From e97c93c1681e8c9408945323eeec70bd403c8449 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 01:10:49 +0200
Subject: [PATCH 1/9] Align configuration to next JNetReflector version

---
 src/configuration.json | 44 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

diff --git a/src/configuration.json b/src/configuration.json
index bef496aa0..ad2841295 100644
--- a/src/configuration.json
+++ b/src/configuration.json
@@ -4,7 +4,7 @@
   "JavaListenerBasePackage": "org.mases.netdroid.generated",
   "ReflectDeprecated": true,
   "PreferMethodWithSignature": true,
-  "OnlyPropertiesForGetterSetter": true,
+  "DisablePropertiesForGetterSetter": true,
   "DisableInterfaceMethodGeneration": true,
   "CreateInterfaceInheritance": true,
   "JarList": [
@@ -13,7 +13,8 @@
   "OriginJavadocJARVersionAndUrls": [
     {
       "Version": 11,
-      "Url": "https://developer.android.com/reference/"
+      "Url": "https://developer.android.com/reference/",
+      "NoModule": true
     }
   ],
   "NamespacesToAvoid": [
@@ -30,10 +31,12 @@
     "org.slf4j"
   ],
   "ClassesToBeListener": [
+    "android.hardware.SensorEventListener2",
+    "android.media.MediaScannerConnection$MediaScannerConnectionClient",
     "javax.swing.Action",
     "javax.management.NotificationFilter"
   ],
-  "ClassesToAvoidJavaListener": [
+  "ClassesToRemoveAsListener": [
     "android.animation.AnimatorListenerAdapter",
     "android.bluetooth.BluetoothAdapter",
     "android.content.AbstractThreadedSyncAdapter",
@@ -59,6 +62,7 @@
     "android.text.method.MetaKeyKeyListener",
     "android.text.method.QwertyKeyListener",
     "android.text.method.TimeKeyListener",
+    "android.widget.ArrayAdapter",
     "android.widget.CursorTreeAdapter",
     "android.widget.HeaderViewListAdapter",
     "android.widget.ResourceCursorAdapter",
@@ -71,20 +75,16 @@
     "org.xml.sax.helpers.XMLReaderAdapter"
   ],
   "ClassesToAvoid": [
-    "android.R",
-    "android.icu.number.NumberFormatterSettings",
-    "android.icu.number.NumberRangeFormatterSettings",
-    "android.icu.text.UnicodeSetIterator",
-    "android.text.style.TtsSpan",
     "android.util.Range",
-    "android.util.TypedValue",
-    "android.widget.ArrayAdapter",
     "java.io.ObjectInputFilter",
     "java.lang.Enum$EnumDesc",
     "java.lang.Module",
     "java.lang.ModuleLayer",
     "java.lang.ProcessBuilder$Redirect$Type",
     "java.lang.ProcessHandle",
+    "java.lang.ProcessHandle$Info",
+    "java.lang.Runtime$Version",
+    "java.lang.System$Logger",
     "java.lang.Thread$UncaughtExceptionHandler",
     "java.lang.reflect.AnnotatedType",
     "java.security.SecureRandomParameters",
@@ -105,34 +105,10 @@
     "java.util.ServiceLoader$Provider",
     "java.util.zip.ZipConstants",
     "javax.sql.PooledConnectionBuilder",
-    "javax.swing.ToolTipManager",
-    "javax.swing.text.html.HTMLEditorKit$LinkController",
-    "javax.swing.plaf.basic.BasicButtonListener",
-    "javax.swing.plaf.basic.BasicTreeUI$MouseHandler",
-    "javax.swing.plaf.basic.BasicDesktopIconUI$MouseInputHandler",
-    "javax.swing.plaf.basic.BasicTabbedPaneUI$FocusHandler",
-    "javax.swing.plaf.basic.BasicComboBoxUI$KeyHandler",
-    "javax.swing.plaf.basic.BasicSliderUI$ComponentHandler",
-    "javax.swing.plaf.basic.BasicComboPopup$InvocationKeyHandler",
-    "javax.swing.plaf.basic.BasicTreeUI$KeyHandler",
-    "javax.swing.plaf.basic.BasicTreeUI$ComponentHandler",
-    "javax.swing.plaf.basic.BasicSplitPaneUI$FocusHandler",
-    "javax.swing.plaf.basic.BasicTabbedPaneUI$MouseHandler",
-    "javax.swing.plaf.basic.BasicOptionPaneUI$ButtonActionListener",
-    "javax.swing.plaf.basic.BasicToolBarUI$DockingListener",
-    "javax.swing.plaf.basic.BasicScrollPaneUI$HSBChangeListener",
-    "javax.swing.plaf.basic.BasicInternalFrameUI$InternalFramePropertyChangeListener",
-    "javax.swing.plaf.basic.BasicSliderUI$ScrollListener",
-    "javax.swing.plaf.basic.BasicSliderUI$TrackListener",
-    "javax.swing.plaf.basic.BasicScrollPaneUI$VSBChangeListener",
-    "javax.swing.plaf.metal.MetalComboBoxUI$MetalPropertyChangeListener",
-    "javax.tools.DiagnosticListener",
     "javax.xml.xpath.XPathEvaluationResult",
     "org.w3c.dom.ls.LSSerializerFilter"
   ],
   "NamespacesInConflict": [
-    "android.system",
-    "dalvik.system",
     "java.lang.module",
     "java.awt.color",
     "java.awt.desktop",

From a683e13d4be07dba0029e62398fe4cbd367663d2 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 01:12:45 +0200
Subject: [PATCH 2/9] General code update with next version of JNetReflector

---
 ...oller_OnMagnificationChangedListener.java} |     4 +-
 ...Controller_OnShowModeChangedListener.java} |     4 +-
 ...er.java => Animator_AnimatorListener.java} |     4 +-
 ...va => Animator_AnimatorPauseListener.java} |     4 +-
 ... LayoutTransition_TransitionListener.java} |     4 +-
 ...er.java => TimeAnimator_TimeListener.java} |     4 +-
 ...ValueAnimator_AnimatorUpdateListener.java} |     4 +-
 ...Animator_DurationScaleChangeListener.java} |     4 +-
 ...> ActionBar_OnMenuVisibilityListener.java} |     4 +-
 ...va => ActionBar_OnNavigationListener.java} |     4 +-
 ...stener.java => ActionBar_TabListener.java} |     4 +-
 ...java => AlarmManager_OnAlarmListener.java} |     4 +-
 ...OpsManager_OnOpActiveChangedListener.java} |     4 +-
 ...=> AppOpsManager_OnOpChangedListener.java} |     4 +-
 ...lication_OnProvideAssistDataListener.java} |     4 +-
 ...> DatePickerDialog_OnDateSetListener.java} |     4 +-
 ...readCrumbs_OnBreadCrumbClickListener.java} |     4 +-
 ...ntManager_OnBackStackChangedListener.java} |     4 +-
 ...dManager_KeyguardLockedStateListener.java} |     4 +-
 ...va => SearchManager_OnCancelListener.java} |     4 +-
 ...a => SearchManager_OnDismissListener.java} |     4 +-
 ...llback_OnSharedElementsReadyListener.java} |     4 +-
 ...> TimePickerDialog_OnTimeSetListener.java} |     4 +-
 ...omation_OnAccessibilityEventListener.java} |     4 +-
 ...UiModeManager_ContrastChangeListener.java} |     4 +-
 ...paperManager_OnColorsChangedListener.java} |     4 +-
 ...r_OnClearApplicationUserDataListener.java} |     4 +-
 ... => BluetoothProfile_ServiceListener.java} |     4 +-
 ...Manager_OnPrimaryClipChangedListener.java} |     4 +-
 ... => DialogInterface_OnCancelListener.java} |     4 +-
 ...a => DialogInterface_OnClickListener.java} |     4 +-
 ...=> DialogInterface_OnDismissListener.java} |     4 +-
 ...ava => DialogInterface_OnKeyListener.java} |     4 +-
 ...Interface_OnMultiChoiceClickListener.java} |     4 +-
 ...va => DialogInterface_OnShowListener.java} |     4 +-
 ...ava => Loader_OnLoadCanceledListener.java} |     4 +-
 ...ava => Loader_OnLoadCompleteListener.java} |     4 +-
 ...ces_OnSharedPreferenceChangeListener.java} |     4 +-
 ...kageManager_OnChecksumsReadyListener.java} |     4 +-
 ... => DrmManagerClient_OnErrorListener.java} |     4 +-
 ... => DrmManagerClient_OnEventListener.java} |     4 +-
 ...a => DrmManagerClient_OnInfoListener.java} |     4 +-
 ...GestureOverlayView_OnGestureListener.java} |     4 +-
 ...erlayView_OnGesturePerformedListener.java} |     4 +-
 ...stureOverlayView_OnGesturingListener.java} |     4 +-
 ...ImageDecoder_OnHeaderDecodedListener.java} |     4 +-
 ... ImageDecoder_OnPartialImageListener.java} |     4 +-
 ...faceTexture_OnFrameAvailableListener.java} |     4 +-
 ...ava => Icon_OnDrawableLoadedListener.java} |     4 +-
 ...java => Camera_FaceDetectionListener.java} |     4 +-
 ....java => Camera_OnZoomChangeListener.java} |     4 +-
 ...va => DisplayManager_DisplayListener.java} |     4 +-
 ... => InputManager_InputDeviceListener.java} |     4 +-
 ...eyboardView_OnKeyboardActionListener.java} |     4 +-
 ...ner.java => Geocoder_GeocodeListener.java} |     4 +-
 .../location/GnssAntennaInfo_Listener.java    |    35 +
 ...{Listener.java => GpsStatus_Listener.java} |     4 +-
 ...tener.java => GpsStatus_NmeaListener.java} |     4 +-
 ...ioManager_OnAudioFocusChangeListener.java} |     4 +-
 ...OnCommunicationDeviceChangedListener.java} |     4 +-
 ...> AudioManager_OnModeChangedListener.java} |     4 +-
 ...ferredMixerAttributesChangedListener.java} |     4 +-
 ...ecord_OnRecordPositionUpdateListener.java} |     4 +-
 .../AudioRecord_OnRoutingChangedListener.java |    43 +
 ...AudioRouting_OnRoutingChangedListener.java |    35 +
 ...ioTrack_OnCodecFormatChangedListener.java} |     4 +-
 ...rack_OnPlaybackPositionUpdateListener.java |    39 +
 ... AudioTrack_OnRoutingChangedListener.java} |     4 +-
 ...ImageReader_OnImageAvailableListener.java} |     4 +-
 ... ImageWriter_OnImageReleasedListener.java} |     4 +-
 ...java => JetPlayer_OnJetEventListener.java} |     4 +-
 ...tener.java => MediaCas_EventListener.java} |     4 +-
 ...odec_OnFirstTunnelFrameReadyListener.java} |     4 +-
 ...> MediaCodec_OnFrameRenderedListener.java} |     4 +-
 ...ner.java => MediaDrm_OnEventListener.java} |     4 +-
 ... MediaDrm_OnExpirationUpdateListener.java} |     4 +-
 ...> MediaDrm_OnKeyStatusChangeListener.java} |     4 +-
 ... MediaDrm_OnSessionLostStateListener.java} |     4 +-
 ...ediaPlayer_OnBufferingUpdateListener.java} |     4 +-
 ... => MediaPlayer_OnCompletionListener.java} |     4 +-
 ...ava => MediaPlayer_OnDrmInfoListener.java} |     4 +-
 ...=> MediaPlayer_OnDrmPreparedListener.java} |     4 +-
 .../media/MediaPlayer_OnErrorListener.java    |    35 +
 .../media/MediaPlayer_OnInfoListener.java     |    35 +
 ...yer_OnMediaTimeDiscontinuityListener.java} |     4 +-
 ...va => MediaPlayer_OnPreparedListener.java} |     4 +-
 ...> MediaPlayer_OnSeekCompleteListener.java} |     4 +-
 ...> MediaPlayer_OnSubtitleDataListener.java} |     4 +-
 ...yer_OnTimedMetaDataAvailableListener.java} |     4 +-
 ...a => MediaPlayer_OnTimedTextListener.java} |     4 +-
 ...diaPlayer_OnVideoSizeChangedListener.java} |     4 +-
 .../media/MediaRecorder_OnErrorListener.java  |    35 +
 ...java => MediaRecorder_OnInfoListener.java} |     4 +-
 ...Router2_OnGetControllerHintsListener.java} |     4 +-
 ...erConnection_OnScanCompletedListener.java} |     4 +-
 ...er.java => MediaSync_OnErrorListener.java} |     4 +-
 ...Client_OnGetPlaybackPositionListener.java} |     4 +-
 ...ntrolClient_OnMetadataUpdateListener.java} |     4 +-
 ...ent_OnPlaybackPositionUpdateListener.java} |     4 +-
 ...oteController_OnClientUpdateListener.java} |     4 +-
 ... => SoundPool_OnLoadCompleteListener.java} |     4 +-
 ...lizer_OnHeadTrackerAvailableListener.java} |     4 +-
 ...er_OnSpatializerStateChangedListener.java} |     4 +-
 ...Effect_OnControlStatusChangeListener.java} |     4 +-
 ...oEffect_OnEnableStatusChangeListener.java} |     4 +-
 .../BassBoost_OnParameterChangeListener.java  |    35 +
 ...entalReverb_OnParameterChangeListener.java |    35 +
 .../Equalizer_OnParameterChangeListener.java  |    35 +
 ...resetReverb_OnParameterChangeListener.java |    35 +
 ...irtualizer_OnParameterChangeListener.java} |     4 +-
 ... => Visualizer_OnDataCaptureListener.java} |     4 +-
 ...> MidiManager_OnDeviceOpenedListener.java} |     4 +-
 ...ager_OnActiveSessionsChangedListener.java} |     4 +-
 ...nMediaKeyEventSessionChangedListener.java} |     4 +-
 ...ager_OnSession2TokensChangedListener.java} |     4 +-
 ...TvView_OnUnhandledInputEventListener.java} |     4 +-
 ...ppView_OnUnhandledInputEventListener.java} |     4 +-
 ...ivityManager_OnNetworkActiveListener.java} |     4 +-
 ...er.java => UrlRequest_StatusListener.java} |     4 +-
 ...java => NsdManager_DiscoveryListener.java} |     4 +-
 ...a => NsdManager_RegistrationListener.java} |     4 +-
 ...r.java => NsdManager_ResolveListener.java} |     4 +-
 ...r_LocalOnlyConnectionFailureListener.java} |     4 +-
 ...r_SuggestionConnectionStatusListener.java} |     4 +-
 ...SuggestionUserApprovalStatusListener.java} |     4 +-
 ...ava => WifiP2pManager_ActionListener.java} |     4 +-
 ...va => WifiP2pManager_ChannelListener.java} |     4 +-
 ...ifiP2pManager_ConnectionInfoListener.java} |     4 +-
 ...=> WifiP2pManager_DeviceInfoListener.java} |     4 +-
 ...ifiP2pManager_DiscoveryStateListener.java} |     4 +-
 ...Manager_DnsSdServiceResponseListener.java} |     4 +-
 ...ifiP2pManager_DnsSdTxtRecordListener.java} |     4 +-
 ...ager_ExternalApproverRequestListener.java} |     4 +-
 ... => WifiP2pManager_GroupInfoListener.java} |     4 +-
 ...> WifiP2pManager_NetworkInfoListener.java} |     4 +-
 ...a => WifiP2pManager_P2pStateListener.java} |     4 +-
 ...a => WifiP2pManager_PeerListListener.java} |     4 +-
 ...fiP2pManager_ServiceResponseListener.java} |     4 +-
 ...pManager_UpnpServiceResponseListener.java} |     4 +-
 ...a => NfcAdapter_OnTagRemovedListener.java} |     4 +-
 ... CancellationSignal_OnCancelListener.java} |     4 +-
 .../os/FileUtils_ProgressListener.java        |    35 +
 ...eQueue_OnFileDescriptorEventListener.java} |     4 +-
 ...ParcelFileDescriptor_OnCloseListener.java} |     4 +-
 ...nager_OnThermalStatusChangedListener.java} |     4 +-
 ...> PowerManager_WakeLockStateListener.java} |     4 +-
 ...a => RecoverySystem_ProgressListener.java} |     4 +-
 ...StrictMode_OnThreadViolationListener.java} |     4 +-
 ... => StrictMode_OnVmViolationListener.java} |     4 +-
 ...nceManager_OnActivityDestroyListener.java} |     4 +-
 ...enceManager_OnActivityResultListener.java} |     4 +-
 ...erenceManager_OnActivityStopListener.java} |     4 +-
 ...reference_OnPreferenceChangeListener.java} |     4 +-
 ...Preference_OnPreferenceClickListener.java} |     4 +-
 ...Allocation_OnBufferAvailableListener.java} |     4 +-
 ...ava => SEService_OnConnectedListener.java} |     4 +-
 ....java => TextToSpeech_OnInitListener.java} |     4 +-
 ...oSpeech_OnUtteranceCompletedListener.java} |     4 +-
 ...gManager_CarrierConfigChangeListener.java} |     4 +-
 ...ack_ActiveDataSubscriptionIdListener.java} |     4 +-
 ...elephonyCallback_BarringInfoListener.java} |     4 +-
 ...Callback_CallDisconnectCauseListener.java} |     4 +-
 ...back_CallForwardingIndicatorListener.java} |     4 +-
 ... TelephonyCallback_CallStateListener.java} |     4 +-
 ...phonyCallback_CarrierNetworkListener.java} |     4 +-
 ...> TelephonyCallback_CellInfoListener.java} |     4 +-
 ...lephonyCallback_CellLocationListener.java} |     4 +-
 ...Callback_DataActivationStateListener.java} |     4 +-
 ...lephonyCallback_DataActivityListener.java} |     4 +-
 ...Callback_DataConnectionStateListener.java} |     4 +-
 ...elephonyCallback_DisplayInfoListener.java} |     4 +-
 ...Callback_EmergencyNumberListListener.java} |     4 +-
 ...lback_ImsCallDisconnectCauseListener.java} |     4 +-
 ...back_MessageWaitingIndicatorListener.java} |     4 +-
 ...llback_PhysicalChannelConfigListener.java} |     4 +-
 ...k_PreciseDataConnectionStateListener.java} |     4 +-
 ...yCallback_RegistrationFailedListener.java} |     4 +-
 ...lephonyCallback_ServiceStateListener.java} |     4 +-
 ...honyCallback_SignalStrengthsListener.java} |     4 +-
 ...Callback_UserMobileDataStateListener.java} |     4 +-
 ...ava => Transition_TransitionListener.java} |     4 +-
 ...=> ActionProvider_VisibilityListener.java} |     4 +-
 ...OnBufferTransformHintChangedListener.java} |     4 +-
 ...estureDetector_OnContextClickListener.java |    35 +
 ... GestureDetector_OnDoubleTapListener.java} |     4 +-
 ...=> GestureDetector_OnGestureListener.java} |     4 +-
 ...tureDetector_SimpleOnGestureListener.java} |     4 +-
 ...a => MenuItem_OnActionExpandListener.java} |     4 +-
 ... => MenuItem_OnMenuItemClickListener.java} |     4 +-
 ...ixelCopy_OnPixelCopyFinishedListener.java} |     4 +-
 ...stureDetector_OnScaleGestureListener.java} |     4 +-
 ...etector_SimpleOnScaleGestureListener.java} |     4 +-
 ...Control_TransactionCommittedListener.java} |     4 +-
 ...> TextureView_SurfaceTextureListener.java} |     4 +-
 ... ViewGroup_OnHierarchyChangeListener.java} |     4 +-
 ...r.java => ViewStub_OnInflateListener.java} |     4 +-
 ...a => ViewTreeObserver_OnDrawListener.java} |     4 +-
 ...Observer_OnGlobalFocusChangeListener.java} |     4 +-
 ...wTreeObserver_OnGlobalLayoutListener.java} |     4 +-
 ...> ViewTreeObserver_OnPreDrawListener.java} |     4 +-
 ...TreeObserver_OnScrollChangedListener.java} |     4 +-
 ...eeObserver_OnTouchModeChangeListener.java} |     4 +-
 ...wTreeObserver_OnWindowAttachListener.java} |     4 +-
 ...Observer_OnWindowFocusChangeListener.java} |     4 +-
 ...ver_OnWindowVisibilityChangeListener.java} |     4 +-
 ... => View_OnApplyWindowInsetsListener.java} |     4 +-
 ... => View_OnAttachStateChangeListener.java} |     4 +-
 ...va => View_OnCapturedPointerListener.java} |     4 +-
 ...istener.java => View_OnClickListener.java} |     4 +-
 ....java => View_OnContextClickListener.java} |     4 +-
 ... => View_OnCreateContextMenuListener.java} |     4 +-
 ...Listener.java => View_OnDragListener.java} |     4 +-
 ...r.java => View_OnFocusChangeListener.java} |     4 +-
 ...java => View_OnGenericMotionListener.java} |     4 +-
 ...istener.java => View_OnHoverListener.java} |     4 +-
 ...yListener.java => View_OnKeyListener.java} |     4 +-
 ....java => View_OnLayoutChangeListener.java} |     4 +-
 ...ner.java => View_OnLongClickListener.java} |     4 +-
 ....java => View_OnScrollChangeListener.java} |     4 +-
 ...w_OnSystemUiVisibilityChangeListener.java} |     4 +-
 ...istener.java => View_OnTouchListener.java} |     4 +-
 ... => View_OnUnhandledKeyEventListener.java} |     4 +-
 ..._OnControllableInsetsChangedListener.java} |     4 +-
 ...ndow_OnFrameMetricsAvailableListener.java} |     4 +-
 ...RestrictedCaptionAreaChangedListener.java} |     4 +-
 ...ssibilityServicesStateChangeListener.java} |     4 +-
 ...ger_AccessibilityStateChangeListener.java} |     4 +-
 ...ioDescriptionRequestedChangeListener.java} |     4 +-
 ..._TouchExplorationStateChangeListener.java} |     4 +-
 ....java => Animation_AnimationListener.java} |     4 +-
 ...rSession_SpellCheckerSessionListener.java} |     4 +-
 ...java => WebIconDatabase_IconListener.java} |     4 +-
 ...istener.java => WebView_FindListener.java} |     4 +-
 ...ener.java => WebView_PictureListener.java} |     4 +-
 ... AbsListView_MultiChoiceModeListener.java} |     4 +-
 .../widget/AbsListView_OnScrollListener.java  |    39 +
 ...java => AbsListView_RecyclerListener.java} |     4 +-
 ...ctionMenuView_OnMenuItemClickListener.java |    35 +
 ...a => AdapterView_OnItemClickListener.java} |     4 +-
 ... AdapterView_OnItemLongClickListener.java} |     4 +-
 ...> AdapterView_OnItemSelectedListener.java} |     4 +-
 ...utoCompleteTextView_OnDismissListener.java |    35 +
 ...=> CalendarView_OnDateChangeListener.java} |     4 +-
 ...hronometer_OnChronometerTickListener.java} |     4 +-
 ...ompoundButton_OnCheckedChangeListener.java |    35 +
 ... => DatePicker_OnDateChangedListener.java} |     4 +-
 ...andableListView_OnChildClickListener.java} |     4 +-
 ...andableListView_OnGroupClickListener.java} |     4 +-
 ...ableListView_OnGroupCollapseListener.java} |     4 +-
 ...ndableListView_OnGroupExpandListener.java} |     4 +-
 ...stener.java => Filter_FilterListener.java} |     4 +-
 ...ava => NumberPicker_OnScrollListener.java} |     4 +-
 ...> NumberPicker_OnValueChangeListener.java} |     4 +-
 .../widget/PopupMenu_OnDismissListener.java   |    35 +
 .../PopupMenu_OnMenuItemClickListener.java    |    35 +
 ...ava => PopupWindow_OnDismissListener.java} |     4 +-
 ...> RadioGroup_OnCheckedChangeListener.java} |     4 +-
 ... RatingBar_OnRatingBarChangeListener.java} |     4 +-
 ...r.java => SearchView_OnCloseListener.java} |     4 +-
 ...va => SearchView_OnQueryTextListener.java} |     4 +-
 ...a => SearchView_OnSuggestionListener.java} |     4 +-
 ...a => SeekBar_OnSeekBarChangeListener.java} |     4 +-
 ...ovider_OnShareTargetSelectedListener.java} |     4 +-
 ... SlidingDrawer_OnDrawerCloseListener.java} |     4 +-
 ...> SlidingDrawer_OnDrawerOpenListener.java} |     4 +-
 ...SlidingDrawer_OnDrawerScrollListener.java} |     4 +-
 ....java => TabHost_OnTabChangeListener.java} |     4 +-
 ...a => TextView_OnEditorActionListener.java} |     4 +-
 ... => TimePicker_OnTimeChangedListener.java} |     4 +-
 ...a => Toolbar_OnMenuItemClickListener.java} |     4 +-
 ...ZoomButtonsController_OnZoomListener.java} |     4 +-
 ...SplashScreen_OnExitAnimationListener.java} |     4 +-
 .../Developed/Android/Widget/ListAdapter.cs   |    37 +
 .../Android/Widget/SpinnerAdapter.cs          |    32 +
 src/net/Netdroid/Developed/Java/Lang/Class.cs |     4 +-
 src/net/Netdroid/Developed/Java/Lang/Float.cs |     8 +
 .../Netdroid/Developed/Java/Lang/Iterable.cs  |    36 +-
 .../Developed/Java/Util/Comparator.cs         |     8 +-
 .../Java/Util/Function/BiFunction.cs          |   106 +-
 .../Java/Util/Function/BiPredicate.cs         |     5 +
 .../Java/Util/Function/BooleanSupplier.cs     |     5 +
 .../Developed/Java/Util/Function/Consumer.cs  |     5 +
 .../Util/Function/DoubleBinaryOperator.cs     |    59 +-
 .../Java/Util/Function/DoubleUnaryOperator.cs |    71 +
 .../AccessibilityGestureEvent.cs              |    29 +-
 .../AccessibilityService.cs                   |   288 +-
 .../AccessibilityServiceInfo.cs               |   138 +-
 .../Accessibilityservice/AllPackageClasses.cs |    44 +-
 .../GestureDescription.cs                     |    83 +-
 .../Accessibilityservice/InputMethod.cs       |    21 +-
 .../MagnificationConfig.cs                    |    42 +-
 .../TouchInteractionController.cs             |    31 +-
 .../Accounts/AbstractAccountAuthenticator.cs  |    15 +-
 .../Accounts/AccountAuthenticatorActivity.cs  |     2 +-
 .../Android/Accounts/AccountManager.cs        |    30 +-
 .../Android/Accounts/AccountManagerFuture.cs  |    36 +-
 .../Android/Accounts/AllPackageClasses.cs     |    32 +-
 .../Accounts/OnAccountsUpdateListener.cs      |     4 +-
 .../Generated/Android/Adservices/Adid/AdId.cs |    15 +-
 .../Adselection/AdSelectionConfig.cs          |    57 +-
 .../Adselection/AdSelectionManager.cs         |     7 +-
 .../Adselection/AdSelectionOutcome.cs         |    14 +-
 .../AddAdSelectionOverrideRequest.cs          |    21 +-
 .../RemoveAdSelectionOverrideRequest.cs       |     7 +-
 .../Adselection/ReportEventRequest.cs         |    28 +-
 .../Adselection/ReportImpressionRequest.cs    |    14 +-
 .../UpdateAdCounterHistogramRequest.cs        |    21 +-
 .../Android/Adservices/Appsetid/AppSetId.cs   |    14 +-
 .../Android/Adservices/Common/AdData.cs       |    36 +-
 .../Android/Adservices/Common/AdFilters.cs    |     7 +-
 .../Adservices/Common/FrequencyCapFilters.cs  |    36 +-
 .../Adservices/Common/KeyedFrequencyCap.cs    |    29 +-
 .../AddCustomAudienceOverrideRequest.cs       |    28 +-
 .../Customaudience/CustomAudience.cs          |    71 +-
 .../Customaudience/CustomAudienceManager.cs   |     7 +-
 .../JoinCustomAudienceRequest.cs              |     7 +-
 .../LeaveCustomAudienceRequest.cs             |    14 +-
 .../RemoveCustomAudienceOverrideRequest.cs    |    14 +-
 .../Customaudience/TrustedBiddingData.cs      |    22 +-
 .../Adservices/Measurement/DeletionRequest.cs |    42 +-
 .../Adservices/Measurement/WebSourceParams.cs |     7 +-
 .../WebSourceRegistrationRequest.cs           |    50 +-
 .../Measurement/WebTriggerParams.cs           |     7 +-
 .../WebTriggerRegistrationRequest.cs          |    22 +-
 .../Adservices/Topics/GetTopicsRequest.cs     |    15 +-
 .../Adservices/Topics/GetTopicsResponse.cs    |     7 +-
 .../Android/Adservices/Topics/Topic.cs        |    21 +-
 .../Generated/Android/AllPackageClasses.cs    |   968 +
 .../Android/Animation/AllPackageClasses.cs    |   131 +-
 .../Generated/Android/Animation/Animator.cs   |   107 +-
 .../Animation/AnimatorListenerAdapter.cs      |   268 +-
 .../Android/Animation/AnimatorSet.cs          |    32 +-
 .../Generated/Android/Animation/Keyframe.cs   |    68 +-
 .../Android/Animation/LayoutTransition.cs     |    27 +-
 .../Android/Animation/ObjectAnimator.cs       |    22 +-
 .../Android/Animation/PropertyValuesHolder.cs |    23 +-
 .../Android/Animation/TimeAnimator.cs         |     4 +-
 .../Android/Animation/ValueAnimator.cs        |   128 +-
 .../Android/Annotation/AllPackageClasses.cs   |     8 +-
 .../Generated/Android/App/ActionBar.cs        |   376 +-
 .../Generated/Android/App/Activity.cs         |   598 +-
 .../Generated/Android/App/ActivityGroup.cs    |    20 +-
 .../Generated/Android/App/ActivityManager.cs  |   253 +-
 .../Generated/Android/App/ActivityOptions.cs  |    94 +-
 .../Android/App/Admin/AllPackageClasses.cs    |    22 +-
 .../Android/App/Admin/ConnectEvent.cs         |    14 +-
 .../Android/App/Admin/DeviceAdminInfo.cs      |    59 +-
 .../Android/App/Admin/DeviceAdminReceiver.cs  |    10 +-
 .../Android/App/Admin/DevicePolicyManager.cs  |   514 +-
 .../Generated/Android/App/Admin/DnsEvent.cs   |    21 +-
 .../App/Admin/FactoryResetProtectionPolicy.cs |    15 +-
 .../Android/App/Admin/FreezePeriod.cs         |    14 +-
 .../App/Admin/ManagedSubscriptionsPolicy.cs   |    13 +-
 .../Android/App/Admin/NetworkEvent.cs         |    39 +-
 .../Android/App/Admin/PackagePolicy.cs        |    22 +-
 .../Android/App/Admin/PolicyUpdateResult.cs   |     7 +-
 .../Admin/PreferentialNetworkServiceConfig.cs |    45 +-
 .../Android/App/Admin/SecurityLog.cs          |    43 +-
 .../Android/App/Admin/SystemUpdateInfo.cs     |    22 +-
 .../Android/App/Admin/SystemUpdatePolicy.cs   |    46 +-
 .../Android/App/Admin/WifiSsidPolicy.cs       |    22 +-
 .../Generated/Android/App/AlarmManager.cs     |    33 +-
 .../Generated/Android/App/AlertDialog.cs      |    54 +-
 .../Android/App/AllPackageClasses.cs          |   364 +-
 .../Generated/Android/App/AppOpsManager.cs    |    30 +-
 .../Generated/Android/App/Application.cs      |    11 +-
 .../Android/App/ApplicationExitInfo.cs        |   114 +-
 .../App/Appsearch/AllPackageClasses.cs        |    18 +-
 .../App/Appsearch/AppSearchBatchResult.cs     |    58 +-
 .../Android/App/Appsearch/AppSearchManager.cs |     7 +-
 .../Android/App/Appsearch/AppSearchResult.cs  |    58 +-
 .../Android/App/Appsearch/AppSearchSchema.cs  |    71 +-
 .../Android/App/Appsearch/GenericDocument.cs  |   112 +-
 .../App/Appsearch/GetByDocumentIdRequest.cs   |    28 +-
 .../App/Appsearch/GetSchemaResponse.cs        |    35 +-
 .../Android/App/Appsearch/JoinSpec.cs         |    35 +-
 .../Appsearch/Observer/AllPackageClasses.cs   |     4 +-
 .../Appsearch/Observer/DocumentChangeInfo.cs  |    35 +-
 .../App/Appsearch/Observer/ObserverSpec.cs    |     7 +-
 .../Appsearch/Observer/SchemaChangeInfo.cs    |    21 +-
 .../App/Appsearch/PackageIdentifier.cs        |    14 +-
 .../Android/App/Appsearch/PropertyPath.cs     |    14 +-
 .../App/Appsearch/PutDocumentsRequest.cs      |     9 +-
 .../Appsearch/RemoveByDocumentIdRequest.cs    |    14 +-
 .../App/Appsearch/ReportSystemUsageRequest.cs |    35 +-
 .../App/Appsearch/ReportUsageRequest.cs       |    21 +-
 .../Android/App/Appsearch/SearchResult.cs     |   119 +-
 .../Android/App/Appsearch/SearchSpec.cs       |   150 +-
 .../App/Appsearch/SearchSuggestionResult.cs   |     7 +-
 .../App/Appsearch/SearchSuggestionSpec.cs     |    35 +-
 .../Android/App/Appsearch/SetSchemaRequest.cs |    50 +-
 .../App/Appsearch/SetSchemaResponse.cs        |    56 +-
 .../Android/App/Appsearch/StorageInfo.cs      |    21 +-
 .../Android/App/Assist/AssistContent.cs       |    75 +-
 .../Android/App/Assist/AssistStructure.cs     |   532 +-
 .../Generated/Android/App/AsyncNotedAppOp.cs  |    43 +-
 .../Generated/Android/App/AutomaticZenRule.cs |   107 +-
 .../Android/App/Backup/AllPackageClasses.cs   |    12 +-
 .../Android/App/Backup/BackupDataInput.cs     |    30 +-
 .../App/Backup/BackupDataInputStream.cs       |    15 +-
 .../Android/App/Backup/BackupDataOutput.cs    |    22 +-
 .../Android/App/Backup/BackupManager.cs       |     2 +-
 .../App/Backup/FullBackupDataOutput.cs        |    14 +-
 .../Generated/Android/App/Blob/BlobHandle.cs  |    36 +-
 .../Android/App/Blob/BlobStoreManager.cs      |    47 +-
 .../Generated/Android/App/BroadcastOptions.cs |    45 +-
 .../Generated/Android/App/DatePickerDialog.cs |    11 +-
 .../Netdroid/Generated/Android/App/Dialog.cs  |   161 +-
 .../Generated/Android/App/DialogFragment.cs   |    80 +-
 .../Generated/Android/App/DirectAction.cs     |    29 +-
 .../Generated/Android/App/DownloadManager.cs  |    12 +-
 .../Android/App/ExpandableListActivity.cs     |    65 +-
 .../Generated/Android/App/Fragment.cs         |   564 +-
 .../Android/App/FragmentBreadCrumbs.cs        |    26 +-
 .../Android/App/FragmentContainer.cs          |     8 +-
 .../Android/App/FragmentController.cs         |   110 +-
 .../Android/App/FragmentHostCallback.cs       |    52 +-
 .../Generated/Android/App/FragmentManager.cs  |   189 +-
 .../Android/App/FragmentTransaction.cs        |    74 +-
 .../Generated/Android/App/GameManager.cs      |     7 +-
 .../Generated/Android/App/GameState.cs        |    35 +-
 .../App/GrammaticalInflectionManager.cs       |     7 +-
 .../Generated/Android/App/Instrumentation.cs  |   183 +-
 .../Generated/Android/App/IntentService.cs    |     4 +-
 .../Android/App/Job/AllPackageClasses.cs      |    12 +-
 .../Generated/Android/App/Job/JobInfo.cs      |   275 +-
 .../Android/App/Job/JobParameters.cs          |   110 +-
 .../Generated/Android/App/Job/JobScheduler.cs |    45 +-
 .../Android/App/Job/JobServiceEngine.cs       |    15 +-
 .../Generated/Android/App/Job/JobWorkItem.cs  |    50 +-
 .../Generated/Android/App/KeyguardManager.cs  |    18 +-
 .../Generated/Android/App/LauncherActivity.cs |    18 +-
 .../Generated/Android/App/ListActivity.cs     |    56 +-
 .../Generated/Android/App/ListFragment.cs     |    64 +-
 .../Generated/Android/App/LoaderManager.cs    |    24 +-
 .../Android/App/LocalActivityManager.cs       |    56 +-
 .../Generated/Android/App/LocaleConfig.cs     |    20 +-
 .../Generated/Android/App/LocaleManager.cs    |    45 +-
 .../Generated/Android/App/MediaRouteButton.cs |    15 +-
 .../Generated/Android/App/Notification.cs     |  1118 +-
 .../Android/App/NotificationChannel.cs        |   220 +-
 .../Android/App/NotificationChannelGroup.cs   |    60 +-
 .../Android/App/NotificationManager.cs        |   172 +-
 .../Generated/Android/App/PendingIntent.cs    |    61 +-
 .../Android/App/People/ConversationStatus.cs  |    57 +-
 .../Netdroid/Generated/Android/App/Person.cs  |    60 +-
 .../Android/App/PictureInPictureParams.cs     |    73 +-
 .../Generated/Android/App/Presentation.cs     |    14 +-
 .../Generated/Android/App/ProgressDialog.cs   |    98 +-
 .../Generated/Android/App/RemoteAction.cs     |    52 +-
 .../Generated/Android/App/RemoteInput.cs      |    80 +-
 .../App/Sdksandbox/AllPackageClasses.cs       |     8 +-
 .../Sdksandbox/AppOwnedSdkSandboxInterface.cs |    29 +-
 .../Android/App/Sdksandbox/SandboxedSdk.cs    |    14 +-
 .../App/Sdksandbox/SandboxedSdkProvider.cs    |    15 +-
 .../App/Sdksandbox/SdkSandboxManager.cs       |    28 +-
 .../Sdkprovider/AllPackageClasses.cs          |     4 +-
 .../Sdkprovider/SdkSandboxController.cs       |    38 +-
 .../Generated/Android/App/SearchManager.cs    |    36 +-
 .../Generated/Android/App/SearchableInfo.cs   |   181 +-
 .../Netdroid/Generated/Android/App/Service.cs |    36 +-
 .../Android/App/SharedElementCallback.cs      |     4 +-
 .../Android/App/Slice/AllPackageClasses.cs    |     4 +-
 .../Generated/Android/App/Slice/Slice.cs      |    44 +-
 .../Generated/Android/App/Slice/SliceItem.cs  |    95 +-
 .../Android/App/Slice/SliceManager.cs         |    15 +-
 .../Generated/Android/App/Slice/SliceSpec.cs  |    30 +-
 .../Generated/Android/App/SyncNotedAppOp.cs   |    22 +-
 .../Generated/Android/App/TabActivity.cs      |    22 +-
 .../Generated/Android/App/TaskStackBuilder.cs |    30 +-
 .../Generated/Android/App/TimePickerDialog.cs |     4 +-
 .../Generated/Android/App/UiAutomation.cs     |    83 +-
 .../Generated/Android/App/UiModeManager.cs    |    63 +-
 .../Android/App/Usage/AllPackageClasses.cs    |     4 +-
 .../Android/App/Usage/ConfigurationStats.cs   |    50 +-
 .../Generated/Android/App/Usage/EventStats.cs |    50 +-
 .../Android/App/Usage/ExternalStorageStats.cs |    43 +-
 .../Android/App/Usage/NetworkStats.cs         |    84 +-
 .../Android/App/Usage/StorageStats.cs         |    36 +-
 .../Android/App/Usage/UsageEvents.cs          |    53 +-
 .../Generated/Android/App/Usage/UsageStats.cs |    71 +-
 .../Android/App/Usage/UsageStatsManager.cs    |    15 +-
 .../Generated/Android/App/VoiceInteractor.cs  |   119 +-
 .../Generated/Android/App/WallpaperColors.cs  |    34 +-
 .../Generated/Android/App/WallpaperInfo.cs    |    89 +-
 .../Generated/Android/App/WallpaperManager.cs |    94 +-
 .../Android/Appwidget/AppWidgetHost.cs        |    15 +-
 .../Android/Appwidget/AppWidgetHostView.cs    |    16 +-
 .../Android/Appwidget/AppWidgetManager.cs     |    15 +-
 .../Appwidget/AppWidgetProviderInfo.cs        |    32 +-
 .../Android/Bluetooth/AllPackageClasses.cs    |   109 +-
 .../Android/Bluetooth/BluetoothA2dp.cs        |    15 +-
 .../Android/Bluetooth/BluetoothAdapter.cs     |  1408 +-
 .../Android/Bluetooth/BluetoothClass.cs       |    30 +-
 .../Android/Bluetooth/BluetoothCodecConfig.cs |    79 +-
 .../Android/Bluetooth/BluetoothCodecStatus.cs |    37 +-
 .../Bluetooth/BluetoothCsipSetCoordinator.cs  |    15 +-
 .../Android/Bluetooth/BluetoothDevice.cs      |    97 +-
 .../Android/Bluetooth/BluetoothGatt.cs        |    49 +-
 .../Bluetooth/BluetoothGattCallback.cs        |     6 +-
 .../Bluetooth/BluetoothGattCharacteristic.cs  |   144 +-
 .../Bluetooth/BluetoothGattDescriptor.cs      |    50 +-
 .../Android/Bluetooth/BluetoothGattServer.cs  |    32 +-
 .../Android/Bluetooth/BluetoothGattService.cs |    73 +-
 .../Android/Bluetooth/BluetoothHeadset.cs     |    15 +-
 .../Android/Bluetooth/BluetoothHealth.cs      |    55 +-
 .../BluetoothHealthAppConfiguration.cs        |    41 +-
 .../Bluetooth/BluetoothHealthCallback.cs      |     4 +-
 .../Android/Bluetooth/BluetoothHearingAid.cs  |    15 +-
 .../Android/Bluetooth/BluetoothHidDevice.cs   |    15 +-
 .../BluetoothHidDeviceAppQosSettings.cs       |    48 +-
 .../BluetoothHidDeviceAppSdpSettings.cs       |    43 +-
 .../Android/Bluetooth/BluetoothLeAudio.cs     |    15 +-
 .../Bluetooth/BluetoothLeAudioCodecConfig.cs  |    78 +-
 .../Bluetooth/BluetoothLeAudioCodecStatus.cs  |    70 +-
 .../Android/Bluetooth/BluetoothManager.cs     |     7 +-
 .../Android/Bluetooth/BluetoothProfile.cs     |    25 +-
 .../Bluetooth/BluetoothServerSocket.cs        |    15 +-
 .../Android/Bluetooth/BluetoothSocket.cs      |    52 +-
 .../Android/Bluetooth/Le/AdvertiseData.cs     |    57 +-
 .../Android/Bluetooth/Le/AdvertiseSettings.cs |    43 +-
 .../Bluetooth/Le/AdvertisingSetParameters.cs  |    60 +-
 .../Android/Bluetooth/Le/AllPackageClasses.cs |    12 +-
 .../Le/PeriodicAdvertisingParameters.cs       |    20 +-
 .../Android/Bluetooth/Le/ScanFilter.cs        |   123 +-
 .../Android/Bluetooth/Le/ScanRecord.cs        |    83 +-
 .../Android/Bluetooth/Le/ScanResult.cs        |    96 +-
 .../Android/Bluetooth/Le/ScanSettings.cs      |    50 +-
 .../Android/Bluetooth/Le/TransportBlock.cs    |    42 +-
 .../Bluetooth/Le/TransportDiscoveryData.cs    |    30 +-
 .../Android/Companion/AllPackageClasses.cs    |    18 +-
 .../Android/Companion/AssociatedDevice.cs     |    21 +-
 .../Android/Companion/AssociationInfo.cs      |    50 +-
 .../Android/Companion/AssociationRequest.cs   |    30 +-
 .../Companion/BluetoothLeDeviceFilter.cs      |     7 +-
 .../Companion/CompanionDeviceManager.cs       |    40 +-
 .../Companion/CompanionDeviceService.cs       |     4 +-
 .../Companion/Virtual/VirtualDevice.cs        |    22 +-
 .../Companion/Virtual/VirtualDeviceManager.cs |     7 +-
 .../Content/AbstractThreadedSyncAdapter.cs    |   247 +-
 .../Android/Content/AllPackageClasses.cs      |   247 +-
 .../Android/Content/AsyncTaskLoader.cs        |    24 +-
 .../Android/Content/AttributionSource.cs      |    61 +-
 .../Android/Content/BroadcastReceiver.cs      |   145 +-
 .../Generated/Android/Content/ClipData.cs     |    81 +-
 .../Android/Content/ClipDescription.cs        |    75 +-
 .../Android/Content/ClipboardManager.cs       |    26 +-
 .../Android/Content/ComponentName.cs          |    45 +-
 .../Android/Content/ContentProvider.cs        |   120 +-
 .../Android/Content/ContentProviderClient.cs  |     9 +-
 .../Content/ContentProviderOperation.cs       |    15 +-
 .../Android/Content/ContentQueryMap.cs        |    15 +-
 .../Android/Content/ContentResolver.cs        |   127 +-
 .../Generated/Android/Content/Context.cs      |   526 +-
 .../Android/Content/ContextParams.cs          |    14 +-
 .../Android/Content/ContextWrapper.cs         |     7 +-
 .../Generated/Android/Content/CursorLoader.cs |    98 +-
 .../Android/Content/DialogInterface.cs        |    30 +-
 .../Generated/Android/Content/Entity.cs       |    14 +-
 .../Generated/Android/Content/Intent.cs       |   327 +-
 .../Generated/Android/Content/IntentFilter.cs |    45 +-
 .../Generated/Android/Content/IntentSender.cs |    38 +-
 .../Generated/Android/Content/Loader.cs       |   174 +-
 .../Generated/Android/Content/LocusId.cs      |    15 +-
 .../Android/Content/Om/FabricatedOverlay.cs   |     7 +-
 .../Android/Content/Om/OverlayInfo.cs         |    36 +-
 .../Android/Content/Pm/ActivityInfo.cs        |    22 +-
 .../Android/Content/Pm/AllPackageClasses.cs   |    24 +-
 .../Android/Content/Pm/ApkChecksum.cs         |    44 +-
 .../Android/Content/Pm/ApplicationInfo.cs     |    79 +-
 .../Android/Content/Pm/Attribution.cs         |    22 +-
 .../Android/Content/Pm/Capability.cs          |    15 +-
 .../Android/Content/Pm/CapabilityParams.cs    |    29 +-
 .../Android/Content/Pm/ChangedPackages.cs     |    22 +-
 .../Generated/Android/Content/Pm/Checksum.cs  |    28 +-
 .../Android/Content/Pm/ComponentInfo.cs       |    29 +-
 .../Android/Content/Pm/ConfigurationInfo.cs   |    15 +-
 .../Android/Content/Pm/CrossProfileApps.cs    |    15 +-
 .../Android/Content/Pm/FeatureInfo.cs         |    15 +-
 .../Android/Content/Pm/InstallSourceInfo.cs   |    50 +-
 .../Android/Content/Pm/LabeledIntent.cs       |    46 +-
 .../Content/Pm/LauncherActivityInfo.cs        |    76 +-
 .../Android/Content/Pm/LauncherApps.cs        |    71 +-
 .../Android/Content/Pm/ModuleInfo.cs          |    30 +-
 .../Android/Content/Pm/PackageInfo.cs         |    27 +-
 .../Android/Content/Pm/PackageInstaller.cs    |   478 +-
 .../Android/Content/Pm/PackageManager.cs      |   315 +-
 .../Android/Content/Pm/PackageStats.cs        |    30 +-
 .../Android/Content/Pm/PathPermission.cs      |    14 +-
 .../Android/Content/Pm/PermissionGroupInfo.cs |     2 +-
 .../Android/Content/Pm/PermissionInfo.cs      |    32 +-
 .../Android/Content/Pm/ProviderInfo.cs        |     2 +-
 .../Android/Content/Pm/ResolveInfo.cs         |    15 +-
 .../Android/Content/Pm/ServiceInfo.cs         |    15 +-
 .../Android/Content/Pm/SharedLibraryInfo.cs   |    52 +-
 .../Android/Content/Pm/ShortcutInfo.cs        |   203 +-
 .../Android/Content/Pm/ShortcutManager.cs     |    90 +-
 .../Android/Content/Pm/SigningInfo.cs         |    14 +-
 .../Domain/DomainVerificationUserState.cs     |    37 +-
 .../Android/Content/Pm/VersionedPackage.cs    |    31 +-
 .../Android/Content/Res/AllPackageClasses.cs  |     4 +-
 .../Content/Res/AssetFileDescriptor.cs        |    70 +-
 .../Android/Content/Res/AssetManager.cs       |    15 +-
 .../Android/Content/Res/ColorStateList.cs     |    32 +-
 .../Android/Content/Res/Configuration.cs      |    59 +-
 .../Content/Res/Loader/AllPackageClasses.cs   |     4 +-
 .../Content/Res/Loader/ResourcesLoader.cs     |    15 +-
 .../Android/Content/Res/Resources.cs          |   144 +-
 .../Android/Content/Res/TypedArray.cs         |    79 +-
 .../Android/Content/RestrictionEntry.cs       |   165 +-
 .../Android/Content/RestrictionsManager.cs    |    30 +-
 .../Android/Content/SharedPreferences.cs      |    19 +-
 .../Android/Content/SyncAdapterType.cs        |    15 +-
 .../Generated/Android/Content/SyncContext.cs  |     7 +-
 .../Android/Content/UriPermission.cs          |    22 +-
 .../ClearCredentialStateRequest.cs            |     7 +-
 .../Credentials/CreateCredentialRequest.cs    |    44 +-
 .../Credentials/CreateCredentialResponse.cs   |     7 +-
 .../Android/Credentials/Credential.cs         |    22 +-
 .../Credentials/CredentialDescription.cs      |    29 +-
 .../Android/Credentials/CredentialOption.cs   |    44 +-
 .../Credentials/GetCredentialRequest.cs       |    37 +-
 .../Credentials/GetCredentialResponse.cs      |     7 +-
 .../PrepareGetCredentialResponse.cs           |     7 +-
 .../RegisterCredentialDescriptionRequest.cs   |    15 +-
 .../UnregisterCredentialDescriptionRequest.cs |    15 +-
 .../Android/Database/AbstractCursor.cs        |   143 +-
 .../Database/AbstractWindowedCursor.cs        |     8 +-
 .../Android/Database/AllPackageClasses.cs     |    38 +-
 .../Android/Database/ContentObservable.cs     |     4 +-
 .../Android/Database/ContentObserver.cs       |     2 +-
 .../Android/Database/CrossProcessCursor.cs    |     7 +-
 .../Database/CrossProcessCursorWrapper.cs     |     7 +-
 .../Generated/Android/Database/Cursor.cs      |   116 +-
 .../Android/Database/CursorWindow.cs          |    50 +-
 .../Android/Database/CursorWrapper.cs         |   123 +-
 .../Android/Database/DatabaseUtils.cs         |    32 +-
 .../Database/Sqlite/AllPackageClasses.cs      |    30 +-
 .../Android/Database/Sqlite/SQLiteClosable.cs |     2 +-
 .../Android/Database/Sqlite/SQLiteCursor.cs   |     9 +-
 .../Android/Database/Sqlite/SQLiteDatabase.cs |   176 +-
 .../Database/Sqlite/SQLiteOpenHelper.cs       |    43 +-
 .../Android/Database/Sqlite/SQLiteProgram.cs  |     9 +-
 .../Database/Sqlite/SQLiteQueryBuilder.cs     |    96 +-
 .../Sqlite/SQLiteTransactionListener.cs       |    12 +-
 .../Generated/Android/Devicelock/DeviceId.cs  |    14 +-
 .../Android/Drm/AllPackageClasses.cs          |    78 +-
 .../Android/Drm/DrmConvertedStatus.cs         |    14 +-
 .../Generated/Android/Drm/DrmErrorEvent.cs    |    20 +-
 .../Generated/Android/Drm/DrmEvent.cs         |    45 +-
 .../Netdroid/Generated/Android/Drm/DrmInfo.cs |    47 +-
 .../Generated/Android/Drm/DrmInfoEvent.cs     |    16 +-
 .../Generated/Android/Drm/DrmInfoRequest.cs   |    48 +-
 .../Generated/Android/Drm/DrmInfoStatus.cs    |    14 +-
 .../Generated/Android/Drm/DrmManagerClient.cs |   122 +-
 .../Generated/Android/Drm/DrmRights.cs        |    46 +-
 .../Generated/Android/Drm/DrmStore.cs         |    52 +-
 .../Generated/Android/Drm/DrmSupportInfo.cs   |    49 +-
 .../Generated/Android/Drm/DrmUtils.cs         |     8 +-
 .../Generated/Android/Drm/ProcessedData.cs    |    27 +-
 .../Android/Gesture/AllPackageClasses.cs      |    34 +-
 .../Generated/Android/Gesture/Gesture.cs      |    75 +-
 .../Android/Gesture/GestureLibrary.cs         |    61 +-
 .../Android/Gesture/GestureOverlayView.cs     |   234 +-
 .../Generated/Android/Gesture/GestureStore.cs |    53 +-
 .../Android/Gesture/GestureStroke.cs          |    15 +-
 .../Android/Graphics/AllPackageClasses.cs     |    48 +-
 .../Generated/Android/Graphics/Bitmap.cs      |   224 +-
 .../Android/Graphics/BitmapFactory.cs         |    25 +-
 .../Android/Graphics/BitmapRegionDecoder.cs   |    38 +-
 .../Android/Graphics/BitmapShader.cs          |    30 +-
 .../Android/Graphics/BlendModeColorFilter.cs  |    14 +-
 .../Generated/Android/Graphics/Camera.cs      |    33 +-
 .../Generated/Android/Graphics/Canvas.cs      |   189 +-
 .../Generated/Android/Graphics/Color.cs       |    45 +-
 .../Generated/Android/Graphics/ColorMatrix.cs |     7 +-
 .../Generated/Android/Graphics/ColorSpace.cs  |   216 +-
 .../Android/Graphics/ComposeShader.cs         |     2 +-
 .../Graphics/Drawable/AdaptiveIconDrawable.cs |    35 +-
 .../Graphics/Drawable/AllPackageClasses.cs    |    46 +-
 .../Drawable/AnimatedImageDrawable.cs         |    23 +-
 .../Drawable/AnimatedStateListDrawable.cs     |     2 +-
 .../Graphics/Drawable/AnimationDrawable.cs    |    15 +-
 .../Graphics/Drawable/BitmapDrawable.cs       |    91 +-
 .../Graphics/Drawable/ColorDrawable.cs        |    15 +-
 .../Drawable/ColorStateListDrawable.cs        |    15 +-
 .../Android/Graphics/Drawable/Drawable.cs     |   285 +-
 .../Graphics/Drawable/DrawableContainer.cs    |   120 +-
 .../Graphics/Drawable/DrawableWrapper.cs      |    15 +-
 .../Graphics/Drawable/GradientDrawable.cs     |   193 +-
 .../Android/Graphics/Drawable/Icon.cs         |    64 +-
 .../Graphics/Drawable/LayerDrawable.cs        |   128 +-
 .../Graphics/Drawable/NinePatchDrawable.cs    |    11 +-
 .../Graphics/Drawable/PictureDrawable.cs      |    15 +-
 .../Graphics/Drawable/RippleDrawable.cs       |    30 +-
 .../Graphics/Drawable/RotateDrawable.cs       |    76 +-
 .../Graphics/Drawable/ShapeDrawable.cs        |    29 +-
 .../Drawable/Shapes/AllPackageClasses.cs      |     4 +-
 .../Graphics/Drawable/Shapes/ArcShape.cs      |    14 +-
 .../Android/Graphics/Drawable/Shapes/Shape.cs |    30 +-
 .../Graphics/Drawable/StateListDrawable.cs    |    15 +-
 .../Android/Graphics/EmbossMaskFilter.cs      |     2 +-
 .../Generated/Android/Graphics/Fonts/Font.cs  |    63 +-
 .../Android/Graphics/Fonts/FontFamily.cs      |    15 +-
 .../Android/Graphics/Fonts/FontStyle.cs       |    14 +-
 .../Graphics/Fonts/FontVariationAxis.cs       |    14 +-
 .../Android/Graphics/Fonts/SystemFonts.cs     |     7 +-
 .../Generated/Android/Graphics/Gainmap.cs     |    80 +-
 .../Graphics/HardwareBufferRenderer.cs        |    14 +-
 .../Android/Graphics/ImageDecoder.cs          |   120 +-
 .../Android/Graphics/Interpolator.cs          |    30 +-
 .../Android/Graphics/LightingColorFilter.cs   |    14 +-
 .../Android/Graphics/MeshSpecification.cs     |    35 +-
 .../Generated/Android/Graphics/Movie.cs       |    20 +-
 .../Generated/Android/Graphics/NinePatch.cs   |    68 +-
 .../Generated/Android/Graphics/Outline.cs     |    40 +-
 .../Generated/Android/Graphics/Paint.cs       |   709 +-
 .../Android/Graphics/ParcelableColorSpace.cs  |     7 +-
 .../Generated/Android/Graphics/Path.cs        |    31 +-
 .../Android/Graphics/PathIterator.cs          |    21 +-
 .../Generated/Android/Graphics/PathMeasure.cs |    15 +-
 .../Android/Graphics/Pdf/PdfDocument.cs       |    57 +-
 .../Android/Graphics/Pdf/PdfRenderer.cs       |    36 +-
 .../Generated/Android/Graphics/Picture.cs     |    30 +-
 .../Generated/Android/Graphics/PixelFormat.cs |    20 +-
 .../Generated/Android/Graphics/Region.cs      |    14 +-
 .../Generated/Android/Graphics/RenderNode.cs  |   371 +-
 .../Android/Graphics/SurfaceTexture.cs        |    26 +-
 .../Android/Graphics/Text/LineBreakConfig.cs  |    14 +-
 .../Android/Graphics/Text/LineBreaker.cs      |    58 +-
 .../Android/Graphics/Text/MeasuredText.cs     |     2 +-
 .../Android/Graphics/Text/PositionedGlyphs.cs |    59 +-
 .../Generated/Android/Graphics/Typeface.cs    |    44 +-
 .../Generated/Android/Graphics/YuvImage.cs    |    70 +-
 .../Android/Hardware/AllPackageClasses.cs     |   149 +-
 .../Android/Hardware/BatteryState.cs          |    22 +-
 .../Hardware/Biometrics/AllPackageClasses.cs  |     8 +-
 .../Hardware/Biometrics/BiometricManager.cs   |    23 +-
 .../Hardware/Biometrics/BiometricPrompt.cs    |    98 +-
 .../Generated/Android/Hardware/Camera.cs      |   983 +-
 .../Hardware/Camera2/AllPackageClasses.cs     |    60 +-
 .../Hardware/Camera2/CameraCaptureSession.cs  |    14 +-
 .../Hardware/Camera2/CameraCharacteristics.cs |    80 +-
 .../Android/Hardware/Camera2/CameraDevice.cs  |    50 +-
 .../Camera2/CameraExtensionCharacteristics.cs |    17 +-
 .../Camera2/CameraExtensionSession.cs         |    29 +-
 .../Android/Hardware/Camera2/CameraManager.cs |    32 +-
 .../Hardware/Camera2/CameraMetadata.cs        |    18 +-
 .../Hardware/Camera2/CaptureFailure.cs        |    43 +-
 .../Hardware/Camera2/CaptureRequest.cs        |    29 +-
 .../Android/Hardware/Camera2/CaptureResult.cs |    56 +-
 .../Camera2/MultiResolutionImageReader.cs     |    15 +-
 .../Hardware/Camera2/Params/Capability.cs     |    14 +-
 .../Camera2/Params/DynamicRangeProfiles.cs    |    15 +-
 .../Params/ExtensionSessionConfiguration.cs   |    43 +-
 .../Android/Hardware/Camera2/Params/Face.cs   |    42 +-
 .../Camera2/Params/InputConfiguration.cs      |    29 +-
 .../Hardware/Camera2/Params/LensShadingMap.cs |    45 +-
 .../Params/MandatoryStreamCombination.cs      |    82 +-
 .../Camera2/Params/MeteringRectangle.cs       |    56 +-
 .../MultiResolutionStreamConfigurationMap.cs  |    14 +-
 .../Params/MultiResolutionStreamInfo.cs       |    21 +-
 .../Hardware/Camera2/Params/OisSample.cs      |    21 +-
 .../Camera2/Params/OutputConfiguration.cs     |   104 +-
 .../RecommendedStreamConfigurationMap.cs      |    60 +-
 .../Camera2/Params/RggbChannelVector.cs       |    36 +-
 .../Camera2/Params/SessionConfiguration.cs    |    81 +-
 .../Camera2/Params/StreamConfigurationMap.cs  |    45 +-
 .../Hardware/Camera2/TotalCaptureResult.cs    |    23 +-
 .../Android/Hardware/ConsumerIrManager.cs     |    21 +-
 .../Hardware/Display/AllPackageClasses.cs     |    14 +-
 .../Hardware/Display/DeviceProductInfo.cs     |    57 +-
 .../Hardware/Display/DisplayManager.cs        |    49 +-
 .../Hardware/Display/HdrConversionMode.cs     |    20 +-
 .../Hardware/Display/VirtualDisplay.cs        |    22 +-
 .../Hardware/Display/VirtualDisplayConfig.cs  |    64 +-
 .../Hardware/Fingerprint/AllPackageClasses.cs |    12 +-
 .../Fingerprint/FingerprintManager.cs         |    56 +-
 .../Android/Hardware/GeomagneticField.cs      |    49 +-
 .../Android/Hardware/HardwareBuffer.cs        |    58 +-
 .../Hardware/Input/AllPackageClasses.cs       |    10 +-
 .../Android/Hardware/Input/HostUsiVersion.cs  |    20 +-
 .../Android/Hardware/Input/InputManager.cs    |    42 +-
 .../Hardware/Lights/AllPackageClasses.cs      |     8 +-
 .../Android/Hardware/Lights/Light.cs          |    54 +-
 .../Android/Hardware/Lights/LightState.cs     |    20 +-
 .../Android/Hardware/Lights/LightsManager.cs  |    15 +-
 .../Android/Hardware/Lights/LightsRequest.cs  |    21 +-
 .../Generated/Android/Hardware/Sensor.cs      |   147 +-
 .../Android/Hardware/SensorEventListener.cs   |     8 +-
 .../Android/Hardware/SensorListener.cs        |    16 +-
 .../Android/Hardware/SensorManager.cs         |    61 +-
 .../Generated/Android/Hardware/SyncFence.cs   |    15 +-
 .../Android/Hardware/TriggerEventListener.cs  |    62 +-
 .../Android/Hardware/Usb/UsbAccessory.cs      |    50 +-
 .../Android/Hardware/Usb/UsbConfiguration.cs  |    60 +-
 .../Android/Hardware/Usb/UsbDevice.cs         |   119 +-
 .../Hardware/Usb/UsbDeviceConnection.cs       |    45 +-
 .../Android/Hardware/Usb/UsbEndpoint.cs       |    55 +-
 .../Android/Hardware/Usb/UsbInterface.cs      |    67 +-
 .../Android/Hardware/Usb/UsbManager.cs        |    22 +-
 .../Android/Hardware/Usb/UsbRequest.cs        |    32 +-
 ...gregateRecordsGroupedByDurationResponse.cs |    28 +-
 ...AggregateRecordsGroupedByPeriodResponse.cs |    28 +-
 .../Health/Connect/AggregateRecordsRequest.cs |    42 +-
 .../Health/Connect/AllPackageClasses.cs       |    24 +-
 .../Changelog/ChangeLogTokenRequest.cs        |    23 +-
 .../Changelog/ChangeLogTokenResponse.cs       |    15 +-
 .../Connect/Changelog/ChangeLogsRequest.cs    |    22 +-
 .../Connect/Changelog/ChangeLogsResponse.cs   |    51 +-
 .../Datatypes/ActiveCaloriesBurnedRecord.cs   |     7 +-
 .../Connect/Datatypes/AllPackageClasses.cs    |    12 +-
 .../Health/Connect/Datatypes/AppInfo.cs       |    21 +-
 .../Datatypes/BasalBodyTemperatureRecord.cs   |    14 +-
 .../Datatypes/BasalMetabolicRateRecord.cs     |     7 +-
 .../Connect/Datatypes/BloodGlucoseRecord.cs   |    28 +-
 .../Connect/Datatypes/BloodPressureRecord.cs  |    28 +-
 .../Health/Connect/Datatypes/BodyFatRecord.cs |     7 +-
 .../Datatypes/BodyTemperatureRecord.cs        |    14 +-
 .../Connect/Datatypes/BodyWaterMassRecord.cs  |     7 +-
 .../Connect/Datatypes/BoneMassRecord.cs       |     7 +-
 .../Connect/Datatypes/CervicalMucusRecord.cs  |    14 +-
 .../Datatypes/CyclingPedalingCadenceRecord.cs |    21 +-
 .../Health/Connect/Datatypes/DataOrigin.cs    |     7 +-
 .../Health/Connect/Datatypes/Device.cs        |    21 +-
 .../Connect/Datatypes/DistanceRecord.cs       |     7 +-
 .../Datatypes/ElevationGainedRecord.cs        |     7 +-
 .../Health/Connect/Datatypes/ExerciseLap.cs   |    21 +-
 .../Health/Connect/Datatypes/ExerciseRoute.cs |    65 +-
 .../Connect/Datatypes/ExerciseSegment.cs      |    28 +-
 .../Datatypes/ExerciseSessionRecord.cs        |    50 +-
 .../Connect/Datatypes/FloorsClimbedRecord.cs  |     7 +-
 .../Connect/Datatypes/HeartRateRecord.cs      |    21 +-
 .../HeartRateVariabilityRmssdRecord.cs        |     7 +-
 .../Health/Connect/Datatypes/HeightRecord.cs  |     7 +-
 .../Connect/Datatypes/HydrationRecord.cs      |     7 +-
 .../Health/Connect/Datatypes/InstantRecord.cs |    14 +-
 .../Connect/Datatypes/IntervalRecord.cs       |    28 +-
 .../Connect/Datatypes/LeanBodyMassRecord.cs   |     7 +-
 .../Datatypes/MenstruationFlowRecord.cs       |     7 +-
 .../Health/Connect/Datatypes/Metadata.cs      |    49 +-
 .../Connect/Datatypes/NutritionRecord.cs      |   308 +-
 .../Connect/Datatypes/OvulationTestRecord.cs  |     7 +-
 .../Datatypes/OxygenSaturationRecord.cs       |     7 +-
 .../Health/Connect/Datatypes/PowerRecord.cs   |    21 +-
 .../Health/Connect/Datatypes/Record.cs        |     7 +-
 .../Datatypes/RespiratoryRateRecord.cs        |     7 +-
 .../Datatypes/RestingHeartRateRecord.cs       |     7 +-
 .../Connect/Datatypes/SexualActivityRecord.cs |     7 +-
 .../Connect/Datatypes/SleepSessionRecord.cs   |    42 +-
 .../Health/Connect/Datatypes/SpeedRecord.cs   |    21 +-
 .../Connect/Datatypes/StepsCadenceRecord.cs   |    21 +-
 .../Health/Connect/Datatypes/StepsRecord.cs   |     7 +-
 .../Datatypes/TotalCaloriesBurnedRecord.cs    |     7 +-
 .../Connect/Datatypes/Units/BloodGlucose.cs   |     7 +-
 .../Health/Connect/Datatypes/Units/Energy.cs  |     7 +-
 .../Health/Connect/Datatypes/Units/Length.cs  |     7 +-
 .../Health/Connect/Datatypes/Units/Mass.cs    |     7 +-
 .../Connect/Datatypes/Units/Percentage.cs     |     7 +-
 .../Health/Connect/Datatypes/Units/Power.cs   |     7 +-
 .../Connect/Datatypes/Units/Pressure.cs       |     7 +-
 .../Connect/Datatypes/Units/Temperature.cs    |     7 +-
 .../Connect/Datatypes/Units/Velocity.cs       |     7 +-
 .../Health/Connect/Datatypes/Units/Volume.cs  |     7 +-
 .../Health/Connect/Datatypes/Vo2MaxRecord.cs  |    14 +-
 .../Health/Connect/Datatypes/WeightRecord.cs  |     7 +-
 .../Datatypes/WheelchairPushesRecord.cs       |     7 +-
 .../Health/Connect/HealthConnectManager.cs    |    22 +-
 .../Health/Connect/InsertRecordsResponse.cs   |     7 +-
 .../Health/Connect/LocalTimeRangeFilter.cs    |    22 +-
 .../Health/Connect/ReadRecordsRequest.cs      |    14 +-
 .../Connect/ReadRecordsRequestUsingFilters.cs |    72 +-
 .../Connect/ReadRecordsRequestUsingIds.cs     |    14 +-
 .../Health/Connect/ReadRecordsResponse.cs     |    28 +-
 .../Android/Health/Connect/RecordIdFilter.cs  |    22 +-
 .../Health/Connect/TimeInstantRangeFilter.cs  |    22 +-
 .../Android/Icu/Lang/AllPackageClasses.cs     |    72 +-
 .../Generated/Android/Icu/Lang/UCharacter.cs  |    43 +-
 .../Generated/Android/Icu/Math/MathContext.cs |    28 +-
 .../Android/Icu/Number/AllPackageClasses.cs   |   210 +-
 .../Android/Icu/Number/FormattedNumber.cs     |    19 +-
 .../Icu/Number/FormattedNumberRange.cs        |    49 +-
 .../Icu/Number/NumberFormatterSettings.cs     |   345 +
 .../Number/NumberRangeFormatterSettings.cs    |   183 +
 .../Android/Icu/Text/AllPackageClasses.cs     |   120 +-
 .../Android/Icu/Text/AlphabeticIndex.cs       |   342 +-
 .../Generated/Android/Icu/Text/Bidi.cs        |   249 +-
 .../Android/Icu/Text/BidiClassifier.cs        |    23 +-
 .../Generated/Android/Icu/Text/BidiRun.cs     |    51 +-
 .../Android/Icu/Text/BreakIterator.cs         |   120 +-
 .../Generated/Android/Icu/Text/CaseMap.cs     |     8 +-
 .../Icu/Text/CollationElementIterator.cs      |    23 +-
 .../Android/Icu/Text/CollationKey.cs          |    15 +-
 .../Generated/Android/Icu/Text/Collator.cs    |   182 +-
 .../Icu/Text/ConstrainedFieldPosition.cs      |    55 +-
 .../Android/Icu/Text/CurrencyPluralInfo.cs    |    37 +-
 .../Generated/Android/Icu/Text/DateFormat.cs  |   143 +-
 .../Android/Icu/Text/DateFormatSymbols.cs     |   200 +-
 .../Android/Icu/Text/DateIntervalFormat.cs    |    65 +-
 .../Android/Icu/Text/DateIntervalInfo.cs      |    60 +-
 .../Icu/Text/DateTimePatternGenerator.cs      |    67 +-
 .../Android/Icu/Text/DecimalFormat.cs         |   398 +-
 .../Android/Icu/Text/DecimalFormatSymbols.cs  |   513 +-
 .../Generated/Android/Icu/Text/Edits.cs       |    40 +-
 .../Android/Icu/Text/FormattedValue.cs        |     4 +-
 .../Generated/Android/Icu/Text/IDNA.cs        |    15 +-
 .../Android/Icu/Text/ListFormatter.cs         |    11 +-
 .../Android/Icu/Text/LocaleDisplayNames.cs    |    24 +-
 .../Android/Icu/Text/MeasureFormat.cs         |    28 +-
 .../Android/Icu/Text/MessageFormat.cs         |    90 +-
 .../Android/Icu/Text/MessagePattern.cs        |    72 +-
 .../Generated/Android/Icu/Text/Normalizer2.cs |    49 +-
 .../Android/Icu/Text/NumberFormat.cs          |   211 +-
 .../Android/Icu/Text/NumberingSystem.cs       |    51 +-
 .../Generated/Android/Icu/Text/PluralRules.cs |    15 +-
 .../Icu/Text/RelativeDateTimeFormatter.cs     |    40 +-
 .../Android/Icu/Text/RuleBasedCollator.cs     |    38 +-
 .../Android/Icu/Text/SearchIterator.cs        |   105 +-
 .../Android/Icu/Text/SimpleDateFormat.cs      |    53 +-
 .../Android/Icu/Text/StringSearch.cs          |    38 +-
 .../Android/Icu/Text/TimeZoneFormat.cs        |    75 +-
 .../Android/Icu/Text/TimeZoneNames.cs         |    15 +-
 .../Android/Icu/Text/Transliterator.cs        |    95 +-
 .../Android/Icu/Text/UCharacterIterator.cs    |    58 +-
 .../Generated/Android/Icu/Text/UnicodeSet.cs  |    45 +-
 .../Android/Icu/Text/UnicodeSetIterator.cs    |   129 +
 .../Android/Icu/Text/UnicodeSetSpanner.cs     |     7 +-
 .../Android/Icu/Util/AllPackageClasses.cs     |    24 +-
 .../Generated/Android/Icu/Util/Calendar.cs    |   228 +-
 .../Generated/Android/Icu/Util/Currency.cs    |   115 +-
 .../Android/Icu/Util/CurrencyAmount.cs        |     7 +-
 .../Android/Icu/Util/DateInterval.cs          |    14 +-
 .../Android/Icu/Util/GregorianCalendar.cs     |    23 +-
 .../Android/Icu/Util/IslamicCalendar.cs       |     7 +-
 .../Generated/Android/Icu/Util/LocaleData.cs  |    51 +-
 .../Generated/Android/Icu/Util/Measure.cs     |    14 +-
 .../Generated/Android/Icu/Util/MeasureUnit.cs |   124 +-
 .../Generated/Android/Icu/Util/TimeZone.cs    |   113 +-
 .../Generated/Android/Icu/Util/ULocale.cs     |   372 +-
 .../Android/Icu/Util/UniversalTimeScale.cs    |     2 +-
 .../Generated/Android/Icu/Util/VersionInfo.cs |    44 +-
 .../AbstractInputMethodService.cs             |    15 +-
 .../Inputmethodservice/AllPackageClasses.cs   |    32 +-
 .../Inputmethodservice/InputMethodService.cs  |   185 +-
 .../Android/Inputmethodservice/Keyboard.cs    |   190 +-
 .../Inputmethodservice/KeyboardView.cs        |   124 +-
 .../Generated/Android/Location/Address.cs     |   288 +-
 .../Android/Location/AllPackageClasses.cs     |    88 +-
 .../Generated/Android/Location/Criteria.cs    |   188 +-
 .../Generated/Android/Location/Geocoder.cs    |    14 +-
 .../Android/Location/GnssAntennaInfo.cs       |   102 +-
 .../Location/GnssAutomaticGainControl.cs      |    29 +-
 .../Android/Location/GnssCapabilities.cs      |    17 +-
 .../Generated/Android/Location/GnssClock.cs   |   202 +-
 .../Android/Location/GnssMeasurement.cs       |   295 +-
 .../Location/GnssMeasurementRequest.cs        |    15 +-
 .../Android/Location/GnssMeasurementsEvent.cs |    47 +-
 .../Android/Location/GnssNavigationMessage.cs |    56 +-
 .../Android/Location/GnssSignalType.cs        |    29 +-
 .../Generated/Android/Location/GnssStatus.cs  |    15 +-
 .../Android/Location/GpsSatellite.cs          |    66 +-
 .../Generated/Android/Location/GpsStatus.cs   |    53 +-
 .../Generated/Android/Location/Location.cs    |   394 +-
 .../Android/Location/LocationListener.cs      |    30 +-
 .../Android/Location/LocationManager.cs       |   115 +-
 .../Android/Location/LocationProvider.cs      |    73 +-
 .../Android/Location/LocationRequest.cs       |    57 +-
 .../Android/Location/OnNmeaMessageListener.cs |     4 +-
 .../Location/Provider/ProviderProperties.cs   |    30 +-
 .../Netdroid/Generated/Android/Manifest.cs    |    20 +-
 .../Android/Media/AllPackageClasses.cs        |   624 +-
 .../Media/ApplicationMediaCapabilities.cs     |    60 +-
 .../Generated/Android/Media/AsyncPlayer.cs    |     2 +-
 .../Android/Media/AudioAttributes.cs          |    72 +-
 .../Android/Media/AudioDescriptor.cs          |    27 +-
 .../Android/Media/AudioDeviceInfo.cs          |   107 +-
 .../Android/Media/AudioFocusRequest.cs        |    22 +-
 .../Generated/Android/Media/AudioFormat.cs    |    60 +-
 .../Generated/Android/Media/AudioManager.cs   |   271 +-
 .../Generated/Android/Media/AudioMetadata.cs  |    28 +-
 .../Android/Media/AudioMixerAttributes.cs     |    20 +-
 .../AudioPlaybackCaptureConfiguration.cs      |    35 +-
 .../Media/AudioPlaybackConfiguration.cs       |    14 +-
 .../Android/Media/AudioPresentation.cs        |    67 +-
 .../Generated/Android/Media/AudioProfile.cs   |    41 +-
 .../Generated/Android/Media/AudioRecord.cs    |   213 +-
 .../Media/AudioRecordingConfiguration.cs      |    72 +-
 .../Android/Media/AudioRecordingMonitor.cs    |     7 +-
 .../Generated/Android/Media/AudioRouting.cs   |    18 +-
 .../Generated/Android/Media/AudioTrack.cs     |   350 +-
 .../Media/Audiofx/AllPackageClasses.cs        |    80 +-
 .../Android/Media/Audiofx/AudioEffect.cs      |    40 +-
 .../Android/Media/Audiofx/BassBoost.cs        |    42 +-
 .../Media/Audiofx/DynamicsProcessing.cs       |   458 +-
 .../Media/Audiofx/EnvironmentalReverb.cs      |   235 +-
 .../Android/Media/Audiofx/Equalizer.cs        |    97 +-
 .../Android/Media/Audiofx/LoudnessEnhancer.cs |    21 +-
 .../Android/Media/Audiofx/PresetReverb.cs     |    46 +-
 .../Android/Media/Audiofx/Virtualizer.cs      |    75 +-
 .../Android/Media/Audiofx/Visualizer.cs       |    77 +-
 .../Android/Media/Browse/AllPackageClasses.cs |     8 +-
 .../Android/Media/Browse/MediaBrowser.cs      |    73 +-
 .../Android/Media/CamcorderProfile.cs         |     4 +-
 .../Generated/Android/Media/DrmInitData.cs    |    17 +-
 .../Android/Media/Effect/AllPackageClasses.cs |    14 +-
 .../Generated/Android/Media/Effect/Effect.cs  |     7 +-
 .../Android/Media/Effect/EffectContext.cs     |     7 +-
 .../Media/Effect/EffectUpdateListener.cs      |     4 +-
 .../Android/Media/EncoderProfiles.cs          |   140 +-
 .../Generated/Android/Media/ExifInterface.cs  |   120 +-
 .../Netdroid/Generated/Android/Media/Image.cs |   124 +-
 .../Generated/Android/Media/ImageReader.cs    |    76 +-
 .../Generated/Android/Media/ImageWriter.cs    |    61 +-
 .../Generated/Android/Media/JetPlayer.cs      |    30 +-
 .../Generated/Android/Media/MediaCas.cs       |    37 +-
 .../Generated/Android/Media/MediaCodec.cs     |   236 +-
 .../Generated/Android/Media/MediaCodecInfo.cs |   255 +-
 .../Generated/Android/Media/MediaCodecList.cs |    26 +-
 .../Media/MediaCommunicationManager.cs        |    14 +-
 .../Android/Media/MediaController2.cs         |     7 +-
 .../Android/Media/MediaDataSource.cs          |    16 +-
 .../Android/Media/MediaDescription.cs         |    64 +-
 .../Generated/Android/Media/MediaDrm.cs       |   293 +-
 .../Android/Media/MediaDrmThrowable.cs        |    21 +-
 .../Generated/Android/Media/MediaExtractor.cs |   169 +-
 .../Generated/Android/Media/MediaFormat.cs    |    32 +-
 .../Generated/Android/Media/MediaMetadata.cs  |    30 +-
 .../Android/Media/MediaMetadataEditor.cs      |    47 +-
 .../Android/Media/MediaMetadataRetriever.cs   |    67 +-
 .../Generated/Android/Media/MediaParser.cs    |    83 +-
 .../Generated/Android/Media/MediaPlayer.cs    |   301 +-
 .../Generated/Android/Media/MediaRecorder.cs  |   109 +-
 .../Android/Media/MediaRoute2Info.cs          |   107 +-
 .../Media/MediaRoute2ProviderService.cs       |    15 +-
 .../Generated/Android/Media/MediaRouter.cs    |   236 +-
 .../Generated/Android/Media/MediaRouter2.cs   |   128 +-
 .../Android/Media/MediaScannerConnection.cs   |     4 +-
 .../Generated/Android/Media/MediaSession2.cs  |    65 +-
 .../Android/Media/MediaSession2Service.cs     |    29 +-
 .../Generated/Android/Media/MediaSync.cs      |    41 +-
 .../Generated/Android/Media/MediaSyncEvent.cs |    30 +-
 .../Generated/Android/Media/MediaTimestamp.cs |    30 +-
 .../Media/Metrics/AllPackageClasses.cs        |     4 +-
 .../Android/Media/Metrics/BundleSession.cs    |     7 +-
 .../Android/Media/Metrics/EditingSession.cs   |     7 +-
 .../Generated/Android/Media/Metrics/Event.cs  |    14 +-
 .../Android/Media/Metrics/LogSessionId.cs     |     7 +-
 .../Android/Media/Metrics/NetworkEvent.cs     |    13 +-
 .../Media/Metrics/PlaybackErrorEvent.cs       |    20 +-
 .../Android/Media/Metrics/PlaybackMetrics.cs  |   127 +-
 .../Android/Media/Metrics/PlaybackSession.cs  |     7 +-
 .../Media/Metrics/PlaybackStateEvent.cs       |    13 +-
 .../Android/Media/Metrics/RecordingSession.cs |     7 +-
 .../Android/Media/Metrics/TrackChangeEvent.cs |   106 +-
 .../Media/Metrics/TranscodingSession.cs       |     7 +-
 .../Generated/Android/Media/MicrophoneInfo.cs |   105 +-
 .../Android/Media/Midi/AllPackageClasses.cs   |    22 +-
 .../Android/Media/Midi/MidiDevice.cs          |    15 +-
 .../Android/Media/Midi/MidiDeviceInfo.cs      |    84 +-
 .../Android/Media/Midi/MidiDeviceService.cs   |    20 +-
 .../Android/Media/Midi/MidiDeviceStatus.cs    |     7 +-
 .../Android/Media/Midi/MidiInputPort.cs       |     7 +-
 .../Android/Media/Midi/MidiManager.cs         |    15 +-
 .../Android/Media/Midi/MidiOutputPort.cs      |     7 +-
 .../Android/Media/Midi/MidiReceiver.cs        |    15 +-
 .../Generated/Android/Media/PlaybackParams.cs |    45 +-
 .../Media/Projection/AllPackageClasses.cs     |     4 +-
 .../Generated/Android/Media/Rating.cs         |    45 +-
 .../Android/Media/RemoteControlClient.cs      |    99 +-
 .../Android/Media/RemoteController.cs         |    77 +-
 .../Generated/Android/Media/Ringtone.cs       |    65 +-
 .../Android/Media/RingtoneManager.cs          |    35 +-
 .../Android/Media/RouteDiscoveryPreference.cs |    15 +-
 .../Android/Media/RouteListingPreference.cs   |    72 +-
 .../Android/Media/RoutingSessionInfo.cs       |    85 +-
 .../Media/Session/AllPackageClasses.cs        |    38 +-
 .../Android/Media/Session/MediaController.cs  |   158 +-
 .../Android/Media/Session/MediaSession.cs     |    49 +-
 .../Media/Session/MediaSessionManager.cs      |    72 +-
 .../Android/Media/Session/PlaybackState.cs    |   122 +-
 .../Android/Media/Session2Command.cs          |    43 +-
 .../Android/Media/Session2CommandGroup.cs     |    15 +-
 .../Generated/Android/Media/Session2Token.cs  |    43 +-
 .../Generated/Android/Media/SoundPool.cs      |     6 +-
 .../Generated/Android/Media/Spatializer.cs    |    27 +-
 .../Generated/Android/Media/SubtitleData.cs   |    28 +-
 .../Generated/Android/Media/SyncParams.cs     |    60 +-
 .../Generated/Android/Media/ThumbnailUtils.cs |     6 +-
 .../Generated/Android/Media/TimedMetaData.cs  |    14 +-
 .../Generated/Android/Media/TimedText.cs      |    14 +-
 .../Generated/Android/Media/ToneGenerator.cs  |    15 +-
 .../Generated/Android/Media/Tv/AdBuffer.cs    |    57 +-
 .../Generated/Android/Media/Tv/AdRequest.cs   |    71 +-
 .../Generated/Android/Media/Tv/AdResponse.cs  |    29 +-
 .../Generated/Android/Media/Tv/AitInfo.cs     |    20 +-
 .../Android/Media/Tv/AllPackageClasses.cs     |    54 +-
 .../Android/Media/Tv/BroadcastInfoRequest.cs  |    27 +-
 .../Android/Media/Tv/BroadcastInfoResponse.cs |    34 +-
 .../Android/Media/Tv/CommandRequest.cs        |    28 +-
 .../Android/Media/Tv/CommandResponse.cs       |    14 +-
 .../Android/Media/Tv/DsmccRequest.cs          |     7 +-
 .../Android/Media/Tv/DsmccResponse.cs         |    35 +-
 .../Media/Tv/Interactive/AllPackageClasses.cs |    26 +-
 .../Media/Tv/Interactive/AppLinkInfo.cs       |    14 +-
 .../Tv/Interactive/TvInteractiveAppManager.cs |    14 +-
 .../TvInteractiveAppServiceInfo.cs            |    36 +-
 .../Tv/Interactive/TvInteractiveAppView.cs    |    19 +-
 .../Generated/Android/Media/Tv/PesRequest.cs  |    14 +-
 .../Generated/Android/Media/Tv/PesResponse.cs |     7 +-
 .../Android/Media/Tv/SectionRequest.cs        |    21 +-
 .../Android/Media/Tv/SectionResponse.cs       |    21 +-
 .../Android/Media/Tv/StreamEventRequest.cs    |    14 +-
 .../Android/Media/Tv/StreamEventResponse.cs   |    21 +-
 .../Android/Media/Tv/TableRequest.cs          |    21 +-
 .../Android/Media/Tv/TableResponse.cs         |    37 +-
 .../Android/Media/Tv/TimelineRequest.cs       |    14 +-
 .../Android/Media/Tv/TimelineResponse.cs      |    35 +-
 .../Generated/Android/Media/Tv/TsRequest.cs   |     7 +-
 .../Generated/Android/Media/Tv/TsResponse.cs  |     7 +-
 .../Android/Media/Tv/TvContentRating.cs       |    46 +-
 .../Generated/Android/Media/Tv/TvContract.cs  |     4 +-
 .../Generated/Android/Media/Tv/TvInputInfo.cs |    92 +-
 .../Android/Media/Tv/TvInputManager.cs        |    30 +-
 .../Android/Media/Tv/TvInputService.cs        |     7 +-
 .../Android/Media/Tv/TvRecordingInfo.cs       |   122 +-
 .../Generated/Android/Media/Tv/TvTrackInfo.cs |   131 +-
 .../Generated/Android/Media/Tv/TvView.cs      |    19 +-
 .../Generated/Android/Media/VolumeProvider.cs |    36 +-
 .../Generated/Android/Media/VolumeShaper.cs   |    50 +-
 .../Generated/Android/Mtp/MtpDevice.cs        |    52 +-
 .../Generated/Android/Mtp/MtpDeviceInfo.cs    |    62 +-
 .../Generated/Android/Mtp/MtpEvent.cs         |    70 +-
 .../Generated/Android/Mtp/MtpObjectInfo.cs    |   196 +-
 .../Generated/Android/Mtp/MtpStorageInfo.cs   |    35 +-
 .../Android/Net/AllPackageClasses.cs          |    54 +-
 .../Net/ConnectivityDiagnosticsManager.cs     |    93 +-
 .../Android/Net/ConnectivityManager.cs        |   216 +-
 .../Generated/Android/Net/Credentials.cs      |    21 +-
 .../Generated/Android/Net/DnsResolver.cs      |    11 +-
 .../Android/Net/Eap/AllPackageClasses.cs      |     8 +-
 .../Generated/Android/Net/Eap/EapAkaInfo.cs   |     7 +-
 .../Generated/Android/Net/Eap/EapInfo.cs      |     7 +-
 .../Android/Net/Eap/EapSessionConfig.cs       |   134 +-
 .../Android/Net/EthernetNetworkSpecifier.cs   |    15 +-
 .../Android/Net/Http/AllPackageClasses.cs     |    54 +-
 .../Android/Net/Http/BidirectionalStream.cs   |    67 +-
 .../Net/Http/ConnectionMigrationOptions.cs    |    21 +-
 .../Generated/Android/Net/Http/DnsOptions.cs  |    70 +-
 .../Generated/Android/Net/Http/HeaderBlock.cs |    14 +-
 .../Generated/Android/Net/Http/HttpEngine.cs  |    22 +-
 .../Android/Net/Http/HttpResponseCache.cs     |    28 +-
 .../Generated/Android/Net/Http/QuicOptions.cs |    36 +-
 .../Android/Net/Http/SslCertificate.cs        |    85 +-
 .../Generated/Android/Net/Http/SslError.cs    |    43 +-
 .../Android/Net/Http/UploadDataProvider.cs    |     8 +-
 .../Generated/Android/Net/Http/UrlRequest.cs  |    71 +-
 .../Android/Net/Http/UrlResponseInfo.cs       |    57 +-
 .../Generated/Android/Net/Ikev2VpnProfile.cs  |   116 +-
 .../Generated/Android/Net/IpConfiguration.cs  |    14 +-
 .../Generated/Android/Net/IpPrefix.cs         |    39 +-
 .../Generated/Android/Net/IpSecAlgorithm.cs   |    36 +-
 .../Generated/Android/Net/IpSecManager.cs     |    21 +-
 .../Net/Ipsec/Ike/AllPackageClasses.cs        |    52 +-
 .../Android/Net/Ipsec/Ike/ChildSaProposal.cs  |    14 +-
 .../Ipsec/Ike/ChildSessionConfiguration.cs    |    14 +-
 .../Net/Ipsec/Ike/ChildSessionParams.cs       |    35 +-
 .../Android/Net/Ipsec/Ike/IkeSaProposal.cs    |    28 +-
 .../Net/Ipsec/Ike/IkeSessionConfiguration.cs  |    38 +-
 .../Net/Ipsec/Ike/IkeSessionConnectionInfo.cs |    21 +-
 .../Android/Net/Ipsec/Ike/IkeSessionParams.cs |   136 +-
 .../Ipsec/Ike/IkeTunnelConnectionParams.cs    |    14 +-
 .../Android/Net/Ipsec/Ike/SaProposal.cs       |    28 +-
 .../Ipsec/Ike/TunnelModeChildSessionParams.cs |    28 +-
 .../Generated/Android/Net/LinkAddress.cs      |    36 +-
 .../Generated/Android/Net/LinkProperties.cs   |   168 +-
 .../Android/Net/LocalServerSocket.cs          |    24 +-
 .../Generated/Android/Net/LocalSocket.cs      |   128 +-
 .../Android/Net/LocalSocketAddress.cs         |    14 +-
 .../Generated/Android/Net/MacAddress.cs       |    30 +-
 .../Netdroid/Generated/Android/Net/MailTo.cs  |    35 +-
 .../Netdroid/Generated/Android/Net/Network.cs |    30 +-
 .../Android/Net/NetworkCapabilities.cs        |    92 +-
 .../Generated/Android/Net/NetworkInfo.cs      |   178 +-
 .../Generated/Android/Net/NetworkRequest.cs   |    39 +-
 .../Android/Net/Nsd/AllPackageClasses.cs      |    34 +-
 .../Generated/Android/Net/Nsd/NsdManager.cs   |    60 +-
 .../Android/Net/Nsd/NsdServiceInfo.cs         |   108 +-
 .../Android/Net/PlatformVpnProfile.cs         |    30 +-
 .../Netdroid/Generated/Android/Net/Proxy.cs   |    30 +-
 .../Generated/Android/Net/ProxyInfo.cs        |    44 +-
 .../Generated/Android/Net/RouteInfo.cs        |    52 +-
 .../Android/Net/Rtp/AllPackageClasses.cs      |     8 +-
 .../Generated/Android/Net/Rtp/AudioCodec.cs   |    35 +-
 .../Generated/Android/Net/Rtp/AudioGroup.cs   |    41 +-
 .../Generated/Android/Net/Rtp/AudioStream.cs  |    49 +-
 .../Generated/Android/Net/Rtp/RtpStream.cs    |    74 +-
 .../Net/SSLCertificateSocketFactory.cs        |    20 +-
 .../Android/Net/Sip/AllPackageClasses.cs      |    98 +-
 .../Generated/Android/Net/Sip/SipAudioCall.cs |   382 +-
 .../Generated/Android/Net/Sip/SipErrorCode.cs |    28 +-
 .../Generated/Android/Net/Sip/SipManager.cs   |    46 +-
 .../Generated/Android/Net/Sip/SipProfile.cs   |   150 +-
 .../Net/Sip/SipRegistrationListener.cs        |    24 +-
 .../Generated/Android/Net/Sip/SipSession.cs   |   465 +-
 .../Android/Net/StaticIpConfiguration.cs      |    36 +-
 .../Android/Net/TelephonyNetworkSpecifier.cs  |    13 +-
 .../Generated/Android/Net/TrafficStats.cs     |   128 +-
 src/net/Netdroid/Generated/Android/Net/Uri.cs |   158 +-
 .../Android/Net/UrlQuerySanitizer.cs          |   158 +-
 .../Android/Net/Vcn/AllPackageClasses.cs      |     8 +-
 .../Vcn/VcnCellUnderlyingNetworkTemplate.cs   |    70 +-
 .../Generated/Android/Net/Vcn/VcnConfig.cs    |    22 +-
 .../Net/Vcn/VcnGatewayConnectionConfig.cs     |    52 +-
 .../Generated/Android/Net/Vcn/VcnManager.cs   |     7 +-
 .../Net/Vcn/VcnUnderlyingNetworkTemplate.cs   |    35 +-
 .../Vcn/VcnWifiUnderlyingNetworkTemplate.cs   |     7 +-
 .../Generated/Android/Net/VpnManager.cs       |    17 +-
 .../Generated/Android/Net/VpnProfileState.cs  |    30 +-
 .../Android/Net/Wifi/AllPackageClasses.cs     |    64 +-
 .../Net/Wifi/Aware/AllPackageClasses.cs       |    33 +-
 .../Net/Wifi/Aware/AwarePairingConfig.cs      |    15 +-
 .../Android/Net/Wifi/Aware/AwareResources.cs  |    27 +-
 .../Android/Net/Wifi/Aware/Characteristics.cs |    93 +-
 .../Net/Wifi/Aware/DiscoverySession.cs        |     4 +-
 .../Net/Wifi/Aware/IdentityChangedListener.cs |    91 +-
 .../Android/Net/Wifi/Aware/PublishConfig.cs   |    29 +-
 .../Net/Wifi/Aware/ServiceDiscoveryInfo.cs    |    49 +-
 .../Android/Net/Wifi/Aware/SubscribeConfig.cs |    22 +-
 .../Net/Wifi/Aware/WifiAwareChannelInfo.cs    |    27 +-
 .../Aware/WifiAwareDataPathSecurityConfig.cs  |    36 +-
 .../Net/Wifi/Aware/WifiAwareManager.cs        |    14 +-
 .../Net/Wifi/Aware/WifiAwareNetworkInfo.cs    |    36 +-
 .../Wifi/Aware/WifiAwareNetworkSpecifier.cs   |    22 +-
 .../Net/Wifi/Aware/WifiAwareSession.cs        |     4 +-
 .../Wifi/Hotspot2/PasspointConfiguration.cs   |    75 +-
 .../Net/Wifi/Hotspot2/Pps/Credential.cs       |   257 +-
 .../Android/Net/Wifi/Hotspot2/Pps/HomeSp.cs   |    98 +-
 .../Generated/Android/Net/Wifi/MloLink.cs     |    69 +-
 .../Android/Net/Wifi/P2p/AllPackageClasses.cs |   140 +-
 .../Android/Net/Wifi/P2p/WifiP2pConfig.cs     |    43 +-
 .../Android/Net/Wifi/P2p/WifiP2pDevice.cs     |    22 +-
 .../Android/Net/Wifi/P2p/WifiP2pDeviceList.cs |    15 +-
 .../Android/Net/Wifi/P2p/WifiP2pGroup.cs      |    65 +-
 .../Android/Net/Wifi/P2p/WifiP2pManager.cs    |    79 +-
 .../Android/Net/Wifi/P2p/WifiP2pWfdInfo.cs    |   106 +-
 .../Android/Net/Wifi/Rtt/AllPackageClasses.cs |     4 +-
 .../Android/Net/Wifi/Rtt/RangingRequest.cs    |    41 +-
 .../Android/Net/Wifi/Rtt/RangingResult.cs     |   100 +-
 .../Android/Net/Wifi/Rtt/ResponderConfig.cs   |    63 +-
 .../Android/Net/Wifi/Rtt/ResponderLocation.cs |   167 +-
 .../Android/Net/Wifi/Rtt/WifiRttManager.cs    |     7 +-
 .../Generated/Android/Net/Wifi/ScanResult.cs  |   108 +-
 .../Android/Net/Wifi/SoftApConfiguration.cs   |    53 +-
 .../Android/Net/Wifi/WifiAvailableChannel.cs  |    20 +-
 .../Android/Net/Wifi/WifiConfiguration.cs     |   264 +-
 .../Android/Net/Wifi/WifiEnterpriseConfig.cs  |   298 +-
 .../Generated/Android/Net/Wifi/WifiInfo.cs    |   212 +-
 .../Generated/Android/Net/Wifi/WifiManager.cs |   290 +-
 .../Android/Net/Wifi/WifiNetworkSpecifier.cs  |    32 +-
 .../Android/Net/Wifi/WifiNetworkSuggestion.cs |   127 +-
 .../Generated/Android/Net/Wifi/WifiSsid.cs    |     7 +-
 .../Android/Nfc/AllPackageClasses.cs          |   101 +-
 .../Android/Nfc/AvailableNfcAntenna.cs        |    20 +-
 .../Nfc/Cardemulation/AllPackageClasses.cs    |    12 +-
 .../Nfc/Cardemulation/CardEmulation.cs        |    45 +-
 .../Generated/Android/Nfc/NdefMessage.cs      |    22 +-
 .../Generated/Android/Nfc/NdefRecord.cs       |    48 +-
 .../Generated/Android/Nfc/NfcAdapter.cs       |   488 +-
 .../Generated/Android/Nfc/NfcAntennaInfo.cs   |    37 +-
 .../Generated/Android/Nfc/NfcManager.cs       |     7 +-
 src/net/Netdroid/Generated/Android/Nfc/Tag.cs |    22 +-
 .../Android/Nfc/Tech/AllPackageClasses.cs     |     4 +-
 .../Generated/Android/Nfc/Tech/IsoDep.cs      |    71 +-
 .../Android/Nfc/Tech/MifareClassic.cs         |   105 +-
 .../Android/Nfc/Tech/MifareUltralight.cs      |    60 +-
 .../Generated/Android/Nfc/Tech/Ndef.cs        |    53 +-
 .../Android/Nfc/Tech/NdefFormatable.cs        |     7 +-
 .../Generated/Android/Nfc/Tech/NfcA.cs        |    63 +-
 .../Generated/Android/Nfc/Tech/NfcB.cs        |    44 +-
 .../Generated/Android/Nfc/Tech/NfcBarcode.cs  |    29 +-
 .../Generated/Android/Nfc/Tech/NfcF.cs        |    63 +-
 .../Generated/Android/Nfc/Tech/NfcV.cs        |    44 +-
 .../Android/Nfc/Tech/TagTechnology.cs         |     7 +-
 .../Android/Opengl/AllPackageClasses.cs       |    32 +-
 .../Generated/Android/Opengl/EGL14.cs         |     2 +-
 .../Android/Opengl/EGLObjectHandle.cs         |    16 +-
 .../Generated/Android/Opengl/ETC1Util.cs      |    21 +-
 .../Generated/Android/Opengl/GLES20.cs        |     2 +-
 .../Generated/Android/Opengl/GLES30.cs        |     2 +-
 .../Generated/Android/Opengl/GLSurfaceView.cs |    47 +-
 .../Generated/Android/Opengl/Matrix.cs        |     2 +-
 .../Generated/Android/Os/AllPackageClasses.cs |   194 +-
 .../Generated/Android/Os/AsyncTask.cs         |    76 +-
 .../Generated/Android/Os/BaseBundle.cs        |     2 +-
 .../Netdroid/Generated/Android/Os/Binder.cs   |    50 +-
 .../Netdroid/Generated/Android/Os/Build.cs    |    52 +-
 .../Netdroid/Generated/Android/Os/Bundle.cs   |    99 +-
 .../Android/Os/CancellationSignal.cs          |     4 +-
 .../Generated/Android/Os/CpuUsageInfo.cs      |    22 +-
 .../Netdroid/Generated/Android/Os/Debug.cs    |   406 +-
 .../Generated/Android/Os/DropBoxManager.cs    |    45 +-
 .../Generated/Android/Os/Environment.cs       |    92 +-
 .../Generated/Android/Os/Ext/SdkExtensions.cs |    15 +-
 .../Generated/Android/Os/FileObserver.cs      |     4 +-
 .../Generated/Android/Os/FileUtils.cs         |     8 +-
 .../Netdroid/Generated/Android/Os/Handler.cs  |    17 +-
 .../Generated/Android/Os/HandlerThread.cs     |    22 +-
 .../Android/Os/HardwarePropertiesManager.cs   |    22 +-
 .../Android/Os/Health/HealthStats.cs          |    90 +-
 .../Generated/Android/Os/Health/TimerStat.cs  |    38 +-
 .../Android/Os/Health/UidHealthStats.cs       |     2 +-
 .../Netdroid/Generated/Android/Os/IBinder.cs  |    23 +-
 .../Generated/Android/Os/LocaleList.cs        |    37 +-
 .../Netdroid/Generated/Android/Os/Looper.cs   |    31 +-
 .../Generated/Android/Os/MemoryFile.cs        |    34 +-
 .../Netdroid/Generated/Android/Os/Message.cs  |    68 +-
 .../Generated/Android/Os/MessageQueue.cs      |     4 +-
 .../Generated/Android/Os/Messenger.cs         |     7 +-
 .../Netdroid/Generated/Android/Os/Parcel.cs   |   416 +-
 .../Android/Os/ParcelFileDescriptor.cs        |    53 +-
 .../Generated/Android/Os/ParcelUuid.cs        |    15 +-
 .../Generated/Android/Os/PatternMatcher.cs    |    24 +-
 .../Android/Os/PerformanceHintManager.cs      |    15 +-
 .../Generated/Android/Os/PowerManager.cs      |    63 +-
 .../Netdroid/Generated/Android/Os/Process.cs  |    92 +-
 .../Android/Os/ProxyFileDescriptorCallback.cs |     8 +-
 .../Generated/Android/Os/RecoverySystem.cs    |     4 +-
 .../Android/Os/RemoteCallbackList.cs          |    30 +-
 .../Generated/Android/Os/SharedMemory.cs      |    23 +-
 .../Netdroid/Generated/Android/Os/StatFs.cs   |    85 +-
 .../Android/Os/Storage/AllPackageClasses.cs   |    35 +-
 .../Os/Storage/OnObbStateChangeListener.cs    |    99 +-
 .../Android/Os/Storage/StorageManager.cs      |    60 +-
 .../Android/Os/Storage/StorageVolume.cs       |    92 +-
 .../Generated/Android/Os/StrictMode.cs        |    36 +-
 .../Generated/Android/Os/TestLooperManager.cs |    15 +-
 .../Generated/Android/Os/UserManager.cs       |    80 +-
 .../Android/Os/VibrationAttributes.cs         |    37 +-
 .../Netdroid/Generated/Android/Os/Vibrator.cs |    55 +-
 .../Generated/Android/Os/VibratorManager.cs   |    22 +-
 .../Android/Preference/AllPackageClasses.cs   |   126 +-
 .../Android/Preference/CheckBoxPreference.cs  |     8 +-
 .../Android/Preference/DialogPreference.cs    |   106 +-
 .../Android/Preference/EditTextPreference.cs  |    35 +-
 .../Android/Preference/ListPreference.cs      |    75 +-
 .../Preference/MultiSelectListPreference.cs   |    64 +-
 .../Android/Preference/Preference.cs          |   462 +-
 .../Android/Preference/PreferenceActivity.cs  |   151 +-
 .../Android/Preference/PreferenceCategory.cs  |     8 +-
 .../Android/Preference/PreferenceDataStore.cs |    24 +-
 .../Android/Preference/PreferenceFragment.cs  |    47 +-
 .../Android/Preference/PreferenceGroup.cs     |    39 +-
 .../Android/Preference/PreferenceManager.cs   |   135 +-
 .../Android/Preference/PreferenceScreen.cs    |    33 +-
 .../Android/Preference/RingtonePreference.cs  |    72 +-
 .../Android/Preference/SwitchPreference.cs    |    34 +-
 .../Android/Preference/TwoStatePreference.cs  |    64 +-
 .../Android/Print/AllPackageClasses.cs        |    79 +-
 .../Generated/Android/Print/PageRange.cs      |    20 +-
 .../Android/Print/Pdf/PrintedPdfDocument.cs   |    31 +-
 .../Android/Print/PrintAttributes.cs          |   142 +-
 .../Android/Print/PrintDocumentAdapter.cs     |   153 +-
 .../Android/Print/PrintDocumentInfo.cs        |    36 +-
 .../Generated/Android/Print/PrintJob.cs       |    14 +-
 .../Generated/Android/Print/PrintJobInfo.cs   |    88 +-
 .../Generated/Android/Print/PrintManager.cs   |    15 +-
 .../Android/Print/PrinterCapabilitiesInfo.cs  |    50 +-
 .../Generated/Android/Print/PrinterId.cs      |    15 +-
 .../Generated/Android/Print/PrinterInfo.cs    |    43 +-
 .../Android/Printservice/AllPackageClasses.cs |     8 +-
 .../Android/Printservice/PrintDocument.cs     |    14 +-
 .../Android/Printservice/PrintJob.cs          |    36 +-
 .../Android/Printservice/PrintService.cs      |    15 +-
 .../Printservice/PrinterDiscoverySession.cs   |    30 +-
 .../Android/Provider/AllPackageClasses.cs     |   210 +-
 .../Generated/Android/Provider/Contacts.cs    |   432 +-
 .../Android/Provider/ContactsContract.cs      |    74 +-
 .../Android/Provider/DocumentsContract.cs     |    22 +-
 .../Generated/Android/Provider/FontRequest.cs |    40 +-
 .../Android/Provider/FontsContract.cs         |   123 +-
 .../Generated/Android/Provider/LiveFolders.cs |    26 +-
 .../Generated/Android/Provider/MediaStore.cs  |   198 +-
 .../Generated/Android/Provider/Settings.cs    |   262 +-
 .../Generated/Android/Provider/Telephony.cs   |    14 +-
 .../Android/Provider/UserDictionary.cs        |     6 +-
 src/net/Netdroid/Generated/Android/R.cs       | 17824 ++++++++++++++++
 .../Android/Renderscript/AllPackageClasses.cs |   193 +-
 .../Android/Renderscript/Allocation.cs        |   271 +-
 .../Android/Renderscript/AllocationAdapter.cs |  3251 +--
 .../Generated/Android/Renderscript/BaseObj.cs |    20 +-
 .../Generated/Android/Renderscript/Byte2.cs   |     6 +-
 .../Generated/Android/Renderscript/Byte3.cs   |     8 +-
 .../Generated/Android/Renderscript/Byte4.cs   |    10 +-
 .../Generated/Android/Renderscript/Double2.cs |     6 +-
 .../Generated/Android/Renderscript/Double3.cs |     8 +-
 .../Generated/Android/Renderscript/Double4.cs |    10 +-
 .../Generated/Android/Renderscript/Element.cs |   313 +-
 .../Android/Renderscript/FieldPacker.cs       |   177 +-
 .../Generated/Android/Renderscript/Float2.cs  |     6 +-
 .../Generated/Android/Renderscript/Float3.cs  |     8 +-
 .../Generated/Android/Renderscript/Float4.cs  |    10 +-
 .../Generated/Android/Renderscript/Int2.cs    |     6 +-
 .../Generated/Android/Renderscript/Int3.cs    |     8 +-
 .../Generated/Android/Renderscript/Int4.cs    |    10 +-
 .../Generated/Android/Renderscript/Long2.cs   |     6 +-
 .../Generated/Android/Renderscript/Long3.cs   |     8 +-
 .../Generated/Android/Renderscript/Long4.cs   |    10 +-
 .../Android/Renderscript/Matrix2f.cs          |    41 +-
 .../Android/Renderscript/Matrix3f.cs          |    53 +-
 .../Android/Renderscript/Matrix4f.cs          |    59 +-
 .../Android/Renderscript/RenderScript.cs      |   102 +-
 .../Generated/Android/Renderscript/Sampler.cs |    91 +-
 .../Generated/Android/Renderscript/Script.cs  |   157 +-
 .../Android/Renderscript/ScriptGroup.cs       |    49 +-
 .../Renderscript/ScriptIntrinsic3DLUT.cs      |    17 +-
 .../Renderscript/ScriptIntrinsicBLAS.cs       |   214 +-
 .../Renderscript/ScriptIntrinsicBlend.cs      |   197 +-
 .../Renderscript/ScriptIntrinsicBlur.cs       |    28 +-
 .../ScriptIntrinsicColorMatrix.cs             |    31 +-
 .../ScriptIntrinsicConvolve3x3.cs             |    28 +-
 .../ScriptIntrinsicConvolve5x5.cs             |    28 +-
 .../Renderscript/ScriptIntrinsicHistogram.cs  |    32 +-
 .../Renderscript/ScriptIntrinsicLUT.cs        |    23 +-
 .../Renderscript/ScriptIntrinsicResize.cs     |    26 +-
 .../Renderscript/ScriptIntrinsicYuvToRGB.cs   |    24 +-
 .../Generated/Android/Renderscript/Short2.cs  |     6 +-
 .../Generated/Android/Renderscript/Short3.cs  |     8 +-
 .../Generated/Android/Renderscript/Short4.cs  |    10 +-
 .../Generated/Android/Renderscript/Type.cs    |   114 +-
 .../Android/Sax/AllPackageClasses.cs          |    50 +-
 .../Generated/Android/Sax/ElementListener.cs  |     8 +-
 .../Android/Sax/EndElementListener.cs         |     4 +-
 .../Android/Sax/EndTextElementListener.cs     |     4 +-
 .../Generated/Android/Sax/RootElement.cs      |     7 +-
 .../Android/Sax/StartElementListener.cs       |     4 +-
 .../Android/Sax/TextElementListener.cs        |     8 +-
 .../Android/Se/Omapi/AllPackageClasses.cs     |    10 +-
 .../Generated/Android/Se/Omapi/Channel.cs     |    22 +-
 .../Generated/Android/Se/Omapi/Reader.cs      |    22 +-
 .../Generated/Android/Se/Omapi/SEService.cs   |    34 +-
 .../Generated/Android/Se/Omapi/Session.cs     |    30 +-
 .../Android/Security/AllPackageClasses.cs     |    16 +-
 .../Security/AppUriAuthenticationPolicy.cs    |    15 +-
 .../Android/Security/AttestedKeyPair.cs       |    14 +-
 .../Identity/AccessControlProfileId.cs        |     7 +-
 .../Security/Identity/AllPackageClasses.cs    |    30 +-
 .../Identity/AuthenticationKeyMetadata.cs     |    14 +-
 .../Identity/CredentialDataRequest.cs         |    52 +-
 .../Security/Identity/CredentialDataResult.cs |    57 +-
 .../Security/Identity/IdentityCredential.cs   |    80 +-
 .../Identity/IdentityCredentialStore.cs       |    17 +-
 .../Security/Identity/PresentationSession.cs  |    15 +-
 .../Android/Security/Identity/ResultData.cs   |    76 +-
 .../Generated/Android/Security/KeyChain.cs    |     4 +-
 .../Android/Security/KeyPairGeneratorSpec.cs  |   113 +-
 .../Android/Security/KeyStoreParameter.cs     |     8 +-
 .../Security/Keystore/AllPackageClasses.cs    |     4 +-
 .../Security/Keystore/KeyGenParameterSpec.cs  |   222 +-
 .../Android/Security/Keystore/KeyInfo.cs      |   163 +-
 .../Security/Keystore/KeyProperties.cs        |     2 +-
 .../Security/Keystore/KeyProtection.cs        |   143 +-
 .../Security/Keystore/WrappedKeyEntry.cs      |    28 +-
 .../Android/Security/NetworkSecurityPolicy.cs |     7 +-
 .../Classification/FieldClassification.cs     |    22 +-
 .../Service/Autofill/AllPackageClasses.cs     |    24 +-
 .../Service/Autofill/AutofillService.cs       |    15 +-
 .../Android/Service/Autofill/Dataset.cs       |    22 +-
 .../Android/Service/Autofill/Field.cs         |    21 +-
 .../Service/Autofill/FieldClassification.cs   |    21 +-
 .../Android/Service/Autofill/FillContext.cs   |    27 +-
 .../Service/Autofill/FillEventHistory.cs      |    94 +-
 .../Android/Service/Autofill/FillRequest.cs   |    57 +-
 .../Android/Service/Autofill/FillResponse.cs  |     6 +-
 .../Service/Autofill/ImageTransformation.cs   |     4 +-
 .../Service/Autofill/InlinePresentation.cs    |    14 +-
 .../Android/Service/Autofill/Presentations.cs |    28 +-
 .../Android/Service/Autofill/SaveRequest.cs   |    29 +-
 .../Service/Autofill/SavedDatasetsInfo.cs     |    14 +-
 .../Android/Service/Autofill/UserData.cs      |    65 +-
 .../Service/Carrier/AllPackageClasses.cs      |    16 +-
 .../Service/Carrier/CarrierIdentifier.cs      |    64 +-
 .../Carrier/CarrierMessagingService.cs        |    50 +-
 .../Android/Service/Carrier/CarrierService.cs |     4 +-
 .../Android/Service/Carrier/MessagePdu.cs     |    15 +-
 .../Service/Chooser/AllPackageClasses.cs      |     8 +-
 .../Android/Service/Chooser/ChooserAction.cs  |    29 +-
 .../Android/Service/Chooser/ChooserTarget.cs  |    61 +-
 .../Service/Chooser/ChooserTargetService.cs   |     8 +-
 .../Controls/Actions/AllPackageClasses.cs     |     4 +-
 .../Service/Controls/Actions/BooleanAction.cs |     7 +-
 .../Service/Controls/Actions/ControlAction.cs |    28 +-
 .../Service/Controls/Actions/FloatAction.cs   |     7 +-
 .../Service/Controls/Actions/ModeAction.cs    |     7 +-
 .../Service/Controls/AllPackageClasses.cs     |     4 +-
 .../Android/Service/Controls/Control.cs       |   100 +-
 .../Controls/Templates/AllPackageClasses.cs   |     4 +-
 .../Controls/Templates/ControlButton.cs       |    15 +-
 .../Controls/Templates/ControlTemplate.cs     |    28 +-
 .../Controls/Templates/RangeTemplate.cs       |    35 +-
 .../Templates/TemperatureControlTemplate.cs   |    28 +-
 .../Controls/Templates/ThumbnailTemplate.cs   |    22 +-
 .../Controls/Templates/ToggleRangeTemplate.cs |    22 +-
 .../Controls/Templates/ToggleTemplate.cs      |    15 +-
 .../Android/Service/Credentials/Action.cs     |     7 +-
 .../Service/Credentials/AllPackageClasses.cs  |     4 +-
 .../BeginCreateCredentialRequest.cs           |    29 +-
 .../BeginCreateCredentialResponse.cs          |    22 +-
 .../Credentials/BeginGetCredentialOption.cs   |    29 +-
 .../Credentials/BeginGetCredentialRequest.cs  |    22 +-
 .../Credentials/BeginGetCredentialResponse.cs |    36 +-
 .../Service/Credentials/CallingAppInfo.cs     |    29 +-
 .../ClearCredentialStateRequest.cs            |    14 +-
 .../Credentials/CreateCredentialRequest.cs    |    29 +-
 .../Service/Credentials/CreateEntry.cs        |     7 +-
 .../Service/Credentials/CredentialEntry.cs    |    29 +-
 .../Credentials/GetCredentialRequest.cs       |    22 +-
 .../Service/Credentials/RemoteEntry.cs        |     7 +-
 .../Android/Service/Dreams/DreamService.cs    |    38 +-
 .../Service/Media/AllPackageClasses.cs        |     8 +-
 .../Service/Media/MediaBrowserService.cs      |    67 +-
 .../Service/Notification/AllPackageClasses.cs |    10 +-
 .../Notification/ConditionProviderService.cs  |    26 +-
 .../NotificationListenerService.cs            |   205 +-
 .../Notification/StatusBarNotification.cs     |   144 +-
 .../Android/Service/Notification/ZenPolicy.cs |   139 +-
 .../Quickaccesswallet/AllPackageClasses.cs    |     8 +-
 .../Quickaccesswallet/GetWalletCardsError.cs  |    22 +-
 .../GetWalletCardsRequest.cs                  |    34 +-
 .../GetWalletCardsResponse.cs                 |    22 +-
 .../QuickAccessWalletService.cs               |    15 +-
 .../SelectWalletCardRequest.cs                |    15 +-
 .../Service/Quickaccesswallet/WalletCard.cs   |    71 +-
 .../Quickaccesswallet/WalletServiceEvent.cs   |    13 +-
 .../Android/Service/Quicksettings/Tile.cs     |   113 +-
 .../Service/Quicksettings/TileService.cs      |     9 +-
 .../Service/Restrictions/AllPackageClasses.cs |     4 +-
 .../Service/Textservice/AllPackageClasses.cs  |     8 +-
 .../Textservice/SpellCheckerService.cs        |    45 +-
 .../Service/Voice/AllPackageClasses.cs        |     8 +-
 .../Service/Voice/VisibleActivityInfo.cs      |     7 +-
 .../Service/Voice/VoiceInteractionService.cs  |    23 +-
 .../Service/Voice/VoiceInteractionSession.cs  |   220 +-
 .../Android/Service/Vr/AllPackageClasses.cs   |     4 +-
 .../Service/Wallpaper/AllPackageClasses.cs    |     4 +-
 .../Service/Wallpaper/WallpaperService.cs     |    75 +-
 .../Android/Speech/AllPackageClasses.cs       |    28 +-
 .../Android/Speech/AlternativeSpan.cs         |    29 +-
 .../Android/Speech/AlternativeSpans.cs        |    15 +-
 .../Android/Speech/ModelDownloadListener.cs   |    16 +-
 .../Android/Speech/RecognitionListener.cs     |    48 +-
 .../Android/Speech/RecognitionPart.cs         |    36 +-
 .../Android/Speech/RecognitionService.cs      |    21 +-
 .../Android/Speech/RecognitionSupport.cs      |    36 +-
 .../Android/Speech/RecognizerIntent.cs        |     2 +-
 .../Android/Speech/Tts/AllPackageClasses.cs   |    65 +-
 .../Android/Speech/Tts/SynthesisCallback.cs   |    15 +-
 .../Android/Speech/Tts/SynthesisRequest.cs    |    72 +-
 .../Android/Speech/Tts/TextToSpeech.cs        |   165 +-
 .../Speech/Tts/UtteranceProgressListener.cs   |   242 +-
 .../Generated/Android/Speech/Tts/Voice.cs     |    51 +-
 .../{SystemNs => System}/AllPackageClasses.cs |     4 +-
 .../{SystemNs => System}/ErrnoException.cs    |     2 +-
 .../Android/{SystemNs => System}/Int64Ref.cs  |     2 +-
 .../Android/{SystemNs => System}/Os.cs        |   377 +-
 .../{SystemNs => System}/OsConstants.cs       |     2 +-
 .../{SystemNs => System}/StructCmsghdr.cs     |     2 +-
 .../{SystemNs => System}/StructMsghdr.cs      |     8 +-
 .../{SystemNs => System}/StructPollfd.cs      |     2 +-
 .../{SystemNs => System}/StructStat.cs        |    22 +-
 .../{SystemNs => System}/StructStatVfs.cs     |     2 +-
 .../{SystemNs => System}/StructTimespec.cs    |     6 +-
 .../{SystemNs => System}/StructTimeval.cs     |     8 +-
 .../{SystemNs => System}/StructUtsname.cs     |     2 +-
 .../{SystemNs => System}/SystemCleaner.cs     |     2 +-
 .../{SystemNs => System}/VmSocketAddress.cs   |    16 +-
 .../Android/Telecom/AllPackageClasses.cs      |    64 +-
 .../Generated/Android/Telecom/Call.cs         |   249 +-
 .../Android/Telecom/CallAttributes.cs         |    50 +-
 .../Android/Telecom/CallAudioState.cs         |    44 +-
 .../Generated/Android/Telecom/CallControl.cs  |     7 +-
 .../Generated/Android/Telecom/CallEndpoint.cs |    29 +-
 .../Android/Telecom/CallScreeningService.cs   |    42 +-
 .../Generated/Android/Telecom/Conference.cs   |   193 +-
 .../Generated/Android/Telecom/Connection.cs   |   208 +-
 .../Android/Telecom/ConnectionRequest.cs      |    58 +-
 .../Android/Telecom/ConnectionService.cs      |    30 +-
 .../Android/Telecom/DisconnectCause.cs        |    43 +-
 .../Generated/Android/Telecom/GatewayInfo.cs  |    29 +-
 .../Android/Telecom/InCallService.cs          |    37 +-
 .../Generated/Android/Telecom/PhoneAccount.cs |   114 +-
 .../Android/Telecom/PhoneAccountHandle.cs     |    29 +-
 .../Android/Telecom/PhoneAccountSuggestion.cs |    22 +-
 .../Android/Telecom/RemoteConference.cs       |    49 +-
 .../Android/Telecom/RemoteConnection.cs       |   114 +-
 .../Generated/Android/Telecom/StatusHints.cs  |    29 +-
 .../Android/Telecom/TelecomManager.cs         |   115 +-
 .../Generated/Android/Telecom/VideoProfile.cs |    55 +-
 .../Android/Telephony/AllPackageClasses.cs    |   361 +-
 .../Android/Telephony/AvailableNetworkInfo.cs |    43 +-
 .../Android/Telephony/BarringInfo.cs          |    43 +-
 .../Android/Telephony/CarrierConfigManager.cs |    41 +-
 .../Telephony/Cdma/AllPackageClasses.cs       |     2 +-
 .../Telephony/Cdma/CdmaCellLocation.cs        |    57 +-
 .../Android/Telephony/CellIdentity.cs         |    22 +-
 .../Android/Telephony/CellIdentityCdma.cs     |    35 +-
 .../Android/Telephony/CellIdentityGsm.cs      |    83 +-
 .../Android/Telephony/CellIdentityLte.cs      |    95 +-
 .../Android/Telephony/CellIdentityNr.cs       |    56 +-
 .../Android/Telephony/CellIdentityTdscdma.cs  |    63 +-
 .../Android/Telephony/CellIdentityWcdma.cs    |    81 +-
 .../Generated/Android/Telephony/CellInfo.cs   |    61 +-
 .../Android/Telephony/CellLocation.cs         |    11 +-
 .../Android/Telephony/CellSignalStrength.cs   |    21 +-
 .../Telephony/CellSignalStrengthCdma.cs       |    55 +-
 .../Telephony/CellSignalStrengthGsm.cs        |    27 +-
 .../Telephony/CellSignalStrengthLte.cs        |    55 +-
 .../Android/Telephony/CellSignalStrengthNr.cs |    71 +-
 .../Telephony/CellSignalStrengthTdscdma.cs    |    13 +-
 .../Telephony/CellSignalStrengthWcdma.cs      |    13 +-
 .../Telephony/ClosedSubscriberGroupInfo.cs    |    29 +-
 .../Android/Telephony/Data/ApnSetting.cs      |   193 +-
 .../Telephony/Data/NetworkSliceInfo.cs        |    41 +-
 .../Telephony/Data/NetworkSlicingConfig.cs    |    22 +-
 .../Data/RouteSelectionDescriptor.cs          |    43 +-
 .../Telephony/Data/TrafficDescriptor.cs       |    22 +-
 .../Android/Telephony/Data/UrspRule.cs        |    29 +-
 .../Telephony/Emergency/EmergencyNumber.cs    |    97 +-
 .../Euicc/DownloadableSubscription.cs         |    22 +-
 .../Android/Telephony/Euicc/EuiccInfo.cs      |    15 +-
 .../Android/Telephony/Euicc/EuiccManager.cs   |    22 +-
 .../Telephony/Gsm/AllPackageClasses.cs        |    10 +-
 .../Android/Telephony/Gsm/GsmCellLocation.cs  |    35 +-
 .../Android/Telephony/Gsm/SmsManager.cs       |    35 +-
 .../Android/Telephony/Gsm/SmsMessage.cs       |   264 +-
 .../IccOpenLogicalChannelResponse.cs          |    27 +-
 .../Telephony/Ims/AllPackageClasses.cs        |    45 +-
 .../Android/Telephony/Ims/ImsMmTelManager.cs  |    15 +-
 .../Android/Telephony/Ims/ImsRcsManager.cs    |     7 +-
 .../Android/Telephony/Ims/ImsReasonInfo.cs    |    29 +-
 .../Ims/ImsRegistrationAttributes.cs          |    36 +-
 .../Android/Telephony/Ims/RcsUceAdapter.cs    |    64 +-
 .../Telephony/Ims/RegistrationManager.cs      |     4 +-
 .../Android/Telephony/Ims/SipDetails.cs       |    57 +-
 .../Telephony/Mbms/AllPackageClasses.cs       |    74 +-
 .../Mbms/DownloadProgressListener.cs          |    67 +-
 .../Android/Telephony/Mbms/DownloadRequest.cs |    58 +-
 .../Telephony/Mbms/DownloadStatusListener.cs  |    64 +-
 .../Android/Telephony/Mbms/FileInfo.cs        |    22 +-
 .../Android/Telephony/Mbms/FileServiceInfo.cs |    15 +-
 .../Android/Telephony/Mbms/GroupCall.cs       |     7 +-
 .../Android/Telephony/Mbms/ServiceInfo.cs     |    52 +-
 .../Telephony/Mbms/StreamingService.cs        |    14 +-
 .../Android/Telephony/MbmsDownloadSession.cs  |    30 +-
 .../Android/Telephony/NeighboringCellInfo.cs  |    85 +-
 .../Telephony/NetworkRegistrationInfo.cs      |    88 +-
 .../Android/Telephony/NetworkScanRequest.cs   |    57 +-
 .../Android/Telephony/PhoneNumberUtils.cs     |    33 +-
 .../Android/Telephony/PhoneStateListener.cs   |   654 +-
 .../Telephony/PhysicalChannelConfig.cs        |    82 +-
 .../Telephony/PreciseDataConnectionState.cs   |    55 +-
 .../Android/Telephony/RadioAccessSpecifier.cs |    27 +-
 .../Android/Telephony/ServiceState.cs         |   126 +-
 .../Android/Telephony/SignalStrength.cs       |   114 +-
 .../Telephony/SignalStrengthUpdateRequest.cs  |    15 +-
 .../Android/Telephony/SignalThresholdInfo.cs  |    48 +-
 .../Generated/Android/Telephony/SmsManager.cs |    78 +-
 .../Generated/Android/Telephony/SmsMessage.cs |   196 +-
 .../Android/Telephony/SubscriptionInfo.cs     |   173 +-
 .../Android/Telephony/SubscriptionManager.cs  |   296 +-
 .../Android/Telephony/SubscriptionPlan.cs     |    57 +-
 .../Android/Telephony/TelephonyCallback.cs    |    84 +-
 .../Android/Telephony/TelephonyDisplayInfo.cs |    30 +-
 .../Android/Telephony/TelephonyManager.cs     |   905 +-
 .../Android/Telephony/UiccCardInfo.cs         |    78 +-
 .../Android/Telephony/UiccPortInfo.cs         |    37 +-
 .../Android/Telephony/VisualVoicemailSms.cs   |    36 +-
 .../Android/Text/AllPackageClasses.cs         |    98 +-
 .../Android/Text/AlteredCharSequence.cs       |    10 +-
 .../Android/Text/AndroidCharacter.cs          |    22 +-
 .../Generated/Android/Text/Annotation.cs      |    29 +-
 .../Generated/Android/Text/BidiFormatter.cs   |    14 +-
 .../Android/Text/ClipboardManager.cs          |    28 +-
 .../Generated/Android/Text/DynamicLayout.cs   |     6 +-
 .../Generated/Android/Text/Editable.cs        |    30 +-
 .../Android/Text/EmojiConsistency.cs          |     7 +-
 .../Android/Text/Format/AllPackageClasses.cs  |     2 +-
 .../Android/Text/Format/DateUtils.cs          |    42 +-
 .../Android/Text/Format/Formatter.cs          |     2 +-
 .../Generated/Android/Text/Format/Time.cs     |   146 +-
 .../Generated/Android/Text/Highlights.cs      |    15 +-
 .../Netdroid/Generated/Android/Text/Html.cs   |     6 +-
 .../Generated/Android/Text/InputFilter.cs     |     7 +-
 .../Netdroid/Generated/Android/Text/Layout.cs |   165 +-
 .../Generated/Android/Text/LoginFilter.cs     |    16 +-
 .../Android/Text/Method/AllPackageClasses.cs  |   295 +-
 .../Text/Method/ArrowKeyMovementMethod.cs     |     7 +-
 .../Android/Text/Method/BaseKeyListener.cs    |   317 +-
 .../Android/Text/Method/DateKeyListener.cs    |   708 +-
 .../Text/Method/DateTimeKeyListener.cs        |   708 +-
 .../Android/Text/Method/DialerKeyListener.cs  |   679 +-
 .../Android/Text/Method/DigitsKeyListener.cs  |   734 +-
 .../Method/HideReturnsTransformationMethod.cs |     7 +-
 .../Android/Text/Method/KeyListener.cs        |    35 +-
 .../Android/Text/Method/MetaKeyKeyListener.cs |   452 +-
 .../Text/Method/MultiTapKeyListener.cs        |   337 +-
 .../Android/Text/Method/NumberKeyListener.cs  |   321 +-
 .../Method/PasswordTransformationMethod.cs    |     7 +-
 .../Android/Text/Method/QwertyKeyListener.cs  |   674 +-
 .../Text/Method/ScrollingMovementMethod.cs    |     7 +-
 .../Method/SingleLineTransformationMethod.cs  |     7 +-
 .../Android/Text/Method/TextKeyListener.cs    |   389 +-
 .../Android/Text/Method/TimeKeyListener.cs    |   708 +-
 .../Generated/Android/Text/ParcelableSpan.cs  |     7 +-
 .../Generated/Android/Text/PrecomputedText.cs |    65 +-
 .../Generated/Android/Text/Spannable.cs       |     7 +-
 .../Android/Text/SpannableStringBuilder.cs    |    40 +-
 .../Generated/Android/Text/StaticLayout.cs    |     6 +-
 .../Android/Text/Style/AbsoluteSizeSpan.cs    |    27 +-
 .../Android/Text/Style/AlignmentSpan.cs       |    27 +-
 .../Android/Text/Style/AllPackageClasses.cs   |   858 +-
 .../Android/Text/Style/BackgroundColorSpan.cs |    20 +-
 .../Android/Text/Style/BulletSpan.cs          |    42 +-
 .../Android/Text/Style/CharacterStyle.cs      |    15 +-
 .../Android/Text/Style/DrawableMarginSpan.cs  |    22 +-
 .../Android/Text/Style/DynamicDrawableSpan.cs |    14 +-
 .../Android/Text/Style/EasyEditSpan.cs        |    13 +-
 .../Android/Text/Style/ForegroundColorSpan.cs |    20 +-
 .../Android/Text/Style/IconMarginSpan.cs      |    22 +-
 .../Generated/Android/Text/Style/ImageSpan.cs |    11 +-
 .../Android/Text/Style/LeadingMarginSpan.cs   |    22 +-
 .../Android/Text/Style/LineBackgroundSpan.cs  |    20 +-
 .../Android/Text/Style/LineHeightSpan.cs      |    20 +-
 .../Android/Text/Style/LocaleSpan.cs          |    29 +-
 .../Android/Text/Style/MaskFilterSpan.cs      |     7 +-
 .../Generated/Android/Text/Style/QuoteSpan.cs |    42 +-
 .../Android/Text/Style/RelativeSizeSpan.cs    |    20 +-
 .../Android/Text/Style/ReplacementSpan.cs     |    23 +-
 .../Android/Text/Style/ScaleXSpan.cs          |    20 +-
 .../Android/Text/Style/StrikethroughSpan.cs   |    13 +-
 .../Generated/Android/Text/Style/StyleSpan.cs |    27 +-
 .../Android/Text/Style/SubscriptSpan.cs       |    13 +-
 .../Android/Text/Style/SuggestionRangeSpan.cs |    28 +-
 .../Android/Text/Style/SuggestionSpan.cs      |    68 +-
 .../Android/Text/Style/SuperscriptSpan.cs     |    13 +-
 .../Android/Text/Style/TabStopSpan.cs         |    14 +-
 .../Android/Text/Style/TextAppearanceSpan.cs  |   128 +-
 .../Generated/Android/Text/Style/TtsSpan.cs   |  1877 ++
 .../Android/Text/Style/TypefaceSpan.cs        |    29 +-
 .../Generated/Android/Text/Style/URLSpan.cs   |    22 +-
 .../Android/Text/Style/UnderlineSpan.cs       |    13 +-
 .../Generated/Android/Text/TextUtils.cs       |     6 +-
 .../Android/Text/Util/AllPackageClasses.cs    |     8 +-
 .../Generated/Android/Text/Util/Linkify.cs    |     4 +-
 .../Android/Text/Util/Rfc822Token.cs          |    45 +-
 .../Android/Transition/AllPackageClasses.cs   |    44 +-
 .../Generated/Android/Transition/ArcMotion.cs |    45 +-
 .../Android/Transition/ChangeBounds.cs        |    17 +-
 .../Android/Transition/ChangeTransform.cs     |    30 +-
 .../Android/Transition/PatternPathMotion.cs   |    15 +-
 .../Generated/Android/Transition/Scene.cs     |     9 +-
 .../Generated/Android/Transition/Slide.cs     |    15 +-
 .../Android/Transition/Transition.cs          |   231 +-
 .../Transition/TransitionListenerAdapter.cs   |    20 +-
 .../Transition/TransitionPropagation.cs       |     7 +-
 .../Android/Transition/TransitionSet.cs       |    30 +-
 .../Android/Transition/Visibility.cs          |    23 +-
 .../Android/Util/AllPackageClasses.cs         |   110 +-
 .../Generated/Android/Util/ArrayMap.cs        |     8 +-
 .../Generated/Android/Util/ArraySet.cs        |    10 +-
 .../Generated/Android/Util/AtomicFile.cs      |    30 +-
 .../Generated/Android/Util/AttributeSet.cs    |    75 +-
 .../Netdroid/Generated/Android/Util/Config.cs |    10 +-
 .../Generated/Android/Util/DisplayMetrics.cs  |     2 +-
 .../Generated/Android/Util/Dumpable.cs        |    15 +-
 .../Generated/Android/Util/EventLog.cs        |    35 +-
 .../Generated/Android/Util/EventLogTags.cs    |    10 +-
 .../Android/Util/MonthDisplayHelper.cs        |    78 +-
 .../Generated/Android/Util/MutableBoolean.cs  |     4 +-
 .../Generated/Android/Util/MutableByte.cs     |     4 +-
 .../Generated/Android/Util/MutableChar.cs     |     4 +-
 .../Generated/Android/Util/MutableDouble.cs   |     4 +-
 .../Generated/Android/Util/MutableFloat.cs    |     4 +-
 .../Generated/Android/Util/MutableInt.cs      |     4 +-
 .../Generated/Android/Util/MutableLong.cs     |     4 +-
 .../Generated/Android/Util/MutableShort.cs    |     4 +-
 .../Generated/Android/Util/Patterns.cs        |    10 +-
 .../Generated/Android/Util/Property.cs        |    60 +-
 .../Android/Util/Proto/ProtoOutputStream.cs   |    14 +-
 .../Generated/Android/Util/Rational.cs        |    30 +-
 .../Netdroid/Generated/Android/Util/Size.cs   |    14 +-
 .../Netdroid/Generated/Android/Util/SizeF.cs  |    14 +-
 .../Generated/Android/Util/TimeUtils.cs       |    15 +-
 .../Generated/Android/Util/TimingLogger.cs    |    10 +-
 .../Generated/Android/Util/TypedValue.cs      |   493 +
 .../Generated/Android/View/AbsSavedState.cs   |     7 +-
 .../View/Accessibility/AccessibilityEvent.cs  |   151 +-
 .../Accessibility/AccessibilityManager.cs     |    78 +-
 .../Accessibility/AccessibilityNodeInfo.cs    |   908 +-
 .../View/Accessibility/AccessibilityRecord.cs |   332 +-
 .../AccessibilityRequestPreparer.cs           |    15 +-
 .../Accessibility/AccessibilityWindowInfo.cs  |   137 +-
 .../View/Accessibility/AllPackageClasses.cs   |    87 +-
 .../View/Accessibility/CaptioningManager.cs   |   226 +-
 .../Generated/Android/View/ActionMode.cs      |   112 +-
 .../Generated/Android/View/ActionProvider.cs  |     6 +-
 .../Android/View/AllPackageClasses.cs         |   697 +-
 .../View/Animation/AllPackageClasses.cs       |    22 +-
 .../Android/View/Animation/Animation.cs       |   277 +-
 .../Android/View/Animation/AnimationSet.cs    |     7 +-
 .../GridLayoutAnimationController.cs          |    60 +-
 .../Animation/LayoutAnimationController.cs    |    76 +-
 .../Android/View/Animation/Transformation.cs  |    37 +-
 .../Android/View/AttachedSurfaceControl.cs    |    19 +-
 .../View/Autofill/AllPackageClasses.cs        |     4 +-
 .../Android/View/Autofill/AutofillManager.cs  |    74 +-
 .../Android/View/Autofill/AutofillValue.cs    |    52 +-
 .../View/Autofill/VirtualViewFillInfo.cs      |     7 +-
 .../Generated/Android/View/Choreographer.cs   |    49 +-
 .../Generated/Android/View/ContentInfo.cs     |    41 +-
 .../View/Contentcapture/AllPackageClasses.cs  |    14 +-
 .../Contentcapture/ContentCaptureCondition.cs |    20 +-
 .../Contentcapture/ContentCaptureContext.cs   |    14 +-
 .../Contentcapture/ContentCaptureManager.cs   |    22 +-
 .../Contentcapture/ContentCaptureSession.cs   |    38 +-
 .../View/Contentcapture/DataRemovalRequest.cs |    44 +-
 .../View/Contentcapture/DataShareRequest.cs   |    29 +-
 .../Contentcapture/DataShareWriteAdapter.cs   |    12 +-
 .../Generated/Android/View/Display.cs         |   301 +-
 .../Generated/Android/View/DisplayCutout.cs   |    79 +-
 .../Generated/Android/View/DisplayShape.cs    |     7 +-
 .../View/Displayhash/AllPackageClasses.cs     |     4 +-
 .../View/Displayhash/DisplayHashManager.cs    |    15 +-
 .../View/Displayhash/VerifiedDisplayHash.cs   |    36 +-
 .../Generated/Android/View/DragEvent.cs       |    57 +-
 .../Generated/Android/View/FocusFinder.cs     |     7 +-
 .../Generated/Android/View/FrameStats.cs      |    36 +-
 .../Generated/Android/View/GestureDetector.cs |    84 +-
 .../Android/View/HapticFeedbackConstants.cs   |     2 +-
 .../Generated/Android/View/InputDevice.cs     |   286 +-
 .../Generated/Android/View/InputEvent.cs      |    36 +-
 .../View/Inputmethod/AllPackageClasses.cs     |    28 +-
 .../View/Inputmethod/BaseInputConnection.cs   |    14 +-
 .../View/Inputmethod/CompletionInfo.cs        |    36 +-
 .../View/Inputmethod/CorrectionInfo.cs        |    29 +-
 .../View/Inputmethod/CursorAnchorInfo.cs      |   119 +-
 .../Android/View/Inputmethod/DeleteGesture.cs |    20 +-
 .../View/Inputmethod/DeleteRangeGesture.cs    |    27 +-
 .../View/Inputmethod/EditorBoundsInfo.cs      |    14 +-
 .../Android/View/Inputmethod/EditorInfo.cs    |    73 +-
 .../View/Inputmethod/HandwritingGesture.cs    |     7 +-
 .../View/Inputmethod/InlineSuggestion.cs      |     7 +-
 .../View/Inputmethod/InlineSuggestionInfo.cs  |    44 +-
 .../Inputmethod/InlineSuggestionsRequest.cs   |    50 +-
 .../Inputmethod/InlineSuggestionsResponse.cs  |    15 +-
 .../Android/View/Inputmethod/InputBinding.cs  |    34 +-
 .../View/Inputmethod/InputConnection.cs       |     7 +-
 .../Inputmethod/InputConnectionWrapper.cs     |     7 +-
 .../View/Inputmethod/InputContentInfo.cs      |    21 +-
 .../View/Inputmethod/InputMethodInfo.cs       |   127 +-
 .../View/Inputmethod/InputMethodManager.cs    |   100 +-
 .../View/Inputmethod/InputMethodSession.cs    |     2 +-
 .../View/Inputmethod/InputMethodSubtype.cs    |   133 +-
 .../Android/View/Inputmethod/InsertGesture.cs |    22 +-
 .../View/Inputmethod/InsertModeGesture.cs     |    14 +-
 .../View/Inputmethod/JoinOrSplitGesture.cs    |     7 +-
 .../View/Inputmethod/RemoveSpaceGesture.cs    |    14 +-
 .../Android/View/Inputmethod/SelectGesture.cs |    20 +-
 .../View/Inputmethod/SelectRangeGesture.cs    |    27 +-
 .../View/Inputmethod/SurroundingText.cs       |    36 +-
 .../View/Inputmethod/TextAppearanceInfo.cs    |   165 +-
 .../Android/View/Inputmethod/TextAttribute.cs |    22 +-
 .../View/Inputmethod/TextBoundsInfo.cs        |    51 +-
 .../View/Inputmethod/TextBoundsInfoResult.cs  |    14 +-
 .../Android/View/Inputmethod/TextSnapshot.cs  |    42 +-
 .../View/Inspector/AllPackageClasses.cs       |    20 +-
 .../Android/View/Inspector/WindowInspector.cs |     7 +-
 .../Generated/Android/View/KeyCharacterMap.cs |    42 +-
 .../Generated/Android/View/KeyEvent.cs        |   239 +-
 .../Android/View/KeyboardShortcutGroup.cs     |    22 +-
 .../Android/View/KeyboardShortcutInfo.cs      |    36 +-
 .../Generated/Android/View/LayoutInflater.cs  |    54 +-
 .../Generated/Android/View/MenuItem.cs        |   280 +-
 .../Generated/Android/View/MotionEvent.cs     |   426 +-
 .../Android/View/OnReceiveContentListener.cs  |     4 +-
 .../Android/View/OrientationEventListener.cs  |   140 +-
 .../Android/View/OrientationListener.cs       |    40 +-
 .../Generated/Android/View/PixelCopy.cs       |    32 +-
 .../Generated/Android/View/RoundedCorner.cs   |    27 +-
 .../Android/View/ScaleGestureDetector.cs      |   135 +-
 .../Android/View/ScrollCaptureSession.cs      |    21 +-
 .../Android/View/ScrollCaptureTarget.cs       |    50 +-
 .../Generated/Android/View/SearchEvent.cs     |     7 +-
 .../Generated/Android/View/SubMenu.cs         |     7 +-
 .../Generated/Android/View/Surface.cs         |     2 +-
 .../Generated/Android/View/SurfaceControl.cs  |     6 +-
 .../Android/View/SurfaceControlViewHost.cs    |    21 +-
 .../Generated/Android/View/SurfaceHolder.cs   |    40 +-
 .../Generated/Android/View/SurfaceView.cs     |    21 +-
 .../View/Textclassifier/AllPackageClasses.cs  |    22 +-
 .../View/Textclassifier/ConversationAction.cs |    43 +-
 .../Textclassifier/ConversationActions.cs     |   108 +-
 .../View/Textclassifier/SelectionEvent.cs     |   120 +-
 .../View/Textclassifier/TextClassification.cs |   171 +-
 .../TextClassificationContext.cs              |    29 +-
 .../TextClassificationManager.cs              |    23 +-
 .../TextClassificationSessionId.cs            |    15 +-
 .../View/Textclassifier/TextClassifier.cs     |    36 +-
 .../Textclassifier/TextClassifierEvent.cs     |   113 +-
 .../View/Textclassifier/TextLanguage.cs       |    74 +-
 .../Android/View/Textclassifier/TextLinks.cs  |   138 +-
 .../View/Textclassifier/TextSelection.cs      |   124 +-
 .../View/Textservice/AllPackageClasses.cs     |    10 +-
 .../Textservice/SentenceSuggestionsInfo.cs    |    15 +-
 .../View/Textservice/SpellCheckerInfo.cs      |    74 +-
 .../View/Textservice/SpellCheckerSession.cs   |    48 +-
 .../View/Textservice/SpellCheckerSubtype.cs   |    64 +-
 .../View/Textservice/SuggestionsInfo.cs       |    34 +-
 .../Android/View/Textservice/TextInfo.cs      |    36 +-
 .../View/Textservice/TextServicesManager.cs   |    22 +-
 .../Generated/Android/View/TextureView.cs     |    69 +-
 .../Generated/Android/View/TouchDelegate.cs   |     7 +-
 .../View/Translation/AllPackageClasses.cs     |     8 +-
 .../View/Translation/TranslationCapability.cs |    42 +-
 .../View/Translation/TranslationContext.cs    |    27 +-
 .../View/Translation/TranslationManager.cs    |     7 +-
 .../View/Translation/TranslationRequest.cs    |    29 +-
 .../Translation/TranslationRequestValue.cs    |    15 +-
 .../View/Translation/TranslationResponse.cs   |    29 +-
 .../Translation/TranslationResponseValue.cs   |    36 +-
 .../View/Translation/TranslationSpec.cs       |    20 +-
 .../Translation/ViewTranslationRequest.cs     |    22 +-
 .../Translation/ViewTranslationResponse.cs    |    22 +-
 .../Generated/Android/View/VelocityTracker.cs |    30 +-
 .../Android/View/VerifiedInputEvent.cs        |    36 +-
 .../Android/View/VerifiedKeyEvent.cs          |    50 +-
 .../Android/View/VerifiedMotionEvent.cs       |    50 +-
 .../Netdroid/Generated/Android/View/View.cs   |  3552 +--
 .../Android/View/ViewConfiguration.cs         |   364 +-
 .../Generated/Android/View/ViewDebug.cs       |    44 +-
 .../Generated/Android/View/ViewGroup.cs       |   338 +-
 .../Generated/Android/View/ViewParent.cs      |    79 +-
 .../Android/View/ViewPropertyAnimator.cs      |    37 +-
 .../Generated/Android/View/ViewStructure.cs   |   135 +-
 .../Generated/Android/View/ViewStub.cs        |    57 +-
 .../Android/View/ViewTreeObserver.cs          |    42 +-
 .../Netdroid/Generated/Android/View/Window.cs |   703 +-
 .../Android/View/WindowAnimationFrameStats.cs |     6 +-
 .../Generated/Android/View/WindowInsets.cs    |   246 +-
 .../Android/View/WindowInsetsAnimation.cs     |    87 +-
 .../WindowInsetsAnimationControlListener.cs   |    12 +-
 .../View/WindowInsetsAnimationController.cs   |    58 +-
 .../Android/View/WindowInsetsController.cs    |    30 +-
 .../Generated/Android/View/WindowManager.cs   |   196 +-
 .../Generated/Android/View/WindowMetrics.cs   |    23 +-
 .../Android/Webkit/AllPackageClasses.cs       |   166 +-
 .../Android/Webkit/ClientCertRequest.cs       |    28 +-
 .../Generated/Android/Webkit/CookieManager.cs |    15 +-
 .../Android/Webkit/CookieSyncManager.cs       |    29 +-
 .../Android/Webkit/DownloadListener.cs        |     4 +-
 .../Android/Webkit/GeolocationPermissions.cs  |     7 +-
 .../Generated/Android/Webkit/MimeTypeMap.cs   |     7 +-
 .../Android/Webkit/PermissionRequest.cs       |    14 +-
 .../Android/Webkit/ServiceWorkerController.cs |    14 +-
 .../Webkit/ServiceWorkerWebSettings.cs        |    60 +-
 .../Generated/Android/Webkit/TracingConfig.cs |    21 +-
 .../Android/Webkit/TracingController.cs       |     7 +-
 .../Generated/Android/Webkit/URLUtil.cs       |     2 +-
 .../Android/Webkit/WebBackForwardList.cs      |    31 +-
 .../Android/Webkit/WebChromeClient.cs         |    66 +-
 .../Android/Webkit/WebHistoryItem.cs          |    28 +-
 .../Android/Webkit/WebIconDatabase.cs         |    29 +-
 .../Generated/Android/Webkit/WebMessage.cs    |    14 +-
 .../Android/Webkit/WebResourceError.cs        |    14 +-
 .../Android/Webkit/WebResourceRequest.cs      |    37 +-
 .../Android/Webkit/WebResourceResponse.cs     |    74 +-
 .../Generated/Android/Webkit/WebSettings.cs   |   705 +-
 .../Generated/Android/Webkit/WebStorage.cs    |    32 +-
 .../Generated/Android/Webkit/WebView.cs       |   410 +-
 .../Generated/Android/Webkit/WebViewClient.cs |     8 +-
 .../Android/Webkit/WebViewDatabase.cs         |     8 +-
 .../Android/Webkit/WebViewFragment.cs         |     9 +-
 .../Generated/Android/Widget/AbsListView.cs   |   289 +-
 .../Generated/Android/Widget/AbsSeekBar.cs    |   165 +-
 .../Android/Widget/AbsoluteLayout.cs          |    20 +-
 .../Android/Widget/ActionMenuView.cs          |    49 +-
 .../Generated/Android/Widget/Adapter.cs       |    89 +-
 .../Generated/Android/Widget/AdapterView.cs   |   316 +-
 .../Android/Widget/AdapterViewAnimator.cs     |    68 +-
 .../Android/Widget/AdapterViewFlipper.cs      |    23 +-
 .../Android/Widget/AllPackageClasses.cs       |  1004 +-
 .../Android/Widget/AlphabetIndexer.cs         |    15 +-
 .../Generated/Android/Widget/AnalogClock.cs   |   178 +-
 .../Generated/Android/Widget/ArrayAdapter.cs  |   443 +
 .../Android/Widget/AutoCompleteTextView.cs    |   283 +-
 .../Generated/Android/Widget/BaseAdapter.cs   |   123 +-
 .../Widget/BaseExpandableListAdapter.cs       |   141 +-
 .../Generated/Android/Widget/CalendarView.cs  |   233 +-
 .../Android/Widget/CheckedTextView.cs         |    52 +-
 .../Generated/Android/Widget/Chronometer.cs   |    57 +-
 .../Android/Widget/CompoundButton.cs          |    56 +-
 .../Generated/Android/Widget/CursorAdapter.cs |   212 +-
 .../Android/Widget/CursorTreeAdapter.cs       |   658 +-
 .../Generated/Android/Widget/DatePicker.cs    |   115 +-
 .../Generated/Android/Widget/DialerFilter.cs  |    81 +-
 .../Generated/Android/Widget/DigitalClock.cs  |     4 +-
 .../Generated/Android/Widget/EdgeEffect.cs    |    68 +-
 .../Android/Widget/ExpandableListAdapter.cs   |    87 +-
 .../Android/Widget/ExpandableListView.cs      |    53 +-
 .../Generated/Android/Widget/Filter.cs        |     4 +-
 .../Generated/Android/Widget/Filterable.cs    |     7 +-
 .../Generated/Android/Widget/FrameLayout.cs   |    24 +-
 .../Generated/Android/Widget/Gallery.cs       |    36 +-
 .../Generated/Android/Widget/GridLayout.cs    |    91 +-
 .../Generated/Android/Widget/GridView.cs      |   104 +-
 .../Android/Widget/HeaderViewListAdapter.cs   |   575 +-
 .../Widget/HeterogeneousExpandableList.cs     |    30 +-
 .../Android/Widget/HorizontalScrollView.cs    |    61 +-
 .../Generated/Android/Widget/ImageView.cs     |   197 +-
 .../Widget/Inline/AllPackageClasses.cs        |     4 +-
 .../Widget/Inline/InlineContentView.cs        |     7 +-
 .../Widget/Inline/InlinePresentationSpec.cs   |    21 +-
 .../Generated/Android/Widget/LinearLayout.cs  |   121 +-
 .../Generated/Android/Widget/ListAdapter.cs   |    97 +-
 .../Android/Widget/ListPopupWindow.cs         |   282 +-
 .../Generated/Android/Widget/ListView.cs      |   141 +-
 .../Generated/Android/Widget/Magnifier.cs     |   102 +-
 .../Android/Widget/MediaController.cs         |    60 +-
 .../Generated/Android/Widget/NumberPicker.cs  |   128 +-
 .../Generated/Android/Widget/OverScroller.cs  |   105 +-
 .../Generated/Android/Widget/PopupMenu.cs     |    52 +-
 .../Generated/Android/Widget/PopupWindow.cs   |   249 +-
 .../Generated/Android/Widget/ProgressBar.cs   |   392 +-
 .../Generated/Android/Widget/RadioGroup.cs    |    11 +-
 .../Generated/Android/Widget/RatingBar.cs     |    72 +-
 .../Android/Widget/RelativeLayout.cs          |    45 +-
 .../Generated/Android/Widget/RemoteViews.cs   |    92 +-
 .../Android/Widget/RemoteViewsService.cs      |    37 +-
 .../Android/Widget/ResourceCursorAdapter.cs   |   724 +-
 .../Widget/ResourceCursorTreeAdapter.cs       |   746 +-
 .../Generated/Android/Widget/ScrollView.cs    |    61 +-
 .../Generated/Android/Widget/Scroller.cs      |    96 +-
 .../Generated/Android/Widget/SearchView.cs    |   144 +-
 .../Android/Widget/SectionIndexer.cs          |    15 +-
 .../Generated/Android/Widget/SeekBar.cs       |    12 +-
 .../Android/Widget/ShareActionProvider.cs     |     4 +-
 .../Generated/Android/Widget/SimpleAdapter.cs |   153 +-
 .../Android/Widget/SimpleCursorAdapter.cs     |   885 +-
 .../Android/Widget/SimpleCursorTreeAdapter.cs |   875 +-
 .../Widget/SimpleExpandableListAdapter.cs     |   553 +-
 .../Generated/Android/Widget/SlidingDrawer.cs |    86 +-
 .../Generated/Android/Widget/Spinner.cs       |    89 +-
 .../Android/Widget/SpinnerAdapter.cs          |    93 +-
 .../Generated/Android/Widget/Switch.cs        |   225 +-
 .../Generated/Android/Widget/TabHost.cs       |   136 +-
 .../Generated/Android/Widget/TabWidget.cs     |    67 +-
 .../Generated/Android/Widget/TableRow.cs      |    15 +-
 .../Generated/Android/Widget/TextClock.cs     |    57 +-
 .../Generated/Android/Widget/TextView.cs      |  1535 +-
 .../Android/Widget/ThemedSpinnerAdapter.cs    |   116 +-
 .../Generated/Android/Widget/TimePicker.cs    |    86 +-
 .../Generated/Android/Widget/Toast.cs         |    68 +-
 .../Generated/Android/Widget/ToggleButton.cs  |    37 +-
 .../Generated/Android/Widget/Toolbar.cs       |   275 +-
 .../Android/Widget/TwoLineListItem.cs         |    26 +-
 .../Generated/Android/Widget/VideoView.cs     |    60 +-
 .../Generated/Android/Widget/ViewAnimator.cs  |    67 +-
 .../Generated/Android/Widget/ViewFlipper.cs   |    23 +-
 .../Generated/Android/Widget/ViewSwitcher.cs  |     7 +-
 .../Android/Widget/WrapperListAdapter.cs      |   116 +-
 .../Generated/Android/Widget/ZoomButton.cs    |    12 +-
 .../Android/Widget/ZoomButtonsController.cs   |    54 +-
 .../Generated/Android/Widget/ZoomControls.cs  |    18 +-
 .../Android/Window/AllPackageClasses.cs       |    26 +-
 .../Generated/Android/Window/BackEvent.cs     |    28 +-
 .../Generated/Android/Window/SplashScreen.cs  |     4 +-
 .../Android/Window/SplashScreenView.cs        |    21 +-
 .../Dalvik/Annotation/AllPackageClasses.cs    |    12 +-
 .../Optimization/AllPackageClasses.cs         |     8 +-
 .../Generated/Dalvik/Annotation/TestTarget.cs |     6 +-
 .../Dalvik/Annotation/TestTargetClass.cs      |     2 +-
 .../Dalvik/Bytecode/AllPackageClasses.cs      |     4 +-
 .../Generated/Dalvik/Bytecode/Opcodes.cs      |    38 +-
 .../{SystemNs => System}/AllPackageClasses.cs |    14 +-
 .../ApplicationRuntime.cs                     |     9 +-
 .../BaseDexClassLoader.cs                     |     2 +-
 .../DelegateLastClassLoader.cs                |     2 +-
 .../{SystemNs => System}/DexClassLoader.cs    |     2 +-
 .../Dalvik/{SystemNs => System}/DexFile.cs    |    39 +-
 .../InMemoryDexClassLoader.cs                 |     2 +-
 .../{SystemNs => System}/PathClassLoader.cs   |     2 +-
 .../{SystemNs => System}/ZipPathValidator.cs  |     6 +-
 .../Java/Awt/FontNs/AllPackageClasses.cs      |     6 +-
 .../Java/Awt/FontNs/NumericShaper.cs          |   158 +-
 .../Java/Awt/FontNs/TextAttribute.cs          |   118 +-
 .../Generated/Java/Beans/AllPackageClasses.cs |    20 +-
 .../Java/Beans/IndexedPropertyChangeEvent.cs  |     9 +-
 .../Java/Beans/PropertyChangeEvent.cs         |    38 +-
 .../Java/Beans/PropertyChangeListener.cs      |    12 +-
 .../Java/Beans/PropertyChangeListenerProxy.cs |    11 +-
 .../Java/Beans/PropertyChangeSupport.cs       |    43 +-
 .../Generated/Java/Io/AllPackageClasses.cs    |   292 +-
 .../Generated/Java/Io/BufferedInputStream.cs  |     4 +-
 .../Generated/Java/Io/BufferedOutputStream.cs |     4 +-
 .../Generated/Java/Io/BufferedReader.cs       |     8 +-
 .../Generated/Java/Io/BufferedWriter.cs       |     6 +-
 .../Generated/Java/Io/ByteArrayInputStream.cs |     4 +-
 .../Java/Io/ByteArrayOutputStream.cs          |    20 +-
 .../Generated/Java/Io/CharArrayReader.cs      |     4 +-
 .../Generated/Java/Io/CharArrayWriter.cs      |    10 +-
 .../Netdroid/Generated/Java/Io/Closeable.cs   |     2 +-
 src/net/Netdroid/Generated/Java/Io/Console.cs |    26 +-
 .../Netdroid/Generated/Java/Io/DataInput.cs   |    30 +-
 .../Generated/Java/Io/DataInputStream.cs      |    36 +-
 .../Netdroid/Generated/Java/Io/DataOutput.cs  |    28 +-
 .../Generated/Java/Io/DataOutputStream.cs     |    26 +-
 .../Generated/Java/Io/Externalizable.cs       |     4 +-
 src/net/Netdroid/Generated/Java/Io/File.cs    |   259 +-
 .../Generated/Java/Io/FileDescriptor.cs       |    12 +-
 .../Netdroid/Generated/Java/Io/FileFilter.cs  |     2 +-
 .../Generated/Java/Io/FileInputStream.cs      |    21 +-
 .../Generated/Java/Io/FileOutputStream.cs     |    25 +-
 .../Generated/Java/Io/FilePermission.cs       |     2 +-
 .../Netdroid/Generated/Java/Io/FileReader.cs  |    10 +-
 .../Netdroid/Generated/Java/Io/FileWriter.cs  |    18 +-
 .../Generated/Java/Io/FilenameFilter.cs       |     2 +-
 .../Generated/Java/Io/FilterOutputStream.cs   |     2 +-
 .../Netdroid/Generated/Java/Io/Flushable.cs   |     2 +-
 .../Netdroid/Generated/Java/Io/InputStream.cs |    41 +-
 .../Generated/Java/Io/InputStreamReader.cs    |    15 +-
 .../Java/Io/LineNumberInputStream.cs          |    17 +-
 .../Generated/Java/Io/LineNumberReader.cs     |    19 +-
 .../Netdroid/Generated/Java/Io/ObjectInput.cs |    14 +-
 .../Generated/Java/Io/ObjectInputStream.cs    |    79 +-
 .../Java/Io/ObjectInputValidation.cs          |     2 +-
 .../Generated/Java/Io/ObjectOutput.cs         |    12 +-
 .../Generated/Java/Io/ObjectOutputStream.cs   |    60 +-
 .../Generated/Java/Io/ObjectStreamClass.cs    |    45 +-
 .../Java/Io/ObjectStreamConstants.cs          |    60 +-
 .../Generated/Java/Io/ObjectStreamField.cs    |    65 +-
 .../Generated/Java/Io/OutputStream.cs         |    12 +-
 .../Generated/Java/Io/OutputStreamWriter.cs   |    15 +-
 .../Generated/Java/Io/PipedInputStream.cs     |     8 +-
 .../Generated/Java/Io/PipedOutputStream.cs    |     4 +-
 .../Netdroid/Generated/Java/Io/PipedReader.cs |     8 +-
 .../Netdroid/Generated/Java/Io/PipedWriter.cs |     4 +-
 .../Netdroid/Generated/Java/Io/PrintStream.cs |    82 +-
 .../Netdroid/Generated/Java/Io/PrintWriter.cs |    70 +-
 .../Generated/Java/Io/PushbackInputStream.cs  |    10 +-
 .../Generated/Java/Io/PushbackReader.cs       |    10 +-
 .../Generated/Java/Io/RandomAccessFile.cs     |   127 +-
 src/net/Netdroid/Generated/Java/Io/Reader.cs  |    24 +-
 .../Generated/Java/Io/SequenceInputStream.cs  |     4 +-
 .../Java/Io/SerializablePermission.cs         |     4 +-
 .../Generated/Java/Io/StreamTokenizer.cs      |    50 +-
 .../Java/Io/StringBufferInputStream.cs        |     2 +-
 .../Generated/Java/Io/StringReader.cs         |     2 +-
 .../Generated/Java/Io/StringWriter.cs         |     9 +-
 src/net/Netdroid/Generated/Java/Io/Writer.cs  |    22 +-
 .../Generated/Java/Lang/AllPackageClasses.cs  |   261 +-
 .../Java/Lang/Annotation/AllPackageClasses.cs |    52 +-
 .../Java/Lang/Annotation/Annotation.cs        |     4 +-
 .../Java/Lang/Annotation/ElementType.cs       |    32 +-
 .../Java/Lang/Annotation/Repeatable.cs        |     4 +-
 .../Java/Lang/Annotation/Retention.cs         |     2 +-
 .../Java/Lang/Annotation/RetentionPolicy.cs   |    10 +-
 .../Generated/Java/Lang/Annotation/Target.cs  |     2 +-
 .../Generated/Java/Lang/Appendable.cs         |     6 +-
 .../Generated/Java/Lang/AutoCloseable.cs      |     2 +-
 .../Netdroid/Generated/Java/Lang/Boolean.cs   |    40 +-
 src/net/Netdroid/Generated/Java/Lang/Byte.cs  |    48 +-
 .../Generated/Java/Lang/CharSequence.cs       |    20 +-
 .../Netdroid/Generated/Java/Lang/Character.cs |  1442 +-
 src/net/Netdroid/Generated/Java/Lang/Class.cs |  1229 +-
 .../Generated/Java/Lang/ClassLoader.cs        |    91 +-
 .../Generated/Java/Lang/ClassValue.cs         |     8 +-
 .../Generated/Java/Lang/Comparable.cs         |     4 +-
 .../Netdroid/Generated/Java/Lang/Compiler.cs  |    10 +-
 .../Generated/Java/Lang/Deprecated.cs         |     4 +-
 .../Netdroid/Generated/Java/Lang/Double.cs    |    90 +-
 src/net/Netdroid/Generated/Java/Lang/Enum.cs  |    64 +-
 src/net/Netdroid/Generated/Java/Lang/Float.cs |    94 +-
 .../Netdroid/Generated/Java/Lang/Integer.cs   |   120 +-
 .../Java/Lang/Invoke/AllPackageClasses.cs     |   323 +-
 .../Generated/Java/Lang/Invoke/CallSite.cs    |    23 +-
 .../Java/Lang/Invoke/ConstantCallSite.cs      |     2 +-
 .../Java/Lang/Invoke/MethodHandle.cs          |    32 +-
 .../Java/Lang/Invoke/MethodHandleInfo.cs      |    73 +-
 .../Java/Lang/Invoke/MethodHandles.cs         |   314 +-
 .../Generated/Java/Lang/Invoke/MethodType.cs  |   163 +-
 .../Java/Lang/Invoke/MutableCallSite.cs       |     6 +-
 .../Java/Lang/Invoke/TypeDescriptor.cs        |   440 -
 .../Generated/Java/Lang/Invoke/VarHandle.cs   |   218 +-
 .../Java/Lang/Invoke/VolatileCallSite.cs      |     4 +-
 src/net/Netdroid/Generated/Java/Lang/Long.cs  |   118 +-
 src/net/Netdroid/Generated/Java/Lang/Math.cs  |   182 +-
 .../Netdroid/Generated/Java/Lang/Number.cs    |    12 +-
 .../Netdroid/Generated/Java/Lang/Package.cs   |   168 +-
 .../Netdroid/Generated/Java/Lang/Process.cs   |   112 +-
 .../Generated/Java/Lang/ProcessBuilder.cs     |    58 +-
 .../Netdroid/Generated/Java/Lang/Readable.cs  |     2 +-
 .../Java/Lang/Ref/AllPackageClasses.cs        |    36 +-
 .../Generated/Java/Lang/Ref/Cleaner.cs        |     8 +-
 .../Java/Lang/Ref/PhantomReference.cs         |     4 +-
 .../Generated/Java/Lang/Ref/Reference.cs      |    40 +-
 .../Generated/Java/Lang/Ref/ReferenceQueue.cs |    18 +-
 .../Generated/Java/Lang/Ref/SoftReference.cs  |     8 +-
 .../Generated/Java/Lang/Ref/WeakReference.cs  |     8 +-
 .../Java/Lang/Reflect/AccessibleObject.cs     |    68 +-
 .../Java/Lang/Reflect/AllPackageClasses.cs    |   142 +-
 .../Java/Lang/Reflect/AnnotatedElement.cs     |    46 +-
 .../Generated/Java/Lang/Reflect/Array.cs      |    42 +-
 .../Java/Lang/Reflect/Constructor.cs          |     4 +-
 .../Generated/Java/Lang/Reflect/Executable.cs |   101 +-
 .../Generated/Java/Lang/Reflect/Field.cs      |   117 +-
 .../Java/Lang/Reflect/GenericArrayType.cs     |     7 +-
 .../Java/Lang/Reflect/GenericDeclaration.cs   |     7 +-
 .../Java/Lang/Reflect/InvocationHandler.cs    |    14 +-
 .../Generated/Java/Lang/Reflect/Member.cs     |    33 +-
 .../Generated/Java/Lang/Reflect/Method.cs     |    47 +-
 .../Generated/Java/Lang/Reflect/Modifier.cs   |    62 +-
 .../Generated/Java/Lang/Reflect/Parameter.cs  |   129 +-
 .../Java/Lang/Reflect/ParameterizedType.cs    |    21 +-
 .../Generated/Java/Lang/Reflect/Proxy.cs      |    10 +-
 .../Java/Lang/Reflect/RecordComponent.cs      |   124 -
 .../Java/Lang/Reflect/ReflectPermission.cs    |     4 +-
 .../Generated/Java/Lang/Reflect/Type.cs       |     7 +-
 .../Java/Lang/Reflect/TypeVariable.cs         |    42 +-
 .../Java/Lang/Reflect/WildcardType.cs         |    14 +-
 .../Netdroid/Generated/Java/Lang/Runnable.cs  |     2 +-
 .../Netdroid/Generated/Java/Lang/Runtime.cs   |    69 +-
 .../Java/Lang/Runtime/AllPackageClasses.cs    |    75 -
 .../Java/Lang/Runtime/ObjectMethods.cs        |    73 -
 .../Generated/Java/Lang/RuntimePermission.cs  |     4 +-
 .../Generated/Java/Lang/SecurityManager.cs    |    70 +-
 src/net/Netdroid/Generated/Java/Lang/Short.cs |    50 +-
 .../Generated/Java/Lang/StackTraceElement.cs  |    61 +-
 .../Generated/Java/Lang/StackWalker.cs        |   118 +-
 .../Generated/Java/Lang/StrictMath.cs         |   284 +-
 .../Netdroid/Generated/Java/Lang/String.cs    |   259 +-
 .../Generated/Java/Lang/StringBuffer.cs       |    10 +-
 .../Generated/Java/Lang/StringBuilder.cs      |    10 +-
 .../Generated/Java/Lang/SuppressWarnings.cs   |     2 +-
 .../Netdroid/Generated/Java/Lang/System.cs    |   119 +-
 .../Netdroid/Generated/Java/Lang/Thread.cs    |   241 +-
 .../Generated/Java/Lang/ThreadGroup.cs        |   108 +-
 .../Generated/Java/Lang/ThreadLocal.cs        |    18 +-
 src/net/Netdroid/Generated/Java/Lang/Void.cs  |     2 +-
 .../Generated/Java/Math/AllPackageClasses.cs  |     8 +-
 .../Generated/Java/Math/BigDecimal.cs         |   186 +-
 .../Generated/Java/Math/BigInteger.cs         |   125 +-
 .../Generated/Java/Math/MathContext.cs        |    28 +-
 .../Generated/Java/Math/RoundingMode.cs       |    22 +-
 .../Generated/Java/Net/AllPackageClasses.cs   |   234 +-
 .../Generated/Java/Net/Authenticator.cs       |    33 +-
 .../Generated/Java/Net/CacheRequest.cs        |    10 +-
 .../Generated/Java/Net/CacheResponse.cs       |    16 +-
 .../Generated/Java/Net/ContentHandler.cs      |     4 +-
 .../Java/Net/ContentHandlerFactory.cs         |     2 +-
 .../Generated/Java/Net/CookieHandler.cs       |    19 +-
 .../Generated/Java/Net/CookieManager.cs       |    11 +-
 .../Generated/Java/Net/CookiePolicy.cs        |     8 +-
 .../Generated/Java/Net/CookieStore.cs         |    38 +-
 .../Generated/Java/Net/DatagramPacket.cs      |    96 +-
 .../Generated/Java/Net/DatagramSocket.cs      |   270 +-
 .../Java/Net/DatagramSocketImplFactory.cs     |     2 +-
 .../Generated/Java/Net/FileNameMap.cs         |     2 +-
 .../Netdroid/Generated/Java/Net/HttpCookie.cs |   181 +-
 .../Generated/Java/Net/HttpURLConnection.cs   |   165 +-
 src/net/Netdroid/Generated/Java/Net/IDN.cs    |    12 +-
 .../Generated/Java/Net/Inet6Address.cs        |    26 +-
 .../Generated/Java/Net/InetAddress.cs         |   121 +-
 .../Generated/Java/Net/InetSocketAddress.cs   |    44 +-
 .../Generated/Java/Net/InterfaceAddress.cs    |    21 +-
 .../Generated/Java/Net/JarURLConnection.cs    |    62 +-
 .../Generated/Java/Net/MulticastSocket.cs     |   124 +-
 .../Generated/Java/Net/NetPermission.cs       |     4 +-
 .../Generated/Java/Net/NetworkInterface.cs    |   123 +-
 .../Java/Net/PasswordAuthentication.cs        |    16 +-
 .../Generated/Java/Net/ProtocolFamily.cs      |     2 +-
 src/net/Netdroid/Generated/Java/Net/Proxy.cs  |    18 +-
 .../Generated/Java/Net/ProxySelector.cs       |    21 +-
 .../Generated/Java/Net/ResponseCache.cs       |    19 +-
 .../Generated/Java/Net/SecureCacheResponse.cs |    44 +-
 .../Generated/Java/Net/ServerSocket.cs        |   156 +-
 src/net/Netdroid/Generated/Java/Net/Socket.cs |   328 +-
 .../Generated/Java/Net/SocketImplFactory.cs   |     2 +-
 .../Generated/Java/Net/SocketOption.cs        |     8 +-
 .../Generated/Java/Net/SocketOptions.cs       |    34 +-
 .../Generated/Java/Net/SocketPermission.cs    |     2 +-
 .../Java/Net/StandardProtocolFamily.cs        |    14 +-
 .../Java/Net/StandardSocketOptions.cs         |    24 +-
 src/net/Netdroid/Generated/Java/Net/URI.cs    |   167 +-
 src/net/Netdroid/Generated/Java/Net/URL.cs    |   132 +-
 .../Generated/Java/Net/URLClassLoader.cs      |    33 +-
 .../Generated/Java/Net/URLConnection.cs       |   372 +-
 .../Netdroid/Generated/Java/Net/URLDecoder.cs |     8 +-
 .../Netdroid/Generated/Java/Net/URLEncoder.cs |     8 +-
 .../Java/Net/URLStreamHandlerFactory.cs       |     2 +-
 .../Generated/Java/Nio/AllPackageClasses.cs   |    64 +-
 src/net/Netdroid/Generated/Java/Nio/Buffer.cs |    48 +-
 .../Netdroid/Generated/Java/Nio/ByteBuffer.cs |   238 +-
 .../Netdroid/Generated/Java/Nio/ByteOrder.cs  |     6 +-
 .../Java/Nio/Channels/AllPackageClasses.cs    |   234 +-
 .../Nio/Channels/AsynchronousByteChannel.cs   |    12 +-
 .../Java/Nio/Channels/AsynchronousChannel.cs  |     2 +-
 .../Nio/Channels/AsynchronousChannelGroup.cs  |    18 +-
 .../Nio/Channels/AsynchronousFileChannel.cs   |    40 +-
 .../AsynchronousServerSocketChannel.cs        |    34 +-
 .../Nio/Channels/AsynchronousSocketChannel.cs |    80 +-
 .../Generated/Java/Nio/Channels/Channel.cs    |     4 +-
 .../Generated/Java/Nio/Channels/Channels.cs   |    24 +-
 .../Java/Nio/Channels/CompletionHandler.cs    |     8 +-
 .../Java/Nio/Channels/DatagramChannel.cs      |    64 +-
 .../Java/Nio/Channels/FileChannel.cs          |    52 +-
 .../Generated/Java/Nio/Channels/FileLock.cs   |    18 +-
 .../Java/Nio/Channels/GatheringByteChannel.cs |     4 +-
 .../Java/Nio/Channels/InterruptibleChannel.cs |     2 +-
 .../Java/Nio/Channels/MembershipKey.cs        |    16 +-
 .../Java/Nio/Channels/MulticastChannel.cs     |     6 +-
 .../Java/Nio/Channels/NetworkChannel.cs       |    24 +-
 .../Generated/Java/Nio/Channels/Pipe.cs       |     6 +-
 .../Java/Nio/Channels/ReadableByteChannel.cs  |     2 +-
 .../Nio/Channels/ScatteringByteChannel.cs     |     4 +-
 .../Java/Nio/Channels/SeekableByteChannel.cs  |    12 +-
 .../Java/Nio/Channels/SelectableChannel.cs    |    18 +-
 .../Java/Nio/Channels/SelectionKey.cs         |    38 +-
 .../Generated/Java/Nio/Channels/Selector.cs   |    26 +-
 .../Java/Nio/Channels/ServerSocketChannel.cs  |    36 +-
 .../Java/Nio/Channels/SocketChannel.cs        |    76 +-
 .../Spi/AbstractInterruptibleChannel.cs       |     4 +-
 .../Nio/Channels/Spi/AllPackageClasses.cs     |    36 +-
 .../Spi/AsynchronousChannelProvider.cs        |    10 +-
 .../Java/Nio/Channels/Spi/SelectorProvider.cs |    36 +-
 .../Java/Nio/Channels/WritableByteChannel.cs  |     2 +-
 .../Netdroid/Generated/Java/Nio/CharBuffer.cs |   124 +-
 .../Java/Nio/Charset/AllPackageClasses.cs     |    36 +-
 .../Generated/Java/Nio/Charset/Charset.cs     |    36 +-
 .../Java/Nio/Charset/CharsetDecoder.cs        |    32 +-
 .../Java/Nio/Charset/CharsetEncoder.cs        |    32 +-
 .../Generated/Java/Nio/Charset/CoderResult.cs |    22 +-
 .../Java/Nio/Charset/CodingErrorAction.cs     |     6 +-
 .../Java/Nio/Charset/Spi/AllPackageClasses.cs |     6 +-
 .../Java/Nio/Charset/Spi/CharsetProvider.cs   |     4 +-
 .../Java/Nio/Charset/StandardCharsets.cs      |    12 +-
 .../Generated/Java/Nio/DoubleBuffer.cs        |    92 +-
 .../Generated/Java/Nio/File/AccessMode.cs     |    10 +-
 .../Java/Nio/File/AllPackageClasses.cs        |   196 +-
 .../Java/Nio/File/Attribute/AclEntry.cs       |    26 +-
 .../Java/Nio/File/Attribute/AclEntryFlag.cs   |    12 +-
 .../Nio/File/Attribute/AclEntryPermission.cs  |    38 +-
 .../Java/Nio/File/Attribute/AclEntryType.cs   |    12 +-
 .../File/Attribute/AclFileAttributeView.cs    |    25 +-
 .../Nio/File/Attribute/AllPackageClasses.cs   |   120 +-
 .../Java/Nio/File/Attribute/AttributeView.cs  |     2 +-
 .../File/Attribute/BasicFileAttributeView.cs  |     6 +-
 .../Nio/File/Attribute/BasicFileAttributes.cs |    18 +-
 .../File/Attribute/DosFileAttributeView.cs    |    12 +-
 .../Nio/File/Attribute/DosFileAttributes.cs   |     8 +-
 .../Java/Nio/File/Attribute/FileAttribute.cs  |     8 +-
 .../File/Attribute/FileOwnerAttributeView.cs  |    25 +-
 .../Java/Nio/File/Attribute/FileTime.cs       |    16 +-
 .../File/Attribute/PosixFileAttributeView.cs  |     8 +-
 .../Nio/File/Attribute/PosixFileAttributes.cs |     6 +-
 .../Nio/File/Attribute/PosixFilePermission.cs |    22 +-
 .../File/Attribute/PosixFilePermissions.cs    |     6 +-
 .../Attribute/UserDefinedFileAttributeView.cs |    12 +-
 .../Attribute/UserPrincipalLookupService.cs   |     4 +-
 .../Java/Nio/File/DirectoryStream.cs          |     8 +-
 .../Generated/Java/Nio/File/FileStore.cs      |    82 +-
 .../Generated/Java/Nio/File/FileSystem.cs     |    56 +-
 .../Generated/Java/Nio/File/FileSystems.cs    |    48 +-
 .../Java/Nio/File/FileVisitOption.cs          |     6 +-
 .../Java/Nio/File/FileVisitResult.cs          |    12 +-
 .../Generated/Java/Nio/File/FileVisitor.cs    |    16 +-
 .../Netdroid/Generated/Java/Nio/File/Files.cs |   165 +-
 .../Generated/Java/Nio/File/LinkOption.cs     |     6 +-
 .../Generated/Java/Nio/File/LinkPermission.cs |     4 +-
 .../Netdroid/Generated/Java/Nio/File/Path.cs  |   123 +-
 .../Generated/Java/Nio/File/PathMatcher.cs    |     2 +-
 .../Netdroid/Generated/Java/Nio/File/Paths.cs |     4 +-
 .../Java/Nio/File/SecureDirectoryStream.cs    |    38 +-
 .../Java/Nio/File/SimpleFileVisitor.cs        |    16 +-
 .../Java/Nio/File/Spi/AllPackageClasses.cs    |    12 +-
 .../Java/Nio/File/Spi/FileSystemProvider.cs   |    81 +-
 .../Java/Nio/File/Spi/FileTypeDetector.cs     |     2 +-
 .../Java/Nio/File/StandardCopyOption.cs       |    10 +-
 .../Java/Nio/File/StandardOpenOption.cs       |    24 +-
 .../Java/Nio/File/StandardWatchEventKinds.cs  |     8 +-
 .../Generated/Java/Nio/File/WatchEvent.cs     |    22 +-
 .../Generated/Java/Nio/File/WatchKey.cs       |    10 +-
 .../Generated/Java/Nio/File/WatchService.cs   |     8 +-
 .../Generated/Java/Nio/File/Watchable.cs      |     4 +-
 .../Generated/Java/Nio/FloatBuffer.cs         |    92 +-
 .../Netdroid/Generated/Java/Nio/IntBuffer.cs  |    92 +-
 .../Netdroid/Generated/Java/Nio/LongBuffer.cs |    92 +-
 .../Generated/Java/Nio/MappedByteBuffer.cs    |    16 +-
 .../Generated/Java/Nio/ShortBuffer.cs         |    92 +-
 .../Java/Security/AccessControlContext.cs     |    13 +-
 .../Java/Security/AccessController.cs         |    83 +-
 .../Generated/Java/Security/Acl/Acl.cs        |   143 +
 .../Generated/Java/Security/Acl/AclEntry.cs   |   143 +
 .../AclNotFoundException.cs}                  |    31 +-
 .../Java/Security/Acl/AllPackageClasses.cs    |   320 +
 .../Generated/Java/Security/Acl/Group.cs      |   112 +
 .../Java/Security/Acl/LastOwnerException.cs   |    58 +
 .../Acl/NotOwnerException.cs}                 |     6 +-
 .../Generated/Java/Security/Acl/Owner.cs      |   108 +
 .../Serial.cs => Security/Acl/Permission.cs}  |    10 +-
 .../Java/Security/AlgorithmConstraints.cs     |     6 +-
 .../Security/AlgorithmParameterGenerator.cs   |    36 +-
 .../Java/Security/AlgorithmParameters.cs      |    60 +-
 .../Java/Security/AllPackageClasses.cs        |   347 +-
 .../Generated/Java/Security/AllPermission.cs  |     2 +-
 .../Generated/Java/Security/AuthProvider.cs   |     6 +-
 .../Java/Security/BasicPermission.cs          |     4 +-
 .../Java/Security/Cert/AllPackageClasses.cs   |   196 +-
 .../Generated/Java/Security/Cert/CRL.cs       |    17 +-
 .../Generated/Java/Security/Cert/CRLReason.cs |    26 +-
 .../Java/Security/Cert/CRLSelector.cs         |     2 +-
 .../Generated/Java/Security/Cert/CertPath.cs  |    42 +-
 .../Java/Security/Cert/CertPathBuilder.cs     |    48 +-
 .../Security/Cert/CertPathBuilderResult.cs    |     7 +-
 .../Java/Security/Cert/CertPathBuilderSpi.cs  |     4 +-
 .../Java/Security/Cert/CertPathChecker.cs     |     6 +-
 .../Java/Security/Cert/CertPathValidator.cs   |    44 +-
 .../Cert/CertPathValidatorException.cs        |    18 +-
 .../Security/Cert/CertPathValidatorSpi.cs     |     4 +-
 .../Java/Security/Cert/CertSelector.cs        |     2 +-
 .../Generated/Java/Security/Cert/CertStore.cs |    42 +-
 .../Java/Security/Cert/CertStoreSpi.cs        |    10 +-
 .../Java/Security/Cert/Certificate.cs         |    36 +-
 .../Java/Security/Cert/CertificateFactory.cs  |    63 +-
 .../Security/Cert/CertificateFactorySpi.cs    |    22 +-
 .../Cert/CollectionCertStoreParameters.cs     |     9 +-
 .../Generated/Java/Security/Cert/Extension.cs |    24 +-
 .../Security/Cert/LDAPCertStoreParameters.cs  |    18 +-
 .../Security/Cert/PKIXBuilderParameters.cs    |    19 +-
 .../Cert/PKIXCertPathBuilderResult.cs         |     9 +-
 .../Java/Security/Cert/PKIXCertPathChecker.cs |    21 +-
 .../Cert/PKIXCertPathValidatorResult.cs       |    23 +-
 .../Java/Security/Cert/PKIXParameters.cs      |   169 +-
 .../Java/Security/Cert/PKIXReason.cs          |    20 +-
 .../Security/Cert/PKIXRevocationChecker.cs    |    94 +-
 .../Java/Security/Cert/PolicyNode.cs          |    52 +-
 .../Java/Security/Cert/PolicyQualifierInfo.cs |    23 +-
 .../Java/Security/Cert/TrustAnchor.cs         |    41 +-
 .../Security/Cert/URICertStoreParameters.cs   |     9 +-
 .../Generated/Java/Security/Cert/X509CRL.cs   |   114 +-
 .../Java/Security/Cert/X509CRLEntry.cs        |    44 +-
 .../Java/Security/Cert/X509CRLSelector.cs     |    96 +-
 .../Java/Security/Cert/X509CertSelector.cs    |   320 +-
 .../Java/Security/Cert/X509Certificate.cs     |   168 +-
 .../Java/Security/Cert/X509Extension.cs       |    32 +-
 .../Generated/Java/Security/Certificate.cs    |    42 +-
 .../Generated/Java/Security/CodeSigner.cs     |    16 +-
 .../Generated/Java/Security/CodeSource.cs     |    35 +-
 .../Java/Security/CryptoPrimitive.cs          |    24 +-
 .../Java/Security/DigestInputStream.cs        |    19 +-
 .../Java/Security/DigestOutputStream.cs       |    19 +-
 .../Generated/Java/Security/DomainCombiner.cs |     2 +-
 .../Java/Security/DomainLoadStoreParameter.cs |    23 +-
 .../Netdroid/Generated/Java/Security/Guard.cs |     2 +-
 .../Generated/Java/Security/GuardedObject.cs  |    10 +-
 .../Generated/Java/Security/Identity.cs       |    65 +-
 .../Generated/Java/Security/IdentityScope.cs  |    25 +-
 .../Security/Interfaces/AllPackageClasses.cs  |   234 +-
 .../Java/Security/Interfaces/DSAKey.cs        |     7 +-
 .../Interfaces/DSAKeyPairGenerator.cs         |     4 +-
 .../Java/Security/Interfaces/DSAParams.cs     |    21 +-
 .../Java/Security/Interfaces/DSAPrivateKey.cs |    10 +-
 .../Java/Security/Interfaces/DSAPublicKey.cs  |    10 +-
 .../Java/Security/Interfaces/ECKey.cs         |     7 +-
 .../Java/Security/Interfaces/ECPrivateKey.cs  |    10 +-
 .../Java/Security/Interfaces/ECPublicKey.cs   |    10 +-
 .../Security/Interfaces/EdECPrivateKey.cs     |    91 -
 .../Java/Security/Interfaces/EdECPublicKey.cs |    91 -
 .../Java/Security/Interfaces/RSAKey.cs        |    14 +-
 .../Interfaces/RSAMultiPrimePrivateCrtKey.cs  |    52 +-
 .../Security/Interfaces/RSAPrivateCrtKey.cs   |    45 +-
 .../Java/Security/Interfaces/RSAPrivateKey.cs |    10 +-
 .../Java/Security/Interfaces/RSAPublicKey.cs  |    10 +-
 .../Java/Security/Interfaces/XECKey.cs        |     7 +-
 .../Java/Security/Interfaces/XECPrivateKey.cs |     7 +-
 .../Java/Security/Interfaces/XECPublicKey.cs  |     7 +-
 .../Netdroid/Generated/Java/Security/Key.cs   |    24 +-
 .../Generated/Java/Security/KeyFactory.cs     |    46 +-
 .../Generated/Java/Security/KeyPair.cs        |    16 +-
 .../Java/Security/KeyPairGenerator.cs         |    32 +-
 .../Java/Security/KeyPairGeneratorSpi.cs      |     6 +-
 .../Generated/Java/Security/KeyRep.cs         |    12 +-
 .../Generated/Java/Security/KeyStore.cs       |   247 +-
 .../Generated/Java/Security/KeyStoreSpi.cs    |    44 +-
 .../Generated/Java/Security/MessageDigest.cs  |    59 +-
 .../Java/Security/PKCS12Attribute.cs          |    25 +-
 .../Generated/Java/Security/Permission.cs     |    30 +-
 .../Java/Security/PermissionCollection.cs     |    12 +-
 .../Generated/Java/Security/Policy.cs         |    78 +-
 .../Generated/Java/Security/Principal.cs      |     9 +-
 .../Generated/Java/Security/PrivateKey.cs     |     3 +-
 .../Java/Security/PrivilegedAction.cs         |     4 +-
 .../Security/PrivilegedExceptionAction.cs     |     4 +-
 .../Java/Security/ProtectionDomain.cs         |    50 +-
 .../Generated/Java/Security/Provider.cs       |   109 +-
 .../Generated/Java/Security/PublicKey.cs      |     3 +-
 .../Generated/Java/Security/SecureRandom.cs   |    54 +-
 .../Generated/Java/Security/Security.cs       |    37 +-
 .../Java/Security/SecurityPermission.cs       |     4 +-
 .../Generated/Java/Security/Signature.cs      |    85 +-
 .../Generated/Java/Security/SignedObject.cs   |    41 +-
 .../Generated/Java/Security/Signer.cs         |    21 +-
 .../Java/Security/Spec/AllPackageClasses.cs   |   208 +-
 .../Java/Security/Spec/DSAParameterSpec.cs    |    23 +-
 .../Java/Security/Spec/DSAPrivateKeySpec.cs   |    30 +-
 .../Java/Security/Spec/DSAPublicKeySpec.cs    |    30 +-
 .../Generated/Java/Security/Spec/ECField.cs   |     7 +-
 .../Java/Security/Spec/ECFieldF2m.cs          |    34 +-
 .../Generated/Java/Security/Spec/ECFieldFp.cs |    16 +-
 .../Java/Security/Spec/ECGenParameterSpec.cs  |     2 +-
 .../Java/Security/Spec/ECParameterSpec.cs     |    30 +-
 .../Generated/Java/Security/Spec/ECPoint.cs   |    18 +-
 .../Java/Security/Spec/ECPrivateKeySpec.cs    |    16 +-
 .../Java/Security/Spec/ECPublicKeySpec.cs     |    16 +-
 .../Generated/Java/Security/Spec/EdECPoint.cs |    82 -
 .../Java/Security/Spec/EdECPrivateKeySpec.cs  |    81 -
 .../Java/Security/Spec/EdECPublicKeySpec.cs   |    81 -
 .../Java/Security/Spec/EllipticCurve.cs       |    32 +-
 .../Java/Security/Spec/EncodedKeySpec.cs      |    23 +-
 .../Java/Security/Spec/MGF1ParameterSpec.cs   |    47 +-
 .../Java/Security/Spec/NamedParameterSpec.cs  |    25 +-
 .../Java/Security/Spec/PKCS8EncodedKeySpec.cs |     4 +-
 .../Java/Security/Spec/PSSParameterSpec.cs    |    43 +-
 .../Security/Spec/RSAKeyGenParameterSpec.cs   |    29 +-
 .../Spec/RSAMultiPrimePrivateCrtKeySpec.cs    |    53 +-
 .../Java/Security/Spec/RSAOtherPrimeInfo.cs   |    23 +-
 .../Security/Spec/RSAPrivateCrtKeySpec.cs     |    46 +-
 .../Java/Security/Spec/RSAPrivateKeySpec.cs   |    25 +-
 .../Java/Security/Spec/RSAPublicKeySpec.cs    |    25 +-
 .../Java/Security/Spec/X509EncodedKeySpec.cs  |     4 +-
 .../Java/Security/Spec/XECPrivateKeySpec.cs   |    16 +-
 .../Java/Security/Spec/XECPublicKeySpec.cs    |    16 +-
 .../Generated/Java/Security/Timestamp.cs      |    16 +-
 .../Java/Security/UnresolvedPermission.cs     |    30 +-
 .../Generated/Java/Sql/AllPackageClasses.cs   |   184 +-
 src/net/Netdroid/Generated/Java/Sql/Array.cs  |    56 +-
 src/net/Netdroid/Generated/Java/Sql/Blob.cs   |    36 +-
 .../Generated/Java/Sql/CallableStatement.cs   |   228 +-
 .../Generated/Java/Sql/ClientInfoStatus.cs    |    12 +-
 src/net/Netdroid/Generated/Java/Sql/Clob.cs   |    54 +-
 .../Netdroid/Generated/Java/Sql/Connection.cs |   285 +-
 .../Generated/Java/Sql/DatabaseMetaData.cs    |  1244 +-
 src/net/Netdroid/Generated/Java/Sql/Date.cs   |    12 +-
 src/net/Netdroid/Generated/Java/Sql/Driver.cs |    54 +-
 .../Generated/Java/Sql/DriverManager.cs       |    66 +-
 .../Generated/Java/Sql/DriverPropertyInfo.cs  |    12 +-
 .../Generated/Java/Sql/ParameterMetaData.cs   |    46 +-
 .../Generated/Java/Sql/PreparedStatement.cs   |   142 +-
 src/net/Netdroid/Generated/Java/Sql/Ref.cs    |    35 +-
 .../Netdroid/Generated/Java/Sql/ResultSet.cs  |   560 +-
 .../Generated/Java/Sql/ResultSetMetaData.cs   |    62 +-
 src/net/Netdroid/Generated/Java/Sql/RowId.cs  |     7 +-
 .../Generated/Java/Sql/RowIdLifetime.cs       |    14 +-
 .../Netdroid/Generated/Java/Sql/SQLData.cs    |    12 +-
 .../Netdroid/Generated/Java/Sql/SQLInput.cs   |    56 +-
 .../Netdroid/Generated/Java/Sql/SQLOutput.cs  |    54 +-
 .../Generated/Java/Sql/SQLPermission.cs       |     4 +-
 src/net/Netdroid/Generated/Java/Sql/SQLXML.cs |    73 +-
 .../Netdroid/Generated/Java/Sql/Savepoint.cs  |    16 +-
 .../Netdroid/Generated/Java/Sql/Statement.cs  |   388 +-
 src/net/Netdroid/Generated/Java/Sql/Struct.cs |    26 +-
 src/net/Netdroid/Generated/Java/Sql/Time.cs   |    12 +-
 .../Netdroid/Generated/Java/Sql/Timestamp.cs  |    41 +-
 src/net/Netdroid/Generated/Java/Sql/Types.cs  |    78 +-
 .../Netdroid/Generated/Java/Sql/Wrapper.cs    |     4 +-
 .../Generated/Java/Text/AllPackageClasses.cs  |    92 +-
 .../Generated/Java/Text/Annotation.cs         |     9 +-
 .../Java/Text/AttributedCharacterIterator.cs  |    72 +-
 .../Generated/Java/Text/AttributedString.cs   |    29 +-
 src/net/Netdroid/Generated/Java/Text/Bidi.cs  |    81 +-
 .../Generated/Java/Text/BreakIterator.cs      |   104 +-
 .../Generated/Java/Text/CharacterIterator.cs  |    59 +-
 .../Generated/Java/Text/ChoiceFormat.cs       |    30 +-
 .../Java/Text/CollationElementIterator.cs     |    41 +-
 .../Generated/Java/Text/CollationKey.cs       |    21 +-
 .../Netdroid/Generated/Java/Text/Collator.cs  |    92 +-
 .../Generated/Java/Text/DateFormat.cs         |   249 +-
 .../Generated/Java/Text/DateFormatSymbols.cs  |   146 +-
 .../Generated/Java/Text/DecimalFormat.cs      |   145 +-
 .../Java/Text/DecimalFormatSymbols.cs         |   250 +-
 .../Generated/Java/Text/FieldPosition.cs      |    50 +-
 .../Netdroid/Generated/Java/Text/Format.cs    |    10 +-
 .../Generated/Java/Text/MessageFormat.cs      |    91 +-
 .../Generated/Java/Text/Normalizer.cs         |    16 +-
 .../Generated/Java/Text/NumberFormat.cs       |   271 +-
 .../Generated/Java/Text/ParsePosition.cs      |    32 +-
 .../Generated/Java/Text/RuleBasedCollator.cs  |    13 +-
 .../Generated/Java/Text/SimpleDateFormat.cs   |    50 +-
 .../Java/Text/StringCharacterIterator.cs      |    65 +-
 .../Generated/Java/Time/AllPackageClasses.cs  |    92 +-
 .../Java/Time/Chrono/AbstractChronology.cs    |     6 +-
 .../Java/Time/Chrono/AllPackageClasses.cs     |   164 +-
 .../Java/Time/Chrono/ChronoLocalDate.cs       |    76 +-
 .../Java/Time/Chrono/ChronoLocalDateTime.cs   |   332 +-
 .../Java/Time/Chrono/ChronoPeriod.cs          |    44 +-
 .../Java/Time/Chrono/ChronoZonedDateTime.cs   |   435 +-
 .../Generated/Java/Time/Chrono/Chronology.cs  |   114 +-
 .../Generated/Java/Time/Chrono/Era.cs         |    21 +-
 .../Java/Time/Chrono/HijrahChronology.cs      |     2 +-
 .../Generated/Java/Time/Chrono/HijrahDate.cs  |    10 +-
 .../Generated/Java/Time/Chrono/HijrahEra.cs   |    19 +-
 .../Java/Time/Chrono/IsoChronology.cs         |     2 +-
 .../Generated/Java/Time/Chrono/IsoEra.cs      |    17 +-
 .../Java/Time/Chrono/JapaneseChronology.cs    |     2 +-
 .../Java/Time/Chrono/JapaneseDate.cs          |    10 +-
 .../Generated/Java/Time/Chrono/JapaneseEra.cs |    31 +-
 .../Java/Time/Chrono/MinguoChronology.cs      |     2 +-
 .../Generated/Java/Time/Chrono/MinguoDate.cs  |     8 +-
 .../Generated/Java/Time/Chrono/MinguoEra.cs   |    19 +-
 .../Time/Chrono/ThaiBuddhistChronology.cs     |     2 +-
 .../Java/Time/Chrono/ThaiBuddhistDate.cs      |     8 +-
 .../Java/Time/Chrono/ThaiBuddhistEra.cs       |    19 +-
 src/net/Netdroid/Generated/Java/Time/Clock.cs |    39 +-
 .../Netdroid/Generated/Java/Time/DayOfWeek.cs |    55 +-
 .../Netdroid/Generated/Java/Time/Duration.cs  |   155 +-
 .../Java/Time/Format/AllPackageClasses.cs     |    16 +-
 .../Java/Time/Format/DateTimeFormatter.cs     |   170 +-
 .../Time/Format/DateTimeFormatterBuilder.cs   |    91 +-
 .../Java/Time/Format/DecimalStyle.cs          |    57 +-
 .../Generated/Java/Time/Format/FormatStyle.cs |    12 +-
 .../Java/Time/Format/ResolverStyle.cs         |    10 +-
 .../Generated/Java/Time/Format/SignStyle.cs   |    14 +-
 .../Generated/Java/Time/Format/TextStyle.cs   |    22 +-
 .../Netdroid/Generated/Java/Time/Instant.cs   |   106 +-
 .../Generated/Java/Time/InstantSource.cs      |   138 -
 .../Netdroid/Generated/Java/Time/LocalDate.cs |   228 +-
 .../Generated/Java/Time/LocalDateTime.cs      |   270 +-
 .../Netdroid/Generated/Java/Time/LocalTime.cs |   166 +-
 src/net/Netdroid/Generated/Java/Time/Month.cs |    75 +-
 .../Netdroid/Generated/Java/Time/MonthDay.cs  |    93 +-
 .../Generated/Java/Time/OffsetDateTime.cs     |   301 +-
 .../Generated/Java/Time/OffsetTime.cs         |   173 +-
 .../Netdroid/Generated/Java/Time/Period.cs    |   113 +-
 .../Java/Time/Temporal/AllPackageClasses.cs   |    66 +-
 .../Java/Time/Temporal/ChronoField.cs         |   116 +-
 .../Java/Time/Temporal/ChronoUnit.cs          |    65 +-
 .../Generated/Java/Time/Temporal/IsoFields.cs |    12 +-
 .../Java/Time/Temporal/JulianFields.cs        |     6 +-
 .../Generated/Java/Time/Temporal/Temporal.cs  |    16 +-
 .../Java/Time/Temporal/TemporalAccessor.cs    |    10 +-
 .../Java/Time/Temporal/TemporalAdjuster.cs    |     2 +-
 .../Java/Time/Temporal/TemporalAdjusters.cs   |    28 +-
 .../Java/Time/Temporal/TemporalAmount.cs      |    21 +-
 .../Java/Time/Temporal/TemporalField.cs       |    50 +-
 .../Java/Time/Temporal/TemporalQueries.cs     |    14 +-
 .../Java/Time/Temporal/TemporalQuery.cs       |     4 +-
 .../Java/Time/Temporal/TemporalUnit.cs        |    29 +-
 .../Java/Time/Temporal/ValueRange.cs          |    78 +-
 .../Java/Time/Temporal/WeekFields.cs          |    34 +-
 src/net/Netdroid/Generated/Java/Time/Year.cs  |    91 +-
 .../Netdroid/Generated/Java/Time/YearMonth.cs |   123 +-
 .../Java/Time/Zone/AllPackageClasses.cs       |    10 +-
 .../Java/Time/Zone/ZoneOffsetTransition.cs    |    92 +-
 .../Time/Zone/ZoneOffsetTransitionRule.cs     |    88 +-
 .../Generated/Java/Time/Zone/ZoneRules.cs     |    56 +-
 .../Netdroid/Generated/Java/Time/ZoneId.cs    |    45 +-
 .../Generated/Java/Time/ZoneOffset.cs         |    45 +-
 .../Generated/Java/Time/ZonedDateTime.cs      |   258 +-
 .../Generated/Java/Util/AbstractCollection.cs |    54 +-
 .../Generated/Java/Util/AbstractList.cs       |    42 +-
 .../Generated/Java/Util/AbstractMap.cs        |   130 +-
 .../Generated/Java/Util/AbstractQueue.cs      |     8 +-
 .../Generated/Java/Util/AllPackageClasses.cs  |   682 +-
 .../Generated/Java/Util/ArrayDeque.cs         |   152 +-
 .../Netdroid/Generated/Java/Util/ArrayList.cs |    16 +-
 .../Netdroid/Generated/Java/Util/Arrays.cs    |   492 +-
 .../Netdroid/Generated/Java/Util/Base64.cs    |    74 +-
 .../Netdroid/Generated/Java/Util/BitSet.cs    |    64 +-
 .../Netdroid/Generated/Java/Util/Calendar.cs  |   379 +-
 .../Generated/Java/Util/Collection.cs         |    76 +-
 .../Generated/Java/Util/Collections.cs        |   202 +-
 .../Concurrent/AbstractExecutorService.cs     |    22 +-
 .../Java/Util/Concurrent/AllPackageClasses.cs |   414 +-
 .../Util/Concurrent/ArrayBlockingQueue.cs     |    44 +-
 .../Concurrent/Atomic/AllPackageClasses.cs    |    70 +-
 .../Util/Concurrent/Atomic/AtomicBoolean.cs   |    93 +-
 .../Util/Concurrent/Atomic/AtomicInteger.cs   |   139 +-
 .../Concurrent/Atomic/AtomicIntegerArray.cs   |    66 +-
 .../Atomic/AtomicIntegerFieldUpdater.cs       |    68 +-
 .../Java/Util/Concurrent/Atomic/AtomicLong.cs |   139 +-
 .../Util/Concurrent/Atomic/AtomicLongArray.cs |    66 +-
 .../Atomic/AtomicLongFieldUpdater.cs          |    68 +-
 .../Atomic/AtomicMarkableReference.cs         |    58 +-
 .../Util/Concurrent/Atomic/AtomicReference.cs |   202 +-
 .../Concurrent/Atomic/AtomicReferenceArray.cs |   106 +-
 .../Atomic/AtomicReferenceFieldUpdater.cs     |    44 +-
 .../Atomic/AtomicStampedReference.cs          |    84 +-
 .../Concurrent/Atomic/DoubleAccumulator.cs    |    19 +-
 .../Util/Concurrent/Atomic/DoubleAdder.cs     |     8 +-
 .../Util/Concurrent/Atomic/LongAccumulator.cs |    19 +-
 .../Java/Util/Concurrent/Atomic/LongAdder.cs  |    12 +-
 .../Java/Util/Concurrent/BlockingDeque.cs     |   116 +-
 .../Java/Util/Concurrent/BlockingQueue.cs     |    48 +-
 .../Java/Util/Concurrent/Callable.cs          |     4 +-
 .../Java/Util/Concurrent/CompletableFuture.cs |   408 +-
 .../Java/Util/Concurrent/CompletionService.cs |    20 +-
 .../Java/Util/Concurrent/CompletionStage.cs   |   307 +-
 .../Java/Util/Concurrent/ConcurrentHashMap.cs |   238 +-
 .../Util/Concurrent/ConcurrentLinkedDeque.cs  |   144 +-
 .../Util/Concurrent/ConcurrentLinkedQueue.cs  |     4 +-
 .../Java/Util/Concurrent/ConcurrentMap.cs     |    56 +-
 .../Util/Concurrent/ConcurrentNavigableMap.cs |    40 +-
 .../Util/Concurrent/ConcurrentSkipListMap.cs  |   104 +-
 .../Util/Concurrent/ConcurrentSkipListSet.cs  |    76 +-
 .../Util/Concurrent/CopyOnWriteArrayList.cs   |   140 +-
 .../Util/Concurrent/CopyOnWriteArraySet.cs    |     4 +-
 .../Java/Util/Concurrent/CountDownLatch.cs    |    23 +-
 .../Java/Util/Concurrent/CountedCompleter.cs  |   154 +-
 .../Java/Util/Concurrent/CyclicBarrier.cs     |    42 +-
 .../Java/Util/Concurrent/DelayQueue.cs        |    52 +-
 .../Generated/Java/Util/Concurrent/Delayed.cs |     2 +-
 .../Java/Util/Concurrent/Exchanger.cs         |     8 +-
 .../Java/Util/Concurrent/Executor.cs          |     2 +-
 .../Concurrent/ExecutorCompletionService.cs   |    28 +-
 .../Java/Util/Concurrent/ExecutorService.cs   |    32 +-
 .../Java/Util/Concurrent/Executors.cs         |    47 +-
 .../Generated/Java/Util/Concurrent/Flow.cs    |    28 +-
 .../Java/Util/Concurrent/ForkJoinPool.cs      |   146 +-
 .../Java/Util/Concurrent/ForkJoinTask.cs      |   278 +-
 .../Util/Concurrent/ForkJoinWorkerThread.cs   |    14 +-
 .../Generated/Java/Util/Concurrent/Future.cs  |    20 +-
 .../Java/Util/Concurrent/FutureTask.cs        |    32 +-
 .../Util/Concurrent/LinkedBlockingDeque.cs    |   192 +-
 .../Util/Concurrent/LinkedBlockingQueue.cs    |    40 +-
 .../Util/Concurrent/LinkedTransferQueue.cs    |    82 +-
 .../Locks/AbstractQueuedLongSynchronizer.cs   |   123 +-
 .../Locks/AbstractQueuedSynchronizer.cs       |   123 +-
 .../Concurrent/Locks/AllPackageClasses.cs     |    52 +-
 .../Java/Util/Concurrent/Locks/Condition.cs   |    14 +-
 .../Java/Util/Concurrent/Locks/Lock.cs        |    12 +-
 .../Java/Util/Concurrent/Locks/LockSupport.cs |    24 +-
 .../Util/Concurrent/Locks/ReadWriteLock.cs    |     4 +-
 .../Util/Concurrent/Locks/ReentrantLock.cs    |    58 +-
 .../Locks/ReentrantReadWriteLock.cs           |   121 +-
 .../Java/Util/Concurrent/Locks/StampedLock.cs |    69 +-
 .../Generated/Java/Util/Concurrent/Phaser.cs  |   114 +-
 .../Util/Concurrent/PriorityBlockingQueue.cs  |    40 +-
 .../Concurrent/RejectedExecutionHandler.cs    |     2 +-
 .../Java/Util/Concurrent/RunnableFuture.cs    |     4 +-
 .../Concurrent/RunnableScheduledFuture.cs     |     4 +-
 .../Concurrent/ScheduledExecutorService.cs    |     8 +-
 .../Concurrent/ScheduledThreadPoolExecutor.cs |    75 +-
 .../Java/Util/Concurrent/Semaphore.cs         |    47 +-
 .../Util/Concurrent/SubmissionPublisher.cs    |   217 +-
 .../Java/Util/Concurrent/SynchronousQueue.cs  |    36 +-
 .../Java/Util/Concurrent/ThreadFactory.cs     |     2 +-
 .../Java/Util/Concurrent/ThreadLocalRandom.cs |    50 +-
 .../Util/Concurrent/ThreadPoolExecutor.cs     |   174 +-
 .../Java/Util/Concurrent/TimeUnit.cs          |    46 +-
 .../Java/Util/Concurrent/TransferQueue.cs     |    46 +-
 .../Netdroid/Generated/Java/Util/Currency.cs  |    71 +-
 src/net/Netdroid/Generated/Java/Util/Date.cs  |   218 +-
 src/net/Netdroid/Generated/Java/Util/Deque.cs |   166 +-
 .../Generated/Java/Util/Dictionary.cs         |    28 +-
 .../Java/Util/DoubleSummaryStatistics.cs      |    41 +-
 .../Netdroid/Generated/Java/Util/EnumMap.cs   |    20 +-
 .../Netdroid/Generated/Java/Util/EnumSet.cs   |    76 +-
 .../Generated/Java/Util/Enumeration.cs        |    12 +-
 .../Generated/Java/Util/EventObject.cs        |     9 +-
 .../Generated/Java/Util/Formattable.cs        |     2 +-
 .../Generated/Java/Util/FormattableFlags.cs   |     6 +-
 .../Netdroid/Generated/Java/Util/Formatter.cs |    54 +-
 .../Java/Util/Function/AllPackageClasses.cs   |   768 +-
 .../Java/Util/Function/BiConsumer.cs          |    52 +-
 .../Java/Util/Function/BiFunction.cs          |    52 +-
 .../Java/Util/Function/BiPredicate.cs         |   106 +-
 .../Java/Util/Function/BinaryOperator.cs      |    52 +-
 .../Java/Util/Function/BooleanSupplier.cs     |    17 +-
 .../Generated/Java/Util/Function/Consumer.cs  |    52 +-
 .../Util/Function/DoubleBinaryOperator.cs     |    12 +-
 .../Java/Util/Function/DoubleConsumer.cs      |    24 +-
 .../Java/Util/Function/DoubleFunction.cs      |    22 +-
 .../Java/Util/Function/DoublePredicate.cs     |    48 +-
 .../Java/Util/Function/DoubleSupplier.cs      |    17 +-
 .../Java/Util/Function/DoubleToIntFunction.cs |    12 +-
 .../Util/Function/DoubleToLongFunction.cs     |    12 +-
 .../Java/Util/Function/DoubleUnaryOperator.cs |    57 +-
 .../Generated/Java/Util/Function/Function.cs  |   124 +-
 .../Java/Util/Function/IntBinaryOperator.cs   |    12 +-
 .../Java/Util/Function/IntConsumer.cs         |    24 +-
 .../Java/Util/Function/IntFunction.cs         |    22 +-
 .../Java/Util/Function/IntPredicate.cs        |    48 +-
 .../Java/Util/Function/IntSupplier.cs         |    17 +-
 .../Java/Util/Function/IntToDoubleFunction.cs |    12 +-
 .../Java/Util/Function/IntToLongFunction.cs   |    12 +-
 .../Java/Util/Function/IntUnaryOperator.cs    |    57 +-
 .../Java/Util/Function/LongBinaryOperator.cs  |    12 +-
 .../Java/Util/Function/LongConsumer.cs        |    24 +-
 .../Java/Util/Function/LongFunction.cs        |    22 +-
 .../Java/Util/Function/LongPredicate.cs       |    48 +-
 .../Java/Util/Function/LongSupplier.cs        |    17 +-
 .../Util/Function/LongToDoubleFunction.cs     |    12 +-
 .../Java/Util/Function/LongToIntFunction.cs   |    12 +-
 .../Java/Util/Function/LongUnaryOperator.cs   |    57 +-
 .../Java/Util/Function/ObjDoubleConsumer.cs   |    22 +-
 .../Java/Util/Function/ObjIntConsumer.cs      |    22 +-
 .../Java/Util/Function/ObjLongConsumer.cs     |    22 +-
 .../Generated/Java/Util/Function/Predicate.cs |   190 +-
 .../Generated/Java/Util/Function/Supplier.cs  |    22 +-
 .../Java/Util/Function/ToDoubleBiFunction.cs  |    22 +-
 .../Java/Util/Function/ToDoubleFunction.cs    |    22 +-
 .../Java/Util/Function/ToIntBiFunction.cs     |    22 +-
 .../Java/Util/Function/ToIntFunction.cs       |    22 +-
 .../Java/Util/Function/ToLongBiFunction.cs    |    22 +-
 .../Java/Util/Function/ToLongFunction.cs      |    22 +-
 .../Java/Util/Function/UnaryOperator.cs       |    82 +-
 .../Generated/Java/Util/GregorianCalendar.cs  |    45 +-
 .../Netdroid/Generated/Java/Util/HashMap.cs   |    12 +-
 .../Netdroid/Generated/Java/Util/HashSet.cs   |    12 +-
 .../Netdroid/Generated/Java/Util/Hashtable.cs |   102 +-
 .../Netdroid/Generated/Java/Util/HexFormat.cs |   367 -
 .../Generated/Java/Util/IdentityHashMap.cs    |     8 +-
 .../Java/Util/IntSummaryStatistics.cs         |    41 +-
 .../Java/Util/Jar/AllPackageClasses.cs        |   157 +-
 .../Generated/Java/Util/Jar/Attributes.cs     |    78 +-
 .../Generated/Java/Util/Jar/JarEntry.cs       |    35 +-
 .../Generated/Java/Util/Jar/JarFile.cs        |    69 +-
 .../Generated/Java/Util/Jar/JarInputStream.cs |    19 +-
 .../Java/Util/Jar/JarOutputStream.cs          |     4 +-
 .../Generated/Java/Util/Jar/Manifest.cs       |    34 +-
 .../Generated/Java/Util/Jar/Pack200.cs        |   336 +
 .../Generated/Java/Util/LinkedHashMap.cs      |    16 +-
 .../Generated/Java/Util/LinkedHashSet.cs      |    12 +-
 .../Generated/Java/Util/LinkedList.cs         |   144 +-
 src/net/Netdroid/Generated/Java/Util/List.cs  |   158 +-
 .../Generated/Java/Util/ListIterator.cs       |    36 +-
 .../Generated/Java/Util/ListResourceBundle.cs |     2 +-
 .../Netdroid/Generated/Java/Util/Locale.cs    |   404 +-
 .../Java/Util/Logging/AllPackageClasses.cs    |    52 +-
 .../Java/Util/Logging/ErrorManager.cs         |    14 +-
 .../Java/Util/Logging/FileHandler.cs          |    10 +-
 .../Generated/Java/Util/Logging/Filter.cs     |     2 +-
 .../Generated/Java/Util/Logging/Formatter.cs  |     8 +-
 .../Generated/Java/Util/Logging/Handler.cs    |   110 +-
 .../Generated/Java/Util/Logging/Level.cs      |    49 +-
 .../Generated/Java/Util/Logging/LogManager.cs |    56 +-
 .../Generated/Java/Util/Logging/LogRecord.cs  |   198 +-
 .../Generated/Java/Util/Logging/Logger.cs     |   228 +-
 .../Java/Util/Logging/LoggingMXBean.cs        |    21 +-
 .../Java/Util/Logging/LoggingPermission.cs    |     2 +-
 .../Java/Util/Logging/MemoryHandler.cs        |    22 +-
 .../Java/Util/Logging/SocketHandler.cs        |     2 +-
 .../Java/Util/Logging/StreamHandler.cs        |     2 +-
 .../Java/Util/LongSummaryStatistics.cs        |    43 +-
 src/net/Netdroid/Generated/Java/Util/Map.cs   |   218 +-
 .../Generated/Java/Util/NavigableMap.cs       |    84 +-
 .../Generated/Java/Util/NavigableSet.cs       |    60 +-
 .../Netdroid/Generated/Java/Util/Objects.cs   |    66 +-
 .../Generated/Java/Util/Observable.cs         |    14 +-
 .../Netdroid/Generated/Java/Util/Observer.cs  |     2 +-
 .../Netdroid/Generated/Java/Util/Optional.cs  |    88 +-
 .../Generated/Java/Util/OptionalDouble.cs     |    41 +-
 .../Generated/Java/Util/OptionalInt.cs        |    41 +-
 .../Generated/Java/Util/OptionalLong.cs       |    41 +-
 .../Java/Util/Prefs/AllPackageClasses.cs      |    50 +-
 .../Java/Util/Prefs/NodeChangeEvent.cs        |    16 +-
 .../Java/Util/Prefs/NodeChangeListener.cs     |    22 +-
 .../Java/Util/Prefs/PreferenceChangeEvent.cs  |    23 +-
 .../Util/Prefs/PreferenceChangeListener.cs    |    12 +-
 .../Generated/Java/Util/Prefs/Preferences.cs  |    82 +-
 .../Java/Util/Prefs/PreferencesFactory.cs     |     4 +-
 .../Generated/Java/Util/PrimitiveIterator.cs  |    40 +-
 .../Generated/Java/Util/PriorityQueue.cs      |    16 +-
 .../Generated/Java/Util/Properties.cs         |    38 +-
 .../Generated/Java/Util/PropertyPermission.cs |     2 +-
 .../Java/Util/PropertyResourceBundle.cs       |     6 +-
 src/net/Netdroid/Generated/Java/Util/Queue.cs |    24 +-
 .../Netdroid/Generated/Java/Util/Random.cs    |    50 +-
 .../Java/Util/Regex/AllPackageClasses.cs      |    12 +-
 .../Generated/Java/Util/Regex/MatchResult.cs  |    14 +-
 .../Generated/Java/Util/Regex/Matcher.cs      |    76 +-
 .../Generated/Java/Util/Regex/Pattern.cs      |    46 +-
 .../Generated/Java/Util/ResourceBundle.cs     |    93 +-
 .../Netdroid/Generated/Java/Util/Scanner.cs   |   142 +-
 .../Generated/Java/Util/ServiceLoader.cs      |    24 +-
 src/net/Netdroid/Generated/Java/Util/Set.cs   |   112 +-
 .../Generated/Java/Util/SimpleTimeZone.cs     |    30 +-
 .../Netdroid/Generated/Java/Util/SortedMap.cs |    32 +-
 .../Netdroid/Generated/Java/Util/SortedSet.cs |    24 +-
 .../Generated/Java/Util/Spliterator.cs        |   156 +-
 .../Generated/Java/Util/Spliterators.cs       |    88 +-
 .../Generated/Java/Util/SplittableRandom.cs   |   134 +-
 src/net/Netdroid/Generated/Java/Util/Stack.cs |    20 +-
 .../Java/Util/Stream/AllPackageClasses.cs     |    62 +-
 .../Generated/Java/Util/Stream/BaseStream.cs  |    32 +-
 .../Generated/Java/Util/Stream/Collector.cs   |    54 +-
 .../Generated/Java/Util/Stream/Collectors.cs  |   161 +-
 .../Java/Util/Stream/DoubleStream.cs          |    97 +-
 .../Generated/Java/Util/Stream/IntStream.cs   |   105 +-
 .../Generated/Java/Util/Stream/LongStream.cs  |    94 +-
 .../Generated/Java/Util/Stream/Stream.cs      |   299 +-
 .../Java/Util/Stream/StreamSupport.cs         |    24 +-
 .../Generated/Java/Util/StringJoiner.cs       |    12 +-
 .../Generated/Java/Util/StringTokenizer.cs    |    18 +-
 .../Netdroid/Generated/Java/Util/TimeZone.cs  |   136 +-
 src/net/Netdroid/Generated/Java/Util/Timer.cs |    22 +-
 .../Netdroid/Generated/Java/Util/TimerTask.cs |     6 +-
 .../Netdroid/Generated/Java/Util/TreeMap.cs   |   100 +-
 .../Netdroid/Generated/Java/Util/TreeSet.cs   |    72 +-
 src/net/Netdroid/Generated/Java/Util/UUID.cs  |    52 +-
 .../Netdroid/Generated/Java/Util/Vector.cs    |    80 +-
 .../Generated/Java/Util/WeakHashMap.cs        |    12 +-
 .../Generated/Java/Util/Zip/Adler32.cs        |    15 +-
 .../Java/Util/Zip/AllPackageClasses.cs        |    46 +-
 .../Netdroid/Generated/Java/Util/Zip/CRC32.cs |    15 +-
 .../Generated/Java/Util/Zip/CRC32C.cs         |    15 +-
 .../Java/Util/Zip/CheckedInputStream.cs       |     9 +-
 .../Java/Util/Zip/CheckedOutputStream.cs      |     9 +-
 .../Generated/Java/Util/Zip/Checksum.cs       |    17 +-
 .../Generated/Java/Util/Zip/Deflater.cs       |   137 +-
 .../Java/Util/Zip/DeflaterInputStream.cs      |     6 +-
 .../Java/Util/Zip/DeflaterOutputStream.cs     |    14 +-
 .../Java/Util/Zip/GZIPInputStream.cs          |     6 +-
 .../Java/Util/Zip/GZIPOutputStream.cs         |     8 +-
 .../Generated/Java/Util/Zip/Inflater.cs       |   106 +-
 .../Java/Util/Zip/InflaterInputStream.cs      |     6 +-
 .../Java/Util/Zip/InflaterOutputStream.cs     |     8 +-
 .../Generated/Java/Util/Zip/ZipEntry.cs       |   194 +-
 .../Generated/Java/Util/Zip/ZipFile.cs        |    62 +-
 .../Generated/Java/Util/Zip/ZipInputStream.cs |    14 +-
 .../Java/Util/Zip/ZipOutputStream.cs          |    18 +-
 .../Processing/AllPackageClasses.cs           |     6 +-
 .../Javax/Annotation/Processing/Generated.cs  |     6 +-
 .../Javax/Crypto/AllPackageClasses.cs         |    76 +-
 .../Netdroid/Generated/Javax/Crypto/Cipher.cs |   166 +-
 .../Javax/Crypto/CipherInputStream.cs         |     2 +-
 .../Javax/Crypto/CipherOutputStream.cs        |     2 +-
 .../Javax/Crypto/EncryptedPrivateKeyInfo.cs   |    43 +-
 .../Javax/Crypto/ExemptionMechanism.cs        |    52 +-
 .../Crypto/Interfaces/AllPackageClasses.cs    |    24 +-
 .../Javax/Crypto/Interfaces/DHKey.cs          |     7 +-
 .../Javax/Crypto/Interfaces/DHPrivateKey.cs   |    10 +-
 .../Javax/Crypto/Interfaces/DHPublicKey.cs    |    10 +-
 .../Javax/Crypto/Interfaces/PBEKey.cs         |    24 +-
 .../Generated/Javax/Crypto/KeyAgreement.cs    |    52 +-
 .../Generated/Javax/Crypto/KeyGenerator.cs    |    32 +-
 .../Netdroid/Generated/Javax/Crypto/Mac.cs    |    65 +-
 .../Generated/Javax/Crypto/SealedObject.cs    |    23 +-
 .../Generated/Javax/Crypto/SecretKey.cs       |     3 +-
 .../Javax/Crypto/SecretKeyFactory.cs          |    26 +-
 .../Javax/Crypto/Spec/AllPackageClasses.cs    |    32 +-
 .../Generated/Javax/Crypto/Spec/DESKeySpec.cs |    17 +-
 .../Javax/Crypto/Spec/DESedeKeySpec.cs        |    15 +-
 .../Javax/Crypto/Spec/DHGenParameterSpec.cs   |    16 +-
 .../Javax/Crypto/Spec/DHParameterSpec.cs      |    25 +-
 .../Javax/Crypto/Spec/DHPrivateKeySpec.cs     |    23 +-
 .../Javax/Crypto/Spec/DHPublicKeySpec.cs      |    23 +-
 .../Javax/Crypto/Spec/GCMParameterSpec.cs     |    18 +-
 .../Javax/Crypto/Spec/IvParameterSpec.cs      |    11 +-
 .../Javax/Crypto/Spec/OAEPParameterSpec.cs    |    32 +-
 .../Generated/Javax/Crypto/Spec/PBEKeySpec.cs |    38 +-
 .../Javax/Crypto/Spec/PBEParameterSpec.cs     |    25 +-
 .../Generated/Javax/Crypto/Spec/PSource.cs    |    18 +-
 .../Javax/Crypto/Spec/RC2ParameterSpec.cs     |    20 +-
 .../Javax/Crypto/Spec/RC5ParameterSpec.cs     |    34 +-
 .../Javax/Crypto/Spec/SecretKeySpec.cs        |    25 +-
 .../Khronos/Egl/AllPackageClasses.cs          |    28 +-
 .../Javax/Microedition/Khronos/Egl/EGL10.cs   |     2 +-
 .../Microedition/Khronos/Egl/EGLContext.cs    |    14 +-
 .../Khronos/Opengles/AllPackageClasses.cs     |    24 +-
 .../Generated/Javax/Net/AllPackageClasses.cs  |    12 +-
 .../Javax/Net/ServerSocketFactory.cs          |    15 +-
 .../Generated/Javax/Net/SocketFactory.cs      |    17 +-
 .../Javax/Net/Ssl/AllPackageClasses.cs        |   194 +-
 .../Net/Ssl/CertPathTrustManagerParameters.cs |     9 +-
 .../Javax/Net/Ssl/ExtendedSSLSession.cs       |    28 +-
 .../Javax/Net/Ssl/HandshakeCompletedEvent.cs  |    63 +-
 .../Net/Ssl/HandshakeCompletedListener.cs     |    12 +-
 .../Javax/Net/Ssl/HostnameVerifier.cs         |     2 +-
 .../Javax/Net/Ssl/HttpsURLConnection.cs       |    96 +-
 .../Javax/Net/Ssl/KeyManagerFactory.cs        |    38 +-
 .../Net/Ssl/KeyStoreBuilderParameters.cs      |    11 +-
 .../Generated/Javax/Net/Ssl/SNIHostName.cs    |    13 +-
 .../Generated/Javax/Net/Ssl/SNIMatcher.cs     |    17 +-
 .../Generated/Javax/Net/Ssl/SNIServerName.cs  |    14 +-
 .../Generated/Javax/Net/Ssl/SSLContext.cs     |   108 +-
 .../Generated/Javax/Net/Ssl/SSLEngine.cs      |   280 +-
 .../Javax/Net/Ssl/SSLEngineResult.cs          |    64 +-
 .../Generated/Javax/Net/Ssl/SSLParameters.cs  |   184 +-
 .../Generated/Javax/Net/Ssl/SSLPermission.cs  |     4 +-
 .../Javax/Net/Ssl/SSLServerSocket.cs          |   119 +-
 .../Javax/Net/Ssl/SSLServerSocketFactory.cs   |    14 +-
 .../Generated/Javax/Net/Ssl/SSLSession.cs     |   141 +-
 .../Javax/Net/Ssl/SSLSessionBindingEvent.cs   |    16 +-
 .../Net/Ssl/SSLSessionBindingListener.cs      |    22 +-
 .../Javax/Net/Ssl/SSLSessionContext.cs        |    41 +-
 .../Generated/Javax/Net/Ssl/SSLSocket.cs      |   188 +-
 .../Javax/Net/Ssl/SSLSocketFactory.cs         |    18 +-
 .../Javax/Net/Ssl/StandardConstants.cs        |     2 +-
 .../Javax/Net/Ssl/TrustManagerFactory.cs      |    38 +-
 .../Javax/Net/Ssl/X509ExtendedKeyManager.cs   |     4 +-
 .../Javax/Net/Ssl/X509ExtendedTrustManager.cs |     8 +-
 .../Generated/Javax/Net/Ssl/X509KeyManager.cs |    12 +-
 .../Javax/Net/Ssl/X509TrustManager.cs         |    11 +-
 .../Javax/Security/Auth/AllPackageClasses.cs  |    17 +-
 .../Javax/Security/Auth/AuthPermission.cs     |     4 +-
 .../Auth/Callback/AllPackageClasses.cs        |    16 +-
 .../Security/Auth/Callback/CallbackHandler.cs |     2 +-
 .../Auth/Callback/PasswordCallback.cs         |    34 +-
 .../Javax/Security/Auth/Destroyable.cs        |     4 +-
 .../Security/Auth/Login/AllPackageClasses.cs  |     2 +-
 .../Auth/PrivateCredentialPermission.cs       |    16 +-
 .../Generated/Javax/Security/Auth/Subject.cs  |    74 +-
 .../Security/Auth/SubjectDomainCombiner.cs    |    19 +-
 .../Security/Auth/X500/AllPackageClasses.cs   |     2 +-
 .../Javax/Security/Auth/X500/X500Principal.cs |    32 +-
 .../Javax/Security/Cert/AllPackageClasses.cs  |    36 +-
 .../Javax/Security/Cert/Certificate.cs        |    19 +-
 .../Javax/Security/Cert/X509Certificate.cs    |    71 +-
 .../Generated/Javax/Sql/AllPackageClasses.cs  |    96 +-
 .../Generated/Javax/Sql/CommonDataSource.cs   |    41 +-
 .../Generated/Javax/Sql/ConnectionEvent.cs    |    11 +-
 .../Javax/Sql/ConnectionEventListener.cs      |    22 +-
 .../Javax/Sql/ConnectionPoolDataSource.cs     |    44 +-
 .../Generated/Javax/Sql/DataSource.cs         |    44 +-
 .../Generated/Javax/Sql/PooledConnection.cs   |    18 +-
 .../Netdroid/Generated/Javax/Sql/RowSet.cs    |   374 +-
 .../Generated/Javax/Sql/RowSetEvent.cs        |     2 +-
 .../Generated/Javax/Sql/RowSetInternal.cs     |    34 +-
 .../Generated/Javax/Sql/RowSetListener.cs     |    32 +-
 .../Generated/Javax/Sql/RowSetMetaData.cs     |    34 +-
 .../Generated/Javax/Sql/RowSetReader.cs       |     2 +-
 .../Generated/Javax/Sql/RowSetWriter.cs       |     2 +-
 .../Generated/Javax/Sql/StatementEvent.cs     |    18 +-
 .../Javax/Sql/StatementEventListener.cs       |    22 +-
 .../Generated/Javax/Xml/AllPackageClasses.cs  |     2 +-
 .../Javax/Xml/Datatype/AllPackageClasses.cs   |    24 +-
 .../Javax/Xml/Datatype/DatatypeConstants.cs   |    79 +-
 .../Javax/Xml/Datatype/DatatypeFactory.cs     |    52 +-
 .../Generated/Javax/Xml/Datatype/Duration.cs  |   150 +-
 .../Xml/Datatype/XMLGregorianCalendar.cs      |   214 +-
 .../Javax/Xml/Namespace/AllPackageClasses.cs  |     8 +-
 .../Javax/Xml/Namespace/NamespaceContext.cs   |     6 +-
 .../Generated/Javax/Xml/Namespace/QName.cs    |    29 +-
 .../Javax/Xml/Parsers/AllPackageClasses.cs    |    28 +-
 .../Javax/Xml/Parsers/DocumentBuilder.cs      |    54 +-
 .../Xml/Parsers/DocumentBuilderFactory.cs     |    93 +-
 .../Generated/Javax/Xml/Parsers/SAXParser.cs  |    79 +-
 .../Javax/Xml/Parsers/SAXParserFactory.cs     |    73 +-
 .../Javax/Xml/Transform/AllPackageClasses.cs  |    62 +-
 .../Xml/Transform/Dom/AllPackageClasses.cs    |    10 +-
 .../Javax/Xml/Transform/Dom/DOMLocator.cs     |     7 +-
 .../Javax/Xml/Transform/Dom/DOMResult.cs      |    55 +-
 .../Javax/Xml/Transform/Dom/DOMSource.cs      |    44 +-
 .../Javax/Xml/Transform/ErrorListener.cs      |    32 +-
 .../Javax/Xml/Transform/OutputKeys.cs         |    20 +-
 .../Generated/Javax/Xml/Transform/Result.cs   |    19 +-
 .../Xml/Transform/Sax/AllPackageClasses.cs    |    22 +-
 .../Javax/Xml/Transform/Sax/SAXResult.cs      |    49 +-
 .../Javax/Xml/Transform/Sax/SAXSource.cs      |    61 +-
 .../Transform/Sax/SAXTransformerFactory.cs    |    16 +-
 .../Xml/Transform/Sax/TemplatesHandler.cs     |    22 +-
 .../Xml/Transform/Sax/TransformerHandler.cs   |    24 +-
 .../Generated/Javax/Xml/Transform/Source.cs   |    17 +-
 .../Javax/Xml/Transform/SourceLocator.cs      |    28 +-
 .../Xml/Transform/Stream/AllPackageClasses.cs |     4 +-
 .../Xml/Transform/Stream/StreamResult.cs      |    51 +-
 .../Xml/Transform/Stream/StreamSource.cs      |    78 +-
 .../Javax/Xml/Transform/Templates.cs          |     9 +-
 .../Javax/Xml/Transform/Transformer.cs        |    86 +-
 .../Javax/Xml/Transform/TransformerFactory.cs |    76 +-
 .../Javax/Xml/Transform/URIResolver.cs        |     2 +-
 .../Javax/Xml/Validation/AllPackageClasses.cs |    36 +-
 .../Generated/Javax/Xml/Validation/Schema.cs  |     4 +-
 .../Javax/Xml/Validation/SchemaFactory.cs     |    72 +-
 .../Xml/Validation/SchemaFactoryLoader.cs     |     2 +-
 .../Javax/Xml/Validation/TypeInfoProvider.cs  |    21 +-
 .../Javax/Xml/Validation/Validator.cs         |    44 +-
 .../Javax/Xml/Validation/ValidatorHandler.cs  |    60 +-
 .../Generated/Javax/Xml/XMLConstants.cs       |    32 +-
 .../Javax/Xml/Xpath/AllPackageClasses.cs      |    46 +-
 .../Generated/Javax/Xml/Xpath/XPath.cs        |    85 +-
 .../Javax/Xml/Xpath/XPathConstants.cs         |    12 +-
 .../Javax/Xml/Xpath/XPathExpression.cs        |    12 +-
 .../Generated/Javax/Xml/Xpath/XPathFactory.cs |    24 +-
 .../Javax/Xml/Xpath/XPathFunction.cs          |     2 +-
 .../Javax/Xml/Xpath/XPathFunctionResolver.cs  |     2 +-
 .../Javax/Xml/Xpath/XPathVariableResolver.cs  |     2 +-
 .../Org/Apache/Http/Conn/AllPackageClasses.cs |     2 +-
 .../Http/Conn/Scheme/AllPackageClasses.cs     |    18 +-
 .../Http/Conn/Scheme/HostNameResolver.cs      |     2 +-
 .../Http/Conn/Scheme/LayeredSocketFactory.cs  |     2 +-
 .../Apache/Http/Conn/Scheme/SocketFactory.cs  |     6 +-
 .../Apache/Http/Conn/Ssl/AbstractVerifier.cs  |    16 +-
 .../Apache/Http/Conn/Ssl/AllPackageClasses.cs |    20 +-
 .../Apache/Http/Conn/Ssl/SSLSocketFactory.cs  |    63 +-
 .../Http/Conn/Ssl/X509HostnameVerifier.cs     |     8 +-
 .../Apache/Http/Params/AllPackageClasses.cs   |    14 +-
 .../Http/Params/CoreConnectionPNames.cs       |    16 +-
 .../Http/Params/HttpConnectionParams.cs       |    24 +-
 .../Org/Apache/Http/Params/HttpParams.cs      |    28 +-
 .../Org/W3c/Dom/AllPackageClasses.cs          |   164 +-
 .../Netdroid/Generated/Org/W3c/Dom/Attr.cs    |    52 +-
 .../Generated/Org/W3c/Dom/CharacterData.cs    |    34 +-
 .../Generated/Org/W3c/Dom/DOMConfiguration.cs |    21 +-
 .../Generated/Org/W3c/Dom/DOMError.cs         |    48 +-
 .../Generated/Org/W3c/Dom/DOMErrorHandler.cs  |     2 +-
 .../Org/W3c/Dom/DOMImplementation.cs          |     8 +-
 .../Org/W3c/Dom/DOMImplementationList.cs      |     9 +-
 .../Org/W3c/Dom/DOMImplementationSource.cs    |     4 +-
 .../Generated/Org/W3c/Dom/DOMLocator.cs       |    42 +-
 .../Generated/Org/W3c/Dom/DOMStringList.cs    |    19 +-
 .../Generated/Org/W3c/Dom/Document.cs         |   170 +-
 .../Generated/Org/W3c/Dom/DocumentType.cs     |    42 +-
 .../Netdroid/Generated/Org/W3c/Dom/Element.cs |    66 +-
 .../Netdroid/Generated/Org/W3c/Dom/Entity.cs  |    42 +-
 .../Org/W3c/Dom/Ls/AllPackageClasses.cs       |    44 +-
 .../Org/W3c/Dom/Ls/DOMImplementationLS.cs     |    12 +-
 .../Generated/Org/W3c/Dom/Ls/LSInput.cs       |   120 +-
 .../Generated/Org/W3c/Dom/Ls/LSOutput.cs      |    60 +-
 .../Generated/Org/W3c/Dom/Ls/LSParser.cs      |    70 +-
 .../Org/W3c/Dom/Ls/LSParserFilter.cs          |    19 +-
 .../Org/W3c/Dom/Ls/LSResourceResolver.cs      |     2 +-
 .../Generated/Org/W3c/Dom/Ls/LSSerializer.cs  |    44 +-
 .../Generated/Org/W3c/Dom/NameList.cs         |    23 +-
 .../Generated/Org/W3c/Dom/NamedNodeMap.cs     |    21 +-
 .../Netdroid/Generated/Org/W3c/Dom/Node.cs    |   333 +-
 .../Generated/Org/W3c/Dom/NodeList.cs         |     9 +-
 .../Generated/Org/W3c/Dom/Notation.cs         |    14 +-
 .../Org/W3c/Dom/ProcessingInstruction.cs      |    23 +-
 .../Netdroid/Generated/Org/W3c/Dom/Text.cs    |    19 +-
 .../Generated/Org/W3c/Dom/TypeInfo.cs         |    36 +-
 .../Generated/Org/W3c/Dom/UserDataHandler.cs  |    12 +-
 .../Org/Xml/Sax/AllPackageClasses.cs          |    86 +-
 .../Generated/Org/Xml/Sax/AttributeList.cs    |    17 +-
 .../Generated/Org/Xml/Sax/Attributes.cs       |    37 +-
 .../Generated/Org/Xml/Sax/ContentHandler.cs   |    33 +-
 .../Generated/Org/Xml/Sax/DTDHandler.cs       |     4 +-
 .../Generated/Org/Xml/Sax/DocumentHandler.cs  |    16 +-
 .../Generated/Org/Xml/Sax/EntityResolver.cs   |     2 +-
 .../Generated/Org/Xml/Sax/ErrorHandler.cs     |     6 +-
 .../Org/Xml/Sax/Ext/AllPackageClasses.cs      |    36 +-
 .../Generated/Org/Xml/Sax/Ext/Attributes2.cs  |    12 +-
 .../Org/Xml/Sax/Ext/Attributes2Impl.cs        |    18 +-
 .../Generated/Org/Xml/Sax/Ext/DeclHandler.cs  |     8 +-
 .../Org/Xml/Sax/Ext/DefaultHandler2.cs        |    26 +-
 .../Org/Xml/Sax/Ext/EntityResolver2.cs        |     4 +-
 .../Org/Xml/Sax/Ext/LexicalHandler.cs         |    14 +-
 .../Generated/Org/Xml/Sax/Ext/Locator2.cs     |    14 +-
 .../Generated/Org/Xml/Sax/Ext/Locator2Impl.cs |    32 +-
 .../Generated/Org/Xml/Sax/HandlerBase.cs      |    28 +-
 .../Org/Xml/Sax/Helpers/AllPackageClasses.cs  |    69 +-
 .../Org/Xml/Sax/Helpers/AttributeListImpl.cs  |    27 +-
 .../Org/Xml/Sax/Helpers/AttributesImpl.cs     |    59 +-
 .../Org/Xml/Sax/Helpers/DefaultHandler.cs     |    34 +-
 .../Org/Xml/Sax/Helpers/LocatorImpl.cs        |    62 +-
 .../Org/Xml/Sax/Helpers/NamespaceSupport.cs   |    54 +-
 .../Org/Xml/Sax/Helpers/ParserAdapter.cs      |   296 +-
 .../Org/Xml/Sax/Helpers/ParserFactory.cs      |     4 +-
 .../Org/Xml/Sax/Helpers/XMLFilterImpl.cs      |   155 +-
 .../Org/Xml/Sax/Helpers/XMLReaderAdapter.cs   |   581 +-
 .../Org/Xml/Sax/Helpers/XMLReaderFactory.cs   |     4 +-
 .../Generated/Org/Xml/Sax/InputSource.cs      |    89 +-
 .../Netdroid/Generated/Org/Xml/Sax/Locator.cs |    28 +-
 .../Netdroid/Generated/Org/Xml/Sax/Parser.cs  |    14 +-
 .../Generated/Org/Xml/Sax/XMLFilter.cs        |    15 +-
 .../Generated/Org/Xml/Sax/XMLReader.cs        |    96 +-
 .../Org/Xmlpull/V1/AllPackageClasses.cs       |     8 +-
 .../Generated/Org/Xmlpull/V1/Sax2/Driver.cs   |   167 +-
 .../Generated/Org/Xmlpull/V1/XmlPullParser.cs |   166 +-
 .../Generated/Org/Xmlpull/V1/XmlSerializer.cs |    41 +-
 3169 files changed, 124325 insertions(+), 93929 deletions(-)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/{OnMagnificationChangedListener.java => AccessibilityService_MagnificationController_OnMagnificationChangedListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/{OnShowModeChangedListener.java => AccessibilityService_SoftKeyboardController_OnShowModeChangedListener.java} (72%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/{AnimatorListener.java => Animator_AnimatorListener.java} (89%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/{AnimatorPauseListener.java => Animator_AnimatorPauseListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/{TransitionListener.java => LayoutTransition_TransitionListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/{TimeListener.java => TimeAnimator_TimeListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/{AnimatorUpdateListener.java => ValueAnimator_AnimatorUpdateListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/{DurationScaleChangeListener.java => ValueAnimator_DurationScaleChangeListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnMenuVisibilityListener.java => ActionBar_OnMenuVisibilityListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnNavigationListener.java => ActionBar_OnNavigationListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{TabListener.java => ActionBar_TabListener.java} (85%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnAlarmListener.java => AlarmManager_OnAlarmListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnOpActiveChangedListener.java => AppOpsManager_OnOpActiveChangedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnOpChangedListener.java => AppOpsManager_OnOpChangedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnProvideAssistDataListener.java => Application_OnProvideAssistDataListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnDateSetListener.java => DatePickerDialog_OnDateSetListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnBreadCrumbClickListener.java => FragmentBreadCrumbs_OnBreadCrumbClickListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnBackStackChangedListener.java => FragmentManager_OnBackStackChangedListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{KeyguardLockedStateListener.java => KeyguardManager_KeyguardLockedStateListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnCancelListener.java => SearchManager_OnCancelListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnDismissListener.java => SearchManager_OnDismissListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnSharedElementsReadyListener.java => SharedElementCallback_OnSharedElementsReadyListener.java} (74%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnTimeSetListener.java => TimePickerDialog_OnTimeSetListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnAccessibilityEventListener.java => UiAutomation_OnAccessibilityEventListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{ContrastChangeListener.java => UiModeManager_ContrastChangeListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/{OnColorsChangedListener.java => WallpaperManager_OnColorsChangedListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/admin/{OnClearApplicationUserDataListener.java => DevicePolicyManager_OnClearApplicationUserDataListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/bluetooth/{ServiceListener.java => BluetoothProfile_ServiceListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnPrimaryClipChangedListener.java => ClipboardManager_OnPrimaryClipChangedListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnCancelListener.java => DialogInterface_OnCancelListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnClickListener.java => DialogInterface_OnClickListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnDismissListener.java => DialogInterface_OnDismissListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnKeyListener.java => DialogInterface_OnKeyListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnMultiChoiceClickListener.java => DialogInterface_OnMultiChoiceClickListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnShowListener.java => DialogInterface_OnShowListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnLoadCanceledListener.java => Loader_OnLoadCanceledListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnLoadCompleteListener.java => Loader_OnLoadCompleteListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/{OnSharedPreferenceChangeListener.java => SharedPreferences_OnSharedPreferenceChangeListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/pm/{OnChecksumsReadyListener.java => PackageManager_OnChecksumsReadyListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/{OnErrorListener.java => DrmManagerClient_OnErrorListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/{OnEventListener.java => DrmManagerClient_OnEventListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/{OnInfoListener.java => DrmManagerClient_OnInfoListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/{OnGestureListener.java => GestureOverlayView_OnGestureListener.java} (84%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/{OnGesturePerformedListener.java => GestureOverlayView_OnGesturePerformedListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/{OnGesturingListener.java => GestureOverlayView_OnGesturingListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/{OnHeaderDecodedListener.java => ImageDecoder_OnHeaderDecodedListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/{OnPartialImageListener.java => ImageDecoder_OnPartialImageListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/{OnFrameAvailableListener.java => SurfaceTexture_OnFrameAvailableListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/drawable/{OnDrawableLoadedListener.java => Icon_OnDrawableLoadedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/{FaceDetectionListener.java => Camera_FaceDetectionListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/{OnZoomChangeListener.java => Camera_OnZoomChangeListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/display/{DisplayListener.java => DisplayManager_DisplayListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/input/{InputDeviceListener.java => InputManager_InputDeviceListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/inputmethodservice/{OnKeyboardActionListener.java => KeyboardView_OnKeyboardActionListener.java} (84%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/{GeocodeListener.java => Geocoder_GeocodeListener.java} (83%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GnssAntennaInfo_Listener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/{Listener.java => GpsStatus_Listener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/{NmeaListener.java => GpsStatus_NmeaListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnAudioFocusChangeListener.java => AudioManager_OnAudioFocusChangeListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnCommunicationDeviceChangedListener.java => AudioManager_OnCommunicationDeviceChangedListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnModeChangedListener.java => AudioManager_OnModeChangedListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnPreferredMixerAttributesChangedListener.java => AudioManager_OnPreferredMixerAttributesChangedListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnRecordPositionUpdateListener.java => AudioRecord_OnRecordPositionUpdateListener.java} (79%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRecord_OnRoutingChangedListener.java
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRouting_OnRoutingChangedListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnCodecFormatChangedListener.java => AudioTrack_OnCodecFormatChangedListener.java} (78%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnPlaybackPositionUpdateListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnRoutingChangedListener.java => AudioTrack_OnRoutingChangedListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnImageAvailableListener.java => ImageReader_OnImageAvailableListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnImageReleasedListener.java => ImageWriter_OnImageReleasedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnJetEventListener.java => JetPlayer_OnJetEventListener.java} (86%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{EventListener.java => MediaCas_EventListener.java} (90%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnFirstTunnelFrameReadyListener.java => MediaCodec_OnFirstTunnelFrameReadyListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnFrameRenderedListener.java => MediaCodec_OnFrameRenderedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnEventListener.java => MediaDrm_OnEventListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnExpirationUpdateListener.java => MediaDrm_OnExpirationUpdateListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnKeyStatusChangeListener.java => MediaDrm_OnKeyStatusChangeListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnSessionLostStateListener.java => MediaDrm_OnSessionLostStateListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnBufferingUpdateListener.java => MediaPlayer_OnBufferingUpdateListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnCompletionListener.java => MediaPlayer_OnCompletionListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnDrmInfoListener.java => MediaPlayer_OnDrmInfoListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnDrmPreparedListener.java => MediaPlayer_OnDrmPreparedListener.java} (78%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnErrorListener.java
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnInfoListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnMediaTimeDiscontinuityListener.java => MediaPlayer_OnMediaTimeDiscontinuityListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnPreparedListener.java => MediaPlayer_OnPreparedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnSeekCompleteListener.java => MediaPlayer_OnSeekCompleteListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnSubtitleDataListener.java => MediaPlayer_OnSubtitleDataListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnTimedMetaDataAvailableListener.java => MediaPlayer_OnTimedMetaDataAvailableListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnTimedTextListener.java => MediaPlayer_OnTimedTextListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnVideoSizeChangedListener.java => MediaPlayer_OnVideoSizeChangedListener.java} (78%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRecorder_OnErrorListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnInfoListener.java => MediaRecorder_OnInfoListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnGetControllerHintsListener.java => MediaRouter2_OnGetControllerHintsListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnScanCompletedListener.java => MediaScannerConnection_OnScanCompletedListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnErrorListener.java => MediaSync_OnErrorListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnGetPlaybackPositionListener.java => RemoteControlClient_OnGetPlaybackPositionListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnMetadataUpdateListener.java => RemoteControlClient_OnMetadataUpdateListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnPlaybackPositionUpdateListener.java => RemoteControlClient_OnPlaybackPositionUpdateListener.java} (74%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnClientUpdateListener.java => RemoteController_OnClientUpdateListener.java} (84%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnLoadCompleteListener.java => SoundPool_OnLoadCompleteListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnHeadTrackerAvailableListener.java => Spatializer_OnHeadTrackerAvailableListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/{OnSpatializerStateChangedListener.java => Spatializer_OnSpatializerStateChangedListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/{OnControlStatusChangeListener.java => AudioEffect_OnControlStatusChangeListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/{OnEnableStatusChangeListener.java => AudioEffect_OnEnableStatusChangeListener.java} (77%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/BassBoost_OnParameterChangeListener.java
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/EnvironmentalReverb_OnParameterChangeListener.java
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Equalizer_OnParameterChangeListener.java
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/PresetReverb_OnParameterChangeListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/{OnParameterChangeListener.java => Virtualizer_OnParameterChangeListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/{OnDataCaptureListener.java => Visualizer_OnDataCaptureListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/midi/{OnDeviceOpenedListener.java => MidiManager_OnDeviceOpenedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/{OnActiveSessionsChangedListener.java => MediaSessionManager_OnActiveSessionsChangedListener.java} (74%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/{OnMediaKeyEventSessionChangedListener.java => MediaSessionManager_OnMediaKeyEventSessionChangedListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/{OnSession2TokensChangedListener.java => MediaSessionManager_OnSession2TokensChangedListener.java} (74%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/{OnUnhandledInputEventListener.java => TvView_OnUnhandledInputEventListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/interactive/{OnUnhandledInputEventListener.java => TvInteractiveAppView_OnUnhandledInputEventListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/{OnNetworkActiveListener.java => ConnectivityManager_OnNetworkActiveListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/http/{StatusListener.java => UrlRequest_StatusListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/{DiscoveryListener.java => NsdManager_DiscoveryListener.java} (87%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/{RegistrationListener.java => NsdManager_RegistrationListener.java} (84%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/{ResolveListener.java => NsdManager_ResolveListener.java} (88%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/{LocalOnlyConnectionFailureListener.java => WifiManager_LocalOnlyConnectionFailureListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/{SuggestionConnectionStatusListener.java => WifiManager_SuggestionConnectionStatusListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/{SuggestionUserApprovalStatusListener.java => WifiManager_SuggestionUserApprovalStatusListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{ActionListener.java => WifiP2pManager_ActionListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{ChannelListener.java => WifiP2pManager_ChannelListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{ConnectionInfoListener.java => WifiP2pManager_ConnectionInfoListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{DeviceInfoListener.java => WifiP2pManager_DeviceInfoListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{DiscoveryStateListener.java => WifiP2pManager_DiscoveryStateListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{DnsSdServiceResponseListener.java => WifiP2pManager_DnsSdServiceResponseListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{DnsSdTxtRecordListener.java => WifiP2pManager_DnsSdTxtRecordListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{ExternalApproverRequestListener.java => WifiP2pManager_ExternalApproverRequestListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{GroupInfoListener.java => WifiP2pManager_GroupInfoListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{NetworkInfoListener.java => WifiP2pManager_NetworkInfoListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{P2pStateListener.java => WifiP2pManager_P2pStateListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{PeerListListener.java => WifiP2pManager_PeerListListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{ServiceResponseListener.java => WifiP2pManager_ServiceResponseListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/{UpnpServiceResponseListener.java => WifiP2pManager_UpnpServiceResponseListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/nfc/{OnTagRemovedListener.java => NfcAdapter_OnTagRemovedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/{OnCancelListener.java => CancellationSignal_OnCancelListener.java} (77%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/FileUtils_ProgressListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/{OnFileDescriptorEventListener.java => MessageQueue_OnFileDescriptorEventListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/{OnCloseListener.java => ParcelFileDescriptor_OnCloseListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/{OnThermalStatusChangedListener.java => PowerManager_OnThermalStatusChangedListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/{WakeLockStateListener.java => PowerManager_WakeLockStateListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/{ProgressListener.java => RecoverySystem_ProgressListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/{OnThreadViolationListener.java => StrictMode_OnThreadViolationListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/{OnVmViolationListener.java => StrictMode_OnVmViolationListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/{OnActivityDestroyListener.java => PreferenceManager_OnActivityDestroyListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/{OnActivityResultListener.java => PreferenceManager_OnActivityResultListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/{OnActivityStopListener.java => PreferenceManager_OnActivityStopListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/{OnPreferenceChangeListener.java => Preference_OnPreferenceChangeListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/{OnPreferenceClickListener.java => Preference_OnPreferenceClickListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/renderscript/{OnBufferAvailableListener.java => Allocation_OnBufferAvailableListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/se/omapi/{OnConnectedListener.java => SEService_OnConnectedListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/{OnInitListener.java => TextToSpeech_OnInitListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/{OnUtteranceCompletedListener.java => TextToSpeech_OnUtteranceCompletedListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{CarrierConfigChangeListener.java => CarrierConfigManager_CarrierConfigChangeListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{ActiveDataSubscriptionIdListener.java => TelephonyCallback_ActiveDataSubscriptionIdListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{BarringInfoListener.java => TelephonyCallback_BarringInfoListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{CallDisconnectCauseListener.java => TelephonyCallback_CallDisconnectCauseListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{CallForwardingIndicatorListener.java => TelephonyCallback_CallForwardingIndicatorListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{CallStateListener.java => TelephonyCallback_CallStateListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{CarrierNetworkListener.java => TelephonyCallback_CarrierNetworkListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{CellInfoListener.java => TelephonyCallback_CellInfoListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{CellLocationListener.java => TelephonyCallback_CellLocationListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{DataActivationStateListener.java => TelephonyCallback_DataActivationStateListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{DataActivityListener.java => TelephonyCallback_DataActivityListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{DataConnectionStateListener.java => TelephonyCallback_DataConnectionStateListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{DisplayInfoListener.java => TelephonyCallback_DisplayInfoListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{EmergencyNumberListListener.java => TelephonyCallback_EmergencyNumberListListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{ImsCallDisconnectCauseListener.java => TelephonyCallback_ImsCallDisconnectCauseListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{MessageWaitingIndicatorListener.java => TelephonyCallback_MessageWaitingIndicatorListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{PhysicalChannelConfigListener.java => TelephonyCallback_PhysicalChannelConfigListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{PreciseDataConnectionStateListener.java => TelephonyCallback_PreciseDataConnectionStateListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{RegistrationFailedListener.java => TelephonyCallback_RegistrationFailedListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{ServiceStateListener.java => TelephonyCallback_ServiceStateListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{SignalStrengthsListener.java => TelephonyCallback_SignalStrengthsListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/{UserMobileDataStateListener.java => TelephonyCallback_UserMobileDataStateListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/transition/{TransitionListener.java => Transition_TransitionListener.java} (85%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{VisibilityListener.java => ActionProvider_VisibilityListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnBufferTransformHintChangedListener.java => AttachedSurfaceControl_OnBufferTransformHintChangedListener.java} (73%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnContextClickListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnDoubleTapListener.java => GestureDetector_OnDoubleTapListener.java} (84%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnGestureListener.java => GestureDetector_OnGestureListener.java} (88%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{SimpleOnGestureListener.java => GestureDetector_SimpleOnGestureListener.java} (87%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnActionExpandListener.java => MenuItem_OnActionExpandListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnMenuItemClickListener.java => MenuItem_OnMenuItemClickListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnPixelCopyFinishedListener.java => PixelCopy_OnPixelCopyFinishedListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{SimpleOnScaleGestureListener.java => ScaleGestureDetector_OnScaleGestureListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnScaleGestureListener.java => ScaleGestureDetector_SimpleOnScaleGestureListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{TransactionCommittedListener.java => SurfaceControl_TransactionCommittedListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{SurfaceTextureListener.java => TextureView_SurfaceTextureListener.java} (85%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnHierarchyChangeListener.java => ViewGroup_OnHierarchyChangeListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnInflateListener.java => ViewStub_OnInflateListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnDrawListener.java => ViewTreeObserver_OnDrawListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnGlobalFocusChangeListener.java => ViewTreeObserver_OnGlobalFocusChangeListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnGlobalLayoutListener.java => ViewTreeObserver_OnGlobalLayoutListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnPreDrawListener.java => ViewTreeObserver_OnPreDrawListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnScrollChangedListener.java => ViewTreeObserver_OnScrollChangedListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnTouchModeChangeListener.java => ViewTreeObserver_OnTouchModeChangeListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnWindowAttachListener.java => ViewTreeObserver_OnWindowAttachListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnWindowFocusChangeListener.java => ViewTreeObserver_OnWindowFocusChangeListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnWindowVisibilityChangeListener.java => ViewTreeObserver_OnWindowVisibilityChangeListener.java} (75%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnApplyWindowInsetsListener.java => View_OnApplyWindowInsetsListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnAttachStateChangeListener.java => View_OnAttachStateChangeListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnCapturedPointerListener.java => View_OnCapturedPointerListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnClickListener.java => View_OnClickListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnContextClickListener.java => View_OnContextClickListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnCreateContextMenuListener.java => View_OnCreateContextMenuListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnDragListener.java => View_OnDragListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnFocusChangeListener.java => View_OnFocusChangeListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnGenericMotionListener.java => View_OnGenericMotionListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnHoverListener.java => View_OnHoverListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnKeyListener.java => View_OnKeyListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnLayoutChangeListener.java => View_OnLayoutChangeListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnLongClickListener.java => View_OnLongClickListener.java} (86%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnScrollChangeListener.java => View_OnScrollChangeListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnSystemUiVisibilityChangeListener.java => View_OnSystemUiVisibilityChangeListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnTouchListener.java => View_OnTouchListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnUnhandledKeyEventListener.java => View_OnUnhandledKeyEventListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnControllableInsetsChangedListener.java => WindowInsetsController_OnControllableInsetsChangedListener.java} (74%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnFrameMetricsAvailableListener.java => Window_OnFrameMetricsAvailableListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/{OnRestrictedCaptionAreaChangedListener.java => Window_OnRestrictedCaptionAreaChangedListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/{AccessibilityServicesStateChangeListener.java => AccessibilityManager_AccessibilityServicesStateChangeListener.java} (74%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/{AccessibilityStateChangeListener.java => AccessibilityManager_AccessibilityStateChangeListener.java} (74%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/{AudioDescriptionRequestedChangeListener.java => AccessibilityManager_AudioDescriptionRequestedChangeListener.java} (73%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/{TouchExplorationStateChangeListener.java => AccessibilityManager_TouchExplorationStateChangeListener.java} (73%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/animation/{AnimationListener.java => Animation_AnimationListener.java} (83%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/textservice/{SpellCheckerSessionListener.java => SpellCheckerSession_SpellCheckerSessionListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/{IconListener.java => WebIconDatabase_IconListener.java} (85%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/{FindListener.java => WebView_FindListener.java} (81%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/{PictureListener.java => WebView_PictureListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{MultiChoiceModeListener.java => AbsListView_MultiChoiceModeListener.java} (87%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_OnScrollListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{RecyclerListener.java => AbsListView_RecyclerListener.java} (79%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ActionMenuView_OnMenuItemClickListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnItemClickListener.java => AdapterView_OnItemClickListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnItemLongClickListener.java => AdapterView_OnItemLongClickListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnItemSelectedListener.java => AdapterView_OnItemSelectedListener.java} (81%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AutoCompleteTextView_OnDismissListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnDateChangeListener.java => CalendarView_OnDateChangeListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnChronometerTickListener.java => Chronometer_OnChronometerTickListener.java} (77%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/CompoundButton_OnCheckedChangeListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnDateChangedListener.java => DatePicker_OnDateChangedListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnChildClickListener.java => ExpandableListView_OnChildClickListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnGroupClickListener.java => ExpandableListView_OnGroupClickListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnGroupCollapseListener.java => ExpandableListView_OnGroupCollapseListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnGroupExpandListener.java => ExpandableListView_OnGroupExpandListener.java} (76%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{FilterListener.java => Filter_FilterListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnScrollListener.java => NumberPicker_OnScrollListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnValueChangeListener.java => NumberPicker_OnValueChangeListener.java} (78%)
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupMenu_OnDismissListener.java
 create mode 100644 src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupMenu_OnMenuItemClickListener.java
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnDismissListener.java => PopupWindow_OnDismissListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnCheckedChangeListener.java => RadioGroup_OnCheckedChangeListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnRatingBarChangeListener.java => RatingBar_OnRatingBarChangeListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnCloseListener.java => SearchView_OnCloseListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnQueryTextListener.java => SearchView_OnQueryTextListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnSuggestionListener.java => SearchView_OnSuggestionListener.java} (82%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnSeekBarChangeListener.java => SeekBar_OnSeekBarChangeListener.java} (83%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnShareTargetSelectedListener.java => ShareActionProvider_OnShareTargetSelectedListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnDrawerCloseListener.java => SlidingDrawer_OnDrawerCloseListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnDrawerOpenListener.java => SlidingDrawer_OnDrawerOpenListener.java} (77%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnDrawerScrollListener.java => SlidingDrawer_OnDrawerScrollListener.java} (78%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnTabChangeListener.java => TabHost_OnTabChangeListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnEditorActionListener.java => TextView_OnEditorActionListener.java} (80%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnTimeChangedListener.java => TimePicker_OnTimeChangedListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnMenuItemClickListener.java => Toolbar_OnMenuItemClickListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/{OnZoomListener.java => ZoomButtonsController_OnZoomListener.java} (79%)
 rename src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/window/{OnExitAnimationListener.java => SplashScreen_OnExitAnimationListener.java} (78%)
 create mode 100644 src/net/Netdroid/Developed/Android/Widget/ListAdapter.cs
 create mode 100644 src/net/Netdroid/Developed/Android/Widget/SpinnerAdapter.cs
 create mode 100644 src/net/Netdroid/Generated/Android/Icu/Number/NumberFormatterSettings.cs
 create mode 100644 src/net/Netdroid/Generated/Android/Icu/Number/NumberRangeFormatterSettings.cs
 create mode 100644 src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSetIterator.cs
 create mode 100644 src/net/Netdroid/Generated/Android/R.cs
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/AllPackageClasses.cs (99%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/ErrnoException.cs (97%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/Int64Ref.cs (98%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/Os.cs (82%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/OsConstants.cs (99%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/StructCmsghdr.cs (99%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/StructMsghdr.cs (89%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/StructPollfd.cs (98%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/StructStat.cs (88%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/StructStatVfs.cs (99%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/StructTimespec.cs (94%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/StructTimeval.cs (89%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/StructUtsname.cs (99%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/SystemCleaner.cs (98%)
 rename src/net/Netdroid/Generated/Android/{SystemNs => System}/VmSocketAddress.cs (81%)
 create mode 100644 src/net/Netdroid/Generated/Android/Text/Style/TtsSpan.cs
 create mode 100644 src/net/Netdroid/Generated/Android/Util/TypedValue.cs
 create mode 100644 src/net/Netdroid/Generated/Android/Widget/ArrayAdapter.cs
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/AllPackageClasses.cs (96%)
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/ApplicationRuntime.cs (79%)
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/BaseDexClassLoader.cs (98%)
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/DelegateLastClassLoader.cs (99%)
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/DexClassLoader.cs (98%)
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/DexFile.cs (88%)
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/InMemoryDexClassLoader.cs (99%)
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/PathClassLoader.cs (98%)
 rename src/net/Netdroid/Generated/Dalvik/{SystemNs => System}/ZipPathValidator.cs (93%)
 delete mode 100644 src/net/Netdroid/Generated/Java/Lang/Invoke/TypeDescriptor.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Lang/Reflect/RecordComponent.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Lang/Runtime/AllPackageClasses.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Lang/Runtime/ObjectMethods.cs
 create mode 100644 src/net/Netdroid/Generated/Java/Security/Acl/Acl.cs
 create mode 100644 src/net/Netdroid/Generated/Java/Security/Acl/AclEntry.cs
 rename src/net/Netdroid/Generated/Java/Security/{Interfaces/EdECKey.cs => Acl/AclNotFoundException.cs} (58%)
 create mode 100644 src/net/Netdroid/Generated/Java/Security/Acl/AllPackageClasses.cs
 create mode 100644 src/net/Netdroid/Generated/Java/Security/Acl/Group.cs
 create mode 100644 src/net/Netdroid/Generated/Java/Security/Acl/LastOwnerException.cs
 rename src/net/Netdroid/Generated/Java/{Lang/Record.cs => Security/Acl/NotOwnerException.cs} (92%)
 create mode 100644 src/net/Netdroid/Generated/Java/Security/Acl/Owner.cs
 rename src/net/Netdroid/Generated/Java/{Io/Serial.cs => Security/Acl/Permission.cs} (88%)
 delete mode 100644 src/net/Netdroid/Generated/Java/Security/Interfaces/EdECPrivateKey.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Security/Interfaces/EdECPublicKey.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Security/Spec/EdECPoint.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Security/Spec/EdECPrivateKeySpec.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Security/Spec/EdECPublicKeySpec.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Time/InstantSource.cs
 delete mode 100644 src/net/Netdroid/Generated/Java/Util/HexFormat.cs
 create mode 100644 src/net/Netdroid/Generated/Java/Util/Jar/Pack200.cs

diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/OnMagnificationChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/AccessibilityService_MagnificationController_OnMagnificationChangedListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/OnMagnificationChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/AccessibilityService_MagnificationController_OnMagnificationChangedListener.java
index b1eb657d3..1bbc260cb 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/OnMagnificationChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/AccessibilityService_MagnificationController_OnMagnificationChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.accessibilityservice;
 
-public final class OnMagnificationChangedListener extends org.mases.jcobridge.JCListener implements android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener {
-    public OnMagnificationChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AccessibilityService_MagnificationController_OnMagnificationChangedListener extends org.mases.jcobridge.JCListener implements android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener {
+    public AccessibilityService_MagnificationController_OnMagnificationChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/OnShowModeChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/AccessibilityService_SoftKeyboardController_OnShowModeChangedListener.java
similarity index 72%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/OnShowModeChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/AccessibilityService_SoftKeyboardController_OnShowModeChangedListener.java
index cffd45fdb..fa05fbfe4 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/OnShowModeChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/accessibilityservice/AccessibilityService_SoftKeyboardController_OnShowModeChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.accessibilityservice;
 
-public final class OnShowModeChangedListener extends org.mases.jcobridge.JCListener implements android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener {
-    public OnShowModeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AccessibilityService_SoftKeyboardController_OnShowModeChangedListener extends org.mases.jcobridge.JCListener implements android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener {
+    public AccessibilityService_SoftKeyboardController_OnShowModeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/Animator_AnimatorListener.java
similarity index 89%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/Animator_AnimatorListener.java
index 444fa00a1..d96f1ddb3 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/Animator_AnimatorListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class AnimatorListener extends org.mases.jcobridge.JCListener implements android.animation.Animator.AnimatorListener {
-    public AnimatorListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Animator_AnimatorListener extends org.mases.jcobridge.JCListener implements android.animation.Animator.AnimatorListener {
+    public Animator_AnimatorListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorPauseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/Animator_AnimatorPauseListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorPauseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/Animator_AnimatorPauseListener.java
index 1842f1f37..e7259dc14 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorPauseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/Animator_AnimatorPauseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class AnimatorPauseListener extends org.mases.jcobridge.JCListener implements android.animation.Animator.AnimatorPauseListener {
-    public AnimatorPauseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Animator_AnimatorPauseListener extends org.mases.jcobridge.JCListener implements android.animation.Animator.AnimatorPauseListener {
+    public Animator_AnimatorPauseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TransitionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/LayoutTransition_TransitionListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TransitionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/LayoutTransition_TransitionListener.java
index a4e674e81..46099af80 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TransitionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/LayoutTransition_TransitionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class TransitionListener extends org.mases.jcobridge.JCListener implements android.animation.LayoutTransition.TransitionListener {
-    public TransitionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class LayoutTransition_TransitionListener extends org.mases.jcobridge.JCListener implements android.animation.LayoutTransition.TransitionListener {
+    public LayoutTransition_TransitionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TimeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TimeAnimator_TimeListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TimeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TimeAnimator_TimeListener.java
index fa58505c3..a9a336b13 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TimeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/TimeAnimator_TimeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class TimeListener extends org.mases.jcobridge.JCListener implements android.animation.TimeAnimator.TimeListener {
-    public TimeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TimeAnimator_TimeListener extends org.mases.jcobridge.JCListener implements android.animation.TimeAnimator.TimeListener {
+    public TimeAnimator_TimeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorUpdateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/ValueAnimator_AnimatorUpdateListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorUpdateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/ValueAnimator_AnimatorUpdateListener.java
index fdddb6498..687fb57c6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/AnimatorUpdateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/ValueAnimator_AnimatorUpdateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class AnimatorUpdateListener extends org.mases.jcobridge.JCListener implements android.animation.ValueAnimator.AnimatorUpdateListener {
-    public AnimatorUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ValueAnimator_AnimatorUpdateListener extends org.mases.jcobridge.JCListener implements android.animation.ValueAnimator.AnimatorUpdateListener {
+    public ValueAnimator_AnimatorUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/DurationScaleChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/ValueAnimator_DurationScaleChangeListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/DurationScaleChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/ValueAnimator_DurationScaleChangeListener.java
index 026c7857a..1f1676d7e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/DurationScaleChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/animation/ValueAnimator_DurationScaleChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.animation;
 
-public final class DurationScaleChangeListener extends org.mases.jcobridge.JCListener implements android.animation.ValueAnimator.DurationScaleChangeListener {
-    public DurationScaleChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ValueAnimator_DurationScaleChangeListener extends org.mases.jcobridge.JCListener implements android.animation.ValueAnimator.DurationScaleChangeListener {
+    public ValueAnimator_DurationScaleChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnMenuVisibilityListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_OnMenuVisibilityListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnMenuVisibilityListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_OnMenuVisibilityListener.java
index a17f47839..f34416c3e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnMenuVisibilityListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_OnMenuVisibilityListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnMenuVisibilityListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.OnMenuVisibilityListener {
-    public OnMenuVisibilityListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ActionBar_OnMenuVisibilityListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.OnMenuVisibilityListener {
+    public ActionBar_OnMenuVisibilityListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnNavigationListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_OnNavigationListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnNavigationListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_OnNavigationListener.java
index c0bb8bb68..e50a1baa4 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnNavigationListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_OnNavigationListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnNavigationListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.OnNavigationListener {
-    public OnNavigationListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ActionBar_OnNavigationListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.OnNavigationListener {
+    public ActionBar_OnNavigationListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/TabListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_TabListener.java
similarity index 85%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/TabListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_TabListener.java
index 8a620054a..c4245ae84 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/TabListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ActionBar_TabListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class TabListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.TabListener {
-    public TabListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ActionBar_TabListener extends org.mases.jcobridge.JCListener implements android.app.ActionBar.TabListener {
+    public ActionBar_TabListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnAlarmListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AlarmManager_OnAlarmListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnAlarmListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AlarmManager_OnAlarmListener.java
index 655a522fb..9b75522eb 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnAlarmListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AlarmManager_OnAlarmListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnAlarmListener extends org.mases.jcobridge.JCListener implements android.app.AlarmManager.OnAlarmListener {
-    public OnAlarmListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AlarmManager_OnAlarmListener extends org.mases.jcobridge.JCListener implements android.app.AlarmManager.OnAlarmListener {
+    public AlarmManager_OnAlarmListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnOpActiveChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AppOpsManager_OnOpActiveChangedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnOpActiveChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AppOpsManager_OnOpActiveChangedListener.java
index 1301ea0f2..e858ecae1 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnOpActiveChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AppOpsManager_OnOpActiveChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnOpActiveChangedListener extends org.mases.jcobridge.JCListener implements android.app.AppOpsManager.OnOpActiveChangedListener {
-    public OnOpActiveChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AppOpsManager_OnOpActiveChangedListener extends org.mases.jcobridge.JCListener implements android.app.AppOpsManager.OnOpActiveChangedListener {
+    public AppOpsManager_OnOpActiveChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnOpChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AppOpsManager_OnOpChangedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnOpChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AppOpsManager_OnOpChangedListener.java
index 3cd03300e..cbd3a329f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnOpChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/AppOpsManager_OnOpChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnOpChangedListener extends org.mases.jcobridge.JCListener implements android.app.AppOpsManager.OnOpChangedListener {
-    public OnOpChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AppOpsManager_OnOpChangedListener extends org.mases.jcobridge.JCListener implements android.app.AppOpsManager.OnOpChangedListener {
+    public AppOpsManager_OnOpChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnProvideAssistDataListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/Application_OnProvideAssistDataListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnProvideAssistDataListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/Application_OnProvideAssistDataListener.java
index ed238c188..1cbee06ae 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnProvideAssistDataListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/Application_OnProvideAssistDataListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnProvideAssistDataListener extends org.mases.jcobridge.JCListener implements android.app.Application.OnProvideAssistDataListener {
-    public OnProvideAssistDataListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Application_OnProvideAssistDataListener extends org.mases.jcobridge.JCListener implements android.app.Application.OnProvideAssistDataListener {
+    public Application_OnProvideAssistDataListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnDateSetListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/DatePickerDialog_OnDateSetListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnDateSetListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/DatePickerDialog_OnDateSetListener.java
index 77d4168cf..d0cd3374f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnDateSetListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/DatePickerDialog_OnDateSetListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnDateSetListener extends org.mases.jcobridge.JCListener implements android.app.DatePickerDialog.OnDateSetListener {
-    public OnDateSetListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DatePickerDialog_OnDateSetListener extends org.mases.jcobridge.JCListener implements android.app.DatePickerDialog.OnDateSetListener {
+    public DatePickerDialog_OnDateSetListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnBreadCrumbClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/FragmentBreadCrumbs_OnBreadCrumbClickListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnBreadCrumbClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/FragmentBreadCrumbs_OnBreadCrumbClickListener.java
index 9ca9fdfc8..b6d5971ef 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnBreadCrumbClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/FragmentBreadCrumbs_OnBreadCrumbClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnBreadCrumbClickListener extends org.mases.jcobridge.JCListener implements android.app.FragmentBreadCrumbs.OnBreadCrumbClickListener {
-    public OnBreadCrumbClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class FragmentBreadCrumbs_OnBreadCrumbClickListener extends org.mases.jcobridge.JCListener implements android.app.FragmentBreadCrumbs.OnBreadCrumbClickListener {
+    public FragmentBreadCrumbs_OnBreadCrumbClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnBackStackChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/FragmentManager_OnBackStackChangedListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnBackStackChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/FragmentManager_OnBackStackChangedListener.java
index 62d3a5fad..60bbbeb94 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnBackStackChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/FragmentManager_OnBackStackChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnBackStackChangedListener extends org.mases.jcobridge.JCListener implements android.app.FragmentManager.OnBackStackChangedListener {
-    public OnBackStackChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class FragmentManager_OnBackStackChangedListener extends org.mases.jcobridge.JCListener implements android.app.FragmentManager.OnBackStackChangedListener {
+    public FragmentManager_OnBackStackChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/KeyguardLockedStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/KeyguardManager_KeyguardLockedStateListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/KeyguardLockedStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/KeyguardManager_KeyguardLockedStateListener.java
index b7cffdc36..197d08389 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/KeyguardLockedStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/KeyguardManager_KeyguardLockedStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class KeyguardLockedStateListener extends org.mases.jcobridge.JCListener implements android.app.KeyguardManager.KeyguardLockedStateListener {
-    public KeyguardLockedStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class KeyguardManager_KeyguardLockedStateListener extends org.mases.jcobridge.JCListener implements android.app.KeyguardManager.KeyguardLockedStateListener {
+    public KeyguardManager_KeyguardLockedStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnCancelListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SearchManager_OnCancelListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnCancelListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SearchManager_OnCancelListener.java
index c751d0512..a73110684 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnCancelListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SearchManager_OnCancelListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnCancelListener extends org.mases.jcobridge.JCListener implements android.app.SearchManager.OnCancelListener {
-    public OnCancelListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SearchManager_OnCancelListener extends org.mases.jcobridge.JCListener implements android.app.SearchManager.OnCancelListener {
+    public SearchManager_OnCancelListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnDismissListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SearchManager_OnDismissListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnDismissListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SearchManager_OnDismissListener.java
index 33d889f78..e28b94570 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnDismissListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SearchManager_OnDismissListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnDismissListener extends org.mases.jcobridge.JCListener implements android.app.SearchManager.OnDismissListener {
-    public OnDismissListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SearchManager_OnDismissListener extends org.mases.jcobridge.JCListener implements android.app.SearchManager.OnDismissListener {
+    public SearchManager_OnDismissListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnSharedElementsReadyListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SharedElementCallback_OnSharedElementsReadyListener.java
similarity index 74%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnSharedElementsReadyListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SharedElementCallback_OnSharedElementsReadyListener.java
index 0c0ade412..ead347e38 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnSharedElementsReadyListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/SharedElementCallback_OnSharedElementsReadyListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnSharedElementsReadyListener extends org.mases.jcobridge.JCListener implements android.app.SharedElementCallback.OnSharedElementsReadyListener {
-    public OnSharedElementsReadyListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SharedElementCallback_OnSharedElementsReadyListener extends org.mases.jcobridge.JCListener implements android.app.SharedElementCallback.OnSharedElementsReadyListener {
+    public SharedElementCallback_OnSharedElementsReadyListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnTimeSetListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/TimePickerDialog_OnTimeSetListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnTimeSetListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/TimePickerDialog_OnTimeSetListener.java
index fd2a564b3..7bc2bdeeb 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnTimeSetListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/TimePickerDialog_OnTimeSetListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnTimeSetListener extends org.mases.jcobridge.JCListener implements android.app.TimePickerDialog.OnTimeSetListener {
-    public OnTimeSetListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TimePickerDialog_OnTimeSetListener extends org.mases.jcobridge.JCListener implements android.app.TimePickerDialog.OnTimeSetListener {
+    public TimePickerDialog_OnTimeSetListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnAccessibilityEventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/UiAutomation_OnAccessibilityEventListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnAccessibilityEventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/UiAutomation_OnAccessibilityEventListener.java
index 4e298a8c6..e541cab78 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnAccessibilityEventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/UiAutomation_OnAccessibilityEventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnAccessibilityEventListener extends org.mases.jcobridge.JCListener implements android.app.UiAutomation.OnAccessibilityEventListener {
-    public OnAccessibilityEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class UiAutomation_OnAccessibilityEventListener extends org.mases.jcobridge.JCListener implements android.app.UiAutomation.OnAccessibilityEventListener {
+    public UiAutomation_OnAccessibilityEventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ContrastChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/UiModeManager_ContrastChangeListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ContrastChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/UiModeManager_ContrastChangeListener.java
index a9961974b..bedbf1d6b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/ContrastChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/UiModeManager_ContrastChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class ContrastChangeListener extends org.mases.jcobridge.JCListener implements android.app.UiModeManager.ContrastChangeListener {
-    public ContrastChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class UiModeManager_ContrastChangeListener extends org.mases.jcobridge.JCListener implements android.app.UiModeManager.ContrastChangeListener {
+    public UiModeManager_ContrastChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnColorsChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/WallpaperManager_OnColorsChangedListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnColorsChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/WallpaperManager_OnColorsChangedListener.java
index a1f20418b..c9b848e0f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/OnColorsChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/WallpaperManager_OnColorsChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app;
 
-public final class OnColorsChangedListener extends org.mases.jcobridge.JCListener implements android.app.WallpaperManager.OnColorsChangedListener {
-    public OnColorsChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WallpaperManager_OnColorsChangedListener extends org.mases.jcobridge.JCListener implements android.app.WallpaperManager.OnColorsChangedListener {
+    public WallpaperManager_OnColorsChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/admin/OnClearApplicationUserDataListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/admin/DevicePolicyManager_OnClearApplicationUserDataListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/admin/OnClearApplicationUserDataListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/admin/DevicePolicyManager_OnClearApplicationUserDataListener.java
index 665dcb987..ecfd6ea82 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/admin/OnClearApplicationUserDataListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/app/admin/DevicePolicyManager_OnClearApplicationUserDataListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.app.admin;
 
-public final class OnClearApplicationUserDataListener extends org.mases.jcobridge.JCListener implements android.app.admin.DevicePolicyManager.OnClearApplicationUserDataListener {
-    public OnClearApplicationUserDataListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DevicePolicyManager_OnClearApplicationUserDataListener extends org.mases.jcobridge.JCListener implements android.app.admin.DevicePolicyManager.OnClearApplicationUserDataListener {
+    public DevicePolicyManager_OnClearApplicationUserDataListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/bluetooth/ServiceListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/bluetooth/BluetoothProfile_ServiceListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/bluetooth/ServiceListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/bluetooth/BluetoothProfile_ServiceListener.java
index 82bf86099..6660301bb 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/bluetooth/ServiceListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/bluetooth/BluetoothProfile_ServiceListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.bluetooth;
 
-public final class ServiceListener extends org.mases.jcobridge.JCListener implements android.bluetooth.BluetoothProfile.ServiceListener {
-    public ServiceListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class BluetoothProfile_ServiceListener extends org.mases.jcobridge.JCListener implements android.bluetooth.BluetoothProfile.ServiceListener {
+    public BluetoothProfile_ServiceListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnPrimaryClipChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/ClipboardManager_OnPrimaryClipChangedListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnPrimaryClipChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/ClipboardManager_OnPrimaryClipChangedListener.java
index 578ee77e4..8e92673d4 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnPrimaryClipChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/ClipboardManager_OnPrimaryClipChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnPrimaryClipChangedListener extends org.mases.jcobridge.JCListener implements android.content.ClipboardManager.OnPrimaryClipChangedListener {
-    public OnPrimaryClipChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ClipboardManager_OnPrimaryClipChangedListener extends org.mases.jcobridge.JCListener implements android.content.ClipboardManager.OnPrimaryClipChangedListener {
+    public ClipboardManager_OnPrimaryClipChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnCancelListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnCancelListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnCancelListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnCancelListener.java
index a7f8504ae..44977d9ab 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnCancelListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnCancelListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnCancelListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnCancelListener {
-    public OnCancelListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DialogInterface_OnCancelListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnCancelListener {
+    public DialogInterface_OnCancelListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnClickListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnClickListener.java
index 5ec3d1ea9..adab7476c 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnClickListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnClickListener {
-    public OnClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DialogInterface_OnClickListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnClickListener {
+    public DialogInterface_OnClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnDismissListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnDismissListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnDismissListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnDismissListener.java
index 68fe402b2..c68a07c6b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnDismissListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnDismissListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnDismissListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnDismissListener {
-    public OnDismissListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DialogInterface_OnDismissListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnDismissListener {
+    public DialogInterface_OnDismissListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnKeyListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnKeyListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnKeyListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnKeyListener.java
index 28afdec3f..747f0e2e0 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnKeyListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnKeyListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnKeyListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnKeyListener {
-    public OnKeyListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DialogInterface_OnKeyListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnKeyListener {
+    public DialogInterface_OnKeyListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnMultiChoiceClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnMultiChoiceClickListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnMultiChoiceClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnMultiChoiceClickListener.java
index cecdd219b..9f69a5eb5 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnMultiChoiceClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnMultiChoiceClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnMultiChoiceClickListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnMultiChoiceClickListener {
-    public OnMultiChoiceClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DialogInterface_OnMultiChoiceClickListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnMultiChoiceClickListener {
+    public DialogInterface_OnMultiChoiceClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnShowListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnShowListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnShowListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnShowListener.java
index 1d88086ea..9321233f0 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnShowListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/DialogInterface_OnShowListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnShowListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnShowListener {
-    public OnShowListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DialogInterface_OnShowListener extends org.mases.jcobridge.JCListener implements android.content.DialogInterface.OnShowListener {
+    public DialogInterface_OnShowListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnLoadCanceledListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/Loader_OnLoadCanceledListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnLoadCanceledListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/Loader_OnLoadCanceledListener.java
index 48b05ad70..9521016f6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnLoadCanceledListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/Loader_OnLoadCanceledListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnLoadCanceledListener extends org.mases.jcobridge.JCListener implements android.content.Loader.OnLoadCanceledListener {
-    public OnLoadCanceledListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Loader_OnLoadCanceledListener extends org.mases.jcobridge.JCListener implements android.content.Loader.OnLoadCanceledListener {
+    public Loader_OnLoadCanceledListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnLoadCompleteListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/Loader_OnLoadCompleteListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnLoadCompleteListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/Loader_OnLoadCompleteListener.java
index 74bbd8171..ef0fac69c 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnLoadCompleteListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/Loader_OnLoadCompleteListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnLoadCompleteListener extends org.mases.jcobridge.JCListener implements android.content.Loader.OnLoadCompleteListener {
-    public OnLoadCompleteListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Loader_OnLoadCompleteListener extends org.mases.jcobridge.JCListener implements android.content.Loader.OnLoadCompleteListener {
+    public Loader_OnLoadCompleteListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnSharedPreferenceChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/SharedPreferences_OnSharedPreferenceChangeListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnSharedPreferenceChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/SharedPreferences_OnSharedPreferenceChangeListener.java
index bb7a77af7..4295c4769 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/OnSharedPreferenceChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/SharedPreferences_OnSharedPreferenceChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content;
 
-public final class OnSharedPreferenceChangeListener extends org.mases.jcobridge.JCListener implements android.content.SharedPreferences.OnSharedPreferenceChangeListener {
-    public OnSharedPreferenceChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SharedPreferences_OnSharedPreferenceChangeListener extends org.mases.jcobridge.JCListener implements android.content.SharedPreferences.OnSharedPreferenceChangeListener {
+    public SharedPreferences_OnSharedPreferenceChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/pm/OnChecksumsReadyListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/pm/PackageManager_OnChecksumsReadyListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/pm/OnChecksumsReadyListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/pm/PackageManager_OnChecksumsReadyListener.java
index 6cf04a608..e54ef78ab 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/pm/OnChecksumsReadyListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/content/pm/PackageManager_OnChecksumsReadyListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.content.pm;
 
-public final class OnChecksumsReadyListener extends org.mases.jcobridge.JCListener implements android.content.pm.PackageManager.OnChecksumsReadyListener {
-    public OnChecksumsReadyListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class PackageManager_OnChecksumsReadyListener extends org.mases.jcobridge.JCListener implements android.content.pm.PackageManager.OnChecksumsReadyListener {
+    public PackageManager_OnChecksumsReadyListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnErrorListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnErrorListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnErrorListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnErrorListener.java
index bf70cc977..29f0f7dd4 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnErrorListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnErrorListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.drm;
 
-public final class OnErrorListener extends org.mases.jcobridge.JCListener implements android.drm.DrmManagerClient.OnErrorListener {
-    public OnErrorListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DrmManagerClient_OnErrorListener extends org.mases.jcobridge.JCListener implements android.drm.DrmManagerClient.OnErrorListener {
+    public DrmManagerClient_OnErrorListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnEventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnEventListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnEventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnEventListener.java
index efc427c54..2b3f4dd63 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnEventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnEventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.drm;
 
-public final class OnEventListener extends org.mases.jcobridge.JCListener implements android.drm.DrmManagerClient.OnEventListener {
-    public OnEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DrmManagerClient_OnEventListener extends org.mases.jcobridge.JCListener implements android.drm.DrmManagerClient.OnEventListener {
+    public DrmManagerClient_OnEventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnInfoListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnInfoListener.java
index 82d8df3dc..fc21ad206 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/OnInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/drm/DrmManagerClient_OnInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.drm;
 
-public final class OnInfoListener extends org.mases.jcobridge.JCListener implements android.drm.DrmManagerClient.OnInfoListener {
-    public OnInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DrmManagerClient_OnInfoListener extends org.mases.jcobridge.JCListener implements android.drm.DrmManagerClient.OnInfoListener {
+    public DrmManagerClient_OnInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGestureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGestureListener.java
similarity index 84%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGestureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGestureListener.java
index b7e3a5506..23270050d 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGestureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGestureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.gesture;
 
-public final class OnGestureListener extends org.mases.jcobridge.JCListener implements android.gesture.GestureOverlayView.OnGestureListener {
-    public OnGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class GestureOverlayView_OnGestureListener extends org.mases.jcobridge.JCListener implements android.gesture.GestureOverlayView.OnGestureListener {
+    public GestureOverlayView_OnGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGesturePerformedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGesturePerformedListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGesturePerformedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGesturePerformedListener.java
index fab5a0e00..a55ab8e09 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGesturePerformedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGesturePerformedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.gesture;
 
-public final class OnGesturePerformedListener extends org.mases.jcobridge.JCListener implements android.gesture.GestureOverlayView.OnGesturePerformedListener {
-    public OnGesturePerformedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class GestureOverlayView_OnGesturePerformedListener extends org.mases.jcobridge.JCListener implements android.gesture.GestureOverlayView.OnGesturePerformedListener {
+    public GestureOverlayView_OnGesturePerformedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGesturingListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGesturingListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGesturingListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGesturingListener.java
index 67f8eae49..3ba5becae 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/OnGesturingListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/gesture/GestureOverlayView_OnGesturingListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.gesture;
 
-public final class OnGesturingListener extends org.mases.jcobridge.JCListener implements android.gesture.GestureOverlayView.OnGesturingListener {
-    public OnGesturingListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class GestureOverlayView_OnGesturingListener extends org.mases.jcobridge.JCListener implements android.gesture.GestureOverlayView.OnGesturingListener {
+    public GestureOverlayView_OnGesturingListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnHeaderDecodedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/ImageDecoder_OnHeaderDecodedListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnHeaderDecodedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/ImageDecoder_OnHeaderDecodedListener.java
index ce31bf63a..c1d7bd7b7 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnHeaderDecodedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/ImageDecoder_OnHeaderDecodedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.graphics;
 
-public final class OnHeaderDecodedListener extends org.mases.jcobridge.JCListener implements android.graphics.ImageDecoder.OnHeaderDecodedListener {
-    public OnHeaderDecodedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ImageDecoder_OnHeaderDecodedListener extends org.mases.jcobridge.JCListener implements android.graphics.ImageDecoder.OnHeaderDecodedListener {
+    public ImageDecoder_OnHeaderDecodedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnPartialImageListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/ImageDecoder_OnPartialImageListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnPartialImageListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/ImageDecoder_OnPartialImageListener.java
index 4a7a44134..19b259a1b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnPartialImageListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/ImageDecoder_OnPartialImageListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.graphics;
 
-public final class OnPartialImageListener extends org.mases.jcobridge.JCListener implements android.graphics.ImageDecoder.OnPartialImageListener {
-    public OnPartialImageListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ImageDecoder_OnPartialImageListener extends org.mases.jcobridge.JCListener implements android.graphics.ImageDecoder.OnPartialImageListener {
+    public ImageDecoder_OnPartialImageListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnFrameAvailableListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/SurfaceTexture_OnFrameAvailableListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnFrameAvailableListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/SurfaceTexture_OnFrameAvailableListener.java
index 0914bfb16..a5abbba84 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/OnFrameAvailableListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/SurfaceTexture_OnFrameAvailableListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.graphics;
 
-public final class OnFrameAvailableListener extends org.mases.jcobridge.JCListener implements android.graphics.SurfaceTexture.OnFrameAvailableListener {
-    public OnFrameAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SurfaceTexture_OnFrameAvailableListener extends org.mases.jcobridge.JCListener implements android.graphics.SurfaceTexture.OnFrameAvailableListener {
+    public SurfaceTexture_OnFrameAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/drawable/OnDrawableLoadedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/drawable/Icon_OnDrawableLoadedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/drawable/OnDrawableLoadedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/drawable/Icon_OnDrawableLoadedListener.java
index f678bf0fc..91b3b84fa 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/drawable/OnDrawableLoadedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/graphics/drawable/Icon_OnDrawableLoadedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.graphics.drawable;
 
-public final class OnDrawableLoadedListener extends org.mases.jcobridge.JCListener implements android.graphics.drawable.Icon.OnDrawableLoadedListener {
-    public OnDrawableLoadedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Icon_OnDrawableLoadedListener extends org.mases.jcobridge.JCListener implements android.graphics.drawable.Icon.OnDrawableLoadedListener {
+    public Icon_OnDrawableLoadedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/FaceDetectionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/Camera_FaceDetectionListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/FaceDetectionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/Camera_FaceDetectionListener.java
index 8a1b6bdd6..acbd69df5 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/FaceDetectionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/Camera_FaceDetectionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.hardware;
 
-public final class FaceDetectionListener extends org.mases.jcobridge.JCListener implements android.hardware.Camera.FaceDetectionListener {
-    public FaceDetectionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Camera_FaceDetectionListener extends org.mases.jcobridge.JCListener implements android.hardware.Camera.FaceDetectionListener {
+    public Camera_FaceDetectionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/OnZoomChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/Camera_OnZoomChangeListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/OnZoomChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/Camera_OnZoomChangeListener.java
index cac5efdc6..2e05ec6a3 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/OnZoomChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/Camera_OnZoomChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.hardware;
 
-public final class OnZoomChangeListener extends org.mases.jcobridge.JCListener implements android.hardware.Camera.OnZoomChangeListener {
-    public OnZoomChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Camera_OnZoomChangeListener extends org.mases.jcobridge.JCListener implements android.hardware.Camera.OnZoomChangeListener {
+    public Camera_OnZoomChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/display/DisplayListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/display/DisplayManager_DisplayListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/display/DisplayListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/display/DisplayManager_DisplayListener.java
index 84bb65c01..90449f2c3 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/display/DisplayListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/display/DisplayManager_DisplayListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.hardware.display;
 
-public final class DisplayListener extends org.mases.jcobridge.JCListener implements android.hardware.display.DisplayManager.DisplayListener {
-    public DisplayListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DisplayManager_DisplayListener extends org.mases.jcobridge.JCListener implements android.hardware.display.DisplayManager.DisplayListener {
+    public DisplayManager_DisplayListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/input/InputDeviceListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/input/InputManager_InputDeviceListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/input/InputDeviceListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/input/InputManager_InputDeviceListener.java
index 328b03ddf..90039b8fe 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/input/InputDeviceListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/hardware/input/InputManager_InputDeviceListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.hardware.input;
 
-public final class InputDeviceListener extends org.mases.jcobridge.JCListener implements android.hardware.input.InputManager.InputDeviceListener {
-    public InputDeviceListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class InputManager_InputDeviceListener extends org.mases.jcobridge.JCListener implements android.hardware.input.InputManager.InputDeviceListener {
+    public InputManager_InputDeviceListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/inputmethodservice/OnKeyboardActionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/inputmethodservice/KeyboardView_OnKeyboardActionListener.java
similarity index 84%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/inputmethodservice/OnKeyboardActionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/inputmethodservice/KeyboardView_OnKeyboardActionListener.java
index 707d60a2f..c5c7c3adf 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/inputmethodservice/OnKeyboardActionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/inputmethodservice/KeyboardView_OnKeyboardActionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.inputmethodservice;
 
-public final class OnKeyboardActionListener extends org.mases.jcobridge.JCListener implements android.inputmethodservice.KeyboardView.OnKeyboardActionListener {
-    public OnKeyboardActionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class KeyboardView_OnKeyboardActionListener extends org.mases.jcobridge.JCListener implements android.inputmethodservice.KeyboardView.OnKeyboardActionListener {
+    public KeyboardView_OnKeyboardActionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GeocodeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/Geocoder_GeocodeListener.java
similarity index 83%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GeocodeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/Geocoder_GeocodeListener.java
index 674efde75..53571587b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GeocodeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/Geocoder_GeocodeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.location;
 
-public final class GeocodeListener extends org.mases.jcobridge.JCListener implements android.location.Geocoder.GeocodeListener {
-    public GeocodeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Geocoder_GeocodeListener extends org.mases.jcobridge.JCListener implements android.location.Geocoder.GeocodeListener {
+    public Geocoder_GeocodeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GnssAntennaInfo_Listener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GnssAntennaInfo_Listener.java
new file mode 100644
index 000000000..143c8a613
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GnssAntennaInfo_Listener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.location;
+
+public final class GnssAntennaInfo_Listener extends org.mases.jcobridge.JCListener implements android.location.GnssAntennaInfo.Listener {
+    public GnssAntennaInfo_Listener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onGnssAntennaInfoReceived(java.util.List arg0) {
+        raiseEvent("onGnssAntennaInfoReceived", arg0);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/Listener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GpsStatus_Listener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/Listener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GpsStatus_Listener.java
index 48c0eea85..3e562a276 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/Listener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GpsStatus_Listener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.location;
 
-public final class Listener extends org.mases.jcobridge.JCListener implements android.location.GpsStatus.Listener {
-    public Listener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class GpsStatus_Listener extends org.mases.jcobridge.JCListener implements android.location.GpsStatus.Listener {
+    public GpsStatus_Listener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/NmeaListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GpsStatus_NmeaListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/NmeaListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GpsStatus_NmeaListener.java
index f2f13bc8d..2411367ac 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/NmeaListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/location/GpsStatus_NmeaListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.location;
 
-public final class NmeaListener extends org.mases.jcobridge.JCListener implements android.location.GpsStatus.NmeaListener {
-    public NmeaListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class GpsStatus_NmeaListener extends org.mases.jcobridge.JCListener implements android.location.GpsStatus.NmeaListener {
+    public GpsStatus_NmeaListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnAudioFocusChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnAudioFocusChangeListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnAudioFocusChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnAudioFocusChangeListener.java
index 0f8e85b02..53402eb2e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnAudioFocusChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnAudioFocusChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnAudioFocusChangeListener extends org.mases.jcobridge.JCListener implements android.media.AudioManager.OnAudioFocusChangeListener {
-    public OnAudioFocusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioManager_OnAudioFocusChangeListener extends org.mases.jcobridge.JCListener implements android.media.AudioManager.OnAudioFocusChangeListener {
+    public AudioManager_OnAudioFocusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCommunicationDeviceChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnCommunicationDeviceChangedListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCommunicationDeviceChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnCommunicationDeviceChangedListener.java
index 9f9c45097..a78d60963 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCommunicationDeviceChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnCommunicationDeviceChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnCommunicationDeviceChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioManager.OnCommunicationDeviceChangedListener {
-    public OnCommunicationDeviceChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioManager_OnCommunicationDeviceChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioManager.OnCommunicationDeviceChangedListener {
+    public AudioManager_OnCommunicationDeviceChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnModeChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnModeChangedListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnModeChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnModeChangedListener.java
index 12ab622e3..0e20f22bd 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnModeChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnModeChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnModeChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioManager.OnModeChangedListener {
-    public OnModeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioManager_OnModeChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioManager.OnModeChangedListener {
+    public AudioManager_OnModeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPreferredMixerAttributesChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnPreferredMixerAttributesChangedListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPreferredMixerAttributesChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnPreferredMixerAttributesChangedListener.java
index e002d5354..edcb2dcdf 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPreferredMixerAttributesChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioManager_OnPreferredMixerAttributesChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnPreferredMixerAttributesChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioManager.OnPreferredMixerAttributesChangedListener {
-    public OnPreferredMixerAttributesChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioManager_OnPreferredMixerAttributesChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioManager.OnPreferredMixerAttributesChangedListener {
+    public AudioManager_OnPreferredMixerAttributesChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnRecordPositionUpdateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRecord_OnRecordPositionUpdateListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnRecordPositionUpdateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRecord_OnRecordPositionUpdateListener.java
index 0ec896231..61fa7c778 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnRecordPositionUpdateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRecord_OnRecordPositionUpdateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnRecordPositionUpdateListener extends org.mases.jcobridge.JCListener implements android.media.AudioRecord.OnRecordPositionUpdateListener {
-    public OnRecordPositionUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioRecord_OnRecordPositionUpdateListener extends org.mases.jcobridge.JCListener implements android.media.AudioRecord.OnRecordPositionUpdateListener {
+    public AudioRecord_OnRecordPositionUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRecord_OnRoutingChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRecord_OnRoutingChangedListener.java
new file mode 100644
index 000000000..c1fb6d241
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRecord_OnRoutingChangedListener.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media;
+
+public final class AudioRecord_OnRoutingChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioRecord.OnRoutingChangedListener {
+    public AudioRecord_OnRoutingChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onRoutingChanged(android.media.AudioRecord arg0) {
+        raiseEvent("onRoutingChanged", arg0);
+    }
+    //@Override
+    public void onRoutingChanged(android.media.AudioRouting arg0) {
+        raiseEvent("onRoutingChanged1", arg0);
+    }
+    //@Override
+    public void onRoutingChangedDefault(android.media.AudioRouting arg0) {
+        android.media.AudioRecord.OnRoutingChangedListener.super.onRoutingChanged(arg0);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRouting_OnRoutingChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRouting_OnRoutingChangedListener.java
new file mode 100644
index 000000000..2dc2fb387
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioRouting_OnRoutingChangedListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media;
+
+public final class AudioRouting_OnRoutingChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioRouting.OnRoutingChangedListener {
+    public AudioRouting_OnRoutingChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onRoutingChanged(android.media.AudioRouting arg0) {
+        raiseEvent("onRoutingChanged", arg0);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCodecFormatChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnCodecFormatChangedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCodecFormatChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnCodecFormatChangedListener.java
index f72a73501..bed16689a 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCodecFormatChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnCodecFormatChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnCodecFormatChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioTrack.OnCodecFormatChangedListener {
-    public OnCodecFormatChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioTrack_OnCodecFormatChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioTrack.OnCodecFormatChangedListener {
+    public AudioTrack_OnCodecFormatChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnPlaybackPositionUpdateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnPlaybackPositionUpdateListener.java
new file mode 100644
index 000000000..fad0ac499
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnPlaybackPositionUpdateListener.java
@@ -0,0 +1,39 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media;
+
+public final class AudioTrack_OnPlaybackPositionUpdateListener extends org.mases.jcobridge.JCListener implements android.media.AudioTrack.OnPlaybackPositionUpdateListener {
+    public AudioTrack_OnPlaybackPositionUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onMarkerReached(android.media.AudioTrack arg0) {
+        raiseEvent("onMarkerReached", arg0);
+    }
+    //@Override
+    public void onPeriodicNotification(android.media.AudioTrack arg0) {
+        raiseEvent("onPeriodicNotification", arg0);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnRoutingChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnRoutingChangedListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnRoutingChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnRoutingChangedListener.java
index 5238a577a..89ffe32cf 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnRoutingChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/AudioTrack_OnRoutingChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnRoutingChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioTrack.OnRoutingChangedListener {
-    public OnRoutingChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioTrack_OnRoutingChangedListener extends org.mases.jcobridge.JCListener implements android.media.AudioTrack.OnRoutingChangedListener {
+    public AudioTrack_OnRoutingChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnImageAvailableListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/ImageReader_OnImageAvailableListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnImageAvailableListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/ImageReader_OnImageAvailableListener.java
index 53754f8ec..f9c4b26e9 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnImageAvailableListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/ImageReader_OnImageAvailableListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnImageAvailableListener extends org.mases.jcobridge.JCListener implements android.media.ImageReader.OnImageAvailableListener {
-    public OnImageAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ImageReader_OnImageAvailableListener extends org.mases.jcobridge.JCListener implements android.media.ImageReader.OnImageAvailableListener {
+    public ImageReader_OnImageAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnImageReleasedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/ImageWriter_OnImageReleasedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnImageReleasedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/ImageWriter_OnImageReleasedListener.java
index fcffbfbf1..628fc6ab4 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnImageReleasedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/ImageWriter_OnImageReleasedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnImageReleasedListener extends org.mases.jcobridge.JCListener implements android.media.ImageWriter.OnImageReleasedListener {
-    public OnImageReleasedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ImageWriter_OnImageReleasedListener extends org.mases.jcobridge.JCListener implements android.media.ImageWriter.OnImageReleasedListener {
+    public ImageWriter_OnImageReleasedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnJetEventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/JetPlayer_OnJetEventListener.java
similarity index 86%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnJetEventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/JetPlayer_OnJetEventListener.java
index 4aca9d8ea..ef9215917 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnJetEventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/JetPlayer_OnJetEventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnJetEventListener extends org.mases.jcobridge.JCListener implements android.media.JetPlayer.OnJetEventListener {
-    public OnJetEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class JetPlayer_OnJetEventListener extends org.mases.jcobridge.JCListener implements android.media.JetPlayer.OnJetEventListener {
+    public JetPlayer_OnJetEventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/EventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCas_EventListener.java
similarity index 90%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/EventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCas_EventListener.java
index dfa8605ea..581fc135b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/EventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCas_EventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class EventListener extends org.mases.jcobridge.JCListener implements android.media.MediaCas.EventListener {
-    public EventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaCas_EventListener extends org.mases.jcobridge.JCListener implements android.media.MediaCas.EventListener {
+    public MediaCas_EventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnFirstTunnelFrameReadyListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCodec_OnFirstTunnelFrameReadyListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnFirstTunnelFrameReadyListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCodec_OnFirstTunnelFrameReadyListener.java
index fe0ddef70..f1c683e60 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnFirstTunnelFrameReadyListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCodec_OnFirstTunnelFrameReadyListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnFirstTunnelFrameReadyListener extends org.mases.jcobridge.JCListener implements android.media.MediaCodec.OnFirstTunnelFrameReadyListener {
-    public OnFirstTunnelFrameReadyListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaCodec_OnFirstTunnelFrameReadyListener extends org.mases.jcobridge.JCListener implements android.media.MediaCodec.OnFirstTunnelFrameReadyListener {
+    public MediaCodec_OnFirstTunnelFrameReadyListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnFrameRenderedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCodec_OnFrameRenderedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnFrameRenderedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCodec_OnFrameRenderedListener.java
index 061805d6a..5fbe45363 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnFrameRenderedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaCodec_OnFrameRenderedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnFrameRenderedListener extends org.mases.jcobridge.JCListener implements android.media.MediaCodec.OnFrameRenderedListener {
-    public OnFrameRenderedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaCodec_OnFrameRenderedListener extends org.mases.jcobridge.JCListener implements android.media.MediaCodec.OnFrameRenderedListener {
+    public MediaCodec_OnFrameRenderedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnEventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnEventListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnEventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnEventListener.java
index 8f7093f22..64714c84a 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnEventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnEventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnEventListener extends org.mases.jcobridge.JCListener implements android.media.MediaDrm.OnEventListener {
-    public OnEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaDrm_OnEventListener extends org.mases.jcobridge.JCListener implements android.media.MediaDrm.OnEventListener {
+    public MediaDrm_OnEventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnExpirationUpdateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnExpirationUpdateListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnExpirationUpdateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnExpirationUpdateListener.java
index 2f45b7d6f..0afea5ca7 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnExpirationUpdateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnExpirationUpdateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnExpirationUpdateListener extends org.mases.jcobridge.JCListener implements android.media.MediaDrm.OnExpirationUpdateListener {
-    public OnExpirationUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaDrm_OnExpirationUpdateListener extends org.mases.jcobridge.JCListener implements android.media.MediaDrm.OnExpirationUpdateListener {
+    public MediaDrm_OnExpirationUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnKeyStatusChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnKeyStatusChangeListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnKeyStatusChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnKeyStatusChangeListener.java
index 37361017f..cb450bc7e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnKeyStatusChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnKeyStatusChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnKeyStatusChangeListener extends org.mases.jcobridge.JCListener implements android.media.MediaDrm.OnKeyStatusChangeListener {
-    public OnKeyStatusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaDrm_OnKeyStatusChangeListener extends org.mases.jcobridge.JCListener implements android.media.MediaDrm.OnKeyStatusChangeListener {
+    public MediaDrm_OnKeyStatusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSessionLostStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnSessionLostStateListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSessionLostStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnSessionLostStateListener.java
index f84b688c4..69da44a04 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSessionLostStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaDrm_OnSessionLostStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnSessionLostStateListener extends org.mases.jcobridge.JCListener implements android.media.MediaDrm.OnSessionLostStateListener {
-    public OnSessionLostStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaDrm_OnSessionLostStateListener extends org.mases.jcobridge.JCListener implements android.media.MediaDrm.OnSessionLostStateListener {
+    public MediaDrm_OnSessionLostStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnBufferingUpdateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnBufferingUpdateListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnBufferingUpdateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnBufferingUpdateListener.java
index eb0ca5873..803a56aa4 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnBufferingUpdateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnBufferingUpdateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnBufferingUpdateListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnBufferingUpdateListener {
-    public OnBufferingUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnBufferingUpdateListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnBufferingUpdateListener {
+    public MediaPlayer_OnBufferingUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCompletionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnCompletionListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCompletionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnCompletionListener.java
index e467069fc..0c5b22d96 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnCompletionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnCompletionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnCompletionListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnCompletionListener {
-    public OnCompletionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnCompletionListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnCompletionListener {
+    public MediaPlayer_OnCompletionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnDrmInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnDrmInfoListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnDrmInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnDrmInfoListener.java
index a490e62f7..2448d0871 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnDrmInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnDrmInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnDrmInfoListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnDrmInfoListener {
-    public OnDrmInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnDrmInfoListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnDrmInfoListener {
+    public MediaPlayer_OnDrmInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnDrmPreparedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnDrmPreparedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnDrmPreparedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnDrmPreparedListener.java
index eb2bc3ac8..0c99b91c7 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnDrmPreparedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnDrmPreparedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnDrmPreparedListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnDrmPreparedListener {
-    public OnDrmPreparedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnDrmPreparedListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnDrmPreparedListener {
+    public MediaPlayer_OnDrmPreparedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnErrorListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnErrorListener.java
new file mode 100644
index 000000000..9f8d44ad1
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnErrorListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media;
+
+public final class MediaPlayer_OnErrorListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnErrorListener {
+    public MediaPlayer_OnErrorListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public boolean onError(android.media.MediaPlayer arg0, int arg1, int arg2) {
+        raiseEvent("onError", arg0, arg1, arg2); Object retVal = getReturnData(); return (boolean)retVal;
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnInfoListener.java
new file mode 100644
index 000000000..74625f3e4
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnInfoListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media;
+
+public final class MediaPlayer_OnInfoListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnInfoListener {
+    public MediaPlayer_OnInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public boolean onInfo(android.media.MediaPlayer arg0, int arg1, int arg2) {
+        raiseEvent("onInfo", arg0, arg1, arg2); Object retVal = getReturnData(); return (boolean)retVal;
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnMediaTimeDiscontinuityListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnMediaTimeDiscontinuityListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnMediaTimeDiscontinuityListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnMediaTimeDiscontinuityListener.java
index 92f22bea3..a9c765956 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnMediaTimeDiscontinuityListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnMediaTimeDiscontinuityListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnMediaTimeDiscontinuityListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnMediaTimeDiscontinuityListener {
-    public OnMediaTimeDiscontinuityListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnMediaTimeDiscontinuityListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnMediaTimeDiscontinuityListener {
+    public MediaPlayer_OnMediaTimeDiscontinuityListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPreparedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnPreparedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPreparedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnPreparedListener.java
index 2d8987320..72f545bb1 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPreparedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnPreparedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnPreparedListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnPreparedListener {
-    public OnPreparedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnPreparedListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnPreparedListener {
+    public MediaPlayer_OnPreparedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSeekCompleteListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnSeekCompleteListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSeekCompleteListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnSeekCompleteListener.java
index 862f7ac90..fa797eb94 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSeekCompleteListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnSeekCompleteListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnSeekCompleteListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnSeekCompleteListener {
-    public OnSeekCompleteListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnSeekCompleteListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnSeekCompleteListener {
+    public MediaPlayer_OnSeekCompleteListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSubtitleDataListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnSubtitleDataListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSubtitleDataListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnSubtitleDataListener.java
index 4e3f1dfa6..550d10459 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSubtitleDataListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnSubtitleDataListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnSubtitleDataListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnSubtitleDataListener {
-    public OnSubtitleDataListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnSubtitleDataListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnSubtitleDataListener {
+    public MediaPlayer_OnSubtitleDataListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnTimedMetaDataAvailableListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnTimedMetaDataAvailableListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnTimedMetaDataAvailableListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnTimedMetaDataAvailableListener.java
index b5cde9582..dc15a8144 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnTimedMetaDataAvailableListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnTimedMetaDataAvailableListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnTimedMetaDataAvailableListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnTimedMetaDataAvailableListener {
-    public OnTimedMetaDataAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnTimedMetaDataAvailableListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnTimedMetaDataAvailableListener {
+    public MediaPlayer_OnTimedMetaDataAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnTimedTextListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnTimedTextListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnTimedTextListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnTimedTextListener.java
index 00a2b4008..17f320741 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnTimedTextListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnTimedTextListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnTimedTextListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnTimedTextListener {
-    public OnTimedTextListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnTimedTextListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnTimedTextListener {
+    public MediaPlayer_OnTimedTextListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnVideoSizeChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnVideoSizeChangedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnVideoSizeChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnVideoSizeChangedListener.java
index 4b6c21de4..26d0dedd1 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnVideoSizeChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaPlayer_OnVideoSizeChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnVideoSizeChangedListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnVideoSizeChangedListener {
-    public OnVideoSizeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaPlayer_OnVideoSizeChangedListener extends org.mases.jcobridge.JCListener implements android.media.MediaPlayer.OnVideoSizeChangedListener {
+    public MediaPlayer_OnVideoSizeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRecorder_OnErrorListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRecorder_OnErrorListener.java
new file mode 100644
index 000000000..c8d943459
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRecorder_OnErrorListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media;
+
+public final class MediaRecorder_OnErrorListener extends org.mases.jcobridge.JCListener implements android.media.MediaRecorder.OnErrorListener {
+    public MediaRecorder_OnErrorListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onError(android.media.MediaRecorder arg0, int arg1, int arg2) {
+        raiseEvent("onError", arg0, arg1, arg2);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRecorder_OnInfoListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRecorder_OnInfoListener.java
index 14e556a49..39f729ad1 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRecorder_OnInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnInfoListener extends org.mases.jcobridge.JCListener implements android.media.MediaRecorder.OnInfoListener {
-    public OnInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaRecorder_OnInfoListener extends org.mases.jcobridge.JCListener implements android.media.MediaRecorder.OnInfoListener {
+    public MediaRecorder_OnInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnGetControllerHintsListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRouter2_OnGetControllerHintsListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnGetControllerHintsListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRouter2_OnGetControllerHintsListener.java
index 28e974021..9cb703bde 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnGetControllerHintsListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaRouter2_OnGetControllerHintsListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnGetControllerHintsListener extends org.mases.jcobridge.JCListener implements android.media.MediaRouter2.OnGetControllerHintsListener {
-    public OnGetControllerHintsListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaRouter2_OnGetControllerHintsListener extends org.mases.jcobridge.JCListener implements android.media.MediaRouter2.OnGetControllerHintsListener {
+    public MediaRouter2_OnGetControllerHintsListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnScanCompletedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaScannerConnection_OnScanCompletedListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnScanCompletedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaScannerConnection_OnScanCompletedListener.java
index 9619d0c41..b642c36ad 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnScanCompletedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaScannerConnection_OnScanCompletedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnScanCompletedListener extends org.mases.jcobridge.JCListener implements android.media.MediaScannerConnection.OnScanCompletedListener {
-    public OnScanCompletedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaScannerConnection_OnScanCompletedListener extends org.mases.jcobridge.JCListener implements android.media.MediaScannerConnection.OnScanCompletedListener {
+    public MediaScannerConnection_OnScanCompletedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnErrorListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaSync_OnErrorListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnErrorListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaSync_OnErrorListener.java
index 0831a1cca..9dcd85206 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnErrorListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/MediaSync_OnErrorListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnErrorListener extends org.mases.jcobridge.JCListener implements android.media.MediaSync.OnErrorListener {
-    public OnErrorListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaSync_OnErrorListener extends org.mases.jcobridge.JCListener implements android.media.MediaSync.OnErrorListener {
+    public MediaSync_OnErrorListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnGetPlaybackPositionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnGetPlaybackPositionListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnGetPlaybackPositionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnGetPlaybackPositionListener.java
index 3e8b86293..cdb9b1e2b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnGetPlaybackPositionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnGetPlaybackPositionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnGetPlaybackPositionListener extends org.mases.jcobridge.JCListener implements android.media.RemoteControlClient.OnGetPlaybackPositionListener {
-    public OnGetPlaybackPositionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class RemoteControlClient_OnGetPlaybackPositionListener extends org.mases.jcobridge.JCListener implements android.media.RemoteControlClient.OnGetPlaybackPositionListener {
+    public RemoteControlClient_OnGetPlaybackPositionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnMetadataUpdateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnMetadataUpdateListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnMetadataUpdateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnMetadataUpdateListener.java
index 4862cb1af..219a1e220 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnMetadataUpdateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnMetadataUpdateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnMetadataUpdateListener extends org.mases.jcobridge.JCListener implements android.media.RemoteControlClient.OnMetadataUpdateListener {
-    public OnMetadataUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class RemoteControlClient_OnMetadataUpdateListener extends org.mases.jcobridge.JCListener implements android.media.RemoteControlClient.OnMetadataUpdateListener {
+    public RemoteControlClient_OnMetadataUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPlaybackPositionUpdateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnPlaybackPositionUpdateListener.java
similarity index 74%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPlaybackPositionUpdateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnPlaybackPositionUpdateListener.java
index 7a1f33b2e..abfd1566a 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnPlaybackPositionUpdateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteControlClient_OnPlaybackPositionUpdateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnPlaybackPositionUpdateListener extends org.mases.jcobridge.JCListener implements android.media.RemoteControlClient.OnPlaybackPositionUpdateListener {
-    public OnPlaybackPositionUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class RemoteControlClient_OnPlaybackPositionUpdateListener extends org.mases.jcobridge.JCListener implements android.media.RemoteControlClient.OnPlaybackPositionUpdateListener {
+    public RemoteControlClient_OnPlaybackPositionUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnClientUpdateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteController_OnClientUpdateListener.java
similarity index 84%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnClientUpdateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteController_OnClientUpdateListener.java
index 38b24ab86..5e6631e27 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnClientUpdateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/RemoteController_OnClientUpdateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnClientUpdateListener extends org.mases.jcobridge.JCListener implements android.media.RemoteController.OnClientUpdateListener {
-    public OnClientUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class RemoteController_OnClientUpdateListener extends org.mases.jcobridge.JCListener implements android.media.RemoteController.OnClientUpdateListener {
+    public RemoteController_OnClientUpdateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnLoadCompleteListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/SoundPool_OnLoadCompleteListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnLoadCompleteListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/SoundPool_OnLoadCompleteListener.java
index 562bfaef4..116ea77a9 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnLoadCompleteListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/SoundPool_OnLoadCompleteListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnLoadCompleteListener extends org.mases.jcobridge.JCListener implements android.media.SoundPool.OnLoadCompleteListener {
-    public OnLoadCompleteListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SoundPool_OnLoadCompleteListener extends org.mases.jcobridge.JCListener implements android.media.SoundPool.OnLoadCompleteListener {
+    public SoundPool_OnLoadCompleteListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnHeadTrackerAvailableListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/Spatializer_OnHeadTrackerAvailableListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnHeadTrackerAvailableListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/Spatializer_OnHeadTrackerAvailableListener.java
index 5b8af13b9..12b3f9c96 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnHeadTrackerAvailableListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/Spatializer_OnHeadTrackerAvailableListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnHeadTrackerAvailableListener extends org.mases.jcobridge.JCListener implements android.media.Spatializer.OnHeadTrackerAvailableListener {
-    public OnHeadTrackerAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Spatializer_OnHeadTrackerAvailableListener extends org.mases.jcobridge.JCListener implements android.media.Spatializer.OnHeadTrackerAvailableListener {
+    public Spatializer_OnHeadTrackerAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSpatializerStateChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/Spatializer_OnSpatializerStateChangedListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSpatializerStateChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/Spatializer_OnSpatializerStateChangedListener.java
index 3e4233603..7b0386b13 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/OnSpatializerStateChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/Spatializer_OnSpatializerStateChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media;
 
-public final class OnSpatializerStateChangedListener extends org.mases.jcobridge.JCListener implements android.media.Spatializer.OnSpatializerStateChangedListener {
-    public OnSpatializerStateChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Spatializer_OnSpatializerStateChangedListener extends org.mases.jcobridge.JCListener implements android.media.Spatializer.OnSpatializerStateChangedListener {
+    public Spatializer_OnSpatializerStateChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnControlStatusChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/AudioEffect_OnControlStatusChangeListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnControlStatusChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/AudioEffect_OnControlStatusChangeListener.java
index efccea5c1..4d57ce091 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnControlStatusChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/AudioEffect_OnControlStatusChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.audiofx;
 
-public final class OnControlStatusChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.AudioEffect.OnControlStatusChangeListener {
-    public OnControlStatusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioEffect_OnControlStatusChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.AudioEffect.OnControlStatusChangeListener {
+    public AudioEffect_OnControlStatusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnEnableStatusChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/AudioEffect_OnEnableStatusChangeListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnEnableStatusChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/AudioEffect_OnEnableStatusChangeListener.java
index 71bf27f8a..84de15794 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnEnableStatusChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/AudioEffect_OnEnableStatusChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.audiofx;
 
-public final class OnEnableStatusChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.AudioEffect.OnEnableStatusChangeListener {
-    public OnEnableStatusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AudioEffect_OnEnableStatusChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.AudioEffect.OnEnableStatusChangeListener {
+    public AudioEffect_OnEnableStatusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/BassBoost_OnParameterChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/BassBoost_OnParameterChangeListener.java
new file mode 100644
index 000000000..7b484d516
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/BassBoost_OnParameterChangeListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media.audiofx;
+
+public final class BassBoost_OnParameterChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.BassBoost.OnParameterChangeListener {
+    public BassBoost_OnParameterChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onParameterChange(android.media.audiofx.BassBoost arg0, int arg1, int arg2, short arg3) {
+        raiseEvent("onParameterChange", arg0, arg1, arg2, arg3);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/EnvironmentalReverb_OnParameterChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/EnvironmentalReverb_OnParameterChangeListener.java
new file mode 100644
index 000000000..ac3acc1f7
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/EnvironmentalReverb_OnParameterChangeListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media.audiofx;
+
+public final class EnvironmentalReverb_OnParameterChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.EnvironmentalReverb.OnParameterChangeListener {
+    public EnvironmentalReverb_OnParameterChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onParameterChange(android.media.audiofx.EnvironmentalReverb arg0, int arg1, int arg2, int arg3) {
+        raiseEvent("onParameterChange", arg0, arg1, arg2, arg3);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Equalizer_OnParameterChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Equalizer_OnParameterChangeListener.java
new file mode 100644
index 000000000..d901f8728
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Equalizer_OnParameterChangeListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media.audiofx;
+
+public final class Equalizer_OnParameterChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.Equalizer.OnParameterChangeListener {
+    public Equalizer_OnParameterChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onParameterChange(android.media.audiofx.Equalizer arg0, int arg1, int arg2, int arg3, int arg4) {
+        raiseEvent("onParameterChange", arg0, arg1, arg2, arg3, arg4);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/PresetReverb_OnParameterChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/PresetReverb_OnParameterChangeListener.java
new file mode 100644
index 000000000..3d7b6abd5
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/PresetReverb_OnParameterChangeListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.media.audiofx;
+
+public final class PresetReverb_OnParameterChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.PresetReverb.OnParameterChangeListener {
+    public PresetReverb_OnParameterChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onParameterChange(android.media.audiofx.PresetReverb arg0, int arg1, int arg2, short arg3) {
+        raiseEvent("onParameterChange", arg0, arg1, arg2, arg3);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnParameterChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Virtualizer_OnParameterChangeListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnParameterChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Virtualizer_OnParameterChangeListener.java
index 5ef515112..be00a5bd6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnParameterChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Virtualizer_OnParameterChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.audiofx;
 
-public final class OnParameterChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.Virtualizer.OnParameterChangeListener {
-    public OnParameterChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Virtualizer_OnParameterChangeListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.Virtualizer.OnParameterChangeListener {
+    public Virtualizer_OnParameterChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnDataCaptureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Visualizer_OnDataCaptureListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnDataCaptureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Visualizer_OnDataCaptureListener.java
index ec53ae096..729e5864b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/OnDataCaptureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/audiofx/Visualizer_OnDataCaptureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.audiofx;
 
-public final class OnDataCaptureListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.Visualizer.OnDataCaptureListener {
-    public OnDataCaptureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Visualizer_OnDataCaptureListener extends org.mases.jcobridge.JCListener implements android.media.audiofx.Visualizer.OnDataCaptureListener {
+    public Visualizer_OnDataCaptureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/midi/OnDeviceOpenedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/midi/MidiManager_OnDeviceOpenedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/midi/OnDeviceOpenedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/midi/MidiManager_OnDeviceOpenedListener.java
index 67a9e7c7d..abe288678 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/midi/OnDeviceOpenedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/midi/MidiManager_OnDeviceOpenedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.midi;
 
-public final class OnDeviceOpenedListener extends org.mases.jcobridge.JCListener implements android.media.midi.MidiManager.OnDeviceOpenedListener {
-    public OnDeviceOpenedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MidiManager_OnDeviceOpenedListener extends org.mases.jcobridge.JCListener implements android.media.midi.MidiManager.OnDeviceOpenedListener {
+    public MidiManager_OnDeviceOpenedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnActiveSessionsChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnActiveSessionsChangedListener.java
similarity index 74%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnActiveSessionsChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnActiveSessionsChangedListener.java
index 099cb1d9e..9941f54d6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnActiveSessionsChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnActiveSessionsChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.session;
 
-public final class OnActiveSessionsChangedListener extends org.mases.jcobridge.JCListener implements android.media.session.MediaSessionManager.OnActiveSessionsChangedListener {
-    public OnActiveSessionsChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaSessionManager_OnActiveSessionsChangedListener extends org.mases.jcobridge.JCListener implements android.media.session.MediaSessionManager.OnActiveSessionsChangedListener {
+    public MediaSessionManager_OnActiveSessionsChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnMediaKeyEventSessionChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnMediaKeyEventSessionChangedListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnMediaKeyEventSessionChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnMediaKeyEventSessionChangedListener.java
index c7e4e8b87..e992a6d14 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnMediaKeyEventSessionChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnMediaKeyEventSessionChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.session;
 
-public final class OnMediaKeyEventSessionChangedListener extends org.mases.jcobridge.JCListener implements android.media.session.MediaSessionManager.OnMediaKeyEventSessionChangedListener {
-    public OnMediaKeyEventSessionChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaSessionManager_OnMediaKeyEventSessionChangedListener extends org.mases.jcobridge.JCListener implements android.media.session.MediaSessionManager.OnMediaKeyEventSessionChangedListener {
+    public MediaSessionManager_OnMediaKeyEventSessionChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnSession2TokensChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnSession2TokensChangedListener.java
similarity index 74%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnSession2TokensChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnSession2TokensChangedListener.java
index d363a5dce..ef3b7a199 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/OnSession2TokensChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/session/MediaSessionManager_OnSession2TokensChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.session;
 
-public final class OnSession2TokensChangedListener extends org.mases.jcobridge.JCListener implements android.media.session.MediaSessionManager.OnSession2TokensChangedListener {
-    public OnSession2TokensChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MediaSessionManager_OnSession2TokensChangedListener extends org.mases.jcobridge.JCListener implements android.media.session.MediaSessionManager.OnSession2TokensChangedListener {
+    public MediaSessionManager_OnSession2TokensChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/OnUnhandledInputEventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/TvView_OnUnhandledInputEventListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/OnUnhandledInputEventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/TvView_OnUnhandledInputEventListener.java
index c3d81ad37..f605a68d6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/OnUnhandledInputEventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/TvView_OnUnhandledInputEventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.tv;
 
-public final class OnUnhandledInputEventListener extends org.mases.jcobridge.JCListener implements android.media.tv.TvView.OnUnhandledInputEventListener {
-    public OnUnhandledInputEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TvView_OnUnhandledInputEventListener extends org.mases.jcobridge.JCListener implements android.media.tv.TvView.OnUnhandledInputEventListener {
+    public TvView_OnUnhandledInputEventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/interactive/OnUnhandledInputEventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/interactive/TvInteractiveAppView_OnUnhandledInputEventListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/interactive/OnUnhandledInputEventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/interactive/TvInteractiveAppView_OnUnhandledInputEventListener.java
index 669d25c24..d4ce3fb16 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/interactive/OnUnhandledInputEventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/media/tv/interactive/TvInteractiveAppView_OnUnhandledInputEventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.media.tv.interactive;
 
-public final class OnUnhandledInputEventListener extends org.mases.jcobridge.JCListener implements android.media.tv.interactive.TvInteractiveAppView.OnUnhandledInputEventListener {
-    public OnUnhandledInputEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TvInteractiveAppView_OnUnhandledInputEventListener extends org.mases.jcobridge.JCListener implements android.media.tv.interactive.TvInteractiveAppView.OnUnhandledInputEventListener {
+    public TvInteractiveAppView_OnUnhandledInputEventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/OnNetworkActiveListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/ConnectivityManager_OnNetworkActiveListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/OnNetworkActiveListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/ConnectivityManager_OnNetworkActiveListener.java
index 905c7d1b1..aad9cc906 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/OnNetworkActiveListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/ConnectivityManager_OnNetworkActiveListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net;
 
-public final class OnNetworkActiveListener extends org.mases.jcobridge.JCListener implements android.net.ConnectivityManager.OnNetworkActiveListener {
-    public OnNetworkActiveListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ConnectivityManager_OnNetworkActiveListener extends org.mases.jcobridge.JCListener implements android.net.ConnectivityManager.OnNetworkActiveListener {
+    public ConnectivityManager_OnNetworkActiveListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/http/StatusListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/http/UrlRequest_StatusListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/http/StatusListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/http/UrlRequest_StatusListener.java
index eebd55b8d..e2ca71723 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/http/StatusListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/http/UrlRequest_StatusListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.http;
 
-public final class StatusListener extends org.mases.jcobridge.JCListener implements android.net.http.UrlRequest.StatusListener {
-    public StatusListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class UrlRequest_StatusListener extends org.mases.jcobridge.JCListener implements android.net.http.UrlRequest.StatusListener {
+    public UrlRequest_StatusListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/DiscoveryListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_DiscoveryListener.java
similarity index 87%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/DiscoveryListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_DiscoveryListener.java
index 274cb46de..90aa615c7 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/DiscoveryListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_DiscoveryListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.nsd;
 
-public final class DiscoveryListener extends org.mases.jcobridge.JCListener implements android.net.nsd.NsdManager.DiscoveryListener {
-    public DiscoveryListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class NsdManager_DiscoveryListener extends org.mases.jcobridge.JCListener implements android.net.nsd.NsdManager.DiscoveryListener {
+    public NsdManager_DiscoveryListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/RegistrationListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_RegistrationListener.java
similarity index 84%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/RegistrationListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_RegistrationListener.java
index 19d997ba3..b36f4235e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/RegistrationListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_RegistrationListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.nsd;
 
-public final class RegistrationListener extends org.mases.jcobridge.JCListener implements android.net.nsd.NsdManager.RegistrationListener {
-    public RegistrationListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class NsdManager_RegistrationListener extends org.mases.jcobridge.JCListener implements android.net.nsd.NsdManager.RegistrationListener {
+    public NsdManager_RegistrationListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/ResolveListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_ResolveListener.java
similarity index 88%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/ResolveListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_ResolveListener.java
index e528ff2e3..686460eef 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/ResolveListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/nsd/NsdManager_ResolveListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.nsd;
 
-public final class ResolveListener extends org.mases.jcobridge.JCListener implements android.net.nsd.NsdManager.ResolveListener {
-    public ResolveListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class NsdManager_ResolveListener extends org.mases.jcobridge.JCListener implements android.net.nsd.NsdManager.ResolveListener {
+    public NsdManager_ResolveListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/LocalOnlyConnectionFailureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_LocalOnlyConnectionFailureListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/LocalOnlyConnectionFailureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_LocalOnlyConnectionFailureListener.java
index 92b934422..dd947d95d 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/LocalOnlyConnectionFailureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_LocalOnlyConnectionFailureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi;
 
-public final class LocalOnlyConnectionFailureListener extends org.mases.jcobridge.JCListener implements android.net.wifi.WifiManager.LocalOnlyConnectionFailureListener {
-    public LocalOnlyConnectionFailureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiManager_LocalOnlyConnectionFailureListener extends org.mases.jcobridge.JCListener implements android.net.wifi.WifiManager.LocalOnlyConnectionFailureListener {
+    public WifiManager_LocalOnlyConnectionFailureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/SuggestionConnectionStatusListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_SuggestionConnectionStatusListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/SuggestionConnectionStatusListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_SuggestionConnectionStatusListener.java
index 804497ec2..8b1fe0bfe 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/SuggestionConnectionStatusListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_SuggestionConnectionStatusListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi;
 
-public final class SuggestionConnectionStatusListener extends org.mases.jcobridge.JCListener implements android.net.wifi.WifiManager.SuggestionConnectionStatusListener {
-    public SuggestionConnectionStatusListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiManager_SuggestionConnectionStatusListener extends org.mases.jcobridge.JCListener implements android.net.wifi.WifiManager.SuggestionConnectionStatusListener {
+    public WifiManager_SuggestionConnectionStatusListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/SuggestionUserApprovalStatusListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_SuggestionUserApprovalStatusListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/SuggestionUserApprovalStatusListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_SuggestionUserApprovalStatusListener.java
index 112f12d03..851dd505b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/SuggestionUserApprovalStatusListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/WifiManager_SuggestionUserApprovalStatusListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi;
 
-public final class SuggestionUserApprovalStatusListener extends org.mases.jcobridge.JCListener implements android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener {
-    public SuggestionUserApprovalStatusListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiManager_SuggestionUserApprovalStatusListener extends org.mases.jcobridge.JCListener implements android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener {
+    public WifiManager_SuggestionUserApprovalStatusListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ActionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ActionListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ActionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ActionListener.java
index 6d4a34b17..bacb1c685 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ActionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ActionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class ActionListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ActionListener {
-    public ActionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_ActionListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ActionListener {
+    public WifiP2pManager_ActionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ChannelListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ChannelListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ChannelListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ChannelListener.java
index ec4478a42..90f810f82 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ChannelListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ChannelListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class ChannelListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ChannelListener {
-    public ChannelListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_ChannelListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ChannelListener {
+    public WifiP2pManager_ChannelListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ConnectionInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ConnectionInfoListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ConnectionInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ConnectionInfoListener.java
index 1b96f1d30..36d0ed207 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ConnectionInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ConnectionInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class ConnectionInfoListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ConnectionInfoListener {
-    public ConnectionInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_ConnectionInfoListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ConnectionInfoListener {
+    public WifiP2pManager_ConnectionInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DeviceInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DeviceInfoListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DeviceInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DeviceInfoListener.java
index f4f2b0df8..16b989fa5 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DeviceInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DeviceInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class DeviceInfoListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.DeviceInfoListener {
-    public DeviceInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_DeviceInfoListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.DeviceInfoListener {
+    public WifiP2pManager_DeviceInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DiscoveryStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DiscoveryStateListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DiscoveryStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DiscoveryStateListener.java
index d23e22b03..11f392b23 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DiscoveryStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DiscoveryStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class DiscoveryStateListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.DiscoveryStateListener {
-    public DiscoveryStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_DiscoveryStateListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.DiscoveryStateListener {
+    public WifiP2pManager_DiscoveryStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DnsSdServiceResponseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DnsSdServiceResponseListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DnsSdServiceResponseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DnsSdServiceResponseListener.java
index a7fd0f7da..bfaf0dfec 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DnsSdServiceResponseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DnsSdServiceResponseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class DnsSdServiceResponseListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener {
-    public DnsSdServiceResponseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_DnsSdServiceResponseListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener {
+    public WifiP2pManager_DnsSdServiceResponseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DnsSdTxtRecordListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DnsSdTxtRecordListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DnsSdTxtRecordListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DnsSdTxtRecordListener.java
index dfaeb38d3..ab6d04d58 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/DnsSdTxtRecordListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_DnsSdTxtRecordListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class DnsSdTxtRecordListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener {
-    public DnsSdTxtRecordListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_DnsSdTxtRecordListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener {
+    public WifiP2pManager_DnsSdTxtRecordListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ExternalApproverRequestListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ExternalApproverRequestListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ExternalApproverRequestListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ExternalApproverRequestListener.java
index 738dfc373..f2150d64f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ExternalApproverRequestListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ExternalApproverRequestListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class ExternalApproverRequestListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ExternalApproverRequestListener {
-    public ExternalApproverRequestListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_ExternalApproverRequestListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ExternalApproverRequestListener {
+    public WifiP2pManager_ExternalApproverRequestListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/GroupInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_GroupInfoListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/GroupInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_GroupInfoListener.java
index 947a25385..9bc50643f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/GroupInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_GroupInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class GroupInfoListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.GroupInfoListener {
-    public GroupInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_GroupInfoListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.GroupInfoListener {
+    public WifiP2pManager_GroupInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/NetworkInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_NetworkInfoListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/NetworkInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_NetworkInfoListener.java
index d91637291..47d5e3b89 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/NetworkInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_NetworkInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class NetworkInfoListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.NetworkInfoListener {
-    public NetworkInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_NetworkInfoListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.NetworkInfoListener {
+    public WifiP2pManager_NetworkInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/P2pStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_P2pStateListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/P2pStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_P2pStateListener.java
index 633cc0451..6a4c99cb8 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/P2pStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_P2pStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class P2pStateListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.P2pStateListener {
-    public P2pStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_P2pStateListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.P2pStateListener {
+    public WifiP2pManager_P2pStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/PeerListListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_PeerListListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/PeerListListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_PeerListListener.java
index 186b967dc..c17c51d4d 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/PeerListListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_PeerListListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class PeerListListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.PeerListListener {
-    public PeerListListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_PeerListListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.PeerListListener {
+    public WifiP2pManager_PeerListListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ServiceResponseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ServiceResponseListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ServiceResponseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ServiceResponseListener.java
index 42fe05848..dd3fba41d 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/ServiceResponseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_ServiceResponseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class ServiceResponseListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener {
-    public ServiceResponseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_ServiceResponseListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener {
+    public WifiP2pManager_ServiceResponseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/UpnpServiceResponseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_UpnpServiceResponseListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/UpnpServiceResponseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_UpnpServiceResponseListener.java
index 7e5e6ee3e..5dffdf254 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/UpnpServiceResponseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/net/wifi/p2p/WifiP2pManager_UpnpServiceResponseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.net.wifi.p2p;
 
-public final class UpnpServiceResponseListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener {
-    public UpnpServiceResponseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WifiP2pManager_UpnpServiceResponseListener extends org.mases.jcobridge.JCListener implements android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener {
+    public WifiP2pManager_UpnpServiceResponseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/nfc/OnTagRemovedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/nfc/NfcAdapter_OnTagRemovedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/nfc/OnTagRemovedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/nfc/NfcAdapter_OnTagRemovedListener.java
index a92274079..c04668cea 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/nfc/OnTagRemovedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/nfc/NfcAdapter_OnTagRemovedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.nfc;
 
-public final class OnTagRemovedListener extends org.mases.jcobridge.JCListener implements android.nfc.NfcAdapter.OnTagRemovedListener {
-    public OnTagRemovedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class NfcAdapter_OnTagRemovedListener extends org.mases.jcobridge.JCListener implements android.nfc.NfcAdapter.OnTagRemovedListener {
+    public NfcAdapter_OnTagRemovedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnCancelListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/CancellationSignal_OnCancelListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnCancelListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/CancellationSignal_OnCancelListener.java
index d3256def8..e842a75f8 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnCancelListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/CancellationSignal_OnCancelListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.os;
 
-public final class OnCancelListener extends org.mases.jcobridge.JCListener implements android.os.CancellationSignal.OnCancelListener {
-    public OnCancelListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class CancellationSignal_OnCancelListener extends org.mases.jcobridge.JCListener implements android.os.CancellationSignal.OnCancelListener {
+    public CancellationSignal_OnCancelListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/FileUtils_ProgressListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/FileUtils_ProgressListener.java
new file mode 100644
index 000000000..87aceb602
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/FileUtils_ProgressListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.os;
+
+public final class FileUtils_ProgressListener extends org.mases.jcobridge.JCListener implements android.os.FileUtils.ProgressListener {
+    public FileUtils_ProgressListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onProgress(long arg0) {
+        raiseEvent("onProgress", arg0);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnFileDescriptorEventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/MessageQueue_OnFileDescriptorEventListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnFileDescriptorEventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/MessageQueue_OnFileDescriptorEventListener.java
index 357f6d8d8..21e38b785 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnFileDescriptorEventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/MessageQueue_OnFileDescriptorEventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.os;
 
-public final class OnFileDescriptorEventListener extends org.mases.jcobridge.JCListener implements android.os.MessageQueue.OnFileDescriptorEventListener {
-    public OnFileDescriptorEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MessageQueue_OnFileDescriptorEventListener extends org.mases.jcobridge.JCListener implements android.os.MessageQueue.OnFileDescriptorEventListener {
+    public MessageQueue_OnFileDescriptorEventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnCloseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/ParcelFileDescriptor_OnCloseListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnCloseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/ParcelFileDescriptor_OnCloseListener.java
index 7bdb0465b..c6f21c667 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnCloseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/ParcelFileDescriptor_OnCloseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.os;
 
-public final class OnCloseListener extends org.mases.jcobridge.JCListener implements android.os.ParcelFileDescriptor.OnCloseListener {
-    public OnCloseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ParcelFileDescriptor_OnCloseListener extends org.mases.jcobridge.JCListener implements android.os.ParcelFileDescriptor.OnCloseListener {
+    public ParcelFileDescriptor_OnCloseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnThermalStatusChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/PowerManager_OnThermalStatusChangedListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnThermalStatusChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/PowerManager_OnThermalStatusChangedListener.java
index ce2c478e5..838a934c1 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnThermalStatusChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/PowerManager_OnThermalStatusChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.os;
 
-public final class OnThermalStatusChangedListener extends org.mases.jcobridge.JCListener implements android.os.PowerManager.OnThermalStatusChangedListener {
-    public OnThermalStatusChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class PowerManager_OnThermalStatusChangedListener extends org.mases.jcobridge.JCListener implements android.os.PowerManager.OnThermalStatusChangedListener {
+    public PowerManager_OnThermalStatusChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/WakeLockStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/PowerManager_WakeLockStateListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/WakeLockStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/PowerManager_WakeLockStateListener.java
index 90b7d9369..06a893670 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/WakeLockStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/PowerManager_WakeLockStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.os;
 
-public final class WakeLockStateListener extends org.mases.jcobridge.JCListener implements android.os.PowerManager.WakeLockStateListener {
-    public WakeLockStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class PowerManager_WakeLockStateListener extends org.mases.jcobridge.JCListener implements android.os.PowerManager.WakeLockStateListener {
+    public PowerManager_WakeLockStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/ProgressListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/RecoverySystem_ProgressListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/ProgressListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/RecoverySystem_ProgressListener.java
index 31eede069..a965cbac6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/ProgressListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/RecoverySystem_ProgressListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.os;
 
-public final class ProgressListener extends org.mases.jcobridge.JCListener implements android.os.RecoverySystem.ProgressListener {
-    public ProgressListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class RecoverySystem_ProgressListener extends org.mases.jcobridge.JCListener implements android.os.RecoverySystem.ProgressListener {
+    public RecoverySystem_ProgressListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnThreadViolationListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/StrictMode_OnThreadViolationListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnThreadViolationListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/StrictMode_OnThreadViolationListener.java
index f599903f2..8f410ec7a 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnThreadViolationListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/StrictMode_OnThreadViolationListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.os;
 
-public final class OnThreadViolationListener extends org.mases.jcobridge.JCListener implements android.os.StrictMode.OnThreadViolationListener {
-    public OnThreadViolationListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class StrictMode_OnThreadViolationListener extends org.mases.jcobridge.JCListener implements android.os.StrictMode.OnThreadViolationListener {
+    public StrictMode_OnThreadViolationListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnVmViolationListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/StrictMode_OnVmViolationListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnVmViolationListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/StrictMode_OnVmViolationListener.java
index c878a076b..031fd32fe 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/OnVmViolationListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/os/StrictMode_OnVmViolationListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.os;
 
-public final class OnVmViolationListener extends org.mases.jcobridge.JCListener implements android.os.StrictMode.OnVmViolationListener {
-    public OnVmViolationListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class StrictMode_OnVmViolationListener extends org.mases.jcobridge.JCListener implements android.os.StrictMode.OnVmViolationListener {
+    public StrictMode_OnVmViolationListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityDestroyListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityDestroyListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityDestroyListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityDestroyListener.java
index 7ac8fade0..0745fb8f8 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityDestroyListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityDestroyListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.preference;
 
-public final class OnActivityDestroyListener extends org.mases.jcobridge.JCListener implements android.preference.PreferenceManager.OnActivityDestroyListener {
-    public OnActivityDestroyListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class PreferenceManager_OnActivityDestroyListener extends org.mases.jcobridge.JCListener implements android.preference.PreferenceManager.OnActivityDestroyListener {
+    public PreferenceManager_OnActivityDestroyListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityResultListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityResultListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityResultListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityResultListener.java
index 9f4469705..d347736c6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityResultListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityResultListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.preference;
 
-public final class OnActivityResultListener extends org.mases.jcobridge.JCListener implements android.preference.PreferenceManager.OnActivityResultListener {
-    public OnActivityResultListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class PreferenceManager_OnActivityResultListener extends org.mases.jcobridge.JCListener implements android.preference.PreferenceManager.OnActivityResultListener {
+    public PreferenceManager_OnActivityResultListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityStopListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityStopListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityStopListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityStopListener.java
index 94dbee89b..0af191673 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnActivityStopListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/PreferenceManager_OnActivityStopListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.preference;
 
-public final class OnActivityStopListener extends org.mases.jcobridge.JCListener implements android.preference.PreferenceManager.OnActivityStopListener {
-    public OnActivityStopListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class PreferenceManager_OnActivityStopListener extends org.mases.jcobridge.JCListener implements android.preference.PreferenceManager.OnActivityStopListener {
+    public PreferenceManager_OnActivityStopListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnPreferenceChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/Preference_OnPreferenceChangeListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnPreferenceChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/Preference_OnPreferenceChangeListener.java
index 0e62b5400..0f24272cc 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnPreferenceChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/Preference_OnPreferenceChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.preference;
 
-public final class OnPreferenceChangeListener extends org.mases.jcobridge.JCListener implements android.preference.Preference.OnPreferenceChangeListener {
-    public OnPreferenceChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Preference_OnPreferenceChangeListener extends org.mases.jcobridge.JCListener implements android.preference.Preference.OnPreferenceChangeListener {
+    public Preference_OnPreferenceChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnPreferenceClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/Preference_OnPreferenceClickListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnPreferenceClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/Preference_OnPreferenceClickListener.java
index 681cdd908..f8f93e5f3 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/OnPreferenceClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/preference/Preference_OnPreferenceClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.preference;
 
-public final class OnPreferenceClickListener extends org.mases.jcobridge.JCListener implements android.preference.Preference.OnPreferenceClickListener {
-    public OnPreferenceClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Preference_OnPreferenceClickListener extends org.mases.jcobridge.JCListener implements android.preference.Preference.OnPreferenceClickListener {
+    public Preference_OnPreferenceClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/renderscript/OnBufferAvailableListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/renderscript/Allocation_OnBufferAvailableListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/renderscript/OnBufferAvailableListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/renderscript/Allocation_OnBufferAvailableListener.java
index 82090d643..87bd5d7cf 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/renderscript/OnBufferAvailableListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/renderscript/Allocation_OnBufferAvailableListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.renderscript;
 
-public final class OnBufferAvailableListener extends org.mases.jcobridge.JCListener implements android.renderscript.Allocation.OnBufferAvailableListener {
-    public OnBufferAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Allocation_OnBufferAvailableListener extends org.mases.jcobridge.JCListener implements android.renderscript.Allocation.OnBufferAvailableListener {
+    public Allocation_OnBufferAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/se/omapi/OnConnectedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/se/omapi/SEService_OnConnectedListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/se/omapi/OnConnectedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/se/omapi/SEService_OnConnectedListener.java
index 7ab718cf4..2c75d0621 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/se/omapi/OnConnectedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/se/omapi/SEService_OnConnectedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.se.omapi;
 
-public final class OnConnectedListener extends org.mases.jcobridge.JCListener implements android.se.omapi.SEService.OnConnectedListener {
-    public OnConnectedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SEService_OnConnectedListener extends org.mases.jcobridge.JCListener implements android.se.omapi.SEService.OnConnectedListener {
+    public SEService_OnConnectedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/OnInitListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/TextToSpeech_OnInitListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/OnInitListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/TextToSpeech_OnInitListener.java
index b466bc771..09c8c1007 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/OnInitListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/TextToSpeech_OnInitListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.speech.tts;
 
-public final class OnInitListener extends org.mases.jcobridge.JCListener implements android.speech.tts.TextToSpeech.OnInitListener {
-    public OnInitListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TextToSpeech_OnInitListener extends org.mases.jcobridge.JCListener implements android.speech.tts.TextToSpeech.OnInitListener {
+    public TextToSpeech_OnInitListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/OnUtteranceCompletedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/TextToSpeech_OnUtteranceCompletedListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/OnUtteranceCompletedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/TextToSpeech_OnUtteranceCompletedListener.java
index 753c6ef5c..85229b755 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/OnUtteranceCompletedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/speech/tts/TextToSpeech_OnUtteranceCompletedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.speech.tts;
 
-public final class OnUtteranceCompletedListener extends org.mases.jcobridge.JCListener implements android.speech.tts.TextToSpeech.OnUtteranceCompletedListener {
-    public OnUtteranceCompletedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TextToSpeech_OnUtteranceCompletedListener extends org.mases.jcobridge.JCListener implements android.speech.tts.TextToSpeech.OnUtteranceCompletedListener {
+    public TextToSpeech_OnUtteranceCompletedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierConfigChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierConfigManager_CarrierConfigChangeListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierConfigChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierConfigManager_CarrierConfigChangeListener.java
index 835e74277..4859ef53f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierConfigChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierConfigManager_CarrierConfigChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class CarrierConfigChangeListener extends org.mases.jcobridge.JCListener implements android.telephony.CarrierConfigManager.CarrierConfigChangeListener {
-    public CarrierConfigChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class CarrierConfigManager_CarrierConfigChangeListener extends org.mases.jcobridge.JCListener implements android.telephony.CarrierConfigManager.CarrierConfigChangeListener {
+    public CarrierConfigManager_CarrierConfigChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ActiveDataSubscriptionIdListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ActiveDataSubscriptionIdListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ActiveDataSubscriptionIdListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ActiveDataSubscriptionIdListener.java
index 6e493ff27..5edd6dc6e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ActiveDataSubscriptionIdListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ActiveDataSubscriptionIdListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class ActiveDataSubscriptionIdListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.ActiveDataSubscriptionIdListener {
-    public ActiveDataSubscriptionIdListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_ActiveDataSubscriptionIdListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.ActiveDataSubscriptionIdListener {
+    public TelephonyCallback_ActiveDataSubscriptionIdListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/BarringInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_BarringInfoListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/BarringInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_BarringInfoListener.java
index 459281d60..3bf923710 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/BarringInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_BarringInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class BarringInfoListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.BarringInfoListener {
-    public BarringInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_BarringInfoListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.BarringInfoListener {
+    public TelephonyCallback_BarringInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallDisconnectCauseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallDisconnectCauseListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallDisconnectCauseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallDisconnectCauseListener.java
index d1606041c..069aa819d 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallDisconnectCauseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallDisconnectCauseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class CallDisconnectCauseListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CallDisconnectCauseListener {
-    public CallDisconnectCauseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_CallDisconnectCauseListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CallDisconnectCauseListener {
+    public TelephonyCallback_CallDisconnectCauseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallForwardingIndicatorListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallForwardingIndicatorListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallForwardingIndicatorListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallForwardingIndicatorListener.java
index f242a309c..7fabb5bdf 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallForwardingIndicatorListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallForwardingIndicatorListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class CallForwardingIndicatorListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CallForwardingIndicatorListener {
-    public CallForwardingIndicatorListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_CallForwardingIndicatorListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CallForwardingIndicatorListener {
+    public TelephonyCallback_CallForwardingIndicatorListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallStateListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallStateListener.java
index f9e918238..23278d76b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CallStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CallStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class CallStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CallStateListener {
-    public CallStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_CallStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CallStateListener {
+    public TelephonyCallback_CallStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierNetworkListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CarrierNetworkListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierNetworkListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CarrierNetworkListener.java
index b4413ab8b..67045d8f6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CarrierNetworkListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CarrierNetworkListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class CarrierNetworkListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CarrierNetworkListener {
-    public CarrierNetworkListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_CarrierNetworkListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CarrierNetworkListener {
+    public TelephonyCallback_CarrierNetworkListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CellInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CellInfoListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CellInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CellInfoListener.java
index bc606b5e7..5413d7955 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CellInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CellInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class CellInfoListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CellInfoListener {
-    public CellInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_CellInfoListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CellInfoListener {
+    public TelephonyCallback_CellInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CellLocationListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CellLocationListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CellLocationListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CellLocationListener.java
index 44b4ec43f..646c3d474 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/CellLocationListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_CellLocationListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class CellLocationListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CellLocationListener {
-    public CellLocationListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_CellLocationListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.CellLocationListener {
+    public TelephonyCallback_CellLocationListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataActivationStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataActivationStateListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataActivationStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataActivationStateListener.java
index 3e7eb8578..c062b13fc 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataActivationStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataActivationStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class DataActivationStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.DataActivationStateListener {
-    public DataActivationStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_DataActivationStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.DataActivationStateListener {
+    public TelephonyCallback_DataActivationStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataActivityListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataActivityListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataActivityListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataActivityListener.java
index 969579cb9..224147d45 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataActivityListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataActivityListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class DataActivityListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.DataActivityListener {
-    public DataActivityListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_DataActivityListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.DataActivityListener {
+    public TelephonyCallback_DataActivityListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataConnectionStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataConnectionStateListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataConnectionStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataConnectionStateListener.java
index f2f5529c6..2df7d635d 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DataConnectionStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DataConnectionStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class DataConnectionStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.DataConnectionStateListener {
-    public DataConnectionStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_DataConnectionStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.DataConnectionStateListener {
+    public TelephonyCallback_DataConnectionStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DisplayInfoListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DisplayInfoListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DisplayInfoListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DisplayInfoListener.java
index 6428c4eb3..75eff34c1 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/DisplayInfoListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_DisplayInfoListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class DisplayInfoListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.DisplayInfoListener {
-    public DisplayInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_DisplayInfoListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.DisplayInfoListener {
+    public TelephonyCallback_DisplayInfoListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/EmergencyNumberListListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_EmergencyNumberListListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/EmergencyNumberListListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_EmergencyNumberListListener.java
index 9b389e4db..e696c6750 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/EmergencyNumberListListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_EmergencyNumberListListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class EmergencyNumberListListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.EmergencyNumberListListener {
-    public EmergencyNumberListListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_EmergencyNumberListListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.EmergencyNumberListListener {
+    public TelephonyCallback_EmergencyNumberListListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ImsCallDisconnectCauseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ImsCallDisconnectCauseListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ImsCallDisconnectCauseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ImsCallDisconnectCauseListener.java
index cb40bc6e6..1186cb35e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ImsCallDisconnectCauseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ImsCallDisconnectCauseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class ImsCallDisconnectCauseListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.ImsCallDisconnectCauseListener {
-    public ImsCallDisconnectCauseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_ImsCallDisconnectCauseListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.ImsCallDisconnectCauseListener {
+    public TelephonyCallback_ImsCallDisconnectCauseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/MessageWaitingIndicatorListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_MessageWaitingIndicatorListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/MessageWaitingIndicatorListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_MessageWaitingIndicatorListener.java
index 6b1c495b4..1dc040d09 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/MessageWaitingIndicatorListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_MessageWaitingIndicatorListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class MessageWaitingIndicatorListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.MessageWaitingIndicatorListener {
-    public MessageWaitingIndicatorListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_MessageWaitingIndicatorListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.MessageWaitingIndicatorListener {
+    public TelephonyCallback_MessageWaitingIndicatorListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/PhysicalChannelConfigListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_PhysicalChannelConfigListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/PhysicalChannelConfigListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_PhysicalChannelConfigListener.java
index cc46e7b0e..123d21a37 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/PhysicalChannelConfigListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_PhysicalChannelConfigListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class PhysicalChannelConfigListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.PhysicalChannelConfigListener {
-    public PhysicalChannelConfigListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_PhysicalChannelConfigListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.PhysicalChannelConfigListener {
+    public TelephonyCallback_PhysicalChannelConfigListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/PreciseDataConnectionStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_PreciseDataConnectionStateListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/PreciseDataConnectionStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_PreciseDataConnectionStateListener.java
index 7bf24d010..c1515dc1e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/PreciseDataConnectionStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_PreciseDataConnectionStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class PreciseDataConnectionStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.PreciseDataConnectionStateListener {
-    public PreciseDataConnectionStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_PreciseDataConnectionStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.PreciseDataConnectionStateListener {
+    public TelephonyCallback_PreciseDataConnectionStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/RegistrationFailedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_RegistrationFailedListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/RegistrationFailedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_RegistrationFailedListener.java
index 5bef8611b..2027f6d58 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/RegistrationFailedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_RegistrationFailedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class RegistrationFailedListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.RegistrationFailedListener {
-    public RegistrationFailedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_RegistrationFailedListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.RegistrationFailedListener {
+    public TelephonyCallback_RegistrationFailedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ServiceStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ServiceStateListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ServiceStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ServiceStateListener.java
index 903df6cec..48ffa3d61 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/ServiceStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_ServiceStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class ServiceStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.ServiceStateListener {
-    public ServiceStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_ServiceStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.ServiceStateListener {
+    public TelephonyCallback_ServiceStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/SignalStrengthsListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_SignalStrengthsListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/SignalStrengthsListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_SignalStrengthsListener.java
index 09d739d57..fad12cc30 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/SignalStrengthsListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_SignalStrengthsListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class SignalStrengthsListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.SignalStrengthsListener {
-    public SignalStrengthsListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_SignalStrengthsListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.SignalStrengthsListener {
+    public TelephonyCallback_SignalStrengthsListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/UserMobileDataStateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_UserMobileDataStateListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/UserMobileDataStateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_UserMobileDataStateListener.java
index 7b20bb83d..32506ecda 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/UserMobileDataStateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/telephony/TelephonyCallback_UserMobileDataStateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.telephony;
 
-public final class UserMobileDataStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.UserMobileDataStateListener {
-    public UserMobileDataStateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TelephonyCallback_UserMobileDataStateListener extends org.mases.jcobridge.JCListener implements android.telephony.TelephonyCallback.UserMobileDataStateListener {
+    public TelephonyCallback_UserMobileDataStateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/transition/TransitionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/transition/Transition_TransitionListener.java
similarity index 85%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/transition/TransitionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/transition/Transition_TransitionListener.java
index 41786c9bb..84df04cd7 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/transition/TransitionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/transition/Transition_TransitionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.transition;
 
-public final class TransitionListener extends org.mases.jcobridge.JCListener implements android.transition.Transition.TransitionListener {
-    public TransitionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Transition_TransitionListener extends org.mases.jcobridge.JCListener implements android.transition.Transition.TransitionListener {
+    public Transition_TransitionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/VisibilityListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ActionProvider_VisibilityListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/VisibilityListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ActionProvider_VisibilityListener.java
index ef5eaff1b..37daa3802 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/VisibilityListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ActionProvider_VisibilityListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class VisibilityListener extends org.mases.jcobridge.JCListener implements android.view.ActionProvider.VisibilityListener {
-    public VisibilityListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ActionProvider_VisibilityListener extends org.mases.jcobridge.JCListener implements android.view.ActionProvider.VisibilityListener {
+    public ActionProvider_VisibilityListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnBufferTransformHintChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/AttachedSurfaceControl_OnBufferTransformHintChangedListener.java
similarity index 73%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnBufferTransformHintChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/AttachedSurfaceControl_OnBufferTransformHintChangedListener.java
index 648025be5..3b7836680 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnBufferTransformHintChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/AttachedSurfaceControl_OnBufferTransformHintChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnBufferTransformHintChangedListener extends org.mases.jcobridge.JCListener implements android.view.AttachedSurfaceControl.OnBufferTransformHintChangedListener {
-    public OnBufferTransformHintChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AttachedSurfaceControl_OnBufferTransformHintChangedListener extends org.mases.jcobridge.JCListener implements android.view.AttachedSurfaceControl.OnBufferTransformHintChangedListener {
+    public AttachedSurfaceControl_OnBufferTransformHintChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnContextClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnContextClickListener.java
new file mode 100644
index 000000000..49bcfdc36
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnContextClickListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.view;
+
+public final class GestureDetector_OnContextClickListener extends org.mases.jcobridge.JCListener implements android.view.GestureDetector.OnContextClickListener {
+    public GestureDetector_OnContextClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public boolean onContextClick(android.view.MotionEvent arg0) {
+        raiseEvent("onContextClick", arg0); Object retVal = getReturnData(); return (boolean)retVal;
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDoubleTapListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnDoubleTapListener.java
similarity index 84%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDoubleTapListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnDoubleTapListener.java
index e0d49f29a..105e6c2b0 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDoubleTapListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnDoubleTapListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnDoubleTapListener extends org.mases.jcobridge.JCListener implements android.view.GestureDetector.OnDoubleTapListener {
-    public OnDoubleTapListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class GestureDetector_OnDoubleTapListener extends org.mases.jcobridge.JCListener implements android.view.GestureDetector.OnDoubleTapListener {
+    public GestureDetector_OnDoubleTapListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGestureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnGestureListener.java
similarity index 88%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGestureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnGestureListener.java
index c82fdc1e7..573a2336d 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGestureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_OnGestureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnGestureListener extends org.mases.jcobridge.JCListener implements android.view.GestureDetector.OnGestureListener {
-    public OnGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class GestureDetector_OnGestureListener extends org.mases.jcobridge.JCListener implements android.view.GestureDetector.OnGestureListener {
+    public GestureDetector_OnGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SimpleOnGestureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_SimpleOnGestureListener.java
similarity index 87%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SimpleOnGestureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_SimpleOnGestureListener.java
index 78339c355..d36b0e688 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SimpleOnGestureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/GestureDetector_SimpleOnGestureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class SimpleOnGestureListener extends org.mases.jcobridge.JCListener implements android.view.GestureDetector.OnGestureListener, android.view.GestureDetector.OnDoubleTapListener, android.view.GestureDetector.OnContextClickListener {
-    public SimpleOnGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class GestureDetector_SimpleOnGestureListener extends org.mases.jcobridge.JCListener implements android.view.GestureDetector.OnGestureListener, android.view.GestureDetector.OnDoubleTapListener, android.view.GestureDetector.OnContextClickListener {
+    public GestureDetector_SimpleOnGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnActionExpandListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/MenuItem_OnActionExpandListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnActionExpandListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/MenuItem_OnActionExpandListener.java
index b19349848..17004974a 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnActionExpandListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/MenuItem_OnActionExpandListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnActionExpandListener extends org.mases.jcobridge.JCListener implements android.view.MenuItem.OnActionExpandListener {
-    public OnActionExpandListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MenuItem_OnActionExpandListener extends org.mases.jcobridge.JCListener implements android.view.MenuItem.OnActionExpandListener {
+    public MenuItem_OnActionExpandListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnMenuItemClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/MenuItem_OnMenuItemClickListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnMenuItemClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/MenuItem_OnMenuItemClickListener.java
index 83ebc5bf1..a64355175 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnMenuItemClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/MenuItem_OnMenuItemClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnMenuItemClickListener extends org.mases.jcobridge.JCListener implements android.view.MenuItem.OnMenuItemClickListener {
-    public OnMenuItemClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class MenuItem_OnMenuItemClickListener extends org.mases.jcobridge.JCListener implements android.view.MenuItem.OnMenuItemClickListener {
+    public MenuItem_OnMenuItemClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnPixelCopyFinishedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/PixelCopy_OnPixelCopyFinishedListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnPixelCopyFinishedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/PixelCopy_OnPixelCopyFinishedListener.java
index a44350390..609073d52 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnPixelCopyFinishedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/PixelCopy_OnPixelCopyFinishedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnPixelCopyFinishedListener extends org.mases.jcobridge.JCListener implements android.view.PixelCopy.OnPixelCopyFinishedListener {
-    public OnPixelCopyFinishedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class PixelCopy_OnPixelCopyFinishedListener extends org.mases.jcobridge.JCListener implements android.view.PixelCopy.OnPixelCopyFinishedListener {
+    public PixelCopy_OnPixelCopyFinishedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SimpleOnScaleGestureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ScaleGestureDetector_OnScaleGestureListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SimpleOnScaleGestureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ScaleGestureDetector_OnScaleGestureListener.java
index 05f5ca8ab..d55a2e10e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SimpleOnScaleGestureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ScaleGestureDetector_OnScaleGestureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class SimpleOnScaleGestureListener extends org.mases.jcobridge.JCListener implements android.view.ScaleGestureDetector.OnScaleGestureListener {
-    public SimpleOnScaleGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ScaleGestureDetector_OnScaleGestureListener extends org.mases.jcobridge.JCListener implements android.view.ScaleGestureDetector.OnScaleGestureListener {
+    public ScaleGestureDetector_OnScaleGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScaleGestureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ScaleGestureDetector_SimpleOnScaleGestureListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScaleGestureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ScaleGestureDetector_SimpleOnScaleGestureListener.java
index 1abbd0695..f1b3e54d6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScaleGestureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ScaleGestureDetector_SimpleOnScaleGestureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnScaleGestureListener extends org.mases.jcobridge.JCListener implements android.view.ScaleGestureDetector.OnScaleGestureListener {
-    public OnScaleGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ScaleGestureDetector_SimpleOnScaleGestureListener extends org.mases.jcobridge.JCListener implements android.view.ScaleGestureDetector.OnScaleGestureListener {
+    public ScaleGestureDetector_SimpleOnScaleGestureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/TransactionCommittedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SurfaceControl_TransactionCommittedListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/TransactionCommittedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SurfaceControl_TransactionCommittedListener.java
index c58f604f8..53d37dff7 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/TransactionCommittedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SurfaceControl_TransactionCommittedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class TransactionCommittedListener extends org.mases.jcobridge.JCListener implements android.view.SurfaceControl.TransactionCommittedListener {
-    public TransactionCommittedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SurfaceControl_TransactionCommittedListener extends org.mases.jcobridge.JCListener implements android.view.SurfaceControl.TransactionCommittedListener {
+    public SurfaceControl_TransactionCommittedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SurfaceTextureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/TextureView_SurfaceTextureListener.java
similarity index 85%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SurfaceTextureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/TextureView_SurfaceTextureListener.java
index 9dcbc92e1..43f9a2a97 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/SurfaceTextureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/TextureView_SurfaceTextureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class SurfaceTextureListener extends org.mases.jcobridge.JCListener implements android.view.TextureView.SurfaceTextureListener {
-    public SurfaceTextureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TextureView_SurfaceTextureListener extends org.mases.jcobridge.JCListener implements android.view.TextureView.SurfaceTextureListener {
+    public TextureView_SurfaceTextureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnHierarchyChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewGroup_OnHierarchyChangeListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnHierarchyChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewGroup_OnHierarchyChangeListener.java
index 7b4effc53..758b3fe53 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnHierarchyChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewGroup_OnHierarchyChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnHierarchyChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewGroup.OnHierarchyChangeListener {
-    public OnHierarchyChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewGroup_OnHierarchyChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewGroup.OnHierarchyChangeListener {
+    public ViewGroup_OnHierarchyChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnInflateListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewStub_OnInflateListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnInflateListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewStub_OnInflateListener.java
index b84062ce7..093e3c7c0 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnInflateListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewStub_OnInflateListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnInflateListener extends org.mases.jcobridge.JCListener implements android.view.ViewStub.OnInflateListener {
-    public OnInflateListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewStub_OnInflateListener extends org.mases.jcobridge.JCListener implements android.view.ViewStub.OnInflateListener {
+    public ViewStub_OnInflateListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDrawListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnDrawListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDrawListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnDrawListener.java
index 6e715e18e..e28ff47e2 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDrawListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnDrawListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnDrawListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnDrawListener {
-    public OnDrawListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnDrawListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnDrawListener {
+    public ViewTreeObserver_OnDrawListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGlobalFocusChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnGlobalFocusChangeListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGlobalFocusChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnGlobalFocusChangeListener.java
index 1b0eef311..1cd547d2c 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGlobalFocusChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnGlobalFocusChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnGlobalFocusChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnGlobalFocusChangeListener {
-    public OnGlobalFocusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnGlobalFocusChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnGlobalFocusChangeListener {
+    public ViewTreeObserver_OnGlobalFocusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGlobalLayoutListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnGlobalLayoutListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGlobalLayoutListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnGlobalLayoutListener.java
index 2230654f7..5fc1d0e56 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGlobalLayoutListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnGlobalLayoutListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnGlobalLayoutListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnGlobalLayoutListener {
-    public OnGlobalLayoutListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnGlobalLayoutListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnGlobalLayoutListener {
+    public ViewTreeObserver_OnGlobalLayoutListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnPreDrawListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnPreDrawListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnPreDrawListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnPreDrawListener.java
index e3ccfc32c..f94dc9126 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnPreDrawListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnPreDrawListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnPreDrawListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnPreDrawListener {
-    public OnPreDrawListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnPreDrawListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnPreDrawListener {
+    public ViewTreeObserver_OnPreDrawListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScrollChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnScrollChangedListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScrollChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnScrollChangedListener.java
index d64abafc1..00251d5f4 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScrollChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnScrollChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnScrollChangedListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnScrollChangedListener {
-    public OnScrollChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnScrollChangedListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnScrollChangedListener {
+    public ViewTreeObserver_OnScrollChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnTouchModeChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnTouchModeChangeListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnTouchModeChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnTouchModeChangeListener.java
index f93fe8649..72308c27c 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnTouchModeChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnTouchModeChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnTouchModeChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnTouchModeChangeListener {
-    public OnTouchModeChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnTouchModeChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnTouchModeChangeListener {
+    public ViewTreeObserver_OnTouchModeChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowAttachListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowAttachListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowAttachListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowAttachListener.java
index 058a39db2..043f3617f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowAttachListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowAttachListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnWindowAttachListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnWindowAttachListener {
-    public OnWindowAttachListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnWindowAttachListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnWindowAttachListener {
+    public ViewTreeObserver_OnWindowAttachListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowFocusChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowFocusChangeListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowFocusChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowFocusChangeListener.java
index 458ef82a9..9fa522b9e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowFocusChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowFocusChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnWindowFocusChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnWindowFocusChangeListener {
-    public OnWindowFocusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnWindowFocusChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnWindowFocusChangeListener {
+    public ViewTreeObserver_OnWindowFocusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowVisibilityChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowVisibilityChangeListener.java
similarity index 75%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowVisibilityChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowVisibilityChangeListener.java
index ef4b984dd..97a831077 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnWindowVisibilityChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/ViewTreeObserver_OnWindowVisibilityChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnWindowVisibilityChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnWindowVisibilityChangeListener {
-    public OnWindowVisibilityChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ViewTreeObserver_OnWindowVisibilityChangeListener extends org.mases.jcobridge.JCListener implements android.view.ViewTreeObserver.OnWindowVisibilityChangeListener {
+    public ViewTreeObserver_OnWindowVisibilityChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnApplyWindowInsetsListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnApplyWindowInsetsListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnApplyWindowInsetsListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnApplyWindowInsetsListener.java
index 565a2128f..6f9dd96da 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnApplyWindowInsetsListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnApplyWindowInsetsListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnApplyWindowInsetsListener extends org.mases.jcobridge.JCListener implements android.view.View.OnApplyWindowInsetsListener {
-    public OnApplyWindowInsetsListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnApplyWindowInsetsListener extends org.mases.jcobridge.JCListener implements android.view.View.OnApplyWindowInsetsListener {
+    public View_OnApplyWindowInsetsListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnAttachStateChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnAttachStateChangeListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnAttachStateChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnAttachStateChangeListener.java
index 4ecc4722d..1c0650a31 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnAttachStateChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnAttachStateChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnAttachStateChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnAttachStateChangeListener {
-    public OnAttachStateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnAttachStateChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnAttachStateChangeListener {
+    public View_OnAttachStateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnCapturedPointerListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnCapturedPointerListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnCapturedPointerListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnCapturedPointerListener.java
index e933f7baa..a394245a9 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnCapturedPointerListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnCapturedPointerListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnCapturedPointerListener extends org.mases.jcobridge.JCListener implements android.view.View.OnCapturedPointerListener {
-    public OnCapturedPointerListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnCapturedPointerListener extends org.mases.jcobridge.JCListener implements android.view.View.OnCapturedPointerListener {
+    public View_OnCapturedPointerListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnClickListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnClickListener.java
index b1dac3438..f0cc5501c 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnClickListener extends org.mases.jcobridge.JCListener implements android.view.View.OnClickListener {
-    public OnClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnClickListener extends org.mases.jcobridge.JCListener implements android.view.View.OnClickListener {
+    public View_OnClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnContextClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnContextClickListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnContextClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnContextClickListener.java
index cbe9ec9f1..ce12988ec 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnContextClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnContextClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnContextClickListener extends org.mases.jcobridge.JCListener implements android.view.View.OnContextClickListener {
-    public OnContextClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnContextClickListener extends org.mases.jcobridge.JCListener implements android.view.View.OnContextClickListener {
+    public View_OnContextClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnCreateContextMenuListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnCreateContextMenuListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnCreateContextMenuListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnCreateContextMenuListener.java
index 64f0646dc..8db18dff1 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnCreateContextMenuListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnCreateContextMenuListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnCreateContextMenuListener extends org.mases.jcobridge.JCListener implements android.view.View.OnCreateContextMenuListener {
-    public OnCreateContextMenuListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnCreateContextMenuListener extends org.mases.jcobridge.JCListener implements android.view.View.OnCreateContextMenuListener {
+    public View_OnCreateContextMenuListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDragListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnDragListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDragListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnDragListener.java
index edb3fa179..74f4bb9f5 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnDragListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnDragListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnDragListener extends org.mases.jcobridge.JCListener implements android.view.View.OnDragListener {
-    public OnDragListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnDragListener extends org.mases.jcobridge.JCListener implements android.view.View.OnDragListener {
+    public View_OnDragListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnFocusChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnFocusChangeListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnFocusChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnFocusChangeListener.java
index 0b50bfc38..04a7a1d86 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnFocusChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnFocusChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnFocusChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnFocusChangeListener {
-    public OnFocusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnFocusChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnFocusChangeListener {
+    public View_OnFocusChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGenericMotionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnGenericMotionListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGenericMotionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnGenericMotionListener.java
index 4b1e34dc0..4b90fc5fc 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnGenericMotionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnGenericMotionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnGenericMotionListener extends org.mases.jcobridge.JCListener implements android.view.View.OnGenericMotionListener {
-    public OnGenericMotionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnGenericMotionListener extends org.mases.jcobridge.JCListener implements android.view.View.OnGenericMotionListener {
+    public View_OnGenericMotionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnHoverListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnHoverListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnHoverListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnHoverListener.java
index 3602e28b5..c398a9e3d 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnHoverListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnHoverListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnHoverListener extends org.mases.jcobridge.JCListener implements android.view.View.OnHoverListener {
-    public OnHoverListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnHoverListener extends org.mases.jcobridge.JCListener implements android.view.View.OnHoverListener {
+    public View_OnHoverListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnKeyListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnKeyListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnKeyListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnKeyListener.java
index a8eaa6d4c..da30352b3 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnKeyListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnKeyListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnKeyListener extends org.mases.jcobridge.JCListener implements android.view.View.OnKeyListener {
-    public OnKeyListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnKeyListener extends org.mases.jcobridge.JCListener implements android.view.View.OnKeyListener {
+    public View_OnKeyListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnLayoutChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnLayoutChangeListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnLayoutChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnLayoutChangeListener.java
index 0f598bd3d..777a9fce5 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnLayoutChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnLayoutChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnLayoutChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnLayoutChangeListener {
-    public OnLayoutChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnLayoutChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnLayoutChangeListener {
+    public View_OnLayoutChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnLongClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnLongClickListener.java
similarity index 86%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnLongClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnLongClickListener.java
index 83a6628b1..d2855c432 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnLongClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnLongClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnLongClickListener extends org.mases.jcobridge.JCListener implements android.view.View.OnLongClickListener {
-    public OnLongClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnLongClickListener extends org.mases.jcobridge.JCListener implements android.view.View.OnLongClickListener {
+    public View_OnLongClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScrollChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnScrollChangeListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScrollChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnScrollChangeListener.java
index 4d203a980..1c75837c2 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnScrollChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnScrollChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnScrollChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnScrollChangeListener {
-    public OnScrollChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnScrollChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnScrollChangeListener {
+    public View_OnScrollChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnSystemUiVisibilityChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnSystemUiVisibilityChangeListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnSystemUiVisibilityChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnSystemUiVisibilityChangeListener.java
index 63bb446ae..ccc4e37a2 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnSystemUiVisibilityChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnSystemUiVisibilityChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnSystemUiVisibilityChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnSystemUiVisibilityChangeListener {
-    public OnSystemUiVisibilityChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnSystemUiVisibilityChangeListener extends org.mases.jcobridge.JCListener implements android.view.View.OnSystemUiVisibilityChangeListener {
+    public View_OnSystemUiVisibilityChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnTouchListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnTouchListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnTouchListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnTouchListener.java
index f8f356131..99514c617 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnTouchListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnTouchListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnTouchListener extends org.mases.jcobridge.JCListener implements android.view.View.OnTouchListener {
-    public OnTouchListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnTouchListener extends org.mases.jcobridge.JCListener implements android.view.View.OnTouchListener {
+    public View_OnTouchListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnUnhandledKeyEventListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnUnhandledKeyEventListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnUnhandledKeyEventListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnUnhandledKeyEventListener.java
index e9d29f30b..0a73bb086 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnUnhandledKeyEventListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/View_OnUnhandledKeyEventListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnUnhandledKeyEventListener extends org.mases.jcobridge.JCListener implements android.view.View.OnUnhandledKeyEventListener {
-    public OnUnhandledKeyEventListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class View_OnUnhandledKeyEventListener extends org.mases.jcobridge.JCListener implements android.view.View.OnUnhandledKeyEventListener {
+    public View_OnUnhandledKeyEventListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnControllableInsetsChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/WindowInsetsController_OnControllableInsetsChangedListener.java
similarity index 74%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnControllableInsetsChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/WindowInsetsController_OnControllableInsetsChangedListener.java
index e62e9f8fb..bf55257f9 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnControllableInsetsChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/WindowInsetsController_OnControllableInsetsChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnControllableInsetsChangedListener extends org.mases.jcobridge.JCListener implements android.view.WindowInsetsController.OnControllableInsetsChangedListener {
-    public OnControllableInsetsChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WindowInsetsController_OnControllableInsetsChangedListener extends org.mases.jcobridge.JCListener implements android.view.WindowInsetsController.OnControllableInsetsChangedListener {
+    public WindowInsetsController_OnControllableInsetsChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnFrameMetricsAvailableListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/Window_OnFrameMetricsAvailableListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnFrameMetricsAvailableListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/Window_OnFrameMetricsAvailableListener.java
index 4fdb5d059..1811bc360 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnFrameMetricsAvailableListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/Window_OnFrameMetricsAvailableListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnFrameMetricsAvailableListener extends org.mases.jcobridge.JCListener implements android.view.Window.OnFrameMetricsAvailableListener {
-    public OnFrameMetricsAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Window_OnFrameMetricsAvailableListener extends org.mases.jcobridge.JCListener implements android.view.Window.OnFrameMetricsAvailableListener {
+    public Window_OnFrameMetricsAvailableListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnRestrictedCaptionAreaChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/Window_OnRestrictedCaptionAreaChangedListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnRestrictedCaptionAreaChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/Window_OnRestrictedCaptionAreaChangedListener.java
index 3fc5d9f0d..c44970790 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/OnRestrictedCaptionAreaChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/Window_OnRestrictedCaptionAreaChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view;
 
-public final class OnRestrictedCaptionAreaChangedListener extends org.mases.jcobridge.JCListener implements android.view.Window.OnRestrictedCaptionAreaChangedListener {
-    public OnRestrictedCaptionAreaChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Window_OnRestrictedCaptionAreaChangedListener extends org.mases.jcobridge.JCListener implements android.view.Window.OnRestrictedCaptionAreaChangedListener {
+    public Window_OnRestrictedCaptionAreaChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityServicesStateChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AccessibilityServicesStateChangeListener.java
similarity index 74%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityServicesStateChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AccessibilityServicesStateChangeListener.java
index 894eb05d6..499fe35ab 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityServicesStateChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AccessibilityServicesStateChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view.accessibility;
 
-public final class AccessibilityServicesStateChangeListener extends org.mases.jcobridge.JCListener implements android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener {
-    public AccessibilityServicesStateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AccessibilityManager_AccessibilityServicesStateChangeListener extends org.mases.jcobridge.JCListener implements android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener {
+    public AccessibilityManager_AccessibilityServicesStateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityStateChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AccessibilityStateChangeListener.java
similarity index 74%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityStateChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AccessibilityStateChangeListener.java
index de5920bc7..a1e7c2af0 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityStateChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AccessibilityStateChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view.accessibility;
 
-public final class AccessibilityStateChangeListener extends org.mases.jcobridge.JCListener implements android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener {
-    public AccessibilityStateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AccessibilityManager_AccessibilityStateChangeListener extends org.mases.jcobridge.JCListener implements android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener {
+    public AccessibilityManager_AccessibilityStateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AudioDescriptionRequestedChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AudioDescriptionRequestedChangeListener.java
similarity index 73%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AudioDescriptionRequestedChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AudioDescriptionRequestedChangeListener.java
index 2ce173a27..efe842d63 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AudioDescriptionRequestedChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_AudioDescriptionRequestedChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view.accessibility;
 
-public final class AudioDescriptionRequestedChangeListener extends org.mases.jcobridge.JCListener implements android.view.accessibility.AccessibilityManager.AudioDescriptionRequestedChangeListener {
-    public AudioDescriptionRequestedChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AccessibilityManager_AudioDescriptionRequestedChangeListener extends org.mases.jcobridge.JCListener implements android.view.accessibility.AccessibilityManager.AudioDescriptionRequestedChangeListener {
+    public AccessibilityManager_AudioDescriptionRequestedChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/TouchExplorationStateChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_TouchExplorationStateChangeListener.java
similarity index 73%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/TouchExplorationStateChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_TouchExplorationStateChangeListener.java
index d07586d93..ebaf4ea45 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/TouchExplorationStateChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/accessibility/AccessibilityManager_TouchExplorationStateChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view.accessibility;
 
-public final class TouchExplorationStateChangeListener extends org.mases.jcobridge.JCListener implements android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener {
-    public TouchExplorationStateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AccessibilityManager_TouchExplorationStateChangeListener extends org.mases.jcobridge.JCListener implements android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener {
+    public AccessibilityManager_TouchExplorationStateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/animation/AnimationListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/animation/Animation_AnimationListener.java
similarity index 83%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/animation/AnimationListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/animation/Animation_AnimationListener.java
index 9a0eca3f8..42f7c99e1 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/animation/AnimationListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/animation/Animation_AnimationListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view.animation;
 
-public final class AnimationListener extends org.mases.jcobridge.JCListener implements android.view.animation.Animation.AnimationListener {
-    public AnimationListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Animation_AnimationListener extends org.mases.jcobridge.JCListener implements android.view.animation.Animation.AnimationListener {
+    public Animation_AnimationListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/textservice/SpellCheckerSessionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/textservice/SpellCheckerSession_SpellCheckerSessionListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/textservice/SpellCheckerSessionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/textservice/SpellCheckerSession_SpellCheckerSessionListener.java
index 7bbe32627..3f96dd889 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/textservice/SpellCheckerSessionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/view/textservice/SpellCheckerSession_SpellCheckerSessionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.view.textservice;
 
-public final class SpellCheckerSessionListener extends org.mases.jcobridge.JCListener implements android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener {
-    public SpellCheckerSessionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SpellCheckerSession_SpellCheckerSessionListener extends org.mases.jcobridge.JCListener implements android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener {
+    public SpellCheckerSession_SpellCheckerSessionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/IconListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebIconDatabase_IconListener.java
similarity index 85%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/IconListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebIconDatabase_IconListener.java
index bdc51f2f4..d4e0db61c 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/IconListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebIconDatabase_IconListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.webkit;
 
-public final class IconListener extends org.mases.jcobridge.JCListener implements android.webkit.WebIconDatabase.IconListener {
-    public IconListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WebIconDatabase_IconListener extends org.mases.jcobridge.JCListener implements android.webkit.WebIconDatabase.IconListener {
+    public WebIconDatabase_IconListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/FindListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebView_FindListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/FindListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebView_FindListener.java
index 9f15ff2d8..19775da5f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/FindListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebView_FindListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.webkit;
 
-public final class FindListener extends org.mases.jcobridge.JCListener implements android.webkit.WebView.FindListener {
-    public FindListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WebView_FindListener extends org.mases.jcobridge.JCListener implements android.webkit.WebView.FindListener {
+    public WebView_FindListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/PictureListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebView_PictureListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/PictureListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebView_PictureListener.java
index 80a2db4f5..67697734e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/PictureListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/webkit/WebView_PictureListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.webkit;
 
-public final class PictureListener extends org.mases.jcobridge.JCListener implements android.webkit.WebView.PictureListener {
-    public PictureListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class WebView_PictureListener extends org.mases.jcobridge.JCListener implements android.webkit.WebView.PictureListener {
+    public WebView_PictureListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/MultiChoiceModeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_MultiChoiceModeListener.java
similarity index 87%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/MultiChoiceModeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_MultiChoiceModeListener.java
index d72f45602..42337c3d2 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/MultiChoiceModeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_MultiChoiceModeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class MultiChoiceModeListener extends org.mases.jcobridge.JCListener implements android.widget.AbsListView.MultiChoiceModeListener {
-    public MultiChoiceModeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AbsListView_MultiChoiceModeListener extends org.mases.jcobridge.JCListener implements android.widget.AbsListView.MultiChoiceModeListener {
+    public AbsListView_MultiChoiceModeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_OnScrollListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_OnScrollListener.java
new file mode 100644
index 000000000..cfcf72377
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_OnScrollListener.java
@@ -0,0 +1,39 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.widget;
+
+public final class AbsListView_OnScrollListener extends org.mases.jcobridge.JCListener implements android.widget.AbsListView.OnScrollListener {
+    public AbsListView_OnScrollListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onScroll(android.widget.AbsListView arg0, int arg1, int arg2, int arg3) {
+        raiseEvent("onScroll", arg0, arg1, arg2, arg3);
+    }
+    //@Override
+    public void onScrollStateChanged(android.widget.AbsListView arg0, int arg1) {
+        raiseEvent("onScrollStateChanged", arg0, arg1);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RecyclerListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_RecyclerListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RecyclerListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_RecyclerListener.java
index d49bb6241..b85bc1940 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RecyclerListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AbsListView_RecyclerListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class RecyclerListener extends org.mases.jcobridge.JCListener implements android.widget.AbsListView.RecyclerListener {
-    public RecyclerListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AbsListView_RecyclerListener extends org.mases.jcobridge.JCListener implements android.widget.AbsListView.RecyclerListener {
+    public AbsListView_RecyclerListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ActionMenuView_OnMenuItemClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ActionMenuView_OnMenuItemClickListener.java
new file mode 100644
index 000000000..07ed4ff76
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ActionMenuView_OnMenuItemClickListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.widget;
+
+public final class ActionMenuView_OnMenuItemClickListener extends org.mases.jcobridge.JCListener implements android.widget.ActionMenuView.OnMenuItemClickListener {
+    public ActionMenuView_OnMenuItemClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public boolean onMenuItemClick(android.view.MenuItem arg0) {
+        raiseEvent("onMenuItemClick", arg0); Object retVal = getReturnData(); return (boolean)retVal;
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemClickListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemClickListener.java
index 0e21d295a..750fed21b 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnItemClickListener extends org.mases.jcobridge.JCListener implements android.widget.AdapterView.OnItemClickListener {
-    public OnItemClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AdapterView_OnItemClickListener extends org.mases.jcobridge.JCListener implements android.widget.AdapterView.OnItemClickListener {
+    public AdapterView_OnItemClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemLongClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemLongClickListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemLongClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemLongClickListener.java
index 2ff0ad750..bcd29a403 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemLongClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemLongClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnItemLongClickListener extends org.mases.jcobridge.JCListener implements android.widget.AdapterView.OnItemLongClickListener {
-    public OnItemLongClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AdapterView_OnItemLongClickListener extends org.mases.jcobridge.JCListener implements android.widget.AdapterView.OnItemLongClickListener {
+    public AdapterView_OnItemLongClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemSelectedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemSelectedListener.java
similarity index 81%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemSelectedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemSelectedListener.java
index 0317d31cd..74d6a3092 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnItemSelectedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AdapterView_OnItemSelectedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnItemSelectedListener extends org.mases.jcobridge.JCListener implements android.widget.AdapterView.OnItemSelectedListener {
-    public OnItemSelectedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class AdapterView_OnItemSelectedListener extends org.mases.jcobridge.JCListener implements android.widget.AdapterView.OnItemSelectedListener {
+    public AdapterView_OnItemSelectedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AutoCompleteTextView_OnDismissListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AutoCompleteTextView_OnDismissListener.java
new file mode 100644
index 000000000..a036e9f7f
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/AutoCompleteTextView_OnDismissListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.widget;
+
+public final class AutoCompleteTextView_OnDismissListener extends org.mases.jcobridge.JCListener implements android.widget.AutoCompleteTextView.OnDismissListener {
+    public AutoCompleteTextView_OnDismissListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onDismiss() {
+        raiseEvent("onDismiss");
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDateChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/CalendarView_OnDateChangeListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDateChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/CalendarView_OnDateChangeListener.java
index 8209ec56d..b7f7b3ac6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDateChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/CalendarView_OnDateChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnDateChangeListener extends org.mases.jcobridge.JCListener implements android.widget.CalendarView.OnDateChangeListener {
-    public OnDateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class CalendarView_OnDateChangeListener extends org.mases.jcobridge.JCListener implements android.widget.CalendarView.OnDateChangeListener {
+    public CalendarView_OnDateChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnChronometerTickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Chronometer_OnChronometerTickListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnChronometerTickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Chronometer_OnChronometerTickListener.java
index 2bce58282..4400b5a2a 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnChronometerTickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Chronometer_OnChronometerTickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnChronometerTickListener extends org.mases.jcobridge.JCListener implements android.widget.Chronometer.OnChronometerTickListener {
-    public OnChronometerTickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Chronometer_OnChronometerTickListener extends org.mases.jcobridge.JCListener implements android.widget.Chronometer.OnChronometerTickListener {
+    public Chronometer_OnChronometerTickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/CompoundButton_OnCheckedChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/CompoundButton_OnCheckedChangeListener.java
new file mode 100644
index 000000000..284e976b5
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/CompoundButton_OnCheckedChangeListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.widget;
+
+public final class CompoundButton_OnCheckedChangeListener extends org.mases.jcobridge.JCListener implements android.widget.CompoundButton.OnCheckedChangeListener {
+    public CompoundButton_OnCheckedChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onCheckedChanged(android.widget.CompoundButton arg0, boolean arg1) {
+        raiseEvent("onCheckedChanged", arg0, arg1);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDateChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/DatePicker_OnDateChangedListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDateChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/DatePicker_OnDateChangedListener.java
index 607f98b29..6c4f3e0db 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDateChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/DatePicker_OnDateChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnDateChangedListener extends org.mases.jcobridge.JCListener implements android.widget.DatePicker.OnDateChangedListener {
-    public OnDateChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class DatePicker_OnDateChangedListener extends org.mases.jcobridge.JCListener implements android.widget.DatePicker.OnDateChangedListener {
+    public DatePicker_OnDateChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnChildClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnChildClickListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnChildClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnChildClickListener.java
index 51848bf8f..582d599e6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnChildClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnChildClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnChildClickListener extends org.mases.jcobridge.JCListener implements android.widget.ExpandableListView.OnChildClickListener {
-    public OnChildClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ExpandableListView_OnChildClickListener extends org.mases.jcobridge.JCListener implements android.widget.ExpandableListView.OnChildClickListener {
+    public ExpandableListView_OnChildClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupClickListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupClickListener.java
index 33b24e214..ea9da879a 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnGroupClickListener extends org.mases.jcobridge.JCListener implements android.widget.ExpandableListView.OnGroupClickListener {
-    public OnGroupClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ExpandableListView_OnGroupClickListener extends org.mases.jcobridge.JCListener implements android.widget.ExpandableListView.OnGroupClickListener {
+    public ExpandableListView_OnGroupClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupCollapseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupCollapseListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupCollapseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupCollapseListener.java
index 2aefdf48e..72082de9f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupCollapseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupCollapseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnGroupCollapseListener extends org.mases.jcobridge.JCListener implements android.widget.ExpandableListView.OnGroupCollapseListener {
-    public OnGroupCollapseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ExpandableListView_OnGroupCollapseListener extends org.mases.jcobridge.JCListener implements android.widget.ExpandableListView.OnGroupCollapseListener {
+    public ExpandableListView_OnGroupCollapseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupExpandListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupExpandListener.java
similarity index 76%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupExpandListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupExpandListener.java
index 49718390f..685319bcc 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnGroupExpandListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ExpandableListView_OnGroupExpandListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnGroupExpandListener extends org.mases.jcobridge.JCListener implements android.widget.ExpandableListView.OnGroupExpandListener {
-    public OnGroupExpandListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ExpandableListView_OnGroupExpandListener extends org.mases.jcobridge.JCListener implements android.widget.ExpandableListView.OnGroupExpandListener {
+    public ExpandableListView_OnGroupExpandListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/FilterListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Filter_FilterListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/FilterListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Filter_FilterListener.java
index eb1f22d23..7962b5407 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/FilterListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Filter_FilterListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class FilterListener extends org.mases.jcobridge.JCListener implements android.widget.Filter.FilterListener {
-    public FilterListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Filter_FilterListener extends org.mases.jcobridge.JCListener implements android.widget.Filter.FilterListener {
+    public Filter_FilterListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnScrollListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/NumberPicker_OnScrollListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnScrollListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/NumberPicker_OnScrollListener.java
index d5d1ce3e2..65558b821 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnScrollListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/NumberPicker_OnScrollListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnScrollListener extends org.mases.jcobridge.JCListener implements android.widget.NumberPicker.OnScrollListener {
-    public OnScrollListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class NumberPicker_OnScrollListener extends org.mases.jcobridge.JCListener implements android.widget.NumberPicker.OnScrollListener {
+    public NumberPicker_OnScrollListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnValueChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/NumberPicker_OnValueChangeListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnValueChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/NumberPicker_OnValueChangeListener.java
index 9782a5c5c..03a621ab6 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnValueChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/NumberPicker_OnValueChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnValueChangeListener extends org.mases.jcobridge.JCListener implements android.widget.NumberPicker.OnValueChangeListener {
-    public OnValueChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class NumberPicker_OnValueChangeListener extends org.mases.jcobridge.JCListener implements android.widget.NumberPicker.OnValueChangeListener {
+    public NumberPicker_OnValueChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupMenu_OnDismissListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupMenu_OnDismissListener.java
new file mode 100644
index 000000000..038fe25c7
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupMenu_OnDismissListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.widget;
+
+public final class PopupMenu_OnDismissListener extends org.mases.jcobridge.JCListener implements android.widget.PopupMenu.OnDismissListener {
+    public PopupMenu_OnDismissListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public void onDismiss(android.widget.PopupMenu arg0) {
+        raiseEvent("onDismiss", arg0);
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupMenu_OnMenuItemClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupMenu_OnMenuItemClickListener.java
new file mode 100644
index 000000000..b0a037b0c
--- /dev/null
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupMenu_OnMenuItemClickListener.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2024 MASES s.r.l.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  Refer to LICENSE for more information.
+ */
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*/
+
+package org.mases.netdroid.generated.android.widget;
+
+public final class PopupMenu_OnMenuItemClickListener extends org.mases.jcobridge.JCListener implements android.widget.PopupMenu.OnMenuItemClickListener {
+    public PopupMenu_OnMenuItemClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+        super(key);
+    }
+
+    //@Override
+    public boolean onMenuItemClick(android.view.MenuItem arg0) {
+        raiseEvent("onMenuItemClick", arg0); Object retVal = getReturnData(); return (boolean)retVal;
+    }
+
+}
\ No newline at end of file
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDismissListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupWindow_OnDismissListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDismissListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupWindow_OnDismissListener.java
index 8c33d60bd..42b620090 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDismissListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/PopupWindow_OnDismissListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnDismissListener extends org.mases.jcobridge.JCListener implements android.widget.PopupWindow.OnDismissListener {
-    public OnDismissListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class PopupWindow_OnDismissListener extends org.mases.jcobridge.JCListener implements android.widget.PopupWindow.OnDismissListener {
+    public PopupWindow_OnDismissListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnCheckedChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RadioGroup_OnCheckedChangeListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnCheckedChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RadioGroup_OnCheckedChangeListener.java
index 851cac86e..b2f174857 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnCheckedChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RadioGroup_OnCheckedChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnCheckedChangeListener extends org.mases.jcobridge.JCListener implements android.widget.RadioGroup.OnCheckedChangeListener {
-    public OnCheckedChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class RadioGroup_OnCheckedChangeListener extends org.mases.jcobridge.JCListener implements android.widget.RadioGroup.OnCheckedChangeListener {
+    public RadioGroup_OnCheckedChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnRatingBarChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RatingBar_OnRatingBarChangeListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnRatingBarChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RatingBar_OnRatingBarChangeListener.java
index 076fbb257..e0273d0d2 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnRatingBarChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/RatingBar_OnRatingBarChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnRatingBarChangeListener extends org.mases.jcobridge.JCListener implements android.widget.RatingBar.OnRatingBarChangeListener {
-    public OnRatingBarChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class RatingBar_OnRatingBarChangeListener extends org.mases.jcobridge.JCListener implements android.widget.RatingBar.OnRatingBarChangeListener {
+    public RatingBar_OnRatingBarChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnCloseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnCloseListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnCloseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnCloseListener.java
index 6b9683ba2..e25518609 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnCloseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnCloseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnCloseListener extends org.mases.jcobridge.JCListener implements android.widget.SearchView.OnCloseListener {
-    public OnCloseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SearchView_OnCloseListener extends org.mases.jcobridge.JCListener implements android.widget.SearchView.OnCloseListener {
+    public SearchView_OnCloseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnQueryTextListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnQueryTextListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnQueryTextListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnQueryTextListener.java
index 5ab2ed2f1..313b8ea18 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnQueryTextListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnQueryTextListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnQueryTextListener extends org.mases.jcobridge.JCListener implements android.widget.SearchView.OnQueryTextListener {
-    public OnQueryTextListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SearchView_OnQueryTextListener extends org.mases.jcobridge.JCListener implements android.widget.SearchView.OnQueryTextListener {
+    public SearchView_OnQueryTextListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnSuggestionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnSuggestionListener.java
similarity index 82%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnSuggestionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnSuggestionListener.java
index 209dddb83..d694520fb 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnSuggestionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SearchView_OnSuggestionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnSuggestionListener extends org.mases.jcobridge.JCListener implements android.widget.SearchView.OnSuggestionListener {
-    public OnSuggestionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SearchView_OnSuggestionListener extends org.mases.jcobridge.JCListener implements android.widget.SearchView.OnSuggestionListener {
+    public SearchView_OnSuggestionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnSeekBarChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SeekBar_OnSeekBarChangeListener.java
similarity index 83%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnSeekBarChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SeekBar_OnSeekBarChangeListener.java
index 52184c4c9..5705a5c8c 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnSeekBarChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SeekBar_OnSeekBarChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnSeekBarChangeListener extends org.mases.jcobridge.JCListener implements android.widget.SeekBar.OnSeekBarChangeListener {
-    public OnSeekBarChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SeekBar_OnSeekBarChangeListener extends org.mases.jcobridge.JCListener implements android.widget.SeekBar.OnSeekBarChangeListener {
+    public SeekBar_OnSeekBarChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnShareTargetSelectedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ShareActionProvider_OnShareTargetSelectedListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnShareTargetSelectedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ShareActionProvider_OnShareTargetSelectedListener.java
index 2314b1ad3..cd7bd64ad 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnShareTargetSelectedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ShareActionProvider_OnShareTargetSelectedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnShareTargetSelectedListener extends org.mases.jcobridge.JCListener implements android.widget.ShareActionProvider.OnShareTargetSelectedListener {
-    public OnShareTargetSelectedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ShareActionProvider_OnShareTargetSelectedListener extends org.mases.jcobridge.JCListener implements android.widget.ShareActionProvider.OnShareTargetSelectedListener {
+    public ShareActionProvider_OnShareTargetSelectedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerCloseListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerCloseListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerCloseListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerCloseListener.java
index bb451da90..15e9fcf88 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerCloseListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerCloseListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnDrawerCloseListener extends org.mases.jcobridge.JCListener implements android.widget.SlidingDrawer.OnDrawerCloseListener {
-    public OnDrawerCloseListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SlidingDrawer_OnDrawerCloseListener extends org.mases.jcobridge.JCListener implements android.widget.SlidingDrawer.OnDrawerCloseListener {
+    public SlidingDrawer_OnDrawerCloseListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerOpenListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerOpenListener.java
similarity index 77%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerOpenListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerOpenListener.java
index e3c96b130..94d4e3bf9 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerOpenListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerOpenListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnDrawerOpenListener extends org.mases.jcobridge.JCListener implements android.widget.SlidingDrawer.OnDrawerOpenListener {
-    public OnDrawerOpenListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SlidingDrawer_OnDrawerOpenListener extends org.mases.jcobridge.JCListener implements android.widget.SlidingDrawer.OnDrawerOpenListener {
+    public SlidingDrawer_OnDrawerOpenListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerScrollListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerScrollListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerScrollListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerScrollListener.java
index d6472ba57..4ef142d76 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnDrawerScrollListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/SlidingDrawer_OnDrawerScrollListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnDrawerScrollListener extends org.mases.jcobridge.JCListener implements android.widget.SlidingDrawer.OnDrawerScrollListener {
-    public OnDrawerScrollListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SlidingDrawer_OnDrawerScrollListener extends org.mases.jcobridge.JCListener implements android.widget.SlidingDrawer.OnDrawerScrollListener {
+    public SlidingDrawer_OnDrawerScrollListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnTabChangeListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TabHost_OnTabChangeListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnTabChangeListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TabHost_OnTabChangeListener.java
index f8cd84946..4de29b53e 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnTabChangeListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TabHost_OnTabChangeListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnTabChangeListener extends org.mases.jcobridge.JCListener implements android.widget.TabHost.OnTabChangeListener {
-    public OnTabChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TabHost_OnTabChangeListener extends org.mases.jcobridge.JCListener implements android.widget.TabHost.OnTabChangeListener {
+    public TabHost_OnTabChangeListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnEditorActionListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TextView_OnEditorActionListener.java
similarity index 80%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnEditorActionListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TextView_OnEditorActionListener.java
index cdede7860..a7a0fa6c8 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnEditorActionListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TextView_OnEditorActionListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnEditorActionListener extends org.mases.jcobridge.JCListener implements android.widget.TextView.OnEditorActionListener {
-    public OnEditorActionListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TextView_OnEditorActionListener extends org.mases.jcobridge.JCListener implements android.widget.TextView.OnEditorActionListener {
+    public TextView_OnEditorActionListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnTimeChangedListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TimePicker_OnTimeChangedListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnTimeChangedListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TimePicker_OnTimeChangedListener.java
index 1b4268293..dd37a99fa 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnTimeChangedListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/TimePicker_OnTimeChangedListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnTimeChangedListener extends org.mases.jcobridge.JCListener implements android.widget.TimePicker.OnTimeChangedListener {
-    public OnTimeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class TimePicker_OnTimeChangedListener extends org.mases.jcobridge.JCListener implements android.widget.TimePicker.OnTimeChangedListener {
+    public TimePicker_OnTimeChangedListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnMenuItemClickListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Toolbar_OnMenuItemClickListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnMenuItemClickListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Toolbar_OnMenuItemClickListener.java
index 41f249c04..93279c71f 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnMenuItemClickListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/Toolbar_OnMenuItemClickListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnMenuItemClickListener extends org.mases.jcobridge.JCListener implements android.widget.Toolbar.OnMenuItemClickListener {
-    public OnMenuItemClickListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class Toolbar_OnMenuItemClickListener extends org.mases.jcobridge.JCListener implements android.widget.Toolbar.OnMenuItemClickListener {
+    public Toolbar_OnMenuItemClickListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnZoomListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ZoomButtonsController_OnZoomListener.java
similarity index 79%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnZoomListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ZoomButtonsController_OnZoomListener.java
index 04e1a82fd..6b2ea4043 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/OnZoomListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/widget/ZoomButtonsController_OnZoomListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.widget;
 
-public final class OnZoomListener extends org.mases.jcobridge.JCListener implements android.widget.ZoomButtonsController.OnZoomListener {
-    public OnZoomListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class ZoomButtonsController_OnZoomListener extends org.mases.jcobridge.JCListener implements android.widget.ZoomButtonsController.OnZoomListener {
+    public ZoomButtonsController_OnZoomListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/window/OnExitAnimationListener.java b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/window/SplashScreen_OnExitAnimationListener.java
similarity index 78%
rename from src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/window/OnExitAnimationListener.java
rename to src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/window/SplashScreen_OnExitAnimationListener.java
index 4f64f64fa..5662d6f9c 100644
--- a/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/window/OnExitAnimationListener.java
+++ b/src/jvm/netdroid/src/main/java/org/mases/netdroid/generated/android/window/SplashScreen_OnExitAnimationListener.java
@@ -22,8 +22,8 @@
 
 package org.mases.netdroid.generated.android.window;
 
-public final class OnExitAnimationListener extends org.mases.jcobridge.JCListener implements android.window.SplashScreen.OnExitAnimationListener {
-    public OnExitAnimationListener(String key) throws org.mases.jcobridge.JCNativeException {
+public final class SplashScreen_OnExitAnimationListener extends org.mases.jcobridge.JCListener implements android.window.SplashScreen.OnExitAnimationListener {
+    public SplashScreen_OnExitAnimationListener(String key) throws org.mases.jcobridge.JCNativeException {
         super(key);
     }
 
diff --git a/src/net/Netdroid/Developed/Android/Widget/ListAdapter.cs b/src/net/Netdroid/Developed/Android/Widget/ListAdapter.cs
new file mode 100644
index 000000000..e6533b008
--- /dev/null
+++ b/src/net/Netdroid/Developed/Android/Widget/ListAdapter.cs
@@ -0,0 +1,37 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android.Widget
+{
+    #region IListAdapter
+    /// <summary>
+    /// .NET interface for org.mases.netdroid.generated.android.widget.ListAdapter implementing <see href="https://developer.android.com/reference/android/widget/ListAdapter.html"/>
+    /// </summary>
+    public partial interface IListAdapter : IAdapter
+    {
+
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Developed/Android/Widget/SpinnerAdapter.cs b/src/net/Netdroid/Developed/Android/Widget/SpinnerAdapter.cs
new file mode 100644
index 000000000..5d753e268
--- /dev/null
+++ b/src/net/Netdroid/Developed/Android/Widget/SpinnerAdapter.cs
@@ -0,0 +1,32 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android.Widget
+{
+    #region ISpinnerAdapter
+    /// <summary>
+    /// .NET interface for org.mases.netdroid.generated.android.widget.SpinnerAdapter implementing <see href="https://developer.android.com/reference/android/widget/SpinnerAdapter.html"/>
+    /// </summary>
+    public partial interface ISpinnerAdapter : IAdapter
+    {
+
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Developed/Java/Lang/Class.cs b/src/net/Netdroid/Developed/Java/Lang/Class.cs
index 0f77a5e22..8752b086a 100644
--- a/src/net/Netdroid/Developed/Java/Lang/Class.cs
+++ b/src/net/Netdroid/Developed/Java/Lang/Class.cs
@@ -27,10 +27,10 @@ public partial class Class : IGenericDeclaration
         static readonly Java.Lang.ClassLoader _loader = storeLoader();
         static Java.Lang.ClassLoader storeLoader()
         {
-            return Java.Lang.ClassLoader.SystemClassLoader;
+            return Java.Lang.ClassLoader.GetSystemClassLoader();
         }
         /// <summary>
-        /// Returns the cached <see cref="Java.Lang.ClassLoader.SystemClassLoader"/>, it is used internally from <see cref="Of{T}"/>
+        /// Returns the cached <see cref="Java.Lang.ClassLoader.GetSystemClassLoader"/>, it is used internally from <see cref="Of{T}"/>
         /// </summary>
         public static Java.Lang.ClassLoader SystemClassLoader => _loader;
         /// <summary>
diff --git a/src/net/Netdroid/Developed/Java/Lang/Float.cs b/src/net/Netdroid/Developed/Java/Lang/Float.cs
index 2acdb71a8..62d533319 100644
--- a/src/net/Netdroid/Developed/Java/Lang/Float.cs
+++ b/src/net/Netdroid/Developed/Java/Lang/Float.cs
@@ -38,6 +38,14 @@ public static Float ToJVM(float clrValue)
             return ValueOf(clrValue);
         }
 
+        #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Java.Lang.Float"/> to <see cref="Java.Lang.Comparable"/>
+        /// </summary>
+        public static implicit operator Java.Lang.Comparable<Java.Lang.Float>(Java.Lang.Float t) => t.Cast<Java.Lang.Comparable<Java.Lang.Float>>();
+
+        #endregion
+
         /// <summary>
         /// Converter from <see cref="Float"/> to <see cref="float"/>
         /// </summary>
diff --git a/src/net/Netdroid/Developed/Java/Lang/Iterable.cs b/src/net/Netdroid/Developed/Java/Lang/Iterable.cs
index a2317d3bb..c820c7c75 100644
--- a/src/net/Netdroid/Developed/Java/Lang/Iterable.cs
+++ b/src/net/Netdroid/Developed/Java/Lang/Iterable.cs
@@ -20,10 +20,24 @@
 
 namespace Java.Lang
 {
+    #region IIterable<E>
+    /// <summary>
+    /// .NET interface for <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Iterable.html"/>
+    /// </summary>
+    public partial interface IIterable
+    {
+        /// <summary>
+        /// Returns an iterator over elements of type <see langref="object"/>
+        /// </summary>
+        /// <returns>An <see cref="Util.Iterator{T}"/></returns>
+        Java.Util.Iterator Iterator();
+    }
+    #endregion
+
     /// <summary>
     /// .NET implementations of <see href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html"/>
     /// </summary>
-    public class Iterable : JVMBridgeBaseEnumerable<Iterable>
+    public class Iterable : JVMBridgeBaseEnumerable<Iterable>, IIterable
     {
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
@@ -45,14 +59,28 @@ public Iterable(params object[] args) : base(args) { }
         /// Returns an iterator over elements of type <see langref="object"/>
         /// </summary>
         /// <returns>An <see cref="Java.Util.Iterator{T}"/></returns>
-        public Java.Util.Iterator Iterator => IExecute<Util.Iterator>("iterator");
+        public Java.Util.Iterator Iterator() => IExecute<Util.Iterator>("iterator");
+    }
+
+    #region IIterable<E>
+    /// <summary>
+    /// .NET interface for <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Iterable.html"/>
+    /// </summary>
+    public partial interface IIterable<T>
+    {
+        /// <summary>
+        /// Returns an iterator over elements of type <typeparamref name="T"/>.
+        /// </summary>
+        /// <returns>An <see cref="Util.Iterator{T}"/></returns>
+        Java.Util.Iterator<T> Iterator();
     }
+    #endregion
 
     /// <summary>
     /// .NET implementations of <see href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html"/>
     /// </summary>
     /// <typeparam name="T"><see href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html"/></typeparam>
-    public class Iterable<T> : MASES.Netdroid.Specific.NetdroidAsyncEnumerable<Iterable<T>, T>
+    public class Iterable<T> : MASES.Netdroid.Specific.NetdroidAsyncEnumerable<Iterable<T>, T>, IIterable<T>
     {
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
@@ -74,6 +102,6 @@ public Iterable(params object[] args) : base(args) { }
         /// Returns an iterator over elements of type <typeparamref name="T"/>.
         /// </summary>
         /// <returns>An <see cref="Util.Iterator{T}"/></returns>
-        public Util.Iterator<T> Iterator => IExecute<Util.Iterator<T>>("iterator");
+        public Util.Iterator<T> Iterator() => IExecute<Util.Iterator<T>>("iterator");
     }
 }
diff --git a/src/net/Netdroid/Developed/Java/Util/Comparator.cs b/src/net/Netdroid/Developed/Java/Util/Comparator.cs
index d1718da52..02f289a4e 100644
--- a/src/net/Netdroid/Developed/Java/Util/Comparator.cs
+++ b/src/net/Netdroid/Developed/Java/Util/Comparator.cs
@@ -59,8 +59,8 @@ public partial class Comparator<T> : Comparator, IComparator<T>
         /// </summary>
         public Comparator()
         {
-            AddEventHandler("compare", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(CompareEventHandler)); OnCompare = Compare;
-            AddEventHandler("equals", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(EqualsEventHandler)); OnEquals = Equals;
+            AddEventHandler("compare", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(CompareEventHandler)); OnCompare = Compare;
+            AddEventHandler("equals", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(EqualsEventHandler)); OnEquals = Equals;
         }
 
         /// <summary>
@@ -105,7 +105,7 @@ public Comparator()
         /// <summary>
         /// Handler for <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/Comparator.html#compare(java.lang.Object,java.lang.Object)"/>
         /// </summary>
-        public System.Func<T, T, int> OnCompare { get; set; }
+        public global::System.Func<T, T, int> OnCompare { get; set; }
 
         void CompareEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -130,7 +130,7 @@ public virtual int Compare(T arg0, T arg1)
         /// <summary>
         /// Handler for <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/Comparator.html#equals(java.lang.Object)"/>
         /// </summary>
-        public System.Func<object, bool> OnEquals { get; set; }
+        public global::System.Func<object, bool> OnEquals { get; set; }
 
         void EqualsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
diff --git a/src/net/Netdroid/Developed/Java/Util/Function/BiFunction.cs b/src/net/Netdroid/Developed/Java/Util/Function/BiFunction.cs
index ee268a346..7a26700bc 100644
--- a/src/net/Netdroid/Developed/Java/Util/Function/BiFunction.cs
+++ b/src/net/Netdroid/Developed/Java/Util/Function/BiFunction.cs
@@ -43,12 +43,52 @@ public interface IBiFunction<T, U, TReturn> : IJVMBridgeBase
     /// </summary>
     public abstract class BiFunction : JVMBridgeListener
     {
+        /// <summary>
+        /// Enable/disable handlers initialization, default is <see langword="true"/>
+        /// </summary>
+        protected virtual bool InitHandlers { get; } = true;
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
         public override string BridgeClassName => "org.mases.netdroid.developed.java.util.function.BiFunction";
     }
 
+    /// <summary>
+    /// Direct override of <see cref="BiFunction"/> or its generic type if there is one
+    /// </summary>
+    public partial class BiFunctionDirect : BiFunction
+    {
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr_2.5.12/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// </summary>
+        public override bool AutoInit => false;
+
+        /// <inheritdoc cref="Predicate.InitHandlers"/>
+        protected override bool InitHandlers => false;
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => "java.util.function.BiFunction";
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+    }
+
     /// <summary>
     /// Listener for <see href="https://docs.oracle.com/javase/8/docs/api/java/util/function/BiFunction.html"/>. Extends <see cref="BiFunction"/>
     /// </summary>
@@ -66,7 +106,10 @@ public class BiFunction<T, U, TReturn> : BiFunction, IBiFunction<T, U, TReturn>
         /// </summary>
         public BiFunction()
         {
-            AddEventHandler("apply", new EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyEventHandler)); OnApply = Apply;
+            if (InitHandlers)
+            {
+                AddEventHandler("apply", new EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyEventHandler)); OnApply = Apply;
+            }
         }
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
@@ -82,4 +125,65 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data
         /// <returns>The apply <typeparamref name="TReturn"/></returns>
         public virtual TReturn Apply(T o1, U o2) { return default(TReturn); }
     }
+
+    /// <summary>
+    /// Direct override of <see cref="BiFunction"/> or its generic type if there is one
+    /// </summary>
+    public partial class BiFunctionDirect<T, U, R> : BiFunction<T, U, R>
+    {
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// </summary>
+        public override bool AutoInit => false;
+
+        /// <inheritdoc cref="Predicate.InitHandlers"/>
+        protected override bool InitHandlers => false;
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => "java.util.function.BiFunction";
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><typeparamref name="U"/></param>
+        /// <returns><typeparamref name="R"/></returns>
+        public override R Apply(T arg0, U arg1)
+        {
+            return IExecute<R>("apply", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
+        /// <typeparam name="V"></typeparam>
+        /// <typeparam name="Arg0objectSuperR"><typeparamref name="R"/></typeparam>
+        /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
+        /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
+        public Java.Util.Function.BiFunction<T, U, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
+        {
+            return IExecuteWithSignature<Java.Util.Function.BiFunctionDirect<T, U, V>, Java.Util.Function.BiFunction<T, U, V>>("andThen", "(Ljava/util/function/Function;)Ljava/util/function/BiFunction;", arg0);
+        }
+
+        #endregion
+    }
 }
diff --git a/src/net/Netdroid/Developed/Java/Util/Function/BiPredicate.cs b/src/net/Netdroid/Developed/Java/Util/Function/BiPredicate.cs
index fec5cc78f..2e9492028 100644
--- a/src/net/Netdroid/Developed/Java/Util/Function/BiPredicate.cs
+++ b/src/net/Netdroid/Developed/Java/Util/Function/BiPredicate.cs
@@ -42,6 +42,11 @@ public interface IBiPredicate<T, U> : IJVMBridgeBase
     /// </summary>
     public abstract class BiPredicate : JVMBridgeListener
     {
+        /// <summary>
+        /// Enable/disable handlers initialization, default is <see langword="true"/>
+        /// </summary>
+        protected virtual bool InitHandlers { get; } = true;
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Developed/Java/Util/Function/BooleanSupplier.cs b/src/net/Netdroid/Developed/Java/Util/Function/BooleanSupplier.cs
index 0c35b2c94..e4c31e9d9 100644
--- a/src/net/Netdroid/Developed/Java/Util/Function/BooleanSupplier.cs
+++ b/src/net/Netdroid/Developed/Java/Util/Function/BooleanSupplier.cs
@@ -38,6 +38,11 @@ public interface IBooleanSupplier : IJVMBridgeBase
     /// </summary>
     public class BooleanSupplier : JVMBridgeListener, IBooleanSupplier
     {
+        /// <summary>
+        /// Enable/disable handlers initialization, default is <see langword="true"/>
+        /// </summary>
+        protected virtual bool InitHandlers { get; } = true;
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Developed/Java/Util/Function/Consumer.cs b/src/net/Netdroid/Developed/Java/Util/Function/Consumer.cs
index 37413c408..4391d700b 100644
--- a/src/net/Netdroid/Developed/Java/Util/Function/Consumer.cs
+++ b/src/net/Netdroid/Developed/Java/Util/Function/Consumer.cs
@@ -39,6 +39,11 @@ public interface IConsumer<TObject> : IJVMBridgeBase
     /// </summary>
     public abstract class Consumer : JVMBridgeListener
     {
+        /// <summary>
+        /// Enable/disable handlers initialization, default is <see langword="true"/>
+        /// </summary>
+        protected virtual bool InitHandlers { get; } = true;
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Developed/Java/Util/Function/DoubleBinaryOperator.cs b/src/net/Netdroid/Developed/Java/Util/Function/DoubleBinaryOperator.cs
index 250b2cc55..7626ebcc5 100644
--- a/src/net/Netdroid/Developed/Java/Util/Function/DoubleBinaryOperator.cs
+++ b/src/net/Netdroid/Developed/Java/Util/Function/DoubleBinaryOperator.cs
@@ -40,6 +40,11 @@ public interface IDoubleBinaryOperator : IJVMBridgeBase
     /// </summary>
     public class DoubleBinaryOperator : JVMBridgeListener, IDoubleBinaryOperator
     {
+        /// <summary>
+        /// Enable/disable handlers initialization, default is <see langword="true"/>
+        /// </summary>
+        protected virtual bool InitHandlers { get; } = true;
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
@@ -54,7 +59,10 @@ public class DoubleBinaryOperator : JVMBridgeListener, IDoubleBinaryOperator
         /// </summary>
         public DoubleBinaryOperator()
         {
-            AddEventHandler("applyAsDouble", new EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsDoubleEventHandler)); OnApplyAsDouble = ApplyAsDouble;
+            if (InitHandlers)
+            {
+                AddEventHandler("applyAsDouble", new EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsDoubleEventHandler)); OnApplyAsDouble = ApplyAsDouble;
+            }
         }
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
@@ -70,4 +78,53 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <returns>The applyAsDouble result</returns>
         public virtual double ApplyAsDouble(double o1, double o2) { return default(double); }
     }
+
+    /// <summary>
+    /// Direct override of <see cref="DoubleBinaryOperator"/> or its generic type if there is one
+    /// </summary>
+    public partial class DoubleBinaryOperatorDirect : DoubleBinaryOperator
+    {
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// </summary>
+        public override bool AutoInit => false;
+
+        /// <inheritdoc cref="BinaryOperator.InitHandlers"/>
+        protected override bool InitHandlers => false;
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => "java.util.function.DoubleBinaryOperator";
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/function/DoubleBinaryOperator.html#applyAsDouble(double,double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        /// <param name="arg1"><see cref="double"/></param>
+        /// <returns><see cref="double"/></returns>
+        public override double ApplyAsDouble(double arg0, double arg1)
+        {
+            return IExecute<double>("applyAsDouble", arg0, arg1);
+        }
+
+        #endregion
+    }
 }
diff --git a/src/net/Netdroid/Developed/Java/Util/Function/DoubleUnaryOperator.cs b/src/net/Netdroid/Developed/Java/Util/Function/DoubleUnaryOperator.cs
index b8dc96937..59d14d9fc 100644
--- a/src/net/Netdroid/Developed/Java/Util/Function/DoubleUnaryOperator.cs
+++ b/src/net/Netdroid/Developed/Java/Util/Function/DoubleUnaryOperator.cs
@@ -39,6 +39,11 @@ public interface IDoubleUnaryOperator : IJVMBridgeBase
     /// </summary>
     public class DoubleUnaryOperator : JVMBridgeListener, IDoubleUnaryOperator
     {
+        /// <summary>
+        /// Enable/disable handlers initialization, default is <see langword="true"/>
+        /// </summary>
+        protected virtual bool InitHandlers { get; } = true;
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
@@ -68,4 +73,70 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <returns>The apply result</returns>
         public virtual double ApplyAsDouble(double obj) { return default(double); }
     }
+
+    /// <summary>
+    /// Direct override of <see cref="DoubleUnaryOperator"/> or its generic type if there is one
+    /// </summary>
+    public partial class DoubleUnaryOperatorDirect : DoubleUnaryOperator
+    {
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// </summary>
+        public override bool AutoInit => false;
+
+        /// <inheritdoc cref="BinaryOperator.InitHandlers"/>
+        protected override bool InitHandlers => false;
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => "java.util.function.DoubleUnaryOperator";
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/function/DoubleUnaryOperator.html#applyAsDouble(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        /// <returns><see cref="double"/></returns>
+        public override double ApplyAsDouble(double arg0)
+        {
+            return IExecuteWithSignature<double>("applyAsDouble", "(D)D", arg0);
+        }
+        /// <summary>
+        /// <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
+        /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
+        public Java.Util.Function.DoubleUnaryOperator AndThen(Java.Util.Function.DoubleUnaryOperator arg0)
+        {
+            return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperatorDirect, Java.Util.Function.DoubleUnaryOperator>("andThen", "(Ljava/util/function/DoubleUnaryOperator;)Ljava/util/function/DoubleUnaryOperator;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
+        /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
+        public Java.Util.Function.DoubleUnaryOperator Compose(Java.Util.Function.DoubleUnaryOperator arg0)
+        {
+            return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperatorDirect, Java.Util.Function.DoubleUnaryOperator>("compose", "(Ljava/util/function/DoubleUnaryOperator;)Ljava/util/function/DoubleUnaryOperator;", arg0);
+        }
+
+        #endregion
+    }
 }
diff --git a/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityGestureEvent.cs b/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityGestureEvent.cs
index 09dd0c38b..665222f3f 100644
--- a/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityGestureEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityGestureEvent.cs
@@ -71,33 +71,36 @@ public static Java.Lang.String GestureIdToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#getDisplayId()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#describeContents()"/>
         /// </summary>
-        public int DisplayId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDisplayId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#getGestureId()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#getDisplayId()"/>
         /// </summary>
-        public int GestureId
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayId()
         {
-            get { return IExecuteWithSignature<int>("getGestureId", "()I"); }
+            return IExecuteWithSignature<int>("getDisplayId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#getMotionEvents()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#getGestureId()"/>
         /// </summary>
-        public Java.Util.List<Android.View.MotionEvent> MotionEvents
+        /// <returns><see cref="int"/></returns>
+        public int GetGestureId()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.MotionEvent>>("getMotionEvents", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getGestureId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#getMotionEvents()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.MotionEvent> GetMotionEvents()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.View.MotionEvent>>("getMotionEvents", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityGestureEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityService.cs b/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityService.cs
index 4ce013e9f..cbd2572b8 100644
--- a/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityService.cs
+++ b/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityService.cs
@@ -508,76 +508,6 @@ public partial class AccessibilityService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getAccessibilityButtonController()"/> 
-        /// </summary>
-        public Android.Accessibilityservice.AccessibilityButtonController AccessibilityButtonController
-        {
-            get { return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityButtonController>("getAccessibilityButtonController", "()Landroid/accessibilityservice/AccessibilityButtonController;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getFingerprintGestureController()"/> 
-        /// </summary>
-        public Android.Accessibilityservice.FingerprintGestureController FingerprintGestureController
-        {
-            get { return IExecuteWithSignature<Android.Accessibilityservice.FingerprintGestureController>("getFingerprintGestureController", "()Landroid/accessibilityservice/FingerprintGestureController;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getMagnificationController()"/> 
-        /// </summary>
-        public Android.Accessibilityservice.AccessibilityService.MagnificationController GetMagnificationController
-        {
-            get { return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityService.MagnificationController>("getMagnificationController", "()Landroid/accessibilityservice/AccessibilityService$MagnificationController;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getSoftKeyboardController()"/> 
-        /// </summary>
-        public Android.Accessibilityservice.AccessibilityService.SoftKeyboardController GetSoftKeyboardController
-        {
-            get { return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityService.SoftKeyboardController>("getSoftKeyboardController", "()Landroid/accessibilityservice/AccessibilityService$SoftKeyboardController;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getInputMethod()"/> 
-        /// </summary>
-        public Android.Accessibilityservice.InputMethod InputMethod
-        {
-            get { return IExecuteWithSignature<Android.Accessibilityservice.InputMethod>("getInputMethod", "()Landroid/accessibilityservice/InputMethod;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getRootInActiveWindow()"/> 
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo RootInActiveWindow
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getRootInActiveWindow", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getServiceInfo()"/> <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo)"/>
-        /// </summary>
-        public Android.Accessibilityservice.AccessibilityServiceInfo ServiceInfo
-        {
-            get { return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityServiceInfo>("getServiceInfo", "()Landroid/accessibilityservice/AccessibilityServiceInfo;"); } set { IExecuteWithSignature("setServiceInfo", "(Landroid/accessibilityservice/AccessibilityServiceInfo;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getSystemActions()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction> SystemActions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction>>("getSystemActions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getWindows()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo> Windows
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>>("getWindows", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getWindowsOnAllDisplays()"/> 
-        /// </summary>
-        public Android.Util.SparseArray<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>> WindowsOnAllDisplays
-        {
-            get { return IExecuteWithSignature<Android.Util.SparseArray<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>>>("getWindowsOnAllDisplays", "()Landroid/util/SparseArray;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#onAccessibilityEvent(android.view.accessibility.AccessibilityEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityEvent"/></param>
@@ -610,6 +540,14 @@ public Android.View.Accessibility.AccessibilityNodeInfo FindFocus(int arg0)
             return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("findFocus", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getRootInActiveWindow()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetRootInActiveWindow()
+        {
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getRootInActiveWindow", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getRootInActiveWindow(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -671,6 +609,14 @@ public bool SetCacheEnabled(bool arg0)
             return IExecuteWithSignature<bool>("setCacheEnabled", "(Z)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getAccessibilityButtonController()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Accessibilityservice.AccessibilityButtonController"/></returns>
+        public Android.Accessibilityservice.AccessibilityButtonController GetAccessibilityButtonController()
+        {
+            return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityButtonController>("getAccessibilityButtonController", "()Landroid/accessibilityservice/AccessibilityButtonController;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getAccessibilityButtonController(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -680,6 +626,46 @@ public Android.Accessibilityservice.AccessibilityButtonController GetAccessibili
             return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityButtonController>("getAccessibilityButtonController", "(I)Landroid/accessibilityservice/AccessibilityButtonController;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getMagnificationController()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Accessibilityservice.AccessibilityService.MagnificationController"/></returns>
+        public Android.Accessibilityservice.AccessibilityService.MagnificationController GetMagnificationController()
+        {
+            return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityService.MagnificationController>("getMagnificationController", "()Landroid/accessibilityservice/AccessibilityService$MagnificationController;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getSoftKeyboardController()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Accessibilityservice.AccessibilityService.SoftKeyboardController"/></returns>
+        public Android.Accessibilityservice.AccessibilityService.SoftKeyboardController GetSoftKeyboardController()
+        {
+            return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityService.SoftKeyboardController>("getSoftKeyboardController", "()Landroid/accessibilityservice/AccessibilityService$SoftKeyboardController;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getServiceInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Accessibilityservice.AccessibilityServiceInfo"/></returns>
+        public Android.Accessibilityservice.AccessibilityServiceInfo GetServiceInfo()
+        {
+            return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityServiceInfo>("getServiceInfo", "()Landroid/accessibilityservice/AccessibilityServiceInfo;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getFingerprintGestureController()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Accessibilityservice.FingerprintGestureController"/></returns>
+        public Android.Accessibilityservice.FingerprintGestureController GetFingerprintGestureController()
+        {
+            return IExecuteWithSignature<Android.Accessibilityservice.FingerprintGestureController>("getFingerprintGestureController", "()Landroid/accessibilityservice/FingerprintGestureController;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getInputMethod()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Accessibilityservice.InputMethod"/></returns>
+        public Android.Accessibilityservice.InputMethod GetInputMethod()
+        {
+            return IExecuteWithSignature<Android.Accessibilityservice.InputMethod>("getInputMethod", "()Landroid/accessibilityservice/InputMethod;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getTouchInteractionController(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -689,6 +675,14 @@ public Android.Accessibilityservice.TouchInteractionController GetTouchInteracti
             return IExecuteWithSignature<Android.Accessibilityservice.TouchInteractionController>("getTouchInteractionController", "(I)Landroid/accessibilityservice/TouchInteractionController;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getWindowsOnAllDisplays()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>> GetWindowsOnAllDisplays()
+        {
+            return IExecuteWithSignature<Android.Util.SparseArray<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>>>("getWindowsOnAllDisplays", "()Landroid/util/SparseArray;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#dispatchGesture(android.accessibilityservice.GestureDescription,android.accessibilityservice.AccessibilityService.GestureResultCallback,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Accessibilityservice.GestureDescription"/></param>
@@ -709,6 +703,14 @@ public bool PerformGlobalAction(int arg0)
             return IExecuteWithSignature<bool>("performGlobalAction", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getSystemActions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction> GetSystemActions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction>>("getSystemActions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#disableSelf()"/>
         /// </summary>
         public void DisableSelf()
@@ -716,6 +718,22 @@ public void DisableSelf()
             IExecuteWithSignature("disableSelf", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Accessibilityservice.AccessibilityServiceInfo"/></param>
+        public void SetServiceInfo(Android.Accessibilityservice.AccessibilityServiceInfo arg0)
+        {
+            IExecuteWithSignature("setServiceInfo", "(Landroid/accessibilityservice/AccessibilityServiceInfo;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#getWindows()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo> GetWindows()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>>("getWindows", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.html#attachAccessibilityOverlayToDisplay(int,android.view.SurfaceControl)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -875,50 +893,29 @@ public partial class MagnificationController
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getCenterX()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public float CenterX
-            {
-                get { return IExecuteWithSignature<float>("getCenterX", "()F"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getCenterY()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public float CenterY
-            {
-                get { return IExecuteWithSignature<float>("getCenterY", "()F"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getCurrentMagnificationRegion()"/> 
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getMagnificationConfig()"/>
             /// </summary>
-            public Android.Graphics.Region CurrentMagnificationRegion
+            /// <returns><see cref="Android.Accessibilityservice.MagnificationConfig"/></returns>
+            public Android.Accessibilityservice.MagnificationConfig GetMagnificationConfig()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Region>("getCurrentMagnificationRegion", "()Landroid/graphics/Region;"); }
+                return IExecuteWithSignature<Android.Accessibilityservice.MagnificationConfig>("getMagnificationConfig", "()Landroid/accessibilityservice/MagnificationConfig;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getMagnificationConfig()"/> 
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getCurrentMagnificationRegion()"/>
             /// </summary>
-            public Android.Accessibilityservice.MagnificationConfig MagnificationConfig
+            /// <returns><see cref="Android.Graphics.Region"/></returns>
+            public Android.Graphics.Region GetCurrentMagnificationRegion()
             {
-                get { return IExecuteWithSignature<Android.Accessibilityservice.MagnificationConfig>("getMagnificationConfig", "()Landroid/accessibilityservice/MagnificationConfig;"); }
+                return IExecuteWithSignature<Android.Graphics.Region>("getCurrentMagnificationRegion", "()Landroid/graphics/Region;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getMagnificationRegion()"/> 
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getMagnificationRegion()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Graphics.Region MagnificationRegion
+            /// <returns><see cref="Android.Graphics.Region"/></returns>
+            [global::System.Obsolete()]
+            public Android.Graphics.Region GetMagnificationRegion()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Region>("getMagnificationRegion", "()Landroid/graphics/Region;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getScale()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public float Scale
-            {
-                get { return IExecuteWithSignature<float>("getScale", "()F"); }
+                return IExecuteWithSignature<Android.Graphics.Region>("getMagnificationRegion", "()Landroid/graphics/Region;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#removeListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener)"/>
@@ -954,7 +951,7 @@ public bool ResetCurrentMagnification(bool arg0)
             /// <param name="arg1"><see cref="float"/></param>
             /// <param name="arg2"><see cref="bool"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool SetCenter(float arg0, float arg1, bool arg2)
             {
                 return IExecute<bool>("setCenter", arg0, arg1, arg2);
@@ -975,12 +972,39 @@ public bool SetMagnificationConfig(Android.Accessibilityservice.MagnificationCon
             /// <param name="arg0"><see cref="float"/></param>
             /// <param name="arg1"><see cref="bool"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool SetScale(float arg0, bool arg1)
             {
                 return IExecute<bool>("setScale", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getCenterX()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            [global::System.Obsolete()]
+            public float GetCenterX()
+            {
+                return IExecuteWithSignature<float>("getCenterX", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getCenterY()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            [global::System.Obsolete()]
+            public float GetCenterY()
+            {
+                return IExecuteWithSignature<float>("getCenterY", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#getScale()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            [global::System.Obsolete()]
+            public float GetScale()
+            {
+                return IExecuteWithSignature<float>("getScale", "()F");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.html#addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener,android.os.Handler)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener"/></param>
@@ -1026,8 +1050,8 @@ public partial class OnMagnificationChangedListener
                 /// </summary>
                 protected virtual void InitializeHandlers()
                 {
-                    AddEventHandler("onMagnificationChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.MagnificationController>>>(OnMagnificationChangedEventHandler));
-                    AddEventHandler("onMagnificationChanged3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.MagnificationController>>>(OnMagnificationChanged3EventHandler));
+                    AddEventHandler("onMagnificationChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.MagnificationController>>>(OnMagnificationChangedEventHandler));
+                    AddEventHandler("onMagnificationChanged3", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.MagnificationController>>>(OnMagnificationChanged3EventHandler));
 
                 }
 
@@ -1035,7 +1059,7 @@ protected virtual void InitializeHandlers()
                 /// Handler for <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.OnMagnificationChangedListener.html#onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController,android.graphics.Region,float,float,float)"/>
                 /// </summary>
                 /// <remarks>If <see cref="OnOnMagnificationChanged"/> has a value it takes precedence over corresponding class method</remarks>
-                public System.Action<Android.Accessibilityservice.AccessibilityService.MagnificationController, Android.Graphics.Region, float, float, float> OnOnMagnificationChanged { get; set; } = null;
+                public global::System.Action<Android.Accessibilityservice.AccessibilityService.MagnificationController, Android.Graphics.Region, float, float, float> OnOnMagnificationChanged { get; set; } = null;
 
                 void OnMagnificationChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.MagnificationController>> data)
                 {
@@ -1051,7 +1075,7 @@ void OnMagnificationChangedEventHandler(object sender, CLRListenerEventArgs<CLRE
                 /// <param name="arg2"><see cref="float"/></param>
                 /// <param name="arg3"><see cref="float"/></param>
                 /// <param name="arg4"><see cref="float"/></param>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public virtual void OnMagnificationChanged(Android.Accessibilityservice.AccessibilityService.MagnificationController arg0, Android.Graphics.Region arg1, float arg2, float arg3, float arg4)
                 {
                     
@@ -1072,7 +1096,7 @@ public void OnMagnificationChangedDefault(Android.Accessibilityservice.Accessibi
                 /// Handler for <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.MagnificationController.OnMagnificationChangedListener.html#onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController,android.graphics.Region,android.accessibilityservice.MagnificationConfig)"/>
                 /// </summary>
                 /// <remarks>If <see cref="OnOnMagnificationChanged3"/> has a value it takes precedence over corresponding class method</remarks>
-                public System.Action<Android.Accessibilityservice.AccessibilityService.MagnificationController, Android.Graphics.Region, Android.Accessibilityservice.MagnificationConfig> OnOnMagnificationChanged3 { get; set; } = null;
+                public global::System.Action<Android.Accessibilityservice.AccessibilityService.MagnificationController, Android.Graphics.Region, Android.Accessibilityservice.MagnificationConfig> OnOnMagnificationChanged3 { get; set; } = null;
 
                 void OnMagnificationChanged3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.MagnificationController>> data)
                 {
@@ -1130,7 +1154,7 @@ public partial class OnMagnificationChangedListenerDirect
                 /// <param name="arg2"><see cref="float"/></param>
                 /// <param name="arg3"><see cref="float"/></param>
                 /// <param name="arg4"><see cref="float"/></param>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public override void OnMagnificationChanged(Android.Accessibilityservice.AccessibilityService.MagnificationController arg0, Android.Graphics.Region arg1, float arg2, float arg3, float arg4)
                 {
                     IExecute("onMagnificationChanged", arg0, arg1, arg2, arg3, arg4);
@@ -1184,25 +1208,28 @@ public partial class ScreenshotResult
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.ScreenshotResult.html#getColorSpace()"/> 
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.ScreenshotResult.html#getColorSpace()"/>
             /// </summary>
-            public Android.Graphics.ColorSpace ColorSpace
+            /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+            public Android.Graphics.ColorSpace GetColorSpace()
             {
-                get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;"); }
+                return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.ScreenshotResult.html#getHardwareBuffer()"/> 
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.ScreenshotResult.html#getHardwareBuffer()"/>
             /// </summary>
-            public Android.Hardware.HardwareBuffer HardwareBuffer
+            /// <returns><see cref="Android.Hardware.HardwareBuffer"/></returns>
+            public Android.Hardware.HardwareBuffer GetHardwareBuffer()
             {
-                get { return IExecuteWithSignature<Android.Hardware.HardwareBuffer>("getHardwareBuffer", "()Landroid/hardware/HardwareBuffer;"); }
+                return IExecuteWithSignature<Android.Hardware.HardwareBuffer>("getHardwareBuffer", "()Landroid/hardware/HardwareBuffer;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.ScreenshotResult.html#getTimestamp()"/> 
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.ScreenshotResult.html#getTimestamp()"/>
             /// </summary>
-            public long Timestamp
+            /// <returns><see cref="long"/></returns>
+            public long GetTimestamp()
             {
-                get { return IExecuteWithSignature<long>("getTimestamp", "()J"); }
+                return IExecuteWithSignature<long>("getTimestamp", "()J");
             }
 
             #endregion
@@ -1254,13 +1281,6 @@ public partial class SoftKeyboardController
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.SoftKeyboardController.html#getShowMode()"/> 
-            /// </summary>
-            public int ShowMode
-            {
-                get { return IExecuteWithSignature<int>("getShowMode", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.SoftKeyboardController.html#removeOnShowModeChangedListener(android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener"/></param>
@@ -1288,6 +1308,14 @@ public bool SwitchToInputMethod(Java.Lang.String arg0)
                 return IExecuteWithSignature<bool>("switchToInputMethod", "(Ljava/lang/String;)Z", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.SoftKeyboardController.html#getShowMode()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetShowMode()
+            {
+                return IExecuteWithSignature<int>("getShowMode", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.SoftKeyboardController.html#setInputMethodEnabled(java.lang.String,boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1344,7 +1372,7 @@ public partial class OnShowModeChangedListener
                 /// </summary>
                 protected virtual void InitializeHandlers()
                 {
-                    AddEventHandler("onShowModeChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.SoftKeyboardController>>>(OnShowModeChangedEventHandler));
+                    AddEventHandler("onShowModeChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.SoftKeyboardController>>>(OnShowModeChangedEventHandler));
 
                 }
 
@@ -1352,7 +1380,7 @@ protected virtual void InitializeHandlers()
                 /// Handler for <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService.SoftKeyboardController.OnShowModeChangedListener.html#onShowModeChanged(android.accessibilityservice.AccessibilityService.SoftKeyboardController,int)"/>
                 /// </summary>
                 /// <remarks>If <see cref="OnOnShowModeChanged"/> has a value it takes precedence over corresponding class method</remarks>
-                public System.Action<Android.Accessibilityservice.AccessibilityService.SoftKeyboardController, int> OnOnShowModeChanged { get; set; } = null;
+                public global::System.Action<Android.Accessibilityservice.AccessibilityService.SoftKeyboardController, int> OnOnShowModeChanged { get; set; } = null;
 
                 void OnShowModeChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Accessibilityservice.AccessibilityService.SoftKeyboardController>> data)
                 {
diff --git a/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityServiceInfo.cs b/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityServiceInfo.cs
index 69f8e2d37..ec58170a2 100644
--- a/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityServiceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Accessibilityservice/AccessibilityServiceInfo.cs
@@ -78,7 +78,7 @@ public partial class AccessibilityServiceInfo
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY { get { if (!_CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITYReady) { _CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITYContent = SGetField<int>(LocalBridgeClazz, "CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY"); _CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITYReady = true; } return _CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITYContent; } }
         private static int _CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITYContent = default;
         private static bool _CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITYReady = false; // this is used because in case of generics 
@@ -199,7 +199,7 @@ public partial class AccessibilityServiceInfo
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY { get { if (!_FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITYReady) { _FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITYContent = SGetField<int>(LocalBridgeClazz, "FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY"); _FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITYReady = true; } return _FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITYContent; } }
         private static int _FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITYContent = default;
         private static bool _FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITYReady = false; // this is used because in case of generics 
@@ -287,110 +287,120 @@ public static Java.Lang.String FlagToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getCanRetrieveWindowContent()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getResolveInfo()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool CanRetrieveWindowContent
+        /// <returns><see cref="Android.Content.Pm.ResolveInfo"/></returns>
+        public Android.Content.Pm.ResolveInfo GetResolveInfo()
         {
-            get { return IExecuteWithSignature<bool>("getCanRetrieveWindowContent", "()Z"); }
+            return IExecuteWithSignature<Android.Content.Pm.ResolveInfo>("getResolveInfo", "()Landroid/content/pm/ResolveInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getCanRetrieveWindowContent()"/>
         /// </summary>
-        public int Capabilities
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetCanRetrieveWindowContent()
         {
-            get { return IExecuteWithSignature<int>("getCapabilities", "()I"); }
+            return IExecuteWithSignature<bool>("getCanRetrieveWindowContent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#isAccessibilityTool()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Description
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAccessibilityTool()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isAccessibilityTool", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getInteractiveUiTimeoutMillis()"/> <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#setInteractiveUiTimeoutMillis(int)"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getCapabilities()"/>
         /// </summary>
-        public int InteractiveUiTimeoutMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetCapabilities()
         {
-            get { return IExecuteWithSignature<int>("getInteractiveUiTimeoutMillis", "()I"); } set { IExecuteWithSignature("setInteractiveUiTimeoutMillis", "(I)V", value); }
+            return IExecuteWithSignature<int>("getCapabilities", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getMotionEventSources()"/> <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#setMotionEventSources(int)"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getInteractiveUiTimeoutMillis()"/>
         /// </summary>
-        public int MotionEventSources
+        /// <returns><see cref="int"/></returns>
+        public int GetInteractiveUiTimeoutMillis()
         {
-            get { return IExecuteWithSignature<int>("getMotionEventSources", "()I"); } set { IExecuteWithSignature("setMotionEventSources", "(I)V", value); }
+            return IExecuteWithSignature<int>("getInteractiveUiTimeoutMillis", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getNonInteractiveUiTimeoutMillis()"/> <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#setNonInteractiveUiTimeoutMillis(int)"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getMotionEventSources()"/>
         /// </summary>
-        public int NonInteractiveUiTimeoutMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetMotionEventSources()
         {
-            get { return IExecuteWithSignature<int>("getNonInteractiveUiTimeoutMillis", "()I"); } set { IExecuteWithSignature("setNonInteractiveUiTimeoutMillis", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMotionEventSources", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getResolveInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getNonInteractiveUiTimeoutMillis()"/>
         /// </summary>
-        public Android.Content.Pm.ResolveInfo ResolveInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetNonInteractiveUiTimeoutMillis()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.ResolveInfo>("getResolveInfo", "()Landroid/content/pm/ResolveInfo;"); }
+            return IExecuteWithSignature<int>("getNonInteractiveUiTimeoutMillis", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getSettingsActivityName()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#loadIntro(android.content.pm.PackageManager)"/>
         /// </summary>
-        public Java.Lang.String SettingsActivityName
+        /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence LoadIntro(Android.Content.Pm.PackageManager arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSettingsActivityName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("loadIntro", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getTileServiceName()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#loadSummary(android.content.pm.PackageManager)"/>
         /// </summary>
-        public Java.Lang.String TileServiceName
+        /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence LoadSummary(Android.Content.Pm.PackageManager arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTileServiceName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("loadSummary", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#isAccessibilityTool()"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getDescription()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAccessibilityTool()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDescription()
         {
-            return IExecuteWithSignature<bool>("isAccessibilityTool", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#loadIntro(android.content.pm.PackageManager)"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getSettingsActivityName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public Java.Lang.CharSequence LoadIntro(Android.Content.Pm.PackageManager arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSettingsActivityName()
         {
-            return IExecuteWithSignature<Java.Lang.CharSequence>("loadIntro", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSettingsActivityName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#loadSummary(android.content.pm.PackageManager)"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#getTileServiceName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public Java.Lang.CharSequence LoadSummary(Android.Content.Pm.PackageManager arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTileServiceName()
         {
-            return IExecuteWithSignature<Java.Lang.CharSequence>("loadSummary", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getTileServiceName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#loadDescription(android.content.pm.PackageManager)"/>
@@ -402,6 +412,30 @@ public Java.Lang.String LoadDescription(Android.Content.Pm.PackageManager arg0)
             return IExecuteWithSignature<Java.Lang.String>("loadDescription", "(Landroid/content/pm/PackageManager;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#setInteractiveUiTimeoutMillis(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInteractiveUiTimeoutMillis(int arg0)
+        {
+            IExecuteWithSignature("setInteractiveUiTimeoutMillis", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#setMotionEventSources(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMotionEventSources(int arg0)
+        {
+            IExecuteWithSignature("setMotionEventSources", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#setNonInteractiveUiTimeoutMillis(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNonInteractiveUiTimeoutMillis(int arg0)
+        {
+            IExecuteWithSignature("setNonInteractiveUiTimeoutMillis", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityServiceInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Accessibilityservice/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Accessibilityservice/AllPackageClasses.cs
index f4d2a6d53..186e3747c 100644
--- a/src/net/Netdroid/Generated/Android/Accessibilityservice/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Accessibilityservice/AllPackageClasses.cs
@@ -76,12 +76,12 @@ public partial class AccessibilityButtonCallback : MASES.JCOBridge.C2JBridge.JVM
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AccessibilityButtonCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AccessibilityButtonCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AccessibilityButtonCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AccessibilityButtonCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AccessibilityButtonCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AccessibilityButtonCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -170,12 +170,12 @@ public partial class AccessibilityService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AccessibilityService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccessibilityService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccessibilityService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AccessibilityService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccessibilityService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccessibilityService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -212,12 +212,12 @@ public partial class GestureResultCallback : MASES.JCOBridge.C2JBridge.JVMBridge
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("GestureResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GestureResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GestureResultCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("GestureResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GestureResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GestureResultCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -299,10 +299,13 @@ public partial class OnMagnificationChangedListener : MASES.JCOBridge.C2JBridge.
                 /// </summary>
                 public OnMagnificationChangedListener() { InitializeHandlers(); }
 
+                const string _bridgeClassName = "org.mases.netdroid.generated.android.accessibilityservice.AccessibilityService_MagnificationController_OnMagnificationChangedListener";
+                private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+                
                 /// <summary>
                 /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
                 /// </summary>
-                public override string BridgeClassName => "org.mases.netdroid.generated.android.accessibilityservice.OnMagnificationChangedListener";
+                public override string BridgeClassName => _bridgeClassName;
 
             
                 // TODO: complete the class
@@ -324,10 +327,13 @@ public partial class OnMagnificationChangedListenerDirect : OnMagnificationChang
                 /// <inheritdoc />
                 protected override void InitializeHandlers() { }
 
+                const string _bridgeClassName = "android.accessibilityservice.AccessibilityService$MagnificationController$OnMagnificationChangedListener";
+                private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
                 /// <summary>
                 /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
                 /// </summary>
-                public override string BridgeClassName => "android.accessibilityservice.AccessibilityService$MagnificationController$OnMagnificationChangedListener";
+                public override string BridgeClassName => _bridgeClassName;
                 /// <summary>
                 /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
                 /// </summary>
@@ -446,10 +452,13 @@ public partial class OnShowModeChangedListener : MASES.JCOBridge.C2JBridge.JVMBr
                 /// </summary>
                 public OnShowModeChangedListener() { InitializeHandlers(); }
 
+                const string _bridgeClassName = "org.mases.netdroid.generated.android.accessibilityservice.AccessibilityService_SoftKeyboardController_OnShowModeChangedListener";
+                private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+                
                 /// <summary>
                 /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
                 /// </summary>
-                public override string BridgeClassName => "org.mases.netdroid.generated.android.accessibilityservice.OnShowModeChangedListener";
+                public override string BridgeClassName => _bridgeClassName;
 
             
                 // TODO: complete the class
@@ -471,10 +480,13 @@ public partial class OnShowModeChangedListenerDirect : OnShowModeChangedListener
                 /// <inheritdoc />
                 protected override void InitializeHandlers() { }
 
+                const string _bridgeClassName = "android.accessibilityservice.AccessibilityService$SoftKeyboardController$OnShowModeChangedListener";
+                private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
                 /// <summary>
                 /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
                 /// </summary>
-                public override string BridgeClassName => "android.accessibilityservice.AccessibilityService$SoftKeyboardController$OnShowModeChangedListener";
+                public override string BridgeClassName => _bridgeClassName;
                 /// <summary>
                 /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
                 /// </summary>
@@ -508,12 +520,12 @@ public partial class TakeScreenshotCallback : MASES.JCOBridge.C2JBridge.JVMBridg
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TakeScreenshotCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TakeScreenshotCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TakeScreenshotCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TakeScreenshotCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TakeScreenshotCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TakeScreenshotCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -642,12 +654,12 @@ public partial class FingerprintGestureCallback : MASES.JCOBridge.C2JBridge.JVMB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FingerprintGestureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FingerprintGestureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FingerprintGestureCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FingerprintGestureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FingerprintGestureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FingerprintGestureCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1040,12 +1052,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Accessibilityservice/GestureDescription.cs b/src/net/Netdroid/Generated/Android/Accessibilityservice/GestureDescription.cs
index d738e6e16..eb6085cc1 100644
--- a/src/net/Netdroid/Generated/Android/Accessibilityservice/GestureDescription.cs
+++ b/src/net/Netdroid/Generated/Android/Accessibilityservice/GestureDescription.cs
@@ -42,45 +42,49 @@ public partial class GestureDescription
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getMaxGestureDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getMaxStrokeCount()"/>
         /// </summary>
-        public static long MaxGestureDuration
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxStrokeCount()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMaxGestureDuration", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxStrokeCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getMaxStrokeCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getMaxGestureDuration()"/>
         /// </summary>
-        public static int MaxStrokeCount
+        /// <returns><see cref="long"/></returns>
+        public static long GetMaxGestureDuration()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxStrokeCount", "()I"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMaxGestureDuration", "()J");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getDisplayId()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getStroke(int)"/>
         /// </summary>
-        public int DisplayId
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Accessibilityservice.GestureDescription.StrokeDescription"/></returns>
+        public Android.Accessibilityservice.GestureDescription.StrokeDescription GetStroke(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getDisplayId", "()I"); }
+            return IExecuteWithSignature<Android.Accessibilityservice.GestureDescription.StrokeDescription>("getStroke", "(I)Landroid/accessibilityservice/GestureDescription$StrokeDescription;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getStrokeCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getDisplayId()"/>
         /// </summary>
-        public int StrokeCount
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayId()
         {
-            get { return IExecuteWithSignature<int>("getStrokeCount", "()I"); }
+            return IExecuteWithSignature<int>("getDisplayId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getStroke(int)"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.html#getStrokeCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Accessibilityservice.GestureDescription.StrokeDescription"/></returns>
-        public Android.Accessibilityservice.GestureDescription.StrokeDescription GetStroke(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetStrokeCount()
         {
-            return IExecuteWithSignature<Android.Accessibilityservice.GestureDescription.StrokeDescription>("getStroke", "(I)Landroid/accessibilityservice/GestureDescription$StrokeDescription;", arg0);
+            return IExecuteWithSignature<int>("getStrokeCount", "()I");
         }
 
         #endregion
@@ -185,27 +189,6 @@ public StrokeDescription(Android.Graphics.Path arg0, long arg1, long arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.StrokeDescription.html#getDuration()"/> 
-            /// </summary>
-            public long Duration
-            {
-                get { return IExecuteWithSignature<long>("getDuration", "()J"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.StrokeDescription.html#getPath()"/> 
-            /// </summary>
-            public Android.Graphics.Path Path
-            {
-                get { return IExecuteWithSignature<Android.Graphics.Path>("getPath", "()Landroid/graphics/Path;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.StrokeDescription.html#getStartTime()"/> 
-            /// </summary>
-            public long StartTime
-            {
-                get { return IExecuteWithSignature<long>("getStartTime", "()J"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.StrokeDescription.html#continueStroke(android.graphics.Path,long,long,boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Path"/></param>
@@ -218,6 +201,14 @@ public Android.Accessibilityservice.GestureDescription.StrokeDescription Continu
                 return IExecute<Android.Accessibilityservice.GestureDescription.StrokeDescription>("continueStroke", arg0, arg1, arg2, arg3);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.StrokeDescription.html#getPath()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Graphics.Path"/></returns>
+            public Android.Graphics.Path GetPath()
+            {
+                return IExecuteWithSignature<Android.Graphics.Path>("getPath", "()Landroid/graphics/Path;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.StrokeDescription.html#willContinue()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -225,6 +216,22 @@ public bool WillContinue()
             {
                 return IExecuteWithSignature<bool>("willContinue", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.StrokeDescription.html#getDuration()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetDuration()
+            {
+                return IExecuteWithSignature<long>("getDuration", "()J");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/accessibilityservice/GestureDescription.StrokeDescription.html#getStartTime()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetStartTime()
+            {
+                return IExecuteWithSignature<long>("getStartTime", "()J");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Accessibilityservice/InputMethod.cs b/src/net/Netdroid/Generated/Android/Accessibilityservice/InputMethod.cs
index d5ad73d34..ba12e3b1f 100644
--- a/src/net/Netdroid/Generated/Android/Accessibilityservice/InputMethod.cs
+++ b/src/net/Netdroid/Generated/Android/Accessibilityservice/InputMethod.cs
@@ -54,25 +54,28 @@ public InputMethod(Android.Accessibilityservice.AccessibilityService arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/InputMethod.html#getCurrentInputConnection()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/InputMethod.html#getCurrentInputConnection()"/>
         /// </summary>
-        public Android.Accessibilityservice.InputMethod.AccessibilityInputConnection CurrentInputConnection
+        /// <returns><see cref="Android.Accessibilityservice.InputMethod.AccessibilityInputConnection"/></returns>
+        public Android.Accessibilityservice.InputMethod.AccessibilityInputConnection GetCurrentInputConnection()
         {
-            get { return IExecuteWithSignature<Android.Accessibilityservice.InputMethod.AccessibilityInputConnection>("getCurrentInputConnection", "()Landroid/accessibilityservice/InputMethod$AccessibilityInputConnection;"); }
+            return IExecuteWithSignature<Android.Accessibilityservice.InputMethod.AccessibilityInputConnection>("getCurrentInputConnection", "()Landroid/accessibilityservice/InputMethod$AccessibilityInputConnection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/InputMethod.html#getCurrentInputEditorInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/InputMethod.html#getCurrentInputEditorInfo()"/>
         /// </summary>
-        public Android.View.Inputmethod.EditorInfo CurrentInputEditorInfo
+        /// <returns><see cref="Android.View.Inputmethod.EditorInfo"/></returns>
+        public Android.View.Inputmethod.EditorInfo GetCurrentInputEditorInfo()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.EditorInfo>("getCurrentInputEditorInfo", "()Landroid/view/inputmethod/EditorInfo;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.EditorInfo>("getCurrentInputEditorInfo", "()Landroid/view/inputmethod/EditorInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/InputMethod.html#getCurrentInputStarted()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/InputMethod.html#getCurrentInputStarted()"/>
         /// </summary>
-        public bool CurrentInputStarted
+        /// <returns><see cref="bool"/></returns>
+        public bool GetCurrentInputStarted()
         {
-            get { return IExecuteWithSignature<bool>("getCurrentInputStarted", "()Z"); }
+            return IExecuteWithSignature<bool>("getCurrentInputStarted", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/InputMethod.html#onFinishInput()"/>
diff --git a/src/net/Netdroid/Generated/Android/Accessibilityservice/MagnificationConfig.cs b/src/net/Netdroid/Generated/Android/Accessibilityservice/MagnificationConfig.cs
index 8a4f6a2a3..401cd9617 100644
--- a/src/net/Netdroid/Generated/Android/Accessibilityservice/MagnificationConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Accessibilityservice/MagnificationConfig.cs
@@ -70,48 +70,52 @@ public partial class MagnificationConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#getCenterX()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#isActivated()"/>
         /// </summary>
-        public float CenterX
+        /// <returns><see cref="bool"/></returns>
+        public bool IsActivated()
         {
-            get { return IExecuteWithSignature<float>("getCenterX", "()F"); }
+            return IExecuteWithSignature<bool>("isActivated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#getCenterY()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#getCenterX()"/>
         /// </summary>
-        public float CenterY
+        /// <returns><see cref="float"/></returns>
+        public float GetCenterX()
         {
-            get { return IExecuteWithSignature<float>("getCenterY", "()F"); }
+            return IExecuteWithSignature<float>("getCenterX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#getMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#getCenterY()"/>
         /// </summary>
-        public int Mode
+        /// <returns><see cref="float"/></returns>
+        public float GetCenterY()
         {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); }
+            return IExecuteWithSignature<float>("getCenterY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#getScale()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#getScale()"/>
         /// </summary>
-        public float Scale
+        /// <returns><see cref="float"/></returns>
+        public float GetScale()
         {
-            get { return IExecuteWithSignature<float>("getScale", "()F"); }
+            return IExecuteWithSignature<float>("getScale", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#isActivated()"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#describeContents()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsActivated()
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            return IExecuteWithSignature<bool>("isActivated", "()Z");
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#getMode()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetMode()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getMode", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/MagnificationConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Accessibilityservice/TouchInteractionController.cs b/src/net/Netdroid/Generated/Android/Accessibilityservice/TouchInteractionController.cs
index 39909d8d9..082194cc6 100644
--- a/src/net/Netdroid/Generated/Android/Accessibilityservice/TouchInteractionController.cs
+++ b/src/net/Netdroid/Generated/Android/Accessibilityservice/TouchInteractionController.cs
@@ -85,34 +85,37 @@ public static Java.Lang.String StateToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#getDisplayId()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#unregisterCallback(android.accessibilityservice.TouchInteractionController.Callback)"/>
         /// </summary>
-        public int DisplayId
+        /// <param name="arg0"><see cref="Android.Accessibilityservice.TouchInteractionController.Callback"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool UnregisterCallback(Android.Accessibilityservice.TouchInteractionController.Callback arg0)
         {
-            get { return IExecuteWithSignature<int>("getDisplayId", "()I"); }
+            return IExecuteWithSignature<bool>("unregisterCallback", "(Landroid/accessibilityservice/TouchInteractionController$Callback;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#getMaxPointerCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#getDisplayId()"/>
         /// </summary>
-        public int MaxPointerCount
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayId()
         {
-            get { return IExecuteWithSignature<int>("getMaxPointerCount", "()I"); }
+            return IExecuteWithSignature<int>("getDisplayId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#getMaxPointerCount()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxPointerCount()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getMaxPointerCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#unregisterCallback(android.accessibilityservice.TouchInteractionController.Callback)"/>
+        /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#getState()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Accessibilityservice.TouchInteractionController.Callback"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool UnregisterCallback(Android.Accessibilityservice.TouchInteractionController.Callback arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            return IExecuteWithSignature<bool>("unregisterCallback", "(Landroid/accessibilityservice/TouchInteractionController$Callback;)Z", arg0);
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accessibilityservice/TouchInteractionController.html#performClick()"/>
diff --git a/src/net/Netdroid/Generated/Android/Accounts/AbstractAccountAuthenticator.cs b/src/net/Netdroid/Generated/Android/Accounts/AbstractAccountAuthenticator.cs
index 0ad79f0cb..6c4305d36 100644
--- a/src/net/Netdroid/Generated/Android/Accounts/AbstractAccountAuthenticator.cs
+++ b/src/net/Netdroid/Generated/Android/Accounts/AbstractAccountAuthenticator.cs
@@ -60,13 +60,6 @@ public AbstractAccountAuthenticator(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accounts/AbstractAccountAuthenticator.html#getIBinder()"/> 
-        /// </summary>
-        public Android.Os.IBinder IBinder
-        {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getIBinder", "()Landroid/os/IBinder;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accounts/AbstractAccountAuthenticator.html#addAccount(android.accounts.AccountAuthenticatorResponse,java.lang.String,java.lang.String,java.lang.String[],android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Accounts.AccountAuthenticatorResponse"/></param>
@@ -234,6 +227,14 @@ public Android.Os.Bundle StartUpdateCredentialsSession(Android.Accounts.AccountA
         {
             return IExecute<Android.Os.Bundle>("startUpdateCredentialsSession", arg0, arg1, arg2, arg3);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accounts/AbstractAccountAuthenticator.html#getIBinder()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetIBinder()
+        {
+            return IExecuteWithSignature<Android.Os.IBinder>("getIBinder", "()Landroid/os/IBinder;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Accounts/AccountAuthenticatorActivity.cs b/src/net/Netdroid/Generated/Android/Accounts/AccountAuthenticatorActivity.cs
index ee44639d2..b04b8023a 100644
--- a/src/net/Netdroid/Generated/Android/Accounts/AccountAuthenticatorActivity.cs
+++ b/src/net/Netdroid/Generated/Android/Accounts/AccountAuthenticatorActivity.cs
@@ -49,7 +49,7 @@ public partial class AccountAuthenticatorActivity
         /// <see href="https://developer.android.com/reference/android/accounts/AccountAuthenticatorActivity.html#setAccountAuthenticatorResult(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAccountAuthenticatorResult(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("setAccountAuthenticatorResult", "(Landroid/os/Bundle;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Accounts/AccountManager.cs b/src/net/Netdroid/Generated/Android/Accounts/AccountManager.cs
index 7ea12e6a4..9d57d8521 100644
--- a/src/net/Netdroid/Generated/Android/Accounts/AccountManager.cs
+++ b/src/net/Netdroid/Generated/Android/Accounts/AccountManager.cs
@@ -268,7 +268,7 @@ public partial class AccountManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accounts/AccountManager.html#LOGIN_ACCOUNTS_CHANGED_ACTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String LOGIN_ACCOUNTS_CHANGED_ACTION { get { if (!_LOGIN_ACCOUNTS_CHANGED_ACTIONReady) { _LOGIN_ACCOUNTS_CHANGED_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOGIN_ACCOUNTS_CHANGED_ACTION"); _LOGIN_ACCOUNTS_CHANGED_ACTIONReady = true; } return _LOGIN_ACCOUNTS_CHANGED_ACTIONContent; } }
         private static Java.Lang.String _LOGIN_ACCOUNTS_CHANGED_ACTIONContent = default;
         private static bool _LOGIN_ACCOUNTS_CHANGED_ACTIONReady = false; // this is used because in case of generics 
@@ -309,7 +309,7 @@ public static Android.Accounts.AccountManager Get(Android.Content.Context arg0)
         /// <param name="arg6"><see cref="Java.Lang.String"/></param>
         /// <param name="arg7"><see cref="Android.Os.Bundle"/></param>
         /// <returns><see cref="Android.Content.Intent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Content.Intent NewChooseAccountIntent(Android.Accounts.Account arg0, Java.Util.ArrayList<Android.Accounts.Account> arg1, Java.Lang.String[] arg2, bool arg3, Java.Lang.String arg4, Java.Lang.String arg5, Java.Lang.String[] arg6, Android.Os.Bundle arg7)
         {
             return SExecute<Android.Content.Intent>(LocalBridgeClazz, "newChooseAccountIntent", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -334,18 +334,12 @@ public static Android.Content.Intent NewChooseAccountIntent(Android.Accounts.Acc
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accounts/AccountManager.html#getAccounts()"/> 
+        /// <see href="https://developer.android.com/reference/android/accounts/AccountManager.html#getAccounts()"/>
         /// </summary>
-        public Android.Accounts.Account[] Accounts
-        {
-            get { return IExecuteWithSignatureArray<Android.Accounts.Account>("getAccounts", "()[Landroid/accounts/Account;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accounts/AccountManager.html#getAuthenticatorTypes()"/> 
-        /// </summary>
-        public Android.Accounts.AuthenticatorDescription[] AuthenticatorTypes
+        /// <returns><see cref="Android.Accounts.Account"/></returns>
+        public Android.Accounts.Account[] GetAccounts()
         {
-            get { return IExecuteWithSignatureArray<Android.Accounts.AuthenticatorDescription>("getAuthenticatorTypes", "()[Landroid/accounts/AuthenticatorDescription;"); }
+            return IExecuteWithSignatureArray<Android.Accounts.Account>("getAccounts", "()[Landroid/accounts/Account;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/accounts/AccountManager.html#getAccountsByType(java.lang.String)"/>
@@ -479,7 +473,7 @@ public Android.Accounts.Account[] GetAccountsByTypeForPackage(Java.Lang.String a
         /// <param name="arg3"><see cref="Android.Accounts.AccountManagerCallback"/></param>
         /// <param name="arg4"><see cref="Android.Os.Handler"/></param>
         /// <returns><see cref="Android.Accounts.AccountManagerFuture"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Accounts.AccountManagerFuture<Android.Os.Bundle> GetAuthToken(Android.Accounts.Account arg0, Java.Lang.String arg1, bool arg2, Android.Accounts.AccountManagerCallback<Android.Os.Bundle> arg3, Android.Os.Handler arg4)
         {
             return IExecute<Android.Accounts.AccountManagerFuture<Android.Os.Bundle>>("getAuthToken", arg0, arg1, arg2, arg3, arg4);
@@ -586,12 +580,20 @@ public Android.Accounts.Account[] GetAccountsByTypeForPackage(Java.Lang.String a
         /// <param name="arg1"><see cref="Android.Accounts.AccountManagerCallback"/></param>
         /// <param name="arg2"><see cref="Android.Os.Handler"/></param>
         /// <returns><see cref="Android.Accounts.AccountManagerFuture"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Accounts.AccountManagerFuture<Java.Lang.Boolean> RemoveAccount(Android.Accounts.Account arg0, Android.Accounts.AccountManagerCallback<Java.Lang.Boolean> arg1, Android.Os.Handler arg2)
         {
             return IExecute<Android.Accounts.AccountManagerFuture<Java.Lang.Boolean>>("removeAccount", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accounts/AccountManager.html#getAuthenticatorTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Accounts.AuthenticatorDescription"/></returns>
+        public Android.Accounts.AuthenticatorDescription[] GetAuthenticatorTypes()
+        {
+            return IExecuteWithSignatureArray<Android.Accounts.AuthenticatorDescription>("getAuthenticatorTypes", "()[Landroid/accounts/AuthenticatorDescription;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accounts/AccountManager.html#addAccountExplicitly(android.accounts.Account,java.lang.String,android.os.Bundle,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Accounts.Account"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Accounts/AccountManagerFuture.cs b/src/net/Netdroid/Generated/Android/Accounts/AccountManagerFuture.cs
index 8205b1a57..a7c3bd0ee 100644
--- a/src/net/Netdroid/Generated/Android/Accounts/AccountManagerFuture.cs
+++ b/src/net/Netdroid/Generated/Android/Accounts/AccountManagerFuture.cs
@@ -46,13 +46,6 @@ public partial class AccountManagerFuture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accounts/AccountManagerFuture.html#getResult()"/> 
-        /// </summary>
-        public object Result
-        {
-            get { return IExecuteWithSignature("getResult", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accounts/AccountManagerFuture.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -78,6 +71,17 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accounts/AccountManagerFuture.html#getResult()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Android.Accounts.AuthenticatorException"/>
+        /// <exception cref="Java.Io.IOException"/>
+        /// <exception cref="Android.Accounts.OperationCanceledException"/>
+        public object GetResult()
+        {
+            return IExecuteWithSignature("getResult", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accounts/AccountManagerFuture.html#getResult(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -144,13 +148,6 @@ public partial class AccountManagerFuture<V> : Android.Accounts.IAccountManagerF
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/accounts/AccountManagerFuture.html#getResult()"/> 
-        /// </summary>
-        public V Result
-        {
-            get { return IExecuteWithSignature<V>("getResult", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accounts/AccountManagerFuture.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -176,6 +173,17 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/accounts/AccountManagerFuture.html#getResult()"/>
+        /// </summary>
+        /// <returns><typeparamref name="V"/></returns>
+        /// <exception cref="Android.Accounts.AuthenticatorException"/>
+        /// <exception cref="Java.Io.IOException"/>
+        /// <exception cref="Android.Accounts.OperationCanceledException"/>
+        public V GetResult()
+        {
+            return IExecuteWithSignature<V>("getResult", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/accounts/AccountManagerFuture.html#getResult(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Accounts/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Accounts/AllPackageClasses.cs
index 9e6a60fc9..c1c82be7f 100644
--- a/src/net/Netdroid/Generated/Android/Accounts/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Accounts/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class AbstractAccountAuthenticator : MASES.JCOBridge.C2JBridge.JV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractAccountAuthenticator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractAccountAuthenticator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractAccountAuthenticator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractAccountAuthenticator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractAccountAuthenticator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractAccountAuthenticator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public Account(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/accounts/AccountAuthenticatorActivity.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AccountAuthenticatorActivity : Android.App.Activity
     {
         const string _bridgeClassName = "android.accounts.AccountAuthenticatorActivity";
@@ -259,12 +259,12 @@ public partial class AccountManagerCallback : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AccountManagerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccountManagerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccountManagerCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AccountManagerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccountManagerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccountManagerCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -306,12 +306,12 @@ public partial class AccountManagerCallback<V> : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AccountManagerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccountManagerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccountManagerCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AccountManagerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccountManagerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccountManagerCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -352,12 +352,12 @@ public partial class AccountManagerFuture : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AccountManagerFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccountManagerFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccountManagerFuture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AccountManagerFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccountManagerFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccountManagerFuture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -399,12 +399,12 @@ public partial class AccountManagerFuture<V> : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AccountManagerFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccountManagerFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccountManagerFuture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AccountManagerFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccountManagerFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccountManagerFuture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -541,10 +541,13 @@ public partial class OnAccountsUpdateListener : MASES.JCOBridge.C2JBridge.JVMBri
         /// </summary>
         public OnAccountsUpdateListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.accounts.OnAccountsUpdateListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.accounts.OnAccountsUpdateListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -566,10 +569,13 @@ public partial class OnAccountsUpdateListenerDirect : OnAccountsUpdateListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.accounts.OnAccountsUpdateListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.accounts.OnAccountsUpdateListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Accounts/OnAccountsUpdateListener.cs b/src/net/Netdroid/Generated/Android/Accounts/OnAccountsUpdateListener.cs
index 044795766..e8ed9700a 100644
--- a/src/net/Netdroid/Generated/Android/Accounts/OnAccountsUpdateListener.cs
+++ b/src/net/Netdroid/Generated/Android/Accounts/OnAccountsUpdateListener.cs
@@ -68,7 +68,7 @@ public partial class OnAccountsUpdateListener : Android.Accounts.IOnAccountsUpda
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onAccountsUpdated", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accounts.Account[]>>>(OnAccountsUpdatedEventHandler));
+            AddEventHandler("onAccountsUpdated", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accounts.Account[]>>>(OnAccountsUpdatedEventHandler));
 
         }
 
@@ -76,7 +76,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/accounts/OnAccountsUpdateListener.html#onAccountsUpdated(android.accounts.Account[])"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnAccountsUpdated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Accounts.Account[]> OnOnAccountsUpdated { get; set; } = null;
+        public global::System.Action<Android.Accounts.Account[]> OnOnAccountsUpdated { get; set; } = null;
 
         void OnAccountsUpdatedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Accounts.Account[]>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adid/AdId.cs b/src/net/Netdroid/Generated/Android/Adservices/Adid/AdId.cs
index 4a7cc0cf0..30d19499d 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adid/AdId.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adid/AdId.cs
@@ -61,13 +61,6 @@ public AdId(Java.Lang.String arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adid/AdId.html#getAdId()"/> 
-        /// </summary>
-        public Java.Lang.String GetAdId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAdId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/adid/AdId.html#isLimitAdTrackingEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -75,6 +68,14 @@ public bool IsLimitAdTrackingEnabled()
         {
             return IExecuteWithSignature<bool>("isLimitAdTrackingEnabled", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/adservices/adid/AdId.html#getAdId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAdId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAdId", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionConfig.cs b/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionConfig.cs
index 4914f5b2c..1ebaa2a01 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionConfig.cs
@@ -52,61 +52,68 @@ public partial class AdSelectionConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getAdSelectionSignals()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getAdSelectionSignals()"/>
         /// </summary>
-        public Android.Adservices.Common.AdSelectionSignals AdSelectionSignals
+        /// <returns><see cref="Android.Adservices.Common.AdSelectionSignals"/></returns>
+        public Android.Adservices.Common.AdSelectionSignals GetAdSelectionSignals()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getAdSelectionSignals", "()Landroid/adservices/common/AdSelectionSignals;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getAdSelectionSignals", "()Landroid/adservices/common/AdSelectionSignals;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getCustomAudienceBuyers()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getSellerSignals()"/>
         /// </summary>
-        public Java.Util.List<Android.Adservices.Common.AdTechIdentifier> CustomAudienceBuyers
+        /// <returns><see cref="Android.Adservices.Common.AdSelectionSignals"/></returns>
+        public Android.Adservices.Common.AdSelectionSignals GetSellerSignals()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.AdTechIdentifier>>("getCustomAudienceBuyers", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getSellerSignals", "()Landroid/adservices/common/AdSelectionSignals;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getDecisionLogicUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getSeller()"/>
         /// </summary>
-        public Android.Net.Uri DecisionLogicUri
+        /// <returns><see cref="Android.Adservices.Common.AdTechIdentifier"/></returns>
+        public Android.Adservices.Common.AdTechIdentifier GetSeller()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getDecisionLogicUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getSeller", "()Landroid/adservices/common/AdTechIdentifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getPerBuyerSignals()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getDecisionLogicUri()"/>
         /// </summary>
-        public Java.Util.Map<Android.Adservices.Common.AdTechIdentifier, Android.Adservices.Common.AdSelectionSignals> PerBuyerSignals
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetDecisionLogicUri()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Android.Adservices.Common.AdTechIdentifier, Android.Adservices.Common.AdSelectionSignals>>("getPerBuyerSignals", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getDecisionLogicUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getSeller()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getTrustedScoringSignalsUri()"/>
         /// </summary>
-        public Android.Adservices.Common.AdTechIdentifier Seller
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetTrustedScoringSignalsUri()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getSeller", "()Landroid/adservices/common/AdTechIdentifier;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getTrustedScoringSignalsUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getSellerSignals()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#describeContents()"/>
         /// </summary>
-        public Android.Adservices.Common.AdSelectionSignals SellerSignals
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getSellerSignals", "()Landroid/adservices/common/AdSelectionSignals;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getTrustedScoringSignalsUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getCustomAudienceBuyers()"/>
         /// </summary>
-        public Android.Net.Uri TrustedScoringSignalsUri
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Common.AdTechIdentifier> GetCustomAudienceBuyers()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getTrustedScoringSignalsUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.AdTechIdentifier>>("getCustomAudienceBuyers", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#getPerBuyerSignals()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Android.Adservices.Common.AdTechIdentifier, Android.Adservices.Common.AdSelectionSignals> GetPerBuyerSignals()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Map<Android.Adservices.Common.AdTechIdentifier, Android.Adservices.Common.AdSelectionSignals>>("getPerBuyerSignals", "()Ljava/util/Map;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionManager.cs b/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionManager.cs
index 8db709056..3f89b89d8 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionManager.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionManager.cs
@@ -55,11 +55,12 @@ public static Android.Adservices.Adselection.AdSelectionManager Get(Android.Cont
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionManager.html#getTestAdSelectionManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionManager.html#getTestAdSelectionManager()"/>
         /// </summary>
-        public Android.Adservices.Adselection.TestAdSelectionManager TestAdSelectionManager
+        /// <returns><see cref="Android.Adservices.Adselection.TestAdSelectionManager"/></returns>
+        public Android.Adservices.Adselection.TestAdSelectionManager GetTestAdSelectionManager()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Adselection.TestAdSelectionManager>("getTestAdSelectionManager", "()Landroid/adservices/adselection/TestAdSelectionManager;"); }
+            return IExecuteWithSignature<Android.Adservices.Adselection.TestAdSelectionManager>("getTestAdSelectionManager", "()Landroid/adservices/adselection/TestAdSelectionManager;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionManager.html#reportEvent(android.adservices.adselection.ReportEventRequest,java.util.concurrent.Executor,android.os.OutcomeReceiver)"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionOutcome.cs b/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionOutcome.cs
index 1e3de59a3..aa6d0ff42 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionOutcome.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adselection/AdSelectionOutcome.cs
@@ -46,18 +46,20 @@ public partial class AdSelectionOutcome
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionOutcome.html#getAdSelectionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionOutcome.html#getRenderUri()"/>
         /// </summary>
-        public long AdSelectionId
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetRenderUri()
         {
-            get { return IExecuteWithSignature<long>("getAdSelectionId", "()J"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getRenderUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionOutcome.html#getRenderUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AdSelectionOutcome.html#getAdSelectionId()"/>
         /// </summary>
-        public Android.Net.Uri RenderUri
+        /// <returns><see cref="long"/></returns>
+        public long GetAdSelectionId()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getRenderUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<long>("getAdSelectionId", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adselection/AddAdSelectionOverrideRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Adselection/AddAdSelectionOverrideRequest.cs
index e963d41c5..9ee03e9bf 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adselection/AddAdSelectionOverrideRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adselection/AddAdSelectionOverrideRequest.cs
@@ -56,25 +56,28 @@ public AddAdSelectionOverrideRequest(Android.Adservices.Adselection.AdSelectionC
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AddAdSelectionOverrideRequest.html#getAdSelectionConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AddAdSelectionOverrideRequest.html#getAdSelectionConfig()"/>
         /// </summary>
-        public Android.Adservices.Adselection.AdSelectionConfig AdSelectionConfig
+        /// <returns><see cref="Android.Adservices.Adselection.AdSelectionConfig"/></returns>
+        public Android.Adservices.Adselection.AdSelectionConfig GetAdSelectionConfig()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Adselection.AdSelectionConfig>("getAdSelectionConfig", "()Landroid/adservices/adselection/AdSelectionConfig;"); }
+            return IExecuteWithSignature<Android.Adservices.Adselection.AdSelectionConfig>("getAdSelectionConfig", "()Landroid/adservices/adselection/AdSelectionConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AddAdSelectionOverrideRequest.html#getDecisionLogicJs()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AddAdSelectionOverrideRequest.html#getTrustedScoringSignals()"/>
         /// </summary>
-        public Java.Lang.String DecisionLogicJs
+        /// <returns><see cref="Android.Adservices.Common.AdSelectionSignals"/></returns>
+        public Android.Adservices.Common.AdSelectionSignals GetTrustedScoringSignals()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDecisionLogicJs", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getTrustedScoringSignals", "()Landroid/adservices/common/AdSelectionSignals;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AddAdSelectionOverrideRequest.html#getTrustedScoringSignals()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/AddAdSelectionOverrideRequest.html#getDecisionLogicJs()"/>
         /// </summary>
-        public Android.Adservices.Common.AdSelectionSignals TrustedScoringSignals
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDecisionLogicJs()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getTrustedScoringSignals", "()Landroid/adservices/common/AdSelectionSignals;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDecisionLogicJs", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adselection/RemoveAdSelectionOverrideRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Adselection/RemoveAdSelectionOverrideRequest.cs
index 0cbebaf47..6586b5622 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adselection/RemoveAdSelectionOverrideRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adselection/RemoveAdSelectionOverrideRequest.cs
@@ -54,11 +54,12 @@ public RemoveAdSelectionOverrideRequest(Android.Adservices.Adselection.AdSelecti
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/RemoveAdSelectionOverrideRequest.html#getAdSelectionConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/RemoveAdSelectionOverrideRequest.html#getAdSelectionConfig()"/>
         /// </summary>
-        public Android.Adservices.Adselection.AdSelectionConfig AdSelectionConfig
+        /// <returns><see cref="Android.Adservices.Adselection.AdSelectionConfig"/></returns>
+        public Android.Adservices.Adselection.AdSelectionConfig GetAdSelectionConfig()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Adselection.AdSelectionConfig>("getAdSelectionConfig", "()Landroid/adservices/adselection/AdSelectionConfig;"); }
+            return IExecuteWithSignature<Android.Adservices.Adselection.AdSelectionConfig>("getAdSelectionConfig", "()Landroid/adservices/adselection/AdSelectionConfig;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adselection/ReportEventRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Adselection/ReportEventRequest.cs
index 4b5094ee0..8952931bf 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adselection/ReportEventRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adselection/ReportEventRequest.cs
@@ -58,32 +58,36 @@ public partial class ReportEventRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportEventRequest.html#getAdSelectionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportEventRequest.html#getReportingDestinations()"/>
         /// </summary>
-        public long AdSelectionId
+        /// <returns><see cref="int"/></returns>
+        public int GetReportingDestinations()
         {
-            get { return IExecuteWithSignature<long>("getAdSelectionId", "()J"); }
+            return IExecuteWithSignature<int>("getReportingDestinations", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportEventRequest.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportEventRequest.html#getData()"/>
         /// </summary>
-        public Java.Lang.String Data
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetData()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getData", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getData", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportEventRequest.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportEventRequest.html#getKey()"/>
         /// </summary>
-        public Java.Lang.String Key
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKey()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportEventRequest.html#getReportingDestinations()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportEventRequest.html#getAdSelectionId()"/>
         /// </summary>
-        public int ReportingDestinations
+        /// <returns><see cref="long"/></returns>
+        public long GetAdSelectionId()
         {
-            get { return IExecuteWithSignature<int>("getReportingDestinations", "()I"); }
+            return IExecuteWithSignature<long>("getAdSelectionId", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adselection/ReportImpressionRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Adselection/ReportImpressionRequest.cs
index d6de1ed8a..382d0feee 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adselection/ReportImpressionRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adselection/ReportImpressionRequest.cs
@@ -55,18 +55,20 @@ public ReportImpressionRequest(long arg0, Android.Adservices.Adselection.AdSelec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportImpressionRequest.html#getAdSelectionConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportImpressionRequest.html#getAdSelectionConfig()"/>
         /// </summary>
-        public Android.Adservices.Adselection.AdSelectionConfig AdSelectionConfig
+        /// <returns><see cref="Android.Adservices.Adselection.AdSelectionConfig"/></returns>
+        public Android.Adservices.Adselection.AdSelectionConfig GetAdSelectionConfig()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Adselection.AdSelectionConfig>("getAdSelectionConfig", "()Landroid/adservices/adselection/AdSelectionConfig;"); }
+            return IExecuteWithSignature<Android.Adservices.Adselection.AdSelectionConfig>("getAdSelectionConfig", "()Landroid/adservices/adselection/AdSelectionConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportImpressionRequest.html#getAdSelectionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/ReportImpressionRequest.html#getAdSelectionId()"/>
         /// </summary>
-        public long AdSelectionId
+        /// <returns><see cref="long"/></returns>
+        public long GetAdSelectionId()
         {
-            get { return IExecuteWithSignature<long>("getAdSelectionId", "()J"); }
+            return IExecuteWithSignature<long>("getAdSelectionId", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Adselection/UpdateAdCounterHistogramRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Adselection/UpdateAdCounterHistogramRequest.cs
index 1205a5dfc..1949ef54c 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Adselection/UpdateAdCounterHistogramRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Adselection/UpdateAdCounterHistogramRequest.cs
@@ -46,25 +46,28 @@ public partial class UpdateAdCounterHistogramRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/UpdateAdCounterHistogramRequest.html#getAdEventType()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/UpdateAdCounterHistogramRequest.html#getCallerAdTech()"/>
         /// </summary>
-        public int AdEventType
+        /// <returns><see cref="Android.Adservices.Common.AdTechIdentifier"/></returns>
+        public Android.Adservices.Common.AdTechIdentifier GetCallerAdTech()
         {
-            get { return IExecuteWithSignature<int>("getAdEventType", "()I"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getCallerAdTech", "()Landroid/adservices/common/AdTechIdentifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/UpdateAdCounterHistogramRequest.html#getAdSelectionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/UpdateAdCounterHistogramRequest.html#getAdEventType()"/>
         /// </summary>
-        public long AdSelectionId
+        /// <returns><see cref="int"/></returns>
+        public int GetAdEventType()
         {
-            get { return IExecuteWithSignature<long>("getAdSelectionId", "()J"); }
+            return IExecuteWithSignature<int>("getAdEventType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/adselection/UpdateAdCounterHistogramRequest.html#getCallerAdTech()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/adselection/UpdateAdCounterHistogramRequest.html#getAdSelectionId()"/>
         /// </summary>
-        public Android.Adservices.Common.AdTechIdentifier CallerAdTech
+        /// <returns><see cref="long"/></returns>
+        public long GetAdSelectionId()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getCallerAdTech", "()Landroid/adservices/common/AdTechIdentifier;"); }
+            return IExecuteWithSignature<long>("getAdSelectionId", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Appsetid/AppSetId.cs b/src/net/Netdroid/Generated/Android/Adservices/Appsetid/AppSetId.cs
index 7ab59d3e4..898bca418 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Appsetid/AppSetId.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Appsetid/AppSetId.cs
@@ -67,18 +67,20 @@ public AppSetId(Java.Lang.String arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/appsetid/AppSetId.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/appsetid/AppSetId.html#getScope()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="int"/></returns>
+        public int GetScope()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getScope", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/appsetid/AppSetId.html#getScope()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/appsetid/AppSetId.html#getId()"/>
         /// </summary>
-        public int Scope
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<int>("getScope", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Common/AdData.cs b/src/net/Netdroid/Generated/Android/Adservices/Common/AdData.cs
index 32f1db7dc..376a033ef 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Common/AdData.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Common/AdData.cs
@@ -52,40 +52,44 @@ public partial class AdData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#getAdCounterKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#getAdFilters()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.Integer> AdCounterKeys
+        /// <returns><see cref="Android.Adservices.Common.AdFilters"/></returns>
+        public Android.Adservices.Common.AdFilters GetAdFilters()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getAdCounterKeys", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdFilters>("getAdFilters", "()Landroid/adservices/common/AdFilters;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#getAdFilters()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#getRenderUri()"/>
         /// </summary>
-        public Android.Adservices.Common.AdFilters AdFilters
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetRenderUri()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdFilters>("getAdFilters", "()Landroid/adservices/common/AdFilters;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getRenderUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#getMetadata()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Metadata
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMetadata", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#getRenderUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#getMetadata()"/>
         /// </summary>
-        public Android.Net.Uri RenderUri
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMetadata()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getRenderUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMetadata", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#getAdCounterKeys()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Integer> GetAdCounterKeys()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getAdCounterKeys", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/common/AdData.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Common/AdFilters.cs b/src/net/Netdroid/Generated/Android/Adservices/Common/AdFilters.cs
index f0cc8a8ba..070c43c61 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Common/AdFilters.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Common/AdFilters.cs
@@ -52,11 +52,12 @@ public partial class AdFilters
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/AdFilters.html#getFrequencyCapFilters()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/AdFilters.html#getFrequencyCapFilters()"/>
         /// </summary>
-        public Android.Adservices.Common.FrequencyCapFilters FrequencyCapFilters
+        /// <returns><see cref="Android.Adservices.Common.FrequencyCapFilters"/></returns>
+        public Android.Adservices.Common.FrequencyCapFilters GetFrequencyCapFilters()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.FrequencyCapFilters>("getFrequencyCapFilters", "()Landroid/adservices/common/FrequencyCapFilters;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.FrequencyCapFilters>("getFrequencyCapFilters", "()Landroid/adservices/common/FrequencyCapFilters;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/common/AdFilters.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Common/FrequencyCapFilters.cs b/src/net/Netdroid/Generated/Android/Adservices/Common/FrequencyCapFilters.cs
index f8651f065..b1dc5d688 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Common/FrequencyCapFilters.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Common/FrequencyCapFilters.cs
@@ -76,40 +76,44 @@ public partial class FrequencyCapFilters
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#getKeyedFrequencyCapsForClickEvents()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap> KeyedFrequencyCapsForClickEvents
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap>>("getKeyedFrequencyCapsForClickEvents", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#getKeyedFrequencyCapsForImpressionEvents()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#getKeyedFrequencyCapsForClickEvents()"/>
         /// </summary>
-        public Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap> KeyedFrequencyCapsForImpressionEvents
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap> GetKeyedFrequencyCapsForClickEvents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap>>("getKeyedFrequencyCapsForImpressionEvents", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap>>("getKeyedFrequencyCapsForClickEvents", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#getKeyedFrequencyCapsForViewEvents()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#getKeyedFrequencyCapsForImpressionEvents()"/>
         /// </summary>
-        public Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap> KeyedFrequencyCapsForViewEvents
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap> GetKeyedFrequencyCapsForImpressionEvents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap>>("getKeyedFrequencyCapsForViewEvents", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap>>("getKeyedFrequencyCapsForImpressionEvents", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#getKeyedFrequencyCapsForWinEvents()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#getKeyedFrequencyCapsForViewEvents()"/>
         /// </summary>
-        public Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap> KeyedFrequencyCapsForWinEvents
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap> GetKeyedFrequencyCapsForViewEvents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap>>("getKeyedFrequencyCapsForWinEvents", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap>>("getKeyedFrequencyCapsForViewEvents", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#getKeyedFrequencyCapsForWinEvents()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap> GetKeyedFrequencyCapsForWinEvents()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.KeyedFrequencyCap>>("getKeyedFrequencyCapsForWinEvents", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/common/FrequencyCapFilters.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Common/KeyedFrequencyCap.cs b/src/net/Netdroid/Generated/Android/Adservices/Common/KeyedFrequencyCap.cs
index ee5cf45ce..f795a5e54 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Common/KeyedFrequencyCap.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Common/KeyedFrequencyCap.cs
@@ -52,33 +52,36 @@ public partial class KeyedFrequencyCap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#getAdCounterKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#describeContents()"/>
         /// </summary>
-        public int AdCounterKey
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getAdCounterKey", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#getInterval()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#getAdCounterKey()"/>
         /// </summary>
-        public Java.Time.Duration Interval
+        /// <returns><see cref="int"/></returns>
+        public int GetAdCounterKey()
         {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getInterval", "()Ljava/time/Duration;"); }
+            return IExecuteWithSignature<int>("getAdCounterKey", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#getMaxCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#getMaxCount()"/>
         /// </summary>
-        public int MaxCount
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxCount()
         {
-            get { return IExecuteWithSignature<int>("getMaxCount", "()I"); }
+            return IExecuteWithSignature<int>("getMaxCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#getInterval()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetInterval()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Time.Duration>("getInterval", "()Ljava/time/Duration;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/common/KeyedFrequencyCap.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/AddCustomAudienceOverrideRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/AddCustomAudienceOverrideRequest.cs
index 7f38c857c..a4369a94b 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/AddCustomAudienceOverrideRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/AddCustomAudienceOverrideRequest.cs
@@ -57,32 +57,36 @@ public AddCustomAudienceOverrideRequest(Android.Adservices.Common.AdTechIdentifi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/AddCustomAudienceOverrideRequest.html#getBiddingLogicJs()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/AddCustomAudienceOverrideRequest.html#getTrustedBiddingSignals()"/>
         /// </summary>
-        public Java.Lang.String BiddingLogicJs
+        /// <returns><see cref="Android.Adservices.Common.AdSelectionSignals"/></returns>
+        public Android.Adservices.Common.AdSelectionSignals GetTrustedBiddingSignals()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBiddingLogicJs", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getTrustedBiddingSignals", "()Landroid/adservices/common/AdSelectionSignals;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/AddCustomAudienceOverrideRequest.html#getBuyer()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/AddCustomAudienceOverrideRequest.html#getBuyer()"/>
         /// </summary>
-        public Android.Adservices.Common.AdTechIdentifier Buyer
+        /// <returns><see cref="Android.Adservices.Common.AdTechIdentifier"/></returns>
+        public Android.Adservices.Common.AdTechIdentifier GetBuyer()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getBuyer", "()Landroid/adservices/common/AdTechIdentifier;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getBuyer", "()Landroid/adservices/common/AdTechIdentifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/AddCustomAudienceOverrideRequest.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/AddCustomAudienceOverrideRequest.html#getBiddingLogicJs()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBiddingLogicJs()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getBiddingLogicJs", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/AddCustomAudienceOverrideRequest.html#getTrustedBiddingSignals()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/AddCustomAudienceOverrideRequest.html#getName()"/>
         /// </summary>
-        public Android.Adservices.Common.AdSelectionSignals TrustedBiddingSignals
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getTrustedBiddingSignals", "()Landroid/adservices/common/AdSelectionSignals;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/CustomAudience.cs b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/CustomAudience.cs
index 2c077d1f5..62247fce7 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/CustomAudience.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/CustomAudience.cs
@@ -52,75 +52,84 @@ public partial class CustomAudience
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getActivationTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getUserBiddingSignals()"/>
         /// </summary>
-        public Java.Time.Instant ActivationTime
+        /// <returns><see cref="Android.Adservices.Common.AdSelectionSignals"/></returns>
+        public Android.Adservices.Common.AdSelectionSignals GetUserBiddingSignals()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getActivationTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getUserBiddingSignals", "()Landroid/adservices/common/AdSelectionSignals;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getAds()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getBuyer()"/>
         /// </summary>
-        public Java.Util.List<Android.Adservices.Common.AdData> Ads
+        /// <returns><see cref="Android.Adservices.Common.AdTechIdentifier"/></returns>
+        public Android.Adservices.Common.AdTechIdentifier GetBuyer()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.AdData>>("getAds", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getBuyer", "()Landroid/adservices/common/AdTechIdentifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getBiddingLogicUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getTrustedBiddingData()"/>
         /// </summary>
-        public Android.Net.Uri BiddingLogicUri
+        /// <returns><see cref="Android.Adservices.Customaudience.TrustedBiddingData"/></returns>
+        public Android.Adservices.Customaudience.TrustedBiddingData GetTrustedBiddingData()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getBiddingLogicUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Adservices.Customaudience.TrustedBiddingData>("getTrustedBiddingData", "()Landroid/adservices/customaudience/TrustedBiddingData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getBuyer()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getBiddingLogicUri()"/>
         /// </summary>
-        public Android.Adservices.Common.AdTechIdentifier Buyer
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetBiddingLogicUri()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getBuyer", "()Landroid/adservices/common/AdTechIdentifier;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getBiddingLogicUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getDailyUpdateUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getDailyUpdateUri()"/>
         /// </summary>
-        public Android.Net.Uri DailyUpdateUri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetDailyUpdateUri()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getDailyUpdateUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getDailyUpdateUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getExpirationTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#describeContents()"/>
         /// </summary>
-        public Java.Time.Instant ExpirationTime
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getExpirationTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getTrustedBiddingData()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getActivationTime()"/>
         /// </summary>
-        public Android.Adservices.Customaudience.TrustedBiddingData TrustedBiddingData
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetActivationTime()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Customaudience.TrustedBiddingData>("getTrustedBiddingData", "()Landroid/adservices/customaudience/TrustedBiddingData;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getActivationTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getUserBiddingSignals()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getExpirationTime()"/>
         /// </summary>
-        public Android.Adservices.Common.AdSelectionSignals UserBiddingSignals
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetExpirationTime()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdSelectionSignals>("getUserBiddingSignals", "()Landroid/adservices/common/AdSelectionSignals;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getExpirationTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#getAds()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Common.AdData> GetAds()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Common.AdData>>("getAds", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudience.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/CustomAudienceManager.cs b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/CustomAudienceManager.cs
index b3017bac9..1a2eae446 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/CustomAudienceManager.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/CustomAudienceManager.cs
@@ -55,11 +55,12 @@ public static Android.Adservices.Customaudience.CustomAudienceManager Get(Androi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudienceManager.html#getTestCustomAudienceManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudienceManager.html#getTestCustomAudienceManager()"/>
         /// </summary>
-        public Android.Adservices.Customaudience.TestCustomAudienceManager TestCustomAudienceManager
+        /// <returns><see cref="Android.Adservices.Customaudience.TestCustomAudienceManager"/></returns>
+        public Android.Adservices.Customaudience.TestCustomAudienceManager GetTestCustomAudienceManager()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Customaudience.TestCustomAudienceManager>("getTestCustomAudienceManager", "()Landroid/adservices/customaudience/TestCustomAudienceManager;"); }
+            return IExecuteWithSignature<Android.Adservices.Customaudience.TestCustomAudienceManager>("getTestCustomAudienceManager", "()Landroid/adservices/customaudience/TestCustomAudienceManager;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/customaudience/CustomAudienceManager.html#joinCustomAudience(android.adservices.customaudience.JoinCustomAudienceRequest,java.util.concurrent.Executor,android.os.OutcomeReceiver)"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/JoinCustomAudienceRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/JoinCustomAudienceRequest.cs
index 0a3e49754..bbd226a66 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/JoinCustomAudienceRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/JoinCustomAudienceRequest.cs
@@ -46,11 +46,12 @@ public partial class JoinCustomAudienceRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/JoinCustomAudienceRequest.html#getCustomAudience()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/JoinCustomAudienceRequest.html#getCustomAudience()"/>
         /// </summary>
-        public Android.Adservices.Customaudience.CustomAudience CustomAudience
+        /// <returns><see cref="Android.Adservices.Customaudience.CustomAudience"/></returns>
+        public Android.Adservices.Customaudience.CustomAudience GetCustomAudience()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Customaudience.CustomAudience>("getCustomAudience", "()Landroid/adservices/customaudience/CustomAudience;"); }
+            return IExecuteWithSignature<Android.Adservices.Customaudience.CustomAudience>("getCustomAudience", "()Landroid/adservices/customaudience/CustomAudience;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/LeaveCustomAudienceRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/LeaveCustomAudienceRequest.cs
index de0a5a982..a1582a70a 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/LeaveCustomAudienceRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/LeaveCustomAudienceRequest.cs
@@ -46,18 +46,20 @@ public partial class LeaveCustomAudienceRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/LeaveCustomAudienceRequest.html#getBuyer()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/LeaveCustomAudienceRequest.html#getBuyer()"/>
         /// </summary>
-        public Android.Adservices.Common.AdTechIdentifier Buyer
+        /// <returns><see cref="Android.Adservices.Common.AdTechIdentifier"/></returns>
+        public Android.Adservices.Common.AdTechIdentifier GetBuyer()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getBuyer", "()Landroid/adservices/common/AdTechIdentifier;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getBuyer", "()Landroid/adservices/common/AdTechIdentifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/LeaveCustomAudienceRequest.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/LeaveCustomAudienceRequest.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/RemoveCustomAudienceOverrideRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/RemoveCustomAudienceOverrideRequest.cs
index d1445e2c7..ef1e4c94e 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/RemoveCustomAudienceOverrideRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/RemoveCustomAudienceOverrideRequest.cs
@@ -55,18 +55,20 @@ public RemoveCustomAudienceOverrideRequest(Android.Adservices.Common.AdTechIdent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/RemoveCustomAudienceOverrideRequest.html#getBuyer()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/RemoveCustomAudienceOverrideRequest.html#getBuyer()"/>
         /// </summary>
-        public Android.Adservices.Common.AdTechIdentifier Buyer
+        /// <returns><see cref="Android.Adservices.Common.AdTechIdentifier"/></returns>
+        public Android.Adservices.Common.AdTechIdentifier GetBuyer()
         {
-            get { return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getBuyer", "()Landroid/adservices/common/AdTechIdentifier;"); }
+            return IExecuteWithSignature<Android.Adservices.Common.AdTechIdentifier>("getBuyer", "()Landroid/adservices/common/AdTechIdentifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/RemoveCustomAudienceOverrideRequest.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/RemoveCustomAudienceOverrideRequest.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/TrustedBiddingData.cs b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/TrustedBiddingData.cs
index b68d2860f..5181fbabb 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Customaudience/TrustedBiddingData.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Customaudience/TrustedBiddingData.cs
@@ -52,18 +52,12 @@ public partial class TrustedBiddingData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/TrustedBiddingData.html#getTrustedBiddingKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/TrustedBiddingData.html#getTrustedBiddingUri()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> TrustedBiddingKeys
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetTrustedBiddingUri()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getTrustedBiddingKeys", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/TrustedBiddingData.html#getTrustedBiddingUri()"/> 
-        /// </summary>
-        public Android.Net.Uri TrustedBiddingUri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getTrustedBiddingUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getTrustedBiddingUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/customaudience/TrustedBiddingData.html#describeContents()"/>
@@ -74,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/adservices/customaudience/TrustedBiddingData.html#getTrustedBiddingKeys()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetTrustedBiddingKeys()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getTrustedBiddingKeys", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/customaudience/TrustedBiddingData.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Measurement/DeletionRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Measurement/DeletionRequest.cs
index 051bb925c..236b8486b 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Measurement/DeletionRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Measurement/DeletionRequest.cs
@@ -70,46 +70,52 @@ public partial class DeletionRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getDeletionMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getDeletionMode()"/>
         /// </summary>
-        public int DeletionMode
+        /// <returns><see cref="int"/></returns>
+        public int GetDeletionMode()
         {
-            get { return IExecuteWithSignature<int>("getDeletionMode", "()I"); }
+            return IExecuteWithSignature<int>("getDeletionMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getDomainUris()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getMatchBehavior()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Uri> DomainUris
+        /// <returns><see cref="int"/></returns>
+        public int GetMatchBehavior()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getDomainUris", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getMatchBehavior", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getEnd()"/>
         /// </summary>
-        public Java.Time.Instant End
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetEnd()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getEnd", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getEnd", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getMatchBehavior()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getStart()"/>
         /// </summary>
-        public int MatchBehavior
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetStart()
         {
-            get { return IExecuteWithSignature<int>("getMatchBehavior", "()I"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getStart", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getOriginUris()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getDomainUris()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Uri> OriginUris
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Uri> GetDomainUris()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getOriginUris", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getDomainUris", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/DeletionRequest.html#getOriginUris()"/>
         /// </summary>
-        public Java.Time.Instant Start
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Uri> GetOriginUris()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getStart", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getOriginUris", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebSourceParams.cs b/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebSourceParams.cs
index c42482c44..ed50761fd 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebSourceParams.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebSourceParams.cs
@@ -52,11 +52,12 @@ public partial class WebSourceParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceParams.html#getRegistrationUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceParams.html#getRegistrationUri()"/>
         /// </summary>
-        public Android.Net.Uri RegistrationUri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetRegistrationUri()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getRegistrationUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getRegistrationUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceParams.html#isDebugKeyAllowed()"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebSourceRegistrationRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebSourceRegistrationRequest.cs
index c60063542..c735b1c68 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebSourceRegistrationRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebSourceRegistrationRequest.cs
@@ -52,46 +52,44 @@ public partial class WebSourceRegistrationRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getAppDestination()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getAppDestination()"/>
         /// </summary>
-        public Android.Net.Uri AppDestination
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetAppDestination()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getAppDestination", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getAppDestination", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getInputEvent()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getTopOriginUri()"/>
         /// </summary>
-        public Android.View.InputEvent InputEvent
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetTopOriginUri()
         {
-            get { return IExecuteWithSignature<Android.View.InputEvent>("getInputEvent", "()Landroid/view/InputEvent;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getTopOriginUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getSourceParams()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getVerifiedDestination()"/>
         /// </summary>
-        public Java.Util.List<Android.Adservices.Measurement.WebSourceParams> SourceParams
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetVerifiedDestination()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Measurement.WebSourceParams>>("getSourceParams", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getVerifiedDestination", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getTopOriginUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getWebDestination()"/>
         /// </summary>
-        public Android.Net.Uri TopOriginUri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetWebDestination()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getTopOriginUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getWebDestination", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getVerifiedDestination()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getInputEvent()"/>
         /// </summary>
-        public Android.Net.Uri VerifiedDestination
+        /// <returns><see cref="Android.View.InputEvent"/></returns>
+        public Android.View.InputEvent GetInputEvent()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getVerifiedDestination", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getWebDestination()"/> 
-        /// </summary>
-        public Android.Net.Uri WebDestination
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getWebDestination", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.View.InputEvent>("getInputEvent", "()Landroid/view/InputEvent;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#describeContents()"/>
@@ -102,6 +100,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#getSourceParams()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Measurement.WebSourceParams> GetSourceParams()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Measurement.WebSourceParams>>("getSourceParams", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebSourceRegistrationRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebTriggerParams.cs b/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebTriggerParams.cs
index 9fde1315e..12a59733d 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebTriggerParams.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebTriggerParams.cs
@@ -52,11 +52,12 @@ public partial class WebTriggerParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerParams.html#getRegistrationUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerParams.html#getRegistrationUri()"/>
         /// </summary>
-        public Android.Net.Uri RegistrationUri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetRegistrationUri()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getRegistrationUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getRegistrationUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerParams.html#isDebugKeyAllowed()"/>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebTriggerRegistrationRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebTriggerRegistrationRequest.cs
index c088df931..7251b07d2 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebTriggerRegistrationRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Measurement/WebTriggerRegistrationRequest.cs
@@ -52,18 +52,12 @@ public partial class WebTriggerRegistrationRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerRegistrationRequest.html#getDestination()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerRegistrationRequest.html#getDestination()"/>
         /// </summary>
-        public Android.Net.Uri Destination
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetDestination()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getDestination", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerRegistrationRequest.html#getTriggerParams()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Adservices.Measurement.WebTriggerParams> TriggerParams
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Measurement.WebTriggerParams>>("getTriggerParams", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getDestination", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerRegistrationRequest.html#describeContents()"/>
@@ -74,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerRegistrationRequest.html#getTriggerParams()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Measurement.WebTriggerParams> GetTriggerParams()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Measurement.WebTriggerParams>>("getTriggerParams", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/measurement/WebTriggerRegistrationRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Topics/GetTopicsRequest.cs b/src/net/Netdroid/Generated/Android/Adservices/Topics/GetTopicsRequest.cs
index 5339b38ed..0f86c364a 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Topics/GetTopicsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Topics/GetTopicsRequest.cs
@@ -46,13 +46,6 @@ public partial class GetTopicsRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/topics/GetTopicsRequest.html#getAdsSdkName()"/> 
-        /// </summary>
-        public Java.Lang.String AdsSdkName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAdsSdkName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/adservices/topics/GetTopicsRequest.html#shouldRecordObservation()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -60,6 +53,14 @@ public bool ShouldRecordObservation()
         {
             return IExecuteWithSignature<bool>("shouldRecordObservation", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/adservices/topics/GetTopicsRequest.html#getAdsSdkName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAdsSdkName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAdsSdkName", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Topics/GetTopicsResponse.cs b/src/net/Netdroid/Generated/Android/Adservices/Topics/GetTopicsResponse.cs
index ee3bd4fbc..eefe06e30 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Topics/GetTopicsResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Topics/GetTopicsResponse.cs
@@ -46,11 +46,12 @@ public partial class GetTopicsResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/topics/GetTopicsResponse.html#getTopics()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/topics/GetTopicsResponse.html#getTopics()"/>
         /// </summary>
-        public Java.Util.List<Android.Adservices.Topics.Topic> Topics
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Adservices.Topics.Topic> GetTopics()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Adservices.Topics.Topic>>("getTopics", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Adservices.Topics.Topic>>("getTopics", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Adservices/Topics/Topic.cs b/src/net/Netdroid/Generated/Android/Adservices/Topics/Topic.cs
index f3b544524..d24d7f2bf 100644
--- a/src/net/Netdroid/Generated/Android/Adservices/Topics/Topic.cs
+++ b/src/net/Netdroid/Generated/Android/Adservices/Topics/Topic.cs
@@ -56,25 +56,28 @@ public Topic(long arg0, long arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/topics/Topic.html#getModelVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/topics/Topic.html#getTopicId()"/>
         /// </summary>
-        public long ModelVersion
+        /// <returns><see cref="int"/></returns>
+        public int GetTopicId()
         {
-            get { return IExecuteWithSignature<long>("getModelVersion", "()J"); }
+            return IExecuteWithSignature<int>("getTopicId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/topics/Topic.html#getTaxonomyVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/topics/Topic.html#getModelVersion()"/>
         /// </summary>
-        public long TaxonomyVersion
+        /// <returns><see cref="long"/></returns>
+        public long GetModelVersion()
         {
-            get { return IExecuteWithSignature<long>("getTaxonomyVersion", "()J"); }
+            return IExecuteWithSignature<long>("getModelVersion", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/adservices/topics/Topic.html#getTopicId()"/> 
+        /// <see href="https://developer.android.com/reference/android/adservices/topics/Topic.html#getTaxonomyVersion()"/>
         /// </summary>
-        public int TopicId
+        /// <returns><see cref="long"/></returns>
+        public long GetTaxonomyVersion()
         {
-            get { return IExecuteWithSignature<int>("getTopicId", "()I"); }
+            return IExecuteWithSignature<long>("getTaxonomyVersion", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/AllPackageClasses.cs
index a976069b5..44ad75e21 100644
--- a/src/net/Netdroid/Generated/Android/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/AllPackageClasses.cs
@@ -158,6 +158,974 @@ public permission_group(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region R
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/R.html"/>
+    /// </summary>
+    public partial class R : MASES.JCOBridge.C2JBridge.JVMBridgeBase<R>
+    {
+        const string _bridgeClassName = "android.R";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        public R() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public R(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+        #region anim
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.anim.html"/>
+        /// </summary>
+        public partial class anim : MASES.JCOBridge.C2JBridge.JVMBridgeBase<anim>
+        {
+            const string _bridgeClassName = "android.R$anim";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public anim() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public anim(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region animator
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.animator.html"/>
+        /// </summary>
+        public partial class animator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<animator>
+        {
+            const string _bridgeClassName = "android.R$animator";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public animator() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public animator(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region array
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.array.html"/>
+        /// </summary>
+        public partial class array : MASES.JCOBridge.C2JBridge.JVMBridgeBase<array>
+        {
+            const string _bridgeClassName = "android.R$array";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public array() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public array(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region attr
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.attr.html"/>
+        /// </summary>
+        public partial class attr : MASES.JCOBridge.C2JBridge.JVMBridgeBase<attr>
+        {
+            const string _bridgeClassName = "android.R$attr";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public attr() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public attr(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region boolClass
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.bool.html"/>
+        /// </summary>
+        public partial class boolClass : MASES.JCOBridge.C2JBridge.JVMBridgeBase<boolClass>
+        {
+            const string _bridgeClassName = "android.R$bool";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public boolClass() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public boolClass(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region color
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.color.html"/>
+        /// </summary>
+        public partial class color : MASES.JCOBridge.C2JBridge.JVMBridgeBase<color>
+        {
+            const string _bridgeClassName = "android.R$color";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public color() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public color(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region dimen
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.dimen.html"/>
+        /// </summary>
+        public partial class dimen : MASES.JCOBridge.C2JBridge.JVMBridgeBase<dimen>
+        {
+            const string _bridgeClassName = "android.R$dimen";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public dimen() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public dimen(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region drawable
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.drawable.html"/>
+        /// </summary>
+        public partial class drawable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<drawable>
+        {
+            const string _bridgeClassName = "android.R$drawable";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public drawable() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public drawable(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region fraction
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.fraction.html"/>
+        /// </summary>
+        public partial class fraction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<fraction>
+        {
+            const string _bridgeClassName = "android.R$fraction";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public fraction() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public fraction(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region id
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.id.html"/>
+        /// </summary>
+        public partial class id : MASES.JCOBridge.C2JBridge.JVMBridgeBase<id>
+        {
+            const string _bridgeClassName = "android.R$id";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public id() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public id(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region integer
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.integer.html"/>
+        /// </summary>
+        public partial class integer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<integer>
+        {
+            const string _bridgeClassName = "android.R$integer";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public integer() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public integer(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region interpolator
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.interpolator.html"/>
+        /// </summary>
+        public partial class interpolator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<interpolator>
+        {
+            const string _bridgeClassName = "android.R$interpolator";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public interpolator() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public interpolator(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region layout
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.layout.html"/>
+        /// </summary>
+        public partial class layout : MASES.JCOBridge.C2JBridge.JVMBridgeBase<layout>
+        {
+            const string _bridgeClassName = "android.R$layout";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public layout() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public layout(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region menu
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.menu.html"/>
+        /// </summary>
+        public partial class menu : MASES.JCOBridge.C2JBridge.JVMBridgeBase<menu>
+        {
+            const string _bridgeClassName = "android.R$menu";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public menu() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public menu(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region mipmap
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.mipmap.html"/>
+        /// </summary>
+        public partial class mipmap : MASES.JCOBridge.C2JBridge.JVMBridgeBase<mipmap>
+        {
+            const string _bridgeClassName = "android.R$mipmap";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public mipmap() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public mipmap(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region plurals
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.plurals.html"/>
+        /// </summary>
+        public partial class plurals : MASES.JCOBridge.C2JBridge.JVMBridgeBase<plurals>
+        {
+            const string _bridgeClassName = "android.R$plurals";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public plurals() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public plurals(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region raw
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.raw.html"/>
+        /// </summary>
+        public partial class raw : MASES.JCOBridge.C2JBridge.JVMBridgeBase<raw>
+        {
+            const string _bridgeClassName = "android.R$raw";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public raw() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public raw(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region stringClass
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.string.html"/>
+        /// </summary>
+        public partial class stringClass : MASES.JCOBridge.C2JBridge.JVMBridgeBase<stringClass>
+        {
+            const string _bridgeClassName = "android.R$string";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public stringClass() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public stringClass(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region style
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.style.html"/>
+        /// </summary>
+        public partial class style : MASES.JCOBridge.C2JBridge.JVMBridgeBase<style>
+        {
+            const string _bridgeClassName = "android.R$style";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public style() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public style(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region transition
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.transition.html"/>
+        /// </summary>
+        public partial class transition : MASES.JCOBridge.C2JBridge.JVMBridgeBase<transition>
+        {
+            const string _bridgeClassName = "android.R$transition";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public transition() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public transition(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region xml
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/R.xml.html"/>
+        /// </summary>
+        public partial class xml : MASES.JCOBridge.C2JBridge.JVMBridgeBase<xml>
+        {
+            const string _bridgeClassName = "android.R$xml";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public xml() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public xml(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+    
+    }
+    #endregion
+
 
 
 }
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Android/Animation/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Animation/AllPackageClasses.cs
index 983261ab5..8adea0ee9 100644
--- a/src/net/Netdroid/Generated/Android/Animation/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class Animator : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Animator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Animator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Animator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Animator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Animator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Animator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -79,10 +79,13 @@ public partial class AnimatorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public AnimatorListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.animation.Animator_AnimatorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.animation.AnimatorListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -104,10 +107,13 @@ public partial class AnimatorListenerDirect : AnimatorListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.animation.Animator$AnimatorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.animation.Animator$AnimatorListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -138,10 +144,13 @@ public partial class AnimatorPauseListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public AnimatorPauseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.animation.Animator_AnimatorPauseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.animation.AnimatorPauseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -163,10 +172,13 @@ public partial class AnimatorPauseListenerDirect : AnimatorPauseListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.animation.Animator$AnimatorPauseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.animation.Animator$AnimatorPauseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -238,38 +250,26 @@ public AnimatorInflater(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html"/>
     /// </summary>
-    public partial class AnimatorListenerAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class AnimatorListenerAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AnimatorListenerAdapter>
     {
+        const string _bridgeClassName = "android.animation.AnimatorListenerAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public AnimatorListenerAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region AnimatorListenerAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="AnimatorListenerAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class AnimatorListenerAdapterDirect : AnimatorListenerAdapter
-    {
+        [global::System.Obsolete("AnimatorListenerAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public AnimatorListenerAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("AnimatorListenerAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public AnimatorListenerAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.animation.AnimatorListenerAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -286,6 +286,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -431,12 +434,12 @@ public partial class BidirectionalTypeConverter : Android.Animation.TypeConverte
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BidirectionalTypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BidirectionalTypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BidirectionalTypeConverter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BidirectionalTypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BidirectionalTypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BidirectionalTypeConverter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -479,12 +482,12 @@ public partial class BidirectionalTypeConverter<T, V> : Android.Animation.TypeCo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BidirectionalTypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BidirectionalTypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BidirectionalTypeConverter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BidirectionalTypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BidirectionalTypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BidirectionalTypeConverter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -701,12 +704,12 @@ public partial class Keyframe : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Keyframe class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Keyframe class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Keyframe() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Keyframe class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Keyframe class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Keyframe(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -788,10 +791,13 @@ public partial class TransitionListener : MASES.JCOBridge.C2JBridge.JVMBridgeLis
             /// </summary>
             public TransitionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.animation.LayoutTransition_TransitionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.animation.TransitionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -813,10 +819,13 @@ public partial class TransitionListenerDirect : TransitionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.animation.LayoutTransition$TransitionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.animation.LayoutTransition$TransitionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1111,10 +1120,13 @@ public partial class TimeListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public TimeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.animation.TimeAnimator_TimeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.animation.TimeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1136,10 +1148,13 @@ public partial class TimeListenerDirect : TimeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.animation.TimeAnimator$TimeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.animation.TimeAnimator$TimeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1173,12 +1188,12 @@ public partial class TimeInterpolator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TimeInterpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeInterpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeInterpolator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TimeInterpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeInterpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeInterpolator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1219,12 +1234,12 @@ public partial class TypeConverter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Typ
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeConverter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeConverter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1267,12 +1282,12 @@ public partial class TypeConverter<T, V> : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeConverter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeConverter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1313,12 +1328,12 @@ public partial class TypeEvaluator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Typ
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TypeEvaluator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeEvaluator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeEvaluator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TypeEvaluator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeEvaluator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeEvaluator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1360,12 +1375,12 @@ public partial class TypeEvaluator<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TypeEvaluator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeEvaluator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeEvaluator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TypeEvaluator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeEvaluator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeEvaluator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1447,10 +1462,13 @@ public partial class AnimatorUpdateListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public AnimatorUpdateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.animation.ValueAnimator_AnimatorUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.animation.AnimatorUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1472,10 +1490,13 @@ public partial class AnimatorUpdateListenerDirect : AnimatorUpdateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.animation.ValueAnimator$AnimatorUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.animation.ValueAnimator$AnimatorUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1506,10 +1527,13 @@ public partial class DurationScaleChangeListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public DurationScaleChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.animation.ValueAnimator_DurationScaleChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.animation.DurationScaleChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1531,10 +1555,13 @@ public partial class DurationScaleChangeListenerDirect : DurationScaleChangeList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.animation.ValueAnimator$DurationScaleChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.animation.ValueAnimator$DurationScaleChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Animation/Animator.cs b/src/net/Netdroid/Generated/Android/Animation/Animator.cs
index fe91e3bb4..5961965b7 100644
--- a/src/net/Netdroid/Generated/Android/Animation/Animator.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/Animator.cs
@@ -52,56 +52,53 @@ public partial class Animator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#setDuration(long)"/>
         /// </summary>
-        public long Duration
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <returns><see cref="Android.Animation.Animator"/></returns>
+        public Android.Animation.Animator SetDuration(long arg0)
         {
-            get { return IExecuteWithSignature<long>("getDuration", "()J"); }
+            return IExecuteWithSignature<Android.Animation.Animator>("setDuration", "(J)Landroid/animation/Animator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getInterpolator()"/> <see href="https://developer.android.com/reference/android/animation/Animator.html#setInterpolator(android.animation.TimeInterpolator)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#isRunning()"/>
         /// </summary>
-        public Android.Animation.TimeInterpolator Interpolator
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRunning()
         {
-            get { return IExecuteWithSignature<Android.Animation.TimeInterpolator>("getInterpolator", "()Landroid/animation/TimeInterpolator;"); } set { IExecuteWithSignature("setInterpolator", "(Landroid/animation/TimeInterpolator;)V", value); }
+            return IExecuteWithSignature<bool>("isRunning", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getListeners()"/> 
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getDuration()"/>
         /// </summary>
-        public Java.Util.ArrayList<Android.Animation.Animator.AnimatorListener> Listeners
+        /// <returns><see cref="long"/></returns>
+        public long GetDuration()
         {
-            get { return IExecuteWithSignature<Java.Util.ArrayList<Android.Animation.Animator.AnimatorListener>>("getListeners", "()Ljava/util/ArrayList;"); }
+            return IExecuteWithSignature<long>("getDuration", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getStartDelay()"/> <see href="https://developer.android.com/reference/android/animation/Animator.html#setStartDelay(long)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getStartDelay()"/>
         /// </summary>
-        public long StartDelay
+        /// <returns><see cref="long"/></returns>
+        public long GetStartDelay()
         {
-            get { return IExecuteWithSignature<long>("getStartDelay", "()J"); } set { IExecuteWithSignature("setStartDelay", "(J)V", value); }
+            return IExecuteWithSignature<long>("getStartDelay", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getTotalDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#setInterpolator(android.animation.TimeInterpolator)"/>
         /// </summary>
-        public long TotalDuration
+        /// <param name="arg0"><see cref="Android.Animation.TimeInterpolator"/></param>
+        public void SetInterpolator(Android.Animation.TimeInterpolator arg0)
         {
-            get { return IExecuteWithSignature<long>("getTotalDuration", "()J"); }
+            IExecuteWithSignature("setInterpolator", "(Landroid/animation/TimeInterpolator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#setDuration(long)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#setStartDelay(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="Android.Animation.Animator"/></returns>
-        public Android.Animation.Animator SetDuration(long arg0)
+        public void SetStartDelay(long arg0)
         {
-            return IExecuteWithSignature<Android.Animation.Animator>("setDuration", "(J)Landroid/animation/Animator;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#isRunning()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRunning()
-        {
-            return IExecuteWithSignature<bool>("isRunning", "()Z");
+            IExecuteWithSignature("setStartDelay", "(J)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/Animator.html#clone()"/>
@@ -112,6 +109,14 @@ public Android.Animation.Animator Clone()
             return IExecuteWithSignature<Android.Animation.Animator>("clone", "()Landroid/animation/Animator;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getInterpolator()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Animation.TimeInterpolator"/></returns>
+        public Android.Animation.TimeInterpolator GetInterpolator()
+        {
+            return IExecuteWithSignature<Android.Animation.TimeInterpolator>("getInterpolator", "()Landroid/animation/TimeInterpolator;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/Animator.html#isPaused()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -128,6 +133,22 @@ public bool IsStarted()
             return IExecuteWithSignature<bool>("isStarted", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getListeners()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<Android.Animation.Animator.AnimatorListener> GetListeners()
+        {
+            return IExecuteWithSignature<Java.Util.ArrayList<Android.Animation.Animator.AnimatorListener>>("getListeners", "()Ljava/util/ArrayList;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/Animator.html#getTotalDuration()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalDuration()
+        {
+            return IExecuteWithSignature<long>("getTotalDuration", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/Animator.html#addListener(android.animation.Animator.AnimatorListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.Animator.AnimatorListener"/></param>
@@ -252,12 +273,12 @@ public partial class AnimatorListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAnimationCancel", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationCancelEventHandler));
-                AddEventHandler("onAnimationEnd", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationEndEventHandler));
-                AddEventHandler("onAnimationRepeat", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationRepeatEventHandler));
-                AddEventHandler("onAnimationStart", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationStartEventHandler));
-                AddEventHandler("onAnimationEnd2", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationEnd2EventHandler));
-                AddEventHandler("onAnimationStart2", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationStart2EventHandler));
+                AddEventHandler("onAnimationCancel", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationCancelEventHandler));
+                AddEventHandler("onAnimationEnd", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationEndEventHandler));
+                AddEventHandler("onAnimationRepeat", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationRepeatEventHandler));
+                AddEventHandler("onAnimationStart", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationStartEventHandler));
+                AddEventHandler("onAnimationEnd2", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationEnd2EventHandler));
+                AddEventHandler("onAnimationStart2", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationStart2EventHandler));
 
             }
 
@@ -265,7 +286,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationCancel(android.animation.Animator)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationCancel"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.Animator> OnOnAnimationCancel { get; set; } = null;
+            public global::System.Action<Android.Animation.Animator> OnOnAnimationCancel { get; set; } = null;
 
             void OnAnimationCancelEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
             {
@@ -286,7 +307,7 @@ public virtual void OnAnimationCancel(Android.Animation.Animator arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationEnd(android.animation.Animator)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationEnd"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.Animator> OnOnAnimationEnd { get; set; } = null;
+            public global::System.Action<Android.Animation.Animator> OnOnAnimationEnd { get; set; } = null;
 
             void OnAnimationEndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
             {
@@ -307,7 +328,7 @@ public virtual void OnAnimationEnd(Android.Animation.Animator arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationRepeat(android.animation.Animator)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationRepeat"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.Animator> OnOnAnimationRepeat { get; set; } = null;
+            public global::System.Action<Android.Animation.Animator> OnOnAnimationRepeat { get; set; } = null;
 
             void OnAnimationRepeatEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
             {
@@ -328,7 +349,7 @@ public virtual void OnAnimationRepeat(Android.Animation.Animator arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationStart(android.animation.Animator)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationStart"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.Animator> OnOnAnimationStart { get; set; } = null;
+            public global::System.Action<Android.Animation.Animator> OnOnAnimationStart { get; set; } = null;
 
             void OnAnimationStartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
             {
@@ -359,7 +380,7 @@ public void OnAnimationEndDefault(Android.Animation.Animator arg0, bool arg1)
             /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationEnd(android.animation.Animator,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationEnd2"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.Animator, bool> OnOnAnimationEnd2 { get; set; } = null;
+            public global::System.Action<Android.Animation.Animator, bool> OnOnAnimationEnd2 { get; set; } = null;
 
             void OnAnimationEnd2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
             {
@@ -392,7 +413,7 @@ public void OnAnimationStartDefault(Android.Animation.Animator arg0, bool arg1)
             /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationStart(android.animation.Animator,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationStart2"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.Animator, bool> OnOnAnimationStart2 { get; set; } = null;
+            public global::System.Action<Android.Animation.Animator, bool> OnOnAnimationStart2 { get; set; } = null;
 
             void OnAnimationStart2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
             {
@@ -527,8 +548,8 @@ public partial class AnimatorPauseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAnimationPause", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationPauseEventHandler));
-                AddEventHandler("onAnimationResume", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationResumeEventHandler));
+                AddEventHandler("onAnimationPause", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationPauseEventHandler));
+                AddEventHandler("onAnimationResume", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationResumeEventHandler));
 
             }
 
@@ -536,7 +557,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorPauseListener.html#onAnimationPause(android.animation.Animator)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationPause"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.Animator> OnOnAnimationPause { get; set; } = null;
+            public global::System.Action<Android.Animation.Animator> OnOnAnimationPause { get; set; } = null;
 
             void OnAnimationPauseEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
             {
@@ -557,7 +578,7 @@ public virtual void OnAnimationPause(Android.Animation.Animator arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorPauseListener.html#onAnimationResume(android.animation.Animator)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationResume"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.Animator> OnOnAnimationResume { get; set; } = null;
+            public global::System.Action<Android.Animation.Animator> OnOnAnimationResume { get; set; } = null;
 
             void OnAnimationResumeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Animation/AnimatorListenerAdapter.cs b/src/net/Netdroid/Generated/Android/Animation/AnimatorListenerAdapter.cs
index 7a334ab12..7bdca700e 100644
--- a/src/net/Netdroid/Generated/Android/Animation/AnimatorListenerAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/AnimatorListenerAdapter.cs
@@ -46,266 +46,10 @@ public partial class AnimatorListenerAdapter
 
         #region Instance methods
         /// <summary>
-        /// Handlers initializer for <see cref="AnimatorListenerAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onAnimationEnd", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationEndEventHandler));
-            AddEventHandler("onAnimationStart", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationStartEventHandler));
-            AddEventHandler("onAnimationCancel", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationCancelEventHandler));
-            AddEventHandler("onAnimationEnd1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationEnd1EventHandler));
-            AddEventHandler("onAnimationPause", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationPauseEventHandler));
-            AddEventHandler("onAnimationRepeat", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationRepeatEventHandler));
-            AddEventHandler("onAnimationResume", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationResumeEventHandler));
-            AddEventHandler("onAnimationStart1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.Animator>>>(OnAnimationStart1EventHandler));
-
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationEnd(android.animation.Animator,boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public void OnAnimationEndDefault(Android.Animation.Animator arg0, bool arg1)
-        {
-            IExecute("onAnimationEndDefault", arg0, arg1);
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationEnd(android.animation.Animator,boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAnimationEnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Animation.Animator, bool> OnOnAnimationEnd { get; set; } = null;
-
-        void OnAnimationEndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
-        {
-            var methodToExecute = (OnOnAnimationEnd != null) ? OnOnAnimationEnd : OnAnimationEnd;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<bool>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationEnd(android.animation.Animator,boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="OnAnimationEndDefault"/>; override the method to implement a different behavior</remarks>
-        public virtual void OnAnimationEnd(Android.Animation.Animator arg0, bool arg1)
-        {
-            OnAnimationEndDefault(arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationStart(android.animation.Animator,boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public void OnAnimationStartDefault(Android.Animation.Animator arg0, bool arg1)
-        {
-            IExecute("onAnimationStartDefault", arg0, arg1);
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationStart(android.animation.Animator,boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAnimationStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Animation.Animator, bool> OnOnAnimationStart { get; set; } = null;
-
-        void OnAnimationStartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
-        {
-            var methodToExecute = (OnOnAnimationStart != null) ? OnOnAnimationStart : OnAnimationStart;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<bool>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationStart(android.animation.Animator,boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="OnAnimationStartDefault"/>; override the method to implement a different behavior</remarks>
-        public virtual void OnAnimationStart(Android.Animation.Animator arg0, bool arg1)
-        {
-            OnAnimationStartDefault(arg0, arg1);
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationCancel(android.animation.Animator)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAnimationCancel"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Animation.Animator> OnOnAnimationCancel { get; set; } = null;
-
-        void OnAnimationCancelEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
-        {
-            var methodToExecute = (OnOnAnimationCancel != null) ? OnOnAnimationCancel : OnAnimationCancel;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationCancel(android.animation.Animator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public virtual void OnAnimationCancel(Android.Animation.Animator arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationEnd(android.animation.Animator)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAnimationEnd1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Animation.Animator> OnOnAnimationEnd1 { get; set; } = null;
-
-        void OnAnimationEnd1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
-        {
-            var methodToExecute = (OnOnAnimationEnd1 != null) ? OnOnAnimationEnd1 : OnAnimationEnd;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationEnd(android.animation.Animator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public virtual void OnAnimationEnd(Android.Animation.Animator arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationPause(android.animation.Animator)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAnimationPause"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Animation.Animator> OnOnAnimationPause { get; set; } = null;
-
-        void OnAnimationPauseEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
-        {
-            var methodToExecute = (OnOnAnimationPause != null) ? OnOnAnimationPause : OnAnimationPause;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationPause(android.animation.Animator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public virtual void OnAnimationPause(Android.Animation.Animator arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationRepeat(android.animation.Animator)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAnimationRepeat"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Animation.Animator> OnOnAnimationRepeat { get; set; } = null;
-
-        void OnAnimationRepeatEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
-        {
-            var methodToExecute = (OnOnAnimationRepeat != null) ? OnOnAnimationRepeat : OnAnimationRepeat;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationRepeat(android.animation.Animator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public virtual void OnAnimationRepeat(Android.Animation.Animator arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationResume(android.animation.Animator)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAnimationResume"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Animation.Animator> OnOnAnimationResume { get; set; } = null;
-
-        void OnAnimationResumeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
-        {
-            var methodToExecute = (OnOnAnimationResume != null) ? OnOnAnimationResume : OnAnimationResume;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationResume(android.animation.Animator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public virtual void OnAnimationResume(Android.Animation.Animator arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationStart(android.animation.Animator)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAnimationStart1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Animation.Animator> OnOnAnimationStart1 { get; set; } = null;
-
-        void OnAnimationStart1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.Animator>> data)
-        {
-            var methodToExecute = (OnOnAnimationStart1 != null) ? OnOnAnimationStart1 : OnAnimationStart;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationStart(android.animation.Animator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public virtual void OnAnimationStart(Android.Animation.Animator arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region AnimatorListenerAdapterDirect
-    public partial class AnimatorListenerAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationEnd(android.animation.Animator,boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        public override void OnAnimationEnd(Android.Animation.Animator arg0, bool arg1)
-        {
-            IExecute("onAnimationEnd", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Animator.AnimatorListener.html#onAnimationStart(android.animation.Animator,boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        public override void OnAnimationStart(Android.Animation.Animator arg0, bool arg1)
-        {
-            IExecute("onAnimationStart", arg0, arg1);
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationCancel(android.animation.Animator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public override void OnAnimationCancel(Android.Animation.Animator arg0)
+        public void OnAnimationCancel(Android.Animation.Animator arg0)
         {
             IExecuteWithSignature("onAnimationCancel", "(Landroid/animation/Animator;)V", arg0);
         }
@@ -313,7 +57,7 @@ public override void OnAnimationCancel(Android.Animation.Animator arg0)
         /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationEnd(android.animation.Animator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public override void OnAnimationEnd(Android.Animation.Animator arg0)
+        public void OnAnimationEnd(Android.Animation.Animator arg0)
         {
             IExecuteWithSignature("onAnimationEnd", "(Landroid/animation/Animator;)V", arg0);
         }
@@ -321,7 +65,7 @@ public override void OnAnimationEnd(Android.Animation.Animator arg0)
         /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationPause(android.animation.Animator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public override void OnAnimationPause(Android.Animation.Animator arg0)
+        public void OnAnimationPause(Android.Animation.Animator arg0)
         {
             IExecuteWithSignature("onAnimationPause", "(Landroid/animation/Animator;)V", arg0);
         }
@@ -329,7 +73,7 @@ public override void OnAnimationPause(Android.Animation.Animator arg0)
         /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationRepeat(android.animation.Animator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public override void OnAnimationRepeat(Android.Animation.Animator arg0)
+        public void OnAnimationRepeat(Android.Animation.Animator arg0)
         {
             IExecuteWithSignature("onAnimationRepeat", "(Landroid/animation/Animator;)V", arg0);
         }
@@ -337,7 +81,7 @@ public override void OnAnimationRepeat(Android.Animation.Animator arg0)
         /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationResume(android.animation.Animator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public override void OnAnimationResume(Android.Animation.Animator arg0)
+        public void OnAnimationResume(Android.Animation.Animator arg0)
         {
             IExecuteWithSignature("onAnimationResume", "(Landroid/animation/Animator;)V", arg0);
         }
@@ -345,7 +89,7 @@ public override void OnAnimationResume(Android.Animation.Animator arg0)
         /// <see href="https://developer.android.com/reference/android/animation/AnimatorListenerAdapter.html#onAnimationStart(android.animation.Animator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        public override void OnAnimationStart(Android.Animation.Animator arg0)
+        public void OnAnimationStart(Android.Animation.Animator arg0)
         {
             IExecuteWithSignature("onAnimationStart", "(Landroid/animation/Animator;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Animation/AnimatorSet.cs b/src/net/Netdroid/Generated/Android/Animation/AnimatorSet.cs
index ad92725f2..3e0fd8d4d 100644
--- a/src/net/Netdroid/Generated/Android/Animation/AnimatorSet.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/AnimatorSet.cs
@@ -46,27 +46,29 @@ public partial class AnimatorSet
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#getChildAnimations()"/> 
+        /// <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#play(android.animation.Animator)"/>
         /// </summary>
-        public Java.Util.ArrayList<Android.Animation.Animator> ChildAnimations
+        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
+        /// <returns><see cref="Android.Animation.AnimatorSet.Builder"/></returns>
+        public Android.Animation.AnimatorSet.Builder Play(Android.Animation.Animator arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.ArrayList<Android.Animation.Animator>>("getChildAnimations", "()Ljava/util/ArrayList;"); }
+            return IExecuteWithSignature<Android.Animation.AnimatorSet.Builder>("play", "(Landroid/animation/Animator;)Landroid/animation/AnimatorSet$Builder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#getCurrentPlayTime()"/> <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#setCurrentPlayTime(long)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#getChildAnimations()"/>
         /// </summary>
-        public long CurrentPlayTime
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<Android.Animation.Animator> GetChildAnimations()
         {
-            get { return IExecuteWithSignature<long>("getCurrentPlayTime", "()J"); } set { IExecuteWithSignature("setCurrentPlayTime", "(J)V", value); }
+            return IExecuteWithSignature<Java.Util.ArrayList<Android.Animation.Animator>>("getChildAnimations", "()Ljava/util/ArrayList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#play(android.animation.Animator)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#getCurrentPlayTime()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Animation.Animator"/></param>
-        /// <returns><see cref="Android.Animation.AnimatorSet.Builder"/></returns>
-        public Android.Animation.AnimatorSet.Builder Play(Android.Animation.Animator arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetCurrentPlayTime()
         {
-            return IExecuteWithSignature<Android.Animation.AnimatorSet.Builder>("play", "(Landroid/animation/Animator;)Landroid/animation/AnimatorSet$Builder;", arg0);
+            return IExecuteWithSignature<long>("getCurrentPlayTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#playSequentially(android.animation.Animator[])"/>
@@ -107,6 +109,14 @@ public void Reverse()
         {
             IExecuteWithSignature("reverse", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/AnimatorSet.html#setCurrentPlayTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetCurrentPlayTime(long arg0)
+        {
+            IExecuteWithSignature("setCurrentPlayTime", "(J)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Animation/Keyframe.cs b/src/net/Netdroid/Generated/Android/Animation/Keyframe.cs
index 51bfb77c0..ce82f9fdc 100644
--- a/src/net/Netdroid/Generated/Android/Animation/Keyframe.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/Keyframe.cs
@@ -103,40 +103,36 @@ public static Android.Animation.Keyframe OfObject(float arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#getFraction()"/> <see href="https://developer.android.com/reference/android/animation/Keyframe.html#setFraction(float)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#clone()"/>
         /// </summary>
-        public float Fraction
+        /// <returns><see cref="Android.Animation.Keyframe"/></returns>
+        public Android.Animation.Keyframe Clone()
         {
-            get { return IExecuteWithSignature<float>("getFraction", "()F"); } set { IExecuteWithSignature("setFraction", "(F)V", value); }
+            return IExecuteWithSignature<Android.Animation.Keyframe>("clone", "()Landroid/animation/Keyframe;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#getInterpolator()"/> <see href="https://developer.android.com/reference/android/animation/Keyframe.html#setInterpolator(android.animation.TimeInterpolator)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#getValue()"/>
         /// </summary>
-        public Android.Animation.TimeInterpolator Interpolator
+        /// <returns><see cref="object"/></returns>
+        public object GetValue()
         {
-            get { return IExecuteWithSignature<Android.Animation.TimeInterpolator>("getInterpolator", "()Landroid/animation/TimeInterpolator;"); } set { IExecuteWithSignature("setInterpolator", "(Landroid/animation/TimeInterpolator;)V", value); }
+            return IExecuteWithSignature("getValue", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#setValue(java.lang.Object)"/>
         /// </summary>
-        public Java.Lang.Class Type
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetValue(object arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;"); }
+            IExecuteWithSignature("setValue", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#getValue()"/> <see href="https://developer.android.com/reference/android/animation/Keyframe.html#setValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#getInterpolator()"/>
         /// </summary>
-        public object Value
+        /// <returns><see cref="Android.Animation.TimeInterpolator"/></returns>
+        public Android.Animation.TimeInterpolator GetInterpolator()
         {
-            get { return IExecuteWithSignature("getValue", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setValue", "(Ljava/lang/Object;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#clone()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Animation.Keyframe"/></returns>
-        public Android.Animation.Keyframe Clone()
-        {
-            return IExecuteWithSignature<Android.Animation.Keyframe>("clone", "()Landroid/animation/Keyframe;");
+            return IExecuteWithSignature<Android.Animation.TimeInterpolator>("getInterpolator", "()Landroid/animation/TimeInterpolator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#hasValue()"/>
@@ -146,6 +142,38 @@ public bool HasValue()
         {
             return IExecuteWithSignature<bool>("hasValue", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#getFraction()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetFraction()
+        {
+            return IExecuteWithSignature<float>("getFraction", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#setFraction(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetFraction(float arg0)
+        {
+            IExecuteWithSignature("setFraction", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/Keyframe.html#setInterpolator(android.animation.TimeInterpolator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Animation.TimeInterpolator"/></param>
+        public void SetInterpolator(Android.Animation.TimeInterpolator arg0)
+        {
+            IExecuteWithSignature("setInterpolator", "(Landroid/animation/TimeInterpolator;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Animation/LayoutTransition.cs b/src/net/Netdroid/Generated/Android/Animation/LayoutTransition.cs
index 55419317a..dd77d9097 100644
--- a/src/net/Netdroid/Generated/Android/Animation/LayoutTransition.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/LayoutTransition.cs
@@ -76,13 +76,6 @@ public partial class LayoutTransition
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/LayoutTransition.html#getTransitionListeners()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Animation.LayoutTransition.TransitionListener> TransitionListeners
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Animation.LayoutTransition.TransitionListener>>("getTransitionListeners", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/LayoutTransition.html#getAnimator(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -126,6 +119,14 @@ public bool IsTransitionTypeEnabled(int arg0)
             return IExecuteWithSignature<bool>("isTransitionTypeEnabled", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/LayoutTransition.html#getTransitionListeners()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Animation.LayoutTransition.TransitionListener> GetTransitionListeners()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Animation.LayoutTransition.TransitionListener>>("getTransitionListeners", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/LayoutTransition.html#getDuration(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -200,7 +201,7 @@ public void HideChild(Android.View.ViewGroup arg0, Android.View.View arg1, int a
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.ViewGroup"/></param>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void HideChild(Android.View.ViewGroup arg0, Android.View.View arg1)
         {
             IExecute("hideChild", arg0, arg1);
@@ -298,7 +299,7 @@ public void ShowChild(Android.View.ViewGroup arg0, Android.View.View arg1, int a
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.ViewGroup"/></param>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ShowChild(Android.View.ViewGroup arg0, Android.View.View arg1)
         {
             IExecute("showChild", arg0, arg1);
@@ -332,8 +333,8 @@ public partial class TransitionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("endTransition", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.LayoutTransition>>>(EndTransitionEventHandler));
-                AddEventHandler("startTransition", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.LayoutTransition>>>(StartTransitionEventHandler));
+                AddEventHandler("endTransition", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.LayoutTransition>>>(EndTransitionEventHandler));
+                AddEventHandler("startTransition", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.LayoutTransition>>>(StartTransitionEventHandler));
 
             }
 
@@ -341,7 +342,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/animation/LayoutTransition.TransitionListener.html#endTransition(android.animation.LayoutTransition,android.view.ViewGroup,android.view.View,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnEndTransition"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.LayoutTransition, Android.View.ViewGroup, Android.View.View, int> OnEndTransition { get; set; } = null;
+            public global::System.Action<Android.Animation.LayoutTransition, Android.View.ViewGroup, Android.View.View, int> OnEndTransition { get; set; } = null;
 
             void EndTransitionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.LayoutTransition>> data)
             {
@@ -365,7 +366,7 @@ public virtual void EndTransition(Android.Animation.LayoutTransition arg0, Andro
             /// Handler for <see href="https://developer.android.com/reference/android/animation/LayoutTransition.TransitionListener.html#startTransition(android.animation.LayoutTransition,android.view.ViewGroup,android.view.View,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnStartTransition"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.LayoutTransition, Android.View.ViewGroup, Android.View.View, int> OnStartTransition { get; set; } = null;
+            public global::System.Action<Android.Animation.LayoutTransition, Android.View.ViewGroup, Android.View.View, int> OnStartTransition { get; set; } = null;
 
             void StartTransitionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.LayoutTransition>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Animation/ObjectAnimator.cs b/src/net/Netdroid/Generated/Android/Animation/ObjectAnimator.cs
index d022b826c..55e82869c 100644
--- a/src/net/Netdroid/Generated/Android/Animation/ObjectAnimator.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/ObjectAnimator.cs
@@ -315,18 +315,20 @@ public static Android.Animation.ObjectAnimator OfPropertyValuesHolder(object arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ObjectAnimator.html#getPropertyName()"/> <see href="https://developer.android.com/reference/android/animation/ObjectAnimator.html#setPropertyName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/ObjectAnimator.html#getTarget()"/>
         /// </summary>
-        public Java.Lang.String PropertyName
+        /// <returns><see cref="object"/></returns>
+        public object GetTarget()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPropertyName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature("getTarget", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ObjectAnimator.html#getTarget()"/> 
+        /// <see href="https://developer.android.com/reference/android/animation/ObjectAnimator.html#getPropertyName()"/>
         /// </summary>
-        public object Target
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPropertyName()
         {
-            get { return IExecuteWithSignature("getTarget", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/ObjectAnimator.html#setAutoCancel(boolean)"/>
@@ -344,6 +346,14 @@ public void SetProperty(Android.Util.Property arg0)
         {
             IExecuteWithSignature("setProperty", "(Landroid/util/Property;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/ObjectAnimator.html#setPropertyName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPropertyName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPropertyName", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Animation/PropertyValuesHolder.cs b/src/net/Netdroid/Generated/Android/Animation/PropertyValuesHolder.cs
index 0d22c6e43..0bf399fb6 100644
--- a/src/net/Netdroid/Generated/Android/Animation/PropertyValuesHolder.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/PropertyValuesHolder.cs
@@ -258,13 +258,6 @@ public static Android.Animation.PropertyValuesHolder OfObject(Java.Lang.String a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/PropertyValuesHolder.html#getPropertyName()"/> <see href="https://developer.android.com/reference/android/animation/PropertyValuesHolder.html#setPropertyName(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String PropertyName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPropertyName", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/PropertyValuesHolder.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Android.Animation.PropertyValuesHolder"/></returns>
@@ -273,6 +266,14 @@ public Android.Animation.PropertyValuesHolder Clone()
             return IExecuteWithSignature<Android.Animation.PropertyValuesHolder>("clone", "()Landroid/animation/PropertyValuesHolder;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/PropertyValuesHolder.html#getPropertyName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPropertyName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/PropertyValuesHolder.html#setConverter(android.animation.TypeConverter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.TypeConverter"/></param>
@@ -328,6 +329,14 @@ public void SetProperty(Android.Util.Property arg0)
         {
             IExecuteWithSignature("setProperty", "(Landroid/util/Property;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/PropertyValuesHolder.html#setPropertyName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPropertyName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPropertyName", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Animation/TimeAnimator.cs b/src/net/Netdroid/Generated/Android/Animation/TimeAnimator.cs
index dc38ffef3..dcd535584 100644
--- a/src/net/Netdroid/Generated/Android/Animation/TimeAnimator.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/TimeAnimator.cs
@@ -82,7 +82,7 @@ public partial class TimeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTimeUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.TimeAnimator>>>(OnTimeUpdateEventHandler));
+                AddEventHandler("onTimeUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.TimeAnimator>>>(OnTimeUpdateEventHandler));
 
             }
 
@@ -90,7 +90,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/animation/TimeAnimator.TimeListener.html#onTimeUpdate(android.animation.TimeAnimator,long,long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTimeUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.TimeAnimator, long, long> OnOnTimeUpdate { get; set; } = null;
+            public global::System.Action<Android.Animation.TimeAnimator, long, long> OnOnTimeUpdate { get; set; } = null;
 
             void OnTimeUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.TimeAnimator>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Animation/ValueAnimator.cs b/src/net/Netdroid/Generated/Android/Animation/ValueAnimator.cs
index cf81cd294..e0720b541 100644
--- a/src/net/Netdroid/Generated/Android/Animation/ValueAnimator.cs
+++ b/src/net/Netdroid/Generated/Android/Animation/ValueAnimator.cs
@@ -60,20 +60,6 @@ public partial class ValueAnimator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getDurationScale()"/> 
-        /// </summary>
-        public static float DurationScale
-        {
-            get { return SExecuteWithSignature<float>(LocalBridgeClazz, "getDurationScale", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getFrameDelay()"/> <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setFrameDelay(long)"/>
-        /// </summary>
-        public static long FrameDelay
-        {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getFrameDelay", "()J"); } set { SExecuteWithSignature(LocalBridgeClazz, "setFrameDelay", "(J)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#ofArgb(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -145,51 +131,73 @@ public static bool UnregisterDurationScaleChangeListener(Android.Animation.Value
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "unregisterDurationScaleChangeListener", "(Landroid/animation/ValueAnimator$DurationScaleChangeListener;)Z", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getAnimatedFraction()"/> 
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getDurationScale()"/>
         /// </summary>
-        public float AnimatedFraction
+        /// <returns><see cref="float"/></returns>
+        public static float GetDurationScale()
         {
-            get { return IExecuteWithSignature<float>("getAnimatedFraction", "()F"); }
+            return SExecuteWithSignature<float>(LocalBridgeClazz, "getDurationScale", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getAnimatedValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getFrameDelay()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public static long GetFrameDelay()
+        {
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getFrameDelay", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setFrameDelay(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public static void SetFrameDelay(long arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setFrameDelay", "(J)V", arg0);
+        }
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getValues()"/>
         /// </summary>
-        public object AnimatedValue
+        /// <returns><see cref="Android.Animation.PropertyValuesHolder"/></returns>
+        public Android.Animation.PropertyValuesHolder[] GetValues()
         {
-            get { return IExecuteWithSignature("getAnimatedValue", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignatureArray<Android.Animation.PropertyValuesHolder>("getValues", "()[Landroid/animation/PropertyValuesHolder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getCurrentPlayTime()"/> <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setCurrentPlayTime(long)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getAnimatedFraction()"/>
         /// </summary>
-        public long CurrentPlayTime
+        /// <returns><see cref="float"/></returns>
+        public float GetAnimatedFraction()
         {
-            get { return IExecuteWithSignature<long>("getCurrentPlayTime", "()J"); } set { IExecuteWithSignature("setCurrentPlayTime", "(J)V", value); }
+            return IExecuteWithSignature<float>("getAnimatedFraction", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getRepeatCount()"/> <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setRepeatCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getRepeatCount()"/>
         /// </summary>
-        public int RepeatCount
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatCount()
         {
-            get { return IExecuteWithSignature<int>("getRepeatCount", "()I"); } set { IExecuteWithSignature("setRepeatCount", "(I)V", value); }
+            return IExecuteWithSignature<int>("getRepeatCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getRepeatMode()"/> <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setRepeatMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getRepeatMode()"/>
         /// </summary>
-        public int RepeatMode
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatMode()
         {
-            get { return IExecuteWithSignature<int>("getRepeatMode", "()I"); } set { IExecuteWithSignature("setRepeatMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("getRepeatMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getValues()"/> <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setValues(android.animation.PropertyValuesHolder[])"/>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getAnimatedValue()"/>
         /// </summary>
-        public Android.Animation.PropertyValuesHolder[] Values
+        /// <returns><see cref="object"/></returns>
+        public object GetAnimatedValue()
         {
-            get { return IExecuteWithSignatureArray<Android.Animation.PropertyValuesHolder>("getValues", "()[Landroid/animation/PropertyValuesHolder;"); } set { IExecuteWithSignature("setValues", "([Landroid/animation/PropertyValuesHolder;)V", value); }
+            return IExecuteWithSignature("getAnimatedValue", "()Ljava/lang/Object;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getAnimatedValue(java.lang.String)"/>
@@ -201,6 +209,14 @@ public object GetAnimatedValue(Java.Lang.String arg0)
             return IExecuteWithSignature("getAnimatedValue", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#getCurrentPlayTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetCurrentPlayTime()
+        {
+            return IExecuteWithSignature<long>("getCurrentPlayTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#addUpdateListener(android.animation.ValueAnimator.AnimatorUpdateListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.ValueAnimator.AnimatorUpdateListener"/></param>
@@ -239,6 +255,14 @@ public void SetCurrentFraction(float arg0)
             IExecuteWithSignature("setCurrentFraction", "(F)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setCurrentPlayTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetCurrentPlayTime(long arg0)
+        {
+            IExecuteWithSignature("setCurrentPlayTime", "(J)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setEvaluator(android.animation.TypeEvaluator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Animation.TypeEvaluator"/></param>
@@ -270,6 +294,30 @@ public void SetObjectValues(params object[] arg0)
         {
             if (arg0.Length == 0) IExecuteWithSignature("setObjectValues", "([Ljava/lang/Object;)V"); else IExecuteWithSignature("setObjectValues", "([Ljava/lang/Object;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setRepeatCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRepeatCount(int arg0)
+        {
+            IExecuteWithSignature("setRepeatCount", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setRepeatMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRepeatMode(int arg0)
+        {
+            IExecuteWithSignature("setRepeatMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/animation/ValueAnimator.html#setValues(android.animation.PropertyValuesHolder[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Animation.PropertyValuesHolder"/></param>
+        public void SetValues(params Android.Animation.PropertyValuesHolder[] arg0)
+        {
+            if (arg0.Length == 0) IExecuteWithSignature("setValues", "([Landroid/animation/PropertyValuesHolder;)V"); else IExecuteWithSignature("setValues", "([Landroid/animation/PropertyValuesHolder;)V", arg0);
+        }
 
         #endregion
 
@@ -299,7 +347,7 @@ public partial class AnimatorUpdateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAnimationUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.ValueAnimator>>>(OnAnimationUpdateEventHandler));
+                AddEventHandler("onAnimationUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Animation.ValueAnimator>>>(OnAnimationUpdateEventHandler));
 
             }
 
@@ -307,7 +355,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/animation/ValueAnimator.AnimatorUpdateListener.html#onAnimationUpdate(android.animation.ValueAnimator)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Animation.ValueAnimator> OnOnAnimationUpdate { get; set; } = null;
+            public global::System.Action<Android.Animation.ValueAnimator> OnOnAnimationUpdate { get; set; } = null;
 
             void OnAnimationUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Animation.ValueAnimator>> data)
             {
@@ -398,7 +446,7 @@ public partial class DurationScaleChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<float>>>(OnChangedEventHandler));
+                AddEventHandler("onChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<float>>>(OnChangedEventHandler));
 
             }
 
@@ -406,7 +454,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/animation/ValueAnimator.DurationScaleChangeListener.html#onChanged(float)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<float> OnOnChanged { get; set; } = null;
+            public global::System.Action<float> OnOnChanged { get; set; } = null;
 
             void OnChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<float>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Annotation/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Annotation/AllPackageClasses.cs
index 13f732b8a..eee9815f8 100644
--- a/src/net/Netdroid/Generated/Android/Annotation/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Annotation/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class SuppressLint : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SuppressLint class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SuppressLint class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SuppressLint() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SuppressLint class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SuppressLint class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SuppressLint(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -82,12 +82,12 @@ public partial class TargetApi : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TargetApi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TargetApi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TargetApi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TargetApi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TargetApi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TargetApi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/ActionBar.cs b/src/net/Netdroid/Generated/Android/App/ActionBar.cs
index e7bf4ad0d..1695f1bdf 100644
--- a/src/net/Netdroid/Generated/Android/App/ActionBar.cs
+++ b/src/net/Netdroid/Generated/Android/App/ActionBar.cs
@@ -70,21 +70,21 @@ public partial class ActionBar
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#NAVIGATION_MODE_LIST"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NAVIGATION_MODE_LIST { get { if (!_NAVIGATION_MODE_LISTReady) { _NAVIGATION_MODE_LISTContent = SGetField<int>(LocalBridgeClazz, "NAVIGATION_MODE_LIST"); _NAVIGATION_MODE_LISTReady = true; } return _NAVIGATION_MODE_LISTContent; } }
         private static int _NAVIGATION_MODE_LISTContent = default;
         private static bool _NAVIGATION_MODE_LISTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#NAVIGATION_MODE_STANDARD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NAVIGATION_MODE_STANDARD { get { if (!_NAVIGATION_MODE_STANDARDReady) { _NAVIGATION_MODE_STANDARDContent = SGetField<int>(LocalBridgeClazz, "NAVIGATION_MODE_STANDARD"); _NAVIGATION_MODE_STANDARDReady = true; } return _NAVIGATION_MODE_STANDARDContent; } }
         private static int _NAVIGATION_MODE_STANDARDContent = default;
         private static bool _NAVIGATION_MODE_STANDARDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#NAVIGATION_MODE_TABS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NAVIGATION_MODE_TABS { get { if (!_NAVIGATION_MODE_TABSReady) { _NAVIGATION_MODE_TABSContent = SGetField<int>(LocalBridgeClazz, "NAVIGATION_MODE_TABS"); _NAVIGATION_MODE_TABSReady = true; } return _NAVIGATION_MODE_TABSContent; } }
         private static int _NAVIGATION_MODE_TABSContent = default;
         private static bool _NAVIGATION_MODE_TABSReady = false; // this is used because in case of generics 
@@ -97,127 +97,116 @@ public partial class ActionBar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getCustomView()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getSelectedTab()"/>
         /// </summary>
-        public Android.View.View CustomView
-        {
-            get { return IExecuteWithSignature<Android.View.View>("getCustomView", "()Landroid/view/View;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getDisplayOptions()"/> <see href="https://developer.android.com/reference/android/app/ActionBar.html#setDisplayOptions(int)"/>
-        /// </summary>
-        public int DisplayOptions
+        /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.ActionBar.Tab GetSelectedTab()
         {
-            get { return IExecuteWithSignature<int>("getDisplayOptions", "()I"); } set { IExecuteWithSignature("setDisplayOptions", "(I)V", value); }
+            return IExecuteWithSignature<Android.App.ActionBar.Tab>("getSelectedTab", "()Landroid/app/ActionBar$Tab;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getElevation()"/> <see href="https://developer.android.com/reference/android/app/ActionBar.html#setElevation(float)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getTabAt(int)"/>
         /// </summary>
-        public float Elevation
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.ActionBar.Tab GetTabAt(int arg0)
         {
-            get { return IExecuteWithSignature<float>("getElevation", "()F"); } set { IExecuteWithSignature("setElevation", "(F)V", value); }
+            return IExecuteWithSignature<Android.App.ActionBar.Tab>("getTabAt", "(I)Landroid/app/ActionBar$Tab;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#newTab()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.ActionBar.Tab NewTab()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<Android.App.ActionBar.Tab>("newTab", "()Landroid/app/ActionBar$Tab;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getHideOffset()"/> <see href="https://developer.android.com/reference/android/app/ActionBar.html#setHideOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getCustomView()"/>
         /// </summary>
-        public int HideOffset
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetCustomView()
         {
-            get { return IExecuteWithSignature<int>("getHideOffset", "()I"); } set { IExecuteWithSignature("setHideOffset", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.View>("getCustomView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getNavigationItemCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#isShowing()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int NavigationItemCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsShowing()
         {
-            get { return IExecuteWithSignature<int>("getNavigationItemCount", "()I"); }
+            return IExecuteWithSignature<bool>("isShowing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getNavigationMode()"/> <see href="https://developer.android.com/reference/android/app/ActionBar.html#setNavigationMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getDisplayOptions()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int NavigationMode
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayOptions()
         {
-            get { return IExecuteWithSignature<int>("getNavigationMode", "()I"); } set { IExecuteWithSignature("setNavigationMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDisplayOptions", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getSelectedNavigationIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getHeight()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SelectedNavigationIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getSelectedNavigationIndex", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getSelectedTab()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getNavigationItemCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.ActionBar.Tab SelectedTab
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetNavigationItemCount()
         {
-            get { return IExecuteWithSignature<Android.App.ActionBar.Tab>("getSelectedTab", "()Landroid/app/ActionBar$Tab;"); }
+            return IExecuteWithSignature<int>("getNavigationItemCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getSubtitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getNavigationMode()"/>
         /// </summary>
-        public Java.Lang.CharSequence Subtitle
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetNavigationMode()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getNavigationMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getTabCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getSelectedNavigationIndex()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int TabCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSelectedNavigationIndex()
         {
-            get { return IExecuteWithSignature<int>("getTabCount", "()I"); }
+            return IExecuteWithSignature<int>("getSelectedNavigationIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getThemedContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getTabCount()"/>
         /// </summary>
-        public Android.Content.Context ThemedContext
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetTabCount()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getThemedContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<int>("getTabCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getSubtitle()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSubtitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getTabAt(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getTitle()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-        [System.Obsolete()]
-        public Android.App.ActionBar.Tab GetTabAt(int arg0)
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            return IExecuteWithSignature<Android.App.ActionBar.Tab>("getTabAt", "(I)Landroid/app/ActionBar$Tab;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#newTab()"/>
-        /// </summary>
-        /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-        [System.Obsolete()]
-        public Android.App.ActionBar.Tab NewTab()
-        {
-            return IExecuteWithSignature<Android.App.ActionBar.Tab>("newTab", "()Landroid/app/ActionBar$Tab;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#isShowing()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsShowing()
-        {
-            return IExecuteWithSignature<bool>("isShowing", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#addOnMenuVisibilityListener(android.app.ActionBar.OnMenuVisibilityListener)"/>
@@ -232,7 +221,7 @@ public void AddOnMenuVisibilityListener(Android.App.ActionBar.OnMenuVisibilityLi
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddTab(Android.App.ActionBar.Tab arg0, bool arg1)
         {
             IExecute("addTab", arg0, arg1);
@@ -243,7 +232,7 @@ public void AddTab(Android.App.ActionBar.Tab arg0, bool arg1)
         /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddTab(Android.App.ActionBar.Tab arg0, int arg1, bool arg2)
         {
             IExecute("addTab", arg0, arg1, arg2);
@@ -253,7 +242,7 @@ public void AddTab(Android.App.ActionBar.Tab arg0, int arg1, bool arg2)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddTab(Android.App.ActionBar.Tab arg0, int arg1)
         {
             IExecute("addTab", arg0, arg1);
@@ -262,7 +251,7 @@ public void AddTab(Android.App.ActionBar.Tab arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#addTab(android.app.ActionBar.Tab)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddTab(Android.App.ActionBar.Tab arg0)
         {
             IExecuteWithSignature("addTab", "(Landroid/app/ActionBar$Tab;)V", arg0);
@@ -277,7 +266,7 @@ public void Hide()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#removeAllTabs()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveAllTabs()
         {
             IExecuteWithSignature("removeAllTabs", "()V");
@@ -294,7 +283,7 @@ public void RemoveOnMenuVisibilityListener(Android.App.ActionBar.OnMenuVisibilit
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#removeTab(android.app.ActionBar.Tab)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveTab(Android.App.ActionBar.Tab arg0)
         {
             IExecuteWithSignature("removeTab", "(Landroid/app/ActionBar$Tab;)V", arg0);
@@ -303,7 +292,7 @@ public void RemoveTab(Android.App.ActionBar.Tab arg0)
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#removeTabAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveTabAt(int arg0)
         {
             IExecuteWithSignature("removeTabAt", "(I)V", arg0);
@@ -312,7 +301,7 @@ public void RemoveTabAt(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#selectTab(android.app.ActionBar.Tab)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SelectTab(Android.App.ActionBar.Tab arg0)
         {
             IExecuteWithSignature("selectTab", "(Landroid/app/ActionBar$Tab;)V", arg0);
@@ -368,6 +357,14 @@ public void SetDisplayOptions(int arg0, int arg1)
             IExecute("setDisplayOptions", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#setDisplayOptions(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDisplayOptions(int arg0)
+        {
+            IExecuteWithSignature("setDisplayOptions", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#setDisplayShowCustomEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -420,7 +417,7 @@ public void SetIcon(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SpinnerAdapter"/></param>
         /// <param name="arg1"><see cref="Android.App.ActionBar.OnNavigationListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetListNavigationCallbacks(Android.Widget.SpinnerAdapter arg0, Android.App.ActionBar.OnNavigationListener arg1)
         {
             IExecute("setListNavigationCallbacks", arg0, arg1);
@@ -442,10 +439,19 @@ public void SetLogo(int arg0)
             IExecuteWithSignature("setLogo", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#setNavigationMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetNavigationMode(int arg0)
+        {
+            IExecuteWithSignature("setNavigationMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#setSelectedNavigationItem(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSelectedNavigationItem(int arg0)
         {
             IExecuteWithSignature("setSelectedNavigationItem", "(I)V", arg0);
@@ -490,6 +496,14 @@ public void Show()
             IExecuteWithSignature("show", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getThemedContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetThemedContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getThemedContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#isHideOnContentScrollEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -498,6 +512,38 @@ public bool IsHideOnContentScrollEnabled()
             return IExecuteWithSignature<bool>("isHideOnContentScrollEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getElevation()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetElevation()
+        {
+            return IExecuteWithSignature<float>("getElevation", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#getHideOffset()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHideOffset()
+        {
+            return IExecuteWithSignature<int>("getHideOffset", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#setElevation(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetElevation(float arg0)
+        {
+            IExecuteWithSignature("setElevation", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#setHideOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHideOffset(int arg0)
+        {
+            IExecuteWithSignature("setHideOffset", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.html#setHideOnContentScrollEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -677,7 +723,7 @@ public partial class OnMenuVisibilityListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMenuVisibilityChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnMenuVisibilityChangedEventHandler));
+                AddEventHandler("onMenuVisibilityChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnMenuVisibilityChangedEventHandler));
 
             }
 
@@ -685,7 +731,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/ActionBar.OnMenuVisibilityListener.html#onMenuVisibilityChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMenuVisibilityChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnMenuVisibilityChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnMenuVisibilityChanged { get; set; } = null;
 
             void OnMenuVisibilityChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -776,7 +822,7 @@ public partial class OnNavigationListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onNavigationItemSelected", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnNavigationItemSelectedEventHandler));
+                AddEventHandler("onNavigationItemSelected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnNavigationItemSelectedEventHandler));
 
             }
 
@@ -784,7 +830,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/ActionBar.OnNavigationListener.html#onNavigationItemSelected(int,long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnNavigationItemSelected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<int, long, bool> OnOnNavigationItemSelected { get; set; } = null;
+            public global::System.Func<int, long, bool> OnOnNavigationItemSelected { get; set; } = null;
 
             void OnNavigationItemSelectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -799,7 +845,7 @@ void OnNavigationItemSelectedEventHandler(object sender, CLRListenerEventArgs<CL
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="long"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual bool OnNavigationItemSelected(int arg0, long arg1)
             {
                 return default;
@@ -841,7 +887,7 @@ public partial class OnNavigationListenerDirect
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="long"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override bool OnNavigationItemSelected(int arg0, long arg1)
             {
                 return IExecute<bool>("onNavigationItemSelected", arg0, arg1);
@@ -872,7 +918,7 @@ public partial class Tab
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#INVALID_POSITION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int INVALID_POSITION { get { if (!_INVALID_POSITIONReady) { _INVALID_POSITIONContent = SGetField<int>(LocalBridgeClazz, "INVALID_POSITION"); _INVALID_POSITIONReady = true; } return _INVALID_POSITIONContent; } }
             private static int _INVALID_POSITIONContent = default;
             private static bool _INVALID_POSITIONReady = false; // this is used because in case of generics 
@@ -885,59 +931,11 @@ public partial class Tab
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getContentDescription()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence ContentDescription
-            {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getCustomView()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Android.View.View CustomView
-            {
-                get { return IExecuteWithSignature<Android.View.View>("getCustomView", "()Landroid/view/View;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getIcon()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Android.Graphics.Drawable.Drawable Icon
-            {
-                get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "()Landroid/graphics/drawable/Drawable;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getPosition()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public int Position
-            {
-                get { return IExecuteWithSignature<int>("getPosition", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getTag()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public object Tag
-            {
-                get { return IExecuteWithSignature("getTag", "()Ljava/lang/Object;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getText()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence Text
-            {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#setContentDescription(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetContentDescription(int arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setContentDescription", "(I)Landroid/app/ActionBar$Tab;", arg0);
@@ -947,7 +945,7 @@ public Android.App.ActionBar.Tab SetContentDescription(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetContentDescription(Java.Lang.CharSequence arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setContentDescription", "(Ljava/lang/CharSequence;)Landroid/app/ActionBar$Tab;", arg0);
@@ -957,7 +955,7 @@ public Android.App.ActionBar.Tab SetContentDescription(Java.Lang.CharSequence ar
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.View"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetCustomView(Android.View.View arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setCustomView", "(Landroid/view/View;)Landroid/app/ActionBar$Tab;", arg0);
@@ -967,7 +965,7 @@ public Android.App.ActionBar.Tab SetCustomView(Android.View.View arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetCustomView(int arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setCustomView", "(I)Landroid/app/ActionBar$Tab;", arg0);
@@ -977,7 +975,7 @@ public Android.App.ActionBar.Tab SetCustomView(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetIcon(Android.Graphics.Drawable.Drawable arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setIcon", "(Landroid/graphics/drawable/Drawable;)Landroid/app/ActionBar$Tab;", arg0);
@@ -987,7 +985,7 @@ public Android.App.ActionBar.Tab SetIcon(Android.Graphics.Drawable.Drawable arg0
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetIcon(int arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setIcon", "(I)Landroid/app/ActionBar$Tab;", arg0);
@@ -997,7 +995,7 @@ public Android.App.ActionBar.Tab SetIcon(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.ActionBar.TabListener"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetTabListener(Android.App.ActionBar.TabListener arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setTabListener", "(Landroid/app/ActionBar$TabListener;)Landroid/app/ActionBar$Tab;", arg0);
@@ -1007,7 +1005,7 @@ public Android.App.ActionBar.Tab SetTabListener(Android.App.ActionBar.TabListene
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetTag(object arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setTag", "(Ljava/lang/Object;)Landroid/app/ActionBar$Tab;", arg0);
@@ -1017,7 +1015,7 @@ public Android.App.ActionBar.Tab SetTag(object arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetText(int arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setText", "(I)Landroid/app/ActionBar$Tab;", arg0);
@@ -1027,15 +1025,69 @@ public Android.App.ActionBar.Tab SetText(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Android.App.ActionBar.Tab"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.ActionBar.Tab SetText(Java.Lang.CharSequence arg0)
             {
                 return IExecuteWithSignature<Android.App.ActionBar.Tab>("setText", "(Ljava/lang/CharSequence;)Landroid/app/ActionBar$Tab;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getIcon()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+            [global::System.Obsolete()]
+            public Android.Graphics.Drawable.Drawable GetIcon()
+            {
+                return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "()Landroid/graphics/drawable/Drawable;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getCustomView()"/>
+            /// </summary>
+            /// <returns><see cref="Android.View.View"/></returns>
+            [global::System.Obsolete()]
+            public Android.View.View GetCustomView()
+            {
+                return IExecuteWithSignature<Android.View.View>("getCustomView", "()Landroid/view/View;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getPosition()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetPosition()
+            {
+                return IExecuteWithSignature<int>("getPosition", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getContentDescription()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetContentDescription()
+            {
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getText()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetText()
+            {
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#getTag()"/>
+            /// </summary>
+            /// <returns><see cref="object"/></returns>
+            [global::System.Obsolete()]
+            public object GetTag()
+            {
+                return IExecuteWithSignature("getTag", "()Ljava/lang/Object;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html#select()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Select()
             {
                 IExecuteWithSignature("select", "()V");
@@ -1076,9 +1128,9 @@ public partial class TabListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTabReselected", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>>>(OnTabReselectedEventHandler));
-                AddEventHandler("onTabSelected", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>>>(OnTabSelectedEventHandler));
-                AddEventHandler("onTabUnselected", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>>>(OnTabUnselectedEventHandler));
+                AddEventHandler("onTabReselected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>>>(OnTabReselectedEventHandler));
+                AddEventHandler("onTabSelected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>>>(OnTabSelectedEventHandler));
+                AddEventHandler("onTabUnselected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>>>(OnTabUnselectedEventHandler));
 
             }
 
@@ -1086,7 +1138,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/ActionBar.TabListener.html#onTabReselected(android.app.ActionBar.Tab,android.app.FragmentTransaction)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTabReselected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.App.ActionBar.Tab, Android.App.FragmentTransaction> OnOnTabReselected { get; set; } = null;
+            public global::System.Action<Android.App.ActionBar.Tab, Android.App.FragmentTransaction> OnOnTabReselected { get; set; } = null;
 
             void OnTabReselectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>> data)
             {
@@ -1099,7 +1151,7 @@ void OnTabReselectedEventHandler(object sender, CLRListenerEventArgs<CLREventDat
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
             /// <param name="arg1"><see cref="Android.App.FragmentTransaction"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnTabReselected(Android.App.ActionBar.Tab arg0, Android.App.FragmentTransaction arg1)
             {
                 
@@ -1109,7 +1161,7 @@ public virtual void OnTabReselected(Android.App.ActionBar.Tab arg0, Android.App.
             /// Handler for <see href="https://developer.android.com/reference/android/app/ActionBar.TabListener.html#onTabSelected(android.app.ActionBar.Tab,android.app.FragmentTransaction)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTabSelected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.App.ActionBar.Tab, Android.App.FragmentTransaction> OnOnTabSelected { get; set; } = null;
+            public global::System.Action<Android.App.ActionBar.Tab, Android.App.FragmentTransaction> OnOnTabSelected { get; set; } = null;
 
             void OnTabSelectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>> data)
             {
@@ -1122,7 +1174,7 @@ void OnTabSelectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
             /// <param name="arg1"><see cref="Android.App.FragmentTransaction"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnTabSelected(Android.App.ActionBar.Tab arg0, Android.App.FragmentTransaction arg1)
             {
                 
@@ -1132,7 +1184,7 @@ public virtual void OnTabSelected(Android.App.ActionBar.Tab arg0, Android.App.Fr
             /// Handler for <see href="https://developer.android.com/reference/android/app/ActionBar.TabListener.html#onTabUnselected(android.app.ActionBar.Tab,android.app.FragmentTransaction)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTabUnselected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.App.ActionBar.Tab, Android.App.FragmentTransaction> OnOnTabUnselected { get; set; } = null;
+            public global::System.Action<Android.App.ActionBar.Tab, Android.App.FragmentTransaction> OnOnTabUnselected { get; set; } = null;
 
             void OnTabUnselectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.ActionBar.Tab>> data)
             {
@@ -1145,7 +1197,7 @@ void OnTabUnselectedEventHandler(object sender, CLRListenerEventArgs<CLREventDat
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
             /// <param name="arg1"><see cref="Android.App.FragmentTransaction"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnTabUnselected(Android.App.ActionBar.Tab arg0, Android.App.FragmentTransaction arg1)
             {
                 
@@ -1186,7 +1238,7 @@ public partial class TabListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
             /// <param name="arg1"><see cref="Android.App.FragmentTransaction"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnTabReselected(Android.App.ActionBar.Tab arg0, Android.App.FragmentTransaction arg1)
             {
                 IExecute("onTabReselected", arg0, arg1);
@@ -1196,7 +1248,7 @@ public override void OnTabReselected(Android.App.ActionBar.Tab arg0, Android.App
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
             /// <param name="arg1"><see cref="Android.App.FragmentTransaction"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnTabSelected(Android.App.ActionBar.Tab arg0, Android.App.FragmentTransaction arg1)
             {
                 IExecute("onTabSelected", arg0, arg1);
@@ -1206,7 +1258,7 @@ public override void OnTabSelected(Android.App.ActionBar.Tab arg0, Android.App.F
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.ActionBar.Tab"/></param>
             /// <param name="arg1"><see cref="Android.App.FragmentTransaction"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnTabUnselected(Android.App.ActionBar.Tab arg0, Android.App.FragmentTransaction arg1)
             {
                 IExecute("onTabUnselected", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/App/Activity.cs b/src/net/Netdroid/Generated/Android/App/Activity.cs
index 593a64516..410fff94b 100644
--- a/src/net/Netdroid/Generated/Android/App/Activity.cs
+++ b/src/net/Netdroid/Generated/Android/App/Activity.cs
@@ -122,283 +122,132 @@ public partial class Activity : Android.Content.IComponentCallbacks2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getActionBar()"/> <see href="https://developer.android.com/reference/android/app/Activity.html#setActionBar(android.widget.Toolbar)"/>
-        /// </summary>
-        public Android.App.ActionBar ActionBar
-        {
-            get { return IExecuteWithSignature<Android.App.ActionBar>("getActionBar", "()Landroid/app/ActionBar;"); } set { IExecuteWithSignature("setActionBar", "(Landroid/widget/Toolbar;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getApplication()"/> 
-        /// </summary>
-        public Android.App.Application Application
-        {
-            get { return IExecuteWithSignature<Android.App.Application>("getApplication", "()Landroid/app/Application;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getCallingActivity()"/> 
-        /// </summary>
-        public Android.Content.ComponentName CallingActivity
-        {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getCallingActivity", "()Landroid/content/ComponentName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getCallingPackage()"/> 
-        /// </summary>
-        public Java.Lang.String CallingPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getChangingConfigurations()"/> 
-        /// </summary>
-        public int ChangingConfigurations
-        {
-            get { return IExecuteWithSignature<int>("getChangingConfigurations", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getComponentName()"/> 
-        /// </summary>
-        public Android.Content.ComponentName ComponentName
-        {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getContentScene()"/> 
-        /// </summary>
-        public Android.Transition.Scene ContentScene
-        {
-            get { return IExecuteWithSignature<Android.Transition.Scene>("getContentScene", "()Landroid/transition/Scene;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getContentTransitionManager()"/> <see href="https://developer.android.com/reference/android/app/Activity.html#setContentTransitionManager(android.transition.TransitionManager)"/>
-        /// </summary>
-        public Android.Transition.TransitionManager ContentTransitionManager
-        {
-            get { return IExecuteWithSignature<Android.Transition.TransitionManager>("getContentTransitionManager", "()Landroid/transition/TransitionManager;"); } set { IExecuteWithSignature("setContentTransitionManager", "(Landroid/transition/TransitionManager;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getCurrentFocus()"/> 
-        /// </summary>
-        public Android.View.View CurrentFocus
-        {
-            get { return IExecuteWithSignature<Android.View.View>("getCurrentFocus", "()Landroid/view/View;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getFragmentManager()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.App.FragmentManager FragmentManager
-        {
-            get { return IExecuteWithSignature<Android.App.FragmentManager>("getFragmentManager", "()Landroid/app/FragmentManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getIntent()"/> <see href="https://developer.android.com/reference/android/app/Activity.html#setIntent(android.content.Intent)"/>
-        /// </summary>
-        public Android.Content.Intent Intent
-        {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); } set { IExecuteWithSignature("setIntent", "(Landroid/content/Intent;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLastNonConfigurationInstance()"/> 
-        /// </summary>
-        public object LastNonConfigurationInstance
-        {
-            get { return IExecuteWithSignature("getLastNonConfigurationInstance", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLaunchedFromPackage()"/> 
-        /// </summary>
-        public Java.Lang.String LaunchedFromPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLaunchedFromPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLaunchedFromUid()"/> 
-        /// </summary>
-        public int LaunchedFromUid
-        {
-            get { return IExecuteWithSignature<int>("getLaunchedFromUid", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLayoutInflater()"/> 
-        /// </summary>
-        public Android.View.LayoutInflater LayoutInflater
-        {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLoaderManager()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.App.LoaderManager LoaderManager
-        {
-            get { return IExecuteWithSignature<Android.App.LoaderManager>("getLoaderManager", "()Landroid/app/LoaderManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLocalClassName()"/> 
-        /// </summary>
-        public Java.Lang.String LocalClassName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocalClassName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getMaxNumPictureInPictureActions()"/> 
-        /// </summary>
-        public int MaxNumPictureInPictureActions
-        {
-            get { return IExecuteWithSignature<int>("getMaxNumPictureInPictureActions", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getMediaController()"/> <see href="https://developer.android.com/reference/android/app/Activity.html#setMediaController(android.media.session.MediaController)"/>
-        /// </summary>
-        public Android.Media.Session.MediaController MediaController
-        {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaController>("getMediaController", "()Landroid/media/session/MediaController;"); } set { IExecuteWithSignature("setMediaController", "(Landroid/media/session/MediaController;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getMenuInflater()"/> 
-        /// </summary>
-        public Android.View.MenuInflater MenuInflater
-        {
-            get { return IExecuteWithSignature<Android.View.MenuInflater>("getMenuInflater", "()Landroid/view/MenuInflater;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getOnBackInvokedDispatcher()"/> 
-        /// </summary>
-        public Android.Window.OnBackInvokedDispatcher OnBackInvokedDispatcher
-        {
-            get { return IExecuteWithSignature<Android.Window.OnBackInvokedDispatcher>("getOnBackInvokedDispatcher", "()Landroid/window/OnBackInvokedDispatcher;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getParent()"/> 
-        /// </summary>
-        public Android.App.Activity Parent
-        {
-            get { return IExecuteWithSignature<Android.App.Activity>("getParent", "()Landroid/app/Activity;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getParentActivityIntent()"/> 
-        /// </summary>
-        public Android.Content.Intent ParentActivityIntent
-        {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getParentActivityIntent", "()Landroid/content/Intent;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getReferrer()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#findViewById(int)"/>
         /// </summary>
-        public Android.Net.Uri Referrer
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T FindViewById<T>(int arg0) where T : Android.View.View
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getReferrer", "()Landroid/net/Uri;"); }
+            return IExecute<T>("findViewById", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getRequestedOrientation()"/> <see href="https://developer.android.com/reference/android/app/Activity.html#setRequestedOrientation(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getActionBar()"/>
         /// </summary>
-        public int RequestedOrientation
+        /// <returns><see cref="Android.App.ActionBar"/></returns>
+        public Android.App.ActionBar GetActionBar()
         {
-            get { return IExecuteWithSignature<int>("getRequestedOrientation", "()I"); } set { IExecuteWithSignature("setRequestedOrientation", "(I)V", value); }
+            return IExecuteWithSignature<Android.App.ActionBar>("getActionBar", "()Landroid/app/ActionBar;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getSearchEvent()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getFragmentManager()"/>
         /// </summary>
-        public Android.View.SearchEvent SearchEvent
+        /// <returns><see cref="Android.App.FragmentManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.FragmentManager GetFragmentManager()
         {
-            get { return IExecuteWithSignature<Android.View.SearchEvent>("getSearchEvent", "()Landroid/view/SearchEvent;"); }
+            return IExecuteWithSignature<Android.App.FragmentManager>("getFragmentManager", "()Landroid/app/FragmentManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getSplashScreen()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLoaderManager()"/>
         /// </summary>
-        public Android.Window.SplashScreen SplashScreen
+        /// <returns><see cref="Android.App.LoaderManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.LoaderManager GetLoaderManager()
         {
-            get { return IExecuteWithSignature<Android.Window.SplashScreen>("getSplashScreen", "()Landroid/window/SplashScreen;"); }
+            return IExecuteWithSignature<Android.App.LoaderManager>("getLoaderManager", "()Landroid/app/LoaderManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getTaskId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#createPendingResult(int,android.content.Intent,int)"/>
         /// </summary>
-        public int TaskId
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent CreatePendingResult(int arg0, Android.Content.Intent arg1, int arg2)
         {
-            get { return IExecuteWithSignature<int>("getTaskId", "()I"); }
+            return IExecute<Android.App.PendingIntent>("createPendingResult", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getVoiceInteractor()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="Android.App.VoiceInteractor"/></returns>
+        public Android.App.VoiceInteractor GetVoiceInteractor()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.App.VoiceInteractor>("getVoiceInteractor", "()Landroid/app/VoiceInteractor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getTitleColor()"/> <see href="https://developer.android.com/reference/android/app/Activity.html#setTitleColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getCallingActivity()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int TitleColor
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetCallingActivity()
         {
-            get { return IExecuteWithSignature<int>("getTitleColor", "()I"); } set { IExecuteWithSignature("setTitleColor", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getCallingActivity", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getVoiceInteractor()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getComponentName()"/>
         /// </summary>
-        public Android.App.VoiceInteractor VoiceInteractor
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponentName()
         {
-            get { return IExecuteWithSignature<Android.App.VoiceInteractor>("getVoiceInteractor", "()Landroid/app/VoiceInteractor;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getVolumeControlStream()"/> <see href="https://developer.android.com/reference/android/app/Activity.html#setVolumeControlStream(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getIntent()"/>
         /// </summary>
-        public int VolumeControlStream
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent GetIntent()
         {
-            get { return IExecuteWithSignature<int>("getVolumeControlStream", "()I"); } set { IExecuteWithSignature("setVolumeControlStream", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getParentActivityIntent()"/>
         /// </summary>
-        public Android.View.Window Window
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent GetParentActivityIntent()
         {
-            get { return IExecuteWithSignature<Android.View.Window>("getWindow", "()Landroid/view/Window;"); }
+            return IExecuteWithSignature<Android.Content.Intent>("getParentActivityIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getWindowManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getPreferences(int)"/>
         /// </summary>
-        public Android.View.WindowManager WindowManager
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Content.SharedPreferences"/></returns>
+        public Android.Content.SharedPreferences GetPreferences(int arg0)
         {
-            get { return IExecuteWithSignature<Android.View.WindowManager>("getWindowManager", "()Landroid/view/WindowManager;"); }
+            return IExecuteWithSignature<Android.Content.SharedPreferences>("getPreferences", "(I)Landroid/content/SharedPreferences;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#findViewById(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getReferrer()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T FindViewById<T>(int arg0) where T: Android.View.View
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetReferrer()
         {
-            return IExecuteWithSignature<T>("findViewById", "(I)Landroid/view/View;", arg0);
+            return IExecuteWithSignature<Android.Net.Uri>("getReferrer", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#createPendingResult(int,android.content.Intent,int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#onProvideReferrer()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Android.App.PendingIntent"/></returns>
-        public Android.App.PendingIntent CreatePendingResult(int arg0, Android.Content.Intent arg1, int arg2)
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri OnProvideReferrer()
         {
-            return IExecute<Android.App.PendingIntent>("createPendingResult", arg0, arg1, arg2);
+            return IExecuteWithSignature<Android.Net.Uri>("onProvideReferrer", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getPreferences(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getContentScene()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Content.SharedPreferences"/></returns>
-        public Android.Content.SharedPreferences GetPreferences(int arg0)
+        /// <returns><see cref="Android.Transition.Scene"/></returns>
+        public Android.Transition.Scene GetContentScene()
         {
-            return IExecuteWithSignature<Android.Content.SharedPreferences>("getPreferences", "(I)Landroid/content/SharedPreferences;", arg0);
+            return IExecuteWithSignature<Android.Transition.Scene>("getContentScene", "()Landroid/transition/Scene;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Activity.html#onProvideReferrer()"/>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getContentTransitionManager()"/>
         /// </summary>
-        /// <returns><see cref="Android.Net.Uri"/></returns>
-        public Android.Net.Uri OnProvideReferrer()
+        /// <returns><see cref="Android.Transition.TransitionManager"/></returns>
+        public Android.Transition.TransitionManager GetContentTransitionManager()
         {
-            return IExecuteWithSignature<Android.Net.Uri>("onProvideReferrer", "()Landroid/net/Uri;");
+            return IExecuteWithSignature<Android.Transition.TransitionManager>("getContentTransitionManager", "()Landroid/transition/TransitionManager;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onWindowStartingActionMode(android.view.ActionMode.Callback,int)"/>
@@ -448,6 +297,30 @@ public Android.View.DragAndDropPermissions RequestDragAndDropPermissions(Android
             return IExecuteWithSignature<Android.View.DragAndDropPermissions>("requestDragAndDropPermissions", "(Landroid/view/DragEvent;)Landroid/view/DragAndDropPermissions;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLayoutInflater()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
+        public Android.View.LayoutInflater GetLayoutInflater()
+        {
+            return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getMenuInflater()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.MenuInflater"/></returns>
+        public Android.View.MenuInflater GetMenuInflater()
+        {
+            return IExecuteWithSignature<Android.View.MenuInflater>("getMenuInflater", "()Landroid/view/MenuInflater;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getCurrentFocus()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetCurrentFocus()
+        {
+            return IExecuteWithSignature<Android.View.View>("getCurrentFocus", "()Landroid/view/View;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onCreatePanelView(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -480,6 +353,30 @@ public Android.View.View OnCreateView(Java.Lang.String arg0, Android.Content.Con
             return IExecute<Android.View.View>("onCreateView", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getWindow()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Window"/></returns>
+        public Android.View.Window GetWindow()
+        {
+            return IExecuteWithSignature<Android.View.Window>("getWindow", "()Landroid/view/Window;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getWindowManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.WindowManager"/></returns>
+        public Android.View.WindowManager GetWindowManager()
+        {
+            return IExecuteWithSignature<Android.View.WindowManager>("getWindowManager", "()Landroid/view/WindowManager;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getOnBackInvokedDispatcher()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Window.OnBackInvokedDispatcher"/></returns>
+        public Android.Window.OnBackInvokedDispatcher GetOnBackInvokedDispatcher()
+        {
+            return IExecuteWithSignature<Android.Window.OnBackInvokedDispatcher>("getOnBackInvokedDispatcher", "()Landroid/window/OnBackInvokedDispatcher;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#dispatchGenericMotionEvent(android.view.MotionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
@@ -670,7 +567,7 @@ public bool NavigateUpTo(Android.Content.Intent arg0)
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool NavigateUpToFromChild(Android.App.Activity arg0, Android.Content.Intent arg1)
         {
             return IExecute<bool>("navigateUpToFromChild", arg0, arg1);
@@ -709,7 +606,7 @@ public bool OnCreatePanelMenu(int arg0, Android.View.Menu arg1)
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Canvas"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnCreateThumbnail(Android.Graphics.Bitmap arg0, Android.Graphics.Canvas arg1)
         {
             return IExecute<bool>("onCreateThumbnail", arg0, arg1);
@@ -807,7 +704,7 @@ public bool OnNavigateUp()
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnNavigateUpFromChild(Android.App.Activity arg0)
         {
             return IExecuteWithSignature<bool>("onNavigateUpFromChild", "(Landroid/app/Activity;)Z", arg0);
@@ -897,7 +794,7 @@ public bool ReleaseInstance()
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RequestVisibleBehind(bool arg0)
         {
             return IExecuteWithSignature<bool>("requestVisibleBehind", "(Z)Z", arg0);
@@ -992,9 +889,25 @@ public bool StartNextMatchingActivity(Android.Content.Intent arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T RequireViewById<T>(int arg0) where T: Android.View.View
+        public T RequireViewById<T>(int arg0) where T : Android.View.View
+        {
+            return IExecute<T>("requireViewById", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getParent()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.Activity"/></returns>
+        public Android.App.Activity GetParent()
         {
-            return IExecuteWithSignature<T>("requireViewById", "(I)Landroid/view/View;", arg0);
+            return IExecuteWithSignature<Android.App.Activity>("getParent", "()Landroid/app/Activity;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getApplication()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.Application"/></returns>
+        public Android.App.Application GetApplication()
+        {
+            return IExecuteWithSignature<Android.App.Application>("getApplication", "()Landroid/app/Application;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#managedQuery(android.net.Uri,java.lang.String[],java.lang.String,java.lang.String[],java.lang.String)"/>
@@ -1005,12 +918,36 @@ public T RequireViewById<T>(int arg0) where T: Android.View.View
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Database.Cursor"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Database.Cursor ManagedQuery(Android.Net.Uri arg0, Java.Lang.String[] arg1, Java.Lang.String arg2, Java.Lang.String[] arg3, Java.Lang.String arg4)
         {
             return IExecute<Android.Database.Cursor>("managedQuery", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getMediaController()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Session.MediaController"/></returns>
+        public Android.Media.Session.MediaController GetMediaController()
+        {
+            return IExecuteWithSignature<Android.Media.Session.MediaController>("getMediaController", "()Landroid/media/session/MediaController;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getSearchEvent()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.SearchEvent"/></returns>
+        public Android.View.SearchEvent GetSearchEvent()
+        {
+            return IExecuteWithSignature<Android.View.SearchEvent>("getSearchEvent", "()Landroid/view/SearchEvent;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getSplashScreen()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Window.SplashScreen"/></returns>
+        public Android.Window.SplashScreen GetSplashScreen()
+        {
+            return IExecuteWithSignature<Android.Window.SplashScreen>("getSplashScreen", "()Landroid/window/SplashScreen;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#isChild()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -1033,16 +970,40 @@ public bool RequestWindowFeature(int arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ShowDialog(int arg0, Android.Os.Bundle arg1)
         {
             return IExecute<bool>("showDialog", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getTitleColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTitleColor()
+        {
+            return IExecuteWithSignature<int>("getTitleColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getVolumeControlStream()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVolumeControlStream()
+        {
+            return IExecuteWithSignature<int>("getVolumeControlStream", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#dismissDialog(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DismissDialog(int arg0)
         {
             IExecuteWithSignature("dismissDialog", "(I)V", arg0);
@@ -1058,7 +1019,7 @@ public void DismissKeyboardShortcutsHelper()
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#removeDialog(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveDialog(int arg0)
         {
             IExecuteWithSignature("removeDialog", "(I)V", arg0);
@@ -1132,10 +1093,18 @@ public void SetFeatureDrawableUri(int arg0, Android.Net.Uri arg1)
             IExecute("setFeatureDrawableUri", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#setMediaController(android.media.session.MediaController)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Session.MediaController"/></param>
+        public void SetMediaController(Android.Media.Session.MediaController arg0)
+        {
+            IExecuteWithSignature("setMediaController", "(Landroid/media/session/MediaController;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setProgress(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProgress(int arg0)
         {
             IExecuteWithSignature("setProgress", "(I)V", arg0);
@@ -1144,7 +1113,7 @@ public void SetProgress(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setProgressBarIndeterminate(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProgressBarIndeterminate(bool arg0)
         {
             IExecuteWithSignature("setProgressBarIndeterminate", "(Z)V", arg0);
@@ -1153,7 +1122,7 @@ public void SetProgressBarIndeterminate(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setProgressBarIndeterminateVisibility(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProgressBarIndeterminateVisibility(bool arg0)
         {
             IExecuteWithSignature("setProgressBarIndeterminateVisibility", "(Z)V", arg0);
@@ -1162,7 +1131,7 @@ public void SetProgressBarIndeterminateVisibility(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setProgressBarVisibility(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProgressBarVisibility(bool arg0)
         {
             IExecuteWithSignature("setProgressBarVisibility", "(Z)V", arg0);
@@ -1188,21 +1157,69 @@ public void SetResult(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setSecondaryProgress(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSecondaryProgress(int arg0)
         {
             IExecuteWithSignature("setSecondaryProgress", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#setVolumeControlStream(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVolumeControlStream(int arg0)
+        {
+            IExecuteWithSignature("setVolumeControlStream", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#showDialog(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ShowDialog(int arg0)
         {
             IExecuteWithSignature("showDialog", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getChangingConfigurations()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChangingConfigurations()
+        {
+            return IExecuteWithSignature<int>("getChangingConfigurations", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLaunchedFromUid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLaunchedFromUid()
+        {
+            return IExecuteWithSignature<int>("getLaunchedFromUid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getMaxNumPictureInPictureActions()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxNumPictureInPictureActions()
+        {
+            return IExecuteWithSignature<int>("getMaxNumPictureInPictureActions", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getRequestedOrientation()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRequestedOrientation()
+        {
+            return IExecuteWithSignature<int>("getRequestedOrientation", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getTaskId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTaskId()
+        {
+            return IExecuteWithSignature<int>("getTaskId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onCreateDescription()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.CharSequence"/></returns>
@@ -1211,6 +1228,14 @@ public Java.Lang.CharSequence OnCreateDescription()
             return IExecuteWithSignature<Java.Lang.CharSequence>("onCreateDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLastNonConfigurationInstance()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetLastNonConfigurationInstance()
+        {
+            return IExecuteWithSignature("getLastNonConfigurationInstance", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onRetainNonConfigurationInstance()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
@@ -1219,6 +1244,30 @@ public object OnRetainNonConfigurationInstance()
             return IExecuteWithSignature("onRetainNonConfigurationInstance", "()Ljava/lang/Object;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getCallingPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCallingPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCallingPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLaunchedFromPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLaunchedFromPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLaunchedFromPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#getLocalClassName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLocalClassName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLocalClassName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#addContentView(android.view.View,android.view.ViewGroup.LayoutParams)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -1263,7 +1312,7 @@ public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.Pri
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#enterPictureInPictureMode()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void EnterPictureInPictureMode()
         {
             IExecuteWithSignature("enterPictureInPictureMode", "()V");
@@ -1288,7 +1337,7 @@ public void FinishActivity(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void FinishActivityFromChild(Android.App.Activity arg0, int arg1)
         {
             IExecute("finishActivityFromChild", arg0, arg1);
@@ -1318,7 +1367,7 @@ public void FinishAndRemoveTask()
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#finishFromChild(android.app.Activity)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void FinishFromChild(Android.App.Activity arg0)
         {
             IExecuteWithSignature("finishFromChild", "(Landroid/app/Activity;)V", arg0);
@@ -1366,7 +1415,7 @@ public void OnAttachedToWindow()
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onAttachFragment(android.app.Fragment)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnAttachFragment(Android.App.Fragment arg0)
         {
             IExecuteWithSignature("onAttachFragment", "(Landroid/app/Fragment;)V", arg0);
@@ -1374,7 +1423,7 @@ public void OnAttachFragment(Android.App.Fragment arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onBackPressed()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnBackPressed()
         {
             IExecuteWithSignature("onBackPressed", "()V");
@@ -1486,7 +1535,7 @@ public void OnMultiWindowModeChanged(bool arg0, Android.Content.Res.Configuratio
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onMultiWindowModeChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnMultiWindowModeChanged(bool arg0)
         {
             IExecuteWithSignature("onMultiWindowModeChanged", "(Z)V", arg0);
@@ -1532,7 +1581,7 @@ public void OnPictureInPictureModeChanged(bool arg0, Android.Content.Res.Configu
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onPictureInPictureModeChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPictureInPictureModeChanged(bool arg0)
         {
             IExecuteWithSignature("onPictureInPictureModeChanged", "(Z)V", arg0);
@@ -1619,7 +1668,7 @@ public void OnSaveInstanceState(Android.Os.Bundle arg0, Android.Os.PersistableBu
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onStateNotSaved()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStateNotSaved()
         {
             IExecuteWithSignature("onStateNotSaved", "()V");
@@ -1650,7 +1699,7 @@ public void OnUserInteraction()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#onVisibleBehindCanceled()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnVisibleBehindCanceled()
         {
             IExecuteWithSignature("onVisibleBehindCanceled", "()V");
@@ -1713,7 +1762,7 @@ public void OverrideActivityTransition(int arg0, int arg1, int arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OverridePendingTransition(int arg0, int arg1, int arg2)
         {
             IExecute("overridePendingTransition", arg0, arg1, arg2);
@@ -1723,7 +1772,7 @@ public void OverridePendingTransition(int arg0, int arg1, int arg2)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OverridePendingTransition(int arg0, int arg1)
         {
             IExecute("overridePendingTransition", arg0, arg1);
@@ -1784,6 +1833,22 @@ public void RequestFullscreenMode(int arg0, Android.Os.OutcomeReceiver<Java.Lang
             IExecute("requestFullscreenMode", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#setActionBar(android.widget.Toolbar)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Widget.Toolbar"/></param>
+        public void SetActionBar(Android.Widget.Toolbar arg0)
+        {
+            IExecuteWithSignature("setActionBar", "(Landroid/widget/Toolbar;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#setContentTransitionManager(android.transition.TransitionManager)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.TransitionManager"/></param>
+        public void SetContentTransitionManager(Android.Transition.TransitionManager arg0)
+        {
+            IExecuteWithSignature("setContentTransitionManager", "(Landroid/transition/TransitionManager;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setContentView(android.view.View,android.view.ViewGroup.LayoutParams)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -1849,6 +1914,14 @@ public void SetInheritShowWhenLocked(bool arg0)
             IExecuteWithSignature("setInheritShowWhenLocked", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#setIntent(android.content.Intent)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
+        public void SetIntent(Android.Content.Intent arg0)
+        {
+            IExecuteWithSignature("setIntent", "(Landroid/content/Intent;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setLocusContext(android.content.LocusId,android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.LocusId"/></param>
@@ -1874,6 +1947,14 @@ public void SetRecentsScreenshotEnabled(bool arg0)
             IExecuteWithSignature("setRecentsScreenshotEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#setRequestedOrientation(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRequestedOrientation(int arg0)
+        {
+            IExecuteWithSignature("setRequestedOrientation", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setShouldDockBigOverlays(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1914,6 +1995,15 @@ public void SetTitle(Java.Lang.CharSequence arg0)
             IExecuteWithSignature("setTitle", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Activity.html#setTitleColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetTitleColor(int arg0)
+        {
+            IExecuteWithSignature("setTitleColor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#setTurnScreenOn(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1972,7 +2062,7 @@ public void StartActivityForResult(Android.Content.Intent arg0, int arg1)
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivityFromChild(Android.App.Activity arg0, Android.Content.Intent arg1, int arg2, Android.Os.Bundle arg3)
         {
             IExecute("startActivityFromChild", arg0, arg1, arg2, arg3);
@@ -1983,7 +2073,7 @@ public void StartActivityFromChild(Android.App.Activity arg0, Android.Content.In
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivityFromChild(Android.App.Activity arg0, Android.Content.Intent arg1, int arg2)
         {
             IExecute("startActivityFromChild", arg0, arg1, arg2);
@@ -1995,7 +2085,7 @@ public void StartActivityFromChild(Android.App.Activity arg0, Android.Content.In
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivityFromFragment(Android.App.Fragment arg0, Android.Content.Intent arg1, int arg2, Android.Os.Bundle arg3)
         {
             IExecute("startActivityFromFragment", arg0, arg1, arg2, arg3);
@@ -2006,7 +2096,7 @@ public void StartActivityFromFragment(Android.App.Fragment arg0, Android.Content
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivityFromFragment(Android.App.Fragment arg0, Android.Content.Intent arg1, int arg2)
         {
             IExecute("startActivityFromFragment", arg0, arg1, arg2);
@@ -2052,7 +2142,7 @@ public void StartIntentSenderForResult(Android.Content.IntentSender arg0, int ar
         /// <param name="arg6"><see cref="int"/></param>
         /// <param name="arg7"><see cref="Android.Os.Bundle"/></param>
         /// <exception cref="Android.Content.IntentSender.SendIntentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartIntentSenderFromChild(Android.App.Activity arg0, Android.Content.IntentSender arg1, int arg2, Android.Content.Intent arg3, int arg4, int arg5, int arg6, Android.Os.Bundle arg7)
         {
             IExecute("startIntentSenderFromChild", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -2068,7 +2158,7 @@ public void StartIntentSenderFromChild(Android.App.Activity arg0, Android.Conten
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="int"/></param>
         /// <exception cref="Android.Content.IntentSender.SendIntentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartIntentSenderFromChild(Android.App.Activity arg0, Android.Content.IntentSender arg1, int arg2, Android.Content.Intent arg3, int arg4, int arg5, int arg6)
         {
             IExecute("startIntentSenderFromChild", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2092,7 +2182,7 @@ public void StartLockTask()
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#startManagingCursor(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartManagingCursor(Android.Database.Cursor arg0)
         {
             IExecuteWithSignature("startManagingCursor", "(Landroid/database/Cursor;)V", arg0);
@@ -2133,7 +2223,7 @@ public void StopLockTask()
         /// <see href="https://developer.android.com/reference/android/app/Activity.html#stopManagingCursor(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopManagingCursor(Android.Database.Cursor arg0)
         {
             IExecuteWithSignature("stopManagingCursor", "(Landroid/database/Cursor;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/ActivityGroup.cs b/src/net/Netdroid/Generated/Android/App/ActivityGroup.cs
index 70f4b2fc7..53a827001 100644
--- a/src/net/Netdroid/Generated/Android/App/ActivityGroup.cs
+++ b/src/net/Netdroid/Generated/Android/App/ActivityGroup.cs
@@ -33,7 +33,7 @@ public partial class ActivityGroup
         /// <see href="https://developer.android.com/reference/android/app/ActivityGroup.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ActivityGroup(bool arg0)
             : base(arg0)
         {
@@ -55,20 +55,22 @@ public ActivityGroup(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityGroup.html#getCurrentActivity()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActivityGroup.html#getCurrentActivity()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.Activity CurrentActivity
+        /// <returns><see cref="Android.App.Activity"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Activity GetCurrentActivity()
         {
-            get { return IExecuteWithSignature<Android.App.Activity>("getCurrentActivity", "()Landroid/app/Activity;"); }
+            return IExecuteWithSignature<Android.App.Activity>("getCurrentActivity", "()Landroid/app/Activity;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityGroup.html#getLocalActivityManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ActivityGroup.html#getLocalActivityManager()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.LocalActivityManager LocalActivityManager
+        /// <returns><see cref="Android.App.LocalActivityManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.LocalActivityManager GetLocalActivityManager()
         {
-            get { return IExecuteWithSignature<Android.App.LocalActivityManager>("getLocalActivityManager", "()Landroid/app/LocalActivityManager;"); }
+            return IExecuteWithSignature<Android.App.LocalActivityManager>("getLocalActivityManager", "()Landroid/app/LocalActivityManager;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/ActivityManager.cs b/src/net/Netdroid/Generated/Android/App/ActivityManager.cs
index 203e008bf..2657a5f04 100644
--- a/src/net/Netdroid/Generated/Android/App/ActivityManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/ActivityManager.cs
@@ -107,7 +107,7 @@ public static bool IsLowMemoryKillReportSupported()
         /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#isRunningInTestHarness()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsRunningInTestHarness()
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isRunningInTestHarness", "()Z");
@@ -149,76 +149,6 @@ public static void SetVrThread(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getAppTasks()"/> 
-        /// </summary>
-        public Java.Util.List<Android.App.ActivityManager.AppTask> AppTasks
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.ActivityManager.AppTask>>("getAppTasks", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getAppTaskThumbnailSize()"/> 
-        /// </summary>
-        public Android.Util.Size AppTaskThumbnailSize
-        {
-            get { return IExecuteWithSignature<Android.Util.Size>("getAppTaskThumbnailSize", "()Landroid/util/Size;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getDeviceConfigurationInfo()"/> 
-        /// </summary>
-        public Android.Content.Pm.ConfigurationInfo DeviceConfigurationInfo
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.ConfigurationInfo>("getDeviceConfigurationInfo", "()Landroid/content/pm/ConfigurationInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getLargeMemoryClass()"/> 
-        /// </summary>
-        public int LargeMemoryClass
-        {
-            get { return IExecuteWithSignature<int>("getLargeMemoryClass", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getLauncherLargeIconDensity()"/> 
-        /// </summary>
-        public int LauncherLargeIconDensity
-        {
-            get { return IExecuteWithSignature<int>("getLauncherLargeIconDensity", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getLauncherLargeIconSize()"/> 
-        /// </summary>
-        public int LauncherLargeIconSize
-        {
-            get { return IExecuteWithSignature<int>("getLauncherLargeIconSize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getLockTaskModeState()"/> 
-        /// </summary>
-        public int LockTaskModeState
-        {
-            get { return IExecuteWithSignature<int>("getLockTaskModeState", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getMemoryClass()"/> 
-        /// </summary>
-        public int MemoryClass
-        {
-            get { return IExecuteWithSignature<int>("getMemoryClass", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getProcessesInErrorState()"/> 
-        /// </summary>
-        public Java.Util.List<Android.App.ActivityManager.ProcessErrorStateInfo> ProcessesInErrorState
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.ActivityManager.ProcessErrorStateInfo>>("getProcessesInErrorState", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getRunningAppProcesses()"/> 
-        /// </summary>
-        public Java.Util.List<Android.App.ActivityManager.RunningAppProcessInfo> RunningAppProcesses
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.ActivityManager.RunningAppProcessInfo>>("getRunningAppProcesses", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getRunningServiceControlPanel(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -229,6 +159,14 @@ public Android.App.PendingIntent GetRunningServiceControlPanel(Android.Content.C
             return IExecuteWithSignature<Android.App.PendingIntent>("getRunningServiceControlPanel", "(Landroid/content/ComponentName;)Landroid/app/PendingIntent;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getDeviceConfigurationInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.ConfigurationInfo"/></returns>
+        public Android.Content.Pm.ConfigurationInfo GetDeviceConfigurationInfo()
+        {
+            return IExecuteWithSignature<Android.Content.Pm.ConfigurationInfo>("getDeviceConfigurationInfo", "()Landroid/content/pm/ConfigurationInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getProcessMemoryInfo(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -238,6 +176,14 @@ public Android.Os.Debug.MemoryInfo[] GetProcessMemoryInfo(int[] arg0)
             return IExecuteWithSignatureArray<Android.Os.Debug.MemoryInfo>("getProcessMemoryInfo", "([I)[Landroid/os/Debug$MemoryInfo;", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getAppTaskThumbnailSize()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Util.Size"/></returns>
+        public Android.Util.Size GetAppTaskThumbnailSize()
+        {
+            return IExecuteWithSignature<Android.Util.Size>("getAppTaskThumbnailSize", "()Landroid/util/Size;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#clearApplicationUserData()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -268,7 +214,7 @@ public bool IsBackgroundRestricted()
         /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#isInLockTaskMode()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsInLockTaskMode()
         {
             return IExecuteWithSignature<bool>("isInLockTaskMode", "()Z");
@@ -294,24 +240,88 @@ public int AddAppTask(Android.App.Activity arg0, Android.Content.Intent arg1, An
             return IExecute<int>("addAppTask", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getLargeMemoryClass()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLargeMemoryClass()
+        {
+            return IExecuteWithSignature<int>("getLargeMemoryClass", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getLauncherLargeIconDensity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLauncherLargeIconDensity()
+        {
+            return IExecuteWithSignature<int>("getLauncherLargeIconDensity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getLauncherLargeIconSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLauncherLargeIconSize()
+        {
+            return IExecuteWithSignature<int>("getLauncherLargeIconSize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getLockTaskModeState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLockTaskModeState()
+        {
+            return IExecuteWithSignature<int>("getLockTaskModeState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getMemoryClass()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMemoryClass()
+        {
+            return IExecuteWithSignature<int>("getMemoryClass", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getAppTasks()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.ActivityManager.AppTask> GetAppTasks()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.ActivityManager.AppTask>>("getAppTasks", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getProcessesInErrorState()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.ActivityManager.ProcessErrorStateInfo> GetProcessesInErrorState()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.ActivityManager.ProcessErrorStateInfo>>("getProcessesInErrorState", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getRecentTasks(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Lang.SecurityException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.App.ActivityManager.RecentTaskInfo> GetRecentTasks(int arg0, int arg1)
         {
             return IExecute<Java.Util.List<Android.App.ActivityManager.RecentTaskInfo>>("getRecentTasks", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getRunningAppProcesses()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.ActivityManager.RunningAppProcessInfo> GetRunningAppProcesses()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.ActivityManager.RunningAppProcessInfo>>("getRunningAppProcesses", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#getRunningServices(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Lang.SecurityException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.App.ActivityManager.RunningServiceInfo> GetRunningServices(int arg0)
         {
             return IExecuteWithSignature<Java.Util.List<Android.App.ActivityManager.RunningServiceInfo>>("getRunningServices", "(I)Ljava/util/List;", arg0);
@@ -322,7 +332,7 @@ public int AddAppTask(Android.App.Activity arg0, Android.Content.Intent arg1, An
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Lang.SecurityException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.App.ActivityManager.RunningTaskInfo> GetRunningTasks(int arg0)
         {
             return IExecuteWithSignature<Java.Util.List<Android.App.ActivityManager.RunningTaskInfo>>("getRunningTasks", "(I)Ljava/util/List;", arg0);
@@ -401,7 +411,7 @@ public void MoveTaskToFront(int arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/app/ActivityManager.html#restartPackage(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RestartPackage(Java.Lang.String arg0)
         {
             IExecuteWithSignature("restartPackage", "(Ljava/lang/String;)V", arg0);
@@ -447,11 +457,12 @@ public partial class AppTask
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.AppTask.html#getTaskInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.AppTask.html#getTaskInfo()"/>
             /// </summary>
-            public Android.App.ActivityManager.RecentTaskInfo TaskInfo
+            /// <returns><see cref="Android.App.ActivityManager.RecentTaskInfo"/></returns>
+            public Android.App.ActivityManager.RecentTaskInfo GetTaskInfo()
             {
-                get { return IExecuteWithSignature<Android.App.ActivityManager.RecentTaskInfo>("getTaskInfo", "()Landroid/app/ActivityManager$RecentTaskInfo;"); }
+                return IExecuteWithSignature<Android.App.ActivityManager.RecentTaskInfo>("getTaskInfo", "()Landroid/app/ActivityManager$RecentTaskInfo;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.AppTask.html#finishAndRemoveTask()"/>
@@ -713,22 +724,22 @@ public partial class RecentTaskInfo
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RecentTaskInfo.html#affiliatedTaskId"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int affiliatedTaskId { get { return IGetField<int>("affiliatedTaskId"); } set { ISetField("affiliatedTaskId", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RecentTaskInfo.html#id"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int id { get { return IGetField<int>("id"); } set { ISetField("id", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RecentTaskInfo.html#persistentId"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int persistentId { get { return IGetField<int>("persistentId"); } set { ISetField("persistentId", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RecentTaskInfo.html#description"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence description { get { return IGetField<Java.Lang.CharSequence>("description"); } set { ISetField("description", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RecentTaskInfo.html#CREATOR"/>
@@ -851,7 +862,7 @@ public RunningAppProcessInfo(Java.Lang.String arg0, int arg1, Java.Lang.String[]
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RunningAppProcessInfo.html#IMPORTANCE_BACKGROUND"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int IMPORTANCE_BACKGROUND { get { if (!_IMPORTANCE_BACKGROUNDReady) { _IMPORTANCE_BACKGROUNDContent = SGetField<int>(LocalBridgeClazz, "IMPORTANCE_BACKGROUND"); _IMPORTANCE_BACKGROUNDReady = true; } return _IMPORTANCE_BACKGROUNDContent; } }
             private static int _IMPORTANCE_BACKGROUNDContent = default;
             private static bool _IMPORTANCE_BACKGROUNDReady = false; // this is used because in case of generics 
@@ -870,7 +881,7 @@ public RunningAppProcessInfo(Java.Lang.String arg0, int arg1, Java.Lang.String[]
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RunningAppProcessInfo.html#IMPORTANCE_EMPTY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int IMPORTANCE_EMPTY { get { if (!_IMPORTANCE_EMPTYReady) { _IMPORTANCE_EMPTYContent = SGetField<int>(LocalBridgeClazz, "IMPORTANCE_EMPTY"); _IMPORTANCE_EMPTYReady = true; } return _IMPORTANCE_EMPTYContent; } }
             private static int _IMPORTANCE_EMPTYContent = default;
             private static bool _IMPORTANCE_EMPTYReady = false; // this is used because in case of generics 
@@ -919,7 +930,7 @@ public RunningAppProcessInfo(Java.Lang.String arg0, int arg1, Java.Lang.String[]
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RunningAppProcessInfo.html#IMPORTANCE_TOP_SLEEPING_PRE_28"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int IMPORTANCE_TOP_SLEEPING_PRE_28 { get { if (!_IMPORTANCE_TOP_SLEEPING_PRE_28Ready) { _IMPORTANCE_TOP_SLEEPING_PRE_28Content = SGetField<int>(LocalBridgeClazz, "IMPORTANCE_TOP_SLEEPING_PRE_28"); _IMPORTANCE_TOP_SLEEPING_PRE_28Ready = true; } return _IMPORTANCE_TOP_SLEEPING_PRE_28Content; } }
             private static int _IMPORTANCE_TOP_SLEEPING_PRE_28Content = default;
             private static bool _IMPORTANCE_TOP_SLEEPING_PRE_28Ready = false; // this is used because in case of generics 
@@ -1152,22 +1163,22 @@ public partial class RunningTaskInfo
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RunningTaskInfo.html#thumbnail"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Bitmap thumbnail { get { return IGetField<Android.Graphics.Bitmap>("thumbnail"); } set { ISetField("thumbnail", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RunningTaskInfo.html#id"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int id { get { return IGetField<int>("id"); } set { ISetField("id", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RunningTaskInfo.html#numRunning"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int numRunning { get { return IGetField<int>("numRunning"); } set { ISetField("numRunning", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RunningTaskInfo.html#description"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence description { get { return IGetField<Java.Lang.CharSequence>("description"); } set { ISetField("description", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.RunningTaskInfo.html#CREATOR"/>
@@ -1237,7 +1248,7 @@ public TaskDescription(Android.App.ActivityManager.TaskDescription arg0)
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
             /// <param name="arg2"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public TaskDescription(Java.Lang.String arg0, Android.Graphics.Bitmap arg1, int arg2)
                 : base(arg0, arg1, arg2)
             {
@@ -1247,7 +1258,7 @@ public TaskDescription(Java.Lang.String arg0, Android.Graphics.Bitmap arg1, int
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public TaskDescription(Java.Lang.String arg0, Android.Graphics.Bitmap arg1)
                 : base(arg0, arg1)
             {
@@ -1258,7 +1269,7 @@ public TaskDescription(Java.Lang.String arg0, Android.Graphics.Bitmap arg1)
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public TaskDescription(Java.Lang.String arg0, int arg1, int arg2)
                 : base(arg0, arg1, arg2)
             {
@@ -1268,7 +1279,7 @@ public TaskDescription(Java.Lang.String arg0, int arg1, int arg2)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public TaskDescription(Java.Lang.String arg0, int arg1)
                 : base(arg0, arg1)
             {
@@ -1277,7 +1288,7 @@ public TaskDescription(Java.Lang.String arg0, int arg1)
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#%3Cinit%3E(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public TaskDescription(Java.Lang.String arg0)
                 : base(arg0)
             {
@@ -1305,55 +1316,61 @@ public TaskDescription(Java.Lang.String arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getBackgroundColor()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getIcon()"/>
             /// </summary>
-            public int BackgroundColor
+            /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+            [global::System.Obsolete()]
+            public Android.Graphics.Bitmap GetIcon()
             {
-                get { return IExecuteWithSignature<int>("getBackgroundColor", "()I"); }
+                return IExecuteWithSignature<Android.Graphics.Bitmap>("getIcon", "()Landroid/graphics/Bitmap;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getIcon()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#describeContents()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Graphics.Bitmap Icon
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getIcon", "()Landroid/graphics/Bitmap;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getLabel()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getBackgroundColor()"/>
             /// </summary>
-            public Java.Lang.String Label
+            /// <returns><see cref="int"/></returns>
+            public int GetBackgroundColor()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getBackgroundColor", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getNavigationBarColor()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getNavigationBarColor()"/>
             /// </summary>
-            public int NavigationBarColor
+            /// <returns><see cref="int"/></returns>
+            public int GetNavigationBarColor()
             {
-                get { return IExecuteWithSignature<int>("getNavigationBarColor", "()I"); }
+                return IExecuteWithSignature<int>("getNavigationBarColor", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getPrimaryColor()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getPrimaryColor()"/>
             /// </summary>
-            public int PrimaryColor
+            /// <returns><see cref="int"/></returns>
+            public int GetPrimaryColor()
             {
-                get { return IExecuteWithSignature<int>("getPrimaryColor", "()I"); }
+                return IExecuteWithSignature<int>("getPrimaryColor", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getStatusBarColor()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getStatusBarColor()"/>
             /// </summary>
-            public int StatusBarColor
+            /// <returns><see cref="int"/></returns>
+            public int GetStatusBarColor()
             {
-                get { return IExecuteWithSignature<int>("getStatusBarColor", "()I"); }
+                return IExecuteWithSignature<int>("getStatusBarColor", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#getLabel()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetLabel()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/ActivityManager.TaskDescription.html#readFromParcel(android.os.Parcel)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/ActivityOptions.cs b/src/net/Netdroid/Generated/Android/App/ActivityOptions.cs
index 8de9d1a78..8e70e842a 100644
--- a/src/net/Netdroid/Generated/Android/App/ActivityOptions.cs
+++ b/src/net/Netdroid/Generated/Android/App/ActivityOptions.cs
@@ -183,48 +183,6 @@ public static Android.App.ActivityOptions MakeThumbnailScaleUpAnimation(Android.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getLaunchBounds()"/> 
-        /// </summary>
-        public Android.Graphics.Rect LaunchBounds
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getLaunchBounds", "()Landroid/graphics/Rect;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getLaunchDisplayId()"/> 
-        /// </summary>
-        public int LaunchDisplayId
-        {
-            get { return IExecuteWithSignature<int>("getLaunchDisplayId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getLockTaskMode()"/> 
-        /// </summary>
-        public bool LockTaskMode
-        {
-            get { return IExecuteWithSignature<bool>("getLockTaskMode", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getPendingIntentBackgroundActivityStartMode()"/> 
-        /// </summary>
-        public int PendingIntentBackgroundActivityStartMode
-        {
-            get { return IExecuteWithSignature<int>("getPendingIntentBackgroundActivityStartMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getPendingIntentCreatorBackgroundActivityStartMode()"/> 
-        /// </summary>
-        public int PendingIntentCreatorBackgroundActivityStartMode
-        {
-            get { return IExecuteWithSignature<int>("getPendingIntentCreatorBackgroundActivityStartMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getSplashScreenStyle()"/> 
-        /// </summary>
-        public int SplashScreenStyle
-        {
-            get { return IExecuteWithSignature<int>("getSplashScreenStyle", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#setAppVerificationBundle(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
@@ -297,6 +255,14 @@ public Android.App.ActivityOptions SetSplashScreenStyle(int arg0)
             return IExecuteWithSignature<Android.App.ActivityOptions>("setSplashScreenStyle", "(I)Landroid/app/ActivityOptions;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getLaunchBounds()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetLaunchBounds()
+        {
+            return IExecuteWithSignature<Android.Graphics.Rect>("getLaunchBounds", "()Landroid/graphics/Rect;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#toBundle()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.Bundle"/></returns>
@@ -305,10 +271,18 @@ public Android.Os.Bundle ToBundle()
             return IExecuteWithSignature<Android.Os.Bundle>("toBundle", "()Landroid/os/Bundle;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getLockTaskMode()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetLockTaskMode()
+        {
+            return IExecuteWithSignature<bool>("getLockTaskMode", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#isPendingIntentBackgroundActivityLaunchAllowed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsPendingIntentBackgroundActivityLaunchAllowed()
         {
             return IExecuteWithSignature<bool>("isPendingIntentBackgroundActivityLaunchAllowed", "()Z");
@@ -322,6 +296,38 @@ public bool IsShareIdentityEnabled()
             return IExecuteWithSignature<bool>("isShareIdentityEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getLaunchDisplayId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLaunchDisplayId()
+        {
+            return IExecuteWithSignature<int>("getLaunchDisplayId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getPendingIntentBackgroundActivityStartMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPendingIntentBackgroundActivityStartMode()
+        {
+            return IExecuteWithSignature<int>("getPendingIntentBackgroundActivityStartMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getPendingIntentCreatorBackgroundActivityStartMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPendingIntentCreatorBackgroundActivityStartMode()
+        {
+            return IExecuteWithSignature<int>("getPendingIntentCreatorBackgroundActivityStartMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#getSplashScreenStyle()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSplashScreenStyle()
+        {
+            return IExecuteWithSignature<int>("getSplashScreenStyle", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#requestUsageTimeReport(android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
@@ -333,7 +339,7 @@ public void RequestUsageTimeReport(Android.App.PendingIntent arg0)
         /// <see href="https://developer.android.com/reference/android/app/ActivityOptions.html#setPendingIntentBackgroundActivityLaunchAllowed(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPendingIntentBackgroundActivityLaunchAllowed(bool arg0)
         {
             IExecuteWithSignature("setPendingIntentBackgroundActivityLaunchAllowed", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Admin/AllPackageClasses.cs
index 57f3f3720..24a8514f1 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/AllPackageClasses.cs
@@ -340,12 +340,12 @@ public partial class InstallSystemUpdateCallback : MASES.JCOBridge.C2JBridge.JVM
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("InstallSystemUpdateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("InstallSystemUpdateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public InstallSystemUpdateCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("InstallSystemUpdateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("InstallSystemUpdateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public InstallSystemUpdateCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -387,10 +387,13 @@ public partial class OnClearApplicationUserDataListener : MASES.JCOBridge.C2JBri
             /// </summary>
             public OnClearApplicationUserDataListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.admin.DevicePolicyManager_OnClearApplicationUserDataListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.admin.OnClearApplicationUserDataListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -412,10 +415,13 @@ public partial class OnClearApplicationUserDataListenerDirect : OnClearApplicati
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.admin.DevicePolicyManager$OnClearApplicationUserDataListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.admin.DevicePolicyManager$OnClearApplicationUserDataListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -757,12 +763,12 @@ public partial class NetworkEvent : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NetworkEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NetworkEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NetworkEvent() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NetworkEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NetworkEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NetworkEvent(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -847,12 +853,12 @@ public partial class PolicyUpdateReceiver : Android.Content.BroadcastReceiver
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PolicyUpdateReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PolicyUpdateReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PolicyUpdateReceiver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PolicyUpdateReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PolicyUpdateReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PolicyUpdateReceiver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/ConnectEvent.cs b/src/net/Netdroid/Generated/Android/App/Admin/ConnectEvent.cs
index 11893f959..5da0d3785 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/ConnectEvent.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/ConnectEvent.cs
@@ -52,18 +52,20 @@ public partial class ConnectEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/ConnectEvent.html#getInetAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/ConnectEvent.html#getPort()"/>
         /// </summary>
-        public Java.Net.InetAddress InetAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getInetAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/ConnectEvent.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/ConnectEvent.html#getInetAddress()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetInetAddress()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getInetAddress", "()Ljava/net/InetAddress;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/DeviceAdminInfo.cs b/src/net/Netdroid/Generated/Android/App/Admin/DeviceAdminInfo.cs
index f042e6b92..4fe0c100a 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/DeviceAdminInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/DeviceAdminInfo.cs
@@ -129,39 +129,20 @@ public DeviceAdminInfo(Android.Content.Context arg0, Android.Content.Pm.ResolveI
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getActivityInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getComponent()"/>
         /// </summary>
-        public Android.Content.Pm.ActivityInfo ActivityInfo
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponent()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.ActivityInfo>("getActivityInfo", "()Landroid/content/pm/ActivityInfo;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getComponent()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getActivityInfo()"/>
         /// </summary>
-        public Android.Content.ComponentName Component
+        /// <returns><see cref="Android.Content.Pm.ActivityInfo"/></returns>
+        public Android.Content.Pm.ActivityInfo GetActivityInfo()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getHeadlessDeviceOwnerMode()"/> 
-        /// </summary>
-        public int HeadlessDeviceOwnerMode
-        {
-            get { return IExecuteWithSignature<int>("getHeadlessDeviceOwnerMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getReceiverName()"/> 
-        /// </summary>
-        public Java.Lang.String ReceiverName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getReceiverName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.Pm.ActivityInfo>("getActivityInfo", "()Landroid/content/pm/ActivityInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#loadIcon(android.content.pm.PackageManager)"/>
@@ -206,6 +187,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getHeadlessDeviceOwnerMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeadlessDeviceOwnerMode()
+        {
+            return IExecuteWithSignature<int>("getHeadlessDeviceOwnerMode", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#loadDescription(android.content.pm.PackageManager)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
@@ -225,6 +214,22 @@ public Java.Lang.CharSequence LoadLabel(Android.Content.Pm.PackageManager arg0)
             return IExecuteWithSignature<Java.Lang.CharSequence>("loadLabel", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getReceiverName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetReceiverName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getReceiverName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DeviceAdminInfo.html#getTagForPolicy(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/DeviceAdminReceiver.cs b/src/net/Netdroid/Generated/Android/App/Admin/DeviceAdminReceiver.cs
index cd55c0028..1d3a4ca47 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/DeviceAdminReceiver.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/DeviceAdminReceiver.cs
@@ -311,7 +311,7 @@ public void OnPasswordChanged(Android.Content.Context arg0, Android.Content.Inte
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPasswordChanged(Android.Content.Context arg0, Android.Content.Intent arg1)
         {
             IExecute("onPasswordChanged", arg0, arg1);
@@ -331,7 +331,7 @@ public void OnPasswordExpiring(Android.Content.Context arg0, Android.Content.Int
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPasswordExpiring(Android.Content.Context arg0, Android.Content.Intent arg1)
         {
             IExecute("onPasswordExpiring", arg0, arg1);
@@ -351,7 +351,7 @@ public void OnPasswordFailed(Android.Content.Context arg0, Android.Content.Inten
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPasswordFailed(Android.Content.Context arg0, Android.Content.Intent arg1)
         {
             IExecute("onPasswordFailed", arg0, arg1);
@@ -371,7 +371,7 @@ public void OnPasswordSucceeded(Android.Content.Context arg0, Android.Content.In
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPasswordSucceeded(Android.Content.Context arg0, Android.Content.Intent arg1)
         {
             IExecute("onPasswordSucceeded", arg0, arg1);
@@ -390,7 +390,7 @@ public void OnProfileProvisioningComplete(Android.Content.Context arg0, Android.
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnReadyForUserInitialization(Android.Content.Context arg0, Android.Content.Intent arg1)
         {
             IExecute("onReadyForUserInitialization", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/DevicePolicyManager.cs b/src/net/Netdroid/Generated/Android/App/Admin/DevicePolicyManager.cs
index a9cd7e2f4..b96e89a4c 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/DevicePolicyManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/DevicePolicyManager.cs
@@ -40,7 +40,7 @@ public partial class DevicePolicyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#ENCRYPTION_STATUS_ACTIVATING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ENCRYPTION_STATUS_ACTIVATING { get { if (!_ENCRYPTION_STATUS_ACTIVATINGReady) { _ENCRYPTION_STATUS_ACTIVATINGContent = SGetField<int>(LocalBridgeClazz, "ENCRYPTION_STATUS_ACTIVATING"); _ENCRYPTION_STATUS_ACTIVATINGReady = true; } return _ENCRYPTION_STATUS_ACTIVATINGContent; } }
         private static int _ENCRYPTION_STATUS_ACTIVATINGContent = default;
         private static bool _ENCRYPTION_STATUS_ACTIVATINGReady = false; // this is used because in case of generics 
@@ -185,7 +185,7 @@ public partial class DevicePolicyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#KEYGUARD_DISABLE_REMOTE_INPUT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KEYGUARD_DISABLE_REMOTE_INPUT { get { if (!_KEYGUARD_DISABLE_REMOTE_INPUTReady) { _KEYGUARD_DISABLE_REMOTE_INPUTContent = SGetField<int>(LocalBridgeClazz, "KEYGUARD_DISABLE_REMOTE_INPUT"); _KEYGUARD_DISABLE_REMOTE_INPUTReady = true; } return _KEYGUARD_DISABLE_REMOTE_INPUTContent; } }
         private static int _KEYGUARD_DISABLE_REMOTE_INPUTContent = default;
         private static bool _KEYGUARD_DISABLE_REMOTE_INPUTReady = false; // this is used because in case of generics 
@@ -654,7 +654,7 @@ public partial class DevicePolicyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#ACTION_PROVISION_MANAGED_DEVICE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_PROVISION_MANAGED_DEVICE { get { if (!_ACTION_PROVISION_MANAGED_DEVICEReady) { _ACTION_PROVISION_MANAGED_DEVICEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_PROVISION_MANAGED_DEVICE"); _ACTION_PROVISION_MANAGED_DEVICEReady = true; } return _ACTION_PROVISION_MANAGED_DEVICEContent; } }
         private static Java.Lang.String _ACTION_PROVISION_MANAGED_DEVICEContent = default;
         private static bool _ACTION_PROVISION_MANAGED_DEVICEReady = false; // this is used because in case of generics 
@@ -847,7 +847,7 @@ public partial class DevicePolicyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME { get { if (!_EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAMEReady) { _EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME"); _EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAMEReady = true; } return _EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAMEContent; } }
         private static Java.Lang.String _EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAMEContent = default;
         private static bool _EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAMEReady = false; // this is used because in case of generics 
@@ -878,7 +878,7 @@ public partial class DevicePolicyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#EXTRA_PROVISIONING_EMAIL_ADDRESS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_PROVISIONING_EMAIL_ADDRESS { get { if (!_EXTRA_PROVISIONING_EMAIL_ADDRESSReady) { _EXTRA_PROVISIONING_EMAIL_ADDRESSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PROVISIONING_EMAIL_ADDRESS"); _EXTRA_PROVISIONING_EMAIL_ADDRESSReady = true; } return _EXTRA_PROVISIONING_EMAIL_ADDRESSContent; } }
         private static Java.Lang.String _EXTRA_PROVISIONING_EMAIL_ADDRESSContent = default;
         private static bool _EXTRA_PROVISIONING_EMAIL_ADDRESSReady = false; // this is used because in case of generics 
@@ -897,7 +897,7 @@ public partial class DevicePolicyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#EXTRA_PROVISIONING_KEEP_SCREEN_ON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_PROVISIONING_KEEP_SCREEN_ON { get { if (!_EXTRA_PROVISIONING_KEEP_SCREEN_ONReady) { _EXTRA_PROVISIONING_KEEP_SCREEN_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PROVISIONING_KEEP_SCREEN_ON"); _EXTRA_PROVISIONING_KEEP_SCREEN_ONReady = true; } return _EXTRA_PROVISIONING_KEEP_SCREEN_ONContent; } }
         private static Java.Lang.String _EXTRA_PROVISIONING_KEEP_SCREEN_ONContent = default;
         private static bool _EXTRA_PROVISIONING_KEEP_SCREEN_ONReady = false; // this is used because in case of generics 
@@ -922,14 +922,14 @@ public partial class DevicePolicyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#EXTRA_PROVISIONING_LOGO_URI"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_PROVISIONING_LOGO_URI { get { if (!_EXTRA_PROVISIONING_LOGO_URIReady) { _EXTRA_PROVISIONING_LOGO_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PROVISIONING_LOGO_URI"); _EXTRA_PROVISIONING_LOGO_URIReady = true; } return _EXTRA_PROVISIONING_LOGO_URIContent; } }
         private static Java.Lang.String _EXTRA_PROVISIONING_LOGO_URIContent = default;
         private static bool _EXTRA_PROVISIONING_LOGO_URIReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#EXTRA_PROVISIONING_MAIN_COLOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_PROVISIONING_MAIN_COLOR { get { if (!_EXTRA_PROVISIONING_MAIN_COLORReady) { _EXTRA_PROVISIONING_MAIN_COLORContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PROVISIONING_MAIN_COLOR"); _EXTRA_PROVISIONING_MAIN_COLORReady = true; } return _EXTRA_PROVISIONING_MAIN_COLORContent; } }
         private static Java.Lang.String _EXTRA_PROVISIONING_MAIN_COLORContent = default;
         private static bool _EXTRA_PROVISIONING_MAIN_COLORReady = false; // this is used because in case of generics 
@@ -972,7 +972,7 @@ public partial class DevicePolicyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#EXTRA_PROVISIONING_SKIP_USER_CONSENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_PROVISIONING_SKIP_USER_CONSENT { get { if (!_EXTRA_PROVISIONING_SKIP_USER_CONSENTReady) { _EXTRA_PROVISIONING_SKIP_USER_CONSENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PROVISIONING_SKIP_USER_CONSENT"); _EXTRA_PROVISIONING_SKIP_USER_CONSENTReady = true; } return _EXTRA_PROVISIONING_SKIP_USER_CONSENTContent; } }
         private static Java.Lang.String _EXTRA_PROVISIONING_SKIP_USER_CONSENTContent = default;
         private static bool _EXTRA_PROVISIONING_SKIP_USER_CONSENTReady = false; // this is used because in case of generics 
@@ -1123,200 +1123,87 @@ public partial class DevicePolicyManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getAccountTypesWithManagementDisabled()"/> 
-        /// </summary>
-        public Java.Lang.String[] AccountTypesWithManagementDisabled
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getAccountTypesWithManagementDisabled", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getActiveAdmins()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Content.ComponentName> ActiveAdmins
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.ComponentName>>("getActiveAdmins", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getAutoTimeRequired()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public bool AutoTimeRequired
-        {
-            get { return IExecuteWithSignature<bool>("getAutoTimeRequired", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getCredentialManagerPolicy()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setCredentialManagerPolicy(android.app.admin.PackagePolicy)"/>
-        /// </summary>
-        public Android.App.Admin.PackagePolicy CredentialManagerPolicy
-        {
-            get { return IExecuteWithSignature<Android.App.Admin.PackagePolicy>("getCredentialManagerPolicy", "()Landroid/app/admin/PackagePolicy;"); } set { IExecuteWithSignature("setCredentialManagerPolicy", "(Landroid/app/admin/PackagePolicy;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getCurrentFailedPasswordAttempts()"/> 
-        /// </summary>
-        public int CurrentFailedPasswordAttempts
-        {
-            get { return IExecuteWithSignature<int>("getCurrentFailedPasswordAttempts", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getDeviceOwnerLockScreenInfo()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence DeviceOwnerLockScreenInfo
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDeviceOwnerLockScreenInfo", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getDevicePolicyManagementRoleHolderPackage()"/> 
-        /// </summary>
-        public Java.Lang.String DevicePolicyManagementRoleHolderPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDevicePolicyManagementRoleHolderPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getEnrollmentSpecificId()"/> 
-        /// </summary>
-        public Java.Lang.String EnrollmentSpecificId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEnrollmentSpecificId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getManagedProfileCallerIdAccessPolicy()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setManagedProfileCallerIdAccessPolicy(android.app.admin.PackagePolicy)"/>
-        /// </summary>
-        public Android.App.Admin.PackagePolicy ManagedProfileCallerIdAccessPolicy
-        {
-            get { return IExecuteWithSignature<Android.App.Admin.PackagePolicy>("getManagedProfileCallerIdAccessPolicy", "()Landroid/app/admin/PackagePolicy;"); } set { IExecuteWithSignature("setManagedProfileCallerIdAccessPolicy", "(Landroid/app/admin/PackagePolicy;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getManagedProfileContactsAccessPolicy()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setManagedProfileContactsAccessPolicy(android.app.admin.PackagePolicy)"/>
-        /// </summary>
-        public Android.App.Admin.PackagePolicy ManagedProfileContactsAccessPolicy
-        {
-            get { return IExecuteWithSignature<Android.App.Admin.PackagePolicy>("getManagedProfileContactsAccessPolicy", "()Landroid/app/admin/PackagePolicy;"); } set { IExecuteWithSignature("setManagedProfileContactsAccessPolicy", "(Landroid/app/admin/PackagePolicy;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getManagedSubscriptionsPolicy()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setManagedSubscriptionsPolicy(android.app.admin.ManagedSubscriptionsPolicy)"/>
-        /// </summary>
-        public Android.App.Admin.ManagedSubscriptionsPolicy ManagedSubscriptionsPolicy
-        {
-            get { return IExecuteWithSignature<Android.App.Admin.ManagedSubscriptionsPolicy>("getManagedSubscriptionsPolicy", "()Landroid/app/admin/ManagedSubscriptionsPolicy;"); } set { IExecuteWithSignature("setManagedSubscriptionsPolicy", "(Landroid/app/admin/ManagedSubscriptionsPolicy;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getMinimumRequiredWifiSecurityLevel()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setMinimumRequiredWifiSecurityLevel(int)"/>
-        /// </summary>
-        public int MinimumRequiredWifiSecurityLevel
-        {
-            get { return IExecuteWithSignature<int>("getMinimumRequiredWifiSecurityLevel", "()I"); } set { IExecuteWithSignature("setMinimumRequiredWifiSecurityLevel", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getMtePolicy()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setMtePolicy(int)"/>
-        /// </summary>
-        public int MtePolicy
-        {
-            get { return IExecuteWithSignature<int>("getMtePolicy", "()I"); } set { IExecuteWithSignature("setMtePolicy", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getNearbyAppStreamingPolicy()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setNearbyAppStreamingPolicy(int)"/>
-        /// </summary>
-        public int NearbyAppStreamingPolicy
-        {
-            get { return IExecuteWithSignature<int>("getNearbyAppStreamingPolicy", "()I"); } set { IExecuteWithSignature("setNearbyAppStreamingPolicy", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getNearbyNotificationStreamingPolicy()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setNearbyNotificationStreamingPolicy(int)"/>
-        /// </summary>
-        public int NearbyNotificationStreamingPolicy
-        {
-            get { return IExecuteWithSignature<int>("getNearbyNotificationStreamingPolicy", "()I"); } set { IExecuteWithSignature("setNearbyNotificationStreamingPolicy", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getPasswordComplexity()"/> 
-        /// </summary>
-        public int PasswordComplexity
-        {
-            get { return IExecuteWithSignature<int>("getPasswordComplexity", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getPreferentialNetworkServiceConfigs()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setPreferentialNetworkServiceConfigs(java.util.List)"/>
-        /// </summary>
-        public Java.Util.List<Android.App.Admin.PreferentialNetworkServiceConfig> PreferentialNetworkServiceConfigs
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Admin.PreferentialNetworkServiceConfig>>("getPreferentialNetworkServiceConfigs", "()Ljava/util/List;"); } set { IExecuteWithSignature("setPreferentialNetworkServiceConfigs", "(Ljava/util/List;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getRequiredPasswordComplexity()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setRequiredPasswordComplexity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getParentProfileInstance(android.content.ComponentName)"/>
         /// </summary>
-        public int RequiredPasswordComplexity
+        /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
+        /// <returns><see cref="Android.App.Admin.DevicePolicyManager"/></returns>
+        public Android.App.Admin.DevicePolicyManager GetParentProfileInstance(Android.Content.ComponentName arg0)
         {
-            get { return IExecuteWithSignature<int>("getRequiredPasswordComplexity", "()I"); } set { IExecuteWithSignature("setRequiredPasswordComplexity", "(I)V", value); }
+            return IExecuteWithSignature<Android.App.Admin.DevicePolicyManager>("getParentProfileInstance", "(Landroid/content/ComponentName;)Landroid/app/admin/DevicePolicyManager;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getResources()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getResources()"/>
         /// </summary>
-        public Android.App.Admin.DevicePolicyResourcesManager Resources
+        /// <returns><see cref="Android.App.Admin.DevicePolicyResourcesManager"/></returns>
+        public Android.App.Admin.DevicePolicyResourcesManager GetResources()
         {
-            get { return IExecuteWithSignature<Android.App.Admin.DevicePolicyResourcesManager>("getResources", "()Landroid/app/admin/DevicePolicyResourcesManager;"); }
+            return IExecuteWithSignature<Android.App.Admin.DevicePolicyResourcesManager>("getResources", "()Landroid/app/admin/DevicePolicyResourcesManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getStorageEncryptionStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getFactoryResetProtectionPolicy(android.content.ComponentName)"/>
         /// </summary>
-        public int StorageEncryptionStatus
+        /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
+        /// <returns><see cref="Android.App.Admin.FactoryResetProtectionPolicy"/></returns>
+        public Android.App.Admin.FactoryResetProtectionPolicy GetFactoryResetProtectionPolicy(Android.Content.ComponentName arg0)
         {
-            get { return IExecuteWithSignature<int>("getStorageEncryptionStatus", "()I"); }
+            return IExecuteWithSignature<Android.App.Admin.FactoryResetProtectionPolicy>("getFactoryResetProtectionPolicy", "(Landroid/content/ComponentName;)Landroid/app/admin/FactoryResetProtectionPolicy;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getSystemUpdatePolicy()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getManagedSubscriptionsPolicy()"/>
         /// </summary>
-        public Android.App.Admin.SystemUpdatePolicy SystemUpdatePolicy
+        /// <returns><see cref="Android.App.Admin.ManagedSubscriptionsPolicy"/></returns>
+        public Android.App.Admin.ManagedSubscriptionsPolicy GetManagedSubscriptionsPolicy()
         {
-            get { return IExecuteWithSignature<Android.App.Admin.SystemUpdatePolicy>("getSystemUpdatePolicy", "()Landroid/app/admin/SystemUpdatePolicy;"); }
+            return IExecuteWithSignature<Android.App.Admin.ManagedSubscriptionsPolicy>("getManagedSubscriptionsPolicy", "()Landroid/app/admin/ManagedSubscriptionsPolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getTransferOwnershipBundle()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getCredentialManagerPolicy()"/>
         /// </summary>
-        public Android.Os.PersistableBundle TransferOwnershipBundle
+        /// <returns><see cref="Android.App.Admin.PackagePolicy"/></returns>
+        public Android.App.Admin.PackagePolicy GetCredentialManagerPolicy()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getTransferOwnershipBundle", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<Android.App.Admin.PackagePolicy>("getCredentialManagerPolicy", "()Landroid/app/admin/PackagePolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getUserRestrictionsGlobally()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getManagedProfileCallerIdAccessPolicy()"/>
         /// </summary>
-        public Android.Os.Bundle UserRestrictionsGlobally
+        /// <returns><see cref="Android.App.Admin.PackagePolicy"/></returns>
+        public Android.App.Admin.PackagePolicy GetManagedProfileCallerIdAccessPolicy()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getUserRestrictionsGlobally", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.App.Admin.PackagePolicy>("getManagedProfileCallerIdAccessPolicy", "()Landroid/app/admin/PackagePolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getWifiSsidPolicy()"/> <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setWifiSsidPolicy(android.app.admin.WifiSsidPolicy)"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getManagedProfileContactsAccessPolicy()"/>
         /// </summary>
-        public Android.App.Admin.WifiSsidPolicy WifiSsidPolicy
+        /// <returns><see cref="Android.App.Admin.PackagePolicy"/></returns>
+        public Android.App.Admin.PackagePolicy GetManagedProfileContactsAccessPolicy()
         {
-            get { return IExecuteWithSignature<Android.App.Admin.WifiSsidPolicy>("getWifiSsidPolicy", "()Landroid/app/admin/WifiSsidPolicy;"); } set { IExecuteWithSignature("setWifiSsidPolicy", "(Landroid/app/admin/WifiSsidPolicy;)V", value); }
+            return IExecuteWithSignature<Android.App.Admin.PackagePolicy>("getManagedProfileContactsAccessPolicy", "()Landroid/app/admin/PackagePolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getParentProfileInstance(android.content.ComponentName)"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getPendingSystemUpdate(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
-        /// <returns><see cref="Android.App.Admin.DevicePolicyManager"/></returns>
-        public Android.App.Admin.DevicePolicyManager GetParentProfileInstance(Android.Content.ComponentName arg0)
+        /// <returns><see cref="Android.App.Admin.SystemUpdateInfo"/></returns>
+        public Android.App.Admin.SystemUpdateInfo GetPendingSystemUpdate(Android.Content.ComponentName arg0)
         {
-            return IExecuteWithSignature<Android.App.Admin.DevicePolicyManager>("getParentProfileInstance", "(Landroid/content/ComponentName;)Landroid/app/admin/DevicePolicyManager;", arg0);
+            return IExecuteWithSignature<Android.App.Admin.SystemUpdateInfo>("getPendingSystemUpdate", "(Landroid/content/ComponentName;)Landroid/app/admin/SystemUpdateInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getFactoryResetProtectionPolicy(android.content.ComponentName)"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getSystemUpdatePolicy()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
-        /// <returns><see cref="Android.App.Admin.FactoryResetProtectionPolicy"/></returns>
-        public Android.App.Admin.FactoryResetProtectionPolicy GetFactoryResetProtectionPolicy(Android.Content.ComponentName arg0)
+        /// <returns><see cref="Android.App.Admin.SystemUpdatePolicy"/></returns>
+        public Android.App.Admin.SystemUpdatePolicy GetSystemUpdatePolicy()
         {
-            return IExecuteWithSignature<Android.App.Admin.FactoryResetProtectionPolicy>("getFactoryResetProtectionPolicy", "(Landroid/content/ComponentName;)Landroid/app/admin/FactoryResetProtectionPolicy;", arg0);
+            return IExecuteWithSignature<Android.App.Admin.SystemUpdatePolicy>("getSystemUpdatePolicy", "()Landroid/app/admin/SystemUpdatePolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getPendingSystemUpdate(android.content.ComponentName)"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getWifiSsidPolicy()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
-        /// <returns><see cref="Android.App.Admin.SystemUpdateInfo"/></returns>
-        public Android.App.Admin.SystemUpdateInfo GetPendingSystemUpdate(Android.Content.ComponentName arg0)
+        /// <returns><see cref="Android.App.Admin.WifiSsidPolicy"/></returns>
+        public Android.App.Admin.WifiSsidPolicy GetWifiSsidPolicy()
         {
-            return IExecuteWithSignature<Android.App.Admin.SystemUpdateInfo>("getPendingSystemUpdate", "(Landroid/content/ComponentName;)Landroid/app/admin/SystemUpdateInfo;", arg0);
+            return IExecuteWithSignature<Android.App.Admin.WifiSsidPolicy>("getWifiSsidPolicy", "()Landroid/app/admin/WifiSsidPolicy;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#createAdminSupportIntent(java.lang.String)"/>
@@ -1347,6 +1234,22 @@ public Android.Os.Bundle GetUserRestrictions(Android.Content.ComponentName arg0)
             return IExecuteWithSignature<Android.Os.Bundle>("getUserRestrictions", "(Landroid/content/ComponentName;)Landroid/os/Bundle;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getUserRestrictionsGlobally()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetUserRestrictionsGlobally()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getUserRestrictionsGlobally", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getTransferOwnershipBundle()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetTransferOwnershipBundle()
+        {
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getTransferOwnershipBundle", "()Landroid/os/PersistableBundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#createAndManageUser(android.content.ComponentName,java.lang.String,android.content.ComponentName,android.os.PersistableBundle,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -1442,6 +1345,15 @@ public bool GetAutoTimeEnabled(Android.Content.ComponentName arg0)
             return IExecuteWithSignature<bool>("getAutoTimeEnabled", "(Landroid/content/ComponentName;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getAutoTimeRequired()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetAutoTimeRequired()
+        {
+            return IExecuteWithSignature<bool>("getAutoTimeRequired", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getAutoTimeZoneEnabled(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -1473,7 +1385,7 @@ public bool GetCameraDisabled(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool GetCrossProfileCallerIdDisabled(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<bool>("getCrossProfileCallerIdDisabled", "(Landroid/content/ComponentName;)Z", arg0);
@@ -1483,7 +1395,7 @@ public bool GetCrossProfileCallerIdDisabled(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool GetCrossProfileContactsSearchDisabled(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<bool>("getCrossProfileContactsSearchDisabled", "(Landroid/content/ComponentName;)Z", arg0);
@@ -1502,7 +1414,7 @@ public bool GetScreenCaptureDisabled(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool GetStorageEncryption(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<bool>("getStorageEncryption", "(Landroid/content/ComponentName;)Z", arg0);
@@ -1688,7 +1600,7 @@ public bool IsBackupServiceEnabled(Android.Content.ComponentName arg0)
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#isCallerApplicationRestrictionsManagingPackage()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsCallerApplicationRestrictionsManagingPackage()
         {
             return IExecuteWithSignature<bool>("isCallerApplicationRestrictionsManagingPackage", "()Z");
@@ -1976,7 +1888,7 @@ public bool RequestBugreport(Android.Content.ComponentName arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ResetPassword(Java.Lang.String arg0, int arg1)
         {
             return IExecute<bool>("resetPassword", arg0, arg1);
@@ -2170,6 +2082,14 @@ public int EnableSystemApp(Android.Content.ComponentName arg0, Android.Content.I
             return IExecute<int>("enableSystemApp", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getCurrentFailedPasswordAttempts()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentFailedPasswordAttempts()
+        {
+            return IExecuteWithSignature<int>("getCurrentFailedPasswordAttempts", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getGlobalPrivateDnsMode(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -2206,16 +2126,56 @@ public int GetMaximumFailedPasswordsForWipe(Android.Content.ComponentName arg0)
             return IExecuteWithSignature<int>("getMaximumFailedPasswordsForWipe", "(Landroid/content/ComponentName;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getMinimumRequiredWifiSecurityLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumRequiredWifiSecurityLevel()
+        {
+            return IExecuteWithSignature<int>("getMinimumRequiredWifiSecurityLevel", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getMtePolicy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMtePolicy()
+        {
+            return IExecuteWithSignature<int>("getMtePolicy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getNearbyAppStreamingPolicy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNearbyAppStreamingPolicy()
+        {
+            return IExecuteWithSignature<int>("getNearbyAppStreamingPolicy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getNearbyNotificationStreamingPolicy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNearbyNotificationStreamingPolicy()
+        {
+            return IExecuteWithSignature<int>("getNearbyNotificationStreamingPolicy", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getOrganizationColor(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetOrganizationColor(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getOrganizationColor", "(Landroid/content/ComponentName;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getPasswordComplexity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPasswordComplexity()
+        {
+            return IExecuteWithSignature<int>("getPasswordComplexity", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getPasswordHistoryLength(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -2238,7 +2198,7 @@ public int GetPasswordMaximumLength(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPasswordMinimumLength(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getPasswordMinimumLength", "(Landroid/content/ComponentName;)I", arg0);
@@ -2248,7 +2208,7 @@ public int GetPasswordMinimumLength(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPasswordMinimumLetters(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getPasswordMinimumLetters", "(Landroid/content/ComponentName;)I", arg0);
@@ -2258,7 +2218,7 @@ public int GetPasswordMinimumLetters(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPasswordMinimumLowerCase(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getPasswordMinimumLowerCase", "(Landroid/content/ComponentName;)I", arg0);
@@ -2268,7 +2228,7 @@ public int GetPasswordMinimumLowerCase(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPasswordMinimumNonLetter(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getPasswordMinimumNonLetter", "(Landroid/content/ComponentName;)I", arg0);
@@ -2278,7 +2238,7 @@ public int GetPasswordMinimumNonLetter(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPasswordMinimumNumeric(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getPasswordMinimumNumeric", "(Landroid/content/ComponentName;)I", arg0);
@@ -2288,7 +2248,7 @@ public int GetPasswordMinimumNumeric(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPasswordMinimumSymbols(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getPasswordMinimumSymbols", "(Landroid/content/ComponentName;)I", arg0);
@@ -2298,7 +2258,7 @@ public int GetPasswordMinimumSymbols(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPasswordMinimumUpperCase(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getPasswordMinimumUpperCase", "(Landroid/content/ComponentName;)I", arg0);
@@ -2308,7 +2268,7 @@ public int GetPasswordMinimumUpperCase(Android.Content.ComponentName arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPasswordQuality(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<int>("getPasswordQuality", "(Landroid/content/ComponentName;)I", arg0);
@@ -2343,6 +2303,22 @@ public int GetPersonalAppsSuspendedReasons(Android.Content.ComponentName arg0)
             return IExecuteWithSignature<int>("getPersonalAppsSuspendedReasons", "(Landroid/content/ComponentName;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getRequiredPasswordComplexity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRequiredPasswordComplexity()
+        {
+            return IExecuteWithSignature<int>("getRequiredPasswordComplexity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getStorageEncryptionStatus()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStorageEncryptionStatus()
+        {
+            return IExecuteWithSignature<int>("getStorageEncryptionStatus", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#logoutUser(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -2376,7 +2352,7 @@ public int SetGlobalPrivateDnsModeSpecifiedHost(Android.Content.ComponentName ar
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SetStorageEncryption(Android.Content.ComponentName arg0, bool arg1)
         {
             return IExecute<int>("setStorageEncryption", arg0, arg1);
@@ -2402,6 +2378,14 @@ public int StopUser(Android.Content.ComponentName arg0, Android.Os.UserHandle ar
             return IExecute<int>("stopUser", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getDeviceOwnerLockScreenInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDeviceOwnerLockScreenInfo()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDeviceOwnerLockScreenInfo", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getEndUserSessionMessage(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -2460,7 +2444,7 @@ public Java.Lang.String GetAlwaysOnVpnPackage(Android.Content.ComponentName arg0
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetApplicationRestrictionsManagingPackage(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getApplicationRestrictionsManagingPackage", "(Landroid/content/ComponentName;)Ljava/lang/String;", arg0);
@@ -2471,12 +2455,28 @@ public Java.Lang.String GetApplicationRestrictionsManagingPackage(Android.Conten
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Lang.SecurityException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetCertInstallerPackage(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getCertInstallerPackage", "(Landroid/content/ComponentName;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getDevicePolicyManagementRoleHolderPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDevicePolicyManagementRoleHolderPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDevicePolicyManagementRoleHolderPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getEnrollmentSpecificId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEnrollmentSpecificId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getEnrollmentSpecificId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getGlobalPrivateDnsHost(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -2495,6 +2495,14 @@ public Java.Lang.String GetWifiMacAddress(Android.Content.ComponentName arg0)
             return IExecuteWithSignature<Java.Lang.String>("getWifiMacAddress", "(Landroid/content/ComponentName;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getAccountTypesWithManagementDisabled()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetAccountTypesWithManagementDisabled()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getAccountTypesWithManagementDisabled", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getLockTaskPackages(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -2525,6 +2533,14 @@ public Java.Lang.String[] SetPackagesSuspended(Android.Content.ComponentName arg
             return IExecute<Java.Util.List<Android.App.Admin.NetworkEvent>>("retrieveNetworkLogs", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getPreferentialNetworkServiceConfigs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Admin.PreferentialNetworkServiceConfig> GetPreferentialNetworkServiceConfigs()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.Admin.PreferentialNetworkServiceConfig>>("getPreferentialNetworkServiceConfigs", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#retrievePreRebootSecurityLogs(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -2543,6 +2559,14 @@ public Java.Lang.String[] SetPackagesSuspended(Android.Content.ComponentName arg
             return IExecuteWithSignature<Java.Util.List<Android.App.Admin.SecurityLog.SecurityEvent>>("retrieveSecurityLogs", "(Landroid/content/ComponentName;)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getActiveAdmins()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.ComponentName> GetActiveAdmins()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Content.ComponentName>>("getActiveAdmins", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#getTrustAgentConfiguration(android.content.ComponentName,android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -2721,7 +2745,7 @@ public Java.Util.List<byte[]> GetInstalledCaCerts(Android.Content.ComponentName
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Set<Java.Lang.String> GetCrossProfileCalendarPackages(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getCrossProfileCalendarPackages", "(Landroid/content/ComponentName;)Ljava/util/Set;", arg0);
@@ -2847,7 +2871,7 @@ public void ClearCrossProfileIntentFilters(Android.Content.ComponentName arg0)
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#clearDeviceOwnerApp(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearDeviceOwnerApp(Java.Lang.String arg0)
         {
             IExecuteWithSignature("clearDeviceOwnerApp", "(Ljava/lang/String;)V", arg0);
@@ -2865,7 +2889,7 @@ public void ClearPackagePersistentPreferredActivities(Android.Content.ComponentN
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#clearProfileOwner(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearProfileOwner(Android.Content.ComponentName arg0)
         {
             IExecuteWithSignature("clearProfileOwner", "(Landroid/content/ComponentName;)V", arg0);
@@ -2988,7 +3012,7 @@ public void SetApplicationRestrictions(Android.Content.ComponentName arg0, Java.
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Android.Content.Pm.PackageManager.NameNotFoundException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetApplicationRestrictionsManagingPackage(Android.Content.ComponentName arg0, Java.Lang.String arg1)
         {
             IExecute("setApplicationRestrictionsManagingPackage", arg0, arg1);
@@ -3007,7 +3031,7 @@ public void SetAutoTimeEnabled(Android.Content.ComponentName arg0, bool arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAutoTimeRequired(Android.Content.ComponentName arg0, bool arg1)
         {
             IExecute("setAutoTimeRequired", arg0, arg1);
@@ -3054,7 +3078,7 @@ public void SetCameraDisabled(Android.Content.ComponentName arg0, bool arg1)
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Lang.SecurityException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCertInstallerPackage(Android.Content.ComponentName arg0, Java.Lang.String arg1)
         {
             IExecute("setCertInstallerPackage", arg0, arg1);
@@ -3078,11 +3102,19 @@ public void SetConfiguredNetworksLockdownState(Android.Content.ComponentName arg
             IExecute("setConfiguredNetworksLockdownState", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setCredentialManagerPolicy(android.app.admin.PackagePolicy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.Admin.PackagePolicy"/></param>
+        public void SetCredentialManagerPolicy(Android.App.Admin.PackagePolicy arg0)
+        {
+            IExecuteWithSignature("setCredentialManagerPolicy", "(Landroid/app/admin/PackagePolicy;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setCrossProfileCalendarPackages(android.content.ComponentName,java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCrossProfileCalendarPackages(Android.Content.ComponentName arg0, Java.Util.Set<Java.Lang.String> arg1)
         {
             IExecute("setCrossProfileCalendarPackages", arg0, arg1);
@@ -3092,7 +3124,7 @@ public void SetCrossProfileCalendarPackages(Android.Content.ComponentName arg0,
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCrossProfileCallerIdDisabled(Android.Content.ComponentName arg0, bool arg1)
         {
             IExecute("setCrossProfileCallerIdDisabled", arg0, arg1);
@@ -3102,7 +3134,7 @@ public void SetCrossProfileCallerIdDisabled(Android.Content.ComponentName arg0,
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCrossProfileContactsSearchDisabled(Android.Content.ComponentName arg0, bool arg1)
         {
             IExecute("setCrossProfileContactsSearchDisabled", arg0, arg1);
@@ -3245,6 +3277,22 @@ public void SetLongSupportMessage(Android.Content.ComponentName arg0, Java.Lang.
             IExecute("setLongSupportMessage", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setManagedProfileCallerIdAccessPolicy(android.app.admin.PackagePolicy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.Admin.PackagePolicy"/></param>
+        public void SetManagedProfileCallerIdAccessPolicy(Android.App.Admin.PackagePolicy arg0)
+        {
+            IExecuteWithSignature("setManagedProfileCallerIdAccessPolicy", "(Landroid/app/admin/PackagePolicy;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setManagedProfileContactsAccessPolicy(android.app.admin.PackagePolicy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.Admin.PackagePolicy"/></param>
+        public void SetManagedProfileContactsAccessPolicy(Android.App.Admin.PackagePolicy arg0)
+        {
+            IExecuteWithSignature("setManagedProfileContactsAccessPolicy", "(Landroid/app/admin/PackagePolicy;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setManagedProfileMaximumTimeOff(android.content.ComponentName,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -3254,6 +3302,14 @@ public void SetManagedProfileMaximumTimeOff(Android.Content.ComponentName arg0,
             IExecute("setManagedProfileMaximumTimeOff", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setManagedSubscriptionsPolicy(android.app.admin.ManagedSubscriptionsPolicy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.Admin.ManagedSubscriptionsPolicy"/></param>
+        public void SetManagedSubscriptionsPolicy(Android.App.Admin.ManagedSubscriptionsPolicy arg0)
+        {
+            IExecuteWithSignature("setManagedSubscriptionsPolicy", "(Landroid/app/admin/ManagedSubscriptionsPolicy;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setMasterVolumeMuted(android.content.ComponentName,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -3281,6 +3337,38 @@ public void SetMaximumTimeToLock(Android.Content.ComponentName arg0, long arg1)
             IExecute("setMaximumTimeToLock", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setMinimumRequiredWifiSecurityLevel(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumRequiredWifiSecurityLevel(int arg0)
+        {
+            IExecuteWithSignature("setMinimumRequiredWifiSecurityLevel", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setMtePolicy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMtePolicy(int arg0)
+        {
+            IExecuteWithSignature("setMtePolicy", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setNearbyAppStreamingPolicy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNearbyAppStreamingPolicy(int arg0)
+        {
+            IExecuteWithSignature("setNearbyAppStreamingPolicy", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setNearbyNotificationStreamingPolicy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNearbyNotificationStreamingPolicy(int arg0)
+        {
+            IExecuteWithSignature("setNearbyNotificationStreamingPolicy", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setNetworkLoggingEnabled(android.content.ComponentName,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -3294,7 +3382,7 @@ public void SetNetworkLoggingEnabled(Android.Content.ComponentName arg0, bool ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOrganizationColor(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setOrganizationColor", arg0, arg1);
@@ -3348,7 +3436,7 @@ public void SetPasswordHistoryLength(Android.Content.ComponentName arg0, int arg
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPasswordMinimumLength(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setPasswordMinimumLength", arg0, arg1);
@@ -3358,7 +3446,7 @@ public void SetPasswordMinimumLength(Android.Content.ComponentName arg0, int arg
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPasswordMinimumLetters(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setPasswordMinimumLetters", arg0, arg1);
@@ -3368,7 +3456,7 @@ public void SetPasswordMinimumLetters(Android.Content.ComponentName arg0, int ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPasswordMinimumLowerCase(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setPasswordMinimumLowerCase", arg0, arg1);
@@ -3378,7 +3466,7 @@ public void SetPasswordMinimumLowerCase(Android.Content.ComponentName arg0, int
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPasswordMinimumNonLetter(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setPasswordMinimumNonLetter", arg0, arg1);
@@ -3388,7 +3476,7 @@ public void SetPasswordMinimumNonLetter(Android.Content.ComponentName arg0, int
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPasswordMinimumNumeric(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setPasswordMinimumNumeric", arg0, arg1);
@@ -3398,7 +3486,7 @@ public void SetPasswordMinimumNumeric(Android.Content.ComponentName arg0, int ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPasswordMinimumSymbols(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setPasswordMinimumSymbols", arg0, arg1);
@@ -3408,7 +3496,7 @@ public void SetPasswordMinimumSymbols(Android.Content.ComponentName arg0, int ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPasswordMinimumUpperCase(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setPasswordMinimumUpperCase", arg0, arg1);
@@ -3418,7 +3506,7 @@ public void SetPasswordMinimumUpperCase(Android.Content.ComponentName arg0, int
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPasswordQuality(Android.Content.ComponentName arg0, int arg1)
         {
             IExecute("setPasswordQuality", arg0, arg1);
@@ -3442,6 +3530,14 @@ public void SetPersonalAppsSuspended(Android.Content.ComponentName arg0, bool ar
             IExecute("setPersonalAppsSuspended", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setPreferentialNetworkServiceConfigs(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetPreferentialNetworkServiceConfigs(Java.Util.List<Android.App.Admin.PreferentialNetworkServiceConfig> arg0)
+        {
+            IExecuteWithSignature("setPreferentialNetworkServiceConfigs", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setPreferentialNetworkServiceEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -3476,6 +3572,14 @@ public void SetRecommendedGlobalProxy(Android.Content.ComponentName arg0, Androi
             IExecute("setRecommendedGlobalProxy", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setRequiredPasswordComplexity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRequiredPasswordComplexity(int arg0)
+        {
+            IExecuteWithSignature("setRequiredPasswordComplexity", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setRequiredStrongAuthTimeout(android.content.ComponentName,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -3605,6 +3709,14 @@ public void SetUserIcon(Android.Content.ComponentName arg0, Android.Graphics.Bit
             IExecute("setUserIcon", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setWifiSsidPolicy(android.app.admin.WifiSsidPolicy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.Admin.WifiSsidPolicy"/></param>
+        public void SetWifiSsidPolicy(Android.App.Admin.WifiSsidPolicy arg0)
+        {
+            IExecuteWithSignature("setWifiSsidPolicy", "(Landroid/app/admin/WifiSsidPolicy;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#transferOwnership(android.content.ComponentName,android.content.ComponentName,android.os.PersistableBundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -3755,7 +3867,7 @@ public partial class OnClearApplicationUserDataListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onApplicationUserDataCleared", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnApplicationUserDataClearedEventHandler));
+                AddEventHandler("onApplicationUserDataCleared", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnApplicationUserDataClearedEventHandler));
 
             }
 
@@ -3763,7 +3875,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/admin/DevicePolicyManager.OnClearApplicationUserDataListener.html#onApplicationUserDataCleared(java.lang.String,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnApplicationUserDataCleared"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, bool> OnOnApplicationUserDataCleared { get; set; } = null;
+            public global::System.Action<Java.Lang.String, bool> OnOnApplicationUserDataCleared { get; set; } = null;
 
             void OnApplicationUserDataClearedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/DnsEvent.cs b/src/net/Netdroid/Generated/Android/App/Admin/DnsEvent.cs
index 9f020cefe..8b0273ce0 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/DnsEvent.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/DnsEvent.cs
@@ -52,25 +52,28 @@ public partial class DnsEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DnsEvent.html#getHostname()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DnsEvent.html#getTotalResolvedAddressCount()"/>
         /// </summary>
-        public Java.Lang.String Hostname
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalResolvedAddressCount()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHostname", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getTotalResolvedAddressCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DnsEvent.html#getInetAddresses()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DnsEvent.html#getHostname()"/>
         /// </summary>
-        public Java.Util.List<Java.Net.InetAddress> InetAddresses
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHostname()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Net.InetAddress>>("getInetAddresses", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHostname", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/DnsEvent.html#getTotalResolvedAddressCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/DnsEvent.html#getInetAddresses()"/>
         /// </summary>
-        public int TotalResolvedAddressCount
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Net.InetAddress> GetInetAddresses()
         {
-            get { return IExecuteWithSignature<int>("getTotalResolvedAddressCount", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Net.InetAddress>>("getInetAddresses", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/FactoryResetProtectionPolicy.cs b/src/net/Netdroid/Generated/Android/App/Admin/FactoryResetProtectionPolicy.cs
index 394d78afd..13b42758e 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/FactoryResetProtectionPolicy.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/FactoryResetProtectionPolicy.cs
@@ -52,13 +52,6 @@ public partial class FactoryResetProtectionPolicy
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/FactoryResetProtectionPolicy.html#getFactoryResetProtectionAccounts()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> FactoryResetProtectionAccounts
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFactoryResetProtectionAccounts", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/FactoryResetProtectionPolicy.html#isFactoryResetProtectionEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/FactoryResetProtectionPolicy.html#getFactoryResetProtectionAccounts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetFactoryResetProtectionAccounts()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFactoryResetProtectionAccounts", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/FactoryResetProtectionPolicy.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/FreezePeriod.cs b/src/net/Netdroid/Generated/Android/App/Admin/FreezePeriod.cs
index bb0ca9a74..e816cbcb3 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/FreezePeriod.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/FreezePeriod.cs
@@ -55,18 +55,20 @@ public FreezePeriod(Java.Time.MonthDay arg0, Java.Time.MonthDay arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/FreezePeriod.html#getEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/FreezePeriod.html#getEnd()"/>
         /// </summary>
-        public Java.Time.MonthDay End
+        /// <returns><see cref="Java.Time.MonthDay"/></returns>
+        public Java.Time.MonthDay GetEnd()
         {
-            get { return IExecuteWithSignature<Java.Time.MonthDay>("getEnd", "()Ljava/time/MonthDay;"); }
+            return IExecuteWithSignature<Java.Time.MonthDay>("getEnd", "()Ljava/time/MonthDay;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/FreezePeriod.html#getStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/FreezePeriod.html#getStart()"/>
         /// </summary>
-        public Java.Time.MonthDay Start
+        /// <returns><see cref="Java.Time.MonthDay"/></returns>
+        public Java.Time.MonthDay GetStart()
         {
-            get { return IExecuteWithSignature<Java.Time.MonthDay>("getStart", "()Ljava/time/MonthDay;"); }
+            return IExecuteWithSignature<Java.Time.MonthDay>("getStart", "()Ljava/time/MonthDay;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/ManagedSubscriptionsPolicy.cs b/src/net/Netdroid/Generated/Android/App/Admin/ManagedSubscriptionsPolicy.cs
index 2808ff47d..60fc262be 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/ManagedSubscriptionsPolicy.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/ManagedSubscriptionsPolicy.cs
@@ -72,19 +72,20 @@ public ManagedSubscriptionsPolicy(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/ManagedSubscriptionsPolicy.html#getPolicyType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/ManagedSubscriptionsPolicy.html#describeContents()"/>
         /// </summary>
-        public int PolicyType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPolicyType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/ManagedSubscriptionsPolicy.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/ManagedSubscriptionsPolicy.html#getPolicyType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetPolicyType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getPolicyType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/ManagedSubscriptionsPolicy.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/NetworkEvent.cs b/src/net/Netdroid/Generated/Android/App/Admin/NetworkEvent.cs
index 44059dbeb..fd1638e26 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/NetworkEvent.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/NetworkEvent.cs
@@ -52,42 +52,45 @@ public partial class NetworkEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
-        public long Id
+        /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
-            get { return IExecuteWithSignature<long>("getId", "()J"); }
+            IExecute("writeToParcel", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#getPackageName()"/>
         /// </summary>
-        public long Timestamp
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<long>("getTimestamp", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#writeToParcel(android.os.Parcel,int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#getId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
+        /// <returns><see cref="long"/></returns>
+        public long GetId()
         {
-            IExecute("writeToParcel", arg0, arg1);
+            return IExecuteWithSignature<long>("getId", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/NetworkEvent.html#getTimestamp()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestamp()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTimestamp", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/PackagePolicy.cs b/src/net/Netdroid/Generated/Android/App/Admin/PackagePolicy.cs
index c959cfa65..4b43b4e82 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/PackagePolicy.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/PackagePolicy.cs
@@ -87,26 +87,28 @@ public PackagePolicy(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/PackagePolicy.html#getPackageNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/PackagePolicy.html#describeContents()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> PackageNames
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPackageNames", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/PackagePolicy.html#getPolicyType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/PackagePolicy.html#getPolicyType()"/>
         /// </summary>
-        public int PolicyType
+        /// <returns><see cref="int"/></returns>
+        public int GetPolicyType()
         {
-            get { return IExecuteWithSignature<int>("getPolicyType", "()I"); }
+            return IExecuteWithSignature<int>("getPolicyType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/PackagePolicy.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/PackagePolicy.html#getPackageNames()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetPackageNames()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPackageNames", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/PackagePolicy.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/PolicyUpdateResult.cs b/src/net/Netdroid/Generated/Android/App/Admin/PolicyUpdateResult.cs
index 6c0ac003a..a191e8e37 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/PolicyUpdateResult.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/PolicyUpdateResult.cs
@@ -90,11 +90,12 @@ public PolicyUpdateResult(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/PolicyUpdateResult.html#getResultCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/PolicyUpdateResult.html#getResultCode()"/>
         /// </summary>
-        public int ResultCode
+        /// <returns><see cref="int"/></returns>
+        public int GetResultCode()
         {
-            get { return IExecuteWithSignature<int>("getResultCode", "()I"); }
+            return IExecuteWithSignature<int>("getResultCode", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/PreferentialNetworkServiceConfig.cs b/src/net/Netdroid/Generated/Android/App/Admin/PreferentialNetworkServiceConfig.cs
index 0f5f4bbc9..43b93823e 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/PreferentialNetworkServiceConfig.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/PreferentialNetworkServiceConfig.cs
@@ -82,27 +82,6 @@ public partial class PreferentialNetworkServiceConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/PreferentialNetworkServiceConfig.html#getExcludedUids()"/> 
-        /// </summary>
-        public int[] ExcludedUids
-        {
-            get { return IExecuteWithSignatureArray<int>("getExcludedUids", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/PreferentialNetworkServiceConfig.html#getIncludedUids()"/> 
-        /// </summary>
-        public int[] IncludedUids
-        {
-            get { return IExecuteWithSignatureArray<int>("getIncludedUids", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/PreferentialNetworkServiceConfig.html#getNetworkId()"/> 
-        /// </summary>
-        public int NetworkId
-        {
-            get { return IExecuteWithSignature<int>("getNetworkId", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/PreferentialNetworkServiceConfig.html#isEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -135,6 +114,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/PreferentialNetworkServiceConfig.html#getNetworkId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkId()
+        {
+            return IExecuteWithSignature<int>("getNetworkId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/PreferentialNetworkServiceConfig.html#getExcludedUids()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetExcludedUids()
+        {
+            return IExecuteWithSignatureArray<int>("getExcludedUids", "()[I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/admin/PreferentialNetworkServiceConfig.html#getIncludedUids()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetIncludedUids()
+        {
+            return IExecuteWithSignatureArray<int>("getIncludedUids", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/PreferentialNetworkServiceConfig.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/SecurityLog.cs b/src/net/Netdroid/Generated/Android/App/Admin/SecurityLog.cs
index 73bd6dd9e..e3d048974 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/SecurityLog.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/SecurityLog.cs
@@ -352,47 +352,52 @@ public partial class SecurityEvent
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getData()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#describeContents()"/>
             /// </summary>
-            public object Data
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature("getData", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getLogLevel()"/>
             /// </summary>
-            public long Id
+            /// <returns><see cref="int"/></returns>
+            public int GetLogLevel()
             {
-                get { return IExecuteWithSignature<long>("getId", "()J"); }
+                return IExecuteWithSignature<int>("getLogLevel", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getLogLevel()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getTag()"/>
             /// </summary>
-            public int LogLevel
+            /// <returns><see cref="int"/></returns>
+            public int GetTag()
             {
-                get { return IExecuteWithSignature<int>("getLogLevel", "()I"); }
+                return IExecuteWithSignature<int>("getTag", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getTag()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getData()"/>
             /// </summary>
-            public int Tag
+            /// <returns><see cref="object"/></returns>
+            public object GetData()
             {
-                get { return IExecuteWithSignature<int>("getTag", "()I"); }
+                return IExecuteWithSignature("getData", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getTimeNanos()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getId()"/>
             /// </summary>
-            public long TimeNanos
+            /// <returns><see cref="long"/></returns>
+            public long GetId()
             {
-                get { return IExecuteWithSignature<long>("getTimeNanos", "()J"); }
+                return IExecuteWithSignature<long>("getId", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#getTimeNanos()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="long"/></returns>
+            public long GetTimeNanos()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<long>("getTimeNanos", "()J");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/admin/SecurityLog.SecurityEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/SystemUpdateInfo.cs b/src/net/Netdroid/Generated/Android/App/Admin/SystemUpdateInfo.cs
index 34d0414f2..a31b1a277 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/SystemUpdateInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/SystemUpdateInfo.cs
@@ -70,26 +70,28 @@ public partial class SystemUpdateInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdateInfo.html#getReceivedTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdateInfo.html#describeContents()"/>
         /// </summary>
-        public long ReceivedTime
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getReceivedTime", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdateInfo.html#getSecurityPatchState()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdateInfo.html#getSecurityPatchState()"/>
         /// </summary>
-        public int SecurityPatchState
+        /// <returns><see cref="int"/></returns>
+        public int GetSecurityPatchState()
         {
-            get { return IExecuteWithSignature<int>("getSecurityPatchState", "()I"); }
+            return IExecuteWithSignature<int>("getSecurityPatchState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdateInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdateInfo.html#getReceivedTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetReceivedTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getReceivedTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdateInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/SystemUpdatePolicy.cs b/src/net/Netdroid/Generated/Android/App/Admin/SystemUpdatePolicy.cs
index bb5155dce..69b23a63d 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/SystemUpdatePolicy.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/SystemUpdatePolicy.cs
@@ -96,49 +96,53 @@ public static Android.App.Admin.SystemUpdatePolicy CreateWindowedInstallPolicy(i
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#getFreezePeriods()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#setFreezePeriods(java.util.List)"/>
         /// </summary>
-        public Java.Util.List<Android.App.Admin.FreezePeriod> FreezePeriods
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <returns><see cref="Android.App.Admin.SystemUpdatePolicy"/></returns>
+        public Android.App.Admin.SystemUpdatePolicy SetFreezePeriods(Java.Util.List<Android.App.Admin.FreezePeriod> arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Admin.FreezePeriod>>("getFreezePeriods", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.App.Admin.SystemUpdatePolicy>("setFreezePeriods", "(Ljava/util/List;)Landroid/app/admin/SystemUpdatePolicy;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#getInstallWindowEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#describeContents()"/>
         /// </summary>
-        public int InstallWindowEnd
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getInstallWindowEnd", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#getInstallWindowStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#getInstallWindowEnd()"/>
         /// </summary>
-        public int InstallWindowStart
+        /// <returns><see cref="int"/></returns>
+        public int GetInstallWindowEnd()
         {
-            get { return IExecuteWithSignature<int>("getInstallWindowStart", "()I"); }
+            return IExecuteWithSignature<int>("getInstallWindowEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#getPolicyType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#getInstallWindowStart()"/>
         /// </summary>
-        public int PolicyType
+        /// <returns><see cref="int"/></returns>
+        public int GetInstallWindowStart()
         {
-            get { return IExecuteWithSignature<int>("getPolicyType", "()I"); }
+            return IExecuteWithSignature<int>("getInstallWindowStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#setFreezePeriods(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#getPolicyType()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <returns><see cref="Android.App.Admin.SystemUpdatePolicy"/></returns>
-        public Android.App.Admin.SystemUpdatePolicy SetFreezePeriods(Java.Util.List<Android.App.Admin.FreezePeriod> arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPolicyType()
         {
-            return IExecuteWithSignature<Android.App.Admin.SystemUpdatePolicy>("setFreezePeriods", "(Ljava/util/List;)Landroid/app/admin/SystemUpdatePolicy;", arg0);
+            return IExecuteWithSignature<int>("getPolicyType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#getFreezePeriods()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Admin.FreezePeriod> GetFreezePeriods()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.App.Admin.FreezePeriod>>("getFreezePeriods", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/SystemUpdatePolicy.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Admin/WifiSsidPolicy.cs b/src/net/Netdroid/Generated/Android/App/Admin/WifiSsidPolicy.cs
index 5c7de7fc2..f5ab83b44 100644
--- a/src/net/Netdroid/Generated/Android/App/Admin/WifiSsidPolicy.cs
+++ b/src/net/Netdroid/Generated/Android/App/Admin/WifiSsidPolicy.cs
@@ -73,26 +73,28 @@ public WifiSsidPolicy(int arg0, Java.Util.Set<Android.Net.Wifi.WifiSsid> arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/WifiSsidPolicy.html#getPolicyType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/WifiSsidPolicy.html#describeContents()"/>
         /// </summary>
-        public int PolicyType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPolicyType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/WifiSsidPolicy.html#getSsids()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/admin/WifiSsidPolicy.html#getPolicyType()"/>
         /// </summary>
-        public Java.Util.Set<Android.Net.Wifi.WifiSsid> Ssids
+        /// <returns><see cref="int"/></returns>
+        public int GetPolicyType()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Net.Wifi.WifiSsid>>("getSsids", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("getPolicyType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/admin/WifiSsidPolicy.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/admin/WifiSsidPolicy.html#getSsids()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Net.Wifi.WifiSsid> GetSsids()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Android.Net.Wifi.WifiSsid>>("getSsids", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/admin/WifiSsidPolicy.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/AlarmManager.cs b/src/net/Netdroid/Generated/Android/App/AlarmManager.cs
index 6c4d4f319..0d88e70ac 100644
--- a/src/net/Netdroid/Generated/Android/App/AlarmManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/AlarmManager.cs
@@ -112,11 +112,12 @@ public partial class AlarmManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AlarmManager.html#getNextAlarmClock()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/AlarmManager.html#getNextAlarmClock()"/>
         /// </summary>
-        public Android.App.AlarmManager.AlarmClockInfo NextAlarmClock
+        /// <returns><see cref="Android.App.AlarmManager.AlarmClockInfo"/></returns>
+        public Android.App.AlarmManager.AlarmClockInfo GetNextAlarmClock()
         {
-            get { return IExecuteWithSignature<Android.App.AlarmManager.AlarmClockInfo>("getNextAlarmClock", "()Landroid/app/AlarmManager$AlarmClockInfo;"); }
+            return IExecuteWithSignature<Android.App.AlarmManager.AlarmClockInfo>("getNextAlarmClock", "()Landroid/app/AlarmManager$AlarmClockInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AlarmManager.html#canScheduleExactAlarms()"/>
@@ -337,18 +338,12 @@ public AlarmClockInfo(long arg0, Android.App.PendingIntent arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/AlarmManager.AlarmClockInfo.html#getShowIntent()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/AlarmManager.AlarmClockInfo.html#getShowIntent()"/>
             /// </summary>
-            public Android.App.PendingIntent ShowIntent
+            /// <returns><see cref="Android.App.PendingIntent"/></returns>
+            public Android.App.PendingIntent GetShowIntent()
             {
-                get { return IExecuteWithSignature<Android.App.PendingIntent>("getShowIntent", "()Landroid/app/PendingIntent;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/AlarmManager.AlarmClockInfo.html#getTriggerTime()"/> 
-            /// </summary>
-            public long TriggerTime
-            {
-                get { return IExecuteWithSignature<long>("getTriggerTime", "()J"); }
+                return IExecuteWithSignature<Android.App.PendingIntent>("getShowIntent", "()Landroid/app/PendingIntent;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/AlarmManager.AlarmClockInfo.html#describeContents()"/>
@@ -359,6 +354,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/AlarmManager.AlarmClockInfo.html#getTriggerTime()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetTriggerTime()
+            {
+                return IExecuteWithSignature<long>("getTriggerTime", "()J");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/AlarmManager.AlarmClockInfo.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -403,7 +406,7 @@ public partial class OnAlarmListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAlarm", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnAlarmEventHandler));
+                AddEventHandler("onAlarm", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnAlarmEventHandler));
 
             }
 
@@ -411,7 +414,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/AlarmManager.OnAlarmListener.html#onAlarm()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAlarm"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnAlarm { get; set; } = null;
+            public global::System.Action OnOnAlarm { get; set; } = null;
 
             void OnAlarmEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/AlertDialog.cs b/src/net/Netdroid/Generated/Android/App/AlertDialog.cs
index fb1ecc792..7ed068465 100644
--- a/src/net/Netdroid/Generated/Android/App/AlertDialog.cs
+++ b/src/net/Netdroid/Generated/Android/App/AlertDialog.cs
@@ -40,35 +40,35 @@ public partial class AlertDialog
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#THEME_DEVICE_DEFAULT_DARK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int THEME_DEVICE_DEFAULT_DARK { get { if (!_THEME_DEVICE_DEFAULT_DARKReady) { _THEME_DEVICE_DEFAULT_DARKContent = SGetField<int>(LocalBridgeClazz, "THEME_DEVICE_DEFAULT_DARK"); _THEME_DEVICE_DEFAULT_DARKReady = true; } return _THEME_DEVICE_DEFAULT_DARKContent; } }
         private static int _THEME_DEVICE_DEFAULT_DARKContent = default;
         private static bool _THEME_DEVICE_DEFAULT_DARKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#THEME_DEVICE_DEFAULT_LIGHT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int THEME_DEVICE_DEFAULT_LIGHT { get { if (!_THEME_DEVICE_DEFAULT_LIGHTReady) { _THEME_DEVICE_DEFAULT_LIGHTContent = SGetField<int>(LocalBridgeClazz, "THEME_DEVICE_DEFAULT_LIGHT"); _THEME_DEVICE_DEFAULT_LIGHTReady = true; } return _THEME_DEVICE_DEFAULT_LIGHTContent; } }
         private static int _THEME_DEVICE_DEFAULT_LIGHTContent = default;
         private static bool _THEME_DEVICE_DEFAULT_LIGHTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#THEME_HOLO_DARK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int THEME_HOLO_DARK { get { if (!_THEME_HOLO_DARKReady) { _THEME_HOLO_DARKContent = SGetField<int>(LocalBridgeClazz, "THEME_HOLO_DARK"); _THEME_HOLO_DARKReady = true; } return _THEME_HOLO_DARKContent; } }
         private static int _THEME_HOLO_DARKContent = default;
         private static bool _THEME_HOLO_DARKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#THEME_HOLO_LIGHT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int THEME_HOLO_LIGHT { get { if (!_THEME_HOLO_LIGHTReady) { _THEME_HOLO_LIGHTContent = SGetField<int>(LocalBridgeClazz, "THEME_HOLO_LIGHT"); _THEME_HOLO_LIGHTReady = true; } return _THEME_HOLO_LIGHTContent; } }
         private static int _THEME_HOLO_LIGHTContent = default;
         private static bool _THEME_HOLO_LIGHTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#THEME_TRADITIONAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int THEME_TRADITIONAL { get { if (!_THEME_TRADITIONALReady) { _THEME_TRADITIONALContent = SGetField<int>(LocalBridgeClazz, "THEME_TRADITIONAL"); _THEME_TRADITIONALReady = true; } return _THEME_TRADITIONALContent; } }
         private static int _THEME_TRADITIONALContent = default;
         private static bool _THEME_TRADITIONALReady = false; // this is used because in case of generics 
@@ -81,13 +81,6 @@ public partial class AlertDialog
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#getListView()"/> 
-        /// </summary>
-        public Android.Widget.ListView ListView
-        {
-            get { return IExecuteWithSignature<Android.Widget.ListView>("getListView", "()Landroid/widget/ListView;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#getButton(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -97,6 +90,14 @@ public Android.Widget.Button GetButton(int arg0)
             return IExecuteWithSignature<Android.Widget.Button>("getButton", "(I)Landroid/widget/Button;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#getListView()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Widget.ListView"/></returns>
+        public Android.Widget.ListView GetListView()
+        {
+            return IExecuteWithSignature<Android.Widget.ListView>("getListView", "()Landroid/widget/ListView;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AlertDialog.html#setButton(int,java.lang.CharSequence,android.content.DialogInterface.OnClickListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -121,7 +122,7 @@ public void SetButton(int arg0, Java.Lang.CharSequence arg1, Android.Os.Message
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.Content.DialogInterface.OnClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetButton(Java.Lang.CharSequence arg0, Android.Content.DialogInterface.OnClickListener arg1)
         {
             IExecute("setButton", arg0, arg1);
@@ -131,7 +132,7 @@ public void SetButton(Java.Lang.CharSequence arg0, Android.Content.DialogInterfa
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.Os.Message"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetButton(Java.Lang.CharSequence arg0, Android.Os.Message arg1)
         {
             IExecute("setButton", arg0, arg1);
@@ -141,7 +142,7 @@ public void SetButton(Java.Lang.CharSequence arg0, Android.Os.Message arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.Content.DialogInterface.OnClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetButton2(Java.Lang.CharSequence arg0, Android.Content.DialogInterface.OnClickListener arg1)
         {
             IExecute("setButton2", arg0, arg1);
@@ -151,7 +152,7 @@ public void SetButton2(Java.Lang.CharSequence arg0, Android.Content.DialogInterf
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.Os.Message"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetButton2(Java.Lang.CharSequence arg0, Android.Os.Message arg1)
         {
             IExecute("setButton2", arg0, arg1);
@@ -161,7 +162,7 @@ public void SetButton2(Java.Lang.CharSequence arg0, Android.Os.Message arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.Content.DialogInterface.OnClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetButton3(Java.Lang.CharSequence arg0, Android.Content.DialogInterface.OnClickListener arg1)
         {
             IExecute("setButton3", arg0, arg1);
@@ -171,7 +172,7 @@ public void SetButton3(Java.Lang.CharSequence arg0, Android.Content.DialogInterf
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.Os.Message"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetButton3(Java.Lang.CharSequence arg0, Android.Os.Message arg1)
         {
             IExecute("setButton3", arg0, arg1);
@@ -286,13 +287,6 @@ public Builder(Android.Content.Context arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/AlertDialog.Builder.html#getContext()"/> 
-            /// </summary>
-            public Android.Content.Context Context
-            {
-                get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/AlertDialog.Builder.html#create()"/>
             /// </summary>
             /// <returns><see cref="Android.App.AlertDialog"/></returns>
@@ -379,7 +373,7 @@ public Android.App.AlertDialog.Builder SetIconAttribute(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.App.AlertDialog.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.AlertDialog.Builder SetInverseBackgroundForced(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.AlertDialog.Builder>("setInverseBackgroundForced", "(Z)Landroid/app/AlertDialog$Builder;", arg0);
@@ -633,6 +627,14 @@ public Android.App.AlertDialog.Builder SetView(int arg0)
             {
                 return IExecuteWithSignature<Android.App.AlertDialog.Builder>("setView", "(I)Landroid/app/AlertDialog$Builder;", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/AlertDialog.Builder.html#getContext()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Content.Context"/></returns>
+            public Android.Content.Context GetContext()
+            {
+                return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/App/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/AllPackageClasses.cs
index 0e4c30f31..f7a55f41b 100644
--- a/src/net/Netdroid/Generated/Android/App/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class ActionBar : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ActionB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ActionBar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ActionBar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ActionBar() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ActionBar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ActionBar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ActionBar(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -123,10 +123,13 @@ public partial class OnMenuVisibilityListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnMenuVisibilityListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.ActionBar_OnMenuVisibilityListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnMenuVisibilityListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -148,10 +151,13 @@ public partial class OnMenuVisibilityListenerDirect : OnMenuVisibilityListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.ActionBar$OnMenuVisibilityListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.ActionBar$OnMenuVisibilityListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -175,7 +181,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.OnNavigationListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnNavigationListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -183,10 +189,13 @@ public partial class OnNavigationListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnNavigationListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.ActionBar_OnNavigationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnNavigationListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -208,10 +217,13 @@ public partial class OnNavigationListenerDirect : OnNavigationListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.ActionBar$OnNavigationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.ActionBar$OnNavigationListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -235,19 +247,19 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.Tab.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Tab : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Tab>
         {
             const string _bridgeClassName = "android.app.ActionBar$Tab";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Tab class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Tab class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Tab() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Tab class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Tab class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Tab(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -282,7 +294,7 @@ public Tab(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ActionBar.TabListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class TabListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -290,10 +302,13 @@ public partial class TabListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public TabListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.ActionBar_TabListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.TabListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -315,10 +330,13 @@ public partial class TabListenerDirect : TabListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.ActionBar$TabListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.ActionBar$TabListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -392,12 +410,12 @@ public partial class ScreenCaptureCallback : MASES.JCOBridge.C2JBridge.JVMBridge
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ScreenCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ScreenCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ScreenCaptureCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ScreenCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ScreenCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ScreenCaptureCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -436,7 +454,7 @@ public ScreenCaptureCallback(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/ActivityGroup.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ActivityGroup : Android.App.Activity
     {
         const string _bridgeClassName = "android.app.ActivityGroup";
@@ -1056,10 +1074,13 @@ public partial class OnAlarmListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnAlarmListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.AlarmManager_OnAlarmListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnAlarmListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1081,10 +1102,13 @@ public partial class OnAlarmListenerDirect : OnAlarmListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.AlarmManager$OnAlarmListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.AlarmManager$OnAlarmListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1200,7 +1224,7 @@ public Builder(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/AliasActivity.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AliasActivity : Android.App.Activity
     {
         const string _bridgeClassName = "android.app.AliasActivity";
@@ -1335,12 +1359,12 @@ public partial class ActivityLifecycleCallbacks : MASES.JCOBridge.C2JBridge.JVMB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ActivityLifecycleCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ActivityLifecycleCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ActivityLifecycleCallbacks() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ActivityLifecycleCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ActivityLifecycleCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ActivityLifecycleCallbacks(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1382,10 +1406,13 @@ public partial class OnProvideAssistDataListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public OnProvideAssistDataListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.Application_OnProvideAssistDataListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnProvideAssistDataListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1407,10 +1434,13 @@ public partial class OnProvideAssistDataListenerDirect : OnProvideAssistDataList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.Application$OnProvideAssistDataListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.Application$OnProvideAssistDataListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1749,10 +1779,13 @@ public partial class OnOpActiveChangedListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnOpActiveChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.AppOpsManager_OnOpActiveChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnOpActiveChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1774,10 +1807,13 @@ public partial class OnOpActiveChangedListenerDirect : OnOpActiveChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.AppOpsManager$OnOpActiveChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.AppOpsManager$OnOpActiveChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1808,10 +1844,13 @@ public partial class OnOpChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnOpChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.AppOpsManager_OnOpChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnOpChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1833,10 +1872,13 @@ public partial class OnOpChangedListenerDirect : OnOpChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.AppOpsManager$OnOpChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.AppOpsManager$OnOpChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1866,12 +1908,12 @@ public partial class OnOpNotedCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OnOpNotedCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnOpNotedCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnOpNotedCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OnOpNotedCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnOpNotedCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnOpNotedCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2123,10 +2165,13 @@ public partial class OnDateSetListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnDateSetListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.DatePickerDialog_OnDateSetListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnDateSetListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2148,10 +2193,13 @@ public partial class OnDateSetListenerDirect : OnDateSetListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.DatePickerDialog$OnDateSetListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.DatePickerDialog$OnDateSetListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2223,7 +2271,7 @@ public Dialog(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DialogFragment : Android.App.Fragment
     {
         const string _bridgeClassName = "android.app.DialogFragment";
@@ -2488,7 +2536,7 @@ public Request(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ExpandableListActivity : Android.App.Activity
     {
         const string _bridgeClassName = "android.app.ExpandableListActivity";
@@ -2567,7 +2615,7 @@ public partial class ForegroundServiceTypeException : Android.App.ServiceStartNo
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/Fragment.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Fragment : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Fragment>
     {
         const string _bridgeClassName = "android.app.Fragment";
@@ -2608,7 +2656,7 @@ public Fragment(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.InstantiationException.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class InstantiationException : Android.Util.AndroidRuntimeException
         {
             const string _bridgeClassName = "android.app.Fragment$InstantiationException";
@@ -2626,7 +2674,7 @@ public partial class InstantiationException : Android.Util.AndroidRuntimeExcepti
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.SavedState.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class SavedState : Android.Os.Parcelable
         {
             const string _bridgeClassName = "android.app.Fragment$SavedState";
@@ -2675,7 +2723,7 @@ public SavedState(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/FragmentBreadCrumbs.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FragmentBreadCrumbs : Android.View.ViewGroup
     {
         const string _bridgeClassName = "android.app.FragmentBreadCrumbs";
@@ -2716,7 +2764,7 @@ public FragmentBreadCrumbs(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentBreadCrumbs.OnBreadCrumbClickListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnBreadCrumbClickListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -2724,10 +2772,13 @@ public partial class OnBreadCrumbClickListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnBreadCrumbClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.FragmentBreadCrumbs_OnBreadCrumbClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnBreadCrumbClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2749,10 +2800,13 @@ public partial class OnBreadCrumbClickListenerDirect : OnBreadCrumbClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.FragmentBreadCrumbs$OnBreadCrumbClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.FragmentBreadCrumbs$OnBreadCrumbClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2780,19 +2834,19 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/FragmentContainer.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FragmentContainer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FragmentContainer>
     {
         const string _bridgeClassName = "android.app.FragmentContainer";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FragmentContainer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentContainer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentContainer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FragmentContainer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentContainer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentContainer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2827,7 +2881,7 @@ public FragmentContainer(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/FragmentController.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FragmentController : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FragmentController>
     {
         const string _bridgeClassName = "android.app.FragmentController";
@@ -2872,19 +2926,19 @@ public FragmentController(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FragmentHostCallback : Android.App.FragmentContainer
     {
         const string _bridgeClassName = "android.app.FragmentHostCallback";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FragmentHostCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentHostCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentHostCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FragmentHostCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentHostCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentHostCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2920,19 +2974,19 @@ public FragmentHostCallback(params object[] args) : base(args) { }
     /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FragmentHostCallback<E> : Android.App.FragmentContainer
     {
         const string _bridgeClassName = "android.app.FragmentHostCallback";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FragmentHostCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentHostCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentHostCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FragmentHostCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentHostCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentHostCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2967,19 +3021,19 @@ public FragmentHostCallback(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FragmentManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FragmentManager>
     {
         const string _bridgeClassName = "android.app.FragmentManager";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FragmentManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FragmentManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3010,19 +3064,19 @@ public FragmentManager(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class BackStackEntry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BackStackEntry>
         {
             const string _bridgeClassName = "android.app.FragmentManager$BackStackEntry";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("BackStackEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BackStackEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BackStackEntry() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("BackStackEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BackStackEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BackStackEntry(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3057,19 +3111,19 @@ public BackStackEntry(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.FragmentLifecycleCallbacks.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class FragmentLifecycleCallbacks : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FragmentLifecycleCallbacks>
         {
             const string _bridgeClassName = "android.app.FragmentManager$FragmentLifecycleCallbacks";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FragmentLifecycleCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FragmentLifecycleCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FragmentLifecycleCallbacks() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FragmentLifecycleCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FragmentLifecycleCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FragmentLifecycleCallbacks(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3104,7 +3158,7 @@ public FragmentLifecycleCallbacks(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.OnBackStackChangedListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnBackStackChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -3112,10 +3166,13 @@ public partial class OnBackStackChangedListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public OnBackStackChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.FragmentManager_OnBackStackChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnBackStackChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3137,10 +3194,13 @@ public partial class OnBackStackChangedListenerDirect : OnBackStackChangedListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.FragmentManager$OnBackStackChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.FragmentManager$OnBackStackChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3168,7 +3228,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/FragmentManagerNonConfig.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FragmentManagerNonConfig : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FragmentManagerNonConfig>
     {
         const string _bridgeClassName = "android.app.FragmentManagerNonConfig";
@@ -3213,19 +3273,19 @@ public FragmentManagerNonConfig(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FragmentTransaction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FragmentTransaction>
     {
         const string _bridgeClassName = "android.app.FragmentTransaction";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FragmentTransaction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentTransaction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentTransaction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FragmentTransaction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FragmentTransaction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FragmentTransaction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3524,19 +3584,19 @@ public ActivityResult(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/IntentService.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class IntentService : Android.App.Service
     {
         const string _bridgeClassName = "android.app.IntentService";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IntentService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntentService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntentService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IntentService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntentService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntentService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3634,12 +3694,12 @@ public partial class KeyguardDismissCallback : MASES.JCOBridge.C2JBridge.JVMBrid
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("KeyguardDismissCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("KeyguardDismissCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public KeyguardDismissCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("KeyguardDismissCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("KeyguardDismissCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public KeyguardDismissCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3674,7 +3734,7 @@ public KeyguardDismissCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/KeyguardManager.KeyguardLock.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class KeyguardLock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyguardLock>
         {
             const string _bridgeClassName = "android.app.KeyguardManager$KeyguardLock";
@@ -3726,10 +3786,13 @@ public partial class KeyguardLockedStateListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public KeyguardLockedStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.KeyguardManager_KeyguardLockedStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.KeyguardLockedStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3751,10 +3814,13 @@ public partial class KeyguardLockedStateListenerDirect : KeyguardLockedStateList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.KeyguardManager$KeyguardLockedStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.KeyguardManager$KeyguardLockedStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3778,19 +3844,19 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/KeyguardManager.OnKeyguardExitResult.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnKeyguardExitResult : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnKeyguardExitResult>
         {
             const string _bridgeClassName = "android.app.KeyguardManager$OnKeyguardExitResult";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OnKeyguardExitResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnKeyguardExitResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnKeyguardExitResult() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OnKeyguardExitResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnKeyguardExitResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnKeyguardExitResult(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3829,19 +3895,19 @@ public OnKeyguardExitResult(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LauncherActivity : Android.App.ListActivity
     {
         const string _bridgeClassName = "android.app.LauncherActivity";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LauncherActivity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LauncherActivity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LauncherActivity() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LauncherActivity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LauncherActivity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LauncherActivity(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3872,7 +3938,7 @@ public LauncherActivity(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.IconResizer.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class IconResizer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IconResizer>
         {
             const string _bridgeClassName = "android.app.LauncherActivity$IconResizer";
@@ -3917,7 +3983,7 @@ public IconResizer(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.ListItem.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ListItem : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ListItem>
         {
             const string _bridgeClassName = "android.app.LauncherActivity$ListItem";
@@ -3966,7 +4032,7 @@ public ListItem(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/ListActivity.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ListActivity : Android.App.Activity
     {
         const string _bridgeClassName = "android.app.ListActivity";
@@ -4011,7 +4077,7 @@ public ListActivity(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/ListFragment.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ListFragment : Android.App.Fragment
     {
         const string _bridgeClassName = "android.app.ListFragment";
@@ -4056,19 +4122,19 @@ public ListFragment(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/LoaderManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LoaderManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LoaderManager>
     {
         const string _bridgeClassName = "android.app.LoaderManager";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LoaderManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LoaderManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LoaderManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LoaderManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LoaderManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LoaderManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4099,19 +4165,19 @@ public LoaderManager(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LoaderManager.LoaderCallbacks.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class LoaderCallbacks : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LoaderCallbacks>
         {
             const string _bridgeClassName = "android.app.LoaderManager$LoaderCallbacks";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("LoaderCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LoaderCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LoaderCallbacks() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("LoaderCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LoaderCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LoaderCallbacks(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4147,19 +4213,19 @@ public LoaderCallbacks(params object[] args) : base(args) { }
         /// <see href="https://developer.android.com/reference/android/app/LoaderManager.LoaderCallbacks.html"/>
         /// </summary>
         /// <typeparam name="D"></typeparam>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class LoaderCallbacks<D> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LoaderCallbacks<D>>
         {
             const string _bridgeClassName = "android.app.LoaderManager$LoaderCallbacks";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("LoaderCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LoaderCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LoaderCallbacks() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("LoaderCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LoaderCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LoaderCallbacks(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4198,7 +4264,7 @@ public LoaderCallbacks(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LocalActivityManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LocalActivityManager>
     {
         const string _bridgeClassName = "android.app.LocalActivityManager";
@@ -4610,12 +4676,12 @@ public partial class Extender : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Extender
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("Extender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Extender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Extender() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("Extender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Extender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Extender(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5188,12 +5254,12 @@ public partial class Extender : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Extender
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Extender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Extender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Extender() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Extender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Extender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Extender(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5410,12 +5476,12 @@ public partial class Style : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Style>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Style class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Style class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Style() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Style class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Style class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Style(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5737,12 +5803,12 @@ public partial class OnFinished : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnFini
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OnFinished class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnFinished class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnFinished() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OnFinished class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnFinished class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnFinished(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6045,7 +6111,7 @@ public Presentation(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ProgressDialog : Android.App.AlertDialog
     {
         const string _bridgeClassName = "android.app.ProgressDialog";
@@ -6330,10 +6396,13 @@ public partial class OnCancelListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public OnCancelListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.SearchManager_OnCancelListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnCancelListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6355,10 +6424,13 @@ public partial class OnCancelListenerDirect : OnCancelListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.SearchManager$OnCancelListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.SearchManager$OnCancelListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6389,10 +6461,13 @@ public partial class OnDismissListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnDismissListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.SearchManager_OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6414,10 +6489,13 @@ public partial class OnDismissListenerDirect : OnDismissListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.SearchManager$OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.SearchManager$OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6451,12 +6529,12 @@ public partial class Service : Android.Content.ContextWrapper
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Service class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Service class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Service() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Service class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Service class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Service(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6514,12 +6592,12 @@ public partial class SharedElementCallback : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SharedElementCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SharedElementCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SharedElementCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SharedElementCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SharedElementCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SharedElementCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6557,10 +6635,13 @@ public partial class OnSharedElementsReadyListener : MASES.JCOBridge.C2JBridge.J
             /// </summary>
             public OnSharedElementsReadyListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.SharedElementCallback_OnSharedElementsReadyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnSharedElementsReadyListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6582,10 +6663,13 @@ public partial class OnSharedElementsReadyListenerDirect : OnSharedElementsReady
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.SharedElementCallback$OnSharedElementsReadyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.SharedElementCallback$OnSharedElementsReadyListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6718,7 +6802,7 @@ public SyncNotedAppOp(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/app/TabActivity.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class TabActivity : Android.App.ActivityGroup
     {
         const string _bridgeClassName = "android.app.TabActivity";
@@ -6898,10 +6982,13 @@ public partial class OnTimeSetListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnTimeSetListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.TimePickerDialog_OnTimeSetListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnTimeSetListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6923,10 +7010,13 @@ public partial class OnTimeSetListenerDirect : OnTimeSetListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.TimePickerDialog$OnTimeSetListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.TimePickerDialog$OnTimeSetListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7000,12 +7090,12 @@ public partial class AccessibilityEventFilter : MASES.JCOBridge.C2JBridge.JVMBri
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AccessibilityEventFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AccessibilityEventFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AccessibilityEventFilter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AccessibilityEventFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AccessibilityEventFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AccessibilityEventFilter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7047,10 +7137,13 @@ public partial class OnAccessibilityEventListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public OnAccessibilityEventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.UiAutomation_OnAccessibilityEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnAccessibilityEventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7072,10 +7165,13 @@ public partial class OnAccessibilityEventListenerDirect : OnAccessibilityEventLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.UiAutomation$OnAccessibilityEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.UiAutomation$OnAccessibilityEventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7150,10 +7246,13 @@ public partial class ContrastChangeListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public ContrastChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.UiModeManager_ContrastChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.ContrastChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7175,10 +7274,13 @@ public partial class ContrastChangeListenerDirect : ContrastChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.UiModeManager$ContrastChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.UiModeManager$ContrastChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7560,12 +7662,12 @@ public partial class Request : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Request>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Request class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Request class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Request() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Request class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Request class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Request(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7739,10 +7841,13 @@ public partial class OnColorsChangedListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnColorsChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.app.WallpaperManager_OnColorsChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.app.OnColorsChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7764,10 +7869,13 @@ public partial class OnColorsChangedListenerDirect : OnColorsChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.app.WallpaperManager$OnColorsChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.app.WallpaperManager$OnColorsChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7801,12 +7909,12 @@ public partial class ZygotePreload : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Zyg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ZygotePreload class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ZygotePreload class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ZygotePreload() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ZygotePreload class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ZygotePreload class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ZygotePreload(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/AppOpsManager.cs b/src/net/Netdroid/Generated/Android/App/AppOpsManager.cs
index 9fc45502b..8d9bb31ae 100644
--- a/src/net/Netdroid/Generated/Android/App/AppOpsManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/AppOpsManager.cs
@@ -312,7 +312,7 @@ public bool IsOpActive(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CheckOp(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("checkOp", arg0, arg1, arg2);
@@ -324,7 +324,7 @@ public int CheckOp(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CheckOpNoThrow(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("checkOpNoThrow", arg0, arg1, arg2);
@@ -349,7 +349,7 @@ public int NoteOp(Java.Lang.String arg0, int arg1, Java.Lang.String arg2, Java.L
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int NoteOp(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("noteOp", arg0, arg1, arg2);
@@ -374,7 +374,7 @@ public int NoteOpNoThrow(Java.Lang.String arg0, int arg1, Java.Lang.String arg2,
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int NoteOpNoThrow(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("noteOpNoThrow", arg0, arg1, arg2);
@@ -398,7 +398,7 @@ public int NoteProxyOp(Java.Lang.String arg0, Java.Lang.String arg1, int arg2, J
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int NoteProxyOp(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecute<int>("noteProxyOp", arg0, arg1);
@@ -423,7 +423,7 @@ public int NoteProxyOpNoThrow(Java.Lang.String arg0, Java.Lang.String arg1, int
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int NoteProxyOpNoThrow(Java.Lang.String arg0, Java.Lang.String arg1, int arg2)
         {
             return IExecute<int>("noteProxyOpNoThrow", arg0, arg1, arg2);
@@ -434,7 +434,7 @@ public int NoteProxyOpNoThrow(Java.Lang.String arg0, Java.Lang.String arg1, int
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int NoteProxyOpNoThrow(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecute<int>("noteProxyOpNoThrow", arg0, arg1);
@@ -459,7 +459,7 @@ public int StartOp(Java.Lang.String arg0, int arg1, Java.Lang.String arg2, Java.
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int StartOp(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("startOp", arg0, arg1, arg2);
@@ -484,7 +484,7 @@ public int StartOpNoThrow(Java.Lang.String arg0, int arg1, Java.Lang.String arg2
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int StartOpNoThrow(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("startOpNoThrow", arg0, arg1, arg2);
@@ -564,7 +564,7 @@ public int UnsafeCheckOpRawNoThrow(Java.Lang.String arg0, int arg1, Java.Lang.St
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CheckPackage(int arg0, Java.Lang.String arg1)
         {
             IExecute("checkPackage", arg0, arg1);
@@ -586,7 +586,7 @@ public void FinishOp(Java.Lang.String arg0, int arg1, Java.Lang.String arg2, Jav
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void FinishOp(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             IExecute("finishOp", arg0, arg1, arg2);
@@ -687,7 +687,7 @@ public partial class OnOpActiveChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onOpActiveChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnOpActiveChangedEventHandler));
+                AddEventHandler("onOpActiveChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnOpActiveChangedEventHandler));
 
             }
 
@@ -695,7 +695,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/AppOpsManager.OnOpActiveChangedListener.html#onOpActiveChanged(java.lang.String,int,java.lang.String,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnOpActiveChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, int, Java.Lang.String, bool> OnOnOpActiveChanged { get; set; } = null;
+            public global::System.Action<Java.Lang.String, int, Java.Lang.String, bool> OnOnOpActiveChanged { get; set; } = null;
 
             void OnOpActiveChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -792,7 +792,7 @@ public partial class OnOpChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onOpChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnOpChangedEventHandler));
+                AddEventHandler("onOpChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnOpChangedEventHandler));
 
             }
 
@@ -800,7 +800,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/AppOpsManager.OnOpChangedListener.html#onOpChanged(java.lang.String,java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnOpChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, Java.Lang.String> OnOnOpChanged { get; set; } = null;
+            public global::System.Action<Java.Lang.String, Java.Lang.String> OnOnOpChanged { get; set; } = null;
 
             void OnOpChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/Application.cs b/src/net/Netdroid/Generated/Android/App/Application.cs
index 6572c85aa..38f3a0262 100644
--- a/src/net/Netdroid/Generated/Android/App/Application.cs
+++ b/src/net/Netdroid/Generated/Android/App/Application.cs
@@ -46,11 +46,12 @@ public partial class Application
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Application.html#getProcessName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Application.html#getProcessName()"/>
         /// </summary>
-        public static Java.Lang.String ProcessName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetProcessName()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getProcessName", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getProcessName", "()Ljava/lang/String;");
         }
 
         #endregion
@@ -359,7 +360,7 @@ public partial class OnProvideAssistDataListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onProvideAssistData", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.Activity>>>(OnProvideAssistDataEventHandler));
+                AddEventHandler("onProvideAssistData", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.Activity>>>(OnProvideAssistDataEventHandler));
 
             }
 
@@ -367,7 +368,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/Application.OnProvideAssistDataListener.html#onProvideAssistData(android.app.Activity,android.os.Bundle)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnProvideAssistData"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.App.Activity, Android.Os.Bundle> OnOnProvideAssistData { get; set; } = null;
+            public global::System.Action<Android.App.Activity, Android.Os.Bundle> OnOnProvideAssistData { get; set; } = null;
 
             void OnProvideAssistDataEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.Activity>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/ApplicationExitInfo.cs b/src/net/Netdroid/Generated/Android/App/ApplicationExitInfo.cs
index a36e8f7bb..541342003 100644
--- a/src/net/Netdroid/Generated/Android/App/ApplicationExitInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/ApplicationExitInfo.cs
@@ -154,117 +154,133 @@ public partial class ApplicationExitInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getDefiningUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getUserHandle()"/>
         /// </summary>
-        public int DefiningUid
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetUserHandle()
         {
-            get { return IExecuteWithSignature<int>("getDefiningUid", "()I"); }
+            return IExecuteWithSignature<Android.Os.UserHandle>("getUserHandle", "()Landroid/os/UserHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getProcessStateSummary()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetProcessStateSummary()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getProcessStateSummary", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getImportance()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#describeContents()"/>
         /// </summary>
-        public int Importance
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getImportance", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getPackageUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getDefiningUid()"/>
         /// </summary>
-        public int PackageUid
+        /// <returns><see cref="int"/></returns>
+        public int GetDefiningUid()
         {
-            get { return IExecuteWithSignature<int>("getPackageUid", "()I"); }
+            return IExecuteWithSignature<int>("getDefiningUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getPid()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getImportance()"/>
         /// </summary>
-        public int Pid
+        /// <returns><see cref="int"/></returns>
+        public int GetImportance()
         {
-            get { return IExecuteWithSignature<int>("getPid", "()I"); }
+            return IExecuteWithSignature<int>("getImportance", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getProcessName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getPackageUid()"/>
         /// </summary>
-        public Java.Lang.String ProcessName
+        /// <returns><see cref="int"/></returns>
+        public int GetPackageUid()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProcessName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPackageUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getProcessStateSummary()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getPid()"/>
         /// </summary>
-        public byte[] ProcessStateSummary
+        /// <returns><see cref="int"/></returns>
+        public int GetPid()
         {
-            get { return IExecuteWithSignatureArray<byte>("getProcessStateSummary", "()[B"); }
+            return IExecuteWithSignature<int>("getPid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getPss()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getRealUid()"/>
         /// </summary>
-        public long Pss
+        /// <returns><see cref="int"/></returns>
+        public int GetRealUid()
         {
-            get { return IExecuteWithSignature<long>("getPss", "()J"); }
+            return IExecuteWithSignature<int>("getRealUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getRealUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getReason()"/>
         /// </summary>
-        public int RealUid
+        /// <returns><see cref="int"/></returns>
+        public int GetReason()
         {
-            get { return IExecuteWithSignature<int>("getRealUid", "()I"); }
+            return IExecuteWithSignature<int>("getReason", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getReason()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getStatus()"/>
         /// </summary>
-        public int Reason
+        /// <returns><see cref="int"/></returns>
+        public int GetStatus()
         {
-            get { return IExecuteWithSignature<int>("getReason", "()I"); }
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getRss()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getTraceInputStream()"/>
         /// </summary>
-        public long Rss
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.InputStream GetTraceInputStream()
         {
-            get { return IExecuteWithSignature<long>("getRss", "()J"); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getTraceInputStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getDescription()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getProcessName()"/>
         /// </summary>
-        public long Timestamp
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProcessName()
         {
-            get { return IExecuteWithSignature<long>("getTimestamp", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProcessName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getTraceInputStream()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getPss()"/>
         /// </summary>
-        public Java.Io.InputStream TraceInputStream
+        /// <returns><see cref="long"/></returns>
+        public long GetPss()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getTraceInputStream", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature<long>("getPss", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getUserHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getRss()"/>
         /// </summary>
-        public Android.Os.UserHandle UserHandle
+        /// <returns><see cref="long"/></returns>
+        public long GetRss()
         {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getUserHandle", "()Landroid/os/UserHandle;"); }
+            return IExecuteWithSignature<long>("getRss", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#getTimestamp()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestamp()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTimestamp", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ApplicationExitInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/AllPackageClasses.cs
index f47640884..a479ec42a 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/AllPackageClasses.cs
@@ -961,12 +961,12 @@ public partial class PropertyConfig : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pr
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PropertyConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PropertyConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PropertyConfig() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PropertyConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PropertyConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PropertyConfig(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1143,12 +1143,12 @@ public partial class BatchResultCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BatchResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BatchResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BatchResultCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BatchResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BatchResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BatchResultCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1191,12 +1191,12 @@ public partial class BatchResultCallback<KeyType, ValueType> : MASES.JCOBridge.C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BatchResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BatchResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BatchResultCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BatchResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BatchResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BatchResultCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1316,7 +1316,7 @@ public Builder(params object[] args) : base(args) { }
         /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.Builder.html"/>
         /// </summary>
         /// <typeparam name="BuilderType"><see cref="Android.App.Appsearch.GenericDocument.Builder"/></typeparam>
-        public partial class Builder<BuilderType> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<BuilderType>> where BuilderType: Android.App.Appsearch.GenericDocument.Builder<BuilderType>
+        public partial class Builder<BuilderType> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<BuilderType>> where BuilderType : Android.App.Appsearch.GenericDocument.Builder<BuilderType>
         {
             const string _bridgeClassName = "android.app.appsearch.GenericDocument$Builder";
             /// <summary>
@@ -1678,12 +1678,12 @@ public partial class Migrator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Migrator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Migrator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Migrator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Migrator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Migrator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Migrator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Migrator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchBatchResult.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchBatchResult.cs
index 55e2dbcae..885deb261 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchBatchResult.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchBatchResult.cs
@@ -46,33 +46,36 @@ public partial class AppSearchBatchResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getAll()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#isSuccess()"/>
         /// </summary>
-        public Java.Util.Map All
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSuccess()
         {
-            get { return IExecuteWithSignature<Java.Util.Map>("getAll", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<bool>("isSuccess", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getFailures()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getAll()"/>
         /// </summary>
-        public Java.Util.Map Failures
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map GetAll()
         {
-            get { return IExecuteWithSignature<Java.Util.Map>("getFailures", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map>("getAll", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getSuccesses()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getFailures()"/>
         /// </summary>
-        public Java.Util.Map Successes
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map GetFailures()
         {
-            get { return IExecuteWithSignature<Java.Util.Map>("getSuccesses", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map>("getFailures", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#isSuccess()"/>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getSuccesses()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSuccess()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map GetSuccesses()
         {
-            return IExecuteWithSignature<bool>("isSuccess", "()Z");
+            return IExecuteWithSignature<Java.Util.Map>("getSuccesses", "()Ljava/util/Map;");
         }
 
         #endregion
@@ -254,33 +257,36 @@ public partial class AppSearchBatchResult<KeyType, ValueType>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getAll()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#isSuccess()"/>
         /// </summary>
-        public Java.Util.Map<KeyType, Android.App.Appsearch.AppSearchResult<ValueType>> All
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSuccess()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<KeyType, Android.App.Appsearch.AppSearchResult<ValueType>>>("getAll", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<bool>("isSuccess", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getFailures()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getAll()"/>
         /// </summary>
-        public Java.Util.Map<KeyType, Android.App.Appsearch.AppSearchResult<ValueType>> Failures
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<KeyType, Android.App.Appsearch.AppSearchResult<ValueType>> GetAll()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<KeyType, Android.App.Appsearch.AppSearchResult<ValueType>>>("getFailures", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<KeyType, Android.App.Appsearch.AppSearchResult<ValueType>>>("getAll", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getSuccesses()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getFailures()"/>
         /// </summary>
-        public Java.Util.Map<KeyType, ValueType> Successes
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<KeyType, Android.App.Appsearch.AppSearchResult<ValueType>> GetFailures()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<KeyType, ValueType>>("getSuccesses", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<KeyType, Android.App.Appsearch.AppSearchResult<ValueType>>>("getFailures", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#isSuccess()"/>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchBatchResult.html#getSuccesses()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSuccess()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<KeyType, ValueType> GetSuccesses()
         {
-            return IExecuteWithSignature<bool>("isSuccess", "()Z");
+            return IExecuteWithSignature<Java.Util.Map<KeyType, ValueType>>("getSuccesses", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchManager.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchManager.cs
index 2b5c2eb3d..30f5e60f2 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchManager.cs
@@ -89,11 +89,12 @@ public partial class SearchContext
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchManager.SearchContext.html#getDatabaseName()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchManager.SearchContext.html#getDatabaseName()"/>
             /// </summary>
-            public Java.Lang.String DatabaseName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDatabaseName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchResult.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchResult.cs
index 971f0353f..b10ba6c07 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchResult.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchResult.cs
@@ -119,33 +119,36 @@ public static Android.App.Appsearch.AppSearchResult NewSuccessfulResult(object a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getErrorMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#isSuccess()"/>
         /// </summary>
-        public Java.Lang.String ErrorMessage
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSuccess()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getErrorMessage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isSuccess", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getResultCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getResultCode()"/>
         /// </summary>
-        public int ResultCode
+        /// <returns><see cref="int"/></returns>
+        public int GetResultCode()
         {
-            get { return IExecuteWithSignature<int>("getResultCode", "()I"); }
+            return IExecuteWithSignature<int>("getResultCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getResultValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getErrorMessage()"/>
         /// </summary>
-        public object ResultValue
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetErrorMessage()
         {
-            get { return IExecuteWithSignature("getResultValue", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getErrorMessage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#isSuccess()"/>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getResultValue()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSuccess()
+        /// <returns><see cref="object"/></returns>
+        public object GetResultValue()
         {
-            return IExecuteWithSignature<bool>("isSuccess", "()Z");
+            return IExecuteWithSignature("getResultValue", "()Ljava/lang/Object;");
         }
 
         #endregion
@@ -256,33 +259,36 @@ public static Android.App.Appsearch.AppSearchResult<ValueType> NewSuccessfulResu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getErrorMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#isSuccess()"/>
         /// </summary>
-        public Java.Lang.String ErrorMessage
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSuccess()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getErrorMessage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isSuccess", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getResultCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getResultCode()"/>
         /// </summary>
-        public int ResultCode
+        /// <returns><see cref="int"/></returns>
+        public int GetResultCode()
         {
-            get { return IExecuteWithSignature<int>("getResultCode", "()I"); }
+            return IExecuteWithSignature<int>("getResultCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getResultValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getErrorMessage()"/>
         /// </summary>
-        public ValueType ResultValue
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetErrorMessage()
         {
-            get { return IExecuteWithSignature<ValueType>("getResultValue", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getErrorMessage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#isSuccess()"/>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchResult.html#getResultValue()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSuccess()
+        /// <returns><typeparamref name="ValueType"/></returns>
+        public ValueType GetResultValue()
         {
-            return IExecuteWithSignature<bool>("isSuccess", "()Z");
+            return IExecuteWithSignature<ValueType>("getResultValue", "()Ljava/lang/Object;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchSchema.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchSchema.cs
index 0f5856091..a2bcc6569 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchSchema.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/AppSearchSchema.cs
@@ -46,18 +46,20 @@ public partial class AppSearchSchema
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.html#getProperties()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.html#getSchemaType()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Appsearch.AppSearchSchema.PropertyConfig> Properties
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSchemaType()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.AppSearchSchema.PropertyConfig>>("getProperties", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSchemaType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.html#getSchemaType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.html#getProperties()"/>
         /// </summary>
-        public Java.Lang.String SchemaType
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Appsearch.AppSearchSchema.PropertyConfig> GetProperties()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSchemaType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.AppSearchSchema.PropertyConfig>>("getProperties", "()Ljava/util/List;");
         }
 
         #endregion
@@ -314,13 +316,6 @@ public partial class DocumentPropertyConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.DocumentPropertyConfig.html#getSchemaType()"/> 
-            /// </summary>
-            public Java.Lang.String SchemaType
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getSchemaType", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.DocumentPropertyConfig.html#shouldIndexNestedProperties()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -328,6 +323,14 @@ public bool ShouldIndexNestedProperties()
             {
                 return IExecuteWithSignature<bool>("shouldIndexNestedProperties", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.DocumentPropertyConfig.html#getSchemaType()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetSchemaType()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getSchemaType", "()Ljava/lang/String;");
+            }
 
             #endregion
 
@@ -525,11 +528,12 @@ public partial class LongPropertyConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.LongPropertyConfig.html#getIndexingType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.LongPropertyConfig.html#getIndexingType()"/>
             /// </summary>
-            public int IndexingType
+            /// <returns><see cref="int"/></returns>
+            public int GetIndexingType()
             {
-                get { return IExecuteWithSignature<int>("getIndexingType", "()I"); }
+                return IExecuteWithSignature<int>("getIndexingType", "()I");
             }
 
             #endregion
@@ -646,18 +650,20 @@ public partial class PropertyConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.PropertyConfig.html#getCardinality()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.PropertyConfig.html#getCardinality()"/>
             /// </summary>
-            public int Cardinality
+            /// <returns><see cref="int"/></returns>
+            public int GetCardinality()
             {
-                get { return IExecuteWithSignature<int>("getCardinality", "()I"); }
+                return IExecuteWithSignature<int>("getCardinality", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.PropertyConfig.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.PropertyConfig.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -745,25 +751,28 @@ public partial class StringPropertyConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.StringPropertyConfig.html#getIndexingType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.StringPropertyConfig.html#getIndexingType()"/>
             /// </summary>
-            public int IndexingType
+            /// <returns><see cref="int"/></returns>
+            public int GetIndexingType()
             {
-                get { return IExecuteWithSignature<int>("getIndexingType", "()I"); }
+                return IExecuteWithSignature<int>("getIndexingType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.StringPropertyConfig.html#getJoinableValueType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.StringPropertyConfig.html#getJoinableValueType()"/>
             /// </summary>
-            public int JoinableValueType
+            /// <returns><see cref="int"/></returns>
+            public int GetJoinableValueType()
             {
-                get { return IExecuteWithSignature<int>("getJoinableValueType", "()I"); }
+                return IExecuteWithSignature<int>("getJoinableValueType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.StringPropertyConfig.html#getTokenizerType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/AppSearchSchema.StringPropertyConfig.html#getTokenizerType()"/>
             /// </summary>
-            public int TokenizerType
+            /// <returns><see cref="int"/></returns>
+            public int GetTokenizerType()
             {
-                get { return IExecuteWithSignature<int>("getTokenizerType", "()I"); }
+                return IExecuteWithSignature<int>("getTokenizerType", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/GenericDocument.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/GenericDocument.cs
index 0fb687eb1..48b6f0fd8 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/GenericDocument.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/GenericDocument.cs
@@ -42,66 +42,18 @@ public partial class GenericDocument
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getMaxIndexedProperties()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getMaxIndexedProperties()"/>
         /// </summary>
-        public static int MaxIndexedProperties
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxIndexedProperties()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxIndexedProperties", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxIndexedProperties", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getCreationTimestampMillis()"/> 
-        /// </summary>
-        public long CreationTimestampMillis
-        {
-            get { return IExecuteWithSignature<long>("getCreationTimestampMillis", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getNamespace()"/> 
-        /// </summary>
-        public Java.Lang.String Namespace
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getPropertyNames()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> PropertyNames
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPropertyNames", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getSchemaType()"/> 
-        /// </summary>
-        public Java.Lang.String SchemaType
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSchemaType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getScore()"/> 
-        /// </summary>
-        public int Score
-        {
-            get { return IExecuteWithSignature<int>("getScore", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getTtlMillis()"/> 
-        /// </summary>
-        public long TtlMillis
-        {
-            get { return IExecuteWithSignature<long>("getTtlMillis", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getPropertyDocument(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -174,6 +126,14 @@ public double[] GetPropertyDoubleArray(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<double>("getPropertyDoubleArray", "(Ljava/lang/String;)[D", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getScore()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetScore()
+        {
+            return IExecuteWithSignature<int>("getScore", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -183,6 +143,22 @@ public object GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getNamespace()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getPropertyString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -192,6 +168,14 @@ public Java.Lang.String GetPropertyString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getPropertyString", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getSchemaType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSchemaType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSchemaType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getPropertyStringArray(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -201,6 +185,22 @@ public Java.Lang.String[] GetPropertyStringArray(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<Java.Lang.String>("getPropertyStringArray", "(Ljava/lang/String;)[Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getPropertyNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetPropertyNames()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPropertyNames", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getCreationTimestampMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetCreationTimestampMillis()
+        {
+            return IExecuteWithSignature<long>("getCreationTimestampMillis", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getPropertyLong(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -210,6 +210,14 @@ public long GetPropertyLong(Java.Lang.String arg0)
             return IExecuteWithSignature<long>("getPropertyLong", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getTtlMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTtlMillis()
+        {
+            return IExecuteWithSignature<long>("getTtlMillis", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/appsearch/GenericDocument.html#getPropertyLongArray(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/GetByDocumentIdRequest.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/GetByDocumentIdRequest.cs
index eccb436aa..8653c3fbc 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/GetByDocumentIdRequest.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/GetByDocumentIdRequest.cs
@@ -52,32 +52,36 @@ public partial class GetByDocumentIdRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetByDocumentIdRequest.html#getIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetByDocumentIdRequest.html#getNamespace()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> Ids
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getIds", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetByDocumentIdRequest.html#getNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetByDocumentIdRequest.html#getProjectionPaths()"/>
         /// </summary>
-        public Java.Lang.String Namespace
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Appsearch.PropertyPath>> GetProjectionPaths()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Appsearch.PropertyPath>>>("getProjectionPaths", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetByDocumentIdRequest.html#getProjectionPaths()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetByDocumentIdRequest.html#getProjections()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Appsearch.PropertyPath>> ProjectionPaths
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> GetProjections()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Appsearch.PropertyPath>>>("getProjectionPaths", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getProjections", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetByDocumentIdRequest.html#getProjections()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetByDocumentIdRequest.html#getIds()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> Projections
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetIds()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getProjections", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getIds", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/GetSchemaResponse.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/GetSchemaResponse.cs
index cd354ff25..bdf584be4 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/GetSchemaResponse.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/GetSchemaResponse.cs
@@ -46,39 +46,44 @@ public partial class GetSchemaResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getRequiredPermissionsForSchemaTypeVisibility()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getVersion()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Set<Java.Util.Set<Java.Lang.Integer>>> RequiredPermissionsForSchemaTypeVisibility
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Set<Java.Util.Set<Java.Lang.Integer>>>>("getRequiredPermissionsForSchemaTypeVisibility", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getSchemas()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getSchemaTypesVisibleToPackages()"/>
         /// </summary>
-        public Java.Util.Set<Android.App.Appsearch.AppSearchSchema> Schemas
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Set<Android.App.Appsearch.PackageIdentifier>> GetSchemaTypesVisibleToPackages()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.App.Appsearch.AppSearchSchema>>("getSchemas", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Set<Android.App.Appsearch.PackageIdentifier>>>("getSchemaTypesVisibleToPackages", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getSchemaTypesNotDisplayedBySystem()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getRequiredPermissionsForSchemaTypeVisibility()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> SchemaTypesNotDisplayedBySystem
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Set<Java.Util.Set<Java.Lang.Integer>>> GetRequiredPermissionsForSchemaTypeVisibility()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSchemaTypesNotDisplayedBySystem", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Set<Java.Util.Set<Java.Lang.Integer>>>>("getRequiredPermissionsForSchemaTypeVisibility", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getSchemaTypesVisibleToPackages()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getSchemas()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Set<Android.App.Appsearch.PackageIdentifier>> SchemaTypesVisibleToPackages
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.App.Appsearch.AppSearchSchema> GetSchemas()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Set<Android.App.Appsearch.PackageIdentifier>>>("getSchemaTypesVisibleToPackages", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Set<Android.App.Appsearch.AppSearchSchema>>("getSchemas", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/GetSchemaResponse.html#getSchemaTypesNotDisplayedBySystem()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetSchemaTypesNotDisplayedBySystem()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSchemaTypesNotDisplayedBySystem", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/JoinSpec.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/JoinSpec.cs
index dc2ba628a..a74b02125 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/JoinSpec.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/JoinSpec.cs
@@ -82,39 +82,44 @@ public partial class JoinSpec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getAggregationScoringStrategy()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getNestedSearchSpec()"/>
         /// </summary>
-        public int AggregationScoringStrategy
+        /// <returns><see cref="Android.App.Appsearch.SearchSpec"/></returns>
+        public Android.App.Appsearch.SearchSpec GetNestedSearchSpec()
         {
-            get { return IExecuteWithSignature<int>("getAggregationScoringStrategy", "()I"); }
+            return IExecuteWithSignature<Android.App.Appsearch.SearchSpec>("getNestedSearchSpec", "()Landroid/app/appsearch/SearchSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getChildPropertyExpression()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getAggregationScoringStrategy()"/>
         /// </summary>
-        public Java.Lang.String ChildPropertyExpression
+        /// <returns><see cref="int"/></returns>
+        public int GetAggregationScoringStrategy()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getChildPropertyExpression", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getAggregationScoringStrategy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getMaxJoinedResultCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getMaxJoinedResultCount()"/>
         /// </summary>
-        public int MaxJoinedResultCount
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxJoinedResultCount()
         {
-            get { return IExecuteWithSignature<int>("getMaxJoinedResultCount", "()I"); }
+            return IExecuteWithSignature<int>("getMaxJoinedResultCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getNestedQuery()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getChildPropertyExpression()"/>
         /// </summary>
-        public Java.Lang.String NestedQuery
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetChildPropertyExpression()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNestedQuery", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getChildPropertyExpression", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getNestedSearchSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/JoinSpec.html#getNestedQuery()"/>
         /// </summary>
-        public Android.App.Appsearch.SearchSpec NestedSearchSpec
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNestedQuery()
         {
-            get { return IExecuteWithSignature<Android.App.Appsearch.SearchSpec>("getNestedSearchSpec", "()Landroid/app/appsearch/SearchSpec;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNestedQuery", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/AllPackageClasses.cs
index 46a27b424..9fcb37333 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class ObserverCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ObserverCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObserverCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObserverCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ObserverCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObserverCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObserverCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/DocumentChangeInfo.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/DocumentChangeInfo.cs
index 0506dd65c..71af80e87 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/DocumentChangeInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/DocumentChangeInfo.cs
@@ -58,39 +58,44 @@ public DocumentChangeInfo(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getChangedDocumentIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getDatabaseName()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> ChangedDocumentIds
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDatabaseName()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getChangedDocumentIds", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getDatabaseName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getNamespace()"/>
         /// </summary>
-        public Java.Lang.String DatabaseName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getPackageName()"/>
         /// </summary>
-        public Java.Lang.String Namespace
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getSchemaName()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSchemaName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSchemaName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getSchemaName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/DocumentChangeInfo.html#getChangedDocumentIds()"/>
         /// </summary>
-        public Java.Lang.String SchemaName
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetChangedDocumentIds()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSchemaName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getChangedDocumentIds", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/ObserverSpec.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/ObserverSpec.cs
index 2e183d4c8..c623c12d3 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/ObserverSpec.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/ObserverSpec.cs
@@ -46,11 +46,12 @@ public partial class ObserverSpec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/ObserverSpec.html#getFilterSchemas()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/ObserverSpec.html#getFilterSchemas()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> FilterSchemas
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetFilterSchemas()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFilterSchemas", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFilterSchemas", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/SchemaChangeInfo.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/SchemaChangeInfo.cs
index c7396c272..1acf8b5c3 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/SchemaChangeInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/Observer/SchemaChangeInfo.cs
@@ -56,25 +56,28 @@ public SchemaChangeInfo(Java.Lang.String arg0, Java.Lang.String arg1, Java.Util.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/SchemaChangeInfo.html#getChangedSchemaNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/SchemaChangeInfo.html#getDatabaseName()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> ChangedSchemaNames
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDatabaseName()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getChangedSchemaNames", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/SchemaChangeInfo.html#getDatabaseName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/SchemaChangeInfo.html#getPackageName()"/>
         /// </summary>
-        public Java.Lang.String DatabaseName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/SchemaChangeInfo.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/observer/SchemaChangeInfo.html#getChangedSchemaNames()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetChangedSchemaNames()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getChangedSchemaNames", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/PackageIdentifier.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/PackageIdentifier.cs
index cb9c00178..9533d1092 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/PackageIdentifier.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/PackageIdentifier.cs
@@ -55,18 +55,20 @@ public PackageIdentifier(Java.Lang.String arg0, byte[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/PackageIdentifier.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/PackageIdentifier.html#getSha256Certificate()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSha256Certificate()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getSha256Certificate", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/PackageIdentifier.html#getSha256Certificate()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/PackageIdentifier.html#getPackageName()"/>
         /// </summary>
-        public byte[] Sha256Certificate
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSha256Certificate", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/PropertyPath.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/PropertyPath.cs
index 6d21d43f1..ebf796e28 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/PropertyPath.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/PropertyPath.cs
@@ -136,18 +136,20 @@ public static Android.App.Appsearch.PropertyPath.PathSegment Create(Java.Lang.St
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/PropertyPath.PathSegment.html#getPropertyIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/PropertyPath.PathSegment.html#getPropertyIndex()"/>
             /// </summary>
-            public int PropertyIndex
+            /// <returns><see cref="int"/></returns>
+            public int GetPropertyIndex()
             {
-                get { return IExecuteWithSignature<int>("getPropertyIndex", "()I"); }
+                return IExecuteWithSignature<int>("getPropertyIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/PropertyPath.PathSegment.html#getPropertyName()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/PropertyPath.PathSegment.html#getPropertyName()"/>
             /// </summary>
-            public Java.Lang.String PropertyName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPropertyName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/PutDocumentsRequest.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/PutDocumentsRequest.cs
index 5ca6780a3..4bb89a46b 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/PutDocumentsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/PutDocumentsRequest.cs
@@ -46,11 +46,12 @@ public partial class PutDocumentsRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/PutDocumentsRequest.html#getGenericDocuments()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/PutDocumentsRequest.html#getGenericDocuments()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Appsearch.GenericDocument> GenericDocuments
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Appsearch.GenericDocument> GetGenericDocuments()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.GenericDocument>>("getGenericDocuments", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.GenericDocument>>("getGenericDocuments", "()Ljava/util/List;");
         }
 
         #endregion
@@ -99,7 +100,7 @@ public Android.App.Appsearch.PutDocumentsRequest.Builder AddGenericDocuments(par
             /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
             /// <typeparam name="Arg0ExtendsAndroid_App_Appsearch_GenericDocument"><see cref="Android.App.Appsearch.GenericDocument"/></typeparam>
             /// <returns><see cref="Android.App.Appsearch.PutDocumentsRequest.Builder"/></returns>
-            public Android.App.Appsearch.PutDocumentsRequest.Builder AddGenericDocuments<Arg0ExtendsAndroid_App_Appsearch_GenericDocument>(Java.Util.Collection<Arg0ExtendsAndroid_App_Appsearch_GenericDocument> arg0) where Arg0ExtendsAndroid_App_Appsearch_GenericDocument: Android.App.Appsearch.GenericDocument
+            public Android.App.Appsearch.PutDocumentsRequest.Builder AddGenericDocuments<Arg0ExtendsAndroid_App_Appsearch_GenericDocument>(Java.Util.Collection<Arg0ExtendsAndroid_App_Appsearch_GenericDocument> arg0) where Arg0ExtendsAndroid_App_Appsearch_GenericDocument : Android.App.Appsearch.GenericDocument
             {
                 return IExecuteWithSignature<Android.App.Appsearch.PutDocumentsRequest.Builder>("addGenericDocuments", "(Ljava/util/Collection;)Landroid/app/appsearch/PutDocumentsRequest$Builder;", arg0);
             }
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/RemoveByDocumentIdRequest.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/RemoveByDocumentIdRequest.cs
index e14b7ca41..0cb3563be 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/RemoveByDocumentIdRequest.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/RemoveByDocumentIdRequest.cs
@@ -46,18 +46,20 @@ public partial class RemoveByDocumentIdRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/RemoveByDocumentIdRequest.html#getIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/RemoveByDocumentIdRequest.html#getNamespace()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> Ids
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getIds", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/RemoveByDocumentIdRequest.html#getNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/RemoveByDocumentIdRequest.html#getIds()"/>
         /// </summary>
-        public Java.Lang.String Namespace
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetIds()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getIds", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/ReportSystemUsageRequest.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/ReportSystemUsageRequest.cs
index 6f05d61a0..a3e1c1b81 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/ReportSystemUsageRequest.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/ReportSystemUsageRequest.cs
@@ -46,39 +46,44 @@ public partial class ReportSystemUsageRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getDatabaseName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getDatabaseName()"/>
         /// </summary>
-        public Java.Lang.String DatabaseName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDatabaseName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getDocumentId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getDocumentId()"/>
         /// </summary>
-        public Java.Lang.String DocumentId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDocumentId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDocumentId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDocumentId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getNamespace()"/>
         /// </summary>
-        public Java.Lang.String Namespace
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getPackageName()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getUsageTimestampMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportSystemUsageRequest.html#getUsageTimestampMillis()"/>
         /// </summary>
-        public long UsageTimestampMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetUsageTimestampMillis()
         {
-            get { return IExecuteWithSignature<long>("getUsageTimestampMillis", "()J"); }
+            return IExecuteWithSignature<long>("getUsageTimestampMillis", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/ReportUsageRequest.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/ReportUsageRequest.cs
index 461c3def7..4566418ee 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/ReportUsageRequest.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/ReportUsageRequest.cs
@@ -46,25 +46,28 @@ public partial class ReportUsageRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportUsageRequest.html#getDocumentId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportUsageRequest.html#getDocumentId()"/>
         /// </summary>
-        public Java.Lang.String DocumentId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDocumentId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDocumentId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDocumentId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportUsageRequest.html#getNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportUsageRequest.html#getNamespace()"/>
         /// </summary>
-        public Java.Lang.String Namespace
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportUsageRequest.html#getUsageTimestampMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/ReportUsageRequest.html#getUsageTimestampMillis()"/>
         /// </summary>
-        public long UsageTimestampMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetUsageTimestampMillis()
         {
-            get { return IExecuteWithSignature<long>("getUsageTimestampMillis", "()J"); }
+            return IExecuteWithSignature<long>("getUsageTimestampMillis", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/SearchResult.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/SearchResult.cs
index 0bda6ecf9..e5faea1e7 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/SearchResult.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/SearchResult.cs
@@ -46,46 +46,52 @@ public partial class SearchResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getDatabaseName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getGenericDocument()"/>
         /// </summary>
-        public Java.Lang.String DatabaseName
+        /// <returns><see cref="Android.App.Appsearch.GenericDocument"/></returns>
+        public Android.App.Appsearch.GenericDocument GetGenericDocument()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.App.Appsearch.GenericDocument>("getGenericDocument", "()Landroid/app/appsearch/GenericDocument;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getGenericDocument()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getRankingSignal()"/>
         /// </summary>
-        public Android.App.Appsearch.GenericDocument GenericDocument
+        /// <returns><see cref="double"/></returns>
+        public double GetRankingSignal()
         {
-            get { return IExecuteWithSignature<Android.App.Appsearch.GenericDocument>("getGenericDocument", "()Landroid/app/appsearch/GenericDocument;"); }
+            return IExecuteWithSignature<double>("getRankingSignal", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getJoinedResults()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getDatabaseName()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Appsearch.SearchResult> JoinedResults
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDatabaseName()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.SearchResult>>("getJoinedResults", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getMatchInfos()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getPackageName()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Appsearch.SearchResult.MatchInfo> MatchInfos
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.SearchResult.MatchInfo>>("getMatchInfos", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getJoinedResults()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Appsearch.SearchResult> GetJoinedResults()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.SearchResult>>("getJoinedResults", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getRankingSignal()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.html#getMatchInfos()"/>
         /// </summary>
-        public double RankingSignal
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Appsearch.SearchResult.MatchInfo> GetMatchInfos()
         {
-            get { return IExecuteWithSignature<double>("getRankingSignal", "()D"); }
+            return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.SearchResult.MatchInfo>>("getMatchInfos", "()Ljava/util/List;");
         }
 
         #endregion
@@ -196,67 +202,76 @@ public partial class MatchInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getExactMatch()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getPropertyPathObject()"/>
             /// </summary>
-            public Java.Lang.CharSequence ExactMatch
+            /// <returns><see cref="Android.App.Appsearch.PropertyPath"/></returns>
+            public Android.App.Appsearch.PropertyPath GetPropertyPathObject()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getExactMatch", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.App.Appsearch.PropertyPath>("getPropertyPathObject", "()Landroid/app/appsearch/PropertyPath;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getExactMatchRange()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getExactMatchRange()"/>
             /// </summary>
-            public Android.App.Appsearch.SearchResult.MatchRange ExactMatchRange
+            /// <returns><see cref="Android.App.Appsearch.SearchResult.MatchRange"/></returns>
+            public Android.App.Appsearch.SearchResult.MatchRange GetExactMatchRange()
             {
-                get { return IExecuteWithSignature<Android.App.Appsearch.SearchResult.MatchRange>("getExactMatchRange", "()Landroid/app/appsearch/SearchResult$MatchRange;"); }
+                return IExecuteWithSignature<Android.App.Appsearch.SearchResult.MatchRange>("getExactMatchRange", "()Landroid/app/appsearch/SearchResult$MatchRange;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getFullText()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getSnippetRange()"/>
             /// </summary>
-            public Java.Lang.String FullText
+            /// <returns><see cref="Android.App.Appsearch.SearchResult.MatchRange"/></returns>
+            public Android.App.Appsearch.SearchResult.MatchRange GetSnippetRange()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getFullText", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.App.Appsearch.SearchResult.MatchRange>("getSnippetRange", "()Landroid/app/appsearch/SearchResult$MatchRange;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getPropertyPath()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getSubmatchRange()"/>
             /// </summary>
-            public Java.Lang.String PropertyPath
+            /// <returns><see cref="Android.App.Appsearch.SearchResult.MatchRange"/></returns>
+            public Android.App.Appsearch.SearchResult.MatchRange GetSubmatchRange()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPropertyPath", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.App.Appsearch.SearchResult.MatchRange>("getSubmatchRange", "()Landroid/app/appsearch/SearchResult$MatchRange;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getPropertyPathObject()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getExactMatch()"/>
             /// </summary>
-            public Android.App.Appsearch.PropertyPath PropertyPathObject
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetExactMatch()
             {
-                get { return IExecuteWithSignature<Android.App.Appsearch.PropertyPath>("getPropertyPathObject", "()Landroid/app/appsearch/PropertyPath;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getExactMatch", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getSnippet()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getSnippet()"/>
             /// </summary>
-            public Java.Lang.CharSequence Snippet
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetSnippet()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSnippet", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getSnippet", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getSnippetRange()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getSubmatch()"/>
             /// </summary>
-            public Android.App.Appsearch.SearchResult.MatchRange SnippetRange
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetSubmatch()
             {
-                get { return IExecuteWithSignature<Android.App.Appsearch.SearchResult.MatchRange>("getSnippetRange", "()Landroid/app/appsearch/SearchResult$MatchRange;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getSubmatch", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getSubmatch()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getFullText()"/>
             /// </summary>
-            public Java.Lang.CharSequence Submatch
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetFullText()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubmatch", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getFullText", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getSubmatchRange()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchInfo.html#getPropertyPath()"/>
             /// </summary>
-            public Android.App.Appsearch.SearchResult.MatchRange SubmatchRange
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPropertyPath()
             {
-                get { return IExecuteWithSignature<Android.App.Appsearch.SearchResult.MatchRange>("getSubmatchRange", "()Landroid/app/appsearch/SearchResult$MatchRange;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getPropertyPath", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -373,18 +388,20 @@ public MatchRange(int arg0, int arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchRange.html#getEnd()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchRange.html#getEnd()"/>
             /// </summary>
-            public int End
+            /// <returns><see cref="int"/></returns>
+            public int GetEnd()
             {
-                get { return IExecuteWithSignature<int>("getEnd", "()I"); }
+                return IExecuteWithSignature<int>("getEnd", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchRange.html#getStart()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchResult.MatchRange.html#getStart()"/>
             /// </summary>
-            public int Start
+            /// <returns><see cref="int"/></returns>
+            public int GetStart()
             {
-                get { return IExecuteWithSignature<int>("getStart", "()I"); }
+                return IExecuteWithSignature<int>("getStart", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSpec.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSpec.cs
index 39abace07..d6a8d1b1e 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSpec.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSpec.cs
@@ -148,154 +148,172 @@ public partial class SearchSpec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getAdvancedRankingExpression()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getJoinSpec()"/>
         /// </summary>
-        public Java.Lang.String AdvancedRankingExpression
+        /// <returns><see cref="Android.App.Appsearch.JoinSpec"/></returns>
+        public Android.App.Appsearch.JoinSpec GetJoinSpec()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAdvancedRankingExpression", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.App.Appsearch.JoinSpec>("getJoinSpec", "()Landroid/app/appsearch/JoinSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getFilterNamespaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#isListFilterQueryLanguageEnabled()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> FilterNamespaces
+        /// <returns><see cref="bool"/></returns>
+        public bool IsListFilterQueryLanguageEnabled()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterNamespaces", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("isListFilterQueryLanguageEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getFilterPackageNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#isNumericSearchEnabled()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> FilterPackageNames
+        /// <returns><see cref="bool"/></returns>
+        public bool IsNumericSearchEnabled()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterPackageNames", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("isNumericSearchEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getFilterSchemas()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#isVerbatimSearchEnabled()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> FilterSchemas
+        /// <returns><see cref="bool"/></returns>
+        public bool IsVerbatimSearchEnabled()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterSchemas", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("isVerbatimSearchEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getJoinSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getMaxSnippetSize()"/>
         /// </summary>
-        public Android.App.Appsearch.JoinSpec JoinSpec
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSnippetSize()
         {
-            get { return IExecuteWithSignature<Android.App.Appsearch.JoinSpec>("getJoinSpec", "()Landroid/app/appsearch/JoinSpec;"); }
+            return IExecuteWithSignature<int>("getMaxSnippetSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getMaxSnippetSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getOrder()"/>
         /// </summary>
-        public int MaxSnippetSize
+        /// <returns><see cref="int"/></returns>
+        public int GetOrder()
         {
-            get { return IExecuteWithSignature<int>("getMaxSnippetSize", "()I"); }
+            return IExecuteWithSignature<int>("getOrder", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getOrder()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getRankingStrategy()"/>
         /// </summary>
-        public int Order
+        /// <returns><see cref="int"/></returns>
+        public int GetRankingStrategy()
         {
-            get { return IExecuteWithSignature<int>("getOrder", "()I"); }
+            return IExecuteWithSignature<int>("getRankingStrategy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getProjectionPaths()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getResultCountPerPage()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Appsearch.PropertyPath>> ProjectionPaths
+        /// <returns><see cref="int"/></returns>
+        public int GetResultCountPerPage()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Appsearch.PropertyPath>>>("getProjectionPaths", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("getResultCountPerPage", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getProjections()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getResultGroupingLimit()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> Projections
+        /// <returns><see cref="int"/></returns>
+        public int GetResultGroupingLimit()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getProjections", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("getResultGroupingLimit", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getPropertyWeightPaths()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getResultGroupingTypeFlags()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Map<Android.App.Appsearch.PropertyPath, Java.Lang.Double>> PropertyWeightPaths
+        /// <returns><see cref="int"/></returns>
+        public int GetResultGroupingTypeFlags()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Map<Android.App.Appsearch.PropertyPath, Java.Lang.Double>>>("getPropertyWeightPaths", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("getResultGroupingTypeFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getPropertyWeights()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getSnippetCount()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Map<Java.Lang.String, Java.Lang.Double>> PropertyWeights
+        /// <returns><see cref="int"/></returns>
+        public int GetSnippetCount()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Map<Java.Lang.String, Java.Lang.Double>>>("getPropertyWeights", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("getSnippetCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getRankingStrategy()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getSnippetCountPerProperty()"/>
         /// </summary>
-        public int RankingStrategy
+        /// <returns><see cref="int"/></returns>
+        public int GetSnippetCountPerProperty()
         {
-            get { return IExecuteWithSignature<int>("getRankingStrategy", "()I"); }
+            return IExecuteWithSignature<int>("getSnippetCountPerProperty", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getResultCountPerPage()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getTermMatch()"/>
         /// </summary>
-        public int ResultCountPerPage
+        /// <returns><see cref="int"/></returns>
+        public int GetTermMatch()
         {
-            get { return IExecuteWithSignature<int>("getResultCountPerPage", "()I"); }
+            return IExecuteWithSignature<int>("getTermMatch", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getResultGroupingLimit()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getAdvancedRankingExpression()"/>
         /// </summary>
-        public int ResultGroupingLimit
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAdvancedRankingExpression()
         {
-            get { return IExecuteWithSignature<int>("getResultGroupingLimit", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAdvancedRankingExpression", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getResultGroupingTypeFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getFilterNamespaces()"/>
         /// </summary>
-        public int ResultGroupingTypeFlags
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetFilterNamespaces()
         {
-            get { return IExecuteWithSignature<int>("getResultGroupingTypeFlags", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterNamespaces", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getSnippetCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getFilterPackageNames()"/>
         /// </summary>
-        public int SnippetCount
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetFilterPackageNames()
         {
-            get { return IExecuteWithSignature<int>("getSnippetCount", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterPackageNames", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getSnippetCountPerProperty()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getFilterSchemas()"/>
         /// </summary>
-        public int SnippetCountPerProperty
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetFilterSchemas()
         {
-            get { return IExecuteWithSignature<int>("getSnippetCountPerProperty", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterSchemas", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getTermMatch()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getProjectionPaths()"/>
         /// </summary>
-        public int TermMatch
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Appsearch.PropertyPath>> GetProjectionPaths()
         {
-            get { return IExecuteWithSignature<int>("getTermMatch", "()I"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Appsearch.PropertyPath>>>("getProjectionPaths", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#isListFilterQueryLanguageEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getProjections()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsListFilterQueryLanguageEnabled()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> GetProjections()
         {
-            return IExecuteWithSignature<bool>("isListFilterQueryLanguageEnabled", "()Z");
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getProjections", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#isNumericSearchEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getPropertyWeightPaths()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsNumericSearchEnabled()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Map<Android.App.Appsearch.PropertyPath, Java.Lang.Double>> GetPropertyWeightPaths()
         {
-            return IExecuteWithSignature<bool>("isNumericSearchEnabled", "()Z");
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Map<Android.App.Appsearch.PropertyPath, Java.Lang.Double>>>("getPropertyWeightPaths", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#isVerbatimSearchEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSpec.html#getPropertyWeights()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsVerbatimSearchEnabled()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Map<Java.Lang.String, Java.Lang.Double>> GetPropertyWeights()
         {
-            return IExecuteWithSignature<bool>("isVerbatimSearchEnabled", "()Z");
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Map<Java.Lang.String, Java.Lang.Double>>>("getPropertyWeights", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSuggestionResult.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSuggestionResult.cs
index a513ef464..3654b4aee 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSuggestionResult.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSuggestionResult.cs
@@ -46,11 +46,12 @@ public partial class SearchSuggestionResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionResult.html#getSuggestedResult()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionResult.html#getSuggestedResult()"/>
         /// </summary>
-        public Java.Lang.String SuggestedResult
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSuggestedResult()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSuggestedResult", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSuggestedResult", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSuggestionSpec.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSuggestionSpec.cs
index 764f79022..6fb841a9a 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSuggestionSpec.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/SearchSuggestionSpec.cs
@@ -64,39 +64,44 @@ public partial class SearchSuggestionSpec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getFilterDocumentIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getMaximumResultCount()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> FilterDocumentIds
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumResultCount()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getFilterDocumentIds", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("getMaximumResultCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getFilterNamespaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getRankingStrategy()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> FilterNamespaces
+        /// <returns><see cref="int"/></returns>
+        public int GetRankingStrategy()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterNamespaces", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getRankingStrategy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getFilterSchemas()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getFilterNamespaces()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> FilterSchemas
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetFilterNamespaces()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterSchemas", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterNamespaces", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getMaximumResultCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getFilterSchemas()"/>
         /// </summary>
-        public int MaximumResultCount
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetFilterSchemas()
         {
-            get { return IExecuteWithSignature<int>("getMaximumResultCount", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFilterSchemas", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getRankingStrategy()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SearchSuggestionSpec.html#getFilterDocumentIds()"/>
         /// </summary>
-        public int RankingStrategy
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> GetFilterDocumentIds()
         {
-            get { return IExecuteWithSignature<int>("getRankingStrategy", "()I"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getFilterDocumentIds", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/SetSchemaRequest.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/SetSchemaRequest.cs
index 73c5a6791..59b009b68 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/SetSchemaRequest.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/SetSchemaRequest.cs
@@ -82,54 +82,60 @@ public partial class SetSchemaRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getMigrators()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#isForceOverride()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Android.App.Appsearch.Migrator> Migrators
+        /// <returns><see cref="bool"/></returns>
+        public bool IsForceOverride()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.App.Appsearch.Migrator>>("getMigrators", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<bool>("isForceOverride", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getRequiredPermissionsForSchemaTypeVisibility()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getVersion()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Set<Java.Util.Set<Java.Lang.Integer>>> RequiredPermissionsForSchemaTypeVisibility
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Set<Java.Util.Set<Java.Lang.Integer>>>>("getRequiredPermissionsForSchemaTypeVisibility", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getSchemas()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getMigrators()"/>
         /// </summary>
-        public Java.Util.Set<Android.App.Appsearch.AppSearchSchema> Schemas
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Android.App.Appsearch.Migrator> GetMigrators()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.App.Appsearch.AppSearchSchema>>("getSchemas", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.App.Appsearch.Migrator>>("getMigrators", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getSchemasNotDisplayedBySystem()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getSchemasVisibleToPackages()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> SchemasNotDisplayedBySystem
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Set<Android.App.Appsearch.PackageIdentifier>> GetSchemasVisibleToPackages()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSchemasNotDisplayedBySystem", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Set<Android.App.Appsearch.PackageIdentifier>>>("getSchemasVisibleToPackages", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getSchemasVisibleToPackages()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getRequiredPermissionsForSchemaTypeVisibility()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Set<Android.App.Appsearch.PackageIdentifier>> SchemasVisibleToPackages
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Set<Java.Util.Set<Java.Lang.Integer>>> GetRequiredPermissionsForSchemaTypeVisibility()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Set<Android.App.Appsearch.PackageIdentifier>>>("getSchemasVisibleToPackages", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Set<Java.Util.Set<Java.Lang.Integer>>>>("getRequiredPermissionsForSchemaTypeVisibility", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getSchemas()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.App.Appsearch.AppSearchSchema> GetSchemas()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<Java.Util.Set<Android.App.Appsearch.AppSearchSchema>>("getSchemas", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#isForceOverride()"/>
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaRequest.html#getSchemasNotDisplayedBySystem()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsForceOverride()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetSchemasNotDisplayedBySystem()
         {
-            return IExecuteWithSignature<bool>("isForceOverride", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSchemasNotDisplayedBySystem", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/SetSchemaResponse.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/SetSchemaResponse.cs
index adcbc00af..ff525dbfc 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/SetSchemaResponse.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/SetSchemaResponse.cs
@@ -46,32 +46,36 @@ public partial class SetSchemaResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.html#getDeletedTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.html#getMigrationFailures()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> DeletedTypes
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Appsearch.SetSchemaResponse.MigrationFailure> GetMigrationFailures()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getDeletedTypes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.SetSchemaResponse.MigrationFailure>>("getMigrationFailures", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.html#getIncompatibleTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.html#getDeletedTypes()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> IncompatibleTypes
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetDeletedTypes()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getIncompatibleTypes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getDeletedTypes", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.html#getMigratedTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.html#getIncompatibleTypes()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> MigratedTypes
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetIncompatibleTypes()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getMigratedTypes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getIncompatibleTypes", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.html#getMigrationFailures()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.html#getMigratedTypes()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Appsearch.SetSchemaResponse.MigrationFailure> MigrationFailures
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetMigratedTypes()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Appsearch.SetSchemaResponse.MigrationFailure>>("getMigrationFailures", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getMigratedTypes", "()Ljava/util/Set;");
         }
 
         #endregion
@@ -220,32 +224,36 @@ public MigrationFailure(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.MigrationFailure.html#getAppSearchResult()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.MigrationFailure.html#getAppSearchResult()"/>
             /// </summary>
-            public Android.App.Appsearch.AppSearchResult<Java.Lang.Void> AppSearchResult
+            /// <returns><see cref="Android.App.Appsearch.AppSearchResult"/></returns>
+            public Android.App.Appsearch.AppSearchResult<Java.Lang.Void> GetAppSearchResult()
             {
-                get { return IExecuteWithSignature<Android.App.Appsearch.AppSearchResult<Java.Lang.Void>>("getAppSearchResult", "()Landroid/app/appsearch/AppSearchResult;"); }
+                return IExecuteWithSignature<Android.App.Appsearch.AppSearchResult<Java.Lang.Void>>("getAppSearchResult", "()Landroid/app/appsearch/AppSearchResult;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.MigrationFailure.html#getDocumentId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.MigrationFailure.html#getDocumentId()"/>
             /// </summary>
-            public Java.Lang.String DocumentId
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDocumentId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDocumentId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getDocumentId", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.MigrationFailure.html#getNamespace()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.MigrationFailure.html#getNamespace()"/>
             /// </summary>
-            public Java.Lang.String Namespace
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetNamespace()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.MigrationFailure.html#getSchemaType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/appsearch/SetSchemaResponse.MigrationFailure.html#getSchemaType()"/>
             /// </summary>
-            public Java.Lang.String SchemaType
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetSchemaType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getSchemaType", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getSchemaType", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Appsearch/StorageInfo.cs b/src/net/Netdroid/Generated/Android/App/Appsearch/StorageInfo.cs
index 7a580d1e9..e0f10056f 100644
--- a/src/net/Netdroid/Generated/Android/App/Appsearch/StorageInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/Appsearch/StorageInfo.cs
@@ -46,25 +46,28 @@ public partial class StorageInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/StorageInfo.html#getAliveDocumentsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/StorageInfo.html#getAliveDocumentsCount()"/>
         /// </summary>
-        public int AliveDocumentsCount
+        /// <returns><see cref="int"/></returns>
+        public int GetAliveDocumentsCount()
         {
-            get { return IExecuteWithSignature<int>("getAliveDocumentsCount", "()I"); }
+            return IExecuteWithSignature<int>("getAliveDocumentsCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/StorageInfo.html#getAliveNamespacesCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/StorageInfo.html#getAliveNamespacesCount()"/>
         /// </summary>
-        public int AliveNamespacesCount
+        /// <returns><see cref="int"/></returns>
+        public int GetAliveNamespacesCount()
         {
-            get { return IExecuteWithSignature<int>("getAliveNamespacesCount", "()I"); }
+            return IExecuteWithSignature<int>("getAliveNamespacesCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/appsearch/StorageInfo.html#getSizeBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/appsearch/StorageInfo.html#getSizeBytes()"/>
         /// </summary>
-        public long SizeBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetSizeBytes()
         {
-            get { return IExecuteWithSignature<long>("getSizeBytes", "()J"); }
+            return IExecuteWithSignature<long>("getSizeBytes", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Assist/AssistContent.cs b/src/net/Netdroid/Generated/Android/App/Assist/AssistContent.cs
index 28f05aa2d..ea7d967d7 100644
--- a/src/net/Netdroid/Generated/Android/App/Assist/AssistContent.cs
+++ b/src/net/Netdroid/Generated/Android/App/Assist/AssistContent.cs
@@ -52,39 +52,36 @@ public partial class AssistContent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getClipData()"/> <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#setClipData(android.content.ClipData)"/>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getClipData()"/>
         /// </summary>
-        public Android.Content.ClipData ClipData
+        /// <returns><see cref="Android.Content.ClipData"/></returns>
+        public Android.Content.ClipData GetClipData()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;"); } set { IExecuteWithSignature("setClipData", "(Landroid/content/ClipData;)V", value); }
+            return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getIntent()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent GetIntent()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getIntent()"/> <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#setIntent(android.content.Intent)"/>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getWebUri()"/>
         /// </summary>
-        public Android.Content.Intent Intent
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetWebUri()
         {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); } set { IExecuteWithSignature("setIntent", "(Landroid/content/Intent;)V", value); }
+            return IExecuteWithSignature<Android.Net.Uri>("getWebUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getStructuredData()"/> <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#setStructuredData(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getExtras()"/>
         /// </summary>
-        public Java.Lang.String StructuredData
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getStructuredData", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setStructuredData", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getWebUri()"/> <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#setWebUri(android.net.Uri)"/>
-        /// </summary>
-        public Android.Net.Uri WebUri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getWebUri", "()Landroid/net/Uri;"); } set { IExecuteWithSignature("setWebUri", "(Landroid/net/Uri;)V", value); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#isAppProvidedIntent()"/>
@@ -111,6 +108,46 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#getStructuredData()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetStructuredData()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getStructuredData", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#setClipData(android.content.ClipData)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.ClipData"/></param>
+        public void SetClipData(Android.Content.ClipData arg0)
+        {
+            IExecuteWithSignature("setClipData", "(Landroid/content/ClipData;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#setIntent(android.content.Intent)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
+        public void SetIntent(Android.Content.Intent arg0)
+        {
+            IExecuteWithSignature("setIntent", "(Landroid/content/Intent;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#setStructuredData(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetStructuredData(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setStructuredData", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#setWebUri(android.net.Uri)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
+        public void SetWebUri(Android.Net.Uri arg0)
+        {
+            IExecuteWithSignature("setWebUri", "(Landroid/net/Uri;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/assist/AssistContent.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Assist/AssistStructure.cs b/src/net/Netdroid/Generated/Android/App/Assist/AssistStructure.cs
index c5dc45d9d..b0abcf493 100644
--- a/src/net/Netdroid/Generated/Android/App/Assist/AssistStructure.cs
+++ b/src/net/Netdroid/Generated/Android/App/Assist/AssistStructure.cs
@@ -52,57 +52,61 @@ public partial class AssistStructure
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getAcquisitionEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getWindowNodeAt(int)"/>
         /// </summary>
-        public long AcquisitionEndTime
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.App.Assist.AssistStructure.WindowNode"/></returns>
+        public Android.App.Assist.AssistStructure.WindowNode GetWindowNodeAt(int arg0)
         {
-            get { return IExecuteWithSignature<long>("getAcquisitionEndTime", "()J"); }
+            return IExecuteWithSignature<Android.App.Assist.AssistStructure.WindowNode>("getWindowNodeAt", "(I)Landroid/app/assist/AssistStructure$WindowNode;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getAcquisitionStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getActivityComponent()"/>
         /// </summary>
-        public long AcquisitionStartTime
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetActivityComponent()
         {
-            get { return IExecuteWithSignature<long>("getAcquisitionStartTime", "()J"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getActivityComponent", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getActivityComponent()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#isHomeActivity()"/>
         /// </summary>
-        public Android.Content.ComponentName ActivityComponent
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHomeActivity()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getActivityComponent", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<bool>("isHomeActivity", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getWindowNodeCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#describeContents()"/>
         /// </summary>
-        public int WindowNodeCount
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getWindowNodeCount", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getWindowNodeAt(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getWindowNodeCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.App.Assist.AssistStructure.WindowNode"/></returns>
-        public Android.App.Assist.AssistStructure.WindowNode GetWindowNodeAt(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetWindowNodeCount()
         {
-            return IExecuteWithSignature<Android.App.Assist.AssistStructure.WindowNode>("getWindowNodeAt", "(I)Landroid/app/assist/AssistStructure$WindowNode;", arg0);
+            return IExecuteWithSignature<int>("getWindowNodeCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#isHomeActivity()"/>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getAcquisitionEndTime()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHomeActivity()
+        /// <returns><see cref="long"/></returns>
+        public long GetAcquisitionEndTime()
         {
-            return IExecuteWithSignature<bool>("isHomeActivity", "()Z");
+            return IExecuteWithSignature<long>("getAcquisitionEndTime", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#getAcquisitionStartTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetAcquisitionStartTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getAcquisitionStartTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.html#writeToParcel(android.os.Parcel,int)"/>
@@ -168,432 +172,477 @@ public partial class ViewNode
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAlpha()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getChildAt(int)"/>
             /// </summary>
-            public float Alpha
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.App.Assist.AssistStructure.ViewNode"/></returns>
+            public Android.App.Assist.AssistStructure.ViewNode GetChildAt(int arg0)
             {
-                get { return IExecuteWithSignature<float>("getAlpha", "()F"); }
+                return IExecuteWithSignature<Android.App.Assist.AssistStructure.ViewNode>("getChildAt", "(I)Landroid/app/assist/AssistStructure$ViewNode;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillHints()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTransformation()"/>
             /// </summary>
-            public Java.Lang.String[] AutofillHints
+            /// <returns><see cref="Android.Graphics.Matrix"/></returns>
+            public Android.Graphics.Matrix GetTransformation()
             {
-                get { return IExecuteWithSignatureArray<Java.Lang.String>("getAutofillHints", "()[Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Graphics.Matrix>("getTransformation", "()Landroid/graphics/Matrix;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getExtras()"/>
             /// </summary>
-            public Android.View.Autofill.AutofillId AutofillId
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillOptions()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getLocaleList()"/>
             /// </summary>
-            public Java.Lang.CharSequence[] AutofillOptions
+            /// <returns><see cref="Android.Os.LocaleList"/></returns>
+            public Android.Os.LocaleList GetLocaleList()
             {
-                get { return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getAutofillOptions", "()[Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.Os.LocaleList>("getLocaleList", "()Landroid/os/LocaleList;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillId()"/>
             /// </summary>
-            public int AutofillType
+            /// <returns><see cref="Android.View.Autofill.AutofillId"/></returns>
+            public Android.View.Autofill.AutofillId GetAutofillId()
             {
-                get { return IExecuteWithSignature<int>("getAutofillType", "()I"); }
+                return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillValue()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillValue()"/>
             /// </summary>
-            public Android.View.Autofill.AutofillValue AutofillValue
+            /// <returns><see cref="Android.View.Autofill.AutofillValue"/></returns>
+            public Android.View.Autofill.AutofillValue GetAutofillValue()
             {
-                get { return IExecuteWithSignature<Android.View.Autofill.AutofillValue>("getAutofillValue", "()Landroid/view/autofill/AutofillValue;"); }
+                return IExecuteWithSignature<Android.View.Autofill.AutofillValue>("getAutofillValue", "()Landroid/view/autofill/AutofillValue;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getChildCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getHtmlInfo()"/>
             /// </summary>
-            public int ChildCount
+            /// <returns><see cref="Android.View.ViewStructure.HtmlInfo"/></returns>
+            public Android.View.ViewStructure.HtmlInfo GetHtmlInfo()
             {
-                get { return IExecuteWithSignature<int>("getChildCount", "()I"); }
+                return IExecuteWithSignature<Android.View.ViewStructure.HtmlInfo>("getHtmlInfo", "()Landroid/view/ViewStructure$HtmlInfo;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getClassName()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isAccessibilityFocused()"/>
             /// </summary>
-            public Java.Lang.String ClassName
+            /// <returns><see cref="bool"/></returns>
+            public bool IsAccessibilityFocused()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isAccessibilityFocused", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getContentDescription()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isActivated()"/>
             /// </summary>
-            public Java.Lang.CharSequence ContentDescription
+            /// <returns><see cref="bool"/></returns>
+            public bool IsActivated()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<bool>("isActivated", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getElevation()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isAssistBlocked()"/>
             /// </summary>
-            public float Elevation
+            /// <returns><see cref="bool"/></returns>
+            public bool IsAssistBlocked()
             {
-                get { return IExecuteWithSignature<float>("getElevation", "()F"); }
+                return IExecuteWithSignature<bool>("isAssistBlocked", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isCheckable()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="bool"/></returns>
+            public bool IsCheckable()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<bool>("isCheckable", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isChecked()"/>
             /// </summary>
-            public int Height
+            /// <returns><see cref="bool"/></returns>
+            public bool IsChecked()
             {
-                get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+                return IExecuteWithSignature<bool>("isChecked", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getHint()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isClickable()"/>
             /// </summary>
-            public Java.Lang.String Hint
+            /// <returns><see cref="bool"/></returns>
+            public bool IsClickable()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getHint", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isClickable", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getHintIdEntry()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isContextClickable()"/>
             /// </summary>
-            public Java.Lang.String HintIdEntry
+            /// <returns><see cref="bool"/></returns>
+            public bool IsContextClickable()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getHintIdEntry", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isContextClickable", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getHtmlInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isEnabled()"/>
             /// </summary>
-            public Android.View.ViewStructure.HtmlInfo HtmlInfo
+            /// <returns><see cref="bool"/></returns>
+            public bool IsEnabled()
             {
-                get { return IExecuteWithSignature<Android.View.ViewStructure.HtmlInfo>("getHtmlInfo", "()Landroid/view/ViewStructure$HtmlInfo;"); }
+                return IExecuteWithSignature<bool>("isEnabled", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isFocusable()"/>
             /// </summary>
-            public int Id
+            /// <returns><see cref="bool"/></returns>
+            public bool IsFocusable()
             {
-                get { return IExecuteWithSignature<int>("getId", "()I"); }
+                return IExecuteWithSignature<bool>("isFocusable", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getIdEntry()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isFocused()"/>
             /// </summary>
-            public Java.Lang.String IdEntry
+            /// <returns><see cref="bool"/></returns>
+            public bool IsFocused()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getIdEntry", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isFocused", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getIdPackage()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isLongClickable()"/>
             /// </summary>
-            public Java.Lang.String IdPackage
+            /// <returns><see cref="bool"/></returns>
+            public bool IsLongClickable()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getIdPackage", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isLongClickable", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getIdType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isOpaque()"/>
             /// </summary>
-            public Java.Lang.String IdType
+            /// <returns><see cref="bool"/></returns>
+            public bool IsOpaque()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getIdType", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isOpaque", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getImportantForAutofill()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isSelected()"/>
             /// </summary>
-            public int ImportantForAutofill
+            /// <returns><see cref="bool"/></returns>
+            public bool IsSelected()
             {
-                get { return IExecuteWithSignature<int>("getImportantForAutofill", "()I"); }
+                return IExecuteWithSignature<bool>("isSelected", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getInputType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAlpha()"/>
             /// </summary>
-            public int InputType
+            /// <returns><see cref="float"/></returns>
+            public float GetAlpha()
             {
-                get { return IExecuteWithSignature<int>("getInputType", "()I"); }
+                return IExecuteWithSignature<float>("getAlpha", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getLeft()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getElevation()"/>
             /// </summary>
-            public int Left
+            /// <returns><see cref="float"/></returns>
+            public float GetElevation()
             {
-                get { return IExecuteWithSignature<int>("getLeft", "()I"); }
+                return IExecuteWithSignature<float>("getElevation", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getLocaleList()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextSize()"/>
             /// </summary>
-            public Android.Os.LocaleList LocaleList
+            /// <returns><see cref="float"/></returns>
+            public float GetTextSize()
             {
-                get { return IExecuteWithSignature<Android.Os.LocaleList>("getLocaleList", "()Landroid/os/LocaleList;"); }
+                return IExecuteWithSignature<float>("getTextSize", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getMaxTextEms()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillType()"/>
             /// </summary>
-            public int MaxTextEms
+            /// <returns><see cref="int"/></returns>
+            public int GetAutofillType()
             {
-                get { return IExecuteWithSignature<int>("getMaxTextEms", "()I"); }
+                return IExecuteWithSignature<int>("getAutofillType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getMaxTextLength()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getChildCount()"/>
             /// </summary>
-            public int MaxTextLength
+            /// <returns><see cref="int"/></returns>
+            public int GetChildCount()
             {
-                get { return IExecuteWithSignature<int>("getMaxTextLength", "()I"); }
+                return IExecuteWithSignature<int>("getChildCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getMinTextEms()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getHeight()"/>
             /// </summary>
-            public int MinTextEms
+            /// <returns><see cref="int"/></returns>
+            public int GetHeight()
             {
-                get { return IExecuteWithSignature<int>("getMinTextEms", "()I"); }
+                return IExecuteWithSignature<int>("getHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getReceiveContentMimeTypes()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getId()"/>
             /// </summary>
-            public Java.Lang.String[] ReceiveContentMimeTypes
+            /// <returns><see cref="int"/></returns>
+            public int GetId()
             {
-                get { return IExecuteWithSignatureArray<Java.Lang.String>("getReceiveContentMimeTypes", "()[Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getScrollX()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getImportantForAutofill()"/>
             /// </summary>
-            public int ScrollX
+            /// <returns><see cref="int"/></returns>
+            public int GetImportantForAutofill()
             {
-                get { return IExecuteWithSignature<int>("getScrollX", "()I"); }
+                return IExecuteWithSignature<int>("getImportantForAutofill", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getScrollY()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getInputType()"/>
             /// </summary>
-            public int ScrollY
+            /// <returns><see cref="int"/></returns>
+            public int GetInputType()
             {
-                get { return IExecuteWithSignature<int>("getScrollY", "()I"); }
+                return IExecuteWithSignature<int>("getInputType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getText()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getLeft()"/>
             /// </summary>
-            public Java.Lang.CharSequence Text
+            /// <returns><see cref="int"/></returns>
+            public int GetLeft()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<int>("getLeft", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextBackgroundColor()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getMaxTextEms()"/>
             /// </summary>
-            public int TextBackgroundColor
+            /// <returns><see cref="int"/></returns>
+            public int GetMaxTextEms()
             {
-                get { return IExecuteWithSignature<int>("getTextBackgroundColor", "()I"); }
+                return IExecuteWithSignature<int>("getMaxTextEms", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextColor()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getMaxTextLength()"/>
             /// </summary>
-            public int TextColor
+            /// <returns><see cref="int"/></returns>
+            public int GetMaxTextLength()
             {
-                get { return IExecuteWithSignature<int>("getTextColor", "()I"); }
+                return IExecuteWithSignature<int>("getMaxTextLength", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextIdEntry()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getMinTextEms()"/>
             /// </summary>
-            public Java.Lang.String TextIdEntry
+            /// <returns><see cref="int"/></returns>
+            public int GetMinTextEms()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getTextIdEntry", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getMinTextEms", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextLineBaselines()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getScrollX()"/>
             /// </summary>
-            public int[] TextLineBaselines
+            /// <returns><see cref="int"/></returns>
+            public int GetScrollX()
             {
-                get { return IExecuteWithSignatureArray<int>("getTextLineBaselines", "()[I"); }
+                return IExecuteWithSignature<int>("getScrollX", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextLineCharOffsets()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getScrollY()"/>
             /// </summary>
-            public int[] TextLineCharOffsets
+            /// <returns><see cref="int"/></returns>
+            public int GetScrollY()
             {
-                get { return IExecuteWithSignatureArray<int>("getTextLineCharOffsets", "()[I"); }
+                return IExecuteWithSignature<int>("getScrollY", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextSelectionEnd()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextBackgroundColor()"/>
             /// </summary>
-            public int TextSelectionEnd
+            /// <returns><see cref="int"/></returns>
+            public int GetTextBackgroundColor()
             {
-                get { return IExecuteWithSignature<int>("getTextSelectionEnd", "()I"); }
+                return IExecuteWithSignature<int>("getTextBackgroundColor", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextSelectionStart()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextColor()"/>
             /// </summary>
-            public int TextSelectionStart
+            /// <returns><see cref="int"/></returns>
+            public int GetTextColor()
             {
-                get { return IExecuteWithSignature<int>("getTextSelectionStart", "()I"); }
+                return IExecuteWithSignature<int>("getTextColor", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextSize()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextSelectionEnd()"/>
             /// </summary>
-            public float TextSize
+            /// <returns><see cref="int"/></returns>
+            public int GetTextSelectionEnd()
             {
-                get { return IExecuteWithSignature<float>("getTextSize", "()F"); }
+                return IExecuteWithSignature<int>("getTextSelectionEnd", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextStyle()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextSelectionStart()"/>
             /// </summary>
-            public int TextStyle
+            /// <returns><see cref="int"/></returns>
+            public int GetTextSelectionStart()
             {
-                get { return IExecuteWithSignature<int>("getTextStyle", "()I"); }
+                return IExecuteWithSignature<int>("getTextSelectionStart", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTop()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextStyle()"/>
             /// </summary>
-            public int Top
+            /// <returns><see cref="int"/></returns>
+            public int GetTextStyle()
             {
-                get { return IExecuteWithSignature<int>("getTop", "()I"); }
+                return IExecuteWithSignature<int>("getTextStyle", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTransformation()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTop()"/>
             /// </summary>
-            public Android.Graphics.Matrix Transformation
+            /// <returns><see cref="int"/></returns>
+            public int GetTop()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Matrix>("getTransformation", "()Landroid/graphics/Matrix;"); }
+                return IExecuteWithSignature<int>("getTop", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getVisibility()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getVisibility()"/>
             /// </summary>
-            public int Visibility
+            /// <returns><see cref="int"/></returns>
+            public int GetVisibility()
             {
-                get { return IExecuteWithSignature<int>("getVisibility", "()I"); }
+                return IExecuteWithSignature<int>("getVisibility", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getWebDomain()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getWidth()"/>
             /// </summary>
-            public Java.Lang.String WebDomain
+            /// <returns><see cref="int"/></returns>
+            public int GetWidth()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getWebDomain", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getWidth", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getWebScheme()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextLineBaselines()"/>
             /// </summary>
-            public Java.Lang.String WebScheme
+            /// <returns><see cref="int"/></returns>
+            public int[] GetTextLineBaselines()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getWebScheme", "()Ljava/lang/String;"); }
+                return IExecuteWithSignatureArray<int>("getTextLineBaselines", "()[I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextLineCharOffsets()"/>
             /// </summary>
-            public int Width
+            /// <returns><see cref="int"/></returns>
+            public int[] GetTextLineCharOffsets()
             {
-                get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+                return IExecuteWithSignatureArray<int>("getTextLineCharOffsets", "()[I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getChildAt(int)"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getContentDescription()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <returns><see cref="Android.App.Assist.AssistStructure.ViewNode"/></returns>
-            public Android.App.Assist.AssistStructure.ViewNode GetChildAt(int arg0)
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetContentDescription()
             {
-                return IExecuteWithSignature<Android.App.Assist.AssistStructure.ViewNode>("getChildAt", "(I)Landroid/app/assist/AssistStructure$ViewNode;", arg0);
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isAccessibilityFocused()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getText()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsAccessibilityFocused()
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetText()
             {
-                return IExecuteWithSignature<bool>("isAccessibilityFocused", "()Z");
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isActivated()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillOptions()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsActivated()
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence[] GetAutofillOptions()
             {
-                return IExecuteWithSignature<bool>("isActivated", "()Z");
+                return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getAutofillOptions", "()[Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isAssistBlocked()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getClassName()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsAssistBlocked()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetClassName()
             {
-                return IExecuteWithSignature<bool>("isAssistBlocked", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isCheckable()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getHint()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsCheckable()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetHint()
             {
-                return IExecuteWithSignature<bool>("isCheckable", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getHint", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isChecked()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getHintIdEntry()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsChecked()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetHintIdEntry()
             {
-                return IExecuteWithSignature<bool>("isChecked", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getHintIdEntry", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isClickable()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getIdEntry()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsClickable()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetIdEntry()
             {
-                return IExecuteWithSignature<bool>("isClickable", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getIdEntry", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isContextClickable()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getIdPackage()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsContextClickable()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetIdPackage()
             {
-                return IExecuteWithSignature<bool>("isContextClickable", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getIdPackage", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isEnabled()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getIdType()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsEnabled()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetIdType()
             {
-                return IExecuteWithSignature<bool>("isEnabled", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getIdType", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isFocusable()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getTextIdEntry()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsFocusable()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetTextIdEntry()
             {
-                return IExecuteWithSignature<bool>("isFocusable", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getTextIdEntry", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isFocused()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getWebDomain()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsFocused()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetWebDomain()
             {
-                return IExecuteWithSignature<bool>("isFocused", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getWebDomain", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isLongClickable()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getWebScheme()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsLongClickable()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetWebScheme()
             {
-                return IExecuteWithSignature<bool>("isLongClickable", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getWebScheme", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isOpaque()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getAutofillHints()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsOpaque()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String[] GetAutofillHints()
             {
-                return IExecuteWithSignature<bool>("isOpaque", "()Z");
+                return IExecuteWithSignatureArray<Java.Lang.String>("getAutofillHints", "()[Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#isSelected()"/>
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.ViewNode.html#getReceiveContentMimeTypes()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsSelected()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String[] GetReceiveContentMimeTypes()
             {
-                return IExecuteWithSignature<bool>("isSelected", "()Z");
+                return IExecuteWithSignatureArray<Java.Lang.String>("getReceiveContentMimeTypes", "()[Ljava/lang/String;");
             }
 
             #endregion
@@ -627,53 +676,60 @@ public partial class WindowNode
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getDisplayId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getRootViewNode()"/>
             /// </summary>
-            public int DisplayId
+            /// <returns><see cref="Android.App.Assist.AssistStructure.ViewNode"/></returns>
+            public Android.App.Assist.AssistStructure.ViewNode GetRootViewNode()
             {
-                get { return IExecuteWithSignature<int>("getDisplayId", "()I"); }
+                return IExecuteWithSignature<Android.App.Assist.AssistStructure.ViewNode>("getRootViewNode", "()Landroid/app/assist/AssistStructure$ViewNode;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getDisplayId()"/>
             /// </summary>
-            public int Height
+            /// <returns><see cref="int"/></returns>
+            public int GetDisplayId()
             {
-                get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+                return IExecuteWithSignature<int>("getDisplayId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getLeft()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getHeight()"/>
             /// </summary>
-            public int Left
+            /// <returns><see cref="int"/></returns>
+            public int GetHeight()
             {
-                get { return IExecuteWithSignature<int>("getLeft", "()I"); }
+                return IExecuteWithSignature<int>("getHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getRootViewNode()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getLeft()"/>
             /// </summary>
-            public Android.App.Assist.AssistStructure.ViewNode RootViewNode
+            /// <returns><see cref="int"/></returns>
+            public int GetLeft()
             {
-                get { return IExecuteWithSignature<Android.App.Assist.AssistStructure.ViewNode>("getRootViewNode", "()Landroid/app/assist/AssistStructure$ViewNode;"); }
+                return IExecuteWithSignature<int>("getLeft", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getTitle()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getTop()"/>
             /// </summary>
-            public Java.Lang.CharSequence Title
+            /// <returns><see cref="int"/></returns>
+            public int GetTop()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<int>("getTop", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getTop()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getWidth()"/>
             /// </summary>
-            public int Top
+            /// <returns><see cref="int"/></returns>
+            public int GetWidth()
             {
-                get { return IExecuteWithSignature<int>("getTop", "()I"); }
+                return IExecuteWithSignature<int>("getWidth", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/assist/AssistStructure.WindowNode.html#getTitle()"/>
             /// </summary>
-            public int Width
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetTitle()
             {
-                get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/AsyncNotedAppOp.cs b/src/net/Netdroid/Generated/Android/App/AsyncNotedAppOp.cs
index 093a3fa45..73eaea1e9 100644
--- a/src/net/Netdroid/Generated/Android/App/AsyncNotedAppOp.cs
+++ b/src/net/Netdroid/Generated/Android/App/AsyncNotedAppOp.cs
@@ -52,47 +52,52 @@ public partial class AsyncNotedAppOp
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getAttributionTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String AttributionTag
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getNotingUid()"/>
         /// </summary>
-        public Java.Lang.String Message
+        /// <returns><see cref="int"/></returns>
+        public int GetNotingUid()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getNotingUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getNotingUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getAttributionTag()"/>
         /// </summary>
-        public int NotingUid
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAttributionTag()
         {
-            get { return IExecuteWithSignature<int>("getNotingUid", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getOp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getMessage()"/>
         /// </summary>
-        public Java.Lang.String Op
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMessage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOp", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getOp()"/>
         /// </summary>
-        public long Time
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOp()
         {
-            get { return IExecuteWithSignature<long>("getTime", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getOp", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#getTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AsyncNotedAppOp.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/AutomaticZenRule.cs b/src/net/Netdroid/Generated/Android/App/AutomaticZenRule.cs
index 3b7981f07..25f5e7e1b 100644
--- a/src/net/Netdroid/Generated/Android/App/AutomaticZenRule.cs
+++ b/src/net/Netdroid/Generated/Android/App/AutomaticZenRule.cs
@@ -59,7 +59,7 @@ public AutomaticZenRule(Java.Lang.String arg0, Android.Content.ComponentName arg
         /// <param name="arg2"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AutomaticZenRule(Java.Lang.String arg0, Android.Content.ComponentName arg1, Android.Net.Uri arg2, int arg3, bool arg4)
             : base(arg0, arg1, arg2, arg3, arg4)
         {
@@ -87,69 +87,92 @@ public AutomaticZenRule(Java.Lang.String arg0, Android.Content.ComponentName arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getConditionId()"/> <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setConditionId(android.net.Uri)"/>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getConfigurationActivity()"/>
         /// </summary>
-        public Android.Net.Uri ConditionId
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetConfigurationActivity()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getConditionId", "()Landroid/net/Uri;"); } set { IExecuteWithSignature("setConditionId", "(Landroid/net/Uri;)V", value); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getConfigurationActivity", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getConfigurationActivity()"/> <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setConfigurationActivity(android.content.ComponentName)"/>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getOwner()"/>
         /// </summary>
-        public Android.Content.ComponentName ConfigurationActivity
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetOwner()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getConfigurationActivity", "()Landroid/content/ComponentName;"); } set { IExecuteWithSignature("setConfigurationActivity", "(Landroid/content/ComponentName;)V", value); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getOwner", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getCreationTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getConditionId()"/>
         /// </summary>
-        public long CreationTime
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetConditionId()
         {
-            get { return IExecuteWithSignature<long>("getCreationTime", "()J"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getConditionId", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getInterruptionFilter()"/> <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setInterruptionFilter(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getZenPolicy()"/>
         /// </summary>
-        public int InterruptionFilter
+        /// <returns><see cref="Android.Service.Notification.ZenPolicy"/></returns>
+        public Android.Service.Notification.ZenPolicy GetZenPolicy()
         {
-            get { return IExecuteWithSignature<int>("getInterruptionFilter", "()I"); } set { IExecuteWithSignature("setInterruptionFilter", "(I)V", value); }
+            return IExecuteWithSignature<Android.Service.Notification.ZenPolicy>("getZenPolicy", "()Landroid/service/notification/ZenPolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getName()"/> <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#isEnabled()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEnabled()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getOwner()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#describeContents()"/>
         /// </summary>
-        public Android.Content.ComponentName Owner
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getOwner", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getZenPolicy()"/> <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setZenPolicy(android.service.notification.ZenPolicy)"/>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getInterruptionFilter()"/>
         /// </summary>
-        public Android.Service.Notification.ZenPolicy ZenPolicy
+        /// <returns><see cref="int"/></returns>
+        public int GetInterruptionFilter()
         {
-            get { return IExecuteWithSignature<Android.Service.Notification.ZenPolicy>("getZenPolicy", "()Landroid/service/notification/ZenPolicy;"); } set { IExecuteWithSignature("setZenPolicy", "(Landroid/service/notification/ZenPolicy;)V", value); }
+            return IExecuteWithSignature<int>("getInterruptionFilter", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#isEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEnabled()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isEnabled", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#getCreationTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetCreationTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getCreationTime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setConditionId(android.net.Uri)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
+        public void SetConditionId(Android.Net.Uri arg0)
+        {
+            IExecuteWithSignature("setConditionId", "(Landroid/net/Uri;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setConfigurationActivity(android.content.ComponentName)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
+        public void SetConfigurationActivity(Android.Content.ComponentName arg0)
+        {
+            IExecuteWithSignature("setConfigurationActivity", "(Landroid/content/ComponentName;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setEnabled(boolean)"/>
@@ -160,6 +183,30 @@ public void SetEnabled(bool arg0)
             IExecuteWithSignature("setEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setInterruptionFilter(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInterruptionFilter(int arg0)
+        {
+            IExecuteWithSignature("setInterruptionFilter", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#setZenPolicy(android.service.notification.ZenPolicy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Service.Notification.ZenPolicy"/></param>
+        public void SetZenPolicy(Android.Service.Notification.ZenPolicy arg0)
+        {
+            IExecuteWithSignature("setZenPolicy", "(Landroid/service/notification/ZenPolicy;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/AutomaticZenRule.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Backup/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Backup/AllPackageClasses.cs
index c6d42ee91..fb239d94d 100644
--- a/src/net/Netdroid/Generated/Android/App/Backup/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Backup/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class BackupAgent : Android.Content.ContextWrapper
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BackupAgent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BackupAgent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BackupAgent() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BackupAgent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BackupAgent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BackupAgent(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,12 +258,12 @@ public partial class BackupHelper : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Back
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BackupHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BackupHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BackupHelper() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BackupHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BackupHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BackupHelper(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -436,12 +436,12 @@ public partial class RestoreObserver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<R
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RestoreObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RestoreObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RestoreObserver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RestoreObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RestoreObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RestoreObserver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Backup/BackupDataInput.cs b/src/net/Netdroid/Generated/Android/App/Backup/BackupDataInput.cs
index 1a06c3986..583b987ab 100644
--- a/src/net/Netdroid/Generated/Android/App/Backup/BackupDataInput.cs
+++ b/src/net/Netdroid/Generated/Android/App/Backup/BackupDataInput.cs
@@ -46,20 +46,6 @@ public partial class BackupDataInput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInput.html#getDataSize()"/> 
-        /// </summary>
-        public int DataSize
-        {
-            get { return IExecuteWithSignature<int>("getDataSize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInput.html#getKey()"/> 
-        /// </summary>
-        public Java.Lang.String Key
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInput.html#readNextHeader()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -69,6 +55,14 @@ public bool ReadNextHeader()
             return IExecuteWithSignature<bool>("readNextHeader", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInput.html#getDataSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDataSize()
+        {
+            return IExecuteWithSignature<int>("getDataSize", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInput.html#readEntityData(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
@@ -81,6 +75,14 @@ public int ReadEntityData(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("readEntityData", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInput.html#getKey()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKey()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInput.html#skipEntityData()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Backup/BackupDataInputStream.cs b/src/net/Netdroid/Generated/Android/App/Backup/BackupDataInputStream.cs
index 09dfa76e6..4967bdc15 100644
--- a/src/net/Netdroid/Generated/Android/App/Backup/BackupDataInputStream.cs
+++ b/src/net/Netdroid/Generated/Android/App/Backup/BackupDataInputStream.cs
@@ -46,13 +46,6 @@ public partial class BackupDataInputStream
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInputStream.html#getKey()"/> 
-        /// </summary>
-        public Java.Lang.String Key
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInputStream.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -60,6 +53,14 @@ public int Size()
         {
             return IExecuteWithSignature<int>("size", "()I");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataInputStream.html#getKey()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKey()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/App/Backup/BackupDataOutput.cs b/src/net/Netdroid/Generated/Android/App/Backup/BackupDataOutput.cs
index e5e7932ac..b677e38e6 100644
--- a/src/net/Netdroid/Generated/Android/App/Backup/BackupDataOutput.cs
+++ b/src/net/Netdroid/Generated/Android/App/Backup/BackupDataOutput.cs
@@ -46,18 +46,12 @@ public partial class BackupDataOutput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataOutput.html#getQuota()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataOutput.html#getTransportFlags()"/>
         /// </summary>
-        public long Quota
-        {
-            get { return IExecuteWithSignature<long>("getQuota", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataOutput.html#getTransportFlags()"/> 
-        /// </summary>
-        public int TransportFlags
+        /// <returns><see cref="int"/></returns>
+        public int GetTransportFlags()
         {
-            get { return IExecuteWithSignature<int>("getTransportFlags", "()I"); }
+            return IExecuteWithSignature<int>("getTransportFlags", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataOutput.html#writeEntityData(byte[],int)"/>
@@ -81,6 +75,14 @@ public int WriteEntityHeader(Java.Lang.String arg0, int arg1)
         {
             return IExecute<int>("writeEntityHeader", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/backup/BackupDataOutput.html#getQuota()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetQuota()
+        {
+            return IExecuteWithSignature<long>("getQuota", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/App/Backup/BackupManager.cs b/src/net/Netdroid/Generated/Android/App/Backup/BackupManager.cs
index 877975af4..d68e201f1 100644
--- a/src/net/Netdroid/Generated/Android/App/Backup/BackupManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/Backup/BackupManager.cs
@@ -75,7 +75,7 @@ public Android.Os.UserHandle GetUserForAncestralSerialNumber(long arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Backup.RestoreObserver"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int RequestRestore(Android.App.Backup.RestoreObserver arg0)
         {
             return IExecuteWithSignature<int>("requestRestore", "(Landroid/app/backup/RestoreObserver;)I", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/Backup/FullBackupDataOutput.cs b/src/net/Netdroid/Generated/Android/App/Backup/FullBackupDataOutput.cs
index 7026895b0..555920597 100644
--- a/src/net/Netdroid/Generated/Android/App/Backup/FullBackupDataOutput.cs
+++ b/src/net/Netdroid/Generated/Android/App/Backup/FullBackupDataOutput.cs
@@ -46,18 +46,20 @@ public partial class FullBackupDataOutput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/backup/FullBackupDataOutput.html#getQuota()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/backup/FullBackupDataOutput.html#getTransportFlags()"/>
         /// </summary>
-        public long Quota
+        /// <returns><see cref="int"/></returns>
+        public int GetTransportFlags()
         {
-            get { return IExecuteWithSignature<long>("getQuota", "()J"); }
+            return IExecuteWithSignature<int>("getTransportFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/backup/FullBackupDataOutput.html#getTransportFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/backup/FullBackupDataOutput.html#getQuota()"/>
         /// </summary>
-        public int TransportFlags
+        /// <returns><see cref="long"/></returns>
+        public long GetQuota()
         {
-            get { return IExecuteWithSignature<int>("getTransportFlags", "()I"); }
+            return IExecuteWithSignature<long>("getQuota", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Blob/BlobHandle.cs b/src/net/Netdroid/Generated/Android/App/Blob/BlobHandle.cs
index 192c14e48..1dbacfc0f 100644
--- a/src/net/Netdroid/Generated/Android/App/Blob/BlobHandle.cs
+++ b/src/net/Netdroid/Generated/Android/App/Blob/BlobHandle.cs
@@ -64,40 +64,44 @@ public static Android.App.Blob.BlobHandle CreateWithSha256(byte[] arg0, Java.Lan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#getExpiryTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#getSha256Digest()"/>
         /// </summary>
-        public long ExpiryTimeMillis
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSha256Digest()
         {
-            get { return IExecuteWithSignature<long>("getExpiryTimeMillis", "()J"); }
+            return IExecuteWithSignatureArray<byte>("getSha256Digest", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#getSha256Digest()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#getLabel()"/>
         /// </summary>
-        public byte[] Sha256Digest
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSha256Digest", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#getTag()"/>
         /// </summary>
-        public Java.Lang.String Tag
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTag()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#getExpiryTimeMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetExpiryTimeMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getExpiryTimeMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/blob/BlobHandle.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Blob/BlobStoreManager.cs b/src/net/Netdroid/Generated/Android/App/Blob/BlobStoreManager.cs
index f4eca2bb3..8109b2905 100644
--- a/src/net/Netdroid/Generated/Android/App/Blob/BlobStoreManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/Blob/BlobStoreManager.cs
@@ -46,20 +46,6 @@ public partial class BlobStoreManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.html#getLeasedBlobs()"/> 
-        /// </summary>
-        public Java.Util.List<Android.App.Blob.BlobHandle> LeasedBlobs
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Blob.BlobHandle>>("getLeasedBlobs", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.html#getRemainingLeaseQuotaBytes()"/> 
-        /// </summary>
-        public long RemainingLeaseQuotaBytes
-        {
-            get { return IExecuteWithSignature<long>("getRemainingLeaseQuotaBytes", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.html#openSession(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -80,6 +66,15 @@ public Android.Os.ParcelFileDescriptor OpenBlob(Android.App.Blob.BlobHandle arg0
             return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("openBlob", "(Landroid/app/blob/BlobHandle;)Landroid/os/ParcelFileDescriptor;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.html#getLeasedBlobs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.List<Android.App.Blob.BlobHandle> GetLeasedBlobs()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.Blob.BlobHandle>>("getLeasedBlobs", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.html#createSession(android.app.blob.BlobHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Blob.BlobHandle"/></param>
@@ -90,6 +85,14 @@ public long CreateSession(Android.App.Blob.BlobHandle arg0)
             return IExecuteWithSignature<long>("createSession", "(Landroid/app/blob/BlobHandle;)J", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.html#getRemainingLeaseQuotaBytes()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetRemainingLeaseQuotaBytes()
+        {
+            return IExecuteWithSignature<long>("getRemainingLeaseQuotaBytes", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.html#abandonSession(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -174,13 +177,6 @@ public partial class Session
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.Session.html#getSize()"/> 
-            /// </summary>
-            public long Size
-            {
-                get { return IExecuteWithSignature<long>("getSize", "()J"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.Session.html#openRead()"/>
             /// </summary>
             /// <returns><see cref="Android.Os.ParcelFileDescriptor"/></returns>
@@ -230,6 +226,15 @@ public bool IsSameSignatureAccessAllowed()
                 return IExecuteWithSignature<bool>("isSameSignatureAccessAllowed", "()Z");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.Session.html#getSize()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            /// <exception cref="Java.Io.IOException"/>
+            public long GetSize()
+            {
+                return IExecuteWithSignature<long>("getSize", "()J");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/blob/BlobStoreManager.Session.html#abandon()"/>
             /// </summary>
             /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/App/BroadcastOptions.cs b/src/net/Netdroid/Generated/Android/App/BroadcastOptions.cs
index 1b438943b..b87c2fea4 100644
--- a/src/net/Netdroid/Generated/Android/App/BroadcastOptions.cs
+++ b/src/net/Netdroid/Generated/Android/App/BroadcastOptions.cs
@@ -93,27 +93,6 @@ public static Android.App.BroadcastOptions MakeBasic()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/BroadcastOptions.html#getDeferralPolicy()"/> 
-        /// </summary>
-        public int DeferralPolicy
-        {
-            get { return IExecuteWithSignature<int>("getDeferralPolicy", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/BroadcastOptions.html#getDeliveryGroupMatchingKey()"/> 
-        /// </summary>
-        public Java.Lang.String DeliveryGroupMatchingKey
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeliveryGroupMatchingKey", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/BroadcastOptions.html#getDeliveryGroupPolicy()"/> 
-        /// </summary>
-        public int DeliveryGroupPolicy
-        {
-            get { return IExecuteWithSignature<int>("getDeliveryGroupPolicy", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/BroadcastOptions.html#setDeferralPolicy(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -167,6 +146,30 @@ public bool IsShareIdentityEnabled()
             return IExecuteWithSignature<bool>("isShareIdentityEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/BroadcastOptions.html#getDeferralPolicy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDeferralPolicy()
+        {
+            return IExecuteWithSignature<int>("getDeferralPolicy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/BroadcastOptions.html#getDeliveryGroupPolicy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDeliveryGroupPolicy()
+        {
+            return IExecuteWithSignature<int>("getDeliveryGroupPolicy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/BroadcastOptions.html#getDeliveryGroupMatchingKey()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeliveryGroupMatchingKey()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDeliveryGroupMatchingKey", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/BroadcastOptions.html#clearDeferralPolicy()"/>
         /// </summary>
         public void ClearDeferralPolicy()
diff --git a/src/net/Netdroid/Generated/Android/App/DatePickerDialog.cs b/src/net/Netdroid/Generated/Android/App/DatePickerDialog.cs
index 16a84ad05..1ebe8a716 100644
--- a/src/net/Netdroid/Generated/Android/App/DatePickerDialog.cs
+++ b/src/net/Netdroid/Generated/Android/App/DatePickerDialog.cs
@@ -88,11 +88,12 @@ public DatePickerDialog(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/DatePickerDialog.html#getDatePicker()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/DatePickerDialog.html#getDatePicker()"/>
         /// </summary>
-        public Android.Widget.DatePicker DatePicker
+        /// <returns><see cref="Android.Widget.DatePicker"/></returns>
+        public Android.Widget.DatePicker GetDatePicker()
         {
-            get { return IExecuteWithSignature<Android.Widget.DatePicker>("getDatePicker", "()Landroid/widget/DatePicker;"); }
+            return IExecuteWithSignature<Android.Widget.DatePicker>("getDatePicker", "()Landroid/widget/DatePicker;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DatePickerDialog.html#onClick(android.content.DialogInterface,int)"/>
@@ -161,7 +162,7 @@ public partial class OnDateSetListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDateSet", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.DatePicker>>>(OnDateSetEventHandler));
+                AddEventHandler("onDateSet", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.DatePicker>>>(OnDateSetEventHandler));
 
             }
 
@@ -169,7 +170,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/DatePickerDialog.OnDateSetListener.html#onDateSet(android.widget.DatePicker,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDateSet"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.DatePicker, int, int, int> OnOnDateSet { get; set; } = null;
+            public global::System.Action<Android.Widget.DatePicker, int, int, int> OnOnDateSet { get; set; } = null;
 
             void OnDateSetEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.DatePicker>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/Dialog.cs b/src/net/Netdroid/Generated/Android/App/Dialog.cs
index 8c569c396..878ad914e 100644
--- a/src/net/Netdroid/Generated/Android/App/Dialog.cs
+++ b/src/net/Netdroid/Generated/Android/App/Dialog.cs
@@ -67,77 +67,22 @@ public Dialog(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getActionBar()"/> 
-        /// </summary>
-        public Android.App.ActionBar ActionBar
-        {
-            get { return IExecuteWithSignature<Android.App.ActionBar>("getActionBar", "()Landroid/app/ActionBar;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getContext()"/> 
-        /// </summary>
-        public Android.Content.Context Context
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getCurrentFocus()"/> 
-        /// </summary>
-        public Android.View.View CurrentFocus
-        {
-            get { return IExecuteWithSignature<Android.View.View>("getCurrentFocus", "()Landroid/view/View;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getLayoutInflater()"/> 
-        /// </summary>
-        public Android.View.LayoutInflater LayoutInflater
-        {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getOnBackInvokedDispatcher()"/> 
-        /// </summary>
-        public Android.Window.OnBackInvokedDispatcher OnBackInvokedDispatcher
-        {
-            get { return IExecuteWithSignature<Android.Window.OnBackInvokedDispatcher>("getOnBackInvokedDispatcher", "()Landroid/window/OnBackInvokedDispatcher;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getOwnerActivity()"/> <see href="https://developer.android.com/reference/android/app/Dialog.html#setOwnerActivity(android.app.Activity)"/>
-        /// </summary>
-        public Android.App.Activity OwnerActivity
-        {
-            get { return IExecuteWithSignature<Android.App.Activity>("getOwnerActivity", "()Landroid/app/Activity;"); } set { IExecuteWithSignature("setOwnerActivity", "(Landroid/app/Activity;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getSearchEvent()"/> 
-        /// </summary>
-        public Android.View.SearchEvent SearchEvent
-        {
-            get { return IExecuteWithSignature<Android.View.SearchEvent>("getSearchEvent", "()Landroid/view/SearchEvent;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getVolumeControlStream()"/> <see href="https://developer.android.com/reference/android/app/Dialog.html#setVolumeControlStream(int)"/>
-        /// </summary>
-        public int VolumeControlStream
-        {
-            get { return IExecuteWithSignature<int>("getVolumeControlStream", "()I"); } set { IExecuteWithSignature("setVolumeControlStream", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getWindow()"/> 
-        /// </summary>
-        public Android.View.Window Window
-        {
-            get { return IExecuteWithSignature<Android.View.Window>("getWindow", "()Landroid/view/Window;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Dialog.html#findViewById(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T FindViewById<T>(int arg0) where T: Android.View.View
+        public T FindViewById<T>(int arg0) where T : Android.View.View
         {
-            return IExecuteWithSignature<T>("findViewById", "(I)Landroid/view/View;", arg0);
+            return IExecute<T>("findViewById", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getActionBar()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.ActionBar"/></returns>
+        public Android.App.ActionBar GetActionBar()
+        {
+            return IExecuteWithSignature<Android.App.ActionBar>("getActionBar", "()Landroid/app/ActionBar;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Dialog.html#onSaveInstanceState()"/>
@@ -167,6 +112,22 @@ public Android.View.ActionMode OnWindowStartingActionMode(Android.View.ActionMod
             return IExecuteWithSignature<Android.View.ActionMode>("onWindowStartingActionMode", "(Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getLayoutInflater()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
+        public Android.View.LayoutInflater GetLayoutInflater()
+        {
+            return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getCurrentFocus()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetCurrentFocus()
+        {
+            return IExecuteWithSignature<Android.View.View>("getCurrentFocus", "()Landroid/view/View;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Dialog.html#onCreatePanelView(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -176,6 +137,22 @@ public Android.View.View OnCreatePanelView(int arg0)
             return IExecuteWithSignature<Android.View.View>("onCreatePanelView", "(I)Landroid/view/View;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getWindow()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Window"/></returns>
+        public Android.View.Window GetWindow()
+        {
+            return IExecuteWithSignature<Android.View.Window>("getWindow", "()Landroid/view/Window;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getOnBackInvokedDispatcher()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Window.OnBackInvokedDispatcher"/></returns>
+        public Android.Window.OnBackInvokedDispatcher GetOnBackInvokedDispatcher()
+        {
+            return IExecuteWithSignature<Android.Window.OnBackInvokedDispatcher>("getOnBackInvokedDispatcher", "()Landroid/window/OnBackInvokedDispatcher;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Dialog.html#dispatchGenericMotionEvent(android.view.MotionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
@@ -415,9 +392,33 @@ public bool OnTrackballEvent(Android.View.MotionEvent arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T RequireViewById<T>(int arg0) where T: Android.View.View
+        public T RequireViewById<T>(int arg0) where T : Android.View.View
         {
-            return IExecuteWithSignature<T>("requireViewById", "(I)Landroid/view/View;", arg0);
+            return IExecute<T>("requireViewById", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getOwnerActivity()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.Activity"/></returns>
+        public Android.App.Activity GetOwnerActivity()
+        {
+            return IExecuteWithSignature<Android.App.Activity>("getOwnerActivity", "()Landroid/app/Activity;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getSearchEvent()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.SearchEvent"/></returns>
+        public Android.View.SearchEvent GetSearchEvent()
+        {
+            return IExecuteWithSignature<Android.View.SearchEvent>("getSearchEvent", "()Landroid/view/SearchEvent;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Dialog.html#requestWindowFeature(int)"/>
@@ -429,6 +430,14 @@ public bool RequestWindowFeature(int arg0)
             return IExecuteWithSignature<bool>("requestWindowFeature", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#getVolumeControlStream()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVolumeControlStream()
+        {
+            return IExecuteWithSignature<int>("getVolumeControlStream", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Dialog.html#setFeatureDrawable(int,android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -465,6 +474,22 @@ public void SetFeatureDrawableUri(int arg0, Android.Net.Uri arg1)
             IExecute("setFeatureDrawableUri", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#setOwnerActivity(android.app.Activity)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.Activity"/></param>
+        public void SetOwnerActivity(Android.App.Activity arg0)
+        {
+            IExecuteWithSignature("setOwnerActivity", "(Landroid/app/Activity;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Dialog.html#setVolumeControlStream(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVolumeControlStream(int arg0)
+        {
+            IExecuteWithSignature("setVolumeControlStream", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Dialog.html#addContentView(android.view.View,android.view.ViewGroup.LayoutParams)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -541,7 +566,7 @@ public void OnAttachedToWindow()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Dialog.html#onBackPressed()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnBackPressed()
         {
             IExecuteWithSignature("onBackPressed", "()V");
diff --git a/src/net/Netdroid/Generated/Android/App/DialogFragment.cs b/src/net/Netdroid/Generated/Android/App/DialogFragment.cs
index 2bc2fd273..74ffe4160 100644
--- a/src/net/Netdroid/Generated/Android/App/DialogFragment.cs
+++ b/src/net/Netdroid/Generated/Android/App/DialogFragment.cs
@@ -40,28 +40,28 @@ public partial class DialogFragment
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#STYLE_NO_FRAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STYLE_NO_FRAME { get { if (!_STYLE_NO_FRAMEReady) { _STYLE_NO_FRAMEContent = SGetField<int>(LocalBridgeClazz, "STYLE_NO_FRAME"); _STYLE_NO_FRAMEReady = true; } return _STYLE_NO_FRAMEContent; } }
         private static int _STYLE_NO_FRAMEContent = default;
         private static bool _STYLE_NO_FRAMEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#STYLE_NO_INPUT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STYLE_NO_INPUT { get { if (!_STYLE_NO_INPUTReady) { _STYLE_NO_INPUTContent = SGetField<int>(LocalBridgeClazz, "STYLE_NO_INPUT"); _STYLE_NO_INPUTReady = true; } return _STYLE_NO_INPUTContent; } }
         private static int _STYLE_NO_INPUTContent = default;
         private static bool _STYLE_NO_INPUTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#STYLE_NO_TITLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STYLE_NO_TITLE { get { if (!_STYLE_NO_TITLEReady) { _STYLE_NO_TITLEContent = SGetField<int>(LocalBridgeClazz, "STYLE_NO_TITLE"); _STYLE_NO_TITLEReady = true; } return _STYLE_NO_TITLEContent; } }
         private static int _STYLE_NO_TITLEContent = default;
         private static bool _STYLE_NO_TITLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#STYLE_NORMAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STYLE_NORMAL { get { if (!_STYLE_NORMALReady) { _STYLE_NORMALContent = SGetField<int>(LocalBridgeClazz, "STYLE_NORMAL"); _STYLE_NORMALReady = true; } return _STYLE_NORMALContent; } }
         private static int _STYLE_NORMALContent = default;
         private static bool _STYLE_NORMALReady = false; // this is used because in case of generics 
@@ -74,55 +74,58 @@ public partial class DialogFragment
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#getDialog()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#getDialog()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.Dialog Dialog
-        {
-            get { return IExecuteWithSignature<Android.App.Dialog>("getDialog", "()Landroid/app/Dialog;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#getShowsDialog()"/> <see href="https://developer.android.com/reference/android/app/DialogFragment.html#setShowsDialog(boolean)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public bool ShowsDialog
-        {
-            get { return IExecuteWithSignature<bool>("getShowsDialog", "()Z"); } set { IExecuteWithSignature("setShowsDialog", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#getTheme()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Theme
+        /// <returns><see cref="Android.App.Dialog"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Dialog GetDialog()
         {
-            get { return IExecuteWithSignature<int>("getTheme", "()I"); }
+            return IExecuteWithSignature<Android.App.Dialog>("getDialog", "()Landroid/app/Dialog;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#onCreateDialog(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
         /// <returns><see cref="Android.App.Dialog"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.Dialog OnCreateDialog(Android.Os.Bundle arg0)
         {
             return IExecuteWithSignature<Android.App.Dialog>("onCreateDialog", "(Landroid/os/Bundle;)Landroid/app/Dialog;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#getShowsDialog()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetShowsDialog()
+        {
+            return IExecuteWithSignature<bool>("getShowsDialog", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#isCancelable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsCancelable()
         {
             return IExecuteWithSignature<bool>("isCancelable", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#getTheme()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetTheme()
+        {
+            return IExecuteWithSignature<int>("getTheme", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#show(android.app.FragmentTransaction,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.FragmentTransaction"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int Show(Android.App.FragmentTransaction arg0, Java.Lang.String arg1)
         {
             return IExecute<int>("show", arg0, arg1);
@@ -130,7 +133,7 @@ public int Show(Android.App.FragmentTransaction arg0, Java.Lang.String arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#dismiss()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Dismiss()
         {
             IExecuteWithSignature("dismiss", "()V");
@@ -138,7 +141,7 @@ public void Dismiss()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#dismissAllowingStateLoss()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DismissAllowingStateLoss()
         {
             IExecuteWithSignature("dismissAllowingStateLoss", "()V");
@@ -147,7 +150,7 @@ public void DismissAllowingStateLoss()
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#onCancel(android.content.DialogInterface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.DialogInterface"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCancel(Android.Content.DialogInterface arg0)
         {
             IExecuteWithSignature("onCancel", "(Landroid/content/DialogInterface;)V", arg0);
@@ -156,7 +159,7 @@ public void OnCancel(Android.Content.DialogInterface arg0)
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#onDismiss(android.content.DialogInterface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.DialogInterface"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDismiss(Android.Content.DialogInterface arg0)
         {
             IExecuteWithSignature("onDismiss", "(Landroid/content/DialogInterface;)V", arg0);
@@ -165,17 +168,26 @@ public void OnDismiss(Android.Content.DialogInterface arg0)
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#setCancelable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCancelable(bool arg0)
         {
             IExecuteWithSignature("setCancelable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#setShowsDialog(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetShowsDialog(bool arg0)
+        {
+            IExecuteWithSignature("setShowsDialog", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DialogFragment.html#setStyle(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetStyle(int arg0, int arg1)
         {
             IExecute("setStyle", arg0, arg1);
@@ -185,7 +197,7 @@ public void SetStyle(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Show(Android.App.FragmentManager arg0, Java.Lang.String arg1)
         {
             IExecute("show", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/App/DirectAction.cs b/src/net/Netdroid/Generated/Android/App/DirectAction.cs
index a63f1f5cb..1ef2cc143 100644
--- a/src/net/Netdroid/Generated/Android/App/DirectAction.cs
+++ b/src/net/Netdroid/Generated/Android/App/DirectAction.cs
@@ -52,25 +52,20 @@ public partial class DirectAction
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/DirectAction.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/DirectAction.html#getLocusId()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Content.LocusId"/></returns>
+        public Android.Content.LocusId GetLocusId()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/DirectAction.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/DirectAction.html#getExtras()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/DirectAction.html#getLocusId()"/> 
-        /// </summary>
-        public Android.Content.LocusId LocusId
-        {
-            get { return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DirectAction.html#describeContents()"/>
@@ -81,6 +76,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/DirectAction.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DirectAction.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/DownloadManager.cs b/src/net/Netdroid/Generated/Android/App/DownloadManager.cs
index 63cab10f5..91407ab5c 100644
--- a/src/net/Netdroid/Generated/Android/App/DownloadManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/DownloadManager.cs
@@ -190,7 +190,7 @@ public partial class DownloadManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/DownloadManager.html#COLUMN_LOCAL_FILENAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String COLUMN_LOCAL_FILENAME { get { if (!_COLUMN_LOCAL_FILENAMEReady) { _COLUMN_LOCAL_FILENAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "COLUMN_LOCAL_FILENAME"); _COLUMN_LOCAL_FILENAMEReady = true; } return _COLUMN_LOCAL_FILENAMEContent; } }
         private static Java.Lang.String _COLUMN_LOCAL_FILENAMEContent = default;
         private static bool _COLUMN_LOCAL_FILENAMEReady = false; // this is used because in case of generics 
@@ -345,7 +345,7 @@ public Java.Lang.String GetMimeTypeForDownloadedFile(long arg0)
         /// <param name="arg7"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg8"><see cref="Android.Net.Uri"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long AddCompletedDownload(Java.Lang.String arg0, Java.Lang.String arg1, bool arg2, Java.Lang.String arg3, Java.Lang.String arg4, long arg5, bool arg6, Android.Net.Uri arg7, Android.Net.Uri arg8)
         {
             return IExecute<long>("addCompletedDownload", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -361,7 +361,7 @@ public long AddCompletedDownload(Java.Lang.String arg0, Java.Lang.String arg1, b
         /// <param name="arg5"><see cref="long"/></param>
         /// <param name="arg6"><see cref="bool"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long AddCompletedDownload(Java.Lang.String arg0, Java.Lang.String arg1, bool arg2, Java.Lang.String arg3, Java.Lang.String arg4, long arg5, bool arg6)
         {
             return IExecute<long>("addCompletedDownload", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -609,7 +609,7 @@ public Android.App.DownloadManager.Request SetRequiresDeviceIdle(bool arg0)
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.App.DownloadManager.Request"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.DownloadManager.Request SetShowRunningNotification(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.DownloadManager.Request>("setShowRunningNotification", "(Z)Landroid/app/DownloadManager$Request;", arg0);
@@ -628,7 +628,7 @@ public Android.App.DownloadManager.Request SetTitle(Java.Lang.CharSequence arg0)
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.App.DownloadManager.Request"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.DownloadManager.Request SetVisibleInDownloadsUi(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.DownloadManager.Request>("setVisibleInDownloadsUi", "(Z)Landroid/app/DownloadManager$Request;", arg0);
@@ -636,7 +636,7 @@ public Android.App.DownloadManager.Request SetVisibleInDownloadsUi(bool arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/DownloadManager.Request.html#allowScanningByMediaScanner()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void AllowScanningByMediaScanner()
             {
                 IExecuteWithSignature("allowScanningByMediaScanner", "()V");
diff --git a/src/net/Netdroid/Generated/Android/App/ExpandableListActivity.cs b/src/net/Netdroid/Generated/Android/App/ExpandableListActivity.cs
index a3f5ce094..0ab8025f9 100644
--- a/src/net/Netdroid/Generated/Android/App/ExpandableListActivity.cs
+++ b/src/net/Netdroid/Generated/Android/App/ExpandableListActivity.cs
@@ -46,36 +46,31 @@ public partial class ExpandableListActivity
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getExpandableListAdapter()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getExpandableListAdapter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.ExpandableListAdapter ExpandableListAdapter
+        /// <returns><see cref="Android.Widget.ExpandableListAdapter"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ExpandableListAdapter GetExpandableListAdapter()
         {
-            get { return IExecuteWithSignature<Android.Widget.ExpandableListAdapter>("getExpandableListAdapter", "()Landroid/widget/ExpandableListAdapter;"); }
+            return IExecuteWithSignature<Android.Widget.ExpandableListAdapter>("getExpandableListAdapter", "()Landroid/widget/ExpandableListAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getExpandableListView()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getExpandableListAdapter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.ExpandableListView ExpandableListView
+        /// <returns><see cref="Android.Widget.ExpandableListAdapter"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ExpandableListAdapter GetExpandableListAdapterDirect()
         {
-            get { return IExecuteWithSignature<Android.Widget.ExpandableListView>("getExpandableListView", "()Landroid/widget/ExpandableListView;"); }
+            return IExecuteWithSignature<Android.Widget.ExpandableListAdapterDirect, Android.Widget.ExpandableListAdapter>("getExpandableListAdapter", "()Landroid/widget/ExpandableListAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getSelectedId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getExpandableListView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long SelectedId
+        /// <returns><see cref="Android.Widget.ExpandableListView"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ExpandableListView GetExpandableListView()
         {
-            get { return IExecuteWithSignature<long>("getSelectedId", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getSelectedPosition()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public long SelectedPosition
-        {
-            get { return IExecuteWithSignature<long>("getSelectedPosition", "()J"); }
+            return IExecuteWithSignature<Android.Widget.ExpandableListView>("getExpandableListView", "()Landroid/widget/ExpandableListView;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#onChildClick(android.widget.ExpandableListView,android.view.View,int,int,long)"/>
@@ -86,7 +81,7 @@ public long SelectedPosition
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnChildClick(Android.Widget.ExpandableListView arg0, Android.View.View arg1, int arg2, int arg3, long arg4)
         {
             return IExecute<bool>("onChildClick", arg0, arg1, arg2, arg3, arg4);
@@ -98,16 +93,34 @@ public bool OnChildClick(Android.Widget.ExpandableListView arg0, Android.View.Vi
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetSelectedChild(int arg0, int arg1, bool arg2)
         {
             return IExecute<bool>("setSelectedChild", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getSelectedId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetSelectedId()
+        {
+            return IExecuteWithSignature<long>("getSelectedId", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#getSelectedPosition()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetSelectedPosition()
+        {
+            return IExecuteWithSignature<long>("getSelectedPosition", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#onGroupCollapse(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnGroupCollapse(int arg0)
         {
             IExecuteWithSignature("onGroupCollapse", "(I)V", arg0);
@@ -116,7 +129,7 @@ public void OnGroupCollapse(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#onGroupExpand(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnGroupExpand(int arg0)
         {
             IExecuteWithSignature("onGroupExpand", "(I)V", arg0);
@@ -125,7 +138,7 @@ public void OnGroupExpand(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#setListAdapter(android.widget.ExpandableListAdapter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.ExpandableListAdapter"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetListAdapter(Android.Widget.ExpandableListAdapter arg0)
         {
             IExecuteWithSignature("setListAdapter", "(Landroid/widget/ExpandableListAdapter;)V", arg0);
@@ -134,7 +147,7 @@ public void SetListAdapter(Android.Widget.ExpandableListAdapter arg0)
         /// <see href="https://developer.android.com/reference/android/app/ExpandableListActivity.html#setSelectedGroup(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSelectedGroup(int arg0)
         {
             IExecuteWithSignature("setSelectedGroup", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/Fragment.cs b/src/net/Netdroid/Generated/Android/App/Fragment.cs
index 15335a349..d63564a79 100644
--- a/src/net/Netdroid/Generated/Android/App/Fragment.cs
+++ b/src/net/Netdroid/Generated/Android/App/Fragment.cs
@@ -52,7 +52,7 @@ public partial class Fragment : Android.Content.IComponentCallbacks2
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
         /// <returns><see cref="Android.App.Fragment"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.App.Fragment Instantiate(Android.Content.Context arg0, Java.Lang.String arg1, Android.Os.Bundle arg2)
         {
             return SExecute<Android.App.Fragment>(LocalBridgeClazz, "instantiate", arg0, arg1, arg2);
@@ -63,7 +63,7 @@ public static Android.App.Fragment Instantiate(Android.Content.Context arg0, Jav
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.Fragment"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.App.Fragment Instantiate(Android.Content.Context arg0, Java.Lang.String arg1)
         {
             return SExecute<Android.App.Fragment>(LocalBridgeClazz, "instantiate", arg0, arg1);
@@ -73,274 +73,263 @@ public static Android.App.Fragment Instantiate(Android.Content.Context arg0, Jav
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getActivity()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.App.Activity Activity
-        {
-            get { return IExecuteWithSignature<Android.App.Activity>("getActivity", "()Landroid/app/Activity;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getAllowEnterTransitionOverlap()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setAllowEnterTransitionOverlap(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onCreateAnimator(int,boolean,int)"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool AllowEnterTransitionOverlap
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <returns><see cref="Android.Animation.Animator"/></returns>
+        [global::System.Obsolete()]
+        public Android.Animation.Animator OnCreateAnimator(int arg0, bool arg1, int arg2)
         {
-            get { return IExecuteWithSignature<bool>("getAllowEnterTransitionOverlap", "()Z"); } set { IExecuteWithSignature("setAllowEnterTransitionOverlap", "(Z)V", value); }
+            return IExecute<Android.Animation.Animator>("onCreateAnimator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getAllowReturnTransitionOverlap()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setAllowReturnTransitionOverlap(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getLoaderManager()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool AllowReturnTransitionOverlap
+        /// <returns><see cref="Android.App.LoaderManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.LoaderManager GetLoaderManager()
         {
-            get { return IExecuteWithSignature<bool>("getAllowReturnTransitionOverlap", "()Z"); } set { IExecuteWithSignature("setAllowReturnTransitionOverlap", "(Z)V", value); }
+            return IExecuteWithSignature<Android.App.LoaderManager>("getLoaderManager", "()Landroid/app/LoaderManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getArguments()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setArguments(android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getContext()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Os.Bundle Arguments
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Context GetContext()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getArguments", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setArguments", "(Landroid/os/Bundle;)V", value); }
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getChildFragmentManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getEnterTransition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.FragmentManager ChildFragmentManager
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        [global::System.Obsolete()]
+        public Android.Transition.Transition GetEnterTransition()
         {
-            get { return IExecuteWithSignature<Android.App.FragmentManager>("getChildFragmentManager", "()Landroid/app/FragmentManager;"); }
+            return IExecuteWithSignature<Android.Transition.Transition>("getEnterTransition", "()Landroid/transition/Transition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getExitTransition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Context Context
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        [global::System.Obsolete()]
+        public Android.Transition.Transition GetExitTransition()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<Android.Transition.Transition>("getExitTransition", "()Landroid/transition/Transition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getEnterTransition()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setEnterTransition(android.transition.Transition)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getReenterTransition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Transition.Transition EnterTransition
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        [global::System.Obsolete()]
+        public Android.Transition.Transition GetReenterTransition()
         {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getEnterTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setEnterTransition", "(Landroid/transition/Transition;)V", value); }
+            return IExecuteWithSignature<Android.Transition.Transition>("getReenterTransition", "()Landroid/transition/Transition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getExitTransition()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setExitTransition(android.transition.Transition)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getReturnTransition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Transition.Transition ExitTransition
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        [global::System.Obsolete()]
+        public Android.Transition.Transition GetReturnTransition()
         {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getExitTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setExitTransition", "(Landroid/transition/Transition;)V", value); }
+            return IExecuteWithSignature<Android.Transition.Transition>("getReturnTransition", "()Landroid/transition/Transition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getFragmentManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getSharedElementEnterTransition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.FragmentManager FragmentManager
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        [global::System.Obsolete()]
+        public Android.Transition.Transition GetSharedElementEnterTransition()
         {
-            get { return IExecuteWithSignature<Android.App.FragmentManager>("getFragmentManager", "()Landroid/app/FragmentManager;"); }
+            return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementEnterTransition", "()Landroid/transition/Transition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getHost()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getSharedElementReturnTransition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public object Host
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        [global::System.Obsolete()]
+        public Android.Transition.Transition GetSharedElementReturnTransition()
         {
-            get { return IExecuteWithSignature("getHost", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementReturnTransition", "()Landroid/transition/Transition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onGetLayoutInflater(android.os.Bundle)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Id
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.LayoutInflater OnGetLayoutInflater(Android.Os.Bundle arg0)
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.View.LayoutInflater>("onGetLayoutInflater", "(Landroid/os/Bundle;)Landroid/view/LayoutInflater;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getLayoutInflater()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.LayoutInflater LayoutInflater
+        /// <returns><see cref="Android.View.View"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View GetView()
         {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;"); }
+            return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getLoaderManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onCreateView(android.view.LayoutInflater,android.view.ViewGroup,android.os.Bundle)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.LoaderManager LoaderManager
+        /// <param name="arg0"><see cref="Android.View.LayoutInflater"/></param>
+        /// <param name="arg1"><see cref="Android.View.ViewGroup"/></param>
+        /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
+        /// <returns><see cref="Android.View.View"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View OnCreateView(Android.View.LayoutInflater arg0, Android.View.ViewGroup arg1, Android.Os.Bundle arg2)
         {
-            get { return IExecuteWithSignature<Android.App.LoaderManager>("getLoaderManager", "()Landroid/app/LoaderManager;"); }
+            return IExecute<Android.View.View>("onCreateView", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getParentFragment()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getAllowEnterTransitionOverlap()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.Fragment ParentFragment
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetAllowEnterTransitionOverlap()
         {
-            get { return IExecuteWithSignature<Android.App.Fragment>("getParentFragment", "()Landroid/app/Fragment;"); }
+            return IExecuteWithSignature<bool>("getAllowEnterTransitionOverlap", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getReenterTransition()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setReenterTransition(android.transition.Transition)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getAllowReturnTransitionOverlap()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Transition.Transition ReenterTransition
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetAllowReturnTransitionOverlap()
         {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getReenterTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setReenterTransition", "(Landroid/transition/Transition;)V", value); }
+            return IExecuteWithSignature<bool>("getAllowReturnTransitionOverlap", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getResources()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getUserVisibleHint()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Res.Resources Resources
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetUserVisibleHint()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;"); }
+            return IExecuteWithSignature<bool>("getUserVisibleHint", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getRetainInstance()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setRetainInstance(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onContextItemSelected(android.view.MenuItem)"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool RetainInstance
+        /// <param name="arg0"><see cref="Android.View.MenuItem"/></param>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool OnContextItemSelected(Android.View.MenuItem arg0)
         {
-            get { return IExecuteWithSignature<bool>("getRetainInstance", "()Z"); } set { IExecuteWithSignature("setRetainInstance", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("onContextItemSelected", "(Landroid/view/MenuItem;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getReturnTransition()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setReturnTransition(android.transition.Transition)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onOptionsItemSelected(android.view.MenuItem)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Transition.Transition ReturnTransition
+        /// <param name="arg0"><see cref="Android.View.MenuItem"/></param>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool OnOptionsItemSelected(Android.View.MenuItem arg0)
         {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getReturnTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setReturnTransition", "(Landroid/transition/Transition;)V", value); }
+            return IExecuteWithSignature<bool>("onOptionsItemSelected", "(Landroid/view/MenuItem;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getSharedElementEnterTransition()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setSharedElementEnterTransition(android.transition.Transition)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#shouldShowRequestPermissionRationale(java.lang.String)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Transition.Transition SharedElementEnterTransition
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool ShouldShowRequestPermissionRationale(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementEnterTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setSharedElementEnterTransition", "(Landroid/transition/Transition;)V", value); }
+            return IExecuteWithSignature<bool>("shouldShowRequestPermissionRationale", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getSharedElementReturnTransition()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setSharedElementReturnTransition(android.transition.Transition)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getActivity()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Transition.Transition SharedElementReturnTransition
+        /// <returns><see cref="Android.App.Activity"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Activity GetActivity()
         {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementReturnTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setSharedElementReturnTransition", "(Landroid/transition/Transition;)V", value); }
+            return IExecuteWithSignature<Android.App.Activity>("getActivity", "()Landroid/app/Activity;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getParentFragment()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Tag
+        /// <returns><see cref="Android.App.Fragment"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Fragment GetParentFragment()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.App.Fragment>("getParentFragment", "()Landroid/app/Fragment;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getTargetFragment()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getTargetFragment()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.Fragment TargetFragment
+        /// <returns><see cref="Android.App.Fragment"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Fragment GetTargetFragment()
         {
-            get { return IExecuteWithSignature<Android.App.Fragment>("getTargetFragment", "()Landroid/app/Fragment;"); }
+            return IExecuteWithSignature<Android.App.Fragment>("getTargetFragment", "()Landroid/app/Fragment;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getTargetRequestCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getChildFragmentManager()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int TargetRequestCode
+        /// <returns><see cref="Android.App.FragmentManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.FragmentManager GetChildFragmentManager()
         {
-            get { return IExecuteWithSignature<int>("getTargetRequestCode", "()I"); }
+            return IExecuteWithSignature<Android.App.FragmentManager>("getChildFragmentManager", "()Landroid/app/FragmentManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getUserVisibleHint()"/> <see href="https://developer.android.com/reference/android/app/Fragment.html#setUserVisibleHint(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getFragmentManager()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool UserVisibleHint
+        /// <returns><see cref="Android.App.FragmentManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.FragmentManager GetFragmentManager()
         {
-            get { return IExecuteWithSignature<bool>("getUserVisibleHint", "()Z"); } set { IExecuteWithSignature("setUserVisibleHint", "(Z)V", value); }
+            return IExecuteWithSignature<Android.App.FragmentManager>("getFragmentManager", "()Landroid/app/FragmentManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getView()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getResources()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.View View
+        /// <returns><see cref="Android.Content.Res.Resources"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Res.Resources GetResources()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onCreateAnimator(int,boolean,int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getArguments()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Android.Animation.Animator"/></returns>
-        [System.Obsolete()]
-        public Android.Animation.Animator OnCreateAnimator(int arg0, bool arg1, int arg2)
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.Bundle GetArguments()
         {
-            return IExecute<Android.Animation.Animator>("onCreateAnimator", arg0, arg1, arg2);
+            return IExecuteWithSignature<Android.Os.Bundle>("getArguments", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onGetLayoutInflater(android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getLayoutInflater()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
         /// <returns><see cref="Android.View.LayoutInflater"/></returns>
-        [System.Obsolete()]
-        public Android.View.LayoutInflater OnGetLayoutInflater(Android.Os.Bundle arg0)
-        {
-            return IExecuteWithSignature<Android.View.LayoutInflater>("onGetLayoutInflater", "(Landroid/os/Bundle;)Landroid/view/LayoutInflater;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onCreateView(android.view.LayoutInflater,android.view.ViewGroup,android.os.Bundle)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.LayoutInflater"/></param>
-        /// <param name="arg1"><see cref="Android.View.ViewGroup"/></param>
-        /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        [System.Obsolete()]
-        public Android.View.View OnCreateView(Android.View.LayoutInflater arg0, Android.View.ViewGroup arg1, Android.Os.Bundle arg2)
-        {
-            return IExecute<Android.View.View>("onCreateView", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onContextItemSelected(android.view.MenuItem)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MenuItem"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool OnContextItemSelected(Android.View.MenuItem arg0)
-        {
-            return IExecuteWithSignature<bool>("onContextItemSelected", "(Landroid/view/MenuItem;)Z", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onOptionsItemSelected(android.view.MenuItem)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MenuItem"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool OnOptionsItemSelected(Android.View.MenuItem arg0)
+        [global::System.Obsolete()]
+        public Android.View.LayoutInflater GetLayoutInflater()
         {
-            return IExecuteWithSignature<bool>("onOptionsItemSelected", "(Landroid/view/MenuItem;)Z", arg0);
+            return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#shouldShowRequestPermissionRationale(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getRetainInstance()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool ShouldShowRequestPermissionRationale(Java.Lang.String arg0)
+        [global::System.Obsolete()]
+        public bool GetRetainInstance()
         {
-            return IExecuteWithSignature<bool>("shouldShowRequestPermissionRationale", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<bool>("getRetainInstance", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#isAdded()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAdded()
         {
             return IExecuteWithSignature<bool>("isAdded", "()Z");
@@ -349,7 +338,7 @@ public bool IsAdded()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#isDetached()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsDetached()
         {
             return IExecuteWithSignature<bool>("isDetached", "()Z");
@@ -358,7 +347,7 @@ public bool IsDetached()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#isHidden()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsHidden()
         {
             return IExecuteWithSignature<bool>("isHidden", "()Z");
@@ -367,7 +356,7 @@ public bool IsHidden()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#isInLayout()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsInLayout()
         {
             return IExecuteWithSignature<bool>("isInLayout", "()Z");
@@ -376,7 +365,7 @@ public bool IsInLayout()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#isRemoving()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsRemoving()
         {
             return IExecuteWithSignature<bool>("isRemoving", "()Z");
@@ -385,7 +374,7 @@ public bool IsRemoving()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#isResumed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsResumed()
         {
             return IExecuteWithSignature<bool>("isResumed", "()Z");
@@ -394,7 +383,7 @@ public bool IsResumed()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#isStateSaved()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsStateSaved()
         {
             return IExecuteWithSignature<bool>("isStateSaved", "()Z");
@@ -403,28 +392,55 @@ public bool IsStateSaved()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#isVisible()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsVisible()
         {
             return IExecuteWithSignature<bool>("isVisible", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetId()
+        {
+            return IExecuteWithSignature<int>("getId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getTargetRequestCode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetTargetRequestCode()
+        {
+            return IExecuteWithSignature<int>("getTargetRequestCode", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getText(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.CharSequence GetText(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "(I)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getHost()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        [global::System.Obsolete()]
+        public object GetHost()
+        {
+            return IExecuteWithSignature("getHost", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getString(int,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetString(int arg0, params object[] arg1)
         {
             if (arg1.Length == 0) return IExecute<Java.Lang.String>("getString", arg0); else return IExecute<Java.Lang.String>("getString", arg0, arg1);
@@ -434,17 +450,26 @@ public Java.Lang.String GetString(int arg0, params object[] arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetString(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#getTag()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetTag()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#requestPermissions(java.lang.String[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestPermissions(Java.Lang.String[] arg0, int arg1)
         {
             IExecute("requestPermissions", arg0, arg1);
@@ -456,7 +481,7 @@ public void RequestPermissions(Java.Lang.String[] arg0, int arg1)
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg2"><see cref="Java.Io.PrintWriter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.PrintWriter arg2, Java.Lang.String[] arg3)
         {
             IExecute("dump", arg0, arg1, arg2, arg3);
@@ -465,7 +490,7 @@ public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.Pri
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onActivityCreated(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnActivityCreated(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("onActivityCreated", "(Landroid/os/Bundle;)V", arg0);
@@ -476,7 +501,7 @@ public void OnActivityCreated(Android.Os.Bundle arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnActivityResult(int arg0, int arg1, Android.Content.Intent arg2)
         {
             IExecute("onActivityResult", arg0, arg1, arg2);
@@ -485,7 +510,7 @@ public void OnActivityResult(int arg0, int arg1, Android.Content.Intent arg2)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onAttach(android.app.Activity)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnAttach(Android.App.Activity arg0)
         {
             IExecuteWithSignature("onAttach", "(Landroid/app/Activity;)V", arg0);
@@ -494,7 +519,7 @@ public void OnAttach(Android.App.Activity arg0)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onAttach(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnAttach(Android.Content.Context arg0)
         {
             IExecuteWithSignature("onAttach", "(Landroid/content/Context;)V", arg0);
@@ -503,7 +528,7 @@ public void OnAttach(Android.Content.Context arg0)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onAttachFragment(android.app.Fragment)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnAttachFragment(Android.App.Fragment arg0)
         {
             IExecuteWithSignature("onAttachFragment", "(Landroid/app/Fragment;)V", arg0);
@@ -512,7 +537,7 @@ public void OnAttachFragment(Android.App.Fragment arg0)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onConfigurationChanged(android.content.res.Configuration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.Configuration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnConfigurationChanged(Android.Content.Res.Configuration arg0)
         {
             IExecuteWithSignature("onConfigurationChanged", "(Landroid/content/res/Configuration;)V", arg0);
@@ -521,7 +546,7 @@ public void OnConfigurationChanged(Android.Content.Res.Configuration arg0)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onCreate(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCreate(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("onCreate", "(Landroid/os/Bundle;)V", arg0);
@@ -532,7 +557,7 @@ public void OnCreate(Android.Os.Bundle arg0)
         /// <param name="arg0"><see cref="Android.View.ContextMenu"/></param>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
         /// <param name="arg2"><see cref="Android.View.ContextMenu.ContextMenuInfo"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCreateContextMenu(Android.View.ContextMenu arg0, Android.View.View arg1, Android.View.ContextMenu.ContextMenuInfo arg2)
         {
             IExecute("onCreateContextMenu", arg0, arg1, arg2);
@@ -542,7 +567,7 @@ public void OnCreateContextMenu(Android.View.ContextMenu arg0, Android.View.View
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Menu"/></param>
         /// <param name="arg1"><see cref="Android.View.MenuInflater"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCreateOptionsMenu(Android.View.Menu arg0, Android.View.MenuInflater arg1)
         {
             IExecute("onCreateOptionsMenu", arg0, arg1);
@@ -550,7 +575,7 @@ public void OnCreateOptionsMenu(Android.View.Menu arg0, Android.View.MenuInflate
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onDestroy()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDestroy()
         {
             IExecuteWithSignature("onDestroy", "()V");
@@ -558,7 +583,7 @@ public void OnDestroy()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onDestroyOptionsMenu()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDestroyOptionsMenu()
         {
             IExecuteWithSignature("onDestroyOptionsMenu", "()V");
@@ -566,7 +591,7 @@ public void OnDestroyOptionsMenu()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onDestroyView()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDestroyView()
         {
             IExecuteWithSignature("onDestroyView", "()V");
@@ -574,7 +599,7 @@ public void OnDestroyView()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onDetach()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDetach()
         {
             IExecuteWithSignature("onDetach", "()V");
@@ -583,7 +608,7 @@ public void OnDetach()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onHiddenChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnHiddenChanged(bool arg0)
         {
             IExecuteWithSignature("onHiddenChanged", "(Z)V", arg0);
@@ -594,7 +619,7 @@ public void OnHiddenChanged(bool arg0)
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnInflate(Android.App.Activity arg0, Android.Util.AttributeSet arg1, Android.Os.Bundle arg2)
         {
             IExecute("onInflate", arg0, arg1, arg2);
@@ -605,7 +630,7 @@ public void OnInflate(Android.App.Activity arg0, Android.Util.AttributeSet arg1,
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnInflate(Android.Content.Context arg0, Android.Util.AttributeSet arg1, Android.Os.Bundle arg2)
         {
             IExecute("onInflate", arg0, arg1, arg2);
@@ -615,7 +640,7 @@ public void OnInflate(Android.Content.Context arg0, Android.Util.AttributeSet ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnInflate(Android.Util.AttributeSet arg0, Android.Os.Bundle arg1)
         {
             IExecute("onInflate", arg0, arg1);
@@ -623,7 +648,7 @@ public void OnInflate(Android.Util.AttributeSet arg0, Android.Os.Bundle arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onLowMemory()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnLowMemory()
         {
             IExecuteWithSignature("onLowMemory", "()V");
@@ -633,7 +658,7 @@ public void OnLowMemory()
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.Content.Res.Configuration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnMultiWindowModeChanged(bool arg0, Android.Content.Res.Configuration arg1)
         {
             IExecute("onMultiWindowModeChanged", arg0, arg1);
@@ -642,7 +667,7 @@ public void OnMultiWindowModeChanged(bool arg0, Android.Content.Res.Configuratio
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onMultiWindowModeChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnMultiWindowModeChanged(bool arg0)
         {
             IExecuteWithSignature("onMultiWindowModeChanged", "(Z)V", arg0);
@@ -651,7 +676,7 @@ public void OnMultiWindowModeChanged(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onOptionsMenuClosed(android.view.Menu)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Menu"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnOptionsMenuClosed(Android.View.Menu arg0)
         {
             IExecuteWithSignature("onOptionsMenuClosed", "(Landroid/view/Menu;)V", arg0);
@@ -659,7 +684,7 @@ public void OnOptionsMenuClosed(Android.View.Menu arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onPause()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPause()
         {
             IExecuteWithSignature("onPause", "()V");
@@ -669,7 +694,7 @@ public void OnPause()
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.Content.Res.Configuration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPictureInPictureModeChanged(bool arg0, Android.Content.Res.Configuration arg1)
         {
             IExecute("onPictureInPictureModeChanged", arg0, arg1);
@@ -678,7 +703,7 @@ public void OnPictureInPictureModeChanged(bool arg0, Android.Content.Res.Configu
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onPictureInPictureModeChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPictureInPictureModeChanged(bool arg0)
         {
             IExecuteWithSignature("onPictureInPictureModeChanged", "(Z)V", arg0);
@@ -687,7 +712,7 @@ public void OnPictureInPictureModeChanged(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onPrepareOptionsMenu(android.view.Menu)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Menu"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnPrepareOptionsMenu(Android.View.Menu arg0)
         {
             IExecuteWithSignature("onPrepareOptionsMenu", "(Landroid/view/Menu;)V", arg0);
@@ -698,7 +723,7 @@ public void OnPrepareOptionsMenu(Android.View.Menu arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnRequestPermissionsResult(int arg0, Java.Lang.String[] arg1, int[] arg2)
         {
             IExecute("onRequestPermissionsResult", arg0, arg1, arg2);
@@ -706,7 +731,7 @@ public void OnRequestPermissionsResult(int arg0, Java.Lang.String[] arg1, int[]
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onResume()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnResume()
         {
             IExecuteWithSignature("onResume", "()V");
@@ -715,7 +740,7 @@ public void OnResume()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onSaveInstanceState(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnSaveInstanceState(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("onSaveInstanceState", "(Landroid/os/Bundle;)V", arg0);
@@ -723,7 +748,7 @@ public void OnSaveInstanceState(Android.Os.Bundle arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onStart()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStart()
         {
             IExecuteWithSignature("onStart", "()V");
@@ -731,7 +756,7 @@ public void OnStart()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onStop()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStop()
         {
             IExecuteWithSignature("onStop", "()V");
@@ -740,7 +765,7 @@ public void OnStop()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onTrimMemory(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnTrimMemory(int arg0)
         {
             IExecuteWithSignature("onTrimMemory", "(I)V", arg0);
@@ -750,7 +775,7 @@ public void OnTrimMemory(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnViewCreated(Android.View.View arg0, Android.Os.Bundle arg1)
         {
             IExecute("onViewCreated", arg0, arg1);
@@ -759,7 +784,7 @@ public void OnViewCreated(Android.View.View arg0, Android.Os.Bundle arg1)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#onViewStateRestored(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnViewStateRestored(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("onViewStateRestored", "(Landroid/os/Bundle;)V", arg0);
@@ -767,7 +792,7 @@ public void OnViewStateRestored(Android.Os.Bundle arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#postponeEnterTransition()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PostponeEnterTransition()
         {
             IExecuteWithSignature("postponeEnterTransition", "()V");
@@ -776,34 +801,79 @@ public void PostponeEnterTransition()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#registerForContextMenu(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterForContextMenu(Android.View.View arg0)
         {
             IExecuteWithSignature("registerForContextMenu", "(Landroid/view/View;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setAllowEnterTransitionOverlap(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetAllowEnterTransitionOverlap(bool arg0)
+        {
+            IExecuteWithSignature("setAllowEnterTransitionOverlap", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setAllowReturnTransitionOverlap(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetAllowReturnTransitionOverlap(bool arg0)
+        {
+            IExecuteWithSignature("setAllowReturnTransitionOverlap", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setArguments(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        [global::System.Obsolete()]
+        public void SetArguments(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setArguments", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setEnterSharedElementCallback(android.app.SharedElementCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.SharedElementCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEnterSharedElementCallback(Android.App.SharedElementCallback arg0)
         {
             IExecuteWithSignature("setEnterSharedElementCallback", "(Landroid/app/SharedElementCallback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setEnterTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        [global::System.Obsolete()]
+        public void SetEnterTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setEnterTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setExitSharedElementCallback(android.app.SharedElementCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.SharedElementCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetExitSharedElementCallback(Android.App.SharedElementCallback arg0)
         {
             IExecuteWithSignature("setExitSharedElementCallback", "(Landroid/app/SharedElementCallback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setExitTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        [global::System.Obsolete()]
+        public void SetExitTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setExitTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setHasOptionsMenu(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetHasOptionsMenu(bool arg0)
         {
             IExecuteWithSignature("setHasOptionsMenu", "(Z)V", arg0);
@@ -812,7 +882,7 @@ public void SetHasOptionsMenu(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setInitialSavedState(android.app.Fragment.SavedState)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment.SavedState"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInitialSavedState(Android.App.Fragment.SavedState arg0)
         {
             IExecuteWithSignature("setInitialSavedState", "(Landroid/app/Fragment$SavedState;)V", arg0);
@@ -821,27 +891,81 @@ public void SetInitialSavedState(Android.App.Fragment.SavedState arg0)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setMenuVisibility(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetMenuVisibility(bool arg0)
         {
             IExecuteWithSignature("setMenuVisibility", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setReenterTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        [global::System.Obsolete()]
+        public void SetReenterTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setReenterTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setRetainInstance(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetRetainInstance(bool arg0)
+        {
+            IExecuteWithSignature("setRetainInstance", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setReturnTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        [global::System.Obsolete()]
+        public void SetReturnTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setReturnTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setSharedElementEnterTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        [global::System.Obsolete()]
+        public void SetSharedElementEnterTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setSharedElementEnterTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setSharedElementReturnTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        [global::System.Obsolete()]
+        public void SetSharedElementReturnTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setSharedElementReturnTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setTargetFragment(android.app.Fragment,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTargetFragment(Android.App.Fragment arg0, int arg1)
         {
             IExecute("setTargetFragment", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Fragment.html#setUserVisibleHint(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetUserVisibleHint(bool arg0)
+        {
+            IExecuteWithSignature("setUserVisibleHint", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#startActivity(android.content.Intent,android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivity(Android.Content.Intent arg0, Android.Os.Bundle arg1)
         {
             IExecute("startActivity", arg0, arg1);
@@ -850,7 +974,7 @@ public void StartActivity(Android.Content.Intent arg0, Android.Os.Bundle arg1)
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#startActivity(android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivity(Android.Content.Intent arg0)
         {
             IExecuteWithSignature("startActivity", "(Landroid/content/Intent;)V", arg0);
@@ -861,7 +985,7 @@ public void StartActivity(Android.Content.Intent arg0)
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivityForResult(Android.Content.Intent arg0, int arg1, Android.Os.Bundle arg2)
         {
             IExecute("startActivityForResult", arg0, arg1, arg2);
@@ -871,7 +995,7 @@ public void StartActivityForResult(Android.Content.Intent arg0, int arg1, Androi
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivityForResult(Android.Content.Intent arg0, int arg1)
         {
             IExecute("startActivityForResult", arg0, arg1);
@@ -887,7 +1011,7 @@ public void StartActivityForResult(Android.Content.Intent arg0, int arg1)
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Os.Bundle"/></param>
         /// <exception cref="Android.Content.IntentSender.SendIntentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartIntentSenderForResult(Android.Content.IntentSender arg0, int arg1, Android.Content.Intent arg2, int arg3, int arg4, int arg5, Android.Os.Bundle arg6)
         {
             IExecute("startIntentSenderForResult", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -895,7 +1019,7 @@ public void StartIntentSenderForResult(Android.Content.IntentSender arg0, int ar
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#startPostponedEnterTransition()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartPostponedEnterTransition()
         {
             IExecuteWithSignature("startPostponedEnterTransition", "()V");
@@ -904,7 +1028,7 @@ public void StartPostponedEnterTransition()
         /// <see href="https://developer.android.com/reference/android/app/Fragment.html#unregisterForContextMenu(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterForContextMenu(Android.View.View arg0)
         {
             IExecuteWithSignature("unregisterForContextMenu", "(Landroid/view/View;)V", arg0);
@@ -959,7 +1083,7 @@ public partial class SavedState
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Fragment.SavedState.html#CREATOR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Os.Parcelable.ClassLoaderCreator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.ClassLoaderCreator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
             private static Android.Os.Parcelable.ClassLoaderCreator _CREATORContent = default;
             private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -975,7 +1099,7 @@ public partial class SavedState
             /// <see href="https://developer.android.com/reference/android/app/Fragment.SavedState.html#describeContents()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int DescribeContents()
             {
                 return IExecuteWithSignature<int>("describeContents", "()I");
@@ -985,7 +1109,7 @@ public int DescribeContents()
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
             {
                 IExecute("writeToParcel", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/App/FragmentBreadCrumbs.cs b/src/net/Netdroid/Generated/Android/App/FragmentBreadCrumbs.cs
index 4977becff..0723201ba 100644
--- a/src/net/Netdroid/Generated/Android/App/FragmentBreadCrumbs.cs
+++ b/src/net/Netdroid/Generated/Android/App/FragmentBreadCrumbs.cs
@@ -35,7 +35,7 @@ public partial class FragmentBreadCrumbs
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FragmentBreadCrumbs(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -45,7 +45,7 @@ public FragmentBreadCrumbs(Android.Content.Context arg0, Android.Util.AttributeS
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FragmentBreadCrumbs(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -54,7 +54,7 @@ public FragmentBreadCrumbs(Android.Content.Context arg0, Android.Util.AttributeS
         /// <see href="https://developer.android.com/reference/android/app/FragmentBreadCrumbs.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FragmentBreadCrumbs(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -78,7 +78,7 @@ public FragmentBreadCrumbs(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentBreadCrumbs.html#onBackStackChanged()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnBackStackChanged()
         {
             IExecuteWithSignature("onBackStackChanged", "()V");
@@ -87,7 +87,7 @@ public void OnBackStackChanged()
         /// <see href="https://developer.android.com/reference/android/app/FragmentBreadCrumbs.html#setActivity(android.app.Activity)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetActivity(Android.App.Activity arg0)
         {
             IExecuteWithSignature("setActivity", "(Landroid/app/Activity;)V", arg0);
@@ -96,7 +96,7 @@ public void SetActivity(Android.App.Activity arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentBreadCrumbs.html#setMaxVisible(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetMaxVisible(int arg0)
         {
             IExecuteWithSignature("setMaxVisible", "(I)V", arg0);
@@ -105,7 +105,7 @@ public void SetMaxVisible(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentBreadCrumbs.html#setOnBreadCrumbClickListener(android.app.FragmentBreadCrumbs.OnBreadCrumbClickListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.FragmentBreadCrumbs.OnBreadCrumbClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnBreadCrumbClickListener(Android.App.FragmentBreadCrumbs.OnBreadCrumbClickListener arg0)
         {
             IExecuteWithSignature("setOnBreadCrumbClickListener", "(Landroid/app/FragmentBreadCrumbs$OnBreadCrumbClickListener;)V", arg0);
@@ -116,7 +116,7 @@ public void SetOnBreadCrumbClickListener(Android.App.FragmentBreadCrumbs.OnBread
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg2"><see cref="Android.View.View.OnClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetParentTitle(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1, Android.View.View.OnClickListener arg2)
         {
             IExecute("setParentTitle", arg0, arg1, arg2);
@@ -126,7 +126,7 @@ public void SetParentTitle(Java.Lang.CharSequence arg0, Java.Lang.CharSequence a
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTitle(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1)
         {
             IExecute("setTitle", arg0, arg1);
@@ -160,7 +160,7 @@ public partial class OnBreadCrumbClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onBreadCrumbClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.FragmentManager.BackStackEntry>>>(OnBreadCrumbClickEventHandler));
+                AddEventHandler("onBreadCrumbClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.FragmentManager.BackStackEntry>>>(OnBreadCrumbClickEventHandler));
 
             }
 
@@ -168,7 +168,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/FragmentBreadCrumbs.OnBreadCrumbClickListener.html#onBreadCrumbClick(android.app.FragmentManager.BackStackEntry,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnBreadCrumbClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.App.FragmentManager.BackStackEntry, int, bool> OnOnBreadCrumbClick { get; set; } = null;
+            public global::System.Func<Android.App.FragmentManager.BackStackEntry, int, bool> OnOnBreadCrumbClick { get; set; } = null;
 
             void OnBreadCrumbClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.FragmentManager.BackStackEntry>> data)
             {
@@ -183,7 +183,7 @@ void OnBreadCrumbClickEventHandler(object sender, CLRListenerEventArgs<CLREventD
             /// <param name="arg0"><see cref="Android.App.FragmentManager.BackStackEntry"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual bool OnBreadCrumbClick(Android.App.FragmentManager.BackStackEntry arg0, int arg1)
             {
                 return default;
@@ -225,7 +225,7 @@ public partial class OnBreadCrumbClickListenerDirect
             /// <param name="arg0"><see cref="Android.App.FragmentManager.BackStackEntry"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override bool OnBreadCrumbClick(Android.App.FragmentManager.BackStackEntry arg0, int arg1)
             {
                 return IExecute<bool>("onBreadCrumbClick", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/App/FragmentContainer.cs b/src/net/Netdroid/Generated/Android/App/FragmentContainer.cs
index 9f045d406..464a3cd0a 100644
--- a/src/net/Netdroid/Generated/Android/App/FragmentContainer.cs
+++ b/src/net/Netdroid/Generated/Android/App/FragmentContainer.cs
@@ -51,16 +51,16 @@ public partial class FragmentContainer
         /// <param name="arg0"><see cref="int"/></param>
         /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        [System.Obsolete()]
-        public T OnFindViewById<T>(int arg0) where T: Android.View.View
+        [global::System.Obsolete()]
+        public T OnFindViewById<T>(int arg0) where T : Android.View.View
         {
-            return IExecuteWithSignature<T>("onFindViewById", "(I)Landroid/view/View;", arg0);
+            return IExecute<T>("onFindViewById", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentContainer.html#onHasView()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnHasView()
         {
             return IExecuteWithSignature<bool>("onHasView", "()Z");
diff --git a/src/net/Netdroid/Generated/Android/App/FragmentController.cs b/src/net/Netdroid/Generated/Android/App/FragmentController.cs
index 7771e9cca..f3c8299ed 100644
--- a/src/net/Netdroid/Generated/Android/App/FragmentController.cs
+++ b/src/net/Netdroid/Generated/Android/App/FragmentController.cs
@@ -46,7 +46,7 @@ public partial class FragmentController
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.FragmentHostCallback"/></param>
         /// <returns><see cref="Android.App.FragmentController"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.App.FragmentController CreateController(Android.App.FragmentHostCallback<object> arg0)
         {
             return SExecuteWithSignature<Android.App.FragmentController>(LocalBridgeClazz, "createController", "(Landroid/app/FragmentHostCallback;)Landroid/app/FragmentController;", arg0);
@@ -56,45 +56,47 @@ public static Android.App.FragmentController CreateController(Android.App.Fragme
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#getFragmentManager()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.App.FragmentManager FragmentManager
-        {
-            get { return IExecuteWithSignature<Android.App.FragmentManager>("getFragmentManager", "()Landroid/app/FragmentManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#getLoaderManager()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.App.LoaderManager LoaderManager
-        {
-            get { return IExecuteWithSignature<Android.App.LoaderManager>("getLoaderManager", "()Landroid/app/LoaderManager;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#findFragmentByWho(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.Fragment"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.Fragment FindFragmentByWho(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.App.Fragment>("findFragmentByWho", "(Ljava/lang/String;)Landroid/app/Fragment;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#getFragmentManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.FragmentManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.FragmentManager GetFragmentManager()
+        {
+            return IExecuteWithSignature<Android.App.FragmentManager>("getFragmentManager", "()Landroid/app/FragmentManager;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#retainNestedNonConfig()"/>
         /// </summary>
         /// <returns><see cref="Android.App.FragmentManagerNonConfig"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentManagerNonConfig RetainNestedNonConfig()
         {
             return IExecuteWithSignature<Android.App.FragmentManagerNonConfig>("retainNestedNonConfig", "()Landroid/app/FragmentManagerNonConfig;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#getLoaderManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.LoaderManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.LoaderManager GetLoaderManager()
+        {
+            return IExecuteWithSignature<Android.App.LoaderManager>("getLoaderManager", "()Landroid/app/LoaderManager;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#saveAllState()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.Parcelable"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.Parcelable SaveAllState()
         {
             return IExecuteWithSignature<Android.Os.Parcelable>("saveAllState", "()Landroid/os/Parcelable;");
@@ -103,7 +105,7 @@ public Android.Os.Parcelable SaveAllState()
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#retainLoaderNonConfig()"/>
         /// </summary>
         /// <returns><see cref="Android.Util.ArrayMap"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Util.ArrayMap<Java.Lang.String, Android.App.LoaderManager> RetainLoaderNonConfig()
         {
             return IExecuteWithSignature<Android.Util.ArrayMap<Java.Lang.String, Android.App.LoaderManager>>("retainLoaderNonConfig", "()Landroid/util/ArrayMap;");
@@ -116,7 +118,7 @@ public Android.Os.Parcelable SaveAllState()
         /// <param name="arg2"><see cref="Android.Content.Context"/></param>
         /// <param name="arg3"><see cref="Android.Util.AttributeSet"/></param>
         /// <returns><see cref="Android.View.View"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.View OnCreateView(Android.View.View arg0, Java.Lang.String arg1, Android.Content.Context arg2, Android.Util.AttributeSet arg3)
         {
             return IExecute<Android.View.View>("onCreateView", arg0, arg1, arg2, arg3);
@@ -126,7 +128,7 @@ public Android.View.View OnCreateView(Android.View.View arg0, Java.Lang.String a
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MenuItem"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool DispatchContextItemSelected(Android.View.MenuItem arg0)
         {
             return IExecuteWithSignature<bool>("dispatchContextItemSelected", "(Landroid/view/MenuItem;)Z", arg0);
@@ -137,7 +139,7 @@ public bool DispatchContextItemSelected(Android.View.MenuItem arg0)
         /// <param name="arg0"><see cref="Android.View.Menu"/></param>
         /// <param name="arg1"><see cref="Android.View.MenuInflater"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool DispatchCreateOptionsMenu(Android.View.Menu arg0, Android.View.MenuInflater arg1)
         {
             return IExecute<bool>("dispatchCreateOptionsMenu", arg0, arg1);
@@ -147,7 +149,7 @@ public bool DispatchCreateOptionsMenu(Android.View.Menu arg0, Android.View.MenuI
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MenuItem"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool DispatchOptionsItemSelected(Android.View.MenuItem arg0)
         {
             return IExecuteWithSignature<bool>("dispatchOptionsItemSelected", "(Landroid/view/MenuItem;)Z", arg0);
@@ -157,7 +159,7 @@ public bool DispatchOptionsItemSelected(Android.View.MenuItem arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Menu"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool DispatchPrepareOptionsMenu(Android.View.Menu arg0)
         {
             return IExecuteWithSignature<bool>("dispatchPrepareOptionsMenu", "(Landroid/view/Menu;)Z", arg0);
@@ -166,7 +168,7 @@ public bool DispatchPrepareOptionsMenu(Android.View.Menu arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#execPendingActions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ExecPendingActions()
         {
             return IExecuteWithSignature<bool>("execPendingActions", "()Z");
@@ -175,7 +177,7 @@ public bool ExecPendingActions()
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#retainNonConfig()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.App.Fragment> RetainNonConfig()
         {
             return IExecuteWithSignature<Java.Util.List<Android.App.Fragment>>("retainNonConfig", "()Ljava/util/List;");
@@ -184,7 +186,7 @@ public bool ExecPendingActions()
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#attachHost(android.app.Fragment)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AttachHost(Android.App.Fragment arg0)
         {
             IExecuteWithSignature("attachHost", "(Landroid/app/Fragment;)V", arg0);
@@ -192,7 +194,7 @@ public void AttachHost(Android.App.Fragment arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchActivityCreated()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchActivityCreated()
         {
             IExecuteWithSignature("dispatchActivityCreated", "()V");
@@ -201,7 +203,7 @@ public void DispatchActivityCreated()
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchConfigurationChanged(android.content.res.Configuration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.Configuration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchConfigurationChanged(Android.Content.Res.Configuration arg0)
         {
             IExecuteWithSignature("dispatchConfigurationChanged", "(Landroid/content/res/Configuration;)V", arg0);
@@ -209,7 +211,7 @@ public void DispatchConfigurationChanged(Android.Content.Res.Configuration arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchCreate()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchCreate()
         {
             IExecuteWithSignature("dispatchCreate", "()V");
@@ -217,7 +219,7 @@ public void DispatchCreate()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchDestroy()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchDestroy()
         {
             IExecuteWithSignature("dispatchDestroy", "()V");
@@ -225,7 +227,7 @@ public void DispatchDestroy()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchDestroyView()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchDestroyView()
         {
             IExecuteWithSignature("dispatchDestroyView", "()V");
@@ -233,7 +235,7 @@ public void DispatchDestroyView()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchLowMemory()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchLowMemory()
         {
             IExecuteWithSignature("dispatchLowMemory", "()V");
@@ -243,7 +245,7 @@ public void DispatchLowMemory()
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.Content.Res.Configuration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchMultiWindowModeChanged(bool arg0, Android.Content.Res.Configuration arg1)
         {
             IExecute("dispatchMultiWindowModeChanged", arg0, arg1);
@@ -252,7 +254,7 @@ public void DispatchMultiWindowModeChanged(bool arg0, Android.Content.Res.Config
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchMultiWindowModeChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchMultiWindowModeChanged(bool arg0)
         {
             IExecuteWithSignature("dispatchMultiWindowModeChanged", "(Z)V", arg0);
@@ -261,7 +263,7 @@ public void DispatchMultiWindowModeChanged(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchOptionsMenuClosed(android.view.Menu)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Menu"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchOptionsMenuClosed(Android.View.Menu arg0)
         {
             IExecuteWithSignature("dispatchOptionsMenuClosed", "(Landroid/view/Menu;)V", arg0);
@@ -269,7 +271,7 @@ public void DispatchOptionsMenuClosed(Android.View.Menu arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchPause()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchPause()
         {
             IExecuteWithSignature("dispatchPause", "()V");
@@ -279,7 +281,7 @@ public void DispatchPause()
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.Content.Res.Configuration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchPictureInPictureModeChanged(bool arg0, Android.Content.Res.Configuration arg1)
         {
             IExecute("dispatchPictureInPictureModeChanged", arg0, arg1);
@@ -288,7 +290,7 @@ public void DispatchPictureInPictureModeChanged(bool arg0, Android.Content.Res.C
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchPictureInPictureModeChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchPictureInPictureModeChanged(bool arg0)
         {
             IExecuteWithSignature("dispatchPictureInPictureModeChanged", "(Z)V", arg0);
@@ -296,7 +298,7 @@ public void DispatchPictureInPictureModeChanged(bool arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchResume()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchResume()
         {
             IExecuteWithSignature("dispatchResume", "()V");
@@ -304,7 +306,7 @@ public void DispatchResume()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchStart()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchStart()
         {
             IExecuteWithSignature("dispatchStart", "()V");
@@ -312,7 +314,7 @@ public void DispatchStart()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchStop()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchStop()
         {
             IExecuteWithSignature("dispatchStop", "()V");
@@ -321,7 +323,7 @@ public void DispatchStop()
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#dispatchTrimMemory(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchTrimMemory(int arg0)
         {
             IExecuteWithSignature("dispatchTrimMemory", "(I)V", arg0);
@@ -329,7 +331,7 @@ public void DispatchTrimMemory(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#doLoaderDestroy()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DoLoaderDestroy()
         {
             IExecuteWithSignature("doLoaderDestroy", "()V");
@@ -337,7 +339,7 @@ public void DoLoaderDestroy()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#doLoaderStart()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DoLoaderStart()
         {
             IExecuteWithSignature("doLoaderStart", "()V");
@@ -346,7 +348,7 @@ public void DoLoaderStart()
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#doLoaderStop(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DoLoaderStop(bool arg0)
         {
             IExecuteWithSignature("doLoaderStop", "(Z)V", arg0);
@@ -358,7 +360,7 @@ public void DoLoaderStop(bool arg0)
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg2"><see cref="Java.Io.PrintWriter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DumpLoaders(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.PrintWriter arg2, Java.Lang.String[] arg3)
         {
             IExecute("dumpLoaders", arg0, arg1, arg2, arg3);
@@ -366,7 +368,7 @@ public void DumpLoaders(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#noteStateNotSaved()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void NoteStateNotSaved()
         {
             IExecuteWithSignature("noteStateNotSaved", "()V");
@@ -374,7 +376,7 @@ public void NoteStateNotSaved()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#reportLoaderStart()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ReportLoaderStart()
         {
             IExecuteWithSignature("reportLoaderStart", "()V");
@@ -384,7 +386,7 @@ public void ReportLoaderStart()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcelable"/></param>
         /// <param name="arg1"><see cref="Android.App.FragmentManagerNonConfig"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RestoreAllState(Android.Os.Parcelable arg0, Android.App.FragmentManagerNonConfig arg1)
         {
             IExecute("restoreAllState", arg0, arg1);
@@ -394,7 +396,7 @@ public void RestoreAllState(Android.Os.Parcelable arg0, Android.App.FragmentMana
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcelable"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RestoreAllState(Android.Os.Parcelable arg0, Java.Util.List<Android.App.Fragment> arg1)
         {
             IExecute("restoreAllState", arg0, arg1);
@@ -403,7 +405,7 @@ public void RestoreAllState(Android.Os.Parcelable arg0, Java.Util.List<Android.A
         /// <see href="https://developer.android.com/reference/android/app/FragmentController.html#restoreLoaderNonConfig(android.util.ArrayMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.ArrayMap"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RestoreLoaderNonConfig(Android.Util.ArrayMap<Java.Lang.String, Android.App.LoaderManager> arg0)
         {
             IExecuteWithSignature("restoreLoaderNonConfig", "(Landroid/util/ArrayMap;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/FragmentHostCallback.cs b/src/net/Netdroid/Generated/Android/App/FragmentHostCallback.cs
index df14ec1a3..d1888b1a6 100644
--- a/src/net/Netdroid/Generated/Android/App/FragmentHostCallback.cs
+++ b/src/net/Netdroid/Generated/Android/App/FragmentHostCallback.cs
@@ -35,7 +35,7 @@ public partial class FragmentHostCallback
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Os.Handler"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FragmentHostCallback(Android.Content.Context arg0, Android.Os.Handler arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -60,7 +60,7 @@ public FragmentHostCallback(Android.Content.Context arg0, Android.Os.Handler arg
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onGetHost()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object OnGetHost()
         {
             return IExecuteWithSignature("onGetHost", "()Ljava/lang/Object;");
@@ -69,7 +69,7 @@ public object OnGetHost()
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onGetLayoutInflater()"/>
         /// </summary>
         /// <returns><see cref="Android.View.LayoutInflater"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.LayoutInflater OnGetLayoutInflater()
         {
             return IExecuteWithSignature<Android.View.LayoutInflater>("onGetLayoutInflater", "()Landroid/view/LayoutInflater;");
@@ -78,7 +78,7 @@ public Android.View.LayoutInflater OnGetLayoutInflater()
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onHasWindowAnimations()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnHasWindowAnimations()
         {
             return IExecuteWithSignature<bool>("onHasWindowAnimations", "()Z");
@@ -88,7 +88,7 @@ public bool OnHasWindowAnimations()
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnShouldSaveFragmentState(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<bool>("onShouldSaveFragmentState", "(Landroid/app/Fragment;)Z", arg0);
@@ -97,7 +97,7 @@ public bool OnShouldSaveFragmentState(Android.App.Fragment arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onUseFragmentManagerInflaterFactory()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnUseFragmentManagerInflaterFactory()
         {
             return IExecuteWithSignature<bool>("onUseFragmentManagerInflaterFactory", "()Z");
@@ -106,7 +106,7 @@ public bool OnUseFragmentManagerInflaterFactory()
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onGetWindowAnimations()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int OnGetWindowAnimations()
         {
             return IExecuteWithSignature<int>("onGetWindowAnimations", "()I");
@@ -115,7 +115,7 @@ public int OnGetWindowAnimations()
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onAttachFragment(android.app.Fragment)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnAttachFragment(Android.App.Fragment arg0)
         {
             IExecuteWithSignature("onAttachFragment", "(Landroid/app/Fragment;)V", arg0);
@@ -127,7 +127,7 @@ public void OnAttachFragment(Android.App.Fragment arg0)
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg2"><see cref="Java.Io.PrintWriter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.PrintWriter arg2, Java.Lang.String[] arg3)
         {
             IExecute("onDump", arg0, arg1, arg2, arg3);
@@ -135,7 +135,7 @@ public void OnDump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.P
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onInvalidateOptionsMenu()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnInvalidateOptionsMenu()
         {
             IExecuteWithSignature("onInvalidateOptionsMenu", "()V");
@@ -146,7 +146,7 @@ public void OnInvalidateOptionsMenu()
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnRequestPermissionsFromFragment(Android.App.Fragment arg0, Java.Lang.String[] arg1, int arg2)
         {
             IExecute("onRequestPermissionsFromFragment", arg0, arg1, arg2);
@@ -158,7 +158,7 @@ public void OnRequestPermissionsFromFragment(Android.App.Fragment arg0, Java.Lan
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStartActivityFromFragment(Android.App.Fragment arg0, Android.Content.Intent arg1, int arg2, Android.Os.Bundle arg3)
         {
             IExecute("onStartActivityFromFragment", arg0, arg1, arg2, arg3);
@@ -175,7 +175,7 @@ public void OnStartActivityFromFragment(Android.App.Fragment arg0, Android.Conte
         /// <param name="arg6"><see cref="int"/></param>
         /// <param name="arg7"><see cref="Android.Os.Bundle"/></param>
         /// <exception cref="Android.Content.IntentSender.SendIntentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStartIntentSenderFromFragment(Android.App.Fragment arg0, Android.Content.IntentSender arg1, int arg2, Android.Content.Intent arg3, int arg4, int arg5, int arg6, Android.Os.Bundle arg7)
         {
             IExecute("onStartIntentSenderFromFragment", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -201,7 +201,7 @@ public partial class FragmentHostCallback<E>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Os.Handler"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FragmentHostCallback(Android.Content.Context arg0, Android.Os.Handler arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -230,7 +230,7 @@ public FragmentHostCallback(Android.Content.Context arg0, Android.Os.Handler arg
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onGetHost()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public E OnGetHost()
         {
             return IExecuteWithSignature<E>("onGetHost", "()Ljava/lang/Object;");
@@ -239,7 +239,7 @@ public E OnGetHost()
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onGetLayoutInflater()"/>
         /// </summary>
         /// <returns><see cref="Android.View.LayoutInflater"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.LayoutInflater OnGetLayoutInflater()
         {
             return IExecuteWithSignature<Android.View.LayoutInflater>("onGetLayoutInflater", "()Landroid/view/LayoutInflater;");
@@ -248,7 +248,7 @@ public Android.View.LayoutInflater OnGetLayoutInflater()
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onHasWindowAnimations()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnHasWindowAnimations()
         {
             return IExecuteWithSignature<bool>("onHasWindowAnimations", "()Z");
@@ -258,7 +258,7 @@ public bool OnHasWindowAnimations()
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnShouldSaveFragmentState(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<bool>("onShouldSaveFragmentState", "(Landroid/app/Fragment;)Z", arg0);
@@ -267,7 +267,7 @@ public bool OnShouldSaveFragmentState(Android.App.Fragment arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onUseFragmentManagerInflaterFactory()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnUseFragmentManagerInflaterFactory()
         {
             return IExecuteWithSignature<bool>("onUseFragmentManagerInflaterFactory", "()Z");
@@ -276,7 +276,7 @@ public bool OnUseFragmentManagerInflaterFactory()
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onGetWindowAnimations()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int OnGetWindowAnimations()
         {
             return IExecuteWithSignature<int>("onGetWindowAnimations", "()I");
@@ -285,7 +285,7 @@ public int OnGetWindowAnimations()
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onAttachFragment(android.app.Fragment)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnAttachFragment(Android.App.Fragment arg0)
         {
             IExecuteWithSignature("onAttachFragment", "(Landroid/app/Fragment;)V", arg0);
@@ -297,7 +297,7 @@ public void OnAttachFragment(Android.App.Fragment arg0)
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg2"><see cref="Java.Io.PrintWriter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.PrintWriter arg2, Java.Lang.String[] arg3)
         {
             IExecute("onDump", arg0, arg1, arg2, arg3);
@@ -305,7 +305,7 @@ public void OnDump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.P
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentHostCallback.html#onInvalidateOptionsMenu()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnInvalidateOptionsMenu()
         {
             IExecuteWithSignature("onInvalidateOptionsMenu", "()V");
@@ -316,7 +316,7 @@ public void OnInvalidateOptionsMenu()
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnRequestPermissionsFromFragment(Android.App.Fragment arg0, Java.Lang.String[] arg1, int arg2)
         {
             IExecute("onRequestPermissionsFromFragment", arg0, arg1, arg2);
@@ -328,7 +328,7 @@ public void OnRequestPermissionsFromFragment(Android.App.Fragment arg0, Java.Lan
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStartActivityFromFragment(Android.App.Fragment arg0, Android.Content.Intent arg1, int arg2, Android.Os.Bundle arg3)
         {
             IExecute("onStartActivityFromFragment", arg0, arg1, arg2, arg3);
@@ -345,7 +345,7 @@ public void OnStartActivityFromFragment(Android.App.Fragment arg0, Android.Conte
         /// <param name="arg6"><see cref="int"/></param>
         /// <param name="arg7"><see cref="Android.Os.Bundle"/></param>
         /// <exception cref="Android.Content.IntentSender.SendIntentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStartIntentSenderFromFragment(Android.App.Fragment arg0, Android.Content.IntentSender arg1, int arg2, Android.Content.Intent arg3, int arg4, int arg5, int arg6, Android.Os.Bundle arg7)
         {
             IExecute("onStartIntentSenderFromFragment", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
diff --git a/src/net/Netdroid/Generated/Android/App/FragmentManager.cs b/src/net/Netdroid/Generated/Android/App/FragmentManager.cs
index abd807a51..e62de801c 100644
--- a/src/net/Netdroid/Generated/Android/App/FragmentManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/FragmentManager.cs
@@ -40,7 +40,7 @@ public partial class FragmentManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#POP_BACK_STACK_INCLUSIVE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int POP_BACK_STACK_INCLUSIVE { get { if (!_POP_BACK_STACK_INCLUSIVEReady) { _POP_BACK_STACK_INCLUSIVEContent = SGetField<int>(LocalBridgeClazz, "POP_BACK_STACK_INCLUSIVE"); _POP_BACK_STACK_INCLUSIVEReady = true; } return _POP_BACK_STACK_INCLUSIVEContent; } }
         private static int _POP_BACK_STACK_INCLUSIVEContent = default;
         private static bool _POP_BACK_STACK_INCLUSIVEReady = false; // this is used because in case of generics 
@@ -52,7 +52,7 @@ public partial class FragmentManager
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#enableDebugLogging(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void EnableDebugLogging(bool arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "enableDebugLogging", "(Z)V", arg0);
@@ -62,35 +62,11 @@ public static void EnableDebugLogging(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#getBackStackEntryCount()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int BackStackEntryCount
-        {
-            get { return IExecuteWithSignature<int>("getBackStackEntryCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#getFragments()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Android.App.Fragment> Fragments
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Fragment>>("getFragments", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#getPrimaryNavigationFragment()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.App.Fragment PrimaryNavigationFragment
-        {
-            get { return IExecuteWithSignature<Android.App.Fragment>("getPrimaryNavigationFragment", "()Landroid/app/Fragment;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#findFragmentById(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.App.Fragment"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.Fragment FindFragmentById(int arg0)
         {
             return IExecuteWithSignature<Android.App.Fragment>("findFragmentById", "(I)Landroid/app/Fragment;", arg0);
@@ -100,7 +76,7 @@ public Android.App.Fragment FindFragmentById(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.Fragment"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.Fragment FindFragmentByTag(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.App.Fragment>("findFragmentByTag", "(Ljava/lang/String;)Landroid/app/Fragment;", arg0);
@@ -111,17 +87,26 @@ public Android.App.Fragment FindFragmentByTag(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.Fragment"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.Fragment GetFragment(Android.Os.Bundle arg0, Java.Lang.String arg1)
         {
             return IExecute<Android.App.Fragment>("getFragment", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#getPrimaryNavigationFragment()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.Fragment"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Fragment GetPrimaryNavigationFragment()
+        {
+            return IExecuteWithSignature<Android.App.Fragment>("getPrimaryNavigationFragment", "()Landroid/app/Fragment;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#saveFragmentInstanceState(android.app.Fragment)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.Fragment.SavedState"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.Fragment.SavedState SaveFragmentInstanceState(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<Android.App.Fragment.SavedState>("saveFragmentInstanceState", "(Landroid/app/Fragment;)Landroid/app/Fragment$SavedState;", arg0);
@@ -131,7 +116,7 @@ public Android.App.Fragment.SavedState SaveFragmentInstanceState(Android.App.Fra
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.App.FragmentManager.BackStackEntry"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentManager.BackStackEntry GetBackStackEntryAt(int arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentManager.BackStackEntry>("getBackStackEntryAt", "(I)Landroid/app/FragmentManager$BackStackEntry;", arg0);
@@ -140,7 +125,7 @@ public Android.App.FragmentManager.BackStackEntry GetBackStackEntryAt(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#beginTransaction()"/>
         /// </summary>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction BeginTransaction()
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("beginTransaction", "()Landroid/app/FragmentTransaction;");
@@ -149,7 +134,7 @@ public Android.App.FragmentTransaction BeginTransaction()
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#executePendingTransactions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ExecutePendingTransactions()
         {
             return IExecuteWithSignature<bool>("executePendingTransactions", "()Z");
@@ -158,7 +143,7 @@ public bool ExecutePendingTransactions()
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#isDestroyed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsDestroyed()
         {
             return IExecuteWithSignature<bool>("isDestroyed", "()Z");
@@ -167,7 +152,7 @@ public bool IsDestroyed()
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#isStateSaved()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsStateSaved()
         {
             return IExecuteWithSignature<bool>("isStateSaved", "()Z");
@@ -176,7 +161,7 @@ public bool IsStateSaved()
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#popBackStackImmediate()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool PopBackStackImmediate()
         {
             return IExecuteWithSignature<bool>("popBackStackImmediate", "()Z");
@@ -187,7 +172,7 @@ public bool PopBackStackImmediate()
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool PopBackStackImmediate(int arg0, int arg1)
         {
             return IExecute<bool>("popBackStackImmediate", arg0, arg1);
@@ -198,16 +183,34 @@ public bool PopBackStackImmediate(int arg0, int arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool PopBackStackImmediate(Java.Lang.String arg0, int arg1)
         {
             return IExecute<bool>("popBackStackImmediate", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#getBackStackEntryCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBackStackEntryCount()
+        {
+            return IExecuteWithSignature<int>("getBackStackEntryCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#getFragments()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Android.App.Fragment> GetFragments()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.Fragment>>("getFragments", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#addOnBackStackChangedListener(android.app.FragmentManager.OnBackStackChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.FragmentManager.OnBackStackChangedListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddOnBackStackChangedListener(Android.App.FragmentManager.OnBackStackChangedListener arg0)
         {
             IExecuteWithSignature("addOnBackStackChangedListener", "(Landroid/app/FragmentManager$OnBackStackChangedListener;)V", arg0);
@@ -219,7 +222,7 @@ public void AddOnBackStackChangedListener(Android.App.FragmentManager.OnBackStac
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg2"><see cref="Java.Io.PrintWriter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.PrintWriter arg2, Java.Lang.String[] arg3)
         {
             IExecute("dump", arg0, arg1, arg2, arg3);
@@ -227,7 +230,7 @@ public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.Pri
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#popBackStack()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PopBackStack()
         {
             IExecuteWithSignature("popBackStack", "()V");
@@ -237,7 +240,7 @@ public void PopBackStack()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PopBackStack(int arg0, int arg1)
         {
             IExecute("popBackStack", arg0, arg1);
@@ -247,7 +250,7 @@ public void PopBackStack(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PopBackStack(Java.Lang.String arg0, int arg1)
         {
             IExecute("popBackStack", arg0, arg1);
@@ -258,7 +261,7 @@ public void PopBackStack(Java.Lang.String arg0, int arg1)
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Android.App.Fragment"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PutFragment(Android.Os.Bundle arg0, Java.Lang.String arg1, Android.App.Fragment arg2)
         {
             IExecute("putFragment", arg0, arg1, arg2);
@@ -268,7 +271,7 @@ public void PutFragment(Android.Os.Bundle arg0, Java.Lang.String arg1, Android.A
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.FragmentManager.FragmentLifecycleCallbacks"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterFragmentLifecycleCallbacks(Android.App.FragmentManager.FragmentLifecycleCallbacks arg0, bool arg1)
         {
             IExecute("registerFragmentLifecycleCallbacks", arg0, arg1);
@@ -277,7 +280,7 @@ public void RegisterFragmentLifecycleCallbacks(Android.App.FragmentManager.Fragm
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#removeOnBackStackChangedListener(android.app.FragmentManager.OnBackStackChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.FragmentManager.OnBackStackChangedListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveOnBackStackChangedListener(Android.App.FragmentManager.OnBackStackChangedListener arg0)
         {
             IExecuteWithSignature("removeOnBackStackChangedListener", "(Landroid/app/FragmentManager$OnBackStackChangedListener;)V", arg0);
@@ -286,7 +289,7 @@ public void RemoveOnBackStackChangedListener(Android.App.FragmentManager.OnBackS
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#unregisterFragmentLifecycleCallbacks(android.app.FragmentManager.FragmentLifecycleCallbacks)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.FragmentManager.FragmentLifecycleCallbacks"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterFragmentLifecycleCallbacks(Android.App.FragmentManager.FragmentLifecycleCallbacks arg0)
         {
             IExecuteWithSignature("unregisterFragmentLifecycleCallbacks", "(Landroid/app/FragmentManager$FragmentLifecycleCallbacks;)V", arg0);
@@ -294,7 +297,7 @@ public void UnregisterFragmentLifecycleCallbacks(Android.App.FragmentManager.Fra
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentManager.html#invalidateOptionsMenu()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void InvalidateOptionsMenu()
         {
             IExecuteWithSignature("invalidateOptionsMenu", "()V");
@@ -324,52 +327,58 @@ public partial class BackStackEntry
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getBreadCrumbShortTitle()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getBreadCrumbShortTitleRes()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence BreadCrumbShortTitle
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetBreadCrumbShortTitleRes()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getBreadCrumbShortTitle", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<int>("getBreadCrumbShortTitleRes", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getBreadCrumbShortTitleRes()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getBreadCrumbTitleRes()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int BreadCrumbShortTitleRes
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetBreadCrumbTitleRes()
             {
-                get { return IExecuteWithSignature<int>("getBreadCrumbShortTitleRes", "()I"); }
+                return IExecuteWithSignature<int>("getBreadCrumbTitleRes", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getBreadCrumbTitle()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getId()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence BreadCrumbTitle
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetId()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getBreadCrumbTitle", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<int>("getId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getBreadCrumbTitleRes()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getBreadCrumbShortTitle()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int BreadCrumbTitleRes
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetBreadCrumbShortTitle()
             {
-                get { return IExecuteWithSignature<int>("getBreadCrumbTitleRes", "()I"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getBreadCrumbShortTitle", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getBreadCrumbTitle()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int Id
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetBreadCrumbTitle()
             {
-                get { return IExecuteWithSignature<int>("getId", "()I"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getBreadCrumbTitle", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/FragmentManager.BackStackEntry.html#getName()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -408,7 +417,7 @@ public partial class FragmentLifecycleCallbacks
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
             /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentActivityCreated(Android.App.FragmentManager arg0, Android.App.Fragment arg1, Android.Os.Bundle arg2)
             {
                 IExecute("onFragmentActivityCreated", arg0, arg1, arg2);
@@ -419,7 +428,7 @@ public void OnFragmentActivityCreated(Android.App.FragmentManager arg0, Android.
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
             /// <param name="arg2"><see cref="Android.Content.Context"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentAttached(Android.App.FragmentManager arg0, Android.App.Fragment arg1, Android.Content.Context arg2)
             {
                 IExecute("onFragmentAttached", arg0, arg1, arg2);
@@ -430,7 +439,7 @@ public void OnFragmentAttached(Android.App.FragmentManager arg0, Android.App.Fra
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
             /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentCreated(Android.App.FragmentManager arg0, Android.App.Fragment arg1, Android.Os.Bundle arg2)
             {
                 IExecute("onFragmentCreated", arg0, arg1, arg2);
@@ -440,7 +449,7 @@ public void OnFragmentCreated(Android.App.FragmentManager arg0, Android.App.Frag
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentDestroyed(Android.App.FragmentManager arg0, Android.App.Fragment arg1)
             {
                 IExecute("onFragmentDestroyed", arg0, arg1);
@@ -450,7 +459,7 @@ public void OnFragmentDestroyed(Android.App.FragmentManager arg0, Android.App.Fr
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentDetached(Android.App.FragmentManager arg0, Android.App.Fragment arg1)
             {
                 IExecute("onFragmentDetached", arg0, arg1);
@@ -460,7 +469,7 @@ public void OnFragmentDetached(Android.App.FragmentManager arg0, Android.App.Fra
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentPaused(Android.App.FragmentManager arg0, Android.App.Fragment arg1)
             {
                 IExecute("onFragmentPaused", arg0, arg1);
@@ -471,7 +480,7 @@ public void OnFragmentPaused(Android.App.FragmentManager arg0, Android.App.Fragm
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
             /// <param name="arg2"><see cref="Android.Content.Context"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentPreAttached(Android.App.FragmentManager arg0, Android.App.Fragment arg1, Android.Content.Context arg2)
             {
                 IExecute("onFragmentPreAttached", arg0, arg1, arg2);
@@ -482,7 +491,7 @@ public void OnFragmentPreAttached(Android.App.FragmentManager arg0, Android.App.
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
             /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentPreCreated(Android.App.FragmentManager arg0, Android.App.Fragment arg1, Android.Os.Bundle arg2)
             {
                 IExecute("onFragmentPreCreated", arg0, arg1, arg2);
@@ -492,7 +501,7 @@ public void OnFragmentPreCreated(Android.App.FragmentManager arg0, Android.App.F
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentResumed(Android.App.FragmentManager arg0, Android.App.Fragment arg1)
             {
                 IExecute("onFragmentResumed", arg0, arg1);
@@ -503,7 +512,7 @@ public void OnFragmentResumed(Android.App.FragmentManager arg0, Android.App.Frag
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
             /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentSaveInstanceState(Android.App.FragmentManager arg0, Android.App.Fragment arg1, Android.Os.Bundle arg2)
             {
                 IExecute("onFragmentSaveInstanceState", arg0, arg1, arg2);
@@ -513,7 +522,7 @@ public void OnFragmentSaveInstanceState(Android.App.FragmentManager arg0, Androi
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentStarted(Android.App.FragmentManager arg0, Android.App.Fragment arg1)
             {
                 IExecute("onFragmentStarted", arg0, arg1);
@@ -523,7 +532,7 @@ public void OnFragmentStarted(Android.App.FragmentManager arg0, Android.App.Frag
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentStopped(Android.App.FragmentManager arg0, Android.App.Fragment arg1)
             {
                 IExecute("onFragmentStopped", arg0, arg1);
@@ -535,7 +544,7 @@ public void OnFragmentStopped(Android.App.FragmentManager arg0, Android.App.Frag
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
             /// <param name="arg2"><see cref="Android.View.View"/></param>
             /// <param name="arg3"><see cref="Android.Os.Bundle"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentViewCreated(Android.App.FragmentManager arg0, Android.App.Fragment arg1, Android.View.View arg2, Android.Os.Bundle arg3)
             {
                 IExecute("onFragmentViewCreated", arg0, arg1, arg2, arg3);
@@ -545,7 +554,7 @@ public void OnFragmentViewCreated(Android.App.FragmentManager arg0, Android.App.
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.FragmentManager"/></param>
             /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFragmentViewDestroyed(Android.App.FragmentManager arg0, Android.App.Fragment arg1)
             {
                 IExecute("onFragmentViewDestroyed", arg0, arg1);
@@ -586,7 +595,7 @@ public partial class OnBackStackChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onBackStackChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnBackStackChangedEventHandler));
+                AddEventHandler("onBackStackChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnBackStackChangedEventHandler));
 
             }
 
@@ -594,7 +603,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/FragmentManager.OnBackStackChangedListener.html#onBackStackChanged()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnBackStackChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnBackStackChanged { get; set; } = null;
+            public global::System.Action OnOnBackStackChanged { get; set; } = null;
 
             void OnBackStackChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -605,7 +614,7 @@ void OnBackStackChangedEventHandler(object sender, CLRListenerEventArgs<CLREvent
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/FragmentManager.OnBackStackChangedListener.html#onBackStackChanged()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnBackStackChanged()
             {
                 
@@ -644,7 +653,7 @@ public partial class OnBackStackChangedListenerDirect
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/FragmentManager.OnBackStackChangedListener.html#onBackStackChanged()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnBackStackChanged()
             {
                 IExecuteWithSignature("onBackStackChanged", "()V");
diff --git a/src/net/Netdroid/Generated/Android/App/FragmentTransaction.cs b/src/net/Netdroid/Generated/Android/App/FragmentTransaction.cs
index cf01f25ad..47f2ed12f 100644
--- a/src/net/Netdroid/Generated/Android/App/FragmentTransaction.cs
+++ b/src/net/Netdroid/Generated/Android/App/FragmentTransaction.cs
@@ -40,49 +40,49 @@ public partial class FragmentTransaction
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#TRANSIT_ENTER_MASK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSIT_ENTER_MASK { get { if (!_TRANSIT_ENTER_MASKReady) { _TRANSIT_ENTER_MASKContent = SGetField<int>(LocalBridgeClazz, "TRANSIT_ENTER_MASK"); _TRANSIT_ENTER_MASKReady = true; } return _TRANSIT_ENTER_MASKContent; } }
         private static int _TRANSIT_ENTER_MASKContent = default;
         private static bool _TRANSIT_ENTER_MASKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#TRANSIT_EXIT_MASK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSIT_EXIT_MASK { get { if (!_TRANSIT_EXIT_MASKReady) { _TRANSIT_EXIT_MASKContent = SGetField<int>(LocalBridgeClazz, "TRANSIT_EXIT_MASK"); _TRANSIT_EXIT_MASKReady = true; } return _TRANSIT_EXIT_MASKContent; } }
         private static int _TRANSIT_EXIT_MASKContent = default;
         private static bool _TRANSIT_EXIT_MASKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#TRANSIT_FRAGMENT_CLOSE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSIT_FRAGMENT_CLOSE { get { if (!_TRANSIT_FRAGMENT_CLOSEReady) { _TRANSIT_FRAGMENT_CLOSEContent = SGetField<int>(LocalBridgeClazz, "TRANSIT_FRAGMENT_CLOSE"); _TRANSIT_FRAGMENT_CLOSEReady = true; } return _TRANSIT_FRAGMENT_CLOSEContent; } }
         private static int _TRANSIT_FRAGMENT_CLOSEContent = default;
         private static bool _TRANSIT_FRAGMENT_CLOSEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#TRANSIT_FRAGMENT_FADE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSIT_FRAGMENT_FADE { get { if (!_TRANSIT_FRAGMENT_FADEReady) { _TRANSIT_FRAGMENT_FADEContent = SGetField<int>(LocalBridgeClazz, "TRANSIT_FRAGMENT_FADE"); _TRANSIT_FRAGMENT_FADEReady = true; } return _TRANSIT_FRAGMENT_FADEContent; } }
         private static int _TRANSIT_FRAGMENT_FADEContent = default;
         private static bool _TRANSIT_FRAGMENT_FADEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#TRANSIT_FRAGMENT_OPEN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSIT_FRAGMENT_OPEN { get { if (!_TRANSIT_FRAGMENT_OPENReady) { _TRANSIT_FRAGMENT_OPENContent = SGetField<int>(LocalBridgeClazz, "TRANSIT_FRAGMENT_OPEN"); _TRANSIT_FRAGMENT_OPENReady = true; } return _TRANSIT_FRAGMENT_OPENContent; } }
         private static int _TRANSIT_FRAGMENT_OPENContent = default;
         private static bool _TRANSIT_FRAGMENT_OPENReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#TRANSIT_NONE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSIT_NONE { get { if (!_TRANSIT_NONEReady) { _TRANSIT_NONEContent = SGetField<int>(LocalBridgeClazz, "TRANSIT_NONE"); _TRANSIT_NONEReady = true; } return _TRANSIT_NONEContent; } }
         private static int _TRANSIT_NONEContent = default;
         private static bool _TRANSIT_NONEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#TRANSIT_UNSET"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSIT_UNSET { get { if (!_TRANSIT_UNSETReady) { _TRANSIT_UNSETContent = SGetField<int>(LocalBridgeClazz, "TRANSIT_UNSET"); _TRANSIT_UNSETReady = true; } return _TRANSIT_UNSETContent; } }
         private static int _TRANSIT_UNSETContent = default;
         private static bool _TRANSIT_UNSETReady = false; // this is used because in case of generics 
@@ -100,7 +100,7 @@ public partial class FragmentTransaction
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Add(Android.App.Fragment arg0, Java.Lang.String arg1)
         {
             return IExecute<Android.App.FragmentTransaction>("add", arg0, arg1);
@@ -112,7 +112,7 @@ public Android.App.FragmentTransaction Add(Android.App.Fragment arg0, Java.Lang.
         /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Add(int arg0, Android.App.Fragment arg1, Java.Lang.String arg2)
         {
             return IExecute<Android.App.FragmentTransaction>("add", arg0, arg1, arg2);
@@ -123,7 +123,7 @@ public Android.App.FragmentTransaction Add(int arg0, Android.App.Fragment arg1,
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Add(int arg0, Android.App.Fragment arg1)
         {
             return IExecute<Android.App.FragmentTransaction>("add", arg0, arg1);
@@ -134,7 +134,7 @@ public Android.App.FragmentTransaction Add(int arg0, Android.App.Fragment arg1)
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction AddSharedElement(Android.View.View arg0, Java.Lang.String arg1)
         {
             return IExecute<Android.App.FragmentTransaction>("addSharedElement", arg0, arg1);
@@ -144,7 +144,7 @@ public Android.App.FragmentTransaction AddSharedElement(Android.View.View arg0,
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction AddToBackStack(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("addToBackStack", "(Ljava/lang/String;)Landroid/app/FragmentTransaction;", arg0);
@@ -154,7 +154,7 @@ public Android.App.FragmentTransaction AddToBackStack(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Attach(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("attach", "(Landroid/app/Fragment;)Landroid/app/FragmentTransaction;", arg0);
@@ -164,7 +164,7 @@ public Android.App.FragmentTransaction Attach(Android.App.Fragment arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Detach(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("detach", "(Landroid/app/Fragment;)Landroid/app/FragmentTransaction;", arg0);
@@ -173,7 +173,7 @@ public Android.App.FragmentTransaction Detach(Android.App.Fragment arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#disallowAddToBackStack()"/>
         /// </summary>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction DisallowAddToBackStack()
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("disallowAddToBackStack", "()Landroid/app/FragmentTransaction;");
@@ -183,7 +183,7 @@ public Android.App.FragmentTransaction DisallowAddToBackStack()
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Hide(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("hide", "(Landroid/app/Fragment;)Landroid/app/FragmentTransaction;", arg0);
@@ -193,7 +193,7 @@ public Android.App.FragmentTransaction Hide(Android.App.Fragment arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Remove(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("remove", "(Landroid/app/Fragment;)Landroid/app/FragmentTransaction;", arg0);
@@ -205,7 +205,7 @@ public Android.App.FragmentTransaction Remove(Android.App.Fragment arg0)
         /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Replace(int arg0, Android.App.Fragment arg1, Java.Lang.String arg2)
         {
             return IExecute<Android.App.FragmentTransaction>("replace", arg0, arg1, arg2);
@@ -216,7 +216,7 @@ public Android.App.FragmentTransaction Replace(int arg0, Android.App.Fragment ar
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Replace(int arg0, Android.App.Fragment arg1)
         {
             return IExecute<Android.App.FragmentTransaction>("replace", arg0, arg1);
@@ -226,7 +226,7 @@ public Android.App.FragmentTransaction Replace(int arg0, Android.App.Fragment ar
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction RunOnCommit(Java.Lang.Runnable arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("runOnCommit", "(Ljava/lang/Runnable;)Landroid/app/FragmentTransaction;", arg0);
@@ -236,7 +236,7 @@ public Android.App.FragmentTransaction RunOnCommit(Java.Lang.Runnable arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetBreadCrumbShortTitle(int arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("setBreadCrumbShortTitle", "(I)Landroid/app/FragmentTransaction;", arg0);
@@ -246,7 +246,7 @@ public Android.App.FragmentTransaction SetBreadCrumbShortTitle(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetBreadCrumbShortTitle(Java.Lang.CharSequence arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("setBreadCrumbShortTitle", "(Ljava/lang/CharSequence;)Landroid/app/FragmentTransaction;", arg0);
@@ -256,7 +256,7 @@ public Android.App.FragmentTransaction SetBreadCrumbShortTitle(Java.Lang.CharSeq
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetBreadCrumbTitle(int arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("setBreadCrumbTitle", "(I)Landroid/app/FragmentTransaction;", arg0);
@@ -266,7 +266,7 @@ public Android.App.FragmentTransaction SetBreadCrumbTitle(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetBreadCrumbTitle(Java.Lang.CharSequence arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("setBreadCrumbTitle", "(Ljava/lang/CharSequence;)Landroid/app/FragmentTransaction;", arg0);
@@ -279,7 +279,7 @@ public Android.App.FragmentTransaction SetBreadCrumbTitle(Java.Lang.CharSequence
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetCustomAnimations(int arg0, int arg1, int arg2, int arg3)
         {
             return IExecute<Android.App.FragmentTransaction>("setCustomAnimations", arg0, arg1, arg2, arg3);
@@ -290,7 +290,7 @@ public Android.App.FragmentTransaction SetCustomAnimations(int arg0, int arg1, i
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetCustomAnimations(int arg0, int arg1)
         {
             return IExecute<Android.App.FragmentTransaction>("setCustomAnimations", arg0, arg1);
@@ -300,7 +300,7 @@ public Android.App.FragmentTransaction SetCustomAnimations(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetPrimaryNavigationFragment(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("setPrimaryNavigationFragment", "(Landroid/app/Fragment;)Landroid/app/FragmentTransaction;", arg0);
@@ -310,7 +310,7 @@ public Android.App.FragmentTransaction SetPrimaryNavigationFragment(Android.App.
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetReorderingAllowed(bool arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("setReorderingAllowed", "(Z)Landroid/app/FragmentTransaction;", arg0);
@@ -320,7 +320,7 @@ public Android.App.FragmentTransaction SetReorderingAllowed(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetTransition(int arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("setTransition", "(I)Landroid/app/FragmentTransaction;", arg0);
@@ -330,7 +330,7 @@ public Android.App.FragmentTransaction SetTransition(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction SetTransitionStyle(int arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("setTransitionStyle", "(I)Landroid/app/FragmentTransaction;", arg0);
@@ -340,7 +340,7 @@ public Android.App.FragmentTransaction SetTransitionStyle(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <returns><see cref="Android.App.FragmentTransaction"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.FragmentTransaction Show(Android.App.Fragment arg0)
         {
             return IExecuteWithSignature<Android.App.FragmentTransaction>("show", "(Landroid/app/Fragment;)Landroid/app/FragmentTransaction;", arg0);
@@ -349,7 +349,7 @@ public Android.App.FragmentTransaction Show(Android.App.Fragment arg0)
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#isAddToBackStackAllowed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAddToBackStackAllowed()
         {
             return IExecuteWithSignature<bool>("isAddToBackStackAllowed", "()Z");
@@ -358,7 +358,7 @@ public bool IsAddToBackStackAllowed()
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsEmpty()
         {
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
@@ -367,7 +367,7 @@ public bool IsEmpty()
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#commit()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int Commit()
         {
             return IExecuteWithSignature<int>("commit", "()I");
@@ -376,7 +376,7 @@ public int Commit()
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#commitAllowingStateLoss()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CommitAllowingStateLoss()
         {
             return IExecuteWithSignature<int>("commitAllowingStateLoss", "()I");
@@ -384,7 +384,7 @@ public int CommitAllowingStateLoss()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#commitNow()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CommitNow()
         {
             IExecuteWithSignature("commitNow", "()V");
@@ -392,7 +392,7 @@ public void CommitNow()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/FragmentTransaction.html#commitNowAllowingStateLoss()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CommitNowAllowingStateLoss()
         {
             IExecuteWithSignature("commitNowAllowingStateLoss", "()V");
diff --git a/src/net/Netdroid/Generated/Android/App/GameManager.cs b/src/net/Netdroid/Generated/Android/App/GameManager.cs
index ceac1cb3e..a8c46995f 100644
--- a/src/net/Netdroid/Generated/Android/App/GameManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/GameManager.cs
@@ -76,11 +76,12 @@ public partial class GameManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/GameManager.html#getGameMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/GameManager.html#getGameMode()"/>
         /// </summary>
-        public int GameMode
+        /// <returns><see cref="int"/></returns>
+        public int GetGameMode()
         {
-            get { return IExecuteWithSignature<int>("getGameMode", "()I"); }
+            return IExecuteWithSignature<int>("getGameMode", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/GameManager.html#setGameState(android.app.GameState)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/GameState.cs b/src/net/Netdroid/Generated/Android/App/GameState.cs
index 8ace1028f..40e0979ca 100644
--- a/src/net/Netdroid/Generated/Android/App/GameState.cs
+++ b/src/net/Netdroid/Generated/Android/App/GameState.cs
@@ -102,41 +102,44 @@ public GameState(bool arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/GameState.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/GameState.html#isLoading()"/>
         /// </summary>
-        public int Label
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLoading()
         {
-            get { return IExecuteWithSignature<int>("getLabel", "()I"); }
+            return IExecuteWithSignature<bool>("isLoading", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/GameState.html#getMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/GameState.html#describeContents()"/>
         /// </summary>
-        public int Mode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/GameState.html#getQuality()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/GameState.html#getLabel()"/>
         /// </summary>
-        public int Quality
+        /// <returns><see cref="int"/></returns>
+        public int GetLabel()
         {
-            get { return IExecuteWithSignature<int>("getQuality", "()I"); }
+            return IExecuteWithSignature<int>("getLabel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/GameState.html#isLoading()"/>
+        /// <see href="https://developer.android.com/reference/android/app/GameState.html#getMode()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLoading()
+        /// <returns><see cref="int"/></returns>
+        public int GetMode()
         {
-            return IExecuteWithSignature<bool>("isLoading", "()Z");
+            return IExecuteWithSignature<int>("getMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/GameState.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/GameState.html#getQuality()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetQuality()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getQuality", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/GameState.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/GrammaticalInflectionManager.cs b/src/net/Netdroid/Generated/Android/App/GrammaticalInflectionManager.cs
index f359094c2..9b34614cf 100644
--- a/src/net/Netdroid/Generated/Android/App/GrammaticalInflectionManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/GrammaticalInflectionManager.cs
@@ -46,11 +46,12 @@ public partial class GrammaticalInflectionManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/GrammaticalInflectionManager.html#getApplicationGrammaticalGender()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/GrammaticalInflectionManager.html#getApplicationGrammaticalGender()"/>
         /// </summary>
-        public int ApplicationGrammaticalGender
+        /// <returns><see cref="int"/></returns>
+        public int GetApplicationGrammaticalGender()
         {
-            get { return IExecuteWithSignature<int>("getApplicationGrammaticalGender", "()I"); }
+            return IExecuteWithSignature<int>("getApplicationGrammaticalGender", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/GrammaticalInflectionManager.html#setRequestedApplicationGrammaticalGender(int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Instrumentation.cs b/src/net/Netdroid/Generated/Android/App/Instrumentation.cs
index a023d68ec..e8c8b294b 100644
--- a/src/net/Netdroid/Generated/Android/App/Instrumentation.cs
+++ b/src/net/Netdroid/Generated/Android/App/Instrumentation.cs
@@ -71,55 +71,6 @@ public static Android.App.Application NewApplication(Java.Lang.Class arg0, Andro
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getAllocCounts()"/> 
-        /// </summary>
-        public Android.Os.Bundle AllocCounts
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getAllocCounts", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getBinderCounts()"/> 
-        /// </summary>
-        public Android.Os.Bundle BinderCounts
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getBinderCounts", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getComponentName()"/> 
-        /// </summary>
-        public Android.Content.ComponentName ComponentName
-        {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getContext()"/> 
-        /// </summary>
-        public Android.Content.Context Context
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getProcessName()"/> 
-        /// </summary>
-        public Java.Lang.String ProcessName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProcessName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getTargetContext()"/> 
-        /// </summary>
-        public Android.Content.Context TargetContext
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getTargetContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getUiAutomation()"/> 
-        /// </summary>
-        public Android.App.UiAutomation UiAutomation
-        {
-            get { return IExecuteWithSignature<Android.App.UiAutomation>("getUiAutomation", "()Landroid/app/UiAutomation;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#newActivity(java.lang.Class,android.content.Context,android.os.IBinder,android.app.Application,android.content.Intent,android.content.pm.ActivityInfo,java.lang.CharSequence,android.app.Activity,java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
@@ -228,6 +179,14 @@ public Android.App.Instrumentation.ActivityMonitor AddMonitor(Java.Lang.String a
             return IExecute<Android.App.Instrumentation.ActivityMonitor>("addMonitor", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getUiAutomation()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.UiAutomation"/></returns>
+        public Android.App.UiAutomation GetUiAutomation()
+        {
+            return IExecuteWithSignature<Android.App.UiAutomation>("getUiAutomation", "()Landroid/app/UiAutomation;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getUiAutomation(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -237,6 +196,46 @@ public Android.App.UiAutomation GetUiAutomation(int arg0)
             return IExecuteWithSignature<Android.App.UiAutomation>("getUiAutomation", "(I)Landroid/app/UiAutomation;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getComponentName()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponentName()
+        {
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getTargetContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetTargetContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getTargetContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getAllocCounts()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetAllocCounts()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getAllocCounts", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getBinderCounts()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetBinderCounts()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getBinderCounts", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#acquireLooperManager(android.os.Looper)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Looper"/></param>
@@ -296,6 +295,14 @@ public bool OnException(object arg0, MASES.JCOBridge.C2JBridge.JVMBridgeExceptio
             return IExecute<bool>("onException", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#getProcessName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProcessName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getProcessName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#addMonitor(android.app.Instrumentation.ActivityMonitor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Instrumentation.ActivityMonitor"/></param>
@@ -611,7 +618,7 @@ public void Start()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#startAllocCounting()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartAllocCounting()
         {
             IExecuteWithSignature("startAllocCounting", "()V");
@@ -633,7 +640,7 @@ public void StartProfiling()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Instrumentation.html#stopAllocCounting()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopAllocCounting()
         {
             IExecuteWithSignature("stopAllocCounting", "()V");
@@ -705,34 +712,6 @@ public ActivityMonitor(Java.Lang.String arg0, Android.App.Instrumentation.Activi
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#getFilter()"/> 
-            /// </summary>
-            public Android.Content.IntentFilter Filter
-            {
-                get { return IExecuteWithSignature<Android.Content.IntentFilter>("getFilter", "()Landroid/content/IntentFilter;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#getHits()"/> 
-            /// </summary>
-            public int Hits
-            {
-                get { return IExecuteWithSignature<int>("getHits", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#getLastActivity()"/> 
-            /// </summary>
-            public Android.App.Activity LastActivity
-            {
-                get { return IExecuteWithSignature<Android.App.Activity>("getLastActivity", "()Landroid/app/Activity;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#getResult()"/> 
-            /// </summary>
-            public Android.App.Instrumentation.ActivityResult Result
-            {
-                get { return IExecuteWithSignature<Android.App.Instrumentation.ActivityResult>("getResult", "()Landroid/app/Instrumentation$ActivityResult;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#onStartActivity(android.content.Intent)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
@@ -742,6 +721,14 @@ public Android.App.Instrumentation.ActivityResult OnStartActivity(Android.Conten
                 return IExecuteWithSignature<Android.App.Instrumentation.ActivityResult>("onStartActivity", "(Landroid/content/Intent;)Landroid/app/Instrumentation$ActivityResult;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#getLastActivity()"/>
+            /// </summary>
+            /// <returns><see cref="Android.App.Activity"/></returns>
+            public Android.App.Activity GetLastActivity()
+            {
+                return IExecuteWithSignature<Android.App.Activity>("getLastActivity", "()Landroid/app/Activity;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#waitForActivity()"/>
             /// </summary>
             /// <returns><see cref="Android.App.Activity"/></returns>
@@ -759,6 +746,22 @@ public Android.App.Activity WaitForActivityWithTimeout(long arg0)
                 return IExecuteWithSignature<Android.App.Activity>("waitForActivityWithTimeout", "(J)Landroid/app/Activity;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#getResult()"/>
+            /// </summary>
+            /// <returns><see cref="Android.App.Instrumentation.ActivityResult"/></returns>
+            public Android.App.Instrumentation.ActivityResult GetResult()
+            {
+                return IExecuteWithSignature<Android.App.Instrumentation.ActivityResult>("getResult", "()Landroid/app/Instrumentation$ActivityResult;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#getFilter()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Content.IntentFilter"/></returns>
+            public Android.Content.IntentFilter GetFilter()
+            {
+                return IExecuteWithSignature<Android.Content.IntentFilter>("getFilter", "()Landroid/content/IntentFilter;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#isBlocking()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -766,6 +769,14 @@ public bool IsBlocking()
             {
                 return IExecuteWithSignature<bool>("isBlocking", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityMonitor.html#getHits()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetHits()
+            {
+                return IExecuteWithSignature<int>("getHits", "()I");
+            }
 
             #endregion
 
@@ -807,18 +818,20 @@ public ActivityResult(int arg0, Android.Content.Intent arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityResult.html#getResultCode()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityResult.html#getResultData()"/>
             /// </summary>
-            public int ResultCode
+            /// <returns><see cref="Android.Content.Intent"/></returns>
+            public Android.Content.Intent GetResultData()
             {
-                get { return IExecuteWithSignature<int>("getResultCode", "()I"); }
+                return IExecuteWithSignature<Android.Content.Intent>("getResultData", "()Landroid/content/Intent;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityResult.html#getResultData()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Instrumentation.ActivityResult.html#getResultCode()"/>
             /// </summary>
-            public Android.Content.Intent ResultData
+            /// <returns><see cref="int"/></returns>
+            public int GetResultCode()
             {
-                get { return IExecuteWithSignature<Android.Content.Intent>("getResultData", "()Landroid/content/Intent;"); }
+                return IExecuteWithSignature<int>("getResultCode", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/IntentService.cs b/src/net/Netdroid/Generated/Android/App/IntentService.cs
index 75446d1d1..d54cad6ea 100644
--- a/src/net/Netdroid/Generated/Android/App/IntentService.cs
+++ b/src/net/Netdroid/Generated/Android/App/IntentService.cs
@@ -33,7 +33,7 @@ public partial class IntentService
         /// <see href="https://developer.android.com/reference/android/app/IntentService.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public IntentService(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -58,7 +58,7 @@ public IntentService(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/app/IntentService.html#setIntentRedelivery(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIntentRedelivery(bool arg0)
         {
             IExecuteWithSignature("setIntentRedelivery", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/Job/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Job/AllPackageClasses.cs
index 210d10403..661f91b40 100644
--- a/src/net/Netdroid/Generated/Android/App/Job/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Job/AllPackageClasses.cs
@@ -212,12 +212,12 @@ public partial class JobScheduler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<JobS
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("JobScheduler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JobScheduler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JobScheduler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("JobScheduler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JobScheduler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JobScheduler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,12 +258,12 @@ public partial class JobService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("JobService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JobService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JobService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("JobService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JobService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JobService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -304,12 +304,12 @@ public partial class JobServiceEngine : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("JobServiceEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JobServiceEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JobServiceEngine() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("JobServiceEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JobServiceEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JobServiceEngine(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Job/JobInfo.cs b/src/net/Netdroid/Generated/Android/App/Job/JobInfo.cs
index acf85e3a2..e9fd406f1 100644
--- a/src/net/Netdroid/Generated/Android/App/Job/JobInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/Job/JobInfo.cs
@@ -76,7 +76,7 @@ public partial class JobInfo
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#NETWORK_TYPE_METERED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NETWORK_TYPE_METERED { get { if (!_NETWORK_TYPE_METEREDReady) { _NETWORK_TYPE_METEREDContent = SGetField<int>(LocalBridgeClazz, "NETWORK_TYPE_METERED"); _NETWORK_TYPE_METEREDReady = true; } return _NETWORK_TYPE_METEREDContent; } }
         private static int _NETWORK_TYPE_METEREDContent = default;
         private static bool _NETWORK_TYPE_METEREDReady = false; // this is used because in case of generics 
@@ -145,258 +145,281 @@ public partial class JobInfo
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMinFlexMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMinFlexMillis()"/>
         /// </summary>
-        public static long MinFlexMillis
+        /// <returns><see cref="long"/></returns>
+        public static long GetMinFlexMillis()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMinFlexMillis", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMinFlexMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMinPeriodMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMinPeriodMillis()"/>
         /// </summary>
-        public static long MinPeriodMillis
+        /// <returns><see cref="long"/></returns>
+        public static long GetMinPeriodMillis()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMinPeriodMillis", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMinPeriodMillis", "()J");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getBackoffPolicy()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getTriggerContentUris()"/>
         /// </summary>
-        public int BackoffPolicy
+        /// <returns><see cref="Android.App.Job.JobInfo.TriggerContentUri"/></returns>
+        public Android.App.Job.JobInfo.TriggerContentUri[] GetTriggerContentUris()
         {
-            get { return IExecuteWithSignature<int>("getBackoffPolicy", "()I"); }
+            return IExecuteWithSignatureArray<Android.App.Job.JobInfo.TriggerContentUri>("getTriggerContentUris", "()[Landroid/app/job/JobInfo$TriggerContentUri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getClipData()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getClipData()"/>
         /// </summary>
-        public Android.Content.ClipData ClipData
+        /// <returns><see cref="Android.Content.ClipData"/></returns>
+        public Android.Content.ClipData GetClipData()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;"); }
+            return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getClipGrantFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getService()"/>
         /// </summary>
-        public int ClipGrantFlags
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetService()
         {
-            get { return IExecuteWithSignature<int>("getClipGrantFlags", "()I"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getService", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getEstimatedNetworkDownloadBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getRequiredNetwork()"/>
         /// </summary>
-        public long EstimatedNetworkDownloadBytes
+        /// <returns><see cref="Android.Net.NetworkRequest"/></returns>
+        public Android.Net.NetworkRequest GetRequiredNetwork()
         {
-            get { return IExecuteWithSignature<long>("getEstimatedNetworkDownloadBytes", "()J"); }
+            return IExecuteWithSignature<Android.Net.NetworkRequest>("getRequiredNetwork", "()Landroid/net/NetworkRequest;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getEstimatedNetworkUploadBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getTransientExtras()"/>
         /// </summary>
-        public long EstimatedNetworkUploadBytes
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetTransientExtras()
         {
-            get { return IExecuteWithSignature<long>("getEstimatedNetworkUploadBytes", "()J"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getTransientExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getExtras()"/>
         /// </summary>
-        public Android.Os.PersistableBundle Extras
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getFlexMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isExpedited()"/>
         /// </summary>
-        public long FlexMillis
+        /// <returns><see cref="bool"/></returns>
+        public bool IsExpedited()
         {
-            get { return IExecuteWithSignature<long>("getFlexMillis", "()J"); }
+            return IExecuteWithSignature<bool>("isExpedited", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isImportantWhileForeground()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="bool"/></returns>
+        public bool IsImportantWhileForeground()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<bool>("isImportantWhileForeground", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getInitialBackoffMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isPeriodic()"/>
         /// </summary>
-        public long InitialBackoffMillis
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPeriodic()
         {
-            get { return IExecuteWithSignature<long>("getInitialBackoffMillis", "()J"); }
+            return IExecuteWithSignature<bool>("isPeriodic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getIntervalMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isPersisted()"/>
         /// </summary>
-        public long IntervalMillis
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPersisted()
         {
-            get { return IExecuteWithSignature<long>("getIntervalMillis", "()J"); }
+            return IExecuteWithSignature<bool>("isPersisted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMaxExecutionDelayMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isPrefetch()"/>
         /// </summary>
-        public long MaxExecutionDelayMillis
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPrefetch()
         {
-            get { return IExecuteWithSignature<long>("getMaxExecutionDelayMillis", "()J"); }
+            return IExecuteWithSignature<bool>("isPrefetch", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMinimumNetworkChunkBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isRequireBatteryNotLow()"/>
         /// </summary>
-        public long MinimumNetworkChunkBytes
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRequireBatteryNotLow()
         {
-            get { return IExecuteWithSignature<long>("getMinimumNetworkChunkBytes", "()J"); }
+            return IExecuteWithSignature<bool>("isRequireBatteryNotLow", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMinLatencyMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isRequireCharging()"/>
         /// </summary>
-        public long MinLatencyMillis
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRequireCharging()
         {
-            get { return IExecuteWithSignature<long>("getMinLatencyMillis", "()J"); }
+            return IExecuteWithSignature<bool>("isRequireCharging", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isRequireDeviceIdle()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int NetworkType
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRequireDeviceIdle()
         {
-            get { return IExecuteWithSignature<int>("getNetworkType", "()I"); }
+            return IExecuteWithSignature<bool>("isRequireDeviceIdle", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getPriority()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isRequireStorageNotLow()"/>
         /// </summary>
-        public int Priority
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRequireStorageNotLow()
         {
-            get { return IExecuteWithSignature<int>("getPriority", "()I"); }
+            return IExecuteWithSignature<bool>("isRequireStorageNotLow", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getRequiredNetwork()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isUserInitiated()"/>
         /// </summary>
-        public Android.Net.NetworkRequest RequiredNetwork
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserInitiated()
         {
-            get { return IExecuteWithSignature<Android.Net.NetworkRequest>("getRequiredNetwork", "()Landroid/net/NetworkRequest;"); }
+            return IExecuteWithSignature<bool>("isUserInitiated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getService()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#describeContents()"/>
         /// </summary>
-        public Android.Content.ComponentName Service
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getService", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getTransientExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getBackoffPolicy()"/>
         /// </summary>
-        public Android.Os.Bundle TransientExtras
+        /// <returns><see cref="int"/></returns>
+        public int GetBackoffPolicy()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getTransientExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getBackoffPolicy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getTriggerContentMaxDelay()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getClipGrantFlags()"/>
         /// </summary>
-        public long TriggerContentMaxDelay
+        /// <returns><see cref="int"/></returns>
+        public int GetClipGrantFlags()
         {
-            get { return IExecuteWithSignature<long>("getTriggerContentMaxDelay", "()J"); }
+            return IExecuteWithSignature<int>("getClipGrantFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getTriggerContentUpdateDelay()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getId()"/>
         /// </summary>
-        public long TriggerContentUpdateDelay
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<long>("getTriggerContentUpdateDelay", "()J"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getTriggerContentUris()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getNetworkType()"/>
         /// </summary>
-        public Android.App.Job.JobInfo.TriggerContentUri[] TriggerContentUris
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetNetworkType()
         {
-            get { return IExecuteWithSignatureArray<Android.App.Job.JobInfo.TriggerContentUri>("getTriggerContentUris", "()[Landroid/app/job/JobInfo$TriggerContentUri;"); }
+            return IExecuteWithSignature<int>("getNetworkType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isExpedited()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getPriority()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsExpedited()
+        /// <returns><see cref="int"/></returns>
+        public int GetPriority()
         {
-            return IExecuteWithSignature<bool>("isExpedited", "()Z");
+            return IExecuteWithSignature<int>("getPriority", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isImportantWhileForeground()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getEstimatedNetworkDownloadBytes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsImportantWhileForeground()
+        /// <returns><see cref="long"/></returns>
+        public long GetEstimatedNetworkDownloadBytes()
         {
-            return IExecuteWithSignature<bool>("isImportantWhileForeground", "()Z");
+            return IExecuteWithSignature<long>("getEstimatedNetworkDownloadBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isPeriodic()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getEstimatedNetworkUploadBytes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPeriodic()
+        /// <returns><see cref="long"/></returns>
+        public long GetEstimatedNetworkUploadBytes()
         {
-            return IExecuteWithSignature<bool>("isPeriodic", "()Z");
+            return IExecuteWithSignature<long>("getEstimatedNetworkUploadBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isPersisted()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getFlexMillis()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPersisted()
+        /// <returns><see cref="long"/></returns>
+        public long GetFlexMillis()
         {
-            return IExecuteWithSignature<bool>("isPersisted", "()Z");
+            return IExecuteWithSignature<long>("getFlexMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isPrefetch()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getInitialBackoffMillis()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPrefetch()
+        /// <returns><see cref="long"/></returns>
+        public long GetInitialBackoffMillis()
         {
-            return IExecuteWithSignature<bool>("isPrefetch", "()Z");
+            return IExecuteWithSignature<long>("getInitialBackoffMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isRequireBatteryNotLow()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getIntervalMillis()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRequireBatteryNotLow()
+        /// <returns><see cref="long"/></returns>
+        public long GetIntervalMillis()
         {
-            return IExecuteWithSignature<bool>("isRequireBatteryNotLow", "()Z");
+            return IExecuteWithSignature<long>("getIntervalMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isRequireCharging()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMaxExecutionDelayMillis()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRequireCharging()
+        /// <returns><see cref="long"/></returns>
+        public long GetMaxExecutionDelayMillis()
         {
-            return IExecuteWithSignature<bool>("isRequireCharging", "()Z");
+            return IExecuteWithSignature<long>("getMaxExecutionDelayMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isRequireDeviceIdle()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMinimumNetworkChunkBytes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRequireDeviceIdle()
+        /// <returns><see cref="long"/></returns>
+        public long GetMinimumNetworkChunkBytes()
         {
-            return IExecuteWithSignature<bool>("isRequireDeviceIdle", "()Z");
+            return IExecuteWithSignature<long>("getMinimumNetworkChunkBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isRequireStorageNotLow()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getMinLatencyMillis()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRequireStorageNotLow()
+        /// <returns><see cref="long"/></returns>
+        public long GetMinLatencyMillis()
         {
-            return IExecuteWithSignature<bool>("isRequireStorageNotLow", "()Z");
+            return IExecuteWithSignature<long>("getMinLatencyMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#isUserInitiated()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getTriggerContentMaxDelay()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserInitiated()
+        /// <returns><see cref="long"/></returns>
+        public long GetTriggerContentMaxDelay()
         {
-            return IExecuteWithSignature<bool>("isUserInitiated", "()Z");
+            return IExecuteWithSignature<long>("getTriggerContentMaxDelay", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#getTriggerContentUpdateDelay()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTriggerContentUpdateDelay()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTriggerContentUpdateDelay", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.html#writeToParcel(android.os.Parcel,int)"/>
@@ -510,7 +533,7 @@ public Android.App.Job.JobInfo.Builder SetExtras(Android.Os.PersistableBundle ar
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.App.Job.JobInfo.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Job.JobInfo.Builder SetImportantWhileForeground(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.Job.JobInfo.Builder>("setImportantWhileForeground", "(Z)Landroid/app/job/JobInfo$Builder;", arg0);
@@ -731,26 +754,28 @@ public TriggerContentUri(Android.Net.Uri arg0, int arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.TriggerContentUri.html#getFlags()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.TriggerContentUri.html#getUri()"/>
             /// </summary>
-            public int Flags
+            /// <returns><see cref="Android.Net.Uri"/></returns>
+            public Android.Net.Uri GetUri()
             {
-                get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+                return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.TriggerContentUri.html#getUri()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.TriggerContentUri.html#describeContents()"/>
             /// </summary>
-            public Android.Net.Uri Uri
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.TriggerContentUri.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.TriggerContentUri.html#getFlags()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetFlags()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getFlags", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/job/JobInfo.TriggerContentUri.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Job/JobParameters.cs b/src/net/Netdroid/Generated/Android/App/Job/JobParameters.cs
index 7ae05ee7f..53546464f 100644
--- a/src/net/Netdroid/Generated/Android/App/Job/JobParameters.cs
+++ b/src/net/Netdroid/Generated/Android/App/Job/JobParameters.cs
@@ -148,114 +148,124 @@ public partial class JobParameters
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getClipData()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#dequeueWork()"/>
         /// </summary>
-        public Android.Content.ClipData ClipData
+        /// <returns><see cref="Android.App.Job.JobWorkItem"/></returns>
+        public Android.App.Job.JobWorkItem DequeueWork()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;"); }
+            return IExecuteWithSignature<Android.App.Job.JobWorkItem>("dequeueWork", "()Landroid/app/job/JobWorkItem;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getClipGrantFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getClipData()"/>
         /// </summary>
-        public int ClipGrantFlags
+        /// <returns><see cref="Android.Content.ClipData"/></returns>
+        public Android.Content.ClipData GetClipData()
         {
-            get { return IExecuteWithSignature<int>("getClipGrantFlags", "()I"); }
+            return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getNetwork()"/>
         /// </summary>
-        public Android.Os.PersistableBundle Extras
+        /// <returns><see cref="Android.Net.Network"/></returns>
+        public Android.Net.Network GetNetwork()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getJobId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getTriggeredContentUris()"/>
         /// </summary>
-        public int JobId
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri[] GetTriggeredContentUris()
         {
-            get { return IExecuteWithSignature<int>("getJobId", "()I"); }
+            return IExecuteWithSignatureArray<Android.Net.Uri>("getTriggeredContentUris", "()[Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getJobNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getTransientExtras()"/>
         /// </summary>
-        public Java.Lang.String JobNamespace
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetTransientExtras()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getJobNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getTransientExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getNetwork()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getExtras()"/>
         /// </summary>
-        public Android.Net.Network Network
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getStopReason()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#isExpeditedJob()"/>
         /// </summary>
-        public int StopReason
+        /// <returns><see cref="bool"/></returns>
+        public bool IsExpeditedJob()
         {
-            get { return IExecuteWithSignature<int>("getStopReason", "()I"); }
+            return IExecuteWithSignature<bool>("isExpeditedJob", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getTransientExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#isOverrideDeadlineExpired()"/>
         /// </summary>
-        public Android.Os.Bundle TransientExtras
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOverrideDeadlineExpired()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getTransientExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<bool>("isOverrideDeadlineExpired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getTriggeredContentAuthorities()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#isUserInitiatedJob()"/>
         /// </summary>
-        public Java.Lang.String[] TriggeredContentAuthorities
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserInitiatedJob()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getTriggeredContentAuthorities", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isUserInitiatedJob", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getTriggeredContentUris()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#describeContents()"/>
         /// </summary>
-        public Android.Net.Uri[] TriggeredContentUris
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<Android.Net.Uri>("getTriggeredContentUris", "()[Landroid/net/Uri;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#dequeueWork()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getClipGrantFlags()"/>
         /// </summary>
-        /// <returns><see cref="Android.App.Job.JobWorkItem"/></returns>
-        public Android.App.Job.JobWorkItem DequeueWork()
+        /// <returns><see cref="int"/></returns>
+        public int GetClipGrantFlags()
         {
-            return IExecuteWithSignature<Android.App.Job.JobWorkItem>("dequeueWork", "()Landroid/app/job/JobWorkItem;");
+            return IExecuteWithSignature<int>("getClipGrantFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#isExpeditedJob()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getJobId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsExpeditedJob()
+        /// <returns><see cref="int"/></returns>
+        public int GetJobId()
         {
-            return IExecuteWithSignature<bool>("isExpeditedJob", "()Z");
+            return IExecuteWithSignature<int>("getJobId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#isOverrideDeadlineExpired()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getStopReason()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOverrideDeadlineExpired()
+        /// <returns><see cref="int"/></returns>
+        public int GetStopReason()
         {
-            return IExecuteWithSignature<bool>("isOverrideDeadlineExpired", "()Z");
+            return IExecuteWithSignature<int>("getStopReason", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#isUserInitiatedJob()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getJobNamespace()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserInitiatedJob()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetJobNamespace()
         {
-            return IExecuteWithSignature<bool>("isUserInitiatedJob", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getJobNamespace", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#getTriggeredContentAuthorities()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetTriggeredContentAuthorities()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getTriggeredContentAuthorities", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobParameters.html#completeWork(android.app.job.JobWorkItem)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Job/JobScheduler.cs b/src/net/Netdroid/Generated/Android/App/Job/JobScheduler.cs
index 3c02733a6..65acf3ad7 100644
--- a/src/net/Netdroid/Generated/Android/App/Job/JobScheduler.cs
+++ b/src/net/Netdroid/Generated/Android/App/Job/JobScheduler.cs
@@ -166,27 +166,6 @@ public partial class JobScheduler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#getAllPendingJobs()"/> 
-        /// </summary>
-        public Java.Util.List<Android.App.Job.JobInfo> AllPendingJobs
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Job.JobInfo>>("getAllPendingJobs", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#getNamespace()"/> 
-        /// </summary>
-        public Java.Lang.String Namespace
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#getPendingJobsInAllNamespaces()"/> 
-        /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Job.JobInfo>> PendingJobsInAllNamespaces
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Job.JobInfo>>>("getPendingJobsInAllNamespaces", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#getPendingJob(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -215,6 +194,14 @@ public int Schedule(Android.App.Job.JobInfo arg0)
             return IExecuteWithSignature<int>("schedule", "(Landroid/app/job/JobInfo;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#getAllPendingJobs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Job.JobInfo> GetAllPendingJobs()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.Job.JobInfo>>("getAllPendingJobs", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#cancel(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -256,6 +243,22 @@ public int GetPendingJobReason(int arg0)
             return IExecuteWithSignature<int>("getPendingJobReason", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#getNamespace()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#getPendingJobsInAllNamespaces()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Job.JobInfo>> GetPendingJobsInAllNamespaces()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Android.App.Job.JobInfo>>>("getPendingJobsInAllNamespaces", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobScheduler.html#cancelInAllNamespaces()"/>
         /// </summary>
         public void CancelInAllNamespaces()
diff --git a/src/net/Netdroid/Generated/Android/App/Job/JobServiceEngine.cs b/src/net/Netdroid/Generated/Android/App/Job/JobServiceEngine.cs
index 1a471a0aa..beb9abfb2 100644
--- a/src/net/Netdroid/Generated/Android/App/Job/JobServiceEngine.cs
+++ b/src/net/Netdroid/Generated/Android/App/Job/JobServiceEngine.cs
@@ -54,13 +54,6 @@ public JobServiceEngine(Android.App.Service arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobServiceEngine.html#getBinder()"/> 
-        /// </summary>
-        public Android.Os.IBinder Binder
-        {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getBinder", "()Landroid/os/IBinder;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobServiceEngine.html#onStartJob(android.app.job.JobParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Job.JobParameters"/></param>
@@ -79,6 +72,14 @@ public bool OnStopJob(Android.App.Job.JobParameters arg0)
             return IExecuteWithSignature<bool>("onStopJob", "(Landroid/app/job/JobParameters;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobServiceEngine.html#getBinder()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetBinder()
+        {
+            return IExecuteWithSignature<Android.Os.IBinder>("getBinder", "()Landroid/os/IBinder;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobServiceEngine.html#jobFinished(android.app.job.JobParameters,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Job.JobParameters"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Job/JobWorkItem.cs b/src/net/Netdroid/Generated/Android/App/Job/JobWorkItem.cs
index 67bc5bb2b..2404e63cc 100644
--- a/src/net/Netdroid/Generated/Android/App/Job/JobWorkItem.cs
+++ b/src/net/Netdroid/Generated/Android/App/Job/JobWorkItem.cs
@@ -81,54 +81,60 @@ public JobWorkItem(Android.Content.Intent arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getDeliveryCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getIntent()"/>
         /// </summary>
-        public int DeliveryCount
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent GetIntent()
         {
-            get { return IExecuteWithSignature<int>("getDeliveryCount", "()I"); }
+            return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getEstimatedNetworkDownloadBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getExtras()"/>
         /// </summary>
-        public long EstimatedNetworkDownloadBytes
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetExtras()
         {
-            get { return IExecuteWithSignature<long>("getEstimatedNetworkDownloadBytes", "()J"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getEstimatedNetworkUploadBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#describeContents()"/>
         /// </summary>
-        public long EstimatedNetworkUploadBytes
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getEstimatedNetworkUploadBytes", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getDeliveryCount()"/>
         /// </summary>
-        public Android.Os.PersistableBundle Extras
+        /// <returns><see cref="int"/></returns>
+        public int GetDeliveryCount()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<int>("getDeliveryCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getIntent()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getEstimatedNetworkDownloadBytes()"/>
         /// </summary>
-        public Android.Content.Intent Intent
+        /// <returns><see cref="long"/></returns>
+        public long GetEstimatedNetworkDownloadBytes()
         {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); }
+            return IExecuteWithSignature<long>("getEstimatedNetworkDownloadBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getMinimumNetworkChunkBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getEstimatedNetworkUploadBytes()"/>
         /// </summary>
-        public long MinimumNetworkChunkBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetEstimatedNetworkUploadBytes()
         {
-            get { return IExecuteWithSignature<long>("getMinimumNetworkChunkBytes", "()J"); }
+            return IExecuteWithSignature<long>("getEstimatedNetworkUploadBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#getMinimumNetworkChunkBytes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetMinimumNetworkChunkBytes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getMinimumNetworkChunkBytes", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/job/JobWorkItem.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/KeyguardManager.cs b/src/net/Netdroid/Generated/Android/App/KeyguardManager.cs
index 30465bf64..eaa36bb88 100644
--- a/src/net/Netdroid/Generated/Android/App/KeyguardManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/KeyguardManager.cs
@@ -50,7 +50,7 @@ public partial class KeyguardManager
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.KeyguardManager.KeyguardLock"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.KeyguardManager.KeyguardLock NewKeyguardLock(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.App.KeyguardManager.KeyguardLock>("newKeyguardLock", "(Ljava/lang/String;)Landroid/app/KeyguardManager$KeyguardLock;", arg0);
@@ -61,7 +61,7 @@ public Android.App.KeyguardManager.KeyguardLock NewKeyguardLock(Java.Lang.String
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Android.Content.Intent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Intent CreateConfirmDeviceCredentialIntent(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1)
         {
             return IExecute<Android.Content.Intent>("createConfirmDeviceCredentialIntent", arg0, arg1);
@@ -70,7 +70,7 @@ public Android.Content.Intent CreateConfirmDeviceCredentialIntent(Java.Lang.Char
         /// <see href="https://developer.android.com/reference/android/app/KeyguardManager.html#inKeyguardRestrictedInputMode()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool InKeyguardRestrictedInputMode()
         {
             return IExecuteWithSignature<bool>("inKeyguardRestrictedInputMode", "()Z");
@@ -120,7 +120,7 @@ public void AddKeyguardLockedStateListener(Java.Util.Concurrent.Executor arg0, A
         /// <see href="https://developer.android.com/reference/android/app/KeyguardManager.html#exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.KeyguardManager.OnKeyguardExitResult"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ExitKeyguardSecurely(Android.App.KeyguardManager.OnKeyguardExitResult arg0)
         {
             IExecuteWithSignature("exitKeyguardSecurely", "(Landroid/app/KeyguardManager$OnKeyguardExitResult;)V", arg0);
@@ -221,7 +221,7 @@ public partial class KeyguardLock
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/KeyguardManager.KeyguardLock.html#disableKeyguard()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void DisableKeyguard()
             {
                 IExecuteWithSignature("disableKeyguard", "()V");
@@ -229,7 +229,7 @@ public void DisableKeyguard()
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/KeyguardManager.KeyguardLock.html#reenableKeyguard()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void ReenableKeyguard()
             {
                 IExecuteWithSignature("reenableKeyguard", "()V");
@@ -270,7 +270,7 @@ public partial class KeyguardLockedStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onKeyguardLockedStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnKeyguardLockedStateChangedEventHandler));
+                AddEventHandler("onKeyguardLockedStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnKeyguardLockedStateChangedEventHandler));
 
             }
 
@@ -278,7 +278,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/KeyguardManager.KeyguardLockedStateListener.html#onKeyguardLockedStateChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnKeyguardLockedStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnKeyguardLockedStateChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnKeyguardLockedStateChanged { get; set; } = null;
 
             void OnKeyguardLockedStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -368,7 +368,7 @@ public partial class OnKeyguardExitResult
             /// <see href="https://developer.android.com/reference/android/app/KeyguardManager.OnKeyguardExitResult.html#onKeyguardExitResult(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnKeyguardExitResultMethod(bool arg0)
             {
                 IExecuteWithSignature("onKeyguardExitResult", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/LauncherActivity.cs b/src/net/Netdroid/Generated/Android/App/LauncherActivity.cs
index 13371d266..bd13985dc 100644
--- a/src/net/Netdroid/Generated/Android/App/LauncherActivity.cs
+++ b/src/net/Netdroid/Generated/Android/App/LauncherActivity.cs
@@ -49,7 +49,7 @@ public partial class LauncherActivity
         /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.html#makeListItems()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.App.LauncherActivity.ListItem> MakeListItems()
         {
             return IExecuteWithSignature<Java.Util.List<Android.App.LauncherActivity.ListItem>>("makeListItems", "()Ljava/util/List;");
@@ -66,7 +66,7 @@ public partial class IconResizer
             /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.IconResizer.html#%3Cinit%3E(android.app.LauncherActivity)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.LauncherActivity"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public IconResizer(Android.App.LauncherActivity arg0)
                 : base(arg0)
             {
@@ -92,7 +92,7 @@ public IconResizer(Android.App.LauncherActivity arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
             /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Drawable.Drawable CreateIconThumbnail(Android.Graphics.Drawable.Drawable arg0)
             {
                 return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("createIconThumbnail", "(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;", arg0);
@@ -123,32 +123,32 @@ public partial class ListItem
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.ListItem.html#resolveInfo"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Content.Pm.ResolveInfo resolveInfo { get { return IGetField<Android.Content.Pm.ResolveInfo>("resolveInfo"); } set { ISetField("resolveInfo", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.ListItem.html#icon"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Drawable.Drawable icon { get { return IGetField<Android.Graphics.Drawable.Drawable>("icon"); } set { ISetField("icon", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.ListItem.html#extras"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Os.Bundle extras { get { return IGetField<Android.Os.Bundle>("extras"); } set { ISetField("extras", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.ListItem.html#label"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence label { get { return IGetField<Java.Lang.CharSequence>("label"); } set { ISetField("label", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.ListItem.html#className"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.String className { get { return IGetField<Java.Lang.String>("className"); } set { ISetField("className", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/LauncherActivity.ListItem.html#packageName"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.String packageName { get { return IGetField<Java.Lang.String>("packageName"); } set { ISetField("packageName", value); } }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/ListActivity.cs b/src/net/Netdroid/Generated/Android/App/ListActivity.cs
index ea07b4a94..48cea2001 100644
--- a/src/net/Netdroid/Generated/Android/App/ListActivity.cs
+++ b/src/net/Netdroid/Generated/Android/App/ListActivity.cs
@@ -46,42 +46,64 @@ public partial class ListActivity
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getListAdapter()"/> <see href="https://developer.android.com/reference/android/app/ListActivity.html#setListAdapter(android.widget.ListAdapter)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getListAdapter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.ListAdapter ListAdapter
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ListAdapter GetListAdapter()
         {
-            get { return IExecuteWithSignature<Android.Widget.ListAdapter>("getListAdapter", "()Landroid/widget/ListAdapter;"); } set { IExecuteWithSignature("setListAdapter", "(Landroid/widget/ListAdapter;)V", value); }
+            return IExecuteWithSignature<Android.Widget.ListAdapter>("getListAdapter", "()Landroid/widget/ListAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getListView()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getListAdapter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.ListView ListView
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ListAdapter GetListAdapterDirect()
         {
-            get { return IExecuteWithSignature<Android.Widget.ListView>("getListView", "()Landroid/widget/ListView;"); }
+            return IExecuteWithSignature<Android.Widget.ListAdapterDirect, Android.Widget.ListAdapter>("getListAdapter", "()Landroid/widget/ListAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getSelectedItemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getListView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long SelectedItemId
+        /// <returns><see cref="Android.Widget.ListView"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ListView GetListView()
         {
-            get { return IExecuteWithSignature<long>("getSelectedItemId", "()J"); }
+            return IExecuteWithSignature<Android.Widget.ListView>("getListView", "()Landroid/widget/ListView;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getSelectedItemPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getSelectedItemPosition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SelectedItemPosition
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSelectedItemPosition()
         {
-            get { return IExecuteWithSignature<int>("getSelectedItemPosition", "()I"); }
+            return IExecuteWithSignature<int>("getSelectedItemPosition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#getSelectedItemId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetSelectedItemId()
+        {
+            return IExecuteWithSignature<long>("getSelectedItemId", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#setListAdapter(android.widget.ListAdapter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Widget.ListAdapter"/></param>
+        [global::System.Obsolete()]
+        public void SetListAdapter(Android.Widget.ListAdapter arg0)
+        {
+            IExecuteWithSignature("setListAdapter", "(Landroid/widget/ListAdapter;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ListActivity.html#setSelection(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSelection(int arg0)
         {
             IExecuteWithSignature("setSelection", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/ListFragment.cs b/src/net/Netdroid/Generated/Android/App/ListFragment.cs
index e31edab93..3fb1234e7 100644
--- a/src/net/Netdroid/Generated/Android/App/ListFragment.cs
+++ b/src/net/Netdroid/Generated/Android/App/ListFragment.cs
@@ -46,36 +46,49 @@ public partial class ListFragment
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getListAdapter()"/> <see href="https://developer.android.com/reference/android/app/ListFragment.html#setListAdapter(android.widget.ListAdapter)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getListAdapter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.ListAdapter ListAdapter
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ListAdapter GetListAdapter()
         {
-            get { return IExecuteWithSignature<Android.Widget.ListAdapter>("getListAdapter", "()Landroid/widget/ListAdapter;"); } set { IExecuteWithSignature("setListAdapter", "(Landroid/widget/ListAdapter;)V", value); }
+            return IExecuteWithSignature<Android.Widget.ListAdapter>("getListAdapter", "()Landroid/widget/ListAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getListView()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getListAdapter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.ListView ListView
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ListAdapter GetListAdapterDirect()
         {
-            get { return IExecuteWithSignature<Android.Widget.ListView>("getListView", "()Landroid/widget/ListView;"); }
+            return IExecuteWithSignature<Android.Widget.ListAdapterDirect, Android.Widget.ListAdapter>("getListAdapter", "()Landroid/widget/ListAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getSelectedItemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getListView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long SelectedItemId
+        /// <returns><see cref="Android.Widget.ListView"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ListView GetListView()
         {
-            get { return IExecuteWithSignature<long>("getSelectedItemId", "()J"); }
+            return IExecuteWithSignature<Android.Widget.ListView>("getListView", "()Landroid/widget/ListView;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getSelectedItemPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getSelectedItemPosition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SelectedItemPosition
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSelectedItemPosition()
         {
-            get { return IExecuteWithSignature<int>("getSelectedItemPosition", "()I"); }
+            return IExecuteWithSignature<int>("getSelectedItemPosition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#getSelectedItemId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetSelectedItemId()
+        {
+            return IExecuteWithSignature<long>("getSelectedItemId", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#onListItemClick(android.widget.ListView,android.view.View,int,long)"/>
@@ -84,7 +97,7 @@ public int SelectedItemPosition
         /// <param name="arg1"><see cref="Android.View.View"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnListItemClick(Android.Widget.ListView arg0, Android.View.View arg1, int arg2, long arg3)
         {
             IExecute("onListItemClick", arg0, arg1, arg2, arg3);
@@ -93,16 +106,25 @@ public void OnListItemClick(Android.Widget.ListView arg0, Android.View.View arg1
         /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#setEmptyText(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEmptyText(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setEmptyText", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#setListAdapter(android.widget.ListAdapter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Widget.ListAdapter"/></param>
+        [global::System.Obsolete()]
+        public void SetListAdapter(Android.Widget.ListAdapter arg0)
+        {
+            IExecuteWithSignature("setListAdapter", "(Landroid/widget/ListAdapter;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#setListShown(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetListShown(bool arg0)
         {
             IExecuteWithSignature("setListShown", "(Z)V", arg0);
@@ -111,7 +133,7 @@ public void SetListShown(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#setListShownNoAnimation(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetListShownNoAnimation(bool arg0)
         {
             IExecuteWithSignature("setListShownNoAnimation", "(Z)V", arg0);
@@ -120,7 +142,7 @@ public void SetListShownNoAnimation(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/ListFragment.html#setSelection(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSelection(int arg0)
         {
             IExecuteWithSignature("setSelection", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/LoaderManager.cs b/src/net/Netdroid/Generated/Android/App/LoaderManager.cs
index d960240e2..2dcb04f1d 100644
--- a/src/net/Netdroid/Generated/Android/App/LoaderManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/LoaderManager.cs
@@ -45,7 +45,7 @@ public partial class LoaderManager
         /// <see href="https://developer.android.com/reference/android/app/LoaderManager.html#enableDebugLogging(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void EnableDebugLogging(bool arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "enableDebugLogging", "(Z)V", arg0);
@@ -60,7 +60,7 @@ public static void EnableDebugLogging(bool arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <typeparam name="D"></typeparam>
         /// <returns><see cref="Android.Content.Loader"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Loader<D> GetLoader<D>(int arg0)
         {
             return IExecuteWithSignature<Android.Content.Loader<D>>("getLoader", "(I)Landroid/content/Loader;", arg0);
@@ -73,7 +73,7 @@ public Android.Content.Loader<D> GetLoader<D>(int arg0)
         /// <param name="arg2"><see cref="Android.App.LoaderManager.LoaderCallbacks"/></param>
         /// <typeparam name="D"></typeparam>
         /// <returns><see cref="Android.Content.Loader"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Loader<D> InitLoader<D>(int arg0, Android.Os.Bundle arg1, Android.App.LoaderManager.LoaderCallbacks<D> arg2)
         {
             return IExecute<Android.Content.Loader<D>>("initLoader", arg0, arg1, arg2);
@@ -86,7 +86,7 @@ public Android.Content.Loader<D> InitLoader<D>(int arg0, Android.Os.Bundle arg1,
         /// <param name="arg2"><see cref="Android.App.LoaderManager.LoaderCallbacks"/></param>
         /// <typeparam name="D"></typeparam>
         /// <returns><see cref="Android.Content.Loader"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Loader<D> RestartLoader<D>(int arg0, Android.Os.Bundle arg1, Android.App.LoaderManager.LoaderCallbacks<D> arg2)
         {
             return IExecute<Android.Content.Loader<D>>("restartLoader", arg0, arg1, arg2);
@@ -95,7 +95,7 @@ public Android.Content.Loader<D> RestartLoader<D>(int arg0, Android.Os.Bundle ar
         /// <see href="https://developer.android.com/reference/android/app/LoaderManager.html#destroyLoader(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DestroyLoader(int arg0)
         {
             IExecuteWithSignature("destroyLoader", "(I)V", arg0);
@@ -107,7 +107,7 @@ public void DestroyLoader(int arg0)
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg2"><see cref="Java.Io.PrintWriter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.PrintWriter arg2, Java.Lang.String[] arg3)
         {
             IExecute("dump", arg0, arg1, arg2, arg3);
@@ -142,7 +142,7 @@ public partial class LoaderCallbacks
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
             /// <returns><see cref="Android.Content.Loader"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Content.Loader OnCreateLoader(int arg0, Android.Os.Bundle arg1)
             {
                 return IExecute<Android.Content.Loader>("onCreateLoader", arg0, arg1);
@@ -151,7 +151,7 @@ public Android.Content.Loader OnCreateLoader(int arg0, Android.Os.Bundle arg1)
             /// <see href="https://developer.android.com/reference/android/app/LoaderManager.LoaderCallbacks.html#onLoaderReset(android.content.Loader)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnLoaderReset(Android.Content.Loader arg0)
             {
                 IExecuteWithSignature("onLoaderReset", "(Landroid/content/Loader;)V", arg0);
@@ -161,7 +161,7 @@ public void OnLoaderReset(Android.Content.Loader arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
             /// <param name="arg1"><see cref="object"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnLoadFinished(Android.Content.Loader arg0, object arg1)
             {
                 IExecute("onLoadFinished", arg0, arg1);
@@ -207,7 +207,7 @@ public partial class LoaderCallbacks<D>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
             /// <returns><see cref="Android.Content.Loader"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Content.Loader<D> OnCreateLoader(int arg0, Android.Os.Bundle arg1)
             {
                 return IExecute<Android.Content.Loader<D>>("onCreateLoader", arg0, arg1);
@@ -216,7 +216,7 @@ public Android.Content.Loader<D> OnCreateLoader(int arg0, Android.Os.Bundle arg1
             /// <see href="https://developer.android.com/reference/android/app/LoaderManager.LoaderCallbacks.html#onLoaderReset(android.content.Loader)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnLoaderReset(Android.Content.Loader<D> arg0)
             {
                 IExecuteWithSignature("onLoaderReset", "(Landroid/content/Loader;)V", arg0);
@@ -226,7 +226,7 @@ public void OnLoaderReset(Android.Content.Loader<D> arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
             /// <param name="arg1"><typeparamref name="D"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnLoadFinished(Android.Content.Loader<D> arg0, D arg1)
             {
                 IExecute("onLoadFinished", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/App/LocalActivityManager.cs b/src/net/Netdroid/Generated/Android/App/LocalActivityManager.cs
index 43ab95fde..4162bc679 100644
--- a/src/net/Netdroid/Generated/Android/App/LocalActivityManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/LocalActivityManager.cs
@@ -34,7 +34,7 @@ public partial class LocalActivityManager
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public LocalActivityManager(Android.App.Activity arg0, bool arg1)
             : base(arg0, arg1)
         {
@@ -56,36 +56,29 @@ public LocalActivityManager(Android.App.Activity arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#getCurrentActivity()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.App.Activity CurrentActivity
-        {
-            get { return IExecuteWithSignature<Android.App.Activity>("getCurrentActivity", "()Landroid/app/Activity;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#getCurrentId()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String CurrentId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCurrentId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#getActivity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.App.Activity"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.App.Activity GetActivity(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.App.Activity>("getActivity", "(Ljava/lang/String;)Landroid/app/Activity;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#getCurrentActivity()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.Activity"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Activity GetCurrentActivity()
+        {
+            return IExecuteWithSignature<Android.App.Activity>("getCurrentActivity", "()Landroid/app/Activity;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#saveInstanceState()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.Bundle"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.Bundle SaveInstanceState()
         {
             return IExecuteWithSignature<Android.Os.Bundle>("saveInstanceState", "()Landroid/os/Bundle;");
@@ -96,7 +89,7 @@ public Android.Os.Bundle SaveInstanceState()
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="Android.View.Window"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.Window DestroyActivity(Java.Lang.String arg0, bool arg1)
         {
             return IExecute<Android.View.Window>("destroyActivity", arg0, arg1);
@@ -107,16 +100,25 @@ public Android.View.Window DestroyActivity(Java.Lang.String arg0, bool arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.Content.Intent"/></param>
         /// <returns><see cref="Android.View.Window"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.Window StartActivity(Java.Lang.String arg0, Android.Content.Intent arg1)
         {
             return IExecute<Android.View.Window>("startActivity", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#getCurrentId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetCurrentId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCurrentId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#dispatchCreate(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchCreate(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("dispatchCreate", "(Landroid/os/Bundle;)V", arg0);
@@ -125,7 +127,7 @@ public void DispatchCreate(Android.Os.Bundle arg0)
         /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#dispatchDestroy(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchDestroy(bool arg0)
         {
             IExecuteWithSignature("dispatchDestroy", "(Z)V", arg0);
@@ -134,7 +136,7 @@ public void DispatchDestroy(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#dispatchPause(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchPause(bool arg0)
         {
             IExecuteWithSignature("dispatchPause", "(Z)V", arg0);
@@ -142,7 +144,7 @@ public void DispatchPause(bool arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#dispatchResume()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchResume()
         {
             IExecuteWithSignature("dispatchResume", "()V");
@@ -150,7 +152,7 @@ public void DispatchResume()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#dispatchStop()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchStop()
         {
             IExecuteWithSignature("dispatchStop", "()V");
@@ -158,7 +160,7 @@ public void DispatchStop()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LocalActivityManager.html#removeAllActivities()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveAllActivities()
         {
             IExecuteWithSignature("removeAllActivities", "()V");
diff --git a/src/net/Netdroid/Generated/Android/App/LocaleConfig.cs b/src/net/Netdroid/Generated/Android/App/LocaleConfig.cs
index 63aa01940..771b8b5bb 100644
--- a/src/net/Netdroid/Generated/Android/App/LocaleConfig.cs
+++ b/src/net/Netdroid/Generated/Android/App/LocaleConfig.cs
@@ -107,26 +107,28 @@ public static Android.App.LocaleConfig FromContextIgnoringOverride(Android.Conte
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/LocaleConfig.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/LocaleConfig.html#getSupportedLocales()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetSupportedLocales()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getSupportedLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/LocaleConfig.html#getSupportedLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/LocaleConfig.html#describeContents()"/>
         /// </summary>
-        public Android.Os.LocaleList SupportedLocales
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getSupportedLocales", "()Landroid/os/LocaleList;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/LocaleConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/LocaleConfig.html#getStatus()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetStatus()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LocaleConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/LocaleManager.cs b/src/net/Netdroid/Generated/Android/App/LocaleManager.cs
index 62bbdf32e..ba257823f 100644
--- a/src/net/Netdroid/Generated/Android/App/LocaleManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/LocaleManager.cs
@@ -46,25 +46,20 @@ public partial class LocaleManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#getApplicationLocales()"/> <see href="https://developer.android.com/reference/android/app/LocaleManager.html#setApplicationLocales(android.os.LocaleList)"/>
+        /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#getOverrideLocaleConfig()"/>
         /// </summary>
-        public Android.Os.LocaleList ApplicationLocales
+        /// <returns><see cref="Android.App.LocaleConfig"/></returns>
+        public Android.App.LocaleConfig GetOverrideLocaleConfig()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getApplicationLocales", "()Landroid/os/LocaleList;"); } set { IExecuteWithSignature("setApplicationLocales", "(Landroid/os/LocaleList;)V", value); }
+            return IExecuteWithSignature<Android.App.LocaleConfig>("getOverrideLocaleConfig", "()Landroid/app/LocaleConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#getOverrideLocaleConfig()"/> <see href="https://developer.android.com/reference/android/app/LocaleManager.html#setOverrideLocaleConfig(android.app.LocaleConfig)"/>
+        /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#getApplicationLocales()"/>
         /// </summary>
-        public Android.App.LocaleConfig OverrideLocaleConfig
-        {
-            get { return IExecuteWithSignature<Android.App.LocaleConfig>("getOverrideLocaleConfig", "()Landroid/app/LocaleConfig;"); } set { IExecuteWithSignature("setOverrideLocaleConfig", "(Landroid/app/LocaleConfig;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#getSystemLocales()"/> 
-        /// </summary>
-        public Android.Os.LocaleList SystemLocales
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetApplicationLocales()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getSystemLocales", "()Landroid/os/LocaleList;"); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getApplicationLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#getApplicationLocales(java.lang.String)"/>
@@ -75,6 +70,30 @@ public Android.Os.LocaleList GetApplicationLocales(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Os.LocaleList>("getApplicationLocales", "(Ljava/lang/String;)Landroid/os/LocaleList;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#getSystemLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetSystemLocales()
+        {
+            return IExecuteWithSignature<Android.Os.LocaleList>("getSystemLocales", "()Landroid/os/LocaleList;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#setApplicationLocales(android.os.LocaleList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.LocaleList"/></param>
+        public void SetApplicationLocales(Android.Os.LocaleList arg0)
+        {
+            IExecuteWithSignature("setApplicationLocales", "(Landroid/os/LocaleList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/LocaleManager.html#setOverrideLocaleConfig(android.app.LocaleConfig)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.LocaleConfig"/></param>
+        public void SetOverrideLocaleConfig(Android.App.LocaleConfig arg0)
+        {
+            IExecuteWithSignature("setOverrideLocaleConfig", "(Landroid/app/LocaleConfig;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/App/MediaRouteButton.cs b/src/net/Netdroid/Generated/Android/App/MediaRouteButton.cs
index 461e91a76..b6eb0707b 100644
--- a/src/net/Netdroid/Generated/Android/App/MediaRouteButton.cs
+++ b/src/net/Netdroid/Generated/Android/App/MediaRouteButton.cs
@@ -84,11 +84,12 @@ public MediaRouteButton(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/MediaRouteButton.html#getRouteTypes()"/> <see href="https://developer.android.com/reference/android/app/MediaRouteButton.html#setRouteTypes(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/MediaRouteButton.html#getRouteTypes()"/>
         /// </summary>
-        public int RouteTypes
+        /// <returns><see cref="int"/></returns>
+        public int GetRouteTypes()
         {
-            get { return IExecuteWithSignature<int>("getRouteTypes", "()I"); } set { IExecuteWithSignature("setRouteTypes", "(I)V", value); }
+            return IExecuteWithSignature<int>("getRouteTypes", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/MediaRouteButton.html#onAttachedToWindow()"/>
@@ -113,6 +114,14 @@ public void SetExtendedSettingsClickListener(Android.View.View.OnClickListener a
             IExecuteWithSignature("setExtendedSettingsClickListener", "(Landroid/view/View$OnClickListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/MediaRouteButton.html#setRouteTypes(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRouteTypes(int arg0)
+        {
+            IExecuteWithSignature("setRouteTypes", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/MediaRouteButton.html#showDialog()"/>
         /// </summary>
         public void ShowDialog()
diff --git a/src/net/Netdroid/Generated/Android/App/Notification.cs b/src/net/Netdroid/Generated/Android/App/Notification.cs
index eb61d3210..0575a60aa 100644
--- a/src/net/Netdroid/Generated/Android/App/Notification.cs
+++ b/src/net/Netdroid/Generated/Android/App/Notification.cs
@@ -43,7 +43,7 @@ public Notification(Android.Os.Parcel arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg2"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
             : base(arg0, arg1, arg2)
         {
@@ -79,17 +79,17 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#largeIcon"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Graphics.Bitmap largeIcon { get { return IGetField<Android.Graphics.Bitmap>("largeIcon"); } set { ISetField("largeIcon", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#audioAttributes"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Media.AudioAttributes audioAttributes { get { return IGetField<Android.Media.AudioAttributes>("audioAttributes"); } set { ISetField("audioAttributes", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#sound"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.Uri sound { get { return IGetField<Android.Net.Uri>("sound"); } set { ISetField("sound", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#extras"/>
@@ -98,27 +98,27 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#bigContentView"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Widget.RemoteViews bigContentView { get { return IGetField<Android.Widget.RemoteViews>("bigContentView"); } set { ISetField("bigContentView", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#contentView"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Widget.RemoteViews contentView { get { return IGetField<Android.Widget.RemoteViews>("contentView"); } set { ISetField("contentView", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#headsUpContentView"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Widget.RemoteViews headsUpContentView { get { return IGetField<Android.Widget.RemoteViews>("headsUpContentView"); } set { ISetField("headsUpContentView", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#tickerView"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Widget.RemoteViews tickerView { get { return IGetField<Android.Widget.RemoteViews>("tickerView"); } set { ISetField("tickerView", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#audioStreamType"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int audioStreamType { get { return IGetField<int>("audioStreamType"); } set { ISetField("audioStreamType", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#color"/>
@@ -127,7 +127,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#defaults"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int defaults { get { return IGetField<int>("defaults"); } set { ISetField("defaults", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#flags"/>
@@ -136,7 +136,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#icon"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int icon { get { return IGetField<int>("icon"); } set { ISetField("icon", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#iconLevel"/>
@@ -145,17 +145,17 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#ledARGB"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int ledARGB { get { return IGetField<int>("ledARGB"); } set { ISetField("ledARGB", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#ledOffMS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int ledOffMS { get { return IGetField<int>("ledOffMS"); } set { ISetField("ledOffMS", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#ledOnMS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int ledOnMS { get { return IGetField<int>("ledOnMS"); } set { ISetField("ledOnMS", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#number"/>
@@ -164,7 +164,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#priority"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int priority { get { return IGetField<int>("priority"); } set { ISetField("priority", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#visibility"/>
@@ -185,7 +185,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#vibrate"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long[] vibrate { get { return IGetFieldArray<long>("vibrate"); } set { ISetField("vibrate", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#AUDIO_ATTRIBUTES_DEFAULT"/>
@@ -274,7 +274,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#FLAG_HIGH_PRIORITY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_HIGH_PRIORITY { get { if (!_FLAG_HIGH_PRIORITYReady) { _FLAG_HIGH_PRIORITYContent = SGetField<int>(LocalBridgeClazz, "FLAG_HIGH_PRIORITY"); _FLAG_HIGH_PRIORITYReady = true; } return _FLAG_HIGH_PRIORITYContent; } }
         private static int _FLAG_HIGH_PRIORITYContent = default;
         private static bool _FLAG_HIGH_PRIORITYReady = false; // this is used because in case of generics 
@@ -311,7 +311,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#FLAG_SHOW_LIGHTS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_SHOW_LIGHTS { get { if (!_FLAG_SHOW_LIGHTSReady) { _FLAG_SHOW_LIGHTSContent = SGetField<int>(LocalBridgeClazz, "FLAG_SHOW_LIGHTS"); _FLAG_SHOW_LIGHTSReady = true; } return _FLAG_SHOW_LIGHTSContent; } }
         private static int _FLAG_SHOW_LIGHTSContent = default;
         private static bool _FLAG_SHOW_LIGHTSReady = false; // this is used because in case of generics 
@@ -354,42 +354,42 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#PRIORITY_DEFAULT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PRIORITY_DEFAULT { get { if (!_PRIORITY_DEFAULTReady) { _PRIORITY_DEFAULTContent = SGetField<int>(LocalBridgeClazz, "PRIORITY_DEFAULT"); _PRIORITY_DEFAULTReady = true; } return _PRIORITY_DEFAULTContent; } }
         private static int _PRIORITY_DEFAULTContent = default;
         private static bool _PRIORITY_DEFAULTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#PRIORITY_HIGH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PRIORITY_HIGH { get { if (!_PRIORITY_HIGHReady) { _PRIORITY_HIGHContent = SGetField<int>(LocalBridgeClazz, "PRIORITY_HIGH"); _PRIORITY_HIGHReady = true; } return _PRIORITY_HIGHContent; } }
         private static int _PRIORITY_HIGHContent = default;
         private static bool _PRIORITY_HIGHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#PRIORITY_LOW"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PRIORITY_LOW { get { if (!_PRIORITY_LOWReady) { _PRIORITY_LOWContent = SGetField<int>(LocalBridgeClazz, "PRIORITY_LOW"); _PRIORITY_LOWReady = true; } return _PRIORITY_LOWContent; } }
         private static int _PRIORITY_LOWContent = default;
         private static bool _PRIORITY_LOWReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#PRIORITY_MAX"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PRIORITY_MAX { get { if (!_PRIORITY_MAXReady) { _PRIORITY_MAXContent = SGetField<int>(LocalBridgeClazz, "PRIORITY_MAX"); _PRIORITY_MAXReady = true; } return _PRIORITY_MAXContent; } }
         private static int _PRIORITY_MAXContent = default;
         private static bool _PRIORITY_MAXReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#PRIORITY_MIN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PRIORITY_MIN { get { if (!_PRIORITY_MINReady) { _PRIORITY_MINContent = SGetField<int>(LocalBridgeClazz, "PRIORITY_MIN"); _PRIORITY_MINReady = true; } return _PRIORITY_MINContent; } }
         private static int _PRIORITY_MINContent = default;
         private static bool _PRIORITY_MINReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#STREAM_DEFAULT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STREAM_DEFAULT { get { if (!_STREAM_DEFAULTReady) { _STREAM_DEFAULTContent = SGetField<int>(LocalBridgeClazz, "STREAM_DEFAULT"); _STREAM_DEFAULTReady = true; } return _STREAM_DEFAULTContent; } }
         private static int _STREAM_DEFAULTContent = default;
         private static bool _STREAM_DEFAULTReady = false; // this is used because in case of generics 
@@ -654,7 +654,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#EXTRA_LARGE_ICON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_LARGE_ICON { get { if (!_EXTRA_LARGE_ICONReady) { _EXTRA_LARGE_ICONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_LARGE_ICON"); _EXTRA_LARGE_ICONReady = true; } return _EXTRA_LARGE_ICONContent; } }
         private static Java.Lang.String _EXTRA_LARGE_ICONContent = default;
         private static bool _EXTRA_LARGE_ICONReady = false; // this is used because in case of generics 
@@ -697,7 +697,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#EXTRA_PEOPLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_PEOPLE { get { if (!_EXTRA_PEOPLEReady) { _EXTRA_PEOPLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PEOPLE"); _EXTRA_PEOPLEReady = true; } return _EXTRA_PEOPLEContent; } }
         private static Java.Lang.String _EXTRA_PEOPLEContent = default;
         private static bool _EXTRA_PEOPLEReady = false; // this is used because in case of generics 
@@ -758,7 +758,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#EXTRA_SELF_DISPLAY_NAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SELF_DISPLAY_NAME { get { if (!_EXTRA_SELF_DISPLAY_NAMEReady) { _EXTRA_SELF_DISPLAY_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SELF_DISPLAY_NAME"); _EXTRA_SELF_DISPLAY_NAMEReady = true; } return _EXTRA_SELF_DISPLAY_NAMEContent; } }
         private static Java.Lang.String _EXTRA_SELF_DISPLAY_NAMEContent = default;
         private static bool _EXTRA_SELF_DISPLAY_NAMEReady = false; // this is used because in case of generics 
@@ -783,7 +783,7 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#EXTRA_SMALL_ICON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SMALL_ICON { get { if (!_EXTRA_SMALL_ICONReady) { _EXTRA_SMALL_ICONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SMALL_ICON"); _EXTRA_SMALL_ICONReady = true; } return _EXTRA_SMALL_ICONContent; } }
         private static Java.Lang.String _EXTRA_SMALL_ICONContent = default;
         private static bool _EXTRA_SMALL_ICONReady = false; // this is used because in case of generics 
@@ -856,135 +856,149 @@ public Notification(int arg0, Java.Lang.CharSequence arg1, long arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getAllowSystemGeneratedContextualActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#clone()"/>
         /// </summary>
-        public bool AllowSystemGeneratedContextualActions
+        /// <returns><see cref="Android.App.Notification"/></returns>
+        public Android.App.Notification Clone()
         {
-            get { return IExecuteWithSignature<bool>("getAllowSystemGeneratedContextualActions", "()Z"); }
+            return IExecuteWithSignature<Android.App.Notification>("clone", "()Landroid/app/Notification;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getBadgeIconType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getBubbleMetadata()"/>
         /// </summary>
-        public int BadgeIconType
+        /// <returns><see cref="Android.App.Notification.BubbleMetadata"/></returns>
+        public Android.App.Notification.BubbleMetadata GetBubbleMetadata()
         {
-            get { return IExecuteWithSignature<int>("getBadgeIconType", "()I"); }
+            return IExecuteWithSignature<Android.App.Notification.BubbleMetadata>("getBubbleMetadata", "()Landroid/app/Notification$BubbleMetadata;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getChannelId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getLocusId()"/>
         /// </summary>
-        public Java.Lang.String ChannelId
+        /// <returns><see cref="Android.Content.LocusId"/></returns>
+        public Android.Content.LocusId GetLocusId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getChannelId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getContextualActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getLargeIcon()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Notification.Action> ContextualActions
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetLargeIcon()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Notification.Action>>("getContextualActions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getLargeIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getBubbleMetadata()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getSmallIcon()"/>
         /// </summary>
-        public Android.App.Notification.BubbleMetadata GetBubbleMetadata
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetSmallIcon()
         {
-            get { return IExecuteWithSignature<Android.App.Notification.BubbleMetadata>("getBubbleMetadata", "()Landroid/app/Notification$BubbleMetadata;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getSmallIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getGroup()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#findRemoteInputActionPair(boolean)"/>
         /// </summary>
-        public Java.Lang.String Group
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <returns><see cref="Android.Util.Pair"/></returns>
+        public Android.Util.Pair<Android.App.RemoteInput, Android.App.Notification.Action> FindRemoteInputActionPair(bool arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGroup", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Util.Pair<Android.App.RemoteInput, Android.App.Notification.Action>>("findRemoteInputActionPair", "(Z)Landroid/util/Pair;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getGroupAlertBehavior()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getAllowSystemGeneratedContextualActions()"/>
         /// </summary>
-        public int GroupAlertBehavior
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowSystemGeneratedContextualActions()
         {
-            get { return IExecuteWithSignature<int>("getGroupAlertBehavior", "()I"); }
+            return IExecuteWithSignature<bool>("getAllowSystemGeneratedContextualActions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getLargeIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#hasImage()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon LargeIcon
+        /// <returns><see cref="bool"/></returns>
+        public bool HasImage()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getLargeIcon", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<bool>("hasImage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getLocusId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#describeContents()"/>
         /// </summary>
-        public Android.Content.LocusId LocusId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getSettingsText()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getBadgeIconType()"/>
         /// </summary>
-        public Java.Lang.CharSequence SettingsText
+        /// <returns><see cref="int"/></returns>
+        public int GetBadgeIconType()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSettingsText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getBadgeIconType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getShortcutId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getGroupAlertBehavior()"/>
         /// </summary>
-        public Java.Lang.String ShortcutId
+        /// <returns><see cref="int"/></returns>
+        public int GetGroupAlertBehavior()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getShortcutId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getGroupAlertBehavior", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getSmallIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getSettingsText()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon SmallIcon
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSettingsText()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getSmallIcon", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSettingsText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getSortKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getChannelId()"/>
         /// </summary>
-        public Java.Lang.String SortKey
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetChannelId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSortKey", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getChannelId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getTimeoutAfter()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getGroup()"/>
         /// </summary>
-        public long TimeoutAfter
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGroup()
         {
-            get { return IExecuteWithSignature<long>("getTimeoutAfter", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getGroup", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getShortcutId()"/>
         /// </summary>
-        /// <returns><see cref="Android.App.Notification"/></returns>
-        public Android.App.Notification Clone()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetShortcutId()
         {
-            return IExecuteWithSignature<Android.App.Notification>("clone", "()Landroid/app/Notification;");
+            return IExecuteWithSignature<Java.Lang.String>("getShortcutId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#findRemoteInputActionPair(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getSortKey()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <returns><see cref="Android.Util.Pair"/></returns>
-        public Android.Util.Pair<Android.App.RemoteInput, Android.App.Notification.Action> FindRemoteInputActionPair(bool arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSortKey()
         {
-            return IExecuteWithSignature<Android.Util.Pair<Android.App.RemoteInput, Android.App.Notification.Action>>("findRemoteInputActionPair", "(Z)Landroid/util/Pair;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSortKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#hasImage()"/>
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getContextualActions()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasImage()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Notification.Action> GetContextualActions()
         {
-            return IExecuteWithSignature<bool>("hasImage", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.App.Notification.Action>>("getContextualActions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Notification.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/Notification.html#getTimeoutAfter()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimeoutAfter()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTimeoutAfter", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Notification.html#writeToParcel(android.os.Parcel,int)"/>
@@ -1009,7 +1023,7 @@ public partial class Action
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
             /// <param name="arg2"><see cref="Android.App.PendingIntent"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Action(int arg0, Java.Lang.CharSequence arg1, Android.App.PendingIntent arg2)
                 : base(arg0, arg1, arg2)
             {
@@ -1029,7 +1043,7 @@ public Action(int arg0, Java.Lang.CharSequence arg1, Android.App.PendingIntent a
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#icon"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int icon { get { return IGetField<int>("icon"); } set { ISetField("icon", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#title"/>
@@ -1116,54 +1130,52 @@ public Action(int arg0, Java.Lang.CharSequence arg1, Android.App.PendingIntent a
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getAllowGeneratedReplies()"/> 
-            /// </summary>
-            public bool AllowGeneratedReplies
-            {
-                get { return IExecuteWithSignature<bool>("getAllowGeneratedReplies", "()Z"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getDataOnlyRemoteInputs()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#clone()"/>
             /// </summary>
-            public Android.App.RemoteInput[] DataOnlyRemoteInputs
+            /// <returns><see cref="Android.App.Notification.Action"/></returns>
+            public Android.App.Notification.Action Clone()
             {
-                get { return IExecuteWithSignatureArray<Android.App.RemoteInput>("getDataOnlyRemoteInputs", "()[Landroid/app/RemoteInput;"); }
+                return IExecuteWithSignature<Android.App.Notification.Action>("clone", "()Landroid/app/Notification$Action;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getDataOnlyRemoteInputs()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="Android.App.RemoteInput"/></returns>
+            public Android.App.RemoteInput[] GetDataOnlyRemoteInputs()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignatureArray<Android.App.RemoteInput>("getDataOnlyRemoteInputs", "()[Landroid/app/RemoteInput;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getIcon()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getRemoteInputs()"/>
             /// </summary>
-            public Android.Graphics.Drawable.Icon Icon
+            /// <returns><see cref="Android.App.RemoteInput"/></returns>
+            public Android.App.RemoteInput[] GetRemoteInputs()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
+                return IExecuteWithSignatureArray<Android.App.RemoteInput>("getRemoteInputs", "()[Landroid/app/RemoteInput;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getRemoteInputs()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getIcon()"/>
             /// </summary>
-            public Android.App.RemoteInput[] RemoteInputs
+            /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+            public Android.Graphics.Drawable.Icon GetIcon()
             {
-                get { return IExecuteWithSignatureArray<Android.App.RemoteInput>("getRemoteInputs", "()[Landroid/app/RemoteInput;"); }
+                return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getSemanticAction()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getExtras()"/>
             /// </summary>
-            public int SemanticAction
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<int>("getSemanticAction", "()I"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#clone()"/>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getAllowGeneratedReplies()"/>
             /// </summary>
-            /// <returns><see cref="Android.App.Notification.Action"/></returns>
-            public Android.App.Notification.Action Clone()
+            /// <returns><see cref="bool"/></returns>
+            public bool GetAllowGeneratedReplies()
             {
-                return IExecuteWithSignature<Android.App.Notification.Action>("clone", "()Landroid/app/Notification$Action;");
+                return IExecuteWithSignature<bool>("getAllowGeneratedReplies", "()Z");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#isAuthenticationRequired()"/>
@@ -1190,6 +1202,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#getSemanticAction()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetSemanticAction()
+            {
+                return IExecuteWithSignature<int>("getSemanticAction", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.Action.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -1231,44 +1251,6 @@ public WearableExtender(Android.App.Notification.Action arg0)
 
                 #region Instance methods
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getCancelLabel()"/> 
-                /// </summary>
-                [System.Obsolete()]
-                public Java.Lang.CharSequence CancelLabel
-                {
-                    get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCancelLabel", "()Ljava/lang/CharSequence;"); }
-                }
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getConfirmLabel()"/> 
-                /// </summary>
-                [System.Obsolete()]
-                public Java.Lang.CharSequence ConfirmLabel
-                {
-                    get { return IExecuteWithSignature<Java.Lang.CharSequence>("getConfirmLabel", "()Ljava/lang/CharSequence;"); }
-                }
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getHintDisplayActionInline()"/> 
-                /// </summary>
-                public bool HintDisplayActionInline
-                {
-                    get { return IExecuteWithSignature<bool>("getHintDisplayActionInline", "()Z"); }
-                }
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getHintLaunchesActivity()"/> 
-                /// </summary>
-                public bool HintLaunchesActivity
-                {
-                    get { return IExecuteWithSignature<bool>("getHintLaunchesActivity", "()Z"); }
-                }
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getInProgressLabel()"/> 
-                /// </summary>
-                [System.Obsolete()]
-                public Java.Lang.CharSequence InProgressLabel
-                {
-                    get { return IExecuteWithSignature<Java.Lang.CharSequence>("getInProgressLabel", "()Ljava/lang/CharSequence;"); }
-                }
-                /// <summary>
                 /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#extend(android.app.Notification.Action.Builder)"/>
                 /// </summary>
                 /// <param name="arg0"><see cref="Android.App.Notification.Action.Builder"/></param>
@@ -1299,7 +1281,7 @@ public Android.App.Notification.Action.WearableExtender SetAvailableOffline(bool
                 /// </summary>
                 /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
                 /// <returns><see cref="Android.App.Notification.Action.WearableExtender"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public Android.App.Notification.Action.WearableExtender SetCancelLabel(Java.Lang.CharSequence arg0)
                 {
                     return IExecuteWithSignature<Android.App.Notification.Action.WearableExtender>("setCancelLabel", "(Ljava/lang/CharSequence;)Landroid/app/Notification$Action$WearableExtender;", arg0);
@@ -1309,7 +1291,7 @@ public Android.App.Notification.Action.WearableExtender SetCancelLabel(Java.Lang
                 /// </summary>
                 /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
                 /// <returns><see cref="Android.App.Notification.Action.WearableExtender"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public Android.App.Notification.Action.WearableExtender SetConfirmLabel(Java.Lang.CharSequence arg0)
                 {
                     return IExecuteWithSignature<Android.App.Notification.Action.WearableExtender>("setConfirmLabel", "(Ljava/lang/CharSequence;)Landroid/app/Notification$Action$WearableExtender;", arg0);
@@ -1337,12 +1319,28 @@ public Android.App.Notification.Action.WearableExtender SetHintLaunchesActivity(
                 /// </summary>
                 /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
                 /// <returns><see cref="Android.App.Notification.Action.WearableExtender"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public Android.App.Notification.Action.WearableExtender SetInProgressLabel(Java.Lang.CharSequence arg0)
                 {
                     return IExecuteWithSignature<Android.App.Notification.Action.WearableExtender>("setInProgressLabel", "(Ljava/lang/CharSequence;)Landroid/app/Notification$Action$WearableExtender;", arg0);
                 }
                 /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getHintDisplayActionInline()"/>
+                /// </summary>
+                /// <returns><see cref="bool"/></returns>
+                public bool GetHintDisplayActionInline()
+                {
+                    return IExecuteWithSignature<bool>("getHintDisplayActionInline", "()Z");
+                }
+                /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getHintLaunchesActivity()"/>
+                /// </summary>
+                /// <returns><see cref="bool"/></returns>
+                public bool GetHintLaunchesActivity()
+                {
+                    return IExecuteWithSignature<bool>("getHintLaunchesActivity", "()Z");
+                }
+                /// <summary>
                 /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#isAvailableOffline()"/>
                 /// </summary>
                 /// <returns><see cref="bool"/></returns>
@@ -1350,6 +1348,33 @@ public bool IsAvailableOffline()
                 {
                     return IExecuteWithSignature<bool>("isAvailableOffline", "()Z");
                 }
+                /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getCancelLabel()"/>
+                /// </summary>
+                /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+                [global::System.Obsolete()]
+                public Java.Lang.CharSequence GetCancelLabel()
+                {
+                    return IExecuteWithSignature<Java.Lang.CharSequence>("getCancelLabel", "()Ljava/lang/CharSequence;");
+                }
+                /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getConfirmLabel()"/>
+                /// </summary>
+                /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+                [global::System.Obsolete()]
+                public Java.Lang.CharSequence GetConfirmLabel()
+                {
+                    return IExecuteWithSignature<Java.Lang.CharSequence>("getConfirmLabel", "()Ljava/lang/CharSequence;");
+                }
+                /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.WearableExtender.html#getInProgressLabel()"/>
+                /// </summary>
+                /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+                [global::System.Obsolete()]
+                public Java.Lang.CharSequence GetInProgressLabel()
+                {
+                    return IExecuteWithSignature<Java.Lang.CharSequence>("getInProgressLabel", "()Ljava/lang/CharSequence;");
+                }
 
                 #endregion
 
@@ -1429,7 +1454,7 @@ public Builder(Android.Graphics.Drawable.Icon arg0, Java.Lang.CharSequence arg1,
                 /// <param name="arg0"><see cref="int"/></param>
                 /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
                 /// <param name="arg2"><see cref="Android.App.PendingIntent"/></param>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public Builder(int arg0, Java.Lang.CharSequence arg1, Android.App.PendingIntent arg2)
                     : base(arg0, arg1, arg2)
                 {
@@ -1451,13 +1476,6 @@ public Builder(int arg0, Java.Lang.CharSequence arg1, Android.App.PendingIntent
 
                 #region Instance methods
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.Builder.html#getExtras()"/> 
-                /// </summary>
-                public Android.Os.Bundle Extras
-                {
-                    get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-                }
-                /// <summary>
                 /// <see href="https://developer.android.com/reference/android/app/Notification.Action.Builder.html#build()"/>
                 /// </summary>
                 /// <returns><see cref="Android.App.Notification.Action"/></returns>
@@ -1528,6 +1546,14 @@ public Android.App.Notification.Action.Builder SetSemanticAction(int arg0)
                 {
                     return IExecuteWithSignature<Android.App.Notification.Action.Builder>("setSemanticAction", "(I)Landroid/app/Notification$Action$Builder;", arg0);
                 }
+                /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/Notification.Action.Builder.html#getExtras()"/>
+                /// </summary>
+                /// <returns><see cref="Android.Os.Bundle"/></returns>
+                public Android.Os.Bundle GetExtras()
+                {
+                    return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
+                }
 
                 #endregion
 
@@ -1554,7 +1580,7 @@ public partial class BigPictureStyle
             /// <see href="https://developer.android.com/reference/android/app/Notification.BigPictureStyle.html#%3Cinit%3E(android.app.Notification.Builder)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.Notification.Builder"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public BigPictureStyle(Android.App.Notification.Builder arg0)
                 : base(arg0)
             {
@@ -1666,7 +1692,7 @@ public partial class BigTextStyle
             /// <see href="https://developer.android.com/reference/android/app/Notification.BigTextStyle.html#%3Cinit%3E(android.app.Notification.Builder)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.Notification.Builder"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public BigTextStyle(Android.App.Notification.Builder arg0)
                 : base(arg0)
             {
@@ -1752,53 +1778,36 @@ public partial class BubbleMetadata
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getAutoExpandBubble()"/> 
-            /// </summary>
-            public bool AutoExpandBubble
-            {
-                get { return IExecuteWithSignature<bool>("getAutoExpandBubble", "()Z"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getDeleteIntent()"/> 
-            /// </summary>
-            public Android.App.PendingIntent DeleteIntent
-            {
-                get { return IExecuteWithSignature<Android.App.PendingIntent>("getDeleteIntent", "()Landroid/app/PendingIntent;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getDesiredHeight()"/> 
-            /// </summary>
-            public int DesiredHeight
-            {
-                get { return IExecuteWithSignature<int>("getDesiredHeight", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getDesiredHeightResId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getDeleteIntent()"/>
             /// </summary>
-            public int DesiredHeightResId
+            /// <returns><see cref="Android.App.PendingIntent"/></returns>
+            public Android.App.PendingIntent GetDeleteIntent()
             {
-                get { return IExecuteWithSignature<int>("getDesiredHeightResId", "()I"); }
+                return IExecuteWithSignature<Android.App.PendingIntent>("getDeleteIntent", "()Landroid/app/PendingIntent;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getIcon()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getIntent()"/>
             /// </summary>
-            public Android.Graphics.Drawable.Icon Icon
+            /// <returns><see cref="Android.App.PendingIntent"/></returns>
+            public Android.App.PendingIntent GetIntent()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
+                return IExecuteWithSignature<Android.App.PendingIntent>("getIntent", "()Landroid/app/PendingIntent;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getIntent()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getIcon()"/>
             /// </summary>
-            public Android.App.PendingIntent Intent
+            /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+            public Android.Graphics.Drawable.Icon GetIcon()
             {
-                get { return IExecuteWithSignature<Android.App.PendingIntent>("getIntent", "()Landroid/app/PendingIntent;"); }
+                return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getShortcutId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getAutoExpandBubble()"/>
             /// </summary>
-            public Java.Lang.String ShortcutId
+            /// <returns><see cref="bool"/></returns>
+            public bool GetAutoExpandBubble()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getShortcutId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("getAutoExpandBubble", "()Z");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#isBubbleSuppressable()"/>
@@ -1833,6 +1842,30 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getDesiredHeight()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetDesiredHeight()
+            {
+                return IExecuteWithSignature<int>("getDesiredHeight", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getDesiredHeightResId()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetDesiredHeightResId()
+            {
+                return IExecuteWithSignature<int>("getDesiredHeightResId", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#getShortcutId()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetShortcutId()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getShortcutId", "()Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.BubbleMetadata.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -1997,7 +2030,7 @@ public Builder(Android.Content.Context arg0, Java.Lang.String arg1)
             /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#%3Cinit%3E(android.content.Context)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Content.Context arg0)
                 : base(arg0)
             {
@@ -2029,34 +2062,21 @@ public static Android.App.Notification.Builder RecoverBuilder(Android.Content.Co
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#getExtras()"/> 
-            /// </summary>
-            public Android.Os.Bundle Extras
-            {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#getNotification()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Android.App.Notification GetNotification
-            {
-                get { return IExecuteWithSignature<Android.App.Notification>("getNotification", "()Landroid/app/Notification;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#getStyle()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#build()"/>
             /// </summary>
-            public Android.App.Notification.Style GetStyle
+            /// <returns><see cref="Android.App.Notification"/></returns>
+            public Android.App.Notification Build()
             {
-                get { return IExecuteWithSignature<Android.App.Notification.Style>("getStyle", "()Landroid/app/Notification$Style;"); }
+                return IExecuteWithSignature<Android.App.Notification>("build", "()Landroid/app/Notification;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#build()"/>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#getNotification()"/>
             /// </summary>
             /// <returns><see cref="Android.App.Notification"/></returns>
-            public Android.App.Notification Build()
+            [global::System.Obsolete()]
+            public Android.App.Notification GetNotification()
             {
-                return IExecuteWithSignature<Android.App.Notification>("build", "()Landroid/app/Notification;");
+                return IExecuteWithSignature<Android.App.Notification>("getNotification", "()Landroid/app/Notification;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#addAction(android.app.Notification.Action)"/>
@@ -2074,7 +2094,7 @@ public Android.App.Notification.Builder AddAction(Android.App.Notification.Actio
             /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
             /// <param name="arg2"><see cref="Android.App.PendingIntent"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder AddAction(int arg0, Java.Lang.CharSequence arg1, Android.App.PendingIntent arg2)
             {
                 return IExecute<Android.App.Notification.Builder>("addAction", arg0, arg1, arg2);
@@ -2102,7 +2122,7 @@ public Android.App.Notification.Builder AddPerson(Android.App.Person arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder AddPerson(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.Builder>("addPerson", "(Ljava/lang/String;)Landroid/app/Notification$Builder;", arg0);
@@ -2211,7 +2231,7 @@ public Android.App.Notification.Builder SetColorized(bool arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Widget.RemoteViews"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetContent(Android.Widget.RemoteViews arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.Builder>("setContent", "(Landroid/widget/RemoteViews;)Landroid/app/Notification$Builder;", arg0);
@@ -2221,7 +2241,7 @@ public Android.App.Notification.Builder SetContent(Android.Widget.RemoteViews ar
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetContentInfo(Java.Lang.CharSequence arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.Builder>("setContentInfo", "(Ljava/lang/CharSequence;)Landroid/app/Notification$Builder;", arg0);
@@ -2285,7 +2305,7 @@ public Android.App.Notification.Builder SetCustomHeadsUpContentView(Android.Widg
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetDefaults(int arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.Builder>("setDefaults", "(I)Landroid/app/Notification$Builder;", arg0);
@@ -2389,7 +2409,7 @@ public Android.App.Notification.Builder SetLargeIcon(Android.Graphics.Drawable.I
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetLights(int arg0, int arg1, int arg2)
             {
                 return IExecute<Android.App.Notification.Builder>("setLights", arg0, arg1, arg2);
@@ -2444,7 +2464,7 @@ public Android.App.Notification.Builder SetOnlyAlertOnce(bool arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetPriority(int arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.Builder>("setPriority", "(I)Landroid/app/Notification$Builder;", arg0);
@@ -2548,7 +2568,7 @@ public Android.App.Notification.Builder SetSortKey(Java.Lang.String arg0)
             /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
             /// <param name="arg1"><see cref="Android.Media.AudioAttributes"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetSound(Android.Net.Uri arg0, Android.Media.AudioAttributes arg1)
             {
                 return IExecute<Android.App.Notification.Builder>("setSound", arg0, arg1);
@@ -2559,7 +2579,7 @@ public Android.App.Notification.Builder SetSound(Android.Net.Uri arg0, Android.M
             /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetSound(Android.Net.Uri arg0, int arg1)
             {
                 return IExecute<Android.App.Notification.Builder>("setSound", arg0, arg1);
@@ -2569,7 +2589,7 @@ public Android.App.Notification.Builder SetSound(Android.Net.Uri arg0, int arg1)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetSound(Android.Net.Uri arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.Builder>("setSound", "(Landroid/net/Uri;)Landroid/app/Notification$Builder;", arg0);
@@ -2598,7 +2618,7 @@ public Android.App.Notification.Builder SetSubText(Java.Lang.CharSequence arg0)
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
             /// <param name="arg1"><see cref="Android.Widget.RemoteViews"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetTicker(Java.Lang.CharSequence arg0, Android.Widget.RemoteViews arg1)
             {
                 return IExecute<Android.App.Notification.Builder>("setTicker", arg0, arg1);
@@ -2635,7 +2655,7 @@ public Android.App.Notification.Builder SetUsesChronometer(bool arg0)
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <returns><see cref="Android.App.Notification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.Builder SetVibrate(long[] arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.Builder>("setVibrate", "([J)Landroid/app/Notification$Builder;", new object[] { arg0 });
@@ -2659,6 +2679,22 @@ public Android.App.Notification.Builder SetWhen(long arg0)
                 return IExecuteWithSignature<Android.App.Notification.Builder>("setWhen", "(J)Landroid/app/Notification$Builder;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#getStyle()"/>
+            /// </summary>
+            /// <returns><see cref="Android.App.Notification.Style"/></returns>
+            public Android.App.Notification.Style GetStyle()
+            {
+                return IExecuteWithSignature<Android.App.Notification.Style>("getStyle", "()Landroid/app/Notification$Style;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#getExtras()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
+            {
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.Builder.html#createBigContentView()"/>
             /// </summary>
             /// <returns><see cref="Android.Widget.RemoteViews"/></returns>
@@ -2854,27 +2890,6 @@ public CarExtender(Android.App.Notification arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.html#getColor()"/> 
-            /// </summary>
-            public int Color
-            {
-                get { return IExecuteWithSignature<int>("getColor", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.html#getLargeIcon()"/> 
-            /// </summary>
-            public Android.Graphics.Bitmap LargeIcon
-            {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getLargeIcon", "()Landroid/graphics/Bitmap;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.html#getUnreadConversation()"/> 
-            /// </summary>
-            public Android.App.Notification.CarExtender.UnreadConversation UnreadConversation
-            {
-                get { return IExecuteWithSignature<Android.App.Notification.CarExtender.UnreadConversation>("getUnreadConversation", "()Landroid/app/Notification$CarExtender$UnreadConversation;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.html#extend(android.app.Notification.Builder)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.Notification.Builder"/></param>
@@ -2910,6 +2925,30 @@ public Android.App.Notification.CarExtender SetUnreadConversation(Android.App.No
             {
                 return IExecuteWithSignature<Android.App.Notification.CarExtender>("setUnreadConversation", "(Landroid/app/Notification$CarExtender$UnreadConversation;)Landroid/app/Notification$CarExtender;", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.html#getUnreadConversation()"/>
+            /// </summary>
+            /// <returns><see cref="Android.App.Notification.CarExtender.UnreadConversation"/></returns>
+            public Android.App.Notification.CarExtender.UnreadConversation GetUnreadConversation()
+            {
+                return IExecuteWithSignature<Android.App.Notification.CarExtender.UnreadConversation>("getUnreadConversation", "()Landroid/app/Notification$CarExtender$UnreadConversation;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.html#getLargeIcon()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+            public Android.Graphics.Bitmap GetLargeIcon()
+            {
+                return IExecuteWithSignature<Android.Graphics.Bitmap>("getLargeIcon", "()Landroid/graphics/Bitmap;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.html#getColor()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetColor()
+            {
+                return IExecuteWithSignature<int>("getColor", "()I");
+            }
 
             #endregion
 
@@ -2935,53 +2974,60 @@ public partial class UnreadConversation
 
                 #region Instance methods
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getLatestTimestamp()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getReadPendingIntent()"/>
                 /// </summary>
-                public long LatestTimestamp
+                /// <returns><see cref="Android.App.PendingIntent"/></returns>
+                public Android.App.PendingIntent GetReadPendingIntent()
                 {
-                    get { return IExecuteWithSignature<long>("getLatestTimestamp", "()J"); }
+                    return IExecuteWithSignature<Android.App.PendingIntent>("getReadPendingIntent", "()Landroid/app/PendingIntent;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getMessages()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getReplyPendingIntent()"/>
                 /// </summary>
-                public Java.Lang.String[] Messages
+                /// <returns><see cref="Android.App.PendingIntent"/></returns>
+                public Android.App.PendingIntent GetReplyPendingIntent()
                 {
-                    get { return IExecuteWithSignatureArray<Java.Lang.String>("getMessages", "()[Ljava/lang/String;"); }
+                    return IExecuteWithSignature<Android.App.PendingIntent>("getReplyPendingIntent", "()Landroid/app/PendingIntent;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getParticipant()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getRemoteInput()"/>
                 /// </summary>
-                public Java.Lang.String Participant
+                /// <returns><see cref="Android.App.RemoteInput"/></returns>
+                public Android.App.RemoteInput GetRemoteInput()
                 {
-                    get { return IExecuteWithSignature<Java.Lang.String>("getParticipant", "()Ljava/lang/String;"); }
+                    return IExecuteWithSignature<Android.App.RemoteInput>("getRemoteInput", "()Landroid/app/RemoteInput;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getParticipants()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getParticipant()"/>
                 /// </summary>
-                public Java.Lang.String[] Participants
+                /// <returns><see cref="Java.Lang.String"/></returns>
+                public Java.Lang.String GetParticipant()
                 {
-                    get { return IExecuteWithSignatureArray<Java.Lang.String>("getParticipants", "()[Ljava/lang/String;"); }
+                    return IExecuteWithSignature<Java.Lang.String>("getParticipant", "()Ljava/lang/String;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getReadPendingIntent()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getMessages()"/>
                 /// </summary>
-                public Android.App.PendingIntent ReadPendingIntent
+                /// <returns><see cref="Java.Lang.String"/></returns>
+                public Java.Lang.String[] GetMessages()
                 {
-                    get { return IExecuteWithSignature<Android.App.PendingIntent>("getReadPendingIntent", "()Landroid/app/PendingIntent;"); }
+                    return IExecuteWithSignatureArray<Java.Lang.String>("getMessages", "()[Ljava/lang/String;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getRemoteInput()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getParticipants()"/>
                 /// </summary>
-                public Android.App.RemoteInput RemoteInput
+                /// <returns><see cref="Java.Lang.String"/></returns>
+                public Java.Lang.String[] GetParticipants()
                 {
-                    get { return IExecuteWithSignature<Android.App.RemoteInput>("getRemoteInput", "()Landroid/app/RemoteInput;"); }
+                    return IExecuteWithSignatureArray<Java.Lang.String>("getParticipants", "()[Ljava/lang/String;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getReplyPendingIntent()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.CarExtender.UnreadConversation.html#getLatestTimestamp()"/>
                 /// </summary>
-                public Android.App.PendingIntent ReplyPendingIntent
+                /// <returns><see cref="long"/></returns>
+                public long GetLatestTimestamp()
                 {
-                    get { return IExecuteWithSignature<Android.App.PendingIntent>("getReplyPendingIntent", "()Landroid/app/PendingIntent;"); }
+                    return IExecuteWithSignature<long>("getLatestTimestamp", "()J");
                 }
 
                 #endregion
@@ -3195,7 +3241,7 @@ public partial class InboxStyle
             /// <see href="https://developer.android.com/reference/android/app/Notification.InboxStyle.html#%3Cinit%3E(android.app.Notification.Builder)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.Notification.Builder"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public InboxStyle(Android.App.Notification.Builder arg0)
                 : base(arg0)
             {
@@ -3262,7 +3308,7 @@ public partial class MediaStyle
             /// <see href="https://developer.android.com/reference/android/app/Notification.MediaStyle.html#%3Cinit%3E(android.app.Notification.Builder)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.Notification.Builder"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public MediaStyle(Android.App.Notification.Builder arg0)
                 : base(arg0)
             {
@@ -3339,7 +3385,7 @@ public MessagingStyle(Android.App.Person arg0)
             /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#%3Cinit%3E(java.lang.CharSequence)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public MessagingStyle(Java.Lang.CharSequence arg0)
                 : base(arg0)
             {
@@ -3367,42 +3413,6 @@ public MessagingStyle(Java.Lang.CharSequence arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getConversationTitle()"/> 
-            /// </summary>
-            public Java.Lang.CharSequence ConversationTitle
-            {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getConversationTitle", "()Ljava/lang/CharSequence;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getHistoricMessages()"/> 
-            /// </summary>
-            public Java.Util.List<Android.App.Notification.MessagingStyle.Message> HistoricMessages
-            {
-                get { return IExecuteWithSignature<Java.Util.List<Android.App.Notification.MessagingStyle.Message>>("getHistoricMessages", "()Ljava/util/List;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getMessages()"/> 
-            /// </summary>
-            public Java.Util.List<Android.App.Notification.MessagingStyle.Message> Messages
-            {
-                get { return IExecuteWithSignature<Java.Util.List<Android.App.Notification.MessagingStyle.Message>>("getMessages", "()Ljava/util/List;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getUser()"/> 
-            /// </summary>
-            public Android.App.Person User
-            {
-                get { return IExecuteWithSignature<Android.App.Person>("getUser", "()Landroid/app/Person;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getUserDisplayName()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence UserDisplayName
-            {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getUserDisplayName", "()Ljava/lang/CharSequence;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#addHistoricMessage(android.app.Notification.MessagingStyle.Message)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.Notification.MessagingStyle.Message"/></param>
@@ -3438,7 +3448,7 @@ public Android.App.Notification.MessagingStyle AddMessage(Java.Lang.CharSequence
             /// <param name="arg1"><see cref="long"/></param>
             /// <param name="arg2"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Android.App.Notification.MessagingStyle"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.MessagingStyle AddMessage(Java.Lang.CharSequence arg0, long arg1, Java.Lang.CharSequence arg2)
             {
                 return IExecute<Android.App.Notification.MessagingStyle>("addMessage", arg0, arg1, arg2);
@@ -3462,6 +3472,14 @@ public Android.App.Notification.MessagingStyle SetGroupConversation(bool arg0)
                 return IExecuteWithSignature<Android.App.Notification.MessagingStyle>("setGroupConversation", "(Z)Landroid/app/Notification$MessagingStyle;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getUser()"/>
+            /// </summary>
+            /// <returns><see cref="Android.App.Person"/></returns>
+            public Android.App.Person GetUser()
+            {
+                return IExecuteWithSignature<Android.App.Person>("getUser", "()Landroid/app/Person;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#isGroupConversation()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -3469,6 +3487,39 @@ public bool IsGroupConversation()
             {
                 return IExecuteWithSignature<bool>("isGroupConversation", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getConversationTitle()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetConversationTitle()
+            {
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getConversationTitle", "()Ljava/lang/CharSequence;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getUserDisplayName()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetUserDisplayName()
+            {
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getUserDisplayName", "()Ljava/lang/CharSequence;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getHistoricMessages()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.App.Notification.MessagingStyle.Message> GetHistoricMessages()
+            {
+                return IExecuteWithSignature<Java.Util.List<Android.App.Notification.MessagingStyle.Message>>("getHistoricMessages", "()Ljava/util/List;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.html#getMessages()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.App.Notification.MessagingStyle.Message> GetMessages()
+            {
+                return IExecuteWithSignature<Java.Util.List<Android.App.Notification.MessagingStyle.Message>>("getMessages", "()Ljava/util/List;");
+            }
 
             #endregion
 
@@ -3493,7 +3544,7 @@ public Message(Java.Lang.CharSequence arg0, long arg1, Android.App.Person arg2)
                 /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
                 /// <param name="arg1"><see cref="long"/></param>
                 /// <param name="arg2"><see cref="Java.Lang.CharSequence"/></param>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public Message(Java.Lang.CharSequence arg0, long arg1, Java.Lang.CharSequence arg2)
                     : base(arg0, arg1, arg2)
                 {
@@ -3524,64 +3575,71 @@ public Message(Java.Lang.CharSequence arg0, long arg1, Java.Lang.CharSequence ar
 
                 #region Instance methods
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getDataMimeType()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#setData(java.lang.String,android.net.Uri)"/>
                 /// </summary>
-                public Java.Lang.String DataMimeType
+                /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+                /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
+                /// <returns><see cref="Android.App.Notification.MessagingStyle.Message"/></returns>
+                public Android.App.Notification.MessagingStyle.Message SetData(Java.Lang.String arg0, Android.Net.Uri arg1)
                 {
-                    get { return IExecuteWithSignature<Java.Lang.String>("getDataMimeType", "()Ljava/lang/String;"); }
+                    return IExecute<Android.App.Notification.MessagingStyle.Message>("setData", arg0, arg1);
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getDataUri()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getSenderPerson()"/>
                 /// </summary>
-                public Android.Net.Uri DataUri
+                /// <returns><see cref="Android.App.Person"/></returns>
+                public Android.App.Person GetSenderPerson()
                 {
-                    get { return IExecuteWithSignature<Android.Net.Uri>("getDataUri", "()Landroid/net/Uri;"); }
+                    return IExecuteWithSignature<Android.App.Person>("getSenderPerson", "()Landroid/app/Person;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getExtras()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getDataUri()"/>
                 /// </summary>
-                public Android.Os.Bundle Extras
+                /// <returns><see cref="Android.Net.Uri"/></returns>
+                public Android.Net.Uri GetDataUri()
                 {
-                    get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                    return IExecuteWithSignature<Android.Net.Uri>("getDataUri", "()Landroid/net/Uri;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getSender()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getExtras()"/>
                 /// </summary>
-                [System.Obsolete()]
-                public Java.Lang.CharSequence Sender
+                /// <returns><see cref="Android.Os.Bundle"/></returns>
+                public Android.Os.Bundle GetExtras()
                 {
-                    get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSender", "()Ljava/lang/CharSequence;"); }
+                    return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getSenderPerson()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getSender()"/>
                 /// </summary>
-                public Android.App.Person SenderPerson
+                /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+                [global::System.Obsolete()]
+                public Java.Lang.CharSequence GetSender()
                 {
-                    get { return IExecuteWithSignature<Android.App.Person>("getSenderPerson", "()Landroid/app/Person;"); }
+                    return IExecuteWithSignature<Java.Lang.CharSequence>("getSender", "()Ljava/lang/CharSequence;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getText()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getText()"/>
                 /// </summary>
-                public Java.Lang.CharSequence Text
+                /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+                public Java.Lang.CharSequence GetText()
                 {
-                    get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+                    return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getTimestamp()"/> 
+                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getDataMimeType()"/>
                 /// </summary>
-                public long Timestamp
+                /// <returns><see cref="Java.Lang.String"/></returns>
+                public Java.Lang.String GetDataMimeType()
                 {
-                    get { return IExecuteWithSignature<long>("getTimestamp", "()J"); }
+                    return IExecuteWithSignature<Java.Lang.String>("getDataMimeType", "()Ljava/lang/String;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#setData(java.lang.String,android.net.Uri)"/>
+                /// <see href="https://developer.android.com/reference/android/app/Notification.MessagingStyle.Message.html#getTimestamp()"/>
                 /// </summary>
-                /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-                /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
-                /// <returns><see cref="Android.App.Notification.MessagingStyle.Message"/></returns>
-                public Android.App.Notification.MessagingStyle.Message SetData(Java.Lang.String arg0, Android.Net.Uri arg1)
+                /// <returns><see cref="long"/></returns>
+                public long GetTimestamp()
                 {
-                    return IExecute<Android.App.Notification.MessagingStyle.Message>("setData", arg0, arg1);
+                    return IExecuteWithSignature<long>("getTimestamp", "()J");
                 }
 
                 #endregion
@@ -3671,56 +3729,56 @@ public WearableExtender(Android.App.Notification arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#SCREEN_TIMEOUT_LONG"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SCREEN_TIMEOUT_LONG { get { if (!_SCREEN_TIMEOUT_LONGReady) { _SCREEN_TIMEOUT_LONGContent = SGetField<int>(LocalBridgeClazz, "SCREEN_TIMEOUT_LONG"); _SCREEN_TIMEOUT_LONGReady = true; } return _SCREEN_TIMEOUT_LONGContent; } }
             private static int _SCREEN_TIMEOUT_LONGContent = default;
             private static bool _SCREEN_TIMEOUT_LONGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#SCREEN_TIMEOUT_SHORT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SCREEN_TIMEOUT_SHORT { get { if (!_SCREEN_TIMEOUT_SHORTReady) { _SCREEN_TIMEOUT_SHORTContent = SGetField<int>(LocalBridgeClazz, "SCREEN_TIMEOUT_SHORT"); _SCREEN_TIMEOUT_SHORTReady = true; } return _SCREEN_TIMEOUT_SHORTContent; } }
             private static int _SCREEN_TIMEOUT_SHORTContent = default;
             private static bool _SCREEN_TIMEOUT_SHORTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#SIZE_DEFAULT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SIZE_DEFAULT { get { if (!_SIZE_DEFAULTReady) { _SIZE_DEFAULTContent = SGetField<int>(LocalBridgeClazz, "SIZE_DEFAULT"); _SIZE_DEFAULTReady = true; } return _SIZE_DEFAULTContent; } }
             private static int _SIZE_DEFAULTContent = default;
             private static bool _SIZE_DEFAULTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#SIZE_FULL_SCREEN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SIZE_FULL_SCREEN { get { if (!_SIZE_FULL_SCREENReady) { _SIZE_FULL_SCREENContent = SGetField<int>(LocalBridgeClazz, "SIZE_FULL_SCREEN"); _SIZE_FULL_SCREENReady = true; } return _SIZE_FULL_SCREENContent; } }
             private static int _SIZE_FULL_SCREENContent = default;
             private static bool _SIZE_FULL_SCREENReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#SIZE_LARGE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SIZE_LARGE { get { if (!_SIZE_LARGEReady) { _SIZE_LARGEContent = SGetField<int>(LocalBridgeClazz, "SIZE_LARGE"); _SIZE_LARGEReady = true; } return _SIZE_LARGEContent; } }
             private static int _SIZE_LARGEContent = default;
             private static bool _SIZE_LARGEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#SIZE_MEDIUM"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SIZE_MEDIUM { get { if (!_SIZE_MEDIUMReady) { _SIZE_MEDIUMContent = SGetField<int>(LocalBridgeClazz, "SIZE_MEDIUM"); _SIZE_MEDIUMReady = true; } return _SIZE_MEDIUMContent; } }
             private static int _SIZE_MEDIUMContent = default;
             private static bool _SIZE_MEDIUMReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#SIZE_SMALL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SIZE_SMALL { get { if (!_SIZE_SMALLReady) { _SIZE_SMALLContent = SGetField<int>(LocalBridgeClazz, "SIZE_SMALL"); _SIZE_SMALLReady = true; } return _SIZE_SMALLContent; } }
             private static int _SIZE_SMALLContent = default;
             private static bool _SIZE_SMALLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#SIZE_XSMALL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SIZE_XSMALL { get { if (!_SIZE_XSMALLReady) { _SIZE_XSMALLContent = SGetField<int>(LocalBridgeClazz, "SIZE_XSMALL"); _SIZE_XSMALLReady = true; } return _SIZE_XSMALLContent; } }
             private static int _SIZE_XSMALLContent = default;
             private static bool _SIZE_XSMALLReady = false; // this is used because in case of generics 
@@ -3739,159 +3797,6 @@ public WearableExtender(Android.App.Notification arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getActions()"/> 
-            /// </summary>
-            public Java.Util.List<Android.App.Notification.Action> Actions
-            {
-                get { return IExecuteWithSignature<Java.Util.List<Android.App.Notification.Action>>("getActions", "()Ljava/util/List;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getBackground()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Android.Graphics.Bitmap Background
-            {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getBackground", "()Landroid/graphics/Bitmap;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getBridgeTag()"/> 
-            /// </summary>
-            public Java.Lang.String BridgeTag
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getBridgeTag", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getContentAction()"/> 
-            /// </summary>
-            public int ContentAction
-            {
-                get { return IExecuteWithSignature<int>("getContentAction", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getContentIcon()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public int ContentIcon
-            {
-                get { return IExecuteWithSignature<int>("getContentIcon", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getContentIconGravity()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public int ContentIconGravity
-            {
-                get { return IExecuteWithSignature<int>("getContentIconGravity", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getContentIntentAvailableOffline()"/> 
-            /// </summary>
-            public bool ContentIntentAvailableOffline
-            {
-                get { return IExecuteWithSignature<bool>("getContentIntentAvailableOffline", "()Z"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getCustomContentHeight()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public int CustomContentHeight
-            {
-                get { return IExecuteWithSignature<int>("getCustomContentHeight", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getCustomSizePreset()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public int CustomSizePreset
-            {
-                get { return IExecuteWithSignature<int>("getCustomSizePreset", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getDismissalId()"/> 
-            /// </summary>
-            public Java.Lang.String DismissalId
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDismissalId", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getDisplayIntent()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Android.App.PendingIntent DisplayIntent
-            {
-                get { return IExecuteWithSignature<Android.App.PendingIntent>("getDisplayIntent", "()Landroid/app/PendingIntent;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getGravity()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public int Gravity
-            {
-                get { return IExecuteWithSignature<int>("getGravity", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintAmbientBigPicture()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public bool HintAmbientBigPicture
-            {
-                get { return IExecuteWithSignature<bool>("getHintAmbientBigPicture", "()Z"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintAvoidBackgroundClipping()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public bool HintAvoidBackgroundClipping
-            {
-                get { return IExecuteWithSignature<bool>("getHintAvoidBackgroundClipping", "()Z"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintContentIntentLaunchesActivity()"/> 
-            /// </summary>
-            public bool HintContentIntentLaunchesActivity
-            {
-                get { return IExecuteWithSignature<bool>("getHintContentIntentLaunchesActivity", "()Z"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintHideIcon()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public bool HintHideIcon
-            {
-                get { return IExecuteWithSignature<bool>("getHintHideIcon", "()Z"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintScreenTimeout()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public int HintScreenTimeout
-            {
-                get { return IExecuteWithSignature<int>("getHintScreenTimeout", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintShowBackgroundOnly()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public bool HintShowBackgroundOnly
-            {
-                get { return IExecuteWithSignature<bool>("getHintShowBackgroundOnly", "()Z"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getPages()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Android.App.Notification> Pages
-            {
-                get { return IExecuteWithSignature<Java.Util.List<Android.App.Notification>>("getPages", "()Ljava/util/List;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getStartScrollBottom()"/> 
-            /// </summary>
-            public bool StartScrollBottom
-            {
-                get { return IExecuteWithSignature<bool>("getStartScrollBottom", "()Z"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#extend(android.app.Notification.Builder)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.Notification.Builder"/></param>
@@ -3923,7 +3828,7 @@ public Android.App.Notification.WearableExtender AddActions(Java.Util.List<Andro
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.Notification"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender AddPage(Android.App.Notification arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("addPage", "(Landroid/app/Notification;)Landroid/app/Notification$WearableExtender;", arg0);
@@ -3933,7 +3838,7 @@ public Android.App.Notification.WearableExtender AddPage(Android.App.Notificatio
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.List"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender AddPages(Java.Util.List<Android.App.Notification> arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("addPages", "(Ljava/util/List;)Landroid/app/Notification$WearableExtender;", arg0);
@@ -3950,7 +3855,7 @@ public Android.App.Notification.WearableExtender ClearActions()
             /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#clearPages()"/>
             /// </summary>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender ClearPages()
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("clearPages", "()Landroid/app/Notification$WearableExtender;");
@@ -3968,7 +3873,7 @@ public Android.App.Notification.WearableExtender Clone()
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetBackground(Android.Graphics.Bitmap arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setBackground", "(Landroid/graphics/Bitmap;)Landroid/app/Notification$WearableExtender;", arg0);
@@ -3996,7 +3901,7 @@ public Android.App.Notification.WearableExtender SetContentAction(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetContentIcon(int arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setContentIcon", "(I)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4006,7 +3911,7 @@ public Android.App.Notification.WearableExtender SetContentIcon(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetContentIconGravity(int arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setContentIconGravity", "(I)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4025,7 +3930,7 @@ public Android.App.Notification.WearableExtender SetContentIntentAvailableOfflin
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetCustomContentHeight(int arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setCustomContentHeight", "(I)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4035,7 +3940,7 @@ public Android.App.Notification.WearableExtender SetCustomContentHeight(int arg0
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetCustomSizePreset(int arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setCustomSizePreset", "(I)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4054,7 +3959,7 @@ public Android.App.Notification.WearableExtender SetDismissalId(Java.Lang.String
             /// </summary>
             /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetDisplayIntent(Android.App.PendingIntent arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setDisplayIntent", "(Landroid/app/PendingIntent;)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4064,7 +3969,7 @@ public Android.App.Notification.WearableExtender SetDisplayIntent(Android.App.Pe
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetGravity(int arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setGravity", "(I)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4074,7 +3979,7 @@ public Android.App.Notification.WearableExtender SetGravity(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetHintAmbientBigPicture(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setHintAmbientBigPicture", "(Z)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4084,7 +3989,7 @@ public Android.App.Notification.WearableExtender SetHintAmbientBigPicture(bool a
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetHintAvoidBackgroundClipping(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setHintAvoidBackgroundClipping", "(Z)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4103,7 +4008,7 @@ public Android.App.Notification.WearableExtender SetHintContentIntentLaunchesAct
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetHintHideIcon(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setHintHideIcon", "(Z)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4113,7 +4018,7 @@ public Android.App.Notification.WearableExtender SetHintHideIcon(bool arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetHintScreenTimeout(int arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setHintScreenTimeout", "(I)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4123,7 +4028,7 @@ public Android.App.Notification.WearableExtender SetHintScreenTimeout(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.App.Notification.WearableExtender"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.App.Notification.WearableExtender SetHintShowBackgroundOnly(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setHintShowBackgroundOnly", "(Z)Landroid/app/Notification$WearableExtender;", arg0);
@@ -4137,6 +4042,179 @@ public Android.App.Notification.WearableExtender SetStartScrollBottom(bool arg0)
             {
                 return IExecuteWithSignature<Android.App.Notification.WearableExtender>("setStartScrollBottom", "(Z)Landroid/app/Notification$WearableExtender;", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getDisplayIntent()"/>
+            /// </summary>
+            /// <returns><see cref="Android.App.PendingIntent"/></returns>
+            [global::System.Obsolete()]
+            public Android.App.PendingIntent GetDisplayIntent()
+            {
+                return IExecuteWithSignature<Android.App.PendingIntent>("getDisplayIntent", "()Landroid/app/PendingIntent;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getBackground()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+            [global::System.Obsolete()]
+            public Android.Graphics.Bitmap GetBackground()
+            {
+                return IExecuteWithSignature<Android.Graphics.Bitmap>("getBackground", "()Landroid/graphics/Bitmap;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getContentIntentAvailableOffline()"/>
+            /// </summary>
+            /// <returns><see cref="bool"/></returns>
+            public bool GetContentIntentAvailableOffline()
+            {
+                return IExecuteWithSignature<bool>("getContentIntentAvailableOffline", "()Z");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintAmbientBigPicture()"/>
+            /// </summary>
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool GetHintAmbientBigPicture()
+            {
+                return IExecuteWithSignature<bool>("getHintAmbientBigPicture", "()Z");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintAvoidBackgroundClipping()"/>
+            /// </summary>
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool GetHintAvoidBackgroundClipping()
+            {
+                return IExecuteWithSignature<bool>("getHintAvoidBackgroundClipping", "()Z");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintContentIntentLaunchesActivity()"/>
+            /// </summary>
+            /// <returns><see cref="bool"/></returns>
+            public bool GetHintContentIntentLaunchesActivity()
+            {
+                return IExecuteWithSignature<bool>("getHintContentIntentLaunchesActivity", "()Z");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintHideIcon()"/>
+            /// </summary>
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool GetHintHideIcon()
+            {
+                return IExecuteWithSignature<bool>("getHintHideIcon", "()Z");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintShowBackgroundOnly()"/>
+            /// </summary>
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool GetHintShowBackgroundOnly()
+            {
+                return IExecuteWithSignature<bool>("getHintShowBackgroundOnly", "()Z");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getStartScrollBottom()"/>
+            /// </summary>
+            /// <returns><see cref="bool"/></returns>
+            public bool GetStartScrollBottom()
+            {
+                return IExecuteWithSignature<bool>("getStartScrollBottom", "()Z");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getContentAction()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetContentAction()
+            {
+                return IExecuteWithSignature<int>("getContentAction", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getContentIcon()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetContentIcon()
+            {
+                return IExecuteWithSignature<int>("getContentIcon", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getContentIconGravity()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetContentIconGravity()
+            {
+                return IExecuteWithSignature<int>("getContentIconGravity", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getCustomContentHeight()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetCustomContentHeight()
+            {
+                return IExecuteWithSignature<int>("getCustomContentHeight", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getCustomSizePreset()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetCustomSizePreset()
+            {
+                return IExecuteWithSignature<int>("getCustomSizePreset", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getGravity()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetGravity()
+            {
+                return IExecuteWithSignature<int>("getGravity", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getHintScreenTimeout()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetHintScreenTimeout()
+            {
+                return IExecuteWithSignature<int>("getHintScreenTimeout", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getBridgeTag()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetBridgeTag()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getBridgeTag", "()Ljava/lang/String;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getDismissalId()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDismissalId()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getDismissalId", "()Ljava/lang/String;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getPages()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Android.App.Notification> GetPages()
+            {
+                return IExecuteWithSignature<Java.Util.List<Android.App.Notification>>("getPages", "()Ljava/util/List;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/Notification.WearableExtender.html#getActions()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.App.Notification.Action> GetActions()
+            {
+                return IExecuteWithSignature<Java.Util.List<Android.App.Notification.Action>>("getActions", "()Ljava/util/List;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/App/NotificationChannel.cs b/src/net/Netdroid/Generated/Android/App/NotificationChannel.cs
index ffd5fe865..98481ced2 100644
--- a/src/net/Netdroid/Generated/Android/App/NotificationChannel.cs
+++ b/src/net/Netdroid/Generated/Android/App/NotificationChannel.cs
@@ -110,88 +110,20 @@ public NotificationChannel(Java.Lang.String arg0, Java.Lang.CharSequence arg1, i
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getAudioAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getAudioAttributes()"/>
         /// </summary>
-        public Android.Media.AudioAttributes AudioAttributes
+        /// <returns><see cref="Android.Media.AudioAttributes"/></returns>
+        public Android.Media.AudioAttributes GetAudioAttributes()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;"); }
+            return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getConversationId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getSound()"/>
         /// </summary>
-        public Java.Lang.String ConversationId
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetSound()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getConversationId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getDescription()"/> <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setDescription(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String Description
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getGroup()"/> <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setGroup(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String Group
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGroup", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setGroup", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getImportance()"/> <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setImportance(int)"/>
-        /// </summary>
-        public int Importance
-        {
-            get { return IExecuteWithSignature<int>("getImportance", "()I"); } set { IExecuteWithSignature("setImportance", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getLightColor()"/> <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setLightColor(int)"/>
-        /// </summary>
-        public int LightColor
-        {
-            get { return IExecuteWithSignature<int>("getLightColor", "()I"); } set { IExecuteWithSignature("setLightColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getLockscreenVisibility()"/> <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setLockscreenVisibility(int)"/>
-        /// </summary>
-        public int LockscreenVisibility
-        {
-            get { return IExecuteWithSignature<int>("getLockscreenVisibility", "()I"); } set { IExecuteWithSignature("setLockscreenVisibility", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getName()"/> <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setName(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setName", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getParentChannelId()"/> 
-        /// </summary>
-        public Java.Lang.String ParentChannelId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getParentChannelId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getSound()"/> 
-        /// </summary>
-        public Android.Net.Uri Sound
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getSound", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getVibrationPattern()"/> <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setVibrationPattern(long[])"/>
-        /// </summary>
-        public long[] VibrationPattern
-        {
-            get { return IExecuteWithSignatureArray<long>("getVibrationPattern", "()[J"); } set { IExecuteWithSignature("setVibrationPattern", "([J)V", value); }
+            return IExecuteWithSignature<Android.Net.Uri>("getSound", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#canBubble()"/>
@@ -290,6 +222,86 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getImportance()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetImportance()
+        {
+            return IExecuteWithSignature<int>("getImportance", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getLightColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLightColor()
+        {
+            return IExecuteWithSignature<int>("getLightColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getLockscreenVisibility()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLockscreenVisibility()
+        {
+            return IExecuteWithSignature<int>("getLockscreenVisibility", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getConversationId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetConversationId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getConversationId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getGroup()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGroup()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGroup", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getParentChannelId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetParentChannelId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getParentChannelId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#getVibrationPattern()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long[] GetVibrationPattern()
+        {
+            return IExecuteWithSignatureArray<long>("getVibrationPattern", "()[J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#enableLights(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -339,6 +351,54 @@ public void SetConversationId(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setConversationId", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setDescription(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDescription(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setGroup(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetGroup(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setGroup", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setImportance(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetImportance(int arg0)
+        {
+            IExecuteWithSignature("setImportance", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setLightColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLightColor(int arg0)
+        {
+            IExecuteWithSignature("setLightColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setLockscreenVisibility(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLockscreenVisibility(int arg0)
+        {
+            IExecuteWithSignature("setLockscreenVisibility", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setName(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetName(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setName", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setShowBadge(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -356,6 +416,14 @@ public void SetSound(Android.Net.Uri arg0, Android.Media.AudioAttributes arg1)
             IExecute("setSound", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#setVibrationPattern(long[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetVibrationPattern(long[] arg0)
+        {
+            IExecuteWithSignature("setVibrationPattern", "([J)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationChannel.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/NotificationChannelGroup.cs b/src/net/Netdroid/Generated/Android/App/NotificationChannelGroup.cs
index 96d84b978..7899a5fe9 100644
--- a/src/net/Netdroid/Generated/Android/App/NotificationChannelGroup.cs
+++ b/src/net/Netdroid/Generated/Android/App/NotificationChannelGroup.cs
@@ -61,56 +61,68 @@ public NotificationChannelGroup(Java.Lang.String arg0, Java.Lang.CharSequence ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#getChannels()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#clone()"/>
         /// </summary>
-        public Java.Util.List<Android.App.NotificationChannel> Channels
+        /// <returns><see cref="Android.App.NotificationChannelGroup"/></returns>
+        public Android.App.NotificationChannelGroup Clone()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.NotificationChannel>>("getChannels", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.App.NotificationChannelGroup>("clone", "()Landroid/app/NotificationChannelGroup;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#getDescription()"/> <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#setDescription(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#isBlocked()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBlocked()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isBlocked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#getName()"/>
         /// </summary>
-        public Java.Lang.CharSequence Name
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#getDescription()"/>
         /// </summary>
-        /// <returns><see cref="Android.App.NotificationChannelGroup"/></returns>
-        public Android.App.NotificationChannelGroup Clone()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            return IExecuteWithSignature<Android.App.NotificationChannelGroup>("clone", "()Landroid/app/NotificationChannelGroup;");
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#isBlocked()"/>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBlocked()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            return IExecuteWithSignature<bool>("isBlocked", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#getChannels()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.NotificationChannel> GetChannels()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.App.NotificationChannel>>("getChannels", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#setDescription(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDescription(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationChannelGroup.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/NotificationManager.cs b/src/net/Netdroid/Generated/Android/App/NotificationManager.cs
index b2855f005..21564d64f 100644
--- a/src/net/Netdroid/Generated/Android/App/NotificationManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/NotificationManager.cs
@@ -256,76 +256,6 @@ public partial class NotificationManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getActiveNotifications()"/> 
-        /// </summary>
-        public Android.Service.Notification.StatusBarNotification[] ActiveNotifications
-        {
-            get { return IExecuteWithSignatureArray<Android.Service.Notification.StatusBarNotification>("getActiveNotifications", "()[Landroid/service/notification/StatusBarNotification;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getAutomaticZenRules()"/> 
-        /// </summary>
-        public Java.Util.Map<Java.Lang.String, Android.App.AutomaticZenRule> AutomaticZenRules
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.App.AutomaticZenRule>>("getAutomaticZenRules", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getBubblePreference()"/> 
-        /// </summary>
-        public int BubblePreference
-        {
-            get { return IExecuteWithSignature<int>("getBubblePreference", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getConsolidatedNotificationPolicy()"/> 
-        /// </summary>
-        public Android.App.NotificationManager.Policy ConsolidatedNotificationPolicy
-        {
-            get { return IExecuteWithSignature<Android.App.NotificationManager.Policy>("getConsolidatedNotificationPolicy", "()Landroid/app/NotificationManager$Policy;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getCurrentInterruptionFilter()"/> 
-        /// </summary>
-        public int CurrentInterruptionFilter
-        {
-            get { return IExecuteWithSignature<int>("getCurrentInterruptionFilter", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getImportance()"/> 
-        /// </summary>
-        public int Importance
-        {
-            get { return IExecuteWithSignature<int>("getImportance", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getNotificationChannelGroups()"/> 
-        /// </summary>
-        public Java.Util.List<Android.App.NotificationChannelGroup> NotificationChannelGroups
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.NotificationChannelGroup>>("getNotificationChannelGroups", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getNotificationChannels()"/> 
-        /// </summary>
-        public Java.Util.List<Android.App.NotificationChannel> NotificationChannels
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.NotificationChannel>>("getNotificationChannels", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getNotificationDelegate()"/> <see href="https://developer.android.com/reference/android/app/NotificationManager.html#setNotificationDelegate(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String NotificationDelegate
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNotificationDelegate", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNotificationDelegate", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getNotificationPolicy()"/> <see href="https://developer.android.com/reference/android/app/NotificationManager.html#setNotificationPolicy(android.app.NotificationManager.Policy)"/>
-        /// </summary>
-        public Android.App.NotificationManager.Policy NotificationPolicy
-        {
-            get { return IExecuteWithSignature<Android.App.NotificationManager.Policy>("getNotificationPolicy", "()Landroid/app/NotificationManager$Policy;"); } set { IExecuteWithSignature("setNotificationPolicy", "(Landroid/app/NotificationManager$Policy;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getAutomaticZenRule(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -363,10 +293,34 @@ public Android.App.NotificationChannelGroup GetNotificationChannelGroup(Java.Lan
             return IExecuteWithSignature<Android.App.NotificationChannelGroup>("getNotificationChannelGroup", "(Ljava/lang/String;)Landroid/app/NotificationChannelGroup;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getConsolidatedNotificationPolicy()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.NotificationManager.Policy"/></returns>
+        public Android.App.NotificationManager.Policy GetConsolidatedNotificationPolicy()
+        {
+            return IExecuteWithSignature<Android.App.NotificationManager.Policy>("getConsolidatedNotificationPolicy", "()Landroid/app/NotificationManager$Policy;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getNotificationPolicy()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.NotificationManager.Policy"/></returns>
+        public Android.App.NotificationManager.Policy GetNotificationPolicy()
+        {
+            return IExecuteWithSignature<Android.App.NotificationManager.Policy>("getNotificationPolicy", "()Landroid/app/NotificationManager$Policy;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getActiveNotifications()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Service.Notification.StatusBarNotification"/></returns>
+        public Android.Service.Notification.StatusBarNotification[] GetActiveNotifications()
+        {
+            return IExecuteWithSignatureArray<Android.Service.Notification.StatusBarNotification>("getActiveNotifications", "()[Landroid/service/notification/StatusBarNotification;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#areBubblesAllowed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool AreBubblesAllowed()
         {
             return IExecuteWithSignature<bool>("areBubblesAllowed", "()Z");
@@ -466,6 +420,14 @@ public bool UpdateAutomaticZenRule(Java.Lang.String arg0, Android.App.AutomaticZ
             return IExecute<bool>("updateAutomaticZenRule", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getCurrentInterruptionFilter()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentInterruptionFilter()
+        {
+            return IExecuteWithSignature<int>("getCurrentInterruptionFilter", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#setInterruptionFilter(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -474,6 +436,22 @@ public void SetInterruptionFilter(int arg0)
             IExecuteWithSignature("setInterruptionFilter", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getBubblePreference()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBubblePreference()
+        {
+            return IExecuteWithSignature<int>("getBubblePreference", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getImportance()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetImportance()
+        {
+            return IExecuteWithSignature<int>("getImportance", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#addAutomaticZenRule(android.app.AutomaticZenRule)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.AutomaticZenRule"/></param>
@@ -483,6 +461,38 @@ public Java.Lang.String AddAutomaticZenRule(Android.App.AutomaticZenRule arg0)
             return IExecuteWithSignature<Java.Lang.String>("addAutomaticZenRule", "(Landroid/app/AutomaticZenRule;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getNotificationDelegate()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNotificationDelegate()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNotificationDelegate", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getNotificationChannels()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.NotificationChannel> GetNotificationChannels()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.NotificationChannel>>("getNotificationChannels", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getNotificationChannelGroups()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.NotificationChannelGroup> GetNotificationChannelGroups()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.NotificationChannelGroup>>("getNotificationChannelGroups", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#getAutomaticZenRules()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Android.App.AutomaticZenRule> GetAutomaticZenRules()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.App.AutomaticZenRule>>("getAutomaticZenRules", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#cancel(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -603,6 +613,22 @@ public void SetAutomaticZenRuleState(Java.Lang.String arg0, Android.Service.Noti
         {
             IExecute("setAutomaticZenRuleState", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#setNotificationDelegate(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNotificationDelegate(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setNotificationDelegate", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/NotificationManager.html#setNotificationPolicy(android.app.NotificationManager.Policy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.NotificationManager.Policy"/></param>
+        public void SetNotificationPolicy(Android.App.NotificationManager.Policy arg0)
+        {
+            IExecuteWithSignature("setNotificationPolicy", "(Landroid/app/NotificationManager$Policy;)V", arg0);
+        }
 
         #endregion
 
@@ -817,14 +843,14 @@ public Policy(int arg0, int arg1, int arg2)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/NotificationManager.Policy.html#SUPPRESSED_EFFECT_SCREEN_OFF"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SUPPRESSED_EFFECT_SCREEN_OFF { get { if (!_SUPPRESSED_EFFECT_SCREEN_OFFReady) { _SUPPRESSED_EFFECT_SCREEN_OFFContent = SGetField<int>(LocalBridgeClazz, "SUPPRESSED_EFFECT_SCREEN_OFF"); _SUPPRESSED_EFFECT_SCREEN_OFFReady = true; } return _SUPPRESSED_EFFECT_SCREEN_OFFContent; } }
             private static int _SUPPRESSED_EFFECT_SCREEN_OFFContent = default;
             private static bool _SUPPRESSED_EFFECT_SCREEN_OFFReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/NotificationManager.Policy.html#SUPPRESSED_EFFECT_SCREEN_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SUPPRESSED_EFFECT_SCREEN_ON { get { if (!_SUPPRESSED_EFFECT_SCREEN_ONReady) { _SUPPRESSED_EFFECT_SCREEN_ONContent = SGetField<int>(LocalBridgeClazz, "SUPPRESSED_EFFECT_SCREEN_ON"); _SUPPRESSED_EFFECT_SCREEN_ONReady = true; } return _SUPPRESSED_EFFECT_SCREEN_ONContent; } }
             private static int _SUPPRESSED_EFFECT_SCREEN_ONContent = default;
             private static bool _SUPPRESSED_EFFECT_SCREEN_ONReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/App/PendingIntent.cs b/src/net/Netdroid/Generated/Android/App/PendingIntent.cs
index 87f939328..76f5da9a7 100644
--- a/src/net/Netdroid/Generated/Android/App/PendingIntent.cs
+++ b/src/net/Netdroid/Generated/Android/App/PendingIntent.cs
@@ -198,40 +198,20 @@ public static void WritePendingIntentOrNullToParcel(Android.App.PendingIntent ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getCreatorPackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getIntentSender()"/>
         /// </summary>
-        public Java.Lang.String CreatorPackage
+        /// <returns><see cref="Android.Content.IntentSender"/></returns>
+        public Android.Content.IntentSender GetIntentSender()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCreatorPackage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.IntentSender>("getIntentSender", "()Landroid/content/IntentSender;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getCreatorUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getCreatorUserHandle()"/>
         /// </summary>
-        public int CreatorUid
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetCreatorUserHandle()
         {
-            get { return IExecuteWithSignature<int>("getCreatorUid", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getCreatorUserHandle()"/> 
-        /// </summary>
-        public Android.Os.UserHandle CreatorUserHandle
-        {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getCreatorUserHandle", "()Landroid/os/UserHandle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getIntentSender()"/> 
-        /// </summary>
-        public Android.Content.IntentSender IntentSender
-        {
-            get { return IExecuteWithSignature<Android.Content.IntentSender>("getIntentSender", "()Landroid/content/IntentSender;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getTargetPackage()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String TargetPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTargetPackage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.UserHandle>("getCreatorUserHandle", "()Landroid/os/UserHandle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#isActivity()"/>
@@ -282,6 +262,31 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getCreatorUid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCreatorUid()
+        {
+            return IExecuteWithSignature<int>("getCreatorUid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getCreatorPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCreatorPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCreatorPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#getTargetPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetTargetPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTargetPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/PendingIntent.html#cancel()"/>
         /// </summary>
         public void Cancel()
diff --git a/src/net/Netdroid/Generated/Android/App/People/ConversationStatus.cs b/src/net/Netdroid/Generated/Android/App/People/ConversationStatus.cs
index dd41c8f55..0bb6b233f 100644
--- a/src/net/Netdroid/Generated/Android/App/People/ConversationStatus.cs
+++ b/src/net/Netdroid/Generated/Android/App/People/ConversationStatus.cs
@@ -130,61 +130,68 @@ public partial class ConversationStatus
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getActivity()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getIcon()"/>
         /// </summary>
-        public int Activity
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
         {
-            get { return IExecuteWithSignature<int>("getActivity", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getAvailability()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#describeContents()"/>
         /// </summary>
-        public int Availability
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getAvailability", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getActivity()"/>
         /// </summary>
-        public Java.Lang.CharSequence Description
+        /// <returns><see cref="int"/></returns>
+        public int GetActivity()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getActivity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getEndTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getAvailability()"/>
         /// </summary>
-        public long EndTimeMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetAvailability()
         {
-            get { return IExecuteWithSignature<long>("getEndTimeMillis", "()J"); }
+            return IExecuteWithSignature<int>("getAvailability", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getDescription()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescription()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getId()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getStartTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getEndTimeMillis()"/>
         /// </summary>
-        public long StartTimeMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetEndTimeMillis()
         {
-            get { return IExecuteWithSignature<long>("getStartTimeMillis", "()J"); }
+            return IExecuteWithSignature<long>("getEndTimeMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#getStartTimeMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetStartTimeMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getStartTimeMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/people/ConversationStatus.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Person.cs b/src/net/Netdroid/Generated/Android/App/Person.cs
index 283a03508..8f0fcb875 100644
--- a/src/net/Netdroid/Generated/Android/App/Person.cs
+++ b/src/net/Netdroid/Generated/Android/App/Person.cs
@@ -52,34 +52,6 @@ public partial class Person
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Person.html#getIcon()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Person.html#getKey()"/> 
-        /// </summary>
-        public Java.Lang.String Key
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Person.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Person.html#getUri()"/> 
-        /// </summary>
-        public Java.Lang.String Uri
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUri", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Person.html#toBuilder()"/>
         /// </summary>
         /// <returns><see cref="Android.App.Person.Builder"/></returns>
@@ -88,6 +60,14 @@ public Android.App.Person.Builder ToBuilder()
             return IExecuteWithSignature<Android.App.Person.Builder>("toBuilder", "()Landroid/app/Person$Builder;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Person.html#getIcon()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
+        {
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Person.html#isBot()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -112,6 +92,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Person.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Person.html#getKey()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKey()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Person.html#getUri()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUri()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUri", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Person.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/PictureInPictureParams.cs b/src/net/Netdroid/Generated/Android/App/PictureInPictureParams.cs
index 760a05a97..9edc01832 100644
--- a/src/net/Netdroid/Generated/Android/App/PictureInPictureParams.cs
+++ b/src/net/Netdroid/Generated/Android/App/PictureInPictureParams.cs
@@ -52,53 +52,36 @@ public partial class PictureInPictureParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getCloseAction()"/>
         /// </summary>
-        public Java.Util.List<Android.App.RemoteAction> Actions
+        /// <returns><see cref="Android.App.RemoteAction"/></returns>
+        public Android.App.RemoteAction GetCloseAction()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.RemoteAction>>("getActions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.App.RemoteAction>("getCloseAction", "()Landroid/app/RemoteAction;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getAspectRatio()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getSourceRectHint()"/>
         /// </summary>
-        public Android.Util.Rational AspectRatio
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetSourceRectHint()
         {
-            get { return IExecuteWithSignature<Android.Util.Rational>("getAspectRatio", "()Landroid/util/Rational;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getSourceRectHint", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getCloseAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getAspectRatio()"/>
         /// </summary>
-        public Android.App.RemoteAction CloseAction
+        /// <returns><see cref="Android.Util.Rational"/></returns>
+        public Android.Util.Rational GetAspectRatio()
         {
-            get { return IExecuteWithSignature<Android.App.RemoteAction>("getCloseAction", "()Landroid/app/RemoteAction;"); }
+            return IExecuteWithSignature<Android.Util.Rational>("getAspectRatio", "()Landroid/util/Rational;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getExpandedAspectRatio()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getExpandedAspectRatio()"/>
         /// </summary>
-        public Android.Util.Rational ExpandedAspectRatio
+        /// <returns><see cref="Android.Util.Rational"/></returns>
+        public Android.Util.Rational GetExpandedAspectRatio()
         {
-            get { return IExecuteWithSignature<Android.Util.Rational>("getExpandedAspectRatio", "()Landroid/util/Rational;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getSourceRectHint()"/> 
-        /// </summary>
-        public Android.Graphics.Rect SourceRectHint
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getSourceRectHint", "()Landroid/graphics/Rect;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getSubtitle()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Subtitle
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getTitle()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Title
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Util.Rational>("getExpandedAspectRatio", "()Landroid/util/Rational;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#isAutoEnterEnabled()"/>
@@ -125,6 +108,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getSubtitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSubtitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#getActions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.RemoteAction> GetActions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.RemoteAction>>("getActions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/PictureInPictureParams.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Presentation.cs b/src/net/Netdroid/Generated/Android/App/Presentation.cs
index e79448270..13cb0ba4c 100644
--- a/src/net/Netdroid/Generated/Android/App/Presentation.cs
+++ b/src/net/Netdroid/Generated/Android/App/Presentation.cs
@@ -65,18 +65,20 @@ public Presentation(Android.Content.Context arg0, Android.View.Display arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Presentation.html#getDisplay()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Presentation.html#getResources()"/>
         /// </summary>
-        public Android.View.Display Display
+        /// <returns><see cref="Android.Content.Res.Resources"/></returns>
+        public Android.Content.Res.Resources GetResources()
         {
-            get { return IExecuteWithSignature<Android.View.Display>("getDisplay", "()Landroid/view/Display;"); }
+            return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Presentation.html#getResources()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/Presentation.html#getDisplay()"/>
         /// </summary>
-        public Android.Content.Res.Resources Resources
+        /// <returns><see cref="Android.View.Display"/></returns>
+        public Android.View.Display GetDisplay()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;"); }
+            return IExecuteWithSignature<Android.View.Display>("getDisplay", "()Landroid/view/Display;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Presentation.html#onDisplayChanged()"/>
diff --git a/src/net/Netdroid/Generated/Android/App/ProgressDialog.cs b/src/net/Netdroid/Generated/Android/App/ProgressDialog.cs
index 5e1dbebce..a1c6c37d8 100644
--- a/src/net/Netdroid/Generated/Android/App/ProgressDialog.cs
+++ b/src/net/Netdroid/Generated/Android/App/ProgressDialog.cs
@@ -34,7 +34,7 @@ public partial class ProgressDialog
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ProgressDialog(Android.Content.Context arg0, int arg1)
             : base(arg0, arg1)
         {
@@ -43,7 +43,7 @@ public ProgressDialog(Android.Content.Context arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ProgressDialog(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -59,14 +59,14 @@ public ProgressDialog(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#STYLE_HORIZONTAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STYLE_HORIZONTAL { get { if (!_STYLE_HORIZONTALReady) { _STYLE_HORIZONTALContent = SGetField<int>(LocalBridgeClazz, "STYLE_HORIZONTAL"); _STYLE_HORIZONTALReady = true; } return _STYLE_HORIZONTALContent; } }
         private static int _STYLE_HORIZONTALContent = default;
         private static bool _STYLE_HORIZONTALReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#STYLE_SPINNER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STYLE_SPINNER { get { if (!_STYLE_SPINNERReady) { _STYLE_SPINNERContent = SGetField<int>(LocalBridgeClazz, "STYLE_SPINNER"); _STYLE_SPINNERReady = true; } return _STYLE_SPINNERContent; } }
         private static int _STYLE_SPINNERContent = default;
         private static bool _STYLE_SPINNERReady = false; // this is used because in case of generics 
@@ -84,7 +84,7 @@ public ProgressDialog(Android.Content.Context arg0)
         /// <param name="arg4"><see cref="bool"/></param>
         /// <param name="arg5"><see cref="Android.Content.DialogInterface.OnCancelListener"/></param>
         /// <returns><see cref="Android.App.ProgressDialog"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.App.ProgressDialog Show(Android.Content.Context arg0, Java.Lang.CharSequence arg1, Java.Lang.CharSequence arg2, bool arg3, bool arg4, Android.Content.DialogInterface.OnCancelListener arg5)
         {
             return SExecute<Android.App.ProgressDialog>(LocalBridgeClazz, "show", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -98,7 +98,7 @@ public static Android.App.ProgressDialog Show(Android.Content.Context arg0, Java
         /// <param name="arg3"><see cref="bool"/></param>
         /// <param name="arg4"><see cref="bool"/></param>
         /// <returns><see cref="Android.App.ProgressDialog"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.App.ProgressDialog Show(Android.Content.Context arg0, Java.Lang.CharSequence arg1, Java.Lang.CharSequence arg2, bool arg3, bool arg4)
         {
             return SExecute<Android.App.ProgressDialog>(LocalBridgeClazz, "show", arg0, arg1, arg2, arg3, arg4);
@@ -111,7 +111,7 @@ public static Android.App.ProgressDialog Show(Android.Content.Context arg0, Java
         /// <param name="arg2"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg3"><see cref="bool"/></param>
         /// <returns><see cref="Android.App.ProgressDialog"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.App.ProgressDialog Show(Android.Content.Context arg0, Java.Lang.CharSequence arg1, Java.Lang.CharSequence arg2, bool arg3)
         {
             return SExecute<Android.App.ProgressDialog>(LocalBridgeClazz, "show", arg0, arg1, arg2, arg3);
@@ -123,7 +123,7 @@ public static Android.App.ProgressDialog Show(Android.Content.Context arg0, Java
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg2"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Android.App.ProgressDialog"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.App.ProgressDialog Show(Android.Content.Context arg0, Java.Lang.CharSequence arg1, Java.Lang.CharSequence arg2)
         {
             return SExecute<Android.App.ProgressDialog>(LocalBridgeClazz, "show", arg0, arg1, arg2);
@@ -133,43 +133,46 @@ public static Android.App.ProgressDialog Show(Android.Content.Context arg0, Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#getMax()"/> <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setMax(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#isIndeterminate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Max
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsIndeterminate()
         {
-            get { return IExecuteWithSignature<int>("getMax", "()I"); } set { IExecuteWithSignature("setMax", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isIndeterminate", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#getProgress()"/> <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setProgress(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#getMax()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Progress
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMax()
         {
-            get { return IExecuteWithSignature<int>("getProgress", "()I"); } set { IExecuteWithSignature("setProgress", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMax", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#getSecondaryProgress()"/> <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setSecondaryProgress(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#getProgress()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SecondaryProgress
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetProgress()
         {
-            get { return IExecuteWithSignature<int>("getSecondaryProgress", "()I"); } set { IExecuteWithSignature("setSecondaryProgress", "(I)V", value); }
+            return IExecuteWithSignature<int>("getProgress", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#isIndeterminate()"/>
+        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#getSecondaryProgress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsIndeterminate()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSecondaryProgress()
         {
-            return IExecuteWithSignature<bool>("isIndeterminate", "()Z");
+            return IExecuteWithSignature<int>("getSecondaryProgress", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#incrementProgressBy(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void IncrementProgressBy(int arg0)
         {
             IExecuteWithSignature("incrementProgressBy", "(I)V", arg0);
@@ -178,7 +181,7 @@ public void IncrementProgressBy(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#incrementSecondaryProgressBy(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void IncrementSecondaryProgressBy(int arg0)
         {
             IExecuteWithSignature("incrementSecondaryProgressBy", "(I)V", arg0);
@@ -186,7 +189,7 @@ public void IncrementSecondaryProgressBy(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#onStart()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStart()
         {
             IExecuteWithSignature("onStart", "()V");
@@ -195,7 +198,7 @@ public void OnStart()
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setIndeterminate(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIndeterminate(bool arg0)
         {
             IExecuteWithSignature("setIndeterminate", "(Z)V", arg0);
@@ -204,16 +207,34 @@ public void SetIndeterminate(bool arg0)
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setIndeterminateDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIndeterminateDrawable(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setIndeterminateDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setMax(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetMax(int arg0)
+        {
+            IExecuteWithSignature("setMax", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setProgress(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetProgress(int arg0)
+        {
+            IExecuteWithSignature("setProgress", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setProgressDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProgressDrawable(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setProgressDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
@@ -222,7 +243,7 @@ public void SetProgressDrawable(Android.Graphics.Drawable.Drawable arg0)
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setProgressNumberFormat(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProgressNumberFormat(Java.Lang.String arg0)
         {
             IExecuteWithSignature("setProgressNumberFormat", "(Ljava/lang/String;)V", arg0);
@@ -231,7 +252,7 @@ public void SetProgressNumberFormat(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setProgressPercentFormat(java.text.NumberFormat)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.NumberFormat"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProgressPercentFormat(Java.Text.NumberFormat arg0)
         {
             IExecuteWithSignature("setProgressPercentFormat", "(Ljava/text/NumberFormat;)V", arg0);
@@ -240,11 +261,20 @@ public void SetProgressPercentFormat(Java.Text.NumberFormat arg0)
         /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setProgressStyle(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProgressStyle(int arg0)
         {
             IExecuteWithSignature("setProgressStyle", "(I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/ProgressDialog.html#setSecondaryProgress(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetSecondaryProgress(int arg0)
+        {
+            IExecuteWithSignature("setSecondaryProgress", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/App/RemoteAction.cs b/src/net/Netdroid/Generated/Android/App/RemoteAction.cs
index 5b3a8af23..5ee7e9cb9 100644
--- a/src/net/Netdroid/Generated/Android/App/RemoteAction.cs
+++ b/src/net/Netdroid/Generated/Android/App/RemoteAction.cs
@@ -63,32 +63,12 @@ public RemoteAction(Android.Graphics.Drawable.Icon arg0, Java.Lang.CharSequence
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#getActionIntent()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#getActionIntent()"/>
         /// </summary>
-        public Android.App.PendingIntent ActionIntent
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetActionIntent()
         {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getActionIntent", "()Landroid/app/PendingIntent;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#getContentDescription()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence ContentDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#getIcon()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#getTitle()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Title
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.App.PendingIntent>("getActionIntent", "()Landroid/app/PendingIntent;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#clone()"/>
@@ -99,6 +79,14 @@ public Android.App.RemoteAction Clone()
             return IExecuteWithSignature<Android.App.RemoteAction>("clone", "()Landroid/app/RemoteAction;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#getIcon()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
+        {
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#isEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -123,6 +111,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#getContentDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#getTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/RemoteAction.html#dump(java.lang.String,java.io.PrintWriter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/RemoteInput.cs b/src/net/Netdroid/Generated/Android/App/RemoteInput.cs
index 41178d307..254cb9f64 100644
--- a/src/net/Netdroid/Generated/Android/App/RemoteInput.cs
+++ b/src/net/Netdroid/Generated/Android/App/RemoteInput.cs
@@ -151,69 +151,76 @@ public static void SetResultsSource(Android.Content.Intent arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getAllowedDataTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getExtras()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> AllowedDataTypes
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAllowedDataTypes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getAllowFreeFormInput()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getAllowFreeFormInput()"/>
         /// </summary>
-        public bool AllowFreeFormInput
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowFreeFormInput()
         {
-            get { return IExecuteWithSignature<bool>("getAllowFreeFormInput", "()Z"); }
+            return IExecuteWithSignature<bool>("getAllowFreeFormInput", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getChoices()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#isDataOnly()"/>
         /// </summary>
-        public Java.Lang.CharSequence[] Choices
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDataOnly()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getChoices", "()[Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isDataOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getEditChoicesBeforeSending()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#describeContents()"/>
         /// </summary>
-        public int EditChoicesBeforeSending
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getEditChoicesBeforeSending", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getEditChoicesBeforeSending()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="int"/></returns>
+        public int GetEditChoicesBeforeSending()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getEditChoicesBeforeSending", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getLabel()"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getResultKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getChoices()"/>
         /// </summary>
-        public Java.Lang.String ResultKey
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence[] GetChoices()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResultKey", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getChoices", "()[Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#isDataOnly()"/>
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getResultKey()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDataOnly()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResultKey()
         {
-            return IExecuteWithSignature<bool>("isDataOnly", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getResultKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#getAllowedDataTypes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetAllowedDataTypes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAllowedDataTypes", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/RemoteInput.html#writeToParcel(android.os.Parcel,int)"/>
@@ -257,13 +264,6 @@ public Builder(Java.Lang.String arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/RemoteInput.Builder.html#getExtras()"/> 
-            /// </summary>
-            public Android.Os.Bundle Extras
-            {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/RemoteInput.Builder.html#build()"/>
             /// </summary>
             /// <returns><see cref="Android.App.RemoteInput"/></returns>
@@ -326,6 +326,14 @@ public Android.App.RemoteInput.Builder SetLabel(Java.Lang.CharSequence arg0)
             {
                 return IExecuteWithSignature<Android.App.RemoteInput.Builder>("setLabel", "(Ljava/lang/CharSequence;)Landroid/app/RemoteInput$Builder;", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/RemoteInput.Builder.html#getExtras()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
+            {
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/App/Sdksandbox/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Sdksandbox/AllPackageClasses.cs
index 71d0e3ae1..8f71378d2 100644
--- a/src/net/Netdroid/Generated/Android/App/Sdksandbox/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Sdksandbox/AllPackageClasses.cs
@@ -158,12 +158,12 @@ public partial class SandboxedSdkProvider : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SandboxedSdkProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SandboxedSdkProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SandboxedSdkProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SandboxedSdkProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SandboxedSdkProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SandboxedSdkProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -244,12 +244,12 @@ public partial class SdkSandboxProcessDeathCallback : MASES.JCOBridge.C2JBridge.
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SdkSandboxProcessDeathCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SdkSandboxProcessDeathCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SdkSandboxProcessDeathCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SdkSandboxProcessDeathCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SdkSandboxProcessDeathCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SdkSandboxProcessDeathCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Sdksandbox/AppOwnedSdkSandboxInterface.cs b/src/net/Netdroid/Generated/Android/App/Sdksandbox/AppOwnedSdkSandboxInterface.cs
index f103c212e..1b2541bbe 100644
--- a/src/net/Netdroid/Generated/Android/App/Sdksandbox/AppOwnedSdkSandboxInterface.cs
+++ b/src/net/Netdroid/Generated/Android/App/Sdksandbox/AppOwnedSdkSandboxInterface.cs
@@ -62,33 +62,36 @@ public AppOwnedSdkSandboxInterface(Java.Lang.String arg0, long arg1, Android.Os.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#getInterface()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#getInterface()"/>
         /// </summary>
-        public Android.Os.IBinder Interface
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetInterface()
         {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getInterface", "()Landroid/os/IBinder;"); }
+            return IExecuteWithSignature<Android.Os.IBinder>("getInterface", "()Landroid/os/IBinder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#getName()"/>
         /// </summary>
-        public long Version
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<long>("getVersion", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#getVersion()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetVersion()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getVersion", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/sdksandbox/AppOwnedSdkSandboxInterface.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Sdksandbox/SandboxedSdk.cs b/src/net/Netdroid/Generated/Android/App/Sdksandbox/SandboxedSdk.cs
index cf6f9c825..1f3ce83fb 100644
--- a/src/net/Netdroid/Generated/Android/App/Sdksandbox/SandboxedSdk.cs
+++ b/src/net/Netdroid/Generated/Android/App/Sdksandbox/SandboxedSdk.cs
@@ -60,18 +60,20 @@ public SandboxedSdk(Android.Os.IBinder arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdk.html#getInterface()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdk.html#getSharedLibraryInfo()"/>
         /// </summary>
-        public Android.Os.IBinder Interface
+        /// <returns><see cref="Android.Content.Pm.SharedLibraryInfo"/></returns>
+        public Android.Content.Pm.SharedLibraryInfo GetSharedLibraryInfo()
         {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getInterface", "()Landroid/os/IBinder;"); }
+            return IExecuteWithSignature<Android.Content.Pm.SharedLibraryInfo>("getSharedLibraryInfo", "()Landroid/content/pm/SharedLibraryInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdk.html#getSharedLibraryInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdk.html#getInterface()"/>
         /// </summary>
-        public Android.Content.Pm.SharedLibraryInfo SharedLibraryInfo
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetInterface()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.SharedLibraryInfo>("getSharedLibraryInfo", "()Landroid/content/pm/SharedLibraryInfo;"); }
+            return IExecuteWithSignature<Android.Os.IBinder>("getInterface", "()Landroid/os/IBinder;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdk.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Sdksandbox/SandboxedSdkProvider.cs b/src/net/Netdroid/Generated/Android/App/Sdksandbox/SandboxedSdkProvider.cs
index fe4f47651..4f6f9b6fc 100644
--- a/src/net/Netdroid/Generated/Android/App/Sdksandbox/SandboxedSdkProvider.cs
+++ b/src/net/Netdroid/Generated/Android/App/Sdksandbox/SandboxedSdkProvider.cs
@@ -46,13 +46,6 @@ public partial class SandboxedSdkProvider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdkProvider.html#getContext()"/> 
-        /// </summary>
-        public Android.Content.Context Context
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdkProvider.html#onLoadSdk(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
@@ -75,6 +68,14 @@ public Android.View.View GetView(Android.Content.Context arg0, Android.Os.Bundle
             return IExecute<Android.View.View>("getView", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdkProvider.html#getContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SandboxedSdkProvider.html#attachContext(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Sdksandbox/SdkSandboxManager.cs b/src/net/Netdroid/Generated/Android/App/Sdksandbox/SdkSandboxManager.cs
index aaa8ab1c2..17338d837 100644
--- a/src/net/Netdroid/Generated/Android/App/Sdksandbox/SdkSandboxManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/Sdksandbox/SdkSandboxManager.cs
@@ -138,36 +138,40 @@ public partial class SdkSandboxManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#getSdkSandboxState()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#getSdkSandboxState()"/>
         /// </summary>
-        public static int SdkSandboxState
+        /// <returns><see cref="int"/></returns>
+        public static int GetSdkSandboxState()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getSdkSandboxState", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getSdkSandboxState", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#getAppOwnedSdkSandboxInterfaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#getAppOwnedSdkSandboxInterfaces()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Sdksandbox.AppOwnedSdkSandboxInterface> AppOwnedSdkSandboxInterfaces
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Sdksandbox.AppOwnedSdkSandboxInterface> GetAppOwnedSdkSandboxInterfaces()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Sdksandbox.AppOwnedSdkSandboxInterface>>("getAppOwnedSdkSandboxInterfaces", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.App.Sdksandbox.AppOwnedSdkSandboxInterface>>("getAppOwnedSdkSandboxInterfaces", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#getSandboxedSdks()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#getSandboxedSdks()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Sdksandbox.SandboxedSdk> SandboxedSdks
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Sdksandbox.SandboxedSdk> GetSandboxedSdks()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Sdksandbox.SandboxedSdk>>("getSandboxedSdks", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.App.Sdksandbox.SandboxedSdk>>("getSandboxedSdks", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#getSyncedSharedPreferencesKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#getSyncedSharedPreferencesKeys()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> SyncedSharedPreferencesKeys
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetSyncedSharedPreferencesKeys()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSyncedSharedPreferencesKeys", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSyncedSharedPreferencesKeys", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/sdksandbox/SdkSandboxManager.html#addSdkSandboxProcessDeathCallback(java.util.concurrent.Executor,android.app.sdksandbox.SdkSandboxManager.SdkSandboxProcessDeathCallback)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Sdksandbox/Sdkprovider/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Sdksandbox/Sdkprovider/AllPackageClasses.cs
index ffdd3166c..c8c732b4e 100644
--- a/src/net/Netdroid/Generated/Android/App/Sdksandbox/Sdkprovider/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Sdksandbox/Sdkprovider/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class SdkSandboxActivityHandler : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SdkSandboxActivityHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SdkSandboxActivityHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SdkSandboxActivityHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SdkSandboxActivityHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SdkSandboxActivityHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SdkSandboxActivityHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Sdksandbox/Sdkprovider/SdkSandboxController.cs b/src/net/Netdroid/Generated/Android/App/Sdksandbox/Sdkprovider/SdkSandboxController.cs
index 8402c36f2..9d9774f32 100644
--- a/src/net/Netdroid/Generated/Android/App/Sdksandbox/Sdkprovider/SdkSandboxController.cs
+++ b/src/net/Netdroid/Generated/Android/App/Sdksandbox/Sdkprovider/SdkSandboxController.cs
@@ -52,41 +52,45 @@ public partial class SdkSandboxController
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#getAppOwnedSdkSandboxInterfaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#getClientSharedPreferences()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Sdksandbox.AppOwnedSdkSandboxInterface> AppOwnedSdkSandboxInterfaces
+        /// <returns><see cref="Android.Content.SharedPreferences"/></returns>
+        public Android.Content.SharedPreferences GetClientSharedPreferences()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Sdksandbox.AppOwnedSdkSandboxInterface>>("getAppOwnedSdkSandboxInterfaces", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Content.SharedPreferences>("getClientSharedPreferences", "()Landroid/content/SharedPreferences;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#getClientPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#registerSdkSandboxActivityHandler(android.app.sdksandbox.sdkprovider.SdkSandboxActivityHandler)"/>
         /// </summary>
-        public Java.Lang.String ClientPackageName
+        /// <param name="arg0"><see cref="Android.App.Sdksandbox.Sdkprovider.SdkSandboxActivityHandler"/></param>
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder RegisterSdkSandboxActivityHandler(Android.App.Sdksandbox.Sdkprovider.SdkSandboxActivityHandler arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClientPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.IBinder>("registerSdkSandboxActivityHandler", "(Landroid/app/sdksandbox/sdkprovider/SdkSandboxActivityHandler;)Landroid/os/IBinder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#getClientSharedPreferences()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#getClientPackageName()"/>
         /// </summary>
-        public Android.Content.SharedPreferences ClientSharedPreferences
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClientPackageName()
         {
-            get { return IExecuteWithSignature<Android.Content.SharedPreferences>("getClientSharedPreferences", "()Landroid/content/SharedPreferences;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getClientPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#getSandboxedSdks()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#getAppOwnedSdkSandboxInterfaces()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Sdksandbox.SandboxedSdk> SandboxedSdks
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Sdksandbox.AppOwnedSdkSandboxInterface> GetAppOwnedSdkSandboxInterfaces()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Sdksandbox.SandboxedSdk>>("getSandboxedSdks", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.App.Sdksandbox.AppOwnedSdkSandboxInterface>>("getAppOwnedSdkSandboxInterfaces", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#registerSdkSandboxActivityHandler(android.app.sdksandbox.sdkprovider.SdkSandboxActivityHandler)"/>
+        /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#getSandboxedSdks()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.App.Sdksandbox.Sdkprovider.SdkSandboxActivityHandler"/></param>
-        /// <returns><see cref="Android.Os.IBinder"/></returns>
-        public Android.Os.IBinder RegisterSdkSandboxActivityHandler(Android.App.Sdksandbox.Sdkprovider.SdkSandboxActivityHandler arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Sdksandbox.SandboxedSdk> GetSandboxedSdks()
         {
-            return IExecuteWithSignature<Android.Os.IBinder>("registerSdkSandboxActivityHandler", "(Landroid/app/sdksandbox/sdkprovider/SdkSandboxActivityHandler;)Landroid/os/IBinder;", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.App.Sdksandbox.SandboxedSdk>>("getSandboxedSdks", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/sdksandbox/sdkprovider/SdkSandboxController.html#unregisterSdkSandboxActivityHandler(android.app.sdksandbox.sdkprovider.SdkSandboxActivityHandler)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/SearchManager.cs b/src/net/Netdroid/Generated/Android/App/SearchManager.cs
index ca344ca2e..92d6766c4 100644
--- a/src/net/Netdroid/Generated/Android/App/SearchManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/SearchManager.cs
@@ -358,33 +358,35 @@ public partial class SearchManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchManager.html#getGlobalSearchActivity()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchManager.html#getSearchableInfo(android.content.ComponentName)"/>
         /// </summary>
-        public Android.Content.ComponentName GlobalSearchActivity
+        /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
+        /// <returns><see cref="Android.App.SearchableInfo"/></returns>
+        public Android.App.SearchableInfo GetSearchableInfo(Android.Content.ComponentName arg0)
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getGlobalSearchActivity", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.App.SearchableInfo>("getSearchableInfo", "(Landroid/content/ComponentName;)Landroid/app/SearchableInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchManager.html#getSearchablesInGlobalSearch()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchManager.html#getGlobalSearchActivity()"/>
         /// </summary>
-        public Java.Util.List<Android.App.SearchableInfo> SearchablesInGlobalSearch
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetGlobalSearchActivity()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.SearchableInfo>>("getSearchablesInGlobalSearch", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getGlobalSearchActivity", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchManager.html#getSearchableInfo(android.content.ComponentName)"/>
+        /// <see href="https://developer.android.com/reference/android/app/SearchManager.html#getSearchablesInGlobalSearch()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
-        /// <returns><see cref="Android.App.SearchableInfo"/></returns>
-        public Android.App.SearchableInfo GetSearchableInfo(Android.Content.ComponentName arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.SearchableInfo> GetSearchablesInGlobalSearch()
         {
-            return IExecuteWithSignature<Android.App.SearchableInfo>("getSearchableInfo", "(Landroid/content/ComponentName;)Landroid/app/SearchableInfo;", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.App.SearchableInfo>>("getSearchablesInGlobalSearch", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/SearchManager.html#onCancel(android.content.DialogInterface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.DialogInterface"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCancel(Android.Content.DialogInterface arg0)
         {
             IExecuteWithSignature("onCancel", "(Landroid/content/DialogInterface;)V", arg0);
@@ -393,7 +395,7 @@ public void OnCancel(Android.Content.DialogInterface arg0)
         /// <see href="https://developer.android.com/reference/android/app/SearchManager.html#onDismiss(android.content.DialogInterface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.DialogInterface"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDismiss(Android.Content.DialogInterface arg0)
         {
             IExecuteWithSignature("onDismiss", "(Landroid/content/DialogInterface;)V", arg0);
@@ -472,7 +474,7 @@ public partial class OnCancelListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCancel", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCancelEventHandler));
+                AddEventHandler("onCancel", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCancelEventHandler));
 
             }
 
@@ -480,7 +482,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/SearchManager.OnCancelListener.html#onCancel()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCancel"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnCancel { get; set; } = null;
+            public global::System.Action OnOnCancel { get; set; } = null;
 
             void OnCancelEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -569,7 +571,7 @@ public partial class OnDismissListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDismiss", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDismissEventHandler));
+                AddEventHandler("onDismiss", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDismissEventHandler));
 
             }
 
@@ -577,7 +579,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/SearchManager.OnDismissListener.html#onDismiss()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDismiss"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnDismiss { get; set; } = null;
+            public global::System.Action OnOnDismiss { get; set; } = null;
 
             void OnDismissEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/SearchableInfo.cs b/src/net/Netdroid/Generated/Android/App/SearchableInfo.cs
index 032dd92f4..aa78736a9 100644
--- a/src/net/Netdroid/Generated/Android/App/SearchableInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/SearchableInfo.cs
@@ -52,185 +52,204 @@ public partial class SearchableInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getHintId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSearchActivity()"/>
         /// </summary>
-        public int HintId
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetSearchActivity()
         {
-            get { return IExecuteWithSignature<int>("getHintId", "()I"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getSearchActivity", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getImeOptions()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#autoUrlDetect()"/>
         /// </summary>
-        public int ImeOptions
+        /// <returns><see cref="bool"/></returns>
+        public bool AutoUrlDetect()
         {
-            get { return IExecuteWithSignature<int>("getImeOptions", "()I"); }
+            return IExecuteWithSignature<bool>("autoUrlDetect", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getInputType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceSearchEnabled()"/>
         /// </summary>
-        public int InputType
+        /// <returns><see cref="bool"/></returns>
+        public bool GetVoiceSearchEnabled()
         {
-            get { return IExecuteWithSignature<int>("getInputType", "()I"); }
+            return IExecuteWithSignature<bool>("getVoiceSearchEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSearchActivity()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceSearchLaunchRecognizer()"/>
         /// </summary>
-        public Android.Content.ComponentName SearchActivity
+        /// <returns><see cref="bool"/></returns>
+        public bool GetVoiceSearchLaunchRecognizer()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getSearchActivity", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<bool>("getVoiceSearchLaunchRecognizer", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSettingsDescriptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceSearchLaunchWebSearch()"/>
         /// </summary>
-        public int SettingsDescriptionId
+        /// <returns><see cref="bool"/></returns>
+        public bool GetVoiceSearchLaunchWebSearch()
         {
-            get { return IExecuteWithSignature<int>("getSettingsDescriptionId", "()I"); }
+            return IExecuteWithSignature<bool>("getVoiceSearchLaunchWebSearch", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestAuthority()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#queryAfterZeroResults()"/>
         /// </summary>
-        public Java.Lang.String SuggestAuthority
+        /// <returns><see cref="bool"/></returns>
+        public bool QueryAfterZeroResults()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSuggestAuthority", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("queryAfterZeroResults", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestIntentAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#shouldIncludeInGlobalSearch()"/>
         /// </summary>
-        public Java.Lang.String SuggestIntentAction
+        /// <returns><see cref="bool"/></returns>
+        public bool ShouldIncludeInGlobalSearch()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSuggestIntentAction", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("shouldIncludeInGlobalSearch", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestIntentData()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#shouldRewriteQueryFromData()"/>
         /// </summary>
-        public Java.Lang.String SuggestIntentData
+        /// <returns><see cref="bool"/></returns>
+        public bool ShouldRewriteQueryFromData()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSuggestIntentData", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("shouldRewriteQueryFromData", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestPackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#shouldRewriteQueryFromText()"/>
         /// </summary>
-        public Java.Lang.String SuggestPackage
+        /// <returns><see cref="bool"/></returns>
+        public bool ShouldRewriteQueryFromText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSuggestPackage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("shouldRewriteQueryFromText", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestPath()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String SuggestPath
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSuggestPath", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestSelection()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getHintId()"/>
         /// </summary>
-        public Java.Lang.String SuggestSelection
+        /// <returns><see cref="int"/></returns>
+        public int GetHintId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSuggestSelection", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getHintId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestThreshold()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getImeOptions()"/>
         /// </summary>
-        public int SuggestThreshold
+        /// <returns><see cref="int"/></returns>
+        public int GetImeOptions()
         {
-            get { return IExecuteWithSignature<int>("getSuggestThreshold", "()I"); }
+            return IExecuteWithSignature<int>("getImeOptions", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceLanguageId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getInputType()"/>
         /// </summary>
-        public int VoiceLanguageId
+        /// <returns><see cref="int"/></returns>
+        public int GetInputType()
         {
-            get { return IExecuteWithSignature<int>("getVoiceLanguageId", "()I"); }
+            return IExecuteWithSignature<int>("getInputType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceLanguageModeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSettingsDescriptionId()"/>
         /// </summary>
-        public int VoiceLanguageModeId
+        /// <returns><see cref="int"/></returns>
+        public int GetSettingsDescriptionId()
         {
-            get { return IExecuteWithSignature<int>("getVoiceLanguageModeId", "()I"); }
+            return IExecuteWithSignature<int>("getSettingsDescriptionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceMaxResults()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestThreshold()"/>
         /// </summary>
-        public int VoiceMaxResults
+        /// <returns><see cref="int"/></returns>
+        public int GetSuggestThreshold()
         {
-            get { return IExecuteWithSignature<int>("getVoiceMaxResults", "()I"); }
+            return IExecuteWithSignature<int>("getSuggestThreshold", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoicePromptTextId()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceLanguageId()"/>
         /// </summary>
-        public int VoicePromptTextId
+        /// <returns><see cref="int"/></returns>
+        public int GetVoiceLanguageId()
         {
-            get { return IExecuteWithSignature<int>("getVoicePromptTextId", "()I"); }
+            return IExecuteWithSignature<int>("getVoiceLanguageId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceSearchEnabled()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceLanguageModeId()"/>
         /// </summary>
-        public bool VoiceSearchEnabled
+        /// <returns><see cref="int"/></returns>
+        public int GetVoiceLanguageModeId()
         {
-            get { return IExecuteWithSignature<bool>("getVoiceSearchEnabled", "()Z"); }
+            return IExecuteWithSignature<int>("getVoiceLanguageModeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceSearchLaunchRecognizer()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceMaxResults()"/>
         /// </summary>
-        public bool VoiceSearchLaunchRecognizer
+        /// <returns><see cref="int"/></returns>
+        public int GetVoiceMaxResults()
         {
-            get { return IExecuteWithSignature<bool>("getVoiceSearchLaunchRecognizer", "()Z"); }
+            return IExecuteWithSignature<int>("getVoiceMaxResults", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoiceSearchLaunchWebSearch()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getVoicePromptTextId()"/>
         /// </summary>
-        public bool VoiceSearchLaunchWebSearch
+        /// <returns><see cref="int"/></returns>
+        public int GetVoicePromptTextId()
         {
-            get { return IExecuteWithSignature<bool>("getVoiceSearchLaunchWebSearch", "()Z"); }
+            return IExecuteWithSignature<int>("getVoicePromptTextId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#autoUrlDetect()"/>
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestAuthority()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool AutoUrlDetect()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSuggestAuthority()
         {
-            return IExecuteWithSignature<bool>("autoUrlDetect", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSuggestAuthority", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#queryAfterZeroResults()"/>
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestIntentAction()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool QueryAfterZeroResults()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSuggestIntentAction()
         {
-            return IExecuteWithSignature<bool>("queryAfterZeroResults", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSuggestIntentAction", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#shouldIncludeInGlobalSearch()"/>
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestIntentData()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ShouldIncludeInGlobalSearch()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSuggestIntentData()
         {
-            return IExecuteWithSignature<bool>("shouldIncludeInGlobalSearch", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSuggestIntentData", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#shouldRewriteQueryFromData()"/>
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestPackage()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ShouldRewriteQueryFromData()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSuggestPackage()
         {
-            return IExecuteWithSignature<bool>("shouldRewriteQueryFromData", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSuggestPackage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#shouldRewriteQueryFromText()"/>
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestPath()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ShouldRewriteQueryFromText()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSuggestPath()
         {
-            return IExecuteWithSignature<bool>("shouldRewriteQueryFromText", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSuggestPath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#getSuggestSelection()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSuggestSelection()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getSuggestSelection", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/SearchableInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Service.cs b/src/net/Netdroid/Generated/Android/App/Service.cs
index dfa68d808..0af2a02d2 100644
--- a/src/net/Netdroid/Generated/Android/App/Service.cs
+++ b/src/net/Netdroid/Generated/Android/App/Service.cs
@@ -92,7 +92,7 @@ public partial class Service
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Service.html#STOP_FOREGROUND_LEGACY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STOP_FOREGROUND_LEGACY { get { if (!_STOP_FOREGROUND_LEGACYReady) { _STOP_FOREGROUND_LEGACYContent = SGetField<int>(LocalBridgeClazz, "STOP_FOREGROUND_LEGACY"); _STOP_FOREGROUND_LEGACYReady = true; } return _STOP_FOREGROUND_LEGACYContent; } }
         private static int _STOP_FOREGROUND_LEGACYContent = default;
         private static bool _STOP_FOREGROUND_LEGACYReady = false; // this is used because in case of generics 
@@ -111,20 +111,6 @@ public partial class Service
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Service.html#getApplication()"/> 
-        /// </summary>
-        public Android.App.Application Application
-        {
-            get { return IExecuteWithSignature<Android.App.Application>("getApplication", "()Landroid/app/Application;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/Service.html#getForegroundServiceType()"/> 
-        /// </summary>
-        public int ForegroundServiceType
-        {
-            get { return IExecuteWithSignature<int>("getForegroundServiceType", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Service.html#onBind(android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
@@ -143,6 +129,14 @@ public bool OnUnbind(Android.Content.Intent arg0)
             return IExecuteWithSignature<bool>("onUnbind", "(Landroid/content/Intent;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Service.html#getApplication()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.Application"/></returns>
+        public Android.App.Application GetApplication()
+        {
+            return IExecuteWithSignature<Android.App.Application>("getApplication", "()Landroid/app/Application;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Service.html#stopSelfResult(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -152,6 +146,14 @@ public bool StopSelfResult(int arg0)
             return IExecuteWithSignature<bool>("stopSelfResult", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/Service.html#getForegroundServiceType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetForegroundServiceType()
+        {
+            return IExecuteWithSignature<int>("getForegroundServiceType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/Service.html#startForeground(int,android.app.Notification,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -174,7 +176,7 @@ public void StartForeground(int arg0, Android.App.Notification arg1)
         /// <see href="https://developer.android.com/reference/android/app/Service.html#stopForeground(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopForeground(bool arg0)
         {
             IExecuteWithSignature("stopForeground", "(Z)V", arg0);
@@ -255,7 +257,7 @@ public void OnRebind(Android.Content.Intent arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStart(Android.Content.Intent arg0, int arg1)
         {
             IExecute("onStart", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/App/SharedElementCallback.cs b/src/net/Netdroid/Generated/Android/App/SharedElementCallback.cs
index c92565517..be3448f40 100644
--- a/src/net/Netdroid/Generated/Android/App/SharedElementCallback.cs
+++ b/src/net/Netdroid/Generated/Android/App/SharedElementCallback.cs
@@ -142,7 +142,7 @@ public partial class OnSharedElementsReadyListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSharedElementsReady", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnSharedElementsReadyEventHandler));
+                AddEventHandler("onSharedElementsReady", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnSharedElementsReadyEventHandler));
 
             }
 
@@ -150,7 +150,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/SharedElementCallback.OnSharedElementsReadyListener.html#onSharedElementsReady()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSharedElementsReady"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnSharedElementsReady { get; set; } = null;
+            public global::System.Action OnOnSharedElementsReady { get; set; } = null;
 
             void OnSharedElementsReadyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/Slice/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Slice/AllPackageClasses.cs
index f07e58931..7b3aab4bb 100644
--- a/src/net/Netdroid/Generated/Android/App/Slice/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Slice/AllPackageClasses.cs
@@ -256,12 +256,12 @@ public partial class SliceProvider : Android.Content.ContentProvider
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SliceProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SliceProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SliceProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SliceProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SliceProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SliceProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Slice/Slice.cs b/src/net/Netdroid/Generated/Android/App/Slice/Slice.cs
index 8d39545ef..09bc4b6f2 100644
--- a/src/net/Netdroid/Generated/Android/App/Slice/Slice.cs
+++ b/src/net/Netdroid/Generated/Android/App/Slice/Slice.cs
@@ -232,32 +232,20 @@ public partial class Slice
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#getHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#getSpec()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> Hints
+        /// <returns><see cref="Android.App.Slice.SliceSpec"/></returns>
+        public Android.App.Slice.SliceSpec GetSpec()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getHints", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.App.Slice.SliceSpec>("getSpec", "()Landroid/app/slice/SliceSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#getItems()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#getUri()"/>
         /// </summary>
-        public Java.Util.List<Android.App.Slice.SliceItem> Items
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUri()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.Slice.SliceItem>>("getItems", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#getSpec()"/> 
-        /// </summary>
-        public Android.App.Slice.SliceSpec Spec
-        {
-            get { return IExecuteWithSignature<Android.App.Slice.SliceSpec>("getSpec", "()Landroid/app/slice/SliceSpec;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#getUri()"/> 
-        /// </summary>
-        public Android.Net.Uri Uri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#isCallerNeeded()"/>
@@ -276,6 +264,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#getItems()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.Slice.SliceItem> GetItems()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.Slice.SliceItem>>("getItems", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#getHints()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetHints()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getHints", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/slice/Slice.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Slice/SliceItem.cs b/src/net/Netdroid/Generated/Android/App/Slice/SliceItem.cs
index 2a5a7a532..21de62a1e 100644
--- a/src/net/Netdroid/Generated/Android/App/Slice/SliceItem.cs
+++ b/src/net/Netdroid/Generated/Android/App/Slice/SliceItem.cs
@@ -100,98 +100,109 @@ public partial class SliceItem
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getAction()"/>
         /// </summary>
-        public Android.App.PendingIntent Action
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetAction()
         {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getAction", "()Landroid/app/PendingIntent;"); }
+            return IExecuteWithSignature<Android.App.PendingIntent>("getAction", "()Landroid/app/PendingIntent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getBundle()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getRemoteInput()"/>
         /// </summary>
-        public Android.Os.Bundle Bundle
+        /// <returns><see cref="Android.App.RemoteInput"/></returns>
+        public Android.App.RemoteInput GetRemoteInput()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getBundle", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.App.RemoteInput>("getRemoteInput", "()Landroid/app/RemoteInput;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getSlice()"/>
         /// </summary>
-        public Java.Lang.String Format
+        /// <returns><see cref="Android.App.Slice.Slice"/></returns>
+        public Android.App.Slice.Slice GetSlice()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getIcon()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> Hints
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getHints", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getBundle()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetBundle()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getBundle", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getInt()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#hasHint(java.lang.String)"/>
         /// </summary>
-        public int Int
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool HasHint(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<int>("getInt", "()I"); }
+            return IExecuteWithSignature<bool>("hasHint", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#describeContents()"/>
         /// </summary>
-        public long Long
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getLong", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getRemoteInput()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getInt()"/>
         /// </summary>
-        public Android.App.RemoteInput RemoteInput
+        /// <returns><see cref="int"/></returns>
+        public int GetInt()
         {
-            get { return IExecuteWithSignature<Android.App.RemoteInput>("getRemoteInput", "()Landroid/app/RemoteInput;"); }
+            return IExecuteWithSignature<int>("getInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getSlice()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getText()"/>
         /// </summary>
-        public Android.App.Slice.Slice Slice
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
         {
-            get { return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getSubType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getFormat()"/>
         /// </summary>
-        public Java.Lang.String SubType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFormat()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getSubType()"/>
         /// </summary>
-        public Java.Lang.CharSequence Text
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubType()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSubType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#hasHint(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getHints()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasHint(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetHints()
         {
-            return IExecuteWithSignature<bool>("hasHint", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getHints", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#getLong()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetLong()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getLong", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/slice/SliceItem.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Slice/SliceManager.cs b/src/net/Netdroid/Generated/Android/App/Slice/SliceManager.cs
index 5e6bcceb3..f9899bc1c 100644
--- a/src/net/Netdroid/Generated/Android/App/Slice/SliceManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/Slice/SliceManager.cs
@@ -58,13 +58,6 @@ public partial class SliceManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceManager.html#getPinnedSlices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Net.Uri> PinnedSlices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getPinnedSlices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/slice/SliceManager.html#bindSlice(android.content.Intent,java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
@@ -114,6 +107,14 @@ public int CheckSlicePermission(Android.Net.Uri arg0, int arg1, int arg2)
             return IExecuteWithSignature<Java.Util.Collection<Android.Net.Uri>>("getSliceDescendants", "(Landroid/net/Uri;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceManager.html#getPinnedSlices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Uri> GetPinnedSlices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getPinnedSlices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/slice/SliceManager.html#getPinnedSpecs(android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/Slice/SliceSpec.cs b/src/net/Netdroid/Generated/Android/App/Slice/SliceSpec.cs
index a7ee73b96..0ed72ddbb 100644
--- a/src/net/Netdroid/Generated/Android/App/Slice/SliceSpec.cs
+++ b/src/net/Netdroid/Generated/Android/App/Slice/SliceSpec.cs
@@ -61,20 +61,6 @@ public SliceSpec(Java.Lang.String arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceSpec.html#getRevision()"/> 
-        /// </summary>
-        public int Revision
-        {
-            get { return IExecuteWithSignature<int>("getRevision", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/slice/SliceSpec.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/slice/SliceSpec.html#canRender(android.app.slice.SliceSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Slice.SliceSpec"/></param>
@@ -92,6 +78,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceSpec.html#getRevision()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRevision()
+        {
+            return IExecuteWithSignature<int>("getRevision", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/slice/SliceSpec.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/slice/SliceSpec.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/SyncNotedAppOp.cs b/src/net/Netdroid/Generated/Android/App/SyncNotedAppOp.cs
index 79f1a1686..fd6cfcaad 100644
--- a/src/net/Netdroid/Generated/Android/App/SyncNotedAppOp.cs
+++ b/src/net/Netdroid/Generated/Android/App/SyncNotedAppOp.cs
@@ -61,26 +61,28 @@ public SyncNotedAppOp(int arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SyncNotedAppOp.html#getAttributionTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SyncNotedAppOp.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String AttributionTag
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SyncNotedAppOp.html#getOp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/SyncNotedAppOp.html#getAttributionTag()"/>
         /// </summary>
-        public Java.Lang.String Op
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAttributionTag()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOp", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/SyncNotedAppOp.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/SyncNotedAppOp.html#getOp()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOp()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getOp", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/SyncNotedAppOp.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/TabActivity.cs b/src/net/Netdroid/Generated/Android/App/TabActivity.cs
index 0e6a492f8..18bec25e7 100644
--- a/src/net/Netdroid/Generated/Android/App/TabActivity.cs
+++ b/src/net/Netdroid/Generated/Android/App/TabActivity.cs
@@ -46,26 +46,28 @@ public partial class TabActivity
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/TabActivity.html#getTabHost()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/TabActivity.html#getTabHost()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.TabHost TabHost
+        /// <returns><see cref="Android.Widget.TabHost"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.TabHost GetTabHost()
         {
-            get { return IExecuteWithSignature<Android.Widget.TabHost>("getTabHost", "()Landroid/widget/TabHost;"); }
+            return IExecuteWithSignature<Android.Widget.TabHost>("getTabHost", "()Landroid/widget/TabHost;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/TabActivity.html#getTabWidget()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/TabActivity.html#getTabWidget()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.TabWidget TabWidget
+        /// <returns><see cref="Android.Widget.TabWidget"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.TabWidget GetTabWidget()
         {
-            get { return IExecuteWithSignature<Android.Widget.TabWidget>("getTabWidget", "()Landroid/widget/TabWidget;"); }
+            return IExecuteWithSignature<Android.Widget.TabWidget>("getTabWidget", "()Landroid/widget/TabWidget;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/TabActivity.html#setDefaultTab(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDefaultTab(int arg0)
         {
             IExecuteWithSignature("setDefaultTab", "(I)V", arg0);
@@ -74,7 +76,7 @@ public void SetDefaultTab(int arg0)
         /// <see href="https://developer.android.com/reference/android/app/TabActivity.html#setDefaultTab(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDefaultTab(Java.Lang.String arg0)
         {
             IExecuteWithSignature("setDefaultTab", "(Ljava/lang/String;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/App/TaskStackBuilder.cs b/src/net/Netdroid/Generated/Android/App/TaskStackBuilder.cs
index 67aef9715..19c1e796f 100644
--- a/src/net/Netdroid/Generated/Android/App/TaskStackBuilder.cs
+++ b/src/net/Netdroid/Generated/Android/App/TaskStackBuilder.cs
@@ -55,20 +55,6 @@ public static Android.App.TaskStackBuilder Create(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/TaskStackBuilder.html#getIntentCount()"/> 
-        /// </summary>
-        public int IntentCount
-        {
-            get { return IExecuteWithSignature<int>("getIntentCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/TaskStackBuilder.html#getIntents()"/> 
-        /// </summary>
-        public Android.Content.Intent[] Intents
-        {
-            get { return IExecuteWithSignatureArray<Android.Content.Intent>("getIntents", "()[Landroid/content/Intent;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/TaskStackBuilder.html#getPendingIntent(int,int,android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -144,6 +130,22 @@ public Android.Content.Intent EditIntentAt(int arg0)
             return IExecuteWithSignature<Android.Content.Intent>("editIntentAt", "(I)Landroid/content/Intent;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/TaskStackBuilder.html#getIntents()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent[] GetIntents()
+        {
+            return IExecuteWithSignatureArray<Android.Content.Intent>("getIntents", "()[Landroid/content/Intent;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/TaskStackBuilder.html#getIntentCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIntentCount()
+        {
+            return IExecuteWithSignature<int>("getIntentCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/TaskStackBuilder.html#startActivities()"/>
         /// </summary>
         public void StartActivities()
diff --git a/src/net/Netdroid/Generated/Android/App/TimePickerDialog.cs b/src/net/Netdroid/Generated/Android/App/TimePickerDialog.cs
index 557d290e6..8f2e84928 100644
--- a/src/net/Netdroid/Generated/Android/App/TimePickerDialog.cs
+++ b/src/net/Netdroid/Generated/Android/App/TimePickerDialog.cs
@@ -127,7 +127,7 @@ public partial class OnTimeSetListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTimeSet", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TimePicker>>>(OnTimeSetEventHandler));
+                AddEventHandler("onTimeSet", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TimePicker>>>(OnTimeSetEventHandler));
 
             }
 
@@ -135,7 +135,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/TimePickerDialog.OnTimeSetListener.html#onTimeSet(android.widget.TimePicker,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTimeSet"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.TimePicker, int, int> OnOnTimeSet { get; set; } = null;
+            public global::System.Action<Android.Widget.TimePicker, int, int> OnOnTimeSet { get; set; } = null;
 
             void OnTimeSetEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.TimePicker>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/UiAutomation.cs b/src/net/Netdroid/Generated/Android/App/UiAutomation.cs
index 417c87e71..15ad13bf1 100644
--- a/src/net/Netdroid/Generated/Android/App/UiAutomation.cs
+++ b/src/net/Netdroid/Generated/Android/App/UiAutomation.cs
@@ -94,40 +94,12 @@ public partial class UiAutomation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getRootInActiveWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getServiceInfo()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo RootInActiveWindow
+        /// <returns><see cref="Android.Accessibilityservice.AccessibilityServiceInfo"/></returns>
+        public Android.Accessibilityservice.AccessibilityServiceInfo GetServiceInfo()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getRootInActiveWindow", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getServiceInfo()"/> <see href="https://developer.android.com/reference/android/app/UiAutomation.html#setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo)"/>
-        /// </summary>
-        public Android.Accessibilityservice.AccessibilityServiceInfo ServiceInfo
-        {
-            get { return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityServiceInfo>("getServiceInfo", "()Landroid/accessibilityservice/AccessibilityServiceInfo;"); } set { IExecuteWithSignature("setServiceInfo", "(Landroid/accessibilityservice/AccessibilityServiceInfo;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getWindowAnimationFrameStats()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.View.WindowAnimationFrameStats WindowAnimationFrameStats
-        {
-            get { return IExecuteWithSignature<Android.View.WindowAnimationFrameStats>("getWindowAnimationFrameStats", "()Landroid/view/WindowAnimationFrameStats;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getWindows()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo> Windows
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>>("getWindows", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getWindowsOnAllDisplays()"/> 
-        /// </summary>
-        public Android.Util.SparseArray<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>> WindowsOnAllDisplays
-        {
-            get { return IExecuteWithSignature<Android.Util.SparseArray<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>>>("getWindowsOnAllDisplays", "()Landroid/util/SparseArray;"); }
+            return IExecuteWithSignature<Android.Accessibilityservice.AccessibilityServiceInfo>("getServiceInfo", "()Landroid/accessibilityservice/AccessibilityServiceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#takeScreenshot()"/>
@@ -174,6 +146,14 @@ public Android.Os.ParcelFileDescriptor[] ExecuteShellCommandRwe(Java.Lang.String
             return IExecuteWithSignatureArray<Android.Os.ParcelFileDescriptor>("executeShellCommandRwe", "(Ljava/lang/String;)[Landroid/os/ParcelFileDescriptor;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getWindowsOnAllDisplays()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>> GetWindowsOnAllDisplays()
+        {
+            return IExecuteWithSignature<Android.Util.SparseArray<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>>>("getWindowsOnAllDisplays", "()Landroid/util/SparseArray;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#executeAndWaitForEvent(java.lang.Runnable,android.app.UiAutomation.AccessibilityEventFilter,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
@@ -195,6 +175,23 @@ public Android.View.Accessibility.AccessibilityNodeInfo FindFocus(int arg0)
             return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("findFocus", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getRootInActiveWindow()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetRootInActiveWindow()
+        {
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getRootInActiveWindow", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getWindowAnimationFrameStats()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.WindowAnimationFrameStats"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.WindowAnimationFrameStats GetWindowAnimationFrameStats()
+        {
+            return IExecuteWithSignature<Android.View.WindowAnimationFrameStats>("getWindowAnimationFrameStats", "()Landroid/view/WindowAnimationFrameStats;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getWindowContentFrameStats(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -249,6 +246,14 @@ public bool SetRotation(int arg0)
             return IExecuteWithSignature<bool>("setRotation", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#getWindows()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo> GetWindows()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityWindowInfo>>("getWindows", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#adoptShellPermissionIdentity()"/>
         /// </summary>
         public void AdoptShellPermissionIdentity()
@@ -266,7 +271,7 @@ public void AdoptShellPermissionIdentity(params Java.Lang.String[] arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#clearWindowAnimationFrameStats()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearWindowAnimationFrameStats()
         {
             IExecuteWithSignature("clearWindowAnimationFrameStats", "()V");
@@ -341,6 +346,14 @@ public void SetRunAsMonkey(bool arg0)
             IExecuteWithSignature("setRunAsMonkey", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Accessibilityservice.AccessibilityServiceInfo"/></param>
+        public void SetServiceInfo(Android.Accessibilityservice.AccessibilityServiceInfo arg0)
+        {
+            IExecuteWithSignature("setServiceInfo", "(Landroid/accessibilityservice/AccessibilityServiceInfo;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/UiAutomation.html#waitForIdle(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -419,7 +432,7 @@ public partial class OnAccessibilityEventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAccessibilityEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Accessibility.AccessibilityEvent>>>(OnAccessibilityEventEventHandler));
+                AddEventHandler("onAccessibilityEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Accessibility.AccessibilityEvent>>>(OnAccessibilityEventEventHandler));
 
             }
 
@@ -427,7 +440,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/UiAutomation.OnAccessibilityEventListener.html#onAccessibilityEvent(android.view.accessibility.AccessibilityEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAccessibilityEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Accessibility.AccessibilityEvent> OnOnAccessibilityEvent { get; set; } = null;
+            public global::System.Action<Android.View.Accessibility.AccessibilityEvent> OnOnAccessibilityEvent { get; set; } = null;
 
             void OnAccessibilityEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Accessibility.AccessibilityEvent>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/UiModeManager.cs b/src/net/Netdroid/Generated/Android/App/UiModeManager.cs
index 0aa0239b2..d5e14c131 100644
--- a/src/net/Netdroid/Generated/Android/App/UiModeManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/UiModeManager.cs
@@ -104,39 +104,44 @@ public partial class UiModeManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getContrast()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getContrast()"/>
         /// </summary>
-        public float Contrast
+        /// <returns><see cref="float"/></returns>
+        public float GetContrast()
         {
-            get { return IExecuteWithSignature<float>("getContrast", "()F"); }
+            return IExecuteWithSignature<float>("getContrast", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getCurrentModeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getCurrentModeType()"/>
         /// </summary>
-        public int CurrentModeType
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentModeType()
         {
-            get { return IExecuteWithSignature<int>("getCurrentModeType", "()I"); }
+            return IExecuteWithSignature<int>("getCurrentModeType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getCustomNightModeEnd()"/> <see href="https://developer.android.com/reference/android/app/UiModeManager.html#setCustomNightModeEnd(java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getNightMode()"/>
         /// </summary>
-        public Java.Time.LocalTime CustomNightModeEnd
+        /// <returns><see cref="int"/></returns>
+        public int GetNightMode()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalTime>("getCustomNightModeEnd", "()Ljava/time/LocalTime;"); } set { IExecuteWithSignature("setCustomNightModeEnd", "(Ljava/time/LocalTime;)V", value); }
+            return IExecuteWithSignature<int>("getNightMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getCustomNightModeStart()"/> <see href="https://developer.android.com/reference/android/app/UiModeManager.html#setCustomNightModeStart(java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getCustomNightModeEnd()"/>
         /// </summary>
-        public Java.Time.LocalTime CustomNightModeStart
+        /// <returns><see cref="Java.Time.LocalTime"/></returns>
+        public Java.Time.LocalTime GetCustomNightModeEnd()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalTime>("getCustomNightModeStart", "()Ljava/time/LocalTime;"); } set { IExecuteWithSignature("setCustomNightModeStart", "(Ljava/time/LocalTime;)V", value); }
+            return IExecuteWithSignature<Java.Time.LocalTime>("getCustomNightModeEnd", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getNightMode()"/> <see href="https://developer.android.com/reference/android/app/UiModeManager.html#setNightMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#getCustomNightModeStart()"/>
         /// </summary>
-        public int NightMode
+        /// <returns><see cref="Java.Time.LocalTime"/></returns>
+        public Java.Time.LocalTime GetCustomNightModeStart()
         {
-            get { return IExecuteWithSignature<int>("getNightMode", "()I"); } set { IExecuteWithSignature("setNightMode", "(I)V", value); }
+            return IExecuteWithSignature<Java.Time.LocalTime>("getCustomNightModeStart", "()Ljava/time/LocalTime;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#addContrastChangeListener(java.util.concurrent.Executor,android.app.UiModeManager.ContrastChangeListener)"/>
@@ -179,6 +184,30 @@ public void SetApplicationNightMode(int arg0)
         {
             IExecuteWithSignature("setApplicationNightMode", "(I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#setCustomNightModeEnd(java.time.LocalTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
+        public void SetCustomNightModeEnd(Java.Time.LocalTime arg0)
+        {
+            IExecuteWithSignature("setCustomNightModeEnd", "(Ljava/time/LocalTime;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#setCustomNightModeStart(java.time.LocalTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
+        public void SetCustomNightModeStart(Java.Time.LocalTime arg0)
+        {
+            IExecuteWithSignature("setCustomNightModeStart", "(Ljava/time/LocalTime;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/UiModeManager.html#setNightMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNightMode(int arg0)
+        {
+            IExecuteWithSignature("setNightMode", "(I)V", arg0);
+        }
 
         #endregion
 
@@ -208,7 +237,7 @@ public partial class ContrastChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onContrastChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<float>>>(OnContrastChangedEventHandler));
+                AddEventHandler("onContrastChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<float>>>(OnContrastChangedEventHandler));
 
             }
 
@@ -216,7 +245,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/UiModeManager.ContrastChangeListener.html#onContrastChanged(float)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnContrastChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<float> OnOnContrastChanged { get; set; } = null;
+            public global::System.Action<float> OnOnContrastChanged { get; set; } = null;
 
             void OnContrastChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<float>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/App/Usage/AllPackageClasses.cs
index 5f9c3f0ef..689296510 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/AllPackageClasses.cs
@@ -296,12 +296,12 @@ public partial class UsageCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Usa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("UsageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("UsageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public UsageCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("UsageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("UsageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public UsageCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/ConfigurationStats.cs b/src/net/Netdroid/Generated/Android/App/Usage/ConfigurationStats.cs
index eb668d94a..a1662c1c3 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/ConfigurationStats.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/ConfigurationStats.cs
@@ -60,54 +60,60 @@ public ConfigurationStats(Android.App.Usage.ConfigurationStats arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getActivationCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getConfiguration()"/>
         /// </summary>
-        public int ActivationCount
+        /// <returns><see cref="Android.Content.Res.Configuration"/></returns>
+        public Android.Content.Res.Configuration GetConfiguration()
         {
-            get { return IExecuteWithSignature<int>("getActivationCount", "()I"); }
+            return IExecuteWithSignature<Android.Content.Res.Configuration>("getConfiguration", "()Landroid/content/res/Configuration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getConfiguration()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#describeContents()"/>
         /// </summary>
-        public Android.Content.Res.Configuration Configuration
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.Configuration>("getConfiguration", "()Landroid/content/res/Configuration;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getFirstTimeStamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getActivationCount()"/>
         /// </summary>
-        public long FirstTimeStamp
+        /// <returns><see cref="int"/></returns>
+        public int GetActivationCount()
         {
-            get { return IExecuteWithSignature<long>("getFirstTimeStamp", "()J"); }
+            return IExecuteWithSignature<int>("getActivationCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getLastTimeActive()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getFirstTimeStamp()"/>
         /// </summary>
-        public long LastTimeActive
+        /// <returns><see cref="long"/></returns>
+        public long GetFirstTimeStamp()
         {
-            get { return IExecuteWithSignature<long>("getLastTimeActive", "()J"); }
+            return IExecuteWithSignature<long>("getFirstTimeStamp", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getLastTimeStamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getLastTimeActive()"/>
         /// </summary>
-        public long LastTimeStamp
+        /// <returns><see cref="long"/></returns>
+        public long GetLastTimeActive()
         {
-            get { return IExecuteWithSignature<long>("getLastTimeStamp", "()J"); }
+            return IExecuteWithSignature<long>("getLastTimeActive", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getTotalTimeActive()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getLastTimeStamp()"/>
         /// </summary>
-        public long TotalTimeActive
+        /// <returns><see cref="long"/></returns>
+        public long GetLastTimeStamp()
         {
-            get { return IExecuteWithSignature<long>("getTotalTimeActive", "()J"); }
+            return IExecuteWithSignature<long>("getLastTimeStamp", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#getTotalTimeActive()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalTimeActive()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTotalTimeActive", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/usage/ConfigurationStats.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/EventStats.cs b/src/net/Netdroid/Generated/Android/App/Usage/EventStats.cs
index b802262f6..c55f32b1b 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/EventStats.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/EventStats.cs
@@ -60,54 +60,60 @@ public EventStats(Android.App.Usage.EventStats arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#describeContents()"/>
         /// </summary>
-        public int Count
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getEventType()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getCount()"/>
         /// </summary>
-        public int EventType
+        /// <returns><see cref="int"/></returns>
+        public int GetCount()
         {
-            get { return IExecuteWithSignature<int>("getEventType", "()I"); }
+            return IExecuteWithSignature<int>("getCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getFirstTimeStamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getEventType()"/>
         /// </summary>
-        public long FirstTimeStamp
+        /// <returns><see cref="int"/></returns>
+        public int GetEventType()
         {
-            get { return IExecuteWithSignature<long>("getFirstTimeStamp", "()J"); }
+            return IExecuteWithSignature<int>("getEventType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getLastEventTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getFirstTimeStamp()"/>
         /// </summary>
-        public long LastEventTime
+        /// <returns><see cref="long"/></returns>
+        public long GetFirstTimeStamp()
         {
-            get { return IExecuteWithSignature<long>("getLastEventTime", "()J"); }
+            return IExecuteWithSignature<long>("getFirstTimeStamp", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getLastTimeStamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getLastEventTime()"/>
         /// </summary>
-        public long LastTimeStamp
+        /// <returns><see cref="long"/></returns>
+        public long GetLastEventTime()
         {
-            get { return IExecuteWithSignature<long>("getLastTimeStamp", "()J"); }
+            return IExecuteWithSignature<long>("getLastEventTime", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getTotalTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getLastTimeStamp()"/>
         /// </summary>
-        public long TotalTime
+        /// <returns><see cref="long"/></returns>
+        public long GetLastTimeStamp()
         {
-            get { return IExecuteWithSignature<long>("getTotalTime", "()J"); }
+            return IExecuteWithSignature<long>("getLastTimeStamp", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#getTotalTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTotalTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/usage/EventStats.html#add(android.app.usage.EventStats)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/ExternalStorageStats.cs b/src/net/Netdroid/Generated/Android/App/Usage/ExternalStorageStats.cs
index 6cc84569a..d6f48e5ce 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/ExternalStorageStats.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/ExternalStorageStats.cs
@@ -52,47 +52,52 @@ public partial class ExternalStorageStats
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getAppBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#describeContents()"/>
         /// </summary>
-        public long AppBytes
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getAppBytes", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getAudioBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getAppBytes()"/>
         /// </summary>
-        public long AudioBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetAppBytes()
         {
-            get { return IExecuteWithSignature<long>("getAudioBytes", "()J"); }
+            return IExecuteWithSignature<long>("getAppBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getImageBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getAudioBytes()"/>
         /// </summary>
-        public long ImageBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetAudioBytes()
         {
-            get { return IExecuteWithSignature<long>("getImageBytes", "()J"); }
+            return IExecuteWithSignature<long>("getAudioBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getTotalBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getImageBytes()"/>
         /// </summary>
-        public long TotalBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetImageBytes()
         {
-            get { return IExecuteWithSignature<long>("getTotalBytes", "()J"); }
+            return IExecuteWithSignature<long>("getImageBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getVideoBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getTotalBytes()"/>
         /// </summary>
-        public long VideoBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalBytes()
         {
-            get { return IExecuteWithSignature<long>("getVideoBytes", "()J"); }
+            return IExecuteWithSignature<long>("getTotalBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#getVideoBytes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetVideoBytes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getVideoBytes", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/usage/ExternalStorageStats.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/NetworkStats.cs b/src/net/Netdroid/Generated/Android/App/Usage/NetworkStats.cs
index d965bc6ce..88b859134 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/NetworkStats.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/NetworkStats.cs
@@ -190,88 +190,100 @@ public partial class Bucket
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getDefaultNetworkStatus()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getDefaultNetworkStatus()"/>
             /// </summary>
-            public int DefaultNetworkStatus
+            /// <returns><see cref="int"/></returns>
+            public int GetDefaultNetworkStatus()
             {
-                get { return IExecuteWithSignature<int>("getDefaultNetworkStatus", "()I"); }
+                return IExecuteWithSignature<int>("getDefaultNetworkStatus", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getEndTimeStamp()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getMetered()"/>
             /// </summary>
-            public long EndTimeStamp
+            /// <returns><see cref="int"/></returns>
+            public int GetMetered()
             {
-                get { return IExecuteWithSignature<long>("getEndTimeStamp", "()J"); }
+                return IExecuteWithSignature<int>("getMetered", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getMetered()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getRoaming()"/>
             /// </summary>
-            public int Metered
+            /// <returns><see cref="int"/></returns>
+            public int GetRoaming()
             {
-                get { return IExecuteWithSignature<int>("getMetered", "()I"); }
+                return IExecuteWithSignature<int>("getRoaming", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getRoaming()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getState()"/>
             /// </summary>
-            public int Roaming
+            /// <returns><see cref="int"/></returns>
+            public int GetState()
             {
-                get { return IExecuteWithSignature<int>("getRoaming", "()I"); }
+                return IExecuteWithSignature<int>("getState", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getRxBytes()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getTag()"/>
             /// </summary>
-            public long RxBytes
+            /// <returns><see cref="int"/></returns>
+            public int GetTag()
             {
-                get { return IExecuteWithSignature<long>("getRxBytes", "()J"); }
+                return IExecuteWithSignature<int>("getTag", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getRxPackets()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getUid()"/>
             /// </summary>
-            public long RxPackets
+            /// <returns><see cref="int"/></returns>
+            public int GetUid()
             {
-                get { return IExecuteWithSignature<long>("getRxPackets", "()J"); }
+                return IExecuteWithSignature<int>("getUid", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getStartTimeStamp()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getEndTimeStamp()"/>
             /// </summary>
-            public long StartTimeStamp
+            /// <returns><see cref="long"/></returns>
+            public long GetEndTimeStamp()
             {
-                get { return IExecuteWithSignature<long>("getStartTimeStamp", "()J"); }
+                return IExecuteWithSignature<long>("getEndTimeStamp", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getState()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getRxBytes()"/>
             /// </summary>
-            public int State
+            /// <returns><see cref="long"/></returns>
+            public long GetRxBytes()
             {
-                get { return IExecuteWithSignature<int>("getState", "()I"); }
+                return IExecuteWithSignature<long>("getRxBytes", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getTag()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getRxPackets()"/>
             /// </summary>
-            public int Tag
+            /// <returns><see cref="long"/></returns>
+            public long GetRxPackets()
             {
-                get { return IExecuteWithSignature<int>("getTag", "()I"); }
+                return IExecuteWithSignature<long>("getRxPackets", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getTxBytes()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getStartTimeStamp()"/>
             /// </summary>
-            public long TxBytes
+            /// <returns><see cref="long"/></returns>
+            public long GetStartTimeStamp()
             {
-                get { return IExecuteWithSignature<long>("getTxBytes", "()J"); }
+                return IExecuteWithSignature<long>("getStartTimeStamp", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getTxPackets()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getTxBytes()"/>
             /// </summary>
-            public long TxPackets
+            /// <returns><see cref="long"/></returns>
+            public long GetTxBytes()
             {
-                get { return IExecuteWithSignature<long>("getTxPackets", "()J"); }
+                return IExecuteWithSignature<long>("getTxBytes", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getUid()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/NetworkStats.Bucket.html#getTxPackets()"/>
             /// </summary>
-            public int Uid
+            /// <returns><see cref="long"/></returns>
+            public long GetTxPackets()
             {
-                get { return IExecuteWithSignature<int>("getUid", "()I"); }
+                return IExecuteWithSignature<long>("getTxPackets", "()J");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/StorageStats.cs b/src/net/Netdroid/Generated/Android/App/Usage/StorageStats.cs
index 6920955dd..fe3dc7fd4 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/StorageStats.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/StorageStats.cs
@@ -52,40 +52,44 @@ public partial class StorageStats
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#getAppBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#describeContents()"/>
         /// </summary>
-        public long AppBytes
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getAppBytes", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#getCacheBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#getAppBytes()"/>
         /// </summary>
-        public long CacheBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetAppBytes()
         {
-            get { return IExecuteWithSignature<long>("getCacheBytes", "()J"); }
+            return IExecuteWithSignature<long>("getAppBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#getDataBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#getCacheBytes()"/>
         /// </summary>
-        public long DataBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetCacheBytes()
         {
-            get { return IExecuteWithSignature<long>("getDataBytes", "()J"); }
+            return IExecuteWithSignature<long>("getCacheBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#getExternalCacheBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#getDataBytes()"/>
         /// </summary>
-        public long ExternalCacheBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetDataBytes()
         {
-            get { return IExecuteWithSignature<long>("getExternalCacheBytes", "()J"); }
+            return IExecuteWithSignature<long>("getDataBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#getExternalCacheBytes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetExternalCacheBytes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getExternalCacheBytes", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/usage/StorageStats.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/UsageEvents.cs b/src/net/Netdroid/Generated/Android/App/Usage/UsageEvents.cs
index 7b4858e10..858d996ce 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/UsageEvents.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/UsageEvents.cs
@@ -164,14 +164,14 @@ public partial class Event
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#MOVE_TO_BACKGROUND"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int MOVE_TO_BACKGROUND { get { if (!_MOVE_TO_BACKGROUNDReady) { _MOVE_TO_BACKGROUNDContent = SGetField<int>(LocalBridgeClazz, "MOVE_TO_BACKGROUND"); _MOVE_TO_BACKGROUNDReady = true; } return _MOVE_TO_BACKGROUNDContent; } }
             private static int _MOVE_TO_BACKGROUNDContent = default;
             private static bool _MOVE_TO_BACKGROUNDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#MOVE_TO_FOREGROUND"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int MOVE_TO_FOREGROUND { get { if (!_MOVE_TO_FOREGROUNDReady) { _MOVE_TO_FOREGROUNDContent = SGetField<int>(LocalBridgeClazz, "MOVE_TO_FOREGROUND"); _MOVE_TO_FOREGROUNDReady = true; } return _MOVE_TO_FOREGROUNDContent; } }
             private static int _MOVE_TO_FOREGROUNDContent = default;
             private static bool _MOVE_TO_FOREGROUNDReady = false; // this is used because in case of generics 
@@ -220,53 +220,60 @@ public partial class Event
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getAppStandbyBucket()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getConfiguration()"/>
             /// </summary>
-            public int AppStandbyBucket
+            /// <returns><see cref="Android.Content.Res.Configuration"/></returns>
+            public Android.Content.Res.Configuration GetConfiguration()
             {
-                get { return IExecuteWithSignature<int>("getAppStandbyBucket", "()I"); }
+                return IExecuteWithSignature<Android.Content.Res.Configuration>("getConfiguration", "()Landroid/content/res/Configuration;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getClassName()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getAppStandbyBucket()"/>
             /// </summary>
-            public Java.Lang.String ClassName
+            /// <returns><see cref="int"/></returns>
+            public int GetAppStandbyBucket()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getAppStandbyBucket", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getConfiguration()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getEventType()"/>
             /// </summary>
-            public Android.Content.Res.Configuration Configuration
+            /// <returns><see cref="int"/></returns>
+            public int GetEventType()
             {
-                get { return IExecuteWithSignature<Android.Content.Res.Configuration>("getConfiguration", "()Landroid/content/res/Configuration;"); }
+                return IExecuteWithSignature<int>("getEventType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getEventType()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getClassName()"/>
             /// </summary>
-            public int EventType
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetClassName()
             {
-                get { return IExecuteWithSignature<int>("getEventType", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getPackageName()"/>
             /// </summary>
-            public Java.Lang.String PackageName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPackageName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getShortcutId()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getShortcutId()"/>
             /// </summary>
-            public Java.Lang.String ShortcutId
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetShortcutId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getShortcutId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getShortcutId", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getTimeStamp()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/usage/UsageEvents.Event.html#getTimeStamp()"/>
             /// </summary>
-            public long TimeStamp
+            /// <returns><see cref="long"/></returns>
+            public long GetTimeStamp()
             {
-                get { return IExecuteWithSignature<long>("getTimeStamp", "()J"); }
+                return IExecuteWithSignature<long>("getTimeStamp", "()J");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/UsageStats.cs b/src/net/Netdroid/Generated/Android/App/Usage/UsageStats.cs
index d4719bb80..19d297761 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/UsageStats.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/UsageStats.cs
@@ -60,75 +60,84 @@ public UsageStats(Android.App.Usage.UsageStats arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getFirstTimeStamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#describeContents()"/>
         /// </summary>
-        public long FirstTimeStamp
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getFirstTimeStamp", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getLastTimeForegroundServiceUsed()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getPackageName()"/>
         /// </summary>
-        public long LastTimeForegroundServiceUsed
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<long>("getLastTimeForegroundServiceUsed", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getLastTimeStamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getFirstTimeStamp()"/>
         /// </summary>
-        public long LastTimeStamp
+        /// <returns><see cref="long"/></returns>
+        public long GetFirstTimeStamp()
         {
-            get { return IExecuteWithSignature<long>("getLastTimeStamp", "()J"); }
+            return IExecuteWithSignature<long>("getFirstTimeStamp", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getLastTimeUsed()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getLastTimeForegroundServiceUsed()"/>
         /// </summary>
-        public long LastTimeUsed
+        /// <returns><see cref="long"/></returns>
+        public long GetLastTimeForegroundServiceUsed()
         {
-            get { return IExecuteWithSignature<long>("getLastTimeUsed", "()J"); }
+            return IExecuteWithSignature<long>("getLastTimeForegroundServiceUsed", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getLastTimeVisible()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getLastTimeStamp()"/>
         /// </summary>
-        public long LastTimeVisible
+        /// <returns><see cref="long"/></returns>
+        public long GetLastTimeStamp()
         {
-            get { return IExecuteWithSignature<long>("getLastTimeVisible", "()J"); }
+            return IExecuteWithSignature<long>("getLastTimeStamp", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getLastTimeUsed()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="long"/></returns>
+        public long GetLastTimeUsed()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<long>("getLastTimeUsed", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getTotalTimeForegroundServiceUsed()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getLastTimeVisible()"/>
         /// </summary>
-        public long TotalTimeForegroundServiceUsed
+        /// <returns><see cref="long"/></returns>
+        public long GetLastTimeVisible()
         {
-            get { return IExecuteWithSignature<long>("getTotalTimeForegroundServiceUsed", "()J"); }
+            return IExecuteWithSignature<long>("getLastTimeVisible", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getTotalTimeInForeground()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getTotalTimeForegroundServiceUsed()"/>
         /// </summary>
-        public long TotalTimeInForeground
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalTimeForegroundServiceUsed()
         {
-            get { return IExecuteWithSignature<long>("getTotalTimeInForeground", "()J"); }
+            return IExecuteWithSignature<long>("getTotalTimeForegroundServiceUsed", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getTotalTimeVisible()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getTotalTimeInForeground()"/>
         /// </summary>
-        public long TotalTimeVisible
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalTimeInForeground()
         {
-            get { return IExecuteWithSignature<long>("getTotalTimeVisible", "()J"); }
+            return IExecuteWithSignature<long>("getTotalTimeInForeground", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#getTotalTimeVisible()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalTimeVisible()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTotalTimeVisible", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/usage/UsageStats.html#add(android.app.usage.UsageStats)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/Usage/UsageStatsManager.cs b/src/net/Netdroid/Generated/Android/App/Usage/UsageStatsManager.cs
index 4c9f9f697..e166dc12b 100644
--- a/src/net/Netdroid/Generated/Android/App/Usage/UsageStatsManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/Usage/UsageStatsManager.cs
@@ -106,13 +106,6 @@ public partial class UsageStatsManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStatsManager.html#getAppStandbyBucket()"/> 
-        /// </summary>
-        public int AppStandbyBucket
-        {
-            get { return IExecuteWithSignature<int>("getAppStandbyBucket", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/usage/UsageStatsManager.html#queryEvents(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -142,6 +135,14 @@ public bool IsAppInactive(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isAppInactive", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/usage/UsageStatsManager.html#getAppStandbyBucket()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAppStandbyBucket()
+        {
+            return IExecuteWithSignature<int>("getAppStandbyBucket", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/usage/UsageStatsManager.html#queryConfigurations(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/VoiceInteractor.cs b/src/net/Netdroid/Generated/Android/App/VoiceInteractor.cs
index a3fd15d39..b924b5359 100644
--- a/src/net/Netdroid/Generated/Android/App/VoiceInteractor.cs
+++ b/src/net/Netdroid/Generated/Android/App/VoiceInteractor.cs
@@ -46,20 +46,6 @@ public partial class VoiceInteractor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.html#getActiveRequests()"/> 
-        /// </summary>
-        public Android.App.VoiceInteractor.Request[] ActiveRequests
-        {
-            get { return IExecuteWithSignatureArray<Android.App.VoiceInteractor.Request>("getActiveRequests", "()[Landroid/app/VoiceInteractor$Request;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.html#getActiveRequest(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -69,6 +55,14 @@ public Android.App.VoiceInteractor.Request GetActiveRequest(Java.Lang.String arg
             return IExecuteWithSignature<Android.App.VoiceInteractor.Request>("getActiveRequest", "(Ljava/lang/String;)Landroid/app/VoiceInteractor$Request;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.html#getActiveRequests()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.VoiceInteractor.Request"/></returns>
+        public Android.App.VoiceInteractor.Request[] GetActiveRequests()
+        {
+            return IExecuteWithSignatureArray<Android.App.VoiceInteractor.Request>("getActiveRequests", "()[Landroid/app/VoiceInteractor$Request;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.html#isDestroyed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -124,6 +118,14 @@ public bool[] SupportsCommands(Java.Lang.String[] arg0)
             return IExecuteWithSignatureArray<bool>("supportsCommands", "([Ljava/lang/String;)[Z", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.html#notifyDirectActionsChanged()"/>
         /// </summary>
         public void NotifyDirectActionsChanged()
@@ -408,27 +410,6 @@ public Option(Java.Lang.CharSequence arg0, int arg1)
 
                 #region Instance methods
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#getExtras()"/> <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#setExtras(android.os.Bundle)"/>
-                /// </summary>
-                public Android.Os.Bundle Extras
-                {
-                    get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", value); }
-                }
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#getIndex()"/> 
-                /// </summary>
-                public int Index
-                {
-                    get { return IExecuteWithSignature<int>("getIndex", "()I"); }
-                }
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#getLabel()"/> 
-                /// </summary>
-                public Java.Lang.CharSequence Label
-                {
-                    get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
-                }
-                /// <summary>
                 /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#addSynonym(java.lang.CharSequence)"/>
                 /// </summary>
                 /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -438,6 +419,14 @@ public Android.App.VoiceInteractor.PickOptionRequest.Option AddSynonym(Java.Lang
                     return IExecuteWithSignature<Android.App.VoiceInteractor.PickOptionRequest.Option>("addSynonym", "(Ljava/lang/CharSequence;)Landroid/app/VoiceInteractor$PickOptionRequest$Option;", arg0);
                 }
                 /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#getExtras()"/>
+                /// </summary>
+                /// <returns><see cref="Android.Os.Bundle"/></returns>
+                public Android.Os.Bundle GetExtras()
+                {
+                    return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
+                }
+                /// <summary>
                 /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#countSynonyms()"/>
                 /// </summary>
                 /// <returns><see cref="int"/></returns>
@@ -454,6 +443,22 @@ public int DescribeContents()
                     return IExecuteWithSignature<int>("describeContents", "()I");
                 }
                 /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#getIndex()"/>
+                /// </summary>
+                /// <returns><see cref="int"/></returns>
+                public int GetIndex()
+                {
+                    return IExecuteWithSignature<int>("getIndex", "()I");
+                }
+                /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#getLabel()"/>
+                /// </summary>
+                /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+                public Java.Lang.CharSequence GetLabel()
+                {
+                    return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
+                }
+                /// <summary>
                 /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#getSynonymAt(int)"/>
                 /// </summary>
                 /// <param name="arg0"><see cref="int"/></param>
@@ -463,6 +468,14 @@ public Java.Lang.CharSequence GetSynonymAt(int arg0)
                     return IExecuteWithSignature<Java.Lang.CharSequence>("getSynonymAt", "(I)Ljava/lang/CharSequence;", arg0);
                 }
                 /// <summary>
+                /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#setExtras(android.os.Bundle)"/>
+                /// </summary>
+                /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+                public void SetExtras(Android.Os.Bundle arg0)
+                {
+                    IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", arg0);
+                }
+                /// <summary>
                 /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.PickOptionRequest.Option.html#writeToParcel(android.os.Parcel,int)"/>
                 /// </summary>
                 /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -533,13 +546,6 @@ public Prompt(Java.Lang.CharSequence[] arg0, Java.Lang.CharSequence arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Prompt.html#getVisualPrompt()"/> 
-            /// </summary>
-            public Java.Lang.CharSequence VisualPrompt
-            {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getVisualPrompt", "()Ljava/lang/CharSequence;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Prompt.html#countVoicePrompts()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
@@ -556,6 +562,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Prompt.html#getVisualPrompt()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetVisualPrompt()
+            {
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getVisualPrompt", "()Ljava/lang/CharSequence;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Prompt.html#getVoicePromptAt(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -605,25 +619,28 @@ public partial class Request
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Request.html#getActivity()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Request.html#getActivity()"/>
             /// </summary>
-            public Android.App.Activity Activity
+            /// <returns><see cref="Android.App.Activity"/></returns>
+            public Android.App.Activity GetActivity()
             {
-                get { return IExecuteWithSignature<Android.App.Activity>("getActivity", "()Landroid/app/Activity;"); }
+                return IExecuteWithSignature<Android.App.Activity>("getActivity", "()Landroid/app/Activity;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Request.html#getContext()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Request.html#getContext()"/>
             /// </summary>
-            public Android.Content.Context Context
+            /// <returns><see cref="Android.Content.Context"/></returns>
+            public Android.Content.Context GetContext()
             {
-                get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
+                return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Request.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Request.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/app/VoiceInteractor.Request.html#cancel()"/>
diff --git a/src/net/Netdroid/Generated/Android/App/WallpaperColors.cs b/src/net/Netdroid/Generated/Android/App/WallpaperColors.cs
index 471232b09..7cb8a892f 100644
--- a/src/net/Netdroid/Generated/Android/App/WallpaperColors.cs
+++ b/src/net/Netdroid/Generated/Android/App/WallpaperColors.cs
@@ -111,40 +111,44 @@ public static Android.App.WallpaperColors FromDrawable(Android.Graphics.Drawable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#getColorHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#getPrimaryColor()"/>
         /// </summary>
-        public int ColorHints
+        /// <returns><see cref="Android.Graphics.Color"/></returns>
+        public Android.Graphics.Color GetPrimaryColor()
         {
-            get { return IExecuteWithSignature<int>("getColorHints", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Color>("getPrimaryColor", "()Landroid/graphics/Color;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#getPrimaryColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#getSecondaryColor()"/>
         /// </summary>
-        public Android.Graphics.Color PrimaryColor
+        /// <returns><see cref="Android.Graphics.Color"/></returns>
+        public Android.Graphics.Color GetSecondaryColor()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Color>("getPrimaryColor", "()Landroid/graphics/Color;"); }
+            return IExecuteWithSignature<Android.Graphics.Color>("getSecondaryColor", "()Landroid/graphics/Color;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#getSecondaryColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#getTertiaryColor()"/>
         /// </summary>
-        public Android.Graphics.Color SecondaryColor
+        /// <returns><see cref="Android.Graphics.Color"/></returns>
+        public Android.Graphics.Color GetTertiaryColor()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Color>("getSecondaryColor", "()Landroid/graphics/Color;"); }
+            return IExecuteWithSignature<Android.Graphics.Color>("getTertiaryColor", "()Landroid/graphics/Color;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#getTertiaryColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#describeContents()"/>
         /// </summary>
-        public Android.Graphics.Color TertiaryColor
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Color>("getTertiaryColor", "()Landroid/graphics/Color;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#getColorHints()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetColorHints()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getColorHints", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperColors.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/App/WallpaperInfo.cs b/src/net/Netdroid/Generated/Android/App/WallpaperInfo.cs
index 442c61a7a..5c88de08c 100644
--- a/src/net/Netdroid/Generated/Android/App/WallpaperInfo.cs
+++ b/src/net/Netdroid/Generated/Android/App/WallpaperInfo.cs
@@ -63,53 +63,20 @@ public WallpaperInfo(Android.Content.Context arg0, Android.Content.Pm.ResolveInf
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getComponent()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getComponent()"/>
         /// </summary>
-        public Android.Content.ComponentName Component
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponent()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getServiceInfo()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Android.Content.Pm.ServiceInfo"/></returns>
+        public Android.Content.Pm.ServiceInfo GetServiceInfo()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getServiceInfo()"/> 
-        /// </summary>
-        public Android.Content.Pm.ServiceInfo ServiceInfo
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getServiceName()"/> 
-        /// </summary>
-        public Java.Lang.String ServiceName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getSettingsActivity()"/> 
-        /// </summary>
-        public Java.Lang.String SettingsActivity
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSettingsActivity", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getSettingsSliceUri()"/> 
-        /// </summary>
-        public Android.Net.Uri SettingsSliceUri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getSettingsSliceUri", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getShowMetadataInPreview()"/> 
-        /// </summary>
-        public bool ShowMetadataInPreview
-        {
-            get { return IExecuteWithSignature<bool>("getShowMetadataInPreview", "()Z"); }
+            return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#loadIcon(android.content.pm.PackageManager)"/>
@@ -130,6 +97,14 @@ public Android.Graphics.Drawable.Drawable LoadThumbnail(Android.Content.Pm.Packa
             return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("loadThumbnail", "(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getSettingsSliceUri()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetSettingsSliceUri()
+        {
+            return IExecuteWithSignature<Android.Net.Uri>("getSettingsSliceUri", "()Landroid/net/Uri;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#loadContextUri(android.content.pm.PackageManager)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
@@ -140,6 +115,14 @@ public Android.Net.Uri LoadContextUri(Android.Content.Pm.PackageManager arg0)
             return IExecuteWithSignature<Android.Net.Uri>("loadContextUri", "(Landroid/content/pm/PackageManager;)Landroid/net/Uri;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getShowMetadataInPreview()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetShowMetadataInPreview()
+        {
+            return IExecuteWithSignature<bool>("getShowMetadataInPreview", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#shouldUseDefaultUnfoldTransition()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -203,6 +186,30 @@ public Java.Lang.CharSequence LoadLabel(Android.Content.Pm.PackageManager arg0)
             return IExecuteWithSignature<Java.Lang.CharSequence>("loadLabel", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getServiceName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServiceName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getServiceName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#getSettingsActivity()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSettingsActivity()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSettingsActivity", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperInfo.html#dump(android.util.Printer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.Printer"/></param>
diff --git a/src/net/Netdroid/Generated/Android/App/WallpaperManager.cs b/src/net/Netdroid/Generated/Android/App/WallpaperManager.cs
index f388ce0be..d0d404922 100644
--- a/src/net/Netdroid/Generated/Android/App/WallpaperManager.cs
+++ b/src/net/Netdroid/Generated/Android/App/WallpaperManager.cs
@@ -115,48 +115,6 @@ public static Android.App.WallpaperManager GetInstance(Android.Content.Context a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getBuiltInDrawable()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Drawable BuiltInDrawable
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBuiltInDrawable", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getDesiredMinimumHeight()"/> 
-        /// </summary>
-        public int DesiredMinimumHeight
-        {
-            get { return IExecuteWithSignature<int>("getDesiredMinimumHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getDesiredMinimumWidth()"/> 
-        /// </summary>
-        public int DesiredMinimumWidth
-        {
-            get { return IExecuteWithSignature<int>("getDesiredMinimumWidth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getDrawable()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Drawable Drawable
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getFastDrawable()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Drawable FastDrawable
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getFastDrawable", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getWallpaperInfo()"/> 
-        /// </summary>
-        public Android.App.WallpaperInfo WallpaperInfo
-        {
-            get { return IExecuteWithSignature<Android.App.WallpaperInfo>("getWallpaperInfo", "()Landroid/app/WallpaperInfo;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getWallpaperColors(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -166,6 +124,14 @@ public Android.App.WallpaperColors GetWallpaperColors(int arg0)
             return IExecuteWithSignature<Android.App.WallpaperColors>("getWallpaperColors", "(I)Landroid/app/WallpaperColors;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getWallpaperInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.WallpaperInfo"/></returns>
+        public Android.App.WallpaperInfo GetWallpaperInfo()
+        {
+            return IExecuteWithSignature<Android.App.WallpaperInfo>("getWallpaperInfo", "()Landroid/app/WallpaperInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getWallpaperInfo(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -184,6 +150,14 @@ public Android.Content.Intent GetCropAndSetWallpaperIntent(Android.Net.Uri arg0)
             return IExecuteWithSignature<Android.Content.Intent>("getCropAndSetWallpaperIntent", "(Landroid/net/Uri;)Landroid/content/Intent;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getBuiltInDrawable()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetBuiltInDrawable()
+        {
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBuiltInDrawable", "()Landroid/graphics/drawable/Drawable;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getBuiltInDrawable(int,int,boolean,float,float,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -220,6 +194,14 @@ public Android.Graphics.Drawable.Drawable GetBuiltInDrawable(int arg0)
             return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBuiltInDrawable", "(I)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getDrawable()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDrawable()
+        {
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getDrawable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -229,6 +211,14 @@ public Android.Graphics.Drawable.Drawable GetDrawable(int arg0)
             return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "(I)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getFastDrawable()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetFastDrawable()
+        {
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getFastDrawable", "()Landroid/graphics/drawable/Drawable;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getFastDrawable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -306,6 +296,22 @@ public bool IsWallpaperSupported()
             return IExecuteWithSignature<bool>("isWallpaperSupported", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getDesiredMinimumHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDesiredMinimumHeight()
+        {
+            return IExecuteWithSignature<int>("getDesiredMinimumHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getDesiredMinimumWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDesiredMinimumWidth()
+        {
+            return IExecuteWithSignature<int>("getDesiredMinimumWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/app/WallpaperManager.html#getWallpaperId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -536,7 +542,7 @@ public partial class OnColorsChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onColorsChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.WallpaperColors>>>(OnColorsChangedEventHandler));
+                AddEventHandler("onColorsChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.WallpaperColors>>>(OnColorsChangedEventHandler));
 
             }
 
@@ -544,7 +550,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/app/WallpaperManager.OnColorsChangedListener.html#onColorsChanged(android.app.WallpaperColors,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnColorsChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.App.WallpaperColors, int> OnOnColorsChanged { get; set; } = null;
+            public global::System.Action<Android.App.WallpaperColors, int> OnOnColorsChanged { get; set; } = null;
 
             void OnColorsChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.WallpaperColors>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetHost.cs b/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetHost.cs
index 3c73c3682..d1863234c 100644
--- a/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetHost.cs
+++ b/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetHost.cs
@@ -62,13 +62,6 @@ public static void DeleteAllHosts()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHost.html#getAppWidgetIds()"/> 
-        /// </summary>
-        public int[] AppWidgetIds
-        {
-            get { return IExecuteWithSignatureArray<int>("getAppWidgetIds", "()[I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHost.html#createView(android.content.Context,int,android.appwidget.AppWidgetProviderInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -100,6 +93,14 @@ public int AllocateAppWidgetId()
             return IExecuteWithSignature<int>("allocateAppWidgetId", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHost.html#getAppWidgetIds()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetAppWidgetIds()
+        {
+            return IExecuteWithSignatureArray<int>("getAppWidgetIds", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHost.html#deleteAppWidgetId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetHostView.cs b/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetHostView.cs
index b94d4c42f..69b3ae651 100644
--- a/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetHostView.cs
+++ b/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetHostView.cs
@@ -75,18 +75,20 @@ public static Android.Graphics.Rect GetDefaultPaddingForWidget(Android.Content.C
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView.html#getAppWidgetId()"/> 
+        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView.html#getAppWidgetInfo()"/>
         /// </summary>
-        public int AppWidgetId
+        /// <returns><see cref="Android.Appwidget.AppWidgetProviderInfo"/></returns>
+        public Android.Appwidget.AppWidgetProviderInfo GetAppWidgetInfo()
         {
-            get { return IExecuteWithSignature<int>("getAppWidgetId", "()I"); }
+            return IExecuteWithSignature<Android.Appwidget.AppWidgetProviderInfo>("getAppWidgetInfo", "()Landroid/appwidget/AppWidgetProviderInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView.html#getAppWidgetInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView.html#getAppWidgetId()"/>
         /// </summary>
-        public Android.Appwidget.AppWidgetProviderInfo AppWidgetInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetAppWidgetId()
         {
-            get { return IExecuteWithSignature<Android.Appwidget.AppWidgetProviderInfo>("getAppWidgetInfo", "()Landroid/appwidget/AppWidgetProviderInfo;"); }
+            return IExecuteWithSignature<int>("getAppWidgetId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetHostView.html#resetColorResources()"/>
@@ -152,7 +154,7 @@ public void UpdateAppWidgetOptions(Android.Os.Bundle arg0)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UpdateAppWidgetSize(Android.Os.Bundle arg0, int arg1, int arg2, int arg3, int arg4)
         {
             IExecute("updateAppWidgetSize", arg0, arg1, arg2, arg3, arg4);
diff --git a/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetManager.cs b/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetManager.cs
index 4f045234c..a07d189ee 100644
--- a/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetManager.cs
+++ b/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetManager.cs
@@ -229,13 +229,6 @@ public static Android.Appwidget.AppWidgetManager GetInstance(Android.Content.Con
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetManager.html#getInstalledProviders()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Appwidget.AppWidgetProviderInfo> InstalledProviders
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Appwidget.AppWidgetProviderInfo>>("getInstalledProviders", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetManager.html#getAppWidgetInfo(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -315,6 +308,14 @@ public int[] GetAppWidgetIds(Android.Content.ComponentName arg0)
             return IExecuteWithSignatureArray<int>("getAppWidgetIds", "(Landroid/content/ComponentName;)[I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetManager.html#getInstalledProviders()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Appwidget.AppWidgetProviderInfo> GetInstalledProviders()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Appwidget.AppWidgetProviderInfo>>("getInstalledProviders", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetManager.html#getInstalledProvidersForPackage(java.lang.String,android.os.UserHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetProviderInfo.cs b/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetProviderInfo.cs
index c3939d0ea..45d741b25 100644
--- a/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetProviderInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Appwidget/AppWidgetProviderInfo.cs
@@ -132,7 +132,7 @@ public AppWidgetProviderInfo(Android.Os.Parcel arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#label"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String label { get { return IGetField<Java.Lang.String>("label"); } set { ISetField("label", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#CREATOR"/>
@@ -209,20 +209,6 @@ public AppWidgetProviderInfo(Android.Os.Parcel arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#getActivityInfo()"/> 
-        /// </summary>
-        public Android.Content.Pm.ActivityInfo ActivityInfo
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.ActivityInfo>("getActivityInfo", "()Landroid/content/pm/ActivityInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#getProfile()"/> 
-        /// </summary>
-        public Android.Os.UserHandle Profile
-        {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getProfile", "()Landroid/os/UserHandle;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Android.Appwidget.AppWidgetProviderInfo"/></returns>
@@ -231,6 +217,14 @@ public Android.Appwidget.AppWidgetProviderInfo Clone()
             return IExecuteWithSignature<Android.Appwidget.AppWidgetProviderInfo>("clone", "()Landroid/appwidget/AppWidgetProviderInfo;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#getActivityInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.ActivityInfo"/></returns>
+        public Android.Content.Pm.ActivityInfo GetActivityInfo()
+        {
+            return IExecuteWithSignature<Android.Content.Pm.ActivityInfo>("getActivityInfo", "()Landroid/content/pm/ActivityInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#loadIcon(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -251,6 +245,14 @@ public Android.Graphics.Drawable.Drawable LoadPreviewImage(Android.Content.Conte
             return IExecute<Android.Graphics.Drawable.Drawable>("loadPreviewImage", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#getProfile()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetProfile()
+        {
+            return IExecuteWithSignature<Android.Os.UserHandle>("getProfile", "()Landroid/os/UserHandle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/appwidget/AppWidgetProviderInfo.html#loadDescription(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Bluetooth/AllPackageClasses.cs
index a1752c448..79bdb3d8d 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/AllPackageClasses.cs
@@ -74,14 +74,40 @@ public BluetoothA2dp(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html"/>
     /// </summary>
-    public partial class BluetoothAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class BluetoothAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BluetoothAdapter>
     {
+        const string _bridgeClassName = "android.bluetooth.BluetoothAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public BluetoothAdapter() { InitializeHandlers(); }
+        public BluetoothAdapter() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public BluetoothAdapter(params object[] args) : base(args) { }
 
-    #warning Remember to build the Java class for event listener
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
 
         // TODO: complete the class
         #region LeScanCallback
@@ -94,12 +120,12 @@ public partial class LeScanCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Le
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("LeScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LeScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LeScanCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("LeScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LeScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LeScanCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -134,43 +160,6 @@ public LeScanCallback(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region BluetoothAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="BluetoothAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class BluetoothAdapterDirect : BluetoothAdapter
-    {
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
-        /// </summary>
-        public override bool AutoInit => false;
-
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => "android.bluetooth.BluetoothAdapter";
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-    }
-    #endregion
-
     #region BluetoothAssignedNumbers
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAssignedNumbers.html"/>
@@ -709,12 +698,12 @@ public partial class BluetoothGattCallback : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BluetoothGattCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BluetoothGattCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BluetoothGattCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BluetoothGattCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BluetoothGattCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BluetoothGattCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -887,12 +876,12 @@ public partial class BluetoothGattServerCallback : MASES.JCOBridge.C2JBridge.JVM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BluetoothGattServerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BluetoothGattServerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BluetoothGattServerCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BluetoothGattServerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BluetoothGattServerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BluetoothGattServerCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1015,7 +1004,7 @@ public BluetoothHeadset(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class BluetoothHealth : Android.Bluetooth.BluetoothProfile
     {
         const string _bridgeClassName = "android.bluetooth.BluetoothHealth";
@@ -1060,7 +1049,7 @@ public BluetoothHealth(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class BluetoothHealthAppConfiguration : Android.Os.Parcelable
     {
         const string _bridgeClassName = "android.bluetooth.BluetoothHealthAppConfiguration";
@@ -1105,19 +1094,19 @@ public BluetoothHealthAppConfiguration(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthCallback.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class BluetoothHealthCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BluetoothHealthCallback>
     {
         const string _bridgeClassName = "android.bluetooth.BluetoothHealthCallback";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BluetoothHealthCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BluetoothHealthCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BluetoothHealthCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BluetoothHealthCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BluetoothHealthCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BluetoothHealthCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1242,12 +1231,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1600,12 +1589,12 @@ public partial class BluetoothProfile : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BluetoothProfile class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BluetoothProfile class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BluetoothProfile() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BluetoothProfile class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BluetoothProfile class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BluetoothProfile(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1643,10 +1632,13 @@ public partial class ServiceListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public ServiceListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.bluetooth.BluetoothProfile_ServiceListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.bluetooth.ServiceListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1668,10 +1660,13 @@ public partial class ServiceListenerDirect : ServiceListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.bluetooth.BluetoothProfile$ServiceListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.bluetooth.BluetoothProfile$ServiceListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothA2dp.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothA2dp.cs
index 8ca84d26e..fc2213c6b 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothA2dp.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothA2dp.cs
@@ -70,13 +70,6 @@ public partial class BluetoothA2dp
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothA2dp.html#getConnectedDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothA2dp.html#isA2dpPlaying(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
@@ -95,6 +88,14 @@ public int GetConnectionState(Android.Bluetooth.BluetoothDevice arg0)
             return IExecuteWithSignature<int>("getConnectionState", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothA2dp.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothA2dp.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothAdapter.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothAdapter.cs
index b0fd43124..2ba92da80 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothAdapter.cs
@@ -37,1159 +37,206 @@ public partial class BluetoothAdapter
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-        
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#checkBluetoothAddress(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCheckBluetoothAddress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, bool> OnCheckBluetoothAddress { get; set; } = null;
-
-        void CheckBluetoothAddressEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnCheckBluetoothAddress != null) ? OnCheckBluetoothAddress : CheckBluetoothAddress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#checkBluetoothAddress(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool CheckBluetoothAddress(Java.Lang.String arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getDefaultAdapter()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetDefaultAdapter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Bluetooth.BluetoothAdapter> OnGetDefaultAdapter { get; set; } = null;
-
-        void GetDefaultAdapterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetDefaultAdapter != null) ? OnGetDefaultAdapter : GetDefaultAdapter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getDefaultAdapter()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Bluetooth.BluetoothAdapter"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Bluetooth.BluetoothAdapter GetDefaultAdapter()
-        {
-            return default;
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="BluetoothAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("getRemoteDevice", new System.EventHandler<CLRListenerEventArgs<CLREventData<byte[]>>>(GetRemoteDeviceEventHandler));
-            AddEventHandler("getRemoteDevice1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(GetRemoteDevice1EventHandler));
-            AddEventHandler("getRemoteLeDevice", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(GetRemoteLeDeviceEventHandler));
-            AddEventHandler("listenUsingInsecureL2capChannel", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(ListenUsingInsecureL2capChannelEventHandler));
-            AddEventHandler("listenUsingInsecureRfcommWithServiceRecord", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(ListenUsingInsecureRfcommWithServiceRecordEventHandler));
-            AddEventHandler("listenUsingL2capChannel", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(ListenUsingL2capChannelEventHandler));
-            AddEventHandler("listenUsingRfcommWithServiceRecord", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(ListenUsingRfcommWithServiceRecordEventHandler));
-            AddEventHandler("getBluetoothLeAdvertiser", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetBluetoothLeAdvertiserEventHandler));
-            AddEventHandler("getBluetoothLeScanner", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetBluetoothLeScannerEventHandler));
-            AddEventHandler("cancelDiscovery", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(CancelDiscoveryEventHandler));
-            AddEventHandler("disable", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(DisableEventHandler));
-            AddEventHandler("enable", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(EnableEventHandler));
-            AddEventHandler("getProfileProxy", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(GetProfileProxyEventHandler));
-            AddEventHandler("isDiscovering", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsDiscoveringEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEnabledEventHandler));
-            AddEventHandler("isLe2MPhySupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsLe2MPhySupportedEventHandler));
-            AddEventHandler("isLeCodedPhySupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsLeCodedPhySupportedEventHandler));
-            AddEventHandler("isLeExtendedAdvertisingSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsLeExtendedAdvertisingSupportedEventHandler));
-            AddEventHandler("isLePeriodicAdvertisingSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsLePeriodicAdvertisingSupportedEventHandler));
-            AddEventHandler("isMultipleAdvertisementSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsMultipleAdvertisementSupportedEventHandler));
-            AddEventHandler("isOffloadedFilteringSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsOffloadedFilteringSupportedEventHandler));
-            AddEventHandler("isOffloadedScanBatchingSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsOffloadedScanBatchingSupportedEventHandler));
-            AddEventHandler("setName", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(SetNameEventHandler));
-            AddEventHandler("startDiscovery", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(StartDiscoveryEventHandler));
-            AddEventHandler("startLeScan", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Bluetooth.BluetoothAdapter.LeScanCallback>>>(StartLeScanEventHandler));
-            AddEventHandler("startLeScan2", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.UUID[]>>>(StartLeScan2EventHandler));
-            AddEventHandler("getLeMaximumAdvertisingDataLength", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetLeMaximumAdvertisingDataLengthEventHandler));
-            AddEventHandler("getMaxConnectedAudioDevices", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetMaxConnectedAudioDevicesEventHandler));
-            AddEventHandler("getProfileConnectionState", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetProfileConnectionStateEventHandler));
-            AddEventHandler("getScanMode", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetScanModeEventHandler));
-            AddEventHandler("getState", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetStateEventHandler));
-            AddEventHandler("isLeAudioBroadcastAssistantSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsLeAudioBroadcastAssistantSupportedEventHandler));
-            AddEventHandler("isLeAudioBroadcastSourceSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsLeAudioBroadcastSourceSupportedEventHandler));
-            AddEventHandler("isLeAudioSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsLeAudioSupportedEventHandler));
-            AddEventHandler("getAddress", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAddressEventHandler));
-            AddEventHandler("getName", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetNameEventHandler));
-            AddEventHandler("getDiscoverableTimeout", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDiscoverableTimeoutEventHandler));
-            AddEventHandler("getBondedDevices", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetBondedDevicesEventHandler));
-            AddEventHandler("closeProfileProxy", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(CloseProfileProxyEventHandler));
-            AddEventHandler("stopLeScan", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Bluetooth.BluetoothAdapter.LeScanCallback>>>(StopLeScanEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getRemoteDevice(byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetRemoteDevice"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<byte[], Android.Bluetooth.BluetoothDevice> OnGetRemoteDevice { get; set; } = null;
-
-        void GetRemoteDeviceEventHandler(object sender, CLRListenerEventArgs<CLREventData<byte[]>> data)
-        {
-            var methodToExecute = (OnGetRemoteDevice != null) ? OnGetRemoteDevice : GetRemoteDevice;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getRemoteDevice(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
-        public virtual Android.Bluetooth.BluetoothDevice GetRemoteDevice(byte[] arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getRemoteDevice(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetRemoteDevice1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, Android.Bluetooth.BluetoothDevice> OnGetRemoteDevice1 { get; set; } = null;
-
-        void GetRemoteDevice1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnGetRemoteDevice1 != null) ? OnGetRemoteDevice1 : GetRemoteDevice;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getRemoteDevice(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
-        public virtual Android.Bluetooth.BluetoothDevice GetRemoteDevice(Java.Lang.String arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getRemoteLeDevice(java.lang.String,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetRemoteLeDevice"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, int, Android.Bluetooth.BluetoothDevice> OnGetRemoteLeDevice { get; set; } = null;
-
-        void GetRemoteLeDeviceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnGetRemoteLeDevice != null) ? OnGetRemoteLeDevice : GetRemoteLeDevice;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getRemoteLeDevice(java.lang.String,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
-        public virtual Android.Bluetooth.BluetoothDevice GetRemoteLeDevice(Java.Lang.String arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#listenUsingInsecureL2capChannel()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnListenUsingInsecureL2capChannel"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Bluetooth.BluetoothServerSocket> OnListenUsingInsecureL2capChannel { get; set; } = null;
-
-        void ListenUsingInsecureL2capChannelEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnListenUsingInsecureL2capChannel != null) ? OnListenUsingInsecureL2capChannel : ListenUsingInsecureL2capChannel;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#listenUsingInsecureL2capChannel()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Bluetooth.BluetoothServerSocket"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public virtual Android.Bluetooth.BluetoothServerSocket ListenUsingInsecureL2capChannel()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#listenUsingInsecureRfcommWithServiceRecord(java.lang.String,java.util.UUID)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnListenUsingInsecureRfcommWithServiceRecord"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, Java.Util.UUID, Android.Bluetooth.BluetoothServerSocket> OnListenUsingInsecureRfcommWithServiceRecord { get; set; } = null;
-
-        void ListenUsingInsecureRfcommWithServiceRecordEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnListenUsingInsecureRfcommWithServiceRecord != null) ? OnListenUsingInsecureRfcommWithServiceRecord : ListenUsingInsecureRfcommWithServiceRecord;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Util.UUID>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#listenUsingInsecureRfcommWithServiceRecord(java.lang.String,java.util.UUID)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Util.UUID"/></param>
-        /// <returns><see cref="Android.Bluetooth.BluetoothServerSocket"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public virtual Android.Bluetooth.BluetoothServerSocket ListenUsingInsecureRfcommWithServiceRecord(Java.Lang.String arg0, Java.Util.UUID arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#listenUsingL2capChannel()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnListenUsingL2capChannel"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Bluetooth.BluetoothServerSocket> OnListenUsingL2capChannel { get; set; } = null;
-
-        void ListenUsingL2capChannelEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnListenUsingL2capChannel != null) ? OnListenUsingL2capChannel : ListenUsingL2capChannel;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#listenUsingL2capChannel()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Bluetooth.BluetoothServerSocket"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public virtual Android.Bluetooth.BluetoothServerSocket ListenUsingL2capChannel()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#listenUsingRfcommWithServiceRecord(java.lang.String,java.util.UUID)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnListenUsingRfcommWithServiceRecord"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, Java.Util.UUID, Android.Bluetooth.BluetoothServerSocket> OnListenUsingRfcommWithServiceRecord { get; set; } = null;
-
-        void ListenUsingRfcommWithServiceRecordEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnListenUsingRfcommWithServiceRecord != null) ? OnListenUsingRfcommWithServiceRecord : ListenUsingRfcommWithServiceRecord;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Util.UUID>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#listenUsingRfcommWithServiceRecord(java.lang.String,java.util.UUID)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Util.UUID"/></param>
-        /// <returns><see cref="Android.Bluetooth.BluetoothServerSocket"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public virtual Android.Bluetooth.BluetoothServerSocket ListenUsingRfcommWithServiceRecord(Java.Lang.String arg0, Java.Util.UUID arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBluetoothLeAdvertiser()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetBluetoothLeAdvertiser"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Bluetooth.Le.BluetoothLeAdvertiser> OnGetBluetoothLeAdvertiser { get; set; } = null;
-
-        void GetBluetoothLeAdvertiserEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetBluetoothLeAdvertiser != null) ? OnGetBluetoothLeAdvertiser : GetBluetoothLeAdvertiser;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBluetoothLeAdvertiser()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Bluetooth.Le.BluetoothLeAdvertiser"/></returns>
-        public virtual Android.Bluetooth.Le.BluetoothLeAdvertiser GetBluetoothLeAdvertiser()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBluetoothLeScanner()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetBluetoothLeScanner"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Bluetooth.Le.BluetoothLeScanner> OnGetBluetoothLeScanner { get; set; } = null;
-
-        void GetBluetoothLeScannerEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetBluetoothLeScanner != null) ? OnGetBluetoothLeScanner : GetBluetoothLeScanner;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBluetoothLeScanner()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Bluetooth.Le.BluetoothLeScanner"/></returns>
-        public virtual Android.Bluetooth.Le.BluetoothLeScanner GetBluetoothLeScanner()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#cancelDiscovery()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCancelDiscovery"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnCancelDiscovery { get; set; } = null;
-
-        void CancelDiscoveryEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnCancelDiscovery != null) ? OnCancelDiscovery : CancelDiscovery;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#cancelDiscovery()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool CancelDiscovery()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#disable()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnDisable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnDisable { get; set; } = null;
-
-        void DisableEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnDisable != null) ? OnDisable : Disable;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#disable()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public virtual bool Disable()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#enable()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnEnable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnEnable { get; set; } = null;
-
-        void EnableEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnEnable != null) ? OnEnable : Enable;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#enable()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public virtual bool Enable()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getProfileProxy(android.content.Context,android.bluetooth.BluetoothProfile.ServiceListener,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetProfileProxy"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context, Android.Bluetooth.BluetoothProfile.ServiceListener, int, bool> OnGetProfileProxy { get; set; } = null;
-
-        void GetProfileProxyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Context>> data)
-        {
-            var methodToExecute = (OnGetProfileProxy != null) ? OnGetProfileProxy : GetProfileProxy;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Bluetooth.BluetoothProfile.ServiceListener>(0), data.EventData.GetAt<int>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getProfileProxy(android.content.Context,android.bluetooth.BluetoothProfile.ServiceListener,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothProfile.ServiceListener"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool GetProfileProxy(Android.Content.Context arg0, Android.Bluetooth.BluetoothProfile.ServiceListener arg1, int arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isDiscovering()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsDiscovering"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsDiscovering { get; set; } = null;
-
-        void IsDiscoveringEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsDiscovering != null) ? OnIsDiscovering : IsDiscovering;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isDiscovering()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsDiscovering()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEnabled { get; set; } = null;
-
-        void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEnabled != null) ? OnIsEnabled : IsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLe2MPhySupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsLe2MPhySupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsLe2MPhySupported { get; set; } = null;
-
-        void IsLe2MPhySupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsLe2MPhySupported != null) ? OnIsLe2MPhySupported : IsLe2MPhySupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLe2MPhySupported()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsLe2MPhySupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeCodedPhySupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsLeCodedPhySupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsLeCodedPhySupported { get; set; } = null;
-
-        void IsLeCodedPhySupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsLeCodedPhySupported != null) ? OnIsLeCodedPhySupported : IsLeCodedPhySupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeCodedPhySupported()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsLeCodedPhySupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeExtendedAdvertisingSupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsLeExtendedAdvertisingSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsLeExtendedAdvertisingSupported { get; set; } = null;
-
-        void IsLeExtendedAdvertisingSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsLeExtendedAdvertisingSupported != null) ? OnIsLeExtendedAdvertisingSupported : IsLeExtendedAdvertisingSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeExtendedAdvertisingSupported()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsLeExtendedAdvertisingSupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLePeriodicAdvertisingSupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsLePeriodicAdvertisingSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsLePeriodicAdvertisingSupported { get; set; } = null;
-
-        void IsLePeriodicAdvertisingSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsLePeriodicAdvertisingSupported != null) ? OnIsLePeriodicAdvertisingSupported : IsLePeriodicAdvertisingSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLePeriodicAdvertisingSupported()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsLePeriodicAdvertisingSupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isMultipleAdvertisementSupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMultipleAdvertisementSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsMultipleAdvertisementSupported { get; set; } = null;
-
-        void IsMultipleAdvertisementSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsMultipleAdvertisementSupported != null) ? OnIsMultipleAdvertisementSupported : IsMultipleAdvertisementSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isMultipleAdvertisementSupported()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMultipleAdvertisementSupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isOffloadedFilteringSupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsOffloadedFilteringSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsOffloadedFilteringSupported { get; set; } = null;
-
-        void IsOffloadedFilteringSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsOffloadedFilteringSupported != null) ? OnIsOffloadedFilteringSupported : IsOffloadedFilteringSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isOffloadedFilteringSupported()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsOffloadedFilteringSupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isOffloadedScanBatchingSupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsOffloadedScanBatchingSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsOffloadedScanBatchingSupported { get; set; } = null;
-
-        void IsOffloadedScanBatchingSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsOffloadedScanBatchingSupported != null) ? OnIsOffloadedScanBatchingSupported : IsOffloadedScanBatchingSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isOffloadedScanBatchingSupported()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsOffloadedScanBatchingSupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#setName(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetName"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, bool> OnSetName { get; set; } = null;
-
-        void SetNameEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnSetName != null) ? OnSetName : SetName;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#setName(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool SetName(Java.Lang.String arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#startDiscovery()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnStartDiscovery"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnStartDiscovery { get; set; } = null;
-
-        void StartDiscoveryEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnStartDiscovery != null) ? OnStartDiscovery : StartDiscovery;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#startDiscovery()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool StartDiscovery()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#startLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnStartLeScan"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Bluetooth.BluetoothAdapter.LeScanCallback, bool> OnStartLeScan { get; set; } = null;
-
-        void StartLeScanEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Bluetooth.BluetoothAdapter.LeScanCallback>> data)
-        {
-            var methodToExecute = (OnStartLeScan != null) ? OnStartLeScan : StartLeScan;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#startLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothAdapter.LeScanCallback"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public virtual bool StartLeScan(Android.Bluetooth.BluetoothAdapter.LeScanCallback arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#startLeScan(java.util.UUID[],android.bluetooth.BluetoothAdapter.LeScanCallback)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnStartLeScan2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.UUID[], Android.Bluetooth.BluetoothAdapter.LeScanCallback, bool> OnStartLeScan2 { get; set; } = null;
-
-        void StartLeScan2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.UUID[]>> data)
-        {
-            var methodToExecute = (OnStartLeScan2 != null) ? OnStartLeScan2 : StartLeScan;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Bluetooth.BluetoothAdapter.LeScanCallback>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#startLeScan(java.util.UUID[],android.bluetooth.BluetoothAdapter.LeScanCallback)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
-        /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothAdapter.LeScanCallback"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public virtual bool StartLeScan(Java.Util.UUID[] arg0, Android.Bluetooth.BluetoothAdapter.LeScanCallback arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getLeMaximumAdvertisingDataLength()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetLeMaximumAdvertisingDataLength"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetLeMaximumAdvertisingDataLength { get; set; } = null;
-
-        void GetLeMaximumAdvertisingDataLengthEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetLeMaximumAdvertisingDataLength != null) ? OnGetLeMaximumAdvertisingDataLength : GetLeMaximumAdvertisingDataLength;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getLeMaximumAdvertisingDataLength()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetLeMaximumAdvertisingDataLength()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getMaxConnectedAudioDevices()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMaxConnectedAudioDevices"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetMaxConnectedAudioDevices { get; set; } = null;
-
-        void GetMaxConnectedAudioDevicesEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetMaxConnectedAudioDevices != null) ? OnGetMaxConnectedAudioDevices : GetMaxConnectedAudioDevices;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getMaxConnectedAudioDevices()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMaxConnectedAudioDevices()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getProfileConnectionState(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetProfileConnectionState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetProfileConnectionState { get; set; } = null;
-
-        void GetProfileConnectionStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetProfileConnectionState != null) ? OnGetProfileConnectionState : GetProfileConnectionState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getProfileConnectionState(int)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ERROR"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetProfileConnectionState(int arg0)
-        {
-            return default;
-        }
-
+        public static int ERROR { get { if (!_ERRORReady) { _ERRORContent = SGetField<int>(LocalBridgeClazz, "ERROR"); _ERRORReady = true; } return _ERRORContent; } }
+        private static int _ERRORContent = default;
+        private static bool _ERRORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getScanMode()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#SCAN_MODE_CONNECTABLE"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetScanMode"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetScanMode { get; set; } = null;
-
-        void GetScanModeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetScanMode != null) ? OnGetScanMode : GetScanMode;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
+        public static int SCAN_MODE_CONNECTABLE { get { if (!_SCAN_MODE_CONNECTABLEReady) { _SCAN_MODE_CONNECTABLEContent = SGetField<int>(LocalBridgeClazz, "SCAN_MODE_CONNECTABLE"); _SCAN_MODE_CONNECTABLEReady = true; } return _SCAN_MODE_CONNECTABLEContent; } }
+        private static int _SCAN_MODE_CONNECTABLEContent = default;
+        private static bool _SCAN_MODE_CONNECTABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getScanMode()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#SCAN_MODE_CONNECTABLE_DISCOVERABLE"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetScanMode()
-        {
-            return default;
-        }
-
+        public static int SCAN_MODE_CONNECTABLE_DISCOVERABLE { get { if (!_SCAN_MODE_CONNECTABLE_DISCOVERABLEReady) { _SCAN_MODE_CONNECTABLE_DISCOVERABLEContent = SGetField<int>(LocalBridgeClazz, "SCAN_MODE_CONNECTABLE_DISCOVERABLE"); _SCAN_MODE_CONNECTABLE_DISCOVERABLEReady = true; } return _SCAN_MODE_CONNECTABLE_DISCOVERABLEContent; } }
+        private static int _SCAN_MODE_CONNECTABLE_DISCOVERABLEContent = default;
+        private static bool _SCAN_MODE_CONNECTABLE_DISCOVERABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getState()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#SCAN_MODE_NONE"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetState { get; set; } = null;
-
-        void GetStateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetState != null) ? OnGetState : GetState;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
+        public static int SCAN_MODE_NONE { get { if (!_SCAN_MODE_NONEReady) { _SCAN_MODE_NONEContent = SGetField<int>(LocalBridgeClazz, "SCAN_MODE_NONE"); _SCAN_MODE_NONEReady = true; } return _SCAN_MODE_NONEContent; } }
+        private static int _SCAN_MODE_NONEContent = default;
+        private static bool _SCAN_MODE_NONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getState()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#STATE_CONNECTED"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetState()
-        {
-            return default;
-        }
-
+        public static int STATE_CONNECTED { get { if (!_STATE_CONNECTEDReady) { _STATE_CONNECTEDContent = SGetField<int>(LocalBridgeClazz, "STATE_CONNECTED"); _STATE_CONNECTEDReady = true; } return _STATE_CONNECTEDContent; } }
+        private static int _STATE_CONNECTEDContent = default;
+        private static bool _STATE_CONNECTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioBroadcastAssistantSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#STATE_CONNECTING"/>
         /// </summary>
-        /// <remarks>If <see cref="OnIsLeAudioBroadcastAssistantSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnIsLeAudioBroadcastAssistantSupported { get; set; } = null;
-
-        void IsLeAudioBroadcastAssistantSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsLeAudioBroadcastAssistantSupported != null) ? OnIsLeAudioBroadcastAssistantSupported : IsLeAudioBroadcastAssistantSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
+        public static int STATE_CONNECTING { get { if (!_STATE_CONNECTINGReady) { _STATE_CONNECTINGContent = SGetField<int>(LocalBridgeClazz, "STATE_CONNECTING"); _STATE_CONNECTINGReady = true; } return _STATE_CONNECTINGContent; } }
+        private static int _STATE_CONNECTINGContent = default;
+        private static bool _STATE_CONNECTINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioBroadcastAssistantSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#STATE_DISCONNECTED"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int IsLeAudioBroadcastAssistantSupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioBroadcastSourceSupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsLeAudioBroadcastSourceSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnIsLeAudioBroadcastSourceSupported { get; set; } = null;
-
-        void IsLeAudioBroadcastSourceSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsLeAudioBroadcastSourceSupported != null) ? OnIsLeAudioBroadcastSourceSupported : IsLeAudioBroadcastSourceSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioBroadcastSourceSupported()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int IsLeAudioBroadcastSourceSupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioSupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsLeAudioSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnIsLeAudioSupported { get; set; } = null;
-
-        void IsLeAudioSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsLeAudioSupported != null) ? OnIsLeAudioSupported : IsLeAudioSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioSupported()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int IsLeAudioSupported()
-        {
-            return default;
-        }
-
+        public static int STATE_DISCONNECTED { get { if (!_STATE_DISCONNECTEDReady) { _STATE_DISCONNECTEDContent = SGetField<int>(LocalBridgeClazz, "STATE_DISCONNECTED"); _STATE_DISCONNECTEDReady = true; } return _STATE_DISCONNECTEDContent; } }
+        private static int _STATE_DISCONNECTEDContent = default;
+        private static bool _STATE_DISCONNECTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getAddress()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#STATE_DISCONNECTING"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetAddress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String> OnGetAddress { get; set; } = null;
-
-        void GetAddressEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetAddress != null) ? OnGetAddress : GetAddress;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
+        public static int STATE_DISCONNECTING { get { if (!_STATE_DISCONNECTINGReady) { _STATE_DISCONNECTINGContent = SGetField<int>(LocalBridgeClazz, "STATE_DISCONNECTING"); _STATE_DISCONNECTINGReady = true; } return _STATE_DISCONNECTINGContent; } }
+        private static int _STATE_DISCONNECTINGContent = default;
+        private static bool _STATE_DISCONNECTINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getAddress()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#STATE_OFF"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public virtual Java.Lang.String GetAddress()
-        {
-            return default;
-        }
-
+        public static int STATE_OFF { get { if (!_STATE_OFFReady) { _STATE_OFFContent = SGetField<int>(LocalBridgeClazz, "STATE_OFF"); _STATE_OFFReady = true; } return _STATE_OFFContent; } }
+        private static int _STATE_OFFContent = default;
+        private static bool _STATE_OFFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getName()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#STATE_ON"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetName"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String> OnGetName { get; set; } = null;
-
-        void GetNameEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetName != null) ? OnGetName : GetName;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
+        public static int STATE_ON { get { if (!_STATE_ONReady) { _STATE_ONContent = SGetField<int>(LocalBridgeClazz, "STATE_ON"); _STATE_ONReady = true; } return _STATE_ONContent; } }
+        private static int _STATE_ONContent = default;
+        private static bool _STATE_ONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getName()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#STATE_TURNING_OFF"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public virtual Java.Lang.String GetName()
-        {
-            return default;
-        }
-
+        public static int STATE_TURNING_OFF { get { if (!_STATE_TURNING_OFFReady) { _STATE_TURNING_OFFContent = SGetField<int>(LocalBridgeClazz, "STATE_TURNING_OFF"); _STATE_TURNING_OFFReady = true; } return _STATE_TURNING_OFFContent; } }
+        private static int _STATE_TURNING_OFFContent = default;
+        private static bool _STATE_TURNING_OFFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getDiscoverableTimeout()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#STATE_TURNING_ON"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetDiscoverableTimeout"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Time.Duration> OnGetDiscoverableTimeout { get; set; } = null;
-
-        void GetDiscoverableTimeoutEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetDiscoverableTimeout != null) ? OnGetDiscoverableTimeout : GetDiscoverableTimeout;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
+        public static int STATE_TURNING_ON { get { if (!_STATE_TURNING_ONReady) { _STATE_TURNING_ONContent = SGetField<int>(LocalBridgeClazz, "STATE_TURNING_ON"); _STATE_TURNING_ONReady = true; } return _STATE_TURNING_ONContent; } }
+        private static int _STATE_TURNING_ONContent = default;
+        private static bool _STATE_TURNING_ONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getDiscoverableTimeout()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ACTION_CONNECTION_STATE_CHANGED"/>
         /// </summary>
-        /// <returns><see cref="Java.Time.Duration"/></returns>
-        public virtual Java.Time.Duration GetDiscoverableTimeout()
-        {
-            return default;
-        }
-
+        public static Java.Lang.String ACTION_CONNECTION_STATE_CHANGED { get { if (!_ACTION_CONNECTION_STATE_CHANGEDReady) { _ACTION_CONNECTION_STATE_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_CONNECTION_STATE_CHANGED"); _ACTION_CONNECTION_STATE_CHANGEDReady = true; } return _ACTION_CONNECTION_STATE_CHANGEDContent; } }
+        private static Java.Lang.String _ACTION_CONNECTION_STATE_CHANGEDContent = default;
+        private static bool _ACTION_CONNECTION_STATE_CHANGEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBondedDevices()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ACTION_DISCOVERY_FINISHED"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetBondedDevices"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Set<Android.Bluetooth.BluetoothDevice>> OnGetBondedDevices { get; set; } = null;
-
-        void GetBondedDevicesEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetBondedDevices != null) ? OnGetBondedDevices : GetBondedDevices;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
+        public static Java.Lang.String ACTION_DISCOVERY_FINISHED { get { if (!_ACTION_DISCOVERY_FINISHEDReady) { _ACTION_DISCOVERY_FINISHEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_DISCOVERY_FINISHED"); _ACTION_DISCOVERY_FINISHEDReady = true; } return _ACTION_DISCOVERY_FINISHEDContent; } }
+        private static Java.Lang.String _ACTION_DISCOVERY_FINISHEDContent = default;
+        private static bool _ACTION_DISCOVERY_FINISHEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBondedDevices()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ACTION_DISCOVERY_STARTED"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Set"/></returns>
-        public virtual Java.Util.Set<Android.Bluetooth.BluetoothDevice> GetBondedDevices()
-        {
-            return default;
-        }
-
+        public static Java.Lang.String ACTION_DISCOVERY_STARTED { get { if (!_ACTION_DISCOVERY_STARTEDReady) { _ACTION_DISCOVERY_STARTEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_DISCOVERY_STARTED"); _ACTION_DISCOVERY_STARTEDReady = true; } return _ACTION_DISCOVERY_STARTEDContent; } }
+        private static Java.Lang.String _ACTION_DISCOVERY_STARTEDContent = default;
+        private static bool _ACTION_DISCOVERY_STARTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#closeProfileProxy(int,android.bluetooth.BluetoothProfile)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ACTION_LOCAL_NAME_CHANGED"/>
         /// </summary>
-        /// <remarks>If <see cref="OnCloseProfileProxy"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, Android.Bluetooth.BluetoothProfile> OnCloseProfileProxy { get; set; } = null;
-
-        void CloseProfileProxyEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCloseProfileProxy != null) ? OnCloseProfileProxy : CloseProfileProxy;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Bluetooth.BluetoothProfile>(0));
-        }
-
+        public static Java.Lang.String ACTION_LOCAL_NAME_CHANGED { get { if (!_ACTION_LOCAL_NAME_CHANGEDReady) { _ACTION_LOCAL_NAME_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_LOCAL_NAME_CHANGED"); _ACTION_LOCAL_NAME_CHANGEDReady = true; } return _ACTION_LOCAL_NAME_CHANGEDContent; } }
+        private static Java.Lang.String _ACTION_LOCAL_NAME_CHANGEDContent = default;
+        private static bool _ACTION_LOCAL_NAME_CHANGEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#closeProfileProxy(int,android.bluetooth.BluetoothProfile)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ACTION_REQUEST_DISCOVERABLE"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothProfile"/></param>
-        public virtual void CloseProfileProxy(int arg0, Android.Bluetooth.BluetoothProfile arg1)
-        {
-            
-        }
-
+        public static Java.Lang.String ACTION_REQUEST_DISCOVERABLE { get { if (!_ACTION_REQUEST_DISCOVERABLEReady) { _ACTION_REQUEST_DISCOVERABLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_REQUEST_DISCOVERABLE"); _ACTION_REQUEST_DISCOVERABLEReady = true; } return _ACTION_REQUEST_DISCOVERABLEContent; } }
+        private static Java.Lang.String _ACTION_REQUEST_DISCOVERABLEContent = default;
+        private static bool _ACTION_REQUEST_DISCOVERABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#stopLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ACTION_REQUEST_ENABLE"/>
         /// </summary>
-        /// <remarks>If <see cref="OnStopLeScan"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Bluetooth.BluetoothAdapter.LeScanCallback> OnStopLeScan { get; set; } = null;
-
-        void StopLeScanEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Bluetooth.BluetoothAdapter.LeScanCallback>> data)
-        {
-            var methodToExecute = (OnStopLeScan != null) ? OnStopLeScan : StopLeScan;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        public static Java.Lang.String ACTION_REQUEST_ENABLE { get { if (!_ACTION_REQUEST_ENABLEReady) { _ACTION_REQUEST_ENABLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_REQUEST_ENABLE"); _ACTION_REQUEST_ENABLEReady = true; } return _ACTION_REQUEST_ENABLEContent; } }
+        private static Java.Lang.String _ACTION_REQUEST_ENABLEContent = default;
+        private static bool _ACTION_REQUEST_ENABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#stopLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ACTION_SCAN_MODE_CHANGED"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothAdapter.LeScanCallback"/></param>
-        [System.Obsolete()]
-        public virtual void StopLeScan(Android.Bluetooth.BluetoothAdapter.LeScanCallback arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-        #region LeScanCallback
-        public partial class LeScanCallback
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
-            #region Instance methods
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.LeScanCallback.html#onLeScan(android.bluetooth.BluetoothDevice,int,byte[])"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <param name="arg2"><see cref="byte"/></param>
-            public void OnLeScan(Android.Bluetooth.BluetoothDevice arg0, int arg1, byte[] arg2)
-            {
-                IExecute("onLeScan", arg0, arg1, arg2);
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-    
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region BluetoothAdapterDirect
-    public partial class BluetoothAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
+        public static Java.Lang.String ACTION_SCAN_MODE_CHANGED { get { if (!_ACTION_SCAN_MODE_CHANGEDReady) { _ACTION_SCAN_MODE_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_SCAN_MODE_CHANGED"); _ACTION_SCAN_MODE_CHANGEDReady = true; } return _ACTION_SCAN_MODE_CHANGEDContent; } }
+        private static Java.Lang.String _ACTION_SCAN_MODE_CHANGEDContent = default;
+        private static bool _ACTION_SCAN_MODE_CHANGEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#ACTION_STATE_CHANGED"/>
         /// </summary>
-        public Java.Lang.String Address
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;"); }
-        }
+        public static Java.Lang.String ACTION_STATE_CHANGED { get { if (!_ACTION_STATE_CHANGEDReady) { _ACTION_STATE_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_STATE_CHANGED"); _ACTION_STATE_CHANGEDReady = true; } return _ACTION_STATE_CHANGEDContent; } }
+        private static Java.Lang.String _ACTION_STATE_CHANGEDContent = default;
+        private static bool _ACTION_STATE_CHANGEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBluetoothLeAdvertiser()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#EXTRA_CONNECTION_STATE"/>
         /// </summary>
-        public Android.Bluetooth.Le.BluetoothLeAdvertiser BluetoothLeAdvertiser
-        {
-            get { return IExecuteWithSignature<Android.Bluetooth.Le.BluetoothLeAdvertiser>("getBluetoothLeAdvertiser", "()Landroid/bluetooth/le/BluetoothLeAdvertiser;"); }
-        }
+        public static Java.Lang.String EXTRA_CONNECTION_STATE { get { if (!_EXTRA_CONNECTION_STATEReady) { _EXTRA_CONNECTION_STATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_CONNECTION_STATE"); _EXTRA_CONNECTION_STATEReady = true; } return _EXTRA_CONNECTION_STATEContent; } }
+        private static Java.Lang.String _EXTRA_CONNECTION_STATEContent = default;
+        private static bool _EXTRA_CONNECTION_STATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBluetoothLeScanner()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#EXTRA_DISCOVERABLE_DURATION"/>
         /// </summary>
-        public Android.Bluetooth.Le.BluetoothLeScanner BluetoothLeScanner
-        {
-            get { return IExecuteWithSignature<Android.Bluetooth.Le.BluetoothLeScanner>("getBluetoothLeScanner", "()Landroid/bluetooth/le/BluetoothLeScanner;"); }
-        }
+        public static Java.Lang.String EXTRA_DISCOVERABLE_DURATION { get { if (!_EXTRA_DISCOVERABLE_DURATIONReady) { _EXTRA_DISCOVERABLE_DURATIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_DISCOVERABLE_DURATION"); _EXTRA_DISCOVERABLE_DURATIONReady = true; } return _EXTRA_DISCOVERABLE_DURATIONContent; } }
+        private static Java.Lang.String _EXTRA_DISCOVERABLE_DURATIONContent = default;
+        private static bool _EXTRA_DISCOVERABLE_DURATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBondedDevices()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#EXTRA_LOCAL_NAME"/>
         /// </summary>
-        public Java.Util.Set<Android.Bluetooth.BluetoothDevice> BondedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Bluetooth.BluetoothDevice>>("getBondedDevices", "()Ljava/util/Set;"); }
-        }
+        public static Java.Lang.String EXTRA_LOCAL_NAME { get { if (!_EXTRA_LOCAL_NAMEReady) { _EXTRA_LOCAL_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_LOCAL_NAME"); _EXTRA_LOCAL_NAMEReady = true; } return _EXTRA_LOCAL_NAMEContent; } }
+        private static Java.Lang.String _EXTRA_LOCAL_NAMEContent = default;
+        private static bool _EXTRA_LOCAL_NAMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getDiscoverableTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#EXTRA_PREVIOUS_CONNECTION_STATE"/>
         /// </summary>
-        public Java.Time.Duration DiscoverableTimeout
-        {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getDiscoverableTimeout", "()Ljava/time/Duration;"); }
-        }
+        public static Java.Lang.String EXTRA_PREVIOUS_CONNECTION_STATE { get { if (!_EXTRA_PREVIOUS_CONNECTION_STATEReady) { _EXTRA_PREVIOUS_CONNECTION_STATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PREVIOUS_CONNECTION_STATE"); _EXTRA_PREVIOUS_CONNECTION_STATEReady = true; } return _EXTRA_PREVIOUS_CONNECTION_STATEContent; } }
+        private static Java.Lang.String _EXTRA_PREVIOUS_CONNECTION_STATEContent = default;
+        private static bool _EXTRA_PREVIOUS_CONNECTION_STATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getLeMaximumAdvertisingDataLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#EXTRA_PREVIOUS_SCAN_MODE"/>
         /// </summary>
-        public int LeMaximumAdvertisingDataLength
-        {
-            get { return IExecuteWithSignature<int>("getLeMaximumAdvertisingDataLength", "()I"); }
-        }
+        public static Java.Lang.String EXTRA_PREVIOUS_SCAN_MODE { get { if (!_EXTRA_PREVIOUS_SCAN_MODEReady) { _EXTRA_PREVIOUS_SCAN_MODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PREVIOUS_SCAN_MODE"); _EXTRA_PREVIOUS_SCAN_MODEReady = true; } return _EXTRA_PREVIOUS_SCAN_MODEContent; } }
+        private static Java.Lang.String _EXTRA_PREVIOUS_SCAN_MODEContent = default;
+        private static bool _EXTRA_PREVIOUS_SCAN_MODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getMaxConnectedAudioDevices()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#EXTRA_PREVIOUS_STATE"/>
         /// </summary>
-        public int MaxConnectedAudioDevices
-        {
-            get { return IExecuteWithSignature<int>("getMaxConnectedAudioDevices", "()I"); }
-        }
+        public static Java.Lang.String EXTRA_PREVIOUS_STATE { get { if (!_EXTRA_PREVIOUS_STATEReady) { _EXTRA_PREVIOUS_STATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PREVIOUS_STATE"); _EXTRA_PREVIOUS_STATEReady = true; } return _EXTRA_PREVIOUS_STATEContent; } }
+        private static Java.Lang.String _EXTRA_PREVIOUS_STATEContent = default;
+        private static bool _EXTRA_PREVIOUS_STATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#EXTRA_SCAN_MODE"/>
         /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
+        public static Java.Lang.String EXTRA_SCAN_MODE { get { if (!_EXTRA_SCAN_MODEReady) { _EXTRA_SCAN_MODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SCAN_MODE"); _EXTRA_SCAN_MODEReady = true; } return _EXTRA_SCAN_MODEContent; } }
+        private static Java.Lang.String _EXTRA_SCAN_MODEContent = default;
+        private static bool _EXTRA_SCAN_MODEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#EXTRA_STATE"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_STATE { get { if (!_EXTRA_STATEReady) { _EXTRA_STATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_STATE"); _EXTRA_STATEReady = true; } return _EXTRA_STATEContent; } }
+        private static Java.Lang.String _EXTRA_STATEContent = default;
+        private static bool _EXTRA_STATEReady = false; // this is used because in case of generics 
+
+        #endregion
+
+        #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getScanMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#checkBluetoothAddress(java.lang.String)"/>
         /// </summary>
-        public int ScanMode
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public static bool CheckBluetoothAddress(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<int>("getScanMode", "()I"); }
+            return SExecuteWithSignature<bool>(LocalBridgeClazz, "checkBluetoothAddress", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getDefaultAdapter()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="Android.Bluetooth.BluetoothAdapter"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Bluetooth.BluetoothAdapter GetDefaultAdapter()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return SExecuteWithSignature<Android.Bluetooth.BluetoothAdapter>(LocalBridgeClazz, "getDefaultAdapter", "()Landroid/bluetooth/BluetoothAdapter;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getRemoteDevice(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
-        public override Android.Bluetooth.BluetoothDevice GetRemoteDevice(byte[] arg0)
+        public Android.Bluetooth.BluetoothDevice GetRemoteDevice(byte[] arg0)
         {
             return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getRemoteDevice", "([B)Landroid/bluetooth/BluetoothDevice;", new object[] { arg0 });
         }
@@ -1198,7 +245,7 @@ public override Android.Bluetooth.BluetoothDevice GetRemoteDevice(byte[] arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
-        public override Android.Bluetooth.BluetoothDevice GetRemoteDevice(Java.Lang.String arg0)
+        public Android.Bluetooth.BluetoothDevice GetRemoteDevice(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getRemoteDevice", "(Ljava/lang/String;)Landroid/bluetooth/BluetoothDevice;", arg0);
         }
@@ -1208,7 +255,7 @@ public override Android.Bluetooth.BluetoothDevice GetRemoteDevice(Java.Lang.Stri
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
-        public override Android.Bluetooth.BluetoothDevice GetRemoteLeDevice(Java.Lang.String arg0, int arg1)
+        public Android.Bluetooth.BluetoothDevice GetRemoteLeDevice(Java.Lang.String arg0, int arg1)
         {
             return IExecute<Android.Bluetooth.BluetoothDevice>("getRemoteLeDevice", arg0, arg1);
         }
@@ -1217,7 +264,7 @@ public override Android.Bluetooth.BluetoothDevice GetRemoteLeDevice(Java.Lang.St
         /// </summary>
         /// <returns><see cref="Android.Bluetooth.BluetoothServerSocket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public override Android.Bluetooth.BluetoothServerSocket ListenUsingInsecureL2capChannel()
+        public Android.Bluetooth.BluetoothServerSocket ListenUsingInsecureL2capChannel()
         {
             return IExecuteWithSignature<Android.Bluetooth.BluetoothServerSocket>("listenUsingInsecureL2capChannel", "()Landroid/bluetooth/BluetoothServerSocket;");
         }
@@ -1228,7 +275,7 @@ public override Android.Bluetooth.BluetoothServerSocket ListenUsingInsecureL2cap
         /// <param name="arg1"><see cref="Java.Util.UUID"/></param>
         /// <returns><see cref="Android.Bluetooth.BluetoothServerSocket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public override Android.Bluetooth.BluetoothServerSocket ListenUsingInsecureRfcommWithServiceRecord(Java.Lang.String arg0, Java.Util.UUID arg1)
+        public Android.Bluetooth.BluetoothServerSocket ListenUsingInsecureRfcommWithServiceRecord(Java.Lang.String arg0, Java.Util.UUID arg1)
         {
             return IExecute<Android.Bluetooth.BluetoothServerSocket>("listenUsingInsecureRfcommWithServiceRecord", arg0, arg1);
         }
@@ -1237,7 +284,7 @@ public override Android.Bluetooth.BluetoothServerSocket ListenUsingInsecureRfcom
         /// </summary>
         /// <returns><see cref="Android.Bluetooth.BluetoothServerSocket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public override Android.Bluetooth.BluetoothServerSocket ListenUsingL2capChannel()
+        public Android.Bluetooth.BluetoothServerSocket ListenUsingL2capChannel()
         {
             return IExecuteWithSignature<Android.Bluetooth.BluetoothServerSocket>("listenUsingL2capChannel", "()Landroid/bluetooth/BluetoothServerSocket;");
         }
@@ -1248,15 +295,31 @@ public override Android.Bluetooth.BluetoothServerSocket ListenUsingL2capChannel(
         /// <param name="arg1"><see cref="Java.Util.UUID"/></param>
         /// <returns><see cref="Android.Bluetooth.BluetoothServerSocket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public override Android.Bluetooth.BluetoothServerSocket ListenUsingRfcommWithServiceRecord(Java.Lang.String arg0, Java.Util.UUID arg1)
+        public Android.Bluetooth.BluetoothServerSocket ListenUsingRfcommWithServiceRecord(Java.Lang.String arg0, Java.Util.UUID arg1)
         {
             return IExecute<Android.Bluetooth.BluetoothServerSocket>("listenUsingRfcommWithServiceRecord", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBluetoothLeAdvertiser()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Bluetooth.Le.BluetoothLeAdvertiser"/></returns>
+        public Android.Bluetooth.Le.BluetoothLeAdvertiser GetBluetoothLeAdvertiser()
+        {
+            return IExecuteWithSignature<Android.Bluetooth.Le.BluetoothLeAdvertiser>("getBluetoothLeAdvertiser", "()Landroid/bluetooth/le/BluetoothLeAdvertiser;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBluetoothLeScanner()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Bluetooth.Le.BluetoothLeScanner"/></returns>
+        public Android.Bluetooth.Le.BluetoothLeScanner GetBluetoothLeScanner()
+        {
+            return IExecuteWithSignature<Android.Bluetooth.Le.BluetoothLeScanner>("getBluetoothLeScanner", "()Landroid/bluetooth/le/BluetoothLeScanner;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#cancelDiscovery()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool CancelDiscovery()
+        public bool CancelDiscovery()
         {
             return IExecuteWithSignature<bool>("cancelDiscovery", "()Z");
         }
@@ -1264,8 +327,8 @@ public override bool CancelDiscovery()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#disable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public override bool Disable()
+        [global::System.Obsolete()]
+        public bool Disable()
         {
             return IExecuteWithSignature<bool>("disable", "()Z");
         }
@@ -1273,8 +336,8 @@ public override bool Disable()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#enable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public override bool Enable()
+        [global::System.Obsolete()]
+        public bool Enable()
         {
             return IExecuteWithSignature<bool>("enable", "()Z");
         }
@@ -1285,7 +348,7 @@ public override bool Enable()
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothProfile.ServiceListener"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public override bool GetProfileProxy(Android.Content.Context arg0, Android.Bluetooth.BluetoothProfile.ServiceListener arg1, int arg2)
+        public bool GetProfileProxy(Android.Content.Context arg0, Android.Bluetooth.BluetoothProfile.ServiceListener arg1, int arg2)
         {
             return IExecute<bool>("getProfileProxy", arg0, arg1, arg2);
         }
@@ -1293,7 +356,7 @@ public override bool GetProfileProxy(Android.Content.Context arg0, Android.Bluet
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isDiscovering()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsDiscovering()
+        public bool IsDiscovering()
         {
             return IExecuteWithSignature<bool>("isDiscovering", "()Z");
         }
@@ -1301,7 +364,7 @@ public override bool IsDiscovering()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsEnabled()
+        public bool IsEnabled()
         {
             return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
@@ -1309,7 +372,7 @@ public override bool IsEnabled()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLe2MPhySupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsLe2MPhySupported()
+        public bool IsLe2MPhySupported()
         {
             return IExecuteWithSignature<bool>("isLe2MPhySupported", "()Z");
         }
@@ -1317,7 +380,7 @@ public override bool IsLe2MPhySupported()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeCodedPhySupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsLeCodedPhySupported()
+        public bool IsLeCodedPhySupported()
         {
             return IExecuteWithSignature<bool>("isLeCodedPhySupported", "()Z");
         }
@@ -1325,7 +388,7 @@ public override bool IsLeCodedPhySupported()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeExtendedAdvertisingSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsLeExtendedAdvertisingSupported()
+        public bool IsLeExtendedAdvertisingSupported()
         {
             return IExecuteWithSignature<bool>("isLeExtendedAdvertisingSupported", "()Z");
         }
@@ -1333,7 +396,7 @@ public override bool IsLeExtendedAdvertisingSupported()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLePeriodicAdvertisingSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsLePeriodicAdvertisingSupported()
+        public bool IsLePeriodicAdvertisingSupported()
         {
             return IExecuteWithSignature<bool>("isLePeriodicAdvertisingSupported", "()Z");
         }
@@ -1341,7 +404,7 @@ public override bool IsLePeriodicAdvertisingSupported()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isMultipleAdvertisementSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsMultipleAdvertisementSupported()
+        public bool IsMultipleAdvertisementSupported()
         {
             return IExecuteWithSignature<bool>("isMultipleAdvertisementSupported", "()Z");
         }
@@ -1349,7 +412,7 @@ public override bool IsMultipleAdvertisementSupported()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isOffloadedFilteringSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsOffloadedFilteringSupported()
+        public bool IsOffloadedFilteringSupported()
         {
             return IExecuteWithSignature<bool>("isOffloadedFilteringSupported", "()Z");
         }
@@ -1357,7 +420,7 @@ public override bool IsOffloadedFilteringSupported()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isOffloadedScanBatchingSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool IsOffloadedScanBatchingSupported()
+        public bool IsOffloadedScanBatchingSupported()
         {
             return IExecuteWithSignature<bool>("isOffloadedScanBatchingSupported", "()Z");
         }
@@ -1366,7 +429,7 @@ public override bool IsOffloadedScanBatchingSupported()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        public override bool SetName(Java.Lang.String arg0)
+        public bool SetName(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("setName", "(Ljava/lang/String;)Z", arg0);
         }
@@ -1374,7 +437,7 @@ public override bool SetName(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#startDiscovery()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool StartDiscovery()
+        public bool StartDiscovery()
         {
             return IExecuteWithSignature<bool>("startDiscovery", "()Z");
         }
@@ -1383,8 +446,8 @@ public override bool StartDiscovery()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothAdapter.LeScanCallback"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public override bool StartLeScan(Android.Bluetooth.BluetoothAdapter.LeScanCallback arg0)
+        [global::System.Obsolete()]
+        public bool StartLeScan(Android.Bluetooth.BluetoothAdapter.LeScanCallback arg0)
         {
             return IExecuteWithSignature<bool>("startLeScan", "(Landroid/bluetooth/BluetoothAdapter$LeScanCallback;)Z", arg0);
         }
@@ -1394,25 +457,57 @@ public override bool StartLeScan(Android.Bluetooth.BluetoothAdapter.LeScanCallba
         /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothAdapter.LeScanCallback"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public override bool StartLeScan(Java.Util.UUID[] arg0, Android.Bluetooth.BluetoothAdapter.LeScanCallback arg1)
+        [global::System.Obsolete()]
+        public bool StartLeScan(Java.Util.UUID[] arg0, Android.Bluetooth.BluetoothAdapter.LeScanCallback arg1)
         {
             return IExecute<bool>("startLeScan", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getLeMaximumAdvertisingDataLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLeMaximumAdvertisingDataLength()
+        {
+            return IExecuteWithSignature<int>("getLeMaximumAdvertisingDataLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getMaxConnectedAudioDevices()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxConnectedAudioDevices()
+        {
+            return IExecuteWithSignature<int>("getMaxConnectedAudioDevices", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getProfileConnectionState(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public override int GetProfileConnectionState(int arg0)
+        public int GetProfileConnectionState(int arg0)
         {
             return IExecuteWithSignature<int>("getProfileConnectionState", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getScanMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetScanMode()
+        {
+            return IExecuteWithSignature<int>("getScanMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
+        {
+            return IExecuteWithSignature<int>("getState", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioBroadcastAssistantSupported()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public override int IsLeAudioBroadcastAssistantSupported()
+        public int IsLeAudioBroadcastAssistantSupported()
         {
             return IExecuteWithSignature<int>("isLeAudioBroadcastAssistantSupported", "()I");
         }
@@ -1420,7 +515,7 @@ public override int IsLeAudioBroadcastAssistantSupported()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioBroadcastSourceSupported()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public override int IsLeAudioBroadcastSourceSupported()
+        public int IsLeAudioBroadcastSourceSupported()
         {
             return IExecuteWithSignature<int>("isLeAudioBroadcastSourceSupported", "()I");
         }
@@ -1428,16 +523,48 @@ public override int IsLeAudioBroadcastSourceSupported()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#isLeAudioSupported()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public override int IsLeAudioSupported()
+        public int IsLeAudioSupported()
         {
             return IExecuteWithSignature<int>("isLeAudioSupported", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAddress()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getDiscoverableTimeout()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetDiscoverableTimeout()
+        {
+            return IExecuteWithSignature<Java.Time.Duration>("getDiscoverableTimeout", "()Ljava/time/Duration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#getBondedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Bluetooth.BluetoothDevice> GetBondedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Android.Bluetooth.BluetoothDevice>>("getBondedDevices", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#closeProfileProxy(int,android.bluetooth.BluetoothProfile)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothProfile"/></param>
-        public override void CloseProfileProxy(int arg0, Android.Bluetooth.BluetoothProfile arg1)
+        public void CloseProfileProxy(int arg0, Android.Bluetooth.BluetoothProfile arg1)
         {
             IExecute("closeProfileProxy", arg0, arg1);
         }
@@ -1445,8 +572,8 @@ public override void CloseProfileProxy(int arg0, Android.Bluetooth.BluetoothProf
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html#stopLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothAdapter.LeScanCallback"/></param>
-        [System.Obsolete()]
-        public override void StopLeScan(Android.Bluetooth.BluetoothAdapter.LeScanCallback arg0)
+        [global::System.Obsolete()]
+        public void StopLeScan(Android.Bluetooth.BluetoothAdapter.LeScanCallback arg0)
         {
             IExecuteWithSignature("stopLeScan", "(Landroid/bluetooth/BluetoothAdapter$LeScanCallback;)V", arg0);
         }
@@ -1454,7 +581,48 @@ public override void StopLeScan(Android.Bluetooth.BluetoothAdapter.LeScanCallbac
         #endregion
 
         #region Nested classes
+        #region LeScanCallback
+        public partial class LeScanCallback
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.LeScanCallback.html#onLeScan(android.bluetooth.BluetoothDevice,int,byte[])"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            /// <param name="arg2"><see cref="byte"/></param>
+            public void OnLeScan(Android.Bluetooth.BluetoothDevice arg0, int arg1, byte[] arg2)
+            {
+                IExecute("onLeScan", arg0, arg1, arg2);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
 
+    
         #endregion
 
         // TODO: complete the class
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothClass.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothClass.cs
index c9dc16ab8..6d49bf323 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothClass.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothClass.cs
@@ -70,20 +70,6 @@ public partial class BluetoothClass
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothClass.html#getDeviceClass()"/> 
-        /// </summary>
-        public int DeviceClass
-        {
-            get { return IExecuteWithSignature<int>("getDeviceClass", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothClass.html#getMajorDeviceClass()"/> 
-        /// </summary>
-        public int MajorDeviceClass
-        {
-            get { return IExecuteWithSignature<int>("getMajorDeviceClass", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothClass.html#doesClassMatch(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -110,6 +96,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothClass.html#getDeviceClass()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceClass()
+        {
+            return IExecuteWithSignature<int>("getDeviceClass", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothClass.html#getMajorDeviceClass()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMajorDeviceClass()
+        {
+            return IExecuteWithSignature<int>("getMajorDeviceClass", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothClass.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCodecConfig.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCodecConfig.cs
index 4b21b3608..9a1fe675a 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCodecConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCodecConfig.cs
@@ -202,83 +202,92 @@ public partial class BluetoothCodecConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getBitsPerSample()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#isMandatoryCodec()"/>
         /// </summary>
-        public int BitsPerSample
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMandatoryCodec()
         {
-            get { return IExecuteWithSignature<int>("getBitsPerSample", "()I"); }
+            return IExecuteWithSignature<bool>("isMandatoryCodec", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getChannelMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#describeContents()"/>
         /// </summary>
-        public int ChannelMode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getChannelMode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecPriority()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getBitsPerSample()"/>
         /// </summary>
-        public int CodecPriority
+        /// <returns><see cref="int"/></returns>
+        public int GetBitsPerSample()
         {
-            get { return IExecuteWithSignature<int>("getCodecPriority", "()I"); }
+            return IExecuteWithSignature<int>("getBitsPerSample", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecSpecific1()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getChannelMode()"/>
         /// </summary>
-        public long CodecSpecific1
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelMode()
         {
-            get { return IExecuteWithSignature<long>("getCodecSpecific1", "()J"); }
+            return IExecuteWithSignature<int>("getChannelMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecSpecific2()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecPriority()"/>
         /// </summary>
-        public long CodecSpecific2
+        /// <returns><see cref="int"/></returns>
+        public int GetCodecPriority()
         {
-            get { return IExecuteWithSignature<long>("getCodecSpecific2", "()J"); }
+            return IExecuteWithSignature<int>("getCodecPriority", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecSpecific3()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecType()"/>
         /// </summary>
-        public long CodecSpecific3
+        /// <returns><see cref="int"/></returns>
+        public int GetCodecType()
         {
-            get { return IExecuteWithSignature<long>("getCodecSpecific3", "()J"); }
+            return IExecuteWithSignature<int>("getCodecType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecSpecific4()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getSampleRate()"/>
         /// </summary>
-        public long CodecSpecific4
+        /// <returns><see cref="int"/></returns>
+        public int GetSampleRate()
         {
-            get { return IExecuteWithSignature<long>("getCodecSpecific4", "()J"); }
+            return IExecuteWithSignature<int>("getSampleRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecSpecific1()"/>
         /// </summary>
-        public int CodecType
+        /// <returns><see cref="long"/></returns>
+        public long GetCodecSpecific1()
         {
-            get { return IExecuteWithSignature<int>("getCodecType", "()I"); }
+            return IExecuteWithSignature<long>("getCodecSpecific1", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getSampleRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecSpecific2()"/>
         /// </summary>
-        public int SampleRate
+        /// <returns><see cref="long"/></returns>
+        public long GetCodecSpecific2()
         {
-            get { return IExecuteWithSignature<int>("getSampleRate", "()I"); }
+            return IExecuteWithSignature<long>("getCodecSpecific2", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#isMandatoryCodec()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecSpecific3()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMandatoryCodec()
+        /// <returns><see cref="long"/></returns>
+        public long GetCodecSpecific3()
         {
-            return IExecuteWithSignature<bool>("isMandatoryCodec", "()Z");
+            return IExecuteWithSignature<long>("getCodecSpecific3", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#getCodecSpecific4()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetCodecSpecific4()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getCodecSpecific4", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCodecStatus.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCodecStatus.cs
index d4e014912..31cb04729 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCodecStatus.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCodecStatus.cs
@@ -58,25 +58,12 @@ public partial class BluetoothCodecStatus
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecStatus.html#getCodecConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecStatus.html#getCodecConfig()"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothCodecConfig CodecConfig
+        /// <returns><see cref="Android.Bluetooth.BluetoothCodecConfig"/></returns>
+        public Android.Bluetooth.BluetoothCodecConfig GetCodecConfig()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothCodecConfig>("getCodecConfig", "()Landroid/bluetooth/BluetoothCodecConfig;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecStatus.html#getCodecsLocalCapabilities()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothCodecConfig> CodecsLocalCapabilities
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothCodecConfig>>("getCodecsLocalCapabilities", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecStatus.html#getCodecsSelectableCapabilities()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothCodecConfig> CodecsSelectableCapabilities
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothCodecConfig>>("getCodecsSelectableCapabilities", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothCodecConfig>("getCodecConfig", "()Landroid/bluetooth/BluetoothCodecConfig;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecStatus.html#isCodecConfigSelectable(android.bluetooth.BluetoothCodecConfig)"/>
@@ -96,6 +83,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecStatus.html#getCodecsLocalCapabilities()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothCodecConfig> GetCodecsLocalCapabilities()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothCodecConfig>>("getCodecsLocalCapabilities", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecStatus.html#getCodecsSelectableCapabilities()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothCodecConfig> GetCodecsSelectableCapabilities()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothCodecConfig>>("getCodecsSelectableCapabilities", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCodecStatus.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCsipSetCoordinator.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCsipSetCoordinator.cs
index 509f524ba..56b631a7b 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCsipSetCoordinator.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothCsipSetCoordinator.cs
@@ -60,13 +60,6 @@ public partial class BluetoothCsipSetCoordinator : Android.Bluetooth.IBluetoothP
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCsipSetCoordinator.html#getConnectedDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCsipSetCoordinator.html#getConnectionState(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
@@ -76,6 +69,14 @@ public int GetConnectionState(Android.Bluetooth.BluetoothDevice arg0)
             return IExecuteWithSignature<int>("getConnectionState", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCsipSetCoordinator.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothCsipSetCoordinator.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothDevice.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothDevice.cs
index 649ca2ba7..5ef479ae1 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothDevice.cs
@@ -328,53 +328,12 @@ public partial class BluetoothDevice
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getBluetoothClass()"/>
         /// </summary>
-        public Java.Lang.String Address
+        /// <returns><see cref="Android.Bluetooth.BluetoothClass"/></returns>
+        public Android.Bluetooth.BluetoothClass GetBluetoothClass()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getAlias()"/> 
-        /// </summary>
-        public Java.Lang.String Alias
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlias", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getBluetoothClass()"/> 
-        /// </summary>
-        public Android.Bluetooth.BluetoothClass BluetoothClass
-        {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothClass>("getBluetoothClass", "()Landroid/bluetooth/BluetoothClass;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getBondState()"/> 
-        /// </summary>
-        public int BondState
-        {
-            get { return IExecuteWithSignature<int>("getBondState", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getUuids()"/> 
-        /// </summary>
-        public Android.Os.ParcelUuid[] Uuids
-        {
-            get { return IExecuteWithSignatureArray<Android.Os.ParcelUuid>("getUuids", "()[Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothClass>("getBluetoothClass", "()Landroid/bluetooth/BluetoothClass;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#connectGatt(android.content.Context,boolean,android.bluetooth.BluetoothGattCallback,int,int,android.os.Handler)"/>
@@ -467,6 +426,14 @@ public Android.Bluetooth.BluetoothSocket CreateRfcommSocketToServiceRecord(Java.
             return IExecuteWithSignature<Android.Bluetooth.BluetoothSocket>("createRfcommSocketToServiceRecord", "(Ljava/util/UUID;)Landroid/bluetooth/BluetoothSocket;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getUuids()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid[] GetUuids()
+        {
+            return IExecuteWithSignatureArray<Android.Os.ParcelUuid>("getUuids", "()[Landroid/os/ParcelUuid;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#createBond()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -509,6 +476,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getBondState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBondState()
+        {
+            return IExecuteWithSignature<int>("getBondState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#setAlias(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -518,6 +501,30 @@ public int SetAlias(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("setAlias", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAddress()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getAlias()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlias()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAlias", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGatt.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGatt.cs
index 35d2df51d..a11f866e2 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGatt.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGatt.cs
@@ -136,26 +136,12 @@ public partial class BluetoothGatt
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#getConnectedDevices()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#getDevice()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
+        /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
+        public Android.Bluetooth.BluetoothDevice GetDevice()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#getDevice()"/> 
-        /// </summary>
-        public Android.Bluetooth.BluetoothDevice Device
-        {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getDevice", "()Landroid/bluetooth/BluetoothDevice;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#getServices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothGattService> Services
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattService>>("getServices", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getDevice", "()Landroid/bluetooth/BluetoothDevice;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#getService(java.util.UUID)"/>
@@ -257,7 +243,7 @@ public bool SetCharacteristicNotification(Android.Bluetooth.BluetoothGattCharact
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WriteCharacteristic(Android.Bluetooth.BluetoothGattCharacteristic arg0)
         {
             return IExecuteWithSignature<bool>("writeCharacteristic", "(Landroid/bluetooth/BluetoothGattCharacteristic;)Z", arg0);
@@ -267,7 +253,7 @@ public bool WriteCharacteristic(Android.Bluetooth.BluetoothGattCharacteristic ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGattDescriptor"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WriteDescriptor(Android.Bluetooth.BluetoothGattDescriptor arg0)
         {
             return IExecuteWithSignature<bool>("writeDescriptor", "(Landroid/bluetooth/BluetoothGattDescriptor;)Z", arg0);
@@ -277,7 +263,7 @@ public bool WriteDescriptor(Android.Bluetooth.BluetoothGattDescriptor arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetConnectionState(Android.Bluetooth.BluetoothDevice arg0)
         {
             return IExecuteWithSignature<int>("getConnectionState", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
@@ -304,16 +290,33 @@ public int WriteDescriptor(Android.Bluetooth.BluetoothGattDescriptor arg0, byte[
             return IExecute<int>("writeDescriptor", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetDevicesMatchingConnectionStates(int[] arg0)
         {
             return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getDevicesMatchingConnectionStates", "([I)Ljava/util/List;", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#getServices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothGattService> GetServices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattService>>("getServices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#abortReliableWrite()"/>
         /// </summary>
         public void AbortReliableWrite()
@@ -324,7 +327,7 @@ public void AbortReliableWrite()
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#abortReliableWrite(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AbortReliableWrite(Android.Bluetooth.BluetoothDevice arg0)
         {
             IExecuteWithSignature("abortReliableWrite", "(Landroid/bluetooth/BluetoothDevice;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattCallback.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattCallback.cs
index 90094e22f..4f7ad6dca 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattCallback.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattCallback.cs
@@ -60,7 +60,7 @@ public void OnCharacteristicChanged(Android.Bluetooth.BluetoothGatt arg0, Androi
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGatt"/></param>
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCharacteristicChanged(Android.Bluetooth.BluetoothGatt arg0, Android.Bluetooth.BluetoothGattCharacteristic arg1)
         {
             IExecute("onCharacteristicChanged", arg0, arg1);
@@ -82,7 +82,7 @@ public void OnCharacteristicRead(Android.Bluetooth.BluetoothGatt arg0, Android.B
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGatt"/></param>
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCharacteristicRead(Android.Bluetooth.BluetoothGatt arg0, Android.Bluetooth.BluetoothGattCharacteristic arg1, int arg2)
         {
             IExecute("onCharacteristicRead", arg0, arg1, arg2);
@@ -124,7 +124,7 @@ public void OnDescriptorRead(Android.Bluetooth.BluetoothGatt arg0, Android.Bluet
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGatt"/></param>
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothGattDescriptor"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDescriptorRead(Android.Bluetooth.BluetoothGatt arg0, Android.Bluetooth.BluetoothGattDescriptor arg1, int arg2)
         {
             IExecute("onDescriptorRead", arg0, arg1, arg2);
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattCharacteristic.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattCharacteristic.cs
index e50e45f57..5c312c0d5 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattCharacteristic.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattCharacteristic.cs
@@ -224,63 +224,6 @@ public BluetoothGattCharacteristic(Java.Util.UUID arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getDescriptors()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothGattDescriptor> Descriptors
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattDescriptor>>("getDescriptors", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getInstanceId()"/> 
-        /// </summary>
-        public int InstanceId
-        {
-            get { return IExecuteWithSignature<int>("getInstanceId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getPermissions()"/> 
-        /// </summary>
-        public int Permissions
-        {
-            get { return IExecuteWithSignature<int>("getPermissions", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getProperties()"/> 
-        /// </summary>
-        public int Properties
-        {
-            get { return IExecuteWithSignature<int>("getProperties", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getService()"/> 
-        /// </summary>
-        public Android.Bluetooth.BluetoothGattService Service
-        {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothGattService>("getService", "()Landroid/bluetooth/BluetoothGattService;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getUuid()"/> 
-        /// </summary>
-        public Java.Util.UUID Uuid
-        {
-            get { return IExecuteWithSignature<Java.Util.UUID>("getUuid", "()Ljava/util/UUID;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getValue()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public byte[] Value
-        {
-            get { return IExecuteWithSignatureArray<byte>("getValue", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getWriteType()"/> <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#setWriteType(int)"/>
-        /// </summary>
-        public int WriteType
-        {
-            get { return IExecuteWithSignature<int>("getWriteType", "()I"); } set { IExecuteWithSignature("setWriteType", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getDescriptor(java.util.UUID)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
@@ -290,6 +233,14 @@ public Android.Bluetooth.BluetoothGattDescriptor GetDescriptor(Java.Util.UUID ar
             return IExecuteWithSignature<Android.Bluetooth.BluetoothGattDescriptor>("getDescriptor", "(Ljava/util/UUID;)Landroid/bluetooth/BluetoothGattDescriptor;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getService()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Bluetooth.BluetoothGattService"/></returns>
+        public Android.Bluetooth.BluetoothGattService GetService()
+        {
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothGattService>("getService", "()Landroid/bluetooth/BluetoothGattService;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#addDescriptor(android.bluetooth.BluetoothGattDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGattDescriptor"/></param>
@@ -303,7 +254,7 @@ public bool AddDescriptor(Android.Bluetooth.BluetoothGattDescriptor arg0)
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetValue(byte[] arg0)
         {
             return IExecuteWithSignature<bool>("setValue", "([B)Z", new object[] { arg0 });
@@ -316,7 +267,7 @@ public bool SetValue(byte[] arg0)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetValue(int arg0, int arg1, int arg2, int arg3)
         {
             return IExecute<bool>("setValue", arg0, arg1, arg2, arg3);
@@ -328,7 +279,7 @@ public bool SetValue(int arg0, int arg1, int arg2, int arg3)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetValue(int arg0, int arg1, int arg2)
         {
             return IExecute<bool>("setValue", arg0, arg1, arg2);
@@ -338,12 +289,21 @@ public bool SetValue(int arg0, int arg1, int arg2)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetValue(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("setValue", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getValue()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetValue()
+        {
+            return IExecuteWithSignatureArray<byte>("getValue", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -352,12 +312,44 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getInstanceId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInstanceId()
+        {
+            return IExecuteWithSignature<int>("getInstanceId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getPermissions()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPermissions()
+        {
+            return IExecuteWithSignature<int>("getPermissions", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getProperties()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetProperties()
+        {
+            return IExecuteWithSignature<int>("getProperties", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getWriteType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWriteType()
+        {
+            return IExecuteWithSignature<int>("getWriteType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getFloatValue(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.Float"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.Float GetFloatValue(int arg0, int arg1)
         {
             return IExecute<Java.Lang.Float>("getFloatValue", arg0, arg1);
@@ -368,7 +360,7 @@ public Java.Lang.Float GetFloatValue(int arg0, int arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.Integer"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.Integer GetIntValue(int arg0, int arg1)
         {
             return IExecute<Java.Lang.Integer>("getIntValue", arg0, arg1);
@@ -378,12 +370,36 @@ public Java.Lang.Integer GetIntValue(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetStringValue(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getStringValue", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getDescriptors()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothGattDescriptor> GetDescriptors()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattDescriptor>>("getDescriptors", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#getUuid()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.UUID"/></returns>
+        public Java.Util.UUID GetUuid()
+        {
+            return IExecuteWithSignature<Java.Util.UUID>("getUuid", "()Ljava/util/UUID;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#setWriteType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetWriteType(int arg0)
+        {
+            IExecuteWithSignature("setWriteType", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattCharacteristic.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattDescriptor.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattDescriptor.cs
index 4cdd02d5f..2945ea044 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattDescriptor.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattDescriptor.cs
@@ -127,51 +127,55 @@ public BluetoothGattDescriptor(Java.Util.UUID arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#getCharacteristic()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#getCharacteristic()"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothGattCharacteristic Characteristic
+        /// <returns><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></returns>
+        public Android.Bluetooth.BluetoothGattCharacteristic GetCharacteristic()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothGattCharacteristic>("getCharacteristic", "()Landroid/bluetooth/BluetoothGattCharacteristic;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothGattCharacteristic>("getCharacteristic", "()Landroid/bluetooth/BluetoothGattCharacteristic;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#getPermissions()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#setValue(byte[])"/>
         /// </summary>
-        public int Permissions
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool SetValue(byte[] arg0)
         {
-            get { return IExecuteWithSignature<int>("getPermissions", "()I"); }
+            return IExecuteWithSignature<bool>("setValue", "([B)Z", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#getUuid()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#getValue()"/>
         /// </summary>
-        public Java.Util.UUID Uuid
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetValue()
         {
-            get { return IExecuteWithSignature<Java.Util.UUID>("getUuid", "()Ljava/util/UUID;"); }
+            return IExecuteWithSignatureArray<byte>("getValue", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#describeContents()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte[] Value
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<byte>("getValue", "()[B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#setValue(byte[])"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#getPermissions()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool SetValue(byte[] arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPermissions()
         {
-            return IExecuteWithSignature<bool>("setValue", "([B)Z", new object[] { arg0 });
+            return IExecuteWithSignature<int>("getPermissions", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#getUuid()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.UUID"/></returns>
+        public Java.Util.UUID GetUuid()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.UUID>("getUuid", "()Ljava/util/UUID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattDescriptor.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattServer.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattServer.cs
index f7d12df19..756b38b69 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattServer.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattServer.cs
@@ -46,20 +46,6 @@ public partial class BluetoothGattServer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattServer.html#getConnectedDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattServer.html#getServices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothGattService> Services
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattService>>("getServices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattServer.html#getService(java.util.UUID)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
@@ -94,7 +80,7 @@ public bool Connect(Android.Bluetooth.BluetoothDevice arg0, bool arg1)
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool NotifyCharacteristicChanged(Android.Bluetooth.BluetoothDevice arg0, Android.Bluetooth.BluetoothGattCharacteristic arg1, bool arg2)
         {
             return IExecute<bool>("notifyCharacteristicChanged", arg0, arg1, arg2);
@@ -143,6 +129,14 @@ public int NotifyCharacteristicChanged(Android.Bluetooth.BluetoothDevice arg0, A
             return IExecute<int>("notifyCharacteristicChanged", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattServer.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattServer.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -152,6 +146,14 @@ public int NotifyCharacteristicChanged(Android.Bluetooth.BluetoothDevice arg0, A
             return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getDevicesMatchingConnectionStates", "([I)Ljava/util/List;", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattServer.html#getServices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothGattService> GetServices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattService>>("getServices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattServer.html#cancelConnection(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattService.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattService.cs
index 0a2ca0f66..814fb0770 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattService.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothGattService.cs
@@ -73,74 +73,79 @@ public BluetoothGattService(Java.Util.UUID arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getCharacteristics()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getCharacteristic(java.util.UUID)"/>
         /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothGattCharacteristic> Characteristics
+        /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
+        /// <returns><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></returns>
+        public Android.Bluetooth.BluetoothGattCharacteristic GetCharacteristic(Java.Util.UUID arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattCharacteristic>>("getCharacteristics", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothGattCharacteristic>("getCharacteristic", "(Ljava/util/UUID;)Landroid/bluetooth/BluetoothGattCharacteristic;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getIncludedServices()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#addCharacteristic(android.bluetooth.BluetoothGattCharacteristic)"/>
         /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothGattService> IncludedServices
+        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool AddCharacteristic(Android.Bluetooth.BluetoothGattCharacteristic arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattService>>("getIncludedServices", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("addCharacteristic", "(Landroid/bluetooth/BluetoothGattCharacteristic;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getInstanceId()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#addService(android.bluetooth.BluetoothGattService)"/>
         /// </summary>
-        public int InstanceId
+        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGattService"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool AddService(Android.Bluetooth.BluetoothGattService arg0)
         {
-            get { return IExecuteWithSignature<int>("getInstanceId", "()I"); }
+            return IExecuteWithSignature<bool>("addService", "(Landroid/bluetooth/BluetoothGattService;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#describeContents()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getUuid()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getInstanceId()"/>
         /// </summary>
-        public Java.Util.UUID Uuid
+        /// <returns><see cref="int"/></returns>
+        public int GetInstanceId()
         {
-            get { return IExecuteWithSignature<Java.Util.UUID>("getUuid", "()Ljava/util/UUID;"); }
+            return IExecuteWithSignature<int>("getInstanceId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getCharacteristic(java.util.UUID)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getType()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
-        /// <returns><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></returns>
-        public Android.Bluetooth.BluetoothGattCharacteristic GetCharacteristic(Java.Util.UUID arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            return IExecuteWithSignature<Android.Bluetooth.BluetoothGattCharacteristic>("getCharacteristic", "(Ljava/util/UUID;)Landroid/bluetooth/BluetoothGattCharacteristic;", arg0);
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#addCharacteristic(android.bluetooth.BluetoothGattCharacteristic)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getCharacteristics()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGattCharacteristic"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool AddCharacteristic(Android.Bluetooth.BluetoothGattCharacteristic arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothGattCharacteristic> GetCharacteristics()
         {
-            return IExecuteWithSignature<bool>("addCharacteristic", "(Landroid/bluetooth/BluetoothGattCharacteristic;)Z", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattCharacteristic>>("getCharacteristics", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#addService(android.bluetooth.BluetoothGattService)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getIncludedServices()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothGattService"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool AddService(Android.Bluetooth.BluetoothGattService arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothGattService> GetIncludedServices()
         {
-            return IExecuteWithSignature<bool>("addService", "(Landroid/bluetooth/BluetoothGattService;)Z", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothGattService>>("getIncludedServices", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#getUuid()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.UUID"/></returns>
+        public Java.Util.UUID GetUuid()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.UUID>("getUuid", "()Ljava/util/UUID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothGattService.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHeadset.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHeadset.cs
index fb5957463..118944ff7 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHeadset.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHeadset.cs
@@ -142,13 +142,6 @@ public partial class BluetoothHeadset
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHeadset.html#getConnectedDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHeadset.html#isAudioConnected(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
@@ -214,6 +207,14 @@ public int GetConnectionState(Android.Bluetooth.BluetoothDevice arg0)
             return IExecuteWithSignature<int>("getConnectionState", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHeadset.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHeadset.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealth.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealth.cs
index 6193c3d28..0fb046506 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealth.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealth.cs
@@ -40,84 +40,84 @@ public partial class BluetoothHealth
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#APP_CONFIG_REGISTRATION_FAILURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int APP_CONFIG_REGISTRATION_FAILURE { get { if (!_APP_CONFIG_REGISTRATION_FAILUREReady) { _APP_CONFIG_REGISTRATION_FAILUREContent = SGetField<int>(LocalBridgeClazz, "APP_CONFIG_REGISTRATION_FAILURE"); _APP_CONFIG_REGISTRATION_FAILUREReady = true; } return _APP_CONFIG_REGISTRATION_FAILUREContent; } }
         private static int _APP_CONFIG_REGISTRATION_FAILUREContent = default;
         private static bool _APP_CONFIG_REGISTRATION_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#APP_CONFIG_REGISTRATION_SUCCESS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int APP_CONFIG_REGISTRATION_SUCCESS { get { if (!_APP_CONFIG_REGISTRATION_SUCCESSReady) { _APP_CONFIG_REGISTRATION_SUCCESSContent = SGetField<int>(LocalBridgeClazz, "APP_CONFIG_REGISTRATION_SUCCESS"); _APP_CONFIG_REGISTRATION_SUCCESSReady = true; } return _APP_CONFIG_REGISTRATION_SUCCESSContent; } }
         private static int _APP_CONFIG_REGISTRATION_SUCCESSContent = default;
         private static bool _APP_CONFIG_REGISTRATION_SUCCESSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#APP_CONFIG_UNREGISTRATION_FAILURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int APP_CONFIG_UNREGISTRATION_FAILURE { get { if (!_APP_CONFIG_UNREGISTRATION_FAILUREReady) { _APP_CONFIG_UNREGISTRATION_FAILUREContent = SGetField<int>(LocalBridgeClazz, "APP_CONFIG_UNREGISTRATION_FAILURE"); _APP_CONFIG_UNREGISTRATION_FAILUREReady = true; } return _APP_CONFIG_UNREGISTRATION_FAILUREContent; } }
         private static int _APP_CONFIG_UNREGISTRATION_FAILUREContent = default;
         private static bool _APP_CONFIG_UNREGISTRATION_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#APP_CONFIG_UNREGISTRATION_SUCCESS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int APP_CONFIG_UNREGISTRATION_SUCCESS { get { if (!_APP_CONFIG_UNREGISTRATION_SUCCESSReady) { _APP_CONFIG_UNREGISTRATION_SUCCESSContent = SGetField<int>(LocalBridgeClazz, "APP_CONFIG_UNREGISTRATION_SUCCESS"); _APP_CONFIG_UNREGISTRATION_SUCCESSReady = true; } return _APP_CONFIG_UNREGISTRATION_SUCCESSContent; } }
         private static int _APP_CONFIG_UNREGISTRATION_SUCCESSContent = default;
         private static bool _APP_CONFIG_UNREGISTRATION_SUCCESSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#CHANNEL_TYPE_RELIABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CHANNEL_TYPE_RELIABLE { get { if (!_CHANNEL_TYPE_RELIABLEReady) { _CHANNEL_TYPE_RELIABLEContent = SGetField<int>(LocalBridgeClazz, "CHANNEL_TYPE_RELIABLE"); _CHANNEL_TYPE_RELIABLEReady = true; } return _CHANNEL_TYPE_RELIABLEContent; } }
         private static int _CHANNEL_TYPE_RELIABLEContent = default;
         private static bool _CHANNEL_TYPE_RELIABLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#CHANNEL_TYPE_STREAMING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CHANNEL_TYPE_STREAMING { get { if (!_CHANNEL_TYPE_STREAMINGReady) { _CHANNEL_TYPE_STREAMINGContent = SGetField<int>(LocalBridgeClazz, "CHANNEL_TYPE_STREAMING"); _CHANNEL_TYPE_STREAMINGReady = true; } return _CHANNEL_TYPE_STREAMINGContent; } }
         private static int _CHANNEL_TYPE_STREAMINGContent = default;
         private static bool _CHANNEL_TYPE_STREAMINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#SINK_ROLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SINK_ROLE { get { if (!_SINK_ROLEReady) { _SINK_ROLEContent = SGetField<int>(LocalBridgeClazz, "SINK_ROLE"); _SINK_ROLEReady = true; } return _SINK_ROLEContent; } }
         private static int _SINK_ROLEContent = default;
         private static bool _SINK_ROLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#SOURCE_ROLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SOURCE_ROLE { get { if (!_SOURCE_ROLEReady) { _SOURCE_ROLEContent = SGetField<int>(LocalBridgeClazz, "SOURCE_ROLE"); _SOURCE_ROLEReady = true; } return _SOURCE_ROLEContent; } }
         private static int _SOURCE_ROLEContent = default;
         private static bool _SOURCE_ROLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#STATE_CHANNEL_CONNECTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATE_CHANNEL_CONNECTED { get { if (!_STATE_CHANNEL_CONNECTEDReady) { _STATE_CHANNEL_CONNECTEDContent = SGetField<int>(LocalBridgeClazz, "STATE_CHANNEL_CONNECTED"); _STATE_CHANNEL_CONNECTEDReady = true; } return _STATE_CHANNEL_CONNECTEDContent; } }
         private static int _STATE_CHANNEL_CONNECTEDContent = default;
         private static bool _STATE_CHANNEL_CONNECTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#STATE_CHANNEL_CONNECTING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATE_CHANNEL_CONNECTING { get { if (!_STATE_CHANNEL_CONNECTINGReady) { _STATE_CHANNEL_CONNECTINGContent = SGetField<int>(LocalBridgeClazz, "STATE_CHANNEL_CONNECTING"); _STATE_CHANNEL_CONNECTINGReady = true; } return _STATE_CHANNEL_CONNECTINGContent; } }
         private static int _STATE_CHANNEL_CONNECTINGContent = default;
         private static bool _STATE_CHANNEL_CONNECTINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#STATE_CHANNEL_DISCONNECTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATE_CHANNEL_DISCONNECTED { get { if (!_STATE_CHANNEL_DISCONNECTEDReady) { _STATE_CHANNEL_DISCONNECTEDContent = SGetField<int>(LocalBridgeClazz, "STATE_CHANNEL_DISCONNECTED"); _STATE_CHANNEL_DISCONNECTEDReady = true; } return _STATE_CHANNEL_DISCONNECTEDContent; } }
         private static int _STATE_CHANNEL_DISCONNECTEDContent = default;
         private static bool _STATE_CHANNEL_DISCONNECTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#STATE_CHANNEL_DISCONNECTING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATE_CHANNEL_DISCONNECTING { get { if (!_STATE_CHANNEL_DISCONNECTINGReady) { _STATE_CHANNEL_DISCONNECTINGContent = SGetField<int>(LocalBridgeClazz, "STATE_CHANNEL_DISCONNECTING"); _STATE_CHANNEL_DISCONNECTINGReady = true; } return _STATE_CHANNEL_DISCONNECTINGContent; } }
         private static int _STATE_CHANNEL_DISCONNECTINGContent = default;
         private static bool _STATE_CHANNEL_DISCONNECTINGReady = false; // this is used because in case of generics 
@@ -130,20 +130,12 @@ public partial class BluetoothHealth
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#getConnectedDevices()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#getMainChannelFd(android.bluetooth.BluetoothDevice,android.bluetooth.BluetoothHealthAppConfiguration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothHealthAppConfiguration"/></param>
         /// <returns><see cref="Android.Os.ParcelFileDescriptor"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.ParcelFileDescriptor GetMainChannelFd(Android.Bluetooth.BluetoothDevice arg0, Android.Bluetooth.BluetoothHealthAppConfiguration arg1)
         {
             return IExecute<Android.Os.ParcelFileDescriptor>("getMainChannelFd", arg0, arg1);
@@ -154,7 +146,7 @@ public Android.Os.ParcelFileDescriptor GetMainChannelFd(Android.Bluetooth.Blueto
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothHealthAppConfiguration"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ConnectChannelToSource(Android.Bluetooth.BluetoothDevice arg0, Android.Bluetooth.BluetoothHealthAppConfiguration arg1)
         {
             return IExecute<bool>("connectChannelToSource", arg0, arg1);
@@ -166,7 +158,7 @@ public bool ConnectChannelToSource(Android.Bluetooth.BluetoothDevice arg0, Andro
         /// <param name="arg1"><see cref="Android.Bluetooth.BluetoothHealthAppConfiguration"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool DisconnectChannel(Android.Bluetooth.BluetoothDevice arg0, Android.Bluetooth.BluetoothHealthAppConfiguration arg1, int arg2)
         {
             return IExecute<bool>("disconnectChannel", arg0, arg1, arg2);
@@ -178,7 +170,7 @@ public bool DisconnectChannel(Android.Bluetooth.BluetoothDevice arg0, Android.Bl
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Bluetooth.BluetoothHealthCallback"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RegisterSinkAppConfiguration(Java.Lang.String arg0, int arg1, Android.Bluetooth.BluetoothHealthCallback arg2)
         {
             return IExecute<bool>("registerSinkAppConfiguration", arg0, arg1, arg2);
@@ -188,7 +180,7 @@ public bool RegisterSinkAppConfiguration(Java.Lang.String arg0, int arg1, Androi
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothHealthAppConfiguration"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool UnregisterAppConfiguration(Android.Bluetooth.BluetoothHealthAppConfiguration arg0)
         {
             return IExecuteWithSignature<bool>("unregisterAppConfiguration", "(Landroid/bluetooth/BluetoothHealthAppConfiguration;)Z", arg0);
@@ -198,17 +190,26 @@ public bool UnregisterAppConfiguration(Android.Bluetooth.BluetoothHealthAppConfi
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetConnectionState(Android.Bluetooth.BluetoothDevice arg0)
         {
             return IExecuteWithSignature<int>("getConnectionState", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealth.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetDevicesMatchingConnectionStates(int[] arg0)
         {
             return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getDevicesMatchingConnectionStates", "([I)Ljava/util/List;", new object[] { arg0 });
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealthAppConfiguration.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealthAppConfiguration.cs
index 7705349ff..177bd1c73 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealthAppConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealthAppConfiguration.cs
@@ -40,7 +40,7 @@ public partial class BluetoothHealthAppConfiguration
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#CREATOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
         private static Android.Os.Parcelable.Creator _CREATORContent = default;
         private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -53,44 +53,47 @@ public partial class BluetoothHealthAppConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#getDataType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#describeContents()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int DataType
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDataType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#getDataType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetDataType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getDataType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#getRole()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#getRole()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Role
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetRole()
         {
-            get { return IExecuteWithSignature<int>("getRole", "()I"); }
+            return IExecuteWithSignature<int>("getRole", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHealthAppConfiguration.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
             IExecute("writeToParcel", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealthCallback.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealthCallback.cs
index b6ebfc689..db6b4db3a 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealthCallback.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHealthCallback.cs
@@ -50,7 +50,7 @@ public partial class BluetoothHealthCallback
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothHealthAppConfiguration"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnHealthAppConfigurationStatusChange(Android.Bluetooth.BluetoothHealthAppConfiguration arg0, int arg1)
         {
             IExecute("onHealthAppConfigurationStatusChange", arg0, arg1);
@@ -64,7 +64,7 @@ public void OnHealthAppConfigurationStatusChange(Android.Bluetooth.BluetoothHeal
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Os.ParcelFileDescriptor"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnHealthChannelStateChange(Android.Bluetooth.BluetoothHealthAppConfiguration arg0, Android.Bluetooth.BluetoothDevice arg1, int arg2, int arg3, Android.Os.ParcelFileDescriptor arg4, int arg5)
         {
             IExecute("onHealthChannelStateChange", arg0, arg1, arg2, arg3, arg4, arg5);
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHearingAid.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHearingAid.cs
index 519598889..f922df7a7 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHearingAid.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHearingAid.cs
@@ -52,13 +52,6 @@ public partial class BluetoothHearingAid
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHearingAid.html#getConnectedDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHearingAid.html#getConnectionState(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
@@ -68,6 +61,14 @@ public int GetConnectionState(Android.Bluetooth.BluetoothDevice arg0)
             return IExecuteWithSignature<int>("getConnectionState", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHearingAid.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHearingAid.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDevice.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDevice.cs
index 0832eca24..94b8c495a 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDevice.cs
@@ -184,13 +184,6 @@ public partial class BluetoothHidDevice
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDevice.html#getConnectedDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDevice.html#connect(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
@@ -272,6 +265,14 @@ public int GetConnectionState(Android.Bluetooth.BluetoothDevice arg0)
             return IExecuteWithSignature<int>("getConnectionState", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDevice.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDevice.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDeviceAppQosSettings.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDeviceAppQosSettings.cs
index 4a642ea9b..84929aa04 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDeviceAppQosSettings.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDeviceAppQosSettings.cs
@@ -89,54 +89,60 @@ public BluetoothHidDeviceAppQosSettings(int arg0, int arg1, int arg2, int arg3,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getDelayVariation()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#describeContents()"/>
         /// </summary>
-        public int DelayVariation
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDelayVariation", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getLatency()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getDelayVariation()"/>
         /// </summary>
-        public int Latency
+        /// <returns><see cref="int"/></returns>
+        public int GetDelayVariation()
         {
-            get { return IExecuteWithSignature<int>("getLatency", "()I"); }
+            return IExecuteWithSignature<int>("getDelayVariation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getPeakBandwidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getLatency()"/>
         /// </summary>
-        public int PeakBandwidth
+        /// <returns><see cref="int"/></returns>
+        public int GetLatency()
         {
-            get { return IExecuteWithSignature<int>("getPeakBandwidth", "()I"); }
+            return IExecuteWithSignature<int>("getLatency", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getServiceType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getPeakBandwidth()"/>
         /// </summary>
-        public int ServiceType
+        /// <returns><see cref="int"/></returns>
+        public int GetPeakBandwidth()
         {
-            get { return IExecuteWithSignature<int>("getServiceType", "()I"); }
+            return IExecuteWithSignature<int>("getPeakBandwidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getTokenBucketSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getServiceType()"/>
         /// </summary>
-        public int TokenBucketSize
+        /// <returns><see cref="int"/></returns>
+        public int GetServiceType()
         {
-            get { return IExecuteWithSignature<int>("getTokenBucketSize", "()I"); }
+            return IExecuteWithSignature<int>("getServiceType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getTokenRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getTokenBucketSize()"/>
         /// </summary>
-        public int TokenRate
+        /// <returns><see cref="int"/></returns>
+        public int GetTokenBucketSize()
         {
-            get { return IExecuteWithSignature<int>("getTokenRate", "()I"); }
+            return IExecuteWithSignature<int>("getTokenBucketSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#getTokenRate()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetTokenRate()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getTokenRate", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppQosSettings.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDeviceAppSdpSettings.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDeviceAppSdpSettings.cs
index 4cbfdde1f..131fbc1de 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDeviceAppSdpSettings.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothHidDeviceAppSdpSettings.cs
@@ -64,47 +64,52 @@ public BluetoothHidDeviceAppSdpSettings(Java.Lang.String arg0, Java.Lang.String
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getSubclass()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="byte"/></returns>
+        public byte GetSubclass()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); }
+            return IExecute<byte>("getSubclass");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getDescriptors()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getDescriptors()"/>
         /// </summary>
-        public byte[] Descriptors
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetDescriptors()
         {
-            get { return IExecuteWithSignatureArray<byte>("getDescriptors", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getDescriptors", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getDescription()"/>
         /// </summary>
-        public Java.Lang.String Provider
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProvider", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getSubclass()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getName()"/>
         /// </summary>
-        public byte Subclass
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecute<byte>("getSubclass"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#getProvider()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProvider()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getProvider", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothHidDeviceAppSdpSettings.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudio.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudio.cs
index d3cb10e6a..1cbb9c48c 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudio.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudio.cs
@@ -66,13 +66,6 @@ public partial class BluetoothLeAudio : Android.Bluetooth.IBluetoothProfile, Jav
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudio.html#getConnectedDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudio.html#getConnectedGroupLeadDevice(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -100,6 +93,14 @@ public int GetGroupId(Android.Bluetooth.BluetoothDevice arg0)
             return IExecuteWithSignature<int>("getGroupId", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudio.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudio.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudioCodecConfig.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudioCodecConfig.cs
index d258f6eb6..e4b1890d5 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudioCodecConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudioCodecConfig.cs
@@ -184,82 +184,92 @@ public partial class BluetoothLeAudioCodecConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getBitsPerSample()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#describeContents()"/>
         /// </summary>
-        public int BitsPerSample
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getBitsPerSample", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getChannelCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getBitsPerSample()"/>
         /// </summary>
-        public int ChannelCount
+        /// <returns><see cref="int"/></returns>
+        public int GetBitsPerSample()
         {
-            get { return IExecuteWithSignature<int>("getChannelCount", "()I"); }
+            return IExecuteWithSignature<int>("getBitsPerSample", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getCodecName()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getChannelCount()"/>
         /// </summary>
-        public Java.Lang.String CodecName
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelCount()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCodecName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getChannelCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getCodecPriority()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getCodecPriority()"/>
         /// </summary>
-        public int CodecPriority
+        /// <returns><see cref="int"/></returns>
+        public int GetCodecPriority()
         {
-            get { return IExecuteWithSignature<int>("getCodecPriority", "()I"); }
+            return IExecuteWithSignature<int>("getCodecPriority", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getCodecType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getCodecType()"/>
         /// </summary>
-        public int CodecType
+        /// <returns><see cref="int"/></returns>
+        public int GetCodecType()
         {
-            get { return IExecuteWithSignature<int>("getCodecType", "()I"); }
+            return IExecuteWithSignature<int>("getCodecType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getFrameDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getFrameDuration()"/>
         /// </summary>
-        public int FrameDuration
+        /// <returns><see cref="int"/></returns>
+        public int GetFrameDuration()
         {
-            get { return IExecuteWithSignature<int>("getFrameDuration", "()I"); }
+            return IExecuteWithSignature<int>("getFrameDuration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getMaxOctetsPerFrame()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getMaxOctetsPerFrame()"/>
         /// </summary>
-        public int MaxOctetsPerFrame
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxOctetsPerFrame()
         {
-            get { return IExecuteWithSignature<int>("getMaxOctetsPerFrame", "()I"); }
+            return IExecuteWithSignature<int>("getMaxOctetsPerFrame", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getMinOctetsPerFrame()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getMinOctetsPerFrame()"/>
         /// </summary>
-        public int MinOctetsPerFrame
+        /// <returns><see cref="int"/></returns>
+        public int GetMinOctetsPerFrame()
         {
-            get { return IExecuteWithSignature<int>("getMinOctetsPerFrame", "()I"); }
+            return IExecuteWithSignature<int>("getMinOctetsPerFrame", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getOctetsPerFrame()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getOctetsPerFrame()"/>
         /// </summary>
-        public int OctetsPerFrame
+        /// <returns><see cref="int"/></returns>
+        public int GetOctetsPerFrame()
         {
-            get { return IExecuteWithSignature<int>("getOctetsPerFrame", "()I"); }
+            return IExecuteWithSignature<int>("getOctetsPerFrame", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getSampleRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getSampleRate()"/>
         /// </summary>
-        public int SampleRate
+        /// <returns><see cref="int"/></returns>
+        public int GetSampleRate()
         {
-            get { return IExecuteWithSignature<int>("getSampleRate", "()I"); }
+            return IExecuteWithSignature<int>("getSampleRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#getCodecName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCodecName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getCodecName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudioCodecStatus.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudioCodecStatus.cs
index f2d4bf9e3..2c1b9c353 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudioCodecStatus.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothLeAudioCodecStatus.cs
@@ -71,72 +71,78 @@ public BluetoothLeAudioCodecStatus(Android.Bluetooth.BluetoothLeAudioCodecConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getInputCodecConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getInputCodecConfig()"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothLeAudioCodecConfig InputCodecConfig
+        /// <returns><see cref="Android.Bluetooth.BluetoothLeAudioCodecConfig"/></returns>
+        public Android.Bluetooth.BluetoothLeAudioCodecConfig GetInputCodecConfig()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothLeAudioCodecConfig>("getInputCodecConfig", "()Landroid/bluetooth/BluetoothLeAudioCodecConfig;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothLeAudioCodecConfig>("getInputCodecConfig", "()Landroid/bluetooth/BluetoothLeAudioCodecConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getInputCodecLocalCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getOutputCodecConfig()"/>
         /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig> InputCodecLocalCapabilities
+        /// <returns><see cref="Android.Bluetooth.BluetoothLeAudioCodecConfig"/></returns>
+        public Android.Bluetooth.BluetoothLeAudioCodecConfig GetOutputCodecConfig()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig>>("getInputCodecLocalCapabilities", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothLeAudioCodecConfig>("getOutputCodecConfig", "()Landroid/bluetooth/BluetoothLeAudioCodecConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getInputCodecSelectableCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#isInputCodecConfigSelectable(android.bluetooth.BluetoothLeAudioCodecConfig)"/>
         /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig> InputCodecSelectableCapabilities
+        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothLeAudioCodecConfig"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInputCodecConfigSelectable(Android.Bluetooth.BluetoothLeAudioCodecConfig arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig>>("getInputCodecSelectableCapabilities", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("isInputCodecConfigSelectable", "(Landroid/bluetooth/BluetoothLeAudioCodecConfig;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getOutputCodecConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#isOutputCodecConfigSelectable(android.bluetooth.BluetoothLeAudioCodecConfig)"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothLeAudioCodecConfig OutputCodecConfig
+        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothLeAudioCodecConfig"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOutputCodecConfigSelectable(Android.Bluetooth.BluetoothLeAudioCodecConfig arg0)
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothLeAudioCodecConfig>("getOutputCodecConfig", "()Landroid/bluetooth/BluetoothLeAudioCodecConfig;"); }
+            return IExecuteWithSignature<bool>("isOutputCodecConfigSelectable", "(Landroid/bluetooth/BluetoothLeAudioCodecConfig;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getOutputCodecLocalCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig> OutputCodecLocalCapabilities
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig>>("getOutputCodecLocalCapabilities", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getOutputCodecSelectableCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getInputCodecLocalCapabilities()"/>
         /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig> OutputCodecSelectableCapabilities
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig> GetInputCodecLocalCapabilities()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig>>("getOutputCodecSelectableCapabilities", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig>>("getInputCodecLocalCapabilities", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#isInputCodecConfigSelectable(android.bluetooth.BluetoothLeAudioCodecConfig)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getInputCodecSelectableCapabilities()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothLeAudioCodecConfig"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInputCodecConfigSelectable(Android.Bluetooth.BluetoothLeAudioCodecConfig arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig> GetInputCodecSelectableCapabilities()
         {
-            return IExecuteWithSignature<bool>("isInputCodecConfigSelectable", "(Landroid/bluetooth/BluetoothLeAudioCodecConfig;)Z", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig>>("getInputCodecSelectableCapabilities", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#isOutputCodecConfigSelectable(android.bluetooth.BluetoothLeAudioCodecConfig)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getOutputCodecLocalCapabilities()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothLeAudioCodecConfig"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOutputCodecConfigSelectable(Android.Bluetooth.BluetoothLeAudioCodecConfig arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig> GetOutputCodecLocalCapabilities()
         {
-            return IExecuteWithSignature<bool>("isOutputCodecConfigSelectable", "(Landroid/bluetooth/BluetoothLeAudioCodecConfig;)Z", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig>>("getOutputCodecLocalCapabilities", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#getOutputCodecSelectableCapabilities()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig> GetOutputCodecSelectableCapabilities()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothLeAudioCodecConfig>>("getOutputCodecSelectableCapabilities", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothLeAudioCodecStatus.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothManager.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothManager.cs
index 5fe1e0160..e072ca907 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothManager.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothManager.cs
@@ -46,11 +46,12 @@ public partial class BluetoothManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothManager.html#getAdapter()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothManager.html#getAdapter()"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothAdapter Adapter
+        /// <returns><see cref="Android.Bluetooth.BluetoothAdapter"/></returns>
+        public Android.Bluetooth.BluetoothAdapter GetAdapter()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothAdapter>("getAdapter", "()Landroid/bluetooth/BluetoothAdapter;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothAdapter>("getAdapter", "()Landroid/bluetooth/BluetoothAdapter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothManager.html#openGattServer(android.content.Context,android.bluetooth.BluetoothGattServerCallback)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothProfile.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothProfile.cs
index c65f147de..9abfe5416 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothProfile.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothProfile.cs
@@ -94,7 +94,7 @@ public partial class BluetoothProfile : Android.Bluetooth.IBluetoothProfile
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothProfile.html#HEALTH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int HEALTH { get { if (!_HEALTHReady) { _HEALTHContent = SGetField<int>(LocalBridgeClazz, "HEALTH"); _HEALTHReady = true; } return _HEALTHContent; } }
         private static int _HEALTHContent = default;
         private static bool _HEALTHReady = false; // this is used because in case of generics 
@@ -167,13 +167,6 @@ public partial class BluetoothProfile : Android.Bluetooth.IBluetoothProfile
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothProfile.html#getConnectedDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.BluetoothDevice> ConnectedDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothProfile.html#getConnectionState(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
@@ -183,6 +176,14 @@ public int GetConnectionState(Android.Bluetooth.BluetoothDevice arg0)
             return IExecuteWithSignature<int>("getConnectionState", "(Landroid/bluetooth/BluetoothDevice;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothProfile.html#getConnectedDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.BluetoothDevice> GetConnectedDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.BluetoothDevice>>("getConnectedDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothProfile.html#getDevicesMatchingConnectionStates(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -220,8 +221,8 @@ public partial class ServiceListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onServiceConnected", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnServiceConnectedEventHandler));
-                AddEventHandler("onServiceDisconnected", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnServiceDisconnectedEventHandler));
+                AddEventHandler("onServiceConnected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnServiceConnectedEventHandler));
+                AddEventHandler("onServiceDisconnected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnServiceDisconnectedEventHandler));
 
             }
 
@@ -229,7 +230,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothProfile.ServiceListener.html#onServiceConnected(int,android.bluetooth.BluetoothProfile)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceConnected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, Android.Bluetooth.BluetoothProfile> OnOnServiceConnected { get; set; } = null;
+            public global::System.Action<int, Android.Bluetooth.BluetoothProfile> OnOnServiceConnected { get; set; } = null;
 
             void OnServiceConnectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -251,7 +252,7 @@ public virtual void OnServiceConnected(int arg0, Android.Bluetooth.BluetoothProf
             /// Handler for <see href="https://developer.android.com/reference/android/bluetooth/BluetoothProfile.ServiceListener.html#onServiceDisconnected(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceDisconnected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnServiceDisconnected { get; set; } = null;
+            public global::System.Action<int> OnOnServiceDisconnected { get; set; } = null;
 
             void OnServiceDisconnectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothServerSocket.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothServerSocket.cs
index f36fbf826..6ac44ffb5 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothServerSocket.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothServerSocket.cs
@@ -46,13 +46,6 @@ public partial class BluetoothServerSocket
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothServerSocket.html#getPsm()"/> 
-        /// </summary>
-        public int Psm
-        {
-            get { return IExecuteWithSignature<int>("getPsm", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothServerSocket.html#accept()"/>
         /// </summary>
         /// <returns><see cref="Android.Bluetooth.BluetoothSocket"/></returns>
@@ -72,6 +65,14 @@ public Android.Bluetooth.BluetoothSocket Accept(int arg0)
             return IExecuteWithSignature<Android.Bluetooth.BluetoothSocket>("accept", "(I)Landroid/bluetooth/BluetoothSocket;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothServerSocket.html#getPsm()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPsm()
+        {
+            return IExecuteWithSignature<int>("getPsm", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothServerSocket.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothSocket.cs b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothSocket.cs
index 3909f3745..323d869f1 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothSocket.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/BluetoothSocket.cs
@@ -64,54 +64,62 @@ public partial class BluetoothSocket
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getConnectionType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getRemoteDevice()"/>
         /// </summary>
-        public int ConnectionType
+        /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
+        public Android.Bluetooth.BluetoothDevice GetRemoteDevice()
         {
-            get { return IExecuteWithSignature<int>("getConnectionType", "()I"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getRemoteDevice", "()Landroid/bluetooth/BluetoothDevice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getInputStream()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#isConnected()"/>
         /// </summary>
-        public Java.Io.InputStream InputStream
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getMaxReceivePacketSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getConnectionType()"/>
         /// </summary>
-        public int MaxReceivePacketSize
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionType()
         {
-            get { return IExecuteWithSignature<int>("getMaxReceivePacketSize", "()I"); }
+            return IExecuteWithSignature<int>("getConnectionType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getMaxTransmitPacketSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getMaxReceivePacketSize()"/>
         /// </summary>
-        public int MaxTransmitPacketSize
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxReceivePacketSize()
         {
-            get { return IExecuteWithSignature<int>("getMaxTransmitPacketSize", "()I"); }
+            return IExecuteWithSignature<int>("getMaxReceivePacketSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getOutputStream()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getMaxTransmitPacketSize()"/>
         /// </summary>
-        public Java.Io.OutputStream OutputStream
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTransmitPacketSize()
         {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;"); }
+            return IExecuteWithSignature<int>("getMaxTransmitPacketSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getRemoteDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getInputStream()"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothDevice RemoteDevice
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.InputStream GetInputStream()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getRemoteDevice", "()Landroid/bluetooth/BluetoothDevice;"); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#getOutputStream()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.OutputStream GetOutputStream()
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/BluetoothSocket.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertiseData.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertiseData.cs
index 1fc1bdfa5..8f20b9e5b 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertiseData.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertiseData.cs
@@ -52,61 +52,68 @@ public partial class AdvertiseData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getIncludeDeviceName()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getManufacturerSpecificData()"/>
         /// </summary>
-        public bool IncludeDeviceName
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<byte[]> GetManufacturerSpecificData()
         {
-            get { return IExecuteWithSignature<bool>("getIncludeDeviceName", "()Z"); }
+            return IExecuteWithSignature<Android.Util.SparseArray<byte[]>>("getManufacturerSpecificData", "()Landroid/util/SparseArray;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getIncludeTxPowerLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getIncludeDeviceName()"/>
         /// </summary>
-        public bool IncludeTxPowerLevel
+        /// <returns><see cref="bool"/></returns>
+        public bool GetIncludeDeviceName()
         {
-            get { return IExecuteWithSignature<bool>("getIncludeTxPowerLevel", "()Z"); }
+            return IExecuteWithSignature<bool>("getIncludeDeviceName", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getManufacturerSpecificData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getIncludeTxPowerLevel()"/>
         /// </summary>
-        public Android.Util.SparseArray<byte[]> ManufacturerSpecificData
+        /// <returns><see cref="bool"/></returns>
+        public bool GetIncludeTxPowerLevel()
         {
-            get { return IExecuteWithSignature<Android.Util.SparseArray<byte[]>>("getManufacturerSpecificData", "()Landroid/util/SparseArray;"); }
+            return IExecuteWithSignature<bool>("getIncludeTxPowerLevel", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getServiceData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#describeContents()"/>
         /// </summary>
-        public Java.Util.Map<Android.Os.ParcelUuid, byte[]> ServiceData
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Android.Os.ParcelUuid, byte[]>>("getServiceData", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getServiceSolicitationUuids()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getTransportDiscoveryData()"/>
         /// </summary>
-        public Java.Util.List<Android.Os.ParcelUuid> ServiceSolicitationUuids
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.Le.TransportDiscoveryData> GetTransportDiscoveryData()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getServiceSolicitationUuids", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.Le.TransportDiscoveryData>>("getTransportDiscoveryData", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getServiceUuids()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getServiceSolicitationUuids()"/>
         /// </summary>
-        public Java.Util.List<Android.Os.ParcelUuid> ServiceUuids
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.ParcelUuid> GetServiceSolicitationUuids()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getServiceUuids", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getServiceSolicitationUuids", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getTransportDiscoveryData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getServiceUuids()"/>
         /// </summary>
-        public Java.Util.List<Android.Bluetooth.Le.TransportDiscoveryData> TransportDiscoveryData
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.ParcelUuid> GetServiceUuids()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.Le.TransportDiscoveryData>>("getTransportDiscoveryData", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getServiceUuids", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#getServiceData()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Android.Os.ParcelUuid, byte[]> GetServiceData()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Map<Android.Os.ParcelUuid, byte[]>>("getServiceData", "()Ljava/util/Map;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseData.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertiseSettings.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertiseSettings.cs
index d3101722d..b4f577cde 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertiseSettings.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertiseSettings.cs
@@ -94,49 +94,52 @@ public partial class AdvertiseSettings
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#getMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#isConnectable()"/>
         /// </summary>
-        public int Mode
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnectable()
         {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); }
+            return IExecuteWithSignature<bool>("isConnectable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#getTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#isDiscoverable()"/>
         /// </summary>
-        public int Timeout
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDiscoverable()
         {
-            get { return IExecuteWithSignature<int>("getTimeout", "()I"); }
+            return IExecuteWithSignature<bool>("isDiscoverable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#getTxPowerLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#describeContents()"/>
         /// </summary>
-        public int TxPowerLevel
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getTxPowerLevel", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#isConnectable()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#getMode()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnectable()
+        /// <returns><see cref="int"/></returns>
+        public int GetMode()
         {
-            return IExecuteWithSignature<bool>("isConnectable", "()Z");
+            return IExecuteWithSignature<int>("getMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#isDiscoverable()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#getTimeout()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDiscoverable()
+        /// <returns><see cref="int"/></returns>
+        public int GetTimeout()
         {
-            return IExecuteWithSignature<bool>("isDiscoverable", "()Z");
+            return IExecuteWithSignature<int>("getTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#getTxPowerLevel()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetTxPowerLevel()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getTxPowerLevel", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertiseSettings.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertisingSetParameters.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertisingSetParameters.cs
index 26b6cc53e..bd35ab936 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertisingSetParameters.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/AdvertisingSetParameters.cs
@@ -118,34 +118,6 @@ public partial class AdvertisingSetParameters
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#getInterval()"/> 
-        /// </summary>
-        public int Interval
-        {
-            get { return IExecuteWithSignature<int>("getInterval", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#getPrimaryPhy()"/> 
-        /// </summary>
-        public int PrimaryPhy
-        {
-            get { return IExecuteWithSignature<int>("getPrimaryPhy", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#getSecondaryPhy()"/> 
-        /// </summary>
-        public int SecondaryPhy
-        {
-            get { return IExecuteWithSignature<int>("getSecondaryPhy", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#getTxPowerLevel()"/> 
-        /// </summary>
-        public int TxPowerLevel
-        {
-            get { return IExecuteWithSignature<int>("getTxPowerLevel", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#includeTxPower()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -202,6 +174,38 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#getInterval()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInterval()
+        {
+            return IExecuteWithSignature<int>("getInterval", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#getPrimaryPhy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPrimaryPhy()
+        {
+            return IExecuteWithSignature<int>("getPrimaryPhy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#getSecondaryPhy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSecondaryPhy()
+        {
+            return IExecuteWithSignature<int>("getSecondaryPhy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#getTxPowerLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTxPowerLevel()
+        {
+            return IExecuteWithSignature<int>("getTxPowerLevel", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/AdvertisingSetParameters.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/AllPackageClasses.cs
index 3664177d9..93565fdf6 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class AdvertiseCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AdvertiseCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdvertiseCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdvertiseCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AdvertiseCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdvertiseCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdvertiseCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -302,12 +302,12 @@ public partial class AdvertisingSetCallback : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AdvertisingSetCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdvertisingSetCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdvertisingSetCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AdvertisingSetCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdvertisingSetCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdvertisingSetCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -612,12 +612,12 @@ public partial class ScanCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Scan
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScanCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScanCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/PeriodicAdvertisingParameters.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/PeriodicAdvertisingParameters.cs
index 067807093..a735a5ab6 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/PeriodicAdvertisingParameters.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/PeriodicAdvertisingParameters.cs
@@ -52,26 +52,28 @@ public partial class PeriodicAdvertisingParameters
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/PeriodicAdvertisingParameters.html#getIncludeTxPower()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/PeriodicAdvertisingParameters.html#getIncludeTxPower()"/>
         /// </summary>
-        public bool IncludeTxPower
+        /// <returns><see cref="bool"/></returns>
+        public bool GetIncludeTxPower()
         {
-            get { return IExecuteWithSignature<bool>("getIncludeTxPower", "()Z"); }
+            return IExecuteWithSignature<bool>("getIncludeTxPower", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/PeriodicAdvertisingParameters.html#getInterval()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/PeriodicAdvertisingParameters.html#describeContents()"/>
         /// </summary>
-        public int Interval
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getInterval", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/PeriodicAdvertisingParameters.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/PeriodicAdvertisingParameters.html#getInterval()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetInterval()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getInterval", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/PeriodicAdvertisingParameters.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanFilter.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanFilter.cs
index 2ed2869d9..03a8fee06 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanFilter.cs
@@ -52,126 +52,141 @@ public partial class ScanFilter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getAdvertisingData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceDataUuid()"/>
         /// </summary>
-        public byte[] AdvertisingData
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetServiceDataUuid()
         {
-            get { return IExecuteWithSignatureArray<byte>("getAdvertisingData", "()[B"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceDataUuid", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getAdvertisingDataMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceSolicitationUuid()"/>
         /// </summary>
-        public byte[] AdvertisingDataMask
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetServiceSolicitationUuid()
         {
-            get { return IExecuteWithSignatureArray<byte>("getAdvertisingDataMask", "()[B"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceSolicitationUuid", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getAdvertisingDataType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceSolicitationUuidMask()"/>
         /// </summary>
-        public int AdvertisingDataType
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetServiceSolicitationUuidMask()
         {
-            get { return IExecuteWithSignature<int>("getAdvertisingDataType", "()I"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceSolicitationUuidMask", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getDeviceAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceUuid()"/>
         /// </summary>
-        public Java.Lang.String DeviceAddress
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetServiceUuid()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceUuid", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getDeviceName()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceUuidMask()"/>
         /// </summary>
-        public Java.Lang.String DeviceName
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetServiceUuidMask()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceUuidMask", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getManufacturerData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#matches(android.bluetooth.le.ScanResult)"/>
         /// </summary>
-        public byte[] ManufacturerData
+        /// <param name="arg0"><see cref="Android.Bluetooth.Le.ScanResult"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Matches(Android.Bluetooth.Le.ScanResult arg0)
         {
-            get { return IExecuteWithSignatureArray<byte>("getManufacturerData", "()[B"); }
+            return IExecuteWithSignature<bool>("matches", "(Landroid/bluetooth/le/ScanResult;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getManufacturerDataMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getAdvertisingData()"/>
         /// </summary>
-        public byte[] ManufacturerDataMask
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetAdvertisingData()
         {
-            get { return IExecuteWithSignatureArray<byte>("getManufacturerDataMask", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getAdvertisingData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getManufacturerId()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getAdvertisingDataMask()"/>
         /// </summary>
-        public int ManufacturerId
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetAdvertisingDataMask()
         {
-            get { return IExecuteWithSignature<int>("getManufacturerId", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getAdvertisingDataMask", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getManufacturerData()"/>
         /// </summary>
-        public byte[] ServiceData
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetManufacturerData()
         {
-            get { return IExecuteWithSignatureArray<byte>("getServiceData", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getManufacturerData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceDataMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getManufacturerDataMask()"/>
         /// </summary>
-        public byte[] ServiceDataMask
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetManufacturerDataMask()
         {
-            get { return IExecuteWithSignatureArray<byte>("getServiceDataMask", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getManufacturerDataMask", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceDataUuid()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceData()"/>
         /// </summary>
-        public Android.Os.ParcelUuid ServiceDataUuid
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetServiceData()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceDataUuid", "()Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignatureArray<byte>("getServiceData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceSolicitationUuid()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceDataMask()"/>
         /// </summary>
-        public Android.Os.ParcelUuid ServiceSolicitationUuid
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetServiceDataMask()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceSolicitationUuid", "()Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignatureArray<byte>("getServiceDataMask", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceSolicitationUuidMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#describeContents()"/>
         /// </summary>
-        public Android.Os.ParcelUuid ServiceSolicitationUuidMask
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceSolicitationUuidMask", "()Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceUuid()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getAdvertisingDataType()"/>
         /// </summary>
-        public Android.Os.ParcelUuid ServiceUuid
+        /// <returns><see cref="int"/></returns>
+        public int GetAdvertisingDataType()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceUuid", "()Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignature<int>("getAdvertisingDataType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getServiceUuidMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getManufacturerId()"/>
         /// </summary>
-        public Android.Os.ParcelUuid ServiceUuidMask
+        /// <returns><see cref="int"/></returns>
+        public int GetManufacturerId()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getServiceUuidMask", "()Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignature<int>("getManufacturerId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#matches(android.bluetooth.le.ScanResult)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getDeviceAddress()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Bluetooth.Le.ScanResult"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Matches(Android.Bluetooth.Le.ScanResult arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeviceAddress()
         {
-            return IExecuteWithSignature<bool>("matches", "(Landroid/bluetooth/le/ScanResult;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#getDeviceName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeviceName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanFilter.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanRecord.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanRecord.cs
index 1ddd433b4..c109c33b6 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanRecord.cs
@@ -328,85 +328,94 @@ public partial class ScanRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getAdvertiseFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getManufacturerSpecificData()"/>
         /// </summary>
-        public int AdvertiseFlags
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<byte[]> GetManufacturerSpecificData()
         {
-            get { return IExecuteWithSignature<int>("getAdvertiseFlags", "()I"); }
+            return IExecuteWithSignature<Android.Util.SparseArray<byte[]>>("getManufacturerSpecificData", "()Landroid/util/SparseArray;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getAdvertisingDataMap()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getBytes()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.Integer, byte[]> AdvertisingDataMap
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetBytes()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.Integer, byte[]>>("getAdvertisingDataMap", "()Ljava/util/Map;"); }
+            return IExecuteWithSignatureArray<byte>("getBytes", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getManufacturerSpecificData(int)"/>
         /// </summary>
-        public byte[] Bytes
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetManufacturerSpecificData(int arg0)
         {
-            get { return IExecuteWithSignatureArray<byte>("getBytes", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getManufacturerSpecificData", "(I)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getDeviceName()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getServiceData(android.os.ParcelUuid)"/>
         /// </summary>
-        public Java.Lang.String DeviceName
+        /// <param name="arg0"><see cref="Android.Os.ParcelUuid"/></param>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetServiceData(Android.Os.ParcelUuid arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getServiceData", "(Landroid/os/ParcelUuid;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getManufacturerSpecificData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getAdvertiseFlags()"/>
         /// </summary>
-        public Android.Util.SparseArray<byte[]> ManufacturerSpecificData
+        /// <returns><see cref="int"/></returns>
+        public int GetAdvertiseFlags()
         {
-            get { return IExecuteWithSignature<Android.Util.SparseArray<byte[]>>("getManufacturerSpecificData", "()Landroid/util/SparseArray;"); }
+            return IExecuteWithSignature<int>("getAdvertiseFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getServiceData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getTxPowerLevel()"/>
         /// </summary>
-        public Java.Util.Map<Android.Os.ParcelUuid, byte[]> ServiceData
+        /// <returns><see cref="int"/></returns>
+        public int GetTxPowerLevel()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Android.Os.ParcelUuid, byte[]>>("getServiceData", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<int>("getTxPowerLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getServiceSolicitationUuids()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getDeviceName()"/>
         /// </summary>
-        public Java.Util.List<Android.Os.ParcelUuid> ServiceSolicitationUuids
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeviceName()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getServiceSolicitationUuids", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getServiceUuids()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getServiceSolicitationUuids()"/>
         /// </summary>
-        public Java.Util.List<Android.Os.ParcelUuid> ServiceUuids
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.ParcelUuid> GetServiceSolicitationUuids()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getServiceUuids", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getServiceSolicitationUuids", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getTxPowerLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getServiceUuids()"/>
         /// </summary>
-        public int TxPowerLevel
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.ParcelUuid> GetServiceUuids()
         {
-            get { return IExecuteWithSignature<int>("getTxPowerLevel", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getServiceUuids", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getManufacturerSpecificData(int)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getServiceData()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] GetManufacturerSpecificData(int arg0)
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Android.Os.ParcelUuid, byte[]> GetServiceData()
         {
-            return IExecuteWithSignatureArray<byte>("getManufacturerSpecificData", "(I)[B", arg0);
+            return IExecuteWithSignature<Java.Util.Map<Android.Os.ParcelUuid, byte[]>>("getServiceData", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getServiceData(android.os.ParcelUuid)"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getAdvertisingDataMap()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Os.ParcelUuid"/></param>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] GetServiceData(Android.Os.ParcelUuid arg0)
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.Integer, byte[]> GetAdvertisingDataMap()
         {
-            return IExecuteWithSignatureArray<byte>("getServiceData", "(Landroid/os/ParcelUuid;)[B", arg0);
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.Integer, byte[]>>("getAdvertisingDataMap", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanResult.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanResult.cs
index 356c90a53..f6d04017a 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanResult.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanResult.cs
@@ -36,7 +36,7 @@ public partial class ScanResult
         /// <param name="arg1"><see cref="Android.Bluetooth.Le.ScanRecord"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ScanResult(Android.Bluetooth.BluetoothDevice arg0, Android.Bluetooth.Le.ScanRecord arg1, int arg2, long arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -117,98 +117,108 @@ public ScanResult(Android.Bluetooth.BluetoothDevice arg0, int arg1, int arg2, in
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getAdvertisingSid()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getDevice()"/>
         /// </summary>
-        public int AdvertisingSid
+        /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
+        public Android.Bluetooth.BluetoothDevice GetDevice()
         {
-            get { return IExecuteWithSignature<int>("getAdvertisingSid", "()I"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getDevice", "()Landroid/bluetooth/BluetoothDevice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getDataStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getScanRecord()"/>
         /// </summary>
-        public int DataStatus
+        /// <returns><see cref="Android.Bluetooth.Le.ScanRecord"/></returns>
+        public Android.Bluetooth.Le.ScanRecord GetScanRecord()
         {
-            get { return IExecuteWithSignature<int>("getDataStatus", "()I"); }
+            return IExecuteWithSignature<Android.Bluetooth.Le.ScanRecord>("getScanRecord", "()Landroid/bluetooth/le/ScanRecord;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#isConnectable()"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothDevice Device
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnectable()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getDevice", "()Landroid/bluetooth/BluetoothDevice;"); }
+            return IExecuteWithSignature<bool>("isConnectable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getPeriodicAdvertisingInterval()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#isLegacy()"/>
         /// </summary>
-        public int PeriodicAdvertisingInterval
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLegacy()
         {
-            get { return IExecuteWithSignature<int>("getPeriodicAdvertisingInterval", "()I"); }
+            return IExecuteWithSignature<bool>("isLegacy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getPrimaryPhy()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#describeContents()"/>
         /// </summary>
-        public int PrimaryPhy
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPrimaryPhy", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getRssi()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getAdvertisingSid()"/>
         /// </summary>
-        public int Rssi
+        /// <returns><see cref="int"/></returns>
+        public int GetAdvertisingSid()
         {
-            get { return IExecuteWithSignature<int>("getRssi", "()I"); }
+            return IExecuteWithSignature<int>("getAdvertisingSid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getScanRecord()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getDataStatus()"/>
         /// </summary>
-        public Android.Bluetooth.Le.ScanRecord ScanRecord
+        /// <returns><see cref="int"/></returns>
+        public int GetDataStatus()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.Le.ScanRecord>("getScanRecord", "()Landroid/bluetooth/le/ScanRecord;"); }
+            return IExecuteWithSignature<int>("getDataStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getSecondaryPhy()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getPeriodicAdvertisingInterval()"/>
         /// </summary>
-        public int SecondaryPhy
+        /// <returns><see cref="int"/></returns>
+        public int GetPeriodicAdvertisingInterval()
         {
-            get { return IExecuteWithSignature<int>("getSecondaryPhy", "()I"); }
+            return IExecuteWithSignature<int>("getPeriodicAdvertisingInterval", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getTimestampNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getPrimaryPhy()"/>
         /// </summary>
-        public long TimestampNanos
+        /// <returns><see cref="int"/></returns>
+        public int GetPrimaryPhy()
         {
-            get { return IExecuteWithSignature<long>("getTimestampNanos", "()J"); }
+            return IExecuteWithSignature<int>("getPrimaryPhy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getTxPower()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getRssi()"/>
         /// </summary>
-        public int TxPower
+        /// <returns><see cref="int"/></returns>
+        public int GetRssi()
         {
-            get { return IExecuteWithSignature<int>("getTxPower", "()I"); }
+            return IExecuteWithSignature<int>("getRssi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#isConnectable()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getSecondaryPhy()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnectable()
+        /// <returns><see cref="int"/></returns>
+        public int GetSecondaryPhy()
         {
-            return IExecuteWithSignature<bool>("isConnectable", "()Z");
+            return IExecuteWithSignature<int>("getSecondaryPhy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#isLegacy()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getTxPower()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLegacy()
+        /// <returns><see cref="int"/></returns>
+        public int GetTxPower()
         {
-            return IExecuteWithSignature<bool>("isLegacy", "()Z");
+            return IExecuteWithSignature<int>("getTxPower", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#getTimestampNanos()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestampNanos()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTimestampNanos", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanResult.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanSettings.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanSettings.cs
index 79f69ad00..89ab40ac4 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanSettings.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/ScanSettings.cs
@@ -142,54 +142,60 @@ public partial class ScanSettings
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getCallbackType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getLegacy()"/>
         /// </summary>
-        public int CallbackType
+        /// <returns><see cref="bool"/></returns>
+        public bool GetLegacy()
         {
-            get { return IExecuteWithSignature<int>("getCallbackType", "()I"); }
+            return IExecuteWithSignature<bool>("getLegacy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getLegacy()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#describeContents()"/>
         /// </summary>
-        public bool Legacy
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<bool>("getLegacy", "()Z"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getPhy()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getCallbackType()"/>
         /// </summary>
-        public int Phy
+        /// <returns><see cref="int"/></returns>
+        public int GetCallbackType()
         {
-            get { return IExecuteWithSignature<int>("getPhy", "()I"); }
+            return IExecuteWithSignature<int>("getCallbackType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getReportDelayMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getPhy()"/>
         /// </summary>
-        public long ReportDelayMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetPhy()
         {
-            get { return IExecuteWithSignature<long>("getReportDelayMillis", "()J"); }
+            return IExecuteWithSignature<int>("getPhy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getScanMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getScanMode()"/>
         /// </summary>
-        public int ScanMode
+        /// <returns><see cref="int"/></returns>
+        public int GetScanMode()
         {
-            get { return IExecuteWithSignature<int>("getScanMode", "()I"); }
+            return IExecuteWithSignature<int>("getScanMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getScanResultType()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getScanResultType()"/>
         /// </summary>
-        public int ScanResultType
+        /// <returns><see cref="int"/></returns>
+        public int GetScanResultType()
         {
-            get { return IExecuteWithSignature<int>("getScanResultType", "()I"); }
+            return IExecuteWithSignature<int>("getScanResultType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#getReportDelayMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetReportDelayMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getReportDelayMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/ScanSettings.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/TransportBlock.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/TransportBlock.cs
index 42c37d6ac..5187f087d 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/TransportBlock.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/TransportBlock.cs
@@ -63,48 +63,52 @@ public TransportBlock(int arg0, int arg1, int arg2, byte[] arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#getOrgId()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#getTransportData()"/>
         /// </summary>
-        public int OrgId
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetTransportData()
         {
-            get { return IExecuteWithSignature<int>("getOrgId", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getTransportData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#getTdsFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#toByteArray()"/>
         /// </summary>
-        public int TdsFlags
+        /// <returns><see cref="byte"/></returns>
+        public byte[] ToByteArray()
         {
-            get { return IExecuteWithSignature<int>("getTdsFlags", "()I"); }
+            return IExecuteWithSignatureArray<byte>("toByteArray", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#getTransportData()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#describeContents()"/>
         /// </summary>
-        public byte[] TransportData
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<byte>("getTransportData", "()[B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#getTransportDataLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#getOrgId()"/>
         /// </summary>
-        public int TransportDataLength
+        /// <returns><see cref="int"/></returns>
+        public int GetOrgId()
         {
-            get { return IExecuteWithSignature<int>("getTransportDataLength", "()I"); }
+            return IExecuteWithSignature<int>("getOrgId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#toByteArray()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#getTdsFlags()"/>
         /// </summary>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] ToByteArray()
+        /// <returns><see cref="int"/></returns>
+        public int GetTdsFlags()
         {
-            return IExecuteWithSignatureArray<byte>("toByteArray", "()[B");
+            return IExecuteWithSignature<int>("getTdsFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#getTransportDataLength()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetTransportDataLength()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getTransportDataLength", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportBlock.html#totalBytes()"/>
diff --git a/src/net/Netdroid/Generated/Android/Bluetooth/Le/TransportDiscoveryData.cs b/src/net/Netdroid/Generated/Android/Bluetooth/Le/TransportDiscoveryData.cs
index 654904391..8e306deff 100644
--- a/src/net/Netdroid/Generated/Android/Bluetooth/Le/TransportDiscoveryData.cs
+++ b/src/net/Netdroid/Generated/Android/Bluetooth/Le/TransportDiscoveryData.cs
@@ -69,20 +69,6 @@ public TransportDiscoveryData(int arg0, Java.Util.List<Android.Bluetooth.Le.Tran
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportDiscoveryData.html#getTransportBlocks()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Bluetooth.Le.TransportBlock> TransportBlocks
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.Le.TransportBlock>>("getTransportBlocks", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportDiscoveryData.html#getTransportDataType()"/> 
-        /// </summary>
-        public int TransportDataType
-        {
-            get { return IExecuteWithSignature<int>("getTransportDataType", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportDiscoveryData.html#toByteArray()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
@@ -99,6 +85,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportDiscoveryData.html#getTransportDataType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTransportDataType()
+        {
+            return IExecuteWithSignature<int>("getTransportDataType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportDiscoveryData.html#totalBytes()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -107,6 +101,14 @@ public int TotalBytes()
             return IExecuteWithSignature<int>("totalBytes", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportDiscoveryData.html#getTransportBlocks()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Bluetooth.Le.TransportBlock> GetTransportBlocks()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Bluetooth.Le.TransportBlock>>("getTransportBlocks", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/bluetooth/le/TransportDiscoveryData.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Companion/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Companion/AllPackageClasses.cs
index b27f6168d..c7736fb21 100644
--- a/src/net/Netdroid/Generated/Android/Companion/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/AllPackageClasses.cs
@@ -428,12 +428,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -478,12 +478,12 @@ public partial class CompanionDeviceService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CompanionDeviceService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompanionDeviceService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompanionDeviceService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CompanionDeviceService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompanionDeviceService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompanionDeviceService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -541,12 +541,12 @@ public partial class DeviceFilter : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DeviceFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DeviceFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DeviceFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DeviceFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DeviceFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DeviceFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -582,18 +582,18 @@ public DeviceFilter(params object[] args) : base(args) { }
     /// <see href="https://developer.android.com/reference/android/companion/DeviceFilter.html"/>
     /// </summary>
     /// <typeparam name="D"><see cref="Android.Os.IParcelable"/></typeparam>
-    public partial class DeviceFilter<D> : Android.Os.Parcelable where D: Android.Os.IParcelable, new()
+    public partial class DeviceFilter<D> : Android.Os.Parcelable where D : Android.Os.IParcelable, new()
     {
         const string _bridgeClassName = "android.companion.DeviceFilter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DeviceFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DeviceFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DeviceFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DeviceFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DeviceFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DeviceFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Companion/AssociatedDevice.cs b/src/net/Netdroid/Generated/Android/Companion/AssociatedDevice.cs
index e76b1fb61..e1b60f641 100644
--- a/src/net/Netdroid/Generated/Android/Companion/AssociatedDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/AssociatedDevice.cs
@@ -52,25 +52,28 @@ public partial class AssociatedDevice
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociatedDevice.html#getBleDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociatedDevice.html#getBluetoothDevice()"/>
         /// </summary>
-        public Android.Bluetooth.Le.ScanResult BleDevice
+        /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
+        public Android.Bluetooth.BluetoothDevice GetBluetoothDevice()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.Le.ScanResult>("getBleDevice", "()Landroid/bluetooth/le/ScanResult;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getBluetoothDevice", "()Landroid/bluetooth/BluetoothDevice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociatedDevice.html#getBluetoothDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociatedDevice.html#getBleDevice()"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothDevice BluetoothDevice
+        /// <returns><see cref="Android.Bluetooth.Le.ScanResult"/></returns>
+        public Android.Bluetooth.Le.ScanResult GetBleDevice()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getBluetoothDevice", "()Landroid/bluetooth/BluetoothDevice;"); }
+            return IExecuteWithSignature<Android.Bluetooth.Le.ScanResult>("getBleDevice", "()Landroid/bluetooth/le/ScanResult;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociatedDevice.html#getWifiDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociatedDevice.html#getWifiDevice()"/>
         /// </summary>
-        public Android.Net.Wifi.ScanResult WifiDevice
+        /// <returns><see cref="Android.Net.Wifi.ScanResult"/></returns>
+        public Android.Net.Wifi.ScanResult GetWifiDevice()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.ScanResult>("getWifiDevice", "()Landroid/net/wifi/ScanResult;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.ScanResult>("getWifiDevice", "()Landroid/net/wifi/ScanResult;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/companion/AssociatedDevice.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Companion/AssociationInfo.cs b/src/net/Netdroid/Generated/Android/Companion/AssociationInfo.cs
index d8bdfb900..ee2314124 100644
--- a/src/net/Netdroid/Generated/Android/Companion/AssociationInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/AssociationInfo.cs
@@ -52,54 +52,60 @@ public partial class AssociationInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getAssociatedDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getAssociatedDevice()"/>
         /// </summary>
-        public Android.Companion.AssociatedDevice AssociatedDevice
+        /// <returns><see cref="Android.Companion.AssociatedDevice"/></returns>
+        public Android.Companion.AssociatedDevice GetAssociatedDevice()
         {
-            get { return IExecuteWithSignature<Android.Companion.AssociatedDevice>("getAssociatedDevice", "()Landroid/companion/AssociatedDevice;"); }
+            return IExecuteWithSignature<Android.Companion.AssociatedDevice>("getAssociatedDevice", "()Landroid/companion/AssociatedDevice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getDeviceMacAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getDeviceMacAddress()"/>
         /// </summary>
-        public Android.Net.MacAddress DeviceMacAddress
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetDeviceMacAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getDeviceMacAddress", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getDeviceMacAddress", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getDeviceProfile()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String DeviceProfile
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceProfile", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getId()"/>
         /// </summary>
-        public Java.Lang.CharSequence DisplayName
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDisplayName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getSystemDataSyncFlags()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int GetSystemDataSyncFlags()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<int>("getSystemDataSyncFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getSystemDataSyncFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getDisplayName()"/>
         /// </summary>
-        public int SystemDataSyncFlags
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDisplayName()
         {
-            get { return IExecuteWithSignature<int>("getSystemDataSyncFlags", "()I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDisplayName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#getDeviceProfile()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeviceProfile()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceProfile", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/companion/AssociationInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Companion/AssociationRequest.cs b/src/net/Netdroid/Generated/Android/Companion/AssociationRequest.cs
index d6e8e9d79..12fc68f65 100644
--- a/src/net/Netdroid/Generated/Android/Companion/AssociationRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/AssociationRequest.cs
@@ -88,20 +88,6 @@ public partial class AssociationRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationRequest.html#getDeviceProfile()"/> 
-        /// </summary>
-        public Java.Lang.String DeviceProfile
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceProfile", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/AssociationRequest.html#getDisplayName()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence DisplayName
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDisplayName", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/companion/AssociationRequest.html#isForceConfirmation()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -134,6 +120,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationRequest.html#getDisplayName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDisplayName()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDisplayName", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/companion/AssociationRequest.html#getDeviceProfile()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeviceProfile()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceProfile", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/companion/AssociationRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Companion/BluetoothLeDeviceFilter.cs b/src/net/Netdroid/Generated/Android/Companion/BluetoothLeDeviceFilter.cs
index 13028c1e0..fd8c37dbc 100644
--- a/src/net/Netdroid/Generated/Android/Companion/BluetoothLeDeviceFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/BluetoothLeDeviceFilter.cs
@@ -48,11 +48,12 @@ public partial class BluetoothLeDeviceFilter
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/BluetoothLeDeviceFilter.html#getRenamePrefixLengthLimit()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/BluetoothLeDeviceFilter.html#getRenamePrefixLengthLimit()"/>
         /// </summary>
-        public static int RenamePrefixLengthLimit
+        /// <returns><see cref="int"/></returns>
+        public static int GetRenamePrefixLengthLimit()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getRenamePrefixLengthLimit", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getRenamePrefixLengthLimit", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Companion/CompanionDeviceManager.cs b/src/net/Netdroid/Generated/Android/Companion/CompanionDeviceManager.cs
index 03bb9b35a..6fbbf5fd5 100644
--- a/src/net/Netdroid/Generated/Android/Companion/CompanionDeviceManager.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/CompanionDeviceManager.cs
@@ -82,7 +82,7 @@ public partial class CompanionDeviceManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.html#EXTRA_DEVICE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_DEVICE { get { if (!_EXTRA_DEVICEReady) { _EXTRA_DEVICEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_DEVICE"); _EXTRA_DEVICEReady = true; } return _EXTRA_DEVICEContent; } }
         private static Java.Lang.String _EXTRA_DEVICEContent = default;
         private static bool _EXTRA_DEVICEReady = false; // this is used because in case of generics 
@@ -95,21 +95,6 @@ public partial class CompanionDeviceManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.html#getAssociations()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Java.Lang.String> Associations
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAssociations", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.html#getMyAssociations()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Companion.AssociationInfo> MyAssociations
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Companion.AssociationInfo>>("getMyAssociations", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.html#buildAssociationCancellationIntent()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.IntentSender"/></returns>
@@ -132,12 +117,29 @@ public Android.Content.IntentSender BuildPermissionTransferUserConsentIntent(int
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasNotificationAccess(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<bool>("hasNotificationAccess", "(Landroid/content/ComponentName;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.html#getMyAssociations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Companion.AssociationInfo> GetMyAssociations()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Companion.AssociationInfo>>("getMyAssociations", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.html#getAssociations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Java.Lang.String> GetAssociations()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAssociations", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.html#associate(android.companion.AssociationRequest,android.companion.CompanionDeviceManager.Callback,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Companion.AssociationRequest"/></param>
@@ -198,7 +200,7 @@ public void Disassociate(int arg0)
         /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.html#disassociate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Disassociate(Java.Lang.String arg0)
         {
             IExecuteWithSignature("disassociate", "(Ljava/lang/String;)V", arg0);
@@ -301,7 +303,7 @@ public void OnAssociationPending(Android.Content.IntentSender arg0)
             /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceManager.Callback.html#onDeviceFound(android.content.IntentSender)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.IntentSender"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnDeviceFound(Android.Content.IntentSender arg0)
             {
                 IExecuteWithSignature("onDeviceFound", "(Landroid/content/IntentSender;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Companion/CompanionDeviceService.cs b/src/net/Netdroid/Generated/Android/Companion/CompanionDeviceService.cs
index e4be252d8..03c2a71b5 100644
--- a/src/net/Netdroid/Generated/Android/Companion/CompanionDeviceService.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/CompanionDeviceService.cs
@@ -83,7 +83,7 @@ public void OnDeviceAppeared(Android.Companion.AssociationInfo arg0)
         /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceService.html#onDeviceAppeared(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDeviceAppeared(Java.Lang.String arg0)
         {
             IExecuteWithSignature("onDeviceAppeared", "(Ljava/lang/String;)V", arg0);
@@ -100,7 +100,7 @@ public void OnDeviceDisappeared(Android.Companion.AssociationInfo arg0)
         /// <see href="https://developer.android.com/reference/android/companion/CompanionDeviceService.html#onDeviceDisappeared(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDeviceDisappeared(Java.Lang.String arg0)
         {
             IExecuteWithSignature("onDeviceDisappeared", "(Ljava/lang/String;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Companion/Virtual/VirtualDevice.cs b/src/net/Netdroid/Generated/Android/Companion/Virtual/VirtualDevice.cs
index b7e012599..eab552e2f 100644
--- a/src/net/Netdroid/Generated/Android/Companion/Virtual/VirtualDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/Virtual/VirtualDevice.cs
@@ -52,26 +52,28 @@ public partial class VirtualDevice
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDevice.html#getDeviceId()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDevice.html#describeContents()"/>
         /// </summary>
-        public int DeviceId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDeviceId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDevice.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDevice.html#getDeviceId()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getDeviceId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDevice.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDevice.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDevice.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Companion/Virtual/VirtualDeviceManager.cs b/src/net/Netdroid/Generated/Android/Companion/Virtual/VirtualDeviceManager.cs
index 878e34cbc..a03a9abe8 100644
--- a/src/net/Netdroid/Generated/Android/Companion/Virtual/VirtualDeviceManager.cs
+++ b/src/net/Netdroid/Generated/Android/Companion/Virtual/VirtualDeviceManager.cs
@@ -46,11 +46,12 @@ public partial class VirtualDeviceManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDeviceManager.html#getVirtualDevices()"/> 
+        /// <see href="https://developer.android.com/reference/android/companion/virtual/VirtualDeviceManager.html#getVirtualDevices()"/>
         /// </summary>
-        public Java.Util.List<Android.Companion.Virtual.VirtualDevice> VirtualDevices
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Companion.Virtual.VirtualDevice> GetVirtualDevices()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Companion.Virtual.VirtualDevice>>("getVirtualDevices", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Companion.Virtual.VirtualDevice>>("getVirtualDevices", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Content/AbstractThreadedSyncAdapter.cs b/src/net/Netdroid/Generated/Android/Content/AbstractThreadedSyncAdapter.cs
index f3c31e1de..665314e76 100644
--- a/src/net/Netdroid/Generated/Android/Content/AbstractThreadedSyncAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Content/AbstractThreadedSyncAdapter.cs
@@ -29,6 +29,25 @@ namespace Android.Content
     public partial class AbstractThreadedSyncAdapter
     {
         #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#%3Cinit%3E(android.content.Context,boolean,boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        /// <param name="arg2"><see cref="bool"/></param>
+        public AbstractThreadedSyncAdapter(Android.Content.Context arg0, bool arg1, bool arg2)
+            : base(arg0, arg1, arg2)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#%3Cinit%3E(android.content.Context,boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        public AbstractThreadedSyncAdapter(Android.Content.Context arg0, bool arg1)
+            : base(arg0, arg1)
+        {
+        }
 
         #endregion
 
@@ -37,6 +56,13 @@ public partial class AbstractThreadedSyncAdapter
         #endregion
 
         #region Fields
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#LOG_SYNC_DETAILS"/>
+        /// </summary>
+        [global::System.Obsolete()]
+        public static int LOG_SYNC_DETAILS { get { if (!_LOG_SYNC_DETAILSReady) { _LOG_SYNC_DETAILSContent = SGetField<int>(LocalBridgeClazz, "LOG_SYNC_DETAILS"); _LOG_SYNC_DETAILSReady = true; } return _LOG_SYNC_DETAILSContent; } }
+        private static int _LOG_SYNC_DETAILSContent = default;
+        private static bool _LOG_SYNC_DETAILSReady = false; // this is used because in case of generics 
 
         #endregion
 
@@ -45,33 +71,6 @@ public partial class AbstractThreadedSyncAdapter
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="AbstractThreadedSyncAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onPerformSync", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accounts.Account>>>(OnPerformSyncEventHandler));
-            AddEventHandler("getContext", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetContextEventHandler));
-            AddEventHandler("onUnsyncableAccount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnUnsyncableAccountEventHandler));
-            AddEventHandler("getSyncAdapterBinder", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetSyncAdapterBinderEventHandler));
-            AddEventHandler("onSecurityException", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Accounts.Account>>>(OnSecurityExceptionEventHandler));
-            AddEventHandler("onSyncCanceled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnSyncCanceledEventHandler));
-            AddEventHandler("onSyncCanceled1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.Thread>>>(OnSyncCanceled1EventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onPerformSync(android.accounts.Account,android.os.Bundle,java.lang.String,android.content.ContentProviderClient,android.content.SyncResult)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnPerformSync"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Accounts.Account, Android.Os.Bundle, Java.Lang.String, Android.Content.ContentProviderClient, Android.Content.SyncResult> OnOnPerformSync { get; set; } = null;
-
-        void OnPerformSyncEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Accounts.Account>> data)
-        {
-            var methodToExecute = (OnOnPerformSync != null) ? OnOnPerformSync : OnPerformSync;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Os.Bundle>(0), data.EventData.GetAt<Java.Lang.String>(1), data.EventData.GetAt<Android.Content.ContentProviderClient>(2), data.EventData.GetAt<Android.Content.SyncResult>(3));
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onPerformSync(android.accounts.Account,android.os.Bundle,java.lang.String,android.content.ContentProviderClient,android.content.SyncResult)"/>
         /// </summary>
@@ -80,205 +79,33 @@ void OnPerformSyncEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Android.Content.ContentProviderClient"/></param>
         /// <param name="arg4"><see cref="Android.Content.SyncResult"/></param>
-        public virtual void OnPerformSync(Android.Accounts.Account arg0, Android.Os.Bundle arg1, Java.Lang.String arg2, Android.Content.ContentProviderClient arg3, Android.Content.SyncResult arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#getContext()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetContext"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context> OnGetContext { get; set; } = null;
-
-        void GetContextEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        public void OnPerformSync(Android.Accounts.Account arg0, Android.Os.Bundle arg1, Java.Lang.String arg2, Android.Content.ContentProviderClient arg3, Android.Content.SyncResult arg4)
         {
-            var methodToExecute = (OnGetContext != null) ? OnGetContext : GetContext;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            IExecute("onPerformSync", arg0, arg1, arg2, arg3, arg4);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#getContext()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.Context"/></returns>
-        public virtual Android.Content.Context GetContext()
+        public Android.Content.Context GetContext()
         {
-            return default;
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onUnsyncableAccount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnUnsyncableAccount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnOnUnsyncableAccount { get; set; } = null;
-
-        void OnUnsyncableAccountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnOnUnsyncableAccount != null) ? OnOnUnsyncableAccount : OnUnsyncableAccount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onUnsyncableAccount()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool OnUnsyncableAccount()
+        public bool OnUnsyncableAccount()
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#getSyncAdapterBinder()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetSyncAdapterBinder"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Os.IBinder> OnGetSyncAdapterBinder { get; set; } = null;
-
-        void GetSyncAdapterBinderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetSyncAdapterBinder != null) ? OnGetSyncAdapterBinder : GetSyncAdapterBinder;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<bool>("onUnsyncableAccount", "()Z");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#getSyncAdapterBinder()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.IBinder"/></returns>
-        public virtual Android.Os.IBinder GetSyncAdapterBinder()
+        public Android.Os.IBinder GetSyncAdapterBinder()
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSecurityException(android.accounts.Account,android.os.Bundle,java.lang.String,android.content.SyncResult)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnSecurityException"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Accounts.Account, Android.Os.Bundle, Java.Lang.String, Android.Content.SyncResult> OnOnSecurityException { get; set; } = null;
-
-        void OnSecurityExceptionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Accounts.Account>> data)
-        {
-            var methodToExecute = (OnOnSecurityException != null) ? OnOnSecurityException : OnSecurityException;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Os.Bundle>(0), data.EventData.GetAt<Java.Lang.String>(1), data.EventData.GetAt<Android.Content.SyncResult>(2));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSecurityException(android.accounts.Account,android.os.Bundle,java.lang.String,android.content.SyncResult)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Accounts.Account"/></param>
-        /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg3"><see cref="Android.Content.SyncResult"/></param>
-        public virtual void OnSecurityException(Android.Accounts.Account arg0, Android.Os.Bundle arg1, Java.Lang.String arg2, Android.Content.SyncResult arg3)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSyncCanceled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnSyncCanceled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnSyncCanceled { get; set; } = null;
-
-        void OnSyncCanceledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnOnSyncCanceled != null) ? OnOnSyncCanceled : OnSyncCanceled;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSyncCanceled()"/>
-        /// </summary>
-        public virtual void OnSyncCanceled()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSyncCanceled(java.lang.Thread)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnSyncCanceled1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.Thread> OnOnSyncCanceled1 { get; set; } = null;
-
-        void OnSyncCanceled1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.Thread>> data)
-        {
-            var methodToExecute = (OnOnSyncCanceled1 != null) ? OnOnSyncCanceled1 : OnSyncCanceled;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSyncCanceled(java.lang.Thread)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
-        public virtual void OnSyncCanceled(Java.Lang.Thread arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region AbstractThreadedSyncAdapterDirect
-    public partial class AbstractThreadedSyncAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#getContext()"/> 
-        /// </summary>
-        public Android.Content.Context Context
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#getSyncAdapterBinder()"/> 
-        /// </summary>
-        public Android.Os.IBinder SyncAdapterBinder
-        {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getSyncAdapterBinder", "()Landroid/os/IBinder;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onPerformSync(android.accounts.Account,android.os.Bundle,java.lang.String,android.content.ContentProviderClient,android.content.SyncResult)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Accounts.Account"/></param>
-        /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg3"><see cref="Android.Content.ContentProviderClient"/></param>
-        /// <param name="arg4"><see cref="Android.Content.SyncResult"/></param>
-        public override void OnPerformSync(Android.Accounts.Account arg0, Android.Os.Bundle arg1, Java.Lang.String arg2, Android.Content.ContentProviderClient arg3, Android.Content.SyncResult arg4)
-        {
-            IExecute("onPerformSync", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onUnsyncableAccount()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnUnsyncableAccount()
-        {
-            return IExecuteWithSignature<bool>("onUnsyncableAccount", "()Z");
+            return IExecuteWithSignature<Android.Os.IBinder>("getSyncAdapterBinder", "()Landroid/os/IBinder;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSecurityException(android.accounts.Account,android.os.Bundle,java.lang.String,android.content.SyncResult)"/>
@@ -287,14 +114,14 @@ public override bool OnUnsyncableAccount()
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Android.Content.SyncResult"/></param>
-        public override void OnSecurityException(Android.Accounts.Account arg0, Android.Os.Bundle arg1, Java.Lang.String arg2, Android.Content.SyncResult arg3)
+        public void OnSecurityException(Android.Accounts.Account arg0, Android.Os.Bundle arg1, Java.Lang.String arg2, Android.Content.SyncResult arg3)
         {
             IExecute("onSecurityException", arg0, arg1, arg2, arg3);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSyncCanceled()"/>
         /// </summary>
-        public override void OnSyncCanceled()
+        public void OnSyncCanceled()
         {
             IExecuteWithSignature("onSyncCanceled", "()V");
         }
@@ -302,7 +129,7 @@ public override void OnSyncCanceled()
         /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html#onSyncCanceled(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
-        public override void OnSyncCanceled(Java.Lang.Thread arg0)
+        public void OnSyncCanceled(Java.Lang.Thread arg0)
         {
             IExecuteWithSignature("onSyncCanceled", "(Ljava/lang/Thread;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Content/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Content/AllPackageClasses.cs
index bd827e9f9..68deb99f3 100644
--- a/src/net/Netdroid/Generated/Android/Content/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Content/AllPackageClasses.cs
@@ -30,38 +30,26 @@ namespace Android.Content
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/content/AbstractThreadedSyncAdapter.html"/>
     /// </summary>
-    public partial class AbstractThreadedSyncAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class AbstractThreadedSyncAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AbstractThreadedSyncAdapter>
     {
+        const string _bridgeClassName = "android.content.AbstractThreadedSyncAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public AbstractThreadedSyncAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region AbstractThreadedSyncAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="AbstractThreadedSyncAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class AbstractThreadedSyncAdapterDirect : AbstractThreadedSyncAdapter
-    {
+        [global::System.Obsolete("AbstractThreadedSyncAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public AbstractThreadedSyncAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("AbstractThreadedSyncAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public AbstractThreadedSyncAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.content.AbstractThreadedSyncAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -78,6 +66,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -108,12 +99,12 @@ public partial class AsyncQueryHandler : Android.Os.Handler
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsyncQueryHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncQueryHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncQueryHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsyncQueryHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncQueryHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncQueryHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -148,19 +139,19 @@ public AsyncQueryHandler(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AsyncTaskLoader : Android.Content.Loader
     {
         const string _bridgeClassName = "android.content.AsyncTaskLoader";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsyncTaskLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncTaskLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncTaskLoader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsyncTaskLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncTaskLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncTaskLoader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -196,19 +187,19 @@ public AsyncTaskLoader(params object[] args) : base(args) { }
     /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html"/>
     /// </summary>
     /// <typeparam name="D"></typeparam>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AsyncTaskLoader<D> : Android.Content.Loader<D>
     {
         const string _bridgeClassName = "android.content.AsyncTaskLoader";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsyncTaskLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncTaskLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncTaskLoader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsyncTaskLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncTaskLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncTaskLoader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -337,12 +328,12 @@ public partial class BroadcastReceiver : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BroadcastReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BroadcastReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BroadcastReceiver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BroadcastReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BroadcastReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BroadcastReceiver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -468,10 +459,13 @@ public partial class OnPrimaryClipChangedListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public OnPrimaryClipChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.ClipboardManager_OnPrimaryClipChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnPrimaryClipChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -493,10 +487,13 @@ public partial class OnPrimaryClipChangedListenerDirect : OnPrimaryClipChangedLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.ClipboardManager$OnPrimaryClipChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.ClipboardManager$OnPrimaryClipChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -662,12 +659,12 @@ public partial class ComponentCallbacks : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ComponentCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ComponentCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ComponentCallbacks() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ComponentCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ComponentCallbacks class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ComponentCallbacks(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -708,12 +705,12 @@ public partial class ComponentCallbacks2 : Android.Content.ComponentCallbacks
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ComponentCallbacks2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ComponentCallbacks2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ComponentCallbacks2() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ComponentCallbacks2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ComponentCallbacks2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ComponentCallbacks2(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -798,12 +795,12 @@ public partial class ContentProvider : Android.Content.ComponentCallbacks2
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ContentProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ContentProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -884,12 +881,12 @@ public partial class PipeDataWriter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pi
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PipeDataWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PipeDataWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PipeDataWriter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PipeDataWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PipeDataWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PipeDataWriter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -931,12 +928,12 @@ public partial class PipeDataWriter<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PipeDataWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PipeDataWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PipeDataWriter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PipeDataWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PipeDataWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PipeDataWriter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1201,12 +1198,12 @@ public partial class ContentResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ContentResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentResolver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ContentResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentResolver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1379,12 +1376,12 @@ public partial class Context : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Context>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Context class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Context class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Context() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Context class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Context class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Context(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1595,7 +1592,7 @@ public ContextWrapper(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CursorLoader : Android.Content.AsyncTaskLoader<Android.Database.Cursor>
     {
         const string _bridgeClassName = "android.content.CursorLoader";
@@ -1646,12 +1643,12 @@ public partial class DialogInterface : MASES.JCOBridge.C2JBridge.JVMBridgeBase<D
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DialogInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DialogInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DialogInterface() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DialogInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DialogInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DialogInterface(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1689,10 +1686,13 @@ public partial class OnCancelListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public OnCancelListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.DialogInterface_OnCancelListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnCancelListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1714,10 +1714,13 @@ public partial class OnCancelListenerDirect : OnCancelListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.DialogInterface$OnCancelListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.DialogInterface$OnCancelListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1748,10 +1751,13 @@ public partial class OnClickListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.DialogInterface_OnClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1773,10 +1779,13 @@ public partial class OnClickListenerDirect : OnClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.DialogInterface$OnClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.DialogInterface$OnClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1807,10 +1816,13 @@ public partial class OnDismissListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnDismissListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.DialogInterface_OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1832,10 +1844,13 @@ public partial class OnDismissListenerDirect : OnDismissListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.DialogInterface$OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.DialogInterface$OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1866,10 +1881,13 @@ public partial class OnKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public OnKeyListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.DialogInterface_OnKeyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnKeyListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1891,10 +1909,13 @@ public partial class OnKeyListenerDirect : OnKeyListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.DialogInterface$OnKeyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.DialogInterface$OnKeyListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1925,10 +1946,13 @@ public partial class OnMultiChoiceClickListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public OnMultiChoiceClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.DialogInterface_OnMultiChoiceClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnMultiChoiceClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1950,10 +1974,13 @@ public partial class OnMultiChoiceClickListenerDirect : OnMultiChoiceClickListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.DialogInterface$OnMultiChoiceClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.DialogInterface$OnMultiChoiceClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1984,10 +2011,13 @@ public partial class OnShowListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public OnShowListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.DialogInterface_OnShowListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnShowListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2009,10 +2039,13 @@ public partial class OnShowListenerDirect : OnShowListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.DialogInterface$OnShowListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.DialogInterface$OnShowListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2134,12 +2167,12 @@ public partial class EntityIterator : Java.Util.Iterator<Android.Content.Entity>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EntityIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EntityIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EntityIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EntityIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EntityIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EntityIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2457,12 +2490,12 @@ public partial class OnFinished : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnFini
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OnFinished class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnFinished class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnFinished() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OnFinished class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnFinished class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnFinished(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2518,7 +2551,7 @@ public partial class SendIntentException : Android.Util.AndroidException
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/content/Loader.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Loader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Loader>
     {
         const string _bridgeClassName = "android.content.Loader";
@@ -2559,7 +2592,7 @@ public Loader(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.ForceLoadContentObserver.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ForceLoadContentObserver : Android.Database.ContentObserver
         {
             const string _bridgeClassName = "android.content.Loader$ForceLoadContentObserver";
@@ -2604,7 +2637,7 @@ public ForceLoadContentObserver(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCanceledListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnLoadCanceledListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -2612,10 +2645,13 @@ public partial class OnLoadCanceledListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnLoadCanceledListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.Loader_OnLoadCanceledListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnLoadCanceledListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2637,10 +2673,13 @@ public partial class OnLoadCanceledListenerDirect : OnLoadCanceledListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.Loader$OnLoadCanceledListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.Loader$OnLoadCanceledListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2665,7 +2704,7 @@ protected override void InitializeHandlers() { }
         /// <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCanceledListener.html"/>
         /// </summary>
         /// <typeparam name="D"></typeparam>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnLoadCanceledListener<D> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -2673,10 +2712,13 @@ public partial class OnLoadCanceledListener<D> : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnLoadCanceledListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.Loader_OnLoadCanceledListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnLoadCanceledListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2698,10 +2740,13 @@ public partial class OnLoadCanceledListenerDirect<D> : OnLoadCanceledListener<D>
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.Loader$OnLoadCanceledListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.Loader$OnLoadCanceledListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2725,7 +2770,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCompleteListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnLoadCompleteListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -2733,10 +2778,13 @@ public partial class OnLoadCompleteListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnLoadCompleteListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.Loader_OnLoadCompleteListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnLoadCompleteListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2758,10 +2806,13 @@ public partial class OnLoadCompleteListenerDirect : OnLoadCompleteListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.Loader$OnLoadCompleteListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.Loader$OnLoadCompleteListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2786,7 +2837,7 @@ protected override void InitializeHandlers() { }
         /// <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCompleteListener.html"/>
         /// </summary>
         /// <typeparam name="D"></typeparam>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnLoadCompleteListener<D> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -2794,10 +2845,13 @@ public partial class OnLoadCompleteListener<D> : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnLoadCompleteListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.Loader_OnLoadCompleteListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnLoadCompleteListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2819,10 +2873,13 @@ public partial class OnLoadCompleteListenerDirect<D> : OnLoadCompleteListener<D>
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.Loader$OnLoadCompleteListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.Loader$OnLoadCompleteListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2851,7 +2908,7 @@ protected override void InitializeHandlers() { }
     /// <see href="https://developer.android.com/reference/android/content/Loader.html"/>
     /// </summary>
     /// <typeparam name="D"></typeparam>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Loader<D> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Loader<D>>
     {
         const string _bridgeClassName = "android.content.Loader";
@@ -3244,12 +3301,12 @@ public partial class ServiceConnection : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ServiceConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServiceConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServiceConnection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ServiceConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServiceConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServiceConnection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3290,12 +3347,12 @@ public partial class SharedPreferences : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SharedPreferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SharedPreferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SharedPreferences() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SharedPreferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SharedPreferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SharedPreferences(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3332,12 +3389,12 @@ public partial class Editor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Editor>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Editor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Editor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Editor() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Editor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Editor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Editor(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3379,10 +3436,13 @@ public partial class OnSharedPreferenceChangeListener : MASES.JCOBridge.C2JBridg
             /// </summary>
             public OnSharedPreferenceChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.SharedPreferences_OnSharedPreferenceChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.OnSharedPreferenceChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3404,10 +3464,13 @@ public partial class OnSharedPreferenceChangeListenerDirect : OnSharedPreference
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.SharedPreferences$OnSharedPreferenceChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.SharedPreferences$OnSharedPreferenceChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3749,12 +3812,12 @@ public partial class SyncStatusObserver : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SyncStatusObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SyncStatusObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SyncStatusObserver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SyncStatusObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SyncStatusObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SyncStatusObserver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Content/AsyncTaskLoader.cs b/src/net/Netdroid/Generated/Android/Content/AsyncTaskLoader.cs
index e10cb7aac..7f429297b 100644
--- a/src/net/Netdroid/Generated/Android/Content/AsyncTaskLoader.cs
+++ b/src/net/Netdroid/Generated/Android/Content/AsyncTaskLoader.cs
@@ -33,7 +33,7 @@ public partial class AsyncTaskLoader
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AsyncTaskLoader(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -58,7 +58,7 @@ public AsyncTaskLoader(Android.Content.Context arg0)
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#loadInBackground()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object LoadInBackground()
         {
             return IExecuteWithSignature("loadInBackground", "()Ljava/lang/Object;");
@@ -67,7 +67,7 @@ public object LoadInBackground()
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#isLoadInBackgroundCanceled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsLoadInBackgroundCanceled()
         {
             return IExecuteWithSignature<bool>("isLoadInBackgroundCanceled", "()Z");
@@ -75,7 +75,7 @@ public bool IsLoadInBackgroundCanceled()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#cancelLoadInBackground()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CancelLoadInBackground()
         {
             IExecuteWithSignature("cancelLoadInBackground", "()V");
@@ -84,7 +84,7 @@ public void CancelLoadInBackground()
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#onCanceled(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCanceled(object arg0)
         {
             IExecuteWithSignature("onCanceled", "(Ljava/lang/Object;)V", arg0);
@@ -93,7 +93,7 @@ public void OnCanceled(object arg0)
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#setUpdateThrottle(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetUpdateThrottle(long arg0)
         {
             IExecuteWithSignature("setUpdateThrottle", "(J)V", arg0);
@@ -117,7 +117,7 @@ public partial class AsyncTaskLoader<D>
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AsyncTaskLoader(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -146,7 +146,7 @@ public AsyncTaskLoader(Android.Content.Context arg0)
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#loadInBackground()"/>
         /// </summary>
         /// <returns><typeparamref name="D"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public D LoadInBackground()
         {
             return IExecuteWithSignature<D>("loadInBackground", "()Ljava/lang/Object;");
@@ -155,7 +155,7 @@ public D LoadInBackground()
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#isLoadInBackgroundCanceled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsLoadInBackgroundCanceled()
         {
             return IExecuteWithSignature<bool>("isLoadInBackgroundCanceled", "()Z");
@@ -163,7 +163,7 @@ public bool IsLoadInBackgroundCanceled()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#cancelLoadInBackground()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CancelLoadInBackground()
         {
             IExecuteWithSignature("cancelLoadInBackground", "()V");
@@ -172,7 +172,7 @@ public void CancelLoadInBackground()
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#onCanceled(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="D"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCanceled(D arg0)
         {
             IExecuteWithSignature("onCanceled", "(Ljava/lang/Object;)V", arg0);
@@ -181,7 +181,7 @@ public void OnCanceled(D arg0)
         /// <see href="https://developer.android.com/reference/android/content/AsyncTaskLoader.html#setUpdateThrottle(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetUpdateThrottle(long arg0)
         {
             IExecuteWithSignature("setUpdateThrottle", "(J)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Content/AttributionSource.cs b/src/net/Netdroid/Generated/Android/Content/AttributionSource.cs
index 9d67a6f7b..7a6a4c8a2 100644
--- a/src/net/Netdroid/Generated/Android/Content/AttributionSource.cs
+++ b/src/net/Netdroid/Generated/Android/Content/AttributionSource.cs
@@ -60,64 +60,69 @@ public static Android.Content.AttributionSource MyAttributionSource()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getAttributionTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getNext()"/>
         /// </summary>
-        public Java.Lang.String AttributionTag
+        /// <returns><see cref="Android.Content.AttributionSource"/></returns>
+        public Android.Content.AttributionSource GetNext()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.AttributionSource>("getNext", "()Landroid/content/AttributionSource;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getNext()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#checkCallingUid()"/>
         /// </summary>
-        public Android.Content.AttributionSource Next
+        /// <returns><see cref="bool"/></returns>
+        public bool CheckCallingUid()
         {
-            get { return IExecuteWithSignature<Android.Content.AttributionSource>("getNext", "()Landroid/content/AttributionSource;"); }
+            return IExecuteWithSignature<bool>("checkCallingUid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#isTrusted(android.content.Context)"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTrusted(Android.Content.Context arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isTrusted", "(Landroid/content/Context;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getPid()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#describeContents()"/>
         /// </summary>
-        public int Pid
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPid", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getPid()"/>
         /// </summary>
-        public int Uid
+        /// <returns><see cref="int"/></returns>
+        public int GetPid()
         {
-            get { return IExecuteWithSignature<int>("getUid", "()I"); }
+            return IExecuteWithSignature<int>("getPid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#checkCallingUid()"/>
+        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getUid()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool CheckCallingUid()
+        /// <returns><see cref="int"/></returns>
+        public int GetUid()
         {
-            return IExecuteWithSignature<bool>("checkCallingUid", "()Z");
+            return IExecuteWithSignature<int>("getUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#isTrusted(android.content.Context)"/>
+        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getAttributionTag()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTrusted(Android.Content.Context arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAttributionTag()
         {
-            return IExecuteWithSignature<bool>("isTrusted", "(Landroid/content/Context;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#getPackageName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/AttributionSource.html#enforceCallingUid()"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/BroadcastReceiver.cs b/src/net/Netdroid/Generated/Android/Content/BroadcastReceiver.cs
index 973d48e35..1b2a84763 100644
--- a/src/net/Netdroid/Generated/Android/Content/BroadcastReceiver.cs
+++ b/src/net/Netdroid/Generated/Android/Content/BroadcastReceiver.cs
@@ -46,41 +46,6 @@ public partial class BroadcastReceiver
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getDebugUnregister()"/> <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#setDebugUnregister(boolean)"/>
-        /// </summary>
-        public bool DebugUnregister
-        {
-            get { return IExecuteWithSignature<bool>("getDebugUnregister", "()Z"); } set { IExecuteWithSignature("setDebugUnregister", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getResultCode()"/> <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#setResultCode(int)"/>
-        /// </summary>
-        public int ResultCode
-        {
-            get { return IExecuteWithSignature<int>("getResultCode", "()I"); } set { IExecuteWithSignature("setResultCode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getResultData()"/> <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#setResultData(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String ResultData
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResultData", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setResultData", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getSentFromPackage()"/> 
-        /// </summary>
-        public Java.Lang.String SentFromPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSentFromPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getSentFromUid()"/> 
-        /// </summary>
-        public int SentFromUid
-        {
-            get { return IExecuteWithSignature<int>("getSentFromUid", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#onReceive(android.content.Context,android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -125,6 +90,14 @@ public bool GetAbortBroadcast()
             return IExecuteWithSignature<bool>("getAbortBroadcast", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getDebugUnregister()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDebugUnregister()
+        {
+            return IExecuteWithSignature<bool>("getDebugUnregister", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#isInitialStickyBroadcast()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -141,6 +114,22 @@ public bool IsOrderedBroadcast()
             return IExecuteWithSignature<bool>("isOrderedBroadcast", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getResultCode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetResultCode()
+        {
+            return IExecuteWithSignature<int>("getResultCode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getResultData()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResultData()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getResultData", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#abortBroadcast()"/>
         /// </summary>
         public void AbortBroadcast()
@@ -155,6 +144,14 @@ public void ClearAbortBroadcast()
             IExecuteWithSignature("clearAbortBroadcast", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#setDebugUnregister(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDebugUnregister(bool arg0)
+        {
+            IExecuteWithSignature("setDebugUnregister", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#setOrderedHint(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -173,6 +170,22 @@ public void SetResult(int arg0, Java.Lang.String arg1, Android.Os.Bundle arg2)
             IExecute("setResult", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#setResultCode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetResultCode(int arg0)
+        {
+            IExecuteWithSignature("setResultCode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#setResultData(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetResultData(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setResultData", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#setResultExtras(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
@@ -180,6 +193,22 @@ public void SetResultExtras(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("setResultExtras", "(Landroid/os/Bundle;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getSentFromUid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSentFromUid()
+        {
+            return IExecuteWithSignature<int>("getSentFromUid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.html#getSentFromPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSentFromPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSentFromPackage", "()Ljava/lang/String;");
+        }
 
         #endregion
 
@@ -205,20 +234,6 @@ public partial class PendingResult
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#getResultCode()"/> <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#setResultCode(int)"/>
-            /// </summary>
-            public int ResultCode
-            {
-                get { return IExecuteWithSignature<int>("getResultCode", "()I"); } set { IExecuteWithSignature("setResultCode", "(I)V", value); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#getResultData()"/> <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#setResultData(java.lang.String)"/>
-            /// </summary>
-            public Java.Lang.String ResultData
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getResultData", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setResultData", "(Ljava/lang/String;)V", value); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#getResultExtras(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
@@ -236,6 +251,22 @@ public bool GetAbortBroadcast()
                 return IExecuteWithSignature<bool>("getAbortBroadcast", "()Z");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#getResultCode()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetResultCode()
+            {
+                return IExecuteWithSignature<int>("getResultCode", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#getResultData()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetResultData()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getResultData", "()Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#abortBroadcast()"/>
             /// </summary>
             public void AbortBroadcast()
@@ -267,6 +298,22 @@ public void SetResult(int arg0, Java.Lang.String arg1, Android.Os.Bundle arg2)
                 IExecute("setResult", arg0, arg1, arg2);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#setResultCode(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetResultCode(int arg0)
+            {
+                IExecuteWithSignature("setResultCode", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#setResultData(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public void SetResultData(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setResultData", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/BroadcastReceiver.PendingResult.html#setResultExtras(android.os.Bundle)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/ClipData.cs b/src/net/Netdroid/Generated/Android/Content/ClipData.cs
index f1c993e82..22f93cd75 100644
--- a/src/net/Netdroid/Generated/Android/Content/ClipData.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ClipData.cs
@@ -131,20 +131,6 @@ public static Android.Content.ClipData NewUri(Android.Content.ContentResolver ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipData.html#getDescription()"/> 
-        /// </summary>
-        public Android.Content.ClipDescription Description
-        {
-            get { return IExecuteWithSignature<Android.Content.ClipDescription>("getDescription", "()Landroid/content/ClipDescription;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipData.html#getItemCount()"/> 
-        /// </summary>
-        public int ItemCount
-        {
-            get { return IExecuteWithSignature<int>("getItemCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ClipData.html#getItemAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -154,6 +140,14 @@ public Android.Content.ClipData.Item GetItemAt(int arg0)
             return IExecuteWithSignature<Android.Content.ClipData.Item>("getItemAt", "(I)Landroid/content/ClipData$Item;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ClipData.html#getDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.ClipDescription"/></returns>
+        public Android.Content.ClipDescription GetDescription()
+        {
+            return IExecuteWithSignature<Android.Content.ClipDescription>("getDescription", "()Landroid/content/ClipDescription;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ClipData.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -162,6 +156,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ClipData.html#getItemCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetItemCount()
+        {
+            return IExecuteWithSignature<int>("getItemCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ClipData.html#addItem(android.content.ClipData.Item)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ClipData.Item"/></param>
@@ -266,39 +268,28 @@ public Item(Java.Lang.CharSequence arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getHtmlText()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getIntent()"/>
             /// </summary>
-            public Java.Lang.String HtmlText
+            /// <returns><see cref="Android.Content.Intent"/></returns>
+            public Android.Content.Intent GetIntent()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getHtmlText", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getIntent()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getUri()"/>
             /// </summary>
-            public Android.Content.Intent Intent
+            /// <returns><see cref="Android.Net.Uri"/></returns>
+            public Android.Net.Uri GetUri()
             {
-                get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); }
+                return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getText()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getTextLinks()"/>
             /// </summary>
-            public Java.Lang.CharSequence Text
+            /// <returns><see cref="Android.View.Textclassifier.TextLinks"/></returns>
+            public Android.View.Textclassifier.TextLinks GetTextLinks()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getTextLinks()"/> 
-            /// </summary>
-            public Android.View.Textclassifier.TextLinks TextLinks
-            {
-                get { return IExecute<Android.View.Textclassifier.TextLinks>("getTextLinks"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getUri()"/> 
-            /// </summary>
-            public Android.Net.Uri Uri
-            {
-                get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+                return IExecute<Android.View.Textclassifier.TextLinks>("getTextLinks");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#coerceToStyledText(android.content.Context)"/>
@@ -319,6 +310,14 @@ public Java.Lang.CharSequence CoerceToText(Android.Content.Context arg0)
                 return IExecuteWithSignature<Java.Lang.CharSequence>("coerceToText", "(Landroid/content/Context;)Ljava/lang/CharSequence;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getText()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetText()
+            {
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#coerceToHtmlText(android.content.Context)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -327,6 +326,14 @@ public Java.Lang.String CoerceToHtmlText(Android.Content.Context arg0)
             {
                 return IExecuteWithSignature<Java.Lang.String>("coerceToHtmlText", "(Landroid/content/Context;)Ljava/lang/String;", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/ClipData.Item.html#getHtmlText()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetHtmlText()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getHtmlText", "()Ljava/lang/String;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Content/ClipDescription.cs b/src/net/Netdroid/Generated/Android/Content/ClipDescription.cs
index d1b8ac9b8..4b4f0872f 100644
--- a/src/net/Netdroid/Generated/Android/Content/ClipDescription.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ClipDescription.cs
@@ -139,39 +139,12 @@ public static bool CompareMimeTypes(Java.Lang.String arg0, Java.Lang.String arg1
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getClassificationStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getExtras()"/>
         /// </summary>
-        public int ClassificationStatus
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetExtras()
         {
-            get { return IExecuteWithSignature<int>("getClassificationStatus", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getExtras()"/> <see href="https://developer.android.com/reference/android/content/ClipDescription.html#setExtras(android.os.PersistableBundle)"/>
-        /// </summary>
-        public Android.Os.PersistableBundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/PersistableBundle;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getLabel()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Label
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getMimeTypeCount()"/> 
-        /// </summary>
-        public int MimeTypeCount
-        {
-            get { return IExecuteWithSignature<int>("getMimeTypeCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getTimestamp()"/> 
-        /// </summary>
-        public long Timestamp
-        {
-            get { return IExecuteWithSignature<long>("getTimestamp", "()J"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#hasMimeType(java.lang.String)"/>
@@ -208,6 +181,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getClassificationStatus()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetClassificationStatus()
+        {
+            return IExecuteWithSignature<int>("getClassificationStatus", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getMimeTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMimeTypeCount()
+        {
+            return IExecuteWithSignature<int>("getMimeTypeCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getMimeType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -226,6 +223,22 @@ public Java.Lang.String[] FilterMimeTypes(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<Java.Lang.String>("filterMimeTypes", "(Ljava/lang/String;)[Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#getTimestamp()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestamp()
+        {
+            return IExecuteWithSignature<long>("getTimestamp", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#setExtras(android.os.PersistableBundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.PersistableBundle"/></param>
+        public void SetExtras(Android.Os.PersistableBundle arg0)
+        {
+            IExecuteWithSignature("setExtras", "(Landroid/os/PersistableBundle;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ClipDescription.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/ClipboardManager.cs b/src/net/Netdroid/Generated/Android/Content/ClipboardManager.cs
index 9f514a73a..b8d183384 100644
--- a/src/net/Netdroid/Generated/Android/Content/ClipboardManager.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ClipboardManager.cs
@@ -46,18 +46,20 @@ public partial class ClipboardManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipboardManager.html#getPrimaryClip()"/> <see href="https://developer.android.com/reference/android/content/ClipboardManager.html#setPrimaryClip(android.content.ClipData)"/>
+        /// <see href="https://developer.android.com/reference/android/content/ClipboardManager.html#getPrimaryClip()"/>
         /// </summary>
-        public Android.Content.ClipData PrimaryClip
+        /// <returns><see cref="Android.Content.ClipData"/></returns>
+        public Android.Content.ClipData GetPrimaryClip()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipData>("getPrimaryClip", "()Landroid/content/ClipData;"); } set { IExecuteWithSignature("setPrimaryClip", "(Landroid/content/ClipData;)V", value); }
+            return IExecuteWithSignature<Android.Content.ClipData>("getPrimaryClip", "()Landroid/content/ClipData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ClipboardManager.html#getPrimaryClipDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/ClipboardManager.html#getPrimaryClipDescription()"/>
         /// </summary>
-        public Android.Content.ClipDescription PrimaryClipDescription
+        /// <returns><see cref="Android.Content.ClipDescription"/></returns>
+        public Android.Content.ClipDescription GetPrimaryClipDescription()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipDescription>("getPrimaryClipDescription", "()Landroid/content/ClipDescription;"); }
+            return IExecuteWithSignature<Android.Content.ClipDescription>("getPrimaryClipDescription", "()Landroid/content/ClipDescription;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ClipboardManager.html#hasPrimaryClip()"/>
@@ -90,6 +92,14 @@ public void RemovePrimaryClipChangedListener(Android.Content.ClipboardManager.On
         {
             IExecuteWithSignature("removePrimaryClipChangedListener", "(Landroid/content/ClipboardManager$OnPrimaryClipChangedListener;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ClipboardManager.html#setPrimaryClip(android.content.ClipData)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.ClipData"/></param>
+        public void SetPrimaryClip(Android.Content.ClipData arg0)
+        {
+            IExecuteWithSignature("setPrimaryClip", "(Landroid/content/ClipData;)V", arg0);
+        }
 
         #endregion
 
@@ -119,7 +129,7 @@ public partial class OnPrimaryClipChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPrimaryClipChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnPrimaryClipChangedEventHandler));
+                AddEventHandler("onPrimaryClipChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnPrimaryClipChangedEventHandler));
 
             }
 
@@ -127,7 +137,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/ClipboardManager.OnPrimaryClipChangedListener.html#onPrimaryClipChanged()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPrimaryClipChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnPrimaryClipChanged { get; set; } = null;
+            public global::System.Action OnOnPrimaryClipChanged { get; set; } = null;
 
             void OnPrimaryClipChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Content/ComponentName.cs b/src/net/Netdroid/Generated/Android/Content/ComponentName.cs
index af18b996e..fdf03c9ef 100644
--- a/src/net/Netdroid/Generated/Android/Content/ComponentName.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ComponentName.cs
@@ -146,27 +146,6 @@ public static void WriteToParcel(Android.Content.ComponentName arg0, Android.Os.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ComponentName.html#getClassName()"/> 
-        /// </summary>
-        public Java.Lang.String ClassName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ComponentName.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ComponentName.html#getShortClassName()"/> 
-        /// </summary>
-        public Java.Lang.String ShortClassName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getShortClassName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ComponentName.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.ComponentName"/></returns>
@@ -217,6 +196,30 @@ public Java.Lang.String FlattenToString()
             return IExecuteWithSignature<Java.Lang.String>("flattenToString", "()Ljava/lang/String;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ComponentName.html#getClassName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClassName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ComponentName.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ComponentName.html#getShortClassName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetShortClassName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getShortClassName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ComponentName.html#toShortString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Android/Content/ContentProvider.cs b/src/net/Netdroid/Generated/Android/Content/ContentProvider.cs
index dc60f0d99..fcf33cd09 100644
--- a/src/net/Netdroid/Generated/Android/Content/ContentProvider.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ContentProvider.cs
@@ -46,62 +46,6 @@ public partial class ContentProvider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getCallingAttributionSource()"/> 
-        /// </summary>
-        public Android.Content.AttributionSource CallingAttributionSource
-        {
-            get { return IExecuteWithSignature<Android.Content.AttributionSource>("getCallingAttributionSource", "()Landroid/content/AttributionSource;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getCallingAttributionTag()"/> 
-        /// </summary>
-        public Java.Lang.String CallingAttributionTag
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCallingAttributionTag", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getCallingPackage()"/> 
-        /// </summary>
-        public Java.Lang.String CallingPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getCallingPackageUnchecked()"/> 
-        /// </summary>
-        public Java.Lang.String CallingPackageUnchecked
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackageUnchecked", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getContext()"/> 
-        /// </summary>
-        public Android.Content.Context Context
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getPathPermissions()"/> 
-        /// </summary>
-        public Android.Content.Pm.PathPermission[] PathPermissions
-        {
-            get { return IExecuteWithSignatureArray<Android.Content.Pm.PathPermission>("getPathPermissions", "()[Landroid/content/pm/PathPermission;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getReadPermission()"/> 
-        /// </summary>
-        public Java.Lang.String ReadPermission
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getReadPermission", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getWritePermission()"/> 
-        /// </summary>
-        public Java.Lang.String WritePermission
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getWritePermission", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#openPipeHelper(android.net.Uri,java.lang.String,android.os.Bundle,java.lang.Object,android.content.ContentProvider.PipeDataWriter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
@@ -361,6 +305,14 @@ public bool Refresh(Android.Net.Uri arg0, Android.Os.Bundle arg1, Android.Os.Can
             return IExecute<bool>("refresh", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getCallingAttributionSource()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.AttributionSource"/></returns>
+        public Android.Content.AttributionSource GetCallingAttributionSource()
+        {
+            return IExecuteWithSignature<Android.Content.AttributionSource>("getCallingAttributionSource", "()Landroid/content/AttributionSource;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#clearCallingIdentity()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.ContentProvider.CallingIdentity"/></returns>
@@ -369,6 +321,14 @@ public Android.Content.ContentProvider.CallingIdentity ClearCallingIdentity()
             return IExecuteWithSignature<Android.Content.ContentProvider.CallingIdentity>("clearCallingIdentity", "()Landroid/content/ContentProvider$CallingIdentity;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#requireContext()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.Context"/></returns>
@@ -377,6 +337,54 @@ public Android.Content.Context RequireContext()
             return IExecuteWithSignature<Android.Content.Context>("requireContext", "()Landroid/content/Context;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getPathPermissions()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.PathPermission"/></returns>
+        public Android.Content.Pm.PathPermission[] GetPathPermissions()
+        {
+            return IExecuteWithSignatureArray<Android.Content.Pm.PathPermission>("getPathPermissions", "()[Landroid/content/pm/PathPermission;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getCallingAttributionTag()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCallingAttributionTag()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCallingAttributionTag", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getCallingPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCallingPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCallingPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getCallingPackageUnchecked()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCallingPackageUnchecked()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCallingPackageUnchecked", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getReadPermission()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetReadPermission()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getReadPermission", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#getWritePermission()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetWritePermission()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getWritePermission", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentProvider.html#restoreCallingIdentity(android.content.ContentProvider.CallingIdentity)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentProvider.CallingIdentity"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/ContentProviderClient.cs b/src/net/Netdroid/Generated/Android/Content/ContentProviderClient.cs
index 92ea1916e..f518d2a80 100644
--- a/src/net/Netdroid/Generated/Android/Content/ContentProviderClient.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ContentProviderClient.cs
@@ -46,11 +46,12 @@ public partial class ContentProviderClient
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProviderClient.html#getLocalContentProvider()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/ContentProviderClient.html#getLocalContentProvider()"/>
         /// </summary>
-        public Android.Content.ContentProvider LocalContentProvider
+        /// <returns><see cref="Android.Content.ContentProvider"/></returns>
+        public Android.Content.ContentProvider GetLocalContentProvider()
         {
-            get { return IExecuteWithSignature<Android.Content.ContentProvider>("getLocalContentProvider", "()Landroid/content/ContentProvider;"); }
+            return IExecuteWithSignature<Android.Content.ContentProvider>("getLocalContentProvider", "()Landroid/content/ContentProvider;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentProviderClient.html#applyBatch(java.lang.String,java.util.ArrayList)"/>
@@ -231,7 +232,7 @@ public bool Refresh(Android.Net.Uri arg0, Android.Os.Bundle arg1, Android.Os.Can
         /// <see href="https://developer.android.com/reference/android/content/ContentProviderClient.html#release()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Release()
         {
             return IExecuteWithSignature<bool>("release", "()Z");
diff --git a/src/net/Netdroid/Generated/Android/Content/ContentProviderOperation.cs b/src/net/Netdroid/Generated/Android/Content/ContentProviderOperation.cs
index 19e9b445d..0cea64ee5 100644
--- a/src/net/Netdroid/Generated/Android/Content/ContentProviderOperation.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ContentProviderOperation.cs
@@ -99,13 +99,6 @@ public static Android.Content.ContentProviderOperation.Builder NewUpdate(Android
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentProviderOperation.html#getUri()"/> 
-        /// </summary>
-        public Android.Net.Uri Uri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentProviderOperation.html#apply(android.content.ContentProvider,android.content.ContentProviderResult[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentProvider"/></param>
@@ -128,6 +121,14 @@ public Android.Content.ContentValues ResolveValueBackReferences(Android.Content.
             return IExecute<Android.Content.ContentValues>("resolveValueBackReferences", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentProviderOperation.html#getUri()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUri()
+        {
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentProviderOperation.html#resolveExtrasBackReferences(android.content.ContentProviderResult[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentProviderResult"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/ContentQueryMap.cs b/src/net/Netdroid/Generated/Android/Content/ContentQueryMap.cs
index 4b904bd42..bb16bd921 100644
--- a/src/net/Netdroid/Generated/Android/Content/ContentQueryMap.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ContentQueryMap.cs
@@ -57,13 +57,6 @@ public ContentQueryMap(Android.Database.Cursor arg0, Java.Lang.String arg1, bool
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentQueryMap.html#getRows()"/> 
-        /// </summary>
-        public Java.Util.Map<Java.Lang.String, Android.Content.ContentValues> Rows
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.Content.ContentValues>>("getRows", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentQueryMap.html#getValues(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -73,6 +66,14 @@ public Android.Content.ContentValues GetValues(Java.Lang.String arg0)
             return IExecuteWithSignature<Android.Content.ContentValues>("getValues", "(Ljava/lang/String;)Landroid/content/ContentValues;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentQueryMap.html#getRows()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Android.Content.ContentValues> GetRows()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.Content.ContentValues>>("getRows", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentQueryMap.html#close()"/>
         /// </summary>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Android/Content/ContentResolver.cs b/src/net/Netdroid/Generated/Android/Content/ContentResolver.cs
index 8524c7d86..aefc915a0 100644
--- a/src/net/Netdroid/Generated/Android/Content/ContentResolver.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ContentResolver.cs
@@ -246,7 +246,7 @@ public ContentResolver(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#SYNC_EXTRAS_ACCOUNT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SYNC_EXTRAS_ACCOUNT { get { if (!_SYNC_EXTRAS_ACCOUNTReady) { _SYNC_EXTRAS_ACCOUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SYNC_EXTRAS_ACCOUNT"); _SYNC_EXTRAS_ACCOUNTReady = true; } return _SYNC_EXTRAS_ACCOUNTContent; } }
         private static Java.Lang.String _SYNC_EXTRAS_ACCOUNTContent = default;
         private static bool _SYNC_EXTRAS_ACCOUNTReady = false; // this is used because in case of generics 
@@ -271,7 +271,7 @@ public ContentResolver(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#SYNC_EXTRAS_FORCE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SYNC_EXTRAS_FORCE { get { if (!_SYNC_EXTRAS_FORCEReady) { _SYNC_EXTRAS_FORCEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SYNC_EXTRAS_FORCE"); _SYNC_EXTRAS_FORCEReady = true; } return _SYNC_EXTRAS_FORCEContent; } }
         private static Java.Lang.String _SYNC_EXTRAS_FORCEContent = default;
         private static bool _SYNC_EXTRAS_FORCEReady = false; // this is used because in case of generics 
@@ -328,51 +328,47 @@ public ContentResolver(Android.Content.Context arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getCurrentSync()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static Android.Content.SyncInfo CurrentSync
-        {
-            get { return SExecuteWithSignature<Android.Content.SyncInfo>(LocalBridgeClazz, "getCurrentSync", "()Landroid/content/SyncInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getCurrentSyncs()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#wrap(android.content.ContentProvider)"/>
         /// </summary>
-        public static Java.Util.List<Android.Content.SyncInfo> CurrentSyncs
+        /// <param name="arg0"><see cref="Android.Content.ContentProvider"/></param>
+        /// <returns><see cref="Android.Content.ContentResolver"/></returns>
+        public static Android.Content.ContentResolver Wrap(Android.Content.ContentProvider arg0)
         {
-            get { return SExecuteWithSignature<Java.Util.List<Android.Content.SyncInfo>>(LocalBridgeClazz, "getCurrentSyncs", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<Android.Content.ContentResolver>(LocalBridgeClazz, "wrap", "(Landroid/content/ContentProvider;)Landroid/content/ContentResolver;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getMasterSyncAutomatically()"/> <see href="https://developer.android.com/reference/android/content/ContentResolver.html#setMasterSyncAutomatically(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#wrap(android.content.ContentProviderClient)"/>
         /// </summary>
-        public static bool MasterSyncAutomatically
+        /// <param name="arg0"><see cref="Android.Content.ContentProviderClient"/></param>
+        /// <returns><see cref="Android.Content.ContentResolver"/></returns>
+        public static Android.Content.ContentResolver Wrap(Android.Content.ContentProviderClient arg0)
         {
-            get { return SExecuteWithSignature<bool>(LocalBridgeClazz, "getMasterSyncAutomatically", "()Z"); } set { SExecuteWithSignature(LocalBridgeClazz, "setMasterSyncAutomatically", "(Z)V", value); }
+            return SExecuteWithSignature<Android.Content.ContentResolver>(LocalBridgeClazz, "wrap", "(Landroid/content/ContentProviderClient;)Landroid/content/ContentResolver;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getSyncAdapterTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getSyncAdapterTypes()"/>
         /// </summary>
-        public static Android.Content.SyncAdapterType[] SyncAdapterTypes
+        /// <returns><see cref="Android.Content.SyncAdapterType"/></returns>
+        public static Android.Content.SyncAdapterType[] GetSyncAdapterTypes()
         {
-            get { return SExecuteWithSignatureArray<Android.Content.SyncAdapterType>(LocalBridgeClazz, "getSyncAdapterTypes", "()[Landroid/content/SyncAdapterType;"); }
+            return SExecuteWithSignatureArray<Android.Content.SyncAdapterType>(LocalBridgeClazz, "getSyncAdapterTypes", "()[Landroid/content/SyncAdapterType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#wrap(android.content.ContentProvider)"/>
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getCurrentSync()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.ContentProvider"/></param>
-        /// <returns><see cref="Android.Content.ContentResolver"/></returns>
-        public static Android.Content.ContentResolver Wrap(Android.Content.ContentProvider arg0)
+        /// <returns><see cref="Android.Content.SyncInfo"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Content.SyncInfo GetCurrentSync()
         {
-            return SExecuteWithSignature<Android.Content.ContentResolver>(LocalBridgeClazz, "wrap", "(Landroid/content/ContentProvider;)Landroid/content/ContentResolver;", arg0);
+            return SExecuteWithSignature<Android.Content.SyncInfo>(LocalBridgeClazz, "getCurrentSync", "()Landroid/content/SyncInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#wrap(android.content.ContentProviderClient)"/>
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getMasterSyncAutomatically()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.ContentProviderClient"/></param>
-        /// <returns><see cref="Android.Content.ContentResolver"/></returns>
-        public static Android.Content.ContentResolver Wrap(Android.Content.ContentProviderClient arg0)
+        /// <returns><see cref="bool"/></returns>
+        public static bool GetMasterSyncAutomatically()
         {
-            return SExecuteWithSignature<Android.Content.ContentResolver>(LocalBridgeClazz, "wrap", "(Landroid/content/ContentProviderClient;)Landroid/content/ContentResolver;", arg0);
+            return SExecuteWithSignature<bool>(LocalBridgeClazz, "getMasterSyncAutomatically", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getSyncAutomatically(android.accounts.Account,java.lang.String)"/>
@@ -435,6 +431,14 @@ public static object AddStatusChangeListener(int arg0, Android.Content.SyncStatu
             return SExecute<Java.Util.List<Android.Content.PeriodicSync>>(LocalBridgeClazz, "getPeriodicSyncs", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getCurrentSyncs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public static Java.Util.List<Android.Content.SyncInfo> GetCurrentSyncs()
+        {
+            return SExecuteWithSignature<Java.Util.List<Android.Content.SyncInfo>>(LocalBridgeClazz, "getCurrentSyncs", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#addPeriodicSync(android.accounts.Account,java.lang.String,android.os.Bundle,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Accounts.Account"/></param>
@@ -509,6 +513,14 @@ public static void SetIsSyncable(Android.Accounts.Account arg0, Java.Lang.String
             SExecute(LocalBridgeClazz, "setIsSyncable", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#setMasterSyncAutomatically(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public static void SetMasterSyncAutomatically(bool arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setMasterSyncAutomatically", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#setSyncAutomatically(android.accounts.Account,java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Accounts.Account"/></param>
@@ -531,20 +543,6 @@ public static void ValidateSyncExtrasBundle(Android.Os.Bundle arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getOutgoingPersistedUriPermissions()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Content.UriPermission> OutgoingPersistedUriPermissions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.UriPermission>>("getOutgoingPersistedUriPermissions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getPersistedUriPermissions()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Content.UriPermission> PersistedUriPermissions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.UriPermission>>("getPersistedUriPermissions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#applyBatch(java.lang.String,java.util.ArrayList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -957,10 +955,26 @@ public Java.Lang.String[] GetStreamTypes(Android.Net.Uri arg0, Java.Lang.String
             return IExecuteArray<Java.Lang.String>("getStreamTypes", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getOutgoingPersistedUriPermissions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.UriPermission> GetOutgoingPersistedUriPermissions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Content.UriPermission>>("getOutgoingPersistedUriPermissions", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#getPersistedUriPermissions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.UriPermission> GetPersistedUriPermissions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Content.UriPermission>>("getPersistedUriPermissions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContentResolver.html#cancelSync(android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CancelSync(Android.Net.Uri arg0)
         {
             IExecuteWithSignature("cancelSync", "(Landroid/net/Uri;)V", arg0);
@@ -971,7 +985,7 @@ public void CancelSync(Android.Net.Uri arg0)
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg1"><see cref="Android.Database.ContentObserver"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void NotifyChange(Android.Net.Uri arg0, Android.Database.ContentObserver arg1, bool arg2)
         {
             IExecute("notifyChange", arg0, arg1, arg2);
@@ -1019,7 +1033,7 @@ public void ReleasePersistableUriPermission(Android.Net.Uri arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartSync(Android.Net.Uri arg0, Android.Os.Bundle arg1)
         {
             IExecute("startSync", arg0, arg1);
@@ -1058,25 +1072,28 @@ public partial class MimeTypeInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/ContentResolver.MimeTypeInfo.html#getContentDescription()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/ContentResolver.MimeTypeInfo.html#getIcon()"/>
             /// </summary>
-            public Java.Lang.CharSequence ContentDescription
+            /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+            public Android.Graphics.Drawable.Icon GetIcon()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/ContentResolver.MimeTypeInfo.html#getIcon()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/ContentResolver.MimeTypeInfo.html#getContentDescription()"/>
             /// </summary>
-            public Android.Graphics.Drawable.Icon Icon
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetContentDescription()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/ContentResolver.MimeTypeInfo.html#getLabel()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/ContentResolver.MimeTypeInfo.html#getLabel()"/>
             /// </summary>
-            public Java.Lang.CharSequence Label
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetLabel()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Content/Context.cs b/src/net/Netdroid/Generated/Android/Content/Context.cs
index f930c969a..b8dbb9e99 100644
--- a/src/net/Netdroid/Generated/Android/Content/Context.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Context.cs
@@ -160,7 +160,7 @@ public partial class Context
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#MODE_MULTI_PROCESS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_MULTI_PROCESS { get { if (!_MODE_MULTI_PROCESSReady) { _MODE_MULTI_PROCESSContent = SGetField<int>(LocalBridgeClazz, "MODE_MULTI_PROCESS"); _MODE_MULTI_PROCESSReady = true; } return _MODE_MULTI_PROCESSContent; } }
         private static int _MODE_MULTI_PROCESSContent = default;
         private static bool _MODE_MULTI_PROCESSReady = false; // this is used because in case of generics 
@@ -179,14 +179,14 @@ public partial class Context
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#MODE_WORLD_READABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_WORLD_READABLE { get { if (!_MODE_WORLD_READABLEReady) { _MODE_WORLD_READABLEContent = SGetField<int>(LocalBridgeClazz, "MODE_WORLD_READABLE"); _MODE_WORLD_READABLEReady = true; } return _MODE_WORLD_READABLEContent; } }
         private static int _MODE_WORLD_READABLEContent = default;
         private static bool _MODE_WORLD_READABLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#MODE_WORLD_WRITEABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_WORLD_WRITEABLE { get { if (!_MODE_WORLD_WRITEABLEReady) { _MODE_WORLD_WRITEABLEContent = SGetField<int>(LocalBridgeClazz, "MODE_WORLD_WRITEABLE"); _MODE_WORLD_WRITEABLEReady = true; } return _MODE_WORLD_WRITEABLEContent; } }
         private static int _MODE_WORLD_WRITEABLEContent = default;
         private static bool _MODE_WORLD_WRITEABLEReady = false; // this is used because in case of generics 
@@ -709,7 +709,7 @@ public partial class Context
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#VIBRATOR_SERVICE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String VIBRATOR_SERVICE { get { if (!_VIBRATOR_SERVICEReady) { _VIBRATOR_SERVICEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "VIBRATOR_SERVICE"); _VIBRATOR_SERVICEReady = true; } return _VIBRATOR_SERVICEContent; } }
         private static Java.Lang.String _VIBRATOR_SERVICEContent = default;
         private static bool _VIBRATOR_SERVICEReady = false; // this is used because in case of generics 
@@ -776,234 +776,6 @@ public partial class Context
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getApplicationContext()"/> 
-        /// </summary>
-        public Android.Content.Context ApplicationContext
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getApplicationContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getApplicationInfo()"/> 
-        /// </summary>
-        public Android.Content.Pm.ApplicationInfo ApplicationInfo
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.ApplicationInfo>("getApplicationInfo", "()Landroid/content/pm/ApplicationInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getAssets()"/> 
-        /// </summary>
-        public Android.Content.Res.AssetManager Assets
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.AssetManager>("getAssets", "()Landroid/content/res/AssetManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getAttributionSource()"/> 
-        /// </summary>
-        public Android.Content.AttributionSource AttributionSource
-        {
-            get { return IExecuteWithSignature<Android.Content.AttributionSource>("getAttributionSource", "()Landroid/content/AttributionSource;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getAttributionTag()"/> 
-        /// </summary>
-        public Java.Lang.String AttributionTag
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getCacheDir()"/> 
-        /// </summary>
-        public Java.Io.File CacheDir
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getCacheDir", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getClassLoader()"/> 
-        /// </summary>
-        public Java.Lang.ClassLoader ClassLoader
-        {
-            get { return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getCodeCacheDir()"/> 
-        /// </summary>
-        public Java.Io.File CodeCacheDir
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getCodeCacheDir", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getContentResolver()"/> 
-        /// </summary>
-        public Android.Content.ContentResolver ContentResolver
-        {
-            get { return IExecuteWithSignature<Android.Content.ContentResolver>("getContentResolver", "()Landroid/content/ContentResolver;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getDataDir()"/> 
-        /// </summary>
-        public Java.Io.File DataDir
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getDataDir", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getDeviceId()"/> 
-        /// </summary>
-        public int DeviceId
-        {
-            get { return IExecuteWithSignature<int>("getDeviceId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getDisplay()"/> 
-        /// </summary>
-        public Android.View.Display Display
-        {
-            get { return IExecuteWithSignature<Android.View.Display>("getDisplay", "()Landroid/view/Display;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getExternalCacheDir()"/> 
-        /// </summary>
-        public Java.Io.File ExternalCacheDir
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getExternalCacheDir", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getExternalCacheDirs()"/> 
-        /// </summary>
-        public Java.Io.File[] ExternalCacheDirs
-        {
-            get { return IExecuteWithSignatureArray<Java.Io.File>("getExternalCacheDirs", "()[Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getExternalMediaDirs()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Io.File[] ExternalMediaDirs
-        {
-            get { return IExecuteWithSignatureArray<Java.Io.File>("getExternalMediaDirs", "()[Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getFilesDir()"/> 
-        /// </summary>
-        public Java.Io.File FilesDir
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getFilesDir", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getMainExecutor()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.Executor MainExecutor
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getMainExecutor", "()Ljava/util/concurrent/Executor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getMainLooper()"/> 
-        /// </summary>
-        public Android.Os.Looper MainLooper
-        {
-            get { return IExecuteWithSignature<Android.Os.Looper>("getMainLooper", "()Landroid/os/Looper;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getNoBackupFilesDir()"/> 
-        /// </summary>
-        public Java.Io.File NoBackupFilesDir
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getNoBackupFilesDir", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getObbDir()"/> 
-        /// </summary>
-        public Java.Io.File ObbDir
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getObbDir", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getObbDirs()"/> 
-        /// </summary>
-        public Java.Io.File[] ObbDirs
-        {
-            get { return IExecuteWithSignatureArray<Java.Io.File>("getObbDirs", "()[Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getOpPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String OpPackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOpPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getPackageCodePath()"/> 
-        /// </summary>
-        public Java.Lang.String PackageCodePath
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageCodePath", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getPackageManager()"/> 
-        /// </summary>
-        public Android.Content.Pm.PackageManager PackageManager
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.PackageManager>("getPackageManager", "()Landroid/content/pm/PackageManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getPackageResourcePath()"/> 
-        /// </summary>
-        public Java.Lang.String PackageResourcePath
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageResourcePath", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getParams()"/> 
-        /// </summary>
-        public Android.Content.ContextParams Params
-        {
-            get { return IExecuteWithSignature<Android.Content.ContextParams>("getParams", "()Landroid/content/ContextParams;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getResources()"/> 
-        /// </summary>
-        public Android.Content.Res.Resources Resources
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getTheme()"/> <see href="https://developer.android.com/reference/android/content/Context.html#setTheme(int)"/>
-        /// </summary>
-        public Android.Content.Res.Resources.Theme Theme
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getTheme", "()Landroid/content/res/Resources$Theme;"); } set { IExecuteWithSignature("setTheme", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getWallpaper()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Drawable.Drawable Wallpaper
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getWallpaper", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getWallpaperDesiredMinimumHeight()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int WallpaperDesiredMinimumHeight
-        {
-            get { return IExecuteWithSignature<int>("getWallpaperDesiredMinimumHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Context.html#getWallpaperDesiredMinimumWidth()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int WallpaperDesiredMinimumWidth
-        {
-            get { return IExecuteWithSignature<int>("getWallpaperDesiredMinimumWidth", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#startForegroundService(android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
@@ -1022,6 +794,14 @@ public Android.Content.ComponentName StartService(Android.Content.Intent arg0)
             return IExecuteWithSignature<Android.Content.ComponentName>("startService", "(Landroid/content/Intent;)Landroid/content/ComponentName;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getContentResolver()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.ContentResolver"/></returns>
+        public Android.Content.ContentResolver GetContentResolver()
+        {
+            return IExecuteWithSignature<Android.Content.ContentResolver>("getContentResolver", "()Landroid/content/ContentResolver;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#createConfigurationContext(android.content.res.Configuration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.Configuration"/></param>
@@ -1069,6 +849,14 @@ public Android.Content.Context CreatePackageContext(Java.Lang.String arg0, int a
             return IExecute<Android.Content.Context>("createPackageContext", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getApplicationContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetApplicationContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getApplicationContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#registerReceiver(android.content.BroadcastReceiver,android.content.IntentFilter,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.BroadcastReceiver"/></param>
@@ -1115,6 +903,46 @@ public Android.Content.Intent RegisterReceiver(Android.Content.BroadcastReceiver
             return IExecute<Android.Content.Intent>("registerReceiver", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getApplicationInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.ApplicationInfo"/></returns>
+        public Android.Content.Pm.ApplicationInfo GetApplicationInfo()
+        {
+            return IExecuteWithSignature<Android.Content.Pm.ApplicationInfo>("getApplicationInfo", "()Landroid/content/pm/ApplicationInfo;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getPackageManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.PackageManager"/></returns>
+        public Android.Content.Pm.PackageManager GetPackageManager()
+        {
+            return IExecuteWithSignature<Android.Content.Pm.PackageManager>("getPackageManager", "()Landroid/content/pm/PackageManager;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getAssets()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.AssetManager"/></returns>
+        public Android.Content.Res.AssetManager GetAssets()
+        {
+            return IExecuteWithSignature<Android.Content.Res.AssetManager>("getAssets", "()Landroid/content/res/AssetManager;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getResources()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.Resources"/></returns>
+        public Android.Content.Res.Resources GetResources()
+        {
+            return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getTheme()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
+        public Android.Content.Res.Resources.Theme GetTheme()
+        {
+            return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getTheme", "()Landroid/content/res/Resources$Theme;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#getSharedPreferences(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1148,15 +976,32 @@ public Android.Database.Sqlite.SQLiteDatabase OpenOrCreateDatabase(Java.Lang.Str
             return IExecute<Android.Database.Sqlite.SQLiteDatabase>("openOrCreateDatabase", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getWallpaper()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Drawable.Drawable GetWallpaper()
+        {
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getWallpaper", "()Landroid/graphics/drawable/Drawable;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#peekWallpaper()"/>
         /// </summary>
         /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Graphics.Drawable.Drawable PeekWallpaper()
         {
             return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("peekWallpaper", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getMainLooper()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Looper"/></returns>
+        public Android.Os.Looper GetMainLooper()
+        {
+            return IExecuteWithSignature<Android.Os.Looper>("getMainLooper", "()Landroid/os/Looper;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#bindService(android.content.Intent,android.content.ServiceConnection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
@@ -1327,6 +1172,40 @@ public int CheckUriPermission(Android.Net.Uri arg0, Java.Lang.String arg1, Java.
             return IExecute<int>("checkUriPermission", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getWallpaperDesiredMinimumHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetWallpaperDesiredMinimumHeight()
+        {
+            return IExecuteWithSignature<int>("getWallpaperDesiredMinimumHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getWallpaperDesiredMinimumWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetWallpaperDesiredMinimumWidth()
+        {
+            return IExecuteWithSignature<int>("getWallpaperDesiredMinimumWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getCacheDir()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetCacheDir()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getCacheDir", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getCodeCacheDir()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetCodeCacheDir()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getCodeCacheDir", "()Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#getDatabasePath(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1336,6 +1215,14 @@ public Java.Io.File GetDatabasePath(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.File>("getDatabasePath", "(Ljava/lang/String;)Ljava/io/File;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getDataDir()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetDataDir()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getDataDir", "()Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#getDir(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1346,6 +1233,14 @@ public Java.Io.File GetDir(Java.Lang.String arg0, int arg1)
             return IExecute<Java.Io.File>("getDir", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getExternalCacheDir()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetExternalCacheDir()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getExternalCacheDir", "()Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#getExternalFilesDir(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1355,6 +1250,14 @@ public Java.Io.File GetExternalFilesDir(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.File>("getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getFilesDir()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetFilesDir()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getFilesDir", "()Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#getFileStreamPath(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1364,6 +1267,30 @@ public Java.Io.File GetFileStreamPath(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.File>("getFileStreamPath", "(Ljava/lang/String;)Ljava/io/File;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getNoBackupFilesDir()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetNoBackupFilesDir()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getNoBackupFilesDir", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getObbDir()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetObbDir()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getObbDir", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getExternalCacheDirs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File[] GetExternalCacheDirs()
+        {
+            return IExecuteWithSignatureArray<Java.Io.File>("getExternalCacheDirs", "()[Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#getExternalFilesDirs(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1373,6 +1300,23 @@ public Java.Io.File[] GetExternalFilesDirs(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<Java.Io.File>("getExternalFilesDirs", "(Ljava/lang/String;)[Ljava/io/File;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getExternalMediaDirs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        [global::System.Obsolete()]
+        public Java.Io.File[] GetExternalMediaDirs()
+        {
+            return IExecuteWithSignatureArray<Java.Io.File>("getExternalMediaDirs", "()[Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getObbDirs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File[] GetObbDirs()
+        {
+            return IExecuteWithSignatureArray<Java.Io.File>("getObbDirs", "()[Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#openFileInput(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1394,6 +1338,14 @@ public Java.Io.FileOutputStream OpenFileOutput(Java.Lang.String arg0, int arg1)
             return IExecute<Java.Io.FileOutputStream>("openFileOutput", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getClassLoader()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public Java.Lang.ClassLoader GetClassLoader()
+        {
+            return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#getSystemService(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1403,6 +1355,30 @@ public object GetSystemService(Java.Lang.String arg0)
             return IExecuteWithSignature("getSystemService", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getPackageCodePath()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageCodePath()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageCodePath", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getPackageResourcePath()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageResourcePath()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageResourcePath", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#getSystemServiceName(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
@@ -1431,7 +1407,7 @@ public Java.Lang.String[] FileList()
         /// <see href="https://developer.android.com/reference/android/content/Context.html#clearWallpaper()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearWallpaper()
         {
             IExecuteWithSignature("clearWallpaper", "()V");
@@ -1525,7 +1501,7 @@ public void GrantUriPermission(Java.Lang.String arg0, Android.Net.Uri arg1, int
         /// <see href="https://developer.android.com/reference/android/content/Context.html#removeStickyBroadcast(android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveStickyBroadcast(Android.Content.Intent arg0)
         {
             IExecuteWithSignature("removeStickyBroadcast", "(Landroid/content/Intent;)V", arg0);
@@ -1535,7 +1511,7 @@ public void RemoveStickyBroadcast(Android.Content.Intent arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg1"><see cref="Android.Os.UserHandle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveStickyBroadcastAsUser(Android.Content.Intent arg0, Android.Os.UserHandle arg1)
         {
             IExecute("removeStickyBroadcastAsUser", arg0, arg1);
@@ -1637,7 +1613,7 @@ public void SendOrderedBroadcastAsUser(Android.Content.Intent arg0, Android.Os.U
         /// <see href="https://developer.android.com/reference/android/content/Context.html#sendStickyBroadcast(android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendStickyBroadcast(Android.Content.Intent arg0)
         {
             IExecuteWithSignature("sendStickyBroadcast", "(Landroid/content/Intent;)V", arg0);
@@ -1647,7 +1623,7 @@ public void SendStickyBroadcast(Android.Content.Intent arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg1"><see cref="Android.Os.UserHandle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendStickyBroadcastAsUser(Android.Content.Intent arg0, Android.Os.UserHandle arg1)
         {
             IExecute("sendStickyBroadcastAsUser", arg0, arg1);
@@ -1661,7 +1637,7 @@ public void SendStickyBroadcastAsUser(Android.Content.Intent arg0, Android.Os.Us
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
         /// <param name="arg5"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendStickyOrderedBroadcast(Android.Content.Intent arg0, Android.Content.BroadcastReceiver arg1, Android.Os.Handler arg2, int arg3, Java.Lang.String arg4, Android.Os.Bundle arg5)
         {
             IExecute("sendStickyOrderedBroadcast", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1676,17 +1652,25 @@ public void SendStickyOrderedBroadcast(Android.Content.Intent arg0, Android.Cont
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Java.Lang.String"/></param>
         /// <param name="arg6"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendStickyOrderedBroadcastAsUser(Android.Content.Intent arg0, Android.Os.UserHandle arg1, Android.Content.BroadcastReceiver arg2, Android.Os.Handler arg3, int arg4, Java.Lang.String arg5, Android.Os.Bundle arg6)
         {
             IExecute("sendStickyOrderedBroadcastAsUser", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#setTheme(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTheme(int arg0)
+        {
+            IExecuteWithSignature("setTheme", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#setWallpaper(android.graphics.Bitmap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetWallpaper(Android.Graphics.Bitmap arg0)
         {
             IExecuteWithSignature("setWallpaper", "(Landroid/graphics/Bitmap;)V", arg0);
@@ -1696,7 +1680,7 @@ public void SetWallpaper(Android.Graphics.Bitmap arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetWallpaper(Java.Io.InputStream arg0)
         {
             IExecuteWithSignature("setWallpaper", "(Ljava/io/InputStream;)V", arg0);
@@ -1779,6 +1763,14 @@ public void UnregisterReceiver(Android.Content.BroadcastReceiver arg0)
             IExecuteWithSignature("unregisterReceiver", "(Landroid/content/BroadcastReceiver;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getAttributionSource()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.AttributionSource"/></returns>
+        public Android.Content.AttributionSource GetAttributionSource()
+        {
+            return IExecuteWithSignature<Android.Content.AttributionSource>("getAttributionSource", "()Landroid/content/AttributionSource;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#createAttributionContext(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1827,6 +1819,22 @@ public Android.Content.Context CreateWindowContext(int arg0, Android.Os.Bundle a
             return IExecute<Android.Content.Context>("createWindowContext", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getParams()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.ContextParams"/></returns>
+        public Android.Content.ContextParams GetParams()
+        {
+            return IExecuteWithSignature<Android.Content.ContextParams>("getParams", "()Landroid/content/ContextParams;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getDisplay()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Display"/></returns>
+        public Android.View.Display GetDisplay()
+        {
+            return IExecuteWithSignature<Android.View.Display>("getDisplay", "()Landroid/view/Display;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#bindIsolatedService(android.content.Intent,android.content.Context.BindServiceFlags,java.lang.String,java.util.concurrent.Executor,android.content.ServiceConnection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
@@ -2035,6 +2043,14 @@ public Java.Lang.String GetString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getDeviceId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceId()
+        {
+            return IExecuteWithSignature<int>("getDeviceId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#checkCallingOrSelfUriPermissions(java.util.List,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
@@ -2067,6 +2083,30 @@ public int[] CheckUriPermissions(Java.Util.List<Android.Net.Uri> arg0, int arg1,
             return IExecuteArray<int>("checkUriPermissions", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getAttributionTag()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAttributionTag()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getOpPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOpPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getOpPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Context.html#getMainExecutor()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.Executor"/></returns>
+        public Java.Util.Concurrent.Executor GetMainExecutor()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getMainExecutor", "()Ljava/util/concurrent/Executor;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Context.html#registerComponentCallbacks(android.content.ComponentCallbacks)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentCallbacks"/></param>
@@ -2163,7 +2203,7 @@ public void SendOrderedBroadcast(Android.Content.Intent arg0, Java.Lang.String a
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendStickyBroadcast(Android.Content.Intent arg0, Android.Os.Bundle arg1)
         {
             IExecute("sendStickyBroadcast", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Content/ContextParams.cs b/src/net/Netdroid/Generated/Android/Content/ContextParams.cs
index fe18efdb9..49f07af60 100644
--- a/src/net/Netdroid/Generated/Android/Content/ContextParams.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ContextParams.cs
@@ -46,18 +46,20 @@ public partial class ContextParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContextParams.html#getAttributionTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/ContextParams.html#getNextAttributionSource()"/>
         /// </summary>
-        public Java.Lang.String AttributionTag
+        /// <returns><see cref="Android.Content.AttributionSource"/></returns>
+        public Android.Content.AttributionSource GetNextAttributionSource()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.AttributionSource>("getNextAttributionSource", "()Landroid/content/AttributionSource;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContextParams.html#getNextAttributionSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/ContextParams.html#getAttributionTag()"/>
         /// </summary>
-        public Android.Content.AttributionSource NextAttributionSource
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAttributionTag()
         {
-            get { return IExecuteWithSignature<Android.Content.AttributionSource>("getNextAttributionSource", "()Landroid/content/AttributionSource;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAttributionTag", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Content/ContextWrapper.cs b/src/net/Netdroid/Generated/Android/Content/ContextWrapper.cs
index c172106b0..1f94fd7b3 100644
--- a/src/net/Netdroid/Generated/Android/Content/ContextWrapper.cs
+++ b/src/net/Netdroid/Generated/Android/Content/ContextWrapper.cs
@@ -54,11 +54,12 @@ public ContextWrapper(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/ContextWrapper.html#getBaseContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/ContextWrapper.html#getBaseContext()"/>
         /// </summary>
-        public Android.Content.Context BaseContext
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetBaseContext()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getBaseContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<Android.Content.Context>("getBaseContext", "()Landroid/content/Context;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/ContextWrapper.html#sendOrderedBroadcast(android.content.Intent,int,java.lang.String,java.lang.String,android.content.BroadcastReceiver,android.os.Handler,java.lang.String,android.os.Bundle,android.os.Bundle)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/CursorLoader.cs b/src/net/Netdroid/Generated/Android/Content/CursorLoader.cs
index 2e65e4506..ad9930813 100644
--- a/src/net/Netdroid/Generated/Android/Content/CursorLoader.cs
+++ b/src/net/Netdroid/Generated/Android/Content/CursorLoader.cs
@@ -38,7 +38,7 @@ public partial class CursorLoader
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
         /// <param name="arg5"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public CursorLoader(Android.Content.Context arg0, Android.Net.Uri arg1, Java.Lang.String[] arg2, Java.Lang.String arg3, Java.Lang.String[] arg4, Java.Lang.String arg5)
             : base(arg0, arg1, arg2, arg3, arg4, arg5)
         {
@@ -47,7 +47,7 @@ public CursorLoader(Android.Content.Context arg0, Android.Net.Uri arg1, Java.Lan
         /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public CursorLoader(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -69,50 +69,55 @@ public CursorLoader(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getProjection()"/> <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setProjection(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getUri()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String[] Projection
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Uri GetUri()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getProjection", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setProjection", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getSelection()"/> <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setSelection(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getSelection()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Selection
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSelection()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSelection", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSelection", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSelection", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getSelectionArgs()"/> <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setSelectionArgs(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getSortOrder()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String[] SelectionArgs
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSortOrder()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSelectionArgs", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setSelectionArgs", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSortOrder", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getSortOrder()"/> <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setSortOrder(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getProjection()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String SortOrder
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String[] GetProjection()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSortOrder", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSortOrder", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getProjection", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getUri()"/> <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setUri(android.net.Uri)"/>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#getSelectionArgs()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Uri Uri
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String[] GetSelectionArgs()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); } set { IExecuteWithSignature("setUri", "(Landroid/net/Uri;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSelectionArgs", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#deliverResult(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DeliverResult(Android.Database.Cursor arg0)
         {
             IExecuteWithSignature("deliverResult", "(Landroid/database/Cursor;)V", arg0);
@@ -121,11 +126,56 @@ public void DeliverResult(Android.Database.Cursor arg0)
         /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#onCanceled(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCanceled(Android.Database.Cursor arg0)
         {
             IExecuteWithSignature("onCanceled", "(Landroid/database/Cursor;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setProjection(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetProjection(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setProjection", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setSelection(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetSelection(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSelection", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setSelectionArgs(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetSelectionArgs(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setSelectionArgs", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setSortOrder(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetSortOrder(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSortOrder", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/CursorLoader.html#setUri(android.net.Uri)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
+        [global::System.Obsolete()]
+        public void SetUri(Android.Net.Uri arg0)
+        {
+            IExecuteWithSignature("setUri", "(Landroid/net/Uri;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Content/DialogInterface.cs b/src/net/Netdroid/Generated/Android/Content/DialogInterface.cs
index 320d3db1c..69741c7ce 100644
--- a/src/net/Netdroid/Generated/Android/Content/DialogInterface.cs
+++ b/src/net/Netdroid/Generated/Android/Content/DialogInterface.cs
@@ -76,21 +76,21 @@ public partial class DialogInterface : Android.Content.IDialogInterface
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/DialogInterface.html#BUTTON1"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BUTTON1 { get { if (!_BUTTON1Ready) { _BUTTON1Content = SGetField<int>(LocalBridgeClazz, "BUTTON1"); _BUTTON1Ready = true; } return _BUTTON1Content; } }
         private static int _BUTTON1Content = default;
         private static bool _BUTTON1Ready = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/DialogInterface.html#BUTTON2"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BUTTON2 { get { if (!_BUTTON2Ready) { _BUTTON2Content = SGetField<int>(LocalBridgeClazz, "BUTTON2"); _BUTTON2Ready = true; } return _BUTTON2Content; } }
         private static int _BUTTON2Content = default;
         private static bool _BUTTON2Ready = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/DialogInterface.html#BUTTON3"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BUTTON3 { get { if (!_BUTTON3Ready) { _BUTTON3Content = SGetField<int>(LocalBridgeClazz, "BUTTON3"); _BUTTON3Ready = true; } return _BUTTON3Content; } }
         private static int _BUTTON3Content = default;
         private static bool _BUTTON3Ready = false; // this is used because in case of generics 
@@ -145,7 +145,7 @@ public partial class OnCancelListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCancel", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnCancelEventHandler));
+                AddEventHandler("onCancel", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnCancelEventHandler));
 
             }
 
@@ -153,7 +153,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/DialogInterface.OnCancelListener.html#onCancel(android.content.DialogInterface)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCancel"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.DialogInterface> OnOnCancel { get; set; } = null;
+            public global::System.Action<Android.Content.DialogInterface> OnOnCancel { get; set; } = null;
 
             void OnCancelEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>> data)
             {
@@ -244,7 +244,7 @@ public partial class OnClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnClickEventHandler));
+                AddEventHandler("onClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnClickEventHandler));
 
             }
 
@@ -252,7 +252,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/DialogInterface.OnClickListener.html#onClick(android.content.DialogInterface,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.DialogInterface, int> OnOnClick { get; set; } = null;
+            public global::System.Action<Android.Content.DialogInterface, int> OnOnClick { get; set; } = null;
 
             void OnClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>> data)
             {
@@ -345,7 +345,7 @@ public partial class OnDismissListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDismiss", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnDismissEventHandler));
+                AddEventHandler("onDismiss", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnDismissEventHandler));
 
             }
 
@@ -353,7 +353,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/DialogInterface.OnDismissListener.html#onDismiss(android.content.DialogInterface)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDismiss"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.DialogInterface> OnOnDismiss { get; set; } = null;
+            public global::System.Action<Android.Content.DialogInterface> OnOnDismiss { get; set; } = null;
 
             void OnDismissEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>> data)
             {
@@ -444,7 +444,7 @@ public partial class OnKeyListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onKey", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnKeyEventHandler));
+                AddEventHandler("onKey", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnKeyEventHandler));
 
             }
 
@@ -452,7 +452,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/DialogInterface.OnKeyListener.html#onKey(android.content.DialogInterface,int,android.view.KeyEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnKey"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Content.DialogInterface, int, Android.View.KeyEvent, bool> OnOnKey { get; set; } = null;
+            public global::System.Func<Android.Content.DialogInterface, int, Android.View.KeyEvent, bool> OnOnKey { get; set; } = null;
 
             void OnKeyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>> data)
             {
@@ -550,7 +550,7 @@ public partial class OnMultiChoiceClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnClickEventHandler));
+                AddEventHandler("onClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnClickEventHandler));
 
             }
 
@@ -558,7 +558,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/DialogInterface.OnMultiChoiceClickListener.html#onClick(android.content.DialogInterface,int,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.DialogInterface, int, bool> OnOnClick { get; set; } = null;
+            public global::System.Action<Android.Content.DialogInterface, int, bool> OnOnClick { get; set; } = null;
 
             void OnClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>> data)
             {
@@ -653,7 +653,7 @@ public partial class OnShowListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onShow", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnShowEventHandler));
+                AddEventHandler("onShow", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>>>(OnShowEventHandler));
 
             }
 
@@ -661,7 +661,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/DialogInterface.OnShowListener.html#onShow(android.content.DialogInterface)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnShow"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.DialogInterface> OnOnShow { get; set; } = null;
+            public global::System.Action<Android.Content.DialogInterface> OnOnShow { get; set; } = null;
 
             void OnShowEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.DialogInterface>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Content/Entity.cs b/src/net/Netdroid/Generated/Android/Content/Entity.cs
index c54bed09c..b085b7159 100644
--- a/src/net/Netdroid/Generated/Android/Content/Entity.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Entity.cs
@@ -54,18 +54,20 @@ public Entity(Android.Content.ContentValues arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Entity.html#getEntityValues()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/Entity.html#getEntityValues()"/>
         /// </summary>
-        public Android.Content.ContentValues EntityValues
+        /// <returns><see cref="Android.Content.ContentValues"/></returns>
+        public Android.Content.ContentValues GetEntityValues()
         {
-            get { return IExecuteWithSignature<Android.Content.ContentValues>("getEntityValues", "()Landroid/content/ContentValues;"); }
+            return IExecuteWithSignature<Android.Content.ContentValues>("getEntityValues", "()Landroid/content/ContentValues;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Entity.html#getSubValues()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/Entity.html#getSubValues()"/>
         /// </summary>
-        public Java.Util.ArrayList<Android.Content.Entity.NamedContentValues> SubValues
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<Android.Content.Entity.NamedContentValues> GetSubValues()
         {
-            get { return IExecuteWithSignature<Java.Util.ArrayList<Android.Content.Entity.NamedContentValues>>("getSubValues", "()Ljava/util/ArrayList;"); }
+            return IExecuteWithSignature<Java.Util.ArrayList<Android.Content.Entity.NamedContentValues>>("getSubValues", "()Ljava/util/ArrayList;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Entity.html#addSubValue(android.net.Uri,android.content.ContentValues)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Intent.cs b/src/net/Netdroid/Generated/Android/Content/Intent.cs
index aa6b1c6dc..6a2a4ca74 100644
--- a/src/net/Netdroid/Generated/Android/Content/Intent.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Intent.cs
@@ -231,7 +231,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET { get { if (!_FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESETReady) { _FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESETContent = SGetField<int>(LocalBridgeClazz, "FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET"); _FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESETReady = true; } return _FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESETContent; } }
         private static int _FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESETContent = default;
         private static bool _FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESETReady = false; // this is used because in case of generics 
@@ -574,7 +574,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_CLOSE_SYSTEM_DIALOGS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_CLOSE_SYSTEM_DIALOGS { get { if (!_ACTION_CLOSE_SYSTEM_DIALOGSReady) { _ACTION_CLOSE_SYSTEM_DIALOGSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_CLOSE_SYSTEM_DIALOGS"); _ACTION_CLOSE_SYSTEM_DIALOGSReady = true; } return _ACTION_CLOSE_SYSTEM_DIALOGSContent; } }
         private static Java.Lang.String _ACTION_CLOSE_SYSTEM_DIALOGSContent = default;
         private static bool _ACTION_CLOSE_SYSTEM_DIALOGSReady = false; // this is used because in case of generics 
@@ -635,14 +635,14 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_DEVICE_STORAGE_LOW"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_DEVICE_STORAGE_LOW { get { if (!_ACTION_DEVICE_STORAGE_LOWReady) { _ACTION_DEVICE_STORAGE_LOWContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_DEVICE_STORAGE_LOW"); _ACTION_DEVICE_STORAGE_LOWReady = true; } return _ACTION_DEVICE_STORAGE_LOWContent; } }
         private static Java.Lang.String _ACTION_DEVICE_STORAGE_LOWContent = default;
         private static bool _ACTION_DEVICE_STORAGE_LOWReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_DEVICE_STORAGE_OK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_DEVICE_STORAGE_OK { get { if (!_ACTION_DEVICE_STORAGE_OKReady) { _ACTION_DEVICE_STORAGE_OKContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_DEVICE_STORAGE_OK"); _ACTION_DEVICE_STORAGE_OKReady = true; } return _ACTION_DEVICE_STORAGE_OKContent; } }
         private static Java.Lang.String _ACTION_DEVICE_STORAGE_OKContent = default;
         private static bool _ACTION_DEVICE_STORAGE_OKReady = false; // this is used because in case of generics 
@@ -751,7 +751,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_INSTALL_PACKAGE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_INSTALL_PACKAGE { get { if (!_ACTION_INSTALL_PACKAGEReady) { _ACTION_INSTALL_PACKAGEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_INSTALL_PACKAGE"); _ACTION_INSTALL_PACKAGEReady = true; } return _ACTION_INSTALL_PACKAGEContent; } }
         private static Java.Lang.String _ACTION_INSTALL_PACKAGEContent = default;
         private static bool _ACTION_INSTALL_PACKAGEReady = false; // this is used because in case of generics 
@@ -878,7 +878,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_MEDIA_SCANNER_SCAN_FILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_MEDIA_SCANNER_SCAN_FILE { get { if (!_ACTION_MEDIA_SCANNER_SCAN_FILEReady) { _ACTION_MEDIA_SCANNER_SCAN_FILEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_MEDIA_SCANNER_SCAN_FILE"); _ACTION_MEDIA_SCANNER_SCAN_FILEReady = true; } return _ACTION_MEDIA_SCANNER_SCAN_FILEContent; } }
         private static Java.Lang.String _ACTION_MEDIA_SCANNER_SCAN_FILEContent = default;
         private static bool _ACTION_MEDIA_SCANNER_SCAN_FILEReady = false; // this is used because in case of generics 
@@ -927,7 +927,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_NEW_OUTGOING_CALL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_NEW_OUTGOING_CALL { get { if (!_ACTION_NEW_OUTGOING_CALLReady) { _ACTION_NEW_OUTGOING_CALLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_NEW_OUTGOING_CALL"); _ACTION_NEW_OUTGOING_CALLReady = true; } return _ACTION_NEW_OUTGOING_CALLContent; } }
         private static Java.Lang.String _ACTION_NEW_OUTGOING_CALLContent = default;
         private static bool _ACTION_NEW_OUTGOING_CALLReady = false; // this is used because in case of generics 
@@ -976,7 +976,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_PACKAGE_INSTALL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_PACKAGE_INSTALL { get { if (!_ACTION_PACKAGE_INSTALLReady) { _ACTION_PACKAGE_INSTALLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_PACKAGE_INSTALL"); _ACTION_PACKAGE_INSTALLReady = true; } return _ACTION_PACKAGE_INSTALLContent; } }
         private static Java.Lang.String _ACTION_PACKAGE_INSTALLContent = default;
         private static bool _ACTION_PACKAGE_INSTALLReady = false; // this is used because in case of generics 
@@ -1235,21 +1235,21 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_UMS_CONNECTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_UMS_CONNECTED { get { if (!_ACTION_UMS_CONNECTEDReady) { _ACTION_UMS_CONNECTEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_UMS_CONNECTED"); _ACTION_UMS_CONNECTEDReady = true; } return _ACTION_UMS_CONNECTEDContent; } }
         private static Java.Lang.String _ACTION_UMS_CONNECTEDContent = default;
         private static bool _ACTION_UMS_CONNECTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_UMS_DISCONNECTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_UMS_DISCONNECTED { get { if (!_ACTION_UMS_DISCONNECTEDReady) { _ACTION_UMS_DISCONNECTEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_UMS_DISCONNECTED"); _ACTION_UMS_DISCONNECTEDReady = true; } return _ACTION_UMS_DISCONNECTEDContent; } }
         private static Java.Lang.String _ACTION_UMS_DISCONNECTEDContent = default;
         private static bool _ACTION_UMS_DISCONNECTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_UNINSTALL_PACKAGE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_UNINSTALL_PACKAGE { get { if (!_ACTION_UNINSTALL_PACKAGEReady) { _ACTION_UNINSTALL_PACKAGEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_UNINSTALL_PACKAGE"); _ACTION_UNINSTALL_PACKAGEReady = true; } return _ACTION_UNINSTALL_PACKAGEContent; } }
         private static Java.Lang.String _ACTION_UNINSTALL_PACKAGEContent = default;
         private static bool _ACTION_UNINSTALL_PACKAGEReady = false; // this is used because in case of generics 
@@ -1316,7 +1316,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#ACTION_WALLPAPER_CHANGED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_WALLPAPER_CHANGED { get { if (!_ACTION_WALLPAPER_CHANGEDReady) { _ACTION_WALLPAPER_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_WALLPAPER_CHANGED"); _ACTION_WALLPAPER_CHANGEDReady = true; } return _ACTION_WALLPAPER_CHANGEDContent; } }
         private static Java.Lang.String _ACTION_WALLPAPER_CHANGEDContent = default;
         private static bool _ACTION_WALLPAPER_CHANGEDReady = false; // this is used because in case of generics 
@@ -1587,7 +1587,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#EXTRA_ALLOW_REPLACE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_ALLOW_REPLACE { get { if (!_EXTRA_ALLOW_REPLACEReady) { _EXTRA_ALLOW_REPLACEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_ALLOW_REPLACE"); _EXTRA_ALLOW_REPLACEReady = true; } return _EXTRA_ALLOW_REPLACEContent; } }
         private static Java.Lang.String _EXTRA_ALLOW_REPLACEContent = default;
         private static bool _EXTRA_ALLOW_REPLACEReady = false; // this is used because in case of generics 
@@ -1666,7 +1666,7 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#EXTRA_CHANGED_COMPONENT_NAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_CHANGED_COMPONENT_NAME { get { if (!_EXTRA_CHANGED_COMPONENT_NAMEReady) { _EXTRA_CHANGED_COMPONENT_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_CHANGED_COMPONENT_NAME"); _EXTRA_CHANGED_COMPONENT_NAMEReady = true; } return _EXTRA_CHANGED_COMPONENT_NAMEContent; } }
         private static Java.Lang.String _EXTRA_CHANGED_COMPONENT_NAMEContent = default;
         private static bool _EXTRA_CHANGED_COMPONENT_NAMEReady = false; // this is used because in case of generics 
@@ -1973,14 +1973,14 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#EXTRA_SHORTCUT_ICON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SHORTCUT_ICON { get { if (!_EXTRA_SHORTCUT_ICONReady) { _EXTRA_SHORTCUT_ICONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SHORTCUT_ICON"); _EXTRA_SHORTCUT_ICONReady = true; } return _EXTRA_SHORTCUT_ICONContent; } }
         private static Java.Lang.String _EXTRA_SHORTCUT_ICONContent = default;
         private static bool _EXTRA_SHORTCUT_ICONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#EXTRA_SHORTCUT_ICON_RESOURCE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SHORTCUT_ICON_RESOURCE { get { if (!_EXTRA_SHORTCUT_ICON_RESOURCEReady) { _EXTRA_SHORTCUT_ICON_RESOURCEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SHORTCUT_ICON_RESOURCE"); _EXTRA_SHORTCUT_ICON_RESOURCEReady = true; } return _EXTRA_SHORTCUT_ICON_RESOURCEContent; } }
         private static Java.Lang.String _EXTRA_SHORTCUT_ICON_RESOURCEContent = default;
         private static bool _EXTRA_SHORTCUT_ICON_RESOURCEReady = false; // this is used because in case of generics 
@@ -1993,14 +1993,14 @@ public Intent(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#EXTRA_SHORTCUT_INTENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SHORTCUT_INTENT { get { if (!_EXTRA_SHORTCUT_INTENTReady) { _EXTRA_SHORTCUT_INTENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SHORTCUT_INTENT"); _EXTRA_SHORTCUT_INTENTReady = true; } return _EXTRA_SHORTCUT_INTENTContent; } }
         private static Java.Lang.String _EXTRA_SHORTCUT_INTENTContent = default;
         private static bool _EXTRA_SHORTCUT_INTENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#EXTRA_SHORTCUT_NAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SHORTCUT_NAME { get { if (!_EXTRA_SHORTCUT_NAMEReady) { _EXTRA_SHORTCUT_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SHORTCUT_NAME"); _EXTRA_SHORTCUT_NAMEReady = true; } return _EXTRA_SHORTCUT_NAMEContent; } }
         private static Java.Lang.String _EXTRA_SHORTCUT_NAMEContent = default;
         private static bool _EXTRA_SHORTCUT_NAMEReady = false; // this is used because in case of generics 
@@ -2131,7 +2131,7 @@ public static Android.Content.Intent CreateChooser(Android.Content.Intent arg0,
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Content.Intent"/></returns>
         /// <exception cref="Java.Net.URISyntaxException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Content.Intent GetIntent(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Android.Content.Intent>(LocalBridgeClazz, "getIntent", "(Ljava/lang/String;)Landroid/content/Intent;", arg0);
@@ -2212,113 +2212,37 @@ public static Java.Lang.String NormalizeMimeType(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getAction()"/> 
-        /// </summary>
-        public Java.Lang.String Action
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAction", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getCategories()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> Categories
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getCategories", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getClipData()"/> <see href="https://developer.android.com/reference/android/content/Intent.html#setClipData(android.content.ClipData)"/>
-        /// </summary>
-        public Android.Content.ClipData ClipData
-        {
-            get { return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;"); } set { IExecuteWithSignature("setClipData", "(Landroid/content/ClipData;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getComponent()"/> 
-        /// </summary>
-        public Android.Content.ComponentName Component
-        {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getData()"/> 
-        /// </summary>
-        public Android.Net.Uri Data
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getData", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getDataString()"/> 
-        /// </summary>
-        public Java.Lang.String DataString
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDataString", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getExtras()"/> 
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getFlags()"/> 
-        /// </summary>
-        public int Flags
-        {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getIdentifier()"/> 
-        /// </summary>
-        public Java.Lang.String Identifier
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIdentifier", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getPackage()"/> 
-        /// </summary>
-        public Java.Lang.String Package
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getScheme()"/> 
-        /// </summary>
-        public Java.Lang.String Scheme
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getScheme", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getSelector()"/> <see href="https://developer.android.com/reference/android/content/Intent.html#setSelector(android.content.Intent)"/>
-        /// </summary>
-        public Android.Content.Intent Selector
-        {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getSelector", "()Landroid/content/Intent;"); } set { IExecuteWithSignature("setSelector", "(Landroid/content/Intent;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getSourceBounds()"/> <see href="https://developer.android.com/reference/android/content/Intent.html#setSourceBounds(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableArrayListExtra(java.lang.String,java.lang.Class)"/>
         /// </summary>
-        public Android.Graphics.Rect SourceBounds
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<T> GetParcelableArrayListExtra<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getSourceBounds", "()Landroid/graphics/Rect;"); } set { IExecuteWithSignature("setSourceBounds", "(Landroid/graphics/Rect;)V", value); }
+            return IExecute<Java.Util.ArrayList<T>>("getParcelableArrayListExtra", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableArrayListExtra(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.ArrayList<T> GetParcelableArrayListExtra<T>(Java.Lang.String arg0) where T : Android.Os.IParcelable, new()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecute<Java.Util.ArrayList<T>>("getParcelableArrayListExtra", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableArrayListExtra(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableExtra(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        /// <returns><see cref="Java.Util.ArrayList"/></returns>
-        [System.Obsolete()]
-        public Java.Util.ArrayList<T> GetParcelableArrayListExtra<T>(Java.Lang.String arg0) where T: Android.Os.IParcelable, new()
+        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T GetParcelableExtra<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
         {
-            return IExecuteWithSignature<Java.Util.ArrayList<T>>("getParcelableArrayListExtra", "(Ljava/lang/String;)Ljava/util/ArrayList;", arg0);
+            return IExecute<T>("getParcelableExtra", arg0, arg1);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableExtra(java.lang.String)"/>
@@ -2326,10 +2250,10 @@ public Java.Lang.String Type
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        [System.Obsolete()]
-        public T GetParcelableExtra<T>(Java.Lang.String arg0) where T: Android.Os.IParcelable, new()
+        [global::System.Obsolete()]
+        public T GetParcelableExtra<T>(Java.Lang.String arg0) where T : Android.Os.IParcelable, new()
         {
-            return IExecuteWithSignature<T>("getParcelableExtra", "(Ljava/lang/String;)Landroid/os/Parcelable;", arg0);
+            return IExecute<T>("getParcelableExtra", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#getSerializableExtra(java.lang.String,java.lang.Class)"/>
@@ -2338,42 +2262,36 @@ public Java.Lang.String Type
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Io.ISerializable"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T GetSerializableExtra<T>(Java.Lang.String arg0, Java.Lang.Class arg1) where T: Java.Io.ISerializable, new()
+        public T GetSerializableExtra<T>(Java.Lang.String arg0, Java.Lang.Class arg1) where T : Java.Io.ISerializable, new()
         {
             return IExecute<T>("getSerializableExtra", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableArrayListExtra(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableArrayExtra(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="Java.Util.ArrayList"/></returns>
-        public Java.Util.ArrayList<T> GetParcelableArrayListExtra<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
+        /// <returns><typeparamref name="T"/></returns>
+        public T[] GetParcelableArrayExtra<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
         {
-            return IExecute<Java.Util.ArrayList<T>>("getParcelableArrayListExtra", arg0, arg1);
+            return IExecuteArray<T>("getParcelableArrayExtra", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableExtra(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getClipData()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T GetParcelableExtra<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
+        /// <returns><see cref="Android.Content.ClipData"/></returns>
+        public Android.Content.ClipData GetClipData()
         {
-            return IExecute<T>("getParcelableExtra", arg0, arg1);
+            return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableArrayExtra(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getComponent()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T[] GetParcelableArrayExtra<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponent()
         {
-            return IExecuteArray<T>("getParcelableArrayExtra", arg0, arg1);
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#resolveActivity(android.content.pm.PackageManager)"/>
@@ -2411,6 +2329,14 @@ public Android.Content.Intent CloneFilter()
             return IExecuteWithSignature<Android.Content.Intent>("cloneFilter", "()Landroid/content/Intent;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getSelector()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent GetSelector()
+        {
+            return IExecuteWithSignature<Android.Content.Intent>("getSelector", "()Landroid/content/Intent;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#putCharSequenceArrayListExtra(java.lang.String,java.util.ArrayList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -2695,7 +2621,7 @@ public Android.Content.Intent PutIntegerArrayListExtra(Java.Lang.String arg0, Ja
         /// <param name="arg1"><see cref="Java.Util.ArrayList"/></param>
         /// <typeparam name="Arg1ExtendsAndroid_Os_Parcelable"><see cref="Android.Os.Parcelable"/></typeparam>
         /// <returns><see cref="Android.Content.Intent"/></returns>
-        public Android.Content.Intent PutParcelableArrayListExtra<Arg1ExtendsAndroid_Os_Parcelable>(Java.Lang.String arg0, Java.Util.ArrayList<Arg1ExtendsAndroid_Os_Parcelable> arg1) where Arg1ExtendsAndroid_Os_Parcelable: Android.Os.Parcelable
+        public Android.Content.Intent PutParcelableArrayListExtra<Arg1ExtendsAndroid_Os_Parcelable>(Java.Lang.String arg0, Java.Util.ArrayList<Arg1ExtendsAndroid_Os_Parcelable> arg1) where Arg1ExtendsAndroid_Os_Parcelable : Android.Os.Parcelable
         {
             return IExecute<Android.Content.Intent>("putParcelableArrayListExtra", arg0, arg1);
         }
@@ -2869,6 +2795,22 @@ public Android.Content.Pm.ActivityInfo ResolveActivityInfo(Android.Content.Pm.Pa
             return IExecute<Android.Content.Pm.ActivityInfo>("resolveActivityInfo", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getSourceBounds()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetSourceBounds()
+        {
+            return IExecuteWithSignature<Android.Graphics.Rect>("getSourceBounds", "()Landroid/graphics/Rect;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getData()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetData()
+        {
+            return IExecuteWithSignature<Android.Net.Uri>("getData", "()Landroid/net/Uri;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#getBundleExtra(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -2878,11 +2820,19 @@ public Android.Os.Bundle GetBundleExtra(Java.Lang.String arg0)
             return IExecuteWithSignature<Android.Os.Bundle>("getBundleExtra", "(Ljava/lang/String;)Landroid/os/Bundle;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getExtras()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#getParcelableArrayExtra(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Os.Parcelable"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.Parcelable[] GetParcelableArrayExtra(Java.Lang.String arg0)
         {
             return IExecuteWithSignatureArray<Android.Os.Parcelable>("getParcelableArrayExtra", "(Ljava/lang/String;)[Landroid/os/Parcelable;", arg0);
@@ -3044,6 +2994,14 @@ public int FilterHashCode()
             return IExecuteWithSignature<int>("filterHashCode", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getFlags()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
+        {
+            return IExecuteWithSignature<int>("getFlags", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#getIntExtra(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -3067,7 +3025,7 @@ public int[] GetIntArrayExtra(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.Serializable"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Io.Serializable GetSerializableExtra(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Io.Serializable>("getSerializableExtra", "(Ljava/lang/String;)Ljava/io/Serializable;", arg0);
@@ -3091,6 +3049,46 @@ public Java.Lang.CharSequence[] GetCharSequenceArrayExtra(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getCharSequenceArrayExtra", "(Ljava/lang/String;)[Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getAction()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAction()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAction", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getDataString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDataString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDataString", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getIdentifier()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetIdentifier()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getIdentifier", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getScheme()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetScheme()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getScheme", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#getStringExtra(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -3100,6 +3098,14 @@ public Java.Lang.String GetStringExtra(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getStringExtra", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#resolveType(android.content.ContentResolver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
@@ -3130,7 +3136,7 @@ public Java.Lang.String ResolveTypeIfNeeded(Android.Content.ContentResolver arg0
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#toURI()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String ToURI()
         {
             return IExecuteWithSignature<Java.Lang.String>("toURI", "()Ljava/lang/String;");
@@ -3181,6 +3187,14 @@ public Java.Lang.String[] GetStringArrayExtra(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.ArrayList<Java.Lang.String>>("getStringArrayListExtra", "(Ljava/lang/String;)Ljava/util/ArrayList;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#getCategories()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetCategories()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getCategories", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#getLongExtra(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -3251,6 +3265,14 @@ public void RemoveFlags(int arg0)
             IExecuteWithSignature("removeFlags", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#setClipData(android.content.ClipData)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.ClipData"/></param>
+        public void SetClipData(Android.Content.ClipData arg0)
+        {
+            IExecuteWithSignature("setClipData", "(Landroid/content/ClipData;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#setExtrasClassLoader(java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
@@ -3259,6 +3281,22 @@ public void SetExtrasClassLoader(Java.Lang.ClassLoader arg0)
             IExecuteWithSignature("setExtrasClassLoader", "(Ljava/lang/ClassLoader;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#setSelector(android.content.Intent)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
+        public void SetSelector(Android.Content.Intent arg0)
+        {
+            IExecuteWithSignature("setSelector", "(Landroid/content/Intent;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Intent.html#setSourceBounds(android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        public void SetSourceBounds(Android.Graphics.Rect arg0)
+        {
+            IExecuteWithSignature("setSourceBounds", "(Landroid/graphics/Rect;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Intent.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -3300,11 +3338,12 @@ public FilterComparison(Android.Content.Intent arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/Intent.FilterComparison.html#getIntent()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/Intent.FilterComparison.html#getIntent()"/>
             /// </summary>
-            public Android.Content.Intent GetIntent
+            /// <returns><see cref="Android.Content.Intent"/></returns>
+            public Android.Content.Intent GetIntent()
             {
-                get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); }
+                return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Content/IntentFilter.cs b/src/net/Netdroid/Generated/Android/Content/IntentFilter.cs
index 4e6a5a24a..6e6b5d8b0 100644
--- a/src/net/Netdroid/Generated/Android/Content/IntentFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Content/IntentFilter.cs
@@ -184,13 +184,6 @@ public static Android.Content.IntentFilter Create(Java.Lang.String arg0, Java.La
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/IntentFilter.html#getPriority()"/> <see href="https://developer.android.com/reference/android/content/IntentFilter.html#setPriority(int)"/>
-        /// </summary>
-        public int Priority
-        {
-            get { return IExecuteWithSignature<int>("getPriority", "()I"); } set { IExecuteWithSignature("setPriority", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/IntentFilter.html#getDataAuthority(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -354,6 +347,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/IntentFilter.html#getPriority()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPriority()
+        {
+            return IExecuteWithSignature<int>("getPriority", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/IntentFilter.html#match(android.content.ContentResolver,android.content.Intent,boolean,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
@@ -561,6 +562,14 @@ public void AddDataType(Java.Lang.String arg0)
             IExecuteWithSignature("addDataType", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/IntentFilter.html#setPriority(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPriority(int arg0)
+        {
+            IExecuteWithSignature("setPriority", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/IntentFilter.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -665,18 +674,12 @@ public AuthorityEntry(Java.Lang.String arg0, Java.Lang.String arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/IntentFilter.AuthorityEntry.html#getHost()"/> 
-            /// </summary>
-            public Java.Lang.String Host
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/IntentFilter.AuthorityEntry.html#getPort()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/IntentFilter.AuthorityEntry.html#getPort()"/>
             /// </summary>
-            public int Port
+            /// <returns><see cref="int"/></returns>
+            public int GetPort()
             {
-                get { return IExecuteWithSignature<int>("getPort", "()I"); }
+                return IExecuteWithSignature<int>("getPort", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/IntentFilter.AuthorityEntry.html#match(android.net.Uri)"/>
@@ -687,6 +690,14 @@ public int Match(Android.Net.Uri arg0)
             {
                 return IExecuteWithSignature<int>("match", "(Landroid/net/Uri;)I", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/IntentFilter.AuthorityEntry.html#getHost()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetHost()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Content/IntentSender.cs b/src/net/Netdroid/Generated/Android/Content/IntentSender.cs
index 6fd29264b..6e0926a10 100644
--- a/src/net/Netdroid/Generated/Android/Content/IntentSender.cs
+++ b/src/net/Netdroid/Generated/Android/Content/IntentSender.cs
@@ -70,41 +70,45 @@ public static void WriteIntentSenderOrNullToParcel(Android.Content.IntentSender
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#getCreatorPackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#getCreatorUserHandle()"/>
         /// </summary>
-        public Java.Lang.String CreatorPackage
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetCreatorUserHandle()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCreatorPackage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.UserHandle>("getCreatorUserHandle", "()Landroid/os/UserHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#getCreatorUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#describeContents()"/>
         /// </summary>
-        public int CreatorUid
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCreatorUid", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#getCreatorUserHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#getCreatorUid()"/>
         /// </summary>
-        public Android.Os.UserHandle CreatorUserHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetCreatorUid()
         {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getCreatorUserHandle", "()Landroid/os/UserHandle;"); }
+            return IExecuteWithSignature<int>("getCreatorUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#getTargetPackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#getCreatorPackage()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String TargetPackage
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCreatorPackage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTargetPackage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCreatorPackage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#getTargetPackage()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetTargetPackage()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getTargetPackage", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/IntentSender.html#sendIntent(android.content.Context,int,android.content.Intent,android.content.IntentSender.OnFinished,android.os.Handler,java.lang.String)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Loader.cs b/src/net/Netdroid/Generated/Android/Content/Loader.cs
index 6eb9b2765..3b94a2341 100644
--- a/src/net/Netdroid/Generated/Android/Content/Loader.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Loader.cs
@@ -33,7 +33,7 @@ public partial class Loader
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Loader(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -55,26 +55,19 @@ public Loader(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Loader.html#getContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/Loader.html#getContext()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Context Context
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Context GetContext()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Loader.html#getId()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Id
-        {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#cancelLoad()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool CancelLoad()
         {
             return IExecuteWithSignature<bool>("cancelLoad", "()Z");
@@ -83,7 +76,7 @@ public bool CancelLoad()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#isAbandoned()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAbandoned()
         {
             return IExecuteWithSignature<bool>("isAbandoned", "()Z");
@@ -92,7 +85,7 @@ public bool IsAbandoned()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#isReset()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsReset()
         {
             return IExecuteWithSignature<bool>("isReset", "()Z");
@@ -101,7 +94,7 @@ public bool IsReset()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#isStarted()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsStarted()
         {
             return IExecuteWithSignature<bool>("isStarted", "()Z");
@@ -110,7 +103,7 @@ public bool IsStarted()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#takeContentChanged()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool TakeContentChanged()
         {
             return IExecuteWithSignature<bool>("takeContentChanged", "()Z");
@@ -118,17 +111,26 @@ public bool TakeContentChanged()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#startLoading()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartLoading()
         {
             IExecuteWithSignature("startLoading", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Loader.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetId()
+        {
+            return IExecuteWithSignature<int>("getId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#dataToString(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String DataToString(object arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("dataToString", "(Ljava/lang/Object;)Ljava/lang/String;", arg0);
@@ -136,7 +138,7 @@ public Java.Lang.String DataToString(object arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#abandon()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Abandon()
         {
             IExecuteWithSignature("abandon", "()V");
@@ -144,7 +146,7 @@ public void Abandon()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#commitContentChanged()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CommitContentChanged()
         {
             IExecuteWithSignature("commitContentChanged", "()V");
@@ -152,7 +154,7 @@ public void CommitContentChanged()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#deliverCancellation()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DeliverCancellation()
         {
             IExecuteWithSignature("deliverCancellation", "()V");
@@ -161,7 +163,7 @@ public void DeliverCancellation()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#deliverResult(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DeliverResult(object arg0)
         {
             IExecuteWithSignature("deliverResult", "(Ljava/lang/Object;)V", arg0);
@@ -173,7 +175,7 @@ public void DeliverResult(object arg0)
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg2"><see cref="Java.Io.PrintWriter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.PrintWriter arg2, Java.Lang.String[] arg3)
         {
             IExecute("dump", arg0, arg1, arg2, arg3);
@@ -181,7 +183,7 @@ public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.Pri
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#forceLoad()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForceLoad()
         {
             IExecuteWithSignature("forceLoad", "()V");
@@ -189,7 +191,7 @@ public void ForceLoad()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#onContentChanged()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnContentChanged()
         {
             IExecuteWithSignature("onContentChanged", "()V");
@@ -199,7 +201,7 @@ public void OnContentChanged()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Content.Loader.OnLoadCompleteListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterListener(int arg0, Android.Content.Loader.OnLoadCompleteListener arg1)
         {
             IExecute("registerListener", arg0, arg1);
@@ -208,7 +210,7 @@ public void RegisterListener(int arg0, Android.Content.Loader.OnLoadCompleteList
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#registerOnLoadCanceledListener(android.content.Loader.OnLoadCanceledListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Loader.OnLoadCanceledListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterOnLoadCanceledListener(Android.Content.Loader.OnLoadCanceledListener arg0)
         {
             IExecuteWithSignature("registerOnLoadCanceledListener", "(Landroid/content/Loader$OnLoadCanceledListener;)V", arg0);
@@ -216,7 +218,7 @@ public void RegisterOnLoadCanceledListener(Android.Content.Loader.OnLoadCanceled
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#reset()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
@@ -224,7 +226,7 @@ public void Reset()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#rollbackContentChanged()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RollbackContentChanged()
         {
             IExecuteWithSignature("rollbackContentChanged", "()V");
@@ -232,7 +234,7 @@ public void RollbackContentChanged()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#stopLoading()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopLoading()
         {
             IExecuteWithSignature("stopLoading", "()V");
@@ -241,7 +243,7 @@ public void StopLoading()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#unregisterListener(android.content.Loader.OnLoadCompleteListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Loader.OnLoadCompleteListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterListener(Android.Content.Loader.OnLoadCompleteListener arg0)
         {
             IExecuteWithSignature("unregisterListener", "(Landroid/content/Loader$OnLoadCompleteListener;)V", arg0);
@@ -250,7 +252,7 @@ public void UnregisterListener(Android.Content.Loader.OnLoadCompleteListener arg
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#unregisterOnLoadCanceledListener(android.content.Loader.OnLoadCanceledListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Loader.OnLoadCanceledListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterOnLoadCanceledListener(Android.Content.Loader.OnLoadCanceledListener arg0)
         {
             IExecuteWithSignature("unregisterOnLoadCanceledListener", "(Landroid/content/Loader$OnLoadCanceledListener;)V", arg0);
@@ -267,7 +269,7 @@ public partial class ForceLoadContentObserver
             /// <see href="https://developer.android.com/reference/android/content/Loader.ForceLoadContentObserver.html#%3Cinit%3E(android.content.Loader)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public ForceLoadContentObserver(Android.Content.Loader arg0)
                 : base(arg0)
             {
@@ -324,7 +326,7 @@ public partial class OnLoadCanceledListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onLoadCanceled", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Loader>>>(OnLoadCanceledEventHandler));
+                AddEventHandler("onLoadCanceled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Loader>>>(OnLoadCanceledEventHandler));
 
             }
 
@@ -332,7 +334,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCanceledListener.html#onLoadCanceled(android.content.Loader)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLoadCanceled"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.Loader> OnOnLoadCanceled { get; set; } = null;
+            public global::System.Action<Android.Content.Loader> OnOnLoadCanceled { get; set; } = null;
 
             void OnLoadCanceledEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Loader>> data)
             {
@@ -344,7 +346,7 @@ void OnLoadCanceledEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCanceledListener.html#onLoadCanceled(android.content.Loader)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnLoadCanceled(Android.Content.Loader arg0)
             {
                 
@@ -384,7 +386,7 @@ public partial class OnLoadCanceledListenerDirect
             /// <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCanceledListener.html#onLoadCanceled(android.content.Loader)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnLoadCanceled(Android.Content.Loader arg0)
             {
                 IExecuteWithSignature("onLoadCanceled", "(Landroid/content/Loader;)V", arg0);
@@ -425,7 +427,7 @@ public partial class OnLoadCanceledListener<D>
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onLoadCanceled", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Loader<D>>>>(OnLoadCanceledEventHandler));
+                AddEventHandler("onLoadCanceled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Loader<D>>>>(OnLoadCanceledEventHandler));
 
             }
 
@@ -433,7 +435,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCanceledListener.html#onLoadCanceled(android.content.Loader)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLoadCanceled"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.Loader<D>> OnOnLoadCanceled { get; set; } = null;
+            public global::System.Action<Android.Content.Loader<D>> OnOnLoadCanceled { get; set; } = null;
 
             void OnLoadCanceledEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Loader<D>>> data)
             {
@@ -445,7 +447,7 @@ void OnLoadCanceledEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCanceledListener.html#onLoadCanceled(android.content.Loader)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnLoadCanceled(Android.Content.Loader<D> arg0)
             {
                 
@@ -485,7 +487,7 @@ public partial class OnLoadCanceledListenerDirect<D>
             /// <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCanceledListener.html#onLoadCanceled(android.content.Loader)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnLoadCanceled(Android.Content.Loader<D> arg0)
             {
                 IExecuteWithSignature("onLoadCanceled", "(Landroid/content/Loader;)V", arg0);
@@ -526,7 +528,7 @@ public partial class OnLoadCompleteListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onLoadComplete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Loader>>>(OnLoadCompleteEventHandler));
+                AddEventHandler("onLoadComplete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Loader>>>(OnLoadCompleteEventHandler));
 
             }
 
@@ -534,7 +536,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCompleteListener.html#onLoadComplete(android.content.Loader,java.lang.Object)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLoadComplete"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.Loader, object> OnOnLoadComplete { get; set; } = null;
+            public global::System.Action<Android.Content.Loader, object> OnOnLoadComplete { get; set; } = null;
 
             void OnLoadCompleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Loader>> data)
             {
@@ -547,7 +549,7 @@ void OnLoadCompleteEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
             /// <param name="arg1"><see cref="object"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnLoadComplete(Android.Content.Loader arg0, object arg1)
             {
                 
@@ -588,7 +590,7 @@ public partial class OnLoadCompleteListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
             /// <param name="arg1"><see cref="object"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnLoadComplete(Android.Content.Loader arg0, object arg1)
             {
                 IExecute("onLoadComplete", arg0, arg1);
@@ -629,7 +631,7 @@ public partial class OnLoadCompleteListener<D>
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onLoadComplete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Loader<D>>>>(OnLoadCompleteEventHandler));
+                AddEventHandler("onLoadComplete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Loader<D>>>>(OnLoadCompleteEventHandler));
 
             }
 
@@ -637,7 +639,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/Loader.OnLoadCompleteListener.html#onLoadComplete(android.content.Loader,java.lang.Object)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLoadComplete"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.Loader<D>, D> OnOnLoadComplete { get; set; } = null;
+            public global::System.Action<Android.Content.Loader<D>, D> OnOnLoadComplete { get; set; } = null;
 
             void OnLoadCompleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Loader<D>>> data)
             {
@@ -650,7 +652,7 @@ void OnLoadCompleteEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
             /// <param name="arg1"><typeparamref name="D"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnLoadComplete(Android.Content.Loader<D> arg0, D arg1)
             {
                 
@@ -691,7 +693,7 @@ public partial class OnLoadCompleteListenerDirect<D>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Loader"/></param>
             /// <param name="arg1"><typeparamref name="D"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnLoadComplete(Android.Content.Loader<D> arg0, D arg1)
             {
                 IExecute("onLoadComplete", arg0, arg1);
@@ -722,7 +724,7 @@ public partial class Loader<D>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Loader(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -748,26 +750,19 @@ public Loader(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Loader.html#getContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/Loader.html#getContext()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Context Context
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Context GetContext()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/Loader.html#getId()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Id
-        {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#cancelLoad()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool CancelLoad()
         {
             return IExecuteWithSignature<bool>("cancelLoad", "()Z");
@@ -776,7 +771,7 @@ public bool CancelLoad()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#isAbandoned()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAbandoned()
         {
             return IExecuteWithSignature<bool>("isAbandoned", "()Z");
@@ -785,7 +780,7 @@ public bool IsAbandoned()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#isReset()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsReset()
         {
             return IExecuteWithSignature<bool>("isReset", "()Z");
@@ -794,7 +789,7 @@ public bool IsReset()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#isStarted()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsStarted()
         {
             return IExecuteWithSignature<bool>("isStarted", "()Z");
@@ -803,7 +798,7 @@ public bool IsStarted()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#takeContentChanged()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool TakeContentChanged()
         {
             return IExecuteWithSignature<bool>("takeContentChanged", "()Z");
@@ -811,17 +806,26 @@ public bool TakeContentChanged()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#startLoading()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartLoading()
         {
             IExecuteWithSignature("startLoading", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/Loader.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetId()
+        {
+            return IExecuteWithSignature<int>("getId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#dataToString(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="D"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String DataToString(D arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("dataToString", "(Ljava/lang/Object;)Ljava/lang/String;", arg0);
@@ -829,7 +833,7 @@ public Java.Lang.String DataToString(D arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#abandon()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Abandon()
         {
             IExecuteWithSignature("abandon", "()V");
@@ -837,7 +841,7 @@ public void Abandon()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#commitContentChanged()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CommitContentChanged()
         {
             IExecuteWithSignature("commitContentChanged", "()V");
@@ -845,7 +849,7 @@ public void CommitContentChanged()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#deliverCancellation()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DeliverCancellation()
         {
             IExecuteWithSignature("deliverCancellation", "()V");
@@ -854,7 +858,7 @@ public void DeliverCancellation()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#deliverResult(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="D"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DeliverResult(D arg0)
         {
             IExecuteWithSignature("deliverResult", "(Ljava/lang/Object;)V", arg0);
@@ -866,7 +870,7 @@ public void DeliverResult(D arg0)
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg2"><see cref="Java.Io.PrintWriter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.PrintWriter arg2, Java.Lang.String[] arg3)
         {
             IExecute("dump", arg0, arg1, arg2, arg3);
@@ -874,7 +878,7 @@ public void Dump(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Io.Pri
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#forceLoad()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForceLoad()
         {
             IExecuteWithSignature("forceLoad", "()V");
@@ -882,7 +886,7 @@ public void ForceLoad()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#onContentChanged()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnContentChanged()
         {
             IExecuteWithSignature("onContentChanged", "()V");
@@ -892,7 +896,7 @@ public void OnContentChanged()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Content.Loader.OnLoadCompleteListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterListener(int arg0, Android.Content.Loader.OnLoadCompleteListener<D> arg1)
         {
             IExecute("registerListener", arg0, arg1);
@@ -901,7 +905,7 @@ public void RegisterListener(int arg0, Android.Content.Loader.OnLoadCompleteList
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#registerOnLoadCanceledListener(android.content.Loader.OnLoadCanceledListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Loader.OnLoadCanceledListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterOnLoadCanceledListener(Android.Content.Loader.OnLoadCanceledListener<D> arg0)
         {
             IExecuteWithSignature("registerOnLoadCanceledListener", "(Landroid/content/Loader$OnLoadCanceledListener;)V", arg0);
@@ -909,7 +913,7 @@ public void RegisterOnLoadCanceledListener(Android.Content.Loader.OnLoadCanceled
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#reset()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
@@ -917,7 +921,7 @@ public void Reset()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#rollbackContentChanged()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RollbackContentChanged()
         {
             IExecuteWithSignature("rollbackContentChanged", "()V");
@@ -925,7 +929,7 @@ public void RollbackContentChanged()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#stopLoading()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopLoading()
         {
             IExecuteWithSignature("stopLoading", "()V");
@@ -934,7 +938,7 @@ public void StopLoading()
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#unregisterListener(android.content.Loader.OnLoadCompleteListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Loader.OnLoadCompleteListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterListener(Android.Content.Loader.OnLoadCompleteListener<D> arg0)
         {
             IExecuteWithSignature("unregisterListener", "(Landroid/content/Loader$OnLoadCompleteListener;)V", arg0);
@@ -943,7 +947,7 @@ public void UnregisterListener(Android.Content.Loader.OnLoadCompleteListener<D>
         /// <see href="https://developer.android.com/reference/android/content/Loader.html#unregisterOnLoadCanceledListener(android.content.Loader.OnLoadCanceledListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Loader.OnLoadCanceledListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterOnLoadCanceledListener(Android.Content.Loader.OnLoadCanceledListener<D> arg0)
         {
             IExecuteWithSignature("unregisterOnLoadCanceledListener", "(Landroid/content/Loader$OnLoadCanceledListener;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Content/LocusId.cs b/src/net/Netdroid/Generated/Android/Content/LocusId.cs
index 693942440..ca7c6ca67 100644
--- a/src/net/Netdroid/Generated/Android/Content/LocusId.cs
+++ b/src/net/Netdroid/Generated/Android/Content/LocusId.cs
@@ -60,13 +60,6 @@ public LocusId(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/LocusId.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/LocusId.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/LocusId.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/LocusId.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Om/FabricatedOverlay.cs b/src/net/Netdroid/Generated/Android/Content/Om/FabricatedOverlay.cs
index a05ac8cb4..db7f384d2 100644
--- a/src/net/Netdroid/Generated/Android/Content/Om/FabricatedOverlay.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Om/FabricatedOverlay.cs
@@ -55,11 +55,12 @@ public FabricatedOverlay(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/om/FabricatedOverlay.html#getIdentifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/om/FabricatedOverlay.html#getIdentifier()"/>
         /// </summary>
-        public Android.Content.Om.OverlayIdentifier Identifier
+        /// <returns><see cref="Android.Content.Om.OverlayIdentifier"/></returns>
+        public Android.Content.Om.OverlayIdentifier GetIdentifier()
         {
-            get { return IExecuteWithSignature<Android.Content.Om.OverlayIdentifier>("getIdentifier", "()Landroid/content/om/OverlayIdentifier;"); }
+            return IExecuteWithSignature<Android.Content.Om.OverlayIdentifier>("getIdentifier", "()Landroid/content/om/OverlayIdentifier;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/om/FabricatedOverlay.html#setResourceValue(java.lang.String,android.os.ParcelFileDescriptor,java.lang.String)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Om/OverlayInfo.cs b/src/net/Netdroid/Generated/Android/Content/Om/OverlayInfo.cs
index df182f2df..ba1e95336 100644
--- a/src/net/Netdroid/Generated/Android/Content/Om/OverlayInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Om/OverlayInfo.cs
@@ -52,40 +52,44 @@ public partial class OverlayInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#getOverlayIdentifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#getOverlayIdentifier()"/>
         /// </summary>
-        public Android.Content.Om.OverlayIdentifier OverlayIdentifier
+        /// <returns><see cref="Android.Content.Om.OverlayIdentifier"/></returns>
+        public Android.Content.Om.OverlayIdentifier GetOverlayIdentifier()
         {
-            get { return IExecuteWithSignature<Android.Content.Om.OverlayIdentifier>("getOverlayIdentifier", "()Landroid/content/om/OverlayIdentifier;"); }
+            return IExecuteWithSignature<Android.Content.Om.OverlayIdentifier>("getOverlayIdentifier", "()Landroid/content/om/OverlayIdentifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#getOverlayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String OverlayName
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOverlayName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#getTargetOverlayableName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#getOverlayName()"/>
         /// </summary>
-        public Java.Lang.String TargetOverlayableName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOverlayName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTargetOverlayableName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getOverlayName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#getTargetPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#getTargetOverlayableName()"/>
         /// </summary>
-        public Java.Lang.String TargetPackageName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTargetOverlayableName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTargetPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTargetOverlayableName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#getTargetPackageName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTargetPackageName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getTargetPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/om/OverlayInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ActivityInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ActivityInfo.cs
index 8bba7c750..4db2556c8 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ActivityInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ActivityInfo.cs
@@ -540,18 +540,12 @@ public ActivityInfo(Android.Content.Pm.ActivityInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ActivityInfo.html#getKnownActivityEmbeddingCerts()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ActivityInfo.html#getThemeResource()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> KnownActivityEmbeddingCerts
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKnownActivityEmbeddingCerts", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ActivityInfo.html#getThemeResource()"/> 
-        /// </summary>
-        public int ThemeResource
+        /// <returns><see cref="int"/></returns>
+        public int GetThemeResource()
         {
-            get { return IExecuteWithSignature<int>("getThemeResource", "()I"); }
+            return IExecuteWithSignature<int>("getThemeResource", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ActivityInfo.html#describeContents()"/>
@@ -562,6 +556,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ActivityInfo.html#getKnownActivityEmbeddingCerts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetKnownActivityEmbeddingCerts()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKnownActivityEmbeddingCerts", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ActivityInfo.html#dump(android.util.Printer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.Printer"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Content/Pm/AllPackageClasses.cs
index 418653178..ccb699d85 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/AllPackageClasses.cs
@@ -1000,12 +1000,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1530,12 +1530,12 @@ public partial class SessionCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<S
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SessionCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SessionCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1756,12 +1756,12 @@ public partial class PackageManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PackageManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PackageManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PackageManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PackageManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PackageManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PackageManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1948,10 +1948,13 @@ public partial class OnChecksumsReadyListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnChecksumsReadyListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.content.pm.PackageManager_OnChecksumsReadyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.content.pm.OnChecksumsReadyListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1973,10 +1976,13 @@ public partial class OnChecksumsReadyListenerDirect : OnChecksumsReadyListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.content.pm.PackageManager$OnChecksumsReadyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.content.pm.PackageManager$OnChecksumsReadyListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2136,7 +2142,7 @@ public ResolveInfoFlags(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class PackageStats : Android.Os.Parcelable
     {
         const string _bridgeClassName = "android.content.pm.PackageStats";
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ApkChecksum.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ApkChecksum.cs
index d1a7a0d98..06a2b8431 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ApkChecksum.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ApkChecksum.cs
@@ -52,47 +52,53 @@ public partial class ApkChecksum
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getInstallerCertificate()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getValue()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate InstallerCertificate
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetValue()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.Certificate>("getInstallerCertificate", "()Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignatureArray<byte>("getValue", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getInstallerPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String InstallerPackageName
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInstallerPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getSplitName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getType()"/>
         /// </summary>
-        public Java.Lang.String SplitName
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSplitName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getInstallerPackageName()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInstallerPackageName()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInstallerPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getSplitName()"/>
         /// </summary>
-        public byte[] Value
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSplitName()
         {
-            get { return IExecuteWithSignatureArray<byte>("getValue", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSplitName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#getInstallerCertificate()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        /// <exception cref="Java.Security.Cert.CertificateException"/>
+        public Java.Security.Cert.Certificate GetInstallerCertificate()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Security.Cert.Certificate>("getInstallerCertificate", "()Ljava/security/cert/Certificate;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ApkChecksum.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ApplicationInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ApplicationInfo.cs
index 17981c02a..77d727490 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ApplicationInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ApplicationInfo.cs
@@ -314,7 +314,7 @@ public ApplicationInfo(Android.Content.Pm.ApplicationInfo arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#FLAG_IS_GAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_IS_GAME { get { if (!_FLAG_IS_GAMEReady) { _FLAG_IS_GAMEContent = SGetField<int>(LocalBridgeClazz, "FLAG_IS_GAME"); _FLAG_IS_GAMEReady = true; } return _FLAG_IS_GAMEContent; } }
         private static int _FLAG_IS_GAMEContent = default;
         private static bool _FLAG_IS_GAMEReady = false; // this is used because in case of generics 
@@ -381,7 +381,7 @@ public ApplicationInfo(Android.Content.Pm.ApplicationInfo arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#FLAG_SUPPORTS_SCREEN_DENSITIES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_SUPPORTS_SCREEN_DENSITIES { get { if (!_FLAG_SUPPORTS_SCREEN_DENSITIESReady) { _FLAG_SUPPORTS_SCREEN_DENSITIESContent = SGetField<int>(LocalBridgeClazz, "FLAG_SUPPORTS_SCREEN_DENSITIES"); _FLAG_SUPPORTS_SCREEN_DENSITIESReady = true; } return _FLAG_SUPPORTS_SCREEN_DENSITIESContent; } }
         private static int _FLAG_SUPPORTS_SCREEN_DENSITIESContent = default;
         private static bool _FLAG_SUPPORTS_SCREEN_DENSITIESReady = false; // this is used because in case of generics 
@@ -530,41 +530,6 @@ public static Java.Lang.CharSequence GetCategoryTitle(Android.Content.Context ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getGwpAsanMode()"/> 
-        /// </summary>
-        public int GwpAsanMode
-        {
-            get { return IExecuteWithSignature<int>("getGwpAsanMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getKnownActivityEmbeddingCerts()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> KnownActivityEmbeddingCerts
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKnownActivityEmbeddingCerts", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getMemtagMode()"/> 
-        /// </summary>
-        public int MemtagMode
-        {
-            get { return IExecuteWithSignature<int>("getMemtagMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getNativeHeapZeroInitialized()"/> 
-        /// </summary>
-        public int NativeHeapZeroInitialized
-        {
-            get { return IExecuteWithSignature<int>("getNativeHeapZeroInitialized", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getRequestRawExternalStorageAccess()"/> 
-        /// </summary>
-        public int RequestRawExternalStorageAccess
-        {
-            get { return IExecuteWithSignature<int>("getRequestRawExternalStorageAccess", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#areAttributionsUserVisible()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -613,6 +578,38 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getGwpAsanMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGwpAsanMode()
+        {
+            return IExecuteWithSignature<int>("getGwpAsanMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getMemtagMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMemtagMode()
+        {
+            return IExecuteWithSignature<int>("getMemtagMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getNativeHeapZeroInitialized()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNativeHeapZeroInitialized()
+        {
+            return IExecuteWithSignature<int>("getNativeHeapZeroInitialized", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getRequestRawExternalStorageAccess()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRequestRawExternalStorageAccess()
+        {
+            return IExecuteWithSignature<int>("getRequestRawExternalStorageAccess", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#loadDescription(android.content.pm.PackageManager)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
@@ -622,6 +619,14 @@ public Java.Lang.CharSequence LoadDescription(Android.Content.Pm.PackageManager
             return IExecuteWithSignature<Java.Lang.CharSequence>("loadDescription", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#getKnownActivityEmbeddingCerts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetKnownActivityEmbeddingCerts()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKnownActivityEmbeddingCerts", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ApplicationInfo.html#dump(android.util.Printer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.Printer"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/Attribution.cs b/src/net/Netdroid/Generated/Android/Content/Pm/Attribution.cs
index f0f0c512c..f2df2d3b6 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/Attribution.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/Attribution.cs
@@ -52,26 +52,28 @@ public partial class Attribution
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/Attribution.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/Attribution.html#describeContents()"/>
         /// </summary>
-        public int Label
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getLabel", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/Attribution.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/Attribution.html#getLabel()"/>
         /// </summary>
-        public Java.Lang.String Tag
+        /// <returns><see cref="int"/></returns>
+        public int GetLabel()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getLabel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/Attribution.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/Attribution.html#getTag()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTag()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/Attribution.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/Capability.cs b/src/net/Netdroid/Generated/Android/Content/Pm/Capability.cs
index a4d82ad76..83aef0293 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/Capability.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/Capability.cs
@@ -52,13 +52,6 @@ public partial class Capability
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/Capability.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/Capability.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -67,6 +60,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/Capability.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/Capability.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/CapabilityParams.cs b/src/net/Netdroid/Generated/Android/Content/Pm/CapabilityParams.cs
index 79d0cd9ae..ff29fa127 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/CapabilityParams.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/CapabilityParams.cs
@@ -52,33 +52,36 @@ public partial class CapabilityParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#getAliases()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> Aliases
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAliases", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#getValue()"/>
         /// </summary>
-        public Java.Lang.String Value
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetValue()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#getAliases()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetAliases()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAliases", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/CapabilityParams.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ChangedPackages.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ChangedPackages.cs
index e6c785bb2..974364928 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ChangedPackages.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ChangedPackages.cs
@@ -61,26 +61,28 @@ public ChangedPackages(int arg0, Java.Util.List<Java.Lang.String> arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ChangedPackages.html#getPackageNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ChangedPackages.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> PackageNames
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPackageNames", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ChangedPackages.html#getSequenceNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ChangedPackages.html#getSequenceNumber()"/>
         /// </summary>
-        public int SequenceNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetSequenceNumber()
         {
-            get { return IExecuteWithSignature<int>("getSequenceNumber", "()I"); }
+            return IExecuteWithSignature<int>("getSequenceNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ChangedPackages.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ChangedPackages.html#getPackageNames()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetPackageNames()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPackageNames", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ChangedPackages.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/Checksum.cs b/src/net/Netdroid/Generated/Android/Content/Pm/Checksum.cs
index bd2e8bd48..a45eaa2dc 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/Checksum.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/Checksum.cs
@@ -67,7 +67,7 @@ public Checksum(int arg0, byte[] arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#TYPE_WHOLE_MD5"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_WHOLE_MD5 { get { if (!_TYPE_WHOLE_MD5Ready) { _TYPE_WHOLE_MD5Content = SGetField<int>(LocalBridgeClazz, "TYPE_WHOLE_MD5"); _TYPE_WHOLE_MD5Ready = true; } return _TYPE_WHOLE_MD5Content; } }
         private static int _TYPE_WHOLE_MD5Content = default;
         private static bool _TYPE_WHOLE_MD5Ready = false; // this is used because in case of generics 
@@ -80,21 +80,21 @@ public Checksum(int arg0, byte[] arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#TYPE_WHOLE_SHA1"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_WHOLE_SHA1 { get { if (!_TYPE_WHOLE_SHA1Ready) { _TYPE_WHOLE_SHA1Content = SGetField<int>(LocalBridgeClazz, "TYPE_WHOLE_SHA1"); _TYPE_WHOLE_SHA1Ready = true; } return _TYPE_WHOLE_SHA1Content; } }
         private static int _TYPE_WHOLE_SHA1Content = default;
         private static bool _TYPE_WHOLE_SHA1Ready = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#TYPE_WHOLE_SHA256"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_WHOLE_SHA256 { get { if (!_TYPE_WHOLE_SHA256Ready) { _TYPE_WHOLE_SHA256Content = SGetField<int>(LocalBridgeClazz, "TYPE_WHOLE_SHA256"); _TYPE_WHOLE_SHA256Ready = true; } return _TYPE_WHOLE_SHA256Content; } }
         private static int _TYPE_WHOLE_SHA256Content = default;
         private static bool _TYPE_WHOLE_SHA256Ready = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#TYPE_WHOLE_SHA512"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_WHOLE_SHA512 { get { if (!_TYPE_WHOLE_SHA512Ready) { _TYPE_WHOLE_SHA512Content = SGetField<int>(LocalBridgeClazz, "TYPE_WHOLE_SHA512"); _TYPE_WHOLE_SHA512Ready = true; } return _TYPE_WHOLE_SHA512Content; } }
         private static int _TYPE_WHOLE_SHA512Content = default;
         private static bool _TYPE_WHOLE_SHA512Ready = false; // this is used because in case of generics 
@@ -107,26 +107,28 @@ public Checksum(int arg0, byte[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#getValue()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetValue()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getValue", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#describeContents()"/>
         /// </summary>
-        public byte[] Value
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<byte>("getValue", "()[B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#getType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/Checksum.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ComponentInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ComponentInfo.cs
index a002a0cc6..7e8eb9ec0 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ComponentInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ComponentInfo.cs
@@ -86,33 +86,36 @@ public ComponentInfo(Android.Content.Pm.ComponentInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ComponentInfo.html#getBannerResource()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ComponentInfo.html#isEnabled()"/>
         /// </summary>
-        public int BannerResource
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEnabled()
         {
-            get { return IExecuteWithSignature<int>("getBannerResource", "()I"); }
+            return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ComponentInfo.html#getIconResource()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ComponentInfo.html#getBannerResource()"/>
         /// </summary>
-        public int IconResource
+        /// <returns><see cref="int"/></returns>
+        public int GetBannerResource()
         {
-            get { return IExecuteWithSignature<int>("getIconResource", "()I"); }
+            return IExecuteWithSignature<int>("getBannerResource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ComponentInfo.html#getLogoResource()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ComponentInfo.html#getIconResource()"/>
         /// </summary>
-        public int LogoResource
+        /// <returns><see cref="int"/></returns>
+        public int GetIconResource()
         {
-            get { return IExecuteWithSignature<int>("getLogoResource", "()I"); }
+            return IExecuteWithSignature<int>("getIconResource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ComponentInfo.html#isEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ComponentInfo.html#getLogoResource()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetLogoResource()
         {
-            return IExecuteWithSignature<bool>("isEnabled", "()Z");
+            return IExecuteWithSignature<int>("getLogoResource", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ConfigurationInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ConfigurationInfo.cs
index 73bab3e69..d3fc3af6e 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ConfigurationInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ConfigurationInfo.cs
@@ -98,13 +98,6 @@ public ConfigurationInfo(Android.Content.Pm.ConfigurationInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ConfigurationInfo.html#getGlEsVersion()"/> 
-        /// </summary>
-        public Java.Lang.String GlEsVersion
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGlEsVersion", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ConfigurationInfo.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -113,6 +106,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ConfigurationInfo.html#getGlEsVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGlEsVersion()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGlEsVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ConfigurationInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/CrossProfileApps.cs b/src/net/Netdroid/Generated/Android/Content/Pm/CrossProfileApps.cs
index 195eac78d..109e2c1ab 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/CrossProfileApps.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/CrossProfileApps.cs
@@ -52,13 +52,6 @@ public partial class CrossProfileApps
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/CrossProfileApps.html#getTargetUserProfiles()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Os.UserHandle> TargetUserProfiles
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.UserHandle>>("getTargetUserProfiles", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/CrossProfileApps.html#createRequestInteractAcrossProfilesIntent()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.Intent"/></returns>
@@ -101,6 +94,14 @@ public Java.Lang.CharSequence GetProfileSwitchingLabel(Android.Os.UserHandle arg
             return IExecuteWithSignature<Java.Lang.CharSequence>("getProfileSwitchingLabel", "(Landroid/os/UserHandle;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/CrossProfileApps.html#getTargetUserProfiles()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.UserHandle> GetTargetUserProfiles()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Os.UserHandle>>("getTargetUserProfiles", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/CrossProfileApps.html#startActivity(android.content.Intent,android.os.UserHandle,android.app.Activity,android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/FeatureInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/FeatureInfo.cs
index 8b308ab74..984124037 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/FeatureInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/FeatureInfo.cs
@@ -88,13 +88,6 @@ public FeatureInfo(Android.Content.Pm.FeatureInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/FeatureInfo.html#getGlEsVersion()"/> 
-        /// </summary>
-        public Java.Lang.String GlEsVersion
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGlEsVersion", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/FeatureInfo.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -103,6 +96,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/FeatureInfo.html#getGlEsVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGlEsVersion()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGlEsVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/FeatureInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/InstallSourceInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/InstallSourceInfo.cs
index 7539bffd1..4ccb927ff 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/InstallSourceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/InstallSourceInfo.cs
@@ -52,54 +52,60 @@ public partial class InstallSourceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getInitiatingPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getInitiatingPackageSigningInfo()"/>
         /// </summary>
-        public Java.Lang.String InitiatingPackageName
+        /// <returns><see cref="Android.Content.Pm.SigningInfo"/></returns>
+        public Android.Content.Pm.SigningInfo GetInitiatingPackageSigningInfo()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInitiatingPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.Pm.SigningInfo>("getInitiatingPackageSigningInfo", "()Landroid/content/pm/SigningInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getInitiatingPackageSigningInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#describeContents()"/>
         /// </summary>
-        public Android.Content.Pm.SigningInfo InitiatingPackageSigningInfo
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.SigningInfo>("getInitiatingPackageSigningInfo", "()Landroid/content/pm/SigningInfo;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getInstallingPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getPackageSource()"/>
         /// </summary>
-        public Java.Lang.String InstallingPackageName
+        /// <returns><see cref="int"/></returns>
+        public int GetPackageSource()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInstallingPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPackageSource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getOriginatingPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getInitiatingPackageName()"/>
         /// </summary>
-        public Java.Lang.String OriginatingPackageName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInitiatingPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOriginatingPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInitiatingPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getPackageSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getInstallingPackageName()"/>
         /// </summary>
-        public int PackageSource
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInstallingPackageName()
         {
-            get { return IExecuteWithSignature<int>("getPackageSource", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInstallingPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getUpdateOwnerPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getOriginatingPackageName()"/>
         /// </summary>
-        public Java.Lang.String UpdateOwnerPackageName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOriginatingPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUpdateOwnerPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getOriginatingPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#getUpdateOwnerPackageName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUpdateOwnerPackageName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getUpdateOwnerPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/InstallSourceInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/LabeledIntent.cs b/src/net/Netdroid/Generated/Android/Content/Pm/LabeledIntent.cs
index f59087028..92d8d58d4 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/LabeledIntent.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/LabeledIntent.cs
@@ -94,41 +94,37 @@ public LabeledIntent(Java.Lang.String arg0, Java.Lang.CharSequence arg1, int arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#getIconResource()"/> 
-        /// </summary>
-        public int IconResource
-        {
-            get { return IExecuteWithSignature<int>("getIconResource", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#getLabelResource()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#loadIcon(android.content.pm.PackageManager)"/>
         /// </summary>
-        public int LabelResource
+        /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable LoadIcon(Android.Content.Pm.PackageManager arg0)
         {
-            get { return IExecuteWithSignature<int>("getLabelResource", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("loadIcon", "(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#getNonLocalizedLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#getIconResource()"/>
         /// </summary>
-        public Java.Lang.CharSequence NonLocalizedLabel
+        /// <returns><see cref="int"/></returns>
+        public int GetIconResource()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getNonLocalizedLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getIconResource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#getSourcePackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#getLabelResource()"/>
         /// </summary>
-        public Java.Lang.String SourcePackage
+        /// <returns><see cref="int"/></returns>
+        public int GetLabelResource()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSourcePackage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getLabelResource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#loadIcon(android.content.pm.PackageManager)"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#getNonLocalizedLabel()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
-        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
-        public Android.Graphics.Drawable.Drawable LoadIcon(Android.Content.Pm.PackageManager arg0)
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetNonLocalizedLabel()
         {
-            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("loadIcon", "(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;", arg0);
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNonLocalizedLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#loadLabel(android.content.pm.PackageManager)"/>
@@ -139,6 +135,14 @@ public Java.Lang.CharSequence LoadLabel(Android.Content.Pm.PackageManager arg0)
         {
             return IExecuteWithSignature<Java.Lang.CharSequence>("loadLabel", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/LabeledIntent.html#getSourcePackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSourcePackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSourcePackage", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/LauncherActivityInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/LauncherActivityInfo.cs
index e5021f6a7..23640444d 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/LauncherActivityInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/LauncherActivityInfo.cs
@@ -46,78 +46,86 @@ public partial class LauncherActivityInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getActivityInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getComponentName()"/>
         /// </summary>
-        public Android.Content.Pm.ActivityInfo ActivityInfo
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponentName()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.ActivityInfo>("getActivityInfo", "()Landroid/content/pm/ActivityInfo;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getApplicationInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getActivityInfo()"/>
         /// </summary>
-        public Android.Content.Pm.ApplicationInfo ApplicationInfo
+        /// <returns><see cref="Android.Content.Pm.ActivityInfo"/></returns>
+        public Android.Content.Pm.ActivityInfo GetActivityInfo()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.ApplicationInfo>("getApplicationInfo", "()Landroid/content/pm/ApplicationInfo;"); }
+            return IExecuteWithSignature<Android.Content.Pm.ActivityInfo>("getActivityInfo", "()Landroid/content/pm/ActivityInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getComponentName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getApplicationInfo()"/>
         /// </summary>
-        public Android.Content.ComponentName ComponentName
+        /// <returns><see cref="Android.Content.Pm.ApplicationInfo"/></returns>
+        public Android.Content.Pm.ApplicationInfo GetApplicationInfo()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.Pm.ApplicationInfo>("getApplicationInfo", "()Landroid/content/pm/ApplicationInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getFirstInstallTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getBadgedIcon(int)"/>
         /// </summary>
-        public long FirstInstallTime
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetBadgedIcon(int arg0)
         {
-            get { return IExecuteWithSignature<long>("getFirstInstallTime", "()J"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBadgedIcon", "(I)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getIcon(int)"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetIcon(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "(I)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getLoadingProgress()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getUser()"/>
         /// </summary>
-        public float LoadingProgress
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetUser()
         {
-            get { return IExecuteWithSignature<float>("getLoadingProgress", "()F"); }
+            return IExecuteWithSignature<Android.Os.UserHandle>("getUser", "()Landroid/os/UserHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getLoadingProgress()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="float"/></returns>
+        public float GetLoadingProgress()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<float>("getLoadingProgress", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getUser()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getLabel()"/>
         /// </summary>
-        public Android.Os.UserHandle User
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getUser", "()Landroid/os/UserHandle;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getBadgedIcon(int)"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
-        public Android.Graphics.Drawable.Drawable GetBadgedIcon(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBadgedIcon", "(I)Landroid/graphics/drawable/Drawable;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getIcon(int)"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherActivityInfo.html#getFirstInstallTime()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
-        public Android.Graphics.Drawable.Drawable GetIcon(int arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetFirstInstallTime()
         {
-            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "(I)Landroid/graphics/drawable/Drawable;", arg0);
+            return IExecuteWithSignature<long>("getFirstInstallTime", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/LauncherApps.cs b/src/net/Netdroid/Generated/Android/Content/Pm/LauncherApps.cs
index 95fe963d5..23b47ace0 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/LauncherApps.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/LauncherApps.cs
@@ -64,20 +64,6 @@ public partial class LauncherApps
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.html#getAllPackageInstallerSessions()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> AllPackageInstallerSessions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getAllPackageInstallerSessions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.html#getProfiles()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Os.UserHandle> Profiles
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.UserHandle>>("getProfiles", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.html#getShortcutIntent(java.lang.String,java.lang.String,android.os.Bundle,android.os.UserHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -218,6 +204,14 @@ public bool ShouldHideFromSuggestions(Java.Lang.String arg0, Android.Os.UserHand
             return IExecute<Java.Util.List<Android.Content.Pm.LauncherActivityInfo>>("getShortcutConfigActivityList", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.html#getAllPackageInstallerSessions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> GetAllPackageInstallerSessions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getAllPackageInstallerSessions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.html#getShortcuts(android.content.pm.LauncherApps.ShortcutQuery,android.os.UserHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.LauncherApps.ShortcutQuery"/></param>
@@ -228,6 +222,14 @@ public bool ShouldHideFromSuggestions(Java.Lang.String arg0, Android.Os.UserHand
             return IExecute<Java.Util.List<Android.Content.Pm.ShortcutInfo>>("getShortcuts", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.html#getProfiles()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.UserHandle> GetProfiles()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Os.UserHandle>>("getProfiles", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.html#pinShortcuts(java.lang.String,java.util.List,android.os.UserHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -420,7 +422,7 @@ public void OnPackageLoadingProgressChanged(Java.Lang.String arg0, Android.Os.Us
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Android.Os.UserHandle"/></param>
             /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnPackagesSuspended(Java.Lang.String[] arg0, Android.Os.UserHandle arg1, Android.Os.Bundle arg2)
             {
                 IExecute("onPackagesSuspended", arg0, arg1, arg2);
@@ -503,34 +505,29 @@ public partial class PinItemRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#getExtras()"/> 
-            /// </summary>
-            public Android.Os.Bundle Extras
-            {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#getRequestType()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#getAppWidgetProviderInfo(android.content.Context)"/>
             /// </summary>
-            public int RequestType
+            /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+            /// <returns><see cref="Android.Appwidget.AppWidgetProviderInfo"/></returns>
+            public Android.Appwidget.AppWidgetProviderInfo GetAppWidgetProviderInfo(Android.Content.Context arg0)
             {
-                get { return IExecuteWithSignature<int>("getRequestType", "()I"); }
+                return IExecuteWithSignature<Android.Appwidget.AppWidgetProviderInfo>("getAppWidgetProviderInfo", "(Landroid/content/Context;)Landroid/appwidget/AppWidgetProviderInfo;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#getShortcutInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#getShortcutInfo()"/>
             /// </summary>
-            public Android.Content.Pm.ShortcutInfo ShortcutInfo
+            /// <returns><see cref="Android.Content.Pm.ShortcutInfo"/></returns>
+            public Android.Content.Pm.ShortcutInfo GetShortcutInfo()
             {
-                get { return IExecuteWithSignature<Android.Content.Pm.ShortcutInfo>("getShortcutInfo", "()Landroid/content/pm/ShortcutInfo;"); }
+                return IExecuteWithSignature<Android.Content.Pm.ShortcutInfo>("getShortcutInfo", "()Landroid/content/pm/ShortcutInfo;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#getAppWidgetProviderInfo(android.content.Context)"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#getExtras()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-            /// <returns><see cref="Android.Appwidget.AppWidgetProviderInfo"/></returns>
-            public Android.Appwidget.AppWidgetProviderInfo GetAppWidgetProviderInfo(Android.Content.Context arg0)
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                return IExecuteWithSignature<Android.Appwidget.AppWidgetProviderInfo>("getAppWidgetProviderInfo", "(Landroid/content/Context;)Landroid/appwidget/AppWidgetProviderInfo;", arg0);
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#accept()"/>
@@ -566,6 +563,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#getRequestType()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetRequestType()
+            {
+                return IExecuteWithSignature<int>("getRequestType", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/LauncherApps.PinItemRequest.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ModuleInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ModuleInfo.cs
index 16431c53c..f21fa375e 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ModuleInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ModuleInfo.cs
@@ -52,20 +52,6 @@ public partial class ModuleInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ModuleInfo.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ModuleInfo.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ModuleInfo.html#isHidden()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -82,6 +68,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ModuleInfo.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ModuleInfo.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ModuleInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/PackageInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/PackageInfo.cs
index 193390f53..c354f18e3 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/PackageInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/PackageInfo.cs
@@ -84,7 +84,7 @@ public partial class PackageInfo
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#signatures"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Pm.Signature[] signatures { get { return IGetFieldArray<Android.Content.Pm.Signature>("signatures"); } set { ISetField("signatures", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#signingInfo"/>
@@ -109,7 +109,7 @@ public partial class PackageInfo
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#versionCode"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int versionCode { get { return IGetField<int>("versionCode"); } set { ISetField("versionCode", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#gids"/>
@@ -202,13 +202,6 @@ public partial class PackageInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#getLongVersionCode()"/> <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#setLongVersionCode(long)"/>
-        /// </summary>
-        public long LongVersionCode
-        {
-            get { return IExecuteWithSignature<long>("getLongVersionCode", "()J"); } set { IExecuteWithSignature("setLongVersionCode", "(J)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -217,6 +210,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#getLongVersionCode()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetLongVersionCode()
+        {
+            return IExecuteWithSignature<long>("getLongVersionCode", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#setLongVersionCode(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetLongVersionCode(long arg0)
+        {
+            IExecuteWithSignature("setLongVersionCode", "(J)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/PackageInstaller.cs b/src/net/Netdroid/Generated/Android/Content/Pm/PackageInstaller.cs
index ff6a1bc4e..5364a0e2e 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/PackageInstaller.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/PackageInstaller.cs
@@ -214,69 +214,74 @@ public partial class PackageInstaller
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getActiveStagedSession()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#openSession(int)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Pm.PackageInstaller.SessionInfo ActiveStagedSession
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Content.Pm.PackageInstaller.Session"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Android.Content.Pm.PackageInstaller.Session OpenSession(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.PackageInstaller.SessionInfo>("getActiveStagedSession", "()Landroid/content/pm/PackageInstaller$SessionInfo;"); }
+            return IExecuteWithSignature<Android.Content.Pm.PackageInstaller.Session>("openSession", "(I)Landroid/content/pm/PackageInstaller$Session;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getActiveStagedSessions()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getActiveStagedSession()"/>
         /// </summary>
-        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> ActiveStagedSessions
+        /// <returns><see cref="Android.Content.Pm.PackageInstaller.SessionInfo"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Pm.PackageInstaller.SessionInfo GetActiveStagedSession()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getActiveStagedSessions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Content.Pm.PackageInstaller.SessionInfo>("getActiveStagedSession", "()Landroid/content/pm/PackageInstaller$SessionInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getAllSessions()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getSessionInfo(int)"/>
         /// </summary>
-        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> AllSessions
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Content.Pm.PackageInstaller.SessionInfo"/></returns>
+        public Android.Content.Pm.PackageInstaller.SessionInfo GetSessionInfo(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getAllSessions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Content.Pm.PackageInstaller.SessionInfo>("getSessionInfo", "(I)Landroid/content/pm/PackageInstaller$SessionInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getMySessions()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#createSession(android.content.pm.PackageInstaller.SessionParams)"/>
         /// </summary>
-        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> MySessions
+        /// <param name="arg0"><see cref="Android.Content.Pm.PackageInstaller.SessionParams"/></param>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public int CreateSession(Android.Content.Pm.PackageInstaller.SessionParams arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getMySessions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("createSession", "(Landroid/content/pm/PackageInstaller$SessionParams;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getStagedSessions()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getActiveStagedSessions()"/>
         /// </summary>
-        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> StagedSessions
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> GetActiveStagedSessions()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getStagedSessions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getActiveStagedSessions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#openSession(int)"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getAllSessions()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Content.Pm.PackageInstaller.Session"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Android.Content.Pm.PackageInstaller.Session OpenSession(int arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> GetAllSessions()
         {
-            return IExecuteWithSignature<Android.Content.Pm.PackageInstaller.Session>("openSession", "(I)Landroid/content/pm/PackageInstaller$Session;", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getAllSessions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getSessionInfo(int)"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getMySessions()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Content.Pm.PackageInstaller.SessionInfo"/></returns>
-        public Android.Content.Pm.PackageInstaller.SessionInfo GetSessionInfo(int arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> GetMySessions()
         {
-            return IExecuteWithSignature<Android.Content.Pm.PackageInstaller.SessionInfo>("getSessionInfo", "(I)Landroid/content/pm/PackageInstaller$SessionInfo;", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getMySessions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#createSession(android.content.pm.PackageInstaller.SessionParams)"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#getStagedSessions()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Pm.PackageInstaller.SessionParams"/></param>
-        /// <returns><see cref="int"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public int CreateSession(Android.Content.Pm.PackageInstaller.SessionParams arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo> GetStagedSessions()
         {
-            return IExecuteWithSignature<int>("createSession", "(Landroid/content/pm/PackageInstaller$SessionParams;)I", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInstaller.SessionInfo>>("getStagedSessions", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.html#abandonSession(int)"/>
@@ -681,40 +686,44 @@ public partial class PreapprovalDetails
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#getIcon()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#getIcon()"/>
             /// </summary>
-            public Android.Graphics.Bitmap Icon
+            /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+            public Android.Graphics.Bitmap GetIcon()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getIcon", "()Landroid/graphics/Bitmap;"); }
+                return IExecuteWithSignature<Android.Graphics.Bitmap>("getIcon", "()Landroid/graphics/Bitmap;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#getLabel()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#getLocale()"/>
             /// </summary>
-            public Java.Lang.CharSequence Label
+            /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+            public Android.Icu.Util.ULocale GetLocale()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#getLocale()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#describeContents()"/>
             /// </summary>
-            public Android.Icu.Util.ULocale Locale
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#getPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#getLabel()"/>
             /// </summary>
-            public Java.Lang.String PackageName
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetLabel()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#getPackageName()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPackageName()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.PreapprovalDetails.html#writeToParcel(android.os.Parcel,int)"/>
@@ -832,32 +841,12 @@ public partial class Session
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#getAppMetadata()"/> <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#setAppMetadata(android.os.PersistableBundle)"/>
-            /// </summary>
-            public Android.Os.PersistableBundle AppMetadata
-            {
-                get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getAppMetadata", "()Landroid/os/PersistableBundle;"); } set { IExecuteWithSignature("setAppMetadata", "(Landroid/os/PersistableBundle;)V", value); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#getChildSessionIds()"/> 
-            /// </summary>
-            public int[] ChildSessionIds
-            {
-                get { return IExecuteWithSignatureArray<int>("getChildSessionIds", "()[I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#getNames()"/> 
-            /// </summary>
-            public Java.Lang.String[] Names
-            {
-                get { return IExecuteWithSignatureArray<Java.Lang.String>("getNames", "()[Ljava/lang/String;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#getParentSessionId()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#getAppMetadata()"/>
             /// </summary>
-            public int ParentSessionId
+            /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+            public Android.Os.PersistableBundle GetAppMetadata()
             {
-                get { return IExecuteWithSignature<int>("getParentSessionId", "()I"); }
+                return IExecuteWithSignature<Android.Os.PersistableBundle>("getAppMetadata", "()Landroid/os/PersistableBundle;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#isApplicationEnabledSettingPersistent()"/>
@@ -892,6 +881,22 @@ public bool IsStaged()
                 return IExecuteWithSignature<bool>("isStaged", "()Z");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#getParentSessionId()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetParentSessionId()
+            {
+                return IExecuteWithSignature<int>("getParentSessionId", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#getChildSessionIds()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int[] GetChildSessionIds()
+            {
+                return IExecuteWithSignatureArray<int>("getChildSessionIds", "()[I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#openRead(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -914,6 +919,15 @@ public Java.Io.OutputStream OpenWrite(Java.Lang.String arg0, long arg1, long arg
                 return IExecute<Java.Io.OutputStream>("openWrite", arg0, arg1, arg2);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#getNames()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            /// <exception cref="Java.Io.IOException"/>
+            public Java.Lang.String[] GetNames()
+            {
+                return IExecuteWithSignatureArray<Java.Lang.String>("getNames", "()[Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#abandon()"/>
             /// </summary>
             public void Abandon()
@@ -993,13 +1007,22 @@ public void RequestUserPreapproval(Android.Content.Pm.PackageInstaller.Preapprov
                 IExecute("requestUserPreapproval", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#setAppMetadata(android.os.PersistableBundle)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Android.Os.PersistableBundle"/></param>
+            /// <exception cref="Java.Io.IOException"/>
+            public void SetAppMetadata(Android.Os.PersistableBundle arg0)
+            {
+                IExecuteWithSignature("setAppMetadata", "(Landroid/os/PersistableBundle;)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.Session.html#setChecksums(java.lang.String,java.util.List,byte[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Util.List"/></param>
             /// <param name="arg2"><see cref="byte"/></param>
             /// <exception cref="Java.Io.IOException"/>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetChecksums(Java.Lang.String arg0, Java.Util.List<Android.Content.Pm.Checksum> arg1, byte[] arg2)
             {
                 IExecute("setChecksums", arg0, arg1, arg2);
@@ -1163,35 +1186,35 @@ public partial class SessionInfo
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#STAGED_SESSION_ACTIVATION_FAILED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STAGED_SESSION_ACTIVATION_FAILED { get { if (!_STAGED_SESSION_ACTIVATION_FAILEDReady) { _STAGED_SESSION_ACTIVATION_FAILEDContent = SGetField<int>(LocalBridgeClazz, "STAGED_SESSION_ACTIVATION_FAILED"); _STAGED_SESSION_ACTIVATION_FAILEDReady = true; } return _STAGED_SESSION_ACTIVATION_FAILEDContent; } }
             private static int _STAGED_SESSION_ACTIVATION_FAILEDContent = default;
             private static bool _STAGED_SESSION_ACTIVATION_FAILEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#STAGED_SESSION_CONFLICT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STAGED_SESSION_CONFLICT { get { if (!_STAGED_SESSION_CONFLICTReady) { _STAGED_SESSION_CONFLICTContent = SGetField<int>(LocalBridgeClazz, "STAGED_SESSION_CONFLICT"); _STAGED_SESSION_CONFLICTReady = true; } return _STAGED_SESSION_CONFLICTContent; } }
             private static int _STAGED_SESSION_CONFLICTContent = default;
             private static bool _STAGED_SESSION_CONFLICTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#STAGED_SESSION_NO_ERROR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STAGED_SESSION_NO_ERROR { get { if (!_STAGED_SESSION_NO_ERRORReady) { _STAGED_SESSION_NO_ERRORContent = SGetField<int>(LocalBridgeClazz, "STAGED_SESSION_NO_ERROR"); _STAGED_SESSION_NO_ERRORReady = true; } return _STAGED_SESSION_NO_ERRORContent; } }
             private static int _STAGED_SESSION_NO_ERRORContent = default;
             private static bool _STAGED_SESSION_NO_ERRORReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#STAGED_SESSION_UNKNOWN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STAGED_SESSION_UNKNOWN { get { if (!_STAGED_SESSION_UNKNOWNReady) { _STAGED_SESSION_UNKNOWNContent = SGetField<int>(LocalBridgeClazz, "STAGED_SESSION_UNKNOWN"); _STAGED_SESSION_UNKNOWNReady = true; } return _STAGED_SESSION_UNKNOWNContent; } }
             private static int _STAGED_SESSION_UNKNOWNContent = default;
             private static bool _STAGED_SESSION_UNKNOWNReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#STAGED_SESSION_VERIFICATION_FAILED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STAGED_SESSION_VERIFICATION_FAILED { get { if (!_STAGED_SESSION_VERIFICATION_FAILEDReady) { _STAGED_SESSION_VERIFICATION_FAILEDContent = SGetField<int>(LocalBridgeClazz, "STAGED_SESSION_VERIFICATION_FAILED"); _STAGED_SESSION_VERIFICATION_FAILEDReady = true; } return _STAGED_SESSION_VERIFICATION_FAILEDContent; } }
             private static int _STAGED_SESSION_VERIFICATION_FAILEDContent = default;
             private static bool _STAGED_SESSION_VERIFICATION_FAILEDReady = false; // this is used because in case of generics 
@@ -1204,299 +1227,324 @@ public partial class SessionInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getAppIcon()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#createDetailsIntent()"/>
             /// </summary>
-            public Android.Graphics.Bitmap AppIcon
+            /// <returns><see cref="Android.Content.Intent"/></returns>
+            public Android.Content.Intent CreateDetailsIntent()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getAppIcon", "()Landroid/graphics/Bitmap;"); }
+                return IExecuteWithSignature<Android.Content.Intent>("createDetailsIntent", "()Landroid/content/Intent;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getAppLabel()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getAppIcon()"/>
             /// </summary>
-            public Java.Lang.CharSequence AppLabel
+            /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+            public Android.Graphics.Bitmap GetAppIcon()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getAppLabel", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.Graphics.Bitmap>("getAppIcon", "()Landroid/graphics/Bitmap;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getAppPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getOriginatingUri()"/>
             /// </summary>
-            public Java.Lang.String AppPackageName
+            /// <returns><see cref="Android.Net.Uri"/></returns>
+            public Android.Net.Uri GetOriginatingUri()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getAppPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Net.Uri>("getOriginatingUri", "()Landroid/net/Uri;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getChildSessionIds()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getReferrerUri()"/>
             /// </summary>
-            public int[] ChildSessionIds
+            /// <returns><see cref="Android.Net.Uri"/></returns>
+            public Android.Net.Uri GetReferrerUri()
             {
-                get { return IExecuteWithSignatureArray<int>("getChildSessionIds", "()[I"); }
+                return IExecuteWithSignature<Android.Net.Uri>("getReferrerUri", "()Landroid/net/Uri;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getCreatedMillis()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getUser()"/>
             /// </summary>
-            public long CreatedMillis
+            /// <returns><see cref="Android.Os.UserHandle"/></returns>
+            public Android.Os.UserHandle GetUser()
             {
-                get { return IExecuteWithSignature<long>("getCreatedMillis", "()J"); }
+                return IExecuteWithSignature<Android.Os.UserHandle>("getUser", "()Landroid/os/UserHandle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getDontKillApp()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getDontKillApp()"/>
             /// </summary>
-            public bool DontKillApp
+            /// <returns><see cref="bool"/></returns>
+            public bool GetDontKillApp()
             {
-                get { return IExecuteWithSignature<bool>("getDontKillApp", "()Z"); }
+                return IExecuteWithSignature<bool>("getDontKillApp", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallerAttributionTag()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#hasParentSessionId()"/>
             /// </summary>
-            public Java.Lang.String InstallerAttributionTag
+            /// <returns><see cref="bool"/></returns>
+            public bool HasParentSessionId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getInstallerAttributionTag", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("hasParentSessionId", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallerPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isActive()"/>
             /// </summary>
-            public Java.Lang.String InstallerPackageName
+            /// <returns><see cref="bool"/></returns>
+            public bool IsActive()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getInstallerPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isActive", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallerUid()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isApplicationEnabledSettingPersistent()"/>
             /// </summary>
-            public int InstallerUid
+            /// <returns><see cref="bool"/></returns>
+            public bool IsApplicationEnabledSettingPersistent()
             {
-                get { return IExecuteWithSignature<int>("getInstallerUid", "()I"); }
+                return IExecuteWithSignature<bool>("isApplicationEnabledSettingPersistent", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallLocation()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isCommitted()"/>
             /// </summary>
-            public int InstallLocation
+            /// <returns><see cref="bool"/></returns>
+            public bool IsCommitted()
             {
-                get { return IExecuteWithSignature<int>("getInstallLocation", "()I"); }
+                return IExecuteWithSignature<bool>("isCommitted", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallReason()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isMultiPackage()"/>
             /// </summary>
-            public int InstallReason
+            /// <returns><see cref="bool"/></returns>
+            public bool IsMultiPackage()
             {
-                get { return IExecuteWithSignature<int>("getInstallReason", "()I"); }
+                return IExecuteWithSignature<bool>("isMultiPackage", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getMode()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isPreApprovalRequested()"/>
             /// </summary>
-            public int Mode
+            /// <returns><see cref="bool"/></returns>
+            public bool IsPreApprovalRequested()
             {
-                get { return IExecuteWithSignature<int>("getMode", "()I"); }
+                return IExecuteWithSignature<bool>("isPreApprovalRequested", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getOriginatingUid()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isRequestUpdateOwnership()"/>
             /// </summary>
-            public int OriginatingUid
+            /// <returns><see cref="bool"/></returns>
+            public bool IsRequestUpdateOwnership()
             {
-                get { return IExecuteWithSignature<int>("getOriginatingUid", "()I"); }
+                return IExecuteWithSignature<bool>("isRequestUpdateOwnership", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getOriginatingUri()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isSealed()"/>
             /// </summary>
-            public Android.Net.Uri OriginatingUri
+            /// <returns><see cref="bool"/></returns>
+            public bool IsSealed()
             {
-                get { return IExecuteWithSignature<Android.Net.Uri>("getOriginatingUri", "()Landroid/net/Uri;"); }
+                return IExecuteWithSignature<bool>("isSealed", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getPackageSource()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStaged()"/>
             /// </summary>
-            public int PackageSource
+            /// <returns><see cref="bool"/></returns>
+            public bool IsStaged()
             {
-                get { return IExecuteWithSignature<int>("getPackageSource", "()I"); }
+                return IExecuteWithSignature<bool>("isStaged", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getParentSessionId()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStagedSessionActive()"/>
             /// </summary>
-            public int ParentSessionId
+            /// <returns><see cref="bool"/></returns>
+            public bool IsStagedSessionActive()
             {
-                get { return IExecuteWithSignature<int>("getParentSessionId", "()I"); }
+                return IExecuteWithSignature<bool>("isStagedSessionActive", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getProgress()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStagedSessionApplied()"/>
             /// </summary>
-            public float Progress
+            /// <returns><see cref="bool"/></returns>
+            public bool IsStagedSessionApplied()
             {
-                get { return IExecuteWithSignature<float>("getProgress", "()F"); }
+                return IExecuteWithSignature<bool>("isStagedSessionApplied", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getReferrerUri()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStagedSessionFailed()"/>
             /// </summary>
-            public Android.Net.Uri ReferrerUri
+            /// <returns><see cref="bool"/></returns>
+            public bool IsStagedSessionFailed()
             {
-                get { return IExecuteWithSignature<Android.Net.Uri>("getReferrerUri", "()Landroid/net/Uri;"); }
+                return IExecuteWithSignature<bool>("isStagedSessionFailed", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getRequireUserAction()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStagedSessionReady()"/>
             /// </summary>
-            public int RequireUserAction
+            /// <returns><see cref="bool"/></returns>
+            public bool IsStagedSessionReady()
             {
-                get { return IExecuteWithSignature<int>("getRequireUserAction", "()I"); }
+                return IExecuteWithSignature<bool>("isStagedSessionReady", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getSessionId()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getProgress()"/>
             /// </summary>
-            public int SessionId
+            /// <returns><see cref="float"/></returns>
+            public float GetProgress()
             {
-                get { return IExecuteWithSignature<int>("getSessionId", "()I"); }
+                return IExecuteWithSignature<float>("getProgress", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getSize()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#describeContents()"/>
             /// </summary>
-            public long Size
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<long>("getSize", "()J"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getStagedSessionErrorCode()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallerUid()"/>
             /// </summary>
-            public int StagedSessionErrorCode
+            /// <returns><see cref="int"/></returns>
+            public int GetInstallerUid()
             {
-                get { return IExecuteWithSignature<int>("getStagedSessionErrorCode", "()I"); }
+                return IExecuteWithSignature<int>("getInstallerUid", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getStagedSessionErrorMessage()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallLocation()"/>
             /// </summary>
-            public Java.Lang.String StagedSessionErrorMessage
+            /// <returns><see cref="int"/></returns>
+            public int GetInstallLocation()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getStagedSessionErrorMessage", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getInstallLocation", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getUpdatedMillis()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallReason()"/>
             /// </summary>
-            public long UpdatedMillis
+            /// <returns><see cref="int"/></returns>
+            public int GetInstallReason()
             {
-                get { return IExecuteWithSignature<long>("getUpdatedMillis", "()J"); }
+                return IExecuteWithSignature<int>("getInstallReason", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getUser()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getMode()"/>
             /// </summary>
-            public Android.Os.UserHandle User
+            /// <returns><see cref="int"/></returns>
+            public int GetMode()
             {
-                get { return IExecuteWithSignature<Android.Os.UserHandle>("getUser", "()Landroid/os/UserHandle;"); }
+                return IExecuteWithSignature<int>("getMode", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#createDetailsIntent()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getOriginatingUid()"/>
             /// </summary>
-            /// <returns><see cref="Android.Content.Intent"/></returns>
-            public Android.Content.Intent CreateDetailsIntent()
+            /// <returns><see cref="int"/></returns>
+            public int GetOriginatingUid()
             {
-                return IExecuteWithSignature<Android.Content.Intent>("createDetailsIntent", "()Landroid/content/Intent;");
+                return IExecuteWithSignature<int>("getOriginatingUid", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#hasParentSessionId()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getPackageSource()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool HasParentSessionId()
+            /// <returns><see cref="int"/></returns>
+            public int GetPackageSource()
             {
-                return IExecuteWithSignature<bool>("hasParentSessionId", "()Z");
+                return IExecuteWithSignature<int>("getPackageSource", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isActive()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getParentSessionId()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsActive()
+            /// <returns><see cref="int"/></returns>
+            public int GetParentSessionId()
             {
-                return IExecuteWithSignature<bool>("isActive", "()Z");
+                return IExecuteWithSignature<int>("getParentSessionId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isApplicationEnabledSettingPersistent()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getRequireUserAction()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsApplicationEnabledSettingPersistent()
+            /// <returns><see cref="int"/></returns>
+            public int GetRequireUserAction()
             {
-                return IExecuteWithSignature<bool>("isApplicationEnabledSettingPersistent", "()Z");
+                return IExecuteWithSignature<int>("getRequireUserAction", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isCommitted()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getSessionId()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsCommitted()
+            /// <returns><see cref="int"/></returns>
+            public int GetSessionId()
             {
-                return IExecuteWithSignature<bool>("isCommitted", "()Z");
+                return IExecuteWithSignature<int>("getSessionId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isMultiPackage()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getStagedSessionErrorCode()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsMultiPackage()
+            /// <returns><see cref="int"/></returns>
+            public int GetStagedSessionErrorCode()
             {
-                return IExecuteWithSignature<bool>("isMultiPackage", "()Z");
+                return IExecuteWithSignature<int>("getStagedSessionErrorCode", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isPreApprovalRequested()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getChildSessionIds()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsPreApprovalRequested()
+            /// <returns><see cref="int"/></returns>
+            public int[] GetChildSessionIds()
             {
-                return IExecuteWithSignature<bool>("isPreApprovalRequested", "()Z");
+                return IExecuteWithSignatureArray<int>("getChildSessionIds", "()[I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isRequestUpdateOwnership()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getAppLabel()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsRequestUpdateOwnership()
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetAppLabel()
             {
-                return IExecuteWithSignature<bool>("isRequestUpdateOwnership", "()Z");
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getAppLabel", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isSealed()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getAppPackageName()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsSealed()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetAppPackageName()
             {
-                return IExecuteWithSignature<bool>("isSealed", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getAppPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStaged()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallerAttributionTag()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsStaged()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetInstallerAttributionTag()
             {
-                return IExecuteWithSignature<bool>("isStaged", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getInstallerAttributionTag", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStagedSessionActive()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getInstallerPackageName()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsStagedSessionActive()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetInstallerPackageName()
             {
-                return IExecuteWithSignature<bool>("isStagedSessionActive", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getInstallerPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStagedSessionApplied()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getStagedSessionErrorMessage()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsStagedSessionApplied()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetStagedSessionErrorMessage()
             {
-                return IExecuteWithSignature<bool>("isStagedSessionApplied", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getStagedSessionErrorMessage", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStagedSessionFailed()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getCreatedMillis()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsStagedSessionFailed()
+            /// <returns><see cref="long"/></returns>
+            public long GetCreatedMillis()
             {
-                return IExecuteWithSignature<bool>("isStagedSessionFailed", "()Z");
+                return IExecuteWithSignature<long>("getCreatedMillis", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#isStagedSessionReady()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getSize()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsStagedSessionReady()
+            /// <returns><see cref="long"/></returns>
+            public long GetSize()
             {
-                return IExecuteWithSignature<bool>("isStagedSessionReady", "()Z");
+                return IExecuteWithSignature<long>("getSize", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#getUpdatedMillis()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="long"/></returns>
+            public long GetUpdatedMillis()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<long>("getUpdatedMillis", "()J");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionInfo.html#writeToParcel(android.os.Parcel,int)"/>
@@ -1659,7 +1707,7 @@ public void SetAppPackageName(Java.Lang.String arg0)
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams.html#setAutoRevokePermissionsMode(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetAutoRevokePermissionsMode(bool arg0)
             {
                 IExecuteWithSignature("setAutoRevokePermissionsMode", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/PackageManager.cs b/src/net/Netdroid/Generated/Android/Content/Pm/PackageManager.cs
index 65c9be124..e6c6ea3be 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/PackageManager.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/PackageManager.cs
@@ -112,7 +112,7 @@ public partial class PackageManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#GET_ATTRIBUTIONS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GET_ATTRIBUTIONS { get { if (!_GET_ATTRIBUTIONSReady) { _GET_ATTRIBUTIONSContent = SGetField<int>(LocalBridgeClazz, "GET_ATTRIBUTIONS"); _GET_ATTRIBUTIONSReady = true; } return _GET_ATTRIBUTIONSContent; } }
         private static int _GET_ATTRIBUTIONSContent = default;
         private static bool _GET_ATTRIBUTIONSReady = false; // this is used because in case of generics 
@@ -125,14 +125,14 @@ public partial class PackageManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#GET_DISABLED_COMPONENTS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GET_DISABLED_COMPONENTS { get { if (!_GET_DISABLED_COMPONENTSReady) { _GET_DISABLED_COMPONENTSContent = SGetField<int>(LocalBridgeClazz, "GET_DISABLED_COMPONENTS"); _GET_DISABLED_COMPONENTSReady = true; } return _GET_DISABLED_COMPONENTSContent; } }
         private static int _GET_DISABLED_COMPONENTSContent = default;
         private static bool _GET_DISABLED_COMPONENTSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#GET_DISABLED_UNTIL_USED_COMPONENTS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GET_DISABLED_UNTIL_USED_COMPONENTS { get { if (!_GET_DISABLED_UNTIL_USED_COMPONENTSReady) { _GET_DISABLED_UNTIL_USED_COMPONENTSContent = SGetField<int>(LocalBridgeClazz, "GET_DISABLED_UNTIL_USED_COMPONENTS"); _GET_DISABLED_UNTIL_USED_COMPONENTSReady = true; } return _GET_DISABLED_UNTIL_USED_COMPONENTSContent; } }
         private static int _GET_DISABLED_UNTIL_USED_COMPONENTSContent = default;
         private static bool _GET_DISABLED_UNTIL_USED_COMPONENTSReady = false; // this is used because in case of generics 
@@ -151,7 +151,7 @@ public partial class PackageManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#GET_INTENT_FILTERS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GET_INTENT_FILTERS { get { if (!_GET_INTENT_FILTERSReady) { _GET_INTENT_FILTERSContent = SGetField<int>(LocalBridgeClazz, "GET_INTENT_FILTERS"); _GET_INTENT_FILTERSReady = true; } return _GET_INTENT_FILTERSContent; } }
         private static int _GET_INTENT_FILTERSContent = default;
         private static bool _GET_INTENT_FILTERSReady = false; // this is used because in case of generics 
@@ -200,7 +200,7 @@ public partial class PackageManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#GET_SIGNATURES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GET_SIGNATURES { get { if (!_GET_SIGNATURESReady) { _GET_SIGNATURESContent = SGetField<int>(LocalBridgeClazz, "GET_SIGNATURES"); _GET_SIGNATURESReady = true; } return _GET_SIGNATURESContent; } }
         private static int _GET_SIGNATURESContent = default;
         private static bool _GET_SIGNATURESReady = false; // this is used because in case of generics 
@@ -213,7 +213,7 @@ public partial class PackageManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#GET_UNINSTALLED_PACKAGES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GET_UNINSTALLED_PACKAGES { get { if (!_GET_UNINSTALLED_PACKAGESReady) { _GET_UNINSTALLED_PACKAGESContent = SGetField<int>(LocalBridgeClazz, "GET_UNINSTALLED_PACKAGES"); _GET_UNINSTALLED_PACKAGESReady = true; } return _GET_UNINSTALLED_PACKAGESContent; } }
         private static int _GET_UNINSTALLED_PACKAGESContent = default;
         private static bool _GET_UNINSTALLED_PACKAGESReady = false; // this is used because in case of generics 
@@ -568,7 +568,7 @@ public partial class PackageManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#FEATURE_CONNECTION_SERVICE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String FEATURE_CONNECTION_SERVICE { get { if (!_FEATURE_CONNECTION_SERVICEReady) { _FEATURE_CONNECTION_SERVICEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE_CONNECTION_SERVICE"); _FEATURE_CONNECTION_SERVICEReady = true; } return _FEATURE_CONNECTION_SERVICEContent; } }
         private static Java.Lang.String _FEATURE_CONNECTION_SERVICEContent = default;
         private static bool _FEATURE_CONNECTION_SERVICEReady = false; // this is used because in case of generics 
@@ -1133,7 +1133,7 @@ public partial class PackageManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#FEATURE_TELEVISION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String FEATURE_TELEVISION { get { if (!_FEATURE_TELEVISIONReady) { _FEATURE_TELEVISIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE_TELEVISION"); _FEATURE_TELEVISIONReady = true; } return _FEATURE_TELEVISIONContent; } }
         private static Java.Lang.String _FEATURE_TELEVISIONContent = default;
         private static bool _FEATURE_TELEVISIONReady = false; // this is used because in case of generics 
@@ -1194,7 +1194,7 @@ public partial class PackageManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#FEATURE_VR_MODE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String FEATURE_VR_MODE { get { if (!_FEATURE_VR_MODEReady) { _FEATURE_VR_MODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE_VR_MODE"); _FEATURE_VR_MODEReady = true; } return _FEATURE_VR_MODEContent; } }
         private static Java.Lang.String _FEATURE_VR_MODEContent = default;
         private static bool _FEATURE_VR_MODEReady = false; // this is used because in case of generics 
@@ -1339,62 +1339,6 @@ public partial class PackageManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getBackgroundPermissionOptionLabel()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence BackgroundPermissionOptionLabel
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getBackgroundPermissionOptionLabel", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getDefaultActivityIcon()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Drawable DefaultActivityIcon
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDefaultActivityIcon", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getInstantAppCookie()"/> 
-        /// </summary>
-        public byte[] InstantAppCookie
-        {
-            get { return IExecuteWithSignatureArray<byte>("getInstantAppCookie", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getInstantAppCookieMaxBytes()"/> 
-        /// </summary>
-        public int InstantAppCookieMaxBytes
-        {
-            get { return IExecuteWithSignature<int>("getInstantAppCookieMaxBytes", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getPackageInstaller()"/> 
-        /// </summary>
-        public Android.Content.Pm.PackageInstaller PackageInstaller
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.PackageInstaller>("getPackageInstaller", "()Landroid/content/pm/PackageInstaller;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getSuspendedPackageAppExtras()"/> 
-        /// </summary>
-        public Android.Os.Bundle SuspendedPackageAppExtras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getSuspendedPackageAppExtras", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getSystemAvailableFeatures()"/> 
-        /// </summary>
-        public Android.Content.Pm.FeatureInfo[] SystemAvailableFeatures
-        {
-            get { return IExecuteWithSignatureArray<Android.Content.Pm.FeatureInfo>("getSystemAvailableFeatures", "()[Landroid/content/pm/FeatureInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getSystemSharedLibraryNames()"/> 
-        /// </summary>
-        public Java.Lang.String[] SystemSharedLibraryNames
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSystemSharedLibraryNames", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getLaunchIntentForPackage(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1455,6 +1399,14 @@ public Android.Content.Pm.ChangedPackages GetChangedPackages(int arg0)
             return IExecuteWithSignature<Android.Content.Pm.ChangedPackages>("getChangedPackages", "(I)Landroid/content/pm/ChangedPackages;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getSystemAvailableFeatures()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.FeatureInfo"/></returns>
+        public Android.Content.Pm.FeatureInfo[] GetSystemAvailableFeatures()
+        {
+            return IExecuteWithSignatureArray<Android.Content.Pm.FeatureInfo>("getSystemAvailableFeatures", "()[Landroid/content/pm/FeatureInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getInstrumentationInfo(android.content.ComponentName,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -1488,6 +1440,14 @@ public Android.Content.Pm.PackageInfo GetPackageInfo(Java.Lang.String arg0, int
             return IExecute<Android.Content.Pm.PackageInfo>("getPackageInfo", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getPackageInstaller()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.PackageInstaller"/></returns>
+        public Android.Content.Pm.PackageInstaller GetPackageInstaller()
+        {
+            return IExecuteWithSignature<Android.Content.Pm.PackageInstaller>("getPackageInstaller", "()Landroid/content/pm/PackageInstaller;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getPermissionGroupInfo(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1720,6 +1680,14 @@ public Android.Graphics.Drawable.Drawable GetApplicationLogo(Java.Lang.String ar
             return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getApplicationLogo", "(Ljava/lang/String;)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getDefaultActivityIcon()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDefaultActivityIcon()
+        {
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDefaultActivityIcon", "()Landroid/graphics/drawable/Drawable;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getDrawable(java.lang.String,int,android.content.pm.ApplicationInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1833,6 +1801,14 @@ public bool IsSafeMode()
             return IExecuteWithSignature<bool>("isSafeMode", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getInstantAppCookie()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetInstantAppCookie()
+        {
+            return IExecuteWithSignatureArray<byte>("getInstantAppCookie", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#checkPermission(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1881,6 +1857,14 @@ public int GetComponentEnabledSetting(Android.Content.ComponentName arg0)
             return IExecuteWithSignature<int>("getComponentEnabledSetting", "(Landroid/content/ComponentName;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getInstantAppCookieMaxBytes()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInstantAppCookieMaxBytes()
+        {
+            return IExecuteWithSignature<int>("getInstantAppCookieMaxBytes", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getPackageUid(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1898,7 +1882,7 @@ public int GetPackageUid(Java.Lang.String arg0, int arg1)
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetPreferredActivities(Java.Util.List<Android.Content.IntentFilter> arg0, Java.Util.List<Android.Content.ComponentName> arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("getPreferredActivities", arg0, arg1, arg2);
@@ -1959,7 +1943,7 @@ public Java.Lang.CharSequence GetUserBadgedLabel(Java.Lang.CharSequence arg0, An
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetInstallerPackageName(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getInstallerPackageName", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
@@ -2001,6 +1985,14 @@ public Java.Lang.String[] GetPackagesForUid(int arg0)
             return IExecuteWithSignatureArray<Java.Lang.String>("getPackagesForUid", "(I)[Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getSystemSharedLibraryNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSystemSharedLibraryNames()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSystemSharedLibraryNames", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getInstalledApplications(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2043,7 +2035,7 @@ public Java.Lang.String[] GetPackagesForUid(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.Content.Pm.PackageInfo> GetPreferredPackages(int arg0)
         {
             return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.PackageInfo>>("getPreferredPackages", "(I)Ljava/util/List;", arg0);
@@ -2144,7 +2136,7 @@ public Java.Lang.String[] GetPackagesForUid(int arg0)
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#addPackageToPreferred(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddPackageToPreferred(Java.Lang.String arg0)
         {
             IExecuteWithSignature("addPackageToPreferred", "(Ljava/lang/String;)V", arg0);
@@ -2156,7 +2148,7 @@ public void AddPackageToPreferred(Java.Lang.String arg0)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg3"><see cref="Android.Content.ComponentName"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddPreferredActivity(Android.Content.IntentFilter arg0, int arg1, Android.Content.ComponentName[] arg2, Android.Content.ComponentName arg3)
         {
             IExecute("addPreferredActivity", arg0, arg1, arg2, arg3);
@@ -2172,7 +2164,7 @@ public void ClearInstantAppCookie()
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#clearPackagePreferredActivities(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearPackagePreferredActivities(Java.Lang.String arg0)
         {
             IExecuteWithSignature("clearPackagePreferredActivities", "(Ljava/lang/String;)V", arg0);
@@ -2191,7 +2183,7 @@ public void ExtendVerificationTimeout(int arg0, int arg1, long arg2)
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#removePackageFromPreferred(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemovePackageFromPreferred(Java.Lang.String arg0)
         {
             IExecuteWithSignature("removePackageFromPreferred", "(Ljava/lang/String;)V", arg0);
@@ -2450,6 +2442,14 @@ public Android.Content.Res.Resources GetResourcesForApplication(Android.Content.
             return IExecute<Android.Content.Res.Resources>("getResourcesForApplication", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getSuspendedPackageAppExtras()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetSuspendedPackageAppExtras()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getSuspendedPackageAppExtras", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#addWhitelistedRestrictedPermission(java.lang.String,java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -2619,6 +2619,14 @@ public int[] GetPackageGids(Java.Lang.String arg0, Android.Content.Pm.PackageMan
             return IExecuteArray<int>("getPackageGids", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getBackgroundPermissionOptionLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetBackgroundPermissionOptionLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getBackgroundPermissionOptionLabel", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.html#getInstalledApplications(android.content.pm.PackageManager.ApplicationInfoFlags)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager.ApplicationInfoFlags"/></param>
@@ -2884,11 +2892,12 @@ public static Android.Content.Pm.PackageManager.ApplicationInfoFlags Of(long arg
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ApplicationInfoFlags.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ApplicationInfoFlags.html#getValue()"/>
             /// </summary>
-            public long Value
+            /// <returns><see cref="long"/></returns>
+            public long GetValue()
             {
-                get { return IExecuteWithSignature<long>("getValue", "()J"); }
+                return IExecuteWithSignature<long>("getValue", "()J");
             }
 
             #endregion
@@ -2938,33 +2947,36 @@ public ComponentEnabledSetting(Android.Content.ComponentName arg0, int arg1, int
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#getComponentName()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#getComponentName()"/>
             /// </summary>
-            public Android.Content.ComponentName ComponentName
+            /// <returns><see cref="Android.Content.ComponentName"/></returns>
+            public Android.Content.ComponentName GetComponentName()
             {
-                get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;"); }
+                return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#getEnabledFlags()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#describeContents()"/>
             /// </summary>
-            public int EnabledFlags
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getEnabledFlags", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#getEnabledState()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#getEnabledFlags()"/>
             /// </summary>
-            public int EnabledState
+            /// <returns><see cref="int"/></returns>
+            public int GetEnabledFlags()
             {
-                get { return IExecuteWithSignature<int>("getEnabledState", "()I"); }
+                return IExecuteWithSignature<int>("getEnabledFlags", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#getEnabledState()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetEnabledState()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getEnabledState", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentEnabledSetting.html#writeToParcel(android.os.Parcel,int)"/>
@@ -3016,11 +3028,12 @@ public static Android.Content.Pm.PackageManager.ComponentInfoFlags Of(long arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentInfoFlags.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ComponentInfoFlags.html#getValue()"/>
             /// </summary>
-            public long Value
+            /// <returns><see cref="long"/></returns>
+            public long GetValue()
             {
-                get { return IExecuteWithSignature<long>("getValue", "()J"); }
+                return IExecuteWithSignature<long>("getValue", "()J");
             }
 
             #endregion
@@ -3089,7 +3102,7 @@ public partial class OnChecksumsReadyListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onChecksumsReady", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Content.Pm.ApkChecksum>>>>(OnChecksumsReadyEventHandler));
+                AddEventHandler("onChecksumsReady", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Content.Pm.ApkChecksum>>>>(OnChecksumsReadyEventHandler));
 
             }
 
@@ -3097,7 +3110,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/pm/PackageManager.OnChecksumsReadyListener.html#onChecksumsReady(java.util.List)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnChecksumsReady"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.List<Android.Content.Pm.ApkChecksum>> OnOnChecksumsReady { get; set; } = null;
+            public global::System.Action<Java.Util.List<Android.Content.Pm.ApkChecksum>> OnOnChecksumsReady { get; set; } = null;
 
             void OnChecksumsReadyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Content.Pm.ApkChecksum>>> data)
             {
@@ -3193,11 +3206,12 @@ public static Android.Content.Pm.PackageManager.PackageInfoFlags Of(long arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.PackageInfoFlags.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.PackageInfoFlags.html#getValue()"/>
             /// </summary>
-            public long Value
+            /// <returns><see cref="long"/></returns>
+            public long GetValue()
             {
-                get { return IExecuteWithSignature<long>("getValue", "()J"); }
+                return IExecuteWithSignature<long>("getValue", "()J");
             }
 
             #endregion
@@ -3237,108 +3251,116 @@ public partial class Property
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getBoolean()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getBoolean()"/>
             /// </summary>
-            public bool Boolean
+            /// <returns><see cref="bool"/></returns>
+            public bool GetBoolean()
             {
-                get { return IExecuteWithSignature<bool>("getBoolean", "()Z"); }
+                return IExecuteWithSignature<bool>("getBoolean", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getClassName()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isBoolean()"/>
             /// </summary>
-            public Java.Lang.String ClassName
+            /// <returns><see cref="bool"/></returns>
+            public bool IsBoolean()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isBoolean", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getFloat()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isFloat()"/>
             /// </summary>
-            public float Float
+            /// <returns><see cref="bool"/></returns>
+            public bool IsFloat()
             {
-                get { return IExecuteWithSignature<float>("getFloat", "()F"); }
+                return IExecuteWithSignature<bool>("isFloat", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getInteger()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isInteger()"/>
             /// </summary>
-            public int Integer
+            /// <returns><see cref="bool"/></returns>
+            public bool IsInteger()
             {
-                get { return IExecuteWithSignature<int>("getInteger", "()I"); }
+                return IExecuteWithSignature<bool>("isInteger", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isResourceId()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="bool"/></returns>
+            public bool IsResourceId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isResourceId", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isString()"/>
             /// </summary>
-            public Java.Lang.String PackageName
+            /// <returns><see cref="bool"/></returns>
+            public bool IsString()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isString", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getResourceId()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getFloat()"/>
             /// </summary>
-            public int ResourceId
+            /// <returns><see cref="float"/></returns>
+            public float GetFloat()
             {
-                get { return IExecuteWithSignature<int>("getResourceId", "()I"); }
+                return IExecuteWithSignature<float>("getFloat", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getString()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#describeContents()"/>
             /// </summary>
-            public Java.Lang.String String
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getString", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isBoolean()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getInteger()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsBoolean()
+            /// <returns><see cref="int"/></returns>
+            public int GetInteger()
             {
-                return IExecuteWithSignature<bool>("isBoolean", "()Z");
+                return IExecuteWithSignature<int>("getInteger", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isFloat()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getResourceId()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsFloat()
+            /// <returns><see cref="int"/></returns>
+            public int GetResourceId()
             {
-                return IExecuteWithSignature<bool>("isFloat", "()Z");
+                return IExecuteWithSignature<int>("getResourceId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isInteger()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getClassName()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsInteger()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetClassName()
             {
-                return IExecuteWithSignature<bool>("isInteger", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isResourceId()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getName()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsResourceId()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                return IExecuteWithSignature<bool>("isResourceId", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#isString()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getPackageName()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsString()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPackageName()
             {
-                return IExecuteWithSignature<bool>("isString", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#getString()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetString()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getString", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.Property.html#writeToParcel(android.os.Parcel,int)"/>
@@ -3390,11 +3412,12 @@ public static Android.Content.Pm.PackageManager.ResolveInfoFlags Of(long arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ResolveInfoFlags.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/pm/PackageManager.ResolveInfoFlags.html#getValue()"/>
             /// </summary>
-            public long Value
+            /// <returns><see cref="long"/></returns>
+            public long GetValue()
             {
-                get { return IExecuteWithSignature<long>("getValue", "()J"); }
+                return IExecuteWithSignature<long>("getValue", "()J");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/PackageStats.cs b/src/net/Netdroid/Generated/Android/Content/Pm/PackageStats.cs
index a7f2a570e..2074faf47 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/PackageStats.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/PackageStats.cs
@@ -33,7 +33,7 @@ public partial class PackageStats
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#%3Cinit%3E(android.content.pm.PackageStats)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageStats"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PackageStats(Android.Content.Pm.PackageStats arg0)
             : base(arg0)
         {
@@ -42,7 +42,7 @@ public PackageStats(Android.Content.Pm.PackageStats arg0)
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#%3Cinit%3E(android.os.Parcel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PackageStats(Android.Os.Parcel arg0)
             : base(arg0)
         {
@@ -51,7 +51,7 @@ public PackageStats(Android.Os.Parcel arg0)
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PackageStats(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -67,52 +67,52 @@ public PackageStats(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#packageName"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String packageName { get { return IGetField<Java.Lang.String>("packageName"); } set { ISetField("packageName", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#cacheSize"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long cacheSize { get { return IGetField<long>("cacheSize"); } set { ISetField("cacheSize", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#codeSize"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long codeSize { get { return IGetField<long>("codeSize"); } set { ISetField("codeSize", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#dataSize"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long dataSize { get { return IGetField<long>("dataSize"); } set { ISetField("dataSize", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#externalCacheSize"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long externalCacheSize { get { return IGetField<long>("externalCacheSize"); } set { ISetField("externalCacheSize", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#externalCodeSize"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long externalCodeSize { get { return IGetField<long>("externalCodeSize"); } set { ISetField("externalCodeSize", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#externalDataSize"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long externalDataSize { get { return IGetField<long>("externalDataSize"); } set { ISetField("externalDataSize", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#externalMediaSize"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long externalMediaSize { get { return IGetField<long>("externalMediaSize"); } set { ISetField("externalMediaSize", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#externalObbSize"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long externalObbSize { get { return IGetField<long>("externalObbSize"); } set { ISetField("externalObbSize", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#CREATOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
         private static Android.Os.Parcelable.Creator _CREATORContent = default;
         private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -128,7 +128,7 @@ public PackageStats(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/content/pm/PackageStats.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int DescribeContents()
         {
             return IExecuteWithSignature<int>("describeContents", "()I");
@@ -138,7 +138,7 @@ public int DescribeContents()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
             IExecute("writeToParcel", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/PathPermission.cs b/src/net/Netdroid/Generated/Android/Content/Pm/PathPermission.cs
index d8a7909f3..aa6bb3f36 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/PathPermission.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/PathPermission.cs
@@ -71,18 +71,20 @@ public PathPermission(Java.Lang.String arg0, int arg1, Java.Lang.String arg2, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PathPermission.html#getReadPermission()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PathPermission.html#getReadPermission()"/>
         /// </summary>
-        public Java.Lang.String ReadPermission
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetReadPermission()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getReadPermission", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getReadPermission", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PathPermission.html#getWritePermission()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PathPermission.html#getWritePermission()"/>
         /// </summary>
-        public Java.Lang.String WritePermission
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetWritePermission()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getWritePermission", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getWritePermission", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/PermissionGroupInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/PermissionGroupInfo.cs
index 21b8856b2..c06011cc4 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/PermissionGroupInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/PermissionGroupInfo.cs
@@ -33,7 +33,7 @@ public partial class PermissionGroupInfo
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionGroupInfo.html#%3Cinit%3E(android.content.pm.PermissionGroupInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PermissionGroupInfo"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PermissionGroupInfo(Android.Content.Pm.PermissionGroupInfo arg0)
             : base(arg0)
         {
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/PermissionInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/PermissionInfo.cs
index e322785b3..705c930a5 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/PermissionInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/PermissionInfo.cs
@@ -33,7 +33,7 @@ public partial class PermissionInfo
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#%3Cinit%3E(android.content.pm.PermissionInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PermissionInfo"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PermissionInfo(Android.Content.Pm.PermissionInfo arg0)
             : base(arg0)
         {
@@ -61,7 +61,7 @@ public PermissionInfo(Android.Content.Pm.PermissionInfo arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#protectionLevel"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int protectionLevel { get { return IGetField<int>("protectionLevel"); } set { ISetField("protectionLevel", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#nonLocalizedDescription"/>
@@ -170,7 +170,7 @@ public PermissionInfo(Android.Content.Pm.PermissionInfo arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#PROTECTION_FLAG_SYSTEM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROTECTION_FLAG_SYSTEM { get { if (!_PROTECTION_FLAG_SYSTEMReady) { _PROTECTION_FLAG_SYSTEMContent = SGetField<int>(LocalBridgeClazz, "PROTECTION_FLAG_SYSTEM"); _PROTECTION_FLAG_SYSTEMReady = true; } return _PROTECTION_FLAG_SYSTEMContent; } }
         private static int _PROTECTION_FLAG_SYSTEMContent = default;
         private static bool _PROTECTION_FLAG_SYSTEMReady = false; // this is used because in case of generics 
@@ -189,14 +189,14 @@ public PermissionInfo(Android.Content.Pm.PermissionInfo arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#PROTECTION_MASK_BASE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROTECTION_MASK_BASE { get { if (!_PROTECTION_MASK_BASEReady) { _PROTECTION_MASK_BASEContent = SGetField<int>(LocalBridgeClazz, "PROTECTION_MASK_BASE"); _PROTECTION_MASK_BASEReady = true; } return _PROTECTION_MASK_BASEContent; } }
         private static int _PROTECTION_MASK_BASEContent = default;
         private static bool _PROTECTION_MASK_BASEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#PROTECTION_MASK_FLAGS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROTECTION_MASK_FLAGS { get { if (!_PROTECTION_MASK_FLAGSReady) { _PROTECTION_MASK_FLAGSContent = SGetField<int>(LocalBridgeClazz, "PROTECTION_MASK_FLAGS"); _PROTECTION_MASK_FLAGSReady = true; } return _PROTECTION_MASK_FLAGSContent; } }
         private static int _PROTECTION_MASK_FLAGSContent = default;
         private static bool _PROTECTION_MASK_FLAGSReady = false; // this is used because in case of generics 
@@ -215,7 +215,7 @@ public PermissionInfo(Android.Content.Pm.PermissionInfo arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#PROTECTION_SIGNATURE_OR_SYSTEM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROTECTION_SIGNATURE_OR_SYSTEM { get { if (!_PROTECTION_SIGNATURE_OR_SYSTEMReady) { _PROTECTION_SIGNATURE_OR_SYSTEMContent = SGetField<int>(LocalBridgeClazz, "PROTECTION_SIGNATURE_OR_SYSTEM"); _PROTECTION_SIGNATURE_OR_SYSTEMReady = true; } return _PROTECTION_SIGNATURE_OR_SYSTEMContent; } }
         private static int _PROTECTION_SIGNATURE_OR_SYSTEMContent = default;
         private static bool _PROTECTION_SIGNATURE_OR_SYSTEMReady = false; // this is used because in case of generics 
@@ -228,26 +228,28 @@ public PermissionInfo(Android.Content.Pm.PermissionInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#getProtection()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#describeContents()"/>
         /// </summary>
-        public int Protection
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getProtection", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#getProtectionFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#getProtection()"/>
         /// </summary>
-        public int ProtectionFlags
+        /// <returns><see cref="int"/></returns>
+        public int GetProtection()
         {
-            get { return IExecuteWithSignature<int>("getProtectionFlags", "()I"); }
+            return IExecuteWithSignature<int>("getProtection", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#getProtectionFlags()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetProtectionFlags()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getProtectionFlags", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/PermissionInfo.html#loadDescription(android.content.pm.PackageManager)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ProviderInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ProviderInfo.cs
index 3369eab9f..358b77a7a 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ProviderInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ProviderInfo.cs
@@ -68,7 +68,7 @@ public ProviderInfo(Android.Content.Pm.ProviderInfo arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ProviderInfo.html#isSyncable"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool isSyncable { get { return IGetField<bool>("isSyncable"); } set { ISetField("isSyncable", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ProviderInfo.html#multiprocess"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ResolveInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ResolveInfo.cs
index a280d2bcb..368f82dfe 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ResolveInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ResolveInfo.cs
@@ -116,13 +116,6 @@ public ResolveInfo(Android.Content.Pm.ResolveInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ResolveInfo.html#getIconResource()"/> 
-        /// </summary>
-        public int IconResource
-        {
-            get { return IExecuteWithSignature<int>("getIconResource", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ResolveInfo.html#loadIcon(android.content.pm.PackageManager)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
@@ -140,6 +133,14 @@ public bool IsCrossProfileIntentForwarderActivity()
             return IExecuteWithSignature<bool>("isCrossProfileIntentForwarderActivity", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ResolveInfo.html#getIconResource()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIconResource()
+        {
+            return IExecuteWithSignature<int>("getIconResource", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ResolveInfo.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ServiceInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ServiceInfo.cs
index 062d38218..80c734d55 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ServiceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ServiceInfo.cs
@@ -156,7 +156,7 @@ public ServiceInfo(Android.Content.Pm.ServiceInfo arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ServiceInfo.html#FOREGROUND_SERVICE_TYPE_NONE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FOREGROUND_SERVICE_TYPE_NONE { get { if (!_FOREGROUND_SERVICE_TYPE_NONEReady) { _FOREGROUND_SERVICE_TYPE_NONEContent = SGetField<int>(LocalBridgeClazz, "FOREGROUND_SERVICE_TYPE_NONE"); _FOREGROUND_SERVICE_TYPE_NONEReady = true; } return _FOREGROUND_SERVICE_TYPE_NONEContent; } }
         private static int _FOREGROUND_SERVICE_TYPE_NONEContent = default;
         private static bool _FOREGROUND_SERVICE_TYPE_NONEReady = false; // this is used because in case of generics 
@@ -199,19 +199,20 @@ public ServiceInfo(Android.Content.Pm.ServiceInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ServiceInfo.html#getForegroundServiceType()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ServiceInfo.html#describeContents()"/>
         /// </summary>
-        public int ForegroundServiceType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getForegroundServiceType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ServiceInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ServiceInfo.html#getForegroundServiceType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetForegroundServiceType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getForegroundServiceType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ServiceInfo.html#dump(android.util.Printer,java.lang.String)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/SharedLibraryInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/SharedLibraryInfo.cs
index 09a262ede..bd3007732 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/SharedLibraryInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/SharedLibraryInfo.cs
@@ -82,55 +82,61 @@ public partial class SharedLibraryInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getDeclaringPackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getDeclaringPackage()"/>
         /// </summary>
-        public Android.Content.Pm.VersionedPackage DeclaringPackage
+        /// <returns><see cref="Android.Content.Pm.VersionedPackage"/></returns>
+        public Android.Content.Pm.VersionedPackage GetDeclaringPackage()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.VersionedPackage>("getDeclaringPackage", "()Landroid/content/pm/VersionedPackage;"); }
+            return IExecuteWithSignature<Android.Content.Pm.VersionedPackage>("getDeclaringPackage", "()Landroid/content/pm/VersionedPackage;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getDependentPackages()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Content.Pm.VersionedPackage> DependentPackages
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.VersionedPackage>>("getDependentPackages", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getLongVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getType()"/>
         /// </summary>
-        public long LongVersion
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<long>("getLongVersion", "()J"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getVersion()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getName()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getDependentPackages()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Version
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.VersionedPackage> GetDependentPackages()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.VersionedPackage>>("getDependentPackages", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#getLongVersion()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetLongVersion()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getLongVersion", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/SharedLibraryInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ShortcutInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ShortcutInfo.cs
index 8528b8e21..9986be152 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ShortcutInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ShortcutInfo.cs
@@ -122,205 +122,222 @@ public static Android.Content.Pm.ShortcutInfo CreateFromGenericDocument(Android.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getActivity()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getActivity()"/>
         /// </summary>
-        public Android.Content.ComponentName Activity
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetActivity()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getActivity", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getActivity", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getIntent()"/>
         /// </summary>
-        public Java.Util.List<Android.Content.Pm.Capability> Capabilities
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent GetIntent()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.Capability>>("getCapabilities", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getCategories()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getIntents()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> Categories
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent[] GetIntents()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getCategories", "()Ljava/util/Set;"); }
+            return IExecuteWithSignatureArray<Android.Content.Intent>("getIntents", "()[Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getDisabledMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getLocusId()"/>
         /// </summary>
-        public Java.Lang.CharSequence DisabledMessage
+        /// <returns><see cref="Android.Content.LocusId"/></returns>
+        public Android.Content.LocusId GetLocusId()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDisabledMessage", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getDisabledReason()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getExtras()"/>
         /// </summary>
-        public int DisabledReason
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetExtras()
         {
-            get { return IExecuteWithSignature<int>("getDisabledReason", "()I"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getExcludedFromSurfaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getUserHandle()"/>
         /// </summary>
-        public int ExcludedFromSurfaces
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetUserHandle()
         {
-            get { return IExecuteWithSignature<int>("getExcludedFromSurfaces", "()I"); }
+            return IExecuteWithSignature<Android.Os.UserHandle>("getUserHandle", "()Landroid/os/UserHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#hasKeyFieldsOnly()"/>
         /// </summary>
-        public Android.Os.PersistableBundle Extras
+        /// <returns><see cref="bool"/></returns>
+        public bool HasKeyFieldsOnly()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<bool>("hasKeyFieldsOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isCached()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="bool"/></returns>
+        public bool IsCached()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isCached", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getIntent()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isDeclaredInManifest()"/>
         /// </summary>
-        public Android.Content.Intent Intent
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDeclaredInManifest()
         {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); }
+            return IExecuteWithSignature<bool>("isDeclaredInManifest", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getIntents()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isDynamic()"/>
         /// </summary>
-        public Android.Content.Intent[] Intents
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDynamic()
         {
-            get { return IExecuteWithSignatureArray<Android.Content.Intent>("getIntents", "()[Landroid/content/Intent;"); }
+            return IExecuteWithSignature<bool>("isDynamic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getLastChangedTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isEnabled()"/>
         /// </summary>
-        public long LastChangedTimestamp
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEnabled()
         {
-            get { return IExecuteWithSignature<long>("getLastChangedTimestamp", "()J"); }
+            return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getLocusId()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isExcludedFromSurfaces(int)"/>
         /// </summary>
-        public Android.Content.LocusId LocusId
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsExcludedFromSurfaces(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;"); }
+            return IExecuteWithSignature<bool>("isExcludedFromSurfaces", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getLongLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isImmutable()"/>
         /// </summary>
-        public Java.Lang.CharSequence LongLabel
+        /// <returns><see cref="bool"/></returns>
+        public bool IsImmutable()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLongLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isImmutable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getPackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isPinned()"/>
         /// </summary>
-        public Java.Lang.String Package
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPinned()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isPinned", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getRank()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#describeContents()"/>
         /// </summary>
-        public int Rank
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getRank", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getShortLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getDisabledReason()"/>
         /// </summary>
-        public Java.Lang.CharSequence ShortLabel
+        /// <returns><see cref="int"/></returns>
+        public int GetDisabledReason()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getShortLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getDisabledReason", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getUserHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getExcludedFromSurfaces()"/>
         /// </summary>
-        public Android.Os.UserHandle UserHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetExcludedFromSurfaces()
         {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getUserHandle", "()Landroid/os/UserHandle;"); }
+            return IExecuteWithSignature<int>("getExcludedFromSurfaces", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#hasKeyFieldsOnly()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getRank()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasKeyFieldsOnly()
+        /// <returns><see cref="int"/></returns>
+        public int GetRank()
         {
-            return IExecuteWithSignature<bool>("hasKeyFieldsOnly", "()Z");
+            return IExecuteWithSignature<int>("getRank", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isCached()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getDisabledMessage()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsCached()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDisabledMessage()
         {
-            return IExecuteWithSignature<bool>("isCached", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDisabledMessage", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isDeclaredInManifest()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getLongLabel()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDeclaredInManifest()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLongLabel()
         {
-            return IExecuteWithSignature<bool>("isDeclaredInManifest", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLongLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isDynamic()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getShortLabel()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDynamic()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetShortLabel()
         {
-            return IExecuteWithSignature<bool>("isDynamic", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getShortLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEnabled()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            return IExecuteWithSignature<bool>("isEnabled", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isExcludedFromSurfaces(int)"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getPackage()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsExcludedFromSurfaces(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackage()
         {
-            return IExecuteWithSignature<bool>("isExcludedFromSurfaces", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getPackage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isImmutable()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getCapabilities()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsImmutable()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.Capability> GetCapabilities()
         {
-            return IExecuteWithSignature<bool>("isImmutable", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.Capability>>("getCapabilities", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#isPinned()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getCapabilityParams(android.content.pm.Capability)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPinned()
+        /// <param name="arg0"><see cref="Android.Content.Pm.Capability"/></param>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.CapabilityParams> GetCapabilityParams(Android.Content.Pm.Capability arg0)
         {
-            return IExecuteWithSignature<bool>("isPinned", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.CapabilityParams>>("getCapabilityParams", "(Landroid/content/pm/Capability;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getCategories()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetCategories()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getCategories", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getCapabilityParams(android.content.pm.Capability)"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#getLastChangedTimestamp()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Pm.Capability"/></param>
-        /// <returns><see cref="Java.Util.List"/></returns>
-        public Java.Util.List<Android.Content.Pm.CapabilityParams> GetCapabilityParams(Android.Content.Pm.Capability arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetLastChangedTimestamp()
         {
-            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.CapabilityParams>>("getCapabilityParams", "(Landroid/content/pm/Capability;)Ljava/util/List;", arg0);
+            return IExecuteWithSignature<long>("getLastChangedTimestamp", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/ShortcutManager.cs b/src/net/Netdroid/Generated/Android/Content/Pm/ShortcutManager.cs
index 276f01317..1c6f64fbf 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/ShortcutManager.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/ShortcutManager.cs
@@ -70,48 +70,6 @@ public partial class ShortcutManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getDynamicShortcuts()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Content.Pm.ShortcutInfo> DynamicShortcuts
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.ShortcutInfo>>("getDynamicShortcuts", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getIconMaxHeight()"/> 
-        /// </summary>
-        public int IconMaxHeight
-        {
-            get { return IExecuteWithSignature<int>("getIconMaxHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getIconMaxWidth()"/> 
-        /// </summary>
-        public int IconMaxWidth
-        {
-            get { return IExecuteWithSignature<int>("getIconMaxWidth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getManifestShortcuts()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Content.Pm.ShortcutInfo> ManifestShortcuts
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.ShortcutInfo>>("getManifestShortcuts", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getMaxShortcutCountPerActivity()"/> 
-        /// </summary>
-        public int MaxShortcutCountPerActivity
-        {
-            get { return IExecuteWithSignature<int>("getMaxShortcutCountPerActivity", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getPinnedShortcuts()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Content.Pm.ShortcutInfo> PinnedShortcuts
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.ShortcutInfo>>("getPinnedShortcuts", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#createShortcutResultIntent(android.content.pm.ShortcutInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.ShortcutInfo"/></param>
@@ -174,6 +132,54 @@ public bool UpdateShortcuts(Java.Util.List<Android.Content.Pm.ShortcutInfo> arg0
             return IExecuteWithSignature<bool>("updateShortcuts", "(Ljava/util/List;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getIconMaxHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIconMaxHeight()
+        {
+            return IExecuteWithSignature<int>("getIconMaxHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getIconMaxWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIconMaxWidth()
+        {
+            return IExecuteWithSignature<int>("getIconMaxWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getMaxShortcutCountPerActivity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxShortcutCountPerActivity()
+        {
+            return IExecuteWithSignature<int>("getMaxShortcutCountPerActivity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getDynamicShortcuts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.ShortcutInfo> GetDynamicShortcuts()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.ShortcutInfo>>("getDynamicShortcuts", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getManifestShortcuts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.ShortcutInfo> GetManifestShortcuts()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.ShortcutInfo>>("getManifestShortcuts", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getPinnedShortcuts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Pm.ShortcutInfo> GetPinnedShortcuts()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.ShortcutInfo>>("getPinnedShortcuts", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/ShortcutManager.html#getShortcuts(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/SigningInfo.cs b/src/net/Netdroid/Generated/Android/Content/Pm/SigningInfo.cs
index f78bcb4df..eea4e4229 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/SigningInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/SigningInfo.cs
@@ -60,18 +60,20 @@ public SigningInfo(Android.Content.Pm.SigningInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SigningInfo.html#getApkContentsSigners()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/SigningInfo.html#getApkContentsSigners()"/>
         /// </summary>
-        public Android.Content.Pm.Signature[] ApkContentsSigners
+        /// <returns><see cref="Android.Content.Pm.Signature"/></returns>
+        public Android.Content.Pm.Signature[] GetApkContentsSigners()
         {
-            get { return IExecuteWithSignatureArray<Android.Content.Pm.Signature>("getApkContentsSigners", "()[Landroid/content/pm/Signature;"); }
+            return IExecuteWithSignatureArray<Android.Content.Pm.Signature>("getApkContentsSigners", "()[Landroid/content/pm/Signature;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/SigningInfo.html#getSigningCertificateHistory()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/SigningInfo.html#getSigningCertificateHistory()"/>
         /// </summary>
-        public Android.Content.Pm.Signature[] SigningCertificateHistory
+        /// <returns><see cref="Android.Content.Pm.Signature"/></returns>
+        public Android.Content.Pm.Signature[] GetSigningCertificateHistory()
         {
-            get { return IExecuteWithSignatureArray<Android.Content.Pm.Signature>("getSigningCertificateHistory", "()[Landroid/content/pm/Signature;"); }
+            return IExecuteWithSignatureArray<Android.Content.Pm.Signature>("getSigningCertificateHistory", "()[Landroid/content/pm/Signature;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/SigningInfo.html#hasMultipleSigners()"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/Verify/Domain/DomainVerificationUserState.cs b/src/net/Netdroid/Generated/Android/Content/Pm/Verify/Domain/DomainVerificationUserState.cs
index f61431bf6..ebce47962 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/Verify/Domain/DomainVerificationUserState.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/Verify/Domain/DomainVerificationUserState.cs
@@ -70,25 +70,12 @@ public partial class DomainVerificationUserState
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/verify/domain/DomainVerificationUserState.html#getHostToStateMap()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/verify/domain/DomainVerificationUserState.html#getUser()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Lang.Integer> HostToStateMap
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetUser()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.Integer>>("getHostToStateMap", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/verify/domain/DomainVerificationUserState.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/verify/domain/DomainVerificationUserState.html#getUser()"/> 
-        /// </summary>
-        public Android.Os.UserHandle User
-        {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getUser", "()Landroid/os/UserHandle;"); }
+            return IExecuteWithSignature<Android.Os.UserHandle>("getUser", "()Landroid/os/UserHandle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/verify/domain/DomainVerificationUserState.html#isLinkHandlingAllowed()"/>
@@ -107,6 +94,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/verify/domain/DomainVerificationUserState.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/pm/verify/domain/DomainVerificationUserState.html#getHostToStateMap()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Lang.Integer> GetHostToStateMap()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.Integer>>("getHostToStateMap", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/verify/domain/DomainVerificationUserState.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Pm/VersionedPackage.cs b/src/net/Netdroid/Generated/Android/Content/Pm/VersionedPackage.cs
index 18bb6e10f..bb82d47a0 100644
--- a/src/net/Netdroid/Generated/Android/Content/Pm/VersionedPackage.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Pm/VersionedPackage.cs
@@ -70,34 +70,37 @@ public VersionedPackage(Java.Lang.String arg0, long arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#getLongVersionCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#describeContents()"/>
         /// </summary>
-        public long LongVersionCode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getLongVersionCode", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#getVersionCode()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetVersionCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getVersionCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#getVersionCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#getPackageName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int VersionCode
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<int>("getVersionCode", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#getLongVersionCode()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetLongVersionCode()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getLongVersionCode", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/pm/VersionedPackage.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Content/Res/AllPackageClasses.cs
index 4e81c8315..b08d25080 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/AllPackageClasses.cs
@@ -581,12 +581,12 @@ public partial class XmlResourceParser : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XmlResourceParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XmlResourceParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XmlResourceParser() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XmlResourceParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XmlResourceParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XmlResourceParser(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/AssetFileDescriptor.cs b/src/net/Netdroid/Generated/Android/Content/Res/AssetFileDescriptor.cs
index 8c19eee93..1d31d48e1 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/AssetFileDescriptor.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/AssetFileDescriptor.cs
@@ -87,72 +87,78 @@ public AssetFileDescriptor(Android.Os.ParcelFileDescriptor arg0, long arg1, long
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getDeclaredLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getExtras()"/>
         /// </summary>
-        public long DeclaredLength
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<long>("getDeclaredLength", "()J"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getParcelFileDescriptor()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Os.ParcelFileDescriptor"/></returns>
+        public Android.Os.ParcelFileDescriptor GetParcelFileDescriptor()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("getParcelFileDescriptor", "()Landroid/os/ParcelFileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getFileDescriptor()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#describeContents()"/>
         /// </summary>
-        public Java.Io.FileDescriptor FileDescriptor
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getFileDescriptor()"/>
         /// </summary>
-        public long Length
+        /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+        public Java.Io.FileDescriptor GetFileDescriptor()
         {
-            get { return IExecuteWithSignature<long>("getLength", "()J"); }
+            return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getParcelFileDescriptor()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#createInputStream()"/>
         /// </summary>
-        public Android.Os.ParcelFileDescriptor ParcelFileDescriptor
+        /// <returns><see cref="Java.Io.FileInputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.FileInputStream CreateInputStream()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("getParcelFileDescriptor", "()Landroid/os/ParcelFileDescriptor;"); }
+            return IExecuteWithSignature<Java.Io.FileInputStream>("createInputStream", "()Ljava/io/FileInputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getStartOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#createOutputStream()"/>
         /// </summary>
-        public long StartOffset
+        /// <returns><see cref="Java.Io.FileOutputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.FileOutputStream CreateOutputStream()
         {
-            get { return IExecuteWithSignature<long>("getStartOffset", "()J"); }
+            return IExecuteWithSignature<Java.Io.FileOutputStream>("createOutputStream", "()Ljava/io/FileOutputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getDeclaredLength()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetDeclaredLength()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getDeclaredLength", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#createInputStream()"/>
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getLength()"/>
         /// </summary>
-        /// <returns><see cref="Java.Io.FileInputStream"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Java.Io.FileInputStream CreateInputStream()
+        /// <returns><see cref="long"/></returns>
+        public long GetLength()
         {
-            return IExecuteWithSignature<Java.Io.FileInputStream>("createInputStream", "()Ljava/io/FileInputStream;");
+            return IExecuteWithSignature<long>("getLength", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#createOutputStream()"/>
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#getStartOffset()"/>
         /// </summary>
-        /// <returns><see cref="Java.Io.FileOutputStream"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Java.Io.FileOutputStream CreateOutputStream()
+        /// <returns><see cref="long"/></returns>
+        public long GetStartOffset()
         {
-            return IExecuteWithSignature<Java.Io.FileOutputStream>("createOutputStream", "()Ljava/io/FileOutputStream;");
+            return IExecuteWithSignature<long>("getStartOffset", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/AssetFileDescriptor.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/AssetManager.cs b/src/net/Netdroid/Generated/Android/Content/Res/AssetManager.cs
index cff0b1a56..626a7689b 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/AssetManager.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/AssetManager.cs
@@ -70,13 +70,6 @@ public partial class AssetManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/AssetManager.html#getLocales()"/> 
-        /// </summary>
-        public Java.Lang.String[] Locales
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getLocales", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/AssetManager.html#openFd(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -150,6 +143,14 @@ public Java.Io.InputStream Open(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.InputStream>("open", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/AssetManager.html#getLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetLocales()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getLocales", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/AssetManager.html#list(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/ColorStateList.cs b/src/net/Netdroid/Generated/Android/Content/Res/ColorStateList.cs
index 408a4e13e..00fb3b984 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/ColorStateList.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/ColorStateList.cs
@@ -77,7 +77,7 @@ public static Android.Content.Res.ColorStateList CreateFromXml(Android.Content.R
         /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
         /// <exception cref="Java.Io.IOException"/>
         /// <exception cref="Org.Xmlpull.V1.XmlPullParserException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Content.Res.ColorStateList CreateFromXml(Android.Content.Res.Resources arg0, Org.Xmlpull.V1.XmlPullParser arg1)
         {
             return SExecute<Android.Content.Res.ColorStateList>(LocalBridgeClazz, "createFromXml", arg0, arg1);
@@ -96,20 +96,6 @@ public static Android.Content.Res.ColorStateList ValueOf(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/ColorStateList.html#getChangingConfigurations()"/> 
-        /// </summary>
-        public int ChangingConfigurations
-        {
-            get { return IExecuteWithSignature<int>("getChangingConfigurations", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/ColorStateList.html#getDefaultColor()"/> 
-        /// </summary>
-        public int DefaultColor
-        {
-            get { return IExecuteWithSignature<int>("getDefaultColor", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/ColorStateList.html#withAlpha(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -152,6 +138,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/ColorStateList.html#getChangingConfigurations()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChangingConfigurations()
+        {
+            return IExecuteWithSignature<int>("getChangingConfigurations", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/ColorStateList.html#getColorForState(int[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -162,6 +156,14 @@ public int GetColorForState(int[] arg0, int arg1)
             return IExecute<int>("getColorForState", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/ColorStateList.html#getDefaultColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultColor()
+        {
+            return IExecuteWithSignature<int>("getDefaultColor", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/ColorStateList.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/Configuration.cs b/src/net/Netdroid/Generated/Android/Content/Res/Configuration.cs
index b55296288..18c33a439 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/Configuration.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/Configuration.cs
@@ -128,7 +128,7 @@ public Configuration(Android.Content.Res.Configuration arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#locale"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Locale locale { get { return IGetField<Java.Util.Locale>("locale"); } set { ISetField("locale", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#CREATOR"/>
@@ -361,7 +361,7 @@ public Configuration(Android.Content.Res.Configuration arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#ORIENTATION_SQUARE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ORIENTATION_SQUARE { get { if (!_ORIENTATION_SQUAREReady) { _ORIENTATION_SQUAREContent = SGetField<int>(LocalBridgeClazz, "ORIENTATION_SQUARE"); _ORIENTATION_SQUAREReady = true; } return _ORIENTATION_SQUAREContent; } }
         private static int _ORIENTATION_SQUAREContent = default;
         private static bool _ORIENTATION_SQUAREReady = false; // this is used because in case of generics 
@@ -524,7 +524,7 @@ public Configuration(Android.Content.Res.Configuration arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#TOUCHSCREEN_STYLUS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TOUCHSCREEN_STYLUS { get { if (!_TOUCHSCREEN_STYLUSReady) { _TOUCHSCREEN_STYLUSContent = SGetField<int>(LocalBridgeClazz, "TOUCHSCREEN_STYLUS"); _TOUCHSCREEN_STYLUSReady = true; } return _TOUCHSCREEN_STYLUSContent; } }
         private static int _TOUCHSCREEN_STYLUSContent = default;
         private static bool _TOUCHSCREEN_STYLUSReady = false; // this is used because in case of generics 
@@ -641,25 +641,12 @@ public static bool NeedNewResources(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#getGrammaticalGender()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#getLocales()"/>
         /// </summary>
-        public int GrammaticalGender
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetLocales()
         {
-            get { return IExecuteWithSignature<int>("getGrammaticalGender", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#getLayoutDirection()"/> <see href="https://developer.android.com/reference/android/content/res/Configuration.html#setLayoutDirection(java.util.Locale)"/>
-        /// </summary>
-        public int LayoutDirection
-        {
-            get { return IExecuteWithSignature<int>("getLayoutDirection", "()I"); } set { IExecuteWithSignature("setLayoutDirection", "(Ljava/util/Locale;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#getLocales()"/> <see href="https://developer.android.com/reference/android/content/res/Configuration.html#setLocales(android.os.LocaleList)"/>
-        /// </summary>
-        public Android.Os.LocaleList Locales
-        {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getLocales", "()Landroid/os/LocaleList;"); } set { IExecuteWithSignature("setLocales", "(Landroid/os/LocaleList;)V", value); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#isLayoutSizeAtLeast(int)"/>
@@ -738,6 +725,22 @@ public int Diff(Android.Content.Res.Configuration arg0)
             return IExecuteWithSignature<int>("diff", "(Landroid/content/res/Configuration;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#getGrammaticalGender()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGrammaticalGender()
+        {
+            return IExecuteWithSignature<int>("getGrammaticalGender", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#getLayoutDirection()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLayoutDirection()
+        {
+            return IExecuteWithSignature<int>("getLayoutDirection", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#updateFrom(android.content.res.Configuration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.Configuration"/></param>
@@ -755,6 +758,14 @@ public void ReadFromParcel(Android.Os.Parcel arg0)
             IExecuteWithSignature("readFromParcel", "(Landroid/os/Parcel;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#setLayoutDirection(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public void SetLayoutDirection(Java.Util.Locale arg0)
+        {
+            IExecuteWithSignature("setLayoutDirection", "(Ljava/util/Locale;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#setLocale(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
@@ -763,6 +774,14 @@ public void SetLocale(Java.Util.Locale arg0)
             IExecuteWithSignature("setLocale", "(Ljava/util/Locale;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#setLocales(android.os.LocaleList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.LocaleList"/></param>
+        public void SetLocales(Android.Os.LocaleList arg0)
+        {
+            IExecuteWithSignature("setLocales", "(Landroid/os/LocaleList;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Configuration.html#setTo(android.content.res.Configuration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.Configuration"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/Loader/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Content/Res/Loader/AllPackageClasses.cs
index 2b08a24e2..44a6472e2 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/Loader/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/Loader/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class AssetsProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<As
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AssetsProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AssetsProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AssetsProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AssetsProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AssetsProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AssetsProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/Loader/ResourcesLoader.cs b/src/net/Netdroid/Generated/Android/Content/Res/Loader/ResourcesLoader.cs
index a6aa96cfb..ac9ce858e 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/Loader/ResourcesLoader.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/Loader/ResourcesLoader.cs
@@ -46,11 +46,12 @@ public partial class ResourcesLoader
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/loader/ResourcesLoader.html#getProviders()"/> <see href="https://developer.android.com/reference/android/content/res/loader/ResourcesLoader.html#setProviders(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/android/content/res/loader/ResourcesLoader.html#getProviders()"/>
         /// </summary>
-        public Java.Util.List<Android.Content.Res.Loader.ResourcesProvider> Providers
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Content.Res.Loader.ResourcesProvider> GetProviders()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Res.Loader.ResourcesProvider>>("getProviders", "()Ljava/util/List;"); } set { IExecuteWithSignature("setProviders", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Res.Loader.ResourcesProvider>>("getProviders", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/loader/ResourcesLoader.html#addProvider(android.content.res.loader.ResourcesProvider)"/>
@@ -75,6 +76,14 @@ public void RemoveProvider(Android.Content.Res.Loader.ResourcesProvider arg0)
         {
             IExecuteWithSignature("removeProvider", "(Landroid/content/res/loader/ResourcesProvider;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/loader/ResourcesLoader.html#setProviders(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetProviders(Java.Util.List<Android.Content.Res.Loader.ResourcesProvider> arg0)
+        {
+            IExecuteWithSignature("setProviders", "(Ljava/util/List;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/Resources.cs b/src/net/Netdroid/Generated/Android/Content/Res/Resources.cs
index c3de45079..7c51c5905 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/Resources.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/Resources.cs
@@ -35,7 +35,7 @@ public partial class Resources
         /// <param name="arg0"><see cref="Android.Content.Res.AssetManager"/></param>
         /// <param name="arg1"><see cref="Android.Util.DisplayMetrics"/></param>
         /// <param name="arg2"><see cref="Android.Content.Res.Configuration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Resources(Android.Content.Res.AssetManager arg0, Android.Util.DisplayMetrics arg1, Android.Content.Res.Configuration arg2)
             : base(arg0, arg1, arg2)
         {
@@ -59,11 +59,12 @@ public Resources(Android.Content.Res.AssetManager arg0, Android.Util.DisplayMetr
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getSystem()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getSystem()"/>
         /// </summary>
-        public static Android.Content.Res.Resources System
+        /// <returns><see cref="Android.Content.Res.Resources"/></returns>
+        public static Android.Content.Res.Resources GetSystem()
         {
-            get { return SExecuteWithSignature<Android.Content.Res.Resources>(LocalBridgeClazz, "getSystem", "()Landroid/content/res/Resources;"); }
+            return SExecuteWithSignature<Android.Content.Res.Resources>(LocalBridgeClazz, "getSystem", "()Landroid/content/res/Resources;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getAttributeSetSourceResId(android.util.AttributeSet)"/>
@@ -79,27 +80,6 @@ public static int GetAttributeSetSourceResId(Android.Util.AttributeSet arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getAssets()"/> 
-        /// </summary>
-        public Android.Content.Res.AssetManager Assets
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.AssetManager>("getAssets", "()Landroid/content/res/AssetManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getConfiguration()"/> 
-        /// </summary>
-        public Android.Content.Res.Configuration Configuration
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.Configuration>("getConfiguration", "()Landroid/content/res/Configuration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getDisplayMetrics()"/> 
-        /// </summary>
-        public Android.Util.DisplayMetrics DisplayMetrics
-        {
-            get { return IExecuteWithSignature<Android.Util.DisplayMetrics>("getDisplayMetrics", "()Landroid/util/DisplayMetrics;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#openRawResourceFd(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -126,12 +106,20 @@ public Android.Content.Res.ColorStateList GetColorStateList(int arg0, Android.Co
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
         /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Res.ColorStateList GetColorStateList(int arg0)
         {
             return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getColorStateList", "(I)Landroid/content/res/ColorStateList;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getConfiguration()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.Configuration"/></returns>
+        public Android.Content.Res.Configuration GetConfiguration()
+        {
+            return IExecuteWithSignature<Android.Content.Res.Configuration>("getConfiguration", "()Landroid/content/res/Configuration;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#obtainAttributes(android.util.AttributeSet,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.AttributeSet"/></param>
@@ -198,7 +186,7 @@ public Android.Graphics.Drawable.Drawable GetDrawable(int arg0, Android.Content.
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
         /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Graphics.Drawable.Drawable GetDrawable(int arg0)
         {
             return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "(I)Landroid/graphics/drawable/Drawable;", arg0);
@@ -221,7 +209,7 @@ public Android.Graphics.Drawable.Drawable GetDrawableForDensity(int arg0, int ar
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
         /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Graphics.Drawable.Drawable GetDrawableForDensity(int arg0, int arg1)
         {
             return IExecute<Android.Graphics.Drawable.Drawable>("getDrawableForDensity", arg0, arg1);
@@ -232,7 +220,7 @@ public Android.Graphics.Drawable.Drawable GetDrawableForDensity(int arg0, int ar
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Graphics.Movie"/></returns>
         /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Graphics.Movie GetMovie(int arg0)
         {
             return IExecuteWithSignature<Android.Graphics.Movie>("getMovie", "(I)Landroid/graphics/Movie;", arg0);
@@ -248,6 +236,14 @@ public Android.Graphics.Typeface GetFont(int arg0)
             return IExecuteWithSignature<Android.Graphics.Typeface>("getFont", "(I)Landroid/graphics/Typeface;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getDisplayMetrics()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Util.DisplayMetrics"/></returns>
+        public Android.Util.DisplayMetrics GetDisplayMetrics()
+        {
+            return IExecuteWithSignature<Android.Util.DisplayMetrics>("getDisplayMetrics", "()Landroid/util/DisplayMetrics;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getBoolean(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -258,6 +254,14 @@ public bool GetBoolean(int arg0)
             return IExecuteWithSignature<bool>("getBoolean", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getAssets()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.AssetManager"/></returns>
+        public Android.Content.Res.AssetManager GetAssets()
+        {
+            return IExecuteWithSignature<Android.Content.Res.AssetManager>("getAssets", "()Landroid/content/res/AssetManager;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#newTheme()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
@@ -326,7 +330,7 @@ public int GetColor(int arg0, Android.Content.Res.Resources.Theme arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetColor(int arg0)
         {
             return IExecuteWithSignature<int>("getColor", "(I)I", arg0);
@@ -383,6 +387,17 @@ public int[] GetIntArray(int arg0)
             return IExecuteWithSignatureArray<int>("getIntArray", "(I)[I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#openRawResource(int,android.util.TypedValue)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Util.TypedValue"/></param>
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
+        public Java.Io.InputStream OpenRawResource(int arg0, Android.Util.TypedValue arg1)
+        {
+            return IExecute<Java.Io.InputStream>("openRawResource", arg0, arg1);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#openRawResource(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -536,6 +551,40 @@ public void AddLoaders(params Android.Content.Res.Loader.ResourcesLoader[] arg0)
             if (arg0.Length == 0) IExecuteWithSignature("addLoaders", "([Landroid/content/res/loader/ResourcesLoader;)V"); else IExecuteWithSignature("addLoaders", "([Landroid/content/res/loader/ResourcesLoader;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getValue(int,android.util.TypedValue,boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Util.TypedValue"/></param>
+        /// <param name="arg2"><see cref="bool"/></param>
+        /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
+        public void GetValue(int arg0, Android.Util.TypedValue arg1, bool arg2)
+        {
+            IExecute("getValue", arg0, arg1, arg2);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getValue(java.lang.String,android.util.TypedValue,boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Android.Util.TypedValue"/></param>
+        /// <param name="arg2"><see cref="bool"/></param>
+        /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
+        public void GetValue(Java.Lang.String arg0, Android.Util.TypedValue arg1, bool arg2)
+        {
+            IExecute("getValue", arg0, arg1, arg2);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#getValueForDensity(int,int,android.util.TypedValue,boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Android.Util.TypedValue"/></param>
+        /// <param name="arg3"><see cref="bool"/></param>
+        /// <exception cref="Android.Content.Res.Resources.NotFoundException"/>
+        public void GetValueForDensity(int arg0, int arg1, Android.Util.TypedValue arg2, bool arg3)
+        {
+            IExecute("getValueForDensity", arg0, arg1, arg2, arg3);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/Resources.html#parseBundleExtra(java.lang.String,android.util.AttributeSet,android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -570,7 +619,7 @@ public void RemoveLoaders(params Android.Content.Res.Loader.ResourcesLoader[] ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.Configuration"/></param>
         /// <param name="arg1"><see cref="Android.Util.DisplayMetrics"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UpdateConfiguration(Android.Content.Res.Configuration arg0, Android.Util.DisplayMetrics arg1)
         {
             IExecute("updateConfiguration", arg0, arg1);
@@ -631,18 +680,12 @@ public partial class Theme
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/res/Resources.Theme.html#getChangingConfigurations()"/> 
-            /// </summary>
-            public int ChangingConfigurations
-            {
-                get { return IExecuteWithSignature<int>("getChangingConfigurations", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/content/res/Resources.Theme.html#getResources()"/> 
+            /// <see href="https://developer.android.com/reference/android/content/res/Resources.Theme.html#getResources()"/>
             /// </summary>
-            public Android.Content.Res.Resources GetResources
+            /// <returns><see cref="Android.Content.Res.Resources"/></returns>
+            public Android.Content.Res.Resources GetResources()
             {
-                get { return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;"); }
+                return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/res/Resources.Theme.html#obtainStyledAttributes(android.util.AttributeSet,int[],int,int)"/>
@@ -687,6 +730,25 @@ public Android.Graphics.Drawable.Drawable GetDrawable(int arg0)
                 return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "(I)Landroid/graphics/drawable/Drawable;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/res/Resources.Theme.html#resolveAttribute(int,android.util.TypedValue,boolean)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <param name="arg1"><see cref="Android.Util.TypedValue"/></param>
+            /// <param name="arg2"><see cref="bool"/></param>
+            /// <returns><see cref="bool"/></returns>
+            public bool ResolveAttribute(int arg0, Android.Util.TypedValue arg1, bool arg2)
+            {
+                return IExecute<bool>("resolveAttribute", arg0, arg1, arg2);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/content/res/Resources.Theme.html#getChangingConfigurations()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetChangingConfigurations()
+            {
+                return IExecuteWithSignature<int>("getChangingConfigurations", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/content/res/Resources.Theme.html#getExplicitStyle(android.util.AttributeSet)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Util.AttributeSet"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/Res/TypedArray.cs b/src/net/Netdroid/Generated/Android/Content/Res/TypedArray.cs
index 05d7359a1..f8aeafc84 100644
--- a/src/net/Netdroid/Generated/Android/Content/Res/TypedArray.cs
+++ b/src/net/Netdroid/Generated/Android/Content/Res/TypedArray.cs
@@ -46,34 +46,6 @@ public partial class TypedArray
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getChangingConfigurations()"/> 
-        /// </summary>
-        public int ChangingConfigurations
-        {
-            get { return IExecuteWithSignature<int>("getChangingConfigurations", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getIndexCount()"/> 
-        /// </summary>
-        public int IndexCount
-        {
-            get { return IExecuteWithSignature<int>("getIndexCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getPositionDescription()"/> 
-        /// </summary>
-        public Java.Lang.String PositionDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPositionDescription", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getResources()"/> 
-        /// </summary>
-        public Android.Content.Res.Resources Resources
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getColorStateList(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -83,6 +55,14 @@ public Android.Content.Res.ColorStateList GetColorStateList(int arg0)
             return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getColorStateList", "(I)Landroid/content/res/ColorStateList;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getResources()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.Resources"/></returns>
+        public Android.Content.Res.Resources GetResources()
+        {
+            return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getDrawable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -101,6 +81,15 @@ public Android.Graphics.Typeface GetFont(int arg0)
             return IExecuteWithSignature<Android.Graphics.Typeface>("getFont", "(I)Landroid/graphics/Typeface;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#peekValue(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Util.TypedValue"/></returns>
+        public Android.Util.TypedValue PeekValue(int arg0)
+        {
+            return IExecuteWithSignature<Android.Util.TypedValue>("peekValue", "(I)Landroid/util/TypedValue;", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getBoolean(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -111,6 +100,16 @@ public bool GetBoolean(int arg0, bool arg1)
             return IExecute<bool>("getBoolean", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getValue(int,android.util.TypedValue)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Util.TypedValue"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetValue(int arg0, Android.Util.TypedValue arg1)
+        {
+            return IExecute<bool>("getValue", arg0, arg1);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#hasValue(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -161,6 +160,14 @@ public float GetFraction(int arg0, int arg1, int arg2, float arg3)
             return IExecute<float>("getFraction", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getChangingConfigurations()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChangingConfigurations()
+        {
+            return IExecuteWithSignature<int>("getChangingConfigurations", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getColor(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -200,6 +207,14 @@ public int GetIndex(int arg0)
             return IExecuteWithSignature<int>("getIndex", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getIndexCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIndexCount()
+        {
+            return IExecuteWithSignature<int>("getIndexCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getInt(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -304,6 +319,14 @@ public Java.Lang.String GetNonResourceString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getNonResourceString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getPositionDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPositionDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPositionDescription", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/res/TypedArray.html#getString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/RestrictionEntry.cs b/src/net/Netdroid/Generated/Android/Content/RestrictionEntry.cs
index 02796ef19..d8663531f 100644
--- a/src/net/Netdroid/Generated/Android/Content/RestrictionEntry.cs
+++ b/src/net/Netdroid/Generated/Android/Content/RestrictionEntry.cs
@@ -173,89 +173,108 @@ public static Android.Content.RestrictionEntry CreateBundleEntry(Java.Lang.Strin
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getAllSelectedStrings()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setAllSelectedStrings(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getRestrictions()"/>
         /// </summary>
-        public Java.Lang.String[] AllSelectedStrings
+        /// <returns><see cref="Android.Content.RestrictionEntry"/></returns>
+        public Android.Content.RestrictionEntry[] GetRestrictions()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getAllSelectedStrings", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setAllSelectedStrings", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Android.Content.RestrictionEntry>("getRestrictions", "()[Landroid/content/RestrictionEntry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getChoiceEntries()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setChoiceEntries(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getSelectedState()"/>
         /// </summary>
-        public Java.Lang.String[] ChoiceEntries
+        /// <returns><see cref="bool"/></returns>
+        public bool GetSelectedState()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getChoiceEntries", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setChoiceEntries", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getSelectedState", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getChoiceValues()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setChoiceValues(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String[] ChoiceValues
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getChoiceValues", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setChoiceValues", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getDescription()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setDescription(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getIntValue()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="int"/></returns>
+        public int GetIntValue()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getIntValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getIntValue()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setIntValue(int)"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getType()"/>
         /// </summary>
-        public int IntValue
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<int>("getIntValue", "()I"); } set { IExecuteWithSignature("setIntValue", "(I)V", value); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getDescription()"/>
         /// </summary>
-        public Java.Lang.String Key
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getRestrictions()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setRestrictions(android.content.RestrictionEntry[])"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getKey()"/>
         /// </summary>
-        public Android.Content.RestrictionEntry[] Restrictions
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKey()
         {
-            get { return IExecuteWithSignatureArray<Android.Content.RestrictionEntry>("getRestrictions", "()[Landroid/content/RestrictionEntry;"); } set { IExecuteWithSignature("setRestrictions", "([Landroid/content/RestrictionEntry;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getSelectedState()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setSelectedState(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getSelectedString()"/>
         /// </summary>
-        public bool SelectedState
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSelectedString()
         {
-            get { return IExecuteWithSignature<bool>("getSelectedState", "()Z"); } set { IExecuteWithSignature("setSelectedState", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSelectedString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getSelectedString()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setSelectedString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getTitle()"/>
         /// </summary>
-        public Java.Lang.String SelectedString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSelectedString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSelectedString", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getTitle", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getTitle()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setTitle(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getAllSelectedStrings()"/>
         /// </summary>
-        public Java.Lang.String Title
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetAllSelectedStrings()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTitle", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setTitle", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getAllSelectedStrings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getType()"/> <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getChoiceEntries()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetChoiceEntries()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); } set { IExecuteWithSignature("setType", "(I)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getChoiceEntries", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#getChoiceValues()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetChoiceValues()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getChoiceValues", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setAllSelectedStrings(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetAllSelectedStrings(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setAllSelectedStrings", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setChoiceEntries(android.content.Context,int)"/>
@@ -267,6 +286,14 @@ public void SetChoiceEntries(Android.Content.Context arg0, int arg1)
             IExecute("setChoiceEntries", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setChoiceEntries(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetChoiceEntries(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setChoiceEntries", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setChoiceValues(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -276,6 +303,70 @@ public void SetChoiceValues(Android.Content.Context arg0, int arg1)
             IExecute("setChoiceValues", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setChoiceValues(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetChoiceValues(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setChoiceValues", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setDescription(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDescription(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setIntValue(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetIntValue(int arg0)
+        {
+            IExecuteWithSignature("setIntValue", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setRestrictions(android.content.RestrictionEntry[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.RestrictionEntry"/></param>
+        public void SetRestrictions(Android.Content.RestrictionEntry[] arg0)
+        {
+            IExecuteWithSignature("setRestrictions", "([Landroid/content/RestrictionEntry;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setSelectedState(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetSelectedState(bool arg0)
+        {
+            IExecuteWithSignature("setSelectedState", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setSelectedString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSelectedString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSelectedString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setTitle(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetTitle(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setTitle", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#setType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetType(int arg0)
+        {
+            IExecuteWithSignature("setType", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/RestrictionEntry.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/RestrictionsManager.cs b/src/net/Netdroid/Generated/Android/Content/RestrictionsManager.cs
index 8e7cca382..a76010db5 100644
--- a/src/net/Netdroid/Generated/Android/Content/RestrictionsManager.cs
+++ b/src/net/Netdroid/Generated/Android/Content/RestrictionsManager.cs
@@ -235,20 +235,6 @@ public static Android.Os.Bundle ConvertRestrictionsToBundle(Java.Util.List<Andro
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionsManager.html#getApplicationRestrictions()"/> 
-        /// </summary>
-        public Android.Os.Bundle ApplicationRestrictions
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getApplicationRestrictions", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/RestrictionsManager.html#getApplicationRestrictionsPerAdmin()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Os.Bundle> ApplicationRestrictionsPerAdmin
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.Bundle>>("getApplicationRestrictionsPerAdmin", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/RestrictionsManager.html#createLocalApprovalIntent()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.Intent"/></returns>
@@ -257,6 +243,14 @@ public Android.Content.Intent CreateLocalApprovalIntent()
             return IExecuteWithSignature<Android.Content.Intent>("createLocalApprovalIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionsManager.html#getApplicationRestrictions()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetApplicationRestrictions()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getApplicationRestrictions", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/RestrictionsManager.html#hasRestrictionsProvider()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -274,6 +268,14 @@ public bool HasRestrictionsProvider()
             return IExecuteWithSignature<Java.Util.List<Android.Content.RestrictionEntry>>("getManifestRestrictions", "(Ljava/lang/String;)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/RestrictionsManager.html#getApplicationRestrictionsPerAdmin()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.Bundle> GetApplicationRestrictionsPerAdmin()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Os.Bundle>>("getApplicationRestrictionsPerAdmin", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/RestrictionsManager.html#notifyPermissionResponse(java.lang.String,android.os.PersistableBundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/SharedPreferences.cs b/src/net/Netdroid/Generated/Android/Content/SharedPreferences.cs
index 2f34d114b..c5accd8b2 100644
--- a/src/net/Netdroid/Generated/Android/Content/SharedPreferences.cs
+++ b/src/net/Netdroid/Generated/Android/Content/SharedPreferences.cs
@@ -64,13 +64,6 @@ public partial class SharedPreferences : Android.Content.ISharedPreferences
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/SharedPreferences.html#getAll()"/> 
-        /// </summary>
-        public Java.Util.Map<Java.Lang.String, object> All
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, object>>("getAll", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/SharedPreferences.html#edit()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.SharedPreferences.Editor"/></returns>
@@ -128,6 +121,14 @@ public Java.Lang.String GetString(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<Java.Lang.String>("getString", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/SharedPreferences.html#getAll()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, object> GetAll()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, object>>("getAll", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/SharedPreferences.html#getStringSet(java.lang.String,java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -315,7 +316,7 @@ public partial class OnSharedPreferenceChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSharedPreferenceChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.SharedPreferences>>>(OnSharedPreferenceChangedEventHandler));
+                AddEventHandler("onSharedPreferenceChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.SharedPreferences>>>(OnSharedPreferenceChangedEventHandler));
 
             }
 
@@ -323,7 +324,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/content/SharedPreferences.OnSharedPreferenceChangeListener.html#onSharedPreferenceChanged(android.content.SharedPreferences,java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSharedPreferenceChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Content.SharedPreferences, Java.Lang.String> OnOnSharedPreferenceChanged { get; set; } = null;
+            public global::System.Action<Android.Content.SharedPreferences, Java.Lang.String> OnOnSharedPreferenceChanged { get; set; } = null;
 
             void OnSharedPreferenceChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.SharedPreferences>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Content/SyncAdapterType.cs b/src/net/Netdroid/Generated/Android/Content/SyncAdapterType.cs
index 63812c20b..c19b3cbc6 100644
--- a/src/net/Netdroid/Generated/Android/Content/SyncAdapterType.cs
+++ b/src/net/Netdroid/Generated/Android/Content/SyncAdapterType.cs
@@ -99,13 +99,6 @@ public static Android.Content.SyncAdapterType NewKey(Java.Lang.String arg0, Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/SyncAdapterType.html#getSettingsActivity()"/> 
-        /// </summary>
-        public Java.Lang.String SettingsActivity
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSettingsActivity", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/SyncAdapterType.html#allowParallelSyncs()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -146,6 +139,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/SyncAdapterType.html#getSettingsActivity()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSettingsActivity()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSettingsActivity", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/SyncAdapterType.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Content/SyncContext.cs b/src/net/Netdroid/Generated/Android/Content/SyncContext.cs
index a160815c1..5dca7ff9b 100644
--- a/src/net/Netdroid/Generated/Android/Content/SyncContext.cs
+++ b/src/net/Netdroid/Generated/Android/Content/SyncContext.cs
@@ -46,11 +46,12 @@ public partial class SyncContext
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/SyncContext.html#getSyncContextBinder()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/SyncContext.html#getSyncContextBinder()"/>
         /// </summary>
-        public Android.Os.IBinder SyncContextBinder
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetSyncContextBinder()
         {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getSyncContextBinder", "()Landroid/os/IBinder;"); }
+            return IExecuteWithSignature<Android.Os.IBinder>("getSyncContextBinder", "()Landroid/os/IBinder;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/SyncContext.html#onFinished(android.content.SyncResult)"/>
diff --git a/src/net/Netdroid/Generated/Android/Content/UriPermission.cs b/src/net/Netdroid/Generated/Android/Content/UriPermission.cs
index 873d81c8a..345d2c684 100644
--- a/src/net/Netdroid/Generated/Android/Content/UriPermission.cs
+++ b/src/net/Netdroid/Generated/Android/Content/UriPermission.cs
@@ -58,18 +58,12 @@ public partial class UriPermission
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/UriPermission.html#getPersistedTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/content/UriPermission.html#getUri()"/>
         /// </summary>
-        public long PersistedTime
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUri()
         {
-            get { return IExecuteWithSignature<long>("getPersistedTime", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/content/UriPermission.html#getUri()"/> 
-        /// </summary>
-        public Android.Net.Uri Uri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/UriPermission.html#isReadPermission()"/>
@@ -96,6 +90,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/content/UriPermission.html#getPersistedTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetPersistedTime()
+        {
+            return IExecuteWithSignature<long>("getPersistedTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/content/UriPermission.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/ClearCredentialStateRequest.cs b/src/net/Netdroid/Generated/Android/Credentials/ClearCredentialStateRequest.cs
index 20fb38e33..fe1159eeb 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/ClearCredentialStateRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/ClearCredentialStateRequest.cs
@@ -60,11 +60,12 @@ public ClearCredentialStateRequest(Android.Os.Bundle arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/ClearCredentialStateRequest.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/ClearCredentialStateRequest.html#getData()"/>
         /// </summary>
-        public Android.Os.Bundle Data
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetData()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/ClearCredentialStateRequest.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/CreateCredentialRequest.cs b/src/net/Netdroid/Generated/Android/Credentials/CreateCredentialRequest.cs
index 686f2177e..d96e2de0c 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/CreateCredentialRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/CreateCredentialRequest.cs
@@ -52,32 +52,20 @@ public partial class CreateCredentialRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#getCandidateQueryData()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#getCandidateQueryData()"/>
         /// </summary>
-        public Android.Os.Bundle CandidateQueryData
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetCandidateQueryData()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getCandidateQueryData", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getCandidateQueryData", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#getCredentialData()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#getCredentialData()"/>
         /// </summary>
-        public Android.Os.Bundle CredentialData
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetCredentialData()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getCredentialData", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#getOrigin()"/> 
-        /// </summary>
-        public Java.Lang.String Origin
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOrigin", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getCredentialData", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#alwaysSendAppInfoToProvider()"/>
@@ -104,6 +92,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#getOrigin()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOrigin()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getOrigin", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/CreateCredentialResponse.cs b/src/net/Netdroid/Generated/Android/Credentials/CreateCredentialResponse.cs
index 21884b49c..21eb05701 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/CreateCredentialResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/CreateCredentialResponse.cs
@@ -60,11 +60,12 @@ public CreateCredentialResponse(Android.Os.Bundle arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialResponse.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialResponse.html#getData()"/>
         /// </summary>
-        public Android.Os.Bundle Data
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetData()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/CreateCredentialResponse.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/Credential.cs b/src/net/Netdroid/Generated/Android/Credentials/Credential.cs
index 1980705f1..498fa1999 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/Credential.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/Credential.cs
@@ -67,18 +67,12 @@ public Credential(Java.Lang.String arg0, Android.Os.Bundle arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/Credential.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/Credential.html#getData()"/>
         /// </summary>
-        public Android.Os.Bundle Data
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetData()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/Credential.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/Credential.html#describeContents()"/>
@@ -89,6 +83,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/Credential.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/Credential.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/CredentialDescription.cs b/src/net/Netdroid/Generated/Android/Credentials/CredentialDescription.cs
index bc69d0607..90f666292 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/CredentialDescription.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/CredentialDescription.cs
@@ -62,33 +62,36 @@ public CredentialDescription(Java.Lang.String arg0, Java.Util.Set<Java.Lang.Stri
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#getCredentialEntries()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Credentials.CredentialEntry> CredentialEntries
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.CredentialEntry>>("getCredentialEntries", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#getSupportedElementKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#getType()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> SupportedElementKeys
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSupportedElementKeys", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#getCredentialEntries()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Credentials.CredentialEntry> GetCredentialEntries()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.CredentialEntry>>("getCredentialEntries", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#getSupportedElementKeys()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetSupportedElementKeys()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSupportedElementKeys", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/CredentialDescription.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/CredentialOption.cs b/src/net/Netdroid/Generated/Android/Credentials/CredentialOption.cs
index c602d7b21..8825f6021 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/CredentialOption.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/CredentialOption.cs
@@ -58,32 +58,20 @@ public partial class CredentialOption
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#getAllowedProviders()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#getCandidateQueryData()"/>
         /// </summary>
-        public Java.Util.Set<Android.Content.ComponentName> AllowedProviders
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetCandidateQueryData()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Content.ComponentName>>("getAllowedProviders", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getCandidateQueryData", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#getCandidateQueryData()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#getCredentialRetrievalData()"/>
         /// </summary>
-        public Android.Os.Bundle CandidateQueryData
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetCredentialRetrievalData()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getCandidateQueryData", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#getCredentialRetrievalData()"/> 
-        /// </summary>
-        public Android.Os.Bundle CredentialRetrievalData
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getCredentialRetrievalData", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getCredentialRetrievalData", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#isSystemProviderRequired()"/>
@@ -102,6 +90,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#getAllowedProviders()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Content.ComponentName> GetAllowedProviders()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Android.Content.ComponentName>>("getAllowedProviders", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/CredentialOption.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/GetCredentialRequest.cs b/src/net/Netdroid/Generated/Android/Credentials/GetCredentialRequest.cs
index 86599a4c4..20f3b20ae 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/GetCredentialRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/GetCredentialRequest.cs
@@ -52,25 +52,12 @@ public partial class GetCredentialRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialRequest.html#getCredentialOptions()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialRequest.html#getData()"/>
         /// </summary>
-        public Java.Util.List<Android.Credentials.CredentialOption> CredentialOptions
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetData()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Credentials.CredentialOption>>("getCredentialOptions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialRequest.html#getData()"/> 
-        /// </summary>
-        public Android.Os.Bundle Data
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialRequest.html#getOrigin()"/> 
-        /// </summary>
-        public Java.Lang.String Origin
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOrigin", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialRequest.html#alwaysSendAppInfoToProvider()"/>
@@ -89,6 +76,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialRequest.html#getOrigin()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOrigin()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getOrigin", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialRequest.html#getCredentialOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Credentials.CredentialOption> GetCredentialOptions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Credentials.CredentialOption>>("getCredentialOptions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/GetCredentialResponse.cs b/src/net/Netdroid/Generated/Android/Credentials/GetCredentialResponse.cs
index 0e44b6607..aaca17a94 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/GetCredentialResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/GetCredentialResponse.cs
@@ -60,11 +60,12 @@ public GetCredentialResponse(Android.Credentials.Credential arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialResponse.html#getCredential()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialResponse.html#getCredential()"/>
         /// </summary>
-        public Android.Credentials.Credential Credential
+        /// <returns><see cref="Android.Credentials.Credential"/></returns>
+        public Android.Credentials.Credential GetCredential()
         {
-            get { return IExecuteWithSignature<Android.Credentials.Credential>("getCredential", "()Landroid/credentials/Credential;"); }
+            return IExecuteWithSignature<Android.Credentials.Credential>("getCredential", "()Landroid/credentials/Credential;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/GetCredentialResponse.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/PrepareGetCredentialResponse.cs b/src/net/Netdroid/Generated/Android/Credentials/PrepareGetCredentialResponse.cs
index 734ece592..4fa4ad59d 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/PrepareGetCredentialResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/PrepareGetCredentialResponse.cs
@@ -46,11 +46,12 @@ public partial class PrepareGetCredentialResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/PrepareGetCredentialResponse.html#getPendingGetCredentialHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/credentials/PrepareGetCredentialResponse.html#getPendingGetCredentialHandle()"/>
         /// </summary>
-        public Android.Credentials.PrepareGetCredentialResponse.PendingGetCredentialHandle GetPendingGetCredentialHandle
+        /// <returns><see cref="Android.Credentials.PrepareGetCredentialResponse.PendingGetCredentialHandle"/></returns>
+        public Android.Credentials.PrepareGetCredentialResponse.PendingGetCredentialHandle GetPendingGetCredentialHandle()
         {
-            get { return IExecuteWithSignature<Android.Credentials.PrepareGetCredentialResponse.PendingGetCredentialHandle>("getPendingGetCredentialHandle", "()Landroid/credentials/PrepareGetCredentialResponse$PendingGetCredentialHandle;"); }
+            return IExecuteWithSignature<Android.Credentials.PrepareGetCredentialResponse.PendingGetCredentialHandle>("getPendingGetCredentialHandle", "()Landroid/credentials/PrepareGetCredentialResponse$PendingGetCredentialHandle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/PrepareGetCredentialResponse.html#hasAuthenticationResults()"/>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/RegisterCredentialDescriptionRequest.cs b/src/net/Netdroid/Generated/Android/Credentials/RegisterCredentialDescriptionRequest.cs
index e20c1beaa..cf611d945 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/RegisterCredentialDescriptionRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/RegisterCredentialDescriptionRequest.cs
@@ -68,13 +68,6 @@ public RegisterCredentialDescriptionRequest(Java.Util.Set<Android.Credentials.Cr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/RegisterCredentialDescriptionRequest.html#getCredentialDescriptions()"/> 
-        /// </summary>
-        public Java.Util.Set<Android.Credentials.CredentialDescription> CredentialDescriptions
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Credentials.CredentialDescription>>("getCredentialDescriptions", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/RegisterCredentialDescriptionRequest.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -83,6 +76,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/RegisterCredentialDescriptionRequest.html#getCredentialDescriptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Credentials.CredentialDescription> GetCredentialDescriptions()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Android.Credentials.CredentialDescription>>("getCredentialDescriptions", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/RegisterCredentialDescriptionRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Credentials/UnregisterCredentialDescriptionRequest.cs b/src/net/Netdroid/Generated/Android/Credentials/UnregisterCredentialDescriptionRequest.cs
index e09d72162..27ff2fc3e 100644
--- a/src/net/Netdroid/Generated/Android/Credentials/UnregisterCredentialDescriptionRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Credentials/UnregisterCredentialDescriptionRequest.cs
@@ -68,13 +68,6 @@ public UnregisterCredentialDescriptionRequest(Java.Util.Set<Android.Credentials.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/credentials/UnregisterCredentialDescriptionRequest.html#getCredentialDescriptions()"/> 
-        /// </summary>
-        public Java.Util.Set<Android.Credentials.CredentialDescription> CredentialDescriptions
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Credentials.CredentialDescription>>("getCredentialDescriptions", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/UnregisterCredentialDescriptionRequest.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -83,6 +76,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/credentials/UnregisterCredentialDescriptionRequest.html#getCredentialDescriptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Credentials.CredentialDescription> GetCredentialDescriptions()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Android.Credentials.CredentialDescription>>("getCredentialDescriptions", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/credentials/UnregisterCredentialDescriptionRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Database/AbstractCursor.cs b/src/net/Netdroid/Generated/Android/Database/AbstractCursor.cs
index 586d4c878..38a039aaf 100644
--- a/src/net/Netdroid/Generated/Android/Database/AbstractCursor.cs
+++ b/src/net/Netdroid/Generated/Android/Database/AbstractCursor.cs
@@ -46,69 +46,6 @@ public partial class AbstractCursor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getColumnCount()"/> 
-        /// </summary>
-        public int ColumnCount
-        {
-            get { return IExecuteWithSignature<int>("getColumnCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getColumnNames()"/> 
-        /// </summary>
-        public Java.Lang.String[] ColumnNames
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getColumnNames", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getExtras()"/> <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#setExtras(android.os.Bundle)"/>
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getNotificationUri()"/> 
-        /// </summary>
-        public Android.Net.Uri NotificationUri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getNotificationUri", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getNotificationUris()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Net.Uri> NotificationUris
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getNotificationUris", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getPosition()"/> 
-        /// </summary>
-        public int Position
-        {
-            get { return IExecuteWithSignature<int>("getPosition", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getWantsAllOnMoveCalls()"/> 
-        /// </summary>
-        public bool WantsAllOnMoveCalls
-        {
-            get { return IExecuteWithSignature<bool>("getWantsAllOnMoveCalls", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getWindow()"/> 
-        /// </summary>
-        public Android.Database.CursorWindow Window
-        {
-            get { return IExecuteWithSignature<Android.Database.CursorWindow>("getWindow", "()Landroid/database/CursorWindow;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#isNull(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -136,6 +73,14 @@ public float GetFloat(int arg0)
             return IExecuteWithSignature<float>("getFloat", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCount()
+        {
+            return IExecuteWithSignature<int>("getCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -154,6 +99,14 @@ public Java.Lang.String GetString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getColumnNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetColumnNames()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getColumnNames", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -172,6 +125,30 @@ public short GetShort(int arg0)
             return IExecuteWithSignature<short>("getShort", "(I)S", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getWindow()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Database.CursorWindow"/></returns>
+        public Android.Database.CursorWindow GetWindow()
+        {
+            return IExecuteWithSignature<Android.Database.CursorWindow>("getWindow", "()Landroid/database/CursorWindow;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getNotificationUri()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetNotificationUri()
+        {
+            return IExecuteWithSignature<Android.Net.Uri>("getNotificationUri", "()Landroid/net/Uri;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getExtras()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#respond(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
@@ -181,6 +158,14 @@ public Android.Os.Bundle Respond(Android.Os.Bundle arg0)
             return IExecuteWithSignature<Android.Os.Bundle>("respond", "(Landroid/os/Bundle;)Landroid/os/Bundle;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getWantsAllOnMoveCalls()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetWantsAllOnMoveCalls()
+        {
+            return IExecuteWithSignature<bool>("getWantsAllOnMoveCalls", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#isClosed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -298,6 +283,22 @@ public bool MoveToPrevious()
             return IExecuteWithSignature<bool>("moveToPrevious", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPosition()
+        {
+            return IExecuteWithSignature<int>("getPosition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getColumnCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnCount()
+        {
+            return IExecuteWithSignature<int>("getColumnCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getColumnIndex(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -334,6 +335,14 @@ public Java.Lang.String GetColumnName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getColumnName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#getNotificationUris()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Uri> GetNotificationUris()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getNotificationUris", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#close()"/>
         /// </summary>
         public void Close()
@@ -382,6 +391,14 @@ public void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
             IExecuteWithSignature("registerDataSetObserver", "(Landroid/database/DataSetObserver;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#setExtras(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        public void SetExtras(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/AbstractCursor.html#setNotificationUri(android.content.ContentResolver,android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Database/AbstractWindowedCursor.cs b/src/net/Netdroid/Generated/Android/Database/AbstractWindowedCursor.cs
index d97b4985f..6ad1dfaed 100644
--- a/src/net/Netdroid/Generated/Android/Database/AbstractWindowedCursor.cs
+++ b/src/net/Netdroid/Generated/Android/Database/AbstractWindowedCursor.cs
@@ -58,7 +58,7 @@ public bool HasWindow()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsBlob(int arg0)
         {
             return IExecuteWithSignature<bool>("isBlob", "(I)Z", arg0);
@@ -68,7 +68,7 @@ public bool IsBlob(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsFloat(int arg0)
         {
             return IExecuteWithSignature<bool>("isFloat", "(I)Z", arg0);
@@ -78,7 +78,7 @@ public bool IsFloat(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsLong(int arg0)
         {
             return IExecuteWithSignature<bool>("isLong", "(I)Z", arg0);
@@ -88,7 +88,7 @@ public bool IsLong(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsString(int arg0)
         {
             return IExecuteWithSignature<bool>("isString", "(I)Z", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Database/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Database/AllPackageClasses.cs
index d040c9980..cce6cda9d 100644
--- a/src/net/Netdroid/Generated/Android/Database/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Database/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class AbstractCursor : Android.Database.CrossProcessCursor
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractCursor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractCursor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -82,12 +82,12 @@ public partial class AbstractWindowedCursor : Android.Database.AbstractCursor
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractWindowedCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractWindowedCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractWindowedCursor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractWindowedCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractWindowedCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractWindowedCursor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -216,12 +216,12 @@ public partial class ContentObserver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ContentObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentObserver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ContentObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentObserver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -262,12 +262,12 @@ public partial class CrossProcessCursor : Android.Database.Cursor
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CrossProcessCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CrossProcessCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CrossProcessCursor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CrossProcessCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CrossProcessCursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CrossProcessCursor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -352,12 +352,12 @@ public partial class Cursor : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Cursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Cursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Cursor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Cursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Cursor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Cursor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -608,12 +608,12 @@ public partial class DatabaseErrorHandler : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DatabaseErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatabaseErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatabaseErrorHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DatabaseErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatabaseErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatabaseErrorHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -688,7 +688,7 @@ public DatabaseUtils(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/DatabaseUtils.InsertHelper.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class InsertHelper : MASES.JCOBridge.C2JBridge.JVMBridgeBase<InsertHelper>
         {
             const string _bridgeClassName = "android.database.DatabaseUtils$InsertHelper";
@@ -787,12 +787,12 @@ public partial class DataSetObserver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<D
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DataSetObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DataSetObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DataSetObserver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DataSetObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DataSetObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DataSetObserver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1009,12 +1009,12 @@ public partial class Observable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Observ
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Observable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Observable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Observable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Observable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Observable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Observable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1056,12 +1056,12 @@ public partial class Observable<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Obs
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Observable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Observable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Observable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Observable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Observable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Observable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Database/ContentObservable.cs b/src/net/Netdroid/Generated/Android/Database/ContentObservable.cs
index 5ab704628..5307ee553 100644
--- a/src/net/Netdroid/Generated/Android/Database/ContentObservable.cs
+++ b/src/net/Netdroid/Generated/Android/Database/ContentObservable.cs
@@ -58,7 +58,7 @@ public void DispatchChange(bool arg0, Android.Net.Uri arg1)
         /// <see href="https://developer.android.com/reference/android/database/ContentObservable.html#dispatchChange(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchChange(bool arg0)
         {
             IExecuteWithSignature("dispatchChange", "(Z)V", arg0);
@@ -67,7 +67,7 @@ public void DispatchChange(bool arg0)
         /// <see href="https://developer.android.com/reference/android/database/ContentObservable.html#notifyChange(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void NotifyChange(bool arg0)
         {
             IExecuteWithSignature("notifyChange", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Database/ContentObserver.cs b/src/net/Netdroid/Generated/Android/Database/ContentObserver.cs
index a64ac5d41..0be6f14be 100644
--- a/src/net/Netdroid/Generated/Android/Database/ContentObserver.cs
+++ b/src/net/Netdroid/Generated/Android/Database/ContentObserver.cs
@@ -94,7 +94,7 @@ public void DispatchChange(bool arg0, Java.Util.Collection<Android.Net.Uri> arg1
         /// <see href="https://developer.android.com/reference/android/database/ContentObserver.html#dispatchChange(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchChange(bool arg0)
         {
             IExecuteWithSignature("dispatchChange", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Database/CrossProcessCursor.cs b/src/net/Netdroid/Generated/Android/Database/CrossProcessCursor.cs
index 798509d21..6cf8b00da 100644
--- a/src/net/Netdroid/Generated/Android/Database/CrossProcessCursor.cs
+++ b/src/net/Netdroid/Generated/Android/Database/CrossProcessCursor.cs
@@ -64,11 +64,12 @@ public partial class CrossProcessCursor : Android.Database.ICrossProcessCursor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CrossProcessCursor.html#getWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/CrossProcessCursor.html#getWindow()"/>
         /// </summary>
-        public Android.Database.CursorWindow Window
+        /// <returns><see cref="Android.Database.CursorWindow"/></returns>
+        public Android.Database.CursorWindow GetWindow()
         {
-            get { return IExecuteWithSignature<Android.Database.CursorWindow>("getWindow", "()Landroid/database/CursorWindow;"); }
+            return IExecuteWithSignature<Android.Database.CursorWindow>("getWindow", "()Landroid/database/CursorWindow;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CrossProcessCursor.html#onMove(int,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Database/CrossProcessCursorWrapper.cs b/src/net/Netdroid/Generated/Android/Database/CrossProcessCursorWrapper.cs
index 914b44a9e..6865dc630 100644
--- a/src/net/Netdroid/Generated/Android/Database/CrossProcessCursorWrapper.cs
+++ b/src/net/Netdroid/Generated/Android/Database/CrossProcessCursorWrapper.cs
@@ -58,11 +58,12 @@ public CrossProcessCursorWrapper(Android.Database.Cursor arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CrossProcessCursorWrapper.html#getWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/CrossProcessCursorWrapper.html#getWindow()"/>
         /// </summary>
-        public Android.Database.CursorWindow Window
+        /// <returns><see cref="Android.Database.CursorWindow"/></returns>
+        public Android.Database.CursorWindow GetWindow()
         {
-            get { return IExecuteWithSignature<Android.Database.CursorWindow>("getWindow", "()Landroid/database/CursorWindow;"); }
+            return IExecuteWithSignature<Android.Database.CursorWindow>("getWindow", "()Landroid/database/CursorWindow;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CrossProcessCursorWrapper.html#onMove(int,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Database/Cursor.cs b/src/net/Netdroid/Generated/Android/Database/Cursor.cs
index eebf5b51e..c0d187058 100644
--- a/src/net/Netdroid/Generated/Android/Database/Cursor.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Cursor.cs
@@ -94,60 +94,20 @@ public partial class Cursor : Android.Database.ICursor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getColumnCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getNotificationUri()"/>
         /// </summary>
-        public int ColumnCount
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetNotificationUri()
         {
-            get { return IExecuteWithSignature<int>("getColumnCount", "()I"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getNotificationUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getColumnNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getExtras()"/>
         /// </summary>
-        public Java.Lang.String[] ColumnNames
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getColumnNames", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getExtras()"/> <see href="https://developer.android.com/reference/android/database/Cursor.html#setExtras(android.os.Bundle)"/>
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getNotificationUri()"/> 
-        /// </summary>
-        public Android.Net.Uri NotificationUri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getNotificationUri", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getNotificationUris()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Net.Uri> NotificationUris
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getNotificationUris", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getPosition()"/> 
-        /// </summary>
-        public int Position
-        {
-            get { return IExecuteWithSignature<int>("getPosition", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getWantsAllOnMoveCalls()"/> 
-        /// </summary>
-        public bool WantsAllOnMoveCalls
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<bool>("getWantsAllOnMoveCalls", "()Z"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#respond(android.os.Bundle)"/>
@@ -159,6 +119,14 @@ public Android.Os.Bundle Respond(Android.Os.Bundle arg0)
             return IExecuteWithSignature<Android.Os.Bundle>("respond", "(Landroid/os/Bundle;)Landroid/os/Bundle;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getWantsAllOnMoveCalls()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetWantsAllOnMoveCalls()
+        {
+            return IExecuteWithSignature<bool>("getWantsAllOnMoveCalls", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#isAfterLast()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -261,7 +229,7 @@ public bool MoveToPrevious()
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#requery()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Requery()
         {
             return IExecuteWithSignature<bool>("requery", "()Z");
@@ -294,6 +262,14 @@ public float GetFloat(int arg0)
             return IExecuteWithSignature<float>("getFloat", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getColumnCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnCount()
+        {
+            return IExecuteWithSignature<int>("getColumnCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getColumnIndex(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -313,6 +289,14 @@ public int GetColumnIndexOrThrow(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getColumnIndexOrThrow", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCount()
+        {
+            return IExecuteWithSignature<int>("getCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -322,6 +306,14 @@ public int GetInt(int arg0)
             return IExecuteWithSignature<int>("getInt", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPosition()
+        {
+            return IExecuteWithSignature<int>("getPosition", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -349,6 +341,14 @@ public Java.Lang.String GetString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getColumnNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetColumnNames()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getColumnNames", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -385,7 +385,7 @@ public void CopyStringToBuffer(int arg0, Android.Database.CharArrayBuffer arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#deactivate()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Deactivate()
         {
             IExecuteWithSignature("deactivate", "()V");
@@ -407,6 +407,14 @@ public void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
             IExecuteWithSignature("registerDataSetObserver", "(Landroid/database/DataSetObserver;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#setExtras(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        public void SetExtras(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#setNotificationUri(android.content.ContentResolver,android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
@@ -432,6 +440,14 @@ public void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
             IExecuteWithSignature("unregisterDataSetObserver", "(Landroid/database/DataSetObserver;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/Cursor.html#getNotificationUris()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Uri> GetNotificationUris()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getNotificationUris", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/Cursor.html#setNotificationUris(android.content.ContentResolver,java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Database/CursorWindow.cs b/src/net/Netdroid/Generated/Android/Database/CursorWindow.cs
index 2741a18cc..614a5867d 100644
--- a/src/net/Netdroid/Generated/Android/Database/CursorWindow.cs
+++ b/src/net/Netdroid/Generated/Android/Database/CursorWindow.cs
@@ -33,7 +33,7 @@ public partial class CursorWindow
         /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public CursorWindow(bool arg0)
             : base(arg0)
         {
@@ -91,20 +91,6 @@ public static Android.Database.CursorWindow NewFromParcel(Android.Os.Parcel arg0
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#getNumRows()"/> 
-        /// </summary>
-        public int NumRows
-        {
-            get { return IExecuteWithSignature<int>("getNumRows", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#getStartPosition()"/> <see href="https://developer.android.com/reference/android/database/CursorWindow.html#setStartPosition(int)"/>
-        /// </summary>
-        public int StartPosition
-        {
-            get { return IExecuteWithSignature<int>("getStartPosition", "()I"); } set { IExecuteWithSignature("setStartPosition", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#allocRow()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -118,7 +104,7 @@ public bool AllocRow()
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsBlob(int arg0, int arg1)
         {
             return IExecute<bool>("isBlob", arg0, arg1);
@@ -129,7 +115,7 @@ public bool IsBlob(int arg0, int arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsFloat(int arg0, int arg1)
         {
             return IExecute<bool>("isFloat", arg0, arg1);
@@ -140,7 +126,7 @@ public bool IsFloat(int arg0, int arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsLong(int arg0, int arg1)
         {
             return IExecute<bool>("isLong", arg0, arg1);
@@ -151,7 +137,7 @@ public bool IsLong(int arg0, int arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsNull(int arg0, int arg1)
         {
             return IExecute<bool>("isNull", arg0, arg1);
@@ -162,7 +148,7 @@ public bool IsNull(int arg0, int arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsString(int arg0, int arg1)
         {
             return IExecute<bool>("isString", arg0, arg1);
@@ -279,6 +265,22 @@ public int GetInt(int arg0, int arg1)
             return IExecute<int>("getInt", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#getNumRows()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumRows()
+        {
+            return IExecuteWithSignature<int>("getNumRows", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#getStartPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStartPosition()
+        {
+            return IExecuteWithSignature<int>("getStartPosition", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#getType(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -343,6 +345,14 @@ public void FreeLastRow()
             IExecuteWithSignature("freeLastRow", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#setStartPosition(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetStartPosition(int arg0)
+        {
+            IExecuteWithSignature("setStartPosition", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWindow.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Database/CursorWrapper.cs b/src/net/Netdroid/Generated/Android/Database/CursorWrapper.cs
index fc19f8043..115bb22b1 100644
--- a/src/net/Netdroid/Generated/Android/Database/CursorWrapper.cs
+++ b/src/net/Netdroid/Generated/Android/Database/CursorWrapper.cs
@@ -54,67 +54,28 @@ public CursorWrapper(Android.Database.Cursor arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getColumnCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getWrappedCursor()"/>
         /// </summary>
-        public int ColumnCount
+        /// <returns><see cref="Android.Database.Cursor"/></returns>
+        public Android.Database.Cursor GetWrappedCursor()
         {
-            get { return IExecuteWithSignature<int>("getColumnCount", "()I"); }
+            return IExecuteWithSignature<Android.Database.Cursor>("getWrappedCursor", "()Landroid/database/Cursor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getColumnNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getNotificationUri()"/>
         /// </summary>
-        public Java.Lang.String[] ColumnNames
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetNotificationUri()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getColumnNames", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getNotificationUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getExtras()"/>
         /// </summary>
-        public int Count
-        {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getExtras()"/> <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#setExtras(android.os.Bundle)"/>
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getNotificationUri()"/> 
-        /// </summary>
-        public Android.Net.Uri NotificationUri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getNotificationUri", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getNotificationUris()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Net.Uri> NotificationUris
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getNotificationUris", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getPosition()"/> 
-        /// </summary>
-        public int Position
-        {
-            get { return IExecuteWithSignature<int>("getPosition", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getWantsAllOnMoveCalls()"/> 
-        /// </summary>
-        public bool WantsAllOnMoveCalls
-        {
-            get { return IExecuteWithSignature<bool>("getWantsAllOnMoveCalls", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getWrappedCursor()"/> 
-        /// </summary>
-        public Android.Database.Cursor WrappedCursor
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Database.Cursor>("getWrappedCursor", "()Landroid/database/Cursor;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#respond(android.os.Bundle)"/>
@@ -126,6 +87,14 @@ public Android.Os.Bundle Respond(Android.Os.Bundle arg0)
             return IExecuteWithSignature<Android.Os.Bundle>("respond", "(Landroid/os/Bundle;)Landroid/os/Bundle;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getWantsAllOnMoveCalls()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetWantsAllOnMoveCalls()
+        {
+            return IExecuteWithSignature<bool>("getWantsAllOnMoveCalls", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#isAfterLast()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -228,7 +197,7 @@ public bool MoveToPrevious()
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#requery()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Requery()
         {
             return IExecuteWithSignature<bool>("requery", "()Z");
@@ -261,6 +230,14 @@ public float GetFloat(int arg0)
             return IExecuteWithSignature<float>("getFloat", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getColumnCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnCount()
+        {
+            return IExecuteWithSignature<int>("getColumnCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getColumnIndex(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -280,6 +257,14 @@ public int GetColumnIndexOrThrow(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getColumnIndexOrThrow", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCount()
+        {
+            return IExecuteWithSignature<int>("getCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -289,6 +274,14 @@ public int GetInt(int arg0)
             return IExecuteWithSignature<int>("getInt", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPosition()
+        {
+            return IExecuteWithSignature<int>("getPosition", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -316,6 +309,22 @@ public Java.Lang.String GetString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getColumnNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetColumnNames()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getColumnNames", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getNotificationUris()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Uri> GetNotificationUris()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getNotificationUris", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#getLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -352,7 +361,7 @@ public void CopyStringToBuffer(int arg0, Android.Database.CharArrayBuffer arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#deactivate()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Deactivate()
         {
             IExecuteWithSignature("deactivate", "()V");
@@ -374,6 +383,14 @@ public void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
             IExecuteWithSignature("registerDataSetObserver", "(Landroid/database/DataSetObserver;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#setExtras(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        public void SetExtras(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/CursorWrapper.html#setNotificationUri(android.content.ContentResolver,android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Database/DatabaseUtils.cs b/src/net/Netdroid/Generated/Android/Database/DatabaseUtils.cs
index 774eef3ab..a3e9c331f 100644
--- a/src/net/Netdroid/Generated/Android/Database/DatabaseUtils.cs
+++ b/src/net/Netdroid/Generated/Android/Database/DatabaseUtils.cs
@@ -578,7 +578,7 @@ public partial class InsertHelper
             /// </summary>
             /// <param name="arg0"><see cref="Android.Database.Sqlite.SQLiteDatabase"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public InsertHelper(Android.Database.Sqlite.SQLiteDatabase arg0, Java.Lang.String arg1)
                 : base(arg0, arg1)
             {
@@ -604,7 +604,7 @@ public InsertHelper(Android.Database.Sqlite.SQLiteDatabase arg0, Java.Lang.Strin
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="int"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int GetColumnIndex(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<int>("getColumnIndex", "(Ljava/lang/String;)I", arg0);
@@ -613,7 +613,7 @@ public int GetColumnIndex(Java.Lang.String arg0)
             /// <see href="https://developer.android.com/reference/android/database/DatabaseUtils.InsertHelper.html#execute()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public long Execute()
             {
                 return IExecuteWithSignature<long>("execute", "()J");
@@ -623,7 +623,7 @@ public long Execute()
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.ContentValues"/></param>
             /// <returns><see cref="long"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public long Insert(Android.Content.ContentValues arg0)
             {
                 return IExecuteWithSignature<long>("insert", "(Landroid/content/ContentValues;)J", arg0);
@@ -633,7 +633,7 @@ public long Insert(Android.Content.ContentValues arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.ContentValues"/></param>
             /// <returns><see cref="long"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public long Replace(Android.Content.ContentValues arg0)
             {
                 return IExecuteWithSignature<long>("replace", "(Landroid/content/ContentValues;)J", arg0);
@@ -643,7 +643,7 @@ public long Replace(Android.Content.ContentValues arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Bind(int arg0, bool arg1)
             {
                 IExecute("bind", arg0, arg1);
@@ -653,7 +653,7 @@ public void Bind(int arg0, bool arg1)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="byte"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Bind(int arg0, byte[] arg1)
             {
                 IExecute("bind", arg0, arg1);
@@ -663,7 +663,7 @@ public void Bind(int arg0, byte[] arg1)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="double"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Bind(int arg0, double arg1)
             {
                 IExecute("bind", arg0, arg1);
@@ -673,7 +673,7 @@ public void Bind(int arg0, double arg1)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="float"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Bind(int arg0, float arg1)
             {
                 IExecute("bind", arg0, arg1);
@@ -683,7 +683,7 @@ public void Bind(int arg0, float arg1)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Bind(int arg0, int arg1)
             {
                 IExecute("bind", arg0, arg1);
@@ -693,7 +693,7 @@ public void Bind(int arg0, int arg1)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Bind(int arg0, Java.Lang.String arg1)
             {
                 IExecute("bind", arg0, arg1);
@@ -703,7 +703,7 @@ public void Bind(int arg0, Java.Lang.String arg1)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="long"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Bind(int arg0, long arg1)
             {
                 IExecute("bind", arg0, arg1);
@@ -712,7 +712,7 @@ public void Bind(int arg0, long arg1)
             /// <see href="https://developer.android.com/reference/android/database/DatabaseUtils.InsertHelper.html#bindNull(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void BindNull(int arg0)
             {
                 IExecuteWithSignature("bindNull", "(I)V", arg0);
@@ -720,7 +720,7 @@ public void BindNull(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/database/DatabaseUtils.InsertHelper.html#close()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Close()
             {
                 IExecuteWithSignature("close", "()V");
@@ -728,7 +728,7 @@ public void Close()
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/database/DatabaseUtils.InsertHelper.html#prepareForInsert()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void PrepareForInsert()
             {
                 IExecuteWithSignature("prepareForInsert", "()V");
@@ -736,7 +736,7 @@ public void PrepareForInsert()
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/database/DatabaseUtils.InsertHelper.html#prepareForReplace()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void PrepareForReplace()
             {
                 IExecuteWithSignature("prepareForReplace", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Database/Sqlite/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Database/Sqlite/AllPackageClasses.cs
index ba4817a2c..2611ee20a 100644
--- a/src/net/Netdroid/Generated/Android/Database/Sqlite/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Sqlite/AllPackageClasses.cs
@@ -121,12 +121,12 @@ public partial class SQLiteClosable : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SQLiteClosable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLiteClosable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLiteClosable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SQLiteClosable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLiteClosable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLiteClosable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -228,12 +228,12 @@ public partial class SQLiteCursorDriver : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SQLiteCursorDriver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLiteCursorDriver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLiteCursorDriver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SQLiteCursorDriver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLiteCursorDriver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLiteCursorDriver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -314,12 +314,12 @@ public partial class CursorFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cur
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CursorFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CursorFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CursorFactory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CursorFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CursorFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CursorFactory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -588,12 +588,12 @@ public partial class SQLiteOpenHelper : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SQLiteOpenHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLiteOpenHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLiteOpenHelper() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SQLiteOpenHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLiteOpenHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLiteOpenHelper(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -651,12 +651,12 @@ public partial class SQLiteProgram : Android.Database.Sqlite.SQLiteClosable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SQLiteProgram class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLiteProgram class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLiteProgram() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SQLiteProgram class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLiteProgram class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLiteProgram(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -864,10 +864,13 @@ public partial class SQLiteTransactionListener : MASES.JCOBridge.C2JBridge.JVMBr
         /// </summary>
         public SQLiteTransactionListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.database.sqlite.SQLiteTransactionListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.database.sqlite.SQLiteTransactionListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -889,10 +892,13 @@ public partial class SQLiteTransactionListenerDirect : SQLiteTransactionListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.database.sqlite.SQLiteTransactionListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.database.sqlite.SQLiteTransactionListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteClosable.cs b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteClosable.cs
index b9e073941..72b2b99c3 100644
--- a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteClosable.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteClosable.cs
@@ -69,7 +69,7 @@ public void ReleaseReference()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteClosable.html#releaseReferenceFromContainer()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ReleaseReferenceFromContainer()
         {
             IExecuteWithSignature("releaseReferenceFromContainer", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteCursor.cs b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteCursor.cs
index b6d922df4..e2ae75f54 100644
--- a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteCursor.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteCursor.cs
@@ -46,7 +46,7 @@ public SQLiteCursor(Android.Database.Sqlite.SQLiteCursorDriver arg0, Java.Lang.S
         /// <param name="arg1"><see cref="Android.Database.Sqlite.SQLiteCursorDriver"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Android.Database.Sqlite.SQLiteQuery"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SQLiteCursor(Android.Database.Sqlite.SQLiteDatabase arg0, Android.Database.Sqlite.SQLiteCursorDriver arg1, Java.Lang.String arg2, Android.Database.Sqlite.SQLiteQuery arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -68,11 +68,12 @@ public SQLiteCursor(Android.Database.Sqlite.SQLiteDatabase arg0, Android.Databas
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteCursor.html#getDatabase()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteCursor.html#getDatabase()"/>
         /// </summary>
-        public Android.Database.Sqlite.SQLiteDatabase Database
+        /// <returns><see cref="Android.Database.Sqlite.SQLiteDatabase"/></returns>
+        public Android.Database.Sqlite.SQLiteDatabase GetDatabase()
         {
-            get { return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase>("getDatabase", "()Landroid/database/sqlite/SQLiteDatabase;"); }
+            return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase>("getDatabase", "()Landroid/database/sqlite/SQLiteDatabase;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteCursor.html#setFillWindowForwardOnly(boolean)"/>
diff --git a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteDatabase.cs b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteDatabase.cs
index e4df05cb2..674f3604b 100644
--- a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteDatabase.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteDatabase.cs
@@ -292,49 +292,6 @@ public static Java.Lang.String FindEditTable(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getAttachedDbs()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Util.Pair<Java.Lang.String, Java.Lang.String>> AttachedDbs
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.String, Java.Lang.String>>>("getAttachedDbs", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getMaximumSize()"/> 
-        /// </summary>
-        public long MaximumSize
-        {
-            get { return IExecuteWithSignature<long>("getMaximumSize", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getPageSize()"/> <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#setPageSize(long)"/>
-        /// </summary>
-        public long PageSize
-        {
-            get { return IExecuteWithSignature<long>("getPageSize", "()J"); } set { IExecuteWithSignature("setPageSize", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getPath()"/> 
-        /// </summary>
-        public Java.Lang.String Path
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getSyncedTables()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Map<Java.Lang.String, Java.Lang.String> SyncedTables
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getSyncedTables", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getVersion()"/> <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#setVersion(int)"/>
-        /// </summary>
-        public int Version
-        {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); } set { IExecuteWithSignature("setVersion", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#query(boolean,java.lang.String,java.lang.String[],java.lang.String,java.lang.String[],java.lang.String,java.lang.String,java.lang.String,java.lang.String,android.os.CancellationSignal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -529,7 +486,7 @@ public bool IsDbLockedByCurrentThread()
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#isDbLockedByOtherThreads()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsDbLockedByOtherThreads()
         {
             return IExecuteWithSignature<bool>("isDbLockedByOtherThreads", "()Z");
@@ -571,7 +528,7 @@ public bool NeedUpgrade(int arg0)
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#yieldIfContended()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool YieldIfContended()
         {
             return IExecuteWithSignature<bool>("yieldIfContended", "()Z");
@@ -605,6 +562,14 @@ public int Delete(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String
             return IExecute<int>("delete", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
+        {
+            return IExecuteWithSignature<int>("getVersion", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#update(java.lang.String,android.content.ContentValues,java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -630,6 +595,47 @@ public int UpdateWithOnConflict(Java.Lang.String arg0, Android.Content.ContentVa
             return IExecute<int>("updateWithOnConflict", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getPath()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPath()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getAttachedDbs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Util.Pair<Java.Lang.String, Java.Lang.String>> GetAttachedDbs()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.String, Java.Lang.String>>>("getAttachedDbs", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getSyncedTables()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Map<Java.Lang.String, Java.Lang.String> GetSyncedTables()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getSyncedTables", "()Ljava/util/Map;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getMaximumSize()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetMaximumSize()
+        {
+            return IExecuteWithSignature<long>("getMaximumSize", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#getPageSize()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetPageSize()
+        {
+            return IExecuteWithSignature<long>("getPageSize", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#insert(java.lang.String,java.lang.String,android.content.ContentValues)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -775,7 +781,7 @@ public void ExecSQL(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void MarkTableSyncable(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
             IExecute("markTableSyncable", arg0, arg1, arg2);
@@ -785,7 +791,7 @@ public void MarkTableSyncable(Java.Lang.String arg0, Java.Lang.String arg1, Java
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void MarkTableSyncable(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             IExecute("markTableSyncable", arg0, arg1);
@@ -830,7 +836,7 @@ public void SetLocale(Java.Util.Locale arg0)
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#setLockingEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetLockingEnabled(bool arg0)
         {
             IExecuteWithSignature("setLockingEnabled", "(Z)V", arg0);
@@ -844,6 +850,14 @@ public void SetMaxSqlCacheSize(int arg0)
             IExecuteWithSignature("setMaxSqlCacheSize", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#setPageSize(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetPageSize(long arg0)
+        {
+            IExecuteWithSignature("setPageSize", "(J)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#setTransactionSuccessful()"/>
         /// </summary>
         public void SetTransactionSuccessful()
@@ -851,6 +865,14 @@ public void SetTransactionSuccessful()
             IExecuteWithSignature("setTransactionSuccessful", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#setVersion(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVersion(int arg0)
+        {
+            IExecuteWithSignature("setVersion", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.html#validateSql(java.lang.String,android.os.CancellationSignal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -927,60 +949,68 @@ public partial class OpenParams
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getErrorHandler()"/> 
+            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getErrorHandler()"/>
             /// </summary>
-            public Android.Database.DatabaseErrorHandler ErrorHandler
+            /// <returns><see cref="Android.Database.DatabaseErrorHandler"/></returns>
+            public Android.Database.DatabaseErrorHandler GetErrorHandler()
             {
-                get { return IExecuteWithSignature<Android.Database.DatabaseErrorHandler>("getErrorHandler", "()Landroid/database/DatabaseErrorHandler;"); }
+                return IExecuteWithSignature<Android.Database.DatabaseErrorHandler>("getErrorHandler", "()Landroid/database/DatabaseErrorHandler;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getCursorFactory()"/> 
+            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getCursorFactory()"/>
             /// </summary>
-            public Android.Database.Sqlite.SQLiteDatabase.CursorFactory GetCursorFactory
+            /// <returns><see cref="Android.Database.Sqlite.SQLiteDatabase.CursorFactory"/></returns>
+            public Android.Database.Sqlite.SQLiteDatabase.CursorFactory GetCursorFactory()
             {
-                get { return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase.CursorFactory>("getCursorFactory", "()Landroid/database/sqlite/SQLiteDatabase$CursorFactory;"); }
+                return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase.CursorFactory>("getCursorFactory", "()Landroid/database/sqlite/SQLiteDatabase$CursorFactory;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getIdleConnectionTimeout()"/> 
+            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getLookasideSlotCount()"/>
             /// </summary>
-            public long IdleConnectionTimeout
+            /// <returns><see cref="int"/></returns>
+            public int GetLookasideSlotCount()
             {
-                get { return IExecuteWithSignature<long>("getIdleConnectionTimeout", "()J"); }
+                return IExecuteWithSignature<int>("getLookasideSlotCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getJournalMode()"/> 
+            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getLookasideSlotSize()"/>
             /// </summary>
-            public Java.Lang.String JournalMode
+            /// <returns><see cref="int"/></returns>
+            public int GetLookasideSlotSize()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getJournalMode", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getLookasideSlotSize", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getLookasideSlotCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getOpenFlags()"/>
             /// </summary>
-            public int LookasideSlotCount
+            /// <returns><see cref="int"/></returns>
+            public int GetOpenFlags()
             {
-                get { return IExecuteWithSignature<int>("getLookasideSlotCount", "()I"); }
+                return IExecuteWithSignature<int>("getOpenFlags", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getLookasideSlotSize()"/> 
+            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getJournalMode()"/>
             /// </summary>
-            public int LookasideSlotSize
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetJournalMode()
             {
-                get { return IExecuteWithSignature<int>("getLookasideSlotSize", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getJournalMode", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getOpenFlags()"/> 
+            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getSynchronousMode()"/>
             /// </summary>
-            public int OpenFlags
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetSynchronousMode()
             {
-                get { return IExecuteWithSignature<int>("getOpenFlags", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getSynchronousMode", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getSynchronousMode()"/> 
+            /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase.OpenParams.html#getIdleConnectionTimeout()"/>
             /// </summary>
-            public Java.Lang.String SynchronousMode
+            /// <returns><see cref="long"/></returns>
+            public long GetIdleConnectionTimeout()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getSynchronousMode", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<long>("getIdleConnectionTimeout", "()J");
             }
 
             #endregion
@@ -1063,7 +1093,7 @@ public Android.Database.Sqlite.SQLiteDatabase.OpenParams.Builder SetErrorHandler
                 /// </summary>
                 /// <param name="arg0"><see cref="long"/></param>
                 /// <returns><see cref="Android.Database.Sqlite.SQLiteDatabase.OpenParams.Builder"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public Android.Database.Sqlite.SQLiteDatabase.OpenParams.Builder SetIdleConnectionTimeout(long arg0)
                 {
                     return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase.OpenParams.Builder>("setIdleConnectionTimeout", "(J)Landroid/database/sqlite/SQLiteDatabase$OpenParams$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteOpenHelper.cs b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteOpenHelper.cs
index fdb0ec785..5e564df9b 100644
--- a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteOpenHelper.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteOpenHelper.cs
@@ -80,43 +80,46 @@ public SQLiteOpenHelper(Android.Content.Context arg0, Java.Lang.String arg1, int
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#getDatabaseName()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#onCreate(android.database.sqlite.SQLiteDatabase)"/>
         /// </summary>
-        public Java.Lang.String DatabaseName
+        /// <param name="arg0"><see cref="Android.Database.Sqlite.SQLiteDatabase"/></param>
+        public void OnCreate(Android.Database.Sqlite.SQLiteDatabase arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;"); }
+            IExecuteWithSignature("onCreate", "(Landroid/database/sqlite/SQLiteDatabase;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#getReadableDatabase()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#onUpgrade(android.database.sqlite.SQLiteDatabase,int,int)"/>
         /// </summary>
-        public Android.Database.Sqlite.SQLiteDatabase ReadableDatabase
+        /// <param name="arg0"><see cref="Android.Database.Sqlite.SQLiteDatabase"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        public void OnUpgrade(Android.Database.Sqlite.SQLiteDatabase arg0, int arg1, int arg2)
         {
-            get { return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase>("getReadableDatabase", "()Landroid/database/sqlite/SQLiteDatabase;"); }
+            IExecute("onUpgrade", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#getWritableDatabase()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#getReadableDatabase()"/>
         /// </summary>
-        public Android.Database.Sqlite.SQLiteDatabase WritableDatabase
+        /// <returns><see cref="Android.Database.Sqlite.SQLiteDatabase"/></returns>
+        public Android.Database.Sqlite.SQLiteDatabase GetReadableDatabase()
         {
-            get { return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase>("getWritableDatabase", "()Landroid/database/sqlite/SQLiteDatabase;"); }
+            return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase>("getReadableDatabase", "()Landroid/database/sqlite/SQLiteDatabase;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#onCreate(android.database.sqlite.SQLiteDatabase)"/>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#getWritableDatabase()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Sqlite.SQLiteDatabase"/></param>
-        public void OnCreate(Android.Database.Sqlite.SQLiteDatabase arg0)
+        /// <returns><see cref="Android.Database.Sqlite.SQLiteDatabase"/></returns>
+        public Android.Database.Sqlite.SQLiteDatabase GetWritableDatabase()
         {
-            IExecuteWithSignature("onCreate", "(Landroid/database/sqlite/SQLiteDatabase;)V", arg0);
+            return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase>("getWritableDatabase", "()Landroid/database/sqlite/SQLiteDatabase;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#onUpgrade(android.database.sqlite.SQLiteDatabase,int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#getDatabaseName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Sqlite.SQLiteDatabase"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public void OnUpgrade(Android.Database.Sqlite.SQLiteDatabase arg0, int arg1, int arg2)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDatabaseName()
         {
-            IExecute("onUpgrade", arg0, arg1, arg2);
+            return IExecuteWithSignature<Java.Lang.String>("getDatabaseName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#close()"/>
@@ -155,7 +158,7 @@ public void OnOpen(Android.Database.Sqlite.SQLiteDatabase arg0)
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteOpenHelper.html#setIdleConnectionTimeout(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIdleConnectionTimeout(long arg0)
         {
             IExecuteWithSignature("setIdleConnectionTimeout", "(J)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteProgram.cs b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteProgram.cs
index 62e55c836..652e42c94 100644
--- a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteProgram.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteProgram.cs
@@ -46,12 +46,13 @@ public partial class SQLiteProgram
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteProgram.html#getUniqueId()"/> 
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteProgram.html#getUniqueId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int UniqueId
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetUniqueId()
         {
-            get { return IExecuteWithSignature<int>("getUniqueId", "()I"); }
+            return IExecuteWithSignature<int>("getUniqueId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteProgram.html#bindAllArgsAsStrings(java.lang.String[])"/>
diff --git a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteQueryBuilder.cs b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteQueryBuilder.cs
index 45b964a8d..9a1675e6b 100644
--- a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteQueryBuilder.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteQueryBuilder.cs
@@ -71,34 +71,6 @@ public static void AppendColumns(Java.Lang.StringBuilder arg0, Java.Lang.String[
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#getCursorFactory()"/> <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory)"/>
-        /// </summary>
-        public Android.Database.Sqlite.SQLiteDatabase.CursorFactory CursorFactory
-        {
-            get { return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase.CursorFactory>("getCursorFactory", "()Landroid/database/sqlite/SQLiteDatabase$CursorFactory;"); } set { IExecuteWithSignature("setCursorFactory", "(Landroid/database/sqlite/SQLiteDatabase$CursorFactory;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#getProjectionGreylist()"/> <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setProjectionGreylist(java.util.Collection)"/>
-        /// </summary>
-        public Java.Util.Collection<Java.Util.Regex.Pattern> ProjectionGreylist
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Util.Regex.Pattern>>("getProjectionGreylist", "()Ljava/util/Collection;"); } set { IExecuteWithSignature("setProjectionGreylist", "(Ljava/util/Collection;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#getProjectionMap()"/> <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setProjectionMap(java.util.Map)"/>
-        /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Lang.String> ProjectionMap
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getProjectionMap", "()Ljava/util/Map;"); } set { IExecuteWithSignature("setProjectionMap", "(Ljava/util/Map;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#getTables()"/> <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setTables(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String Tables
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTables", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setTables", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#query(android.database.sqlite.SQLiteDatabase,java.lang.String[],java.lang.String,java.lang.String[],java.lang.String,java.lang.String,java.lang.String,java.lang.String,android.os.CancellationSignal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Sqlite.SQLiteDatabase"/></param>
@@ -147,6 +119,14 @@ public Android.Database.Cursor Query(Android.Database.Sqlite.SQLiteDatabase arg0
             return IExecute<Android.Database.Cursor>("query", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#getCursorFactory()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Database.Sqlite.SQLiteDatabase.CursorFactory"/></returns>
+        public Android.Database.Sqlite.SQLiteDatabase.CursorFactory GetCursorFactory()
+        {
+            return IExecuteWithSignature<Android.Database.Sqlite.SQLiteDatabase.CursorFactory>("getCursorFactory", "()Landroid/database/sqlite/SQLiteDatabase$CursorFactory;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#isDistinct()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -226,7 +206,7 @@ public Java.Lang.String BuildQuery(Java.Lang.String[] arg0, Java.Lang.String arg
         /// <param name="arg5"><see cref="Java.Lang.String"/></param>
         /// <param name="arg6"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String BuildQuery(Java.Lang.String[] arg0, Java.Lang.String arg1, Java.Lang.String[] arg2, Java.Lang.String arg3, Java.Lang.String arg4, Java.Lang.String arg5, Java.Lang.String arg6)
         {
             return IExecute<Java.Lang.String>("buildQuery", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -271,12 +251,36 @@ public Java.Lang.String BuildUnionSubQuery(Java.Lang.String arg0, Java.Lang.Stri
         /// <param name="arg7"><see cref="Java.Lang.String"/></param>
         /// <param name="arg8"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String BuildUnionSubQuery(Java.Lang.String arg0, Java.Lang.String[] arg1, Java.Util.Set<Java.Lang.String> arg2, int arg3, Java.Lang.String arg4, Java.Lang.String arg5, Java.Lang.String[] arg6, Java.Lang.String arg7, Java.Lang.String arg8)
         {
             return IExecute<Java.Lang.String>("buildUnionSubQuery", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#getTables()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTables()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTables", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#getProjectionGreylist()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Util.Regex.Pattern> GetProjectionGreylist()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Util.Regex.Pattern>>("getProjectionGreylist", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#getProjectionMap()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Lang.String> GetProjectionMap()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getProjectionMap", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#insert(android.database.sqlite.SQLiteDatabase,android.content.ContentValues)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Sqlite.SQLiteDatabase"/></param>
@@ -311,6 +315,14 @@ public void AppendWhereStandalone(Java.Lang.CharSequence arg0)
             IExecuteWithSignature("appendWhereStandalone", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Database.Sqlite.SQLiteDatabase.CursorFactory"/></param>
+        public void SetCursorFactory(Android.Database.Sqlite.SQLiteDatabase.CursorFactory arg0)
+        {
+            IExecuteWithSignature("setCursorFactory", "(Landroid/database/sqlite/SQLiteDatabase$CursorFactory;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setDistinct(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -319,6 +331,22 @@ public void SetDistinct(bool arg0)
             IExecuteWithSignature("setDistinct", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setProjectionGreylist(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        public void SetProjectionGreylist(Java.Util.Collection<Java.Util.Regex.Pattern> arg0)
+        {
+            IExecuteWithSignature("setProjectionGreylist", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setProjectionMap(java.util.Map)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Map"/></param>
+        public void SetProjectionMap(Java.Util.Map<Java.Lang.String, Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setProjectionMap", "(Ljava/util/Map;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setStrict(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -342,6 +370,14 @@ public void SetStrictGrammar(bool arg0)
         {
             IExecuteWithSignature("setStrictGrammar", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteQueryBuilder.html#setTables(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetTables(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setTables", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteTransactionListener.cs b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteTransactionListener.cs
index 93421c814..770fc7e1f 100644
--- a/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteTransactionListener.cs
+++ b/src/net/Netdroid/Generated/Android/Database/Sqlite/SQLiteTransactionListener.cs
@@ -68,9 +68,9 @@ public partial class SQLiteTransactionListener : Android.Database.Sqlite.ISQLite
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onBegin", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnBeginEventHandler));
-            AddEventHandler("onCommit", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCommitEventHandler));
-            AddEventHandler("onRollback", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnRollbackEventHandler));
+            AddEventHandler("onBegin", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnBeginEventHandler));
+            AddEventHandler("onCommit", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCommitEventHandler));
+            AddEventHandler("onRollback", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnRollbackEventHandler));
 
         }
 
@@ -78,7 +78,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteTransactionListener.html#onBegin()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnBegin"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnBegin { get; set; } = null;
+        public global::System.Action OnOnBegin { get; set; } = null;
 
         void OnBeginEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -98,7 +98,7 @@ public virtual void OnBegin()
         /// Handler for <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteTransactionListener.html#onCommit()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnCommit"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnCommit { get; set; } = null;
+        public global::System.Action OnOnCommit { get; set; } = null;
 
         void OnCommitEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -118,7 +118,7 @@ public virtual void OnCommit()
         /// Handler for <see href="https://developer.android.com/reference/android/database/sqlite/SQLiteTransactionListener.html#onRollback()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnRollback"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnRollback { get; set; } = null;
+        public global::System.Action OnOnRollback { get; set; } = null;
 
         void OnRollbackEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Devicelock/DeviceId.cs b/src/net/Netdroid/Generated/Android/Devicelock/DeviceId.cs
index d708a6eca..844035ffa 100644
--- a/src/net/Netdroid/Generated/Android/Devicelock/DeviceId.cs
+++ b/src/net/Netdroid/Generated/Android/Devicelock/DeviceId.cs
@@ -58,18 +58,20 @@ public partial class DeviceId
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/devicelock/DeviceId.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/devicelock/DeviceId.html#getType()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/devicelock/DeviceId.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/devicelock/DeviceId.html#getId()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Drm/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Drm/AllPackageClasses.cs
index 19a1e7a4d..bc1791797 100644
--- a/src/net/Netdroid/Generated/Android/Drm/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Drm
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmConvertedStatus.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmConvertedStatus : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmConvertedStatus>
     {
         const string _bridgeClassName = "android.drm.DrmConvertedStatus";
@@ -75,7 +75,7 @@ public DrmConvertedStatus(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmErrorEvent : Android.Drm.DrmEvent
     {
         const string _bridgeClassName = "android.drm.DrmErrorEvent";
@@ -120,7 +120,7 @@ public DrmErrorEvent(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmEvent : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmEvent>
     {
         const string _bridgeClassName = "android.drm.DrmEvent";
@@ -165,7 +165,7 @@ public DrmEvent(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmInfo>
     {
         const string _bridgeClassName = "android.drm.DrmInfo";
@@ -210,7 +210,7 @@ public DrmInfo(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmInfoEvent.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmInfoEvent : Android.Drm.DrmEvent
     {
         const string _bridgeClassName = "android.drm.DrmInfoEvent";
@@ -255,7 +255,7 @@ public DrmInfoEvent(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmInfoRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmInfoRequest>
     {
         const string _bridgeClassName = "android.drm.DrmInfoRequest";
@@ -300,7 +300,7 @@ public DrmInfoRequest(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmInfoStatus.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmInfoStatus : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmInfoStatus>
     {
         const string _bridgeClassName = "android.drm.DrmInfoStatus";
@@ -345,7 +345,7 @@ public DrmInfoStatus(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmManagerClient : Java.Lang.AutoCloseable
     {
         const string _bridgeClassName = "android.drm.DrmManagerClient";
@@ -386,7 +386,7 @@ public DrmManagerClient(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.OnErrorListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnErrorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -394,10 +394,13 @@ public partial class OnErrorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnErrorListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.drm.DrmManagerClient_OnErrorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.drm.OnErrorListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -419,10 +422,13 @@ public partial class OnErrorListenerDirect : OnErrorListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.drm.DrmManagerClient$OnErrorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.drm.DrmManagerClient$OnErrorListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -446,7 +452,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.OnEventListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -454,10 +460,13 @@ public partial class OnEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnEventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.drm.DrmManagerClient_OnEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.drm.OnEventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -479,10 +488,13 @@ public partial class OnEventListenerDirect : OnEventListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.drm.DrmManagerClient$OnEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.drm.DrmManagerClient$OnEventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -506,7 +518,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.OnInfoListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -514,10 +526,13 @@ public partial class OnInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public OnInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.drm.DrmManagerClient_OnInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.drm.OnInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -539,10 +554,13 @@ public partial class OnInfoListenerDirect : OnInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.drm.DrmManagerClient$OnInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.drm.DrmManagerClient$OnInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -570,7 +588,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmRights : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmRights>
     {
         const string _bridgeClassName = "android.drm.DrmRights";
@@ -615,7 +633,7 @@ public DrmRights(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmStore.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmStore : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmStore>
     {
         const string _bridgeClassName = "android.drm.DrmStore";
@@ -656,7 +674,7 @@ public DrmStore(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Action : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Action>
         {
             const string _bridgeClassName = "android.drm.DrmStore$Action";
@@ -701,19 +719,19 @@ public Action(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmStore.ConstraintsColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ConstraintsColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ConstraintsColumns>
         {
             const string _bridgeClassName = "android.drm.DrmStore$ConstraintsColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConstraintsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConstraintsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConstraintsColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConstraintsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConstraintsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConstraintsColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -748,7 +766,7 @@ public ConstraintsColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmStore.DrmObjectType.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class DrmObjectType : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmObjectType>
         {
             const string _bridgeClassName = "android.drm.DrmStore$DrmObjectType";
@@ -793,7 +811,7 @@ public DrmObjectType(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Playback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Playback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Playback>
         {
             const string _bridgeClassName = "android.drm.DrmStore$Playback";
@@ -838,7 +856,7 @@ public Playback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmStore.RightsStatus.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class RightsStatus : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RightsStatus>
         {
             const string _bridgeClassName = "android.drm.DrmStore$RightsStatus";
@@ -887,7 +905,7 @@ public RightsStatus(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmSupportInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmSupportInfo>
     {
         const string _bridgeClassName = "android.drm.DrmSupportInfo";
@@ -932,7 +950,7 @@ public DrmSupportInfo(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/DrmUtils.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DrmUtils : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmUtils>
     {
         const string _bridgeClassName = "android.drm.DrmUtils";
@@ -973,7 +991,7 @@ public DrmUtils(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmUtils.ExtendedMetadataParser.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ExtendedMetadataParser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ExtendedMetadataParser>
         {
             const string _bridgeClassName = "android.drm.DrmUtils$ExtendedMetadataParser";
@@ -1022,7 +1040,7 @@ public ExtendedMetadataParser(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/drm/ProcessedData.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ProcessedData : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ProcessedData>
     {
         const string _bridgeClassName = "android.drm.ProcessedData";
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmConvertedStatus.cs b/src/net/Netdroid/Generated/Android/Drm/DrmConvertedStatus.cs
index 6bf5023c2..931713706 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmConvertedStatus.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmConvertedStatus.cs
@@ -35,7 +35,7 @@ public partial class DrmConvertedStatus
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmConvertedStatus(int arg0, byte[] arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -51,42 +51,42 @@ public DrmConvertedStatus(int arg0, byte[] arg1, int arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmConvertedStatus.html#convertedData"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte[] convertedData { get { if (!_convertedDataReady) { _convertedDataContent = IGetFieldArray<byte>("convertedData"); _convertedDataReady = true; } return _convertedDataContent; } }
         private byte[] _convertedDataContent = default;
         private bool _convertedDataReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmConvertedStatus.html#offset"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int offset { get { if (!_offsetReady) { _offsetContent = IGetField<int>("offset"); _offsetReady = true; } return _offsetContent; } }
         private int _offsetContent = default;
         private bool _offsetReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmConvertedStatus.html#statusCode"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int statusCode { get { if (!_statusCodeReady) { _statusCodeContent = IGetField<int>("statusCode"); _statusCodeReady = true; } return _statusCodeContent; } }
         private int _statusCodeContent = default;
         private bool _statusCodeReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmConvertedStatus.html#STATUS_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_ERROR { get { if (!_STATUS_ERRORReady) { _STATUS_ERRORContent = SGetField<int>(LocalBridgeClazz, "STATUS_ERROR"); _STATUS_ERRORReady = true; } return _STATUS_ERRORContent; } }
         private static int _STATUS_ERRORContent = default;
         private static bool _STATUS_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmConvertedStatus.html#STATUS_INPUTDATA_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_INPUTDATA_ERROR { get { if (!_STATUS_INPUTDATA_ERRORReady) { _STATUS_INPUTDATA_ERRORContent = SGetField<int>(LocalBridgeClazz, "STATUS_INPUTDATA_ERROR"); _STATUS_INPUTDATA_ERRORReady = true; } return _STATUS_INPUTDATA_ERRORContent; } }
         private static int _STATUS_INPUTDATA_ERRORContent = default;
         private static bool _STATUS_INPUTDATA_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmConvertedStatus.html#STATUS_OK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_OK { get { if (!_STATUS_OKReady) { _STATUS_OKContent = SGetField<int>(LocalBridgeClazz, "STATUS_OK"); _STATUS_OKReady = true; } return _STATUS_OKContent; } }
         private static int _STATUS_OKContent = default;
         private static bool _STATUS_OKReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmErrorEvent.cs b/src/net/Netdroid/Generated/Android/Drm/DrmErrorEvent.cs
index a4647624e..e666f95be 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmErrorEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmErrorEvent.cs
@@ -36,7 +36,7 @@ public partial class DrmErrorEvent
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Util.HashMap"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmErrorEvent(int arg0, int arg1, Java.Lang.String arg2, Java.Util.HashMap<Java.Lang.String, object> arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public DrmErrorEvent(int arg0, int arg1, Java.Lang.String arg2, Java.Util.HashMa
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmErrorEvent(int arg0, int arg1, Java.Lang.String arg2)
             : base(arg0, arg1, arg2)
         {
@@ -63,56 +63,56 @@ public DrmErrorEvent(int arg0, int arg1, Java.Lang.String arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html#TYPE_ACQUIRE_DRM_INFO_FAILED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_ACQUIRE_DRM_INFO_FAILED { get { if (!_TYPE_ACQUIRE_DRM_INFO_FAILEDReady) { _TYPE_ACQUIRE_DRM_INFO_FAILEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_ACQUIRE_DRM_INFO_FAILED"); _TYPE_ACQUIRE_DRM_INFO_FAILEDReady = true; } return _TYPE_ACQUIRE_DRM_INFO_FAILEDContent; } }
         private static int _TYPE_ACQUIRE_DRM_INFO_FAILEDContent = default;
         private static bool _TYPE_ACQUIRE_DRM_INFO_FAILEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html#TYPE_NO_INTERNET_CONNECTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_NO_INTERNET_CONNECTION { get { if (!_TYPE_NO_INTERNET_CONNECTIONReady) { _TYPE_NO_INTERNET_CONNECTIONContent = SGetField<int>(LocalBridgeClazz, "TYPE_NO_INTERNET_CONNECTION"); _TYPE_NO_INTERNET_CONNECTIONReady = true; } return _TYPE_NO_INTERNET_CONNECTIONContent; } }
         private static int _TYPE_NO_INTERNET_CONNECTIONContent = default;
         private static bool _TYPE_NO_INTERNET_CONNECTIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html#TYPE_NOT_SUPPORTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_NOT_SUPPORTED { get { if (!_TYPE_NOT_SUPPORTEDReady) { _TYPE_NOT_SUPPORTEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_NOT_SUPPORTED"); _TYPE_NOT_SUPPORTEDReady = true; } return _TYPE_NOT_SUPPORTEDContent; } }
         private static int _TYPE_NOT_SUPPORTEDContent = default;
         private static bool _TYPE_NOT_SUPPORTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html#TYPE_OUT_OF_MEMORY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_OUT_OF_MEMORY { get { if (!_TYPE_OUT_OF_MEMORYReady) { _TYPE_OUT_OF_MEMORYContent = SGetField<int>(LocalBridgeClazz, "TYPE_OUT_OF_MEMORY"); _TYPE_OUT_OF_MEMORYReady = true; } return _TYPE_OUT_OF_MEMORYContent; } }
         private static int _TYPE_OUT_OF_MEMORYContent = default;
         private static bool _TYPE_OUT_OF_MEMORYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html#TYPE_PROCESS_DRM_INFO_FAILED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_PROCESS_DRM_INFO_FAILED { get { if (!_TYPE_PROCESS_DRM_INFO_FAILEDReady) { _TYPE_PROCESS_DRM_INFO_FAILEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_PROCESS_DRM_INFO_FAILED"); _TYPE_PROCESS_DRM_INFO_FAILEDReady = true; } return _TYPE_PROCESS_DRM_INFO_FAILEDContent; } }
         private static int _TYPE_PROCESS_DRM_INFO_FAILEDContent = default;
         private static bool _TYPE_PROCESS_DRM_INFO_FAILEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html#TYPE_REMOVE_ALL_RIGHTS_FAILED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_REMOVE_ALL_RIGHTS_FAILED { get { if (!_TYPE_REMOVE_ALL_RIGHTS_FAILEDReady) { _TYPE_REMOVE_ALL_RIGHTS_FAILEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_REMOVE_ALL_RIGHTS_FAILED"); _TYPE_REMOVE_ALL_RIGHTS_FAILEDReady = true; } return _TYPE_REMOVE_ALL_RIGHTS_FAILEDContent; } }
         private static int _TYPE_REMOVE_ALL_RIGHTS_FAILEDContent = default;
         private static bool _TYPE_REMOVE_ALL_RIGHTS_FAILEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html#TYPE_RIGHTS_NOT_INSTALLED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_RIGHTS_NOT_INSTALLED { get { if (!_TYPE_RIGHTS_NOT_INSTALLEDReady) { _TYPE_RIGHTS_NOT_INSTALLEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_RIGHTS_NOT_INSTALLED"); _TYPE_RIGHTS_NOT_INSTALLEDReady = true; } return _TYPE_RIGHTS_NOT_INSTALLEDContent; } }
         private static int _TYPE_RIGHTS_NOT_INSTALLEDContent = default;
         private static bool _TYPE_RIGHTS_NOT_INSTALLEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmErrorEvent.html#TYPE_RIGHTS_RENEWAL_NOT_ALLOWED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_RIGHTS_RENEWAL_NOT_ALLOWED { get { if (!_TYPE_RIGHTS_RENEWAL_NOT_ALLOWEDReady) { _TYPE_RIGHTS_RENEWAL_NOT_ALLOWEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_RIGHTS_RENEWAL_NOT_ALLOWED"); _TYPE_RIGHTS_RENEWAL_NOT_ALLOWEDReady = true; } return _TYPE_RIGHTS_RENEWAL_NOT_ALLOWEDContent; } }
         private static int _TYPE_RIGHTS_RENEWAL_NOT_ALLOWEDContent = default;
         private static bool _TYPE_RIGHTS_RENEWAL_NOT_ALLOWEDReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmEvent.cs b/src/net/Netdroid/Generated/Android/Drm/DrmEvent.cs
index a86fc071d..51ae29325 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmEvent.cs
@@ -40,28 +40,28 @@ public partial class DrmEvent
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#TYPE_ALL_RIGHTS_REMOVED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_ALL_RIGHTS_REMOVED { get { if (!_TYPE_ALL_RIGHTS_REMOVEDReady) { _TYPE_ALL_RIGHTS_REMOVEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_ALL_RIGHTS_REMOVED"); _TYPE_ALL_RIGHTS_REMOVEDReady = true; } return _TYPE_ALL_RIGHTS_REMOVEDContent; } }
         private static int _TYPE_ALL_RIGHTS_REMOVEDContent = default;
         private static bool _TYPE_ALL_RIGHTS_REMOVEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#TYPE_DRM_INFO_PROCESSED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_DRM_INFO_PROCESSED { get { if (!_TYPE_DRM_INFO_PROCESSEDReady) { _TYPE_DRM_INFO_PROCESSEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_DRM_INFO_PROCESSED"); _TYPE_DRM_INFO_PROCESSEDReady = true; } return _TYPE_DRM_INFO_PROCESSEDContent; } }
         private static int _TYPE_DRM_INFO_PROCESSEDContent = default;
         private static bool _TYPE_DRM_INFO_PROCESSEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#DRM_INFO_OBJECT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String DRM_INFO_OBJECT { get { if (!_DRM_INFO_OBJECTReady) { _DRM_INFO_OBJECTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DRM_INFO_OBJECT"); _DRM_INFO_OBJECTReady = true; } return _DRM_INFO_OBJECTContent; } }
         private static Java.Lang.String _DRM_INFO_OBJECTContent = default;
         private static bool _DRM_INFO_OBJECTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#DRM_INFO_STATUS_OBJECT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String DRM_INFO_STATUS_OBJECT { get { if (!_DRM_INFO_STATUS_OBJECTReady) { _DRM_INFO_STATUS_OBJECTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DRM_INFO_STATUS_OBJECT"); _DRM_INFO_STATUS_OBJECTReady = true; } return _DRM_INFO_STATUS_OBJECTContent; } }
         private static Java.Lang.String _DRM_INFO_STATUS_OBJECTContent = default;
         private static bool _DRM_INFO_STATUS_OBJECTReady = false; // this is used because in case of generics 
@@ -74,39 +74,42 @@ public partial class DrmEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#getMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#getType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Message
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#getUniqueId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetUniqueId()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#getUniqueId()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int UniqueId
-        {
-            get { return IExecuteWithSignature<int>("getUniqueId", "()I"); }
+            return IExecuteWithSignature<int>("getUniqueId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#getAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object GetAttribute(Java.Lang.String arg0)
         {
             return IExecuteWithSignature("getAttribute", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/drm/DrmEvent.html#getMessage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetMessage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmInfo.cs b/src/net/Netdroid/Generated/Android/Drm/DrmInfo.cs
index 1664f7a25..fff6b8cd4 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmInfo.cs
@@ -35,7 +35,7 @@ public partial class DrmInfo
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmInfo(int arg0, byte[] arg1, Java.Lang.String arg2)
             : base(arg0, arg1, arg2)
         {
@@ -46,7 +46,7 @@ public DrmInfo(int arg0, byte[] arg1, Java.Lang.String arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmInfo(int arg0, Java.Lang.String arg1, Java.Lang.String arg2)
             : base(arg0, arg1, arg2)
         {
@@ -68,44 +68,47 @@ public DrmInfo(int arg0, Java.Lang.String arg1, Java.Lang.String arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#getData()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte[] Data
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetData()
         {
-            get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#getInfoType()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#getInfoType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int InfoType
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetInfoType()
         {
-            get { return IExecuteWithSignature<int>("getInfoType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#getMimeType()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String MimeType
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getInfoType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#get(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object Get(Java.Lang.String arg0)
         {
             return IExecuteWithSignature("get", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#getMimeType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetMimeType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Iterator<object> Iterator()
         {
             return IExecuteWithSignature<Java.Util.Iterator<object>>("iterator", "()Ljava/util/Iterator;");
@@ -114,7 +117,7 @@ public Java.Util.Iterator<object> Iterator()
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfo.html#keyIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Iterator<Java.Lang.String> KeyIterator()
         {
             return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("keyIterator", "()Ljava/util/Iterator;");
@@ -124,7 +127,7 @@ public Java.Util.Iterator<object> Iterator()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Put(Java.Lang.String arg0, object arg1)
         {
             IExecute("put", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmInfoEvent.cs b/src/net/Netdroid/Generated/Android/Drm/DrmInfoEvent.cs
index bc755e86c..1816d492f 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmInfoEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmInfoEvent.cs
@@ -36,7 +36,7 @@ public partial class DrmInfoEvent
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Util.HashMap"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmInfoEvent(int arg0, int arg1, Java.Lang.String arg2, Java.Util.HashMap<Java.Lang.String, object> arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public DrmInfoEvent(int arg0, int arg1, Java.Lang.String arg2, Java.Util.HashMap
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmInfoEvent(int arg0, int arg1, Java.Lang.String arg2)
             : base(arg0, arg1, arg2)
         {
@@ -63,42 +63,42 @@ public DrmInfoEvent(int arg0, int arg1, Java.Lang.String arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoEvent.html#TYPE_ACCOUNT_ALREADY_REGISTERED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_ACCOUNT_ALREADY_REGISTERED { get { if (!_TYPE_ACCOUNT_ALREADY_REGISTEREDReady) { _TYPE_ACCOUNT_ALREADY_REGISTEREDContent = SGetField<int>(LocalBridgeClazz, "TYPE_ACCOUNT_ALREADY_REGISTERED"); _TYPE_ACCOUNT_ALREADY_REGISTEREDReady = true; } return _TYPE_ACCOUNT_ALREADY_REGISTEREDContent; } }
         private static int _TYPE_ACCOUNT_ALREADY_REGISTEREDContent = default;
         private static bool _TYPE_ACCOUNT_ALREADY_REGISTEREDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoEvent.html#TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT { get { if (!_TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNTReady) { _TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNTContent = SGetField<int>(LocalBridgeClazz, "TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNT"); _TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNTReady = true; } return _TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNTContent; } }
         private static int _TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNTContent = default;
         private static bool _TYPE_ALREADY_REGISTERED_BY_ANOTHER_ACCOUNTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoEvent.html#TYPE_REMOVE_RIGHTS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_REMOVE_RIGHTS { get { if (!_TYPE_REMOVE_RIGHTSReady) { _TYPE_REMOVE_RIGHTSContent = SGetField<int>(LocalBridgeClazz, "TYPE_REMOVE_RIGHTS"); _TYPE_REMOVE_RIGHTSReady = true; } return _TYPE_REMOVE_RIGHTSContent; } }
         private static int _TYPE_REMOVE_RIGHTSContent = default;
         private static bool _TYPE_REMOVE_RIGHTSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoEvent.html#TYPE_RIGHTS_INSTALLED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_RIGHTS_INSTALLED { get { if (!_TYPE_RIGHTS_INSTALLEDReady) { _TYPE_RIGHTS_INSTALLEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_RIGHTS_INSTALLED"); _TYPE_RIGHTS_INSTALLEDReady = true; } return _TYPE_RIGHTS_INSTALLEDContent; } }
         private static int _TYPE_RIGHTS_INSTALLEDContent = default;
         private static bool _TYPE_RIGHTS_INSTALLEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoEvent.html#TYPE_RIGHTS_REMOVED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_RIGHTS_REMOVED { get { if (!_TYPE_RIGHTS_REMOVEDReady) { _TYPE_RIGHTS_REMOVEDContent = SGetField<int>(LocalBridgeClazz, "TYPE_RIGHTS_REMOVED"); _TYPE_RIGHTS_REMOVEDReady = true; } return _TYPE_RIGHTS_REMOVEDContent; } }
         private static int _TYPE_RIGHTS_REMOVEDContent = default;
         private static bool _TYPE_RIGHTS_REMOVEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoEvent.html#TYPE_WAIT_FOR_RIGHTS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_WAIT_FOR_RIGHTS { get { if (!_TYPE_WAIT_FOR_RIGHTSReady) { _TYPE_WAIT_FOR_RIGHTSContent = SGetField<int>(LocalBridgeClazz, "TYPE_WAIT_FOR_RIGHTS"); _TYPE_WAIT_FOR_RIGHTSReady = true; } return _TYPE_WAIT_FOR_RIGHTSContent; } }
         private static int _TYPE_WAIT_FOR_RIGHTSContent = default;
         private static bool _TYPE_WAIT_FOR_RIGHTSReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmInfoRequest.cs b/src/net/Netdroid/Generated/Android/Drm/DrmInfoRequest.cs
index 46bc5bb85..f5aa6ed1d 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmInfoRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmInfoRequest.cs
@@ -34,7 +34,7 @@ public partial class DrmInfoRequest
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmInfoRequest(int arg0, Java.Lang.String arg1)
             : base(arg0, arg1)
         {
@@ -50,42 +50,42 @@ public DrmInfoRequest(int arg0, Java.Lang.String arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#TYPE_REGISTRATION_INFO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_REGISTRATION_INFO { get { if (!_TYPE_REGISTRATION_INFOReady) { _TYPE_REGISTRATION_INFOContent = SGetField<int>(LocalBridgeClazz, "TYPE_REGISTRATION_INFO"); _TYPE_REGISTRATION_INFOReady = true; } return _TYPE_REGISTRATION_INFOContent; } }
         private static int _TYPE_REGISTRATION_INFOContent = default;
         private static bool _TYPE_REGISTRATION_INFOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#TYPE_RIGHTS_ACQUISITION_INFO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_RIGHTS_ACQUISITION_INFO { get { if (!_TYPE_RIGHTS_ACQUISITION_INFOReady) { _TYPE_RIGHTS_ACQUISITION_INFOContent = SGetField<int>(LocalBridgeClazz, "TYPE_RIGHTS_ACQUISITION_INFO"); _TYPE_RIGHTS_ACQUISITION_INFOReady = true; } return _TYPE_RIGHTS_ACQUISITION_INFOContent; } }
         private static int _TYPE_RIGHTS_ACQUISITION_INFOContent = default;
         private static bool _TYPE_RIGHTS_ACQUISITION_INFOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO { get { if (!_TYPE_RIGHTS_ACQUISITION_PROGRESS_INFOReady) { _TYPE_RIGHTS_ACQUISITION_PROGRESS_INFOContent = SGetField<int>(LocalBridgeClazz, "TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO"); _TYPE_RIGHTS_ACQUISITION_PROGRESS_INFOReady = true; } return _TYPE_RIGHTS_ACQUISITION_PROGRESS_INFOContent; } }
         private static int _TYPE_RIGHTS_ACQUISITION_PROGRESS_INFOContent = default;
         private static bool _TYPE_RIGHTS_ACQUISITION_PROGRESS_INFOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#TYPE_UNREGISTRATION_INFO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_UNREGISTRATION_INFO { get { if (!_TYPE_UNREGISTRATION_INFOReady) { _TYPE_UNREGISTRATION_INFOContent = SGetField<int>(LocalBridgeClazz, "TYPE_UNREGISTRATION_INFO"); _TYPE_UNREGISTRATION_INFOReady = true; } return _TYPE_UNREGISTRATION_INFOContent; } }
         private static int _TYPE_UNREGISTRATION_INFOContent = default;
         private static bool _TYPE_UNREGISTRATION_INFOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#ACCOUNT_ID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACCOUNT_ID { get { if (!_ACCOUNT_IDReady) { _ACCOUNT_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACCOUNT_ID"); _ACCOUNT_IDReady = true; } return _ACCOUNT_IDContent; } }
         private static Java.Lang.String _ACCOUNT_IDContent = default;
         private static bool _ACCOUNT_IDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#SUBSCRIPTION_ID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SUBSCRIPTION_ID { get { if (!_SUBSCRIPTION_IDReady) { _SUBSCRIPTION_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SUBSCRIPTION_ID"); _SUBSCRIPTION_IDReady = true; } return _SUBSCRIPTION_IDContent; } }
         private static Java.Lang.String _SUBSCRIPTION_IDContent = default;
         private static bool _SUBSCRIPTION_IDReady = false; // this is used because in case of generics 
@@ -98,36 +98,38 @@ public DrmInfoRequest(int arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#getInfoType()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#getInfoType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int InfoType
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetInfoType()
         {
-            get { return IExecuteWithSignature<int>("getInfoType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#getMimeType()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String MimeType
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getInfoType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#get(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object Get(Java.Lang.String arg0)
         {
             return IExecuteWithSignature("get", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#getMimeType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetMimeType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Iterator<object> Iterator()
         {
             return IExecuteWithSignature<Java.Util.Iterator<object>>("iterator", "()Ljava/util/Iterator;");
@@ -136,7 +138,7 @@ public Java.Util.Iterator<object> Iterator()
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoRequest.html#keyIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Iterator<Java.Lang.String> KeyIterator()
         {
             return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("keyIterator", "()Ljava/util/Iterator;");
@@ -146,7 +148,7 @@ public Java.Util.Iterator<object> Iterator()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Put(Java.Lang.String arg0, object arg1)
         {
             IExecute("put", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmInfoStatus.cs b/src/net/Netdroid/Generated/Android/Drm/DrmInfoStatus.cs
index cc163d3aa..e71c4b4cd 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmInfoStatus.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmInfoStatus.cs
@@ -36,7 +36,7 @@ public partial class DrmInfoStatus
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Drm.ProcessedData"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmInfoStatus(int arg0, int arg1, Android.Drm.ProcessedData arg2, Java.Lang.String arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -52,42 +52,42 @@ public DrmInfoStatus(int arg0, int arg1, Android.Drm.ProcessedData arg2, Java.La
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoStatus.html#data"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Drm.ProcessedData data { get { if (!_dataReady) { _dataContent = IGetField<Android.Drm.ProcessedData>("data"); _dataReady = true; } return _dataContent; } }
         private Android.Drm.ProcessedData _dataContent = default;
         private bool _dataReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoStatus.html#infoType"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int infoType { get { if (!_infoTypeReady) { _infoTypeContent = IGetField<int>("infoType"); _infoTypeReady = true; } return _infoTypeContent; } }
         private int _infoTypeContent = default;
         private bool _infoTypeReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoStatus.html#statusCode"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int statusCode { get { if (!_statusCodeReady) { _statusCodeContent = IGetField<int>("statusCode"); _statusCodeReady = true; } return _statusCodeContent; } }
         private int _statusCodeContent = default;
         private bool _statusCodeReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoStatus.html#mimeType"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String mimeType { get { if (!_mimeTypeReady) { _mimeTypeContent = IGetField<Java.Lang.String>("mimeType"); _mimeTypeReady = true; } return _mimeTypeContent; } }
         private Java.Lang.String _mimeTypeContent = default;
         private bool _mimeTypeReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoStatus.html#STATUS_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_ERROR { get { if (!_STATUS_ERRORReady) { _STATUS_ERRORContent = SGetField<int>(LocalBridgeClazz, "STATUS_ERROR"); _STATUS_ERRORReady = true; } return _STATUS_ERRORContent; } }
         private static int _STATUS_ERRORContent = default;
         private static bool _STATUS_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmInfoStatus.html#STATUS_OK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_OK { get { if (!_STATUS_OKReady) { _STATUS_OKContent = SGetField<int>(LocalBridgeClazz, "STATUS_OK"); _STATUS_OKReady = true; } return _STATUS_OKContent; } }
         private static int _STATUS_OKContent = default;
         private static bool _STATUS_OKReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmManagerClient.cs b/src/net/Netdroid/Generated/Android/Drm/DrmManagerClient.cs
index 9f2aefe4a..538707a87 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmManagerClient.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmManagerClient.cs
@@ -33,7 +33,7 @@ public partial class DrmManagerClient
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmManagerClient(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -49,14 +49,14 @@ public DrmManagerClient(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#ERROR_NONE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ERROR_NONE { get { if (!_ERROR_NONEReady) { _ERROR_NONEContent = SGetField<int>(LocalBridgeClazz, "ERROR_NONE"); _ERROR_NONEReady = true; } return _ERROR_NONEContent; } }
         private static int _ERROR_NONEContent = default;
         private static bool _ERROR_NONEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#ERROR_UNKNOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ERROR_UNKNOWN { get { if (!_ERROR_UNKNOWNReady) { _ERROR_UNKNOWNContent = SGetField<int>(LocalBridgeClazz, "ERROR_UNKNOWN"); _ERROR_UNKNOWNReady = true; } return _ERROR_UNKNOWNContent; } }
         private static int _ERROR_UNKNOWNContent = default;
         private static bool _ERROR_UNKNOWNReady = false; // this is used because in case of generics 
@@ -69,28 +69,12 @@ public DrmManagerClient(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#getAvailableDrmEngines()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String[] AvailableDrmEngines
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getAvailableDrmEngines", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#getAvailableDrmSupportInfo()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Collection<Android.Drm.DrmSupportInfo> AvailableDrmSupportInfo
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Drm.DrmSupportInfo>>("getAvailableDrmSupportInfo", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#getConstraints(android.net.Uri,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Content.ContentValues"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.ContentValues GetConstraints(Android.Net.Uri arg0, int arg1)
         {
             return IExecute<Android.Content.ContentValues>("getConstraints", arg0, arg1);
@@ -101,7 +85,7 @@ public Android.Content.ContentValues GetConstraints(Android.Net.Uri arg0, int ar
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Content.ContentValues"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.ContentValues GetConstraints(Java.Lang.String arg0, int arg1)
         {
             return IExecute<Android.Content.ContentValues>("getConstraints", arg0, arg1);
@@ -111,7 +95,7 @@ public Android.Content.ContentValues GetConstraints(Java.Lang.String arg0, int a
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <returns><see cref="Android.Content.ContentValues"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.ContentValues GetMetadata(Android.Net.Uri arg0)
         {
             return IExecuteWithSignature<Android.Content.ContentValues>("getMetadata", "(Landroid/net/Uri;)Landroid/content/ContentValues;", arg0);
@@ -121,7 +105,7 @@ public Android.Content.ContentValues GetMetadata(Android.Net.Uri arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Content.ContentValues"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.ContentValues GetMetadata(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Content.ContentValues>("getMetadata", "(Ljava/lang/String;)Landroid/content/ContentValues;", arg0);
@@ -131,7 +115,7 @@ public Android.Content.ContentValues GetMetadata(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Drm.DrmConvertedStatus"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Drm.DrmConvertedStatus CloseConvertSession(int arg0)
         {
             return IExecuteWithSignature<Android.Drm.DrmConvertedStatus>("closeConvertSession", "(I)Landroid/drm/DrmConvertedStatus;", arg0);
@@ -142,7 +126,7 @@ public Android.Drm.DrmConvertedStatus CloseConvertSession(int arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
         /// <returns><see cref="Android.Drm.DrmConvertedStatus"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Drm.DrmConvertedStatus ConvertData(int arg0, byte[] arg1)
         {
             return IExecute<Android.Drm.DrmConvertedStatus>("convertData", arg0, arg1);
@@ -152,7 +136,7 @@ public Android.Drm.DrmConvertedStatus ConvertData(int arg0, byte[] arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Drm.DrmInfoRequest"/></param>
         /// <returns><see cref="Android.Drm.DrmInfo"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Drm.DrmInfo AcquireDrmInfo(Android.Drm.DrmInfoRequest arg0)
         {
             return IExecuteWithSignature<Android.Drm.DrmInfo>("acquireDrmInfo", "(Landroid/drm/DrmInfoRequest;)Landroid/drm/DrmInfo;", arg0);
@@ -163,7 +147,7 @@ public Android.Drm.DrmInfo AcquireDrmInfo(Android.Drm.DrmInfoRequest arg0)
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool CanHandle(Android.Net.Uri arg0, Java.Lang.String arg1)
         {
             return IExecute<bool>("canHandle", arg0, arg1);
@@ -174,7 +158,7 @@ public bool CanHandle(Android.Net.Uri arg0, Java.Lang.String arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool CanHandle(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecute<bool>("canHandle", arg0, arg1);
@@ -184,7 +168,7 @@ public bool CanHandle(Java.Lang.String arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Drm.DrmInfoRequest"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int AcquireRights(Android.Drm.DrmInfoRequest arg0)
         {
             return IExecuteWithSignature<int>("acquireRights", "(Landroid/drm/DrmInfoRequest;)I", arg0);
@@ -195,7 +179,7 @@ public int AcquireRights(Android.Drm.DrmInfoRequest arg0)
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CheckRightsStatus(Android.Net.Uri arg0, int arg1)
         {
             return IExecute<int>("checkRightsStatus", arg0, arg1);
@@ -205,7 +189,7 @@ public int CheckRightsStatus(Android.Net.Uri arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CheckRightsStatus(Android.Net.Uri arg0)
         {
             return IExecuteWithSignature<int>("checkRightsStatus", "(Landroid/net/Uri;)I", arg0);
@@ -216,7 +200,7 @@ public int CheckRightsStatus(Android.Net.Uri arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CheckRightsStatus(Java.Lang.String arg0, int arg1)
         {
             return IExecute<int>("checkRightsStatus", arg0, arg1);
@@ -226,7 +210,7 @@ public int CheckRightsStatus(Java.Lang.String arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CheckRightsStatus(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<int>("checkRightsStatus", "(Ljava/lang/String;)I", arg0);
@@ -237,7 +221,7 @@ public int CheckRightsStatus(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetDrmObjectType(Android.Net.Uri arg0, Java.Lang.String arg1)
         {
             return IExecute<int>("getDrmObjectType", arg0, arg1);
@@ -248,7 +232,7 @@ public int GetDrmObjectType(Android.Net.Uri arg0, Java.Lang.String arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetDrmObjectType(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecute<int>("getDrmObjectType", arg0, arg1);
@@ -258,7 +242,7 @@ public int GetDrmObjectType(Java.Lang.String arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int OpenConvertSession(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<int>("openConvertSession", "(Ljava/lang/String;)I", arg0);
@@ -268,7 +252,7 @@ public int OpenConvertSession(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Drm.DrmInfo"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int ProcessDrmInfo(Android.Drm.DrmInfo arg0)
         {
             return IExecuteWithSignature<int>("processDrmInfo", "(Landroid/drm/DrmInfo;)I", arg0);
@@ -277,7 +261,7 @@ public int ProcessDrmInfo(Android.Drm.DrmInfo arg0)
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#removeAllRights()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int RemoveAllRights()
         {
             return IExecuteWithSignature<int>("removeAllRights", "()I");
@@ -287,7 +271,7 @@ public int RemoveAllRights()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int RemoveRights(Android.Net.Uri arg0)
         {
             return IExecuteWithSignature<int>("removeRights", "(Landroid/net/Uri;)I", arg0);
@@ -297,7 +281,7 @@ public int RemoveRights(Android.Net.Uri arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int RemoveRights(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<int>("removeRights", "(Ljava/lang/String;)I", arg0);
@@ -310,7 +294,7 @@ public int RemoveRights(Java.Lang.String arg0)
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SaveRights(Android.Drm.DrmRights arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("saveRights", arg0, arg1, arg2);
@@ -320,7 +304,7 @@ public int SaveRights(Android.Drm.DrmRights arg0, Java.Lang.String arg1, Java.La
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetOriginalMimeType(Android.Net.Uri arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getOriginalMimeType", "(Landroid/net/Uri;)Ljava/lang/String;", arg0);
@@ -330,16 +314,34 @@ public Java.Lang.String GetOriginalMimeType(Android.Net.Uri arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetOriginalMimeType(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getOriginalMimeType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#getAvailableDrmEngines()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String[] GetAvailableDrmEngines()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getAvailableDrmEngines", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#getAvailableDrmSupportInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Collection<Android.Drm.DrmSupportInfo> GetAvailableDrmSupportInfo()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Android.Drm.DrmSupportInfo>>("getAvailableDrmSupportInfo", "()Ljava/util/Collection;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#setOnErrorListener(android.drm.DrmManagerClient.OnErrorListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient.OnErrorListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnErrorListener(Android.Drm.DrmManagerClient.OnErrorListener arg0)
         {
             IExecuteWithSignature("setOnErrorListener", "(Landroid/drm/DrmManagerClient$OnErrorListener;)V", arg0);
@@ -348,7 +350,7 @@ public void SetOnErrorListener(Android.Drm.DrmManagerClient.OnErrorListener arg0
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#setOnEventListener(android.drm.DrmManagerClient.OnEventListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient.OnEventListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnEventListener(Android.Drm.DrmManagerClient.OnEventListener arg0)
         {
             IExecuteWithSignature("setOnEventListener", "(Landroid/drm/DrmManagerClient$OnEventListener;)V", arg0);
@@ -357,7 +359,7 @@ public void SetOnEventListener(Android.Drm.DrmManagerClient.OnEventListener arg0
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#setOnInfoListener(android.drm.DrmManagerClient.OnInfoListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient.OnInfoListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnInfoListener(Android.Drm.DrmManagerClient.OnInfoListener arg0)
         {
             IExecuteWithSignature("setOnInfoListener", "(Landroid/drm/DrmManagerClient$OnInfoListener;)V", arg0);
@@ -365,7 +367,7 @@ public void SetOnInfoListener(Android.Drm.DrmManagerClient.OnInfoListener arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#close()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
@@ -373,7 +375,7 @@ public void Close()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.html#release()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Release()
         {
             IExecuteWithSignature("release", "()V");
@@ -407,7 +409,7 @@ public partial class OnErrorListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>>>(OnErrorEventHandler));
+                AddEventHandler("onError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>>>(OnErrorEventHandler));
 
             }
 
@@ -415,7 +417,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.OnErrorListener.html#onError(android.drm.DrmManagerClient,android.drm.DrmErrorEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Drm.DrmManagerClient, Android.Drm.DrmErrorEvent> OnOnError { get; set; } = null;
+            public global::System.Action<Android.Drm.DrmManagerClient, Android.Drm.DrmErrorEvent> OnOnError { get; set; } = null;
 
             void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>> data)
             {
@@ -428,7 +430,7 @@ void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Androi
             /// </summary>
             /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient"/></param>
             /// <param name="arg1"><see cref="Android.Drm.DrmErrorEvent"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnError(Android.Drm.DrmManagerClient arg0, Android.Drm.DrmErrorEvent arg1)
             {
                 
@@ -469,7 +471,7 @@ public partial class OnErrorListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient"/></param>
             /// <param name="arg1"><see cref="Android.Drm.DrmErrorEvent"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnError(Android.Drm.DrmManagerClient arg0, Android.Drm.DrmErrorEvent arg1)
             {
                 IExecute("onError", arg0, arg1);
@@ -510,7 +512,7 @@ public partial class OnEventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>>>(OnEventEventHandler));
+                AddEventHandler("onEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>>>(OnEventEventHandler));
 
             }
 
@@ -518,7 +520,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.OnEventListener.html#onEvent(android.drm.DrmManagerClient,android.drm.DrmEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Drm.DrmManagerClient, Android.Drm.DrmEvent> OnOnEvent { get; set; } = null;
+            public global::System.Action<Android.Drm.DrmManagerClient, Android.Drm.DrmEvent> OnOnEvent { get; set; } = null;
 
             void OnEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>> data)
             {
@@ -531,7 +533,7 @@ void OnEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Androi
             /// </summary>
             /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient"/></param>
             /// <param name="arg1"><see cref="Android.Drm.DrmEvent"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnEvent(Android.Drm.DrmManagerClient arg0, Android.Drm.DrmEvent arg1)
             {
                 
@@ -572,7 +574,7 @@ public partial class OnEventListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient"/></param>
             /// <param name="arg1"><see cref="Android.Drm.DrmEvent"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnEvent(Android.Drm.DrmManagerClient arg0, Android.Drm.DrmEvent arg1)
             {
                 IExecute("onEvent", arg0, arg1);
@@ -613,7 +615,7 @@ public partial class OnInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onInfo", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>>>(OnInfoEventHandler));
+                AddEventHandler("onInfo", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>>>(OnInfoEventHandler));
 
             }
 
@@ -621,7 +623,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/drm/DrmManagerClient.OnInfoListener.html#onInfo(android.drm.DrmManagerClient,android.drm.DrmInfoEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnInfo"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Drm.DrmManagerClient, Android.Drm.DrmInfoEvent> OnOnInfo { get; set; } = null;
+            public global::System.Action<Android.Drm.DrmManagerClient, Android.Drm.DrmInfoEvent> OnOnInfo { get; set; } = null;
 
             void OnInfoEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Drm.DrmManagerClient>> data)
             {
@@ -634,7 +636,7 @@ void OnInfoEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android
             /// </summary>
             /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient"/></param>
             /// <param name="arg1"><see cref="Android.Drm.DrmInfoEvent"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnInfo(Android.Drm.DrmManagerClient arg0, Android.Drm.DrmInfoEvent arg1)
             {
                 
@@ -675,7 +677,7 @@ public partial class OnInfoListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Android.Drm.DrmManagerClient"/></param>
             /// <param name="arg1"><see cref="Android.Drm.DrmInfoEvent"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnInfo(Android.Drm.DrmManagerClient arg0, Android.Drm.DrmInfoEvent arg1)
             {
                 IExecute("onInfo", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmRights.cs b/src/net/Netdroid/Generated/Android/Drm/DrmRights.cs
index a886087ab..53562c5b7 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmRights.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmRights.cs
@@ -34,7 +34,7 @@ public partial class DrmRights
         /// </summary>
         /// <param name="arg0"><see cref="Android.Drm.ProcessedData"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmRights(Android.Drm.ProcessedData arg0, Java.Lang.String arg1)
             : base(arg0, arg1)
         {
@@ -44,7 +44,7 @@ public DrmRights(Android.Drm.ProcessedData arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmRights(Java.Io.File arg0, Java.Lang.String arg1)
             : base(arg0, arg1)
         {
@@ -56,7 +56,7 @@ public DrmRights(Java.Io.File arg0, Java.Lang.String arg1)
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmRights(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -67,7 +67,7 @@ public DrmRights(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmRights(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
             : base(arg0, arg1, arg2)
         {
@@ -77,7 +77,7 @@ public DrmRights(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DrmRights(Java.Lang.String arg0, Java.Lang.String arg1)
             : base(arg0, arg1)
         {
@@ -99,36 +99,40 @@ public DrmRights(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html#getAccountId()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html#getData()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String AccountId
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetData()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAccountId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html#getAccountId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte[] Data
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetAccountId()
         {
-            get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAccountId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html#getMimeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html#getMimeType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String MimeType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetMimeType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html#getSubscriptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmRights.html#getSubscriptionId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String SubscriptionId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSubscriptionId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubscriptionId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSubscriptionId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmStore.cs b/src/net/Netdroid/Generated/Android/Drm/DrmStore.cs
index 1036d4255..6eab00ad5 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmStore.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmStore.cs
@@ -64,56 +64,56 @@ public partial class Action
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html#DEFAULT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int DEFAULT { get { if (!_DEFAULTReady) { _DEFAULTContent = SGetField<int>(LocalBridgeClazz, "DEFAULT"); _DEFAULTReady = true; } return _DEFAULTContent; } }
             private static int _DEFAULTContent = default;
             private static bool _DEFAULTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html#DISPLAY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int DISPLAY { get { if (!_DISPLAYReady) { _DISPLAYContent = SGetField<int>(LocalBridgeClazz, "DISPLAY"); _DISPLAYReady = true; } return _DISPLAYContent; } }
             private static int _DISPLAYContent = default;
             private static bool _DISPLAYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html#EXECUTE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int EXECUTE { get { if (!_EXECUTEReady) { _EXECUTEContent = SGetField<int>(LocalBridgeClazz, "EXECUTE"); _EXECUTEReady = true; } return _EXECUTEContent; } }
             private static int _EXECUTEContent = default;
             private static bool _EXECUTEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html#OUTPUT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int OUTPUT { get { if (!_OUTPUTReady) { _OUTPUTContent = SGetField<int>(LocalBridgeClazz, "OUTPUT"); _OUTPUTReady = true; } return _OUTPUTContent; } }
             private static int _OUTPUTContent = default;
             private static bool _OUTPUTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html#PLAY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PLAY { get { if (!_PLAYReady) { _PLAYContent = SGetField<int>(LocalBridgeClazz, "PLAY"); _PLAYReady = true; } return _PLAYContent; } }
             private static int _PLAYContent = default;
             private static bool _PLAYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html#PREVIEW"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PREVIEW { get { if (!_PREVIEWReady) { _PREVIEWContent = SGetField<int>(LocalBridgeClazz, "PREVIEW"); _PREVIEWReady = true; } return _PREVIEWContent; } }
             private static int _PREVIEWContent = default;
             private static bool _PREVIEWReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html#RINGTONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RINGTONE { get { if (!_RINGTONEReady) { _RINGTONEContent = SGetField<int>(LocalBridgeClazz, "RINGTONE"); _RINGTONEReady = true; } return _RINGTONEContent; } }
             private static int _RINGTONEContent = default;
             private static bool _RINGTONEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Action.html#TRANSFER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TRANSFER { get { if (!_TRANSFERReady) { _TRANSFERContent = SGetField<int>(LocalBridgeClazz, "TRANSFER"); _TRANSFERReady = true; } return _TRANSFERContent; } }
             private static int _TRANSFERContent = default;
             private static bool _TRANSFERReady = false; // this is used because in case of generics 
@@ -151,42 +151,42 @@ public partial class ConstraintsColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.ConstraintsColumns.html#EXTENDED_METADATA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXTENDED_METADATA { get { if (!_EXTENDED_METADATAReady) { _EXTENDED_METADATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTENDED_METADATA"); _EXTENDED_METADATAReady = true; } return _EXTENDED_METADATAContent; } }
             private static Java.Lang.String _EXTENDED_METADATAContent = default;
             private static bool _EXTENDED_METADATAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.ConstraintsColumns.html#LICENSE_AVAILABLE_TIME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LICENSE_AVAILABLE_TIME { get { if (!_LICENSE_AVAILABLE_TIMEReady) { _LICENSE_AVAILABLE_TIMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LICENSE_AVAILABLE_TIME"); _LICENSE_AVAILABLE_TIMEReady = true; } return _LICENSE_AVAILABLE_TIMEContent; } }
             private static Java.Lang.String _LICENSE_AVAILABLE_TIMEContent = default;
             private static bool _LICENSE_AVAILABLE_TIMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.ConstraintsColumns.html#LICENSE_EXPIRY_TIME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LICENSE_EXPIRY_TIME { get { if (!_LICENSE_EXPIRY_TIMEReady) { _LICENSE_EXPIRY_TIMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LICENSE_EXPIRY_TIME"); _LICENSE_EXPIRY_TIMEReady = true; } return _LICENSE_EXPIRY_TIMEContent; } }
             private static Java.Lang.String _LICENSE_EXPIRY_TIMEContent = default;
             private static bool _LICENSE_EXPIRY_TIMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.ConstraintsColumns.html#LICENSE_START_TIME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LICENSE_START_TIME { get { if (!_LICENSE_START_TIMEReady) { _LICENSE_START_TIMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LICENSE_START_TIME"); _LICENSE_START_TIMEReady = true; } return _LICENSE_START_TIMEContent; } }
             private static Java.Lang.String _LICENSE_START_TIMEContent = default;
             private static bool _LICENSE_START_TIMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.ConstraintsColumns.html#MAX_REPEAT_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String MAX_REPEAT_COUNT { get { if (!_MAX_REPEAT_COUNTReady) { _MAX_REPEAT_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MAX_REPEAT_COUNT"); _MAX_REPEAT_COUNTReady = true; } return _MAX_REPEAT_COUNTContent; } }
             private static Java.Lang.String _MAX_REPEAT_COUNTContent = default;
             private static bool _MAX_REPEAT_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.ConstraintsColumns.html#REMAINING_REPEAT_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String REMAINING_REPEAT_COUNT { get { if (!_REMAINING_REPEAT_COUNTReady) { _REMAINING_REPEAT_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "REMAINING_REPEAT_COUNT"); _REMAINING_REPEAT_COUNTReady = true; } return _REMAINING_REPEAT_COUNTContent; } }
             private static Java.Lang.String _REMAINING_REPEAT_COUNTContent = default;
             private static bool _REMAINING_REPEAT_COUNTReady = false; // this is used because in case of generics 
@@ -224,28 +224,28 @@ public partial class DrmObjectType
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.DrmObjectType.html#CONTENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CONTENT { get { if (!_CONTENTReady) { _CONTENTContent = SGetField<int>(LocalBridgeClazz, "CONTENT"); _CONTENTReady = true; } return _CONTENTContent; } }
             private static int _CONTENTContent = default;
             private static bool _CONTENTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.DrmObjectType.html#RIGHTS_OBJECT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RIGHTS_OBJECT { get { if (!_RIGHTS_OBJECTReady) { _RIGHTS_OBJECTContent = SGetField<int>(LocalBridgeClazz, "RIGHTS_OBJECT"); _RIGHTS_OBJECTReady = true; } return _RIGHTS_OBJECTContent; } }
             private static int _RIGHTS_OBJECTContent = default;
             private static bool _RIGHTS_OBJECTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.DrmObjectType.html#TRIGGER_OBJECT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TRIGGER_OBJECT { get { if (!_TRIGGER_OBJECTReady) { _TRIGGER_OBJECTContent = SGetField<int>(LocalBridgeClazz, "TRIGGER_OBJECT"); _TRIGGER_OBJECTReady = true; } return _TRIGGER_OBJECTContent; } }
             private static int _TRIGGER_OBJECTContent = default;
             private static bool _TRIGGER_OBJECTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.DrmObjectType.html#UNKNOWN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int UNKNOWN { get { if (!_UNKNOWNReady) { _UNKNOWNContent = SGetField<int>(LocalBridgeClazz, "UNKNOWN"); _UNKNOWNReady = true; } return _UNKNOWNContent; } }
             private static int _UNKNOWNContent = default;
             private static bool _UNKNOWNReady = false; // this is used because in case of generics 
@@ -283,28 +283,28 @@ public partial class Playback
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Playback.html#PAUSE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PAUSE { get { if (!_PAUSEReady) { _PAUSEContent = SGetField<int>(LocalBridgeClazz, "PAUSE"); _PAUSEReady = true; } return _PAUSEContent; } }
             private static int _PAUSEContent = default;
             private static bool _PAUSEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Playback.html#RESUME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RESUME { get { if (!_RESUMEReady) { _RESUMEContent = SGetField<int>(LocalBridgeClazz, "RESUME"); _RESUMEReady = true; } return _RESUMEContent; } }
             private static int _RESUMEContent = default;
             private static bool _RESUMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Playback.html#START"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int START { get { if (!_STARTReady) { _STARTContent = SGetField<int>(LocalBridgeClazz, "START"); _STARTReady = true; } return _STARTContent; } }
             private static int _STARTContent = default;
             private static bool _STARTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.Playback.html#STOP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STOP { get { if (!_STOPReady) { _STOPContent = SGetField<int>(LocalBridgeClazz, "STOP"); _STOPReady = true; } return _STOPContent; } }
             private static int _STOPContent = default;
             private static bool _STOPReady = false; // this is used because in case of generics 
@@ -342,28 +342,28 @@ public partial class RightsStatus
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.RightsStatus.html#RIGHTS_EXPIRED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RIGHTS_EXPIRED { get { if (!_RIGHTS_EXPIREDReady) { _RIGHTS_EXPIREDContent = SGetField<int>(LocalBridgeClazz, "RIGHTS_EXPIRED"); _RIGHTS_EXPIREDReady = true; } return _RIGHTS_EXPIREDContent; } }
             private static int _RIGHTS_EXPIREDContent = default;
             private static bool _RIGHTS_EXPIREDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.RightsStatus.html#RIGHTS_INVALID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RIGHTS_INVALID { get { if (!_RIGHTS_INVALIDReady) { _RIGHTS_INVALIDContent = SGetField<int>(LocalBridgeClazz, "RIGHTS_INVALID"); _RIGHTS_INVALIDReady = true; } return _RIGHTS_INVALIDContent; } }
             private static int _RIGHTS_INVALIDContent = default;
             private static bool _RIGHTS_INVALIDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.RightsStatus.html#RIGHTS_NOT_ACQUIRED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RIGHTS_NOT_ACQUIRED { get { if (!_RIGHTS_NOT_ACQUIREDReady) { _RIGHTS_NOT_ACQUIREDContent = SGetField<int>(LocalBridgeClazz, "RIGHTS_NOT_ACQUIRED"); _RIGHTS_NOT_ACQUIREDReady = true; } return _RIGHTS_NOT_ACQUIREDContent; } }
             private static int _RIGHTS_NOT_ACQUIREDContent = default;
             private static bool _RIGHTS_NOT_ACQUIREDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/drm/DrmStore.RightsStatus.html#RIGHTS_VALID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RIGHTS_VALID { get { if (!_RIGHTS_VALIDReady) { _RIGHTS_VALIDContent = SGetField<int>(LocalBridgeClazz, "RIGHTS_VALID"); _RIGHTS_VALIDReady = true; } return _RIGHTS_VALIDContent; } }
             private static int _RIGHTS_VALIDContent = default;
             private static bool _RIGHTS_VALIDReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmSupportInfo.cs b/src/net/Netdroid/Generated/Android/Drm/DrmSupportInfo.cs
index 0530babe8..17fda915e 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmSupportInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmSupportInfo.cs
@@ -46,42 +46,46 @@ public partial class DrmSupportInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#getDescriprition()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#getDescriprition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Descriprition
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDescriprition()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescriprition", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescriprition", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#getDescription()"/> <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#setDescription(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#getDescription()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Description
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#getFileSuffixIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#getFileSuffixIterator()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Iterator<Java.Lang.String> FileSuffixIterator
+        /// <returns><see cref="Java.Util.Iterator"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Iterator<Java.Lang.String> GetFileSuffixIterator()
         {
-            get { return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getFileSuffixIterator", "()Ljava/util/Iterator;"); }
+            return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getFileSuffixIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#getMimeTypeIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#getMimeTypeIterator()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Iterator<Java.Lang.String> MimeTypeIterator
+        /// <returns><see cref="Java.Util.Iterator"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Iterator<Java.Lang.String> GetMimeTypeIterator()
         {
-            get { return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getMimeTypeIterator", "()Ljava/util/Iterator;"); }
+            return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getMimeTypeIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#addFileSuffix(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddFileSuffix(Java.Lang.String arg0)
         {
             IExecuteWithSignature("addFileSuffix", "(Ljava/lang/String;)V", arg0);
@@ -90,11 +94,20 @@ public void AddFileSuffix(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#addMimeType(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddMimeType(Java.Lang.String arg0)
         {
             IExecuteWithSignature("addMimeType", "(Ljava/lang/String;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/drm/DrmSupportInfo.html#setDescription(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetDescription(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Drm/DrmUtils.cs b/src/net/Netdroid/Generated/Android/Drm/DrmUtils.cs
index dabb12715..05287a824 100644
--- a/src/net/Netdroid/Generated/Android/Drm/DrmUtils.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/DrmUtils.cs
@@ -46,7 +46,7 @@ public partial class DrmUtils
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Android.Drm.DrmUtils.ExtendedMetadataParser"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Drm.DrmUtils.ExtendedMetadataParser GetExtendedMetadataParser(byte[] arg0)
         {
             return SExecuteWithSignature<Android.Drm.DrmUtils.ExtendedMetadataParser>(LocalBridgeClazz, "getExtendedMetadataParser", "([B)Landroid/drm/DrmUtils$ExtendedMetadataParser;", new object[] { arg0 });
@@ -84,7 +84,7 @@ public partial class ExtendedMetadataParser
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.String Get(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Java.Lang.String>("get", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
@@ -93,7 +93,7 @@ public Java.Lang.String Get(Java.Lang.String arg0)
             /// <see href="https://developer.android.com/reference/android/drm/DrmUtils.ExtendedMetadataParser.html#iterator()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Iterator"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Util.Iterator<Java.Lang.String> Iterator()
             {
                 return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("iterator", "()Ljava/util/Iterator;");
@@ -102,7 +102,7 @@ public Java.Lang.String Get(Java.Lang.String arg0)
             /// <see href="https://developer.android.com/reference/android/drm/DrmUtils.ExtendedMetadataParser.html#keyIterator()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Iterator"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Util.Iterator<Java.Lang.String> KeyIterator()
             {
                 return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("keyIterator", "()Ljava/util/Iterator;");
diff --git a/src/net/Netdroid/Generated/Android/Drm/ProcessedData.cs b/src/net/Netdroid/Generated/Android/Drm/ProcessedData.cs
index ae6f9e802..141915934 100644
--- a/src/net/Netdroid/Generated/Android/Drm/ProcessedData.cs
+++ b/src/net/Netdroid/Generated/Android/Drm/ProcessedData.cs
@@ -46,28 +46,31 @@ public partial class ProcessedData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/ProcessedData.html#getAccountId()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/ProcessedData.html#getData()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String AccountId
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetData()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAccountId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/ProcessedData.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/ProcessedData.html#getAccountId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte[] Data
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetAccountId()
         {
-            get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAccountId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/drm/ProcessedData.html#getSubscriptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/drm/ProcessedData.html#getSubscriptionId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String SubscriptionId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSubscriptionId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubscriptionId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSubscriptionId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Gesture/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Gesture/AllPackageClasses.cs
index 8863eb84e..b6e34fe4a 100644
--- a/src/net/Netdroid/Generated/Android/Gesture/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Gesture/AllPackageClasses.cs
@@ -124,12 +124,12 @@ public partial class GestureLibrary : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GestureLibrary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GestureLibrary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GestureLibrary() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GestureLibrary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GestureLibrary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GestureLibrary(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -211,10 +211,13 @@ public partial class OnGestureListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnGestureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.gesture.GestureOverlayView_OnGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.gesture.OnGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -236,10 +239,13 @@ public partial class OnGestureListenerDirect : OnGestureListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.gesture.GestureOverlayView$OnGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.gesture.GestureOverlayView$OnGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -270,10 +276,13 @@ public partial class OnGesturePerformedListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public OnGesturePerformedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.gesture.GestureOverlayView_OnGesturePerformedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.gesture.OnGesturePerformedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -295,10 +304,13 @@ public partial class OnGesturePerformedListenerDirect : OnGesturePerformedListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.gesture.GestureOverlayView$OnGesturePerformedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.gesture.GestureOverlayView$OnGesturePerformedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -329,10 +341,13 @@ public partial class OnGesturingListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnGesturingListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.gesture.GestureOverlayView_OnGesturingListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.gesture.OnGesturingListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -354,10 +369,13 @@ public partial class OnGesturingListenerDirect : OnGesturingListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.gesture.GestureOverlayView$OnGesturingListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.gesture.GestureOverlayView$OnGesturingListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Gesture/Gesture.cs b/src/net/Netdroid/Generated/Android/Gesture/Gesture.cs
index 121a7d201..b4353d773 100644
--- a/src/net/Netdroid/Generated/Android/Gesture/Gesture.cs
+++ b/src/net/Netdroid/Generated/Android/Gesture/Gesture.cs
@@ -52,41 +52,6 @@ public partial class Gesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getBoundingBox()"/> 
-        /// </summary>
-        public Android.Graphics.RectF BoundingBox
-        {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getBoundingBox", "()Landroid/graphics/RectF;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getID()"/> 
-        /// </summary>
-        public long ID
-        {
-            get { return IExecuteWithSignature<long>("getID", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getLength()"/> 
-        /// </summary>
-        public float Length
-        {
-            get { return IExecuteWithSignature<float>("getLength", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getStrokes()"/> 
-        /// </summary>
-        public Java.Util.ArrayList<Android.Gesture.GestureStroke> Strokes
-        {
-            get { return IExecuteWithSignature<Java.Util.ArrayList<Android.Gesture.GestureStroke>>("getStrokes", "()Ljava/util/ArrayList;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getStrokesCount()"/> 
-        /// </summary>
-        public int StrokesCount
-        {
-            get { return IExecuteWithSignature<int>("getStrokesCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#toBitmap(int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -154,6 +119,22 @@ public Android.Graphics.Path ToPath(int arg0, int arg1, int arg2, int arg3)
             return IExecute<Android.Graphics.Path>("toPath", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getBoundingBox()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetBoundingBox()
+        {
+            return IExecuteWithSignature<Android.Graphics.RectF>("getBoundingBox", "()Landroid/graphics/RectF;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetLength()
+        {
+            return IExecuteWithSignature<float>("getLength", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -162,6 +143,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getStrokesCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStrokesCount()
+        {
+            return IExecuteWithSignature<int>("getStrokesCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getStrokes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<Android.Gesture.GestureStroke> GetStrokes()
+        {
+            return IExecuteWithSignature<Java.Util.ArrayList<Android.Gesture.GestureStroke>>("getStrokes", "()Ljava/util/ArrayList;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#getID()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetID()
+        {
+            return IExecuteWithSignature<long>("getID", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/Gesture.html#addStroke(android.gesture.GestureStroke)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Gesture.GestureStroke"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Gesture/GestureLibrary.cs b/src/net/Netdroid/Generated/Android/Gesture/GestureLibrary.cs
index 0e2208fd5..04e918576 100644
--- a/src/net/Netdroid/Generated/Android/Gesture/GestureLibrary.cs
+++ b/src/net/Netdroid/Generated/Android/Gesture/GestureLibrary.cs
@@ -46,27 +46,6 @@ public partial class GestureLibrary
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#getGestureEntries()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> GestureEntries
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getGestureEntries", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#getOrientationStyle()"/> <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#setOrientationStyle(int)"/>
-        /// </summary>
-        public int OrientationStyle
-        {
-            get { return IExecuteWithSignature<int>("getOrientationStyle", "()I"); } set { IExecuteWithSignature("setOrientationStyle", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#getSequenceType()"/> <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#setSequenceType(int)"/>
-        /// </summary>
-        public int SequenceType
-        {
-            get { return IExecuteWithSignature<int>("getSequenceType", "()I"); } set { IExecuteWithSignature("setSequenceType", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#load()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -91,6 +70,22 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#getOrientationStyle()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetOrientationStyle()
+        {
+            return IExecuteWithSignature<int>("getOrientationStyle", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#getSequenceType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSequenceType()
+        {
+            return IExecuteWithSignature<int>("getSequenceType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#getGestures(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -109,6 +104,14 @@ public bool IsReadOnly()
             return IExecuteWithSignature<Java.Util.ArrayList<Android.Gesture.Prediction>>("recognize", "(Landroid/gesture/Gesture;)Ljava/util/ArrayList;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#getGestureEntries()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetGestureEntries()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getGestureEntries", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#addGesture(java.lang.String,android.gesture.Gesture)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -134,6 +137,22 @@ public void RemoveGesture(Java.Lang.String arg0, Android.Gesture.Gesture arg1)
         {
             IExecute("removeGesture", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#setOrientationStyle(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOrientationStyle(int arg0)
+        {
+            IExecuteWithSignature("setOrientationStyle", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureLibrary.html#setSequenceType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSequenceType(int arg0)
+        {
+            IExecuteWithSignature("setSequenceType", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Gesture/GestureOverlayView.cs b/src/net/Netdroid/Generated/Android/Gesture/GestureOverlayView.cs
index 83377386a..f2f2ac5f2 100644
--- a/src/net/Netdroid/Generated/Android/Gesture/GestureOverlayView.cs
+++ b/src/net/Netdroid/Generated/Android/Gesture/GestureOverlayView.cs
@@ -108,129 +108,141 @@ public GestureOverlayView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getCurrentStroke()"/> 
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGesture()"/>
         /// </summary>
-        public Java.Util.ArrayList<Android.Gesture.GesturePoint> CurrentStroke
+        /// <returns><see cref="Android.Gesture.Gesture"/></returns>
+        public Android.Gesture.Gesture GetGesture()
         {
-            get { return IExecuteWithSignature<Java.Util.ArrayList<Android.Gesture.GesturePoint>>("getCurrentStroke", "()Ljava/util/ArrayList;"); }
+            return IExecuteWithSignature<Android.Gesture.Gesture>("getGesture", "()Landroid/gesture/Gesture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getFadeOffset()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setFadeOffset(long)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGesturePath()"/>
         /// </summary>
-        public long FadeOffset
+        /// <returns><see cref="Android.Graphics.Path"/></returns>
+        public Android.Graphics.Path GetGesturePath()
         {
-            get { return IExecuteWithSignature<long>("getFadeOffset", "()J"); } set { IExecuteWithSignature("setFadeOffset", "(J)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Path>("getGesturePath", "()Landroid/graphics/Path;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGesture()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGesture(android.gesture.Gesture)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGesturePath(android.graphics.Path)"/>
         /// </summary>
-        public Android.Gesture.Gesture Gesture
+        /// <param name="arg0"><see cref="Android.Graphics.Path"/></param>
+        /// <returns><see cref="Android.Graphics.Path"/></returns>
+        public Android.Graphics.Path GetGesturePath(Android.Graphics.Path arg0)
         {
-            get { return IExecuteWithSignature<Android.Gesture.Gesture>("getGesture", "()Landroid/gesture/Gesture;"); } set { IExecuteWithSignature("setGesture", "(Landroid/gesture/Gesture;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Path>("getGesturePath", "(Landroid/graphics/Path;)Landroid/graphics/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureColor()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#isEventsInterceptionEnabled()"/>
         /// </summary>
-        public int GestureColor
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEventsInterceptionEnabled()
         {
-            get { return IExecuteWithSignature<int>("getGestureColor", "()I"); } set { IExecuteWithSignature("setGestureColor", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isEventsInterceptionEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGesturePath()"/> 
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#isFadeEnabled()"/>
         /// </summary>
-        public Android.Graphics.Path GesturePath
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFadeEnabled()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Path>("getGesturePath", "()Landroid/graphics/Path;"); }
+            return IExecuteWithSignature<bool>("isFadeEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeAngleThreshold()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeAngleThreshold(float)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#isGestureVisible()"/>
         /// </summary>
-        public float GestureStrokeAngleThreshold
+        /// <returns><see cref="bool"/></returns>
+        public bool IsGestureVisible()
         {
-            get { return IExecuteWithSignature<float>("getGestureStrokeAngleThreshold", "()F"); } set { IExecuteWithSignature("setGestureStrokeAngleThreshold", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isGestureVisible", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeLengthThreshold()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeLengthThreshold(float)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#isGesturing()"/>
         /// </summary>
-        public float GestureStrokeLengthThreshold
+        /// <returns><see cref="bool"/></returns>
+        public bool IsGesturing()
         {
-            get { return IExecuteWithSignature<float>("getGestureStrokeLengthThreshold", "()F"); } set { IExecuteWithSignature("setGestureStrokeLengthThreshold", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isGesturing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeSquarenessTreshold()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeSquarenessTreshold(float)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeAngleThreshold()"/>
         /// </summary>
-        public float GestureStrokeSquarenessTreshold
+        /// <returns><see cref="float"/></returns>
+        public float GetGestureStrokeAngleThreshold()
         {
-            get { return IExecuteWithSignature<float>("getGestureStrokeSquarenessTreshold", "()F"); } set { IExecuteWithSignature("setGestureStrokeSquarenessTreshold", "(F)V", value); }
+            return IExecuteWithSignature<float>("getGestureStrokeAngleThreshold", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeType()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeLengthThreshold()"/>
         /// </summary>
-        public int GestureStrokeType
+        /// <returns><see cref="float"/></returns>
+        public float GetGestureStrokeLengthThreshold()
         {
-            get { return IExecuteWithSignature<int>("getGestureStrokeType", "()I"); } set { IExecuteWithSignature("setGestureStrokeType", "(I)V", value); }
+            return IExecuteWithSignature<float>("getGestureStrokeLengthThreshold", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeWidth()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeWidth(float)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeSquarenessTreshold()"/>
         /// </summary>
-        public float GestureStrokeWidth
+        /// <returns><see cref="float"/></returns>
+        public float GetGestureStrokeSquarenessTreshold()
         {
-            get { return IExecuteWithSignature<float>("getGestureStrokeWidth", "()F"); } set { IExecuteWithSignature("setGestureStrokeWidth", "(F)V", value); }
+            return IExecuteWithSignature<float>("getGestureStrokeSquarenessTreshold", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getOrientation()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setOrientation(int)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeWidth()"/>
         /// </summary>
-        public int Orientation
+        /// <returns><see cref="float"/></returns>
+        public float GetGestureStrokeWidth()
         {
-            get { return IExecuteWithSignature<int>("getOrientation", "()I"); } set { IExecuteWithSignature("setOrientation", "(I)V", value); }
+            return IExecuteWithSignature<float>("getGestureStrokeWidth", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getUncertainGestureColor()"/> <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setUncertainGestureColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureColor()"/>
         /// </summary>
-        public int UncertainGestureColor
+        /// <returns><see cref="int"/></returns>
+        public int GetGestureColor()
         {
-            get { return IExecuteWithSignature<int>("getUncertainGestureColor", "()I"); } set { IExecuteWithSignature("setUncertainGestureColor", "(I)V", value); }
+            return IExecuteWithSignature<int>("getGestureColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGesturePath(android.graphics.Path)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getGestureStrokeType()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Path"/></param>
-        /// <returns><see cref="Android.Graphics.Path"/></returns>
-        public Android.Graphics.Path GetGesturePath(Android.Graphics.Path arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetGestureStrokeType()
         {
-            return IExecuteWithSignature<Android.Graphics.Path>("getGesturePath", "(Landroid/graphics/Path;)Landroid/graphics/Path;", arg0);
+            return IExecuteWithSignature<int>("getGestureStrokeType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#isEventsInterceptionEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getOrientation()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEventsInterceptionEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetOrientation()
         {
-            return IExecuteWithSignature<bool>("isEventsInterceptionEnabled", "()Z");
+            return IExecuteWithSignature<int>("getOrientation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#isFadeEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getUncertainGestureColor()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFadeEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetUncertainGestureColor()
         {
-            return IExecuteWithSignature<bool>("isFadeEnabled", "()Z");
+            return IExecuteWithSignature<int>("getUncertainGestureColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#isGestureVisible()"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getCurrentStroke()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsGestureVisible()
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<Android.Gesture.GesturePoint> GetCurrentStroke()
         {
-            return IExecuteWithSignature<bool>("isGestureVisible", "()Z");
+            return IExecuteWithSignature<Java.Util.ArrayList<Android.Gesture.GesturePoint>>("getCurrentStroke", "()Ljava/util/ArrayList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#isGesturing()"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#getFadeOffset()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsGesturing()
+        /// <returns><see cref="long"/></returns>
+        public long GetFadeOffset()
         {
-            return IExecuteWithSignature<bool>("isGesturing", "()Z");
+            return IExecuteWithSignature<long>("getFadeOffset", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#addOnGestureListener(android.gesture.GestureOverlayView.OnGestureListener)"/>
@@ -340,6 +352,70 @@ public void SetFadeEnabled(bool arg0)
             IExecuteWithSignature("setFadeEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setFadeOffset(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetFadeOffset(long arg0)
+        {
+            IExecuteWithSignature("setFadeOffset", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGesture(android.gesture.Gesture)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Gesture.Gesture"/></param>
+        public void SetGesture(Android.Gesture.Gesture arg0)
+        {
+            IExecuteWithSignature("setGesture", "(Landroid/gesture/Gesture;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGestureColor(int arg0)
+        {
+            IExecuteWithSignature("setGestureColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeAngleThreshold(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetGestureStrokeAngleThreshold(float arg0)
+        {
+            IExecuteWithSignature("setGestureStrokeAngleThreshold", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeLengthThreshold(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetGestureStrokeLengthThreshold(float arg0)
+        {
+            IExecuteWithSignature("setGestureStrokeLengthThreshold", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeSquarenessTreshold(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetGestureStrokeSquarenessTreshold(float arg0)
+        {
+            IExecuteWithSignature("setGestureStrokeSquarenessTreshold", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGestureStrokeType(int arg0)
+        {
+            IExecuteWithSignature("setGestureStrokeType", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureStrokeWidth(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetGestureStrokeWidth(float arg0)
+        {
+            IExecuteWithSignature("setGestureStrokeWidth", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setGestureVisible(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -347,6 +423,22 @@ public void SetGestureVisible(bool arg0)
         {
             IExecuteWithSignature("setGestureVisible", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setOrientation(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOrientation(int arg0)
+        {
+            IExecuteWithSignature("setOrientation", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.html#setUncertainGestureColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetUncertainGestureColor(int arg0)
+        {
+            IExecuteWithSignature("setUncertainGestureColor", "(I)V", arg0);
+        }
 
         #endregion
 
@@ -376,10 +468,10 @@ public partial class OnGestureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGesture", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGestureEventHandler));
-                AddEventHandler("onGestureCancelled", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGestureCancelledEventHandler));
-                AddEventHandler("onGestureEnded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGestureEndedEventHandler));
-                AddEventHandler("onGestureStarted", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGestureStartedEventHandler));
+                AddEventHandler("onGesture", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGestureEventHandler));
+                AddEventHandler("onGestureCancelled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGestureCancelledEventHandler));
+                AddEventHandler("onGestureEnded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGestureEndedEventHandler));
+                AddEventHandler("onGestureStarted", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGestureStartedEventHandler));
 
             }
 
@@ -387,7 +479,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.OnGestureListener.html#onGesture(android.gesture.GestureOverlayView,android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGesture"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Gesture.GestureOverlayView, Android.View.MotionEvent> OnOnGesture { get; set; } = null;
+            public global::System.Action<Android.Gesture.GestureOverlayView, Android.View.MotionEvent> OnOnGesture { get; set; } = null;
 
             void OnGestureEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>> data)
             {
@@ -409,7 +501,7 @@ public virtual void OnGesture(Android.Gesture.GestureOverlayView arg0, Android.V
             /// Handler for <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.OnGestureListener.html#onGestureCancelled(android.gesture.GestureOverlayView,android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGestureCancelled"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Gesture.GestureOverlayView, Android.View.MotionEvent> OnOnGestureCancelled { get; set; } = null;
+            public global::System.Action<Android.Gesture.GestureOverlayView, Android.View.MotionEvent> OnOnGestureCancelled { get; set; } = null;
 
             void OnGestureCancelledEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>> data)
             {
@@ -431,7 +523,7 @@ public virtual void OnGestureCancelled(Android.Gesture.GestureOverlayView arg0,
             /// Handler for <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.OnGestureListener.html#onGestureEnded(android.gesture.GestureOverlayView,android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGestureEnded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Gesture.GestureOverlayView, Android.View.MotionEvent> OnOnGestureEnded { get; set; } = null;
+            public global::System.Action<Android.Gesture.GestureOverlayView, Android.View.MotionEvent> OnOnGestureEnded { get; set; } = null;
 
             void OnGestureEndedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>> data)
             {
@@ -453,7 +545,7 @@ public virtual void OnGestureEnded(Android.Gesture.GestureOverlayView arg0, Andr
             /// Handler for <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.OnGestureListener.html#onGestureStarted(android.gesture.GestureOverlayView,android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGestureStarted"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Gesture.GestureOverlayView, Android.View.MotionEvent> OnOnGestureStarted { get; set; } = null;
+            public global::System.Action<Android.Gesture.GestureOverlayView, Android.View.MotionEvent> OnOnGestureStarted { get; set; } = null;
 
             void OnGestureStartedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>> data)
             {
@@ -573,7 +665,7 @@ public partial class OnGesturePerformedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGesturePerformed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGesturePerformedEventHandler));
+                AddEventHandler("onGesturePerformed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGesturePerformedEventHandler));
 
             }
 
@@ -581,7 +673,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.OnGesturePerformedListener.html#onGesturePerformed(android.gesture.GestureOverlayView,android.gesture.Gesture)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGesturePerformed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Gesture.GestureOverlayView, Android.Gesture.Gesture> OnOnGesturePerformed { get; set; } = null;
+            public global::System.Action<Android.Gesture.GestureOverlayView, Android.Gesture.Gesture> OnOnGesturePerformed { get; set; } = null;
 
             void OnGesturePerformedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>> data)
             {
@@ -674,8 +766,8 @@ public partial class OnGesturingListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGesturingEnded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGesturingEndedEventHandler));
-                AddEventHandler("onGesturingStarted", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGesturingStartedEventHandler));
+                AddEventHandler("onGesturingEnded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGesturingEndedEventHandler));
+                AddEventHandler("onGesturingStarted", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>>>(OnGesturingStartedEventHandler));
 
             }
 
@@ -683,7 +775,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.OnGesturingListener.html#onGesturingEnded(android.gesture.GestureOverlayView)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGesturingEnded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Gesture.GestureOverlayView> OnOnGesturingEnded { get; set; } = null;
+            public global::System.Action<Android.Gesture.GestureOverlayView> OnOnGesturingEnded { get; set; } = null;
 
             void OnGesturingEndedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>> data)
             {
@@ -704,7 +796,7 @@ public virtual void OnGesturingEnded(Android.Gesture.GestureOverlayView arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/gesture/GestureOverlayView.OnGesturingListener.html#onGesturingStarted(android.gesture.GestureOverlayView)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGesturingStarted"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Gesture.GestureOverlayView> OnOnGesturingStarted { get; set; } = null;
+            public global::System.Action<Android.Gesture.GestureOverlayView> OnOnGesturingStarted { get; set; } = null;
 
             void OnGesturingStartedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Gesture.GestureOverlayView>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Gesture/GestureStore.cs b/src/net/Netdroid/Generated/Android/Gesture/GestureStore.cs
index 19f18b482..328f115b3 100644
--- a/src/net/Netdroid/Generated/Android/Gesture/GestureStore.cs
+++ b/src/net/Netdroid/Generated/Android/Gesture/GestureStore.cs
@@ -70,33 +70,28 @@ public partial class GestureStore
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#getGestureEntries()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> GestureEntries
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getGestureEntries", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#getOrientationStyle()"/> <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#setOrientationStyle(int)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#hasChanged()"/>
         /// </summary>
-        public int OrientationStyle
+        /// <returns><see cref="bool"/></returns>
+        public bool HasChanged()
         {
-            get { return IExecuteWithSignature<int>("getOrientationStyle", "()I"); } set { IExecuteWithSignature("setOrientationStyle", "(I)V", value); }
+            return IExecuteWithSignature<bool>("hasChanged", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#getSequenceType()"/> <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#setSequenceType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#getOrientationStyle()"/>
         /// </summary>
-        public int SequenceType
+        /// <returns><see cref="int"/></returns>
+        public int GetOrientationStyle()
         {
-            get { return IExecuteWithSignature<int>("getSequenceType", "()I"); } set { IExecuteWithSignature("setSequenceType", "(I)V", value); }
+            return IExecuteWithSignature<int>("getOrientationStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#hasChanged()"/>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#getSequenceType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasChanged()
+        /// <returns><see cref="int"/></returns>
+        public int GetSequenceType()
         {
-            return IExecuteWithSignature<bool>("hasChanged", "()Z");
+            return IExecuteWithSignature<int>("getSequenceType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#getGestures(java.lang.String)"/>
@@ -117,6 +112,14 @@ public bool HasChanged()
             return IExecuteWithSignature<Java.Util.ArrayList<Android.Gesture.Prediction>>("recognize", "(Landroid/gesture/Gesture;)Ljava/util/ArrayList;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#getGestureEntries()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetGestureEntries()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getGestureEntries", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#addGesture(java.lang.String,android.gesture.Gesture)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -180,6 +183,22 @@ public void Save(Java.Io.OutputStream arg0)
         {
             IExecuteWithSignature("save", "(Ljava/io/OutputStream;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#setOrientationStyle(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOrientationStyle(int arg0)
+        {
+            IExecuteWithSignature("setOrientationStyle", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureStore.html#setSequenceType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSequenceType(int arg0)
+        {
+            IExecuteWithSignature("setSequenceType", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Gesture/GestureStroke.cs b/src/net/Netdroid/Generated/Android/Gesture/GestureStroke.cs
index d57d00b5f..559197734 100644
--- a/src/net/Netdroid/Generated/Android/Gesture/GestureStroke.cs
+++ b/src/net/Netdroid/Generated/Android/Gesture/GestureStroke.cs
@@ -72,13 +72,6 @@ public GestureStroke(Java.Util.ArrayList<Android.Gesture.GesturePoint> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/gesture/GestureStroke.html#getPath()"/> 
-        /// </summary>
-        public Android.Graphics.Path Path
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Path>("getPath", "()Landroid/graphics/Path;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureStroke.html#computeOrientedBoundingBox()"/>
         /// </summary>
         /// <returns><see cref="Android.Gesture.OrientedBoundingBox"/></returns>
@@ -87,6 +80,14 @@ public Android.Gesture.OrientedBoundingBox ComputeOrientedBoundingBox()
             return IExecuteWithSignature<Android.Gesture.OrientedBoundingBox>("computeOrientedBoundingBox", "()Landroid/gesture/OrientedBoundingBox;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/gesture/GestureStroke.html#getPath()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Path"/></returns>
+        public Android.Graphics.Path GetPath()
+        {
+            return IExecuteWithSignature<Android.Graphics.Path>("getPath", "()Landroid/graphics/Path;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/gesture/GestureStroke.html#toPath(float,float,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Graphics/AllPackageClasses.cs
index ef5b57751..20b6f09d1 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/AllPackageClasses.cs
@@ -598,7 +598,7 @@ public Canvas(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Canvas.EdgeType.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class EdgeType : Java.Lang.Enum<Android.Graphics.Canvas.EdgeType>
         {
             const string _bridgeClassName = "android.graphics.Canvas$EdgeType";
@@ -873,12 +873,12 @@ public partial class ColorSpace : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ColorS
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ColorSpace class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ColorSpace class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ColorSpace() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ColorSpace class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ColorSpace class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ColorSpace(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1901,10 +1901,13 @@ public partial class OnHeaderDecodedListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnHeaderDecodedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.graphics.ImageDecoder_OnHeaderDecodedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.graphics.OnHeaderDecodedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1926,10 +1929,13 @@ public partial class OnHeaderDecodedListenerDirect : OnHeaderDecodedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.graphics.ImageDecoder$OnHeaderDecodedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.graphics.ImageDecoder$OnHeaderDecodedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1960,10 +1966,13 @@ public partial class OnPartialImageListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnPartialImageListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.graphics.ImageDecoder_OnPartialImageListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.graphics.OnPartialImageListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1985,10 +1994,13 @@ public partial class OnPartialImageListenerDirect : OnPartialImageListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.graphics.ImageDecoder$OnPartialImageListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.graphics.ImageDecoder$OnPartialImageListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2018,12 +2030,12 @@ public partial class Source : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Source>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Source class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Source class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Source() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Source class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Source class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Source(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2634,7 +2646,7 @@ public Varying(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/graphics/Movie.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Movie : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Movie>
     {
         const string _bridgeClassName = "android.graphics.Movie";
@@ -3961,12 +3973,12 @@ public partial class PostProcessor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pos
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PostProcessor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PostProcessor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PostProcessor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PostProcessor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PostProcessor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PostProcessor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4620,10 +4632,13 @@ public partial class OnFrameAvailableListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnFrameAvailableListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.graphics.SurfaceTexture_OnFrameAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.graphics.OnFrameAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4645,10 +4660,13 @@ public partial class OnFrameAvailableListenerDirect : OnFrameAvailableListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.graphics.SurfaceTexture$OnFrameAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.graphics.SurfaceTexture$OnFrameAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4672,7 +4690,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.OutOfResourcesException.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OutOfResourcesException : Java.Lang.Exception
         {
             const string _bridgeClassName = "android.graphics.SurfaceTexture$OutOfResourcesException";
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Bitmap.cs b/src/net/Netdroid/Generated/Android/Graphics/Bitmap.cs
index fba369b1d..8b7c76e62 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Bitmap.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Bitmap.cs
@@ -267,90 +267,6 @@ public static Android.Graphics.Bitmap WrapHardwareBuffer(Android.Hardware.Hardwa
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getAllocationByteCount()"/> 
-        /// </summary>
-        public int AllocationByteCount
-        {
-            get { return IExecuteWithSignature<int>("getAllocationByteCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getByteCount()"/> 
-        /// </summary>
-        public int ByteCount
-        {
-            get { return IExecuteWithSignature<int>("getByteCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getColorSpace()"/> <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setColorSpace(android.graphics.ColorSpace)"/>
-        /// </summary>
-        public Android.Graphics.ColorSpace ColorSpace
-        {
-            get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;"); } set { IExecuteWithSignature("setColorSpace", "(Landroid/graphics/ColorSpace;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getDensity()"/> <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setDensity(int)"/>
-        /// </summary>
-        public int Density
-        {
-            get { return IExecuteWithSignature<int>("getDensity", "()I"); } set { IExecuteWithSignature("setDensity", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getGainmap()"/> <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setGainmap(android.graphics.Gainmap)"/>
-        /// </summary>
-        public Android.Graphics.Gainmap Gainmap
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Gainmap>("getGainmap", "()Landroid/graphics/Gainmap;"); } set { IExecuteWithSignature("setGainmap", "(Landroid/graphics/Gainmap;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getGenerationId()"/> 
-        /// </summary>
-        public int GenerationId
-        {
-            get { return IExecuteWithSignature<int>("getGenerationId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getConfig()"/> 
-        /// </summary>
-        public Android.Graphics.Bitmap.Config GetConfig
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap.Config>("getConfig", "()Landroid/graphics/Bitmap$Config;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getHardwareBuffer()"/> 
-        /// </summary>
-        public Android.Hardware.HardwareBuffer HardwareBuffer
-        {
-            get { return IExecuteWithSignature<Android.Hardware.HardwareBuffer>("getHardwareBuffer", "()Landroid/hardware/HardwareBuffer;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getHeight()"/> <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setHeight(int)"/>
-        /// </summary>
-        public int Height
-        {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); } set { IExecuteWithSignature("setHeight", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getNinePatchChunk()"/> 
-        /// </summary>
-        public byte[] NinePatchChunk
-        {
-            get { return IExecuteWithSignatureArray<byte>("getNinePatchChunk", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getRowBytes()"/> 
-        /// </summary>
-        public int RowBytes
-        {
-            get { return IExecuteWithSignature<int>("getRowBytes", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getWidth()"/> <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setWidth(int)"/>
-        /// </summary>
-        public int Width
-        {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); } set { IExecuteWithSignature("setWidth", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#asShared()"/>
         /// </summary>
         /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
@@ -387,6 +303,14 @@ public Android.Graphics.Bitmap ExtractAlpha(Android.Graphics.Paint arg0, int[] a
             return IExecute<Android.Graphics.Bitmap>("extractAlpha", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getConfig()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Bitmap.Config"/></returns>
+        public Android.Graphics.Bitmap.Config GetConfig()
+        {
+            return IExecuteWithSignature<Android.Graphics.Bitmap.Config>("getConfig", "()Landroid/graphics/Bitmap$Config;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getColor(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -397,6 +321,30 @@ public Android.Graphics.Color GetColor(int arg0, int arg1)
             return IExecute<Android.Graphics.Color>("getColor", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getColorSpace()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+        public Android.Graphics.ColorSpace GetColorSpace()
+        {
+            return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getGainmap()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Gainmap"/></returns>
+        public Android.Graphics.Gainmap GetGainmap()
+        {
+            return IExecuteWithSignature<Android.Graphics.Gainmap>("getGainmap", "()Landroid/graphics/Gainmap;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getHardwareBuffer()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Hardware.HardwareBuffer"/></returns>
+        public Android.Hardware.HardwareBuffer GetHardwareBuffer()
+        {
+            return IExecuteWithSignature<Android.Hardware.HardwareBuffer>("getHardwareBuffer", "()Landroid/hardware/HardwareBuffer;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#compress(android.graphics.Bitmap.CompressFormat,int,java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap.CompressFormat"/></param>
@@ -465,6 +413,14 @@ public bool SameAs(Android.Graphics.Bitmap arg0)
             return IExecuteWithSignature<bool>("sameAs", "(Landroid/graphics/Bitmap;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getNinePatchChunk()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetNinePatchChunk()
+        {
+            return IExecuteWithSignatureArray<byte>("getNinePatchChunk", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -473,6 +429,46 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getAllocationByteCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAllocationByteCount()
+        {
+            return IExecuteWithSignature<int>("getAllocationByteCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getByteCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetByteCount()
+        {
+            return IExecuteWithSignature<int>("getByteCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getDensity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDensity()
+        {
+            return IExecuteWithSignature<int>("getDensity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getGenerationId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGenerationId()
+        {
+            return IExecuteWithSignature<int>("getGenerationId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
+        {
+            return IExecuteWithSignature<int>("getHeight", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getPixel(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -483,6 +479,14 @@ public int GetPixel(int arg0, int arg1)
             return IExecute<int>("getPixel", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getRowBytes()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRowBytes()
+        {
+            return IExecuteWithSignature<int>("getRowBytes", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getScaledHeight(android.graphics.Canvas)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
@@ -537,6 +541,14 @@ public int GetScaledWidth(int arg0)
             return IExecuteWithSignature<int>("getScaledWidth", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#getWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
+        {
+            return IExecuteWithSignature<int>("getWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#copyPixelsFromBuffer(java.nio.Buffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Buffer"/></param>
@@ -607,6 +619,14 @@ public void Recycle()
             IExecuteWithSignature("recycle", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setColorSpace(android.graphics.ColorSpace)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.ColorSpace"/></param>
+        public void SetColorSpace(Android.Graphics.ColorSpace arg0)
+        {
+            IExecuteWithSignature("setColorSpace", "(Landroid/graphics/ColorSpace;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setConfig(android.graphics.Bitmap.Config)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap.Config"/></param>
@@ -615,6 +635,22 @@ public void SetConfig(Android.Graphics.Bitmap.Config arg0)
             IExecuteWithSignature("setConfig", "(Landroid/graphics/Bitmap$Config;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setDensity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDensity(int arg0)
+        {
+            IExecuteWithSignature("setDensity", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setGainmap(android.graphics.Gainmap)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Gainmap"/></param>
+        public void SetGainmap(Android.Graphics.Gainmap arg0)
+        {
+            IExecuteWithSignature("setGainmap", "(Landroid/graphics/Gainmap;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setHasAlpha(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -631,6 +667,14 @@ public void SetHasMipMap(bool arg0)
             IExecuteWithSignature("setHasMipMap", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHeight(int arg0)
+        {
+            IExecuteWithSignature("setHeight", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setPixel(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -663,6 +707,14 @@ public void SetPremultiplied(bool arg0)
             IExecuteWithSignature("setPremultiplied", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#setWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetWidth(int arg0)
+        {
+            IExecuteWithSignature("setWidth", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -702,7 +754,7 @@ public partial class CompressFormat
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.CompressFormat.html#WEBP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Graphics.Bitmap.CompressFormat WEBP { get { if (!_WEBPReady) { _WEBPContent = SGetField<Android.Graphics.Bitmap.CompressFormat>(LocalBridgeClazz, "WEBP"); _WEBPReady = true; } return _WEBPContent; } }
             private static Android.Graphics.Bitmap.CompressFormat _WEBPContent = default;
             private static bool _WEBPReady = false; // this is used because in case of generics 
@@ -775,7 +827,7 @@ public partial class Config
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/Bitmap.Config.html#ARGB_4444"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Graphics.Bitmap.Config ARGB_4444 { get { if (!_ARGB_4444Ready) { _ARGB_4444Content = SGetField<Android.Graphics.Bitmap.Config>(LocalBridgeClazz, "ARGB_4444"); _ARGB_4444Ready = true; } return _ARGB_4444Content; } }
             private static Android.Graphics.Bitmap.Config _ARGB_4444Content = default;
             private static bool _ARGB_4444Ready = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/BitmapFactory.cs b/src/net/Netdroid/Generated/Android/Graphics/BitmapFactory.cs
index 6139fe82c..a3332bbb9 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/BitmapFactory.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/BitmapFactory.cs
@@ -125,6 +125,19 @@ public static Android.Graphics.Bitmap DecodeResource(Android.Content.Res.Resourc
             return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "decodeResource", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.html#decodeResourceStream(android.content.res.Resources,android.util.TypedValue,java.io.InputStream,android.graphics.Rect,android.graphics.BitmapFactory.Options)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
+        /// <param name="arg1"><see cref="Android.Util.TypedValue"/></param>
+        /// <param name="arg2"><see cref="Java.Io.InputStream"/></param>
+        /// <param name="arg3"><see cref="Android.Graphics.Rect"/></param>
+        /// <param name="arg4"><see cref="Android.Graphics.BitmapFactory.Options"/></param>
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public static Android.Graphics.Bitmap DecodeResourceStream(Android.Content.Res.Resources arg0, Android.Util.TypedValue arg1, Java.Io.InputStream arg2, Android.Graphics.Rect arg3, Android.Graphics.BitmapFactory.Options arg4)
+        {
+            return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "decodeResourceStream", arg0, arg1, arg2, arg3, arg4);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.html#decodeStream(java.io.InputStream,android.graphics.Rect,android.graphics.BitmapFactory.Options)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
@@ -187,12 +200,12 @@ public partial class Options
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#inDither"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool inDither { get { return IGetField<bool>("inDither"); } set { ISetField("inDither", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#inInputShareable"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool inInputShareable { get { return IGetField<bool>("inInputShareable"); } set { ISetField("inInputShareable", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#inJustDecodeBounds"/>
@@ -205,7 +218,7 @@ public partial class Options
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#inPreferQualityOverSpeed"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool inPreferQualityOverSpeed { get { return IGetField<bool>("inPreferQualityOverSpeed"); } set { ISetField("inPreferQualityOverSpeed", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#inPremultiplied"/>
@@ -214,7 +227,7 @@ public partial class Options
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#inPurgeable"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool inPurgeable { get { return IGetField<bool>("inPurgeable"); } set { ISetField("inPurgeable", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#inScaled"/>
@@ -223,7 +236,7 @@ public partial class Options
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#mCancel"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool mCancel { get { return IGetField<bool>("mCancel"); } set { ISetField("mCancel", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#inTempStorage"/>
@@ -268,7 +281,7 @@ public partial class Options
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/BitmapFactory.Options.html#requestCancelDecode()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void RequestCancelDecode()
             {
                 IExecuteWithSignature("requestCancelDecode", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Graphics/BitmapRegionDecoder.cs b/src/net/Netdroid/Generated/Android/Graphics/BitmapRegionDecoder.cs
index 3f803332c..83e1487b6 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/BitmapRegionDecoder.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/BitmapRegionDecoder.cs
@@ -60,7 +60,7 @@ public static Android.Graphics.BitmapRegionDecoder NewInstance(Android.Os.Parcel
         /// <param name="arg3"><see cref="bool"/></param>
         /// <returns><see cref="Android.Graphics.BitmapRegionDecoder"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.BitmapRegionDecoder NewInstance(byte[] arg0, int arg1, int arg2, bool arg3)
         {
             return SExecute<Android.Graphics.BitmapRegionDecoder>(LocalBridgeClazz, "newInstance", arg0, arg1, arg2, arg3);
@@ -84,7 +84,7 @@ public static Android.Graphics.BitmapRegionDecoder NewInstance(byte[] arg0, int
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="Android.Graphics.BitmapRegionDecoder"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.BitmapRegionDecoder NewInstance(Java.Io.FileDescriptor arg0, bool arg1)
         {
             return SExecute<Android.Graphics.BitmapRegionDecoder>(LocalBridgeClazz, "newInstance", arg0, arg1);
@@ -96,7 +96,7 @@ public static Android.Graphics.BitmapRegionDecoder NewInstance(Java.Io.FileDescr
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="Android.Graphics.BitmapRegionDecoder"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.BitmapRegionDecoder NewInstance(Java.Io.InputStream arg0, bool arg1)
         {
             return SExecute<Android.Graphics.BitmapRegionDecoder>(LocalBridgeClazz, "newInstance", arg0, arg1);
@@ -118,7 +118,7 @@ public static Android.Graphics.BitmapRegionDecoder NewInstance(Java.Io.InputStre
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="Android.Graphics.BitmapRegionDecoder"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.BitmapRegionDecoder NewInstance(Java.Lang.String arg0, bool arg1)
         {
             return SExecute<Android.Graphics.BitmapRegionDecoder>(LocalBridgeClazz, "newInstance", arg0, arg1);
@@ -138,20 +138,6 @@ public static Android.Graphics.BitmapRegionDecoder NewInstance(Java.Lang.String
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder.html#getHeight()"/> 
-        /// </summary>
-        public int Height
-        {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder.html#getWidth()"/> 
-        /// </summary>
-        public int Width
-        {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder.html#decodeRegion(android.graphics.Rect,android.graphics.BitmapFactory.Options)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
@@ -170,6 +156,22 @@ public bool IsRecycled()
             return IExecuteWithSignature<bool>("isRecycled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder.html#getHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
+        {
+            return IExecuteWithSignature<int>("getHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder.html#getWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
+        {
+            return IExecuteWithSignature<int>("getWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/BitmapRegionDecoder.html#recycle()"/>
         /// </summary>
         public void Recycle()
diff --git a/src/net/Netdroid/Generated/Android/Graphics/BitmapShader.cs b/src/net/Netdroid/Generated/Android/Graphics/BitmapShader.cs
index 49a98308f..9fba1ce87 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/BitmapShader.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/BitmapShader.cs
@@ -74,18 +74,36 @@ public BitmapShader(Android.Graphics.Bitmap arg0, Android.Graphics.Shader.TileMo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/BitmapShader.html#getFilterMode()"/> <see href="https://developer.android.com/reference/android/graphics/BitmapShader.html#setFilterMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/BitmapShader.html#getFilterMode()"/>
         /// </summary>
-        public int FilterMode
+        /// <returns><see cref="int"/></returns>
+        public int GetFilterMode()
         {
-            get { return IExecuteWithSignature<int>("getFilterMode", "()I"); } set { IExecuteWithSignature("setFilterMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("getFilterMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/BitmapShader.html#getMaxAnisotropy()"/> <see href="https://developer.android.com/reference/android/graphics/BitmapShader.html#setMaxAnisotropy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/BitmapShader.html#getMaxAnisotropy()"/>
         /// </summary>
-        public int MaxAnisotropy
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxAnisotropy()
         {
-            get { return IExecuteWithSignature<int>("getMaxAnisotropy", "()I"); } set { IExecuteWithSignature("setMaxAnisotropy", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxAnisotropy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/BitmapShader.html#setFilterMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFilterMode(int arg0)
+        {
+            IExecuteWithSignature("setFilterMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/BitmapShader.html#setMaxAnisotropy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxAnisotropy(int arg0)
+        {
+            IExecuteWithSignature("setMaxAnisotropy", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/BlendModeColorFilter.cs b/src/net/Netdroid/Generated/Android/Graphics/BlendModeColorFilter.cs
index 438052ea4..ac38c6664 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/BlendModeColorFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/BlendModeColorFilter.cs
@@ -55,18 +55,20 @@ public BlendModeColorFilter(int arg0, Android.Graphics.BlendMode arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/BlendModeColorFilter.html#getColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/BlendModeColorFilter.html#getMode()"/>
         /// </summary>
-        public int Color
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetMode()
         {
-            get { return IExecuteWithSignature<int>("getColor", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/BlendModeColorFilter.html#getMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/BlendModeColorFilter.html#getColor()"/>
         /// </summary>
-        public Android.Graphics.BlendMode Mode
+        /// <returns><see cref="int"/></returns>
+        public int GetColor()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getMode", "()Landroid/graphics/BlendMode;"); }
+            return IExecuteWithSignature<int>("getColor", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Camera.cs b/src/net/Netdroid/Generated/Android/Graphics/Camera.cs
index f119448e5..39be3b4a3 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Camera.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Camera.cs
@@ -46,36 +46,39 @@ public partial class Camera
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#getLocationX()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#dotWithNormal(float,float,float)"/>
         /// </summary>
-        public float LocationX
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <param name="arg2"><see cref="float"/></param>
+        /// <returns><see cref="float"/></returns>
+        public float DotWithNormal(float arg0, float arg1, float arg2)
         {
-            get { return IExecuteWithSignature<float>("getLocationX", "()F"); }
+            return IExecute<float>("dotWithNormal", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#getLocationY()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#getLocationX()"/>
         /// </summary>
-        public float LocationY
+        /// <returns><see cref="float"/></returns>
+        public float GetLocationX()
         {
-            get { return IExecuteWithSignature<float>("getLocationY", "()F"); }
+            return IExecuteWithSignature<float>("getLocationX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#getLocationZ()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#getLocationY()"/>
         /// </summary>
-        public float LocationZ
+        /// <returns><see cref="float"/></returns>
+        public float GetLocationY()
         {
-            get { return IExecuteWithSignature<float>("getLocationZ", "()F"); }
+            return IExecuteWithSignature<float>("getLocationY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#dotWithNormal(float,float,float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#getLocationZ()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
-        public float DotWithNormal(float arg0, float arg1, float arg2)
+        public float GetLocationZ()
         {
-            return IExecute<float>("dotWithNormal", arg0, arg1, arg2);
+            return IExecuteWithSignature<float>("getLocationZ", "()F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Camera.html#restore()"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Canvas.cs b/src/net/Netdroid/Generated/Android/Graphics/Canvas.cs
index 562289cee..359ae293b 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Canvas.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Canvas.cs
@@ -60,68 +60,12 @@ public Canvas(Android.Graphics.Bitmap arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getClipBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getDrawFilter()"/>
         /// </summary>
-        public Android.Graphics.Rect ClipBounds
+        /// <returns><see cref="Android.Graphics.DrawFilter"/></returns>
+        public Android.Graphics.DrawFilter GetDrawFilter()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getClipBounds", "()Landroid/graphics/Rect;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getDensity()"/> <see href="https://developer.android.com/reference/android/graphics/Canvas.html#setDensity(int)"/>
-        /// </summary>
-        public int Density
-        {
-            get { return IExecuteWithSignature<int>("getDensity", "()I"); } set { IExecuteWithSignature("setDensity", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getDrawFilter()"/> <see href="https://developer.android.com/reference/android/graphics/Canvas.html#setDrawFilter(android.graphics.DrawFilter)"/>
-        /// </summary>
-        public Android.Graphics.DrawFilter DrawFilter
-        {
-            get { return IExecuteWithSignature<Android.Graphics.DrawFilter>("getDrawFilter", "()Landroid/graphics/DrawFilter;"); } set { IExecuteWithSignature("setDrawFilter", "(Landroid/graphics/DrawFilter;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getHeight()"/> 
-        /// </summary>
-        public int Height
-        {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getMatrix()"/> <see href="https://developer.android.com/reference/android/graphics/Canvas.html#setMatrix(android.graphics.Matrix)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Matrix Matrix
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Matrix>("getMatrix", "()Landroid/graphics/Matrix;"); } set { IExecuteWithSignature("setMatrix", "(Landroid/graphics/Matrix;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getMaximumBitmapHeight()"/> 
-        /// </summary>
-        public int MaximumBitmapHeight
-        {
-            get { return IExecuteWithSignature<int>("getMaximumBitmapHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getMaximumBitmapWidth()"/> 
-        /// </summary>
-        public int MaximumBitmapWidth
-        {
-            get { return IExecuteWithSignature<int>("getMaximumBitmapWidth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getSaveCount()"/> 
-        /// </summary>
-        public int SaveCount
-        {
-            get { return IExecuteWithSignature<int>("getSaveCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getWidth()"/> 
-        /// </summary>
-        public int Width
-        {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.DrawFilter>("getDrawFilter", "()Landroid/graphics/DrawFilter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#clipOutPath(android.graphics.Path)"/>
@@ -180,7 +124,7 @@ public bool ClipOutRect(int arg0, int arg1, int arg2, int arg3)
         /// <param name="arg0"><see cref="Android.Graphics.Path"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Region.Op"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ClipPath(Android.Graphics.Path arg0, Android.Graphics.Region.Op arg1)
         {
             return IExecute<bool>("clipPath", arg0, arg1);
@@ -200,7 +144,7 @@ public bool ClipPath(Android.Graphics.Path arg0)
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Region.Op"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ClipRect(Android.Graphics.Rect arg0, Android.Graphics.Region.Op arg1)
         {
             return IExecute<bool>("clipRect", arg0, arg1);
@@ -220,7 +164,7 @@ public bool ClipRect(Android.Graphics.Rect arg0)
         /// <param name="arg0"><see cref="Android.Graphics.RectF"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Region.Op"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ClipRect(Android.Graphics.RectF arg0, Android.Graphics.Region.Op arg1)
         {
             return IExecute<bool>("clipRect", arg0, arg1);
@@ -243,7 +187,7 @@ public bool ClipRect(Android.Graphics.RectF arg0)
         /// <param name="arg3"><see cref="float"/></param>
         /// <param name="arg4"><see cref="Android.Graphics.Region.Op"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ClipRect(float arg0, float arg1, float arg2, float arg3, Android.Graphics.Region.Op arg4)
         {
             return IExecute<bool>("clipRect", arg0, arg1, arg2, arg3, arg4);
@@ -303,7 +247,7 @@ public bool IsOpaque()
         /// <param name="arg0"><see cref="Android.Graphics.Path"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Canvas.EdgeType"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool QuickReject(Android.Graphics.Path arg0, Android.Graphics.Canvas.EdgeType arg1)
         {
             return IExecute<bool>("quickReject", arg0, arg1);
@@ -323,7 +267,7 @@ public bool QuickReject(Android.Graphics.Path arg0)
         /// <param name="arg0"><see cref="Android.Graphics.RectF"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Canvas.EdgeType"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool QuickReject(Android.Graphics.RectF arg0, Android.Graphics.Canvas.EdgeType arg1)
         {
             return IExecute<bool>("quickReject", arg0, arg1);
@@ -346,7 +290,7 @@ public bool QuickReject(Android.Graphics.RectF arg0)
         /// <param name="arg3"><see cref="float"/></param>
         /// <param name="arg4"><see cref="Android.Graphics.Canvas.EdgeType"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool QuickReject(float arg0, float arg1, float arg2, float arg3, Android.Graphics.Canvas.EdgeType arg4)
         {
             return IExecute<bool>("quickReject", arg0, arg1, arg2, arg3, arg4);
@@ -364,6 +308,23 @@ public bool QuickReject(float arg0, float arg1, float arg2, float arg3)
             return IExecute<bool>("quickReject", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getMatrix()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Matrix"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Matrix GetMatrix()
+        {
+            return IExecuteWithSignature<Android.Graphics.Matrix>("getMatrix", "()Landroid/graphics/Matrix;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getClipBounds()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetClipBounds()
+        {
+            return IExecuteWithSignature<Android.Graphics.Rect>("getClipBounds", "()Landroid/graphics/Rect;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#rotate(float,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -385,6 +346,54 @@ public void Scale(float arg0, float arg1, float arg2, float arg3)
             IExecute("scale", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getDensity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDensity()
+        {
+            return IExecuteWithSignature<int>("getDensity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
+        {
+            return IExecuteWithSignature<int>("getHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getMaximumBitmapHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumBitmapHeight()
+        {
+            return IExecuteWithSignature<int>("getMaximumBitmapHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getMaximumBitmapWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumBitmapWidth()
+        {
+            return IExecuteWithSignature<int>("getMaximumBitmapWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getSaveCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSaveCount()
+        {
+            return IExecuteWithSignature<int>("getSaveCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
+        {
+            return IExecuteWithSignature<int>("getWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#save()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -399,7 +408,7 @@ public int Save()
         /// <param name="arg1"><see cref="Android.Graphics.Paint"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SaveLayer(Android.Graphics.RectF arg0, Android.Graphics.Paint arg1, int arg2)
         {
             return IExecute<int>("saveLayer", arg0, arg1, arg2);
@@ -424,7 +433,7 @@ public int SaveLayer(Android.Graphics.RectF arg0, Android.Graphics.Paint arg1)
         /// <param name="arg4"><see cref="Android.Graphics.Paint"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SaveLayer(float arg0, float arg1, float arg2, float arg3, Android.Graphics.Paint arg4, int arg5)
         {
             return IExecute<int>("saveLayer", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -449,7 +458,7 @@ public int SaveLayer(float arg0, float arg1, float arg2, float arg3, Android.Gra
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SaveLayerAlpha(Android.Graphics.RectF arg0, int arg1, int arg2)
         {
             return IExecute<int>("saveLayerAlpha", arg0, arg1, arg2);
@@ -474,7 +483,7 @@ public int SaveLayerAlpha(Android.Graphics.RectF arg0, int arg1)
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SaveLayerAlpha(float arg0, float arg1, float arg2, float arg3, int arg4, int arg5)
         {
             return IExecute<int>("saveLayerAlpha", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -600,7 +609,7 @@ public void DrawBitmap(Android.Graphics.Bitmap arg0, float arg1, float arg2, And
         /// <param name="arg6"><see cref="int"/></param>
         /// <param name="arg7"><see cref="bool"/></param>
         /// <param name="arg8"><see cref="Android.Graphics.Paint"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DrawBitmap(int[] arg0, int arg1, int arg2, float arg3, float arg4, int arg5, int arg6, bool arg7, Android.Graphics.Paint arg8)
         {
             IExecute("drawBitmap", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -617,7 +626,7 @@ public void DrawBitmap(int[] arg0, int arg1, int arg2, float arg3, float arg4, i
         /// <param name="arg6"><see cref="int"/></param>
         /// <param name="arg7"><see cref="bool"/></param>
         /// <param name="arg8"><see cref="Android.Graphics.Paint"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DrawBitmap(int[] arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, bool arg7, Android.Graphics.Paint arg8)
         {
             IExecute("drawBitmap", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -895,7 +904,7 @@ public void DrawPoints(float[] arg0, int arg1, int arg2, Android.Graphics.Paint
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="float"/></param>
         /// <param name="arg4"><see cref="Android.Graphics.Paint"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DrawPosText(char[] arg0, int arg1, int arg2, float[] arg3, Android.Graphics.Paint arg4)
         {
             IExecute("drawPosText", arg0, arg1, arg2, arg3, arg4);
@@ -906,7 +915,7 @@ public void DrawPosText(char[] arg0, int arg1, int arg2, float[] arg3, Android.G
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="Android.Graphics.Paint"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DrawPosText(Java.Lang.String arg0, float[] arg1, Android.Graphics.Paint arg2)
         {
             IExecute("drawPosText", arg0, arg1, arg2);
@@ -1138,7 +1147,7 @@ public void EnableZ()
         /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#getMatrix(android.graphics.Matrix)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Matrix"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetMatrix(Android.Graphics.Matrix arg0)
         {
             IExecuteWithSignature("getMatrix", "(Landroid/graphics/Matrix;)V", arg0);
@@ -1184,6 +1193,30 @@ public void SetBitmap(Android.Graphics.Bitmap arg0)
             IExecuteWithSignature("setBitmap", "(Landroid/graphics/Bitmap;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#setDensity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDensity(int arg0)
+        {
+            IExecuteWithSignature("setDensity", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#setDrawFilter(android.graphics.DrawFilter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.DrawFilter"/></param>
+        public void SetDrawFilter(Android.Graphics.DrawFilter arg0)
+        {
+            IExecuteWithSignature("setDrawFilter", "(Landroid/graphics/DrawFilter;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#setMatrix(android.graphics.Matrix)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Matrix"/></param>
+        public void SetMatrix(Android.Graphics.Matrix arg0)
+        {
+            IExecuteWithSignature("setMatrix", "(Landroid/graphics/Matrix;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Canvas.html#skew(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -1220,14 +1253,14 @@ public partial class EdgeType
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/Canvas.EdgeType.html#AA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Graphics.Canvas.EdgeType AA { get { if (!_AAReady) { _AAContent = SGetField<Android.Graphics.Canvas.EdgeType>(LocalBridgeClazz, "AA"); _AAReady = true; } return _AAContent; } }
             private static Android.Graphics.Canvas.EdgeType _AAContent = default;
             private static bool _AAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/Canvas.EdgeType.html#BW"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Graphics.Canvas.EdgeType BW { get { if (!_BWReady) { _BWContent = SGetField<Android.Graphics.Canvas.EdgeType>(LocalBridgeClazz, "BW"); _BWReady = true; } return _BWContent; } }
             private static Android.Graphics.Canvas.EdgeType _BWContent = default;
             private static bool _BWReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Color.cs b/src/net/Netdroid/Generated/Android/Graphics/Color.cs
index ffd9b47bf..f4624f0eb 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Color.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Color.cs
@@ -514,27 +514,6 @@ public static void RGBToHSV(int arg0, int arg1, int arg2, float[] arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Color.html#getComponentCount()"/> 
-        /// </summary>
-        public int ComponentCount
-        {
-            get { return IExecuteWithSignature<int>("getComponentCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Color.html#getComponents()"/> 
-        /// </summary>
-        public float[] Components
-        {
-            get { return IExecuteWithSignatureArray<float>("getComponents", "()[F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Color.html#getModel()"/> 
-        /// </summary>
-        public Android.Graphics.ColorSpace.Model Model
-        {
-            get { return IExecuteWithSignature<Android.Graphics.ColorSpace.Model>("getModel", "()Landroid/graphics/ColorSpace$Model;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Color.html#convert(android.graphics.ColorSpace)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.ColorSpace"/></param>
@@ -552,6 +531,14 @@ public Android.Graphics.ColorSpace GetColorSpace()
             return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Color.html#getModel()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.ColorSpace.Model"/></returns>
+        public Android.Graphics.ColorSpace.Model GetModel()
+        {
+            return IExecuteWithSignature<Android.Graphics.ColorSpace.Model>("getModel", "()Landroid/graphics/ColorSpace$Model;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Color.html#isSrgb()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -617,6 +604,14 @@ public float Red()
             return IExecuteWithSignature<float>("red", "()F");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Color.html#getComponents()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float[] GetComponents()
+        {
+            return IExecuteWithSignatureArray<float>("getComponents", "()[F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Color.html#getComponents(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -626,6 +621,14 @@ public float[] GetComponents(float[] arg0)
             return IExecuteWithSignatureArray<float>("getComponents", "([F)[F", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Color.html#getComponentCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetComponentCount()
+        {
+            return IExecuteWithSignature<int>("getComponentCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Color.html#toArgb()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/ColorMatrix.cs b/src/net/Netdroid/Generated/Android/Graphics/ColorMatrix.cs
index bed4fc24f..9a34e77f5 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/ColorMatrix.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/ColorMatrix.cs
@@ -62,11 +62,12 @@ public ColorMatrix(float[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ColorMatrix.html#getArray()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/ColorMatrix.html#getArray()"/>
         /// </summary>
-        public float[] Array
+        /// <returns><see cref="float"/></returns>
+        public float[] GetArray()
         {
-            get { return IExecuteWithSignatureArray<float>("getArray", "()[F"); }
+            return IExecuteWithSignatureArray<float>("getArray", "()[F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ColorMatrix.html#postConcat(android.graphics.ColorMatrix)"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/ColorSpace.cs b/src/net/Netdroid/Generated/Android/Graphics/ColorSpace.cs
index da45adff4..67ee52e51 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/ColorSpace.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/ColorSpace.cs
@@ -221,41 +221,6 @@ public static float[] ChromaticAdaptation(Android.Graphics.ColorSpace.Adaptation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getComponentCount()"/> 
-        /// </summary>
-        public int ComponentCount
-        {
-            get { return IExecuteWithSignature<int>("getComponentCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getDataSpace()"/> 
-        /// </summary>
-        public int DataSpace
-        {
-            get { return IExecuteWithSignature<int>("getDataSpace", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getModel()"/> 
-        /// </summary>
-        public Android.Graphics.ColorSpace.Model GetModel
-        {
-            get { return IExecuteWithSignature<Android.Graphics.ColorSpace.Model>("getModel", "()Landroid/graphics/ColorSpace$Model;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getId()"/> 
-        /// </summary>
-        public int Id
-        {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#isWideGamut()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -300,6 +265,14 @@ public float[] ToXyz(float[] arg0)
             return IExecuteWithSignatureArray<float>("toXyz", "([F)[F", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getModel()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.ColorSpace.Model"/></returns>
+        public Android.Graphics.ColorSpace.Model GetModel()
+        {
+            return IExecuteWithSignature<Android.Graphics.ColorSpace.Model>("getModel", "()Landroid/graphics/ColorSpace$Model;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#isSrgb()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -329,6 +302,38 @@ public float[] ToXyz(float arg0, float arg1, float arg2)
         {
             return IExecuteArray<float>("toXyz", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getComponentCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetComponentCount()
+        {
+            return IExecuteWithSignature<int>("getComponentCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getDataSpace()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDataSpace()
+        {
+            return IExecuteWithSignature<int>("getDataSpace", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
+        {
+            return IExecuteWithSignature<int>("getId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
 
         #endregion
 
@@ -420,25 +425,28 @@ public partial class Connector
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Connector.html#getDestination()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Connector.html#getDestination()"/>
             /// </summary>
-            public Android.Graphics.ColorSpace Destination
+            /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+            public Android.Graphics.ColorSpace GetDestination()
             {
-                get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getDestination", "()Landroid/graphics/ColorSpace;"); }
+                return IExecuteWithSignature<Android.Graphics.ColorSpace>("getDestination", "()Landroid/graphics/ColorSpace;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Connector.html#getRenderIntent()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Connector.html#getSource()"/>
             /// </summary>
-            public Android.Graphics.ColorSpace.RenderIntent GetRenderIntent
+            /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+            public Android.Graphics.ColorSpace GetSource()
             {
-                get { return IExecuteWithSignature<Android.Graphics.ColorSpace.RenderIntent>("getRenderIntent", "()Landroid/graphics/ColorSpace$RenderIntent;"); }
+                return IExecuteWithSignature<Android.Graphics.ColorSpace>("getSource", "()Landroid/graphics/ColorSpace;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Connector.html#getSource()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Connector.html#getRenderIntent()"/>
             /// </summary>
-            public Android.Graphics.ColorSpace Source
+            /// <returns><see cref="Android.Graphics.ColorSpace.RenderIntent"/></returns>
+            public Android.Graphics.ColorSpace.RenderIntent GetRenderIntent()
             {
-                get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getSource", "()Landroid/graphics/ColorSpace;"); }
+                return IExecuteWithSignature<Android.Graphics.ColorSpace.RenderIntent>("getRenderIntent", "()Landroid/graphics/ColorSpace$RenderIntent;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Connector.html#transform(float,float,float)"/>
@@ -533,11 +541,12 @@ public static Android.Graphics.ColorSpace.Model[] Values()
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Model.html#getComponentCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Model.html#getComponentCount()"/>
             /// </summary>
-            public int ComponentCount
+            /// <returns><see cref="int"/></returns>
+            public int GetComponentCount()
             {
-                get { return IExecuteWithSignature<int>("getComponentCount", "()I"); }
+                return IExecuteWithSignature<int>("getComponentCount", "()I");
             }
 
             #endregion
@@ -866,53 +875,12 @@ public Rgb(Java.Lang.String arg0, float[] arg1, Java.Util.Function.DoubleUnaryOp
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getEotf()"/> 
-            /// </summary>
-            public Java.Util.Function.DoubleUnaryOperator Eotf
-            {
-                get { return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperator>("getEotf", "()Ljava/util/function/DoubleUnaryOperator;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getInverseTransform()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getTransferParameters()"/>
             /// </summary>
-            public float[] InverseTransform
+            /// <returns><see cref="Android.Graphics.ColorSpace.Rgb.TransferParameters"/></returns>
+            public Android.Graphics.ColorSpace.Rgb.TransferParameters GetTransferParameters()
             {
-                get { return IExecuteWithSignatureArray<float>("getInverseTransform", "()[F"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getOetf()"/> 
-            /// </summary>
-            public Java.Util.Function.DoubleUnaryOperator Oetf
-            {
-                get { return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperator>("getOetf", "()Ljava/util/function/DoubleUnaryOperator;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getPrimaries()"/> 
-            /// </summary>
-            public float[] Primaries
-            {
-                get { return IExecuteWithSignatureArray<float>("getPrimaries", "()[F"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getTransferParameters()"/> 
-            /// </summary>
-            public Android.Graphics.ColorSpace.Rgb.TransferParameters TransferParameters
-            {
-                get { return IExecuteWithSignature<Android.Graphics.ColorSpace.Rgb.TransferParameters>("getTransferParameters", "()Landroid/graphics/ColorSpace$Rgb$TransferParameters;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getTransform()"/> 
-            /// </summary>
-            public float[] Transform
-            {
-                get { return IExecuteWithSignatureArray<float>("getTransform", "()[F"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getWhitePoint()"/> 
-            /// </summary>
-            public float[] WhitePoint
-            {
-                get { return IExecuteWithSignatureArray<float>("getWhitePoint", "()[F"); }
+                return IExecuteWithSignature<Android.Graphics.ColorSpace.Rgb.TransferParameters>("getTransferParameters", "()Landroid/graphics/ColorSpace$Rgb$TransferParameters;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#fromLinear(float,float,float)"/>
@@ -935,6 +903,14 @@ public float[] FromLinear(float[] arg0)
                 return IExecuteWithSignatureArray<float>("fromLinear", "([F)[F", new object[] { arg0 });
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getInverseTransform()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float[] GetInverseTransform()
+            {
+                return IExecuteWithSignatureArray<float>("getInverseTransform", "()[F");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getInverseTransform(float[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="float"/></param>
@@ -944,6 +920,14 @@ public float[] GetInverseTransform(float[] arg0)
                 return IExecuteWithSignatureArray<float>("getInverseTransform", "([F)[F", new object[] { arg0 });
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getPrimaries()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float[] GetPrimaries()
+            {
+                return IExecuteWithSignatureArray<float>("getPrimaries", "()[F");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getPrimaries(float[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="float"/></param>
@@ -953,6 +937,14 @@ public float[] GetPrimaries(float[] arg0)
                 return IExecuteWithSignatureArray<float>("getPrimaries", "([F)[F", new object[] { arg0 });
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getTransform()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float[] GetTransform()
+            {
+                return IExecuteWithSignatureArray<float>("getTransform", "()[F");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getTransform(float[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="float"/></param>
@@ -962,6 +954,14 @@ public float[] GetTransform(float[] arg0)
                 return IExecuteWithSignatureArray<float>("getTransform", "([F)[F", new object[] { arg0 });
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getWhitePoint()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float[] GetWhitePoint()
+            {
+                return IExecuteWithSignatureArray<float>("getWhitePoint", "()[F");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getWhitePoint(float[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="float"/></param>
@@ -990,6 +990,38 @@ public float[] ToLinear(float[] arg0)
             {
                 return IExecuteWithSignatureArray<float>("toLinear", "([F)[F", new object[] { arg0 });
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getEotf()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
+            public Java.Util.Function.DoubleUnaryOperator GetEotf()
+            {
+                return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperator>("getEotf", "()Ljava/util/function/DoubleUnaryOperator;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getEotf()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
+            public Java.Util.Function.DoubleUnaryOperator GetEotfDirect()
+            {
+                return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperatorDirect, Java.Util.Function.DoubleUnaryOperator>("getEotf", "()Ljava/util/function/DoubleUnaryOperator;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getOetf()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
+            public Java.Util.Function.DoubleUnaryOperator GetOetf()
+            {
+                return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperator>("getOetf", "()Ljava/util/function/DoubleUnaryOperator;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ColorSpace.Rgb.html#getOetf()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
+            public Java.Util.Function.DoubleUnaryOperator GetOetfDirect()
+            {
+                return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperatorDirect, Java.Util.Function.DoubleUnaryOperator>("getOetf", "()Ljava/util/function/DoubleUnaryOperator;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/ComposeShader.cs b/src/net/Netdroid/Generated/Android/Graphics/ComposeShader.cs
index 228b6c6b2..f7546350b 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/ComposeShader.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/ComposeShader.cs
@@ -55,7 +55,7 @@ public ComposeShader(Android.Graphics.Shader arg0, Android.Graphics.Shader arg1,
         /// <param name="arg0"><see cref="Android.Graphics.Shader"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Shader"/></param>
         /// <param name="arg2"><see cref="Android.Graphics.Xfermode"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ComposeShader(Android.Graphics.Shader arg0, Android.Graphics.Shader arg1, Android.Graphics.Xfermode arg2)
             : base(arg0, arg1, arg2)
         {
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AdaptiveIconDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AdaptiveIconDrawable.cs
index 64dd9963e..a88406c39 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AdaptiveIconDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AdaptiveIconDrawable.cs
@@ -61,43 +61,48 @@ public AdaptiveIconDrawable(Android.Graphics.Drawable.Drawable arg0, Android.Gra
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getExtraInsetFraction()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getExtraInsetFraction()"/>
         /// </summary>
-        public static float ExtraInsetFraction
+        /// <returns><see cref="float"/></returns>
+        public static float GetExtraInsetFraction()
         {
-            get { return SExecuteWithSignature<float>(LocalBridgeClazz, "getExtraInsetFraction", "()F"); }
+            return SExecuteWithSignature<float>(LocalBridgeClazz, "getExtraInsetFraction", "()F");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getBackground()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getBackground()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Background
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetBackground()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBackground", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBackground", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getForeground()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getForeground()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Foreground
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetForeground()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getForeground", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getForeground", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getIconMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getMonochrome()"/>
         /// </summary>
-        public Android.Graphics.Path IconMask
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetMonochrome()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Path>("getIconMask", "()Landroid/graphics/Path;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getMonochrome", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getMonochrome()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#getIconMask()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Monochrome
+        /// <returns><see cref="Android.Graphics.Path"/></returns>
+        public Android.Graphics.Path GetIconMask()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getMonochrome", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Path>("getIconMask", "()Landroid/graphics/Path;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html#invalidateDrawable(android.graphics.drawable.Drawable)"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AllPackageClasses.cs
index 1d723a0f2..7fe18fa6c 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class Animatable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Animat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Animatable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Animatable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Animatable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Animatable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Animatable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Animatable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -126,12 +126,12 @@ public partial class Animatable2 : Android.Graphics.Drawable.Animatable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Animatable2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Animatable2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Animatable2() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Animatable2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Animatable2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Animatable2(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -168,12 +168,12 @@ public partial class AnimationCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AnimationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AnimationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AnimationCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AnimationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AnimationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AnimationCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -570,12 +570,12 @@ public partial class Drawable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Drawable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Drawable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Drawable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Drawable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Drawable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Drawable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Drawable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -612,12 +612,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -658,12 +658,12 @@ public partial class ConstantState : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Con
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConstantState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConstantState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConstantState() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConstantState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConstantState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConstantState(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -748,12 +748,12 @@ public partial class DrawableContainerState : Android.Graphics.Drawable.Drawable
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("DrawableContainerState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DrawableContainerState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DrawableContainerState() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("DrawableContainerState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DrawableContainerState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DrawableContainerState(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -798,12 +798,12 @@ public partial class DrawableWrapper : Android.Graphics.Drawable.Drawable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DrawableWrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DrawableWrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DrawableWrapper() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DrawableWrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DrawableWrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DrawableWrapper(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -973,10 +973,13 @@ public partial class OnDrawableLoadedListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnDrawableLoadedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.graphics.drawable.Icon_OnDrawableLoadedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.graphics.drawable.OnDrawableLoadedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -998,10 +1001,13 @@ public partial class OnDrawableLoadedListenerDirect : OnDrawableLoadedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.graphics.drawable.Icon$OnDrawableLoadedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.graphics.drawable.Icon$OnDrawableLoadedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1471,12 +1477,12 @@ public partial class ShaderFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sha
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ShaderFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ShaderFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ShaderFactory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ShaderFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ShaderFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ShaderFactory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimatedImageDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimatedImageDrawable.cs
index 49e4af599..a0783bcae 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimatedImageDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimatedImageDrawable.cs
@@ -56,13 +56,6 @@ public partial class AnimatedImageDrawable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimatedImageDrawable.html#getRepeatCount()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/AnimatedImageDrawable.html#setRepeatCount(int)"/>
-        /// </summary>
-        public int RepeatCount
-        {
-            get { return IExecuteWithSignature<int>("getRepeatCount", "()I"); } set { IExecuteWithSignature("setRepeatCount", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimatedImageDrawable.html#isRunning()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -80,6 +73,14 @@ public bool UnregisterAnimationCallback(Android.Graphics.Drawable.Animatable2.An
             return IExecuteWithSignature<bool>("unregisterAnimationCallback", "(Landroid/graphics/drawable/Animatable2$AnimationCallback;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimatedImageDrawable.html#getRepeatCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatCount()
+        {
+            return IExecuteWithSignature<int>("getRepeatCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimatedImageDrawable.html#clearAnimationCallbacks()"/>
         /// </summary>
         public void ClearAnimationCallbacks()
@@ -95,6 +96,14 @@ public void RegisterAnimationCallback(Android.Graphics.Drawable.Animatable2.Anim
             IExecuteWithSignature("registerAnimationCallback", "(Landroid/graphics/drawable/Animatable2$AnimationCallback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimatedImageDrawable.html#setRepeatCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRepeatCount(int arg0)
+        {
+            IExecuteWithSignature("setRepeatCount", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimatedImageDrawable.html#start()"/>
         /// </summary>
         public void Start()
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimatedStateListDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimatedStateListDrawable.cs
index 0b0df06f8..0a70a1c5f 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimatedStateListDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimatedStateListDrawable.cs
@@ -53,7 +53,7 @@ public partial class AnimatedStateListDrawable
         /// <param name="arg2"><typeparamref name="T"/></param>
         /// <param name="arg3"><see cref="bool"/></param>
         /// <typeparam name="T"><see cref="Android.Graphics.Drawable.Drawable, Android.Graphics.Drawable.IAnimatable"/></typeparam>
-        public void AddTransition<T>(int arg0, int arg1, T arg2, bool arg3) where T: Android.Graphics.Drawable.Drawable, Android.Graphics.Drawable.IAnimatable, new()
+        public void AddTransition<T>(int arg0, int arg1, T arg2, bool arg3) where T : Android.Graphics.Drawable.Drawable, Android.Graphics.Drawable.IAnimatable, new()
         {
             IExecute("addTransition", arg0, arg1, arg2, arg3);
         }
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimationDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimationDrawable.cs
index 6ef0f5839..a6a344769 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimationDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/AnimationDrawable.cs
@@ -54,13 +54,6 @@ public partial class AnimationDrawable : Java.Lang.IRunnable, Android.Graphics.D
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimationDrawable.html#getNumberOfFrames()"/> 
-        /// </summary>
-        public int NumberOfFrames
-        {
-            get { return IExecuteWithSignature<int>("getNumberOfFrames", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimationDrawable.html#getFrame(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -95,6 +88,14 @@ public int GetDuration(int arg0)
             return IExecuteWithSignature<int>("getDuration", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimationDrawable.html#getNumberOfFrames()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfFrames()
+        {
+            return IExecuteWithSignature<int>("getNumberOfFrames", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/AnimationDrawable.html#addFrame(android.graphics.drawable.Drawable,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/BitmapDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/BitmapDrawable.cs
index 18635c2d6..5f4e0b3a6 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/BitmapDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/BitmapDrawable.cs
@@ -60,7 +60,7 @@ public BitmapDrawable(Android.Content.Res.Resources arg0, Java.Lang.String arg1)
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#%3Cinit%3E(android.content.res.Resources)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public BitmapDrawable(Android.Content.Res.Resources arg0)
             : base(arg0)
         {
@@ -69,7 +69,7 @@ public BitmapDrawable(Android.Content.Res.Resources arg0)
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#%3Cinit%3E(android.graphics.Bitmap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public BitmapDrawable(Android.Graphics.Bitmap arg0)
             : base(arg0)
         {
@@ -78,7 +78,7 @@ public BitmapDrawable(Android.Graphics.Bitmap arg0)
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public BitmapDrawable(Java.Io.InputStream arg0)
             : base(arg0)
         {
@@ -87,7 +87,7 @@ public BitmapDrawable(Java.Io.InputStream arg0)
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public BitmapDrawable(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -109,55 +109,68 @@ public BitmapDrawable(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getBitmap()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setBitmap(android.graphics.Bitmap)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getTileModeX()"/>
         /// </summary>
-        public Android.Graphics.Bitmap Bitmap
+        /// <returns><see cref="Android.Graphics.Shader.TileMode"/></returns>
+        public Android.Graphics.Shader.TileMode GetTileModeX()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;"); } set { IExecuteWithSignature("setBitmap", "(Landroid/graphics/Bitmap;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Shader.TileMode>("getTileModeX", "()Landroid/graphics/Shader$TileMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getGravity()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getTileModeY()"/>
         /// </summary>
-        public int Gravity
+        /// <returns><see cref="Android.Graphics.Shader.TileMode"/></returns>
+        public Android.Graphics.Shader.TileMode GetTileModeY()
         {
-            get { return IExecuteWithSignature<int>("getGravity", "()I"); } set { IExecuteWithSignature("setGravity", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Shader.TileMode>("getTileModeY", "()Landroid/graphics/Shader$TileMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getPaint()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#hasAntiAlias()"/>
         /// </summary>
-        public Android.Graphics.Paint Paint
+        /// <returns><see cref="bool"/></returns>
+        public bool HasAntiAlias()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "()Landroid/graphics/Paint;"); }
+            return IExecuteWithSignature<bool>("hasAntiAlias", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getTileModeX()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setTileModeX(android.graphics.Shader.TileMode)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#hasMipMap()"/>
         /// </summary>
-        public Android.Graphics.Shader.TileMode TileModeX
+        /// <returns><see cref="bool"/></returns>
+        public bool HasMipMap()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Shader.TileMode>("getTileModeX", "()Landroid/graphics/Shader$TileMode;"); } set { IExecuteWithSignature("setTileModeX", "(Landroid/graphics/Shader$TileMode;)V", value); }
+            return IExecuteWithSignature<bool>("hasMipMap", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getTileModeY()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setTileModeY(android.graphics.Shader.TileMode)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getBitmap()"/>
         /// </summary>
-        public Android.Graphics.Shader.TileMode TileModeY
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetBitmap()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Shader.TileMode>("getTileModeY", "()Landroid/graphics/Shader$TileMode;"); } set { IExecuteWithSignature("setTileModeY", "(Landroid/graphics/Shader$TileMode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#hasAntiAlias()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getPaint()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasAntiAlias()
+        /// <returns><see cref="Android.Graphics.Paint"/></returns>
+        public Android.Graphics.Paint GetPaint()
         {
-            return IExecuteWithSignature<bool>("hasAntiAlias", "()Z");
+            return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "()Landroid/graphics/Paint;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#hasMipMap()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setTileModeY(android.graphics.Shader.TileMode)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasMipMap()
+        /// <param name="arg0"><see cref="Android.Graphics.Shader.TileMode"/></param>
+        public void SetTileModeY(Android.Graphics.Shader.TileMode arg0)
         {
-            return IExecuteWithSignature<bool>("hasMipMap", "()Z");
+            IExecuteWithSignature("setTileModeY", "(Landroid/graphics/Shader$TileMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#getGravity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGravity()
+        {
+            return IExecuteWithSignature<int>("getGravity", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setAntiAlias(boolean)"/>
@@ -168,6 +181,22 @@ public void SetAntiAlias(bool arg0)
             IExecuteWithSignature("setAntiAlias", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setBitmap(android.graphics.Bitmap)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
+        public void SetBitmap(Android.Graphics.Bitmap arg0)
+        {
+            IExecuteWithSignature("setBitmap", "(Landroid/graphics/Bitmap;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGravity(int arg0)
+        {
+            IExecuteWithSignature("setGravity", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setMipMap(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -200,6 +229,14 @@ public void SetTargetDensity(int arg0)
             IExecuteWithSignature("setTargetDensity", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setTileModeX(android.graphics.Shader.TileMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Shader.TileMode"/></param>
+        public void SetTileModeX(Android.Graphics.Shader.TileMode arg0)
+        {
+            IExecuteWithSignature("setTileModeX", "(Landroid/graphics/Shader$TileMode;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/BitmapDrawable.html#setTileModeXY(android.graphics.Shader.TileMode,android.graphics.Shader.TileMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Shader.TileMode"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/ColorDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/ColorDrawable.cs
index ac0c0a14c..f0e1f1306 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/ColorDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/ColorDrawable.cs
@@ -54,11 +54,20 @@ public ColorDrawable(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ColorDrawable.html#getColor()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/ColorDrawable.html#setColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ColorDrawable.html#getColor()"/>
         /// </summary>
-        public int Color
+        /// <returns><see cref="int"/></returns>
+        public int GetColor()
         {
-            get { return IExecuteWithSignature<int>("getColor", "()I"); } set { IExecuteWithSignature("setColor", "(I)V", value); }
+            return IExecuteWithSignature<int>("getColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ColorDrawable.html#setColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetColor(int arg0)
+        {
+            IExecuteWithSignature("setColor", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/ColorStateListDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/ColorStateListDrawable.cs
index 2d901f543..3122d5d61 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/ColorStateListDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/ColorStateListDrawable.cs
@@ -54,11 +54,12 @@ public ColorStateListDrawable(Android.Content.Res.ColorStateList arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ColorStateListDrawable.html#getColorStateList()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/ColorStateListDrawable.html#setColorStateList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ColorStateListDrawable.html#getColorStateList()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList ColorStateList
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetColorStateList()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getColorStateList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setColorStateList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getColorStateList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/ColorStateListDrawable.html#clearAlpha()"/>
@@ -86,6 +87,14 @@ public void ScheduleDrawable(Android.Graphics.Drawable.Drawable arg0, Java.Lang.
             IExecute("scheduleDrawable", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ColorStateListDrawable.html#setColorStateList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetColorStateList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setColorStateList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/ColorStateListDrawable.html#unscheduleDrawable(android.graphics.drawable.Drawable,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Drawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Drawable.cs
index 32d047c85..53518c407 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Drawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Drawable.cs
@@ -51,6 +51,32 @@ public static Android.Graphics.Drawable.Drawable CreateFromPath(Java.Lang.String
             return SExecuteWithSignature<Android.Graphics.Drawable.Drawable>(LocalBridgeClazz, "createFromPath", "(Ljava/lang/String;)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#createFromResourceStream(android.content.res.Resources,android.util.TypedValue,java.io.InputStream,java.lang.String,android.graphics.BitmapFactory.Options)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
+        /// <param name="arg1"><see cref="Android.Util.TypedValue"/></param>
+        /// <param name="arg2"><see cref="Java.Io.InputStream"/></param>
+        /// <param name="arg3"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg4"><see cref="Android.Graphics.BitmapFactory.Options"/></param>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Graphics.Drawable.Drawable CreateFromResourceStream(Android.Content.Res.Resources arg0, Android.Util.TypedValue arg1, Java.Io.InputStream arg2, Java.Lang.String arg3, Android.Graphics.BitmapFactory.Options arg4)
+        {
+            return SExecute<Android.Graphics.Drawable.Drawable>(LocalBridgeClazz, "createFromResourceStream", arg0, arg1, arg2, arg3, arg4);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#createFromResourceStream(android.content.res.Resources,android.util.TypedValue,java.io.InputStream,java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
+        /// <param name="arg1"><see cref="Android.Util.TypedValue"/></param>
+        /// <param name="arg2"><see cref="Java.Io.InputStream"/></param>
+        /// <param name="arg3"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public static Android.Graphics.Drawable.Drawable CreateFromResourceStream(Android.Content.Res.Resources arg0, Android.Util.TypedValue arg1, Java.Io.InputStream arg2, Java.Lang.String arg3)
+        {
+            return SExecute<Android.Graphics.Drawable.Drawable>(LocalBridgeClazz, "createFromResourceStream", arg0, arg1, arg2, arg3);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#createFromStream(java.io.InputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
@@ -127,147 +153,101 @@ public static int ResolveOpacity(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getAlpha()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setAlpha(int)"/>
-        /// </summary>
-        public int Alpha
-        {
-            get { return IExecuteWithSignature<int>("getAlpha", "()I"); } set { IExecuteWithSignature("setAlpha", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getBounds()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setBounds(android.graphics.Rect)"/>
-        /// </summary>
-        public Android.Graphics.Rect Bounds
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;"); } set { IExecuteWithSignature("setBounds", "(Landroid/graphics/Rect;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getChangingConfigurations()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setChangingConfigurations(int)"/>
-        /// </summary>
-        public int ChangingConfigurations
-        {
-            get { return IExecuteWithSignature<int>("getChangingConfigurations", "()I"); } set { IExecuteWithSignature("setChangingConfigurations", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getColorFilter()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setColorFilter(android.graphics.ColorFilter)"/>
-        /// </summary>
-        public Android.Graphics.ColorFilter ColorFilter
-        {
-            get { return IExecuteWithSignature<Android.Graphics.ColorFilter>("getColorFilter", "()Landroid/graphics/ColorFilter;"); } set { IExecuteWithSignature("setColorFilter", "(Landroid/graphics/ColorFilter;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getCurrent()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Drawable Current
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getCurrent", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getDirtyBounds()"/> 
-        /// </summary>
-        public Android.Graphics.Rect DirtyBounds
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getDirtyBounds", "()Landroid/graphics/Rect;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getCallback()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getOpacity()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable.Callback GetCallback
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable.Callback>("getCallback", "()Landroid/graphics/drawable/Drawable$Callback;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getConstantState()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Drawable.ConstantState GetConstantState
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable.ConstantState>("getConstantState", "()Landroid/graphics/drawable/Drawable$ConstantState;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getIntrinsicHeight()"/> 
-        /// </summary>
-        public int IntrinsicHeight
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetOpacity()
         {
-            get { return IExecuteWithSignature<int>("getIntrinsicHeight", "()I"); }
+            return IExecuteWithSignature<int>("getOpacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getIntrinsicWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#draw(android.graphics.Canvas)"/>
         /// </summary>
-        public int IntrinsicWidth
+        /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
+        public void Draw(Android.Graphics.Canvas arg0)
         {
-            get { return IExecuteWithSignature<int>("getIntrinsicWidth", "()I"); }
+            IExecuteWithSignature("draw", "(Landroid/graphics/Canvas;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getLayoutDirection()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setAlpha(int)"/>
         /// </summary>
-        public int LayoutDirection
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAlpha(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getLayoutDirection", "()I"); }
+            IExecuteWithSignature("setAlpha", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setColorFilter(android.graphics.ColorFilter)"/>
         /// </summary>
-        public int Level
+        /// <param name="arg0"><see cref="Android.Graphics.ColorFilter"/></param>
+        public void SetColorFilter(Android.Graphics.ColorFilter arg0)
         {
-            get { return IExecuteWithSignature<int>("getLevel", "()I"); }
+            IExecuteWithSignature("setColorFilter", "(Landroid/graphics/ColorFilter;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getMinimumHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getColorFilter()"/>
         /// </summary>
-        public int MinimumHeight
+        /// <returns><see cref="Android.Graphics.ColorFilter"/></returns>
+        public Android.Graphics.ColorFilter GetColorFilter()
         {
-            get { return IExecuteWithSignature<int>("getMinimumHeight", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.ColorFilter>("getColorFilter", "()Landroid/graphics/ColorFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getMinimumWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getCurrent()"/>
         /// </summary>
-        public int MinimumWidth
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetCurrent()
         {
-            get { return IExecuteWithSignature<int>("getMinimumWidth", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getCurrent", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getOpacity()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#mutate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Opacity
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable Mutate()
         {
-            get { return IExecuteWithSignature<int>("getOpacity", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("mutate", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getOpticalInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getCallback()"/>
         /// </summary>
-        public Android.Graphics.Insets OpticalInsets
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable.Callback"/></returns>
+        public Android.Graphics.Drawable.Drawable.Callback GetCallback()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getOpticalInsets", "()Landroid/graphics/Insets;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable.Callback>("getCallback", "()Landroid/graphics/drawable/Drawable$Callback;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getConstantState()"/>
         /// </summary>
-        public int[] State
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable.ConstantState"/></returns>
+        public Android.Graphics.Drawable.Drawable.ConstantState GetConstantState()
         {
-            get { return IExecuteWithSignatureArray<int>("getState", "()[I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable.ConstantState>("getConstantState", "()Landroid/graphics/drawable/Drawable$ConstantState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getTransparentRegion()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getOpticalInsets()"/>
         /// </summary>
-        public Android.Graphics.Region TransparentRegion
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        public Android.Graphics.Insets GetOpticalInsets()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Region>("getTransparentRegion", "()Landroid/graphics/Region;"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getOpticalInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#draw(android.graphics.Canvas)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getDirtyBounds()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
-        public void Draw(Android.Graphics.Canvas arg0)
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetDirtyBounds()
         {
-            IExecuteWithSignature("draw", "(Landroid/graphics/Canvas;)V", arg0);
+            return IExecuteWithSignature<Android.Graphics.Rect>("getDirtyBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#mutate()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getTransparentRegion()"/>
         /// </summary>
-        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
-        public Android.Graphics.Drawable.Drawable Mutate()
+        /// <returns><see cref="Android.Graphics.Region"/></returns>
+        public Android.Graphics.Region GetTransparentRegion()
         {
-            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("mutate", "()Landroid/graphics/drawable/Drawable;");
+            return IExecuteWithSignature<Android.Graphics.Region>("getTransparentRegion", "()Landroid/graphics/Region;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#canApplyTheme()"/>
@@ -363,6 +343,14 @@ public Android.Graphics.Rect CopyBounds()
             return IExecuteWithSignature<Android.Graphics.Rect>("copyBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getBounds()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBounds()
+        {
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#isVisible()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -389,6 +377,14 @@ public bool SetLevel(int arg0)
             return IExecuteWithSignature<bool>("setLevel", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLevel()
+        {
+            return IExecuteWithSignature<int>("getLevel", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#copyBounds(android.graphics.Rect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
@@ -405,6 +401,70 @@ public void SetCallback(Android.Graphics.Drawable.Drawable.Callback arg0)
             IExecuteWithSignature("setCallback", "(Landroid/graphics/drawable/Drawable$Callback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getAlpha()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAlpha()
+        {
+            return IExecuteWithSignature<int>("getAlpha", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getChangingConfigurations()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChangingConfigurations()
+        {
+            return IExecuteWithSignature<int>("getChangingConfigurations", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getIntrinsicHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIntrinsicHeight()
+        {
+            return IExecuteWithSignature<int>("getIntrinsicHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getIntrinsicWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIntrinsicWidth()
+        {
+            return IExecuteWithSignature<int>("getIntrinsicWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getLayoutDirection()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLayoutDirection()
+        {
+            return IExecuteWithSignature<int>("getLayoutDirection", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getMinimumHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumHeight()
+        {
+            return IExecuteWithSignature<int>("getMinimumHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getMinimumWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumWidth()
+        {
+            return IExecuteWithSignature<int>("getMinimumWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#getState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetState()
+        {
+            return IExecuteWithSignatureArray<int>("getState", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#applyTheme(android.content.res.Resources.Theme)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.Resources.Theme"/></param>
@@ -492,6 +552,14 @@ public void SetAutoMirrored(bool arg0)
             IExecuteWithSignature("setAutoMirrored", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setBounds(android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        public void SetBounds(Android.Graphics.Rect arg0)
+        {
+            IExecuteWithSignature("setBounds", "(Landroid/graphics/Rect;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setBounds(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -503,11 +571,19 @@ public void SetBounds(int arg0, int arg1, int arg2, int arg3)
             IExecute("setBounds", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setChangingConfigurations(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetChangingConfigurations(int arg0)
+        {
+            IExecuteWithSignature("setChangingConfigurations", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setColorFilter(int,android.graphics.PorterDuff.Mode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetColorFilter(int arg0, Android.Graphics.PorterDuff.Mode arg1)
         {
             IExecute("setColorFilter", arg0, arg1);
@@ -516,7 +592,7 @@ public void SetColorFilter(int arg0, Android.Graphics.PorterDuff.Mode arg1)
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.html#setDither(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDither(bool arg0)
         {
             IExecuteWithSignature("setDither", "(Z)V", arg0);
@@ -672,13 +748,6 @@ public partial class ConstantState
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.ConstantState.html#getChangingConfigurations()"/> 
-            /// </summary>
-            public int ChangingConfigurations
-            {
-                get { return IExecuteWithSignature<int>("getChangingConfigurations", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.ConstantState.html#newDrawable()"/>
             /// </summary>
             /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
@@ -687,6 +756,14 @@ public Android.Graphics.Drawable.Drawable NewDrawable()
                 return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("newDrawable", "()Landroid/graphics/drawable/Drawable;");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.ConstantState.html#getChangingConfigurations()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetChangingConfigurations()
+            {
+                return IExecuteWithSignature<int>("getChangingConfigurations", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/drawable/Drawable.ConstantState.html#newDrawable(android.content.res.Resources,android.content.res.Resources.Theme)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/DrawableContainer.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/DrawableContainer.cs
index f9b81d499..32077c346 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/DrawableContainer.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/DrawableContainer.cs
@@ -122,108 +122,118 @@ public partial class DrawableContainerState
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getChildCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getChild(int)"/>
             /// </summary>
-            public int ChildCount
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+            public Android.Graphics.Drawable.Drawable GetChild(int arg0)
             {
-                get { return IExecuteWithSignature<int>("getChildCount", "()I"); }
+                return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getChild", "(I)Landroid/graphics/drawable/Drawable;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getChildren()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getChildren()"/>
             /// </summary>
-            public Android.Graphics.Drawable.Drawable[] Children
+            /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+            public Android.Graphics.Drawable.Drawable[] GetChildren()
             {
-                get { return IExecuteWithSignatureArray<Android.Graphics.Drawable.Drawable>("getChildren", "()[Landroid/graphics/drawable/Drawable;"); }
+                return IExecuteWithSignatureArray<Android.Graphics.Drawable.Drawable>("getChildren", "()[Landroid/graphics/drawable/Drawable;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantPadding()"/>
             /// </summary>
-            public int ConstantHeight
+            /// <returns><see cref="Android.Graphics.Rect"/></returns>
+            public Android.Graphics.Rect GetConstantPadding()
             {
-                get { return IExecuteWithSignature<int>("getConstantHeight", "()I"); }
+                return IExecuteWithSignature<Android.Graphics.Rect>("getConstantPadding", "()Landroid/graphics/Rect;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantMinimumHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#isConstantSize()"/>
             /// </summary>
-            public int ConstantMinimumHeight
+            /// <returns><see cref="bool"/></returns>
+            public bool IsConstantSize()
             {
-                get { return IExecuteWithSignature<int>("getConstantMinimumHeight", "()I"); }
+                return IExecuteWithSignature<bool>("isConstantSize", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantMinimumWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#isStateful()"/>
             /// </summary>
-            public int ConstantMinimumWidth
+            /// <returns><see cref="bool"/></returns>
+            public bool IsStateful()
             {
-                get { return IExecuteWithSignature<int>("getConstantMinimumWidth", "()I"); }
+                return IExecuteWithSignature<bool>("isStateful", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantPadding()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#addChild(android.graphics.drawable.Drawable)"/>
             /// </summary>
-            public Android.Graphics.Rect ConstantPadding
+            /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+            /// <returns><see cref="int"/></returns>
+            public int AddChild(Android.Graphics.Drawable.Drawable arg0)
             {
-                get { return IExecuteWithSignature<Android.Graphics.Rect>("getConstantPadding", "()Landroid/graphics/Rect;"); }
+                return IExecuteWithSignature<int>("addChild", "(Landroid/graphics/drawable/Drawable;)I", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getChildCount()"/>
             /// </summary>
-            public int ConstantWidth
+            /// <returns><see cref="int"/></returns>
+            public int GetChildCount()
             {
-                get { return IExecuteWithSignature<int>("getConstantWidth", "()I"); }
+                return IExecuteWithSignature<int>("getChildCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getEnterFadeDuration()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#setEnterFadeDuration(int)"/>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantHeight()"/>
             /// </summary>
-            public int EnterFadeDuration
+            /// <returns><see cref="int"/></returns>
+            public int GetConstantHeight()
             {
-                get { return IExecuteWithSignature<int>("getEnterFadeDuration", "()I"); } set { IExecuteWithSignature("setEnterFadeDuration", "(I)V", value); }
+                return IExecuteWithSignature<int>("getConstantHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getExitFadeDuration()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#setExitFadeDuration(int)"/>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantMinimumHeight()"/>
             /// </summary>
-            public int ExitFadeDuration
+            /// <returns><see cref="int"/></returns>
+            public int GetConstantMinimumHeight()
             {
-                get { return IExecuteWithSignature<int>("getExitFadeDuration", "()I"); } set { IExecuteWithSignature("setExitFadeDuration", "(I)V", value); }
+                return IExecuteWithSignature<int>("getConstantMinimumHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getOpacity()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantMinimumWidth()"/>
             /// </summary>
-            public int Opacity
+            /// <returns><see cref="int"/></returns>
+            public int GetConstantMinimumWidth()
             {
-                get { return IExecuteWithSignature<int>("getOpacity", "()I"); }
+                return IExecuteWithSignature<int>("getConstantMinimumWidth", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getChild(int)"/>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getConstantWidth()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
-            public Android.Graphics.Drawable.Drawable GetChild(int arg0)
+            /// <returns><see cref="int"/></returns>
+            public int GetConstantWidth()
             {
-                return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getChild", "(I)Landroid/graphics/drawable/Drawable;", arg0);
+                return IExecuteWithSignature<int>("getConstantWidth", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#isConstantSize()"/>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getEnterFadeDuration()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsConstantSize()
+            /// <returns><see cref="int"/></returns>
+            public int GetEnterFadeDuration()
             {
-                return IExecuteWithSignature<bool>("isConstantSize", "()Z");
+                return IExecuteWithSignature<int>("getEnterFadeDuration", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#isStateful()"/>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getExitFadeDuration()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsStateful()
+            /// <returns><see cref="int"/></returns>
+            public int GetExitFadeDuration()
             {
-                return IExecuteWithSignature<bool>("isStateful", "()Z");
+                return IExecuteWithSignature<int>("getExitFadeDuration", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#addChild(android.graphics.drawable.Drawable)"/>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#getOpacity()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
             /// <returns><see cref="int"/></returns>
-            public int AddChild(Android.Graphics.Drawable.Drawable arg0)
+            public int GetOpacity()
             {
-                return IExecuteWithSignature<int>("addChild", "(Landroid/graphics/drawable/Drawable;)I", arg0);
+                return IExecuteWithSignature<int>("getOpacity", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#setConstantSize(boolean)"/>
@@ -234,6 +244,22 @@ public void SetConstantSize(bool arg0)
                 IExecuteWithSignature("setConstantSize", "(Z)V", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#setEnterFadeDuration(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetEnterFadeDuration(int arg0)
+            {
+                IExecuteWithSignature("setEnterFadeDuration", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#setExitFadeDuration(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetExitFadeDuration(int arg0)
+            {
+                IExecuteWithSignature("setExitFadeDuration", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableContainer.DrawableContainerState.html#setVariablePadding(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/DrawableWrapper.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/DrawableWrapper.cs
index 687bd89f1..3de5cf8de 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/DrawableWrapper.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/DrawableWrapper.cs
@@ -54,11 +54,12 @@ public DrawableWrapper(Android.Graphics.Drawable.Drawable arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableWrapper.html#getDrawable()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableWrapper.html#setDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableWrapper.html#getDrawable()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Drawable
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDrawable()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableWrapper.html#invalidateDrawable(android.graphics.drawable.Drawable)"/>
@@ -79,6 +80,14 @@ public void ScheduleDrawable(Android.Graphics.Drawable.Drawable arg0, Java.Lang.
             IExecute("scheduleDrawable", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableWrapper.html#setDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/DrawableWrapper.html#unscheduleDrawable(android.graphics.drawable.Drawable,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/GradientDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/GradientDrawable.cs
index 007904157..163c5f00d 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/GradientDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/GradientDrawable.cs
@@ -97,109 +97,124 @@ public GradientDrawable(Android.Graphics.Drawable.GradientDrawable.Orientation a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getColor()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList Color
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetColor()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getColor", "()Landroid/content/res/ColorStateList;"); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getColor", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getColors()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setColors(int[])"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getOrientation()"/>
         /// </summary>
-        public int[] Colors
+        /// <returns><see cref="Android.Graphics.Drawable.GradientDrawable.Orientation"/></returns>
+        public Android.Graphics.Drawable.GradientDrawable.Orientation GetOrientation()
         {
-            get { return IExecuteWithSignatureArray<int>("getColors", "()[I"); } set { IExecuteWithSignature("setColors", "([I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.GradientDrawable.Orientation>("getOrientation", "()Landroid/graphics/drawable/GradientDrawable$Orientation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getCornerRadii()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setCornerRadii(float[])"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getUseLevel()"/>
         /// </summary>
-        public float[] CornerRadii
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseLevel()
         {
-            get { return IExecuteWithSignatureArray<float>("getCornerRadii", "()[F"); } set { IExecuteWithSignature("setCornerRadii", "([F)V", value); }
+            return IExecuteWithSignature<bool>("getUseLevel", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getCornerRadius()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setCornerRadius(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getCornerRadius()"/>
         /// </summary>
-        public float CornerRadius
+        /// <returns><see cref="float"/></returns>
+        public float GetCornerRadius()
         {
-            get { return IExecuteWithSignature<float>("getCornerRadius", "()F"); } set { IExecuteWithSignature("setCornerRadius", "(F)V", value); }
+            return IExecuteWithSignature<float>("getCornerRadius", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getOrientation()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getGradientCenterX()"/>
         /// </summary>
-        public Android.Graphics.Drawable.GradientDrawable.Orientation GetOrientation
+        /// <returns><see cref="float"/></returns>
+        public float GetGradientCenterX()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.GradientDrawable.Orientation>("getOrientation", "()Landroid/graphics/drawable/GradientDrawable$Orientation;"); }
+            return IExecuteWithSignature<float>("getGradientCenterX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getGradientCenterX()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getGradientCenterY()"/>
         /// </summary>
-        public float GradientCenterX
+        /// <returns><see cref="float"/></returns>
+        public float GetGradientCenterY()
         {
-            get { return IExecuteWithSignature<float>("getGradientCenterX", "()F"); }
+            return IExecuteWithSignature<float>("getGradientCenterY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getGradientCenterY()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getGradientRadius()"/>
         /// </summary>
-        public float GradientCenterY
+        /// <returns><see cref="float"/></returns>
+        public float GetGradientRadius()
         {
-            get { return IExecuteWithSignature<float>("getGradientCenterY", "()F"); }
+            return IExecuteWithSignature<float>("getGradientRadius", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getGradientRadius()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setGradientRadius(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getInnerRadiusRatio()"/>
         /// </summary>
-        public float GradientRadius
+        /// <returns><see cref="float"/></returns>
+        public float GetInnerRadiusRatio()
         {
-            get { return IExecuteWithSignature<float>("getGradientRadius", "()F"); } set { IExecuteWithSignature("setGradientRadius", "(F)V", value); }
+            return IExecuteWithSignature<float>("getInnerRadiusRatio", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getGradientType()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setGradientType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getThicknessRatio()"/>
         /// </summary>
-        public int GradientType
+        /// <returns><see cref="float"/></returns>
+        public float GetThicknessRatio()
         {
-            get { return IExecuteWithSignature<int>("getGradientType", "()I"); } set { IExecuteWithSignature("setGradientType", "(I)V", value); }
+            return IExecuteWithSignature<float>("getThicknessRatio", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getInnerRadius()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setInnerRadius(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getCornerRadii()"/>
         /// </summary>
-        public int InnerRadius
+        /// <returns><see cref="float"/></returns>
+        public float[] GetCornerRadii()
         {
-            get { return IExecuteWithSignature<int>("getInnerRadius", "()I"); } set { IExecuteWithSignature("setInnerRadius", "(I)V", value); }
+            return IExecuteWithSignatureArray<float>("getCornerRadii", "()[F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getInnerRadiusRatio()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setInnerRadiusRatio(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getGradientType()"/>
         /// </summary>
-        public float InnerRadiusRatio
+        /// <returns><see cref="int"/></returns>
+        public int GetGradientType()
         {
-            get { return IExecuteWithSignature<float>("getInnerRadiusRatio", "()F"); } set { IExecuteWithSignature("setInnerRadiusRatio", "(F)V", value); }
+            return IExecuteWithSignature<int>("getGradientType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getShape()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setShape(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getInnerRadius()"/>
         /// </summary>
-        public int Shape
+        /// <returns><see cref="int"/></returns>
+        public int GetInnerRadius()
         {
-            get { return IExecuteWithSignature<int>("getShape", "()I"); } set { IExecuteWithSignature("setShape", "(I)V", value); }
+            return IExecuteWithSignature<int>("getInnerRadius", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getThickness()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setThickness(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getShape()"/>
         /// </summary>
-        public int Thickness
+        /// <returns><see cref="int"/></returns>
+        public int GetShape()
         {
-            get { return IExecuteWithSignature<int>("getThickness", "()I"); } set { IExecuteWithSignature("setThickness", "(I)V", value); }
+            return IExecuteWithSignature<int>("getShape", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getThicknessRatio()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setThicknessRatio(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getThickness()"/>
         /// </summary>
-        public float ThicknessRatio
+        /// <returns><see cref="int"/></returns>
+        public int GetThickness()
         {
-            get { return IExecuteWithSignature<float>("getThicknessRatio", "()F"); } set { IExecuteWithSignature("setThicknessRatio", "(F)V", value); }
+            return IExecuteWithSignature<int>("getThickness", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getUseLevel()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setUseLevel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#getColors()"/>
         /// </summary>
-        public bool UseLevel
+        /// <returns><see cref="int"/></returns>
+        public int[] GetColors()
         {
-            get { return IExecuteWithSignature<bool>("getUseLevel", "()Z"); } set { IExecuteWithSignature("setUseLevel", "(Z)V", value); }
+            return IExecuteWithSignatureArray<int>("getColors", "()[I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setColor(android.content.res.ColorStateList)"/>
@@ -227,6 +242,30 @@ public void SetColors(int[] arg0, float[] arg1)
             IExecute("setColors", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setColors(int[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetColors(int[] arg0)
+        {
+            IExecuteWithSignature("setColors", "([I)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setCornerRadii(float[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetCornerRadii(float[] arg0)
+        {
+            IExecuteWithSignature("setCornerRadii", "([F)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setCornerRadius(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetCornerRadius(float arg0)
+        {
+            IExecuteWithSignature("setCornerRadius", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setGradientCenter(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -236,6 +275,38 @@ public void SetGradientCenter(float arg0, float arg1)
             IExecute("setGradientCenter", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setGradientRadius(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetGradientRadius(float arg0)
+        {
+            IExecuteWithSignature("setGradientRadius", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setGradientType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGradientType(int arg0)
+        {
+            IExecuteWithSignature("setGradientType", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setInnerRadius(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInnerRadius(int arg0)
+        {
+            IExecuteWithSignature("setInnerRadius", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setInnerRadiusRatio(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetInnerRadiusRatio(float arg0)
+        {
+            IExecuteWithSignature("setInnerRadiusRatio", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setOrientation(android.graphics.drawable.GradientDrawable.Orientation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.GradientDrawable.Orientation"/></param>
@@ -255,6 +326,14 @@ public void SetPadding(int arg0, int arg1, int arg2, int arg3)
             IExecute("setPadding", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setShape(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetShape(int arg0)
+        {
+            IExecuteWithSignature("setShape", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setSize(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -303,6 +382,30 @@ public void SetStroke(int arg0, int arg1)
         {
             IExecute("setStroke", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setThickness(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetThickness(int arg0)
+        {
+            IExecuteWithSignature("setThickness", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setThicknessRatio(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetThicknessRatio(float arg0)
+        {
+            IExecuteWithSignature("setThicknessRatio", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/GradientDrawable.html#setUseLevel(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseLevel(bool arg0)
+        {
+            IExecuteWithSignature("setUseLevel", "(Z)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Icon.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Icon.cs
index 8779220df..66088db4f 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Icon.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Icon.cs
@@ -182,34 +182,6 @@ public static Android.Graphics.Drawable.Icon CreateWithResource(Java.Lang.String
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#getResId()"/> 
-        /// </summary>
-        public int ResId
-        {
-            get { return IExecuteWithSignature<int>("getResId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#getResPackage()"/> 
-        /// </summary>
-        public Java.Lang.String ResPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#getUri()"/> 
-        /// </summary>
-        public Android.Net.Uri Uri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#loadDrawable(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -255,6 +227,14 @@ public Android.Graphics.Drawable.Icon SetTintMode(Android.Graphics.PorterDuff.Mo
             return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("setTintMode", "(Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/drawable/Icon;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#getUri()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUri()
+        {
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -263,6 +243,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#getResId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetResId()
+        {
+            return IExecuteWithSignature<int>("getResId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#getResPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getResPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.html#loadDrawableAsync(android.content.Context,android.graphics.drawable.Icon.OnDrawableLoadedListener,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -319,7 +323,7 @@ public partial class OnDrawableLoadedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDrawableLoaded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.Drawable.Drawable>>>(OnDrawableLoadedEventHandler));
+                AddEventHandler("onDrawableLoaded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.Drawable.Drawable>>>(OnDrawableLoadedEventHandler));
 
             }
 
@@ -327,7 +331,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/graphics/drawable/Icon.OnDrawableLoadedListener.html#onDrawableLoaded(android.graphics.drawable.Drawable)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDrawableLoaded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Graphics.Drawable.Drawable> OnOnDrawableLoaded { get; set; } = null;
+            public global::System.Action<Android.Graphics.Drawable.Drawable> OnOnDrawableLoaded { get; set; } = null;
 
             void OnDrawableLoadedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.Drawable.Drawable>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/LayerDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/LayerDrawable.cs
index c24beb66a..78f492c8c 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/LayerDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/LayerDrawable.cs
@@ -72,62 +72,6 @@ public LayerDrawable(Android.Graphics.Drawable.Drawable[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getBottomPadding()"/> 
-        /// </summary>
-        public int BottomPadding
-        {
-            get { return IExecuteWithSignature<int>("getBottomPadding", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getEndPadding()"/> 
-        /// </summary>
-        public int EndPadding
-        {
-            get { return IExecuteWithSignature<int>("getEndPadding", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getLeftPadding()"/> 
-        /// </summary>
-        public int LeftPadding
-        {
-            get { return IExecuteWithSignature<int>("getLeftPadding", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getNumberOfLayers()"/> 
-        /// </summary>
-        public int NumberOfLayers
-        {
-            get { return IExecuteWithSignature<int>("getNumberOfLayers", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getPaddingMode()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#setPaddingMode(int)"/>
-        /// </summary>
-        public int PaddingMode
-        {
-            get { return IExecuteWithSignature<int>("getPaddingMode", "()I"); } set { IExecuteWithSignature("setPaddingMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getRightPadding()"/> 
-        /// </summary>
-        public int RightPadding
-        {
-            get { return IExecuteWithSignature<int>("getRightPadding", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getStartPadding()"/> 
-        /// </summary>
-        public int StartPadding
-        {
-            get { return IExecuteWithSignature<int>("getStartPadding", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getTopPadding()"/> 
-        /// </summary>
-        public int TopPadding
-        {
-            get { return IExecuteWithSignature<int>("getTopPadding", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#findDrawableByLayerId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -174,6 +118,22 @@ public int FindIndexByLayerId(int arg0)
             return IExecuteWithSignature<int>("findIndexByLayerId", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getBottomPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBottomPadding()
+        {
+            return IExecuteWithSignature<int>("getBottomPadding", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getEndPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetEndPadding()
+        {
+            return IExecuteWithSignature<int>("getEndPadding", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -264,6 +224,54 @@ public int GetLayerWidth(int arg0)
             return IExecuteWithSignature<int>("getLayerWidth", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getLeftPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLeftPadding()
+        {
+            return IExecuteWithSignature<int>("getLeftPadding", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getNumberOfLayers()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfLayers()
+        {
+            return IExecuteWithSignature<int>("getNumberOfLayers", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getPaddingMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPaddingMode()
+        {
+            return IExecuteWithSignature<int>("getPaddingMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getRightPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRightPadding()
+        {
+            return IExecuteWithSignature<int>("getRightPadding", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getStartPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStartPadding()
+        {
+            return IExecuteWithSignature<int>("getStartPadding", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#getTopPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTopPadding()
+        {
+            return IExecuteWithSignature<int>("getTopPadding", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#invalidateDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -434,6 +442,14 @@ public void SetPadding(int arg0, int arg1, int arg2, int arg3)
             IExecute("setPadding", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#setPaddingMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPaddingMode(int arg0)
+        {
+            IExecuteWithSignature("setPaddingMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/LayerDrawable.html#setPaddingRelative(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/NinePatchDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/NinePatchDrawable.cs
index 44b5f1e38..f756f7287 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/NinePatchDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/NinePatchDrawable.cs
@@ -57,7 +57,7 @@ public NinePatchDrawable(Android.Content.Res.Resources arg0, Android.Graphics.Ni
         /// <param name="arg1"><see cref="byte"/></param>
         /// <param name="arg2"><see cref="Android.Graphics.Rect"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public NinePatchDrawable(Android.Graphics.Bitmap arg0, byte[] arg1, Android.Graphics.Rect arg2, Java.Lang.String arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -66,7 +66,7 @@ public NinePatchDrawable(Android.Graphics.Bitmap arg0, byte[] arg1, Android.Grap
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable.html#%3Cinit%3E(android.graphics.NinePatch)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.NinePatch"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public NinePatchDrawable(Android.Graphics.NinePatch arg0)
             : base(arg0)
         {
@@ -88,11 +88,12 @@ public NinePatchDrawable(Android.Graphics.NinePatch arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable.html#getPaint()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable.html#getPaint()"/>
         /// </summary>
-        public Android.Graphics.Paint Paint
+        /// <returns><see cref="Android.Graphics.Paint"/></returns>
+        public Android.Graphics.Paint GetPaint()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "()Landroid/graphics/Paint;"); }
+            return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "()Landroid/graphics/Paint;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/NinePatchDrawable.html#setTargetDensity(android.graphics.Canvas)"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/PictureDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/PictureDrawable.cs
index 9548c675e..7cd4631e1 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/PictureDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/PictureDrawable.cs
@@ -54,11 +54,20 @@ public PictureDrawable(Android.Graphics.Picture arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/PictureDrawable.html#getPicture()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/PictureDrawable.html#setPicture(android.graphics.Picture)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/PictureDrawable.html#getPicture()"/>
         /// </summary>
-        public Android.Graphics.Picture Picture
+        /// <returns><see cref="Android.Graphics.Picture"/></returns>
+        public Android.Graphics.Picture GetPicture()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Picture>("getPicture", "()Landroid/graphics/Picture;"); } set { IExecuteWithSignature("setPicture", "(Landroid/graphics/Picture;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Picture>("getPicture", "()Landroid/graphics/Picture;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/PictureDrawable.html#setPicture(android.graphics.Picture)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Picture"/></param>
+        public void SetPicture(Android.Graphics.Picture arg0)
+        {
+            IExecuteWithSignature("setPicture", "(Landroid/graphics/Picture;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/RippleDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/RippleDrawable.cs
index 39fdd9f14..d2e6b9404 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/RippleDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/RippleDrawable.cs
@@ -62,18 +62,20 @@ public RippleDrawable(Android.Content.Res.ColorStateList arg0, Android.Graphics.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#getEffectColor()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#setEffectColor(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#getEffectColor()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList EffectColor
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetEffectColor()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getEffectColor", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setEffectColor", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getEffectColor", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#getRadius()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#setRadius(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#getRadius()"/>
         /// </summary>
-        public int Radius
+        /// <returns><see cref="int"/></returns>
+        public int GetRadius()
         {
-            get { return IExecuteWithSignature<int>("getRadius", "()I"); } set { IExecuteWithSignature("setRadius", "(I)V", value); }
+            return IExecuteWithSignature<int>("getRadius", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#setColor(android.content.res.ColorStateList)"/>
@@ -83,6 +85,22 @@ public void SetColor(Android.Content.Res.ColorStateList arg0)
         {
             IExecuteWithSignature("setColor", "(Landroid/content/res/ColorStateList;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#setEffectColor(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetEffectColor(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setEffectColor", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RippleDrawable.html#setRadius(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRadius(int arg0)
+        {
+            IExecuteWithSignature("setRadius", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/RotateDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/RotateDrawable.cs
index f66600ae0..1f6f4e611 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/RotateDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/RotateDrawable.cs
@@ -46,48 +46,68 @@ public partial class RotateDrawable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#getFromDegrees()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setFromDegrees(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#isPivotXRelative()"/>
         /// </summary>
-        public float FromDegrees
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPivotXRelative()
         {
-            get { return IExecuteWithSignature<float>("getFromDegrees", "()F"); } set { IExecuteWithSignature("setFromDegrees", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isPivotXRelative", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#getPivotX()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setPivotX(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#isPivotYRelative()"/>
         /// </summary>
-        public float PivotX
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPivotYRelative()
         {
-            get { return IExecuteWithSignature<float>("getPivotX", "()F"); } set { IExecuteWithSignature("setPivotX", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isPivotYRelative", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#getPivotY()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setPivotY(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#getFromDegrees()"/>
         /// </summary>
-        public float PivotY
+        /// <returns><see cref="float"/></returns>
+        public float GetFromDegrees()
         {
-            get { return IExecuteWithSignature<float>("getPivotY", "()F"); } set { IExecuteWithSignature("setPivotY", "(F)V", value); }
+            return IExecuteWithSignature<float>("getFromDegrees", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#getToDegrees()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setToDegrees(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#getPivotX()"/>
         /// </summary>
-        public float ToDegrees
+        /// <returns><see cref="float"/></returns>
+        public float GetPivotX()
         {
-            get { return IExecuteWithSignature<float>("getToDegrees", "()F"); } set { IExecuteWithSignature("setToDegrees", "(F)V", value); }
+            return IExecuteWithSignature<float>("getPivotX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#isPivotXRelative()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#getPivotY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPivotXRelative()
+        /// <returns><see cref="float"/></returns>
+        public float GetPivotY()
         {
-            return IExecuteWithSignature<bool>("isPivotXRelative", "()Z");
+            return IExecuteWithSignature<float>("getPivotY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#isPivotYRelative()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#getToDegrees()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPivotYRelative()
+        /// <returns><see cref="float"/></returns>
+        public float GetToDegrees()
         {
-            return IExecuteWithSignature<bool>("isPivotYRelative", "()Z");
+            return IExecuteWithSignature<float>("getToDegrees", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setFromDegrees(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetFromDegrees(float arg0)
+        {
+            IExecuteWithSignature("setFromDegrees", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setPivotX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetPivotX(float arg0)
+        {
+            IExecuteWithSignature("setPivotX", "(F)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setPivotXRelative(boolean)"/>
@@ -98,6 +118,14 @@ public void SetPivotXRelative(bool arg0)
             IExecuteWithSignature("setPivotXRelative", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setPivotY(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetPivotY(float arg0)
+        {
+            IExecuteWithSignature("setPivotY", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setPivotYRelative(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -105,6 +133,14 @@ public void SetPivotYRelative(bool arg0)
         {
             IExecuteWithSignature("setPivotYRelative", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/RotateDrawable.html#setToDegrees(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetToDegrees(float arg0)
+        {
+            IExecuteWithSignature("setToDegrees", "(F)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/ShapeDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/ShapeDrawable.cs
index a072d9cda..391e4aa74 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/ShapeDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/ShapeDrawable.cs
@@ -54,25 +54,28 @@ public ShapeDrawable(Android.Graphics.Drawable.Shapes.Shape arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#getShaderFactory()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#getShaderFactory()"/>
         /// </summary>
-        public Android.Graphics.Drawable.ShapeDrawable.ShaderFactory GetShaderFactory
+        /// <returns><see cref="Android.Graphics.Drawable.ShapeDrawable.ShaderFactory"/></returns>
+        public Android.Graphics.Drawable.ShapeDrawable.ShaderFactory GetShaderFactory()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.ShapeDrawable.ShaderFactory>("getShaderFactory", "()Landroid/graphics/drawable/ShapeDrawable$ShaderFactory;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.ShapeDrawable.ShaderFactory>("getShaderFactory", "()Landroid/graphics/drawable/ShapeDrawable$ShaderFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#getPaint()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#getShape()"/>
         /// </summary>
-        public Android.Graphics.Paint Paint
+        /// <returns><see cref="Android.Graphics.Drawable.Shapes.Shape"/></returns>
+        public Android.Graphics.Drawable.Shapes.Shape GetShape()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "()Landroid/graphics/Paint;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Shapes.Shape>("getShape", "()Landroid/graphics/drawable/shapes/Shape;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#getShape()"/> <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#setShape(android.graphics.drawable.shapes.Shape)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#getPaint()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Shapes.Shape Shape
+        /// <returns><see cref="Android.Graphics.Paint"/></returns>
+        public Android.Graphics.Paint GetPaint()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Shapes.Shape>("getShape", "()Landroid/graphics/drawable/shapes/Shape;"); } set { IExecuteWithSignature("setShape", "(Landroid/graphics/drawable/shapes/Shape;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "()Landroid/graphics/Paint;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#setIntrinsicHeight(int)"/>
@@ -117,6 +120,14 @@ public void SetShaderFactory(Android.Graphics.Drawable.ShapeDrawable.ShaderFacto
         {
             IExecuteWithSignature("setShaderFactory", "(Landroid/graphics/drawable/ShapeDrawable$ShaderFactory;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/ShapeDrawable.html#setShape(android.graphics.drawable.shapes.Shape)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Shapes.Shape"/></param>
+        public void SetShape(Android.Graphics.Drawable.Shapes.Shape arg0)
+        {
+            IExecuteWithSignature("setShape", "(Landroid/graphics/drawable/shapes/Shape;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/AllPackageClasses.cs
index 271253bc3..8f2372e54 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/AllPackageClasses.cs
@@ -256,12 +256,12 @@ public partial class Shape : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Shape class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Shape class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Shape() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Shape class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Shape class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Shape(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/ArcShape.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/ArcShape.cs
index 220dd5f09..26952b3b4 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/ArcShape.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/ArcShape.cs
@@ -55,18 +55,20 @@ public ArcShape(float arg0, float arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/ArcShape.html#getStartAngle()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/ArcShape.html#getStartAngle()"/>
         /// </summary>
-        public float StartAngle
+        /// <returns><see cref="float"/></returns>
+        public float GetStartAngle()
         {
-            get { return IExecuteWithSignature<float>("getStartAngle", "()F"); }
+            return IExecuteWithSignature<float>("getStartAngle", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/ArcShape.html#getSweepAngle()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/ArcShape.html#getSweepAngle()"/>
         /// </summary>
-        public float SweepAngle
+        /// <returns><see cref="float"/></returns>
+        public float GetSweepAngle()
         {
-            get { return IExecuteWithSignature<float>("getSweepAngle", "()F"); }
+            return IExecuteWithSignature<float>("getSweepAngle", "()F");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/Shape.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/Shape.cs
index 151b2cadc..3ee4bbe84 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/Shape.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/Shapes/Shape.cs
@@ -46,20 +46,6 @@ public partial class Shape
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/Shape.html#getHeight()"/> 
-        /// </summary>
-        public float Height
-        {
-            get { return IExecuteWithSignature<float>("getHeight", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/Shape.html#getWidth()"/> 
-        /// </summary>
-        public float Width
-        {
-            get { return IExecuteWithSignature<float>("getWidth", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/Shape.html#draw(android.graphics.Canvas,android.graphics.Paint)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
@@ -86,6 +72,22 @@ public bool HasAlpha()
             return IExecuteWithSignature<bool>("hasAlpha", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/Shape.html#getHeight()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetHeight()
+        {
+            return IExecuteWithSignature<float>("getHeight", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/Shape.html#getWidth()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetWidth()
+        {
+            return IExecuteWithSignature<float>("getWidth", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/shapes/Shape.html#resize(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Drawable/StateListDrawable.cs b/src/net/Netdroid/Generated/Android/Graphics/Drawable/StateListDrawable.cs
index b690a4b01..6c2705a11 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Drawable/StateListDrawable.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Drawable/StateListDrawable.cs
@@ -46,13 +46,6 @@ public partial class StateListDrawable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/drawable/StateListDrawable.html#getStateCount()"/> 
-        /// </summary>
-        public int StateCount
-        {
-            get { return IExecuteWithSignature<int>("getStateCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/StateListDrawable.html#getStateDrawable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -71,6 +64,14 @@ public int FindStateDrawableIndex(int[] arg0)
             return IExecuteWithSignature<int>("findStateDrawableIndex", "([I)I", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/drawable/StateListDrawable.html#getStateCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStateCount()
+        {
+            return IExecuteWithSignature<int>("getStateCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/drawable/StateListDrawable.html#getStateSet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/EmbossMaskFilter.cs b/src/net/Netdroid/Generated/Android/Graphics/EmbossMaskFilter.cs
index d1d0103ee..e147da1a1 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/EmbossMaskFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/EmbossMaskFilter.cs
@@ -36,7 +36,7 @@ public partial class EmbossMaskFilter
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public EmbossMaskFilter(float[] arg0, float arg1, float arg2, float arg3)
             : base(arg0, arg1, arg2, arg3)
         {
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Fonts/Font.cs b/src/net/Netdroid/Generated/Android/Graphics/Fonts/Font.cs
index e0a5bf7aa..2daa84d0c 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Fonts/Font.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Fonts/Font.cs
@@ -46,64 +46,71 @@ public partial class Font
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getAxes()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getStyle()"/>
         /// </summary>
-        public Android.Graphics.Fonts.FontVariationAxis[] Axes
+        /// <returns><see cref="Android.Graphics.Fonts.FontStyle"/></returns>
+        public Android.Graphics.Fonts.FontStyle GetStyle()
         {
-            get { return IExecuteWithSignatureArray<Android.Graphics.Fonts.FontVariationAxis>("getAxes", "()[Landroid/graphics/fonts/FontVariationAxis;"); }
+            return IExecuteWithSignature<Android.Graphics.Fonts.FontStyle>("getStyle", "()Landroid/graphics/fonts/FontStyle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getBuffer()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getAxes()"/>
         /// </summary>
-        public Java.Nio.ByteBuffer Buffer
+        /// <returns><see cref="Android.Graphics.Fonts.FontVariationAxis"/></returns>
+        public Android.Graphics.Fonts.FontVariationAxis[] GetAxes()
         {
-            get { return IExecuteWithSignature<Java.Nio.ByteBuffer>("getBuffer", "()Ljava/nio/ByteBuffer;"); }
+            return IExecuteWithSignatureArray<Android.Graphics.Fonts.FontVariationAxis>("getAxes", "()[Landroid/graphics/fonts/FontVariationAxis;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getFile()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getLocaleList()"/>
         /// </summary>
-        public Java.Io.File File
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetLocaleList()
         {
-            get { return IExecuteWithSignature<Java.Io.File>("getFile", "()Ljava/io/File;"); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getLocaleList", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getLocaleList()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getGlyphBounds(int,android.graphics.Paint,android.graphics.RectF)"/>
         /// </summary>
-        public Android.Os.LocaleList LocaleList
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Graphics.Paint"/></param>
+        /// <param name="arg2"><see cref="Android.Graphics.RectF"/></param>
+        /// <returns><see cref="float"/></returns>
+        public float GetGlyphBounds(int arg0, Android.Graphics.Paint arg1, Android.Graphics.RectF arg2)
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getLocaleList", "()Landroid/os/LocaleList;"); }
+            return IExecute<float>("getGlyphBounds", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getSourceIdentifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getSourceIdentifier()"/>
         /// </summary>
-        public int SourceIdentifier
+        /// <returns><see cref="int"/></returns>
+        public int GetSourceIdentifier()
         {
-            get { return IExecuteWithSignature<int>("getSourceIdentifier", "()I"); }
+            return IExecuteWithSignature<int>("getSourceIdentifier", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getTtcIndex()"/>
         /// </summary>
-        public Android.Graphics.Fonts.FontStyle Style
+        /// <returns><see cref="int"/></returns>
+        public int GetTtcIndex()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Fonts.FontStyle>("getStyle", "()Landroid/graphics/fonts/FontStyle;"); }
+            return IExecuteWithSignature<int>("getTtcIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getTtcIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getFile()"/>
         /// </summary>
-        public int TtcIndex
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetFile()
         {
-            get { return IExecuteWithSignature<int>("getTtcIndex", "()I"); }
+            return IExecuteWithSignature<Java.Io.File>("getFile", "()Ljava/io/File;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getGlyphBounds(int,android.graphics.Paint,android.graphics.RectF)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getBuffer()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Paint"/></param>
-        /// <param name="arg2"><see cref="Android.Graphics.RectF"/></param>
-        /// <returns><see cref="float"/></returns>
-        public float GetGlyphBounds(int arg0, Android.Graphics.Paint arg1, Android.Graphics.RectF arg2)
+        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
+        public Java.Nio.ByteBuffer GetBuffer()
         {
-            return IExecute<float>("getGlyphBounds", arg0, arg1, arg2);
+            return IExecuteWithSignature<Java.Nio.ByteBuffer>("getBuffer", "()Ljava/nio/ByteBuffer;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/fonts/Font.html#getMetrics(android.graphics.Paint,android.graphics.Paint.FontMetrics)"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontFamily.cs b/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontFamily.cs
index 95b2d2782..0f38b3bb4 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontFamily.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontFamily.cs
@@ -46,13 +46,6 @@ public partial class FontFamily
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontFamily.html#getSize()"/> 
-        /// </summary>
-        public int Size
-        {
-            get { return IExecuteWithSignature<int>("getSize", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontFamily.html#getFont(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -61,6 +54,14 @@ public Android.Graphics.Fonts.Font GetFont(int arg0)
         {
             return IExecuteWithSignature<Android.Graphics.Fonts.Font>("getFont", "(I)Landroid/graphics/fonts/Font;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontFamily.html#getSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSize()
+        {
+            return IExecuteWithSignature<int>("getSize", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontStyle.cs b/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontStyle.cs
index 351831743..ee851c3a4 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontStyle.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontStyle.cs
@@ -139,18 +139,20 @@ public FontStyle(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontStyle.html#getSlant()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontStyle.html#getSlant()"/>
         /// </summary>
-        public int Slant
+        /// <returns><see cref="int"/></returns>
+        public int GetSlant()
         {
-            get { return IExecuteWithSignature<int>("getSlant", "()I"); }
+            return IExecuteWithSignature<int>("getSlant", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontStyle.html#getWeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontStyle.html#getWeight()"/>
         /// </summary>
-        public int Weight
+        /// <returns><see cref="int"/></returns>
+        public int GetWeight()
         {
-            get { return IExecuteWithSignature<int>("getWeight", "()I"); }
+            return IExecuteWithSignature<int>("getWeight", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontVariationAxis.cs b/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontVariationAxis.cs
index 417bcce2c..105a6e727 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontVariationAxis.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Fonts/FontVariationAxis.cs
@@ -73,18 +73,20 @@ public static Java.Lang.String ToFontVariationSettings(Android.Graphics.Fonts.Fo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontVariationAxis.html#getStyleValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontVariationAxis.html#getStyleValue()"/>
         /// </summary>
-        public float StyleValue
+        /// <returns><see cref="float"/></returns>
+        public float GetStyleValue()
         {
-            get { return IExecuteWithSignature<float>("getStyleValue", "()F"); }
+            return IExecuteWithSignature<float>("getStyleValue", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontVariationAxis.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/FontVariationAxis.html#getTag()"/>
         /// </summary>
-        public Java.Lang.String Tag
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTag()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Fonts/SystemFonts.cs b/src/net/Netdroid/Generated/Android/Graphics/Fonts/SystemFonts.cs
index 0eb8b278e..eae79ab75 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Fonts/SystemFonts.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Fonts/SystemFonts.cs
@@ -42,11 +42,12 @@ public partial class SystemFonts
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/fonts/SystemFonts.html#getAvailableFonts()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/fonts/SystemFonts.html#getAvailableFonts()"/>
         /// </summary>
-        public static Java.Util.Set<Android.Graphics.Fonts.Font> AvailableFonts
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Android.Graphics.Fonts.Font> GetAvailableFonts()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<Android.Graphics.Fonts.Font>>(LocalBridgeClazz, "getAvailableFonts", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<Android.Graphics.Fonts.Font>>(LocalBridgeClazz, "getAvailableFonts", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Gainmap.cs b/src/net/Netdroid/Generated/Android/Graphics/Gainmap.cs
index f51b4f9a4..0451499da 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Gainmap.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Gainmap.cs
@@ -60,60 +60,68 @@ public Gainmap(Android.Graphics.Bitmap arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getDisplayRatioForFullHdr()"/> <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setDisplayRatioForFullHdr(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getGainmapContents()"/>
         /// </summary>
-        public float DisplayRatioForFullHdr
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetGainmapContents()
         {
-            get { return IExecuteWithSignature<float>("getDisplayRatioForFullHdr", "()F"); } set { IExecuteWithSignature("setDisplayRatioForFullHdr", "(F)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getGainmapContents", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getEpsilonHdr()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getDisplayRatioForFullHdr()"/>
         /// </summary>
-        public float[] EpsilonHdr
+        /// <returns><see cref="float"/></returns>
+        public float GetDisplayRatioForFullHdr()
         {
-            get { return IExecuteWithSignatureArray<float>("getEpsilonHdr", "()[F"); }
+            return IExecuteWithSignature<float>("getDisplayRatioForFullHdr", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getEpsilonSdr()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getMinDisplayRatioForHdrTransition()"/>
         /// </summary>
-        public float[] EpsilonSdr
+        /// <returns><see cref="float"/></returns>
+        public float GetMinDisplayRatioForHdrTransition()
         {
-            get { return IExecuteWithSignatureArray<float>("getEpsilonSdr", "()[F"); }
+            return IExecuteWithSignature<float>("getMinDisplayRatioForHdrTransition", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getGainmapContents()"/> <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setGainmapContents(android.graphics.Bitmap)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getEpsilonHdr()"/>
         /// </summary>
-        public Android.Graphics.Bitmap GainmapContents
+        /// <returns><see cref="float"/></returns>
+        public float[] GetEpsilonHdr()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getGainmapContents", "()Landroid/graphics/Bitmap;"); } set { IExecuteWithSignature("setGainmapContents", "(Landroid/graphics/Bitmap;)V", value); }
+            return IExecuteWithSignatureArray<float>("getEpsilonHdr", "()[F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getGamma()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getEpsilonSdr()"/>
         /// </summary>
-        public float[] Gamma
+        /// <returns><see cref="float"/></returns>
+        public float[] GetEpsilonSdr()
         {
-            get { return IExecuteWithSignatureArray<float>("getGamma", "()[F"); }
+            return IExecuteWithSignatureArray<float>("getEpsilonSdr", "()[F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getMinDisplayRatioForHdrTransition()"/> <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setMinDisplayRatioForHdrTransition(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getGamma()"/>
         /// </summary>
-        public float MinDisplayRatioForHdrTransition
+        /// <returns><see cref="float"/></returns>
+        public float[] GetGamma()
         {
-            get { return IExecuteWithSignature<float>("getMinDisplayRatioForHdrTransition", "()F"); } set { IExecuteWithSignature("setMinDisplayRatioForHdrTransition", "(F)V", value); }
+            return IExecuteWithSignatureArray<float>("getGamma", "()[F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getRatioMax()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getRatioMax()"/>
         /// </summary>
-        public float[] RatioMax
+        /// <returns><see cref="float"/></returns>
+        public float[] GetRatioMax()
         {
-            get { return IExecuteWithSignatureArray<float>("getRatioMax", "()[F"); }
+            return IExecuteWithSignatureArray<float>("getRatioMax", "()[F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getRatioMin()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#getRatioMin()"/>
         /// </summary>
-        public float[] RatioMin
+        /// <returns><see cref="float"/></returns>
+        public float[] GetRatioMin()
         {
-            get { return IExecuteWithSignatureArray<float>("getRatioMin", "()[F"); }
+            return IExecuteWithSignatureArray<float>("getRatioMin", "()[F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#describeContents()"/>
@@ -124,6 +132,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setDisplayRatioForFullHdr(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetDisplayRatioForFullHdr(float arg0)
+        {
+            IExecuteWithSignature("setDisplayRatioForFullHdr", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setEpsilonHdr(float,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -144,6 +160,14 @@ public void SetEpsilonSdr(float arg0, float arg1, float arg2)
             IExecute("setEpsilonSdr", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setGainmapContents(android.graphics.Bitmap)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
+        public void SetGainmapContents(Android.Graphics.Bitmap arg0)
+        {
+            IExecuteWithSignature("setGainmapContents", "(Landroid/graphics/Bitmap;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setGamma(float,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -154,6 +178,14 @@ public void SetGamma(float arg0, float arg1, float arg2)
             IExecute("setGamma", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setMinDisplayRatioForHdrTransition(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetMinDisplayRatioForHdrTransition(float arg0)
+        {
+            IExecuteWithSignature("setMinDisplayRatioForHdrTransition", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Gainmap.html#setRatioMax(float,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/HardwareBufferRenderer.cs b/src/net/Netdroid/Generated/Android/Graphics/HardwareBufferRenderer.cs
index 7602c1f7d..0641d0d37 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/HardwareBufferRenderer.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/HardwareBufferRenderer.cs
@@ -199,18 +199,20 @@ public partial class RenderResult
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/HardwareBufferRenderer.RenderResult.html#getFence()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/HardwareBufferRenderer.RenderResult.html#getFence()"/>
             /// </summary>
-            public Android.Hardware.SyncFence Fence
+            /// <returns><see cref="Android.Hardware.SyncFence"/></returns>
+            public Android.Hardware.SyncFence GetFence()
             {
-                get { return IExecuteWithSignature<Android.Hardware.SyncFence>("getFence", "()Landroid/hardware/SyncFence;"); }
+                return IExecuteWithSignature<Android.Hardware.SyncFence>("getFence", "()Landroid/hardware/SyncFence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/HardwareBufferRenderer.RenderResult.html#getStatus()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/HardwareBufferRenderer.RenderResult.html#getStatus()"/>
             /// </summary>
-            public int Status
+            /// <returns><see cref="int"/></returns>
+            public int GetStatus()
             {
-                get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+                return IExecuteWithSignature<int>("getStatus", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/ImageDecoder.cs b/src/net/Netdroid/Generated/Android/Graphics/ImageDecoder.cs
index 69997993b..3087e1ab2 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/ImageDecoder.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/ImageDecoder.cs
@@ -211,39 +211,36 @@ public static bool IsMimeTypeSupported(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getAllocator()"/> <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setAllocator(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getOnPartialImageListener()"/>
         /// </summary>
-        public int Allocator
+        /// <returns><see cref="Android.Graphics.ImageDecoder.OnPartialImageListener"/></returns>
+        public Android.Graphics.ImageDecoder.OnPartialImageListener GetOnPartialImageListener()
         {
-            get { return IExecuteWithSignature<int>("getAllocator", "()I"); } set { IExecuteWithSignature("setAllocator", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.ImageDecoder.OnPartialImageListener>("getOnPartialImageListener", "()Landroid/graphics/ImageDecoder$OnPartialImageListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getCrop()"/> <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setCrop(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getOnPartialImageListener()"/>
         /// </summary>
-        public Android.Graphics.Rect Crop
+        /// <returns><see cref="Android.Graphics.ImageDecoder.OnPartialImageListener"/></returns>
+        public Android.Graphics.ImageDecoder.OnPartialImageListener GetOnPartialImageListenerDirect()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getCrop", "()Landroid/graphics/Rect;"); } set { IExecuteWithSignature("setCrop", "(Landroid/graphics/Rect;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.ImageDecoder.OnPartialImageListenerDirect, Android.Graphics.ImageDecoder.OnPartialImageListener>("getOnPartialImageListener", "()Landroid/graphics/ImageDecoder$OnPartialImageListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getOnPartialImageListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getPostProcessor()"/>
         /// </summary>
-        public Android.Graphics.ImageDecoder.OnPartialImageListener GetOnPartialImageListener
+        /// <returns><see cref="Android.Graphics.PostProcessor"/></returns>
+        public Android.Graphics.PostProcessor GetPostProcessor()
         {
-            get { return IExecuteWithSignature<Android.Graphics.ImageDecoder.OnPartialImageListener>("getOnPartialImageListener", "()Landroid/graphics/ImageDecoder$OnPartialImageListener;"); }
+            return IExecuteWithSignature<Android.Graphics.PostProcessor>("getPostProcessor", "()Landroid/graphics/PostProcessor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getMemorySizePolicy()"/> <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setMemorySizePolicy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getCrop()"/>
         /// </summary>
-        public int MemorySizePolicy
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetCrop()
         {
-            get { return IExecuteWithSignature<int>("getMemorySizePolicy", "()I"); } set { IExecuteWithSignature("setMemorySizePolicy", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getPostProcessor()"/> <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setPostProcessor(android.graphics.PostProcessor)"/>
-        /// </summary>
-        public Android.Graphics.PostProcessor PostProcessor
-        {
-            get { return IExecuteWithSignature<Android.Graphics.PostProcessor>("getPostProcessor", "()Landroid/graphics/PostProcessor;"); } set { IExecuteWithSignature("setPostProcessor", "(Landroid/graphics/PostProcessor;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getCrop", "()Landroid/graphics/Rect;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#isDecodeAsAlphaMaskEnabled()"/>
@@ -270,6 +267,22 @@ public bool IsUnpremultipliedRequired()
             return IExecuteWithSignature<bool>("isUnpremultipliedRequired", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getAllocator()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAllocator()
+        {
+            return IExecuteWithSignature<int>("getAllocator", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#getMemorySizePolicy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMemorySizePolicy()
+        {
+            return IExecuteWithSignature<int>("getMemorySizePolicy", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#close()"/>
         /// </summary>
         public void Close()
@@ -277,6 +290,22 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setAllocator(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAllocator(int arg0)
+        {
+            IExecuteWithSignature("setAllocator", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setCrop(android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        public void SetCrop(Android.Graphics.Rect arg0)
+        {
+            IExecuteWithSignature("setCrop", "(Landroid/graphics/Rect;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setDecodeAsAlphaMaskEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -285,6 +314,14 @@ public void SetDecodeAsAlphaMaskEnabled(bool arg0)
             IExecuteWithSignature("setDecodeAsAlphaMaskEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setMemorySizePolicy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMemorySizePolicy(int arg0)
+        {
+            IExecuteWithSignature("setMemorySizePolicy", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setMutableRequired(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -301,6 +338,14 @@ public void SetOnPartialImageListener(Android.Graphics.ImageDecoder.OnPartialIma
             IExecuteWithSignature("setOnPartialImageListener", "(Landroid/graphics/ImageDecoder$OnPartialImageListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setPostProcessor(android.graphics.PostProcessor)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PostProcessor"/></param>
+        public void SetPostProcessor(Android.Graphics.PostProcessor arg0)
+        {
+            IExecuteWithSignature("setPostProcessor", "(Landroid/graphics/PostProcessor;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.html#setTargetColorSpace(android.graphics.ColorSpace)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.ColorSpace"/></param>
@@ -389,25 +434,20 @@ public partial class ImageInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.ImageInfo.html#getColorSpace()"/> 
-            /// </summary>
-            public Android.Graphics.ColorSpace ColorSpace
-            {
-                get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.ImageInfo.html#getMimeType()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.ImageInfo.html#getColorSpace()"/>
             /// </summary>
-            public Java.Lang.String MimeType
+            /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+            public Android.Graphics.ColorSpace GetColorSpace()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.ImageInfo.html#getSize()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.ImageInfo.html#getSize()"/>
             /// </summary>
-            public Android.Util.Size Size
+            /// <returns><see cref="Android.Util.Size"/></returns>
+            public Android.Util.Size GetSize()
             {
-                get { return IExecuteWithSignature<Android.Util.Size>("getSize", "()Landroid/util/Size;"); }
+                return IExecuteWithSignature<Android.Util.Size>("getSize", "()Landroid/util/Size;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.ImageInfo.html#isAnimated()"/>
@@ -417,6 +457,14 @@ public bool IsAnimated()
             {
                 return IExecuteWithSignature<bool>("isAnimated", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.ImageInfo.html#getMimeType()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetMimeType()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
+            }
 
             #endregion
 
@@ -453,7 +501,7 @@ public partial class OnHeaderDecodedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onHeaderDecoded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.ImageDecoder>>>(OnHeaderDecodedEventHandler));
+                AddEventHandler("onHeaderDecoded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.ImageDecoder>>>(OnHeaderDecodedEventHandler));
 
             }
 
@@ -461,7 +509,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.OnHeaderDecodedListener.html#onHeaderDecoded(android.graphics.ImageDecoder,android.graphics.ImageDecoder.ImageInfo,android.graphics.ImageDecoder.Source)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnHeaderDecoded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Graphics.ImageDecoder, Android.Graphics.ImageDecoder.ImageInfo, Android.Graphics.ImageDecoder.Source> OnOnHeaderDecoded { get; set; } = null;
+            public global::System.Action<Android.Graphics.ImageDecoder, Android.Graphics.ImageDecoder.ImageInfo, Android.Graphics.ImageDecoder.Source> OnOnHeaderDecoded { get; set; } = null;
 
             void OnHeaderDecodedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.ImageDecoder>> data)
             {
@@ -556,7 +604,7 @@ public partial class OnPartialImageListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPartialImage", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnPartialImageEventHandler));
+                AddEventHandler("onPartialImage", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnPartialImageEventHandler));
 
             }
 
@@ -564,7 +612,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/graphics/ImageDecoder.OnPartialImageListener.html#onPartialImage(android.graphics.ImageDecoder.DecodeException)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPartialImage"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<MASES.JCOBridge.C2JBridge.JVMBridgeException, bool> OnOnPartialImage { get; set; } = null;
+            public global::System.Func<MASES.JCOBridge.C2JBridge.JVMBridgeException, bool> OnOnPartialImage { get; set; } = null;
 
             void OnPartialImageEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Interpolator.cs b/src/net/Netdroid/Generated/Android/Graphics/Interpolator.cs
index 0738a3840..56534a002 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Interpolator.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Interpolator.cs
@@ -63,20 +63,6 @@ public Interpolator(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Interpolator.html#getKeyFrameCount()"/> 
-        /// </summary>
-        public int KeyFrameCount
-        {
-            get { return IExecuteWithSignature<int>("getKeyFrameCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Interpolator.html#getValueCount()"/> 
-        /// </summary>
-        public int ValueCount
-        {
-            get { return IExecuteWithSignature<int>("getValueCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Interpolator.html#timeToValues(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -96,6 +82,22 @@ public Android.Graphics.Interpolator.Result TimeToValues(int arg0, float[] arg1)
             return IExecute<Android.Graphics.Interpolator.Result>("timeToValues", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Interpolator.html#getKeyFrameCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetKeyFrameCount()
+        {
+            return IExecuteWithSignature<int>("getKeyFrameCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Interpolator.html#getValueCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetValueCount()
+        {
+            return IExecuteWithSignature<int>("getValueCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Interpolator.html#reset(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/LightingColorFilter.cs b/src/net/Netdroid/Generated/Android/Graphics/LightingColorFilter.cs
index af118e1b4..7d0ff4bb9 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/LightingColorFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/LightingColorFilter.cs
@@ -55,18 +55,20 @@ public LightingColorFilter(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/LightingColorFilter.html#getColorAdd()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/LightingColorFilter.html#getColorAdd()"/>
         /// </summary>
-        public int ColorAdd
+        /// <returns><see cref="int"/></returns>
+        public int GetColorAdd()
         {
-            get { return IExecuteWithSignature<int>("getColorAdd", "()I"); }
+            return IExecuteWithSignature<int>("getColorAdd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/LightingColorFilter.html#getColorMultiply()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/LightingColorFilter.html#getColorMultiply()"/>
         /// </summary>
-        public int ColorMultiply
+        /// <returns><see cref="int"/></returns>
+        public int GetColorMultiply()
         {
-            get { return IExecuteWithSignature<int>("getColorMultiply", "()I"); }
+            return IExecuteWithSignature<int>("getColorMultiply", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/MeshSpecification.cs b/src/net/Netdroid/Generated/Android/Graphics/MeshSpecification.cs
index 8be69d2d5..c6cb3137a 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/MeshSpecification.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/MeshSpecification.cs
@@ -176,25 +176,28 @@ public Attribute(int arg0, int arg1, Java.Lang.String arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Attribute.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Attribute.html#getOffset()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="int"/></returns>
+            public int GetOffset()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getOffset", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Attribute.html#getOffset()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Attribute.html#getType()"/>
             /// </summary>
-            public int Offset
+            /// <returns><see cref="int"/></returns>
+            public int GetType()
             {
-                get { return IExecuteWithSignature<int>("getOffset", "()I"); }
+                return IExecuteWithSignature<int>("getType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Attribute.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Attribute.html#getName()"/>
             /// </summary>
-            public int Type
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<int>("getType", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -237,18 +240,20 @@ public Varying(int arg0, Java.Lang.String arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Varying.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Varying.html#getType()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="int"/></returns>
+            public int GetType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Varying.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/MeshSpecification.Varying.html#getName()"/>
             /// </summary>
-            public int Type
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<int>("getType", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Movie.cs b/src/net/Netdroid/Generated/Android/Graphics/Movie.cs
index 51a135eb8..c0f86f059 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Movie.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Movie.cs
@@ -46,7 +46,7 @@ public partial class Movie
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Graphics.Movie"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.Movie DecodeFile(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Android.Graphics.Movie>(LocalBridgeClazz, "decodeFile", "(Ljava/lang/String;)Landroid/graphics/Movie;", arg0);
@@ -56,7 +56,7 @@ public static Android.Graphics.Movie DecodeFile(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Android.Graphics.Movie"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.Movie DecodeStream(Java.Io.InputStream arg0)
         {
             return SExecuteWithSignature<Android.Graphics.Movie>(LocalBridgeClazz, "decodeStream", "(Ljava/io/InputStream;)Landroid/graphics/Movie;", arg0);
@@ -68,7 +68,7 @@ public static Android.Graphics.Movie DecodeStream(Java.Io.InputStream arg0)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Android.Graphics.Movie"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.Movie DecodeByteArray(byte[] arg0, int arg1, int arg2)
         {
             return SExecute<Android.Graphics.Movie>(LocalBridgeClazz, "decodeByteArray", arg0, arg1, arg2);
@@ -81,7 +81,7 @@ public static Android.Graphics.Movie DecodeByteArray(byte[] arg0, int arg1, int
         /// <see href="https://developer.android.com/reference/android/graphics/Movie.html#isOpaque()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsOpaque()
         {
             return IExecuteWithSignature<bool>("isOpaque", "()Z");
@@ -91,7 +91,7 @@ public bool IsOpaque()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetTime(int arg0)
         {
             return IExecuteWithSignature<bool>("setTime", "(I)Z", arg0);
@@ -100,7 +100,7 @@ public bool SetTime(int arg0)
         /// <see href="https://developer.android.com/reference/android/graphics/Movie.html#duration()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int Duration()
         {
             return IExecuteWithSignature<int>("duration", "()I");
@@ -109,7 +109,7 @@ public int Duration()
         /// <see href="https://developer.android.com/reference/android/graphics/Movie.html#height()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int Height()
         {
             return IExecuteWithSignature<int>("height", "()I");
@@ -118,7 +118,7 @@ public int Height()
         /// <see href="https://developer.android.com/reference/android/graphics/Movie.html#width()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int Width()
         {
             return IExecuteWithSignature<int>("width", "()I");
@@ -130,7 +130,7 @@ public int Width()
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="Android.Graphics.Paint"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Draw(Android.Graphics.Canvas arg0, float arg1, float arg2, Android.Graphics.Paint arg3)
         {
             IExecute("draw", arg0, arg1, arg2, arg3);
@@ -141,7 +141,7 @@ public void Draw(Android.Graphics.Canvas arg0, float arg1, float arg2, Android.G
         /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Draw(Android.Graphics.Canvas arg0, float arg1, float arg2)
         {
             IExecute("draw", arg0, arg1, arg2);
diff --git a/src/net/Netdroid/Generated/Android/Graphics/NinePatch.cs b/src/net/Netdroid/Generated/Android/Graphics/NinePatch.cs
index da8f89447..aa9c0e567 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/NinePatch.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/NinePatch.cs
@@ -74,63 +74,69 @@ public static bool IsNinePatchChunk(byte[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getBitmap()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getBitmap()"/>
         /// </summary>
-        public Android.Graphics.Bitmap Bitmap
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetBitmap()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;"); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getDensity()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getPaint()"/>
         /// </summary>
-        public int Density
+        /// <returns><see cref="Android.Graphics.Paint"/></returns>
+        public Android.Graphics.Paint GetPaint()
         {
-            get { return IExecuteWithSignature<int>("getDensity", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "()Landroid/graphics/Paint;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getTransparentRegion(android.graphics.Rect)"/>
         /// </summary>
-        public int Height
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        /// <returns><see cref="Android.Graphics.Region"/></returns>
+        public Android.Graphics.Region GetTransparentRegion(Android.Graphics.Rect arg0)
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Region>("getTransparentRegion", "(Landroid/graphics/Rect;)Landroid/graphics/Region;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#hasAlpha()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool HasAlpha()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("hasAlpha", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getPaint()"/> <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#setPaint(android.graphics.Paint)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getDensity()"/>
         /// </summary>
-        public Android.Graphics.Paint Paint
+        /// <returns><see cref="int"/></returns>
+        public int GetDensity()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "()Landroid/graphics/Paint;"); } set { IExecuteWithSignature("setPaint", "(Landroid/graphics/Paint;)V", value); }
+            return IExecuteWithSignature<int>("getDensity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getHeight()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getTransparentRegion(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getWidth()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        /// <returns><see cref="Android.Graphics.Region"/></returns>
-        public Android.Graphics.Region GetTransparentRegion(Android.Graphics.Rect arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            return IExecuteWithSignature<Android.Graphics.Region>("getTransparentRegion", "(Landroid/graphics/Rect;)Landroid/graphics/Region;", arg0);
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#hasAlpha()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasAlpha()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("hasAlpha", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#draw(android.graphics.Canvas,android.graphics.Rect,android.graphics.Paint)"/>
@@ -160,6 +166,14 @@ public void Draw(Android.Graphics.Canvas arg0, Android.Graphics.RectF arg1)
         {
             IExecute("draw", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/NinePatch.html#setPaint(android.graphics.Paint)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Paint"/></param>
+        public void SetPaint(Android.Graphics.Paint arg0)
+        {
+            IExecuteWithSignature("setPaint", "(Landroid/graphics/Paint;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Outline.cs b/src/net/Netdroid/Generated/Android/Graphics/Outline.cs
index 8eff3f4f1..a4dde9362 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Outline.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Outline.cs
@@ -54,20 +54,6 @@ public Outline(Android.Graphics.Outline arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Outline.html#getAlpha()"/> <see href="https://developer.android.com/reference/android/graphics/Outline.html#setAlpha(float)"/>
-        /// </summary>
-        public float Alpha
-        {
-            get { return IExecuteWithSignature<float>("getAlpha", "()F"); } set { IExecuteWithSignature("setAlpha", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Outline.html#getRadius()"/> 
-        /// </summary>
-        public float Radius
-        {
-            get { return IExecuteWithSignature<float>("getRadius", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Outline.html#canClip()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -93,6 +79,22 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Outline.html#getAlpha()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetAlpha()
+        {
+            return IExecuteWithSignature<float>("getAlpha", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Outline.html#getRadius()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetRadius()
+        {
+            return IExecuteWithSignature<float>("getRadius", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Outline.html#offset(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -110,10 +112,18 @@ public void Set(Android.Graphics.Outline arg0)
             IExecuteWithSignature("set", "(Landroid/graphics/Outline;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Outline.html#setAlpha(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetAlpha(float arg0)
+        {
+            IExecuteWithSignature("setAlpha", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Outline.html#setConvexPath(android.graphics.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Path"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetConvexPath(Android.Graphics.Path arg0)
         {
             IExecuteWithSignature("setConvexPath", "(Landroid/graphics/Path;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Paint.cs b/src/net/Netdroid/Generated/Android/Graphics/Paint.cs
index b3c045be7..8467dd810 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Paint.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Paint.cs
@@ -224,311 +224,102 @@ public Paint(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getAlpha()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setAlpha(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getBlendMode()"/>
         /// </summary>
-        public int Alpha
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetBlendMode()
         {
-            get { return IExecuteWithSignature<int>("getAlpha", "()I"); } set { IExecuteWithSignature("setAlpha", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getBlendMode()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getColorFilter()"/>
         /// </summary>
-        public Android.Graphics.BlendMode BlendMode
-        {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getColor()"/> 
-        /// </summary>
-        public int Color
-        {
-            get { return IExecuteWithSignature<int>("getColor", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getColorFilter()"/> 
-        /// </summary>
-        public Android.Graphics.ColorFilter ColorFilter
-        {
-            get { return IExecuteWithSignature<Android.Graphics.ColorFilter>("getColorFilter", "()Landroid/graphics/ColorFilter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getColorLong()"/> 
-        /// </summary>
-        public long ColorLong
-        {
-            get { return IExecuteWithSignature<long>("getColorLong", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getEndHyphenEdit()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setEndHyphenEdit(int)"/>
-        /// </summary>
-        public int EndHyphenEdit
-        {
-            get { return IExecuteWithSignature<int>("getEndHyphenEdit", "()I"); } set { IExecuteWithSignature("setEndHyphenEdit", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFlags()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setFlags(int)"/>
-        /// </summary>
-        public int Flags
-        {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); } set { IExecuteWithSignature("setFlags", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontFeatureSettings()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setFontFeatureSettings(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String FontFeatureSettings
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFontFeatureSettings", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFontFeatureSettings", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontSpacing()"/> 
-        /// </summary>
-        public float FontSpacing
-        {
-            get { return IExecuteWithSignature<float>("getFontSpacing", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontVariationSettings()"/> 
-        /// </summary>
-        public Java.Lang.String FontVariationSettings
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFontVariationSettings", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStyle()"/> 
-        /// </summary>
-        public Android.Graphics.Paint.Style GetStyle
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Paint.Style>("getStyle", "()Landroid/graphics/Paint$Style;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getHinting()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setHinting(int)"/>
-        /// </summary>
-        public int Hinting
-        {
-            get { return IExecuteWithSignature<int>("getHinting", "()I"); } set { IExecuteWithSignature("setHinting", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getLetterSpacing()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setLetterSpacing(float)"/>
-        /// </summary>
-        public float LetterSpacing
-        {
-            get { return IExecuteWithSignature<float>("getLetterSpacing", "()F"); } set { IExecuteWithSignature("setLetterSpacing", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getMaskFilter()"/> 
-        /// </summary>
-        public Android.Graphics.MaskFilter MaskFilter
-        {
-            get { return IExecuteWithSignature<Android.Graphics.MaskFilter>("getMaskFilter", "()Landroid/graphics/MaskFilter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getPathEffect()"/> 
-        /// </summary>
-        public Android.Graphics.PathEffect PathEffect
-        {
-            get { return IExecuteWithSignature<Android.Graphics.PathEffect>("getPathEffect", "()Landroid/graphics/PathEffect;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShader()"/> 
-        /// </summary>
-        public Android.Graphics.Shader Shader
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Shader>("getShader", "()Landroid/graphics/Shader;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerColor()"/> 
-        /// </summary>
-        public int ShadowLayerColor
-        {
-            get { return IExecuteWithSignature<int>("getShadowLayerColor", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerColorLong()"/> 
-        /// </summary>
-        public long ShadowLayerColorLong
-        {
-            get { return IExecuteWithSignature<long>("getShadowLayerColorLong", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerDx()"/> 
-        /// </summary>
-        public float ShadowLayerDx
-        {
-            get { return IExecuteWithSignature<float>("getShadowLayerDx", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerDy()"/> 
-        /// </summary>
-        public float ShadowLayerDy
-        {
-            get { return IExecuteWithSignature<float>("getShadowLayerDy", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerRadius()"/> 
-        /// </summary>
-        public float ShadowLayerRadius
-        {
-            get { return IExecuteWithSignature<float>("getShadowLayerRadius", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStartHyphenEdit()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStartHyphenEdit(int)"/>
-        /// </summary>
-        public int StartHyphenEdit
-        {
-            get { return IExecuteWithSignature<int>("getStartHyphenEdit", "()I"); } set { IExecuteWithSignature("setStartHyphenEdit", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrikeThruPosition()"/> 
-        /// </summary>
-        public float StrikeThruPosition
-        {
-            get { return IExecuteWithSignature<float>("getStrikeThruPosition", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrikeThruThickness()"/> 
-        /// </summary>
-        public float StrikeThruThickness
-        {
-            get { return IExecuteWithSignature<float>("getStrikeThruThickness", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrokeCap()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrokeCap(android.graphics.Paint.Cap)"/>
-        /// </summary>
-        public Android.Graphics.Paint.Cap StrokeCap
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Paint.Cap>("getStrokeCap", "()Landroid/graphics/Paint$Cap;"); } set { IExecuteWithSignature("setStrokeCap", "(Landroid/graphics/Paint$Cap;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrokeJoin()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrokeJoin(android.graphics.Paint.Join)"/>
-        /// </summary>
-        public Android.Graphics.Paint.Join StrokeJoin
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Paint.Join>("getStrokeJoin", "()Landroid/graphics/Paint$Join;"); } set { IExecuteWithSignature("setStrokeJoin", "(Landroid/graphics/Paint$Join;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrokeMiter()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrokeMiter(float)"/>
-        /// </summary>
-        public float StrokeMiter
-        {
-            get { return IExecuteWithSignature<float>("getStrokeMiter", "()F"); } set { IExecuteWithSignature("setStrokeMiter", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrokeWidth()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrokeWidth(float)"/>
-        /// </summary>
-        public float StrokeWidth
-        {
-            get { return IExecuteWithSignature<float>("getStrokeWidth", "()F"); } set { IExecuteWithSignature("setStrokeWidth", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextAlign()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextAlign(android.graphics.Paint.Align)"/>
-        /// </summary>
-        public Android.Graphics.Paint.Align TextAlign
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Paint.Align>("getTextAlign", "()Landroid/graphics/Paint$Align;"); } set { IExecuteWithSignature("setTextAlign", "(Landroid/graphics/Paint$Align;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextLocale()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextLocale(java.util.Locale)"/>
-        /// </summary>
-        public Java.Util.Locale TextLocale
-        {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getTextLocale", "()Ljava/util/Locale;"); } set { IExecuteWithSignature("setTextLocale", "(Ljava/util/Locale;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextLocales()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextLocales(android.os.LocaleList)"/>
-        /// </summary>
-        public Android.Os.LocaleList TextLocales
-        {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getTextLocales", "()Landroid/os/LocaleList;"); } set { IExecuteWithSignature("setTextLocales", "(Landroid/os/LocaleList;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextScaleX()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextScaleX(float)"/>
-        /// </summary>
-        public float TextScaleX
-        {
-            get { return IExecuteWithSignature<float>("getTextScaleX", "()F"); } set { IExecuteWithSignature("setTextScaleX", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextSize()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextSize(float)"/>
-        /// </summary>
-        public float TextSize
+        /// <returns><see cref="Android.Graphics.ColorFilter"/></returns>
+        public Android.Graphics.ColorFilter GetColorFilter()
         {
-            get { return IExecuteWithSignature<float>("getTextSize", "()F"); } set { IExecuteWithSignature("setTextSize", "(F)V", value); }
+            return IExecuteWithSignature<Android.Graphics.ColorFilter>("getColorFilter", "()Landroid/graphics/ColorFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextSkewX()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextSkewX(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setColorFilter(android.graphics.ColorFilter)"/>
         /// </summary>
-        public float TextSkewX
+        /// <param name="arg0"><see cref="Android.Graphics.ColorFilter"/></param>
+        /// <returns><see cref="Android.Graphics.ColorFilter"/></returns>
+        public Android.Graphics.ColorFilter SetColorFilter(Android.Graphics.ColorFilter arg0)
         {
-            get { return IExecuteWithSignature<float>("getTextSkewX", "()F"); } set { IExecuteWithSignature("setTextSkewX", "(F)V", value); }
+            return IExecuteWithSignature<Android.Graphics.ColorFilter>("setColorFilter", "(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTypeface()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getMaskFilter()"/>
         /// </summary>
-        public Android.Graphics.Typeface Typeface
+        /// <returns><see cref="Android.Graphics.MaskFilter"/></returns>
+        public Android.Graphics.MaskFilter GetMaskFilter()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;"); }
+            return IExecuteWithSignature<Android.Graphics.MaskFilter>("getMaskFilter", "()Landroid/graphics/MaskFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getUnderlinePosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setMaskFilter(android.graphics.MaskFilter)"/>
         /// </summary>
-        public float UnderlinePosition
+        /// <param name="arg0"><see cref="Android.Graphics.MaskFilter"/></param>
+        /// <returns><see cref="Android.Graphics.MaskFilter"/></returns>
+        public Android.Graphics.MaskFilter SetMaskFilter(Android.Graphics.MaskFilter arg0)
         {
-            get { return IExecuteWithSignature<float>("getUnderlinePosition", "()F"); }
+            return IExecuteWithSignature<Android.Graphics.MaskFilter>("setMaskFilter", "(Landroid/graphics/MaskFilter;)Landroid/graphics/MaskFilter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getUnderlineThickness()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextAlign()"/>
         /// </summary>
-        public float UnderlineThickness
+        /// <returns><see cref="Android.Graphics.Paint.Align"/></returns>
+        public Android.Graphics.Paint.Align GetTextAlign()
         {
-            get { return IExecuteWithSignature<float>("getUnderlineThickness", "()F"); }
+            return IExecuteWithSignature<Android.Graphics.Paint.Align>("getTextAlign", "()Landroid/graphics/Paint$Align;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getWordSpacing()"/> <see href="https://developer.android.com/reference/android/graphics/Paint.html#setWordSpacing(float)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrokeCap()"/>
         /// </summary>
-        public float WordSpacing
+        /// <returns><see cref="Android.Graphics.Paint.Cap"/></returns>
+        public Android.Graphics.Paint.Cap GetStrokeCap()
         {
-            get { return IExecuteWithSignature<float>("getWordSpacing", "()F"); } set { IExecuteWithSignature("setWordSpacing", "(F)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Paint.Cap>("getStrokeCap", "()Landroid/graphics/Paint$Cap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getXfermode()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontMetrics()"/>
         /// </summary>
-        public Android.Graphics.Xfermode Xfermode
+        /// <returns><see cref="Android.Graphics.Paint.FontMetrics"/></returns>
+        public Android.Graphics.Paint.FontMetrics GetFontMetrics()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Xfermode>("getXfermode", "()Landroid/graphics/Xfermode;"); }
+            return IExecuteWithSignature<Android.Graphics.Paint.FontMetrics>("getFontMetrics", "()Landroid/graphics/Paint$FontMetrics;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setColorFilter(android.graphics.ColorFilter)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontMetricsInt()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.ColorFilter"/></param>
-        /// <returns><see cref="Android.Graphics.ColorFilter"/></returns>
-        public Android.Graphics.ColorFilter SetColorFilter(Android.Graphics.ColorFilter arg0)
+        /// <returns><see cref="Android.Graphics.Paint.FontMetricsInt"/></returns>
+        public Android.Graphics.Paint.FontMetricsInt GetFontMetricsInt()
         {
-            return IExecuteWithSignature<Android.Graphics.ColorFilter>("setColorFilter", "(Landroid/graphics/ColorFilter;)Landroid/graphics/ColorFilter;", arg0);
+            return IExecuteWithSignature<Android.Graphics.Paint.FontMetricsInt>("getFontMetricsInt", "()Landroid/graphics/Paint$FontMetricsInt;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setMaskFilter(android.graphics.MaskFilter)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrokeJoin()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.MaskFilter"/></param>
-        /// <returns><see cref="Android.Graphics.MaskFilter"/></returns>
-        public Android.Graphics.MaskFilter SetMaskFilter(Android.Graphics.MaskFilter arg0)
+        /// <returns><see cref="Android.Graphics.Paint.Join"/></returns>
+        public Android.Graphics.Paint.Join GetStrokeJoin()
         {
-            return IExecuteWithSignature<Android.Graphics.MaskFilter>("setMaskFilter", "(Landroid/graphics/MaskFilter;)Landroid/graphics/MaskFilter;", arg0);
+            return IExecuteWithSignature<Android.Graphics.Paint.Join>("getStrokeJoin", "()Landroid/graphics/Paint$Join;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontMetrics()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStyle()"/>
         /// </summary>
-        /// <returns><see cref="Android.Graphics.Paint.FontMetrics"/></returns>
-        public Android.Graphics.Paint.FontMetrics GetFontMetrics()
+        /// <returns><see cref="Android.Graphics.Paint.Style"/></returns>
+        public Android.Graphics.Paint.Style GetStyle()
         {
-            return IExecuteWithSignature<Android.Graphics.Paint.FontMetrics>("getFontMetrics", "()Landroid/graphics/Paint$FontMetrics;");
+            return IExecuteWithSignature<Android.Graphics.Paint.Style>("getStyle", "()Landroid/graphics/Paint$Style;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontMetricsInt()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getPathEffect()"/>
         /// </summary>
-        /// <returns><see cref="Android.Graphics.Paint.FontMetricsInt"/></returns>
-        public Android.Graphics.Paint.FontMetricsInt GetFontMetricsInt()
+        /// <returns><see cref="Android.Graphics.PathEffect"/></returns>
+        public Android.Graphics.PathEffect GetPathEffect()
         {
-            return IExecuteWithSignature<Android.Graphics.Paint.FontMetricsInt>("getFontMetricsInt", "()Landroid/graphics/Paint$FontMetricsInt;");
+            return IExecuteWithSignature<Android.Graphics.PathEffect>("getPathEffect", "()Landroid/graphics/PathEffect;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setPathEffect(android.graphics.PathEffect)"/>
@@ -540,6 +331,14 @@ public Android.Graphics.PathEffect SetPathEffect(Android.Graphics.PathEffect arg
             return IExecuteWithSignature<Android.Graphics.PathEffect>("setPathEffect", "(Landroid/graphics/PathEffect;)Landroid/graphics/PathEffect;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShader()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Shader"/></returns>
+        public Android.Graphics.Shader GetShader()
+        {
+            return IExecuteWithSignature<Android.Graphics.Shader>("getShader", "()Landroid/graphics/Shader;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setShader(android.graphics.Shader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Shader"/></param>
@@ -549,6 +348,14 @@ public Android.Graphics.Shader SetShader(Android.Graphics.Shader arg0)
             return IExecuteWithSignature<Android.Graphics.Shader>("setShader", "(Landroid/graphics/Shader;)Landroid/graphics/Shader;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTypeface()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Typeface"/></returns>
+        public Android.Graphics.Typeface GetTypeface()
+        {
+            return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTypeface(android.graphics.Typeface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Typeface"/></param>
@@ -558,6 +365,14 @@ public Android.Graphics.Typeface SetTypeface(Android.Graphics.Typeface arg0)
             return IExecuteWithSignature<Android.Graphics.Typeface>("setTypeface", "(Landroid/graphics/Typeface;)Landroid/graphics/Typeface;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getXfermode()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Xfermode"/></returns>
+        public Android.Graphics.Xfermode GetXfermode()
+        {
+            return IExecuteWithSignature<Android.Graphics.Xfermode>("getXfermode", "()Landroid/graphics/Xfermode;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setXfermode(android.graphics.Xfermode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Xfermode"/></param>
@@ -567,6 +382,14 @@ public Android.Graphics.Xfermode SetXfermode(Android.Graphics.Xfermode arg0)
             return IExecuteWithSignature<Android.Graphics.Xfermode>("setXfermode", "(Landroid/graphics/Xfermode;)Landroid/graphics/Xfermode;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetTextLocales()
+        {
+            return IExecuteWithSignature<Android.Os.LocaleList>("getTextLocales", "()Landroid/os/LocaleList;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#equalsForTextMeasurement(android.graphics.Paint)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Paint"/></param>
@@ -701,6 +524,22 @@ public float GetFontMetrics(Android.Graphics.Paint.FontMetrics arg0)
             return IExecuteWithSignature<float>("getFontMetrics", "(Landroid/graphics/Paint$FontMetrics;)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontSpacing()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetFontSpacing()
+        {
+            return IExecuteWithSignature<float>("getFontSpacing", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getLetterSpacing()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetLetterSpacing()
+        {
+            return IExecuteWithSignature<float>("getLetterSpacing", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getRunAdvance(char[],int,int,int,int,boolean,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -765,6 +604,62 @@ public float GetRunCharacterAdvance(Java.Lang.CharSequence arg0, int arg1, int a
             return IExecute<float>("getRunCharacterAdvance", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerDx()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowLayerDx()
+        {
+            return IExecuteWithSignature<float>("getShadowLayerDx", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerDy()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowLayerDy()
+        {
+            return IExecuteWithSignature<float>("getShadowLayerDy", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerRadius()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowLayerRadius()
+        {
+            return IExecuteWithSignature<float>("getShadowLayerRadius", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrikeThruPosition()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetStrikeThruPosition()
+        {
+            return IExecuteWithSignature<float>("getStrikeThruPosition", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrikeThruThickness()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetStrikeThruThickness()
+        {
+            return IExecuteWithSignature<float>("getStrikeThruThickness", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrokeMiter()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetStrokeMiter()
+        {
+            return IExecuteWithSignature<float>("getStrokeMiter", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStrokeWidth()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetStrokeWidth()
+        {
+            return IExecuteWithSignature<float>("getStrokeWidth", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextRunAdvances(char[],int,int,int,int,boolean,float[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -781,6 +676,54 @@ public float GetTextRunAdvances(char[] arg0, int arg1, int arg2, int arg3, int a
             return IExecute<float>("getTextRunAdvances", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextScaleX()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTextScaleX()
+        {
+            return IExecuteWithSignature<float>("getTextScaleX", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextSize()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTextSize()
+        {
+            return IExecuteWithSignature<float>("getTextSize", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextSkewX()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTextSkewX()
+        {
+            return IExecuteWithSignature<float>("getTextSkewX", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getUnderlinePosition()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetUnderlinePosition()
+        {
+            return IExecuteWithSignature<float>("getUnderlinePosition", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getUnderlineThickness()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetUnderlineThickness()
+        {
+            return IExecuteWithSignature<float>("getUnderlineThickness", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getWordSpacing()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetWordSpacing()
+        {
+            return IExecuteWithSignature<float>("getWordSpacing", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#measureText(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -862,6 +805,38 @@ public int BreakText(Java.Lang.String arg0, bool arg1, float arg2, float[] arg3)
             return IExecute<int>("breakText", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getAlpha()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAlpha()
+        {
+            return IExecuteWithSignature<int>("getAlpha", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColor()
+        {
+            return IExecuteWithSignature<int>("getColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getEndHyphenEdit()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetEndHyphenEdit()
+        {
+            return IExecuteWithSignature<int>("getEndHyphenEdit", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFlags()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
+        {
+            return IExecuteWithSignature<int>("getFlags", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontMetricsInt(android.graphics.Paint.FontMetricsInt)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Paint.FontMetricsInt"/></param>
@@ -871,6 +846,14 @@ public int GetFontMetricsInt(Android.Graphics.Paint.FontMetricsInt arg0)
             return IExecuteWithSignature<int>("getFontMetricsInt", "(Landroid/graphics/Paint$FontMetricsInt;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getHinting()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHinting()
+        {
+            return IExecuteWithSignature<int>("getHinting", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getOffsetForAdvance(char[],int,int,int,int,boolean,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -901,6 +884,22 @@ public int GetOffsetForAdvance(Java.Lang.CharSequence arg0, int arg1, int arg2,
             return IExecute<int>("getOffsetForAdvance", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetShadowLayerColor()
+        {
+            return IExecuteWithSignature<int>("getShadowLayerColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getStartHyphenEdit()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStartHyphenEdit()
+        {
+            return IExecuteWithSignature<int>("getStartHyphenEdit", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextRunCursor(char[],int,int,boolean,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -975,6 +974,46 @@ public int GetTextWidths(Java.Lang.String arg0, int arg1, int arg2, float[] arg3
             return IExecute<int>("getTextWidths", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontFeatureSettings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFontFeatureSettings()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getFontFeatureSettings", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getFontVariationSettings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFontVariationSettings()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getFontVariationSettings", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getTextLocale()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetTextLocale()
+        {
+            return IExecuteWithSignature<Java.Util.Locale>("getTextLocale", "()Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getColorLong()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetColorLong()
+        {
+            return IExecuteWithSignature<long>("getColorLong", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#getShadowLayerColorLong()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetShadowLayerColorLong()
+        {
+            return IExecuteWithSignature<long>("getShadowLayerColorLong", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#clearShadowLayer()"/>
         /// </summary>
         public void ClearShadowLayer()
@@ -1084,6 +1123,14 @@ public void Set(Android.Graphics.Paint arg0)
             IExecuteWithSignature("set", "(Landroid/graphics/Paint;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setAlpha(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAlpha(int arg0)
+        {
+            IExecuteWithSignature("setAlpha", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setAntiAlias(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1103,6 +1150,14 @@ public void SetARGB(int arg0, int arg1, int arg2, int arg3)
             IExecute("setARGB", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setColor(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1135,6 +1190,14 @@ public void SetElegantTextHeight(bool arg0)
             IExecuteWithSignature("setElegantTextHeight", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setEndHyphenEdit(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetEndHyphenEdit(int arg0)
+        {
+            IExecuteWithSignature("setEndHyphenEdit", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setFakeBoldText(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1151,6 +1214,38 @@ public void SetFilterBitmap(bool arg0)
             IExecuteWithSignature("setFilterBitmap", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setFlags(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFlags(int arg0)
+        {
+            IExecuteWithSignature("setFlags", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setFontFeatureSettings(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFontFeatureSettings(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFontFeatureSettings", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setHinting(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHinting(int arg0)
+        {
+            IExecuteWithSignature("setHinting", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setLetterSpacing(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetLetterSpacing(float arg0)
+        {
+            IExecuteWithSignature("setLetterSpacing", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setLinearText(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1181,6 +1276,14 @@ public void SetShadowLayer(float arg0, float arg1, float arg2, long arg3)
             IExecute("setShadowLayer", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStartHyphenEdit(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetStartHyphenEdit(int arg0)
+        {
+            IExecuteWithSignature("setStartHyphenEdit", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrikeThruText(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1189,6 +1292,38 @@ public void SetStrikeThruText(bool arg0)
             IExecuteWithSignature("setStrikeThruText", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrokeCap(android.graphics.Paint.Cap)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Paint.Cap"/></param>
+        public void SetStrokeCap(Android.Graphics.Paint.Cap arg0)
+        {
+            IExecuteWithSignature("setStrokeCap", "(Landroid/graphics/Paint$Cap;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrokeJoin(android.graphics.Paint.Join)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Paint.Join"/></param>
+        public void SetStrokeJoin(Android.Graphics.Paint.Join arg0)
+        {
+            IExecuteWithSignature("setStrokeJoin", "(Landroid/graphics/Paint$Join;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrokeMiter(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetStrokeMiter(float arg0)
+        {
+            IExecuteWithSignature("setStrokeMiter", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStrokeWidth(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetStrokeWidth(float arg0)
+        {
+            IExecuteWithSignature("setStrokeWidth", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setStyle(android.graphics.Paint.Style)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Paint.Style"/></param>
@@ -1205,6 +1340,54 @@ public void SetSubpixelText(bool arg0)
             IExecuteWithSignature("setSubpixelText", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextAlign(android.graphics.Paint.Align)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Paint.Align"/></param>
+        public void SetTextAlign(Android.Graphics.Paint.Align arg0)
+        {
+            IExecuteWithSignature("setTextAlign", "(Landroid/graphics/Paint$Align;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextLocale(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public void SetTextLocale(Java.Util.Locale arg0)
+        {
+            IExecuteWithSignature("setTextLocale", "(Ljava/util/Locale;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextLocales(android.os.LocaleList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.LocaleList"/></param>
+        public void SetTextLocales(Android.Os.LocaleList arg0)
+        {
+            IExecuteWithSignature("setTextLocales", "(Landroid/os/LocaleList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextScaleX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTextScaleX(float arg0)
+        {
+            IExecuteWithSignature("setTextScaleX", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextSize(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTextSize(float arg0)
+        {
+            IExecuteWithSignature("setTextSize", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setTextSkewX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTextSkewX(float arg0)
+        {
+            IExecuteWithSignature("setTextSkewX", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setUnderlineText(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1212,6 +1395,14 @@ public void SetUnderlineText(bool arg0)
         {
             IExecuteWithSignature("setUnderlineText", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Paint.html#setWordSpacing(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetWordSpacing(float arg0)
+        {
+            IExecuteWithSignature("setWordSpacing", "(F)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/ParcelableColorSpace.cs b/src/net/Netdroid/Generated/Android/Graphics/ParcelableColorSpace.cs
index d24fa125f..c88a948ba 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/ParcelableColorSpace.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/ParcelableColorSpace.cs
@@ -69,11 +69,12 @@ public static bool IsParcelable(Android.Graphics.ColorSpace arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/ParcelableColorSpace.html#getColorSpace()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/ParcelableColorSpace.html#getColorSpace()"/>
         /// </summary>
-        public Android.Graphics.ColorSpace ColorSpace
+        /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+        public Android.Graphics.ColorSpace GetColorSpace()
         {
-            get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;"); }
+            return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/ParcelableColorSpace.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Path.cs b/src/net/Netdroid/Generated/Android/Graphics/Path.cs
index 2b8c9ae96..bffd1fd5c 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Path.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Path.cs
@@ -54,25 +54,20 @@ public Path(Android.Graphics.Path arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Path.html#getGenerationId()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Path.html#getFillType()"/>
         /// </summary>
-        public int GenerationId
+        /// <returns><see cref="Android.Graphics.Path.FillType"/></returns>
+        public Android.Graphics.Path.FillType GetFillType()
         {
-            get { return IExecuteWithSignature<int>("getGenerationId", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Path.FillType>("getFillType", "()Landroid/graphics/Path$FillType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Path.html#getFillType()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Path.html#getPathIterator()"/>
         /// </summary>
-        public Android.Graphics.Path.FillType GetFillType
+        /// <returns><see cref="Android.Graphics.PathIterator"/></returns>
+        public Android.Graphics.PathIterator GetPathIterator()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Path.FillType>("getFillType", "()Landroid/graphics/Path$FillType;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Path.html#getPathIterator()"/> 
-        /// </summary>
-        public Android.Graphics.PathIterator PathIterator
-        {
-            get { return IExecuteWithSignature<Android.Graphics.PathIterator>("getPathIterator", "()Landroid/graphics/PathIterator;"); }
+            return IExecuteWithSignature<Android.Graphics.PathIterator>("getPathIterator", "()Landroid/graphics/PathIterator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Path.html#interpolate(android.graphics.Path,float,android.graphics.Path)"/>
@@ -89,7 +84,7 @@ public bool Interpolate(Android.Graphics.Path arg0, float arg1, Android.Graphics
         /// <see href="https://developer.android.com/reference/android/graphics/Path.html#isConvex()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsConvex()
         {
             return IExecuteWithSignature<bool>("isConvex", "()Z");
@@ -159,6 +154,14 @@ public float[] Approximate(float arg0)
             return IExecuteWithSignatureArray<float>("approximate", "(F)[F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Path.html#getGenerationId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGenerationId()
+        {
+            return IExecuteWithSignature<int>("getGenerationId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Path.html#addArc(android.graphics.RectF,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.RectF"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/PathIterator.cs b/src/net/Netdroid/Generated/Android/Graphics/PathIterator.cs
index e3cd732f4..61dbf4a57 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/PathIterator.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/PathIterator.cs
@@ -146,25 +146,28 @@ public partial class Segment
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/PathIterator.Segment.html#getConicWeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/PathIterator.Segment.html#getConicWeight()"/>
             /// </summary>
-            public float ConicWeight
+            /// <returns><see cref="float"/></returns>
+            public float GetConicWeight()
             {
-                get { return IExecuteWithSignature<float>("getConicWeight", "()F"); }
+                return IExecuteWithSignature<float>("getConicWeight", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/PathIterator.Segment.html#getPoints()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/PathIterator.Segment.html#getPoints()"/>
             /// </summary>
-            public float[] Points
+            /// <returns><see cref="float"/></returns>
+            public float[] GetPoints()
             {
-                get { return IExecuteWithSignatureArray<float>("getPoints", "()[F"); }
+                return IExecuteWithSignatureArray<float>("getPoints", "()[F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/PathIterator.Segment.html#getVerb()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/PathIterator.Segment.html#getVerb()"/>
             /// </summary>
-            public int Verb
+            /// <returns><see cref="int"/></returns>
+            public int GetVerb()
             {
-                get { return IExecuteWithSignature<int>("getVerb", "()I"); }
+                return IExecuteWithSignature<int>("getVerb", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/PathMeasure.cs b/src/net/Netdroid/Generated/Android/Graphics/PathMeasure.cs
index c33767664..36262b55a 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/PathMeasure.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/PathMeasure.cs
@@ -67,13 +67,6 @@ public PathMeasure(Android.Graphics.Path arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/PathMeasure.html#getLength()"/> 
-        /// </summary>
-        public float Length
-        {
-            get { return IExecuteWithSignature<float>("getLength", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PathMeasure.html#getMatrix(float,android.graphics.Matrix,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -124,6 +117,14 @@ public bool NextContour()
             return IExecuteWithSignature<bool>("nextContour", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/PathMeasure.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetLength()
+        {
+            return IExecuteWithSignature<float>("getLength", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PathMeasure.html#setPath(android.graphics.Path,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Path"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Pdf/PdfDocument.cs b/src/net/Netdroid/Generated/Android/Graphics/Pdf/PdfDocument.cs
index da6bd79ac..c86d26e77 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Pdf/PdfDocument.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Pdf/PdfDocument.cs
@@ -46,13 +46,6 @@ public partial class PdfDocument
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.html#getPages()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Graphics.Pdf.PdfDocument.PageInfo> Pages
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Graphics.Pdf.PdfDocument.PageInfo>>("getPages", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.html#startPage(android.graphics.pdf.PdfDocument.PageInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Pdf.PdfDocument.PageInfo"/></param>
@@ -62,6 +55,14 @@ public Android.Graphics.Pdf.PdfDocument.Page StartPage(Android.Graphics.Pdf.PdfD
             return IExecuteWithSignature<Android.Graphics.Pdf.PdfDocument.Page>("startPage", "(Landroid/graphics/pdf/PdfDocument$PageInfo;)Landroid/graphics/pdf/PdfDocument$Page;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.html#getPages()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Graphics.Pdf.PdfDocument.PageInfo> GetPages()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Graphics.Pdf.PdfDocument.PageInfo>>("getPages", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.html#close()"/>
         /// </summary>
         public void Close()
@@ -110,18 +111,20 @@ public partial class Page
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.Page.html#getCanvas()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.Page.html#getCanvas()"/>
             /// </summary>
-            public Android.Graphics.Canvas Canvas
+            /// <returns><see cref="Android.Graphics.Canvas"/></returns>
+            public Android.Graphics.Canvas GetCanvas()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Canvas>("getCanvas", "()Landroid/graphics/Canvas;"); }
+                return IExecuteWithSignature<Android.Graphics.Canvas>("getCanvas", "()Landroid/graphics/Canvas;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.Page.html#getInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.Page.html#getInfo()"/>
             /// </summary>
-            public Android.Graphics.Pdf.PdfDocument.PageInfo Info
+            /// <returns><see cref="Android.Graphics.Pdf.PdfDocument.PageInfo"/></returns>
+            public Android.Graphics.Pdf.PdfDocument.PageInfo GetInfo()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Pdf.PdfDocument.PageInfo>("getInfo", "()Landroid/graphics/pdf/PdfDocument$PageInfo;"); }
+                return IExecuteWithSignature<Android.Graphics.Pdf.PdfDocument.PageInfo>("getInfo", "()Landroid/graphics/pdf/PdfDocument$PageInfo;");
             }
 
             #endregion
@@ -155,32 +158,36 @@ public partial class PageInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.PageInfo.html#getContentRect()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.PageInfo.html#getContentRect()"/>
             /// </summary>
-            public Android.Graphics.Rect ContentRect
+            /// <returns><see cref="Android.Graphics.Rect"/></returns>
+            public Android.Graphics.Rect GetContentRect()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Rect>("getContentRect", "()Landroid/graphics/Rect;"); }
+                return IExecuteWithSignature<Android.Graphics.Rect>("getContentRect", "()Landroid/graphics/Rect;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.PageInfo.html#getPageHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.PageInfo.html#getPageHeight()"/>
             /// </summary>
-            public int PageHeight
+            /// <returns><see cref="int"/></returns>
+            public int GetPageHeight()
             {
-                get { return IExecuteWithSignature<int>("getPageHeight", "()I"); }
+                return IExecuteWithSignature<int>("getPageHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.PageInfo.html#getPageNumber()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.PageInfo.html#getPageNumber()"/>
             /// </summary>
-            public int PageNumber
+            /// <returns><see cref="int"/></returns>
+            public int GetPageNumber()
             {
-                get { return IExecuteWithSignature<int>("getPageNumber", "()I"); }
+                return IExecuteWithSignature<int>("getPageNumber", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.PageInfo.html#getPageWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfDocument.PageInfo.html#getPageWidth()"/>
             /// </summary>
-            public int PageWidth
+            /// <returns><see cref="int"/></returns>
+            public int GetPageWidth()
             {
-                get { return IExecuteWithSignature<int>("getPageWidth", "()I"); }
+                return IExecuteWithSignature<int>("getPageWidth", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Pdf/PdfRenderer.cs b/src/net/Netdroid/Generated/Android/Graphics/Pdf/PdfRenderer.cs
index 620f552b5..860936f57 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Pdf/PdfRenderer.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Pdf/PdfRenderer.cs
@@ -55,13 +55,6 @@ public PdfRenderer(Android.Os.ParcelFileDescriptor arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.html#getPageCount()"/> 
-        /// </summary>
-        public int PageCount
-        {
-            get { return IExecuteWithSignature<int>("getPageCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.html#openPage(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -79,6 +72,14 @@ public bool ShouldScaleForPrinting()
             return IExecuteWithSignature<bool>("shouldScaleForPrinting", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.html#getPageCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPageCount()
+        {
+            return IExecuteWithSignature<int>("getPageCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.html#close()"/>
         /// </summary>
         public void Close()
@@ -122,25 +123,28 @@ public partial class Page
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.Page.html#getHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.Page.html#getHeight()"/>
             /// </summary>
-            public int Height
+            /// <returns><see cref="int"/></returns>
+            public int GetHeight()
             {
-                get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+                return IExecuteWithSignature<int>("getHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.Page.html#getIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.Page.html#getIndex()"/>
             /// </summary>
-            public int Index
+            /// <returns><see cref="int"/></returns>
+            public int GetIndex()
             {
-                get { return IExecuteWithSignature<int>("getIndex", "()I"); }
+                return IExecuteWithSignature<int>("getIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.Page.html#getWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.Page.html#getWidth()"/>
             /// </summary>
-            public int Width
+            /// <returns><see cref="int"/></returns>
+            public int GetWidth()
             {
-                get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+                return IExecuteWithSignature<int>("getWidth", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/pdf/PdfRenderer.Page.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Picture.cs b/src/net/Netdroid/Generated/Android/Graphics/Picture.cs
index af6cc7ef6..26099e0bc 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Picture.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Picture.cs
@@ -54,20 +54,6 @@ public Picture(Android.Graphics.Picture arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Picture.html#getHeight()"/> 
-        /// </summary>
-        public int Height
-        {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Picture.html#getWidth()"/> 
-        /// </summary>
-        public int Width
-        {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Picture.html#beginRecording(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -86,6 +72,22 @@ public bool RequiresHardwareAcceleration()
             return IExecuteWithSignature<bool>("requiresHardwareAcceleration", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Picture.html#getHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
+        {
+            return IExecuteWithSignature<int>("getHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/Picture.html#getWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
+        {
+            return IExecuteWithSignature<int>("getWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Picture.html#draw(android.graphics.Canvas)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/PixelFormat.cs b/src/net/Netdroid/Generated/Android/Graphics/PixelFormat.cs
index 2b06c6d50..e3b12b850 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/PixelFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/PixelFormat.cs
@@ -48,28 +48,28 @@ public partial class PixelFormat
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#A_8"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int A_8 { get { if (!_A_8Ready) { _A_8Content = SGetField<int>(LocalBridgeClazz, "A_8"); _A_8Ready = true; } return _A_8Content; } }
         private static int _A_8Content = default;
         private static bool _A_8Ready = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#JPEG"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int JPEG { get { if (!_JPEGReady) { _JPEGContent = SGetField<int>(LocalBridgeClazz, "JPEG"); _JPEGReady = true; } return _JPEGContent; } }
         private static int _JPEGContent = default;
         private static bool _JPEGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#L_8"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int L_8 { get { if (!_L_8Ready) { _L_8Content = SGetField<int>(LocalBridgeClazz, "L_8"); _L_8Ready = true; } return _L_8Content; } }
         private static int _L_8Content = default;
         private static bool _L_8Ready = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#LA_88"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LA_88 { get { if (!_LA_88Ready) { _LA_88Content = SGetField<int>(LocalBridgeClazz, "LA_88"); _LA_88Ready = true; } return _LA_88Content; } }
         private static int _LA_88Content = default;
         private static bool _LA_88Ready = false; // this is used because in case of generics 
@@ -82,7 +82,7 @@ public partial class PixelFormat
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#RGB_332"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RGB_332 { get { if (!_RGB_332Ready) { _RGB_332Content = SGetField<int>(LocalBridgeClazz, "RGB_332"); _RGB_332Ready = true; } return _RGB_332Content; } }
         private static int _RGB_332Content = default;
         private static bool _RGB_332Ready = false; // this is used because in case of generics 
@@ -107,14 +107,14 @@ public partial class PixelFormat
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#RGBA_4444"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RGBA_4444 { get { if (!_RGBA_4444Ready) { _RGBA_4444Content = SGetField<int>(LocalBridgeClazz, "RGBA_4444"); _RGBA_4444Ready = true; } return _RGBA_4444Content; } }
         private static int _RGBA_4444Content = default;
         private static bool _RGBA_4444Ready = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#RGBA_5551"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RGBA_5551 { get { if (!_RGBA_5551Ready) { _RGBA_5551Content = SGetField<int>(LocalBridgeClazz, "RGBA_5551"); _RGBA_5551Ready = true; } return _RGBA_5551Content; } }
         private static int _RGBA_5551Content = default;
         private static bool _RGBA_5551Ready = false; // this is used because in case of generics 
@@ -157,21 +157,21 @@ public partial class PixelFormat
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#YCbCr_420_SP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int YCbCr_420_SP { get { if (!_YCbCr_420_SPReady) { _YCbCr_420_SPContent = SGetField<int>(LocalBridgeClazz, "YCbCr_420_SP"); _YCbCr_420_SPReady = true; } return _YCbCr_420_SPContent; } }
         private static int _YCbCr_420_SPContent = default;
         private static bool _YCbCr_420_SPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#YCbCr_422_I"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int YCbCr_422_I { get { if (!_YCbCr_422_IReady) { _YCbCr_422_IContent = SGetField<int>(LocalBridgeClazz, "YCbCr_422_I"); _YCbCr_422_IReady = true; } return _YCbCr_422_IContent; } }
         private static int _YCbCr_422_IContent = default;
         private static bool _YCbCr_422_IReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/PixelFormat.html#YCbCr_422_SP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int YCbCr_422_SP { get { if (!_YCbCr_422_SPReady) { _YCbCr_422_SPContent = SGetField<int>(LocalBridgeClazz, "YCbCr_422_SP"); _YCbCr_422_SPReady = true; } return _YCbCr_422_SPContent; } }
         private static int _YCbCr_422_SPContent = default;
         private static bool _YCbCr_422_SPReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Region.cs b/src/net/Netdroid/Generated/Android/Graphics/Region.cs
index 7430aff17..3ade597d3 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Region.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Region.cs
@@ -79,18 +79,20 @@ public Region(int arg0, int arg1, int arg2, int arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Region.html#getBoundaryPath()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Region.html#getBoundaryPath()"/>
         /// </summary>
-        public Android.Graphics.Path BoundaryPath
+        /// <returns><see cref="Android.Graphics.Path"/></returns>
+        public Android.Graphics.Path GetBoundaryPath()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Path>("getBoundaryPath", "()Landroid/graphics/Path;"); }
+            return IExecuteWithSignature<Android.Graphics.Path>("getBoundaryPath", "()Landroid/graphics/Path;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Region.html#getBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Region.html#getBounds()"/>
         /// </summary>
-        public Android.Graphics.Rect Bounds
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/Region.html#getBoundaryPath(android.graphics.Path)"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/RenderNode.cs b/src/net/Netdroid/Generated/Android/Graphics/RenderNode.cs
index 840d1c0e4..6911589b8 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/RenderNode.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/RenderNode.cs
@@ -54,197 +54,46 @@ public RenderNode(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getAlpha()"/> 
-        /// </summary>
-        public float Alpha
-        {
-            get { return IExecuteWithSignature<float>("getAlpha", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getAmbientShadowColor()"/> 
-        /// </summary>
-        public int AmbientShadowColor
-        {
-            get { return IExecuteWithSignature<int>("getAmbientShadowColor", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getBottom()"/> 
-        /// </summary>
-        public int Bottom
-        {
-            get { return IExecuteWithSignature<int>("getBottom", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getCameraDistance()"/> 
-        /// </summary>
-        public float CameraDistance
-        {
-            get { return IExecuteWithSignature<float>("getCameraDistance", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getClipToBounds()"/> 
-        /// </summary>
-        public bool ClipToBounds
-        {
-            get { return IExecuteWithSignature<bool>("getClipToBounds", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getClipToOutline()"/> 
-        /// </summary>
-        public bool ClipToOutline
-        {
-            get { return IExecuteWithSignature<bool>("getClipToOutline", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getElevation()"/> 
-        /// </summary>
-        public float Elevation
-        {
-            get { return IExecuteWithSignature<float>("getElevation", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getHeight()"/> 
-        /// </summary>
-        public int Height
-        {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getLeft()"/> 
-        /// </summary>
-        public int Left
-        {
-            get { return IExecuteWithSignature<int>("getLeft", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getPivotX()"/> 
-        /// </summary>
-        public float PivotX
-        {
-            get { return IExecuteWithSignature<float>("getPivotX", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getPivotY()"/> 
-        /// </summary>
-        public float PivotY
-        {
-            get { return IExecuteWithSignature<float>("getPivotY", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getRight()"/> 
-        /// </summary>
-        public int Right
-        {
-            get { return IExecuteWithSignature<int>("getRight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getRotationX()"/> 
-        /// </summary>
-        public float RotationX
-        {
-            get { return IExecuteWithSignature<float>("getRotationX", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getRotationY()"/> 
-        /// </summary>
-        public float RotationY
-        {
-            get { return IExecuteWithSignature<float>("getRotationY", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getRotationZ()"/> 
-        /// </summary>
-        public float RotationZ
-        {
-            get { return IExecuteWithSignature<float>("getRotationZ", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getScaleX()"/> 
-        /// </summary>
-        public float ScaleX
-        {
-            get { return IExecuteWithSignature<float>("getScaleX", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getScaleY()"/> 
-        /// </summary>
-        public float ScaleY
-        {
-            get { return IExecuteWithSignature<float>("getScaleY", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getSpotShadowColor()"/> 
-        /// </summary>
-        public int SpotShadowColor
-        {
-            get { return IExecuteWithSignature<int>("getSpotShadowColor", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getTop()"/> 
-        /// </summary>
-        public int Top
-        {
-            get { return IExecuteWithSignature<int>("getTop", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getTranslationX()"/> 
-        /// </summary>
-        public float TranslationX
-        {
-            get { return IExecuteWithSignature<float>("getTranslationX", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getTranslationY()"/> 
-        /// </summary>
-        public float TranslationY
-        {
-            get { return IExecuteWithSignature<float>("getTranslationY", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getTranslationZ()"/> 
-        /// </summary>
-        public float TranslationZ
-        {
-            get { return IExecuteWithSignature<float>("getTranslationZ", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getUniqueId()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#beginRecording()"/>
         /// </summary>
-        public long UniqueId
+        /// <returns><see cref="Android.Graphics.RecordingCanvas"/></returns>
+        public Android.Graphics.RecordingCanvas BeginRecording()
         {
-            get { return IExecuteWithSignature<long>("getUniqueId", "()J"); }
+            return IExecuteWithSignature<Android.Graphics.RecordingCanvas>("beginRecording", "()Landroid/graphics/RecordingCanvas;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getUseCompositingLayer()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#beginRecording(int,int)"/>
         /// </summary>
-        public bool UseCompositingLayer
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Android.Graphics.RecordingCanvas"/></returns>
+        public Android.Graphics.RecordingCanvas BeginRecording(int arg0, int arg1)
         {
-            get { return IExecuteWithSignature<bool>("getUseCompositingLayer", "()Z"); }
+            return IExecute<Android.Graphics.RecordingCanvas>("beginRecording", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getClipToBounds()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="bool"/></returns>
+        public bool GetClipToBounds()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<bool>("getClipToBounds", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#beginRecording()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getClipToOutline()"/>
         /// </summary>
-        /// <returns><see cref="Android.Graphics.RecordingCanvas"/></returns>
-        public Android.Graphics.RecordingCanvas BeginRecording()
+        /// <returns><see cref="bool"/></returns>
+        public bool GetClipToOutline()
         {
-            return IExecuteWithSignature<Android.Graphics.RecordingCanvas>("beginRecording", "()Landroid/graphics/RecordingCanvas;");
+            return IExecuteWithSignature<bool>("getClipToOutline", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#beginRecording(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getUseCompositingLayer()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Android.Graphics.RecordingCanvas"/></returns>
-        public Android.Graphics.RecordingCanvas BeginRecording(int arg0, int arg1)
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseCompositingLayer()
         {
-            return IExecute<Android.Graphics.RecordingCanvas>("beginRecording", arg0, arg1);
+            return IExecuteWithSignature<bool>("getUseCompositingLayer", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#hasDisplayList()"/>
@@ -568,6 +417,174 @@ public bool SetUseCompositingLayer(bool arg0, Android.Graphics.Paint arg1)
             return IExecute<bool>("setUseCompositingLayer", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getAlpha()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetAlpha()
+        {
+            return IExecuteWithSignature<float>("getAlpha", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getCameraDistance()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetCameraDistance()
+        {
+            return IExecuteWithSignature<float>("getCameraDistance", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getElevation()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetElevation()
+        {
+            return IExecuteWithSignature<float>("getElevation", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getPivotX()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetPivotX()
+        {
+            return IExecuteWithSignature<float>("getPivotX", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getPivotY()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetPivotY()
+        {
+            return IExecuteWithSignature<float>("getPivotY", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getRotationX()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetRotationX()
+        {
+            return IExecuteWithSignature<float>("getRotationX", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getRotationY()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetRotationY()
+        {
+            return IExecuteWithSignature<float>("getRotationY", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getRotationZ()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetRotationZ()
+        {
+            return IExecuteWithSignature<float>("getRotationZ", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getScaleX()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetScaleX()
+        {
+            return IExecuteWithSignature<float>("getScaleX", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getScaleY()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetScaleY()
+        {
+            return IExecuteWithSignature<float>("getScaleY", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getTranslationX()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTranslationX()
+        {
+            return IExecuteWithSignature<float>("getTranslationX", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getTranslationY()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTranslationY()
+        {
+            return IExecuteWithSignature<float>("getTranslationY", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getTranslationZ()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTranslationZ()
+        {
+            return IExecuteWithSignature<float>("getTranslationZ", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getAmbientShadowColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAmbientShadowColor()
+        {
+            return IExecuteWithSignature<int>("getAmbientShadowColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getBottom()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBottom()
+        {
+            return IExecuteWithSignature<int>("getBottom", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
+        {
+            return IExecuteWithSignature<int>("getHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getLeft()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLeft()
+        {
+            return IExecuteWithSignature<int>("getLeft", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getRight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRight()
+        {
+            return IExecuteWithSignature<int>("getRight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getSpotShadowColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSpotShadowColor()
+        {
+            return IExecuteWithSignature<int>("getSpotShadowColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getTop()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTop()
+        {
+            return IExecuteWithSignature<int>("getTop", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
+        {
+            return IExecuteWithSignature<int>("getWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#computeApproximateMemoryUsage()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
@@ -576,6 +593,14 @@ public long ComputeApproximateMemoryUsage()
             return IExecuteWithSignature<long>("computeApproximateMemoryUsage", "()J");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#getUniqueId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetUniqueId()
+        {
+            return IExecuteWithSignature<long>("getUniqueId", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/RenderNode.html#discardDisplayList()"/>
         /// </summary>
         public void DiscardDisplayList()
diff --git a/src/net/Netdroid/Generated/Android/Graphics/SurfaceTexture.cs b/src/net/Netdroid/Generated/Android/Graphics/SurfaceTexture.cs
index 1e8e05feb..097ee2e95 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/SurfaceTexture.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/SurfaceTexture.cs
@@ -71,26 +71,28 @@ public SurfaceTexture(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.html#getDataSpace()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.html#isReleased()"/>
         /// </summary>
-        public int DataSpace
+        /// <returns><see cref="bool"/></returns>
+        public bool IsReleased()
         {
-            get { return IExecuteWithSignature<int>("getDataSpace", "()I"); }
+            return IExecuteWithSignature<bool>("isReleased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.html#getDataSpace()"/>
         /// </summary>
-        public long Timestamp
+        /// <returns><see cref="int"/></returns>
+        public int GetDataSpace()
         {
-            get { return IExecuteWithSignature<long>("getTimestamp", "()J"); }
+            return IExecuteWithSignature<int>("getDataSpace", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.html#isReleased()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.html#getTimestamp()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsReleased()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestamp()
         {
-            return IExecuteWithSignature<bool>("isReleased", "()Z");
+            return IExecuteWithSignature<long>("getTimestamp", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.html#attachToGLContext(int)"/>
@@ -191,7 +193,7 @@ public partial class OnFrameAvailableListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFrameAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnFrameAvailableEventHandler));
+                AddEventHandler("onFrameAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnFrameAvailableEventHandler));
 
             }
 
@@ -199,7 +201,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/graphics/SurfaceTexture.OnFrameAvailableListener.html#onFrameAvailable(android.graphics.SurfaceTexture)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFrameAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Graphics.SurfaceTexture> OnOnFrameAvailable { get; set; } = null;
+            public global::System.Action<Android.Graphics.SurfaceTexture> OnOnFrameAvailable { get; set; } = null;
 
             void OnFrameAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Text/LineBreakConfig.cs b/src/net/Netdroid/Generated/Android/Graphics/Text/LineBreakConfig.cs
index 8abe05b7a..f7593fcc4 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Text/LineBreakConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Text/LineBreakConfig.cs
@@ -82,18 +82,20 @@ public partial class LineBreakConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreakConfig.html#getLineBreakStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreakConfig.html#getLineBreakStyle()"/>
         /// </summary>
-        public int LineBreakStyle
+        /// <returns><see cref="int"/></returns>
+        public int GetLineBreakStyle()
         {
-            get { return IExecuteWithSignature<int>("getLineBreakStyle", "()I"); }
+            return IExecuteWithSignature<int>("getLineBreakStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreakConfig.html#getLineBreakWordStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreakConfig.html#getLineBreakWordStyle()"/>
         /// </summary>
-        public int LineBreakWordStyle
+        /// <returns><see cref="int"/></returns>
+        public int GetLineBreakWordStyle()
         {
-            get { return IExecuteWithSignature<int>("getLineBreakWordStyle", "()I"); }
+            return IExecuteWithSignature<int>("getLineBreakWordStyle", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Text/LineBreaker.cs b/src/net/Netdroid/Generated/Android/Graphics/Text/LineBreaker.cs
index d7e77c07e..674c5a8ec 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Text/LineBreaker.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Text/LineBreaker.cs
@@ -204,39 +204,44 @@ public partial class ParagraphConstraints
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getDefaultTabStop()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getDefaultTabStop()"/>
             /// </summary>
-            public float DefaultTabStop
+            /// <returns><see cref="float"/></returns>
+            public float GetDefaultTabStop()
             {
-                get { return IExecuteWithSignature<float>("getDefaultTabStop", "()F"); }
+                return IExecuteWithSignature<float>("getDefaultTabStop", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getFirstWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getFirstWidth()"/>
             /// </summary>
-            public float FirstWidth
+            /// <returns><see cref="float"/></returns>
+            public float GetFirstWidth()
             {
-                get { return IExecuteWithSignature<float>("getFirstWidth", "()F"); }
+                return IExecuteWithSignature<float>("getFirstWidth", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getFirstWidthLineCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getWidth()"/>
             /// </summary>
-            public int FirstWidthLineCount
+            /// <returns><see cref="float"/></returns>
+            public float GetWidth()
             {
-                get { return IExecuteWithSignature<int>("getFirstWidthLineCount", "()I"); }
+                return IExecuteWithSignature<float>("getWidth", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getTabStops()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getTabStops()"/>
             /// </summary>
-            public float[] TabStops
+            /// <returns><see cref="float"/></returns>
+            public float[] GetTabStops()
             {
-                get { return IExecuteWithSignatureArray<float>("getTabStops", "()[F"); }
+                return IExecuteWithSignatureArray<float>("getTabStops", "()[F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getWidth()"/> <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#setWidth(float)"/>
+            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#getFirstWidthLineCount()"/>
             /// </summary>
-            public float Width
+            /// <returns><see cref="int"/></returns>
+            public int GetFirstWidthLineCount()
             {
-                get { return IExecuteWithSignature<float>("getWidth", "()F"); } set { IExecuteWithSignature("setWidth", "(F)V", value); }
+                return IExecuteWithSignature<int>("getFirstWidthLineCount", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#setIndent(float,int)"/>
@@ -256,6 +261,14 @@ public void SetTabStops(float[] arg0, float arg1)
             {
                 IExecute("setTabStops", arg0, arg1);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.ParagraphConstraints.html#setWidth(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetWidth(float arg0)
+            {
+                IExecuteWithSignature("setWidth", "(F)V", arg0);
+            }
 
             #endregion
 
@@ -288,13 +301,6 @@ public partial class Result
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.Result.html#getLineCount()"/> 
-            /// </summary>
-            public int LineCount
-            {
-                get { return IExecuteWithSignature<int>("getLineCount", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.Result.html#hasLineTab(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -349,6 +355,14 @@ public int GetLineBreakOffset(int arg0)
                 return IExecuteWithSignature<int>("getLineBreakOffset", "(I)I", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.Result.html#getLineCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetLineCount()
+            {
+                return IExecuteWithSignature<int>("getLineCount", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/graphics/text/LineBreaker.Result.html#getStartLineHyphenEdit(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Text/MeasuredText.cs b/src/net/Netdroid/Generated/Android/Graphics/Text/MeasuredText.cs
index bc8ce70e8..f2feda38c 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Text/MeasuredText.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Text/MeasuredText.cs
@@ -189,7 +189,7 @@ public Android.Graphics.Text.MeasuredText.Builder AppendStyleRun(Android.Graphic
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.Graphics.Text.MeasuredText.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Text.MeasuredText.Builder SetComputeHyphenation(bool arg0)
             {
                 return IExecuteWithSignature<Android.Graphics.Text.MeasuredText.Builder>("setComputeHyphenation", "(Z)Landroid/graphics/text/MeasuredText$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Text/PositionedGlyphs.cs b/src/net/Netdroid/Generated/Android/Graphics/Text/PositionedGlyphs.cs
index cf6a268df..a24399e99 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Text/PositionedGlyphs.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Text/PositionedGlyphs.cs
@@ -46,66 +46,71 @@ public partial class PositionedGlyphs
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getAdvance()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getFont(int)"/>
         /// </summary>
-        public float Advance
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Graphics.Fonts.Font"/></returns>
+        public Android.Graphics.Fonts.Font GetFont(int arg0)
         {
-            get { return IExecuteWithSignature<float>("getAdvance", "()F"); }
+            return IExecuteWithSignature<Android.Graphics.Fonts.Font>("getFont", "(I)Landroid/graphics/fonts/Font;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getAscent()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getAdvance()"/>
         /// </summary>
-        public float Ascent
+        /// <returns><see cref="float"/></returns>
+        public float GetAdvance()
         {
-            get { return IExecuteWithSignature<float>("getAscent", "()F"); }
+            return IExecuteWithSignature<float>("getAdvance", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getDescent()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getAscent()"/>
         /// </summary>
-        public float Descent
+        /// <returns><see cref="float"/></returns>
+        public float GetAscent()
         {
-            get { return IExecuteWithSignature<float>("getDescent", "()F"); }
+            return IExecuteWithSignature<float>("getAscent", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getOffsetX()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getDescent()"/>
         /// </summary>
-        public float OffsetX
+        /// <returns><see cref="float"/></returns>
+        public float GetDescent()
         {
-            get { return IExecuteWithSignature<float>("getOffsetX", "()F"); }
+            return IExecuteWithSignature<float>("getDescent", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getOffsetY()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getGlyphX(int)"/>
         /// </summary>
-        public float OffsetY
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="float"/></returns>
+        public float GetGlyphX(int arg0)
         {
-            get { return IExecuteWithSignature<float>("getOffsetY", "()F"); }
+            return IExecuteWithSignature<float>("getGlyphX", "(I)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getFont(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getGlyphY(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Graphics.Fonts.Font"/></returns>
-        public Android.Graphics.Fonts.Font GetFont(int arg0)
+        /// <returns><see cref="float"/></returns>
+        public float GetGlyphY(int arg0)
         {
-            return IExecuteWithSignature<Android.Graphics.Fonts.Font>("getFont", "(I)Landroid/graphics/fonts/Font;", arg0);
+            return IExecuteWithSignature<float>("getGlyphY", "(I)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getGlyphX(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getOffsetX()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
-        public float GetGlyphX(int arg0)
+        public float GetOffsetX()
         {
-            return IExecuteWithSignature<float>("getGlyphX", "(I)F", arg0);
+            return IExecuteWithSignature<float>("getOffsetX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getGlyphY(int)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getOffsetY()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
-        public float GetGlyphY(int arg0)
+        public float GetOffsetY()
         {
-            return IExecuteWithSignature<float>("getGlyphY", "(I)F", arg0);
+            return IExecuteWithSignature<float>("getOffsetY", "()F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/graphics/text/PositionedGlyphs.html#getGlyphId(int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Graphics/Typeface.cs b/src/net/Netdroid/Generated/Android/Graphics/Typeface.cs
index e6c609cbd..19e2d9300 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/Typeface.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/Typeface.cs
@@ -168,41 +168,44 @@ public static Android.Graphics.Typeface DefaultFromStyle(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#getStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#isBold()"/>
         /// </summary>
-        public int Style
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBold()
         {
-            get { return IExecuteWithSignature<int>("getStyle", "()I"); }
+            return IExecuteWithSignature<bool>("isBold", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#getSystemFontFamilyName()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#isItalic()"/>
         /// </summary>
-        public Java.Lang.String SystemFontFamilyName
+        /// <returns><see cref="bool"/></returns>
+        public bool IsItalic()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemFontFamilyName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isItalic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#getWeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#getSystemFontFamilyName()"/>
         /// </summary>
-        public int Weight
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemFontFamilyName()
         {
-            get { return IExecuteWithSignature<int>("getWeight", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemFontFamilyName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#isBold()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#getStyle()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBold()
+        /// <returns><see cref="int"/></returns>
+        public int GetStyle()
         {
-            return IExecuteWithSignature<bool>("isBold", "()Z");
+            return IExecuteWithSignature<int>("getStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#isItalic()"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/Typeface.html#getWeight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsItalic()
+        /// <returns><see cref="int"/></returns>
+        public int GetWeight()
         {
-            return IExecuteWithSignature<bool>("isItalic", "()Z");
+            return IExecuteWithSignature<int>("getWeight", "()I");
         }
 
         #endregion
@@ -359,11 +362,12 @@ public CustomFallbackBuilder(Android.Graphics.Fonts.FontFamily arg0)
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/graphics/Typeface.CustomFallbackBuilder.html#getMaxCustomFallbackCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/graphics/Typeface.CustomFallbackBuilder.html#getMaxCustomFallbackCount()"/>
             /// </summary>
-            public static int MaxCustomFallbackCount
+            /// <returns><see cref="int"/></returns>
+            public static int GetMaxCustomFallbackCount()
             {
-                get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxCustomFallbackCount", "()I"); }
+                return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxCustomFallbackCount", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Graphics/YuvImage.cs b/src/net/Netdroid/Generated/Android/Graphics/YuvImage.cs
index 50dcae1a2..84880ad29 100644
--- a/src/net/Netdroid/Generated/Android/Graphics/YuvImage.cs
+++ b/src/net/Netdroid/Generated/Android/Graphics/YuvImage.cs
@@ -71,68 +71,74 @@ public YuvImage(byte[] arg0, int arg1, int arg2, int arg3, int[] arg4)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getColorSpace()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getColorSpace()"/>
         /// </summary>
-        public Android.Graphics.ColorSpace ColorSpace
+        /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+        public Android.Graphics.ColorSpace GetColorSpace()
         {
-            get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;"); }
+            return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#compressToJpeg(android.graphics.Rect,int,java.io.OutputStream)"/>
         /// </summary>
-        public int Height
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Java.Io.OutputStream"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool CompressToJpeg(Android.Graphics.Rect arg0, int arg1, Java.Io.OutputStream arg2)
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecute<bool>("compressToJpeg", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getStrides()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#compressToJpegR(android.graphics.YuvImage,int,java.io.OutputStream)"/>
         /// </summary>
-        public int[] Strides
+        /// <param name="arg0"><see cref="Android.Graphics.YuvImage"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Java.Io.OutputStream"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool CompressToJpegR(Android.Graphics.YuvImage arg0, int arg1, Java.Io.OutputStream arg2)
         {
-            get { return IExecuteWithSignatureArray<int>("getStrides", "()[I"); }
+            return IExecute<bool>("compressToJpegR", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getYuvData()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetYuvData()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getYuvData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getYuvData()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getHeight()"/>
         /// </summary>
-        public byte[] YuvData
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignatureArray<byte>("getYuvData", "()[B"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getYuvFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getWidth()"/>
         /// </summary>
-        public int YuvFormat
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<int>("getYuvFormat", "()I"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#compressToJpeg(android.graphics.Rect,int,java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getYuvFormat()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Java.Io.OutputStream"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool CompressToJpeg(Android.Graphics.Rect arg0, int arg1, Java.Io.OutputStream arg2)
+        /// <returns><see cref="int"/></returns>
+        public int GetYuvFormat()
         {
-            return IExecute<bool>("compressToJpeg", arg0, arg1, arg2);
+            return IExecuteWithSignature<int>("getYuvFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#compressToJpegR(android.graphics.YuvImage,int,java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/android/graphics/YuvImage.html#getStrides()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.YuvImage"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Java.Io.OutputStream"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool CompressToJpegR(Android.Graphics.YuvImage arg0, int arg1, Java.Io.OutputStream arg2)
+        /// <returns><see cref="int"/></returns>
+        public int[] GetStrides()
         {
-            return IExecute<bool>("compressToJpegR", arg0, arg1, arg2);
+            return IExecuteWithSignatureArray<int>("getStrides", "()[I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Hardware/AllPackageClasses.cs
index c38917823..104f00114 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class BatteryState : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Batt
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BatteryState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BatteryState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BatteryState() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BatteryState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BatteryState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BatteryState(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -76,7 +76,7 @@ public BatteryState(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/hardware/Camera.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Camera : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Camera>
     {
         const string _bridgeClassName = "android.hardware.Camera";
@@ -117,7 +117,7 @@ public Camera(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.Area.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Area : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Area>
         {
             const string _bridgeClassName = "android.hardware.Camera$Area";
@@ -162,19 +162,19 @@ public Area(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.AutoFocusCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class AutoFocusCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AutoFocusCallback>
         {
             const string _bridgeClassName = "android.hardware.Camera$AutoFocusCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AutoFocusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AutoFocusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AutoFocusCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AutoFocusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AutoFocusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AutoFocusCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -209,19 +209,19 @@ public AutoFocusCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.AutoFocusMoveCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class AutoFocusMoveCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AutoFocusMoveCallback>
         {
             const string _bridgeClassName = "android.hardware.Camera$AutoFocusMoveCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AutoFocusMoveCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AutoFocusMoveCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AutoFocusMoveCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AutoFocusMoveCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AutoFocusMoveCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AutoFocusMoveCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -256,7 +256,7 @@ public AutoFocusMoveCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.CameraInfo.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class CameraInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CameraInfo>
         {
             const string _bridgeClassName = "android.hardware.Camera$CameraInfo";
@@ -301,19 +301,19 @@ public CameraInfo(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.ErrorCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ErrorCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ErrorCallback>
         {
             const string _bridgeClassName = "android.hardware.Camera$ErrorCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ErrorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ErrorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ErrorCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ErrorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ErrorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ErrorCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -348,7 +348,7 @@ public ErrorCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.Face.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Face : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Face>
         {
             const string _bridgeClassName = "android.hardware.Camera$Face";
@@ -393,7 +393,7 @@ public Face(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.FaceDetectionListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class FaceDetectionListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -401,10 +401,13 @@ public partial class FaceDetectionListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public FaceDetectionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.hardware.Camera_FaceDetectionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.hardware.FaceDetectionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -426,10 +429,13 @@ public partial class FaceDetectionListenerDirect : FaceDetectionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.hardware.Camera$FaceDetectionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.hardware.Camera$FaceDetectionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -453,7 +459,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.OnZoomChangeListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnZoomChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -461,10 +467,13 @@ public partial class OnZoomChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnZoomChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.hardware.Camera_OnZoomChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.hardware.OnZoomChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -486,10 +495,13 @@ public partial class OnZoomChangeListenerDirect : OnZoomChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.hardware.Camera$OnZoomChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.hardware.Camera$OnZoomChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -513,7 +525,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Parameters : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Parameters>
         {
             const string _bridgeClassName = "android.hardware.Camera$Parameters";
@@ -558,19 +570,19 @@ public Parameters(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.PictureCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PictureCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PictureCallback>
         {
             const string _bridgeClassName = "android.hardware.Camera$PictureCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PictureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PictureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PictureCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PictureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PictureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PictureCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -605,19 +617,19 @@ public PictureCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.PreviewCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PreviewCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PreviewCallback>
         {
             const string _bridgeClassName = "android.hardware.Camera$PreviewCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PreviewCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PreviewCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PreviewCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PreviewCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PreviewCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PreviewCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -652,19 +664,19 @@ public PreviewCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.ShutterCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ShutterCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ShutterCallback>
         {
             const string _bridgeClassName = "android.hardware.Camera$ShutterCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ShutterCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ShutterCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ShutterCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ShutterCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ShutterCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ShutterCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -699,7 +711,7 @@ public ShutterCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.Size.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Size : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Size>
         {
             const string _bridgeClassName = "android.hardware.Camera$Size";
@@ -1150,12 +1162,12 @@ public partial class SensorEventCallback : Android.Hardware.SensorEventListener2
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SensorEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SensorEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SensorEventCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SensorEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SensorEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SensorEventCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1197,10 +1209,13 @@ public partial class SensorEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public SensorEventListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.hardware.SensorEventListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.hardware.SensorEventListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1222,10 +1237,13 @@ public partial class SensorEventListenerDirect : SensorEventListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.hardware.SensorEventListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.hardware.SensorEventListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1255,12 +1273,12 @@ public partial class SensorEventListener2 : Android.Hardware.SensorEventListener
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SensorEventListener2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SensorEventListener2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SensorEventListener2() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SensorEventListener2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SensorEventListener2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SensorEventListener2(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1295,7 +1313,7 @@ public SensorEventListener2(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/hardware/SensorListener.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SensorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
         /// <summary>
@@ -1303,10 +1321,13 @@ public partial class SensorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public SensorListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.hardware.SensorListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.hardware.SensorListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1328,10 +1349,13 @@ public partial class SensorListenerDirect : SensorListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.hardware.SensorListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.hardware.SensorListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1361,12 +1385,12 @@ public partial class SensorManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sen
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SensorManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SensorManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SensorManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SensorManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SensorManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SensorManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1403,12 +1427,12 @@ public partial class DynamicSensorCallback : MASES.JCOBridge.C2JBridge.JVMBridge
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("DynamicSensorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DynamicSensorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DynamicSensorCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("DynamicSensorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DynamicSensorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DynamicSensorCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1623,38 +1647,26 @@ public TriggerEvent(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/hardware/TriggerEventListener.html"/>
     /// </summary>
-    public partial class TriggerEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class TriggerEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TriggerEventListener>
     {
+        const string _bridgeClassName = "android.hardware.TriggerEventListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public TriggerEventListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region TriggerEventListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="TriggerEventListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class TriggerEventListenerDirect : TriggerEventListener
-    {
+        [global::System.Obsolete("TriggerEventListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public TriggerEventListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("TriggerEventListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public TriggerEventListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.hardware.TriggerEventListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1671,6 +1683,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Hardware/BatteryState.cs b/src/net/Netdroid/Generated/Android/Hardware/BatteryState.cs
index c85085625..fe083fa31 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/BatteryState.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/BatteryState.cs
@@ -76,26 +76,28 @@ public partial class BatteryState
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/BatteryState.html#getCapacity()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/BatteryState.html#isPresent()"/>
         /// </summary>
-        public float Capacity
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPresent()
         {
-            get { return IExecuteWithSignature<float>("getCapacity", "()F"); }
+            return IExecuteWithSignature<bool>("isPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/BatteryState.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/BatteryState.html#getCapacity()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="float"/></returns>
+        public float GetCapacity()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<float>("getCapacity", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/BatteryState.html#isPresent()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/BatteryState.html#getStatus()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPresent()
+        /// <returns><see cref="int"/></returns>
+        public int GetStatus()
         {
-            return IExecuteWithSignature<bool>("isPresent", "()Z");
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Biometrics/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Hardware/Biometrics/AllPackageClasses.cs
index 250f86b19..104049fea 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Biometrics/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Biometrics/AllPackageClasses.cs
@@ -76,12 +76,12 @@ public partial class Authenticators : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Au
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Authenticators class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Authenticators class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Authenticators() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Authenticators class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Authenticators class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Authenticators(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -210,12 +210,12 @@ public partial class AuthenticationCallback : MASES.JCOBridge.C2JBridge.JVMBridg
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AuthenticationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AuthenticationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AuthenticationCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AuthenticationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AuthenticationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AuthenticationCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Biometrics/BiometricManager.cs b/src/net/Netdroid/Generated/Android/Hardware/Biometrics/BiometricManager.cs
index 462c6ac6c..3a149f91f 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Biometrics/BiometricManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Biometrics/BiometricManager.cs
@@ -88,7 +88,7 @@ public Android.Hardware.Biometrics.BiometricManager.Strings GetStrings(int arg0)
         /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager.html#canAuthenticate()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CanAuthenticate()
         {
             return IExecuteWithSignature<int>("canAuthenticate", "()I");
@@ -176,25 +176,28 @@ public partial class Strings
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager.Strings.html#getButtonLabel()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager.Strings.html#getButtonLabel()"/>
             /// </summary>
-            public Java.Lang.CharSequence ButtonLabel
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetButtonLabel()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getButtonLabel", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getButtonLabel", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager.Strings.html#getPromptMessage()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager.Strings.html#getPromptMessage()"/>
             /// </summary>
-            public Java.Lang.CharSequence PromptMessage
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetPromptMessage()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getPromptMessage", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getPromptMessage", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager.Strings.html#getSettingName()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricManager.Strings.html#getSettingName()"/>
             /// </summary>
-            public Java.Lang.CharSequence SettingName
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetSettingName()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSettingName", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getSettingName", "()Ljava/lang/CharSequence;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Biometrics/BiometricPrompt.cs b/src/net/Netdroid/Generated/Android/Hardware/Biometrics/BiometricPrompt.cs
index 21d93ca11..4d5ec9841 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Biometrics/BiometricPrompt.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Biometrics/BiometricPrompt.cs
@@ -172,47 +172,52 @@ public partial class BiometricPrompt
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getAllowedAuthenticators()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#isConfirmationRequired()"/>
         /// </summary>
-        public int AllowedAuthenticators
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConfirmationRequired()
         {
-            get { return IExecuteWithSignature<int>("getAllowedAuthenticators", "()I"); }
+            return IExecuteWithSignature<bool>("isConfirmationRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getAllowedAuthenticators()"/>
         /// </summary>
-        public Java.Lang.CharSequence Description
+        /// <returns><see cref="int"/></returns>
+        public int GetAllowedAuthenticators()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getAllowedAuthenticators", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getNegativeButtonText()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getDescription()"/>
         /// </summary>
-        public Java.Lang.CharSequence NegativeButtonText
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescription()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getNegativeButtonText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getSubtitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getNegativeButtonText()"/>
         /// </summary>
-        public Java.Lang.CharSequence Subtitle
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetNegativeButtonText()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNegativeButtonText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getSubtitle()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSubtitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#isConfirmationRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#getTitle()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConfirmationRequired()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            return IExecuteWithSignature<bool>("isConfirmationRequired", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.html#authenticate(android.hardware.biometrics.BiometricPrompt.CryptoObject,android.os.CancellationSignal,java.util.concurrent.Executor,android.hardware.biometrics.BiometricPrompt.AuthenticationCallback)"/>
@@ -324,18 +329,20 @@ public partial class AuthenticationResult
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.AuthenticationResult.html#getAuthenticationType()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.AuthenticationResult.html#getCryptoObject()"/>
             /// </summary>
-            public int AuthenticationType
+            /// <returns><see cref="Android.Hardware.Biometrics.BiometricPrompt.CryptoObject"/></returns>
+            public Android.Hardware.Biometrics.BiometricPrompt.CryptoObject GetCryptoObject()
             {
-                get { return IExecuteWithSignature<int>("getAuthenticationType", "()I"); }
+                return IExecuteWithSignature<Android.Hardware.Biometrics.BiometricPrompt.CryptoObject>("getCryptoObject", "()Landroid/hardware/biometrics/BiometricPrompt$CryptoObject;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.AuthenticationResult.html#getCryptoObject()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.AuthenticationResult.html#getAuthenticationType()"/>
             /// </summary>
-            public Android.Hardware.Biometrics.BiometricPrompt.CryptoObject GetCryptoObject
+            /// <returns><see cref="int"/></returns>
+            public int GetAuthenticationType()
             {
-                get { return IExecuteWithSignature<Android.Hardware.Biometrics.BiometricPrompt.CryptoObject>("getCryptoObject", "()Landroid/hardware/biometrics/BiometricPrompt$CryptoObject;"); }
+                return IExecuteWithSignature<int>("getAuthenticationType", "()I");
             }
 
             #endregion
@@ -416,7 +423,7 @@ public Android.Hardware.Biometrics.BiometricPrompt.Builder SetDescription(Java.L
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.Hardware.Biometrics.BiometricPrompt.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Hardware.Biometrics.BiometricPrompt.Builder SetDeviceCredentialAllowed(bool arg0)
             {
                 return IExecuteWithSignature<Android.Hardware.Biometrics.BiometricPrompt.Builder>("setDeviceCredentialAllowed", "(Z)Landroid/hardware/biometrics/BiometricPrompt$Builder;", arg0);
@@ -469,7 +476,7 @@ public partial class CryptoObject
             /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#%3Cinit%3E(android.security.identity.IdentityCredential)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Security.Identity.IdentityCredential"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public CryptoObject(Android.Security.Identity.IdentityCredential arg0)
                 : base(arg0)
             {
@@ -523,40 +530,45 @@ public CryptoObject(Javax.Crypto.Mac arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getCipher()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getIdentityCredential()"/>
             /// </summary>
-            public Javax.Crypto.Cipher Cipher
+            /// <returns><see cref="Android.Security.Identity.IdentityCredential"/></returns>
+            [global::System.Obsolete()]
+            public Android.Security.Identity.IdentityCredential GetIdentityCredential()
             {
-                get { return IExecuteWithSignature<Javax.Crypto.Cipher>("getCipher", "()Ljavax/crypto/Cipher;"); }
+                return IExecuteWithSignature<Android.Security.Identity.IdentityCredential>("getIdentityCredential", "()Landroid/security/identity/IdentityCredential;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getIdentityCredential()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getPresentationSession()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Security.Identity.IdentityCredential IdentityCredential
+            /// <returns><see cref="Android.Security.Identity.PresentationSession"/></returns>
+            public Android.Security.Identity.PresentationSession GetPresentationSession()
             {
-                get { return IExecuteWithSignature<Android.Security.Identity.IdentityCredential>("getIdentityCredential", "()Landroid/security/identity/IdentityCredential;"); }
+                return IExecuteWithSignature<Android.Security.Identity.PresentationSession>("getPresentationSession", "()Landroid/security/identity/PresentationSession;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getMac()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getSignature()"/>
             /// </summary>
-            public Javax.Crypto.Mac Mac
+            /// <returns><see cref="Java.Security.Signature"/></returns>
+            public Java.Security.Signature GetSignature()
             {
-                get { return IExecuteWithSignature<Javax.Crypto.Mac>("getMac", "()Ljavax/crypto/Mac;"); }
+                return IExecuteWithSignature<Java.Security.Signature>("getSignature", "()Ljava/security/Signature;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getPresentationSession()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getCipher()"/>
             /// </summary>
-            public Android.Security.Identity.PresentationSession PresentationSession
+            /// <returns><see cref="Javax.Crypto.Cipher"/></returns>
+            public Javax.Crypto.Cipher GetCipher()
             {
-                get { return IExecuteWithSignature<Android.Security.Identity.PresentationSession>("getPresentationSession", "()Landroid/security/identity/PresentationSession;"); }
+                return IExecuteWithSignature<Javax.Crypto.Cipher>("getCipher", "()Ljavax/crypto/Cipher;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getSignature()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/biometrics/BiometricPrompt.CryptoObject.html#getMac()"/>
             /// </summary>
-            public Java.Security.Signature Signature
+            /// <returns><see cref="Javax.Crypto.Mac"/></returns>
+            public Javax.Crypto.Mac GetMac()
             {
-                get { return IExecuteWithSignature<Java.Security.Signature>("getSignature", "()Ljava/security/Signature;"); }
+                return IExecuteWithSignature<Javax.Crypto.Mac>("getMac", "()Ljavax/crypto/Mac;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera.cs
index 6408aeaa6..62ececfbc 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera.cs
@@ -40,35 +40,35 @@ public partial class Camera
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#CAMERA_ERROR_EVICTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CAMERA_ERROR_EVICTED { get { if (!_CAMERA_ERROR_EVICTEDReady) { _CAMERA_ERROR_EVICTEDContent = SGetField<int>(LocalBridgeClazz, "CAMERA_ERROR_EVICTED"); _CAMERA_ERROR_EVICTEDReady = true; } return _CAMERA_ERROR_EVICTEDContent; } }
         private static int _CAMERA_ERROR_EVICTEDContent = default;
         private static bool _CAMERA_ERROR_EVICTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#CAMERA_ERROR_SERVER_DIED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CAMERA_ERROR_SERVER_DIED { get { if (!_CAMERA_ERROR_SERVER_DIEDReady) { _CAMERA_ERROR_SERVER_DIEDContent = SGetField<int>(LocalBridgeClazz, "CAMERA_ERROR_SERVER_DIED"); _CAMERA_ERROR_SERVER_DIEDReady = true; } return _CAMERA_ERROR_SERVER_DIEDContent; } }
         private static int _CAMERA_ERROR_SERVER_DIEDContent = default;
         private static bool _CAMERA_ERROR_SERVER_DIEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#CAMERA_ERROR_UNKNOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CAMERA_ERROR_UNKNOWN { get { if (!_CAMERA_ERROR_UNKNOWNReady) { _CAMERA_ERROR_UNKNOWNContent = SGetField<int>(LocalBridgeClazz, "CAMERA_ERROR_UNKNOWN"); _CAMERA_ERROR_UNKNOWNReady = true; } return _CAMERA_ERROR_UNKNOWNContent; } }
         private static int _CAMERA_ERROR_UNKNOWNContent = default;
         private static bool _CAMERA_ERROR_UNKNOWNReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#ACTION_NEW_PICTURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_NEW_PICTURE { get { if (!_ACTION_NEW_PICTUREReady) { _ACTION_NEW_PICTUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_NEW_PICTURE"); _ACTION_NEW_PICTUREReady = true; } return _ACTION_NEW_PICTUREContent; } }
         private static Java.Lang.String _ACTION_NEW_PICTUREContent = default;
         private static bool _ACTION_NEW_PICTUREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#ACTION_NEW_VIDEO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_NEW_VIDEO { get { if (!_ACTION_NEW_VIDEOReady) { _ACTION_NEW_VIDEOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_NEW_VIDEO"); _ACTION_NEW_VIDEOReady = true; } return _ACTION_NEW_VIDEOContent; } }
         private static Java.Lang.String _ACTION_NEW_VIDEOContent = default;
         private static bool _ACTION_NEW_VIDEOReady = false; // this is used because in case of generics 
@@ -77,18 +77,10 @@ public partial class Camera
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#getNumberOfCameras()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static int NumberOfCameras
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getNumberOfCameras", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#open()"/>
         /// </summary>
         /// <returns><see cref="Android.Hardware.Camera"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Hardware.Camera Open()
         {
             return SExecuteWithSignature<Android.Hardware.Camera>(LocalBridgeClazz, "open", "()Landroid/hardware/Camera;");
@@ -98,17 +90,26 @@ public static Android.Hardware.Camera Open()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Hardware.Camera"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Hardware.Camera Open(int arg0)
         {
             return SExecuteWithSignature<Android.Hardware.Camera>(LocalBridgeClazz, "open", "(I)Landroid/hardware/Camera;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#getNumberOfCameras()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetNumberOfCameras()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getNumberOfCameras", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#getCameraInfo(int,android.hardware.Camera.CameraInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Hardware.Camera.CameraInfo"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void GetCameraInfo(int arg0, Android.Hardware.Camera.CameraInfo arg1)
         {
             SExecute(LocalBridgeClazz, "getCameraInfo", arg0, arg1);
@@ -118,19 +119,20 @@ public static void GetCameraInfo(int arg0, Android.Hardware.Camera.CameraInfo ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#getParameters()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#getParameters()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Hardware.Camera.Parameters GetParameters
+        /// <returns><see cref="Android.Hardware.Camera.Parameters"/></returns>
+        [global::System.Obsolete()]
+        public Android.Hardware.Camera.Parameters GetParameters()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera.Parameters>("getParameters", "()Landroid/hardware/Camera$Parameters;"); }
+            return IExecuteWithSignature<Android.Hardware.Camera.Parameters>("getParameters", "()Landroid/hardware/Camera$Parameters;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#enableShutterSound(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool EnableShutterSound(bool arg0)
         {
             return IExecuteWithSignature<bool>("enableShutterSound", "(Z)Z", arg0);
@@ -138,7 +140,7 @@ public bool EnableShutterSound(bool arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#lock()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Lock()
         {
             IExecuteWithSignature("lock", "()V");
@@ -147,7 +149,7 @@ public void Lock()
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#reconnect()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Reconnect()
         {
             IExecuteWithSignature("reconnect", "()V");
@@ -156,7 +158,7 @@ public void Reconnect()
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setDisplayOrientation(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDisplayOrientation(int arg0)
         {
             IExecuteWithSignature("setDisplayOrientation", "(I)V", arg0);
@@ -166,7 +168,7 @@ public void SetDisplayOrientation(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.SurfaceTexture"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPreviewTexture(Android.Graphics.SurfaceTexture arg0)
         {
             IExecuteWithSignature("setPreviewTexture", "(Landroid/graphics/SurfaceTexture;)V", arg0);
@@ -174,7 +176,7 @@ public void SetPreviewTexture(Android.Graphics.SurfaceTexture arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#startPreview()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartPreview()
         {
             IExecuteWithSignature("startPreview", "()V");
@@ -183,7 +185,7 @@ public void StartPreview()
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#startSmoothZoom(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartSmoothZoom(int arg0)
         {
             IExecuteWithSignature("startSmoothZoom", "(I)V", arg0);
@@ -191,7 +193,7 @@ public void StartSmoothZoom(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#stopSmoothZoom()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopSmoothZoom()
         {
             IExecuteWithSignature("stopSmoothZoom", "()V");
@@ -199,7 +201,7 @@ public void StopSmoothZoom()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#unlock()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Unlock()
         {
             IExecuteWithSignature("unlock", "()V");
@@ -208,7 +210,7 @@ public void Unlock()
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#addCallbackBuffer(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddCallbackBuffer(byte[] arg0)
         {
             IExecuteWithSignature("addCallbackBuffer", "([B)V", new object[] { arg0 });
@@ -217,7 +219,7 @@ public void AddCallbackBuffer(byte[] arg0)
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#autoFocus(android.hardware.Camera.AutoFocusCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.AutoFocusCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AutoFocus(Android.Hardware.Camera.AutoFocusCallback arg0)
         {
             IExecuteWithSignature("autoFocus", "(Landroid/hardware/Camera$AutoFocusCallback;)V", arg0);
@@ -225,7 +227,7 @@ public void AutoFocus(Android.Hardware.Camera.AutoFocusCallback arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#cancelAutoFocus()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CancelAutoFocus()
         {
             IExecuteWithSignature("cancelAutoFocus", "()V");
@@ -233,7 +235,7 @@ public void CancelAutoFocus()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#release()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Release()
         {
             IExecuteWithSignature("release", "()V");
@@ -242,7 +244,7 @@ public void Release()
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setErrorCallback(android.hardware.Camera.ErrorCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.ErrorCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetErrorCallback(Android.Hardware.Camera.ErrorCallback arg0)
         {
             IExecuteWithSignature("setErrorCallback", "(Landroid/hardware/Camera$ErrorCallback;)V", arg0);
@@ -251,7 +253,7 @@ public void SetErrorCallback(Android.Hardware.Camera.ErrorCallback arg0)
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setFaceDetectionListener(android.hardware.Camera.FaceDetectionListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.FaceDetectionListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetFaceDetectionListener(Android.Hardware.Camera.FaceDetectionListener arg0)
         {
             IExecuteWithSignature("setFaceDetectionListener", "(Landroid/hardware/Camera$FaceDetectionListener;)V", arg0);
@@ -260,7 +262,7 @@ public void SetFaceDetectionListener(Android.Hardware.Camera.FaceDetectionListen
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setOneShotPreviewCallback(android.hardware.Camera.PreviewCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.PreviewCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOneShotPreviewCallback(Android.Hardware.Camera.PreviewCallback arg0)
         {
             IExecuteWithSignature("setOneShotPreviewCallback", "(Landroid/hardware/Camera$PreviewCallback;)V", arg0);
@@ -269,7 +271,7 @@ public void SetOneShotPreviewCallback(Android.Hardware.Camera.PreviewCallback ar
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setPreviewCallback(android.hardware.Camera.PreviewCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.PreviewCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPreviewCallback(Android.Hardware.Camera.PreviewCallback arg0)
         {
             IExecuteWithSignature("setPreviewCallback", "(Landroid/hardware/Camera$PreviewCallback;)V", arg0);
@@ -278,7 +280,7 @@ public void SetPreviewCallback(Android.Hardware.Camera.PreviewCallback arg0)
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setPreviewCallbackWithBuffer(android.hardware.Camera.PreviewCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.PreviewCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPreviewCallbackWithBuffer(Android.Hardware.Camera.PreviewCallback arg0)
         {
             IExecuteWithSignature("setPreviewCallbackWithBuffer", "(Landroid/hardware/Camera$PreviewCallback;)V", arg0);
@@ -288,7 +290,7 @@ public void SetPreviewCallbackWithBuffer(Android.Hardware.Camera.PreviewCallback
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.SurfaceHolder"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPreviewDisplay(Android.View.SurfaceHolder arg0)
         {
             IExecuteWithSignature("setPreviewDisplay", "(Landroid/view/SurfaceHolder;)V", arg0);
@@ -297,7 +299,7 @@ public void SetPreviewDisplay(Android.View.SurfaceHolder arg0)
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setZoomChangeListener(android.hardware.Camera.OnZoomChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.OnZoomChangeListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetZoomChangeListener(Android.Hardware.Camera.OnZoomChangeListener arg0)
         {
             IExecuteWithSignature("setZoomChangeListener", "(Landroid/hardware/Camera$OnZoomChangeListener;)V", arg0);
@@ -305,7 +307,7 @@ public void SetZoomChangeListener(Android.Hardware.Camera.OnZoomChangeListener a
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#startFaceDetection()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartFaceDetection()
         {
             IExecuteWithSignature("startFaceDetection", "()V");
@@ -313,7 +315,7 @@ public void StartFaceDetection()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#stopFaceDetection()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopFaceDetection()
         {
             IExecuteWithSignature("stopFaceDetection", "()V");
@@ -321,7 +323,7 @@ public void StopFaceDetection()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#stopPreview()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopPreview()
         {
             IExecuteWithSignature("stopPreview", "()V");
@@ -333,7 +335,7 @@ public void StopPreview()
         /// <param name="arg1"><see cref="Android.Hardware.Camera.PictureCallback"/></param>
         /// <param name="arg2"><see cref="Android.Hardware.Camera.PictureCallback"/></param>
         /// <param name="arg3"><see cref="Android.Hardware.Camera.PictureCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void TakePicture(Android.Hardware.Camera.ShutterCallback arg0, Android.Hardware.Camera.PictureCallback arg1, Android.Hardware.Camera.PictureCallback arg2, Android.Hardware.Camera.PictureCallback arg3)
         {
             IExecute("takePicture", arg0, arg1, arg2, arg3);
@@ -344,7 +346,7 @@ public void TakePicture(Android.Hardware.Camera.ShutterCallback arg0, Android.Ha
         /// <param name="arg0"><see cref="Android.Hardware.Camera.ShutterCallback"/></param>
         /// <param name="arg1"><see cref="Android.Hardware.Camera.PictureCallback"/></param>
         /// <param name="arg2"><see cref="Android.Hardware.Camera.PictureCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void TakePicture(Android.Hardware.Camera.ShutterCallback arg0, Android.Hardware.Camera.PictureCallback arg1, Android.Hardware.Camera.PictureCallback arg2)
         {
             IExecute("takePicture", arg0, arg1, arg2);
@@ -353,7 +355,7 @@ public void TakePicture(Android.Hardware.Camera.ShutterCallback arg0, Android.Ha
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setAutoFocusMoveCallback(android.hardware.Camera.AutoFocusMoveCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.AutoFocusMoveCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAutoFocusMoveCallback(Android.Hardware.Camera.AutoFocusMoveCallback arg0)
         {
             IExecuteWithSignature("setAutoFocusMoveCallback", "(Landroid/hardware/Camera$AutoFocusMoveCallback;)V", arg0);
@@ -362,7 +364,7 @@ public void SetAutoFocusMoveCallback(Android.Hardware.Camera.AutoFocusMoveCallba
         /// <see href="https://developer.android.com/reference/android/hardware/Camera.html#setParameters(android.hardware.Camera.Parameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera.Parameters"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetParameters(Android.Hardware.Camera.Parameters arg0)
         {
             IExecuteWithSignature("setParameters", "(Landroid/hardware/Camera$Parameters;)V", arg0);
@@ -380,7 +382,7 @@ public partial class Area
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Area(Android.Graphics.Rect arg0, int arg1)
                 : base(arg0, arg1)
             {
@@ -396,12 +398,12 @@ public Area(Android.Graphics.Rect arg0, int arg1)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Area.html#rect"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Rect rect { get { return IGetField<Android.Graphics.Rect>("rect"); } set { ISetField("rect", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Area.html#weight"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int weight { get { return IGetField<int>("weight"); } set { ISetField("weight", value); } }
 
             #endregion
@@ -447,7 +449,7 @@ public partial class AutoFocusCallback
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <param name="arg1"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnAutoFocus(bool arg0, Android.Hardware.Camera arg1)
             {
                 IExecute("onAutoFocus", arg0, arg1);
@@ -488,7 +490,7 @@ public partial class AutoFocusMoveCallback
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <param name="arg1"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnAutoFocusMoving(bool arg0, Android.Hardware.Camera arg1)
             {
                 IExecute("onAutoFocusMoving", arg0, arg1);
@@ -519,29 +521,29 @@ public partial class CameraInfo
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#canDisableShutterSound"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool canDisableShutterSound { get { return IGetField<bool>("canDisableShutterSound"); } set { ISetField("canDisableShutterSound", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#facing"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int facing { get { return IGetField<int>("facing"); } set { ISetField("facing", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#orientation"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int orientation { get { return IGetField<int>("orientation"); } set { ISetField("orientation", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#CAMERA_FACING_BACK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CAMERA_FACING_BACK { get { if (!_CAMERA_FACING_BACKReady) { _CAMERA_FACING_BACKContent = SGetField<int>(LocalBridgeClazz, "CAMERA_FACING_BACK"); _CAMERA_FACING_BACKReady = true; } return _CAMERA_FACING_BACKContent; } }
             private static int _CAMERA_FACING_BACKContent = default;
             private static bool _CAMERA_FACING_BACKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.CameraInfo.html#CAMERA_FACING_FRONT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CAMERA_FACING_FRONT { get { if (!_CAMERA_FACING_FRONTReady) { _CAMERA_FACING_FRONTContent = SGetField<int>(LocalBridgeClazz, "CAMERA_FACING_FRONT"); _CAMERA_FACING_FRONTReady = true; } return _CAMERA_FACING_FRONTContent; } }
             private static int _CAMERA_FACING_FRONTContent = default;
             private static bool _CAMERA_FACING_FRONTReady = false; // this is used because in case of generics 
@@ -589,7 +591,7 @@ public partial class ErrorCallback
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnError(int arg0, Android.Hardware.Camera arg1)
             {
                 IExecute("onError", arg0, arg1);
@@ -620,32 +622,32 @@ public partial class Face
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Face.html#leftEye"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Point leftEye { get { return IGetField<Android.Graphics.Point>("leftEye"); } set { ISetField("leftEye", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Face.html#mouth"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Point mouth { get { return IGetField<Android.Graphics.Point>("mouth"); } set { ISetField("mouth", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Face.html#rightEye"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Point rightEye { get { return IGetField<Android.Graphics.Point>("rightEye"); } set { ISetField("rightEye", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Face.html#rect"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Rect rect { get { return IGetField<Android.Graphics.Rect>("rect"); } set { ISetField("rect", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Face.html#id"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int id { get { return IGetField<int>("id"); } set { ISetField("id", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Face.html#score"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int score { get { return IGetField<int>("score"); } set { ISetField("score", value); } }
 
             #endregion
@@ -691,7 +693,7 @@ public partial class FaceDetectionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFaceDetection", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Hardware.Camera.Face[]>>>(OnFaceDetectionEventHandler));
+                AddEventHandler("onFaceDetection", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Hardware.Camera.Face[]>>>(OnFaceDetectionEventHandler));
 
             }
 
@@ -699,7 +701,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/hardware/Camera.FaceDetectionListener.html#onFaceDetection(android.hardware.Camera.Face[],android.hardware.Camera)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFaceDetection"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Hardware.Camera.Face[], Android.Hardware.Camera> OnOnFaceDetection { get; set; } = null;
+            public global::System.Action<Android.Hardware.Camera.Face[], Android.Hardware.Camera> OnOnFaceDetection { get; set; } = null;
 
             void OnFaceDetectionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Hardware.Camera.Face[]>> data)
             {
@@ -712,7 +714,7 @@ void OnFaceDetectionEventHandler(object sender, CLRListenerEventArgs<CLREventDat
             /// </summary>
             /// <param name="arg0"><see cref="Android.Hardware.Camera.Face"/></param>
             /// <param name="arg1"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnFaceDetection(Android.Hardware.Camera.Face[] arg0, Android.Hardware.Camera arg1)
             {
                 
@@ -753,7 +755,7 @@ public partial class FaceDetectionListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Android.Hardware.Camera.Face"/></param>
             /// <param name="arg1"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnFaceDetection(Android.Hardware.Camera.Face[] arg0, Android.Hardware.Camera arg1)
             {
                 IExecute("onFaceDetection", arg0, arg1);
@@ -794,7 +796,7 @@ public partial class OnZoomChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onZoomChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnZoomChangeEventHandler));
+                AddEventHandler("onZoomChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnZoomChangeEventHandler));
 
             }
 
@@ -802,7 +804,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/hardware/Camera.OnZoomChangeListener.html#onZoomChange(int,boolean,android.hardware.Camera)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnZoomChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, bool, Android.Hardware.Camera> OnOnZoomChange { get; set; } = null;
+            public global::System.Action<int, bool, Android.Hardware.Camera> OnOnZoomChange { get; set; } = null;
 
             void OnZoomChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -816,7 +818,7 @@ void OnZoomChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<i
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="bool"/></param>
             /// <param name="arg2"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnZoomChange(int arg0, bool arg1, Android.Hardware.Camera arg2)
             {
                 
@@ -858,7 +860,7 @@ public partial class OnZoomChangeListenerDirect
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="bool"/></param>
             /// <param name="arg2"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnZoomChange(int arg0, bool arg1, Android.Hardware.Camera arg2)
             {
                 IExecute("onZoomChange", arg0, arg1, arg2);
@@ -889,385 +891,385 @@ public partial class Parameters
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_DISTANCE_FAR_INDEX"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FOCUS_DISTANCE_FAR_INDEX { get { if (!_FOCUS_DISTANCE_FAR_INDEXReady) { _FOCUS_DISTANCE_FAR_INDEXContent = SGetField<int>(LocalBridgeClazz, "FOCUS_DISTANCE_FAR_INDEX"); _FOCUS_DISTANCE_FAR_INDEXReady = true; } return _FOCUS_DISTANCE_FAR_INDEXContent; } }
             private static int _FOCUS_DISTANCE_FAR_INDEXContent = default;
             private static bool _FOCUS_DISTANCE_FAR_INDEXReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_DISTANCE_NEAR_INDEX"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FOCUS_DISTANCE_NEAR_INDEX { get { if (!_FOCUS_DISTANCE_NEAR_INDEXReady) { _FOCUS_DISTANCE_NEAR_INDEXContent = SGetField<int>(LocalBridgeClazz, "FOCUS_DISTANCE_NEAR_INDEX"); _FOCUS_DISTANCE_NEAR_INDEXReady = true; } return _FOCUS_DISTANCE_NEAR_INDEXContent; } }
             private static int _FOCUS_DISTANCE_NEAR_INDEXContent = default;
             private static bool _FOCUS_DISTANCE_NEAR_INDEXReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_DISTANCE_OPTIMAL_INDEX"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FOCUS_DISTANCE_OPTIMAL_INDEX { get { if (!_FOCUS_DISTANCE_OPTIMAL_INDEXReady) { _FOCUS_DISTANCE_OPTIMAL_INDEXContent = SGetField<int>(LocalBridgeClazz, "FOCUS_DISTANCE_OPTIMAL_INDEX"); _FOCUS_DISTANCE_OPTIMAL_INDEXReady = true; } return _FOCUS_DISTANCE_OPTIMAL_INDEXContent; } }
             private static int _FOCUS_DISTANCE_OPTIMAL_INDEXContent = default;
             private static bool _FOCUS_DISTANCE_OPTIMAL_INDEXReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#PREVIEW_FPS_MAX_INDEX"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PREVIEW_FPS_MAX_INDEX { get { if (!_PREVIEW_FPS_MAX_INDEXReady) { _PREVIEW_FPS_MAX_INDEXContent = SGetField<int>(LocalBridgeClazz, "PREVIEW_FPS_MAX_INDEX"); _PREVIEW_FPS_MAX_INDEXReady = true; } return _PREVIEW_FPS_MAX_INDEXContent; } }
             private static int _PREVIEW_FPS_MAX_INDEXContent = default;
             private static bool _PREVIEW_FPS_MAX_INDEXReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#PREVIEW_FPS_MIN_INDEX"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PREVIEW_FPS_MIN_INDEX { get { if (!_PREVIEW_FPS_MIN_INDEXReady) { _PREVIEW_FPS_MIN_INDEXContent = SGetField<int>(LocalBridgeClazz, "PREVIEW_FPS_MIN_INDEX"); _PREVIEW_FPS_MIN_INDEXReady = true; } return _PREVIEW_FPS_MIN_INDEXContent; } }
             private static int _PREVIEW_FPS_MIN_INDEXContent = default;
             private static bool _PREVIEW_FPS_MIN_INDEXReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#ANTIBANDING_50HZ"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ANTIBANDING_50HZ { get { if (!_ANTIBANDING_50HZReady) { _ANTIBANDING_50HZContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ANTIBANDING_50HZ"); _ANTIBANDING_50HZReady = true; } return _ANTIBANDING_50HZContent; } }
             private static Java.Lang.String _ANTIBANDING_50HZContent = default;
             private static bool _ANTIBANDING_50HZReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#ANTIBANDING_60HZ"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ANTIBANDING_60HZ { get { if (!_ANTIBANDING_60HZReady) { _ANTIBANDING_60HZContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ANTIBANDING_60HZ"); _ANTIBANDING_60HZReady = true; } return _ANTIBANDING_60HZContent; } }
             private static Java.Lang.String _ANTIBANDING_60HZContent = default;
             private static bool _ANTIBANDING_60HZReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#ANTIBANDING_AUTO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ANTIBANDING_AUTO { get { if (!_ANTIBANDING_AUTOReady) { _ANTIBANDING_AUTOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ANTIBANDING_AUTO"); _ANTIBANDING_AUTOReady = true; } return _ANTIBANDING_AUTOContent; } }
             private static Java.Lang.String _ANTIBANDING_AUTOContent = default;
             private static bool _ANTIBANDING_AUTOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#ANTIBANDING_OFF"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ANTIBANDING_OFF { get { if (!_ANTIBANDING_OFFReady) { _ANTIBANDING_OFFContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ANTIBANDING_OFF"); _ANTIBANDING_OFFReady = true; } return _ANTIBANDING_OFFContent; } }
             private static Java.Lang.String _ANTIBANDING_OFFContent = default;
             private static bool _ANTIBANDING_OFFReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_AQUA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_AQUA { get { if (!_EFFECT_AQUAReady) { _EFFECT_AQUAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_AQUA"); _EFFECT_AQUAReady = true; } return _EFFECT_AQUAContent; } }
             private static Java.Lang.String _EFFECT_AQUAContent = default;
             private static bool _EFFECT_AQUAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_BLACKBOARD"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_BLACKBOARD { get { if (!_EFFECT_BLACKBOARDReady) { _EFFECT_BLACKBOARDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_BLACKBOARD"); _EFFECT_BLACKBOARDReady = true; } return _EFFECT_BLACKBOARDContent; } }
             private static Java.Lang.String _EFFECT_BLACKBOARDContent = default;
             private static bool _EFFECT_BLACKBOARDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_MONO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_MONO { get { if (!_EFFECT_MONOReady) { _EFFECT_MONOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_MONO"); _EFFECT_MONOReady = true; } return _EFFECT_MONOContent; } }
             private static Java.Lang.String _EFFECT_MONOContent = default;
             private static bool _EFFECT_MONOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_NEGATIVE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_NEGATIVE { get { if (!_EFFECT_NEGATIVEReady) { _EFFECT_NEGATIVEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_NEGATIVE"); _EFFECT_NEGATIVEReady = true; } return _EFFECT_NEGATIVEContent; } }
             private static Java.Lang.String _EFFECT_NEGATIVEContent = default;
             private static bool _EFFECT_NEGATIVEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_NONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_NONE { get { if (!_EFFECT_NONEReady) { _EFFECT_NONEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_NONE"); _EFFECT_NONEReady = true; } return _EFFECT_NONEContent; } }
             private static Java.Lang.String _EFFECT_NONEContent = default;
             private static bool _EFFECT_NONEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_POSTERIZE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_POSTERIZE { get { if (!_EFFECT_POSTERIZEReady) { _EFFECT_POSTERIZEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_POSTERIZE"); _EFFECT_POSTERIZEReady = true; } return _EFFECT_POSTERIZEContent; } }
             private static Java.Lang.String _EFFECT_POSTERIZEContent = default;
             private static bool _EFFECT_POSTERIZEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_SEPIA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_SEPIA { get { if (!_EFFECT_SEPIAReady) { _EFFECT_SEPIAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_SEPIA"); _EFFECT_SEPIAReady = true; } return _EFFECT_SEPIAContent; } }
             private static Java.Lang.String _EFFECT_SEPIAContent = default;
             private static bool _EFFECT_SEPIAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_SOLARIZE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_SOLARIZE { get { if (!_EFFECT_SOLARIZEReady) { _EFFECT_SOLARIZEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_SOLARIZE"); _EFFECT_SOLARIZEReady = true; } return _EFFECT_SOLARIZEContent; } }
             private static Java.Lang.String _EFFECT_SOLARIZEContent = default;
             private static bool _EFFECT_SOLARIZEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#EFFECT_WHITEBOARD"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EFFECT_WHITEBOARD { get { if (!_EFFECT_WHITEBOARDReady) { _EFFECT_WHITEBOARDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFECT_WHITEBOARD"); _EFFECT_WHITEBOARDReady = true; } return _EFFECT_WHITEBOARDContent; } }
             private static Java.Lang.String _EFFECT_WHITEBOARDContent = default;
             private static bool _EFFECT_WHITEBOARDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FLASH_MODE_AUTO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FLASH_MODE_AUTO { get { if (!_FLASH_MODE_AUTOReady) { _FLASH_MODE_AUTOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FLASH_MODE_AUTO"); _FLASH_MODE_AUTOReady = true; } return _FLASH_MODE_AUTOContent; } }
             private static Java.Lang.String _FLASH_MODE_AUTOContent = default;
             private static bool _FLASH_MODE_AUTOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FLASH_MODE_OFF"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FLASH_MODE_OFF { get { if (!_FLASH_MODE_OFFReady) { _FLASH_MODE_OFFContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FLASH_MODE_OFF"); _FLASH_MODE_OFFReady = true; } return _FLASH_MODE_OFFContent; } }
             private static Java.Lang.String _FLASH_MODE_OFFContent = default;
             private static bool _FLASH_MODE_OFFReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FLASH_MODE_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FLASH_MODE_ON { get { if (!_FLASH_MODE_ONReady) { _FLASH_MODE_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FLASH_MODE_ON"); _FLASH_MODE_ONReady = true; } return _FLASH_MODE_ONContent; } }
             private static Java.Lang.String _FLASH_MODE_ONContent = default;
             private static bool _FLASH_MODE_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FLASH_MODE_RED_EYE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FLASH_MODE_RED_EYE { get { if (!_FLASH_MODE_RED_EYEReady) { _FLASH_MODE_RED_EYEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FLASH_MODE_RED_EYE"); _FLASH_MODE_RED_EYEReady = true; } return _FLASH_MODE_RED_EYEContent; } }
             private static Java.Lang.String _FLASH_MODE_RED_EYEContent = default;
             private static bool _FLASH_MODE_RED_EYEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FLASH_MODE_TORCH"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FLASH_MODE_TORCH { get { if (!_FLASH_MODE_TORCHReady) { _FLASH_MODE_TORCHContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FLASH_MODE_TORCH"); _FLASH_MODE_TORCHReady = true; } return _FLASH_MODE_TORCHContent; } }
             private static Java.Lang.String _FLASH_MODE_TORCHContent = default;
             private static bool _FLASH_MODE_TORCHReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_MODE_AUTO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FOCUS_MODE_AUTO { get { if (!_FOCUS_MODE_AUTOReady) { _FOCUS_MODE_AUTOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FOCUS_MODE_AUTO"); _FOCUS_MODE_AUTOReady = true; } return _FOCUS_MODE_AUTOContent; } }
             private static Java.Lang.String _FOCUS_MODE_AUTOContent = default;
             private static bool _FOCUS_MODE_AUTOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_MODE_CONTINUOUS_PICTURE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FOCUS_MODE_CONTINUOUS_PICTURE { get { if (!_FOCUS_MODE_CONTINUOUS_PICTUREReady) { _FOCUS_MODE_CONTINUOUS_PICTUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FOCUS_MODE_CONTINUOUS_PICTURE"); _FOCUS_MODE_CONTINUOUS_PICTUREReady = true; } return _FOCUS_MODE_CONTINUOUS_PICTUREContent; } }
             private static Java.Lang.String _FOCUS_MODE_CONTINUOUS_PICTUREContent = default;
             private static bool _FOCUS_MODE_CONTINUOUS_PICTUREReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_MODE_CONTINUOUS_VIDEO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FOCUS_MODE_CONTINUOUS_VIDEO { get { if (!_FOCUS_MODE_CONTINUOUS_VIDEOReady) { _FOCUS_MODE_CONTINUOUS_VIDEOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FOCUS_MODE_CONTINUOUS_VIDEO"); _FOCUS_MODE_CONTINUOUS_VIDEOReady = true; } return _FOCUS_MODE_CONTINUOUS_VIDEOContent; } }
             private static Java.Lang.String _FOCUS_MODE_CONTINUOUS_VIDEOContent = default;
             private static bool _FOCUS_MODE_CONTINUOUS_VIDEOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_MODE_EDOF"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FOCUS_MODE_EDOF { get { if (!_FOCUS_MODE_EDOFReady) { _FOCUS_MODE_EDOFContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FOCUS_MODE_EDOF"); _FOCUS_MODE_EDOFReady = true; } return _FOCUS_MODE_EDOFContent; } }
             private static Java.Lang.String _FOCUS_MODE_EDOFContent = default;
             private static bool _FOCUS_MODE_EDOFReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_MODE_FIXED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FOCUS_MODE_FIXED { get { if (!_FOCUS_MODE_FIXEDReady) { _FOCUS_MODE_FIXEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FOCUS_MODE_FIXED"); _FOCUS_MODE_FIXEDReady = true; } return _FOCUS_MODE_FIXEDContent; } }
             private static Java.Lang.String _FOCUS_MODE_FIXEDContent = default;
             private static bool _FOCUS_MODE_FIXEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_MODE_INFINITY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FOCUS_MODE_INFINITY { get { if (!_FOCUS_MODE_INFINITYReady) { _FOCUS_MODE_INFINITYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FOCUS_MODE_INFINITY"); _FOCUS_MODE_INFINITYReady = true; } return _FOCUS_MODE_INFINITYContent; } }
             private static Java.Lang.String _FOCUS_MODE_INFINITYContent = default;
             private static bool _FOCUS_MODE_INFINITYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#FOCUS_MODE_MACRO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FOCUS_MODE_MACRO { get { if (!_FOCUS_MODE_MACROReady) { _FOCUS_MODE_MACROContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FOCUS_MODE_MACRO"); _FOCUS_MODE_MACROReady = true; } return _FOCUS_MODE_MACROContent; } }
             private static Java.Lang.String _FOCUS_MODE_MACROContent = default;
             private static bool _FOCUS_MODE_MACROReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_ACTION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_ACTION { get { if (!_SCENE_MODE_ACTIONReady) { _SCENE_MODE_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_ACTION"); _SCENE_MODE_ACTIONReady = true; } return _SCENE_MODE_ACTIONContent; } }
             private static Java.Lang.String _SCENE_MODE_ACTIONContent = default;
             private static bool _SCENE_MODE_ACTIONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_AUTO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_AUTO { get { if (!_SCENE_MODE_AUTOReady) { _SCENE_MODE_AUTOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_AUTO"); _SCENE_MODE_AUTOReady = true; } return _SCENE_MODE_AUTOContent; } }
             private static Java.Lang.String _SCENE_MODE_AUTOContent = default;
             private static bool _SCENE_MODE_AUTOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_BARCODE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_BARCODE { get { if (!_SCENE_MODE_BARCODEReady) { _SCENE_MODE_BARCODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_BARCODE"); _SCENE_MODE_BARCODEReady = true; } return _SCENE_MODE_BARCODEContent; } }
             private static Java.Lang.String _SCENE_MODE_BARCODEContent = default;
             private static bool _SCENE_MODE_BARCODEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_BEACH"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_BEACH { get { if (!_SCENE_MODE_BEACHReady) { _SCENE_MODE_BEACHContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_BEACH"); _SCENE_MODE_BEACHReady = true; } return _SCENE_MODE_BEACHContent; } }
             private static Java.Lang.String _SCENE_MODE_BEACHContent = default;
             private static bool _SCENE_MODE_BEACHReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_CANDLELIGHT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_CANDLELIGHT { get { if (!_SCENE_MODE_CANDLELIGHTReady) { _SCENE_MODE_CANDLELIGHTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_CANDLELIGHT"); _SCENE_MODE_CANDLELIGHTReady = true; } return _SCENE_MODE_CANDLELIGHTContent; } }
             private static Java.Lang.String _SCENE_MODE_CANDLELIGHTContent = default;
             private static bool _SCENE_MODE_CANDLELIGHTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_FIREWORKS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_FIREWORKS { get { if (!_SCENE_MODE_FIREWORKSReady) { _SCENE_MODE_FIREWORKSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_FIREWORKS"); _SCENE_MODE_FIREWORKSReady = true; } return _SCENE_MODE_FIREWORKSContent; } }
             private static Java.Lang.String _SCENE_MODE_FIREWORKSContent = default;
             private static bool _SCENE_MODE_FIREWORKSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_HDR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_HDR { get { if (!_SCENE_MODE_HDRReady) { _SCENE_MODE_HDRContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_HDR"); _SCENE_MODE_HDRReady = true; } return _SCENE_MODE_HDRContent; } }
             private static Java.Lang.String _SCENE_MODE_HDRContent = default;
             private static bool _SCENE_MODE_HDRReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_LANDSCAPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_LANDSCAPE { get { if (!_SCENE_MODE_LANDSCAPEReady) { _SCENE_MODE_LANDSCAPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_LANDSCAPE"); _SCENE_MODE_LANDSCAPEReady = true; } return _SCENE_MODE_LANDSCAPEContent; } }
             private static Java.Lang.String _SCENE_MODE_LANDSCAPEContent = default;
             private static bool _SCENE_MODE_LANDSCAPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_NIGHT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_NIGHT { get { if (!_SCENE_MODE_NIGHTReady) { _SCENE_MODE_NIGHTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_NIGHT"); _SCENE_MODE_NIGHTReady = true; } return _SCENE_MODE_NIGHTContent; } }
             private static Java.Lang.String _SCENE_MODE_NIGHTContent = default;
             private static bool _SCENE_MODE_NIGHTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_NIGHT_PORTRAIT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_NIGHT_PORTRAIT { get { if (!_SCENE_MODE_NIGHT_PORTRAITReady) { _SCENE_MODE_NIGHT_PORTRAITContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_NIGHT_PORTRAIT"); _SCENE_MODE_NIGHT_PORTRAITReady = true; } return _SCENE_MODE_NIGHT_PORTRAITContent; } }
             private static Java.Lang.String _SCENE_MODE_NIGHT_PORTRAITContent = default;
             private static bool _SCENE_MODE_NIGHT_PORTRAITReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_PARTY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_PARTY { get { if (!_SCENE_MODE_PARTYReady) { _SCENE_MODE_PARTYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_PARTY"); _SCENE_MODE_PARTYReady = true; } return _SCENE_MODE_PARTYContent; } }
             private static Java.Lang.String _SCENE_MODE_PARTYContent = default;
             private static bool _SCENE_MODE_PARTYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_PORTRAIT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_PORTRAIT { get { if (!_SCENE_MODE_PORTRAITReady) { _SCENE_MODE_PORTRAITContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_PORTRAIT"); _SCENE_MODE_PORTRAITReady = true; } return _SCENE_MODE_PORTRAITContent; } }
             private static Java.Lang.String _SCENE_MODE_PORTRAITContent = default;
             private static bool _SCENE_MODE_PORTRAITReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_SNOW"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_SNOW { get { if (!_SCENE_MODE_SNOWReady) { _SCENE_MODE_SNOWContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_SNOW"); _SCENE_MODE_SNOWReady = true; } return _SCENE_MODE_SNOWContent; } }
             private static Java.Lang.String _SCENE_MODE_SNOWContent = default;
             private static bool _SCENE_MODE_SNOWReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_SPORTS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_SPORTS { get { if (!_SCENE_MODE_SPORTSReady) { _SCENE_MODE_SPORTSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_SPORTS"); _SCENE_MODE_SPORTSReady = true; } return _SCENE_MODE_SPORTSContent; } }
             private static Java.Lang.String _SCENE_MODE_SPORTSContent = default;
             private static bool _SCENE_MODE_SPORTSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_STEADYPHOTO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_STEADYPHOTO { get { if (!_SCENE_MODE_STEADYPHOTOReady) { _SCENE_MODE_STEADYPHOTOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_STEADYPHOTO"); _SCENE_MODE_STEADYPHOTOReady = true; } return _SCENE_MODE_STEADYPHOTOContent; } }
             private static Java.Lang.String _SCENE_MODE_STEADYPHOTOContent = default;
             private static bool _SCENE_MODE_STEADYPHOTOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_SUNSET"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_SUNSET { get { if (!_SCENE_MODE_SUNSETReady) { _SCENE_MODE_SUNSETContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_SUNSET"); _SCENE_MODE_SUNSETReady = true; } return _SCENE_MODE_SUNSETContent; } }
             private static Java.Lang.String _SCENE_MODE_SUNSETContent = default;
             private static bool _SCENE_MODE_SUNSETReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#SCENE_MODE_THEATRE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SCENE_MODE_THEATRE { get { if (!_SCENE_MODE_THEATREReady) { _SCENE_MODE_THEATREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SCENE_MODE_THEATRE"); _SCENE_MODE_THEATREReady = true; } return _SCENE_MODE_THEATREContent; } }
             private static Java.Lang.String _SCENE_MODE_THEATREContent = default;
             private static bool _SCENE_MODE_THEATREReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#WHITE_BALANCE_AUTO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WHITE_BALANCE_AUTO { get { if (!_WHITE_BALANCE_AUTOReady) { _WHITE_BALANCE_AUTOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WHITE_BALANCE_AUTO"); _WHITE_BALANCE_AUTOReady = true; } return _WHITE_BALANCE_AUTOContent; } }
             private static Java.Lang.String _WHITE_BALANCE_AUTOContent = default;
             private static bool _WHITE_BALANCE_AUTOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#WHITE_BALANCE_CLOUDY_DAYLIGHT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WHITE_BALANCE_CLOUDY_DAYLIGHT { get { if (!_WHITE_BALANCE_CLOUDY_DAYLIGHTReady) { _WHITE_BALANCE_CLOUDY_DAYLIGHTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WHITE_BALANCE_CLOUDY_DAYLIGHT"); _WHITE_BALANCE_CLOUDY_DAYLIGHTReady = true; } return _WHITE_BALANCE_CLOUDY_DAYLIGHTContent; } }
             private static Java.Lang.String _WHITE_BALANCE_CLOUDY_DAYLIGHTContent = default;
             private static bool _WHITE_BALANCE_CLOUDY_DAYLIGHTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#WHITE_BALANCE_DAYLIGHT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WHITE_BALANCE_DAYLIGHT { get { if (!_WHITE_BALANCE_DAYLIGHTReady) { _WHITE_BALANCE_DAYLIGHTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WHITE_BALANCE_DAYLIGHT"); _WHITE_BALANCE_DAYLIGHTReady = true; } return _WHITE_BALANCE_DAYLIGHTContent; } }
             private static Java.Lang.String _WHITE_BALANCE_DAYLIGHTContent = default;
             private static bool _WHITE_BALANCE_DAYLIGHTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#WHITE_BALANCE_FLUORESCENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WHITE_BALANCE_FLUORESCENT { get { if (!_WHITE_BALANCE_FLUORESCENTReady) { _WHITE_BALANCE_FLUORESCENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WHITE_BALANCE_FLUORESCENT"); _WHITE_BALANCE_FLUORESCENTReady = true; } return _WHITE_BALANCE_FLUORESCENTContent; } }
             private static Java.Lang.String _WHITE_BALANCE_FLUORESCENTContent = default;
             private static bool _WHITE_BALANCE_FLUORESCENTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#WHITE_BALANCE_INCANDESCENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WHITE_BALANCE_INCANDESCENT { get { if (!_WHITE_BALANCE_INCANDESCENTReady) { _WHITE_BALANCE_INCANDESCENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WHITE_BALANCE_INCANDESCENT"); _WHITE_BALANCE_INCANDESCENTReady = true; } return _WHITE_BALANCE_INCANDESCENTContent; } }
             private static Java.Lang.String _WHITE_BALANCE_INCANDESCENTContent = default;
             private static bool _WHITE_BALANCE_INCANDESCENTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#WHITE_BALANCE_SHADE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WHITE_BALANCE_SHADE { get { if (!_WHITE_BALANCE_SHADEReady) { _WHITE_BALANCE_SHADEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WHITE_BALANCE_SHADE"); _WHITE_BALANCE_SHADEReady = true; } return _WHITE_BALANCE_SHADEContent; } }
             private static Java.Lang.String _WHITE_BALANCE_SHADEContent = default;
             private static bool _WHITE_BALANCE_SHADEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#WHITE_BALANCE_TWILIGHT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WHITE_BALANCE_TWILIGHT { get { if (!_WHITE_BALANCE_TWILIGHTReady) { _WHITE_BALANCE_TWILIGHTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WHITE_BALANCE_TWILIGHT"); _WHITE_BALANCE_TWILIGHTReady = true; } return _WHITE_BALANCE_TWILIGHTContent; } }
             private static Java.Lang.String _WHITE_BALANCE_TWILIGHTContent = default;
             private static bool _WHITE_BALANCE_TWILIGHTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#WHITE_BALANCE_WARM_FLUORESCENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WHITE_BALANCE_WARM_FLUORESCENT { get { if (!_WHITE_BALANCE_WARM_FLUORESCENTReady) { _WHITE_BALANCE_WARM_FLUORESCENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WHITE_BALANCE_WARM_FLUORESCENT"); _WHITE_BALANCE_WARM_FLUORESCENTReady = true; } return _WHITE_BALANCE_WARM_FLUORESCENTContent; } }
             private static Java.Lang.String _WHITE_BALANCE_WARM_FLUORESCENTContent = default;
             private static bool _WHITE_BALANCE_WARM_FLUORESCENTReady = false; // this is used because in case of generics 
@@ -1280,469 +1282,516 @@ public partial class Parameters
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getAntibanding()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setAntibanding(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getJpegThumbnailSize()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.String Antibanding
+            /// <returns><see cref="Android.Hardware.Camera.Size"/></returns>
+            [global::System.Obsolete()]
+            public Android.Hardware.Camera.Size GetJpegThumbnailSize()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getAntibanding", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setAntibanding", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<Android.Hardware.Camera.Size>("getJpegThumbnailSize", "()Landroid/hardware/Camera$Size;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getAutoExposureLock()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setAutoExposureLock(boolean)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPictureSize()"/>
             /// </summary>
-            [System.Obsolete()]
-            public bool AutoExposureLock
+            /// <returns><see cref="Android.Hardware.Camera.Size"/></returns>
+            [global::System.Obsolete()]
+            public Android.Hardware.Camera.Size GetPictureSize()
             {
-                get { return IExecuteWithSignature<bool>("getAutoExposureLock", "()Z"); } set { IExecuteWithSignature("setAutoExposureLock", "(Z)V", value); }
+                return IExecuteWithSignature<Android.Hardware.Camera.Size>("getPictureSize", "()Landroid/hardware/Camera$Size;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getAutoWhiteBalanceLock()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setAutoWhiteBalanceLock(boolean)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreferredPreviewSizeForVideo()"/>
             /// </summary>
-            [System.Obsolete()]
-            public bool AutoWhiteBalanceLock
+            /// <returns><see cref="Android.Hardware.Camera.Size"/></returns>
+            [global::System.Obsolete()]
+            public Android.Hardware.Camera.Size GetPreferredPreviewSizeForVideo()
             {
-                get { return IExecuteWithSignature<bool>("getAutoWhiteBalanceLock", "()Z"); } set { IExecuteWithSignature("setAutoWhiteBalanceLock", "(Z)V", value); }
+                return IExecuteWithSignature<Android.Hardware.Camera.Size>("getPreferredPreviewSizeForVideo", "()Landroid/hardware/Camera$Size;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getColorEffect()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setColorEffect(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreviewSize()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.String ColorEffect
+            /// <returns><see cref="Android.Hardware.Camera.Size"/></returns>
+            [global::System.Obsolete()]
+            public Android.Hardware.Camera.Size GetPreviewSize()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getColorEffect", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setColorEffect", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<Android.Hardware.Camera.Size>("getPreviewSize", "()Landroid/hardware/Camera$Size;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getExposureCompensation()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setExposureCompensation(int)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getAutoExposureLock()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int ExposureCompensation
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool GetAutoExposureLock()
             {
-                get { return IExecuteWithSignature<int>("getExposureCompensation", "()I"); } set { IExecuteWithSignature("setExposureCompensation", "(I)V", value); }
+                return IExecuteWithSignature<bool>("getAutoExposureLock", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getExposureCompensationStep()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getAutoWhiteBalanceLock()"/>
             /// </summary>
-            [System.Obsolete()]
-            public float ExposureCompensationStep
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool GetAutoWhiteBalanceLock()
             {
-                get { return IExecuteWithSignature<float>("getExposureCompensationStep", "()F"); }
+                return IExecuteWithSignature<bool>("getAutoWhiteBalanceLock", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFlashMode()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setFlashMode(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getVideoStabilization()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.String FlashMode
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool GetVideoStabilization()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getFlashMode", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFlashMode", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<bool>("getVideoStabilization", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFocalLength()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isAutoExposureLockSupported()"/>
             /// </summary>
-            [System.Obsolete()]
-            public float FocalLength
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool IsAutoExposureLockSupported()
             {
-                get { return IExecuteWithSignature<float>("getFocalLength", "()F"); }
+                return IExecuteWithSignature<bool>("isAutoExposureLockSupported", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFocusAreas()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setFocusAreas(java.util.List)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isAutoWhiteBalanceLockSupported()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Android.Hardware.Camera.Area> FocusAreas
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool IsAutoWhiteBalanceLockSupported()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Area>>("getFocusAreas", "()Ljava/util/List;"); } set { IExecuteWithSignature("setFocusAreas", "(Ljava/util/List;)V", value); }
+                return IExecuteWithSignature<bool>("isAutoWhiteBalanceLockSupported", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFocusMode()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setFocusMode(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isSmoothZoomSupported()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.String FocusMode
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool IsSmoothZoomSupported()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getFocusMode", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFocusMode", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<bool>("isSmoothZoomSupported", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getHorizontalViewAngle()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isVideoSnapshotSupported()"/>
             /// </summary>
-            [System.Obsolete()]
-            public float HorizontalViewAngle
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool IsVideoSnapshotSupported()
             {
-                get { return IExecuteWithSignature<float>("getHorizontalViewAngle", "()F"); }
+                return IExecuteWithSignature<bool>("isVideoSnapshotSupported", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getJpegQuality()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setJpegQuality(int)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isVideoStabilizationSupported()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int JpegQuality
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool IsVideoStabilizationSupported()
             {
-                get { return IExecuteWithSignature<int>("getJpegQuality", "()I"); } set { IExecuteWithSignature("setJpegQuality", "(I)V", value); }
+                return IExecuteWithSignature<bool>("isVideoStabilizationSupported", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getJpegThumbnailQuality()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setJpegThumbnailQuality(int)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isZoomSupported()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int JpegThumbnailQuality
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool IsZoomSupported()
             {
-                get { return IExecuteWithSignature<int>("getJpegThumbnailQuality", "()I"); } set { IExecuteWithSignature("setJpegThumbnailQuality", "(I)V", value); }
+                return IExecuteWithSignature<bool>("isZoomSupported", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getJpegThumbnailSize()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getExposureCompensationStep()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Hardware.Camera.Size JpegThumbnailSize
+            /// <returns><see cref="float"/></returns>
+            [global::System.Obsolete()]
+            public float GetExposureCompensationStep()
             {
-                get { return IExecuteWithSignature<Android.Hardware.Camera.Size>("getJpegThumbnailSize", "()Landroid/hardware/Camera$Size;"); }
+                return IExecuteWithSignature<float>("getExposureCompensationStep", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxExposureCompensation()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFocalLength()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int MaxExposureCompensation
+            /// <returns><see cref="float"/></returns>
+            [global::System.Obsolete()]
+            public float GetFocalLength()
             {
-                get { return IExecuteWithSignature<int>("getMaxExposureCompensation", "()I"); }
+                return IExecuteWithSignature<float>("getFocalLength", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxNumDetectedFaces()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getHorizontalViewAngle()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int MaxNumDetectedFaces
+            /// <returns><see cref="float"/></returns>
+            [global::System.Obsolete()]
+            public float GetHorizontalViewAngle()
             {
-                get { return IExecuteWithSignature<int>("getMaxNumDetectedFaces", "()I"); }
+                return IExecuteWithSignature<float>("getHorizontalViewAngle", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxNumFocusAreas()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getVerticalViewAngle()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int MaxNumFocusAreas
+            /// <returns><see cref="float"/></returns>
+            [global::System.Obsolete()]
+            public float GetVerticalViewAngle()
             {
-                get { return IExecuteWithSignature<int>("getMaxNumFocusAreas", "()I"); }
+                return IExecuteWithSignature<float>("getVerticalViewAngle", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxNumMeteringAreas()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getExposureCompensation()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int MaxNumMeteringAreas
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetExposureCompensation()
             {
-                get { return IExecuteWithSignature<int>("getMaxNumMeteringAreas", "()I"); }
+                return IExecuteWithSignature<int>("getExposureCompensation", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxZoom()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getInt(java.lang.String)"/>
             /// </summary>
-            [System.Obsolete()]
-            public int MaxZoom
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetInt(Java.Lang.String arg0)
             {
-                get { return IExecuteWithSignature<int>("getMaxZoom", "()I"); }
+                return IExecuteWithSignature<int>("getInt", "(Ljava/lang/String;)I", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMeteringAreas()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setMeteringAreas(java.util.List)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getJpegQuality()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Android.Hardware.Camera.Area> MeteringAreas
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetJpegQuality()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Area>>("getMeteringAreas", "()Ljava/util/List;"); } set { IExecuteWithSignature("setMeteringAreas", "(Ljava/util/List;)V", value); }
+                return IExecuteWithSignature<int>("getJpegQuality", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMinExposureCompensation()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getJpegThumbnailQuality()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int MinExposureCompensation
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetJpegThumbnailQuality()
             {
-                get { return IExecuteWithSignature<int>("getMinExposureCompensation", "()I"); }
+                return IExecuteWithSignature<int>("getJpegThumbnailQuality", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPictureFormat()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPictureFormat(int)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxExposureCompensation()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int PictureFormat
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetMaxExposureCompensation()
             {
-                get { return IExecuteWithSignature<int>("getPictureFormat", "()I"); } set { IExecuteWithSignature("setPictureFormat", "(I)V", value); }
+                return IExecuteWithSignature<int>("getMaxExposureCompensation", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPictureSize()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxNumDetectedFaces()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Hardware.Camera.Size PictureSize
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetMaxNumDetectedFaces()
             {
-                get { return IExecuteWithSignature<Android.Hardware.Camera.Size>("getPictureSize", "()Landroid/hardware/Camera$Size;"); }
+                return IExecuteWithSignature<int>("getMaxNumDetectedFaces", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreferredPreviewSizeForVideo()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxNumFocusAreas()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Hardware.Camera.Size PreferredPreviewSizeForVideo
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetMaxNumFocusAreas()
             {
-                get { return IExecuteWithSignature<Android.Hardware.Camera.Size>("getPreferredPreviewSizeForVideo", "()Landroid/hardware/Camera$Size;"); }
+                return IExecuteWithSignature<int>("getMaxNumFocusAreas", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreviewFormat()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPreviewFormat(int)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxNumMeteringAreas()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int PreviewFormat
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetMaxNumMeteringAreas()
             {
-                get { return IExecuteWithSignature<int>("getPreviewFormat", "()I"); } set { IExecuteWithSignature("setPreviewFormat", "(I)V", value); }
+                return IExecuteWithSignature<int>("getMaxNumMeteringAreas", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreviewFrameRate()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPreviewFrameRate(int)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMaxZoom()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int PreviewFrameRate
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetMaxZoom()
             {
-                get { return IExecuteWithSignature<int>("getPreviewFrameRate", "()I"); } set { IExecuteWithSignature("setPreviewFrameRate", "(I)V", value); }
+                return IExecuteWithSignature<int>("getMaxZoom", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreviewSize()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMinExposureCompensation()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Hardware.Camera.Size PreviewSize
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetMinExposureCompensation()
             {
-                get { return IExecuteWithSignature<Android.Hardware.Camera.Size>("getPreviewSize", "()Landroid/hardware/Camera$Size;"); }
+                return IExecuteWithSignature<int>("getMinExposureCompensation", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSceneMode()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setSceneMode(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPictureFormat()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.String SceneMode
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetPictureFormat()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getSceneMode", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSceneMode", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<int>("getPictureFormat", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedAntibanding()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreviewFormat()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.String> SupportedAntibanding
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetPreviewFormat()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedAntibanding", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("getPreviewFormat", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedColorEffects()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreviewFrameRate()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.String> SupportedColorEffects
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetPreviewFrameRate()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedColorEffects", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("getPreviewFrameRate", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedFlashModes()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getZoom()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.String> SupportedFlashModes
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetZoom()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedFlashModes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("getZoom", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedFocusModes()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#flatten()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.String> SupportedFocusModes
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String Flatten()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedFocusModes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("flatten", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedJpegThumbnailSizes()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#get(java.lang.String)"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Android.Hardware.Camera.Size> SupportedJpegThumbnailSizes
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String Get(Java.Lang.String arg0)
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Size>>("getSupportedJpegThumbnailSizes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("get", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPictureFormats()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getAntibanding()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.Integer> SupportedPictureFormats
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String GetAntibanding()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getSupportedPictureFormats", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getAntibanding", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPictureSizes()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getColorEffect()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Android.Hardware.Camera.Size> SupportedPictureSizes
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String GetColorEffect()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Size>>("getSupportedPictureSizes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getColorEffect", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPreviewFormats()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFlashMode()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.Integer> SupportedPreviewFormats
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String GetFlashMode()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getSupportedPreviewFormats", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getFlashMode", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPreviewFpsRange()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFocusMode()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<int[]> SupportedPreviewFpsRange
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String GetFocusMode()
             {
-                get { return IExecuteWithSignature<Java.Util.List<int[]>>("getSupportedPreviewFpsRange", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getFocusMode", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPreviewFrameRates()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSceneMode()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.Integer> SupportedPreviewFrameRates
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String GetSceneMode()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getSupportedPreviewFrameRates", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getSceneMode", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPreviewSizes()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getWhiteBalance()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Android.Hardware.Camera.Size> SupportedPreviewSizes
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String GetWhiteBalance()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Size>>("getSupportedPreviewSizes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getWhiteBalance", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedSceneModes()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFocusAreas()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.String> SupportedSceneModes
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Android.Hardware.Camera.Area> GetFocusAreas()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedSceneModes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Area>>("getFocusAreas", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedVideoSizes()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getMeteringAreas()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Android.Hardware.Camera.Size> SupportedVideoSizes
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Android.Hardware.Camera.Area> GetMeteringAreas()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Size>>("getSupportedVideoSizes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Area>>("getMeteringAreas", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedWhiteBalance()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedJpegThumbnailSizes()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.String> SupportedWhiteBalance
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Android.Hardware.Camera.Size> GetSupportedJpegThumbnailSizes()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedWhiteBalance", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Size>>("getSupportedJpegThumbnailSizes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getVerticalViewAngle()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPictureSizes()"/>
             /// </summary>
-            [System.Obsolete()]
-            public float VerticalViewAngle
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Android.Hardware.Camera.Size> GetSupportedPictureSizes()
             {
-                get { return IExecuteWithSignature<float>("getVerticalViewAngle", "()F"); }
+                return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Size>>("getSupportedPictureSizes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getVideoStabilization()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setVideoStabilization(boolean)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPreviewSizes()"/>
             /// </summary>
-            [System.Obsolete()]
-            public bool VideoStabilization
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Android.Hardware.Camera.Size> GetSupportedPreviewSizes()
             {
-                get { return IExecuteWithSignature<bool>("getVideoStabilization", "()Z"); } set { IExecuteWithSignature("setVideoStabilization", "(Z)V", value); }
+                return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Size>>("getSupportedPreviewSizes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getWhiteBalance()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setWhiteBalance(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedVideoSizes()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.String WhiteBalance
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Android.Hardware.Camera.Size> GetSupportedVideoSizes()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getWhiteBalance", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setWhiteBalance", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera.Size>>("getSupportedVideoSizes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getZoom()"/> <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setZoom(int)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPreviewFpsRange()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int Zoom
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<int[]> GetSupportedPreviewFpsRange()
             {
-                get { return IExecuteWithSignature<int>("getZoom", "()I"); } set { IExecuteWithSignature("setZoom", "(I)V", value); }
+                return IExecuteWithSignature<Java.Util.List<int[]>>("getSupportedPreviewFpsRange", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getZoomRatios()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPictureFormats()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Util.List<Java.Lang.Integer> ZoomRatios
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.Integer> GetSupportedPictureFormats()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getZoomRatios", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getSupportedPictureFormats", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isAutoExposureLockSupported()"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPreviewFormats()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
-            public bool IsAutoExposureLockSupported()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.Integer> GetSupportedPreviewFormats()
             {
-                return IExecuteWithSignature<bool>("isAutoExposureLockSupported", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getSupportedPreviewFormats", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isAutoWhiteBalanceLockSupported()"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedPreviewFrameRates()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
-            public bool IsAutoWhiteBalanceLockSupported()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.Integer> GetSupportedPreviewFrameRates()
             {
-                return IExecuteWithSignature<bool>("isAutoWhiteBalanceLockSupported", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getSupportedPreviewFrameRates", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isSmoothZoomSupported()"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getZoomRatios()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
-            public bool IsSmoothZoomSupported()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.Integer> GetZoomRatios()
             {
-                return IExecuteWithSignature<bool>("isSmoothZoomSupported", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getZoomRatios", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isVideoSnapshotSupported()"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedAntibanding()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
-            public bool IsVideoSnapshotSupported()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.String> GetSupportedAntibanding()
             {
-                return IExecuteWithSignature<bool>("isVideoSnapshotSupported", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedAntibanding", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isVideoStabilizationSupported()"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedColorEffects()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
-            public bool IsVideoStabilizationSupported()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.String> GetSupportedColorEffects()
             {
-                return IExecuteWithSignature<bool>("isVideoStabilizationSupported", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedColorEffects", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#isZoomSupported()"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedFlashModes()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
-            public bool IsZoomSupported()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.String> GetSupportedFlashModes()
             {
-                return IExecuteWithSignature<bool>("isZoomSupported", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedFlashModes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getInt(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedFocusModes()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            /// <returns><see cref="int"/></returns>
-            [System.Obsolete()]
-            public int GetInt(Java.Lang.String arg0)
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.String> GetSupportedFocusModes()
             {
-                return IExecuteWithSignature<int>("getInt", "(Ljava/lang/String;)I", arg0);
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedFocusModes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#flatten()"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedSceneModes()"/>
             /// </summary>
-            /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
-            public Java.Lang.String Flatten()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.String> GetSupportedSceneModes()
             {
-                return IExecuteWithSignature<Java.Lang.String>("flatten", "()Ljava/lang/String;");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedSceneModes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#get(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getSupportedWhiteBalance()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
-            public Java.Lang.String Get(Java.Lang.String arg0)
+            /// <returns><see cref="Java.Util.List"/></returns>
+            [global::System.Obsolete()]
+            public Java.Util.List<Java.Lang.String> GetSupportedWhiteBalance()
             {
-                return IExecuteWithSignature<Java.Lang.String>("get", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedWhiteBalance", "()Ljava/util/List;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getFocusDistances(float[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="float"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void GetFocusDistances(float[] arg0)
             {
                 IExecuteWithSignature("getFocusDistances", "([F)V", new object[] { arg0 });
@@ -1751,7 +1800,7 @@ public void GetFocusDistances(float[] arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#getPreviewFpsRange(int[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void GetPreviewFpsRange(int[] arg0)
             {
                 IExecuteWithSignature("getPreviewFpsRange", "([I)V", new object[] { arg0 });
@@ -1760,7 +1809,7 @@ public void GetPreviewFpsRange(int[] arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#remove(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Remove(Java.Lang.String arg0)
             {
                 IExecuteWithSignature("remove", "(Ljava/lang/String;)V", arg0);
@@ -1768,7 +1817,7 @@ public void Remove(Java.Lang.String arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#removeGpsData()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void RemoveGpsData()
             {
                 IExecuteWithSignature("removeGpsData", "()V");
@@ -1778,7 +1827,7 @@ public void RemoveGpsData()
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Set(Java.Lang.String arg0, int arg1)
             {
                 IExecute("set", arg0, arg1);
@@ -1788,16 +1837,88 @@ public void Set(Java.Lang.String arg0, int arg1)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Set(Java.Lang.String arg0, Java.Lang.String arg1)
             {
                 IExecute("set", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setAntibanding(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            [global::System.Obsolete()]
+            public void SetAntibanding(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setAntibanding", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setAutoExposureLock(boolean)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="bool"/></param>
+            [global::System.Obsolete()]
+            public void SetAutoExposureLock(bool arg0)
+            {
+                IExecuteWithSignature("setAutoExposureLock", "(Z)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setAutoWhiteBalanceLock(boolean)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="bool"/></param>
+            [global::System.Obsolete()]
+            public void SetAutoWhiteBalanceLock(bool arg0)
+            {
+                IExecuteWithSignature("setAutoWhiteBalanceLock", "(Z)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setColorEffect(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            [global::System.Obsolete()]
+            public void SetColorEffect(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setColorEffect", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setExposureCompensation(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            [global::System.Obsolete()]
+            public void SetExposureCompensation(int arg0)
+            {
+                IExecuteWithSignature("setExposureCompensation", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setFlashMode(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            [global::System.Obsolete()]
+            public void SetFlashMode(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setFlashMode", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setFocusAreas(java.util.List)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Util.List"/></param>
+            [global::System.Obsolete()]
+            public void SetFocusAreas(Java.Util.List<Android.Hardware.Camera.Area> arg0)
+            {
+                IExecuteWithSignature("setFocusAreas", "(Ljava/util/List;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setFocusMode(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            [global::System.Obsolete()]
+            public void SetFocusMode(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setFocusMode", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setGpsAltitude(double)"/>
             /// </summary>
             /// <param name="arg0"><see cref="double"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetGpsAltitude(double arg0)
             {
                 IExecuteWithSignature("setGpsAltitude", "(D)V", arg0);
@@ -1806,7 +1927,7 @@ public void SetGpsAltitude(double arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setGpsLatitude(double)"/>
             /// </summary>
             /// <param name="arg0"><see cref="double"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetGpsLatitude(double arg0)
             {
                 IExecuteWithSignature("setGpsLatitude", "(D)V", arg0);
@@ -1815,7 +1936,7 @@ public void SetGpsLatitude(double arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setGpsLongitude(double)"/>
             /// </summary>
             /// <param name="arg0"><see cref="double"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetGpsLongitude(double arg0)
             {
                 IExecuteWithSignature("setGpsLongitude", "(D)V", arg0);
@@ -1824,7 +1945,7 @@ public void SetGpsLongitude(double arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setGpsProcessingMethod(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetGpsProcessingMethod(Java.Lang.String arg0)
             {
                 IExecuteWithSignature("setGpsProcessingMethod", "(Ljava/lang/String;)V", arg0);
@@ -1833,47 +1954,101 @@ public void SetGpsProcessingMethod(Java.Lang.String arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setGpsTimestamp(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetGpsTimestamp(long arg0)
             {
                 IExecuteWithSignature("setGpsTimestamp", "(J)V", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setJpegQuality(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            [global::System.Obsolete()]
+            public void SetJpegQuality(int arg0)
+            {
+                IExecuteWithSignature("setJpegQuality", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setJpegThumbnailQuality(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            [global::System.Obsolete()]
+            public void SetJpegThumbnailQuality(int arg0)
+            {
+                IExecuteWithSignature("setJpegThumbnailQuality", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setJpegThumbnailSize(int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetJpegThumbnailSize(int arg0, int arg1)
             {
                 IExecute("setJpegThumbnailSize", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setMeteringAreas(java.util.List)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Util.List"/></param>
+            [global::System.Obsolete()]
+            public void SetMeteringAreas(Java.Util.List<Android.Hardware.Camera.Area> arg0)
+            {
+                IExecuteWithSignature("setMeteringAreas", "(Ljava/util/List;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPictureFormat(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            [global::System.Obsolete()]
+            public void SetPictureFormat(int arg0)
+            {
+                IExecuteWithSignature("setPictureFormat", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPictureSize(int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetPictureSize(int arg0, int arg1)
             {
                 IExecute("setPictureSize", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPreviewFormat(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            [global::System.Obsolete()]
+            public void SetPreviewFormat(int arg0)
+            {
+                IExecuteWithSignature("setPreviewFormat", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPreviewFpsRange(int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetPreviewFpsRange(int arg0, int arg1)
             {
                 IExecute("setPreviewFpsRange", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPreviewFrameRate(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            [global::System.Obsolete()]
+            public void SetPreviewFrameRate(int arg0)
+            {
+                IExecuteWithSignature("setPreviewFrameRate", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPreviewSize(int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetPreviewSize(int arg0, int arg1)
             {
                 IExecute("setPreviewSize", arg0, arg1);
@@ -1882,7 +2057,7 @@ public void SetPreviewSize(int arg0, int arg1)
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setRecordingHint(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetRecordingHint(bool arg0)
             {
                 IExecuteWithSignature("setRecordingHint", "(Z)V", arg0);
@@ -1891,16 +2066,52 @@ public void SetRecordingHint(bool arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setRotation(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetRotation(int arg0)
             {
                 IExecuteWithSignature("setRotation", "(I)V", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setSceneMode(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            [global::System.Obsolete()]
+            public void SetSceneMode(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setSceneMode", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setVideoStabilization(boolean)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="bool"/></param>
+            [global::System.Obsolete()]
+            public void SetVideoStabilization(bool arg0)
+            {
+                IExecuteWithSignature("setVideoStabilization", "(Z)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setWhiteBalance(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            [global::System.Obsolete()]
+            public void SetWhiteBalance(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setWhiteBalance", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#setZoom(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            [global::System.Obsolete()]
+            public void SetZoom(int arg0)
+            {
+                IExecuteWithSignature("setZoom", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Parameters.html#unflatten(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Unflatten(Java.Lang.String arg0)
             {
                 IExecuteWithSignature("unflatten", "(Ljava/lang/String;)V", arg0);
@@ -1941,7 +2152,7 @@ public partial class PictureCallback
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             /// <param name="arg1"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnPictureTaken(byte[] arg0, Android.Hardware.Camera arg1)
             {
                 IExecute("onPictureTaken", arg0, arg1);
@@ -1982,7 +2193,7 @@ public partial class PreviewCallback
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             /// <param name="arg1"><see cref="Android.Hardware.Camera"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnPreviewFrame(byte[] arg0, Android.Hardware.Camera arg1)
             {
                 IExecute("onPreviewFrame", arg0, arg1);
@@ -2021,7 +2232,7 @@ public partial class ShutterCallback
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.ShutterCallback.html#onShutter()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnShutter()
             {
                 IExecuteWithSignature("onShutter", "()V");
@@ -2047,7 +2258,7 @@ public partial class Size
             /// <param name="arg0"><see cref="Android.Hardware.Camera"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Size(Android.Hardware.Camera arg0, int arg1, int arg2)
                 : base(arg0, arg1, arg2)
             {
@@ -2063,12 +2274,12 @@ public Size(Android.Hardware.Camera arg0, int arg1, int arg2)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Size.html#height"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int height { get { return IGetField<int>("height"); } set { ISetField("height", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/Camera.Size.html#width"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int width { get { return IGetField<int>("width"); } set { ISetField("width", value); } }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/AllPackageClasses.cs
index 43beba9d7..9c10bfa4d 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/AllPackageClasses.cs
@@ -53,12 +53,12 @@ public partial class CameraCaptureSession : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CameraCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraCaptureSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CameraCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraCaptureSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -95,12 +95,12 @@ public partial class CaptureCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CaptureCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CaptureCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -141,12 +141,12 @@ public partial class StateCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sta
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StateCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StateCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -324,12 +324,12 @@ public partial class CameraConstrainedHighSpeedCaptureSession : Android.Hardware
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CameraConstrainedHighSpeedCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraConstrainedHighSpeedCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraConstrainedHighSpeedCaptureSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CameraConstrainedHighSpeedCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraConstrainedHighSpeedCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraConstrainedHighSpeedCaptureSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -370,12 +370,12 @@ public partial class CameraDevice : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CameraDevice class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraDevice class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraDevice() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CameraDevice class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraDevice class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraDevice(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -412,12 +412,12 @@ public partial class StateCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sta
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StateCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StateCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -506,12 +506,12 @@ public partial class CameraExtensionSession : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CameraExtensionSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraExtensionSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraExtensionSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CameraExtensionSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraExtensionSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraExtensionSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -548,12 +548,12 @@ public partial class ExtensionCaptureCallback : MASES.JCOBridge.C2JBridge.JVMBri
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ExtensionCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ExtensionCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ExtensionCaptureCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ExtensionCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ExtensionCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ExtensionCaptureCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -594,12 +594,12 @@ public partial class StateCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sta
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StateCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StateCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -728,12 +728,12 @@ public partial class AvailabilityCallback : MASES.JCOBridge.C2JBridge.JVMBridgeB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AvailabilityCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AvailabilityCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AvailabilityCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AvailabilityCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AvailabilityCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AvailabilityCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -774,12 +774,12 @@ public partial class TorchCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Tor
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TorchCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TorchCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TorchCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TorchCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TorchCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TorchCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -824,12 +824,12 @@ public partial class CameraMetadata : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ca
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CameraMetadata class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraMetadata class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraMetadata() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CameraMetadata class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraMetadata class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraMetadata(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -871,12 +871,12 @@ public partial class CameraMetadata<TKey> : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CameraMetadata class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraMetadata class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraMetadata() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CameraMetadata class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraMetadata class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraMetadata(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -917,12 +917,12 @@ public partial class CameraOfflineSession : Android.Hardware.Camera2.CameraCaptu
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CameraOfflineSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraOfflineSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraOfflineSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CameraOfflineSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraOfflineSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraOfflineSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -959,12 +959,12 @@ public partial class CameraOfflineSessionCallback : MASES.JCOBridge.C2JBridge.JV
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CameraOfflineSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CameraOfflineSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CameraOfflineSessionCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CameraOfflineSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CameraOfflineSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CameraOfflineSessionCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraCaptureSession.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraCaptureSession.cs
index b0590e756..508c53b2c 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraCaptureSession.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraCaptureSession.cs
@@ -46,18 +46,20 @@ public partial class CameraCaptureSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession.html#getDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession.html#getDevice()"/>
         /// </summary>
-        public Android.Hardware.Camera2.CameraDevice Device
+        /// <returns><see cref="Android.Hardware.Camera2.CameraDevice"/></returns>
+        public Android.Hardware.Camera2.CameraDevice GetDevice()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.CameraDevice>("getDevice", "()Landroid/hardware/camera2/CameraDevice;"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.CameraDevice>("getDevice", "()Landroid/hardware/camera2/CameraDevice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession.html#getInputSurface()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession.html#getInputSurface()"/>
         /// </summary>
-        public Android.View.Surface InputSurface
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetInputSurface()
         {
-            get { return IExecuteWithSignature<Android.View.Surface>("getInputSurface", "()Landroid/view/Surface;"); }
+            return IExecuteWithSignature<Android.View.Surface>("getInputSurface", "()Landroid/view/Surface;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession.html#isReprocessable()"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraCharacteristics.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraCharacteristics.cs
index fc0c18ca8..2d67d2141 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraCharacteristics.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraCharacteristics.cs
@@ -328,7 +328,7 @@ public partial class CameraCharacteristics
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#LENS_RADIAL_DISTORTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Hardware.Camera2.CameraCharacteristics.Key LENS_RADIAL_DISTORTION { get { if (!_LENS_RADIAL_DISTORTIONReady) { _LENS_RADIAL_DISTORTIONContent = SGetField<Android.Hardware.Camera2.CameraCharacteristics.Key>(LocalBridgeClazz, "LENS_RADIAL_DISTORTION"); _LENS_RADIAL_DISTORTIONReady = true; } return _LENS_RADIAL_DISTORTIONContent; } }
         private static Android.Hardware.Camera2.CameraCharacteristics.Key _LENS_RADIAL_DISTORTIONContent = default;
         private static bool _LENS_RADIAL_DISTORTIONReady = false; // this is used because in case of generics 
@@ -743,65 +743,71 @@ public partial class CameraCharacteristics
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailableCaptureRequestKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#get(android.hardware.camera2.CameraCharacteristics.Key)"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>> AvailableCaptureRequestKeys
+        /// <param name="arg0"><see cref="Android.Hardware.Camera2.CameraCharacteristics.Key"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Get<T>(Android.Hardware.Camera2.CameraCharacteristics.Key<T> arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>>>("getAvailableCaptureRequestKeys", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<T>("get", "(Landroid/hardware/camera2/CameraCharacteristics$Key;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailableCaptureResultKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getRecommendedStreamConfigurationMap(int)"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.CaptureResult.Key<object>> AvailableCaptureResultKeys
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Hardware.Camera2.Params.RecommendedStreamConfigurationMap"/></returns>
+        public Android.Hardware.Camera2.Params.RecommendedStreamConfigurationMap GetRecommendedStreamConfigurationMap(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureResult.Key<object>>>("getAvailableCaptureResultKeys", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.Params.RecommendedStreamConfigurationMap>("getRecommendedStreamConfigurationMap", "(I)Landroid/hardware/camera2/params/RecommendedStreamConfigurationMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailablePhysicalCameraRequestKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getKeysNeedingPermission()"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>> AvailablePhysicalCameraRequestKeys
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.CameraCharacteristics.Key<object>> GetKeysNeedingPermission()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>>>("getAvailablePhysicalCameraRequestKeys", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CameraCharacteristics.Key<object>>>("getKeysNeedingPermission", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailableSessionKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailableCaptureRequestKeys()"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>> AvailableSessionKeys
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>> GetAvailableCaptureRequestKeys()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>>>("getAvailableSessionKeys", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>>>("getAvailableCaptureRequestKeys", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getKeysNeedingPermission()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailablePhysicalCameraRequestKeys()"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.CameraCharacteristics.Key<object>> KeysNeedingPermission
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>> GetAvailablePhysicalCameraRequestKeys()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CameraCharacteristics.Key<object>>>("getKeysNeedingPermission", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>>>("getAvailablePhysicalCameraRequestKeys", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getPhysicalCameraIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailableSessionKeys()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> PhysicalCameraIds
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>> GetAvailableSessionKeys()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPhysicalCameraIds", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureRequest.Key<object>>>("getAvailableSessionKeys", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#get(android.hardware.camera2.CameraCharacteristics.Key)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailableCaptureResultKeys()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Hardware.Camera2.CameraCharacteristics.Key"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T Get<T>(Android.Hardware.Camera2.CameraCharacteristics.Key<T> arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.CaptureResult.Key<object>> GetAvailableCaptureResultKeys()
         {
-            return IExecuteWithSignature<T>("get", "(Landroid/hardware/camera2/CameraCharacteristics$Key;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureResult.Key<object>>>("getAvailableCaptureResultKeys", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getRecommendedStreamConfigurationMap(int)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getPhysicalCameraIds()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Hardware.Camera2.Params.RecommendedStreamConfigurationMap"/></returns>
-        public Android.Hardware.Camera2.Params.RecommendedStreamConfigurationMap GetRecommendedStreamConfigurationMap(int arg0)
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetPhysicalCameraIds()
         {
-            return IExecuteWithSignature<Android.Hardware.Camera2.Params.RecommendedStreamConfigurationMap>("getRecommendedStreamConfigurationMap", "(I)Landroid/hardware/camera2/params/RecommendedStreamConfigurationMap;", arg0);
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPhysicalCameraIds", "()Ljava/util/Set;");
         }
 
         #endregion
@@ -837,11 +843,12 @@ public Key(Java.Lang.String arg0, Java.Lang.Class arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.Key.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.Key.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -888,11 +895,12 @@ public Key(Java.Lang.String arg0, Java.Lang.Class arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.Key.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.Key.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraDevice.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraDevice.cs
index 6a312e501..4ea70f5d5 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraDevice.cs
@@ -100,20 +100,6 @@ public partial class CameraDevice
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#getCameraAudioRestriction()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#setCameraAudioRestriction(int)"/>
-        /// </summary>
-        public int CameraAudioRestriction
-        {
-            get { return IExecuteWithSignature<int>("getCameraAudioRestriction", "()I"); } set { IExecuteWithSignature("setCameraAudioRestriction", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureRequest(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -134,6 +120,14 @@ public Android.Hardware.Camera2.CaptureRequest.Builder CreateReprocessCaptureReq
             return IExecuteWithSignature<Android.Hardware.Camera2.CaptureRequest.Builder>("createReprocessCaptureRequest", "(Landroid/hardware/camera2/TotalCaptureResult;)Landroid/hardware/camera2/CaptureRequest$Builder;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#close()"/>
         /// </summary>
         public void Close()
@@ -147,7 +141,7 @@ public void Close()
         /// <param name="arg1"><see cref="Android.Hardware.Camera2.CameraCaptureSession.StateCallback"/></param>
         /// <param name="arg2"><see cref="Android.Os.Handler"/></param>
         /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CreateCaptureSession(Java.Util.List<Android.View.Surface> arg0, Android.Hardware.Camera2.CameraCaptureSession.StateCallback arg1, Android.Os.Handler arg2)
         {
             IExecute("createCaptureSession", arg0, arg1, arg2);
@@ -159,7 +153,7 @@ public void CreateCaptureSession(Java.Util.List<Android.View.Surface> arg0, Andr
         /// <param name="arg1"><see cref="Android.Hardware.Camera2.CameraCaptureSession.StateCallback"/></param>
         /// <param name="arg2"><see cref="Android.Os.Handler"/></param>
         /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CreateCaptureSessionByOutputConfigurations(Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration> arg0, Android.Hardware.Camera2.CameraCaptureSession.StateCallback arg1, Android.Os.Handler arg2)
         {
             IExecute("createCaptureSessionByOutputConfigurations", arg0, arg1, arg2);
@@ -171,7 +165,7 @@ public void CreateCaptureSessionByOutputConfigurations(Java.Util.List<Android.Ha
         /// <param name="arg1"><see cref="Android.Hardware.Camera2.CameraCaptureSession.StateCallback"/></param>
         /// <param name="arg2"><see cref="Android.Os.Handler"/></param>
         /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CreateConstrainedHighSpeedCaptureSession(Java.Util.List<Android.View.Surface> arg0, Android.Hardware.Camera2.CameraCaptureSession.StateCallback arg1, Android.Os.Handler arg2)
         {
             IExecute("createConstrainedHighSpeedCaptureSession", arg0, arg1, arg2);
@@ -184,7 +178,7 @@ public void CreateConstrainedHighSpeedCaptureSession(Java.Util.List<Android.View
         /// <param name="arg2"><see cref="Android.Hardware.Camera2.CameraCaptureSession.StateCallback"/></param>
         /// <param name="arg3"><see cref="Android.Os.Handler"/></param>
         /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CreateReprocessableCaptureSession(Android.Hardware.Camera2.Params.InputConfiguration arg0, Java.Util.List<Android.View.Surface> arg1, Android.Hardware.Camera2.CameraCaptureSession.StateCallback arg2, Android.Os.Handler arg3)
         {
             IExecute("createReprocessableCaptureSession", arg0, arg1, arg2, arg3);
@@ -197,7 +191,7 @@ public void CreateReprocessableCaptureSession(Android.Hardware.Camera2.Params.In
         /// <param name="arg2"><see cref="Android.Hardware.Camera2.CameraCaptureSession.StateCallback"/></param>
         /// <param name="arg3"><see cref="Android.Os.Handler"/></param>
         /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CreateReprocessableCaptureSessionByConfigurations(Android.Hardware.Camera2.Params.InputConfiguration arg0, Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration> arg1, Android.Hardware.Camera2.CameraCaptureSession.StateCallback arg2, Android.Os.Handler arg3)
         {
             IExecute("createReprocessableCaptureSessionByConfigurations", arg0, arg1, arg2, arg3);
@@ -224,6 +218,15 @@ public bool IsSessionConfigurationSupported(Android.Hardware.Camera2.Params.Sess
             return IExecuteWithSignature<bool>("isSessionConfigurationSupported", "(Landroid/hardware/camera2/params/SessionConfiguration;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#getCameraAudioRestriction()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
+        public int GetCameraAudioRestriction()
+        {
+            return IExecuteWithSignature<int>("getCameraAudioRestriction", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureSession(android.hardware.camera2.params.SessionConfiguration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera2.Params.SessionConfiguration"/></param>
@@ -241,6 +244,15 @@ public void CreateExtensionSession(Android.Hardware.Camera2.Params.ExtensionSess
         {
             IExecuteWithSignature("createExtensionSession", "(Landroid/hardware/camera2/params/ExtensionSessionConfiguration;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#setCameraAudioRestriction(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
+        public void SetCameraAudioRestriction(int arg0)
+        {
+            IExecuteWithSignature("setCameraAudioRestriction", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraExtensionCharacteristics.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraExtensionCharacteristics.cs
index 55d639a1b..29b0172a1 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraExtensionCharacteristics.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraExtensionCharacteristics.cs
@@ -46,7 +46,7 @@ public partial class CameraExtensionCharacteristics
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics.html#EXTENSION_BEAUTY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EXTENSION_BEAUTY { get { if (!_EXTENSION_BEAUTYReady) { _EXTENSION_BEAUTYContent = SGetField<int>(LocalBridgeClazz, "EXTENSION_BEAUTY"); _EXTENSION_BEAUTYReady = true; } return _EXTENSION_BEAUTYContent; } }
         private static int _EXTENSION_BEAUTYContent = default;
         private static bool _EXTENSION_BEAUTYReady = false; // this is used because in case of generics 
@@ -83,13 +83,6 @@ public partial class CameraExtensionCharacteristics
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics.html#getSupportedExtensions()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.Integer> SupportedExtensions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getSupportedExtensions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics.html#getExtensionSupportedSizes(int,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -139,6 +132,14 @@ public bool IsPostviewAvailable(int arg0)
             return IExecute<Java.Util.List<Android.Util.Size>>("getPostviewSupportedSizes", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics.html#getSupportedExtensions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetSupportedExtensions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getSupportedExtensions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics.html#getAvailableCaptureRequestKeys(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraExtensionSession.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraExtensionSession.cs
index 94864c40b..20579720e 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraExtensionSession.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraExtensionSession.cs
@@ -46,18 +46,21 @@ public partial class CameraExtensionSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.html#getDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.html#getDevice()"/>
         /// </summary>
-        public Android.Hardware.Camera2.CameraDevice Device
+        /// <returns><see cref="Android.Hardware.Camera2.CameraDevice"/></returns>
+        public Android.Hardware.Camera2.CameraDevice GetDevice()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.CameraDevice>("getDevice", "()Landroid/hardware/camera2/CameraDevice;"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.CameraDevice>("getDevice", "()Landroid/hardware/camera2/CameraDevice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.html#getRealtimeStillCaptureLatency()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.html#getRealtimeStillCaptureLatency()"/>
         /// </summary>
-        public Android.Hardware.Camera2.CameraExtensionSession.StillCaptureLatency RealtimeStillCaptureLatency
+        /// <returns><see cref="Android.Hardware.Camera2.CameraExtensionSession.StillCaptureLatency"/></returns>
+        /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
+        public Android.Hardware.Camera2.CameraExtensionSession.StillCaptureLatency GetRealtimeStillCaptureLatency()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.CameraExtensionSession.StillCaptureLatency>("getRealtimeStillCaptureLatency", "()Landroid/hardware/camera2/CameraExtensionSession$StillCaptureLatency;"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.CameraExtensionSession.StillCaptureLatency>("getRealtimeStillCaptureLatency", "()Landroid/hardware/camera2/CameraExtensionSession$StillCaptureLatency;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.html#capture(android.hardware.camera2.CaptureRequest,java.util.concurrent.Executor,android.hardware.camera2.CameraExtensionSession.ExtensionCaptureCallback)"/>
@@ -285,18 +288,20 @@ public StillCaptureLatency(long arg0, long arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.StillCaptureLatency.html#getCaptureLatency()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.StillCaptureLatency.html#getCaptureLatency()"/>
             /// </summary>
-            public long CaptureLatency
+            /// <returns><see cref="long"/></returns>
+            public long GetCaptureLatency()
             {
-                get { return IExecuteWithSignature<long>("getCaptureLatency", "()J"); }
+                return IExecuteWithSignature<long>("getCaptureLatency", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.StillCaptureLatency.html#getProcessingLatency()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraExtensionSession.StillCaptureLatency.html#getProcessingLatency()"/>
             /// </summary>
-            public long ProcessingLatency
+            /// <returns><see cref="long"/></returns>
+            public long GetProcessingLatency()
             {
-                get { return IExecuteWithSignature<long>("getProcessingLatency", "()J"); }
+                return IExecuteWithSignature<long>("getProcessingLatency", "()J");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraManager.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraManager.cs
index e5f05fb98..e54b36718 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraManager.cs
@@ -46,20 +46,6 @@ public partial class CameraManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#getCameraIdList()"/> 
-        /// </summary>
-        public Java.Lang.String[] CameraIdList
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getCameraIdList", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#getConcurrentCameraIds()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Util.Set<Java.Lang.String>> ConcurrentCameraIds
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Util.Set<Java.Lang.String>>>("getConcurrentCameraIds", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#getCameraCharacteristics(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -100,6 +86,24 @@ public int GetTorchStrengthLevel(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getTorchStrengthLevel", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#getCameraIdList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
+        public Java.Lang.String[] GetCameraIdList()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getCameraIdList", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#getConcurrentCameraIds()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        /// <exception cref="Android.Hardware.Camera2.CameraAccessException"/>
+        public Java.Util.Set<Java.Util.Set<Java.Lang.String>> GetConcurrentCameraIds()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Util.Set<Java.Lang.String>>>("getConcurrentCameraIds", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#openCamera(java.lang.String,android.hardware.camera2.CameraDevice.StateCallback,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraMetadata.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraMetadata.cs
index 904d5b5e2..c57ebd320 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraMetadata.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CameraMetadata.cs
@@ -760,7 +760,7 @@ public partial class CameraMetadata
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO { get { if (!_CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOReady) { _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOContent = SGetField<int>(LocalBridgeClazz, "CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO"); _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOReady = true; } return _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOContent; } }
         private static int _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOContent = default;
         private static bool _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOReady = false; // this is used because in case of generics 
@@ -1697,11 +1697,12 @@ public partial class CameraMetadata
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#getKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#getKeys()"/>
         /// </summary>
-        public Java.Util.List Keys
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List GetKeys()
         {
-            get { return IExecuteWithSignature<Java.Util.List>("getKeys", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List>("getKeys", "()Ljava/util/List;");
         }
 
         #endregion
@@ -2453,7 +2454,7 @@ public partial class CameraMetadata<TKey>
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO { get { if (!_CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOReady) { _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOContent = SGetField<int>(LocalBridgeClazz, "CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO"); _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOReady = true; } return _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOContent; } }
         private static int _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOContent = default;
         private static bool _CONTROL_SCENE_MODE_HIGH_SPEED_VIDEOReady = false; // this is used because in case of generics 
@@ -3390,11 +3391,12 @@ public partial class CameraMetadata<TKey>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#getKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#getKeys()"/>
         /// </summary>
-        public Java.Util.List<TKey> Keys
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<TKey> GetKeys()
         {
-            get { return IExecuteWithSignature<Java.Util.List<TKey>>("getKeys", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<TKey>>("getKeys", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureFailure.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureFailure.cs
index 292929e88..df544c412 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureFailure.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureFailure.cs
@@ -58,47 +58,52 @@ public partial class CaptureFailure
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getFrameNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getRequest()"/>
         /// </summary>
-        public long FrameNumber
+        /// <returns><see cref="Android.Hardware.Camera2.CaptureRequest"/></returns>
+        public Android.Hardware.Camera2.CaptureRequest GetRequest()
         {
-            get { return IExecuteWithSignature<long>("getFrameNumber", "()J"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.CaptureRequest>("getRequest", "()Landroid/hardware/camera2/CaptureRequest;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getPhysicalCameraId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#wasImageCaptured()"/>
         /// </summary>
-        public Java.Lang.String PhysicalCameraId
+        /// <returns><see cref="bool"/></returns>
+        public bool WasImageCaptured()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPhysicalCameraId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("wasImageCaptured", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getReason()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getReason()"/>
         /// </summary>
-        public int Reason
+        /// <returns><see cref="int"/></returns>
+        public int GetReason()
         {
-            get { return IExecuteWithSignature<int>("getReason", "()I"); }
+            return IExecuteWithSignature<int>("getReason", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getRequest()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getSequenceId()"/>
         /// </summary>
-        public Android.Hardware.Camera2.CaptureRequest Request
+        /// <returns><see cref="int"/></returns>
+        public int GetSequenceId()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.CaptureRequest>("getRequest", "()Landroid/hardware/camera2/CaptureRequest;"); }
+            return IExecuteWithSignature<int>("getSequenceId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getSequenceId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getPhysicalCameraId()"/>
         /// </summary>
-        public int SequenceId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPhysicalCameraId()
         {
-            get { return IExecuteWithSignature<int>("getSequenceId", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPhysicalCameraId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#wasImageCaptured()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureFailure.html#getFrameNumber()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool WasImageCaptured()
+        /// <returns><see cref="long"/></returns>
+        public long GetFrameNumber()
         {
-            return IExecuteWithSignature<bool>("wasImageCaptured", "()Z");
+            return IExecuteWithSignature<long>("getFrameNumber", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureRequest.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureRequest.cs
index c855887d8..74c12592d 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureRequest.cs
@@ -434,13 +434,6 @@ public partial class CaptureRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.html#getTag()"/> 
-        /// </summary>
-        public object Tag
-        {
-            get { return IExecuteWithSignature("getTag", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.html#get(android.hardware.camera2.CaptureRequest.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera2.CaptureRequest.Key"/></param>
@@ -467,6 +460,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.html#getTag()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetTag()
+        {
+            return IExecuteWithSignature("getTag", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -615,11 +616,12 @@ public Key(Java.Lang.String arg0, Java.Lang.Class arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.Key.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.Key.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -666,11 +668,12 @@ public Key(Java.Lang.String arg0, Java.Lang.Class arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.Key.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureRequest.Key.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureResult.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureResult.cs
index 3f23de8a8..7ec3830bc 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureResult.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/CaptureResult.cs
@@ -172,7 +172,7 @@ public partial class CaptureResult
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#LENS_RADIAL_DISTORTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Hardware.Camera2.CaptureResult.Key LENS_RADIAL_DISTORTION { get { if (!_LENS_RADIAL_DISTORTIONReady) { _LENS_RADIAL_DISTORTIONContent = SGetField<Android.Hardware.Camera2.CaptureResult.Key>(LocalBridgeClazz, "LENS_RADIAL_DISTORTION"); _LENS_RADIAL_DISTORTIONReady = true; } return _LENS_RADIAL_DISTORTIONContent; } }
         private static Android.Hardware.Camera2.CaptureResult.Key _LENS_RADIAL_DISTORTIONContent = default;
         private static bool _LENS_RADIAL_DISTORTIONReady = false; // this is used because in case of generics 
@@ -605,42 +605,46 @@ public partial class CaptureResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#getCameraId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#get(android.hardware.camera2.CaptureResult.Key)"/>
         /// </summary>
-        public Java.Lang.String CameraId
+        /// <param name="arg0"><see cref="Android.Hardware.Camera2.CaptureResult.Key"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Get<T>(Android.Hardware.Camera2.CaptureResult.Key<T> arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCameraId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<T>("get", "(Landroid/hardware/camera2/CaptureResult$Key;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#getFrameNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#getRequest()"/>
         /// </summary>
-        public long FrameNumber
+        /// <returns><see cref="Android.Hardware.Camera2.CaptureRequest"/></returns>
+        public Android.Hardware.Camera2.CaptureRequest GetRequest()
         {
-            get { return IExecuteWithSignature<long>("getFrameNumber", "()J"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.CaptureRequest>("getRequest", "()Landroid/hardware/camera2/CaptureRequest;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#getRequest()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#getSequenceId()"/>
         /// </summary>
-        public Android.Hardware.Camera2.CaptureRequest Request
+        /// <returns><see cref="int"/></returns>
+        public int GetSequenceId()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.CaptureRequest>("getRequest", "()Landroid/hardware/camera2/CaptureRequest;"); }
+            return IExecuteWithSignature<int>("getSequenceId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#getSequenceId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#getCameraId()"/>
         /// </summary>
-        public int SequenceId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCameraId()
         {
-            get { return IExecuteWithSignature<int>("getSequenceId", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCameraId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#get(android.hardware.camera2.CaptureResult.Key)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.html#getFrameNumber()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Hardware.Camera2.CaptureResult.Key"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T Get<T>(Android.Hardware.Camera2.CaptureResult.Key<T> arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetFrameNumber()
         {
-            return IExecuteWithSignature<T>("get", "(Landroid/hardware/camera2/CaptureResult$Key;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<long>("getFrameNumber", "()J");
         }
 
         #endregion
@@ -676,11 +680,12 @@ public Key(Java.Lang.String arg0, Java.Lang.Class arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.Key.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.Key.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -727,11 +732,12 @@ public Key(Java.Lang.String arg0, Java.Lang.Class arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.Key.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/CaptureResult.Key.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/MultiResolutionImageReader.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/MultiResolutionImageReader.cs
index d61187454..9f00bdc00 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/MultiResolutionImageReader.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/MultiResolutionImageReader.cs
@@ -56,13 +56,6 @@ public MultiResolutionImageReader(Java.Util.Collection<Android.Hardware.Camera2.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/MultiResolutionImageReader.html#getSurface()"/> 
-        /// </summary>
-        public Android.View.Surface Surface
-        {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/MultiResolutionImageReader.html#getStreamInfoForImageReader(android.media.ImageReader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.ImageReader"/></param>
@@ -72,6 +65,14 @@ public Android.Hardware.Camera2.Params.MultiResolutionStreamInfo GetStreamInfoFo
             return IExecuteWithSignature<Android.Hardware.Camera2.Params.MultiResolutionStreamInfo>("getStreamInfoForImageReader", "(Landroid/media/ImageReader;)Landroid/hardware/camera2/params/MultiResolutionStreamInfo;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/MultiResolutionImageReader.html#getSurface()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetSurface()
+        {
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/MultiResolutionImageReader.html#close()"/>
         /// </summary>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/Capability.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/Capability.cs
index 17d3c8b03..72b1a96df 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/Capability.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/Capability.cs
@@ -46,18 +46,20 @@ public partial class Capability
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Capability.html#getMaxStreamingSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Capability.html#getMaxStreamingSize()"/>
         /// </summary>
-        public Android.Util.Size MaxStreamingSize
+        /// <returns><see cref="Android.Util.Size"/></returns>
+        public Android.Util.Size GetMaxStreamingSize()
         {
-            get { return IExecuteWithSignature<Android.Util.Size>("getMaxStreamingSize", "()Landroid/util/Size;"); }
+            return IExecuteWithSignature<Android.Util.Size>("getMaxStreamingSize", "()Landroid/util/Size;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Capability.html#getMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Capability.html#getMode()"/>
         /// </summary>
-        public int Mode
+        /// <returns><see cref="int"/></returns>
+        public int GetMode()
         {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); }
+            return IExecuteWithSignature<int>("getMode", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/DynamicRangeProfiles.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/DynamicRangeProfiles.cs
index affa8801a..8f9ac4750 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/DynamicRangeProfiles.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/DynamicRangeProfiles.cs
@@ -132,13 +132,6 @@ public DynamicRangeProfiles(long[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/DynamicRangeProfiles.html#getSupportedProfiles()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.Long> SupportedProfiles
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.Long>>("getSupportedProfiles", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/DynamicRangeProfiles.html#isExtraLatencyPresent(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -156,6 +149,14 @@ public bool IsExtraLatencyPresent(long arg0)
         {
             return IExecuteWithSignature<Java.Util.Set<Java.Lang.Long>>("getProfileCaptureRequestConstraints", "(J)Ljava/util/Set;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/DynamicRangeProfiles.html#getSupportedProfiles()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Long> GetSupportedProfiles()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Long>>("getSupportedProfiles", "()Ljava/util/Set;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/ExtensionSessionConfiguration.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/ExtensionSessionConfiguration.cs
index 7343be638..a5e0a9142 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/ExtensionSessionConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/ExtensionSessionConfiguration.cs
@@ -57,39 +57,52 @@ public ExtensionSessionConfiguration(int arg0, Java.Util.List<Android.Hardware.C
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getExecutor()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getStateCallback()"/>
         /// </summary>
-        public Java.Util.Concurrent.Executor Executor
+        /// <returns><see cref="Android.Hardware.Camera2.CameraExtensionSession.StateCallback"/></returns>
+        public Android.Hardware.Camera2.CameraExtensionSession.StateCallback GetStateCallback()
         {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getExecutor", "()Ljava/util/concurrent/Executor;"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.CameraExtensionSession.StateCallback>("getStateCallback", "()Landroid/hardware/camera2/CameraExtensionSession$StateCallback;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getExtension()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getPostviewOutputConfiguration()"/>
         /// </summary>
-        public int Extension
+        /// <returns><see cref="Android.Hardware.Camera2.Params.OutputConfiguration"/></returns>
+        public Android.Hardware.Camera2.Params.OutputConfiguration GetPostviewOutputConfiguration()
         {
-            get { return IExecuteWithSignature<int>("getExtension", "()I"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.Params.OutputConfiguration>("getPostviewOutputConfiguration", "()Landroid/hardware/camera2/params/OutputConfiguration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getOutputConfigurations()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getExtension()"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration> OutputConfigurations
+        /// <returns><see cref="int"/></returns>
+        public int GetExtension()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration>>("getOutputConfigurations", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getExtension", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getPostviewOutputConfiguration()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#setPostviewOutputConfiguration(android.hardware.camera2.params.OutputConfiguration)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getExecutor()"/>
         /// </summary>
-        public Android.Hardware.Camera2.Params.OutputConfiguration PostviewOutputConfiguration
+        /// <returns><see cref="Java.Util.Concurrent.Executor"/></returns>
+        public Java.Util.Concurrent.Executor GetExecutor()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.Params.OutputConfiguration>("getPostviewOutputConfiguration", "()Landroid/hardware/camera2/params/OutputConfiguration;"); } set { IExecuteWithSignature("setPostviewOutputConfiguration", "(Landroid/hardware/camera2/params/OutputConfiguration;)V", value); }
+            return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getExecutor", "()Ljava/util/concurrent/Executor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getStateCallback()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#getOutputConfigurations()"/>
         /// </summary>
-        public Android.Hardware.Camera2.CameraExtensionSession.StateCallback StateCallback
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration> GetOutputConfigurations()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.CameraExtensionSession.StateCallback>("getStateCallback", "()Landroid/hardware/camera2/CameraExtensionSession$StateCallback;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration>>("getOutputConfigurations", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/ExtensionSessionConfiguration.html#setPostviewOutputConfiguration(android.hardware.camera2.params.OutputConfiguration)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Hardware.Camera2.Params.OutputConfiguration"/></param>
+        public void SetPostviewOutputConfiguration(Android.Hardware.Camera2.Params.OutputConfiguration arg0)
+        {
+            IExecuteWithSignature("setPostviewOutputConfiguration", "(Landroid/hardware/camera2/params/OutputConfiguration;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/Face.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/Face.cs
index ef1d25aba..f50175b0d 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/Face.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/Face.cs
@@ -64,46 +64,52 @@ public partial class Face
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getLeftEyePosition()"/>
         /// </summary>
-        public Android.Graphics.Rect Bounds
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetLeftEyePosition()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getLeftEyePosition", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getMouthPosition()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetMouthPosition()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getMouthPosition", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getLeftEyePosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getRightEyePosition()"/>
         /// </summary>
-        public Android.Graphics.Point LeftEyePosition
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetRightEyePosition()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getLeftEyePosition", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getRightEyePosition", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getMouthPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getBounds()"/>
         /// </summary>
-        public Android.Graphics.Point MouthPosition
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getMouthPosition", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getRightEyePosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getId()"/>
         /// </summary>
-        public Android.Graphics.Point RightEyePosition
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getRightEyePosition", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getScore()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/Face.html#getScore()"/>
         /// </summary>
-        public int Score
+        /// <returns><see cref="int"/></returns>
+        public int GetScore()
         {
-            get { return IExecuteWithSignature<int>("getScore", "()I"); }
+            return IExecuteWithSignature<int>("getScore", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/InputConfiguration.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/InputConfiguration.cs
index 1fa368c82..5bf474718 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/InputConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/InputConfiguration.cs
@@ -65,33 +65,36 @@ public InputConfiguration(Java.Util.Collection<Android.Hardware.Camera2.Params.M
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration.html#isMultiResolution()"/>
         /// </summary>
-        public int Format
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMultiResolution()
         {
-            get { return IExecuteWithSignature<int>("getFormat", "()I"); }
+            return IExecuteWithSignature<bool>("isMultiResolution", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration.html#getFormat()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="int"/></returns>
+        public int GetFormat()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<int>("getFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration.html#getHeight()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration.html#isMultiResolution()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/InputConfiguration.html#getWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMultiResolution()
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            return IExecuteWithSignature<bool>("isMultiResolution", "()Z");
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/LensShadingMap.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/LensShadingMap.cs
index 3cfb6abd3..48bb730ca 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/LensShadingMap.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/LensShadingMap.cs
@@ -52,27 +52,6 @@ public partial class LensShadingMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/LensShadingMap.html#getColumnCount()"/> 
-        /// </summary>
-        public int ColumnCount
-        {
-            get { return IExecuteWithSignature<int>("getColumnCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/LensShadingMap.html#getGainFactorCount()"/> 
-        /// </summary>
-        public int GainFactorCount
-        {
-            get { return IExecuteWithSignature<int>("getGainFactorCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/LensShadingMap.html#getRowCount()"/> 
-        /// </summary>
-        public int RowCount
-        {
-            get { return IExecuteWithSignature<int>("getRowCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/LensShadingMap.html#getGainFactorVector(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -94,6 +73,30 @@ public float GetGainFactor(int arg0, int arg1, int arg2)
             return IExecute<float>("getGainFactor", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/LensShadingMap.html#getColumnCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnCount()
+        {
+            return IExecuteWithSignature<int>("getColumnCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/LensShadingMap.html#getGainFactorCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGainFactorCount()
+        {
+            return IExecuteWithSignature<int>("getGainFactorCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/LensShadingMap.html#getRowCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRowCount()
+        {
+            return IExecuteWithSignature<int>("getRowCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/LensShadingMap.html#copyGainFactors(float[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MandatoryStreamCombination.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MandatoryStreamCombination.cs
index 1bde4c62d..faa61b32e 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MandatoryStreamCombination.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MandatoryStreamCombination.cs
@@ -46,26 +46,28 @@ public partial class MandatoryStreamCombination
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html#isReprocessable()"/>
         /// </summary>
-        public Java.Lang.CharSequence Description
+        /// <returns><see cref="bool"/></returns>
+        public bool IsReprocessable()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isReprocessable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html#getStreamsInformation()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html#getDescription()"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.Params.MandatoryStreamCombination.MandatoryStreamInformation> StreamsInformation
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescription()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.Params.MandatoryStreamCombination.MandatoryStreamInformation>>("getStreamsInformation", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html#isReprocessable()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html#getStreamsInformation()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsReprocessable()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.Params.MandatoryStreamCombination.MandatoryStreamInformation> GetStreamsInformation()
         {
-            return IExecuteWithSignature<bool>("isReprocessable", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.Params.MandatoryStreamCombination.MandatoryStreamInformation>>("getStreamsInformation", "()Ljava/util/List;");
         }
 
         #endregion
@@ -92,34 +94,6 @@ public partial class MandatoryStreamInformation
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#getAvailableSizes()"/> 
-            /// </summary>
-            public Java.Util.List<Android.Util.Size> AvailableSizes
-            {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Util.Size>>("getAvailableSizes", "()Ljava/util/List;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#getFormat()"/> 
-            /// </summary>
-            public int Format
-            {
-                get { return IExecuteWithSignature<int>("getFormat", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#get10BitFormat()"/> 
-            /// </summary>
-            public int Get10BitFormat
-            {
-                get { return IExecuteWithSignature<int>("get10BitFormat", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#getStreamUseCase()"/> 
-            /// </summary>
-            public long StreamUseCase
-            {
-                get { return IExecuteWithSignature<long>("getStreamUseCase", "()J"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#is10BitCapable()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -151,6 +125,38 @@ public bool IsUltraHighResolution()
             {
                 return IExecuteWithSignature<bool>("isUltraHighResolution", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#get10BitFormat()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int Get10BitFormat()
+            {
+                return IExecuteWithSignature<int>("get10BitFormat", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#getFormat()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetFormat()
+            {
+                return IExecuteWithSignature<int>("getFormat", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#getAvailableSizes()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.Util.Size> GetAvailableSizes()
+            {
+                return IExecuteWithSignature<Java.Util.List<Android.Util.Size>>("getAvailableSizes", "()Ljava/util/List;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.MandatoryStreamInformation.html#getStreamUseCase()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetStreamUseCase()
+            {
+                return IExecuteWithSignature<long>("getStreamUseCase", "()J");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MeteringRectangle.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MeteringRectangle.cs
index 66a68b293..16910ab4d 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MeteringRectangle.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MeteringRectangle.cs
@@ -95,60 +95,68 @@ public MeteringRectangle(int arg0, int arg1, int arg2, int arg3, int arg4)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getUpperLeftPoint()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetUpperLeftPoint()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getUpperLeftPoint", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getMeteringWeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getRect()"/>
         /// </summary>
-        public int MeteringWeight
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetRect()
         {
-            get { return IExecuteWithSignature<int>("getMeteringWeight", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getRect", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getRect()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getSize()"/>
         /// </summary>
-        public Android.Graphics.Rect Rect
+        /// <returns><see cref="Android.Util.Size"/></returns>
+        public Android.Util.Size GetSize()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getRect", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Util.Size>("getSize", "()Landroid/util/Size;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getHeight()"/>
         /// </summary>
-        public Android.Util.Size Size
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<Android.Util.Size>("getSize", "()Landroid/util/Size;"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getUpperLeftPoint()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getMeteringWeight()"/>
         /// </summary>
-        public Android.Graphics.Point UpperLeftPoint
+        /// <returns><see cref="int"/></returns>
+        public int GetMeteringWeight()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getUpperLeftPoint", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<int>("getMeteringWeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getWidth()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getX()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getX()"/>
         /// </summary>
-        public int X
+        /// <returns><see cref="int"/></returns>
+        public int GetX()
         {
-            get { return IExecuteWithSignature<int>("getX", "()I"); }
+            return IExecuteWithSignature<int>("getX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getY()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MeteringRectangle.html#getY()"/>
         /// </summary>
-        public int Y
+        /// <returns><see cref="int"/></returns>
+        public int GetY()
         {
-            get { return IExecuteWithSignature<int>("getY", "()I"); }
+            return IExecuteWithSignature<int>("getY", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MultiResolutionStreamConfigurationMap.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MultiResolutionStreamConfigurationMap.cs
index 4e8cd80cc..ab6a3173b 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MultiResolutionStreamConfigurationMap.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MultiResolutionStreamConfigurationMap.cs
@@ -46,18 +46,20 @@ public partial class MultiResolutionStreamConfigurationMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamConfigurationMap.html#getInputFormats()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamConfigurationMap.html#getInputFormats()"/>
         /// </summary>
-        public int[] InputFormats
+        /// <returns><see cref="int"/></returns>
+        public int[] GetInputFormats()
         {
-            get { return IExecuteWithSignatureArray<int>("getInputFormats", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getInputFormats", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamConfigurationMap.html#getOutputFormats()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamConfigurationMap.html#getOutputFormats()"/>
         /// </summary>
-        public int[] OutputFormats
+        /// <returns><see cref="int"/></returns>
+        public int[] GetOutputFormats()
         {
-            get { return IExecuteWithSignatureArray<int>("getOutputFormats", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getOutputFormats", "()[I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamConfigurationMap.html#getInputInfo(int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MultiResolutionStreamInfo.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MultiResolutionStreamInfo.cs
index 833383490..efd0affe8 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MultiResolutionStreamInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/MultiResolutionStreamInfo.cs
@@ -56,25 +56,28 @@ public MultiResolutionStreamInfo(int arg0, int arg1, Java.Lang.String arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamInfo.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamInfo.html#getHeight()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamInfo.html#getPhysicalCameraId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamInfo.html#getWidth()"/>
         /// </summary>
-        public Java.Lang.String PhysicalCameraId
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPhysicalCameraId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamInfo.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/MultiResolutionStreamInfo.html#getPhysicalCameraId()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPhysicalCameraId()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPhysicalCameraId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/OisSample.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/OisSample.cs
index 658f43445..26d2bdfc7 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/OisSample.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/OisSample.cs
@@ -56,25 +56,28 @@ public OisSample(long arg0, float arg1, float arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OisSample.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OisSample.html#getXshift()"/>
         /// </summary>
-        public long Timestamp
+        /// <returns><see cref="float"/></returns>
+        public float GetXshift()
         {
-            get { return IExecuteWithSignature<long>("getTimestamp", "()J"); }
+            return IExecuteWithSignature<float>("getXshift", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OisSample.html#getXshift()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OisSample.html#getYshift()"/>
         /// </summary>
-        public float Xshift
+        /// <returns><see cref="float"/></returns>
+        public float GetYshift()
         {
-            get { return IExecuteWithSignature<float>("getXshift", "()F"); }
+            return IExecuteWithSignature<float>("getYshift", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OisSample.html#getYshift()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OisSample.html#getTimestamp()"/>
         /// </summary>
-        public float Yshift
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestamp()
         {
-            get { return IExecuteWithSignature<float>("getYshift", "()F"); }
+            return IExecuteWithSignature<long>("getTimestamp", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/OutputConfiguration.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/OutputConfiguration.cs
index a1df0ff3b..cab290918 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/OutputConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/OutputConfiguration.cs
@@ -147,76 +147,84 @@ public OutputConfiguration(int arg0, Android.View.Surface arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getDynamicRangeProfile()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setDynamicRangeProfile(long)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getSurface()"/>
         /// </summary>
-        public long DynamicRangeProfile
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetSurface()
         {
-            get { return IExecuteWithSignature<long>("getDynamicRangeProfile", "()J"); } set { IExecuteWithSignature("setDynamicRangeProfile", "(J)V", value); }
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getMaxSharedSurfaceCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#isReadoutTimestampEnabled()"/>
         /// </summary>
-        public int MaxSharedSurfaceCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsReadoutTimestampEnabled()
         {
-            get { return IExecuteWithSignature<int>("getMaxSharedSurfaceCount", "()I"); }
+            return IExecuteWithSignature<bool>("isReadoutTimestampEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getMirrorMode()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setMirrorMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#describeContents()"/>
         /// </summary>
-        public int MirrorMode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getMirrorMode", "()I"); } set { IExecuteWithSignature("setMirrorMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getStreamUseCase()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setStreamUseCase(long)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getMaxSharedSurfaceCount()"/>
         /// </summary>
-        public long StreamUseCase
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSharedSurfaceCount()
         {
-            get { return IExecuteWithSignature<long>("getStreamUseCase", "()J"); } set { IExecuteWithSignature("setStreamUseCase", "(J)V", value); }
+            return IExecuteWithSignature<int>("getMaxSharedSurfaceCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getSurface()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getMirrorMode()"/>
         /// </summary>
-        public Android.View.Surface Surface
+        /// <returns><see cref="int"/></returns>
+        public int GetMirrorMode()
         {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); }
+            return IExecuteWithSignature<int>("getMirrorMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getSurfaceGroupId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getSurfaceGroupId()"/>
         /// </summary>
-        public int SurfaceGroupId
+        /// <returns><see cref="int"/></returns>
+        public int GetSurfaceGroupId()
         {
-            get { return IExecuteWithSignature<int>("getSurfaceGroupId", "()I"); }
+            return IExecuteWithSignature<int>("getSurfaceGroupId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getSurfaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getTimestampBase()"/>
         /// </summary>
-        public Java.Util.List<Android.View.Surface> Surfaces
+        /// <returns><see cref="int"/></returns>
+        public int GetTimestampBase()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Surface>>("getSurfaces", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getTimestampBase", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getTimestampBase()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setTimestampBase(int)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getSurfaces()"/>
         /// </summary>
-        public int TimestampBase
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Surface> GetSurfaces()
         {
-            get { return IExecuteWithSignature<int>("getTimestampBase", "()I"); } set { IExecuteWithSignature("setTimestampBase", "(I)V", value); }
+            return IExecuteWithSignature<Java.Util.List<Android.View.Surface>>("getSurfaces", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#isReadoutTimestampEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getDynamicRangeProfile()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsReadoutTimestampEnabled()
+        /// <returns><see cref="long"/></returns>
+        public long GetDynamicRangeProfile()
         {
-            return IExecuteWithSignature<bool>("isReadoutTimestampEnabled", "()Z");
+            return IExecuteWithSignature<long>("getDynamicRangeProfile", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#getStreamUseCase()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetStreamUseCase()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getStreamUseCase", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#addSensorPixelModeUsed(int)"/>
@@ -258,6 +266,22 @@ public void RemoveSurface(Android.View.Surface arg0)
             IExecuteWithSignature("removeSurface", "(Landroid/view/Surface;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setDynamicRangeProfile(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetDynamicRangeProfile(long arg0)
+        {
+            IExecuteWithSignature("setDynamicRangeProfile", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setMirrorMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMirrorMode(int arg0)
+        {
+            IExecuteWithSignature("setMirrorMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setPhysicalCameraId(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -274,6 +298,22 @@ public void SetReadoutTimestampEnabled(bool arg0)
             IExecuteWithSignature("setReadoutTimestampEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setStreamUseCase(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetStreamUseCase(long arg0)
+        {
+            IExecuteWithSignature("setStreamUseCase", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#setTimestampBase(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTimestampBase(int arg0)
+        {
+            IExecuteWithSignature("setTimestampBase", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/OutputConfiguration.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/RecommendedStreamConfigurationMap.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/RecommendedStreamConfigurationMap.cs
index 18f3a0660..12ca2165f 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/RecommendedStreamConfigurationMap.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/RecommendedStreamConfigurationMap.cs
@@ -94,34 +94,6 @@ public partial class RecommendedStreamConfigurationMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getHighSpeedVideoSizes()"/> 
-        /// </summary>
-        public Java.Util.Set<Android.Util.Size> HighSpeedVideoSizes
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Util.Size>>("getHighSpeedVideoSizes", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getInputFormats()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.Integer> InputFormats
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getInputFormats", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getOutputFormats()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.Integer> OutputFormats
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getOutputFormats", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getRecommendedUseCase()"/> 
-        /// </summary>
-        public int RecommendedUseCase
-        {
-            get { return IExecuteWithSignature<int>("getRecommendedUseCase", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getOutputSizes(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
@@ -169,6 +141,14 @@ public bool IsOutputSupportedFor(int arg0)
             return IExecuteWithSignature<bool>("isOutputSupportedFor", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getRecommendedUseCase()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRecommendedUseCase()
+        {
+            return IExecuteWithSignature<int>("getRecommendedUseCase", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getHighResolutionOutputSizes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -178,6 +158,14 @@ public bool IsOutputSupportedFor(int arg0)
             return IExecuteWithSignature<Java.Util.Set<Android.Util.Size>>("getHighResolutionOutputSizes", "(I)Ljava/util/Set;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getHighSpeedVideoSizes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Util.Size> GetHighSpeedVideoSizes()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Android.Util.Size>>("getHighSpeedVideoSizes", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getInputSizes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -196,6 +184,22 @@ public bool IsOutputSupportedFor(int arg0)
             return IExecuteWithSignature<Java.Util.Set<Android.Util.Size>>("getOutputSizes", "(I)Ljava/util/Set;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getInputFormats()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Integer> GetInputFormats()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getInputFormats", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getOutputFormats()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Integer> GetOutputFormats()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getOutputFormats", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RecommendedStreamConfigurationMap.html#getValidOutputFormatsForInput(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/RggbChannelVector.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/RggbChannelVector.cs
index cb759784a..7bfc733d3 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/RggbChannelVector.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/RggbChannelVector.cs
@@ -87,41 +87,45 @@ public RggbChannelVector(float arg0, float arg1, float arg2, float arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getBlue()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getBlue()"/>
         /// </summary>
-        public float Blue
+        /// <returns><see cref="float"/></returns>
+        public float GetBlue()
         {
-            get { return IExecuteWithSignature<float>("getBlue", "()F"); }
+            return IExecuteWithSignature<float>("getBlue", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getGreenEven()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getComponent(int)"/>
         /// </summary>
-        public float GreenEven
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="float"/></returns>
+        public float GetComponent(int arg0)
         {
-            get { return IExecuteWithSignature<float>("getGreenEven", "()F"); }
+            return IExecuteWithSignature<float>("getComponent", "(I)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getGreenOdd()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getGreenEven()"/>
         /// </summary>
-        public float GreenOdd
+        /// <returns><see cref="float"/></returns>
+        public float GetGreenEven()
         {
-            get { return IExecuteWithSignature<float>("getGreenOdd", "()F"); }
+            return IExecuteWithSignature<float>("getGreenEven", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getRed()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getGreenOdd()"/>
         /// </summary>
-        public float Red
+        /// <returns><see cref="float"/></returns>
+        public float GetGreenOdd()
         {
-            get { return IExecuteWithSignature<float>("getRed", "()F"); }
+            return IExecuteWithSignature<float>("getGreenOdd", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getComponent(int)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#getRed()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
-        public float GetComponent(int arg0)
+        public float GetRed()
         {
-            return IExecuteWithSignature<float>("getComponent", "(I)F", arg0);
+            return IExecuteWithSignature<float>("getRed", "()F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/RggbChannelVector.html#copyTo(float[],int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/SessionConfiguration.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/SessionConfiguration.cs
index acf9c4f18..136446d55 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/SessionConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/SessionConfiguration.cs
@@ -75,61 +75,68 @@ public SessionConfiguration(int arg0, Java.Util.List<Android.Hardware.Camera2.Pa
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getColorSpace()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#setColorSpace(android.graphics.ColorSpace.Named)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getColorSpace()"/>
         /// </summary>
-        public Android.Graphics.ColorSpace ColorSpace
+        /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+        public Android.Graphics.ColorSpace GetColorSpace()
         {
-            get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;"); } set { IExecuteWithSignature("setColorSpace", "(Landroid/graphics/ColorSpace$Named;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.ColorSpace>("getColorSpace", "()Landroid/graphics/ColorSpace;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getExecutor()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getStateCallback()"/>
         /// </summary>
-        public Java.Util.Concurrent.Executor Executor
+        /// <returns><see cref="Android.Hardware.Camera2.CameraCaptureSession.StateCallback"/></returns>
+        public Android.Hardware.Camera2.CameraCaptureSession.StateCallback GetStateCallback()
         {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getExecutor", "()Ljava/util/concurrent/Executor;"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.CameraCaptureSession.StateCallback>("getStateCallback", "()Landroid/hardware/camera2/CameraCaptureSession$StateCallback;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getInputConfiguration()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#setInputConfiguration(android.hardware.camera2.params.InputConfiguration)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getSessionParameters()"/>
         /// </summary>
-        public Android.Hardware.Camera2.Params.InputConfiguration InputConfiguration
+        /// <returns><see cref="Android.Hardware.Camera2.CaptureRequest"/></returns>
+        public Android.Hardware.Camera2.CaptureRequest GetSessionParameters()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.Params.InputConfiguration>("getInputConfiguration", "()Landroid/hardware/camera2/params/InputConfiguration;"); } set { IExecuteWithSignature("setInputConfiguration", "(Landroid/hardware/camera2/params/InputConfiguration;)V", value); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.CaptureRequest>("getSessionParameters", "()Landroid/hardware/camera2/CaptureRequest;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getOutputConfigurations()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getInputConfiguration()"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration> OutputConfigurations
+        /// <returns><see cref="Android.Hardware.Camera2.Params.InputConfiguration"/></returns>
+        public Android.Hardware.Camera2.Params.InputConfiguration GetInputConfiguration()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration>>("getOutputConfigurations", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Hardware.Camera2.Params.InputConfiguration>("getInputConfiguration", "()Landroid/hardware/camera2/params/InputConfiguration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getSessionParameters()"/> <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#setSessionParameters(android.hardware.camera2.CaptureRequest)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#describeContents()"/>
         /// </summary>
-        public Android.Hardware.Camera2.CaptureRequest SessionParameters
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.CaptureRequest>("getSessionParameters", "()Landroid/hardware/camera2/CaptureRequest;"); } set { IExecuteWithSignature("setSessionParameters", "(Landroid/hardware/camera2/CaptureRequest;)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getSessionType()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getSessionType()"/>
         /// </summary>
-        public int SessionType
+        /// <returns><see cref="int"/></returns>
+        public int GetSessionType()
         {
-            get { return IExecuteWithSignature<int>("getSessionType", "()I"); }
+            return IExecuteWithSignature<int>("getSessionType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getStateCallback()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getExecutor()"/>
         /// </summary>
-        public Android.Hardware.Camera2.CameraCaptureSession.StateCallback StateCallback
+        /// <returns><see cref="Java.Util.Concurrent.Executor"/></returns>
+        public Java.Util.Concurrent.Executor GetExecutor()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Camera2.CameraCaptureSession.StateCallback>("getStateCallback", "()Landroid/hardware/camera2/CameraCaptureSession$StateCallback;"); }
+            return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getExecutor", "()Ljava/util/concurrent/Executor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#getOutputConfigurations()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration> GetOutputConfigurations()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.Params.OutputConfiguration>>("getOutputConfigurations", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#clearColorSpace()"/>
@@ -139,6 +146,30 @@ public void ClearColorSpace()
             IExecuteWithSignature("clearColorSpace", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#setColorSpace(android.graphics.ColorSpace.Named)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.ColorSpace.Named"/></param>
+        public void SetColorSpace(Android.Graphics.ColorSpace.Named arg0)
+        {
+            IExecuteWithSignature("setColorSpace", "(Landroid/graphics/ColorSpace$Named;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#setInputConfiguration(android.hardware.camera2.params.InputConfiguration)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Hardware.Camera2.Params.InputConfiguration"/></param>
+        public void SetInputConfiguration(Android.Hardware.Camera2.Params.InputConfiguration arg0)
+        {
+            IExecuteWithSignature("setInputConfiguration", "(Landroid/hardware/camera2/params/InputConfiguration;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#setSessionParameters(android.hardware.camera2.CaptureRequest)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Hardware.Camera2.CaptureRequest"/></param>
+        public void SetSessionParameters(Android.Hardware.Camera2.CaptureRequest arg0)
+        {
+            IExecuteWithSignature("setSessionParameters", "(Landroid/hardware/camera2/CaptureRequest;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/SessionConfiguration.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/StreamConfigurationMap.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/StreamConfigurationMap.cs
index 8f33b2a8f..c62510f9e 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/StreamConfigurationMap.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/Params/StreamConfigurationMap.cs
@@ -55,27 +55,6 @@ public static bool IsOutputSupportedFor(Java.Lang.Class arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getHighSpeedVideoSizes()"/> 
-        /// </summary>
-        public Android.Util.Size[] HighSpeedVideoSizes
-        {
-            get { return IExecuteWithSignatureArray<Android.Util.Size>("getHighSpeedVideoSizes", "()[Landroid/util/Size;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getInputFormats()"/> 
-        /// </summary>
-        public int[] InputFormats
-        {
-            get { return IExecuteWithSignatureArray<int>("getInputFormats", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getOutputFormats()"/> 
-        /// </summary>
-        public int[] OutputFormats
-        {
-            get { return IExecuteWithSignatureArray<int>("getOutputFormats", "()[I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getOutputSizes(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
@@ -114,6 +93,14 @@ public Android.Util.Size[] GetHighResolutionOutputSizes(int arg0)
             return IExecuteWithSignatureArray<Android.Util.Size>("getHighResolutionOutputSizes", "(I)[Landroid/util/Size;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getHighSpeedVideoSizes()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Util.Size"/></returns>
+        public Android.Util.Size[] GetHighSpeedVideoSizes()
+        {
+            return IExecuteWithSignatureArray<Android.Util.Size>("getHighSpeedVideoSizes", "()[Landroid/util/Size;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getInputSizes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -150,6 +137,22 @@ public bool IsOutputSupportedFor(int arg0)
             return IExecuteWithSignature<bool>("isOutputSupportedFor", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getInputFormats()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetInputFormats()
+        {
+            return IExecuteWithSignatureArray<int>("getInputFormats", "()[I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getOutputFormats()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetOutputFormats()
+        {
+            return IExecuteWithSignatureArray<int>("getOutputFormats", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getValidOutputFormatsForInput(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Camera2/TotalCaptureResult.cs b/src/net/Netdroid/Generated/Android/Hardware/Camera2/TotalCaptureResult.cs
index cc09a8dff..002b7dfbf 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Camera2/TotalCaptureResult.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Camera2/TotalCaptureResult.cs
@@ -46,26 +46,29 @@ public partial class TotalCaptureResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/TotalCaptureResult.html#getPartialResults()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/TotalCaptureResult.html#getPartialResults()"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Camera2.CaptureResult> PartialResults
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Camera2.CaptureResult> GetPartialResults()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureResult>>("getPartialResults", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Camera2.CaptureResult>>("getPartialResults", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/TotalCaptureResult.html#getPhysicalCameraResults()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/TotalCaptureResult.html#getPhysicalCameraResults()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Map<Java.Lang.String, Android.Hardware.Camera2.CaptureResult> PhysicalCameraResults
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Map<Java.Lang.String, Android.Hardware.Camera2.CaptureResult> GetPhysicalCameraResults()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.Hardware.Camera2.CaptureResult>>("getPhysicalCameraResults", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.Hardware.Camera2.CaptureResult>>("getPhysicalCameraResults", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/camera2/TotalCaptureResult.html#getPhysicalCameraTotalResults()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/camera2/TotalCaptureResult.html#getPhysicalCameraTotalResults()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Android.Hardware.Camera2.TotalCaptureResult> PhysicalCameraTotalResults
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Android.Hardware.Camera2.TotalCaptureResult> GetPhysicalCameraTotalResults()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.Hardware.Camera2.TotalCaptureResult>>("getPhysicalCameraTotalResults", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Android.Hardware.Camera2.TotalCaptureResult>>("getPhysicalCameraTotalResults", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/ConsumerIrManager.cs b/src/net/Netdroid/Generated/Android/Hardware/ConsumerIrManager.cs
index 74de90cd1..4a84e7713 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/ConsumerIrManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/ConsumerIrManager.cs
@@ -46,11 +46,12 @@ public partial class ConsumerIrManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/ConsumerIrManager.html#getCarrierFrequencies()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/ConsumerIrManager.html#getCarrierFrequencies()"/>
         /// </summary>
-        public Android.Hardware.ConsumerIrManager.CarrierFrequencyRange[] CarrierFrequencies
+        /// <returns><see cref="Android.Hardware.ConsumerIrManager.CarrierFrequencyRange"/></returns>
+        public Android.Hardware.ConsumerIrManager.CarrierFrequencyRange[] GetCarrierFrequencies()
         {
-            get { return IExecuteWithSignatureArray<Android.Hardware.ConsumerIrManager.CarrierFrequencyRange>("getCarrierFrequencies", "()[Landroid/hardware/ConsumerIrManager$CarrierFrequencyRange;"); }
+            return IExecuteWithSignatureArray<Android.Hardware.ConsumerIrManager.CarrierFrequencyRange>("getCarrierFrequencies", "()[Landroid/hardware/ConsumerIrManager$CarrierFrequencyRange;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/ConsumerIrManager.html#hasIrEmitter()"/>
@@ -104,18 +105,20 @@ public CarrierFrequencyRange(Android.Hardware.ConsumerIrManager arg0, int arg1,
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/ConsumerIrManager.CarrierFrequencyRange.html#getMaxFrequency()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/ConsumerIrManager.CarrierFrequencyRange.html#getMaxFrequency()"/>
             /// </summary>
-            public int MaxFrequency
+            /// <returns><see cref="int"/></returns>
+            public int GetMaxFrequency()
             {
-                get { return IExecuteWithSignature<int>("getMaxFrequency", "()I"); }
+                return IExecuteWithSignature<int>("getMaxFrequency", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/ConsumerIrManager.CarrierFrequencyRange.html#getMinFrequency()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/ConsumerIrManager.CarrierFrequencyRange.html#getMinFrequency()"/>
             /// </summary>
-            public int MinFrequency
+            /// <returns><see cref="int"/></returns>
+            public int GetMinFrequency()
             {
-                get { return IExecuteWithSignature<int>("getMinFrequency", "()I"); }
+                return IExecuteWithSignature<int>("getMinFrequency", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Display/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Hardware/Display/AllPackageClasses.cs
index d85c5adcd..987081de0 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Display/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Display/AllPackageClasses.cs
@@ -121,10 +121,13 @@ public partial class DisplayListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public DisplayListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.hardware.display.DisplayManager_DisplayListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.hardware.display.DisplayListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -146,10 +149,13 @@ public partial class DisplayListenerDirect : DisplayListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.hardware.display.DisplayManager$DisplayListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.hardware.display.DisplayManager$DisplayListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -267,12 +273,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Display/DeviceProductInfo.cs b/src/net/Netdroid/Generated/Android/Hardware/Display/DeviceProductInfo.cs
index 1ef65c4ed..8cc86eb3d 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Display/DeviceProductInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Display/DeviceProductInfo.cs
@@ -88,61 +88,68 @@ public DeviceProductInfo(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getConnectionToSinkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#describeContents()"/>
         /// </summary>
-        public int ConnectionToSinkType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getConnectionToSinkType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getManufacturerPnpId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getConnectionToSinkType()"/>
         /// </summary>
-        public Java.Lang.String ManufacturerPnpId
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionToSinkType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getManufacturerPnpId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getConnectionToSinkType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getManufactureWeek()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getManufactureWeek()"/>
         /// </summary>
-        public int ManufactureWeek
+        /// <returns><see cref="int"/></returns>
+        public int GetManufactureWeek()
         {
-            get { return IExecuteWithSignature<int>("getManufactureWeek", "()I"); }
+            return IExecuteWithSignature<int>("getManufactureWeek", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getManufactureYear()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getManufactureYear()"/>
         /// </summary>
-        public int ManufactureYear
+        /// <returns><see cref="int"/></returns>
+        public int GetManufactureYear()
         {
-            get { return IExecuteWithSignature<int>("getManufactureYear", "()I"); }
+            return IExecuteWithSignature<int>("getManufactureYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getModelYear()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getModelYear()"/>
         /// </summary>
-        public int ModelYear
+        /// <returns><see cref="int"/></returns>
+        public int GetModelYear()
         {
-            get { return IExecuteWithSignature<int>("getModelYear", "()I"); }
+            return IExecuteWithSignature<int>("getModelYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getManufacturerPnpId()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetManufacturerPnpId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getManufacturerPnpId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getProductId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getName()"/>
         /// </summary>
-        public Java.Lang.String ProductId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProductId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#getProductId()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProductId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getProductId", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/display/DeviceProductInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Display/DisplayManager.cs b/src/net/Netdroid/Generated/Android/Hardware/Display/DisplayManager.cs
index 26d2e19d9..4e6f40ec0 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Display/DisplayManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Display/DisplayManager.cs
@@ -106,25 +106,12 @@ public partial class DisplayManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#getDisplays()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#getHdrConversionMode()"/>
         /// </summary>
-        public Android.View.Display[] Displays
+        /// <returns><see cref="Android.Hardware.Display.HdrConversionMode"/></returns>
+        public Android.Hardware.Display.HdrConversionMode GetHdrConversionMode()
         {
-            get { return IExecuteWithSignatureArray<Android.View.Display>("getDisplays", "()[Landroid/view/Display;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#getHdrConversionMode()"/> 
-        /// </summary>
-        public Android.Hardware.Display.HdrConversionMode HdrConversionMode
-        {
-            get { return IExecuteWithSignature<Android.Hardware.Display.HdrConversionMode>("getHdrConversionMode", "()Landroid/hardware/display/HdrConversionMode;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#getMatchContentFrameRateUserPreference()"/> 
-        /// </summary>
-        public int MatchContentFrameRateUserPreference
-        {
-            get { return IExecuteWithSignature<int>("getMatchContentFrameRateUserPreference", "()I"); }
+            return IExecuteWithSignature<Android.Hardware.Display.HdrConversionMode>("getHdrConversionMode", "()Landroid/hardware/display/HdrConversionMode;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#createVirtualDisplay(android.hardware.display.VirtualDisplayConfig,android.os.Handler,android.hardware.display.VirtualDisplay.Callback)"/>
@@ -186,6 +173,14 @@ public Android.View.Display GetDisplay(int arg0)
             return IExecuteWithSignature<Android.View.Display>("getDisplay", "(I)Landroid/view/Display;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#getDisplays()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Display"/></returns>
+        public Android.View.Display[] GetDisplays()
+        {
+            return IExecuteWithSignatureArray<Android.View.Display>("getDisplays", "()[Landroid/view/Display;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#getDisplays(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -195,6 +190,14 @@ public Android.View.Display[] GetDisplays(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<Android.View.Display>("getDisplays", "(Ljava/lang/String;)[Landroid/view/Display;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#getMatchContentFrameRateUserPreference()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMatchContentFrameRateUserPreference()
+        {
+            return IExecuteWithSignature<int>("getMatchContentFrameRateUserPreference", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.html#registerDisplayListener(android.hardware.display.DisplayManager.DisplayListener,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Display.DisplayManager.DisplayListener"/></param>
@@ -240,9 +243,9 @@ public partial class DisplayListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDisplayAdded", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDisplayAddedEventHandler));
-                AddEventHandler("onDisplayChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDisplayChangedEventHandler));
-                AddEventHandler("onDisplayRemoved", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDisplayRemovedEventHandler));
+                AddEventHandler("onDisplayAdded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDisplayAddedEventHandler));
+                AddEventHandler("onDisplayChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDisplayChangedEventHandler));
+                AddEventHandler("onDisplayRemoved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDisplayRemovedEventHandler));
 
             }
 
@@ -250,7 +253,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.DisplayListener.html#onDisplayAdded(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDisplayAdded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnDisplayAdded { get; set; } = null;
+            public global::System.Action<int> OnOnDisplayAdded { get; set; } = null;
 
             void OnDisplayAddedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -271,7 +274,7 @@ public virtual void OnDisplayAdded(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.DisplayListener.html#onDisplayChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDisplayChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnDisplayChanged { get; set; } = null;
+            public global::System.Action<int> OnOnDisplayChanged { get; set; } = null;
 
             void OnDisplayChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -292,7 +295,7 @@ public virtual void OnDisplayChanged(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/hardware/display/DisplayManager.DisplayListener.html#onDisplayRemoved(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDisplayRemoved"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnDisplayRemoved { get; set; } = null;
+            public global::System.Action<int> OnOnDisplayRemoved { get; set; } = null;
 
             void OnDisplayRemovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Display/HdrConversionMode.cs b/src/net/Netdroid/Generated/Android/Hardware/Display/HdrConversionMode.cs
index 3e3aff0c4..1ffd069e2 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Display/HdrConversionMode.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Display/HdrConversionMode.cs
@@ -93,26 +93,28 @@ public HdrConversionMode(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/HdrConversionMode.html#getConversionMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/HdrConversionMode.html#describeContents()"/>
         /// </summary>
-        public int ConversionMode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getConversionMode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/HdrConversionMode.html#getPreferredHdrOutputType()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/HdrConversionMode.html#getConversionMode()"/>
         /// </summary>
-        public int PreferredHdrOutputType
+        /// <returns><see cref="int"/></returns>
+        public int GetConversionMode()
         {
-            get { return IExecuteWithSignature<int>("getPreferredHdrOutputType", "()I"); }
+            return IExecuteWithSignature<int>("getConversionMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/HdrConversionMode.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/display/HdrConversionMode.html#getPreferredHdrOutputType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetPreferredHdrOutputType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getPreferredHdrOutputType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/display/HdrConversionMode.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Display/VirtualDisplay.cs b/src/net/Netdroid/Generated/Android/Hardware/Display/VirtualDisplay.cs
index f82c6a8ad..5070fce1a 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Display/VirtualDisplay.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Display/VirtualDisplay.cs
@@ -46,18 +46,20 @@ public partial class VirtualDisplay
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplay.html#getDisplay()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplay.html#getDisplay()"/>
         /// </summary>
-        public Android.View.Display Display
+        /// <returns><see cref="Android.View.Display"/></returns>
+        public Android.View.Display GetDisplay()
         {
-            get { return IExecuteWithSignature<Android.View.Display>("getDisplay", "()Landroid/view/Display;"); }
+            return IExecuteWithSignature<Android.View.Display>("getDisplay", "()Landroid/view/Display;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplay.html#getSurface()"/> <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplay.html#setSurface(android.view.Surface)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplay.html#getSurface()"/>
         /// </summary>
-        public Android.View.Surface Surface
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetSurface()
         {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); } set { IExecuteWithSignature("setSurface", "(Landroid/view/Surface;)V", value); }
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplay.html#release()"/>
@@ -76,6 +78,14 @@ public void Resize(int arg0, int arg1, int arg2)
         {
             IExecute("resize", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplay.html#setSurface(android.view.Surface)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Surface"/></param>
+        public void SetSurface(Android.View.Surface arg0)
+        {
+            IExecuteWithSignature("setSurface", "(Landroid/view/Surface;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Display/VirtualDisplayConfig.cs b/src/net/Netdroid/Generated/Android/Hardware/Display/VirtualDisplayConfig.cs
index 0f341f623..d992f0bd5 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Display/VirtualDisplayConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Display/VirtualDisplayConfig.cs
@@ -52,68 +52,76 @@ public partial class VirtualDisplayConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getDensityDpi()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getSurface()"/>
         /// </summary>
-        public int DensityDpi
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetSurface()
         {
-            get { return IExecuteWithSignature<int>("getDensityDpi", "()I"); }
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getDisplayCategories()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getRequestedRefreshRate()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> DisplayCategories
+        /// <returns><see cref="float"/></returns>
+        public float GetRequestedRefreshRate()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getDisplayCategories", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<float>("getRequestedRefreshRate", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#describeContents()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getDensityDpi()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="int"/></returns>
+        public int GetDensityDpi()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<int>("getDensityDpi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getFlags()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getRequestedRefreshRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getHeight()"/>
         /// </summary>
-        public float RequestedRefreshRate
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<float>("getRequestedRefreshRate", "()F"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getSurface()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getWidth()"/>
         /// </summary>
-        public Android.View.Surface Surface
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getName()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#getDisplayCategories()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetDisplayCategories()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getDisplayCategories", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/display/VirtualDisplayConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Fingerprint/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Hardware/Fingerprint/AllPackageClasses.cs
index 8b52da622..76e5b8636 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Fingerprint/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Fingerprint/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Hardware.Fingerprint
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FingerprintManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FingerprintManager>
     {
         const string _bridgeClassName = "android.hardware.fingerprint.FingerprintManager";
@@ -71,19 +71,19 @@ public FingerprintManager(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.AuthenticationCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class AuthenticationCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AuthenticationCallback>
         {
             const string _bridgeClassName = "android.hardware.fingerprint.FingerprintManager$AuthenticationCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AuthenticationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AuthenticationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AuthenticationCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AuthenticationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AuthenticationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AuthenticationCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -118,7 +118,7 @@ public AuthenticationCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.AuthenticationResult.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class AuthenticationResult : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AuthenticationResult>
         {
             const string _bridgeClassName = "android.hardware.fingerprint.FingerprintManager$AuthenticationResult";
@@ -163,7 +163,7 @@ public AuthenticationResult(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class CryptoObject : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CryptoObject>
         {
             const string _bridgeClassName = "android.hardware.fingerprint.FingerprintManager$CryptoObject";
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Fingerprint/FingerprintManager.cs b/src/net/Netdroid/Generated/Android/Hardware/Fingerprint/FingerprintManager.cs
index c3b2767ed..36cad9ef9 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Fingerprint/FingerprintManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Fingerprint/FingerprintManager.cs
@@ -151,7 +151,7 @@ public partial class FingerprintManager
         /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.html#hasEnrolledFingerprints()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasEnrolledFingerprints()
         {
             return IExecuteWithSignature<bool>("hasEnrolledFingerprints", "()Z");
@@ -160,7 +160,7 @@ public bool HasEnrolledFingerprints()
         /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.html#isHardwareDetected()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsHardwareDetected()
         {
             return IExecuteWithSignature<bool>("isHardwareDetected", "()Z");
@@ -173,7 +173,7 @@ public bool IsHardwareDetected()
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Android.Hardware.Fingerprint.FingerprintManager.AuthenticationCallback"/></param>
         /// <param name="arg4"><see cref="Android.Os.Handler"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Authenticate(Android.Hardware.Fingerprint.FingerprintManager.CryptoObject arg0, Android.Os.CancellationSignal arg1, int arg2, Android.Hardware.Fingerprint.FingerprintManager.AuthenticationCallback arg3, Android.Os.Handler arg4)
         {
             IExecute("authenticate", arg0, arg1, arg2, arg3, arg4);
@@ -207,7 +207,7 @@ public partial class AuthenticationCallback
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnAuthenticationError(int arg0, Java.Lang.CharSequence arg1)
             {
                 IExecute("onAuthenticationError", arg0, arg1);
@@ -215,7 +215,7 @@ public void OnAuthenticationError(int arg0, Java.Lang.CharSequence arg1)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.AuthenticationCallback.html#onAuthenticationFailed()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnAuthenticationFailed()
             {
                 IExecuteWithSignature("onAuthenticationFailed", "()V");
@@ -225,7 +225,7 @@ public void OnAuthenticationFailed()
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnAuthenticationHelp(int arg0, Java.Lang.CharSequence arg1)
             {
                 IExecute("onAuthenticationHelp", arg0, arg1);
@@ -234,7 +234,7 @@ public void OnAuthenticationHelp(int arg0, Java.Lang.CharSequence arg1)
             /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.AuthenticationCallback.html#onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Hardware.Fingerprint.FingerprintManager.AuthenticationResult"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnAuthenticationSucceeded(Android.Hardware.Fingerprint.FingerprintManager.AuthenticationResult arg0)
             {
                 IExecuteWithSignature("onAuthenticationSucceeded", "(Landroid/hardware/fingerprint/FingerprintManager$AuthenticationResult;)V", arg0);
@@ -271,12 +271,13 @@ public partial class AuthenticationResult
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.AuthenticationResult.html#getCryptoObject()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.AuthenticationResult.html#getCryptoObject()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Hardware.Fingerprint.FingerprintManager.CryptoObject GetCryptoObject
+            /// <returns><see cref="Android.Hardware.Fingerprint.FingerprintManager.CryptoObject"/></returns>
+            [global::System.Obsolete()]
+            public Android.Hardware.Fingerprint.FingerprintManager.CryptoObject GetCryptoObject()
             {
-                get { return IExecuteWithSignature<Android.Hardware.Fingerprint.FingerprintManager.CryptoObject>("getCryptoObject", "()Landroid/hardware/fingerprint/FingerprintManager$CryptoObject;"); }
+                return IExecuteWithSignature<Android.Hardware.Fingerprint.FingerprintManager.CryptoObject>("getCryptoObject", "()Landroid/hardware/fingerprint/FingerprintManager$CryptoObject;");
             }
 
             #endregion
@@ -297,7 +298,7 @@ public partial class CryptoObject
             /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#%3Cinit%3E(java.security.Signature)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Security.Signature"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public CryptoObject(Java.Security.Signature arg0)
                 : base(arg0)
             {
@@ -306,7 +307,7 @@ public CryptoObject(Java.Security.Signature arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#%3Cinit%3E(javax.crypto.Cipher)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Javax.Crypto.Cipher"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public CryptoObject(Javax.Crypto.Cipher arg0)
                 : base(arg0)
             {
@@ -315,7 +316,7 @@ public CryptoObject(Javax.Crypto.Cipher arg0)
             /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#%3Cinit%3E(javax.crypto.Mac)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Javax.Crypto.Mac"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public CryptoObject(Javax.Crypto.Mac arg0)
                 : base(arg0)
             {
@@ -337,28 +338,31 @@ public CryptoObject(Javax.Crypto.Mac arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#getCipher()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#getSignature()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Javax.Crypto.Cipher Cipher
+            /// <returns><see cref="Java.Security.Signature"/></returns>
+            [global::System.Obsolete()]
+            public Java.Security.Signature GetSignature()
             {
-                get { return IExecuteWithSignature<Javax.Crypto.Cipher>("getCipher", "()Ljavax/crypto/Cipher;"); }
+                return IExecuteWithSignature<Java.Security.Signature>("getSignature", "()Ljava/security/Signature;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#getMac()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#getCipher()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Javax.Crypto.Mac Mac
+            /// <returns><see cref="Javax.Crypto.Cipher"/></returns>
+            [global::System.Obsolete()]
+            public Javax.Crypto.Cipher GetCipher()
             {
-                get { return IExecuteWithSignature<Javax.Crypto.Mac>("getMac", "()Ljavax/crypto/Mac;"); }
+                return IExecuteWithSignature<Javax.Crypto.Cipher>("getCipher", "()Ljavax/crypto/Cipher;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#getSignature()"/> 
+            /// <see href="https://developer.android.com/reference/android/hardware/fingerprint/FingerprintManager.CryptoObject.html#getMac()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Security.Signature Signature
+            /// <returns><see cref="Javax.Crypto.Mac"/></returns>
+            [global::System.Obsolete()]
+            public Javax.Crypto.Mac GetMac()
             {
-                get { return IExecuteWithSignature<Java.Security.Signature>("getSignature", "()Ljava/security/Signature;"); }
+                return IExecuteWithSignature<Javax.Crypto.Mac>("getMac", "()Ljavax/crypto/Mac;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/GeomagneticField.cs b/src/net/Netdroid/Generated/Android/Hardware/GeomagneticField.cs
index 1b8a5c5a8..ecd67fdac 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/GeomagneticField.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/GeomagneticField.cs
@@ -57,53 +57,60 @@ public GeomagneticField(float arg0, float arg1, float arg2, long arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getDeclination()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getDeclination()"/>
         /// </summary>
-        public float Declination
+        /// <returns><see cref="float"/></returns>
+        public float GetDeclination()
         {
-            get { return IExecuteWithSignature<float>("getDeclination", "()F"); }
+            return IExecuteWithSignature<float>("getDeclination", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getFieldStrength()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getFieldStrength()"/>
         /// </summary>
-        public float FieldStrength
+        /// <returns><see cref="float"/></returns>
+        public float GetFieldStrength()
         {
-            get { return IExecuteWithSignature<float>("getFieldStrength", "()F"); }
+            return IExecuteWithSignature<float>("getFieldStrength", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getHorizontalStrength()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getHorizontalStrength()"/>
         /// </summary>
-        public float HorizontalStrength
+        /// <returns><see cref="float"/></returns>
+        public float GetHorizontalStrength()
         {
-            get { return IExecuteWithSignature<float>("getHorizontalStrength", "()F"); }
+            return IExecuteWithSignature<float>("getHorizontalStrength", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getInclination()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getInclination()"/>
         /// </summary>
-        public float Inclination
+        /// <returns><see cref="float"/></returns>
+        public float GetInclination()
         {
-            get { return IExecuteWithSignature<float>("getInclination", "()F"); }
+            return IExecuteWithSignature<float>("getInclination", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getX()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getX()"/>
         /// </summary>
-        public float X
+        /// <returns><see cref="float"/></returns>
+        public float GetX()
         {
-            get { return IExecuteWithSignature<float>("getX", "()F"); }
+            return IExecuteWithSignature<float>("getX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getY()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getY()"/>
         /// </summary>
-        public float Y
+        /// <returns><see cref="float"/></returns>
+        public float GetY()
         {
-            get { return IExecuteWithSignature<float>("getY", "()F"); }
+            return IExecuteWithSignature<float>("getY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getZ()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/GeomagneticField.html#getZ()"/>
         /// </summary>
-        public float Z
+        /// <returns><see cref="float"/></returns>
+        public float GetZ()
         {
-            get { return IExecuteWithSignature<float>("getZ", "()F"); }
+            return IExecuteWithSignature<float>("getZ", "()F");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/HardwareBuffer.cs b/src/net/Netdroid/Generated/Android/Hardware/HardwareBuffer.cs
index 37e87f4e4..2db77666c 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/HardwareBuffer.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/HardwareBuffer.cs
@@ -260,62 +260,68 @@ public static bool IsSupported(int arg0, int arg1, int arg2, int arg3, long arg4
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#isClosed()"/>
         /// </summary>
-        public int Format
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClosed()
         {
-            get { return IExecuteWithSignature<int>("getFormat", "()I"); }
+            return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#describeContents()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getFormat()"/>
         /// </summary>
-        public long Id
+        /// <returns><see cref="int"/></returns>
+        public int GetFormat()
         {
-            get { return IExecuteWithSignature<long>("getId", "()J"); }
+            return IExecuteWithSignature<int>("getFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getLayers()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getHeight()"/>
         /// </summary>
-        public int Layers
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getLayers", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getUsage()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getLayers()"/>
         /// </summary>
-        public long Usage
+        /// <returns><see cref="int"/></returns>
+        public int GetLayers()
         {
-            get { return IExecuteWithSignature<long>("getUsage", "()J"); }
+            return IExecuteWithSignature<int>("getLayers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getWidth()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClosed()
+        /// <returns><see cref="long"/></returns>
+        public long GetId()
         {
-            return IExecuteWithSignature<bool>("isClosed", "()Z");
+            return IExecuteWithSignature<long>("getId", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#getUsage()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetUsage()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getUsage", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/HardwareBuffer.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Input/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Hardware/Input/AllPackageClasses.cs
index 8a3437b33..c2b784094 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Input/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Input/AllPackageClasses.cs
@@ -121,10 +121,13 @@ public partial class InputDeviceListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public InputDeviceListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.hardware.input.InputManager_InputDeviceListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.hardware.input.InputDeviceListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -146,10 +149,13 @@ public partial class InputDeviceListenerDirect : InputDeviceListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.hardware.input.InputManager$InputDeviceListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.hardware.input.InputManager$InputDeviceListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Input/HostUsiVersion.cs b/src/net/Netdroid/Generated/Android/Hardware/Input/HostUsiVersion.cs
index e4ff267f9..0595829b4 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Input/HostUsiVersion.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Input/HostUsiVersion.cs
@@ -52,26 +52,28 @@ public partial class HostUsiVersion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/input/HostUsiVersion.html#getMajorVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/input/HostUsiVersion.html#describeContents()"/>
         /// </summary>
-        public int MajorVersion
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getMajorVersion", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/input/HostUsiVersion.html#getMinorVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/input/HostUsiVersion.html#getMajorVersion()"/>
         /// </summary>
-        public int MinorVersion
+        /// <returns><see cref="int"/></returns>
+        public int GetMajorVersion()
         {
-            get { return IExecuteWithSignature<int>("getMinorVersion", "()I"); }
+            return IExecuteWithSignature<int>("getMajorVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/input/HostUsiVersion.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/input/HostUsiVersion.html#getMinorVersion()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetMinorVersion()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getMinorVersion", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/input/HostUsiVersion.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Input/InputManager.cs b/src/net/Netdroid/Generated/Android/Hardware/Input/InputManager.cs
index f90f1e32b..548566dab 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Input/InputManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Input/InputManager.cs
@@ -58,20 +58,6 @@ public partial class InputManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/input/InputManager.html#getInputDeviceIds()"/> 
-        /// </summary>
-        public int[] InputDeviceIds
-        {
-            get { return IExecuteWithSignatureArray<int>("getInputDeviceIds", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/input/InputManager.html#getMaximumObscuringOpacityForTouch()"/> 
-        /// </summary>
-        public float MaximumObscuringOpacityForTouch
-        {
-            get { return IExecuteWithSignature<float>("getMaximumObscuringOpacityForTouch", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/input/InputManager.html#getHostUsiVersion(android.view.Display)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Display"/></param>
@@ -107,6 +93,22 @@ public bool IsStylusPointerIconEnabled()
             return IExecuteWithSignature<bool>("isStylusPointerIconEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/input/InputManager.html#getMaximumObscuringOpacityForTouch()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetMaximumObscuringOpacityForTouch()
+        {
+            return IExecuteWithSignature<float>("getMaximumObscuringOpacityForTouch", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/input/InputManager.html#getInputDeviceIds()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetInputDeviceIds()
+        {
+            return IExecuteWithSignatureArray<int>("getInputDeviceIds", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/input/InputManager.html#registerInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Input.InputManager.InputDeviceListener"/></param>
@@ -152,9 +154,9 @@ public partial class InputDeviceListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onInputDeviceAdded", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnInputDeviceAddedEventHandler));
-                AddEventHandler("onInputDeviceChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnInputDeviceChangedEventHandler));
-                AddEventHandler("onInputDeviceRemoved", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnInputDeviceRemovedEventHandler));
+                AddEventHandler("onInputDeviceAdded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnInputDeviceAddedEventHandler));
+                AddEventHandler("onInputDeviceChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnInputDeviceChangedEventHandler));
+                AddEventHandler("onInputDeviceRemoved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnInputDeviceRemovedEventHandler));
 
             }
 
@@ -162,7 +164,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/hardware/input/InputManager.InputDeviceListener.html#onInputDeviceAdded(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnInputDeviceAdded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnInputDeviceAdded { get; set; } = null;
+            public global::System.Action<int> OnOnInputDeviceAdded { get; set; } = null;
 
             void OnInputDeviceAddedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -183,7 +185,7 @@ public virtual void OnInputDeviceAdded(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/hardware/input/InputManager.InputDeviceListener.html#onInputDeviceChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnInputDeviceChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnInputDeviceChanged { get; set; } = null;
+            public global::System.Action<int> OnOnInputDeviceChanged { get; set; } = null;
 
             void OnInputDeviceChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -204,7 +206,7 @@ public virtual void OnInputDeviceChanged(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/hardware/input/InputManager.InputDeviceListener.html#onInputDeviceRemoved(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnInputDeviceRemoved"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnInputDeviceRemoved { get; set; } = null;
+            public global::System.Action<int> OnOnInputDeviceRemoved { get; set; } = null;
 
             void OnInputDeviceRemovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Lights/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Hardware/Lights/AllPackageClasses.cs
index 2cb5c2759..ecfd715c0 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Lights/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Lights/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class LightsManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Lig
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LightsManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LightsManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LightsManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LightsManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LightsManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LightsManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -122,12 +122,12 @@ public partial class LightsSession : Java.Lang.AutoCloseable
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("LightsSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LightsSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LightsSession() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("LightsSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LightsSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LightsSession(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Lights/Light.cs b/src/net/Netdroid/Generated/Android/Hardware/Lights/Light.cs
index f8f7dce7b..737d1b442 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Lights/Light.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Lights/Light.cs
@@ -58,7 +58,7 @@ public partial class Light
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#LIGHT_CAPABILITY_RGB"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LIGHT_CAPABILITY_RGB { get { if (!_LIGHT_CAPABILITY_RGBReady) { _LIGHT_CAPABILITY_RGBContent = SGetField<int>(LocalBridgeClazz, "LIGHT_CAPABILITY_RGB"); _LIGHT_CAPABILITY_RGBReady = true; } return _LIGHT_CAPABILITY_RGBContent; } }
         private static int _LIGHT_CAPABILITY_RGBContent = default;
         private static bool _LIGHT_CAPABILITY_RGBReady = false; // this is used because in case of generics 
@@ -95,56 +95,60 @@ public partial class Light
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#hasBrightnessControl()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="bool"/></returns>
+        public bool HasBrightnessControl()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<bool>("hasBrightnessControl", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#hasRgbControl()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool HasRgbControl()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("hasRgbControl", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#getOrdinal()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#describeContents()"/>
         /// </summary>
-        public int Ordinal
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getOrdinal", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#getId()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#hasBrightnessControl()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#getOrdinal()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasBrightnessControl()
+        /// <returns><see cref="int"/></returns>
+        public int GetOrdinal()
         {
-            return IExecuteWithSignature<bool>("hasBrightnessControl", "()Z");
+            return IExecuteWithSignature<int>("getOrdinal", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#hasRgbControl()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasRgbControl()
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            return IExecuteWithSignature<bool>("hasRgbControl", "()Z");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/lights/Light.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Lights/LightState.cs b/src/net/Netdroid/Generated/Android/Hardware/Lights/LightState.cs
index a19326e21..2ff3e579c 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Lights/LightState.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Lights/LightState.cs
@@ -52,26 +52,28 @@ public partial class LightState
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightState.html#getColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightState.html#describeContents()"/>
         /// </summary>
-        public int Color
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getColor", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightState.html#getPlayerId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightState.html#getColor()"/>
         /// </summary>
-        public int PlayerId
+        /// <returns><see cref="int"/></returns>
+        public int GetColor()
         {
-            get { return IExecuteWithSignature<int>("getPlayerId", "()I"); }
+            return IExecuteWithSignature<int>("getColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightState.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightState.html#getPlayerId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetPlayerId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getPlayerId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/lights/LightState.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Lights/LightsManager.cs b/src/net/Netdroid/Generated/Android/Hardware/Lights/LightsManager.cs
index f67776881..25d763806 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Lights/LightsManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Lights/LightsManager.cs
@@ -46,13 +46,6 @@ public partial class LightsManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsManager.html#getLights()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Hardware.Lights.Light> Lights
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Lights.Light>>("getLights", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsManager.html#openSession()"/>
         /// </summary>
         /// <returns><see cref="Android.Hardware.Lights.LightsManager.LightsSession"/></returns>
@@ -69,6 +62,14 @@ public Android.Hardware.Lights.LightState GetLightState(Android.Hardware.Lights.
         {
             return IExecuteWithSignature<Android.Hardware.Lights.LightState>("getLightState", "(Landroid/hardware/lights/Light;)Landroid/hardware/lights/LightState;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsManager.html#getLights()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Lights.Light> GetLights()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Lights.Light>>("getLights", "()Ljava/util/List;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Lights/LightsRequest.cs b/src/net/Netdroid/Generated/Android/Hardware/Lights/LightsRequest.cs
index 6de3f24fa..808346065 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Lights/LightsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Lights/LightsRequest.cs
@@ -46,25 +46,28 @@ public partial class LightsRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsRequest.html#getLights()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsRequest.html#getLightStates()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.Integer> Lights
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Hardware.Lights.LightState> GetLightStates()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getLights", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Hardware.Lights.LightState>>("getLightStates", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsRequest.html#getLightsAndStates()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsRequest.html#getLights()"/>
         /// </summary>
-        public Java.Util.Map<Android.Hardware.Lights.Light, Android.Hardware.Lights.LightState> LightsAndStates
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetLights()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Android.Hardware.Lights.Light, Android.Hardware.Lights.LightState>>("getLightsAndStates", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getLights", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsRequest.html#getLightStates()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/lights/LightsRequest.html#getLightsAndStates()"/>
         /// </summary>
-        public Java.Util.List<Android.Hardware.Lights.LightState> LightStates
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Android.Hardware.Lights.Light, Android.Hardware.Lights.LightState> GetLightsAndStates()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Hardware.Lights.LightState>>("getLightStates", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.Map<Android.Hardware.Lights.Light, Android.Hardware.Lights.LightState>>("getLightsAndStates", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Sensor.cs b/src/net/Netdroid/Generated/Android/Hardware/Sensor.cs
index fcc65cfad..73903e8d9 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Sensor.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Sensor.cs
@@ -214,7 +214,7 @@ public partial class Sensor
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#TYPE_ORIENTATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_ORIENTATION { get { if (!_TYPE_ORIENTATIONReady) { _TYPE_ORIENTATIONContent = SGetField<int>(LocalBridgeClazz, "TYPE_ORIENTATION"); _TYPE_ORIENTATIONReady = true; } return _TYPE_ORIENTATIONContent; } }
         private static int _TYPE_ORIENTATIONContent = default;
         private static bool _TYPE_ORIENTATIONReady = false; // this is used because in case of generics 
@@ -275,7 +275,7 @@ public partial class Sensor
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#TYPE_TEMPERATURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_TEMPERATURE { get { if (!_TYPE_TEMPERATUREReady) { _TYPE_TEMPERATUREContent = SGetField<int>(LocalBridgeClazz, "TYPE_TEMPERATURE"); _TYPE_TEMPERATUREReady = true; } return _TYPE_TEMPERATUREContent; } }
         private static int _TYPE_TEMPERATUREContent = default;
         private static bool _TYPE_TEMPERATUREReady = false; // this is used because in case of generics 
@@ -420,7 +420,7 @@ public partial class Sensor
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#STRING_TYPE_ORIENTATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String STRING_TYPE_ORIENTATION { get { if (!_STRING_TYPE_ORIENTATIONReady) { _STRING_TYPE_ORIENTATIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "STRING_TYPE_ORIENTATION"); _STRING_TYPE_ORIENTATIONReady = true; } return _STRING_TYPE_ORIENTATIONContent; } }
         private static Java.Lang.String _STRING_TYPE_ORIENTATIONContent = default;
         private static bool _STRING_TYPE_ORIENTATIONReady = false; // this is used because in case of generics 
@@ -481,7 +481,7 @@ public partial class Sensor
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#STRING_TYPE_TEMPERATURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String STRING_TYPE_TEMPERATURE { get { if (!_STRING_TYPE_TEMPERATUREReady) { _STRING_TYPE_TEMPERATUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "STRING_TYPE_TEMPERATURE"); _STRING_TYPE_TEMPERATUREReady = true; } return _STRING_TYPE_TEMPERATUREContent; } }
         private static Java.Lang.String _STRING_TYPE_TEMPERATUREContent = default;
         private static bool _STRING_TYPE_TEMPERATUREReady = false; // this is used because in case of generics 
@@ -494,142 +494,157 @@ public partial class Sensor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getFifoMaxEventCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#isAdditionalInfoSupported()"/>
         /// </summary>
-        public int FifoMaxEventCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAdditionalInfoSupported()
         {
-            get { return IExecuteWithSignature<int>("getFifoMaxEventCount", "()I"); }
+            return IExecuteWithSignature<bool>("isAdditionalInfoSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getFifoReservedEventCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#isDirectChannelTypeSupported(int)"/>
         /// </summary>
-        public int FifoReservedEventCount
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDirectChannelTypeSupported(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getFifoReservedEventCount", "()I"); }
+            return IExecuteWithSignature<bool>("isDirectChannelTypeSupported", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getHighestDirectReportRateLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#isDynamicSensor()"/>
         /// </summary>
-        public int HighestDirectReportRateLevel
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDynamicSensor()
         {
-            get { return IExecuteWithSignature<int>("getHighestDirectReportRateLevel", "()I"); }
+            return IExecuteWithSignature<bool>("isDynamicSensor", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#isWakeUpSensor()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="bool"/></returns>
+        public bool IsWakeUpSensor()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<bool>("isWakeUpSensor", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getMaxDelay()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getMaximumRange()"/>
         /// </summary>
-        public int MaxDelay
+        /// <returns><see cref="float"/></returns>
+        public float GetMaximumRange()
         {
-            get { return IExecuteWithSignature<int>("getMaxDelay", "()I"); }
+            return IExecuteWithSignature<float>("getMaximumRange", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getMaximumRange()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getPower()"/>
         /// </summary>
-        public float MaximumRange
+        /// <returns><see cref="float"/></returns>
+        public float GetPower()
         {
-            get { return IExecuteWithSignature<float>("getMaximumRange", "()F"); }
+            return IExecuteWithSignature<float>("getPower", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getMinDelay()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getResolution()"/>
         /// </summary>
-        public int MinDelay
+        /// <returns><see cref="float"/></returns>
+        public float GetResolution()
         {
-            get { return IExecuteWithSignature<int>("getMinDelay", "()I"); }
+            return IExecuteWithSignature<float>("getResolution", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getFifoMaxEventCount()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetFifoMaxEventCount()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getFifoMaxEventCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getPower()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getFifoReservedEventCount()"/>
         /// </summary>
-        public float Power
+        /// <returns><see cref="int"/></returns>
+        public int GetFifoReservedEventCount()
         {
-            get { return IExecuteWithSignature<float>("getPower", "()F"); }
+            return IExecuteWithSignature<int>("getFifoReservedEventCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getReportingMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getHighestDirectReportRateLevel()"/>
         /// </summary>
-        public int ReportingMode
+        /// <returns><see cref="int"/></returns>
+        public int GetHighestDirectReportRateLevel()
         {
-            get { return IExecuteWithSignature<int>("getReportingMode", "()I"); }
+            return IExecuteWithSignature<int>("getHighestDirectReportRateLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getResolution()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getId()"/>
         /// </summary>
-        public float Resolution
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<float>("getResolution", "()F"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getStringType()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getMaxDelay()"/>
         /// </summary>
-        public Java.Lang.String StringType
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxDelay()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getStringType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getMaxDelay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getMinDelay()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetMinDelay()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getMinDelay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getVendor()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getReportingMode()"/>
         /// </summary>
-        public Java.Lang.String Vendor
+        /// <returns><see cref="int"/></returns>
+        public int GetReportingMode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVendor", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getReportingMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getType()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#isAdditionalInfoSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getVersion()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAdditionalInfoSupported()
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            return IExecuteWithSignature<bool>("isAdditionalInfoSupported", "()Z");
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#isDirectChannelTypeSupported(int)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDirectChannelTypeSupported(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isDirectChannelTypeSupported", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#isDynamicSensor()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getStringType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDynamicSensor()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetStringType()
         {
-            return IExecuteWithSignature<bool>("isDynamicSensor", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getStringType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#isWakeUpSensor()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/Sensor.html#getVendor()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsWakeUpSensor()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVendor()
         {
-            return IExecuteWithSignature<bool>("isWakeUpSensor", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getVendor", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Hardware/SensorEventListener.cs b/src/net/Netdroid/Generated/Android/Hardware/SensorEventListener.cs
index 13d304775..da611ffaa 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/SensorEventListener.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/SensorEventListener.cs
@@ -68,8 +68,8 @@ public partial class SensorEventListener : Android.Hardware.ISensorEventListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onAccuracyChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Hardware.Sensor>>>(OnAccuracyChangedEventHandler));
-            AddEventHandler("onSensorChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Hardware.SensorEvent>>>(OnSensorChangedEventHandler));
+            AddEventHandler("onAccuracyChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Hardware.Sensor>>>(OnAccuracyChangedEventHandler));
+            AddEventHandler("onSensorChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Hardware.SensorEvent>>>(OnSensorChangedEventHandler));
 
         }
 
@@ -77,7 +77,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/hardware/SensorEventListener.html#onAccuracyChanged(android.hardware.Sensor,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnAccuracyChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Hardware.Sensor, int> OnOnAccuracyChanged { get; set; } = null;
+        public global::System.Action<Android.Hardware.Sensor, int> OnOnAccuracyChanged { get; set; } = null;
 
         void OnAccuracyChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Hardware.Sensor>> data)
         {
@@ -99,7 +99,7 @@ public virtual void OnAccuracyChanged(Android.Hardware.Sensor arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/hardware/SensorEventListener.html#onSensorChanged(android.hardware.SensorEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSensorChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Hardware.SensorEvent> OnOnSensorChanged { get; set; } = null;
+        public global::System.Action<Android.Hardware.SensorEvent> OnOnSensorChanged { get; set; } = null;
 
         void OnSensorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Hardware.SensorEvent>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Hardware/SensorListener.cs b/src/net/Netdroid/Generated/Android/Hardware/SensorListener.cs
index bf82ecfeb..c2243aec8 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/SensorListener.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/SensorListener.cs
@@ -68,8 +68,8 @@ public partial class SensorListener : Android.Hardware.ISensorListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onAccuracyChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnAccuracyChangedEventHandler));
-            AddEventHandler("onSensorChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSensorChangedEventHandler));
+            AddEventHandler("onAccuracyChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnAccuracyChangedEventHandler));
+            AddEventHandler("onSensorChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSensorChangedEventHandler));
 
         }
 
@@ -77,7 +77,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/hardware/SensorListener.html#onAccuracyChanged(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnAccuracyChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int> OnOnAccuracyChanged { get; set; } = null;
+        public global::System.Action<int, int> OnOnAccuracyChanged { get; set; } = null;
 
         void OnAccuracyChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -90,7 +90,7 @@ void OnAccuracyChangedEventHandler(object sender, CLRListenerEventArgs<CLREventD
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void OnAccuracyChanged(int arg0, int arg1)
         {
             
@@ -100,7 +100,7 @@ public virtual void OnAccuracyChanged(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/hardware/SensorListener.html#onSensorChanged(int,float[])"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSensorChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, float[]> OnOnSensorChanged { get; set; } = null;
+        public global::System.Action<int, float[]> OnOnSensorChanged { get; set; } = null;
 
         void OnSensorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -113,7 +113,7 @@ void OnSensorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventDat
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void OnSensorChanged(int arg0, float[] arg1)
         {
             
@@ -154,7 +154,7 @@ public partial class SensorListenerDirect : Android.Hardware.ISensorListener
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnAccuracyChanged(int arg0, int arg1)
         {
             IExecute("onAccuracyChanged", arg0, arg1);
@@ -164,7 +164,7 @@ public override void OnAccuracyChanged(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnSensorChanged(int arg0, float[] arg1)
         {
             IExecute("onSensorChanged", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Hardware/SensorManager.cs b/src/net/Netdroid/Generated/Android/Hardware/SensorManager.cs
index 6da0f56d6..d76601f23 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/SensorManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/SensorManager.cs
@@ -226,63 +226,63 @@ public partial class SensorManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#DATA_X"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DATA_X { get { if (!_DATA_XReady) { _DATA_XContent = SGetField<int>(LocalBridgeClazz, "DATA_X"); _DATA_XReady = true; } return _DATA_XContent; } }
         private static int _DATA_XContent = default;
         private static bool _DATA_XReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#DATA_Y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DATA_Y { get { if (!_DATA_YReady) { _DATA_YContent = SGetField<int>(LocalBridgeClazz, "DATA_Y"); _DATA_YReady = true; } return _DATA_YContent; } }
         private static int _DATA_YContent = default;
         private static bool _DATA_YReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#DATA_Z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DATA_Z { get { if (!_DATA_ZReady) { _DATA_ZContent = SGetField<int>(LocalBridgeClazz, "DATA_Z"); _DATA_ZReady = true; } return _DATA_ZContent; } }
         private static int _DATA_ZContent = default;
         private static bool _DATA_ZReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#RAW_DATA_INDEX"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RAW_DATA_INDEX { get { if (!_RAW_DATA_INDEXReady) { _RAW_DATA_INDEXContent = SGetField<int>(LocalBridgeClazz, "RAW_DATA_INDEX"); _RAW_DATA_INDEXReady = true; } return _RAW_DATA_INDEXContent; } }
         private static int _RAW_DATA_INDEXContent = default;
         private static bool _RAW_DATA_INDEXReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#RAW_DATA_X"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RAW_DATA_X { get { if (!_RAW_DATA_XReady) { _RAW_DATA_XContent = SGetField<int>(LocalBridgeClazz, "RAW_DATA_X"); _RAW_DATA_XReady = true; } return _RAW_DATA_XContent; } }
         private static int _RAW_DATA_XContent = default;
         private static bool _RAW_DATA_XReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#RAW_DATA_Y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RAW_DATA_Y { get { if (!_RAW_DATA_YReady) { _RAW_DATA_YContent = SGetField<int>(LocalBridgeClazz, "RAW_DATA_Y"); _RAW_DATA_YReady = true; } return _RAW_DATA_YContent; } }
         private static int _RAW_DATA_YContent = default;
         private static bool _RAW_DATA_YReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#RAW_DATA_Z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RAW_DATA_Z { get { if (!_RAW_DATA_ZReady) { _RAW_DATA_ZContent = SGetField<int>(LocalBridgeClazz, "RAW_DATA_Z"); _RAW_DATA_ZReady = true; } return _RAW_DATA_ZContent; } }
         private static int _RAW_DATA_ZContent = default;
         private static bool _RAW_DATA_ZReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_ACCELEROMETER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_ACCELEROMETER { get { if (!_SENSOR_ACCELEROMETERReady) { _SENSOR_ACCELEROMETERContent = SGetField<int>(LocalBridgeClazz, "SENSOR_ACCELEROMETER"); _SENSOR_ACCELEROMETERReady = true; } return _SENSOR_ACCELEROMETERContent; } }
         private static int _SENSOR_ACCELEROMETERContent = default;
         private static bool _SENSOR_ACCELEROMETERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_ALL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_ALL { get { if (!_SENSOR_ALLReady) { _SENSOR_ALLContent = SGetField<int>(LocalBridgeClazz, "SENSOR_ALL"); _SENSOR_ALLReady = true; } return _SENSOR_ALLContent; } }
         private static int _SENSOR_ALLContent = default;
         private static bool _SENSOR_ALLReady = false; // this is used because in case of generics 
@@ -313,49 +313,49 @@ public partial class SensorManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_LIGHT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_LIGHT { get { if (!_SENSOR_LIGHTReady) { _SENSOR_LIGHTContent = SGetField<int>(LocalBridgeClazz, "SENSOR_LIGHT"); _SENSOR_LIGHTReady = true; } return _SENSOR_LIGHTContent; } }
         private static int _SENSOR_LIGHTContent = default;
         private static bool _SENSOR_LIGHTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_MAGNETIC_FIELD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_MAGNETIC_FIELD { get { if (!_SENSOR_MAGNETIC_FIELDReady) { _SENSOR_MAGNETIC_FIELDContent = SGetField<int>(LocalBridgeClazz, "SENSOR_MAGNETIC_FIELD"); _SENSOR_MAGNETIC_FIELDReady = true; } return _SENSOR_MAGNETIC_FIELDContent; } }
         private static int _SENSOR_MAGNETIC_FIELDContent = default;
         private static bool _SENSOR_MAGNETIC_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_MAX"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_MAX { get { if (!_SENSOR_MAXReady) { _SENSOR_MAXContent = SGetField<int>(LocalBridgeClazz, "SENSOR_MAX"); _SENSOR_MAXReady = true; } return _SENSOR_MAXContent; } }
         private static int _SENSOR_MAXContent = default;
         private static bool _SENSOR_MAXReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_MIN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_MIN { get { if (!_SENSOR_MINReady) { _SENSOR_MINContent = SGetField<int>(LocalBridgeClazz, "SENSOR_MIN"); _SENSOR_MINReady = true; } return _SENSOR_MINContent; } }
         private static int _SENSOR_MINContent = default;
         private static bool _SENSOR_MINReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_ORIENTATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_ORIENTATION { get { if (!_SENSOR_ORIENTATIONReady) { _SENSOR_ORIENTATIONContent = SGetField<int>(LocalBridgeClazz, "SENSOR_ORIENTATION"); _SENSOR_ORIENTATIONReady = true; } return _SENSOR_ORIENTATIONContent; } }
         private static int _SENSOR_ORIENTATIONContent = default;
         private static bool _SENSOR_ORIENTATIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_ORIENTATION_RAW"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_ORIENTATION_RAW { get { if (!_SENSOR_ORIENTATION_RAWReady) { _SENSOR_ORIENTATION_RAWContent = SGetField<int>(LocalBridgeClazz, "SENSOR_ORIENTATION_RAW"); _SENSOR_ORIENTATION_RAWReady = true; } return _SENSOR_ORIENTATION_RAWContent; } }
         private static int _SENSOR_ORIENTATION_RAWContent = default;
         private static bool _SENSOR_ORIENTATION_RAWReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_PROXIMITY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_PROXIMITY { get { if (!_SENSOR_PROXIMITYReady) { _SENSOR_PROXIMITYContent = SGetField<int>(LocalBridgeClazz, "SENSOR_PROXIMITY"); _SENSOR_PROXIMITYReady = true; } return _SENSOR_PROXIMITYContent; } }
         private static int _SENSOR_PROXIMITYContent = default;
         private static bool _SENSOR_PROXIMITYReady = false; // this is used because in case of generics 
@@ -392,14 +392,14 @@ public partial class SensorManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_TEMPERATURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_TEMPERATURE { get { if (!_SENSOR_TEMPERATUREReady) { _SENSOR_TEMPERATUREContent = SGetField<int>(LocalBridgeClazz, "SENSOR_TEMPERATURE"); _SENSOR_TEMPERATUREReady = true; } return _SENSOR_TEMPERATUREContent; } }
         private static int _SENSOR_TEMPERATUREContent = default;
         private static bool _SENSOR_TEMPERATUREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#SENSOR_TRICORDER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SENSOR_TRICORDER { get { if (!_SENSOR_TRICORDERReady) { _SENSOR_TRICORDERContent = SGetField<int>(LocalBridgeClazz, "SENSOR_TRICORDER"); _SENSOR_TRICORDERReady = true; } return _SENSOR_TRICORDERContent; } }
         private static int _SENSOR_TRICORDERContent = default;
         private static bool _SENSOR_TRICORDERReady = false; // this is used because in case of generics 
@@ -493,14 +493,6 @@ public static void GetRotationMatrixFromVector(float[] arg0, float[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#getSensors()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Sensors
-        {
-            get { return IExecuteWithSignature<int>("getSensors", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#getDefaultSensor(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -619,7 +611,7 @@ public bool RegisterListener(Android.Hardware.SensorEventListener arg0, Android.
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RegisterListener(Android.Hardware.SensorListener arg0, int arg1, int arg2)
         {
             return IExecute<bool>("registerListener", arg0, arg1, arg2);
@@ -630,7 +622,7 @@ public bool RegisterListener(Android.Hardware.SensorListener arg0, int arg1, int
         /// <param name="arg0"><see cref="Android.Hardware.SensorListener"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RegisterListener(Android.Hardware.SensorListener arg0, int arg1)
         {
             return IExecute<bool>("registerListener", arg0, arg1);
@@ -646,6 +638,15 @@ public bool RequestTriggerSensor(Android.Hardware.TriggerEventListener arg0, And
             return IExecute<bool>("requestTriggerSensor", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#getSensors()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSensors()
+        {
+            return IExecuteWithSignature<int>("getSensors", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#getDynamicSensorList(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -710,7 +711,7 @@ public void UnregisterListener(Android.Hardware.SensorEventListener arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.SensorListener"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterListener(Android.Hardware.SensorListener arg0, int arg1)
         {
             IExecute("unregisterListener", arg0, arg1);
@@ -719,7 +720,7 @@ public void UnregisterListener(Android.Hardware.SensorListener arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/hardware/SensorManager.html#unregisterListener(android.hardware.SensorListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.SensorListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterListener(Android.Hardware.SensorListener arg0)
         {
             IExecuteWithSignature("unregisterListener", "(Landroid/hardware/SensorListener;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Hardware/SyncFence.cs b/src/net/Netdroid/Generated/Android/Hardware/SyncFence.cs
index f6a36bde0..65a1b2dc9 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/SyncFence.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/SyncFence.cs
@@ -72,13 +72,6 @@ public partial class SyncFence : Java.Lang.IAutoCloseable, Android.Os.IParcelabl
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/SyncFence.html#getSignalTime()"/> 
-        /// </summary>
-        public long SignalTime
-        {
-            get { return IExecuteWithSignature<long>("getSignalTime", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SyncFence.html#await(java.time.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Duration"/></param>
@@ -112,6 +105,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/SyncFence.html#getSignalTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetSignalTime()
+        {
+            return IExecuteWithSignature<long>("getSignalTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/SyncFence.html#close()"/>
         /// </summary>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Android/Hardware/TriggerEventListener.cs b/src/net/Netdroid/Generated/Android/Hardware/TriggerEventListener.cs
index ac4df6c50..f91891479 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/TriggerEventListener.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/TriggerEventListener.cs
@@ -44,72 +44,12 @@ public partial class TriggerEventListener
 
         #endregion
 
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="TriggerEventListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onTrigger", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Hardware.TriggerEvent>>>(OnTriggerEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/hardware/TriggerEventListener.html#onTrigger(android.hardware.TriggerEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnTrigger"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Hardware.TriggerEvent> OnOnTrigger { get; set; } = null;
-
-        void OnTriggerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Hardware.TriggerEvent>> data)
-        {
-            var methodToExecute = (OnOnTrigger != null) ? OnOnTrigger : OnTrigger;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/TriggerEventListener.html#onTrigger(android.hardware.TriggerEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Hardware.TriggerEvent"/></param>
-        public virtual void OnTrigger(Android.Hardware.TriggerEvent arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region TriggerEventListenerDirect
-    public partial class TriggerEventListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
         #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/TriggerEventListener.html#onTrigger(android.hardware.TriggerEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.TriggerEvent"/></param>
-        public override void OnTrigger(Android.Hardware.TriggerEvent arg0)
+        public void OnTrigger(Android.Hardware.TriggerEvent arg0)
         {
             IExecuteWithSignature("onTrigger", "(Landroid/hardware/TriggerEvent;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbAccessory.cs b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbAccessory.cs
index 3445a6528..f255a4717 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbAccessory.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbAccessory.cs
@@ -52,54 +52,60 @@ public partial class UsbAccessory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getManufacturer()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getDescription()"/>
         /// </summary>
-        public Java.Lang.String Manufacturer
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getManufacturer", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getModel()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getManufacturer()"/>
         /// </summary>
-        public Java.Lang.String Model
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetManufacturer()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getModel", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getManufacturer", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getSerial()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getModel()"/>
         /// </summary>
-        public Java.Lang.String Serial
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetModel()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSerial", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getModel", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getSerial()"/>
         /// </summary>
-        public Java.Lang.String Uri
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSerial()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUri", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSerial", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getUri()"/>
         /// </summary>
-        public Java.Lang.String Version
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUri()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUri", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#getVersion()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVersion()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getVersion", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbAccessory.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbConfiguration.cs b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbConfiguration.cs
index 1d6c660ec..a498bba34 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbConfiguration.cs
@@ -52,34 +52,6 @@ public partial class UsbConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getId()"/> 
-        /// </summary>
-        public int Id
-        {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getInterfaceCount()"/> 
-        /// </summary>
-        public int InterfaceCount
-        {
-            get { return IExecuteWithSignature<int>("getInterfaceCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getMaxPower()"/> 
-        /// </summary>
-        public int MaxPower
-        {
-            get { return IExecuteWithSignature<int>("getMaxPower", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getInterface(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -113,6 +85,38 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
+        {
+            return IExecuteWithSignature<int>("getId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getInterfaceCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInterfaceCount()
+        {
+            return IExecuteWithSignature<int>("getInterfaceCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getMaxPower()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxPower()
+        {
+            return IExecuteWithSignature<int>("getMaxPower", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbConfiguration.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbDevice.cs b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbDevice.cs
index ab03d04fa..900594f41 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbDevice.cs
@@ -70,121 +70,134 @@ public static Java.Lang.String GetDeviceName(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getConfigurationCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getConfiguration(int)"/>
         /// </summary>
-        public int ConfigurationCount
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Hardware.Usb.UsbConfiguration"/></returns>
+        public Android.Hardware.Usb.UsbConfiguration GetConfiguration(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getConfigurationCount", "()I"); }
+            return IExecuteWithSignature<Android.Hardware.Usb.UsbConfiguration>("getConfiguration", "(I)Landroid/hardware/usb/UsbConfiguration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceClass()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getInterface(int)"/>
         /// </summary>
-        public int DeviceClass
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Hardware.Usb.UsbInterface"/></returns>
+        public Android.Hardware.Usb.UsbInterface GetInterface(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getDeviceClass", "()I"); }
+            return IExecuteWithSignature<Android.Hardware.Usb.UsbInterface>("getInterface", "(I)Landroid/hardware/usb/UsbInterface;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#describeContents()"/>
         /// </summary>
-        public int DeviceId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDeviceId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceName()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getConfigurationCount()"/>
         /// </summary>
-        public Java.Lang.String DeviceName
+        /// <returns><see cref="int"/></returns>
+        public int GetConfigurationCount()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getConfigurationCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceClass()"/>
         /// </summary>
-        public int DeviceProtocol
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceClass()
         {
-            get { return IExecuteWithSignature<int>("getDeviceProtocol", "()I"); }
+            return IExecuteWithSignature<int>("getDeviceClass", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceSubclass()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceId()"/>
         /// </summary>
-        public int DeviceSubclass
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceId()
         {
-            get { return IExecute<int>("getDeviceSubclass"); }
+            return IExecuteWithSignature<int>("getDeviceId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getInterfaceCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceProtocol()"/>
         /// </summary>
-        public int InterfaceCount
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceProtocol()
         {
-            get { return IExecuteWithSignature<int>("getInterfaceCount", "()I"); }
+            return IExecuteWithSignature<int>("getDeviceProtocol", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getManufacturerName()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceSubclass()"/>
         /// </summary>
-        public Java.Lang.String ManufacturerName
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceSubclass()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getManufacturerName", "()Ljava/lang/String;"); }
+            return IExecute<int>("getDeviceSubclass");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getProductId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getInterfaceCount()"/>
         /// </summary>
-        public int ProductId
+        /// <returns><see cref="int"/></returns>
+        public int GetInterfaceCount()
         {
-            get { return IExecuteWithSignature<int>("getProductId", "()I"); }
+            return IExecuteWithSignature<int>("getInterfaceCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getProductName()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getProductId()"/>
         /// </summary>
-        public Java.Lang.String ProductName
+        /// <returns><see cref="int"/></returns>
+        public int GetProductId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProductName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getProductId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getSerialNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getVendorId()"/>
         /// </summary>
-        public Java.Lang.String SerialNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetVendorId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSerialNumber", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getVendorId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getVendorId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getDeviceName()"/>
         /// </summary>
-        public int VendorId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeviceName()
         {
-            get { return IExecuteWithSignature<int>("getVendorId", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getManufacturerName()"/>
         /// </summary>
-        public Java.Lang.String Version
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetManufacturerName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getManufacturerName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getConfiguration(int)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getProductName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Hardware.Usb.UsbConfiguration"/></returns>
-        public Android.Hardware.Usb.UsbConfiguration GetConfiguration(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProductName()
         {
-            return IExecuteWithSignature<Android.Hardware.Usb.UsbConfiguration>("getConfiguration", "(I)Landroid/hardware/usb/UsbConfiguration;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getProductName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getInterface(int)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getSerialNumber()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Hardware.Usb.UsbInterface"/></returns>
-        public Android.Hardware.Usb.UsbInterface GetInterface(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSerialNumber()
         {
-            return IExecuteWithSignature<Android.Hardware.Usb.UsbInterface>("getInterface", "(I)Landroid/hardware/usb/UsbInterface;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSerialNumber", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#getVersion()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVersion()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getVersion", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDevice.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbDeviceConnection.cs b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbDeviceConnection.cs
index b902f213e..82f3a05a9 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbDeviceConnection.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbDeviceConnection.cs
@@ -46,27 +46,6 @@ public partial class UsbDeviceConnection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#getFileDescriptor()"/> 
-        /// </summary>
-        public int FileDescriptor
-        {
-            get { return IExecuteWithSignature<int>("getFileDescriptor", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#getRawDescriptors()"/> 
-        /// </summary>
-        public byte[] RawDescriptors
-        {
-            get { return IExecuteWithSignatureArray<byte>("getRawDescriptors", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#getSerial()"/> 
-        /// </summary>
-        public Java.Lang.String Serial
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSerial", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#requestWait()"/>
         /// </summary>
         /// <returns><see cref="Android.Hardware.Usb.UsbRequest"/></returns>
@@ -122,6 +101,14 @@ public bool SetInterface(Android.Hardware.Usb.UsbInterface arg0)
             return IExecuteWithSignature<bool>("setInterface", "(Landroid/hardware/usb/UsbInterface;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#getRawDescriptors()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetRawDescriptors()
+        {
+            return IExecuteWithSignatureArray<byte>("getRawDescriptors", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#bulkTransfer(android.hardware.usb.UsbEndpoint,byte[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Usb.UsbEndpoint"/></param>
@@ -178,6 +165,22 @@ public int ControlTransfer(int arg0, int arg1, int arg2, int arg3, byte[] arg4,
             return IExecute<int>("controlTransfer", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#getFileDescriptor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFileDescriptor()
+        {
+            return IExecuteWithSignature<int>("getFileDescriptor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#getSerial()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSerial()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSerial", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbDeviceConnection.html#close()"/>
         /// </summary>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbEndpoint.cs b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbEndpoint.cs
index 0364e6c2e..2568a96df 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbEndpoint.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbEndpoint.cs
@@ -52,61 +52,68 @@ public partial class UsbEndpoint
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#describeContents()"/>
         /// </summary>
-        public int Address
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getAddress", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getAddress()"/>
         /// </summary>
-        public int Attributes
+        /// <returns><see cref="int"/></returns>
+        public int GetAddress()
         {
-            get { return IExecuteWithSignature<int>("getAttributes", "()I"); }
+            return IExecuteWithSignature<int>("getAddress", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getDirection()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getAttributes()"/>
         /// </summary>
-        public int Direction
+        /// <returns><see cref="int"/></returns>
+        public int GetAttributes()
         {
-            get { return IExecuteWithSignature<int>("getDirection", "()I"); }
+            return IExecuteWithSignature<int>("getAttributes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getEndpointNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getDirection()"/>
         /// </summary>
-        public int EndpointNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetDirection()
         {
-            get { return IExecuteWithSignature<int>("getEndpointNumber", "()I"); }
+            return IExecuteWithSignature<int>("getDirection", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getInterval()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getEndpointNumber()"/>
         /// </summary>
-        public int Interval
+        /// <returns><see cref="int"/></returns>
+        public int GetEndpointNumber()
         {
-            get { return IExecuteWithSignature<int>("getInterval", "()I"); }
+            return IExecuteWithSignature<int>("getEndpointNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getMaxPacketSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getInterval()"/>
         /// </summary>
-        public int MaxPacketSize
+        /// <returns><see cref="int"/></returns>
+        public int GetInterval()
         {
-            get { return IExecuteWithSignature<int>("getMaxPacketSize", "()I"); }
+            return IExecuteWithSignature<int>("getInterval", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getMaxPacketSize()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxPacketSize()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getMaxPacketSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#getType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbEndpoint.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbInterface.cs b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbInterface.cs
index 139db73f4..49f4a4a63 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbInterface.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbInterface.cs
@@ -52,70 +52,77 @@ public partial class UsbInterface
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getAlternateSetting()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getEndpoint(int)"/>
         /// </summary>
-        public int AlternateSetting
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Hardware.Usb.UsbEndpoint"/></returns>
+        public Android.Hardware.Usb.UsbEndpoint GetEndpoint(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getAlternateSetting", "()I"); }
+            return IExecuteWithSignature<Android.Hardware.Usb.UsbEndpoint>("getEndpoint", "(I)Landroid/hardware/usb/UsbEndpoint;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getEndpointCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#describeContents()"/>
         /// </summary>
-        public int EndpointCount
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getEndpointCount", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getAlternateSetting()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int GetAlternateSetting()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<int>("getAlternateSetting", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getInterfaceClass()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getEndpointCount()"/>
         /// </summary>
-        public int InterfaceClass
+        /// <returns><see cref="int"/></returns>
+        public int GetEndpointCount()
         {
-            get { return IExecuteWithSignature<int>("getInterfaceClass", "()I"); }
+            return IExecuteWithSignature<int>("getEndpointCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getInterfaceProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getId()"/>
         /// </summary>
-        public int InterfaceProtocol
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<int>("getInterfaceProtocol", "()I"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getInterfaceSubclass()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getInterfaceClass()"/>
         /// </summary>
-        public int InterfaceSubclass
+        /// <returns><see cref="int"/></returns>
+        public int GetInterfaceClass()
         {
-            get { return IExecute<int>("getInterfaceSubclass"); }
+            return IExecuteWithSignature<int>("getInterfaceClass", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getInterfaceProtocol()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetInterfaceProtocol()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getInterfaceProtocol", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getEndpoint(int)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getInterfaceSubclass()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Hardware.Usb.UsbEndpoint"/></returns>
-        public Android.Hardware.Usb.UsbEndpoint GetEndpoint(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetInterfaceSubclass()
         {
-            return IExecuteWithSignature<Android.Hardware.Usb.UsbEndpoint>("getEndpoint", "(I)Landroid/hardware/usb/UsbEndpoint;", arg0);
+            return IExecute<int>("getInterfaceSubclass");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbInterface.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbManager.cs b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbManager.cs
index 2c035856a..1ad0e5e0c 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbManager.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbManager.cs
@@ -88,18 +88,12 @@ public partial class UsbManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbManager.html#getAccessoryList()"/> 
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbManager.html#getAccessoryList()"/>
         /// </summary>
-        public Android.Hardware.Usb.UsbAccessory[] AccessoryList
+        /// <returns><see cref="Android.Hardware.Usb.UsbAccessory"/></returns>
+        public Android.Hardware.Usb.UsbAccessory[] GetAccessoryList()
         {
-            get { return IExecuteWithSignatureArray<Android.Hardware.Usb.UsbAccessory>("getAccessoryList", "()[Landroid/hardware/usb/UsbAccessory;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbManager.html#getDeviceList()"/> 
-        /// </summary>
-        public Java.Util.HashMap<Java.Lang.String, Android.Hardware.Usb.UsbDevice> DeviceList
-        {
-            get { return IExecuteWithSignature<Java.Util.HashMap<Java.Lang.String, Android.Hardware.Usb.UsbDevice>>("getDeviceList", "()Ljava/util/HashMap;"); }
+            return IExecuteWithSignatureArray<Android.Hardware.Usb.UsbAccessory>("getAccessoryList", "()[Landroid/hardware/usb/UsbAccessory;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbManager.html#openDevice(android.hardware.usb.UsbDevice)"/>
@@ -138,6 +132,14 @@ public bool HasPermission(Android.Hardware.Usb.UsbDevice arg0)
             return IExecuteWithSignature<bool>("hasPermission", "(Landroid/hardware/usb/UsbDevice;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbManager.html#getDeviceList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.HashMap"/></returns>
+        public Java.Util.HashMap<Java.Lang.String, Android.Hardware.Usb.UsbDevice> GetDeviceList()
+        {
+            return IExecuteWithSignature<Java.Util.HashMap<Java.Lang.String, Android.Hardware.Usb.UsbDevice>>("getDeviceList", "()Ljava/util/HashMap;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbManager.html#requestPermission(android.hardware.usb.UsbAccessory,android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Usb.UsbAccessory"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbRequest.cs b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbRequest.cs
index 16606b5d5..6eb5d57ec 100644
--- a/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Hardware/Usb/UsbRequest.cs
@@ -46,18 +46,12 @@ public partial class UsbRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbRequest.html#getClientData()"/> <see href="https://developer.android.com/reference/android/hardware/usb/UsbRequest.html#setClientData(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbRequest.html#getEndpoint()"/>
         /// </summary>
-        public object ClientData
+        /// <returns><see cref="Android.Hardware.Usb.UsbEndpoint"/></returns>
+        public Android.Hardware.Usb.UsbEndpoint GetEndpoint()
         {
-            get { return IExecuteWithSignature("getClientData", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setClientData", "(Ljava/lang/Object;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbRequest.html#getEndpoint()"/> 
-        /// </summary>
-        public Android.Hardware.Usb.UsbEndpoint Endpoint
-        {
-            get { return IExecuteWithSignature<Android.Hardware.Usb.UsbEndpoint>("getEndpoint", "()Landroid/hardware/usb/UsbEndpoint;"); }
+            return IExecuteWithSignature<Android.Hardware.Usb.UsbEndpoint>("getEndpoint", "()Landroid/hardware/usb/UsbEndpoint;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbRequest.html#cancel()"/>
@@ -83,7 +77,7 @@ public bool Initialize(Android.Hardware.Usb.UsbDeviceConnection arg0, Android.Ha
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Queue(Java.Nio.ByteBuffer arg0, int arg1)
         {
             return IExecute<bool>("queue", arg0, arg1);
@@ -98,12 +92,28 @@ public bool Queue(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<bool>("queue", "(Ljava/nio/ByteBuffer;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbRequest.html#getClientData()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetClientData()
+        {
+            return IExecuteWithSignature("getClientData", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbRequest.html#close()"/>
         /// </summary>
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/hardware/usb/UsbRequest.html#setClientData(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetClientData(object arg0)
+        {
+            IExecuteWithSignature("setClientData", "(Ljava/lang/Object;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsGroupedByDurationResponse.cs b/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsGroupedByDurationResponse.cs
index e230ab57c..255e02046 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsGroupedByDurationResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsGroupedByDurationResponse.cs
@@ -46,18 +46,20 @@ public partial class AggregateRecordsGroupedByDurationResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getEndTime()"/>
         /// </summary>
-        public Java.Time.Instant EndTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetEndTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getStartTime()"/>
         /// </summary>
-        public Java.Time.Instant StartTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetStartTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getZoneOffset(android.health.connect.datatypes.AggregationType)"/>
@@ -113,18 +115,20 @@ public partial class AggregateRecordsGroupedByDurationResponse<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getEndTime()"/>
         /// </summary>
-        public Java.Time.Instant EndTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetEndTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getStartTime()"/>
         /// </summary>
-        public Java.Time.Instant StartTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetStartTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByDurationResponse.html#getZoneOffset(android.health.connect.datatypes.AggregationType)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsGroupedByPeriodResponse.cs b/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsGroupedByPeriodResponse.cs
index b18f76615..d89fd476e 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsGroupedByPeriodResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsGroupedByPeriodResponse.cs
@@ -46,18 +46,20 @@ public partial class AggregateRecordsGroupedByPeriodResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getEndTime()"/>
         /// </summary>
-        public Java.Time.LocalDateTime EndTime
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetEndTime()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getEndTime", "()Ljava/time/LocalDateTime;"); }
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getEndTime", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getStartTime()"/>
         /// </summary>
-        public Java.Time.LocalDateTime StartTime
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetStartTime()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getStartTime", "()Ljava/time/LocalDateTime;"); }
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getStartTime", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getZoneOffset(android.health.connect.datatypes.AggregationType)"/>
@@ -113,18 +115,20 @@ public partial class AggregateRecordsGroupedByPeriodResponse<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getEndTime()"/>
         /// </summary>
-        public Java.Time.LocalDateTime EndTime
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetEndTime()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getEndTime", "()Ljava/time/LocalDateTime;"); }
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getEndTime", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getStartTime()"/>
         /// </summary>
-        public Java.Time.LocalDateTime StartTime
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetStartTime()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getStartTime", "()Ljava/time/LocalDateTime;"); }
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getStartTime", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsGroupedByPeriodResponse.html#getZoneOffset(android.health.connect.datatypes.AggregationType)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsRequest.cs b/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsRequest.cs
index 282f03f29..099a363a7 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/AggregateRecordsRequest.cs
@@ -46,25 +46,28 @@ public partial class AggregateRecordsRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getAggregationTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getTimeRangeFilter()"/>
         /// </summary>
-        public Java.Util.Set AggregationTypes
+        /// <returns><see cref="Android.Health.Connect.TimeRangeFilter"/></returns>
+        public Android.Health.Connect.TimeRangeFilter GetTimeRangeFilter()
         {
-            get { return IExecuteWithSignature<Java.Util.Set>("getAggregationTypes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Health.Connect.TimeRangeFilter>("getTimeRangeFilter", "()Landroid/health/connect/TimeRangeFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getDataOriginsFilters()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getAggregationTypes()"/>
         /// </summary>
-        public Java.Util.Set DataOriginsFilters
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set GetAggregationTypes()
         {
-            get { return IExecuteWithSignature<Java.Util.Set>("getDataOriginsFilters", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set>("getAggregationTypes", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getTimeRangeFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getDataOriginsFilters()"/>
         /// </summary>
-        public Android.Health.Connect.TimeRangeFilter TimeRangeFilter
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set GetDataOriginsFilters()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.TimeRangeFilter>("getTimeRangeFilter", "()Landroid/health/connect/TimeRangeFilter;"); }
+            return IExecuteWithSignature<Java.Util.Set>("getDataOriginsFilters", "()Ljava/util/Set;");
         }
 
         #endregion
@@ -236,25 +239,28 @@ public partial class AggregateRecordsRequest<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getAggregationTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getTimeRangeFilter()"/>
         /// </summary>
-        public Java.Util.Set<Android.Health.Connect.Datatypes.AggregationType<T>> AggregationTypes
+        /// <returns><see cref="Android.Health.Connect.TimeRangeFilter"/></returns>
+        public Android.Health.Connect.TimeRangeFilter GetTimeRangeFilter()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Health.Connect.Datatypes.AggregationType<T>>>("getAggregationTypes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Health.Connect.TimeRangeFilter>("getTimeRangeFilter", "()Landroid/health/connect/TimeRangeFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getDataOriginsFilters()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getAggregationTypes()"/>
         /// </summary>
-        public Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin> DataOriginsFilters
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Health.Connect.Datatypes.AggregationType<T>> GetAggregationTypes()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin>>("getDataOriginsFilters", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Android.Health.Connect.Datatypes.AggregationType<T>>>("getAggregationTypes", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getTimeRangeFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/AggregateRecordsRequest.html#getDataOriginsFilters()"/>
         /// </summary>
-        public Android.Health.Connect.TimeRangeFilter TimeRangeFilter
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin> GetDataOriginsFilters()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.TimeRangeFilter>("getTimeRangeFilter", "()Landroid/health/connect/TimeRangeFilter;"); }
+            return IExecuteWithSignature<Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin>>("getDataOriginsFilters", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Health/Connect/AllPackageClasses.cs
index 755db074c..82fac65ba 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/AllPackageClasses.cs
@@ -718,12 +718,12 @@ public partial class ReadRecordsRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ReadRecordsRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReadRecordsRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReadRecordsRequest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ReadRecordsRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReadRecordsRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReadRecordsRequest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -759,18 +759,18 @@ public ReadRecordsRequest(params object[] args) : base(args) { }
     /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequest.html"/>
     /// </summary>
     /// <typeparam name="T"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
-    public partial class ReadRecordsRequest<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReadRecordsRequest<T>> where T: Android.Health.Connect.Datatypes.Record
+    public partial class ReadRecordsRequest<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReadRecordsRequest<T>> where T : Android.Health.Connect.Datatypes.Record
     {
         const string _bridgeClassName = "android.health.connect.ReadRecordsRequest";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ReadRecordsRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReadRecordsRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReadRecordsRequest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ReadRecordsRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReadRecordsRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReadRecordsRequest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -890,7 +890,7 @@ public Builder(params object[] args) : base(args) { }
         /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.Builder.html"/>
         /// </summary>
         /// <typeparam name="T"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
-        public partial class Builder<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<T>> where T: Android.Health.Connect.Datatypes.Record
+        public partial class Builder<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<T>> where T : Android.Health.Connect.Datatypes.Record
         {
             const string _bridgeClassName = "android.health.connect.ReadRecordsRequestUsingFilters$Builder";
             /// <summary>
@@ -939,7 +939,7 @@ public Builder(params object[] args) : base(args) { }
     /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html"/>
     /// </summary>
     /// <typeparam name="T"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
-    public partial class ReadRecordsRequestUsingFilters<T> : Android.Health.Connect.ReadRecordsRequest<T> where T: Android.Health.Connect.Datatypes.Record
+    public partial class ReadRecordsRequestUsingFilters<T> : Android.Health.Connect.ReadRecordsRequest<T> where T : Android.Health.Connect.Datatypes.Record
     {
         const string _bridgeClassName = "android.health.connect.ReadRecordsRequestUsingFilters";
         /// <summary>
@@ -1068,7 +1068,7 @@ public Builder(params object[] args) : base(args) { }
         /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingIds.Builder.html"/>
         /// </summary>
         /// <typeparam name="T"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
-        public partial class Builder<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<T>> where T: Android.Health.Connect.Datatypes.Record
+        public partial class Builder<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<T>> where T : Android.Health.Connect.Datatypes.Record
         {
             const string _bridgeClassName = "android.health.connect.ReadRecordsRequestUsingIds$Builder";
             /// <summary>
@@ -1117,7 +1117,7 @@ public Builder(params object[] args) : base(args) { }
     /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingIds.html"/>
     /// </summary>
     /// <typeparam name="T"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
-    public partial class ReadRecordsRequestUsingIds<T> : Android.Health.Connect.ReadRecordsRequest<T> where T: Android.Health.Connect.Datatypes.Record
+    public partial class ReadRecordsRequestUsingIds<T> : Android.Health.Connect.ReadRecordsRequest<T> where T : Android.Health.Connect.Datatypes.Record
     {
         const string _bridgeClassName = "android.health.connect.ReadRecordsRequestUsingIds";
         /// <summary>
@@ -1206,7 +1206,7 @@ public ReadRecordsResponse(params object[] args) : base(args) { }
     /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html"/>
     /// </summary>
     /// <typeparam name="T"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
-    public partial class ReadRecordsResponse<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReadRecordsResponse<T>> where T: Android.Health.Connect.Datatypes.Record
+    public partial class ReadRecordsResponse<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReadRecordsResponse<T>> where T : Android.Health.Connect.Datatypes.Record
     {
         const string _bridgeClassName = "android.health.connect.ReadRecordsResponse";
         /// <summary>
@@ -1388,12 +1388,12 @@ public partial class TimeRangeFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<T
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TimeRangeFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeRangeFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeRangeFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TimeRangeFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeRangeFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeRangeFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogTokenRequest.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogTokenRequest.cs
index 1b5eaed55..948df149d 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogTokenRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogTokenRequest.cs
@@ -52,26 +52,29 @@ public partial class ChangeLogTokenRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenRequest.html#getDataOriginFilters()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenRequest.html#describeContents()"/>
         /// </summary>
-        public Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin> DataOriginFilters
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin>>("getDataOriginFilters", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenRequest.html#getRecordTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenRequest.html#getDataOriginFilters()"/>
         /// </summary>
-        public Java.Util.Set RecordTypes
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin> GetDataOriginFilters()
         {
-            get { return IExecuteWithSignature<Java.Util.Set>("getRecordTypes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin>>("getDataOriginFilters", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenRequest.html#getRecordTypes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <typeparam name="ReturnExtendsAndroid_Health_Connect_Datatypes_Record"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Class> GetRecordTypes<ReturnExtendsAndroid_Health_Connect_Datatypes_Record>() where ReturnExtendsAndroid_Health_Connect_Datatypes_Record : Android.Health.Connect.Datatypes.Record
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Class>>("getRecordTypes", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogTokenResponse.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogTokenResponse.cs
index 47ed80e8f..be2ba7941 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogTokenResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogTokenResponse.cs
@@ -52,13 +52,6 @@ public partial class ChangeLogTokenResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenResponse.html#getToken()"/> 
-        /// </summary>
-        public Java.Lang.String Token
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getToken", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenResponse.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -67,6 +60,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenResponse.html#getToken()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetToken()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getToken", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogTokenResponse.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogsRequest.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogsRequest.cs
index 4e80c88bc..2fa7cea27 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogsRequest.cs
@@ -52,26 +52,28 @@ public partial class ChangeLogsRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsRequest.html#getPageSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsRequest.html#describeContents()"/>
         /// </summary>
-        public int PageSize
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPageSize", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsRequest.html#getToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsRequest.html#getPageSize()"/>
         /// </summary>
-        public Java.Lang.String Token
+        /// <returns><see cref="int"/></returns>
+        public int GetPageSize()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getToken", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPageSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsRequest.html#getToken()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetToken()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getToken", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogsResponse.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogsResponse.cs
index e8231b455..e2b62e46b 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogsResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Changelog/ChangeLogsResponse.cs
@@ -52,41 +52,44 @@ public partial class ChangeLogsResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#getDeletedLogs()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#hasMorePages()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Changelog.ChangeLogsResponse.DeletedLog> DeletedLogs
+        /// <returns><see cref="bool"/></returns>
+        public bool HasMorePages()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Changelog.ChangeLogsResponse.DeletedLog>>("getDeletedLogs", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("hasMorePages", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#getNextChangesToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String NextChangesToken
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNextChangesToken", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#getUpsertedRecords()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#getNextChangesToken()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.Record> UpsertedRecords
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNextChangesToken()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.Record>>("getUpsertedRecords", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNextChangesToken", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#hasMorePages()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#getDeletedLogs()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasMorePages()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Changelog.ChangeLogsResponse.DeletedLog> GetDeletedLogs()
         {
-            return IExecuteWithSignature<bool>("hasMorePages", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Changelog.ChangeLogsResponse.DeletedLog>>("getDeletedLogs", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#getUpsertedRecords()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.Record> GetUpsertedRecords()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.Record>>("getUpsertedRecords", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.html#writeToParcel(android.os.Parcel,int)"/>
@@ -131,18 +134,20 @@ public DeletedLog(Java.Lang.String arg0, long arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.DeletedLog.html#getDeletedRecordId()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.DeletedLog.html#getDeletedRecordId()"/>
             /// </summary>
-            public Java.Lang.String DeletedRecordId
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDeletedRecordId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDeletedRecordId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getDeletedRecordId", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.DeletedLog.html#getDeletedTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/changelog/ChangeLogsResponse.DeletedLog.html#getDeletedTime()"/>
             /// </summary>
-            public Java.Time.Instant DeletedTime
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetDeletedTime()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getDeletedTime", "()Ljava/time/Instant;"); }
+                return IExecuteWithSignature<Java.Time.Instant>("getDeletedTime", "()Ljava/time/Instant;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ActiveCaloriesBurnedRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ActiveCaloriesBurnedRecord.cs
index 9149535eb..57593248f 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ActiveCaloriesBurnedRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ActiveCaloriesBurnedRecord.cs
@@ -52,11 +52,12 @@ public partial class ActiveCaloriesBurnedRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ActiveCaloriesBurnedRecord.html#getEnergy()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ActiveCaloriesBurnedRecord.html#getEnergy()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Energy Energy
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Energy"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Energy GetEnergy()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Energy>("getEnergy", "()Landroid/health/connect/datatypes/units/Energy;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Energy>("getEnergy", "()Landroid/health/connect/datatypes/units/Energy;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/AllPackageClasses.cs
index cb3772069..aa1489469 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/AllPackageClasses.cs
@@ -2809,12 +2809,12 @@ public partial class InstantRecord : Android.Health.Connect.Datatypes.Record
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InstantRecord class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InstantRecord class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InstantRecord() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InstantRecord class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InstantRecord class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InstantRecord(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2943,12 +2943,12 @@ public partial class IntervalRecord : Android.Health.Connect.Datatypes.Record
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IntervalRecord class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntervalRecord class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntervalRecord() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IntervalRecord class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntervalRecord class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntervalRecord(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3869,12 +3869,12 @@ public partial class Record : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Record>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Record class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Record class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Record() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Record class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Record class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Record(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/AppInfo.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/AppInfo.cs
index 250988140..a938d24f9 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/AppInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/AppInfo.cs
@@ -46,25 +46,28 @@ public partial class AppInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/AppInfo.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/AppInfo.html#getIcon()"/>
         /// </summary>
-        public Android.Graphics.Bitmap Icon
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetIcon()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getIcon", "()Landroid/graphics/Bitmap;"); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getIcon", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/AppInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/AppInfo.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/AppInfo.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/AppInfo.html#getPackageName()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BasalBodyTemperatureRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BasalBodyTemperatureRecord.cs
index c72fc1894..655c4f395 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BasalBodyTemperatureRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BasalBodyTemperatureRecord.cs
@@ -46,18 +46,20 @@ public partial class BasalBodyTemperatureRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BasalBodyTemperatureRecord.html#getMeasurementLocation()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BasalBodyTemperatureRecord.html#getTemperature()"/>
         /// </summary>
-        public int MeasurementLocation
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Temperature"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Temperature GetTemperature()
         {
-            get { return IExecuteWithSignature<int>("getMeasurementLocation", "()I"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Temperature>("getTemperature", "()Landroid/health/connect/datatypes/units/Temperature;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BasalBodyTemperatureRecord.html#getTemperature()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BasalBodyTemperatureRecord.html#getMeasurementLocation()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Temperature Temperature
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementLocation()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Temperature>("getTemperature", "()Landroid/health/connect/datatypes/units/Temperature;"); }
+            return IExecuteWithSignature<int>("getMeasurementLocation", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BasalMetabolicRateRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BasalMetabolicRateRecord.cs
index 6a744b4d7..4276983b1 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BasalMetabolicRateRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BasalMetabolicRateRecord.cs
@@ -52,11 +52,12 @@ public partial class BasalMetabolicRateRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BasalMetabolicRateRecord.html#getBasalMetabolicRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BasalMetabolicRateRecord.html#getBasalMetabolicRate()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Power BasalMetabolicRate
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Power"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Power GetBasalMetabolicRate()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Power>("getBasalMetabolicRate", "()Landroid/health/connect/datatypes/units/Power;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Power>("getBasalMetabolicRate", "()Landroid/health/connect/datatypes/units/Power;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BloodGlucoseRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BloodGlucoseRecord.cs
index f2afb3de8..9775f3491 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BloodGlucoseRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BloodGlucoseRecord.cs
@@ -46,32 +46,36 @@ public partial class BloodGlucoseRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodGlucoseRecord.html#getSpecimenSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodGlucoseRecord.html#getLevel()"/>
         /// </summary>
-        public int GetSpecimenSource
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.BloodGlucose"/></returns>
+        public Android.Health.Connect.Datatypes.Units.BloodGlucose GetLevel()
         {
-            get { return IExecuteWithSignature<int>("getSpecimenSource", "()I"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.BloodGlucose>("getLevel", "()Landroid/health/connect/datatypes/units/BloodGlucose;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodGlucoseRecord.html#getLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodGlucoseRecord.html#getMealType()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.BloodGlucose Level
+        /// <returns><see cref="int"/></returns>
+        public int GetMealType()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.BloodGlucose>("getLevel", "()Landroid/health/connect/datatypes/units/BloodGlucose;"); }
+            return IExecuteWithSignature<int>("getMealType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodGlucoseRecord.html#getMealType()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodGlucoseRecord.html#getRelationToMeal()"/>
         /// </summary>
-        public int MealType
+        /// <returns><see cref="int"/></returns>
+        public int GetRelationToMeal()
         {
-            get { return IExecuteWithSignature<int>("getMealType", "()I"); }
+            return IExecuteWithSignature<int>("getRelationToMeal", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodGlucoseRecord.html#getRelationToMeal()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodGlucoseRecord.html#getSpecimenSource()"/>
         /// </summary>
-        public int RelationToMeal
+        /// <returns><see cref="int"/></returns>
+        public int GetSpecimenSource()
         {
-            get { return IExecuteWithSignature<int>("getRelationToMeal", "()I"); }
+            return IExecuteWithSignature<int>("getSpecimenSource", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BloodPressureRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BloodPressureRecord.cs
index 16ca4b9d0..210dd0bf0 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BloodPressureRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BloodPressureRecord.cs
@@ -46,32 +46,36 @@ public partial class BloodPressureRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodPressureRecord.html#getDiastolic()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodPressureRecord.html#getDiastolic()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Pressure Diastolic
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Pressure"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Pressure GetDiastolic()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Pressure>("getDiastolic", "()Landroid/health/connect/datatypes/units/Pressure;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Pressure>("getDiastolic", "()Landroid/health/connect/datatypes/units/Pressure;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodPressureRecord.html#getBodyPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodPressureRecord.html#getSystolic()"/>
         /// </summary>
-        public int GetBodyPosition
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Pressure"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Pressure GetSystolic()
         {
-            get { return IExecuteWithSignature<int>("getBodyPosition", "()I"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Pressure>("getSystolic", "()Landroid/health/connect/datatypes/units/Pressure;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodPressureRecord.html#getMeasurementLocation()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodPressureRecord.html#getBodyPosition()"/>
         /// </summary>
-        public int MeasurementLocation
+        /// <returns><see cref="int"/></returns>
+        public int GetBodyPosition()
         {
-            get { return IExecuteWithSignature<int>("getMeasurementLocation", "()I"); }
+            return IExecuteWithSignature<int>("getBodyPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodPressureRecord.html#getSystolic()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BloodPressureRecord.html#getMeasurementLocation()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Pressure Systolic
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementLocation()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Pressure>("getSystolic", "()Landroid/health/connect/datatypes/units/Pressure;"); }
+            return IExecuteWithSignature<int>("getMeasurementLocation", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyFatRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyFatRecord.cs
index 6ea955429..610999963 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyFatRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyFatRecord.cs
@@ -46,11 +46,12 @@ public partial class BodyFatRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BodyFatRecord.html#getPercentage()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BodyFatRecord.html#getPercentage()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Percentage Percentage
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Percentage"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Percentage GetPercentage()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Percentage>("getPercentage", "()Landroid/health/connect/datatypes/units/Percentage;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Percentage>("getPercentage", "()Landroid/health/connect/datatypes/units/Percentage;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyTemperatureRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyTemperatureRecord.cs
index 7e0b8985f..b0e3cfd35 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyTemperatureRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyTemperatureRecord.cs
@@ -46,18 +46,20 @@ public partial class BodyTemperatureRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BodyTemperatureRecord.html#getMeasurementLocation()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BodyTemperatureRecord.html#getTemperature()"/>
         /// </summary>
-        public int MeasurementLocation
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Temperature"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Temperature GetTemperature()
         {
-            get { return IExecuteWithSignature<int>("getMeasurementLocation", "()I"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Temperature>("getTemperature", "()Landroid/health/connect/datatypes/units/Temperature;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BodyTemperatureRecord.html#getTemperature()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BodyTemperatureRecord.html#getMeasurementLocation()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Temperature Temperature
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementLocation()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Temperature>("getTemperature", "()Landroid/health/connect/datatypes/units/Temperature;"); }
+            return IExecuteWithSignature<int>("getMeasurementLocation", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyWaterMassRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyWaterMassRecord.cs
index 63dd529fd..4557ad938 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyWaterMassRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BodyWaterMassRecord.cs
@@ -46,11 +46,12 @@ public partial class BodyWaterMassRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BodyWaterMassRecord.html#getBodyWaterMass()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BodyWaterMassRecord.html#getBodyWaterMass()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass BodyWaterMass
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetBodyWaterMass()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getBodyWaterMass", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getBodyWaterMass", "()Landroid/health/connect/datatypes/units/Mass;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BoneMassRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BoneMassRecord.cs
index 6001b825b..47f93072c 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BoneMassRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/BoneMassRecord.cs
@@ -46,11 +46,12 @@ public partial class BoneMassRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BoneMassRecord.html#getMass()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/BoneMassRecord.html#getMass()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Mass
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetMass()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMass", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMass", "()Landroid/health/connect/datatypes/units/Mass;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/CervicalMucusRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/CervicalMucusRecord.cs
index 2d27a1818..4cd64520f 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/CervicalMucusRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/CervicalMucusRecord.cs
@@ -46,18 +46,20 @@ public partial class CervicalMucusRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CervicalMucusRecord.html#getAppearance()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CervicalMucusRecord.html#getAppearance()"/>
         /// </summary>
-        public int Appearance
+        /// <returns><see cref="int"/></returns>
+        public int GetAppearance()
         {
-            get { return IExecuteWithSignature<int>("getAppearance", "()I"); }
+            return IExecuteWithSignature<int>("getAppearance", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CervicalMucusRecord.html#getSensation()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CervicalMucusRecord.html#getSensation()"/>
         /// </summary>
-        public int Sensation
+        /// <returns><see cref="int"/></returns>
+        public int GetSensation()
         {
-            get { return IExecuteWithSignature<int>("getSensation", "()I"); }
+            return IExecuteWithSignature<int>("getSensation", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/CyclingPedalingCadenceRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/CyclingPedalingCadenceRecord.cs
index cdb781882..bf231c2c2 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/CyclingPedalingCadenceRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/CyclingPedalingCadenceRecord.cs
@@ -46,11 +46,12 @@ public partial class CyclingPedalingCadenceRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CyclingPedalingCadenceRecord.html#getSamples()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CyclingPedalingCadenceRecord.html#getSamples()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.CyclingPedalingCadenceRecord.CyclingPedalingCadenceRecordSample> Samples
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.CyclingPedalingCadenceRecord.CyclingPedalingCadenceRecordSample> GetSamples()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.CyclingPedalingCadenceRecord.CyclingPedalingCadenceRecordSample>>("getSamples", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.CyclingPedalingCadenceRecord.CyclingPedalingCadenceRecordSample>>("getSamples", "()Ljava/util/List;");
         }
 
         #endregion
@@ -170,18 +171,20 @@ public CyclingPedalingCadenceRecordSample(double arg0, Java.Time.Instant arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CyclingPedalingCadenceRecord.CyclingPedalingCadenceRecordSample.html#getRevolutionsPerMinute()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CyclingPedalingCadenceRecord.CyclingPedalingCadenceRecordSample.html#getRevolutionsPerMinute()"/>
             /// </summary>
-            public double RevolutionsPerMinute
+            /// <returns><see cref="double"/></returns>
+            public double GetRevolutionsPerMinute()
             {
-                get { return IExecuteWithSignature<double>("getRevolutionsPerMinute", "()D"); }
+                return IExecuteWithSignature<double>("getRevolutionsPerMinute", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CyclingPedalingCadenceRecord.CyclingPedalingCadenceRecordSample.html#getTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/CyclingPedalingCadenceRecord.CyclingPedalingCadenceRecordSample.html#getTime()"/>
             /// </summary>
-            public Java.Time.Instant Time
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetTime()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;"); }
+                return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/DataOrigin.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/DataOrigin.cs
index 11c3aa964..123a9d07e 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/DataOrigin.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/DataOrigin.cs
@@ -46,11 +46,12 @@ public partial class DataOrigin
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/DataOrigin.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/DataOrigin.html#getPackageName()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Device.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Device.cs
index a85a0f28b..33aee429f 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Device.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Device.cs
@@ -100,25 +100,28 @@ public partial class Device
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Device.html#getManufacturer()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Device.html#getType()"/>
         /// </summary>
-        public Java.Lang.String Manufacturer
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getManufacturer", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Device.html#getModel()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Device.html#getManufacturer()"/>
         /// </summary>
-        public Java.Lang.String Model
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetManufacturer()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getModel", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getManufacturer", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Device.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Device.html#getModel()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetModel()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getModel", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/DistanceRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/DistanceRecord.cs
index e43797d81..a87eeec00 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/DistanceRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/DistanceRecord.cs
@@ -52,11 +52,12 @@ public partial class DistanceRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/DistanceRecord.html#getDistance()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/DistanceRecord.html#getDistance()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Length Distance
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Length"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Length GetDistance()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getDistance", "()Landroid/health/connect/datatypes/units/Length;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getDistance", "()Landroid/health/connect/datatypes/units/Length;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ElevationGainedRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ElevationGainedRecord.cs
index 1a47cfd65..8971d4eee 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ElevationGainedRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ElevationGainedRecord.cs
@@ -52,11 +52,12 @@ public partial class ElevationGainedRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ElevationGainedRecord.html#getElevation()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ElevationGainedRecord.html#getElevation()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Length Elevation
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Length"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Length GetElevation()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getElevation", "()Landroid/health/connect/datatypes/units/Length;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getElevation", "()Landroid/health/connect/datatypes/units/Length;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseLap.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseLap.cs
index cccc1f990..68eae31ab 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseLap.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseLap.cs
@@ -46,25 +46,28 @@ public partial class ExerciseLap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseLap.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseLap.html#getLength()"/>
         /// </summary>
-        public Java.Time.Instant EndTime
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Length"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Length GetLength()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getLength", "()Landroid/health/connect/datatypes/units/Length;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseLap.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseLap.html#getEndTime()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Length Length
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetEndTime()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getLength", "()Landroid/health/connect/datatypes/units/Length;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseLap.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseLap.html#getStartTime()"/>
         /// </summary>
-        public Java.Time.Instant StartTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetStartTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseRoute.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseRoute.cs
index 353335551..804705105 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseRoute.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseRoute.cs
@@ -60,13 +60,6 @@ public ExerciseRoute(Java.Util.List<Android.Health.Connect.Datatypes.ExerciseRou
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.html#getRouteLocations()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.ExerciseRoute.Location> RouteLocations
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.ExerciseRoute.Location>>("getRouteLocations", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.html#getRouteLocations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.ExerciseRoute.Location> GetRouteLocations()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.ExerciseRoute.Location>>("getRouteLocations", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -114,46 +115,44 @@ public partial class Location
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getAltitude()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getAltitude()"/>
             /// </summary>
-            public Android.Health.Connect.Datatypes.Units.Length Altitude
+            /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Length"/></returns>
+            public Android.Health.Connect.Datatypes.Units.Length GetAltitude()
             {
-                get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getAltitude", "()Landroid/health/connect/datatypes/units/Length;"); }
+                return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getAltitude", "()Landroid/health/connect/datatypes/units/Length;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getHorizontalAccuracy()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getHorizontalAccuracy()"/>
             /// </summary>
-            public Android.Health.Connect.Datatypes.Units.Length HorizontalAccuracy
+            /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Length"/></returns>
+            public Android.Health.Connect.Datatypes.Units.Length GetHorizontalAccuracy()
             {
-                get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getHorizontalAccuracy", "()Landroid/health/connect/datatypes/units/Length;"); }
+                return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getHorizontalAccuracy", "()Landroid/health/connect/datatypes/units/Length;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getLatitude()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getVerticalAccuracy()"/>
             /// </summary>
-            public double Latitude
+            /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Length"/></returns>
+            public Android.Health.Connect.Datatypes.Units.Length GetVerticalAccuracy()
             {
-                get { return IExecuteWithSignature<double>("getLatitude", "()D"); }
+                return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getVerticalAccuracy", "()Landroid/health/connect/datatypes/units/Length;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getLongitude()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getLatitude()"/>
             /// </summary>
-            public double Longitude
+            /// <returns><see cref="double"/></returns>
+            public double GetLatitude()
             {
-                get { return IExecuteWithSignature<double>("getLongitude", "()D"); }
+                return IExecuteWithSignature<double>("getLatitude", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getLongitude()"/>
             /// </summary>
-            public Java.Time.Instant Time
+            /// <returns><see cref="double"/></returns>
+            public double GetLongitude()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getVerticalAccuracy()"/> 
-            /// </summary>
-            public Android.Health.Connect.Datatypes.Units.Length VerticalAccuracy
-            {
-                get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getVerticalAccuracy", "()Landroid/health/connect/datatypes/units/Length;"); }
+                return IExecuteWithSignature<double>("getLongitude", "()D");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#describeContents()"/>
@@ -164,6 +163,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#getTime()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetTime()
+            {
+                return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseRoute.Location.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseSegment.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseSegment.cs
index e925c40fc..de2c96958 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseSegment.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseSegment.cs
@@ -46,32 +46,36 @@ public partial class ExerciseSegment
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSegment.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSegment.html#getRepetitionsCount()"/>
         /// </summary>
-        public Java.Time.Instant EndTime
+        /// <returns><see cref="int"/></returns>
+        public int GetRepetitionsCount()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<int>("getRepetitionsCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSegment.html#getRepetitionsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSegment.html#getSegmentType()"/>
         /// </summary>
-        public int RepetitionsCount
+        /// <returns><see cref="int"/></returns>
+        public int GetSegmentType()
         {
-            get { return IExecuteWithSignature<int>("getRepetitionsCount", "()I"); }
+            return IExecuteWithSignature<int>("getSegmentType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSegment.html#getSegmentType()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSegment.html#getEndTime()"/>
         /// </summary>
-        public int SegmentType
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetEndTime()
         {
-            get { return IExecuteWithSignature<int>("getSegmentType", "()I"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSegment.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSegment.html#getStartTime()"/>
         /// </summary>
-        public Java.Time.Instant StartTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetStartTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseSessionRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseSessionRecord.cs
index 1cd250134..eba3e101d 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseSessionRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/ExerciseSessionRecord.cs
@@ -52,54 +52,60 @@ public partial class ExerciseSessionRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getExerciseType()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getRoute()"/>
         /// </summary>
-        public int ExerciseType
+        /// <returns><see cref="Android.Health.Connect.Datatypes.ExerciseRoute"/></returns>
+        public Android.Health.Connect.Datatypes.ExerciseRoute GetRoute()
         {
-            get { return IExecuteWithSignature<int>("getExerciseType", "()I"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.ExerciseRoute>("getRoute", "()Landroid/health/connect/datatypes/ExerciseRoute;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getLaps()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#hasRoute()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.ExerciseLap> Laps
+        /// <returns><see cref="bool"/></returns>
+        public bool HasRoute()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.ExerciseLap>>("getLaps", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("hasRoute", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getNotes()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getExerciseType()"/>
         /// </summary>
-        public Java.Lang.CharSequence Notes
+        /// <returns><see cref="int"/></returns>
+        public int GetExerciseType()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getNotes", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getExerciseType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getRoute()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getNotes()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.ExerciseRoute Route
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetNotes()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.ExerciseRoute>("getRoute", "()Landroid/health/connect/datatypes/ExerciseRoute;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNotes", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getSegments()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getTitle()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.ExerciseSegment> Segments
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.ExerciseSegment>>("getSegments", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getLaps()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.ExerciseLap> GetLaps()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.ExerciseLap>>("getLaps", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#hasRoute()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/ExerciseSessionRecord.html#getSegments()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasRoute()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.ExerciseSegment> GetSegments()
         {
-            return IExecuteWithSignature<bool>("hasRoute", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.ExerciseSegment>>("getSegments", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/FloorsClimbedRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/FloorsClimbedRecord.cs
index beb3661d1..0c545d84d 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/FloorsClimbedRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/FloorsClimbedRecord.cs
@@ -52,11 +52,12 @@ public partial class FloorsClimbedRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/FloorsClimbedRecord.html#getFloors()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/FloorsClimbedRecord.html#getFloors()"/>
         /// </summary>
-        public double Floors
+        /// <returns><see cref="double"/></returns>
+        public double GetFloors()
         {
-            get { return IExecuteWithSignature<double>("getFloors", "()D"); }
+            return IExecuteWithSignature<double>("getFloors", "()D");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeartRateRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeartRateRecord.cs
index e2679ebe5..2a658f6d0 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeartRateRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeartRateRecord.cs
@@ -70,11 +70,12 @@ public partial class HeartRateRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeartRateRecord.html#getSamples()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeartRateRecord.html#getSamples()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.HeartRateRecord.HeartRateSample> Samples
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.HeartRateRecord.HeartRateSample> GetSamples()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.HeartRateRecord.HeartRateSample>>("getSamples", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.HeartRateRecord.HeartRateSample>>("getSamples", "()Ljava/util/List;");
         }
 
         #endregion
@@ -194,18 +195,20 @@ public HeartRateSample(long arg0, Java.Time.Instant arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeartRateRecord.HeartRateSample.html#getBeatsPerMinute()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeartRateRecord.HeartRateSample.html#getTime()"/>
             /// </summary>
-            public long BeatsPerMinute
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetTime()
             {
-                get { return IExecuteWithSignature<long>("getBeatsPerMinute", "()J"); }
+                return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeartRateRecord.HeartRateSample.html#getTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeartRateRecord.HeartRateSample.html#getBeatsPerMinute()"/>
             /// </summary>
-            public Java.Time.Instant Time
+            /// <returns><see cref="long"/></returns>
+            public long GetBeatsPerMinute()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;"); }
+                return IExecuteWithSignature<long>("getBeatsPerMinute", "()J");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeartRateVariabilityRmssdRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeartRateVariabilityRmssdRecord.cs
index 9af0e49ef..d85a6295b 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeartRateVariabilityRmssdRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeartRateVariabilityRmssdRecord.cs
@@ -46,11 +46,12 @@ public partial class HeartRateVariabilityRmssdRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeartRateVariabilityRmssdRecord.html#getHeartRateVariabilityMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeartRateVariabilityRmssdRecord.html#getHeartRateVariabilityMillis()"/>
         /// </summary>
-        public double HeartRateVariabilityMillis
+        /// <returns><see cref="double"/></returns>
+        public double GetHeartRateVariabilityMillis()
         {
-            get { return IExecuteWithSignature<double>("getHeartRateVariabilityMillis", "()D"); }
+            return IExecuteWithSignature<double>("getHeartRateVariabilityMillis", "()D");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeightRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeightRecord.cs
index 85309c051..b3b49b9bc 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeightRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HeightRecord.cs
@@ -64,11 +64,12 @@ public partial class HeightRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeightRecord.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HeightRecord.html#getHeight()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Length Height
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Length"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Length GetHeight()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getHeight", "()Landroid/health/connect/datatypes/units/Length;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Length>("getHeight", "()Landroid/health/connect/datatypes/units/Length;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HydrationRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HydrationRecord.cs
index 396755d92..8e5265e4e 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HydrationRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/HydrationRecord.cs
@@ -52,11 +52,12 @@ public partial class HydrationRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HydrationRecord.html#getVolume()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/HydrationRecord.html#getVolume()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Volume Volume
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Volume"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Volume GetVolume()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Volume>("getVolume", "()Landroid/health/connect/datatypes/units/Volume;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Volume>("getVolume", "()Landroid/health/connect/datatypes/units/Volume;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/InstantRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/InstantRecord.cs
index a6c82ce4b..536c07882 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/InstantRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/InstantRecord.cs
@@ -46,18 +46,20 @@ public partial class InstantRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/InstantRecord.html#getTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/InstantRecord.html#getTime()"/>
         /// </summary>
-        public Java.Time.Instant Time
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/InstantRecord.html#getZoneOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/InstantRecord.html#getZoneOffset()"/>
         /// </summary>
-        public Java.Time.ZoneOffset ZoneOffset
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetZoneOffset()
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getZoneOffset", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getZoneOffset", "()Ljava/time/ZoneOffset;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/IntervalRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/IntervalRecord.cs
index b00b9da9b..3f36a947a 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/IntervalRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/IntervalRecord.cs
@@ -46,32 +46,36 @@ public partial class IntervalRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/IntervalRecord.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/IntervalRecord.html#getEndTime()"/>
         /// </summary>
-        public Java.Time.Instant EndTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetEndTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/IntervalRecord.html#getEndZoneOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/IntervalRecord.html#getStartTime()"/>
         /// </summary>
-        public Java.Time.ZoneOffset EndZoneOffset
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetStartTime()
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getEndZoneOffset", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/IntervalRecord.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/IntervalRecord.html#getEndZoneOffset()"/>
         /// </summary>
-        public Java.Time.Instant StartTime
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetEndZoneOffset()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getEndZoneOffset", "()Ljava/time/ZoneOffset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/IntervalRecord.html#getStartZoneOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/IntervalRecord.html#getStartZoneOffset()"/>
         /// </summary>
-        public Java.Time.ZoneOffset StartZoneOffset
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetStartZoneOffset()
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getStartZoneOffset", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getStartZoneOffset", "()Ljava/time/ZoneOffset;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/LeanBodyMassRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/LeanBodyMassRecord.cs
index 7812a431a..ec296c715 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/LeanBodyMassRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/LeanBodyMassRecord.cs
@@ -46,11 +46,12 @@ public partial class LeanBodyMassRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/LeanBodyMassRecord.html#getMass()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/LeanBodyMassRecord.html#getMass()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Mass
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetMass()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMass", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMass", "()Landroid/health/connect/datatypes/units/Mass;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/MenstruationFlowRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/MenstruationFlowRecord.cs
index 2e250ec2a..1fbb435df 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/MenstruationFlowRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/MenstruationFlowRecord.cs
@@ -46,11 +46,12 @@ public partial class MenstruationFlowRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/MenstruationFlowRecord.html#getFlow()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/MenstruationFlowRecord.html#getFlow()"/>
         /// </summary>
-        public int Flow
+        /// <returns><see cref="int"/></returns>
+        public int GetFlow()
         {
-            get { return IExecuteWithSignature<int>("getFlow", "()I"); }
+            return IExecuteWithSignature<int>("getFlow", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Metadata.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Metadata.cs
index 09ade8aeb..de0fb5760 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Metadata.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Metadata.cs
@@ -70,53 +70,60 @@ public partial class Metadata
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getClientRecordId()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getDataOrigin()"/>
         /// </summary>
-        public Java.Lang.String ClientRecordId
+        /// <returns><see cref="Android.Health.Connect.Datatypes.DataOrigin"/></returns>
+        public Android.Health.Connect.Datatypes.DataOrigin GetDataOrigin()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClientRecordId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.DataOrigin>("getDataOrigin", "()Landroid/health/connect/datatypes/DataOrigin;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getClientRecordVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getDevice()"/>
         /// </summary>
-        public long ClientRecordVersion
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Device"/></returns>
+        public Android.Health.Connect.Datatypes.Device GetDevice()
         {
-            get { return IExecuteWithSignature<long>("getClientRecordVersion", "()J"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Device>("getDevice", "()Landroid/health/connect/datatypes/Device;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getDataOrigin()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getRecordingMethod()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.DataOrigin DataOrigin
+        /// <returns><see cref="int"/></returns>
+        public int GetRecordingMethod()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.DataOrigin>("getDataOrigin", "()Landroid/health/connect/datatypes/DataOrigin;"); }
+            return IExecuteWithSignature<int>("getRecordingMethod", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getClientRecordId()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Device Device
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClientRecordId()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Device>("getDevice", "()Landroid/health/connect/datatypes/Device;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getClientRecordId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getId()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getLastModifiedTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getLastModifiedTime()"/>
         /// </summary>
-        public Java.Time.Instant LastModifiedTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetLastModifiedTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getLastModifiedTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getLastModifiedTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getRecordingMethod()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Metadata.html#getClientRecordVersion()"/>
         /// </summary>
-        public int RecordingMethod
+        /// <returns><see cref="long"/></returns>
+        public long GetClientRecordVersion()
         {
-            get { return IExecuteWithSignature<int>("getRecordingMethod", "()I"); }
+            return IExecuteWithSignature<long>("getClientRecordVersion", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/NutritionRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/NutritionRecord.cs
index d73b75243..4afbb87d4 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/NutritionRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/NutritionRecord.cs
@@ -292,312 +292,356 @@ public partial class NutritionRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getBiotin()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getEnergy()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Biotin
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Energy"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Energy GetEnergy()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getBiotin", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Energy>("getEnergy", "()Landroid/health/connect/datatypes/units/Energy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getCaffeine()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getEnergyFromFat()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Caffeine
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Energy"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Energy GetEnergyFromFat()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getCaffeine", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Energy>("getEnergyFromFat", "()Landroid/health/connect/datatypes/units/Energy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getCalcium()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getBiotin()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Calcium
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetBiotin()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getCalcium", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getBiotin", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getChloride()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getCaffeine()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Chloride
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetCaffeine()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getChloride", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getCaffeine", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getCholesterol()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getCalcium()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Cholesterol
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetCalcium()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getCholesterol", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getCalcium", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getChromium()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getChloride()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Chromium
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetChloride()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getChromium", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getChloride", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getCopper()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getCholesterol()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Copper
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetCholesterol()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getCopper", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getCholesterol", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getDietaryFiber()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getChromium()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass DietaryFiber
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetChromium()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getDietaryFiber", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getChromium", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getEnergy()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getCopper()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Energy Energy
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetCopper()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Energy>("getEnergy", "()Landroid/health/connect/datatypes/units/Energy;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getCopper", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getEnergyFromFat()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getDietaryFiber()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Energy EnergyFromFat
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetDietaryFiber()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Energy>("getEnergyFromFat", "()Landroid/health/connect/datatypes/units/Energy;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getDietaryFiber", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getFolate()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getFolate()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Folate
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetFolate()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getFolate", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getFolate", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getFolicAcid()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getFolicAcid()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass FolicAcid
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetFolicAcid()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getFolicAcid", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getFolicAcid", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getIodine()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getIodine()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Iodine
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetIodine()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getIodine", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getIodine", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getIron()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getIron()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Iron
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetIron()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getIron", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getIron", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMagnesium()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMagnesium()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Magnesium
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetMagnesium()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMagnesium", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMagnesium", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getManganese()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getManganese()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Manganese
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetManganese()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getManganese", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getManganese", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMealName()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMolybdenum()"/>
         /// </summary>
-        public Java.Lang.String MealName
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetMolybdenum()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMealName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMolybdenum", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMealType()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMonounsaturatedFat()"/>
         /// </summary>
-        public int MealType
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetMonounsaturatedFat()
         {
-            get { return IExecuteWithSignature<int>("getMealType", "()I"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMonounsaturatedFat", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMolybdenum()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getNiacin()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Molybdenum
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetNiacin()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMolybdenum", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getNiacin", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMonounsaturatedFat()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getPantothenicAcid()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass MonounsaturatedFat
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetPantothenicAcid()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getMonounsaturatedFat", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getPantothenicAcid", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getNiacin()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getPhosphorus()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Niacin
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetPhosphorus()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getNiacin", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getPhosphorus", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getPantothenicAcid()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getPolyunsaturatedFat()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass PantothenicAcid
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetPolyunsaturatedFat()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getPantothenicAcid", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getPolyunsaturatedFat", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getPhosphorus()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getPotassium()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Phosphorus
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetPotassium()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getPhosphorus", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getPotassium", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getPolyunsaturatedFat()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getProtein()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass PolyunsaturatedFat
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetProtein()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getPolyunsaturatedFat", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getProtein", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getPotassium()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getRiboflavin()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Potassium
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetRiboflavin()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getPotassium", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getRiboflavin", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getProtein()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getSaturatedFat()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Protein
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetSaturatedFat()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getProtein", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getSaturatedFat", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getRiboflavin()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getSelenium()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Riboflavin
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetSelenium()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getRiboflavin", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getSelenium", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getSaturatedFat()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getSodium()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass SaturatedFat
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetSodium()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getSaturatedFat", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getSodium", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getSelenium()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getSugar()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Selenium
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetSugar()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getSelenium", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getSugar", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getSodium()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getThiamin()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Sodium
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetThiamin()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getSodium", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getThiamin", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getSugar()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getTotalCarbohydrate()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Sugar
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetTotalCarbohydrate()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getSugar", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getTotalCarbohydrate", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getThiamin()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getTotalFat()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Thiamin
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetTotalFat()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getThiamin", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getTotalFat", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getTotalCarbohydrate()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getTransFat()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass TotalCarbohydrate
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetTransFat()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getTotalCarbohydrate", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getTransFat", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getTotalFat()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getUnsaturatedFat()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass TotalFat
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetUnsaturatedFat()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getTotalFat", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getUnsaturatedFat", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getTransFat()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminA()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass TransFat
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetVitaminA()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getTransFat", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminA", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getUnsaturatedFat()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminB12()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass UnsaturatedFat
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetVitaminB12()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getUnsaturatedFat", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminB12", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminA()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminB6()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass VitaminA
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetVitaminB6()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminA", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminB6", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminB12()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminC()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass VitaminB12
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetVitaminC()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminB12", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminC", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminB6()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminD()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass VitaminB6
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetVitaminD()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminB6", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminD", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminC()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminE()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass VitaminC
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetVitaminE()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminC", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminE", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminD()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminK()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass VitaminD
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetVitaminK()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminD", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminK", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminE()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getZinc()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass VitaminE
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetZinc()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminE", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getZinc", "()Landroid/health/connect/datatypes/units/Mass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getVitaminK()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMealType()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass VitaminK
+        /// <returns><see cref="int"/></returns>
+        public int GetMealType()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getVitaminK", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<int>("getMealType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getZinc()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/NutritionRecord.html#getMealName()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Zinc
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMealName()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getZinc", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMealName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/OvulationTestRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/OvulationTestRecord.cs
index febd4771a..719189ee2 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/OvulationTestRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/OvulationTestRecord.cs
@@ -46,11 +46,12 @@ public partial class OvulationTestRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/OvulationTestRecord.html#getResult()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/OvulationTestRecord.html#getResult()"/>
         /// </summary>
-        public int Result
+        /// <returns><see cref="int"/></returns>
+        public int GetResult()
         {
-            get { return IExecuteWithSignature<int>("getResult", "()I"); }
+            return IExecuteWithSignature<int>("getResult", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/OxygenSaturationRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/OxygenSaturationRecord.cs
index 11665d586..39a129cea 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/OxygenSaturationRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/OxygenSaturationRecord.cs
@@ -46,11 +46,12 @@ public partial class OxygenSaturationRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/OxygenSaturationRecord.html#getPercentage()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/OxygenSaturationRecord.html#getPercentage()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Percentage Percentage
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Percentage"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Percentage GetPercentage()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Percentage>("getPercentage", "()Landroid/health/connect/datatypes/units/Percentage;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Percentage>("getPercentage", "()Landroid/health/connect/datatypes/units/Percentage;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/PowerRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/PowerRecord.cs
index 85bb0baf3..65793440e 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/PowerRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/PowerRecord.cs
@@ -64,11 +64,12 @@ public partial class PowerRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/PowerRecord.html#getSamples()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/PowerRecord.html#getSamples()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.PowerRecord.PowerRecordSample> Samples
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.PowerRecord.PowerRecordSample> GetSamples()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.PowerRecord.PowerRecordSample>>("getSamples", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.PowerRecord.PowerRecordSample>>("getSamples", "()Ljava/util/List;");
         }
 
         #endregion
@@ -188,18 +189,20 @@ public PowerRecordSample(Android.Health.Connect.Datatypes.Units.Power arg0, Java
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/PowerRecord.PowerRecordSample.html#getPower()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/PowerRecord.PowerRecordSample.html#getPower()"/>
             /// </summary>
-            public Android.Health.Connect.Datatypes.Units.Power Power
+            /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Power"/></returns>
+            public Android.Health.Connect.Datatypes.Units.Power GetPower()
             {
-                get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Power>("getPower", "()Landroid/health/connect/datatypes/units/Power;"); }
+                return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Power>("getPower", "()Landroid/health/connect/datatypes/units/Power;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/PowerRecord.PowerRecordSample.html#getTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/PowerRecord.PowerRecordSample.html#getTime()"/>
             /// </summary>
-            public Java.Time.Instant Time
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetTime()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;"); }
+                return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Record.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Record.cs
index bbb748dd8..b9e5e60f0 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Record.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Record.cs
@@ -46,11 +46,12 @@ public partial class Record
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Record.html#getMetadata()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Record.html#getMetadata()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Metadata Metadata
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Metadata"/></returns>
+        public Android.Health.Connect.Datatypes.Metadata GetMetadata()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Metadata>("getMetadata", "()Landroid/health/connect/datatypes/Metadata;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Metadata>("getMetadata", "()Landroid/health/connect/datatypes/Metadata;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/RespiratoryRateRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/RespiratoryRateRecord.cs
index 41e49f5c3..59069207d 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/RespiratoryRateRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/RespiratoryRateRecord.cs
@@ -46,11 +46,12 @@ public partial class RespiratoryRateRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/RespiratoryRateRecord.html#getRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/RespiratoryRateRecord.html#getRate()"/>
         /// </summary>
-        public double Rate
+        /// <returns><see cref="double"/></returns>
+        public double GetRate()
         {
-            get { return IExecuteWithSignature<double>("getRate", "()D"); }
+            return IExecuteWithSignature<double>("getRate", "()D");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/RestingHeartRateRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/RestingHeartRateRecord.cs
index a4c849fb3..325ea2dd5 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/RestingHeartRateRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/RestingHeartRateRecord.cs
@@ -64,11 +64,12 @@ public partial class RestingHeartRateRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/RestingHeartRateRecord.html#getBeatsPerMinute()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/RestingHeartRateRecord.html#getBeatsPerMinute()"/>
         /// </summary>
-        public long BeatsPerMinute
+        /// <returns><see cref="long"/></returns>
+        public long GetBeatsPerMinute()
         {
-            get { return IExecuteWithSignature<long>("getBeatsPerMinute", "()J"); }
+            return IExecuteWithSignature<long>("getBeatsPerMinute", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SexualActivityRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SexualActivityRecord.cs
index 90ad0d2c5..5abbb285b 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SexualActivityRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SexualActivityRecord.cs
@@ -46,11 +46,12 @@ public partial class SexualActivityRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SexualActivityRecord.html#getProtectionUsed()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SexualActivityRecord.html#getProtectionUsed()"/>
         /// </summary>
-        public int ProtectionUsed
+        /// <returns><see cref="int"/></returns>
+        public int GetProtectionUsed()
         {
-            get { return IExecuteWithSignature<int>("getProtectionUsed", "()I"); }
+            return IExecuteWithSignature<int>("getProtectionUsed", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SleepSessionRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SleepSessionRecord.cs
index 2772376ac..701cb7bba 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SleepSessionRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SleepSessionRecord.cs
@@ -52,25 +52,28 @@ public partial class SleepSessionRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.html#getNotes()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.html#getNotes()"/>
         /// </summary>
-        public Java.Lang.CharSequence Notes
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetNotes()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getNotes", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNotes", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.html#getStages()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.html#getTitle()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.SleepSessionRecord.Stage> Stages
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.SleepSessionRecord.Stage>>("getStages", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.html#getStages()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.SleepSessionRecord.Stage> GetStages()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.SleepSessionRecord.Stage>>("getStages", "()Ljava/util/List;");
         }
 
         #endregion
@@ -217,25 +220,28 @@ public Stage(Java.Time.Instant arg0, Java.Time.Instant arg1, int arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.Stage.html#getEndTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.Stage.html#getType()"/>
             /// </summary>
-            public Java.Time.Instant EndTime
+            /// <returns><see cref="int"/></returns>
+            public int GetType()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;"); }
+                return IExecuteWithSignature<int>("getType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.Stage.html#getStartTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.Stage.html#getEndTime()"/>
             /// </summary>
-            public Java.Time.Instant StartTime
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetEndTime()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;"); }
+                return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.Stage.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SleepSessionRecord.Stage.html#getStartTime()"/>
             /// </summary>
-            public int Type
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetStartTime()
             {
-                get { return IExecuteWithSignature<int>("getType", "()I"); }
+                return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SpeedRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SpeedRecord.cs
index 354b933cf..7b9083b9a 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SpeedRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/SpeedRecord.cs
@@ -46,11 +46,12 @@ public partial class SpeedRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SpeedRecord.html#getSamples()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SpeedRecord.html#getSamples()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.SpeedRecord.SpeedRecordSample> Samples
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.SpeedRecord.SpeedRecordSample> GetSamples()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.SpeedRecord.SpeedRecordSample>>("getSamples", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.SpeedRecord.SpeedRecordSample>>("getSamples", "()Ljava/util/List;");
         }
 
         #endregion
@@ -170,18 +171,20 @@ public SpeedRecordSample(Android.Health.Connect.Datatypes.Units.Velocity arg0, J
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SpeedRecord.SpeedRecordSample.html#getSpeed()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SpeedRecord.SpeedRecordSample.html#getSpeed()"/>
             /// </summary>
-            public Android.Health.Connect.Datatypes.Units.Velocity Speed
+            /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Velocity"/></returns>
+            public Android.Health.Connect.Datatypes.Units.Velocity GetSpeed()
             {
-                get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Velocity>("getSpeed", "()Landroid/health/connect/datatypes/units/Velocity;"); }
+                return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Velocity>("getSpeed", "()Landroid/health/connect/datatypes/units/Velocity;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SpeedRecord.SpeedRecordSample.html#getTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/SpeedRecord.SpeedRecordSample.html#getTime()"/>
             /// </summary>
-            public Java.Time.Instant Time
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetTime()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;"); }
+                return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/StepsCadenceRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/StepsCadenceRecord.cs
index a8fdfde39..32ad839ef 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/StepsCadenceRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/StepsCadenceRecord.cs
@@ -46,11 +46,12 @@ public partial class StepsCadenceRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/StepsCadenceRecord.html#getSamples()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/StepsCadenceRecord.html#getSamples()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.StepsCadenceRecord.StepsCadenceRecordSample> Samples
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.StepsCadenceRecord.StepsCadenceRecordSample> GetSamples()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.StepsCadenceRecord.StepsCadenceRecordSample>>("getSamples", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.StepsCadenceRecord.StepsCadenceRecordSample>>("getSamples", "()Ljava/util/List;");
         }
 
         #endregion
@@ -170,18 +171,20 @@ public StepsCadenceRecordSample(double arg0, Java.Time.Instant arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/StepsCadenceRecord.StepsCadenceRecordSample.html#getRate()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/StepsCadenceRecord.StepsCadenceRecordSample.html#getRate()"/>
             /// </summary>
-            public double Rate
+            /// <returns><see cref="double"/></returns>
+            public double GetRate()
             {
-                get { return IExecuteWithSignature<double>("getRate", "()D"); }
+                return IExecuteWithSignature<double>("getRate", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/StepsCadenceRecord.StepsCadenceRecordSample.html#getTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/StepsCadenceRecord.StepsCadenceRecordSample.html#getTime()"/>
             /// </summary>
-            public Java.Time.Instant Time
+            /// <returns><see cref="Java.Time.Instant"/></returns>
+            public Java.Time.Instant GetTime()
             {
-                get { return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;"); }
+                return IExecuteWithSignature<Java.Time.Instant>("getTime", "()Ljava/time/Instant;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/StepsRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/StepsRecord.cs
index 35459d867..3befcc2ea 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/StepsRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/StepsRecord.cs
@@ -52,11 +52,12 @@ public partial class StepsRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/StepsRecord.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/StepsRecord.html#getCount()"/>
         /// </summary>
-        public long Count
+        /// <returns><see cref="long"/></returns>
+        public long GetCount()
         {
-            get { return IExecuteWithSignature<long>("getCount", "()J"); }
+            return IExecuteWithSignature<long>("getCount", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/TotalCaloriesBurnedRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/TotalCaloriesBurnedRecord.cs
index 6e6baf934..6d65a8251 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/TotalCaloriesBurnedRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/TotalCaloriesBurnedRecord.cs
@@ -52,11 +52,12 @@ public partial class TotalCaloriesBurnedRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/TotalCaloriesBurnedRecord.html#getEnergy()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/TotalCaloriesBurnedRecord.html#getEnergy()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Energy Energy
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Energy"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Energy GetEnergy()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Energy>("getEnergy", "()Landroid/health/connect/datatypes/units/Energy;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Energy>("getEnergy", "()Landroid/health/connect/datatypes/units/Energy;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/BloodGlucose.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/BloodGlucose.cs
index 00400988e..bfbc47359 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/BloodGlucose.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/BloodGlucose.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.BloodGlucose FromMillimoles
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/BloodGlucose.html#getInMillimolesPerLiter()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/BloodGlucose.html#getInMillimolesPerLiter()"/>
         /// </summary>
-        public double InMillimolesPerLiter
+        /// <returns><see cref="double"/></returns>
+        public double GetInMillimolesPerLiter()
         {
-            get { return IExecuteWithSignature<double>("getInMillimolesPerLiter", "()D"); }
+            return IExecuteWithSignature<double>("getInMillimolesPerLiter", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/BloodGlucose.html#compareTo(android.health.connect.datatypes.units.BloodGlucose)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Energy.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Energy.cs
index 39e1713c0..09addae8a 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Energy.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Energy.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Energy FromCalories(double
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Energy.html#getInCalories()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Energy.html#getInCalories()"/>
         /// </summary>
-        public double InCalories
+        /// <returns><see cref="double"/></returns>
+        public double GetInCalories()
         {
-            get { return IExecuteWithSignature<double>("getInCalories", "()D"); }
+            return IExecuteWithSignature<double>("getInCalories", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Energy.html#compareTo(android.health.connect.datatypes.units.Energy)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Length.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Length.cs
index 67629e1b5..fcd1c7b05 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Length.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Length.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Length FromMeters(double ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Length.html#getInMeters()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Length.html#getInMeters()"/>
         /// </summary>
-        public double InMeters
+        /// <returns><see cref="double"/></returns>
+        public double GetInMeters()
         {
-            get { return IExecuteWithSignature<double>("getInMeters", "()D"); }
+            return IExecuteWithSignature<double>("getInMeters", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Length.html#compareTo(android.health.connect.datatypes.units.Length)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Mass.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Mass.cs
index d89b6629d..4aaba8fe6 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Mass.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Mass.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Mass FromGrams(double arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Mass.html#getInGrams()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Mass.html#getInGrams()"/>
         /// </summary>
-        public double InGrams
+        /// <returns><see cref="double"/></returns>
+        public double GetInGrams()
         {
-            get { return IExecuteWithSignature<double>("getInGrams", "()D"); }
+            return IExecuteWithSignature<double>("getInGrams", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Mass.html#compareTo(android.health.connect.datatypes.units.Mass)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Percentage.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Percentage.cs
index a86fc0cb7..4ece60f9b 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Percentage.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Percentage.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Percentage FromValue(double
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Percentage.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Percentage.html#getValue()"/>
         /// </summary>
-        public double Value
+        /// <returns><see cref="double"/></returns>
+        public double GetValue()
         {
-            get { return IExecuteWithSignature<double>("getValue", "()D"); }
+            return IExecuteWithSignature<double>("getValue", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Percentage.html#compareTo(android.health.connect.datatypes.units.Percentage)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Power.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Power.cs
index 4687ce3b7..c1bee95dc 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Power.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Power.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Power FromWatts(double arg0
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Power.html#getInWatts()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Power.html#getInWatts()"/>
         /// </summary>
-        public double InWatts
+        /// <returns><see cref="double"/></returns>
+        public double GetInWatts()
         {
-            get { return IExecuteWithSignature<double>("getInWatts", "()D"); }
+            return IExecuteWithSignature<double>("getInWatts", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Power.html#compareTo(android.health.connect.datatypes.units.Power)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Pressure.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Pressure.cs
index fcb20bdca..d22bc007a 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Pressure.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Pressure.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Pressure FromMillimetersOfM
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Pressure.html#getInMillimetersOfMercury()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Pressure.html#getInMillimetersOfMercury()"/>
         /// </summary>
-        public double InMillimetersOfMercury
+        /// <returns><see cref="double"/></returns>
+        public double GetInMillimetersOfMercury()
         {
-            get { return IExecuteWithSignature<double>("getInMillimetersOfMercury", "()D"); }
+            return IExecuteWithSignature<double>("getInMillimetersOfMercury", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Pressure.html#compareTo(android.health.connect.datatypes.units.Pressure)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Temperature.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Temperature.cs
index e4f8c7ef3..b872c5286 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Temperature.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Temperature.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Temperature FromCelsius(dou
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Temperature.html#getInCelsius()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Temperature.html#getInCelsius()"/>
         /// </summary>
-        public double InCelsius
+        /// <returns><see cref="double"/></returns>
+        public double GetInCelsius()
         {
-            get { return IExecuteWithSignature<double>("getInCelsius", "()D"); }
+            return IExecuteWithSignature<double>("getInCelsius", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Temperature.html#compareTo(android.health.connect.datatypes.units.Temperature)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Velocity.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Velocity.cs
index 33c6b300a..92bcf3082 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Velocity.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Velocity.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Velocity FromMetersPerSecon
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Velocity.html#getInMetersPerSecond()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Velocity.html#getInMetersPerSecond()"/>
         /// </summary>
-        public double InMetersPerSecond
+        /// <returns><see cref="double"/></returns>
+        public double GetInMetersPerSecond()
         {
-            get { return IExecuteWithSignature<double>("getInMetersPerSecond", "()D"); }
+            return IExecuteWithSignature<double>("getInMetersPerSecond", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Velocity.html#compareTo(android.health.connect.datatypes.units.Velocity)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Volume.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Volume.cs
index 360a2e171..2ba8554e9 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Volume.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Units/Volume.cs
@@ -55,11 +55,12 @@ public static Android.Health.Connect.Datatypes.Units.Volume FromLiters(double ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Volume.html#getInLiters()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Volume.html#getInLiters()"/>
         /// </summary>
-        public double InLiters
+        /// <returns><see cref="double"/></returns>
+        public double GetInLiters()
         {
-            get { return IExecuteWithSignature<double>("getInLiters", "()D"); }
+            return IExecuteWithSignature<double>("getInLiters", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/units/Volume.html#compareTo(android.health.connect.datatypes.units.Volume)"/>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Vo2MaxRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Vo2MaxRecord.cs
index 9f6bc1cd3..396e26fdf 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Vo2MaxRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/Vo2MaxRecord.cs
@@ -46,18 +46,20 @@ public partial class Vo2MaxRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Vo2MaxRecord.html#getMeasurementMethod()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Vo2MaxRecord.html#getVo2MillilitersPerMinuteKilogram()"/>
         /// </summary>
-        public int MeasurementMethod
+        /// <returns><see cref="double"/></returns>
+        public double GetVo2MillilitersPerMinuteKilogram()
         {
-            get { return IExecuteWithSignature<int>("getMeasurementMethod", "()I"); }
+            return IExecuteWithSignature<double>("getVo2MillilitersPerMinuteKilogram", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Vo2MaxRecord.html#getVo2MillilitersPerMinuteKilogram()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/Vo2MaxRecord.html#getMeasurementMethod()"/>
         /// </summary>
-        public double Vo2MillilitersPerMinuteKilogram
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementMethod()
         {
-            get { return IExecuteWithSignature<double>("getVo2MillilitersPerMinuteKilogram", "()D"); }
+            return IExecuteWithSignature<int>("getMeasurementMethod", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/WeightRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/WeightRecord.cs
index 98c1a140c..db4a79249 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/WeightRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/WeightRecord.cs
@@ -64,11 +64,12 @@ public partial class WeightRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/WeightRecord.html#getWeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/WeightRecord.html#getWeight()"/>
         /// </summary>
-        public Android.Health.Connect.Datatypes.Units.Mass Weight
+        /// <returns><see cref="Android.Health.Connect.Datatypes.Units.Mass"/></returns>
+        public Android.Health.Connect.Datatypes.Units.Mass GetWeight()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getWeight", "()Landroid/health/connect/datatypes/units/Mass;"); }
+            return IExecuteWithSignature<Android.Health.Connect.Datatypes.Units.Mass>("getWeight", "()Landroid/health/connect/datatypes/units/Mass;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/WheelchairPushesRecord.cs b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/WheelchairPushesRecord.cs
index 8a7df00d4..f3455d244 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/WheelchairPushesRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/Datatypes/WheelchairPushesRecord.cs
@@ -52,11 +52,12 @@ public partial class WheelchairPushesRecord
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/WheelchairPushesRecord.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/datatypes/WheelchairPushesRecord.html#getCount()"/>
         /// </summary>
-        public long Count
+        /// <returns><see cref="long"/></returns>
+        public long GetCount()
         {
-            get { return IExecuteWithSignature<long>("getCount", "()J"); }
+            return IExecuteWithSignature<long>("getCount", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/HealthConnectManager.cs b/src/net/Netdroid/Generated/Android/Health/Connect/HealthConnectManager.cs
index 46fd6432d..cb748c6fb 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/HealthConnectManager.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/HealthConnectManager.cs
@@ -76,17 +76,6 @@ public partial class HealthConnectManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/HealthConnectManager.html#readRecords(android.health.connect.ReadRecordsRequest,java.util.concurrent.Executor,android.os.OutcomeReceiver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Health.Connect.ReadRecordsRequest"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <param name="arg2"><see cref="Android.Os.OutcomeReceiver"/></param>
-        /// <typeparam name="T"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
-        public void ReadRecords<T>(Android.Health.Connect.ReadRecordsRequest<T> arg0, Java.Util.Concurrent.Executor arg1, Android.Os.OutcomeReceiver<Android.Health.Connect.ReadRecordsResponse<T>, Android.Health.Connect.HealthConnectException> arg2) where T: Android.Health.Connect.Datatypes.Record
-        {
-            IExecute("readRecords", arg0, arg1, arg2);
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/HealthConnectManager.html#aggregate(android.health.connect.AggregateRecordsRequest,java.util.concurrent.Executor,android.os.OutcomeReceiver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Health.Connect.AggregateRecordsRequest"/></param>
@@ -122,6 +111,17 @@ public void AggregateGroupByPeriod<T>(Android.Health.Connect.AggregateRecordsReq
             IExecute("aggregateGroupByPeriod", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/health/connect/HealthConnectManager.html#readRecords(android.health.connect.ReadRecordsRequest,java.util.concurrent.Executor,android.os.OutcomeReceiver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Health.Connect.ReadRecordsRequest"/></param>
+        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
+        /// <param name="arg2"><see cref="Android.Os.OutcomeReceiver"/></param>
+        /// <typeparam name="T"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
+        public void ReadRecords<T>(Android.Health.Connect.ReadRecordsRequest<T> arg0, Java.Util.Concurrent.Executor arg1, Android.Os.OutcomeReceiver<Android.Health.Connect.ReadRecordsResponse<T>, Android.Health.Connect.HealthConnectException> arg2) where T : Android.Health.Connect.Datatypes.Record
+        {
+            IExecute("readRecords", arg0, arg1, arg2);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/health/connect/HealthConnectManager.html#deleteRecords(java.lang.Class,android.health.connect.TimeRangeFilter,java.util.concurrent.Executor,android.os.OutcomeReceiver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/InsertRecordsResponse.cs b/src/net/Netdroid/Generated/Android/Health/Connect/InsertRecordsResponse.cs
index 140b9000e..4a4d4b91a 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/InsertRecordsResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/InsertRecordsResponse.cs
@@ -46,11 +46,12 @@ public partial class InsertRecordsResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/InsertRecordsResponse.html#getRecords()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/InsertRecordsResponse.html#getRecords()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.Datatypes.Record> Records
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.Datatypes.Record> GetRecords()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.Record>>("getRecords", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.Datatypes.Record>>("getRecords", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/LocalTimeRangeFilter.cs b/src/net/Netdroid/Generated/Android/Health/Connect/LocalTimeRangeFilter.cs
index 4c65eb6f4..25afc4f0c 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/LocalTimeRangeFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/LocalTimeRangeFilter.cs
@@ -46,26 +46,28 @@ public partial class LocalTimeRangeFilter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/LocalTimeRangeFilter.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/LocalTimeRangeFilter.html#isBounded()"/>
         /// </summary>
-        public Java.Time.LocalDateTime EndTime
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBounded()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getEndTime", "()Ljava/time/LocalDateTime;"); }
+            return IExecuteWithSignature<bool>("isBounded", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/LocalTimeRangeFilter.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/LocalTimeRangeFilter.html#getEndTime()"/>
         /// </summary>
-        public Java.Time.LocalDateTime StartTime
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetEndTime()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getStartTime", "()Ljava/time/LocalDateTime;"); }
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getEndTime", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/LocalTimeRangeFilter.html#isBounded()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/LocalTimeRangeFilter.html#getStartTime()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBounded()
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetStartTime()
         {
-            return IExecuteWithSignature<bool>("isBounded", "()Z");
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getStartTime", "()Ljava/time/LocalDateTime;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequest.cs b/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequest.cs
index 179a53a19..e691c94a5 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequest.cs
@@ -46,11 +46,12 @@ public partial class ReadRecordsRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequest.html#getRecordType()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequest.html#getRecordType()"/>
         /// </summary>
-        public Java.Lang.Class RecordType
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetRecordType()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getRecordType", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<Java.Lang.Class>("getRecordType", "()Ljava/lang/Class;");
         }
 
         #endregion
@@ -88,11 +89,12 @@ public partial class ReadRecordsRequest<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequest.html#getRecordType()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequest.html#getRecordType()"/>
         /// </summary>
-        public Java.Lang.Class RecordType
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetRecordType()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getRecordType", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<Java.Lang.Class>("getRecordType", "()Ljava/lang/Class;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequestUsingFilters.cs b/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequestUsingFilters.cs
index cc83fd9f9..5ae42bc8f 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequestUsingFilters.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequestUsingFilters.cs
@@ -46,40 +46,44 @@ public partial class ReadRecordsRequestUsingFilters
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getDataOrigins()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getTimeRangeFilter()"/>
         /// </summary>
-        public Java.Util.Set DataOrigins
+        /// <returns><see cref="Android.Health.Connect.TimeRangeFilter"/></returns>
+        public Android.Health.Connect.TimeRangeFilter GetTimeRangeFilter()
         {
-            get { return IExecuteWithSignature<Java.Util.Set>("getDataOrigins", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Health.Connect.TimeRangeFilter>("getTimeRangeFilter", "()Landroid/health/connect/TimeRangeFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getPageSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#isAscending()"/>
         /// </summary>
-        public int PageSize
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAscending()
         {
-            get { return IExecuteWithSignature<int>("getPageSize", "()I"); }
+            return IExecuteWithSignature<bool>("isAscending", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getPageToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getPageSize()"/>
         /// </summary>
-        public long PageToken
+        /// <returns><see cref="int"/></returns>
+        public int GetPageSize()
         {
-            get { return IExecuteWithSignature<long>("getPageToken", "()J"); }
+            return IExecuteWithSignature<int>("getPageSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getTimeRangeFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getDataOrigins()"/>
         /// </summary>
-        public Android.Health.Connect.TimeRangeFilter TimeRangeFilter
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set GetDataOrigins()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.TimeRangeFilter>("getTimeRangeFilter", "()Landroid/health/connect/TimeRangeFilter;"); }
+            return IExecuteWithSignature<Java.Util.Set>("getDataOrigins", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#isAscending()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getPageToken()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAscending()
+        /// <returns><see cref="long"/></returns>
+        public long GetPageToken()
         {
-            return IExecuteWithSignature<bool>("isAscending", "()Z");
+            return IExecuteWithSignature<long>("getPageToken", "()J");
         }
 
         #endregion
@@ -305,40 +309,44 @@ public partial class ReadRecordsRequestUsingFilters<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getDataOrigins()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getTimeRangeFilter()"/>
         /// </summary>
-        public Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin> DataOrigins
+        /// <returns><see cref="Android.Health.Connect.TimeRangeFilter"/></returns>
+        public Android.Health.Connect.TimeRangeFilter GetTimeRangeFilter()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin>>("getDataOrigins", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Health.Connect.TimeRangeFilter>("getTimeRangeFilter", "()Landroid/health/connect/TimeRangeFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getPageSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#isAscending()"/>
         /// </summary>
-        public int PageSize
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAscending()
         {
-            get { return IExecuteWithSignature<int>("getPageSize", "()I"); }
+            return IExecuteWithSignature<bool>("isAscending", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getPageToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getPageSize()"/>
         /// </summary>
-        public long PageToken
+        /// <returns><see cref="int"/></returns>
+        public int GetPageSize()
         {
-            get { return IExecuteWithSignature<long>("getPageToken", "()J"); }
+            return IExecuteWithSignature<int>("getPageSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getTimeRangeFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getDataOrigins()"/>
         /// </summary>
-        public Android.Health.Connect.TimeRangeFilter TimeRangeFilter
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin> GetDataOrigins()
         {
-            get { return IExecuteWithSignature<Android.Health.Connect.TimeRangeFilter>("getTimeRangeFilter", "()Landroid/health/connect/TimeRangeFilter;"); }
+            return IExecuteWithSignature<Java.Util.Set<Android.Health.Connect.Datatypes.DataOrigin>>("getDataOrigins", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#isAscending()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingFilters.html#getPageToken()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAscending()
+        /// <returns><see cref="long"/></returns>
+        public long GetPageToken()
         {
-            return IExecuteWithSignature<bool>("isAscending", "()Z");
+            return IExecuteWithSignature<long>("getPageToken", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequestUsingIds.cs b/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequestUsingIds.cs
index 91858365b..9b843da0f 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequestUsingIds.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsRequestUsingIds.cs
@@ -46,11 +46,12 @@ public partial class ReadRecordsRequestUsingIds
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingIds.html#getRecordIdFilters()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingIds.html#getRecordIdFilters()"/>
         /// </summary>
-        public Java.Util.List RecordIdFilters
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List GetRecordIdFilters()
         {
-            get { return IExecuteWithSignature<Java.Util.List>("getRecordIdFilters", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List>("getRecordIdFilters", "()Ljava/util/List;");
         }
 
         #endregion
@@ -222,11 +223,12 @@ public partial class ReadRecordsRequestUsingIds<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingIds.html#getRecordIdFilters()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsRequestUsingIds.html#getRecordIdFilters()"/>
         /// </summary>
-        public Java.Util.List<Android.Health.Connect.RecordIdFilter> RecordIdFilters
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Health.Connect.RecordIdFilter> GetRecordIdFilters()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.RecordIdFilter>>("getRecordIdFilters", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Health.Connect.RecordIdFilter>>("getRecordIdFilters", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsResponse.cs b/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsResponse.cs
index 4afb8e885..e92d529aa 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/ReadRecordsResponse.cs
@@ -46,18 +46,20 @@ public partial class ReadRecordsResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html#getNextPageToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html#getRecords()"/>
         /// </summary>
-        public long NextPageToken
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List GetRecords()
         {
-            get { return IExecuteWithSignature<long>("getNextPageToken", "()J"); }
+            return IExecuteWithSignature<Java.Util.List>("getRecords", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html#getRecords()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html#getNextPageToken()"/>
         /// </summary>
-        public Java.Util.List Records
+        /// <returns><see cref="long"/></returns>
+        public long GetNextPageToken()
         {
-            get { return IExecuteWithSignature<Java.Util.List>("getRecords", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<long>("getNextPageToken", "()J");
         }
 
         #endregion
@@ -95,18 +97,20 @@ public partial class ReadRecordsResponse<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html#getNextPageToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html#getRecords()"/>
         /// </summary>
-        public long NextPageToken
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<T> GetRecords()
         {
-            get { return IExecuteWithSignature<long>("getNextPageToken", "()J"); }
+            return IExecuteWithSignature<Java.Util.List<T>>("getRecords", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html#getRecords()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/ReadRecordsResponse.html#getNextPageToken()"/>
         /// </summary>
-        public Java.Util.List<T> Records
+        /// <returns><see cref="long"/></returns>
+        public long GetNextPageToken()
         {
-            get { return IExecuteWithSignature<Java.Util.List<T>>("getRecords", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<long>("getNextPageToken", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/RecordIdFilter.cs b/src/net/Netdroid/Generated/Android/Health/Connect/RecordIdFilter.cs
index 44c8d6149..f6d3f6701 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/RecordIdFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/RecordIdFilter.cs
@@ -66,25 +66,29 @@ public static Android.Health.Connect.RecordIdFilter FromId(Java.Lang.Class arg0,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/RecordIdFilter.html#getClientRecordId()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/RecordIdFilter.html#getRecordType()"/>
         /// </summary>
-        public Java.Lang.String ClientRecordId
+        /// <typeparam name="ReturnExtendsAndroid_Health_Connect_Datatypes_Record"><see cref="Android.Health.Connect.Datatypes.Record"/></typeparam>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetRecordType<ReturnExtendsAndroid_Health_Connect_Datatypes_Record>() where ReturnExtendsAndroid_Health_Connect_Datatypes_Record : Android.Health.Connect.Datatypes.Record
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClientRecordId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.Class>("getRecordType", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/RecordIdFilter.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/RecordIdFilter.html#getClientRecordId()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClientRecordId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getClientRecordId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/RecordIdFilter.html#getRecordType()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/RecordIdFilter.html#getId()"/>
         /// </summary>
-        public Java.Lang.Class RecordType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getRecordType", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Health/Connect/TimeInstantRangeFilter.cs b/src/net/Netdroid/Generated/Android/Health/Connect/TimeInstantRangeFilter.cs
index e2ec78da6..1fb590e8f 100644
--- a/src/net/Netdroid/Generated/Android/Health/Connect/TimeInstantRangeFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Health/Connect/TimeInstantRangeFilter.cs
@@ -46,26 +46,28 @@ public partial class TimeInstantRangeFilter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/TimeInstantRangeFilter.html#getEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/TimeInstantRangeFilter.html#isBounded()"/>
         /// </summary>
-        public Java.Time.Instant EndTime
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBounded()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<bool>("isBounded", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/TimeInstantRangeFilter.html#getStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/health/connect/TimeInstantRangeFilter.html#getEndTime()"/>
         /// </summary>
-        public Java.Time.Instant StartTime
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetEndTime()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getEndTime", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/health/connect/TimeInstantRangeFilter.html#isBounded()"/>
+        /// <see href="https://developer.android.com/reference/android/health/connect/TimeInstantRangeFilter.html#getStartTime()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBounded()
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetStartTime()
         {
-            return IExecuteWithSignature<bool>("isBounded", "()Z");
+            return IExecuteWithSignature<Java.Time.Instant>("getStartTime", "()Ljava/time/Instant;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Lang/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Icu/Lang/AllPackageClasses.cs
index 99ba996cd..84e7328c3 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Lang/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Lang/AllPackageClasses.cs
@@ -76,12 +76,12 @@ public partial class BidiPairedBracketType : MASES.JCOBridge.C2JBridge.JVMBridge
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("BidiPairedBracketType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BidiPairedBracketType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BidiPairedBracketType() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("BidiPairedBracketType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BidiPairedBracketType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BidiPairedBracketType(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -122,12 +122,12 @@ public partial class DecompositionType : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("DecompositionType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DecompositionType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DecompositionType() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("DecompositionType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DecompositionType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DecompositionType(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -168,12 +168,12 @@ public partial class EastAsianWidth : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ea
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("EastAsianWidth class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EastAsianWidth class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EastAsianWidth() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("EastAsianWidth class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EastAsianWidth class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EastAsianWidth(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -214,12 +214,12 @@ public partial class GraphemeClusterBreak : MASES.JCOBridge.C2JBridge.JVMBridgeB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("GraphemeClusterBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GraphemeClusterBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GraphemeClusterBreak() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("GraphemeClusterBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GraphemeClusterBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GraphemeClusterBreak(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -260,12 +260,12 @@ public partial class HangulSyllableType : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("HangulSyllableType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("HangulSyllableType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public HangulSyllableType() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("HangulSyllableType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("HangulSyllableType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public HangulSyllableType(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -306,12 +306,12 @@ public partial class IndicPositionalCategory : MASES.JCOBridge.C2JBridge.JVMBrid
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("IndicPositionalCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IndicPositionalCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IndicPositionalCategory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("IndicPositionalCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IndicPositionalCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IndicPositionalCategory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -352,12 +352,12 @@ public partial class IndicSyllabicCategory : MASES.JCOBridge.C2JBridge.JVMBridge
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("IndicSyllabicCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IndicSyllabicCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IndicSyllabicCategory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("IndicSyllabicCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IndicSyllabicCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IndicSyllabicCategory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -398,12 +398,12 @@ public partial class JoiningGroup : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Join
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("JoiningGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("JoiningGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public JoiningGroup() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("JoiningGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("JoiningGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public JoiningGroup(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -444,12 +444,12 @@ public partial class JoiningType : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Joini
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("JoiningType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("JoiningType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public JoiningType() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("JoiningType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("JoiningType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public JoiningType(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -490,12 +490,12 @@ public partial class LineBreak : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LineBre
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("LineBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LineBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LineBreak() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("LineBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LineBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LineBreak(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -536,12 +536,12 @@ public partial class NumericType : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Numer
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("NumericType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("NumericType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public NumericType() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("NumericType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("NumericType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public NumericType(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -582,12 +582,12 @@ public partial class SentenceBreak : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sen
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SentenceBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SentenceBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SentenceBreak() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SentenceBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SentenceBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SentenceBreak(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -672,12 +672,12 @@ public partial class VerticalOrientation : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("VerticalOrientation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VerticalOrientation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VerticalOrientation() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("VerticalOrientation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VerticalOrientation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VerticalOrientation(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -718,12 +718,12 @@ public partial class WordBreak : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WordBre
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("WordBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WordBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WordBreak() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("WordBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WordBreak class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WordBreak(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -896,12 +896,12 @@ public partial class ECharacterCategory : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ECharacterCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ECharacterCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ECharacterCategory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ECharacterCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ECharacterCategory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ECharacterCategory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -942,12 +942,12 @@ public partial class ECharacterDirection : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ECharacterDirection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ECharacterDirection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ECharacterDirection() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ECharacterDirection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ECharacterDirection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ECharacterDirection(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -992,12 +992,12 @@ public partial class UProperty : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UProper
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UProperty() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UProperty(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1034,12 +1034,12 @@ public partial class NameChoice : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NameCh
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("NameChoice class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("NameChoice class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public NameChoice() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("NameChoice class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("NameChoice class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public NameChoice(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Icu/Lang/UCharacter.cs b/src/net/Netdroid/Generated/Android/Icu/Lang/UCharacter.cs
index 8fd8a2a49..bf2f7a448 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Lang/UCharacter.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Lang/UCharacter.cs
@@ -162,32 +162,28 @@ public partial class UCharacter
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getExtendedNameIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getTypeIterator()"/>
         /// </summary>
-        public static Android.Icu.Util.ValueIterator ExtendedNameIterator
+        /// <returns><see cref="Android.Icu.Util.RangeValueIterator"/></returns>
+        public static Android.Icu.Util.RangeValueIterator GetTypeIterator()
         {
-            get { return SExecuteWithSignature<Android.Icu.Util.ValueIterator>(LocalBridgeClazz, "getExtendedNameIterator", "()Landroid/icu/util/ValueIterator;"); }
+            return SExecuteWithSignature<Android.Icu.Util.RangeValueIterator>(LocalBridgeClazz, "getTypeIterator", "()Landroid/icu/util/RangeValueIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getNameIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getExtendedNameIterator()"/>
         /// </summary>
-        public static Android.Icu.Util.ValueIterator NameIterator
+        /// <returns><see cref="Android.Icu.Util.ValueIterator"/></returns>
+        public static Android.Icu.Util.ValueIterator GetExtendedNameIterator()
         {
-            get { return SExecuteWithSignature<Android.Icu.Util.ValueIterator>(LocalBridgeClazz, "getNameIterator", "()Landroid/icu/util/ValueIterator;"); }
+            return SExecuteWithSignature<Android.Icu.Util.ValueIterator>(LocalBridgeClazz, "getExtendedNameIterator", "()Landroid/icu/util/ValueIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getTypeIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getNameIterator()"/>
         /// </summary>
-        public static Android.Icu.Util.RangeValueIterator TypeIterator
+        /// <returns><see cref="Android.Icu.Util.ValueIterator"/></returns>
+        public static Android.Icu.Util.ValueIterator GetNameIterator()
         {
-            get { return SExecuteWithSignature<Android.Icu.Util.RangeValueIterator>(LocalBridgeClazz, "getTypeIterator", "()Landroid/icu/util/RangeValueIterator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getUnicodeVersion()"/> 
-        /// </summary>
-        public static Android.Icu.Util.VersionInfo UnicodeVersion
-        {
-            get { return SExecuteWithSignature<Android.Icu.Util.VersionInfo>(LocalBridgeClazz, "getUnicodeVersion", "()Landroid/icu/util/VersionInfo;"); }
+            return SExecuteWithSignature<Android.Icu.Util.ValueIterator>(LocalBridgeClazz, "getNameIterator", "()Landroid/icu/util/ValueIterator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getAge(int)"/>
@@ -199,6 +195,14 @@ public static Android.Icu.Util.VersionInfo GetAge(int arg0)
             return SExecuteWithSignature<Android.Icu.Util.VersionInfo>(LocalBridgeClazz, "getAge", "(I)Landroid/icu/util/VersionInfo;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#getUnicodeVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.VersionInfo"/></returns>
+        public static Android.Icu.Util.VersionInfo GetUnicodeVersion()
+        {
+            return SExecuteWithSignature<Android.Icu.Util.VersionInfo>(LocalBridgeClazz, "getUnicodeVersion", "()Landroid/icu/util/VersionInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.html#hasBinaryProperty(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -7200,11 +7204,12 @@ public static Android.Icu.Lang.UCharacter.UnicodeBlock Of(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.UnicodeBlock.html#getID()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/lang/UCharacter.UnicodeBlock.html#getID()"/>
             /// </summary>
-            public int ID
+            /// <returns><see cref="int"/></returns>
+            public int GetID()
             {
-                get { return IExecuteWithSignature<int>("getID", "()I"); }
+                return IExecuteWithSignature<int>("getID", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Math/MathContext.cs b/src/net/Netdroid/Generated/Android/Icu/Math/MathContext.cs
index f5148cae4..30e48eb9f 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Math/MathContext.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Math/MathContext.cs
@@ -156,32 +156,36 @@ public MathContext(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/math/MathContext.html#getDigits()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/math/MathContext.html#getLostDigits()"/>
         /// </summary>
-        public int Digits
+        /// <returns><see cref="bool"/></returns>
+        public bool GetLostDigits()
         {
-            get { return IExecuteWithSignature<int>("getDigits", "()I"); }
+            return IExecuteWithSignature<bool>("getLostDigits", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/math/MathContext.html#getForm()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/math/MathContext.html#getDigits()"/>
         /// </summary>
-        public int Form
+        /// <returns><see cref="int"/></returns>
+        public int GetDigits()
         {
-            get { return IExecuteWithSignature<int>("getForm", "()I"); }
+            return IExecuteWithSignature<int>("getDigits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/math/MathContext.html#getLostDigits()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/math/MathContext.html#getForm()"/>
         /// </summary>
-        public bool LostDigits
+        /// <returns><see cref="int"/></returns>
+        public int GetForm()
         {
-            get { return IExecuteWithSignature<bool>("getLostDigits", "()Z"); }
+            return IExecuteWithSignature<int>("getForm", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/math/MathContext.html#getRoundingMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/math/MathContext.html#getRoundingMode()"/>
         /// </summary>
-        public int RoundingMode
+        /// <returns><see cref="int"/></returns>
+        public int GetRoundingMode()
         {
-            get { return IExecuteWithSignature<int>("getRoundingMode", "()I"); }
+            return IExecuteWithSignature<int>("getRoundingMode", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Number/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Icu/Number/AllPackageClasses.cs
index 1e48bb45d..b3693dbf6 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Number/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Number/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class CurrencyPrecision : Android.Icu.Number.Precision
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CurrencyPrecision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CurrencyPrecision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CurrencyPrecision() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CurrencyPrecision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CurrencyPrecision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CurrencyPrecision(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -214,12 +214,12 @@ public partial class FractionPrecision : Android.Icu.Number.Precision
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FractionPrecision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FractionPrecision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FractionPrecision() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FractionPrecision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FractionPrecision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FractionPrecision(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -298,7 +298,7 @@ public IntegerWidth(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/icu/number/LocalizedNumberFormatter.html"/>
     /// </summary>
-    public partial class LocalizedNumberFormatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LocalizedNumberFormatter>
+    public partial class LocalizedNumberFormatter : Android.Icu.Number.NumberFormatterSettings<Android.Icu.Number.LocalizedNumberFormatter>
     {
         const string _bridgeClassName = "android.icu.number.LocalizedNumberFormatter";
         /// <summary>
@@ -342,7 +342,7 @@ public LocalizedNumberFormatter(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/icu/number/LocalizedNumberRangeFormatter.html"/>
     /// </summary>
-    public partial class LocalizedNumberRangeFormatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LocalizedNumberRangeFormatter>
+    public partial class LocalizedNumberRangeFormatter : Android.Icu.Number.NumberRangeFormatterSettings<Android.Icu.Number.LocalizedNumberRangeFormatter>
     {
         const string _bridgeClassName = "android.icu.number.LocalizedNumberRangeFormatter";
         /// <summary>
@@ -734,6 +734,99 @@ public UnitWidth(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region NumberFormatterSettings
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html"/>
+    /// </summary>
+    public partial class NumberFormatterSettings : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NumberFormatterSettings>
+    {
+        const string _bridgeClassName = "android.icu.number.NumberFormatterSettings";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("NumberFormatterSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public NumberFormatterSettings() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("NumberFormatterSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public NumberFormatterSettings(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region NumberFormatterSettings<T>
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html"/>
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public partial class NumberFormatterSettings<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NumberFormatterSettings<T>> where T : Android.Icu.Number.NumberFormatterSettings<T>
+    {
+        const string _bridgeClassName = "android.icu.number.NumberFormatterSettings";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("NumberFormatterSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public NumberFormatterSettings() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("NumberFormatterSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public NumberFormatterSettings(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+    
+    }
+    #endregion
+
     #region NumberRangeFormatter
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatter.html"/>
@@ -744,12 +837,12 @@ public partial class NumberRangeFormatter : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NumberRangeFormatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NumberRangeFormatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NumberRangeFormatter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NumberRangeFormatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NumberRangeFormatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NumberRangeFormatter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -912,6 +1005,99 @@ public RangeIdentityResult(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region NumberRangeFormatterSettings
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html"/>
+    /// </summary>
+    public partial class NumberRangeFormatterSettings : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NumberRangeFormatterSettings>
+    {
+        const string _bridgeClassName = "android.icu.number.NumberRangeFormatterSettings";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("NumberRangeFormatterSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public NumberRangeFormatterSettings() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("NumberRangeFormatterSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public NumberRangeFormatterSettings(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region NumberRangeFormatterSettings<T>
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html"/>
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public partial class NumberRangeFormatterSettings<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NumberRangeFormatterSettings<T>> where T : Android.Icu.Number.NumberRangeFormatterSettings<T>
+    {
+        const string _bridgeClassName = "android.icu.number.NumberRangeFormatterSettings";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("NumberRangeFormatterSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public NumberRangeFormatterSettings() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("NumberRangeFormatterSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public NumberRangeFormatterSettings(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+    
+    }
+    #endregion
+
     #region Precision
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/icu/number/Precision.html"/>
@@ -922,12 +1108,12 @@ public partial class Precision : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Precisi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Precision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Precision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Precision() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Precision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Precision class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Precision(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1094,7 +1280,7 @@ public SimpleNotation(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/icu/number/UnlocalizedNumberFormatter.html"/>
     /// </summary>
-    public partial class UnlocalizedNumberFormatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UnlocalizedNumberFormatter>
+    public partial class UnlocalizedNumberFormatter : Android.Icu.Number.NumberFormatterSettings<Android.Icu.Number.UnlocalizedNumberFormatter>
     {
         const string _bridgeClassName = "android.icu.number.UnlocalizedNumberFormatter";
         /// <summary>
@@ -1138,7 +1324,7 @@ public UnlocalizedNumberFormatter(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/icu/number/UnlocalizedNumberRangeFormatter.html"/>
     /// </summary>
-    public partial class UnlocalizedNumberRangeFormatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UnlocalizedNumberRangeFormatter>
+    public partial class UnlocalizedNumberRangeFormatter : Android.Icu.Number.NumberRangeFormatterSettings<Android.Icu.Number.UnlocalizedNumberRangeFormatter>
     {
         const string _bridgeClassName = "android.icu.number.UnlocalizedNumberRangeFormatter";
         /// <summary>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Number/FormattedNumber.cs b/src/net/Netdroid/Generated/Android/Icu/Number/FormattedNumber.cs
index b835583b1..39604e744 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Number/FormattedNumber.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Number/FormattedNumber.cs
@@ -46,21 +46,22 @@ public partial class FormattedNumber
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumber.html#getOutputUnit()"/> 
-        /// </summary>
-        public Android.Icu.Util.MeasureUnit OutputUnit
-        {
-            get { return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("getOutputUnit", "()Landroid/icu/util/MeasureUnit;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumber.html#appendTo(java.lang.Appendable)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="A"/></param>
         /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
-        public A AppendTo<A>(A arg0) where A: Java.Lang.IAppendable, new()
+        public A AppendTo<A>(A arg0) where A : Java.Lang.IAppendable, new()
+        {
+            return IExecute<A>("appendTo", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumber.html#getOutputUnit()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
+        public Android.Icu.Util.MeasureUnit GetOutputUnit()
         {
-            return IExecuteWithSignature<A>("appendTo", "(Ljava/lang/Appendable;)Ljava/lang/Appendable;", arg0);
+            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("getOutputUnit", "()Landroid/icu/util/MeasureUnit;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumber.html#nextPosition(android.icu.text.ConstrainedFieldPosition)"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Number/FormattedNumberRange.cs b/src/net/Netdroid/Generated/Android/Icu/Number/FormattedNumberRange.cs
index 96bab8cf5..bd6e0f1ac 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Number/FormattedNumberRange.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Number/FormattedNumberRange.cs
@@ -46,35 +46,22 @@ public partial class FormattedNumberRange
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#getFirstBigDecimal()"/> 
-        /// </summary>
-        public Java.Math.BigDecimal FirstBigDecimal
-        {
-            get { return IExecuteWithSignature<Java.Math.BigDecimal>("getFirstBigDecimal", "()Ljava/math/BigDecimal;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#getIdentityResult()"/> 
-        /// </summary>
-        public Android.Icu.Number.NumberRangeFormatter.RangeIdentityResult IdentityResult
-        {
-            get { return IExecuteWithSignature<Android.Icu.Number.NumberRangeFormatter.RangeIdentityResult>("getIdentityResult", "()Landroid/icu/number/NumberRangeFormatter$RangeIdentityResult;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#getSecondBigDecimal()"/> 
-        /// </summary>
-        public Java.Math.BigDecimal SecondBigDecimal
-        {
-            get { return IExecuteWithSignature<Java.Math.BigDecimal>("getSecondBigDecimal", "()Ljava/math/BigDecimal;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#appendTo(java.lang.Appendable)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="A"/></param>
         /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
-        public A AppendTo<A>(A arg0) where A: Java.Lang.IAppendable, new()
+        public A AppendTo<A>(A arg0) where A : Java.Lang.IAppendable, new()
         {
-            return IExecuteWithSignature<A>("appendTo", "(Ljava/lang/Appendable;)Ljava/lang/Appendable;", arg0);
+            return IExecute<A>("appendTo", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#getIdentityResult()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Number.NumberRangeFormatter.RangeIdentityResult"/></returns>
+        public Android.Icu.Number.NumberRangeFormatter.RangeIdentityResult GetIdentityResult()
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberRangeFormatter.RangeIdentityResult>("getIdentityResult", "()Landroid/icu/number/NumberRangeFormatter$RangeIdentityResult;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#nextPosition(android.icu.text.ConstrainedFieldPosition)"/>
@@ -113,6 +100,22 @@ public Java.Lang.CharSequence SubSequence(int arg0, int arg1)
             return IExecute<Java.Lang.CharSequence>("subSequence", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#getFirstBigDecimal()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Math.BigDecimal"/></returns>
+        public Java.Math.BigDecimal GetFirstBigDecimal()
+        {
+            return IExecuteWithSignature<Java.Math.BigDecimal>("getFirstBigDecimal", "()Ljava/math/BigDecimal;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#getSecondBigDecimal()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Math.BigDecimal"/></returns>
+        public Java.Math.BigDecimal GetSecondBigDecimal()
+        {
+            return IExecuteWithSignature<Java.Math.BigDecimal>("getSecondBigDecimal", "()Ljava/math/BigDecimal;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/number/FormattedNumberRange.html#toCharacterIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Text.AttributedCharacterIterator"/></returns>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Number/NumberFormatterSettings.cs b/src/net/Netdroid/Generated/Android/Icu/Number/NumberFormatterSettings.cs
new file mode 100644
index 000000000..cdbb6d234
--- /dev/null
+++ b/src/net/Netdroid/Generated/Android/Icu/Number/NumberFormatterSettings.cs
@@ -0,0 +1,345 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android.Icu.Number
+{
+    #region NumberFormatterSettings
+    public partial class NumberFormatterSettings
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#decimal(android.icu.number.NumberFormatter.DecimalSeparatorDisplay)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberFormatter.DecimalSeparatorDisplay"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Decimal(Android.Icu.Number.NumberFormatter.DecimalSeparatorDisplay arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("decimal", "(Landroid/icu/number/NumberFormatter$DecimalSeparatorDisplay;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#grouping(android.icu.number.NumberFormatter.GroupingStrategy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberFormatter.GroupingStrategy"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Grouping(Android.Icu.Number.NumberFormatter.GroupingStrategy arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("grouping", "(Landroid/icu/number/NumberFormatter$GroupingStrategy;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#integerWidth(android.icu.number.IntegerWidth)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.IntegerWidth"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings IntegerWidth(Android.Icu.Number.IntegerWidth arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("integerWidth", "(Landroid/icu/number/IntegerWidth;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#notation(android.icu.number.Notation)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.Notation"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Notation(Android.Icu.Number.Notation arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("notation", "(Landroid/icu/number/Notation;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#perUnit(android.icu.util.MeasureUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.MeasureUnit"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings PerUnit(Android.Icu.Util.MeasureUnit arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("perUnit", "(Landroid/icu/util/MeasureUnit;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#precision(android.icu.number.Precision)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.Precision"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Precision(Android.Icu.Number.Precision arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("precision", "(Landroid/icu/number/Precision;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#roundingMode(java.math.RoundingMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Math.RoundingMode"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings RoundingMode(Java.Math.RoundingMode arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("roundingMode", "(Ljava/math/RoundingMode;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#scale(android.icu.number.Scale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.Scale"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Scale(Android.Icu.Number.Scale arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("scale", "(Landroid/icu/number/Scale;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#sign(android.icu.number.NumberFormatter.SignDisplay)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberFormatter.SignDisplay"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Sign(Android.Icu.Number.NumberFormatter.SignDisplay arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("sign", "(Landroid/icu/number/NumberFormatter$SignDisplay;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#symbols(android.icu.text.DecimalFormatSymbols)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.DecimalFormatSymbols"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Symbols(Android.Icu.Text.DecimalFormatSymbols arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("symbols", "(Landroid/icu/text/DecimalFormatSymbols;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#symbols(android.icu.text.NumberingSystem)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.NumberingSystem"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Symbols(Android.Icu.Text.NumberingSystem arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("symbols", "(Landroid/icu/text/NumberingSystem;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#unit(android.icu.util.MeasureUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.MeasureUnit"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Unit(Android.Icu.Util.MeasureUnit arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("unit", "(Landroid/icu/util/MeasureUnit;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#unitWidth(android.icu.number.NumberFormatter.UnitWidth)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberFormatter.UnitWidth"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings UnitWidth(Android.Icu.Number.NumberFormatter.UnitWidth arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("unitWidth", "(Landroid/icu/number/NumberFormatter$UnitWidth;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#usage(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberFormatterSettings Usage(Java.Lang.String arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberFormatterSettings>("usage", "(Ljava/lang/String;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region NumberFormatterSettings<T>
+    public partial class NumberFormatterSettings<T>
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Android.Icu.Number.NumberFormatterSettings{T}"/> to <see cref="Android.Icu.Number.NumberFormatterSettings"/>
+        /// </summary>
+        public static implicit operator Android.Icu.Number.NumberFormatterSettings(Android.Icu.Number.NumberFormatterSettings<T> t) => t.Cast<Android.Icu.Number.NumberFormatterSettings>();
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#decimal(android.icu.number.NumberFormatter.DecimalSeparatorDisplay)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberFormatter.DecimalSeparatorDisplay"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Decimal(Android.Icu.Number.NumberFormatter.DecimalSeparatorDisplay arg0)
+        {
+            return IExecuteWithSignature<T>("decimal", "(Landroid/icu/number/NumberFormatter$DecimalSeparatorDisplay;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#grouping(android.icu.number.NumberFormatter.GroupingStrategy)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberFormatter.GroupingStrategy"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Grouping(Android.Icu.Number.NumberFormatter.GroupingStrategy arg0)
+        {
+            return IExecuteWithSignature<T>("grouping", "(Landroid/icu/number/NumberFormatter$GroupingStrategy;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#integerWidth(android.icu.number.IntegerWidth)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.IntegerWidth"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T IntegerWidth(Android.Icu.Number.IntegerWidth arg0)
+        {
+            return IExecuteWithSignature<T>("integerWidth", "(Landroid/icu/number/IntegerWidth;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#notation(android.icu.number.Notation)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.Notation"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Notation(Android.Icu.Number.Notation arg0)
+        {
+            return IExecuteWithSignature<T>("notation", "(Landroid/icu/number/Notation;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#perUnit(android.icu.util.MeasureUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.MeasureUnit"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T PerUnit(Android.Icu.Util.MeasureUnit arg0)
+        {
+            return IExecuteWithSignature<T>("perUnit", "(Landroid/icu/util/MeasureUnit;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#precision(android.icu.number.Precision)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.Precision"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Precision(Android.Icu.Number.Precision arg0)
+        {
+            return IExecuteWithSignature<T>("precision", "(Landroid/icu/number/Precision;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#roundingMode(java.math.RoundingMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Math.RoundingMode"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T RoundingMode(Java.Math.RoundingMode arg0)
+        {
+            return IExecuteWithSignature<T>("roundingMode", "(Ljava/math/RoundingMode;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#scale(android.icu.number.Scale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.Scale"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Scale(Android.Icu.Number.Scale arg0)
+        {
+            return IExecuteWithSignature<T>("scale", "(Landroid/icu/number/Scale;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#sign(android.icu.number.NumberFormatter.SignDisplay)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberFormatter.SignDisplay"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Sign(Android.Icu.Number.NumberFormatter.SignDisplay arg0)
+        {
+            return IExecuteWithSignature<T>("sign", "(Landroid/icu/number/NumberFormatter$SignDisplay;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#symbols(android.icu.text.DecimalFormatSymbols)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.DecimalFormatSymbols"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Symbols(Android.Icu.Text.DecimalFormatSymbols arg0)
+        {
+            return IExecuteWithSignature<T>("symbols", "(Landroid/icu/text/DecimalFormatSymbols;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#symbols(android.icu.text.NumberingSystem)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.NumberingSystem"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Symbols(Android.Icu.Text.NumberingSystem arg0)
+        {
+            return IExecuteWithSignature<T>("symbols", "(Landroid/icu/text/NumberingSystem;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#unit(android.icu.util.MeasureUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.MeasureUnit"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Unit(Android.Icu.Util.MeasureUnit arg0)
+        {
+            return IExecuteWithSignature<T>("unit", "(Landroid/icu/util/MeasureUnit;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#unitWidth(android.icu.number.NumberFormatter.UnitWidth)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberFormatter.UnitWidth"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T UnitWidth(Android.Icu.Number.NumberFormatter.UnitWidth arg0)
+        {
+            return IExecuteWithSignature<T>("unitWidth", "(Landroid/icu/number/NumberFormatter$UnitWidth;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberFormatterSettings.html#usage(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Usage(Java.Lang.String arg0)
+        {
+            return IExecuteWithSignature<T>("usage", "(Ljava/lang/String;)Landroid/icu/number/NumberFormatterSettings;", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Android/Icu/Number/NumberRangeFormatterSettings.cs b/src/net/Netdroid/Generated/Android/Icu/Number/NumberRangeFormatterSettings.cs
new file mode 100644
index 000000000..320659bb0
--- /dev/null
+++ b/src/net/Netdroid/Generated/Android/Icu/Number/NumberRangeFormatterSettings.cs
@@ -0,0 +1,183 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android.Icu.Number
+{
+    #region NumberRangeFormatterSettings
+    public partial class NumberRangeFormatterSettings
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#collapse(android.icu.number.NumberRangeFormatter.RangeCollapse)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberRangeFormatter.RangeCollapse"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberRangeFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberRangeFormatterSettings Collapse(Android.Icu.Number.NumberRangeFormatter.RangeCollapse arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberRangeFormatterSettings>("collapse", "(Landroid/icu/number/NumberRangeFormatter$RangeCollapse;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#identityFallback(android.icu.number.NumberRangeFormatter.RangeIdentityFallback)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberRangeFormatter.RangeIdentityFallback"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberRangeFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberRangeFormatterSettings IdentityFallback(Android.Icu.Number.NumberRangeFormatter.RangeIdentityFallback arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberRangeFormatterSettings>("identityFallback", "(Landroid/icu/number/NumberRangeFormatter$RangeIdentityFallback;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#numberFormatterBoth(android.icu.number.UnlocalizedNumberFormatter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.UnlocalizedNumberFormatter"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberRangeFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberRangeFormatterSettings NumberFormatterBoth(Android.Icu.Number.UnlocalizedNumberFormatter arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberRangeFormatterSettings>("numberFormatterBoth", "(Landroid/icu/number/UnlocalizedNumberFormatter;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#numberFormatterFirst(android.icu.number.UnlocalizedNumberFormatter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.UnlocalizedNumberFormatter"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberRangeFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberRangeFormatterSettings NumberFormatterFirst(Android.Icu.Number.UnlocalizedNumberFormatter arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberRangeFormatterSettings>("numberFormatterFirst", "(Landroid/icu/number/UnlocalizedNumberFormatter;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#numberFormatterSecond(android.icu.number.UnlocalizedNumberFormatter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.UnlocalizedNumberFormatter"/></param>
+        /// <returns><see cref="Android.Icu.Number.NumberRangeFormatterSettings"/></returns>
+        public Android.Icu.Number.NumberRangeFormatterSettings NumberFormatterSecond(Android.Icu.Number.UnlocalizedNumberFormatter arg0)
+        {
+            return IExecuteWithSignature<Android.Icu.Number.NumberRangeFormatterSettings>("numberFormatterSecond", "(Landroid/icu/number/UnlocalizedNumberFormatter;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region NumberRangeFormatterSettings<T>
+    public partial class NumberRangeFormatterSettings<T>
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Android.Icu.Number.NumberRangeFormatterSettings{T}"/> to <see cref="Android.Icu.Number.NumberRangeFormatterSettings"/>
+        /// </summary>
+        public static implicit operator Android.Icu.Number.NumberRangeFormatterSettings(Android.Icu.Number.NumberRangeFormatterSettings<T> t) => t.Cast<Android.Icu.Number.NumberRangeFormatterSettings>();
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#collapse(android.icu.number.NumberRangeFormatter.RangeCollapse)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberRangeFormatter.RangeCollapse"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Collapse(Android.Icu.Number.NumberRangeFormatter.RangeCollapse arg0)
+        {
+            return IExecuteWithSignature<T>("collapse", "(Landroid/icu/number/NumberRangeFormatter$RangeCollapse;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#identityFallback(android.icu.number.NumberRangeFormatter.RangeIdentityFallback)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.NumberRangeFormatter.RangeIdentityFallback"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T IdentityFallback(Android.Icu.Number.NumberRangeFormatter.RangeIdentityFallback arg0)
+        {
+            return IExecuteWithSignature<T>("identityFallback", "(Landroid/icu/number/NumberRangeFormatter$RangeIdentityFallback;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#numberFormatterBoth(android.icu.number.UnlocalizedNumberFormatter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.UnlocalizedNumberFormatter"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T NumberFormatterBoth(Android.Icu.Number.UnlocalizedNumberFormatter arg0)
+        {
+            return IExecuteWithSignature<T>("numberFormatterBoth", "(Landroid/icu/number/UnlocalizedNumberFormatter;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#numberFormatterFirst(android.icu.number.UnlocalizedNumberFormatter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.UnlocalizedNumberFormatter"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T NumberFormatterFirst(Android.Icu.Number.UnlocalizedNumberFormatter arg0)
+        {
+            return IExecuteWithSignature<T>("numberFormatterFirst", "(Landroid/icu/number/UnlocalizedNumberFormatter;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/number/NumberRangeFormatterSettings.html#numberFormatterSecond(android.icu.number.UnlocalizedNumberFormatter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Number.UnlocalizedNumberFormatter"/></param>
+        /// <returns><typeparamref name="T"/></returns>
+        public T NumberFormatterSecond(Android.Icu.Number.UnlocalizedNumberFormatter arg0)
+        {
+            return IExecuteWithSignature<T>("numberFormatterSecond", "(Landroid/icu/number/UnlocalizedNumberFormatter;)Landroid/icu/number/NumberRangeFormatterSettings;", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Icu/Text/AllPackageClasses.cs
index 20d67c440..2f9bf94ec 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/AllPackageClasses.cs
@@ -612,12 +612,12 @@ public partial class BreakIterator : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BreakIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BreakIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BreakIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BreakIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BreakIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BreakIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -658,12 +658,12 @@ public partial class CaseMap : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CaseMap>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CaseMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CaseMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CaseMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CaseMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CaseMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CaseMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1012,12 +1012,12 @@ public partial class Collator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Collator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Collator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Collator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1054,12 +1054,12 @@ public partial class ReorderCodes : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Reor
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ReorderCodes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ReorderCodes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ReorderCodes() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ReorderCodes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ReorderCodes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ReorderCodes(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1280,12 +1280,12 @@ public partial class DateFormat : Android.Icu.Text.UFormat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DateFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DateFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DateFormat() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DateFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DateFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DateFormat(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2074,12 +2074,12 @@ public partial class FormattedValue : Java.Lang.CharSequence
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FormattedValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FormattedValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FormattedValue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FormattedValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FormattedValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FormattedValue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2120,12 +2120,12 @@ public partial class IDNA : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IDNA>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IDNA class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IDNA class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IDNA() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IDNA class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IDNA class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IDNA(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2430,12 +2430,12 @@ public partial class LocaleDisplayNames : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LocaleDisplayNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LocaleDisplayNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LocaleDisplayNames() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LocaleDisplayNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LocaleDisplayNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LocaleDisplayNames(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3048,12 +3048,12 @@ public partial class Normalizer2 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Norma
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Normalizer2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Normalizer2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Normalizer2() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Normalizer2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Normalizer2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Normalizer2(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3138,12 +3138,12 @@ public partial class NumberFormat : Android.Icu.Text.UFormat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NumberFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NumberFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NumberFormat() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NumberFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NumberFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NumberFormat(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3712,12 +3712,12 @@ public partial class Replaceable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Repla
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Replaceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Replaceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Replaceable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Replaceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Replaceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Replaceable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3846,12 +3846,12 @@ public partial class SearchIterator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Se
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SearchIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SearchIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SearchIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SearchIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SearchIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SearchIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4085,12 +4085,12 @@ public partial class SymbolTable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Symbo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SymbolTable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SymbolTable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SymbolTable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SymbolTable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SymbolTable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SymbolTable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4351,12 +4351,12 @@ public partial class TimeZoneNames : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TimeZoneNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeZoneNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeZoneNames() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TimeZoneNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeZoneNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeZoneNames(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4441,12 +4441,12 @@ public partial class Transliterator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Tr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Transliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Transliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Transliterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Transliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Transliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Transliterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4531,12 +4531,12 @@ public partial class UCharacterIterator : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UCharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UCharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UCharacterIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UCharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UCharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UCharacterIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4577,12 +4577,12 @@ public partial class UFormat : Java.Text.Format
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UFormat() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UFormat(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4623,12 +4623,12 @@ public partial class UnicodeFilter : Android.Icu.Text.UnicodeMatcher
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UnicodeFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UnicodeFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UnicodeFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UnicodeFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UnicodeFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UnicodeFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4669,12 +4669,12 @@ public partial class UnicodeMatcher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Un
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UnicodeMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UnicodeMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UnicodeMatcher() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UnicodeMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UnicodeMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UnicodeMatcher(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4881,6 +4881,50 @@ public SpanCondition(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region UnicodeSetIterator
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html"/>
+    /// </summary>
+    public partial class UnicodeSetIterator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UnicodeSetIterator>
+    {
+        const string _bridgeClassName = "android.icu.text.UnicodeSetIterator";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        public UnicodeSetIterator() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public UnicodeSetIterator(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
     #region UnicodeSetSpanner
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetSpanner.html"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/AlphabeticIndex.cs b/src/net/Netdroid/Generated/Android/Icu/Text/AlphabeticIndex.cs
index 731281a12..dea085b90 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/AlphabeticIndex.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/AlphabeticIndex.cs
@@ -70,62 +70,6 @@ public AlphabeticIndex(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketCount()"/> 
-        /// </summary>
-        public int BucketCount
-        {
-            get { return IExecuteWithSignature<int>("getBucketCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketLabels()"/> 
-        /// </summary>
-        public Java.Util.List BucketLabels
-        {
-            get { return IExecuteWithSignature<Java.Util.List>("getBucketLabels", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getCollator()"/> 
-        /// </summary>
-        public Android.Icu.Text.RuleBasedCollator Collator
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.RuleBasedCollator>("getCollator", "()Landroid/icu/text/RuleBasedCollator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getInflowLabel()"/> 
-        /// </summary>
-        public Java.Lang.String InflowLabel
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInflowLabel", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getMaxLabelCount()"/> 
-        /// </summary>
-        public int MaxLabelCount
-        {
-            get { return IExecuteWithSignature<int>("getMaxLabelCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getOverflowLabel()"/> 
-        /// </summary>
-        public Java.Lang.String OverflowLabel
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOverflowLabel", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getRecordCount()"/> 
-        /// </summary>
-        public int RecordCount
-        {
-            get { return IExecuteWithSignature<int>("getRecordCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getUnderflowLabel()"/> 
-        /// </summary>
-        public Java.Lang.String UnderflowLabel
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUnderflowLabel", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#addLabels(android.icu.text.UnicodeSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.UnicodeSet"/></param>
@@ -215,6 +159,22 @@ public Android.Icu.Text.AlphabeticIndex.ImmutableIndex BuildImmutableIndex()
             return IExecuteWithSignature<Android.Icu.Text.AlphabeticIndex.ImmutableIndex>("buildImmutableIndex", "()Landroid/icu/text/AlphabeticIndex$ImmutableIndex;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getCollator()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.RuleBasedCollator"/></returns>
+        public Android.Icu.Text.RuleBasedCollator GetCollator()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.RuleBasedCollator>("getCollator", "()Landroid/icu/text/RuleBasedCollator;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBucketCount()
+        {
+            return IExecuteWithSignature<int>("getBucketCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketIndex(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -224,6 +184,46 @@ public int GetBucketIndex(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<int>("getBucketIndex", "(Ljava/lang/CharSequence;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getMaxLabelCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxLabelCount()
+        {
+            return IExecuteWithSignature<int>("getMaxLabelCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getRecordCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRecordCount()
+        {
+            return IExecuteWithSignature<int>("getRecordCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getInflowLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInflowLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInflowLabel", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getOverflowLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOverflowLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getOverflowLabel", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getUnderflowLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUnderflowLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUnderflowLabel", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
@@ -231,6 +231,14 @@ public Java.Util.Iterator Iterator()
         {
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketLabels()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List GetBucketLabels()
+        {
+            return IExecuteWithSignature<Java.Util.List>("getBucketLabels", "()Ljava/util/List;");
+        }
 
         #endregion
 
@@ -256,18 +264,12 @@ public partial class Bucket
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#getLabel()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#getLabelType()"/>
             /// </summary>
-            public Java.Lang.String Label
+            /// <returns><see cref="Android.Icu.Text.AlphabeticIndex.Bucket.LabelType"/></returns>
+            public Android.Icu.Text.AlphabeticIndex.Bucket.LabelType GetLabelType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#getLabelType()"/> 
-            /// </summary>
-            public Android.Icu.Text.AlphabeticIndex.Bucket.LabelType LabelType
-            {
-                get { return IExecuteWithSignature<Android.Icu.Text.AlphabeticIndex.Bucket.LabelType>("getLabelType", "()Landroid/icu/text/AlphabeticIndex$Bucket$LabelType;"); }
+                return IExecuteWithSignature<Android.Icu.Text.AlphabeticIndex.Bucket.LabelType>("getLabelType", "()Landroid/icu/text/AlphabeticIndex$Bucket$LabelType;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#size()"/>
@@ -278,6 +280,14 @@ public int Size()
                 return IExecuteWithSignature<int>("size", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#getLabel()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetLabel()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#iterator()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Iterator"/></returns>
@@ -393,18 +403,12 @@ public partial class Bucket<V>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#getLabel()"/> 
-            /// </summary>
-            public Java.Lang.String Label
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#getLabelType()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#getLabelType()"/>
             /// </summary>
-            public Android.Icu.Text.AlphabeticIndex.Bucket.LabelType LabelType
+            /// <returns><see cref="Android.Icu.Text.AlphabeticIndex.Bucket.LabelType"/></returns>
+            public Android.Icu.Text.AlphabeticIndex.Bucket.LabelType GetLabelType()
             {
-                get { return IExecuteWithSignature<Android.Icu.Text.AlphabeticIndex.Bucket.LabelType>("getLabelType", "()Landroid/icu/text/AlphabeticIndex$Bucket$LabelType;"); }
+                return IExecuteWithSignature<Android.Icu.Text.AlphabeticIndex.Bucket.LabelType>("getLabelType", "()Landroid/icu/text/AlphabeticIndex$Bucket$LabelType;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#size()"/>
@@ -415,6 +419,14 @@ public int Size()
                 return IExecuteWithSignature<int>("size", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#getLabel()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetLabel()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Bucket.html#iterator()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Iterator"/></returns>
@@ -526,13 +538,6 @@ public partial class ImmutableIndex
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.ImmutableIndex.html#getBucketCount()"/> 
-            /// </summary>
-            public int BucketCount
-            {
-                get { return IExecuteWithSignature<int>("getBucketCount", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.ImmutableIndex.html#getBucket(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -542,6 +547,14 @@ public Android.Icu.Text.AlphabeticIndex.Bucket GetBucket(int arg0)
                 return IExecuteWithSignature<Android.Icu.Text.AlphabeticIndex.Bucket>("getBucket", "(I)Landroid/icu/text/AlphabeticIndex$Bucket;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.ImmutableIndex.html#getBucketCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetBucketCount()
+            {
+                return IExecuteWithSignature<int>("getBucketCount", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.ImmutableIndex.html#getBucketIndex(java.lang.CharSequence)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -594,13 +607,6 @@ public partial class ImmutableIndex<V>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.ImmutableIndex.html#getBucketCount()"/> 
-            /// </summary>
-            public int BucketCount
-            {
-                get { return IExecuteWithSignature<int>("getBucketCount", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.ImmutableIndex.html#getBucket(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -610,6 +616,14 @@ public Android.Icu.Text.AlphabeticIndex.Bucket<V> GetBucket(int arg0)
                 return IExecuteWithSignature<Android.Icu.Text.AlphabeticIndex.Bucket<V>>("getBucket", "(I)Landroid/icu/text/AlphabeticIndex$Bucket;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.ImmutableIndex.html#getBucketCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetBucketCount()
+            {
+                return IExecuteWithSignature<int>("getBucketCount", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.ImmutableIndex.html#getBucketIndex(java.lang.CharSequence)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -658,18 +672,20 @@ public partial class Record
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Record.html#getData()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Record.html#getName()"/>
             /// </summary>
-            public object Data
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetName()
             {
-                get { return IExecuteWithSignature("getData", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Record.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Record.html#getData()"/>
             /// </summary>
-            public Java.Lang.CharSequence Name
+            /// <returns><see cref="object"/></returns>
+            public object GetData()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature("getData", "()Ljava/lang/Object;");
             }
 
             #endregion
@@ -707,18 +723,20 @@ public partial class Record<V>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Record.html#getData()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Record.html#getName()"/>
             /// </summary>
-            public V Data
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetName()
             {
-                get { return IExecuteWithSignature<V>("getData", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Record.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.Record.html#getData()"/>
             /// </summary>
-            public Java.Lang.CharSequence Name
+            /// <returns><typeparamref name="V"/></returns>
+            public V GetData()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<V>("getData", "()Ljava/lang/Object;");
             }
 
             #endregion
@@ -787,62 +805,6 @@ public AlphabeticIndex(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketCount()"/> 
-        /// </summary>
-        public int BucketCount
-        {
-            get { return IExecuteWithSignature<int>("getBucketCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketLabels()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> BucketLabels
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getBucketLabels", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getCollator()"/> 
-        /// </summary>
-        public Android.Icu.Text.RuleBasedCollator Collator
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.RuleBasedCollator>("getCollator", "()Landroid/icu/text/RuleBasedCollator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getInflowLabel()"/> 
-        /// </summary>
-        public Java.Lang.String InflowLabel
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInflowLabel", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getMaxLabelCount()"/> 
-        /// </summary>
-        public int MaxLabelCount
-        {
-            get { return IExecuteWithSignature<int>("getMaxLabelCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getOverflowLabel()"/> 
-        /// </summary>
-        public Java.Lang.String OverflowLabel
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOverflowLabel", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getRecordCount()"/> 
-        /// </summary>
-        public int RecordCount
-        {
-            get { return IExecuteWithSignature<int>("getRecordCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getUnderflowLabel()"/> 
-        /// </summary>
-        public Java.Lang.String UnderflowLabel
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUnderflowLabel", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#addLabels(android.icu.text.UnicodeSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.UnicodeSet"/></param>
@@ -932,6 +894,22 @@ public Android.Icu.Text.AlphabeticIndex.ImmutableIndex<V> BuildImmutableIndex()
             return IExecuteWithSignature<Android.Icu.Text.AlphabeticIndex.ImmutableIndex<V>>("buildImmutableIndex", "()Landroid/icu/text/AlphabeticIndex$ImmutableIndex;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getCollator()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.RuleBasedCollator"/></returns>
+        public Android.Icu.Text.RuleBasedCollator GetCollator()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.RuleBasedCollator>("getCollator", "()Landroid/icu/text/RuleBasedCollator;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBucketCount()
+        {
+            return IExecuteWithSignature<int>("getBucketCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketIndex(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -941,6 +919,46 @@ public int GetBucketIndex(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<int>("getBucketIndex", "(Ljava/lang/CharSequence;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getMaxLabelCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxLabelCount()
+        {
+            return IExecuteWithSignature<int>("getMaxLabelCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getRecordCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRecordCount()
+        {
+            return IExecuteWithSignature<int>("getRecordCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getInflowLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInflowLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInflowLabel", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getOverflowLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOverflowLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getOverflowLabel", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getUnderflowLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUnderflowLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUnderflowLabel", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
@@ -948,6 +966,14 @@ public int GetBucketIndex(Java.Lang.CharSequence arg0)
         {
             return IExecuteWithSignature<Java.Util.Iterator<Android.Icu.Text.AlphabeticIndex.Bucket<V>>>("iterator", "()Ljava/util/Iterator;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/AlphabeticIndex.html#getBucketLabels()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetBucketLabels()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getBucketLabels", "()Ljava/util/List;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/Bidi.cs b/src/net/Netdroid/Generated/Android/Icu/Text/Bidi.cs
index 31c106f86..a40d419da 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/Bidi.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/Bidi.cs
@@ -328,111 +328,6 @@ public static void ReorderVisually(byte[] arg0, int arg1, object[] arg2, int arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getBaseLevel()"/> 
-        /// </summary>
-        public int BaseLevel
-        {
-            get { return IExecuteWithSignature<int>("getBaseLevel", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getCustomClassifier()"/> <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#setCustomClassifier(android.icu.text.BidiClassifier)"/>
-        /// </summary>
-        public Android.Icu.Text.BidiClassifier CustomClassifier
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.BidiClassifier>("getCustomClassifier", "()Landroid/icu/text/BidiClassifier;"); } set { IExecuteWithSignature("setCustomClassifier", "(Landroid/icu/text/BidiClassifier;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getDirection()"/> 
-        /// </summary>
-        public byte Direction
-        {
-            get { return IExecuteWithSignature<byte>("getDirection", "()B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLength()"/> 
-        /// </summary>
-        public int Length
-        {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLevels()"/> 
-        /// </summary>
-        public byte[] Levels
-        {
-            get { return IExecuteWithSignatureArray<byte>("getLevels", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLogicalMap()"/> 
-        /// </summary>
-        public int[] LogicalMap
-        {
-            get { return IExecuteWithSignatureArray<int>("getLogicalMap", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getParaLevel()"/> 
-        /// </summary>
-        public byte ParaLevel
-        {
-            get { return IExecuteWithSignature<byte>("getParaLevel", "()B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getProcessedLength()"/> 
-        /// </summary>
-        public int ProcessedLength
-        {
-            get { return IExecuteWithSignature<int>("getProcessedLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getReorderingMode()"/> <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#setReorderingMode(int)"/>
-        /// </summary>
-        public int ReorderingMode
-        {
-            get { return IExecuteWithSignature<int>("getReorderingMode", "()I"); } set { IExecuteWithSignature("setReorderingMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getReorderingOptions()"/> <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#setReorderingOptions(int)"/>
-        /// </summary>
-        public int ReorderingOptions
-        {
-            get { return IExecuteWithSignature<int>("getReorderingOptions", "()I"); } set { IExecuteWithSignature("setReorderingOptions", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getResultLength()"/> 
-        /// </summary>
-        public int ResultLength
-        {
-            get { return IExecuteWithSignature<int>("getResultLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getRunCount()"/> 
-        /// </summary>
-        public int RunCount
-        {
-            get { return IExecuteWithSignature<int>("getRunCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getText()"/> 
-        /// </summary>
-        public char[] Text
-        {
-            get { return IExecuteWithSignatureArray<char>("getText", "()[C"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getTextAsString()"/> 
-        /// </summary>
-        public Java.Lang.String TextAsString
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTextAsString", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getVisualMap()"/> 
-        /// </summary>
-        public int[] VisualMap
-        {
-            get { return IExecuteWithSignatureArray<int>("getVisualMap", "()[I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#createLineBidi(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -453,6 +348,14 @@ public Android.Icu.Text.Bidi SetLine(int arg0, int arg1)
             return IExecute<Android.Icu.Text.Bidi>("setLine", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getCustomClassifier()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.BidiClassifier"/></returns>
+        public Android.Icu.Text.BidiClassifier GetCustomClassifier()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.BidiClassifier>("getCustomClassifier", "()Landroid/icu/text/BidiClassifier;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLogicalRun(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -537,6 +440,14 @@ public bool IsRightToLeft()
             return IExecuteWithSignature<bool>("isRightToLeft", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getDirection()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte GetDirection()
+        {
+            return IExecuteWithSignature<byte>("getDirection", "()B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLevelAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -546,6 +457,30 @@ public byte GetLevelAt(int arg0)
             return IExecuteWithSignature<byte>("getLevelAt", "(I)B", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getParaLevel()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte GetParaLevel()
+        {
+            return IExecuteWithSignature<byte>("getParaLevel", "()B");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLevels()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetLevels()
+        {
+            return IExecuteWithSignatureArray<byte>("getLevels", "()[B");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char[] GetText()
+        {
+            return IExecuteWithSignatureArray<char>("getText", "()[C");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#countParagraphs()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -562,6 +497,14 @@ public int CountRuns()
             return IExecuteWithSignature<int>("countRuns", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getBaseLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBaseLevel()
+        {
+            return IExecuteWithSignature<int>("getBaseLevel", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getCustomizedClass(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -571,6 +514,14 @@ public int GetCustomizedClass(int arg0)
             return IExecuteWithSignature<int>("getCustomizedClass", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
+        {
+            return IExecuteWithSignature<int>("getLength", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLogicalIndex(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -589,6 +540,46 @@ public int GetParagraphIndex(int arg0)
             return IExecuteWithSignature<int>("getParagraphIndex", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getProcessedLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetProcessedLength()
+        {
+            return IExecuteWithSignature<int>("getProcessedLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getReorderingMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetReorderingMode()
+        {
+            return IExecuteWithSignature<int>("getReorderingMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getReorderingOptions()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetReorderingOptions()
+        {
+            return IExecuteWithSignature<int>("getReorderingOptions", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getResultLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetResultLength()
+        {
+            return IExecuteWithSignature<int>("getResultLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getRunCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRunCount()
+        {
+            return IExecuteWithSignature<int>("getRunCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getRunLevel(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -625,6 +616,30 @@ public int GetVisualIndex(int arg0)
             return IExecuteWithSignature<int>("getVisualIndex", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getLogicalMap()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetLogicalMap()
+        {
+            return IExecuteWithSignatureArray<int>("getLogicalMap", "()[I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getVisualMap()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetVisualMap()
+        {
+            return IExecuteWithSignatureArray<int>("getVisualMap", "()[I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#getTextAsString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTextAsString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTextAsString", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#writeReordered(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -651,6 +666,14 @@ public void SetContext(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setContext", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#setCustomClassifier(android.icu.text.BidiClassifier)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.BidiClassifier"/></param>
+        public void SetCustomClassifier(Android.Icu.Text.BidiClassifier arg0)
+        {
+            IExecuteWithSignature("setCustomClassifier", "(Landroid/icu/text/BidiClassifier;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#setInverse(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -686,6 +709,22 @@ public void SetPara(Java.Text.AttributedCharacterIterator arg0)
         {
             IExecuteWithSignature("setPara", "(Ljava/text/AttributedCharacterIterator;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#setReorderingMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetReorderingMode(int arg0)
+        {
+            IExecuteWithSignature("setReorderingMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Bidi.html#setReorderingOptions(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetReorderingOptions(int arg0)
+        {
+            IExecuteWithSignature("setReorderingOptions", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/BidiClassifier.cs b/src/net/Netdroid/Generated/Android/Icu/Text/BidiClassifier.cs
index 50a6c9e7d..9fa90ce76 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/BidiClassifier.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/BidiClassifier.cs
@@ -54,13 +54,6 @@ public BidiClassifier(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BidiClassifier.html#getContext()"/> <see href="https://developer.android.com/reference/android/icu/text/BidiClassifier.html#setContext(java.lang.Object)"/>
-        /// </summary>
-        public object Context
-        {
-            get { return IExecuteWithSignature("getContext", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setContext", "(Ljava/lang/Object;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BidiClassifier.html#classify(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -69,6 +62,22 @@ public int Classify(int arg0)
         {
             return IExecute<int>("classify", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiClassifier.html#getContext()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetContext()
+        {
+            return IExecuteWithSignature("getContext", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiClassifier.html#setContext(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetContext(object arg0)
+        {
+            IExecuteWithSignature("setContext", "(Ljava/lang/Object;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/BidiRun.cs b/src/net/Netdroid/Generated/Android/Icu/Text/BidiRun.cs
index 15916c0b4..21346c3e7 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/BidiRun.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/BidiRun.cs
@@ -46,55 +46,60 @@ public partial class BidiRun
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getDirection()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#isEvenRun()"/>
         /// </summary>
-        public byte Direction
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEvenRun()
         {
-            get { return IExecuteWithSignature<byte>("getDirection", "()B"); }
+            return IExecuteWithSignature<bool>("isEvenRun", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getEmbeddingLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#isOddRun()"/>
         /// </summary>
-        public byte EmbeddingLevel
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOddRun()
         {
-            get { return IExecuteWithSignature<byte>("getEmbeddingLevel", "()B"); }
+            return IExecuteWithSignature<bool>("isOddRun", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getDirection()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="byte"/></returns>
+        public byte GetDirection()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<byte>("getDirection", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getLimit()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getEmbeddingLevel()"/>
         /// </summary>
-        public int Limit
+        /// <returns><see cref="byte"/></returns>
+        public byte GetEmbeddingLevel()
         {
-            get { return IExecuteWithSignature<int>("getLimit", "()I"); }
+            return IExecuteWithSignature<byte>("getEmbeddingLevel", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getLength()"/>
         /// </summary>
-        public int Start
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignature<int>("getStart", "()I"); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#isEvenRun()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getLimit()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEvenRun()
+        /// <returns><see cref="int"/></returns>
+        public int GetLimit()
         {
-            return IExecuteWithSignature<bool>("isEvenRun", "()Z");
+            return IExecuteWithSignature<int>("getLimit", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#isOddRun()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BidiRun.html#getStart()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOddRun()
+        /// <returns><see cref="int"/></returns>
+        public int GetStart()
         {
-            return IExecuteWithSignature<bool>("isOddRun", "()Z");
+            return IExecuteWithSignature<int>("getStart", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/BreakIterator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/BreakIterator.cs
index c803c77b2..9e9afa688 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/BreakIterator.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/BreakIterator.cs
@@ -64,7 +64,7 @@ public partial class BreakIterator
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#KIND_TITLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KIND_TITLE { get { if (!_KIND_TITLEReady) { _KIND_TITLEContent = SGetField<int>(LocalBridgeClazz, "KIND_TITLE"); _KIND_TITLEReady = true; } return _KIND_TITLEContent; } }
         private static int _KIND_TITLEContent = default;
         private static bool _KIND_TITLEReady = false; // this is used because in case of generics 
@@ -139,47 +139,12 @@ public partial class BreakIterator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getCharacterInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getCharacterInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.BreakIterator CharacterInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getCharacterInstance", "()Landroid/icu/text/BreakIterator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getLineInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.BreakIterator LineInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getLineInstance", "()Landroid/icu/text/BreakIterator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getSentenceInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.BreakIterator SentenceInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getSentenceInstance", "()Landroid/icu/text/BreakIterator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getTitleInstance()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static Android.Icu.Text.BreakIterator TitleInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getTitleInstance", "()Landroid/icu/text/BreakIterator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getWordInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.BreakIterator WordInstance
+        /// <returns><see cref="Android.Icu.Text.BreakIterator"/></returns>
+        public static Android.Icu.Text.BreakIterator GetCharacterInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getWordInstance", "()Landroid/icu/text/BreakIterator;"); }
+            return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getCharacterInstance", "()Landroid/icu/text/BreakIterator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getCharacterInstance(android.icu.util.ULocale)"/>
@@ -200,6 +165,14 @@ public static Android.Icu.Text.BreakIterator GetCharacterInstance(Java.Util.Loca
             return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getCharacterInstance", "(Ljava/util/Locale;)Landroid/icu/text/BreakIterator;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getLineInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.BreakIterator"/></returns>
+        public static Android.Icu.Text.BreakIterator GetLineInstance()
+        {
+            return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getLineInstance", "()Landroid/icu/text/BreakIterator;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getLineInstance(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -218,6 +191,14 @@ public static Android.Icu.Text.BreakIterator GetLineInstance(Java.Util.Locale ar
             return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getLineInstance", "(Ljava/util/Locale;)Landroid/icu/text/BreakIterator;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getSentenceInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.BreakIterator"/></returns>
+        public static Android.Icu.Text.BreakIterator GetSentenceInstance()
+        {
+            return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getSentenceInstance", "()Landroid/icu/text/BreakIterator;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getSentenceInstance(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -236,11 +217,20 @@ public static Android.Icu.Text.BreakIterator GetSentenceInstance(Java.Util.Local
             return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getSentenceInstance", "(Ljava/util/Locale;)Landroid/icu/text/BreakIterator;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getTitleInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.BreakIterator"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Icu.Text.BreakIterator GetTitleInstance()
+        {
+            return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getTitleInstance", "()Landroid/icu/text/BreakIterator;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getTitleInstance(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
         /// <returns><see cref="Android.Icu.Text.BreakIterator"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Icu.Text.BreakIterator GetTitleInstance(Android.Icu.Util.ULocale arg0)
         {
             return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getTitleInstance", "(Landroid/icu/util/ULocale;)Landroid/icu/text/BreakIterator;", arg0);
@@ -250,12 +240,20 @@ public static Android.Icu.Text.BreakIterator GetTitleInstance(Android.Icu.Util.U
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Android.Icu.Text.BreakIterator"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Icu.Text.BreakIterator GetTitleInstance(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getTitleInstance", "(Ljava/util/Locale;)Landroid/icu/text/BreakIterator;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getWordInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.BreakIterator"/></returns>
+        public static Android.Icu.Text.BreakIterator GetWordInstance()
+        {
+            return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getWordInstance", "()Landroid/icu/text/BreakIterator;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getWordInstance(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -273,24 +271,18 @@ public static Android.Icu.Text.BreakIterator GetWordInstance(Java.Util.Locale ar
         {
             return SExecuteWithSignature<Android.Icu.Text.BreakIterator>(LocalBridgeClazz, "getWordInstance", "(Ljava/util/Locale;)Landroid/icu/text/BreakIterator;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getRuleStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getAvailableLocales()"/>
         /// </summary>
-        public int RuleStatus
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignature<int>("getRuleStatus", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getText()"/> 
-        /// </summary>
-        public Java.Text.CharacterIterator Text
-        {
-            get { return IExecuteWithSignature<Java.Text.CharacterIterator>("getText", "()Ljava/text/CharacterIterator;"); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#current()"/>
         /// </summary>
@@ -350,6 +342,14 @@ public int Previous()
             return IExecuteWithSignature<int>("previous", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.CharacterIterator"/></returns>
+        public Java.Text.CharacterIterator GetText()
+        {
+            return IExecuteWithSignature<Java.Text.CharacterIterator>("getText", "()Ljava/text/CharacterIterator;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#setText(java.text.CharacterIterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.CharacterIterator"/></param>
@@ -367,6 +367,14 @@ public bool IsBoundary(int arg0)
             return IExecuteWithSignature<bool>("isBoundary", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getRuleStatus()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRuleStatus()
+        {
+            return IExecuteWithSignature<int>("getRuleStatus", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/BreakIterator.html#getRuleStatusVec(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/CaseMap.cs b/src/net/Netdroid/Generated/Android/Icu/Text/CaseMap.cs
index 66d3be681..728e83bb3 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/CaseMap.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/CaseMap.cs
@@ -117,7 +117,7 @@ public partial class Fold
             /// <param name="arg2"><see cref="Android.Icu.Text.Edits"/></param>
             /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
             /// <returns><typeparamref name="A"/></returns>
-            public A Apply<A>(Java.Lang.CharSequence arg0, A arg1, Android.Icu.Text.Edits arg2) where A: Java.Lang.IAppendable, new()
+            public A Apply<A>(Java.Lang.CharSequence arg0, A arg1, Android.Icu.Text.Edits arg2) where A : Java.Lang.IAppendable, new()
             {
                 return IExecute<A>("apply", arg0, arg1, arg2);
             }
@@ -178,7 +178,7 @@ public partial class Lower
             /// <param name="arg3"><see cref="Android.Icu.Text.Edits"/></param>
             /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
             /// <returns><typeparamref name="A"/></returns>
-            public A Apply<A>(Java.Util.Locale arg0, Java.Lang.CharSequence arg1, A arg2, Android.Icu.Text.Edits arg3) where A: Java.Lang.IAppendable, new()
+            public A Apply<A>(Java.Util.Locale arg0, Java.Lang.CharSequence arg1, A arg2, Android.Icu.Text.Edits arg3) where A : Java.Lang.IAppendable, new()
             {
                 return IExecute<A>("apply", arg0, arg1, arg2, arg3);
             }
@@ -233,7 +233,7 @@ public partial class Title
             /// <param name="arg4"><see cref="Android.Icu.Text.Edits"/></param>
             /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
             /// <returns><typeparamref name="A"/></returns>
-            public A Apply<A>(Java.Util.Locale arg0, Android.Icu.Text.BreakIterator arg1, Java.Lang.CharSequence arg2, A arg3, Android.Icu.Text.Edits arg4) where A: Java.Lang.IAppendable, new()
+            public A Apply<A>(Java.Util.Locale arg0, Android.Icu.Text.BreakIterator arg1, Java.Lang.CharSequence arg2, A arg3, Android.Icu.Text.Edits arg4) where A : Java.Lang.IAppendable, new()
             {
                 return IExecute<A>("apply", arg0, arg1, arg2, arg3, arg4);
             }
@@ -328,7 +328,7 @@ public partial class Upper
             /// <param name="arg3"><see cref="Android.Icu.Text.Edits"/></param>
             /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
             /// <returns><typeparamref name="A"/></returns>
-            public A Apply<A>(Java.Util.Locale arg0, Java.Lang.CharSequence arg1, A arg2, Android.Icu.Text.Edits arg3) where A: Java.Lang.IAppendable, new()
+            public A Apply<A>(Java.Util.Locale arg0, Java.Lang.CharSequence arg1, A arg2, Android.Icu.Text.Edits arg3) where A : Java.Lang.IAppendable, new()
             {
                 return IExecute<A>("apply", arg0, arg1, arg2, arg3);
             }
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/CollationElementIterator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/CollationElementIterator.cs
index 07d6e9438..066dec8a8 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/CollationElementIterator.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/CollationElementIterator.cs
@@ -85,13 +85,6 @@ public static int TertiaryOrder(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/CollationElementIterator.html#getOffset()"/> <see href="https://developer.android.com/reference/android/icu/text/CollationElementIterator.html#setOffset(int)"/>
-        /// </summary>
-        public int Offset
-        {
-            get { return IExecuteWithSignature<int>("getOffset", "()I"); } set { IExecuteWithSignature("setOffset", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/CollationElementIterator.html#getMaxExpansion(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -101,6 +94,14 @@ public int GetMaxExpansion(int arg0)
             return IExecuteWithSignature<int>("getMaxExpansion", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/CollationElementIterator.html#getOffset()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetOffset()
+        {
+            return IExecuteWithSignature<int>("getOffset", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/CollationElementIterator.html#next()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -124,6 +125,14 @@ public void Reset()
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/CollationElementIterator.html#setOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOffset(int arg0)
+        {
+            IExecuteWithSignature("setOffset", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/CollationElementIterator.html#setText(android.icu.text.UCharacterIterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.UCharacterIterator"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/CollationKey.cs b/src/net/Netdroid/Generated/Android/Icu/Text/CollationKey.cs
index 0b744830b..dda0d8d79 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/CollationKey.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/CollationKey.cs
@@ -55,13 +55,6 @@ public CollationKey(Java.Lang.String arg0, byte[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/CollationKey.html#getSourceString()"/> 
-        /// </summary>
-        public Java.Lang.String SourceString
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSourceString", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/CollationKey.html#getBound(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -106,6 +99,14 @@ public int CompareTo(object arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/CollationKey.html#getSourceString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSourceString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSourceString", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/Collator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/Collator.cs
index be7f1665b..6bd73fd7f 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/Collator.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/Collator.cs
@@ -98,32 +98,12 @@ public partial class Collator : Android.Icu.Util.IFreezable<Android.Icu.Text.Col
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getAvailableULocales()"/> 
-        /// </summary>
-        public static Android.Icu.Util.ULocale[] AvailableULocales
-        {
-            get { return SExecuteWithSignatureArray<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getAvailableULocales", "()[Landroid/icu/util/ULocale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.Collator Instance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.Collator>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/Collator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getKeywords()"/> 
-        /// </summary>
-        public static Java.Lang.String[] Keywords
+        /// <returns><see cref="Android.Icu.Text.Collator"/></returns>
+        public static Android.Icu.Text.Collator GetInstance()
         {
-            get { return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getKeywords", "()[Ljava/lang/String;"); }
+            return SExecuteWithSignature<Android.Icu.Text.Collator>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/Collator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getInstance(android.icu.util.ULocale)"/>
@@ -165,6 +145,22 @@ public static Android.Icu.Util.ULocale GetFunctionalEquivalent(Java.Lang.String
             return SExecute<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getFunctionalEquivalent", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getAvailableULocales()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public static Android.Icu.Util.ULocale[] GetAvailableULocales()
+        {
+            return SExecuteWithSignatureArray<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getAvailableULocales", "()[Landroid/icu/util/ULocale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getKeywords()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String[] GetKeywords()
+        {
+            return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getKeywords", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getKeywordValues(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -231,74 +227,42 @@ public static Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getDecomposition()"/> <see href="https://developer.android.com/reference/android/icu/text/Collator.html#setDecomposition(int)"/>
-        /// </summary>
-        public int Decomposition
-        {
-            get { return IExecuteWithSignature<int>("getDecomposition", "()I"); } set { IExecuteWithSignature("setDecomposition", "(I)V", value); }
-        }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getReorderCodes()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getAvailableLocales()"/>
         /// </summary>
-        public int[] GetReorderCodes
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignatureArray<int>("getReorderCodes", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getMaxVariable()"/> 
-        /// </summary>
-        public int MaxVariable
-        {
-            get { return IExecuteWithSignature<int>("getMaxVariable", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getStrength()"/> <see href="https://developer.android.com/reference/android/icu/text/Collator.html#setStrength(int)"/>
-        /// </summary>
-        public int Strength
-        {
-            get { return IExecuteWithSignature<int>("getStrength", "()I"); } set { IExecuteWithSignature("setStrength", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getTailoredSet()"/> 
-        /// </summary>
-        public Android.Icu.Text.UnicodeSet TailoredSet
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("getTailoredSet", "()Landroid/icu/text/UnicodeSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getUCAVersion()"/> 
-        /// </summary>
-        public Android.Icu.Util.VersionInfo UCAVersion
-        {
-            get { return IExecuteWithSignature<Android.Icu.Util.VersionInfo>("getUCAVersion", "()Landroid/icu/util/VersionInfo;"); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getVariableTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getCollationKey(java.lang.String)"/>
         /// </summary>
-        public int VariableTop
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Icu.Text.CollationKey"/></returns>
+        public Android.Icu.Text.CollationKey GetCollationKey(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<int>("getVariableTop", "()I"); }
+            return IExecuteWithSignature<Android.Icu.Text.CollationKey>("getCollationKey", "(Ljava/lang/String;)Landroid/icu/text/CollationKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getUCAVersion()"/>
         /// </summary>
-        public Android.Icu.Util.VersionInfo Version
+        /// <returns><see cref="Android.Icu.Util.VersionInfo"/></returns>
+        public Android.Icu.Util.VersionInfo GetUCAVersion()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.VersionInfo>("getVersion", "()Landroid/icu/util/VersionInfo;"); }
+            return IExecuteWithSignature<Android.Icu.Util.VersionInfo>("getUCAVersion", "()Landroid/icu/util/VersionInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getCollationKey(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getVersion()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Icu.Text.CollationKey"/></returns>
-        public Android.Icu.Text.CollationKey GetCollationKey(Java.Lang.String arg0)
+        /// <returns><see cref="Android.Icu.Util.VersionInfo"/></returns>
+        public Android.Icu.Util.VersionInfo GetVersion()
         {
-            return IExecuteWithSignature<Android.Icu.Text.CollationKey>("getCollationKey", "(Ljava/lang/String;)Landroid/icu/text/CollationKey;", arg0);
+            return IExecuteWithSignature<Android.Icu.Util.VersionInfo>("getVersion", "()Landroid/icu/util/VersionInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#compare(java.lang.String,java.lang.String)"/>
@@ -311,6 +275,14 @@ public int Compare(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<int>("compare", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getVariableTop()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVariableTop()
+        {
+            return IExecuteWithSignature<int>("getVariableTop", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#setMaxVariable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -320,6 +292,14 @@ public Android.Icu.Text.Collator SetMaxVariable(int arg0)
             return IExecuteWithSignature<Android.Icu.Text.Collator>("setMaxVariable", "(I)Landroid/icu/text/Collator;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getTailoredSet()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.UnicodeSet"/></returns>
+        public Android.Icu.Text.UnicodeSet GetTailoredSet()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("getTailoredSet", "()Landroid/icu/text/UnicodeSet;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#equals(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -348,6 +328,38 @@ public int Compare(object arg0, object arg1)
             return IExecute<int>("compare", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getDecomposition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDecomposition()
+        {
+            return IExecuteWithSignature<int>("getDecomposition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getMaxVariable()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxVariable()
+        {
+            return IExecuteWithSignature<int>("getMaxVariable", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getStrength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStrength()
+        {
+            return IExecuteWithSignature<int>("getStrength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#getReorderCodes()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetReorderCodes()
+        {
+            return IExecuteWithSignatureArray<int>("getReorderCodes", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#cloneAsThawed()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
@@ -364,6 +376,14 @@ public object Freeze()
             return IExecuteWithSignature("freeze", "()Ljava/lang/Object;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#setDecomposition(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDecomposition(int arg0)
+        {
+            IExecuteWithSignature("setDecomposition", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#setReorderCodes(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -371,6 +391,14 @@ public void SetReorderCodes(params int[] arg0)
         {
             if (arg0.Length == 0) IExecuteWithSignature("setReorderCodes", "([I)V"); else IExecuteWithSignature("setReorderCodes", "([I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Collator.html#setStrength(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetStrength(int arg0)
+        {
+            IExecuteWithSignature("setStrength", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/ConstrainedFieldPosition.cs b/src/net/Netdroid/Generated/Android/Icu/Text/ConstrainedFieldPosition.cs
index af5e11071..cd269972e 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/ConstrainedFieldPosition.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/ConstrainedFieldPosition.cs
@@ -46,49 +46,54 @@ public partial class ConstrainedFieldPosition
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getField()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#matchesField(java.text.Format.Field,java.lang.Object)"/>
         /// </summary>
-        public Java.Text.Format.Field Field
+        /// <param name="arg0"><see cref="Java.Text.Format.Field"/></param>
+        /// <param name="arg1"><see cref="object"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool MatchesField(Java.Text.Format.Field arg0, object arg1)
         {
-            get { return IExecuteWithSignature<Java.Text.Format.Field>("getField", "()Ljava/text/Format$Field;"); }
+            return IExecute<bool>("matchesField", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getFieldValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getLimit()"/>
         /// </summary>
-        public object FieldValue
+        /// <returns><see cref="int"/></returns>
+        public int GetLimit()
         {
-            get { return IExecuteWithSignature("getFieldValue", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<int>("getLimit", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getInt64IterationContext()"/> <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#setInt64IterationContext(long)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getStart()"/>
         /// </summary>
-        public long Int64IterationContext
+        /// <returns><see cref="int"/></returns>
+        public int GetStart()
         {
-            get { return IExecuteWithSignature<long>("getInt64IterationContext", "()J"); } set { IExecuteWithSignature("setInt64IterationContext", "(J)V", value); }
+            return IExecuteWithSignature<int>("getStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getLimit()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getFieldValue()"/>
         /// </summary>
-        public int Limit
+        /// <returns><see cref="object"/></returns>
+        public object GetFieldValue()
         {
-            get { return IExecuteWithSignature<int>("getLimit", "()I"); }
+            return IExecuteWithSignature("getFieldValue", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getField()"/>
         /// </summary>
-        public int Start
+        /// <returns><see cref="Java.Text.Format.Field"/></returns>
+        public Java.Text.Format.Field GetField()
         {
-            get { return IExecuteWithSignature<int>("getStart", "()I"); }
+            return IExecuteWithSignature<Java.Text.Format.Field>("getField", "()Ljava/text/Format$Field;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#matchesField(java.text.Format.Field,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#getInt64IterationContext()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Text.Format.Field"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool MatchesField(Java.Text.Format.Field arg0, object arg1)
+        /// <returns><see cref="long"/></returns>
+        public long GetInt64IterationContext()
         {
-            return IExecute<bool>("matchesField", arg0, arg1);
+            return IExecuteWithSignature<long>("getInt64IterationContext", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#constrainClass(java.lang.Class)"/>
@@ -114,6 +119,14 @@ public void Reset()
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#setInt64IterationContext(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetInt64IterationContext(long arg0)
+        {
+            IExecuteWithSignature("setInt64IterationContext", "(J)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/ConstrainedFieldPosition.html#setState(java.text.Format.Field,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.Format.Field"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/CurrencyPluralInfo.cs b/src/net/Netdroid/Generated/Android/Icu/Text/CurrencyPluralInfo.cs
index ab776548f..396e2a738 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/CurrencyPluralInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/CurrencyPluralInfo.cs
@@ -66,11 +66,12 @@ public CurrencyPluralInfo(Java.Util.Locale arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#getInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.CurrencyPluralInfo Instance
+        /// <returns><see cref="Android.Icu.Text.CurrencyPluralInfo"/></returns>
+        public static Android.Icu.Text.CurrencyPluralInfo GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.CurrencyPluralInfo>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/CurrencyPluralInfo;"); }
+            return SExecuteWithSignature<Android.Icu.Text.CurrencyPluralInfo>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/CurrencyPluralInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#getInstance(android.icu.util.ULocale)"/>
@@ -95,18 +96,20 @@ public static Android.Icu.Text.CurrencyPluralInfo GetInstance(Java.Util.Locale a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#getLocale()"/> <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#setLocale(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#getPluralRules()"/>
         /// </summary>
-        public Android.Icu.Util.ULocale Locale
+        /// <returns><see cref="Android.Icu.Text.PluralRules"/></returns>
+        public Android.Icu.Text.PluralRules GetPluralRules()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;"); } set { IExecuteWithSignature("setLocale", "(Landroid/icu/util/ULocale;)V", value); }
+            return IExecuteWithSignature<Android.Icu.Text.PluralRules>("getPluralRules", "()Landroid/icu/text/PluralRules;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#getPluralRules()"/> <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#setPluralRules(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#getLocale()"/>
         /// </summary>
-        public Android.Icu.Text.PluralRules PluralRules
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetLocale()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.PluralRules>("getPluralRules", "()Landroid/icu/text/PluralRules;"); } set { IExecuteWithSignature("setPluralRules", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#getCurrencyPluralPattern(java.lang.String)"/>
@@ -126,6 +129,22 @@ public void SetCurrencyPluralPattern(Java.Lang.String arg0, Java.Lang.String arg
         {
             IExecute("setCurrencyPluralPattern", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#setLocale(android.icu.util.ULocale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        public void SetLocale(Android.Icu.Util.ULocale arg0)
+        {
+            IExecuteWithSignature("setLocale", "(Landroid/icu/util/ULocale;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/CurrencyPluralInfo.html#setPluralRules(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPluralRules(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPluralRules", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/DateFormat.cs b/src/net/Netdroid/Generated/Android/Icu/Text/DateFormat.cs
index f7f649929..b0c3d14f8 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/DateFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/DateFormat.cs
@@ -582,39 +582,12 @@ public partial class DateFormat
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getDateInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getDateInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.DateFormat DateInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getDateInstance", "()Landroid/icu/text/DateFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getDateTimeInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.DateFormat DateTimeInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getDateTimeInstance", "()Landroid/icu/text/DateFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.DateFormat Instance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/DateFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getTimeInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.DateFormat TimeInstance
+        /// <returns><see cref="Android.Icu.Text.DateFormat"/></returns>
+        public static Android.Icu.Text.DateFormat GetDateInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", "()Landroid/icu/text/DateFormat;"); }
+            return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getDateInstance", "()Landroid/icu/text/DateFormat;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getDateInstance(android.icu.util.Calendar,int,android.icu.util.ULocale)"/>
@@ -678,6 +651,14 @@ public static Android.Icu.Text.DateFormat GetDateInstance(int arg0)
             return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getDateInstance", "(I)Landroid/icu/text/DateFormat;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getDateTimeInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.DateFormat"/></returns>
+        public static Android.Icu.Text.DateFormat GetDateTimeInstance()
+        {
+            return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getDateTimeInstance", "()Landroid/icu/text/DateFormat;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getDateTimeInstance(android.icu.util.Calendar,int,int,android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.Calendar"/></param>
@@ -745,6 +726,14 @@ public static Android.Icu.Text.DateFormat GetDateTimeInstance(int arg0, int arg1
             return SExecute<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getDateTimeInstance", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.DateFormat"/></returns>
+        public static Android.Icu.Text.DateFormat GetInstance()
+        {
+            return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/DateFormat;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getInstance(android.icu.util.Calendar,android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.Calendar"/></param>
@@ -876,6 +865,14 @@ public static Android.Icu.Text.DateFormat GetPatternInstance(Java.Lang.String ar
             return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getPatternInstance", "(Ljava/lang/String;)Landroid/icu/text/DateFormat;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getTimeInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.DateFormat"/></returns>
+        public static Android.Icu.Text.DateFormat GetTimeInstance()
+        {
+            return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", "()Landroid/icu/text/DateFormat;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getTimeInstance(android.icu.util.Calendar,int,android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.Calendar"/></param>
@@ -936,31 +933,18 @@ public static Android.Icu.Text.DateFormat GetTimeInstance(int arg0)
         {
             return SExecuteWithSignature<Android.Icu.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", "(I)Landroid/icu/text/DateFormat;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getCalendar()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#setCalendar(android.icu.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getAvailableLocales()"/>
         /// </summary>
-        public Android.Icu.Util.Calendar Calendar
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.Calendar>("getCalendar", "()Landroid/icu/util/Calendar;"); } set { IExecuteWithSignature("setCalendar", "(Landroid/icu/util/Calendar;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getNumberFormat()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#setNumberFormat(android.icu.text.NumberFormat)"/>
-        /// </summary>
-        public Android.Icu.Text.NumberFormat NumberFormat
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.NumberFormat>("getNumberFormat", "()Landroid/icu/text/NumberFormat;"); } set { IExecuteWithSignature("setNumberFormat", "(Landroid/icu/text/NumberFormat;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getTimeZone()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#setTimeZone(android.icu.util.TimeZone)"/>
-        /// </summary>
-        public Android.Icu.Util.TimeZone TimeZone
-        {
-            get { return IExecuteWithSignature<Android.Icu.Util.TimeZone>("getTimeZone", "()Landroid/icu/util/TimeZone;"); } set { IExecuteWithSignature("setTimeZone", "(Landroid/icu/util/TimeZone;)V", value); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#format(android.icu.util.Calendar,java.lang.StringBuffer,java.text.FieldPosition)"/>
         /// </summary>
@@ -1002,6 +986,30 @@ public Android.Icu.Text.DisplayContext GetContext(Android.Icu.Text.DisplayContex
             return IExecuteWithSignature<Android.Icu.Text.DisplayContext>("getContext", "(Landroid/icu/text/DisplayContext$Type;)Landroid/icu/text/DisplayContext;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getNumberFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public Android.Icu.Text.NumberFormat GetNumberFormat()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.NumberFormat>("getNumberFormat", "()Landroid/icu/text/NumberFormat;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getCalendar()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.Calendar"/></returns>
+        public Android.Icu.Util.Calendar GetCalendar()
+        {
+            return IExecuteWithSignature<Android.Icu.Util.Calendar>("getCalendar", "()Landroid/icu/util/Calendar;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getTimeZone()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.TimeZone"/></returns>
+        public Android.Icu.Util.TimeZone GetTimeZone()
+        {
+            return IExecuteWithSignature<Android.Icu.Util.TimeZone>("getTimeZone", "()Landroid/icu/util/TimeZone;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#getBooleanAttribute(android.icu.text.DateFormat.BooleanAttribute)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.DateFormat.BooleanAttribute"/></param>
@@ -1067,6 +1075,14 @@ public Java.Util.Date Parse(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Date>("parse", "(Ljava/lang/String;)Ljava/util/Date;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#setCalendar(android.icu.util.Calendar)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.Calendar"/></param>
+        public void SetCalendar(Android.Icu.Util.Calendar arg0)
+        {
+            IExecuteWithSignature("setCalendar", "(Landroid/icu/util/Calendar;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#setCalendarLenient(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1090,6 +1106,22 @@ public void SetLenient(bool arg0)
         {
             IExecuteWithSignature("setLenient", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#setNumberFormat(android.icu.text.NumberFormat)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.NumberFormat"/></param>
+        public void SetNumberFormat(Android.Icu.Text.NumberFormat arg0)
+        {
+            IExecuteWithSignature("setNumberFormat", "(Landroid/icu/text/NumberFormat;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.html#setTimeZone(android.icu.util.TimeZone)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.TimeZone"/></param>
+        public void SetTimeZone(Android.Icu.Util.TimeZone arg0)
+        {
+            IExecuteWithSignature("setTimeZone", "(Landroid/icu/util/TimeZone;)V", arg0);
+        }
 
         #endregion
 
@@ -1352,11 +1384,12 @@ public static Android.Icu.Text.DateFormat.Field OfCalendarField(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.Field.html#getCalendarField()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/DateFormat.Field.html#getCalendarField()"/>
             /// </summary>
-            public int CalendarField
+            /// <returns><see cref="int"/></returns>
+            public int GetCalendarField()
             {
-                get { return IExecuteWithSignature<int>("getCalendarField", "()I"); }
+                return IExecuteWithSignature<int>("getCalendarField", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/DateFormatSymbols.cs b/src/net/Netdroid/Generated/Android/Icu/Text/DateFormatSymbols.cs
index 6d8ada919..ba5150b5c 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/DateFormatSymbols.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/DateFormatSymbols.cs
@@ -156,18 +156,12 @@ public DateFormatSymbols(Java.Util.ResourceBundle arg0, Java.Util.Locale arg1)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.DateFormatSymbols Instance
+        /// <returns><see cref="Android.Icu.Text.DateFormatSymbols"/></returns>
+        public static Android.Icu.Text.DateFormatSymbols GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.DateFormatSymbols>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/DateFormatSymbols;"); }
+            return SExecuteWithSignature<Android.Icu.Text.DateFormatSymbols>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/DateFormatSymbols;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getInstance(android.icu.util.ULocale)"/>
@@ -187,99 +181,109 @@ public static Android.Icu.Text.DateFormatSymbols GetInstance(Java.Util.Locale ar
         {
             return SExecuteWithSignature<Android.Icu.Text.DateFormatSymbols>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Landroid/icu/text/DateFormatSymbols;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getAmPmStrings()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setAmPmStrings(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getAvailableLocales()"/>
         /// </summary>
-        public Java.Lang.String[] AmPmStrings
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getAmPmStrings", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setAmPmStrings", "([Ljava/lang/String;)V", value); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getEraNames()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setEraNames(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getLocalPatternChars()"/>
         /// </summary>
-        public Java.Lang.String[] EraNames
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLocalPatternChars()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEraNames", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEraNames", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getLocalPatternChars", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getEras()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setEras(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getAmPmStrings()"/>
         /// </summary>
-        public Java.Lang.String[] Eras
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetAmPmStrings()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEras", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEras", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getAmPmStrings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getLocalPatternChars()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setLocalPatternChars(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getEraNames()"/>
         /// </summary>
-        public Java.Lang.String LocalPatternChars
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEraNames()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocalPatternChars", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setLocalPatternChars", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEraNames", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getMonths()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setMonths(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getEras()"/>
         /// </summary>
-        public Java.Lang.String[] Months
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEras()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getMonths", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setMonths", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEras", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getNarrowEras()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setNarrowEras(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getMonths()"/>
         /// </summary>
-        public Java.Lang.String[] NarrowEras
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetMonths()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getNarrowEras", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setNarrowEras", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getMonths", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getShortMonths()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setShortMonths(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getMonths(int,int)"/>
         /// </summary>
-        public Java.Lang.String[] ShortMonths
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetMonths(int arg0, int arg1)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getShortMonths", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setShortMonths", "([Ljava/lang/String;)V", value); }
+            return IExecuteArray<Java.Lang.String>("getMonths", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getShortWeekdays()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setShortWeekdays(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getNarrowEras()"/>
         /// </summary>
-        public Java.Lang.String[] ShortWeekdays
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetNarrowEras()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getShortWeekdays", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setShortWeekdays", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getNarrowEras", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getWeekdays()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setWeekdays(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getQuarters(int,int)"/>
         /// </summary>
-        public Java.Lang.String[] Weekdays
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetQuarters(int arg0, int arg1)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getWeekdays", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setWeekdays", "([Ljava/lang/String;)V", value); }
+            return IExecuteArray<Java.Lang.String>("getQuarters", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getZoneStrings()"/> <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setZoneStrings(java.lang.String[][])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getShortMonths()"/>
         /// </summary>
-        public Java.Lang.String[] ZoneStrings
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetShortMonths()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getZoneStrings", "()[[Ljava/lang/String;"); } set { IExecuteWithSignature("setZoneStrings", "([[Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getShortMonths", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getMonths(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getShortWeekdays()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String[] GetMonths(int arg0, int arg1)
+        public Java.Lang.String[] GetShortWeekdays()
         {
-            return IExecuteArray<Java.Lang.String>("getMonths", arg0, arg1);
+            return IExecuteWithSignatureArray<Java.Lang.String>("getShortWeekdays", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getQuarters(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getWeekdays()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String[] GetQuarters(int arg0, int arg1)
+        public Java.Lang.String[] GetWeekdays()
         {
-            return IExecuteArray<Java.Lang.String>("getQuarters", arg0, arg1);
+            return IExecuteWithSignatureArray<Java.Lang.String>("getWeekdays", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getWeekdays(int,int)"/>
@@ -312,6 +316,46 @@ public Java.Lang.String[] GetZodiacNames(int arg0, int arg1)
             return IExecuteArray<Java.Lang.String>("getZodiacNames", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#getZoneStrings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetZoneStrings()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getZoneStrings", "()[[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setAmPmStrings(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetAmPmStrings(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setAmPmStrings", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setEraNames(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEraNames(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setEraNames", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setEras(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEras(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setEras", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setLocalPatternChars(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetLocalPatternChars(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setLocalPatternChars", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setMonths(java.lang.String[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -322,6 +366,22 @@ public void SetMonths(Java.Lang.String[] arg0, int arg1, int arg2)
             IExecute("setMonths", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setMonths(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetMonths(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setMonths", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setNarrowEras(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNarrowEras(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setNarrowEras", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setQuarters(java.lang.String[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -332,6 +392,22 @@ public void SetQuarters(Java.Lang.String[] arg0, int arg1, int arg2)
             IExecute("setQuarters", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setShortMonths(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetShortMonths(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setShortMonths", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setShortWeekdays(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetShortWeekdays(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setShortWeekdays", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setWeekdays(java.lang.String[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -342,6 +418,14 @@ public void SetWeekdays(Java.Lang.String[] arg0, int arg1, int arg2)
             IExecute("setWeekdays", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setWeekdays(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetWeekdays(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setWeekdays", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setYearNames(java.lang.String[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -361,6 +445,14 @@ public void SetZodiacNames(Java.Lang.String[] arg0, int arg1, int arg2)
         {
             IExecute("setZodiacNames", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateFormatSymbols.html#setZoneStrings(java.lang.String[][])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetZoneStrings(Java.Lang.String[][] arg0)
+        {
+            IExecuteWithSignature("setZoneStrings", "([[Ljava/lang/String;)V", new object[] { arg0 });
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/DateIntervalFormat.cs b/src/net/Netdroid/Generated/Android/Icu/Text/DateIntervalFormat.cs
index 5c37341fb..c6759e773 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/DateIntervalFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/DateIntervalFormat.cs
@@ -107,27 +107,6 @@ public static Android.Icu.Text.DateIntervalFormat GetInstance(Java.Lang.String a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#getDateFormat()"/> 
-        /// </summary>
-        public Android.Icu.Text.DateFormat DateFormat
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.DateFormat>("getDateFormat", "()Landroid/icu/text/DateFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#getDateIntervalInfo()"/> <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#setDateIntervalInfo(android.icu.text.DateIntervalInfo)"/>
-        /// </summary>
-        public Android.Icu.Text.DateIntervalInfo DateIntervalInfo
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.DateIntervalInfo>("getDateIntervalInfo", "()Landroid/icu/text/DateIntervalInfo;"); } set { IExecuteWithSignature("setDateIntervalInfo", "(Landroid/icu/text/DateIntervalInfo;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#getTimeZone()"/> <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#setTimeZone(android.icu.util.TimeZone)"/>
-        /// </summary>
-        public Android.Icu.Util.TimeZone TimeZone
-        {
-            get { return IExecuteWithSignature<Android.Icu.Util.TimeZone>("getTimeZone", "()Landroid/icu/util/TimeZone;"); } set { IExecuteWithSignature("setTimeZone", "(Landroid/icu/util/TimeZone;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#formatToValue(android.icu.util.Calendar,android.icu.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.Calendar"/></param>
@@ -147,6 +126,14 @@ public Android.Icu.Text.DateIntervalFormat.FormattedDateInterval FormatToValue(A
             return IExecuteWithSignature<Android.Icu.Text.DateIntervalFormat.FormattedDateInterval>("formatToValue", "(Landroid/icu/util/DateInterval;)Landroid/icu/text/DateIntervalFormat$FormattedDateInterval;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#getDateIntervalInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.DateIntervalInfo"/></returns>
+        public Android.Icu.Text.DateIntervalInfo GetDateIntervalInfo()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.DateIntervalInfo>("getDateIntervalInfo", "()Landroid/icu/text/DateIntervalInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#getContext(android.icu.text.DisplayContext.Type)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.DisplayContext.Type"/></param>
@@ -156,6 +143,14 @@ public Android.Icu.Text.DisplayContext GetContext(Android.Icu.Text.DisplayContex
             return IExecuteWithSignature<Android.Icu.Text.DisplayContext>("getContext", "(Landroid/icu/text/DisplayContext$Type;)Landroid/icu/text/DisplayContext;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#getTimeZone()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.TimeZone"/></returns>
+        public Android.Icu.Util.TimeZone GetTimeZone()
+        {
+            return IExecuteWithSignature<Android.Icu.Util.TimeZone>("getTimeZone", "()Landroid/icu/util/TimeZone;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#format(android.icu.util.Calendar,android.icu.util.Calendar,java.lang.StringBuffer,java.text.FieldPosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.Calendar"/></param>
@@ -179,6 +174,14 @@ public Java.Lang.StringBuffer Format(Android.Icu.Util.DateInterval arg0, Java.La
             return IExecute<Java.Lang.StringBuffer>("format", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#getDateFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.DateFormat"/></returns>
+        public Android.Icu.Text.DateFormat GetDateFormat()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.DateFormat>("getDateFormat", "()Landroid/icu/text/DateFormat;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#setContext(android.icu.text.DisplayContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.DisplayContext"/></param>
@@ -186,6 +189,22 @@ public void SetContext(Android.Icu.Text.DisplayContext arg0)
         {
             IExecuteWithSignature("setContext", "(Landroid/icu/text/DisplayContext;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#setDateIntervalInfo(android.icu.text.DateIntervalInfo)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.DateIntervalInfo"/></param>
+        public void SetDateIntervalInfo(Android.Icu.Text.DateIntervalInfo arg0)
+        {
+            IExecuteWithSignature("setDateIntervalInfo", "(Landroid/icu/text/DateIntervalInfo;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.html#setTimeZone(android.icu.util.TimeZone)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.TimeZone"/></param>
+        public void SetTimeZone(Android.Icu.Util.TimeZone arg0)
+        {
+            IExecuteWithSignature("setTimeZone", "(Landroid/icu/util/TimeZone;)V", arg0);
+        }
 
         #endregion
 
@@ -216,9 +235,9 @@ public partial class FormattedDateInterval
             /// <param name="arg0"><typeparamref name="A"/></param>
             /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
             /// <returns><typeparamref name="A"/></returns>
-            public A AppendTo<A>(A arg0) where A: Java.Lang.IAppendable, new()
+            public A AppendTo<A>(A arg0) where A : Java.Lang.IAppendable, new()
             {
-                return IExecuteWithSignature<A>("appendTo", "(Ljava/lang/Appendable;)Ljava/lang/Appendable;", arg0);
+                return IExecute<A>("appendTo", arg0);
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalFormat.FormattedDateInterval.html#nextPosition(android.icu.text.ConstrainedFieldPosition)"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/DateIntervalInfo.cs b/src/net/Netdroid/Generated/Android/Icu/Text/DateIntervalInfo.cs
index 3478f55bd..ead9de96a 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/DateIntervalInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/DateIntervalInfo.cs
@@ -74,20 +74,6 @@ public DateIntervalInfo(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#getDefaultOrder()"/> 
-        /// </summary>
-        public bool DefaultOrder
-        {
-            get { return IExecuteWithSignature<bool>("getDefaultOrder", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#getFallbackIntervalPattern()"/> <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#setFallbackIntervalPattern(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String FallbackIntervalPattern
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFallbackIntervalPattern", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFallbackIntervalPattern", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#getIntervalPattern(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -98,6 +84,14 @@ public Android.Icu.Text.DateIntervalInfo.PatternInfo GetIntervalPattern(Java.Lan
             return IExecute<Android.Icu.Text.DateIntervalInfo.PatternInfo>("getIntervalPattern", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#getDefaultOrder()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDefaultOrder()
+        {
+            return IExecuteWithSignature<bool>("getDefaultOrder", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#isFrozen()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -122,6 +116,22 @@ public object Freeze()
             return IExecuteWithSignature("freeze", "()Ljava/lang/Object;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#getFallbackIntervalPattern()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFallbackIntervalPattern()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getFallbackIntervalPattern", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#setFallbackIntervalPattern(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFallbackIntervalPattern(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFallbackIntervalPattern", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.html#setIntervalPattern(java.lang.String,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -174,26 +184,28 @@ public PatternInfo(Java.Lang.String arg0, Java.Lang.String arg1, bool arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.PatternInfo.html#getFirstPart()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.PatternInfo.html#firstDateInPtnIsLaterDate()"/>
             /// </summary>
-            public Java.Lang.String FirstPart
+            /// <returns><see cref="bool"/></returns>
+            public bool FirstDateInPtnIsLaterDate()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getFirstPart", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("firstDateInPtnIsLaterDate", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.PatternInfo.html#getSecondPart()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.PatternInfo.html#getFirstPart()"/>
             /// </summary>
-            public Java.Lang.String SecondPart
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetFirstPart()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getSecondPart", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getFirstPart", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.PatternInfo.html#firstDateInPtnIsLaterDate()"/>
+            /// <see href="https://developer.android.com/reference/android/icu/text/DateIntervalInfo.PatternInfo.html#getSecondPart()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool FirstDateInPtnIsLaterDate()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetSecondPart()
             {
-                return IExecuteWithSignature<bool>("firstDateInPtnIsLaterDate", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getSecondPart", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/DateTimePatternGenerator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/DateTimePatternGenerator.cs
index b582ac712..811a7fe89 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/DateTimePatternGenerator.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/DateTimePatternGenerator.cs
@@ -164,18 +164,20 @@ public partial class DateTimePatternGenerator : Android.Icu.Util.IFreezable<Andr
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getEmptyInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getEmptyInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.DateTimePatternGenerator EmptyInstance
+        /// <returns><see cref="Android.Icu.Text.DateTimePatternGenerator"/></returns>
+        public static Android.Icu.Text.DateTimePatternGenerator GetEmptyInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.DateTimePatternGenerator>(LocalBridgeClazz, "getEmptyInstance", "()Landroid/icu/text/DateTimePatternGenerator;"); }
+            return SExecuteWithSignature<Android.Icu.Text.DateTimePatternGenerator>(LocalBridgeClazz, "getEmptyInstance", "()Landroid/icu/text/DateTimePatternGenerator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.DateTimePatternGenerator Instance
+        /// <returns><see cref="Android.Icu.Text.DateTimePatternGenerator"/></returns>
+        public static Android.Icu.Text.DateTimePatternGenerator GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.DateTimePatternGenerator>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/DateTimePatternGenerator;"); }
+            return SExecuteWithSignature<Android.Icu.Text.DateTimePatternGenerator>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/DateTimePatternGenerator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getInstance(android.icu.util.ULocale)"/>
@@ -200,25 +202,12 @@ public static Android.Icu.Text.DateTimePatternGenerator GetInstance(Java.Util.Lo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getDateTimeFormat()"/> <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#setDateTimeFormat(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String DateTimeFormat
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDateTimeFormat", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDateTimeFormat", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getDecimal()"/> <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#setDecimal(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getDefaultHourCycle()"/>
         /// </summary>
-        public Java.Lang.String Decimal
+        /// <returns><see cref="Android.Icu.Text.DateFormat.HourCycle"/></returns>
+        public Android.Icu.Text.DateFormat.HourCycle GetDefaultHourCycle()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDecimal", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDecimal", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getDefaultHourCycle()"/> 
-        /// </summary>
-        public Android.Icu.Text.DateFormat.HourCycle DefaultHourCycle
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.DateFormat.HourCycle>("getDefaultHourCycle", "()Landroid/icu/text/DateFormat$HourCycle;"); }
+            return IExecuteWithSignature<Android.Icu.Text.DateFormat.HourCycle>("getDefaultHourCycle", "()Landroid/icu/text/DateFormat$HourCycle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#addPattern(java.lang.String,boolean,android.icu.text.DateTimePatternGenerator.PatternInfo)"/>
@@ -302,6 +291,22 @@ public Java.Lang.String GetBestPattern(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getBestPattern", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getDateTimeFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDateTimeFormat()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDateTimeFormat", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getDecimal()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDecimal()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDecimal", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#getFieldDisplayName(int,android.icu.text.DateTimePatternGenerator.DisplayWidth)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -377,6 +382,22 @@ public void SetAppendItemName(int arg0, Java.Lang.String arg1)
         {
             IExecute("setAppendItemName", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#setDateTimeFormat(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDateTimeFormat(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDateTimeFormat", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DateTimePatternGenerator.html#setDecimal(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDecimal(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDecimal", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/DecimalFormat.cs b/src/net/Netdroid/Generated/Android/Icu/Text/DecimalFormat.cs
index 2f3262e75..24b2e0bce 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/DecimalFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/DecimalFormat.cs
@@ -110,224 +110,229 @@ public DecimalFormat(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getCurrencyPluralInfo()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setCurrencyPluralInfo(android.icu.text.CurrencyPluralInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getParseMaxDigits()"/>
         /// </summary>
-        public Android.Icu.Text.CurrencyPluralInfo CurrencyPluralInfo
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetParseMaxDigits()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.CurrencyPluralInfo>("getCurrencyPluralInfo", "()Landroid/icu/text/CurrencyPluralInfo;"); } set { IExecuteWithSignature("setCurrencyPluralInfo", "(Landroid/icu/text/CurrencyPluralInfo;)V", value); }
+            return IExecuteWithSignature<int>("getParseMaxDigits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getCurrencyUsage()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setCurrencyUsage(android.icu.util.Currency.CurrencyUsage)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMathContextICU()"/>
         /// </summary>
-        public Android.Icu.Util.Currency.CurrencyUsage CurrencyUsage
+        /// <returns><see cref="Android.Icu.Math.MathContext"/></returns>
+        public Android.Icu.Math.MathContext GetMathContextICU()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.Currency.CurrencyUsage>("getCurrencyUsage", "()Landroid/icu/util/Currency$CurrencyUsage;"); } set { IExecuteWithSignature("setCurrencyUsage", "(Landroid/icu/util/Currency$CurrencyUsage;)V", value); }
+            return IExecuteWithSignature<Android.Icu.Math.MathContext>("getMathContextICU", "()Landroid/icu/math/MathContext;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getDecimalFormatSymbols()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setDecimalFormatSymbols(android.icu.text.DecimalFormatSymbols)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getCurrencyPluralInfo()"/>
         /// </summary>
-        public Android.Icu.Text.DecimalFormatSymbols DecimalFormatSymbols
+        /// <returns><see cref="Android.Icu.Text.CurrencyPluralInfo"/></returns>
+        public Android.Icu.Text.CurrencyPluralInfo GetCurrencyPluralInfo()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.DecimalFormatSymbols>("getDecimalFormatSymbols", "()Landroid/icu/text/DecimalFormatSymbols;"); } set { IExecuteWithSignature("setDecimalFormatSymbols", "(Landroid/icu/text/DecimalFormatSymbols;)V", value); }
+            return IExecuteWithSignature<Android.Icu.Text.CurrencyPluralInfo>("getCurrencyPluralInfo", "()Landroid/icu/text/CurrencyPluralInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getFormatWidth()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setFormatWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getDecimalFormatSymbols()"/>
         /// </summary>
-        public int FormatWidth
+        /// <returns><see cref="Android.Icu.Text.DecimalFormatSymbols"/></returns>
+        public Android.Icu.Text.DecimalFormatSymbols GetDecimalFormatSymbols()
         {
-            get { return IExecuteWithSignature<int>("getFormatWidth", "()I"); } set { IExecuteWithSignature("setFormatWidth", "(I)V", value); }
+            return IExecuteWithSignature<Android.Icu.Text.DecimalFormatSymbols>("getDecimalFormatSymbols", "()Landroid/icu/text/DecimalFormatSymbols;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getGroupingSize()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setGroupingSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getCurrencyUsage()"/>
         /// </summary>
-        public int GroupingSize
+        /// <returns><see cref="Android.Icu.Util.Currency.CurrencyUsage"/></returns>
+        public Android.Icu.Util.Currency.CurrencyUsage GetCurrencyUsage()
         {
-            get { return IExecuteWithSignature<int>("getGroupingSize", "()I"); } set { IExecuteWithSignature("setGroupingSize", "(I)V", value); }
+            return IExecuteWithSignature<Android.Icu.Util.Currency.CurrencyUsage>("getCurrencyUsage", "()Landroid/icu/util/Currency$CurrencyUsage;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMathContext()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMathContext(java.math.MathContext)"/>
-        /// </summary>
-        public Java.Math.MathContext MathContext
-        {
-            get { return IExecuteWithSignature<Java.Math.MathContext>("getMathContext", "()Ljava/math/MathContext;"); } set { IExecuteWithSignature("setMathContext", "(Ljava/math/MathContext;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMathContextICU()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMathContextICU(android.icu.math.MathContext)"/>
-        /// </summary>
-        public Android.Icu.Math.MathContext MathContextICU
-        {
-            get { return IExecuteWithSignature<Android.Icu.Math.MathContext>("getMathContextICU", "()Landroid/icu/math/MathContext;"); } set { IExecuteWithSignature("setMathContextICU", "(Landroid/icu/math/MathContext;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMaximumSignificantDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMaximumSignificantDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#areSignificantDigitsUsed()"/>
         /// </summary>
-        public int MaximumSignificantDigits
+        /// <returns><see cref="bool"/></returns>
+        public bool AreSignificantDigitsUsed()
         {
-            get { return IExecuteWithSignature<int>("getMaximumSignificantDigits", "()I"); } set { IExecuteWithSignature("setMaximumSignificantDigits", "(I)V", value); }
+            return IExecuteWithSignature<bool>("areSignificantDigitsUsed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMinimumExponentDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMinimumExponentDigits(byte)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isDecimalPatternMatchRequired()"/>
         /// </summary>
-        public byte MinimumExponentDigits
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDecimalPatternMatchRequired()
         {
-            get { return IExecuteWithSignature<byte>("getMinimumExponentDigits", "()B"); } set { IExecuteWithSignature("setMinimumExponentDigits", "(B)V", value); }
+            return IExecuteWithSignature<bool>("isDecimalPatternMatchRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMinimumGroupingDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMinimumGroupingDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isDecimalSeparatorAlwaysShown()"/>
         /// </summary>
-        public int MinimumGroupingDigits
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDecimalSeparatorAlwaysShown()
         {
-            get { return IExecuteWithSignature<int>("getMinimumGroupingDigits", "()I"); } set { IExecuteWithSignature("setMinimumGroupingDigits", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isDecimalSeparatorAlwaysShown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMinimumSignificantDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMinimumSignificantDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isExponentSignAlwaysShown()"/>
         /// </summary>
-        public int MinimumSignificantDigits
+        /// <returns><see cref="bool"/></returns>
+        public bool IsExponentSignAlwaysShown()
         {
-            get { return IExecuteWithSignature<int>("getMinimumSignificantDigits", "()I"); } set { IExecuteWithSignature("setMinimumSignificantDigits", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isExponentSignAlwaysShown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMultiplier()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMultiplier(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isParseBigDecimal()"/>
         /// </summary>
-        public int Multiplier
+        /// <returns><see cref="bool"/></returns>
+        public bool IsParseBigDecimal()
         {
-            get { return IExecuteWithSignature<int>("getMultiplier", "()I"); } set { IExecuteWithSignature("setMultiplier", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isParseBigDecimal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getNegativePrefix()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setNegativePrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isParseCaseSensitive()"/>
         /// </summary>
-        public Java.Lang.String NegativePrefix
+        /// <returns><see cref="bool"/></returns>
+        public bool IsParseCaseSensitive()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNegativePrefix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNegativePrefix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isParseCaseSensitive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getNegativeSuffix()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setNegativeSuffix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isParseNoExponent()"/>
         /// </summary>
-        public Java.Lang.String NegativeSuffix
+        /// <returns><see cref="bool"/></returns>
+        public bool IsParseNoExponent()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNegativeSuffix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNegativeSuffix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isParseNoExponent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getPadCharacter()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setPadCharacter(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isScientificNotation()"/>
         /// </summary>
-        public char PadCharacter
+        /// <returns><see cref="bool"/></returns>
+        public bool IsScientificNotation()
         {
-            get { return IExecuteWithSignature<char>("getPadCharacter", "()C"); } set { IExecuteWithSignature("setPadCharacter", "(C)V", value); }
+            return IExecuteWithSignature<bool>("isScientificNotation", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getPadPosition()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setPadPosition(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isSignAlwaysShown()"/>
         /// </summary>
-        public int PadPosition
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSignAlwaysShown()
         {
-            get { return IExecuteWithSignature<int>("getPadPosition", "()I"); } set { IExecuteWithSignature("setPadPosition", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isSignAlwaysShown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getParseMaxDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setParseMaxDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMinimumExponentDigits()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int ParseMaxDigits
+        /// <returns><see cref="byte"/></returns>
+        public byte GetMinimumExponentDigits()
         {
-            get { return IExecuteWithSignature<int>("getParseMaxDigits", "()I"); } set { IExecuteWithSignature("setParseMaxDigits", "(I)V", value); }
+            return IExecuteWithSignature<byte>("getMinimumExponentDigits", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getPositivePrefix()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setPositivePrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getPadCharacter()"/>
         /// </summary>
-        public Java.Lang.String PositivePrefix
+        /// <returns><see cref="char"/></returns>
+        public char GetPadCharacter()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPositivePrefix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPositivePrefix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<char>("getPadCharacter", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getPositiveSuffix()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setPositiveSuffix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getFormatWidth()"/>
         /// </summary>
-        public Java.Lang.String PositiveSuffix
+        /// <returns><see cref="int"/></returns>
+        public int GetFormatWidth()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPositiveSuffix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPositiveSuffix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getFormatWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getRoundingIncrement()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getGroupingSize()"/>
         /// </summary>
-        public Java.Math.BigDecimal RoundingIncrement
+        /// <returns><see cref="int"/></returns>
+        public int GetGroupingSize()
         {
-            get { return IExecuteWithSignature<Java.Math.BigDecimal>("getRoundingIncrement", "()Ljava/math/BigDecimal;"); }
+            return IExecuteWithSignature<int>("getGroupingSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getSecondaryGroupingSize()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setSecondaryGroupingSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMaximumSignificantDigits()"/>
         /// </summary>
-        public int SecondaryGroupingSize
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumSignificantDigits()
         {
-            get { return IExecuteWithSignature<int>("getSecondaryGroupingSize", "()I"); } set { IExecuteWithSignature("setSecondaryGroupingSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaximumSignificantDigits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#areSignificantDigitsUsed()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMinimumGroupingDigits()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool AreSignificantDigitsUsed()
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumGroupingDigits()
         {
-            return IExecuteWithSignature<bool>("areSignificantDigitsUsed", "()Z");
+            return IExecuteWithSignature<int>("getMinimumGroupingDigits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isDecimalPatternMatchRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMinimumSignificantDigits()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDecimalPatternMatchRequired()
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumSignificantDigits()
         {
-            return IExecuteWithSignature<bool>("isDecimalPatternMatchRequired", "()Z");
+            return IExecuteWithSignature<int>("getMinimumSignificantDigits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isDecimalSeparatorAlwaysShown()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMultiplier()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDecimalSeparatorAlwaysShown()
+        /// <returns><see cref="int"/></returns>
+        public int GetMultiplier()
         {
-            return IExecuteWithSignature<bool>("isDecimalSeparatorAlwaysShown", "()Z");
+            return IExecuteWithSignature<int>("getMultiplier", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isExponentSignAlwaysShown()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getPadPosition()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsExponentSignAlwaysShown()
+        /// <returns><see cref="int"/></returns>
+        public int GetPadPosition()
         {
-            return IExecuteWithSignature<bool>("isExponentSignAlwaysShown", "()Z");
+            return IExecuteWithSignature<int>("getPadPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isParseBigDecimal()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getSecondaryGroupingSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsParseBigDecimal()
+        /// <returns><see cref="int"/></returns>
+        public int GetSecondaryGroupingSize()
         {
-            return IExecuteWithSignature<bool>("isParseBigDecimal", "()Z");
+            return IExecuteWithSignature<int>("getSecondaryGroupingSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isParseCaseSensitive()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getNegativePrefix()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsParseCaseSensitive()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNegativePrefix()
         {
-            return IExecuteWithSignature<bool>("isParseCaseSensitive", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getNegativePrefix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isParseNoExponent()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getNegativeSuffix()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsParseNoExponent()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNegativeSuffix()
         {
-            return IExecuteWithSignature<bool>("isParseNoExponent", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getNegativeSuffix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isScientificNotation()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getPositivePrefix()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsScientificNotation()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPositivePrefix()
         {
-            return IExecuteWithSignature<bool>("isScientificNotation", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPositivePrefix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#isSignAlwaysShown()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getPositiveSuffix()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSignAlwaysShown()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPositiveSuffix()
         {
-            return IExecuteWithSignature<bool>("isSignAlwaysShown", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPositiveSuffix", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#toLocalizedPattern()"/>
@@ -346,6 +351,22 @@ public Java.Lang.String ToPattern()
             return IExecuteWithSignature<Java.Lang.String>("toPattern", "()Ljava/lang/String;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getRoundingIncrement()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Math.BigDecimal"/></returns>
+        public Java.Math.BigDecimal GetRoundingIncrement()
+        {
+            return IExecuteWithSignature<Java.Math.BigDecimal>("getRoundingIncrement", "()Ljava/math/BigDecimal;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#getMathContext()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Math.MathContext"/></returns>
+        public Java.Math.MathContext GetMathContext()
+        {
+            return IExecuteWithSignature<Java.Math.MathContext>("getMathContext", "()Ljava/math/MathContext;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#applyLocalizedPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -362,6 +383,30 @@ public void ApplyPattern(Java.Lang.String arg0)
             IExecuteWithSignature("applyPattern", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setCurrencyPluralInfo(android.icu.text.CurrencyPluralInfo)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.CurrencyPluralInfo"/></param>
+        public void SetCurrencyPluralInfo(Android.Icu.Text.CurrencyPluralInfo arg0)
+        {
+            IExecuteWithSignature("setCurrencyPluralInfo", "(Landroid/icu/text/CurrencyPluralInfo;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setCurrencyUsage(android.icu.util.Currency.CurrencyUsage)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.Currency.CurrencyUsage"/></param>
+        public void SetCurrencyUsage(Android.Icu.Util.Currency.CurrencyUsage arg0)
+        {
+            IExecuteWithSignature("setCurrencyUsage", "(Landroid/icu/util/Currency$CurrencyUsage;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setDecimalFormatSymbols(android.icu.text.DecimalFormatSymbols)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.DecimalFormatSymbols"/></param>
+        public void SetDecimalFormatSymbols(Android.Icu.Text.DecimalFormatSymbols arg0)
+        {
+            IExecuteWithSignature("setDecimalFormatSymbols", "(Landroid/icu/text/DecimalFormatSymbols;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setDecimalPatternMatchRequired(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -386,6 +431,110 @@ public void SetExponentSignAlwaysShown(bool arg0)
             IExecuteWithSignature("setExponentSignAlwaysShown", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setFormatWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFormatWidth(int arg0)
+        {
+            IExecuteWithSignature("setFormatWidth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setGroupingSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGroupingSize(int arg0)
+        {
+            IExecuteWithSignature("setGroupingSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMathContext(java.math.MathContext)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Math.MathContext"/></param>
+        public void SetMathContext(Java.Math.MathContext arg0)
+        {
+            IExecuteWithSignature("setMathContext", "(Ljava/math/MathContext;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMathContextICU(android.icu.math.MathContext)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Math.MathContext"/></param>
+        public void SetMathContextICU(Android.Icu.Math.MathContext arg0)
+        {
+            IExecuteWithSignature("setMathContextICU", "(Landroid/icu/math/MathContext;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMaximumSignificantDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaximumSignificantDigits(int arg0)
+        {
+            IExecuteWithSignature("setMaximumSignificantDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMinimumExponentDigits(byte)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="byte"/></param>
+        public void SetMinimumExponentDigits(byte arg0)
+        {
+            IExecuteWithSignature("setMinimumExponentDigits", "(B)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMinimumGroupingDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumGroupingDigits(int arg0)
+        {
+            IExecuteWithSignature("setMinimumGroupingDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMinimumSignificantDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumSignificantDigits(int arg0)
+        {
+            IExecuteWithSignature("setMinimumSignificantDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setMultiplier(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMultiplier(int arg0)
+        {
+            IExecuteWithSignature("setMultiplier", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setNegativePrefix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNegativePrefix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setNegativePrefix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setNegativeSuffix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNegativeSuffix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setNegativeSuffix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setPadCharacter(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPadCharacter(char arg0)
+        {
+            IExecuteWithSignature("setPadCharacter", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setPadPosition(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPadPosition(int arg0)
+        {
+            IExecuteWithSignature("setPadPosition", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setParseBigDecimal(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -410,6 +559,22 @@ public void SetParseNoExponent(bool arg0)
             IExecuteWithSignature("setParseNoExponent", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setPositivePrefix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPositivePrefix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPositivePrefix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setPositiveSuffix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPositiveSuffix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPositiveSuffix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setRoundingIncrement(android.icu.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Math.BigDecimal"/></param>
@@ -442,6 +607,14 @@ public void SetScientificNotation(bool arg0)
             IExecuteWithSignature("setScientificNotation", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setSecondaryGroupingSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSecondaryGroupingSize(int arg0)
+        {
+            IExecuteWithSignature("setSecondaryGroupingSize", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setSignAlwaysShown(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -457,6 +630,15 @@ public void SetSignificantDigitsUsed(bool arg0)
         {
             IExecuteWithSignature("setSignificantDigitsUsed", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormat.html#setParseMaxDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetParseMaxDigits(int arg0)
+        {
+            IExecuteWithSignature("setParseMaxDigits", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/DecimalFormatSymbols.cs b/src/net/Netdroid/Generated/Android/Icu/Text/DecimalFormatSymbols.cs
index 6f87b0953..19397bd36 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/DecimalFormatSymbols.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/DecimalFormatSymbols.cs
@@ -84,27 +84,6 @@ public DecimalFormatSymbols(Java.Util.Locale arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getAvailableLocales()"/> 
-        /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getAvailableULocales()"/> 
-        /// </summary>
-        public static Android.Icu.Util.ULocale[] AvailableULocales
-        {
-            get { return SExecuteWithSignatureArray<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getAvailableULocales", "()[Landroid/icu/util/ULocale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.DecimalFormatSymbols Instance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.DecimalFormatSymbols>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/DecimalFormatSymbols;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#forNumberingSystem(android.icu.util.ULocale,android.icu.text.NumberingSystem)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -125,6 +104,14 @@ public static Android.Icu.Text.DecimalFormatSymbols ForNumberingSystem(Java.Util
             return SExecute<Android.Icu.Text.DecimalFormatSymbols>(LocalBridgeClazz, "forNumberingSystem", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.DecimalFormatSymbols"/></returns>
+        public static Android.Icu.Text.DecimalFormatSymbols GetInstance()
+        {
+            return SExecuteWithSignature<Android.Icu.Text.DecimalFormatSymbols>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/DecimalFormatSymbols;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getInstance(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -142,243 +129,451 @@ public static Android.Icu.Text.DecimalFormatSymbols GetInstance(Java.Util.Locale
         {
             return SExecuteWithSignature<Android.Icu.Text.DecimalFormatSymbols>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Landroid/icu/text/DecimalFormatSymbols;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getAvailableULocales()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public static Android.Icu.Util.ULocale[] GetAvailableULocales()
+        {
+            return SExecuteWithSignatureArray<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getAvailableULocales", "()[Landroid/icu/util/ULocale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getAvailableLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
+        {
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getCurrency()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setCurrency(android.icu.util.Currency)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getCurrency()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.Currency"/></returns>
+        public Android.Icu.Util.Currency GetCurrency()
+        {
+            return IExecuteWithSignature<Android.Icu.Util.Currency>("getCurrency", "()Landroid/icu/util/Currency;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getULocale()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetULocale()
+        {
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getULocale", "()Landroid/icu/util/ULocale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDecimalSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetDecimalSeparator()
+        {
+            return IExecuteWithSignature<char>("getDecimalSeparator", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDigit()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetDigit()
+        {
+            return IExecuteWithSignature<char>("getDigit", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getGroupingSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetGroupingSeparator()
+        {
+            return IExecuteWithSignature<char>("getGroupingSeparator", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMinusSign()"/>
         /// </summary>
-        public Android.Icu.Util.Currency Currency
+        /// <returns><see cref="char"/></returns>
+        public char GetMinusSign()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.Currency>("getCurrency", "()Landroid/icu/util/Currency;"); } set { IExecuteWithSignature("setCurrency", "(Landroid/icu/util/Currency;)V", value); }
+            return IExecuteWithSignature<char>("getMinusSign", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getCurrencySymbol()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setCurrencySymbol(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMonetaryDecimalSeparator()"/>
         /// </summary>
-        public Java.Lang.String CurrencySymbol
+        /// <returns><see cref="char"/></returns>
+        public char GetMonetaryDecimalSeparator()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCurrencySymbol", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCurrencySymbol", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<char>("getMonetaryDecimalSeparator", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDecimalSeparator()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setDecimalSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMonetaryGroupingSeparator()"/>
         /// </summary>
-        public char DecimalSeparator
+        /// <returns><see cref="char"/></returns>
+        public char GetMonetaryGroupingSeparator()
         {
-            get { return IExecuteWithSignature<char>("getDecimalSeparator", "()C"); } set { IExecuteWithSignature("setDecimalSeparator", "(C)V", value); }
+            return IExecuteWithSignature<char>("getMonetaryGroupingSeparator", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDecimalSeparatorString()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setDecimalSeparatorString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPadEscape()"/>
         /// </summary>
-        public Java.Lang.String DecimalSeparatorString
+        /// <returns><see cref="char"/></returns>
+        public char GetPadEscape()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDecimalSeparatorString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDecimalSeparatorString", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<char>("getPadEscape", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDigit()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPatternSeparator()"/>
         /// </summary>
-        public char Digit
+        /// <returns><see cref="char"/></returns>
+        public char GetPatternSeparator()
         {
-            get { return IExecuteWithSignature<char>("getDigit", "()C"); } set { IExecuteWithSignature("setDigit", "(C)V", value); }
+            return IExecuteWithSignature<char>("getPatternSeparator", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDigits()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPercent()"/>
         /// </summary>
-        public char[] Digits
+        /// <returns><see cref="char"/></returns>
+        public char GetPercent()
         {
-            get { return IExecuteWithSignatureArray<char>("getDigits", "()[C"); }
+            return IExecuteWithSignature<char>("getPercent", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDigitStrings()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setDigitStrings(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPerMill()"/>
         /// </summary>
-        public Java.Lang.String[] DigitStrings
+        /// <returns><see cref="char"/></returns>
+        public char GetPerMill()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getDigitStrings", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setDigitStrings", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<char>("getPerMill", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getExponentMultiplicationSign()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setExponentMultiplicationSign(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPlusSign()"/>
         /// </summary>
-        public Java.Lang.String ExponentMultiplicationSign
+        /// <returns><see cref="char"/></returns>
+        public char GetPlusSign()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getExponentMultiplicationSign", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setExponentMultiplicationSign", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<char>("getPlusSign", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getExponentSeparator()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setExponentSeparator(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getSignificantDigit()"/>
         /// </summary>
-        public Java.Lang.String ExponentSeparator
+        /// <returns><see cref="char"/></returns>
+        public char GetSignificantDigit()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getExponentSeparator", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setExponentSeparator", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<char>("getSignificantDigit", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getGroupingSeparator()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setGroupingSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getZeroDigit()"/>
         /// </summary>
-        public char GroupingSeparator
+        /// <returns><see cref="char"/></returns>
+        public char GetZeroDigit()
         {
-            get { return IExecuteWithSignature<char>("getGroupingSeparator", "()C"); } set { IExecuteWithSignature("setGroupingSeparator", "(C)V", value); }
+            return IExecuteWithSignature<char>("getZeroDigit", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getGroupingSeparatorString()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setGroupingSeparatorString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDigits()"/>
         /// </summary>
-        public Java.Lang.String GroupingSeparatorString
+        /// <returns><see cref="char"/></returns>
+        public char[] GetDigits()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGroupingSeparatorString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setGroupingSeparatorString", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<char>("getDigits", "()[C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getInfinity()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setInfinity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getCurrencySymbol()"/>
         /// </summary>
-        public Java.Lang.String Infinity
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCurrencySymbol()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInfinity", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setInfinity", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getCurrencySymbol", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getInternationalCurrencySymbol()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setInternationalCurrencySymbol(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDecimalSeparatorString()"/>
         /// </summary>
-        public Java.Lang.String InternationalCurrencySymbol
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDecimalSeparatorString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInternationalCurrencySymbol", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setInternationalCurrencySymbol", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDecimalSeparatorString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getExponentMultiplicationSign()"/>
         /// </summary>
-        public Java.Util.Locale Locale
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetExponentMultiplicationSign()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getExponentMultiplicationSign", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getExponentSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetExponentSeparator()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getExponentSeparator", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getGroupingSeparatorString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGroupingSeparatorString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGroupingSeparatorString", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getInfinity()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInfinity()
         {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInfinity", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMinusSign()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMinusSign(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getInternationalCurrencySymbol()"/>
         /// </summary>
-        public char MinusSign
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInternationalCurrencySymbol()
         {
-            get { return IExecuteWithSignature<char>("getMinusSign", "()C"); } set { IExecuteWithSignature("setMinusSign", "(C)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getInternationalCurrencySymbol", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMinusSignString()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMinusSignString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMinusSignString()"/>
         /// </summary>
-        public Java.Lang.String MinusSignString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMinusSignString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMinusSignString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setMinusSignString", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getMinusSignString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMonetaryDecimalSeparator()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMonetaryDecimalSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMonetaryDecimalSeparatorString()"/>
         /// </summary>
-        public char MonetaryDecimalSeparator
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMonetaryDecimalSeparatorString()
         {
-            get { return IExecuteWithSignature<char>("getMonetaryDecimalSeparator", "()C"); } set { IExecuteWithSignature("setMonetaryDecimalSeparator", "(C)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getMonetaryDecimalSeparatorString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMonetaryDecimalSeparatorString()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMonetaryDecimalSeparatorString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMonetaryGroupingSeparatorString()"/>
         /// </summary>
-        public Java.Lang.String MonetaryDecimalSeparatorString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMonetaryGroupingSeparatorString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMonetaryDecimalSeparatorString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setMonetaryDecimalSeparatorString", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getMonetaryGroupingSeparatorString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMonetaryGroupingSeparator()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMonetaryGroupingSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getNaN()"/>
         /// </summary>
-        public char MonetaryGroupingSeparator
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNaN()
         {
-            get { return IExecuteWithSignature<char>("getMonetaryGroupingSeparator", "()C"); } set { IExecuteWithSignature("setMonetaryGroupingSeparator", "(C)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getNaN", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getMonetaryGroupingSeparatorString()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMonetaryGroupingSeparatorString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPatternForCurrencySpacing(int,boolean)"/>
         /// </summary>
-        public Java.Lang.String MonetaryGroupingSeparatorString
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPatternForCurrencySpacing(int arg0, bool arg1)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMonetaryGroupingSeparatorString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setMonetaryGroupingSeparatorString", "(Ljava/lang/String;)V", value); }
+            return IExecute<Java.Lang.String>("getPatternForCurrencySpacing", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getNaN()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setNaN(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPercentString()"/>
         /// </summary>
-        public Java.Lang.String NaN
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPercentString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNaN", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNaN", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPercentString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPadEscape()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPadEscape(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPerMillString()"/>
         /// </summary>
-        public char PadEscape
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPerMillString()
         {
-            get { return IExecuteWithSignature<char>("getPadEscape", "()C"); } set { IExecuteWithSignature("setPadEscape", "(C)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPerMillString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPatternSeparator()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPatternSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPlusSignString()"/>
         /// </summary>
-        public char PatternSeparator
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPlusSignString()
         {
-            get { return IExecuteWithSignature<char>("getPatternSeparator", "()C"); } set { IExecuteWithSignature("setPatternSeparator", "(C)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPlusSignString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPercent()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPercent(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getDigitStrings()"/>
         /// </summary>
-        public char Percent
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetDigitStrings()
         {
-            get { return IExecuteWithSignature<char>("getPercent", "()C"); } set { IExecuteWithSignature("setPercent", "(C)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getDigitStrings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPercentString()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPercentString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getLocale()"/>
         /// </summary>
-        public Java.Lang.String PercentString
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPercentString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPercentString", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPerMill()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPerMill(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setCurrency(android.icu.util.Currency)"/>
         /// </summary>
-        public char PerMill
+        /// <param name="arg0"><see cref="Android.Icu.Util.Currency"/></param>
+        public void SetCurrency(Android.Icu.Util.Currency arg0)
         {
-            get { return IExecuteWithSignature<char>("getPerMill", "()C"); } set { IExecuteWithSignature("setPerMill", "(C)V", value); }
+            IExecuteWithSignature("setCurrency", "(Landroid/icu/util/Currency;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPerMillString()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPerMillString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setCurrencySymbol(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String PerMillString
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetCurrencySymbol(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPerMillString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPerMillString", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setCurrencySymbol", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPlusSign()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPlusSign(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setDecimalSeparator(char)"/>
         /// </summary>
-        public char PlusSign
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetDecimalSeparator(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getPlusSign", "()C"); } set { IExecuteWithSignature("setPlusSign", "(C)V", value); }
+            IExecuteWithSignature("setDecimalSeparator", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPlusSignString()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPlusSignString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setDecimalSeparatorString(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String PlusSignString
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDecimalSeparatorString(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPlusSignString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPlusSignString", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setDecimalSeparatorString", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getSignificantDigit()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setSignificantDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setDigit(char)"/>
         /// </summary>
-        public char SignificantDigit
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetDigit(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getSignificantDigit", "()C"); } set { IExecuteWithSignature("setSignificantDigit", "(C)V", value); }
+            IExecuteWithSignature("setDigit", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getULocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setDigitStrings(java.lang.String[])"/>
         /// </summary>
-        public Android.Icu.Util.ULocale ULocale
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDigitStrings(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getULocale", "()Landroid/icu/util/ULocale;"); }
+            IExecuteWithSignature("setDigitStrings", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getZeroDigit()"/> <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setZeroDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setExponentMultiplicationSign(java.lang.String)"/>
         /// </summary>
-        public char ZeroDigit
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetExponentMultiplicationSign(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<char>("getZeroDigit", "()C"); } set { IExecuteWithSignature("setZeroDigit", "(C)V", value); }
+            IExecuteWithSignature("setExponentMultiplicationSign", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#getPatternForCurrencySpacing(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setExponentSeparator(java.lang.String)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetPatternForCurrencySpacing(int arg0, bool arg1)
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetExponentSeparator(Java.Lang.String arg0)
         {
-            return IExecute<Java.Lang.String>("getPatternForCurrencySpacing", arg0, arg1);
+            IExecuteWithSignature("setExponentSeparator", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setGroupingSeparator(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetGroupingSeparator(char arg0)
+        {
+            IExecuteWithSignature("setGroupingSeparator", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setGroupingSeparatorString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetGroupingSeparatorString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setGroupingSeparatorString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setInfinity(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetInfinity(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setInfinity", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setInternationalCurrencySymbol(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetInternationalCurrencySymbol(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setInternationalCurrencySymbol", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMinusSign(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetMinusSign(char arg0)
+        {
+            IExecuteWithSignature("setMinusSign", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMinusSignString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetMinusSignString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setMinusSignString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMonetaryDecimalSeparator(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetMonetaryDecimalSeparator(char arg0)
+        {
+            IExecuteWithSignature("setMonetaryDecimalSeparator", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMonetaryDecimalSeparatorString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetMonetaryDecimalSeparatorString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setMonetaryDecimalSeparatorString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMonetaryGroupingSeparator(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetMonetaryGroupingSeparator(char arg0)
+        {
+            IExecuteWithSignature("setMonetaryGroupingSeparator", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setMonetaryGroupingSeparatorString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetMonetaryGroupingSeparatorString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setMonetaryGroupingSeparatorString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setNaN(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNaN(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setNaN", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPadEscape(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPadEscape(char arg0)
+        {
+            IExecuteWithSignature("setPadEscape", "(C)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPatternForCurrencySpacing(int,boolean,java.lang.String)"/>
@@ -390,6 +585,78 @@ public void SetPatternForCurrencySpacing(int arg0, bool arg1, Java.Lang.String a
         {
             IExecute("setPatternForCurrencySpacing", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPatternSeparator(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPatternSeparator(char arg0)
+        {
+            IExecuteWithSignature("setPatternSeparator", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPercent(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPercent(char arg0)
+        {
+            IExecuteWithSignature("setPercent", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPercentString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPercentString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPercentString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPerMill(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPerMill(char arg0)
+        {
+            IExecuteWithSignature("setPerMill", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPerMillString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPerMillString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPerMillString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPlusSign(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPlusSign(char arg0)
+        {
+            IExecuteWithSignature("setPlusSign", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setPlusSignString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPlusSignString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPlusSignString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setSignificantDigit(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetSignificantDigit(char arg0)
+        {
+            IExecuteWithSignature("setSignificantDigit", "(C)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/DecimalFormatSymbols.html#setZeroDigit(char)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetZeroDigit(char arg0)
+        {
+            IExecuteWithSignature("setZeroDigit", "(C)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/Edits.cs b/src/net/Netdroid/Generated/Android/Icu/Text/Edits.cs
index 19061c7cd..68f2ec09f 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/Edits.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/Edits.cs
@@ -46,42 +46,46 @@ public partial class Edits
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#getCoarseChangesIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#mergeAndAppend(android.icu.text.Edits,android.icu.text.Edits)"/>
         /// </summary>
-        public Android.Icu.Text.Edits.Iterator CoarseChangesIterator
+        /// <param name="arg0"><see cref="Android.Icu.Text.Edits"/></param>
+        /// <param name="arg1"><see cref="Android.Icu.Text.Edits"/></param>
+        /// <returns><see cref="Android.Icu.Text.Edits"/></returns>
+        public Android.Icu.Text.Edits MergeAndAppend(Android.Icu.Text.Edits arg0, Android.Icu.Text.Edits arg1)
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.Edits.Iterator>("getCoarseChangesIterator", "()Landroid/icu/text/Edits$Iterator;"); }
+            return IExecute<Android.Icu.Text.Edits>("mergeAndAppend", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#getCoarseIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#getCoarseChangesIterator()"/>
         /// </summary>
-        public Android.Icu.Text.Edits.Iterator CoarseIterator
+        /// <returns><see cref="Android.Icu.Text.Edits.Iterator"/></returns>
+        public Android.Icu.Text.Edits.Iterator GetCoarseChangesIterator()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.Edits.Iterator>("getCoarseIterator", "()Landroid/icu/text/Edits$Iterator;"); }
+            return IExecuteWithSignature<Android.Icu.Text.Edits.Iterator>("getCoarseChangesIterator", "()Landroid/icu/text/Edits$Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#getFineChangesIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#getCoarseIterator()"/>
         /// </summary>
-        public Android.Icu.Text.Edits.Iterator FineChangesIterator
+        /// <returns><see cref="Android.Icu.Text.Edits.Iterator"/></returns>
+        public Android.Icu.Text.Edits.Iterator GetCoarseIterator()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.Edits.Iterator>("getFineChangesIterator", "()Landroid/icu/text/Edits$Iterator;"); }
+            return IExecuteWithSignature<Android.Icu.Text.Edits.Iterator>("getCoarseIterator", "()Landroid/icu/text/Edits$Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#getFineIterator()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#getFineChangesIterator()"/>
         /// </summary>
-        public Android.Icu.Text.Edits.Iterator FineIterator
+        /// <returns><see cref="Android.Icu.Text.Edits.Iterator"/></returns>
+        public Android.Icu.Text.Edits.Iterator GetFineChangesIterator()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.Edits.Iterator>("getFineIterator", "()Landroid/icu/text/Edits$Iterator;"); }
+            return IExecuteWithSignature<Android.Icu.Text.Edits.Iterator>("getFineChangesIterator", "()Landroid/icu/text/Edits$Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#mergeAndAppend(android.icu.text.Edits,android.icu.text.Edits)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#getFineIterator()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Text.Edits"/></param>
-        /// <param name="arg1"><see cref="Android.Icu.Text.Edits"/></param>
-        /// <returns><see cref="Android.Icu.Text.Edits"/></returns>
-        public Android.Icu.Text.Edits MergeAndAppend(Android.Icu.Text.Edits arg0, Android.Icu.Text.Edits arg1)
+        /// <returns><see cref="Android.Icu.Text.Edits.Iterator"/></returns>
+        public Android.Icu.Text.Edits.Iterator GetFineIterator()
         {
-            return IExecute<Android.Icu.Text.Edits>("mergeAndAppend", arg0, arg1);
+            return IExecuteWithSignature<Android.Icu.Text.Edits.Iterator>("getFineIterator", "()Landroid/icu/text/Edits$Iterator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Edits.html#hasChanges()"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/FormattedValue.cs b/src/net/Netdroid/Generated/Android/Icu/Text/FormattedValue.cs
index d7eee9130..e0427d874 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/FormattedValue.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/FormattedValue.cs
@@ -69,9 +69,9 @@ public partial class FormattedValue : Android.Icu.Text.IFormattedValue
         /// <param name="arg0"><typeparamref name="A"/></param>
         /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
-        public A AppendTo<A>(A arg0) where A: Java.Lang.IAppendable, new()
+        public A AppendTo<A>(A arg0) where A : Java.Lang.IAppendable, new()
         {
-            return IExecuteWithSignature<A>("appendTo", "(Ljava/lang/Appendable;)Ljava/lang/Appendable;", arg0);
+            return IExecute<A>("appendTo", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/FormattedValue.html#nextPosition(android.icu.text.ConstrainedFieldPosition)"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/IDNA.cs b/src/net/Netdroid/Generated/Android/Icu/Text/IDNA.cs
index c3ec307f6..5c7bf63a3 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/IDNA.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/IDNA.cs
@@ -303,13 +303,6 @@ public partial class Info
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/IDNA.Info.html#getErrors()"/> 
-            /// </summary>
-            public Java.Util.Set<Android.Icu.Text.IDNA.Error> Errors
-            {
-                get { return IExecuteWithSignature<Java.Util.Set<Android.Icu.Text.IDNA.Error>>("getErrors", "()Ljava/util/Set;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/IDNA.Info.html#hasErrors()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -325,6 +318,14 @@ public bool IsTransitionalDifferent()
             {
                 return IExecuteWithSignature<bool>("isTransitionalDifferent", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/icu/text/IDNA.Info.html#getErrors()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Android.Icu.Text.IDNA.Error> GetErrors()
+            {
+                return IExecuteWithSignature<Java.Util.Set<Android.Icu.Text.IDNA.Error>>("getErrors", "()Ljava/util/Set;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/ListFormatter.cs b/src/net/Netdroid/Generated/Android/Icu/Text/ListFormatter.cs
index 16fa4803f..9a5a6f1f1 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/ListFormatter.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/ListFormatter.cs
@@ -42,11 +42,12 @@ public partial class ListFormatter
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/ListFormatter.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/ListFormatter.html#getInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.ListFormatter Instance
+        /// <returns><see cref="Android.Icu.Text.ListFormatter"/></returns>
+        public static Android.Icu.Text.ListFormatter GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.ListFormatter>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/ListFormatter;"); }
+            return SExecuteWithSignature<Android.Icu.Text.ListFormatter>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/ListFormatter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/ListFormatter.html#getInstance(android.icu.util.ULocale,android.icu.text.ListFormatter.Type,android.icu.text.ListFormatter.Width)"/>
@@ -167,9 +168,9 @@ public partial class FormattedList
             /// <param name="arg0"><typeparamref name="A"/></param>
             /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
             /// <returns><typeparamref name="A"/></returns>
-            public A AppendTo<A>(A arg0) where A: Java.Lang.IAppendable, new()
+            public A AppendTo<A>(A arg0) where A : Java.Lang.IAppendable, new()
             {
-                return IExecuteWithSignature<A>("appendTo", "(Ljava/lang/Appendable;)Ljava/lang/Appendable;", arg0);
+                return IExecute<A>("appendTo", arg0);
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/ListFormatter.FormattedList.html#nextPosition(android.icu.text.ConstrainedFieldPosition)"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/LocaleDisplayNames.cs b/src/net/Netdroid/Generated/Android/Icu/Text/LocaleDisplayNames.cs
index f6e476b1a..0ebc499f7 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/LocaleDisplayNames.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/LocaleDisplayNames.cs
@@ -94,27 +94,29 @@ public static Android.Icu.Text.LocaleDisplayNames GetInstance(Java.Util.Locale a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/LocaleDisplayNames.html#getDialectHandling()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/LocaleDisplayNames.html#getContext(android.icu.text.DisplayContext.Type)"/>
         /// </summary>
-        public Android.Icu.Text.LocaleDisplayNames.DialectHandling GetDialectHandling
+        /// <param name="arg0"><see cref="Android.Icu.Text.DisplayContext.Type"/></param>
+        /// <returns><see cref="Android.Icu.Text.DisplayContext"/></returns>
+        public Android.Icu.Text.DisplayContext GetContext(Android.Icu.Text.DisplayContext.Type arg0)
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.LocaleDisplayNames.DialectHandling>("getDialectHandling", "()Landroid/icu/text/LocaleDisplayNames$DialectHandling;"); }
+            return IExecuteWithSignature<Android.Icu.Text.DisplayContext>("getContext", "(Landroid/icu/text/DisplayContext$Type;)Landroid/icu/text/DisplayContext;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/LocaleDisplayNames.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/LocaleDisplayNames.html#getDialectHandling()"/>
         /// </summary>
-        public Android.Icu.Util.ULocale Locale
+        /// <returns><see cref="Android.Icu.Text.LocaleDisplayNames.DialectHandling"/></returns>
+        public Android.Icu.Text.LocaleDisplayNames.DialectHandling GetDialectHandling()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;"); }
+            return IExecuteWithSignature<Android.Icu.Text.LocaleDisplayNames.DialectHandling>("getDialectHandling", "()Landroid/icu/text/LocaleDisplayNames$DialectHandling;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/LocaleDisplayNames.html#getContext(android.icu.text.DisplayContext.Type)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/LocaleDisplayNames.html#getLocale()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Text.DisplayContext.Type"/></param>
-        /// <returns><see cref="Android.Icu.Text.DisplayContext"/></returns>
-        public Android.Icu.Text.DisplayContext GetContext(Android.Icu.Text.DisplayContext.Type arg0)
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetLocale()
         {
-            return IExecuteWithSignature<Android.Icu.Text.DisplayContext>("getContext", "(Landroid/icu/text/DisplayContext$Type;)Landroid/icu/text/DisplayContext;", arg0);
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/LocaleDisplayNames.html#keyDisplayName(java.lang.String)"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/MeasureFormat.cs b/src/net/Netdroid/Generated/Android/Icu/Text/MeasureFormat.cs
index d959d74d0..059e5ac3b 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/MeasureFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/MeasureFormat.cs
@@ -42,11 +42,12 @@ public partial class MeasureFormat
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getCurrencyFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getCurrencyFormat()"/>
         /// </summary>
-        public static Android.Icu.Text.MeasureFormat CurrencyFormat
+        /// <returns><see cref="Android.Icu.Text.MeasureFormat"/></returns>
+        public static Android.Icu.Text.MeasureFormat GetCurrencyFormat()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.MeasureFormat>(LocalBridgeClazz, "getCurrencyFormat", "()Landroid/icu/text/MeasureFormat;"); }
+            return SExecuteWithSignature<Android.Icu.Text.MeasureFormat>(LocalBridgeClazz, "getCurrencyFormat", "()Landroid/icu/text/MeasureFormat;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getCurrencyFormat(android.icu.util.ULocale)"/>
@@ -113,25 +114,28 @@ public static Android.Icu.Text.MeasureFormat GetInstance(Java.Util.Locale arg0,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getWidth()"/>
         /// </summary>
-        public Android.Icu.Util.ULocale Locale
+        /// <returns><see cref="Android.Icu.Text.MeasureFormat.FormatWidth"/></returns>
+        public Android.Icu.Text.MeasureFormat.FormatWidth GetWidth()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;"); }
+            return IExecuteWithSignature<Android.Icu.Text.MeasureFormat.FormatWidth>("getWidth", "()Landroid/icu/text/MeasureFormat$FormatWidth;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getNumberFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getNumberFormat()"/>
         /// </summary>
-        public Android.Icu.Text.NumberFormat NumberFormat
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public Android.Icu.Text.NumberFormat GetNumberFormat()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.NumberFormat>("getNumberFormat", "()Landroid/icu/text/NumberFormat;"); }
+            return IExecuteWithSignature<Android.Icu.Text.NumberFormat>("getNumberFormat", "()Landroid/icu/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#getLocale()"/>
         /// </summary>
-        public Android.Icu.Text.MeasureFormat.FormatWidth Width
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetLocale()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.MeasureFormat.FormatWidth>("getWidth", "()Landroid/icu/text/MeasureFormat$FormatWidth;"); }
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MeasureFormat.html#formatMeasures(android.icu.util.Measure[])"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/MessageFormat.cs b/src/net/Netdroid/Generated/Android/Icu/Text/MessageFormat.cs
index 946959f50..dd9224378 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/MessageFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/MessageFormat.cs
@@ -101,46 +101,20 @@ public static Java.Lang.String Format(Java.Lang.String arg0, Java.Util.Map<Java.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getApostropheMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getApostropheMode()"/>
         /// </summary>
-        public Android.Icu.Text.MessagePattern.ApostropheMode ApostropheMode
+        /// <returns><see cref="Android.Icu.Text.MessagePattern.ApostropheMode"/></returns>
+        public Android.Icu.Text.MessagePattern.ApostropheMode GetApostropheMode()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.MessagePattern.ApostropheMode>("getApostropheMode", "()Landroid/icu/text/MessagePattern$ApostropheMode;"); }
+            return IExecuteWithSignature<Android.Icu.Text.MessagePattern.ApostropheMode>("getApostropheMode", "()Landroid/icu/text/MessagePattern$ApostropheMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getArgumentNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getULocale()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> ArgumentNames
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetULocale()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getArgumentNames", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getFormats()"/> <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#setFormats(java.text.Format[])"/>
-        /// </summary>
-        public Java.Text.Format[] Formats
-        {
-            get { return IExecuteWithSignatureArray<Java.Text.Format>("getFormats", "()[Ljava/text/Format;"); } set { IExecuteWithSignature("setFormats", "([Ljava/text/Format;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getFormatsByArgumentIndex()"/> <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#setFormatsByArgumentIndex(java.text.Format[])"/>
-        /// </summary>
-        public Java.Text.Format[] FormatsByArgumentIndex
-        {
-            get { return IExecuteWithSignatureArray<Java.Text.Format>("getFormatsByArgumentIndex", "()[Ljava/text/Format;"); } set { IExecuteWithSignature("setFormatsByArgumentIndex", "([Ljava/text/Format;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getLocale()"/> 
-        /// </summary>
-        public Java.Util.Locale Locale
-        {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getULocale()"/> 
-        /// </summary>
-        public Android.Icu.Util.ULocale ULocale
-        {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getULocale", "()Landroid/icu/util/ULocale;"); }
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getULocale", "()Landroid/icu/util/ULocale;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#usesNamedArguments()"/>
@@ -210,6 +184,30 @@ public Java.Text.Format GetFormatByArgumentName(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Text.Format>("getFormatByArgumentName", "(Ljava/lang/String;)Ljava/text/Format;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getFormats()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.Format"/></returns>
+        public Java.Text.Format[] GetFormats()
+        {
+            return IExecuteWithSignatureArray<Java.Text.Format>("getFormats", "()[Ljava/text/Format;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getFormatsByArgumentIndex()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.Format"/></returns>
+        public Java.Text.Format[] GetFormatsByArgumentIndex()
+        {
+            return IExecuteWithSignatureArray<Java.Text.Format>("getFormatsByArgumentIndex", "()[Ljava/text/Format;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getLocale()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
+        {
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#parseToMap(java.lang.String,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -230,6 +228,14 @@ public Java.Text.Format GetFormatByArgumentName(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, object>>("parseToMap", "(Ljava/lang/String;)Ljava/util/Map;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#getArgumentNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetArgumentNames()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getArgumentNames", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#applyPattern(java.lang.String,android.icu.text.MessagePattern.ApostropheMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -274,6 +280,22 @@ public void SetFormatByArgumentName(Java.Lang.String arg0, Java.Text.Format arg1
             IExecute("setFormatByArgumentName", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#setFormats(java.text.Format[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Text.Format"/></param>
+        public void SetFormats(Java.Text.Format[] arg0)
+        {
+            IExecuteWithSignature("setFormats", "([Ljava/text/Format;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#setFormatsByArgumentIndex(java.text.Format[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Text.Format"/></param>
+        public void SetFormatsByArgumentIndex(Java.Text.Format[] arg0)
+        {
+            IExecuteWithSignature("setFormatsByArgumentIndex", "([Ljava/text/Format;)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MessageFormat.html#setFormatsByArgumentName(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/MessagePattern.cs b/src/net/Netdroid/Generated/Android/Icu/Text/MessagePattern.cs
index b8a2b4377..eba64f534 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/MessagePattern.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/MessagePattern.cs
@@ -97,20 +97,6 @@ public static int ValidateArgumentName(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.html#getApostropheMode()"/> 
-        /// </summary>
-        public Android.Icu.Text.MessagePattern.ApostropheMode GetApostropheMode
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.MessagePattern.ApostropheMode>("getApostropheMode", "()Landroid/icu/text/MessagePattern$ApostropheMode;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.html#getPatternString()"/> 
-        /// </summary>
-        public Java.Lang.String PatternString
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPatternString", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -147,6 +133,14 @@ public Android.Icu.Text.MessagePattern ParseSelectStyle(Java.Lang.String arg0)
             return IExecuteWithSignature<Android.Icu.Text.MessagePattern>("parseSelectStyle", "(Ljava/lang/String;)Landroid/icu/text/MessagePattern;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.html#getApostropheMode()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.MessagePattern.ApostropheMode"/></returns>
+        public Android.Icu.Text.MessagePattern.ApostropheMode GetApostropheMode()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.MessagePattern.ApostropheMode>("getApostropheMode", "()Landroid/icu/text/MessagePattern$ApostropheMode;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.html#getPart(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -267,6 +261,14 @@ public Java.Lang.String AutoQuoteApostropheDeep()
             return IExecuteWithSignature<Java.Lang.String>("autoQuoteApostropheDeep", "()Ljava/lang/String;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.html#getPatternString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPatternString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPatternString", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.html#getSubstring(android.icu.text.MessagePattern.Part)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.MessagePattern.Part"/></param>
@@ -467,46 +469,52 @@ public partial class Part
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getArgType()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getArgType()"/>
             /// </summary>
-            public Android.Icu.Text.MessagePattern.ArgType GetArgType
+            /// <returns><see cref="Android.Icu.Text.MessagePattern.ArgType"/></returns>
+            public Android.Icu.Text.MessagePattern.ArgType GetArgType()
             {
-                get { return IExecuteWithSignature<Android.Icu.Text.MessagePattern.ArgType>("getArgType", "()Landroid/icu/text/MessagePattern$ArgType;"); }
+                return IExecuteWithSignature<Android.Icu.Text.MessagePattern.ArgType>("getArgType", "()Landroid/icu/text/MessagePattern$ArgType;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getType()"/>
             /// </summary>
-            public int Index
+            /// <returns><see cref="Android.Icu.Text.MessagePattern.Part.Type"/></returns>
+            public Android.Icu.Text.MessagePattern.Part.Type GetType()
             {
-                get { return IExecuteWithSignature<int>("getIndex", "()I"); }
+                return IExecuteWithSignature<Android.Icu.Text.MessagePattern.Part.Type>("getType", "()Landroid/icu/text/MessagePattern$Part$Type;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getLength()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getIndex()"/>
             /// </summary>
-            public int Length
+            /// <returns><see cref="int"/></returns>
+            public int GetIndex()
             {
-                get { return IExecuteWithSignature<int>("getLength", "()I"); }
+                return IExecuteWithSignature<int>("getIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getLimit()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getLength()"/>
             /// </summary>
-            public int Limit
+            /// <returns><see cref="int"/></returns>
+            public int GetLength()
             {
-                get { return IExecuteWithSignature<int>("getLimit", "()I"); }
+                return IExecuteWithSignature<int>("getLength", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getLimit()"/>
             /// </summary>
-            public Android.Icu.Text.MessagePattern.Part.Type Type
+            /// <returns><see cref="int"/></returns>
+            public int GetLimit()
             {
-                get { return IExecuteWithSignature<Android.Icu.Text.MessagePattern.Part.Type>("getType", "()Landroid/icu/text/MessagePattern$Part$Type;"); }
+                return IExecuteWithSignature<int>("getLimit", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/text/MessagePattern.Part.html#getValue()"/>
             /// </summary>
-            public int Value
+            /// <returns><see cref="int"/></returns>
+            public int GetValue()
             {
-                get { return IExecuteWithSignature<int>("getValue", "()I"); }
+                return IExecuteWithSignature<int>("getValue", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/Normalizer2.cs b/src/net/Netdroid/Generated/Android/Icu/Text/Normalizer2.cs
index cd3aed0ee..60c163329 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/Normalizer2.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/Normalizer2.cs
@@ -42,51 +42,56 @@ public partial class Normalizer2
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFCInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getInstance(java.io.InputStream,java.lang.String,android.icu.text.Normalizer2.Mode)"/>
         /// </summary>
-        public static Android.Icu.Text.Normalizer2 NFCInstance
+        /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg2"><see cref="Android.Icu.Text.Normalizer2.Mode"/></param>
+        /// <returns><see cref="Android.Icu.Text.Normalizer2"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Icu.Text.Normalizer2 GetInstance(Java.Io.InputStream arg0, Java.Lang.String arg1, Android.Icu.Text.Normalizer2.Mode arg2)
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFCInstance", "()Landroid/icu/text/Normalizer2;"); }
+            return SExecute<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFDInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFCInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.Normalizer2 NFDInstance
+        /// <returns><see cref="Android.Icu.Text.Normalizer2"/></returns>
+        public static Android.Icu.Text.Normalizer2 GetNFCInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFDInstance", "()Landroid/icu/text/Normalizer2;"); }
+            return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFCInstance", "()Landroid/icu/text/Normalizer2;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFKCCasefoldInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFDInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.Normalizer2 NFKCCasefoldInstance
+        /// <returns><see cref="Android.Icu.Text.Normalizer2"/></returns>
+        public static Android.Icu.Text.Normalizer2 GetNFDInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFKCCasefoldInstance", "()Landroid/icu/text/Normalizer2;"); }
+            return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFDInstance", "()Landroid/icu/text/Normalizer2;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFKCInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFKCCasefoldInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.Normalizer2 NFKCInstance
+        /// <returns><see cref="Android.Icu.Text.Normalizer2"/></returns>
+        public static Android.Icu.Text.Normalizer2 GetNFKCCasefoldInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFKCInstance", "()Landroid/icu/text/Normalizer2;"); }
+            return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFKCCasefoldInstance", "()Landroid/icu/text/Normalizer2;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFKDInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFKCInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.Normalizer2 NFKDInstance
+        /// <returns><see cref="Android.Icu.Text.Normalizer2"/></returns>
+        public static Android.Icu.Text.Normalizer2 GetNFKCInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFKDInstance", "()Landroid/icu/text/Normalizer2;"); }
+            return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFKCInstance", "()Landroid/icu/text/Normalizer2;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getInstance(java.io.InputStream,java.lang.String,android.icu.text.Normalizer2.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Normalizer2.html#getNFKDInstance()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Android.Icu.Text.Normalizer2.Mode"/></param>
         /// <returns><see cref="Android.Icu.Text.Normalizer2"/></returns>
-        [System.Obsolete()]
-        public static Android.Icu.Text.Normalizer2 GetInstance(Java.Io.InputStream arg0, Java.Lang.String arg1, Android.Icu.Text.Normalizer2.Mode arg2)
+        public static Android.Icu.Text.Normalizer2 GetNFKDInstance()
         {
-            return SExecute<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getInstance", arg0, arg1, arg2);
+            return SExecuteWithSignature<Android.Icu.Text.Normalizer2>(LocalBridgeClazz, "getNFKDInstance", "()Landroid/icu/text/Normalizer2;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/NumberFormat.cs b/src/net/Netdroid/Generated/Android/Icu/Text/NumberFormat.cs
index 439be6b39..47c053b2d 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/NumberFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/NumberFormat.cs
@@ -114,55 +114,6 @@ public partial class NumberFormat
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getAvailableLocales()"/> 
-        /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getCurrencyInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.NumberFormat CurrencyInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getCurrencyInstance", "()Landroid/icu/text/NumberFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.NumberFormat Instance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/NumberFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getIntegerInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.NumberFormat IntegerInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getIntegerInstance", "()Landroid/icu/text/NumberFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getNumberInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.NumberFormat NumberInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getNumberInstance", "()Landroid/icu/text/NumberFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getPercentInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.NumberFormat PercentInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getPercentInstance", "()Landroid/icu/text/NumberFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getScientificInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.NumberFormat ScientificInstance
-        {
-            get { return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getScientificInstance", "()Landroid/icu/text/NumberFormat;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getCurrencyInstance(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -291,61 +242,75 @@ public static Android.Icu.Text.NumberFormat GetScientificInstance(Java.Util.Loca
             return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getScientificInstance", "(Ljava/util/Locale;)Landroid/icu/text/NumberFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getInstance(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getCurrencyInstance()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
-        public static Android.Icu.Text.NumberFormat GetInstance(int arg0)
+        public static Android.Icu.Text.NumberFormat GetCurrencyInstance()
         {
-            return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getInstance", "(I)Landroid/icu/text/NumberFormat;", arg0);
+            return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getCurrencyInstance", "()Landroid/icu/text/NumberFormat;");
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getCurrency()"/> <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setCurrency(android.icu.util.Currency)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getInstance()"/>
         /// </summary>
-        public Android.Icu.Util.Currency Currency
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public static Android.Icu.Text.NumberFormat GetInstance()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.Currency>("getCurrency", "()Landroid/icu/util/Currency;"); } set { IExecuteWithSignature("setCurrency", "(Landroid/icu/util/Currency;)V", value); }
+            return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getMaximumFractionDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setMaximumFractionDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getInstance(int)"/>
         /// </summary>
-        public int MaximumFractionDigits
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public static Android.Icu.Text.NumberFormat GetInstance(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getMaximumFractionDigits", "()I"); } set { IExecuteWithSignature("setMaximumFractionDigits", "(I)V", value); }
+            return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getInstance", "(I)Landroid/icu/text/NumberFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getMaximumIntegerDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setMaximumIntegerDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getIntegerInstance()"/>
         /// </summary>
-        public int MaximumIntegerDigits
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public static Android.Icu.Text.NumberFormat GetIntegerInstance()
         {
-            get { return IExecuteWithSignature<int>("getMaximumIntegerDigits", "()I"); } set { IExecuteWithSignature("setMaximumIntegerDigits", "(I)V", value); }
+            return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getIntegerInstance", "()Landroid/icu/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getMinimumFractionDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setMinimumFractionDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getNumberInstance()"/>
         /// </summary>
-        public int MinimumFractionDigits
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public static Android.Icu.Text.NumberFormat GetNumberInstance()
         {
-            get { return IExecuteWithSignature<int>("getMinimumFractionDigits", "()I"); } set { IExecuteWithSignature("setMinimumFractionDigits", "(I)V", value); }
+            return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getNumberInstance", "()Landroid/icu/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getMinimumIntegerDigits()"/> <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setMinimumIntegerDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getPercentInstance()"/>
         /// </summary>
-        public int MinimumIntegerDigits
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public static Android.Icu.Text.NumberFormat GetPercentInstance()
         {
-            get { return IExecuteWithSignature<int>("getMinimumIntegerDigits", "()I"); } set { IExecuteWithSignature("setMinimumIntegerDigits", "(I)V", value); }
+            return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getPercentInstance", "()Landroid/icu/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getRoundingMode()"/> <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setRoundingMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getScientificInstance()"/>
         /// </summary>
-        public int RoundingMode
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public static Android.Icu.Text.NumberFormat GetScientificInstance()
         {
-            get { return IExecuteWithSignature<int>("getRoundingMode", "()I"); } set { IExecuteWithSignature("setRoundingMode", "(I)V", value); }
+            return SExecuteWithSignature<Android.Icu.Text.NumberFormat>(LocalBridgeClazz, "getScientificInstance", "()Landroid/icu/text/NumberFormat;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getAvailableLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
+        {
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
+        }
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#parse(java.lang.String,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -420,6 +385,14 @@ public Android.Icu.Text.DisplayContext GetContext(Android.Icu.Text.DisplayContex
             return IExecuteWithSignature<Android.Icu.Text.DisplayContext>("getContext", "(Landroid/icu/text/DisplayContext$Type;)Landroid/icu/text/DisplayContext;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getCurrency()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.Currency"/></returns>
+        public Android.Icu.Util.Currency GetCurrency()
+        {
+            return IExecuteWithSignature<Android.Icu.Util.Currency>("getCurrency", "()Landroid/icu/util/Currency;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#parseCurrency(java.lang.CharSequence,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -508,6 +481,46 @@ public Java.Lang.String Format(long arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(J)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getMaximumFractionDigits()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumFractionDigits()
+        {
+            return IExecuteWithSignature<int>("getMaximumFractionDigits", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getMaximumIntegerDigits()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumIntegerDigits()
+        {
+            return IExecuteWithSignature<int>("getMaximumIntegerDigits", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getMinimumFractionDigits()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumFractionDigits()
+        {
+            return IExecuteWithSignature<int>("getMinimumFractionDigits", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getMinimumIntegerDigits()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumIntegerDigits()
+        {
+            return IExecuteWithSignature<int>("getMinimumIntegerDigits", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#getRoundingMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRoundingMode()
+        {
+            return IExecuteWithSignature<int>("getRoundingMode", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -537,6 +550,14 @@ public void SetContext(Android.Icu.Text.DisplayContext arg0)
             IExecuteWithSignature("setContext", "(Landroid/icu/text/DisplayContext;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setCurrency(android.icu.util.Currency)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.Currency"/></param>
+        public void SetCurrency(Android.Icu.Util.Currency arg0)
+        {
+            IExecuteWithSignature("setCurrency", "(Landroid/icu/util/Currency;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setGroupingUsed(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -545,6 +566,38 @@ public void SetGroupingUsed(bool arg0)
             IExecuteWithSignature("setGroupingUsed", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setMaximumFractionDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaximumFractionDigits(int arg0)
+        {
+            IExecuteWithSignature("setMaximumFractionDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setMaximumIntegerDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaximumIntegerDigits(int arg0)
+        {
+            IExecuteWithSignature("setMaximumIntegerDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setMinimumFractionDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumFractionDigits(int arg0)
+        {
+            IExecuteWithSignature("setMinimumFractionDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setMinimumIntegerDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumIntegerDigits(int arg0)
+        {
+            IExecuteWithSignature("setMinimumIntegerDigits", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setParseIntegerOnly(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -560,6 +613,14 @@ public void SetParseStrict(bool arg0)
         {
             IExecuteWithSignature("setParseStrict", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberFormat.html#setRoundingMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRoundingMode(int arg0)
+        {
+            IExecuteWithSignature("setRoundingMode", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/NumberingSystem.cs b/src/net/Netdroid/Generated/Android/Icu/Text/NumberingSystem.cs
index fdd7b6100..af44e0128 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/NumberingSystem.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/NumberingSystem.cs
@@ -48,18 +48,12 @@ public partial class NumberingSystem
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getAvailableNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getInstance()"/>
         /// </summary>
-        public static Java.Lang.String[] AvailableNames
-        {
-            get { return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getAvailableNames", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Text.NumberingSystem Instance
+        /// <returns><see cref="Android.Icu.Text.NumberingSystem"/></returns>
+        public static Android.Icu.Text.NumberingSystem GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.NumberingSystem>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/NumberingSystem;"); }
+            return SExecuteWithSignature<Android.Icu.Text.NumberingSystem>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/NumberingSystem;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getInstance(android.icu.util.ULocale)"/>
@@ -108,38 +102,49 @@ public static bool IsValidDigitString(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isValidDigitString", "(Ljava/lang/String;)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getAvailableNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String[] GetAvailableNames()
+        {
+            return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getAvailableNames", "()[Ljava/lang/String;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#isAlgorithmic()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAlgorithmic()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isAlgorithmic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getRadix()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetRadix()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getRadix", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getRadix()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getDescription()"/>
         /// </summary>
-        public int Radix
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<int>("getRadix", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#isAlgorithmic()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/NumberingSystem.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAlgorithmic()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isAlgorithmic", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/PluralRules.cs b/src/net/Netdroid/Generated/Android/Icu/Text/PluralRules.cs
index 3c6d06113..039aa8033 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/PluralRules.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/PluralRules.cs
@@ -151,13 +151,6 @@ public static Android.Icu.Text.PluralRules ParseDescription(Java.Lang.String arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/PluralRules.html#getKeywords()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> Keywords
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKeywords", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/PluralRules.html#getUniqueKeywordValue(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -211,6 +204,14 @@ public Java.Lang.String Select(double arg0)
         {
             return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Double>>("getSamples", "(Ljava/lang/String;)Ljava/util/Collection;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/PluralRules.html#getKeywords()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetKeywords()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKeywords", "()Ljava/util/Set;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/RelativeDateTimeFormatter.cs b/src/net/Netdroid/Generated/Android/Icu/Text/RelativeDateTimeFormatter.cs
index 84a1d4e91..b2a87b844 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/RelativeDateTimeFormatter.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/RelativeDateTimeFormatter.cs
@@ -42,11 +42,12 @@ public partial class RelativeDateTimeFormatter
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getInstance()"/>
         /// </summary>
-        public static Android.Icu.Text.RelativeDateTimeFormatter Instance
+        /// <returns><see cref="Android.Icu.Text.RelativeDateTimeFormatter"/></returns>
+        public static Android.Icu.Text.RelativeDateTimeFormatter GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Text.RelativeDateTimeFormatter>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/RelativeDateTimeFormatter;"); }
+            return SExecuteWithSignature<Android.Icu.Text.RelativeDateTimeFormatter>(LocalBridgeClazz, "getInstance", "()Landroid/icu/text/RelativeDateTimeFormatter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getInstance(android.icu.util.ULocale,android.icu.text.NumberFormat,android.icu.text.RelativeDateTimeFormatter.Style,android.icu.text.DisplayContext)"/>
@@ -103,25 +104,20 @@ public static Android.Icu.Text.RelativeDateTimeFormatter GetInstance(Java.Util.L
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getCapitalizationContext()"/> 
-        /// </summary>
-        public Android.Icu.Text.DisplayContext CapitalizationContext
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.DisplayContext>("getCapitalizationContext", "()Landroid/icu/text/DisplayContext;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getFormatStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getCapitalizationContext()"/>
         /// </summary>
-        public Android.Icu.Text.RelativeDateTimeFormatter.Style FormatStyle
+        /// <returns><see cref="Android.Icu.Text.DisplayContext"/></returns>
+        public Android.Icu.Text.DisplayContext GetCapitalizationContext()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.RelativeDateTimeFormatter.Style>("getFormatStyle", "()Landroid/icu/text/RelativeDateTimeFormatter$Style;"); }
+            return IExecuteWithSignature<Android.Icu.Text.DisplayContext>("getCapitalizationContext", "()Landroid/icu/text/DisplayContext;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getNumberFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getNumberFormat()"/>
         /// </summary>
-        public Android.Icu.Text.NumberFormat NumberFormat
+        /// <returns><see cref="Android.Icu.Text.NumberFormat"/></returns>
+        public Android.Icu.Text.NumberFormat GetNumberFormat()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.NumberFormat>("getNumberFormat", "()Landroid/icu/text/NumberFormat;"); }
+            return IExecuteWithSignature<Android.Icu.Text.NumberFormat>("getNumberFormat", "()Landroid/icu/text/NumberFormat;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#formatNumericToValue(double,android.icu.text.RelativeDateTimeFormatter.RelativeDateTimeUnit)"/>
@@ -165,6 +161,14 @@ public Android.Icu.Text.RelativeDateTimeFormatter.FormattedRelativeDateTime Form
             return IExecute<Android.Icu.Text.RelativeDateTimeFormatter.FormattedRelativeDateTime>("formatToValue", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#getFormatStyle()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.RelativeDateTimeFormatter.Style"/></returns>
+        public Android.Icu.Text.RelativeDateTimeFormatter.Style GetFormatStyle()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.RelativeDateTimeFormatter.Style>("getFormatStyle", "()Landroid/icu/text/RelativeDateTimeFormatter$Style;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.html#combineDateAndTime(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -467,9 +471,9 @@ public partial class FormattedRelativeDateTime
             /// <param name="arg0"><typeparamref name="A"/></param>
             /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
             /// <returns><typeparamref name="A"/></returns>
-            public A AppendTo<A>(A arg0) where A: Java.Lang.IAppendable, new()
+            public A AppendTo<A>(A arg0) where A : Java.Lang.IAppendable, new()
             {
-                return IExecuteWithSignature<A>("appendTo", "(Ljava/lang/Appendable;)Ljava/lang/Appendable;", arg0);
+                return IExecute<A>("appendTo", arg0);
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/icu/text/RelativeDateTimeFormatter.FormattedRelativeDateTime.html#nextPosition(android.icu.text.ConstrainedFieldPosition)"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/RuleBasedCollator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/RuleBasedCollator.cs
index c3a580163..3ee721dc5 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/RuleBasedCollator.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/RuleBasedCollator.cs
@@ -55,20 +55,6 @@ public RuleBasedCollator(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#getNumericCollation()"/> <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#setNumericCollation(boolean)"/>
-        /// </summary>
-        public bool NumericCollation
-        {
-            get { return IExecuteWithSignature<bool>("getNumericCollation", "()Z"); } set { IExecuteWithSignature("setNumericCollation", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#getRules()"/> 
-        /// </summary>
-        public Java.Lang.String Rules
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRules", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#getCollationElementIterator(android.icu.text.UCharacterIterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.UCharacterIterator"/></param>
@@ -96,6 +82,14 @@ public Android.Icu.Text.CollationElementIterator GetCollationElementIterator(Jav
             return IExecuteWithSignature<Android.Icu.Text.CollationElementIterator>("getCollationElementIterator", "(Ljava/text/CharacterIterator;)Landroid/icu/text/CollationElementIterator;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#getNumericCollation()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetNumericCollation()
+        {
+            return IExecuteWithSignature<bool>("getNumericCollation", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#isAlternateHandlingShifted()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -136,6 +130,14 @@ public bool IsUpperCaseFirst()
             return IExecuteWithSignature<bool>("isUpperCaseFirst", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#getRules()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRules()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getRules", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#getRules(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -223,6 +225,14 @@ public void SetLowerCaseFirst(bool arg0)
             IExecuteWithSignature("setLowerCaseFirst", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#setNumericCollation(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetNumericCollation(bool arg0)
+        {
+            IExecuteWithSignature("setNumericCollation", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/RuleBasedCollator.html#setNumericCollationDefault()"/>
         /// </summary>
         public void SetNumericCollationDefault()
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/SearchIterator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/SearchIterator.cs
index a9f9b091d..43fda4667 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/SearchIterator.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/SearchIterator.cs
@@ -52,53 +52,28 @@ public partial class SearchIterator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getBreakIterator()"/> <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#setBreakIterator(android.icu.text.BreakIterator)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getIndex()"/>
         /// </summary>
-        public Android.Icu.Text.BreakIterator BreakIterator
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.BreakIterator>("getBreakIterator", "()Landroid/icu/text/BreakIterator;"); } set { IExecuteWithSignature("setBreakIterator", "(Landroid/icu/text/BreakIterator;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getElementComparisonType()"/> 
-        /// </summary>
-        public Android.Icu.Text.SearchIterator.ElementComparisonType GetElementComparisonType
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.SearchIterator.ElementComparisonType>("getElementComparisonType", "()Landroid/icu/text/SearchIterator$ElementComparisonType;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getIndex()"/> <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#setIndex(int)"/>
-        /// </summary>
-        public int Index
-        {
-            get { return IExecuteWithSignature<int>("getIndex", "()I"); } set { IExecuteWithSignature("setIndex", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getMatchedText()"/> 
-        /// </summary>
-        public Java.Lang.String MatchedText
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMatchedText", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getMatchLength()"/> 
-        /// </summary>
-        public int MatchLength
+        /// <returns><see cref="int"/></returns>
+        public int GetIndex()
         {
-            get { return IExecuteWithSignature<int>("getMatchLength", "()I"); }
+            return IExecuteWithSignature<int>("getIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getMatchStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getBreakIterator()"/>
         /// </summary>
-        public int MatchStart
+        /// <returns><see cref="Android.Icu.Text.BreakIterator"/></returns>
+        public Android.Icu.Text.BreakIterator GetBreakIterator()
         {
-            get { return IExecuteWithSignature<int>("getMatchStart", "()I"); }
+            return IExecuteWithSignature<Android.Icu.Text.BreakIterator>("getBreakIterator", "()Landroid/icu/text/BreakIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getTarget()"/> <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#setTarget(java.text.CharacterIterator)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getElementComparisonType()"/>
         /// </summary>
-        public Java.Text.CharacterIterator Target
+        /// <returns><see cref="Android.Icu.Text.SearchIterator.ElementComparisonType"/></returns>
+        public Android.Icu.Text.SearchIterator.ElementComparisonType GetElementComparisonType()
         {
-            get { return IExecuteWithSignature<Java.Text.CharacterIterator>("getTarget", "()Ljava/text/CharacterIterator;"); } set { IExecuteWithSignature("setTarget", "(Ljava/text/CharacterIterator;)V", value); }
+            return IExecuteWithSignature<Android.Icu.Text.SearchIterator.ElementComparisonType>("getElementComparisonType", "()Landroid/icu/text/SearchIterator$ElementComparisonType;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#isOverlapping()"/>
@@ -143,6 +118,22 @@ public int Preceding(int arg0)
             return IExecuteWithSignature<int>("preceding", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getMatchLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMatchLength()
+        {
+            return IExecuteWithSignature<int>("getMatchLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getMatchStart()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMatchStart()
+        {
+            return IExecuteWithSignature<int>("getMatchStart", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#next()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -159,6 +150,22 @@ public int Previous()
             return IExecuteWithSignature<int>("previous", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getMatchedText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMatchedText()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMatchedText", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#getTarget()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.CharacterIterator"/></returns>
+        public Java.Text.CharacterIterator GetTarget()
+        {
+            return IExecuteWithSignature<Java.Text.CharacterIterator>("getTarget", "()Ljava/text/CharacterIterator;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#reset()"/>
         /// </summary>
         public void Reset()
@@ -166,6 +173,14 @@ public void Reset()
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#setBreakIterator(android.icu.text.BreakIterator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.BreakIterator"/></param>
+        public void SetBreakIterator(Android.Icu.Text.BreakIterator arg0)
+        {
+            IExecuteWithSignature("setBreakIterator", "(Landroid/icu/text/BreakIterator;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#setElementComparisonType(android.icu.text.SearchIterator.ElementComparisonType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.SearchIterator.ElementComparisonType"/></param>
@@ -174,6 +189,14 @@ public void SetElementComparisonType(Android.Icu.Text.SearchIterator.ElementComp
             IExecuteWithSignature("setElementComparisonType", "(Landroid/icu/text/SearchIterator$ElementComparisonType;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#setIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetIndex(int arg0)
+        {
+            IExecuteWithSignature("setIndex", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#setOverlapping(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -181,6 +204,14 @@ public void SetOverlapping(bool arg0)
         {
             IExecuteWithSignature("setOverlapping", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SearchIterator.html#setTarget(java.text.CharacterIterator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Text.CharacterIterator"/></param>
+        public void SetTarget(Java.Text.CharacterIterator arg0)
+        {
+            IExecuteWithSignature("setTarget", "(Ljava/text/CharacterIterator;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/SimpleDateFormat.cs b/src/net/Netdroid/Generated/Android/Icu/Text/SimpleDateFormat.cs
index ef47bb91e..1e1419f03 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/SimpleDateFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/SimpleDateFormat.cs
@@ -91,25 +91,12 @@ public SimpleDateFormat(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#getDateFormatSymbols()"/> <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#setDateFormatSymbols(android.icu.text.DateFormatSymbols)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#getDateFormatSymbols()"/>
         /// </summary>
-        public Android.Icu.Text.DateFormatSymbols DateFormatSymbols
+        /// <returns><see cref="Android.Icu.Text.DateFormatSymbols"/></returns>
+        public Android.Icu.Text.DateFormatSymbols GetDateFormatSymbols()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.DateFormatSymbols>("getDateFormatSymbols", "()Landroid/icu/text/DateFormatSymbols;"); } set { IExecuteWithSignature("setDateFormatSymbols", "(Landroid/icu/text/DateFormatSymbols;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#get2DigitYearStart()"/> 
-        /// </summary>
-        public Java.Util.Date Get2DigitYearStart
-        {
-            get { return IExecuteWithSignature<Java.Util.Date>("get2DigitYearStart", "()Ljava/util/Date;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#getTimeZoneFormat()"/> <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#setTimeZoneFormat(android.icu.text.TimeZoneFormat)"/>
-        /// </summary>
-        public Android.Icu.Text.TimeZoneFormat TimeZoneFormat
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.TimeZoneFormat>("getTimeZoneFormat", "()Landroid/icu/text/TimeZoneFormat;"); } set { IExecuteWithSignature("setTimeZoneFormat", "(Landroid/icu/text/TimeZoneFormat;)V", value); }
+            return IExecuteWithSignature<Android.Icu.Text.DateFormatSymbols>("getDateFormatSymbols", "()Landroid/icu/text/DateFormatSymbols;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#getNumberFormat(char)"/>
@@ -121,6 +108,14 @@ public Android.Icu.Text.NumberFormat GetNumberFormat(char arg0)
             return IExecuteWithSignature<Android.Icu.Text.NumberFormat>("getNumberFormat", "(C)Landroid/icu/text/NumberFormat;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#getTimeZoneFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.TimeZoneFormat"/></returns>
+        public Android.Icu.Text.TimeZoneFormat GetTimeZoneFormat()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.TimeZoneFormat>("getTimeZoneFormat", "()Landroid/icu/text/TimeZoneFormat;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#toLocalizedPattern()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -137,6 +132,14 @@ public Java.Lang.String ToPattern()
             return IExecuteWithSignature<Java.Lang.String>("toPattern", "()Ljava/lang/String;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#get2DigitYearStart()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date Get2DigitYearStart()
+        {
+            return IExecuteWithSignature<Java.Util.Date>("get2DigitYearStart", "()Ljava/util/Date;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#applyLocalizedPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -161,6 +164,14 @@ public void Set2DigitYearStart(Java.Util.Date arg0)
             IExecuteWithSignature("set2DigitYearStart", "(Ljava/util/Date;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#setDateFormatSymbols(android.icu.text.DateFormatSymbols)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.DateFormatSymbols"/></param>
+        public void SetDateFormatSymbols(Android.Icu.Text.DateFormatSymbols arg0)
+        {
+            IExecuteWithSignature("setDateFormatSymbols", "(Landroid/icu/text/DateFormatSymbols;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#setNumberFormat(java.lang.String,android.icu.text.NumberFormat)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -169,6 +180,14 @@ public void SetNumberFormat(Java.Lang.String arg0, Android.Icu.Text.NumberFormat
         {
             IExecute("setNumberFormat", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/SimpleDateFormat.html#setTimeZoneFormat(android.icu.text.TimeZoneFormat)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.TimeZoneFormat"/></param>
+        public void SetTimeZoneFormat(Android.Icu.Text.TimeZoneFormat arg0)
+        {
+            IExecuteWithSignature("setTimeZoneFormat", "(Landroid/icu/text/TimeZoneFormat;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/StringSearch.cs b/src/net/Netdroid/Generated/Android/Icu/Text/StringSearch.cs
index 8ac52d0ee..d65bc8801 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/StringSearch.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/StringSearch.cs
@@ -96,18 +96,12 @@ public StringSearch(Java.Lang.String arg0, Java.Text.CharacterIterator arg1, Jav
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#getCollator()"/> <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#setCollator(android.icu.text.RuleBasedCollator)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#getCollator()"/>
         /// </summary>
-        public Android.Icu.Text.RuleBasedCollator Collator
+        /// <returns><see cref="Android.Icu.Text.RuleBasedCollator"/></returns>
+        public Android.Icu.Text.RuleBasedCollator GetCollator()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.RuleBasedCollator>("getCollator", "()Landroid/icu/text/RuleBasedCollator;"); } set { IExecuteWithSignature("setCollator", "(Landroid/icu/text/RuleBasedCollator;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#getPattern()"/> <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#setPattern(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String Pattern
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPattern", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPattern", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Icu.Text.RuleBasedCollator>("getCollator", "()Landroid/icu/text/RuleBasedCollator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#isCanonical()"/>
@@ -118,6 +112,14 @@ public bool IsCanonical()
             return IExecuteWithSignature<bool>("isCanonical", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#getPattern()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPattern()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPattern", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#setCanonical(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -125,6 +127,22 @@ public void SetCanonical(bool arg0)
         {
             IExecuteWithSignature("setCanonical", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#setCollator(android.icu.text.RuleBasedCollator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.RuleBasedCollator"/></param>
+        public void SetCollator(Android.Icu.Text.RuleBasedCollator arg0)
+        {
+            IExecuteWithSignature("setCollator", "(Landroid/icu/text/RuleBasedCollator;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/StringSearch.html#setPattern(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPattern(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPattern", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/TimeZoneFormat.cs b/src/net/Netdroid/Generated/Android/Icu/Text/TimeZoneFormat.cs
index 89ffeb706..b10198fa8 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/TimeZoneFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/TimeZoneFormat.cs
@@ -72,41 +72,6 @@ public static Android.Icu.Text.TimeZoneFormat GetInstance(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getDefaultParseOptions()"/> 
-        /// </summary>
-        public Java.Util.EnumSet<Android.Icu.Text.TimeZoneFormat.ParseOption> DefaultParseOptions
-        {
-            get { return IExecuteWithSignature<Java.Util.EnumSet<Android.Icu.Text.TimeZoneFormat.ParseOption>>("getDefaultParseOptions", "()Ljava/util/EnumSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getGMTOffsetDigits()"/> 
-        /// </summary>
-        public Java.Lang.String GMTOffsetDigits
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGMTOffsetDigits", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getGMTPattern()"/> 
-        /// </summary>
-        public Java.Lang.String GMTPattern
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGMTPattern", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getGMTZeroFormat()"/> 
-        /// </summary>
-        public Java.Lang.String GMTZeroFormat
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGMTZeroFormat", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getTimeZoneNames()"/> 
-        /// </summary>
-        public Android.Icu.Text.TimeZoneNames TimeZoneNames
-        {
-            get { return IExecuteWithSignature<Android.Icu.Text.TimeZoneNames>("getTimeZoneNames", "()Landroid/icu/text/TimeZoneNames;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#setDefaultParseOptions(java.util.EnumSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.EnumSet"/></param>
@@ -162,6 +127,14 @@ public Android.Icu.Text.TimeZoneFormat SetTimeZoneNames(Android.Icu.Text.TimeZon
             return IExecuteWithSignature<Android.Icu.Text.TimeZoneFormat>("setTimeZoneNames", "(Landroid/icu/text/TimeZoneNames;)Landroid/icu/text/TimeZoneFormat;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getTimeZoneNames()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.TimeZoneNames"/></returns>
+        public Android.Icu.Text.TimeZoneNames GetTimeZoneNames()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.TimeZoneNames>("getTimeZoneNames", "()Landroid/icu/text/TimeZoneNames;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#parse(android.icu.text.TimeZoneFormat.Style,java.lang.String,java.text.ParsePosition,android.icu.util.Output)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.TimeZoneFormat.Style"/></param>
@@ -326,6 +299,14 @@ public Java.Lang.String FormatOffsetShortLocalizedGMT(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("formatOffsetShortLocalizedGMT", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getGMTOffsetDigits()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGMTOffsetDigits()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGMTOffsetDigits", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getGMTOffsetPattern(android.icu.text.TimeZoneFormat.GMTOffsetPatternType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Text.TimeZoneFormat.GMTOffsetPatternType"/></param>
@@ -334,6 +315,30 @@ public Java.Lang.String GetGMTOffsetPattern(Android.Icu.Text.TimeZoneFormat.GMTO
         {
             return IExecuteWithSignature<Java.Lang.String>("getGMTOffsetPattern", "(Landroid/icu/text/TimeZoneFormat$GMTOffsetPatternType;)Ljava/lang/String;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getGMTPattern()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGMTPattern()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGMTPattern", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getGMTZeroFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGMTZeroFormat()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGMTZeroFormat", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneFormat.html#getDefaultParseOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.EnumSet"/></returns>
+        public Java.Util.EnumSet<Android.Icu.Text.TimeZoneFormat.ParseOption> GetDefaultParseOptions()
+        {
+            return IExecuteWithSignature<Java.Util.EnumSet<Android.Icu.Text.TimeZoneFormat.ParseOption>>("getDefaultParseOptions", "()Ljava/util/EnumSet;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/TimeZoneNames.cs b/src/net/Netdroid/Generated/Android/Icu/Text/TimeZoneNames.cs
index 40958b5c2..4c87e240c 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/TimeZoneNames.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/TimeZoneNames.cs
@@ -73,13 +73,6 @@ public static Android.Icu.Text.TimeZoneNames GetTZDBInstance(Android.Icu.Util.UL
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneNames.html#getAvailableMetaZoneIDs()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> AvailableMetaZoneIDs
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAvailableMetaZoneIDs", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneNames.html#getMetaZoneDisplayName(java.lang.String,android.icu.text.TimeZoneNames.NameType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -120,6 +113,14 @@ public Java.Lang.String GetTimeZoneDisplayName(Java.Lang.String arg0, Android.Ic
             return IExecute<Java.Lang.String>("getTimeZoneDisplayName", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneNames.html#getAvailableMetaZoneIDs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetAvailableMetaZoneIDs()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAvailableMetaZoneIDs", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/TimeZoneNames.html#getAvailableMetaZoneIDs(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/Transliterator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/Transliterator.cs
index 4dee33fa6..0109b7997 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/Transliterator.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/Transliterator.cs
@@ -54,20 +54,6 @@ public partial class Transliterator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getAvailableIDs()"/> 
-        /// </summary>
-        public static Java.Util.Enumeration<Java.Lang.String> AvailableIDs
-        {
-            get { return SExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>(LocalBridgeClazz, "getAvailableIDs", "()Ljava/util/Enumeration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getAvailableSources()"/> 
-        /// </summary>
-        public static Java.Util.Enumeration<Java.Lang.String> AvailableSources
-        {
-            get { return SExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>(LocalBridgeClazz, "getAvailableSources", "()Ljava/util/Enumeration;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getInstance(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -107,6 +93,22 @@ public static Java.Lang.String GetDisplayName(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDisplayName", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getAvailableIDs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public static Java.Util.Enumeration<Java.Lang.String> GetAvailableIDs()
+        {
+            return SExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>(LocalBridgeClazz, "getAvailableIDs", "()Ljava/util/Enumeration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getAvailableSources()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public static Java.Util.Enumeration<Java.Lang.String> GetAvailableSources()
+        {
+            return SExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>(LocalBridgeClazz, "getAvailableSources", "()Ljava/util/Enumeration;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getAvailableTargets(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -150,53 +152,52 @@ public static Java.Lang.String GetDisplayName(Java.Lang.String arg0, Java.Util.L
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getElements()"/> 
-        /// </summary>
-        public Android.Icu.Text.Transliterator[] Elements
-        {
-            get { return IExecuteWithSignatureArray<Android.Icu.Text.Transliterator>("getElements", "()[Landroid/icu/text/Transliterator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getFilter()"/> <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#setFilter(android.icu.text.UnicodeFilter)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getElements()"/>
         /// </summary>
-        public Android.Icu.Text.UnicodeFilter Filter
+        /// <returns><see cref="Android.Icu.Text.Transliterator"/></returns>
+        public Android.Icu.Text.Transliterator[] GetElements()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.UnicodeFilter>("getFilter", "()Landroid/icu/text/UnicodeFilter;"); } set { IExecuteWithSignature("setFilter", "(Landroid/icu/text/UnicodeFilter;)V", value); }
+            return IExecuteWithSignatureArray<Android.Icu.Text.Transliterator>("getElements", "()[Landroid/icu/text/Transliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getID()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getTargetSet()"/>
         /// </summary>
-        public Java.Lang.String ID
+        /// <returns><see cref="Android.Icu.Text.UnicodeSet"/></returns>
+        public Android.Icu.Text.UnicodeSet GetTargetSet()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getID", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("getTargetSet", "()Landroid/icu/text/UnicodeSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getInverse()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getInverse()"/>
         /// </summary>
-        public Android.Icu.Text.Transliterator Inverse
+        /// <returns><see cref="Android.Icu.Text.Transliterator"/></returns>
+        public Android.Icu.Text.Transliterator GetInverse()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.Transliterator>("getInverse", "()Landroid/icu/text/Transliterator;"); }
+            return IExecuteWithSignature<Android.Icu.Text.Transliterator>("getInverse", "()Landroid/icu/text/Transliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getMaximumContextLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getFilter()"/>
         /// </summary>
-        public int MaximumContextLength
+        /// <returns><see cref="Android.Icu.Text.UnicodeFilter"/></returns>
+        public Android.Icu.Text.UnicodeFilter GetFilter()
         {
-            get { return IExecuteWithSignature<int>("getMaximumContextLength", "()I"); }
+            return IExecuteWithSignature<Android.Icu.Text.UnicodeFilter>("getFilter", "()Landroid/icu/text/UnicodeFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getSourceSet()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getSourceSet()"/>
         /// </summary>
-        public Android.Icu.Text.UnicodeSet SourceSet
+        /// <returns><see cref="Android.Icu.Text.UnicodeSet"/></returns>
+        public Android.Icu.Text.UnicodeSet GetSourceSet()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("getSourceSet", "()Landroid/icu/text/UnicodeSet;"); }
+            return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("getSourceSet", "()Landroid/icu/text/UnicodeSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getTargetSet()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getMaximumContextLength()"/>
         /// </summary>
-        public Android.Icu.Text.UnicodeSet TargetSet
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumContextLength()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("getTargetSet", "()Landroid/icu/text/UnicodeSet;"); }
+            return IExecuteWithSignature<int>("getMaximumContextLength", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#transliterate(android.icu.text.Replaceable,int,int)"/>
@@ -210,6 +211,14 @@ public int Transliterate(Android.Icu.Text.Replaceable arg0, int arg1, int arg2)
             return IExecute<int>("transliterate", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#getID()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetID()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getID", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#transliterate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -283,6 +292,14 @@ public void FilteredTransliterate(Android.Icu.Text.Replaceable arg0, Android.Icu
         {
             IExecute("filteredTransliterate", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/Transliterator.html#setFilter(android.icu.text.UnicodeFilter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.UnicodeFilter"/></param>
+        public void SetFilter(Android.Icu.Text.UnicodeFilter arg0)
+        {
+            IExecuteWithSignature("setFilter", "(Landroid/icu/text/UnicodeFilter;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/UCharacterIterator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/UCharacterIterator.cs
index dd818bb78..2d4d6ba24 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/UCharacterIterator.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/UCharacterIterator.cs
@@ -108,40 +108,28 @@ public static Android.Icu.Text.UCharacterIterator GetInstance(Java.Text.Characte
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getCharacterIterator()"/> 
-        /// </summary>
-        public Java.Text.CharacterIterator CharacterIterator
-        {
-            get { return IExecuteWithSignature<Java.Text.CharacterIterator>("getCharacterIterator", "()Ljava/text/CharacterIterator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getIndex()"/> <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#setIndex(int)"/>
-        /// </summary>
-        public int Index
-        {
-            get { return IExecuteWithSignature<int>("getIndex", "()I"); } set { IExecuteWithSignature("setIndex", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#current()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="int"/></returns>
+        public int Current()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<int>("current", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getIndex()"/>
         /// </summary>
-        public Java.Lang.String Text
+        /// <returns><see cref="int"/></returns>
+        public int GetIndex()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#current()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getLength()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int Current()
+        public int GetLength()
         {
-            return IExecuteWithSignature<int>("current", "()I");
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getText(char[],int)"/>
@@ -170,6 +158,14 @@ public int Previous()
             return IExecuteWithSignature<int>("previous", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#setIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetIndex(int arg0)
+        {
+            IExecuteWithSignature("setIndex", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getText(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -221,6 +217,22 @@ public int PreviousCodePoint()
             return IExecuteWithSignature<int>("previousCodePoint", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#getCharacterIterator()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.CharacterIterator"/></returns>
+        public Java.Text.CharacterIterator GetCharacterIterator()
+        {
+            return IExecuteWithSignature<Java.Text.CharacterIterator>("getCharacterIterator", "()Ljava/text/CharacterIterator;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UCharacterIterator.html#setToLimit()"/>
         /// </summary>
         public void SetToLimit()
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSet.cs b/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSet.cs
index 7957c2cd3..7f38817b3 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSet.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSet.cs
@@ -192,21 +192,14 @@ public static Android.Icu.Text.UnicodeSet FromAll(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#getRangeCount()"/> 
-        /// </summary>
-        public int RangeCount
-        {
-            get { return IExecuteWithSignature<int>("getRangeCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#addAll(java.lang.CharSequence[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.ICharSequence"/></typeparam>
         /// <returns><see cref="Android.Icu.Text.UnicodeSet"/></returns>
-        public Android.Icu.Text.UnicodeSet AddAll<T>(params T[] arg0) where T: Java.Lang.ICharSequence, new()
+        public Android.Icu.Text.UnicodeSet AddAll<T>(params T[] arg0) where T : Java.Lang.ICharSequence, new()
         {
-            if (arg0.Length == 0) return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("addAll", "([Ljava/lang/CharSequence;)Landroid/icu/text/UnicodeSet;"); else return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("addAll", "([Ljava/lang/CharSequence;)Landroid/icu/text/UnicodeSet;", arg0);
+            if (arg0.Length == 0) return IExecute<Android.Icu.Text.UnicodeSet>("addAll"); else return IExecute<Android.Icu.Text.UnicodeSet>("addAll", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#removeAll(java.lang.Iterable)"/>
@@ -214,9 +207,9 @@ public int RangeCount
         /// <param name="arg0"><see cref="Java.Lang.Iterable"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.ICharSequence"/></typeparam>
         /// <returns><see cref="Android.Icu.Text.UnicodeSet"/></returns>
-        public Android.Icu.Text.UnicodeSet RemoveAll<T>(Java.Lang.Iterable<T> arg0) where T: Java.Lang.ICharSequence, new()
+        public Android.Icu.Text.UnicodeSet RemoveAll<T>(Java.Lang.Iterable<T> arg0) where T : Java.Lang.ICharSequence, new()
         {
-            return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("removeAll", "(Ljava/lang/Iterable;)Landroid/icu/text/UnicodeSet;", arg0);
+            return IExecute<Android.Icu.Text.UnicodeSet>("removeAll", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#retainAll(java.lang.Iterable)"/>
@@ -224,9 +217,9 @@ public int RangeCount
         /// <param name="arg0"><see cref="Java.Lang.Iterable"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.ICharSequence"/></typeparam>
         /// <returns><see cref="Android.Icu.Text.UnicodeSet"/></returns>
-        public Android.Icu.Text.UnicodeSet RetainAll<T>(Java.Lang.Iterable<T> arg0) where T: Java.Lang.ICharSequence, new()
+        public Android.Icu.Text.UnicodeSet RetainAll<T>(Java.Lang.Iterable<T> arg0) where T : Java.Lang.ICharSequence, new()
         {
-            return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("retainAll", "(Ljava/lang/Iterable;)Landroid/icu/text/UnicodeSet;", arg0);
+            return IExecute<Android.Icu.Text.UnicodeSet>("retainAll", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#containsAll(java.lang.Iterable)"/>
@@ -234,9 +227,9 @@ public int RangeCount
         /// <param name="arg0"><see cref="Java.Lang.Iterable"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.ICharSequence"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool ContainsAll<T>(Java.Lang.Iterable<T> arg0) where T: Java.Lang.ICharSequence, new()
+        public bool ContainsAll<T>(Java.Lang.Iterable<T> arg0) where T : Java.Lang.ICharSequence, new()
         {
-            return IExecuteWithSignature<bool>("containsAll", "(Ljava/lang/Iterable;)Z", arg0);
+            return IExecute<bool>("containsAll", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#containsNone(java.lang.Iterable)"/>
@@ -244,19 +237,19 @@ public int RangeCount
         /// <param name="arg0"><see cref="Java.Lang.Iterable"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.ICharSequence"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool ContainsNone<T>(Java.Lang.Iterable<T> arg0) where T: Java.Lang.ICharSequence, new()
+        public bool ContainsNone<T>(Java.Lang.Iterable<T> arg0) where T : Java.Lang.ICharSequence, new()
         {
-            return IExecuteWithSignature<bool>("containsNone", "(Ljava/lang/Iterable;)Z", arg0);
+            return IExecute<bool>("containsNone", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#addAllTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <typeparam name="T"><see cref="Java.Util.Collection{java.Lang.String}"/></typeparam>
+        /// <typeparam name="T"><see cref="Java.Util.Collection{Java.Lang.String}"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T AddAllTo<T>(T arg0) where T: Java.Util.Collection<java.Lang.String>
+        public T AddAllTo<T>(T arg0) where T : Java.Util.Collection<Java.Lang.String>
         {
-            return IExecuteWithSignature<T>("addAllTo", "(Ljava/util/Collection;)Ljava/util/Collection;", arg0);
+            return IExecute<T>("addAllTo", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#add(int,int)"/>
@@ -551,9 +544,9 @@ public bool IsFrozen()
         /// <param name="arg0"><see cref="Java.Lang.Iterable"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.ICharSequence"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool ContainsSome<T>(Java.Lang.Iterable<T> arg0) where T: Java.Lang.ICharSequence, new()
+        public bool ContainsSome<T>(Java.Lang.Iterable<T> arg0) where T : Java.Lang.ICharSequence, new()
         {
-            return IExecuteWithSignature<bool>("containsSome", "(Ljava/lang/Iterable;)Z", arg0);
+            return IExecute<bool>("containsSome", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#add(int)"/>
@@ -764,6 +757,14 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#getRangeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRangeCount()
+        {
+            return IExecuteWithSignature<int>("getRangeCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSet.html#getRangeEnd(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSetIterator.cs b/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSetIterator.cs
new file mode 100644
index 000000000..7e463a60a
--- /dev/null
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSetIterator.cs
@@ -0,0 +1,129 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android.Icu.Text
+{
+    #region UnicodeSetIterator
+    public partial class UnicodeSetIterator
+    {
+        #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#%3Cinit%3E(android.icu.text.UnicodeSet)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.UnicodeSet"/></param>
+        public UnicodeSetIterator(Android.Icu.Text.UnicodeSet arg0)
+            : base(arg0)
+        {
+        }
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#codepoint"/>
+        /// </summary>
+        public int codepoint { get { return IGetField<int>("codepoint"); } set { ISetField("codepoint", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#codepointEnd"/>
+        /// </summary>
+        public int codepointEnd { get { return IGetField<int>("codepointEnd"); } set { ISetField("codepointEnd", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#string"/>
+        /// </summary>
+        public Java.Lang.String stringField { get { return IGetField<Java.Lang.String>("string"); } set { ISetField("string", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#IS_STRING"/>
+        /// </summary>
+        public static int IS_STRING { get { return SGetField<int>(LocalBridgeClazz, "IS_STRING"); } set { SSetField(LocalBridgeClazz, "IS_STRING", value); } }
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#skipToStrings()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Text.UnicodeSetIterator"/></returns>
+        public Android.Icu.Text.UnicodeSetIterator SkipToStrings()
+        {
+            return IExecuteWithSignature<Android.Icu.Text.UnicodeSetIterator>("skipToStrings", "()Landroid/icu/text/UnicodeSetIterator;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#next()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool Next()
+        {
+            return IExecuteWithSignature<bool>("next", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#nextRange()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool NextRange()
+        {
+            return IExecuteWithSignature<bool>("nextRange", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#getString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getString", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#reset()"/>
+        /// </summary>
+        public void Reset()
+        {
+            IExecuteWithSignature("reset", "()V");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetIterator.html#reset(android.icu.text.UnicodeSet)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Text.UnicodeSet"/></param>
+        public void Reset(Android.Icu.Text.UnicodeSet arg0)
+        {
+            IExecuteWithSignature("reset", "(Landroid/icu/text/UnicodeSet;)V", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSetSpanner.cs b/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSetSpanner.cs
index 65c6a593f..d2cf46231 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSetSpanner.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Text/UnicodeSetSpanner.cs
@@ -54,11 +54,12 @@ public UnicodeSetSpanner(Android.Icu.Text.UnicodeSet arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetSpanner.html#getUnicodeSet()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetSpanner.html#getUnicodeSet()"/>
         /// </summary>
-        public Android.Icu.Text.UnicodeSet UnicodeSet
+        /// <returns><see cref="Android.Icu.Text.UnicodeSet"/></returns>
+        public Android.Icu.Text.UnicodeSet GetUnicodeSet()
         {
-            get { return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("getUnicodeSet", "()Landroid/icu/text/UnicodeSet;"); }
+            return IExecuteWithSignature<Android.Icu.Text.UnicodeSet>("getUnicodeSet", "()Landroid/icu/text/UnicodeSet;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/text/UnicodeSetSpanner.html#countIn(java.lang.CharSequence,android.icu.text.UnicodeSetSpanner.CountMethod,android.icu.text.UnicodeSet.SpanCondition)"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Icu/Util/AllPackageClasses.cs
index 7270966ab..396e78bd8 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class Calendar : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Calendar
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Calendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Calendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Calendar() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Calendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Calendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Calendar(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -478,12 +478,12 @@ public partial class Freezable : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Freezable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Freezable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Freezable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Freezable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Freezable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Freezable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -525,12 +525,12 @@ public partial class Freezable<T> : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Freezable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Freezable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Freezable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Freezable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Freezable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Freezable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1266,12 +1266,12 @@ public partial class RangeValueIterator : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RangeValueIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RangeValueIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RangeValueIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RangeValueIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RangeValueIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RangeValueIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1444,12 +1444,12 @@ public partial class TimeZone : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TimeZone
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TimeZone class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeZone class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeZone() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TimeZone class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeZone class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeZone(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1754,12 +1754,12 @@ public partial class ValueIterator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Val
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ValueIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ValueIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ValueIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ValueIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ValueIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ValueIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/Calendar.cs b/src/net/Netdroid/Generated/Android/Icu/Util/Calendar.cs
index 873c7eada..c3e4a1a21 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/Calendar.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/Calendar.cs
@@ -348,18 +348,12 @@ public partial class Calendar : Java.Io.ISerializable, Java.Lang.ICloneable, Jav
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Util.Calendar Instance
+        /// <returns><see cref="Android.Icu.Util.Calendar"/></returns>
+        public static Android.Icu.Util.Calendar GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Util.Calendar>(LocalBridgeClazz, "getInstance", "()Landroid/icu/util/Calendar;"); }
+            return SExecuteWithSignature<Android.Icu.Util.Calendar>(LocalBridgeClazz, "getInstance", "()Landroid/icu/util/Calendar;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getInstance(android.icu.util.TimeZone,android.icu.util.ULocale)"/>
@@ -428,80 +422,18 @@ public static Java.Lang.String[] GetKeywordValuesForLocale(Java.Lang.String arg0
         {
             return SExecuteArray<Java.Lang.String>(LocalBridgeClazz, "getKeywordValuesForLocale", arg0, arg1, arg2);
         }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getFieldCount()"/> 
-        /// </summary>
-        public int FieldCount
-        {
-            get { return IExecuteWithSignature<int>("getFieldCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getFirstDayOfWeek()"/> <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setFirstDayOfWeek(int)"/>
-        /// </summary>
-        public int FirstDayOfWeek
-        {
-            get { return IExecuteWithSignature<int>("getFirstDayOfWeek", "()I"); } set { IExecuteWithSignature("setFirstDayOfWeek", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getWeekData()"/> 
-        /// </summary>
-        public Android.Icu.Util.Calendar.WeekData GetWeekData
-        {
-            get { return IExecuteWithSignature<Android.Icu.Util.Calendar.WeekData>("getWeekData", "()Landroid/icu/util/Calendar$WeekData;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getMinimalDaysInFirstWeek()"/> <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setMinimalDaysInFirstWeek(int)"/>
-        /// </summary>
-        public int MinimalDaysInFirstWeek
-        {
-            get { return IExecuteWithSignature<int>("getMinimalDaysInFirstWeek", "()I"); } set { IExecuteWithSignature("setMinimalDaysInFirstWeek", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getRepeatedWallTimeOption()"/> <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setRepeatedWallTimeOption(int)"/>
-        /// </summary>
-        public int RepeatedWallTimeOption
-        {
-            get { return IExecuteWithSignature<int>("getRepeatedWallTimeOption", "()I"); } set { IExecuteWithSignature("setRepeatedWallTimeOption", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getSkippedWallTimeOption()"/> <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setSkippedWallTimeOption(int)"/>
-        /// </summary>
-        public int SkippedWallTimeOption
-        {
-            get { return IExecuteWithSignature<int>("getSkippedWallTimeOption", "()I"); } set { IExecuteWithSignature("setSkippedWallTimeOption", "(I)V", value); }
-        }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getTime()"/> <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setTime(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getAvailableLocales()"/>
         /// </summary>
-        public Java.Util.Date Time
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getTime", "()Ljava/util/Date;"); } set { IExecuteWithSignature("setTime", "(Ljava/util/Date;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getTimeInMillis()"/> <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setTimeInMillis(long)"/>
-        /// </summary>
-        public long TimeInMillis
-        {
-            get { return IExecuteWithSignature<long>("getTimeInMillis", "()J"); } set { IExecuteWithSignature("setTimeInMillis", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getTimeZone()"/> <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setTimeZone(android.icu.util.TimeZone)"/>
-        /// </summary>
-        public Android.Icu.Util.TimeZone TimeZone
-        {
-            get { return IExecuteWithSignature<Android.Icu.Util.TimeZone>("getTimeZone", "()Landroid/icu/util/TimeZone;"); } set { IExecuteWithSignature("setTimeZone", "(Landroid/icu/util/TimeZone;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getDateTimeFormat(int,int,android.icu.util.ULocale)"/>
         /// </summary>
@@ -534,6 +466,22 @@ public Android.Icu.Util.Calendar SetWeekData(Android.Icu.Util.Calendar.WeekData
             return IExecuteWithSignature<Android.Icu.Util.Calendar>("setWeekData", "(Landroid/icu/util/Calendar$WeekData;)Landroid/icu/util/Calendar;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getWeekData()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.Calendar.WeekData"/></returns>
+        public Android.Icu.Util.Calendar.WeekData GetWeekData()
+        {
+            return IExecuteWithSignature<Android.Icu.Util.Calendar.WeekData>("getWeekData", "()Landroid/icu/util/Calendar$WeekData;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getTimeZone()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.TimeZone"/></returns>
+        public Android.Icu.Util.TimeZone GetTimeZone()
+        {
+            return IExecuteWithSignature<Android.Icu.Util.TimeZone>("getTimeZone", "()Landroid/icu/util/TimeZone;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#after(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
@@ -604,6 +552,14 @@ public int Get(int arg0)
             return IExecuteWithSignature<int>("get", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getFieldCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFieldCount()
+        {
+            return IExecuteWithSignature<int>("getFieldCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getGreatestMinimum(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -640,6 +596,14 @@ public int GetMinimum(int arg0)
             return IExecuteWithSignature<int>("getMinimum", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getTime()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetTime()
+        {
+            return IExecuteWithSignature<Java.Util.Date>("getTime", "()Ljava/util/Date;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#clear()"/>
         /// </summary>
         public void Clear()
@@ -708,6 +672,14 @@ public void Set(int arg0, int arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setTime(java.util.Date)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        public void SetTime(Java.Util.Date arg0)
+        {
+            IExecuteWithSignature("setTime", "(Ljava/util/Date;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#compareTo(android.icu.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.Calendar"/></param>
@@ -754,6 +726,38 @@ public int GetActualMinimum(int arg0)
             return IExecuteWithSignature<int>("getActualMinimum", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getFirstDayOfWeek()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFirstDayOfWeek()
+        {
+            return IExecuteWithSignature<int>("getFirstDayOfWeek", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getMinimalDaysInFirstWeek()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimalDaysInFirstWeek()
+        {
+            return IExecuteWithSignature<int>("getMinimalDaysInFirstWeek", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getRepeatedWallTimeOption()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatedWallTimeOption()
+        {
+            return IExecuteWithSignature<int>("getRepeatedWallTimeOption", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getSkippedWallTimeOption()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSkippedWallTimeOption()
+        {
+            return IExecuteWithSignature<int>("getSkippedWallTimeOption", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getDisplayName(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -772,6 +776,22 @@ public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#getTimeInMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTimeInMillis()
+        {
+            return IExecuteWithSignature<long>("getTimeInMillis", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#add(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -790,6 +810,14 @@ public void Roll(int arg0, int arg1)
             IExecute("roll", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setFirstDayOfWeek(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFirstDayOfWeek(int arg0)
+        {
+            IExecuteWithSignature("setFirstDayOfWeek", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setLenient(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -797,6 +825,46 @@ public void SetLenient(bool arg0)
         {
             IExecuteWithSignature("setLenient", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setMinimalDaysInFirstWeek(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimalDaysInFirstWeek(int arg0)
+        {
+            IExecuteWithSignature("setMinimalDaysInFirstWeek", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setRepeatedWallTimeOption(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRepeatedWallTimeOption(int arg0)
+        {
+            IExecuteWithSignature("setRepeatedWallTimeOption", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setSkippedWallTimeOption(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSkippedWallTimeOption(int arg0)
+        {
+            IExecuteWithSignature("setSkippedWallTimeOption", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setTimeInMillis(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetTimeInMillis(long arg0)
+        {
+            IExecuteWithSignature("setTimeInMillis", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Calendar.html#setTimeZone(android.icu.util.TimeZone)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Icu.Util.TimeZone"/></param>
+        public void SetTimeZone(Android.Icu.Util.TimeZone arg0)
+        {
+            IExecuteWithSignature("setTimeZone", "(Landroid/icu/util/TimeZone;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/Currency.cs b/src/net/Netdroid/Generated/Android/Icu/Util/Currency.cs
index bc5b4c9fa..a7171f9d3 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/Currency.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/Currency.cs
@@ -78,27 +78,6 @@ public partial class Currency
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getAvailableCurrencies()"/> 
-        /// </summary>
-        public static Java.Util.Set<Android.Icu.Util.Currency> AvailableCurrencies
-        {
-            get { return SExecuteWithSignature<Java.Util.Set<Android.Icu.Util.Currency>>(LocalBridgeClazz, "getAvailableCurrencies", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getAvailableLocales()"/> 
-        /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getAvailableULocales()"/> 
-        /// </summary>
-        public static Android.Icu.Util.ULocale[] AvailableULocales
-        {
-            get { return SExecuteWithSignatureArray<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getAvailableULocales", "()[Landroid/icu/util/ULocale;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#fromJavaCurrency(java.util.Currency)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Currency"/></param>
@@ -135,6 +114,14 @@ public static Android.Icu.Util.Currency GetInstance(Java.Util.Locale arg0)
             return SExecuteWithSignature<Android.Icu.Util.Currency>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Landroid/icu/util/Currency;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getAvailableULocales()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public static Android.Icu.Util.ULocale[] GetAvailableULocales()
+        {
+            return SExecuteWithSignatureArray<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getAvailableULocales", "()[Landroid/icu/util/ULocale;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#isAvailable(java.lang.String,java.util.Date,java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -176,69 +163,83 @@ public static Java.Lang.String[] GetAvailableCurrencyCodes(Java.Util.Locale arg0
         {
             return SExecuteArray<Java.Lang.String>(LocalBridgeClazz, "getAvailableCurrencyCodes", arg0, arg1);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getCurrencyCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getAvailableLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
+        {
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getAvailableCurrencies()"/>
         /// </summary>
-        public Java.Lang.String CurrencyCode
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Android.Icu.Util.Currency> GetAvailableCurrencies()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCurrencyCode", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Util.Set<Android.Icu.Util.Currency>>(LocalBridgeClazz, "getAvailableCurrencies", "()Ljava/util/Set;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getDefaultFractionDigits()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getRoundingIncrement()"/>
         /// </summary>
-        public int DefaultFractionDigits
+        /// <returns><see cref="double"/></returns>
+        public double GetRoundingIncrement()
         {
-            get { return IExecuteWithSignature<int>("getDefaultFractionDigits", "()I"); }
+            return IExecuteWithSignature<double>("getRoundingIncrement", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getRoundingIncrement(android.icu.util.Currency.CurrencyUsage)"/>
         /// </summary>
-        public Java.Lang.String DisplayName
+        /// <param name="arg0"><see cref="Android.Icu.Util.Currency.CurrencyUsage"/></param>
+        /// <returns><see cref="double"/></returns>
+        public double GetRoundingIncrement(Android.Icu.Util.Currency.CurrencyUsage arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<double>("getRoundingIncrement", "(Landroid/icu/util/Currency$CurrencyUsage;)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getNumericCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getDefaultFractionDigits()"/>
         /// </summary>
-        public int NumericCode
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultFractionDigits()
         {
-            get { return IExecuteWithSignature<int>("getNumericCode", "()I"); }
+            return IExecuteWithSignature<int>("getDefaultFractionDigits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getRoundingIncrement()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getDefaultFractionDigits(android.icu.util.Currency.CurrencyUsage)"/>
         /// </summary>
-        public double RoundingIncrement
+        /// <param name="arg0"><see cref="Android.Icu.Util.Currency.CurrencyUsage"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultFractionDigits(Android.Icu.Util.Currency.CurrencyUsage arg0)
         {
-            get { return IExecuteWithSignature<double>("getRoundingIncrement", "()D"); }
+            return IExecuteWithSignature<int>("getDefaultFractionDigits", "(Landroid/icu/util/Currency$CurrencyUsage;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getSymbol()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getNumericCode()"/>
         /// </summary>
-        public Java.Lang.String Symbol
+        /// <returns><see cref="int"/></returns>
+        public int GetNumericCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSymbol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getNumericCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getRoundingIncrement(android.icu.util.Currency.CurrencyUsage)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getCurrencyCode()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.Currency.CurrencyUsage"/></param>
-        /// <returns><see cref="double"/></returns>
-        public double GetRoundingIncrement(Android.Icu.Util.Currency.CurrencyUsage arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCurrencyCode()
         {
-            return IExecuteWithSignature<double>("getRoundingIncrement", "(Landroid/icu/util/Currency$CurrencyUsage;)D", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getCurrencyCode", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getDefaultFractionDigits(android.icu.util.Currency.CurrencyUsage)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getDisplayName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.Currency.CurrencyUsage"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int GetDefaultFractionDigits(Android.Icu.Util.Currency.CurrencyUsage arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName()
         {
-            return IExecuteWithSignature<int>("getDefaultFractionDigits", "(Landroid/icu/util/Currency$CurrencyUsage;)I", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getDisplayName(java.util.Locale)"/>
@@ -296,6 +297,14 @@ public Java.Lang.String GetName(Java.Util.Locale arg0, int arg1, Java.Lang.Strin
             return IExecute<Java.Lang.String>("getName", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getSymbol()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSymbol()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSymbol", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/Currency.html#getSymbol(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/CurrencyAmount.cs b/src/net/Netdroid/Generated/Android/Icu/Util/CurrencyAmount.cs
index ce996de02..f03c57616 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/CurrencyAmount.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/CurrencyAmount.cs
@@ -82,11 +82,12 @@ public CurrencyAmount(Java.Lang.Number arg0, Java.Util.Currency arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/CurrencyAmount.html#getCurrency()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/CurrencyAmount.html#getCurrency()"/>
         /// </summary>
-        public Android.Icu.Util.Currency Currency
+        /// <returns><see cref="Android.Icu.Util.Currency"/></returns>
+        public Android.Icu.Util.Currency GetCurrency()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.Currency>("getCurrency", "()Landroid/icu/util/Currency;"); }
+            return IExecuteWithSignature<Android.Icu.Util.Currency>("getCurrency", "()Landroid/icu/util/Currency;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/DateInterval.cs b/src/net/Netdroid/Generated/Android/Icu/Util/DateInterval.cs
index f49b33f26..4e6d8a89f 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/DateInterval.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/DateInterval.cs
@@ -55,18 +55,20 @@ public DateInterval(long arg0, long arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/DateInterval.html#getFromDate()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/DateInterval.html#getFromDate()"/>
         /// </summary>
-        public long FromDate
+        /// <returns><see cref="long"/></returns>
+        public long GetFromDate()
         {
-            get { return IExecuteWithSignature<long>("getFromDate", "()J"); }
+            return IExecuteWithSignature<long>("getFromDate", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/DateInterval.html#getToDate()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/DateInterval.html#getToDate()"/>
         /// </summary>
-        public long ToDate
+        /// <returns><see cref="long"/></returns>
+        public long GetToDate()
         {
-            get { return IExecuteWithSignature<long>("getToDate", "()J"); }
+            return IExecuteWithSignature<long>("getToDate", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/GregorianCalendar.cs b/src/net/Netdroid/Generated/Android/Icu/Util/GregorianCalendar.cs
index 6c369da47..8c5462379 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/GregorianCalendar.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/GregorianCalendar.cs
@@ -135,13 +135,6 @@ public GregorianCalendar(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/GregorianCalendar.html#getGregorianChange()"/> <see href="https://developer.android.com/reference/android/icu/util/GregorianCalendar.html#setGregorianChange(java.util.Date)"/>
-        /// </summary>
-        public Java.Util.Date GregorianChange
-        {
-            get { return IExecuteWithSignature<Java.Util.Date>("getGregorianChange", "()Ljava/util/Date;"); } set { IExecuteWithSignature("setGregorianChange", "(Ljava/util/Date;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/GregorianCalendar.html#isLeapYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -150,6 +143,22 @@ public bool IsLeapYear(int arg0)
         {
             return IExecuteWithSignature<bool>("isLeapYear", "(I)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/GregorianCalendar.html#getGregorianChange()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetGregorianChange()
+        {
+            return IExecuteWithSignature<Java.Util.Date>("getGregorianChange", "()Ljava/util/Date;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/GregorianCalendar.html#setGregorianChange(java.util.Date)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        public void SetGregorianChange(Java.Util.Date arg0)
+        {
+            IExecuteWithSignature("setGregorianChange", "(Ljava/util/Date;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/IslamicCalendar.cs b/src/net/Netdroid/Generated/Android/Icu/Util/IslamicCalendar.cs
index 63395b64f..1f78df24e 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/IslamicCalendar.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/IslamicCalendar.cs
@@ -191,11 +191,12 @@ public IslamicCalendar(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/IslamicCalendar.html#getCalculationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/IslamicCalendar.html#getCalculationType()"/>
         /// </summary>
-        public Android.Icu.Util.IslamicCalendar.CalculationType GetCalculationType
+        /// <returns><see cref="Android.Icu.Util.IslamicCalendar.CalculationType"/></returns>
+        public Android.Icu.Util.IslamicCalendar.CalculationType GetCalculationType()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.IslamicCalendar.CalculationType>("getCalculationType", "()Landroid/icu/util/IslamicCalendar$CalculationType;"); }
+            return IExecuteWithSignature<Android.Icu.Util.IslamicCalendar.CalculationType>("getCalculationType", "()Landroid/icu/util/IslamicCalendar$CalculationType;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/IslamicCalendar.html#setCalculationType(android.icu.util.IslamicCalendar.CalculationType)"/>
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/LocaleData.cs b/src/net/Netdroid/Generated/Android/Icu/Util/LocaleData.cs
index 12d8d31f3..4cee11cb2 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/LocaleData.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/LocaleData.cs
@@ -66,18 +66,12 @@ public partial class LocaleData
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#getCLDRVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#getInstance()"/>
         /// </summary>
-        public static Android.Icu.Util.VersionInfo CLDRVersion
-        {
-            get { return SExecuteWithSignature<Android.Icu.Util.VersionInfo>(LocalBridgeClazz, "getCLDRVersion", "()Landroid/icu/util/VersionInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#getInstance()"/> 
-        /// </summary>
-        public static Android.Icu.Util.LocaleData Instance
+        /// <returns><see cref="Android.Icu.Util.LocaleData"/></returns>
+        public static Android.Icu.Util.LocaleData GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Icu.Util.LocaleData>(LocalBridgeClazz, "getInstance", "()Landroid/icu/util/LocaleData;"); }
+            return SExecuteWithSignature<Android.Icu.Util.LocaleData>(LocalBridgeClazz, "getInstance", "()Landroid/icu/util/LocaleData;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#getInstance(android.icu.util.ULocale)"/>
@@ -106,16 +100,25 @@ public static Android.Icu.Util.LocaleData.PaperSize GetPaperSize(Android.Icu.Uti
         {
             return SExecuteWithSignature<Android.Icu.Util.LocaleData.PaperSize>(LocalBridgeClazz, "getPaperSize", "(Landroid/icu/util/ULocale;)Landroid/icu/util/LocaleData$PaperSize;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#getCLDRVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.VersionInfo"/></returns>
+        public static Android.Icu.Util.VersionInfo GetCLDRVersion()
+        {
+            return SExecuteWithSignature<Android.Icu.Util.VersionInfo>(LocalBridgeClazz, "getCLDRVersion", "()Landroid/icu/util/VersionInfo;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#getNoSubstitute()"/> <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#setNoSubstitute(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#getNoSubstitute()"/>
         /// </summary>
-        public bool NoSubstitute
+        /// <returns><see cref="bool"/></returns>
+        public bool GetNoSubstitute()
         {
-            get { return IExecuteWithSignature<bool>("getNoSubstitute", "()Z"); } set { IExecuteWithSignature("setNoSubstitute", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getNoSubstitute", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#getDelimiter(int)"/>
@@ -126,6 +129,14 @@ public Java.Lang.String GetDelimiter(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getDelimiter", "(I)Ljava/lang/String;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.html#setNoSubstitute(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetNoSubstitute(bool arg0)
+        {
+            IExecuteWithSignature("setNoSubstitute", "(Z)V", arg0);
+        }
 
         #endregion
 
@@ -200,18 +211,20 @@ public partial class PaperSize
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.PaperSize.html#getHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.PaperSize.html#getHeight()"/>
             /// </summary>
-            public int Height
+            /// <returns><see cref="int"/></returns>
+            public int GetHeight()
             {
-                get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+                return IExecuteWithSignature<int>("getHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.PaperSize.html#getWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/util/LocaleData.PaperSize.html#getWidth()"/>
             /// </summary>
-            public int Width
+            /// <returns><see cref="int"/></returns>
+            public int GetWidth()
             {
-                get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+                return IExecuteWithSignature<int>("getWidth", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/Measure.cs b/src/net/Netdroid/Generated/Android/Icu/Util/Measure.cs
index 36582fd6f..b699b2648 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/Measure.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/Measure.cs
@@ -55,18 +55,20 @@ public Measure(Java.Lang.Number arg0, Android.Icu.Util.MeasureUnit arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Measure.html#getNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Measure.html#getUnit()"/>
         /// </summary>
-        public Java.Lang.Number Number
+        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
+        public Android.Icu.Util.MeasureUnit GetUnit()
         {
-            get { return IExecuteWithSignature<Java.Lang.Number>("getNumber", "()Ljava/lang/Number;"); }
+            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("getUnit", "()Landroid/icu/util/MeasureUnit;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/Measure.html#getUnit()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/Measure.html#getNumber()"/>
         /// </summary>
-        public Android.Icu.Util.MeasureUnit Unit
+        /// <returns><see cref="Java.Lang.Number"/></returns>
+        public Java.Lang.Number GetNumber()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("getUnit", "()Landroid/icu/util/MeasureUnit;"); }
+            return IExecuteWithSignature<Java.Lang.Number>("getNumber", "()Ljava/lang/Number;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/MeasureUnit.cs b/src/net/Netdroid/Generated/Android/Icu/Util/MeasureUnit.cs
index 3e50c4f50..f8d40b03d 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/MeasureUnit.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/MeasureUnit.cs
@@ -960,20 +960,6 @@ public partial class MeasureUnit
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getAvailable()"/> 
-        /// </summary>
-        public static Java.Util.Set<Android.Icu.Util.MeasureUnit> Available
-        {
-            get { return SExecuteWithSignature<Java.Util.Set<Android.Icu.Util.MeasureUnit>>(LocalBridgeClazz, "getAvailable", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getAvailableTypes()"/> 
-        /// </summary>
-        public static Java.Util.Set<Java.Lang.String> AvailableTypes
-        {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getAvailableTypes", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#forIdentifier(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -991,86 +977,108 @@ public static Android.Icu.Util.MeasureUnit ForIdentifier(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Util.Set<Android.Icu.Util.MeasureUnit>>(LocalBridgeClazz, "getAvailable", "(Ljava/lang/String;)Ljava/util/Set;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getAvailableTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.String> GetAvailableTypes()
+        {
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getAvailableTypes", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getAvailable()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Android.Icu.Util.MeasureUnit> GetAvailable()
+        {
+            return SExecuteWithSignature<Java.Util.Set<Android.Icu.Util.MeasureUnit>>(LocalBridgeClazz, "getAvailable", "()Ljava/util/Set;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getDimensionality()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#product(android.icu.util.MeasureUnit)"/>
         /// </summary>
-        public int Dimensionality
+        /// <param name="arg0"><see cref="Android.Icu.Util.MeasureUnit"/></param>
+        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
+        public Android.Icu.Util.MeasureUnit Product(Android.Icu.Util.MeasureUnit arg0)
         {
-            get { return IExecuteWithSignature<int>("getDimensionality", "()I"); }
+            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("product", "(Landroid/icu/util/MeasureUnit;)Landroid/icu/util/MeasureUnit;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getComplexity()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#reciprocal()"/>
         /// </summary>
-        public Android.Icu.Util.MeasureUnit.Complexity GetComplexity
+        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
+        public Android.Icu.Util.MeasureUnit Reciprocal()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.MeasureUnit.Complexity>("getComplexity", "()Landroid/icu/util/MeasureUnit$Complexity;"); }
+            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("reciprocal", "()Landroid/icu/util/MeasureUnit;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getIdentifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#withDimensionality(int)"/>
         /// </summary>
-        public Java.Lang.String Identifier
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
+        public Android.Icu.Util.MeasureUnit WithDimensionality(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIdentifier", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("withDimensionality", "(I)Landroid/icu/util/MeasureUnit;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getPrefix()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#withPrefix(android.icu.util.MeasureUnit.MeasurePrefix)"/>
         /// </summary>
-        public Android.Icu.Util.MeasureUnit.MeasurePrefix Prefix
+        /// <param name="arg0"><see cref="Android.Icu.Util.MeasureUnit.MeasurePrefix"/></param>
+        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
+        public Android.Icu.Util.MeasureUnit WithPrefix(Android.Icu.Util.MeasureUnit.MeasurePrefix arg0)
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.MeasureUnit.MeasurePrefix>("getPrefix", "()Landroid/icu/util/MeasureUnit$MeasurePrefix;"); }
+            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("withPrefix", "(Landroid/icu/util/MeasureUnit$MeasurePrefix;)Landroid/icu/util/MeasureUnit;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getSubtype()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getComplexity()"/>
         /// </summary>
-        public Java.Lang.String Subtype
+        /// <returns><see cref="Android.Icu.Util.MeasureUnit.Complexity"/></returns>
+        public Android.Icu.Util.MeasureUnit.Complexity GetComplexity()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubtype", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit.Complexity>("getComplexity", "()Landroid/icu/util/MeasureUnit$Complexity;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getPrefix()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Android.Icu.Util.MeasureUnit.MeasurePrefix"/></returns>
+        public Android.Icu.Util.MeasureUnit.MeasurePrefix GetPrefix()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit.MeasurePrefix>("getPrefix", "()Landroid/icu/util/MeasureUnit$MeasurePrefix;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#product(android.icu.util.MeasureUnit)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getDimensionality()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.MeasureUnit"/></param>
-        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
-        public Android.Icu.Util.MeasureUnit Product(Android.Icu.Util.MeasureUnit arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetDimensionality()
         {
-            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("product", "(Landroid/icu/util/MeasureUnit;)Landroid/icu/util/MeasureUnit;", arg0);
+            return IExecuteWithSignature<int>("getDimensionality", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#reciprocal()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getIdentifier()"/>
         /// </summary>
-        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
-        public Android.Icu.Util.MeasureUnit Reciprocal()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetIdentifier()
         {
-            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("reciprocal", "()Landroid/icu/util/MeasureUnit;");
+            return IExecuteWithSignature<Java.Lang.String>("getIdentifier", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#withDimensionality(int)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getSubtype()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
-        public Android.Icu.Util.MeasureUnit WithDimensionality(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubtype()
         {
-            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("withDimensionality", "(I)Landroid/icu/util/MeasureUnit;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSubtype", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#withPrefix(android.icu.util.MeasureUnit.MeasurePrefix)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#getType()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.MeasureUnit.MeasurePrefix"/></param>
-        /// <returns><see cref="Android.Icu.Util.MeasureUnit"/></returns>
-        public Android.Icu.Util.MeasureUnit WithPrefix(Android.Icu.Util.MeasureUnit.MeasurePrefix arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            return IExecuteWithSignature<Android.Icu.Util.MeasureUnit>("withPrefix", "(Landroid/icu/util/MeasureUnit$MeasurePrefix;)Landroid/icu/util/MeasureUnit;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.html#splitToSingleUnits()"/>
@@ -1362,18 +1370,20 @@ public static Android.Icu.Util.MeasureUnit.MeasurePrefix[] Values()
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.MeasurePrefix.html#getBase()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.MeasurePrefix.html#getBase()"/>
             /// </summary>
-            public int Base
+            /// <returns><see cref="int"/></returns>
+            public int GetBase()
             {
-                get { return IExecuteWithSignature<int>("getBase", "()I"); }
+                return IExecuteWithSignature<int>("getBase", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.MeasurePrefix.html#getPower()"/> 
+            /// <see href="https://developer.android.com/reference/android/icu/util/MeasureUnit.MeasurePrefix.html#getPower()"/>
             /// </summary>
-            public int Power
+            /// <returns><see cref="int"/></returns>
+            public int GetPower()
             {
-                get { return IExecuteWithSignature<int>("getPower", "()I"); }
+                return IExecuteWithSignature<int>("getPower", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/TimeZone.cs b/src/net/Netdroid/Generated/Android/Icu/Util/TimeZone.cs
index 13fda8ba0..3eee1a01d 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/TimeZone.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/TimeZone.cs
@@ -132,25 +132,12 @@ public partial class TimeZone : Java.Io.ISerializable, Java.Lang.ICloneable, And
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getAvailableIDs()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getDefault()"/>
         /// </summary>
-        public static Java.Lang.String[] AvailableIDs
-        {
-            get { return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getAvailableIDs", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getDefault()"/> 
-        /// </summary>
-        public static Android.Icu.Util.TimeZone Default
-        {
-            get { return SExecuteWithSignature<Android.Icu.Util.TimeZone>(LocalBridgeClazz, "getDefault", "()Landroid/icu/util/TimeZone;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getTZDataVersion()"/> 
-        /// </summary>
-        public static Java.Lang.String TZDataVersion
+        /// <returns><see cref="Android.Icu.Util.TimeZone"/></returns>
+        public static Android.Icu.Util.TimeZone GetDefault()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getTZDataVersion", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Android.Icu.Util.TimeZone>(LocalBridgeClazz, "getDefault", "()Landroid/icu/util/TimeZone;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getFrozenTimeZone(java.lang.String)"/>
@@ -238,6 +225,14 @@ public static Java.Lang.String GetRegion(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getRegion", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getTZDataVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetTZDataVersion()
+        {
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getTZDataVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getWindowsID(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -247,6 +242,14 @@ public static Java.Lang.String GetWindowsID(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getWindowsID", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getAvailableIDs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String[] GetAvailableIDs()
+        {
+            return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getAvailableIDs", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getAvailableIDs(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -280,34 +283,6 @@ public static Java.Lang.String[] GetAvailableIDs(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getDisplayName()"/> 
-        /// </summary>
-        public Java.Lang.String DisplayName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getDSTSavings()"/> 
-        /// </summary>
-        public int DSTSavings
-        {
-            get { return IExecuteWithSignature<int>("getDSTSavings", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getID()"/> <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#setID(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String ID
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getID", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setID", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getRawOffset()"/> <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#setRawOffset(int)"/>
-        /// </summary>
-        public int RawOffset
-        {
-            get { return IExecuteWithSignature<int>("getRawOffset", "()I"); } set { IExecuteWithSignature("setRawOffset", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#inDaylightTime(java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
@@ -339,6 +314,22 @@ public int GetOffset(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
             return IExecute<int>("getOffset", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getRawOffset()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRawOffset()
+        {
+            return IExecuteWithSignature<int>("getRawOffset", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#setRawOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRawOffset(int arg0)
+        {
+            IExecuteWithSignature("setRawOffset", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#hasSameRules(android.icu.util.TimeZone)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.TimeZone"/></param>
@@ -364,6 +355,14 @@ public bool ObservesDaylightTime()
             return IExecuteWithSignature<bool>("observesDaylightTime", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getDisplayName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getDisplayName(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -392,6 +391,14 @@ public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getDSTSavings()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDSTSavings()
+        {
+            return IExecuteWithSignature<int>("getDSTSavings", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getOffset(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -439,6 +446,14 @@ public Java.Lang.String GetDisplayName(bool arg0, int arg1, Java.Util.Locale arg
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getID()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetID()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getID", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#getOffset(long,boolean,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -448,6 +463,14 @@ public void GetOffset(long arg0, bool arg1, int[] arg2)
         {
             IExecute("getOffset", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/TimeZone.html#setID(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetID(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setID", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/ULocale.cs b/src/net/Netdroid/Generated/Android/Icu/Util/ULocale.cs
index 726c7f0dd..38c97585a 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/ULocale.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/ULocale.cs
@@ -221,34 +221,6 @@ public ULocale(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getAvailableLocales()"/> 
-        /// </summary>
-        public static Android.Icu.Util.ULocale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getAvailableLocales", "()[Landroid/icu/util/ULocale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDefault()"/> 
-        /// </summary>
-        public static Android.Icu.Util.ULocale Default
-        {
-            get { return SExecuteWithSignature<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getDefault", "()Landroid/icu/util/ULocale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getISOCountries()"/> 
-        /// </summary>
-        public static Java.Lang.String[] ISOCountries
-        {
-            get { return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getISOCountries", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getISOLanguages()"/> 
-        /// </summary>
-        public static Java.Lang.String[] ISOLanguages
-        {
-            get { return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getISOLanguages", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#acceptLanguage(android.icu.util.ULocale[],android.icu.util.ULocale[],boolean[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -336,6 +308,14 @@ public static Android.Icu.Util.ULocale ForLocale(Java.Util.Locale arg0)
             return SExecuteWithSignature<Android.Icu.Util.ULocale>(LocalBridgeClazz, "forLocale", "(Ljava/util/Locale;)Landroid/icu/util/ULocale;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDefault()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public static Android.Icu.Util.ULocale GetDefault()
+        {
+            return SExecuteWithSignature<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getDefault", "()Landroid/icu/util/ULocale;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDefault(android.icu.util.ULocale.Category)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale.Category"/></param>
@@ -354,6 +334,14 @@ public static Android.Icu.Util.ULocale MinimizeSubtags(Android.Icu.Util.ULocale
             return SExecuteWithSignature<Android.Icu.Util.ULocale>(LocalBridgeClazz, "minimizeSubtags", "(Landroid/icu/util/ULocale;)Landroid/icu/util/ULocale;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getAvailableLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public static Android.Icu.Util.ULocale[] GetAvailableLocales()
+        {
+            return SExecuteWithSignatureArray<Android.Icu.Util.ULocale>(LocalBridgeClazz, "getAvailableLocales", "()[Landroid/icu/util/ULocale;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#canonicalize(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -694,6 +682,22 @@ public static Java.Lang.String ToUnicodeLocaleType(Java.Lang.String arg0, Java.L
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "toUnicodeLocaleType", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getISOCountries()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String[] GetISOCountries()
+        {
+            return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getISOCountries", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getISOLanguages()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String[] GetISOLanguages()
+        {
+            return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getISOLanguages", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getAvailableLocalesByType(android.icu.util.ULocale.AvailableType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale.AvailableType"/></param>
@@ -716,319 +720,341 @@ public static Java.Lang.String ToUnicodeLocaleType(Java.Lang.String arg0, Java.L
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getBaseName()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getFallback()"/>
         /// </summary>
-        public Java.Lang.String BaseName
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetFallback()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBaseName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getFallback", "()Landroid/icu/util/ULocale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getCharacterOrientation()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#setKeywordValue(java.lang.String,java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String CharacterOrientation
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale SetKeywordValue(Java.Lang.String arg0, Java.Lang.String arg1)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCharacterOrientation", "()Ljava/lang/String;"); }
+            return IExecute<Android.Icu.Util.ULocale>("setKeywordValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getCountry()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#isRightToLeft()"/>
         /// </summary>
-        public Java.Lang.String Country
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRightToLeft()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCountry", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isRightToLeft", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayCountry()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#compareTo(android.icu.util.ULocale)"/>
         /// </summary>
-        public Java.Lang.String DisplayCountry
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(Android.Icu.Util.ULocale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayCountry", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("compareTo", "(Landroid/icu/util/ULocale;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayLanguage()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#compareTo(java.lang.Object)"/>
         /// </summary>
-        public Java.Lang.String DisplayLanguage
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayLanguageWithDialect()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getBaseName()"/>
         /// </summary>
-        public Java.Lang.String DisplayLanguageWithDialect
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBaseName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguageWithDialect", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getBaseName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getCharacterOrientation()"/>
         /// </summary>
-        public Java.Lang.String DisplayName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCharacterOrientation()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCharacterOrientation", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayNameWithDialect()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getCountry()"/>
         /// </summary>
-        public Java.Lang.String DisplayNameWithDialect
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCountry()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayNameWithDialect", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCountry", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayScript()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayCountry()"/>
         /// </summary>
-        public Java.Lang.String DisplayScript
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayCountry()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayScript", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayCountry", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayVariant()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayCountry(android.icu.util.ULocale)"/>
         /// </summary>
-        public Java.Lang.String DisplayVariant
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayCountry(Android.Icu.Util.ULocale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayVariant", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayCountry", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getExtensionKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayKeywordValue(java.lang.String,android.icu.util.ULocale)"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.Character> ExtensionKeys
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayKeywordValue(Java.Lang.String arg0, Android.Icu.Util.ULocale arg1)
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.Character>>("getExtensionKeys", "()Ljava/util/Set;"); }
+            return IExecute<Java.Lang.String>("getDisplayKeywordValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getFallback()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayKeywordValue(java.lang.String)"/>
         /// </summary>
-        public Android.Icu.Util.ULocale Fallback
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayKeywordValue(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getFallback", "()Landroid/icu/util/ULocale;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayKeywordValue", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getISO3Country()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayLanguage()"/>
         /// </summary>
-        public Java.Lang.String ISO3Country
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayLanguage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getISO3Country", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getISO3Language()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayLanguage(android.icu.util.ULocale)"/>
         /// </summary>
-        public Java.Lang.String ISO3Language
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayLanguage(Android.Icu.Util.ULocale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getISO3Language", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguage", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getKeywords()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayLanguageWithDialect()"/>
         /// </summary>
-        public Java.Util.Iterator<Java.Lang.String> Keywords
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayLanguageWithDialect()
         {
-            get { return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getKeywords", "()Ljava/util/Iterator;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguageWithDialect", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getLanguage()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayLanguageWithDialect(android.icu.util.ULocale)"/>
         /// </summary>
-        public Java.Lang.String Language
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayLanguageWithDialect(Android.Icu.Util.ULocale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguageWithDialect", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getLineOrientation()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayName()"/>
         /// </summary>
-        public Java.Lang.String LineOrientation
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLineOrientation", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayName(android.icu.util.ULocale)"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName(Android.Icu.Util.ULocale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getScript()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayNameWithDialect()"/>
         /// </summary>
-        public Java.Lang.String Script
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayNameWithDialect()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getScript", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayNameWithDialect", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getUnicodeLocaleAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayNameWithDialect(android.icu.util.ULocale)"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> UnicodeLocaleAttributes
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayNameWithDialect(Android.Icu.Util.ULocale arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getUnicodeLocaleAttributes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayNameWithDialect", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getUnicodeLocaleKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayScript()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> UnicodeLocaleKeys
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayScript()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getUnicodeLocaleKeys", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayScript", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getVariant()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayScript(android.icu.util.ULocale)"/>
         /// </summary>
-        public Java.Lang.String Variant
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayScript(Android.Icu.Util.ULocale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVariant", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayScript", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#setKeywordValue(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayVariant()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
-        public Android.Icu.Util.ULocale SetKeywordValue(Java.Lang.String arg0, Java.Lang.String arg1)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayVariant()
         {
-            return IExecute<Android.Icu.Util.ULocale>("setKeywordValue", arg0, arg1);
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayVariant", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#isRightToLeft()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayVariant(android.icu.util.ULocale)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRightToLeft()
+        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayVariant(Android.Icu.Util.ULocale arg0)
         {
-            return IExecuteWithSignature<bool>("isRightToLeft", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayVariant", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#compareTo(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getExtension(char)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(Android.Icu.Util.ULocale arg0)
+        /// <param name="arg0"><see cref="char"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetExtension(char arg0)
         {
-            return IExecuteWithSignature<int>("compareTo", "(Landroid/icu/util/ULocale;)I", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getExtension", "(C)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getISO3Country()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(object arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetISO3Country()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getISO3Country", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayCountry(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getISO3Language()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayCountry(Android.Icu.Util.ULocale arg0)
+        public Java.Lang.String GetISO3Language()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayCountry", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getISO3Language", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayKeywordValue(java.lang.String,android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getKeywordValue(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Android.Icu.Util.ULocale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayKeywordValue(Java.Lang.String arg0, Android.Icu.Util.ULocale arg1)
+        public Java.Lang.String GetKeywordValue(Java.Lang.String arg0)
         {
-            return IExecute<Java.Lang.String>("getDisplayKeywordValue", arg0, arg1);
+            return IExecuteWithSignature<Java.Lang.String>("getKeywordValue", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayKeywordValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getLanguage()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayKeywordValue(Java.Lang.String arg0)
+        public Java.Lang.String GetLanguage()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayKeywordValue", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayLanguage(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getLineOrientation()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayLanguage(Android.Icu.Util.ULocale arg0)
+        public Java.Lang.String GetLineOrientation()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguage", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getLineOrientation", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayLanguageWithDialect(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayLanguageWithDialect(Android.Icu.Util.ULocale arg0)
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguageWithDialect", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayName(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getScript()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayName(Android.Icu.Util.ULocale arg0)
+        public Java.Lang.String GetScript()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getScript", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayNameWithDialect(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getUnicodeLocaleType(java.lang.String)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayNameWithDialect(Android.Icu.Util.ULocale arg0)
+        public Java.Lang.String GetUnicodeLocaleType(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayNameWithDialect", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getUnicodeLocaleType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayScript(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getVariant()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayScript(Android.Icu.Util.ULocale arg0)
+        public Java.Lang.String GetVariant()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayScript", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getVariant", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getDisplayVariant(android.icu.util.ULocale)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#toLanguageTag()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayVariant(Android.Icu.Util.ULocale arg0)
+        public Java.Lang.String ToLanguageTag()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayVariant", "(Landroid/icu/util/ULocale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("toLanguageTag", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getExtension(char)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getKeywords()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="char"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetExtension(char arg0)
+        /// <returns><see cref="Java.Util.Iterator"/></returns>
+        public Java.Util.Iterator<Java.Lang.String> GetKeywords()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getExtension", "(C)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getKeywords", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getKeywordValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#toLocale()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetKeywordValue(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale ToLocale()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getKeywordValue", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Util.Locale>("toLocale", "()Ljava/util/Locale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getUnicodeLocaleType(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getExtensionKeys()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetUnicodeLocaleType(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Character> GetExtensionKeys()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getUnicodeLocaleType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Character>>("getExtensionKeys", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#toLanguageTag()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getUnicodeLocaleAttributes()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToLanguageTag()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetUnicodeLocaleAttributes()
         {
-            return IExecuteWithSignature<Java.Lang.String>("toLanguageTag", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getUnicodeLocaleAttributes", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#toLocale()"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/ULocale.html#getUnicodeLocaleKeys()"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Locale"/></returns>
-        public Java.Util.Locale ToLocale()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetUnicodeLocaleKeys()
         {
-            return IExecuteWithSignature<Java.Util.Locale>("toLocale", "()Ljava/util/Locale;");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getUnicodeLocaleKeys", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/UniversalTimeScale.cs b/src/net/Netdroid/Generated/Android/Icu/Util/UniversalTimeScale.cs
index 0171852ec..64c744995 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/UniversalTimeScale.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/UniversalTimeScale.cs
@@ -106,7 +106,7 @@ public partial class UniversalTimeScale
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/icu/util/UniversalTimeScale.html#MAX_SCALE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MAX_SCALE { get { if (!_MAX_SCALEReady) { _MAX_SCALEContent = SGetField<int>(LocalBridgeClazz, "MAX_SCALE"); _MAX_SCALEReady = true; } return _MAX_SCALEContent; } }
         private static int _MAX_SCALEContent = default;
         private static bool _MAX_SCALEReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Icu/Util/VersionInfo.cs b/src/net/Netdroid/Generated/Android/Icu/Util/VersionInfo.cs
index 6a6d9cd73..269f6779e 100644
--- a/src/net/Netdroid/Generated/Android/Icu/Util/VersionInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Icu/Util/VersionInfo.cs
@@ -319,50 +319,54 @@ public static Android.Icu.Util.VersionInfo GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#getMajor()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#compareTo(android.icu.util.VersionInfo)"/>
         /// </summary>
-        public int Major
+        /// <param name="arg0"><see cref="Android.Icu.Util.VersionInfo"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(Android.Icu.Util.VersionInfo arg0)
         {
-            get { return IExecuteWithSignature<int>("getMajor", "()I"); }
+            return IExecuteWithSignature<int>("compareTo", "(Landroid/icu/util/VersionInfo;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#getMicro()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#compareTo(java.lang.Object)"/>
         /// </summary>
-        public int Micro
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
         {
-            get { return IExecuteWithSignature<int>("getMicro", "()I"); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#getMilli()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#getMajor()"/>
         /// </summary>
-        public int Milli
+        /// <returns><see cref="int"/></returns>
+        public int GetMajor()
         {
-            get { return IExecuteWithSignature<int>("getMilli", "()I"); }
+            return IExecuteWithSignature<int>("getMajor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#getMinor()"/> 
+        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#getMicro()"/>
         /// </summary>
-        public int Minor
+        /// <returns><see cref="int"/></returns>
+        public int GetMicro()
         {
-            get { return IExecuteWithSignature<int>("getMinor", "()I"); }
+            return IExecuteWithSignature<int>("getMicro", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#compareTo(android.icu.util.VersionInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#getMilli()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Icu.Util.VersionInfo"/></param>
         /// <returns><see cref="int"/></returns>
-        public int CompareTo(Android.Icu.Util.VersionInfo arg0)
+        public int GetMilli()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Landroid/icu/util/VersionInfo;)I", arg0);
+            return IExecuteWithSignature<int>("getMilli", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/icu/util/VersionInfo.html#getMinor()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
-        public int CompareTo(object arg0)
+        public int GetMinor()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+            return IExecuteWithSignature<int>("getMinor", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Inputmethodservice/AbstractInputMethodService.cs b/src/net/Netdroid/Generated/Android/Inputmethodservice/AbstractInputMethodService.cs
index f38c5a24a..d9aa28578 100644
--- a/src/net/Netdroid/Generated/Android/Inputmethodservice/AbstractInputMethodService.cs
+++ b/src/net/Netdroid/Generated/Android/Inputmethodservice/AbstractInputMethodService.cs
@@ -46,13 +46,6 @@ public partial class AbstractInputMethodService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/AbstractInputMethodService.html#getKeyDispatcherState()"/> 
-        /// </summary>
-        public Android.View.KeyEvent.DispatcherState KeyDispatcherState
-        {
-            get { return IExecuteWithSignature<Android.View.KeyEvent.DispatcherState>("getKeyDispatcherState", "()Landroid/view/KeyEvent$DispatcherState;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/AbstractInputMethodService.html#onCreateInputMethodInterface()"/>
         /// </summary>
         /// <returns><see cref="Android.Inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl"/></returns>
@@ -69,6 +62,14 @@ public Android.Inputmethodservice.AbstractInputMethodService.AbstractInputMethod
             return IExecuteWithSignature<Android.Inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl>("onCreateInputMethodSessionInterface", "()Landroid/inputmethodservice/AbstractInputMethodService$AbstractInputMethodSessionImpl;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/AbstractInputMethodService.html#getKeyDispatcherState()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.KeyEvent.DispatcherState"/></returns>
+        public Android.View.KeyEvent.DispatcherState GetKeyDispatcherState()
+        {
+            return IExecuteWithSignature<Android.View.KeyEvent.DispatcherState>("getKeyDispatcherState", "()Landroid/view/KeyEvent$DispatcherState;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/AbstractInputMethodService.html#onGenericMotionEvent(android.view.MotionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Inputmethodservice/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Inputmethodservice/AllPackageClasses.cs
index f311e8b1a..45759d226 100644
--- a/src/net/Netdroid/Generated/Android/Inputmethodservice/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Inputmethodservice/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class AbstractInputMethodService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractInputMethodService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractInputMethodService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractInputMethodService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractInputMethodService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractInputMethodService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractInputMethodService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -78,12 +78,12 @@ public partial class AbstractInputMethodImpl : Android.View.Inputmethod.InputMet
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AbstractInputMethodImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractInputMethodImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractInputMethodImpl() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AbstractInputMethodImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractInputMethodImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractInputMethodImpl(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -124,12 +124,12 @@ public partial class AbstractInputMethodSessionImpl : Android.View.Inputmethod.I
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AbstractInputMethodSessionImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractInputMethodSessionImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractInputMethodSessionImpl() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AbstractInputMethodSessionImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractInputMethodSessionImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractInputMethodSessionImpl(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -388,7 +388,7 @@ public Insets(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Keyboard : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Keyboard>
     {
         const string _bridgeClassName = "android.inputmethodservice.Keyboard";
@@ -429,7 +429,7 @@ public Keyboard(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Key : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Key>
         {
             const string _bridgeClassName = "android.inputmethodservice.Keyboard$Key";
@@ -474,7 +474,7 @@ public Key(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Row.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Row : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Row>
         {
             const string _bridgeClassName = "android.inputmethodservice.Keyboard$Row";
@@ -523,7 +523,7 @@ public Row(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class KeyboardView : Android.View.View
     {
         const string _bridgeClassName = "android.inputmethodservice.KeyboardView";
@@ -564,7 +564,7 @@ public KeyboardView(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnKeyboardActionListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -572,10 +572,13 @@ public partial class OnKeyboardActionListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnKeyboardActionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.inputmethodservice.KeyboardView_OnKeyboardActionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.inputmethodservice.OnKeyboardActionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -597,10 +600,13 @@ public partial class OnKeyboardActionListenerDirect : OnKeyboardActionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.inputmethodservice.KeyboardView$OnKeyboardActionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.inputmethodservice.KeyboardView$OnKeyboardActionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Inputmethodservice/InputMethodService.cs b/src/net/Netdroid/Generated/Android/Inputmethodservice/InputMethodService.cs
index 6fb767a7c..e4560e5d6 100644
--- a/src/net/Netdroid/Generated/Android/Inputmethodservice/InputMethodService.cs
+++ b/src/net/Netdroid/Generated/Android/Inputmethodservice/InputMethodService.cs
@@ -52,14 +52,14 @@ public partial class InputMethodService
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#BACK_DISPOSITION_WILL_DISMISS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BACK_DISPOSITION_WILL_DISMISS { get { if (!_BACK_DISPOSITION_WILL_DISMISSReady) { _BACK_DISPOSITION_WILL_DISMISSContent = SGetField<int>(LocalBridgeClazz, "BACK_DISPOSITION_WILL_DISMISS"); _BACK_DISPOSITION_WILL_DISMISSReady = true; } return _BACK_DISPOSITION_WILL_DISMISSContent; } }
         private static int _BACK_DISPOSITION_WILL_DISMISSContent = default;
         private static bool _BACK_DISPOSITION_WILL_DISMISSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#BACK_DISPOSITION_WILL_NOT_DISMISS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BACK_DISPOSITION_WILL_NOT_DISMISS { get { if (!_BACK_DISPOSITION_WILL_NOT_DISMISSReady) { _BACK_DISPOSITION_WILL_NOT_DISMISSContent = SGetField<int>(LocalBridgeClazz, "BACK_DISPOSITION_WILL_NOT_DISMISS"); _BACK_DISPOSITION_WILL_NOT_DISMISSReady = true; } return _BACK_DISPOSITION_WILL_NOT_DISMISSContent; } }
         private static int _BACK_DISPOSITION_WILL_NOT_DISMISSContent = default;
         private static bool _BACK_DISPOSITION_WILL_NOT_DISMISSReady = false; // this is used because in case of generics 
@@ -68,109 +68,65 @@ public partial class InputMethodService
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getStylusHandwritingIdleTimeoutMax()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getStylusHandwritingIdleTimeoutMax()"/>
         /// </summary>
-        public static Java.Time.Duration StylusHandwritingIdleTimeoutMax
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public static Java.Time.Duration GetStylusHandwritingIdleTimeoutMax()
         {
-            get { return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "getStylusHandwritingIdleTimeoutMax", "()Ljava/time/Duration;"); }
+            return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "getStylusHandwritingIdleTimeoutMax", "()Ljava/time/Duration;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getBackDisposition()"/> <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#setBackDisposition(int)"/>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getWindow()"/>
         /// </summary>
-        public int BackDisposition
+        /// <returns><see cref="Android.App.Dialog"/></returns>
+        public Android.App.Dialog GetWindow()
         {
-            get { return IExecuteWithSignature<int>("getBackDisposition", "()I"); } set { IExecuteWithSignature("setBackDisposition", "(I)V", value); }
+            return IExecuteWithSignature<Android.App.Dialog>("getWindow", "()Landroid/app/Dialog;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCandidatesHiddenVisibility()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCurrentInputEditorInfo()"/>
         /// </summary>
-        public int CandidatesHiddenVisibility
+        /// <returns><see cref="Android.View.Inputmethod.EditorInfo"/></returns>
+        public Android.View.Inputmethod.EditorInfo GetCurrentInputEditorInfo()
         {
-            get { return IExecuteWithSignature<int>("getCandidatesHiddenVisibility", "()I"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.EditorInfo>("getCurrentInputEditorInfo", "()Landroid/view/inputmethod/EditorInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCurrentInputBinding()"/> 
-        /// </summary>
-        public Android.View.Inputmethod.InputBinding CurrentInputBinding
-        {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.InputBinding>("getCurrentInputBinding", "()Landroid/view/inputmethod/InputBinding;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCurrentInputConnection()"/> 
-        /// </summary>
-        public Android.View.Inputmethod.InputConnection CurrentInputConnection
-        {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.InputConnection>("getCurrentInputConnection", "()Landroid/view/inputmethod/InputConnection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCurrentInputEditorInfo()"/> 
-        /// </summary>
-        public Android.View.Inputmethod.EditorInfo CurrentInputEditorInfo
-        {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.EditorInfo>("getCurrentInputEditorInfo", "()Landroid/view/inputmethod/EditorInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCurrentInputStarted()"/> 
-        /// </summary>
-        public bool CurrentInputStarted
-        {
-            get { return IExecuteWithSignature<bool>("getCurrentInputStarted", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getInputMethodWindowRecommendedHeight()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int InputMethodWindowRecommendedHeight
-        {
-            get { return IExecuteWithSignature<int>("getInputMethodWindowRecommendedHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getLayoutInflater()"/> 
-        /// </summary>
-        public Android.View.LayoutInflater LayoutInflater
-        {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getMaxWidth()"/> 
-        /// </summary>
-        public int MaxWidth
-        {
-            get { return IExecuteWithSignature<int>("getMaxWidth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getStylusHandwritingSessionTimeout()"/> <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#setStylusHandwritingSessionTimeout(java.time.Duration)"/>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#onCreateInlineSuggestionsRequest(android.os.Bundle)"/>
         /// </summary>
-        public Java.Time.Duration StylusHandwritingSessionTimeout
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        /// <returns><see cref="Android.View.Inputmethod.InlineSuggestionsRequest"/></returns>
+        public Android.View.Inputmethod.InlineSuggestionsRequest OnCreateInlineSuggestionsRequest(Android.Os.Bundle arg0)
         {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getStylusHandwritingSessionTimeout", "()Ljava/time/Duration;"); } set { IExecuteWithSignature("setStylusHandwritingSessionTimeout", "(Ljava/time/Duration;)V", value); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InlineSuggestionsRequest>("onCreateInlineSuggestionsRequest", "(Landroid/os/Bundle;)Landroid/view/inputmethod/InlineSuggestionsRequest;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getStylusHandwritingWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCurrentInputBinding()"/>
         /// </summary>
-        public Android.View.Window StylusHandwritingWindow
+        /// <returns><see cref="Android.View.Inputmethod.InputBinding"/></returns>
+        public Android.View.Inputmethod.InputBinding GetCurrentInputBinding()
         {
-            get { return IExecuteWithSignature<Android.View.Window>("getStylusHandwritingWindow", "()Landroid/view/Window;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InputBinding>("getCurrentInputBinding", "()Landroid/view/inputmethod/InputBinding;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCurrentInputConnection()"/>
         /// </summary>
-        public Android.App.Dialog Window
+        /// <returns><see cref="Android.View.Inputmethod.InputConnection"/></returns>
+        public Android.View.Inputmethod.InputConnection GetCurrentInputConnection()
         {
-            get { return IExecuteWithSignature<Android.App.Dialog>("getWindow", "()Landroid/app/Dialog;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InputConnection>("getCurrentInputConnection", "()Landroid/view/inputmethod/InputConnection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#onCreateInlineSuggestionsRequest(android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getLayoutInflater()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        /// <returns><see cref="Android.View.Inputmethod.InlineSuggestionsRequest"/></returns>
-        public Android.View.Inputmethod.InlineSuggestionsRequest OnCreateInlineSuggestionsRequest(Android.Os.Bundle arg0)
+        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
+        public Android.View.LayoutInflater GetLayoutInflater()
         {
-            return IExecuteWithSignature<Android.View.Inputmethod.InlineSuggestionsRequest>("onCreateInlineSuggestionsRequest", "(Landroid/os/Bundle;)Landroid/view/inputmethod/InlineSuggestionsRequest;", arg0);
+            return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#onCreateCandidatesView()"/>
@@ -200,12 +156,20 @@ public Android.View.View OnCreateInputView()
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#enableHardwareAcceleration()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool EnableHardwareAcceleration()
         {
             return IExecuteWithSignature<bool>("enableHardwareAcceleration", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCurrentInputStarted()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetCurrentInputStarted()
+        {
+            return IExecuteWithSignature<bool>("getCurrentInputStarted", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#isExtractViewShown()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -299,6 +263,14 @@ public bool SendDefaultEditorAction(bool arg0)
             return IExecuteWithSignature<bool>("sendDefaultEditorAction", "(Z)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getStylusHandwritingWindow()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Window"/></returns>
+        public Android.View.Window GetStylusHandwritingWindow()
+        {
+            return IExecuteWithSignature<Android.View.Window>("getStylusHandwritingWindow", "()Landroid/view/Window;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#shouldOfferSwitchingToNextInputMethod()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -324,6 +296,14 @@ public bool SwitchToPreviousInputMethod()
             return IExecuteWithSignature<bool>("switchToPreviousInputMethod", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getStylusHandwritingSessionTimeout()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetStylusHandwritingSessionTimeout()
+        {
+            return IExecuteWithSignature<Java.Time.Duration>("getStylusHandwritingSessionTimeout", "()Ljava/time/Duration;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#finishStylusHandwriting()"/>
         /// </summary>
         public void FinishStylusHandwriting()
@@ -339,6 +319,14 @@ public void RequestShowSelf(int arg0)
             IExecuteWithSignature("requestShowSelf", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#setStylusHandwritingSessionTimeout(java.time.Duration)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Duration"/></param>
+        public void SetStylusHandwritingSessionTimeout(Java.Time.Duration arg0)
+        {
+            IExecuteWithSignature("setStylusHandwritingSessionTimeout", "(Ljava/time/Duration;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#switchInputMethod(java.lang.String,android.view.inputmethod.InputMethodSubtype)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -348,6 +336,39 @@ public void SwitchInputMethod(Java.Lang.String arg0, Android.View.Inputmethod.In
             IExecute("switchInputMethod", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getBackDisposition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBackDisposition()
+        {
+            return IExecuteWithSignature<int>("getBackDisposition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getCandidatesHiddenVisibility()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCandidatesHiddenVisibility()
+        {
+            return IExecuteWithSignature<int>("getCandidatesHiddenVisibility", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getInputMethodWindowRecommendedHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetInputMethodWindowRecommendedHeight()
+        {
+            return IExecuteWithSignature<int>("getInputMethodWindowRecommendedHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getMaxWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxWidth()
+        {
+            return IExecuteWithSignature<int>("getMaxWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#getTextForImeAction(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -535,7 +556,7 @@ public void OnUnbindInput()
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#onUpdateCursor(android.graphics.Rect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnUpdateCursor(Android.Graphics.Rect arg0)
         {
             IExecuteWithSignature("onUpdateCursor", "(Landroid/graphics/Rect;)V", arg0);
@@ -598,7 +619,7 @@ public void OnUpdateSelection(int arg0, int arg1, int arg2, int arg3, int arg4,
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#onViewClicked(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnViewClicked(bool arg0)
         {
             IExecuteWithSignature("onViewClicked", "(Z)V", arg0);
@@ -642,6 +663,14 @@ public void SendKeyChar(char arg0)
             IExecuteWithSignature("sendKeyChar", "(C)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#setBackDisposition(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBackDisposition(int arg0)
+        {
+            IExecuteWithSignature("setBackDisposition", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/InputMethodService.html#setCandidatesView(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Inputmethodservice/Keyboard.cs b/src/net/Netdroid/Generated/Android/Inputmethodservice/Keyboard.cs
index 3192d2de5..bf99d27ce 100644
--- a/src/net/Netdroid/Generated/Android/Inputmethodservice/Keyboard.cs
+++ b/src/net/Netdroid/Generated/Android/Inputmethodservice/Keyboard.cs
@@ -37,7 +37,7 @@ public partial class Keyboard
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Keyboard(Android.Content.Context arg0, int arg1, int arg2, int arg3, int arg4)
             : base(arg0, arg1, arg2, arg3, arg4)
         {
@@ -48,7 +48,7 @@ public Keyboard(Android.Content.Context arg0, int arg1, int arg2, int arg3, int
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Keyboard(Android.Content.Context arg0, int arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -61,7 +61,7 @@ public Keyboard(Android.Content.Context arg0, int arg1, int arg2)
         /// <param name="arg2"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Keyboard(Android.Content.Context arg0, int arg1, Java.Lang.CharSequence arg2, int arg3, int arg4)
             : base(arg0, arg1, arg2, arg3, arg4)
         {
@@ -71,7 +71,7 @@ public Keyboard(Android.Content.Context arg0, int arg1, Java.Lang.CharSequence a
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Keyboard(Android.Content.Context arg0, int arg1)
             : base(arg0, arg1)
         {
@@ -87,70 +87,70 @@ public Keyboard(Android.Content.Context arg0, int arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#EDGE_BOTTOM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EDGE_BOTTOM { get { if (!_EDGE_BOTTOMReady) { _EDGE_BOTTOMContent = SGetField<int>(LocalBridgeClazz, "EDGE_BOTTOM"); _EDGE_BOTTOMReady = true; } return _EDGE_BOTTOMContent; } }
         private static int _EDGE_BOTTOMContent = default;
         private static bool _EDGE_BOTTOMReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#EDGE_LEFT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EDGE_LEFT { get { if (!_EDGE_LEFTReady) { _EDGE_LEFTContent = SGetField<int>(LocalBridgeClazz, "EDGE_LEFT"); _EDGE_LEFTReady = true; } return _EDGE_LEFTContent; } }
         private static int _EDGE_LEFTContent = default;
         private static bool _EDGE_LEFTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#EDGE_RIGHT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EDGE_RIGHT { get { if (!_EDGE_RIGHTReady) { _EDGE_RIGHTContent = SGetField<int>(LocalBridgeClazz, "EDGE_RIGHT"); _EDGE_RIGHTReady = true; } return _EDGE_RIGHTContent; } }
         private static int _EDGE_RIGHTContent = default;
         private static bool _EDGE_RIGHTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#EDGE_TOP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EDGE_TOP { get { if (!_EDGE_TOPReady) { _EDGE_TOPContent = SGetField<int>(LocalBridgeClazz, "EDGE_TOP"); _EDGE_TOPReady = true; } return _EDGE_TOPContent; } }
         private static int _EDGE_TOPContent = default;
         private static bool _EDGE_TOPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#KEYCODE_ALT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KEYCODE_ALT { get { if (!_KEYCODE_ALTReady) { _KEYCODE_ALTContent = SGetField<int>(LocalBridgeClazz, "KEYCODE_ALT"); _KEYCODE_ALTReady = true; } return _KEYCODE_ALTContent; } }
         private static int _KEYCODE_ALTContent = default;
         private static bool _KEYCODE_ALTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#KEYCODE_CANCEL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KEYCODE_CANCEL { get { if (!_KEYCODE_CANCELReady) { _KEYCODE_CANCELContent = SGetField<int>(LocalBridgeClazz, "KEYCODE_CANCEL"); _KEYCODE_CANCELReady = true; } return _KEYCODE_CANCELContent; } }
         private static int _KEYCODE_CANCELContent = default;
         private static bool _KEYCODE_CANCELReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#KEYCODE_DELETE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KEYCODE_DELETE { get { if (!_KEYCODE_DELETEReady) { _KEYCODE_DELETEContent = SGetField<int>(LocalBridgeClazz, "KEYCODE_DELETE"); _KEYCODE_DELETEReady = true; } return _KEYCODE_DELETEContent; } }
         private static int _KEYCODE_DELETEContent = default;
         private static bool _KEYCODE_DELETEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#KEYCODE_DONE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KEYCODE_DONE { get { if (!_KEYCODE_DONEReady) { _KEYCODE_DONEContent = SGetField<int>(LocalBridgeClazz, "KEYCODE_DONE"); _KEYCODE_DONEReady = true; } return _KEYCODE_DONEContent; } }
         private static int _KEYCODE_DONEContent = default;
         private static bool _KEYCODE_DONEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#KEYCODE_MODE_CHANGE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KEYCODE_MODE_CHANGE { get { if (!_KEYCODE_MODE_CHANGEReady) { _KEYCODE_MODE_CHANGEContent = SGetField<int>(LocalBridgeClazz, "KEYCODE_MODE_CHANGE"); _KEYCODE_MODE_CHANGEReady = true; } return _KEYCODE_MODE_CHANGEContent; } }
         private static int _KEYCODE_MODE_CHANGEContent = default;
         private static bool _KEYCODE_MODE_CHANGEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#KEYCODE_SHIFT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KEYCODE_SHIFT { get { if (!_KEYCODE_SHIFTReady) { _KEYCODE_SHIFTContent = SGetField<int>(LocalBridgeClazz, "KEYCODE_SHIFT"); _KEYCODE_SHIFTReady = true; } return _KEYCODE_SHIFTContent; } }
         private static int _KEYCODE_SHIFTContent = default;
         private static bool _KEYCODE_SHIFTReady = false; // this is used because in case of generics 
@@ -163,74 +163,79 @@ public Keyboard(Android.Content.Context arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#isShifted()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Height
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsShifted()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<bool>("isShifted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#setShifted(boolean)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Android.Inputmethodservice.Keyboard.Key> Keys
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool SetShifted(bool arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Inputmethodservice.Keyboard.Key>>("getKeys", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("setShifted", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getMinWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getHeight()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int MinWidth
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getMinWidth", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getModifierKeys()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getMinWidth()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Android.Inputmethodservice.Keyboard.Key> ModifierKeys
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMinWidth()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Inputmethodservice.Keyboard.Key>>("getModifierKeys", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getMinWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getShiftKeyIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getShiftKeyIndex()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int ShiftKeyIndex
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetShiftKeyIndex()
         {
-            get { return IExecuteWithSignature<int>("getShiftKeyIndex", "()I"); }
+            return IExecuteWithSignature<int>("getShiftKeyIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#isShifted()"/>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getNearestKeys(int,int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsShifted()
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int[] GetNearestKeys(int arg0, int arg1)
         {
-            return IExecuteWithSignature<bool>("isShifted", "()Z");
+            return IExecuteArray<int>("getNearestKeys", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#setShifted(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getKeys()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool SetShifted(bool arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Android.Inputmethodservice.Keyboard.Key> GetKeys()
         {
-            return IExecuteWithSignature<bool>("setShifted", "(Z)Z", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Inputmethodservice.Keyboard.Key>>("getKeys", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getNearestKeys(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.html#getModifierKeys()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public int[] GetNearestKeys(int arg0, int arg1)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Android.Inputmethodservice.Keyboard.Key> GetModifierKeys()
         {
-            return IExecuteArray<int>("getNearestKeys", arg0, arg1);
+            return IExecuteWithSignature<Java.Util.List<Android.Inputmethodservice.Keyboard.Key>>("getModifierKeys", "()Ljava/util/List;");
         }
 
         #endregion
@@ -248,7 +253,7 @@ public partial class Key
             /// <param name="arg2"><see cref="int"/></param>
             /// <param name="arg3"><see cref="int"/></param>
             /// <param name="arg4"><see cref="Android.Content.Res.XmlResourceParser"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Key(Android.Content.Res.Resources arg0, Android.Inputmethodservice.Keyboard.Row arg1, int arg2, int arg3, Android.Content.Res.XmlResourceParser arg4)
                 : base(arg0, arg1, arg2, arg3, arg4)
             {
@@ -257,7 +262,7 @@ public Key(Android.Content.Res.Resources arg0, Android.Inputmethodservice.Keyboa
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#%3Cinit%3E(android.inputmethodservice.Keyboard.Row)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Inputmethodservice.Keyboard.Row"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Key(Android.Inputmethodservice.Keyboard.Row arg0)
                 : base(arg0)
             {
@@ -273,92 +278,92 @@ public Key(Android.Inputmethodservice.Keyboard.Row arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#icon"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Drawable.Drawable icon { get { return IGetField<Android.Graphics.Drawable.Drawable>("icon"); } set { ISetField("icon", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#iconPreview"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Graphics.Drawable.Drawable iconPreview { get { return IGetField<Android.Graphics.Drawable.Drawable>("iconPreview"); } set { ISetField("iconPreview", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#modifier"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool modifier { get { return IGetField<bool>("modifier"); } set { ISetField("modifier", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#on"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool on { get { return IGetField<bool>("on"); } set { ISetField("on", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#pressed"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool pressed { get { return IGetField<bool>("pressed"); } set { ISetField("pressed", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#repeatable"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool repeatable { get { return IGetField<bool>("repeatable"); } set { ISetField("repeatable", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#sticky"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool sticky { get { return IGetField<bool>("sticky"); } set { ISetField("sticky", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#edgeFlags"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int edgeFlags { get { return IGetField<int>("edgeFlags"); } set { ISetField("edgeFlags", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#gap"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int gap { get { return IGetField<int>("gap"); } set { ISetField("gap", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#height"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int height { get { return IGetField<int>("height"); } set { ISetField("height", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#popupResId"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int popupResId { get { return IGetField<int>("popupResId"); } set { ISetField("popupResId", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#width"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int width { get { return IGetField<int>("width"); } set { ISetField("width", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#x"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int x { get { return IGetField<int>("x"); } set { ISetField("x", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#y"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int y { get { return IGetField<int>("y"); } set { ISetField("y", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#codes"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int[] codes { get { return IGetFieldArray<int>("codes"); } set { ISetField("codes", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#label"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence label { get { return IGetField<Java.Lang.CharSequence>("label"); } set { ISetField("label", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#popupCharacters"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence popupCharacters { get { return IGetField<Java.Lang.CharSequence>("popupCharacters"); } set { ISetField("popupCharacters", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#text"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence text { get { return IGetField<Java.Lang.CharSequence>("text"); } set { ISetField("text", value); } }
 
             #endregion
@@ -369,20 +374,12 @@ public Key(Android.Inputmethodservice.Keyboard.Row arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#getCurrentDrawableState()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public int[] CurrentDrawableState
-            {
-                get { return IExecuteWithSignatureArray<int>("getCurrentDrawableState", "()[I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#isInside(int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool IsInside(int arg0, int arg1)
             {
                 return IExecute<bool>("isInside", arg0, arg1);
@@ -393,15 +390,24 @@ public bool IsInside(int arg0, int arg1)
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <returns><see cref="int"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int SquaredDistanceFrom(int arg0, int arg1)
             {
                 return IExecute<int>("squaredDistanceFrom", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#getCurrentDrawableState()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int[] GetCurrentDrawableState()
+            {
+                return IExecuteWithSignatureArray<int>("getCurrentDrawableState", "()[I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#onPressed()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnPressed()
             {
                 IExecuteWithSignature("onPressed", "()V");
@@ -410,7 +416,7 @@ public void OnPressed()
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Key.html#onReleased(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnReleased(bool arg0)
             {
                 IExecuteWithSignature("onReleased", "(Z)V", arg0);
@@ -436,7 +442,7 @@ public partial class Row
             /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
             /// <param name="arg1"><see cref="Android.Inputmethodservice.Keyboard"/></param>
             /// <param name="arg2"><see cref="Android.Content.Res.XmlResourceParser"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Row(Android.Content.Res.Resources arg0, Android.Inputmethodservice.Keyboard arg1, Android.Content.Res.XmlResourceParser arg2)
                 : base(arg0, arg1, arg2)
             {
@@ -445,7 +451,7 @@ public Row(Android.Content.Res.Resources arg0, Android.Inputmethodservice.Keyboa
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Row.html#%3Cinit%3E(android.inputmethodservice.Keyboard)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Inputmethodservice.Keyboard"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Row(Android.Inputmethodservice.Keyboard arg0)
                 : base(arg0)
             {
@@ -461,32 +467,32 @@ public Row(Android.Inputmethodservice.Keyboard arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Row.html#defaultHeight"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int defaultHeight { get { return IGetField<int>("defaultHeight"); } set { ISetField("defaultHeight", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Row.html#defaultHorizontalGap"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int defaultHorizontalGap { get { return IGetField<int>("defaultHorizontalGap"); } set { ISetField("defaultHorizontalGap", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Row.html#defaultWidth"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int defaultWidth { get { return IGetField<int>("defaultWidth"); } set { ISetField("defaultWidth", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Row.html#mode"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int mode { get { return IGetField<int>("mode"); } set { ISetField("mode", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Row.html#rowEdgeFlags"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int rowEdgeFlags { get { return IGetField<int>("rowEdgeFlags"); } set { ISetField("rowEdgeFlags", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/Keyboard.Row.html#verticalGap"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int verticalGap { get { return IGetField<int>("verticalGap"); } set { ISetField("verticalGap", value); } }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Inputmethodservice/KeyboardView.cs b/src/net/Netdroid/Generated/Android/Inputmethodservice/KeyboardView.cs
index 295b47e24..0fa03e7f4 100644
--- a/src/net/Netdroid/Generated/Android/Inputmethodservice/KeyboardView.cs
+++ b/src/net/Netdroid/Generated/Android/Inputmethodservice/KeyboardView.cs
@@ -36,7 +36,7 @@ public partial class KeyboardView
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public KeyboardView(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public KeyboardView(Android.Content.Context arg0, Android.Util.AttributeSet arg1
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public KeyboardView(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public KeyboardView(Android.Content.Context arg0, Android.Util.AttributeSet arg1
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public KeyboardView(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -79,18 +79,19 @@ public KeyboardView(Android.Content.Context arg0, Android.Util.AttributeSet arg1
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#getKeyboard()"/> <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#setKeyboard(android.inputmethodservice.Keyboard)"/>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#getKeyboard()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Inputmethodservice.Keyboard Keyboard
+        /// <returns><see cref="Android.Inputmethodservice.Keyboard"/></returns>
+        [global::System.Obsolete()]
+        public Android.Inputmethodservice.Keyboard GetKeyboard()
         {
-            get { return IExecuteWithSignature<Android.Inputmethodservice.Keyboard>("getKeyboard", "()Landroid/inputmethodservice/Keyboard;"); } set { IExecuteWithSignature("setKeyboard", "(Landroid/inputmethodservice/Keyboard;)V", value); }
+            return IExecuteWithSignature<Android.Inputmethodservice.Keyboard>("getKeyboard", "()Landroid/inputmethodservice/Keyboard;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#handleBack()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HandleBack()
         {
             return IExecuteWithSignature<bool>("handleBack", "()Z");
@@ -99,7 +100,7 @@ public bool HandleBack()
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#isPreviewEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsPreviewEnabled()
         {
             return IExecuteWithSignature<bool>("isPreviewEnabled", "()Z");
@@ -108,7 +109,7 @@ public bool IsPreviewEnabled()
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#isProximityCorrectionEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsProximityCorrectionEnabled()
         {
             return IExecuteWithSignature<bool>("isProximityCorrectionEnabled", "()Z");
@@ -117,7 +118,7 @@ public bool IsProximityCorrectionEnabled()
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#isShifted()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsShifted()
         {
             return IExecuteWithSignature<bool>("isShifted", "()Z");
@@ -127,7 +128,7 @@ public bool IsShifted()
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetShifted(bool arg0)
         {
             return IExecuteWithSignature<bool>("setShifted", "(Z)Z", arg0);
@@ -135,7 +136,7 @@ public bool SetShifted(bool arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#closing()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Closing()
         {
             IExecuteWithSignature("closing", "()V");
@@ -143,7 +144,7 @@ public void Closing()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#invalidateAllKeys()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void InvalidateAllKeys()
         {
             IExecuteWithSignature("invalidateAllKeys", "()V");
@@ -152,7 +153,7 @@ public void InvalidateAllKeys()
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#invalidateKey(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void InvalidateKey(int arg0)
         {
             IExecuteWithSignature("invalidateKey", "(I)V", arg0);
@@ -168,7 +169,7 @@ public void OnClick(Android.View.View arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#onDetachedFromWindow()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDetachedFromWindow()
         {
             IExecuteWithSignature("onDetachedFromWindow", "()V");
@@ -177,7 +178,7 @@ public void OnDetachedFromWindow()
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#onDraw(android.graphics.Canvas)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDraw(Android.Graphics.Canvas arg0)
         {
             IExecuteWithSignature("onDraw", "(Landroid/graphics/Canvas;)V", arg0);
@@ -187,7 +188,7 @@ public void OnDraw(Android.Graphics.Canvas arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnMeasure(int arg0, int arg1)
         {
             IExecute("onMeasure", arg0, arg1);
@@ -199,16 +200,25 @@ public void OnMeasure(int arg0, int arg1)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnSizeChanged(int arg0, int arg1, int arg2, int arg3)
         {
             IExecute("onSizeChanged", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#setKeyboard(android.inputmethodservice.Keyboard)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Inputmethodservice.Keyboard"/></param>
+        [global::System.Obsolete()]
+        public void SetKeyboard(Android.Inputmethodservice.Keyboard arg0)
+        {
+            IExecuteWithSignature("setKeyboard", "(Landroid/inputmethodservice/Keyboard;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#setOnKeyboardActionListener(android.inputmethodservice.KeyboardView.OnKeyboardActionListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Inputmethodservice.KeyboardView.OnKeyboardActionListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnKeyboardActionListener(Android.Inputmethodservice.KeyboardView.OnKeyboardActionListener arg0)
         {
             IExecuteWithSignature("setOnKeyboardActionListener", "(Landroid/inputmethodservice/KeyboardView$OnKeyboardActionListener;)V", arg0);
@@ -218,7 +228,7 @@ public void SetOnKeyboardActionListener(Android.Inputmethodservice.KeyboardView.
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPopupOffset(int arg0, int arg1)
         {
             IExecute("setPopupOffset", arg0, arg1);
@@ -227,7 +237,7 @@ public void SetPopupOffset(int arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#setPopupParent(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPopupParent(Android.View.View arg0)
         {
             IExecuteWithSignature("setPopupParent", "(Landroid/view/View;)V", arg0);
@@ -236,7 +246,7 @@ public void SetPopupParent(Android.View.View arg0)
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#setPreviewEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPreviewEnabled(bool arg0)
         {
             IExecuteWithSignature("setPreviewEnabled", "(Z)V", arg0);
@@ -245,7 +255,7 @@ public void SetPreviewEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#setProximityCorrectionEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetProximityCorrectionEnabled(bool arg0)
         {
             IExecuteWithSignature("setProximityCorrectionEnabled", "(Z)V", arg0);
@@ -254,7 +264,7 @@ public void SetProximityCorrectionEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.html#setVerticalCorrection(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVerticalCorrection(int arg0)
         {
             IExecuteWithSignature("setVerticalCorrection", "(I)V", arg0);
@@ -288,14 +298,14 @@ public partial class OnKeyboardActionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onKey", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnKeyEventHandler));
-                AddEventHandler("onPress", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnPressEventHandler));
-                AddEventHandler("onRelease", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnReleaseEventHandler));
-                AddEventHandler("onText", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(OnTextEventHandler));
-                AddEventHandler("swipeDown", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(SwipeDownEventHandler));
-                AddEventHandler("swipeLeft", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(SwipeLeftEventHandler));
-                AddEventHandler("swipeRight", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(SwipeRightEventHandler));
-                AddEventHandler("swipeUp", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(SwipeUpEventHandler));
+                AddEventHandler("onKey", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnKeyEventHandler));
+                AddEventHandler("onPress", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnPressEventHandler));
+                AddEventHandler("onRelease", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnReleaseEventHandler));
+                AddEventHandler("onText", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(OnTextEventHandler));
+                AddEventHandler("swipeDown", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(SwipeDownEventHandler));
+                AddEventHandler("swipeLeft", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(SwipeLeftEventHandler));
+                AddEventHandler("swipeRight", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(SwipeRightEventHandler));
+                AddEventHandler("swipeUp", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(SwipeUpEventHandler));
 
             }
 
@@ -303,7 +313,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onKey(int,int[])"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnKey"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, int[]> OnOnKey { get; set; } = null;
+            public global::System.Action<int, int[]> OnOnKey { get; set; } = null;
 
             void OnKeyEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -316,7 +326,7 @@ void OnKeyEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> da
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnKey(int arg0, int[] arg1)
             {
                 
@@ -326,7 +336,7 @@ public virtual void OnKey(int arg0, int[] arg1)
             /// Handler for <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onPress(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPress"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnPress { get; set; } = null;
+            public global::System.Action<int> OnOnPress { get; set; } = null;
 
             void OnPressEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -338,7 +348,7 @@ void OnPressEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onPress(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnPress(int arg0)
             {
                 
@@ -348,7 +358,7 @@ public virtual void OnPress(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onRelease(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRelease"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnRelease { get; set; } = null;
+            public global::System.Action<int> OnOnRelease { get; set; } = null;
 
             void OnReleaseEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -360,7 +370,7 @@ void OnReleaseEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onRelease(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnRelease(int arg0)
             {
                 
@@ -370,7 +380,7 @@ public virtual void OnRelease(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onText(java.lang.CharSequence)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnText"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.CharSequence> OnOnText { get; set; } = null;
+            public global::System.Action<Java.Lang.CharSequence> OnOnText { get; set; } = null;
 
             void OnTextEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
             {
@@ -382,7 +392,7 @@ void OnTextEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.La
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onText(java.lang.CharSequence)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnText(Java.Lang.CharSequence arg0)
             {
                 
@@ -392,7 +402,7 @@ public virtual void OnText(Java.Lang.CharSequence arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeDown()"/>
             /// </summary>
             /// <remarks>If <see cref="OnSwipeDown"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnSwipeDown { get; set; } = null;
+            public global::System.Action OnSwipeDown { get; set; } = null;
 
             void SwipeDownEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -403,7 +413,7 @@ void SwipeDownEventHandler(object sender, CLRListenerEventArgs<CLREventData> dat
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeDown()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void SwipeDown()
             {
                 
@@ -413,7 +423,7 @@ public virtual void SwipeDown()
             /// Handler for <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeLeft()"/>
             /// </summary>
             /// <remarks>If <see cref="OnSwipeLeft"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnSwipeLeft { get; set; } = null;
+            public global::System.Action OnSwipeLeft { get; set; } = null;
 
             void SwipeLeftEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -424,7 +434,7 @@ void SwipeLeftEventHandler(object sender, CLRListenerEventArgs<CLREventData> dat
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeLeft()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void SwipeLeft()
             {
                 
@@ -434,7 +444,7 @@ public virtual void SwipeLeft()
             /// Handler for <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeRight()"/>
             /// </summary>
             /// <remarks>If <see cref="OnSwipeRight"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnSwipeRight { get; set; } = null;
+            public global::System.Action OnSwipeRight { get; set; } = null;
 
             void SwipeRightEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -445,7 +455,7 @@ void SwipeRightEventHandler(object sender, CLRListenerEventArgs<CLREventData> da
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeRight()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void SwipeRight()
             {
                 
@@ -455,7 +465,7 @@ public virtual void SwipeRight()
             /// Handler for <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeUp()"/>
             /// </summary>
             /// <remarks>If <see cref="OnSwipeUp"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnSwipeUp { get; set; } = null;
+            public global::System.Action OnSwipeUp { get; set; } = null;
 
             void SwipeUpEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -466,7 +476,7 @@ void SwipeUpEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeUp()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void SwipeUp()
             {
                 
@@ -507,7 +517,7 @@ public partial class OnKeyboardActionListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnKey(int arg0, int[] arg1)
             {
                 IExecute("onKey", arg0, arg1);
@@ -516,7 +526,7 @@ public override void OnKey(int arg0, int[] arg1)
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onPress(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnPress(int arg0)
             {
                 IExecuteWithSignature("onPress", "(I)V", arg0);
@@ -525,7 +535,7 @@ public override void OnPress(int arg0)
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onRelease(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnRelease(int arg0)
             {
                 IExecuteWithSignature("onRelease", "(I)V", arg0);
@@ -534,7 +544,7 @@ public override void OnRelease(int arg0)
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#onText(java.lang.CharSequence)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnText(Java.Lang.CharSequence arg0)
             {
                 IExecuteWithSignature("onText", "(Ljava/lang/CharSequence;)V", arg0);
@@ -542,7 +552,7 @@ public override void OnText(Java.Lang.CharSequence arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeDown()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void SwipeDown()
             {
                 IExecuteWithSignature("swipeDown", "()V");
@@ -550,7 +560,7 @@ public override void SwipeDown()
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeLeft()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void SwipeLeft()
             {
                 IExecuteWithSignature("swipeLeft", "()V");
@@ -558,7 +568,7 @@ public override void SwipeLeft()
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeRight()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void SwipeRight()
             {
                 IExecuteWithSignature("swipeRight", "()V");
@@ -566,7 +576,7 @@ public override void SwipeRight()
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/inputmethodservice/KeyboardView.OnKeyboardActionListener.html#swipeUp()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void SwipeUp()
             {
                 IExecuteWithSignature("swipeUp", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Location/Address.cs b/src/net/Netdroid/Generated/Android/Location/Address.cs
index 940da47eb..9aab0b0a8 100644
--- a/src/net/Netdroid/Generated/Android/Location/Address.cs
+++ b/src/net/Netdroid/Generated/Android/Location/Address.cs
@@ -60,163 +60,181 @@ public Address(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getAdminArea()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setAdminArea(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getExtras()"/>
         /// </summary>
-        public Java.Lang.String AdminArea
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAdminArea", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setAdminArea", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getCountryCode()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setCountryCode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#hasLatitude()"/>
         /// </summary>
-        public Java.Lang.String CountryCode
+        /// <returns><see cref="bool"/></returns>
+        public bool HasLatitude()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCountryCode", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCountryCode", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("hasLatitude", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getCountryName()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setCountryName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#hasLongitude()"/>
         /// </summary>
-        public Java.Lang.String CountryName
+        /// <returns><see cref="bool"/></returns>
+        public bool HasLongitude()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCountryName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCountryName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("hasLongitude", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getExtras()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setExtras(android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getLatitude()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="double"/></returns>
+        public double GetLatitude()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", value); }
+            return IExecuteWithSignature<double>("getLatitude", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getFeatureName()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setFeatureName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getLongitude()"/>
         /// </summary>
-        public Java.Lang.String FeatureName
+        /// <returns><see cref="double"/></returns>
+        public double GetLongitude()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFeatureName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFeatureName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<double>("getLongitude", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getLatitude()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setLatitude(double)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#describeContents()"/>
         /// </summary>
-        public double Latitude
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<double>("getLatitude", "()D"); } set { IExecuteWithSignature("setLatitude", "(D)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getMaxAddressLineIndex()"/>
         /// </summary>
-        public Java.Util.Locale Locale
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxAddressLineIndex()
         {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
+            return IExecuteWithSignature<int>("getMaxAddressLineIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getLocality()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setLocality(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getAddressLine(int)"/>
         /// </summary>
-        public Java.Lang.String Locality
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAddressLine(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocality", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setLocality", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getAddressLine", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getLongitude()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setLongitude(double)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getAdminArea()"/>
         /// </summary>
-        public double Longitude
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAdminArea()
         {
-            get { return IExecuteWithSignature<double>("getLongitude", "()D"); } set { IExecuteWithSignature("setLongitude", "(D)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getAdminArea", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getMaxAddressLineIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getCountryCode()"/>
         /// </summary>
-        public int MaxAddressLineIndex
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCountryCode()
         {
-            get { return IExecuteWithSignature<int>("getMaxAddressLineIndex", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCountryCode", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getPhone()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setPhone(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getCountryName()"/>
         /// </summary>
-        public Java.Lang.String Phone
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCountryName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPhone", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPhone", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getCountryName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getPostalCode()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setPostalCode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getFeatureName()"/>
         /// </summary>
-        public Java.Lang.String PostalCode
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFeatureName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPostalCode", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPostalCode", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getFeatureName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getPremises()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setPremises(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getLocality()"/>
         /// </summary>
-        public Java.Lang.String Premises
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLocality()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPremises", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPremises", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getLocality", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getSubAdminArea()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setSubAdminArea(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getPhone()"/>
         /// </summary>
-        public Java.Lang.String SubAdminArea
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPhone()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubAdminArea", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSubAdminArea", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPhone", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getSubLocality()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setSubLocality(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getPostalCode()"/>
         /// </summary>
-        public Java.Lang.String SubLocality
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPostalCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubLocality", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSubLocality", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPostalCode", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getSubThoroughfare()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setSubThoroughfare(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getPremises()"/>
         /// </summary>
-        public Java.Lang.String SubThoroughfare
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPremises()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubThoroughfare", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSubThoroughfare", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPremises", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getThoroughfare()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setThoroughfare(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getSubAdminArea()"/>
         /// </summary>
-        public Java.Lang.String Thoroughfare
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubAdminArea()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getThoroughfare", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setThoroughfare", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSubAdminArea", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getUrl()"/> <see href="https://developer.android.com/reference/android/location/Address.html#setUrl(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getSubLocality()"/>
         /// </summary>
-        public Java.Lang.String Url
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubLocality()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setUrl", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSubLocality", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#hasLatitude()"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getSubThoroughfare()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasLatitude()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubThoroughfare()
         {
-            return IExecuteWithSignature<bool>("hasLatitude", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSubThoroughfare", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#hasLongitude()"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getThoroughfare()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasLongitude()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetThoroughfare()
         {
-            return IExecuteWithSignature<bool>("hasLongitude", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getThoroughfare", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getUrl()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUrl()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Address.html#getAddressLine(int)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#getLocale()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetAddressLine(int arg0)
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getAddressLine", "(I)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Address.html#clearLatitude()"/>
@@ -242,6 +260,134 @@ public void SetAddressLine(int arg0, Java.Lang.String arg1)
             IExecute("setAddressLine", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setAdminArea(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetAdminArea(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setAdminArea", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setCountryCode(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetCountryCode(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setCountryCode", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setCountryName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetCountryName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setCountryName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setExtras(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        public void SetExtras(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setFeatureName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFeatureName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFeatureName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setLatitude(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        public void SetLatitude(double arg0)
+        {
+            IExecuteWithSignature("setLatitude", "(D)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setLocality(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetLocality(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setLocality", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setLongitude(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        public void SetLongitude(double arg0)
+        {
+            IExecuteWithSignature("setLongitude", "(D)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setPhone(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPhone(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPhone", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setPostalCode(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPostalCode(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPostalCode", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setPremises(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPremises(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPremises", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setSubAdminArea(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSubAdminArea(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSubAdminArea", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setSubLocality(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSubLocality(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSubLocality", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setSubThoroughfare(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSubThoroughfare(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSubThoroughfare", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setThoroughfare(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetThoroughfare(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setThoroughfare", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Address.html#setUrl(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetUrl(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setUrl", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Address.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Location/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Location/AllPackageClasses.cs
index f98ccf64b..24dcc16fc 100644
--- a/src/net/Netdroid/Generated/Android/Location/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Location/AllPackageClasses.cs
@@ -74,7 +74,7 @@ public Address(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/location/Criteria.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Criteria : Android.Os.Parcelable
     {
         const string _bridgeClassName = "android.location.Criteria";
@@ -166,10 +166,13 @@ public partial class GeocodeListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public GeocodeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.location.Geocoder_GeocodeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.location.GeocodeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -191,10 +194,13 @@ public partial class GeocodeListenerDirect : GeocodeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.location.Geocoder$GeocodeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.location.Geocoder$GeocodeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -313,10 +319,13 @@ public partial class Listener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public Listener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.location.GnssAntennaInfo_Listener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.location.Listener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -338,10 +347,13 @@ public partial class ListenerDirect : Listener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.location.GnssAntennaInfo$Listener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.location.GnssAntennaInfo$Listener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -899,12 +911,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -989,12 +1001,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1167,12 +1179,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1211,7 +1223,7 @@ public Callback(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class GpsSatellite : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GpsSatellite>
     {
         const string _bridgeClassName = "android.location.GpsSatellite";
@@ -1256,7 +1268,7 @@ public GpsSatellite(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class GpsStatus : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GpsStatus>
     {
         const string _bridgeClassName = "android.location.GpsStatus";
@@ -1297,7 +1309,7 @@ public GpsStatus(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GpsStatus.Listener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Listener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -1305,10 +1317,13 @@ public partial class Listener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public Listener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.location.GpsStatus_Listener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.location.Listener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1330,10 +1345,13 @@ public partial class ListenerDirect : Listener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.location.GpsStatus$Listener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.location.GpsStatus$Listener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1357,7 +1375,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GpsStatus.NmeaListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class NmeaListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -1365,10 +1383,13 @@ public partial class NmeaListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public NmeaListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.location.GpsStatus_NmeaListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.location.NmeaListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1390,10 +1411,13 @@ public partial class NmeaListenerDirect : NmeaListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.location.GpsStatus$NmeaListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.location.GpsStatus$NmeaListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1472,10 +1496,13 @@ public partial class LocationListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
         /// </summary>
         public LocationListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.location.LocationListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.location.LocationListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1497,10 +1524,13 @@ public partial class LocationListenerDirect : LocationListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.location.LocationListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.location.LocationListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1568,7 +1598,7 @@ public LocationManager(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LocationProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LocationProvider>
     {
         const string _bridgeClassName = "android.location.LocationProvider";
@@ -1708,10 +1738,13 @@ public partial class OnNmeaMessageListener : MASES.JCOBridge.C2JBridge.JVMBridge
         /// </summary>
         public OnNmeaMessageListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.location.OnNmeaMessageListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.location.OnNmeaMessageListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1733,10 +1766,13 @@ public partial class OnNmeaMessageListenerDirect : OnNmeaMessageListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.location.OnNmeaMessageListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.location.OnNmeaMessageListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1766,12 +1802,12 @@ public partial class SettingInjectorService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SettingInjectorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SettingInjectorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SettingInjectorService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SettingInjectorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SettingInjectorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SettingInjectorService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Location/Criteria.cs b/src/net/Netdroid/Generated/Android/Location/Criteria.cs
index ae211a0b8..7d165cd62 100644
--- a/src/net/Netdroid/Generated/Android/Location/Criteria.cs
+++ b/src/net/Netdroid/Generated/Android/Location/Criteria.cs
@@ -33,7 +33,7 @@ public partial class Criteria
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#%3Cinit%3E(android.location.Criteria)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.Criteria"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Criteria(Android.Location.Criteria arg0)
             : base(arg0)
         {
@@ -49,70 +49,70 @@ public Criteria(Android.Location.Criteria arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#CREATOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
         private static Android.Os.Parcelable.Creator _CREATORContent = default;
         private static bool _CREATORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#ACCURACY_COARSE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACCURACY_COARSE { get { if (!_ACCURACY_COARSEReady) { _ACCURACY_COARSEContent = SGetField<int>(LocalBridgeClazz, "ACCURACY_COARSE"); _ACCURACY_COARSEReady = true; } return _ACCURACY_COARSEContent; } }
         private static int _ACCURACY_COARSEContent = default;
         private static bool _ACCURACY_COARSEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#ACCURACY_FINE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACCURACY_FINE { get { if (!_ACCURACY_FINEReady) { _ACCURACY_FINEContent = SGetField<int>(LocalBridgeClazz, "ACCURACY_FINE"); _ACCURACY_FINEReady = true; } return _ACCURACY_FINEContent; } }
         private static int _ACCURACY_FINEContent = default;
         private static bool _ACCURACY_FINEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#ACCURACY_HIGH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACCURACY_HIGH { get { if (!_ACCURACY_HIGHReady) { _ACCURACY_HIGHContent = SGetField<int>(LocalBridgeClazz, "ACCURACY_HIGH"); _ACCURACY_HIGHReady = true; } return _ACCURACY_HIGHContent; } }
         private static int _ACCURACY_HIGHContent = default;
         private static bool _ACCURACY_HIGHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#ACCURACY_LOW"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACCURACY_LOW { get { if (!_ACCURACY_LOWReady) { _ACCURACY_LOWContent = SGetField<int>(LocalBridgeClazz, "ACCURACY_LOW"); _ACCURACY_LOWReady = true; } return _ACCURACY_LOWContent; } }
         private static int _ACCURACY_LOWContent = default;
         private static bool _ACCURACY_LOWReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#ACCURACY_MEDIUM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACCURACY_MEDIUM { get { if (!_ACCURACY_MEDIUMReady) { _ACCURACY_MEDIUMContent = SGetField<int>(LocalBridgeClazz, "ACCURACY_MEDIUM"); _ACCURACY_MEDIUMReady = true; } return _ACCURACY_MEDIUMContent; } }
         private static int _ACCURACY_MEDIUMContent = default;
         private static bool _ACCURACY_MEDIUMReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#NO_REQUIREMENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NO_REQUIREMENT { get { if (!_NO_REQUIREMENTReady) { _NO_REQUIREMENTContent = SGetField<int>(LocalBridgeClazz, "NO_REQUIREMENT"); _NO_REQUIREMENTReady = true; } return _NO_REQUIREMENTContent; } }
         private static int _NO_REQUIREMENTContent = default;
         private static bool _NO_REQUIREMENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#POWER_HIGH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int POWER_HIGH { get { if (!_POWER_HIGHReady) { _POWER_HIGHContent = SGetField<int>(LocalBridgeClazz, "POWER_HIGH"); _POWER_HIGHReady = true; } return _POWER_HIGHContent; } }
         private static int _POWER_HIGHContent = default;
         private static bool _POWER_HIGHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#POWER_LOW"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int POWER_LOW { get { if (!_POWER_LOWReady) { _POWER_LOWContent = SGetField<int>(LocalBridgeClazz, "POWER_LOW"); _POWER_LOWReady = true; } return _POWER_LOWContent; } }
         private static int _POWER_LOWContent = default;
         private static bool _POWER_LOWReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#POWER_MEDIUM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int POWER_MEDIUM { get { if (!_POWER_MEDIUMReady) { _POWER_MEDIUMContent = SGetField<int>(LocalBridgeClazz, "POWER_MEDIUM"); _POWER_MEDIUMReady = true; } return _POWER_MEDIUMContent; } }
         private static int _POWER_MEDIUMContent = default;
         private static bool _POWER_MEDIUMReady = false; // this is used because in case of generics 
@@ -125,112 +125,136 @@ public Criteria(Android.Location.Criteria arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getAccuracy()"/> <see href="https://developer.android.com/reference/android/location/Criteria.html#setAccuracy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#isAltitudeRequired()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Accuracy
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsAltitudeRequired()
         {
-            get { return IExecuteWithSignature<int>("getAccuracy", "()I"); } set { IExecuteWithSignature("setAccuracy", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isAltitudeRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getBearingAccuracy()"/> <see href="https://developer.android.com/reference/android/location/Criteria.html#setBearingAccuracy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#isBearingRequired()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int BearingAccuracy
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsBearingRequired()
         {
-            get { return IExecuteWithSignature<int>("getBearingAccuracy", "()I"); } set { IExecuteWithSignature("setBearingAccuracy", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isBearingRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getHorizontalAccuracy()"/> <see href="https://developer.android.com/reference/android/location/Criteria.html#setHorizontalAccuracy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#isCostAllowed()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int HorizontalAccuracy
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsCostAllowed()
         {
-            get { return IExecuteWithSignature<int>("getHorizontalAccuracy", "()I"); } set { IExecuteWithSignature("setHorizontalAccuracy", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isCostAllowed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getPowerRequirement()"/> <see href="https://developer.android.com/reference/android/location/Criteria.html#setPowerRequirement(int)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#isSpeedRequired()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int PowerRequirement
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsSpeedRequired()
         {
-            get { return IExecuteWithSignature<int>("getPowerRequirement", "()I"); } set { IExecuteWithSignature("setPowerRequirement", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isSpeedRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getSpeedAccuracy()"/> <see href="https://developer.android.com/reference/android/location/Criteria.html#setSpeedAccuracy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#describeContents()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SpeedAccuracy
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpeedAccuracy", "()I"); } set { IExecuteWithSignature("setSpeedAccuracy", "(I)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getVerticalAccuracy()"/> <see href="https://developer.android.com/reference/android/location/Criteria.html#setVerticalAccuracy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getAccuracy()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int VerticalAccuracy
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetAccuracy()
         {
-            get { return IExecuteWithSignature<int>("getVerticalAccuracy", "()I"); } set { IExecuteWithSignature("setVerticalAccuracy", "(I)V", value); }
+            return IExecuteWithSignature<int>("getAccuracy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#isAltitudeRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getBearingAccuracy()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsAltitudeRequired()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBearingAccuracy()
         {
-            return IExecuteWithSignature<bool>("isAltitudeRequired", "()Z");
+            return IExecuteWithSignature<int>("getBearingAccuracy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#isBearingRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getHorizontalAccuracy()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsBearingRequired()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetHorizontalAccuracy()
         {
-            return IExecuteWithSignature<bool>("isBearingRequired", "()Z");
+            return IExecuteWithSignature<int>("getHorizontalAccuracy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#isCostAllowed()"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getPowerRequirement()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsCostAllowed()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPowerRequirement()
         {
-            return IExecuteWithSignature<bool>("isCostAllowed", "()Z");
+            return IExecuteWithSignature<int>("getPowerRequirement", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#isSpeedRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getSpeedAccuracy()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsSpeedRequired()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSpeedAccuracy()
         {
-            return IExecuteWithSignature<bool>("isSpeedRequired", "()Z");
+            return IExecuteWithSignature<int>("getSpeedAccuracy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#getVerticalAccuracy()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public int DescribeContents()
+        [global::System.Obsolete()]
+        public int GetVerticalAccuracy()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getVerticalAccuracy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setAccuracy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetAccuracy(int arg0)
+        {
+            IExecuteWithSignature("setAccuracy", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setAltitudeRequired(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAltitudeRequired(bool arg0)
         {
             IExecuteWithSignature("setAltitudeRequired", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setBearingAccuracy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetBearingAccuracy(int arg0)
+        {
+            IExecuteWithSignature("setBearingAccuracy", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setBearingRequired(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetBearingRequired(bool arg0)
         {
             IExecuteWithSignature("setBearingRequired", "(Z)V", arg0);
@@ -239,26 +263,62 @@ public void SetBearingRequired(bool arg0)
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setCostAllowed(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCostAllowed(bool arg0)
         {
             IExecuteWithSignature("setCostAllowed", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setHorizontalAccuracy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetHorizontalAccuracy(int arg0)
+        {
+            IExecuteWithSignature("setHorizontalAccuracy", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setPowerRequirement(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetPowerRequirement(int arg0)
+        {
+            IExecuteWithSignature("setPowerRequirement", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setSpeedAccuracy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetSpeedAccuracy(int arg0)
+        {
+            IExecuteWithSignature("setSpeedAccuracy", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setSpeedRequired(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSpeedRequired(bool arg0)
         {
             IExecuteWithSignature("setSpeedRequired", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Criteria.html#setVerticalAccuracy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetVerticalAccuracy(int arg0)
+        {
+            IExecuteWithSignature("setVerticalAccuracy", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Criteria.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
             IExecute("writeToParcel", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Location/Geocoder.cs b/src/net/Netdroid/Generated/Android/Location/Geocoder.cs
index ac289718a..3f62c8047 100644
--- a/src/net/Netdroid/Generated/Android/Location/Geocoder.cs
+++ b/src/net/Netdroid/Generated/Android/Location/Geocoder.cs
@@ -78,7 +78,7 @@ public static bool IsPresent()
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.Location.Address> GetFromLocation(double arg0, double arg1, int arg2)
         {
             return IExecute<Java.Util.List<Android.Location.Address>>("getFromLocation", arg0, arg1, arg2);
@@ -94,7 +94,7 @@ public static bool IsPresent()
         /// <param name="arg5"><see cref="double"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.Location.Address> GetFromLocationName(Java.Lang.String arg0, int arg1, double arg2, double arg3, double arg4, double arg5)
         {
             return IExecute<Java.Util.List<Android.Location.Address>>("getFromLocationName", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -106,7 +106,7 @@ public static bool IsPresent()
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.Location.Address> GetFromLocationName(Java.Lang.String arg0, int arg1)
         {
             return IExecute<Java.Util.List<Android.Location.Address>>("getFromLocationName", arg0, arg1);
@@ -175,8 +175,8 @@ public partial class GeocodeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGeocode", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.Address>>>>(OnGeocodeEventHandler));
-                AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnErrorEventHandler));
+                AddEventHandler("onGeocode", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.Address>>>>(OnGeocodeEventHandler));
+                AddEventHandler("onError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnErrorEventHandler));
 
             }
 
@@ -184,7 +184,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/location/Geocoder.GeocodeListener.html#onGeocode(java.util.List)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGeocode"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.List<Android.Location.Address>> OnOnGeocode { get; set; } = null;
+            public global::System.Action<Java.Util.List<Android.Location.Address>> OnOnGeocode { get; set; } = null;
 
             void OnGeocodeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.Address>>> data)
             {
@@ -214,7 +214,7 @@ public void OnErrorDefault(Java.Lang.String arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/location/Geocoder.GeocodeListener.html#onError(java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String> OnOnError { get; set; } = null;
+            public global::System.Action<Java.Lang.String> OnOnError { get; set; } = null;
 
             void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssAntennaInfo.cs b/src/net/Netdroid/Generated/Android/Location/GnssAntennaInfo.cs
index 715b93676..9a041047b 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssAntennaInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssAntennaInfo.cs
@@ -52,32 +52,36 @@ public partial class GnssAntennaInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#getCarrierFrequencyMHz()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#getPhaseCenterOffset()"/>
         /// </summary>
-        public double CarrierFrequencyMHz
+        /// <returns><see cref="Android.Location.GnssAntennaInfo.PhaseCenterOffset"/></returns>
+        public Android.Location.GnssAntennaInfo.PhaseCenterOffset GetPhaseCenterOffset()
         {
-            get { return IExecuteWithSignature<double>("getCarrierFrequencyMHz", "()D"); }
+            return IExecuteWithSignature<Android.Location.GnssAntennaInfo.PhaseCenterOffset>("getPhaseCenterOffset", "()Landroid/location/GnssAntennaInfo$PhaseCenterOffset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#getPhaseCenterOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#getPhaseCenterVariationCorrections()"/>
         /// </summary>
-        public Android.Location.GnssAntennaInfo.PhaseCenterOffset GetPhaseCenterOffset
+        /// <returns><see cref="Android.Location.GnssAntennaInfo.SphericalCorrections"/></returns>
+        public Android.Location.GnssAntennaInfo.SphericalCorrections GetPhaseCenterVariationCorrections()
         {
-            get { return IExecuteWithSignature<Android.Location.GnssAntennaInfo.PhaseCenterOffset>("getPhaseCenterOffset", "()Landroid/location/GnssAntennaInfo$PhaseCenterOffset;"); }
+            return IExecuteWithSignature<Android.Location.GnssAntennaInfo.SphericalCorrections>("getPhaseCenterVariationCorrections", "()Landroid/location/GnssAntennaInfo$SphericalCorrections;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#getPhaseCenterVariationCorrections()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#getSignalGainCorrections()"/>
         /// </summary>
-        public Android.Location.GnssAntennaInfo.SphericalCorrections PhaseCenterVariationCorrections
+        /// <returns><see cref="Android.Location.GnssAntennaInfo.SphericalCorrections"/></returns>
+        public Android.Location.GnssAntennaInfo.SphericalCorrections GetSignalGainCorrections()
         {
-            get { return IExecuteWithSignature<Android.Location.GnssAntennaInfo.SphericalCorrections>("getPhaseCenterVariationCorrections", "()Landroid/location/GnssAntennaInfo$SphericalCorrections;"); }
+            return IExecuteWithSignature<Android.Location.GnssAntennaInfo.SphericalCorrections>("getSignalGainCorrections", "()Landroid/location/GnssAntennaInfo$SphericalCorrections;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#getSignalGainCorrections()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#getCarrierFrequencyMHz()"/>
         /// </summary>
-        public Android.Location.GnssAntennaInfo.SphericalCorrections SignalGainCorrections
+        /// <returns><see cref="double"/></returns>
+        public double GetCarrierFrequencyMHz()
         {
-            get { return IExecuteWithSignature<Android.Location.GnssAntennaInfo.SphericalCorrections>("getSignalGainCorrections", "()Landroid/location/GnssAntennaInfo$SphericalCorrections;"); }
+            return IExecuteWithSignature<double>("getCarrierFrequencyMHz", "()D");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.html#describeContents()"/>
@@ -217,7 +221,7 @@ public partial class Listener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGnssAntennaInfoReceived", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.GnssAntennaInfo>>>>(OnGnssAntennaInfoReceivedEventHandler));
+                AddEventHandler("onGnssAntennaInfoReceived", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.GnssAntennaInfo>>>>(OnGnssAntennaInfoReceivedEventHandler));
 
             }
 
@@ -225,7 +229,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.Listener.html#onGnssAntennaInfoReceived(java.util.List)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGnssAntennaInfoReceived"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.List<Android.Location.GnssAntennaInfo>> OnOnGnssAntennaInfoReceived { get; set; } = null;
+            public global::System.Action<Java.Util.List<Android.Location.GnssAntennaInfo>> OnOnGnssAntennaInfoReceived { get; set; } = null;
 
             void OnGnssAntennaInfoReceivedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.GnssAntennaInfo>>> data)
             {
@@ -331,46 +335,52 @@ public PhaseCenterOffset(double arg0, double arg1, double arg2, double arg3, dou
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getXOffsetMm()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getXOffsetMm()"/>
             /// </summary>
-            public double XOffsetMm
+            /// <returns><see cref="double"/></returns>
+            public double GetXOffsetMm()
             {
-                get { return IExecuteWithSignature<double>("getXOffsetMm", "()D"); }
+                return IExecuteWithSignature<double>("getXOffsetMm", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getXOffsetUncertaintyMm()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getXOffsetUncertaintyMm()"/>
             /// </summary>
-            public double XOffsetUncertaintyMm
+            /// <returns><see cref="double"/></returns>
+            public double GetXOffsetUncertaintyMm()
             {
-                get { return IExecuteWithSignature<double>("getXOffsetUncertaintyMm", "()D"); }
+                return IExecuteWithSignature<double>("getXOffsetUncertaintyMm", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getYOffsetMm()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getYOffsetMm()"/>
             /// </summary>
-            public double YOffsetMm
+            /// <returns><see cref="double"/></returns>
+            public double GetYOffsetMm()
             {
-                get { return IExecuteWithSignature<double>("getYOffsetMm", "()D"); }
+                return IExecuteWithSignature<double>("getYOffsetMm", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getYOffsetUncertaintyMm()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getYOffsetUncertaintyMm()"/>
             /// </summary>
-            public double YOffsetUncertaintyMm
+            /// <returns><see cref="double"/></returns>
+            public double GetYOffsetUncertaintyMm()
             {
-                get { return IExecuteWithSignature<double>("getYOffsetUncertaintyMm", "()D"); }
+                return IExecuteWithSignature<double>("getYOffsetUncertaintyMm", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getZOffsetMm()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getZOffsetMm()"/>
             /// </summary>
-            public double ZOffsetMm
+            /// <returns><see cref="double"/></returns>
+            public double GetZOffsetMm()
             {
-                get { return IExecuteWithSignature<double>("getZOffsetMm", "()D"); }
+                return IExecuteWithSignature<double>("getZOffsetMm", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getZOffsetUncertaintyMm()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#getZOffsetUncertaintyMm()"/>
             /// </summary>
-            public double ZOffsetUncertaintyMm
+            /// <returns><see cref="double"/></returns>
+            public double GetZOffsetUncertaintyMm()
             {
-                get { return IExecuteWithSignature<double>("getZOffsetUncertaintyMm", "()D"); }
+                return IExecuteWithSignature<double>("getZOffsetUncertaintyMm", "()D");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.PhaseCenterOffset.html#describeContents()"/>
@@ -436,32 +446,36 @@ public SphericalCorrections(double[][] arg0, double[][] arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#getCorrectionsArray()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#getDeltaPhi()"/>
             /// </summary>
-            public double[] CorrectionsArray
+            /// <returns><see cref="double"/></returns>
+            public double GetDeltaPhi()
             {
-                get { return IExecuteWithSignatureArray<double>("getCorrectionsArray", "()[[D"); }
+                return IExecuteWithSignature<double>("getDeltaPhi", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#getCorrectionUncertaintiesArray()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#getDeltaTheta()"/>
             /// </summary>
-            public double[] CorrectionUncertaintiesArray
+            /// <returns><see cref="double"/></returns>
+            public double GetDeltaTheta()
             {
-                get { return IExecuteWithSignatureArray<double>("getCorrectionUncertaintiesArray", "()[[D"); }
+                return IExecuteWithSignature<double>("getDeltaTheta", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#getDeltaPhi()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#getCorrectionsArray()"/>
             /// </summary>
-            public double DeltaPhi
+            /// <returns><see cref="double"/></returns>
+            public double[] GetCorrectionsArray()
             {
-                get { return IExecuteWithSignature<double>("getDeltaPhi", "()D"); }
+                return IExecuteWithSignatureArray<double>("getCorrectionsArray", "()[[D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#getDeltaTheta()"/> 
+            /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#getCorrectionUncertaintiesArray()"/>
             /// </summary>
-            public double DeltaTheta
+            /// <returns><see cref="double"/></returns>
+            public double[] GetCorrectionUncertaintiesArray()
             {
-                get { return IExecuteWithSignature<double>("getDeltaTheta", "()D"); }
+                return IExecuteWithSignatureArray<double>("getCorrectionUncertaintiesArray", "()[[D");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssAntennaInfo.SphericalCorrections.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssAutomaticGainControl.cs b/src/net/Netdroid/Generated/Android/Location/GnssAutomaticGainControl.cs
index 928b9da31..20fe33aff 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssAutomaticGainControl.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssAutomaticGainControl.cs
@@ -52,33 +52,36 @@ public partial class GnssAutomaticGainControl
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#getCarrierFrequencyHz()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#getLevelDb()"/>
         /// </summary>
-        public long CarrierFrequencyHz
+        /// <returns><see cref="double"/></returns>
+        public double GetLevelDb()
         {
-            get { return IExecuteWithSignature<long>("getCarrierFrequencyHz", "()J"); }
+            return IExecuteWithSignature<double>("getLevelDb", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#getConstellationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#describeContents()"/>
         /// </summary>
-        public int ConstellationType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getConstellationType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#getLevelDb()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#getConstellationType()"/>
         /// </summary>
-        public double LevelDb
+        /// <returns><see cref="int"/></returns>
+        public int GetConstellationType()
         {
-            get { return IExecuteWithSignature<double>("getLevelDb", "()D"); }
+            return IExecuteWithSignature<int>("getConstellationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#getCarrierFrequencyHz()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetCarrierFrequencyHz()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getCarrierFrequencyHz", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssAutomaticGainControl.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssCapabilities.cs b/src/net/Netdroid/Generated/Android/Location/GnssCapabilities.cs
index 7995d0689..7a38902bf 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssCapabilities.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssCapabilities.cs
@@ -70,13 +70,6 @@ public partial class GnssCapabilities
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssCapabilities.html#getGnssSignalTypes()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Location.GnssSignalType> GnssSignalTypes
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Location.GnssSignalType>>("getGnssSignalTypes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssCapabilities.html#hasAntennaInfo()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -96,7 +89,7 @@ public bool HasGeofencing()
         /// <see href="https://developer.android.com/reference/android/location/GnssCapabilities.html#hasGnssAntennaInfo()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasGnssAntennaInfo()
         {
             return IExecuteWithSignature<bool>("hasGnssAntennaInfo", "()Z");
@@ -294,6 +287,14 @@ public int HasAccumulatedDeltaRange()
             return IExecuteWithSignature<int>("hasAccumulatedDeltaRange", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/GnssCapabilities.html#getGnssSignalTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Location.GnssSignalType> GetGnssSignalTypes()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Location.GnssSignalType>>("getGnssSignalTypes", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssCapabilities.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssClock.cs b/src/net/Netdroid/Generated/Android/Location/GnssClock.cs
index cf5e0e758..f03d0d8aa 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssClock.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssClock.cs
@@ -52,206 +52,220 @@ public partial class GnssClock
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getBiasNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasBiasNanos()"/>
         /// </summary>
-        public double BiasNanos
+        /// <returns><see cref="bool"/></returns>
+        public bool HasBiasNanos()
         {
-            get { return IExecuteWithSignature<double>("getBiasNanos", "()D"); }
+            return IExecuteWithSignature<bool>("hasBiasNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getBiasUncertaintyNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasBiasUncertaintyNanos()"/>
         /// </summary>
-        public double BiasUncertaintyNanos
+        /// <returns><see cref="bool"/></returns>
+        public bool HasBiasUncertaintyNanos()
         {
-            get { return IExecuteWithSignature<double>("getBiasUncertaintyNanos", "()D"); }
+            return IExecuteWithSignature<bool>("hasBiasUncertaintyNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getDriftNanosPerSecond()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasDriftNanosPerSecond()"/>
         /// </summary>
-        public double DriftNanosPerSecond
+        /// <returns><see cref="bool"/></returns>
+        public bool HasDriftNanosPerSecond()
         {
-            get { return IExecuteWithSignature<double>("getDriftNanosPerSecond", "()D"); }
+            return IExecuteWithSignature<bool>("hasDriftNanosPerSecond", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getDriftUncertaintyNanosPerSecond()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasDriftUncertaintyNanosPerSecond()"/>
         /// </summary>
-        public double DriftUncertaintyNanosPerSecond
+        /// <returns><see cref="bool"/></returns>
+        public bool HasDriftUncertaintyNanosPerSecond()
         {
-            get { return IExecuteWithSignature<double>("getDriftUncertaintyNanosPerSecond", "()D"); }
+            return IExecuteWithSignature<bool>("hasDriftUncertaintyNanosPerSecond", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getElapsedRealtimeNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasElapsedRealtimeNanos()"/>
         /// </summary>
-        public long ElapsedRealtimeNanos
+        /// <returns><see cref="bool"/></returns>
+        public bool HasElapsedRealtimeNanos()
         {
-            get { return IExecuteWithSignature<long>("getElapsedRealtimeNanos", "()J"); }
+            return IExecuteWithSignature<bool>("hasElapsedRealtimeNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getElapsedRealtimeUncertaintyNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasElapsedRealtimeUncertaintyNanos()"/>
         /// </summary>
-        public double ElapsedRealtimeUncertaintyNanos
+        /// <returns><see cref="bool"/></returns>
+        public bool HasElapsedRealtimeUncertaintyNanos()
         {
-            get { return IExecuteWithSignature<double>("getElapsedRealtimeUncertaintyNanos", "()D"); }
+            return IExecuteWithSignature<bool>("hasElapsedRealtimeUncertaintyNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getFullBiasNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasFullBiasNanos()"/>
         /// </summary>
-        public long FullBiasNanos
+        /// <returns><see cref="bool"/></returns>
+        public bool HasFullBiasNanos()
         {
-            get { return IExecuteWithSignature<long>("getFullBiasNanos", "()J"); }
+            return IExecuteWithSignature<bool>("hasFullBiasNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getHardwareClockDiscontinuityCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasLeapSecond()"/>
         /// </summary>
-        public int HardwareClockDiscontinuityCount
+        /// <returns><see cref="bool"/></returns>
+        public bool HasLeapSecond()
         {
-            get { return IExecuteWithSignature<int>("getHardwareClockDiscontinuityCount", "()I"); }
+            return IExecuteWithSignature<bool>("hasLeapSecond", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getLeapSecond()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasReferenceCarrierFrequencyHzForIsb()"/>
         /// </summary>
-        public int LeapSecond
+        /// <returns><see cref="bool"/></returns>
+        public bool HasReferenceCarrierFrequencyHzForIsb()
         {
-            get { return IExecuteWithSignature<int>("getLeapSecond", "()I"); }
+            return IExecuteWithSignature<bool>("hasReferenceCarrierFrequencyHzForIsb", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getReferenceCarrierFrequencyHzForIsb()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasReferenceCodeTypeForIsb()"/>
         /// </summary>
-        public double ReferenceCarrierFrequencyHzForIsb
+        /// <returns><see cref="bool"/></returns>
+        public bool HasReferenceCodeTypeForIsb()
         {
-            get { return IExecuteWithSignature<double>("getReferenceCarrierFrequencyHzForIsb", "()D"); }
+            return IExecuteWithSignature<bool>("hasReferenceCodeTypeForIsb", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getReferenceCodeTypeForIsb()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasReferenceConstellationTypeForIsb()"/>
         /// </summary>
-        public Java.Lang.String ReferenceCodeTypeForIsb
+        /// <returns><see cref="bool"/></returns>
+        public bool HasReferenceConstellationTypeForIsb()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getReferenceCodeTypeForIsb", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("hasReferenceConstellationTypeForIsb", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getReferenceConstellationTypeForIsb()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasTimeUncertaintyNanos()"/>
         /// </summary>
-        public int ReferenceConstellationTypeForIsb
+        /// <returns><see cref="bool"/></returns>
+        public bool HasTimeUncertaintyNanos()
         {
-            get { return IExecuteWithSignature<int>("getReferenceConstellationTypeForIsb", "()I"); }
+            return IExecuteWithSignature<bool>("hasTimeUncertaintyNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getTimeNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getBiasNanos()"/>
         /// </summary>
-        public long TimeNanos
+        /// <returns><see cref="double"/></returns>
+        public double GetBiasNanos()
         {
-            get { return IExecuteWithSignature<long>("getTimeNanos", "()J"); }
+            return IExecuteWithSignature<double>("getBiasNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getTimeUncertaintyNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getBiasUncertaintyNanos()"/>
         /// </summary>
-        public double TimeUncertaintyNanos
+        /// <returns><see cref="double"/></returns>
+        public double GetBiasUncertaintyNanos()
         {
-            get { return IExecuteWithSignature<double>("getTimeUncertaintyNanos", "()D"); }
+            return IExecuteWithSignature<double>("getBiasUncertaintyNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasBiasNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getDriftNanosPerSecond()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasBiasNanos()
+        /// <returns><see cref="double"/></returns>
+        public double GetDriftNanosPerSecond()
         {
-            return IExecuteWithSignature<bool>("hasBiasNanos", "()Z");
+            return IExecuteWithSignature<double>("getDriftNanosPerSecond", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasBiasUncertaintyNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getDriftUncertaintyNanosPerSecond()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasBiasUncertaintyNanos()
+        /// <returns><see cref="double"/></returns>
+        public double GetDriftUncertaintyNanosPerSecond()
         {
-            return IExecuteWithSignature<bool>("hasBiasUncertaintyNanos", "()Z");
+            return IExecuteWithSignature<double>("getDriftUncertaintyNanosPerSecond", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasDriftNanosPerSecond()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getElapsedRealtimeUncertaintyNanos()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasDriftNanosPerSecond()
+        /// <returns><see cref="double"/></returns>
+        public double GetElapsedRealtimeUncertaintyNanos()
         {
-            return IExecuteWithSignature<bool>("hasDriftNanosPerSecond", "()Z");
+            return IExecuteWithSignature<double>("getElapsedRealtimeUncertaintyNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasDriftUncertaintyNanosPerSecond()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getReferenceCarrierFrequencyHzForIsb()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasDriftUncertaintyNanosPerSecond()
+        /// <returns><see cref="double"/></returns>
+        public double GetReferenceCarrierFrequencyHzForIsb()
         {
-            return IExecuteWithSignature<bool>("hasDriftUncertaintyNanosPerSecond", "()Z");
+            return IExecuteWithSignature<double>("getReferenceCarrierFrequencyHzForIsb", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasElapsedRealtimeNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getTimeUncertaintyNanos()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasElapsedRealtimeNanos()
+        /// <returns><see cref="double"/></returns>
+        public double GetTimeUncertaintyNanos()
         {
-            return IExecuteWithSignature<bool>("hasElapsedRealtimeNanos", "()Z");
+            return IExecuteWithSignature<double>("getTimeUncertaintyNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasElapsedRealtimeUncertaintyNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#describeContents()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasElapsedRealtimeUncertaintyNanos()
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            return IExecuteWithSignature<bool>("hasElapsedRealtimeUncertaintyNanos", "()Z");
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasFullBiasNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getHardwareClockDiscontinuityCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasFullBiasNanos()
+        /// <returns><see cref="int"/></returns>
+        public int GetHardwareClockDiscontinuityCount()
         {
-            return IExecuteWithSignature<bool>("hasFullBiasNanos", "()Z");
+            return IExecuteWithSignature<int>("getHardwareClockDiscontinuityCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasLeapSecond()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getLeapSecond()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasLeapSecond()
+        /// <returns><see cref="int"/></returns>
+        public int GetLeapSecond()
         {
-            return IExecuteWithSignature<bool>("hasLeapSecond", "()Z");
+            return IExecuteWithSignature<int>("getLeapSecond", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasReferenceCarrierFrequencyHzForIsb()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getReferenceConstellationTypeForIsb()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasReferenceCarrierFrequencyHzForIsb()
+        /// <returns><see cref="int"/></returns>
+        public int GetReferenceConstellationTypeForIsb()
         {
-            return IExecuteWithSignature<bool>("hasReferenceCarrierFrequencyHzForIsb", "()Z");
+            return IExecuteWithSignature<int>("getReferenceConstellationTypeForIsb", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasReferenceCodeTypeForIsb()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getReferenceCodeTypeForIsb()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasReferenceCodeTypeForIsb()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetReferenceCodeTypeForIsb()
         {
-            return IExecuteWithSignature<bool>("hasReferenceCodeTypeForIsb", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getReferenceCodeTypeForIsb", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasReferenceConstellationTypeForIsb()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getElapsedRealtimeNanos()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasReferenceConstellationTypeForIsb()
+        /// <returns><see cref="long"/></returns>
+        public long GetElapsedRealtimeNanos()
         {
-            return IExecuteWithSignature<bool>("hasReferenceConstellationTypeForIsb", "()Z");
+            return IExecuteWithSignature<long>("getElapsedRealtimeNanos", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#hasTimeUncertaintyNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getFullBiasNanos()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasTimeUncertaintyNanos()
+        /// <returns><see cref="long"/></returns>
+        public long GetFullBiasNanos()
         {
-            return IExecuteWithSignature<bool>("hasTimeUncertaintyNanos", "()Z");
+            return IExecuteWithSignature<long>("getFullBiasNanos", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#getTimeNanos()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimeNanos()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTimeNanos", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssClock.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssMeasurement.cs b/src/net/Netdroid/Generated/Android/Location/GnssMeasurement.cs
index 701f1945e..904f0f42d 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssMeasurement.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssMeasurement.cs
@@ -214,291 +214,316 @@ public partial class GnssMeasurement
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getAccumulatedDeltaRangeMeters()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasAutomaticGainControlLevelDb()"/>
         /// </summary>
-        public double AccumulatedDeltaRangeMeters
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool HasAutomaticGainControlLevelDb()
         {
-            get { return IExecuteWithSignature<double>("getAccumulatedDeltaRangeMeters", "()D"); }
+            return IExecuteWithSignature<bool>("hasAutomaticGainControlLevelDb", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getAccumulatedDeltaRangeState()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasBasebandCn0DbHz()"/>
         /// </summary>
-        public int AccumulatedDeltaRangeState
+        /// <returns><see cref="bool"/></returns>
+        public bool HasBasebandCn0DbHz()
         {
-            get { return IExecuteWithSignature<int>("getAccumulatedDeltaRangeState", "()I"); }
+            return IExecuteWithSignature<bool>("hasBasebandCn0DbHz", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getAccumulatedDeltaRangeUncertaintyMeters()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCarrierCycles()"/>
         /// </summary>
-        public double AccumulatedDeltaRangeUncertaintyMeters
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool HasCarrierCycles()
         {
-            get { return IExecuteWithSignature<double>("getAccumulatedDeltaRangeUncertaintyMeters", "()D"); }
+            return IExecuteWithSignature<bool>("hasCarrierCycles", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getAutomaticGainControlLevelDb()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCarrierFrequencyHz()"/>
         /// </summary>
-        [System.Obsolete()]
-        public double AutomaticGainControlLevelDb
+        /// <returns><see cref="bool"/></returns>
+        public bool HasCarrierFrequencyHz()
         {
-            get { return IExecuteWithSignature<double>("getAutomaticGainControlLevelDb", "()D"); }
+            return IExecuteWithSignature<bool>("hasCarrierFrequencyHz", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getBasebandCn0DbHz()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCarrierPhase()"/>
         /// </summary>
-        public double BasebandCn0DbHz
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool HasCarrierPhase()
         {
-            get { return IExecuteWithSignature<double>("getBasebandCn0DbHz", "()D"); }
+            return IExecuteWithSignature<bool>("hasCarrierPhase", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCarrierCycles()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCarrierPhaseUncertainty()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long CarrierCycles
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool HasCarrierPhaseUncertainty()
         {
-            get { return IExecuteWithSignature<long>("getCarrierCycles", "()J"); }
+            return IExecuteWithSignature<bool>("hasCarrierPhaseUncertainty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCarrierFrequencyHz()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCodeType()"/>
         /// </summary>
-        public float CarrierFrequencyHz
+        /// <returns><see cref="bool"/></returns>
+        public bool HasCodeType()
         {
-            get { return IExecuteWithSignature<float>("getCarrierFrequencyHz", "()F"); }
+            return IExecuteWithSignature<bool>("hasCodeType", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCarrierPhase()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasFullInterSignalBiasNanos()"/>
         /// </summary>
-        [System.Obsolete()]
-        public double CarrierPhase
+        /// <returns><see cref="bool"/></returns>
+        public bool HasFullInterSignalBiasNanos()
         {
-            get { return IExecuteWithSignature<double>("getCarrierPhase", "()D"); }
+            return IExecuteWithSignature<bool>("hasFullInterSignalBiasNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCarrierPhaseUncertainty()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasFullInterSignalBiasUncertaintyNanos()"/>
         /// </summary>
-        [System.Obsolete()]
-        public double CarrierPhaseUncertainty
+        /// <returns><see cref="bool"/></returns>
+        public bool HasFullInterSignalBiasUncertaintyNanos()
         {
-            get { return IExecuteWithSignature<double>("getCarrierPhaseUncertainty", "()D"); }
+            return IExecuteWithSignature<bool>("hasFullInterSignalBiasUncertaintyNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCn0DbHz()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasSatelliteInterSignalBiasNanos()"/>
         /// </summary>
-        public double Cn0DbHz
+        /// <returns><see cref="bool"/></returns>
+        public bool HasSatelliteInterSignalBiasNanos()
         {
-            get { return IExecuteWithSignature<double>("getCn0DbHz", "()D"); }
+            return IExecuteWithSignature<bool>("hasSatelliteInterSignalBiasNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCodeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasSatelliteInterSignalBiasUncertaintyNanos()"/>
         /// </summary>
-        public Java.Lang.String CodeType
+        /// <returns><see cref="bool"/></returns>
+        public bool HasSatelliteInterSignalBiasUncertaintyNanos()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCodeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("hasSatelliteInterSignalBiasUncertaintyNanos", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getConstellationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasSnrInDb()"/>
         /// </summary>
-        public int ConstellationType
+        /// <returns><see cref="bool"/></returns>
+        public bool HasSnrInDb()
         {
-            get { return IExecuteWithSignature<int>("getConstellationType", "()I"); }
+            return IExecuteWithSignature<bool>("hasSnrInDb", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getFullInterSignalBiasNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getAccumulatedDeltaRangeMeters()"/>
         /// </summary>
-        public double FullInterSignalBiasNanos
+        /// <returns><see cref="double"/></returns>
+        public double GetAccumulatedDeltaRangeMeters()
         {
-            get { return IExecuteWithSignature<double>("getFullInterSignalBiasNanos", "()D"); }
+            return IExecuteWithSignature<double>("getAccumulatedDeltaRangeMeters", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getFullInterSignalBiasUncertaintyNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getAccumulatedDeltaRangeUncertaintyMeters()"/>
         /// </summary>
-        public double FullInterSignalBiasUncertaintyNanos
+        /// <returns><see cref="double"/></returns>
+        public double GetAccumulatedDeltaRangeUncertaintyMeters()
         {
-            get { return IExecuteWithSignature<double>("getFullInterSignalBiasUncertaintyNanos", "()D"); }
+            return IExecuteWithSignature<double>("getAccumulatedDeltaRangeUncertaintyMeters", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getMultipathIndicator()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getAutomaticGainControlLevelDb()"/>
         /// </summary>
-        public int MultipathIndicator
+        /// <returns><see cref="double"/></returns>
+        [global::System.Obsolete()]
+        public double GetAutomaticGainControlLevelDb()
         {
-            get { return IExecuteWithSignature<int>("getMultipathIndicator", "()I"); }
+            return IExecuteWithSignature<double>("getAutomaticGainControlLevelDb", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getPseudorangeRateMetersPerSecond()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getBasebandCn0DbHz()"/>
         /// </summary>
-        public double PseudorangeRateMetersPerSecond
+        /// <returns><see cref="double"/></returns>
+        public double GetBasebandCn0DbHz()
         {
-            get { return IExecuteWithSignature<double>("getPseudorangeRateMetersPerSecond", "()D"); }
+            return IExecuteWithSignature<double>("getBasebandCn0DbHz", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getPseudorangeRateUncertaintyMetersPerSecond()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCarrierPhase()"/>
         /// </summary>
-        public double PseudorangeRateUncertaintyMetersPerSecond
+        /// <returns><see cref="double"/></returns>
+        [global::System.Obsolete()]
+        public double GetCarrierPhase()
         {
-            get { return IExecuteWithSignature<double>("getPseudorangeRateUncertaintyMetersPerSecond", "()D"); }
+            return IExecuteWithSignature<double>("getCarrierPhase", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getReceivedSvTimeNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCarrierPhaseUncertainty()"/>
         /// </summary>
-        public long ReceivedSvTimeNanos
+        /// <returns><see cref="double"/></returns>
+        [global::System.Obsolete()]
+        public double GetCarrierPhaseUncertainty()
         {
-            get { return IExecuteWithSignature<long>("getReceivedSvTimeNanos", "()J"); }
+            return IExecuteWithSignature<double>("getCarrierPhaseUncertainty", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getReceivedSvTimeUncertaintyNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCn0DbHz()"/>
         /// </summary>
-        public long ReceivedSvTimeUncertaintyNanos
+        /// <returns><see cref="double"/></returns>
+        public double GetCn0DbHz()
         {
-            get { return IExecuteWithSignature<long>("getReceivedSvTimeUncertaintyNanos", "()J"); }
+            return IExecuteWithSignature<double>("getCn0DbHz", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getSatelliteInterSignalBiasNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getFullInterSignalBiasNanos()"/>
         /// </summary>
-        public double SatelliteInterSignalBiasNanos
+        /// <returns><see cref="double"/></returns>
+        public double GetFullInterSignalBiasNanos()
         {
-            get { return IExecuteWithSignature<double>("getSatelliteInterSignalBiasNanos", "()D"); }
+            return IExecuteWithSignature<double>("getFullInterSignalBiasNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getSatelliteInterSignalBiasUncertaintyNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getFullInterSignalBiasUncertaintyNanos()"/>
         /// </summary>
-        public double SatelliteInterSignalBiasUncertaintyNanos
+        /// <returns><see cref="double"/></returns>
+        public double GetFullInterSignalBiasUncertaintyNanos()
         {
-            get { return IExecuteWithSignature<double>("getSatelliteInterSignalBiasUncertaintyNanos", "()D"); }
+            return IExecuteWithSignature<double>("getFullInterSignalBiasUncertaintyNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getSnrInDb()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getPseudorangeRateMetersPerSecond()"/>
         /// </summary>
-        public double SnrInDb
+        /// <returns><see cref="double"/></returns>
+        public double GetPseudorangeRateMetersPerSecond()
         {
-            get { return IExecuteWithSignature<double>("getSnrInDb", "()D"); }
+            return IExecuteWithSignature<double>("getPseudorangeRateMetersPerSecond", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getPseudorangeRateUncertaintyMetersPerSecond()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="double"/></returns>
+        public double GetPseudorangeRateUncertaintyMetersPerSecond()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<double>("getPseudorangeRateUncertaintyMetersPerSecond", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getSvid()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getSatelliteInterSignalBiasNanos()"/>
         /// </summary>
-        public int Svid
+        /// <returns><see cref="double"/></returns>
+        public double GetSatelliteInterSignalBiasNanos()
         {
-            get { return IExecuteWithSignature<int>("getSvid", "()I"); }
+            return IExecuteWithSignature<double>("getSatelliteInterSignalBiasNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getTimeOffsetNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getSatelliteInterSignalBiasUncertaintyNanos()"/>
         /// </summary>
-        public double TimeOffsetNanos
+        /// <returns><see cref="double"/></returns>
+        public double GetSatelliteInterSignalBiasUncertaintyNanos()
         {
-            get { return IExecuteWithSignature<double>("getTimeOffsetNanos", "()D"); }
+            return IExecuteWithSignature<double>("getSatelliteInterSignalBiasUncertaintyNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasAutomaticGainControlLevelDb()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getSnrInDb()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool HasAutomaticGainControlLevelDb()
+        /// <returns><see cref="double"/></returns>
+        public double GetSnrInDb()
         {
-            return IExecuteWithSignature<bool>("hasAutomaticGainControlLevelDb", "()Z");
+            return IExecuteWithSignature<double>("getSnrInDb", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasBasebandCn0DbHz()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getTimeOffsetNanos()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasBasebandCn0DbHz()
+        /// <returns><see cref="double"/></returns>
+        public double GetTimeOffsetNanos()
         {
-            return IExecuteWithSignature<bool>("hasBasebandCn0DbHz", "()Z");
+            return IExecuteWithSignature<double>("getTimeOffsetNanos", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCarrierCycles()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCarrierFrequencyHz()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool HasCarrierCycles()
+        /// <returns><see cref="float"/></returns>
+        public float GetCarrierFrequencyHz()
         {
-            return IExecuteWithSignature<bool>("hasCarrierCycles", "()Z");
+            return IExecuteWithSignature<float>("getCarrierFrequencyHz", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCarrierFrequencyHz()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#describeContents()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasCarrierFrequencyHz()
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            return IExecuteWithSignature<bool>("hasCarrierFrequencyHz", "()Z");
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCarrierPhase()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getAccumulatedDeltaRangeState()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool HasCarrierPhase()
+        /// <returns><see cref="int"/></returns>
+        public int GetAccumulatedDeltaRangeState()
         {
-            return IExecuteWithSignature<bool>("hasCarrierPhase", "()Z");
+            return IExecuteWithSignature<int>("getAccumulatedDeltaRangeState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCarrierPhaseUncertainty()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getConstellationType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool HasCarrierPhaseUncertainty()
+        /// <returns><see cref="int"/></returns>
+        public int GetConstellationType()
         {
-            return IExecuteWithSignature<bool>("hasCarrierPhaseUncertainty", "()Z");
+            return IExecuteWithSignature<int>("getConstellationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasCodeType()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getMultipathIndicator()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasCodeType()
+        /// <returns><see cref="int"/></returns>
+        public int GetMultipathIndicator()
         {
-            return IExecuteWithSignature<bool>("hasCodeType", "()Z");
+            return IExecuteWithSignature<int>("getMultipathIndicator", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasFullInterSignalBiasNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getState()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasFullInterSignalBiasNanos()
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            return IExecuteWithSignature<bool>("hasFullInterSignalBiasNanos", "()Z");
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasFullInterSignalBiasUncertaintyNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getSvid()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasFullInterSignalBiasUncertaintyNanos()
+        /// <returns><see cref="int"/></returns>
+        public int GetSvid()
         {
-            return IExecuteWithSignature<bool>("hasFullInterSignalBiasUncertaintyNanos", "()Z");
+            return IExecuteWithSignature<int>("getSvid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasSatelliteInterSignalBiasNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCodeType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasSatelliteInterSignalBiasNanos()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCodeType()
         {
-            return IExecuteWithSignature<bool>("hasSatelliteInterSignalBiasNanos", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getCodeType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasSatelliteInterSignalBiasUncertaintyNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getCarrierCycles()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasSatelliteInterSignalBiasUncertaintyNanos()
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetCarrierCycles()
         {
-            return IExecuteWithSignature<bool>("hasSatelliteInterSignalBiasUncertaintyNanos", "()Z");
+            return IExecuteWithSignature<long>("getCarrierCycles", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#hasSnrInDb()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getReceivedSvTimeNanos()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasSnrInDb()
+        /// <returns><see cref="long"/></returns>
+        public long GetReceivedSvTimeNanos()
         {
-            return IExecuteWithSignature<bool>("hasSnrInDb", "()Z");
+            return IExecuteWithSignature<long>("getReceivedSvTimeNanos", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#getReceivedSvTimeUncertaintyNanos()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetReceivedSvTimeUncertaintyNanos()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getReceivedSvTimeUncertaintyNanos", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssMeasurement.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssMeasurementRequest.cs b/src/net/Netdroid/Generated/Android/Location/GnssMeasurementRequest.cs
index f47902ab5..5be5b8625 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssMeasurementRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssMeasurementRequest.cs
@@ -58,13 +58,6 @@ public partial class GnssMeasurementRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementRequest.html#getIntervalMillis()"/> 
-        /// </summary>
-        public int IntervalMillis
-        {
-            get { return IExecuteWithSignature<int>("getIntervalMillis", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementRequest.html#isFullTracking()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -81,6 +74,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementRequest.html#getIntervalMillis()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIntervalMillis()
+        {
+            return IExecuteWithSignature<int>("getIntervalMillis", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssMeasurementsEvent.cs b/src/net/Netdroid/Generated/Android/Location/GnssMeasurementsEvent.cs
index 00b611d07..4eb0d3b16 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssMeasurementsEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssMeasurementsEvent.cs
@@ -52,25 +52,12 @@ public partial class GnssMeasurementsEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.html#getClock()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.html#getClock()"/>
         /// </summary>
-        public Android.Location.GnssClock Clock
+        /// <returns><see cref="Android.Location.GnssClock"/></returns>
+        public Android.Location.GnssClock GetClock()
         {
-            get { return IExecuteWithSignature<Android.Location.GnssClock>("getClock", "()Landroid/location/GnssClock;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.html#getGnssAutomaticGainControls()"/> 
-        /// </summary>
-        public Java.Util.Collection<Android.Location.GnssAutomaticGainControl> GnssAutomaticGainControls
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Location.GnssAutomaticGainControl>>("getGnssAutomaticGainControls", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.html#getMeasurements()"/> 
-        /// </summary>
-        public Java.Util.Collection<Android.Location.GnssMeasurement> Measurements
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Location.GnssMeasurement>>("getMeasurements", "()Ljava/util/Collection;"); }
+            return IExecuteWithSignature<Android.Location.GnssClock>("getClock", "()Landroid/location/GnssClock;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.html#hasIsFullTracking()"/>
@@ -97,6 +84,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.html#getGnssAutomaticGainControls()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Location.GnssAutomaticGainControl> GetGnssAutomaticGainControls()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Android.Location.GnssAutomaticGainControl>>("getGnssAutomaticGainControls", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.html#getMeasurements()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Location.GnssMeasurement> GetMeasurements()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Android.Location.GnssMeasurement>>("getMeasurements", "()Ljava/util/Collection;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -215,28 +218,28 @@ public partial class Callback
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.Callback.html#STATUS_LOCATION_DISABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_LOCATION_DISABLED { get { if (!_STATUS_LOCATION_DISABLEDReady) { _STATUS_LOCATION_DISABLEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_LOCATION_DISABLED"); _STATUS_LOCATION_DISABLEDReady = true; } return _STATUS_LOCATION_DISABLEDContent; } }
             private static int _STATUS_LOCATION_DISABLEDContent = default;
             private static bool _STATUS_LOCATION_DISABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.Callback.html#STATUS_NOT_ALLOWED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_NOT_ALLOWED { get { if (!_STATUS_NOT_ALLOWEDReady) { _STATUS_NOT_ALLOWEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_NOT_ALLOWED"); _STATUS_NOT_ALLOWEDReady = true; } return _STATUS_NOT_ALLOWEDContent; } }
             private static int _STATUS_NOT_ALLOWEDContent = default;
             private static bool _STATUS_NOT_ALLOWEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.Callback.html#STATUS_NOT_SUPPORTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_NOT_SUPPORTED { get { if (!_STATUS_NOT_SUPPORTEDReady) { _STATUS_NOT_SUPPORTEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_NOT_SUPPORTED"); _STATUS_NOT_SUPPORTEDReady = true; } return _STATUS_NOT_SUPPORTEDContent; } }
             private static int _STATUS_NOT_SUPPORTEDContent = default;
             private static bool _STATUS_NOT_SUPPORTEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.Callback.html#STATUS_READY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_READY { get { if (!_STATUS_READYReady) { _STATUS_READYContent = SGetField<int>(LocalBridgeClazz, "STATUS_READY"); _STATUS_READYReady = true; } return _STATUS_READYContent; } }
             private static int _STATUS_READYContent = default;
             private static bool _STATUS_READYReady = false; // this is used because in case of generics 
@@ -260,7 +263,7 @@ public void OnGnssMeasurementsReceived(Android.Location.GnssMeasurementsEvent ar
             /// <see href="https://developer.android.com/reference/android/location/GnssMeasurementsEvent.Callback.html#onStatusChanged(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnStatusChanged(int arg0)
             {
                 IExecuteWithSignature("onStatusChanged", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssNavigationMessage.cs b/src/net/Netdroid/Generated/Android/Location/GnssNavigationMessage.cs
index f5470ca03..4c6f03b72 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssNavigationMessage.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssNavigationMessage.cs
@@ -160,54 +160,60 @@ public partial class GnssNavigationMessage
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getData()"/>
         /// </summary>
-        public byte[] Data
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetData()
         {
-            get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getMessageId()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#describeContents()"/>
         /// </summary>
-        public int MessageId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getMessageId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getMessageId()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="int"/></returns>
+        public int GetMessageId()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<int>("getMessageId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getSubmessageId()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getStatus()"/>
         /// </summary>
-        public int SubmessageId
+        /// <returns><see cref="int"/></returns>
+        public int GetStatus()
         {
-            get { return IExecuteWithSignature<int>("getSubmessageId", "()I"); }
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getSvid()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getSubmessageId()"/>
         /// </summary>
-        public int Svid
+        /// <returns><see cref="int"/></returns>
+        public int GetSubmessageId()
         {
-            get { return IExecuteWithSignature<int>("getSvid", "()I"); }
+            return IExecuteWithSignature<int>("getSubmessageId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getSvid()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetSvid()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getSvid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#getType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.html#writeToParcel(android.os.Parcel,int)"/>
@@ -237,21 +243,21 @@ public partial class Callback
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.Callback.html#STATUS_LOCATION_DISABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_LOCATION_DISABLED { get { if (!_STATUS_LOCATION_DISABLEDReady) { _STATUS_LOCATION_DISABLEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_LOCATION_DISABLED"); _STATUS_LOCATION_DISABLEDReady = true; } return _STATUS_LOCATION_DISABLEDContent; } }
             private static int _STATUS_LOCATION_DISABLEDContent = default;
             private static bool _STATUS_LOCATION_DISABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.Callback.html#STATUS_NOT_SUPPORTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_NOT_SUPPORTED { get { if (!_STATUS_NOT_SUPPORTEDReady) { _STATUS_NOT_SUPPORTEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_NOT_SUPPORTED"); _STATUS_NOT_SUPPORTEDReady = true; } return _STATUS_NOT_SUPPORTEDContent; } }
             private static int _STATUS_NOT_SUPPORTEDContent = default;
             private static bool _STATUS_NOT_SUPPORTEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.Callback.html#STATUS_READY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_READY { get { if (!_STATUS_READYReady) { _STATUS_READYContent = SGetField<int>(LocalBridgeClazz, "STATUS_READY"); _STATUS_READYReady = true; } return _STATUS_READYContent; } }
             private static int _STATUS_READYContent = default;
             private static bool _STATUS_READYReady = false; // this is used because in case of generics 
@@ -275,7 +281,7 @@ public void OnGnssNavigationMessageReceived(Android.Location.GnssNavigationMessa
             /// <see href="https://developer.android.com/reference/android/location/GnssNavigationMessage.Callback.html#onStatusChanged(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnStatusChanged(int arg0)
             {
                 IExecuteWithSignature("onStatusChanged", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssSignalType.cs b/src/net/Netdroid/Generated/Android/Location/GnssSignalType.cs
index 03551417b..26b226283 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssSignalType.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssSignalType.cs
@@ -63,33 +63,36 @@ public static Android.Location.GnssSignalType Create(int arg0, double arg1, Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#getCarrierFrequencyHz()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#getCarrierFrequencyHz()"/>
         /// </summary>
-        public double CarrierFrequencyHz
+        /// <returns><see cref="double"/></returns>
+        public double GetCarrierFrequencyHz()
         {
-            get { return IExecuteWithSignature<double>("getCarrierFrequencyHz", "()D"); }
+            return IExecuteWithSignature<double>("getCarrierFrequencyHz", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#getCodeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String CodeType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCodeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#getConstellationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#getConstellationType()"/>
         /// </summary>
-        public int ConstellationType
+        /// <returns><see cref="int"/></returns>
+        public int GetConstellationType()
         {
-            get { return IExecuteWithSignature<int>("getConstellationType", "()I"); }
+            return IExecuteWithSignature<int>("getConstellationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#getCodeType()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCodeType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getCodeType", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssSignalType.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Location/GnssStatus.cs b/src/net/Netdroid/Generated/Android/Location/GnssStatus.cs
index 1e2c74262..22f327ec5 100644
--- a/src/net/Netdroid/Generated/Android/Location/GnssStatus.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GnssStatus.cs
@@ -100,13 +100,6 @@ public partial class GnssStatus
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GnssStatus.html#getSatelliteCount()"/> 
-        /// </summary>
-        public int SatelliteCount
-        {
-            get { return IExecuteWithSignature<int>("getSatelliteCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssStatus.html#hasAlmanacData(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -214,6 +207,14 @@ public int GetConstellationType(int arg0)
             return IExecuteWithSignature<int>("getConstellationType", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/GnssStatus.html#getSatelliteCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSatelliteCount()
+        {
+            return IExecuteWithSignature<int>("getSatelliteCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GnssStatus.html#getSvid(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Location/GpsSatellite.cs b/src/net/Netdroid/Generated/Android/Location/GpsSatellite.cs
index 2e8f5a7a6..73a1fc041 100644
--- a/src/net/Netdroid/Generated/Android/Location/GpsSatellite.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GpsSatellite.cs
@@ -46,63 +46,67 @@ public partial class GpsSatellite
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#getAzimuth()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#hasAlmanac()"/>
         /// </summary>
-        [System.Obsolete()]
-        public float Azimuth
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool HasAlmanac()
         {
-            get { return IExecuteWithSignature<float>("getAzimuth", "()F"); }
+            return IExecuteWithSignature<bool>("hasAlmanac", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#getElevation()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#hasEphemeris()"/>
         /// </summary>
-        [System.Obsolete()]
-        public float Elevation
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool HasEphemeris()
         {
-            get { return IExecuteWithSignature<float>("getElevation", "()F"); }
+            return IExecuteWithSignature<bool>("hasEphemeris", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#getPrn()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#usedInFix()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Prn
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool UsedInFix()
         {
-            get { return IExecuteWithSignature<int>("getPrn", "()I"); }
+            return IExecuteWithSignature<bool>("usedInFix", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#getSnr()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#getAzimuth()"/>
         /// </summary>
-        [System.Obsolete()]
-        public float Snr
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float GetAzimuth()
         {
-            get { return IExecuteWithSignature<float>("getSnr", "()F"); }
+            return IExecuteWithSignature<float>("getAzimuth", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#hasAlmanac()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#getElevation()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool HasAlmanac()
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float GetElevation()
         {
-            return IExecuteWithSignature<bool>("hasAlmanac", "()Z");
+            return IExecuteWithSignature<float>("getElevation", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#hasEphemeris()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#getSnr()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool HasEphemeris()
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float GetSnr()
         {
-            return IExecuteWithSignature<bool>("hasEphemeris", "()Z");
+            return IExecuteWithSignature<float>("getSnr", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#usedInFix()"/>
+        /// <see href="https://developer.android.com/reference/android/location/GpsSatellite.html#getPrn()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool UsedInFix()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPrn()
         {
-            return IExecuteWithSignature<bool>("usedInFix", "()Z");
+            return IExecuteWithSignature<int>("getPrn", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Location/GpsStatus.cs b/src/net/Netdroid/Generated/Android/Location/GpsStatus.cs
index a084bb7d3..50428f452 100644
--- a/src/net/Netdroid/Generated/Android/Location/GpsStatus.cs
+++ b/src/net/Netdroid/Generated/Android/Location/GpsStatus.cs
@@ -40,28 +40,28 @@ public partial class GpsStatus
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#GPS_EVENT_FIRST_FIX"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GPS_EVENT_FIRST_FIX { get { if (!_GPS_EVENT_FIRST_FIXReady) { _GPS_EVENT_FIRST_FIXContent = SGetField<int>(LocalBridgeClazz, "GPS_EVENT_FIRST_FIX"); _GPS_EVENT_FIRST_FIXReady = true; } return _GPS_EVENT_FIRST_FIXContent; } }
         private static int _GPS_EVENT_FIRST_FIXContent = default;
         private static bool _GPS_EVENT_FIRST_FIXReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#GPS_EVENT_SATELLITE_STATUS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GPS_EVENT_SATELLITE_STATUS { get { if (!_GPS_EVENT_SATELLITE_STATUSReady) { _GPS_EVENT_SATELLITE_STATUSContent = SGetField<int>(LocalBridgeClazz, "GPS_EVENT_SATELLITE_STATUS"); _GPS_EVENT_SATELLITE_STATUSReady = true; } return _GPS_EVENT_SATELLITE_STATUSContent; } }
         private static int _GPS_EVENT_SATELLITE_STATUSContent = default;
         private static bool _GPS_EVENT_SATELLITE_STATUSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#GPS_EVENT_STARTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GPS_EVENT_STARTED { get { if (!_GPS_EVENT_STARTEDReady) { _GPS_EVENT_STARTEDContent = SGetField<int>(LocalBridgeClazz, "GPS_EVENT_STARTED"); _GPS_EVENT_STARTEDReady = true; } return _GPS_EVENT_STARTEDContent; } }
         private static int _GPS_EVENT_STARTEDContent = default;
         private static bool _GPS_EVENT_STARTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#GPS_EVENT_STOPPED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GPS_EVENT_STOPPED { get { if (!_GPS_EVENT_STOPPEDReady) { _GPS_EVENT_STOPPEDContent = SGetField<int>(LocalBridgeClazz, "GPS_EVENT_STOPPED"); _GPS_EVENT_STOPPEDReady = true; } return _GPS_EVENT_STOPPEDContent; } }
         private static int _GPS_EVENT_STOPPEDContent = default;
         private static bool _GPS_EVENT_STOPPEDReady = false; // this is used because in case of generics 
@@ -75,7 +75,7 @@ public partial class GpsStatus
         /// <param name="arg0"><see cref="Android.Location.GnssStatus"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Location.GpsStatus"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Location.GpsStatus Create(Android.Location.GnssStatus arg0, int arg1)
         {
             return SExecute<Android.Location.GpsStatus>(LocalBridgeClazz, "create", arg0, arg1);
@@ -85,28 +85,31 @@ public static Android.Location.GpsStatus Create(Android.Location.GnssStatus arg0
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#getMaxSatellites()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#getMaxSatellites()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int MaxSatellites
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMaxSatellites()
         {
-            get { return IExecuteWithSignature<int>("getMaxSatellites", "()I"); }
+            return IExecuteWithSignature<int>("getMaxSatellites", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#getSatellites()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#getTimeToFirstFix()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.Iterable<Android.Location.GpsSatellite> Satellites
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetTimeToFirstFix()
         {
-            get { return IExecuteWithSignature<Java.Lang.Iterable<Android.Location.GpsSatellite>>("getSatellites", "()Ljava/lang/Iterable;"); }
+            return IExecuteWithSignature<int>("getTimeToFirstFix", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#getTimeToFirstFix()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/GpsStatus.html#getSatellites()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int TimeToFirstFix
+        /// <returns><see cref="Java.Lang.Iterable"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.Iterable<Android.Location.GpsSatellite> GetSatellites()
         {
-            get { return IExecuteWithSignature<int>("getTimeToFirstFix", "()I"); }
+            return IExecuteWithSignature<Java.Lang.Iterable<Android.Location.GpsSatellite>>("getSatellites", "()Ljava/lang/Iterable;");
         }
 
         #endregion
@@ -137,7 +140,7 @@ public partial class Listener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGpsStatusChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGpsStatusChangedEventHandler));
+                AddEventHandler("onGpsStatusChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGpsStatusChangedEventHandler));
 
             }
 
@@ -145,7 +148,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/location/GpsStatus.Listener.html#onGpsStatusChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGpsStatusChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnGpsStatusChanged { get; set; } = null;
+            public global::System.Action<int> OnOnGpsStatusChanged { get; set; } = null;
 
             void OnGpsStatusChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -157,7 +160,7 @@ void OnGpsStatusChangedEventHandler(object sender, CLRListenerEventArgs<CLREvent
             /// <see href="https://developer.android.com/reference/android/location/GpsStatus.Listener.html#onGpsStatusChanged(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnGpsStatusChanged(int arg0)
             {
                 
@@ -197,7 +200,7 @@ public partial class ListenerDirect
             /// <see href="https://developer.android.com/reference/android/location/GpsStatus.Listener.html#onGpsStatusChanged(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnGpsStatusChanged(int arg0)
             {
                 IExecuteWithSignature("onGpsStatusChanged", "(I)V", arg0);
@@ -238,7 +241,7 @@ public partial class NmeaListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onNmeaReceived", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(OnNmeaReceivedEventHandler));
+                AddEventHandler("onNmeaReceived", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(OnNmeaReceivedEventHandler));
 
             }
 
@@ -246,7 +249,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/location/GpsStatus.NmeaListener.html#onNmeaReceived(long,java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnNmeaReceived"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<long, Java.Lang.String> OnOnNmeaReceived { get; set; } = null;
+            public global::System.Action<long, Java.Lang.String> OnOnNmeaReceived { get; set; } = null;
 
             void OnNmeaReceivedEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
             {
@@ -259,7 +262,7 @@ void OnNmeaReceivedEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnNmeaReceived(long arg0, Java.Lang.String arg1)
             {
                 
@@ -300,7 +303,7 @@ public partial class NmeaListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnNmeaReceived(long arg0, Java.Lang.String arg1)
             {
                 IExecute("onNmeaReceived", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Location/Location.cs b/src/net/Netdroid/Generated/Android/Location/Location.cs
index 8ae1ed425..70fbf7114 100644
--- a/src/net/Netdroid/Generated/Android/Location/Location.cs
+++ b/src/net/Netdroid/Generated/Android/Location/Location.cs
@@ -117,130 +117,12 @@ public static void DistanceBetween(double arg0, double arg1, double arg2, double
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getAccuracy()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setAccuracy(float)"/>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getExtras()"/>
         /// </summary>
-        public float Accuracy
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<float>("getAccuracy", "()F"); } set { IExecuteWithSignature("setAccuracy", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getAltitude()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setAltitude(double)"/>
-        /// </summary>
-        public double Altitude
-        {
-            get { return IExecuteWithSignature<double>("getAltitude", "()D"); } set { IExecuteWithSignature("setAltitude", "(D)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getBearing()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setBearing(float)"/>
-        /// </summary>
-        public float Bearing
-        {
-            get { return IExecuteWithSignature<float>("getBearing", "()F"); } set { IExecuteWithSignature("setBearing", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getBearingAccuracyDegrees()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setBearingAccuracyDegrees(float)"/>
-        /// </summary>
-        public float BearingAccuracyDegrees
-        {
-            get { return IExecuteWithSignature<float>("getBearingAccuracyDegrees", "()F"); } set { IExecuteWithSignature("setBearingAccuracyDegrees", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeAgeMillis()"/> 
-        /// </summary>
-        public long ElapsedRealtimeAgeMillis
-        {
-            get { return IExecuteWithSignature<long>("getElapsedRealtimeAgeMillis", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeMillis()"/> 
-        /// </summary>
-        public long ElapsedRealtimeMillis
-        {
-            get { return IExecuteWithSignature<long>("getElapsedRealtimeMillis", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeNanos()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setElapsedRealtimeNanos(long)"/>
-        /// </summary>
-        public long ElapsedRealtimeNanos
-        {
-            get { return IExecuteWithSignature<long>("getElapsedRealtimeNanos", "()J"); } set { IExecuteWithSignature("setElapsedRealtimeNanos", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeUncertaintyNanos()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setElapsedRealtimeUncertaintyNanos(double)"/>
-        /// </summary>
-        public double ElapsedRealtimeUncertaintyNanos
-        {
-            get { return IExecuteWithSignature<double>("getElapsedRealtimeUncertaintyNanos", "()D"); } set { IExecuteWithSignature("setElapsedRealtimeUncertaintyNanos", "(D)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getExtras()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setExtras(android.os.Bundle)"/>
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getLatitude()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setLatitude(double)"/>
-        /// </summary>
-        public double Latitude
-        {
-            get { return IExecuteWithSignature<double>("getLatitude", "()D"); } set { IExecuteWithSignature("setLatitude", "(D)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getLongitude()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setLongitude(double)"/>
-        /// </summary>
-        public double Longitude
-        {
-            get { return IExecuteWithSignature<double>("getLongitude", "()D"); } set { IExecuteWithSignature("setLongitude", "(D)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getMslAltitudeAccuracyMeters()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setMslAltitudeAccuracyMeters(float)"/>
-        /// </summary>
-        public float MslAltitudeAccuracyMeters
-        {
-            get { return IExecuteWithSignature<float>("getMslAltitudeAccuracyMeters", "()F"); } set { IExecuteWithSignature("setMslAltitudeAccuracyMeters", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getMslAltitudeMeters()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setMslAltitudeMeters(double)"/>
-        /// </summary>
-        public double MslAltitudeMeters
-        {
-            get { return IExecuteWithSignature<double>("getMslAltitudeMeters", "()D"); } set { IExecuteWithSignature("setMslAltitudeMeters", "(D)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getProvider()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setProvider(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String Provider
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProvider", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setProvider", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getSpeed()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setSpeed(float)"/>
-        /// </summary>
-        public float Speed
-        {
-            get { return IExecuteWithSignature<float>("getSpeed", "()F"); } set { IExecuteWithSignature("setSpeed", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getSpeedAccuracyMetersPerSecond()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setSpeedAccuracyMetersPerSecond(float)"/>
-        /// </summary>
-        public float SpeedAccuracyMetersPerSecond
-        {
-            get { return IExecuteWithSignature<float>("getSpeedAccuracyMetersPerSecond", "()F"); } set { IExecuteWithSignature("setSpeedAccuracyMetersPerSecond", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getTime()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setTime(long)"/>
-        /// </summary>
-        public long Time
-        {
-            get { return IExecuteWithSignature<long>("getTime", "()J"); } set { IExecuteWithSignature("setTime", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/Location.html#getVerticalAccuracyMeters()"/> <see href="https://developer.android.com/reference/android/location/Location.html#setVerticalAccuracyMeters(float)"/>
-        /// </summary>
-        public float VerticalAccuracyMeters
-        {
-            get { return IExecuteWithSignature<float>("getVerticalAccuracyMeters", "()F"); } set { IExecuteWithSignature("setVerticalAccuracyMeters", "(F)V", value); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Location.html#hasAccuracy()"/>
@@ -334,7 +216,7 @@ public bool IsComplete()
         /// <see href="https://developer.android.com/reference/android/location/Location.html#isFromMockProvider()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsFromMockProvider()
         {
             return IExecuteWithSignature<bool>("isFromMockProvider", "()Z");
@@ -348,6 +230,46 @@ public bool IsMock()
             return IExecuteWithSignature<bool>("isMock", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getAltitude()"/>
+        /// </summary>
+        /// <returns><see cref="double"/></returns>
+        public double GetAltitude()
+        {
+            return IExecuteWithSignature<double>("getAltitude", "()D");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeUncertaintyNanos()"/>
+        /// </summary>
+        /// <returns><see cref="double"/></returns>
+        public double GetElapsedRealtimeUncertaintyNanos()
+        {
+            return IExecuteWithSignature<double>("getElapsedRealtimeUncertaintyNanos", "()D");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getLatitude()"/>
+        /// </summary>
+        /// <returns><see cref="double"/></returns>
+        public double GetLatitude()
+        {
+            return IExecuteWithSignature<double>("getLatitude", "()D");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getLongitude()"/>
+        /// </summary>
+        /// <returns><see cref="double"/></returns>
+        public double GetLongitude()
+        {
+            return IExecuteWithSignature<double>("getLongitude", "()D");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getMslAltitudeMeters()"/>
+        /// </summary>
+        /// <returns><see cref="double"/></returns>
+        public double GetMslAltitudeMeters()
+        {
+            return IExecuteWithSignature<double>("getMslAltitudeMeters", "()D");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Location.html#bearingTo(android.location.Location)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.Location"/></param>
@@ -366,6 +288,62 @@ public float DistanceTo(Android.Location.Location arg0)
             return IExecuteWithSignature<float>("distanceTo", "(Landroid/location/Location;)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getAccuracy()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetAccuracy()
+        {
+            return IExecuteWithSignature<float>("getAccuracy", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getBearing()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetBearing()
+        {
+            return IExecuteWithSignature<float>("getBearing", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getBearingAccuracyDegrees()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetBearingAccuracyDegrees()
+        {
+            return IExecuteWithSignature<float>("getBearingAccuracyDegrees", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getMslAltitudeAccuracyMeters()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetMslAltitudeAccuracyMeters()
+        {
+            return IExecuteWithSignature<float>("getMslAltitudeAccuracyMeters", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getSpeed()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetSpeed()
+        {
+            return IExecuteWithSignature<float>("getSpeed", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getSpeedAccuracyMetersPerSecond()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetSpeedAccuracyMetersPerSecond()
+        {
+            return IExecuteWithSignature<float>("getSpeedAccuracyMetersPerSecond", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getVerticalAccuracyMeters()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetVerticalAccuracyMeters()
+        {
+            return IExecuteWithSignature<float>("getVerticalAccuracyMeters", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Location.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -374,6 +352,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProvider()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getProvider", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeAgeMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetElapsedRealtimeAgeMillis()
+        {
+            return IExecuteWithSignature<long>("getElapsedRealtimeAgeMillis", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeAgeMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -383,11 +377,35 @@ public long GetElapsedRealtimeAgeMillis(long arg0)
             return IExecuteWithSignature<long>("getElapsedRealtimeAgeMillis", "(J)J", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetElapsedRealtimeMillis()
+        {
+            return IExecuteWithSignature<long>("getElapsedRealtimeMillis", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getElapsedRealtimeNanos()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetElapsedRealtimeNanos()
+        {
+            return IExecuteWithSignature<long>("getElapsedRealtimeNanos", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#getTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTime()
+        {
+            return IExecuteWithSignature<long>("getTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Location.html#dump(android.util.Printer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.Printer"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Dump(Android.Util.Printer arg0, Java.Lang.String arg1)
         {
             IExecute("dump", arg0, arg1);
@@ -478,6 +496,78 @@ public void Set(Android.Location.Location arg0)
             IExecuteWithSignature("set", "(Landroid/location/Location;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setAccuracy(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetAccuracy(float arg0)
+        {
+            IExecuteWithSignature("setAccuracy", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setAltitude(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        public void SetAltitude(double arg0)
+        {
+            IExecuteWithSignature("setAltitude", "(D)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setBearing(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetBearing(float arg0)
+        {
+            IExecuteWithSignature("setBearing", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setBearingAccuracyDegrees(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetBearingAccuracyDegrees(float arg0)
+        {
+            IExecuteWithSignature("setBearingAccuracyDegrees", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setElapsedRealtimeNanos(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetElapsedRealtimeNanos(long arg0)
+        {
+            IExecuteWithSignature("setElapsedRealtimeNanos", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setElapsedRealtimeUncertaintyNanos(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        public void SetElapsedRealtimeUncertaintyNanos(double arg0)
+        {
+            IExecuteWithSignature("setElapsedRealtimeUncertaintyNanos", "(D)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setExtras(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        public void SetExtras(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setLatitude(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        public void SetLatitude(double arg0)
+        {
+            IExecuteWithSignature("setLatitude", "(D)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setLongitude(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        public void SetLongitude(double arg0)
+        {
+            IExecuteWithSignature("setLongitude", "(D)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Location.html#setMock(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -486,6 +576,62 @@ public void SetMock(bool arg0)
             IExecuteWithSignature("setMock", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setMslAltitudeAccuracyMeters(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetMslAltitudeAccuracyMeters(float arg0)
+        {
+            IExecuteWithSignature("setMslAltitudeAccuracyMeters", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setMslAltitudeMeters(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        public void SetMslAltitudeMeters(double arg0)
+        {
+            IExecuteWithSignature("setMslAltitudeMeters", "(D)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setProvider(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetProvider(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setProvider", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setSpeed(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetSpeed(float arg0)
+        {
+            IExecuteWithSignature("setSpeed", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setSpeedAccuracyMetersPerSecond(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetSpeedAccuracyMetersPerSecond(float arg0)
+        {
+            IExecuteWithSignature("setSpeedAccuracyMetersPerSecond", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetTime(long arg0)
+        {
+            IExecuteWithSignature("setTime", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/Location.html#setVerticalAccuracyMeters(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetVerticalAccuracyMeters(float arg0)
+        {
+            IExecuteWithSignature("setVerticalAccuracyMeters", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/Location.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Location/LocationListener.cs b/src/net/Netdroid/Generated/Android/Location/LocationListener.cs
index 6f6504131..813f8bcb9 100644
--- a/src/net/Netdroid/Generated/Android/Location/LocationListener.cs
+++ b/src/net/Netdroid/Generated/Android/Location/LocationListener.cs
@@ -68,12 +68,12 @@ public partial class LocationListener : Android.Location.ILocationListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onLocationChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Location.Location>>>(OnLocationChangedEventHandler));
-            AddEventHandler("onFlushComplete", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnFlushCompleteEventHandler));
-            AddEventHandler("onLocationChanged1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.Location>>>>(OnLocationChanged1EventHandler));
-            AddEventHandler("onProviderDisabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnProviderDisabledEventHandler));
-            AddEventHandler("onProviderEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnProviderEnabledEventHandler));
-            AddEventHandler("onStatusChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnStatusChangedEventHandler));
+            AddEventHandler("onLocationChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Location.Location>>>(OnLocationChangedEventHandler));
+            AddEventHandler("onFlushComplete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnFlushCompleteEventHandler));
+            AddEventHandler("onLocationChanged1", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.Location>>>>(OnLocationChanged1EventHandler));
+            AddEventHandler("onProviderDisabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnProviderDisabledEventHandler));
+            AddEventHandler("onProviderEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnProviderEnabledEventHandler));
+            AddEventHandler("onStatusChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnStatusChangedEventHandler));
 
         }
 
@@ -81,7 +81,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/location/LocationListener.html#onLocationChanged(android.location.Location)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnLocationChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Location.Location> OnOnLocationChanged { get; set; } = null;
+        public global::System.Action<Android.Location.Location> OnOnLocationChanged { get; set; } = null;
 
         void OnLocationChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Location.Location>> data)
         {
@@ -111,7 +111,7 @@ public void OnFlushCompleteDefault(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/location/LocationListener.html#onFlushComplete(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnFlushComplete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnFlushComplete { get; set; } = null;
+        public global::System.Action<int> OnOnFlushComplete { get; set; } = null;
 
         void OnFlushCompleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -142,7 +142,7 @@ public void OnLocationChangedDefault(Java.Util.List<Android.Location.Location> a
         /// Handler for <see href="https://developer.android.com/reference/android/location/LocationListener.html#onLocationChanged(java.util.List)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnLocationChanged1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Util.List<Android.Location.Location>> OnOnLocationChanged1 { get; set; } = null;
+        public global::System.Action<Java.Util.List<Android.Location.Location>> OnOnLocationChanged1 { get; set; } = null;
 
         void OnLocationChanged1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Location.Location>>> data)
         {
@@ -173,7 +173,7 @@ public void OnProviderDisabledDefault(Java.Lang.String arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/location/LocationListener.html#onProviderDisabled(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnProviderDisabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnOnProviderDisabled { get; set; } = null;
+        public global::System.Action<Java.Lang.String> OnOnProviderDisabled { get; set; } = null;
 
         void OnProviderDisabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -204,7 +204,7 @@ public void OnProviderEnabledDefault(Java.Lang.String arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/location/LocationListener.html#onProviderEnabled(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnProviderEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnOnProviderEnabled { get; set; } = null;
+        public global::System.Action<Java.Lang.String> OnOnProviderEnabled { get; set; } = null;
 
         void OnProviderEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -227,7 +227,7 @@ public virtual void OnProviderEnabled(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
         public void OnStatusChangedDefault(Java.Lang.String arg0, int arg1, Android.Os.Bundle arg2)
         {
@@ -238,7 +238,7 @@ public void OnStatusChangedDefault(Java.Lang.String arg0, int arg1, Android.Os.B
         /// Handler for <see href="https://developer.android.com/reference/android/location/LocationListener.html#onStatusChanged(java.lang.String,int,android.os.Bundle)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnStatusChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, int, Android.Os.Bundle> OnOnStatusChanged { get; set; } = null;
+        public global::System.Action<Java.Lang.String, int, Android.Os.Bundle> OnOnStatusChanged { get; set; } = null;
 
         void OnStatusChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -252,7 +252,7 @@ void OnStatusChangedEventHandler(object sender, CLRListenerEventArgs<CLREventDat
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="OnStatusChangedDefault"/>; override the method to implement a different behavior</remarks>
         public virtual void OnStatusChanged(Java.Lang.String arg0, int arg1, Android.Os.Bundle arg2)
         {
@@ -335,7 +335,7 @@ public override void OnProviderEnabled(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnStatusChanged(Java.Lang.String arg0, int arg1, Android.Os.Bundle arg2)
         {
             IExecute("onStatusChanged", arg0, arg1, arg2);
diff --git a/src/net/Netdroid/Generated/Android/Location/LocationManager.cs b/src/net/Netdroid/Generated/Android/Location/LocationManager.cs
index 7f246f310..60d8e5673 100644
--- a/src/net/Netdroid/Generated/Android/Location/LocationManager.cs
+++ b/src/net/Netdroid/Generated/Android/Location/LocationManager.cs
@@ -112,7 +112,7 @@ public partial class LocationManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#KEY_STATUS_CHANGED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_STATUS_CHANGED { get { if (!_KEY_STATUS_CHANGEDReady) { _KEY_STATUS_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_STATUS_CHANGED"); _KEY_STATUS_CHANGEDReady = true; } return _KEY_STATUS_CHANGEDContent; } }
         private static Java.Lang.String _KEY_STATUS_CHANGEDContent = default;
         private static bool _KEY_STATUS_CHANGEDReady = false; // this is used because in case of generics 
@@ -149,46 +149,19 @@ public partial class LocationManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getAllProviders()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGnssCapabilities()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> AllProviders
+        /// <returns><see cref="Android.Location.GnssCapabilities"/></returns>
+        public Android.Location.GnssCapabilities GetGnssCapabilities()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAllProviders", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGnssAntennaInfos()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Location.GnssAntennaInfo> GnssAntennaInfos
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Location.GnssAntennaInfo>>("getGnssAntennaInfos", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGnssCapabilities()"/> 
-        /// </summary>
-        public Android.Location.GnssCapabilities GnssCapabilities
-        {
-            get { return IExecuteWithSignature<Android.Location.GnssCapabilities>("getGnssCapabilities", "()Landroid/location/GnssCapabilities;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGnssHardwareModelName()"/> 
-        /// </summary>
-        public Java.Lang.String GnssHardwareModelName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGnssHardwareModelName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGnssYearOfHardware()"/> 
-        /// </summary>
-        public int GnssYearOfHardware
-        {
-            get { return IExecuteWithSignature<int>("getGnssYearOfHardware", "()I"); }
+            return IExecuteWithSignature<Android.Location.GnssCapabilities>("getGnssCapabilities", "()Landroid/location/GnssCapabilities;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGpsStatus(android.location.GpsStatus)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.GpsStatus"/></param>
         /// <returns><see cref="Android.Location.GpsStatus"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Location.GpsStatus GetGpsStatus(Android.Location.GpsStatus arg0)
         {
             return IExecuteWithSignature<Android.Location.GpsStatus>("getGpsStatus", "(Landroid/location/GpsStatus;)Landroid/location/GpsStatus;", arg0);
@@ -207,7 +180,7 @@ public Android.Location.Location GetLastKnownLocation(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Location.LocationProvider"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Location.LocationProvider GetProvider(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Location.LocationProvider>("getProvider", "(Ljava/lang/String;)Landroid/location/LocationProvider;", arg0);
@@ -226,7 +199,7 @@ public Android.Location.Provider.ProviderProperties GetProviderProperties(Java.L
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.GpsStatus.Listener"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool AddGpsStatusListener(Android.Location.GpsStatus.Listener arg0)
         {
             return IExecuteWithSignature<bool>("addGpsStatusListener", "(Landroid/location/GpsStatus$Listener;)Z", arg0);
@@ -236,7 +209,7 @@ public bool AddGpsStatusListener(Android.Location.GpsStatus.Listener arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.GpsStatus.NmeaListener"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool AddNmeaListener(Android.Location.GpsStatus.NmeaListener arg0)
         {
             return IExecuteWithSignature<bool>("addNmeaListener", "(Landroid/location/GpsStatus$NmeaListener;)Z", arg0);
@@ -256,7 +229,7 @@ public bool AddNmeaListener(Android.Location.OnNmeaMessageListener arg0, Android
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.OnNmeaMessageListener"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool AddNmeaListener(Android.Location.OnNmeaMessageListener arg0)
         {
             return IExecuteWithSignature<bool>("addNmeaListener", "(Landroid/location/OnNmeaMessageListener;)Z", arg0);
@@ -333,7 +306,7 @@ public bool RegisterGnssMeasurementsCallback(Android.Location.GnssMeasurementsEv
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.GnssMeasurementsEvent.Callback"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RegisterGnssMeasurementsCallback(Android.Location.GnssMeasurementsEvent.Callback arg0)
         {
             return IExecuteWithSignature<bool>("registerGnssMeasurementsCallback", "(Landroid/location/GnssMeasurementsEvent$Callback;)Z", arg0);
@@ -363,7 +336,7 @@ public bool RegisterGnssNavigationMessageCallback(Android.Location.GnssNavigatio
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.GnssNavigationMessage.Callback"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RegisterGnssNavigationMessageCallback(Android.Location.GnssNavigationMessage.Callback arg0)
         {
             return IExecuteWithSignature<bool>("registerGnssNavigationMessageCallback", "(Landroid/location/GnssNavigationMessage$Callback;)Z", arg0);
@@ -393,7 +366,7 @@ public bool RegisterGnssStatusCallback(Android.Location.GnssStatus.Callback arg0
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.GnssStatus.Callback"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RegisterGnssStatusCallback(Android.Location.GnssStatus.Callback arg0)
         {
             return IExecuteWithSignature<bool>("registerGnssStatusCallback", "(Landroid/location/GnssStatus$Callback;)Z", arg0);
@@ -420,23 +393,55 @@ public bool SendExtraCommand(Java.Lang.String arg0, Java.Lang.String arg1, Andro
             return IExecute<bool>("sendExtraCommand", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGnssYearOfHardware()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGnssYearOfHardware()
+        {
+            return IExecuteWithSignature<int>("getGnssYearOfHardware", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getBestProvider(android.location.Criteria,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.Criteria"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetBestProvider(Android.Location.Criteria arg0, bool arg1)
         {
             return IExecute<Java.Lang.String>("getBestProvider", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGnssHardwareModelName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGnssHardwareModelName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGnssHardwareModelName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getGnssAntennaInfos()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Location.GnssAntennaInfo> GetGnssAntennaInfos()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Location.GnssAntennaInfo>>("getGnssAntennaInfos", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getAllProviders()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetAllProviders()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAllProviders", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#getProviders(android.location.Criteria,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.Criteria"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Java.Lang.String> GetProviders(Android.Location.Criteria arg0, bool arg1)
         {
             return IExecute<Java.Util.List<Java.Lang.String>>("getProviders", arg0, arg1);
@@ -502,7 +507,7 @@ public void AddTestProvider(Java.Lang.String arg0, bool arg1, bool arg2, bool ar
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#clearTestProviderEnabled(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearTestProviderEnabled(Java.Lang.String arg0)
         {
             IExecuteWithSignature("clearTestProviderEnabled", "(Ljava/lang/String;)V", arg0);
@@ -511,7 +516,7 @@ public void ClearTestProviderEnabled(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#clearTestProviderLocation(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearTestProviderLocation(Java.Lang.String arg0)
         {
             IExecuteWithSignature("clearTestProviderLocation", "(Ljava/lang/String;)V", arg0);
@@ -520,7 +525,7 @@ public void ClearTestProviderLocation(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#clearTestProviderStatus(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearTestProviderStatus(Java.Lang.String arg0)
         {
             IExecuteWithSignature("clearTestProviderStatus", "(Ljava/lang/String;)V", arg0);
@@ -552,7 +557,7 @@ public void GetCurrentLocation(Java.Lang.String arg0, Android.Os.CancellationSig
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#removeGpsStatusListener(android.location.GpsStatus.Listener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.GpsStatus.Listener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveGpsStatusListener(Android.Location.GpsStatus.Listener arg0)
         {
             IExecuteWithSignature("removeGpsStatusListener", "(Landroid/location/GpsStatus$Listener;)V", arg0);
@@ -561,7 +566,7 @@ public void RemoveGpsStatusListener(Android.Location.GpsStatus.Listener arg0)
         /// <see href="https://developer.android.com/reference/android/location/LocationManager.html#removeNmeaListener(android.location.GpsStatus.NmeaListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.GpsStatus.NmeaListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveNmeaListener(Android.Location.GpsStatus.NmeaListener arg0)
         {
             IExecuteWithSignature("removeNmeaListener", "(Landroid/location/GpsStatus$NmeaListener;)V", arg0);
@@ -700,7 +705,7 @@ public void RequestLocationUpdates(Java.Lang.String arg0, long arg1, float arg2,
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="Android.Location.Criteria"/></param>
         /// <param name="arg3"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestLocationUpdates(long arg0, float arg1, Android.Location.Criteria arg2, Android.App.PendingIntent arg3)
         {
             IExecute("requestLocationUpdates", arg0, arg1, arg2, arg3);
@@ -713,7 +718,7 @@ public void RequestLocationUpdates(long arg0, float arg1, Android.Location.Crite
         /// <param name="arg2"><see cref="Android.Location.Criteria"/></param>
         /// <param name="arg3"><see cref="Android.Location.LocationListener"/></param>
         /// <param name="arg4"><see cref="Android.Os.Looper"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestLocationUpdates(long arg0, float arg1, Android.Location.Criteria arg2, Android.Location.LocationListener arg3, Android.Os.Looper arg4)
         {
             IExecute("requestLocationUpdates", arg0, arg1, arg2, arg3, arg4);
@@ -726,7 +731,7 @@ public void RequestLocationUpdates(long arg0, float arg1, Android.Location.Crite
         /// <param name="arg2"><see cref="Android.Location.Criteria"/></param>
         /// <param name="arg3"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg4"><see cref="Android.Location.LocationListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestLocationUpdates(long arg0, float arg1, Android.Location.Criteria arg2, Java.Util.Concurrent.Executor arg3, Android.Location.LocationListener arg4)
         {
             IExecute("requestLocationUpdates", arg0, arg1, arg2, arg3, arg4);
@@ -736,7 +741,7 @@ public void RequestLocationUpdates(long arg0, float arg1, Android.Location.Crite
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.Criteria"/></param>
         /// <param name="arg1"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestSingleUpdate(Android.Location.Criteria arg0, Android.App.PendingIntent arg1)
         {
             IExecute("requestSingleUpdate", arg0, arg1);
@@ -747,7 +752,7 @@ public void RequestSingleUpdate(Android.Location.Criteria arg0, Android.App.Pend
         /// <param name="arg0"><see cref="Android.Location.Criteria"/></param>
         /// <param name="arg1"><see cref="Android.Location.LocationListener"/></param>
         /// <param name="arg2"><see cref="Android.Os.Looper"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestSingleUpdate(Android.Location.Criteria arg0, Android.Location.LocationListener arg1, Android.Os.Looper arg2)
         {
             IExecute("requestSingleUpdate", arg0, arg1, arg2);
@@ -757,7 +762,7 @@ public void RequestSingleUpdate(Android.Location.Criteria arg0, Android.Location
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestSingleUpdate(Java.Lang.String arg0, Android.App.PendingIntent arg1)
         {
             IExecute("requestSingleUpdate", arg0, arg1);
@@ -768,7 +773,7 @@ public void RequestSingleUpdate(Java.Lang.String arg0, Android.App.PendingIntent
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.Location.LocationListener"/></param>
         /// <param name="arg2"><see cref="Android.Os.Looper"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestSingleUpdate(Java.Lang.String arg0, Android.Location.LocationListener arg1, Android.Os.Looper arg2)
         {
             IExecute("requestSingleUpdate", arg0, arg1, arg2);
@@ -798,7 +803,7 @@ public void SetTestProviderLocation(Java.Lang.String arg0, Android.Location.Loca
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Os.Bundle"/></param>
         /// <param name="arg3"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTestProviderStatus(Java.Lang.String arg0, int arg1, Android.Os.Bundle arg2, long arg3)
         {
             IExecute("setTestProviderStatus", arg0, arg1, arg2, arg3);
diff --git a/src/net/Netdroid/Generated/Android/Location/LocationProvider.cs b/src/net/Netdroid/Generated/Android/Location/LocationProvider.cs
index ef1cb2c83..6091ec613 100644
--- a/src/net/Netdroid/Generated/Android/Location/LocationProvider.cs
+++ b/src/net/Netdroid/Generated/Android/Location/LocationProvider.cs
@@ -40,21 +40,21 @@ public partial class LocationProvider
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#AVAILABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int AVAILABLE { get { if (!_AVAILABLEReady) { _AVAILABLEContent = SGetField<int>(LocalBridgeClazz, "AVAILABLE"); _AVAILABLEReady = true; } return _AVAILABLEContent; } }
         private static int _AVAILABLEContent = default;
         private static bool _AVAILABLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#OUT_OF_SERVICE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OUT_OF_SERVICE { get { if (!_OUT_OF_SERVICEReady) { _OUT_OF_SERVICEContent = SGetField<int>(LocalBridgeClazz, "OUT_OF_SERVICE"); _OUT_OF_SERVICEReady = true; } return _OUT_OF_SERVICEContent; } }
         private static int _OUT_OF_SERVICEContent = default;
         private static bool _OUT_OF_SERVICEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#TEMPORARILY_UNAVAILABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TEMPORARILY_UNAVAILABLE { get { if (!_TEMPORARILY_UNAVAILABLEReady) { _TEMPORARILY_UNAVAILABLEContent = SGetField<int>(LocalBridgeClazz, "TEMPORARILY_UNAVAILABLE"); _TEMPORARILY_UNAVAILABLEReady = true; } return _TEMPORARILY_UNAVAILABLEContent; } }
         private static int _TEMPORARILY_UNAVAILABLEContent = default;
         private static bool _TEMPORARILY_UNAVAILABLEReady = false; // this is used because in case of generics 
@@ -67,34 +67,10 @@ public partial class LocationProvider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#getAccuracy()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Accuracy
-        {
-            get { return IExecuteWithSignature<int>("getAccuracy", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#getName()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#getPowerRequirement()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int PowerRequirement
-        {
-            get { return IExecuteWithSignature<int>("getPowerRequirement", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#hasMonetaryCost()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasMonetaryCost()
         {
             return IExecuteWithSignature<bool>("hasMonetaryCost", "()Z");
@@ -104,7 +80,7 @@ public bool HasMonetaryCost()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Location.Criteria"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool MeetsCriteria(Android.Location.Criteria arg0)
         {
             return IExecuteWithSignature<bool>("meetsCriteria", "(Landroid/location/Criteria;)Z", arg0);
@@ -113,7 +89,7 @@ public bool MeetsCriteria(Android.Location.Criteria arg0)
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#requiresCell()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RequiresCell()
         {
             return IExecuteWithSignature<bool>("requiresCell", "()Z");
@@ -122,7 +98,7 @@ public bool RequiresCell()
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#requiresNetwork()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RequiresNetwork()
         {
             return IExecuteWithSignature<bool>("requiresNetwork", "()Z");
@@ -131,7 +107,7 @@ public bool RequiresNetwork()
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#requiresSatellite()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RequiresSatellite()
         {
             return IExecuteWithSignature<bool>("requiresSatellite", "()Z");
@@ -140,7 +116,7 @@ public bool RequiresSatellite()
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#supportsAltitude()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SupportsAltitude()
         {
             return IExecuteWithSignature<bool>("supportsAltitude", "()Z");
@@ -149,7 +125,7 @@ public bool SupportsAltitude()
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#supportsBearing()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SupportsBearing()
         {
             return IExecuteWithSignature<bool>("supportsBearing", "()Z");
@@ -158,11 +134,38 @@ public bool SupportsBearing()
         /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#supportsSpeed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SupportsSpeed()
         {
             return IExecuteWithSignature<bool>("supportsSpeed", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#getAccuracy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetAccuracy()
+        {
+            return IExecuteWithSignature<int>("getAccuracy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#getPowerRequirement()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPowerRequirement()
+        {
+            return IExecuteWithSignature<int>("getPowerRequirement", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/LocationProvider.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Location/LocationRequest.cs b/src/net/Netdroid/Generated/Android/Location/LocationRequest.cs
index e12b6992b..4ef6bbc02 100644
--- a/src/net/Netdroid/Generated/Android/Location/LocationRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Location/LocationRequest.cs
@@ -76,61 +76,68 @@ public partial class LocationRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getDurationMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getMinUpdateDistanceMeters()"/>
         /// </summary>
-        public long DurationMillis
+        /// <returns><see cref="float"/></returns>
+        public float GetMinUpdateDistanceMeters()
         {
-            get { return IExecuteWithSignature<long>("getDurationMillis", "()J"); }
+            return IExecuteWithSignature<float>("getMinUpdateDistanceMeters", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getIntervalMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#describeContents()"/>
         /// </summary>
-        public long IntervalMillis
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getIntervalMillis", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getMaxUpdateDelayMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getMaxUpdates()"/>
         /// </summary>
-        public long MaxUpdateDelayMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxUpdates()
         {
-            get { return IExecuteWithSignature<long>("getMaxUpdateDelayMillis", "()J"); }
+            return IExecuteWithSignature<int>("getMaxUpdates", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getMaxUpdates()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getQuality()"/>
         /// </summary>
-        public int MaxUpdates
+        /// <returns><see cref="int"/></returns>
+        public int GetQuality()
         {
-            get { return IExecuteWithSignature<int>("getMaxUpdates", "()I"); }
+            return IExecuteWithSignature<int>("getQuality", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getMinUpdateDistanceMeters()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getDurationMillis()"/>
         /// </summary>
-        public float MinUpdateDistanceMeters
+        /// <returns><see cref="long"/></returns>
+        public long GetDurationMillis()
         {
-            get { return IExecuteWithSignature<float>("getMinUpdateDistanceMeters", "()F"); }
+            return IExecuteWithSignature<long>("getDurationMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getMinUpdateIntervalMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getIntervalMillis()"/>
         /// </summary>
-        public long MinUpdateIntervalMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetIntervalMillis()
         {
-            get { return IExecuteWithSignature<long>("getMinUpdateIntervalMillis", "()J"); }
+            return IExecuteWithSignature<long>("getIntervalMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getQuality()"/> 
+        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getMaxUpdateDelayMillis()"/>
         /// </summary>
-        public int Quality
+        /// <returns><see cref="long"/></returns>
+        public long GetMaxUpdateDelayMillis()
         {
-            get { return IExecuteWithSignature<int>("getQuality", "()I"); }
+            return IExecuteWithSignature<long>("getMaxUpdateDelayMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#getMinUpdateIntervalMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetMinUpdateIntervalMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getMinUpdateIntervalMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/LocationRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Location/OnNmeaMessageListener.cs b/src/net/Netdroid/Generated/Android/Location/OnNmeaMessageListener.cs
index dca1aaf02..8a399ed5a 100644
--- a/src/net/Netdroid/Generated/Android/Location/OnNmeaMessageListener.cs
+++ b/src/net/Netdroid/Generated/Android/Location/OnNmeaMessageListener.cs
@@ -68,7 +68,7 @@ public partial class OnNmeaMessageListener : Android.Location.IOnNmeaMessageList
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onNmeaMessage", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnNmeaMessageEventHandler));
+            AddEventHandler("onNmeaMessage", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnNmeaMessageEventHandler));
 
         }
 
@@ -76,7 +76,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/location/OnNmeaMessageListener.html#onNmeaMessage(java.lang.String,long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnNmeaMessage"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, long> OnOnNmeaMessage { get; set; } = null;
+        public global::System.Action<Java.Lang.String, long> OnOnNmeaMessage { get; set; } = null;
 
         void OnNmeaMessageEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Location/Provider/ProviderProperties.cs b/src/net/Netdroid/Generated/Android/Location/Provider/ProviderProperties.cs
index fa7f90d93..96b7f6c9e 100644
--- a/src/net/Netdroid/Generated/Android/Location/Provider/ProviderProperties.cs
+++ b/src/net/Netdroid/Generated/Android/Location/Provider/ProviderProperties.cs
@@ -82,20 +82,6 @@ public partial class ProviderProperties
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/provider/ProviderProperties.html#getAccuracy()"/> 
-        /// </summary>
-        public int Accuracy
-        {
-            get { return IExecuteWithSignature<int>("getAccuracy", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/location/provider/ProviderProperties.html#getPowerUsage()"/> 
-        /// </summary>
-        public int PowerUsage
-        {
-            get { return IExecuteWithSignature<int>("getPowerUsage", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/provider/ProviderProperties.html#hasAltitudeSupport()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -160,6 +146,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/provider/ProviderProperties.html#getAccuracy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAccuracy()
+        {
+            return IExecuteWithSignature<int>("getAccuracy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/location/provider/ProviderProperties.html#getPowerUsage()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPowerUsage()
+        {
+            return IExecuteWithSignature<int>("getPowerUsage", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/location/provider/ProviderProperties.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Manifest.cs b/src/net/Netdroid/Generated/Android/Manifest.cs
index 385fc3244..a468149cb 100644
--- a/src/net/Netdroid/Generated/Android/Manifest.cs
+++ b/src/net/Netdroid/Generated/Android/Manifest.cs
@@ -190,7 +190,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#BIND_CARRIER_MESSAGING_SERVICE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String BIND_CARRIER_MESSAGING_SERVICE { get { if (!_BIND_CARRIER_MESSAGING_SERVICEReady) { _BIND_CARRIER_MESSAGING_SERVICEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "BIND_CARRIER_MESSAGING_SERVICE"); _BIND_CARRIER_MESSAGING_SERVICEReady = true; } return _BIND_CARRIER_MESSAGING_SERVICEContent; } }
             private static Java.Lang.String _BIND_CARRIER_MESSAGING_SERVICEContent = default;
             private static bool _BIND_CARRIER_MESSAGING_SERVICEReady = false; // this is used because in case of generics 
@@ -203,7 +203,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#BIND_CHOOSER_TARGET_SERVICE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String BIND_CHOOSER_TARGET_SERVICE { get { if (!_BIND_CHOOSER_TARGET_SERVICEReady) { _BIND_CHOOSER_TARGET_SERVICEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "BIND_CHOOSER_TARGET_SERVICE"); _BIND_CHOOSER_TARGET_SERVICEReady = true; } return _BIND_CHOOSER_TARGET_SERVICEContent; } }
             private static Java.Lang.String _BIND_CHOOSER_TARGET_SERVICEContent = default;
             private static bool _BIND_CHOOSER_TARGET_SERVICEReady = false; // this is used because in case of generics 
@@ -690,7 +690,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#GET_TASKS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String GET_TASKS { get { if (!_GET_TASKSReady) { _GET_TASKSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GET_TASKS"); _GET_TASKSReady = true; } return _GET_TASKSContent; } }
             private static Java.Lang.String _GET_TASKSContent = default;
             private static bool _GET_TASKSReady = false; // this is used because in case of generics 
@@ -1351,7 +1351,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#PERSISTENT_ACTIVITY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PERSISTENT_ACTIVITY { get { if (!_PERSISTENT_ACTIVITYReady) { _PERSISTENT_ACTIVITYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PERSISTENT_ACTIVITY"); _PERSISTENT_ACTIVITYReady = true; } return _PERSISTENT_ACTIVITYContent; } }
             private static Java.Lang.String _PERSISTENT_ACTIVITYContent = default;
             private static bool _PERSISTENT_ACTIVITYReady = false; // this is used because in case of generics 
@@ -1364,7 +1364,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#PROCESS_OUTGOING_CALLS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PROCESS_OUTGOING_CALLS { get { if (!_PROCESS_OUTGOING_CALLSReady) { _PROCESS_OUTGOING_CALLSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PROCESS_OUTGOING_CALLS"); _PROCESS_OUTGOING_CALLSReady = true; } return _PROCESS_OUTGOING_CALLSContent; } }
             private static Java.Lang.String _PROCESS_OUTGOING_CALLSContent = default;
             private static bool _PROCESS_OUTGOING_CALLSReady = false; // this is used because in case of generics 
@@ -1431,7 +1431,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#READ_INPUT_STATE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String READ_INPUT_STATE { get { if (!_READ_INPUT_STATEReady) { _READ_INPUT_STATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "READ_INPUT_STATE"); _READ_INPUT_STATEReady = true; } return _READ_INPUT_STATEContent; } }
             private static Java.Lang.String _READ_INPUT_STATEContent = default;
             private static bool _READ_INPUT_STATEReady = false; // this is used because in case of generics 
@@ -1648,7 +1648,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#RESTART_PACKAGES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String RESTART_PACKAGES { get { if (!_RESTART_PACKAGESReady) { _RESTART_PACKAGESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "RESTART_PACKAGES"); _RESTART_PACKAGESReady = true; } return _RESTART_PACKAGESContent; } }
             private static Java.Lang.String _RESTART_PACKAGESContent = default;
             private static bool _RESTART_PACKAGESReady = false; // this is used because in case of generics 
@@ -1703,7 +1703,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#SET_PREFERRED_APPLICATIONS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SET_PREFERRED_APPLICATIONS { get { if (!_SET_PREFERRED_APPLICATIONSReady) { _SET_PREFERRED_APPLICATIONSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SET_PREFERRED_APPLICATIONS"); _SET_PREFERRED_APPLICATIONSReady = true; } return _SET_PREFERRED_APPLICATIONSContent; } }
             private static Java.Lang.String _SET_PREFERRED_APPLICATIONSContent = default;
             private static bool _SET_PREFERRED_APPLICATIONSReady = false; // this is used because in case of generics 
@@ -1746,7 +1746,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#SMS_FINANCIAL_TRANSACTIONS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SMS_FINANCIAL_TRANSACTIONS { get { if (!_SMS_FINANCIAL_TRANSACTIONSReady) { _SMS_FINANCIAL_TRANSACTIONSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SMS_FINANCIAL_TRANSACTIONS"); _SMS_FINANCIAL_TRANSACTIONSReady = true; } return _SMS_FINANCIAL_TRANSACTIONSContent; } }
             private static Java.Lang.String _SMS_FINANCIAL_TRANSACTIONSContent = default;
             private static bool _SMS_FINANCIAL_TRANSACTIONSReady = false; // this is used because in case of generics 
@@ -1831,7 +1831,7 @@ public partial class permission
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/Manifest.permission.html#USE_FINGERPRINT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USE_FINGERPRINT { get { if (!_USE_FINGERPRINTReady) { _USE_FINGERPRINTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USE_FINGERPRINT"); _USE_FINGERPRINTReady = true; } return _USE_FINGERPRINTContent; } }
             private static Java.Lang.String _USE_FINGERPRINTContent = default;
             private static bool _USE_FINGERPRINTReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Media/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/AllPackageClasses.cs
index 0078b706b..b8c2e3352 100644
--- a/src/net/Netdroid/Generated/Android/Media/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AllPackageClasses.cs
@@ -300,12 +300,12 @@ public partial class AudioDeviceCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AudioDeviceCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioDeviceCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioDeviceCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AudioDeviceCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioDeviceCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioDeviceCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -606,12 +606,12 @@ public partial class AudioPlaybackCallback : MASES.JCOBridge.C2JBridge.JVMBridge
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AudioPlaybackCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AudioPlaybackCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AudioPlaybackCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AudioPlaybackCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AudioPlaybackCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AudioPlaybackCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -652,12 +652,12 @@ public partial class AudioRecordingCallback : MASES.JCOBridge.C2JBridge.JVMBridg
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AudioRecordingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AudioRecordingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AudioRecordingCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AudioRecordingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AudioRecordingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AudioRecordingCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -699,10 +699,13 @@ public partial class OnAudioFocusChangeListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public OnAudioFocusChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioManager_OnAudioFocusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnAudioFocusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -724,10 +727,13 @@ public partial class OnAudioFocusChangeListenerDirect : OnAudioFocusChangeListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioManager$OnAudioFocusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioManager$OnAudioFocusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -758,10 +764,13 @@ public partial class OnCommunicationDeviceChangedListener : MASES.JCOBridge.C2JB
             /// </summary>
             public OnCommunicationDeviceChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioManager_OnCommunicationDeviceChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnCommunicationDeviceChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -783,10 +792,13 @@ public partial class OnCommunicationDeviceChangedListenerDirect : OnCommunicatio
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioManager$OnCommunicationDeviceChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioManager$OnCommunicationDeviceChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -817,10 +829,13 @@ public partial class OnModeChangedListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnModeChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioManager_OnModeChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnModeChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -842,10 +857,13 @@ public partial class OnModeChangedListenerDirect : OnModeChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioManager$OnModeChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioManager$OnModeChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -876,10 +894,13 @@ public partial class OnPreferredMixerAttributesChangedListener : MASES.JCOBridge
             /// </summary>
             public OnPreferredMixerAttributesChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioManager_OnPreferredMixerAttributesChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnPreferredMixerAttributesChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -901,10 +922,13 @@ public partial class OnPreferredMixerAttributesChangedListenerDirect : OnPreferr
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioManager$OnPreferredMixerAttributesChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioManager$OnPreferredMixerAttributesChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1022,12 +1046,12 @@ public partial class Key : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Key>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Key() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Key(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1069,12 +1093,12 @@ public partial class Key<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Key<T>>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Key() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Key(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1119,12 +1143,12 @@ public partial class AudioMetadataMap : Android.Media.AudioMetadataReadMap
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AudioMetadataMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioMetadataMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioMetadataMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AudioMetadataMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioMetadataMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioMetadataMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1165,12 +1189,12 @@ public partial class AudioMetadataReadMap : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AudioMetadataReadMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioMetadataReadMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioMetadataReadMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AudioMetadataReadMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioMetadataReadMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioMetadataReadMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1692,10 +1716,13 @@ public partial class OnRecordPositionUpdateListener : MASES.JCOBridge.C2JBridge.
             /// </summary>
             public OnRecordPositionUpdateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioRecord_OnRecordPositionUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnRecordPositionUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1717,10 +1744,13 @@ public partial class OnRecordPositionUpdateListenerDirect : OnRecordPositionUpda
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioRecord$OnRecordPositionUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioRecord$OnRecordPositionUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1744,7 +1774,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRoutingChangedListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnRoutingChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -1752,10 +1782,13 @@ public partial class OnRoutingChangedListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnRoutingChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioRecord_OnRoutingChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnRoutingChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1777,10 +1810,13 @@ public partial class OnRoutingChangedListenerDirect : OnRoutingChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioRecord$OnRoutingChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioRecord$OnRoutingChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1858,12 +1894,12 @@ public partial class AudioRecordingMonitor : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AudioRecordingMonitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioRecordingMonitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioRecordingMonitor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AudioRecordingMonitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioRecordingMonitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioRecordingMonitor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1904,12 +1940,12 @@ public partial class AudioRouting : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Audi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AudioRouting class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioRouting class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioRouting() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AudioRouting class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AudioRouting class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AudioRouting(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1947,10 +1983,13 @@ public partial class OnRoutingChangedListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnRoutingChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioRouting_OnRoutingChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnRoutingChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1972,10 +2011,13 @@ public partial class OnRoutingChangedListenerDirect : OnRoutingChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioRouting$OnRoutingChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioRouting$OnRoutingChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2182,10 +2224,13 @@ public partial class OnCodecFormatChangedListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public OnCodecFormatChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioTrack_OnCodecFormatChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnCodecFormatChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2207,10 +2252,13 @@ public partial class OnCodecFormatChangedListenerDirect : OnCodecFormatChangedLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioTrack$OnCodecFormatChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioTrack$OnCodecFormatChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2241,10 +2289,13 @@ public partial class OnPlaybackPositionUpdateListener : MASES.JCOBridge.C2JBridg
             /// </summary>
             public OnPlaybackPositionUpdateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioTrack_OnPlaybackPositionUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnPlaybackPositionUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2266,10 +2317,13 @@ public partial class OnPlaybackPositionUpdateListenerDirect : OnPlaybackPosition
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioTrack$OnPlaybackPositionUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioTrack$OnPlaybackPositionUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2293,7 +2347,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioTrack.OnRoutingChangedListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnRoutingChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -2301,10 +2355,13 @@ public partial class OnRoutingChangedListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnRoutingChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.AudioTrack_OnRoutingChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnRoutingChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2326,10 +2383,13 @@ public partial class OnRoutingChangedListenerDirect : OnRoutingChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.AudioTrack$OnRoutingChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.AudioTrack$OnRoutingChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2359,12 +2419,12 @@ public partial class StreamEventCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("StreamEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StreamEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StreamEventCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("StreamEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StreamEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StreamEventCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2514,12 +2574,12 @@ public partial class DrmInitData : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DrmIn
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DrmInitData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DrmInitData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DrmInitData() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DrmInitData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DrmInitData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DrmInitData(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2868,12 +2928,12 @@ public partial class Image : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Image class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Image class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Image() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Image class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Image class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Image(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2910,12 +2970,12 @@ public partial class Plane : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Plane>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Plane class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Plane class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Plane() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Plane class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Plane class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Plane(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3045,10 +3105,13 @@ public partial class OnImageAvailableListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnImageAvailableListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.ImageReader_OnImageAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnImageAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3070,10 +3133,13 @@ public partial class OnImageAvailableListenerDirect : OnImageAvailableListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.ImageReader$OnImageAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.ImageReader$OnImageAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3192,10 +3258,13 @@ public partial class OnImageReleasedListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnImageReleasedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.ImageWriter_OnImageReleasedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnImageReleasedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3217,10 +3286,13 @@ public partial class OnImageReleasedListenerDirect : OnImageReleasedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.ImageWriter$OnImageReleasedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.ImageWriter$OnImageReleasedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3295,10 +3367,13 @@ public partial class OnJetEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeLis
             /// </summary>
             public OnJetEventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.JetPlayer_OnJetEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnJetEventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3320,10 +3395,13 @@ public partial class OnJetEventListenerDirect : OnJetEventListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.JetPlayer$OnJetEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.JetPlayer$OnJetEventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3442,10 +3520,13 @@ public partial class EventListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public EventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaCas_EventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.EventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3467,10 +3548,13 @@ public partial class EventListenerDirect : EventListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaCas$EventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaCas$EventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3795,12 +3879,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4086,10 +4170,13 @@ public partial class OnFirstTunnelFrameReadyListener : MASES.JCOBridge.C2JBridge
             /// </summary>
             public OnFirstTunnelFrameReadyListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaCodec_OnFirstTunnelFrameReadyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnFirstTunnelFrameReadyListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4111,10 +4198,13 @@ public partial class OnFirstTunnelFrameReadyListenerDirect : OnFirstTunnelFrameR
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaCodec$OnFirstTunnelFrameReadyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaCodec$OnFirstTunnelFrameReadyListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4145,10 +4235,13 @@ public partial class OnFrameRenderedListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnFrameRenderedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaCodec_OnFrameRenderedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnFrameRenderedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4170,10 +4263,13 @@ public partial class OnFrameRenderedListenerDirect : OnFrameRenderedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaCodec$OnFrameRenderedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaCodec$OnFrameRenderedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4819,12 +4915,12 @@ public partial class ControllerCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ControllerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ControllerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ControllerCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ControllerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ControllerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ControllerCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4930,12 +5026,12 @@ public partial class MediaDataSource : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MediaDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaDataSource() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MediaDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaDataSource(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5230,19 +5326,19 @@ public ErrorCodes(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.HdcpLevel.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class HdcpLevel : Java.Lang.Annotation.Annotation
         {
             const string _bridgeClassName = "android.media.MediaDrm$HdcpLevel";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("HdcpLevel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("HdcpLevel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public HdcpLevel() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("HdcpLevel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("HdcpLevel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public HdcpLevel(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5477,10 +5573,13 @@ public partial class OnEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnEventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaDrm_OnEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnEventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5502,10 +5601,13 @@ public partial class OnEventListenerDirect : OnEventListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaDrm$OnEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaDrm$OnEventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5536,10 +5638,13 @@ public partial class OnExpirationUpdateListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public OnExpirationUpdateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaDrm_OnExpirationUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnExpirationUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5561,10 +5666,13 @@ public partial class OnExpirationUpdateListenerDirect : OnExpirationUpdateListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaDrm$OnExpirationUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaDrm$OnExpirationUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5595,10 +5703,13 @@ public partial class OnKeyStatusChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnKeyStatusChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaDrm_OnKeyStatusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnKeyStatusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5620,10 +5731,13 @@ public partial class OnKeyStatusChangeListenerDirect : OnKeyStatusChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaDrm$OnKeyStatusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaDrm$OnKeyStatusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5654,10 +5768,13 @@ public partial class OnSessionLostStateListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public OnSessionLostStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaDrm_OnSessionLostStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnSessionLostStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5679,10 +5796,13 @@ public partial class OnSessionLostStateListenerDirect : OnSessionLostStateListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaDrm$OnSessionLostStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaDrm$OnSessionLostStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5794,19 +5914,19 @@ public ProvisionRequest(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.SecurityLevel.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class SecurityLevel : Java.Lang.Annotation.Annotation
         {
             const string _bridgeClassName = "android.media.MediaDrm$SecurityLevel";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SecurityLevel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SecurityLevel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SecurityLevel() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SecurityLevel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SecurityLevel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SecurityLevel(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5902,12 +6022,12 @@ public partial class MediaDrmThrowable : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MediaDrmThrowable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaDrmThrowable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaDrmThrowable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MediaDrmThrowable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaDrmThrowable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaDrmThrowable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6294,19 +6414,19 @@ public Builder(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MediaMetadataEditor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MediaMetadataEditor>
     {
         const string _bridgeClassName = "android.media.MediaMetadataEditor";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MediaMetadataEditor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaMetadataEditor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaMetadataEditor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MediaMetadataEditor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaMetadataEditor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaMetadataEditor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6563,12 +6683,12 @@ public partial class InputReader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Input
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("InputReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("InputReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public InputReader() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("InputReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("InputReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public InputReader(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6609,12 +6729,12 @@ public partial class OutputConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ou
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OutputConsumer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OutputConsumer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OutputConsumer() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OutputConsumer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OutputConsumer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OutputConsumer(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6672,12 +6792,12 @@ public partial class SeekableInputReader : Android.Media.MediaParser.InputReader
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SeekableInputReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SeekableInputReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SeekableInputReader() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SeekableInputReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SeekableInputReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SeekableInputReader(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7017,10 +7137,13 @@ public partial class OnBufferingUpdateListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnBufferingUpdateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnBufferingUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnBufferingUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7042,10 +7165,13 @@ public partial class OnBufferingUpdateListenerDirect : OnBufferingUpdateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnBufferingUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnBufferingUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7076,10 +7202,13 @@ public partial class OnCompletionListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnCompletionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnCompletionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnCompletionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7101,10 +7230,13 @@ public partial class OnCompletionListenerDirect : OnCompletionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnCompletionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnCompletionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7134,12 +7266,12 @@ public partial class OnDrmConfigHelper : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OnDrmConfigHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnDrmConfigHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnDrmConfigHelper() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OnDrmConfigHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnDrmConfigHelper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnDrmConfigHelper(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7181,10 +7313,13 @@ public partial class OnDrmInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnDrmInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnDrmInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnDrmInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7206,10 +7341,13 @@ public partial class OnDrmInfoListenerDirect : OnDrmInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnDrmInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnDrmInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7240,10 +7378,13 @@ public partial class OnDrmPreparedListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnDrmPreparedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnDrmPreparedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnDrmPreparedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7265,10 +7406,13 @@ public partial class OnDrmPreparedListenerDirect : OnDrmPreparedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnDrmPreparedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnDrmPreparedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7299,10 +7443,13 @@ public partial class OnErrorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnErrorListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnErrorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnErrorListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7324,10 +7471,13 @@ public partial class OnErrorListenerDirect : OnErrorListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnErrorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnErrorListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7358,10 +7508,13 @@ public partial class OnInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public OnInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7383,10 +7536,13 @@ public partial class OnInfoListenerDirect : OnInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7417,10 +7573,13 @@ public partial class OnMediaTimeDiscontinuityListener : MASES.JCOBridge.C2JBridg
             /// </summary>
             public OnMediaTimeDiscontinuityListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnMediaTimeDiscontinuityListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnMediaTimeDiscontinuityListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7442,10 +7601,13 @@ public partial class OnMediaTimeDiscontinuityListenerDirect : OnMediaTimeDiscont
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnMediaTimeDiscontinuityListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnMediaTimeDiscontinuityListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7476,10 +7638,13 @@ public partial class OnPreparedListener : MASES.JCOBridge.C2JBridge.JVMBridgeLis
             /// </summary>
             public OnPreparedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnPreparedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnPreparedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7501,10 +7666,13 @@ public partial class OnPreparedListenerDirect : OnPreparedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnPreparedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnPreparedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7535,10 +7703,13 @@ public partial class OnSeekCompleteListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnSeekCompleteListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnSeekCompleteListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnSeekCompleteListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7560,10 +7731,13 @@ public partial class OnSeekCompleteListenerDirect : OnSeekCompleteListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnSeekCompleteListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnSeekCompleteListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7594,10 +7768,13 @@ public partial class OnSubtitleDataListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnSubtitleDataListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnSubtitleDataListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnSubtitleDataListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7619,10 +7796,13 @@ public partial class OnSubtitleDataListenerDirect : OnSubtitleDataListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnSubtitleDataListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnSubtitleDataListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7653,10 +7833,13 @@ public partial class OnTimedMetaDataAvailableListener : MASES.JCOBridge.C2JBridg
             /// </summary>
             public OnTimedMetaDataAvailableListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnTimedMetaDataAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnTimedMetaDataAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7678,10 +7861,13 @@ public partial class OnTimedMetaDataAvailableListenerDirect : OnTimedMetaDataAva
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnTimedMetaDataAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnTimedMetaDataAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7712,10 +7898,13 @@ public partial class OnTimedTextListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnTimedTextListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnTimedTextListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnTimedTextListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7737,10 +7926,13 @@ public partial class OnTimedTextListenerDirect : OnTimedTextListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnTimedTextListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnTimedTextListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7771,10 +7963,13 @@ public partial class OnVideoSizeChangedListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public OnVideoSizeChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaPlayer_OnVideoSizeChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnVideoSizeChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7796,10 +7991,13 @@ public partial class OnVideoSizeChangedListenerDirect : OnVideoSizeChangedListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaPlayer$OnVideoSizeChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaPlayer$OnVideoSizeChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -8084,10 +8282,13 @@ public partial class OnErrorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnErrorListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaRecorder_OnErrorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnErrorListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -8109,10 +8310,13 @@ public partial class OnErrorListenerDirect : OnErrorListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaRecorder$OnErrorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaRecorder$OnErrorListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -8143,10 +8347,13 @@ public partial class OnInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public OnInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaRecorder_OnInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -8168,10 +8375,13 @@ public partial class OnInfoListenerDirect : OnInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaRecorder$OnInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaRecorder$OnInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -8425,12 +8635,12 @@ public partial class MediaRoute2ProviderService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MediaRoute2ProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaRoute2ProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaRoute2ProviderService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MediaRoute2ProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaRoute2ProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaRoute2ProviderService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8511,12 +8721,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8777,12 +8987,12 @@ public partial class VolumeCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Vo
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("VolumeCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VolumeCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VolumeCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("VolumeCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VolumeCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VolumeCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8867,12 +9077,12 @@ public partial class ControllerCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ControllerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ControllerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ControllerCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ControllerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ControllerCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ControllerCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8914,10 +9124,13 @@ public partial class OnGetControllerHintsListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public OnGetControllerHintsListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaRouter2_OnGetControllerHintsListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnGetControllerHintsListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -8939,10 +9152,13 @@ public partial class OnGetControllerHintsListenerDirect : OnGetControllerHintsLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaRouter2$OnGetControllerHintsListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaRouter2$OnGetControllerHintsListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -8972,12 +9188,12 @@ public partial class RouteCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Rou
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("RouteCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RouteCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RouteCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("RouteCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RouteCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RouteCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -9062,12 +9278,12 @@ public partial class TransferCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TransferCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TransferCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TransferCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TransferCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TransferCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TransferCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -9152,12 +9368,12 @@ public partial class MediaScannerConnectionClient : Android.Media.MediaScannerCo
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("MediaScannerConnectionClient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("MediaScannerConnectionClient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public MediaScannerConnectionClient() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("MediaScannerConnectionClient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("MediaScannerConnectionClient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public MediaScannerConnectionClient(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -9199,10 +9415,13 @@ public partial class OnScanCompletedListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnScanCompletedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaScannerConnection_OnScanCompletedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnScanCompletedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -9224,10 +9443,13 @@ public partial class OnScanCompletedListenerDirect : OnScanCompletedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaScannerConnection$OnScanCompletedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaScannerConnection$OnScanCompletedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -9389,12 +9611,12 @@ public partial class SessionCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<S
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SessionCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SessionCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -9439,12 +9661,12 @@ public partial class MediaSession2Service : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MediaSession2Service class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaSession2Service class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaSession2Service() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MediaSession2Service class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaSession2Service class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaSession2Service(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -9569,12 +9791,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -9616,10 +9838,13 @@ public partial class OnErrorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnErrorListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.MediaSync_OnErrorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnErrorListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -9641,10 +9866,13 @@ public partial class OnErrorListenerDirect : OnErrorListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.MediaSync$OnErrorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.MediaSync$OnErrorListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -9766,12 +9994,12 @@ public partial class MicrophoneDirection : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MicrophoneDirection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MicrophoneDirection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MicrophoneDirection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MicrophoneDirection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MicrophoneDirection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MicrophoneDirection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -9999,7 +10227,7 @@ public Rating(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RemoteControlClient : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RemoteControlClient>
     {
         const string _bridgeClassName = "android.media.RemoteControlClient";
@@ -10040,7 +10268,7 @@ public RemoteControlClient(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.MetadataEditor.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class MetadataEditor : Android.Media.MediaMetadataEditor
         {
             const string _bridgeClassName = "android.media.RemoteControlClient$MetadataEditor";
@@ -10085,7 +10313,7 @@ public MetadataEditor(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnGetPlaybackPositionListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnGetPlaybackPositionListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -10093,10 +10321,13 @@ public partial class OnGetPlaybackPositionListener : MASES.JCOBridge.C2JBridge.J
             /// </summary>
             public OnGetPlaybackPositionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.RemoteControlClient_OnGetPlaybackPositionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnGetPlaybackPositionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -10118,10 +10349,13 @@ public partial class OnGetPlaybackPositionListenerDirect : OnGetPlaybackPosition
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.RemoteControlClient$OnGetPlaybackPositionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.RemoteControlClient$OnGetPlaybackPositionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -10145,7 +10379,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnMetadataUpdateListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnMetadataUpdateListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -10153,10 +10387,13 @@ public partial class OnMetadataUpdateListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnMetadataUpdateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.RemoteControlClient_OnMetadataUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnMetadataUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -10178,10 +10415,13 @@ public partial class OnMetadataUpdateListenerDirect : OnMetadataUpdateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.RemoteControlClient$OnMetadataUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.RemoteControlClient$OnMetadataUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -10205,7 +10445,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnPlaybackPositionUpdateListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnPlaybackPositionUpdateListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -10213,10 +10453,13 @@ public partial class OnPlaybackPositionUpdateListener : MASES.JCOBridge.C2JBridg
             /// </summary>
             public OnPlaybackPositionUpdateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.RemoteControlClient_OnPlaybackPositionUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnPlaybackPositionUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -10238,10 +10481,13 @@ public partial class OnPlaybackPositionUpdateListenerDirect : OnPlaybackPosition
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.RemoteControlClient$OnPlaybackPositionUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.RemoteControlClient$OnPlaybackPositionUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -10269,7 +10515,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/media/RemoteController.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RemoteController : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RemoteController>
     {
         const string _bridgeClassName = "android.media.RemoteController";
@@ -10310,7 +10556,7 @@ public RemoteController(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteController.MetadataEditor.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class MetadataEditor : Android.Media.MediaMetadataEditor
         {
             const string _bridgeClassName = "android.media.RemoteController$MetadataEditor";
@@ -10355,7 +10601,7 @@ public MetadataEditor(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnClientUpdateListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -10363,10 +10609,13 @@ public partial class OnClientUpdateListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnClientUpdateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.RemoteController_OnClientUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnClientUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -10388,10 +10637,13 @@ public partial class OnClientUpdateListenerDirect : OnClientUpdateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.RemoteController$OnClientUpdateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.RemoteController$OnClientUpdateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -11187,10 +11439,13 @@ public partial class OnLoadCompleteListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnLoadCompleteListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.SoundPool_OnLoadCompleteListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnLoadCompleteListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -11212,10 +11467,13 @@ public partial class OnLoadCompleteListenerDirect : OnLoadCompleteListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.SoundPool$OnLoadCompleteListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.SoundPool$OnLoadCompleteListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -11290,10 +11548,13 @@ public partial class OnHeadTrackerAvailableListener : MASES.JCOBridge.C2JBridge.
             /// </summary>
             public OnHeadTrackerAvailableListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.Spatializer_OnHeadTrackerAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnHeadTrackerAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -11315,10 +11576,13 @@ public partial class OnHeadTrackerAvailableListenerDirect : OnHeadTrackerAvailab
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.Spatializer$OnHeadTrackerAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.Spatializer$OnHeadTrackerAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -11349,10 +11613,13 @@ public partial class OnSpatializerStateChangedListener : MASES.JCOBridge.C2JBrid
             /// </summary>
             public OnSpatializerStateChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.Spatializer_OnSpatializerStateChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.OnSpatializerStateChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -11374,10 +11641,13 @@ public partial class OnSpatializerStateChangedListenerDirect : OnSpatializerStat
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.Spatializer$OnSpatializerStateChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.Spatializer$OnSpatializerStateChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -11692,12 +11962,12 @@ public partial class VolumeAutomation : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VolumeAutomation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VolumeAutomation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VolumeAutomation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VolumeAutomation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VolumeAutomation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VolumeAutomation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -11738,12 +12008,12 @@ public partial class VolumeProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Vo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VolumeProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VolumeProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VolumeProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VolumeProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VolumeProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VolumeProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Media/ApplicationMediaCapabilities.cs b/src/net/Netdroid/Generated/Android/Media/ApplicationMediaCapabilities.cs
index 89384a007..56b80200f 100644
--- a/src/net/Netdroid/Generated/Android/Media/ApplicationMediaCapabilities.cs
+++ b/src/net/Netdroid/Generated/Android/Media/ApplicationMediaCapabilities.cs
@@ -61,34 +61,6 @@ public static Android.Media.ApplicationMediaCapabilities CreateFromXml(Org.Xmlpu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#getSupportedHdrTypes()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> SupportedHdrTypes
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedHdrTypes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#getSupportedVideoMimeTypes()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> SupportedVideoMimeTypes
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedVideoMimeTypes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#getUnsupportedHdrTypes()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> UnsupportedHdrTypes
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getUnsupportedHdrTypes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#getUnsupportedVideoMimeTypes()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> UnsupportedVideoMimeTypes
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getUnsupportedVideoMimeTypes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#isFormatSpecified(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -124,6 +96,38 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#getSupportedHdrTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetSupportedHdrTypes()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedHdrTypes", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#getSupportedVideoMimeTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetSupportedVideoMimeTypes()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedVideoMimeTypes", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#getUnsupportedHdrTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetUnsupportedHdrTypes()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getUnsupportedHdrTypes", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#getUnsupportedVideoMimeTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetUnsupportedVideoMimeTypes()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getUnsupportedVideoMimeTypes", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ApplicationMediaCapabilities.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/AsyncPlayer.cs b/src/net/Netdroid/Generated/Android/Media/AsyncPlayer.cs
index 5cbccfb60..998662412 100644
--- a/src/net/Netdroid/Generated/Android/Media/AsyncPlayer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AsyncPlayer.cs
@@ -72,7 +72,7 @@ public void Play(Android.Content.Context arg0, Android.Net.Uri arg1, bool arg2,
         /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Play(Android.Content.Context arg0, Android.Net.Uri arg1, bool arg2, int arg3)
         {
             IExecute("play", arg0, arg1, arg2, arg3);
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioAttributes.cs b/src/net/Netdroid/Generated/Android/Media/AudioAttributes.cs
index 9a71b64ab..b1054949f 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioAttributes.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioAttributes.cs
@@ -106,7 +106,7 @@ public partial class AudioAttributes
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#FLAG_LOW_LATENCY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_LOW_LATENCY { get { if (!_FLAG_LOW_LATENCYReady) { _FLAG_LOW_LATENCYContent = SGetField<int>(LocalBridgeClazz, "FLAG_LOW_LATENCY"); _FLAG_LOW_LATENCYReady = true; } return _FLAG_LOW_LATENCYContent; } }
         private static int _FLAG_LOW_LATENCYContent = default;
         private static bool _FLAG_LOW_LATENCYReady = false; // this is used because in case of generics 
@@ -173,21 +173,21 @@ public partial class AudioAttributes
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#USAGE_NOTIFICATION_COMMUNICATION_DELAYED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_NOTIFICATION_COMMUNICATION_DELAYED { get { if (!_USAGE_NOTIFICATION_COMMUNICATION_DELAYEDReady) { _USAGE_NOTIFICATION_COMMUNICATION_DELAYEDContent = SGetField<int>(LocalBridgeClazz, "USAGE_NOTIFICATION_COMMUNICATION_DELAYED"); _USAGE_NOTIFICATION_COMMUNICATION_DELAYEDReady = true; } return _USAGE_NOTIFICATION_COMMUNICATION_DELAYEDContent; } }
         private static int _USAGE_NOTIFICATION_COMMUNICATION_DELAYEDContent = default;
         private static bool _USAGE_NOTIFICATION_COMMUNICATION_DELAYEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#USAGE_NOTIFICATION_COMMUNICATION_INSTANT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_NOTIFICATION_COMMUNICATION_INSTANT { get { if (!_USAGE_NOTIFICATION_COMMUNICATION_INSTANTReady) { _USAGE_NOTIFICATION_COMMUNICATION_INSTANTContent = SGetField<int>(LocalBridgeClazz, "USAGE_NOTIFICATION_COMMUNICATION_INSTANT"); _USAGE_NOTIFICATION_COMMUNICATION_INSTANTReady = true; } return _USAGE_NOTIFICATION_COMMUNICATION_INSTANTContent; } }
         private static int _USAGE_NOTIFICATION_COMMUNICATION_INSTANTContent = default;
         private static bool _USAGE_NOTIFICATION_COMMUNICATION_INSTANTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#USAGE_NOTIFICATION_COMMUNICATION_REQUEST"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_NOTIFICATION_COMMUNICATION_REQUEST { get { if (!_USAGE_NOTIFICATION_COMMUNICATION_REQUESTReady) { _USAGE_NOTIFICATION_COMMUNICATION_REQUESTContent = SGetField<int>(LocalBridgeClazz, "USAGE_NOTIFICATION_COMMUNICATION_REQUEST"); _USAGE_NOTIFICATION_COMMUNICATION_REQUESTReady = true; } return _USAGE_NOTIFICATION_COMMUNICATION_REQUESTContent; } }
         private static int _USAGE_NOTIFICATION_COMMUNICATION_REQUESTContent = default;
         private static bool _USAGE_NOTIFICATION_COMMUNICATION_REQUESTReady = false; // this is used because in case of generics 
@@ -230,70 +230,76 @@ public partial class AudioAttributes
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getAllowedCapturePolicy()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#areHapticChannelsMuted()"/>
         /// </summary>
-        public int AllowedCapturePolicy
+        /// <returns><see cref="bool"/></returns>
+        public bool AreHapticChannelsMuted()
         {
-            get { return IExecuteWithSignature<int>("getAllowedCapturePolicy", "()I"); }
+            return IExecuteWithSignature<bool>("areHapticChannelsMuted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getContentType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#isContentSpatialized()"/>
         /// </summary>
-        public int ContentType
+        /// <returns><see cref="bool"/></returns>
+        public bool IsContentSpatialized()
         {
-            get { return IExecuteWithSignature<int>("getContentType", "()I"); }
+            return IExecuteWithSignature<bool>("isContentSpatialized", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#describeContents()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getSpatializationBehavior()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getAllowedCapturePolicy()"/>
         /// </summary>
-        public int SpatializationBehavior
+        /// <returns><see cref="int"/></returns>
+        public int GetAllowedCapturePolicy()
         {
-            get { return IExecuteWithSignature<int>("getSpatializationBehavior", "()I"); }
+            return IExecuteWithSignature<int>("getAllowedCapturePolicy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getUsage()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getContentType()"/>
         /// </summary>
-        public int Usage
+        /// <returns><see cref="int"/></returns>
+        public int GetContentType()
         {
-            get { return IExecuteWithSignature<int>("getUsage", "()I"); }
+            return IExecuteWithSignature<int>("getContentType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getVolumeControlStream()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getFlags()"/>
         /// </summary>
-        public int VolumeControlStream
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<int>("getVolumeControlStream", "()I"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#areHapticChannelsMuted()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getSpatializationBehavior()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool AreHapticChannelsMuted()
+        /// <returns><see cref="int"/></returns>
+        public int GetSpatializationBehavior()
         {
-            return IExecuteWithSignature<bool>("areHapticChannelsMuted", "()Z");
+            return IExecuteWithSignature<int>("getSpatializationBehavior", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#isContentSpatialized()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getUsage()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsContentSpatialized()
+        /// <returns><see cref="int"/></returns>
+        public int GetUsage()
         {
-            return IExecuteWithSignature<bool>("isContentSpatialized", "()Z");
+            return IExecuteWithSignature<int>("getUsage", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#getVolumeControlStream()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetVolumeControlStream()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getVolumeControlStream", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioAttributes.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioDescriptor.cs b/src/net/Netdroid/Generated/Android/Media/AudioDescriptor.cs
index cfcd44432..80a7bfdb3 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioDescriptor.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioDescriptor.cs
@@ -76,33 +76,36 @@ public partial class AudioDescriptor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#getDescriptor()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#getDescriptor()"/>
         /// </summary>
-        public byte[] Descriptor
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetDescriptor()
         {
-            get { return IExecuteWithSignatureArray<byte>("getDescriptor", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getDescriptor", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#getEncapsulationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#describeContents()"/>
         /// </summary>
-        public int EncapsulationType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getEncapsulationType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#getStandard()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#getEncapsulationType()"/>
         /// </summary>
-        public int Standard
+        /// <returns><see cref="int"/></returns>
+        public int GetEncapsulationType()
         {
-            get { return IExecuteWithSignature<int>("getStandard", "()I"); }
+            return IExecuteWithSignature<int>("getEncapsulationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#getStandard()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetStandard()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getStandard", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioDescriptor.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioDeviceInfo.cs b/src/net/Netdroid/Generated/Android/Media/AudioDeviceInfo.cs
index 48931c631..2538d3714 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioDeviceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioDeviceInfo.cs
@@ -232,111 +232,124 @@ public partial class AudioDeviceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#isSink()"/>
         /// </summary>
-        public Java.Lang.String Address
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSink()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isSink", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getAudioDescriptors()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#isSource()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.AudioDescriptor> AudioDescriptors
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSource()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.AudioDescriptor>>("getAudioDescriptors", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("isSource", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getAudioProfiles()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getId()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.AudioProfile> AudioProfiles
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.AudioProfile>>("getAudioProfiles", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getChannelCounts()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getType()"/>
         /// </summary>
-        public int[] ChannelCounts
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignatureArray<int>("getChannelCounts", "()[I"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getChannelIndexMasks()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getChannelCounts()"/>
         /// </summary>
-        public int[] ChannelIndexMasks
+        /// <returns><see cref="int"/></returns>
+        public int[] GetChannelCounts()
         {
-            get { return IExecuteWithSignatureArray<int>("getChannelIndexMasks", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getChannelCounts", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getChannelMasks()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getChannelIndexMasks()"/>
         /// </summary>
-        public int[] ChannelMasks
+        /// <returns><see cref="int"/></returns>
+        public int[] GetChannelIndexMasks()
         {
-            get { return IExecuteWithSignatureArray<int>("getChannelMasks", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getChannelIndexMasks", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getEncapsulationMetadataTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getChannelMasks()"/>
         /// </summary>
-        public int[] EncapsulationMetadataTypes
+        /// <returns><see cref="int"/></returns>
+        public int[] GetChannelMasks()
         {
-            get { return IExecuteWithSignatureArray<int>("getEncapsulationMetadataTypes", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getChannelMasks", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getEncapsulationModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getEncapsulationMetadataTypes()"/>
         /// </summary>
-        public int[] EncapsulationModes
+        /// <returns><see cref="int"/></returns>
+        public int[] GetEncapsulationMetadataTypes()
         {
-            get { return IExecuteWithSignatureArray<int>("getEncapsulationModes", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getEncapsulationMetadataTypes", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getEncodings()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getEncapsulationModes()"/>
         /// </summary>
-        public int[] Encodings
+        /// <returns><see cref="int"/></returns>
+        public int[] GetEncapsulationModes()
         {
-            get { return IExecuteWithSignatureArray<int>("getEncodings", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getEncapsulationModes", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getEncodings()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int[] GetEncodings()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignatureArray<int>("getEncodings", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getProductName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getSampleRates()"/>
         /// </summary>
-        public Java.Lang.CharSequence ProductName
+        /// <returns><see cref="int"/></returns>
+        public int[] GetSampleRates()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getProductName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignatureArray<int>("getSampleRates", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getSampleRates()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getProductName()"/>
         /// </summary>
-        public int[] SampleRates
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetProductName()
         {
-            get { return IExecuteWithSignatureArray<int>("getSampleRates", "()[I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getProductName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getAddress()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAddress()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#isSink()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getAudioDescriptors()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSink()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.AudioDescriptor> GetAudioDescriptors()
         {
-            return IExecuteWithSignature<bool>("isSink", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Media.AudioDescriptor>>("getAudioDescriptors", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#isSource()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioDeviceInfo.html#getAudioProfiles()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSource()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.AudioProfile> GetAudioProfiles()
         {
-            return IExecuteWithSignature<bool>("isSource", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Media.AudioProfile>>("getAudioProfiles", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioFocusRequest.cs b/src/net/Netdroid/Generated/Android/Media/AudioFocusRequest.cs
index a32204b3e..379ca2b5d 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioFocusRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioFocusRequest.cs
@@ -46,18 +46,12 @@ public partial class AudioFocusRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFocusRequest.html#getAudioAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioFocusRequest.html#getAudioAttributes()"/>
         /// </summary>
-        public Android.Media.AudioAttributes AudioAttributes
+        /// <returns><see cref="Android.Media.AudioAttributes"/></returns>
+        public Android.Media.AudioAttributes GetAudioAttributes()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFocusRequest.html#getFocusGain()"/> 
-        /// </summary>
-        public int FocusGain
-        {
-            get { return IExecuteWithSignature<int>("getFocusGain", "()I"); }
+            return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioFocusRequest.html#acceptsDelayedFocusGain()"/>
@@ -75,6 +69,14 @@ public bool WillPauseWhenDucked()
         {
             return IExecuteWithSignature<bool>("willPauseWhenDucked", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioFocusRequest.html#getFocusGain()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFocusGain()
+        {
+            return IExecuteWithSignature<int>("getFocusGain", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioFormat.cs b/src/net/Netdroid/Generated/Android/Media/AudioFormat.cs
index aee267a49..9280e565a 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioFormat.cs
@@ -46,28 +46,28 @@ public partial class AudioFormat
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#CHANNEL_CONFIGURATION_DEFAULT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CHANNEL_CONFIGURATION_DEFAULT { get { if (!_CHANNEL_CONFIGURATION_DEFAULTReady) { _CHANNEL_CONFIGURATION_DEFAULTContent = SGetField<int>(LocalBridgeClazz, "CHANNEL_CONFIGURATION_DEFAULT"); _CHANNEL_CONFIGURATION_DEFAULTReady = true; } return _CHANNEL_CONFIGURATION_DEFAULTContent; } }
         private static int _CHANNEL_CONFIGURATION_DEFAULTContent = default;
         private static bool _CHANNEL_CONFIGURATION_DEFAULTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#CHANNEL_CONFIGURATION_INVALID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CHANNEL_CONFIGURATION_INVALID { get { if (!_CHANNEL_CONFIGURATION_INVALIDReady) { _CHANNEL_CONFIGURATION_INVALIDContent = SGetField<int>(LocalBridgeClazz, "CHANNEL_CONFIGURATION_INVALID"); _CHANNEL_CONFIGURATION_INVALIDReady = true; } return _CHANNEL_CONFIGURATION_INVALIDContent; } }
         private static int _CHANNEL_CONFIGURATION_INVALIDContent = default;
         private static bool _CHANNEL_CONFIGURATION_INVALIDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#CHANNEL_CONFIGURATION_MONO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CHANNEL_CONFIGURATION_MONO { get { if (!_CHANNEL_CONFIGURATION_MONOReady) { _CHANNEL_CONFIGURATION_MONOContent = SGetField<int>(LocalBridgeClazz, "CHANNEL_CONFIGURATION_MONO"); _CHANNEL_CONFIGURATION_MONOReady = true; } return _CHANNEL_CONFIGURATION_MONOContent; } }
         private static int _CHANNEL_CONFIGURATION_MONOContent = default;
         private static bool _CHANNEL_CONFIGURATION_MONOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#CHANNEL_CONFIGURATION_STEREO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CHANNEL_CONFIGURATION_STEREO { get { if (!_CHANNEL_CONFIGURATION_STEREOReady) { _CHANNEL_CONFIGURATION_STEREOContent = SGetField<int>(LocalBridgeClazz, "CHANNEL_CONFIGURATION_STEREO"); _CHANNEL_CONFIGURATION_STEREOReady = true; } return _CHANNEL_CONFIGURATION_STEREOContent; } }
         private static int _CHANNEL_CONFIGURATION_STEREOContent = default;
         private static bool _CHANNEL_CONFIGURATION_STEREOReady = false; // this is used because in case of generics 
@@ -206,7 +206,7 @@ public partial class AudioFormat
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#CHANNEL_OUT_7POINT1"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CHANNEL_OUT_7POINT1 { get { if (!_CHANNEL_OUT_7POINT1Ready) { _CHANNEL_OUT_7POINT1Content = SGetField<int>(LocalBridgeClazz, "CHANNEL_OUT_7POINT1"); _CHANNEL_OUT_7POINT1Ready = true; } return _CHANNEL_OUT_7POINT1Content; } }
         private static int _CHANNEL_OUT_7POINT1Content = default;
         private static bool _CHANNEL_OUT_7POINT1Ready = false; // this is used because in case of generics 
@@ -519,7 +519,7 @@ public partial class AudioFormat
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#ENCODING_DTS_UHD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ENCODING_DTS_UHD { get { if (!_ENCODING_DTS_UHDReady) { _ENCODING_DTS_UHDContent = SGetField<int>(LocalBridgeClazz, "ENCODING_DTS_UHD"); _ENCODING_DTS_UHDReady = true; } return _ENCODING_DTS_UHDContent; } }
         private static int _ENCODING_DTS_UHDContent = default;
         private static bool _ENCODING_DTS_UHDReady = false; // this is used because in case of generics 
@@ -640,54 +640,60 @@ public partial class AudioFormat
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getChannelCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#describeContents()"/>
         /// </summary>
-        public int ChannelCount
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getChannelCount", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getChannelIndexMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getChannelCount()"/>
         /// </summary>
-        public int ChannelIndexMask
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelCount()
         {
-            get { return IExecuteWithSignature<int>("getChannelIndexMask", "()I"); }
+            return IExecuteWithSignature<int>("getChannelCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getChannelMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getChannelIndexMask()"/>
         /// </summary>
-        public int ChannelMask
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelIndexMask()
         {
-            get { return IExecuteWithSignature<int>("getChannelMask", "()I"); }
+            return IExecuteWithSignature<int>("getChannelIndexMask", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getChannelMask()"/>
         /// </summary>
-        public int Encoding
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelMask()
         {
-            get { return IExecuteWithSignature<int>("getEncoding", "()I"); }
+            return IExecuteWithSignature<int>("getChannelMask", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getFrameSizeInBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getEncoding()"/>
         /// </summary>
-        public int FrameSizeInBytes
+        /// <returns><see cref="int"/></returns>
+        public int GetEncoding()
         {
-            get { return IExecuteWithSignature<int>("getFrameSizeInBytes", "()I"); }
+            return IExecuteWithSignature<int>("getEncoding", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getSampleRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getFrameSizeInBytes()"/>
         /// </summary>
-        public int SampleRate
+        /// <returns><see cref="int"/></returns>
+        public int GetFrameSizeInBytes()
         {
-            get { return IExecuteWithSignature<int>("getSampleRate", "()I"); }
+            return IExecuteWithSignature<int>("getFrameSizeInBytes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#getSampleRate()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSampleRate()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSampleRate", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioFormat.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioManager.cs b/src/net/Netdroid/Generated/Android/Media/AudioManager.cs
index b911d906b..d49fef79a 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioManager.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioManager.cs
@@ -382,7 +382,7 @@ public partial class AudioManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#NUM_STREAMS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NUM_STREAMS { get { if (!_NUM_STREAMSReady) { _NUM_STREAMSContent = SGetField<int>(LocalBridgeClazz, "NUM_STREAMS"); _NUM_STREAMSReady = true; } return _NUM_STREAMSContent; } }
         private static int _NUM_STREAMSContent = default;
         private static bool _NUM_STREAMSReady = false; // this is used because in case of generics 
@@ -425,49 +425,49 @@ public partial class AudioManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#ROUTE_ALL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUTE_ALL { get { if (!_ROUTE_ALLReady) { _ROUTE_ALLContent = SGetField<int>(LocalBridgeClazz, "ROUTE_ALL"); _ROUTE_ALLReady = true; } return _ROUTE_ALLContent; } }
         private static int _ROUTE_ALLContent = default;
         private static bool _ROUTE_ALLReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#ROUTE_BLUETOOTH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUTE_BLUETOOTH { get { if (!_ROUTE_BLUETOOTHReady) { _ROUTE_BLUETOOTHContent = SGetField<int>(LocalBridgeClazz, "ROUTE_BLUETOOTH"); _ROUTE_BLUETOOTHReady = true; } return _ROUTE_BLUETOOTHContent; } }
         private static int _ROUTE_BLUETOOTHContent = default;
         private static bool _ROUTE_BLUETOOTHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#ROUTE_BLUETOOTH_A2DP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUTE_BLUETOOTH_A2DP { get { if (!_ROUTE_BLUETOOTH_A2DPReady) { _ROUTE_BLUETOOTH_A2DPContent = SGetField<int>(LocalBridgeClazz, "ROUTE_BLUETOOTH_A2DP"); _ROUTE_BLUETOOTH_A2DPReady = true; } return _ROUTE_BLUETOOTH_A2DPContent; } }
         private static int _ROUTE_BLUETOOTH_A2DPContent = default;
         private static bool _ROUTE_BLUETOOTH_A2DPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#ROUTE_BLUETOOTH_SCO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUTE_BLUETOOTH_SCO { get { if (!_ROUTE_BLUETOOTH_SCOReady) { _ROUTE_BLUETOOTH_SCOContent = SGetField<int>(LocalBridgeClazz, "ROUTE_BLUETOOTH_SCO"); _ROUTE_BLUETOOTH_SCOReady = true; } return _ROUTE_BLUETOOTH_SCOContent; } }
         private static int _ROUTE_BLUETOOTH_SCOContent = default;
         private static bool _ROUTE_BLUETOOTH_SCOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#ROUTE_EARPIECE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUTE_EARPIECE { get { if (!_ROUTE_EARPIECEReady) { _ROUTE_EARPIECEContent = SGetField<int>(LocalBridgeClazz, "ROUTE_EARPIECE"); _ROUTE_EARPIECEReady = true; } return _ROUTE_EARPIECEContent; } }
         private static int _ROUTE_EARPIECEContent = default;
         private static bool _ROUTE_EARPIECEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#ROUTE_HEADSET"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUTE_HEADSET { get { if (!_ROUTE_HEADSETReady) { _ROUTE_HEADSETContent = SGetField<int>(LocalBridgeClazz, "ROUTE_HEADSET"); _ROUTE_HEADSETReady = true; } return _ROUTE_HEADSETContent; } }
         private static int _ROUTE_HEADSETContent = default;
         private static bool _ROUTE_HEADSETReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#ROUTE_SPEAKER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUTE_SPEAKER { get { if (!_ROUTE_SPEAKERReady) { _ROUTE_SPEAKERContent = SGetField<int>(LocalBridgeClazz, "ROUTE_SPEAKER"); _ROUTE_SPEAKERReady = true; } return _ROUTE_SPEAKERContent; } }
         private static int _ROUTE_SPEAKERContent = default;
         private static bool _ROUTE_SPEAKERReady = false; // this is used because in case of generics 
@@ -552,35 +552,35 @@ public partial class AudioManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#VIBRATE_SETTING_OFF"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int VIBRATE_SETTING_OFF { get { if (!_VIBRATE_SETTING_OFFReady) { _VIBRATE_SETTING_OFFContent = SGetField<int>(LocalBridgeClazz, "VIBRATE_SETTING_OFF"); _VIBRATE_SETTING_OFFReady = true; } return _VIBRATE_SETTING_OFFContent; } }
         private static int _VIBRATE_SETTING_OFFContent = default;
         private static bool _VIBRATE_SETTING_OFFReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#VIBRATE_SETTING_ON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int VIBRATE_SETTING_ON { get { if (!_VIBRATE_SETTING_ONReady) { _VIBRATE_SETTING_ONContent = SGetField<int>(LocalBridgeClazz, "VIBRATE_SETTING_ON"); _VIBRATE_SETTING_ONReady = true; } return _VIBRATE_SETTING_ONContent; } }
         private static int _VIBRATE_SETTING_ONContent = default;
         private static bool _VIBRATE_SETTING_ONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#VIBRATE_SETTING_ONLY_SILENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int VIBRATE_SETTING_ONLY_SILENT { get { if (!_VIBRATE_SETTING_ONLY_SILENTReady) { _VIBRATE_SETTING_ONLY_SILENTContent = SGetField<int>(LocalBridgeClazz, "VIBRATE_SETTING_ONLY_SILENT"); _VIBRATE_SETTING_ONLY_SILENTReady = true; } return _VIBRATE_SETTING_ONLY_SILENTContent; } }
         private static int _VIBRATE_SETTING_ONLY_SILENTContent = default;
         private static bool _VIBRATE_SETTING_ONLY_SILENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#VIBRATE_TYPE_NOTIFICATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int VIBRATE_TYPE_NOTIFICATION { get { if (!_VIBRATE_TYPE_NOTIFICATIONReady) { _VIBRATE_TYPE_NOTIFICATIONContent = SGetField<int>(LocalBridgeClazz, "VIBRATE_TYPE_NOTIFICATION"); _VIBRATE_TYPE_NOTIFICATIONReady = true; } return _VIBRATE_TYPE_NOTIFICATIONContent; } }
         private static int _VIBRATE_TYPE_NOTIFICATIONContent = default;
         private static bool _VIBRATE_TYPE_NOTIFICATIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#VIBRATE_TYPE_RINGER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int VIBRATE_TYPE_RINGER { get { if (!_VIBRATE_TYPE_RINGERReady) { _VIBRATE_TYPE_RINGERContent = SGetField<int>(LocalBridgeClazz, "VIBRATE_TYPE_RINGER"); _VIBRATE_TYPE_RINGERReady = true; } return _VIBRATE_TYPE_RINGERContent; } }
         private static int _VIBRATE_TYPE_RINGERContent = default;
         private static bool _VIBRATE_TYPE_RINGERReady = false; // this is used because in case of generics 
@@ -611,7 +611,7 @@ public partial class AudioManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#ACTION_SCO_AUDIO_STATE_CHANGED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_SCO_AUDIO_STATE_CHANGED { get { if (!_ACTION_SCO_AUDIO_STATE_CHANGEDReady) { _ACTION_SCO_AUDIO_STATE_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_SCO_AUDIO_STATE_CHANGED"); _ACTION_SCO_AUDIO_STATE_CHANGEDReady = true; } return _ACTION_SCO_AUDIO_STATE_CHANGEDContent; } }
         private static Java.Lang.String _ACTION_SCO_AUDIO_STATE_CHANGEDContent = default;
         private static bool _ACTION_SCO_AUDIO_STATE_CHANGEDReady = false; // this is used because in case of generics 
@@ -666,14 +666,14 @@ public partial class AudioManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#EXTRA_VIBRATE_SETTING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_VIBRATE_SETTING { get { if (!_EXTRA_VIBRATE_SETTINGReady) { _EXTRA_VIBRATE_SETTINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_VIBRATE_SETTING"); _EXTRA_VIBRATE_SETTINGReady = true; } return _EXTRA_VIBRATE_SETTINGContent; } }
         private static Java.Lang.String _EXTRA_VIBRATE_SETTINGContent = default;
         private static bool _EXTRA_VIBRATE_SETTINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#EXTRA_VIBRATE_TYPE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_VIBRATE_TYPE { get { if (!_EXTRA_VIBRATE_TYPEReady) { _EXTRA_VIBRATE_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_VIBRATE_TYPE"); _EXTRA_VIBRATE_TYPEReady = true; } return _EXTRA_VIBRATE_TYPEContent; } }
         private static Java.Lang.String _EXTRA_VIBRATE_TYPEContent = default;
         private static bool _EXTRA_VIBRATE_TYPEReady = false; // this is used because in case of generics 
@@ -716,7 +716,7 @@ public partial class AudioManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#VIBRATE_SETTING_CHANGED_ACTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String VIBRATE_SETTING_CHANGED_ACTION { get { if (!_VIBRATE_SETTING_CHANGED_ACTIONReady) { _VIBRATE_SETTING_CHANGED_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "VIBRATE_SETTING_CHANGED_ACTION"); _VIBRATE_SETTING_CHANGED_ACTIONReady = true; } return _VIBRATE_SETTING_CHANGED_ACTIONContent; } }
         private static Java.Lang.String _VIBRATE_SETTING_CHANGED_ACTIONContent = default;
         private static bool _VIBRATE_SETTING_CHANGED_ACTIONReady = false; // this is used because in case of generics 
@@ -758,7 +758,7 @@ public static int GetDirectPlaybackSupport(Android.Media.AudioFormat arg0, Andro
         /// <param name="arg0"><see cref="Android.Media.AudioFormat"/></param>
         /// <param name="arg1"><see cref="Android.Media.AudioAttributes"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetPlaybackOffloadSupport(Android.Media.AudioFormat arg0, Android.Media.AudioAttributes arg1)
         {
             return SExecute<int>(LocalBridgeClazz, "getPlaybackOffloadSupport", arg0, arg1);
@@ -768,74 +768,12 @@ public static int GetPlaybackOffloadSupport(Android.Media.AudioFormat arg0, Andr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getActivePlaybackConfigurations()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getCommunicationDevice()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.AudioPlaybackConfiguration> ActivePlaybackConfigurations
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.AudioPlaybackConfiguration>>("getActivePlaybackConfigurations", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getActiveRecordingConfigurations()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.AudioRecordingConfiguration> ActiveRecordingConfigurations
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.AudioRecordingConfiguration>>("getActiveRecordingConfigurations", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getAllowedCapturePolicy()"/> <see href="https://developer.android.com/reference/android/media/AudioManager.html#setAllowedCapturePolicy(int)"/>
-        /// </summary>
-        public int AllowedCapturePolicy
-        {
-            get { return IExecuteWithSignature<int>("getAllowedCapturePolicy", "()I"); } set { IExecuteWithSignature("setAllowedCapturePolicy", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getAvailableCommunicationDevices()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.AudioDeviceInfo> AvailableCommunicationDevices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.AudioDeviceInfo>>("getAvailableCommunicationDevices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getCommunicationDevice()"/> 
-        /// </summary>
-        public Android.Media.AudioDeviceInfo CommunicationDevice
-        {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getCommunicationDevice", "()Landroid/media/AudioDeviceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getEncodedSurroundMode()"/> 
-        /// </summary>
-        public int EncodedSurroundMode
-        {
-            get { return IExecuteWithSignature<int>("getEncodedSurroundMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getMicrophones()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.MicrophoneInfo> Microphones
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.MicrophoneInfo>>("getMicrophones", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getMode()"/> <see href="https://developer.android.com/reference/android/media/AudioManager.html#setMode(int)"/>
-        /// </summary>
-        public int Mode
-        {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); } set { IExecuteWithSignature("setMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getRingerMode()"/> <see href="https://developer.android.com/reference/android/media/AudioManager.html#setRingerMode(int)"/>
-        /// </summary>
-        public int RingerMode
-        {
-            get { return IExecuteWithSignature<int>("getRingerMode", "()I"); } set { IExecuteWithSignature("setRingerMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getSpatializer()"/> 
-        /// </summary>
-        public Android.Media.Spatializer Spatializer
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetCommunicationDevice()
         {
-            get { return IExecuteWithSignature<Android.Media.Spatializer>("getSpatializer", "()Landroid/media/Spatializer;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getCommunicationDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getDevices(int)"/>
@@ -857,6 +795,14 @@ public Android.Media.AudioMixerAttributes GetPreferredMixerAttributes(Android.Me
             return IExecute<Android.Media.AudioMixerAttributes>("getPreferredMixerAttributes", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getSpatializer()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Spatializer"/></returns>
+        public Android.Media.Spatializer GetSpatializer()
+        {
+            return IExecuteWithSignature<Android.Media.Spatializer>("getSpatializer", "()Landroid/media/Spatializer;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#clearPreferredMixerAttributes(android.media.AudioAttributes,android.media.AudioDeviceInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioAttributes"/></param>
@@ -870,7 +816,7 @@ public bool ClearPreferredMixerAttributes(Android.Media.AudioAttributes arg0, An
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#isBluetoothA2dpOn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsBluetoothA2dpOn()
         {
             return IExecuteWithSignature<bool>("isBluetoothA2dpOn", "()Z");
@@ -887,7 +833,7 @@ public bool IsBluetoothScoAvailableOffCall()
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#isBluetoothScoOn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsBluetoothScoOn()
         {
             return IExecuteWithSignature<bool>("isBluetoothScoOn", "()Z");
@@ -928,7 +874,7 @@ public bool IsRampingRingerEnabled()
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#isSpeakerphoneOn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsSpeakerphoneOn()
         {
             return IExecuteWithSignature<bool>("isSpeakerphoneOn", "()Z");
@@ -972,7 +918,7 @@ public bool IsVolumeGroupMuted(int arg0)
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#isWiredHeadsetOn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsWiredHeadsetOn()
         {
             return IExecuteWithSignature<bool>("isWiredHeadsetOn", "()Z");
@@ -982,7 +928,7 @@ public bool IsWiredHeadsetOn()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.RemoteController"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RegisterRemoteController(Android.Media.RemoteController arg0)
         {
             return IExecuteWithSignature<bool>("registerRemoteController", "(Landroid/media/RemoteController;)Z", arg0);
@@ -1031,7 +977,7 @@ public bool SetSurroundFormatEnabled(int arg0, bool arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ShouldVibrate(int arg0)
         {
             return IExecuteWithSignature<bool>("shouldVibrate", "(I)Z", arg0);
@@ -1052,7 +998,7 @@ public float GetStreamVolumeDb(int arg0, int arg1, int arg2)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioManager.OnAudioFocusChangeListener"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int AbandonAudioFocus(Android.Media.AudioManager.OnAudioFocusChangeListener arg0)
         {
             return IExecuteWithSignature<int>("abandonAudioFocus", "(Landroid/media/AudioManager$OnAudioFocusChangeListener;)I", arg0);
@@ -1075,6 +1021,14 @@ public int GenerateAudioSessionId()
             return IExecuteWithSignature<int>("generateAudioSessionId", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getAllowedCapturePolicy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAllowedCapturePolicy()
+        {
+            return IExecuteWithSignature<int>("getAllowedCapturePolicy", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getAudioHwSyncForSession(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1084,11 +1038,35 @@ public int GetAudioHwSyncForSession(int arg0)
             return IExecuteWithSignature<int>("getAudioHwSyncForSession", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getEncodedSurroundMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetEncodedSurroundMode()
+        {
+            return IExecuteWithSignature<int>("getEncodedSurroundMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMode()
+        {
+            return IExecuteWithSignature<int>("getMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getRingerMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRingerMode()
+        {
+            return IExecuteWithSignature<int>("getRingerMode", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getRouting(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetRouting(int arg0)
         {
             return IExecuteWithSignature<int>("getRouting", "(I)I", arg0);
@@ -1125,7 +1103,7 @@ public int GetStreamVolume(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetVibrateSetting(int arg0)
         {
             return IExecuteWithSignature<int>("getVibrateSetting", "(I)I", arg0);
@@ -1155,7 +1133,7 @@ public int RequestAudioFocus(Android.Media.AudioFocusRequest arg0)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int RequestAudioFocus(Android.Media.AudioManager.OnAudioFocusChangeListener arg0, int arg1, int arg2)
         {
             return IExecute<int>("requestAudioFocus", arg0, arg1, arg2);
@@ -1188,6 +1166,14 @@ public Java.Lang.String GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.List<Android.Media.AudioDeviceInfo>>("getAudioDevicesForAttributes", "(Landroid/media/AudioAttributes;)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getAvailableCommunicationDevices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.AudioDeviceInfo> GetAvailableCommunicationDevices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.AudioDeviceInfo>>("getAvailableCommunicationDevices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getSupportedMixerAttributes(android.media.AudioDeviceInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioDeviceInfo"/></param>
@@ -1197,6 +1183,14 @@ public Java.Lang.String GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.List<Android.Media.AudioMixerAttributes>>("getSupportedMixerAttributes", "(Landroid/media/AudioDeviceInfo;)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getActivePlaybackConfigurations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.AudioPlaybackConfiguration> GetActivePlaybackConfigurations()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.AudioPlaybackConfiguration>>("getActivePlaybackConfigurations", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getDirectProfilesForAttributes(android.media.AudioAttributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioAttributes"/></param>
@@ -1206,6 +1200,23 @@ public Java.Lang.String GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.List<Android.Media.AudioProfile>>("getDirectProfilesForAttributes", "(Landroid/media/AudioAttributes;)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getActiveRecordingConfigurations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.AudioRecordingConfiguration> GetActiveRecordingConfigurations()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.AudioRecordingConfiguration>>("getActiveRecordingConfigurations", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#getMicrophones()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.List<Android.Media.MicrophoneInfo> GetMicrophones()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.MicrophoneInfo>>("getMicrophones", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#addOnCommunicationDeviceChangedListener(java.util.concurrent.Executor,android.media.AudioManager.OnCommunicationDeviceChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1341,7 +1352,7 @@ public void RegisterAudioRecordingCallback(Android.Media.AudioManager.AudioRecor
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#registerMediaButtonEventReceiver(android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterMediaButtonEventReceiver(Android.App.PendingIntent arg0)
         {
             IExecuteWithSignature("registerMediaButtonEventReceiver", "(Landroid/app/PendingIntent;)V", arg0);
@@ -1350,7 +1361,7 @@ public void RegisterMediaButtonEventReceiver(Android.App.PendingIntent arg0)
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#registerMediaButtonEventReceiver(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterMediaButtonEventReceiver(Android.Content.ComponentName arg0)
         {
             IExecuteWithSignature("registerMediaButtonEventReceiver", "(Landroid/content/ComponentName;)V", arg0);
@@ -1359,7 +1370,7 @@ public void RegisterMediaButtonEventReceiver(Android.Content.ComponentName arg0)
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#registerRemoteControlClient(android.media.RemoteControlClient)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.RemoteControlClient"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterRemoteControlClient(Android.Media.RemoteControlClient arg0)
         {
             IExecuteWithSignature("registerRemoteControlClient", "(Landroid/media/RemoteControlClient;)V", arg0);
@@ -1389,10 +1400,18 @@ public void RemoveOnPreferredMixerAttributesChangedListener(Android.Media.AudioM
             IExecuteWithSignature("removeOnPreferredMixerAttributesChangedListener", "(Landroid/media/AudioManager$OnPreferredMixerAttributesChangedListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#setAllowedCapturePolicy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAllowedCapturePolicy(int arg0)
+        {
+            IExecuteWithSignature("setAllowedCapturePolicy", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#setBluetoothA2dpOn(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetBluetoothA2dpOn(bool arg0)
         {
             IExecuteWithSignature("setBluetoothA2dpOn", "(Z)V", arg0);
@@ -1414,6 +1433,14 @@ public void SetMicrophoneMute(bool arg0)
             IExecuteWithSignature("setMicrophoneMute", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#setMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMode(int arg0)
+        {
+            IExecuteWithSignature("setMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#setParameters(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1422,12 +1449,20 @@ public void SetParameters(Java.Lang.String arg0)
             IExecuteWithSignature("setParameters", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#setRingerMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRingerMode(int arg0)
+        {
+            IExecuteWithSignature("setRingerMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#setRouting(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRouting(int arg0, int arg1, int arg2)
         {
             IExecute("setRouting", arg0, arg1, arg2);
@@ -1436,7 +1471,7 @@ public void SetRouting(int arg0, int arg1, int arg2)
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#setSpeakerphoneOn(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSpeakerphoneOn(bool arg0)
         {
             IExecuteWithSignature("setSpeakerphoneOn", "(Z)V", arg0);
@@ -1446,7 +1481,7 @@ public void SetSpeakerphoneOn(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetStreamMute(int arg0, bool arg1)
         {
             IExecute("setStreamMute", arg0, arg1);
@@ -1456,7 +1491,7 @@ public void SetStreamMute(int arg0, bool arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetStreamSolo(int arg0, bool arg1)
         {
             IExecute("setStreamSolo", arg0, arg1);
@@ -1476,7 +1511,7 @@ public void SetStreamVolume(int arg0, int arg1, int arg2)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVibrateSetting(int arg0, int arg1)
         {
             IExecute("setVibrateSetting", arg0, arg1);
@@ -1485,7 +1520,7 @@ public void SetVibrateSetting(int arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#setWiredHeadsetOn(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetWiredHeadsetOn(bool arg0)
         {
             IExecuteWithSignature("setWiredHeadsetOn", "(Z)V", arg0);
@@ -1493,7 +1528,7 @@ public void SetWiredHeadsetOn(bool arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#startBluetoothSco()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartBluetoothSco()
         {
             IExecuteWithSignature("startBluetoothSco", "()V");
@@ -1501,7 +1536,7 @@ public void StartBluetoothSco()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#stopBluetoothSco()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopBluetoothSco()
         {
             IExecuteWithSignature("stopBluetoothSco", "()V");
@@ -1541,7 +1576,7 @@ public void UnregisterAudioRecordingCallback(Android.Media.AudioManager.AudioRec
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#unregisterMediaButtonEventReceiver(android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterMediaButtonEventReceiver(Android.App.PendingIntent arg0)
         {
             IExecuteWithSignature("unregisterMediaButtonEventReceiver", "(Landroid/app/PendingIntent;)V", arg0);
@@ -1550,7 +1585,7 @@ public void UnregisterMediaButtonEventReceiver(Android.App.PendingIntent arg0)
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#unregisterMediaButtonEventReceiver(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterMediaButtonEventReceiver(Android.Content.ComponentName arg0)
         {
             IExecuteWithSignature("unregisterMediaButtonEventReceiver", "(Landroid/content/ComponentName;)V", arg0);
@@ -1559,7 +1594,7 @@ public void UnregisterMediaButtonEventReceiver(Android.Content.ComponentName arg
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#unregisterRemoteControlClient(android.media.RemoteControlClient)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.RemoteControlClient"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterRemoteControlClient(Android.Media.RemoteControlClient arg0)
         {
             IExecuteWithSignature("unregisterRemoteControlClient", "(Landroid/media/RemoteControlClient;)V", arg0);
@@ -1568,7 +1603,7 @@ public void UnregisterRemoteControlClient(Android.Media.RemoteControlClient arg0
         /// <see href="https://developer.android.com/reference/android/media/AudioManager.html#unregisterRemoteController(android.media.RemoteController)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.RemoteController"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnregisterRemoteController(Android.Media.RemoteController arg0)
         {
             IExecuteWithSignature("unregisterRemoteController", "(Landroid/media/RemoteController;)V", arg0);
@@ -1680,7 +1715,7 @@ public partial class OnAudioFocusChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAudioFocusChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnAudioFocusChangeEventHandler));
+                AddEventHandler("onAudioFocusChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnAudioFocusChangeEventHandler));
 
             }
 
@@ -1688,7 +1723,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioManager.OnAudioFocusChangeListener.html#onAudioFocusChange(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAudioFocusChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnAudioFocusChange { get; set; } = null;
+            public global::System.Action<int> OnOnAudioFocusChange { get; set; } = null;
 
             void OnAudioFocusChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -1779,7 +1814,7 @@ public partial class OnCommunicationDeviceChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCommunicationDeviceChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioDeviceInfo>>>(OnCommunicationDeviceChangedEventHandler));
+                AddEventHandler("onCommunicationDeviceChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioDeviceInfo>>>(OnCommunicationDeviceChangedEventHandler));
 
             }
 
@@ -1787,7 +1822,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioManager.OnCommunicationDeviceChangedListener.html#onCommunicationDeviceChanged(android.media.AudioDeviceInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCommunicationDeviceChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioDeviceInfo> OnOnCommunicationDeviceChanged { get; set; } = null;
+            public global::System.Action<Android.Media.AudioDeviceInfo> OnOnCommunicationDeviceChanged { get; set; } = null;
 
             void OnCommunicationDeviceChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioDeviceInfo>> data)
             {
@@ -1878,7 +1913,7 @@ public partial class OnModeChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onModeChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnModeChangedEventHandler));
+                AddEventHandler("onModeChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnModeChangedEventHandler));
 
             }
 
@@ -1886,7 +1921,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioManager.OnModeChangedListener.html#onModeChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnModeChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnModeChanged { get; set; } = null;
+            public global::System.Action<int> OnOnModeChanged { get; set; } = null;
 
             void OnModeChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -1977,7 +2012,7 @@ public partial class OnPreferredMixerAttributesChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPreferredMixerAttributesChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioAttributes>>>(OnPreferredMixerAttributesChangedEventHandler));
+                AddEventHandler("onPreferredMixerAttributesChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioAttributes>>>(OnPreferredMixerAttributesChangedEventHandler));
 
             }
 
@@ -1985,7 +2020,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioManager.OnPreferredMixerAttributesChangedListener.html#onPreferredMixerAttributesChanged(android.media.AudioAttributes,android.media.AudioDeviceInfo,android.media.AudioMixerAttributes)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPreferredMixerAttributesChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioAttributes, Android.Media.AudioDeviceInfo, Android.Media.AudioMixerAttributes> OnOnPreferredMixerAttributesChanged { get; set; } = null;
+            public global::System.Action<Android.Media.AudioAttributes, Android.Media.AudioDeviceInfo, Android.Media.AudioMixerAttributes> OnOnPreferredMixerAttributesChanged { get; set; } = null;
 
             void OnPreferredMixerAttributesChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioAttributes>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioMetadata.cs b/src/net/Netdroid/Generated/Android/Media/AudioMetadata.cs
index 7b0412819..f6e5a98e1 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioMetadata.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioMetadata.cs
@@ -175,18 +175,20 @@ public partial class Key
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/AudioMetadata.Key.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/AudioMetadata.Key.html#getValueClass()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.Class"/></returns>
+            public Java.Lang.Class GetValueClass()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.Class>("getValueClass", "()Ljava/lang/Class;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/AudioMetadata.Key.html#getValueClass()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/AudioMetadata.Key.html#getName()"/>
             /// </summary>
-            public Java.Lang.Class ValueClass
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.Class>("getValueClass", "()Ljava/lang/Class;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -224,18 +226,20 @@ public partial class Key<T>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/AudioMetadata.Key.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/AudioMetadata.Key.html#getValueClass()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="Java.Lang.Class"/></returns>
+            public Java.Lang.Class GetValueClass()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.Class>("getValueClass", "()Ljava/lang/Class;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/AudioMetadata.Key.html#getValueClass()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/AudioMetadata.Key.html#getName()"/>
             /// </summary>
-            public Java.Lang.Class ValueClass
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.Class>("getValueClass", "()Ljava/lang/Class;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioMixerAttributes.cs b/src/net/Netdroid/Generated/Android/Media/AudioMixerAttributes.cs
index 9050c3151..f7c5185f7 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioMixerAttributes.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioMixerAttributes.cs
@@ -64,26 +64,28 @@ public partial class AudioMixerAttributes
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioMixerAttributes.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioMixerAttributes.html#getFormat()"/>
         /// </summary>
-        public Android.Media.AudioFormat Format
+        /// <returns><see cref="Android.Media.AudioFormat"/></returns>
+        public Android.Media.AudioFormat GetFormat()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioFormat>("getFormat", "()Landroid/media/AudioFormat;"); }
+            return IExecuteWithSignature<Android.Media.AudioFormat>("getFormat", "()Landroid/media/AudioFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioMixerAttributes.html#getMixerBehavior()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioMixerAttributes.html#describeContents()"/>
         /// </summary>
-        public int MixerBehavior
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getMixerBehavior", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioMixerAttributes.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioMixerAttributes.html#getMixerBehavior()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetMixerBehavior()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getMixerBehavior", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioMixerAttributes.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioPlaybackCaptureConfiguration.cs b/src/net/Netdroid/Generated/Android/Media/AudioPlaybackCaptureConfiguration.cs
index 8cdc8dc01..a1392dff7 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioPlaybackCaptureConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioPlaybackCaptureConfiguration.cs
@@ -46,39 +46,44 @@ public partial class AudioPlaybackCaptureConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getExcludeUids()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getMediaProjection()"/>
         /// </summary>
-        public int[] ExcludeUids
+        /// <returns><see cref="Android.Media.Projection.MediaProjection"/></returns>
+        public Android.Media.Projection.MediaProjection GetMediaProjection()
         {
-            get { return IExecuteWithSignatureArray<int>("getExcludeUids", "()[I"); }
+            return IExecuteWithSignature<Android.Media.Projection.MediaProjection>("getMediaProjection", "()Landroid/media/projection/MediaProjection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getExcludeUsages()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getExcludeUids()"/>
         /// </summary>
-        public int[] ExcludeUsages
+        /// <returns><see cref="int"/></returns>
+        public int[] GetExcludeUids()
         {
-            get { return IExecuteWithSignatureArray<int>("getExcludeUsages", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getExcludeUids", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getMatchingUids()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getExcludeUsages()"/>
         /// </summary>
-        public int[] MatchingUids
+        /// <returns><see cref="int"/></returns>
+        public int[] GetExcludeUsages()
         {
-            get { return IExecuteWithSignatureArray<int>("getMatchingUids", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getExcludeUsages", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getMatchingUsages()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getMatchingUids()"/>
         /// </summary>
-        public int[] MatchingUsages
+        /// <returns><see cref="int"/></returns>
+        public int[] GetMatchingUids()
         {
-            get { return IExecuteWithSignatureArray<int>("getMatchingUsages", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getMatchingUids", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getMediaProjection()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackCaptureConfiguration.html#getMatchingUsages()"/>
         /// </summary>
-        public Android.Media.Projection.MediaProjection MediaProjection
+        /// <returns><see cref="int"/></returns>
+        public int[] GetMatchingUsages()
         {
-            get { return IExecuteWithSignature<Android.Media.Projection.MediaProjection>("getMediaProjection", "()Landroid/media/projection/MediaProjection;"); }
+            return IExecuteWithSignatureArray<int>("getMatchingUsages", "()[I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioPlaybackConfiguration.cs b/src/net/Netdroid/Generated/Android/Media/AudioPlaybackConfiguration.cs
index 88016fc06..c1cf92ab9 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioPlaybackConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioPlaybackConfiguration.cs
@@ -52,18 +52,20 @@ public partial class AudioPlaybackConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackConfiguration.html#getAudioAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackConfiguration.html#getAudioAttributes()"/>
         /// </summary>
-        public Android.Media.AudioAttributes AudioAttributes
+        /// <returns><see cref="Android.Media.AudioAttributes"/></returns>
+        public Android.Media.AudioAttributes GetAudioAttributes()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;"); }
+            return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackConfiguration.html#getAudioDeviceInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackConfiguration.html#getAudioDeviceInfo()"/>
         /// </summary>
-        public Android.Media.AudioDeviceInfo AudioDeviceInfo
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetAudioDeviceInfo()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getAudioDeviceInfo", "()Landroid/media/AudioDeviceInfo;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getAudioDeviceInfo", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioPlaybackConfiguration.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioPresentation.cs b/src/net/Netdroid/Generated/Android/Media/AudioPresentation.cs
index 710a3bc53..aaf396de5 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioPresentation.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioPresentation.cs
@@ -148,71 +148,76 @@ public partial class AudioPresentation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getLabels()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#hasAudioDescription()"/>
         /// </summary>
-        public Java.Util.Map<Java.Util.Locale, Java.Lang.String> Labels
+        /// <returns><see cref="bool"/></returns>
+        public bool HasAudioDescription()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Util.Locale, Java.Lang.String>>("getLabels", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<bool>("hasAudioDescription", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#hasDialogueEnhancement()"/>
         /// </summary>
-        public Java.Util.Locale Locale
+        /// <returns><see cref="bool"/></returns>
+        public bool HasDialogueEnhancement()
         {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
+            return IExecuteWithSignature<bool>("hasDialogueEnhancement", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getMasteringIndication()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#hasSpokenSubtitles()"/>
         /// </summary>
-        public int MasteringIndication
+        /// <returns><see cref="bool"/></returns>
+        public bool HasSpokenSubtitles()
         {
-            get { return IExecuteWithSignature<int>("getMasteringIndication", "()I"); }
+            return IExecuteWithSignature<bool>("hasSpokenSubtitles", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getPresentationId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#describeContents()"/>
         /// </summary>
-        public int PresentationId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPresentationId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getProgramId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getMasteringIndication()"/>
         /// </summary>
-        public int ProgramId
+        /// <returns><see cref="int"/></returns>
+        public int GetMasteringIndication()
         {
-            get { return IExecuteWithSignature<int>("getProgramId", "()I"); }
+            return IExecuteWithSignature<int>("getMasteringIndication", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#hasAudioDescription()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getPresentationId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasAudioDescription()
+        /// <returns><see cref="int"/></returns>
+        public int GetPresentationId()
         {
-            return IExecuteWithSignature<bool>("hasAudioDescription", "()Z");
+            return IExecuteWithSignature<int>("getPresentationId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#hasDialogueEnhancement()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getProgramId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasDialogueEnhancement()
+        /// <returns><see cref="int"/></returns>
+        public int GetProgramId()
         {
-            return IExecuteWithSignature<bool>("hasDialogueEnhancement", "()Z");
+            return IExecuteWithSignature<int>("getProgramId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#hasSpokenSubtitles()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getLocale()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasSpokenSubtitles()
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
         {
-            return IExecuteWithSignature<bool>("hasSpokenSubtitles", "()Z");
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#getLabels()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Util.Locale, Java.Lang.String> GetLabels()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Map<Java.Util.Locale, Java.Lang.String>>("getLabels", "()Ljava/util/Map;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioPresentation.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioProfile.cs b/src/net/Netdroid/Generated/Android/Media/AudioProfile.cs
index 71e642f2a..789af0fd5 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioProfile.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioProfile.cs
@@ -70,47 +70,52 @@ public partial class AudioProfile
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getChannelIndexMasks()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#describeContents()"/>
         /// </summary>
-        public int[] ChannelIndexMasks
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<int>("getChannelIndexMasks", "()[I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getChannelMasks()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getEncapsulationType()"/>
         /// </summary>
-        public int[] ChannelMasks
+        /// <returns><see cref="int"/></returns>
+        public int GetEncapsulationType()
         {
-            get { return IExecuteWithSignatureArray<int>("getChannelMasks", "()[I"); }
+            return IExecuteWithSignature<int>("getEncapsulationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getEncapsulationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getFormat()"/>
         /// </summary>
-        public int EncapsulationType
+        /// <returns><see cref="int"/></returns>
+        public int GetFormat()
         {
-            get { return IExecuteWithSignature<int>("getEncapsulationType", "()I"); }
+            return IExecuteWithSignature<int>("getFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getChannelIndexMasks()"/>
         /// </summary>
-        public int Format
+        /// <returns><see cref="int"/></returns>
+        public int[] GetChannelIndexMasks()
         {
-            get { return IExecuteWithSignature<int>("getFormat", "()I"); }
+            return IExecuteWithSignatureArray<int>("getChannelIndexMasks", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getSampleRates()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getChannelMasks()"/>
         /// </summary>
-        public int[] SampleRates
+        /// <returns><see cref="int"/></returns>
+        public int[] GetChannelMasks()
         {
-            get { return IExecuteWithSignatureArray<int>("getSampleRates", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getChannelMasks", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#getSampleRates()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int[] GetSampleRates()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<int>("getSampleRates", "()[I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioProfile.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioRecord.cs b/src/net/Netdroid/Generated/Android/Media/AudioRecord.cs
index d0e1d0c92..20c9343a4 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioRecord.cs
@@ -148,165 +148,175 @@ public static int GetMinBufferSize(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getActiveMicrophones()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getPreferredDevice()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.MicrophoneInfo> ActiveMicrophones
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetPreferredDevice()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.MicrophoneInfo>>("getActiveMicrophones", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getActiveRecordingConfiguration()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getRoutedDevice()"/>
         /// </summary>
-        public Android.Media.AudioRecordingConfiguration ActiveRecordingConfiguration
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetRoutedDevice()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioRecordingConfiguration>("getActiveRecordingConfiguration", "()Landroid/media/AudioRecordingConfiguration;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getAudioFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getFormat()"/>
         /// </summary>
-        public int AudioFormat
+        /// <returns><see cref="Android.Media.AudioFormat"/></returns>
+        public Android.Media.AudioFormat GetFormat()
         {
-            get { return IExecuteWithSignature<int>("getAudioFormat", "()I"); }
+            return IExecuteWithSignature<Android.Media.AudioFormat>("getFormat", "()Landroid/media/AudioFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getAudioSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getActiveRecordingConfiguration()"/>
         /// </summary>
-        public int AudioSessionId
+        /// <returns><see cref="Android.Media.AudioRecordingConfiguration"/></returns>
+        public Android.Media.AudioRecordingConfiguration GetActiveRecordingConfiguration()
         {
-            get { return IExecuteWithSignature<int>("getAudioSessionId", "()I"); }
+            return IExecuteWithSignature<Android.Media.AudioRecordingConfiguration>("getActiveRecordingConfiguration", "()Landroid/media/AudioRecordingConfiguration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getAudioSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getLogSessionId()"/>
         /// </summary>
-        public int AudioSource
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetLogSessionId()
         {
-            get { return IExecuteWithSignature<int>("getAudioSource", "()I"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getBufferSizeInFrames()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getMetrics()"/>
         /// </summary>
-        public int BufferSizeInFrames
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetMetrics()
         {
-            get { return IExecuteWithSignature<int>("getBufferSizeInFrames", "()I"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getChannelConfiguration()"/> 
-        /// </summary>
-        public int ChannelConfiguration
-        {
-            get { return IExecuteWithSignature<int>("getChannelConfiguration", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getChannelCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#isPrivacySensitive()"/>
         /// </summary>
-        public int ChannelCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPrivacySensitive()
         {
-            get { return IExecuteWithSignature<int>("getChannelCount", "()I"); }
+            return IExecuteWithSignature<bool>("isPrivacySensitive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setPreferredDevice(android.media.AudioDeviceInfo)"/>
         /// </summary>
-        public Android.Media.AudioFormat Format
+        /// <param name="arg0"><see cref="Android.Media.AudioDeviceInfo"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SetPreferredDevice(Android.Media.AudioDeviceInfo arg0)
         {
-            get { return IExecuteWithSignature<Android.Media.AudioFormat>("getFormat", "()Landroid/media/AudioFormat;"); }
+            return IExecuteWithSignature<bool>("setPreferredDevice", "(Landroid/media/AudioDeviceInfo;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getLogSessionId()"/> <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setPreferredMicrophoneDirection(int)"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId LogSessionId
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SetPreferredMicrophoneDirection(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;"); } set { IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", value); }
+            return IExecuteWithSignature<bool>("setPreferredMicrophoneDirection", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getMetrics()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setPreferredMicrophoneFieldDimension(float)"/>
         /// </summary>
-        public Android.Os.PersistableBundle Metrics
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SetPreferredMicrophoneFieldDimension(float arg0)
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<bool>("setPreferredMicrophoneFieldDimension", "(F)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getNotificationMarkerPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getAudioFormat()"/>
         /// </summary>
-        public int NotificationMarkerPosition
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioFormat()
         {
-            get { return IExecuteWithSignature<int>("getNotificationMarkerPosition", "()I"); }
+            return IExecuteWithSignature<int>("getAudioFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getPositionNotificationPeriod()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getAudioSessionId()"/>
         /// </summary>
-        public int PositionNotificationPeriod
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSessionId()
         {
-            get { return IExecuteWithSignature<int>("getPositionNotificationPeriod", "()I"); }
+            return IExecuteWithSignature<int>("getAudioSessionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getPreferredDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getAudioSource()"/>
         /// </summary>
-        public Android.Media.AudioDeviceInfo PreferredDevice
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSource()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;"); }
+            return IExecuteWithSignature<int>("getAudioSource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getRecordingState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getBufferSizeInFrames()"/>
         /// </summary>
-        public int RecordingState
+        /// <returns><see cref="int"/></returns>
+        public int GetBufferSizeInFrames()
         {
-            get { return IExecuteWithSignature<int>("getRecordingState", "()I"); }
+            return IExecuteWithSignature<int>("getBufferSizeInFrames", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getRoutedDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getChannelConfiguration()"/>
         /// </summary>
-        public Android.Media.AudioDeviceInfo RoutedDevice
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelConfiguration()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;"); }
+            return IExecuteWithSignature<int>("getChannelConfiguration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getSampleRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getChannelCount()"/>
         /// </summary>
-        public int SampleRate
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelCount()
         {
-            get { return IExecuteWithSignature<int>("getSampleRate", "()I"); }
+            return IExecuteWithSignature<int>("getChannelCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getNotificationMarkerPosition()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetNotificationMarkerPosition()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getNotificationMarkerPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#isPrivacySensitive()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getPositionNotificationPeriod()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPrivacySensitive()
+        /// <returns><see cref="int"/></returns>
+        public int GetPositionNotificationPeriod()
         {
-            return IExecuteWithSignature<bool>("isPrivacySensitive", "()Z");
+            return IExecuteWithSignature<int>("getPositionNotificationPeriod", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setPreferredDevice(android.media.AudioDeviceInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getRecordingState()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Media.AudioDeviceInfo"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SetPreferredDevice(Android.Media.AudioDeviceInfo arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetRecordingState()
         {
-            return IExecuteWithSignature<bool>("setPreferredDevice", "(Landroid/media/AudioDeviceInfo;)Z", arg0);
+            return IExecuteWithSignature<int>("getRecordingState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setPreferredMicrophoneDirection(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getSampleRate()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SetPreferredMicrophoneDirection(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSampleRate()
         {
-            return IExecuteWithSignature<bool>("setPreferredMicrophoneDirection", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getSampleRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setPreferredMicrophoneFieldDimension(float)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getState()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SetPreferredMicrophoneFieldDimension(float arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            return IExecuteWithSignature<bool>("setPreferredMicrophoneFieldDimension", "(F)Z", arg0);
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getTimestamp(android.media.AudioTimestamp,int)"/>
@@ -416,11 +426,20 @@ public int SetPositionNotificationPeriod(int arg0)
             return IExecuteWithSignature<int>("setPositionNotificationPeriod", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#getActiveMicrophones()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.List<Android.Media.MicrophoneInfo> GetActiveMicrophones()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.MicrophoneInfo>>("getActiveMicrophones", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#addOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioRecord.OnRoutingChangedListener"/></param>
         /// <param name="arg1"><see cref="Android.Os.Handler"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddOnRoutingChangedListener(Android.Media.AudioRecord.OnRoutingChangedListener arg0, Android.Os.Handler arg1)
         {
             IExecute("addOnRoutingChangedListener", arg0, arg1);
@@ -454,7 +473,7 @@ public void Release()
         /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#removeOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioRecord.OnRoutingChangedListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveOnRoutingChangedListener(Android.Media.AudioRecord.OnRoutingChangedListener arg0)
         {
             IExecuteWithSignature("removeOnRoutingChangedListener", "(Landroid/media/AudioRecord$OnRoutingChangedListener;)V", arg0);
@@ -468,6 +487,14 @@ public void RemoveOnRoutingChangedListener(Android.Media.AudioRouting.OnRoutingC
             IExecuteWithSignature("removeOnRoutingChangedListener", "(Landroid/media/AudioRouting$OnRoutingChangedListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Metrics.LogSessionId"/></param>
+        public void SetLogSessionId(Android.Media.Metrics.LogSessionId arg0)
+        {
+            IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioRecord.html#setRecordPositionUpdateListener(android.media.AudioRecord.OnRecordPositionUpdateListener,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioRecord.OnRecordPositionUpdateListener"/></param>
@@ -645,7 +672,7 @@ public partial class MetricsConstants
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/AudioRecord.MetricsConstants.html#LATENCY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LATENCY { get { if (!_LATENCYReady) { _LATENCYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LATENCY"); _LATENCYReady = true; } return _LATENCYContent; } }
             private static Java.Lang.String _LATENCYContent = default;
             private static bool _LATENCYReady = false; // this is used because in case of generics 
@@ -705,8 +732,8 @@ public partial class OnRecordPositionUpdateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMarkerReached", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>>>(OnMarkerReachedEventHandler));
-                AddEventHandler("onPeriodicNotification", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>>>(OnPeriodicNotificationEventHandler));
+                AddEventHandler("onMarkerReached", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>>>(OnMarkerReachedEventHandler));
+                AddEventHandler("onPeriodicNotification", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>>>(OnPeriodicNotificationEventHandler));
 
             }
 
@@ -714,7 +741,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRecordPositionUpdateListener.html#onMarkerReached(android.media.AudioRecord)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMarkerReached"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioRecord> OnOnMarkerReached { get; set; } = null;
+            public global::System.Action<Android.Media.AudioRecord> OnOnMarkerReached { get; set; } = null;
 
             void OnMarkerReachedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>> data)
             {
@@ -735,7 +762,7 @@ public virtual void OnMarkerReached(Android.Media.AudioRecord arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRecordPositionUpdateListener.html#onPeriodicNotification(android.media.AudioRecord)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPeriodicNotification"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioRecord> OnOnPeriodicNotification { get; set; } = null;
+            public global::System.Action<Android.Media.AudioRecord> OnOnPeriodicNotification { get; set; } = null;
 
             void OnPeriodicNotificationEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>> data)
             {
@@ -834,8 +861,8 @@ public partial class OnRoutingChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onRoutingChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>>>(OnRoutingChangedEventHandler));
-                AddEventHandler("onRoutingChanged1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>>>(OnRoutingChanged1EventHandler));
+                AddEventHandler("onRoutingChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>>>(OnRoutingChangedEventHandler));
+                AddEventHandler("onRoutingChanged1", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>>>(OnRoutingChanged1EventHandler));
 
             }
 
@@ -843,7 +870,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRecord)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRoutingChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioRecord> OnOnRoutingChanged { get; set; } = null;
+            public global::System.Action<Android.Media.AudioRecord> OnOnRoutingChanged { get; set; } = null;
 
             void OnRoutingChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioRecord>> data)
             {
@@ -855,7 +882,7 @@ void OnRoutingChangedEventHandler(object sender, CLRListenerEventArgs<CLREventDa
             /// <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRecord)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioRecord"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnRoutingChanged(Android.Media.AudioRecord arg0)
             {
                 
@@ -864,7 +891,7 @@ public virtual void OnRoutingChanged(Android.Media.AudioRecord arg0)
             /// <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioRouting"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
             public void OnRoutingChangedDefault(Android.Media.AudioRouting arg0)
             {
@@ -875,7 +902,7 @@ public void OnRoutingChangedDefault(Android.Media.AudioRouting arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRoutingChanged1"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioRouting> OnOnRoutingChanged1 { get; set; } = null;
+            public global::System.Action<Android.Media.AudioRouting> OnOnRoutingChanged1 { get; set; } = null;
 
             void OnRoutingChanged1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>> data)
             {
@@ -887,7 +914,7 @@ void OnRoutingChanged1EventHandler(object sender, CLRListenerEventArgs<CLREventD
             /// <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioRouting"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="OnRoutingChangedDefault"/>; override the method to implement a different behavior</remarks>
             public virtual void OnRoutingChanged(Android.Media.AudioRouting arg0)
             {
@@ -928,7 +955,7 @@ public partial class OnRoutingChangedListenerDirect
             /// <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRecord)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioRecord"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnRoutingChanged(Android.Media.AudioRecord arg0)
             {
                 IExecuteWithSignature("onRoutingChanged", "(Landroid/media/AudioRecord;)V", arg0);
@@ -937,7 +964,7 @@ public override void OnRoutingChanged(Android.Media.AudioRecord arg0)
             /// <see href="https://developer.android.com/reference/android/media/AudioRecord.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioRouting"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnRoutingChanged(Android.Media.AudioRouting arg0)
             {
                 IExecuteWithSignature("onRoutingChanged", "(Landroid/media/AudioRouting;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioRecordingConfiguration.cs b/src/net/Netdroid/Generated/Android/Media/AudioRecordingConfiguration.cs
index 1a000d91e..46097b26e 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioRecordingConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioRecordingConfiguration.cs
@@ -52,76 +52,84 @@ public partial class AudioRecordingConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getAudioDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getAudioDevice()"/>
         /// </summary>
-        public Android.Media.AudioDeviceInfo AudioDevice
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetAudioDevice()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getAudioDevice", "()Landroid/media/AudioDeviceInfo;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getAudioDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getAudioSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getClientFormat()"/>
         /// </summary>
-        public int AudioSource
+        /// <returns><see cref="Android.Media.AudioFormat"/></returns>
+        public Android.Media.AudioFormat GetClientFormat()
         {
-            get { return IExecuteWithSignature<int>("getAudioSource", "()I"); }
+            return IExecuteWithSignature<Android.Media.AudioFormat>("getClientFormat", "()Landroid/media/AudioFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getClientAudioSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getFormat()"/>
         /// </summary>
-        public int ClientAudioSessionId
+        /// <returns><see cref="Android.Media.AudioFormat"/></returns>
+        public Android.Media.AudioFormat GetFormat()
         {
-            get { return IExecuteWithSignature<int>("getClientAudioSessionId", "()I"); }
+            return IExecuteWithSignature<Android.Media.AudioFormat>("getFormat", "()Landroid/media/AudioFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getClientAudioSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#isClientSilenced()"/>
         /// </summary>
-        public int ClientAudioSource
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClientSilenced()
         {
-            get { return IExecuteWithSignature<int>("getClientAudioSource", "()I"); }
+            return IExecuteWithSignature<bool>("isClientSilenced", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getClientEffects()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.Audiofx.AudioEffect.Descriptor> ClientEffects
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Audiofx.AudioEffect.Descriptor>>("getClientEffects", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getClientFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getAudioSource()"/>
         /// </summary>
-        public Android.Media.AudioFormat ClientFormat
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSource()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioFormat>("getClientFormat", "()Landroid/media/AudioFormat;"); }
+            return IExecuteWithSignature<int>("getAudioSource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getEffects()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getClientAudioSessionId()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.Audiofx.AudioEffect.Descriptor> Effects
+        /// <returns><see cref="int"/></returns>
+        public int GetClientAudioSessionId()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Audiofx.AudioEffect.Descriptor>>("getEffects", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getClientAudioSessionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getClientAudioSource()"/>
         /// </summary>
-        public Android.Media.AudioFormat Format
+        /// <returns><see cref="int"/></returns>
+        public int GetClientAudioSource()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioFormat>("getFormat", "()Landroid/media/AudioFormat;"); }
+            return IExecuteWithSignature<int>("getClientAudioSource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#isClientSilenced()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getClientEffects()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClientSilenced()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Audiofx.AudioEffect.Descriptor> GetClientEffects()
         {
-            return IExecuteWithSignature<bool>("isClientSilenced", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Audiofx.AudioEffect.Descriptor>>("getClientEffects", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#getEffects()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Audiofx.AudioEffect.Descriptor> GetEffects()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Audiofx.AudioEffect.Descriptor>>("getEffects", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioRecordingConfiguration.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioRecordingMonitor.cs b/src/net/Netdroid/Generated/Android/Media/AudioRecordingMonitor.cs
index db94c13b2..bff66a9ef 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioRecordingMonitor.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioRecordingMonitor.cs
@@ -64,11 +64,12 @@ public partial class AudioRecordingMonitor : Android.Media.IAudioRecordingMonito
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingMonitor.html#getActiveRecordingConfiguration()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRecordingMonitor.html#getActiveRecordingConfiguration()"/>
         /// </summary>
-        public Android.Media.AudioRecordingConfiguration ActiveRecordingConfiguration
+        /// <returns><see cref="Android.Media.AudioRecordingConfiguration"/></returns>
+        public Android.Media.AudioRecordingConfiguration GetActiveRecordingConfiguration()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioRecordingConfiguration>("getActiveRecordingConfiguration", "()Landroid/media/AudioRecordingConfiguration;"); }
+            return IExecuteWithSignature<Android.Media.AudioRecordingConfiguration>("getActiveRecordingConfiguration", "()Landroid/media/AudioRecordingConfiguration;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioRecordingMonitor.html#registerAudioRecordingCallback(java.util.concurrent.Executor,android.media.AudioManager.AudioRecordingCallback)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioRouting.cs b/src/net/Netdroid/Generated/Android/Media/AudioRouting.cs
index ef2c833d9..8aa269323 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioRouting.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioRouting.cs
@@ -64,18 +64,20 @@ public partial class AudioRouting : Android.Media.IAudioRouting
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRouting.html#getPreferredDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRouting.html#getPreferredDevice()"/>
         /// </summary>
-        public Android.Media.AudioDeviceInfo PreferredDevice
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetPreferredDevice()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioRouting.html#getRoutedDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioRouting.html#getRoutedDevice()"/>
         /// </summary>
-        public Android.Media.AudioDeviceInfo RoutedDevice
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetRoutedDevice()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioRouting.html#setPreferredDevice(android.media.AudioDeviceInfo)"/>
@@ -132,7 +134,7 @@ public partial class OnRoutingChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onRoutingChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>>>(OnRoutingChangedEventHandler));
+                AddEventHandler("onRoutingChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>>>(OnRoutingChangedEventHandler));
 
             }
 
@@ -140,7 +142,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioRouting.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRoutingChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioRouting> OnOnRoutingChanged { get; set; } = null;
+            public global::System.Action<Android.Media.AudioRouting> OnOnRoutingChanged { get; set; } = null;
 
             void OnRoutingChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/AudioTrack.cs b/src/net/Netdroid/Generated/Android/Media/AudioTrack.cs
index ceece5fa3..4ca1fc2e5 100644
--- a/src/net/Netdroid/Generated/Android/Media/AudioTrack.cs
+++ b/src/net/Netdroid/Generated/Android/Media/AudioTrack.cs
@@ -53,7 +53,7 @@ public AudioTrack(Android.Media.AudioAttributes arg0, Android.Media.AudioFormat
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="int"/></param>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AudioTrack(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
         {
@@ -68,7 +68,7 @@ public AudioTrack(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, in
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AudioTrack(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
             : base(arg0, arg1, arg2, arg3, arg4, arg5)
         {
@@ -274,29 +274,31 @@ public AudioTrack(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getMaxVolume()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#isDirectPlaybackSupported(android.media.AudioFormat,android.media.AudioAttributes)"/>
         /// </summary>
-        public static float MaxVolume
+        /// <param name="arg0"><see cref="Android.Media.AudioFormat"/></param>
+        /// <param name="arg1"><see cref="Android.Media.AudioAttributes"/></param>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public static bool IsDirectPlaybackSupported(Android.Media.AudioFormat arg0, Android.Media.AudioAttributes arg1)
         {
-            get { return SExecuteWithSignature<float>(LocalBridgeClazz, "getMaxVolume", "()F"); }
+            return SExecute<bool>(LocalBridgeClazz, "isDirectPlaybackSupported", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getMinVolume()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getMaxVolume()"/>
         /// </summary>
-        public static float MinVolume
+        /// <returns><see cref="float"/></returns>
+        public static float GetMaxVolume()
         {
-            get { return SExecuteWithSignature<float>(LocalBridgeClazz, "getMinVolume", "()F"); }
+            return SExecuteWithSignature<float>(LocalBridgeClazz, "getMaxVolume", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#isDirectPlaybackSupported(android.media.AudioFormat,android.media.AudioAttributes)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getMinVolume()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Media.AudioFormat"/></param>
-        /// <param name="arg1"><see cref="Android.Media.AudioAttributes"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public static bool IsDirectPlaybackSupported(Android.Media.AudioFormat arg0, Android.Media.AudioAttributes arg1)
+        /// <returns><see cref="float"/></returns>
+        public static float GetMinVolume()
         {
-            return SExecute<bool>(LocalBridgeClazz, "isDirectPlaybackSupported", arg0, arg1);
+            return SExecuteWithSignature<float>(LocalBridgeClazz, "getMinVolume", "()F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getMinBufferSize(int,int,int)"/>
@@ -323,262 +325,290 @@ public static int GetNativeOutputSampleRate(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getAudioAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getAudioAttributes()"/>
         /// </summary>
-        public Android.Media.AudioAttributes AudioAttributes
+        /// <returns><see cref="Android.Media.AudioAttributes"/></returns>
+        public Android.Media.AudioAttributes GetAudioAttributes()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;"); }
+            return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getAudioDescriptionMixLeveldB()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPreferredDevice()"/>
         /// </summary>
-        public float AudioDescriptionMixLeveldB
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetPreferredDevice()
         {
-            get { return IExecuteWithSignature<float>("getAudioDescriptionMixLeveldB", "()F"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getAudioFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getRoutedDevice()"/>
         /// </summary>
-        public int AudioFormat
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetRoutedDevice()
         {
-            get { return IExecuteWithSignature<int>("getAudioFormat", "()I"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getAudioSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getFormat()"/>
         /// </summary>
-        public int AudioSessionId
+        /// <returns><see cref="Android.Media.AudioFormat"/></returns>
+        public Android.Media.AudioFormat GetFormat()
         {
-            get { return IExecuteWithSignature<int>("getAudioSessionId", "()I"); }
+            return IExecuteWithSignature<Android.Media.AudioFormat>("getFormat", "()Landroid/media/AudioFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getBufferCapacityInFrames()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getLogSessionId()"/>
         /// </summary>
-        public int BufferCapacityInFrames
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetLogSessionId()
         {
-            get { return IExecuteWithSignature<int>("getBufferCapacityInFrames", "()I"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getBufferSizeInFrames()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPlaybackParams()"/>
         /// </summary>
-        public int BufferSizeInFrames
+        /// <returns><see cref="Android.Media.PlaybackParams"/></returns>
+        public Android.Media.PlaybackParams GetPlaybackParams()
         {
-            get { return IExecuteWithSignature<int>("getBufferSizeInFrames", "()I"); }
+            return IExecuteWithSignature<Android.Media.PlaybackParams>("getPlaybackParams", "()Landroid/media/PlaybackParams;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getChannelConfiguration()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#createVolumeShaper(android.media.VolumeShaper.Configuration)"/>
         /// </summary>
-        public int ChannelConfiguration
+        /// <param name="arg0"><see cref="Android.Media.VolumeShaper.Configuration"/></param>
+        /// <returns><see cref="Android.Media.VolumeShaper"/></returns>
+        public Android.Media.VolumeShaper CreateVolumeShaper(Android.Media.VolumeShaper.Configuration arg0)
         {
-            get { return IExecuteWithSignature<int>("getChannelConfiguration", "()I"); }
+            return IExecuteWithSignature<Android.Media.VolumeShaper>("createVolumeShaper", "(Landroid/media/VolumeShaper$Configuration;)Landroid/media/VolumeShaper;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getChannelCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getMetrics()"/>
         /// </summary>
-        public int ChannelCount
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetMetrics()
         {
-            get { return IExecuteWithSignature<int>("getChannelCount", "()I"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getDualMonoMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getTimestamp(android.media.AudioTimestamp)"/>
         /// </summary>
-        public int DualMonoMode
+        /// <param name="arg0"><see cref="Android.Media.AudioTimestamp"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetTimestamp(Android.Media.AudioTimestamp arg0)
         {
-            get { return IExecuteWithSignature<int>("getDualMonoMode", "()I"); }
+            return IExecuteWithSignature<bool>("getTimestamp", "(Landroid/media/AudioTimestamp;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#isOffloadedPlayback()"/>
         /// </summary>
-        public Android.Media.AudioFormat Format
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOffloadedPlayback()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioFormat>("getFormat", "()Landroid/media/AudioFormat;"); }
+            return IExecuteWithSignature<bool>("isOffloadedPlayback", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getLogSessionId()"/> <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setAudioDescriptionMixLeveldB(float)"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId LogSessionId
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SetAudioDescriptionMixLeveldB(float arg0)
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;"); } set { IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", value); }
+            return IExecuteWithSignature<bool>("setAudioDescriptionMixLeveldB", "(F)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getMetrics()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setDualMonoMode(int)"/>
         /// </summary>
-        public Android.Os.PersistableBundle Metrics
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SetDualMonoMode(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<bool>("setDualMonoMode", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getNotificationMarkerPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setPreferredDevice(android.media.AudioDeviceInfo)"/>
         /// </summary>
-        public int NotificationMarkerPosition
+        /// <param name="arg0"><see cref="Android.Media.AudioDeviceInfo"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SetPreferredDevice(Android.Media.AudioDeviceInfo arg0)
         {
-            get { return IExecuteWithSignature<int>("getNotificationMarkerPosition", "()I"); }
+            return IExecuteWithSignature<bool>("setPreferredDevice", "(Landroid/media/AudioDeviceInfo;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getOffloadDelay()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getAudioDescriptionMixLeveldB()"/>
         /// </summary>
-        public int OffloadDelay
+        /// <returns><see cref="float"/></returns>
+        public float GetAudioDescriptionMixLeveldB()
         {
-            get { return IExecuteWithSignature<int>("getOffloadDelay", "()I"); }
+            return IExecuteWithSignature<float>("getAudioDescriptionMixLeveldB", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getOffloadPadding()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#attachAuxEffect(int)"/>
         /// </summary>
-        public int OffloadPadding
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int AttachAuxEffect(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getOffloadPadding", "()I"); }
+            return IExecuteWithSignature<int>("attachAuxEffect", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPerformanceMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getAudioFormat()"/>
         /// </summary>
-        public int PerformanceMode
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioFormat()
         {
-            get { return IExecuteWithSignature<int>("getPerformanceMode", "()I"); }
+            return IExecuteWithSignature<int>("getAudioFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPlaybackHeadPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getAudioSessionId()"/>
         /// </summary>
-        public int PlaybackHeadPosition
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSessionId()
         {
-            get { return IExecuteWithSignature<int>("getPlaybackHeadPosition", "()I"); }
+            return IExecuteWithSignature<int>("getAudioSessionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPlaybackParams()"/> <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setPlaybackParams(android.media.PlaybackParams)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getBufferCapacityInFrames()"/>
         /// </summary>
-        public Android.Media.PlaybackParams PlaybackParams
+        /// <returns><see cref="int"/></returns>
+        public int GetBufferCapacityInFrames()
         {
-            get { return IExecuteWithSignature<Android.Media.PlaybackParams>("getPlaybackParams", "()Landroid/media/PlaybackParams;"); } set { IExecuteWithSignature("setPlaybackParams", "(Landroid/media/PlaybackParams;)V", value); }
+            return IExecuteWithSignature<int>("getBufferCapacityInFrames", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPlaybackRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getBufferSizeInFrames()"/>
         /// </summary>
-        public int PlaybackRate
+        /// <returns><see cref="int"/></returns>
+        public int GetBufferSizeInFrames()
         {
-            get { return IExecuteWithSignature<int>("getPlaybackRate", "()I"); }
+            return IExecuteWithSignature<int>("getBufferSizeInFrames", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPlayState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getChannelConfiguration()"/>
         /// </summary>
-        public int PlayState
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelConfiguration()
         {
-            get { return IExecuteWithSignature<int>("getPlayState", "()I"); }
+            return IExecuteWithSignature<int>("getChannelConfiguration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPositionNotificationPeriod()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getChannelCount()"/>
         /// </summary>
-        public int PositionNotificationPeriod
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelCount()
         {
-            get { return IExecuteWithSignature<int>("getPositionNotificationPeriod", "()I"); }
+            return IExecuteWithSignature<int>("getChannelCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPreferredDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getDualMonoMode()"/>
         /// </summary>
-        public Android.Media.AudioDeviceInfo PreferredDevice
+        /// <returns><see cref="int"/></returns>
+        public int GetDualMonoMode()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;"); }
+            return IExecuteWithSignature<int>("getDualMonoMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getRoutedDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getNotificationMarkerPosition()"/>
         /// </summary>
-        public Android.Media.AudioDeviceInfo RoutedDevice
+        /// <returns><see cref="int"/></returns>
+        public int GetNotificationMarkerPosition()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;"); }
+            return IExecuteWithSignature<int>("getNotificationMarkerPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getSampleRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getOffloadDelay()"/>
         /// </summary>
-        public int SampleRate
+        /// <returns><see cref="int"/></returns>
+        public int GetOffloadDelay()
         {
-            get { return IExecuteWithSignature<int>("getSampleRate", "()I"); }
+            return IExecuteWithSignature<int>("getOffloadDelay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getStartThresholdInFrames()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getOffloadPadding()"/>
         /// </summary>
-        public int StartThresholdInFrames
+        /// <returns><see cref="int"/></returns>
+        public int GetOffloadPadding()
         {
-            get { return IExecuteWithSignature<int>("getStartThresholdInFrames", "()I"); }
+            return IExecuteWithSignature<int>("getOffloadPadding", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPerformanceMode()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetPerformanceMode()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getPerformanceMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getStreamType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPlaybackHeadPosition()"/>
         /// </summary>
-        public int StreamType
+        /// <returns><see cref="int"/></returns>
+        public int GetPlaybackHeadPosition()
         {
-            get { return IExecuteWithSignature<int>("getStreamType", "()I"); }
+            return IExecuteWithSignature<int>("getPlaybackHeadPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getUnderrunCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPlaybackRate()"/>
         /// </summary>
-        public int UnderrunCount
+        /// <returns><see cref="int"/></returns>
+        public int GetPlaybackRate()
         {
-            get { return IExecuteWithSignature<int>("getUnderrunCount", "()I"); }
+            return IExecuteWithSignature<int>("getPlaybackRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#createVolumeShaper(android.media.VolumeShaper.Configuration)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPlayState()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Media.VolumeShaper.Configuration"/></param>
-        /// <returns><see cref="Android.Media.VolumeShaper"/></returns>
-        public Android.Media.VolumeShaper CreateVolumeShaper(Android.Media.VolumeShaper.Configuration arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPlayState()
         {
-            return IExecuteWithSignature<Android.Media.VolumeShaper>("createVolumeShaper", "(Landroid/media/VolumeShaper$Configuration;)Landroid/media/VolumeShaper;", arg0);
+            return IExecuteWithSignature<int>("getPlayState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getTimestamp(android.media.AudioTimestamp)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getPositionNotificationPeriod()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Media.AudioTimestamp"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool GetTimestamp(Android.Media.AudioTimestamp arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPositionNotificationPeriod()
         {
-            return IExecuteWithSignature<bool>("getTimestamp", "(Landroid/media/AudioTimestamp;)Z", arg0);
+            return IExecuteWithSignature<int>("getPositionNotificationPeriod", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#isOffloadedPlayback()"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getSampleRate()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOffloadedPlayback()
+        /// <returns><see cref="int"/></returns>
+        public int GetSampleRate()
         {
-            return IExecuteWithSignature<bool>("isOffloadedPlayback", "()Z");
+            return IExecuteWithSignature<int>("getSampleRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setAudioDescriptionMixLeveldB(float)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getStartThresholdInFrames()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SetAudioDescriptionMixLeveldB(float arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetStartThresholdInFrames()
         {
-            return IExecuteWithSignature<bool>("setAudioDescriptionMixLeveldB", "(F)Z", arg0);
+            return IExecuteWithSignature<int>("getStartThresholdInFrames", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setDualMonoMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getState()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SetDualMonoMode(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            return IExecuteWithSignature<bool>("setDualMonoMode", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setPreferredDevice(android.media.AudioDeviceInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getStreamType()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Media.AudioDeviceInfo"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SetPreferredDevice(Android.Media.AudioDeviceInfo arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetStreamType()
         {
-            return IExecuteWithSignature<bool>("setPreferredDevice", "(Landroid/media/AudioDeviceInfo;)Z", arg0);
+            return IExecuteWithSignature<int>("getStreamType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#attachAuxEffect(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#getUnderrunCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public int AttachAuxEffect(int arg0)
+        public int GetUnderrunCount()
         {
-            return IExecuteWithSignature<int>("attachAuxEffect", "(I)I", arg0);
+            return IExecuteWithSignature<int>("getUnderrunCount", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#reloadStaticData()"/>
@@ -677,7 +707,7 @@ public int SetStartThresholdInFrames(int arg0)
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SetStereoVolume(float arg0, float arg1)
         {
             return IExecute<int>("setStereoVolume", arg0, arg1);
@@ -795,7 +825,7 @@ public void AddOnRoutingChangedListener(Android.Media.AudioRouting.OnRoutingChan
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioTrack.OnRoutingChangedListener"/></param>
         /// <param name="arg1"><see cref="Android.Os.Handler"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddOnRoutingChangedListener(Android.Media.AudioTrack.OnRoutingChangedListener arg0, Android.Os.Handler arg1)
         {
             IExecute("addOnRoutingChangedListener", arg0, arg1);
@@ -859,12 +889,20 @@ public void RemoveOnRoutingChangedListener(Android.Media.AudioRouting.OnRoutingC
         /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#removeOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioTrack.OnRoutingChangedListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveOnRoutingChangedListener(Android.Media.AudioTrack.OnRoutingChangedListener arg0)
         {
             IExecuteWithSignature("removeOnRoutingChangedListener", "(Landroid/media/AudioTrack$OnRoutingChangedListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Metrics.LogSessionId"/></param>
+        public void SetLogSessionId(Android.Media.Metrics.LogSessionId arg0)
+        {
+            IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setOffloadDelayPadding(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -881,6 +919,14 @@ public void SetOffloadEndOfStream()
             IExecuteWithSignature("setOffloadEndOfStream", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setPlaybackParams(android.media.PlaybackParams)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.PlaybackParams"/></param>
+        public void SetPlaybackParams(Android.Media.PlaybackParams arg0)
+        {
+            IExecuteWithSignature("setPlaybackParams", "(Landroid/media/PlaybackParams;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/AudioTrack.html#setPlaybackPositionUpdateListener(android.media.AudioTrack.OnPlaybackPositionUpdateListener,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioTrack.OnPlaybackPositionUpdateListener"/></param>
@@ -1058,7 +1104,7 @@ public partial class MetricsConstants
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/AudioTrack.MetricsConstants.html#CHANNELMASK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CHANNELMASK { get { if (!_CHANNELMASKReady) { _CHANNELMASKContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CHANNELMASK"); _CHANNELMASKReady = true; } return _CHANNELMASKContent; } }
             private static Java.Lang.String _CHANNELMASKContent = default;
             private static bool _CHANNELMASKReady = false; // this is used because in case of generics 
@@ -1071,7 +1117,7 @@ public partial class MetricsConstants
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/AudioTrack.MetricsConstants.html#SAMPLERATE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SAMPLERATE { get { if (!_SAMPLERATEReady) { _SAMPLERATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SAMPLERATE"); _SAMPLERATEReady = true; } return _SAMPLERATEContent; } }
             private static Java.Lang.String _SAMPLERATEContent = default;
             private static bool _SAMPLERATEReady = false; // this is used because in case of generics 
@@ -1131,7 +1177,7 @@ public partial class OnCodecFormatChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCodecFormatChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>>>(OnCodecFormatChangedEventHandler));
+                AddEventHandler("onCodecFormatChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>>>(OnCodecFormatChangedEventHandler));
 
             }
 
@@ -1139,7 +1185,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioTrack.OnCodecFormatChangedListener.html#onCodecFormatChanged(android.media.AudioTrack,android.media.AudioMetadataReadMap)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCodecFormatChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioTrack, Android.Media.AudioMetadataReadMap> OnOnCodecFormatChanged { get; set; } = null;
+            public global::System.Action<Android.Media.AudioTrack, Android.Media.AudioMetadataReadMap> OnOnCodecFormatChanged { get; set; } = null;
 
             void OnCodecFormatChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>> data)
             {
@@ -1232,8 +1278,8 @@ public partial class OnPlaybackPositionUpdateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMarkerReached", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>>>(OnMarkerReachedEventHandler));
-                AddEventHandler("onPeriodicNotification", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>>>(OnPeriodicNotificationEventHandler));
+                AddEventHandler("onMarkerReached", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>>>(OnMarkerReachedEventHandler));
+                AddEventHandler("onPeriodicNotification", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>>>(OnPeriodicNotificationEventHandler));
 
             }
 
@@ -1241,7 +1287,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioTrack.OnPlaybackPositionUpdateListener.html#onMarkerReached(android.media.AudioTrack)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMarkerReached"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioTrack> OnOnMarkerReached { get; set; } = null;
+            public global::System.Action<Android.Media.AudioTrack> OnOnMarkerReached { get; set; } = null;
 
             void OnMarkerReachedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>> data)
             {
@@ -1262,7 +1308,7 @@ public virtual void OnMarkerReached(Android.Media.AudioTrack arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioTrack.OnPlaybackPositionUpdateListener.html#onPeriodicNotification(android.media.AudioTrack)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPeriodicNotification"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioTrack> OnOnPeriodicNotification { get; set; } = null;
+            public global::System.Action<Android.Media.AudioTrack> OnOnPeriodicNotification { get; set; } = null;
 
             void OnPeriodicNotificationEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>> data)
             {
@@ -1361,8 +1407,8 @@ public partial class OnRoutingChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onRoutingChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>>>(OnRoutingChangedEventHandler));
-                AddEventHandler("onRoutingChanged1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>>>(OnRoutingChanged1EventHandler));
+                AddEventHandler("onRoutingChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>>>(OnRoutingChangedEventHandler));
+                AddEventHandler("onRoutingChanged1", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>>>(OnRoutingChanged1EventHandler));
 
             }
 
@@ -1370,7 +1416,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioTrack.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioTrack)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRoutingChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioTrack> OnOnRoutingChanged { get; set; } = null;
+            public global::System.Action<Android.Media.AudioTrack> OnOnRoutingChanged { get; set; } = null;
 
             void OnRoutingChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioTrack>> data)
             {
@@ -1382,7 +1428,7 @@ void OnRoutingChangedEventHandler(object sender, CLRListenerEventArgs<CLREventDa
             /// <see href="https://developer.android.com/reference/android/media/AudioTrack.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioTrack)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioTrack"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnRoutingChanged(Android.Media.AudioTrack arg0)
             {
                 
@@ -1391,7 +1437,7 @@ public virtual void OnRoutingChanged(Android.Media.AudioTrack arg0)
             /// <see href="https://developer.android.com/reference/android/media/AudioTrack.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioRouting"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
             public void OnRoutingChangedDefault(Android.Media.AudioRouting arg0)
             {
@@ -1402,7 +1448,7 @@ public void OnRoutingChangedDefault(Android.Media.AudioRouting arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/media/AudioTrack.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRoutingChanged1"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.AudioRouting> OnOnRoutingChanged1 { get; set; } = null;
+            public global::System.Action<Android.Media.AudioRouting> OnOnRoutingChanged1 { get; set; } = null;
 
             void OnRoutingChanged1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.AudioRouting>> data)
             {
@@ -1414,7 +1460,7 @@ void OnRoutingChanged1EventHandler(object sender, CLRListenerEventArgs<CLREventD
             /// <see href="https://developer.android.com/reference/android/media/AudioTrack.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioRouting"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="OnRoutingChangedDefault"/>; override the method to implement a different behavior</remarks>
             public virtual void OnRoutingChanged(Android.Media.AudioRouting arg0)
             {
@@ -1455,7 +1501,7 @@ public partial class OnRoutingChangedListenerDirect
             /// <see href="https://developer.android.com/reference/android/media/AudioTrack.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioTrack)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioTrack"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnRoutingChanged(Android.Media.AudioTrack arg0)
             {
                 IExecuteWithSignature("onRoutingChanged", "(Landroid/media/AudioTrack;)V", arg0);
@@ -1464,7 +1510,7 @@ public override void OnRoutingChanged(Android.Media.AudioTrack arg0)
             /// <see href="https://developer.android.com/reference/android/media/AudioTrack.OnRoutingChangedListener.html#onRoutingChanged(android.media.AudioRouting)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.AudioRouting"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnRoutingChanged(Android.Media.AudioRouting arg0)
             {
                 IExecuteWithSignature("onRoutingChanged", "(Landroid/media/AudioRouting;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/AllPackageClasses.cs
index 403a3b7b3..b6761ca9b 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/AllPackageClasses.cs
@@ -165,10 +165,13 @@ public partial class OnControlStatusChangeListener : MASES.JCOBridge.C2JBridge.J
             /// </summary>
             public OnControlStatusChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.audiofx.AudioEffect_OnControlStatusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.audiofx.OnControlStatusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -190,10 +193,13 @@ public partial class OnControlStatusChangeListenerDirect : OnControlStatusChange
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.audiofx.AudioEffect$OnControlStatusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.audiofx.AudioEffect$OnControlStatusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -224,10 +230,13 @@ public partial class OnEnableStatusChangeListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public OnEnableStatusChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.audiofx.AudioEffect_OnEnableStatusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.audiofx.OnEnableStatusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -249,10 +258,13 @@ public partial class OnEnableStatusChangeListenerDirect : OnEnableStatusChangeLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.audiofx.AudioEffect$OnEnableStatusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.audiofx.AudioEffect$OnEnableStatusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -371,10 +383,13 @@ public partial class OnParameterChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnParameterChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.audiofx.BassBoost_OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.audiofx.OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -396,10 +411,13 @@ public partial class OnParameterChangeListenerDirect : OnParameterChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.audiofx.BassBoost$OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.audiofx.BassBoost$OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1046,10 +1064,13 @@ public partial class OnParameterChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnParameterChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.audiofx.EnvironmentalReverb_OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.audiofx.OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1071,10 +1092,13 @@ public partial class OnParameterChangeListenerDirect : OnParameterChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.audiofx.EnvironmentalReverb$OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.audiofx.EnvironmentalReverb$OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1193,10 +1217,13 @@ public partial class OnParameterChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnParameterChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.audiofx.Equalizer_OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.audiofx.OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1218,10 +1245,13 @@ public partial class OnParameterChangeListenerDirect : OnParameterChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.audiofx.Equalizer$OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.audiofx.Equalizer$OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1472,10 +1502,13 @@ public partial class OnParameterChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnParameterChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.audiofx.PresetReverb_OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.audiofx.OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1497,10 +1530,13 @@ public partial class OnParameterChangeListenerDirect : OnParameterChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.audiofx.PresetReverb$OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.audiofx.PresetReverb$OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1619,10 +1655,13 @@ public partial class OnParameterChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnParameterChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.audiofx.Virtualizer_OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.audiofx.OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1644,10 +1683,13 @@ public partial class OnParameterChangeListenerDirect : OnParameterChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.audiofx.Virtualizer$OnParameterChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.audiofx.Virtualizer$OnParameterChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1810,10 +1852,13 @@ public partial class OnDataCaptureListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnDataCaptureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.audiofx.Visualizer_OnDataCaptureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.audiofx.OnDataCaptureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1835,10 +1880,13 @@ public partial class OnDataCaptureListenerDirect : OnDataCaptureListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.audiofx.Visualizer$OnDataCaptureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.audiofx.Visualizer$OnDataCaptureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/AudioEffect.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/AudioEffect.cs
index 89de76e71..0f57551df 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/AudioEffect.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/AudioEffect.cs
@@ -252,25 +252,22 @@ public static Android.Media.Audiofx.AudioEffect.Descriptor[] QueryEffects()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.html#getEnabled()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.html#getDescriptor()"/>
         /// </summary>
-        public bool Enabled
-        {
-            get { return IExecuteWithSignature<bool>("getEnabled", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.html#getDescriptor()"/> 
-        /// </summary>
-        public Android.Media.Audiofx.AudioEffect.Descriptor GetDescriptor
+        /// <returns><see cref="Android.Media.Audiofx.AudioEffect.Descriptor"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public Android.Media.Audiofx.AudioEffect.Descriptor GetDescriptor()
         {
-            get { return IExecuteWithSignature<Android.Media.Audiofx.AudioEffect.Descriptor>("getDescriptor", "()Landroid/media/audiofx/AudioEffect$Descriptor;"); }
+            return IExecuteWithSignature<Android.Media.Audiofx.AudioEffect.Descriptor>("getDescriptor", "()Landroid/media/audiofx/AudioEffect$Descriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.html#getEnabled()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public bool GetEnabled()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<bool>("getEnabled", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.html#hasControl()"/>
@@ -282,6 +279,15 @@ public bool HasControl()
             return IExecuteWithSignature<bool>("hasControl", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public int GetId()
+        {
+            return IExecuteWithSignature<int>("getId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.html#setEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -406,7 +412,7 @@ public partial class OnControlStatusChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onControlStatusChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.AudioEffect>>>(OnControlStatusChangeEventHandler));
+                AddEventHandler("onControlStatusChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.AudioEffect>>>(OnControlStatusChangeEventHandler));
 
             }
 
@@ -414,7 +420,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.OnControlStatusChangeListener.html#onControlStatusChange(android.media.audiofx.AudioEffect,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnControlStatusChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.AudioEffect, bool> OnOnControlStatusChange { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.AudioEffect, bool> OnOnControlStatusChange { get; set; } = null;
 
             void OnControlStatusChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.AudioEffect>> data)
             {
@@ -507,7 +513,7 @@ public partial class OnEnableStatusChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onEnableStatusChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.AudioEffect>>>(OnEnableStatusChangeEventHandler));
+                AddEventHandler("onEnableStatusChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.AudioEffect>>>(OnEnableStatusChangeEventHandler));
 
             }
 
@@ -515,7 +521,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/AudioEffect.OnEnableStatusChangeListener.html#onEnableStatusChange(android.media.audiofx.AudioEffect,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnEnableStatusChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.AudioEffect, bool> OnOnEnableStatusChange { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.AudioEffect, bool> OnOnEnableStatusChange { get; set; } = null;
 
             void OnEnableStatusChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.AudioEffect>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/BassBoost.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/BassBoost.cs
index 39f4d523e..274e8f55e 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/BassBoost.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/BassBoost.cs
@@ -71,25 +71,34 @@ public BassBoost(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#getProperties()"/> <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#setProperties(android.media.audiofx.BassBoost.Settings)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#getProperties()"/>
         /// </summary>
-        public Android.Media.Audiofx.BassBoost.Settings Properties
+        /// <returns><see cref="Android.Media.Audiofx.BassBoost.Settings"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public Android.Media.Audiofx.BassBoost.Settings GetProperties()
         {
-            get { return IExecuteWithSignature<Android.Media.Audiofx.BassBoost.Settings>("getProperties", "()Landroid/media/audiofx/BassBoost$Settings;"); } set { IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/BassBoost$Settings;)V", value); }
+            return IExecuteWithSignature<Android.Media.Audiofx.BassBoost.Settings>("getProperties", "()Landroid/media/audiofx/BassBoost$Settings;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#getRoundedStrength()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#getStrengthSupported()"/>
         /// </summary>
-        public short RoundedStrength
+        /// <returns><see cref="bool"/></returns>
+        public bool GetStrengthSupported()
         {
-            get { return IExecuteWithSignature<short>("getRoundedStrength", "()S"); }
+            return IExecuteWithSignature<bool>("getStrengthSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#getStrengthSupported()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#getRoundedStrength()"/>
         /// </summary>
-        public bool StrengthSupported
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetRoundedStrength()
         {
-            get { return IExecuteWithSignature<bool>("getStrengthSupported", "()Z"); }
+            return IExecuteWithSignature<short>("getRoundedStrength", "()S");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#setParameterListener(android.media.audiofx.BassBoost.OnParameterChangeListener)"/>
@@ -100,6 +109,17 @@ public void SetParameterListener(Android.Media.Audiofx.BassBoost.OnParameterChan
             IExecuteWithSignature("setParameterListener", "(Landroid/media/audiofx/BassBoost$OnParameterChangeListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#setProperties(android.media.audiofx.BassBoost.Settings)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Audiofx.BassBoost.Settings"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetProperties(Android.Media.Audiofx.BassBoost.Settings arg0)
+        {
+            IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/BassBoost$Settings;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.html#setStrength(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
@@ -139,7 +159,7 @@ public partial class OnParameterChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onParameterChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.BassBoost>>>(OnParameterChangeEventHandler));
+                AddEventHandler("onParameterChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.BassBoost>>>(OnParameterChangeEventHandler));
 
             }
 
@@ -147,7 +167,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/BassBoost.OnParameterChangeListener.html#onParameterChange(android.media.audiofx.BassBoost,int,int,short)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnParameterChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.BassBoost, int, int, short> OnOnParameterChange { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.BassBoost, int, int, short> OnOnParameterChange { get; set; } = null;
 
             void OnParameterChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.BassBoost>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/DynamicsProcessing.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/DynamicsProcessing.cs
index ca5e58cfb..f0dfa713a 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/DynamicsProcessing.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/DynamicsProcessing.cs
@@ -76,20 +76,6 @@ public DynamicsProcessing(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.html#getChannelCount()"/> 
-        /// </summary>
-        public int ChannelCount
-        {
-            get { return IExecuteWithSignature<int>("getChannelCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.html#getConfig()"/> 
-        /// </summary>
-        public Android.Media.Audiofx.DynamicsProcessing.Config GetConfig
-        {
-            get { return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Config>("getConfig", "()Landroid/media/audiofx/DynamicsProcessing$Config;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.html#getChannelByChannelIndex(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -99,6 +85,14 @@ public Android.Media.Audiofx.DynamicsProcessing.Channel GetChannelByChannelIndex
             return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Channel>("getChannelByChannelIndex", "(I)Landroid/media/audiofx/DynamicsProcessing$Channel;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.html#getConfig()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Audiofx.DynamicsProcessing.Config"/></returns>
+        public Android.Media.Audiofx.DynamicsProcessing.Config GetConfig()
+        {
+            return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Config>("getConfig", "()Landroid/media/audiofx/DynamicsProcessing$Config;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.html#getPostEqByChannelIndex(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -174,6 +168,14 @@ public float GetInputGainByChannelIndex(int arg0)
             return IExecuteWithSignature<float>("getInputGainByChannelIndex", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.html#getChannelCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelCount()
+        {
+            return IExecuteWithSignature<int>("getChannelCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.html#setAllChannelsTo(android.media.audiofx.DynamicsProcessing.Channel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Audiofx.DynamicsProcessing.Channel"/></param>
@@ -366,13 +368,6 @@ public BandBase(bool arg0, float arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.BandBase.html#getCutoffFrequency()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.BandBase.html#setCutoffFrequency(float)"/>
-            /// </summary>
-            public float CutoffFrequency
-            {
-                get { return IExecuteWithSignature<float>("getCutoffFrequency", "()F"); } set { IExecuteWithSignature("setCutoffFrequency", "(F)V", value); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.BandBase.html#isEnabled()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -381,6 +376,22 @@ public bool IsEnabled()
                 return IExecuteWithSignature<bool>("isEnabled", "()Z");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.BandBase.html#getCutoffFrequency()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float GetCutoffFrequency()
+            {
+                return IExecuteWithSignature<float>("getCutoffFrequency", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.BandBase.html#setCutoffFrequency(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetCutoffFrequency(float arg0)
+            {
+                IExecuteWithSignature("setCutoffFrequency", "(F)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.BandBase.html#setEnabled(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
@@ -430,11 +441,12 @@ public BandStage(bool arg0, bool arg1, int arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.BandStage.html#getBandCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.BandStage.html#getBandCount()"/>
             /// </summary>
-            public int BandCount
+            /// <returns><see cref="int"/></returns>
+            public int GetBandCount()
             {
-                get { return IExecuteWithSignature<int>("getBandCount", "()I"); }
+                return IExecuteWithSignature<int>("getBandCount", "()I");
             }
 
             #endregion
@@ -491,39 +503,20 @@ public Channel(float arg0, bool arg1, int arg2, bool arg3, int arg4, bool arg5,
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getLimiter()"/> 
-            /// </summary>
-            public Android.Media.Audiofx.DynamicsProcessing.Limiter GetLimiter
-            {
-                get { return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Limiter>("getLimiter", "()Landroid/media/audiofx/DynamicsProcessing$Limiter;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getMbc()"/> 
-            /// </summary>
-            public Android.Media.Audiofx.DynamicsProcessing.Mbc GetMbc
-            {
-                get { return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Mbc>("getMbc", "()Landroid/media/audiofx/DynamicsProcessing$Mbc;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getInputGain()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setInputGain(float)"/>
-            /// </summary>
-            public float InputGain
-            {
-                get { return IExecuteWithSignature<float>("getInputGain", "()F"); } set { IExecuteWithSignature("setInputGain", "(F)V", value); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getPostEq()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setPostEq(android.media.audiofx.DynamicsProcessing.Eq)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getPostEq()"/>
             /// </summary>
-            public Android.Media.Audiofx.DynamicsProcessing.Eq PostEq
+            /// <returns><see cref="Android.Media.Audiofx.DynamicsProcessing.Eq"/></returns>
+            public Android.Media.Audiofx.DynamicsProcessing.Eq GetPostEq()
             {
-                get { return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Eq>("getPostEq", "()Landroid/media/audiofx/DynamicsProcessing$Eq;"); } set { IExecuteWithSignature("setPostEq", "(Landroid/media/audiofx/DynamicsProcessing$Eq;)V", value); }
+                return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Eq>("getPostEq", "()Landroid/media/audiofx/DynamicsProcessing$Eq;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getPreEq()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setPreEq(android.media.audiofx.DynamicsProcessing.Eq)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getPreEq()"/>
             /// </summary>
-            public Android.Media.Audiofx.DynamicsProcessing.Eq PreEq
+            /// <returns><see cref="Android.Media.Audiofx.DynamicsProcessing.Eq"/></returns>
+            public Android.Media.Audiofx.DynamicsProcessing.Eq GetPreEq()
             {
-                get { return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Eq>("getPreEq", "()Landroid/media/audiofx/DynamicsProcessing$Eq;"); } set { IExecuteWithSignature("setPreEq", "(Landroid/media/audiofx/DynamicsProcessing$Eq;)V", value); }
+                return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Eq>("getPreEq", "()Landroid/media/audiofx/DynamicsProcessing$Eq;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getPostEqBand(int)"/>
@@ -544,6 +537,22 @@ public Android.Media.Audiofx.DynamicsProcessing.EqBand GetPreEqBand(int arg0)
                 return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.EqBand>("getPreEqBand", "(I)Landroid/media/audiofx/DynamicsProcessing$EqBand;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getLimiter()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Media.Audiofx.DynamicsProcessing.Limiter"/></returns>
+            public Android.Media.Audiofx.DynamicsProcessing.Limiter GetLimiter()
+            {
+                return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Limiter>("getLimiter", "()Landroid/media/audiofx/DynamicsProcessing$Limiter;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getMbc()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Media.Audiofx.DynamicsProcessing.Mbc"/></returns>
+            public Android.Media.Audiofx.DynamicsProcessing.Mbc GetMbc()
+            {
+                return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.Mbc>("getMbc", "()Landroid/media/audiofx/DynamicsProcessing$Mbc;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getMbcBand(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -553,6 +562,22 @@ public Android.Media.Audiofx.DynamicsProcessing.MbcBand GetMbcBand(int arg0)
                 return IExecuteWithSignature<Android.Media.Audiofx.DynamicsProcessing.MbcBand>("getMbcBand", "(I)Landroid/media/audiofx/DynamicsProcessing$MbcBand;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#getInputGain()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float GetInputGain()
+            {
+                return IExecuteWithSignature<float>("getInputGain", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setInputGain(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetInputGain(float arg0)
+            {
+                IExecuteWithSignature("setInputGain", "(F)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setLimiter(android.media.audiofx.DynamicsProcessing.Limiter)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.Audiofx.DynamicsProcessing.Limiter"/></param>
@@ -578,6 +603,14 @@ public void SetMbcBand(int arg0, Android.Media.Audiofx.DynamicsProcessing.MbcBan
                 IExecute("setMbcBand", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setPostEq(android.media.audiofx.DynamicsProcessing.Eq)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Android.Media.Audiofx.DynamicsProcessing.Eq"/></param>
+            public void SetPostEq(Android.Media.Audiofx.DynamicsProcessing.Eq arg0)
+            {
+                IExecuteWithSignature("setPostEq", "(Landroid/media/audiofx/DynamicsProcessing$Eq;)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setPostEqBand(int,android.media.audiofx.DynamicsProcessing.EqBand)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -587,6 +620,14 @@ public void SetPostEqBand(int arg0, Android.Media.Audiofx.DynamicsProcessing.EqB
                 IExecute("setPostEqBand", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setPreEq(android.media.audiofx.DynamicsProcessing.Eq)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Android.Media.Audiofx.DynamicsProcessing.Eq"/></param>
+            public void SetPreEq(Android.Media.Audiofx.DynamicsProcessing.Eq arg0)
+            {
+                IExecuteWithSignature("setPreEq", "(Landroid/media/audiofx/DynamicsProcessing$Eq;)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Channel.html#setPreEqBand(int,android.media.audiofx.DynamicsProcessing.EqBand)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -627,41 +668,6 @@ public partial class Config
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getMbcBandCount()"/> 
-            /// </summary>
-            public int MbcBandCount
-            {
-                get { return IExecuteWithSignature<int>("getMbcBandCount", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getPostEqBandCount()"/> 
-            /// </summary>
-            public int PostEqBandCount
-            {
-                get { return IExecuteWithSignature<int>("getPostEqBandCount", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getPreEqBandCount()"/> 
-            /// </summary>
-            public int PreEqBandCount
-            {
-                get { return IExecuteWithSignature<int>("getPreEqBandCount", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getPreferredFrameDuration()"/> 
-            /// </summary>
-            public float PreferredFrameDuration
-            {
-                get { return IExecuteWithSignature<float>("getPreferredFrameDuration", "()F"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getVariant()"/> 
-            /// </summary>
-            public int Variant
-            {
-                get { return IExecuteWithSignature<int>("getVariant", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getChannelByChannelIndex(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -778,6 +784,46 @@ public float GetInputGainByChannelIndex(int arg0)
                 return IExecuteWithSignature<float>("getInputGainByChannelIndex", "(I)F", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getPreferredFrameDuration()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float GetPreferredFrameDuration()
+            {
+                return IExecuteWithSignature<float>("getPreferredFrameDuration", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getMbcBandCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetMbcBandCount()
+            {
+                return IExecuteWithSignature<int>("getMbcBandCount", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getPostEqBandCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetPostEqBandCount()
+            {
+                return IExecuteWithSignature<int>("getPostEqBandCount", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getPreEqBandCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetPreEqBandCount()
+            {
+                return IExecuteWithSignature<int>("getPreEqBandCount", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#getVariant()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetVariant()
+            {
+                return IExecuteWithSignature<int>("getVariant", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Config.html#setAllChannelsTo(android.media.audiofx.DynamicsProcessing.Channel)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.Audiofx.DynamicsProcessing.Channel"/></param>
@@ -1231,11 +1277,20 @@ public EqBand(bool arg0, float arg1, float arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.EqBand.html#getGain()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.EqBand.html#setGain(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.EqBand.html#getGain()"/>
             /// </summary>
-            public float Gain
+            /// <returns><see cref="float"/></returns>
+            public float GetGain()
             {
-                get { return IExecuteWithSignature<float>("getGain", "()F"); } set { IExecuteWithSignature("setGain", "(F)V", value); }
+                return IExecuteWithSignature<float>("getGain", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.EqBand.html#setGain(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetGain(float arg0)
+            {
+                IExecuteWithSignature("setGain", "(F)V", arg0);
             }
 
             #endregion
@@ -1292,46 +1347,100 @@ public Limiter(bool arg0, bool arg1, int arg2, float arg3, float arg4, float arg
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getAttackTime()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setAttackTime(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getAttackTime()"/>
             /// </summary>
-            public float AttackTime
+            /// <returns><see cref="float"/></returns>
+            public float GetAttackTime()
             {
-                get { return IExecuteWithSignature<float>("getAttackTime", "()F"); } set { IExecuteWithSignature("setAttackTime", "(F)V", value); }
+                return IExecuteWithSignature<float>("getAttackTime", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getLinkGroup()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setLinkGroup(int)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getPostGain()"/>
             /// </summary>
-            public int LinkGroup
+            /// <returns><see cref="float"/></returns>
+            public float GetPostGain()
             {
-                get { return IExecuteWithSignature<int>("getLinkGroup", "()I"); } set { IExecuteWithSignature("setLinkGroup", "(I)V", value); }
+                return IExecuteWithSignature<float>("getPostGain", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getPostGain()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setPostGain(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getRatio()"/>
             /// </summary>
-            public float PostGain
+            /// <returns><see cref="float"/></returns>
+            public float GetRatio()
             {
-                get { return IExecuteWithSignature<float>("getPostGain", "()F"); } set { IExecuteWithSignature("setPostGain", "(F)V", value); }
+                return IExecuteWithSignature<float>("getRatio", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getRatio()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setRatio(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getReleaseTime()"/>
             /// </summary>
-            public float Ratio
+            /// <returns><see cref="float"/></returns>
+            public float GetReleaseTime()
             {
-                get { return IExecuteWithSignature<float>("getRatio", "()F"); } set { IExecuteWithSignature("setRatio", "(F)V", value); }
+                return IExecuteWithSignature<float>("getReleaseTime", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getReleaseTime()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setReleaseTime(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getThreshold()"/>
             /// </summary>
-            public float ReleaseTime
+            /// <returns><see cref="float"/></returns>
+            public float GetThreshold()
             {
-                get { return IExecuteWithSignature<float>("getReleaseTime", "()F"); } set { IExecuteWithSignature("setReleaseTime", "(F)V", value); }
+                return IExecuteWithSignature<float>("getThreshold", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getThreshold()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setThreshold(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#getLinkGroup()"/>
             /// </summary>
-            public float Threshold
+            /// <returns><see cref="int"/></returns>
+            public int GetLinkGroup()
             {
-                get { return IExecuteWithSignature<float>("getThreshold", "()F"); } set { IExecuteWithSignature("setThreshold", "(F)V", value); }
+                return IExecuteWithSignature<int>("getLinkGroup", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setAttackTime(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetAttackTime(float arg0)
+            {
+                IExecuteWithSignature("setAttackTime", "(F)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setLinkGroup(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetLinkGroup(int arg0)
+            {
+                IExecuteWithSignature("setLinkGroup", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setPostGain(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetPostGain(float arg0)
+            {
+                IExecuteWithSignature("setPostGain", "(F)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setRatio(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetRatio(float arg0)
+            {
+                IExecuteWithSignature("setRatio", "(F)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setReleaseTime(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetReleaseTime(float arg0)
+            {
+                IExecuteWithSignature("setReleaseTime", "(F)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.Limiter.html#setThreshold(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetThreshold(float arg0)
+            {
+                IExecuteWithSignature("setThreshold", "(F)V", arg0);
             }
 
             #endregion
@@ -1458,67 +1567,148 @@ public MbcBand(bool arg0, float arg1, float arg2, float arg3, float arg4, float
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getAttackTime()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setAttackTime(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getAttackTime()"/>
             /// </summary>
-            public float AttackTime
+            /// <returns><see cref="float"/></returns>
+            public float GetAttackTime()
             {
-                get { return IExecuteWithSignature<float>("getAttackTime", "()F"); } set { IExecuteWithSignature("setAttackTime", "(F)V", value); }
+                return IExecuteWithSignature<float>("getAttackTime", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getExpanderRatio()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setExpanderRatio(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getExpanderRatio()"/>
             /// </summary>
-            public float ExpanderRatio
+            /// <returns><see cref="float"/></returns>
+            public float GetExpanderRatio()
             {
-                get { return IExecuteWithSignature<float>("getExpanderRatio", "()F"); } set { IExecuteWithSignature("setExpanderRatio", "(F)V", value); }
+                return IExecuteWithSignature<float>("getExpanderRatio", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getKneeWidth()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setKneeWidth(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getKneeWidth()"/>
             /// </summary>
-            public float KneeWidth
+            /// <returns><see cref="float"/></returns>
+            public float GetKneeWidth()
+            {
+                return IExecuteWithSignature<float>("getKneeWidth", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getNoiseGateThreshold()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float GetNoiseGateThreshold()
+            {
+                return IExecuteWithSignature<float>("getNoiseGateThreshold", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getPostGain()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float GetPostGain()
+            {
+                return IExecuteWithSignature<float>("getPostGain", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getPreGain()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float GetPreGain()
+            {
+                return IExecuteWithSignature<float>("getPreGain", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getRatio()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float GetRatio()
+            {
+                return IExecuteWithSignature<float>("getRatio", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getReleaseTime()"/>
+            /// </summary>
+            /// <returns><see cref="float"/></returns>
+            public float GetReleaseTime()
             {
-                get { return IExecuteWithSignature<float>("getKneeWidth", "()F"); } set { IExecuteWithSignature("setKneeWidth", "(F)V", value); }
+                return IExecuteWithSignature<float>("getReleaseTime", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getNoiseGateThreshold()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setNoiseGateThreshold(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getThreshold()"/>
             /// </summary>
-            public float NoiseGateThreshold
+            /// <returns><see cref="float"/></returns>
+            public float GetThreshold()
+            {
+                return IExecuteWithSignature<float>("getThreshold", "()F");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setAttackTime(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetAttackTime(float arg0)
+            {
+                IExecuteWithSignature("setAttackTime", "(F)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setExpanderRatio(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetExpanderRatio(float arg0)
+            {
+                IExecuteWithSignature("setExpanderRatio", "(F)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setKneeWidth(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetKneeWidth(float arg0)
             {
-                get { return IExecuteWithSignature<float>("getNoiseGateThreshold", "()F"); } set { IExecuteWithSignature("setNoiseGateThreshold", "(F)V", value); }
+                IExecuteWithSignature("setKneeWidth", "(F)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getPostGain()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setPostGain(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setNoiseGateThreshold(float)"/>
             /// </summary>
-            public float PostGain
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetNoiseGateThreshold(float arg0)
             {
-                get { return IExecuteWithSignature<float>("getPostGain", "()F"); } set { IExecuteWithSignature("setPostGain", "(F)V", value); }
+                IExecuteWithSignature("setNoiseGateThreshold", "(F)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getPreGain()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setPreGain(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setPostGain(float)"/>
             /// </summary>
-            public float PreGain
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetPostGain(float arg0)
             {
-                get { return IExecuteWithSignature<float>("getPreGain", "()F"); } set { IExecuteWithSignature("setPreGain", "(F)V", value); }
+                IExecuteWithSignature("setPostGain", "(F)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getRatio()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setRatio(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setPreGain(float)"/>
             /// </summary>
-            public float Ratio
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetPreGain(float arg0)
             {
-                get { return IExecuteWithSignature<float>("getRatio", "()F"); } set { IExecuteWithSignature("setRatio", "(F)V", value); }
+                IExecuteWithSignature("setPreGain", "(F)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getReleaseTime()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setReleaseTime(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setRatio(float)"/>
             /// </summary>
-            public float ReleaseTime
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetRatio(float arg0)
             {
-                get { return IExecuteWithSignature<float>("getReleaseTime", "()F"); } set { IExecuteWithSignature("setReleaseTime", "(F)V", value); }
+                IExecuteWithSignature("setRatio", "(F)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#getThreshold()"/> <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setThreshold(float)"/>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setReleaseTime(float)"/>
             /// </summary>
-            public float Threshold
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetReleaseTime(float arg0)
+            {
+                IExecuteWithSignature("setReleaseTime", "(F)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/audiofx/DynamicsProcessing.MbcBand.html#setThreshold(float)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="float"/></param>
+            public void SetThreshold(float arg0)
             {
-                get { return IExecuteWithSignature<float>("getThreshold", "()F"); } set { IExecuteWithSignature("setThreshold", "(F)V", value); }
+                IExecuteWithSignature("setThreshold", "(F)V", arg0);
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/EnvironmentalReverb.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/EnvironmentalReverb.cs
index 3c49bbbe7..a1fa058c1 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/EnvironmentalReverb.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/EnvironmentalReverb.cs
@@ -118,81 +118,169 @@ public EnvironmentalReverb(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getDecayHFRatio()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setDecayHFRatio(short)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getProperties()"/>
         /// </summary>
-        public short DecayHFRatio
+        /// <returns><see cref="Android.Media.Audiofx.EnvironmentalReverb.Settings"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public Android.Media.Audiofx.EnvironmentalReverb.Settings GetProperties()
+        {
+            return IExecuteWithSignature<Android.Media.Audiofx.EnvironmentalReverb.Settings>("getProperties", "()Landroid/media/audiofx/EnvironmentalReverb$Settings;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getDecayTime()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public int GetDecayTime()
         {
-            get { return IExecuteWithSignature<short>("getDecayHFRatio", "()S"); } set { IExecuteWithSignature("setDecayHFRatio", "(S)V", value); }
+            return IExecuteWithSignature<int>("getDecayTime", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getDecayTime()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setDecayTime(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getReflectionsDelay()"/>
         /// </summary>
-        public int DecayTime
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public int GetReflectionsDelay()
         {
-            get { return IExecuteWithSignature<int>("getDecayTime", "()I"); } set { IExecuteWithSignature("setDecayTime", "(I)V", value); }
+            return IExecuteWithSignature<int>("getReflectionsDelay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getDensity()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setDensity(short)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getReverbDelay()"/>
         /// </summary>
-        public short Density
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public int GetReverbDelay()
+        {
+            return IExecuteWithSignature<int>("getReverbDelay", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getDecayHFRatio()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetDecayHFRatio()
+        {
+            return IExecuteWithSignature<short>("getDecayHFRatio", "()S");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getDensity()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetDensity()
         {
-            get { return IExecuteWithSignature<short>("getDensity", "()S"); } set { IExecuteWithSignature("setDensity", "(S)V", value); }
+            return IExecuteWithSignature<short>("getDensity", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getDiffusion()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setDiffusion(short)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getDiffusion()"/>
         /// </summary>
-        public short Diffusion
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetDiffusion()
         {
-            get { return IExecuteWithSignature<short>("getDiffusion", "()S"); } set { IExecuteWithSignature("setDiffusion", "(S)V", value); }
+            return IExecuteWithSignature<short>("getDiffusion", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getProperties()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setProperties(android.media.audiofx.EnvironmentalReverb.Settings)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getReflectionsLevel()"/>
         /// </summary>
-        public Android.Media.Audiofx.EnvironmentalReverb.Settings Properties
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetReflectionsLevel()
         {
-            get { return IExecuteWithSignature<Android.Media.Audiofx.EnvironmentalReverb.Settings>("getProperties", "()Landroid/media/audiofx/EnvironmentalReverb$Settings;"); } set { IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/EnvironmentalReverb$Settings;)V", value); }
+            return IExecuteWithSignature<short>("getReflectionsLevel", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getReflectionsDelay()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setReflectionsDelay(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getReverbLevel()"/>
         /// </summary>
-        public int ReflectionsDelay
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetReverbLevel()
         {
-            get { return IExecuteWithSignature<int>("getReflectionsDelay", "()I"); } set { IExecuteWithSignature("setReflectionsDelay", "(I)V", value); }
+            return IExecuteWithSignature<short>("getReverbLevel", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getReflectionsLevel()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setReflectionsLevel(short)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getRoomHFLevel()"/>
         /// </summary>
-        public short ReflectionsLevel
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetRoomHFLevel()
         {
-            get { return IExecuteWithSignature<short>("getReflectionsLevel", "()S"); } set { IExecuteWithSignature("setReflectionsLevel", "(S)V", value); }
+            return IExecuteWithSignature<short>("getRoomHFLevel", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getReverbDelay()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setReverbDelay(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getRoomLevel()"/>
         /// </summary>
-        public int ReverbDelay
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetRoomLevel()
         {
-            get { return IExecuteWithSignature<int>("getReverbDelay", "()I"); } set { IExecuteWithSignature("setReverbDelay", "(I)V", value); }
+            return IExecuteWithSignature<short>("getRoomLevel", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getReverbLevel()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setReverbLevel(short)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setDecayHFRatio(short)"/>
         /// </summary>
-        public short ReverbLevel
+        /// <param name="arg0"><see cref="short"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetDecayHFRatio(short arg0)
         {
-            get { return IExecuteWithSignature<short>("getReverbLevel", "()S"); } set { IExecuteWithSignature("setReverbLevel", "(S)V", value); }
+            IExecuteWithSignature("setDecayHFRatio", "(S)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getRoomHFLevel()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setRoomHFLevel(short)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setDecayTime(int)"/>
         /// </summary>
-        public short RoomHFLevel
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetDecayTime(int arg0)
         {
-            get { return IExecuteWithSignature<short>("getRoomHFLevel", "()S"); } set { IExecuteWithSignature("setRoomHFLevel", "(S)V", value); }
+            IExecuteWithSignature("setDecayTime", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#getRoomLevel()"/> <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setRoomLevel(short)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setDensity(short)"/>
         /// </summary>
-        public short RoomLevel
+        /// <param name="arg0"><see cref="short"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetDensity(short arg0)
         {
-            get { return IExecuteWithSignature<short>("getRoomLevel", "()S"); } set { IExecuteWithSignature("setRoomLevel", "(S)V", value); }
+            IExecuteWithSignature("setDensity", "(S)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setDiffusion(short)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="short"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetDiffusion(short arg0)
+        {
+            IExecuteWithSignature("setDiffusion", "(S)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setParameterListener(android.media.audiofx.EnvironmentalReverb.OnParameterChangeListener)"/>
@@ -202,6 +290,83 @@ public void SetParameterListener(Android.Media.Audiofx.EnvironmentalReverb.OnPar
         {
             IExecuteWithSignature("setParameterListener", "(Landroid/media/audiofx/EnvironmentalReverb$OnParameterChangeListener;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setProperties(android.media.audiofx.EnvironmentalReverb.Settings)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Audiofx.EnvironmentalReverb.Settings"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetProperties(Android.Media.Audiofx.EnvironmentalReverb.Settings arg0)
+        {
+            IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/EnvironmentalReverb$Settings;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setReflectionsDelay(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetReflectionsDelay(int arg0)
+        {
+            IExecuteWithSignature("setReflectionsDelay", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setReflectionsLevel(short)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="short"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetReflectionsLevel(short arg0)
+        {
+            IExecuteWithSignature("setReflectionsLevel", "(S)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setReverbDelay(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetReverbDelay(int arg0)
+        {
+            IExecuteWithSignature("setReverbDelay", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setReverbLevel(short)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="short"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetReverbLevel(short arg0)
+        {
+            IExecuteWithSignature("setReverbLevel", "(S)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setRoomHFLevel(short)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="short"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetRoomHFLevel(short arg0)
+        {
+            IExecuteWithSignature("setRoomHFLevel", "(S)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.html#setRoomLevel(short)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="short"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetRoomLevel(short arg0)
+        {
+            IExecuteWithSignature("setRoomLevel", "(S)V", arg0);
+        }
 
         #endregion
 
@@ -231,7 +396,7 @@ public partial class OnParameterChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onParameterChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.EnvironmentalReverb>>>(OnParameterChangeEventHandler));
+                AddEventHandler("onParameterChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.EnvironmentalReverb>>>(OnParameterChangeEventHandler));
 
             }
 
@@ -239,7 +404,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/EnvironmentalReverb.OnParameterChangeListener.html#onParameterChange(android.media.audiofx.EnvironmentalReverb,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnParameterChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.EnvironmentalReverb, int, int, int> OnOnParameterChange { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.EnvironmentalReverb, int, int, int> OnOnParameterChange { get; set; } = null;
 
             void OnParameterChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.EnvironmentalReverb>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/Equalizer.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/Equalizer.cs
index 17a206e90..9e810dd96 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/Equalizer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/Equalizer.cs
@@ -119,39 +119,15 @@ public Equalizer(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getBandLevelRange()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getProperties()"/>
         /// </summary>
-        public short[] BandLevelRange
-        {
-            get { return IExecuteWithSignatureArray<short>("getBandLevelRange", "()[S"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getCurrentPreset()"/> 
-        /// </summary>
-        public short CurrentPreset
-        {
-            get { return IExecuteWithSignature<short>("getCurrentPreset", "()S"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getNumberOfBands()"/> 
-        /// </summary>
-        public short NumberOfBands
-        {
-            get { return IExecuteWithSignature<short>("getNumberOfBands", "()S"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getNumberOfPresets()"/> 
-        /// </summary>
-        public short NumberOfPresets
-        {
-            get { return IExecuteWithSignature<short>("getNumberOfPresets", "()S"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getProperties()"/> <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#setProperties(android.media.audiofx.Equalizer.Settings)"/>
-        /// </summary>
-        public Android.Media.Audiofx.Equalizer.Settings Properties
+        /// <returns><see cref="Android.Media.Audiofx.Equalizer.Settings"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public Android.Media.Audiofx.Equalizer.Settings GetProperties()
         {
-            get { return IExecuteWithSignature<Android.Media.Audiofx.Equalizer.Settings>("getProperties", "()Landroid/media/audiofx/Equalizer$Settings;"); } set { IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/Equalizer$Settings;)V", value); }
+            return IExecuteWithSignature<Android.Media.Audiofx.Equalizer.Settings>("getProperties", "()Landroid/media/audiofx/Equalizer$Settings;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getCenterFreq(short)"/>
@@ -211,6 +187,50 @@ public short GetBandLevel(short arg0)
             return IExecuteWithSignature<short>("getBandLevel", "(S)S", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getCurrentPreset()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetCurrentPreset()
+        {
+            return IExecuteWithSignature<short>("getCurrentPreset", "()S");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getNumberOfBands()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetNumberOfBands()
+        {
+            return IExecuteWithSignature<short>("getNumberOfBands", "()S");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getNumberOfPresets()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetNumberOfPresets()
+        {
+            return IExecuteWithSignature<short>("getNumberOfPresets", "()S");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#getBandLevelRange()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short[] GetBandLevelRange()
+        {
+            return IExecuteWithSignatureArray<short>("getBandLevelRange", "()[S");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#setBandLevel(short,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
@@ -231,6 +251,17 @@ public void SetParameterListener(Android.Media.Audiofx.Equalizer.OnParameterChan
             IExecuteWithSignature("setParameterListener", "(Landroid/media/audiofx/Equalizer$OnParameterChangeListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#setProperties(android.media.audiofx.Equalizer.Settings)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Audiofx.Equalizer.Settings"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetProperties(Android.Media.Audiofx.Equalizer.Settings arg0)
+        {
+            IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/Equalizer$Settings;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.html#usePreset(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
@@ -270,7 +301,7 @@ public partial class OnParameterChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onParameterChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Equalizer>>>(OnParameterChangeEventHandler));
+                AddEventHandler("onParameterChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Equalizer>>>(OnParameterChangeEventHandler));
 
             }
 
@@ -278,7 +309,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/Equalizer.OnParameterChangeListener.html#onParameterChange(android.media.audiofx.Equalizer,int,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnParameterChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.Equalizer, int, int, int, int> OnOnParameterChange { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.Equalizer, int, int, int, int> OnOnParameterChange { get; set; } = null;
 
             void OnParameterChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Equalizer>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/LoudnessEnhancer.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/LoudnessEnhancer.cs
index 59f377117..c841d90e3 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/LoudnessEnhancer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/LoudnessEnhancer.cs
@@ -64,11 +64,26 @@ public LoudnessEnhancer(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/LoudnessEnhancer.html#getTargetGain()"/> <see href="https://developer.android.com/reference/android/media/audiofx/LoudnessEnhancer.html#setTargetGain(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/LoudnessEnhancer.html#getTargetGain()"/>
         /// </summary>
-        public float TargetGain
+        /// <returns><see cref="float"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public float GetTargetGain()
+        {
+            return IExecuteWithSignature<float>("getTargetGain", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/LoudnessEnhancer.html#setTargetGain(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetTargetGain(int arg0)
         {
-            get { return IExecuteWithSignature<float>("getTargetGain", "()F"); } set { IExecuteWithSignature("setTargetGain", "(I)V", value); }
+            IExecuteWithSignature("setTargetGain", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/PresetReverb.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/PresetReverb.cs
index e8f965f2b..9bf48ca12 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/PresetReverb.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/PresetReverb.cs
@@ -106,18 +106,26 @@ public PresetReverb(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#getPreset()"/> <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#setPreset(short)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#getProperties()"/>
         /// </summary>
-        public short Preset
+        /// <returns><see cref="Android.Media.Audiofx.PresetReverb.Settings"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public Android.Media.Audiofx.PresetReverb.Settings GetProperties()
         {
-            get { return IExecuteWithSignature<short>("getPreset", "()S"); } set { IExecuteWithSignature("setPreset", "(S)V", value); }
+            return IExecuteWithSignature<Android.Media.Audiofx.PresetReverb.Settings>("getProperties", "()Landroid/media/audiofx/PresetReverb$Settings;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#getProperties()"/> <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#setProperties(android.media.audiofx.PresetReverb.Settings)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#getPreset()"/>
         /// </summary>
-        public Android.Media.Audiofx.PresetReverb.Settings Properties
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetPreset()
         {
-            get { return IExecuteWithSignature<Android.Media.Audiofx.PresetReverb.Settings>("getProperties", "()Landroid/media/audiofx/PresetReverb$Settings;"); } set { IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/PresetReverb$Settings;)V", value); }
+            return IExecuteWithSignature<short>("getPreset", "()S");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#setParameterListener(android.media.audiofx.PresetReverb.OnParameterChangeListener)"/>
@@ -127,6 +135,28 @@ public void SetParameterListener(Android.Media.Audiofx.PresetReverb.OnParameterC
         {
             IExecuteWithSignature("setParameterListener", "(Landroid/media/audiofx/PresetReverb$OnParameterChangeListener;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#setPreset(short)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="short"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetPreset(short arg0)
+        {
+            IExecuteWithSignature("setPreset", "(S)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.html#setProperties(android.media.audiofx.PresetReverb.Settings)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Audiofx.PresetReverb.Settings"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetProperties(Android.Media.Audiofx.PresetReverb.Settings arg0)
+        {
+            IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/PresetReverb$Settings;)V", arg0);
+        }
 
         #endregion
 
@@ -156,7 +186,7 @@ public partial class OnParameterChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onParameterChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.PresetReverb>>>(OnParameterChangeEventHandler));
+                AddEventHandler("onParameterChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.PresetReverb>>>(OnParameterChangeEventHandler));
 
             }
 
@@ -164,7 +194,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/PresetReverb.OnParameterChangeListener.html#onParameterChange(android.media.audiofx.PresetReverb,int,int,short)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnParameterChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.PresetReverb, int, int, short> OnOnParameterChange { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.PresetReverb, int, int, short> OnOnParameterChange { get; set; } = null;
 
             void OnParameterChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.PresetReverb>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/Virtualizer.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/Virtualizer.cs
index 6e279a4df..c4481a70b 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/Virtualizer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/Virtualizer.cs
@@ -95,32 +95,15 @@ public Virtualizer(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#getProperties()"/> <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#setProperties(android.media.audiofx.Virtualizer.Settings)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#getProperties()"/>
         /// </summary>
-        public Android.Media.Audiofx.Virtualizer.Settings Properties
-        {
-            get { return IExecuteWithSignature<Android.Media.Audiofx.Virtualizer.Settings>("getProperties", "()Landroid/media/audiofx/Virtualizer$Settings;"); } set { IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/Virtualizer$Settings;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#getRoundedStrength()"/> 
-        /// </summary>
-        public short RoundedStrength
-        {
-            get { return IExecuteWithSignature<short>("getRoundedStrength", "()S"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#getStrengthSupported()"/> 
-        /// </summary>
-        public bool StrengthSupported
-        {
-            get { return IExecuteWithSignature<bool>("getStrengthSupported", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#getVirtualizationMode()"/> 
-        /// </summary>
-        public int VirtualizationMode
+        /// <returns><see cref="Android.Media.Audiofx.Virtualizer.Settings"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public Android.Media.Audiofx.Virtualizer.Settings GetProperties()
         {
-            get { return IExecuteWithSignature<int>("getVirtualizationMode", "()I"); }
+            return IExecuteWithSignature<Android.Media.Audiofx.Virtualizer.Settings>("getProperties", "()Landroid/media/audiofx/Virtualizer$Settings;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#canVirtualize(int,int)"/>
@@ -162,6 +145,35 @@ public bool GetSpeakerAngles(int arg0, int arg1, int[] arg2)
             return IExecute<bool>("getSpeakerAngles", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#getStrengthSupported()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetStrengthSupported()
+        {
+            return IExecuteWithSignature<bool>("getStrengthSupported", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#getVirtualizationMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public int GetVirtualizationMode()
+        {
+            return IExecuteWithSignature<int>("getVirtualizationMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#getRoundedStrength()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public short GetRoundedStrength()
+        {
+            return IExecuteWithSignature<short>("getRoundedStrength", "()S");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#setParameterListener(android.media.audiofx.Virtualizer.OnParameterChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Audiofx.Virtualizer.OnParameterChangeListener"/></param>
@@ -170,6 +182,17 @@ public void SetParameterListener(Android.Media.Audiofx.Virtualizer.OnParameterCh
             IExecuteWithSignature("setParameterListener", "(Landroid/media/audiofx/Virtualizer$OnParameterChangeListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#setProperties(android.media.audiofx.Virtualizer.Settings)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Audiofx.Virtualizer.Settings"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        /// <exception cref="Java.Lang.UnsupportedOperationException"/>
+        public void SetProperties(Android.Media.Audiofx.Virtualizer.Settings arg0)
+        {
+            IExecuteWithSignature("setProperties", "(Landroid/media/audiofx/Virtualizer$Settings;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.html#setStrength(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
@@ -209,7 +232,7 @@ public partial class OnParameterChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onParameterChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Virtualizer>>>(OnParameterChangeEventHandler));
+                AddEventHandler("onParameterChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Virtualizer>>>(OnParameterChangeEventHandler));
 
             }
 
@@ -217,7 +240,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/Virtualizer.OnParameterChangeListener.html#onParameterChange(android.media.audiofx.Virtualizer,int,int,short)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnParameterChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.Virtualizer, int, int, short> OnOnParameterChange { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.Virtualizer, int, int, short> OnOnParameterChange { get; set; } = null;
 
             void OnParameterChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Virtualizer>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Audiofx/Visualizer.cs b/src/net/Netdroid/Generated/Android/Media/Audiofx/Visualizer.cs
index dfc9be79a..016a43c43 100644
--- a/src/net/Netdroid/Generated/Android/Media/Audiofx/Visualizer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Audiofx/Visualizer.cs
@@ -142,76 +142,87 @@ public Visualizer(int arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getCaptureSizeRange()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getMaxCaptureRate()"/>
         /// </summary>
-        public static int[] CaptureSizeRange
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxCaptureRate()
         {
-            get { return SExecuteWithSignatureArray<int>(LocalBridgeClazz, "getCaptureSizeRange", "()[I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxCaptureRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getMaxCaptureRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getCaptureSizeRange()"/>
         /// </summary>
-        public static int MaxCaptureRate
+        /// <returns><see cref="int"/></returns>
+        public static int[] GetCaptureSizeRange()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxCaptureRate", "()I"); }
+            return SExecuteWithSignatureArray<int>(LocalBridgeClazz, "getCaptureSizeRange", "()[I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getCaptureSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getEnabled()"/>
         /// </summary>
-        public int CaptureSize
+        /// <returns><see cref="bool"/></returns>
+        public bool GetEnabled()
         {
-            get { return IExecuteWithSignature<int>("getCaptureSize", "()I"); }
+            return IExecuteWithSignature<bool>("getEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getEnabled()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getCaptureSize()"/>
         /// </summary>
-        public bool Enabled
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public int GetCaptureSize()
         {
-            get { return IExecuteWithSignature<bool>("getEnabled", "()Z"); }
+            return IExecuteWithSignature<int>("getCaptureSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getMeasurementMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getFft(byte[])"/>
         /// </summary>
-        public int MeasurementMode
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public int GetFft(byte[] arg0)
         {
-            get { return IExecuteWithSignature<int>("getMeasurementMode", "()I"); }
+            return IExecuteWithSignature<int>("getFft", "([B)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getSamplingRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getMeasurementMode()"/>
         /// </summary>
-        public int SamplingRate
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public int GetMeasurementMode()
         {
-            get { return IExecuteWithSignature<int>("getSamplingRate", "()I"); }
+            return IExecuteWithSignature<int>("getMeasurementMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getScalingMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getMeasurementPeakRms(android.media.audiofx.Visualizer.MeasurementPeakRms)"/>
         /// </summary>
-        public int ScalingMode
+        /// <param name="arg0"><see cref="Android.Media.Audiofx.Visualizer.MeasurementPeakRms"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementPeakRms(Android.Media.Audiofx.Visualizer.MeasurementPeakRms arg0)
         {
-            get { return IExecuteWithSignature<int>("getScalingMode", "()I"); }
+            return IExecuteWithSignature<int>("getMeasurementPeakRms", "(Landroid/media/audiofx/Visualizer$MeasurementPeakRms;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getFft(byte[])"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getSamplingRate()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Lang.IllegalStateException"/>
-        public int GetFft(byte[] arg0)
+        public int GetSamplingRate()
         {
-            return IExecuteWithSignature<int>("getFft", "([B)I", new object[] { arg0 });
+            return IExecuteWithSignature<int>("getSamplingRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getMeasurementPeakRms(android.media.audiofx.Visualizer.MeasurementPeakRms)"/>
+        /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getScalingMode()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Media.Audiofx.Visualizer.MeasurementPeakRms"/></param>
         /// <returns><see cref="int"/></returns>
-        public int GetMeasurementPeakRms(Android.Media.Audiofx.Visualizer.MeasurementPeakRms arg0)
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public int GetScalingMode()
         {
-            return IExecuteWithSignature<int>("getMeasurementPeakRms", "(Landroid/media/audiofx/Visualizer$MeasurementPeakRms;)I", arg0);
+            return IExecuteWithSignature<int>("getScalingMode", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.html#getWaveForm(byte[])"/>
@@ -350,8 +361,8 @@ public partial class OnDataCaptureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFftDataCapture", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Visualizer>>>(OnFftDataCaptureEventHandler));
-                AddEventHandler("onWaveFormDataCapture", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Visualizer>>>(OnWaveFormDataCaptureEventHandler));
+                AddEventHandler("onFftDataCapture", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Visualizer>>>(OnFftDataCaptureEventHandler));
+                AddEventHandler("onWaveFormDataCapture", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Visualizer>>>(OnWaveFormDataCaptureEventHandler));
 
             }
 
@@ -359,7 +370,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.OnDataCaptureListener.html#onFftDataCapture(android.media.audiofx.Visualizer,byte[],int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFftDataCapture"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.Visualizer, byte[], int> OnOnFftDataCapture { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.Visualizer, byte[], int> OnOnFftDataCapture { get; set; } = null;
 
             void OnFftDataCaptureEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Visualizer>> data)
             {
@@ -382,7 +393,7 @@ public virtual void OnFftDataCapture(Android.Media.Audiofx.Visualizer arg0, byte
             /// Handler for <see href="https://developer.android.com/reference/android/media/audiofx/Visualizer.OnDataCaptureListener.html#onWaveFormDataCapture(android.media.audiofx.Visualizer,byte[],int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnWaveFormDataCapture"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Audiofx.Visualizer, byte[], int> OnOnWaveFormDataCapture { get; set; } = null;
+            public global::System.Action<Android.Media.Audiofx.Visualizer, byte[], int> OnOnWaveFormDataCapture { get; set; } = null;
 
             void OnWaveFormDataCaptureEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Audiofx.Visualizer>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Browse/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Browse/AllPackageClasses.cs
index 83663ea1b..742ba5d83 100644
--- a/src/net/Netdroid/Generated/Android/Media/Browse/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Browse/AllPackageClasses.cs
@@ -120,12 +120,12 @@ public partial class ItemCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Item
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ItemCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ItemCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ItemCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ItemCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ItemCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ItemCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -210,12 +210,12 @@ public partial class SubscriptionCallback : MASES.JCOBridge.C2JBridge.JVMBridgeB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SubscriptionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SubscriptionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SubscriptionCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SubscriptionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SubscriptionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SubscriptionCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Media/Browse/MediaBrowser.cs b/src/net/Netdroid/Generated/Android/Media/Browse/MediaBrowser.cs
index 0b518df56..8968b0ef6 100644
--- a/src/net/Netdroid/Generated/Android/Media/Browse/MediaBrowser.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Browse/MediaBrowser.cs
@@ -69,32 +69,28 @@ public MediaBrowser(Android.Content.Context arg0, Android.Content.ComponentName
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#getServiceComponent()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetServiceComponent()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getServiceComponent", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#getRoot()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#getSessionToken()"/>
         /// </summary>
-        public Java.Lang.String Root
+        /// <returns><see cref="Android.Media.Session.MediaSession.Token"/></returns>
+        public Android.Media.Session.MediaSession.Token GetSessionToken()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRoot", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getSessionToken", "()Landroid/media/session/MediaSession$Token;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#getServiceComponent()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#getExtras()"/>
         /// </summary>
-        public Android.Content.ComponentName ServiceComponent
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getServiceComponent", "()Landroid/content/ComponentName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#getSessionToken()"/> 
-        /// </summary>
-        public Android.Media.Session.MediaSession.Token SessionToken
-        {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getSessionToken", "()Landroid/media/session/MediaSession$Token;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#isConnected()"/>
@@ -105,6 +101,14 @@ public bool IsConnected()
             return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#getRoot()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRoot()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getRoot", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.html#connect()"/>
         /// </summary>
         public void Connect()
@@ -314,25 +318,12 @@ public MediaItem(Android.Media.MediaDescription arg0, int arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.MediaItem.html#getDescription()"/> 
-            /// </summary>
-            public Android.Media.MediaDescription Description
-            {
-                get { return IExecuteWithSignature<Android.Media.MediaDescription>("getDescription", "()Landroid/media/MediaDescription;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.MediaItem.html#getFlags()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.MediaItem.html#getDescription()"/>
             /// </summary>
-            public int Flags
+            /// <returns><see cref="Android.Media.MediaDescription"/></returns>
+            public Android.Media.MediaDescription GetDescription()
             {
-                get { return IExecuteWithSignature<int>("getFlags", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.MediaItem.html#getMediaId()"/> 
-            /// </summary>
-            public Java.Lang.String MediaId
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getMediaId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Media.MediaDescription>("getDescription", "()Landroid/media/MediaDescription;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.MediaItem.html#isBrowsable()"/>
@@ -359,6 +350,22 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.MediaItem.html#getFlags()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetFlags()
+            {
+                return IExecuteWithSignature<int>("getFlags", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.MediaItem.html#getMediaId()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetMediaId()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getMediaId", "()Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/browse/MediaBrowser.MediaItem.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/CamcorderProfile.cs b/src/net/Netdroid/Generated/Android/Media/CamcorderProfile.cs
index 4dc96e902..16d2a04cc 100644
--- a/src/net/Netdroid/Generated/Android/Media/CamcorderProfile.cs
+++ b/src/net/Netdroid/Generated/Android/Media/CamcorderProfile.cs
@@ -317,7 +317,7 @@ public partial class CamcorderProfile
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Media.CamcorderProfile"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Media.CamcorderProfile Get(int arg0, int arg1)
         {
             return SExecute<Android.Media.CamcorderProfile>(LocalBridgeClazz, "get", arg0, arg1);
@@ -327,7 +327,7 @@ public static Android.Media.CamcorderProfile Get(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Media.CamcorderProfile"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Media.CamcorderProfile Get(int arg0)
         {
             return SExecuteWithSignature<Android.Media.CamcorderProfile>(LocalBridgeClazz, "get", "(I)Landroid/media/CamcorderProfile;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Media/DrmInitData.cs b/src/net/Netdroid/Generated/Android/Media/DrmInitData.cs
index d4f1a7364..fdd54e62c 100644
--- a/src/net/Netdroid/Generated/Android/Media/DrmInitData.cs
+++ b/src/net/Netdroid/Generated/Android/Media/DrmInitData.cs
@@ -46,18 +46,11 @@ public partial class DrmInitData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/DrmInitData.html#getSchemeInitDataCount()"/> 
-        /// </summary>
-        public int SchemeInitDataCount
-        {
-            get { return IExecuteWithSignature<int>("getSchemeInitDataCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/DrmInitData.html#get(java.util.UUID)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
         /// <returns><see cref="Android.Media.DrmInitData.SchemeInitData"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Media.DrmInitData.SchemeInitData Get(Java.Util.UUID arg0)
         {
             return IExecuteWithSignature<Android.Media.DrmInitData.SchemeInitData>("get", "(Ljava/util/UUID;)Landroid/media/DrmInitData$SchemeInitData;", arg0);
@@ -71,6 +64,14 @@ public Android.Media.DrmInitData.SchemeInitData GetSchemeInitDataAt(int arg0)
         {
             return IExecuteWithSignature<Android.Media.DrmInitData.SchemeInitData>("getSchemeInitDataAt", "(I)Landroid/media/DrmInitData$SchemeInitData;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/DrmInitData.html#getSchemeInitDataCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSchemeInitDataCount()
+        {
+            return IExecuteWithSignature<int>("getSchemeInitDataCount", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Media/Effect/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Effect/AllPackageClasses.cs
index 608822659..03e2937a9 100644
--- a/src/net/Netdroid/Generated/Android/Media/Effect/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Effect/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class Effect : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Effect>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Effect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Effect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Effect() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Effect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Effect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Effect(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -171,10 +171,13 @@ public partial class EffectUpdateListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
         /// </summary>
         public EffectUpdateListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.media.effect.EffectUpdateListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.media.effect.EffectUpdateListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -196,10 +199,13 @@ public partial class EffectUpdateListenerDirect : EffectUpdateListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.media.effect.EffectUpdateListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.media.effect.EffectUpdateListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Media/Effect/Effect.cs b/src/net/Netdroid/Generated/Android/Media/Effect/Effect.cs
index a76801910..6811382be 100644
--- a/src/net/Netdroid/Generated/Android/Media/Effect/Effect.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Effect/Effect.cs
@@ -46,11 +46,12 @@ public partial class Effect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/effect/Effect.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/effect/Effect.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/effect/Effect.html#apply(int,int,int,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Effect/EffectContext.cs b/src/net/Netdroid/Generated/Android/Media/Effect/EffectContext.cs
index 3c6536e9e..c234a26c9 100644
--- a/src/net/Netdroid/Generated/Android/Media/Effect/EffectContext.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Effect/EffectContext.cs
@@ -54,11 +54,12 @@ public static Android.Media.Effect.EffectContext CreateWithCurrentGlContext()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/effect/EffectContext.html#getFactory()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/effect/EffectContext.html#getFactory()"/>
         /// </summary>
-        public Android.Media.Effect.EffectFactory Factory
+        /// <returns><see cref="Android.Media.Effect.EffectFactory"/></returns>
+        public Android.Media.Effect.EffectFactory GetFactory()
         {
-            get { return IExecuteWithSignature<Android.Media.Effect.EffectFactory>("getFactory", "()Landroid/media/effect/EffectFactory;"); }
+            return IExecuteWithSignature<Android.Media.Effect.EffectFactory>("getFactory", "()Landroid/media/effect/EffectFactory;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/effect/EffectContext.html#release()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Effect/EffectUpdateListener.cs b/src/net/Netdroid/Generated/Android/Media/Effect/EffectUpdateListener.cs
index b0cbcb0b9..f6afb86e1 100644
--- a/src/net/Netdroid/Generated/Android/Media/Effect/EffectUpdateListener.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Effect/EffectUpdateListener.cs
@@ -68,7 +68,7 @@ public partial class EffectUpdateListener : Android.Media.Effect.IEffectUpdateLi
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onEffectUpdated", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Effect.Effect>>>(OnEffectUpdatedEventHandler));
+            AddEventHandler("onEffectUpdated", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Effect.Effect>>>(OnEffectUpdatedEventHandler));
 
         }
 
@@ -76,7 +76,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/media/effect/EffectUpdateListener.html#onEffectUpdated(android.media.effect.Effect,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnEffectUpdated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Media.Effect.Effect, object> OnOnEffectUpdated { get; set; } = null;
+        public global::System.Action<Android.Media.Effect.Effect, object> OnOnEffectUpdated { get; set; } = null;
 
         void OnEffectUpdatedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Effect.Effect>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Media/EncoderProfiles.cs b/src/net/Netdroid/Generated/Android/Media/EncoderProfiles.cs
index 60baf0a78..97ed12c69 100644
--- a/src/net/Netdroid/Generated/Android/Media/EncoderProfiles.cs
+++ b/src/net/Netdroid/Generated/Android/Media/EncoderProfiles.cs
@@ -46,32 +46,36 @@ public partial class EncoderProfiles
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.html#getAudioProfiles()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.html#getDefaultDurationSeconds()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.EncoderProfiles.AudioProfile> AudioProfiles
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultDurationSeconds()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.EncoderProfiles.AudioProfile>>("getAudioProfiles", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getDefaultDurationSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.html#getDefaultDurationSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.html#getRecommendedFileFormat()"/>
         /// </summary>
-        public int DefaultDurationSeconds
+        /// <returns><see cref="int"/></returns>
+        public int GetRecommendedFileFormat()
         {
-            get { return IExecuteWithSignature<int>("getDefaultDurationSeconds", "()I"); }
+            return IExecuteWithSignature<int>("getRecommendedFileFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.html#getRecommendedFileFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.html#getAudioProfiles()"/>
         /// </summary>
-        public int RecommendedFileFormat
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.EncoderProfiles.AudioProfile> GetAudioProfiles()
         {
-            get { return IExecuteWithSignature<int>("getRecommendedFileFormat", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.EncoderProfiles.AudioProfile>>("getAudioProfiles", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.html#getVideoProfiles()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.html#getVideoProfiles()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.EncoderProfiles.VideoProfile> VideoProfiles
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.EncoderProfiles.VideoProfile> GetVideoProfiles()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.EncoderProfiles.VideoProfile>>("getVideoProfiles", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.EncoderProfiles.VideoProfile>>("getVideoProfiles", "()Ljava/util/List;");
         }
 
         #endregion
@@ -98,46 +102,52 @@ public partial class AudioProfile
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getBitrate()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getBitrate()"/>
             /// </summary>
-            public int Bitrate
+            /// <returns><see cref="int"/></returns>
+            public int GetBitrate()
             {
-                get { return IExecuteWithSignature<int>("getBitrate", "()I"); }
+                return IExecuteWithSignature<int>("getBitrate", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getChannels()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getChannels()"/>
             /// </summary>
-            public int Channels
+            /// <returns><see cref="int"/></returns>
+            public int GetChannels()
             {
-                get { return IExecuteWithSignature<int>("getChannels", "()I"); }
+                return IExecuteWithSignature<int>("getChannels", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getCodec()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getCodec()"/>
             /// </summary>
-            public int Codec
+            /// <returns><see cref="int"/></returns>
+            public int GetCodec()
             {
-                get { return IExecuteWithSignature<int>("getCodec", "()I"); }
+                return IExecuteWithSignature<int>("getCodec", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getMediaType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getProfile()"/>
             /// </summary>
-            public Java.Lang.String MediaType
+            /// <returns><see cref="int"/></returns>
+            public int GetProfile()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getMediaType", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getProfile", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getProfile()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getSampleRate()"/>
             /// </summary>
-            public int Profile
+            /// <returns><see cref="int"/></returns>
+            public int GetSampleRate()
             {
-                get { return IExecuteWithSignature<int>("getProfile", "()I"); }
+                return IExecuteWithSignature<int>("getSampleRate", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getSampleRate()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.AudioProfile.html#getMediaType()"/>
             /// </summary>
-            public int SampleRate
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetMediaType()
             {
-                get { return IExecuteWithSignature<int>("getSampleRate", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getMediaType", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -219,74 +229,84 @@ public partial class VideoProfile
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getBitDepth()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getBitDepth()"/>
             /// </summary>
-            public int BitDepth
+            /// <returns><see cref="int"/></returns>
+            public int GetBitDepth()
             {
-                get { return IExecuteWithSignature<int>("getBitDepth", "()I"); }
+                return IExecuteWithSignature<int>("getBitDepth", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getBitrate()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getBitrate()"/>
             /// </summary>
-            public int Bitrate
+            /// <returns><see cref="int"/></returns>
+            public int GetBitrate()
             {
-                get { return IExecuteWithSignature<int>("getBitrate", "()I"); }
+                return IExecuteWithSignature<int>("getBitrate", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getChromaSubsampling()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getChromaSubsampling()"/>
             /// </summary>
-            public int ChromaSubsampling
+            /// <returns><see cref="int"/></returns>
+            public int GetChromaSubsampling()
             {
-                get { return IExecuteWithSignature<int>("getChromaSubsampling", "()I"); }
+                return IExecuteWithSignature<int>("getChromaSubsampling", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getCodec()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getCodec()"/>
             /// </summary>
-            public int Codec
+            /// <returns><see cref="int"/></returns>
+            public int GetCodec()
             {
-                get { return IExecuteWithSignature<int>("getCodec", "()I"); }
+                return IExecuteWithSignature<int>("getCodec", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getFrameRate()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getFrameRate()"/>
             /// </summary>
-            public int FrameRate
+            /// <returns><see cref="int"/></returns>
+            public int GetFrameRate()
             {
-                get { return IExecuteWithSignature<int>("getFrameRate", "()I"); }
+                return IExecuteWithSignature<int>("getFrameRate", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getHdrFormat()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getHdrFormat()"/>
             /// </summary>
-            public int HdrFormat
+            /// <returns><see cref="int"/></returns>
+            public int GetHdrFormat()
             {
-                get { return IExecuteWithSignature<int>("getHdrFormat", "()I"); }
+                return IExecuteWithSignature<int>("getHdrFormat", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getHeight()"/>
             /// </summary>
-            public int Height
+            /// <returns><see cref="int"/></returns>
+            public int GetHeight()
             {
-                get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+                return IExecuteWithSignature<int>("getHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getMediaType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getProfile()"/>
             /// </summary>
-            public Java.Lang.String MediaType
+            /// <returns><see cref="int"/></returns>
+            public int GetProfile()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getMediaType", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getProfile", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getProfile()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getWidth()"/>
             /// </summary>
-            public int Profile
+            /// <returns><see cref="int"/></returns>
+            public int GetWidth()
             {
-                get { return IExecuteWithSignature<int>("getProfile", "()I"); }
+                return IExecuteWithSignature<int>("getWidth", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/EncoderProfiles.VideoProfile.html#getMediaType()"/>
             /// </summary>
-            public int Width
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetMediaType()
             {
-                get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getMediaType", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/ExifInterface.cs b/src/net/Netdroid/Generated/Android/Media/ExifInterface.cs
index 56cc362d0..b6b3c1634 100644
--- a/src/net/Netdroid/Generated/Android/Media/ExifInterface.cs
+++ b/src/net/Netdroid/Generated/Android/Media/ExifInterface.cs
@@ -164,7 +164,7 @@ public ExifInterface(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#TAG_APERTURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TAG_APERTURE { get { if (!_TAG_APERTUREReady) { _TAG_APERTUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TAG_APERTURE"); _TAG_APERTUREReady = true; } return _TAG_APERTUREContent; } }
         private static Java.Lang.String _TAG_APERTUREContent = default;
         private static bool _TAG_APERTUREReady = false; // this is used because in case of generics 
@@ -603,7 +603,7 @@ public ExifInterface(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#TAG_ISO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TAG_ISO { get { if (!_TAG_ISOReady) { _TAG_ISOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TAG_ISO"); _TAG_ISOReady = true; } return _TAG_ISOContent; } }
         private static Java.Lang.String _TAG_ISOContent = default;
         private static bool _TAG_ISOReady = false; // this is used because in case of generics 
@@ -922,7 +922,7 @@ public ExifInterface(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#TAG_SUBSEC_TIME_DIG"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TAG_SUBSEC_TIME_DIG { get { if (!_TAG_SUBSEC_TIME_DIGReady) { _TAG_SUBSEC_TIME_DIGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TAG_SUBSEC_TIME_DIG"); _TAG_SUBSEC_TIME_DIGReady = true; } return _TAG_SUBSEC_TIME_DIGContent; } }
         private static Java.Lang.String _TAG_SUBSEC_TIME_DIGContent = default;
         private static bool _TAG_SUBSEC_TIME_DIGReady = false; // this is used because in case of generics 
@@ -935,7 +935,7 @@ public ExifInterface(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#TAG_SUBSEC_TIME_ORIG"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TAG_SUBSEC_TIME_ORIG { get { if (!_TAG_SUBSEC_TIME_ORIGReady) { _TAG_SUBSEC_TIME_ORIGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TAG_SUBSEC_TIME_ORIG"); _TAG_SUBSEC_TIME_ORIGReady = true; } return _TAG_SUBSEC_TIME_ORIGContent; } }
         private static Java.Lang.String _TAG_SUBSEC_TIME_ORIGContent = default;
         private static bool _TAG_SUBSEC_TIME_ORIGReady = false; // this is used because in case of generics 
@@ -1041,60 +1041,12 @@ public static bool IsSupportedMimeType(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getDateTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getThumbnailBitmap()"/>
         /// </summary>
-        public long DateTime
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetThumbnailBitmap()
         {
-            get { return IExecuteWithSignature<long>("getDateTime", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getDateTimeDigitized()"/> 
-        /// </summary>
-        public long DateTimeDigitized
-        {
-            get { return IExecuteWithSignature<long>("getDateTimeDigitized", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getDateTimeOriginal()"/> 
-        /// </summary>
-        public long DateTimeOriginal
-        {
-            get { return IExecuteWithSignature<long>("getDateTimeOriginal", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getGpsDateTime()"/> 
-        /// </summary>
-        public long GpsDateTime
-        {
-            get { return IExecuteWithSignature<long>("getGpsDateTime", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getThumbnail()"/> 
-        /// </summary>
-        public byte[] Thumbnail
-        {
-            get { return IExecuteWithSignatureArray<byte>("getThumbnail", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getThumbnailBitmap()"/> 
-        /// </summary>
-        public Android.Graphics.Bitmap ThumbnailBitmap
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getThumbnailBitmap", "()Landroid/graphics/Bitmap;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getThumbnailBytes()"/> 
-        /// </summary>
-        public byte[] ThumbnailBytes
-        {
-            get { return IExecuteWithSignatureArray<byte>("getThumbnailBytes", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getThumbnailRange()"/> 
-        /// </summary>
-        public long[] ThumbnailRange
-        {
-            get { return IExecuteWithSignatureArray<long>("getThumbnailRange", "()[J"); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getThumbnailBitmap", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getLatLong(float[])"/>
@@ -1140,6 +1092,22 @@ public byte[] GetAttributeBytes(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<byte>("getAttributeBytes", "(Ljava/lang/String;)[B", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getThumbnail()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetThumbnail()
+        {
+            return IExecuteWithSignatureArray<byte>("getThumbnail", "()[B");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getThumbnailBytes()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetThumbnailBytes()
+        {
+            return IExecuteWithSignatureArray<byte>("getThumbnailBytes", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getAltitude(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
@@ -1178,6 +1146,38 @@ public Java.Lang.String GetAttribute(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getAttribute", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getDateTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDateTime()
+        {
+            return IExecuteWithSignature<long>("getDateTime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getDateTimeDigitized()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDateTimeDigitized()
+        {
+            return IExecuteWithSignature<long>("getDateTimeDigitized", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getDateTimeOriginal()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDateTimeOriginal()
+        {
+            return IExecuteWithSignature<long>("getDateTimeOriginal", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getGpsDateTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetGpsDateTime()
+        {
+            return IExecuteWithSignature<long>("getGpsDateTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getAttributeRange(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1187,6 +1187,14 @@ public long[] GetAttributeRange(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<long>("getAttributeRange", "(Ljava/lang/String;)[J", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#getThumbnailRange()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long[] GetThumbnailRange()
+        {
+            return IExecuteWithSignatureArray<long>("getThumbnailRange", "()[J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ExifInterface.html#saveAttributes()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Image.cs b/src/net/Netdroid/Generated/Android/Media/Image.cs
index 2b783848b..0d50ba48b 100644
--- a/src/net/Netdroid/Generated/Android/Media/Image.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Image.cs
@@ -46,74 +46,117 @@ public partial class Image
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getCropRect()"/> <see href="https://developer.android.com/reference/android/media/Image.html#setCropRect(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getPlanes()"/>
         /// </summary>
-        public Android.Graphics.Rect CropRect
+        /// <returns><see cref="Android.Media.Image.Plane"/></returns>
+        public Android.Media.Image.Plane[] GetPlanes()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getCropRect", "()Landroid/graphics/Rect;"); } set { IExecuteWithSignature("setCropRect", "(Landroid/graphics/Rect;)V", value); }
+            return IExecuteWithSignatureArray<Android.Media.Image.Plane>("getPlanes", "()[Landroid/media/Image$Plane;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getDataSpace()"/> <see href="https://developer.android.com/reference/android/media/Image.html#setDataSpace(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getFormat()"/>
         /// </summary>
-        public int DataSpace
+        /// <returns><see cref="int"/></returns>
+        public int GetFormat()
         {
-            get { return IExecuteWithSignature<int>("getDataSpace", "()I"); } set { IExecuteWithSignature("setDataSpace", "(I)V", value); }
+            return IExecuteWithSignature<int>("getFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getFence()"/> <see href="https://developer.android.com/reference/android/media/Image.html#setFence(android.hardware.SyncFence)"/>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getHeight()"/>
         /// </summary>
-        public Android.Hardware.SyncFence Fence
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<Android.Hardware.SyncFence>("getFence", "()Landroid/hardware/SyncFence;"); } set { IExecuteWithSignature("setFence", "(Landroid/hardware/SyncFence;)V", value); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getWidth()"/>
         /// </summary>
-        public int Format
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<int>("getFormat", "()I"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getHardwareBuffer()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getTimestamp()"/>
         /// </summary>
-        public Android.Hardware.HardwareBuffer HardwareBuffer
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestamp()
         {
-            get { return IExecuteWithSignature<Android.Hardware.HardwareBuffer>("getHardwareBuffer", "()Landroid/hardware/HardwareBuffer;"); }
+            return IExecuteWithSignature<long>("getTimestamp", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#close()"/>
         /// </summary>
-        public int Height
+        public void Close()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getPlanes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getCropRect()"/>
         /// </summary>
-        public Android.Media.Image.Plane[] Planes
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetCropRect()
         {
-            get { return IExecuteWithSignatureArray<Android.Media.Image.Plane>("getPlanes", "()[Landroid/media/Image$Plane;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getCropRect", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getTimestamp()"/> <see href="https://developer.android.com/reference/android/media/Image.html#setTimestamp(long)"/>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getHardwareBuffer()"/>
         /// </summary>
-        public long Timestamp
+        /// <returns><see cref="Android.Hardware.HardwareBuffer"/></returns>
+        public Android.Hardware.HardwareBuffer GetHardwareBuffer()
         {
-            get { return IExecuteWithSignature<long>("getTimestamp", "()J"); } set { IExecuteWithSignature("setTimestamp", "(J)V", value); }
+            return IExecuteWithSignature<Android.Hardware.HardwareBuffer>("getHardwareBuffer", "()Landroid/hardware/HardwareBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getFence()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="Android.Hardware.SyncFence"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Android.Hardware.SyncFence GetFence()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<Android.Hardware.SyncFence>("getFence", "()Landroid/hardware/SyncFence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Image.html#close()"/>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#getDataSpace()"/>
         /// </summary>
-        public void Close()
+        /// <returns><see cref="int"/></returns>
+        public int GetDataSpace()
         {
-            IExecuteWithSignature("close", "()V");
+            return IExecuteWithSignature<int>("getDataSpace", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#setCropRect(android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        public void SetCropRect(Android.Graphics.Rect arg0)
+        {
+            IExecuteWithSignature("setCropRect", "(Landroid/graphics/Rect;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#setDataSpace(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDataSpace(int arg0)
+        {
+            IExecuteWithSignature("setDataSpace", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#setFence(android.hardware.SyncFence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Hardware.SyncFence"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetFence(Android.Hardware.SyncFence arg0)
+        {
+            IExecuteWithSignature("setFence", "(Landroid/hardware/SyncFence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Image.html#setTimestamp(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetTimestamp(long arg0)
+        {
+            IExecuteWithSignature("setTimestamp", "(J)V", arg0);
         }
 
         #endregion
@@ -140,25 +183,28 @@ public partial class Plane
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/Image.Plane.html#getBuffer()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/Image.Plane.html#getPixelStride()"/>
             /// </summary>
-            public Java.Nio.ByteBuffer Buffer
+            /// <returns><see cref="int"/></returns>
+            public int GetPixelStride()
             {
-                get { return IExecuteWithSignature<Java.Nio.ByteBuffer>("getBuffer", "()Ljava/nio/ByteBuffer;"); }
+                return IExecuteWithSignature<int>("getPixelStride", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/Image.Plane.html#getPixelStride()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/Image.Plane.html#getRowStride()"/>
             /// </summary>
-            public int PixelStride
+            /// <returns><see cref="int"/></returns>
+            public int GetRowStride()
             {
-                get { return IExecuteWithSignature<int>("getPixelStride", "()I"); }
+                return IExecuteWithSignature<int>("getRowStride", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/Image.Plane.html#getRowStride()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/Image.Plane.html#getBuffer()"/>
             /// </summary>
-            public int RowStride
+            /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
+            public Java.Nio.ByteBuffer GetBuffer()
             {
-                get { return IExecuteWithSignature<int>("getRowStride", "()I"); }
+                return IExecuteWithSignature<Java.Nio.ByteBuffer>("getBuffer", "()Ljava/nio/ByteBuffer;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/ImageReader.cs b/src/net/Netdroid/Generated/Android/Media/ImageReader.cs
index 6f04b2202..152d0a6e0 100644
--- a/src/net/Netdroid/Generated/Android/Media/ImageReader.cs
+++ b/src/net/Netdroid/Generated/Android/Media/ImageReader.cs
@@ -71,76 +71,84 @@ public static Android.Media.ImageReader NewInstance(int arg0, int arg1, int arg2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getDataSpace()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#acquireLatestImage()"/>
         /// </summary>
-        public int DataSpace
+        /// <returns><see cref="Android.Media.Image"/></returns>
+        public Android.Media.Image AcquireLatestImage()
         {
-            get { return IExecuteWithSignature<int>("getDataSpace", "()I"); }
+            return IExecuteWithSignature<Android.Media.Image>("acquireLatestImage", "()Landroid/media/Image;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getHardwareBufferFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#acquireNextImage()"/>
         /// </summary>
-        public int HardwareBufferFormat
+        /// <returns><see cref="Android.Media.Image"/></returns>
+        public Android.Media.Image AcquireNextImage()
         {
-            get { return IExecuteWithSignature<int>("getHardwareBufferFormat", "()I"); }
+            return IExecuteWithSignature<Android.Media.Image>("acquireNextImage", "()Landroid/media/Image;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getSurface()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetSurface()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getImageFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getDataSpace()"/>
         /// </summary>
-        public int ImageFormat
+        /// <returns><see cref="int"/></returns>
+        public int GetDataSpace()
         {
-            get { return IExecuteWithSignature<int>("getImageFormat", "()I"); }
+            return IExecuteWithSignature<int>("getDataSpace", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getMaxImages()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getHardwareBufferFormat()"/>
         /// </summary>
-        public int MaxImages
+        /// <returns><see cref="int"/></returns>
+        public int GetHardwareBufferFormat()
         {
-            get { return IExecuteWithSignature<int>("getMaxImages", "()I"); }
+            return IExecuteWithSignature<int>("getHardwareBufferFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getSurface()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getHeight()"/>
         /// </summary>
-        public Android.View.Surface Surface
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getUsage()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getImageFormat()"/>
         /// </summary>
-        public long Usage
+        /// <returns><see cref="int"/></returns>
+        public int GetImageFormat()
         {
-            get { return IExecuteWithSignature<long>("getUsage", "()J"); }
+            return IExecuteWithSignature<int>("getImageFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getMaxImages()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxImages()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getMaxImages", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#acquireLatestImage()"/>
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getWidth()"/>
         /// </summary>
-        /// <returns><see cref="Android.Media.Image"/></returns>
-        public Android.Media.Image AcquireLatestImage()
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            return IExecuteWithSignature<Android.Media.Image>("acquireLatestImage", "()Landroid/media/Image;");
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#acquireNextImage()"/>
+        /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#getUsage()"/>
         /// </summary>
-        /// <returns><see cref="Android.Media.Image"/></returns>
-        public Android.Media.Image AcquireNextImage()
+        /// <returns><see cref="long"/></returns>
+        public long GetUsage()
         {
-            return IExecuteWithSignature<Android.Media.Image>("acquireNextImage", "()Landroid/media/Image;");
+            return IExecuteWithSignature<long>("getUsage", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ImageReader.html#close()"/>
@@ -287,7 +295,7 @@ public partial class OnImageAvailableListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onImageAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.ImageReader>>>(OnImageAvailableEventHandler));
+                AddEventHandler("onImageAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.ImageReader>>>(OnImageAvailableEventHandler));
 
             }
 
@@ -295,7 +303,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/ImageReader.OnImageAvailableListener.html#onImageAvailable(android.media.ImageReader)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnImageAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.ImageReader> OnOnImageAvailable { get; set; } = null;
+            public global::System.Action<Android.Media.ImageReader> OnOnImageAvailable { get; set; } = null;
 
             void OnImageAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.ImageReader>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/ImageWriter.cs b/src/net/Netdroid/Generated/Android/Media/ImageWriter.cs
index d4b419859..12e676136 100644
--- a/src/net/Netdroid/Generated/Android/Media/ImageWriter.cs
+++ b/src/net/Netdroid/Generated/Android/Media/ImageWriter.cs
@@ -67,61 +67,68 @@ public static Android.Media.ImageWriter NewInstance(Android.View.Surface arg0, i
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getDataSpace()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#dequeueInputImage()"/>
         /// </summary>
-        public int DataSpace
+        /// <returns><see cref="Android.Media.Image"/></returns>
+        public Android.Media.Image DequeueInputImage()
         {
-            get { return IExecuteWithSignature<int>("getDataSpace", "()I"); }
+            return IExecuteWithSignature<Android.Media.Image>("dequeueInputImage", "()Landroid/media/Image;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getDataSpace()"/>
         /// </summary>
-        public int Format
+        /// <returns><see cref="int"/></returns>
+        public int GetDataSpace()
         {
-            get { return IExecuteWithSignature<int>("getFormat", "()I"); }
+            return IExecuteWithSignature<int>("getDataSpace", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getHardwareBufferFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getFormat()"/>
         /// </summary>
-        public int HardwareBufferFormat
+        /// <returns><see cref="int"/></returns>
+        public int GetFormat()
         {
-            get { return IExecuteWithSignature<int>("getHardwareBufferFormat", "()I"); }
+            return IExecuteWithSignature<int>("getFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getHardwareBufferFormat()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="int"/></returns>
+        public int GetHardwareBufferFormat()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<int>("getHardwareBufferFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getMaxImages()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getHeight()"/>
         /// </summary>
-        public int MaxImages
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getMaxImages", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getUsage()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getMaxImages()"/>
         /// </summary>
-        public long Usage
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxImages()
         {
-            get { return IExecuteWithSignature<long>("getUsage", "()J"); }
+            return IExecuteWithSignature<int>("getMaxImages", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getWidth()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#dequeueInputImage()"/>
+        /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#getUsage()"/>
         /// </summary>
-        /// <returns><see cref="Android.Media.Image"/></returns>
-        public Android.Media.Image DequeueInputImage()
+        /// <returns><see cref="long"/></returns>
+        public long GetUsage()
         {
-            return IExecuteWithSignature<Android.Media.Image>("dequeueInputImage", "()Landroid/media/Image;");
+            return IExecuteWithSignature<long>("getUsage", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ImageWriter.html#close()"/>
@@ -278,7 +285,7 @@ public partial class OnImageReleasedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onImageReleased", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.ImageWriter>>>(OnImageReleasedEventHandler));
+                AddEventHandler("onImageReleased", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.ImageWriter>>>(OnImageReleasedEventHandler));
 
             }
 
@@ -286,7 +293,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/ImageWriter.OnImageReleasedListener.html#onImageReleased(android.media.ImageWriter)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnImageReleased"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.ImageWriter> OnOnImageReleased { get; set; } = null;
+            public global::System.Action<Android.Media.ImageWriter> OnOnImageReleased { get; set; } = null;
 
             void OnImageReleasedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.ImageWriter>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/JetPlayer.cs b/src/net/Netdroid/Generated/Android/Media/JetPlayer.cs
index ef0476884..739d6062e 100644
--- a/src/net/Netdroid/Generated/Android/Media/JetPlayer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/JetPlayer.cs
@@ -42,18 +42,20 @@ public partial class JetPlayer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/JetPlayer.html#getJetPlayer()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/JetPlayer.html#getJetPlayer()"/>
         /// </summary>
-        public static Android.Media.JetPlayer GetJetPlayer
+        /// <returns><see cref="Android.Media.JetPlayer"/></returns>
+        public static Android.Media.JetPlayer GetJetPlayer()
         {
-            get { return SExecuteWithSignature<Android.Media.JetPlayer>(LocalBridgeClazz, "getJetPlayer", "()Landroid/media/JetPlayer;"); }
+            return SExecuteWithSignature<Android.Media.JetPlayer>(LocalBridgeClazz, "getJetPlayer", "()Landroid/media/JetPlayer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/JetPlayer.html#getMaxTracks()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/JetPlayer.html#getMaxTracks()"/>
         /// </summary>
-        public static int MaxTracks
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxTracks()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxTracks", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxTracks", "()I");
         }
 
         #endregion
@@ -230,10 +232,10 @@ public partial class OnJetEventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onJetEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>>>(OnJetEventEventHandler));
-                AddEventHandler("onJetNumQueuedSegmentUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>>>(OnJetNumQueuedSegmentUpdateEventHandler));
-                AddEventHandler("onJetPauseUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>>>(OnJetPauseUpdateEventHandler));
-                AddEventHandler("onJetUserIdUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>>>(OnJetUserIdUpdateEventHandler));
+                AddEventHandler("onJetEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>>>(OnJetEventEventHandler));
+                AddEventHandler("onJetNumQueuedSegmentUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>>>(OnJetNumQueuedSegmentUpdateEventHandler));
+                AddEventHandler("onJetPauseUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>>>(OnJetPauseUpdateEventHandler));
+                AddEventHandler("onJetUserIdUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>>>(OnJetUserIdUpdateEventHandler));
 
             }
 
@@ -241,7 +243,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/JetPlayer.OnJetEventListener.html#onJetEvent(android.media.JetPlayer,short,byte,byte,byte,byte)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnJetEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.JetPlayer, short, byte, byte, byte, byte> OnOnJetEvent { get; set; } = null;
+            public global::System.Action<Android.Media.JetPlayer, short, byte, byte, byte, byte> OnOnJetEvent { get; set; } = null;
 
             void OnJetEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>> data)
             {
@@ -267,7 +269,7 @@ public virtual void OnJetEvent(Android.Media.JetPlayer arg0, short arg1, byte ar
             /// Handler for <see href="https://developer.android.com/reference/android/media/JetPlayer.OnJetEventListener.html#onJetNumQueuedSegmentUpdate(android.media.JetPlayer,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnJetNumQueuedSegmentUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.JetPlayer, int> OnOnJetNumQueuedSegmentUpdate { get; set; } = null;
+            public global::System.Action<Android.Media.JetPlayer, int> OnOnJetNumQueuedSegmentUpdate { get; set; } = null;
 
             void OnJetNumQueuedSegmentUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>> data)
             {
@@ -289,7 +291,7 @@ public virtual void OnJetNumQueuedSegmentUpdate(Android.Media.JetPlayer arg0, in
             /// Handler for <see href="https://developer.android.com/reference/android/media/JetPlayer.OnJetEventListener.html#onJetPauseUpdate(android.media.JetPlayer,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnJetPauseUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.JetPlayer, int> OnOnJetPauseUpdate { get; set; } = null;
+            public global::System.Action<Android.Media.JetPlayer, int> OnOnJetPauseUpdate { get; set; } = null;
 
             void OnJetPauseUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>> data)
             {
@@ -311,7 +313,7 @@ public virtual void OnJetPauseUpdate(Android.Media.JetPlayer arg0, int arg1)
             /// Handler for <see href="https://developer.android.com/reference/android/media/JetPlayer.OnJetEventListener.html#onJetUserIdUpdate(android.media.JetPlayer,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnJetUserIdUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.JetPlayer, int, int> OnOnJetUserIdUpdate { get; set; } = null;
+            public global::System.Action<Android.Media.JetPlayer, int, int> OnOnJetUserIdUpdate { get; set; } = null;
 
             void OnJetUserIdUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.JetPlayer>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaCas.cs b/src/net/Netdroid/Generated/Android/Media/MediaCas.cs
index 06598aab8..1cc11416a 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaCas.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaCas.cs
@@ -347,10 +347,10 @@ public partial class EventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>>>(OnEventEventHandler));
-                AddEventHandler("onPluginStatusUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>>>(OnPluginStatusUpdateEventHandler));
-                AddEventHandler("onResourceLost", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>>>(OnResourceLostEventHandler));
-                AddEventHandler("onSessionEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>>>(OnSessionEventEventHandler));
+                AddEventHandler("onEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>>>(OnEventEventHandler));
+                AddEventHandler("onPluginStatusUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>>>(OnPluginStatusUpdateEventHandler));
+                AddEventHandler("onResourceLost", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>>>(OnResourceLostEventHandler));
+                AddEventHandler("onSessionEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>>>(OnSessionEventEventHandler));
 
             }
 
@@ -358,7 +358,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaCas.EventListener.html#onEvent(android.media.MediaCas,int,int,byte[])"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaCas, int, int, byte[]> OnOnEvent { get; set; } = null;
+            public global::System.Action<Android.Media.MediaCas, int, int, byte[]> OnOnEvent { get; set; } = null;
 
             void OnEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>> data)
             {
@@ -393,7 +393,7 @@ public void OnPluginStatusUpdateDefault(Android.Media.MediaCas arg0, int arg1, i
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaCas.EventListener.html#onPluginStatusUpdate(android.media.MediaCas,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPluginStatusUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaCas, int, int> OnOnPluginStatusUpdate { get; set; } = null;
+            public global::System.Action<Android.Media.MediaCas, int, int> OnOnPluginStatusUpdate { get; set; } = null;
 
             void OnPluginStatusUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>> data)
             {
@@ -426,7 +426,7 @@ public void OnResourceLostDefault(Android.Media.MediaCas arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaCas.EventListener.html#onResourceLost(android.media.MediaCas)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnResourceLost"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaCas> OnOnResourceLost { get; set; } = null;
+            public global::System.Action<Android.Media.MediaCas> OnOnResourceLost { get; set; } = null;
 
             void OnResourceLostEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>> data)
             {
@@ -461,7 +461,7 @@ public void OnSessionEventDefault(Android.Media.MediaCas arg0, Android.Media.Med
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaCas.EventListener.html#onSessionEvent(android.media.MediaCas,android.media.MediaCas.Session,int,int,byte[])"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSessionEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaCas, Android.Media.MediaCas.Session, int, int, byte[]> OnOnSessionEvent { get; set; } = null;
+            public global::System.Action<Android.Media.MediaCas, Android.Media.MediaCas.Session, int, int, byte[]> OnOnSessionEvent { get; set; } = null;
 
             void OnSessionEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaCas>> data)
             {
@@ -586,18 +586,20 @@ public partial class PluginDescriptor
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCas.PluginDescriptor.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCas.PluginDescriptor.html#getSystemId()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="int"/></returns>
+            public int GetSystemId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getSystemId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCas.PluginDescriptor.html#getSystemId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCas.PluginDescriptor.html#getName()"/>
             /// </summary>
-            public int SystemId
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<int>("getSystemId", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -631,11 +633,12 @@ public partial class Session
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCas.Session.html#getSessionId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCas.Session.html#getSessionId()"/>
             /// </summary>
-            public byte[] SessionId
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetSessionId()
             {
-                get { return IExecuteWithSignatureArray<byte>("getSessionId", "()[B"); }
+                return IExecuteWithSignatureArray<byte>("getSessionId", "()[B");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCas.Session.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaCodec.cs b/src/net/Netdroid/Generated/Android/Media/MediaCodec.cs
index 45082a727..69ab8dd88 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaCodec.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaCodec.cs
@@ -70,7 +70,7 @@ public partial class MediaCodec
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#BUFFER_FLAG_SYNC_FRAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BUFFER_FLAG_SYNC_FRAME { get { if (!_BUFFER_FLAG_SYNC_FRAMEReady) { _BUFFER_FLAG_SYNC_FRAMEContent = SGetField<int>(LocalBridgeClazz, "BUFFER_FLAG_SYNC_FRAME"); _BUFFER_FLAG_SYNC_FRAMEReady = true; } return _BUFFER_FLAG_SYNC_FRAMEContent; } }
         private static int _BUFFER_FLAG_SYNC_FRAMEContent = default;
         private static bool _BUFFER_FLAG_SYNC_FRAMEReady = false; // this is used because in case of generics 
@@ -113,7 +113,7 @@ public partial class MediaCodec
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#INFO_OUTPUT_BUFFERS_CHANGED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int INFO_OUTPUT_BUFFERS_CHANGED { get { if (!_INFO_OUTPUT_BUFFERS_CHANGEDReady) { _INFO_OUTPUT_BUFFERS_CHANGEDContent = SGetField<int>(LocalBridgeClazz, "INFO_OUTPUT_BUFFERS_CHANGED"); _INFO_OUTPUT_BUFFERS_CHANGEDReady = true; } return _INFO_OUTPUT_BUFFERS_CHANGEDContent; } }
         private static int _INFO_OUTPUT_BUFFERS_CHANGEDContent = default;
         private static bool _INFO_OUTPUT_BUFFERS_CHANGEDReady = false; // this is used because in case of generics 
@@ -245,71 +245,6 @@ public static Android.View.Surface CreatePersistentInputSurface()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getCanonicalName()"/> 
-        /// </summary>
-        public Java.Lang.String CanonicalName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCanonicalName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getCodecInfo()"/> 
-        /// </summary>
-        public Android.Media.MediaCodecInfo CodecInfo
-        {
-            get { return IExecuteWithSignature<Android.Media.MediaCodecInfo>("getCodecInfo", "()Landroid/media/MediaCodecInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getInputBuffers()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Nio.ByteBuffer[] InputBuffers
-        {
-            get { return IExecuteWithSignatureArray<Java.Nio.ByteBuffer>("getInputBuffers", "()[Ljava/nio/ByteBuffer;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getInputFormat()"/> 
-        /// </summary>
-        public Android.Media.MediaFormat InputFormat
-        {
-            get { return IExecuteWithSignature<Android.Media.MediaFormat>("getInputFormat", "()Landroid/media/MediaFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getMetrics()"/> 
-        /// </summary>
-        public Android.Os.PersistableBundle Metrics
-        {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getOutputBuffers()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Nio.ByteBuffer[] OutputBuffers
-        {
-            get { return IExecuteWithSignatureArray<Java.Nio.ByteBuffer>("getOutputBuffers", "()[Ljava/nio/ByteBuffer;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getOutputFormat()"/> 
-        /// </summary>
-        public Android.Media.MediaFormat OutputFormat
-        {
-            get { return IExecuteWithSignature<Android.Media.MediaFormat>("getOutputFormat", "()Landroid/media/MediaFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getSupportedVendorParameters()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> SupportedVendorParameters
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedVendorParameters", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getInputImage(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -355,6 +290,30 @@ public Android.Media.MediaCodec.QueueRequest GetQueueRequest(int arg0)
             return IExecuteWithSignature<Android.Media.MediaCodec.QueueRequest>("getQueueRequest", "(I)Landroid/media/MediaCodec$QueueRequest;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getCodecInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.MediaCodecInfo"/></returns>
+        public Android.Media.MediaCodecInfo GetCodecInfo()
+        {
+            return IExecuteWithSignature<Android.Media.MediaCodecInfo>("getCodecInfo", "()Landroid/media/MediaCodecInfo;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getInputFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.MediaFormat"/></returns>
+        public Android.Media.MediaFormat GetInputFormat()
+        {
+            return IExecuteWithSignature<Android.Media.MediaFormat>("getInputFormat", "()Landroid/media/MediaFormat;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getOutputFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.MediaFormat"/></returns>
+        public Android.Media.MediaFormat GetOutputFormat()
+        {
+            return IExecuteWithSignature<Android.Media.MediaFormat>("getOutputFormat", "()Landroid/media/MediaFormat;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getOutputFormat(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -364,6 +323,14 @@ public Android.Media.MediaFormat GetOutputFormat(int arg0)
             return IExecuteWithSignature<Android.Media.MediaFormat>("getOutputFormat", "(I)Landroid/media/MediaFormat;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getMetrics()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetMetrics()
+        {
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#dequeueInputBuffer(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -383,6 +350,14 @@ public int DequeueOutputBuffer(Android.Media.MediaCodec.BufferInfo arg0, long ar
             return IExecute<int>("dequeueOutputBuffer", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getInputBuffer(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -401,6 +376,32 @@ public Java.Nio.ByteBuffer GetOutputBuffer(int arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("getOutputBuffer", "(I)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getInputBuffers()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
+        [global::System.Obsolete()]
+        public Java.Nio.ByteBuffer[] GetInputBuffers()
+        {
+            return IExecuteWithSignatureArray<Java.Nio.ByteBuffer>("getInputBuffers", "()[Ljava/nio/ByteBuffer;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getOutputBuffers()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
+        [global::System.Obsolete()]
+        public Java.Nio.ByteBuffer[] GetOutputBuffers()
+        {
+            return IExecuteWithSignatureArray<Java.Nio.ByteBuffer>("getOutputBuffers", "()[Ljava/nio/ByteBuffer;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getSupportedVendorParameters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetSupportedVendorParameters()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedVendorParameters", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#createInputSurface()"/>
         /// </summary>
         /// <returns><see cref="Android.View.Surface"/></returns>
@@ -409,6 +410,14 @@ public Android.View.Surface CreateInputSurface()
             return IExecuteWithSignature<Android.View.Surface>("createInputSurface", "()Landroid/view/Surface;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#getCanonicalName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCanonicalName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCanonicalName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodec.html#setVideoScalingMode(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -853,11 +862,12 @@ public partial class CryptoInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.html#getPattern()"/> <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.html#setPattern(android.media.MediaCodec.CryptoInfo.Pattern)"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.html#getPattern()"/>
             /// </summary>
-            public Android.Media.MediaCodec.CryptoInfo.Pattern Pattern
+            /// <returns><see cref="Android.Media.MediaCodec.CryptoInfo.Pattern"/></returns>
+            public Android.Media.MediaCodec.CryptoInfo.Pattern GetPattern()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaCodec.CryptoInfo.Pattern>("getPattern", "()Landroid/media/MediaCodec$CryptoInfo$Pattern;"); } set { IExecuteWithSignature("setPattern", "(Landroid/media/MediaCodec$CryptoInfo$Pattern;)V", value); }
+                return IExecuteWithSignature<Android.Media.MediaCodec.CryptoInfo.Pattern>("getPattern", "()Landroid/media/MediaCodec$CryptoInfo$Pattern;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.html#set(int,int[],int[],byte[],byte[],int)"/>
@@ -872,6 +882,14 @@ public void Set(int arg0, int[] arg1, int[] arg2, byte[] arg3, byte[] arg4, int
             {
                 IExecute("set", arg0, arg1, arg2, arg3, arg4, arg5);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.html#setPattern(android.media.MediaCodec.CryptoInfo.Pattern)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Android.Media.MediaCodec.CryptoInfo.Pattern"/></param>
+            public void SetPattern(Android.Media.MediaCodec.CryptoInfo.Pattern arg0)
+            {
+                IExecuteWithSignature("setPattern", "(Landroid/media/MediaCodec$CryptoInfo$Pattern;)V", arg0);
+            }
 
             #endregion
 
@@ -906,18 +924,20 @@ public Pattern(int arg0, int arg1)
 
                 #region Instance methods
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.Pattern.html#getEncryptBlocks()"/> 
+                /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.Pattern.html#getEncryptBlocks()"/>
                 /// </summary>
-                public int EncryptBlocks
+                /// <returns><see cref="int"/></returns>
+                public int GetEncryptBlocks()
                 {
-                    get { return IExecuteWithSignature<int>("getEncryptBlocks", "()I"); }
+                    return IExecuteWithSignature<int>("getEncryptBlocks", "()I");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.Pattern.html#getSkipBlocks()"/> 
+                /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.Pattern.html#getSkipBlocks()"/>
                 /// </summary>
-                public int SkipBlocks
+                /// <returns><see cref="int"/></returns>
+                public int GetSkipBlocks()
                 {
-                    get { return IExecuteWithSignature<int>("getSkipBlocks", "()I"); }
+                    return IExecuteWithSignature<int>("getSkipBlocks", "()I");
                 }
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/media/MediaCodec.CryptoInfo.Pattern.html#set(int,int)"/>
@@ -1197,7 +1217,7 @@ public partial class OnFirstTunnelFrameReadyListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFirstTunnelFrameReady", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCodec>>>(OnFirstTunnelFrameReadyEventHandler));
+                AddEventHandler("onFirstTunnelFrameReady", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCodec>>>(OnFirstTunnelFrameReadyEventHandler));
 
             }
 
@@ -1205,7 +1225,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaCodec.OnFirstTunnelFrameReadyListener.html#onFirstTunnelFrameReady(android.media.MediaCodec)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFirstTunnelFrameReady"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaCodec> OnOnFirstTunnelFrameReady { get; set; } = null;
+            public global::System.Action<Android.Media.MediaCodec> OnOnFirstTunnelFrameReady { get; set; } = null;
 
             void OnFirstTunnelFrameReadyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaCodec>> data)
             {
@@ -1296,7 +1316,7 @@ public partial class OnFrameRenderedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFrameRendered", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCodec>>>(OnFrameRenderedEventHandler));
+                AddEventHandler("onFrameRendered", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaCodec>>>(OnFrameRenderedEventHandler));
 
             }
 
@@ -1304,7 +1324,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaCodec.OnFrameRenderedListener.html#onFrameRendered(android.media.MediaCodec,long,long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFrameRendered"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaCodec, long, long> OnOnFrameRendered { get; set; } = null;
+            public global::System.Action<Android.Media.MediaCodec, long, long> OnOnFrameRendered { get; set; } = null;
 
             void OnFrameRenderedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaCodec>> data)
             {
@@ -1395,46 +1415,52 @@ public partial class OutputFrame
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getChangedKeys()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getHardwareBuffer()"/>
             /// </summary>
-            public Java.Util.Set<Java.Lang.String> ChangedKeys
+            /// <returns><see cref="Android.Hardware.HardwareBuffer"/></returns>
+            public Android.Hardware.HardwareBuffer GetHardwareBuffer()
             {
-                get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getChangedKeys", "()Ljava/util/Set;"); }
+                return IExecuteWithSignature<Android.Hardware.HardwareBuffer>("getHardwareBuffer", "()Landroid/hardware/HardwareBuffer;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getFlags()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getLinearBlock()"/>
             /// </summary>
-            public int Flags
+            /// <returns><see cref="Android.Media.MediaCodec.LinearBlock"/></returns>
+            public Android.Media.MediaCodec.LinearBlock GetLinearBlock()
             {
-                get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+                return IExecuteWithSignature<Android.Media.MediaCodec.LinearBlock>("getLinearBlock", "()Landroid/media/MediaCodec$LinearBlock;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getFormat()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getFormat()"/>
             /// </summary>
-            public Android.Media.MediaFormat Format
+            /// <returns><see cref="Android.Media.MediaFormat"/></returns>
+            public Android.Media.MediaFormat GetFormat()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaFormat>("getFormat", "()Landroid/media/MediaFormat;"); }
+                return IExecuteWithSignature<Android.Media.MediaFormat>("getFormat", "()Landroid/media/MediaFormat;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getLinearBlock()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getFlags()"/>
             /// </summary>
-            public Android.Media.MediaCodec.LinearBlock GetLinearBlock
+            /// <returns><see cref="int"/></returns>
+            public int GetFlags()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaCodec.LinearBlock>("getLinearBlock", "()Landroid/media/MediaCodec$LinearBlock;"); }
+                return IExecuteWithSignature<int>("getFlags", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getHardwareBuffer()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getChangedKeys()"/>
             /// </summary>
-            public Android.Hardware.HardwareBuffer HardwareBuffer
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Java.Lang.String> GetChangedKeys()
             {
-                get { return IExecuteWithSignature<Android.Hardware.HardwareBuffer>("getHardwareBuffer", "()Landroid/hardware/HardwareBuffer;"); }
+                return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getChangedKeys", "()Ljava/util/Set;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getPresentationTimeUs()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.OutputFrame.html#getPresentationTimeUs()"/>
             /// </summary>
-            public long PresentationTimeUs
+            /// <returns><see cref="long"/></returns>
+            public long GetPresentationTimeUs()
             {
-                get { return IExecuteWithSignature<long>("getPresentationTimeUs", "()J"); }
+                return IExecuteWithSignature<long>("getPresentationTimeUs", "()J");
             }
 
             #endregion
@@ -1468,18 +1494,20 @@ public partial class ParameterDescriptor
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.ParameterDescriptor.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.ParameterDescriptor.html#getType()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="int"/></returns>
+            public int GetType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.ParameterDescriptor.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodec.ParameterDescriptor.html#getName()"/>
             /// </summary>
-            public int Type
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<int>("getType", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaCodecInfo.cs b/src/net/Netdroid/Generated/Android/Media/MediaCodecInfo.cs
index 88d73bc49..916095227 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaCodecInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaCodecInfo.cs
@@ -46,27 +46,6 @@ public partial class MediaCodecInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.html#getCanonicalName()"/> 
-        /// </summary>
-        public Java.Lang.String CanonicalName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCanonicalName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.html#getSupportedTypes()"/> 
-        /// </summary>
-        public Java.Lang.String[] SupportedTypes
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedTypes", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.html#getCapabilitiesForType(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -115,6 +94,30 @@ public bool IsVendor()
         {
             return IExecuteWithSignature<bool>("isVendor", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.html#getCanonicalName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCanonicalName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCanonicalName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.html#getSupportedTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedTypes()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedTypes", "()[Ljava/lang/String;");
+        }
 
         #endregion
 
@@ -140,34 +143,37 @@ public partial class AudioCapabilities
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.AudioCapabilities.html#getMaxInputChannelCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.AudioCapabilities.html#isSampleRateSupported(int)"/>
             /// </summary>
-            public int MaxInputChannelCount
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="bool"/></returns>
+            public bool IsSampleRateSupported(int arg0)
             {
-                get { return IExecuteWithSignature<int>("getMaxInputChannelCount", "()I"); }
+                return IExecuteWithSignature<bool>("isSampleRateSupported", "(I)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.AudioCapabilities.html#getMinInputChannelCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.AudioCapabilities.html#getMaxInputChannelCount()"/>
             /// </summary>
-            public int MinInputChannelCount
+            /// <returns><see cref="int"/></returns>
+            public int GetMaxInputChannelCount()
             {
-                get { return IExecuteWithSignature<int>("getMinInputChannelCount", "()I"); }
+                return IExecuteWithSignature<int>("getMaxInputChannelCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.AudioCapabilities.html#getSupportedSampleRates()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.AudioCapabilities.html#getMinInputChannelCount()"/>
             /// </summary>
-            public int[] SupportedSampleRates
+            /// <returns><see cref="int"/></returns>
+            public int GetMinInputChannelCount()
             {
-                get { return IExecuteWithSignatureArray<int>("getSupportedSampleRates", "()[I"); }
+                return IExecuteWithSignature<int>("getMinInputChannelCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.AudioCapabilities.html#isSampleRateSupported(int)"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.AudioCapabilities.html#getSupportedSampleRates()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsSampleRateSupported(int arg0)
+            /// <returns><see cref="int"/></returns>
+            public int[] GetSupportedSampleRates()
             {
-                return IExecuteWithSignature<bool>("isSampleRateSupported", "(I)Z", arg0);
+                return IExecuteWithSignatureArray<int>("getSupportedSampleRates", "()[I");
             }
 
             #endregion
@@ -203,28 +209,28 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format12bitRGB444"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format12bitRGB444 { get { if (!_COLOR_Format12bitRGB444Ready) { _COLOR_Format12bitRGB444Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format12bitRGB444"); _COLOR_Format12bitRGB444Ready = true; } return _COLOR_Format12bitRGB444Content; } }
             private static int _COLOR_Format12bitRGB444Content = default;
             private static bool _COLOR_Format12bitRGB444Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format16bitARGB1555"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format16bitARGB1555 { get { if (!_COLOR_Format16bitARGB1555Ready) { _COLOR_Format16bitARGB1555Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format16bitARGB1555"); _COLOR_Format16bitARGB1555Ready = true; } return _COLOR_Format16bitARGB1555Content; } }
             private static int _COLOR_Format16bitARGB1555Content = default;
             private static bool _COLOR_Format16bitARGB1555Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format16bitARGB4444"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format16bitARGB4444 { get { if (!_COLOR_Format16bitARGB4444Ready) { _COLOR_Format16bitARGB4444Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format16bitARGB4444"); _COLOR_Format16bitARGB4444Ready = true; } return _COLOR_Format16bitARGB4444Content; } }
             private static int _COLOR_Format16bitARGB4444Content = default;
             private static bool _COLOR_Format16bitARGB4444Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format16bitBGR565"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format16bitBGR565 { get { if (!_COLOR_Format16bitBGR565Ready) { _COLOR_Format16bitBGR565Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format16bitBGR565"); _COLOR_Format16bitBGR565Ready = true; } return _COLOR_Format16bitBGR565Content; } }
             private static int _COLOR_Format16bitBGR565Content = default;
             private static bool _COLOR_Format16bitBGR565Ready = false; // this is used because in case of generics 
@@ -237,49 +243,49 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format18bitARGB1665"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format18bitARGB1665 { get { if (!_COLOR_Format18bitARGB1665Ready) { _COLOR_Format18bitARGB1665Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format18bitARGB1665"); _COLOR_Format18bitARGB1665Ready = true; } return _COLOR_Format18bitARGB1665Content; } }
             private static int _COLOR_Format18bitARGB1665Content = default;
             private static bool _COLOR_Format18bitARGB1665Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format18BitBGR666"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format18BitBGR666 { get { if (!_COLOR_Format18BitBGR666Ready) { _COLOR_Format18BitBGR666Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format18BitBGR666"); _COLOR_Format18BitBGR666Ready = true; } return _COLOR_Format18BitBGR666Content; } }
             private static int _COLOR_Format18BitBGR666Content = default;
             private static bool _COLOR_Format18BitBGR666Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format18bitRGB666"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format18bitRGB666 { get { if (!_COLOR_Format18bitRGB666Ready) { _COLOR_Format18bitRGB666Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format18bitRGB666"); _COLOR_Format18bitRGB666Ready = true; } return _COLOR_Format18bitRGB666Content; } }
             private static int _COLOR_Format18bitRGB666Content = default;
             private static bool _COLOR_Format18bitRGB666Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format19bitARGB1666"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format19bitARGB1666 { get { if (!_COLOR_Format19bitARGB1666Ready) { _COLOR_Format19bitARGB1666Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format19bitARGB1666"); _COLOR_Format19bitARGB1666Ready = true; } return _COLOR_Format19bitARGB1666Content; } }
             private static int _COLOR_Format19bitARGB1666Content = default;
             private static bool _COLOR_Format19bitARGB1666Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format24BitABGR6666"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format24BitABGR6666 { get { if (!_COLOR_Format24BitABGR6666Ready) { _COLOR_Format24BitABGR6666Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format24BitABGR6666"); _COLOR_Format24BitABGR6666Ready = true; } return _COLOR_Format24BitABGR6666Content; } }
             private static int _COLOR_Format24BitABGR6666Content = default;
             private static bool _COLOR_Format24BitABGR6666Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format24bitARGB1887"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format24bitARGB1887 { get { if (!_COLOR_Format24bitARGB1887Ready) { _COLOR_Format24bitARGB1887Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format24bitARGB1887"); _COLOR_Format24bitARGB1887Ready = true; } return _COLOR_Format24bitARGB1887Content; } }
             private static int _COLOR_Format24bitARGB1887Content = default;
             private static bool _COLOR_Format24bitARGB1887Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format24BitARGB6666"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format24BitARGB6666 { get { if (!_COLOR_Format24BitARGB6666Ready) { _COLOR_Format24BitARGB6666Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format24BitARGB6666"); _COLOR_Format24BitARGB6666Ready = true; } return _COLOR_Format24BitARGB6666Content; } }
             private static int _COLOR_Format24BitARGB6666Content = default;
             private static bool _COLOR_Format24BitARGB6666Ready = false; // this is used because in case of generics 
@@ -292,14 +298,14 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format24bitRGB888"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format24bitRGB888 { get { if (!_COLOR_Format24bitRGB888Ready) { _COLOR_Format24bitRGB888Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format24bitRGB888"); _COLOR_Format24bitRGB888Ready = true; } return _COLOR_Format24bitRGB888Content; } }
             private static int _COLOR_Format24bitRGB888Content = default;
             private static bool _COLOR_Format24bitRGB888Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format25bitARGB1888"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format25bitARGB1888 { get { if (!_COLOR_Format25bitARGB1888Ready) { _COLOR_Format25bitARGB1888Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format25bitARGB1888"); _COLOR_Format25bitARGB1888Ready = true; } return _COLOR_Format25bitARGB1888Content; } }
             private static int _COLOR_Format25bitARGB1888Content = default;
             private static bool _COLOR_Format25bitARGB1888Ready = false; // this is used because in case of generics 
@@ -318,14 +324,14 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format32bitARGB8888"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format32bitARGB8888 { get { if (!_COLOR_Format32bitARGB8888Ready) { _COLOR_Format32bitARGB8888Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format32bitARGB8888"); _COLOR_Format32bitARGB8888Ready = true; } return _COLOR_Format32bitARGB8888Content; } }
             private static int _COLOR_Format32bitARGB8888Content = default;
             private static bool _COLOR_Format32bitARGB8888Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format32bitBGRA8888"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format32bitBGRA8888 { get { if (!_COLOR_Format32bitBGRA8888Ready) { _COLOR_Format32bitBGRA8888Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format32bitBGRA8888"); _COLOR_Format32bitBGRA8888Ready = true; } return _COLOR_Format32bitBGRA8888Content; } }
             private static int _COLOR_Format32bitBGRA8888Content = default;
             private static bool _COLOR_Format32bitBGRA8888Ready = false; // this is used because in case of generics 
@@ -338,21 +344,21 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_Format8bitRGB332"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_Format8bitRGB332 { get { if (!_COLOR_Format8bitRGB332Ready) { _COLOR_Format8bitRGB332Content = SGetField<int>(LocalBridgeClazz, "COLOR_Format8bitRGB332"); _COLOR_Format8bitRGB332Ready = true; } return _COLOR_Format8bitRGB332Content; } }
             private static int _COLOR_Format8bitRGB332Content = default;
             private static bool _COLOR_Format8bitRGB332Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatCbYCrY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatCbYCrY { get { if (!_COLOR_FormatCbYCrYReady) { _COLOR_FormatCbYCrYContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatCbYCrY"); _COLOR_FormatCbYCrYReady = true; } return _COLOR_FormatCbYCrYContent; } }
             private static int _COLOR_FormatCbYCrYContent = default;
             private static bool _COLOR_FormatCbYCrYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatCrYCbY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatCrYCbY { get { if (!_COLOR_FormatCrYCbYReady) { _COLOR_FormatCrYCbYContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatCrYCbY"); _COLOR_FormatCrYCbYReady = true; } return _COLOR_FormatCrYCbYContent; } }
             private static int _COLOR_FormatCrYCbYContent = default;
             private static bool _COLOR_FormatCrYCbYReady = false; // this is used because in case of generics 
@@ -365,28 +371,28 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatL2"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatL2 { get { if (!_COLOR_FormatL2Ready) { _COLOR_FormatL2Content = SGetField<int>(LocalBridgeClazz, "COLOR_FormatL2"); _COLOR_FormatL2Ready = true; } return _COLOR_FormatL2Content; } }
             private static int _COLOR_FormatL2Content = default;
             private static bool _COLOR_FormatL2Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatL24"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatL24 { get { if (!_COLOR_FormatL24Ready) { _COLOR_FormatL24Content = SGetField<int>(LocalBridgeClazz, "COLOR_FormatL24"); _COLOR_FormatL24Ready = true; } return _COLOR_FormatL24Content; } }
             private static int _COLOR_FormatL24Content = default;
             private static bool _COLOR_FormatL24Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatL32"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatL32 { get { if (!_COLOR_FormatL32Ready) { _COLOR_FormatL32Content = SGetField<int>(LocalBridgeClazz, "COLOR_FormatL32"); _COLOR_FormatL32Ready = true; } return _COLOR_FormatL32Content; } }
             private static int _COLOR_FormatL32Content = default;
             private static bool _COLOR_FormatL32Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatL4"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatL4 { get { if (!_COLOR_FormatL4Ready) { _COLOR_FormatL4Content = SGetField<int>(LocalBridgeClazz, "COLOR_FormatL4"); _COLOR_FormatL4Ready = true; } return _COLOR_FormatL4Content; } }
             private static int _COLOR_FormatL4Content = default;
             private static bool _COLOR_FormatL4Ready = false; // this is used because in case of generics 
@@ -399,7 +405,7 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatMonochrome"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatMonochrome { get { if (!_COLOR_FormatMonochromeReady) { _COLOR_FormatMonochromeContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatMonochrome"); _COLOR_FormatMonochromeReady = true; } return _COLOR_FormatMonochromeContent; } }
             private static int _COLOR_FormatMonochromeContent = default;
             private static bool _COLOR_FormatMonochromeReady = false; // this is used because in case of generics 
@@ -442,28 +448,28 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYCbYCr"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYCbYCr { get { if (!_COLOR_FormatYCbYCrReady) { _COLOR_FormatYCbYCrContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYCbYCr"); _COLOR_FormatYCbYCrReady = true; } return _COLOR_FormatYCbYCrContent; } }
             private static int _COLOR_FormatYCbYCrContent = default;
             private static bool _COLOR_FormatYCbYCrReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYCrYCb"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYCrYCb { get { if (!_COLOR_FormatYCrYCbReady) { _COLOR_FormatYCrYCbContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYCrYCb"); _COLOR_FormatYCrYCbReady = true; } return _COLOR_FormatYCrYCbContent; } }
             private static int _COLOR_FormatYCrYCbContent = default;
             private static bool _COLOR_FormatYCrYCbReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV411PackedPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV411PackedPlanar { get { if (!_COLOR_FormatYUV411PackedPlanarReady) { _COLOR_FormatYUV411PackedPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV411PackedPlanar"); _COLOR_FormatYUV411PackedPlanarReady = true; } return _COLOR_FormatYUV411PackedPlanarContent; } }
             private static int _COLOR_FormatYUV411PackedPlanarContent = default;
             private static bool _COLOR_FormatYUV411PackedPlanarReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV411Planar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV411Planar { get { if (!_COLOR_FormatYUV411PlanarReady) { _COLOR_FormatYUV411PlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV411Planar"); _COLOR_FormatYUV411PlanarReady = true; } return _COLOR_FormatYUV411PlanarContent; } }
             private static int _COLOR_FormatYUV411PlanarContent = default;
             private static bool _COLOR_FormatYUV411PlanarReady = false; // this is used because in case of generics 
@@ -476,28 +482,28 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV420PackedPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV420PackedPlanar { get { if (!_COLOR_FormatYUV420PackedPlanarReady) { _COLOR_FormatYUV420PackedPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV420PackedPlanar"); _COLOR_FormatYUV420PackedPlanarReady = true; } return _COLOR_FormatYUV420PackedPlanarContent; } }
             private static int _COLOR_FormatYUV420PackedPlanarContent = default;
             private static bool _COLOR_FormatYUV420PackedPlanarReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV420PackedSemiPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV420PackedSemiPlanar { get { if (!_COLOR_FormatYUV420PackedSemiPlanarReady) { _COLOR_FormatYUV420PackedSemiPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV420PackedSemiPlanar"); _COLOR_FormatYUV420PackedSemiPlanarReady = true; } return _COLOR_FormatYUV420PackedSemiPlanarContent; } }
             private static int _COLOR_FormatYUV420PackedSemiPlanarContent = default;
             private static bool _COLOR_FormatYUV420PackedSemiPlanarReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV420Planar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV420Planar { get { if (!_COLOR_FormatYUV420PlanarReady) { _COLOR_FormatYUV420PlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV420Planar"); _COLOR_FormatYUV420PlanarReady = true; } return _COLOR_FormatYUV420PlanarContent; } }
             private static int _COLOR_FormatYUV420PlanarContent = default;
             private static bool _COLOR_FormatYUV420PlanarReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV420SemiPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV420SemiPlanar { get { if (!_COLOR_FormatYUV420SemiPlanarReady) { _COLOR_FormatYUV420SemiPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV420SemiPlanar"); _COLOR_FormatYUV420SemiPlanarReady = true; } return _COLOR_FormatYUV420SemiPlanarContent; } }
             private static int _COLOR_FormatYUV420SemiPlanarContent = default;
             private static bool _COLOR_FormatYUV420SemiPlanarReady = false; // this is used because in case of generics 
@@ -510,28 +516,28 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV422PackedPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV422PackedPlanar { get { if (!_COLOR_FormatYUV422PackedPlanarReady) { _COLOR_FormatYUV422PackedPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV422PackedPlanar"); _COLOR_FormatYUV422PackedPlanarReady = true; } return _COLOR_FormatYUV422PackedPlanarContent; } }
             private static int _COLOR_FormatYUV422PackedPlanarContent = default;
             private static bool _COLOR_FormatYUV422PackedPlanarReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV422PackedSemiPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV422PackedSemiPlanar { get { if (!_COLOR_FormatYUV422PackedSemiPlanarReady) { _COLOR_FormatYUV422PackedSemiPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV422PackedSemiPlanar"); _COLOR_FormatYUV422PackedSemiPlanarReady = true; } return _COLOR_FormatYUV422PackedSemiPlanarContent; } }
             private static int _COLOR_FormatYUV422PackedSemiPlanarContent = default;
             private static bool _COLOR_FormatYUV422PackedSemiPlanarReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV422Planar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV422Planar { get { if (!_COLOR_FormatYUV422PlanarReady) { _COLOR_FormatYUV422PlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV422Planar"); _COLOR_FormatYUV422PlanarReady = true; } return _COLOR_FormatYUV422PlanarContent; } }
             private static int _COLOR_FormatYUV422PlanarContent = default;
             private static bool _COLOR_FormatYUV422PlanarReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV422SemiPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV422SemiPlanar { get { if (!_COLOR_FormatYUV422SemiPlanarReady) { _COLOR_FormatYUV422SemiPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV422SemiPlanar"); _COLOR_FormatYUV422SemiPlanarReady = true; } return _COLOR_FormatYUV422SemiPlanarContent; } }
             private static int _COLOR_FormatYUV422SemiPlanarContent = default;
             private static bool _COLOR_FormatYUV422SemiPlanarReady = false; // this is used because in case of generics 
@@ -544,7 +550,7 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_FormatYUV444Interleaved"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_FormatYUV444Interleaved { get { if (!_COLOR_FormatYUV444InterleavedReady) { _COLOR_FormatYUV444InterleavedContent = SGetField<int>(LocalBridgeClazz, "COLOR_FormatYUV444Interleaved"); _COLOR_FormatYUV444InterleavedReady = true; } return _COLOR_FormatYUV444InterleavedContent; } }
             private static int _COLOR_FormatYUV444InterleavedContent = default;
             private static bool _COLOR_FormatYUV444InterleavedReady = false; // this is used because in case of generics 
@@ -557,14 +563,14 @@ public partial class CodecCapabilities
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_QCOM_FormatYUV420SemiPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_QCOM_FormatYUV420SemiPlanar { get { if (!_COLOR_QCOM_FormatYUV420SemiPlanarReady) { _COLOR_QCOM_FormatYUV420SemiPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_QCOM_FormatYUV420SemiPlanar"); _COLOR_QCOM_FormatYUV420SemiPlanarReady = true; } return _COLOR_QCOM_FormatYUV420SemiPlanarContent; } }
             private static int _COLOR_QCOM_FormatYUV420SemiPlanarContent = default;
             private static bool _COLOR_QCOM_FormatYUV420SemiPlanarReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#COLOR_TI_FormatYUV420PackedSemiPlanar"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int COLOR_TI_FormatYUV420PackedSemiPlanar { get { if (!_COLOR_TI_FormatYUV420PackedSemiPlanarReady) { _COLOR_TI_FormatYUV420PackedSemiPlanarContent = SGetField<int>(LocalBridgeClazz, "COLOR_TI_FormatYUV420PackedSemiPlanar"); _COLOR_TI_FormatYUV420PackedSemiPlanarReady = true; } return _COLOR_TI_FormatYUV420PackedSemiPlanarContent; } }
             private static int _COLOR_TI_FormatYUV420PackedSemiPlanarContent = default;
             private static bool _COLOR_TI_FormatYUV420PackedSemiPlanarReady = false; // this is used because in case of generics 
@@ -660,46 +666,36 @@ public static Android.Media.MediaCodecInfo.CodecCapabilities CreateFromProfileLe
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getDefaultFormat()"/> 
-            /// </summary>
-            public Android.Media.MediaFormat DefaultFormat
-            {
-                get { return IExecuteWithSignature<Android.Media.MediaFormat>("getDefaultFormat", "()Landroid/media/MediaFormat;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getAudioCapabilities()"/> 
-            /// </summary>
-            public Android.Media.MediaCodecInfo.AudioCapabilities GetAudioCapabilities
-            {
-                get { return IExecuteWithSignature<Android.Media.MediaCodecInfo.AudioCapabilities>("getAudioCapabilities", "()Landroid/media/MediaCodecInfo$AudioCapabilities;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getEncoderCapabilities()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getAudioCapabilities()"/>
             /// </summary>
-            public Android.Media.MediaCodecInfo.EncoderCapabilities GetEncoderCapabilities
+            /// <returns><see cref="Android.Media.MediaCodecInfo.AudioCapabilities"/></returns>
+            public Android.Media.MediaCodecInfo.AudioCapabilities GetAudioCapabilities()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaCodecInfo.EncoderCapabilities>("getEncoderCapabilities", "()Landroid/media/MediaCodecInfo$EncoderCapabilities;"); }
+                return IExecuteWithSignature<Android.Media.MediaCodecInfo.AudioCapabilities>("getAudioCapabilities", "()Landroid/media/MediaCodecInfo$AudioCapabilities;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getVideoCapabilities()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getEncoderCapabilities()"/>
             /// </summary>
-            public Android.Media.MediaCodecInfo.VideoCapabilities GetVideoCapabilities
+            /// <returns><see cref="Android.Media.MediaCodecInfo.EncoderCapabilities"/></returns>
+            public Android.Media.MediaCodecInfo.EncoderCapabilities GetEncoderCapabilities()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaCodecInfo.VideoCapabilities>("getVideoCapabilities", "()Landroid/media/MediaCodecInfo$VideoCapabilities;"); }
+                return IExecuteWithSignature<Android.Media.MediaCodecInfo.EncoderCapabilities>("getEncoderCapabilities", "()Landroid/media/MediaCodecInfo$EncoderCapabilities;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getMaxSupportedInstances()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getVideoCapabilities()"/>
             /// </summary>
-            public int MaxSupportedInstances
+            /// <returns><see cref="Android.Media.MediaCodecInfo.VideoCapabilities"/></returns>
+            public Android.Media.MediaCodecInfo.VideoCapabilities GetVideoCapabilities()
             {
-                get { return IExecuteWithSignature<int>("getMaxSupportedInstances", "()I"); }
+                return IExecuteWithSignature<Android.Media.MediaCodecInfo.VideoCapabilities>("getVideoCapabilities", "()Landroid/media/MediaCodecInfo$VideoCapabilities;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getMimeType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getDefaultFormat()"/>
             /// </summary>
-            public Java.Lang.String MimeType
+            /// <returns><see cref="Android.Media.MediaFormat"/></returns>
+            public Android.Media.MediaFormat GetDefaultFormat()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Media.MediaFormat>("getDefaultFormat", "()Landroid/media/MediaFormat;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#isFeatureRequired(java.lang.String)"/>
@@ -728,6 +724,22 @@ public bool IsFormatSupported(Android.Media.MediaFormat arg0)
             {
                 return IExecuteWithSignature<bool>("isFormatSupported", "(Landroid/media/MediaFormat;)Z", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getMaxSupportedInstances()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetMaxSupportedInstances()
+            {
+                return IExecuteWithSignature<int>("getMaxSupportedInstances", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#getMimeType()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetMimeType()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
+            }
 
             #endregion
 
@@ -2177,27 +2189,6 @@ public partial class VideoCapabilities
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.VideoCapabilities.html#getHeightAlignment()"/> 
-            /// </summary>
-            public int HeightAlignment
-            {
-                get { return IExecuteWithSignature<int>("getHeightAlignment", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.VideoCapabilities.html#getSupportedPerformancePoints()"/> 
-            /// </summary>
-            public Java.Util.List<Android.Media.MediaCodecInfo.VideoCapabilities.PerformancePoint> SupportedPerformancePoints
-            {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaCodecInfo.VideoCapabilities.PerformancePoint>>("getSupportedPerformancePoints", "()Ljava/util/List;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.VideoCapabilities.html#getWidthAlignment()"/> 
-            /// </summary>
-            public int WidthAlignment
-            {
-                get { return IExecuteWithSignature<int>("getWidthAlignment", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.VideoCapabilities.html#areSizeAndRateSupported(int,int,double)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -2218,6 +2209,30 @@ public bool IsSizeSupported(int arg0, int arg1)
             {
                 return IExecute<bool>("isSizeSupported", arg0, arg1);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.VideoCapabilities.html#getHeightAlignment()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetHeightAlignment()
+            {
+                return IExecuteWithSignature<int>("getHeightAlignment", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.VideoCapabilities.html#getWidthAlignment()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetWidthAlignment()
+            {
+                return IExecuteWithSignature<int>("getWidthAlignment", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaCodecInfo.VideoCapabilities.html#getSupportedPerformancePoints()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.Media.MediaCodecInfo.VideoCapabilities.PerformancePoint> GetSupportedPerformancePoints()
+            {
+                return IExecuteWithSignature<Java.Util.List<Android.Media.MediaCodecInfo.VideoCapabilities.PerformancePoint>>("getSupportedPerformancePoints", "()Ljava/util/List;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaCodecList.cs b/src/net/Netdroid/Generated/Android/Media/MediaCodecList.cs
index 8fadb4042..6aadb0227 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaCodecList.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaCodecList.cs
@@ -62,33 +62,35 @@ public MediaCodecList(int arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodecList.html#getCodecCount()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static int CodecCount
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getCodecCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodecList.html#getCodecInfoAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Media.MediaCodecInfo"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Media.MediaCodecInfo GetCodecInfoAt(int arg0)
         {
             return SExecuteWithSignature<Android.Media.MediaCodecInfo>(LocalBridgeClazz, "getCodecInfoAt", "(I)Landroid/media/MediaCodecInfo;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodecList.html#getCodecCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetCodecCount()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getCodecCount", "()I");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCodecList.html#getCodecInfos()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaCodecList.html#getCodecInfos()"/>
         /// </summary>
-        public Android.Media.MediaCodecInfo[] CodecInfos
+        /// <returns><see cref="Android.Media.MediaCodecInfo"/></returns>
+        public Android.Media.MediaCodecInfo[] GetCodecInfos()
         {
-            get { return IExecuteWithSignatureArray<Android.Media.MediaCodecInfo>("getCodecInfos", "()[Landroid/media/MediaCodecInfo;"); }
+            return IExecuteWithSignatureArray<Android.Media.MediaCodecInfo>("getCodecInfos", "()[Landroid/media/MediaCodecInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaCodecList.html#findDecoderForFormat(android.media.MediaFormat)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaCommunicationManager.cs b/src/net/Netdroid/Generated/Android/Media/MediaCommunicationManager.cs
index c7b529fe4..988099f0f 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaCommunicationManager.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaCommunicationManager.cs
@@ -46,18 +46,20 @@ public partial class MediaCommunicationManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCommunicationManager.html#getSession2Tokens()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaCommunicationManager.html#getVersion()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.Session2Token> Session2Tokens
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Session2Token>>("getSession2Tokens", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaCommunicationManager.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaCommunicationManager.html#getSession2Tokens()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Session2Token> GetSession2Tokens()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Session2Token>>("getSession2Tokens", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaController2.cs b/src/net/Netdroid/Generated/Android/Media/MediaController2.cs
index 365421c24..4644fb5b1 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaController2.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaController2.cs
@@ -46,11 +46,12 @@ public partial class MediaController2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaController2.html#getConnectedToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaController2.html#getConnectedToken()"/>
         /// </summary>
-        public Android.Media.Session2Token ConnectedToken
+        /// <returns><see cref="Android.Media.Session2Token"/></returns>
+        public Android.Media.Session2Token GetConnectedToken()
         {
-            get { return IExecuteWithSignature<Android.Media.Session2Token>("getConnectedToken", "()Landroid/media/Session2Token;"); }
+            return IExecuteWithSignature<Android.Media.Session2Token>("getConnectedToken", "()Landroid/media/Session2Token;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaController2.html#isPlaybackActive()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaDataSource.cs b/src/net/Netdroid/Generated/Android/Media/MediaDataSource.cs
index 69be0410c..0ee16a0bd 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaDataSource.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaDataSource.cs
@@ -46,13 +46,6 @@ public partial class MediaDataSource
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDataSource.html#getSize()"/> 
-        /// </summary>
-        public long Size
-        {
-            get { return IExecuteWithSignature<long>("getSize", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDataSource.html#readAt(long,byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -65,6 +58,15 @@ public int ReadAt(long arg0, byte[] arg1, int arg2, int arg3)
         {
             return IExecute<int>("readAt", arg0, arg1, arg2, arg3);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDataSource.html#getSize()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public long GetSize()
+        {
+            return IExecuteWithSignature<long>("getSize", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaDescription.cs b/src/net/Netdroid/Generated/Android/Media/MediaDescription.cs
index 7de40e43c..b459cac59 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaDescription.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaDescription.cs
@@ -100,68 +100,76 @@ public partial class MediaDescription
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getIconBitmap()"/>
         /// </summary>
-        public Java.Lang.CharSequence Description
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetIconBitmap()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getIconBitmap", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getIconUri()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetIconUri()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getIconUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getIconBitmap()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getMediaUri()"/>
         /// </summary>
-        public Android.Graphics.Bitmap IconBitmap
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetMediaUri()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getIconBitmap", "()Landroid/graphics/Bitmap;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getMediaUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getIconUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getExtras()"/>
         /// </summary>
-        public Android.Net.Uri IconUri
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getIconUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getMediaId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String MediaId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMediaId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getMediaUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getDescription()"/>
         /// </summary>
-        public Android.Net.Uri MediaUri
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescription()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getMediaUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getSubtitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getSubtitle()"/>
         /// </summary>
-        public Java.Lang.CharSequence Subtitle
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSubtitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getTitle()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#getMediaId()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMediaId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getMediaId", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDescription.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaDrm.cs b/src/net/Netdroid/Generated/Android/Media/MediaDrm.cs
index 31ef3f9a2..a56ddfa81 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaDrm.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaDrm.cs
@@ -49,7 +49,7 @@ public MediaDrm(Java.Util.UUID arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#EVENT_KEY_EXPIRED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EVENT_KEY_EXPIRED { get { if (!_EVENT_KEY_EXPIREDReady) { _EVENT_KEY_EXPIREDContent = SGetField<int>(LocalBridgeClazz, "EVENT_KEY_EXPIRED"); _EVENT_KEY_EXPIREDReady = true; } return _EVENT_KEY_EXPIREDContent; } }
         private static int _EVENT_KEY_EXPIREDContent = default;
         private static bool _EVENT_KEY_EXPIREDReady = false; // this is used because in case of generics 
@@ -62,7 +62,7 @@ public MediaDrm(Java.Util.UUID arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#EVENT_PROVISION_REQUIRED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EVENT_PROVISION_REQUIRED { get { if (!_EVENT_PROVISION_REQUIREDReady) { _EVENT_PROVISION_REQUIREDContent = SGetField<int>(LocalBridgeClazz, "EVENT_PROVISION_REQUIRED"); _EVENT_PROVISION_REQUIREDReady = true; } return _EVENT_PROVISION_REQUIREDContent; } }
         private static int _EVENT_PROVISION_REQUIREDContent = default;
         private static bool _EVENT_PROVISION_REQUIREDReady = false; // this is used because in case of generics 
@@ -233,20 +233,6 @@ public MediaDrm(Java.Util.UUID arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getMaxSecurityLevel()"/> 
-        /// </summary>
-        public static int MaxSecurityLevel
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxSecurityLevel", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getSupportedCryptoSchemes()"/> 
-        /// </summary>
-        public static Java.Util.List<Java.Util.UUID> SupportedCryptoSchemes
-        {
-            get { return SExecuteWithSignature<Java.Util.List<Java.Util.UUID>>(LocalBridgeClazz, "getSupportedCryptoSchemes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#isCryptoSchemeSupported(java.util.UUID,java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
@@ -276,82 +262,26 @@ public static bool IsCryptoSchemeSupported(Java.Util.UUID arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isCryptoSchemeSupported", "(Ljava/util/UUID;)Z", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getConnectedHdcpLevel()"/> 
-        /// </summary>
-        public int ConnectedHdcpLevel
-        {
-            get { return IExecuteWithSignature<int>("getConnectedHdcpLevel", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getProvisionRequest()"/> 
-        /// </summary>
-        public Android.Media.MediaDrm.ProvisionRequest GetProvisionRequest
-        {
-            get { return IExecuteWithSignature<Android.Media.MediaDrm.ProvisionRequest>("getProvisionRequest", "()Landroid/media/MediaDrm$ProvisionRequest;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getLogMessages()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.MediaDrm.LogMessage> LogMessages
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaDrm.LogMessage>>("getLogMessages", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getMaxHdcpLevel()"/> 
-        /// </summary>
-        public int MaxHdcpLevel
-        {
-            get { return IExecuteWithSignature<int>("getMaxHdcpLevel", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getMaxSessionCount()"/> 
-        /// </summary>
-        public int MaxSessionCount
-        {
-            get { return IExecuteWithSignature<int>("getMaxSessionCount", "()I"); }
-        }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getMetrics()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getMaxSecurityLevel()"/>
         /// </summary>
-        public Android.Os.PersistableBundle Metrics
-        {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getOfflineLicenseKeySetIds()"/> 
-        /// </summary>
-        public Java.Util.List<byte[]> OfflineLicenseKeySetIds
-        {
-            get { return IExecuteWithSignature<Java.Util.List<byte[]>>("getOfflineLicenseKeySetIds", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getOpenSessionCount()"/> 
-        /// </summary>
-        public int OpenSessionCount
-        {
-            get { return IExecuteWithSignature<int>("getOpenSessionCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getSecureStopIds()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<byte[]> SecureStopIds
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxSecurityLevel()
         {
-            get { return IExecuteWithSignature<Java.Util.List<byte[]>>("getSecureStopIds", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxSecurityLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getSecureStops()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getSupportedCryptoSchemes()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<byte[]> SecureStops
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public static Java.Util.List<Java.Util.UUID> GetSupportedCryptoSchemes()
         {
-            get { return IExecuteWithSignature<Java.Util.List<byte[]>>("getSecureStops", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<Java.Util.List<Java.Util.UUID>>(LocalBridgeClazz, "getSupportedCryptoSchemes", "()Ljava/util/List;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getCryptoSession(byte[],java.lang.String,java.lang.String)"/>
         /// </summary>
@@ -387,6 +317,22 @@ public Android.Media.MediaDrm.PlaybackComponent GetPlaybackComponent(byte[] arg0
             return IExecuteWithSignature<Android.Media.MediaDrm.PlaybackComponent>("getPlaybackComponent", "([B)Landroid/media/MediaDrm$PlaybackComponent;", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getProvisionRequest()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.MediaDrm.ProvisionRequest"/></returns>
+        public Android.Media.MediaDrm.ProvisionRequest GetProvisionRequest()
+        {
+            return IExecuteWithSignature<Android.Media.MediaDrm.ProvisionRequest>("getProvisionRequest", "()Landroid/media/MediaDrm$ProvisionRequest;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getMetrics()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetMetrics()
+        {
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#requiresSecureDecoder(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -440,7 +386,7 @@ public byte[] GetPropertyByteArray(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="byte"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte[] GetSecureStop(byte[] arg0)
         {
             return IExecuteWithSignatureArray<byte>("getSecureStop", "([B)[B", new object[] { arg0 });
@@ -458,6 +404,30 @@ public byte[] ProvideKeyResponse(byte[] arg0, byte[] arg1)
             return IExecuteArray<byte>("provideKeyResponse", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getConnectedHdcpLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectedHdcpLevel()
+        {
+            return IExecuteWithSignature<int>("getConnectedHdcpLevel", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getMaxHdcpLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxHdcpLevel()
+        {
+            return IExecuteWithSignature<int>("getMaxHdcpLevel", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getMaxSessionCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSessionCount()
+        {
+            return IExecuteWithSignature<int>("getMaxSessionCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getOfflineLicenseState(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
@@ -467,6 +437,14 @@ public int GetOfflineLicenseState(byte[] arg0)
             return IExecuteWithSignature<int>("getOfflineLicenseState", "([B)I", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getOpenSessionCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetOpenSessionCount()
+        {
+            return IExecuteWithSignature<int>("getOpenSessionCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getSecurityLevel(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
@@ -494,10 +472,44 @@ public Java.Lang.String GetPropertyString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.HashMap<Java.Lang.String, Java.Lang.String>>("queryKeyStatus", "([B)Ljava/util/HashMap;", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getLogMessages()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.MediaDrm.LogMessage> GetLogMessages()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.MediaDrm.LogMessage>>("getLogMessages", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getOfflineLicenseKeySetIds()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<byte[]> GetOfflineLicenseKeySetIds()
+        {
+            return IExecuteWithSignature<Java.Util.List<byte[]>>("getOfflineLicenseKeySetIds", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getSecureStopIds()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<byte[]> GetSecureStopIds()
+        {
+            return IExecuteWithSignature<Java.Util.List<byte[]>>("getSecureStopIds", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#getSecureStops()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<byte[]> GetSecureStops()
+        {
+            return IExecuteWithSignature<Java.Util.List<byte[]>>("getSecureStops", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#releaseSecureStops(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ReleaseSecureStops(byte[] arg0)
         {
             IExecuteWithSignature("releaseSecureStops", "([B)V", new object[] { arg0 });
@@ -505,7 +517,7 @@ public void ReleaseSecureStops(byte[] arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#removeAllSecureStops()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveAllSecureStops()
         {
             IExecuteWithSignature("removeAllSecureStops", "()V");
@@ -530,7 +542,7 @@ public void RemoveOfflineLicense(byte[] arg0)
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#removeSecureStop(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveSecureStop(byte[] arg0)
         {
             IExecuteWithSignature("removeSecureStop", "([B)V", new object[] { arg0 });
@@ -617,7 +629,7 @@ public void ProvideProvisionResponse(byte[] arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#release()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Release()
         {
             IExecuteWithSignature("release", "()V");
@@ -625,7 +637,7 @@ public void Release()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaDrm.html#releaseAllSecureStops()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ReleaseAllSecureStops()
         {
             IExecuteWithSignature("releaseAllSecureStops", "()V");
@@ -1105,25 +1117,28 @@ public partial class KeyRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyRequest.html#getData()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyRequest.html#getData()"/>
             /// </summary>
-            public byte[] Data
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetData()
             {
-                get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
+                return IExecuteWithSignatureArray<byte>("getData", "()[B");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyRequest.html#getDefaultUrl()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyRequest.html#getRequestType()"/>
             /// </summary>
-            public Java.Lang.String DefaultUrl
+            /// <returns><see cref="int"/></returns>
+            public int GetRequestType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDefaultUrl", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getRequestType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyRequest.html#getRequestType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyRequest.html#getDefaultUrl()"/>
             /// </summary>
-            public int RequestType
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDefaultUrl()
             {
-                get { return IExecuteWithSignature<int>("getRequestType", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getDefaultUrl", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -1193,18 +1208,20 @@ public partial class KeyStatus
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyStatus.html#getKeyId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyStatus.html#getKeyId()"/>
             /// </summary>
-            public byte[] KeyId
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetKeyId()
             {
-                get { return IExecuteWithSignatureArray<byte>("getKeyId", "()[B"); }
+                return IExecuteWithSignatureArray<byte>("getKeyId", "()[B");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyStatus.html#getStatusCode()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.KeyStatus.html#getStatusCode()"/>
             /// </summary>
-            public int StatusCode
+            /// <returns><see cref="int"/></returns>
+            public int GetStatusCode()
             {
-                get { return IExecuteWithSignature<int>("getStatusCode", "()I"); }
+                return IExecuteWithSignature<int>("getStatusCode", "()I");
             }
 
             #endregion
@@ -1238,25 +1255,28 @@ public partial class LogMessage
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.LogMessage.html#getMessage()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.LogMessage.html#getPriority()"/>
             /// </summary>
-            public Java.Lang.String Message
+            /// <returns><see cref="int"/></returns>
+            public int GetPriority()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getPriority", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.LogMessage.html#getPriority()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.LogMessage.html#getMessage()"/>
             /// </summary>
-            public int Priority
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetMessage()
             {
-                get { return IExecuteWithSignature<int>("getPriority", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.LogMessage.html#getTimestampMillis()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.LogMessage.html#getTimestampMillis()"/>
             /// </summary>
-            public long TimestampMillis
+            /// <returns><see cref="long"/></returns>
+            public long GetTimestampMillis()
             {
-                get { return IExecuteWithSignature<long>("getTimestampMillis", "()J"); }
+                return IExecuteWithSignature<long>("getTimestampMillis", "()J");
             }
 
             #endregion
@@ -1566,7 +1586,7 @@ public partial class OnEventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>>>(OnEventEventHandler));
+                AddEventHandler("onEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>>>(OnEventEventHandler));
 
             }
 
@@ -1574,7 +1594,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaDrm.OnEventListener.html#onEvent(android.media.MediaDrm,byte[],int,int,byte[])"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaDrm, byte[], int, int, byte[]> OnOnEvent { get; set; } = null;
+            public global::System.Action<Android.Media.MediaDrm, byte[], int, int, byte[]> OnOnEvent { get; set; } = null;
 
             void OnEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>> data)
             {
@@ -1673,7 +1693,7 @@ public partial class OnExpirationUpdateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onExpirationUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>>>(OnExpirationUpdateEventHandler));
+                AddEventHandler("onExpirationUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>>>(OnExpirationUpdateEventHandler));
 
             }
 
@@ -1681,7 +1701,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaDrm.OnExpirationUpdateListener.html#onExpirationUpdate(android.media.MediaDrm,byte[],long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnExpirationUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaDrm, byte[], long> OnOnExpirationUpdate { get; set; } = null;
+            public global::System.Action<Android.Media.MediaDrm, byte[], long> OnOnExpirationUpdate { get; set; } = null;
 
             void OnExpirationUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>> data)
             {
@@ -1776,7 +1796,7 @@ public partial class OnKeyStatusChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onKeyStatusChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>>>(OnKeyStatusChangeEventHandler));
+                AddEventHandler("onKeyStatusChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>>>(OnKeyStatusChangeEventHandler));
 
             }
 
@@ -1784,7 +1804,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaDrm.OnKeyStatusChangeListener.html#onKeyStatusChange(android.media.MediaDrm,byte[],java.util.List,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnKeyStatusChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaDrm, byte[], Java.Util.List<Android.Media.MediaDrm.KeyStatus>, bool> OnOnKeyStatusChange { get; set; } = null;
+            public global::System.Action<Android.Media.MediaDrm, byte[], Java.Util.List<Android.Media.MediaDrm.KeyStatus>, bool> OnOnKeyStatusChange { get; set; } = null;
 
             void OnKeyStatusChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>> data)
             {
@@ -1881,7 +1901,7 @@ public partial class OnSessionLostStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSessionLostState", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>>>(OnSessionLostStateEventHandler));
+                AddEventHandler("onSessionLostState", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>>>(OnSessionLostStateEventHandler));
 
             }
 
@@ -1889,7 +1909,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaDrm.OnSessionLostStateListener.html#onSessionLostState(android.media.MediaDrm,byte[])"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSessionLostState"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaDrm, byte[]> OnOnSessionLostState { get; set; } = null;
+            public global::System.Action<Android.Media.MediaDrm, byte[]> OnOnSessionLostState { get; set; } = null;
 
             void OnSessionLostStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaDrm>> data)
             {
@@ -1978,11 +1998,20 @@ public partial class PlaybackComponent
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.PlaybackComponent.html#getLogSessionId()"/> <see href="https://developer.android.com/reference/android/media/MediaDrm.PlaybackComponent.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.PlaybackComponent.html#getLogSessionId()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+            public Android.Media.Metrics.LogSessionId GetLogSessionId()
+            {
+                return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.PlaybackComponent.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
             /// </summary>
-            public Android.Media.Metrics.LogSessionId LogSessionId
+            /// <param name="arg0"><see cref="Android.Media.Metrics.LogSessionId"/></param>
+            public void SetLogSessionId(Android.Media.Metrics.LogSessionId arg0)
             {
-                get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;"); } set { IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", value); }
+                IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", arg0);
             }
 
             #endregion
@@ -2016,18 +2045,20 @@ public partial class ProvisionRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.ProvisionRequest.html#getData()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.ProvisionRequest.html#getData()"/>
             /// </summary>
-            public byte[] Data
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetData()
             {
-                get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
+                return IExecuteWithSignatureArray<byte>("getData", "()[B");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.ProvisionRequest.html#getDefaultUrl()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaDrm.ProvisionRequest.html#getDefaultUrl()"/>
             /// </summary>
-            public Java.Lang.String DefaultUrl
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDefaultUrl()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDefaultUrl", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getDefaultUrl", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaDrmThrowable.cs b/src/net/Netdroid/Generated/Android/Media/MediaDrmThrowable.cs
index f681c3a9a..4c485771d 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaDrmThrowable.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaDrmThrowable.cs
@@ -64,25 +64,28 @@ public partial class MediaDrmThrowable : Android.Media.IMediaDrmThrowable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrmThrowable.html#getErrorContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrmThrowable.html#getErrorContext()"/>
         /// </summary>
-        public int ErrorContext
+        /// <returns><see cref="int"/></returns>
+        public int GetErrorContext()
         {
-            get { return IExecuteWithSignature<int>("getErrorContext", "()I"); }
+            return IExecuteWithSignature<int>("getErrorContext", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrmThrowable.html#getOemError()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrmThrowable.html#getOemError()"/>
         /// </summary>
-        public int OemError
+        /// <returns><see cref="int"/></returns>
+        public int GetOemError()
         {
-            get { return IExecuteWithSignature<int>("getOemError", "()I"); }
+            return IExecuteWithSignature<int>("getOemError", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaDrmThrowable.html#getVendorError()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaDrmThrowable.html#getVendorError()"/>
         /// </summary>
-        public int VendorError
+        /// <returns><see cref="int"/></returns>
+        public int GetVendorError()
         {
-            get { return IExecuteWithSignature<int>("getVendorError", "()I"); }
+            return IExecuteWithSignature<int>("getVendorError", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaExtractor.cs b/src/net/Netdroid/Generated/Android/Media/MediaExtractor.cs
index 298ced46d..ad798ca5d 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaExtractor.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaExtractor.cs
@@ -82,136 +82,146 @@ public partial class MediaExtractor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getCachedDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getDrmInitData()"/>
         /// </summary>
-        public long CachedDuration
+        /// <returns><see cref="Android.Media.DrmInitData"/></returns>
+        public Android.Media.DrmInitData GetDrmInitData()
         {
-            get { return IExecuteWithSignature<long>("getCachedDuration", "()J"); }
+            return IExecuteWithSignature<Android.Media.DrmInitData>("getDrmInitData", "()Landroid/media/DrmInitData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getDrmInitData()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getCasInfo(int)"/>
         /// </summary>
-        public Android.Media.DrmInitData DrmInitData
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Media.MediaExtractor.CasInfo"/></returns>
+        public Android.Media.MediaExtractor.CasInfo GetCasInfo(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Media.DrmInitData>("getDrmInitData", "()Landroid/media/DrmInitData;"); }
+            return IExecuteWithSignature<Android.Media.MediaExtractor.CasInfo>("getCasInfo", "(I)Landroid/media/MediaExtractor$CasInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getLogSessionId()"/> <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getTrackFormat(int)"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId LogSessionId
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Media.MediaFormat"/></returns>
+        public Android.Media.MediaFormat GetTrackFormat(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;"); } set { IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", value); }
+            return IExecuteWithSignature<Android.Media.MediaFormat>("getTrackFormat", "(I)Landroid/media/MediaFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getMetrics()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getLogSessionId()"/>
         /// </summary>
-        public Android.Os.PersistableBundle Metrics
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetLogSessionId()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getPsshInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getMetrics()"/>
         /// </summary>
-        public Java.Util.Map<Java.Util.UUID, byte[]> PsshInfo
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetMetrics()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Util.UUID, byte[]>>("getPsshInfo", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getAudioPresentations(int)"/>
         /// </summary>
-        public int SampleFlags
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.AudioPresentation> GetAudioPresentations(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getSampleFlags", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.AudioPresentation>>("getAudioPresentations", "(I)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getPsshInfo()"/>
         /// </summary>
-        public long SampleSize
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Util.UUID, byte[]> GetPsshInfo()
         {
-            get { return IExecuteWithSignature<long>("getSampleSize", "()J"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Util.UUID, byte[]>>("getPsshInfo", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#advance()"/>
         /// </summary>
-        public long SampleTime
+        /// <returns><see cref="bool"/></returns>
+        public bool Advance()
         {
-            get { return IExecuteWithSignature<long>("getSampleTime", "()J"); }
+            return IExecuteWithSignature<bool>("advance", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleTrackIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo)"/>
         /// </summary>
-        public int SampleTrackIndex
+        /// <param name="arg0"><see cref="Android.Media.MediaCodec.CryptoInfo"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetSampleCryptoInfo(Android.Media.MediaCodec.CryptoInfo arg0)
         {
-            get { return IExecuteWithSignature<int>("getSampleTrackIndex", "()I"); }
+            return IExecuteWithSignature<bool>("getSampleCryptoInfo", "(Landroid/media/MediaCodec$CryptoInfo;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getTrackCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#hasCacheReachedEndOfStream()"/>
         /// </summary>
-        public int TrackCount
+        /// <returns><see cref="bool"/></returns>
+        public bool HasCacheReachedEndOfStream()
         {
-            get { return IExecuteWithSignature<int>("getTrackCount", "()I"); }
+            return IExecuteWithSignature<bool>("hasCacheReachedEndOfStream", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getCasInfo(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleFlags()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Media.MediaExtractor.CasInfo"/></returns>
-        public Android.Media.MediaExtractor.CasInfo GetCasInfo(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSampleFlags()
         {
-            return IExecuteWithSignature<Android.Media.MediaExtractor.CasInfo>("getCasInfo", "(I)Landroid/media/MediaExtractor$CasInfo;", arg0);
+            return IExecuteWithSignature<int>("getSampleFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getTrackFormat(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleTrackIndex()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Media.MediaFormat"/></returns>
-        public Android.Media.MediaFormat GetTrackFormat(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSampleTrackIndex()
         {
-            return IExecuteWithSignature<Android.Media.MediaFormat>("getTrackFormat", "(I)Landroid/media/MediaFormat;", arg0);
+            return IExecuteWithSignature<int>("getSampleTrackIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getAudioPresentations(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getTrackCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Java.Util.List"/></returns>
-        public Java.Util.List<Android.Media.AudioPresentation> GetAudioPresentations(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTrackCount()
         {
-            return IExecuteWithSignature<Java.Util.List<Android.Media.AudioPresentation>>("getAudioPresentations", "(I)Ljava/util/List;", arg0);
+            return IExecuteWithSignature<int>("getTrackCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#advance()"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#readSampleData(java.nio.ByteBuffer,int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool Advance()
+        /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int ReadSampleData(Java.Nio.ByteBuffer arg0, int arg1)
         {
-            return IExecuteWithSignature<bool>("advance", "()Z");
+            return IExecute<int>("readSampleData", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getCachedDuration()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Media.MediaCodec.CryptoInfo"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool GetSampleCryptoInfo(Android.Media.MediaCodec.CryptoInfo arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetCachedDuration()
         {
-            return IExecuteWithSignature<bool>("getSampleCryptoInfo", "(Landroid/media/MediaCodec$CryptoInfo;)Z", arg0);
+            return IExecuteWithSignature<long>("getCachedDuration", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#hasCacheReachedEndOfStream()"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasCacheReachedEndOfStream()
+        /// <returns><see cref="long"/></returns>
+        public long GetSampleSize()
         {
-            return IExecuteWithSignature<bool>("hasCacheReachedEndOfStream", "()Z");
+            return IExecuteWithSignature<long>("getSampleSize", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#readSampleData(java.nio.ByteBuffer,int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#getSampleTime()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int ReadSampleData(Java.Nio.ByteBuffer arg0, int arg1)
+        /// <returns><see cref="long"/></returns>
+        public long GetSampleTime()
         {
-            return IExecute<int>("readSampleData", arg0, arg1);
+            return IExecuteWithSignature<long>("getSampleTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#release()"/>
@@ -316,10 +326,18 @@ public void SetDataSource(Java.Lang.String arg0)
             IExecuteWithSignature("setDataSource", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Metrics.LogSessionId"/></param>
+        public void SetLogSessionId(Android.Media.Metrics.LogSessionId arg0)
+        {
+            IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.html#setMediaCas(android.media.MediaCas)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.MediaCas"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetMediaCas(Android.Media.MediaCas arg0)
         {
             IExecuteWithSignature("setMediaCas", "(Landroid/media/MediaCas;)V", arg0);
@@ -349,25 +367,28 @@ public partial class CasInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.CasInfo.html#getPrivateData()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.CasInfo.html#getSession()"/>
             /// </summary>
-            public byte[] PrivateData
+            /// <returns><see cref="Android.Media.MediaCas.Session"/></returns>
+            public Android.Media.MediaCas.Session GetSession()
             {
-                get { return IExecuteWithSignatureArray<byte>("getPrivateData", "()[B"); }
+                return IExecuteWithSignature<Android.Media.MediaCas.Session>("getSession", "()Landroid/media/MediaCas$Session;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.CasInfo.html#getSession()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.CasInfo.html#getPrivateData()"/>
             /// </summary>
-            public Android.Media.MediaCas.Session Session
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetPrivateData()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaCas.Session>("getSession", "()Landroid/media/MediaCas$Session;"); }
+                return IExecuteWithSignatureArray<byte>("getPrivateData", "()[B");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.CasInfo.html#getSystemId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaExtractor.CasInfo.html#getSystemId()"/>
             /// </summary>
-            public int SystemId
+            /// <returns><see cref="int"/></returns>
+            public int GetSystemId()
             {
-                get { return IExecuteWithSignature<int>("getSystemId", "()I"); }
+                return IExecuteWithSignature<int>("getSystemId", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaFormat.cs b/src/net/Netdroid/Generated/Android/Media/MediaFormat.cs
index 71138eae5..1d35e03e8 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaFormat.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaFormat.cs
@@ -228,7 +228,7 @@ public MediaFormat(Android.Media.MediaFormat arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaFormat.html#KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT { get { if (!_KEY_AAC_MAX_OUTPUT_CHANNEL_COUNTReady) { _KEY_AAC_MAX_OUTPUT_CHANNEL_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT"); _KEY_AAC_MAX_OUTPUT_CHANNEL_COUNTReady = true; } return _KEY_AAC_MAX_OUTPUT_CHANNEL_COUNTContent; } }
         private static Java.Lang.String _KEY_AAC_MAX_OUTPUT_CHANNEL_COUNTContent = default;
         private static bool _KEY_AAC_MAX_OUTPUT_CHANNEL_COUNTReady = false; // this is used because in case of generics 
@@ -1113,20 +1113,6 @@ public static Android.Media.MediaFormat CreateVideoFormat(Java.Lang.String arg0,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaFormat.html#getFeatures()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> Features
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFeatures", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaFormat.html#getKeys()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> Keys
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKeys", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaFormat.html#containsFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1258,6 +1244,22 @@ public Java.Nio.ByteBuffer GetByteBuffer(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("getByteBuffer", "(Ljava/lang/String;)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaFormat.html#getFeatures()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetFeatures()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFeatures", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaFormat.html#getKeys()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetKeys()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKeys", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaFormat.html#getLong(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaMetadata.cs b/src/net/Netdroid/Generated/Android/Media/MediaMetadata.cs
index f172eebe3..814c12542 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaMetadata.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaMetadata.cs
@@ -226,20 +226,6 @@ public partial class MediaMetadata
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaMetadata.html#getBitmapDimensionLimit()"/> 
-        /// </summary>
-        public int BitmapDimensionLimit
-        {
-            get { return IExecuteWithSignature<int>("getBitmapDimensionLimit", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaMetadata.html#getDescription()"/> 
-        /// </summary>
-        public Android.Media.MediaDescription Description
-        {
-            get { return IExecuteWithSignature<Android.Media.MediaDescription>("getDescription", "()Landroid/media/MediaDescription;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadata.html#getBitmap(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -249,6 +235,14 @@ public Android.Graphics.Bitmap GetBitmap(Java.Lang.String arg0)
             return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "(Ljava/lang/String;)Landroid/graphics/Bitmap;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaMetadata.html#getDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.MediaDescription"/></returns>
+        public Android.Media.MediaDescription GetDescription()
+        {
+            return IExecuteWithSignature<Android.Media.MediaDescription>("getDescription", "()Landroid/media/MediaDescription;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadata.html#getRating(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -275,6 +269,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaMetadata.html#getBitmapDimensionLimit()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBitmapDimensionLimit()
+        {
+            return IExecuteWithSignature<int>("getBitmapDimensionLimit", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadata.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaMetadataEditor.cs b/src/net/Netdroid/Generated/Android/Media/MediaMetadataEditor.cs
index 1315c8808..24ff99e75 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaMetadataEditor.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaMetadataEditor.cs
@@ -40,21 +40,21 @@ public partial class MediaMetadataEditor
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#BITMAP_KEY_ARTWORK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BITMAP_KEY_ARTWORK { get { if (!_BITMAP_KEY_ARTWORKReady) { _BITMAP_KEY_ARTWORKContent = SGetField<int>(LocalBridgeClazz, "BITMAP_KEY_ARTWORK"); _BITMAP_KEY_ARTWORKReady = true; } return _BITMAP_KEY_ARTWORKContent; } }
         private static int _BITMAP_KEY_ARTWORKContent = default;
         private static bool _BITMAP_KEY_ARTWORKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#RATING_KEY_BY_OTHERS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RATING_KEY_BY_OTHERS { get { if (!_RATING_KEY_BY_OTHERSReady) { _RATING_KEY_BY_OTHERSContent = SGetField<int>(LocalBridgeClazz, "RATING_KEY_BY_OTHERS"); _RATING_KEY_BY_OTHERSReady = true; } return _RATING_KEY_BY_OTHERSContent; } }
         private static int _RATING_KEY_BY_OTHERSContent = default;
         private static bool _RATING_KEY_BY_OTHERSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#RATING_KEY_BY_USER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RATING_KEY_BY_USER { get { if (!_RATING_KEY_BY_USERReady) { _RATING_KEY_BY_USERContent = SGetField<int>(LocalBridgeClazz, "RATING_KEY_BY_USER"); _RATING_KEY_BY_USERReady = true; } return _RATING_KEY_BY_USERContent; } }
         private static int _RATING_KEY_BY_USERContent = default;
         private static bool _RATING_KEY_BY_USERReady = false; // this is used because in case of generics 
@@ -67,17 +67,9 @@ public partial class MediaMetadataEditor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#getEditableKeys()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int[] EditableKeys
-        {
-            get { return IExecuteWithSignatureArray<int>("getEditableKeys", "()[I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#apply()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Apply()
         {
             IExecuteWithSignature("apply", "()V");
@@ -89,7 +81,7 @@ public void Apply()
         /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
         /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Graphics.Bitmap GetBitmap(int arg0, Android.Graphics.Bitmap arg1)
         {
             return IExecute<Android.Graphics.Bitmap>("getBitmap", arg0, arg1);
@@ -101,7 +93,7 @@ public Android.Graphics.Bitmap GetBitmap(int arg0, Android.Graphics.Bitmap arg1)
         /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
         /// <returns><see cref="Android.Media.MediaMetadataEditor"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Media.MediaMetadataEditor PutBitmap(int arg0, Android.Graphics.Bitmap arg1)
         {
             return IExecute<Android.Media.MediaMetadataEditor>("putBitmap", arg0, arg1);
@@ -113,7 +105,7 @@ public Android.Media.MediaMetadataEditor PutBitmap(int arg0, Android.Graphics.Bi
         /// <param name="arg1"><see cref="long"/></param>
         /// <returns><see cref="Android.Media.MediaMetadataEditor"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Media.MediaMetadataEditor PutLong(int arg0, long arg1)
         {
             return IExecute<Android.Media.MediaMetadataEditor>("putLong", arg0, arg1);
@@ -125,7 +117,7 @@ public Android.Media.MediaMetadataEditor PutLong(int arg0, long arg1)
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="Android.Media.MediaMetadataEditor"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Media.MediaMetadataEditor PutObject(int arg0, object arg1)
         {
             return IExecute<Android.Media.MediaMetadataEditor>("putObject", arg0, arg1);
@@ -137,19 +129,28 @@ public Android.Media.MediaMetadataEditor PutObject(int arg0, object arg1)
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Media.MediaMetadataEditor"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Media.MediaMetadataEditor PutString(int arg0, Java.Lang.String arg1)
         {
             return IExecute<Android.Media.MediaMetadataEditor>("putString", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#getEditableKeys()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int[] GetEditableKeys()
+        {
+            return IExecuteWithSignatureArray<int>("getEditableKeys", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#getObject(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object GetObject(int arg0, object arg1)
         {
             return IExecute("getObject", arg0, arg1);
@@ -161,7 +162,7 @@ public object GetObject(int arg0, object arg1)
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetString(int arg0, Java.Lang.String arg1)
         {
             return IExecute<Java.Lang.String>("getString", arg0, arg1);
@@ -173,7 +174,7 @@ public Java.Lang.String GetString(int arg0, Java.Lang.String arg1)
         /// <param name="arg1"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long GetLong(int arg0, long arg1)
         {
             return IExecute<long>("getLong", arg0, arg1);
@@ -182,7 +183,7 @@ public long GetLong(int arg0, long arg1)
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#addEditableKey(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddEditableKey(int arg0)
         {
             IExecuteWithSignature("addEditableKey", "(I)V", arg0);
@@ -190,7 +191,7 @@ public void AddEditableKey(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#clear()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
@@ -198,7 +199,7 @@ public void Clear()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataEditor.html#removeEditableKeys()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveEditableKeys()
         {
             IExecuteWithSignature("removeEditableKeys", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaMetadataRetriever.cs b/src/net/Netdroid/Generated/Android/Media/MediaMetadataRetriever.cs
index 120914476..14c7ae627 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaMetadataRetriever.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaMetadataRetriever.cs
@@ -310,27 +310,6 @@ public partial class MediaMetadataRetriever
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getEmbeddedPicture()"/> 
-        /// </summary>
-        public byte[] EmbeddedPicture
-        {
-            get { return IExecuteWithSignatureArray<byte>("getEmbeddedPicture", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getFrameAtTime()"/> 
-        /// </summary>
-        public Android.Graphics.Bitmap FrameAtTime
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getFrameAtTime", "()Landroid/graphics/Bitmap;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getPrimaryImage()"/> 
-        /// </summary>
-        public Android.Graphics.Bitmap PrimaryImage
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getPrimaryImage", "()Landroid/graphics/Bitmap;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getFrameAtIndex(int,android.media.MediaMetadataRetriever.BitmapParams)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -350,6 +329,14 @@ public Android.Graphics.Bitmap GetFrameAtIndex(int arg0)
             return IExecuteWithSignature<Android.Graphics.Bitmap>("getFrameAtIndex", "(I)Landroid/graphics/Bitmap;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getFrameAtTime()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetFrameAtTime()
+        {
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getFrameAtTime", "()Landroid/graphics/Bitmap;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getFrameAtTime(long,int,android.media.MediaMetadataRetriever.BitmapParams)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -399,6 +386,14 @@ public Android.Graphics.Bitmap GetImageAtIndex(int arg0)
             return IExecuteWithSignature<Android.Graphics.Bitmap>("getImageAtIndex", "(I)Landroid/graphics/Bitmap;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getPrimaryImage()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetPrimaryImage()
+        {
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getPrimaryImage", "()Landroid/graphics/Bitmap;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getPrimaryImage(android.media.MediaMetadataRetriever.BitmapParams)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.MediaMetadataRetriever.BitmapParams"/></param>
@@ -433,6 +428,14 @@ public Android.Graphics.Bitmap GetScaledFrameAtTime(long arg0, int arg1, int arg
             return IExecute<Android.Graphics.Bitmap>("getScaledFrameAtTime", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#getEmbeddedPicture()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEmbeddedPicture()
+        {
+            return IExecuteWithSignatureArray<byte>("getEmbeddedPicture", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.html#extractMetadata(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -562,18 +565,28 @@ public partial class BitmapParams
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.BitmapParams.html#getActualConfig()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.BitmapParams.html#getActualConfig()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Graphics.Bitmap.Config"/></returns>
+            public Android.Graphics.Bitmap.Config GetActualConfig()
+            {
+                return IExecuteWithSignature<Android.Graphics.Bitmap.Config>("getActualConfig", "()Landroid/graphics/Bitmap$Config;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.BitmapParams.html#getPreferredConfig()"/>
             /// </summary>
-            public Android.Graphics.Bitmap.Config ActualConfig
+            /// <returns><see cref="Android.Graphics.Bitmap.Config"/></returns>
+            public Android.Graphics.Bitmap.Config GetPreferredConfig()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap.Config>("getActualConfig", "()Landroid/graphics/Bitmap$Config;"); }
+                return IExecuteWithSignature<Android.Graphics.Bitmap.Config>("getPreferredConfig", "()Landroid/graphics/Bitmap$Config;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.BitmapParams.html#getPreferredConfig()"/> <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.BitmapParams.html#setPreferredConfig(android.graphics.Bitmap.Config)"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaMetadataRetriever.BitmapParams.html#setPreferredConfig(android.graphics.Bitmap.Config)"/>
             /// </summary>
-            public Android.Graphics.Bitmap.Config PreferredConfig
+            /// <param name="arg0"><see cref="Android.Graphics.Bitmap.Config"/></param>
+            public void SetPreferredConfig(Android.Graphics.Bitmap.Config arg0)
             {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap.Config>("getPreferredConfig", "()Landroid/graphics/Bitmap$Config;"); } set { IExecuteWithSignature("setPreferredConfig", "(Landroid/graphics/Bitmap$Config;)V", value); }
+                IExecuteWithSignature("setPreferredConfig", "(Landroid/graphics/Bitmap$Config;)V", arg0);
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaParser.cs b/src/net/Netdroid/Generated/Android/Media/MediaParser.cs
index 82f47e571..5f1b0d025 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaParser.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaParser.cs
@@ -297,20 +297,6 @@ public static Android.Media.MediaParser CreateByName(Java.Lang.String arg0, Andr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaParser.html#getLogSessionId()"/> <see href="https://developer.android.com/reference/android/media/MediaParser.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
-        /// </summary>
-        public Android.Media.Metrics.LogSessionId LogSessionId
-        {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;"); } set { IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaParser.html#getParserName()"/> 
-        /// </summary>
-        public Java.Lang.String ParserName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getParserName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaParser.html#setParameter(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -321,6 +307,14 @@ public Android.Media.MediaParser SetParameter(Java.Lang.String arg0, object arg1
             return IExecute<Android.Media.MediaParser>("setParameter", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaParser.html#getLogSessionId()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetLogSessionId()
+        {
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaParser.html#advance(android.media.MediaParser.SeekableInputReader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.MediaParser.SeekableInputReader"/></param>
@@ -340,6 +334,14 @@ public bool SupportsParameter(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("supportsParameter", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaParser.html#getParserName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetParserName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getParserName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaParser.html#release()"/>
         /// </summary>
         public void Release()
@@ -354,6 +356,14 @@ public void Seek(Android.Media.MediaParser.SeekPoint arg0)
         {
             IExecuteWithSignature("seek", "(Landroid/media/MediaParser$SeekPoint;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaParser.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Metrics.LogSessionId"/></param>
+        public void SetLogSessionId(Android.Media.Metrics.LogSessionId arg0)
+        {
+            IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", arg0);
+        }
 
         #endregion
 
@@ -379,20 +389,6 @@ public partial class InputReader
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaParser.InputReader.html#getLength()"/> 
-            /// </summary>
-            public long Length
-            {
-                get { return IExecuteWithSignature<long>("getLength", "()J"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaParser.InputReader.html#getPosition()"/> 
-            /// </summary>
-            public long Position
-            {
-                get { return IExecuteWithSignature<long>("getPosition", "()J"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaParser.InputReader.html#read(byte[],int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
@@ -404,6 +400,22 @@ public int Read(byte[] arg0, int arg1, int arg2)
             {
                 return IExecute<int>("read", arg0, arg1, arg2);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaParser.InputReader.html#getLength()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetLength()
+            {
+                return IExecuteWithSignature<long>("getLength", "()J");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaParser.InputReader.html#getPosition()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetPosition()
+            {
+                return IExecuteWithSignature<long>("getPosition", "()J");
+            }
 
             #endregion
 
@@ -591,13 +603,6 @@ public partial class SeekMap
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaParser.SeekMap.html#getDurationMicros()"/> 
-            /// </summary>
-            public long DurationMicros
-            {
-                get { return IExecuteWithSignature<long>("getDurationMicros", "()J"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaParser.SeekMap.html#getSeekPoints(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
@@ -614,6 +619,14 @@ public bool IsSeekable()
             {
                 return IExecuteWithSignature<bool>("isSeekable", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaParser.SeekMap.html#getDurationMicros()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetDurationMicros()
+            {
+                return IExecuteWithSignature<long>("getDurationMicros", "()J");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaPlayer.cs b/src/net/Netdroid/Generated/Android/Media/MediaPlayer.cs
index b6da24c8b..ef3040db0 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaPlayer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaPlayer.cs
@@ -236,7 +236,7 @@ public MediaPlayer(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#MEDIA_MIMETYPE_TEXT_SUBRIP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String MEDIA_MIMETYPE_TEXT_SUBRIP { get { if (!_MEDIA_MIMETYPE_TEXT_SUBRIPReady) { _MEDIA_MIMETYPE_TEXT_SUBRIPContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MEDIA_MIMETYPE_TEXT_SUBRIP"); _MEDIA_MIMETYPE_TEXT_SUBRIPReady = true; } return _MEDIA_MIMETYPE_TEXT_SUBRIPContent; } }
         private static Java.Lang.String _MEDIA_MIMETYPE_TEXT_SUBRIPContent = default;
         private static bool _MEDIA_MIMETYPE_TEXT_SUBRIPReady = false; // this is used because in case of generics 
@@ -305,109 +305,59 @@ public static Android.Media.MediaPlayer Create(Android.Content.Context arg0, int
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getAudioSessionId()"/> <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#setAudioSessionId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getPreferredDevice()"/>
         /// </summary>
-        public int AudioSessionId
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetPreferredDevice()
         {
-            get { return IExecuteWithSignature<int>("getAudioSessionId", "()I"); } set { IExecuteWithSignature("setAudioSessionId", "(I)V", value); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getCurrentPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getRoutedDevice()"/>
         /// </summary>
-        public int CurrentPosition
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetRoutedDevice()
         {
-            get { return IExecuteWithSignature<int>("getCurrentPosition", "()I"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getDuration()"/> 
-        /// </summary>
-        public int Duration
-        {
-            get { return IExecuteWithSignature<int>("getDuration", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getDrmInfo()"/> 
-        /// </summary>
-        public Android.Media.MediaPlayer.DrmInfo GetDrmInfo
-        {
-            get { return IExecuteWithSignature<Android.Media.MediaPlayer.DrmInfo>("getDrmInfo", "()Landroid/media/MediaPlayer$DrmInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getTrackInfo()"/> 
-        /// </summary>
-        public Android.Media.MediaPlayer.TrackInfo[] GetTrackInfo
-        {
-            get { return IExecuteWithSignatureArray<Android.Media.MediaPlayer.TrackInfo>("getTrackInfo", "()[Landroid/media/MediaPlayer$TrackInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getMetrics()"/> 
-        /// </summary>
-        public Android.Os.PersistableBundle Metrics
-        {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getPlaybackParams()"/> <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#setPlaybackParams(android.media.PlaybackParams)"/>
-        /// </summary>
-        public Android.Media.PlaybackParams PlaybackParams
-        {
-            get { return IExecuteWithSignature<Android.Media.PlaybackParams>("getPlaybackParams", "()Landroid/media/PlaybackParams;"); } set { IExecuteWithSignature("setPlaybackParams", "(Landroid/media/PlaybackParams;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getPreferredDevice()"/> 
-        /// </summary>
-        public Android.Media.AudioDeviceInfo PreferredDevice
-        {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getRoutedDevice()"/> 
-        /// </summary>
-        public Android.Media.AudioDeviceInfo RoutedDevice
-        {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getSyncParams()"/> <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#setSyncParams(android.media.SyncParams)"/>
-        /// </summary>
-        public Android.Media.SyncParams SyncParams
-        {
-            get { return IExecuteWithSignature<Android.Media.SyncParams>("getSyncParams", "()Landroid/media/SyncParams;"); } set { IExecuteWithSignature("setSyncParams", "(Landroid/media/SyncParams;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getKeyRequest(byte[],byte[],java.lang.String,int,java.util.Map)"/>
         /// </summary>
-        public Android.Media.MediaTimestamp Timestamp
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <param name="arg1"><see cref="byte"/></param>
+        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="Java.Util.Map"/></param>
+        /// <returns><see cref="Android.Media.MediaDrm.KeyRequest"/></returns>
+        /// <exception cref="Android.Media.MediaPlayer.NoDrmSchemeException"/>
+        public Android.Media.MediaDrm.KeyRequest GetKeyRequest(byte[] arg0, byte[] arg1, Java.Lang.String arg2, int arg3, Java.Util.Map<Java.Lang.String, Java.Lang.String> arg4)
         {
-            get { return IExecuteWithSignature<Android.Media.MediaTimestamp>("getTimestamp", "()Landroid/media/MediaTimestamp;"); }
+            return IExecute<Android.Media.MediaDrm.KeyRequest>("getKeyRequest", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getVideoHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getDrmInfo()"/>
         /// </summary>
-        public int VideoHeight
+        /// <returns><see cref="Android.Media.MediaPlayer.DrmInfo"/></returns>
+        public Android.Media.MediaPlayer.DrmInfo GetDrmInfo()
         {
-            get { return IExecuteWithSignature<int>("getVideoHeight", "()I"); }
+            return IExecuteWithSignature<Android.Media.MediaPlayer.DrmInfo>("getDrmInfo", "()Landroid/media/MediaPlayer$DrmInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getVideoWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getTrackInfo()"/>
         /// </summary>
-        public int VideoWidth
+        /// <returns><see cref="Android.Media.MediaPlayer.TrackInfo"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public Android.Media.MediaPlayer.TrackInfo[] GetTrackInfo()
         {
-            get { return IExecuteWithSignature<int>("getVideoWidth", "()I"); }
+            return IExecuteWithSignatureArray<Android.Media.MediaPlayer.TrackInfo>("getTrackInfo", "()[Landroid/media/MediaPlayer$TrackInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getKeyRequest(byte[],byte[],java.lang.String,int,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getTimestamp()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="Java.Util.Map"/></param>
-        /// <returns><see cref="Android.Media.MediaDrm.KeyRequest"/></returns>
-        /// <exception cref="Android.Media.MediaPlayer.NoDrmSchemeException"/>
-        public Android.Media.MediaDrm.KeyRequest GetKeyRequest(byte[] arg0, byte[] arg1, Java.Lang.String arg2, int arg3, Java.Util.Map<Java.Lang.String, Java.Lang.String> arg4)
+        /// <returns><see cref="Android.Media.MediaTimestamp"/></returns>
+        public Android.Media.MediaTimestamp GetTimestamp()
         {
-            return IExecute<Android.Media.MediaDrm.KeyRequest>("getKeyRequest", arg0, arg1, arg2, arg3, arg4);
+            return IExecuteWithSignature<Android.Media.MediaTimestamp>("getTimestamp", "()Landroid/media/MediaTimestamp;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#createVolumeShaper(android.media.VolumeShaper.Configuration)"/>
@@ -419,6 +369,14 @@ public Android.Media.VolumeShaper CreateVolumeShaper(Android.Media.VolumeShaper.
             return IExecuteWithSignature<Android.Media.VolumeShaper>("createVolumeShaper", "(Landroid/media/VolumeShaper$Configuration;)Landroid/media/VolumeShaper;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getMetrics()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetMetrics()
+        {
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#setPreferredDevice(android.media.AudioDeviceInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioDeviceInfo"/></param>
@@ -460,6 +418,22 @@ public Java.Lang.String GetDrmPropertyString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getDrmPropertyString", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getPlaybackParams()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.PlaybackParams"/></returns>
+        public Android.Media.PlaybackParams GetPlaybackParams()
+        {
+            return IExecuteWithSignature<Android.Media.PlaybackParams>("getPlaybackParams", "()Landroid/media/PlaybackParams;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getSyncParams()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.SyncParams"/></returns>
+        public Android.Media.SyncParams GetSyncParams()
+        {
+            return IExecuteWithSignature<Android.Media.SyncParams>("getSyncParams", "()Landroid/media/SyncParams;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#isLooping()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -476,6 +450,46 @@ public bool IsPlaying()
             return IExecuteWithSignature<bool>("isPlaying", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getAudioSessionId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSessionId()
+        {
+            return IExecuteWithSignature<int>("getAudioSessionId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getCurrentPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentPosition()
+        {
+            return IExecuteWithSignature<int>("getCurrentPosition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getDuration()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDuration()
+        {
+            return IExecuteWithSignature<int>("getDuration", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getVideoHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoHeight()
+        {
+            return IExecuteWithSignature<int>("getVideoHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#getVideoWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoWidth()
+        {
+            return IExecuteWithSignature<int>("getVideoWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#attachAuxEffect(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -500,6 +514,22 @@ public void SetNextMediaPlayer(Android.Media.MediaPlayer arg0)
             IExecuteWithSignature("setNextMediaPlayer", "(Landroid/media/MediaPlayer;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#setPlaybackParams(android.media.PlaybackParams)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.PlaybackParams"/></param>
+        public void SetPlaybackParams(Android.Media.PlaybackParams arg0)
+        {
+            IExecuteWithSignature("setPlaybackParams", "(Landroid/media/PlaybackParams;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#setSyncParams(android.media.SyncParams)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.SyncParams"/></param>
+        public void SetSyncParams(Android.Media.SyncParams arg0)
+        {
+            IExecuteWithSignature("setSyncParams", "(Landroid/media/SyncParams;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioRouting.OnRoutingChangedListener"/></param>
@@ -693,10 +723,20 @@ public void SetAudioAttributes(Android.Media.AudioAttributes arg0)
             IExecuteWithSignature("setAudioAttributes", "(Landroid/media/AudioAttributes;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#setAudioSessionId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public void SetAudioSessionId(int arg0)
+        {
+            IExecuteWithSignature("setAudioSessionId", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.html#setAudioStreamType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAudioStreamType(int arg0)
         {
             IExecuteWithSignature("setAudioStreamType", "(I)V", arg0);
@@ -1054,18 +1094,20 @@ public partial class DrmInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.DrmInfo.html#getPssh()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.DrmInfo.html#getPssh()"/>
             /// </summary>
-            public Java.Util.Map<Java.Util.UUID, byte[]> Pssh
+            /// <returns><see cref="Java.Util.Map"/></returns>
+            public Java.Util.Map<Java.Util.UUID, byte[]> GetPssh()
             {
-                get { return IExecuteWithSignature<Java.Util.Map<Java.Util.UUID, byte[]>>("getPssh", "()Ljava/util/Map;"); }
+                return IExecuteWithSignature<Java.Util.Map<Java.Util.UUID, byte[]>>("getPssh", "()Ljava/util/Map;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.DrmInfo.html#getSupportedSchemes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.DrmInfo.html#getSupportedSchemes()"/>
             /// </summary>
-            public Java.Util.UUID[] SupportedSchemes
+            /// <returns><see cref="Java.Util.UUID"/></returns>
+            public Java.Util.UUID[] GetSupportedSchemes()
             {
-                get { return IExecuteWithSignatureArray<Java.Util.UUID>("getSupportedSchemes", "()[Ljava/util/UUID;"); }
+                return IExecuteWithSignatureArray<Java.Util.UUID>("getSupportedSchemes", "()[Ljava/util/UUID;");
             }
 
             #endregion
@@ -1237,7 +1279,7 @@ public partial class OnBufferingUpdateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onBufferingUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnBufferingUpdateEventHandler));
+                AddEventHandler("onBufferingUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnBufferingUpdateEventHandler));
 
             }
 
@@ -1245,7 +1287,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnBufferingUpdateListener.html#onBufferingUpdate(android.media.MediaPlayer,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnBufferingUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer, int> OnOnBufferingUpdate { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer, int> OnOnBufferingUpdate { get; set; } = null;
 
             void OnBufferingUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -1338,7 +1380,7 @@ public partial class OnCompletionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCompletion", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnCompletionEventHandler));
+                AddEventHandler("onCompletion", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnCompletionEventHandler));
 
             }
 
@@ -1346,7 +1388,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnCompletionListener.html#onCompletion(android.media.MediaPlayer)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCompletion"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer> OnOnCompletion { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer> OnOnCompletion { get; set; } = null;
 
             void OnCompletionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -1476,7 +1518,7 @@ public partial class OnDrmInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDrmInfo", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnDrmInfoEventHandler));
+                AddEventHandler("onDrmInfo", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnDrmInfoEventHandler));
 
             }
 
@@ -1484,7 +1526,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnDrmInfoListener.html#onDrmInfo(android.media.MediaPlayer,android.media.MediaPlayer.DrmInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDrmInfo"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer, Android.Media.MediaPlayer.DrmInfo> OnOnDrmInfo { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer, Android.Media.MediaPlayer.DrmInfo> OnOnDrmInfo { get; set; } = null;
 
             void OnDrmInfoEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -1577,7 +1619,7 @@ public partial class OnDrmPreparedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDrmPrepared", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnDrmPreparedEventHandler));
+                AddEventHandler("onDrmPrepared", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnDrmPreparedEventHandler));
 
             }
 
@@ -1585,7 +1627,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnDrmPreparedListener.html#onDrmPrepared(android.media.MediaPlayer,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDrmPrepared"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer, int> OnOnDrmPrepared { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer, int> OnOnDrmPrepared { get; set; } = null;
 
             void OnDrmPreparedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -1678,7 +1720,7 @@ public partial class OnErrorListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnErrorEventHandler));
+                AddEventHandler("onError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnErrorEventHandler));
 
             }
 
@@ -1686,7 +1728,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnErrorListener.html#onError(android.media.MediaPlayer,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Media.MediaPlayer, int, int, bool> OnOnError { get; set; } = null;
+            public global::System.Func<Android.Media.MediaPlayer, int, int, bool> OnOnError { get; set; } = null;
 
             void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -1784,7 +1826,7 @@ public partial class OnInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onInfo", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnInfoEventHandler));
+                AddEventHandler("onInfo", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnInfoEventHandler));
 
             }
 
@@ -1792,7 +1834,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnInfoListener.html#onInfo(android.media.MediaPlayer,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnInfo"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Media.MediaPlayer, int, int, bool> OnOnInfo { get; set; } = null;
+            public global::System.Func<Android.Media.MediaPlayer, int, int, bool> OnOnInfo { get; set; } = null;
 
             void OnInfoEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -1890,7 +1932,7 @@ public partial class OnMediaTimeDiscontinuityListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMediaTimeDiscontinuity", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnMediaTimeDiscontinuityEventHandler));
+                AddEventHandler("onMediaTimeDiscontinuity", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnMediaTimeDiscontinuityEventHandler));
 
             }
 
@@ -1898,7 +1940,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnMediaTimeDiscontinuityListener.html#onMediaTimeDiscontinuity(android.media.MediaPlayer,android.media.MediaTimestamp)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMediaTimeDiscontinuity"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer, Android.Media.MediaTimestamp> OnOnMediaTimeDiscontinuity { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer, Android.Media.MediaTimestamp> OnOnMediaTimeDiscontinuity { get; set; } = null;
 
             void OnMediaTimeDiscontinuityEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -1991,7 +2033,7 @@ public partial class OnPreparedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPrepared", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnPreparedEventHandler));
+                AddEventHandler("onPrepared", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnPreparedEventHandler));
 
             }
 
@@ -1999,7 +2041,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnPreparedListener.html#onPrepared(android.media.MediaPlayer)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPrepared"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer> OnOnPrepared { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer> OnOnPrepared { get; set; } = null;
 
             void OnPreparedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -2090,7 +2132,7 @@ public partial class OnSeekCompleteListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSeekComplete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnSeekCompleteEventHandler));
+                AddEventHandler("onSeekComplete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnSeekCompleteEventHandler));
 
             }
 
@@ -2098,7 +2140,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnSeekCompleteListener.html#onSeekComplete(android.media.MediaPlayer)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSeekComplete"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer> OnOnSeekComplete { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer> OnOnSeekComplete { get; set; } = null;
 
             void OnSeekCompleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -2189,7 +2231,7 @@ public partial class OnSubtitleDataListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSubtitleData", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnSubtitleDataEventHandler));
+                AddEventHandler("onSubtitleData", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnSubtitleDataEventHandler));
 
             }
 
@@ -2197,7 +2239,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnSubtitleDataListener.html#onSubtitleData(android.media.MediaPlayer,android.media.SubtitleData)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSubtitleData"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer, Android.Media.SubtitleData> OnOnSubtitleData { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer, Android.Media.SubtitleData> OnOnSubtitleData { get; set; } = null;
 
             void OnSubtitleDataEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -2290,7 +2332,7 @@ public partial class OnTimedMetaDataAvailableListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTimedMetaDataAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnTimedMetaDataAvailableEventHandler));
+                AddEventHandler("onTimedMetaDataAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnTimedMetaDataAvailableEventHandler));
 
             }
 
@@ -2298,7 +2340,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnTimedMetaDataAvailableListener.html#onTimedMetaDataAvailable(android.media.MediaPlayer,android.media.TimedMetaData)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTimedMetaDataAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer, Android.Media.TimedMetaData> OnOnTimedMetaDataAvailable { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer, Android.Media.TimedMetaData> OnOnTimedMetaDataAvailable { get; set; } = null;
 
             void OnTimedMetaDataAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -2391,7 +2433,7 @@ public partial class OnTimedTextListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTimedText", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnTimedTextEventHandler));
+                AddEventHandler("onTimedText", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnTimedTextEventHandler));
 
             }
 
@@ -2399,7 +2441,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnTimedTextListener.html#onTimedText(android.media.MediaPlayer,android.media.TimedText)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTimedText"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer, Android.Media.TimedText> OnOnTimedText { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer, Android.Media.TimedText> OnOnTimedText { get; set; } = null;
 
             void OnTimedTextEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -2492,7 +2534,7 @@ public partial class OnVideoSizeChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onVideoSizeChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnVideoSizeChangedEventHandler));
+                AddEventHandler("onVideoSizeChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>>>(OnVideoSizeChangedEventHandler));
 
             }
 
@@ -2500,7 +2542,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaPlayer.OnVideoSizeChangedListener.html#onVideoSizeChanged(android.media.MediaPlayer,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnVideoSizeChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaPlayer, int, int> OnOnVideoSizeChanged { get; set; } = null;
+            public global::System.Action<Android.Media.MediaPlayer, int, int> OnOnVideoSizeChanged { get; set; } = null;
 
             void OnVideoSizeChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaPlayer>> data)
             {
@@ -2689,33 +2731,36 @@ public partial class TrackInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#getFormat()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#getFormat()"/>
             /// </summary>
-            public Android.Media.MediaFormat Format
+            /// <returns><see cref="Android.Media.MediaFormat"/></returns>
+            public Android.Media.MediaFormat GetFormat()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaFormat>("getFormat", "()Landroid/media/MediaFormat;"); }
+                return IExecuteWithSignature<Android.Media.MediaFormat>("getFormat", "()Landroid/media/MediaFormat;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#getLanguage()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#describeContents()"/>
             /// </summary>
-            public Java.Lang.String Language
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#getTrackType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#getTrackType()"/>
             /// </summary>
-            public int TrackType
+            /// <returns><see cref="int"/></returns>
+            public int GetTrackType()
             {
-                get { return IExecuteWithSignature<int>("getTrackType", "()I"); }
+                return IExecuteWithSignature<int>("getTrackType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#getLanguage()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetLanguage()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaPlayer.TrackInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaRecorder.cs b/src/net/Netdroid/Generated/Android/Media/MediaRecorder.cs
index 49157dc53..017704ea8 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaRecorder.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaRecorder.cs
@@ -104,71 +104,56 @@ public MediaRecorder(Android.Content.Context arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getAudioSourceMax()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getAudioSourceMax()"/>
         /// </summary>
-        public static int AudioSourceMax
+        /// <returns><see cref="int"/></returns>
+        public static int GetAudioSourceMax()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getAudioSourceMax", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getAudioSourceMax", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getActiveMicrophones()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getPreferredDevice()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.MicrophoneInfo> ActiveMicrophones
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetPreferredDevice()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.MicrophoneInfo>>("getActiveMicrophones", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getActiveRecordingConfiguration()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getRoutedDevice()"/>
         /// </summary>
-        public Android.Media.AudioRecordingConfiguration ActiveRecordingConfiguration
+        /// <returns><see cref="Android.Media.AudioDeviceInfo"/></returns>
+        public Android.Media.AudioDeviceInfo GetRoutedDevice()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioRecordingConfiguration>("getActiveRecordingConfiguration", "()Landroid/media/AudioRecordingConfiguration;"); }
+            return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getLogSessionId()"/> <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getActiveRecordingConfiguration()"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId LogSessionId
+        /// <returns><see cref="Android.Media.AudioRecordingConfiguration"/></returns>
+        public Android.Media.AudioRecordingConfiguration GetActiveRecordingConfiguration()
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;"); } set { IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", value); }
+            return IExecuteWithSignature<Android.Media.AudioRecordingConfiguration>("getActiveRecordingConfiguration", "()Landroid/media/AudioRecordingConfiguration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getMaxAmplitude()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getLogSessionId()"/>
         /// </summary>
-        public int MaxAmplitude
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetLogSessionId()
         {
-            get { return IExecuteWithSignature<int>("getMaxAmplitude", "()I"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getLogSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getMetrics()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getMetrics()"/>
         /// </summary>
-        public Android.Os.PersistableBundle Metrics
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetMetrics()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getPreferredDevice()"/> 
-        /// </summary>
-        public Android.Media.AudioDeviceInfo PreferredDevice
-        {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getPreferredDevice", "()Landroid/media/AudioDeviceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getRoutedDevice()"/> 
-        /// </summary>
-        public Android.Media.AudioDeviceInfo RoutedDevice
-        {
-            get { return IExecuteWithSignature<Android.Media.AudioDeviceInfo>("getRoutedDevice", "()Landroid/media/AudioDeviceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getSurface()"/> 
-        /// </summary>
-        public Android.View.Surface Surface
-        {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getMetrics", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#setPreferredDevice(android.media.AudioDeviceInfo)"/>
@@ -198,6 +183,23 @@ public bool SetPreferredMicrophoneFieldDimension(float arg0)
             return IExecuteWithSignature<bool>("setPreferredMicrophoneFieldDimension", "(F)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getActiveMicrophones()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.List<Android.Media.MicrophoneInfo> GetActiveMicrophones()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.MicrophoneInfo>>("getActiveMicrophones", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getSurface()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetSurface()
+        {
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#isPrivacySensitive()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -206,6 +208,15 @@ public bool IsPrivacySensitive()
             return IExecuteWithSignature<bool>("isPrivacySensitive", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#getMaxAmplitude()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public int GetMaxAmplitude()
+        {
+            return IExecuteWithSignature<int>("getMaxAmplitude", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#pause()"/>
         /// </summary>
         /// <exception cref="Java.Lang.IllegalStateException"/>
@@ -250,7 +261,7 @@ public void SetAudioSource(int arg0)
         /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#setCamera(android.hardware.Camera)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Hardware.Camera"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCamera(Android.Hardware.Camera arg0)
         {
             IExecuteWithSignature("setCamera", "(Landroid/hardware/Camera;)V", arg0);
@@ -443,6 +454,14 @@ public void SetLocation(float arg0, float arg1)
             IExecute("setLocation", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#setLogSessionId(android.media.metrics.LogSessionId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Metrics.LogSessionId"/></param>
+        public void SetLogSessionId(Android.Media.Metrics.LogSessionId arg0)
+        {
+            IExecuteWithSignature("setLogSessionId", "(Landroid/media/metrics/LogSessionId;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.html#setNextOutputFile(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
@@ -891,7 +910,7 @@ public partial class OnErrorListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaRecorder>>>(OnErrorEventHandler));
+                AddEventHandler("onError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaRecorder>>>(OnErrorEventHandler));
 
             }
 
@@ -899,7 +918,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaRecorder.OnErrorListener.html#onError(android.media.MediaRecorder,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaRecorder, int, int> OnOnError { get; set; } = null;
+            public global::System.Action<Android.Media.MediaRecorder, int, int> OnOnError { get; set; } = null;
 
             void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaRecorder>> data)
             {
@@ -994,7 +1013,7 @@ public partial class OnInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onInfo", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaRecorder>>>(OnInfoEventHandler));
+                AddEventHandler("onInfo", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaRecorder>>>(OnInfoEventHandler));
 
             }
 
@@ -1002,7 +1021,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaRecorder.OnInfoListener.html#onInfo(android.media.MediaRecorder,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnInfo"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaRecorder, int, int> OnOnInfo { get; set; } = null;
+            public global::System.Action<Android.Media.MediaRecorder, int, int> OnOnInfo { get; set; } = null;
 
             void OnInfoEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaRecorder>> data)
             {
@@ -1129,7 +1148,7 @@ public partial class OutputFormat
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaRecorder.OutputFormat.html#RAW_AMR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RAW_AMR { get { if (!_RAW_AMRReady) { _RAW_AMRContent = SGetField<int>(LocalBridgeClazz, "RAW_AMR"); _RAW_AMRReady = true; } return _RAW_AMRContent; } }
             private static int _RAW_AMRContent = default;
             private static bool _RAW_AMRReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaRoute2Info.cs b/src/net/Netdroid/Generated/Android/Media/MediaRoute2Info.cs
index ec45e921a..71bb04260 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaRoute2Info.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaRoute2Info.cs
@@ -208,111 +208,124 @@ public partial class MediaRoute2Info
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getClientPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getIconUri()"/>
         /// </summary>
-        public Java.Lang.String ClientPackageName
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetIconUri()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClientPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getIconUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getConnectionState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getExtras()"/>
         /// </summary>
-        public int ConnectionState
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<int>("getConnectionState", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getDeduplicationIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#isSystemRoute()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> DeduplicationIds
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSystemRoute()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getDeduplicationIds", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<bool>("isSystemRoute", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.CharSequence Description
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getConnectionState()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionState()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getConnectionState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getFeatures()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getType()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> Features
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFeatures", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getIconUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getVolume()"/>
         /// </summary>
-        public Android.Net.Uri IconUri
+        /// <returns><see cref="int"/></returns>
+        public int GetVolume()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getIconUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<int>("getVolume", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getVolumeHandling()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="int"/></returns>
+        public int GetVolumeHandling()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getVolumeHandling", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getVolumeMax()"/>
         /// </summary>
-        public Java.Lang.CharSequence Name
+        /// <returns><see cref="int"/></returns>
+        public int GetVolumeMax()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getVolumeMax", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getDescription()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescription()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getVolume()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getName()"/>
         /// </summary>
-        public int Volume
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetName()
         {
-            get { return IExecuteWithSignature<int>("getVolume", "()I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getVolumeHandling()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getClientPackageName()"/>
         /// </summary>
-        public int VolumeHandling
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClientPackageName()
         {
-            get { return IExecuteWithSignature<int>("getVolumeHandling", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getClientPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getVolumeMax()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getId()"/>
         /// </summary>
-        public int VolumeMax
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<int>("getVolumeMax", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#isSystemRoute()"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getFeatures()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSystemRoute()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetFeatures()
         {
-            return IExecuteWithSignature<bool>("isSystemRoute", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFeatures", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#getDeduplicationIds()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetDeduplicationIds()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getDeduplicationIds", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRoute2Info.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaRoute2ProviderService.cs b/src/net/Netdroid/Generated/Android/Media/MediaRoute2ProviderService.cs
index 551f0c9e8..2fc6f4516 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaRoute2ProviderService.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaRoute2ProviderService.cs
@@ -88,13 +88,6 @@ public partial class MediaRoute2ProviderService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2ProviderService.html#getAllSessionInfo()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.RoutingSessionInfo> AllSessionInfo
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.RoutingSessionInfo>>("getAllSessionInfo", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRoute2ProviderService.html#onCreateSession(long,java.lang.String,java.lang.String,android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -174,6 +167,14 @@ public Android.Media.RoutingSessionInfo GetSessionInfo(Java.Lang.String arg0)
             return IExecuteWithSignature<Android.Media.RoutingSessionInfo>("getSessionInfo", "(Ljava/lang/String;)Landroid/media/RoutingSessionInfo;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRoute2ProviderService.html#getAllSessionInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.RoutingSessionInfo> GetAllSessionInfo()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.RoutingSessionInfo>>("getAllSessionInfo", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRoute2ProviderService.html#notifyRequestFailed(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaRouter.cs b/src/net/Netdroid/Generated/Android/Media/MediaRouter.cs
index f1b04b2af..bb9367a69 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaRouter.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaRouter.cs
@@ -76,27 +76,6 @@ public partial class MediaRouter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#getCategoryCount()"/> 
-        /// </summary>
-        public int CategoryCount
-        {
-            get { return IExecuteWithSignature<int>("getCategoryCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#getDefaultRoute()"/> 
-        /// </summary>
-        public Android.Media.MediaRouter.RouteInfo DefaultRoute
-        {
-            get { return IExecuteWithSignature<Android.Media.MediaRouter.RouteInfo>("getDefaultRoute", "()Landroid/media/MediaRouter$RouteInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#getRouteCount()"/> 
-        /// </summary>
-        public int RouteCount
-        {
-            get { return IExecuteWithSignature<int>("getRouteCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#createRouteCategory(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -126,6 +105,14 @@ public Android.Media.MediaRouter.RouteCategory GetCategoryAt(int arg0)
             return IExecuteWithSignature<Android.Media.MediaRouter.RouteCategory>("getCategoryAt", "(I)Landroid/media/MediaRouter$RouteCategory;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#getDefaultRoute()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.MediaRouter.RouteInfo"/></returns>
+        public Android.Media.MediaRouter.RouteInfo GetDefaultRoute()
+        {
+            return IExecuteWithSignature<Android.Media.MediaRouter.RouteInfo>("getDefaultRoute", "()Landroid/media/MediaRouter$RouteInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#getRouteAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -153,6 +140,22 @@ public Android.Media.MediaRouter.UserRouteInfo CreateUserRoute(Android.Media.Med
             return IExecuteWithSignature<Android.Media.MediaRouter.UserRouteInfo>("createUserRoute", "(Landroid/media/MediaRouter$RouteCategory;)Landroid/media/MediaRouter$UserRouteInfo;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#getCategoryCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCategoryCount()
+        {
+            return IExecuteWithSignature<int>("getCategoryCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#getRouteCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRouteCount()
+        {
+            return IExecuteWithSignature<int>("getRouteCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRouter.html#addCallback(int,android.media.MediaRouter.Callback,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -353,26 +356,28 @@ public partial class RouteCategory
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteCategory.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteCategory.html#isGroupable()"/>
             /// </summary>
-            public Java.Lang.CharSequence Name
+            /// <returns><see cref="bool"/></returns>
+            public bool IsGroupable()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<bool>("isGroupable", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteCategory.html#getSupportedTypes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteCategory.html#getSupportedTypes()"/>
             /// </summary>
-            public int SupportedTypes
+            /// <returns><see cref="int"/></returns>
+            public int GetSupportedTypes()
             {
-                get { return IExecuteWithSignature<int>("getSupportedTypes", "()I"); }
+                return IExecuteWithSignature<int>("getSupportedTypes", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteCategory.html#isGroupable()"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteCategory.html#getName()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsGroupable()
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetName()
             {
-                return IExecuteWithSignature<bool>("isGroupable", "()Z");
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteCategory.html#getName(android.content.Context)"/>
@@ -424,13 +429,6 @@ public partial class RouteGroup
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteGroup.html#getRouteCount()"/> 
-            /// </summary>
-            public int RouteCount
-            {
-                get { return IExecuteWithSignature<int>("getRouteCount", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteGroup.html#getRouteAt(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -440,6 +438,14 @@ public Android.Media.MediaRouter.RouteInfo GetRouteAt(int arg0)
                 return IExecuteWithSignature<Android.Media.MediaRouter.RouteInfo>("getRouteAt", "(I)Landroid/media/MediaRouter$RouteInfo;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteGroup.html#getRouteCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetRouteCount()
+            {
+                return IExecuteWithSignature<int>("getRouteCount", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteGroup.html#addRoute(android.media.MediaRouter.RouteInfo,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.MediaRouter.RouteInfo"/></param>
@@ -568,134 +574,149 @@ public partial class RouteInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getCategory()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getIconDrawable()"/>
             /// </summary>
-            public Android.Media.MediaRouter.RouteCategory Category
+            /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+            public Android.Graphics.Drawable.Drawable GetIconDrawable()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaRouter.RouteCategory>("getCategory", "()Landroid/media/MediaRouter$RouteCategory;"); }
+                return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIconDrawable", "()Landroid/graphics/drawable/Drawable;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getDescription()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getCategory()"/>
             /// </summary>
-            public Java.Lang.CharSequence Description
+            /// <returns><see cref="Android.Media.MediaRouter.RouteCategory"/></returns>
+            public Android.Media.MediaRouter.RouteCategory GetCategory()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.Media.MediaRouter.RouteCategory>("getCategory", "()Landroid/media/MediaRouter$RouteCategory;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getDeviceType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getGroup()"/>
             /// </summary>
-            public int DeviceType
+            /// <returns><see cref="Android.Media.MediaRouter.RouteGroup"/></returns>
+            public Android.Media.MediaRouter.RouteGroup GetGroup()
             {
-                get { return IExecuteWithSignature<int>("getDeviceType", "()I"); }
+                return IExecuteWithSignature<Android.Media.MediaRouter.RouteGroup>("getGroup", "()Landroid/media/MediaRouter$RouteGroup;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getGroup()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getPresentationDisplay()"/>
             /// </summary>
-            public Android.Media.MediaRouter.RouteGroup Group
+            /// <returns><see cref="Android.View.Display"/></returns>
+            public Android.View.Display GetPresentationDisplay()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaRouter.RouteGroup>("getGroup", "()Landroid/media/MediaRouter$RouteGroup;"); }
+                return IExecuteWithSignature<Android.View.Display>("getPresentationDisplay", "()Landroid/view/Display;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getIconDrawable()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#isConnecting()"/>
             /// </summary>
-            public Android.Graphics.Drawable.Drawable IconDrawable
+            /// <returns><see cref="bool"/></returns>
+            public bool IsConnecting()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIconDrawable", "()Landroid/graphics/drawable/Drawable;"); }
+                return IExecuteWithSignature<bool>("isConnecting", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#isEnabled()"/>
             /// </summary>
-            public Java.Lang.CharSequence Name
+            /// <returns><see cref="bool"/></returns>
+            public bool IsEnabled()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<bool>("isEnabled", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getPlaybackStream()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getDeviceType()"/>
             /// </summary>
-            public int PlaybackStream
+            /// <returns><see cref="int"/></returns>
+            public int GetDeviceType()
             {
-                get { return IExecuteWithSignature<int>("getPlaybackStream", "()I"); }
+                return IExecuteWithSignature<int>("getDeviceType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getPlaybackType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getPlaybackStream()"/>
             /// </summary>
-            public int PlaybackType
+            /// <returns><see cref="int"/></returns>
+            public int GetPlaybackStream()
             {
-                get { return IExecuteWithSignature<int>("getPlaybackType", "()I"); }
+                return IExecuteWithSignature<int>("getPlaybackStream", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getPresentationDisplay()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getPlaybackType()"/>
             /// </summary>
-            public Android.View.Display PresentationDisplay
+            /// <returns><see cref="int"/></returns>
+            public int GetPlaybackType()
             {
-                get { return IExecuteWithSignature<Android.View.Display>("getPresentationDisplay", "()Landroid/view/Display;"); }
+                return IExecuteWithSignature<int>("getPlaybackType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getStatus()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getSupportedTypes()"/>
             /// </summary>
-            public Java.Lang.CharSequence Status
+            /// <returns><see cref="int"/></returns>
+            public int GetSupportedTypes()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getStatus", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<int>("getSupportedTypes", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getSupportedTypes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getVolume()"/>
             /// </summary>
-            public int SupportedTypes
+            /// <returns><see cref="int"/></returns>
+            public int GetVolume()
             {
-                get { return IExecuteWithSignature<int>("getSupportedTypes", "()I"); }
+                return IExecuteWithSignature<int>("getVolume", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getTag()"/> <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#setTag(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getVolumeHandling()"/>
             /// </summary>
-            public object Tag
+            /// <returns><see cref="int"/></returns>
+            public int GetVolumeHandling()
             {
-                get { return IExecuteWithSignature("getTag", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setTag", "(Ljava/lang/Object;)V", value); }
+                return IExecuteWithSignature<int>("getVolumeHandling", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getVolume()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getVolumeMax()"/>
             /// </summary>
-            public int Volume
+            /// <returns><see cref="int"/></returns>
+            public int GetVolumeMax()
             {
-                get { return IExecuteWithSignature<int>("getVolume", "()I"); }
+                return IExecuteWithSignature<int>("getVolumeMax", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getVolumeHandling()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getDescription()"/>
             /// </summary>
-            public int VolumeHandling
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetDescription()
             {
-                get { return IExecuteWithSignature<int>("getVolumeHandling", "()I"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getVolumeMax()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getName()"/>
             /// </summary>
-            public int VolumeMax
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetName()
             {
-                get { return IExecuteWithSignature<int>("getVolumeMax", "()I"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#isConnecting()"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getName(android.content.Context)"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsConnecting()
+            /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetName(Android.Content.Context arg0)
             {
-                return IExecuteWithSignature<bool>("isConnecting", "()Z");
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "(Landroid/content/Context;)Ljava/lang/CharSequence;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#isEnabled()"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getStatus()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsEnabled()
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetStatus()
             {
-                return IExecuteWithSignature<bool>("isEnabled", "()Z");
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getStatus", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getName(android.content.Context)"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#getTag()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            public Java.Lang.CharSequence GetName(Android.Content.Context arg0)
+            /// <returns><see cref="object"/></returns>
+            public object GetTag()
             {
-                return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "(Landroid/content/Context;)Ljava/lang/CharSequence;", arg0);
+                return IExecuteWithSignature("getTag", "()Ljava/lang/Object;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#requestSetVolume(int)"/>
@@ -713,6 +734,14 @@ public void RequestUpdateVolume(int arg0)
             {
                 IExecuteWithSignature("requestUpdateVolume", "(I)V", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.RouteInfo.html#setTag(java.lang.Object)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="object"/></param>
+            public void SetTag(object arg0)
+            {
+                IExecuteWithSignature("setTag", "(Ljava/lang/Object;)V", arg0);
+            }
 
             #endregion
 
@@ -776,11 +805,12 @@ public partial class UserRouteInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.UserRouteInfo.html#getRemoteControlClient()"/> <see href="https://developer.android.com/reference/android/media/MediaRouter.UserRouteInfo.html#setRemoteControlClient(android.media.RemoteControlClient)"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.UserRouteInfo.html#getRemoteControlClient()"/>
             /// </summary>
-            public Android.Media.RemoteControlClient RemoteControlClient
+            /// <returns><see cref="Android.Media.RemoteControlClient"/></returns>
+            public Android.Media.RemoteControlClient GetRemoteControlClient()
             {
-                get { return IExecuteWithSignature<Android.Media.RemoteControlClient>("getRemoteControlClient", "()Landroid/media/RemoteControlClient;"); } set { IExecuteWithSignature("setRemoteControlClient", "(Landroid/media/RemoteControlClient;)V", value); }
+                return IExecuteWithSignature<Android.Media.RemoteControlClient>("getRemoteControlClient", "()Landroid/media/RemoteControlClient;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter.UserRouteInfo.html#setDescription(java.lang.CharSequence)"/>
@@ -839,6 +869,14 @@ public void SetPlaybackType(int arg0)
                 IExecuteWithSignature("setPlaybackType", "(I)V", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter.UserRouteInfo.html#setRemoteControlClient(android.media.RemoteControlClient)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Android.Media.RemoteControlClient"/></param>
+            public void SetRemoteControlClient(Android.Media.RemoteControlClient arg0)
+            {
+                IExecuteWithSignature("setRemoteControlClient", "(Landroid/media/RemoteControlClient;)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter.UserRouteInfo.html#setStatus(java.lang.CharSequence)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaRouter2.cs b/src/net/Netdroid/Generated/Android/Media/MediaRouter2.cs
index 3e04e9016..a7506101b 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaRouter2.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaRouter2.cs
@@ -55,42 +55,45 @@ public static Android.Media.MediaRouter2 GetInstance(Android.Content.Context arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#getControllers()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#getController(java.lang.String)"/>
         /// </summary>
-        public Java.Util.List<Android.Media.MediaRouter2.RoutingController> Controllers
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Media.MediaRouter2.RoutingController"/></returns>
+        public Android.Media.MediaRouter2.RoutingController GetController(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRouter2.RoutingController>>("getControllers", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Media.MediaRouter2.RoutingController>("getController", "(Ljava/lang/String;)Landroid/media/MediaRouter2$RoutingController;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#getRoutes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#getSystemController()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.MediaRoute2Info> Routes
+        /// <returns><see cref="Android.Media.MediaRouter2.RoutingController"/></returns>
+        public Android.Media.MediaRouter2.RoutingController GetSystemController()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRoute2Info>>("getRoutes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Media.MediaRouter2.RoutingController>("getSystemController", "()Landroid/media/MediaRouter2$RoutingController;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#getSystemController()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#showSystemOutputSwitcher()"/>
         /// </summary>
-        public Android.Media.MediaRouter2.RoutingController SystemController
+        /// <returns><see cref="bool"/></returns>
+        public bool ShowSystemOutputSwitcher()
         {
-            get { return IExecuteWithSignature<Android.Media.MediaRouter2.RoutingController>("getSystemController", "()Landroid/media/MediaRouter2$RoutingController;"); }
+            return IExecuteWithSignature<bool>("showSystemOutputSwitcher", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#getController(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#getRoutes()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Media.MediaRouter2.RoutingController"/></returns>
-        public Android.Media.MediaRouter2.RoutingController GetController(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.MediaRoute2Info> GetRoutes()
         {
-            return IExecuteWithSignature<Android.Media.MediaRouter2.RoutingController>("getController", "(Ljava/lang/String;)Landroid/media/MediaRouter2$RoutingController;", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRoute2Info>>("getRoutes", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#showSystemOutputSwitcher()"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#getControllers()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ShowSystemOutputSwitcher()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.MediaRouter2.RoutingController> GetControllers()
         {
-            return IExecuteWithSignature<bool>("showSystemOutputSwitcher", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRouter2.RoutingController>>("getControllers", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.html#registerControllerCallback(java.util.concurrent.Executor,android.media.MediaRouter2.ControllerCallback)"/>
@@ -243,7 +246,7 @@ public partial class OnGetControllerHintsListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGetControllerHints", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaRoute2Info>>>(OnGetControllerHintsEventHandler));
+                AddEventHandler("onGetControllerHints", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaRoute2Info>>>(OnGetControllerHintsEventHandler));
 
             }
 
@@ -251,7 +254,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaRouter2.OnGetControllerHintsListener.html#onGetControllerHints(android.media.MediaRoute2Info)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGetControllerHints"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Media.MediaRoute2Info, Android.Os.Bundle> OnOnGetControllerHints { get; set; } = null;
+            public global::System.Func<Android.Media.MediaRoute2Info, Android.Os.Bundle> OnOnGetControllerHints { get; set; } = null;
 
             void OnGetControllerHintsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaRoute2Info>> data)
             {
@@ -344,7 +347,7 @@ public partial class RouteCallback
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RouteCallback.html#onRoutesAdded(java.util.List)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.List"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnRoutesAdded(Java.Util.List<Android.Media.MediaRoute2Info> arg0)
             {
                 IExecuteWithSignature("onRoutesAdded", "(Ljava/util/List;)V", arg0);
@@ -353,7 +356,7 @@ public void OnRoutesAdded(Java.Util.List<Android.Media.MediaRoute2Info> arg0)
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RouteCallback.html#onRoutesChanged(java.util.List)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.List"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnRoutesChanged(Java.Util.List<Android.Media.MediaRoute2Info> arg0)
             {
                 IExecuteWithSignature("onRoutesChanged", "(Ljava/util/List;)V", arg0);
@@ -362,7 +365,7 @@ public void OnRoutesChanged(Java.Util.List<Android.Media.MediaRoute2Info> arg0)
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RouteCallback.html#onRoutesRemoved(java.util.List)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.List"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnRoutesRemoved(Java.Util.List<Android.Media.MediaRoute2Info> arg0)
             {
                 IExecuteWithSignature("onRoutesRemoved", "(Ljava/util/List;)V", arg0);
@@ -407,75 +410,84 @@ public partial class RoutingController
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getControlHints()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getRoutingSessionInfo()"/>
             /// </summary>
-            public Android.Os.Bundle ControlHints
+            /// <returns><see cref="Android.Media.RoutingSessionInfo"/></returns>
+            public Android.Media.RoutingSessionInfo GetRoutingSessionInfo()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getControlHints", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<Android.Media.RoutingSessionInfo>("getRoutingSessionInfo", "()Landroid/media/RoutingSessionInfo;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getDeselectableRoutes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getControlHints()"/>
             /// </summary>
-            public Java.Util.List<Android.Media.MediaRoute2Info> DeselectableRoutes
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetControlHints()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRoute2Info>>("getDeselectableRoutes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getControlHints", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#isReleased()"/>
             /// </summary>
-            public Java.Lang.String Id
+            /// <returns><see cref="bool"/></returns>
+            public bool IsReleased()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isReleased", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getRoutingSessionInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getVolume()"/>
             /// </summary>
-            public Android.Media.RoutingSessionInfo RoutingSessionInfo
+            /// <returns><see cref="int"/></returns>
+            public int GetVolume()
             {
-                get { return IExecuteWithSignature<Android.Media.RoutingSessionInfo>("getRoutingSessionInfo", "()Landroid/media/RoutingSessionInfo;"); }
+                return IExecuteWithSignature<int>("getVolume", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getSelectableRoutes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getVolumeHandling()"/>
             /// </summary>
-            public Java.Util.List<Android.Media.MediaRoute2Info> SelectableRoutes
+            /// <returns><see cref="int"/></returns>
+            public int GetVolumeHandling()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRoute2Info>>("getSelectableRoutes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("getVolumeHandling", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getSelectedRoutes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getVolumeMax()"/>
             /// </summary>
-            public Java.Util.List<Android.Media.MediaRoute2Info> SelectedRoutes
+            /// <returns><see cref="int"/></returns>
+            public int GetVolumeMax()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRoute2Info>>("getSelectedRoutes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("getVolumeMax", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getVolume()"/> <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#setVolume(int)"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getId()"/>
             /// </summary>
-            public int Volume
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetId()
             {
-                get { return IExecuteWithSignature<int>("getVolume", "()I"); } set { IExecuteWithSignature("setVolume", "(I)V", value); }
+                return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getVolumeHandling()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getDeselectableRoutes()"/>
             /// </summary>
-            public int VolumeHandling
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.Media.MediaRoute2Info> GetDeselectableRoutes()
             {
-                get { return IExecuteWithSignature<int>("getVolumeHandling", "()I"); }
+                return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRoute2Info>>("getDeselectableRoutes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getVolumeMax()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getSelectableRoutes()"/>
             /// </summary>
-            public int VolumeMax
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.Media.MediaRoute2Info> GetSelectableRoutes()
             {
-                get { return IExecuteWithSignature<int>("getVolumeMax", "()I"); }
+                return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRoute2Info>>("getSelectableRoutes", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#isReleased()"/>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#getSelectedRoutes()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsReleased()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.Media.MediaRoute2Info> GetSelectedRoutes()
             {
-                return IExecuteWithSignature<bool>("isReleased", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Android.Media.MediaRoute2Info>>("getSelectedRoutes", "()Ljava/util/List;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#deselectRoute(android.media.MediaRoute2Info)"/>
@@ -500,6 +512,14 @@ public void SelectRoute(Android.Media.MediaRoute2Info arg0)
             {
                 IExecuteWithSignature("selectRoute", "(Landroid/media/MediaRoute2Info;)V", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/MediaRouter2.RoutingController.html#setVolume(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetVolume(int arg0)
+            {
+                IExecuteWithSignature("setVolume", "(I)V", arg0);
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaScannerConnection.cs b/src/net/Netdroid/Generated/Android/Media/MediaScannerConnection.cs
index 70bf2fad7..98a701e42 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaScannerConnection.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaScannerConnection.cs
@@ -180,7 +180,7 @@ public partial class OnScanCompletedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onScanCompleted", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnScanCompletedEventHandler));
+                AddEventHandler("onScanCompleted", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnScanCompletedEventHandler));
 
             }
 
@@ -188,7 +188,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaScannerConnection.OnScanCompletedListener.html#onScanCompleted(java.lang.String,android.net.Uri)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScanCompleted"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, Android.Net.Uri> OnOnScanCompleted { get; set; } = null;
+            public global::System.Action<Java.Lang.String, Android.Net.Uri> OnOnScanCompleted { get; set; } = null;
 
             void OnScanCompletedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaSession2.cs b/src/net/Netdroid/Generated/Android/Media/MediaSession2.cs
index 49924c040..bb5c4691c 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaSession2.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaSession2.cs
@@ -46,25 +46,12 @@ public partial class MediaSession2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSession2.html#getConnectedControllers()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaSession2.html#getToken()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.MediaSession2.ControllerInfo> ConnectedControllers
+        /// <returns><see cref="Android.Media.Session2Token"/></returns>
+        public Android.Media.Session2Token GetToken()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaSession2.ControllerInfo>>("getConnectedControllers", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSession2.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSession2.html#getToken()"/> 
-        /// </summary>
-        public Android.Media.Session2Token Token
-        {
-            get { return IExecuteWithSignature<Android.Media.Session2Token>("getToken", "()Landroid/media/Session2Token;"); }
+            return IExecuteWithSignature<Android.Media.Session2Token>("getToken", "()Landroid/media/Session2Token;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaSession2.html#isPlaybackActive()"/>
@@ -86,6 +73,22 @@ public object SendSessionCommand(Android.Media.MediaSession2.ControllerInfo arg0
             return IExecute("sendSessionCommand", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSession2.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSession2.html#getConnectedControllers()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.MediaSession2.ControllerInfo> GetConnectedControllers()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.MediaSession2.ControllerInfo>>("getConnectedControllers", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaSession2.html#broadcastSessionCommand(android.media.Session2Command,android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Session2Command"/></param>
@@ -227,32 +230,36 @@ public partial class ControllerInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaSession2.ControllerInfo.html#getConnectionHints()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaSession2.ControllerInfo.html#getRemoteUserInfo()"/>
             /// </summary>
-            public Android.Os.Bundle ConnectionHints
+            /// <returns><see cref="Android.Media.Session.MediaSessionManager.RemoteUserInfo"/></returns>
+            public Android.Media.Session.MediaSessionManager.RemoteUserInfo GetRemoteUserInfo()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getConnectionHints", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<Android.Media.Session.MediaSessionManager.RemoteUserInfo>("getRemoteUserInfo", "()Landroid/media/session/MediaSessionManager$RemoteUserInfo;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaSession2.ControllerInfo.html#getPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaSession2.ControllerInfo.html#getConnectionHints()"/>
             /// </summary>
-            public Java.Lang.String PackageName
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetConnectionHints()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getConnectionHints", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaSession2.ControllerInfo.html#getRemoteUserInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaSession2.ControllerInfo.html#getUid()"/>
             /// </summary>
-            public Android.Media.Session.MediaSessionManager.RemoteUserInfo RemoteUserInfo
+            /// <returns><see cref="int"/></returns>
+            public int GetUid()
             {
-                get { return IExecuteWithSignature<Android.Media.Session.MediaSessionManager.RemoteUserInfo>("getRemoteUserInfo", "()Landroid/media/session/MediaSessionManager$RemoteUserInfo;"); }
+                return IExecuteWithSignature<int>("getUid", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaSession2.ControllerInfo.html#getUid()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaSession2.ControllerInfo.html#getPackageName()"/>
             /// </summary>
-            public int Uid
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPackageName()
             {
-                get { return IExecuteWithSignature<int>("getUid", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaSession2Service.cs b/src/net/Netdroid/Generated/Android/Media/MediaSession2Service.cs
index c550e69f4..0bd7c75ac 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaSession2Service.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaSession2Service.cs
@@ -52,13 +52,6 @@ public partial class MediaSession2Service
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSession2Service.html#getSessions()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.MediaSession2> Sessions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.MediaSession2>>("getSessions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaSession2Service.html#onGetSession(android.media.MediaSession2.ControllerInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.MediaSession2.ControllerInfo"/></param>
@@ -77,6 +70,14 @@ public Android.Media.MediaSession2Service.MediaNotification OnUpdateNotification
             return IExecuteWithSignature<Android.Media.MediaSession2Service.MediaNotification>("onUpdateNotification", "(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSession2Service.html#getSessions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.MediaSession2> GetSessions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.MediaSession2>>("getSessions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaSession2Service.html#addSession(android.media.MediaSession2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.MediaSession2"/></param>
@@ -126,18 +127,20 @@ public MediaNotification(int arg0, Android.App.Notification arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaSession2Service.MediaNotification.html#getNotification()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaSession2Service.MediaNotification.html#getNotification()"/>
             /// </summary>
-            public Android.App.Notification Notification
+            /// <returns><see cref="Android.App.Notification"/></returns>
+            public Android.App.Notification GetNotification()
             {
-                get { return IExecuteWithSignature<Android.App.Notification>("getNotification", "()Landroid/app/Notification;"); }
+                return IExecuteWithSignature<Android.App.Notification>("getNotification", "()Landroid/app/Notification;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/MediaSession2Service.MediaNotification.html#getNotificationId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/MediaSession2Service.MediaNotification.html#getNotificationId()"/>
             /// </summary>
-            public int NotificationId
+            /// <returns><see cref="int"/></returns>
+            public int GetNotificationId()
             {
-                get { return IExecuteWithSignature<int>("getNotificationId", "()I"); }
+                return IExecuteWithSignature<int>("getNotificationId", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaSync.cs b/src/net/Netdroid/Generated/Android/Media/MediaSync.cs
index a18c2855d..80b7d9ab0 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaSync.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaSync.cs
@@ -58,25 +58,28 @@ public partial class MediaSync
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#getPlaybackParams()"/> <see href="https://developer.android.com/reference/android/media/MediaSync.html#setPlaybackParams(android.media.PlaybackParams)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#getTimestamp()"/>
         /// </summary>
-        public Android.Media.PlaybackParams PlaybackParams
+        /// <returns><see cref="Android.Media.MediaTimestamp"/></returns>
+        public Android.Media.MediaTimestamp GetTimestamp()
         {
-            get { return IExecuteWithSignature<Android.Media.PlaybackParams>("getPlaybackParams", "()Landroid/media/PlaybackParams;"); } set { IExecuteWithSignature("setPlaybackParams", "(Landroid/media/PlaybackParams;)V", value); }
+            return IExecuteWithSignature<Android.Media.MediaTimestamp>("getTimestamp", "()Landroid/media/MediaTimestamp;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#getSyncParams()"/> <see href="https://developer.android.com/reference/android/media/MediaSync.html#setSyncParams(android.media.SyncParams)"/>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#getPlaybackParams()"/>
         /// </summary>
-        public Android.Media.SyncParams SyncParams
+        /// <returns><see cref="Android.Media.PlaybackParams"/></returns>
+        public Android.Media.PlaybackParams GetPlaybackParams()
         {
-            get { return IExecuteWithSignature<Android.Media.SyncParams>("getSyncParams", "()Landroid/media/SyncParams;"); } set { IExecuteWithSignature("setSyncParams", "(Landroid/media/SyncParams;)V", value); }
+            return IExecuteWithSignature<Android.Media.PlaybackParams>("getPlaybackParams", "()Landroid/media/PlaybackParams;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#getSyncParams()"/>
         /// </summary>
-        public Android.Media.MediaTimestamp Timestamp
+        /// <returns><see cref="Android.Media.SyncParams"/></returns>
+        public Android.Media.SyncParams GetSyncParams()
         {
-            get { return IExecuteWithSignature<Android.Media.MediaTimestamp>("getTimestamp", "()Landroid/media/MediaTimestamp;"); }
+            return IExecuteWithSignature<Android.Media.SyncParams>("getSyncParams", "()Landroid/media/SyncParams;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#createInputSurface()"/>
@@ -137,6 +140,14 @@ public void SetOnErrorListener(Android.Media.MediaSync.OnErrorListener arg0, And
             IExecute("setOnErrorListener", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#setPlaybackParams(android.media.PlaybackParams)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.PlaybackParams"/></param>
+        public void SetPlaybackParams(Android.Media.PlaybackParams arg0)
+        {
+            IExecuteWithSignature("setPlaybackParams", "(Landroid/media/PlaybackParams;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#setSurface(android.view.Surface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Surface"/></param>
@@ -144,6 +155,14 @@ public void SetSurface(Android.View.Surface arg0)
         {
             IExecuteWithSignature("setSurface", "(Landroid/view/Surface;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSync.html#setSyncParams(android.media.SyncParams)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.SyncParams"/></param>
+        public void SetSyncParams(Android.Media.SyncParams arg0)
+        {
+            IExecuteWithSignature("setSyncParams", "(Landroid/media/SyncParams;)V", arg0);
+        }
 
         #endregion
 
@@ -214,7 +233,7 @@ public partial class OnErrorListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaSync>>>(OnErrorEventHandler));
+                AddEventHandler("onError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.MediaSync>>>(OnErrorEventHandler));
 
             }
 
@@ -222,7 +241,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/MediaSync.OnErrorListener.html#onError(android.media.MediaSync,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.MediaSync, int, int> OnOnError { get; set; } = null;
+            public global::System.Action<Android.Media.MediaSync, int, int> OnOnError { get; set; } = null;
 
             void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.MediaSync>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaSyncEvent.cs b/src/net/Netdroid/Generated/Android/Media/MediaSyncEvent.cs
index 51c763e48..a9a40a52c 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaSyncEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaSyncEvent.cs
@@ -74,20 +74,6 @@ public static Android.Media.MediaSyncEvent CreateEvent(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSyncEvent.html#getAudioSessionId()"/> 
-        /// </summary>
-        public int AudioSessionId
-        {
-            get { return IExecuteWithSignature<int>("getAudioSessionId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaSyncEvent.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaSyncEvent.html#setAudioSessionId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -106,6 +92,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSyncEvent.html#getAudioSessionId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSessionId()
+        {
+            return IExecuteWithSignature<int>("getAudioSessionId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/MediaSyncEvent.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/MediaSyncEvent.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/MediaTimestamp.cs b/src/net/Netdroid/Generated/Android/Media/MediaTimestamp.cs
index d0376d62b..0078abb23 100644
--- a/src/net/Netdroid/Generated/Android/Media/MediaTimestamp.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MediaTimestamp.cs
@@ -62,33 +62,37 @@ public MediaTimestamp(long arg0, long arg1, float arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaTimestamp.html#getAnchorMediaTimeUs()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaTimestamp.html#getMediaClockRate()"/>
         /// </summary>
-        public long AnchorMediaTimeUs
+        /// <returns><see cref="float"/></returns>
+        public float GetMediaClockRate()
         {
-            get { return IExecuteWithSignature<long>("getAnchorMediaTimeUs", "()J"); }
+            return IExecuteWithSignature<float>("getMediaClockRate", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaTimestamp.html#getAnchorSystemNanoTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaTimestamp.html#getAnchorMediaTimeUs()"/>
         /// </summary>
-        public long AnchorSystemNanoTime
+        /// <returns><see cref="long"/></returns>
+        public long GetAnchorMediaTimeUs()
         {
-            get { return IExecuteWithSignature<long>("getAnchorSystemNanoTime", "()J"); }
+            return IExecuteWithSignature<long>("getAnchorMediaTimeUs", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaTimestamp.html#getAnchorSytemNanoTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaTimestamp.html#getAnchorSystemNanoTime()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long AnchorSytemNanoTime
+        /// <returns><see cref="long"/></returns>
+        public long GetAnchorSystemNanoTime()
         {
-            get { return IExecuteWithSignature<long>("getAnchorSytemNanoTime", "()J"); }
+            return IExecuteWithSignature<long>("getAnchorSystemNanoTime", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MediaTimestamp.html#getMediaClockRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MediaTimestamp.html#getAnchorSytemNanoTime()"/>
         /// </summary>
-        public float MediaClockRate
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetAnchorSytemNanoTime()
         {
-            get { return IExecuteWithSignature<float>("getMediaClockRate", "()F"); }
+            return IExecuteWithSignature<long>("getAnchorSytemNanoTime", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/AllPackageClasses.cs
index 06ada0595..ea873f6a9 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/AllPackageClasses.cs
@@ -124,12 +124,12 @@ public partial class Event : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Event>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Event class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Event class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Event() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Event class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Event class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Event(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/BundleSession.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/BundleSession.cs
index e4af11723..fd1122957 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/BundleSession.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/BundleSession.cs
@@ -52,11 +52,12 @@ public partial class BundleSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/BundleSession.html#getSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/BundleSession.html#getSessionId()"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId SessionId
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetSessionId()
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/BundleSession.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/EditingSession.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/EditingSession.cs
index 4f608e9f5..7998a76d8 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/EditingSession.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/EditingSession.cs
@@ -46,11 +46,12 @@ public partial class EditingSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/EditingSession.html#getSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/EditingSession.html#getSessionId()"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId SessionId
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetSessionId()
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/EditingSession.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/Event.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/Event.cs
index 119eb974f..5fdca1376 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/Event.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/Event.cs
@@ -46,18 +46,20 @@ public partial class Event
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/Event.html#getMetricsBundle()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/Event.html#getMetricsBundle()"/>
         /// </summary>
-        public Android.Os.Bundle MetricsBundle
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetMetricsBundle()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getMetricsBundle", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getMetricsBundle", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/Event.html#getTimeSinceCreatedMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/Event.html#getTimeSinceCreatedMillis()"/>
         /// </summary>
-        public long TimeSinceCreatedMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetTimeSinceCreatedMillis()
         {
-            get { return IExecuteWithSignature<long>("getTimeSinceCreatedMillis", "()J"); }
+            return IExecuteWithSignature<long>("getTimeSinceCreatedMillis", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/LogSessionId.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/LogSessionId.cs
index 2d800ffdd..e96d38787 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/LogSessionId.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/LogSessionId.cs
@@ -52,11 +52,12 @@ public partial class LogSessionId
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/LogSessionId.html#getStringId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/LogSessionId.html#getStringId()"/>
         /// </summary>
-        public Java.Lang.String StringId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetStringId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getStringId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getStringId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/NetworkEvent.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/NetworkEvent.cs
index c7f41391b..74c4da498 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/NetworkEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/NetworkEvent.cs
@@ -116,19 +116,20 @@ public partial class NetworkEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/NetworkEvent.html#getNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/NetworkEvent.html#describeContents()"/>
         /// </summary>
-        public int NetworkType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getNetworkType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/NetworkEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/metrics/NetworkEvent.html#getNetworkType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetNetworkType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getNetworkType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/NetworkEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackErrorEvent.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackErrorEvent.cs
index c58a617a7..779c5f97a 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackErrorEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackErrorEvent.cs
@@ -272,26 +272,28 @@ public partial class PlaybackErrorEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackErrorEvent.html#getErrorCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackErrorEvent.html#describeContents()"/>
         /// </summary>
-        public int ErrorCode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getErrorCode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackErrorEvent.html#getSubErrorCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackErrorEvent.html#getErrorCode()"/>
         /// </summary>
-        public int SubErrorCode
+        /// <returns><see cref="int"/></returns>
+        public int GetErrorCode()
         {
-            get { return IExecuteWithSignature<int>("getSubErrorCode", "()I"); }
+            return IExecuteWithSignature<int>("getErrorCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackErrorEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackErrorEvent.html#getSubErrorCode()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSubErrorCode()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSubErrorCode", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackErrorEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackMetrics.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackMetrics.cs
index 40c8a4400..905e41dc8 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackMetrics.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackMetrics.cs
@@ -202,131 +202,148 @@ public partial class PlaybackMetrics
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getAudioUnderrunCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getMetricsBundle()"/>
         /// </summary>
-        public int AudioUnderrunCount
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetMetricsBundle()
         {
-            get { return IExecuteWithSignature<int>("getAudioUnderrunCount", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getMetricsBundle", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getContentType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getDrmSessionId()"/>
         /// </summary>
-        public int ContentType
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetDrmSessionId()
         {
-            get { return IExecuteWithSignature<int>("getContentType", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getDrmSessionId", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getDrmSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#describeContents()"/>
         /// </summary>
-        public byte[] DrmSessionId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<byte>("getDrmSessionId", "()[B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getDrmType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getAudioUnderrunCount()"/>
         /// </summary>
-        public int DrmType
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioUnderrunCount()
         {
-            get { return IExecuteWithSignature<int>("getDrmType", "()I"); }
+            return IExecuteWithSignature<int>("getAudioUnderrunCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getExperimentIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getContentType()"/>
         /// </summary>
-        public long[] ExperimentIds
+        /// <returns><see cref="int"/></returns>
+        public int GetContentType()
         {
-            get { return IExecuteWithSignatureArray<long>("getExperimentIds", "()[J"); }
+            return IExecuteWithSignature<int>("getContentType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getLocalBytesRead()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getDrmType()"/>
         /// </summary>
-        public long LocalBytesRead
+        /// <returns><see cref="int"/></returns>
+        public int GetDrmType()
         {
-            get { return IExecuteWithSignature<long>("getLocalBytesRead", "()J"); }
+            return IExecuteWithSignature<int>("getDrmType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getMediaDurationMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getPlaybackType()"/>
         /// </summary>
-        public long MediaDurationMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetPlaybackType()
         {
-            get { return IExecuteWithSignature<long>("getMediaDurationMillis", "()J"); }
+            return IExecuteWithSignature<int>("getPlaybackType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getMetricsBundle()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getStreamSource()"/>
         /// </summary>
-        public Android.Os.Bundle MetricsBundle
+        /// <returns><see cref="int"/></returns>
+        public int GetStreamSource()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getMetricsBundle", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getStreamSource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getNetworkBytesRead()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getStreamType()"/>
         /// </summary>
-        public long NetworkBytesRead
+        /// <returns><see cref="int"/></returns>
+        public int GetStreamType()
         {
-            get { return IExecuteWithSignature<long>("getNetworkBytesRead", "()J"); }
+            return IExecuteWithSignature<int>("getStreamType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getNetworkTransferDurationMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getVideoFramesDropped()"/>
         /// </summary>
-        public long NetworkTransferDurationMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoFramesDropped()
         {
-            get { return IExecuteWithSignature<long>("getNetworkTransferDurationMillis", "()J"); }
+            return IExecuteWithSignature<int>("getVideoFramesDropped", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getPlaybackType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getVideoFramesPlayed()"/>
         /// </summary>
-        public int PlaybackType
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoFramesPlayed()
         {
-            get { return IExecuteWithSignature<int>("getPlaybackType", "()I"); }
+            return IExecuteWithSignature<int>("getVideoFramesPlayed", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getPlayerName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getPlayerName()"/>
         /// </summary>
-        public Java.Lang.String PlayerName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPlayerName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPlayerName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPlayerName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getPlayerVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getPlayerVersion()"/>
         /// </summary>
-        public Java.Lang.String PlayerVersion
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPlayerVersion()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPlayerVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPlayerVersion", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getStreamSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getLocalBytesRead()"/>
         /// </summary>
-        public int StreamSource
+        /// <returns><see cref="long"/></returns>
+        public long GetLocalBytesRead()
         {
-            get { return IExecuteWithSignature<int>("getStreamSource", "()I"); }
+            return IExecuteWithSignature<long>("getLocalBytesRead", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getStreamType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getMediaDurationMillis()"/>
         /// </summary>
-        public int StreamType
+        /// <returns><see cref="long"/></returns>
+        public long GetMediaDurationMillis()
         {
-            get { return IExecuteWithSignature<int>("getStreamType", "()I"); }
+            return IExecuteWithSignature<long>("getMediaDurationMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getVideoFramesDropped()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getNetworkBytesRead()"/>
         /// </summary>
-        public int VideoFramesDropped
+        /// <returns><see cref="long"/></returns>
+        public long GetNetworkBytesRead()
         {
-            get { return IExecuteWithSignature<int>("getVideoFramesDropped", "()I"); }
+            return IExecuteWithSignature<long>("getNetworkBytesRead", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getVideoFramesPlayed()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getNetworkTransferDurationMillis()"/>
         /// </summary>
-        public int VideoFramesPlayed
+        /// <returns><see cref="long"/></returns>
+        public long GetNetworkTransferDurationMillis()
         {
-            get { return IExecuteWithSignature<int>("getVideoFramesPlayed", "()I"); }
+            return IExecuteWithSignature<long>("getNetworkTransferDurationMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#getExperimentIds()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long[] GetExperimentIds()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<long>("getExperimentIds", "()[J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackMetrics.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackSession.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackSession.cs
index 98caf4a19..8252584f5 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackSession.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackSession.cs
@@ -46,11 +46,12 @@ public partial class PlaybackSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackSession.html#getSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackSession.html#getSessionId()"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId SessionId
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetSessionId()
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackSession.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackStateEvent.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackStateEvent.cs
index 2d63eca89..e589561a8 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackStateEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/PlaybackStateEvent.cs
@@ -146,19 +146,20 @@ public partial class PlaybackStateEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackStateEvent.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackStateEvent.html#describeContents()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackStateEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackStateEvent.html#getState()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetState()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/PlaybackStateEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/RecordingSession.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/RecordingSession.cs
index 5505e4ae9..ca7cf0d98 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/RecordingSession.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/RecordingSession.cs
@@ -46,11 +46,12 @@ public partial class RecordingSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/RecordingSession.html#getSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/RecordingSession.html#getSessionId()"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId SessionId
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetSessionId()
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/RecordingSession.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/TrackChangeEvent.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/TrackChangeEvent.cs
index 7deeb007f..c8c6a57bf 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/TrackChangeEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/TrackChangeEvent.cs
@@ -116,110 +116,124 @@ public partial class TrackChangeEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getAudioSampleRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getVideoFrameRate()"/>
         /// </summary>
-        public int AudioSampleRate
+        /// <returns><see cref="float"/></returns>
+        public float GetVideoFrameRate()
         {
-            get { return IExecuteWithSignature<int>("getAudioSampleRate", "()I"); }
+            return IExecuteWithSignature<float>("getVideoFrameRate", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getBitrate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#describeContents()"/>
         /// </summary>
-        public int Bitrate
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getBitrate", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getChannelCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getAudioSampleRate()"/>
         /// </summary>
-        public int ChannelCount
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSampleRate()
         {
-            get { return IExecuteWithSignature<int>("getChannelCount", "()I"); }
+            return IExecuteWithSignature<int>("getAudioSampleRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getCodecName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getBitrate()"/>
         /// </summary>
-        public Java.Lang.String CodecName
+        /// <returns><see cref="int"/></returns>
+        public int GetBitrate()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCodecName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getBitrate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getContainerMimeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getChannelCount()"/>
         /// </summary>
-        public Java.Lang.String ContainerMimeType
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelCount()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getContainerMimeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getChannelCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getHeight()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getLanguage()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getTrackChangeReason()"/>
         /// </summary>
-        public Java.Lang.String Language
+        /// <returns><see cref="int"/></returns>
+        public int GetTrackChangeReason()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getTrackChangeReason", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getLanguageRegion()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getTrackState()"/>
         /// </summary>
-        public Java.Lang.String LanguageRegion
+        /// <returns><see cref="int"/></returns>
+        public int GetTrackState()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLanguageRegion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getTrackState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getSampleMimeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getTrackType()"/>
         /// </summary>
-        public Java.Lang.String SampleMimeType
+        /// <returns><see cref="int"/></returns>
+        public int GetTrackType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSampleMimeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getTrackType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getTrackChangeReason()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getWidth()"/>
         /// </summary>
-        public int TrackChangeReason
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<int>("getTrackChangeReason", "()I"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getTrackState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getCodecName()"/>
         /// </summary>
-        public int TrackState
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCodecName()
         {
-            get { return IExecuteWithSignature<int>("getTrackState", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCodecName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getTrackType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getContainerMimeType()"/>
         /// </summary>
-        public int TrackType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetContainerMimeType()
         {
-            get { return IExecuteWithSignature<int>("getTrackType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getContainerMimeType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getVideoFrameRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getLanguage()"/>
         /// </summary>
-        public float VideoFrameRate
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLanguage()
         {
-            get { return IExecuteWithSignature<float>("getVideoFrameRate", "()F"); }
+            return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getLanguageRegion()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLanguageRegion()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getLanguageRegion", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#getSampleMimeType()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSampleMimeType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getSampleMimeType", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/TrackChangeEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Metrics/TranscodingSession.cs b/src/net/Netdroid/Generated/Android/Media/Metrics/TranscodingSession.cs
index 1fa2f5a7b..3aadfe805 100644
--- a/src/net/Netdroid/Generated/Android/Media/Metrics/TranscodingSession.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Metrics/TranscodingSession.cs
@@ -46,11 +46,12 @@ public partial class TranscodingSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/metrics/TranscodingSession.html#getSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/metrics/TranscodingSession.html#getSessionId()"/>
         /// </summary>
-        public Android.Media.Metrics.LogSessionId SessionId
+        /// <returns><see cref="Android.Media.Metrics.LogSessionId"/></returns>
+        public Android.Media.Metrics.LogSessionId GetSessionId()
         {
-            get { return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;"); }
+            return IExecuteWithSignature<Android.Media.Metrics.LogSessionId>("getSessionId", "()Landroid/media/metrics/LogSessionId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/metrics/TranscodingSession.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/MicrophoneInfo.cs b/src/net/Netdroid/Generated/Android/Media/MicrophoneInfo.cs
index 4d2a1e008..9fedc9a3d 100644
--- a/src/net/Netdroid/Generated/Android/Media/MicrophoneInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/MicrophoneInfo.cs
@@ -154,109 +154,124 @@ public partial class MicrophoneInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getOrientation()"/>
         /// </summary>
-        public Java.Lang.String Address
+        /// <returns><see cref="Android.Media.MicrophoneInfo.Coordinate3F"/></returns>
+        public Android.Media.MicrophoneInfo.Coordinate3F GetOrientation()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Media.MicrophoneInfo.Coordinate3F>("getOrientation", "()Landroid/media/MicrophoneInfo$Coordinate3F;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getChannelMapping()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getPosition()"/>
         /// </summary>
-        public Java.Util.List<Android.Util.Pair<Java.Lang.Integer, Java.Lang.Integer>> ChannelMapping
+        /// <returns><see cref="Android.Media.MicrophoneInfo.Coordinate3F"/></returns>
+        public Android.Media.MicrophoneInfo.Coordinate3F GetPosition()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.Integer, Java.Lang.Integer>>>("getChannelMapping", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Media.MicrophoneInfo.Coordinate3F>("getPosition", "()Landroid/media/MicrophoneInfo$Coordinate3F;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getMaxSpl()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="float"/></returns>
+        public float GetMaxSpl()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<float>("getMaxSpl", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getDirectionality()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getMinSpl()"/>
         /// </summary>
-        public int Directionality
+        /// <returns><see cref="float"/></returns>
+        public float GetMinSpl()
         {
-            get { return IExecuteWithSignature<int>("getDirectionality", "()I"); }
+            return IExecuteWithSignature<float>("getMinSpl", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getFrequencyResponse()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getSensitivity()"/>
         /// </summary>
-        public Java.Util.List<Android.Util.Pair<Java.Lang.Float, Java.Lang.Float>> FrequencyResponse
+        /// <returns><see cref="float"/></returns>
+        public float GetSensitivity()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.Float, Java.Lang.Float>>>("getFrequencyResponse", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<float>("getSensitivity", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getGroup()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getDirectionality()"/>
         /// </summary>
-        public int Group
+        /// <returns><see cref="int"/></returns>
+        public int GetDirectionality()
         {
-            get { return IExecuteWithSignature<int>("getGroup", "()I"); }
+            return IExecuteWithSignature<int>("getDirectionality", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getGroup()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int GetGroup()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<int>("getGroup", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getIndexInTheGroup()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getId()"/>
         /// </summary>
-        public int IndexInTheGroup
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<int>("getIndexInTheGroup", "()I"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getLocation()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getIndexInTheGroup()"/>
         /// </summary>
-        public int Location
+        /// <returns><see cref="int"/></returns>
+        public int GetIndexInTheGroup()
         {
-            get { return IExecuteWithSignature<int>("getLocation", "()I"); }
+            return IExecuteWithSignature<int>("getIndexInTheGroup", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getMaxSpl()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getLocation()"/>
         /// </summary>
-        public float MaxSpl
+        /// <returns><see cref="int"/></returns>
+        public int GetLocation()
         {
-            get { return IExecuteWithSignature<float>("getMaxSpl", "()F"); }
+            return IExecuteWithSignature<int>("getLocation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getMinSpl()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getType()"/>
         /// </summary>
-        public float MinSpl
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<float>("getMinSpl", "()F"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getOrientation()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getAddress()"/>
         /// </summary>
-        public Android.Media.MicrophoneInfo.Coordinate3F Orientation
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAddress()
         {
-            get { return IExecuteWithSignature<Android.Media.MicrophoneInfo.Coordinate3F>("getOrientation", "()Landroid/media/MicrophoneInfo$Coordinate3F;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getDescription()"/>
         /// </summary>
-        public Android.Media.MicrophoneInfo.Coordinate3F Position
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<Android.Media.MicrophoneInfo.Coordinate3F>("getPosition", "()Landroid/media/MicrophoneInfo$Coordinate3F;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getSensitivity()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getFrequencyResponse()"/>
         /// </summary>
-        public float Sensitivity
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Util.Pair<Java.Lang.Float, Java.Lang.Float>> GetFrequencyResponse()
         {
-            get { return IExecuteWithSignature<float>("getSensitivity", "()F"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.Float, Java.Lang.Float>>>("getFrequencyResponse", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/MicrophoneInfo.html#getChannelMapping()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Util.Pair<Java.Lang.Integer, Java.Lang.Integer>> GetChannelMapping()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.Integer, Java.Lang.Integer>>>("getChannelMapping", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Midi/AllPackageClasses.cs
index 01cb41c9f..fa3123360 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/AllPackageClasses.cs
@@ -212,12 +212,12 @@ public partial class MidiDeviceService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MidiDeviceService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MidiDeviceService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MidiDeviceService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MidiDeviceService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MidiDeviceService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MidiDeviceService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -431,10 +431,13 @@ public partial class OnDeviceOpenedListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnDeviceOpenedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.midi.MidiManager_OnDeviceOpenedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.midi.OnDeviceOpenedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -456,10 +459,13 @@ public partial class OnDeviceOpenedListenerDirect : OnDeviceOpenedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.midi.MidiManager$OnDeviceOpenedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.midi.MidiManager$OnDeviceOpenedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -537,12 +543,12 @@ public partial class MidiReceiver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Midi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MidiReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MidiReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MidiReceiver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MidiReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MidiReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MidiReceiver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -583,12 +589,12 @@ public partial class MidiSender : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MidiSe
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MidiSender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MidiSender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MidiSender() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MidiSender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MidiSender class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MidiSender(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/MidiDevice.cs b/src/net/Netdroid/Generated/Android/Media/Midi/MidiDevice.cs
index 7c87d64b8..bf0509b60 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/MidiDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/MidiDevice.cs
@@ -46,13 +46,6 @@ public partial class MidiDevice
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDevice.html#getInfo()"/> 
-        /// </summary>
-        public Android.Media.Midi.MidiDeviceInfo Info
-        {
-            get { return IExecuteWithSignature<Android.Media.Midi.MidiDeviceInfo>("getInfo", "()Landroid/media/midi/MidiDeviceInfo;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiDevice.html#connectPorts(android.media.midi.MidiInputPort,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Midi.MidiInputPort"/></param>
@@ -63,6 +56,14 @@ public Android.Media.Midi.MidiDevice.MidiConnection ConnectPorts(Android.Media.M
             return IExecute<Android.Media.Midi.MidiDevice.MidiConnection>("connectPorts", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDevice.html#getInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Midi.MidiDeviceInfo"/></returns>
+        public Android.Media.Midi.MidiDeviceInfo GetInfo()
+        {
+            return IExecuteWithSignature<Android.Media.Midi.MidiDeviceInfo>("getInfo", "()Landroid/media/midi/MidiDeviceInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiDevice.html#openInputPort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceInfo.cs b/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceInfo.cs
index 137f47319..45936b4d6 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceInfo.cs
@@ -160,69 +160,76 @@ public partial class MidiDeviceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getDefaultProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getPorts()"/>
         /// </summary>
-        public int DefaultProtocol
+        /// <returns><see cref="Android.Media.Midi.MidiDeviceInfo.PortInfo"/></returns>
+        public Android.Media.Midi.MidiDeviceInfo.PortInfo[] GetPorts()
         {
-            get { return IExecuteWithSignature<int>("getDefaultProtocol", "()I"); }
+            return IExecuteWithSignatureArray<Android.Media.Midi.MidiDeviceInfo.PortInfo>("getPorts", "()[Landroid/media/midi/MidiDeviceInfo$PortInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getProperties()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetProperties()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getProperties", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getInputPortCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#isPrivate()"/>
         /// </summary>
-        public int InputPortCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPrivate()
         {
-            get { return IExecuteWithSignature<int>("getInputPortCount", "()I"); }
+            return IExecuteWithSignature<bool>("isPrivate", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getOutputPortCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#describeContents()"/>
         /// </summary>
-        public int OutputPortCount
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getOutputPortCount", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getPorts()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getDefaultProtocol()"/>
         /// </summary>
-        public Android.Media.Midi.MidiDeviceInfo.PortInfo[] Ports
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultProtocol()
         {
-            get { return IExecuteWithSignatureArray<Android.Media.Midi.MidiDeviceInfo.PortInfo>("getPorts", "()[Landroid/media/midi/MidiDeviceInfo$PortInfo;"); }
+            return IExecuteWithSignature<int>("getDefaultProtocol", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getProperties()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getId()"/>
         /// </summary>
-        public Android.Os.Bundle Properties
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getProperties", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getInputPortCount()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetInputPortCount()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getInputPortCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#isPrivate()"/>
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getOutputPortCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPrivate()
+        /// <returns><see cref="int"/></returns>
+        public int GetOutputPortCount()
         {
-            return IExecuteWithSignature<bool>("isPrivate", "()Z");
+            return IExecuteWithSignature<int>("getOutputPortCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#getType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.html#writeToParcel(android.os.Parcel,int)"/>
@@ -270,25 +277,28 @@ public partial class PortInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.PortInfo.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.PortInfo.html#getPortNumber()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="int"/></returns>
+            public int GetPortNumber()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getPortNumber", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.PortInfo.html#getPortNumber()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.PortInfo.html#getType()"/>
             /// </summary>
-            public int PortNumber
+            /// <returns><see cref="int"/></returns>
+            public int GetType()
             {
-                get { return IExecuteWithSignature<int>("getPortNumber", "()I"); }
+                return IExecuteWithSignature<int>("getType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.PortInfo.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceInfo.PortInfo.html#getName()"/>
             /// </summary>
-            public int Type
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<int>("getType", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceService.cs b/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceService.cs
index 11ed34a54..500cfd848 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceService.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceService.cs
@@ -52,26 +52,28 @@ public partial class MidiDeviceService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceService.html#getDeviceInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceService.html#onGetInputPortReceivers()"/>
         /// </summary>
-        public Android.Media.Midi.MidiDeviceInfo DeviceInfo
+        /// <returns><see cref="Android.Media.Midi.MidiReceiver"/></returns>
+        public Android.Media.Midi.MidiReceiver[] OnGetInputPortReceivers()
         {
-            get { return IExecuteWithSignature<Android.Media.Midi.MidiDeviceInfo>("getDeviceInfo", "()Landroid/media/midi/MidiDeviceInfo;"); }
+            return IExecuteWithSignatureArray<Android.Media.Midi.MidiReceiver>("onGetInputPortReceivers", "()[Landroid/media/midi/MidiReceiver;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceService.html#getOutputPortReceivers()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceService.html#getDeviceInfo()"/>
         /// </summary>
-        public Android.Media.Midi.MidiReceiver[] OutputPortReceivers
+        /// <returns><see cref="Android.Media.Midi.MidiDeviceInfo"/></returns>
+        public Android.Media.Midi.MidiDeviceInfo GetDeviceInfo()
         {
-            get { return IExecuteWithSignatureArray<Android.Media.Midi.MidiReceiver>("getOutputPortReceivers", "()[Landroid/media/midi/MidiReceiver;"); }
+            return IExecuteWithSignature<Android.Media.Midi.MidiDeviceInfo>("getDeviceInfo", "()Landroid/media/midi/MidiDeviceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceService.html#onGetInputPortReceivers()"/>
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceService.html#getOutputPortReceivers()"/>
         /// </summary>
         /// <returns><see cref="Android.Media.Midi.MidiReceiver"/></returns>
-        public Android.Media.Midi.MidiReceiver[] OnGetInputPortReceivers()
+        public Android.Media.Midi.MidiReceiver[] GetOutputPortReceivers()
         {
-            return IExecuteWithSignatureArray<Android.Media.Midi.MidiReceiver>("onGetInputPortReceivers", "()[Landroid/media/midi/MidiReceiver;");
+            return IExecuteWithSignatureArray<Android.Media.Midi.MidiReceiver>("getOutputPortReceivers", "()[Landroid/media/midi/MidiReceiver;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceService.html#onClose()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceStatus.cs b/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceStatus.cs
index fe6167f32..8287cfae0 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceStatus.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/MidiDeviceStatus.cs
@@ -52,11 +52,12 @@ public partial class MidiDeviceStatus
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceStatus.html#getDeviceInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceStatus.html#getDeviceInfo()"/>
         /// </summary>
-        public Android.Media.Midi.MidiDeviceInfo DeviceInfo
+        /// <returns><see cref="Android.Media.Midi.MidiDeviceInfo"/></returns>
+        public Android.Media.Midi.MidiDeviceInfo GetDeviceInfo()
         {
-            get { return IExecuteWithSignature<Android.Media.Midi.MidiDeviceInfo>("getDeviceInfo", "()Landroid/media/midi/MidiDeviceInfo;"); }
+            return IExecuteWithSignature<Android.Media.Midi.MidiDeviceInfo>("getDeviceInfo", "()Landroid/media/midi/MidiDeviceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiDeviceStatus.html#isInputPortOpen(int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/MidiInputPort.cs b/src/net/Netdroid/Generated/Android/Media/Midi/MidiInputPort.cs
index c91409a0d..e42209bef 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/MidiInputPort.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/MidiInputPort.cs
@@ -50,11 +50,12 @@ public partial class MidiInputPort
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiInputPort.html#getPortNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiInputPort.html#getPortNumber()"/>
         /// </summary>
-        public int PortNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetPortNumber()
         {
-            get { return IExecuteWithSignature<int>("getPortNumber", "()I"); }
+            return IExecuteWithSignature<int>("getPortNumber", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiInputPort.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/MidiManager.cs b/src/net/Netdroid/Generated/Android/Media/Midi/MidiManager.cs
index afc6298a2..021a3fd34 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/MidiManager.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/MidiManager.cs
@@ -58,12 +58,13 @@ public partial class MidiManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiManager.html#getDevices()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiManager.html#getDevices()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Media.Midi.MidiDeviceInfo[] Devices
+        /// <returns><see cref="Android.Media.Midi.MidiDeviceInfo"/></returns>
+        [global::System.Obsolete()]
+        public Android.Media.Midi.MidiDeviceInfo[] GetDevices()
         {
-            get { return IExecuteWithSignatureArray<Android.Media.Midi.MidiDeviceInfo>("getDevices", "()[Landroid/media/midi/MidiDeviceInfo;"); }
+            return IExecuteWithSignatureArray<Android.Media.Midi.MidiDeviceInfo>("getDevices", "()[Landroid/media/midi/MidiDeviceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiManager.html#getDevicesForTransport(int)"/>
@@ -99,7 +100,7 @@ public void OpenDevice(Android.Media.Midi.MidiDeviceInfo arg0, Android.Media.Mid
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Midi.MidiManager.DeviceCallback"/></param>
         /// <param name="arg1"><see cref="Android.Os.Handler"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RegisterDeviceCallback(Android.Media.Midi.MidiManager.DeviceCallback arg0, Android.Os.Handler arg1)
         {
             IExecute("registerDeviceCallback", arg0, arg1);
@@ -206,7 +207,7 @@ public partial class OnDeviceOpenedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDeviceOpened", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Midi.MidiDevice>>>(OnDeviceOpenedEventHandler));
+                AddEventHandler("onDeviceOpened", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Midi.MidiDevice>>>(OnDeviceOpenedEventHandler));
 
             }
 
@@ -214,7 +215,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/midi/MidiManager.OnDeviceOpenedListener.html#onDeviceOpened(android.media.midi.MidiDevice)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDeviceOpened"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Midi.MidiDevice> OnOnDeviceOpened { get; set; } = null;
+            public global::System.Action<Android.Media.Midi.MidiDevice> OnOnDeviceOpened { get; set; } = null;
 
             void OnDeviceOpenedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Midi.MidiDevice>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/MidiOutputPort.cs b/src/net/Netdroid/Generated/Android/Media/Midi/MidiOutputPort.cs
index 7aab6d36b..a73fe353f 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/MidiOutputPort.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/MidiOutputPort.cs
@@ -50,11 +50,12 @@ public partial class MidiOutputPort
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiOutputPort.html#getPortNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiOutputPort.html#getPortNumber()"/>
         /// </summary>
-        public int PortNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetPortNumber()
         {
-            get { return IExecuteWithSignature<int>("getPortNumber", "()I"); }
+            return IExecuteWithSignature<int>("getPortNumber", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiOutputPort.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Midi/MidiReceiver.cs b/src/net/Netdroid/Generated/Android/Media/Midi/MidiReceiver.cs
index f5127cf21..181d483e5 100644
--- a/src/net/Netdroid/Generated/Android/Media/Midi/MidiReceiver.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Midi/MidiReceiver.cs
@@ -54,13 +54,6 @@ public MidiReceiver(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/midi/MidiReceiver.html#getMaxMessageSize()"/> 
-        /// </summary>
-        public int MaxMessageSize
-        {
-            get { return IExecuteWithSignature<int>("getMaxMessageSize", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiReceiver.html#onSend(byte[],int,int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
@@ -73,6 +66,14 @@ public void OnSend(byte[] arg0, int arg1, int arg2, long arg3)
             IExecute("onSend", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/midi/MidiReceiver.html#getMaxMessageSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxMessageSize()
+        {
+            return IExecuteWithSignature<int>("getMaxMessageSize", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/midi/MidiReceiver.html#flush()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/PlaybackParams.cs b/src/net/Netdroid/Generated/Android/Media/PlaybackParams.cs
index 90abb64b0..aec014be1 100644
--- a/src/net/Netdroid/Generated/Android/Media/PlaybackParams.cs
+++ b/src/net/Netdroid/Generated/Android/Media/PlaybackParams.cs
@@ -70,27 +70,6 @@ public partial class PlaybackParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#getAudioFallbackMode()"/> 
-        /// </summary>
-        public int AudioFallbackMode
-        {
-            get { return IExecuteWithSignature<int>("getAudioFallbackMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#getPitch()"/> 
-        /// </summary>
-        public float Pitch
-        {
-            get { return IExecuteWithSignature<float>("getPitch", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#getSpeed()"/> 
-        /// </summary>
-        public float Speed
-        {
-            get { return IExecuteWithSignature<float>("getSpeed", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#allowDefaults()"/>
         /// </summary>
         /// <returns><see cref="Android.Media.PlaybackParams"/></returns>
@@ -126,6 +105,22 @@ public Android.Media.PlaybackParams SetSpeed(float arg0)
             return IExecuteWithSignature<Android.Media.PlaybackParams>("setSpeed", "(F)Landroid/media/PlaybackParams;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#getPitch()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetPitch()
+        {
+            return IExecuteWithSignature<float>("getPitch", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#getSpeed()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetSpeed()
+        {
+            return IExecuteWithSignature<float>("getSpeed", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -134,6 +129,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#getAudioFallbackMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioFallbackMode()
+        {
+            return IExecuteWithSignature<int>("getAudioFallbackMode", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/PlaybackParams.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/Projection/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Projection/AllPackageClasses.cs
index 7a93e59a5..4c6f873fa 100644
--- a/src/net/Netdroid/Generated/Android/Media/Projection/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Projection/AllPackageClasses.cs
@@ -76,12 +76,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Media/Rating.cs b/src/net/Netdroid/Generated/Android/Media/Rating.cs
index ac9a20de0..2e64da6bf 100644
--- a/src/net/Netdroid/Generated/Android/Media/Rating.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Rating.cs
@@ -140,27 +140,6 @@ public static Android.Media.Rating NewUnratedRating(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Rating.html#getPercentRating()"/> 
-        /// </summary>
-        public float PercentRating
-        {
-            get { return IExecuteWithSignature<float>("getPercentRating", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Rating.html#getRatingStyle()"/> 
-        /// </summary>
-        public int RatingStyle
-        {
-            get { return IExecuteWithSignature<int>("getRatingStyle", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Rating.html#getStarRating()"/> 
-        /// </summary>
-        public float StarRating
-        {
-            get { return IExecuteWithSignature<float>("getStarRating", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Rating.html#hasHeart()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -185,6 +164,22 @@ public bool IsThumbUp()
             return IExecuteWithSignature<bool>("isThumbUp", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Rating.html#getPercentRating()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetPercentRating()
+        {
+            return IExecuteWithSignature<float>("getPercentRating", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Rating.html#getStarRating()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetStarRating()
+        {
+            return IExecuteWithSignature<float>("getStarRating", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Rating.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -193,6 +188,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Rating.html#getRatingStyle()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRatingStyle()
+        {
+            return IExecuteWithSignature<int>("getRatingStyle", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Rating.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/RemoteControlClient.cs b/src/net/Netdroid/Generated/Android/Media/RemoteControlClient.cs
index 860fc4d57..aaf0bc72f 100644
--- a/src/net/Netdroid/Generated/Android/Media/RemoteControlClient.cs
+++ b/src/net/Netdroid/Generated/Android/Media/RemoteControlClient.cs
@@ -34,7 +34,7 @@ public partial class RemoteControlClient
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
         /// <param name="arg1"><see cref="Android.Os.Looper"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public RemoteControlClient(Android.App.PendingIntent arg0, Android.Os.Looper arg1)
             : base(arg0, arg1)
         {
@@ -43,7 +43,7 @@ public RemoteControlClient(Android.App.PendingIntent arg0, Android.Os.Looper arg
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#%3Cinit%3E(android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public RemoteControlClient(Android.App.PendingIntent arg0)
             : base(arg0)
         {
@@ -59,133 +59,133 @@ public RemoteControlClient(Android.App.PendingIntent arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_FAST_FORWARD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_FAST_FORWARD { get { if (!_FLAG_KEY_MEDIA_FAST_FORWARDReady) { _FLAG_KEY_MEDIA_FAST_FORWARDContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_FAST_FORWARD"); _FLAG_KEY_MEDIA_FAST_FORWARDReady = true; } return _FLAG_KEY_MEDIA_FAST_FORWARDContent; } }
         private static int _FLAG_KEY_MEDIA_FAST_FORWARDContent = default;
         private static bool _FLAG_KEY_MEDIA_FAST_FORWARDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_NEXT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_NEXT { get { if (!_FLAG_KEY_MEDIA_NEXTReady) { _FLAG_KEY_MEDIA_NEXTContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_NEXT"); _FLAG_KEY_MEDIA_NEXTReady = true; } return _FLAG_KEY_MEDIA_NEXTContent; } }
         private static int _FLAG_KEY_MEDIA_NEXTContent = default;
         private static bool _FLAG_KEY_MEDIA_NEXTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_PAUSE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_PAUSE { get { if (!_FLAG_KEY_MEDIA_PAUSEReady) { _FLAG_KEY_MEDIA_PAUSEContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_PAUSE"); _FLAG_KEY_MEDIA_PAUSEReady = true; } return _FLAG_KEY_MEDIA_PAUSEContent; } }
         private static int _FLAG_KEY_MEDIA_PAUSEContent = default;
         private static bool _FLAG_KEY_MEDIA_PAUSEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_PLAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_PLAY { get { if (!_FLAG_KEY_MEDIA_PLAYReady) { _FLAG_KEY_MEDIA_PLAYContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_PLAY"); _FLAG_KEY_MEDIA_PLAYReady = true; } return _FLAG_KEY_MEDIA_PLAYContent; } }
         private static int _FLAG_KEY_MEDIA_PLAYContent = default;
         private static bool _FLAG_KEY_MEDIA_PLAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_PLAY_PAUSE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_PLAY_PAUSE { get { if (!_FLAG_KEY_MEDIA_PLAY_PAUSEReady) { _FLAG_KEY_MEDIA_PLAY_PAUSEContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_PLAY_PAUSE"); _FLAG_KEY_MEDIA_PLAY_PAUSEReady = true; } return _FLAG_KEY_MEDIA_PLAY_PAUSEContent; } }
         private static int _FLAG_KEY_MEDIA_PLAY_PAUSEContent = default;
         private static bool _FLAG_KEY_MEDIA_PLAY_PAUSEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_POSITION_UPDATE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_POSITION_UPDATE { get { if (!_FLAG_KEY_MEDIA_POSITION_UPDATEReady) { _FLAG_KEY_MEDIA_POSITION_UPDATEContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_POSITION_UPDATE"); _FLAG_KEY_MEDIA_POSITION_UPDATEReady = true; } return _FLAG_KEY_MEDIA_POSITION_UPDATEContent; } }
         private static int _FLAG_KEY_MEDIA_POSITION_UPDATEContent = default;
         private static bool _FLAG_KEY_MEDIA_POSITION_UPDATEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_PREVIOUS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_PREVIOUS { get { if (!_FLAG_KEY_MEDIA_PREVIOUSReady) { _FLAG_KEY_MEDIA_PREVIOUSContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_PREVIOUS"); _FLAG_KEY_MEDIA_PREVIOUSReady = true; } return _FLAG_KEY_MEDIA_PREVIOUSContent; } }
         private static int _FLAG_KEY_MEDIA_PREVIOUSContent = default;
         private static bool _FLAG_KEY_MEDIA_PREVIOUSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_RATING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_RATING { get { if (!_FLAG_KEY_MEDIA_RATINGReady) { _FLAG_KEY_MEDIA_RATINGContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_RATING"); _FLAG_KEY_MEDIA_RATINGReady = true; } return _FLAG_KEY_MEDIA_RATINGContent; } }
         private static int _FLAG_KEY_MEDIA_RATINGContent = default;
         private static bool _FLAG_KEY_MEDIA_RATINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_REWIND"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_REWIND { get { if (!_FLAG_KEY_MEDIA_REWINDReady) { _FLAG_KEY_MEDIA_REWINDContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_REWIND"); _FLAG_KEY_MEDIA_REWINDReady = true; } return _FLAG_KEY_MEDIA_REWINDContent; } }
         private static int _FLAG_KEY_MEDIA_REWINDContent = default;
         private static bool _FLAG_KEY_MEDIA_REWINDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#FLAG_KEY_MEDIA_STOP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_KEY_MEDIA_STOP { get { if (!_FLAG_KEY_MEDIA_STOPReady) { _FLAG_KEY_MEDIA_STOPContent = SGetField<int>(LocalBridgeClazz, "FLAG_KEY_MEDIA_STOP"); _FLAG_KEY_MEDIA_STOPReady = true; } return _FLAG_KEY_MEDIA_STOPContent; } }
         private static int _FLAG_KEY_MEDIA_STOPContent = default;
         private static bool _FLAG_KEY_MEDIA_STOPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_BUFFERING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_BUFFERING { get { if (!_PLAYSTATE_BUFFERINGReady) { _PLAYSTATE_BUFFERINGContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_BUFFERING"); _PLAYSTATE_BUFFERINGReady = true; } return _PLAYSTATE_BUFFERINGContent; } }
         private static int _PLAYSTATE_BUFFERINGContent = default;
         private static bool _PLAYSTATE_BUFFERINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_ERROR { get { if (!_PLAYSTATE_ERRORReady) { _PLAYSTATE_ERRORContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_ERROR"); _PLAYSTATE_ERRORReady = true; } return _PLAYSTATE_ERRORContent; } }
         private static int _PLAYSTATE_ERRORContent = default;
         private static bool _PLAYSTATE_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_FAST_FORWARDING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_FAST_FORWARDING { get { if (!_PLAYSTATE_FAST_FORWARDINGReady) { _PLAYSTATE_FAST_FORWARDINGContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_FAST_FORWARDING"); _PLAYSTATE_FAST_FORWARDINGReady = true; } return _PLAYSTATE_FAST_FORWARDINGContent; } }
         private static int _PLAYSTATE_FAST_FORWARDINGContent = default;
         private static bool _PLAYSTATE_FAST_FORWARDINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_PAUSED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_PAUSED { get { if (!_PLAYSTATE_PAUSEDReady) { _PLAYSTATE_PAUSEDContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_PAUSED"); _PLAYSTATE_PAUSEDReady = true; } return _PLAYSTATE_PAUSEDContent; } }
         private static int _PLAYSTATE_PAUSEDContent = default;
         private static bool _PLAYSTATE_PAUSEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_PLAYING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_PLAYING { get { if (!_PLAYSTATE_PLAYINGReady) { _PLAYSTATE_PLAYINGContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_PLAYING"); _PLAYSTATE_PLAYINGReady = true; } return _PLAYSTATE_PLAYINGContent; } }
         private static int _PLAYSTATE_PLAYINGContent = default;
         private static bool _PLAYSTATE_PLAYINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_REWINDING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_REWINDING { get { if (!_PLAYSTATE_REWINDINGReady) { _PLAYSTATE_REWINDINGContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_REWINDING"); _PLAYSTATE_REWINDINGReady = true; } return _PLAYSTATE_REWINDINGContent; } }
         private static int _PLAYSTATE_REWINDINGContent = default;
         private static bool _PLAYSTATE_REWINDINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_SKIPPING_BACKWARDS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_SKIPPING_BACKWARDS { get { if (!_PLAYSTATE_SKIPPING_BACKWARDSReady) { _PLAYSTATE_SKIPPING_BACKWARDSContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_SKIPPING_BACKWARDS"); _PLAYSTATE_SKIPPING_BACKWARDSReady = true; } return _PLAYSTATE_SKIPPING_BACKWARDSContent; } }
         private static int _PLAYSTATE_SKIPPING_BACKWARDSContent = default;
         private static bool _PLAYSTATE_SKIPPING_BACKWARDSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_SKIPPING_FORWARDS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_SKIPPING_FORWARDS { get { if (!_PLAYSTATE_SKIPPING_FORWARDSReady) { _PLAYSTATE_SKIPPING_FORWARDSContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_SKIPPING_FORWARDS"); _PLAYSTATE_SKIPPING_FORWARDSReady = true; } return _PLAYSTATE_SKIPPING_FORWARDSContent; } }
         private static int _PLAYSTATE_SKIPPING_FORWARDSContent = default;
         private static bool _PLAYSTATE_SKIPPING_FORWARDSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#PLAYSTATE_STOPPED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PLAYSTATE_STOPPED { get { if (!_PLAYSTATE_STOPPEDReady) { _PLAYSTATE_STOPPEDContent = SGetField<int>(LocalBridgeClazz, "PLAYSTATE_STOPPED"); _PLAYSTATE_STOPPEDReady = true; } return _PLAYSTATE_STOPPEDContent; } }
         private static int _PLAYSTATE_STOPPEDContent = default;
         private static bool _PLAYSTATE_STOPPEDReady = false; // this is used because in case of generics 
@@ -198,28 +198,29 @@ public RemoteControlClient(Android.App.PendingIntent arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#getMediaSession()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Media.Session.MediaSession MediaSession
-        {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaSession>("getMediaSession", "()Landroid/media/session/MediaSession;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#editMetadata(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Android.Media.RemoteControlClient.MetadataEditor"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Media.RemoteControlClient.MetadataEditor EditMetadata(bool arg0)
         {
             return IExecuteWithSignature<Android.Media.RemoteControlClient.MetadataEditor>("editMetadata", "(Z)Landroid/media/RemoteControlClient$MetadataEditor;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#getMediaSession()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Session.MediaSession"/></returns>
+        [global::System.Obsolete()]
+        public Android.Media.Session.MediaSession GetMediaSession()
+        {
+            return IExecuteWithSignature<Android.Media.Session.MediaSession>("getMediaSession", "()Landroid/media/session/MediaSession;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#setMetadataUpdateListener(android.media.RemoteControlClient.OnMetadataUpdateListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.RemoteControlClient.OnMetadataUpdateListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetMetadataUpdateListener(Android.Media.RemoteControlClient.OnMetadataUpdateListener arg0)
         {
             IExecuteWithSignature("setMetadataUpdateListener", "(Landroid/media/RemoteControlClient$OnMetadataUpdateListener;)V", arg0);
@@ -228,7 +229,7 @@ public void SetMetadataUpdateListener(Android.Media.RemoteControlClient.OnMetada
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#setOnGetPlaybackPositionListener(android.media.RemoteControlClient.OnGetPlaybackPositionListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.RemoteControlClient.OnGetPlaybackPositionListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnGetPlaybackPositionListener(Android.Media.RemoteControlClient.OnGetPlaybackPositionListener arg0)
         {
             IExecuteWithSignature("setOnGetPlaybackPositionListener", "(Landroid/media/RemoteControlClient$OnGetPlaybackPositionListener;)V", arg0);
@@ -237,7 +238,7 @@ public void SetOnGetPlaybackPositionListener(Android.Media.RemoteControlClient.O
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#setPlaybackPositionUpdateListener(android.media.RemoteControlClient.OnPlaybackPositionUpdateListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.RemoteControlClient.OnPlaybackPositionUpdateListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPlaybackPositionUpdateListener(Android.Media.RemoteControlClient.OnPlaybackPositionUpdateListener arg0)
         {
             IExecuteWithSignature("setPlaybackPositionUpdateListener", "(Landroid/media/RemoteControlClient$OnPlaybackPositionUpdateListener;)V", arg0);
@@ -248,7 +249,7 @@ public void SetPlaybackPositionUpdateListener(Android.Media.RemoteControlClient.
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPlaybackState(int arg0, long arg1, float arg2)
         {
             IExecute("setPlaybackState", arg0, arg1, arg2);
@@ -257,7 +258,7 @@ public void SetPlaybackState(int arg0, long arg1, float arg2)
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#setPlaybackState(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPlaybackState(int arg0)
         {
             IExecuteWithSignature("setPlaybackState", "(I)V", arg0);
@@ -266,7 +267,7 @@ public void SetPlaybackState(int arg0)
         /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.html#setTransportControlFlags(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTransportControlFlags(int arg0)
         {
             IExecuteWithSignature("setTransportControlFlags", "(I)V", arg0);
@@ -290,7 +291,7 @@ public partial class MetadataEditor
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.MetadataEditor.html#BITMAP_KEY_ARTWORK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int BITMAP_KEY_ARTWORK { get { if (!_BITMAP_KEY_ARTWORKReady) { _BITMAP_KEY_ARTWORKContent = SGetField<int>(LocalBridgeClazz, "BITMAP_KEY_ARTWORK"); _BITMAP_KEY_ARTWORKReady = true; } return _BITMAP_KEY_ARTWORKContent; } }
             private static int _BITMAP_KEY_ARTWORKContent = default;
             private static bool _BITMAP_KEY_ARTWORKReady = false; // this is used because in case of generics 
@@ -338,7 +339,7 @@ public partial class OnGetPlaybackPositionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGetPlaybackPosition", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnGetPlaybackPositionEventHandler));
+                AddEventHandler("onGetPlaybackPosition", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnGetPlaybackPositionEventHandler));
 
             }
 
@@ -346,7 +347,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnGetPlaybackPositionListener.html#onGetPlaybackPosition()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGetPlaybackPosition"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<long> OnOnGetPlaybackPosition { get; set; } = null;
+            public global::System.Func<long> OnOnGetPlaybackPosition { get; set; } = null;
 
             void OnGetPlaybackPositionEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -359,7 +360,7 @@ void OnGetPlaybackPositionEventHandler(object sender, CLRListenerEventArgs<CLREv
             /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnGetPlaybackPositionListener.html#onGetPlaybackPosition()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual long OnGetPlaybackPosition()
             {
                 return default;
@@ -399,7 +400,7 @@ public partial class OnGetPlaybackPositionListenerDirect
             /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnGetPlaybackPositionListener.html#onGetPlaybackPosition()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override long OnGetPlaybackPosition()
             {
                 return IExecuteWithSignature<long>("onGetPlaybackPosition", "()J");
@@ -440,7 +441,7 @@ public partial class OnMetadataUpdateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMetadataUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnMetadataUpdateEventHandler));
+                AddEventHandler("onMetadataUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnMetadataUpdateEventHandler));
 
             }
 
@@ -448,7 +449,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnMetadataUpdateListener.html#onMetadataUpdate(int,java.lang.Object)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMetadataUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, object> OnOnMetadataUpdate { get; set; } = null;
+            public global::System.Action<int, object> OnOnMetadataUpdate { get; set; } = null;
 
             void OnMetadataUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -461,7 +462,7 @@ void OnMetadataUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventDa
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="object"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnMetadataUpdate(int arg0, object arg1)
             {
                 
@@ -502,7 +503,7 @@ public partial class OnMetadataUpdateListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="object"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnMetadataUpdate(int arg0, object arg1)
             {
                 IExecute("onMetadataUpdate", arg0, arg1);
@@ -543,7 +544,7 @@ public partial class OnPlaybackPositionUpdateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPlaybackPositionUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(OnPlaybackPositionUpdateEventHandler));
+                AddEventHandler("onPlaybackPositionUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(OnPlaybackPositionUpdateEventHandler));
 
             }
 
@@ -551,7 +552,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnPlaybackPositionUpdateListener.html#onPlaybackPositionUpdate(long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPlaybackPositionUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<long> OnOnPlaybackPositionUpdate { get; set; } = null;
+            public global::System.Action<long> OnOnPlaybackPositionUpdate { get; set; } = null;
 
             void OnPlaybackPositionUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
             {
@@ -563,7 +564,7 @@ void OnPlaybackPositionUpdateEventHandler(object sender, CLRListenerEventArgs<CL
             /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnPlaybackPositionUpdateListener.html#onPlaybackPositionUpdate(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnPlaybackPositionUpdate(long arg0)
             {
                 
@@ -603,7 +604,7 @@ public partial class OnPlaybackPositionUpdateListenerDirect
             /// <see href="https://developer.android.com/reference/android/media/RemoteControlClient.OnPlaybackPositionUpdateListener.html#onPlaybackPositionUpdate(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnPlaybackPositionUpdate(long arg0)
             {
                 IExecuteWithSignature("onPlaybackPositionUpdate", "(J)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Media/RemoteController.cs b/src/net/Netdroid/Generated/Android/Media/RemoteController.cs
index a4f6b026e..4fd88f7c1 100644
--- a/src/net/Netdroid/Generated/Android/Media/RemoteController.cs
+++ b/src/net/Netdroid/Generated/Android/Media/RemoteController.cs
@@ -36,7 +36,7 @@ public partial class RemoteController
         /// <param name="arg1"><see cref="Android.Media.RemoteController.OnClientUpdateListener"/></param>
         /// <param name="arg2"><see cref="Android.Os.Looper"/></param>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public RemoteController(Android.Content.Context arg0, Android.Media.RemoteController.OnClientUpdateListener arg1, Android.Os.Looper arg2)
             : base(arg0, arg1, arg2)
         {
@@ -47,7 +47,7 @@ public RemoteController(Android.Content.Context arg0, Android.Media.RemoteContro
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Media.RemoteController.OnClientUpdateListener"/></param>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public RemoteController(Android.Content.Context arg0, Android.Media.RemoteController.OnClientUpdateListener arg1)
             : base(arg0, arg1)
         {
@@ -63,14 +63,14 @@ public RemoteController(Android.Content.Context arg0, Android.Media.RemoteContro
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteController.html#POSITION_SYNCHRONIZATION_CHECK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int POSITION_SYNCHRONIZATION_CHECK { get { if (!_POSITION_SYNCHRONIZATION_CHECKReady) { _POSITION_SYNCHRONIZATION_CHECKContent = SGetField<int>(LocalBridgeClazz, "POSITION_SYNCHRONIZATION_CHECK"); _POSITION_SYNCHRONIZATION_CHECKReady = true; } return _POSITION_SYNCHRONIZATION_CHECKContent; } }
         private static int _POSITION_SYNCHRONIZATION_CHECKContent = default;
         private static bool _POSITION_SYNCHRONIZATION_CHECKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteController.html#POSITION_SYNCHRONIZATION_NONE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int POSITION_SYNCHRONIZATION_NONE { get { if (!_POSITION_SYNCHRONIZATION_NONEReady) { _POSITION_SYNCHRONIZATION_NONEContent = SGetField<int>(LocalBridgeClazz, "POSITION_SYNCHRONIZATION_NONE"); _POSITION_SYNCHRONIZATION_NONEReady = true; } return _POSITION_SYNCHRONIZATION_NONEContent; } }
         private static int _POSITION_SYNCHRONIZATION_NONEContent = default;
         private static bool _POSITION_SYNCHRONIZATION_NONEReady = false; // this is used because in case of generics 
@@ -83,18 +83,10 @@ public RemoteController(Android.Content.Context arg0, Android.Media.RemoteContro
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RemoteController.html#getEstimatedMediaPosition()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public long EstimatedMediaPosition
-        {
-            get { return IExecuteWithSignature<long>("getEstimatedMediaPosition", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RemoteController.html#editMetadata()"/>
         /// </summary>
         /// <returns><see cref="Android.Media.RemoteController.MetadataEditor"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Media.RemoteController.MetadataEditor EditMetadata()
         {
             return IExecuteWithSignature<Android.Media.RemoteController.MetadataEditor>("editMetadata", "()Landroid/media/RemoteController$MetadataEditor;");
@@ -103,7 +95,7 @@ public Android.Media.RemoteController.MetadataEditor EditMetadata()
         /// <see href="https://developer.android.com/reference/android/media/RemoteController.html#clearArtworkConfiguration()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ClearArtworkConfiguration()
         {
             return IExecuteWithSignature<bool>("clearArtworkConfiguration", "()Z");
@@ -114,7 +106,7 @@ public bool ClearArtworkConfiguration()
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SeekTo(long arg0)
         {
             return IExecuteWithSignature<bool>("seekTo", "(J)Z", arg0);
@@ -125,7 +117,7 @@ public bool SeekTo(long arg0)
         /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SendMediaKeyEvent(Android.View.KeyEvent arg0)
         {
             return IExecuteWithSignature<bool>("sendMediaKeyEvent", "(Landroid/view/KeyEvent;)Z", arg0);
@@ -137,7 +129,7 @@ public bool SendMediaKeyEvent(Android.View.KeyEvent arg0)
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetArtworkConfiguration(int arg0, int arg1)
         {
             return IExecute<bool>("setArtworkConfiguration", arg0, arg1);
@@ -148,11 +140,20 @@ public bool SetArtworkConfiguration(int arg0, int arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetSynchronizationMode(int arg0)
         {
             return IExecuteWithSignature<bool>("setSynchronizationMode", "(I)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/RemoteController.html#getEstimatedMediaPosition()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetEstimatedMediaPosition()
+        {
+            return IExecuteWithSignature<long>("getEstimatedMediaPosition", "()J");
+        }
 
         #endregion
 
@@ -213,11 +214,11 @@ public partial class OnClientUpdateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onClientChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnClientChangeEventHandler));
-                AddEventHandler("onClientMetadataUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.RemoteController.MetadataEditor>>>(OnClientMetadataUpdateEventHandler));
-                AddEventHandler("onClientPlaybackStateUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnClientPlaybackStateUpdateEventHandler));
-                AddEventHandler("onClientPlaybackStateUpdate1", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnClientPlaybackStateUpdate1EventHandler));
-                AddEventHandler("onClientTransportControlUpdate", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnClientTransportControlUpdateEventHandler));
+                AddEventHandler("onClientChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnClientChangeEventHandler));
+                AddEventHandler("onClientMetadataUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.RemoteController.MetadataEditor>>>(OnClientMetadataUpdateEventHandler));
+                AddEventHandler("onClientPlaybackStateUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnClientPlaybackStateUpdateEventHandler));
+                AddEventHandler("onClientPlaybackStateUpdate1", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnClientPlaybackStateUpdate1EventHandler));
+                AddEventHandler("onClientTransportControlUpdate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnClientTransportControlUpdateEventHandler));
 
             }
 
@@ -225,7 +226,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientChange(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClientChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnClientChange { get; set; } = null;
+            public global::System.Action<bool> OnOnClientChange { get; set; } = null;
 
             void OnClientChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -237,7 +238,7 @@ void OnClientChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientChange(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnClientChange(bool arg0)
             {
                 
@@ -247,7 +248,7 @@ public virtual void OnClientChange(bool arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientMetadataUpdate(android.media.RemoteController.MetadataEditor)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClientMetadataUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.RemoteController.MetadataEditor> OnOnClientMetadataUpdate { get; set; } = null;
+            public global::System.Action<Android.Media.RemoteController.MetadataEditor> OnOnClientMetadataUpdate { get; set; } = null;
 
             void OnClientMetadataUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.RemoteController.MetadataEditor>> data)
             {
@@ -259,7 +260,7 @@ void OnClientMetadataUpdateEventHandler(object sender, CLRListenerEventArgs<CLRE
             /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientMetadataUpdate(android.media.RemoteController.MetadataEditor)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.RemoteController.MetadataEditor"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnClientMetadataUpdate(Android.Media.RemoteController.MetadataEditor arg0)
             {
                 
@@ -269,7 +270,7 @@ public virtual void OnClientMetadataUpdate(Android.Media.RemoteController.Metada
             /// Handler for <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientPlaybackStateUpdate(int,long,long,float)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClientPlaybackStateUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, long, long, float> OnOnClientPlaybackStateUpdate { get; set; } = null;
+            public global::System.Action<int, long, long, float> OnOnClientPlaybackStateUpdate { get; set; } = null;
 
             void OnClientPlaybackStateUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -284,7 +285,7 @@ void OnClientPlaybackStateUpdateEventHandler(object sender, CLRListenerEventArgs
             /// <param name="arg1"><see cref="long"/></param>
             /// <param name="arg2"><see cref="long"/></param>
             /// <param name="arg3"><see cref="float"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnClientPlaybackStateUpdate(int arg0, long arg1, long arg2, float arg3)
             {
                 
@@ -294,7 +295,7 @@ public virtual void OnClientPlaybackStateUpdate(int arg0, long arg1, long arg2,
             /// Handler for <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientPlaybackStateUpdate(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClientPlaybackStateUpdate1"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnClientPlaybackStateUpdate1 { get; set; } = null;
+            public global::System.Action<int> OnOnClientPlaybackStateUpdate1 { get; set; } = null;
 
             void OnClientPlaybackStateUpdate1EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -306,7 +307,7 @@ void OnClientPlaybackStateUpdate1EventHandler(object sender, CLRListenerEventArg
             /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientPlaybackStateUpdate(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnClientPlaybackStateUpdate(int arg0)
             {
                 
@@ -316,7 +317,7 @@ public virtual void OnClientPlaybackStateUpdate(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientTransportControlUpdate(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClientTransportControlUpdate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnClientTransportControlUpdate { get; set; } = null;
+            public global::System.Action<int> OnOnClientTransportControlUpdate { get; set; } = null;
 
             void OnClientTransportControlUpdateEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -328,7 +329,7 @@ void OnClientTransportControlUpdateEventHandler(object sender, CLRListenerEventA
             /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientTransportControlUpdate(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnClientTransportControlUpdate(int arg0)
             {
                 
@@ -368,7 +369,7 @@ public partial class OnClientUpdateListenerDirect
             /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientChange(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnClientChange(bool arg0)
             {
                 IExecuteWithSignature("onClientChange", "(Z)V", arg0);
@@ -377,7 +378,7 @@ public override void OnClientChange(bool arg0)
             /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientMetadataUpdate(android.media.RemoteController.MetadataEditor)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Media.RemoteController.MetadataEditor"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnClientMetadataUpdate(Android.Media.RemoteController.MetadataEditor arg0)
             {
                 IExecuteWithSignature("onClientMetadataUpdate", "(Landroid/media/RemoteController$MetadataEditor;)V", arg0);
@@ -389,7 +390,7 @@ public override void OnClientMetadataUpdate(Android.Media.RemoteController.Metad
             /// <param name="arg1"><see cref="long"/></param>
             /// <param name="arg2"><see cref="long"/></param>
             /// <param name="arg3"><see cref="float"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnClientPlaybackStateUpdate(int arg0, long arg1, long arg2, float arg3)
             {
                 IExecute("onClientPlaybackStateUpdate", arg0, arg1, arg2, arg3);
@@ -398,7 +399,7 @@ public override void OnClientPlaybackStateUpdate(int arg0, long arg1, long arg2,
             /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientPlaybackStateUpdate(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnClientPlaybackStateUpdate(int arg0)
             {
                 IExecuteWithSignature("onClientPlaybackStateUpdate", "(I)V", arg0);
@@ -407,7 +408,7 @@ public override void OnClientPlaybackStateUpdate(int arg0)
             /// <see href="https://developer.android.com/reference/android/media/RemoteController.OnClientUpdateListener.html#onClientTransportControlUpdate(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnClientTransportControlUpdate(int arg0)
             {
                 IExecuteWithSignature("onClientTransportControlUpdate", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Media/Ringtone.cs b/src/net/Netdroid/Generated/Android/Media/Ringtone.cs
index 1d2d6aaf6..5d153ea4c 100644
--- a/src/net/Netdroid/Generated/Android/Media/Ringtone.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Ringtone.cs
@@ -46,26 +46,12 @@ public partial class Ringtone
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#getAudioAttributes()"/> <see href="https://developer.android.com/reference/android/media/Ringtone.html#setAudioAttributes(android.media.AudioAttributes)"/>
+        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#getAudioAttributes()"/>
         /// </summary>
-        public Android.Media.AudioAttributes AudioAttributes
+        /// <returns><see cref="Android.Media.AudioAttributes"/></returns>
+        public Android.Media.AudioAttributes GetAudioAttributes()
         {
-            get { return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;"); } set { IExecuteWithSignature("setAudioAttributes", "(Landroid/media/AudioAttributes;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#getStreamType()"/> <see href="https://developer.android.com/reference/android/media/Ringtone.html#setStreamType(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public int StreamType
-        {
-            get { return IExecuteWithSignature<int>("getStreamType", "()I"); } set { IExecuteWithSignature("setStreamType", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#getVolume()"/> <see href="https://developer.android.com/reference/android/media/Ringtone.html#setVolume(float)"/>
-        /// </summary>
-        public float Volume
-        {
-            get { return IExecuteWithSignature<float>("getVolume", "()F"); } set { IExecuteWithSignature("setVolume", "(F)V", value); }
+            return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#isHapticGeneratorEnabled()"/>
@@ -101,6 +87,23 @@ public bool SetHapticGeneratorEnabled(bool arg0)
             return IExecuteWithSignature<bool>("setHapticGeneratorEnabled", "(Z)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#getVolume()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetVolume()
+        {
+            return IExecuteWithSignature<float>("getVolume", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#getStreamType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetStreamType()
+        {
+            return IExecuteWithSignature<int>("getStreamType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#getTitle(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -117,6 +120,15 @@ public void Play()
             IExecuteWithSignature("play", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#setAudioAttributes(android.media.AudioAttributes)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.AudioAttributes"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        public void SetAudioAttributes(Android.Media.AudioAttributes arg0)
+        {
+            IExecuteWithSignature("setAudioAttributes", "(Landroid/media/AudioAttributes;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#setLooping(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -125,6 +137,23 @@ public void SetLooping(bool arg0)
             IExecuteWithSignature("setLooping", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#setStreamType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetStreamType(int arg0)
+        {
+            IExecuteWithSignature("setStreamType", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#setVolume(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetVolume(float arg0)
+        {
+            IExecuteWithSignature("setVolume", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Ringtone.html#stop()"/>
         /// </summary>
         public void Stop()
diff --git a/src/net/Netdroid/Generated/Android/Media/RingtoneManager.cs b/src/net/Netdroid/Generated/Android/Media/RingtoneManager.cs
index 8e6c9990d..e9212c86c 100644
--- a/src/net/Netdroid/Generated/Android/Media/RingtoneManager.cs
+++ b/src/net/Netdroid/Generated/Android/Media/RingtoneManager.cs
@@ -116,7 +116,7 @@ public RingtoneManager(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#EXTRA_RINGTONE_INCLUDE_DRM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_RINGTONE_INCLUDE_DRM { get { if (!_EXTRA_RINGTONE_INCLUDE_DRMReady) { _EXTRA_RINGTONE_INCLUDE_DRMContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_RINGTONE_INCLUDE_DRM"); _EXTRA_RINGTONE_INCLUDE_DRMReady = true; } return _EXTRA_RINGTONE_INCLUDE_DRMContent; } }
         private static Java.Lang.String _EXTRA_RINGTONE_INCLUDE_DRMContent = default;
         private static bool _EXTRA_RINGTONE_INCLUDE_DRMReady = false; // this is used because in case of generics 
@@ -255,19 +255,12 @@ public static void SetActualDefaultRingtoneUri(Android.Content.Context arg0, int
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#getCursor()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#getCursor()"/>
         /// </summary>
-        public Android.Database.Cursor Cursor
+        /// <returns><see cref="Android.Database.Cursor"/></returns>
+        public Android.Database.Cursor GetCursor()
         {
-            get { return IExecuteWithSignature<Android.Database.Cursor>("getCursor", "()Landroid/database/Cursor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#getIncludeDrm()"/> <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#setIncludeDrm(boolean)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public bool IncludeDrm
-        {
-            get { return IExecuteWithSignature<bool>("getIncludeDrm", "()Z"); } set { IExecuteWithSignature("setIncludeDrm", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Database.Cursor>("getCursor", "()Landroid/database/Cursor;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#getRingtone(int)"/>
@@ -288,6 +281,15 @@ public Android.Net.Uri GetRingtoneUri(int arg0)
             return IExecuteWithSignature<Android.Net.Uri>("getRingtoneUri", "(I)Landroid/net/Uri;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#getIncludeDrm()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetIncludeDrm()
+        {
+            return IExecuteWithSignature<bool>("getIncludeDrm", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#getStopPreviousRingtone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -322,6 +324,15 @@ public int InferStreamType()
             return IExecuteWithSignature<int>("inferStreamType", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#setIncludeDrm(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetIncludeDrm(bool arg0)
+        {
+            IExecuteWithSignature("setIncludeDrm", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RingtoneManager.html#setStopPreviousRingtone(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/RouteDiscoveryPreference.cs b/src/net/Netdroid/Generated/Android/Media/RouteDiscoveryPreference.cs
index 5fbffac05..b6739c8cb 100644
--- a/src/net/Netdroid/Generated/Android/Media/RouteDiscoveryPreference.cs
+++ b/src/net/Netdroid/Generated/Android/Media/RouteDiscoveryPreference.cs
@@ -52,13 +52,6 @@ public partial class RouteDiscoveryPreference
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RouteDiscoveryPreference.html#getPreferredFeatures()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> PreferredFeatures
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPreferredFeatures", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RouteDiscoveryPreference.html#shouldPerformActiveScan()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/RouteDiscoveryPreference.html#getPreferredFeatures()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetPreferredFeatures()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPreferredFeatures", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RouteDiscoveryPreference.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/RouteListingPreference.cs b/src/net/Netdroid/Generated/Android/Media/RouteListingPreference.cs
index 172d3408d..c3c6dc46d 100644
--- a/src/net/Netdroid/Generated/Android/Media/RouteListingPreference.cs
+++ b/src/net/Netdroid/Generated/Android/Media/RouteListingPreference.cs
@@ -64,25 +64,20 @@ public partial class RouteListingPreference
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.html#getItems()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.html#getLinkedItemComponentName()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.RouteListingPreference.Item> Items
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetLinkedItemComponentName()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.RouteListingPreference.Item>>("getItems", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getLinkedItemComponentName", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.html#getLinkedItemComponentName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.html#getUseSystemOrdering()"/>
         /// </summary>
-        public Android.Content.ComponentName LinkedItemComponentName
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseSystemOrdering()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getLinkedItemComponentName", "()Landroid/content/ComponentName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.html#getUseSystemOrdering()"/> 
-        /// </summary>
-        public bool UseSystemOrdering
-        {
-            get { return IExecuteWithSignature<bool>("getUseSystemOrdering", "()Z"); }
+            return IExecuteWithSignature<bool>("getUseSystemOrdering", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.html#describeContents()"/>
@@ -93,6 +88,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.html#getItems()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.RouteListingPreference.Item> GetItems()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.RouteListingPreference.Item>>("getItems", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -288,47 +291,52 @@ public partial class Item
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getCustomSubtextMessage()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#describeContents()"/>
             /// </summary>
-            public Java.Lang.CharSequence CustomSubtextMessage
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCustomSubtextMessage", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getFlags()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getFlags()"/>
             /// </summary>
-            public int Flags
+            /// <returns><see cref="int"/></returns>
+            public int GetFlags()
             {
-                get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+                return IExecuteWithSignature<int>("getFlags", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getRouteId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getSelectionBehavior()"/>
             /// </summary>
-            public Java.Lang.String RouteId
+            /// <returns><see cref="int"/></returns>
+            public int GetSelectionBehavior()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getRouteId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getSelectionBehavior", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getSelectionBehavior()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getSubText()"/>
             /// </summary>
-            public int SelectionBehavior
+            /// <returns><see cref="int"/></returns>
+            public int GetSubText()
             {
-                get { return IExecuteWithSignature<int>("getSelectionBehavior", "()I"); }
+                return IExecuteWithSignature<int>("getSubText", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getSubText()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getCustomSubtextMessage()"/>
             /// </summary>
-            public int SubText
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetCustomSubtextMessage()
             {
-                get { return IExecuteWithSignature<int>("getSubText", "()I"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getCustomSubtextMessage", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#getRouteId()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetRouteId()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getRouteId", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/RouteListingPreference.Item.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/RoutingSessionInfo.cs b/src/net/Netdroid/Generated/Android/Media/RoutingSessionInfo.cs
index 07284eb7b..46cc0f206 100644
--- a/src/net/Netdroid/Generated/Android/Media/RoutingSessionInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/RoutingSessionInfo.cs
@@ -52,89 +52,100 @@ public partial class RoutingSessionInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getClientPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getControlHints()"/>
         /// </summary>
-        public Java.Lang.String ClientPackageName
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetControlHints()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClientPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getControlHints", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getControlHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#describeContents()"/>
         /// </summary>
-        public Android.Os.Bundle ControlHints
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getControlHints", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getDeselectableRoutes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getVolume()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> DeselectableRoutes
+        /// <returns><see cref="int"/></returns>
+        public int GetVolume()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getDeselectableRoutes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getVolume", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getVolumeHandling()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="int"/></returns>
+        public int GetVolumeHandling()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getVolumeHandling", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getVolumeMax()"/>
         /// </summary>
-        public Java.Lang.CharSequence Name
+        /// <returns><see cref="int"/></returns>
+        public int GetVolumeMax()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getVolumeMax", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getSelectableRoutes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getName()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> SelectableRoutes
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetName()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSelectableRoutes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getSelectedRoutes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getClientPackageName()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> SelectedRoutes
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClientPackageName()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSelectedRoutes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getClientPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getTransferableRoutes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getId()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> TransferableRoutes
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getTransferableRoutes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getVolume()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getDeselectableRoutes()"/>
         /// </summary>
-        public int Volume
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetDeselectableRoutes()
         {
-            get { return IExecuteWithSignature<int>("getVolume", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getDeselectableRoutes", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getVolumeHandling()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getSelectableRoutes()"/>
         /// </summary>
-        public int VolumeHandling
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetSelectableRoutes()
         {
-            get { return IExecuteWithSignature<int>("getVolumeHandling", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSelectableRoutes", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getVolumeMax()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getSelectedRoutes()"/>
         /// </summary>
-        public int VolumeMax
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetSelectedRoutes()
         {
-            get { return IExecuteWithSignature<int>("getVolumeMax", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSelectedRoutes", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#getTransferableRoutes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetTransferableRoutes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getTransferableRoutes", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/RoutingSessionInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Session/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Session/AllPackageClasses.cs
index 2db6d866c..e6fc463d8 100644
--- a/src/net/Netdroid/Generated/Android/Media/Session/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Session/AllPackageClasses.cs
@@ -76,12 +76,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -254,12 +254,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -433,10 +433,13 @@ public partial class OnActiveSessionsChangedListener : MASES.JCOBridge.C2JBridge
             /// </summary>
             public OnActiveSessionsChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.session.MediaSessionManager_OnActiveSessionsChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.session.OnActiveSessionsChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -458,10 +461,13 @@ public partial class OnActiveSessionsChangedListenerDirect : OnActiveSessionsCha
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.session.MediaSessionManager$OnActiveSessionsChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.session.MediaSessionManager$OnActiveSessionsChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -492,10 +498,13 @@ public partial class OnMediaKeyEventSessionChangedListener : MASES.JCOBridge.C2J
             /// </summary>
             public OnMediaKeyEventSessionChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.session.MediaSessionManager_OnMediaKeyEventSessionChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.session.OnMediaKeyEventSessionChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -517,10 +526,13 @@ public partial class OnMediaKeyEventSessionChangedListenerDirect : OnMediaKeyEve
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.session.MediaSessionManager$OnMediaKeyEventSessionChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.session.MediaSessionManager$OnMediaKeyEventSessionChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -551,10 +563,13 @@ public partial class OnSession2TokensChangedListener : MASES.JCOBridge.C2JBridge
             /// </summary>
             public OnSession2TokensChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.session.MediaSessionManager_OnSession2TokensChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.session.OnSession2TokensChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -576,10 +591,13 @@ public partial class OnSession2TokensChangedListenerDirect : OnSession2TokensCha
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.session.MediaSessionManager$OnSession2TokensChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.session.MediaSessionManager$OnSession2TokensChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Media/Session/MediaController.cs b/src/net/Netdroid/Generated/Android/Media/Session/MediaController.cs
index 71379bfc9..af540d6d7 100644
--- a/src/net/Netdroid/Generated/Android/Media/Session/MediaController.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Session/MediaController.cs
@@ -55,111 +55,125 @@ public MediaController(Android.Content.Context arg0, Android.Media.Session.Media
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getSessionActivity()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetSessionActivity()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.App.PendingIntent>("getSessionActivity", "()Landroid/app/PendingIntent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getMetadata()"/>
         /// </summary>
-        public long Flags
+        /// <returns><see cref="Android.Media.MediaMetadata"/></returns>
+        public Android.Media.MediaMetadata GetMetadata()
         {
-            get { return IExecuteWithSignature<long>("getFlags", "()J"); }
+            return IExecuteWithSignature<Android.Media.MediaMetadata>("getMetadata", "()Landroid/media/MediaMetadata;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getPlaybackInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getPlaybackInfo()"/>
         /// </summary>
-        public Android.Media.Session.MediaController.PlaybackInfo GetPlaybackInfo
+        /// <returns><see cref="Android.Media.Session.MediaController.PlaybackInfo"/></returns>
+        public Android.Media.Session.MediaController.PlaybackInfo GetPlaybackInfo()
         {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaController.PlaybackInfo>("getPlaybackInfo", "()Landroid/media/session/MediaController$PlaybackInfo;"); }
+            return IExecuteWithSignature<Android.Media.Session.MediaController.PlaybackInfo>("getPlaybackInfo", "()Landroid/media/session/MediaController$PlaybackInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getTransportControls()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getTransportControls()"/>
         /// </summary>
-        public Android.Media.Session.MediaController.TransportControls GetTransportControls
+        /// <returns><see cref="Android.Media.Session.MediaController.TransportControls"/></returns>
+        public Android.Media.Session.MediaController.TransportControls GetTransportControls()
         {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaController.TransportControls>("getTransportControls", "()Landroid/media/session/MediaController$TransportControls;"); }
+            return IExecuteWithSignature<Android.Media.Session.MediaController.TransportControls>("getTransportControls", "()Landroid/media/session/MediaController$TransportControls;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getMetadata()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getSessionToken()"/>
         /// </summary>
-        public Android.Media.MediaMetadata Metadata
+        /// <returns><see cref="Android.Media.Session.MediaSession.Token"/></returns>
+        public Android.Media.Session.MediaSession.Token GetSessionToken()
         {
-            get { return IExecuteWithSignature<Android.Media.MediaMetadata>("getMetadata", "()Landroid/media/MediaMetadata;"); }
+            return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getSessionToken", "()Landroid/media/session/MediaSession$Token;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getPlaybackState()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Android.Media.Session.PlaybackState"/></returns>
+        public Android.Media.Session.PlaybackState GetPlaybackState()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Media.Session.PlaybackState>("getPlaybackState", "()Landroid/media/session/PlaybackState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getPlaybackState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getExtras()"/>
         /// </summary>
-        public Android.Media.Session.PlaybackState PlaybackState
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Media.Session.PlaybackState>("getPlaybackState", "()Landroid/media/session/PlaybackState;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getQueue()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getSessionInfo()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.Session.MediaSession.QueueItem> Queue
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetSessionInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Session.MediaSession.QueueItem>>("getQueue", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getSessionInfo", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getQueueTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#dispatchMediaButtonEvent(android.view.KeyEvent)"/>
         /// </summary>
-        public Java.Lang.CharSequence QueueTitle
+        /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchMediaButtonEvent(Android.View.KeyEvent arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getQueueTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("dispatchMediaButtonEvent", "(Landroid/view/KeyEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getRatingType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getRatingType()"/>
         /// </summary>
-        public int RatingType
+        /// <returns><see cref="int"/></returns>
+        public int GetRatingType()
         {
-            get { return IExecuteWithSignature<int>("getRatingType", "()I"); }
+            return IExecuteWithSignature<int>("getRatingType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getSessionActivity()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getQueueTitle()"/>
         /// </summary>
-        public Android.App.PendingIntent SessionActivity
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetQueueTitle()
         {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getSessionActivity", "()Landroid/app/PendingIntent;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getQueueTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getSessionInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getPackageName()"/>
         /// </summary>
-        public Android.Os.Bundle SessionInfo
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getSessionInfo", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getSessionToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getTag()"/>
         /// </summary>
-        public Android.Media.Session.MediaSession.Token SessionToken
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTag()
         {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getSessionToken", "()Landroid/media/session/MediaSession$Token;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getQueue()"/>
         /// </summary>
-        public Java.Lang.String Tag
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Session.MediaSession.QueueItem> GetQueue()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Session.MediaSession.QueueItem>>("getQueue", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#dispatchMediaButtonEvent(android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#getFlags()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool DispatchMediaButtonEvent(Android.View.KeyEvent arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetFlags()
         {
-            return IExecuteWithSignature<bool>("dispatchMediaButtonEvent", "(Landroid/view/KeyEvent;)Z", arg0);
+            return IExecuteWithSignature<long>("getFlags", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/session/MediaController.html#adjustVolume(int,int)"/>
@@ -352,54 +366,60 @@ public partial class PlaybackInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getAudioAttributes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getAudioAttributes()"/>
             /// </summary>
-            public Android.Media.AudioAttributes AudioAttributes
+            /// <returns><see cref="Android.Media.AudioAttributes"/></returns>
+            public Android.Media.AudioAttributes GetAudioAttributes()
             {
-                get { return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;"); }
+                return IExecuteWithSignature<Android.Media.AudioAttributes>("getAudioAttributes", "()Landroid/media/AudioAttributes;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getCurrentVolume()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#describeContents()"/>
             /// </summary>
-            public int CurrentVolume
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getCurrentVolume", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getMaxVolume()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getCurrentVolume()"/>
             /// </summary>
-            public int MaxVolume
+            /// <returns><see cref="int"/></returns>
+            public int GetCurrentVolume()
             {
-                get { return IExecuteWithSignature<int>("getMaxVolume", "()I"); }
+                return IExecuteWithSignature<int>("getCurrentVolume", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getPlaybackType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getMaxVolume()"/>
             /// </summary>
-            public int PlaybackType
+            /// <returns><see cref="int"/></returns>
+            public int GetMaxVolume()
             {
-                get { return IExecuteWithSignature<int>("getPlaybackType", "()I"); }
+                return IExecuteWithSignature<int>("getMaxVolume", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getVolumeControl()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getPlaybackType()"/>
             /// </summary>
-            public int VolumeControl
+            /// <returns><see cref="int"/></returns>
+            public int GetPlaybackType()
             {
-                get { return IExecuteWithSignature<int>("getVolumeControl", "()I"); }
+                return IExecuteWithSignature<int>("getPlaybackType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getVolumeControlId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getVolumeControl()"/>
             /// </summary>
-            public Java.Lang.String VolumeControlId
+            /// <returns><see cref="int"/></returns>
+            public int GetVolumeControl()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getVolumeControlId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getVolumeControl", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#getVolumeControlId()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetVolumeControlId()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getVolumeControlId", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/session/MediaController.PlaybackInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Session/MediaSession.cs b/src/net/Netdroid/Generated/Android/Media/Session/MediaSession.cs
index c1f181ff7..9ea8727c6 100644
--- a/src/net/Netdroid/Generated/Android/Media/Session/MediaSession.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Session/MediaSession.cs
@@ -59,14 +59,14 @@ public MediaSession(Android.Content.Context arg0, Java.Lang.String arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#FLAG_HANDLES_MEDIA_BUTTONS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_HANDLES_MEDIA_BUTTONS { get { if (!_FLAG_HANDLES_MEDIA_BUTTONSReady) { _FLAG_HANDLES_MEDIA_BUTTONSContent = SGetField<int>(LocalBridgeClazz, "FLAG_HANDLES_MEDIA_BUTTONS"); _FLAG_HANDLES_MEDIA_BUTTONSReady = true; } return _FLAG_HANDLES_MEDIA_BUTTONSContent; } }
         private static int _FLAG_HANDLES_MEDIA_BUTTONSContent = default;
         private static bool _FLAG_HANDLES_MEDIA_BUTTONSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#FLAG_HANDLES_TRANSPORT_CONTROLS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_HANDLES_TRANSPORT_CONTROLS { get { if (!_FLAG_HANDLES_TRANSPORT_CONTROLSReady) { _FLAG_HANDLES_TRANSPORT_CONTROLSContent = SGetField<int>(LocalBridgeClazz, "FLAG_HANDLES_TRANSPORT_CONTROLS"); _FLAG_HANDLES_TRANSPORT_CONTROLSReady = true; } return _FLAG_HANDLES_TRANSPORT_CONTROLSContent; } }
         private static int _FLAG_HANDLES_TRANSPORT_CONTROLSContent = default;
         private static bool _FLAG_HANDLES_TRANSPORT_CONTROLSReady = false; // this is used because in case of generics 
@@ -79,25 +79,28 @@ public MediaSession(Android.Content.Context arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#getController()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#getController()"/>
         /// </summary>
-        public Android.Media.Session.MediaController Controller
+        /// <returns><see cref="Android.Media.Session.MediaController"/></returns>
+        public Android.Media.Session.MediaController GetController()
         {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaController>("getController", "()Landroid/media/session/MediaController;"); }
+            return IExecuteWithSignature<Android.Media.Session.MediaController>("getController", "()Landroid/media/session/MediaController;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#getCurrentControllerInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#getSessionToken()"/>
         /// </summary>
-        public Android.Media.Session.MediaSessionManager.RemoteUserInfo CurrentControllerInfo
+        /// <returns><see cref="Android.Media.Session.MediaSession.Token"/></returns>
+        public Android.Media.Session.MediaSession.Token GetSessionToken()
         {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaSessionManager.RemoteUserInfo>("getCurrentControllerInfo", "()Landroid/media/session/MediaSessionManager$RemoteUserInfo;"); }
+            return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getSessionToken", "()Landroid/media/session/MediaSession$Token;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#getSessionToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#getCurrentControllerInfo()"/>
         /// </summary>
-        public Android.Media.Session.MediaSession.Token SessionToken
+        /// <returns><see cref="Android.Media.Session.MediaSessionManager.RemoteUserInfo"/></returns>
+        public Android.Media.Session.MediaSessionManager.RemoteUserInfo GetCurrentControllerInfo()
         {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getSessionToken", "()Landroid/media/session/MediaSession$Token;"); }
+            return IExecuteWithSignature<Android.Media.Session.MediaSessionManager.RemoteUserInfo>("getCurrentControllerInfo", "()Landroid/media/session/MediaSessionManager$RemoteUserInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#isActive()"/>
@@ -176,7 +179,7 @@ public void SetMediaButtonBroadcastReceiver(Android.Content.ComponentName arg0)
         /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.html#setMediaButtonReceiver(android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetMediaButtonReceiver(Android.App.PendingIntent arg0)
         {
             IExecuteWithSignature("setMediaButtonReceiver", "(Landroid/app/PendingIntent;)V", arg0);
@@ -492,18 +495,12 @@ public QueueItem(Android.Media.MediaDescription arg0, long arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.QueueItem.html#getDescription()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.QueueItem.html#getDescription()"/>
             /// </summary>
-            public Android.Media.MediaDescription Description
+            /// <returns><see cref="Android.Media.MediaDescription"/></returns>
+            public Android.Media.MediaDescription GetDescription()
             {
-                get { return IExecuteWithSignature<Android.Media.MediaDescription>("getDescription", "()Landroid/media/MediaDescription;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.QueueItem.html#getQueueId()"/> 
-            /// </summary>
-            public long QueueId
-            {
-                get { return IExecuteWithSignature<long>("getQueueId", "()J"); }
+                return IExecuteWithSignature<Android.Media.MediaDescription>("getDescription", "()Landroid/media/MediaDescription;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.QueueItem.html#describeContents()"/>
@@ -514,6 +511,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.QueueItem.html#getQueueId()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetQueueId()
+            {
+                return IExecuteWithSignature<long>("getQueueId", "()J");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/session/MediaSession.QueueItem.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/Session/MediaSessionManager.cs b/src/net/Netdroid/Generated/Android/Media/Session/MediaSessionManager.cs
index 4695b4277..83cfc6f23 100644
--- a/src/net/Netdroid/Generated/Android/Media/Session/MediaSessionManager.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Session/MediaSessionManager.cs
@@ -46,25 +46,12 @@ public partial class MediaSessionManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#getMediaKeyEventSession()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#getMediaKeyEventSession()"/>
         /// </summary>
-        public Android.Media.Session.MediaSession.Token MediaKeyEventSession
+        /// <returns><see cref="Android.Media.Session.MediaSession.Token"/></returns>
+        public Android.Media.Session.MediaSession.Token GetMediaKeyEventSession()
         {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getMediaKeyEventSession", "()Landroid/media/session/MediaSession$Token;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#getMediaKeyEventSessionPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String MediaKeyEventSessionPackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMediaKeyEventSessionPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#getSession2Tokens()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.Session2Token> Session2Tokens
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Session2Token>>("getSession2Tokens", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getMediaKeyEventSession", "()Landroid/media/session/MediaSession$Token;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#isTrustedForMediaControl(android.media.session.MediaSessionManager.RemoteUserInfo)"/>
@@ -76,6 +63,14 @@ public bool IsTrustedForMediaControl(Android.Media.Session.MediaSessionManager.R
             return IExecuteWithSignature<bool>("isTrustedForMediaControl", "(Landroid/media/session/MediaSessionManager$RemoteUserInfo;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#getMediaKeyEventSessionPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMediaKeyEventSessionPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMediaKeyEventSessionPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#getActiveSessions(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
@@ -85,6 +80,14 @@ public bool IsTrustedForMediaControl(Android.Media.Session.MediaSessionManager.R
             return IExecuteWithSignature<Java.Util.List<Android.Media.Session.MediaController>>("getActiveSessions", "(Landroid/content/ComponentName;)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#getSession2Tokens()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Session2Token> GetSession2Tokens()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Session2Token>>("getSession2Tokens", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener,android.content.ComponentName,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Session.MediaSessionManager.OnActiveSessionsChangedListener"/></param>
@@ -133,7 +136,7 @@ public void AddOnSession2TokensChangedListener(Android.Media.Session.MediaSessio
         /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.html#notifySession2Created(android.media.Session2Token)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Session2Token"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void NotifySession2Created(Android.Media.Session2Token arg0)
         {
             IExecuteWithSignature("notifySession2Created", "(Landroid/media/Session2Token;)V", arg0);
@@ -191,7 +194,7 @@ public partial class OnActiveSessionsChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onActiveSessionsChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Media.Session.MediaController>>>>(OnActiveSessionsChangedEventHandler));
+                AddEventHandler("onActiveSessionsChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Media.Session.MediaController>>>>(OnActiveSessionsChangedEventHandler));
 
             }
 
@@ -199,7 +202,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.OnActiveSessionsChangedListener.html#onActiveSessionsChanged(java.util.List)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnActiveSessionsChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.List<Android.Media.Session.MediaController>> OnOnActiveSessionsChanged { get; set; } = null;
+            public global::System.Action<Java.Util.List<Android.Media.Session.MediaController>> OnOnActiveSessionsChanged { get; set; } = null;
 
             void OnActiveSessionsChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Media.Session.MediaController>>> data)
             {
@@ -290,7 +293,7 @@ public partial class OnMediaKeyEventSessionChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMediaKeyEventSessionChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnMediaKeyEventSessionChangedEventHandler));
+                AddEventHandler("onMediaKeyEventSessionChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnMediaKeyEventSessionChangedEventHandler));
 
             }
 
@@ -298,7 +301,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.OnMediaKeyEventSessionChangedListener.html#onMediaKeyEventSessionChanged(java.lang.String,android.media.session.MediaSession.Token)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMediaKeyEventSessionChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, Android.Media.Session.MediaSession.Token> OnOnMediaKeyEventSessionChanged { get; set; } = null;
+            public global::System.Action<Java.Lang.String, Android.Media.Session.MediaSession.Token> OnOnMediaKeyEventSessionChanged { get; set; } = null;
 
             void OnMediaKeyEventSessionChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -391,7 +394,7 @@ public partial class OnSession2TokensChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSession2TokensChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Media.Session2Token>>>>(OnSession2TokensChangedEventHandler));
+                AddEventHandler("onSession2TokensChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Media.Session2Token>>>>(OnSession2TokensChangedEventHandler));
 
             }
 
@@ -399,7 +402,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.OnSession2TokensChangedListener.html#onSession2TokensChanged(java.util.List)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSession2TokensChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.List<Android.Media.Session2Token>> OnOnSession2TokensChanged { get; set; } = null;
+            public global::System.Action<Java.Util.List<Android.Media.Session2Token>> OnOnSession2TokensChanged { get; set; } = null;
 
             void OnSession2TokensChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Media.Session2Token>>> data)
             {
@@ -496,25 +499,28 @@ public RemoteUserInfo(Java.Lang.String arg0, int arg1, int arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.RemoteUserInfo.html#getPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.RemoteUserInfo.html#getPid()"/>
             /// </summary>
-            public Java.Lang.String PackageName
+            /// <returns><see cref="int"/></returns>
+            public int GetPid()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getPid", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.RemoteUserInfo.html#getPid()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.RemoteUserInfo.html#getUid()"/>
             /// </summary>
-            public int Pid
+            /// <returns><see cref="int"/></returns>
+            public int GetUid()
             {
-                get { return IExecuteWithSignature<int>("getPid", "()I"); }
+                return IExecuteWithSignature<int>("getUid", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.RemoteUserInfo.html#getUid()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/MediaSessionManager.RemoteUserInfo.html#getPackageName()"/>
             /// </summary>
-            public int Uid
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPackageName()
             {
-                get { return IExecuteWithSignature<int>("getUid", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Session/PlaybackState.cs b/src/net/Netdroid/Generated/Android/Media/Session/PlaybackState.cs
index 7b63d0a4c..688c08212 100644
--- a/src/net/Netdroid/Generated/Android/Media/Session/PlaybackState.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Session/PlaybackState.cs
@@ -244,90 +244,100 @@ public partial class PlaybackState
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getExtras()"/>
         /// </summary>
-        public long Actions
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<long>("getActions", "()J"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getActiveQueueItemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#isActive()"/>
         /// </summary>
-        public long ActiveQueueItemId
+        /// <returns><see cref="bool"/></returns>
+        public bool IsActive()
         {
-            get { return IExecuteWithSignature<long>("getActiveQueueItemId", "()J"); }
+            return IExecuteWithSignature<bool>("isActive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getBufferedPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getPlaybackSpeed()"/>
         /// </summary>
-        public long BufferedPosition
+        /// <returns><see cref="float"/></returns>
+        public float GetPlaybackSpeed()
         {
-            get { return IExecuteWithSignature<long>("getBufferedPosition", "()J"); }
+            return IExecuteWithSignature<float>("getPlaybackSpeed", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getCustomActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.Session.PlaybackState.CustomAction> CustomActions
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Session.PlaybackState.CustomAction>>("getCustomActions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getErrorMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getState()"/>
         /// </summary>
-        public Java.Lang.CharSequence ErrorMessage
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getErrorMessage", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getErrorMessage()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetErrorMessage()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getErrorMessage", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getLastPositionUpdateTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getCustomActions()"/>
         /// </summary>
-        public long LastPositionUpdateTime
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Session.PlaybackState.CustomAction> GetCustomActions()
         {
-            get { return IExecuteWithSignature<long>("getLastPositionUpdateTime", "()J"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Session.PlaybackState.CustomAction>>("getCustomActions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getPlaybackSpeed()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getActions()"/>
         /// </summary>
-        public float PlaybackSpeed
+        /// <returns><see cref="long"/></returns>
+        public long GetActions()
         {
-            get { return IExecuteWithSignature<float>("getPlaybackSpeed", "()F"); }
+            return IExecuteWithSignature<long>("getActions", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getActiveQueueItemId()"/>
         /// </summary>
-        public long Position
+        /// <returns><see cref="long"/></returns>
+        public long GetActiveQueueItemId()
         {
-            get { return IExecuteWithSignature<long>("getPosition", "()J"); }
+            return IExecuteWithSignature<long>("getActiveQueueItemId", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getBufferedPosition()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="long"/></returns>
+        public long GetBufferedPosition()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<long>("getBufferedPosition", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#isActive()"/>
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getLastPositionUpdateTime()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsActive()
+        /// <returns><see cref="long"/></returns>
+        public long GetLastPositionUpdateTime()
         {
-            return IExecuteWithSignature<bool>("isActive", "()Z");
+            return IExecuteWithSignature<long>("getLastPositionUpdateTime", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#getPosition()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetPosition()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getPosition", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.html#writeToParcel(android.os.Parcel,int)"/>
@@ -504,40 +514,44 @@ public partial class CustomAction
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#getAction()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#getExtras()"/>
             /// </summary>
-            public Java.Lang.String Action
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getAction", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#describeContents()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#getIcon()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#getIcon()"/>
             /// </summary>
-            public int Icon
+            /// <returns><see cref="int"/></returns>
+            public int GetIcon()
             {
-                get { return IExecuteWithSignature<int>("getIcon", "()I"); }
+                return IExecuteWithSignature<int>("getIcon", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#getName()"/>
             /// </summary>
-            public Java.Lang.CharSequence Name
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getName", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#getAction()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetAction()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getAction", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/session/PlaybackState.CustomAction.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Session2Command.cs b/src/net/Netdroid/Generated/Android/Media/Session2Command.cs
index 4cb47691b..a00b40710 100644
--- a/src/net/Netdroid/Generated/Android/Media/Session2Command.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Session2Command.cs
@@ -75,33 +75,36 @@ public Session2Command(Java.Lang.String arg0, Android.Os.Bundle arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#getCommandCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#getCustomExtras()"/>
         /// </summary>
-        public int CommandCode
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetCustomExtras()
         {
-            get { return IExecuteWithSignature<int>("getCommandCode", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getCustomExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#getCustomAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String CustomAction
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCustomAction", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#getCustomExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#getCommandCode()"/>
         /// </summary>
-        public Android.Os.Bundle CustomExtras
+        /// <returns><see cref="int"/></returns>
+        public int GetCommandCode()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getCustomExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getCommandCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#getCustomAction()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCustomAction()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getCustomAction", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Session2Command.html#writeToParcel(android.os.Parcel,int)"/>
@@ -164,18 +167,20 @@ public Result(int arg0, Android.Os.Bundle arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/Session2Command.Result.html#getResultCode()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/Session2Command.Result.html#getResultData()"/>
             /// </summary>
-            public int ResultCode
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetResultData()
             {
-                get { return IExecuteWithSignature<int>("getResultCode", "()I"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getResultData", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/Session2Command.Result.html#getResultData()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/Session2Command.Result.html#getResultCode()"/>
             /// </summary>
-            public Android.Os.Bundle ResultData
+            /// <returns><see cref="int"/></returns>
+            public int GetResultCode()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getResultData", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("getResultCode", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Session2CommandGroup.cs b/src/net/Netdroid/Generated/Android/Media/Session2CommandGroup.cs
index 24b7eff88..8c06202f6 100644
--- a/src/net/Netdroid/Generated/Android/Media/Session2CommandGroup.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Session2CommandGroup.cs
@@ -52,13 +52,6 @@ public partial class Session2CommandGroup
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2CommandGroup.html#getCommands()"/> 
-        /// </summary>
-        public Java.Util.Set<Android.Media.Session2Command> Commands
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Media.Session2Command>>("getCommands", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Session2CommandGroup.html#hasCommand(android.media.Session2Command)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Session2Command"/></param>
@@ -85,6 +78,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Session2CommandGroup.html#getCommands()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Media.Session2Command> GetCommands()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Android.Media.Session2Command>>("getCommands", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Session2CommandGroup.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/Session2Token.cs b/src/net/Netdroid/Generated/Android/Media/Session2Token.cs
index 4e789db40..980605fd6 100644
--- a/src/net/Netdroid/Generated/Android/Media/Session2Token.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Session2Token.cs
@@ -73,47 +73,52 @@ public Session2Token(Android.Content.Context arg0, Android.Content.ComponentName
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getExtras()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getServiceName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getType()"/>
         /// </summary>
-        public Java.Lang.String ServiceName
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getUid()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetUid()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getPackageName()"/>
         /// </summary>
-        public int Uid
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<int>("getUid", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#getServiceName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServiceName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getServiceName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Session2Token.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/SoundPool.cs b/src/net/Netdroid/Generated/Android/Media/SoundPool.cs
index af97c58e5..d5172b28a 100644
--- a/src/net/Netdroid/Generated/Android/Media/SoundPool.cs
+++ b/src/net/Netdroid/Generated/Android/Media/SoundPool.cs
@@ -35,7 +35,7 @@ public partial class SoundPool
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SoundPool(int arg0, int arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -318,7 +318,7 @@ public partial class OnLoadCompleteListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onLoadComplete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.SoundPool>>>(OnLoadCompleteEventHandler));
+                AddEventHandler("onLoadComplete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.SoundPool>>>(OnLoadCompleteEventHandler));
 
             }
 
@@ -326,7 +326,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/SoundPool.OnLoadCompleteListener.html#onLoadComplete(android.media.SoundPool,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLoadComplete"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.SoundPool, int, int> OnOnLoadComplete { get; set; } = null;
+            public global::System.Action<Android.Media.SoundPool, int, int> OnOnLoadComplete { get; set; } = null;
 
             void OnLoadCompleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.SoundPool>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Spatializer.cs b/src/net/Netdroid/Generated/Android/Media/Spatializer.cs
index 66b6d328c..62aa76929 100644
--- a/src/net/Netdroid/Generated/Android/Media/Spatializer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Spatializer.cs
@@ -64,13 +64,6 @@ public partial class Spatializer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/Spatializer.html#getImmersiveAudioLevel()"/> 
-        /// </summary>
-        public int ImmersiveAudioLevel
-        {
-            get { return IExecuteWithSignature<int>("getImmersiveAudioLevel", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Spatializer.html#canBeSpatialized(android.media.AudioAttributes,android.media.AudioFormat)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.AudioAttributes"/></param>
@@ -105,6 +98,14 @@ public bool IsHeadTrackerAvailable()
             return IExecuteWithSignature<bool>("isHeadTrackerAvailable", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/Spatializer.html#getImmersiveAudioLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetImmersiveAudioLevel()
+        {
+            return IExecuteWithSignature<int>("getImmersiveAudioLevel", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/Spatializer.html#addOnHeadTrackerAvailableListener(java.util.concurrent.Executor,android.media.Spatializer.OnHeadTrackerAvailableListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -167,7 +168,7 @@ public partial class OnHeadTrackerAvailableListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onHeadTrackerAvailableChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>>>(OnHeadTrackerAvailableChangedEventHandler));
+                AddEventHandler("onHeadTrackerAvailableChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>>>(OnHeadTrackerAvailableChangedEventHandler));
 
             }
 
@@ -175,7 +176,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/Spatializer.OnHeadTrackerAvailableListener.html#onHeadTrackerAvailableChanged(android.media.Spatializer,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnHeadTrackerAvailableChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Spatializer, bool> OnOnHeadTrackerAvailableChanged { get; set; } = null;
+            public global::System.Action<Android.Media.Spatializer, bool> OnOnHeadTrackerAvailableChanged { get; set; } = null;
 
             void OnHeadTrackerAvailableChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>> data)
             {
@@ -268,8 +269,8 @@ public partial class OnSpatializerStateChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSpatializerAvailableChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>>>(OnSpatializerAvailableChangedEventHandler));
-                AddEventHandler("onSpatializerEnabledChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>>>(OnSpatializerEnabledChangedEventHandler));
+                AddEventHandler("onSpatializerAvailableChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>>>(OnSpatializerAvailableChangedEventHandler));
+                AddEventHandler("onSpatializerEnabledChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>>>(OnSpatializerEnabledChangedEventHandler));
 
             }
 
@@ -277,7 +278,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/Spatializer.OnSpatializerStateChangedListener.html#onSpatializerAvailableChanged(android.media.Spatializer,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSpatializerAvailableChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Spatializer, bool> OnOnSpatializerAvailableChanged { get; set; } = null;
+            public global::System.Action<Android.Media.Spatializer, bool> OnOnSpatializerAvailableChanged { get; set; } = null;
 
             void OnSpatializerAvailableChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>> data)
             {
@@ -299,7 +300,7 @@ public virtual void OnSpatializerAvailableChanged(Android.Media.Spatializer arg0
             /// Handler for <see href="https://developer.android.com/reference/android/media/Spatializer.OnSpatializerStateChangedListener.html#onSpatializerEnabledChanged(android.media.Spatializer,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSpatializerEnabledChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Media.Spatializer, bool> OnOnSpatializerEnabledChanged { get; set; } = null;
+            public global::System.Action<Android.Media.Spatializer, bool> OnOnSpatializerEnabledChanged { get; set; } = null;
 
             void OnSpatializerEnabledChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Media.Spatializer>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/SubtitleData.cs b/src/net/Netdroid/Generated/Android/Media/SubtitleData.cs
index 2876e1958..3dff6bbb9 100644
--- a/src/net/Netdroid/Generated/Android/Media/SubtitleData.cs
+++ b/src/net/Netdroid/Generated/Android/Media/SubtitleData.cs
@@ -57,32 +57,36 @@ public SubtitleData(int arg0, long arg1, long arg2, byte[] arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/SubtitleData.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/SubtitleData.html#getData()"/>
         /// </summary>
-        public byte[] Data
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetData()
         {
-            get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/SubtitleData.html#getDurationUs()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/SubtitleData.html#getTrackIndex()"/>
         /// </summary>
-        public long DurationUs
+        /// <returns><see cref="int"/></returns>
+        public int GetTrackIndex()
         {
-            get { return IExecuteWithSignature<long>("getDurationUs", "()J"); }
+            return IExecuteWithSignature<int>("getTrackIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/SubtitleData.html#getStartTimeUs()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/SubtitleData.html#getDurationUs()"/>
         /// </summary>
-        public long StartTimeUs
+        /// <returns><see cref="long"/></returns>
+        public long GetDurationUs()
         {
-            get { return IExecuteWithSignature<long>("getStartTimeUs", "()J"); }
+            return IExecuteWithSignature<long>("getDurationUs", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/SubtitleData.html#getTrackIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/SubtitleData.html#getStartTimeUs()"/>
         /// </summary>
-        public int TrackIndex
+        /// <returns><see cref="long"/></returns>
+        public long GetStartTimeUs()
         {
-            get { return IExecuteWithSignature<int>("getTrackIndex", "()I"); }
+            return IExecuteWithSignature<long>("getStartTimeUs", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/SyncParams.cs b/src/net/Netdroid/Generated/Android/Media/SyncParams.cs
index 5fee883e6..3d4ab1bbc 100644
--- a/src/net/Netdroid/Generated/Android/Media/SyncParams.cs
+++ b/src/net/Netdroid/Generated/Android/Media/SyncParams.cs
@@ -88,34 +88,6 @@ public partial class SyncParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#getAudioAdjustMode()"/> 
-        /// </summary>
-        public int AudioAdjustMode
-        {
-            get { return IExecuteWithSignature<int>("getAudioAdjustMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#getFrameRate()"/> 
-        /// </summary>
-        public float FrameRate
-        {
-            get { return IExecuteWithSignature<float>("getFrameRate", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#getSyncSource()"/> 
-        /// </summary>
-        public int SyncSource
-        {
-            get { return IExecuteWithSignature<int>("getSyncSource", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#getTolerance()"/> 
-        /// </summary>
-        public float Tolerance
-        {
-            get { return IExecuteWithSignature<float>("getTolerance", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#allowDefaults()"/>
         /// </summary>
         /// <returns><see cref="Android.Media.SyncParams"/></returns>
@@ -159,6 +131,38 @@ public Android.Media.SyncParams SetTolerance(float arg0)
         {
             return IExecuteWithSignature<Android.Media.SyncParams>("setTolerance", "(F)Landroid/media/SyncParams;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#getFrameRate()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetFrameRate()
+        {
+            return IExecuteWithSignature<float>("getFrameRate", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#getTolerance()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTolerance()
+        {
+            return IExecuteWithSignature<float>("getTolerance", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#getAudioAdjustMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioAdjustMode()
+        {
+            return IExecuteWithSignature<int>("getAudioAdjustMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/SyncParams.html#getSyncSource()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSyncSource()
+        {
+            return IExecuteWithSignature<int>("getSyncSource", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Media/ThumbnailUtils.cs b/src/net/Netdroid/Generated/Android/Media/ThumbnailUtils.cs
index f6236bb15..97bd07cdb 100644
--- a/src/net/Netdroid/Generated/Android/Media/ThumbnailUtils.cs
+++ b/src/net/Netdroid/Generated/Android/Media/ThumbnailUtils.cs
@@ -65,7 +65,7 @@ public static Android.Graphics.Bitmap CreateAudioThumbnail(Java.Io.File arg0, An
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.Bitmap CreateAudioThumbnail(Java.Lang.String arg0, int arg1)
         {
             return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "createAudioThumbnail", arg0, arg1);
@@ -88,7 +88,7 @@ public static Android.Graphics.Bitmap CreateImageThumbnail(Java.Io.File arg0, An
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.Bitmap CreateImageThumbnail(Java.Lang.String arg0, int arg1)
         {
             return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "createImageThumbnail", arg0, arg1);
@@ -111,7 +111,7 @@ public static Android.Graphics.Bitmap CreateVideoThumbnail(Java.Io.File arg0, An
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.Bitmap CreateVideoThumbnail(Java.Lang.String arg0, int arg1)
         {
             return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "createVideoThumbnail", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Media/TimedMetaData.cs b/src/net/Netdroid/Generated/Android/Media/TimedMetaData.cs
index 0ad5ed79a..fb6e957b2 100644
--- a/src/net/Netdroid/Generated/Android/Media/TimedMetaData.cs
+++ b/src/net/Netdroid/Generated/Android/Media/TimedMetaData.cs
@@ -55,18 +55,20 @@ public TimedMetaData(long arg0, byte[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/TimedMetaData.html#getMetaData()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/TimedMetaData.html#getMetaData()"/>
         /// </summary>
-        public byte[] MetaData
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetMetaData()
         {
-            get { return IExecuteWithSignatureArray<byte>("getMetaData", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getMetaData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/TimedMetaData.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/TimedMetaData.html#getTimestamp()"/>
         /// </summary>
-        public long Timestamp
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestamp()
         {
-            get { return IExecuteWithSignature<long>("getTimestamp", "()J"); }
+            return IExecuteWithSignature<long>("getTimestamp", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/TimedText.cs b/src/net/Netdroid/Generated/Android/Media/TimedText.cs
index a579e24bb..4cf91ef86 100644
--- a/src/net/Netdroid/Generated/Android/Media/TimedText.cs
+++ b/src/net/Netdroid/Generated/Android/Media/TimedText.cs
@@ -46,18 +46,20 @@ public partial class TimedText
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/TimedText.html#getBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/TimedText.html#getBounds()"/>
         /// </summary>
-        public Android.Graphics.Rect Bounds
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/TimedText.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/TimedText.html#getText()"/>
         /// </summary>
-        public Java.Lang.String Text
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/ToneGenerator.cs b/src/net/Netdroid/Generated/Android/Media/ToneGenerator.cs
index 01bc8703b..fd8061136 100644
--- a/src/net/Netdroid/Generated/Android/Media/ToneGenerator.cs
+++ b/src/net/Netdroid/Generated/Android/Media/ToneGenerator.cs
@@ -661,13 +661,6 @@ public ToneGenerator(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/ToneGenerator.html#getAudioSessionId()"/> 
-        /// </summary>
-        public int AudioSessionId
-        {
-            get { return IExecuteWithSignature<int>("getAudioSessionId", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ToneGenerator.html#startTone(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -677,6 +670,14 @@ public bool StartTone(int arg0)
             return IExecuteWithSignature<bool>("startTone", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/ToneGenerator.html#getAudioSessionId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSessionId()
+        {
+            return IExecuteWithSignature<int>("getAudioSessionId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/ToneGenerator.html#startTone(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/AdBuffer.cs b/src/net/Netdroid/Generated/Android/Media/Tv/AdBuffer.cs
index 71656ccf8..c7794ea32 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/AdBuffer.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/AdBuffer.cs
@@ -66,61 +66,68 @@ public AdBuffer(int arg0, Java.Lang.String arg1, Android.Os.SharedMemory arg2, i
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getSharedMemory()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="Android.Os.SharedMemory"/></returns>
+        public Android.Os.SharedMemory GetSharedMemory()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<Android.Os.SharedMemory>("getSharedMemory", "()Landroid/os/SharedMemory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#describeContents()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getFlags()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getMimeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getId()"/>
         /// </summary>
-        public Java.Lang.String MimeType
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getLength()"/>
         /// </summary>
-        public int Offset
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignature<int>("getOffset", "()I"); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getPresentationTimeUs()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getOffset()"/>
         /// </summary>
-        public long PresentationTimeUs
+        /// <returns><see cref="int"/></returns>
+        public int GetOffset()
         {
-            get { return IExecuteWithSignature<long>("getPresentationTimeUs", "()J"); }
+            return IExecuteWithSignature<int>("getOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getSharedMemory()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getMimeType()"/>
         /// </summary>
-        public Android.Os.SharedMemory SharedMemory
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMimeType()
         {
-            get { return IExecuteWithSignature<Android.Os.SharedMemory>("getSharedMemory", "()Landroid/os/SharedMemory;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#getPresentationTimeUs()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetPresentationTimeUs()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getPresentationTimeUs", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/AdBuffer.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/AdRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/AdRequest.cs
index 7513739fa..570ee1949 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/AdRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/AdRequest.cs
@@ -93,75 +93,84 @@ public AdRequest(int arg0, int arg1, Android.Os.ParcelFileDescriptor arg2, long
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getEchoIntervalMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getUri()"/>
         /// </summary>
-        public long EchoIntervalMillis
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUri()
         {
-            get { return IExecuteWithSignature<long>("getEchoIntervalMillis", "()J"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getFileDescriptor()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getMetadata()"/>
         /// </summary>
-        public Android.Os.ParcelFileDescriptor FileDescriptor
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetMetadata()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("getFileDescriptor", "()Landroid/os/ParcelFileDescriptor;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getMetadata", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getFileDescriptor()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="Android.Os.ParcelFileDescriptor"/></returns>
+        public Android.Os.ParcelFileDescriptor GetFileDescriptor()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("getFileDescriptor", "()Landroid/os/ParcelFileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getMediaFileType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String MediaFileType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMediaFileType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getMetadata()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getId()"/>
         /// </summary>
-        public Android.Os.Bundle Metadata
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getMetadata", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getRequestType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getRequestType()"/>
         /// </summary>
-        public int RequestType
+        /// <returns><see cref="int"/></returns>
+        public int GetRequestType()
         {
-            get { return IExecuteWithSignature<int>("getRequestType", "()I"); }
+            return IExecuteWithSignature<int>("getRequestType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getStartTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getMediaFileType()"/>
         /// </summary>
-        public long StartTimeMillis
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMediaFileType()
         {
-            get { return IExecuteWithSignature<long>("getStartTimeMillis", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMediaFileType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getStopTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getEchoIntervalMillis()"/>
         /// </summary>
-        public long StopTimeMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetEchoIntervalMillis()
         {
-            get { return IExecuteWithSignature<long>("getStopTimeMillis", "()J"); }
+            return IExecuteWithSignature<long>("getEchoIntervalMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getStartTimeMillis()"/>
         /// </summary>
-        public Android.Net.Uri Uri
+        /// <returns><see cref="long"/></returns>
+        public long GetStartTimeMillis()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<long>("getStartTimeMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#getStopTimeMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetStopTimeMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getStopTimeMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/AdRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/AdResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/AdResponse.cs
index 99838802b..d6d0f878f 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/AdResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/AdResponse.cs
@@ -92,33 +92,36 @@ public AdResponse(int arg0, int arg1, long arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#getElapsedTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#describeContents()"/>
         /// </summary>
-        public long ElapsedTimeMillis
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getElapsedTimeMillis", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#getId()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#getResponseType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#getResponseType()"/>
         /// </summary>
-        public int ResponseType
+        /// <returns><see cref="int"/></returns>
+        public int GetResponseType()
         {
-            get { return IExecuteWithSignature<int>("getResponseType", "()I"); }
+            return IExecuteWithSignature<int>("getResponseType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#getElapsedTimeMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetElapsedTimeMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getElapsedTimeMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/AdResponse.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/AitInfo.cs b/src/net/Netdroid/Generated/Android/Media/Tv/AitInfo.cs
index b9fe952d6..198fff07e 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/AitInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/AitInfo.cs
@@ -61,26 +61,28 @@ public AitInfo(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AitInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AitInfo.html#describeContents()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AitInfo.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/AitInfo.html#getType()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/AitInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/AitInfo.html#getVersion()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetVersion()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/AitInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Tv/AllPackageClasses.cs
index 9d4547830..34f745958 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/AllPackageClasses.cs
@@ -212,12 +212,12 @@ public partial class BroadcastInfoRequest : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BroadcastInfoRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BroadcastInfoRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BroadcastInfoRequest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BroadcastInfoRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BroadcastInfoRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BroadcastInfoRequest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,12 +258,12 @@ public partial class BroadcastInfoResponse : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BroadcastInfoResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BroadcastInfoResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BroadcastInfoResponse() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BroadcastInfoResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BroadcastInfoResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BroadcastInfoResponse(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1136,12 +1136,12 @@ public partial class BaseTvColumns : Android.Provider.BaseColumns
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("BaseTvColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BaseTvColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BaseTvColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("BaseTvColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BaseTvColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BaseTvColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1622,12 +1622,12 @@ public partial class TvInputCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<T
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TvInputCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TvInputCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TvInputCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TvInputCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TvInputCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TvInputCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1672,12 +1672,12 @@ public partial class TvInputService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TvInputService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TvInputService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TvInputService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TvInputService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TvInputService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TvInputService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1714,12 +1714,12 @@ public partial class HardwareSession : Android.Media.Tv.TvInputService.Session
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("HardwareSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("HardwareSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public HardwareSession() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("HardwareSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("HardwareSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public HardwareSession(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1760,12 +1760,12 @@ public partial class RecordingSession : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("RecordingSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RecordingSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RecordingSession() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("RecordingSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RecordingSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RecordingSession(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1806,12 +1806,12 @@ public partial class Session : Android.View.KeyEvent.Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Session() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Session(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1896,12 +1896,12 @@ public partial class RecordingCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("RecordingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RecordingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RecordingCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("RecordingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RecordingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RecordingCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2119,10 +2119,13 @@ public partial class OnUnhandledInputEventListener : MASES.JCOBridge.C2JBridge.J
             /// </summary>
             public OnUnhandledInputEventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.tv.TvView_OnUnhandledInputEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.tv.OnUnhandledInputEventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2144,10 +2147,13 @@ public partial class OnUnhandledInputEventListenerDirect : OnUnhandledInputEvent
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.tv.TvView$OnUnhandledInputEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.tv.TvView$OnUnhandledInputEventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2177,12 +2183,12 @@ public partial class TimeShiftPositionCallback : MASES.JCOBridge.C2JBridge.JVMBr
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TimeShiftPositionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TimeShiftPositionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TimeShiftPositionCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TimeShiftPositionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TimeShiftPositionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TimeShiftPositionCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2223,12 +2229,12 @@ public partial class TvInputCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<T
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TvInputCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TvInputCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TvInputCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TvInputCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TvInputCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TvInputCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/BroadcastInfoRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/BroadcastInfoRequest.cs
index a5de1fc97..43af81bb7 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/BroadcastInfoRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/BroadcastInfoRequest.cs
@@ -64,33 +64,36 @@ public partial class BroadcastInfoRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#getOption()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#describeContents()"/>
         /// </summary>
-        public int Option
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getOption", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#getRequestId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#getOption()"/>
         /// </summary>
-        public int RequestId
+        /// <returns><see cref="int"/></returns>
+        public int GetOption()
         {
-            get { return IExecuteWithSignature<int>("getRequestId", "()I"); }
+            return IExecuteWithSignature<int>("getOption", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#getRequestId()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetRequestId()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getRequestId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#getType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/BroadcastInfoResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/BroadcastInfoResponse.cs
index e98368bbe..78a3a56e6 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/BroadcastInfoResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/BroadcastInfoResponse.cs
@@ -70,40 +70,44 @@ public partial class BroadcastInfoResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#getRequestId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#describeContents()"/>
         /// </summary>
-        public int RequestId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getRequestId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#getResponseResult()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#getRequestId()"/>
         /// </summary>
-        public int ResponseResult
+        /// <returns><see cref="int"/></returns>
+        public int GetRequestId()
         {
-            get { return IExecuteWithSignature<int>("getResponseResult", "()I"); }
+            return IExecuteWithSignature<int>("getRequestId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#getSequence()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#getResponseResult()"/>
         /// </summary>
-        public int Sequence
+        /// <returns><see cref="int"/></returns>
+        public int GetResponseResult()
         {
-            get { return IExecuteWithSignature<int>("getSequence", "()I"); }
+            return IExecuteWithSignature<int>("getResponseResult", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#getSequence()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetSequence()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getSequence", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#getType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/BroadcastInfoResponse.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/CommandRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/CommandRequest.cs
index c7ab26814..2299dc3a1 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/CommandRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/CommandRequest.cs
@@ -77,32 +77,36 @@ public CommandRequest(int arg0, int arg1, Java.Lang.String arg2, Java.Lang.Strin
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/CommandRequest.html#getArguments()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/CommandRequest.html#getArguments()"/>
         /// </summary>
-        public Java.Lang.String Arguments
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetArguments()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getArguments", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getArguments", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/CommandRequest.html#getArgumentType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/CommandRequest.html#getArgumentType()"/>
         /// </summary>
-        public Java.Lang.String ArgumentType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetArgumentType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getArgumentType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getArgumentType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/CommandRequest.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/CommandRequest.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/CommandRequest.html#getNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/CommandRequest.html#getNamespace()"/>
         /// </summary>
-        public Java.Lang.String Namespace
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/CommandResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/CommandResponse.cs
index 8f5d04a78..605662349 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/CommandResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/CommandResponse.cs
@@ -76,18 +76,20 @@ public CommandResponse(int arg0, int arg1, int arg2, Java.Lang.String arg3, Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/CommandResponse.html#getResponse()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/CommandResponse.html#getResponse()"/>
         /// </summary>
-        public Java.Lang.String Response
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResponse()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResponse", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getResponse", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/CommandResponse.html#getResponseType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/CommandResponse.html#getResponseType()"/>
         /// </summary>
-        public Java.Lang.String ResponseType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResponseType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResponseType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getResponseType", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/DsmccRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/DsmccRequest.cs
index 9870d83f0..cd55d32e0 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/DsmccRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/DsmccRequest.cs
@@ -62,11 +62,12 @@ public DsmccRequest(int arg0, int arg1, Android.Net.Uri arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccRequest.html#getUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccRequest.html#getUri()"/>
         /// </summary>
-        public Android.Net.Uri Uri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUri()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/DsmccResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/DsmccResponse.cs
index a336c0e8d..72e6f48bf 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/DsmccResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/DsmccResponse.cs
@@ -111,39 +111,44 @@ public DsmccResponse(int arg0, int arg1, int arg2, int[] arg3, Java.Lang.String[
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getBiopMessageType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getFile()"/>
         /// </summary>
-        public Java.Lang.String BiopMessageType
+        /// <returns><see cref="Android.Os.ParcelFileDescriptor"/></returns>
+        public Android.Os.ParcelFileDescriptor GetFile()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBiopMessageType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("getFile", "()Landroid/os/ParcelFileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getChildList()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getStreamEventIds()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> ChildList
+        /// <returns><see cref="int"/></returns>
+        public int[] GetStreamEventIds()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getChildList", "()Ljava/util/List;"); }
+            return IExecuteWithSignatureArray<int>("getStreamEventIds", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getFile()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getBiopMessageType()"/>
         /// </summary>
-        public Android.Os.ParcelFileDescriptor File
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBiopMessageType()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("getFile", "()Landroid/os/ParcelFileDescriptor;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getBiopMessageType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getStreamEventIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getStreamEventNames()"/>
         /// </summary>
-        public int[] StreamEventIds
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetStreamEventNames()
         {
-            get { return IExecuteWithSignatureArray<int>("getStreamEventIds", "()[I"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getStreamEventNames", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getStreamEventNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/DsmccResponse.html#getChildList()"/>
         /// </summary>
-        public Java.Lang.String[] StreamEventNames
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetChildList()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getStreamEventNames", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getChildList", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/AllPackageClasses.cs
index 5e2fda8c5..29235276b 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/AllPackageClasses.cs
@@ -120,12 +120,12 @@ public partial class TvInteractiveAppCallback : MASES.JCOBridge.C2JBridge.JVMBri
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TvInteractiveAppCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TvInteractiveAppCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TvInteractiveAppCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TvInteractiveAppCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TvInteractiveAppCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TvInteractiveAppCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -170,12 +170,12 @@ public partial class TvInteractiveAppService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TvInteractiveAppService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TvInteractiveAppService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TvInteractiveAppService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TvInteractiveAppService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TvInteractiveAppService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TvInteractiveAppService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -212,12 +212,12 @@ public partial class Session : Android.View.KeyEvent.Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Session() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Session(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -347,10 +347,13 @@ public partial class OnUnhandledInputEventListener : MASES.JCOBridge.C2JBridge.J
             /// </summary>
             public OnUnhandledInputEventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.media.tv.interactive.TvInteractiveAppView_OnUnhandledInputEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.media.tv.interactive.OnUnhandledInputEventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -372,10 +375,13 @@ public partial class OnUnhandledInputEventListenerDirect : OnUnhandledInputEvent
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.media.tv.interactive.TvInteractiveAppView$OnUnhandledInputEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.media.tv.interactive.TvInteractiveAppView$OnUnhandledInputEventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -405,12 +411,12 @@ public partial class TvInteractiveAppCallback : MASES.JCOBridge.C2JBridge.JVMBri
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TvInteractiveAppCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TvInteractiveAppCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TvInteractiveAppCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TvInteractiveAppCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TvInteractiveAppCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TvInteractiveAppCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/AppLinkInfo.cs b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/AppLinkInfo.cs
index b254a5737..550d526aa 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/AppLinkInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/AppLinkInfo.cs
@@ -62,18 +62,20 @@ public AppLinkInfo(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.Strin
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/AppLinkInfo.html#getComponentName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/AppLinkInfo.html#getComponentName()"/>
         /// </summary>
-        public Android.Content.ComponentName ComponentName
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponentName()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/AppLinkInfo.html#getUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/AppLinkInfo.html#getUri()"/>
         /// </summary>
-        public Android.Net.Uri Uri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUri()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/interactive/AppLinkInfo.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppManager.cs b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppManager.cs
index c83dce84a..52ef5f627 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppManager.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppManager.cs
@@ -226,18 +226,20 @@ public partial class TvInteractiveAppManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppManager.html#getAppLinkInfoList()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppManager.html#getAppLinkInfoList()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.Tv.Interactive.AppLinkInfo> AppLinkInfoList
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Tv.Interactive.AppLinkInfo> GetAppLinkInfoList()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.Interactive.AppLinkInfo>>("getAppLinkInfoList", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.Interactive.AppLinkInfo>>("getAppLinkInfoList", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppManager.html#getTvInteractiveAppServiceList()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppManager.html#getTvInteractiveAppServiceList()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.Tv.Interactive.TvInteractiveAppServiceInfo> TvInteractiveAppServiceList
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Tv.Interactive.TvInteractiveAppServiceInfo> GetTvInteractiveAppServiceList()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.Interactive.TvInteractiveAppServiceInfo>>("getTvInteractiveAppServiceList", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.Interactive.TvInteractiveAppServiceInfo>>("getTvInteractiveAppServiceList", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppManager.html#registerAppLinkInfo(java.lang.String,android.media.tv.interactive.AppLinkInfo)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppServiceInfo.cs b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppServiceInfo.cs
index dafd68bd7..b2fc15e70 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppServiceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppServiceInfo.cs
@@ -91,40 +91,44 @@ public TvInteractiveAppServiceInfo(Android.Content.Context arg0, Android.Content
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#getCustomSupportedTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#getServiceInfo()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> CustomSupportedTypes
+        /// <returns><see cref="Android.Content.Pm.ServiceInfo"/></returns>
+        public Android.Content.Pm.ServiceInfo GetServiceInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getCustomSupportedTypes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#getServiceInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#getSupportedTypes()"/>
         /// </summary>
-        public Android.Content.Pm.ServiceInfo ServiceInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetSupportedTypes()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;"); }
+            return IExecuteWithSignature<int>("getSupportedTypes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#getSupportedTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#getId()"/>
         /// </summary>
-        public int SupportedTypes
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<int>("getSupportedTypes", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#getCustomSupportedTypes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetCustomSupportedTypes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getCustomSupportedTypes", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppServiceInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppView.cs b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppView.cs
index c4f99a45a..cbbe908eb 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppView.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/Interactive/TvInteractiveAppView.cs
@@ -109,11 +109,20 @@ public TvInteractiveAppView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppView.html#getOnUnhandledInputEventListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppView.html#getOnUnhandledInputEventListener()"/>
         /// </summary>
-        public Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListener GetOnUnhandledInputEventListener
+        /// <returns><see cref="Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListener"/></returns>
+        public Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListener GetOnUnhandledInputEventListener()
         {
-            get { return IExecuteWithSignature<Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListener>("getOnUnhandledInputEventListener", "()Landroid/media/tv/interactive/TvInteractiveAppView$OnUnhandledInputEventListener;"); }
+            return IExecuteWithSignature<Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListener>("getOnUnhandledInputEventListener", "()Landroid/media/tv/interactive/TvInteractiveAppView$OnUnhandledInputEventListener;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppView.html#getOnUnhandledInputEventListener()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListener"/></returns>
+        public Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListener GetOnUnhandledInputEventListenerDirect()
+        {
+            return IExecuteWithSignature<Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListenerDirect, Android.Media.Tv.Interactive.TvInteractiveAppView.OnUnhandledInputEventListener>("getOnUnhandledInputEventListener", "()Landroid/media/tv/interactive/TvInteractiveAppView$OnUnhandledInputEventListener;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppView.html#dispatchUnhandledInputEvent(android.view.InputEvent)"/>
@@ -477,7 +486,7 @@ public partial class OnUnhandledInputEventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onUnhandledInputEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.InputEvent>>>(OnUnhandledInputEventEventHandler));
+                AddEventHandler("onUnhandledInputEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.InputEvent>>>(OnUnhandledInputEventEventHandler));
 
             }
 
@@ -485,7 +494,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/tv/interactive/TvInteractiveAppView.OnUnhandledInputEventListener.html#onUnhandledInputEvent(android.view.InputEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnUnhandledInputEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.InputEvent, bool> OnOnUnhandledInputEvent { get; set; } = null;
+            public global::System.Func<Android.View.InputEvent, bool> OnOnUnhandledInputEvent { get; set; } = null;
 
             void OnUnhandledInputEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.InputEvent>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/PesRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/PesRequest.cs
index 33781601f..ddebb0cc9 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/PesRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/PesRequest.cs
@@ -63,18 +63,20 @@ public PesRequest(int arg0, int arg1, int arg2, int arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/PesRequest.html#getStreamId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/PesRequest.html#getStreamId()"/>
         /// </summary>
-        public int StreamId
+        /// <returns><see cref="int"/></returns>
+        public int GetStreamId()
         {
-            get { return IExecuteWithSignature<int>("getStreamId", "()I"); }
+            return IExecuteWithSignature<int>("getStreamId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/PesRequest.html#getTsPid()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/PesRequest.html#getTsPid()"/>
         /// </summary>
-        public int TsPid
+        /// <returns><see cref="int"/></returns>
+        public int GetTsPid()
         {
-            get { return IExecuteWithSignature<int>("getTsPid", "()I"); }
+            return IExecuteWithSignature<int>("getTsPid", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/PesResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/PesResponse.cs
index 70b2ea96a..41270e012 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/PesResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/PesResponse.cs
@@ -63,11 +63,12 @@ public PesResponse(int arg0, int arg1, int arg2, Java.Lang.String arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/PesResponse.html#getSharedFilterToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/PesResponse.html#getSharedFilterToken()"/>
         /// </summary>
-        public Java.Lang.String SharedFilterToken
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSharedFilterToken()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSharedFilterToken", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSharedFilterToken", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/SectionRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/SectionRequest.cs
index d38ce854c..bae906a61 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/SectionRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/SectionRequest.cs
@@ -64,25 +64,28 @@ public SectionRequest(int arg0, int arg1, int arg2, int arg3, int arg4)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/SectionRequest.html#getTableId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/SectionRequest.html#getTableId()"/>
         /// </summary>
-        public int TableId
+        /// <returns><see cref="int"/></returns>
+        public int GetTableId()
         {
-            get { return IExecuteWithSignature<int>("getTableId", "()I"); }
+            return IExecuteWithSignature<int>("getTableId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/SectionRequest.html#getTsPid()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/SectionRequest.html#getTsPid()"/>
         /// </summary>
-        public int TsPid
+        /// <returns><see cref="int"/></returns>
+        public int GetTsPid()
         {
-            get { return IExecuteWithSignature<int>("getTsPid", "()I"); }
+            return IExecuteWithSignature<int>("getTsPid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/SectionRequest.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/SectionRequest.html#getVersion()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/SectionResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/SectionResponse.cs
index 831278e45..4498f3139 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/SectionResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/SectionResponse.cs
@@ -65,25 +65,28 @@ public SectionResponse(int arg0, int arg1, int arg2, int arg3, int arg4, Android
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/SectionResponse.html#getSessionData()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/SectionResponse.html#getSessionData()"/>
         /// </summary>
-        public Android.Os.Bundle SessionData
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetSessionData()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getSessionData", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getSessionData", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/SectionResponse.html#getSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/SectionResponse.html#getSessionId()"/>
         /// </summary>
-        public int SessionId
+        /// <returns><see cref="int"/></returns>
+        public int GetSessionId()
         {
-            get { return IExecuteWithSignature<int>("getSessionId", "()I"); }
+            return IExecuteWithSignature<int>("getSessionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/SectionResponse.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/SectionResponse.html#getVersion()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/StreamEventRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/StreamEventRequest.cs
index 63dd99bb5..717631727 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/StreamEventRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/StreamEventRequest.cs
@@ -63,18 +63,20 @@ public StreamEventRequest(int arg0, int arg1, Android.Net.Uri arg2, Java.Lang.St
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventRequest.html#getEventName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventRequest.html#getTargetUri()"/>
         /// </summary>
-        public Java.Lang.String EventName
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetTargetUri()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEventName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getTargetUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventRequest.html#getTargetUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventRequest.html#getEventName()"/>
         /// </summary>
-        public Android.Net.Uri TargetUri
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEventName()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getTargetUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEventName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/StreamEventResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/StreamEventResponse.cs
index f341be43e..23cc7e242 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/StreamEventResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/StreamEventResponse.cs
@@ -65,25 +65,28 @@ public StreamEventResponse(int arg0, int arg1, int arg2, int arg3, long arg4, by
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventResponse.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventResponse.html#getData()"/>
         /// </summary>
-        public byte[] Data
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetData()
         {
-            get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventResponse.html#getEventId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventResponse.html#getEventId()"/>
         /// </summary>
-        public int EventId
+        /// <returns><see cref="int"/></returns>
+        public int GetEventId()
         {
-            get { return IExecuteWithSignature<int>("getEventId", "()I"); }
+            return IExecuteWithSignature<int>("getEventId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventResponse.html#getNptMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/StreamEventResponse.html#getNptMillis()"/>
         /// </summary>
-        public long NptMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetNptMillis()
         {
-            get { return IExecuteWithSignature<long>("getNptMillis", "()J"); }
+            return IExecuteWithSignature<long>("getNptMillis", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TableRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TableRequest.cs
index 7477df27d..7de903797 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TableRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TableRequest.cs
@@ -124,25 +124,28 @@ public TableRequest(int arg0, int arg1, int arg2, int arg3, int arg4)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TableRequest.html#getTableId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TableRequest.html#getTableId()"/>
         /// </summary>
-        public int TableId
+        /// <returns><see cref="int"/></returns>
+        public int GetTableId()
         {
-            get { return IExecuteWithSignature<int>("getTableId", "()I"); }
+            return IExecuteWithSignature<int>("getTableId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TableRequest.html#getTableName()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TableRequest.html#getTableName()"/>
         /// </summary>
-        public int TableName
+        /// <returns><see cref="int"/></returns>
+        public int GetTableName()
         {
-            get { return IExecuteWithSignature<int>("getTableName", "()I"); }
+            return IExecuteWithSignature<int>("getTableName", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TableRequest.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TableRequest.html#getVersion()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TableResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TableResponse.cs
index fcc476452..cac43f62f 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TableResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TableResponse.cs
@@ -38,7 +38,7 @@ public partial class TableResponse
         /// <param name="arg3"><see cref="Android.Net.Uri"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TableResponse(int arg0, int arg1, int arg2, Android.Net.Uri arg3, int arg4, int arg5)
             : base(arg0, arg1, arg2, arg3, arg4, arg5)
         {
@@ -66,39 +66,44 @@ public TableResponse(int arg0, int arg1, int arg2, Android.Net.Uri arg3, int arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getTableUri()"/>
         /// </summary>
-        public int Size
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetTableUri()
         {
-            get { return IExecuteWithSignature<int>("getSize", "()I"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getTableUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getTableByteArray()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getTableSharedMemory()"/>
         /// </summary>
-        public byte[] TableByteArray
+        /// <returns><see cref="Android.Os.SharedMemory"/></returns>
+        public Android.Os.SharedMemory GetTableSharedMemory()
         {
-            get { return IExecuteWithSignatureArray<byte>("getTableByteArray", "()[B"); }
+            return IExecuteWithSignature<Android.Os.SharedMemory>("getTableSharedMemory", "()Landroid/os/SharedMemory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getTableSharedMemory()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getTableByteArray()"/>
         /// </summary>
-        public Android.Os.SharedMemory TableSharedMemory
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetTableByteArray()
         {
-            get { return IExecuteWithSignature<Android.Os.SharedMemory>("getTableSharedMemory", "()Landroid/os/SharedMemory;"); }
+            return IExecuteWithSignatureArray<byte>("getTableByteArray", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getTableUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getSize()"/>
         /// </summary>
-        public Android.Net.Uri TableUri
+        /// <returns><see cref="int"/></returns>
+        public int GetSize()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getTableUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<int>("getSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TableResponse.html#getVersion()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TimelineRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TimelineRequest.cs
index 84cfbb755..77f10ee9b 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TimelineRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TimelineRequest.cs
@@ -73,18 +73,20 @@ public TimelineRequest(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineRequest.html#getIntervalMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineRequest.html#getIntervalMillis()"/>
         /// </summary>
-        public int IntervalMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetIntervalMillis()
         {
-            get { return IExecuteWithSignature<int>("getIntervalMillis", "()I"); }
+            return IExecuteWithSignature<int>("getIntervalMillis", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineRequest.html#getSelector()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineRequest.html#getSelector()"/>
         /// </summary>
-        public Java.Lang.String Selector
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSelector()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSelector", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSelector", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TimelineResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TimelineResponse.cs
index c031d3058..e2f49ea18 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TimelineResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TimelineResponse.cs
@@ -67,39 +67,44 @@ public TimelineResponse(int arg0, int arg1, int arg2, Java.Lang.String arg3, int
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getSelector()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getSelector()"/>
         /// </summary>
-        public Android.Net.Uri Selector
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetSelector()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getSelector", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getSelector", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getTicks()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getUnitsPerSecond()"/>
         /// </summary>
-        public long Ticks
+        /// <returns><see cref="int"/></returns>
+        public int GetUnitsPerSecond()
         {
-            get { return IExecuteWithSignature<long>("getTicks", "()J"); }
+            return IExecuteWithSignature<int>("getUnitsPerSecond", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getUnitsPerSecond()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getUnitsPerTick()"/>
         /// </summary>
-        public int UnitsPerSecond
+        /// <returns><see cref="int"/></returns>
+        public int GetUnitsPerTick()
         {
-            get { return IExecuteWithSignature<int>("getUnitsPerSecond", "()I"); }
+            return IExecuteWithSignature<int>("getUnitsPerTick", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getUnitsPerTick()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getTicks()"/>
         /// </summary>
-        public int UnitsPerTick
+        /// <returns><see cref="long"/></returns>
+        public long GetTicks()
         {
-            get { return IExecuteWithSignature<int>("getUnitsPerTick", "()I"); }
+            return IExecuteWithSignature<long>("getTicks", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getWallClock()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TimelineResponse.html#getWallClock()"/>
         /// </summary>
-        public long WallClock
+        /// <returns><see cref="long"/></returns>
+        public long GetWallClock()
         {
-            get { return IExecuteWithSignature<long>("getWallClock", "()J"); }
+            return IExecuteWithSignature<long>("getWallClock", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TsRequest.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TsRequest.cs
index a84584bdf..3205c4da0 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TsRequest.cs
@@ -62,11 +62,12 @@ public TsRequest(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TsRequest.html#getTsPid()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TsRequest.html#getTsPid()"/>
         /// </summary>
-        public int TsPid
+        /// <returns><see cref="int"/></returns>
+        public int GetTsPid()
         {
-            get { return IExecuteWithSignature<int>("getTsPid", "()I"); }
+            return IExecuteWithSignature<int>("getTsPid", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TsResponse.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TsResponse.cs
index 702f11e23..5e57bfd6b 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TsResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TsResponse.cs
@@ -63,11 +63,12 @@ public TsResponse(int arg0, int arg1, int arg2, Java.Lang.String arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TsResponse.html#getSharedFilterToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TsResponse.html#getSharedFilterToken()"/>
         /// </summary>
-        public Java.Lang.String SharedFilterToken
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSharedFilterToken()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSharedFilterToken", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSharedFilterToken", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TvContentRating.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TvContentRating.cs
index b865ac529..12171cb89 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TvContentRating.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TvContentRating.cs
@@ -73,49 +73,53 @@ public static Android.Media.Tv.TvContentRating UnflattenFromString(Java.Lang.Str
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#getDomain()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#contains(android.media.tv.TvContentRating)"/>
         /// </summary>
-        public Java.Lang.String Domain
+        /// <param name="arg0"><see cref="Android.Media.Tv.TvContentRating"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Contains(Android.Media.Tv.TvContentRating arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDomain", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("contains", "(Landroid/media/tv/TvContentRating;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#getMainRating()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#flattenToString()"/>
         /// </summary>
-        public Java.Lang.String MainRating
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String FlattenToString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMainRating", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("flattenToString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#getRatingSystem()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#getDomain()"/>
         /// </summary>
-        public Java.Lang.String RatingSystem
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDomain()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRatingSystem", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDomain", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#getSubRatings()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#getMainRating()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> SubRatings
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMainRating()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSubRatings", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMainRating", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#contains(android.media.tv.TvContentRating)"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#getRatingSystem()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Media.Tv.TvContentRating"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Contains(Android.Media.Tv.TvContentRating arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRatingSystem()
         {
-            return IExecuteWithSignature<bool>("contains", "(Landroid/media/tv/TvContentRating;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getRatingSystem", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#flattenToString()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvContentRating.html#getSubRatings()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String FlattenToString()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetSubRatings()
         {
-            return IExecuteWithSignature<Java.Lang.String>("flattenToString", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSubRatings", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TvContract.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TvContract.cs
index e19d4ea6e..2b2aca763 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TvContract.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TvContract.cs
@@ -1521,7 +1521,7 @@ public partial class Programs
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/tv/TvContract.Programs.html#COLUMN_EPISODE_NUMBER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String COLUMN_EPISODE_NUMBER { get { if (!_COLUMN_EPISODE_NUMBERReady) { _COLUMN_EPISODE_NUMBERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "COLUMN_EPISODE_NUMBER"); _COLUMN_EPISODE_NUMBERReady = true; } return _COLUMN_EPISODE_NUMBERContent; } }
             private static Java.Lang.String _COLUMN_EPISODE_NUMBERContent = default;
             private static bool _COLUMN_EPISODE_NUMBERReady = false; // this is used because in case of generics 
@@ -1636,7 +1636,7 @@ public partial class Programs
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/tv/TvContract.Programs.html#COLUMN_SEASON_NUMBER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String COLUMN_SEASON_NUMBER { get { if (!_COLUMN_SEASON_NUMBERReady) { _COLUMN_SEASON_NUMBERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "COLUMN_SEASON_NUMBER"); _COLUMN_SEASON_NUMBERReady = true; } return _COLUMN_SEASON_NUMBERContent; } }
             private static Java.Lang.String _COLUMN_SEASON_NUMBERContent = default;
             private static bool _COLUMN_SEASON_NUMBERReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TvInputInfo.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TvInputInfo.cs
index 4fbd0c485..ae2ecb7a2 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TvInputInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TvInputInfo.cs
@@ -118,52 +118,10 @@ public partial class TvInputInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getExtras()"/> 
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getParentId()"/> 
-        /// </summary>
-        public Java.Lang.String ParentId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getParentId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getServiceInfo()"/> 
-        /// </summary>
-        public Android.Content.Pm.ServiceInfo ServiceInfo
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getTunerCount()"/> 
-        /// </summary>
-        public int TunerCount
-        {
-            get { return IExecuteWithSignature<int>("getTunerCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#createSettingsIntent()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.Intent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Intent CreateSettingsIntent()
         {
             return IExecuteWithSignature<Android.Content.Intent>("createSettingsIntent", "()Landroid/content/Intent;");
@@ -177,6 +135,14 @@ public Android.Content.Intent CreateSetupIntent()
             return IExecuteWithSignature<Android.Content.Intent>("createSetupIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getServiceInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.ServiceInfo"/></returns>
+        public Android.Content.Pm.ServiceInfo GetServiceInfo()
+        {
+            return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#loadIcon(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -186,6 +152,14 @@ public Android.Graphics.Drawable.Drawable LoadIcon(Android.Content.Context arg0)
             return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("loadIcon", "(Landroid/content/Context;)Landroid/graphics/drawable/Drawable;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getExtras()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#canPauseRecording()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -227,6 +201,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getTunerCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTunerCount()
+        {
+            return IExecuteWithSignature<int>("getTunerCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#loadCustomLabel(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -245,6 +235,22 @@ public Java.Lang.CharSequence LoadLabel(Android.Content.Context arg0)
             return IExecuteWithSignature<Java.Lang.CharSequence>("loadLabel", "(Landroid/content/Context;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#getParentId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetParentId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getParentId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvInputInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TvInputManager.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TvInputManager.cs
index 49745d424..b7ad38c50 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TvInputManager.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TvInputManager.cs
@@ -406,20 +406,6 @@ public partial class TvInputManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputManager.html#getBlockedRatings()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.Tv.TvContentRating> BlockedRatings
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.TvContentRating>>("getBlockedRatings", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputManager.html#getTvInputList()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.Tv.TvInputInfo> TvInputList
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.TvInputInfo>>("getTvInputList", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvInputManager.html#getTvInputInfo(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -455,6 +441,22 @@ public int GetInputState(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getInputState", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputManager.html#getBlockedRatings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Tv.TvContentRating> GetBlockedRatings()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.TvContentRating>>("getBlockedRatings", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvInputManager.html#getTvInputList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Tv.TvInputInfo> GetTvInputList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.TvInputInfo>>("getTvInputList", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvInputManager.html#registerCallback(android.media.tv.TvInputManager.TvInputCallback,android.os.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Media.Tv.TvInputManager.TvInputCallback"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TvInputService.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TvInputService.cs
index d488077d9..c12f94eb2 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TvInputService.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TvInputService.cs
@@ -169,11 +169,12 @@ public HardwareSession(Android.Content.Context arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/tv/TvInputService.HardwareSession.html#getHardwareInputId()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/tv/TvInputService.HardwareSession.html#getHardwareInputId()"/>
             /// </summary>
-            public Java.Lang.String HardwareInputId
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetHardwareInputId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getHardwareInputId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getHardwareInputId", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/tv/TvInputService.HardwareSession.html#onHardwareVideoAvailable()"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TvRecordingInfo.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TvRecordingInfo.cs
index 48dd86509..5644a010b 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TvRecordingInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TvRecordingInfo.cs
@@ -133,110 +133,140 @@ public TvRecordingInfo(Java.Lang.String arg0, long arg1, long arg2, int arg3, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getChannelUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getChannelUri()"/>
         /// </summary>
-        public Android.Net.Uri ChannelUri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetChannelUri()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getChannelUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getChannelUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getContentRatings()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getProgramUri()"/>
         /// </summary>
-        public Java.Util.List<Android.Media.Tv.TvContentRating> ContentRatings
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetProgramUri()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.TvContentRating>>("getContentRatings", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getProgramUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getDescription()"/> <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#setDescription(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRecordingUri()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetRecordingUri()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Net.Uri>("getRecordingUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getEndPaddingMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#describeContents()"/>
         /// </summary>
-        public long EndPaddingMillis
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getEndPaddingMillis", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getName()"/> <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#setName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRepeatDays()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatDays()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getRepeatDays", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getProgramUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getDescription()"/>
         /// </summary>
-        public Android.Net.Uri ProgramUri
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getProgramUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRecordingDurationMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getName()"/>
         /// </summary>
-        public long RecordingDurationMillis
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<long>("getRecordingDurationMillis", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRecordingId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRecordingId()"/>
         /// </summary>
-        public Java.Lang.String RecordingId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRecordingId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRecordingId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRecordingId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRecordingStartTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getContentRatings()"/>
         /// </summary>
-        public long RecordingStartTimeMillis
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.Tv.TvContentRating> GetContentRatings()
         {
-            get { return IExecuteWithSignature<long>("getRecordingStartTimeMillis", "()J"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Media.Tv.TvContentRating>>("getContentRatings", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRecordingUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getEndPaddingMillis()"/>
         /// </summary>
-        public Android.Net.Uri RecordingUri
+        /// <returns><see cref="long"/></returns>
+        public long GetEndPaddingMillis()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getRecordingUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<long>("getEndPaddingMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRepeatDays()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRecordingDurationMillis()"/>
         /// </summary>
-        public int RepeatDays
+        /// <returns><see cref="long"/></returns>
+        public long GetRecordingDurationMillis()
         {
-            get { return IExecuteWithSignature<int>("getRepeatDays", "()I"); }
+            return IExecuteWithSignature<long>("getRecordingDurationMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getScheduledDurationMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getRecordingStartTimeMillis()"/>
         /// </summary>
-        public long ScheduledDurationMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetRecordingStartTimeMillis()
         {
-            get { return IExecuteWithSignature<long>("getScheduledDurationMillis", "()J"); }
+            return IExecuteWithSignature<long>("getRecordingStartTimeMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getScheduledStartTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getScheduledDurationMillis()"/>
         /// </summary>
-        public long ScheduledStartTimeMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetScheduledDurationMillis()
         {
-            get { return IExecuteWithSignature<long>("getScheduledStartTimeMillis", "()J"); }
+            return IExecuteWithSignature<long>("getScheduledDurationMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getStartPaddingMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getScheduledStartTimeMillis()"/>
         /// </summary>
-        public long StartPaddingMillis
+        /// <returns><see cref="long"/></returns>
+        public long GetScheduledStartTimeMillis()
         {
-            get { return IExecuteWithSignature<long>("getStartPaddingMillis", "()J"); }
+            return IExecuteWithSignature<long>("getScheduledStartTimeMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#getStartPaddingMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetStartPaddingMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getStartPaddingMillis", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#setDescription(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDescription(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDescription", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#setName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setName", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvRecordingInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TvTrackInfo.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TvTrackInfo.cs
index 717833039..72d551c3e 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TvTrackInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TvTrackInfo.cs
@@ -70,135 +70,148 @@ public partial class TvTrackInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getAudioChannelCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getExtra()"/>
         /// </summary>
-        public int AudioChannelCount
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtra()
         {
-            get { return IExecuteWithSignature<int>("getAudioChannelCount", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtra", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getAudioSampleRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#isAudioDescription()"/>
         /// </summary>
-        public int AudioSampleRate
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAudioDescription()
         {
-            get { return IExecuteWithSignature<int>("getAudioSampleRate", "()I"); }
+            return IExecuteWithSignature<bool>("isAudioDescription", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#isEncrypted()"/>
         /// </summary>
-        public Java.Lang.CharSequence Description
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEncrypted()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isEncrypted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#isHardOfHearing()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHardOfHearing()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isHardOfHearing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getExtra()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#isSpokenSubtitle()"/>
         /// </summary>
-        public Android.Os.Bundle Extra
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSpokenSubtitle()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtra", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<bool>("isSpokenSubtitle", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoActiveFormatDescription()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="byte"/></returns>
+        public byte GetVideoActiveFormatDescription()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<byte>("getVideoActiveFormatDescription", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getLanguage()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoFrameRate()"/>
         /// </summary>
-        public Java.Lang.String Language
+        /// <returns><see cref="float"/></returns>
+        public float GetVideoFrameRate()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<float>("getVideoFrameRate", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoPixelAspectRatio()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="float"/></returns>
+        public float GetVideoPixelAspectRatio()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<float>("getVideoPixelAspectRatio", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoActiveFormatDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#describeContents()"/>
         /// </summary>
-        public byte VideoActiveFormatDescription
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<byte>("getVideoActiveFormatDescription", "()B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoFrameRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getAudioChannelCount()"/>
         /// </summary>
-        public float VideoFrameRate
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioChannelCount()
         {
-            get { return IExecuteWithSignature<float>("getVideoFrameRate", "()F"); }
+            return IExecuteWithSignature<int>("getAudioChannelCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getAudioSampleRate()"/>
         /// </summary>
-        public int VideoHeight
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSampleRate()
         {
-            get { return IExecuteWithSignature<int>("getVideoHeight", "()I"); }
+            return IExecuteWithSignature<int>("getAudioSampleRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoPixelAspectRatio()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getType()"/>
         /// </summary>
-        public float VideoPixelAspectRatio
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<float>("getVideoPixelAspectRatio", "()F"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoHeight()"/>
         /// </summary>
-        public int VideoWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoHeight()
         {
-            get { return IExecuteWithSignature<int>("getVideoWidth", "()I"); }
+            return IExecuteWithSignature<int>("getVideoHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#isAudioDescription()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getVideoWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAudioDescription()
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoWidth()
         {
-            return IExecuteWithSignature<bool>("isAudioDescription", "()Z");
+            return IExecuteWithSignature<int>("getVideoWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#isEncrypted()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getDescription()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEncrypted()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescription()
         {
-            return IExecuteWithSignature<bool>("isEncrypted", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#isHardOfHearing()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getEncoding()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHardOfHearing()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            return IExecuteWithSignature<bool>("isHardOfHearing", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#isSpokenSubtitle()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSpokenSubtitle()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            return IExecuteWithSignature<bool>("isSpokenSubtitle", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#getLanguage()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLanguage()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvTrackInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/Tv/TvView.cs b/src/net/Netdroid/Generated/Android/Media/Tv/TvView.cs
index 4ad914ba0..448c213f3 100644
--- a/src/net/Netdroid/Generated/Android/Media/Tv/TvView.cs
+++ b/src/net/Netdroid/Generated/Android/Media/Tv/TvView.cs
@@ -73,13 +73,6 @@ public TvView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/tv/TvView.html#getAudioPresentations()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Media.AudioPresentation> AudioPresentations
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Media.AudioPresentation>>("getAudioPresentations", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvView.html#dispatchUnhandledInputEvent(android.view.InputEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.InputEvent"/></param>
@@ -107,6 +100,14 @@ public Java.Lang.String GetSelectedTrack(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getSelectedTrack", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/tv/TvView.html#getAudioPresentations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Media.AudioPresentation> GetAudioPresentations()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Media.AudioPresentation>>("getAudioPresentations", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/tv/TvView.html#getTracks(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -325,7 +326,7 @@ public partial class OnUnhandledInputEventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onUnhandledInputEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.InputEvent>>>(OnUnhandledInputEventEventHandler));
+                AddEventHandler("onUnhandledInputEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.InputEvent>>>(OnUnhandledInputEventEventHandler));
 
             }
 
@@ -333,7 +334,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/media/tv/TvView.OnUnhandledInputEventListener.html#onUnhandledInputEvent(android.view.InputEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnUnhandledInputEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.InputEvent, bool> OnOnUnhandledInputEvent { get; set; } = null;
+            public global::System.Func<Android.View.InputEvent, bool> OnOnUnhandledInputEvent { get; set; } = null;
 
             void OnUnhandledInputEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.InputEvent>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Media/VolumeProvider.cs b/src/net/Netdroid/Generated/Android/Media/VolumeProvider.cs
index f0ba1df52..aae9c3c4e 100644
--- a/src/net/Netdroid/Generated/Android/Media/VolumeProvider.cs
+++ b/src/net/Netdroid/Generated/Android/Media/VolumeProvider.cs
@@ -85,32 +85,44 @@ public VolumeProvider(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#getCurrentVolume()"/> <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#setCurrentVolume(int)"/>
+        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#getCurrentVolume()"/>
         /// </summary>
-        public int CurrentVolume
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentVolume()
         {
-            get { return IExecuteWithSignature<int>("getCurrentVolume", "()I"); } set { IExecuteWithSignature("setCurrentVolume", "(I)V", value); }
+            return IExecuteWithSignature<int>("getCurrentVolume", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#getMaxVolume()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#getMaxVolume()"/>
         /// </summary>
-        public int MaxVolume
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxVolume()
         {
-            get { return IExecuteWithSignature<int>("getMaxVolume", "()I"); }
+            return IExecuteWithSignature<int>("getMaxVolume", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#getVolumeControl()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#getVolumeControl()"/>
         /// </summary>
-        public int VolumeControl
+        /// <returns><see cref="int"/></returns>
+        public int GetVolumeControl()
         {
-            get { return IExecuteWithSignature<int>("getVolumeControl", "()I"); }
+            return IExecuteWithSignature<int>("getVolumeControl", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#getVolumeControlId()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#getVolumeControlId()"/>
         /// </summary>
-        public Java.Lang.String VolumeControlId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVolumeControlId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVolumeControlId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getVolumeControlId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#setCurrentVolume(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCurrentVolume(int arg0)
+        {
+            IExecuteWithSignature("setCurrentVolume", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/VolumeProvider.html#onAdjustVolume(int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Media/VolumeShaper.cs b/src/net/Netdroid/Generated/Android/Media/VolumeShaper.cs
index 239edbbe8..48d00043d 100644
--- a/src/net/Netdroid/Generated/Android/Media/VolumeShaper.cs
+++ b/src/net/Netdroid/Generated/Android/Media/VolumeShaper.cs
@@ -46,11 +46,12 @@ public partial class VolumeShaper
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.html#getVolume()"/> 
+        /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.html#getVolume()"/>
         /// </summary>
-        public float Volume
+        /// <returns><see cref="float"/></returns>
+        public float GetVolume()
         {
-            get { return IExecuteWithSignature<float>("getVolume", "()F"); }
+            return IExecuteWithSignature<float>("getVolume", "()F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.html#apply(android.media.VolumeShaper.Operation)"/>
@@ -152,51 +153,56 @@ public partial class Configuration
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getMaximumCurvePoints()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getMaximumCurvePoints()"/>
             /// </summary>
-            public static int MaximumCurvePoints
+            /// <returns><see cref="int"/></returns>
+            public static int GetMaximumCurvePoints()
             {
-                get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumCurvePoints", "()I"); }
+                return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumCurvePoints", "()I");
             }
 
             #endregion
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getDuration()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getTimes()"/>
             /// </summary>
-            public long Duration
+            /// <returns><see cref="float"/></returns>
+            public float[] GetTimes()
             {
-                get { return IExecuteWithSignature<long>("getDuration", "()J"); }
+                return IExecuteWithSignatureArray<float>("getTimes", "()[F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getInterpolatorType()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getVolumes()"/>
             /// </summary>
-            public int InterpolatorType
+            /// <returns><see cref="float"/></returns>
+            public float[] GetVolumes()
             {
-                get { return IExecuteWithSignature<int>("getInterpolatorType", "()I"); }
+                return IExecuteWithSignatureArray<float>("getVolumes", "()[F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getTimes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#describeContents()"/>
             /// </summary>
-            public float[] Times
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignatureArray<float>("getTimes", "()[F"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getVolumes()"/> 
+            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getInterpolatorType()"/>
             /// </summary>
-            public float[] Volumes
+            /// <returns><see cref="int"/></returns>
+            public int GetInterpolatorType()
             {
-                get { return IExecuteWithSignatureArray<float>("getVolumes", "()[F"); }
+                return IExecuteWithSignature<int>("getInterpolatorType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#getDuration()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="long"/></returns>
+            public long GetDuration()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<long>("getDuration", "()J");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/media/VolumeShaper.Configuration.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Mtp/MtpDevice.cs b/src/net/Netdroid/Generated/Android/Mtp/MtpDevice.cs
index 8dffa72e0..2e41e1949 100644
--- a/src/net/Netdroid/Generated/Android/Mtp/MtpDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Mtp/MtpDevice.cs
@@ -54,32 +54,12 @@ public MtpDevice(Android.Hardware.Usb.UsbDevice arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getDeviceId()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getDeviceInfo()"/>
         /// </summary>
-        public int DeviceId
+        /// <returns><see cref="Android.Mtp.MtpDeviceInfo"/></returns>
+        public Android.Mtp.MtpDeviceInfo GetDeviceInfo()
         {
-            get { return IExecuteWithSignature<int>("getDeviceId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getDeviceInfo()"/> 
-        /// </summary>
-        public Android.Mtp.MtpDeviceInfo DeviceInfo
-        {
-            get { return IExecuteWithSignature<Android.Mtp.MtpDeviceInfo>("getDeviceInfo", "()Landroid/mtp/MtpDeviceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getDeviceName()"/> 
-        /// </summary>
-        public Java.Lang.String DeviceName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getStorageIds()"/> 
-        /// </summary>
-        public int[] StorageIds
-        {
-            get { return IExecuteWithSignatureArray<int>("getStorageIds", "()[I"); }
+            return IExecuteWithSignature<Android.Mtp.MtpDeviceInfo>("getDeviceInfo", "()Landroid/mtp/MtpDeviceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#readEvent(android.os.CancellationSignal)"/>
@@ -187,6 +167,14 @@ public byte[] GetThumbnail(int arg0)
             return IExecuteWithSignatureArray<byte>("getThumbnail", "(I)[B", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getDeviceId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceId()
+        {
+            return IExecuteWithSignature<int>("getDeviceId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getObjectHandles(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -198,6 +186,22 @@ public int[] GetObjectHandles(int arg0, int arg1, int arg2)
             return IExecuteArray<int>("getObjectHandles", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getStorageIds()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetStorageIds()
+        {
+            return IExecuteWithSignatureArray<int>("getStorageIds", "()[I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getDeviceName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeviceName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/mtp/MtpDevice.html#getParent(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Mtp/MtpDeviceInfo.cs b/src/net/Netdroid/Generated/Android/Mtp/MtpDeviceInfo.cs
index 3506e287f..c13b01721 100644
--- a/src/net/Netdroid/Generated/Android/Mtp/MtpDeviceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Mtp/MtpDeviceInfo.cs
@@ -46,64 +46,70 @@ public partial class MtpDeviceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getEventsSupported()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#isEventSupported(int)"/>
         /// </summary>
-        public int[] EventsSupported
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEventSupported(int arg0)
         {
-            get { return IExecuteWithSignatureArray<int>("getEventsSupported", "()[I"); }
+            return IExecuteWithSignature<bool>("isEventSupported", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getManufacturer()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#isOperationSupported(int)"/>
         /// </summary>
-        public Java.Lang.String Manufacturer
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOperationSupported(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getManufacturer", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isOperationSupported", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getModel()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getEventsSupported()"/>
         /// </summary>
-        public Java.Lang.String Model
+        /// <returns><see cref="int"/></returns>
+        public int[] GetEventsSupported()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getModel", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<int>("getEventsSupported", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getOperationsSupported()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getOperationsSupported()"/>
         /// </summary>
-        public int[] OperationsSupported
+        /// <returns><see cref="int"/></returns>
+        public int[] GetOperationsSupported()
         {
-            get { return IExecuteWithSignatureArray<int>("getOperationsSupported", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getOperationsSupported", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getSerialNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getManufacturer()"/>
         /// </summary>
-        public Java.Lang.String SerialNumber
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetManufacturer()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSerialNumber", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getManufacturer", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getModel()"/>
         /// </summary>
-        public Java.Lang.String Version
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetModel()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getModel", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#isEventSupported(int)"/>
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getSerialNumber()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEventSupported(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSerialNumber()
         {
-            return IExecuteWithSignature<bool>("isEventSupported", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSerialNumber", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#isOperationSupported(int)"/>
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpDeviceInfo.html#getVersion()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOperationSupported(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVersion()
         {
-            return IExecuteWithSignature<bool>("isOperationSupported", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getVersion", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Mtp/MtpEvent.cs b/src/net/Netdroid/Generated/Android/Mtp/MtpEvent.cs
index 259adea77..e127162bd 100644
--- a/src/net/Netdroid/Generated/Android/Mtp/MtpEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Mtp/MtpEvent.cs
@@ -154,74 +154,84 @@ public partial class MtpEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getDevicePropCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getDevicePropCode()"/>
         /// </summary>
-        public int DevicePropCode
+        /// <returns><see cref="int"/></returns>
+        public int GetDevicePropCode()
         {
-            get { return IExecuteWithSignature<int>("getDevicePropCode", "()I"); }
+            return IExecuteWithSignature<int>("getDevicePropCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getEventCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getEventCode()"/>
         /// </summary>
-        public int EventCode
+        /// <returns><see cref="int"/></returns>
+        public int GetEventCode()
         {
-            get { return IExecuteWithSignature<int>("getEventCode", "()I"); }
+            return IExecuteWithSignature<int>("getEventCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getObjectFormatCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getObjectFormatCode()"/>
         /// </summary>
-        public int ObjectFormatCode
+        /// <returns><see cref="int"/></returns>
+        public int GetObjectFormatCode()
         {
-            get { return IExecuteWithSignature<int>("getObjectFormatCode", "()I"); }
+            return IExecuteWithSignature<int>("getObjectFormatCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getObjectHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getObjectHandle()"/>
         /// </summary>
-        public int ObjectHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetObjectHandle()
         {
-            get { return IExecuteWithSignature<int>("getObjectHandle", "()I"); }
+            return IExecuteWithSignature<int>("getObjectHandle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getObjectPropCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getObjectPropCode()"/>
         /// </summary>
-        public int ObjectPropCode
+        /// <returns><see cref="int"/></returns>
+        public int GetObjectPropCode()
         {
-            get { return IExecuteWithSignature<int>("getObjectPropCode", "()I"); }
+            return IExecuteWithSignature<int>("getObjectPropCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getParameter1()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getParameter1()"/>
         /// </summary>
-        public int Parameter1
+        /// <returns><see cref="int"/></returns>
+        public int GetParameter1()
         {
-            get { return IExecuteWithSignature<int>("getParameter1", "()I"); }
+            return IExecuteWithSignature<int>("getParameter1", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getParameter2()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getParameter2()"/>
         /// </summary>
-        public int Parameter2
+        /// <returns><see cref="int"/></returns>
+        public int GetParameter2()
         {
-            get { return IExecuteWithSignature<int>("getParameter2", "()I"); }
+            return IExecuteWithSignature<int>("getParameter2", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getParameter3()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getParameter3()"/>
         /// </summary>
-        public int Parameter3
+        /// <returns><see cref="int"/></returns>
+        public int GetParameter3()
         {
-            get { return IExecuteWithSignature<int>("getParameter3", "()I"); }
+            return IExecuteWithSignature<int>("getParameter3", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getStorageId()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getStorageId()"/>
         /// </summary>
-        public int StorageId
+        /// <returns><see cref="int"/></returns>
+        public int GetStorageId()
         {
-            get { return IExecuteWithSignature<int>("getStorageId", "()I"); }
+            return IExecuteWithSignature<int>("getStorageId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getTransactionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpEvent.html#getTransactionId()"/>
         /// </summary>
-        public int TransactionId
+        /// <returns><see cref="int"/></returns>
+        public int GetTransactionId()
         {
-            get { return IExecuteWithSignature<int>("getTransactionId", "()I"); }
+            return IExecuteWithSignature<int>("getTransactionId", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Mtp/MtpObjectInfo.cs b/src/net/Netdroid/Generated/Android/Mtp/MtpObjectInfo.cs
index a09c94e4d..8a7fd57a6 100644
--- a/src/net/Netdroid/Generated/Android/Mtp/MtpObjectInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Mtp/MtpObjectInfo.cs
@@ -46,200 +46,228 @@ public partial class MtpObjectInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getAssociationDesc()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getAssociationDesc()"/>
         /// </summary>
-        public int AssociationDesc
+        /// <returns><see cref="int"/></returns>
+        public int GetAssociationDesc()
         {
-            get { return IExecuteWithSignature<int>("getAssociationDesc", "()I"); }
+            return IExecuteWithSignature<int>("getAssociationDesc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getAssociationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getAssociationType()"/>
         /// </summary>
-        public int AssociationType
+        /// <returns><see cref="int"/></returns>
+        public int GetAssociationType()
         {
-            get { return IExecuteWithSignature<int>("getAssociationType", "()I"); }
+            return IExecuteWithSignature<int>("getAssociationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getCompressedSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getCompressedSize()"/>
         /// </summary>
-        public int CompressedSize
+        /// <returns><see cref="int"/></returns>
+        public int GetCompressedSize()
         {
-            get { return IExecuteWithSignature<int>("getCompressedSize", "()I"); }
+            return IExecuteWithSignature<int>("getCompressedSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getCompressedSizeLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getFormat()"/>
         /// </summary>
-        public long CompressedSizeLong
+        /// <returns><see cref="int"/></returns>
+        public int GetFormat()
         {
-            get { return IExecuteWithSignature<long>("getCompressedSizeLong", "()J"); }
+            return IExecuteWithSignature<int>("getFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getDateCreated()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixDepth()"/>
         /// </summary>
-        public long DateCreated
+        /// <returns><see cref="int"/></returns>
+        public int GetImagePixDepth()
         {
-            get { return IExecuteWithSignature<long>("getDateCreated", "()J"); }
+            return IExecuteWithSignature<int>("getImagePixDepth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getDateModified()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixHeight()"/>
         /// </summary>
-        public long DateModified
+        /// <returns><see cref="int"/></returns>
+        public int GetImagePixHeight()
         {
-            get { return IExecuteWithSignature<long>("getDateModified", "()J"); }
+            return IExecuteWithSignature<int>("getImagePixHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixWidth()"/>
         /// </summary>
-        public int Format
+        /// <returns><see cref="int"/></returns>
+        public int GetImagePixWidth()
         {
-            get { return IExecuteWithSignature<int>("getFormat", "()I"); }
+            return IExecuteWithSignature<int>("getImagePixWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixDepth()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getObjectHandle()"/>
         /// </summary>
-        public int ImagePixDepth
+        /// <returns><see cref="int"/></returns>
+        public int GetObjectHandle()
         {
-            get { return IExecuteWithSignature<int>("getImagePixDepth", "()I"); }
+            return IExecuteWithSignature<int>("getObjectHandle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixDepthLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getParent()"/>
         /// </summary>
-        public long ImagePixDepthLong
+        /// <returns><see cref="int"/></returns>
+        public int GetParent()
         {
-            get { return IExecuteWithSignature<long>("getImagePixDepthLong", "()J"); }
+            return IExecuteWithSignature<int>("getParent", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getProtectionStatus()"/>
         /// </summary>
-        public int ImagePixHeight
+        /// <returns><see cref="int"/></returns>
+        public int GetProtectionStatus()
         {
-            get { return IExecuteWithSignature<int>("getImagePixHeight", "()I"); }
+            return IExecuteWithSignature<int>("getProtectionStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixHeightLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getSequenceNumber()"/>
         /// </summary>
-        public long ImagePixHeightLong
+        /// <returns><see cref="int"/></returns>
+        public int GetSequenceNumber()
         {
-            get { return IExecuteWithSignature<long>("getImagePixHeightLong", "()J"); }
+            return IExecuteWithSignature<int>("getSequenceNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getStorageId()"/>
         /// </summary>
-        public int ImagePixWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetStorageId()
         {
-            get { return IExecuteWithSignature<int>("getImagePixWidth", "()I"); }
+            return IExecuteWithSignature<int>("getStorageId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixWidthLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbCompressedSize()"/>
         /// </summary>
-        public long ImagePixWidthLong
+        /// <returns><see cref="int"/></returns>
+        public int GetThumbCompressedSize()
         {
-            get { return IExecuteWithSignature<long>("getImagePixWidthLong", "()J"); }
+            return IExecuteWithSignature<int>("getThumbCompressedSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getKeywords()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbFormat()"/>
         /// </summary>
-        public Java.Lang.String Keywords
+        /// <returns><see cref="int"/></returns>
+        public int GetThumbFormat()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKeywords", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getThumbFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbPixHeight()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetThumbPixHeight()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getThumbPixHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getObjectHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbPixWidth()"/>
         /// </summary>
-        public int ObjectHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetThumbPixWidth()
         {
-            get { return IExecuteWithSignature<int>("getObjectHandle", "()I"); }
+            return IExecuteWithSignature<int>("getThumbPixWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getKeywords()"/>
         /// </summary>
-        public int Parent
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKeywords()
         {
-            get { return IExecuteWithSignature<int>("getParent", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getKeywords", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getProtectionStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getName()"/>
         /// </summary>
-        public int ProtectionStatus
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<int>("getProtectionStatus", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getSequenceNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getCompressedSizeLong()"/>
         /// </summary>
-        public int SequenceNumber
+        /// <returns><see cref="long"/></returns>
+        public long GetCompressedSizeLong()
         {
-            get { return IExecuteWithSignature<int>("getSequenceNumber", "()I"); }
+            return IExecuteWithSignature<long>("getCompressedSizeLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getSequenceNumberLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getDateCreated()"/>
         /// </summary>
-        public long SequenceNumberLong
+        /// <returns><see cref="long"/></returns>
+        public long GetDateCreated()
         {
-            get { return IExecuteWithSignature<long>("getSequenceNumberLong", "()J"); }
+            return IExecuteWithSignature<long>("getDateCreated", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getStorageId()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getDateModified()"/>
         /// </summary>
-        public int StorageId
+        /// <returns><see cref="long"/></returns>
+        public long GetDateModified()
         {
-            get { return IExecuteWithSignature<int>("getStorageId", "()I"); }
+            return IExecuteWithSignature<long>("getDateModified", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbCompressedSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixDepthLong()"/>
         /// </summary>
-        public int ThumbCompressedSize
+        /// <returns><see cref="long"/></returns>
+        public long GetImagePixDepthLong()
         {
-            get { return IExecuteWithSignature<int>("getThumbCompressedSize", "()I"); }
+            return IExecuteWithSignature<long>("getImagePixDepthLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbCompressedSizeLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixHeightLong()"/>
         /// </summary>
-        public long ThumbCompressedSizeLong
+        /// <returns><see cref="long"/></returns>
+        public long GetImagePixHeightLong()
         {
-            get { return IExecuteWithSignature<long>("getThumbCompressedSizeLong", "()J"); }
+            return IExecuteWithSignature<long>("getImagePixHeightLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getImagePixWidthLong()"/>
         /// </summary>
-        public int ThumbFormat
+        /// <returns><see cref="long"/></returns>
+        public long GetImagePixWidthLong()
         {
-            get { return IExecuteWithSignature<int>("getThumbFormat", "()I"); }
+            return IExecuteWithSignature<long>("getImagePixWidthLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbPixHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getSequenceNumberLong()"/>
         /// </summary>
-        public int ThumbPixHeight
+        /// <returns><see cref="long"/></returns>
+        public long GetSequenceNumberLong()
         {
-            get { return IExecuteWithSignature<int>("getThumbPixHeight", "()I"); }
+            return IExecuteWithSignature<long>("getSequenceNumberLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbPixHeightLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbCompressedSizeLong()"/>
         /// </summary>
-        public long ThumbPixHeightLong
+        /// <returns><see cref="long"/></returns>
+        public long GetThumbCompressedSizeLong()
         {
-            get { return IExecuteWithSignature<long>("getThumbPixHeightLong", "()J"); }
+            return IExecuteWithSignature<long>("getThumbCompressedSizeLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbPixWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbPixHeightLong()"/>
         /// </summary>
-        public int ThumbPixWidth
+        /// <returns><see cref="long"/></returns>
+        public long GetThumbPixHeightLong()
         {
-            get { return IExecuteWithSignature<int>("getThumbPixWidth", "()I"); }
+            return IExecuteWithSignature<long>("getThumbPixHeightLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbPixWidthLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpObjectInfo.html#getThumbPixWidthLong()"/>
         /// </summary>
-        public long ThumbPixWidthLong
+        /// <returns><see cref="long"/></returns>
+        public long GetThumbPixWidthLong()
         {
-            get { return IExecuteWithSignature<long>("getThumbPixWidthLong", "()J"); }
+            return IExecuteWithSignature<long>("getThumbPixWidthLong", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Mtp/MtpStorageInfo.cs b/src/net/Netdroid/Generated/Android/Mtp/MtpStorageInfo.cs
index 034fecbe7..6b2d7fad2 100644
--- a/src/net/Netdroid/Generated/Android/Mtp/MtpStorageInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Mtp/MtpStorageInfo.cs
@@ -46,39 +46,44 @@ public partial class MtpStorageInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getStorageId()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="int"/></returns>
+        public int GetStorageId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getStorageId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getFreeSpace()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getDescription()"/>
         /// </summary>
-        public long FreeSpace
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<long>("getFreeSpace", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getMaxCapacity()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getVolumeIdentifier()"/>
         /// </summary>
-        public long MaxCapacity
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVolumeIdentifier()
         {
-            get { return IExecuteWithSignature<long>("getMaxCapacity", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getVolumeIdentifier", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getStorageId()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getFreeSpace()"/>
         /// </summary>
-        public int StorageId
+        /// <returns><see cref="long"/></returns>
+        public long GetFreeSpace()
         {
-            get { return IExecuteWithSignature<int>("getStorageId", "()I"); }
+            return IExecuteWithSignature<long>("getFreeSpace", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getVolumeIdentifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/mtp/MtpStorageInfo.html#getMaxCapacity()"/>
         /// </summary>
-        public Java.Lang.String VolumeIdentifier
+        /// <returns><see cref="long"/></returns>
+        public long GetMaxCapacity()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVolumeIdentifier", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<long>("getMaxCapacity", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/AllPackageClasses.cs
index c6cff5961..342a54f91 100644
--- a/src/net/Netdroid/Generated/Android/Net/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/AllPackageClasses.cs
@@ -120,12 +120,12 @@ public partial class ConnectivityDiagnosticsCallback : MASES.JCOBridge.C2JBridge
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConnectivityDiagnosticsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConnectivityDiagnosticsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConnectivityDiagnosticsCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConnectivityDiagnosticsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConnectivityDiagnosticsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConnectivityDiagnosticsCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -343,10 +343,13 @@ public partial class OnNetworkActiveListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnNetworkActiveListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.ConnectivityManager_OnNetworkActiveListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.OnNetworkActiveListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -368,10 +371,13 @@ public partial class OnNetworkActiveListenerDirect : OnNetworkActiveListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.ConnectivityManager$OnNetworkActiveListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.ConnectivityManager$OnNetworkActiveListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -533,12 +539,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -580,12 +586,12 @@ public partial class Callback<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callb
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1687,7 +1693,7 @@ public NetworkCapabilities(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class NetworkInfo : Android.Os.Parcelable
     {
         const string _bridgeClassName = "android.net.NetworkInfo";
@@ -1728,7 +1734,7 @@ public NetworkInfo(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class DetailedState : Java.Lang.Enum<Android.Net.NetworkInfo.DetailedState>
         {
             const string _bridgeClassName = "android.net.NetworkInfo$DetailedState";
@@ -1773,7 +1779,7 @@ public DetailedState(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.State.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class State : Java.Lang.Enum<Android.Net.NetworkInfo.State>
         {
             const string _bridgeClassName = "android.net.NetworkInfo$State";
@@ -1916,12 +1922,12 @@ public partial class NetworkSpecifier : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NetworkSpecifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NetworkSpecifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NetworkSpecifier() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NetworkSpecifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NetworkSpecifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NetworkSpecifier(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1979,12 +1985,12 @@ public partial class PlatformVpnProfile : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PlatformVpnProfile class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PlatformVpnProfile class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PlatformVpnProfile() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PlatformVpnProfile class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PlatformVpnProfile class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PlatformVpnProfile(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2157,12 +2163,12 @@ public partial class SocketKeepalive : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketKeepalive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketKeepalive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketKeepalive() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketKeepalive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketKeepalive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketKeepalive(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2241,7 +2247,7 @@ public Callback(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SSLCertificateSocketFactory : Javax.Net.Ssl.SSLSocketFactory
     {
         const string _bridgeClassName = "android.net.SSLCertificateSocketFactory";
@@ -2556,12 +2562,12 @@ public partial class TransportInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Tra
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TransportInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransportInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransportInfo() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TransportInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransportInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransportInfo(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2602,12 +2608,12 @@ public partial class Uri : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Uri>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Uri class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Uri class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Uri() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Uri class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Uri class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Uri(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2820,12 +2826,12 @@ public partial class ValueSanitizer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Va
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ValueSanitizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ValueSanitizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ValueSanitizer() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ValueSanitizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ValueSanitizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ValueSanitizer(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Net/ConnectivityDiagnosticsManager.cs b/src/net/Netdroid/Generated/Android/Net/ConnectivityDiagnosticsManager.cs
index 35a8712fa..8f075a2cc 100644
--- a/src/net/Netdroid/Generated/Android/Net/ConnectivityDiagnosticsManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/ConnectivityDiagnosticsManager.cs
@@ -234,39 +234,36 @@ public ConnectivityReport(Android.Net.Network arg0, long arg1, Android.Net.LinkP
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getAdditionalInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getLinkProperties()"/>
             /// </summary>
-            public Android.Os.PersistableBundle AdditionalInfo
+            /// <returns><see cref="Android.Net.LinkProperties"/></returns>
+            public Android.Net.LinkProperties GetLinkProperties()
             {
-                get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getAdditionalInfo", "()Landroid/os/PersistableBundle;"); }
+                return IExecuteWithSignature<Android.Net.LinkProperties>("getLinkProperties", "()Landroid/net/LinkProperties;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getLinkProperties()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getNetwork()"/>
             /// </summary>
-            public Android.Net.LinkProperties LinkProperties
+            /// <returns><see cref="Android.Net.Network"/></returns>
+            public Android.Net.Network GetNetwork()
             {
-                get { return IExecuteWithSignature<Android.Net.LinkProperties>("getLinkProperties", "()Landroid/net/LinkProperties;"); }
+                return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getNetwork()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getNetworkCapabilities()"/>
             /// </summary>
-            public Android.Net.Network Network
+            /// <returns><see cref="Android.Net.NetworkCapabilities"/></returns>
+            public Android.Net.NetworkCapabilities GetNetworkCapabilities()
             {
-                get { return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;"); }
+                return IExecuteWithSignature<Android.Net.NetworkCapabilities>("getNetworkCapabilities", "()Landroid/net/NetworkCapabilities;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getNetworkCapabilities()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getAdditionalInfo()"/>
             /// </summary>
-            public Android.Net.NetworkCapabilities NetworkCapabilities
+            /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+            public Android.Os.PersistableBundle GetAdditionalInfo()
             {
-                get { return IExecuteWithSignature<Android.Net.NetworkCapabilities>("getNetworkCapabilities", "()Landroid/net/NetworkCapabilities;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getReportTimestamp()"/> 
-            /// </summary>
-            public long ReportTimestamp
-            {
-                get { return IExecuteWithSignature<long>("getReportTimestamp", "()J"); }
+                return IExecuteWithSignature<Android.Os.PersistableBundle>("getAdditionalInfo", "()Landroid/os/PersistableBundle;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#describeContents()"/>
@@ -277,6 +274,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#getReportTimestamp()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetReportTimestamp()
+            {
+                return IExecuteWithSignature<long>("getReportTimestamp", "()J");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.ConnectivityReport.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -366,54 +371,60 @@ public DataStallReport(Android.Net.Network arg0, long arg1, int arg2, Android.Ne
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getDetectionMethod()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getLinkProperties()"/>
             /// </summary>
-            public int DetectionMethod
+            /// <returns><see cref="Android.Net.LinkProperties"/></returns>
+            public Android.Net.LinkProperties GetLinkProperties()
             {
-                get { return IExecuteWithSignature<int>("getDetectionMethod", "()I"); }
+                return IExecuteWithSignature<Android.Net.LinkProperties>("getLinkProperties", "()Landroid/net/LinkProperties;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getLinkProperties()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getNetwork()"/>
             /// </summary>
-            public Android.Net.LinkProperties LinkProperties
+            /// <returns><see cref="Android.Net.Network"/></returns>
+            public Android.Net.Network GetNetwork()
             {
-                get { return IExecuteWithSignature<Android.Net.LinkProperties>("getLinkProperties", "()Landroid/net/LinkProperties;"); }
+                return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getNetwork()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getNetworkCapabilities()"/>
             /// </summary>
-            public Android.Net.Network Network
+            /// <returns><see cref="Android.Net.NetworkCapabilities"/></returns>
+            public Android.Net.NetworkCapabilities GetNetworkCapabilities()
             {
-                get { return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;"); }
+                return IExecuteWithSignature<Android.Net.NetworkCapabilities>("getNetworkCapabilities", "()Landroid/net/NetworkCapabilities;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getNetworkCapabilities()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getStallDetails()"/>
             /// </summary>
-            public Android.Net.NetworkCapabilities NetworkCapabilities
+            /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+            public Android.Os.PersistableBundle GetStallDetails()
             {
-                get { return IExecuteWithSignature<Android.Net.NetworkCapabilities>("getNetworkCapabilities", "()Landroid/net/NetworkCapabilities;"); }
+                return IExecuteWithSignature<Android.Os.PersistableBundle>("getStallDetails", "()Landroid/os/PersistableBundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getReportTimestamp()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#describeContents()"/>
             /// </summary>
-            public long ReportTimestamp
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<long>("getReportTimestamp", "()J"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getStallDetails()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getDetectionMethod()"/>
             /// </summary>
-            public Android.Os.PersistableBundle StallDetails
+            /// <returns><see cref="int"/></returns>
+            public int GetDetectionMethod()
             {
-                get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getStallDetails", "()Landroid/os/PersistableBundle;"); }
+                return IExecuteWithSignature<int>("getDetectionMethod", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#getReportTimestamp()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="long"/></returns>
+            public long GetReportTimestamp()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<long>("getReportTimestamp", "()J");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/ConnectivityDiagnosticsManager.DataStallReport.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/ConnectivityManager.cs b/src/net/Netdroid/Generated/Android/Net/ConnectivityManager.cs
index 92d05f239..c534ebf90 100644
--- a/src/net/Netdroid/Generated/Android/Net/ConnectivityManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/ConnectivityManager.cs
@@ -40,7 +40,7 @@ public partial class ConnectivityManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#DEFAULT_NETWORK_PREFERENCE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DEFAULT_NETWORK_PREFERENCE { get { if (!_DEFAULT_NETWORK_PREFERENCEReady) { _DEFAULT_NETWORK_PREFERENCEContent = SGetField<int>(LocalBridgeClazz, "DEFAULT_NETWORK_PREFERENCE"); _DEFAULT_NETWORK_PREFERENCEReady = true; } return _DEFAULT_NETWORK_PREFERENCEContent; } }
         private static int _DEFAULT_NETWORK_PREFERENCEContent = default;
         private static bool _DEFAULT_NETWORK_PREFERENCEReady = false; // this is used because in case of generics 
@@ -83,84 +83,84 @@ public partial class ConnectivityManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_BLUETOOTH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_BLUETOOTH { get { if (!_TYPE_BLUETOOTHReady) { _TYPE_BLUETOOTHContent = SGetField<int>(LocalBridgeClazz, "TYPE_BLUETOOTH"); _TYPE_BLUETOOTHReady = true; } return _TYPE_BLUETOOTHContent; } }
         private static int _TYPE_BLUETOOTHContent = default;
         private static bool _TYPE_BLUETOOTHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_DUMMY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_DUMMY { get { if (!_TYPE_DUMMYReady) { _TYPE_DUMMYContent = SGetField<int>(LocalBridgeClazz, "TYPE_DUMMY"); _TYPE_DUMMYReady = true; } return _TYPE_DUMMYContent; } }
         private static int _TYPE_DUMMYContent = default;
         private static bool _TYPE_DUMMYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_ETHERNET"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_ETHERNET { get { if (!_TYPE_ETHERNETReady) { _TYPE_ETHERNETContent = SGetField<int>(LocalBridgeClazz, "TYPE_ETHERNET"); _TYPE_ETHERNETReady = true; } return _TYPE_ETHERNETContent; } }
         private static int _TYPE_ETHERNETContent = default;
         private static bool _TYPE_ETHERNETReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_MOBILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_MOBILE { get { if (!_TYPE_MOBILEReady) { _TYPE_MOBILEContent = SGetField<int>(LocalBridgeClazz, "TYPE_MOBILE"); _TYPE_MOBILEReady = true; } return _TYPE_MOBILEContent; } }
         private static int _TYPE_MOBILEContent = default;
         private static bool _TYPE_MOBILEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_MOBILE_DUN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_MOBILE_DUN { get { if (!_TYPE_MOBILE_DUNReady) { _TYPE_MOBILE_DUNContent = SGetField<int>(LocalBridgeClazz, "TYPE_MOBILE_DUN"); _TYPE_MOBILE_DUNReady = true; } return _TYPE_MOBILE_DUNContent; } }
         private static int _TYPE_MOBILE_DUNContent = default;
         private static bool _TYPE_MOBILE_DUNReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_MOBILE_HIPRI"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_MOBILE_HIPRI { get { if (!_TYPE_MOBILE_HIPRIReady) { _TYPE_MOBILE_HIPRIContent = SGetField<int>(LocalBridgeClazz, "TYPE_MOBILE_HIPRI"); _TYPE_MOBILE_HIPRIReady = true; } return _TYPE_MOBILE_HIPRIContent; } }
         private static int _TYPE_MOBILE_HIPRIContent = default;
         private static bool _TYPE_MOBILE_HIPRIReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_MOBILE_MMS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_MOBILE_MMS { get { if (!_TYPE_MOBILE_MMSReady) { _TYPE_MOBILE_MMSContent = SGetField<int>(LocalBridgeClazz, "TYPE_MOBILE_MMS"); _TYPE_MOBILE_MMSReady = true; } return _TYPE_MOBILE_MMSContent; } }
         private static int _TYPE_MOBILE_MMSContent = default;
         private static bool _TYPE_MOBILE_MMSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_MOBILE_SUPL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_MOBILE_SUPL { get { if (!_TYPE_MOBILE_SUPLReady) { _TYPE_MOBILE_SUPLContent = SGetField<int>(LocalBridgeClazz, "TYPE_MOBILE_SUPL"); _TYPE_MOBILE_SUPLReady = true; } return _TYPE_MOBILE_SUPLContent; } }
         private static int _TYPE_MOBILE_SUPLContent = default;
         private static bool _TYPE_MOBILE_SUPLReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_VPN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_VPN { get { if (!_TYPE_VPNReady) { _TYPE_VPNContent = SGetField<int>(LocalBridgeClazz, "TYPE_VPN"); _TYPE_VPNReady = true; } return _TYPE_VPNContent; } }
         private static int _TYPE_VPNContent = default;
         private static bool _TYPE_VPNReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_WIFI"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_WIFI { get { if (!_TYPE_WIFIReady) { _TYPE_WIFIContent = SGetField<int>(LocalBridgeClazz, "TYPE_WIFI"); _TYPE_WIFIReady = true; } return _TYPE_WIFIContent; } }
         private static int _TYPE_WIFIContent = default;
         private static bool _TYPE_WIFIReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#TYPE_WIMAX"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TYPE_WIMAX { get { if (!_TYPE_WIMAXReady) { _TYPE_WIMAXContent = SGetField<int>(LocalBridgeClazz, "TYPE_WIMAX"); _TYPE_WIMAXReady = true; } return _TYPE_WIMAXContent; } }
         private static int _TYPE_WIMAXContent = default;
         private static bool _TYPE_WIMAXReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#ACTION_BACKGROUND_DATA_SETTING_CHANGED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED { get { if (!_ACTION_BACKGROUND_DATA_SETTING_CHANGEDReady) { _ACTION_BACKGROUND_DATA_SETTING_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_BACKGROUND_DATA_SETTING_CHANGED"); _ACTION_BACKGROUND_DATA_SETTING_CHANGEDReady = true; } return _ACTION_BACKGROUND_DATA_SETTING_CHANGEDContent; } }
         private static Java.Lang.String _ACTION_BACKGROUND_DATA_SETTING_CHANGEDContent = default;
         private static bool _ACTION_BACKGROUND_DATA_SETTING_CHANGEDReady = false; // this is used because in case of generics 
@@ -179,7 +179,7 @@ public partial class ConnectivityManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#CONNECTIVITY_ACTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String CONNECTIVITY_ACTION { get { if (!_CONNECTIVITY_ACTIONReady) { _CONNECTIVITY_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONNECTIVITY_ACTION"); _CONNECTIVITY_ACTIONReady = true; } return _CONNECTIVITY_ACTIONContent; } }
         private static Java.Lang.String _CONNECTIVITY_ACTIONContent = default;
         private static bool _CONNECTIVITY_ACTIONReady = false; // this is used because in case of generics 
@@ -198,14 +198,14 @@ public partial class ConnectivityManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#EXTRA_EXTRA_INFO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_EXTRA_INFO { get { if (!_EXTRA_EXTRA_INFOReady) { _EXTRA_EXTRA_INFOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_EXTRA_INFO"); _EXTRA_EXTRA_INFOReady = true; } return _EXTRA_EXTRA_INFOContent; } }
         private static Java.Lang.String _EXTRA_EXTRA_INFOContent = default;
         private static bool _EXTRA_EXTRA_INFOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#EXTRA_IS_FAILOVER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_IS_FAILOVER { get { if (!_EXTRA_IS_FAILOVERReady) { _EXTRA_IS_FAILOVERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_IS_FAILOVER"); _EXTRA_IS_FAILOVERReady = true; } return _EXTRA_IS_FAILOVERContent; } }
         private static Java.Lang.String _EXTRA_IS_FAILOVERContent = default;
         private static bool _EXTRA_IS_FAILOVERReady = false; // this is used because in case of generics 
@@ -218,7 +218,7 @@ public partial class ConnectivityManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#EXTRA_NETWORK_INFO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_NETWORK_INFO { get { if (!_EXTRA_NETWORK_INFOReady) { _EXTRA_NETWORK_INFOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_NETWORK_INFO"); _EXTRA_NETWORK_INFOReady = true; } return _EXTRA_NETWORK_INFOContent; } }
         private static Java.Lang.String _EXTRA_NETWORK_INFOContent = default;
         private static bool _EXTRA_NETWORK_INFOReady = false; // this is used because in case of generics 
@@ -231,7 +231,7 @@ public partial class ConnectivityManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#EXTRA_NETWORK_TYPE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_NETWORK_TYPE { get { if (!_EXTRA_NETWORK_TYPEReady) { _EXTRA_NETWORK_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_NETWORK_TYPE"); _EXTRA_NETWORK_TYPEReady = true; } return _EXTRA_NETWORK_TYPEContent; } }
         private static Java.Lang.String _EXTRA_NETWORK_TYPEContent = default;
         private static bool _EXTRA_NETWORK_TYPEReady = false; // this is used because in case of generics 
@@ -244,7 +244,7 @@ public partial class ConnectivityManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#EXTRA_OTHER_NETWORK_INFO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_OTHER_NETWORK_INFO { get { if (!_EXTRA_OTHER_NETWORK_INFOReady) { _EXTRA_OTHER_NETWORK_INFOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_OTHER_NETWORK_INFO"); _EXTRA_OTHER_NETWORK_INFOReady = true; } return _EXTRA_OTHER_NETWORK_INFOContent; } }
         private static Java.Lang.String _EXTRA_OTHER_NETWORK_INFOContent = default;
         private static bool _EXTRA_OTHER_NETWORK_INFOReady = false; // this is used because in case of generics 
@@ -259,19 +259,20 @@ public partial class ConnectivityManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getProcessDefaultNetwork()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getProcessDefaultNetwork()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Android.Net.Network ProcessDefaultNetwork
+        /// <returns><see cref="Android.Net.Network"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Net.Network GetProcessDefaultNetwork()
         {
-            get { return SExecuteWithSignature<Android.Net.Network>(LocalBridgeClazz, "getProcessDefaultNetwork", "()Landroid/net/Network;"); }
+            return SExecuteWithSignature<Android.Net.Network>(LocalBridgeClazz, "getProcessDefaultNetwork", "()Landroid/net/Network;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#isNetworkTypeValid(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsNetworkTypeValid(int arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isNetworkTypeValid", "(I)Z", arg0);
@@ -281,7 +282,7 @@ public static bool IsNetworkTypeValid(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Network"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool SetProcessDefaultNetwork(Android.Net.Network arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "setProcessDefaultNetwork", "(Landroid/net/Network;)Z", arg0);
@@ -291,88 +292,38 @@ public static bool SetProcessDefaultNetwork(Android.Net.Network arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getActiveNetwork()"/> 
-        /// </summary>
-        public Android.Net.Network ActiveNetwork
-        {
-            get { return IExecuteWithSignature<Android.Net.Network>("getActiveNetwork", "()Landroid/net/Network;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getActiveNetworkInfo()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Net.NetworkInfo ActiveNetworkInfo
-        {
-            get { return IExecuteWithSignature<Android.Net.NetworkInfo>("getActiveNetworkInfo", "()Landroid/net/NetworkInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getAllNetworkInfo()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Net.NetworkInfo[] AllNetworkInfo
-        {
-            get { return IExecuteWithSignatureArray<Android.Net.NetworkInfo>("getAllNetworkInfo", "()[Landroid/net/NetworkInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getAllNetworks()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Network[] AllNetworks
-        {
-            get { return IExecuteWithSignatureArray<Android.Net.Network>("getAllNetworks", "()[Landroid/net/Network;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getBackgroundDataSetting()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public bool BackgroundDataSetting
-        {
-            get { return IExecuteWithSignature<bool>("getBackgroundDataSetting", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getBoundNetworkForProcess()"/> 
-        /// </summary>
-        public Android.Net.Network BoundNetworkForProcess
-        {
-            get { return IExecuteWithSignature<Android.Net.Network>("getBoundNetworkForProcess", "()Landroid/net/Network;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getDefaultProxy()"/> 
-        /// </summary>
-        public Android.Net.ProxyInfo DefaultProxy
-        {
-            get { return IExecuteWithSignature<Android.Net.ProxyInfo>("getDefaultProxy", "()Landroid/net/ProxyInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getNetworkPreference()"/> <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#setNetworkPreference(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getLinkProperties(android.net.Network)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int NetworkPreference
+        /// <param name="arg0"><see cref="Android.Net.Network"/></param>
+        /// <returns><see cref="Android.Net.LinkProperties"/></returns>
+        public Android.Net.LinkProperties GetLinkProperties(Android.Net.Network arg0)
         {
-            get { return IExecuteWithSignature<int>("getNetworkPreference", "()I"); } set { IExecuteWithSignature("setNetworkPreference", "(I)V", value); }
+            return IExecuteWithSignature<Android.Net.LinkProperties>("getLinkProperties", "(Landroid/net/Network;)Landroid/net/LinkProperties;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getNetworkWatchlistConfigHash()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getActiveNetwork()"/>
         /// </summary>
-        public byte[] NetworkWatchlistConfigHash
+        /// <returns><see cref="Android.Net.Network"/></returns>
+        public Android.Net.Network GetActiveNetwork()
         {
-            get { return IExecuteWithSignatureArray<byte>("getNetworkWatchlistConfigHash", "()[B"); }
+            return IExecuteWithSignature<Android.Net.Network>("getActiveNetwork", "()Landroid/net/Network;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getRestrictBackgroundStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getBoundNetworkForProcess()"/>
         /// </summary>
-        public int RestrictBackgroundStatus
+        /// <returns><see cref="Android.Net.Network"/></returns>
+        public Android.Net.Network GetBoundNetworkForProcess()
         {
-            get { return IExecuteWithSignature<int>("getRestrictBackgroundStatus", "()I"); }
+            return IExecuteWithSignature<Android.Net.Network>("getBoundNetworkForProcess", "()Landroid/net/Network;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getLinkProperties(android.net.Network)"/>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getAllNetworks()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Net.Network"/></param>
-        /// <returns><see cref="Android.Net.LinkProperties"/></returns>
-        public Android.Net.LinkProperties GetLinkProperties(Android.Net.Network arg0)
+        /// <returns><see cref="Android.Net.Network"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Network[] GetAllNetworks()
         {
-            return IExecuteWithSignature<Android.Net.LinkProperties>("getLinkProperties", "(Landroid/net/Network;)Landroid/net/LinkProperties;", arg0);
+            return IExecuteWithSignatureArray<Android.Net.Network>("getAllNetworks", "()[Landroid/net/Network;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getNetworkCapabilities(android.net.Network)"/>
@@ -384,11 +335,20 @@ public Android.Net.NetworkCapabilities GetNetworkCapabilities(Android.Net.Networ
             return IExecuteWithSignature<Android.Net.NetworkCapabilities>("getNetworkCapabilities", "(Landroid/net/Network;)Landroid/net/NetworkCapabilities;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getActiveNetworkInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.NetworkInfo"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.NetworkInfo GetActiveNetworkInfo()
+        {
+            return IExecuteWithSignature<Android.Net.NetworkInfo>("getActiveNetworkInfo", "()Landroid/net/NetworkInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getNetworkInfo(android.net.Network)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Network"/></param>
         /// <returns><see cref="Android.Net.NetworkInfo"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.NetworkInfo GetNetworkInfo(Android.Net.Network arg0)
         {
             return IExecuteWithSignature<Android.Net.NetworkInfo>("getNetworkInfo", "(Landroid/net/Network;)Landroid/net/NetworkInfo;", arg0);
@@ -398,12 +358,29 @@ public Android.Net.NetworkInfo GetNetworkInfo(Android.Net.Network arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Net.NetworkInfo"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.NetworkInfo GetNetworkInfo(int arg0)
         {
             return IExecuteWithSignature<Android.Net.NetworkInfo>("getNetworkInfo", "(I)Landroid/net/NetworkInfo;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getAllNetworkInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.NetworkInfo"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.NetworkInfo[] GetAllNetworkInfo()
+        {
+            return IExecuteWithSignatureArray<Android.Net.NetworkInfo>("getAllNetworkInfo", "()[Landroid/net/NetworkInfo;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getDefaultProxy()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.ProxyInfo"/></returns>
+        public Android.Net.ProxyInfo GetDefaultProxy()
+        {
+            return IExecuteWithSignature<Android.Net.ProxyInfo>("getDefaultProxy", "()Landroid/net/ProxyInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#createSocketKeepalive(android.net.Network,android.net.IpSecManager.UdpEncapsulationSocket,java.net.InetAddress,java.net.InetAddress,java.util.concurrent.Executor,android.net.SocketKeepalive.Callback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Network"/></param>
@@ -427,6 +404,15 @@ public bool BindProcessToNetwork(Android.Net.Network arg0)
             return IExecuteWithSignature<bool>("bindProcessToNetwork", "(Landroid/net/Network;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getBackgroundDataSetting()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetBackgroundDataSetting()
+        {
+            return IExecuteWithSignature<bool>("getBackgroundDataSetting", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#isActiveNetworkMetered()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -452,6 +438,14 @@ public bool RequestBandwidthUpdate(Android.Net.Network arg0)
             return IExecuteWithSignature<bool>("requestBandwidthUpdate", "(Landroid/net/Network;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getNetworkWatchlistConfigHash()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetNetworkWatchlistConfigHash()
+        {
+            return IExecuteWithSignatureArray<byte>("getNetworkWatchlistConfigHash", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getConnectionOwnerUid(int,java.net.InetSocketAddress,java.net.InetSocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -472,6 +466,23 @@ public int GetMultipathPreference(Android.Net.Network arg0)
             return IExecuteWithSignature<int>("getMultipathPreference", "(Landroid/net/Network;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getNetworkPreference()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetNetworkPreference()
+        {
+            return IExecuteWithSignature<int>("getNetworkPreference", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#getRestrictBackgroundStatus()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRestrictBackgroundStatus()
+        {
+            return IExecuteWithSignature<int>("getRestrictBackgroundStatus", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#addDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.ConnectivityManager.OnNetworkActiveListener"/></param>
@@ -554,7 +565,7 @@ public void RemoveDefaultNetworkActiveListener(Android.Net.ConnectivityManager.O
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#reportBadNetwork(android.net.Network)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Network"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ReportBadNetwork(Android.Net.Network arg0)
         {
             IExecuteWithSignature("reportBadNetwork", "(Landroid/net/Network;)V", arg0);
@@ -618,6 +629,15 @@ public void RequestNetwork(Android.Net.NetworkRequest arg0, Android.Net.Connecti
             IExecute("requestNetwork", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#setNetworkPreference(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetNetworkPreference(int arg0)
+        {
+            IExecuteWithSignature("setNetworkPreference", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ConnectivityManager.html#unregisterNetworkCallback(android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
@@ -766,7 +786,7 @@ public partial class OnNetworkActiveListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onNetworkActive", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnNetworkActiveEventHandler));
+                AddEventHandler("onNetworkActive", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnNetworkActiveEventHandler));
 
             }
 
@@ -774,7 +794,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/ConnectivityManager.OnNetworkActiveListener.html#onNetworkActive()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnNetworkActive"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnNetworkActive { get; set; } = null;
+            public global::System.Action OnOnNetworkActive { get; set; } = null;
 
             void OnNetworkActiveEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Net/Credentials.cs b/src/net/Netdroid/Generated/Android/Net/Credentials.cs
index 413dc8aae..f05e18f88 100644
--- a/src/net/Netdroid/Generated/Android/Net/Credentials.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Credentials.cs
@@ -56,25 +56,28 @@ public Credentials(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Credentials.html#getGid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Credentials.html#getGid()"/>
         /// </summary>
-        public int Gid
+        /// <returns><see cref="int"/></returns>
+        public int GetGid()
         {
-            get { return IExecuteWithSignature<int>("getGid", "()I"); }
+            return IExecuteWithSignature<int>("getGid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Credentials.html#getPid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Credentials.html#getPid()"/>
         /// </summary>
-        public int Pid
+        /// <returns><see cref="int"/></returns>
+        public int GetPid()
         {
-            get { return IExecuteWithSignature<int>("getPid", "()I"); }
+            return IExecuteWithSignature<int>("getPid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Credentials.html#getUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Credentials.html#getUid()"/>
         /// </summary>
-        public int Uid
+        /// <returns><see cref="int"/></returns>
+        public int GetUid()
         {
-            get { return IExecuteWithSignature<int>("getUid", "()I"); }
+            return IExecuteWithSignature<int>("getUid", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/DnsResolver.cs b/src/net/Netdroid/Generated/Android/Net/DnsResolver.cs
index 5e23e3096..0cc3bfbe3 100644
--- a/src/net/Netdroid/Generated/Android/Net/DnsResolver.cs
+++ b/src/net/Netdroid/Generated/Android/Net/DnsResolver.cs
@@ -96,11 +96,12 @@ public partial class DnsResolver
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/DnsResolver.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/DnsResolver.html#getInstance()"/>
         /// </summary>
-        public static Android.Net.DnsResolver Instance
+        /// <returns><see cref="Android.Net.DnsResolver"/></returns>
+        public static Android.Net.DnsResolver GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Net.DnsResolver>(LocalBridgeClazz, "getInstance", "()Landroid/net/DnsResolver;"); }
+            return SExecuteWithSignature<Android.Net.DnsResolver>(LocalBridgeClazz, "getInstance", "()Landroid/net/DnsResolver;");
         }
 
         #endregion
@@ -117,7 +118,7 @@ public static Android.Net.DnsResolver Instance
         /// <param name="arg5"><see cref="Android.Os.CancellationSignal"/></param>
         /// <param name="arg6"><see cref="Android.Net.DnsResolver.Callback"/></param>
         /// <typeparam name="Arg6objectSuperJava_Util_List_Java_Net_InetAddress_"><see cref="Java.Util.List{Java.Net.InetAddress}"/></typeparam>
-        public void Query<Arg6objectSuperJava_Util_List_Java_Net_InetAddress_>(Android.Net.Network arg0, Java.Lang.String arg1, int arg2, int arg3, Java.Util.Concurrent.Executor arg4, Android.Os.CancellationSignal arg5, Android.Net.DnsResolver.Callback<Arg6objectSuperJava_Util_List_Java_Net_InetAddress_> arg6) where Arg6objectSuperJava_Util_List_Java_Net_InetAddress_: Java.Util.List<Java.Net.InetAddress>
+        public void Query<Arg6objectSuperJava_Util_List_Java_Net_InetAddress_>(Android.Net.Network arg0, Java.Lang.String arg1, int arg2, int arg3, Java.Util.Concurrent.Executor arg4, Android.Os.CancellationSignal arg5, Android.Net.DnsResolver.Callback<Arg6objectSuperJava_Util_List_Java_Net_InetAddress_> arg6) where Arg6objectSuperJava_Util_List_Java_Net_InetAddress_ : Java.Util.List<Java.Net.InetAddress>
         {
             IExecute("query", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
@@ -131,7 +132,7 @@ public void Query<Arg6objectSuperJava_Util_List_Java_Net_InetAddress_>(Android.N
         /// <param name="arg4"><see cref="Android.Os.CancellationSignal"/></param>
         /// <param name="arg5"><see cref="Android.Net.DnsResolver.Callback"/></param>
         /// <typeparam name="Arg5objectSuperJava_Util_List_Java_Net_InetAddress_"><see cref="Java.Util.List{Java.Net.InetAddress}"/></typeparam>
-        public void Query<Arg5objectSuperJava_Util_List_Java_Net_InetAddress_>(Android.Net.Network arg0, Java.Lang.String arg1, int arg2, Java.Util.Concurrent.Executor arg3, Android.Os.CancellationSignal arg4, Android.Net.DnsResolver.Callback<Arg5objectSuperJava_Util_List_Java_Net_InetAddress_> arg5) where Arg5objectSuperJava_Util_List_Java_Net_InetAddress_: Java.Util.List<Java.Net.InetAddress>
+        public void Query<Arg5objectSuperJava_Util_List_Java_Net_InetAddress_>(Android.Net.Network arg0, Java.Lang.String arg1, int arg2, Java.Util.Concurrent.Executor arg3, Android.Os.CancellationSignal arg4, Android.Net.DnsResolver.Callback<Arg5objectSuperJava_Util_List_Java_Net_InetAddress_> arg5) where Arg5objectSuperJava_Util_List_Java_Net_InetAddress_ : Java.Util.List<Java.Net.InetAddress>
         {
             IExecute("query", arg0, arg1, arg2, arg3, arg4, arg5);
         }
diff --git a/src/net/Netdroid/Generated/Android/Net/Eap/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Eap/AllPackageClasses.cs
index 315c50064..933db18ee 100644
--- a/src/net/Netdroid/Generated/Android/Net/Eap/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Eap/AllPackageClasses.cs
@@ -124,12 +124,12 @@ public partial class EapInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EapInfo>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EapInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EapInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EapInfo() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EapInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EapInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EapInfo(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -430,12 +430,12 @@ public partial class EapMethodConfig : MASES.JCOBridge.C2JBridge.JVMBridgeBase<E
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("EapMethodConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EapMethodConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EapMethodConfig() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("EapMethodConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EapMethodConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EapMethodConfig(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Net/Eap/EapAkaInfo.cs b/src/net/Netdroid/Generated/Android/Net/Eap/EapAkaInfo.cs
index d4d80d932..83f5a7dee 100644
--- a/src/net/Netdroid/Generated/Android/Net/Eap/EapAkaInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Eap/EapAkaInfo.cs
@@ -46,11 +46,12 @@ public partial class EapAkaInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/eap/EapAkaInfo.html#getReauthId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/eap/EapAkaInfo.html#getReauthId()"/>
         /// </summary>
-        public byte[] ReauthId
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetReauthId()
         {
-            get { return IExecuteWithSignatureArray<byte>("getReauthId", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getReauthId", "()[B");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Eap/EapInfo.cs b/src/net/Netdroid/Generated/Android/Net/Eap/EapInfo.cs
index 8fffad970..647a9340f 100644
--- a/src/net/Netdroid/Generated/Android/Net/Eap/EapInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Eap/EapInfo.cs
@@ -46,11 +46,12 @@ public partial class EapInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/eap/EapInfo.html#getEapMethodType()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/eap/EapInfo.html#getEapMethodType()"/>
         /// </summary>
-        public int EapMethodType
+        /// <returns><see cref="int"/></returns>
+        public int GetEapMethodType()
         {
-            get { return IExecuteWithSignature<int>("getEapMethodType", "()I"); }
+            return IExecuteWithSignature<int>("getEapMethodType", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Eap/EapSessionConfig.cs b/src/net/Netdroid/Generated/Android/Net/Eap/EapSessionConfig.cs
index fa1b7c843..64ceba430 100644
--- a/src/net/Netdroid/Generated/Android/Net/Eap/EapSessionConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Eap/EapSessionConfig.cs
@@ -46,46 +46,52 @@ public partial class EapSessionConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapIdentity()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapAkaConfig()"/>
         /// </summary>
-        public byte[] EapIdentity
+        /// <returns><see cref="Android.Net.Eap.EapSessionConfig.EapAkaConfig"/></returns>
+        public Android.Net.Eap.EapSessionConfig.EapAkaConfig GetEapAkaConfig()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEapIdentity", "()[B"); }
+            return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapAkaConfig>("getEapAkaConfig", "()Landroid/net/eap/EapSessionConfig$EapAkaConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapAkaConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapAkaPrimeConfig()"/>
         /// </summary>
-        public Android.Net.Eap.EapSessionConfig.EapAkaConfig GetEapAkaConfig
+        /// <returns><see cref="Android.Net.Eap.EapSessionConfig.EapAkaPrimeConfig"/></returns>
+        public Android.Net.Eap.EapSessionConfig.EapAkaPrimeConfig GetEapAkaPrimeConfig()
         {
-            get { return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapAkaConfig>("getEapAkaConfig", "()Landroid/net/eap/EapSessionConfig$EapAkaConfig;"); }
+            return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapAkaPrimeConfig>("getEapAkaPrimeConfig", "()Landroid/net/eap/EapSessionConfig$EapAkaPrimeConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapAkaPrimeConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapMsChapV2Config()"/>
         /// </summary>
-        public Android.Net.Eap.EapSessionConfig.EapAkaPrimeConfig GetEapAkaPrimeConfig
+        /// <returns><see cref="Android.Net.Eap.EapSessionConfig.EapMsChapV2Config"/></returns>
+        public Android.Net.Eap.EapSessionConfig.EapMsChapV2Config GetEapMsChapV2Config()
         {
-            get { return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapAkaPrimeConfig>("getEapAkaPrimeConfig", "()Landroid/net/eap/EapSessionConfig$EapAkaPrimeConfig;"); }
+            return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapMsChapV2Config>("getEapMsChapV2Config", "()Landroid/net/eap/EapSessionConfig$EapMsChapV2Config;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapMsChapV2Config()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapSimConfig()"/>
         /// </summary>
-        public Android.Net.Eap.EapSessionConfig.EapMsChapV2Config GetEapMsChapV2Config
+        /// <returns><see cref="Android.Net.Eap.EapSessionConfig.EapSimConfig"/></returns>
+        public Android.Net.Eap.EapSessionConfig.EapSimConfig GetEapSimConfig()
         {
-            get { return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapMsChapV2Config>("getEapMsChapV2Config", "()Landroid/net/eap/EapSessionConfig$EapMsChapV2Config;"); }
+            return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapSimConfig>("getEapSimConfig", "()Landroid/net/eap/EapSessionConfig$EapSimConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapSimConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapTtlsConfig()"/>
         /// </summary>
-        public Android.Net.Eap.EapSessionConfig.EapSimConfig GetEapSimConfig
+        /// <returns><see cref="Android.Net.Eap.EapSessionConfig.EapTtlsConfig"/></returns>
+        public Android.Net.Eap.EapSessionConfig.EapTtlsConfig GetEapTtlsConfig()
         {
-            get { return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapSimConfig>("getEapSimConfig", "()Landroid/net/eap/EapSessionConfig$EapSimConfig;"); }
+            return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapTtlsConfig>("getEapTtlsConfig", "()Landroid/net/eap/EapSessionConfig$EapTtlsConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapTtlsConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.html#getEapIdentity()"/>
         /// </summary>
-        public Android.Net.Eap.EapSessionConfig.EapTtlsConfig GetEapTtlsConfig
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEapIdentity()
         {
-            get { return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapTtlsConfig>("getEapTtlsConfig", "()Landroid/net/eap/EapSessionConfig$EapTtlsConfig;"); }
+            return IExecuteWithSignatureArray<byte>("getEapIdentity", "()[B");
         }
 
         #endregion
@@ -223,25 +229,28 @@ public partial class EapAkaConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaConfig.html#getAppType()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaConfig.html#getEapAkaOption()"/>
             /// </summary>
-            public int AppType
+            /// <returns><see cref="Android.Net.Eap.EapSessionConfig.EapAkaOption"/></returns>
+            public Android.Net.Eap.EapSessionConfig.EapAkaOption GetEapAkaOption()
             {
-                get { return IExecuteWithSignature<int>("getAppType", "()I"); }
+                return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapAkaOption>("getEapAkaOption", "()Landroid/net/eap/EapSessionConfig$EapAkaOption;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaConfig.html#getEapAkaOption()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaConfig.html#getAppType()"/>
             /// </summary>
-            public Android.Net.Eap.EapSessionConfig.EapAkaOption GetEapAkaOption
+            /// <returns><see cref="int"/></returns>
+            public int GetAppType()
             {
-                get { return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig.EapAkaOption>("getEapAkaOption", "()Landroid/net/eap/EapSessionConfig$EapAkaOption;"); }
+                return IExecuteWithSignature<int>("getAppType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaConfig.html#getSubId()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaConfig.html#getSubId()"/>
             /// </summary>
-            public int SubId
+            /// <returns><see cref="int"/></returns>
+            public int GetSubId()
             {
-                get { return IExecuteWithSignature<int>("getSubId", "()I"); }
+                return IExecuteWithSignature<int>("getSubId", "()I");
             }
 
             #endregion
@@ -275,11 +284,12 @@ public partial class EapAkaOption
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaOption.html#getReauthId()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaOption.html#getReauthId()"/>
             /// </summary>
-            public byte[] ReauthId
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetReauthId()
             {
-                get { return IExecuteWithSignatureArray<byte>("getReauthId", "()[B"); }
+                return IExecuteWithSignatureArray<byte>("getReauthId", "()[B");
             }
 
             #endregion
@@ -361,13 +371,6 @@ public partial class EapAkaPrimeConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaPrimeConfig.html#getNetworkName()"/> 
-            /// </summary>
-            public Java.Lang.String NetworkName
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getNetworkName", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaPrimeConfig.html#allowsMismatchedNetworkNames()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -375,6 +378,14 @@ public bool AllowsMismatchedNetworkNames()
             {
                 return IExecuteWithSignature<bool>("allowsMismatchedNetworkNames", "()Z");
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapAkaPrimeConfig.html#getNetworkName()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetNetworkName()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getNetworkName", "()Ljava/lang/String;");
+            }
 
             #endregion
 
@@ -437,11 +448,12 @@ public partial class EapMethodConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapMethodConfig.html#getMethodType()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapMethodConfig.html#getMethodType()"/>
             /// </summary>
-            public int MethodType
+            /// <returns><see cref="int"/></returns>
+            public int GetMethodType()
             {
-                get { return IExecuteWithSignature<int>("getMethodType", "()I"); }
+                return IExecuteWithSignature<int>("getMethodType", "()I");
             }
 
             #endregion
@@ -475,18 +487,20 @@ public partial class EapMsChapV2Config
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapMsChapV2Config.html#getPassword()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapMsChapV2Config.html#getPassword()"/>
             /// </summary>
-            public Java.Lang.String Password
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPassword()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapMsChapV2Config.html#getUsername()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapMsChapV2Config.html#getUsername()"/>
             /// </summary>
-            public Java.Lang.String Username
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetUsername()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getUsername", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getUsername", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -520,18 +534,20 @@ public partial class EapSimConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapSimConfig.html#getAppType()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapSimConfig.html#getAppType()"/>
             /// </summary>
-            public int AppType
+            /// <returns><see cref="int"/></returns>
+            public int GetAppType()
             {
-                get { return IExecuteWithSignature<int>("getAppType", "()I"); }
+                return IExecuteWithSignature<int>("getAppType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapSimConfig.html#getSubId()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapSimConfig.html#getSubId()"/>
             /// </summary>
-            public int SubId
+            /// <returns><see cref="int"/></returns>
+            public int GetSubId()
             {
-                get { return IExecuteWithSignature<int>("getSubId", "()I"); }
+                return IExecuteWithSignature<int>("getSubId", "()I");
             }
 
             #endregion
@@ -565,18 +581,20 @@ public partial class EapTtlsConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapTtlsConfig.html#getInnerEapSessionConfig()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapTtlsConfig.html#getInnerEapSessionConfig()"/>
             /// </summary>
-            public Android.Net.Eap.EapSessionConfig InnerEapSessionConfig
+            /// <returns><see cref="Android.Net.Eap.EapSessionConfig"/></returns>
+            public Android.Net.Eap.EapSessionConfig GetInnerEapSessionConfig()
             {
-                get { return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig>("getInnerEapSessionConfig", "()Landroid/net/eap/EapSessionConfig;"); }
+                return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig>("getInnerEapSessionConfig", "()Landroid/net/eap/EapSessionConfig;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapTtlsConfig.html#getServerCaCert()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/eap/EapSessionConfig.EapTtlsConfig.html#getServerCaCert()"/>
             /// </summary>
-            public Java.Security.Cert.X509Certificate ServerCaCert
+            /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+            public Java.Security.Cert.X509Certificate GetServerCaCert()
             {
-                get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getServerCaCert", "()Ljava/security/cert/X509Certificate;"); }
+                return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getServerCaCert", "()Ljava/security/cert/X509Certificate;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/EthernetNetworkSpecifier.cs b/src/net/Netdroid/Generated/Android/Net/EthernetNetworkSpecifier.cs
index d5bb5fae4..773ee4510 100644
--- a/src/net/Netdroid/Generated/Android/Net/EthernetNetworkSpecifier.cs
+++ b/src/net/Netdroid/Generated/Android/Net/EthernetNetworkSpecifier.cs
@@ -64,13 +64,6 @@ public EthernetNetworkSpecifier(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/EthernetNetworkSpecifier.html#getInterfaceName()"/> 
-        /// </summary>
-        public Java.Lang.String InterfaceName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInterfaceName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/EthernetNetworkSpecifier.html#canBeSatisfiedBy(android.net.NetworkSpecifier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.NetworkSpecifier"/></param>
@@ -88,6 +81,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/EthernetNetworkSpecifier.html#getInterfaceName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInterfaceName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInterfaceName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/EthernetNetworkSpecifier.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Http/AllPackageClasses.cs
index 6185bd554..5ce6f96dd 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class BidirectionalStream : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BidirectionalStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BidirectionalStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BidirectionalStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BidirectionalStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BidirectionalStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BidirectionalStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -78,12 +78,12 @@ public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -124,12 +124,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -455,12 +455,12 @@ public partial class HeaderBlock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Heade
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HeaderBlock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HeaderBlock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HeaderBlock() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HeaderBlock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HeaderBlock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HeaderBlock(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -501,12 +501,12 @@ public partial class HttpEngine : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HttpEn
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HttpEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HttpEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HttpEngine() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HttpEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HttpEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HttpEngine(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -923,12 +923,12 @@ public partial class UploadDataProvider : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UploadDataProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UploadDataProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UploadDataProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UploadDataProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UploadDataProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UploadDataProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -969,12 +969,12 @@ public partial class UploadDataSink : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Up
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UploadDataSink class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UploadDataSink class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UploadDataSink() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UploadDataSink class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UploadDataSink class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UploadDataSink(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1015,12 +1015,12 @@ public partial class UrlRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UrlReq
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UrlRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UrlRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UrlRequest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UrlRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UrlRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UrlRequest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1057,12 +1057,12 @@ public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1103,12 +1103,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1194,10 +1194,13 @@ public partial class StatusListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public StatusListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.http.UrlRequest_StatusListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.http.StatusListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1219,10 +1222,13 @@ public partial class StatusListenerDirect : StatusListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.http.UrlRequest$StatusListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.http.UrlRequest$StatusListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1256,12 +1262,12 @@ public partial class UrlResponseInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<U
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UrlResponseInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UrlResponseInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UrlResponseInfo() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UrlResponseInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UrlResponseInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UrlResponseInfo(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/BidirectionalStream.cs b/src/net/Netdroid/Generated/Android/Net/Http/BidirectionalStream.cs
index c11881dd1..e0e34993c 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/BidirectionalStream.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/BidirectionalStream.cs
@@ -76,39 +76,12 @@ public partial class BidirectionalStream
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getHeaders()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getHeaders()"/>
         /// </summary>
-        public Android.Net.Http.HeaderBlock Headers
+        /// <returns><see cref="Android.Net.Http.HeaderBlock"/></returns>
+        public Android.Net.Http.HeaderBlock GetHeaders()
         {
-            get { return IExecuteWithSignature<Android.Net.Http.HeaderBlock>("getHeaders", "()Landroid/net/http/HeaderBlock;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getHttpMethod()"/> 
-        /// </summary>
-        public Java.Lang.String HttpMethod
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHttpMethod", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getPriority()"/> 
-        /// </summary>
-        public int Priority
-        {
-            get { return IExecuteWithSignature<int>("getPriority", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getTrafficStatsTag()"/> 
-        /// </summary>
-        public int TrafficStatsTag
-        {
-            get { return IExecuteWithSignature<int>("getTrafficStatsTag", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getTrafficStatsUid()"/> 
-        /// </summary>
-        public int TrafficStatsUid
-        {
-            get { return IExecuteWithSignature<int>("getTrafficStatsUid", "()I"); }
+            return IExecuteWithSignature<Android.Net.Http.HeaderBlock>("getHeaders", "()Landroid/net/http/HeaderBlock;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#hasTrafficStatsTag()"/>
@@ -143,6 +116,38 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getPriority()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPriority()
+        {
+            return IExecuteWithSignature<int>("getPriority", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getTrafficStatsTag()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTrafficStatsTag()
+        {
+            return IExecuteWithSignature<int>("getTrafficStatsTag", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getTrafficStatsUid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTrafficStatsUid()
+        {
+            return IExecuteWithSignature<int>("getTrafficStatsUid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#getHttpMethod()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHttpMethod()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getHttpMethod", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/BidirectionalStream.html#cancel()"/>
         /// </summary>
         public void Cancel()
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/ConnectionMigrationOptions.cs b/src/net/Netdroid/Generated/Android/Net/Http/ConnectionMigrationOptions.cs
index 854f5000d..5e6d832e8 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/ConnectionMigrationOptions.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/ConnectionMigrationOptions.cs
@@ -64,25 +64,28 @@ public partial class ConnectionMigrationOptions
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/ConnectionMigrationOptions.html#getAllowNonDefaultNetworkUsage()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/ConnectionMigrationOptions.html#getAllowNonDefaultNetworkUsage()"/>
         /// </summary>
-        public int AllowNonDefaultNetworkUsage
+        /// <returns><see cref="int"/></returns>
+        public int GetAllowNonDefaultNetworkUsage()
         {
-            get { return IExecuteWithSignature<int>("getAllowNonDefaultNetworkUsage", "()I"); }
+            return IExecuteWithSignature<int>("getAllowNonDefaultNetworkUsage", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/ConnectionMigrationOptions.html#getDefaultNetworkMigration()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/ConnectionMigrationOptions.html#getDefaultNetworkMigration()"/>
         /// </summary>
-        public int DefaultNetworkMigration
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultNetworkMigration()
         {
-            get { return IExecuteWithSignature<int>("getDefaultNetworkMigration", "()I"); }
+            return IExecuteWithSignature<int>("getDefaultNetworkMigration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/ConnectionMigrationOptions.html#getPathDegradationMigration()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/ConnectionMigrationOptions.html#getPathDegradationMigration()"/>
         /// </summary>
-        public int PathDegradationMigration
+        /// <returns><see cref="int"/></returns>
+        public int GetPathDegradationMigration()
         {
-            get { return IExecuteWithSignature<int>("getPathDegradationMigration", "()I"); }
+            return IExecuteWithSignature<int>("getPathDegradationMigration", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/DnsOptions.cs b/src/net/Netdroid/Generated/Android/Net/Http/DnsOptions.cs
index 9c6875c38..c981fc57b 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/DnsOptions.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/DnsOptions.cs
@@ -64,46 +64,52 @@ public partial class DnsOptions
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getStaleDnsOptions()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getStaleDnsOptions()"/>
         /// </summary>
-        public Android.Net.Http.DnsOptions.StaleDnsOptions GetStaleDnsOptions
+        /// <returns><see cref="Android.Net.Http.DnsOptions.StaleDnsOptions"/></returns>
+        public Android.Net.Http.DnsOptions.StaleDnsOptions GetStaleDnsOptions()
         {
-            get { return IExecuteWithSignature<Android.Net.Http.DnsOptions.StaleDnsOptions>("getStaleDnsOptions", "()Landroid/net/http/DnsOptions$StaleDnsOptions;"); }
+            return IExecuteWithSignature<Android.Net.Http.DnsOptions.StaleDnsOptions>("getStaleDnsOptions", "()Landroid/net/http/DnsOptions$StaleDnsOptions;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getPersistHostCache()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getPersistHostCache()"/>
         /// </summary>
-        public int PersistHostCache
+        /// <returns><see cref="int"/></returns>
+        public int GetPersistHostCache()
         {
-            get { return IExecuteWithSignature<int>("getPersistHostCache", "()I"); }
+            return IExecuteWithSignature<int>("getPersistHostCache", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getPersistHostCachePeriod()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getPreestablishConnectionsToStaleDnsResults()"/>
         /// </summary>
-        public Java.Time.Duration PersistHostCachePeriod
+        /// <returns><see cref="int"/></returns>
+        public int GetPreestablishConnectionsToStaleDnsResults()
         {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getPersistHostCachePeriod", "()Ljava/time/Duration;"); }
+            return IExecuteWithSignature<int>("getPreestablishConnectionsToStaleDnsResults", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getPreestablishConnectionsToStaleDnsResults()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getStaleDns()"/>
         /// </summary>
-        public int PreestablishConnectionsToStaleDnsResults
+        /// <returns><see cref="int"/></returns>
+        public int GetStaleDns()
         {
-            get { return IExecuteWithSignature<int>("getPreestablishConnectionsToStaleDnsResults", "()I"); }
+            return IExecuteWithSignature<int>("getStaleDns", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getStaleDns()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getUseHttpStackDnsResolver()"/>
         /// </summary>
-        public int StaleDns
+        /// <returns><see cref="int"/></returns>
+        public int GetUseHttpStackDnsResolver()
         {
-            get { return IExecuteWithSignature<int>("getStaleDns", "()I"); }
+            return IExecuteWithSignature<int>("getUseHttpStackDnsResolver", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getUseHttpStackDnsResolver()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.html#getPersistHostCachePeriod()"/>
         /// </summary>
-        public int UseHttpStackDnsResolver
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetPersistHostCachePeriod()
         {
-            get { return IExecuteWithSignature<int>("getUseHttpStackDnsResolver", "()I"); }
+            return IExecuteWithSignature<Java.Time.Duration>("getPersistHostCachePeriod", "()Ljava/time/Duration;");
         }
 
         #endregion
@@ -223,32 +229,36 @@ public partial class StaleDnsOptions
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.StaleDnsOptions.html#getAllowCrossNetworkUsage()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.StaleDnsOptions.html#getAllowCrossNetworkUsage()"/>
             /// </summary>
-            public int AllowCrossNetworkUsage
+            /// <returns><see cref="int"/></returns>
+            public int GetAllowCrossNetworkUsage()
             {
-                get { return IExecuteWithSignature<int>("getAllowCrossNetworkUsage", "()I"); }
+                return IExecuteWithSignature<int>("getAllowCrossNetworkUsage", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.StaleDnsOptions.html#getFreshLookupTimeout()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.StaleDnsOptions.html#getUseStaleOnNameNotResolved()"/>
             /// </summary>
-            public Java.Time.Duration FreshLookupTimeout
+            /// <returns><see cref="int"/></returns>
+            public int GetUseStaleOnNameNotResolved()
             {
-                get { return IExecuteWithSignature<Java.Time.Duration>("getFreshLookupTimeout", "()Ljava/time/Duration;"); }
+                return IExecuteWithSignature<int>("getUseStaleOnNameNotResolved", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.StaleDnsOptions.html#getMaxExpiredDelay()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.StaleDnsOptions.html#getFreshLookupTimeout()"/>
             /// </summary>
-            public Java.Time.Duration MaxExpiredDelay
+            /// <returns><see cref="Java.Time.Duration"/></returns>
+            public Java.Time.Duration GetFreshLookupTimeout()
             {
-                get { return IExecuteWithSignature<Java.Time.Duration>("getMaxExpiredDelay", "()Ljava/time/Duration;"); }
+                return IExecuteWithSignature<Java.Time.Duration>("getFreshLookupTimeout", "()Ljava/time/Duration;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.StaleDnsOptions.html#getUseStaleOnNameNotResolved()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/http/DnsOptions.StaleDnsOptions.html#getMaxExpiredDelay()"/>
             /// </summary>
-            public int UseStaleOnNameNotResolved
+            /// <returns><see cref="Java.Time.Duration"/></returns>
+            public Java.Time.Duration GetMaxExpiredDelay()
             {
-                get { return IExecuteWithSignature<int>("getUseStaleOnNameNotResolved", "()I"); }
+                return IExecuteWithSignature<Java.Time.Duration>("getMaxExpiredDelay", "()Ljava/time/Duration;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/HeaderBlock.cs b/src/net/Netdroid/Generated/Android/Net/Http/HeaderBlock.cs
index 13ed313c5..1cf33380a 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/HeaderBlock.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/HeaderBlock.cs
@@ -46,18 +46,20 @@ public partial class HeaderBlock
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/HeaderBlock.html#getAsList()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/HeaderBlock.html#getAsList()"/>
         /// </summary>
-        public Java.Util.List<Java.Util.Map.Entry<Java.Lang.String, Java.Lang.String>> AsList
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Util.Map.Entry<Java.Lang.String, Java.Lang.String>> GetAsList()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Util.Map.Entry<Java.Lang.String, Java.Lang.String>>>("getAsList", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Util.Map.Entry<Java.Lang.String, Java.Lang.String>>>("getAsList", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/HeaderBlock.html#getAsMap()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/HeaderBlock.html#getAsMap()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> AsMap
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> GetAsMap()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getAsMap", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getAsMap", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/HttpEngine.cs b/src/net/Netdroid/Generated/Android/Net/Http/HttpEngine.cs
index 7317956c1..01c965b83 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/HttpEngine.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/HttpEngine.cs
@@ -42,11 +42,12 @@ public partial class HttpEngine
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/HttpEngine.html#getVersionString()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/HttpEngine.html#getVersionString()"/>
         /// </summary>
-        public static Java.Lang.String VersionString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetVersionString()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getVersionString", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getVersionString", "()Ljava/lang/String;");
         }
 
         #endregion
@@ -164,13 +165,6 @@ public Builder(Android.Content.Context arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/HttpEngine.Builder.html#getDefaultUserAgent()"/> 
-            /// </summary>
-            public Java.Lang.String DefaultUserAgent
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDefaultUserAgent", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/http/HttpEngine.Builder.html#build()"/>
             /// </summary>
             /// <returns><see cref="Android.Net.Http.HttpEngine"/></returns>
@@ -292,6 +286,14 @@ public Android.Net.Http.HttpEngine.Builder SetUserAgent(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Net.Http.HttpEngine.Builder>("setUserAgent", "(Ljava/lang/String;)Landroid/net/http/HttpEngine$Builder;", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/http/HttpEngine.Builder.html#getDefaultUserAgent()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDefaultUserAgent()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getDefaultUserAgent", "()Ljava/lang/String;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/HttpResponseCache.cs b/src/net/Netdroid/Generated/Android/Net/Http/HttpResponseCache.cs
index 54ee9f537..4a602daf9 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/HttpResponseCache.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/HttpResponseCache.cs
@@ -46,11 +46,12 @@ public partial class HttpResponseCache
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#getInstalled()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#getInstalled()"/>
         /// </summary>
-        public static Android.Net.Http.HttpResponseCache Installed
+        /// <returns><see cref="Android.Net.Http.HttpResponseCache"/></returns>
+        public static Android.Net.Http.HttpResponseCache GetInstalled()
         {
-            get { return SExecuteWithSignature<Android.Net.Http.HttpResponseCache>(LocalBridgeClazz, "getInstalled", "()Landroid/net/http/HttpResponseCache;"); }
+            return SExecuteWithSignature<Android.Net.Http.HttpResponseCache>(LocalBridgeClazz, "getInstalled", "()Landroid/net/http/HttpResponseCache;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#install(java.io.File,long)"/>
@@ -68,25 +69,28 @@ public static Android.Net.Http.HttpResponseCache Install(Java.Io.File arg0, long
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#getHitCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#getHitCount()"/>
         /// </summary>
-        public int HitCount
+        /// <returns><see cref="int"/></returns>
+        public int GetHitCount()
         {
-            get { return IExecuteWithSignature<int>("getHitCount", "()I"); }
+            return IExecuteWithSignature<int>("getHitCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#getNetworkCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#getNetworkCount()"/>
         /// </summary>
-        public int NetworkCount
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkCount()
         {
-            get { return IExecuteWithSignature<int>("getNetworkCount", "()I"); }
+            return IExecuteWithSignature<int>("getNetworkCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#getRequestCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#getRequestCount()"/>
         /// </summary>
-        public int RequestCount
+        /// <returns><see cref="int"/></returns>
+        public int GetRequestCount()
         {
-            get { return IExecuteWithSignature<int>("getRequestCount", "()I"); }
+            return IExecuteWithSignature<int>("getRequestCount", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/HttpResponseCache.html#maxSize()"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/QuicOptions.cs b/src/net/Netdroid/Generated/Android/Net/Http/QuicOptions.cs
index 396f853a0..b6d72751a 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/QuicOptions.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/QuicOptions.cs
@@ -46,40 +46,44 @@ public partial class QuicOptions
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#getAllowedQuicHosts()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#hasInMemoryServerConfigsCacheSize()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> AllowedQuicHosts
+        /// <returns><see cref="bool"/></returns>
+        public bool HasInMemoryServerConfigsCacheSize()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAllowedQuicHosts", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<bool>("hasInMemoryServerConfigsCacheSize", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#getHandshakeUserAgent()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#getInMemoryServerConfigsCacheSize()"/>
         /// </summary>
-        public Java.Lang.String HandshakeUserAgent
+        /// <returns><see cref="int"/></returns>
+        public int GetInMemoryServerConfigsCacheSize()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHandshakeUserAgent", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getInMemoryServerConfigsCacheSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#getIdleConnectionTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#getHandshakeUserAgent()"/>
         /// </summary>
-        public Java.Time.Duration IdleConnectionTimeout
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHandshakeUserAgent()
         {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getIdleConnectionTimeout", "()Ljava/time/Duration;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHandshakeUserAgent", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#getInMemoryServerConfigsCacheSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#getIdleConnectionTimeout()"/>
         /// </summary>
-        public int InMemoryServerConfigsCacheSize
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetIdleConnectionTimeout()
         {
-            get { return IExecuteWithSignature<int>("getInMemoryServerConfigsCacheSize", "()I"); }
+            return IExecuteWithSignature<Java.Time.Duration>("getIdleConnectionTimeout", "()Ljava/time/Duration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#hasInMemoryServerConfigsCacheSize()"/>
+        /// <see href="https://developer.android.com/reference/android/net/http/QuicOptions.html#getAllowedQuicHosts()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasInMemoryServerConfigsCacheSize()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetAllowedQuicHosts()
         {
-            return IExecuteWithSignature<bool>("hasInMemoryServerConfigsCacheSize", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAllowedQuicHosts", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/SslCertificate.cs b/src/net/Netdroid/Generated/Android/Net/Http/SslCertificate.cs
index a449d314a..42712a20b 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/SslCertificate.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/SslCertificate.cs
@@ -36,7 +36,7 @@ public partial class SslCertificate
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SslCertificate(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -48,7 +48,7 @@ public SslCertificate(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.St
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Util.Date"/></param>
         /// <param name="arg3"><see cref="Java.Util.Date"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SslCertificate(Java.Lang.String arg0, Java.Lang.String arg1, Java.Util.Date arg2, Java.Util.Date arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -96,55 +96,62 @@ public static Android.Os.Bundle SaveState(Android.Net.Http.SslCertificate arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getIssuedBy()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getIssuedBy()"/>
         /// </summary>
-        public Android.Net.Http.SslCertificate.DName IssuedBy
+        /// <returns><see cref="Android.Net.Http.SslCertificate.DName"/></returns>
+        public Android.Net.Http.SslCertificate.DName GetIssuedBy()
         {
-            get { return IExecuteWithSignature<Android.Net.Http.SslCertificate.DName>("getIssuedBy", "()Landroid/net/http/SslCertificate$DName;"); }
+            return IExecuteWithSignature<Android.Net.Http.SslCertificate.DName>("getIssuedBy", "()Landroid/net/http/SslCertificate$DName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getIssuedTo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getIssuedTo()"/>
         /// </summary>
-        public Android.Net.Http.SslCertificate.DName IssuedTo
+        /// <returns><see cref="Android.Net.Http.SslCertificate.DName"/></returns>
+        public Android.Net.Http.SslCertificate.DName GetIssuedTo()
         {
-            get { return IExecuteWithSignature<Android.Net.Http.SslCertificate.DName>("getIssuedTo", "()Landroid/net/http/SslCertificate$DName;"); }
+            return IExecuteWithSignature<Android.Net.Http.SslCertificate.DName>("getIssuedTo", "()Landroid/net/http/SslCertificate$DName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getValidNotAfter()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getValidNotAfter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String ValidNotAfter
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetValidNotAfter()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValidNotAfter", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getValidNotAfter", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getValidNotAfterDate()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getValidNotBefore()"/>
         /// </summary>
-        public Java.Util.Date ValidNotAfterDate
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetValidNotBefore()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getValidNotAfterDate", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getValidNotBefore", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getValidNotBefore()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getX509Certificate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String ValidNotBefore
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetX509Certificate()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValidNotBefore", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getX509Certificate", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getValidNotBeforeDate()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getValidNotAfterDate()"/>
         /// </summary>
-        public Java.Util.Date ValidNotBeforeDate
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetValidNotAfterDate()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getValidNotBeforeDate", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getValidNotAfterDate", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getX509Certificate()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.html#getValidNotBeforeDate()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate X509Certificate
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetValidNotBeforeDate()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getX509Certificate", "()Ljava/security/cert/X509Certificate;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getValidNotBeforeDate", "()Ljava/util/Date;");
         }
 
         #endregion
@@ -180,32 +187,36 @@ public DName(Android.Net.Http.SslCertificate arg0, Java.Lang.String arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.DName.html#getCName()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.DName.html#getCName()"/>
             /// </summary>
-            public Java.Lang.String CName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getCName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.DName.html#getDName()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.DName.html#getDName()"/>
             /// </summary>
-            public Java.Lang.String GetDName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getDName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.DName.html#getOName()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.DName.html#getOName()"/>
             /// </summary>
-            public Java.Lang.String OName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetOName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getOName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getOName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.DName.html#getUName()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/http/SslCertificate.DName.html#getUName()"/>
             /// </summary>
-            public Java.Lang.String UName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetUName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getUName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getUName", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/SslError.cs b/src/net/Netdroid/Generated/Android/Net/Http/SslError.cs
index 4289a70a7..053b57f85 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/SslError.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/SslError.cs
@@ -44,7 +44,7 @@ public SslError(int arg0, Android.Net.Http.SslCertificate arg1, Java.Lang.String
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Net.Http.SslCertificate"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SslError(int arg0, Android.Net.Http.SslCertificate arg1)
             : base(arg0, arg1)
         {
@@ -64,7 +64,7 @@ public SslError(int arg0, Java.Security.Cert.X509Certificate arg1, Java.Lang.Str
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.X509Certificate"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SslError(int arg0, Java.Security.Cert.X509Certificate arg1)
             : base(arg0, arg1)
         {
@@ -104,7 +104,7 @@ public SslError(int arg0, Java.Security.Cert.X509Certificate arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/SslError.html#SSL_MAX_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SSL_MAX_ERROR { get { if (!_SSL_MAX_ERRORReady) { _SSL_MAX_ERRORContent = SGetField<int>(LocalBridgeClazz, "SSL_MAX_ERROR"); _SSL_MAX_ERRORReady = true; } return _SSL_MAX_ERRORContent; } }
         private static int _SSL_MAX_ERRORContent = default;
         private static bool _SSL_MAX_ERRORReady = false; // this is used because in case of generics 
@@ -129,25 +129,12 @@ public SslError(int arg0, Java.Security.Cert.X509Certificate arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslError.html#getCertificate()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/SslError.html#getCertificate()"/>
         /// </summary>
-        public Android.Net.Http.SslCertificate Certificate
+        /// <returns><see cref="Android.Net.Http.SslCertificate"/></returns>
+        public Android.Net.Http.SslCertificate GetCertificate()
         {
-            get { return IExecuteWithSignature<Android.Net.Http.SslCertificate>("getCertificate", "()Landroid/net/http/SslCertificate;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslError.html#getPrimaryError()"/> 
-        /// </summary>
-        public int PrimaryError
-        {
-            get { return IExecuteWithSignature<int>("getPrimaryError", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/SslError.html#getUrl()"/> 
-        /// </summary>
-        public Java.Lang.String Url
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Http.SslCertificate>("getCertificate", "()Landroid/net/http/SslCertificate;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/SslError.html#addError(int)"/>
@@ -167,6 +154,22 @@ public bool HasError(int arg0)
         {
             return IExecuteWithSignature<bool>("hasError", "(I)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/SslError.html#getPrimaryError()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPrimaryError()
+        {
+            return IExecuteWithSignature<int>("getPrimaryError", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/SslError.html#getUrl()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUrl()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/UploadDataProvider.cs b/src/net/Netdroid/Generated/Android/Net/Http/UploadDataProvider.cs
index de308b0cc..4547b7413 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/UploadDataProvider.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/UploadDataProvider.cs
@@ -46,11 +46,13 @@ public partial class UploadDataProvider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UploadDataProvider.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UploadDataProvider.html#getLength()"/>
         /// </summary>
-        public long Length
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public long GetLength()
         {
-            get { return IExecuteWithSignature<long>("getLength", "()J"); }
+            return IExecuteWithSignature<long>("getLength", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/UploadDataProvider.html#read(android.net.http.UploadDataSink,java.nio.ByteBuffer)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/UrlRequest.cs b/src/net/Netdroid/Generated/Android/Net/Http/UrlRequest.cs
index 0883150a4..4143e2537 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/UrlRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/UrlRequest.cs
@@ -76,39 +76,12 @@ public partial class UrlRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getHeaders()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getHeaders()"/>
         /// </summary>
-        public Android.Net.Http.HeaderBlock Headers
+        /// <returns><see cref="Android.Net.Http.HeaderBlock"/></returns>
+        public Android.Net.Http.HeaderBlock GetHeaders()
         {
-            get { return IExecuteWithSignature<Android.Net.Http.HeaderBlock>("getHeaders", "()Landroid/net/http/HeaderBlock;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getHttpMethod()"/> 
-        /// </summary>
-        public Java.Lang.String HttpMethod
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHttpMethod", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getPriority()"/> 
-        /// </summary>
-        public int Priority
-        {
-            get { return IExecuteWithSignature<int>("getPriority", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getTrafficStatsTag()"/> 
-        /// </summary>
-        public int TrafficStatsTag
-        {
-            get { return IExecuteWithSignature<int>("getTrafficStatsTag", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getTrafficStatsUid()"/> 
-        /// </summary>
-        public int TrafficStatsUid
-        {
-            get { return IExecuteWithSignature<int>("getTrafficStatsUid", "()I"); }
+            return IExecuteWithSignature<Android.Net.Http.HeaderBlock>("getHeaders", "()Landroid/net/http/HeaderBlock;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#hasTrafficStatsTag()"/>
@@ -151,6 +124,38 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getPriority()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPriority()
+        {
+            return IExecuteWithSignature<int>("getPriority", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getTrafficStatsTag()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTrafficStatsTag()
+        {
+            return IExecuteWithSignature<int>("getTrafficStatsTag", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getTrafficStatsUid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTrafficStatsUid()
+        {
+            return IExecuteWithSignature<int>("getTrafficStatsUid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#getHttpMethod()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHttpMethod()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getHttpMethod", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/http/UrlRequest.html#cancel()"/>
         /// </summary>
         public void Cancel()
@@ -556,7 +561,7 @@ public partial class StatusListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onStatus", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnStatusEventHandler));
+                AddEventHandler("onStatus", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnStatusEventHandler));
 
             }
 
@@ -564,7 +569,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/http/UrlRequest.StatusListener.html#onStatus(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnStatus"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnStatus { get; set; } = null;
+            public global::System.Action<int> OnOnStatus { get; set; } = null;
 
             void OnStatusEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Net/Http/UrlResponseInfo.cs b/src/net/Netdroid/Generated/Android/Net/Http/UrlResponseInfo.cs
index 970ec24bf..c758fe184 100644
--- a/src/net/Netdroid/Generated/Android/Net/Http/UrlResponseInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Http/UrlResponseInfo.cs
@@ -46,61 +46,68 @@ public partial class UrlResponseInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getHeaders()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getHeaders()"/>
         /// </summary>
-        public Android.Net.Http.HeaderBlock Headers
+        /// <returns><see cref="Android.Net.Http.HeaderBlock"/></returns>
+        public Android.Net.Http.HeaderBlock GetHeaders()
         {
-            get { return IExecuteWithSignature<Android.Net.Http.HeaderBlock>("getHeaders", "()Landroid/net/http/HeaderBlock;"); }
+            return IExecuteWithSignature<Android.Net.Http.HeaderBlock>("getHeaders", "()Landroid/net/http/HeaderBlock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getHttpStatusCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#wasCached()"/>
         /// </summary>
-        public int HttpStatusCode
+        /// <returns><see cref="bool"/></returns>
+        public bool WasCached()
         {
-            get { return IExecuteWithSignature<int>("getHttpStatusCode", "()I"); }
+            return IExecuteWithSignature<bool>("wasCached", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getHttpStatusText()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getHttpStatusCode()"/>
         /// </summary>
-        public Java.Lang.String HttpStatusText
+        /// <returns><see cref="int"/></returns>
+        public int GetHttpStatusCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHttpStatusText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getHttpStatusCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getNegotiatedProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getHttpStatusText()"/>
         /// </summary>
-        public Java.Lang.String NegotiatedProtocol
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHttpStatusText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNegotiatedProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHttpStatusText", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getReceivedByteCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getNegotiatedProtocol()"/>
         /// </summary>
-        public long ReceivedByteCount
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNegotiatedProtocol()
         {
-            get { return IExecuteWithSignature<long>("getReceivedByteCount", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNegotiatedProtocol", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getUrl()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getUrl()"/>
         /// </summary>
-        public Java.Lang.String Url
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUrl()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getUrlChain()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getUrlChain()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> UrlChain
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetUrlChain()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getUrlChain", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getUrlChain", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#wasCached()"/>
+        /// <see href="https://developer.android.com/reference/android/net/http/UrlResponseInfo.html#getReceivedByteCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool WasCached()
+        /// <returns><see cref="long"/></returns>
+        public long GetReceivedByteCount()
         {
-            return IExecuteWithSignature<bool>("wasCached", "()Z");
+            return IExecuteWithSignature<long>("getReceivedByteCount", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ikev2VpnProfile.cs b/src/net/Netdroid/Generated/Android/Net/Ikev2VpnProfile.cs
index 19b5ccda7..c069735c3 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ikev2VpnProfile.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ikev2VpnProfile.cs
@@ -46,120 +46,132 @@ public partial class Ikev2VpnProfile
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getAllowedAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getIkeTunnelConnectionParams()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> AllowedAlgorithms
+        /// <returns><see cref="Android.Net.Ipsec.Ike.IkeTunnelConnectionParams"/></returns>
+        public Android.Net.Ipsec.Ike.IkeTunnelConnectionParams GetIkeTunnelConnectionParams()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAllowedAlgorithms", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeTunnelConnectionParams>("getIkeTunnelConnectionParams", "()Landroid/net/ipsec/ike/IkeTunnelConnectionParams;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getIkeTunnelConnectionParams()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getProxyInfo()"/>
         /// </summary>
-        public Android.Net.Ipsec.Ike.IkeTunnelConnectionParams IkeTunnelConnectionParams
+        /// <returns><see cref="Android.Net.ProxyInfo"/></returns>
+        public Android.Net.ProxyInfo GetProxyInfo()
         {
-            get { return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeTunnelConnectionParams>("getIkeTunnelConnectionParams", "()Landroid/net/ipsec/ike/IkeTunnelConnectionParams;"); }
+            return IExecuteWithSignature<Android.Net.ProxyInfo>("getProxyInfo", "()Landroid/net/ProxyInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getMaxMtu()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#isAutomaticIpVersionSelectionEnabled()"/>
         /// </summary>
-        public int MaxMtu
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAutomaticIpVersionSelectionEnabled()
         {
-            get { return IExecuteWithSignature<int>("getMaxMtu", "()I"); }
+            return IExecuteWithSignature<bool>("isAutomaticIpVersionSelectionEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getPassword()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#isAutomaticNattKeepaliveTimerEnabled()"/>
         /// </summary>
-        public Java.Lang.String Password
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAutomaticNattKeepaliveTimerEnabled()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isAutomaticNattKeepaliveTimerEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getPresharedKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#isBypassable()"/>
         /// </summary>
-        public byte[] PresharedKey
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBypassable()
         {
-            get { return IExecuteWithSignatureArray<byte>("getPresharedKey", "()[B"); }
+            return IExecuteWithSignature<bool>("isBypassable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getProxyInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#isMetered()"/>
         /// </summary>
-        public Android.Net.ProxyInfo ProxyInfo
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMetered()
         {
-            get { return IExecuteWithSignature<Android.Net.ProxyInfo>("getProxyInfo", "()Landroid/net/ProxyInfo;"); }
+            return IExecuteWithSignature<bool>("isMetered", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getRsaPrivateKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getPresharedKey()"/>
         /// </summary>
-        public Java.Security.PrivateKey RsaPrivateKey
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetPresharedKey()
         {
-            get { return IExecuteWithSignature<Java.Security.PrivateKey>("getRsaPrivateKey", "()Ljava/security/PrivateKey;"); }
+            return IExecuteWithSignatureArray<byte>("getPresharedKey", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getServerAddr()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getMaxMtu()"/>
         /// </summary>
-        public Java.Lang.String ServerAddr
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxMtu()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServerAddr", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getMaxMtu", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getServerRootCaCert()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getPassword()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate ServerRootCaCert
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPassword()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getServerRootCaCert", "()Ljava/security/cert/X509Certificate;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getUserCert()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getServerAddr()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate UserCert
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServerAddr()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getUserCert", "()Ljava/security/cert/X509Certificate;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getServerAddr", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getUserIdentity()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getUserIdentity()"/>
         /// </summary>
-        public Java.Lang.String UserIdentity
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUserIdentity()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserIdentity", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUserIdentity", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getUsername()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getUsername()"/>
         /// </summary>
-        public Java.Lang.String Username
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUsername()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUsername", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUsername", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#isAutomaticIpVersionSelectionEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getServerRootCaCert()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAutomaticIpVersionSelectionEnabled()
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetServerRootCaCert()
         {
-            return IExecuteWithSignature<bool>("isAutomaticIpVersionSelectionEnabled", "()Z");
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getServerRootCaCert", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#isAutomaticNattKeepaliveTimerEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getUserCert()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAutomaticNattKeepaliveTimerEnabled()
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetUserCert()
         {
-            return IExecuteWithSignature<bool>("isAutomaticNattKeepaliveTimerEnabled", "()Z");
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getUserCert", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#isBypassable()"/>
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getRsaPrivateKey()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBypassable()
+        /// <returns><see cref="Java.Security.PrivateKey"/></returns>
+        public Java.Security.PrivateKey GetRsaPrivateKey()
         {
-            return IExecuteWithSignature<bool>("isBypassable", "()Z");
+            return IExecuteWithSignature<Java.Security.PrivateKey>("getRsaPrivateKey", "()Ljava/security/PrivateKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#isMetered()"/>
+        /// <see href="https://developer.android.com/reference/android/net/Ikev2VpnProfile.html#getAllowedAlgorithms()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMetered()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetAllowedAlgorithms()
         {
-            return IExecuteWithSignature<bool>("isMetered", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAllowedAlgorithms", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/IpConfiguration.cs b/src/net/Netdroid/Generated/Android/Net/IpConfiguration.cs
index 4b74cf664..d90227cdb 100644
--- a/src/net/Netdroid/Generated/Android/Net/IpConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Net/IpConfiguration.cs
@@ -52,18 +52,20 @@ public partial class IpConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpConfiguration.html#getHttpProxy()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpConfiguration.html#getHttpProxy()"/>
         /// </summary>
-        public Android.Net.ProxyInfo HttpProxy
+        /// <returns><see cref="Android.Net.ProxyInfo"/></returns>
+        public Android.Net.ProxyInfo GetHttpProxy()
         {
-            get { return IExecuteWithSignature<Android.Net.ProxyInfo>("getHttpProxy", "()Landroid/net/ProxyInfo;"); }
+            return IExecuteWithSignature<Android.Net.ProxyInfo>("getHttpProxy", "()Landroid/net/ProxyInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpConfiguration.html#getStaticIpConfiguration()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpConfiguration.html#getStaticIpConfiguration()"/>
         /// </summary>
-        public Android.Net.StaticIpConfiguration StaticIpConfiguration
+        /// <returns><see cref="Android.Net.StaticIpConfiguration"/></returns>
+        public Android.Net.StaticIpConfiguration GetStaticIpConfiguration()
         {
-            get { return IExecuteWithSignature<Android.Net.StaticIpConfiguration>("getStaticIpConfiguration", "()Landroid/net/StaticIpConfiguration;"); }
+            return IExecuteWithSignature<Android.Net.StaticIpConfiguration>("getStaticIpConfiguration", "()Landroid/net/StaticIpConfiguration;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/IpConfiguration.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/IpPrefix.cs b/src/net/Netdroid/Generated/Android/Net/IpPrefix.cs
index 1cc490d99..67ed12a7e 100644
--- a/src/net/Netdroid/Generated/Android/Net/IpPrefix.cs
+++ b/src/net/Netdroid/Generated/Android/Net/IpPrefix.cs
@@ -61,42 +61,45 @@ public IpPrefix(Java.Net.InetAddress arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#contains(java.net.InetAddress)"/>
         /// </summary>
-        public Java.Net.InetAddress Address
+        /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Contains(Java.Net.InetAddress arg0)
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<bool>("contains", "(Ljava/net/InetAddress;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#getPrefixLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#getRawAddress()"/>
         /// </summary>
-        public int PrefixLength
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetRawAddress()
         {
-            get { return IExecuteWithSignature<int>("getPrefixLength", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getRawAddress", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#getRawAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#describeContents()"/>
         /// </summary>
-        public byte[] RawAddress
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<byte>("getRawAddress", "()[B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#contains(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#getPrefixLength()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Contains(Java.Net.InetAddress arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPrefixLength()
         {
-            return IExecuteWithSignature<bool>("contains", "(Ljava/net/InetAddress;)Z", arg0);
+            return IExecuteWithSignature<int>("getPrefixLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#getAddress()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetAddress()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/IpPrefix.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/IpSecAlgorithm.cs b/src/net/Netdroid/Generated/Android/Net/IpSecAlgorithm.cs
index 9982e281b..0047a74e2 100644
--- a/src/net/Netdroid/Generated/Android/Net/IpSecAlgorithm.cs
+++ b/src/net/Netdroid/Generated/Android/Net/IpSecAlgorithm.cs
@@ -133,44 +133,48 @@ public IpSecAlgorithm(Java.Lang.String arg0, byte[] arg1)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#getSupportedAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#getSupportedAlgorithms()"/>
         /// </summary>
-        public static Java.Util.Set<Java.Lang.String> SupportedAlgorithms
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.String> GetSupportedAlgorithms()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getSupportedAlgorithms", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getSupportedAlgorithms", "()Ljava/util/Set;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#getKey()"/>
         /// </summary>
-        public byte[] Key
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetKey()
         {
-            get { return IExecuteWithSignatureArray<byte>("getKey", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getKey", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#getTruncationLengthBits()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#getTruncationLengthBits()"/>
         /// </summary>
-        public int TruncationLengthBits
+        /// <returns><see cref="int"/></returns>
+        public int GetTruncationLengthBits()
         {
-            get { return IExecuteWithSignature<int>("getTruncationLengthBits", "()I"); }
+            return IExecuteWithSignature<int>("getTruncationLengthBits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/IpSecAlgorithm.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/IpSecManager.cs b/src/net/Netdroid/Generated/Android/Net/IpSecManager.cs
index 5ac9ad826..f4f1df169 100644
--- a/src/net/Netdroid/Generated/Android/Net/IpSecManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/IpSecManager.cs
@@ -216,11 +216,12 @@ public partial class SecurityParameterIndex
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/IpSecManager.SecurityParameterIndex.html#getSpi()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/IpSecManager.SecurityParameterIndex.html#getSpi()"/>
             /// </summary>
-            public int Spi
+            /// <returns><see cref="int"/></returns>
+            public int GetSpi()
             {
-                get { return IExecuteWithSignature<int>("getSpi", "()I"); }
+                return IExecuteWithSignature<int>("getSpi", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/IpSecManager.SecurityParameterIndex.html#close()"/>
@@ -292,18 +293,20 @@ public partial class UdpEncapsulationSocket
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/IpSecManager.UdpEncapsulationSocket.html#getFileDescriptor()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/IpSecManager.UdpEncapsulationSocket.html#getPort()"/>
             /// </summary>
-            public Java.Io.FileDescriptor FileDescriptor
+            /// <returns><see cref="int"/></returns>
+            public int GetPort()
             {
-                get { return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;"); }
+                return IExecuteWithSignature<int>("getPort", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/IpSecManager.UdpEncapsulationSocket.html#getPort()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/IpSecManager.UdpEncapsulationSocket.html#getFileDescriptor()"/>
             /// </summary>
-            public int Port
+            /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+            public Java.Io.FileDescriptor GetFileDescriptor()
             {
-                get { return IExecuteWithSignature<int>("getPort", "()I"); }
+                return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/IpSecManager.UdpEncapsulationSocket.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/AllPackageClasses.cs
index 3bae2e2a8..2aa5c7422 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/AllPackageClasses.cs
@@ -124,12 +124,12 @@ public partial class ChildSessionCallback : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ChildSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChildSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChildSessionCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ChildSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChildSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChildSessionCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,12 +258,12 @@ public partial class ChildSessionParams : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ChildSessionParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChildSessionParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChildSessionParams() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ChildSessionParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChildSessionParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChildSessionParams(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -392,12 +392,12 @@ public partial class IkeIdentification : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IkeIdentification class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IkeIdentification class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IkeIdentification() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IkeIdentification class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IkeIdentification class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IkeIdentification(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -746,12 +746,12 @@ public partial class IkeSessionCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IkeSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IkeSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IkeSessionCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IkeSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IkeSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IkeSessionCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1008,12 +1008,12 @@ public partial class IkeAuthConfig : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ike
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("IkeAuthConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IkeAuthConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IkeAuthConfig() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("IkeAuthConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IkeAuthConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IkeAuthConfig(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1322,12 +1322,12 @@ public partial class SaProposal : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SaProp
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SaProposal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SaProposal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SaProposal() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SaProposal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SaProposal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SaProposal(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1540,12 +1540,12 @@ public partial class ConfigRequestIpv4Address : Android.Net.Ipsec.Ike.TunnelMode
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConfigRequestIpv4Address class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv4Address class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv4Address() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConfigRequestIpv4Address class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv4Address class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv4Address(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1586,12 +1586,12 @@ public partial class ConfigRequestIpv4DhcpServer : Android.Net.Ipsec.Ike.TunnelM
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConfigRequestIpv4DhcpServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv4DhcpServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv4DhcpServer() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConfigRequestIpv4DhcpServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv4DhcpServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv4DhcpServer(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1632,12 +1632,12 @@ public partial class ConfigRequestIpv4DnsServer : Android.Net.Ipsec.Ike.TunnelMo
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConfigRequestIpv4DnsServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv4DnsServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv4DnsServer() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConfigRequestIpv4DnsServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv4DnsServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv4DnsServer(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1678,12 +1678,12 @@ public partial class ConfigRequestIpv4Netmask : Android.Net.Ipsec.Ike.TunnelMode
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConfigRequestIpv4Netmask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv4Netmask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv4Netmask() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConfigRequestIpv4Netmask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv4Netmask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv4Netmask(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1724,12 +1724,12 @@ public partial class ConfigRequestIpv6Address : Android.Net.Ipsec.Ike.TunnelMode
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConfigRequestIpv6Address class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv6Address class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv6Address() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConfigRequestIpv6Address class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv6Address class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv6Address(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1770,12 +1770,12 @@ public partial class ConfigRequestIpv6DnsServer : Android.Net.Ipsec.Ike.TunnelMo
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ConfigRequestIpv6DnsServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv6DnsServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv6DnsServer() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ConfigRequestIpv6DnsServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ConfigRequestIpv6DnsServer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ConfigRequestIpv6DnsServer(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1816,12 +1816,12 @@ public partial class TunnelModeChildConfigRequest : MASES.JCOBridge.C2JBridge.JV
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TunnelModeChildConfigRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TunnelModeChildConfigRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TunnelModeChildConfigRequest() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TunnelModeChildConfigRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TunnelModeChildConfigRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TunnelModeChildConfigRequest(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSaProposal.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSaProposal.cs
index 8a9b8ca58..01cb9339e 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSaProposal.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSaProposal.cs
@@ -42,18 +42,20 @@ public partial class ChildSaProposal
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSaProposal.html#getSupportedEncryptionAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSaProposal.html#getSupportedEncryptionAlgorithms()"/>
         /// </summary>
-        public static Java.Util.Set<Java.Lang.Integer> SupportedEncryptionAlgorithms
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.Integer> GetSupportedEncryptionAlgorithms()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedEncryptionAlgorithms", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedEncryptionAlgorithms", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSaProposal.html#getSupportedIntegrityAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSaProposal.html#getSupportedIntegrityAlgorithms()"/>
         /// </summary>
-        public static Java.Util.Set<Java.Lang.Integer> SupportedIntegrityAlgorithms
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.Integer> GetSupportedIntegrityAlgorithms()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedIntegrityAlgorithms", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedIntegrityAlgorithms", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSessionConfiguration.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSessionConfiguration.cs
index 641a0eb52..8106160f9 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSessionConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSessionConfiguration.cs
@@ -46,18 +46,20 @@ public partial class ChildSessionConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionConfiguration.html#getInboundTrafficSelectors()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionConfiguration.html#getInboundTrafficSelectors()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector> InboundTrafficSelectors
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector> GetInboundTrafficSelectors()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector>>("getInboundTrafficSelectors", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector>>("getInboundTrafficSelectors", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionConfiguration.html#getOutboundTrafficSelectors()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionConfiguration.html#getOutboundTrafficSelectors()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector> OutboundTrafficSelectors
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector> GetOutboundTrafficSelectors()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector>>("getOutboundTrafficSelectors", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector>>("getOutboundTrafficSelectors", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSessionParams.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSessionParams.cs
index 2f11806b1..25be2621a 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSessionParams.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/ChildSessionParams.cs
@@ -46,39 +46,44 @@ public partial class ChildSessionParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getChildSaProposals()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getHardLifetimeSeconds()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Ipsec.Ike.ChildSaProposal> ChildSaProposals
+        /// <returns><see cref="int"/></returns>
+        public int GetHardLifetimeSeconds()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.ChildSaProposal>>("getChildSaProposals", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getHardLifetimeSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getHardLifetimeSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getSoftLifetimeSeconds()"/>
         /// </summary>
-        public int HardLifetimeSeconds
+        /// <returns><see cref="int"/></returns>
+        public int GetSoftLifetimeSeconds()
         {
-            get { return IExecuteWithSignature<int>("getHardLifetimeSeconds", "()I"); }
+            return IExecuteWithSignature<int>("getSoftLifetimeSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getInboundTrafficSelectors()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getChildSaProposals()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector> InboundTrafficSelectors
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Ipsec.Ike.ChildSaProposal> GetChildSaProposals()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector>>("getInboundTrafficSelectors", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.ChildSaProposal>>("getChildSaProposals", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getOutboundTrafficSelectors()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getInboundTrafficSelectors()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector> OutboundTrafficSelectors
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector> GetInboundTrafficSelectors()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector>>("getOutboundTrafficSelectors", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector>>("getInboundTrafficSelectors", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getSoftLifetimeSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/ChildSessionParams.html#getOutboundTrafficSelectors()"/>
         /// </summary>
-        public int SoftLifetimeSeconds
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector> GetOutboundTrafficSelectors()
         {
-            get { return IExecuteWithSignature<int>("getSoftLifetimeSeconds", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeTrafficSelector>>("getOutboundTrafficSelectors", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSaProposal.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSaProposal.cs
index 78d0be46b..b6c7680bf 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSaProposal.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSaProposal.cs
@@ -42,36 +42,40 @@ public partial class IkeSaProposal
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSaProposal.html#getSupportedEncryptionAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSaProposal.html#getSupportedEncryptionAlgorithms()"/>
         /// </summary>
-        public static Java.Util.Set<Java.Lang.Integer> SupportedEncryptionAlgorithms
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.Integer> GetSupportedEncryptionAlgorithms()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedEncryptionAlgorithms", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedEncryptionAlgorithms", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSaProposal.html#getSupportedIntegrityAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSaProposal.html#getSupportedIntegrityAlgorithms()"/>
         /// </summary>
-        public static Java.Util.Set<Java.Lang.Integer> SupportedIntegrityAlgorithms
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.Integer> GetSupportedIntegrityAlgorithms()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedIntegrityAlgorithms", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedIntegrityAlgorithms", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSaProposal.html#getSupportedPseudorandomFunctions()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSaProposal.html#getSupportedPseudorandomFunctions()"/>
         /// </summary>
-        public static Java.Util.Set<Java.Lang.Integer> SupportedPseudorandomFunctions
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.Integer> GetSupportedPseudorandomFunctions()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedPseudorandomFunctions", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedPseudorandomFunctions", "()Ljava/util/Set;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSaProposal.html#getPseudorandomFunctions()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSaProposal.html#getPseudorandomFunctions()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.Integer> PseudorandomFunctions
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetPseudorandomFunctions()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getPseudorandomFunctions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getPseudorandomFunctions", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionConfiguration.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionConfiguration.cs
index 6fd3ef79d..b0345ca50 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionConfiguration.cs
@@ -58,41 +58,45 @@ public partial class IkeSessionConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#getEapInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#getEapInfo()"/>
         /// </summary>
-        public Android.Net.Eap.EapInfo EapInfo
+        /// <returns><see cref="Android.Net.Eap.EapInfo"/></returns>
+        public Android.Net.Eap.EapInfo GetEapInfo()
         {
-            get { return IExecuteWithSignature<Android.Net.Eap.EapInfo>("getEapInfo", "()Landroid/net/eap/EapInfo;"); }
+            return IExecuteWithSignature<Android.Net.Eap.EapInfo>("getEapInfo", "()Landroid/net/eap/EapInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#getIkeSessionConnectionInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#getIkeSessionConnectionInfo()"/>
         /// </summary>
-        public Android.Net.Ipsec.Ike.IkeSessionConnectionInfo IkeSessionConnectionInfo
+        /// <returns><see cref="Android.Net.Ipsec.Ike.IkeSessionConnectionInfo"/></returns>
+        public Android.Net.Ipsec.Ike.IkeSessionConnectionInfo GetIkeSessionConnectionInfo()
         {
-            get { return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeSessionConnectionInfo>("getIkeSessionConnectionInfo", "()Landroid/net/ipsec/ike/IkeSessionConnectionInfo;"); }
+            return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeSessionConnectionInfo>("getIkeSessionConnectionInfo", "()Landroid/net/ipsec/ike/IkeSessionConnectionInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#getRemoteApplicationVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#isIkeExtensionEnabled(int)"/>
         /// </summary>
-        public Java.Lang.String RemoteApplicationVersion
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsIkeExtensionEnabled(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRemoteApplicationVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isIkeExtensionEnabled", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#getRemoteVendorIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#getRemoteApplicationVersion()"/>
         /// </summary>
-        public Java.Util.List<byte[]> RemoteVendorIds
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRemoteApplicationVersion()
         {
-            get { return IExecuteWithSignature<Java.Util.List<byte[]>>("getRemoteVendorIds", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRemoteApplicationVersion", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#isIkeExtensionEnabled(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConfiguration.html#getRemoteVendorIds()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsIkeExtensionEnabled(int arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<byte[]> GetRemoteVendorIds()
         {
-            return IExecuteWithSignature<bool>("isIkeExtensionEnabled", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Util.List<byte[]>>("getRemoteVendorIds", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionConnectionInfo.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionConnectionInfo.cs
index a3838fa4d..25f4be982 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionConnectionInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionConnectionInfo.cs
@@ -56,25 +56,28 @@ public IkeSessionConnectionInfo(Java.Net.InetAddress arg0, Java.Net.InetAddress
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConnectionInfo.html#getLocalAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConnectionInfo.html#getNetwork()"/>
         /// </summary>
-        public Java.Net.InetAddress LocalAddress
+        /// <returns><see cref="Android.Net.Network"/></returns>
+        public Android.Net.Network GetNetwork()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getLocalAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConnectionInfo.html#getNetwork()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConnectionInfo.html#getLocalAddress()"/>
         /// </summary>
-        public Android.Net.Network Network
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetLocalAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;"); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getLocalAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConnectionInfo.html#getRemoteAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionConnectionInfo.html#getRemoteAddress()"/>
         /// </summary>
-        public Java.Net.InetAddress RemoteAddress
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetRemoteAddress()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getRemoteAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getRemoteAddress", "()Ljava/net/InetAddress;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionParams.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionParams.cs
index c91bfced0..ac6c66759 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionParams.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeSessionParams.cs
@@ -76,97 +76,109 @@ public partial class IkeSessionParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getDpdDelaySeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getLocalIdentification()"/>
         /// </summary>
-        public int DpdDelaySeconds
+        /// <returns><see cref="Android.Net.Ipsec.Ike.IkeIdentification"/></returns>
+        public Android.Net.Ipsec.Ike.IkeIdentification GetLocalIdentification()
         {
-            get { return IExecuteWithSignature<int>("getDpdDelaySeconds", "()I"); }
+            return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeIdentification>("getLocalIdentification", "()Landroid/net/ipsec/ike/IkeIdentification;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getHardLifetimeSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getRemoteIdentification()"/>
         /// </summary>
-        public int HardLifetimeSeconds
+        /// <returns><see cref="Android.Net.Ipsec.Ike.IkeIdentification"/></returns>
+        public Android.Net.Ipsec.Ike.IkeIdentification GetRemoteIdentification()
         {
-            get { return IExecuteWithSignature<int>("getHardLifetimeSeconds", "()I"); }
+            return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeIdentification>("getRemoteIdentification", "()Landroid/net/ipsec/ike/IkeIdentification;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getIkeSaProposals()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getLocalAuthConfig()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Ipsec.Ike.IkeSaProposal> IkeSaProposals
+        /// <returns><see cref="Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig"/></returns>
+        public Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig GetLocalAuthConfig()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeSaProposal>>("getIkeSaProposals", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig>("getLocalAuthConfig", "()Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getLocalAuthConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getRemoteAuthConfig()"/>
         /// </summary>
-        public Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig LocalAuthConfig
+        /// <returns><see cref="Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig"/></returns>
+        public Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig GetRemoteAuthConfig()
         {
-            get { return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig>("getLocalAuthConfig", "()Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthConfig;"); }
+            return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig>("getRemoteAuthConfig", "()Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getLocalIdentification()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getNetwork()"/>
         /// </summary>
-        public Android.Net.Ipsec.Ike.IkeIdentification LocalIdentification
+        /// <returns><see cref="Android.Net.Network"/></returns>
+        public Android.Net.Network GetNetwork()
         {
-            get { return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeIdentification>("getLocalIdentification", "()Landroid/net/ipsec/ike/IkeIdentification;"); }
+            return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getNattKeepAliveDelaySeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#hasIkeOption(int)"/>
         /// </summary>
-        public int NattKeepAliveDelaySeconds
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool HasIkeOption(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getNattKeepAliveDelaySeconds", "()I"); }
+            return IExecuteWithSignature<bool>("hasIkeOption", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getNetwork()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getDpdDelaySeconds()"/>
         /// </summary>
-        public Android.Net.Network Network
+        /// <returns><see cref="int"/></returns>
+        public int GetDpdDelaySeconds()
         {
-            get { return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;"); }
+            return IExecuteWithSignature<int>("getDpdDelaySeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getRemoteAuthConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getHardLifetimeSeconds()"/>
         /// </summary>
-        public Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig RemoteAuthConfig
+        /// <returns><see cref="int"/></returns>
+        public int GetHardLifetimeSeconds()
         {
-            get { return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeSessionParams.IkeAuthConfig>("getRemoteAuthConfig", "()Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthConfig;"); }
+            return IExecuteWithSignature<int>("getHardLifetimeSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getRemoteIdentification()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getNattKeepAliveDelaySeconds()"/>
         /// </summary>
-        public Android.Net.Ipsec.Ike.IkeIdentification RemoteIdentification
+        /// <returns><see cref="int"/></returns>
+        public int GetNattKeepAliveDelaySeconds()
         {
-            get { return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeIdentification>("getRemoteIdentification", "()Landroid/net/ipsec/ike/IkeIdentification;"); }
+            return IExecuteWithSignature<int>("getNattKeepAliveDelaySeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getRetransmissionTimeoutsMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getSoftLifetimeSeconds()"/>
         /// </summary>
-        public int[] RetransmissionTimeoutsMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetSoftLifetimeSeconds()
         {
-            get { return IExecuteWithSignatureArray<int>("getRetransmissionTimeoutsMillis", "()[I"); }
+            return IExecuteWithSignature<int>("getSoftLifetimeSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getServerHostname()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getRetransmissionTimeoutsMillis()"/>
         /// </summary>
-        public Java.Lang.String ServerHostname
+        /// <returns><see cref="int"/></returns>
+        public int[] GetRetransmissionTimeoutsMillis()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServerHostname", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<int>("getRetransmissionTimeoutsMillis", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getSoftLifetimeSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getServerHostname()"/>
         /// </summary>
-        public int SoftLifetimeSeconds
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServerHostname()
         {
-            get { return IExecuteWithSignature<int>("getSoftLifetimeSeconds", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getServerHostname", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#hasIkeOption(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.html#getIkeSaProposals()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasIkeOption(int arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Ipsec.Ike.IkeSaProposal> GetIkeSaProposals()
         {
-            return IExecuteWithSignature<bool>("hasIkeOption", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.IkeSaProposal>>("getIkeSaProposals", "()Ljava/util/List;");
         }
 
         #endregion
@@ -413,25 +425,28 @@ public partial class IkeAuthDigitalSignLocalConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthDigitalSignLocalConfig.html#getClientEndCertificate()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthDigitalSignLocalConfig.html#getClientEndCertificate()"/>
             /// </summary>
-            public Java.Security.Cert.X509Certificate ClientEndCertificate
+            /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+            public Java.Security.Cert.X509Certificate GetClientEndCertificate()
             {
-                get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getClientEndCertificate", "()Ljava/security/cert/X509Certificate;"); }
+                return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getClientEndCertificate", "()Ljava/security/cert/X509Certificate;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthDigitalSignLocalConfig.html#getIntermediateCertificates()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthDigitalSignLocalConfig.html#getPrivateKey()"/>
             /// </summary>
-            public Java.Util.List<Java.Security.Cert.X509Certificate> IntermediateCertificates
+            /// <returns><see cref="Java.Security.PrivateKey"/></returns>
+            public Java.Security.PrivateKey GetPrivateKey()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.X509Certificate>>("getIntermediateCertificates", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Security.PrivateKey>("getPrivateKey", "()Ljava/security/PrivateKey;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthDigitalSignLocalConfig.html#getPrivateKey()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthDigitalSignLocalConfig.html#getIntermediateCertificates()"/>
             /// </summary>
-            public Java.Security.PrivateKey PrivateKey
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Java.Security.Cert.X509Certificate> GetIntermediateCertificates()
             {
-                get { return IExecuteWithSignature<Java.Security.PrivateKey>("getPrivateKey", "()Ljava/security/PrivateKey;"); }
+                return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.X509Certificate>>("getIntermediateCertificates", "()Ljava/util/List;");
             }
 
             #endregion
@@ -465,11 +480,12 @@ public partial class IkeAuthDigitalSignRemoteConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthDigitalSignRemoteConfig.html#getRemoteCaCert()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthDigitalSignRemoteConfig.html#getRemoteCaCert()"/>
             /// </summary>
-            public Java.Security.Cert.X509Certificate RemoteCaCert
+            /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+            public Java.Security.Cert.X509Certificate GetRemoteCaCert()
             {
-                get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getRemoteCaCert", "()Ljava/security/cert/X509Certificate;"); }
+                return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getRemoteCaCert", "()Ljava/security/cert/X509Certificate;");
             }
 
             #endregion
@@ -503,11 +519,12 @@ public partial class IkeAuthEapConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthEapConfig.html#getEapConfig()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthEapConfig.html#getEapConfig()"/>
             /// </summary>
-            public Android.Net.Eap.EapSessionConfig EapConfig
+            /// <returns><see cref="Android.Net.Eap.EapSessionConfig"/></returns>
+            public Android.Net.Eap.EapSessionConfig GetEapConfig()
             {
-                get { return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig>("getEapConfig", "()Landroid/net/eap/EapSessionConfig;"); }
+                return IExecuteWithSignature<Android.Net.Eap.EapSessionConfig>("getEapConfig", "()Landroid/net/eap/EapSessionConfig;");
             }
 
             #endregion
@@ -541,11 +558,12 @@ public partial class IkeAuthPskConfig
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthPskConfig.html#getPsk()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeSessionParams.IkeAuthPskConfig.html#getPsk()"/>
             /// </summary>
-            public byte[] Psk
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetPsk()
             {
-                get { return IExecuteWithSignatureArray<byte>("getPsk", "()[B"); }
+                return IExecuteWithSignatureArray<byte>("getPsk", "()[B");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeTunnelConnectionParams.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeTunnelConnectionParams.cs
index 3818b728a..f2c596301 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeTunnelConnectionParams.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/IkeTunnelConnectionParams.cs
@@ -55,18 +55,20 @@ public IkeTunnelConnectionParams(Android.Net.Ipsec.Ike.IkeSessionParams arg0, An
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeTunnelConnectionParams.html#getIkeSessionParams()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeTunnelConnectionParams.html#getIkeSessionParams()"/>
         /// </summary>
-        public Android.Net.Ipsec.Ike.IkeSessionParams IkeSessionParams
+        /// <returns><see cref="Android.Net.Ipsec.Ike.IkeSessionParams"/></returns>
+        public Android.Net.Ipsec.Ike.IkeSessionParams GetIkeSessionParams()
         {
-            get { return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeSessionParams>("getIkeSessionParams", "()Landroid/net/ipsec/ike/IkeSessionParams;"); }
+            return IExecuteWithSignature<Android.Net.Ipsec.Ike.IkeSessionParams>("getIkeSessionParams", "()Landroid/net/ipsec/ike/IkeSessionParams;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeTunnelConnectionParams.html#getTunnelModeChildSessionParams()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/IkeTunnelConnectionParams.html#getTunnelModeChildSessionParams()"/>
         /// </summary>
-        public Android.Net.Ipsec.Ike.TunnelModeChildSessionParams TunnelModeChildSessionParams
+        /// <returns><see cref="Android.Net.Ipsec.Ike.TunnelModeChildSessionParams"/></returns>
+        public Android.Net.Ipsec.Ike.TunnelModeChildSessionParams GetTunnelModeChildSessionParams()
         {
-            get { return IExecuteWithSignature<Android.Net.Ipsec.Ike.TunnelModeChildSessionParams>("getTunnelModeChildSessionParams", "()Landroid/net/ipsec/ike/TunnelModeChildSessionParams;"); }
+            return IExecuteWithSignature<Android.Net.Ipsec.Ike.TunnelModeChildSessionParams>("getTunnelModeChildSessionParams", "()Landroid/net/ipsec/ike/TunnelModeChildSessionParams;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/SaProposal.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/SaProposal.cs
index 5f6ea0880..7492728b3 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/SaProposal.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/SaProposal.cs
@@ -228,36 +228,40 @@ public partial class SaProposal
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/SaProposal.html#getSupportedDhGroups()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/SaProposal.html#getSupportedDhGroups()"/>
         /// </summary>
-        public static Java.Util.Set<Java.Lang.Integer> SupportedDhGroups
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.Integer> GetSupportedDhGroups()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedDhGroups", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>(LocalBridgeClazz, "getSupportedDhGroups", "()Ljava/util/Set;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/SaProposal.html#getDhGroups()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/SaProposal.html#getEncryptionAlgorithms()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.Integer> DhGroups
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Util.Pair<Java.Lang.Integer, Java.Lang.Integer>> GetEncryptionAlgorithms()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getDhGroups", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.Integer, Java.Lang.Integer>>>("getEncryptionAlgorithms", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/SaProposal.html#getEncryptionAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/SaProposal.html#getDhGroups()"/>
         /// </summary>
-        public Java.Util.List<Android.Util.Pair<Java.Lang.Integer, Java.Lang.Integer>> EncryptionAlgorithms
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetDhGroups()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.Integer, Java.Lang.Integer>>>("getEncryptionAlgorithms", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getDhGroups", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/SaProposal.html#getIntegrityAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/SaProposal.html#getIntegrityAlgorithms()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.Integer> IntegrityAlgorithms
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetIntegrityAlgorithms()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getIntegrityAlgorithms", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getIntegrityAlgorithms", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/TunnelModeChildSessionParams.cs b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/TunnelModeChildSessionParams.cs
index 5a18c724a..8c08063d7 100644
--- a/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/TunnelModeChildSessionParams.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Ipsec/Ike/TunnelModeChildSessionParams.cs
@@ -46,11 +46,12 @@ public partial class TunnelModeChildSessionParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/TunnelModeChildSessionParams.html#getConfigurationRequests()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/TunnelModeChildSessionParams.html#getConfigurationRequests()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Ipsec.Ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest> ConfigurationRequests
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Ipsec.Ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest> GetConfigurationRequests()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest>>("getConfigurationRequests", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Ipsec.Ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest>>("getConfigurationRequests", "()Ljava/util/List;");
         }
 
         #endregion
@@ -207,11 +208,12 @@ public partial class ConfigRequestIpv4Address
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/TunnelModeChildSessionParams.ConfigRequestIpv4Address.html#getAddress()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/TunnelModeChildSessionParams.ConfigRequestIpv4Address.html#getAddress()"/>
             /// </summary>
-            public Java.Net.Inet4Address Address
+            /// <returns><see cref="Java.Net.Inet4Address"/></returns>
+            public Java.Net.Inet4Address GetAddress()
             {
-                get { return IExecuteWithSignature<Java.Net.Inet4Address>("getAddress", "()Ljava/net/Inet4Address;"); }
+                return IExecuteWithSignature<Java.Net.Inet4Address>("getAddress", "()Ljava/net/Inet4Address;");
             }
 
             #endregion
@@ -338,18 +340,20 @@ public partial class ConfigRequestIpv6Address
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/TunnelModeChildSessionParams.ConfigRequestIpv6Address.html#getAddress()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/TunnelModeChildSessionParams.ConfigRequestIpv6Address.html#getPrefixLength()"/>
             /// </summary>
-            public Java.Net.Inet6Address Address
+            /// <returns><see cref="int"/></returns>
+            public int GetPrefixLength()
             {
-                get { return IExecuteWithSignature<Java.Net.Inet6Address>("getAddress", "()Ljava/net/Inet6Address;"); }
+                return IExecuteWithSignature<int>("getPrefixLength", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/TunnelModeChildSessionParams.ConfigRequestIpv6Address.html#getPrefixLength()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/ipsec/ike/TunnelModeChildSessionParams.ConfigRequestIpv6Address.html#getAddress()"/>
             /// </summary>
-            public int PrefixLength
+            /// <returns><see cref="Java.Net.Inet6Address"/></returns>
+            public Java.Net.Inet6Address GetAddress()
             {
-                get { return IExecuteWithSignature<int>("getPrefixLength", "()I"); }
+                return IExecuteWithSignature<Java.Net.Inet6Address>("getAddress", "()Ljava/net/Inet6Address;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/LinkAddress.cs b/src/net/Netdroid/Generated/Android/Net/LinkAddress.cs
index 4da762e29..e4a27174c 100644
--- a/src/net/Netdroid/Generated/Android/Net/LinkAddress.cs
+++ b/src/net/Netdroid/Generated/Android/Net/LinkAddress.cs
@@ -52,40 +52,44 @@ public partial class LinkAddress
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#describeContents()"/>
         /// </summary>
-        public Java.Net.InetAddress Address
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#getFlags()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#getPrefixLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#getPrefixLength()"/>
         /// </summary>
-        public int PrefixLength
+        /// <returns><see cref="int"/></returns>
+        public int GetPrefixLength()
         {
-            get { return IExecuteWithSignature<int>("getPrefixLength", "()I"); }
+            return IExecuteWithSignature<int>("getPrefixLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#getScope()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#getScope()"/>
         /// </summary>
-        public int Scope
+        /// <returns><see cref="int"/></returns>
+        public int GetScope()
         {
-            get { return IExecuteWithSignature<int>("getScope", "()I"); }
+            return IExecuteWithSignature<int>("getScope", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#getAddress()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetAddress()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/LinkAddress.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/LinkProperties.cs b/src/net/Netdroid/Generated/Android/Net/LinkProperties.cs
index c368e7284..86b29a0e1 100644
--- a/src/net/Netdroid/Generated/Android/Net/LinkProperties.cs
+++ b/src/net/Netdroid/Generated/Android/Net/LinkProperties.cs
@@ -52,107 +52,117 @@ public partial class LinkProperties
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getDhcpServerAddress()"/> <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setDhcpServerAddress(java.net.Inet4Address)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getNat64Prefix()"/>
         /// </summary>
-        public Java.Net.Inet4Address DhcpServerAddress
+        /// <returns><see cref="Android.Net.IpPrefix"/></returns>
+        public Android.Net.IpPrefix GetNat64Prefix()
         {
-            get { return IExecuteWithSignature<Java.Net.Inet4Address>("getDhcpServerAddress", "()Ljava/net/Inet4Address;"); } set { IExecuteWithSignature("setDhcpServerAddress", "(Ljava/net/Inet4Address;)V", value); }
+            return IExecuteWithSignature<Android.Net.IpPrefix>("getNat64Prefix", "()Landroid/net/IpPrefix;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getDnsServers()"/> <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setDnsServers(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getHttpProxy()"/>
         /// </summary>
-        public Java.Util.List<Java.Net.InetAddress> DnsServers
+        /// <returns><see cref="Android.Net.ProxyInfo"/></returns>
+        public Android.Net.ProxyInfo GetHttpProxy()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Net.InetAddress>>("getDnsServers", "()Ljava/util/List;"); } set { IExecuteWithSignature("setDnsServers", "(Ljava/util/Collection;)V", value); }
+            return IExecuteWithSignature<Android.Net.ProxyInfo>("getHttpProxy", "()Landroid/net/ProxyInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getDomains()"/> <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setDomains(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#addRoute(android.net.RouteInfo)"/>
         /// </summary>
-        public Java.Lang.String Domains
+        /// <param name="arg0"><see cref="Android.Net.RouteInfo"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool AddRoute(Android.Net.RouteInfo arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDomains", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDomains", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("addRoute", "(Landroid/net/RouteInfo;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getHttpProxy()"/> <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setHttpProxy(android.net.ProxyInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#isPrivateDnsActive()"/>
         /// </summary>
-        public Android.Net.ProxyInfo HttpProxy
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPrivateDnsActive()
         {
-            get { return IExecuteWithSignature<Android.Net.ProxyInfo>("getHttpProxy", "()Landroid/net/ProxyInfo;"); } set { IExecuteWithSignature("setHttpProxy", "(Landroid/net/ProxyInfo;)V", value); }
+            return IExecuteWithSignature<bool>("isPrivateDnsActive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getInterfaceName()"/> <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setInterfaceName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#isWakeOnLanSupported()"/>
         /// </summary>
-        public Java.Lang.String InterfaceName
+        /// <returns><see cref="bool"/></returns>
+        public bool IsWakeOnLanSupported()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInterfaceName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setInterfaceName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isWakeOnLanSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getLinkAddresses()"/> <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setLinkAddresses(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.LinkAddress> LinkAddresses
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.LinkAddress>>("getLinkAddresses", "()Ljava/util/List;"); } set { IExecuteWithSignature("setLinkAddresses", "(Ljava/util/Collection;)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getMtu()"/> <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setMtu(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getMtu()"/>
         /// </summary>
-        public int Mtu
+        /// <returns><see cref="int"/></returns>
+        public int GetMtu()
         {
-            get { return IExecuteWithSignature<int>("getMtu", "()I"); } set { IExecuteWithSignature("setMtu", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMtu", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getNat64Prefix()"/> <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setNat64Prefix(android.net.IpPrefix)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getDomains()"/>
         /// </summary>
-        public Android.Net.IpPrefix Nat64Prefix
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDomains()
         {
-            get { return IExecuteWithSignature<Android.Net.IpPrefix>("getNat64Prefix", "()Landroid/net/IpPrefix;"); } set { IExecuteWithSignature("setNat64Prefix", "(Landroid/net/IpPrefix;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDomains", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getPrivateDnsServerName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getInterfaceName()"/>
         /// </summary>
-        public Java.Lang.String PrivateDnsServerName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInterfaceName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPrivateDnsServerName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInterfaceName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getRoutes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getPrivateDnsServerName()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.RouteInfo> Routes
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPrivateDnsServerName()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.RouteInfo>>("getRoutes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPrivateDnsServerName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#addRoute(android.net.RouteInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getDhcpServerAddress()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Net.RouteInfo"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool AddRoute(Android.Net.RouteInfo arg0)
+        /// <returns><see cref="Java.Net.Inet4Address"/></returns>
+        public Java.Net.Inet4Address GetDhcpServerAddress()
         {
-            return IExecuteWithSignature<bool>("addRoute", "(Landroid/net/RouteInfo;)Z", arg0);
+            return IExecuteWithSignature<Java.Net.Inet4Address>("getDhcpServerAddress", "()Ljava/net/Inet4Address;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#isPrivateDnsActive()"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getLinkAddresses()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPrivateDnsActive()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.LinkAddress> GetLinkAddresses()
         {
-            return IExecuteWithSignature<bool>("isPrivateDnsActive", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Net.LinkAddress>>("getLinkAddresses", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#isWakeOnLanSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getRoutes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsWakeOnLanSupported()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.RouteInfo> GetRoutes()
         {
-            return IExecuteWithSignature<bool>("isWakeOnLanSupported", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Net.RouteInfo>>("getRoutes", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#getDnsServers()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Net.InetAddress> GetDnsServers()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Net.InetAddress>>("getDnsServers", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#clear()"/>
@@ -162,6 +172,70 @@ public void Clear()
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setDhcpServerAddress(java.net.Inet4Address)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.Inet4Address"/></param>
+        public void SetDhcpServerAddress(Java.Net.Inet4Address arg0)
+        {
+            IExecuteWithSignature("setDhcpServerAddress", "(Ljava/net/Inet4Address;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setDnsServers(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        public void SetDnsServers(Java.Util.Collection<Java.Net.InetAddress> arg0)
+        {
+            IExecuteWithSignature("setDnsServers", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setDomains(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDomains(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDomains", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setHttpProxy(android.net.ProxyInfo)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.ProxyInfo"/></param>
+        public void SetHttpProxy(Android.Net.ProxyInfo arg0)
+        {
+            IExecuteWithSignature("setHttpProxy", "(Landroid/net/ProxyInfo;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setInterfaceName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetInterfaceName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setInterfaceName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setLinkAddresses(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        public void SetLinkAddresses(Java.Util.Collection<Android.Net.LinkAddress> arg0)
+        {
+            IExecuteWithSignature("setLinkAddresses", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setMtu(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMtu(int arg0)
+        {
+            IExecuteWithSignature("setMtu", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#setNat64Prefix(android.net.IpPrefix)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.IpPrefix"/></param>
+        public void SetNat64Prefix(Android.Net.IpPrefix arg0)
+        {
+            IExecuteWithSignature("setNat64Prefix", "(Landroid/net/IpPrefix;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/LinkProperties.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/LocalServerSocket.cs b/src/net/Netdroid/Generated/Android/Net/LocalServerSocket.cs
index 26713e842..fcd8fd1c6 100644
--- a/src/net/Netdroid/Generated/Android/Net/LocalServerSocket.cs
+++ b/src/net/Netdroid/Generated/Android/Net/LocalServerSocket.cs
@@ -64,27 +64,29 @@ public LocalServerSocket(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalServerSocket.html#getFileDescriptor()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalServerSocket.html#accept()"/>
         /// </summary>
-        public Java.Io.FileDescriptor FileDescriptor
+        /// <returns><see cref="Android.Net.LocalSocket"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Android.Net.LocalSocket Accept()
         {
-            get { return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;"); }
+            return IExecuteWithSignature<Android.Net.LocalSocket>("accept", "()Landroid/net/LocalSocket;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalServerSocket.html#getLocalSocketAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalServerSocket.html#getLocalSocketAddress()"/>
         /// </summary>
-        public Android.Net.LocalSocketAddress LocalSocketAddress
+        /// <returns><see cref="Android.Net.LocalSocketAddress"/></returns>
+        public Android.Net.LocalSocketAddress GetLocalSocketAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.LocalSocketAddress>("getLocalSocketAddress", "()Landroid/net/LocalSocketAddress;"); }
+            return IExecuteWithSignature<Android.Net.LocalSocketAddress>("getLocalSocketAddress", "()Landroid/net/LocalSocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalServerSocket.html#accept()"/>
+        /// <see href="https://developer.android.com/reference/android/net/LocalServerSocket.html#getFileDescriptor()"/>
         /// </summary>
-        /// <returns><see cref="Android.Net.LocalSocket"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Android.Net.LocalSocket Accept()
+        /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+        public Java.Io.FileDescriptor GetFileDescriptor()
         {
-            return IExecuteWithSignature<Android.Net.LocalSocket>("accept", "()Landroid/net/LocalSocket;");
+            return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/LocalServerSocket.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/LocalSocket.cs b/src/net/Netdroid/Generated/Android/Net/LocalSocket.cs
index be3ac5ceb..eddf1aa56 100644
--- a/src/net/Netdroid/Generated/Android/Net/LocalSocket.cs
+++ b/src/net/Netdroid/Generated/Android/Net/LocalSocket.cs
@@ -72,98 +72,115 @@ public LocalSocket(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getAncillaryFileDescriptors()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getPeerCredentials()"/>
         /// </summary>
-        public Java.Io.FileDescriptor[] AncillaryFileDescriptors
+        /// <returns><see cref="Android.Net.Credentials"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Android.Net.Credentials GetPeerCredentials()
         {
-            get { return IExecuteWithSignatureArray<Java.Io.FileDescriptor>("getAncillaryFileDescriptors", "()[Ljava/io/FileDescriptor;"); }
+            return IExecuteWithSignature<Android.Net.Credentials>("getPeerCredentials", "()Landroid/net/Credentials;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getFileDescriptor()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getLocalSocketAddress()"/>
         /// </summary>
-        public Java.Io.FileDescriptor FileDescriptor
+        /// <returns><see cref="Android.Net.LocalSocketAddress"/></returns>
+        public Android.Net.LocalSocketAddress GetLocalSocketAddress()
         {
-            get { return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;"); }
+            return IExecuteWithSignature<Android.Net.LocalSocketAddress>("getLocalSocketAddress", "()Landroid/net/LocalSocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getInputStream()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getRemoteSocketAddress()"/>
         /// </summary>
-        public Java.Io.InputStream InputStream
+        /// <returns><see cref="Android.Net.LocalSocketAddress"/></returns>
+        public Android.Net.LocalSocketAddress GetRemoteSocketAddress()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature<Android.Net.LocalSocketAddress>("getRemoteSocketAddress", "()Landroid/net/LocalSocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getLocalSocketAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#isClosed()"/>
         /// </summary>
-        public Android.Net.LocalSocketAddress LocalSocketAddress
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClosed()
         {
-            get { return IExecuteWithSignature<Android.Net.LocalSocketAddress>("getLocalSocketAddress", "()Landroid/net/LocalSocketAddress;"); }
+            return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getOutputStream()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#isInputShutdown()"/>
         /// </summary>
-        public Java.Io.OutputStream OutputStream
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInputShutdown()
         {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;"); }
+            return IExecuteWithSignature<bool>("isInputShutdown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getPeerCredentials()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#isOutputShutdown()"/>
         /// </summary>
-        public Android.Net.Credentials PeerCredentials
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOutputShutdown()
         {
-            get { return IExecuteWithSignature<Android.Net.Credentials>("getPeerCredentials", "()Landroid/net/Credentials;"); }
+            return IExecuteWithSignature<bool>("isOutputShutdown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getReceiveBufferSize()"/> <see href="https://developer.android.com/reference/android/net/LocalSocket.html#setReceiveBufferSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getReceiveBufferSize()"/>
         /// </summary>
-        public int ReceiveBufferSize
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public int GetReceiveBufferSize()
         {
-            get { return IExecuteWithSignature<int>("getReceiveBufferSize", "()I"); } set { IExecuteWithSignature("setReceiveBufferSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getReceiveBufferSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getRemoteSocketAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getSendBufferSize()"/>
         /// </summary>
-        public Android.Net.LocalSocketAddress RemoteSocketAddress
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public int GetSendBufferSize()
         {
-            get { return IExecuteWithSignature<Android.Net.LocalSocketAddress>("getRemoteSocketAddress", "()Landroid/net/LocalSocketAddress;"); }
+            return IExecuteWithSignature<int>("getSendBufferSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getSendBufferSize()"/> <see href="https://developer.android.com/reference/android/net/LocalSocket.html#setSendBufferSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getSoTimeout()"/>
         /// </summary>
-        public int SendBufferSize
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public int GetSoTimeout()
         {
-            get { return IExecuteWithSignature<int>("getSendBufferSize", "()I"); } set { IExecuteWithSignature("setSendBufferSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getSoTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getSoTimeout()"/> <see href="https://developer.android.com/reference/android/net/LocalSocket.html#setSoTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getFileDescriptor()"/>
         /// </summary>
-        public int SoTimeout
+        /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+        public Java.Io.FileDescriptor GetFileDescriptor()
         {
-            get { return IExecuteWithSignature<int>("getSoTimeout", "()I"); } set { IExecuteWithSignature("setSoTimeout", "(I)V", value); }
+            return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getAncillaryFileDescriptors()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClosed()
+        /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.FileDescriptor[] GetAncillaryFileDescriptors()
         {
-            return IExecuteWithSignature<bool>("isClosed", "()Z");
+            return IExecuteWithSignatureArray<Java.Io.FileDescriptor>("getAncillaryFileDescriptors", "()[Ljava/io/FileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#isInputShutdown()"/>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getInputStream()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInputShutdown()
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.InputStream GetInputStream()
         {
-            return IExecuteWithSignature<bool>("isInputShutdown", "()Z");
+            return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#isOutputShutdown()"/>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#getOutputStream()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOutputShutdown()
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.OutputStream GetOutputStream()
         {
-            return IExecuteWithSignature<bool>("isOutputShutdown", "()Z");
+            return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#isBound()"/>
@@ -226,6 +243,33 @@ public void SetFileDescriptorsForSend(Java.Io.FileDescriptor[] arg0)
             IExecuteWithSignature("setFileDescriptorsForSend", "([Ljava/io/FileDescriptor;)V", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#setReceiveBufferSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetReceiveBufferSize(int arg0)
+        {
+            IExecuteWithSignature("setReceiveBufferSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#setSendBufferSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetSendBufferSize(int arg0)
+        {
+            IExecuteWithSignature("setSendBufferSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#setSoTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetSoTimeout(int arg0)
+        {
+            IExecuteWithSignature("setSoTimeout", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/LocalSocket.html#shutdownInput()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/LocalSocketAddress.cs b/src/net/Netdroid/Generated/Android/Net/LocalSocketAddress.cs
index 923db11ee..393689a57 100644
--- a/src/net/Netdroid/Generated/Android/Net/LocalSocketAddress.cs
+++ b/src/net/Netdroid/Generated/Android/Net/LocalSocketAddress.cs
@@ -63,18 +63,20 @@ public LocalSocketAddress(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocketAddress.html#getNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocketAddress.html#getNamespace()"/>
         /// </summary>
-        public Android.Net.LocalSocketAddress.Namespace GetNamespace
+        /// <returns><see cref="Android.Net.LocalSocketAddress.Namespace"/></returns>
+        public Android.Net.LocalSocketAddress.Namespace GetNamespace()
         {
-            get { return IExecuteWithSignature<Android.Net.LocalSocketAddress.Namespace>("getNamespace", "()Landroid/net/LocalSocketAddress$Namespace;"); }
+            return IExecuteWithSignature<Android.Net.LocalSocketAddress.Namespace>("getNamespace", "()Landroid/net/LocalSocketAddress$Namespace;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/LocalSocketAddress.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/LocalSocketAddress.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/MacAddress.cs b/src/net/Netdroid/Generated/Android/Net/MacAddress.cs
index 55f4dce65..804e62992 100644
--- a/src/net/Netdroid/Generated/Android/Net/MacAddress.cs
+++ b/src/net/Netdroid/Generated/Android/Net/MacAddress.cs
@@ -94,20 +94,6 @@ public static Android.Net.MacAddress FromString(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/MacAddress.html#getAddressType()"/> 
-        /// </summary>
-        public int AddressType
-        {
-            get { return IExecuteWithSignature<int>("getAddressType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/MacAddress.html#getLinkLocalIpv6FromEui48Mac()"/> 
-        /// </summary>
-        public Java.Net.Inet6Address LinkLocalIpv6FromEui48Mac
-        {
-            get { return IExecuteWithSignature<Java.Net.Inet6Address>("getLinkLocalIpv6FromEui48Mac", "()Ljava/net/Inet6Address;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/MacAddress.html#isLocallyAssigned()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -142,6 +128,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/MacAddress.html#getAddressType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAddressType()
+        {
+            return IExecuteWithSignature<int>("getAddressType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/MacAddress.html#toOuiString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -150,6 +144,14 @@ public Java.Lang.String ToOuiString()
             return IExecuteWithSignature<Java.Lang.String>("toOuiString", "()Ljava/lang/String;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/MacAddress.html#getLinkLocalIpv6FromEui48Mac()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.Inet6Address"/></returns>
+        public Java.Net.Inet6Address GetLinkLocalIpv6FromEui48Mac()
+        {
+            return IExecuteWithSignature<Java.Net.Inet6Address>("getLinkLocalIpv6FromEui48Mac", "()Ljava/net/Inet6Address;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/MacAddress.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/MailTo.cs b/src/net/Netdroid/Generated/Android/Net/MailTo.cs
index 63d6f935f..bda683fdd 100644
--- a/src/net/Netdroid/Generated/Android/Net/MailTo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/MailTo.cs
@@ -71,39 +71,44 @@ public static bool IsMailTo(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getBody()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getBody()"/>
         /// </summary>
-        public Java.Lang.String Body
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBody()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBody", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getBody", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getCc()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getCc()"/>
         /// </summary>
-        public Java.Lang.String Cc
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCc()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCc", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCc", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getHeaders()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getSubject()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Lang.String> Headers
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubject()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getHeaders", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSubject", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getSubject()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getTo()"/>
         /// </summary>
-        public Java.Lang.String Subject
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTo()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubject", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTo", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getTo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/MailTo.html#getHeaders()"/>
         /// </summary>
-        public Java.Lang.String To
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Lang.String> GetHeaders()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTo", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getHeaders", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Network.cs b/src/net/Netdroid/Generated/Android/Net/Network.cs
index ceb692f1f..e030a862b 100644
--- a/src/net/Netdroid/Generated/Android/Net/Network.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Network.cs
@@ -61,20 +61,6 @@ public static Android.Net.Network FromNetworkHandle(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Network.html#getNetworkHandle()"/> 
-        /// </summary>
-        public long NetworkHandle
-        {
-            get { return IExecuteWithSignature<long>("getNetworkHandle", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Network.html#getSocketFactory()"/> 
-        /// </summary>
-        public Javax.Net.SocketFactory SocketFactory
-        {
-            get { return IExecuteWithSignature<Javax.Net.SocketFactory>("getSocketFactory", "()Ljavax/net/SocketFactory;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/Network.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -124,6 +110,22 @@ public Java.Net.URLConnection OpenConnection(Java.Net.URL arg0)
             return IExecuteWithSignature<Java.Net.URLConnection>("openConnection", "(Ljava/net/URL;)Ljava/net/URLConnection;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/Network.html#getSocketFactory()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Net.SocketFactory"/></returns>
+        public Javax.Net.SocketFactory GetSocketFactory()
+        {
+            return IExecuteWithSignature<Javax.Net.SocketFactory>("getSocketFactory", "()Ljavax/net/SocketFactory;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/Network.html#getNetworkHandle()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetNetworkHandle()
+        {
+            return IExecuteWithSignature<long>("getNetworkHandle", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/Network.html#bindSocket(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/NetworkCapabilities.cs b/src/net/Netdroid/Generated/Android/Net/NetworkCapabilities.cs
index 6ac719bac..1fc3088a2 100644
--- a/src/net/Netdroid/Generated/Android/Net/NetworkCapabilities.cs
+++ b/src/net/Netdroid/Generated/Android/Net/NetworkCapabilities.cs
@@ -324,95 +324,103 @@ public NetworkCapabilities(Android.Net.NetworkCapabilities arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getNetworkSpecifier()"/>
         /// </summary>
-        public int[] Capabilities
+        /// <returns><see cref="Android.Net.NetworkSpecifier"/></returns>
+        public Android.Net.NetworkSpecifier GetNetworkSpecifier()
         {
-            get { return IExecuteWithSignatureArray<int>("getCapabilities", "()[I"); }
+            return IExecuteWithSignature<Android.Net.NetworkSpecifier>("getNetworkSpecifier", "()Landroid/net/NetworkSpecifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getEnterpriseIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getTransportInfo()"/>
         /// </summary>
-        public int[] EnterpriseIds
+        /// <returns><see cref="Android.Net.TransportInfo"/></returns>
+        public Android.Net.TransportInfo GetTransportInfo()
         {
-            get { return IExecuteWithSignatureArray<int>("getEnterpriseIds", "()[I"); }
+            return IExecuteWithSignature<Android.Net.TransportInfo>("getTransportInfo", "()Landroid/net/TransportInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getLinkDownstreamBandwidthKbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#hasCapability(int)"/>
         /// </summary>
-        public int LinkDownstreamBandwidthKbps
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool HasCapability(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getLinkDownstreamBandwidthKbps", "()I"); }
+            return IExecuteWithSignature<bool>("hasCapability", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getLinkUpstreamBandwidthKbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#hasEnterpriseId(int)"/>
         /// </summary>
-        public int LinkUpstreamBandwidthKbps
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool HasEnterpriseId(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getLinkUpstreamBandwidthKbps", "()I"); }
+            return IExecuteWithSignature<bool>("hasEnterpriseId", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getNetworkSpecifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#hasTransport(int)"/>
         /// </summary>
-        public Android.Net.NetworkSpecifier NetworkSpecifier
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool HasTransport(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Net.NetworkSpecifier>("getNetworkSpecifier", "()Landroid/net/NetworkSpecifier;"); }
+            return IExecuteWithSignature<bool>("hasTransport", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getOwnerUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#describeContents()"/>
         /// </summary>
-        public int OwnerUid
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getOwnerUid", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getSignalStrength()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getLinkDownstreamBandwidthKbps()"/>
         /// </summary>
-        public int SignalStrength
+        /// <returns><see cref="int"/></returns>
+        public int GetLinkDownstreamBandwidthKbps()
         {
-            get { return IExecuteWithSignature<int>("getSignalStrength", "()I"); }
+            return IExecuteWithSignature<int>("getLinkDownstreamBandwidthKbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getTransportInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getLinkUpstreamBandwidthKbps()"/>
         /// </summary>
-        public Android.Net.TransportInfo TransportInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetLinkUpstreamBandwidthKbps()
         {
-            get { return IExecuteWithSignature<Android.Net.TransportInfo>("getTransportInfo", "()Landroid/net/TransportInfo;"); }
+            return IExecuteWithSignature<int>("getLinkUpstreamBandwidthKbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#hasCapability(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getOwnerUid()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasCapability(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetOwnerUid()
         {
-            return IExecuteWithSignature<bool>("hasCapability", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getOwnerUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#hasEnterpriseId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getSignalStrength()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasEnterpriseId(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSignalStrength()
         {
-            return IExecuteWithSignature<bool>("hasEnterpriseId", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getSignalStrength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#hasTransport(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getCapabilities()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasTransport(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int[] GetCapabilities()
         {
-            return IExecuteWithSignature<bool>("hasTransport", "(I)Z", arg0);
+            return IExecuteWithSignatureArray<int>("getCapabilities", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#getEnterpriseIds()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int[] GetEnterpriseIds()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<int>("getEnterpriseIds", "()[I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/NetworkCapabilities.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/NetworkInfo.cs b/src/net/Netdroid/Generated/Android/Net/NetworkInfo.cs
index 545aacd90..370807812 100644
--- a/src/net/Netdroid/Generated/Android/Net/NetworkInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/NetworkInfo.cs
@@ -36,7 +36,7 @@ public partial class NetworkInfo
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public NetworkInfo(int arg0, int arg1, Java.Lang.String arg2, Java.Lang.String arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -52,7 +52,7 @@ public NetworkInfo(int arg0, int arg1, Java.Lang.String arg2, Java.Lang.String a
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#CREATOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
         private static Android.Os.Parcelable.Creator _CREATORContent = default;
         private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -65,74 +65,28 @@ public NetworkInfo(int arg0, int arg1, Java.Lang.String arg2, Java.Lang.String a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getExtraInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getDetailedState()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String ExtraInfo
+        /// <returns><see cref="Android.Net.NetworkInfo.DetailedState"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.NetworkInfo.DetailedState GetDetailedState()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getExtraInfo", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.NetworkInfo.DetailedState>("getDetailedState", "()Landroid/net/NetworkInfo$DetailedState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getDetailedState()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getState()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.NetworkInfo.DetailedState GetDetailedState
+        /// <returns><see cref="Android.Net.NetworkInfo.State"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.NetworkInfo.State GetState()
         {
-            get { return IExecuteWithSignature<Android.Net.NetworkInfo.DetailedState>("getDetailedState", "()Landroid/net/NetworkInfo$DetailedState;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getState()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Net.NetworkInfo.State GetState
-        {
-            get { return IExecuteWithSignature<Android.Net.NetworkInfo.State>("getState", "()Landroid/net/NetworkInfo$State;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getReason()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Reason
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getReason", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getSubtype()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Subtype
-        {
-            get { return IExecuteWithSignature<int>("getSubtype", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getSubtypeName()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String SubtypeName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubtypeName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getType()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getTypeName()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String TypeName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.NetworkInfo.State>("getState", "()Landroid/net/NetworkInfo$State;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#isAvailable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAvailable()
         {
             return IExecuteWithSignature<bool>("isAvailable", "()Z");
@@ -141,7 +95,7 @@ public bool IsAvailable()
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#isConnected()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsConnected()
         {
             return IExecuteWithSignature<bool>("isConnected", "()Z");
@@ -150,7 +104,7 @@ public bool IsConnected()
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#isConnectedOrConnecting()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsConnectedOrConnecting()
         {
             return IExecuteWithSignature<bool>("isConnectedOrConnecting", "()Z");
@@ -159,7 +113,7 @@ public bool IsConnectedOrConnecting()
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#isFailover()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsFailover()
         {
             return IExecuteWithSignature<bool>("isFailover", "()Z");
@@ -168,7 +122,7 @@ public bool IsFailover()
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#isRoaming()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsRoaming()
         {
             return IExecuteWithSignature<bool>("isRoaming", "()Z");
@@ -177,18 +131,72 @@ public bool IsRoaming()
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int DescribeContents()
         {
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getSubtype()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSubtype()
+        {
+            return IExecuteWithSignature<int>("getSubtype", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getExtraInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetExtraInfo()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getExtraInfo", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getReason()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetReason()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getReason", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getSubtypeName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSubtypeName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSubtypeName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#getTypeName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetTypeName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.html#setDetailedState(android.net.NetworkInfo.DetailedState,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.NetworkInfo.DetailedState"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDetailedState(Android.Net.NetworkInfo.DetailedState arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
             IExecute("setDetailedState", arg0, arg1, arg2);
@@ -198,7 +206,7 @@ public void SetDetailedState(Android.Net.NetworkInfo.DetailedState arg0, Java.La
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
             IExecute("writeToParcel", arg0, arg1);
@@ -222,91 +230,91 @@ public partial class DetailedState
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#AUTHENTICATING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState AUTHENTICATING { get { if (!_AUTHENTICATINGReady) { _AUTHENTICATINGContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "AUTHENTICATING"); _AUTHENTICATINGReady = true; } return _AUTHENTICATINGContent; } }
             private static Android.Net.NetworkInfo.DetailedState _AUTHENTICATINGContent = default;
             private static bool _AUTHENTICATINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#BLOCKED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState BLOCKED { get { if (!_BLOCKEDReady) { _BLOCKEDContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "BLOCKED"); _BLOCKEDReady = true; } return _BLOCKEDContent; } }
             private static Android.Net.NetworkInfo.DetailedState _BLOCKEDContent = default;
             private static bool _BLOCKEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#CAPTIVE_PORTAL_CHECK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState CAPTIVE_PORTAL_CHECK { get { if (!_CAPTIVE_PORTAL_CHECKReady) { _CAPTIVE_PORTAL_CHECKContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "CAPTIVE_PORTAL_CHECK"); _CAPTIVE_PORTAL_CHECKReady = true; } return _CAPTIVE_PORTAL_CHECKContent; } }
             private static Android.Net.NetworkInfo.DetailedState _CAPTIVE_PORTAL_CHECKContent = default;
             private static bool _CAPTIVE_PORTAL_CHECKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#CONNECTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState CONNECTED { get { if (!_CONNECTEDReady) { _CONNECTEDContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "CONNECTED"); _CONNECTEDReady = true; } return _CONNECTEDContent; } }
             private static Android.Net.NetworkInfo.DetailedState _CONNECTEDContent = default;
             private static bool _CONNECTEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#CONNECTING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState CONNECTING { get { if (!_CONNECTINGReady) { _CONNECTINGContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "CONNECTING"); _CONNECTINGReady = true; } return _CONNECTINGContent; } }
             private static Android.Net.NetworkInfo.DetailedState _CONNECTINGContent = default;
             private static bool _CONNECTINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#DISCONNECTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState DISCONNECTED { get { if (!_DISCONNECTEDReady) { _DISCONNECTEDContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "DISCONNECTED"); _DISCONNECTEDReady = true; } return _DISCONNECTEDContent; } }
             private static Android.Net.NetworkInfo.DetailedState _DISCONNECTEDContent = default;
             private static bool _DISCONNECTEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#DISCONNECTING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState DISCONNECTING { get { if (!_DISCONNECTINGReady) { _DISCONNECTINGContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "DISCONNECTING"); _DISCONNECTINGReady = true; } return _DISCONNECTINGContent; } }
             private static Android.Net.NetworkInfo.DetailedState _DISCONNECTINGContent = default;
             private static bool _DISCONNECTINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#FAILED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState FAILED { get { if (!_FAILEDReady) { _FAILEDContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "FAILED"); _FAILEDReady = true; } return _FAILEDContent; } }
             private static Android.Net.NetworkInfo.DetailedState _FAILEDContent = default;
             private static bool _FAILEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#IDLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState IDLE { get { if (!_IDLEReady) { _IDLEContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "IDLE"); _IDLEReady = true; } return _IDLEContent; } }
             private static Android.Net.NetworkInfo.DetailedState _IDLEContent = default;
             private static bool _IDLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#OBTAINING_IPADDR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState OBTAINING_IPADDR { get { if (!_OBTAINING_IPADDRReady) { _OBTAINING_IPADDRContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "OBTAINING_IPADDR"); _OBTAINING_IPADDRReady = true; } return _OBTAINING_IPADDRContent; } }
             private static Android.Net.NetworkInfo.DetailedState _OBTAINING_IPADDRContent = default;
             private static bool _OBTAINING_IPADDRReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#SCANNING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState SCANNING { get { if (!_SCANNINGReady) { _SCANNINGContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "SCANNING"); _SCANNINGReady = true; } return _SCANNINGContent; } }
             private static Android.Net.NetworkInfo.DetailedState _SCANNINGContent = default;
             private static bool _SCANNINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#SUSPENDED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState SUSPENDED { get { if (!_SUSPENDEDReady) { _SUSPENDEDContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "SUSPENDED"); _SUSPENDEDReady = true; } return _SUSPENDEDContent; } }
             private static Android.Net.NetworkInfo.DetailedState _SUSPENDEDContent = default;
             private static bool _SUSPENDEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.DetailedState.html#VERIFYING_POOR_LINK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.DetailedState VERIFYING_POOR_LINK { get { if (!_VERIFYING_POOR_LINKReady) { _VERIFYING_POOR_LINKContent = SGetField<Android.Net.NetworkInfo.DetailedState>(LocalBridgeClazz, "VERIFYING_POOR_LINK"); _VERIFYING_POOR_LINKReady = true; } return _VERIFYING_POOR_LINKContent; } }
             private static Android.Net.NetworkInfo.DetailedState _VERIFYING_POOR_LINKContent = default;
             private static bool _VERIFYING_POOR_LINKReady = false; // this is used because in case of generics 
@@ -361,42 +369,42 @@ public partial class State
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.State.html#CONNECTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.State CONNECTED { get { if (!_CONNECTEDReady) { _CONNECTEDContent = SGetField<Android.Net.NetworkInfo.State>(LocalBridgeClazz, "CONNECTED"); _CONNECTEDReady = true; } return _CONNECTEDContent; } }
             private static Android.Net.NetworkInfo.State _CONNECTEDContent = default;
             private static bool _CONNECTEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.State.html#CONNECTING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.State CONNECTING { get { if (!_CONNECTINGReady) { _CONNECTINGContent = SGetField<Android.Net.NetworkInfo.State>(LocalBridgeClazz, "CONNECTING"); _CONNECTINGReady = true; } return _CONNECTINGContent; } }
             private static Android.Net.NetworkInfo.State _CONNECTINGContent = default;
             private static bool _CONNECTINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.State.html#DISCONNECTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.State DISCONNECTED { get { if (!_DISCONNECTEDReady) { _DISCONNECTEDContent = SGetField<Android.Net.NetworkInfo.State>(LocalBridgeClazz, "DISCONNECTED"); _DISCONNECTEDReady = true; } return _DISCONNECTEDContent; } }
             private static Android.Net.NetworkInfo.State _DISCONNECTEDContent = default;
             private static bool _DISCONNECTEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.State.html#DISCONNECTING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.State DISCONNECTING { get { if (!_DISCONNECTINGReady) { _DISCONNECTINGContent = SGetField<Android.Net.NetworkInfo.State>(LocalBridgeClazz, "DISCONNECTING"); _DISCONNECTINGReady = true; } return _DISCONNECTINGContent; } }
             private static Android.Net.NetworkInfo.State _DISCONNECTINGContent = default;
             private static bool _DISCONNECTINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.State.html#SUSPENDED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.State SUSPENDED { get { if (!_SUSPENDEDReady) { _SUSPENDEDContent = SGetField<Android.Net.NetworkInfo.State>(LocalBridgeClazz, "SUSPENDED"); _SUSPENDEDReady = true; } return _SUSPENDEDContent; } }
             private static Android.Net.NetworkInfo.State _SUSPENDEDContent = default;
             private static bool _SUSPENDEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/NetworkInfo.State.html#UNKNOWN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.NetworkInfo.State UNKNOWN { get { if (!_UNKNOWNReady) { _UNKNOWNContent = SGetField<Android.Net.NetworkInfo.State>(LocalBridgeClazz, "UNKNOWN"); _UNKNOWNReady = true; } return _UNKNOWNContent; } }
             private static Android.Net.NetworkInfo.State _UNKNOWNContent = default;
             private static bool _UNKNOWNReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Net/NetworkRequest.cs b/src/net/Netdroid/Generated/Android/Net/NetworkRequest.cs
index 0fa6efee7..be7261c32 100644
--- a/src/net/Netdroid/Generated/Android/Net/NetworkRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Net/NetworkRequest.cs
@@ -52,25 +52,12 @@ public partial class NetworkRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkRequest.html#getCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/NetworkRequest.html#getNetworkSpecifier()"/>
         /// </summary>
-        public int[] Capabilities
+        /// <returns><see cref="Android.Net.NetworkSpecifier"/></returns>
+        public Android.Net.NetworkSpecifier GetNetworkSpecifier()
         {
-            get { return IExecuteWithSignatureArray<int>("getCapabilities", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkRequest.html#getNetworkSpecifier()"/> 
-        /// </summary>
-        public Android.Net.NetworkSpecifier NetworkSpecifier
-        {
-            get { return IExecuteWithSignature<Android.Net.NetworkSpecifier>("getNetworkSpecifier", "()Landroid/net/NetworkSpecifier;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/NetworkRequest.html#getTransportTypes()"/> 
-        /// </summary>
-        public int[] TransportTypes
-        {
-            get { return IExecuteWithSignatureArray<int>("getTransportTypes", "()[I"); }
+            return IExecuteWithSignature<Android.Net.NetworkSpecifier>("getNetworkSpecifier", "()Landroid/net/NetworkSpecifier;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/NetworkRequest.html#canBeSatisfiedBy(android.net.NetworkCapabilities)"/>
@@ -108,6 +95,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkRequest.html#getCapabilities()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetCapabilities()
+        {
+            return IExecuteWithSignatureArray<int>("getCapabilities", "()[I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/NetworkRequest.html#getTransportTypes()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetTransportTypes()
+        {
+            return IExecuteWithSignatureArray<int>("getTransportTypes", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/NetworkRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -223,7 +226,7 @@ public Android.Net.NetworkRequest.Builder SetNetworkSpecifier(Android.Net.Networ
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Net.NetworkRequest.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.NetworkRequest.Builder SetNetworkSpecifier(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Net.NetworkRequest.Builder>("setNetworkSpecifier", "(Ljava/lang/String;)Landroid/net/NetworkRequest$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Net/Nsd/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Nsd/AllPackageClasses.cs
index 760aa5e6e..b52ebbc41 100644
--- a/src/net/Netdroid/Generated/Android/Net/Nsd/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Nsd/AllPackageClasses.cs
@@ -77,10 +77,13 @@ public partial class DiscoveryListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public DiscoveryListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.nsd.NsdManager_DiscoveryListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.nsd.DiscoveryListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -102,10 +105,13 @@ public partial class DiscoveryListenerDirect : DiscoveryListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.nsd.NsdManager$DiscoveryListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.nsd.NsdManager$DiscoveryListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -136,10 +142,13 @@ public partial class RegistrationListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public RegistrationListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.nsd.NsdManager_RegistrationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.nsd.RegistrationListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -161,10 +170,13 @@ public partial class RegistrationListenerDirect : RegistrationListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.nsd.NsdManager$RegistrationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.nsd.NsdManager$RegistrationListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -195,10 +207,13 @@ public partial class ResolveListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public ResolveListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.nsd.NsdManager_ResolveListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.nsd.ResolveListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -220,10 +235,13 @@ public partial class ResolveListenerDirect : ResolveListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.nsd.NsdManager$ResolveListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.nsd.NsdManager$ResolveListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -253,12 +271,12 @@ public partial class ServiceInfoCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ServiceInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ServiceInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ServiceInfoCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ServiceInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ServiceInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ServiceInfoCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Net/Nsd/NsdManager.cs b/src/net/Netdroid/Generated/Android/Net/Nsd/NsdManager.cs
index 60b5f4360..b603a3b4a 100644
--- a/src/net/Netdroid/Generated/Android/Net/Nsd/NsdManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Nsd/NsdManager.cs
@@ -175,7 +175,7 @@ public void RegisterServiceInfoCallback(Android.Net.Nsd.NsdServiceInfo arg0, Jav
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Nsd.NsdServiceInfo"/></param>
         /// <param name="arg1"><see cref="Android.Net.Nsd.NsdManager.ResolveListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ResolveService(Android.Net.Nsd.NsdServiceInfo arg0, Android.Net.Nsd.NsdManager.ResolveListener arg1)
         {
             IExecute("resolveService", arg0, arg1);
@@ -186,7 +186,7 @@ public void ResolveService(Android.Net.Nsd.NsdServiceInfo arg0, Android.Net.Nsd.
         /// <param name="arg0"><see cref="Android.Net.Nsd.NsdServiceInfo"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg2"><see cref="Android.Net.Nsd.NsdManager.ResolveListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ResolveService(Android.Net.Nsd.NsdServiceInfo arg0, Java.Util.Concurrent.Executor arg1, Android.Net.Nsd.NsdManager.ResolveListener arg2)
         {
             IExecute("resolveService", arg0, arg1, arg2);
@@ -252,12 +252,12 @@ public partial class DiscoveryListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDiscoveryStarted", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDiscoveryStartedEventHandler));
-                AddEventHandler("onDiscoveryStopped", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDiscoveryStoppedEventHandler));
-                AddEventHandler("onServiceFound", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceFoundEventHandler));
-                AddEventHandler("onServiceLost", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceLostEventHandler));
-                AddEventHandler("onStartDiscoveryFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnStartDiscoveryFailedEventHandler));
-                AddEventHandler("onStopDiscoveryFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnStopDiscoveryFailedEventHandler));
+                AddEventHandler("onDiscoveryStarted", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDiscoveryStartedEventHandler));
+                AddEventHandler("onDiscoveryStopped", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDiscoveryStoppedEventHandler));
+                AddEventHandler("onServiceFound", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceFoundEventHandler));
+                AddEventHandler("onServiceLost", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceLostEventHandler));
+                AddEventHandler("onStartDiscoveryFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnStartDiscoveryFailedEventHandler));
+                AddEventHandler("onStopDiscoveryFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnStopDiscoveryFailedEventHandler));
 
             }
 
@@ -265,7 +265,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.DiscoveryListener.html#onDiscoveryStarted(java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDiscoveryStarted"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String> OnOnDiscoveryStarted { get; set; } = null;
+            public global::System.Action<Java.Lang.String> OnOnDiscoveryStarted { get; set; } = null;
 
             void OnDiscoveryStartedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -286,7 +286,7 @@ public virtual void OnDiscoveryStarted(Java.Lang.String arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.DiscoveryListener.html#onDiscoveryStopped(java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDiscoveryStopped"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String> OnOnDiscoveryStopped { get; set; } = null;
+            public global::System.Action<Java.Lang.String> OnOnDiscoveryStopped { get; set; } = null;
 
             void OnDiscoveryStoppedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -307,7 +307,7 @@ public virtual void OnDiscoveryStopped(Java.Lang.String arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.DiscoveryListener.html#onServiceFound(android.net.nsd.NsdServiceInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceFound"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceFound { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceFound { get; set; } = null;
 
             void OnServiceFoundEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -328,7 +328,7 @@ public virtual void OnServiceFound(Android.Net.Nsd.NsdServiceInfo arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.DiscoveryListener.html#onServiceLost(android.net.nsd.NsdServiceInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceLost"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceLost { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceLost { get; set; } = null;
 
             void OnServiceLostEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -349,7 +349,7 @@ public virtual void OnServiceLost(Android.Net.Nsd.NsdServiceInfo arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.DiscoveryListener.html#onStartDiscoveryFailed(java.lang.String,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnStartDiscoveryFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, int> OnOnStartDiscoveryFailed { get; set; } = null;
+            public global::System.Action<Java.Lang.String, int> OnOnStartDiscoveryFailed { get; set; } = null;
 
             void OnStartDiscoveryFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -371,7 +371,7 @@ public virtual void OnStartDiscoveryFailed(Java.Lang.String arg0, int arg1)
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.DiscoveryListener.html#onStopDiscoveryFailed(java.lang.String,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnStopDiscoveryFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, int> OnOnStopDiscoveryFailed { get; set; } = null;
+            public global::System.Action<Java.Lang.String, int> OnOnStopDiscoveryFailed { get; set; } = null;
 
             void OnStopDiscoveryFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -505,10 +505,10 @@ public partial class RegistrationListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onRegistrationFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnRegistrationFailedEventHandler));
-                AddEventHandler("onServiceRegistered", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceRegisteredEventHandler));
-                AddEventHandler("onServiceUnregistered", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceUnregisteredEventHandler));
-                AddEventHandler("onUnregistrationFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnUnregistrationFailedEventHandler));
+                AddEventHandler("onRegistrationFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnRegistrationFailedEventHandler));
+                AddEventHandler("onServiceRegistered", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceRegisteredEventHandler));
+                AddEventHandler("onServiceUnregistered", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceUnregisteredEventHandler));
+                AddEventHandler("onUnregistrationFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnUnregistrationFailedEventHandler));
 
             }
 
@@ -516,7 +516,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.RegistrationListener.html#onRegistrationFailed(android.net.nsd.NsdServiceInfo,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRegistrationFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo, int> OnOnRegistrationFailed { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo, int> OnOnRegistrationFailed { get; set; } = null;
 
             void OnRegistrationFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -538,7 +538,7 @@ public virtual void OnRegistrationFailed(Android.Net.Nsd.NsdServiceInfo arg0, in
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.RegistrationListener.html#onServiceRegistered(android.net.nsd.NsdServiceInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceRegistered"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceRegistered { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceRegistered { get; set; } = null;
 
             void OnServiceRegisteredEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -559,7 +559,7 @@ public virtual void OnServiceRegistered(Android.Net.Nsd.NsdServiceInfo arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.RegistrationListener.html#onServiceUnregistered(android.net.nsd.NsdServiceInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceUnregistered"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceUnregistered { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceUnregistered { get; set; } = null;
 
             void OnServiceUnregisteredEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -580,7 +580,7 @@ public virtual void OnServiceUnregistered(Android.Net.Nsd.NsdServiceInfo arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.RegistrationListener.html#onUnregistrationFailed(android.net.nsd.NsdServiceInfo,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnUnregistrationFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo, int> OnOnUnregistrationFailed { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo, int> OnOnUnregistrationFailed { get; set; } = null;
 
             void OnUnregistrationFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -698,10 +698,10 @@ public partial class ResolveListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onResolveFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnResolveFailedEventHandler));
-                AddEventHandler("onServiceResolved", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceResolvedEventHandler));
-                AddEventHandler("onResolutionStopped", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnResolutionStoppedEventHandler));
-                AddEventHandler("onStopResolutionFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnStopResolutionFailedEventHandler));
+                AddEventHandler("onResolveFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnResolveFailedEventHandler));
+                AddEventHandler("onServiceResolved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnServiceResolvedEventHandler));
+                AddEventHandler("onResolutionStopped", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnResolutionStoppedEventHandler));
+                AddEventHandler("onStopResolutionFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>>>(OnStopResolutionFailedEventHandler));
 
             }
 
@@ -709,7 +709,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.ResolveListener.html#onResolveFailed(android.net.nsd.NsdServiceInfo,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnResolveFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo, int> OnOnResolveFailed { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo, int> OnOnResolveFailed { get; set; } = null;
 
             void OnResolveFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -731,7 +731,7 @@ public virtual void OnResolveFailed(Android.Net.Nsd.NsdServiceInfo arg0, int arg
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.ResolveListener.html#onServiceResolved(android.net.nsd.NsdServiceInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceResolved"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceResolved { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnServiceResolved { get; set; } = null;
 
             void OnServiceResolvedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -761,7 +761,7 @@ public void OnResolutionStoppedDefault(Android.Net.Nsd.NsdServiceInfo arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.ResolveListener.html#onResolutionStopped(android.net.nsd.NsdServiceInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnResolutionStopped"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnResolutionStopped { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo> OnOnResolutionStopped { get; set; } = null;
 
             void OnResolutionStoppedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
@@ -793,7 +793,7 @@ public void OnStopResolutionFailedDefault(Android.Net.Nsd.NsdServiceInfo arg0, i
             /// Handler for <see href="https://developer.android.com/reference/android/net/nsd/NsdManager.ResolveListener.html#onStopResolutionFailed(android.net.nsd.NsdServiceInfo,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnStopResolutionFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Nsd.NsdServiceInfo, int> OnOnStopResolutionFailed { get; set; } = null;
+            public global::System.Action<Android.Net.Nsd.NsdServiceInfo, int> OnOnStopResolutionFailed { get; set; } = null;
 
             void OnStopResolutionFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Nsd.NsdServiceInfo>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Net/Nsd/NsdServiceInfo.cs b/src/net/Netdroid/Generated/Android/Net/Nsd/NsdServiceInfo.cs
index 9bebc4a24..c2cd41d4d 100644
--- a/src/net/Netdroid/Generated/Android/Net/Nsd/NsdServiceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Nsd/NsdServiceInfo.cs
@@ -52,62 +52,69 @@ public partial class NsdServiceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getNetwork()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, byte[]> Attributes
+        /// <returns><see cref="Android.Net.Network"/></returns>
+        public Android.Net.Network GetNetwork()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, byte[]>>("getAttributes", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getHost()"/> <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setHost(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#describeContents()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Net.InetAddress Host
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getHost", "()Ljava/net/InetAddress;"); } set { IExecuteWithSignature("setHost", "(Ljava/net/InetAddress;)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getHostAddresses()"/> <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setHostAddresses(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getPort()"/>
         /// </summary>
-        public Java.Util.List<Java.Net.InetAddress> HostAddresses
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Net.InetAddress>>("getHostAddresses", "()Ljava/util/List;"); } set { IExecuteWithSignature("setHostAddresses", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getNetwork()"/> <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setNetwork(android.net.Network)"/>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getServiceName()"/>
         /// </summary>
-        public Android.Net.Network Network
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServiceName()
         {
-            get { return IExecuteWithSignature<Android.Net.Network>("getNetwork", "()Landroid/net/Network;"); } set { IExecuteWithSignature("setNetwork", "(Landroid/net/Network;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getServiceName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getPort()"/> <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setPort(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getServiceType()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServiceType()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); } set { IExecuteWithSignature("setPort", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getServiceType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getServiceName()"/> <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setServiceName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getHost()"/>
         /// </summary>
-        public Java.Lang.String ServiceName
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        [global::System.Obsolete()]
+        public Java.Net.InetAddress GetHost()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setServiceName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getHost", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getServiceType()"/> <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setServiceType(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getHostAddresses()"/>
         /// </summary>
-        public Java.Lang.String ServiceType
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Net.InetAddress> GetHostAddresses()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceType", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setServiceType", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Util.List<Java.Net.InetAddress>>("getHostAddresses", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#getAttributes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, byte[]> GetAttributes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, byte[]>>("getAttributes", "()Ljava/util/Map;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#removeAttribute(java.lang.String)"/>
@@ -127,6 +134,55 @@ public void SetAttribute(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setAttribute", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setHost(java.net.InetAddress)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
+        [global::System.Obsolete()]
+        public void SetHost(Java.Net.InetAddress arg0)
+        {
+            IExecuteWithSignature("setHost", "(Ljava/net/InetAddress;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setHostAddresses(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetHostAddresses(Java.Util.List<Java.Net.InetAddress> arg0)
+        {
+            IExecuteWithSignature("setHostAddresses", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setNetwork(android.net.Network)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Network"/></param>
+        public void SetNetwork(Android.Net.Network arg0)
+        {
+            IExecuteWithSignature("setNetwork", "(Landroid/net/Network;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setPort(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPort(int arg0)
+        {
+            IExecuteWithSignature("setPort", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setServiceName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetServiceName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setServiceName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#setServiceType(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetServiceType(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setServiceType", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/nsd/NsdServiceInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/PlatformVpnProfile.cs b/src/net/Netdroid/Generated/Android/Net/PlatformVpnProfile.cs
index c4fbe0805..7f70c12a0 100644
--- a/src/net/Netdroid/Generated/Android/Net/PlatformVpnProfile.cs
+++ b/src/net/Netdroid/Generated/Android/Net/PlatformVpnProfile.cs
@@ -64,20 +64,6 @@ public partial class PlatformVpnProfile
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/PlatformVpnProfile.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/PlatformVpnProfile.html#getTypeString()"/> 
-        /// </summary>
-        public Java.Lang.String TypeString
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeString", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/PlatformVpnProfile.html#areLocalRoutesExcluded()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -93,6 +79,22 @@ public bool IsInternetValidationRequired()
         {
             return IExecuteWithSignature<bool>("isInternetValidationRequired", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/PlatformVpnProfile.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/PlatformVpnProfile.html#getTypeString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTypeString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTypeString", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/Proxy.cs b/src/net/Netdroid/Generated/Android/Net/Proxy.cs
index dd1e148ce..2f84fe155 100644
--- a/src/net/Netdroid/Generated/Android/Net/Proxy.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Proxy.cs
@@ -48,37 +48,39 @@ public partial class Proxy
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Proxy.html#getDefaultHost()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Proxy.html#getDefaultPort()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Java.Lang.String DefaultHost
-        {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultHost", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Proxy.html#getDefaultPort()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static int DefaultPort
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetDefaultPort()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultPort", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultPort", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/Proxy.html#getPort(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetPort(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getPort", "(Landroid/content/Context;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/Proxy.html#getDefaultHost()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public static Java.Lang.String GetDefaultHost()
+        {
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultHost", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/Proxy.html#getHost(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetHost(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getHost", "(Landroid/content/Context;)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Net/ProxyInfo.cs b/src/net/Netdroid/Generated/Android/Net/ProxyInfo.cs
index 3ef202c92..5ecf091be 100644
--- a/src/net/Netdroid/Generated/Android/Net/ProxyInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/ProxyInfo.cs
@@ -100,48 +100,52 @@ public static Android.Net.ProxyInfo BuildPacProxy(Android.Net.Uri arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#getExclusionList()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#getPacFileUrl()"/>
         /// </summary>
-        public Java.Lang.String[] ExclusionList
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetPacFileUrl()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getExclusionList", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getPacFileUrl", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#getHost()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#isValid()"/>
         /// </summary>
-        public Java.Lang.String Host
+        /// <returns><see cref="bool"/></returns>
+        public bool IsValid()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#getPacFileUrl()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#describeContents()"/>
         /// </summary>
-        public Android.Net.Uri PacFileUrl
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getPacFileUrl", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#getPort()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#isValid()"/>
+        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#getHost()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsValid()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHost()
         {
-            return IExecuteWithSignature<bool>("isValid", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#getExclusionList()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetExclusionList()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getExclusionList", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/ProxyInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/RouteInfo.cs b/src/net/Netdroid/Generated/Android/Net/RouteInfo.cs
index 4054d64fd..cd3f85369 100644
--- a/src/net/Netdroid/Generated/Android/Net/RouteInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/RouteInfo.cs
@@ -70,32 +70,12 @@ public partial class RouteInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#getDestination()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#getDestination()"/>
         /// </summary>
-        public Android.Net.IpPrefix Destination
+        /// <returns><see cref="Android.Net.IpPrefix"/></returns>
+        public Android.Net.IpPrefix GetDestination()
         {
-            get { return IExecuteWithSignature<Android.Net.IpPrefix>("getDestination", "()Landroid/net/IpPrefix;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#getGateway()"/> 
-        /// </summary>
-        public Java.Net.InetAddress Gateway
-        {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getGateway", "()Ljava/net/InetAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#getInterface()"/> 
-        /// </summary>
-        public Java.Lang.String Interface
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInterface", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Android.Net.IpPrefix>("getDestination", "()Landroid/net/IpPrefix;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#hasGateway()"/>
@@ -131,6 +111,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#getInterface()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInterface()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInterface", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#getGateway()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetGateway()
+        {
+            return IExecuteWithSignature<Java.Net.InetAddress>("getGateway", "()Ljava/net/InetAddress;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/RouteInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Rtp/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Rtp/AllPackageClasses.cs
index 757c55ac9..d79a2be08 100644
--- a/src/net/Netdroid/Generated/Android/Net/Rtp/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Rtp/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Net.Rtp
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AudioCodec : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AudioCodec>
     {
         const string _bridgeClassName = "android.net.rtp.AudioCodec";
@@ -75,7 +75,7 @@ public AudioCodec(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AudioGroup : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AudioGroup>
     {
         const string _bridgeClassName = "android.net.rtp.AudioGroup";
@@ -120,7 +120,7 @@ public AudioGroup(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AudioStream : Android.Net.Rtp.RtpStream
     {
         const string _bridgeClassName = "android.net.rtp.AudioStream";
@@ -165,7 +165,7 @@ public AudioStream(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RtpStream : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RtpStream>
     {
         const string _bridgeClassName = "android.net.rtp.RtpStream";
diff --git a/src/net/Netdroid/Generated/Android/Net/Rtp/AudioCodec.cs b/src/net/Netdroid/Generated/Android/Net/Rtp/AudioCodec.cs
index f1544055a..cef271b87 100644
--- a/src/net/Netdroid/Generated/Android/Net/Rtp/AudioCodec.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Rtp/AudioCodec.cs
@@ -40,56 +40,56 @@ public partial class AudioCodec
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#type"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int type { get { if (!_typeReady) { _typeContent = IGetField<int>("type"); _typeReady = true; } return _typeContent; } }
         private int _typeContent = default;
         private bool _typeReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#fmtp"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String fmtp { get { if (!_fmtpReady) { _fmtpContent = IGetField<Java.Lang.String>("fmtp"); _fmtpReady = true; } return _fmtpContent; } }
         private Java.Lang.String _fmtpContent = default;
         private bool _fmtpReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#rtpmap"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String rtpmap { get { if (!_rtpmapReady) { _rtpmapContent = IGetField<Java.Lang.String>("rtpmap"); _rtpmapReady = true; } return _rtpmapContent; } }
         private Java.Lang.String _rtpmapContent = default;
         private bool _rtpmapReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#AMR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Rtp.AudioCodec AMR { get { if (!_AMRReady) { _AMRContent = SGetField<Android.Net.Rtp.AudioCodec>(LocalBridgeClazz, "AMR"); _AMRReady = true; } return _AMRContent; } }
         private static Android.Net.Rtp.AudioCodec _AMRContent = default;
         private static bool _AMRReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#GSM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Rtp.AudioCodec GSM { get { if (!_GSMReady) { _GSMContent = SGetField<Android.Net.Rtp.AudioCodec>(LocalBridgeClazz, "GSM"); _GSMReady = true; } return _GSMContent; } }
         private static Android.Net.Rtp.AudioCodec _GSMContent = default;
         private static bool _GSMReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#GSM_EFR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Rtp.AudioCodec GSM_EFR { get { if (!_GSM_EFRReady) { _GSM_EFRContent = SGetField<Android.Net.Rtp.AudioCodec>(LocalBridgeClazz, "GSM_EFR"); _GSM_EFRReady = true; } return _GSM_EFRContent; } }
         private static Android.Net.Rtp.AudioCodec _GSM_EFRContent = default;
         private static bool _GSM_EFRReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#PCMA"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Rtp.AudioCodec PCMA { get { if (!_PCMAReady) { _PCMAContent = SGetField<Android.Net.Rtp.AudioCodec>(LocalBridgeClazz, "PCMA"); _PCMAReady = true; } return _PCMAContent; } }
         private static Android.Net.Rtp.AudioCodec _PCMAContent = default;
         private static bool _PCMAReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#PCMU"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Rtp.AudioCodec PCMU { get { if (!_PCMUReady) { _PCMUContent = SGetField<Android.Net.Rtp.AudioCodec>(LocalBridgeClazz, "PCMU"); _PCMUReady = true; } return _PCMUContent; } }
         private static Android.Net.Rtp.AudioCodec _PCMUContent = default;
         private static bool _PCMUReady = false; // this is used because in case of generics 
@@ -98,25 +98,26 @@ public partial class AudioCodec
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#getCodecs()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static Android.Net.Rtp.AudioCodec[] Codecs
-        {
-            get { return SExecuteWithSignatureArray<Android.Net.Rtp.AudioCodec>(LocalBridgeClazz, "getCodecs", "()[Landroid/net/rtp/AudioCodec;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#getCodec(int,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Net.Rtp.AudioCodec"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Rtp.AudioCodec GetCodec(int arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
             return SExecute<Android.Net.Rtp.AudioCodec>(LocalBridgeClazz, "getCodec", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioCodec.html#getCodecs()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.Rtp.AudioCodec"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Net.Rtp.AudioCodec[] GetCodecs()
+        {
+            return SExecuteWithSignatureArray<Android.Net.Rtp.AudioCodec>(LocalBridgeClazz, "getCodecs", "()[Landroid/net/rtp/AudioCodec;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/Rtp/AudioGroup.cs b/src/net/Netdroid/Generated/Android/Net/Rtp/AudioGroup.cs
index 59f3fb8d5..ef60ec785 100644
--- a/src/net/Netdroid/Generated/Android/Net/Rtp/AudioGroup.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Rtp/AudioGroup.cs
@@ -33,7 +33,7 @@ public partial class AudioGroup
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AudioGroup(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -49,28 +49,28 @@ public AudioGroup(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#MODE_ECHO_SUPPRESSION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_ECHO_SUPPRESSION { get { if (!_MODE_ECHO_SUPPRESSIONReady) { _MODE_ECHO_SUPPRESSIONContent = SGetField<int>(LocalBridgeClazz, "MODE_ECHO_SUPPRESSION"); _MODE_ECHO_SUPPRESSIONReady = true; } return _MODE_ECHO_SUPPRESSIONContent; } }
         private static int _MODE_ECHO_SUPPRESSIONContent = default;
         private static bool _MODE_ECHO_SUPPRESSIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#MODE_MUTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_MUTED { get { if (!_MODE_MUTEDReady) { _MODE_MUTEDContent = SGetField<int>(LocalBridgeClazz, "MODE_MUTED"); _MODE_MUTEDReady = true; } return _MODE_MUTEDContent; } }
         private static int _MODE_MUTEDContent = default;
         private static bool _MODE_MUTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#MODE_NORMAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_NORMAL { get { if (!_MODE_NORMALReady) { _MODE_NORMALContent = SGetField<int>(LocalBridgeClazz, "MODE_NORMAL"); _MODE_NORMALReady = true; } return _MODE_NORMALContent; } }
         private static int _MODE_NORMALContent = default;
         private static bool _MODE_NORMALReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#MODE_ON_HOLD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_ON_HOLD { get { if (!_MODE_ON_HOLDReady) { _MODE_ON_HOLDContent = SGetField<int>(LocalBridgeClazz, "MODE_ON_HOLD"); _MODE_ON_HOLDReady = true; } return _MODE_ON_HOLDContent; } }
         private static int _MODE_ON_HOLDContent = default;
         private static bool _MODE_ON_HOLDReady = false; // this is used because in case of generics 
@@ -83,25 +83,27 @@ public AudioGroup(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#getMode()"/> <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#setMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#getStreams()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mode
+        /// <returns><see cref="Android.Net.Rtp.AudioStream"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Rtp.AudioStream[] GetStreams()
         {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); } set { IExecuteWithSignature("setMode", "(I)V", value); }
+            return IExecuteWithSignatureArray<Android.Net.Rtp.AudioStream>("getStreams", "()[Landroid/net/rtp/AudioStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#getStreams()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#getMode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Rtp.AudioStream[] Streams
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMode()
         {
-            get { return IExecuteWithSignatureArray<Android.Net.Rtp.AudioStream>("getStreams", "()[Landroid/net/rtp/AudioStream;"); }
+            return IExecuteWithSignature<int>("getMode", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#clear()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
@@ -110,11 +112,20 @@ public void Clear()
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#sendDtmf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendDtmf(int arg0)
         {
             IExecuteWithSignature("sendDtmf", "(I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioGroup.html#setMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetMode(int arg0)
+        {
+            IExecuteWithSignature("setMode", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/Rtp/AudioStream.cs b/src/net/Netdroid/Generated/Android/Net/Rtp/AudioStream.cs
index 97092155b..1d798d398 100644
--- a/src/net/Netdroid/Generated/Android/Net/Rtp/AudioStream.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Rtp/AudioStream.cs
@@ -34,7 +34,7 @@ public partial class AudioStream
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <exception cref="Java.Net.SocketException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AudioStream(Java.Net.InetAddress arg0)
             : base(arg0)
         {
@@ -56,38 +56,59 @@ public AudioStream(Java.Net.InetAddress arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#getCodec()"/> <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#setCodec(android.net.rtp.AudioCodec)"/>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#getCodec()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Rtp.AudioCodec Codec
+        /// <returns><see cref="Android.Net.Rtp.AudioCodec"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Rtp.AudioCodec GetCodec()
         {
-            get { return IExecuteWithSignature<Android.Net.Rtp.AudioCodec>("getCodec", "()Landroid/net/rtp/AudioCodec;"); } set { IExecuteWithSignature("setCodec", "(Landroid/net/rtp/AudioCodec;)V", value); }
+            return IExecuteWithSignature<Android.Net.Rtp.AudioCodec>("getCodec", "()Landroid/net/rtp/AudioCodec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#getDtmfType()"/> <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#setDtmfType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#getGroup()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int DtmfType
+        /// <returns><see cref="Android.Net.Rtp.AudioGroup"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Rtp.AudioGroup GetGroup()
         {
-            get { return IExecuteWithSignature<int>("getDtmfType", "()I"); } set { IExecuteWithSignature("setDtmfType", "(I)V", value); }
+            return IExecuteWithSignature<Android.Net.Rtp.AudioGroup>("getGroup", "()Landroid/net/rtp/AudioGroup;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#getGroup()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#getDtmfType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Rtp.AudioGroup Group
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetDtmfType()
         {
-            get { return IExecuteWithSignature<Android.Net.Rtp.AudioGroup>("getGroup", "()Landroid/net/rtp/AudioGroup;"); }
+            return IExecuteWithSignature<int>("getDtmfType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#join(android.net.rtp.AudioGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Rtp.AudioGroup"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Join(Android.Net.Rtp.AudioGroup arg0)
         {
             IExecuteWithSignature("join", "(Landroid/net/rtp/AudioGroup;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#setCodec(android.net.rtp.AudioCodec)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Rtp.AudioCodec"/></param>
+        [global::System.Obsolete()]
+        public void SetCodec(Android.Net.Rtp.AudioCodec arg0)
+        {
+            IExecuteWithSignature("setCodec", "(Landroid/net/rtp/AudioCodec;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/AudioStream.html#setDtmfType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetDtmfType(int arg0)
+        {
+            IExecuteWithSignature("setDtmfType", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/Rtp/RtpStream.cs b/src/net/Netdroid/Generated/Android/Net/Rtp/RtpStream.cs
index 361ce7ffe..dfb78753d 100644
--- a/src/net/Netdroid/Generated/Android/Net/Rtp/RtpStream.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Rtp/RtpStream.cs
@@ -40,21 +40,21 @@ public partial class RtpStream
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#MODE_NORMAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_NORMAL { get { if (!_MODE_NORMALReady) { _MODE_NORMALContent = SGetField<int>(LocalBridgeClazz, "MODE_NORMAL"); _MODE_NORMALReady = true; } return _MODE_NORMALContent; } }
         private static int _MODE_NORMALContent = default;
         private static bool _MODE_NORMALReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#MODE_RECEIVE_ONLY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_RECEIVE_ONLY { get { if (!_MODE_RECEIVE_ONLYReady) { _MODE_RECEIVE_ONLYContent = SGetField<int>(LocalBridgeClazz, "MODE_RECEIVE_ONLY"); _MODE_RECEIVE_ONLYReady = true; } return _MODE_RECEIVE_ONLYContent; } }
         private static int _MODE_RECEIVE_ONLYContent = default;
         private static bool _MODE_RECEIVE_ONLYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#MODE_SEND_ONLY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_SEND_ONLY { get { if (!_MODE_SEND_ONLYReady) { _MODE_SEND_ONLYContent = SGetField<int>(LocalBridgeClazz, "MODE_SEND_ONLY"); _MODE_SEND_ONLYReady = true; } return _MODE_SEND_ONLYContent; } }
         private static int _MODE_SEND_ONLYContent = default;
         private static bool _MODE_SEND_ONLYReady = false; // this is used because in case of generics 
@@ -67,60 +67,65 @@ public partial class RtpStream
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getLocalAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#isBusy()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Net.InetAddress LocalAddress
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsBusy()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getLocalAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<bool>("isBusy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getLocalPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getLocalPort()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int LocalPort
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetLocalPort()
         {
-            get { return IExecuteWithSignature<int>("getLocalPort", "()I"); }
+            return IExecuteWithSignature<int>("getLocalPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getMode()"/> <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#setMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getMode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mode
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMode()
         {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); } set { IExecuteWithSignature("setMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getRemoteAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getRemotePort()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Net.InetAddress RemoteAddress
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetRemotePort()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getRemoteAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<int>("getRemotePort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getRemotePort()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getLocalAddress()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int RemotePort
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        [global::System.Obsolete()]
+        public Java.Net.InetAddress GetLocalAddress()
         {
-            get { return IExecuteWithSignature<int>("getRemotePort", "()I"); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getLocalAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#isBusy()"/>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#getRemoteAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsBusy()
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        [global::System.Obsolete()]
+        public Java.Net.InetAddress GetRemoteAddress()
         {
-            return IExecuteWithSignature<bool>("isBusy", "()Z");
+            return IExecuteWithSignature<Java.Net.InetAddress>("getRemoteAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#associate(java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Associate(Java.Net.InetAddress arg0, int arg1)
         {
             IExecute("associate", arg0, arg1);
@@ -128,11 +133,20 @@ public void Associate(Java.Net.InetAddress arg0, int arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#release()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Release()
         {
             IExecuteWithSignature("release", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/rtp/RtpStream.html#setMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetMode(int arg0)
+        {
+            IExecuteWithSignature("setMode", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/SSLCertificateSocketFactory.cs b/src/net/Netdroid/Generated/Android/Net/SSLCertificateSocketFactory.cs
index 3fef58f4e..c88734479 100644
--- a/src/net/Netdroid/Generated/Android/Net/SSLCertificateSocketFactory.cs
+++ b/src/net/Netdroid/Generated/Android/Net/SSLCertificateSocketFactory.cs
@@ -33,7 +33,7 @@ public partial class SSLCertificateSocketFactory
         /// <see href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SSLCertificateSocketFactory(int arg0)
             : base(arg0)
         {
@@ -55,7 +55,7 @@ public SSLCertificateSocketFactory(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Javax.Net.SocketFactory"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Javax.Net.SocketFactory GetDefault(int arg0)
         {
             return SExecuteWithSignature<Javax.Net.SocketFactory>(LocalBridgeClazz, "getDefault", "(I)Ljavax/net/SocketFactory;", arg0);
@@ -66,7 +66,7 @@ public static Javax.Net.SocketFactory GetDefault(int arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Net.SSLSessionCache"/></param>
         /// <returns><see cref="Javax.Net.Ssl.SSLSocketFactory"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Javax.Net.Ssl.SSLSocketFactory GetDefault(int arg0, Android.Net.SSLSessionCache arg1)
         {
             return SExecute<Javax.Net.Ssl.SSLSocketFactory>(LocalBridgeClazz, "getDefault", arg0, arg1);
@@ -77,7 +77,7 @@ public static Javax.Net.Ssl.SSLSocketFactory GetDefault(int arg0, Android.Net.SS
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Net.SSLSessionCache"/></param>
         /// <returns><see cref="Javax.Net.Ssl.SSLSocketFactory"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Javax.Net.Ssl.SSLSocketFactory GetInsecure(int arg0, Android.Net.SSLSessionCache arg1)
         {
             return SExecute<Javax.Net.Ssl.SSLSocketFactory>(LocalBridgeClazz, "getInsecure", arg0, arg1);
@@ -91,7 +91,7 @@ public static Javax.Net.Ssl.SSLSocketFactory GetInsecure(int arg0, Android.Net.S
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Socket"/></param>
         /// <returns><see cref="byte"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte[] GetNpnSelectedProtocol(Java.Net.Socket arg0)
         {
             return IExecuteWithSignatureArray<byte>("getNpnSelectedProtocol", "(Ljava/net/Socket;)[B", arg0);
@@ -101,7 +101,7 @@ public byte[] GetNpnSelectedProtocol(Java.Net.Socket arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Socket"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetHostname(Java.Net.Socket arg0, Java.Lang.String arg1)
         {
             IExecute("setHostname", arg0, arg1);
@@ -110,7 +110,7 @@ public void SetHostname(Java.Net.Socket arg0, Java.Lang.String arg1)
         /// <see href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory.html#setKeyManagers(javax.net.ssl.KeyManager[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.KeyManager"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetKeyManagers(Javax.Net.Ssl.KeyManager[] arg0)
         {
             IExecuteWithSignature("setKeyManagers", "([Ljavax/net/ssl/KeyManager;)V", new object[] { arg0 });
@@ -119,7 +119,7 @@ public void SetKeyManagers(Javax.Net.Ssl.KeyManager[] arg0)
         /// <see href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory.html#setNpnProtocols(byte[][])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetNpnProtocols(byte[][] arg0)
         {
             IExecuteWithSignature("setNpnProtocols", "([[B)V", new object[] { arg0 });
@@ -128,7 +128,7 @@ public void SetNpnProtocols(byte[][] arg0)
         /// <see href="https://developer.android.com/reference/android/net/SSLCertificateSocketFactory.html#setTrustManagers(javax.net.ssl.TrustManager[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.TrustManager"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTrustManagers(Javax.Net.Ssl.TrustManager[] arg0)
         {
             IExecuteWithSignature("setTrustManagers", "([Ljavax/net/ssl/TrustManager;)V", new object[] { arg0 });
@@ -138,7 +138,7 @@ public void SetTrustManagers(Javax.Net.Ssl.TrustManager[] arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Socket"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetUseSessionTickets(Java.Net.Socket arg0, bool arg1)
         {
             IExecute("setUseSessionTickets", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Net/Sip/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Sip/AllPackageClasses.cs
index 989fc791f..583673229 100644
--- a/src/net/Netdroid/Generated/Android/Net/Sip/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Sip/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Net.Sip
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SipAudioCall : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SipAudioCall>
     {
         const string _bridgeClassName = "android.net.sip.SipAudioCall";
@@ -71,39 +71,25 @@ public SipAudioCall(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html"/>
         /// </summary>
-        [System.Obsolete()]
-        public partial class Listener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+        [global::System.Obsolete()]
+        public partial class Listener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Listener>
         {
+            const string _bridgeClassName = "android.net.sip.SipAudioCall$Listener";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            public Listener() { InitializeHandlers(); }
-
-        #warning Remember to build the Java class for event listener
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-        #region ListenerDirect
-        /// <summary>
-        /// Direct override of <see cref="Listener"/> or its generic type if there is one
-        /// </summary>
-        public partial class ListenerDirect : Listener
-        {
+            public Listener() { }
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            public override bool AutoInit => false;
+            public Listener(params object[] args) : base(args) { }
 
-            /// <inheritdoc />
-            protected override void InitializeHandlers() { }
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.sip.SipAudioCall$Listener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -120,6 +106,9 @@ protected override void InitializeHandlers() { }
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
             /// </summary>
             public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
         }
         #endregion
 
@@ -131,7 +120,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SipErrorCode : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SipErrorCode>
     {
         const string _bridgeClassName = "android.net.sip.SipErrorCode";
@@ -176,7 +165,7 @@ public SipErrorCode(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/sip/SipException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SipException : Java.Lang.Exception
     {
         const string _bridgeClassName = "android.net.sip.SipException";
@@ -194,7 +183,7 @@ public partial class SipException : Java.Lang.Exception
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/sip/SipManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SipManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SipManager>
     {
         const string _bridgeClassName = "android.net.sip.SipManager";
@@ -239,7 +228,7 @@ public SipManager(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SipProfile : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SipProfile>
     {
         const string _bridgeClassName = "android.net.sip.SipProfile";
@@ -280,7 +269,7 @@ public SipProfile(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.Builder.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
             const string _bridgeClassName = "android.net.sip.SipProfile$Builder";
@@ -329,7 +318,7 @@ public Builder(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/sip/SipRegistrationListener.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SipRegistrationListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
         /// <summary>
@@ -337,10 +326,13 @@ public partial class SipRegistrationListener : MASES.JCOBridge.C2JBridge.JVMBrid
         /// </summary>
         public SipRegistrationListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.net.sip.SipRegistrationListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.net.sip.SipRegistrationListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -362,10 +354,13 @@ public partial class SipRegistrationListenerDirect : SipRegistrationListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.net.sip.SipRegistrationListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.net.sip.SipRegistrationListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -389,7 +384,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SipSession : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SipSession>
     {
         const string _bridgeClassName = "android.net.sip.SipSession";
@@ -430,39 +425,25 @@ public SipSession(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html"/>
         /// </summary>
-        [System.Obsolete()]
-        public partial class Listener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+        [global::System.Obsolete()]
+        public partial class Listener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Listener>
         {
+            const string _bridgeClassName = "android.net.sip.SipSession$Listener";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            public Listener() { InitializeHandlers(); }
-
-        #warning Remember to build the Java class for event listener
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-        #region ListenerDirect
-        /// <summary>
-        /// Direct override of <see cref="Listener"/> or its generic type if there is one
-        /// </summary>
-        public partial class ListenerDirect : Listener
-        {
+            public Listener() { }
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            public override bool AutoInit => false;
+            public Listener(params object[] args) : base(args) { }
 
-            /// <inheritdoc />
-            protected override void InitializeHandlers() { }
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.sip.SipSession$Listener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -479,6 +460,9 @@ protected override void InitializeHandlers() { }
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
             /// </summary>
             public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
         }
         #endregion
 
@@ -486,7 +470,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class State : MASES.JCOBridge.C2JBridge.JVMBridgeBase<State>
         {
             const string _bridgeClassName = "android.net.sip.SipSession$State";
diff --git a/src/net/Netdroid/Generated/Android/Net/Sip/SipAudioCall.cs b/src/net/Netdroid/Generated/Android/Net/Sip/SipAudioCall.cs
index 16c4a796a..8b5f8f580 100644
--- a/src/net/Netdroid/Generated/Android/Net/Sip/SipAudioCall.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Sip/SipAudioCall.cs
@@ -34,7 +34,7 @@ public partial class SipAudioCall
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Net.Sip.SipProfile"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SipAudioCall(Android.Content.Context arg0, Android.Net.Sip.SipProfile arg1)
             : base(arg0, arg1)
         {
@@ -56,34 +56,28 @@ public SipAudioCall(Android.Content.Context arg0, Android.Net.Sip.SipProfile arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#getLocalProfile()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#getLocalProfile()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Sip.SipProfile LocalProfile
+        /// <returns><see cref="Android.Net.Sip.SipProfile"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Sip.SipProfile GetLocalProfile()
         {
-            get { return IExecuteWithSignature<Android.Net.Sip.SipProfile>("getLocalProfile", "()Landroid/net/sip/SipProfile;"); }
+            return IExecuteWithSignature<Android.Net.Sip.SipProfile>("getLocalProfile", "()Landroid/net/sip/SipProfile;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#getPeerProfile()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#getPeerProfile()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Sip.SipProfile PeerProfile
+        /// <returns><see cref="Android.Net.Sip.SipProfile"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Sip.SipProfile GetPeerProfile()
         {
-            get { return IExecuteWithSignature<Android.Net.Sip.SipProfile>("getPeerProfile", "()Landroid/net/sip/SipProfile;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#getState()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int State
-        {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<Android.Net.Sip.SipProfile>("getPeerProfile", "()Landroid/net/sip/SipProfile;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#isInCall()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsInCall()
         {
             return IExecuteWithSignature<bool>("isInCall", "()Z");
@@ -92,7 +86,7 @@ public bool IsInCall()
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#isMuted()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsMuted()
         {
             return IExecuteWithSignature<bool>("isMuted", "()Z");
@@ -101,17 +95,26 @@ public bool IsMuted()
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#isOnHold()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsOnHold()
         {
             return IExecuteWithSignature<bool>("isOnHold", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#getState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetState()
+        {
+            return IExecuteWithSignature<int>("getState", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#answerCall(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AnswerCall(int arg0)
         {
             IExecuteWithSignature("answerCall", "(I)V", arg0);
@@ -122,7 +125,7 @@ public void AnswerCall(int arg0)
         /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AttachCall(Android.Net.Sip.SipSession arg0, Java.Lang.String arg1)
         {
             IExecute("attachCall", arg0, arg1);
@@ -130,7 +133,7 @@ public void AttachCall(Android.Net.Sip.SipSession arg0, Java.Lang.String arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#close()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
@@ -140,7 +143,7 @@ public void Close()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ContinueCall(int arg0)
         {
             IExecuteWithSignature("continueCall", "(I)V", arg0);
@@ -149,7 +152,7 @@ public void ContinueCall(int arg0)
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#endCall()"/>
         /// </summary>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void EndCall()
         {
             IExecuteWithSignature("endCall", "()V");
@@ -159,7 +162,7 @@ public void EndCall()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void HoldCall(int arg0)
         {
             IExecuteWithSignature("holdCall", "(I)V", arg0);
@@ -171,7 +174,7 @@ public void HoldCall(int arg0)
         /// <param name="arg1"><see cref="Android.Net.Sip.SipSession"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void MakeCall(Android.Net.Sip.SipProfile arg0, Android.Net.Sip.SipSession arg1, int arg2)
         {
             IExecute("makeCall", arg0, arg1, arg2);
@@ -181,7 +184,7 @@ public void MakeCall(Android.Net.Sip.SipProfile arg0, Android.Net.Sip.SipSession
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Os.Message"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendDtmf(int arg0, Android.Os.Message arg1)
         {
             IExecute("sendDtmf", arg0, arg1);
@@ -190,7 +193,7 @@ public void SendDtmf(int arg0, Android.Os.Message arg1)
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#sendDtmf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendDtmf(int arg0)
         {
             IExecuteWithSignature("sendDtmf", "(I)V", arg0);
@@ -200,7 +203,7 @@ public void SendDtmf(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall.Listener"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetListener(Android.Net.Sip.SipAudioCall.Listener arg0, bool arg1)
         {
             IExecute("setListener", arg0, arg1);
@@ -209,7 +212,7 @@ public void SetListener(Android.Net.Sip.SipAudioCall.Listener arg0, bool arg1)
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#setListener(android.net.sip.SipAudioCall.Listener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall.Listener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetListener(Android.Net.Sip.SipAudioCall.Listener arg0)
         {
             IExecuteWithSignature("setListener", "(Landroid/net/sip/SipAudioCall$Listener;)V", arg0);
@@ -218,7 +221,7 @@ public void SetListener(Android.Net.Sip.SipAudioCall.Listener arg0)
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#setSpeakerMode(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSpeakerMode(bool arg0)
         {
             IExecuteWithSignature("setSpeakerMode", "(Z)V", arg0);
@@ -226,7 +229,7 @@ public void SetSpeakerMode(bool arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#startAudio()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartAudio()
         {
             IExecuteWithSignature("startAudio", "()V");
@@ -234,7 +237,7 @@ public void StartAudio()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.html#toggleMute()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ToggleMute()
         {
             IExecuteWithSignature("toggleMute", "()V");
@@ -262,284 +265,13 @@ public partial class Listener
 
             #endregion
 
-            #region Instance methods
-            /// <summary>
-            /// Handlers initializer for <see cref="Listener"/>
-            /// </summary>
-            protected virtual void InitializeHandlers()
-            {
-                AddEventHandler("onCallBusy", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnCallBusyEventHandler));
-                AddEventHandler("onCallEnded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnCallEndedEventHandler));
-                AddEventHandler("onCallEstablished", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnCallEstablishedEventHandler));
-                AddEventHandler("onCallHeld", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnCallHeldEventHandler));
-                AddEventHandler("onCalling", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnCallingEventHandler));
-                AddEventHandler("onChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnChangedEventHandler));
-                AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnErrorEventHandler));
-                AddEventHandler("onReadyToCall", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnReadyToCallEventHandler));
-                AddEventHandler("onRinging", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnRingingEventHandler));
-                AddEventHandler("onRingingBack", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>>>(OnRingingBackEventHandler));
-
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallBusy(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCallBusy"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall> OnOnCallBusy { get; set; } = null;
-
-            void OnCallBusyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnCallBusy != null) ? OnOnCallBusy : OnCallBusy;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallBusy(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public virtual void OnCallBusy(Android.Net.Sip.SipAudioCall arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallEnded(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCallEnded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall> OnOnCallEnded { get; set; } = null;
-
-            void OnCallEndedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnCallEnded != null) ? OnOnCallEnded : OnCallEnded;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallEnded(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public virtual void OnCallEnded(Android.Net.Sip.SipAudioCall arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallEstablished(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCallEstablished"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall> OnOnCallEstablished { get; set; } = null;
-
-            void OnCallEstablishedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnCallEstablished != null) ? OnOnCallEstablished : OnCallEstablished;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallEstablished(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public virtual void OnCallEstablished(Android.Net.Sip.SipAudioCall arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallHeld(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCallHeld"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall> OnOnCallHeld { get; set; } = null;
-
-            void OnCallHeldEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnCallHeld != null) ? OnOnCallHeld : OnCallHeld;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallHeld(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public virtual void OnCallHeld(Android.Net.Sip.SipAudioCall arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCalling(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCalling"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall> OnOnCalling { get; set; } = null;
-
-            void OnCallingEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnCalling != null) ? OnOnCalling : OnCalling;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCalling(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public virtual void OnCalling(Android.Net.Sip.SipAudioCall arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onChanged(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall> OnOnChanged { get; set; } = null;
-
-            void OnChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnChanged != null) ? OnOnChanged : OnChanged;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onChanged(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public virtual void OnChanged(Android.Net.Sip.SipAudioCall arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onError(android.net.sip.SipAudioCall,int,java.lang.String)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall, int, Java.Lang.String> OnOnError { get; set; } = null;
-
-            void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnError != null) ? OnOnError : OnError;
-                methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Java.Lang.String>(1));
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onError(android.net.sip.SipAudioCall,int,java.lang.String)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public virtual void OnError(Android.Net.Sip.SipAudioCall arg0, int arg1, Java.Lang.String arg2)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onReadyToCall(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnReadyToCall"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall> OnOnReadyToCall { get; set; } = null;
-
-            void OnReadyToCallEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnReadyToCall != null) ? OnOnReadyToCall : OnReadyToCall;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onReadyToCall(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public virtual void OnReadyToCall(Android.Net.Sip.SipAudioCall arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onRinging(android.net.sip.SipAudioCall,android.net.sip.SipProfile)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnRinging"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall, Android.Net.Sip.SipProfile> OnOnRinging { get; set; } = null;
-
-            void OnRingingEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnRinging != null) ? OnOnRinging : OnRinging;
-                methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Net.Sip.SipProfile>(0));
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onRinging(android.net.sip.SipAudioCall,android.net.sip.SipProfile)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            /// <param name="arg1"><see cref="Android.Net.Sip.SipProfile"/></param>
-            [System.Obsolete()]
-            public virtual void OnRinging(Android.Net.Sip.SipAudioCall arg0, Android.Net.Sip.SipProfile arg1)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onRingingBack(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnRingingBack"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipAudioCall> OnOnRingingBack { get; set; } = null;
-
-            void OnRingingBackEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipAudioCall>> data)
-            {
-                var methodToExecute = (OnOnRingingBack != null) ? OnOnRingingBack : OnRingingBack;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onRingingBack(android.net.sip.SipAudioCall)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public virtual void OnRingingBack(Android.Net.Sip.SipAudioCall arg0)
-            {
-                
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-        #region ListenerDirect
-        public partial class ListenerDirect
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
             #region Instance methods
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallBusy(android.net.sip.SipAudioCall)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public override void OnCallBusy(Android.Net.Sip.SipAudioCall arg0)
+            [global::System.Obsolete()]
+            public void OnCallBusy(Android.Net.Sip.SipAudioCall arg0)
             {
                 IExecuteWithSignature("onCallBusy", "(Landroid/net/sip/SipAudioCall;)V", arg0);
             }
@@ -547,8 +279,8 @@ public override void OnCallBusy(Android.Net.Sip.SipAudioCall arg0)
             /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallEnded(android.net.sip.SipAudioCall)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public override void OnCallEnded(Android.Net.Sip.SipAudioCall arg0)
+            [global::System.Obsolete()]
+            public void OnCallEnded(Android.Net.Sip.SipAudioCall arg0)
             {
                 IExecuteWithSignature("onCallEnded", "(Landroid/net/sip/SipAudioCall;)V", arg0);
             }
@@ -556,8 +288,8 @@ public override void OnCallEnded(Android.Net.Sip.SipAudioCall arg0)
             /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallEstablished(android.net.sip.SipAudioCall)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public override void OnCallEstablished(Android.Net.Sip.SipAudioCall arg0)
+            [global::System.Obsolete()]
+            public void OnCallEstablished(Android.Net.Sip.SipAudioCall arg0)
             {
                 IExecuteWithSignature("onCallEstablished", "(Landroid/net/sip/SipAudioCall;)V", arg0);
             }
@@ -565,8 +297,8 @@ public override void OnCallEstablished(Android.Net.Sip.SipAudioCall arg0)
             /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCallHeld(android.net.sip.SipAudioCall)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public override void OnCallHeld(Android.Net.Sip.SipAudioCall arg0)
+            [global::System.Obsolete()]
+            public void OnCallHeld(Android.Net.Sip.SipAudioCall arg0)
             {
                 IExecuteWithSignature("onCallHeld", "(Landroid/net/sip/SipAudioCall;)V", arg0);
             }
@@ -574,8 +306,8 @@ public override void OnCallHeld(Android.Net.Sip.SipAudioCall arg0)
             /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onCalling(android.net.sip.SipAudioCall)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public override void OnCalling(Android.Net.Sip.SipAudioCall arg0)
+            [global::System.Obsolete()]
+            public void OnCalling(Android.Net.Sip.SipAudioCall arg0)
             {
                 IExecuteWithSignature("onCalling", "(Landroid/net/sip/SipAudioCall;)V", arg0);
             }
@@ -583,8 +315,8 @@ public override void OnCalling(Android.Net.Sip.SipAudioCall arg0)
             /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onChanged(android.net.sip.SipAudioCall)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public override void OnChanged(Android.Net.Sip.SipAudioCall arg0)
+            [global::System.Obsolete()]
+            public void OnChanged(Android.Net.Sip.SipAudioCall arg0)
             {
                 IExecuteWithSignature("onChanged", "(Landroid/net/sip/SipAudioCall;)V", arg0);
             }
@@ -594,8 +326,8 @@ public override void OnChanged(Android.Net.Sip.SipAudioCall arg0)
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public override void OnError(Android.Net.Sip.SipAudioCall arg0, int arg1, Java.Lang.String arg2)
+            [global::System.Obsolete()]
+            public void OnError(Android.Net.Sip.SipAudioCall arg0, int arg1, Java.Lang.String arg2)
             {
                 IExecute("onError", arg0, arg1, arg2);
             }
@@ -603,8 +335,8 @@ public override void OnError(Android.Net.Sip.SipAudioCall arg0, int arg1, Java.L
             /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onReadyToCall(android.net.sip.SipAudioCall)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public override void OnReadyToCall(Android.Net.Sip.SipAudioCall arg0)
+            [global::System.Obsolete()]
+            public void OnReadyToCall(Android.Net.Sip.SipAudioCall arg0)
             {
                 IExecuteWithSignature("onReadyToCall", "(Landroid/net/sip/SipAudioCall;)V", arg0);
             }
@@ -613,8 +345,8 @@ public override void OnReadyToCall(Android.Net.Sip.SipAudioCall arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
             /// <param name="arg1"><see cref="Android.Net.Sip.SipProfile"/></param>
-            [System.Obsolete()]
-            public override void OnRinging(Android.Net.Sip.SipAudioCall arg0, Android.Net.Sip.SipProfile arg1)
+            [global::System.Obsolete()]
+            public void OnRinging(Android.Net.Sip.SipAudioCall arg0, Android.Net.Sip.SipProfile arg1)
             {
                 IExecute("onRinging", arg0, arg1);
             }
@@ -622,8 +354,8 @@ public override void OnRinging(Android.Net.Sip.SipAudioCall arg0, Android.Net.Si
             /// <see href="https://developer.android.com/reference/android/net/sip/SipAudioCall.Listener.html#onRingingBack(android.net.sip.SipAudioCall)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipAudioCall"/></param>
-            [System.Obsolete()]
-            public override void OnRingingBack(Android.Net.Sip.SipAudioCall arg0)
+            [global::System.Obsolete()]
+            public void OnRingingBack(Android.Net.Sip.SipAudioCall arg0)
             {
                 IExecuteWithSignature("onRingingBack", "(Landroid/net/sip/SipAudioCall;)V", arg0);
             }
diff --git a/src/net/Netdroid/Generated/Android/Net/Sip/SipErrorCode.cs b/src/net/Netdroid/Generated/Android/Net/Sip/SipErrorCode.cs
index eceaaba5a..5a820c903 100644
--- a/src/net/Netdroid/Generated/Android/Net/Sip/SipErrorCode.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Sip/SipErrorCode.cs
@@ -40,91 +40,91 @@ public partial class SipErrorCode
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#CLIENT_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CLIENT_ERROR { get { if (!_CLIENT_ERRORReady) { _CLIENT_ERRORContent = SGetField<int>(LocalBridgeClazz, "CLIENT_ERROR"); _CLIENT_ERRORReady = true; } return _CLIENT_ERRORContent; } }
         private static int _CLIENT_ERRORContent = default;
         private static bool _CLIENT_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#CROSS_DOMAIN_AUTHENTICATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CROSS_DOMAIN_AUTHENTICATION { get { if (!_CROSS_DOMAIN_AUTHENTICATIONReady) { _CROSS_DOMAIN_AUTHENTICATIONContent = SGetField<int>(LocalBridgeClazz, "CROSS_DOMAIN_AUTHENTICATION"); _CROSS_DOMAIN_AUTHENTICATIONReady = true; } return _CROSS_DOMAIN_AUTHENTICATIONContent; } }
         private static int _CROSS_DOMAIN_AUTHENTICATIONContent = default;
         private static bool _CROSS_DOMAIN_AUTHENTICATIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#DATA_CONNECTION_LOST"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DATA_CONNECTION_LOST { get { if (!_DATA_CONNECTION_LOSTReady) { _DATA_CONNECTION_LOSTContent = SGetField<int>(LocalBridgeClazz, "DATA_CONNECTION_LOST"); _DATA_CONNECTION_LOSTReady = true; } return _DATA_CONNECTION_LOSTContent; } }
         private static int _DATA_CONNECTION_LOSTContent = default;
         private static bool _DATA_CONNECTION_LOSTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#IN_PROGRESS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int IN_PROGRESS { get { if (!_IN_PROGRESSReady) { _IN_PROGRESSContent = SGetField<int>(LocalBridgeClazz, "IN_PROGRESS"); _IN_PROGRESSReady = true; } return _IN_PROGRESSContent; } }
         private static int _IN_PROGRESSContent = default;
         private static bool _IN_PROGRESSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#INVALID_CREDENTIALS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int INVALID_CREDENTIALS { get { if (!_INVALID_CREDENTIALSReady) { _INVALID_CREDENTIALSContent = SGetField<int>(LocalBridgeClazz, "INVALID_CREDENTIALS"); _INVALID_CREDENTIALSReady = true; } return _INVALID_CREDENTIALSContent; } }
         private static int _INVALID_CREDENTIALSContent = default;
         private static bool _INVALID_CREDENTIALSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#INVALID_REMOTE_URI"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int INVALID_REMOTE_URI { get { if (!_INVALID_REMOTE_URIReady) { _INVALID_REMOTE_URIContent = SGetField<int>(LocalBridgeClazz, "INVALID_REMOTE_URI"); _INVALID_REMOTE_URIReady = true; } return _INVALID_REMOTE_URIContent; } }
         private static int _INVALID_REMOTE_URIContent = default;
         private static bool _INVALID_REMOTE_URIReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#NO_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NO_ERROR { get { if (!_NO_ERRORReady) { _NO_ERRORContent = SGetField<int>(LocalBridgeClazz, "NO_ERROR"); _NO_ERRORReady = true; } return _NO_ERRORContent; } }
         private static int _NO_ERRORContent = default;
         private static bool _NO_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#PEER_NOT_REACHABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PEER_NOT_REACHABLE { get { if (!_PEER_NOT_REACHABLEReady) { _PEER_NOT_REACHABLEContent = SGetField<int>(LocalBridgeClazz, "PEER_NOT_REACHABLE"); _PEER_NOT_REACHABLEReady = true; } return _PEER_NOT_REACHABLEContent; } }
         private static int _PEER_NOT_REACHABLEContent = default;
         private static bool _PEER_NOT_REACHABLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#SERVER_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SERVER_ERROR { get { if (!_SERVER_ERRORReady) { _SERVER_ERRORContent = SGetField<int>(LocalBridgeClazz, "SERVER_ERROR"); _SERVER_ERRORReady = true; } return _SERVER_ERRORContent; } }
         private static int _SERVER_ERRORContent = default;
         private static bool _SERVER_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#SERVER_UNREACHABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SERVER_UNREACHABLE { get { if (!_SERVER_UNREACHABLEReady) { _SERVER_UNREACHABLEContent = SGetField<int>(LocalBridgeClazz, "SERVER_UNREACHABLE"); _SERVER_UNREACHABLEReady = true; } return _SERVER_UNREACHABLEContent; } }
         private static int _SERVER_UNREACHABLEContent = default;
         private static bool _SERVER_UNREACHABLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#SOCKET_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SOCKET_ERROR { get { if (!_SOCKET_ERRORReady) { _SOCKET_ERRORContent = SGetField<int>(LocalBridgeClazz, "SOCKET_ERROR"); _SOCKET_ERRORReady = true; } return _SOCKET_ERRORContent; } }
         private static int _SOCKET_ERRORContent = default;
         private static bool _SOCKET_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#TIME_OUT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TIME_OUT { get { if (!_TIME_OUTReady) { _TIME_OUTContent = SGetField<int>(LocalBridgeClazz, "TIME_OUT"); _TIME_OUTReady = true; } return _TIME_OUTContent; } }
         private static int _TIME_OUTContent = default;
         private static bool _TIME_OUTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipErrorCode.html#TRANSACTION_TERMINTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSACTION_TERMINTED { get { if (!_TRANSACTION_TERMINTEDReady) { _TRANSACTION_TERMINTEDContent = SGetField<int>(LocalBridgeClazz, "TRANSACTION_TERMINTED"); _TRANSACTION_TERMINTEDReady = true; } return _TRANSACTION_TERMINTEDContent; } }
         private static int _TRANSACTION_TERMINTEDContent = default;
         private static bool _TRANSACTION_TERMINTEDReady = false; // this is used because in case of generics 
@@ -137,7 +137,7 @@ public partial class SipErrorCode
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ToString(int arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(I)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Net/Sip/SipManager.cs b/src/net/Netdroid/Generated/Android/Net/Sip/SipManager.cs
index 4fcde32d0..c0ebed2f1 100644
--- a/src/net/Netdroid/Generated/Android/Net/Sip/SipManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Sip/SipManager.cs
@@ -40,21 +40,21 @@ public partial class SipManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipManager.html#INCOMING_CALL_RESULT_CODE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int INCOMING_CALL_RESULT_CODE { get { if (!_INCOMING_CALL_RESULT_CODEReady) { _INCOMING_CALL_RESULT_CODEContent = SGetField<int>(LocalBridgeClazz, "INCOMING_CALL_RESULT_CODE"); _INCOMING_CALL_RESULT_CODEReady = true; } return _INCOMING_CALL_RESULT_CODEContent; } }
         private static int _INCOMING_CALL_RESULT_CODEContent = default;
         private static bool _INCOMING_CALL_RESULT_CODEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipManager.html#EXTRA_CALL_ID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_CALL_ID { get { if (!_EXTRA_CALL_IDReady) { _EXTRA_CALL_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_CALL_ID"); _EXTRA_CALL_IDReady = true; } return _EXTRA_CALL_IDContent; } }
         private static Java.Lang.String _EXTRA_CALL_IDContent = default;
         private static bool _EXTRA_CALL_IDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipManager.html#EXTRA_OFFER_SD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_OFFER_SD { get { if (!_EXTRA_OFFER_SDReady) { _EXTRA_OFFER_SDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_OFFER_SD"); _EXTRA_OFFER_SDReady = true; } return _EXTRA_OFFER_SDContent; } }
         private static Java.Lang.String _EXTRA_OFFER_SDContent = default;
         private static bool _EXTRA_OFFER_SDReady = false; // this is used because in case of generics 
@@ -67,7 +67,7 @@ public partial class SipManager
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Android.Net.Sip.SipManager"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Sip.SipManager NewInstance(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<Android.Net.Sip.SipManager>(LocalBridgeClazz, "newInstance", "(Landroid/content/Context;)Landroid/net/sip/SipManager;", arg0);
@@ -77,7 +77,7 @@ public static Android.Net.Sip.SipManager NewInstance(Android.Content.Context arg
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsApiSupported(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isApiSupported", "(Landroid/content/Context;)Z", arg0);
@@ -87,7 +87,7 @@ public static bool IsApiSupported(Android.Content.Context arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsIncomingCallIntent(Android.Content.Intent arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isIncomingCallIntent", "(Landroid/content/Intent;)Z", arg0);
@@ -97,7 +97,7 @@ public static bool IsIncomingCallIntent(Android.Content.Intent arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsSipWifiOnly(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSipWifiOnly", "(Landroid/content/Context;)Z", arg0);
@@ -107,7 +107,7 @@ public static bool IsSipWifiOnly(Android.Content.Context arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsVoipSupported(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isVoipSupported", "(Landroid/content/Context;)Z", arg0);
@@ -117,7 +117,7 @@ public static bool IsVoipSupported(Android.Content.Context arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetCallId(Android.Content.Intent arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getCallId", "(Landroid/content/Intent;)Ljava/lang/String;", arg0);
@@ -127,7 +127,7 @@ public static Java.Lang.String GetCallId(Android.Content.Intent arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetOfferSessionDescription(Android.Content.Intent arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getOfferSessionDescription", "(Landroid/content/Intent;)Ljava/lang/String;", arg0);
@@ -145,7 +145,7 @@ public static Java.Lang.String GetOfferSessionDescription(Android.Content.Intent
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Net.Sip.SipAudioCall"/></returns>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.Sip.SipAudioCall MakeAudioCall(Android.Net.Sip.SipProfile arg0, Android.Net.Sip.SipProfile arg1, Android.Net.Sip.SipAudioCall.Listener arg2, int arg3)
         {
             return IExecute<Android.Net.Sip.SipAudioCall>("makeAudioCall", arg0, arg1, arg2, arg3);
@@ -159,7 +159,7 @@ public Android.Net.Sip.SipAudioCall MakeAudioCall(Android.Net.Sip.SipProfile arg
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Net.Sip.SipAudioCall"/></returns>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.Sip.SipAudioCall MakeAudioCall(Java.Lang.String arg0, Java.Lang.String arg1, Android.Net.Sip.SipAudioCall.Listener arg2, int arg3)
         {
             return IExecute<Android.Net.Sip.SipAudioCall>("makeAudioCall", arg0, arg1, arg2, arg3);
@@ -171,7 +171,7 @@ public Android.Net.Sip.SipAudioCall MakeAudioCall(Java.Lang.String arg0, Java.La
         /// <param name="arg1"><see cref="Android.Net.Sip.SipAudioCall.Listener"/></param>
         /// <returns><see cref="Android.Net.Sip.SipAudioCall"/></returns>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.Sip.SipAudioCall TakeAudioCall(Android.Content.Intent arg0, Android.Net.Sip.SipAudioCall.Listener arg1)
         {
             return IExecute<Android.Net.Sip.SipAudioCall>("takeAudioCall", arg0, arg1);
@@ -183,7 +183,7 @@ public Android.Net.Sip.SipAudioCall TakeAudioCall(Android.Content.Intent arg0, A
         /// <param name="arg1"><see cref="Android.Net.Sip.SipSession.Listener"/></param>
         /// <returns><see cref="Android.Net.Sip.SipSession"/></returns>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.Sip.SipSession CreateSipSession(Android.Net.Sip.SipProfile arg0, Android.Net.Sip.SipSession.Listener arg1)
         {
             return IExecute<Android.Net.Sip.SipSession>("createSipSession", arg0, arg1);
@@ -194,7 +194,7 @@ public Android.Net.Sip.SipSession CreateSipSession(Android.Net.Sip.SipProfile ar
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
         /// <returns><see cref="Android.Net.Sip.SipSession"/></returns>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.Sip.SipSession GetSessionFor(Android.Content.Intent arg0)
         {
             return IExecuteWithSignature<Android.Net.Sip.SipSession>("getSessionFor", "(Landroid/content/Intent;)Landroid/net/sip/SipSession;", arg0);
@@ -205,7 +205,7 @@ public Android.Net.Sip.SipSession GetSessionFor(Android.Content.Intent arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsOpened(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("isOpened", "(Ljava/lang/String;)Z", arg0);
@@ -216,7 +216,7 @@ public bool IsOpened(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsRegistered(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("isRegistered", "(Ljava/lang/String;)Z", arg0);
@@ -226,7 +226,7 @@ public bool IsRegistered(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Close(Java.Lang.String arg0)
         {
             IExecuteWithSignature("close", "(Ljava/lang/String;)V", arg0);
@@ -238,7 +238,7 @@ public void Close(Java.Lang.String arg0)
         /// <param name="arg1"><see cref="Android.App.PendingIntent"/></param>
         /// <param name="arg2"><see cref="Android.Net.Sip.SipRegistrationListener"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Open(Android.Net.Sip.SipProfile arg0, Android.App.PendingIntent arg1, Android.Net.Sip.SipRegistrationListener arg2)
         {
             IExecute("open", arg0, arg1, arg2);
@@ -248,7 +248,7 @@ public void Open(Android.Net.Sip.SipProfile arg0, Android.App.PendingIntent arg1
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Sip.SipProfile"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Open(Android.Net.Sip.SipProfile arg0)
         {
             IExecuteWithSignature("open", "(Landroid/net/sip/SipProfile;)V", arg0);
@@ -260,7 +260,7 @@ public void Open(Android.Net.Sip.SipProfile arg0)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Net.Sip.SipRegistrationListener"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Register(Android.Net.Sip.SipProfile arg0, int arg1, Android.Net.Sip.SipRegistrationListener arg2)
         {
             IExecute("register", arg0, arg1, arg2);
@@ -271,7 +271,7 @@ public void Register(Android.Net.Sip.SipProfile arg0, int arg1, Android.Net.Sip.
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.Net.Sip.SipRegistrationListener"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRegistrationListener(Java.Lang.String arg0, Android.Net.Sip.SipRegistrationListener arg1)
         {
             IExecute("setRegistrationListener", arg0, arg1);
@@ -282,7 +282,7 @@ public void SetRegistrationListener(Java.Lang.String arg0, Android.Net.Sip.SipRe
         /// <param name="arg0"><see cref="Android.Net.Sip.SipProfile"/></param>
         /// <param name="arg1"><see cref="Android.Net.Sip.SipRegistrationListener"/></param>
         /// <exception cref="Android.Net.Sip.SipException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Unregister(Android.Net.Sip.SipProfile arg0, Android.Net.Sip.SipRegistrationListener arg1)
         {
             IExecute("unregister", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Net/Sip/SipProfile.cs b/src/net/Netdroid/Generated/Android/Net/Sip/SipProfile.cs
index 3c3554317..a702e2dd6 100644
--- a/src/net/Netdroid/Generated/Android/Net/Sip/SipProfile.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Sip/SipProfile.cs
@@ -52,7 +52,7 @@ public partial class SipProfile : Android.Os.IParcelable, Java.Io.ISerializable,
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#CREATOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
         private static Android.Os.Parcelable.Creator _CREATORContent = default;
         private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -65,115 +65,127 @@ public partial class SipProfile : Android.Os.IParcelable, Java.Io.ISerializable,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getAuthUserName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getAutoRegistration()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String AuthUserName
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetAutoRegistration()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAuthUserName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("getAutoRegistration", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getAutoRegistration()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getSendKeepAlive()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool AutoRegistration
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetSendKeepAlive()
         {
-            get { return IExecuteWithSignature<bool>("getAutoRegistration", "()Z"); }
+            return IExecuteWithSignature<bool>("getSendKeepAlive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#describeContents()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String DisplayName
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getPassword()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getPort()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Password
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getAuthUserName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Port
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetAuthUserName()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAuthUserName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getProfileName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getDisplayName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String ProfileName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDisplayName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProfileName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getPassword()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Protocol
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetPassword()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getProxyAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getProfileName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String ProxyAddress
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetProfileName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProxyAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProfileName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getSendKeepAlive()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getProtocol()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool SendKeepAlive
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetProtocol()
         {
-            get { return IExecuteWithSignature<bool>("getSendKeepAlive", "()Z"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProtocol", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getSipDomain()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getProxyAddress()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String SipDomain
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetProxyAddress()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSipDomain", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProxyAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getUriString()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getSipDomain()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String UriString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSipDomain()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUriString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSipDomain", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getUserName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getUriString()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String UserName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetUriString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUriString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#getUserName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetUserName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getUserName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.html#setCallingUid(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCallingUid(int arg0)
         {
             IExecuteWithSignature("setCallingUid", "(I)V", arg0);
@@ -183,7 +195,7 @@ public void SetCallingUid(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
             IExecute("writeToParcel", arg0, arg1);
@@ -200,7 +212,7 @@ public partial class Builder
             /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.Builder.html#%3Cinit%3E(android.net.sip.SipProfile)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipProfile"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Net.Sip.SipProfile arg0)
                 : base(arg0)
             {
@@ -211,7 +223,7 @@ public Builder(Android.Net.Sip.SipProfile arg0)
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
             /// <exception cref="Java.Text.ParseException"/>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Java.Lang.String arg0, Java.Lang.String arg1)
                 : base(arg0, arg1)
             {
@@ -221,7 +233,7 @@ public Builder(Java.Lang.String arg0, Java.Lang.String arg1)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <exception cref="Java.Text.ParseException"/>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Java.Lang.String arg0)
                 : base(arg0)
             {
@@ -246,7 +258,7 @@ public Builder(Java.Lang.String arg0)
             /// <see href="https://developer.android.com/reference/android/net/sip/SipProfile.Builder.html#build()"/>
             /// </summary>
             /// <returns><see cref="Android.Net.Sip.SipProfile"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile Build()
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile>("build", "()Landroid/net/sip/SipProfile;");
@@ -256,7 +268,7 @@ public Android.Net.Sip.SipProfile Build()
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetAuthUserName(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setAuthUserName", "(Ljava/lang/String;)Landroid/net/sip/SipProfile$Builder;", arg0);
@@ -266,7 +278,7 @@ public Android.Net.Sip.SipProfile.Builder SetAuthUserName(Java.Lang.String arg0)
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetAutoRegistration(bool arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setAutoRegistration", "(Z)Landroid/net/sip/SipProfile$Builder;", arg0);
@@ -276,7 +288,7 @@ public Android.Net.Sip.SipProfile.Builder SetAutoRegistration(bool arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetDisplayName(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setDisplayName", "(Ljava/lang/String;)Landroid/net/sip/SipProfile$Builder;", arg0);
@@ -286,7 +298,7 @@ public Android.Net.Sip.SipProfile.Builder SetDisplayName(Java.Lang.String arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetOutboundProxy(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setOutboundProxy", "(Ljava/lang/String;)Landroid/net/sip/SipProfile$Builder;", arg0);
@@ -296,7 +308,7 @@ public Android.Net.Sip.SipProfile.Builder SetOutboundProxy(Java.Lang.String arg0
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetPassword(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setPassword", "(Ljava/lang/String;)Landroid/net/sip/SipProfile$Builder;", arg0);
@@ -307,7 +319,7 @@ public Android.Net.Sip.SipProfile.Builder SetPassword(Java.Lang.String arg0)
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
             /// <exception cref="Java.Lang.IllegalArgumentException"/>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetPort(int arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setPort", "(I)Landroid/net/sip/SipProfile$Builder;", arg0);
@@ -317,7 +329,7 @@ public Android.Net.Sip.SipProfile.Builder SetPort(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetProfileName(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setProfileName", "(Ljava/lang/String;)Landroid/net/sip/SipProfile$Builder;", arg0);
@@ -328,7 +340,7 @@ public Android.Net.Sip.SipProfile.Builder SetProfileName(Java.Lang.String arg0)
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
             /// <exception cref="Java.Lang.IllegalArgumentException"/>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetProtocol(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setProtocol", "(Ljava/lang/String;)Landroid/net/sip/SipProfile$Builder;", arg0);
@@ -338,7 +350,7 @@ public Android.Net.Sip.SipProfile.Builder SetProtocol(Java.Lang.String arg0)
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.Net.Sip.SipProfile.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Sip.SipProfile.Builder SetSendKeepAlive(bool arg0)
             {
                 return IExecuteWithSignature<Android.Net.Sip.SipProfile.Builder>("setSendKeepAlive", "(Z)Landroid/net/sip/SipProfile$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Net/Sip/SipRegistrationListener.cs b/src/net/Netdroid/Generated/Android/Net/Sip/SipRegistrationListener.cs
index 1e1ac8259..04af7a79b 100644
--- a/src/net/Netdroid/Generated/Android/Net/Sip/SipRegistrationListener.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Sip/SipRegistrationListener.cs
@@ -68,9 +68,9 @@ public partial class SipRegistrationListener : Android.Net.Sip.ISipRegistrationL
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onRegistering", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnRegisteringEventHandler));
-            AddEventHandler("onRegistrationDone", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnRegistrationDoneEventHandler));
-            AddEventHandler("onRegistrationFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnRegistrationFailedEventHandler));
+            AddEventHandler("onRegistering", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnRegisteringEventHandler));
+            AddEventHandler("onRegistrationDone", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnRegistrationDoneEventHandler));
+            AddEventHandler("onRegistrationFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnRegistrationFailedEventHandler));
 
         }
 
@@ -78,7 +78,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipRegistrationListener.html#onRegistering(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnRegistering"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnOnRegistering { get; set; } = null;
+        public global::System.Action<Java.Lang.String> OnOnRegistering { get; set; } = null;
 
         void OnRegisteringEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -90,7 +90,7 @@ void OnRegisteringEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <see href="https://developer.android.com/reference/android/net/sip/SipRegistrationListener.html#onRegistering(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void OnRegistering(Java.Lang.String arg0)
         {
             
@@ -100,7 +100,7 @@ public virtual void OnRegistering(Java.Lang.String arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipRegistrationListener.html#onRegistrationDone(java.lang.String,long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnRegistrationDone"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, long> OnOnRegistrationDone { get; set; } = null;
+        public global::System.Action<Java.Lang.String, long> OnOnRegistrationDone { get; set; } = null;
 
         void OnRegistrationDoneEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -113,7 +113,7 @@ void OnRegistrationDoneEventHandler(object sender, CLRListenerEventArgs<CLREvent
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void OnRegistrationDone(Java.Lang.String arg0, long arg1)
         {
             
@@ -123,7 +123,7 @@ public virtual void OnRegistrationDone(Java.Lang.String arg0, long arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipRegistrationListener.html#onRegistrationFailed(java.lang.String,int,java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnRegistrationFailed"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, int, Java.Lang.String> OnOnRegistrationFailed { get; set; } = null;
+        public global::System.Action<Java.Lang.String, int, Java.Lang.String> OnOnRegistrationFailed { get; set; } = null;
 
         void OnRegistrationFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -137,7 +137,7 @@ void OnRegistrationFailedEventHandler(object sender, CLRListenerEventArgs<CLREve
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void OnRegistrationFailed(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             
@@ -177,7 +177,7 @@ public partial class SipRegistrationListenerDirect : Android.Net.Sip.ISipRegistr
         /// <see href="https://developer.android.com/reference/android/net/sip/SipRegistrationListener.html#onRegistering(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnRegistering(Java.Lang.String arg0)
         {
             IExecuteWithSignature("onRegistering", "(Ljava/lang/String;)V", arg0);
@@ -187,7 +187,7 @@ public override void OnRegistering(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnRegistrationDone(Java.Lang.String arg0, long arg1)
         {
             IExecute("onRegistrationDone", arg0, arg1);
@@ -198,7 +198,7 @@ public override void OnRegistrationDone(Java.Lang.String arg0, long arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnRegistrationFailed(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             IExecute("onRegistrationFailed", arg0, arg1, arg2);
diff --git a/src/net/Netdroid/Generated/Android/Net/Sip/SipSession.cs b/src/net/Netdroid/Generated/Android/Net/Sip/SipSession.cs
index 114ef213a..868d60ca0 100644
--- a/src/net/Netdroid/Generated/Android/Net/Sip/SipSession.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Sip/SipSession.cs
@@ -46,60 +46,65 @@ public partial class SipSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getCallId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getLocalProfile()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String CallId
+        /// <returns><see cref="Android.Net.Sip.SipProfile"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Sip.SipProfile GetLocalProfile()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCallId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Sip.SipProfile>("getLocalProfile", "()Landroid/net/sip/SipProfile;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getPeerProfile()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int GetState
+        /// <returns><see cref="Android.Net.Sip.SipProfile"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Sip.SipProfile GetPeerProfile()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<Android.Net.Sip.SipProfile>("getPeerProfile", "()Landroid/net/sip/SipProfile;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getLocalIp()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#isInCall()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String LocalIp
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsInCall()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocalIp", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isInCall", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getLocalProfile()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getState()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Sip.SipProfile LocalProfile
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetState()
         {
-            get { return IExecuteWithSignature<Android.Net.Sip.SipProfile>("getLocalProfile", "()Landroid/net/sip/SipProfile;"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getPeerProfile()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getCallId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Sip.SipProfile PeerProfile
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetCallId()
         {
-            get { return IExecuteWithSignature<Android.Net.Sip.SipProfile>("getPeerProfile", "()Landroid/net/sip/SipProfile;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCallId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#isInCall()"/>
+        /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#getLocalIp()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsInCall()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetLocalIp()
         {
-            return IExecuteWithSignature<bool>("isInCall", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getLocalIp", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#answerCall(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AnswerCall(Java.Lang.String arg0, int arg1)
         {
             IExecute("answerCall", arg0, arg1);
@@ -109,7 +114,7 @@ public void AnswerCall(Java.Lang.String arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ChangeCall(Java.Lang.String arg0, int arg1)
         {
             IExecute("changeCall", arg0, arg1);
@@ -117,7 +122,7 @@ public void ChangeCall(Java.Lang.String arg0, int arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#endCall()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void EndCall()
         {
             IExecuteWithSignature("endCall", "()V");
@@ -128,7 +133,7 @@ public void EndCall()
         /// <param name="arg0"><see cref="Android.Net.Sip.SipProfile"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void MakeCall(Android.Net.Sip.SipProfile arg0, Java.Lang.String arg1, int arg2)
         {
             IExecute("makeCall", arg0, arg1, arg2);
@@ -137,7 +142,7 @@ public void MakeCall(Android.Net.Sip.SipProfile arg0, Java.Lang.String arg1, int
         /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#register(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Register(int arg0)
         {
             IExecuteWithSignature("register", "(I)V", arg0);
@@ -146,7 +151,7 @@ public void Register(int arg0)
         /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#setListener(android.net.sip.SipSession.Listener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Sip.SipSession.Listener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetListener(Android.Net.Sip.SipSession.Listener arg0)
         {
             IExecuteWithSignature("setListener", "(Landroid/net/sip/SipSession$Listener;)V", arg0);
@@ -154,7 +159,7 @@ public void SetListener(Android.Net.Sip.SipSession.Listener arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.html#unregister()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Unregister()
         {
             IExecuteWithSignature("unregister", "()V");
@@ -182,337 +187,13 @@ public partial class Listener
 
             #endregion
 
-            #region Instance methods
-            /// <summary>
-            /// Handlers initializer for <see cref="Listener"/>
-            /// </summary>
-            protected virtual void InitializeHandlers()
-            {
-                AddEventHandler("onCallBusy", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnCallBusyEventHandler));
-                AddEventHandler("onCallChangeFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnCallChangeFailedEventHandler));
-                AddEventHandler("onCallEnded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnCallEndedEventHandler));
-                AddEventHandler("onCallEstablished", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnCallEstablishedEventHandler));
-                AddEventHandler("onCalling", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnCallingEventHandler));
-                AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnErrorEventHandler));
-                AddEventHandler("onRegistering", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnRegisteringEventHandler));
-                AddEventHandler("onRegistrationDone", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnRegistrationDoneEventHandler));
-                AddEventHandler("onRegistrationFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnRegistrationFailedEventHandler));
-                AddEventHandler("onRegistrationTimeout", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnRegistrationTimeoutEventHandler));
-                AddEventHandler("onRinging", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnRingingEventHandler));
-                AddEventHandler("onRingingBack", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>>>(OnRingingBackEventHandler));
-
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallBusy(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCallBusy"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession> OnOnCallBusy { get; set; } = null;
-
-            void OnCallBusyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnCallBusy != null) ? OnOnCallBusy : OnCallBusy;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallBusy(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public virtual void OnCallBusy(Android.Net.Sip.SipSession arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallChangeFailed(android.net.sip.SipSession,int,java.lang.String)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCallChangeFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession, int, Java.Lang.String> OnOnCallChangeFailed { get; set; } = null;
-
-            void OnCallChangeFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnCallChangeFailed != null) ? OnOnCallChangeFailed : OnCallChangeFailed;
-                methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Java.Lang.String>(1));
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallChangeFailed(android.net.sip.SipSession,int,java.lang.String)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public virtual void OnCallChangeFailed(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallEnded(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCallEnded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession> OnOnCallEnded { get; set; } = null;
-
-            void OnCallEndedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnCallEnded != null) ? OnOnCallEnded : OnCallEnded;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallEnded(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public virtual void OnCallEnded(Android.Net.Sip.SipSession arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallEstablished(android.net.sip.SipSession,java.lang.String)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCallEstablished"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession, Java.Lang.String> OnOnCallEstablished { get; set; } = null;
-
-            void OnCallEstablishedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnCallEstablished != null) ? OnOnCallEstablished : OnCallEstablished;
-                methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0));
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallEstablished(android.net.sip.SipSession,java.lang.String)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public virtual void OnCallEstablished(Android.Net.Sip.SipSession arg0, Java.Lang.String arg1)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCalling(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnCalling"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession> OnOnCalling { get; set; } = null;
-
-            void OnCallingEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnCalling != null) ? OnOnCalling : OnCalling;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCalling(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public virtual void OnCalling(Android.Net.Sip.SipSession arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onError(android.net.sip.SipSession,int,java.lang.String)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession, int, Java.Lang.String> OnOnError { get; set; } = null;
-
-            void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnError != null) ? OnOnError : OnError;
-                methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Java.Lang.String>(1));
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onError(android.net.sip.SipSession,int,java.lang.String)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public virtual void OnError(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistering(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnRegistering"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession> OnOnRegistering { get; set; } = null;
-
-            void OnRegisteringEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnRegistering != null) ? OnOnRegistering : OnRegistering;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistering(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public virtual void OnRegistering(Android.Net.Sip.SipSession arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistrationDone(android.net.sip.SipSession,int)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnRegistrationDone"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession, int> OnOnRegistrationDone { get; set; } = null;
-
-            void OnRegistrationDoneEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnRegistrationDone != null) ? OnOnRegistrationDone : OnRegistrationDone;
-                methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistrationDone(android.net.sip.SipSession,int)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
-            public virtual void OnRegistrationDone(Android.Net.Sip.SipSession arg0, int arg1)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistrationFailed(android.net.sip.SipSession,int,java.lang.String)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnRegistrationFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession, int, Java.Lang.String> OnOnRegistrationFailed { get; set; } = null;
-
-            void OnRegistrationFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnRegistrationFailed != null) ? OnOnRegistrationFailed : OnRegistrationFailed;
-                methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Java.Lang.String>(1));
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistrationFailed(android.net.sip.SipSession,int,java.lang.String)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public virtual void OnRegistrationFailed(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistrationTimeout(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnRegistrationTimeout"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession> OnOnRegistrationTimeout { get; set; } = null;
-
-            void OnRegistrationTimeoutEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnRegistrationTimeout != null) ? OnOnRegistrationTimeout : OnRegistrationTimeout;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistrationTimeout(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public virtual void OnRegistrationTimeout(Android.Net.Sip.SipSession arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRinging(android.net.sip.SipSession,android.net.sip.SipProfile,java.lang.String)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnRinging"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession, Android.Net.Sip.SipProfile, Java.Lang.String> OnOnRinging { get; set; } = null;
-
-            void OnRingingEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnRinging != null) ? OnOnRinging : OnRinging;
-                methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Net.Sip.SipProfile>(0), data.EventData.GetAt<Java.Lang.String>(1));
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRinging(android.net.sip.SipSession,android.net.sip.SipProfile,java.lang.String)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            /// <param name="arg1"><see cref="Android.Net.Sip.SipProfile"/></param>
-            /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public virtual void OnRinging(Android.Net.Sip.SipSession arg0, Android.Net.Sip.SipProfile arg1, Java.Lang.String arg2)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRingingBack(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnRingingBack"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Sip.SipSession> OnOnRingingBack { get; set; } = null;
-
-            void OnRingingBackEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Sip.SipSession>> data)
-            {
-                var methodToExecute = (OnOnRingingBack != null) ? OnOnRingingBack : OnRingingBack;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRingingBack(android.net.sip.SipSession)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public virtual void OnRingingBack(Android.Net.Sip.SipSession arg0)
-            {
-                
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-        #region ListenerDirect
-        public partial class ListenerDirect
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
             #region Instance methods
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallBusy(android.net.sip.SipSession)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public override void OnCallBusy(Android.Net.Sip.SipSession arg0)
+            [global::System.Obsolete()]
+            public void OnCallBusy(Android.Net.Sip.SipSession arg0)
             {
                 IExecuteWithSignature("onCallBusy", "(Landroid/net/sip/SipSession;)V", arg0);
             }
@@ -522,8 +203,8 @@ public override void OnCallBusy(Android.Net.Sip.SipSession arg0)
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public override void OnCallChangeFailed(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
+            [global::System.Obsolete()]
+            public void OnCallChangeFailed(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
             {
                 IExecute("onCallChangeFailed", arg0, arg1, arg2);
             }
@@ -531,8 +212,8 @@ public override void OnCallChangeFailed(Android.Net.Sip.SipSession arg0, int arg
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCallEnded(android.net.sip.SipSession)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public override void OnCallEnded(Android.Net.Sip.SipSession arg0)
+            [global::System.Obsolete()]
+            public void OnCallEnded(Android.Net.Sip.SipSession arg0)
             {
                 IExecuteWithSignature("onCallEnded", "(Landroid/net/sip/SipSession;)V", arg0);
             }
@@ -541,8 +222,8 @@ public override void OnCallEnded(Android.Net.Sip.SipSession arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public override void OnCallEstablished(Android.Net.Sip.SipSession arg0, Java.Lang.String arg1)
+            [global::System.Obsolete()]
+            public void OnCallEstablished(Android.Net.Sip.SipSession arg0, Java.Lang.String arg1)
             {
                 IExecute("onCallEstablished", arg0, arg1);
             }
@@ -550,8 +231,8 @@ public override void OnCallEstablished(Android.Net.Sip.SipSession arg0, Java.Lan
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onCalling(android.net.sip.SipSession)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public override void OnCalling(Android.Net.Sip.SipSession arg0)
+            [global::System.Obsolete()]
+            public void OnCalling(Android.Net.Sip.SipSession arg0)
             {
                 IExecuteWithSignature("onCalling", "(Landroid/net/sip/SipSession;)V", arg0);
             }
@@ -561,8 +242,8 @@ public override void OnCalling(Android.Net.Sip.SipSession arg0)
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public override void OnError(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
+            [global::System.Obsolete()]
+            public void OnError(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
             {
                 IExecute("onError", arg0, arg1, arg2);
             }
@@ -570,8 +251,8 @@ public override void OnError(Android.Net.Sip.SipSession arg0, int arg1, Java.Lan
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistering(android.net.sip.SipSession)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public override void OnRegistering(Android.Net.Sip.SipSession arg0)
+            [global::System.Obsolete()]
+            public void OnRegistering(Android.Net.Sip.SipSession arg0)
             {
                 IExecuteWithSignature("onRegistering", "(Landroid/net/sip/SipSession;)V", arg0);
             }
@@ -580,8 +261,8 @@ public override void OnRegistering(Android.Net.Sip.SipSession arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
-            public override void OnRegistrationDone(Android.Net.Sip.SipSession arg0, int arg1)
+            [global::System.Obsolete()]
+            public void OnRegistrationDone(Android.Net.Sip.SipSession arg0, int arg1)
             {
                 IExecute("onRegistrationDone", arg0, arg1);
             }
@@ -591,8 +272,8 @@ public override void OnRegistrationDone(Android.Net.Sip.SipSession arg0, int arg
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public override void OnRegistrationFailed(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
+            [global::System.Obsolete()]
+            public void OnRegistrationFailed(Android.Net.Sip.SipSession arg0, int arg1, Java.Lang.String arg2)
             {
                 IExecute("onRegistrationFailed", arg0, arg1, arg2);
             }
@@ -600,8 +281,8 @@ public override void OnRegistrationFailed(Android.Net.Sip.SipSession arg0, int a
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRegistrationTimeout(android.net.sip.SipSession)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public override void OnRegistrationTimeout(Android.Net.Sip.SipSession arg0)
+            [global::System.Obsolete()]
+            public void OnRegistrationTimeout(Android.Net.Sip.SipSession arg0)
             {
                 IExecuteWithSignature("onRegistrationTimeout", "(Landroid/net/sip/SipSession;)V", arg0);
             }
@@ -611,8 +292,8 @@ public override void OnRegistrationTimeout(Android.Net.Sip.SipSession arg0)
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
             /// <param name="arg1"><see cref="Android.Net.Sip.SipProfile"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
-            public override void OnRinging(Android.Net.Sip.SipSession arg0, Android.Net.Sip.SipProfile arg1, Java.Lang.String arg2)
+            [global::System.Obsolete()]
+            public void OnRinging(Android.Net.Sip.SipSession arg0, Android.Net.Sip.SipProfile arg1, Java.Lang.String arg2)
             {
                 IExecute("onRinging", arg0, arg1, arg2);
             }
@@ -620,8 +301,8 @@ public override void OnRinging(Android.Net.Sip.SipSession arg0, Android.Net.Sip.
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.Listener.html#onRingingBack(android.net.sip.SipSession)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Sip.SipSession"/></param>
-            [System.Obsolete()]
-            public override void OnRingingBack(Android.Net.Sip.SipSession arg0)
+            [global::System.Obsolete()]
+            public void OnRingingBack(Android.Net.Sip.SipSession arg0)
             {
                 IExecuteWithSignature("onRingingBack", "(Landroid/net/sip/SipSession;)V", arg0);
             }
@@ -651,77 +332,77 @@ public partial class State
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#DEREGISTERING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int DEREGISTERING { get { if (!_DEREGISTERINGReady) { _DEREGISTERINGContent = SGetField<int>(LocalBridgeClazz, "DEREGISTERING"); _DEREGISTERINGReady = true; } return _DEREGISTERINGContent; } }
             private static int _DEREGISTERINGContent = default;
             private static bool _DEREGISTERINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#IN_CALL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int IN_CALL { get { if (!_IN_CALLReady) { _IN_CALLContent = SGetField<int>(LocalBridgeClazz, "IN_CALL"); _IN_CALLReady = true; } return _IN_CALLContent; } }
             private static int _IN_CALLContent = default;
             private static bool _IN_CALLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#INCOMING_CALL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int INCOMING_CALL { get { if (!_INCOMING_CALLReady) { _INCOMING_CALLContent = SGetField<int>(LocalBridgeClazz, "INCOMING_CALL"); _INCOMING_CALLReady = true; } return _INCOMING_CALLContent; } }
             private static int _INCOMING_CALLContent = default;
             private static bool _INCOMING_CALLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#INCOMING_CALL_ANSWERING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int INCOMING_CALL_ANSWERING { get { if (!_INCOMING_CALL_ANSWERINGReady) { _INCOMING_CALL_ANSWERINGContent = SGetField<int>(LocalBridgeClazz, "INCOMING_CALL_ANSWERING"); _INCOMING_CALL_ANSWERINGReady = true; } return _INCOMING_CALL_ANSWERINGContent; } }
             private static int _INCOMING_CALL_ANSWERINGContent = default;
             private static bool _INCOMING_CALL_ANSWERINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#NOT_DEFINED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int NOT_DEFINED { get { if (!_NOT_DEFINEDReady) { _NOT_DEFINEDContent = SGetField<int>(LocalBridgeClazz, "NOT_DEFINED"); _NOT_DEFINEDReady = true; } return _NOT_DEFINEDContent; } }
             private static int _NOT_DEFINEDContent = default;
             private static bool _NOT_DEFINEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#OUTGOING_CALL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int OUTGOING_CALL { get { if (!_OUTGOING_CALLReady) { _OUTGOING_CALLContent = SGetField<int>(LocalBridgeClazz, "OUTGOING_CALL"); _OUTGOING_CALLReady = true; } return _OUTGOING_CALLContent; } }
             private static int _OUTGOING_CALLContent = default;
             private static bool _OUTGOING_CALLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#OUTGOING_CALL_CANCELING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int OUTGOING_CALL_CANCELING { get { if (!_OUTGOING_CALL_CANCELINGReady) { _OUTGOING_CALL_CANCELINGContent = SGetField<int>(LocalBridgeClazz, "OUTGOING_CALL_CANCELING"); _OUTGOING_CALL_CANCELINGReady = true; } return _OUTGOING_CALL_CANCELINGContent; } }
             private static int _OUTGOING_CALL_CANCELINGContent = default;
             private static bool _OUTGOING_CALL_CANCELINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#OUTGOING_CALL_RING_BACK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int OUTGOING_CALL_RING_BACK { get { if (!_OUTGOING_CALL_RING_BACKReady) { _OUTGOING_CALL_RING_BACKContent = SGetField<int>(LocalBridgeClazz, "OUTGOING_CALL_RING_BACK"); _OUTGOING_CALL_RING_BACKReady = true; } return _OUTGOING_CALL_RING_BACKContent; } }
             private static int _OUTGOING_CALL_RING_BACKContent = default;
             private static bool _OUTGOING_CALL_RING_BACKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#PINGING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PINGING { get { if (!_PINGINGReady) { _PINGINGContent = SGetField<int>(LocalBridgeClazz, "PINGING"); _PINGINGReady = true; } return _PINGINGContent; } }
             private static int _PINGINGContent = default;
             private static bool _PINGINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#READY_TO_CALL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int READY_TO_CALL { get { if (!_READY_TO_CALLReady) { _READY_TO_CALLContent = SGetField<int>(LocalBridgeClazz, "READY_TO_CALL"); _READY_TO_CALLReady = true; } return _READY_TO_CALLContent; } }
             private static int _READY_TO_CALLContent = default;
             private static bool _READY_TO_CALLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/sip/SipSession.State.html#REGISTERING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int REGISTERING { get { if (!_REGISTERINGReady) { _REGISTERINGContent = SGetField<int>(LocalBridgeClazz, "REGISTERING"); _REGISTERINGReady = true; } return _REGISTERINGContent; } }
             private static int _REGISTERINGContent = default;
             private static bool _REGISTERINGReady = false; // this is used because in case of generics 
@@ -734,7 +415,7 @@ public partial class State
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ToString(int arg0)
             {
                 return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(I)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Net/StaticIpConfiguration.cs b/src/net/Netdroid/Generated/Android/Net/StaticIpConfiguration.cs
index f4fd9ecd0..5ab6b80a1 100644
--- a/src/net/Netdroid/Generated/Android/Net/StaticIpConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Net/StaticIpConfiguration.cs
@@ -52,40 +52,44 @@ public partial class StaticIpConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#getDnsServers()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#getIpAddress()"/>
         /// </summary>
-        public Java.Util.List<Java.Net.InetAddress> DnsServers
+        /// <returns><see cref="Android.Net.LinkAddress"/></returns>
+        public Android.Net.LinkAddress GetIpAddress()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Net.InetAddress>>("getDnsServers", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.LinkAddress>("getIpAddress", "()Landroid/net/LinkAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#getDomains()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Domains
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDomains", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#getGateway()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#getDomains()"/>
         /// </summary>
-        public Java.Net.InetAddress Gateway
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDomains()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getGateway", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDomains", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#getIpAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#getGateway()"/>
         /// </summary>
-        public Android.Net.LinkAddress IpAddress
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetGateway()
         {
-            get { return IExecuteWithSignature<Android.Net.LinkAddress>("getIpAddress", "()Landroid/net/LinkAddress;"); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getGateway", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#getDnsServers()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Net.InetAddress> GetDnsServers()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Net.InetAddress>>("getDnsServers", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/StaticIpConfiguration.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/TelephonyNetworkSpecifier.cs b/src/net/Netdroid/Generated/Android/Net/TelephonyNetworkSpecifier.cs
index a8bcbe8ff..6f80c6606 100644
--- a/src/net/Netdroid/Generated/Android/Net/TelephonyNetworkSpecifier.cs
+++ b/src/net/Netdroid/Generated/Android/Net/TelephonyNetworkSpecifier.cs
@@ -56,19 +56,20 @@ public partial class TelephonyNetworkSpecifier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TelephonyNetworkSpecifier.html#getSubscriptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TelephonyNetworkSpecifier.html#describeContents()"/>
         /// </summary>
-        public int SubscriptionId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSubscriptionId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TelephonyNetworkSpecifier.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/TelephonyNetworkSpecifier.html#getSubscriptionId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSubscriptionId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSubscriptionId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/TelephonyNetworkSpecifier.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/TrafficStats.cs b/src/net/Netdroid/Generated/Android/Net/TrafficStats.cs
index 7c13f79af..41bb5225b 100644
--- a/src/net/Netdroid/Generated/Android/Net/TrafficStats.cs
+++ b/src/net/Netdroid/Generated/Android/Net/TrafficStats.cs
@@ -48,101 +48,111 @@ public partial class TrafficStats
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getMobileRxBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getAndSetThreadStatsTag(int)"/>
         /// </summary>
-        public static long MobileRxBytes
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public static int GetAndSetThreadStatsTag(int arg0)
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMobileRxBytes", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getAndSetThreadStatsTag", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getMobileRxPackets()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getThreadStatsTag()"/>
         /// </summary>
-        public static long MobileRxPackets
+        /// <returns><see cref="int"/></returns>
+        public static int GetThreadStatsTag()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMobileRxPackets", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadStatsTag", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getMobileTxBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getThreadStatsUid()"/>
         /// </summary>
-        public static long MobileTxBytes
+        /// <returns><see cref="int"/></returns>
+        public static int GetThreadStatsUid()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMobileTxBytes", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadStatsUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getMobileTxPackets()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getMobileRxBytes()"/>
         /// </summary>
-        public static long MobileTxPackets
+        /// <returns><see cref="long"/></returns>
+        public static long GetMobileRxBytes()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMobileTxPackets", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMobileRxBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getThreadStatsTag()"/> <see href="https://developer.android.com/reference/android/net/TrafficStats.html#setThreadStatsTag(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getMobileRxPackets()"/>
         /// </summary>
-        public static int ThreadStatsTag
+        /// <returns><see cref="long"/></returns>
+        public static long GetMobileRxPackets()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadStatsTag", "()I"); } set { SExecuteWithSignature(LocalBridgeClazz, "setThreadStatsTag", "(I)V", value); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMobileRxPackets", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getThreadStatsUid()"/> <see href="https://developer.android.com/reference/android/net/TrafficStats.html#setThreadStatsUid(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getMobileTxBytes()"/>
         /// </summary>
-        public static int ThreadStatsUid
+        /// <returns><see cref="long"/></returns>
+        public static long GetMobileTxBytes()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadStatsUid", "()I"); } set { SExecuteWithSignature(LocalBridgeClazz, "setThreadStatsUid", "(I)V", value); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMobileTxBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTotalRxBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getMobileTxPackets()"/>
         /// </summary>
-        public static long TotalRxBytes
+        /// <returns><see cref="long"/></returns>
+        public static long GetMobileTxPackets()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getTotalRxBytes", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMobileTxPackets", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTotalRxPackets()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getRxBytes(java.lang.String)"/>
         /// </summary>
-        public static long TotalRxPackets
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="long"/></returns>
+        public static long GetRxBytes(Java.Lang.String arg0)
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getTotalRxPackets", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getRxBytes", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTotalTxBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getRxPackets(java.lang.String)"/>
         /// </summary>
-        public static long TotalTxBytes
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="long"/></returns>
+        public static long GetRxPackets(Java.Lang.String arg0)
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getTotalTxBytes", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getRxPackets", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTotalTxPackets()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTotalRxBytes()"/>
         /// </summary>
-        public static long TotalTxPackets
+        /// <returns><see cref="long"/></returns>
+        public static long GetTotalRxBytes()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getTotalTxPackets", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getTotalRxBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getAndSetThreadStatsTag(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTotalRxPackets()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int GetAndSetThreadStatsTag(int arg0)
+        /// <returns><see cref="long"/></returns>
+        public static long GetTotalRxPackets()
         {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "getAndSetThreadStatsTag", "(I)I", arg0);
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getTotalRxPackets", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getRxBytes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTotalTxBytes()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="long"/></returns>
-        public static long GetRxBytes(Java.Lang.String arg0)
+        public static long GetTotalTxBytes()
         {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "getRxBytes", "(Ljava/lang/String;)J", arg0);
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getTotalTxBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getRxPackets(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTotalTxPackets()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="long"/></returns>
-        public static long GetRxPackets(Java.Lang.String arg0)
+        public static long GetTotalTxPackets()
         {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "getRxPackets", "(Ljava/lang/String;)J", arg0);
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getTotalTxPackets", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#getTxBytes(java.lang.String)"/>
@@ -185,7 +195,7 @@ public static long GetUidRxPackets(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long GetUidTcpRxBytes(int arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "getUidTcpRxBytes", "(I)J", arg0);
@@ -195,7 +205,7 @@ public static long GetUidTcpRxBytes(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long GetUidTcpRxSegments(int arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "getUidTcpRxSegments", "(I)J", arg0);
@@ -205,7 +215,7 @@ public static long GetUidTcpRxSegments(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long GetUidTcpTxBytes(int arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "getUidTcpTxBytes", "(I)J", arg0);
@@ -215,7 +225,7 @@ public static long GetUidTcpTxBytes(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long GetUidTcpTxSegments(int arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "getUidTcpTxSegments", "(I)J", arg0);
@@ -243,7 +253,7 @@ public static long GetUidTxPackets(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long GetUidUdpRxBytes(int arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "getUidUdpRxBytes", "(I)J", arg0);
@@ -253,7 +263,7 @@ public static long GetUidUdpRxBytes(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long GetUidUdpRxPackets(int arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "getUidUdpRxPackets", "(I)J", arg0);
@@ -263,7 +273,7 @@ public static long GetUidUdpRxPackets(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long GetUidUdpTxBytes(int arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "getUidUdpTxBytes", "(I)J", arg0);
@@ -273,7 +283,7 @@ public static long GetUidUdpTxBytes(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long GetUidUdpTxPackets(int arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "getUidUdpTxPackets", "(I)J", arg0);
@@ -310,6 +320,22 @@ public static void IncrementOperationCount(int arg0)
             SExecuteWithSignature(LocalBridgeClazz, "incrementOperationCount", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#setThreadStatsTag(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public static void SetThreadStatsTag(int arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setThreadStatsTag", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#setThreadStatsUid(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public static void SetThreadStatsUid(int arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setThreadStatsUid", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/TrafficStats.html#tagDatagramSocket(java.net.DatagramSocket)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.DatagramSocket"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Uri.cs b/src/net/Netdroid/Generated/Android/Net/Uri.cs
index 78a65fe70..a8071ebd5 100644
--- a/src/net/Netdroid/Generated/Android/Net/Uri.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Uri.cs
@@ -142,154 +142,164 @@ public static void WriteToParcel(Android.Os.Parcel arg0, Android.Net.Uri arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getAuthority()"/> 
-        /// </summary>
-        public Java.Lang.String Authority
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAuthority", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedAuthority()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#buildUpon()"/>
         /// </summary>
-        public Java.Lang.String EncodedAuthority
+        /// <returns><see cref="Android.Net.Uri.Builder"/></returns>
+        public Android.Net.Uri.Builder BuildUpon()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncodedAuthority", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Uri.Builder>("buildUpon", "()Landroid/net/Uri$Builder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedFragment()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#isHierarchical()"/>
         /// </summary>
-        public Java.Lang.String EncodedFragment
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHierarchical()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncodedFragment", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isHierarchical", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedPath()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#isRelative()"/>
         /// </summary>
-        public Java.Lang.String EncodedPath
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRelative()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncodedPath", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isRelative", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedQuery()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getPort()"/>
         /// </summary>
-        public Java.Lang.String EncodedQuery
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncodedQuery", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedSchemeSpecificPart()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getAuthority()"/>
         /// </summary>
-        public Java.Lang.String EncodedSchemeSpecificPart
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAuthority()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncodedSchemeSpecificPart", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAuthority", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedUserInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedAuthority()"/>
         /// </summary>
-        public Java.Lang.String EncodedUserInfo
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncodedAuthority()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncodedUserInfo", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncodedAuthority", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getFragment()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedFragment()"/>
         /// </summary>
-        public Java.Lang.String Fragment
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncodedFragment()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFragment", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncodedFragment", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getHost()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedPath()"/>
         /// </summary>
-        public Java.Lang.String Host
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncodedPath()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncodedPath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getLastPathSegment()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedQuery()"/>
         /// </summary>
-        public Java.Lang.String LastPathSegment
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncodedQuery()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLastPathSegment", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncodedQuery", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getPath()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedSchemeSpecificPart()"/>
         /// </summary>
-        public Java.Lang.String Path
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncodedSchemeSpecificPart()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncodedSchemeSpecificPart", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getPathSegments()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getEncodedUserInfo()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> PathSegments
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncodedUserInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPathSegments", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncodedUserInfo", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getFragment()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFragment()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFragment", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getQuery()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getHost()"/>
         /// </summary>
-        public Java.Lang.String Query
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHost()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getQuery", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getQueryParameterNames()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getLastPathSegment()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> QueryParameterNames
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLastPathSegment()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getQueryParameterNames", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getLastPathSegment", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getScheme()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getPath()"/>
         /// </summary>
-        public Java.Lang.String Scheme
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPath()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getScheme", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getSchemeSpecificPart()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getQuery()"/>
         /// </summary>
-        public Java.Lang.String SchemeSpecificPart
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetQuery()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSchemeSpecificPart", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getQuery", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getUserInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getScheme()"/>
         /// </summary>
-        public Java.Lang.String UserInfo
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetScheme()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserInfo", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getScheme", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#buildUpon()"/>
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getSchemeSpecificPart()"/>
         /// </summary>
-        /// <returns><see cref="Android.Net.Uri.Builder"/></returns>
-        public Android.Net.Uri.Builder BuildUpon()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSchemeSpecificPart()
         {
-            return IExecuteWithSignature<Android.Net.Uri.Builder>("buildUpon", "()Landroid/net/Uri$Builder;");
+            return IExecuteWithSignature<Java.Lang.String>("getSchemeSpecificPart", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#isHierarchical()"/>
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getUserInfo()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHierarchical()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUserInfo()
         {
-            return IExecuteWithSignature<bool>("isHierarchical", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getUserInfo", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/Uri.html#isRelative()"/>
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getPathSegments()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRelative()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetPathSegments()
         {
-            return IExecuteWithSignature<bool>("isRelative", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPathSegments", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/Uri.html#normalizeScheme()"/>
@@ -361,6 +371,14 @@ public Java.Lang.String GetQueryParameter(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getQueryParameters", "(Ljava/lang/String;)Ljava/util/List;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/Uri.html#getQueryParameterNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetQueryParameterNames()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getQueryParameterNames", "()Ljava/util/Set;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/UrlQuerySanitizer.cs b/src/net/Netdroid/Generated/Android/Net/UrlQuerySanitizer.cs
index 9346a1449..8face72a3 100644
--- a/src/net/Netdroid/Generated/Android/Net/UrlQuerySanitizer.cs
+++ b/src/net/Netdroid/Generated/Android/Net/UrlQuerySanitizer.cs
@@ -50,124 +50,122 @@ public UrlQuerySanitizer(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllButNulAndAngleBracketsLegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllButNulAndAngleBracketsLegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer AllButNulAndAngleBracketsLegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetAllButNulAndAngleBracketsLegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAllButNulAndAngleBracketsLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAllButNulAndAngleBracketsLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllButNulLegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllButNulLegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer AllButNulLegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetAllButNulLegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAllButNulLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAllButNulLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllButWhitespaceLegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllButWhitespaceLegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer AllButWhitespaceLegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetAllButWhitespaceLegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAllButWhitespaceLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAllButWhitespaceLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllIllegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllIllegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer AllIllegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetAllIllegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAllIllegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAllIllegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAmpAndSpaceLegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAmpAndSpaceLegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer AmpAndSpaceLegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetAmpAndSpaceLegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAmpAndSpaceLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAmpAndSpaceLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAmpLegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAmpLegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer AmpLegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetAmpLegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAmpLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getAmpLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getSpaceLegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getSpaceLegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer SpaceLegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetSpaceLegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getSpaceLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getSpaceLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getUrlAndSpaceLegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getUrlAndSpaceLegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer UrlAndSpaceLegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetUrlAndSpaceLegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getUrlAndSpaceLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getUrlAndSpaceLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getUrlLegal()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getUrlLegal()"/>
         /// </summary>
-        public static Android.Net.UrlQuerySanitizer.ValueSanitizer UrlLegal
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public static Android.Net.UrlQuerySanitizer.ValueSanitizer GetUrlLegal()
         {
-            get { return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getUrlLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); }
+            return SExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>(LocalBridgeClazz, "getUrlLegal", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllowUnregisteredParamaters()"/> <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#setAllowUnregisteredParamaters(boolean)"/>
-        /// </summary>
-        public bool AllowUnregisteredParamaters
-        {
-            get { return IExecuteWithSignature<bool>("getAllowUnregisteredParamaters", "()Z"); } set { IExecuteWithSignature("setAllowUnregisteredParamaters", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getParameterList()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Net.UrlQuerySanitizer.ParameterValuePair> ParameterList
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.UrlQuerySanitizer.ParameterValuePair>>("getParameterList", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getParameterSet()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getEffectiveValueSanitizer(java.lang.String)"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> ParameterSet
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public Android.Net.UrlQuerySanitizer.ValueSanitizer GetEffectiveValueSanitizer(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getParameterSet", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>("getEffectiveValueSanitizer", "(Ljava/lang/String;)Landroid/net/UrlQuerySanitizer$ValueSanitizer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getPreferFirstRepeatedParameter()"/> <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#setPreferFirstRepeatedParameter(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getUnregisteredParameterValueSanitizer()"/>
         /// </summary>
-        public bool PreferFirstRepeatedParameter
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public Android.Net.UrlQuerySanitizer.ValueSanitizer GetUnregisteredParameterValueSanitizer()
         {
-            get { return IExecuteWithSignature<bool>("getPreferFirstRepeatedParameter", "()Z"); } set { IExecuteWithSignature("setPreferFirstRepeatedParameter", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>("getUnregisteredParameterValueSanitizer", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getUnregisteredParameterValueSanitizer()"/> <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#setUnregisteredParameterValueSanitizer(android.net.UrlQuerySanitizer.ValueSanitizer)"/>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getValueSanitizer(java.lang.String)"/>
         /// </summary>
-        public Android.Net.UrlQuerySanitizer.ValueSanitizer UnregisteredParameterValueSanitizer
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
+        public Android.Net.UrlQuerySanitizer.ValueSanitizer GetValueSanitizer(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>("getUnregisteredParameterValueSanitizer", "()Landroid/net/UrlQuerySanitizer$ValueSanitizer;"); } set { IExecuteWithSignature("setUnregisteredParameterValueSanitizer", "(Landroid/net/UrlQuerySanitizer$ValueSanitizer;)V", value); }
+            return IExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>("getValueSanitizer", "(Ljava/lang/String;)Landroid/net/UrlQuerySanitizer$ValueSanitizer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getEffectiveValueSanitizer(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getAllowUnregisteredParamaters()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
-        public Android.Net.UrlQuerySanitizer.ValueSanitizer GetEffectiveValueSanitizer(Java.Lang.String arg0)
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowUnregisteredParamaters()
         {
-            return IExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>("getEffectiveValueSanitizer", "(Ljava/lang/String;)Landroid/net/UrlQuerySanitizer$ValueSanitizer;", arg0);
+            return IExecuteWithSignature<bool>("getAllowUnregisteredParamaters", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getValueSanitizer(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getPreferFirstRepeatedParameter()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></returns>
-        public Android.Net.UrlQuerySanitizer.ValueSanitizer GetValueSanitizer(Java.Lang.String arg0)
+        /// <returns><see cref="bool"/></returns>
+        public bool GetPreferFirstRepeatedParameter()
         {
-            return IExecuteWithSignature<Android.Net.UrlQuerySanitizer.ValueSanitizer>("getValueSanitizer", "(Ljava/lang/String;)Landroid/net/UrlQuerySanitizer$ValueSanitizer;", arg0);
+            return IExecuteWithSignature<bool>("getPreferFirstRepeatedParameter", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#hasParameter(java.lang.String)"/>
@@ -197,6 +195,22 @@ public Java.Lang.String Unescape(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("unescape", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getParameterList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.UrlQuerySanitizer.ParameterValuePair> GetParameterList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.UrlQuerySanitizer.ParameterValuePair>>("getParameterList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#getParameterSet()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetParameterSet()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getParameterSet", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#parseQuery(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -230,6 +244,30 @@ public void RegisterParameters(Java.Lang.String[] arg0, Android.Net.UrlQuerySani
         {
             IExecute("registerParameters", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#setAllowUnregisteredParamaters(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAllowUnregisteredParamaters(bool arg0)
+        {
+            IExecuteWithSignature("setAllowUnregisteredParamaters", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#setPreferFirstRepeatedParameter(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetPreferFirstRepeatedParameter(bool arg0)
+        {
+            IExecuteWithSignature("setPreferFirstRepeatedParameter", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/UrlQuerySanitizer.html#setUnregisteredParameterValueSanitizer(android.net.UrlQuerySanitizer.ValueSanitizer)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.UrlQuerySanitizer.ValueSanitizer"/></param>
+        public void SetUnregisteredParameterValueSanitizer(Android.Net.UrlQuerySanitizer.ValueSanitizer arg0)
+        {
+            IExecuteWithSignature("setUnregisteredParameterValueSanitizer", "(Landroid/net/UrlQuerySanitizer$ValueSanitizer;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/Vcn/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Vcn/AllPackageClasses.cs
index 95bb89793..e7a32aee4 100644
--- a/src/net/Netdroid/Generated/Android/Net/Vcn/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Vcn/AllPackageClasses.cs
@@ -340,12 +340,12 @@ public partial class VcnStatusCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("VcnStatusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VcnStatusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VcnStatusCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("VcnStatusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VcnStatusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VcnStatusCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -390,12 +390,12 @@ public partial class VcnUnderlyingNetworkTemplate : MASES.JCOBridge.C2JBridge.JV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VcnUnderlyingNetworkTemplate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VcnUnderlyingNetworkTemplate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VcnUnderlyingNetworkTemplate() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VcnUnderlyingNetworkTemplate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VcnUnderlyingNetworkTemplate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VcnUnderlyingNetworkTemplate(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnCellUnderlyingNetworkTemplate.cs b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnCellUnderlyingNetworkTemplate.cs
index 8b71019a2..6518b3a5a 100644
--- a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnCellUnderlyingNetworkTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnCellUnderlyingNetworkTemplate.cs
@@ -46,74 +46,84 @@ public partial class VcnCellUnderlyingNetworkTemplate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getCbs()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getCbs()"/>
         /// </summary>
-        public int Cbs
+        /// <returns><see cref="int"/></returns>
+        public int GetCbs()
         {
-            get { return IExecuteWithSignature<int>("getCbs", "()I"); }
+            return IExecuteWithSignature<int>("getCbs", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getDun()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getDun()"/>
         /// </summary>
-        public int Dun
+        /// <returns><see cref="int"/></returns>
+        public int GetDun()
         {
-            get { return IExecuteWithSignature<int>("getDun", "()I"); }
+            return IExecuteWithSignature<int>("getDun", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getIms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getIms()"/>
         /// </summary>
-        public int Ims
+        /// <returns><see cref="int"/></returns>
+        public int GetIms()
         {
-            get { return IExecuteWithSignature<int>("getIms", "()I"); }
+            return IExecuteWithSignature<int>("getIms", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getInternet()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getInternet()"/>
         /// </summary>
-        public int Internet
+        /// <returns><see cref="int"/></returns>
+        public int GetInternet()
         {
-            get { return IExecuteWithSignature<int>("getInternet", "()I"); }
+            return IExecuteWithSignature<int>("getInternet", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getMms()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getMms()"/>
         /// </summary>
-        public int Mms
+        /// <returns><see cref="int"/></returns>
+        public int GetMms()
         {
-            get { return IExecuteWithSignature<int>("getMms", "()I"); }
+            return IExecuteWithSignature<int>("getMms", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getOperatorPlmnIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getOpportunistic()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> OperatorPlmnIds
+        /// <returns><see cref="int"/></returns>
+        public int GetOpportunistic()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getOperatorPlmnIds", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("getOpportunistic", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getOpportunistic()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getRcs()"/>
         /// </summary>
-        public int Opportunistic
+        /// <returns><see cref="int"/></returns>
+        public int GetRcs()
         {
-            get { return IExecuteWithSignature<int>("getOpportunistic", "()I"); }
+            return IExecuteWithSignature<int>("getRcs", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getRcs()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getRoaming()"/>
         /// </summary>
-        public int Rcs
+        /// <returns><see cref="int"/></returns>
+        public int GetRoaming()
         {
-            get { return IExecuteWithSignature<int>("getRcs", "()I"); }
+            return IExecuteWithSignature<int>("getRoaming", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getRoaming()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getSimSpecificCarrierIds()"/>
         /// </summary>
-        public int Roaming
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Integer> GetSimSpecificCarrierIds()
         {
-            get { return IExecuteWithSignature<int>("getRoaming", "()I"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getSimSpecificCarrierIds", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getSimSpecificCarrierIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnCellUnderlyingNetworkTemplate.html#getOperatorPlmnIds()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.Integer> SimSpecificCarrierIds
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetOperatorPlmnIds()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getSimSpecificCarrierIds", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getOperatorPlmnIds", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnConfig.cs b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnConfig.cs
index 730a1bc8e..82954f282 100644
--- a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnConfig.cs
@@ -52,26 +52,28 @@ public partial class VcnConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnConfig.html#getGatewayConnectionConfigs()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnConfig.html#describeContents()"/>
         /// </summary>
-        public Java.Util.Set<Android.Net.Vcn.VcnGatewayConnectionConfig> GatewayConnectionConfigs
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Net.Vcn.VcnGatewayConnectionConfig>>("getGatewayConnectionConfigs", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnConfig.html#getRestrictedUnderlyingNetworkTransports()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnConfig.html#getGatewayConnectionConfigs()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.Integer> RestrictedUnderlyingNetworkTransports
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Net.Vcn.VcnGatewayConnectionConfig> GetGatewayConnectionConfigs()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getRestrictedUnderlyingNetworkTransports", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Android.Net.Vcn.VcnGatewayConnectionConfig>>("getGatewayConnectionConfigs", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnConfig.html#getRestrictedUnderlyingNetworkTransports()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Integer> GetRestrictedUnderlyingNetworkTransports()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Integer>>("getRestrictedUnderlyingNetworkTransports", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/vcn/VcnConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnGatewayConnectionConfig.cs b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnGatewayConnectionConfig.cs
index 34250f216..cc8f85ae4 100644
--- a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnGatewayConnectionConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnGatewayConnectionConfig.cs
@@ -52,55 +52,61 @@ public partial class VcnGatewayConnectionConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getExposedCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#hasGatewayOption(int)"/>
         /// </summary>
-        public int[] ExposedCapabilities
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool HasGatewayOption(int arg0)
         {
-            get { return IExecuteWithSignatureArray<int>("getExposedCapabilities", "()[I"); }
+            return IExecuteWithSignature<bool>("hasGatewayOption", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getGatewayConnectionName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getMaxMtu()"/>
         /// </summary>
-        public Java.Lang.String GatewayConnectionName
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxMtu()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGatewayConnectionName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getMaxMtu", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getMaxMtu()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getMinUdpPort4500NatTimeoutSeconds()"/>
         /// </summary>
-        public int MaxMtu
+        /// <returns><see cref="int"/></returns>
+        public int GetMinUdpPort4500NatTimeoutSeconds()
         {
-            get { return IExecuteWithSignature<int>("getMaxMtu", "()I"); }
+            return IExecuteWithSignature<int>("getMinUdpPort4500NatTimeoutSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getMinUdpPort4500NatTimeoutSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getExposedCapabilities()"/>
         /// </summary>
-        public int MinUdpPort4500NatTimeoutSeconds
+        /// <returns><see cref="int"/></returns>
+        public int[] GetExposedCapabilities()
         {
-            get { return IExecuteWithSignature<int>("getMinUdpPort4500NatTimeoutSeconds", "()I"); }
+            return IExecuteWithSignatureArray<int>("getExposedCapabilities", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getRetryIntervalsMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getGatewayConnectionName()"/>
         /// </summary>
-        public long[] RetryIntervalsMillis
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGatewayConnectionName()
         {
-            get { return IExecuteWithSignatureArray<long>("getRetryIntervalsMillis", "()[J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getGatewayConnectionName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getVcnUnderlyingNetworkPriorities()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getVcnUnderlyingNetworkPriorities()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Vcn.VcnUnderlyingNetworkTemplate> VcnUnderlyingNetworkPriorities
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Vcn.VcnUnderlyingNetworkTemplate> GetVcnUnderlyingNetworkPriorities()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Vcn.VcnUnderlyingNetworkTemplate>>("getVcnUnderlyingNetworkPriorities", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Vcn.VcnUnderlyingNetworkTemplate>>("getVcnUnderlyingNetworkPriorities", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#hasGatewayOption(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnGatewayConnectionConfig.html#getRetryIntervalsMillis()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasGatewayOption(int arg0)
+        /// <returns><see cref="long"/></returns>
+        public long[] GetRetryIntervalsMillis()
         {
-            return IExecuteWithSignature<bool>("hasGatewayOption", "(I)Z", arg0);
+            return IExecuteWithSignatureArray<long>("getRetryIntervalsMillis", "()[J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnManager.cs b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnManager.cs
index 54fa70900..1750bf4fa 100644
--- a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnManager.cs
@@ -88,11 +88,12 @@ public partial class VcnManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnManager.html#getConfiguredSubscriptionGroups()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnManager.html#getConfiguredSubscriptionGroups()"/>
         /// </summary>
-        public Java.Util.List<Android.Os.ParcelUuid> ConfiguredSubscriptionGroups
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.ParcelUuid> GetConfiguredSubscriptionGroups()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getConfiguredSubscriptionGroups", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Os.ParcelUuid>>("getConfiguredSubscriptionGroups", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/vcn/VcnManager.html#clearVcnConfig(android.os.ParcelUuid)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnUnderlyingNetworkTemplate.cs b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnUnderlyingNetworkTemplate.cs
index 53cd737cb..06b9ecb44 100644
--- a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnUnderlyingNetworkTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnUnderlyingNetworkTemplate.cs
@@ -64,39 +64,44 @@ public partial class VcnUnderlyingNetworkTemplate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMetered()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMetered()"/>
         /// </summary>
-        public int Metered
+        /// <returns><see cref="int"/></returns>
+        public int GetMetered()
         {
-            get { return IExecuteWithSignature<int>("getMetered", "()I"); }
+            return IExecuteWithSignature<int>("getMetered", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMinEntryDownstreamBandwidthKbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMinEntryDownstreamBandwidthKbps()"/>
         /// </summary>
-        public int MinEntryDownstreamBandwidthKbps
+        /// <returns><see cref="int"/></returns>
+        public int GetMinEntryDownstreamBandwidthKbps()
         {
-            get { return IExecuteWithSignature<int>("getMinEntryDownstreamBandwidthKbps", "()I"); }
+            return IExecuteWithSignature<int>("getMinEntryDownstreamBandwidthKbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMinEntryUpstreamBandwidthKbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMinEntryUpstreamBandwidthKbps()"/>
         /// </summary>
-        public int MinEntryUpstreamBandwidthKbps
+        /// <returns><see cref="int"/></returns>
+        public int GetMinEntryUpstreamBandwidthKbps()
         {
-            get { return IExecuteWithSignature<int>("getMinEntryUpstreamBandwidthKbps", "()I"); }
+            return IExecuteWithSignature<int>("getMinEntryUpstreamBandwidthKbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMinExitDownstreamBandwidthKbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMinExitDownstreamBandwidthKbps()"/>
         /// </summary>
-        public int MinExitDownstreamBandwidthKbps
+        /// <returns><see cref="int"/></returns>
+        public int GetMinExitDownstreamBandwidthKbps()
         {
-            get { return IExecuteWithSignature<int>("getMinExitDownstreamBandwidthKbps", "()I"); }
+            return IExecuteWithSignature<int>("getMinExitDownstreamBandwidthKbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMinExitUpstreamBandwidthKbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnUnderlyingNetworkTemplate.html#getMinExitUpstreamBandwidthKbps()"/>
         /// </summary>
-        public int MinExitUpstreamBandwidthKbps
+        /// <returns><see cref="int"/></returns>
+        public int GetMinExitUpstreamBandwidthKbps()
         {
-            get { return IExecuteWithSignature<int>("getMinExitUpstreamBandwidthKbps", "()I"); }
+            return IExecuteWithSignature<int>("getMinExitUpstreamBandwidthKbps", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnWifiUnderlyingNetworkTemplate.cs b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnWifiUnderlyingNetworkTemplate.cs
index 46b066a71..5048808d3 100644
--- a/src/net/Netdroid/Generated/Android/Net/Vcn/VcnWifiUnderlyingNetworkTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Vcn/VcnWifiUnderlyingNetworkTemplate.cs
@@ -46,11 +46,12 @@ public partial class VcnWifiUnderlyingNetworkTemplate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnWifiUnderlyingNetworkTemplate.html#getSsids()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/vcn/VcnWifiUnderlyingNetworkTemplate.html#getSsids()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> Ssids
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetSsids()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSsids", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSsids", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/VpnManager.cs b/src/net/Netdroid/Generated/Android/Net/VpnManager.cs
index 9121e9a9c..d43aeb2a8 100644
--- a/src/net/Netdroid/Generated/Android/Net/VpnManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/VpnManager.cs
@@ -160,13 +160,6 @@ public partial class VpnManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/VpnManager.html#getProvisionedVpnProfileState()"/> 
-        /// </summary>
-        public Android.Net.VpnProfileState ProvisionedVpnProfileState
-        {
-            get { return IExecuteWithSignature<Android.Net.VpnProfileState>("getProvisionedVpnProfileState", "()Landroid/net/VpnProfileState;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/VpnManager.html#provisionVpnProfile(android.net.PlatformVpnProfile)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.PlatformVpnProfile"/></param>
@@ -176,6 +169,14 @@ public Android.Content.Intent ProvisionVpnProfile(Android.Net.PlatformVpnProfile
             return IExecuteWithSignature<Android.Content.Intent>("provisionVpnProfile", "(Landroid/net/PlatformVpnProfile;)Landroid/content/Intent;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/VpnManager.html#getProvisionedVpnProfileState()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.VpnProfileState"/></returns>
+        public Android.Net.VpnProfileState GetProvisionedVpnProfileState()
+        {
+            return IExecuteWithSignature<Android.Net.VpnProfileState>("getProvisionedVpnProfileState", "()Landroid/net/VpnProfileState;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/VpnManager.html#startProvisionedVpnProfileSession()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -193,7 +194,7 @@ public void DeleteProvisionedVpnProfile()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/VpnManager.html#startProvisionedVpnProfile()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartProvisionedVpnProfile()
         {
             IExecuteWithSignature("startProvisionedVpnProfile", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Net/VpnProfileState.cs b/src/net/Netdroid/Generated/Android/Net/VpnProfileState.cs
index 324190c61..a20b56deb 100644
--- a/src/net/Netdroid/Generated/Android/Net/VpnProfileState.cs
+++ b/src/net/Netdroid/Generated/Android/Net/VpnProfileState.cs
@@ -87,20 +87,6 @@ public VpnProfileState(int arg0, Java.Lang.String arg1, bool arg2, bool arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/VpnProfileState.html#getSessionId()"/> 
-        /// </summary>
-        public Java.Lang.String SessionId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSessionId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/VpnProfileState.html#getState()"/> 
-        /// </summary>
-        public int State
-        {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/VpnProfileState.html#isAlwaysOn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -125,6 +111,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/VpnProfileState.html#getState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
+        {
+            return IExecuteWithSignature<int>("getState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/VpnProfileState.html#getSessionId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSessionId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSessionId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/VpnProfileState.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/AllPackageClasses.cs
index 6ba15f1ea..a6811f4fb 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class EasyConnectStatusCallback : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EasyConnectStatusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EasyConnectStatusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EasyConnectStatusCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EasyConnectStatusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EasyConnectStatusCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EasyConnectStatusCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -340,7 +340,7 @@ public WifiAvailableChannel(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class WifiConfiguration : Android.Os.Parcelable
     {
         const string _bridgeClassName = "android.net.wifi.WifiConfiguration";
@@ -381,7 +381,7 @@ public WifiConfiguration(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.AuthAlgorithm.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class AuthAlgorithm : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AuthAlgorithm>
         {
             const string _bridgeClassName = "android.net.wifi.WifiConfiguration$AuthAlgorithm";
@@ -426,7 +426,7 @@ public AuthAlgorithm(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class GroupCipher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GroupCipher>
         {
             const string _bridgeClassName = "android.net.wifi.WifiConfiguration$GroupCipher";
@@ -471,7 +471,7 @@ public GroupCipher(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupMgmtCipher.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class GroupMgmtCipher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GroupMgmtCipher>
         {
             const string _bridgeClassName = "android.net.wifi.WifiConfiguration$GroupMgmtCipher";
@@ -516,7 +516,7 @@ public GroupMgmtCipher(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class KeyMgmt : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyMgmt>
         {
             const string _bridgeClassName = "android.net.wifi.WifiConfiguration$KeyMgmt";
@@ -561,7 +561,7 @@ public KeyMgmt(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PairwiseCipher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PairwiseCipher>
         {
             const string _bridgeClassName = "android.net.wifi.WifiConfiguration$PairwiseCipher";
@@ -606,7 +606,7 @@ public PairwiseCipher(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Protocol.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Protocol : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Protocol>
         {
             const string _bridgeClassName = "android.net.wifi.WifiConfiguration$Protocol";
@@ -651,7 +651,7 @@ public Protocol(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Status.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Status : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Status>
         {
             const string _bridgeClassName = "android.net.wifi.WifiConfiguration$Status";
@@ -1055,10 +1055,13 @@ public partial class LocalOnlyConnectionFailureListener : MASES.JCOBridge.C2JBri
             /// </summary>
             public LocalOnlyConnectionFailureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.WifiManager_LocalOnlyConnectionFailureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.LocalOnlyConnectionFailureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1080,10 +1083,13 @@ public partial class LocalOnlyConnectionFailureListenerDirect : LocalOnlyConnect
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.WifiManager$LocalOnlyConnectionFailureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.WifiManager$LocalOnlyConnectionFailureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1245,12 +1251,12 @@ public partial class ScanResultsCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ScanResultsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ScanResultsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ScanResultsCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ScanResultsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ScanResultsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ScanResultsCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1291,12 +1297,12 @@ public partial class SubsystemRestartTrackingCallback : MASES.JCOBridge.C2JBridg
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SubsystemRestartTrackingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SubsystemRestartTrackingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SubsystemRestartTrackingCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SubsystemRestartTrackingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SubsystemRestartTrackingCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SubsystemRestartTrackingCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1338,10 +1344,13 @@ public partial class SuggestionConnectionStatusListener : MASES.JCOBridge.C2JBri
             /// </summary>
             public SuggestionConnectionStatusListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.WifiManager_SuggestionConnectionStatusListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.SuggestionConnectionStatusListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1363,10 +1372,13 @@ public partial class SuggestionConnectionStatusListenerDirect : SuggestionConnec
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.WifiManager$SuggestionConnectionStatusListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.WifiManager$SuggestionConnectionStatusListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1397,10 +1409,13 @@ public partial class SuggestionUserApprovalStatusListener : MASES.JCOBridge.C2JB
             /// </summary>
             public SuggestionUserApprovalStatusListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.WifiManager_SuggestionUserApprovalStatusListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.SuggestionUserApprovalStatusListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1422,10 +1437,13 @@ public partial class SuggestionUserApprovalStatusListenerDirect : SuggestionUser
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.WifiManager$SuggestionUserApprovalStatusListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.WifiManager$SuggestionUserApprovalStatusListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1493,19 +1511,19 @@ public WifiLock(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.WpsCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class WpsCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WpsCallback>
         {
             const string _bridgeClassName = "android.net.wifi.WifiManager$WpsCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("WpsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WpsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WpsCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("WpsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WpsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WpsCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AllPackageClasses.cs
index fa9df314d..d91f89626 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AllPackageClasses.cs
@@ -338,38 +338,24 @@ public DiscoverySessionCallback(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/net/wifi/aware/IdentityChangedListener.html"/>
     /// </summary>
-    public partial class IdentityChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class IdentityChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IdentityChangedListener>
     {
+        const string _bridgeClassName = "android.net.wifi.aware.IdentityChangedListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public IdentityChangedListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region IdentityChangedListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="IdentityChangedListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class IdentityChangedListenerDirect : IdentityChangedListener
-    {
+        public IdentityChangedListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public IdentityChangedListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.net.wifi.aware.IdentityChangedListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -386,6 +372,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AwarePairingConfig.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AwarePairingConfig.cs
index 878a5732b..9c1a4ee86 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AwarePairingConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AwarePairingConfig.cs
@@ -106,13 +106,6 @@ public partial class AwarePairingConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwarePairingConfig.html#getBootstrappingMethods()"/> 
-        /// </summary>
-        public int BootstrappingMethods
-        {
-            get { return IExecuteWithSignature<int>("getBootstrappingMethods", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwarePairingConfig.html#isPairingCacheEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -145,6 +138,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwarePairingConfig.html#getBootstrappingMethods()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBootstrappingMethods()
+        {
+            return IExecuteWithSignature<int>("getBootstrappingMethods", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwarePairingConfig.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AwareResources.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AwareResources.cs
index 70a4aab81..497c2eb91 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AwareResources.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/AwareResources.cs
@@ -62,33 +62,36 @@ public AwareResources(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#getAvailableDataPathsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#describeContents()"/>
         /// </summary>
-        public int AvailableDataPathsCount
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getAvailableDataPathsCount", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#getAvailablePublishSessionsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#getAvailableDataPathsCount()"/>
         /// </summary>
-        public int AvailablePublishSessionsCount
+        /// <returns><see cref="int"/></returns>
+        public int GetAvailableDataPathsCount()
         {
-            get { return IExecuteWithSignature<int>("getAvailablePublishSessionsCount", "()I"); }
+            return IExecuteWithSignature<int>("getAvailableDataPathsCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#getAvailableSubscribeSessionsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#getAvailablePublishSessionsCount()"/>
         /// </summary>
-        public int AvailableSubscribeSessionsCount
+        /// <returns><see cref="int"/></returns>
+        public int GetAvailablePublishSessionsCount()
         {
-            get { return IExecuteWithSignature<int>("getAvailableSubscribeSessionsCount", "()I"); }
+            return IExecuteWithSignature<int>("getAvailablePublishSessionsCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#getAvailableSubscribeSessionsCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetAvailableSubscribeSessionsCount()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getAvailableSubscribeSessionsCount", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/AwareResources.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/Characteristics.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/Characteristics.cs
index ca533f6ad..d13ace11d 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/Characteristics.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/Characteristics.cs
@@ -94,99 +94,108 @@ public partial class Characteristics
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getMaxMatchFilterLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#isAwarePairingSupported()"/>
         /// </summary>
-        public int MaxMatchFilterLength
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAwarePairingSupported()
         {
-            get { return IExecuteWithSignature<int>("getMaxMatchFilterLength", "()I"); }
+            return IExecuteWithSignature<bool>("isAwarePairingSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getMaxServiceNameLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#isInstantCommunicationModeSupported()"/>
         /// </summary>
-        public int MaxServiceNameLength
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInstantCommunicationModeSupported()
         {
-            get { return IExecuteWithSignature<int>("getMaxServiceNameLength", "()I"); }
+            return IExecuteWithSignature<bool>("isInstantCommunicationModeSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getMaxServiceSpecificInfoLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#isSuspensionSupported()"/>
         /// </summary>
-        public int MaxServiceSpecificInfoLength
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSuspensionSupported()
         {
-            get { return IExecuteWithSignature<int>("getMaxServiceSpecificInfoLength", "()I"); }
+            return IExecuteWithSignature<bool>("isSuspensionSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getNumberOfSupportedDataInterfaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#describeContents()"/>
         /// </summary>
-        public int NumberOfSupportedDataInterfaces
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getNumberOfSupportedDataInterfaces", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getNumberOfSupportedDataPaths()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getMaxMatchFilterLength()"/>
         /// </summary>
-        public int NumberOfSupportedDataPaths
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxMatchFilterLength()
         {
-            get { return IExecuteWithSignature<int>("getNumberOfSupportedDataPaths", "()I"); }
+            return IExecuteWithSignature<int>("getMaxMatchFilterLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getNumberOfSupportedPublishSessions()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getMaxServiceNameLength()"/>
         /// </summary>
-        public int NumberOfSupportedPublishSessions
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxServiceNameLength()
         {
-            get { return IExecuteWithSignature<int>("getNumberOfSupportedPublishSessions", "()I"); }
+            return IExecuteWithSignature<int>("getMaxServiceNameLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getNumberOfSupportedSubscribeSessions()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getMaxServiceSpecificInfoLength()"/>
         /// </summary>
-        public int NumberOfSupportedSubscribeSessions
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxServiceSpecificInfoLength()
         {
-            get { return IExecuteWithSignature<int>("getNumberOfSupportedSubscribeSessions", "()I"); }
+            return IExecuteWithSignature<int>("getMaxServiceSpecificInfoLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getSupportedCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getNumberOfSupportedDataInterfaces()"/>
         /// </summary>
-        public int SupportedCipherSuites
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfSupportedDataInterfaces()
         {
-            get { return IExecuteWithSignature<int>("getSupportedCipherSuites", "()I"); }
+            return IExecuteWithSignature<int>("getNumberOfSupportedDataInterfaces", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getSupportedPairingCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getNumberOfSupportedDataPaths()"/>
         /// </summary>
-        public int SupportedPairingCipherSuites
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfSupportedDataPaths()
         {
-            get { return IExecuteWithSignature<int>("getSupportedPairingCipherSuites", "()I"); }
+            return IExecuteWithSignature<int>("getNumberOfSupportedDataPaths", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#isAwarePairingSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getNumberOfSupportedPublishSessions()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAwarePairingSupported()
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfSupportedPublishSessions()
         {
-            return IExecuteWithSignature<bool>("isAwarePairingSupported", "()Z");
+            return IExecuteWithSignature<int>("getNumberOfSupportedPublishSessions", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#isInstantCommunicationModeSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getNumberOfSupportedSubscribeSessions()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInstantCommunicationModeSupported()
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfSupportedSubscribeSessions()
         {
-            return IExecuteWithSignature<bool>("isInstantCommunicationModeSupported", "()Z");
+            return IExecuteWithSignature<int>("getNumberOfSupportedSubscribeSessions", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#isSuspensionSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getSupportedCipherSuites()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSuspensionSupported()
+        /// <returns><see cref="int"/></returns>
+        public int GetSupportedCipherSuites()
         {
-            return IExecuteWithSignature<bool>("isSuspensionSupported", "()Z");
+            return IExecuteWithSignature<int>("getSupportedCipherSuites", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#getSupportedPairingCipherSuites()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSupportedPairingCipherSuites()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSupportedPairingCipherSuites", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/Characteristics.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/DiscoverySession.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/DiscoverySession.cs
index 49aa0cfb3..9932754a8 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/DiscoverySession.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/DiscoverySession.cs
@@ -50,7 +50,7 @@ public partial class DiscoverySession
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Wifi.Aware.PeerHandle"/></param>
         /// <returns><see cref="Android.Net.NetworkSpecifier"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.NetworkSpecifier CreateNetworkSpecifierOpen(Android.Net.Wifi.Aware.PeerHandle arg0)
         {
             return IExecuteWithSignature<Android.Net.NetworkSpecifier>("createNetworkSpecifierOpen", "(Landroid/net/wifi/aware/PeerHandle;)Landroid/net/NetworkSpecifier;", arg0);
@@ -61,7 +61,7 @@ public Android.Net.NetworkSpecifier CreateNetworkSpecifierOpen(Android.Net.Wifi.
         /// <param name="arg0"><see cref="Android.Net.Wifi.Aware.PeerHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Net.NetworkSpecifier"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.NetworkSpecifier CreateNetworkSpecifierPassphrase(Android.Net.Wifi.Aware.PeerHandle arg0, Java.Lang.String arg1)
         {
             return IExecute<Android.Net.NetworkSpecifier>("createNetworkSpecifierPassphrase", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/IdentityChangedListener.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/IdentityChangedListener.cs
index 4d8406978..eab13083f 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/IdentityChangedListener.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/IdentityChangedListener.cs
@@ -37,89 +37,18 @@ public partial class IdentityChangedListener
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// Handlers initializer for <see cref="IdentityChangedListener"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/IdentityChangedListener.html#CLUSTER_CHANGE_EVENT_JOINED"/>
         /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onClusterIdChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnClusterIdChangedEventHandler));
-            AddEventHandler("onIdentityChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<byte[]>>>(OnIdentityChangedEventHandler));
-
-        }
-
+        public static int CLUSTER_CHANGE_EVENT_JOINED { get { if (!_CLUSTER_CHANGE_EVENT_JOINEDReady) { _CLUSTER_CHANGE_EVENT_JOINEDContent = SGetField<int>(LocalBridgeClazz, "CLUSTER_CHANGE_EVENT_JOINED"); _CLUSTER_CHANGE_EVENT_JOINEDReady = true; } return _CLUSTER_CHANGE_EVENT_JOINEDContent; } }
+        private static int _CLUSTER_CHANGE_EVENT_JOINEDContent = default;
+        private static bool _CLUSTER_CHANGE_EVENT_JOINEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/aware/IdentityChangedListener.html#onClusterIdChanged(int,android.net.MacAddress)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/IdentityChangedListener.html#CLUSTER_CHANGE_EVENT_STARTED"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnClusterIdChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, Android.Net.MacAddress> OnOnClusterIdChanged { get; set; } = null;
-
-        void OnClusterIdChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnClusterIdChanged != null) ? OnOnClusterIdChanged : OnClusterIdChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Net.MacAddress>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/IdentityChangedListener.html#onClusterIdChanged(int,android.net.MacAddress)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Net.MacAddress"/></param>
-        public virtual void OnClusterIdChanged(int arg0, Android.Net.MacAddress arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/aware/IdentityChangedListener.html#onIdentityChanged(byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnIdentityChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<byte[]> OnOnIdentityChanged { get; set; } = null;
-
-        void OnIdentityChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<byte[]>> data)
-        {
-            var methodToExecute = (OnOnIdentityChanged != null) ? OnOnIdentityChanged : OnIdentityChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/IdentityChangedListener.html#onIdentityChanged(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        public virtual void OnIdentityChanged(byte[] arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region IdentityChangedListenerDirect
-    public partial class IdentityChangedListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
+        public static int CLUSTER_CHANGE_EVENT_STARTED { get { if (!_CLUSTER_CHANGE_EVENT_STARTEDReady) { _CLUSTER_CHANGE_EVENT_STARTEDContent = SGetField<int>(LocalBridgeClazz, "CLUSTER_CHANGE_EVENT_STARTED"); _CLUSTER_CHANGE_EVENT_STARTEDReady = true; } return _CLUSTER_CHANGE_EVENT_STARTEDContent; } }
+        private static int _CLUSTER_CHANGE_EVENT_STARTEDContent = default;
+        private static bool _CLUSTER_CHANGE_EVENT_STARTEDReady = false; // this is used because in case of generics 
 
         #endregion
 
@@ -133,7 +62,7 @@ public partial class IdentityChangedListenerDirect
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Net.MacAddress"/></param>
-        public override void OnClusterIdChanged(int arg0, Android.Net.MacAddress arg1)
+        public void OnClusterIdChanged(int arg0, Android.Net.MacAddress arg1)
         {
             IExecute("onClusterIdChanged", arg0, arg1);
         }
@@ -141,7 +70,7 @@ public override void OnClusterIdChanged(int arg0, Android.Net.MacAddress arg1)
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/IdentityChangedListener.html#onIdentityChanged(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        public override void OnIdentityChanged(byte[] arg0)
+        public void OnIdentityChanged(byte[] arg0)
         {
             IExecuteWithSignature("onIdentityChanged", "([B)V", new object[] { arg0 });
         }
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/PublishConfig.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/PublishConfig.cs
index a91855896..a6b4962a9 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/PublishConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/PublishConfig.cs
@@ -64,25 +64,20 @@ public partial class PublishConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/PublishConfig.html#getInstantCommunicationBand()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/PublishConfig.html#getPairingConfig()"/>
         /// </summary>
-        public int InstantCommunicationBand
+        /// <returns><see cref="Android.Net.Wifi.Aware.AwarePairingConfig"/></returns>
+        public Android.Net.Wifi.Aware.AwarePairingConfig GetPairingConfig()
         {
-            get { return IExecuteWithSignature<int>("getInstantCommunicationBand", "()I"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.AwarePairingConfig>("getPairingConfig", "()Landroid/net/wifi/aware/AwarePairingConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/PublishConfig.html#getPairingConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/PublishConfig.html#getSecurityConfig()"/>
         /// </summary>
-        public Android.Net.Wifi.Aware.AwarePairingConfig PairingConfig
+        /// <returns><see cref="Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig"/></returns>
+        public Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig GetSecurityConfig()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.AwarePairingConfig>("getPairingConfig", "()Landroid/net/wifi/aware/AwarePairingConfig;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/PublishConfig.html#getSecurityConfig()"/> 
-        /// </summary>
-        public Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig SecurityConfig
-        {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig>("getSecurityConfig", "()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig>("getSecurityConfig", "()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/PublishConfig.html#isInstantCommunicationModeEnabled()"/>
@@ -101,6 +96,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/PublishConfig.html#getInstantCommunicationBand()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInstantCommunicationBand()
+        {
+            return IExecuteWithSignature<int>("getInstantCommunicationBand", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/PublishConfig.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/ServiceDiscoveryInfo.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/ServiceDiscoveryInfo.cs
index 2af0e9540..b7a09febf 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/ServiceDiscoveryInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/ServiceDiscoveryInfo.cs
@@ -46,53 +46,60 @@ public partial class ServiceDiscoveryInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getMatchFilters()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getPairingConfig()"/>
         /// </summary>
-        public Java.Util.List<byte[]> MatchFilters
+        /// <returns><see cref="Android.Net.Wifi.Aware.AwarePairingConfig"/></returns>
+        public Android.Net.Wifi.Aware.AwarePairingConfig GetPairingConfig()
         {
-            get { return IExecuteWithSignature<Java.Util.List<byte[]>>("getMatchFilters", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.AwarePairingConfig>("getPairingConfig", "()Landroid/net/wifi/aware/AwarePairingConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getPairedAlias()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getPeerHandle()"/>
         /// </summary>
-        public Java.Lang.String PairedAlias
+        /// <returns><see cref="Android.Net.Wifi.Aware.PeerHandle"/></returns>
+        public Android.Net.Wifi.Aware.PeerHandle GetPeerHandle()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPairedAlias", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.PeerHandle>("getPeerHandle", "()Landroid/net/wifi/aware/PeerHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getPairingConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getScid()"/>
         /// </summary>
-        public Android.Net.Wifi.Aware.AwarePairingConfig PairingConfig
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetScid()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.AwarePairingConfig>("getPairingConfig", "()Landroid/net/wifi/aware/AwarePairingConfig;"); }
+            return IExecuteWithSignatureArray<byte>("getScid", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getPeerCipherSuite()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getServiceSpecificInfo()"/>
         /// </summary>
-        public int PeerCipherSuite
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetServiceSpecificInfo()
         {
-            get { return IExecuteWithSignature<int>("getPeerCipherSuite", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getServiceSpecificInfo", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getPeerHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getPeerCipherSuite()"/>
         /// </summary>
-        public Android.Net.Wifi.Aware.PeerHandle PeerHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetPeerCipherSuite()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.PeerHandle>("getPeerHandle", "()Landroid/net/wifi/aware/PeerHandle;"); }
+            return IExecuteWithSignature<int>("getPeerCipherSuite", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getScid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getPairedAlias()"/>
         /// </summary>
-        public byte[] Scid
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPairedAlias()
         {
-            get { return IExecuteWithSignatureArray<byte>("getScid", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPairedAlias", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getServiceSpecificInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/ServiceDiscoveryInfo.html#getMatchFilters()"/>
         /// </summary>
-        public byte[] ServiceSpecificInfo
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<byte[]> GetMatchFilters()
         {
-            get { return IExecuteWithSignatureArray<byte>("getServiceSpecificInfo", "()[B"); }
+            return IExecuteWithSignature<Java.Util.List<byte[]>>("getMatchFilters", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/SubscribeConfig.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/SubscribeConfig.cs
index 29bdb745f..33d033d9e 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/SubscribeConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/SubscribeConfig.cs
@@ -64,18 +64,12 @@ public partial class SubscribeConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/SubscribeConfig.html#getInstantCommunicationBand()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/SubscribeConfig.html#getPairingConfig()"/>
         /// </summary>
-        public int InstantCommunicationBand
+        /// <returns><see cref="Android.Net.Wifi.Aware.AwarePairingConfig"/></returns>
+        public Android.Net.Wifi.Aware.AwarePairingConfig GetPairingConfig()
         {
-            get { return IExecuteWithSignature<int>("getInstantCommunicationBand", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/SubscribeConfig.html#getPairingConfig()"/> 
-        /// </summary>
-        public Android.Net.Wifi.Aware.AwarePairingConfig PairingConfig
-        {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.AwarePairingConfig>("getPairingConfig", "()Landroid/net/wifi/aware/AwarePairingConfig;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.AwarePairingConfig>("getPairingConfig", "()Landroid/net/wifi/aware/AwarePairingConfig;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/SubscribeConfig.html#isInstantCommunicationModeEnabled()"/>
@@ -94,6 +88,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/SubscribeConfig.html#getInstantCommunicationBand()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInstantCommunicationBand()
+        {
+            return IExecuteWithSignature<int>("getInstantCommunicationBand", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/SubscribeConfig.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareChannelInfo.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareChannelInfo.cs
index b57b135bc..ef1f250e8 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareChannelInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareChannelInfo.cs
@@ -52,33 +52,36 @@ public partial class WifiAwareChannelInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#getChannelBandwidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#describeContents()"/>
         /// </summary>
-        public int ChannelBandwidth
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getChannelBandwidth", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#getChannelFrequencyMhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#getChannelBandwidth()"/>
         /// </summary>
-        public int ChannelFrequencyMhz
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelBandwidth()
         {
-            get { return IExecuteWithSignature<int>("getChannelFrequencyMhz", "()I"); }
+            return IExecuteWithSignature<int>("getChannelBandwidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#getSpatialStreamCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#getChannelFrequencyMhz()"/>
         /// </summary>
-        public int SpatialStreamCount
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelFrequencyMhz()
         {
-            get { return IExecuteWithSignature<int>("getSpatialStreamCount", "()I"); }
+            return IExecuteWithSignature<int>("getChannelFrequencyMhz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#getSpatialStreamCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpatialStreamCount()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpatialStreamCount", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareChannelInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareDataPathSecurityConfig.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareDataPathSecurityConfig.cs
index 92db1aeb6..b5bd75cd6 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareDataPathSecurityConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareDataPathSecurityConfig.cs
@@ -52,40 +52,44 @@ public partial class WifiAwareDataPathSecurityConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#getCipherSuite()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#getPmk()"/>
         /// </summary>
-        public int CipherSuite
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetPmk()
         {
-            get { return IExecuteWithSignature<int>("getCipherSuite", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getPmk", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#getPmk()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#getPmkId()"/>
         /// </summary>
-        public byte[] Pmk
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetPmkId()
         {
-            get { return IExecuteWithSignatureArray<byte>("getPmk", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getPmkId", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#getPmkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#describeContents()"/>
         /// </summary>
-        public byte[] PmkId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<byte>("getPmkId", "()[B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#getPskPassphrase()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#getCipherSuite()"/>
         /// </summary>
-        public Java.Lang.String PskPassphrase
+        /// <returns><see cref="int"/></returns>
+        public int GetCipherSuite()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPskPassphrase", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getCipherSuite", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#getPskPassphrase()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPskPassphrase()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getPskPassphrase", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareDataPathSecurityConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareManager.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareManager.cs
index e21222e23..3cde4d904 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareManager.cs
@@ -88,18 +88,20 @@ public partial class WifiAwareManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareManager.html#getAvailableAwareResources()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareManager.html#getAvailableAwareResources()"/>
         /// </summary>
-        public Android.Net.Wifi.Aware.AwareResources AvailableAwareResources
+        /// <returns><see cref="Android.Net.Wifi.Aware.AwareResources"/></returns>
+        public Android.Net.Wifi.Aware.AwareResources GetAvailableAwareResources()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.AwareResources>("getAvailableAwareResources", "()Landroid/net/wifi/aware/AwareResources;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.AwareResources>("getAvailableAwareResources", "()Landroid/net/wifi/aware/AwareResources;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareManager.html#getCharacteristics()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareManager.html#getCharacteristics()"/>
         /// </summary>
-        public Android.Net.Wifi.Aware.Characteristics Characteristics
+        /// <returns><see cref="Android.Net.Wifi.Aware.Characteristics"/></returns>
+        public Android.Net.Wifi.Aware.Characteristics GetCharacteristics()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.Characteristics>("getCharacteristics", "()Landroid/net/wifi/aware/Characteristics;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.Characteristics>("getCharacteristics", "()Landroid/net/wifi/aware/Characteristics;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareManager.html#isAvailable()"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareNetworkInfo.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareNetworkInfo.cs
index d9bb3015b..7a05af3fd 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareNetworkInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareNetworkInfo.cs
@@ -60,40 +60,44 @@ public partial class WifiAwareNetworkInfo : Android.Net.ITransportInfo, Android.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#getChannelInfoList()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Wifi.Aware.WifiAwareChannelInfo> ChannelInfoList
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.Aware.WifiAwareChannelInfo>>("getChannelInfoList", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#getPeerIpv6Addr()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#getPort()"/>
         /// </summary>
-        public Java.Net.Inet6Address PeerIpv6Addr
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<Java.Net.Inet6Address>("getPeerIpv6Addr", "()Ljava/net/Inet6Address;"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#getTransportProtocol()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="int"/></returns>
+        public int GetTransportProtocol()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<int>("getTransportProtocol", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#getTransportProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#getPeerIpv6Addr()"/>
         /// </summary>
-        public int TransportProtocol
+        /// <returns><see cref="Java.Net.Inet6Address"/></returns>
+        public Java.Net.Inet6Address GetPeerIpv6Addr()
         {
-            get { return IExecuteWithSignature<int>("getTransportProtocol", "()I"); }
+            return IExecuteWithSignature<Java.Net.Inet6Address>("getPeerIpv6Addr", "()Ljava/net/Inet6Address;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#getChannelInfoList()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.Aware.WifiAwareChannelInfo> GetChannelInfoList()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.Aware.WifiAwareChannelInfo>>("getChannelInfoList", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareNetworkSpecifier.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareNetworkSpecifier.cs
index ceebed305..ffdd3ad4e 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareNetworkSpecifier.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareNetworkSpecifier.cs
@@ -56,18 +56,12 @@ public partial class WifiAwareNetworkSpecifier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkSpecifier.html#getChannelFrequencyMhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkSpecifier.html#getWifiAwareDataPathSecurityConfig()"/>
         /// </summary>
-        public int ChannelFrequencyMhz
+        /// <returns><see cref="Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig"/></returns>
+        public Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig GetWifiAwareDataPathSecurityConfig()
         {
-            get { return IExecuteWithSignature<int>("getChannelFrequencyMhz", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkSpecifier.html#getWifiAwareDataPathSecurityConfig()"/> 
-        /// </summary>
-        public Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig WifiAwareDataPathSecurityConfig
-        {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig>("getWifiAwareDataPathSecurityConfig", "()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.WifiAwareDataPathSecurityConfig>("getWifiAwareDataPathSecurityConfig", "()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkSpecifier.html#canBeSatisfiedBy(android.net.NetworkSpecifier)"/>
@@ -95,6 +89,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkSpecifier.html#getChannelFrequencyMhz()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelFrequencyMhz()
+        {
+            return IExecuteWithSignature<int>("getChannelFrequencyMhz", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/aware/WifiAwareNetworkSpecifier.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareSession.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareSession.cs
index 5965b4fa3..dc0be9829 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareSession.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Aware/WifiAwareSession.cs
@@ -51,7 +51,7 @@ public partial class WifiAwareSession
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
         /// <returns><see cref="Android.Net.NetworkSpecifier"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.NetworkSpecifier CreateNetworkSpecifierOpen(int arg0, byte[] arg1)
         {
             return IExecute<Android.Net.NetworkSpecifier>("createNetworkSpecifierOpen", arg0, arg1);
@@ -63,7 +63,7 @@ public Android.Net.NetworkSpecifier CreateNetworkSpecifierOpen(int arg0, byte[]
         /// <param name="arg1"><see cref="byte"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Net.NetworkSpecifier"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.NetworkSpecifier CreateNetworkSpecifierPassphrase(int arg0, byte[] arg1, Java.Lang.String arg2)
         {
             return IExecute<Android.Net.NetworkSpecifier>("createNetworkSpecifierPassphrase", arg0, arg1, arg2);
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/PasspointConfiguration.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/PasspointConfiguration.cs
index 01e65c902..5d17ac23a 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/PasspointConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/PasspointConfiguration.cs
@@ -60,55 +60,84 @@ public PasspointConfiguration(Android.Net.Wifi.Hotspot2.PasspointConfiguration a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getCredential()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#setCredential(android.net.wifi.hotspot2.pps.Credential)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getCredential()"/>
         /// </summary>
-        public Android.Net.Wifi.Hotspot2.Pps.Credential Credential
+        /// <returns><see cref="Android.Net.Wifi.Hotspot2.Pps.Credential"/></returns>
+        public Android.Net.Wifi.Hotspot2.Pps.Credential GetCredential()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.Credential>("getCredential", "()Landroid/net/wifi/hotspot2/pps/Credential;"); } set { IExecuteWithSignature("setCredential", "(Landroid/net/wifi/hotspot2/pps/Credential;)V", value); }
+            return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.Credential>("getCredential", "()Landroid/net/wifi/hotspot2/pps/Credential;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getDecoratedIdentityPrefix()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#setDecoratedIdentityPrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getHomeSp()"/>
         /// </summary>
-        public Java.Lang.String DecoratedIdentityPrefix
+        /// <returns><see cref="Android.Net.Wifi.Hotspot2.Pps.HomeSp"/></returns>
+        public Android.Net.Wifi.Hotspot2.Pps.HomeSp GetHomeSp()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDecoratedIdentityPrefix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDecoratedIdentityPrefix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.HomeSp>("getHomeSp", "()Landroid/net/wifi/hotspot2/pps/HomeSp;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getHomeSp()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#setHomeSp(android.net.wifi.hotspot2.pps.HomeSp)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#isOsuProvisioned()"/>
         /// </summary>
-        public Android.Net.Wifi.Hotspot2.Pps.HomeSp HomeSp
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOsuProvisioned()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.HomeSp>("getHomeSp", "()Landroid/net/wifi/hotspot2/pps/HomeSp;"); } set { IExecuteWithSignature("setHomeSp", "(Landroid/net/wifi/hotspot2/pps/HomeSp;)V", value); }
+            return IExecuteWithSignature<bool>("isOsuProvisioned", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getSubscriptionExpirationTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#describeContents()"/>
         /// </summary>
-        public long SubscriptionExpirationTimeMillis
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getSubscriptionExpirationTimeMillis", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getUniqueId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getDecoratedIdentityPrefix()"/>
         /// </summary>
-        public Java.Lang.String UniqueId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDecoratedIdentityPrefix()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUniqueId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDecoratedIdentityPrefix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#isOsuProvisioned()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getUniqueId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOsuProvisioned()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUniqueId()
         {
-            return IExecuteWithSignature<bool>("isOsuProvisioned", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getUniqueId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#getSubscriptionExpirationTimeMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetSubscriptionExpirationTimeMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getSubscriptionExpirationTimeMillis", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#setCredential(android.net.wifi.hotspot2.pps.Credential)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Wifi.Hotspot2.Pps.Credential"/></param>
+        public void SetCredential(Android.Net.Wifi.Hotspot2.Pps.Credential arg0)
+        {
+            IExecuteWithSignature("setCredential", "(Landroid/net/wifi/hotspot2/pps/Credential;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#setDecoratedIdentityPrefix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDecoratedIdentityPrefix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDecoratedIdentityPrefix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#setHomeSp(android.net.wifi.hotspot2.pps.HomeSp)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Wifi.Hotspot2.Pps.HomeSp"/></param>
+        public void SetHomeSp(Android.Net.Wifi.Hotspot2.Pps.HomeSp arg0)
+        {
+            IExecuteWithSignature("setHomeSp", "(Landroid/net/wifi/hotspot2/pps/HomeSp;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/PasspointConfiguration.html#setSubscriptionExpirationTimeInMillis(long)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/Pps/Credential.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/Pps/Credential.cs
index 095c092d1..055af0139 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/Pps/Credential.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/Pps/Credential.cs
@@ -60,68 +60,125 @@ public Credential(Android.Net.Wifi.Hotspot2.Pps.Credential arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getCaCertificate()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setCaCertificate(java.security.cert.X509Certificate)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getCertCredential()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate CaCertificate
+        /// <returns><see cref="Android.Net.Wifi.Hotspot2.Pps.Credential.CertificateCredential"/></returns>
+        public Android.Net.Wifi.Hotspot2.Pps.Credential.CertificateCredential GetCertCredential()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getCaCertificate", "()Ljava/security/cert/X509Certificate;"); } set { IExecuteWithSignature("setCaCertificate", "(Ljava/security/cert/X509Certificate;)V", value); }
+            return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.Credential.CertificateCredential>("getCertCredential", "()Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getCertCredential()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setCertCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getSimCredential()"/>
         /// </summary>
-        public Android.Net.Wifi.Hotspot2.Pps.Credential.CertificateCredential CertCredential
+        /// <returns><see cref="Android.Net.Wifi.Hotspot2.Pps.Credential.SimCredential"/></returns>
+        public Android.Net.Wifi.Hotspot2.Pps.Credential.SimCredential GetSimCredential()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.Credential.CertificateCredential>("getCertCredential", "()Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;"); } set { IExecuteWithSignature("setCertCredential", "(Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;)V", value); }
+            return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.Credential.SimCredential>("getSimCredential", "()Landroid/net/wifi/hotspot2/pps/Credential$SimCredential;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getClientCertificateChain()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setClientCertificateChain(java.security.cert.X509Certificate[])"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getUserCredential()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate[] ClientCertificateChain
+        /// <returns><see cref="Android.Net.Wifi.Hotspot2.Pps.Credential.UserCredential"/></returns>
+        public Android.Net.Wifi.Hotspot2.Pps.Credential.UserCredential GetUserCredential()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getClientCertificateChain", "()[Ljava/security/cert/X509Certificate;"); } set { IExecuteWithSignature("setClientCertificateChain", "([Ljava/security/cert/X509Certificate;)V", value); }
+            return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.Credential.UserCredential>("getUserCredential", "()Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getClientPrivateKey()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setClientPrivateKey(java.security.PrivateKey)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#describeContents()"/>
         /// </summary>
-        public Java.Security.PrivateKey ClientPrivateKey
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Security.PrivateKey>("getClientPrivateKey", "()Ljava/security/PrivateKey;"); } set { IExecuteWithSignature("setClientPrivateKey", "(Ljava/security/PrivateKey;)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getSimCredential()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getMinimumTlsVersion()"/>
         /// </summary>
-        public Android.Net.Wifi.Hotspot2.Pps.Credential.SimCredential GetSimCredential
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumTlsVersion()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.Credential.SimCredential>("getSimCredential", "()Landroid/net/wifi/hotspot2/pps/Credential$SimCredential;"); }
+            return IExecuteWithSignature<int>("getMinimumTlsVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getUserCredential()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getRealm()"/>
         /// </summary>
-        public Android.Net.Wifi.Hotspot2.Pps.Credential.UserCredential GetUserCredential
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRealm()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.Pps.Credential.UserCredential>("getUserCredential", "()Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRealm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getMinimumTlsVersion()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setMinimumTlsVersion(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getCaCertificate()"/>
         /// </summary>
-        public int MinimumTlsVersion
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetCaCertificate()
         {
-            get { return IExecuteWithSignature<int>("getMinimumTlsVersion", "()I"); } set { IExecuteWithSignature("setMinimumTlsVersion", "(I)V", value); }
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getCaCertificate", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getRealm()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setRealm(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getClientCertificateChain()"/>
         /// </summary>
-        public Java.Lang.String Realm
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate[] GetClientCertificateChain()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRealm", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setRealm", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getClientCertificateChain", "()[Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#getClientPrivateKey()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Security.PrivateKey"/></returns>
+        public Java.Security.PrivateKey GetClientPrivateKey()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Security.PrivateKey>("getClientPrivateKey", "()Ljava/security/PrivateKey;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setCaCertificate(java.security.cert.X509Certificate)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
+        public void SetCaCertificate(Java.Security.Cert.X509Certificate arg0)
+        {
+            IExecuteWithSignature("setCaCertificate", "(Ljava/security/cert/X509Certificate;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setCertCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Wifi.Hotspot2.Pps.Credential.CertificateCredential"/></param>
+        public void SetCertCredential(Android.Net.Wifi.Hotspot2.Pps.Credential.CertificateCredential arg0)
+        {
+            IExecuteWithSignature("setCertCredential", "(Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setClientCertificateChain(java.security.cert.X509Certificate[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
+        public void SetClientCertificateChain(Java.Security.Cert.X509Certificate[] arg0)
+        {
+            IExecuteWithSignature("setClientCertificateChain", "([Ljava/security/cert/X509Certificate;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setClientPrivateKey(java.security.PrivateKey)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.PrivateKey"/></param>
+        public void SetClientPrivateKey(Java.Security.PrivateKey arg0)
+        {
+            IExecuteWithSignature("setClientPrivateKey", "(Ljava/security/PrivateKey;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setMinimumTlsVersion(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        public void SetMinimumTlsVersion(int arg0)
+        {
+            IExecuteWithSignature("setMinimumTlsVersion", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setRealm(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetRealm(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setRealm", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.html#setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential)"/>
@@ -187,18 +244,12 @@ public CertificateCredential(Android.Net.Wifi.Hotspot2.Pps.Credential.Certificat
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#getCertSha256Fingerprint()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#setCertSha256Fingerprint(byte[])"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#getCertSha256Fingerprint()"/>
             /// </summary>
-            public byte[] CertSha256Fingerprint
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetCertSha256Fingerprint()
             {
-                get { return IExecuteWithSignatureArray<byte>("getCertSha256Fingerprint", "()[B"); } set { IExecuteWithSignature("setCertSha256Fingerprint", "([B)V", value); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#getCertType()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#setCertType(java.lang.String)"/>
-            /// </summary>
-            public Java.Lang.String CertType
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCertType", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCertType", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignatureArray<byte>("getCertSha256Fingerprint", "()[B");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#describeContents()"/>
@@ -209,6 +260,30 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#getCertType()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCertType()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getCertType", "()Ljava/lang/String;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#setCertSha256Fingerprint(byte[])"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="byte"/></param>
+            public void SetCertSha256Fingerprint(byte[] arg0)
+            {
+                IExecuteWithSignature("setCertSha256Fingerprint", "([B)V", new object[] { arg0 });
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#setCertType(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public void SetCertType(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setCertType", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.CertificateCredential.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -263,26 +338,44 @@ public SimCredential(Android.Net.Wifi.Hotspot2.Pps.Credential.SimCredential arg0
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#getEapType()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#setEapType(int)"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#describeContents()"/>
             /// </summary>
-            public int EapType
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getEapType", "()I"); } set { IExecuteWithSignature("setEapType", "(I)V", value); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#getImsi()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#setImsi(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#getEapType()"/>
             /// </summary>
-            public Java.Lang.String Imsi
+            /// <returns><see cref="int"/></returns>
+            public int GetEapType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getImsi", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setImsi", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<int>("getEapType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#getImsi()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetImsi()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getImsi", "()Ljava/lang/String;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#setEapType(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetEapType(int arg0)
+            {
+                IExecuteWithSignature("setEapType", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#setImsi(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public void SetImsi(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setImsi", "(Ljava/lang/String;)V", arg0);
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.SimCredential.html#writeToParcel(android.os.Parcel,int)"/>
@@ -339,40 +432,76 @@ public UserCredential(Android.Net.Wifi.Hotspot2.Pps.Credential.UserCredential ar
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#getEapType()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#setEapType(int)"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#describeContents()"/>
             /// </summary>
-            public int EapType
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getEapType", "()I"); } set { IExecuteWithSignature("setEapType", "(I)V", value); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#getNonEapInnerMethod()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#setNonEapInnerMethod(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#getEapType()"/>
             /// </summary>
-            public Java.Lang.String NonEapInnerMethod
+            /// <returns><see cref="int"/></returns>
+            public int GetEapType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getNonEapInnerMethod", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNonEapInnerMethod", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<int>("getEapType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#getPassword()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#setPassword(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#getNonEapInnerMethod()"/>
             /// </summary>
-            public Java.Lang.String Password
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetNonEapInnerMethod()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPassword", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<Java.Lang.String>("getNonEapInnerMethod", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#getUsername()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#setUsername(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#getPassword()"/>
             /// </summary>
-            public Java.Lang.String Username
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetPassword()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getUsername", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setUsername", "(Ljava/lang/String;)V", value); }
+                return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#getUsername()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetUsername()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getUsername", "()Ljava/lang/String;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#setEapType(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetEapType(int arg0)
+            {
+                IExecuteWithSignature("setEapType", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#setNonEapInnerMethod(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public void SetNonEapInnerMethod(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setNonEapInnerMethod", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#setPassword(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public void SetPassword(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setPassword", "(Ljava/lang/String;)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#setUsername(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public void SetUsername(Java.Lang.String arg0)
+            {
+                IExecuteWithSignature("setUsername", "(Ljava/lang/String;)V", arg0);
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/Credential.UserCredential.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/Pps/HomeSp.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/Pps/HomeSp.cs
index c51118e14..400ae95e9 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/Pps/HomeSp.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Hotspot2/Pps/HomeSp.cs
@@ -60,54 +60,108 @@ public HomeSp(Android.Net.Wifi.Hotspot2.Pps.HomeSp arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getFqdn()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setFqdn(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Fqdn
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFqdn", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFqdn", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getFriendlyName()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setFriendlyName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getFqdn()"/>
         /// </summary>
-        public Java.Lang.String FriendlyName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFqdn()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFriendlyName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFriendlyName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getFqdn", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getMatchAllOis()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setMatchAllOis(long[])"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getFriendlyName()"/>
         /// </summary>
-        public long[] MatchAllOis
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFriendlyName()
         {
-            get { return IExecuteWithSignatureArray<long>("getMatchAllOis", "()[J"); } set { IExecuteWithSignature("setMatchAllOis", "([J)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getFriendlyName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getMatchAnyOis()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setMatchAnyOis(long[])"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getOtherHomePartnersList()"/>
         /// </summary>
-        public long[] MatchAnyOis
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Lang.String> GetOtherHomePartnersList()
         {
-            get { return IExecuteWithSignatureArray<long>("getMatchAnyOis", "()[J"); } set { IExecuteWithSignature("setMatchAnyOis", "([J)V", value); }
+            return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getOtherHomePartnersList", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getOtherHomePartnersList()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setOtherHomePartnersList(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getMatchAllOis()"/>
         /// </summary>
-        public Java.Util.Collection<Java.Lang.String> OtherHomePartnersList
+        /// <returns><see cref="long"/></returns>
+        public long[] GetMatchAllOis()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getOtherHomePartnersList", "()Ljava/util/Collection;"); } set { IExecuteWithSignature("setOtherHomePartnersList", "(Ljava/util/Collection;)V", value); }
+            return IExecuteWithSignatureArray<long>("getMatchAllOis", "()[J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getRoamingConsortiumOis()"/> <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setRoamingConsortiumOis(long[])"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getMatchAnyOis()"/>
         /// </summary>
-        public long[] RoamingConsortiumOis
+        /// <returns><see cref="long"/></returns>
+        public long[] GetMatchAnyOis()
         {
-            get { return IExecuteWithSignatureArray<long>("getRoamingConsortiumOis", "()[J"); } set { IExecuteWithSignature("setRoamingConsortiumOis", "([J)V", value); }
+            return IExecuteWithSignatureArray<long>("getMatchAnyOis", "()[J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#getRoamingConsortiumOis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long[] GetRoamingConsortiumOis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<long>("getRoamingConsortiumOis", "()[J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setFqdn(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFqdn(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFqdn", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setFriendlyName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFriendlyName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFriendlyName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setMatchAllOis(long[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetMatchAllOis(long[] arg0)
+        {
+            IExecuteWithSignature("setMatchAllOis", "([J)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setMatchAnyOis(long[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetMatchAnyOis(long[] arg0)
+        {
+            IExecuteWithSignature("setMatchAnyOis", "([J)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setOtherHomePartnersList(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        public void SetOtherHomePartnersList(Java.Util.Collection<Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setOtherHomePartnersList", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#setRoamingConsortiumOis(long[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetRoamingConsortiumOis(long[] arg0)
+        {
+            IExecuteWithSignature("setRoamingConsortiumOis", "([J)V", new object[] { arg0 });
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/hotspot2/pps/HomeSp.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/MloLink.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/MloLink.cs
index 9e4754524..446b56624 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/MloLink.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/MloLink.cs
@@ -82,75 +82,84 @@ public partial class MloLink
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getApMacAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getApMacAddress()"/>
         /// </summary>
-        public Android.Net.MacAddress ApMacAddress
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetApMacAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getApMacAddress", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getApMacAddress", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getBand()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getStaMacAddress()"/>
         /// </summary>
-        public int Band
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetStaMacAddress()
         {
-            get { return IExecuteWithSignature<int>("getBand", "()I"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getStaMacAddress", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getChannel()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#describeContents()"/>
         /// </summary>
-        public int Channel
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getChannel", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getLinkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getBand()"/>
         /// </summary>
-        public int LinkId
+        /// <returns><see cref="int"/></returns>
+        public int GetBand()
         {
-            get { return IExecuteWithSignature<int>("getLinkId", "()I"); }
+            return IExecuteWithSignature<int>("getBand", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getRssi()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getChannel()"/>
         /// </summary>
-        public int Rssi
+        /// <returns><see cref="int"/></returns>
+        public int GetChannel()
         {
-            get { return IExecuteWithSignature<int>("getRssi", "()I"); }
+            return IExecuteWithSignature<int>("getChannel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getRxLinkSpeedMbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getLinkId()"/>
         /// </summary>
-        public int RxLinkSpeedMbps
+        /// <returns><see cref="int"/></returns>
+        public int GetLinkId()
         {
-            get { return IExecuteWithSignature<int>("getRxLinkSpeedMbps", "()I"); }
+            return IExecuteWithSignature<int>("getLinkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getStaMacAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getRssi()"/>
         /// </summary>
-        public Android.Net.MacAddress StaMacAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetRssi()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getStaMacAddress", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<int>("getRssi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getRxLinkSpeedMbps()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetRxLinkSpeedMbps()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getRxLinkSpeedMbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getTxLinkSpeedMbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getState()"/>
         /// </summary>
-        public int TxLinkSpeedMbps
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<int>("getTxLinkSpeedMbps", "()I"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#getTxLinkSpeedMbps()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetTxLinkSpeedMbps()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getTxLinkSpeedMbps", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/MloLink.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/AllPackageClasses.cs
index b8d891187..e147f51a6 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/AllPackageClasses.cs
@@ -341,10 +341,13 @@ public partial class ActionListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public ActionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_ActionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.ActionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -366,10 +369,13 @@ public partial class ActionListenerDirect : ActionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$ActionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$ActionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -444,10 +450,13 @@ public partial class ChannelListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public ChannelListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_ChannelListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.ChannelListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -469,10 +478,13 @@ public partial class ChannelListenerDirect : ChannelListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$ChannelListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$ChannelListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -503,10 +515,13 @@ public partial class ConnectionInfoListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public ConnectionInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_ConnectionInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.ConnectionInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -528,10 +543,13 @@ public partial class ConnectionInfoListenerDirect : ConnectionInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$ConnectionInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$ConnectionInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -562,10 +580,13 @@ public partial class DeviceInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeLis
             /// </summary>
             public DeviceInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_DeviceInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.DeviceInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -587,10 +608,13 @@ public partial class DeviceInfoListenerDirect : DeviceInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$DeviceInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$DeviceInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -621,10 +645,13 @@ public partial class DiscoveryStateListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public DiscoveryStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_DiscoveryStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.DiscoveryStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -646,10 +673,13 @@ public partial class DiscoveryStateListenerDirect : DiscoveryStateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$DiscoveryStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$DiscoveryStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -680,10 +710,13 @@ public partial class DnsSdServiceResponseListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public DnsSdServiceResponseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_DnsSdServiceResponseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.DnsSdServiceResponseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -705,10 +738,13 @@ public partial class DnsSdServiceResponseListenerDirect : DnsSdServiceResponseLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$DnsSdServiceResponseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$DnsSdServiceResponseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -739,10 +775,13 @@ public partial class DnsSdTxtRecordListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public DnsSdTxtRecordListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_DnsSdTxtRecordListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.DnsSdTxtRecordListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -764,10 +803,13 @@ public partial class DnsSdTxtRecordListenerDirect : DnsSdTxtRecordListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$DnsSdTxtRecordListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$DnsSdTxtRecordListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -798,10 +840,13 @@ public partial class ExternalApproverRequestListener : MASES.JCOBridge.C2JBridge
             /// </summary>
             public ExternalApproverRequestListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_ExternalApproverRequestListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.ExternalApproverRequestListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -823,10 +868,13 @@ public partial class ExternalApproverRequestListenerDirect : ExternalApproverReq
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$ExternalApproverRequestListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$ExternalApproverRequestListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -857,10 +905,13 @@ public partial class GroupInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public GroupInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_GroupInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.GroupInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -882,10 +933,13 @@ public partial class GroupInfoListenerDirect : GroupInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$GroupInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$GroupInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -916,10 +970,13 @@ public partial class NetworkInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public NetworkInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_NetworkInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.NetworkInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -941,10 +998,13 @@ public partial class NetworkInfoListenerDirect : NetworkInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$NetworkInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$NetworkInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -975,10 +1035,13 @@ public partial class P2pStateListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public P2pStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_P2pStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.P2pStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1000,10 +1063,13 @@ public partial class P2pStateListenerDirect : P2pStateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$P2pStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$P2pStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1034,10 +1100,13 @@ public partial class PeerListListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public PeerListListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_PeerListListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.PeerListListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1059,10 +1128,13 @@ public partial class PeerListListenerDirect : PeerListListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$PeerListListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$PeerListListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1093,10 +1165,13 @@ public partial class ServiceResponseListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public ServiceResponseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_ServiceResponseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.ServiceResponseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1118,10 +1193,13 @@ public partial class ServiceResponseListenerDirect : ServiceResponseListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$ServiceResponseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$ServiceResponseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1152,10 +1230,13 @@ public partial class UpnpServiceResponseListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public UpnpServiceResponseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.net.wifi.p2p.WifiP2pManager_UpnpServiceResponseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.net.wifi.p2p.UpnpServiceResponseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1177,10 +1258,13 @@ public partial class UpnpServiceResponseListenerDirect : UpnpServiceResponseList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.net.wifi.p2p.WifiP2pManager$UpnpServiceResponseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.net.wifi.p2p.WifiP2pManager$UpnpServiceResponseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pConfig.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pConfig.cs
index 212292550..6c292d274 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pConfig.cs
@@ -120,47 +120,52 @@ public WifiP2pConfig(Android.Net.Wifi.P2p.WifiP2pConfig arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getGroupClientIpProvisioningMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#describeContents()"/>
         /// </summary>
-        public int GroupClientIpProvisioningMode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getGroupClientIpProvisioningMode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getGroupOwnerBand()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getGroupClientIpProvisioningMode()"/>
         /// </summary>
-        public int GroupOwnerBand
+        /// <returns><see cref="int"/></returns>
+        public int GetGroupClientIpProvisioningMode()
         {
-            get { return IExecuteWithSignature<int>("getGroupOwnerBand", "()I"); }
+            return IExecuteWithSignature<int>("getGroupClientIpProvisioningMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getNetworkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getGroupOwnerBand()"/>
         /// </summary>
-        public int NetworkId
+        /// <returns><see cref="int"/></returns>
+        public int GetGroupOwnerBand()
         {
-            get { return IExecuteWithSignature<int>("getNetworkId", "()I"); }
+            return IExecuteWithSignature<int>("getGroupOwnerBand", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getNetworkName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getNetworkId()"/>
         /// </summary>
-        public Java.Lang.String NetworkName
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNetworkName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getNetworkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getPassphrase()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getNetworkName()"/>
         /// </summary>
-        public Java.Lang.String Passphrase
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNetworkName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassphrase", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNetworkName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#getPassphrase()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPassphrase()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getPassphrase", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pDevice.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pDevice.cs
index 3e05ab8f2..63ccf88df 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pDevice.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pDevice.cs
@@ -110,18 +110,12 @@ public WifiP2pDevice(Android.Net.Wifi.P2p.WifiP2pDevice arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDevice.html#getVendorElements()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDevice.html#getWfdInfo()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement> VendorElements
+        /// <returns><see cref="Android.Net.Wifi.P2p.WifiP2pWfdInfo"/></returns>
+        public Android.Net.Wifi.P2p.WifiP2pWfdInfo GetWfdInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement>>("getVendorElements", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDevice.html#getWfdInfo()"/> 
-        /// </summary>
-        public Android.Net.Wifi.P2p.WifiP2pWfdInfo WfdInfo
-        {
-            get { return IExecuteWithSignature<Android.Net.Wifi.P2p.WifiP2pWfdInfo>("getWfdInfo", "()Landroid/net/wifi/p2p/WifiP2pWfdInfo;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.P2p.WifiP2pWfdInfo>("getWfdInfo", "()Landroid/net/wifi/p2p/WifiP2pWfdInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDevice.html#isGroupOwner()"/>
@@ -172,6 +166,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDevice.html#getVendorElements()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement> GetVendorElements()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement>>("getVendorElements", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDevice.html#update(android.net.wifi.p2p.WifiP2pDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Wifi.P2p.WifiP2pDevice"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pDeviceList.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pDeviceList.cs
index 81f79be45..3b795b604 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pDeviceList.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pDeviceList.cs
@@ -60,13 +60,6 @@ public WifiP2pDeviceList(Android.Net.Wifi.P2p.WifiP2pDeviceList arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDeviceList.html#getDeviceList()"/> 
-        /// </summary>
-        public Java.Util.Collection<Android.Net.Wifi.P2p.WifiP2pDevice> DeviceList
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Net.Wifi.P2p.WifiP2pDevice>>("getDeviceList", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDeviceList.html#get(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -84,6 +77,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDeviceList.html#getDeviceList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Net.Wifi.P2p.WifiP2pDevice> GetDeviceList()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Android.Net.Wifi.P2p.WifiP2pDevice>>("getDeviceList", "()Ljava/util/Collection;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pDeviceList.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pGroup.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pGroup.cs
index 9d502e5aa..b13ecfac7 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pGroup.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pGroup.cs
@@ -72,69 +72,76 @@ public WifiP2pGroup(Android.Net.Wifi.P2p.WifiP2pGroup arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getClientList()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getOwner()"/>
         /// </summary>
-        public Java.Util.Collection<Android.Net.Wifi.P2p.WifiP2pDevice> ClientList
+        /// <returns><see cref="Android.Net.Wifi.P2p.WifiP2pDevice"/></returns>
+        public Android.Net.Wifi.P2p.WifiP2pDevice GetOwner()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Net.Wifi.P2p.WifiP2pDevice>>("getClientList", "()Ljava/util/Collection;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.P2p.WifiP2pDevice>("getOwner", "()Landroid/net/wifi/p2p/WifiP2pDevice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getFrequency()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#isGroupOwner()"/>
         /// </summary>
-        public int Frequency
+        /// <returns><see cref="bool"/></returns>
+        public bool IsGroupOwner()
         {
-            get { return IExecuteWithSignature<int>("getFrequency", "()I"); }
+            return IExecuteWithSignature<bool>("isGroupOwner", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getInterface()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Interface
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInterface", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getNetworkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getFrequency()"/>
         /// </summary>
-        public int NetworkId
+        /// <returns><see cref="int"/></returns>
+        public int GetFrequency()
         {
-            get { return IExecuteWithSignature<int>("getNetworkId", "()I"); }
+            return IExecuteWithSignature<int>("getFrequency", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getNetworkName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getNetworkId()"/>
         /// </summary>
-        public Java.Lang.String NetworkName
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNetworkName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getNetworkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getOwner()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getInterface()"/>
         /// </summary>
-        public Android.Net.Wifi.P2p.WifiP2pDevice Owner
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInterface()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.P2p.WifiP2pDevice>("getOwner", "()Landroid/net/wifi/p2p/WifiP2pDevice;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInterface", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getPassphrase()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getNetworkName()"/>
         /// </summary>
-        public Java.Lang.String Passphrase
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNetworkName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassphrase", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNetworkName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#isGroupOwner()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getPassphrase()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsGroupOwner()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPassphrase()
         {
-            return IExecuteWithSignature<bool>("isGroupOwner", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPassphrase", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#getClientList()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Net.Wifi.P2p.WifiP2pDevice> GetClientList()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Collection<Android.Net.Wifi.P2p.WifiP2pDevice>>("getClientList", "()Ljava/util/Collection;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pGroup.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pManager.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pManager.cs
index 2153aca23..598ddb5e7 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pManager.cs
@@ -228,11 +228,12 @@ public partial class WifiP2pManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.html#getP2pMaxAllowedVendorElementsLengthBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.html#getP2pMaxAllowedVendorElementsLengthBytes()"/>
         /// </summary>
-        public static int P2pMaxAllowedVendorElementsLengthBytes
+        /// <returns><see cref="int"/></returns>
+        public static int GetP2pMaxAllowedVendorElementsLengthBytes()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getP2pMaxAllowedVendorElementsLengthBytes", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getP2pMaxAllowedVendorElementsLengthBytes", "()I");
         }
 
         #endregion
@@ -653,8 +654,8 @@ public partial class ActionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFailure", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnFailureEventHandler));
-                AddEventHandler("onSuccess", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnSuccessEventHandler));
+                AddEventHandler("onFailure", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnFailureEventHandler));
+                AddEventHandler("onSuccess", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnSuccessEventHandler));
 
             }
 
@@ -662,7 +663,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ActionListener.html#onFailure(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFailure"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnFailure { get; set; } = null;
+            public global::System.Action<int> OnOnFailure { get; set; } = null;
 
             void OnFailureEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -683,7 +684,7 @@ public virtual void OnFailure(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ActionListener.html#onSuccess()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSuccess"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnSuccess { get; set; } = null;
+            public global::System.Action OnOnSuccess { get; set; } = null;
 
             void OnSuccessEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -818,7 +819,7 @@ public partial class ChannelListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onChannelDisconnected", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnChannelDisconnectedEventHandler));
+                AddEventHandler("onChannelDisconnected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnChannelDisconnectedEventHandler));
 
             }
 
@@ -826,7 +827,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ChannelListener.html#onChannelDisconnected()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnChannelDisconnected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnChannelDisconnected { get; set; } = null;
+            public global::System.Action OnOnChannelDisconnected { get; set; } = null;
 
             void OnChannelDisconnectedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -915,7 +916,7 @@ public partial class ConnectionInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onConnectionInfoAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pInfo>>>(OnConnectionInfoAvailableEventHandler));
+                AddEventHandler("onConnectionInfoAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pInfo>>>(OnConnectionInfoAvailableEventHandler));
 
             }
 
@@ -923,7 +924,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ConnectionInfoListener.html#onConnectionInfoAvailable(android.net.wifi.p2p.WifiP2pInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnConnectionInfoAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Wifi.P2p.WifiP2pInfo> OnOnConnectionInfoAvailable { get; set; } = null;
+            public global::System.Action<Android.Net.Wifi.P2p.WifiP2pInfo> OnOnConnectionInfoAvailable { get; set; } = null;
 
             void OnConnectionInfoAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pInfo>> data)
             {
@@ -1014,7 +1015,7 @@ public partial class DeviceInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDeviceInfoAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pDevice>>>(OnDeviceInfoAvailableEventHandler));
+                AddEventHandler("onDeviceInfoAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pDevice>>>(OnDeviceInfoAvailableEventHandler));
 
             }
 
@@ -1022,7 +1023,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.DeviceInfoListener.html#onDeviceInfoAvailable(android.net.wifi.p2p.WifiP2pDevice)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDeviceInfoAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Wifi.P2p.WifiP2pDevice> OnOnDeviceInfoAvailable { get; set; } = null;
+            public global::System.Action<Android.Net.Wifi.P2p.WifiP2pDevice> OnOnDeviceInfoAvailable { get; set; } = null;
 
             void OnDeviceInfoAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pDevice>> data)
             {
@@ -1113,7 +1114,7 @@ public partial class DiscoveryStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDiscoveryStateAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDiscoveryStateAvailableEventHandler));
+                AddEventHandler("onDiscoveryStateAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDiscoveryStateAvailableEventHandler));
 
             }
 
@@ -1121,7 +1122,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.DiscoveryStateListener.html#onDiscoveryStateAvailable(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDiscoveryStateAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnDiscoveryStateAvailable { get; set; } = null;
+            public global::System.Action<int> OnOnDiscoveryStateAvailable { get; set; } = null;
 
             void OnDiscoveryStateAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -1212,7 +1213,7 @@ public partial class DnsSdServiceResponseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDnsSdServiceAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDnsSdServiceAvailableEventHandler));
+                AddEventHandler("onDnsSdServiceAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDnsSdServiceAvailableEventHandler));
 
             }
 
@@ -1220,7 +1221,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.DnsSdServiceResponseListener.html#onDnsSdServiceAvailable(java.lang.String,java.lang.String,android.net.wifi.p2p.WifiP2pDevice)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDnsSdServiceAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, Java.Lang.String, Android.Net.Wifi.P2p.WifiP2pDevice> OnOnDnsSdServiceAvailable { get; set; } = null;
+            public global::System.Action<Java.Lang.String, Java.Lang.String, Android.Net.Wifi.P2p.WifiP2pDevice> OnOnDnsSdServiceAvailable { get; set; } = null;
 
             void OnDnsSdServiceAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -1315,7 +1316,7 @@ public partial class DnsSdTxtRecordListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDnsSdTxtRecordAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDnsSdTxtRecordAvailableEventHandler));
+                AddEventHandler("onDnsSdTxtRecordAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDnsSdTxtRecordAvailableEventHandler));
 
             }
 
@@ -1323,7 +1324,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.DnsSdTxtRecordListener.html#onDnsSdTxtRecordAvailable(java.lang.String,java.util.Map,android.net.wifi.p2p.WifiP2pDevice)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDnsSdTxtRecordAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, Java.Util.Map<Java.Lang.String, Java.Lang.String>, Android.Net.Wifi.P2p.WifiP2pDevice> OnOnDnsSdTxtRecordAvailable { get; set; } = null;
+            public global::System.Action<Java.Lang.String, Java.Util.Map<Java.Lang.String, Java.Lang.String>, Android.Net.Wifi.P2p.WifiP2pDevice> OnOnDnsSdTxtRecordAvailable { get; set; } = null;
 
             void OnDnsSdTxtRecordAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -1418,10 +1419,10 @@ public partial class ExternalApproverRequestListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAttached", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>>>(OnAttachedEventHandler));
-                AddEventHandler("onConnectionRequested", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnConnectionRequestedEventHandler));
-                AddEventHandler("onDetached", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>>>(OnDetachedEventHandler));
-                AddEventHandler("onPinGenerated", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>>>(OnPinGeneratedEventHandler));
+                AddEventHandler("onAttached", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>>>(OnAttachedEventHandler));
+                AddEventHandler("onConnectionRequested", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnConnectionRequestedEventHandler));
+                AddEventHandler("onDetached", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>>>(OnDetachedEventHandler));
+                AddEventHandler("onPinGenerated", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>>>(OnPinGeneratedEventHandler));
 
             }
 
@@ -1429,7 +1430,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ExternalApproverRequestListener.html#onAttached(android.net.MacAddress)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAttached"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.MacAddress> OnOnAttached { get; set; } = null;
+            public global::System.Action<Android.Net.MacAddress> OnOnAttached { get; set; } = null;
 
             void OnAttachedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>> data)
             {
@@ -1450,7 +1451,7 @@ public virtual void OnAttached(Android.Net.MacAddress arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ExternalApproverRequestListener.html#onConnectionRequested(int,android.net.wifi.p2p.WifiP2pConfig,android.net.wifi.p2p.WifiP2pDevice)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnConnectionRequested"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, Android.Net.Wifi.P2p.WifiP2pConfig, Android.Net.Wifi.P2p.WifiP2pDevice> OnOnConnectionRequested { get; set; } = null;
+            public global::System.Action<int, Android.Net.Wifi.P2p.WifiP2pConfig, Android.Net.Wifi.P2p.WifiP2pDevice> OnOnConnectionRequested { get; set; } = null;
 
             void OnConnectionRequestedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -1473,7 +1474,7 @@ public virtual void OnConnectionRequested(int arg0, Android.Net.Wifi.P2p.WifiP2p
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ExternalApproverRequestListener.html#onDetached(android.net.MacAddress,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDetached"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.MacAddress, int> OnOnDetached { get; set; } = null;
+            public global::System.Action<Android.Net.MacAddress, int> OnOnDetached { get; set; } = null;
 
             void OnDetachedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>> data)
             {
@@ -1495,7 +1496,7 @@ public virtual void OnDetached(Android.Net.MacAddress arg0, int arg1)
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ExternalApproverRequestListener.html#onPinGenerated(android.net.MacAddress,java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPinGenerated"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.MacAddress, Java.Lang.String> OnOnPinGenerated { get; set; } = null;
+            public global::System.Action<Android.Net.MacAddress, Java.Lang.String> OnOnPinGenerated { get; set; } = null;
 
             void OnPinGeneratedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.MacAddress>> data)
             {
@@ -1615,7 +1616,7 @@ public partial class GroupInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGroupInfoAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pGroup>>>(OnGroupInfoAvailableEventHandler));
+                AddEventHandler("onGroupInfoAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pGroup>>>(OnGroupInfoAvailableEventHandler));
 
             }
 
@@ -1623,7 +1624,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.GroupInfoListener.html#onGroupInfoAvailable(android.net.wifi.p2p.WifiP2pGroup)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGroupInfoAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Wifi.P2p.WifiP2pGroup> OnOnGroupInfoAvailable { get; set; } = null;
+            public global::System.Action<Android.Net.Wifi.P2p.WifiP2pGroup> OnOnGroupInfoAvailable { get; set; } = null;
 
             void OnGroupInfoAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pGroup>> data)
             {
@@ -1714,7 +1715,7 @@ public partial class NetworkInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onNetworkInfoAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.NetworkInfo>>>(OnNetworkInfoAvailableEventHandler));
+                AddEventHandler("onNetworkInfoAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.NetworkInfo>>>(OnNetworkInfoAvailableEventHandler));
 
             }
 
@@ -1722,7 +1723,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.NetworkInfoListener.html#onNetworkInfoAvailable(android.net.NetworkInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnNetworkInfoAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.NetworkInfo> OnOnNetworkInfoAvailable { get; set; } = null;
+            public global::System.Action<Android.Net.NetworkInfo> OnOnNetworkInfoAvailable { get; set; } = null;
 
             void OnNetworkInfoAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.NetworkInfo>> data)
             {
@@ -1813,7 +1814,7 @@ public partial class P2pStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onP2pStateAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnP2pStateAvailableEventHandler));
+                AddEventHandler("onP2pStateAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnP2pStateAvailableEventHandler));
 
             }
 
@@ -1821,7 +1822,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.P2pStateListener.html#onP2pStateAvailable(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnP2pStateAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnP2pStateAvailable { get; set; } = null;
+            public global::System.Action<int> OnOnP2pStateAvailable { get; set; } = null;
 
             void OnP2pStateAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -1912,7 +1913,7 @@ public partial class PeerListListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPeersAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pDeviceList>>>(OnPeersAvailableEventHandler));
+                AddEventHandler("onPeersAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pDeviceList>>>(OnPeersAvailableEventHandler));
 
             }
 
@@ -1920,7 +1921,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.PeerListListener.html#onPeersAvailable(android.net.wifi.p2p.WifiP2pDeviceList)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPeersAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Wifi.P2p.WifiP2pDeviceList> OnOnPeersAvailable { get; set; } = null;
+            public global::System.Action<Android.Net.Wifi.P2p.WifiP2pDeviceList> OnOnPeersAvailable { get; set; } = null;
 
             void OnPeersAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Wifi.P2p.WifiP2pDeviceList>> data)
             {
@@ -2011,7 +2012,7 @@ public partial class ServiceResponseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onServiceAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnServiceAvailableEventHandler));
+                AddEventHandler("onServiceAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnServiceAvailableEventHandler));
 
             }
 
@@ -2019,7 +2020,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.ServiceResponseListener.html#onServiceAvailable(int,byte[],android.net.wifi.p2p.WifiP2pDevice)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, byte[], Android.Net.Wifi.P2p.WifiP2pDevice> OnOnServiceAvailable { get; set; } = null;
+            public global::System.Action<int, byte[], Android.Net.Wifi.P2p.WifiP2pDevice> OnOnServiceAvailable { get; set; } = null;
 
             void OnServiceAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -2114,7 +2115,7 @@ public partial class UpnpServiceResponseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onUpnpServiceAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Java.Lang.String>>>>(OnUpnpServiceAvailableEventHandler));
+                AddEventHandler("onUpnpServiceAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Java.Lang.String>>>>(OnUpnpServiceAvailableEventHandler));
 
             }
 
@@ -2122,7 +2123,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pManager.UpnpServiceResponseListener.html#onUpnpServiceAvailable(java.util.List,android.net.wifi.p2p.WifiP2pDevice)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnUpnpServiceAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.List<Java.Lang.String>, Android.Net.Wifi.P2p.WifiP2pDevice> OnOnUpnpServiceAvailable { get; set; } = null;
+            public global::System.Action<Java.Util.List<Java.Lang.String>, Android.Net.Wifi.P2p.WifiP2pDevice> OnOnUpnpServiceAvailable { get; set; } = null;
 
             void OnUpnpServiceAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Java.Lang.String>>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pWfdInfo.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pWfdInfo.cs
index 55dab3afa..b258c57a9 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pWfdInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/P2p/WifiP2pWfdInfo.cs
@@ -168,48 +168,6 @@ public WifiP2pWfdInfo(Android.Net.Wifi.P2p.WifiP2pWfdInfo arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getControlPort()"/> <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#setControlPort(int)"/>
-        /// </summary>
-        public int ControlPort
-        {
-            get { return IExecuteWithSignature<int>("getControlPort", "()I"); } set { IExecuteWithSignature("setControlPort", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getDeviceInfo()"/> 
-        /// </summary>
-        public int DeviceInfo
-        {
-            get { return IExecuteWithSignature<int>("getDeviceInfo", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getDeviceType()"/> 
-        /// </summary>
-        public int DeviceType
-        {
-            get { return IExecuteWithSignature<int>("getDeviceType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getMaxThroughput()"/> <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#setMaxThroughput(int)"/>
-        /// </summary>
-        public int MaxThroughput
-        {
-            get { return IExecuteWithSignature<int>("getMaxThroughput", "()I"); } set { IExecuteWithSignature("setMaxThroughput", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getR2DeviceInfo()"/> 
-        /// </summary>
-        public int R2DeviceInfo
-        {
-            get { return IExecuteWithSignature<int>("getR2DeviceInfo", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getR2DeviceType()"/> 
-        /// </summary>
-        public int R2DeviceType
-        {
-            get { return IExecuteWithSignature<int>("getR2DeviceType", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#isContentProtectionSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -284,6 +242,54 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getControlPort()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetControlPort()
+        {
+            return IExecuteWithSignature<int>("getControlPort", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getDeviceInfo()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceInfo()
+        {
+            return IExecuteWithSignature<int>("getDeviceInfo", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getDeviceType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceType()
+        {
+            return IExecuteWithSignature<int>("getDeviceType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getMaxThroughput()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxThroughput()
+        {
+            return IExecuteWithSignature<int>("getMaxThroughput", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getR2DeviceInfo()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetR2DeviceInfo()
+        {
+            return IExecuteWithSignature<int>("getR2DeviceInfo", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#getR2DeviceType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetR2DeviceType()
+        {
+            return IExecuteWithSignature<int>("getR2DeviceType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#setContentProtectionSupported(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -292,6 +298,14 @@ public void SetContentProtectionSupported(bool arg0)
             IExecuteWithSignature("setContentProtectionSupported", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#setControlPort(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetControlPort(int arg0)
+        {
+            IExecuteWithSignature("setControlPort", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#setCoupledSinkSupportAtSink(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -316,6 +330,14 @@ public void SetEnabled(bool arg0)
             IExecuteWithSignature("setEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#setMaxThroughput(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxThroughput(int arg0)
+        {
+            IExecuteWithSignature("setMaxThroughput", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/p2p/WifiP2pWfdInfo.html#setSessionAvailable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/AllPackageClasses.cs
index d52fd0200..dda2166ba 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/AllPackageClasses.cs
@@ -212,12 +212,12 @@ public partial class RangingResultCallback : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RangingResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RangingResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RangingResultCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RangingResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RangingResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RangingResultCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/RangingRequest.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/RangingRequest.cs
index ae2f06872..35934166f 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/RangingRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/RangingRequest.cs
@@ -48,51 +48,56 @@ public partial class RangingRequest
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getDefaultRttBurstSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getDefaultRttBurstSize()"/>
         /// </summary>
-        public static int DefaultRttBurstSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetDefaultRttBurstSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultRttBurstSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultRttBurstSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getMaxPeers()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getMaxPeers()"/>
         /// </summary>
-        public static int MaxPeers
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxPeers()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxPeers", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxPeers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getMaxRttBurstSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getMaxRttBurstSize()"/>
         /// </summary>
-        public static int MaxRttBurstSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxRttBurstSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxRttBurstSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxRttBurstSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getMinRttBurstSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getMinRttBurstSize()"/>
         /// </summary>
-        public static int MinRttBurstSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetMinRttBurstSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMinRttBurstSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMinRttBurstSize", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getRttBurstSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#describeContents()"/>
         /// </summary>
-        public int RttBurstSize
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getRttBurstSize", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#getRttBurstSize()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetRttBurstSize()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getRttBurstSize", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/RangingResult.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/RangingResult.cs
index c5abbe594..3561d43ff 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/RangingResult.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/RangingResult.cs
@@ -76,104 +76,116 @@ public partial class RangingResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getDistanceMm()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getMacAddress()"/>
         /// </summary>
-        public int DistanceMm
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetMacAddress()
         {
-            get { return IExecuteWithSignature<int>("getDistanceMm", "()I"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getMacAddress", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getDistanceStdDevMm()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getPeerHandle()"/>
         /// </summary>
-        public int DistanceStdDevMm
+        /// <returns><see cref="Android.Net.Wifi.Aware.PeerHandle"/></returns>
+        public Android.Net.Wifi.Aware.PeerHandle GetPeerHandle()
         {
-            get { return IExecuteWithSignature<int>("getDistanceStdDevMm", "()I"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Aware.PeerHandle>("getPeerHandle", "()Landroid/net/wifi/aware/PeerHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getMacAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getUnverifiedResponderLocation()"/>
         /// </summary>
-        public Android.Net.MacAddress MacAddress
+        /// <returns><see cref="Android.Net.Wifi.Rtt.ResponderLocation"/></returns>
+        public Android.Net.Wifi.Rtt.ResponderLocation GetUnverifiedResponderLocation()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getMacAddress", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Rtt.ResponderLocation>("getUnverifiedResponderLocation", "()Landroid/net/wifi/rtt/ResponderLocation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getMeasurementBandwidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#is80211mcMeasurement()"/>
         /// </summary>
-        public int MeasurementBandwidth
+        /// <returns><see cref="bool"/></returns>
+        public bool Is80211mcMeasurement()
         {
-            get { return IExecuteWithSignature<int>("getMeasurementBandwidth", "()I"); }
+            return IExecuteWithSignature<bool>("is80211mcMeasurement", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getMeasurementChannelFrequencyMHz()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#describeContents()"/>
         /// </summary>
-        public int MeasurementChannelFrequencyMHz
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getMeasurementChannelFrequencyMHz", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getNumAttemptedMeasurements()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getDistanceMm()"/>
         /// </summary>
-        public int NumAttemptedMeasurements
+        /// <returns><see cref="int"/></returns>
+        public int GetDistanceMm()
         {
-            get { return IExecuteWithSignature<int>("getNumAttemptedMeasurements", "()I"); }
+            return IExecuteWithSignature<int>("getDistanceMm", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getNumSuccessfulMeasurements()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getDistanceStdDevMm()"/>
         /// </summary>
-        public int NumSuccessfulMeasurements
+        /// <returns><see cref="int"/></returns>
+        public int GetDistanceStdDevMm()
         {
-            get { return IExecuteWithSignature<int>("getNumSuccessfulMeasurements", "()I"); }
+            return IExecuteWithSignature<int>("getDistanceStdDevMm", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getPeerHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getMeasurementBandwidth()"/>
         /// </summary>
-        public Android.Net.Wifi.Aware.PeerHandle PeerHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementBandwidth()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Aware.PeerHandle>("getPeerHandle", "()Landroid/net/wifi/aware/PeerHandle;"); }
+            return IExecuteWithSignature<int>("getMeasurementBandwidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getRangingTimestampMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getMeasurementChannelFrequencyMHz()"/>
         /// </summary>
-        public long RangingTimestampMillis
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementChannelFrequencyMHz()
         {
-            get { return IExecuteWithSignature<long>("getRangingTimestampMillis", "()J"); }
+            return IExecuteWithSignature<int>("getMeasurementChannelFrequencyMHz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getRssi()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getNumAttemptedMeasurements()"/>
         /// </summary>
-        public int Rssi
+        /// <returns><see cref="int"/></returns>
+        public int GetNumAttemptedMeasurements()
         {
-            get { return IExecuteWithSignature<int>("getRssi", "()I"); }
+            return IExecuteWithSignature<int>("getNumAttemptedMeasurements", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getNumSuccessfulMeasurements()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="int"/></returns>
+        public int GetNumSuccessfulMeasurements()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<int>("getNumSuccessfulMeasurements", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getUnverifiedResponderLocation()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getRssi()"/>
         /// </summary>
-        public Android.Net.Wifi.Rtt.ResponderLocation UnverifiedResponderLocation
+        /// <returns><see cref="int"/></returns>
+        public int GetRssi()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Rtt.ResponderLocation>("getUnverifiedResponderLocation", "()Landroid/net/wifi/rtt/ResponderLocation;"); }
+            return IExecuteWithSignature<int>("getRssi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#is80211mcMeasurement()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getStatus()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool Is80211mcMeasurement()
+        /// <returns><see cref="int"/></returns>
+        public int GetStatus()
         {
-            return IExecuteWithSignature<bool>("is80211mcMeasurement", "()Z");
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#getRangingTimestampMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetRangingTimestampMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getRangingTimestampMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/RangingResult.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/ResponderConfig.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/ResponderConfig.cs
index 9411cd7be..b09829e08 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/ResponderConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/ResponderConfig.cs
@@ -73,69 +73,76 @@ public static Android.Net.Wifi.Rtt.ResponderConfig FromScanResult(Android.Net.Wi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getCenterFreq0Mhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getMacAddress()"/>
         /// </summary>
-        public int CenterFreq0Mhz
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetMacAddress()
         {
-            get { return IExecuteWithSignature<int>("getCenterFreq0Mhz", "()I"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getMacAddress", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getCenterFreq1Mhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#is80211mcSupported()"/>
         /// </summary>
-        public int CenterFreq1Mhz
+        /// <returns><see cref="bool"/></returns>
+        public bool Is80211mcSupported()
         {
-            get { return IExecuteWithSignature<int>("getCenterFreq1Mhz", "()I"); }
+            return IExecuteWithSignature<bool>("is80211mcSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getChannelWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#describeContents()"/>
         /// </summary>
-        public int ChannelWidth
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getChannelWidth", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getFrequencyMhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getCenterFreq0Mhz()"/>
         /// </summary>
-        public int FrequencyMhz
+        /// <returns><see cref="int"/></returns>
+        public int GetCenterFreq0Mhz()
         {
-            get { return IExecuteWithSignature<int>("getFrequencyMhz", "()I"); }
+            return IExecuteWithSignature<int>("getCenterFreq0Mhz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getMacAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getCenterFreq1Mhz()"/>
         /// </summary>
-        public Android.Net.MacAddress MacAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetCenterFreq1Mhz()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getMacAddress", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<int>("getCenterFreq1Mhz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getPreamble()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getChannelWidth()"/>
         /// </summary>
-        public int Preamble
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelWidth()
         {
-            get { return IExecuteWithSignature<int>("getPreamble", "()I"); }
+            return IExecuteWithSignature<int>("getChannelWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getResponderType()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getFrequencyMhz()"/>
         /// </summary>
-        public int ResponderType
+        /// <returns><see cref="int"/></returns>
+        public int GetFrequencyMhz()
         {
-            get { return IExecuteWithSignature<int>("getResponderType", "()I"); }
+            return IExecuteWithSignature<int>("getFrequencyMhz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#is80211mcSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getPreamble()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool Is80211mcSupported()
+        /// <returns><see cref="int"/></returns>
+        public int GetPreamble()
         {
-            return IExecuteWithSignature<bool>("is80211mcSupported", "()Z");
+            return IExecuteWithSignature<int>("getPreamble", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#getResponderType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetResponderType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getResponderType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/ResponderLocation.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/ResponderLocation.cs
index f97046f5b..5e0ea38b9 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/ResponderLocation.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/ResponderLocation.cs
@@ -124,171 +124,188 @@ public partial class ResponderLocation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getAltitude()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#toCivicLocationAddress()"/>
         /// </summary>
-        public double Altitude
+        /// <returns><see cref="Android.Location.Address"/></returns>
+        public Android.Location.Address ToCivicLocationAddress()
         {
-            get { return IExecuteWithSignature<double>("getAltitude", "()D"); }
+            return IExecuteWithSignature<Android.Location.Address>("toCivicLocationAddress", "()Landroid/location/Address;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getAltitudeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#toLocation()"/>
         /// </summary>
-        public int AltitudeType
+        /// <returns><see cref="Android.Location.Location"/></returns>
+        public Android.Location.Location ToLocation()
         {
-            get { return IExecuteWithSignature<int>("getAltitudeType", "()I"); }
+            return IExecuteWithSignature<Android.Location.Location>("toLocation", "()Landroid/location/Location;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getAltitudeUncertainty()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getMapImageUri()"/>
         /// </summary>
-        public double AltitudeUncertainty
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetMapImageUri()
         {
-            get { return IExecuteWithSignature<double>("getAltitudeUncertainty", "()D"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getMapImageUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getColocatedBssids()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#toCivicLocationSparseArray()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.MacAddress> ColocatedBssids
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<Java.Lang.String> ToCivicLocationSparseArray()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.MacAddress>>("getColocatedBssids", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Util.SparseArray<Java.Lang.String>>("toCivicLocationSparseArray", "()Landroid/util/SparseArray;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getDatum()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getRegisteredLocationAgreementIndication()"/>
         /// </summary>
-        public int Datum
+        /// <returns><see cref="bool"/></returns>
+        public bool GetRegisteredLocationAgreementIndication()
         {
-            get { return IExecuteWithSignature<int>("getDatum", "()I"); }
+            return IExecuteWithSignature<bool>("getRegisteredLocationAgreementIndication", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getExpectedToMove()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#isLciSubelementValid()"/>
         /// </summary>
-        public int ExpectedToMove
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLciSubelementValid()
         {
-            get { return IExecuteWithSignature<int>("getExpectedToMove", "()I"); }
+            return IExecuteWithSignature<bool>("isLciSubelementValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getFloorNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#isZaxisSubelementValid()"/>
         /// </summary>
-        public double FloorNumber
+        /// <returns><see cref="bool"/></returns>
+        public bool IsZaxisSubelementValid()
         {
-            get { return IExecuteWithSignature<double>("getFloorNumber", "()D"); }
+            return IExecuteWithSignature<bool>("isZaxisSubelementValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getHeightAboveFloorMeters()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getAltitude()"/>
         /// </summary>
-        public double HeightAboveFloorMeters
+        /// <returns><see cref="double"/></returns>
+        public double GetAltitude()
         {
-            get { return IExecuteWithSignature<double>("getHeightAboveFloorMeters", "()D"); }
+            return IExecuteWithSignature<double>("getAltitude", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getHeightAboveFloorUncertaintyMeters()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getAltitudeUncertainty()"/>
         /// </summary>
-        public double HeightAboveFloorUncertaintyMeters
+        /// <returns><see cref="double"/></returns>
+        public double GetAltitudeUncertainty()
         {
-            get { return IExecuteWithSignature<double>("getHeightAboveFloorUncertaintyMeters", "()D"); }
+            return IExecuteWithSignature<double>("getAltitudeUncertainty", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLatitude()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getFloorNumber()"/>
         /// </summary>
-        public double Latitude
+        /// <returns><see cref="double"/></returns>
+        public double GetFloorNumber()
         {
-            get { return IExecuteWithSignature<double>("getLatitude", "()D"); }
+            return IExecuteWithSignature<double>("getFloorNumber", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLatitudeUncertainty()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getHeightAboveFloorMeters()"/>
         /// </summary>
-        public double LatitudeUncertainty
+        /// <returns><see cref="double"/></returns>
+        public double GetHeightAboveFloorMeters()
         {
-            get { return IExecuteWithSignature<double>("getLatitudeUncertainty", "()D"); }
+            return IExecuteWithSignature<double>("getHeightAboveFloorMeters", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLciVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getHeightAboveFloorUncertaintyMeters()"/>
         /// </summary>
-        public int LciVersion
+        /// <returns><see cref="double"/></returns>
+        public double GetHeightAboveFloorUncertaintyMeters()
         {
-            get { return IExecuteWithSignature<int>("getLciVersion", "()I"); }
+            return IExecuteWithSignature<double>("getHeightAboveFloorUncertaintyMeters", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLongitude()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLatitude()"/>
         /// </summary>
-        public double Longitude
+        /// <returns><see cref="double"/></returns>
+        public double GetLatitude()
         {
-            get { return IExecuteWithSignature<double>("getLongitude", "()D"); }
+            return IExecuteWithSignature<double>("getLatitude", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLongitudeUncertainty()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLatitudeUncertainty()"/>
         /// </summary>
-        public double LongitudeUncertainty
+        /// <returns><see cref="double"/></returns>
+        public double GetLatitudeUncertainty()
         {
-            get { return IExecuteWithSignature<double>("getLongitudeUncertainty", "()D"); }
+            return IExecuteWithSignature<double>("getLatitudeUncertainty", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getMapImageMimeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLongitude()"/>
         /// </summary>
-        public Java.Lang.String MapImageMimeType
+        /// <returns><see cref="double"/></returns>
+        public double GetLongitude()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMapImageMimeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<double>("getLongitude", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getMapImageUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLongitudeUncertainty()"/>
         /// </summary>
-        public Android.Net.Uri MapImageUri
+        /// <returns><see cref="double"/></returns>
+        public double GetLongitudeUncertainty()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getMapImageUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<double>("getLongitudeUncertainty", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getRegisteredLocationAgreementIndication()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#describeContents()"/>
         /// </summary>
-        public bool RegisteredLocationAgreementIndication
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<bool>("getRegisteredLocationAgreementIndication", "()Z"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#toCivicLocationAddress()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getAltitudeType()"/>
         /// </summary>
-        /// <returns><see cref="Android.Location.Address"/></returns>
-        public Android.Location.Address ToCivicLocationAddress()
+        /// <returns><see cref="int"/></returns>
+        public int GetAltitudeType()
         {
-            return IExecuteWithSignature<Android.Location.Address>("toCivicLocationAddress", "()Landroid/location/Address;");
+            return IExecuteWithSignature<int>("getAltitudeType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#toLocation()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getDatum()"/>
         /// </summary>
-        /// <returns><see cref="Android.Location.Location"/></returns>
-        public Android.Location.Location ToLocation()
+        /// <returns><see cref="int"/></returns>
+        public int GetDatum()
         {
-            return IExecuteWithSignature<Android.Location.Location>("toLocation", "()Landroid/location/Location;");
+            return IExecuteWithSignature<int>("getDatum", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#toCivicLocationSparseArray()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getExpectedToMove()"/>
         /// </summary>
-        /// <returns><see cref="Android.Util.SparseArray"/></returns>
-        public Android.Util.SparseArray<Java.Lang.String> ToCivicLocationSparseArray()
+        /// <returns><see cref="int"/></returns>
+        public int GetExpectedToMove()
         {
-            return IExecuteWithSignature<Android.Util.SparseArray<Java.Lang.String>>("toCivicLocationSparseArray", "()Landroid/util/SparseArray;");
+            return IExecuteWithSignature<int>("getExpectedToMove", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#isLciSubelementValid()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getLciVersion()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLciSubelementValid()
+        /// <returns><see cref="int"/></returns>
+        public int GetLciVersion()
         {
-            return IExecuteWithSignature<bool>("isLciSubelementValid", "()Z");
+            return IExecuteWithSignature<int>("getLciVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#isZaxisSubelementValid()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getMapImageMimeType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsZaxisSubelementValid()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMapImageMimeType()
         {
-            return IExecuteWithSignature<bool>("isZaxisSubelementValid", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getMapImageMimeType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#getColocatedBssids()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.MacAddress> GetColocatedBssids()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Net.MacAddress>>("getColocatedBssids", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/ResponderLocation.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/WifiRttManager.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/WifiRttManager.cs
index 9c5656f55..5f5bde963 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/WifiRttManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/Rtt/WifiRttManager.cs
@@ -76,11 +76,12 @@ public partial class WifiRttManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/WifiRttManager.html#getRttCharacteristics()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/WifiRttManager.html#getRttCharacteristics()"/>
         /// </summary>
-        public Android.Os.Bundle RttCharacteristics
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetRttCharacteristics()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getRttCharacteristics", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getRttCharacteristics", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/rtt/WifiRttManager.html#isAvailable()"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/ScanResult.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/ScanResult.cs
index d0e9b7c8e..0ec889e6c 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/ScanResult.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/ScanResult.cs
@@ -68,12 +68,12 @@ public ScanResult(Android.Net.Wifi.ScanResult arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#operatorFriendlyName"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.CharSequence operatorFriendlyName { get { return IGetField<Java.Lang.CharSequence>("operatorFriendlyName"); } set { ISetField("operatorFriendlyName", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#venueName"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.CharSequence venueName { get { return IGetField<Java.Lang.CharSequence>("venueName"); } set { ISetField("venueName", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#BSSID"/>
@@ -86,7 +86,7 @@ public ScanResult(Android.Net.Wifi.ScanResult arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#SSID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String SSID { get { return IGetField<Java.Lang.String>("SSID"); } set { ISetField("SSID", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#timestamp"/>
@@ -264,77 +264,84 @@ public static int ConvertFrequencyMhzToChannelIfSupported(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getAffiliatedMloLinks()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getApMldMacAddress()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Wifi.MloLink> AffiliatedMloLinks
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetApMldMacAddress()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.MloLink>>("getAffiliatedMloLinks", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getApMldMacAddress", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getApMldMacAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getWifiSsid()"/>
         /// </summary>
-        public Android.Net.MacAddress ApMldMacAddress
+        /// <returns><see cref="Android.Net.Wifi.WifiSsid"/></returns>
+        public Android.Net.Wifi.WifiSsid GetWifiSsid()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getApMldMacAddress", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.WifiSsid>("getWifiSsid", "()Landroid/net/wifi/WifiSsid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getApMloLinkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#is80211mcResponder()"/>
         /// </summary>
-        public int ApMloLinkId
+        /// <returns><see cref="bool"/></returns>
+        public bool Is80211mcResponder()
         {
-            get { return IExecuteWithSignature<int>("getApMloLinkId", "()I"); }
+            return IExecuteWithSignature<bool>("is80211mcResponder", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getInformationElements()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#isPasspointNetwork()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement> InformationElements
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPasspointNetwork()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement>>("getInformationElements", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("isPasspointNetwork", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getSecurityTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#describeContents()"/>
         /// </summary>
-        public int[] SecurityTypes
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<int>("getSecurityTypes", "()[I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getWifiSsid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getApMloLinkId()"/>
         /// </summary>
-        public Android.Net.Wifi.WifiSsid WifiSsid
+        /// <returns><see cref="int"/></returns>
+        public int GetApMloLinkId()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.WifiSsid>("getWifiSsid", "()Landroid/net/wifi/WifiSsid;"); }
+            return IExecuteWithSignature<int>("getApMloLinkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getWifiStandard()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getWifiStandard()"/>
         /// </summary>
-        public int WifiStandard
+        /// <returns><see cref="int"/></returns>
+        public int GetWifiStandard()
         {
-            get { return IExecuteWithSignature<int>("getWifiStandard", "()I"); }
+            return IExecuteWithSignature<int>("getWifiStandard", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#is80211mcResponder()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getSecurityTypes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool Is80211mcResponder()
+        /// <returns><see cref="int"/></returns>
+        public int[] GetSecurityTypes()
         {
-            return IExecuteWithSignature<bool>("is80211mcResponder", "()Z");
+            return IExecuteWithSignatureArray<int>("getSecurityTypes", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#isPasspointNetwork()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getAffiliatedMloLinks()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPasspointNetwork()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.MloLink> GetAffiliatedMloLinks()
         {
-            return IExecuteWithSignature<bool>("isPasspointNetwork", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.MloLink>>("getAffiliatedMloLinks", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#getInformationElements()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement> GetInformationElements()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement>>("getInformationElements", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.html#writeToParcel(android.os.Parcel,int)"/>
@@ -394,33 +401,36 @@ public InformationElement(int arg0, int arg1, byte[] arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#getBytes()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#describeContents()"/>
             /// </summary>
-            public Java.Nio.ByteBuffer Bytes
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Java.Nio.ByteBuffer>("getBytes", "()Ljava/nio/ByteBuffer;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#getId()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#getId()"/>
             /// </summary>
-            public int Id
+            /// <returns><see cref="int"/></returns>
+            public int GetId()
             {
-                get { return IExecuteWithSignature<int>("getId", "()I"); }
+                return IExecuteWithSignature<int>("getId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#getIdExt()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#getIdExt()"/>
             /// </summary>
-            public int IdExt
+            /// <returns><see cref="int"/></returns>
+            public int GetIdExt()
             {
-                get { return IExecuteWithSignature<int>("getIdExt", "()I"); }
+                return IExecuteWithSignature<int>("getIdExt", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#getBytes()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
+            public Java.Nio.ByteBuffer GetBytes()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Nio.ByteBuffer>("getBytes", "()Ljava/nio/ByteBuffer;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/ScanResult.InformationElement.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/SoftApConfiguration.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/SoftApConfiguration.cs
index fd4295a1a..11add2b4d 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/SoftApConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/SoftApConfiguration.cs
@@ -88,56 +88,61 @@ public partial class SoftApConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getBssid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getBssid()"/>
         /// </summary>
-        public Android.Net.MacAddress Bssid
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetBssid()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getBssid", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getBssid", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getPassphrase()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getWifiSsid()"/>
         /// </summary>
-        public Java.Lang.String Passphrase
+        /// <returns><see cref="Android.Net.Wifi.WifiSsid"/></returns>
+        public Android.Net.Wifi.WifiSsid GetWifiSsid()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassphrase", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.WifiSsid>("getWifiSsid", "()Landroid/net/wifi/WifiSsid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getSecurityType()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#isHiddenSsid()"/>
         /// </summary>
-        public int SecurityType
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHiddenSsid()
         {
-            get { return IExecuteWithSignature<int>("getSecurityType", "()I"); }
+            return IExecuteWithSignature<bool>("isHiddenSsid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getSsid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#describeContents()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Ssid
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSsid", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getWifiSsid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getSecurityType()"/>
         /// </summary>
-        public Android.Net.Wifi.WifiSsid WifiSsid
+        /// <returns><see cref="int"/></returns>
+        public int GetSecurityType()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.WifiSsid>("getWifiSsid", "()Landroid/net/wifi/WifiSsid;"); }
+            return IExecuteWithSignature<int>("getSecurityType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#isHiddenSsid()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getPassphrase()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHiddenSsid()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPassphrase()
         {
-            return IExecuteWithSignature<bool>("isHiddenSsid", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPassphrase", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#getSsid()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSsid()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getSsid", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/SoftApConfiguration.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiAvailableChannel.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiAvailableChannel.cs
index e600faf6c..7bb095a42 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiAvailableChannel.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiAvailableChannel.cs
@@ -97,26 +97,28 @@ public WifiAvailableChannel(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiAvailableChannel.html#getFrequencyMhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiAvailableChannel.html#describeContents()"/>
         /// </summary>
-        public int FrequencyMhz
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getFrequencyMhz", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiAvailableChannel.html#getOperationalModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiAvailableChannel.html#getFrequencyMhz()"/>
         /// </summary>
-        public int OperationalModes
+        /// <returns><see cref="int"/></returns>
+        public int GetFrequencyMhz()
         {
-            get { return IExecuteWithSignature<int>("getOperationalModes", "()I"); }
+            return IExecuteWithSignature<int>("getFrequencyMhz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiAvailableChannel.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiAvailableChannel.html#getOperationalModes()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetOperationalModes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getOperationalModes", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiAvailableChannel.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiConfiguration.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiConfiguration.cs
index 364bfba13..17bc1fd0f 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiConfiguration.cs
@@ -33,7 +33,7 @@ public partial class WifiConfiguration
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#%3Cinit%3E(android.net.wifi.WifiConfiguration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Wifi.WifiConfiguration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public WifiConfiguration(Android.Net.Wifi.WifiConfiguration arg0)
             : base(arg0)
         {
@@ -49,217 +49,217 @@ public WifiConfiguration(Android.Net.Wifi.WifiConfiguration arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#enterpriseConfig"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.Wifi.WifiEnterpriseConfig enterpriseConfig { get { return IGetField<Android.Net.Wifi.WifiEnterpriseConfig>("enterpriseConfig"); } set { ISetField("enterpriseConfig", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#hiddenSSID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool hiddenSSID { get { return IGetField<bool>("hiddenSSID"); } set { ISetField("hiddenSSID", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#isHomeProviderNetwork"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool isHomeProviderNetwork { get { return IGetField<bool>("isHomeProviderNetwork"); } set { ISetField("isHomeProviderNetwork", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#networkId"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int networkId { get { return IGetField<int>("networkId"); } set { ISetField("networkId", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#priority"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int priority { get { return IGetField<int>("priority"); } set { ISetField("priority", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#status"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int status { get { return IGetField<int>("status"); } set { ISetField("status", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#wepTxKeyIndex"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int wepTxKeyIndex { get { return IGetField<int>("wepTxKeyIndex"); } set { ISetField("wepTxKeyIndex", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#BSSID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String BSSID { get { return IGetField<Java.Lang.String>("BSSID"); } set { ISetField("BSSID", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#FQDN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String FQDN { get { return IGetField<Java.Lang.String>("FQDN"); } set { ISetField("FQDN", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#preSharedKey"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String preSharedKey { get { return IGetField<Java.Lang.String>("preSharedKey"); } set { ISetField("preSharedKey", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#providerFriendlyName"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String providerFriendlyName { get { return IGetField<Java.Lang.String>("providerFriendlyName"); } set { ISetField("providerFriendlyName", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SSID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String SSID { get { return IGetField<Java.Lang.String>("SSID"); } set { ISetField("SSID", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#wepKeys"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String[] wepKeys { get { return IGetFieldArray<Java.Lang.String>("wepKeys"); } set { ISetField("wepKeys", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#allowedAuthAlgorithms"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.BitSet allowedAuthAlgorithms { get { return IGetField<Java.Util.BitSet>("allowedAuthAlgorithms"); } set { ISetField("allowedAuthAlgorithms", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#allowedGroupCiphers"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.BitSet allowedGroupCiphers { get { return IGetField<Java.Util.BitSet>("allowedGroupCiphers"); } set { ISetField("allowedGroupCiphers", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#allowedGroupManagementCiphers"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.BitSet allowedGroupManagementCiphers { get { return IGetField<Java.Util.BitSet>("allowedGroupManagementCiphers"); } set { ISetField("allowedGroupManagementCiphers", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#allowedKeyManagement"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.BitSet allowedKeyManagement { get { return IGetField<Java.Util.BitSet>("allowedKeyManagement"); } set { ISetField("allowedKeyManagement", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#allowedPairwiseCiphers"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.BitSet allowedPairwiseCiphers { get { return IGetField<Java.Util.BitSet>("allowedPairwiseCiphers"); } set { ISetField("allowedPairwiseCiphers", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#allowedProtocols"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.BitSet allowedProtocols { get { return IGetField<Java.Util.BitSet>("allowedProtocols"); } set { ISetField("allowedProtocols", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#allowedSuiteBCiphers"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.BitSet allowedSuiteBCiphers { get { return IGetField<Java.Util.BitSet>("allowedSuiteBCiphers"); } set { ISetField("allowedSuiteBCiphers", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#roamingConsortiumIds"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long[] roamingConsortiumIds { get { return IGetFieldArray<long>("roamingConsortiumIds"); } set { ISetField("roamingConsortiumIds", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#RANDOMIZATION_AUTO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RANDOMIZATION_AUTO { get { if (!_RANDOMIZATION_AUTOReady) { _RANDOMIZATION_AUTOContent = SGetField<int>(LocalBridgeClazz, "RANDOMIZATION_AUTO"); _RANDOMIZATION_AUTOReady = true; } return _RANDOMIZATION_AUTOContent; } }
         private static int _RANDOMIZATION_AUTOContent = default;
         private static bool _RANDOMIZATION_AUTOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#RANDOMIZATION_NON_PERSISTENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RANDOMIZATION_NON_PERSISTENT { get { if (!_RANDOMIZATION_NON_PERSISTENTReady) { _RANDOMIZATION_NON_PERSISTENTContent = SGetField<int>(LocalBridgeClazz, "RANDOMIZATION_NON_PERSISTENT"); _RANDOMIZATION_NON_PERSISTENTReady = true; } return _RANDOMIZATION_NON_PERSISTENTContent; } }
         private static int _RANDOMIZATION_NON_PERSISTENTContent = default;
         private static bool _RANDOMIZATION_NON_PERSISTENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#RANDOMIZATION_NONE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RANDOMIZATION_NONE { get { if (!_RANDOMIZATION_NONEReady) { _RANDOMIZATION_NONEContent = SGetField<int>(LocalBridgeClazz, "RANDOMIZATION_NONE"); _RANDOMIZATION_NONEReady = true; } return _RANDOMIZATION_NONEContent; } }
         private static int _RANDOMIZATION_NONEContent = default;
         private static bool _RANDOMIZATION_NONEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#RANDOMIZATION_PERSISTENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RANDOMIZATION_PERSISTENT { get { if (!_RANDOMIZATION_PERSISTENTReady) { _RANDOMIZATION_PERSISTENTContent = SGetField<int>(LocalBridgeClazz, "RANDOMIZATION_PERSISTENT"); _RANDOMIZATION_PERSISTENTReady = true; } return _RANDOMIZATION_PERSISTENTContent; } }
         private static int _RANDOMIZATION_PERSISTENTContent = default;
         private static bool _RANDOMIZATION_PERSISTENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_DPP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_DPP { get { if (!_SECURITY_TYPE_DPPReady) { _SECURITY_TYPE_DPPContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_DPP"); _SECURITY_TYPE_DPPReady = true; } return _SECURITY_TYPE_DPPContent; } }
         private static int _SECURITY_TYPE_DPPContent = default;
         private static bool _SECURITY_TYPE_DPPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_EAP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_EAP { get { if (!_SECURITY_TYPE_EAPReady) { _SECURITY_TYPE_EAPContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_EAP"); _SECURITY_TYPE_EAPReady = true; } return _SECURITY_TYPE_EAPContent; } }
         private static int _SECURITY_TYPE_EAPContent = default;
         private static bool _SECURITY_TYPE_EAPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_EAP_SUITE_B"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_EAP_SUITE_B { get { if (!_SECURITY_TYPE_EAP_SUITE_BReady) { _SECURITY_TYPE_EAP_SUITE_BContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_EAP_SUITE_B"); _SECURITY_TYPE_EAP_SUITE_BReady = true; } return _SECURITY_TYPE_EAP_SUITE_BContent; } }
         private static int _SECURITY_TYPE_EAP_SUITE_BContent = default;
         private static bool _SECURITY_TYPE_EAP_SUITE_BReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_EAP_WPA3_ENTERPRISE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_EAP_WPA3_ENTERPRISE { get { if (!_SECURITY_TYPE_EAP_WPA3_ENTERPRISEReady) { _SECURITY_TYPE_EAP_WPA3_ENTERPRISEContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_EAP_WPA3_ENTERPRISE"); _SECURITY_TYPE_EAP_WPA3_ENTERPRISEReady = true; } return _SECURITY_TYPE_EAP_WPA3_ENTERPRISEContent; } }
         private static int _SECURITY_TYPE_EAP_WPA3_ENTERPRISEContent = default;
         private static bool _SECURITY_TYPE_EAP_WPA3_ENTERPRISEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT { get { if (!_SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BITReady) { _SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BITContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT"); _SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BITReady = true; } return _SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BITContent; } }
         private static int _SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BITContent = default;
         private static bool _SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BITReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_OPEN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_OPEN { get { if (!_SECURITY_TYPE_OPENReady) { _SECURITY_TYPE_OPENContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_OPEN"); _SECURITY_TYPE_OPENReady = true; } return _SECURITY_TYPE_OPENContent; } }
         private static int _SECURITY_TYPE_OPENContent = default;
         private static bool _SECURITY_TYPE_OPENReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_OWE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_OWE { get { if (!_SECURITY_TYPE_OWEReady) { _SECURITY_TYPE_OWEContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_OWE"); _SECURITY_TYPE_OWEReady = true; } return _SECURITY_TYPE_OWEContent; } }
         private static int _SECURITY_TYPE_OWEContent = default;
         private static bool _SECURITY_TYPE_OWEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_PSK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_PSK { get { if (!_SECURITY_TYPE_PSKReady) { _SECURITY_TYPE_PSKContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_PSK"); _SECURITY_TYPE_PSKReady = true; } return _SECURITY_TYPE_PSKContent; } }
         private static int _SECURITY_TYPE_PSKContent = default;
         private static bool _SECURITY_TYPE_PSKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_SAE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_SAE { get { if (!_SECURITY_TYPE_SAEReady) { _SECURITY_TYPE_SAEContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_SAE"); _SECURITY_TYPE_SAEReady = true; } return _SECURITY_TYPE_SAEContent; } }
         private static int _SECURITY_TYPE_SAEContent = default;
         private static bool _SECURITY_TYPE_SAEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_WAPI_CERT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_WAPI_CERT { get { if (!_SECURITY_TYPE_WAPI_CERTReady) { _SECURITY_TYPE_WAPI_CERTContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_WAPI_CERT"); _SECURITY_TYPE_WAPI_CERTReady = true; } return _SECURITY_TYPE_WAPI_CERTContent; } }
         private static int _SECURITY_TYPE_WAPI_CERTContent = default;
         private static bool _SECURITY_TYPE_WAPI_CERTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_WAPI_PSK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_WAPI_PSK { get { if (!_SECURITY_TYPE_WAPI_PSKReady) { _SECURITY_TYPE_WAPI_PSKContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_WAPI_PSK"); _SECURITY_TYPE_WAPI_PSKReady = true; } return _SECURITY_TYPE_WAPI_PSKContent; } }
         private static int _SECURITY_TYPE_WAPI_PSKContent = default;
         private static bool _SECURITY_TYPE_WAPI_PSKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#SECURITY_TYPE_WEP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECURITY_TYPE_WEP { get { if (!_SECURITY_TYPE_WEPReady) { _SECURITY_TYPE_WEPContent = SGetField<int>(LocalBridgeClazz, "SECURITY_TYPE_WEP"); _SECURITY_TYPE_WEPReady = true; } return _SECURITY_TYPE_WEPContent; } }
         private static int _SECURITY_TYPE_WEPContent = default;
         private static bool _SECURITY_TYPE_WEPReady = false; // this is used because in case of generics 
@@ -272,42 +272,28 @@ public WifiConfiguration(Android.Net.Wifi.WifiConfiguration arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#getHttpProxy()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#setHttpProxy(android.net.ProxyInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#getRandomizedMacAddress()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.ProxyInfo HttpProxy
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.MacAddress GetRandomizedMacAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.ProxyInfo>("getHttpProxy", "()Landroid/net/ProxyInfo;"); } set { IExecuteWithSignature("setHttpProxy", "(Landroid/net/ProxyInfo;)V", value); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getRandomizedMacAddress", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#getHttpProxy()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Key
+        /// <returns><see cref="Android.Net.ProxyInfo"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.ProxyInfo GetHttpProxy()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#getMacRandomizationSetting()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#setMacRandomizationSetting(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public int MacRandomizationSetting
-        {
-            get { return IExecuteWithSignature<int>("getMacRandomizationSetting", "()I"); } set { IExecuteWithSignature("setMacRandomizationSetting", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#getRandomizedMacAddress()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Net.MacAddress RandomizedMacAddress
-        {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getRandomizedMacAddress", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<Android.Net.ProxyInfo>("getHttpProxy", "()Landroid/net/ProxyInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#isDppConfigurator()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsDppConfigurator()
         {
             return IExecuteWithSignature<bool>("isDppConfigurator", "()Z");
@@ -316,7 +302,7 @@ public bool IsDppConfigurator()
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#isPasspoint()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsPasspoint()
         {
             return IExecuteWithSignature<bool>("isPasspoint", "()Z");
@@ -330,19 +316,55 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#getMacRandomizationSetting()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMacRandomizationSetting()
+        {
+            return IExecuteWithSignature<int>("getMacRandomizationSetting", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#getKey()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetKey()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#setHttpProxy(android.net.ProxyInfo)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.ProxyInfo"/></param>
+        [global::System.Obsolete()]
+        public void SetHttpProxy(Android.Net.ProxyInfo arg0)
+        {
+            IExecuteWithSignature("setHttpProxy", "(Landroid/net/ProxyInfo;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#setIpConfiguration(android.net.IpConfiguration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.IpConfiguration"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIpConfiguration(Android.Net.IpConfiguration arg0)
         {
             IExecuteWithSignature("setIpConfiguration", "(Landroid/net/IpConfiguration;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#setMacRandomizationSetting(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetMacRandomizationSetting(int arg0)
+        {
+            IExecuteWithSignature("setMacRandomizationSetting", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.html#setSecurityParams(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSecurityParams(int arg0)
         {
             IExecuteWithSignature("setSecurityParams", "(I)V", arg0);
@@ -375,42 +397,42 @@ public partial class AuthAlgorithm
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.AuthAlgorithm.html#LEAP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int LEAP { get { if (!_LEAPReady) { _LEAPContent = SGetField<int>(LocalBridgeClazz, "LEAP"); _LEAPReady = true; } return _LEAPContent; } }
             private static int _LEAPContent = default;
             private static bool _LEAPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.AuthAlgorithm.html#OPEN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int OPEN { get { if (!_OPENReady) { _OPENContent = SGetField<int>(LocalBridgeClazz, "OPEN"); _OPENReady = true; } return _OPENContent; } }
             private static int _OPENContent = default;
             private static bool _OPENReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.AuthAlgorithm.html#SAE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SAE { get { if (!_SAEReady) { _SAEContent = SGetField<int>(LocalBridgeClazz, "SAE"); _SAEReady = true; } return _SAEContent; } }
             private static int _SAEContent = default;
             private static bool _SAEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.AuthAlgorithm.html#SHARED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SHARED { get { if (!_SHAREDReady) { _SHAREDContent = SGetField<int>(LocalBridgeClazz, "SHARED"); _SHAREDReady = true; } return _SHAREDContent; } }
             private static int _SHAREDContent = default;
             private static bool _SHAREDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.AuthAlgorithm.html#varName"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String varName { get { if (!_varNameReady) { _varNameContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "varName"); _varNameReady = true; } return _varNameContent; } }
             private static Java.Lang.String _varNameContent = default;
             private static bool _varNameReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.AuthAlgorithm.html#strings"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String[] strings { get { if (!_stringsReady) { _stringsContent = SGetFieldArray<Java.Lang.String>(LocalBridgeClazz, "strings"); _stringsReady = true; } return _stringsContent; } }
             private static Java.Lang.String[] _stringsContent = default;
             private static bool _stringsReady = false; // this is used because in case of generics 
@@ -448,63 +470,63 @@ public partial class GroupCipher
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#CCMP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CCMP { get { if (!_CCMPReady) { _CCMPContent = SGetField<int>(LocalBridgeClazz, "CCMP"); _CCMPReady = true; } return _CCMPContent; } }
             private static int _CCMPContent = default;
             private static bool _CCMPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#GCMP_128"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int GCMP_128 { get { if (!_GCMP_128Ready) { _GCMP_128Content = SGetField<int>(LocalBridgeClazz, "GCMP_128"); _GCMP_128Ready = true; } return _GCMP_128Content; } }
             private static int _GCMP_128Content = default;
             private static bool _GCMP_128Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#GCMP_256"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int GCMP_256 { get { if (!_GCMP_256Ready) { _GCMP_256Content = SGetField<int>(LocalBridgeClazz, "GCMP_256"); _GCMP_256Ready = true; } return _GCMP_256Content; } }
             private static int _GCMP_256Content = default;
             private static bool _GCMP_256Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#SMS4"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SMS4 { get { if (!_SMS4Ready) { _SMS4Content = SGetField<int>(LocalBridgeClazz, "SMS4"); _SMS4Ready = true; } return _SMS4Content; } }
             private static int _SMS4Content = default;
             private static bool _SMS4Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#TKIP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TKIP { get { if (!_TKIPReady) { _TKIPContent = SGetField<int>(LocalBridgeClazz, "TKIP"); _TKIPReady = true; } return _TKIPContent; } }
             private static int _TKIPContent = default;
             private static bool _TKIPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#WEP104"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WEP104 { get { if (!_WEP104Ready) { _WEP104Content = SGetField<int>(LocalBridgeClazz, "WEP104"); _WEP104Ready = true; } return _WEP104Content; } }
             private static int _WEP104Content = default;
             private static bool _WEP104Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#WEP40"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WEP40 { get { if (!_WEP40Ready) { _WEP40Content = SGetField<int>(LocalBridgeClazz, "WEP40"); _WEP40Ready = true; } return _WEP40Content; } }
             private static int _WEP40Content = default;
             private static bool _WEP40Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#varName"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String varName { get { if (!_varNameReady) { _varNameContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "varName"); _varNameReady = true; } return _varNameContent; } }
             private static Java.Lang.String _varNameContent = default;
             private static bool _varNameReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupCipher.html#strings"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String[] strings { get { if (!_stringsReady) { _stringsContent = SGetFieldArray<Java.Lang.String>(LocalBridgeClazz, "strings"); _stringsReady = true; } return _stringsContent; } }
             private static Java.Lang.String[] _stringsContent = default;
             private static bool _stringsReady = false; // this is used because in case of generics 
@@ -542,21 +564,21 @@ public partial class GroupMgmtCipher
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupMgmtCipher.html#BIP_CMAC_256"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int BIP_CMAC_256 { get { if (!_BIP_CMAC_256Ready) { _BIP_CMAC_256Content = SGetField<int>(LocalBridgeClazz, "BIP_CMAC_256"); _BIP_CMAC_256Ready = true; } return _BIP_CMAC_256Content; } }
             private static int _BIP_CMAC_256Content = default;
             private static bool _BIP_CMAC_256Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupMgmtCipher.html#BIP_GMAC_128"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int BIP_GMAC_128 { get { if (!_BIP_GMAC_128Ready) { _BIP_GMAC_128Content = SGetField<int>(LocalBridgeClazz, "BIP_GMAC_128"); _BIP_GMAC_128Ready = true; } return _BIP_GMAC_128Content; } }
             private static int _BIP_GMAC_128Content = default;
             private static bool _BIP_GMAC_128Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.GroupMgmtCipher.html#BIP_GMAC_256"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int BIP_GMAC_256 { get { if (!_BIP_GMAC_256Ready) { _BIP_GMAC_256Content = SGetField<int>(LocalBridgeClazz, "BIP_GMAC_256"); _BIP_GMAC_256Ready = true; } return _BIP_GMAC_256Content; } }
             private static int _BIP_GMAC_256Content = default;
             private static bool _BIP_GMAC_256Ready = false; // this is used because in case of generics 
@@ -594,140 +616,140 @@ public partial class KeyMgmt
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#DPP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int DPP { get { if (!_DPPReady) { _DPPContent = SGetField<int>(LocalBridgeClazz, "DPP"); _DPPReady = true; } return _DPPContent; } }
             private static int _DPPContent = default;
             private static bool _DPPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#FILS_SHA256"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FILS_SHA256 { get { if (!_FILS_SHA256Ready) { _FILS_SHA256Content = SGetField<int>(LocalBridgeClazz, "FILS_SHA256"); _FILS_SHA256Ready = true; } return _FILS_SHA256Content; } }
             private static int _FILS_SHA256Content = default;
             private static bool _FILS_SHA256Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#FILS_SHA384"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FILS_SHA384 { get { if (!_FILS_SHA384Ready) { _FILS_SHA384Content = SGetField<int>(LocalBridgeClazz, "FILS_SHA384"); _FILS_SHA384Ready = true; } return _FILS_SHA384Content; } }
             private static int _FILS_SHA384Content = default;
             private static bool _FILS_SHA384Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#FT_EAP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FT_EAP { get { if (!_FT_EAPReady) { _FT_EAPContent = SGetField<int>(LocalBridgeClazz, "FT_EAP"); _FT_EAPReady = true; } return _FT_EAPContent; } }
             private static int _FT_EAPContent = default;
             private static bool _FT_EAPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#FT_PSK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FT_PSK { get { if (!_FT_PSKReady) { _FT_PSKContent = SGetField<int>(LocalBridgeClazz, "FT_PSK"); _FT_PSKReady = true; } return _FT_PSKContent; } }
             private static int _FT_PSKContent = default;
             private static bool _FT_PSKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#IEEE8021X"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int IEEE8021X { get { if (!_IEEE8021XReady) { _IEEE8021XContent = SGetField<int>(LocalBridgeClazz, "IEEE8021X"); _IEEE8021XReady = true; } return _IEEE8021XContent; } }
             private static int _IEEE8021XContent = default;
             private static bool _IEEE8021XReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#NONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int NONE { get { if (!_NONEReady) { _NONEContent = SGetField<int>(LocalBridgeClazz, "NONE"); _NONEReady = true; } return _NONEContent; } }
             private static int _NONEContent = default;
             private static bool _NONEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#OSEN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int OSEN { get { if (!_OSENReady) { _OSENContent = SGetField<int>(LocalBridgeClazz, "OSEN"); _OSENReady = true; } return _OSENContent; } }
             private static int _OSENContent = default;
             private static bool _OSENReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#OWE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int OWE { get { if (!_OWEReady) { _OWEContent = SGetField<int>(LocalBridgeClazz, "OWE"); _OWEReady = true; } return _OWEContent; } }
             private static int _OWEContent = default;
             private static bool _OWEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#SAE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SAE { get { if (!_SAEReady) { _SAEContent = SGetField<int>(LocalBridgeClazz, "SAE"); _SAEReady = true; } return _SAEContent; } }
             private static int _SAEContent = default;
             private static bool _SAEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#SUITE_B_192"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SUITE_B_192 { get { if (!_SUITE_B_192Ready) { _SUITE_B_192Content = SGetField<int>(LocalBridgeClazz, "SUITE_B_192"); _SUITE_B_192Ready = true; } return _SUITE_B_192Content; } }
             private static int _SUITE_B_192Content = default;
             private static bool _SUITE_B_192Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#WAPI_CERT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WAPI_CERT { get { if (!_WAPI_CERTReady) { _WAPI_CERTContent = SGetField<int>(LocalBridgeClazz, "WAPI_CERT"); _WAPI_CERTReady = true; } return _WAPI_CERTContent; } }
             private static int _WAPI_CERTContent = default;
             private static bool _WAPI_CERTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#WAPI_PSK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WAPI_PSK { get { if (!_WAPI_PSKReady) { _WAPI_PSKContent = SGetField<int>(LocalBridgeClazz, "WAPI_PSK"); _WAPI_PSKReady = true; } return _WAPI_PSKContent; } }
             private static int _WAPI_PSKContent = default;
             private static bool _WAPI_PSKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#WPA_EAP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WPA_EAP { get { if (!_WPA_EAPReady) { _WPA_EAPContent = SGetField<int>(LocalBridgeClazz, "WPA_EAP"); _WPA_EAPReady = true; } return _WPA_EAPContent; } }
             private static int _WPA_EAPContent = default;
             private static bool _WPA_EAPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#WPA_EAP_SHA256"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WPA_EAP_SHA256 { get { if (!_WPA_EAP_SHA256Ready) { _WPA_EAP_SHA256Content = SGetField<int>(LocalBridgeClazz, "WPA_EAP_SHA256"); _WPA_EAP_SHA256Ready = true; } return _WPA_EAP_SHA256Content; } }
             private static int _WPA_EAP_SHA256Content = default;
             private static bool _WPA_EAP_SHA256Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#WPA_PSK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WPA_PSK { get { if (!_WPA_PSKReady) { _WPA_PSKContent = SGetField<int>(LocalBridgeClazz, "WPA_PSK"); _WPA_PSKReady = true; } return _WPA_PSKContent; } }
             private static int _WPA_PSKContent = default;
             private static bool _WPA_PSKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#WPA_PSK_SHA256"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WPA_PSK_SHA256 { get { if (!_WPA_PSK_SHA256Ready) { _WPA_PSK_SHA256Content = SGetField<int>(LocalBridgeClazz, "WPA_PSK_SHA256"); _WPA_PSK_SHA256Ready = true; } return _WPA_PSK_SHA256Content; } }
             private static int _WPA_PSK_SHA256Content = default;
             private static bool _WPA_PSK_SHA256Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#WPA2_PSK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WPA2_PSK { get { if (!_WPA2_PSKReady) { _WPA2_PSKContent = SGetField<int>(LocalBridgeClazz, "WPA2_PSK"); _WPA2_PSKReady = true; } return _WPA2_PSKContent; } }
             private static int _WPA2_PSKContent = default;
             private static bool _WPA2_PSKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#varName"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String varName { get { if (!_varNameReady) { _varNameContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "varName"); _varNameReady = true; } return _varNameContent; } }
             private static Java.Lang.String _varNameContent = default;
             private static bool _varNameReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.KeyMgmt.html#strings"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String[] strings { get { if (!_stringsReady) { _stringsContent = SGetFieldArray<Java.Lang.String>(LocalBridgeClazz, "strings"); _stringsReady = true; } return _stringsContent; } }
             private static Java.Lang.String[] _stringsContent = default;
             private static bool _stringsReady = false; // this is used because in case of generics 
@@ -765,56 +787,56 @@ public partial class PairwiseCipher
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html#CCMP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CCMP { get { if (!_CCMPReady) { _CCMPContent = SGetField<int>(LocalBridgeClazz, "CCMP"); _CCMPReady = true; } return _CCMPContent; } }
             private static int _CCMPContent = default;
             private static bool _CCMPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html#GCMP_128"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int GCMP_128 { get { if (!_GCMP_128Ready) { _GCMP_128Content = SGetField<int>(LocalBridgeClazz, "GCMP_128"); _GCMP_128Ready = true; } return _GCMP_128Content; } }
             private static int _GCMP_128Content = default;
             private static bool _GCMP_128Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html#GCMP_256"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int GCMP_256 { get { if (!_GCMP_256Ready) { _GCMP_256Content = SGetField<int>(LocalBridgeClazz, "GCMP_256"); _GCMP_256Ready = true; } return _GCMP_256Content; } }
             private static int _GCMP_256Content = default;
             private static bool _GCMP_256Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html#NONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int NONE { get { if (!_NONEReady) { _NONEContent = SGetField<int>(LocalBridgeClazz, "NONE"); _NONEReady = true; } return _NONEContent; } }
             private static int _NONEContent = default;
             private static bool _NONEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html#SMS4"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SMS4 { get { if (!_SMS4Ready) { _SMS4Content = SGetField<int>(LocalBridgeClazz, "SMS4"); _SMS4Ready = true; } return _SMS4Content; } }
             private static int _SMS4Content = default;
             private static bool _SMS4Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html#TKIP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TKIP { get { if (!_TKIPReady) { _TKIPContent = SGetField<int>(LocalBridgeClazz, "TKIP"); _TKIPReady = true; } return _TKIPContent; } }
             private static int _TKIPContent = default;
             private static bool _TKIPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html#varName"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String varName { get { if (!_varNameReady) { _varNameContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "varName"); _varNameReady = true; } return _varNameContent; } }
             private static Java.Lang.String _varNameContent = default;
             private static bool _varNameReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.PairwiseCipher.html#strings"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String[] strings { get { if (!_stringsReady) { _stringsContent = SGetFieldArray<Java.Lang.String>(LocalBridgeClazz, "strings"); _stringsReady = true; } return _stringsContent; } }
             private static Java.Lang.String[] _stringsContent = default;
             private static bool _stringsReady = false; // this is used because in case of generics 
@@ -852,35 +874,35 @@ public partial class Protocol
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Protocol.html#RSN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RSN { get { if (!_RSNReady) { _RSNContent = SGetField<int>(LocalBridgeClazz, "RSN"); _RSNReady = true; } return _RSNContent; } }
             private static int _RSNContent = default;
             private static bool _RSNReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Protocol.html#WAPI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WAPI { get { if (!_WAPIReady) { _WAPIContent = SGetField<int>(LocalBridgeClazz, "WAPI"); _WAPIReady = true; } return _WAPIContent; } }
             private static int _WAPIContent = default;
             private static bool _WAPIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Protocol.html#WPA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WPA { get { if (!_WPAReady) { _WPAContent = SGetField<int>(LocalBridgeClazz, "WPA"); _WPAReady = true; } return _WPAContent; } }
             private static int _WPAContent = default;
             private static bool _WPAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Protocol.html#varName"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String varName { get { if (!_varNameReady) { _varNameContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "varName"); _varNameReady = true; } return _varNameContent; } }
             private static Java.Lang.String _varNameContent = default;
             private static bool _varNameReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Protocol.html#strings"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String[] strings { get { if (!_stringsReady) { _stringsContent = SGetFieldArray<Java.Lang.String>(LocalBridgeClazz, "strings"); _stringsReady = true; } return _stringsContent; } }
             private static Java.Lang.String[] _stringsContent = default;
             private static bool _stringsReady = false; // this is used because in case of generics 
@@ -918,28 +940,28 @@ public partial class Status
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Status.html#CURRENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CURRENT { get { if (!_CURRENTReady) { _CURRENTContent = SGetField<int>(LocalBridgeClazz, "CURRENT"); _CURRENTReady = true; } return _CURRENTContent; } }
             private static int _CURRENTContent = default;
             private static bool _CURRENTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Status.html#DISABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int DISABLED { get { if (!_DISABLEDReady) { _DISABLEDContent = SGetField<int>(LocalBridgeClazz, "DISABLED"); _DISABLEDReady = true; } return _DISABLEDContent; } }
             private static int _DISABLEDContent = default;
             private static bool _DISABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Status.html#ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int ENABLED { get { if (!_ENABLEDReady) { _ENABLEDContent = SGetField<int>(LocalBridgeClazz, "ENABLED"); _ENABLEDReady = true; } return _ENABLEDContent; } }
             private static int _ENABLEDContent = default;
             private static bool _ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiConfiguration.Status.html#strings"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String[] strings { get { if (!_stringsReady) { _stringsContent = SGetFieldArray<Java.Lang.String>(LocalBridgeClazz, "strings"); _stringsReady = true; } return _stringsContent; } }
             private static Java.Lang.String[] _stringsContent = default;
             private static bool _stringsReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiEnterpriseConfig.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiEnterpriseConfig.cs
index 44bf1683b..b5cb7a787 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiEnterpriseConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiEnterpriseConfig.cs
@@ -120,179 +120,197 @@ public WifiEnterpriseConfig(Android.Net.Wifi.WifiEnterpriseConfig arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getAltSubjectMatch()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setAltSubjectMatch(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#hasCaCertificate()"/>
         /// </summary>
-        public Java.Lang.String AltSubjectMatch
+        /// <returns><see cref="bool"/></returns>
+        public bool HasCaCertificate()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAltSubjectMatch", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setAltSubjectMatch", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("hasCaCertificate", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getAnonymousIdentity()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setAnonymousIdentity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#isAuthenticationSimBased()"/>
         /// </summary>
-        public Java.Lang.String AnonymousIdentity
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAuthenticationSimBased()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAnonymousIdentity", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setAnonymousIdentity", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isAuthenticationSimBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getCaCertificate()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setCaCertificate(java.security.cert.X509Certificate)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#isEapMethodServerCertUsed()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate CaCertificate
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEapMethodServerCertUsed()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getCaCertificate", "()Ljava/security/cert/X509Certificate;"); } set { IExecuteWithSignature("setCaCertificate", "(Ljava/security/cert/X509Certificate;)V", value); }
+            return IExecuteWithSignature<bool>("isEapMethodServerCertUsed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getCaCertificates()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setCaCertificates(java.security.cert.X509Certificate[])"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#isServerCertValidationEnabled()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate[] CaCertificates
+        /// <returns><see cref="bool"/></returns>
+        public bool IsServerCertValidationEnabled()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getCaCertificates", "()[Ljava/security/cert/X509Certificate;"); } set { IExecuteWithSignature("setCaCertificates", "([Ljava/security/cert/X509Certificate;)V", value); }
+            return IExecuteWithSignature<bool>("isServerCertValidationEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getClientCertificate()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#isTrustOnFirstUseEnabled()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate ClientCertificate
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTrustOnFirstUseEnabled()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getClientCertificate", "()Ljava/security/cert/X509Certificate;"); }
+            return IExecuteWithSignature<bool>("isTrustOnFirstUseEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getClientCertificateChain()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#describeContents()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate[] ClientCertificateChain
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getClientCertificateChain", "()[Ljava/security/cert/X509Certificate;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getClientKeyPairAlias()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setClientKeyPairAlias(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getEapMethod()"/>
         /// </summary>
-        public Java.Lang.String ClientKeyPairAlias
+        /// <returns><see cref="int"/></returns>
+        public int GetEapMethod()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClientKeyPairAlias", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setClientKeyPairAlias", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getEapMethod", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getClientPrivateKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getMinimumTlsVersion()"/>
         /// </summary>
-        public Java.Security.PrivateKey ClientPrivateKey
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumTlsVersion()
         {
-            get { return IExecuteWithSignature<Java.Security.PrivateKey>("getClientPrivateKey", "()Ljava/security/PrivateKey;"); }
+            return IExecuteWithSignature<int>("getMinimumTlsVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getDecoratedIdentityPrefix()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setDecoratedIdentityPrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getPhase2Method()"/>
         /// </summary>
-        public Java.Lang.String DecoratedIdentityPrefix
+        /// <returns><see cref="int"/></returns>
+        public int GetPhase2Method()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDecoratedIdentityPrefix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDecoratedIdentityPrefix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getPhase2Method", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getDomainSuffixMatch()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setDomainSuffixMatch(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getAltSubjectMatch()"/>
         /// </summary>
-        public Java.Lang.String DomainSuffixMatch
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAltSubjectMatch()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDomainSuffixMatch", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDomainSuffixMatch", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getAltSubjectMatch", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getEapMethod()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setEapMethod(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getAnonymousIdentity()"/>
         /// </summary>
-        public int EapMethod
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAnonymousIdentity()
         {
-            get { return IExecuteWithSignature<int>("getEapMethod", "()I"); } set { IExecuteWithSignature("setEapMethod", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getAnonymousIdentity", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getIdentity()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setIdentity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getClientKeyPairAlias()"/>
         /// </summary>
-        public Java.Lang.String Identity
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClientKeyPairAlias()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIdentity", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setIdentity", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getClientKeyPairAlias", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getMinimumTlsVersion()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setMinimumTlsVersion(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getDecoratedIdentityPrefix()"/>
         /// </summary>
-        public int MinimumTlsVersion
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDecoratedIdentityPrefix()
         {
-            get { return IExecuteWithSignature<int>("getMinimumTlsVersion", "()I"); } set { IExecuteWithSignature("setMinimumTlsVersion", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDecoratedIdentityPrefix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getPassword()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setPassword(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getDomainSuffixMatch()"/>
         /// </summary>
-        public Java.Lang.String Password
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDomainSuffixMatch()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPassword", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDomainSuffixMatch", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getPhase2Method()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setPhase2Method(int)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getIdentity()"/>
         /// </summary>
-        public int Phase2Method
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetIdentity()
         {
-            get { return IExecuteWithSignature<int>("getPhase2Method", "()I"); } set { IExecuteWithSignature("setPhase2Method", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getIdentity", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getPlmn()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setPlmn(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getPassword()"/>
         /// </summary>
-        public Java.Lang.String Plmn
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPassword()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPlmn", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPlmn", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getRealm()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setRealm(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getPlmn()"/>
         /// </summary>
-        public Java.Lang.String Realm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPlmn()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRealm", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setRealm", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPlmn", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getSubjectMatch()"/> <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setSubjectMatch(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getRealm()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String SubjectMatch
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRealm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubjectMatch", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSubjectMatch", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getRealm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#hasCaCertificate()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getSubjectMatch()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasCaCertificate()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSubjectMatch()
         {
-            return IExecuteWithSignature<bool>("hasCaCertificate", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSubjectMatch", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#isAuthenticationSimBased()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getCaCertificate()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAuthenticationSimBased()
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetCaCertificate()
         {
-            return IExecuteWithSignature<bool>("isAuthenticationSimBased", "()Z");
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getCaCertificate", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#isEapMethodServerCertUsed()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getClientCertificate()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEapMethodServerCertUsed()
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetClientCertificate()
         {
-            return IExecuteWithSignature<bool>("isEapMethodServerCertUsed", "()Z");
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getClientCertificate", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#isServerCertValidationEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getCaCertificates()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsServerCertValidationEnabled()
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate[] GetCaCertificates()
         {
-            return IExecuteWithSignature<bool>("isServerCertValidationEnabled", "()Z");
+            return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getCaCertificates", "()[Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#isTrustOnFirstUseEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getClientCertificateChain()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTrustOnFirstUseEnabled()
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate[] GetClientCertificateChain()
         {
-            return IExecuteWithSignature<bool>("isTrustOnFirstUseEnabled", "()Z");
+            return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getClientCertificateChain", "()[Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#getClientPrivateKey()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Security.PrivateKey"/></returns>
+        public Java.Security.PrivateKey GetClientPrivateKey()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Security.PrivateKey>("getClientPrivateKey", "()Ljava/security/PrivateKey;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#enableTrustOnFirstUse(boolean)"/>
@@ -303,6 +321,38 @@ public void EnableTrustOnFirstUse(bool arg0)
             IExecuteWithSignature("enableTrustOnFirstUse", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setAltSubjectMatch(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetAltSubjectMatch(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setAltSubjectMatch", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setAnonymousIdentity(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetAnonymousIdentity(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setAnonymousIdentity", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setCaCertificate(java.security.cert.X509Certificate)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
+        public void SetCaCertificate(Java.Security.Cert.X509Certificate arg0)
+        {
+            IExecuteWithSignature("setCaCertificate", "(Ljava/security/cert/X509Certificate;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setCaCertificates(java.security.cert.X509Certificate[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
+        public void SetCaCertificates(Java.Security.Cert.X509Certificate[] arg0)
+        {
+            IExecuteWithSignature("setCaCertificates", "([Ljava/security/cert/X509Certificate;)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setClientKeyEntry(java.security.PrivateKey,java.security.cert.X509Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivateKey"/></param>
@@ -321,6 +371,96 @@ public void SetClientKeyEntryWithCertificateChain(Java.Security.PrivateKey arg0,
             IExecute("setClientKeyEntryWithCertificateChain", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setClientKeyPairAlias(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetClientKeyPairAlias(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setClientKeyPairAlias", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setDecoratedIdentityPrefix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDecoratedIdentityPrefix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDecoratedIdentityPrefix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setDomainSuffixMatch(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDomainSuffixMatch(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDomainSuffixMatch", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setEapMethod(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetEapMethod(int arg0)
+        {
+            IExecuteWithSignature("setEapMethod", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setIdentity(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetIdentity(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setIdentity", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setMinimumTlsVersion(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        public void SetMinimumTlsVersion(int arg0)
+        {
+            IExecuteWithSignature("setMinimumTlsVersion", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setPassword(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPassword(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPassword", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setPhase2Method(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPhase2Method(int arg0)
+        {
+            IExecuteWithSignature("setPhase2Method", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setPlmn(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPlmn(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPlmn", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setRealm(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetRealm(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setRealm", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#setSubjectMatch(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetSubjectMatch(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSubjectMatch", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiEnterpriseConfig.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiInfo.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiInfo.cs
index 2a2906780..6b9871561 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiInfo.cs
@@ -171,214 +171,230 @@ public static Android.Net.NetworkInfo.DetailedState GetDetailedStateOf(Android.N
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getAffiliatedMloLinks()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getApMldMacAddress()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Wifi.MloLink> AffiliatedMloLinks
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetApMldMacAddress()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.MloLink>>("getAffiliatedMloLinks", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getApMldMacAddress", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getApMldMacAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getSupplicantState()"/>
         /// </summary>
-        public Android.Net.MacAddress ApMldMacAddress
+        /// <returns><see cref="Android.Net.Wifi.SupplicantState"/></returns>
+        public Android.Net.Wifi.SupplicantState GetSupplicantState()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getApMldMacAddress", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.SupplicantState>("getSupplicantState", "()Landroid/net/wifi/SupplicantState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getApMloLinkId()"/> 
-        /// </summary>
-        public int ApMloLinkId
-        {
-            get { return IExecuteWithSignature<int>("getApMloLinkId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getApplicableRedactions()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#makeCopy(long)"/>
         /// </summary>
-        public long ApplicableRedactions
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <returns><see cref="Android.Net.Wifi.WifiInfo"/></returns>
+        public Android.Net.Wifi.WifiInfo MakeCopy(long arg0)
         {
-            get { return IExecuteWithSignature<long>("getApplicableRedactions", "()J"); }
+            return IExecuteWithSignature<Android.Net.Wifi.WifiInfo>("makeCopy", "(J)Landroid/net/wifi/WifiInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getAssociatedMloLinks()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getHiddenSSID()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Wifi.MloLink> AssociatedMloLinks
+        /// <returns><see cref="bool"/></returns>
+        public bool GetHiddenSSID()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.MloLink>>("getAssociatedMloLinks", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("getHiddenSSID", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getBSSID()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#isRestricted()"/>
         /// </summary>
-        public Java.Lang.String BSSID
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRestricted()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBSSID", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isRestricted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getCurrentSecurityType()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#describeContents()"/>
         /// </summary>
-        public int CurrentSecurityType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCurrentSecurityType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getFrequency()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getApMloLinkId()"/>
         /// </summary>
-        public int Frequency
+        /// <returns><see cref="int"/></returns>
+        public int GetApMloLinkId()
         {
-            get { return IExecuteWithSignature<int>("getFrequency", "()I"); }
+            return IExecuteWithSignature<int>("getApMloLinkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getHiddenSSID()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getCurrentSecurityType()"/>
         /// </summary>
-        public bool HiddenSSID
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentSecurityType()
         {
-            get { return IExecuteWithSignature<bool>("getHiddenSSID", "()Z"); }
+            return IExecuteWithSignature<int>("getCurrentSecurityType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getInformationElements()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getFrequency()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement> InformationElements
+        /// <returns><see cref="int"/></returns>
+        public int GetFrequency()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement>>("getInformationElements", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getFrequency", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getIpAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getIpAddress()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int IpAddress
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetIpAddress()
         {
-            get { return IExecuteWithSignature<int>("getIpAddress", "()I"); }
+            return IExecuteWithSignature<int>("getIpAddress", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getLinkSpeed()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getLinkSpeed()"/>
         /// </summary>
-        public int LinkSpeed
+        /// <returns><see cref="int"/></returns>
+        public int GetLinkSpeed()
         {
-            get { return IExecuteWithSignature<int>("getLinkSpeed", "()I"); }
+            return IExecuteWithSignature<int>("getLinkSpeed", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getMacAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getMaxSupportedRxLinkSpeedMbps()"/>
         /// </summary>
-        public Java.Lang.String MacAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSupportedRxLinkSpeedMbps()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMacAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getMaxSupportedRxLinkSpeedMbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getMaxSupportedRxLinkSpeedMbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getMaxSupportedTxLinkSpeedMbps()"/>
         /// </summary>
-        public int MaxSupportedRxLinkSpeedMbps
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSupportedTxLinkSpeedMbps()
         {
-            get { return IExecuteWithSignature<int>("getMaxSupportedRxLinkSpeedMbps", "()I"); }
+            return IExecuteWithSignature<int>("getMaxSupportedTxLinkSpeedMbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getMaxSupportedTxLinkSpeedMbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getNetworkId()"/>
         /// </summary>
-        public int MaxSupportedTxLinkSpeedMbps
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkId()
         {
-            get { return IExecuteWithSignature<int>("getMaxSupportedTxLinkSpeedMbps", "()I"); }
+            return IExecuteWithSignature<int>("getNetworkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getNetworkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getRssi()"/>
         /// </summary>
-        public int NetworkId
+        /// <returns><see cref="int"/></returns>
+        public int GetRssi()
         {
-            get { return IExecuteWithSignature<int>("getNetworkId", "()I"); }
+            return IExecuteWithSignature<int>("getRssi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getPasspointFqdn()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getRxLinkSpeedMbps()"/>
         /// </summary>
-        public Java.Lang.String PasspointFqdn
+        /// <returns><see cref="int"/></returns>
+        public int GetRxLinkSpeedMbps()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPasspointFqdn", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getRxLinkSpeedMbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getPasspointProviderFriendlyName()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getSubscriptionId()"/>
         /// </summary>
-        public Java.Lang.String PasspointProviderFriendlyName
+        /// <returns><see cref="int"/></returns>
+        public int GetSubscriptionId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPasspointProviderFriendlyName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getSubscriptionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getRssi()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getTxLinkSpeedMbps()"/>
         /// </summary>
-        public int Rssi
+        /// <returns><see cref="int"/></returns>
+        public int GetTxLinkSpeedMbps()
         {
-            get { return IExecuteWithSignature<int>("getRssi", "()I"); }
+            return IExecuteWithSignature<int>("getTxLinkSpeedMbps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getRxLinkSpeedMbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getWifiStandard()"/>
         /// </summary>
-        public int RxLinkSpeedMbps
+        /// <returns><see cref="int"/></returns>
+        public int GetWifiStandard()
         {
-            get { return IExecuteWithSignature<int>("getRxLinkSpeedMbps", "()I"); }
+            return IExecuteWithSignature<int>("getWifiStandard", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getSSID()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getBSSID()"/>
         /// </summary>
-        public Java.Lang.String SSID
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBSSID()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSSID", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getBSSID", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getSubscriptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getMacAddress()"/>
         /// </summary>
-        public int SubscriptionId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMacAddress()
         {
-            get { return IExecuteWithSignature<int>("getSubscriptionId", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMacAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getSupplicantState()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getPasspointFqdn()"/>
         /// </summary>
-        public Android.Net.Wifi.SupplicantState SupplicantState
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPasspointFqdn()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.SupplicantState>("getSupplicantState", "()Landroid/net/wifi/SupplicantState;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPasspointFqdn", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getTxLinkSpeedMbps()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getPasspointProviderFriendlyName()"/>
         /// </summary>
-        public int TxLinkSpeedMbps
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPasspointProviderFriendlyName()
         {
-            get { return IExecuteWithSignature<int>("getTxLinkSpeedMbps", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPasspointProviderFriendlyName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getWifiStandard()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getSSID()"/>
         /// </summary>
-        public int WifiStandard
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSSID()
         {
-            get { return IExecuteWithSignature<int>("getWifiStandard", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSSID", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#makeCopy(long)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getAffiliatedMloLinks()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="Android.Net.TransportInfo"/></returns>
-        public Android.Net.TransportInfo MakeCopy(long arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.MloLink> GetAffiliatedMloLinks()
         {
-            return IExecuteWithSignature<Android.Net.TransportInfo>("makeCopy", "(J)Landroid/net/TransportInfo;", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.MloLink>>("getAffiliatedMloLinks", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#makeCopy(long)"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getAssociatedMloLinks()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="Android.Net.Wifi.WifiInfo"/></returns>
-        public Android.Net.Wifi.WifiInfo MakeCopy(long arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.MloLink> GetAssociatedMloLinks()
         {
-            return IExecuteWithSignature<Android.Net.Wifi.WifiInfo>("makeCopy", "(J)Landroid/net/wifi/WifiInfo;", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.MloLink>>("getAssociatedMloLinks", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#isRestricted()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getInformationElements()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRestricted()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement> GetInformationElements()
         {
-            return IExecuteWithSignature<bool>("isRestricted", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.ScanResult.InformationElement>>("getInformationElements", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#getApplicableRedactions()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetApplicableRedactions()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getApplicableRedactions", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiManager.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiManager.cs
index 0177f430d..94786e250 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiManager.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiManager.cs
@@ -52,7 +52,7 @@ public partial class WifiManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#ERROR_AUTHENTICATING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ERROR_AUTHENTICATING { get { if (!_ERROR_AUTHENTICATINGReady) { _ERROR_AUTHENTICATINGContent = SGetField<int>(LocalBridgeClazz, "ERROR_AUTHENTICATING"); _ERROR_AUTHENTICATINGReady = true; } return _ERROR_AUTHENTICATINGContent; } }
         private static int _ERROR_AUTHENTICATINGContent = default;
         private static bool _ERROR_AUTHENTICATINGReady = false; // this is used because in case of generics 
@@ -227,14 +227,14 @@ public partial class WifiManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#WIFI_MODE_FULL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WIFI_MODE_FULL { get { if (!_WIFI_MODE_FULLReady) { _WIFI_MODE_FULLContent = SGetField<int>(LocalBridgeClazz, "WIFI_MODE_FULL"); _WIFI_MODE_FULLReady = true; } return _WIFI_MODE_FULLContent; } }
         private static int _WIFI_MODE_FULLContent = default;
         private static bool _WIFI_MODE_FULLReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#WIFI_MODE_FULL_HIGH_PERF"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WIFI_MODE_FULL_HIGH_PERF { get { if (!_WIFI_MODE_FULL_HIGH_PERFReady) { _WIFI_MODE_FULL_HIGH_PERFContent = SGetField<int>(LocalBridgeClazz, "WIFI_MODE_FULL_HIGH_PERF"); _WIFI_MODE_FULL_HIGH_PERFReady = true; } return _WIFI_MODE_FULL_HIGH_PERFContent; } }
         private static int _WIFI_MODE_FULL_HIGH_PERFContent = default;
         private static bool _WIFI_MODE_FULL_HIGH_PERFReady = false; // this is used because in case of generics 
@@ -247,7 +247,7 @@ public partial class WifiManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#WIFI_MODE_SCAN_ONLY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WIFI_MODE_SCAN_ONLY { get { if (!_WIFI_MODE_SCAN_ONLYReady) { _WIFI_MODE_SCAN_ONLYContent = SGetField<int>(LocalBridgeClazz, "WIFI_MODE_SCAN_ONLY"); _WIFI_MODE_SCAN_ONLYReady = true; } return _WIFI_MODE_SCAN_ONLYContent; } }
         private static int _WIFI_MODE_SCAN_ONLYContent = default;
         private static bool _WIFI_MODE_SCAN_ONLYReady = false; // this is used because in case of generics 
@@ -302,35 +302,35 @@ public partial class WifiManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#WPS_AUTH_FAILURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WPS_AUTH_FAILURE { get { if (!_WPS_AUTH_FAILUREReady) { _WPS_AUTH_FAILUREContent = SGetField<int>(LocalBridgeClazz, "WPS_AUTH_FAILURE"); _WPS_AUTH_FAILUREReady = true; } return _WPS_AUTH_FAILUREContent; } }
         private static int _WPS_AUTH_FAILUREContent = default;
         private static bool _WPS_AUTH_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#WPS_OVERLAP_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WPS_OVERLAP_ERROR { get { if (!_WPS_OVERLAP_ERRORReady) { _WPS_OVERLAP_ERRORContent = SGetField<int>(LocalBridgeClazz, "WPS_OVERLAP_ERROR"); _WPS_OVERLAP_ERRORReady = true; } return _WPS_OVERLAP_ERRORContent; } }
         private static int _WPS_OVERLAP_ERRORContent = default;
         private static bool _WPS_OVERLAP_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#WPS_TIMED_OUT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WPS_TIMED_OUT { get { if (!_WPS_TIMED_OUTReady) { _WPS_TIMED_OUTContent = SGetField<int>(LocalBridgeClazz, "WPS_TIMED_OUT"); _WPS_TIMED_OUTReady = true; } return _WPS_TIMED_OUTContent; } }
         private static int _WPS_TIMED_OUTContent = default;
         private static bool _WPS_TIMED_OUTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#WPS_TKIP_ONLY_PROHIBITED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WPS_TKIP_ONLY_PROHIBITED { get { if (!_WPS_TKIP_ONLY_PROHIBITEDReady) { _WPS_TKIP_ONLY_PROHIBITEDContent = SGetField<int>(LocalBridgeClazz, "WPS_TKIP_ONLY_PROHIBITED"); _WPS_TKIP_ONLY_PROHIBITEDReady = true; } return _WPS_TKIP_ONLY_PROHIBITEDContent; } }
         private static int _WPS_TKIP_ONLY_PROHIBITEDContent = default;
         private static bool _WPS_TKIP_ONLY_PROHIBITEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#WPS_WEP_PROHIBITED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WPS_WEP_PROHIBITED { get { if (!_WPS_WEP_PROHIBITEDReady) { _WPS_WEP_PROHIBITEDContent = SGetField<int>(LocalBridgeClazz, "WPS_WEP_PROHIBITED"); _WPS_WEP_PROHIBITEDReady = true; } return _WPS_WEP_PROHIBITEDContent; } }
         private static int _WPS_WEP_PROHIBITEDContent = default;
         private static bool _WPS_WEP_PROHIBITEDReady = false; // this is used because in case of generics 
@@ -373,7 +373,7 @@ public partial class WifiManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#EXTRA_BSSID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_BSSID { get { if (!_EXTRA_BSSIDReady) { _EXTRA_BSSIDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_BSSID"); _EXTRA_BSSIDReady = true; } return _EXTRA_BSSIDContent; } }
         private static Java.Lang.String _EXTRA_BSSIDContent = default;
         private static bool _EXTRA_BSSIDReady = false; // this is used because in case of generics 
@@ -398,7 +398,7 @@ public partial class WifiManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#EXTRA_NEW_STATE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_NEW_STATE { get { if (!_EXTRA_NEW_STATEReady) { _EXTRA_NEW_STATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_NEW_STATE"); _EXTRA_NEW_STATEReady = true; } return _EXTRA_NEW_STATEContent; } }
         private static Java.Lang.String _EXTRA_NEW_STATEContent = default;
         private static bool _EXTRA_NEW_STATEReady = false; // this is used because in case of generics 
@@ -423,21 +423,21 @@ public partial class WifiManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#EXTRA_SUPPLICANT_CONNECTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SUPPLICANT_CONNECTED { get { if (!_EXTRA_SUPPLICANT_CONNECTEDReady) { _EXTRA_SUPPLICANT_CONNECTEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SUPPLICANT_CONNECTED"); _EXTRA_SUPPLICANT_CONNECTEDReady = true; } return _EXTRA_SUPPLICANT_CONNECTEDContent; } }
         private static Java.Lang.String _EXTRA_SUPPLICANT_CONNECTEDContent = default;
         private static bool _EXTRA_SUPPLICANT_CONNECTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#EXTRA_SUPPLICANT_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SUPPLICANT_ERROR { get { if (!_EXTRA_SUPPLICANT_ERRORReady) { _EXTRA_SUPPLICANT_ERRORContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SUPPLICANT_ERROR"); _EXTRA_SUPPLICANT_ERRORReady = true; } return _EXTRA_SUPPLICANT_ERRORContent; } }
         private static Java.Lang.String _EXTRA_SUPPLICANT_ERRORContent = default;
         private static bool _EXTRA_SUPPLICANT_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#EXTRA_WIFI_INFO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_WIFI_INFO { get { if (!_EXTRA_WIFI_INFOReady) { _EXTRA_WIFI_INFOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_WIFI_INFO"); _EXTRA_WIFI_INFOReady = true; } return _EXTRA_WIFI_INFOContent; } }
         private static Java.Lang.String _EXTRA_WIFI_INFOContent = default;
         private static bool _EXTRA_WIFI_INFOReady = false; // this is used because in case of generics 
@@ -474,14 +474,14 @@ public partial class WifiManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#SUPPLICANT_CONNECTION_CHANGE_ACTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SUPPLICANT_CONNECTION_CHANGE_ACTION { get { if (!_SUPPLICANT_CONNECTION_CHANGE_ACTIONReady) { _SUPPLICANT_CONNECTION_CHANGE_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SUPPLICANT_CONNECTION_CHANGE_ACTION"); _SUPPLICANT_CONNECTION_CHANGE_ACTIONReady = true; } return _SUPPLICANT_CONNECTION_CHANGE_ACTIONContent; } }
         private static Java.Lang.String _SUPPLICANT_CONNECTION_CHANGE_ACTIONContent = default;
         private static bool _SUPPLICANT_CONNECTION_CHANGE_ACTIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#SUPPLICANT_STATE_CHANGED_ACTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SUPPLICANT_STATE_CHANGED_ACTION { get { if (!_SUPPLICANT_STATE_CHANGED_ACTIONReady) { _SUPPLICANT_STATE_CHANGED_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SUPPLICANT_STATE_CHANGED_ACTION"); _SUPPLICANT_STATE_CHANGED_ACTIONReady = true; } return _SUPPLICANT_STATE_CHANGED_ACTIONContent; } }
         private static Java.Lang.String _SUPPLICANT_STATE_CHANGED_ACTIONContent = default;
         private static bool _SUPPLICANT_STATE_CHANGED_ACTIONReady = false; // this is used because in case of generics 
@@ -507,7 +507,7 @@ public partial class WifiManager
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CalculateSignalLevel(int arg0, int arg1)
         {
             return SExecute<int>(LocalBridgeClazz, "calculateSignalLevel", arg0, arg1);
@@ -527,92 +527,22 @@ public static int CompareSignalLevel(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getCallerConfiguredNetworks()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getDhcpInfo()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Wifi.WifiConfiguration> CallerConfiguredNetworks
+        /// <returns><see cref="Android.Net.DhcpInfo"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.DhcpInfo GetDhcpInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.WifiConfiguration>>("getCallerConfiguredNetworks", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Net.DhcpInfo>("getDhcpInfo", "()Landroid/net/DhcpInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getConfiguredNetworks()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getConnectionInfo()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Android.Net.Wifi.WifiConfiguration> ConfiguredNetworks
+        /// <returns><see cref="Android.Net.Wifi.WifiInfo"/></returns>
+        [global::System.Obsolete()]
+        public Android.Net.Wifi.WifiInfo GetConnectionInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.WifiConfiguration>>("getConfiguredNetworks", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getConnectionInfo()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Wifi.WifiInfo ConnectionInfo
-        {
-            get { return IExecuteWithSignature<Android.Net.Wifi.WifiInfo>("getConnectionInfo", "()Landroid/net/wifi/WifiInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getDhcpInfo()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Net.DhcpInfo DhcpInfo
-        {
-            get { return IExecuteWithSignature<Android.Net.DhcpInfo>("getDhcpInfo", "()Landroid/net/DhcpInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getMaxNumberOfChannelsPerNetworkSpecifierRequest()"/> 
-        /// </summary>
-        public int MaxNumberOfChannelsPerNetworkSpecifierRequest
-        {
-            get { return IExecuteWithSignature<int>("getMaxNumberOfChannelsPerNetworkSpecifierRequest", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getMaxNumberOfNetworkSuggestionsPerApp()"/> 
-        /// </summary>
-        public int MaxNumberOfNetworkSuggestionsPerApp
-        {
-            get { return IExecuteWithSignature<int>("getMaxNumberOfNetworkSuggestionsPerApp", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getMaxSignalLevel()"/> 
-        /// </summary>
-        public int MaxSignalLevel
-        {
-            get { return IExecuteWithSignature<int>("getMaxSignalLevel", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getNetworkSuggestions()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Net.Wifi.WifiNetworkSuggestion> NetworkSuggestions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.WifiNetworkSuggestion>>("getNetworkSuggestions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getPasspointConfigurations()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Android.Net.Wifi.Hotspot2.PasspointConfiguration> PasspointConfigurations
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.Hotspot2.PasspointConfiguration>>("getPasspointConfigurations", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getScanResults()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Net.Wifi.ScanResult> ScanResults
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.ScanResult>>("getScanResults", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getStaConcurrencyForMultiInternetMode()"/> 
-        /// </summary>
-        public int StaConcurrencyForMultiInternetMode
-        {
-            get { return IExecuteWithSignature<int>("getStaConcurrencyForMultiInternetMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getWifiState()"/> 
-        /// </summary>
-        public int WifiState
-        {
-            get { return IExecuteWithSignature<int>("getWifiState", "()I"); }
+            return IExecuteWithSignature<Android.Net.Wifi.WifiInfo>("getConnectionInfo", "()Landroid/net/wifi/WifiInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#addNetworkPrivileged(android.net.wifi.WifiConfiguration)"/>
@@ -647,7 +577,7 @@ public Android.Net.Wifi.WifiManager.WifiLock CreateWifiLock(int arg0, Java.Lang.
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Net.Wifi.WifiManager.WifiLock"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Net.Wifi.WifiManager.WifiLock CreateWifiLock(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Net.Wifi.WifiManager.WifiLock>("createWifiLock", "(Ljava/lang/String;)Landroid/net/wifi/WifiManager$WifiLock;", arg0);
@@ -657,7 +587,7 @@ public Android.Net.Wifi.WifiManager.WifiLock CreateWifiLock(Java.Lang.String arg
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool DisableNetwork(int arg0)
         {
             return IExecuteWithSignature<bool>("disableNetwork", "(I)Z", arg0);
@@ -666,7 +596,7 @@ public bool DisableNetwork(int arg0)
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#disconnect()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Disconnect()
         {
             return IExecuteWithSignature<bool>("disconnect", "()Z");
@@ -677,7 +607,7 @@ public bool Disconnect()
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool EnableNetwork(int arg0, bool arg1)
         {
             return IExecute<bool>("enableNetwork", arg0, arg1);
@@ -752,7 +682,7 @@ public bool IsDecoratedIdentitySupported()
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#isDeviceToApRttSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsDeviceToApRttSupported()
         {
             return IExecuteWithSignature<bool>("isDeviceToApRttSupported", "()Z");
@@ -841,7 +771,7 @@ public bool IsPreferredNetworkOffloadSupported()
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#isScanAlwaysAvailable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsScanAlwaysAvailable()
         {
             return IExecuteWithSignature<bool>("isScanAlwaysAvailable", "()Z");
@@ -1003,7 +933,7 @@ public bool IsWpa3SuiteBSupported()
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#pingSupplicant()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool PingSupplicant()
         {
             return IExecuteWithSignature<bool>("pingSupplicant", "()Z");
@@ -1012,7 +942,7 @@ public bool PingSupplicant()
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#reassociate()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Reassociate()
         {
             return IExecuteWithSignature<bool>("reassociate", "()Z");
@@ -1021,7 +951,7 @@ public bool Reassociate()
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#reconnect()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Reconnect()
         {
             return IExecuteWithSignature<bool>("reconnect", "()Z");
@@ -1031,7 +961,7 @@ public bool Reconnect()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RemoveNetwork(int arg0)
         {
             return IExecuteWithSignature<bool>("removeNetwork", "(I)Z", arg0);
@@ -1048,7 +978,7 @@ public bool RemoveNonCallerConfiguredNetworks()
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#saveConfiguration()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SaveConfiguration()
         {
             return IExecuteWithSignature<bool>("saveConfiguration", "()Z");
@@ -1058,7 +988,7 @@ public bool SaveConfiguration()
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetWifiEnabled(bool arg0)
         {
             return IExecuteWithSignature<bool>("setWifiEnabled", "(Z)Z", arg0);
@@ -1067,7 +997,7 @@ public bool SetWifiEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#startScan()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool StartScan()
         {
             return IExecuteWithSignature<bool>("startScan", "()Z");
@@ -1086,7 +1016,7 @@ public bool ValidateSoftApConfiguration(Android.Net.Wifi.SoftApConfiguration arg
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Wifi.WifiConfiguration"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int AddNetwork(Android.Net.Wifi.WifiConfiguration arg0)
         {
             return IExecuteWithSignature<int>("addNetwork", "(Landroid/net/wifi/WifiConfiguration;)I", arg0);
@@ -1110,6 +1040,46 @@ public int CalculateSignalLevel(int arg0)
             return IExecuteWithSignature<int>("calculateSignalLevel", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getMaxNumberOfChannelsPerNetworkSpecifierRequest()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxNumberOfChannelsPerNetworkSpecifierRequest()
+        {
+            return IExecuteWithSignature<int>("getMaxNumberOfChannelsPerNetworkSpecifierRequest", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getMaxNumberOfNetworkSuggestionsPerApp()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxNumberOfNetworkSuggestionsPerApp()
+        {
+            return IExecuteWithSignature<int>("getMaxNumberOfNetworkSuggestionsPerApp", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getMaxSignalLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSignalLevel()
+        {
+            return IExecuteWithSignature<int>("getMaxSignalLevel", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getStaConcurrencyForMultiInternetMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStaConcurrencyForMultiInternetMode()
+        {
+            return IExecuteWithSignature<int>("getStaConcurrencyForMultiInternetMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getWifiState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWifiState()
+        {
+            return IExecuteWithSignature<int>("getWifiState", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#removeNetworkSuggestions(java.util.List,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
@@ -1133,12 +1103,29 @@ public int RemoveNetworkSuggestions(Java.Util.List<Android.Net.Wifi.WifiNetworkS
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Wifi.WifiConfiguration"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int UpdateNetwork(Android.Net.Wifi.WifiConfiguration arg0)
         {
             return IExecuteWithSignature<int>("updateNetwork", "(Landroid/net/wifi/WifiConfiguration;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getPasspointConfigurations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Android.Net.Wifi.Hotspot2.PasspointConfiguration> GetPasspointConfigurations()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.Hotspot2.PasspointConfiguration>>("getPasspointConfigurations", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getScanResults()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.ScanResult> GetScanResults()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.ScanResult>>("getScanResults", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getAllowedChannels(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1159,6 +1146,31 @@ public int UpdateNetwork(Android.Net.Wifi.WifiConfiguration arg0)
             return IExecute<Java.Util.List<Android.Net.Wifi.WifiAvailableChannel>>("getUsableChannels", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getCallerConfiguredNetworks()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.WifiConfiguration> GetCallerConfiguredNetworks()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.WifiConfiguration>>("getCallerConfiguredNetworks", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getConfiguredNetworks()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Android.Net.Wifi.WifiConfiguration> GetConfiguredNetworks()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.WifiConfiguration>>("getConfiguredNetworks", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#getNetworkSuggestions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Wifi.WifiNetworkSuggestion> GetNetworkSuggestions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Wifi.WifiNetworkSuggestion>>("getNetworkSuggestions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#addLocalOnlyConnectionFailureListener(java.util.concurrent.Executor,android.net.wifi.WifiManager.LocalOnlyConnectionFailureListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1205,7 +1217,7 @@ public void AllowAutojoinGlobal(bool arg0)
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#cancelWps(android.net.wifi.WifiManager.WpsCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Wifi.WifiManager.WpsCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CancelWps(Android.Net.Wifi.WifiManager.WpsCallback arg0)
         {
             IExecuteWithSignature("cancelWps", "(Landroid/net/wifi/WifiManager$WpsCallback;)V", arg0);
@@ -1292,7 +1304,7 @@ public void RemoveLocalOnlyConnectionFailureListener(Android.Net.Wifi.WifiManage
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.html#removePasspointConfiguration(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemovePasspointConfiguration(Java.Lang.String arg0)
         {
             IExecuteWithSignature("removePasspointConfiguration", "(Ljava/lang/String;)V", arg0);
@@ -1378,7 +1390,7 @@ public void StartLocalOnlyHotspot(Android.Net.Wifi.WifiManager.LocalOnlyHotspotC
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Wifi.WpsInfo"/></param>
         /// <param name="arg1"><see cref="Android.Net.Wifi.WifiManager.WpsCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartWps(Android.Net.Wifi.WpsInfo arg0, Android.Net.Wifi.WifiManager.WpsCallback arg1)
         {
             IExecute("startWps", arg0, arg1);
@@ -1574,18 +1586,20 @@ public InterfaceCreationImpact(int arg0, Java.Util.Set<Java.Lang.String> arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.InterfaceCreationImpact.html#getInterfaceType()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.InterfaceCreationImpact.html#getInterfaceType()"/>
             /// </summary>
-            public int InterfaceType
+            /// <returns><see cref="int"/></returns>
+            public int GetInterfaceType()
             {
-                get { return IExecuteWithSignature<int>("getInterfaceType", "()I"); }
+                return IExecuteWithSignature<int>("getInterfaceType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.InterfaceCreationImpact.html#getPackages()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.InterfaceCreationImpact.html#getPackages()"/>
             /// </summary>
-            public Java.Util.Set<Java.Lang.String> Packages
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Java.Lang.String> GetPackages()
             {
-                get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPackages", "()Ljava/util/Set;"); }
+                return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPackages", "()Ljava/util/Set;");
             }
 
             #endregion
@@ -1623,7 +1637,7 @@ public partial class LocalOnlyConnectionFailureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onConnectionFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.WifiNetworkSpecifier>>>(OnConnectionFailedEventHandler));
+                AddEventHandler("onConnectionFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.WifiNetworkSpecifier>>>(OnConnectionFailedEventHandler));
 
             }
 
@@ -1631,7 +1645,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.LocalOnlyConnectionFailureListener.html#onConnectionFailed(android.net.wifi.WifiNetworkSpecifier,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnConnectionFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Wifi.WifiNetworkSpecifier, int> OnOnConnectionFailed { get; set; } = null;
+            public global::System.Action<Android.Net.Wifi.WifiNetworkSpecifier, int> OnOnConnectionFailed { get; set; } = null;
 
             void OnConnectionFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Wifi.WifiNetworkSpecifier>> data)
             {
@@ -1798,19 +1812,21 @@ public partial class LocalOnlyHotspotReservation
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.LocalOnlyHotspotReservation.html#getSoftApConfiguration()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.LocalOnlyHotspotReservation.html#getSoftApConfiguration()"/>
             /// </summary>
-            public Android.Net.Wifi.SoftApConfiguration SoftApConfiguration
+            /// <returns><see cref="Android.Net.Wifi.SoftApConfiguration"/></returns>
+            public Android.Net.Wifi.SoftApConfiguration GetSoftApConfiguration()
             {
-                get { return IExecuteWithSignature<Android.Net.Wifi.SoftApConfiguration>("getSoftApConfiguration", "()Landroid/net/wifi/SoftApConfiguration;"); }
+                return IExecuteWithSignature<Android.Net.Wifi.SoftApConfiguration>("getSoftApConfiguration", "()Landroid/net/wifi/SoftApConfiguration;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.LocalOnlyHotspotReservation.html#getWifiConfiguration()"/> 
+            /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.LocalOnlyHotspotReservation.html#getWifiConfiguration()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Net.Wifi.WifiConfiguration WifiConfiguration
+            /// <returns><see cref="Android.Net.Wifi.WifiConfiguration"/></returns>
+            [global::System.Obsolete()]
+            public Android.Net.Wifi.WifiConfiguration GetWifiConfiguration()
             {
-                get { return IExecuteWithSignature<Android.Net.Wifi.WifiConfiguration>("getWifiConfiguration", "()Landroid/net/wifi/WifiConfiguration;"); }
+                return IExecuteWithSignature<Android.Net.Wifi.WifiConfiguration>("getWifiConfiguration", "()Landroid/net/wifi/WifiConfiguration;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.LocalOnlyHotspotReservation.html#close()"/>
@@ -1999,7 +2015,7 @@ public partial class SuggestionConnectionStatusListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onConnectionStatus", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.WifiNetworkSuggestion>>>(OnConnectionStatusEventHandler));
+                AddEventHandler("onConnectionStatus", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Net.Wifi.WifiNetworkSuggestion>>>(OnConnectionStatusEventHandler));
 
             }
 
@@ -2007,7 +2023,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.SuggestionConnectionStatusListener.html#onConnectionStatus(android.net.wifi.WifiNetworkSuggestion,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnConnectionStatus"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Net.Wifi.WifiNetworkSuggestion, int> OnOnConnectionStatus { get; set; } = null;
+            public global::System.Action<Android.Net.Wifi.WifiNetworkSuggestion, int> OnOnConnectionStatus { get; set; } = null;
 
             void OnConnectionStatusEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Net.Wifi.WifiNetworkSuggestion>> data)
             {
@@ -2100,7 +2116,7 @@ public partial class SuggestionUserApprovalStatusListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onUserApprovalStatusChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnUserApprovalStatusChangeEventHandler));
+                AddEventHandler("onUserApprovalStatusChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnUserApprovalStatusChangeEventHandler));
 
             }
 
@@ -2108,7 +2124,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.SuggestionUserApprovalStatusListener.html#onUserApprovalStatusChange(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnUserApprovalStatusChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnUserApprovalStatusChange { get; set; } = null;
+            public global::System.Action<int> OnOnUserApprovalStatusChange { get; set; } = null;
 
             void OnUserApprovalStatusChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -2267,7 +2283,7 @@ public partial class WpsCallback
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.WpsCallback.html#onFailed(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnFailed(int arg0)
             {
                 IExecuteWithSignature("onFailed", "(I)V", arg0);
@@ -2276,7 +2292,7 @@ public void OnFailed(int arg0)
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.WpsCallback.html#onStarted(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnStarted(Java.Lang.String arg0)
             {
                 IExecuteWithSignature("onStarted", "(Ljava/lang/String;)V", arg0);
@@ -2284,7 +2300,7 @@ public void OnStarted(Java.Lang.String arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/net/wifi/WifiManager.WpsCallback.html#onSucceeded()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnSucceeded()
             {
                 IExecuteWithSignature("onSucceeded", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiNetworkSpecifier.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiNetworkSpecifier.cs
index 6f664d8ce..f016885ba 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiNetworkSpecifier.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiNetworkSpecifier.cs
@@ -56,20 +56,6 @@ public partial class WifiNetworkSpecifier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSpecifier.html#getBand()"/> 
-        /// </summary>
-        public int Band
-        {
-            get { return IExecuteWithSignature<int>("getBand", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSpecifier.html#getPreferredChannelFrequenciesMhz()"/> 
-        /// </summary>
-        public int[] PreferredChannelFrequenciesMhz
-        {
-            get { return IExecuteWithSignatureArray<int>("getPreferredChannelFrequenciesMhz", "()[I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSpecifier.html#redact()"/>
         /// </summary>
         /// <returns><see cref="Android.Net.NetworkSpecifier"/></returns>
@@ -95,6 +81,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSpecifier.html#getBand()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBand()
+        {
+            return IExecuteWithSignature<int>("getBand", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSpecifier.html#getPreferredChannelFrequenciesMhz()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetPreferredChannelFrequenciesMhz()
+        {
+            return IExecuteWithSignatureArray<int>("getPreferredChannelFrequenciesMhz", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSpecifier.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -240,7 +242,7 @@ public Android.Net.Wifi.WifiNetworkSpecifier.Builder SetWpa3Enterprise192BitMode
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Wifi.WifiEnterpriseConfig"/></param>
             /// <returns><see cref="Android.Net.Wifi.WifiNetworkSpecifier.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Wifi.WifiNetworkSpecifier.Builder SetWpa3EnterpriseConfig(Android.Net.Wifi.WifiEnterpriseConfig arg0)
             {
                 return IExecuteWithSignature<Android.Net.Wifi.WifiNetworkSpecifier.Builder>("setWpa3EnterpriseConfig", "(Landroid/net/wifi/WifiEnterpriseConfig;)Landroid/net/wifi/WifiNetworkSpecifier$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiNetworkSuggestion.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiNetworkSuggestion.cs
index 7aea8f95a..b38c72d37 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiNetworkSuggestion.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiNetworkSuggestion.cs
@@ -64,81 +64,44 @@ public partial class WifiNetworkSuggestion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getBssid()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getBssid()"/>
         /// </summary>
-        public Android.Net.MacAddress Bssid
+        /// <returns><see cref="Android.Net.MacAddress"/></returns>
+        public Android.Net.MacAddress GetBssid()
         {
-            get { return IExecuteWithSignature<Android.Net.MacAddress>("getBssid", "()Landroid/net/MacAddress;"); }
+            return IExecuteWithSignature<Android.Net.MacAddress>("getBssid", "()Landroid/net/MacAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getEnterpriseConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getPasspointConfig()"/>
         /// </summary>
-        public Android.Net.Wifi.WifiEnterpriseConfig EnterpriseConfig
+        /// <returns><see cref="Android.Net.Wifi.Hotspot2.PasspointConfiguration"/></returns>
+        public Android.Net.Wifi.Hotspot2.PasspointConfiguration GetPasspointConfig()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.WifiEnterpriseConfig>("getEnterpriseConfig", "()Landroid/net/wifi/WifiEnterpriseConfig;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.PasspointConfiguration>("getPasspointConfig", "()Landroid/net/wifi/hotspot2/PasspointConfiguration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getMacRandomizationSetting()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getEnterpriseConfig()"/>
         /// </summary>
-        public int MacRandomizationSetting
+        /// <returns><see cref="Android.Net.Wifi.WifiEnterpriseConfig"/></returns>
+        public Android.Net.Wifi.WifiEnterpriseConfig GetEnterpriseConfig()
         {
-            get { return IExecuteWithSignature<int>("getMacRandomizationSetting", "()I"); }
+            return IExecuteWithSignature<Android.Net.Wifi.WifiEnterpriseConfig>("getEnterpriseConfig", "()Landroid/net/wifi/WifiEnterpriseConfig;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getPassphrase()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getWifiSsid()"/>
         /// </summary>
-        public Java.Lang.String Passphrase
+        /// <returns><see cref="Android.Net.Wifi.WifiSsid"/></returns>
+        public Android.Net.Wifi.WifiSsid GetWifiSsid()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassphrase", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Wifi.WifiSsid>("getWifiSsid", "()Landroid/net/wifi/WifiSsid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getPasspointConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getSubscriptionGroup()"/>
         /// </summary>
-        public Android.Net.Wifi.Hotspot2.PasspointConfiguration PasspointConfig
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetSubscriptionGroup()
         {
-            get { return IExecuteWithSignature<Android.Net.Wifi.Hotspot2.PasspointConfiguration>("getPasspointConfig", "()Landroid/net/wifi/hotspot2/PasspointConfiguration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getPriority()"/> 
-        /// </summary>
-        public int Priority
-        {
-            get { return IExecuteWithSignature<int>("getPriority", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getPriorityGroup()"/> 
-        /// </summary>
-        public int PriorityGroup
-        {
-            get { return IExecuteWithSignature<int>("getPriorityGroup", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getSsid()"/> 
-        /// </summary>
-        public Java.Lang.String Ssid
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSsid", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getSubscriptionGroup()"/> 
-        /// </summary>
-        public Android.Os.ParcelUuid SubscriptionGroup
-        {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getSubscriptionGroup", "()Landroid/os/ParcelUuid;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getSubscriptionId()"/> 
-        /// </summary>
-        public int SubscriptionId
-        {
-            get { return IExecuteWithSignature<int>("getSubscriptionId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getWifiSsid()"/> 
-        /// </summary>
-        public Android.Net.Wifi.WifiSsid WifiSsid
-        {
-            get { return IExecuteWithSignature<Android.Net.Wifi.WifiSsid>("getWifiSsid", "()Landroid/net/wifi/WifiSsid;"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getSubscriptionGroup", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#isAppInteractionRequired()"/>
@@ -229,6 +192,54 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getMacRandomizationSetting()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMacRandomizationSetting()
+        {
+            return IExecuteWithSignature<int>("getMacRandomizationSetting", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getPriority()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPriority()
+        {
+            return IExecuteWithSignature<int>("getPriority", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getPriorityGroup()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityGroup()
+        {
+            return IExecuteWithSignature<int>("getPriorityGroup", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getSubscriptionId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSubscriptionId()
+        {
+            return IExecuteWithSignature<int>("getSubscriptionId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getPassphrase()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPassphrase()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPassphrase", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#getSsid()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSsid()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSsid", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiNetworkSuggestion.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -499,7 +510,7 @@ public Android.Net.Wifi.WifiNetworkSuggestion.Builder SetWpa3Enterprise192BitMod
             /// </summary>
             /// <param name="arg0"><see cref="Android.Net.Wifi.WifiEnterpriseConfig"/></param>
             /// <returns><see cref="Android.Net.Wifi.WifiNetworkSuggestion.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Wifi.WifiNetworkSuggestion.Builder SetWpa3EnterpriseConfig(Android.Net.Wifi.WifiEnterpriseConfig arg0)
             {
                 return IExecuteWithSignature<Android.Net.Wifi.WifiNetworkSuggestion.Builder>("setWpa3EnterpriseConfig", "(Landroid/net/wifi/WifiEnterpriseConfig;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiSsid.cs b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiSsid.cs
index 728d5f10a..04ad49770 100644
--- a/src/net/Netdroid/Generated/Android/Net/Wifi/WifiSsid.cs
+++ b/src/net/Netdroid/Generated/Android/Net/Wifi/WifiSsid.cs
@@ -61,11 +61,12 @@ public static Android.Net.Wifi.WifiSsid FromBytes(byte[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiSsid.html#getBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/net/wifi/WifiSsid.html#getBytes()"/>
         /// </summary>
-        public byte[] Bytes
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetBytes()
         {
-            get { return IExecuteWithSignatureArray<byte>("getBytes", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getBytes", "()[B");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/net/wifi/WifiSsid.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Nfc/AllPackageClasses.cs
index dc9f59f26..f2161b3b1 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/AllPackageClasses.cs
@@ -179,33 +179,59 @@ public NdefRecord(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html"/>
     /// </summary>
-    public partial class NfcAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class NfcAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NfcAdapter>
     {
+        const string _bridgeClassName = "android.nfc.NfcAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public NfcAdapter() { InitializeHandlers(); }
+        public NfcAdapter() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public NfcAdapter(params object[] args) : base(args) { }
 
-    #warning Remember to build the Java class for event listener
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
 
         // TODO: complete the class
         #region CreateBeamUrisCallback
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.CreateBeamUrisCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class CreateBeamUrisCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CreateBeamUrisCallback>
         {
             const string _bridgeClassName = "android.nfc.NfcAdapter$CreateBeamUrisCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CreateBeamUrisCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CreateBeamUrisCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CreateBeamUrisCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CreateBeamUrisCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CreateBeamUrisCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CreateBeamUrisCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -240,19 +266,19 @@ public CreateBeamUrisCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.CreateNdefMessageCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class CreateNdefMessageCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CreateNdefMessageCallback>
         {
             const string _bridgeClassName = "android.nfc.NfcAdapter$CreateNdefMessageCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CreateNdefMessageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CreateNdefMessageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CreateNdefMessageCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CreateNdefMessageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CreateNdefMessageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CreateNdefMessageCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -287,19 +313,19 @@ public CreateNdefMessageCallback(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.OnNdefPushCompleteCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnNdefPushCompleteCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnNdefPushCompleteCallback>
         {
             const string _bridgeClassName = "android.nfc.NfcAdapter$OnNdefPushCompleteCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OnNdefPushCompleteCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnNdefPushCompleteCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnNdefPushCompleteCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OnNdefPushCompleteCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnNdefPushCompleteCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnNdefPushCompleteCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -341,10 +367,13 @@ public partial class OnTagRemovedListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnTagRemovedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.nfc.NfcAdapter_OnTagRemovedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.nfc.OnTagRemovedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -366,10 +395,13 @@ public partial class OnTagRemovedListenerDirect : OnTagRemovedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.nfc.NfcAdapter$OnTagRemovedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.nfc.NfcAdapter$OnTagRemovedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -399,12 +431,12 @@ public partial class ReaderCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Re
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ReaderCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ReaderCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ReaderCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ReaderCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ReaderCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ReaderCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -439,43 +471,6 @@ public ReaderCallback(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region NfcAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="NfcAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class NfcAdapterDirect : NfcAdapter
-    {
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
-        /// </summary>
-        public override bool AutoInit => false;
-
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => "android.nfc.NfcAdapter";
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-    }
-    #endregion
-
     #region NfcAntennaInfo
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/AvailableNfcAntenna.cs b/src/net/Netdroid/Generated/Android/Nfc/AvailableNfcAntenna.cs
index d6a772384..085fb4652 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/AvailableNfcAntenna.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/AvailableNfcAntenna.cs
@@ -61,26 +61,28 @@ public AvailableNfcAntenna(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/AvailableNfcAntenna.html#getLocationX()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/AvailableNfcAntenna.html#describeContents()"/>
         /// </summary>
-        public int LocationX
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getLocationX", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/AvailableNfcAntenna.html#getLocationY()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/AvailableNfcAntenna.html#getLocationX()"/>
         /// </summary>
-        public int LocationY
+        /// <returns><see cref="int"/></returns>
+        public int GetLocationX()
         {
-            get { return IExecuteWithSignature<int>("getLocationY", "()I"); }
+            return IExecuteWithSignature<int>("getLocationX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/AvailableNfcAntenna.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/AvailableNfcAntenna.html#getLocationY()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetLocationY()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getLocationY", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/AvailableNfcAntenna.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Cardemulation/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Nfc/Cardemulation/AllPackageClasses.cs
index ced9d8ab5..42d27432a 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Cardemulation/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Cardemulation/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class HostApduService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HostApduService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HostApduService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HostApduService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HostApduService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HostApduService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HostApduService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -126,12 +126,12 @@ public partial class HostNfcFService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HostNfcFService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HostNfcFService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HostNfcFService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HostNfcFService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HostNfcFService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HostNfcFService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -216,12 +216,12 @@ public partial class OffHostApduService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OffHostApduService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OffHostApduService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OffHostApduService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OffHostApduService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OffHostApduService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OffHostApduService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Cardemulation/CardEmulation.cs b/src/net/Netdroid/Generated/Android/Nfc/Cardemulation/CardEmulation.cs
index c6ece248c..e7e785e0f 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Cardemulation/CardEmulation.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Cardemulation/CardEmulation.cs
@@ -103,27 +103,6 @@ public static Android.Nfc.Cardemulation.CardEmulation GetInstance(Android.Nfc.Nf
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/cardemulation/CardEmulation.html#getAidsForPreferredPaymentService()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> AidsForPreferredPaymentService
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAidsForPreferredPaymentService", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/cardemulation/CardEmulation.html#getDescriptionForPreferredPaymentService()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence DescriptionForPreferredPaymentService
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescriptionForPreferredPaymentService", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/cardemulation/CardEmulation.html#getRouteDestinationForPreferredPaymentService()"/> 
-        /// </summary>
-        public Java.Lang.String RouteDestinationForPreferredPaymentService
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRouteDestinationForPreferredPaymentService", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/cardemulation/CardEmulation.html#categoryAllowsForegroundPreference(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -229,6 +208,30 @@ public int GetSelectionModeForCategory(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getSelectionModeForCategory", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/cardemulation/CardEmulation.html#getDescriptionForPreferredPaymentService()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescriptionForPreferredPaymentService()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescriptionForPreferredPaymentService", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/cardemulation/CardEmulation.html#getRouteDestinationForPreferredPaymentService()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRouteDestinationForPreferredPaymentService()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getRouteDestinationForPreferredPaymentService", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/cardemulation/CardEmulation.html#getAidsForPreferredPaymentService()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetAidsForPreferredPaymentService()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAidsForPreferredPaymentService", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/cardemulation/CardEmulation.html#getAidsForService(android.content.ComponentName,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/NdefMessage.cs b/src/net/Netdroid/Generated/Android/Nfc/NdefMessage.cs
index b74aa8a33..dcf2ed089 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/NdefMessage.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/NdefMessage.cs
@@ -78,18 +78,12 @@ public NdefMessage(byte[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NdefMessage.html#getByteArrayLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NdefMessage.html#getRecords()"/>
         /// </summary>
-        public int ByteArrayLength
+        /// <returns><see cref="Android.Nfc.NdefRecord"/></returns>
+        public Android.Nfc.NdefRecord[] GetRecords()
         {
-            get { return IExecuteWithSignature<int>("getByteArrayLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NdefMessage.html#getRecords()"/> 
-        /// </summary>
-        public Android.Nfc.NdefRecord[] Records
-        {
-            get { return IExecuteWithSignatureArray<Android.Nfc.NdefRecord>("getRecords", "()[Landroid/nfc/NdefRecord;"); }
+            return IExecuteWithSignatureArray<Android.Nfc.NdefRecord>("getRecords", "()[Landroid/nfc/NdefRecord;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NdefMessage.html#toByteArray()"/>
@@ -108,6 +102,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NdefMessage.html#getByteArrayLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetByteArrayLength()
+        {
+            return IExecuteWithSignature<int>("getByteArrayLength", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NdefMessage.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/NdefRecord.cs b/src/net/Netdroid/Generated/Android/Nfc/NdefRecord.cs
index 9556cb6a8..1ecd9421b 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/NdefRecord.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/NdefRecord.cs
@@ -34,7 +34,7 @@ public partial class NdefRecord
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Android.Nfc.FormatException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public NdefRecord(byte[] arg0)
             : base(arg0)
         {
@@ -215,46 +215,42 @@ public static Android.Nfc.NdefRecord CreateUri(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#toUri()"/>
         /// </summary>
-        public byte[] Id
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri ToUri()
         {
-            get { return IExecuteWithSignatureArray<byte>("getId", "()[B"); }
+            return IExecuteWithSignature<Android.Net.Uri>("toUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#getPayload()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#getId()"/>
         /// </summary>
-        public byte[] Payload
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetId()
         {
-            get { return IExecuteWithSignatureArray<byte>("getPayload", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getId", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#getTnf()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#getPayload()"/>
         /// </summary>
-        public short Tnf
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetPayload()
         {
-            get { return IExecuteWithSignature<short>("getTnf", "()S"); }
+            return IExecuteWithSignatureArray<byte>("getPayload", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#getType()"/>
         /// </summary>
-        public byte[] Type
-        {
-            get { return IExecuteWithSignatureArray<byte>("getType", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#toUri()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Net.Uri"/></returns>
-        public Android.Net.Uri ToUri()
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetType()
         {
-            return IExecuteWithSignature<Android.Net.Uri>("toUri", "()Landroid/net/Uri;");
+            return IExecuteWithSignatureArray<byte>("getType", "()[B");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#toByteArray()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte[] ToByteArray()
         {
             return IExecuteWithSignatureArray<byte>("toByteArray", "()[B");
@@ -276,6 +272,14 @@ public Java.Lang.String ToMimeType()
             return IExecuteWithSignature<Java.Lang.String>("toMimeType", "()Ljava/lang/String;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#getTnf()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        public short GetTnf()
+        {
+            return IExecuteWithSignature<short>("getTnf", "()S");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NdefRecord.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/NfcAdapter.cs b/src/net/Netdroid/Generated/Android/Nfc/NfcAdapter.cs
index 11d1aaa1e..6b3a382da 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/NfcAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/NfcAdapter.cs
@@ -37,89 +37,205 @@ public partial class NfcAdapter
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#getDefaultAdapter(android.content.Context)"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#FLAG_READER_NFC_A"/>
+        /// </summary>
+        public static int FLAG_READER_NFC_A { get { if (!_FLAG_READER_NFC_AReady) { _FLAG_READER_NFC_AContent = SGetField<int>(LocalBridgeClazz, "FLAG_READER_NFC_A"); _FLAG_READER_NFC_AReady = true; } return _FLAG_READER_NFC_AContent; } }
+        private static int _FLAG_READER_NFC_AContent = default;
+        private static bool _FLAG_READER_NFC_AReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#FLAG_READER_NFC_B"/>
+        /// </summary>
+        public static int FLAG_READER_NFC_B { get { if (!_FLAG_READER_NFC_BReady) { _FLAG_READER_NFC_BContent = SGetField<int>(LocalBridgeClazz, "FLAG_READER_NFC_B"); _FLAG_READER_NFC_BReady = true; } return _FLAG_READER_NFC_BContent; } }
+        private static int _FLAG_READER_NFC_BContent = default;
+        private static bool _FLAG_READER_NFC_BReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#FLAG_READER_NFC_BARCODE"/>
+        /// </summary>
+        public static int FLAG_READER_NFC_BARCODE { get { if (!_FLAG_READER_NFC_BARCODEReady) { _FLAG_READER_NFC_BARCODEContent = SGetField<int>(LocalBridgeClazz, "FLAG_READER_NFC_BARCODE"); _FLAG_READER_NFC_BARCODEReady = true; } return _FLAG_READER_NFC_BARCODEContent; } }
+        private static int _FLAG_READER_NFC_BARCODEContent = default;
+        private static bool _FLAG_READER_NFC_BARCODEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#FLAG_READER_NFC_F"/>
+        /// </summary>
+        public static int FLAG_READER_NFC_F { get { if (!_FLAG_READER_NFC_FReady) { _FLAG_READER_NFC_FContent = SGetField<int>(LocalBridgeClazz, "FLAG_READER_NFC_F"); _FLAG_READER_NFC_FReady = true; } return _FLAG_READER_NFC_FContent; } }
+        private static int _FLAG_READER_NFC_FContent = default;
+        private static bool _FLAG_READER_NFC_FReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#FLAG_READER_NFC_V"/>
+        /// </summary>
+        public static int FLAG_READER_NFC_V { get { if (!_FLAG_READER_NFC_VReady) { _FLAG_READER_NFC_VContent = SGetField<int>(LocalBridgeClazz, "FLAG_READER_NFC_V"); _FLAG_READER_NFC_VReady = true; } return _FLAG_READER_NFC_VContent; } }
+        private static int _FLAG_READER_NFC_VContent = default;
+        private static bool _FLAG_READER_NFC_VReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#FLAG_READER_NO_PLATFORM_SOUNDS"/>
+        /// </summary>
+        public static int FLAG_READER_NO_PLATFORM_SOUNDS { get { if (!_FLAG_READER_NO_PLATFORM_SOUNDSReady) { _FLAG_READER_NO_PLATFORM_SOUNDSContent = SGetField<int>(LocalBridgeClazz, "FLAG_READER_NO_PLATFORM_SOUNDS"); _FLAG_READER_NO_PLATFORM_SOUNDSReady = true; } return _FLAG_READER_NO_PLATFORM_SOUNDSContent; } }
+        private static int _FLAG_READER_NO_PLATFORM_SOUNDSContent = default;
+        private static bool _FLAG_READER_NO_PLATFORM_SOUNDSReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#FLAG_READER_SKIP_NDEF_CHECK"/>
+        /// </summary>
+        public static int FLAG_READER_SKIP_NDEF_CHECK { get { if (!_FLAG_READER_SKIP_NDEF_CHECKReady) { _FLAG_READER_SKIP_NDEF_CHECKContent = SGetField<int>(LocalBridgeClazz, "FLAG_READER_SKIP_NDEF_CHECK"); _FLAG_READER_SKIP_NDEF_CHECKReady = true; } return _FLAG_READER_SKIP_NDEF_CHECKContent; } }
+        private static int _FLAG_READER_SKIP_NDEF_CHECKContent = default;
+        private static bool _FLAG_READER_SKIP_NDEF_CHECKReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#PREFERRED_PAYMENT_CHANGED"/>
+        /// </summary>
+        public static int PREFERRED_PAYMENT_CHANGED { get { if (!_PREFERRED_PAYMENT_CHANGEDReady) { _PREFERRED_PAYMENT_CHANGEDContent = SGetField<int>(LocalBridgeClazz, "PREFERRED_PAYMENT_CHANGED"); _PREFERRED_PAYMENT_CHANGEDReady = true; } return _PREFERRED_PAYMENT_CHANGEDContent; } }
+        private static int _PREFERRED_PAYMENT_CHANGEDContent = default;
+        private static bool _PREFERRED_PAYMENT_CHANGEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#PREFERRED_PAYMENT_LOADED"/>
+        /// </summary>
+        public static int PREFERRED_PAYMENT_LOADED { get { if (!_PREFERRED_PAYMENT_LOADEDReady) { _PREFERRED_PAYMENT_LOADEDContent = SGetField<int>(LocalBridgeClazz, "PREFERRED_PAYMENT_LOADED"); _PREFERRED_PAYMENT_LOADEDReady = true; } return _PREFERRED_PAYMENT_LOADEDContent; } }
+        private static int _PREFERRED_PAYMENT_LOADEDContent = default;
+        private static bool _PREFERRED_PAYMENT_LOADEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#PREFERRED_PAYMENT_UPDATED"/>
+        /// </summary>
+        public static int PREFERRED_PAYMENT_UPDATED { get { if (!_PREFERRED_PAYMENT_UPDATEDReady) { _PREFERRED_PAYMENT_UPDATEDContent = SGetField<int>(LocalBridgeClazz, "PREFERRED_PAYMENT_UPDATED"); _PREFERRED_PAYMENT_UPDATEDReady = true; } return _PREFERRED_PAYMENT_UPDATEDContent; } }
+        private static int _PREFERRED_PAYMENT_UPDATEDContent = default;
+        private static bool _PREFERRED_PAYMENT_UPDATEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#STATE_OFF"/>
+        /// </summary>
+        public static int STATE_OFF { get { if (!_STATE_OFFReady) { _STATE_OFFContent = SGetField<int>(LocalBridgeClazz, "STATE_OFF"); _STATE_OFFReady = true; } return _STATE_OFFContent; } }
+        private static int _STATE_OFFContent = default;
+        private static bool _STATE_OFFReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#STATE_ON"/>
+        /// </summary>
+        public static int STATE_ON { get { if (!_STATE_ONReady) { _STATE_ONContent = SGetField<int>(LocalBridgeClazz, "STATE_ON"); _STATE_ONReady = true; } return _STATE_ONContent; } }
+        private static int _STATE_ONContent = default;
+        private static bool _STATE_ONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#STATE_TURNING_OFF"/>
+        /// </summary>
+        public static int STATE_TURNING_OFF { get { if (!_STATE_TURNING_OFFReady) { _STATE_TURNING_OFFContent = SGetField<int>(LocalBridgeClazz, "STATE_TURNING_OFF"); _STATE_TURNING_OFFReady = true; } return _STATE_TURNING_OFFContent; } }
+        private static int _STATE_TURNING_OFFContent = default;
+        private static bool _STATE_TURNING_OFFReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#STATE_TURNING_ON"/>
+        /// </summary>
+        public static int STATE_TURNING_ON { get { if (!_STATE_TURNING_ONReady) { _STATE_TURNING_ONContent = SGetField<int>(LocalBridgeClazz, "STATE_TURNING_ON"); _STATE_TURNING_ONReady = true; } return _STATE_TURNING_ONContent; } }
+        private static int _STATE_TURNING_ONContent = default;
+        private static bool _STATE_TURNING_ONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_ADAPTER_STATE_CHANGED"/>
+        /// </summary>
+        public static Java.Lang.String ACTION_ADAPTER_STATE_CHANGED { get { if (!_ACTION_ADAPTER_STATE_CHANGEDReady) { _ACTION_ADAPTER_STATE_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_ADAPTER_STATE_CHANGED"); _ACTION_ADAPTER_STATE_CHANGEDReady = true; } return _ACTION_ADAPTER_STATE_CHANGEDContent; } }
+        private static Java.Lang.String _ACTION_ADAPTER_STATE_CHANGEDContent = default;
+        private static bool _ACTION_ADAPTER_STATE_CHANGEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_NDEF_DISCOVERED"/>
+        /// </summary>
+        public static Java.Lang.String ACTION_NDEF_DISCOVERED { get { if (!_ACTION_NDEF_DISCOVEREDReady) { _ACTION_NDEF_DISCOVEREDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_NDEF_DISCOVERED"); _ACTION_NDEF_DISCOVEREDReady = true; } return _ACTION_NDEF_DISCOVEREDContent; } }
+        private static Java.Lang.String _ACTION_NDEF_DISCOVEREDContent = default;
+        private static bool _ACTION_NDEF_DISCOVEREDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_PREFERRED_PAYMENT_CHANGED"/>
+        /// </summary>
+        public static Java.Lang.String ACTION_PREFERRED_PAYMENT_CHANGED { get { if (!_ACTION_PREFERRED_PAYMENT_CHANGEDReady) { _ACTION_PREFERRED_PAYMENT_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_PREFERRED_PAYMENT_CHANGED"); _ACTION_PREFERRED_PAYMENT_CHANGEDReady = true; } return _ACTION_PREFERRED_PAYMENT_CHANGEDContent; } }
+        private static Java.Lang.String _ACTION_PREFERRED_PAYMENT_CHANGEDContent = default;
+        private static bool _ACTION_PREFERRED_PAYMENT_CHANGEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_TAG_DISCOVERED"/>
+        /// </summary>
+        public static Java.Lang.String ACTION_TAG_DISCOVERED { get { if (!_ACTION_TAG_DISCOVEREDReady) { _ACTION_TAG_DISCOVEREDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_TAG_DISCOVERED"); _ACTION_TAG_DISCOVEREDReady = true; } return _ACTION_TAG_DISCOVEREDContent; } }
+        private static Java.Lang.String _ACTION_TAG_DISCOVEREDContent = default;
+        private static bool _ACTION_TAG_DISCOVEREDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_TECH_DISCOVERED"/>
+        /// </summary>
+        public static Java.Lang.String ACTION_TECH_DISCOVERED { get { if (!_ACTION_TECH_DISCOVEREDReady) { _ACTION_TECH_DISCOVEREDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_TECH_DISCOVERED"); _ACTION_TECH_DISCOVEREDReady = true; } return _ACTION_TECH_DISCOVEREDContent; } }
+        private static Java.Lang.String _ACTION_TECH_DISCOVEREDContent = default;
+        private static bool _ACTION_TECH_DISCOVEREDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ACTION_TRANSACTION_DETECTED"/>
+        /// </summary>
+        public static Java.Lang.String ACTION_TRANSACTION_DETECTED { get { if (!_ACTION_TRANSACTION_DETECTEDReady) { _ACTION_TRANSACTION_DETECTEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_TRANSACTION_DETECTED"); _ACTION_TRANSACTION_DETECTEDReady = true; } return _ACTION_TRANSACTION_DETECTEDContent; } }
+        private static Java.Lang.String _ACTION_TRANSACTION_DETECTEDContent = default;
+        private static bool _ACTION_TRANSACTION_DETECTEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_ADAPTER_STATE"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_ADAPTER_STATE { get { if (!_EXTRA_ADAPTER_STATEReady) { _EXTRA_ADAPTER_STATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_ADAPTER_STATE"); _EXTRA_ADAPTER_STATEReady = true; } return _EXTRA_ADAPTER_STATEContent; } }
+        private static Java.Lang.String _EXTRA_ADAPTER_STATEContent = default;
+        private static bool _EXTRA_ADAPTER_STATEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_AID"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_AID { get { if (!_EXTRA_AIDReady) { _EXTRA_AIDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_AID"); _EXTRA_AIDReady = true; } return _EXTRA_AIDContent; } }
+        private static Java.Lang.String _EXTRA_AIDContent = default;
+        private static bool _EXTRA_AIDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_DATA"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_DATA { get { if (!_EXTRA_DATAReady) { _EXTRA_DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_DATA"); _EXTRA_DATAReady = true; } return _EXTRA_DATAContent; } }
+        private static Java.Lang.String _EXTRA_DATAContent = default;
+        private static bool _EXTRA_DATAReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_ID"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_ID { get { if (!_EXTRA_IDReady) { _EXTRA_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_ID"); _EXTRA_IDReady = true; } return _EXTRA_IDContent; } }
+        private static Java.Lang.String _EXTRA_IDContent = default;
+        private static bool _EXTRA_IDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_NDEF_MESSAGES"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_NDEF_MESSAGES { get { if (!_EXTRA_NDEF_MESSAGESReady) { _EXTRA_NDEF_MESSAGESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_NDEF_MESSAGES"); _EXTRA_NDEF_MESSAGESReady = true; } return _EXTRA_NDEF_MESSAGESContent; } }
+        private static Java.Lang.String _EXTRA_NDEF_MESSAGESContent = default;
+        private static bool _EXTRA_NDEF_MESSAGESReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_PREFERRED_PAYMENT_CHANGED_REASON"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_PREFERRED_PAYMENT_CHANGED_REASON { get { if (!_EXTRA_PREFERRED_PAYMENT_CHANGED_REASONReady) { _EXTRA_PREFERRED_PAYMENT_CHANGED_REASONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PREFERRED_PAYMENT_CHANGED_REASON"); _EXTRA_PREFERRED_PAYMENT_CHANGED_REASONReady = true; } return _EXTRA_PREFERRED_PAYMENT_CHANGED_REASONContent; } }
+        private static Java.Lang.String _EXTRA_PREFERRED_PAYMENT_CHANGED_REASONContent = default;
+        private static bool _EXTRA_PREFERRED_PAYMENT_CHANGED_REASONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_READER_PRESENCE_CHECK_DELAY"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_READER_PRESENCE_CHECK_DELAY { get { if (!_EXTRA_READER_PRESENCE_CHECK_DELAYReady) { _EXTRA_READER_PRESENCE_CHECK_DELAYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_READER_PRESENCE_CHECK_DELAY"); _EXTRA_READER_PRESENCE_CHECK_DELAYReady = true; } return _EXTRA_READER_PRESENCE_CHECK_DELAYContent; } }
+        private static Java.Lang.String _EXTRA_READER_PRESENCE_CHECK_DELAYContent = default;
+        private static bool _EXTRA_READER_PRESENCE_CHECK_DELAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_SECURE_ELEMENT_NAME"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_SECURE_ELEMENT_NAME { get { if (!_EXTRA_SECURE_ELEMENT_NAMEReady) { _EXTRA_SECURE_ELEMENT_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SECURE_ELEMENT_NAME"); _EXTRA_SECURE_ELEMENT_NAMEReady = true; } return _EXTRA_SECURE_ELEMENT_NAMEContent; } }
+        private static Java.Lang.String _EXTRA_SECURE_ELEMENT_NAMEContent = default;
+        private static bool _EXTRA_SECURE_ELEMENT_NAMEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#EXTRA_TAG"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetDefaultAdapter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context, Android.Nfc.NfcAdapter> OnGetDefaultAdapter { get; set; } = null;
+        public static Java.Lang.String EXTRA_TAG { get { if (!_EXTRA_TAGReady) { _EXTRA_TAGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_TAG"); _EXTRA_TAGReady = true; } return _EXTRA_TAGContent; } }
+        private static Java.Lang.String _EXTRA_TAGContent = default;
+        private static bool _EXTRA_TAGReady = false; // this is used because in case of generics 
 
-        void GetDefaultAdapterEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Context>> data)
-        {
-            var methodToExecute = (OnGetDefaultAdapter != null) ? OnGetDefaultAdapter : GetDefaultAdapter;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
+        #region Static methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#getDefaultAdapter(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Android.Nfc.NfcAdapter"/></returns>
-        public virtual Android.Nfc.NfcAdapter GetDefaultAdapter(Android.Content.Context arg0)
+        public static Android.Nfc.NfcAdapter GetDefaultAdapter(Android.Content.Context arg0)
         {
-            return default;
+            return SExecuteWithSignature<Android.Nfc.NfcAdapter>(LocalBridgeClazz, "getDefaultAdapter", "(Landroid/content/Context;)Landroid/nfc/NfcAdapter;", arg0);
         }
 
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="NfcAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("getNfcAntennaInfo", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetNfcAntennaInfoEventHandler));
-            AddEventHandler("ignore", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Nfc.Tag>>>(IgnoreEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEnabledEventHandler));
-            AddEventHandler("isSecureNfcEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsSecureNfcEnabledEventHandler));
-            AddEventHandler("isSecureNfcSupported", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsSecureNfcSupportedEventHandler));
-            AddEventHandler("disableForegroundDispatch", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.Activity>>>(DisableForegroundDispatchEventHandler));
-            AddEventHandler("disableReaderMode", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.Activity>>>(DisableReaderModeEventHandler));
-            AddEventHandler("enableForegroundDispatch", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.Activity>>>(EnableForegroundDispatchEventHandler));
-            AddEventHandler("enableReaderMode", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.App.Activity>>>(EnableReaderModeEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#getNfcAntennaInfo()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetNfcAntennaInfo"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Nfc.NfcAntennaInfo> OnGetNfcAntennaInfo { get; set; } = null;
-
-        void GetNfcAntennaInfoEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetNfcAntennaInfo != null) ? OnGetNfcAntennaInfo : GetNfcAntennaInfo;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#getNfcAntennaInfo()"/>
         /// </summary>
         /// <returns><see cref="Android.Nfc.NfcAntennaInfo"/></returns>
-        public virtual Android.Nfc.NfcAntennaInfo GetNfcAntennaInfo()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ignore(android.nfc.Tag,int,android.nfc.NfcAdapter.OnTagRemovedListener,android.os.Handler)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIgnore"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Nfc.Tag, int, Android.Nfc.NfcAdapter.OnTagRemovedListener, Android.Os.Handler, bool> OnIgnore { get; set; } = null;
-
-        void IgnoreEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Nfc.Tag>> data)
+        public Android.Nfc.NfcAntennaInfo GetNfcAntennaInfo()
         {
-            var methodToExecute = (OnIgnore != null) ? OnIgnore : Ignore;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.Nfc.NfcAdapter.OnTagRemovedListener>(1), data.EventData.GetAt<Android.Os.Handler>(2));
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<Android.Nfc.NfcAntennaInfo>("getNfcAntennaInfo", "()Landroid/nfc/NfcAntennaInfo;");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ignore(android.nfc.Tag,int,android.nfc.NfcAdapter.OnTagRemovedListener,android.os.Handler)"/>
         /// </summary>
@@ -128,131 +244,50 @@ void IgnoreEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android
         /// <param name="arg2"><see cref="Android.Nfc.NfcAdapter.OnTagRemovedListener"/></param>
         /// <param name="arg3"><see cref="Android.Os.Handler"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool Ignore(Android.Nfc.Tag arg0, int arg1, Android.Nfc.NfcAdapter.OnTagRemovedListener arg2, Android.Os.Handler arg3)
+        public bool Ignore(Android.Nfc.Tag arg0, int arg1, Android.Nfc.NfcAdapter.OnTagRemovedListener arg2, Android.Os.Handler arg3)
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEnabled { get; set; } = null;
-
-        void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEnabled != null) ? OnIsEnabled : IsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecute<bool>("ignore", arg0, arg1, arg2, arg3);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEnabled()
+        public bool IsEnabled()
         {
-            return default;
+            return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isSecureNfcEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSecureNfcEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsSecureNfcEnabled { get; set; } = null;
-
-        void IsSecureNfcEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsSecureNfcEnabled != null) ? OnIsSecureNfcEnabled : IsSecureNfcEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isSecureNfcEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSecureNfcEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isSecureNfcSupported()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSecureNfcSupported"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsSecureNfcSupported { get; set; } = null;
-
-        void IsSecureNfcSupportedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        public bool IsSecureNfcEnabled()
         {
-            var methodToExecute = (OnIsSecureNfcSupported != null) ? OnIsSecureNfcSupported : IsSecureNfcSupported;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<bool>("isSecureNfcEnabled", "()Z");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isSecureNfcSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSecureNfcSupported()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#disableForegroundDispatch(android.app.Activity)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnDisableForegroundDispatch"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.App.Activity> OnDisableForegroundDispatch { get; set; } = null;
-
-        void DisableForegroundDispatchEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.Activity>> data)
+        public bool IsSecureNfcSupported()
         {
-            var methodToExecute = (OnDisableForegroundDispatch != null) ? OnDisableForegroundDispatch : DisableForegroundDispatch;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
+            return IExecuteWithSignature<bool>("isSecureNfcSupported", "()Z");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#disableForegroundDispatch(android.app.Activity)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        public virtual void DisableForegroundDispatch(Android.App.Activity arg0)
+        public void DisableForegroundDispatch(Android.App.Activity arg0)
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#disableReaderMode(android.app.Activity)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnDisableReaderMode"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.App.Activity> OnDisableReaderMode { get; set; } = null;
-
-        void DisableReaderModeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.Activity>> data)
-        {
-            var methodToExecute = (OnDisableReaderMode != null) ? OnDisableReaderMode : DisableReaderMode;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
+            IExecuteWithSignature("disableForegroundDispatch", "(Landroid/app/Activity;)V", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#disableReaderMode(android.app.Activity)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        public virtual void DisableReaderMode(Android.App.Activity arg0)
+        public void DisableReaderMode(Android.App.Activity arg0)
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#enableForegroundDispatch(android.app.Activity,android.app.PendingIntent,android.content.IntentFilter[],java.lang.String[][])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnEnableForegroundDispatch"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.App.Activity, Android.App.PendingIntent, Android.Content.IntentFilter[], Java.Lang.String[][]> OnEnableForegroundDispatch { get; set; } = null;
-
-        void EnableForegroundDispatchEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.Activity>> data)
-        {
-            var methodToExecute = (OnEnableForegroundDispatch != null) ? OnEnableForegroundDispatch : EnableForegroundDispatch;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.App.PendingIntent>(0), data.EventData.GetAt<Android.Content.IntentFilter[]>(1), data.EventData.GetAt<Java.Lang.String[][]>(2));
+            IExecuteWithSignature("disableReaderMode", "(Landroid/app/Activity;)V", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#enableForegroundDispatch(android.app.Activity,android.app.PendingIntent,android.content.IntentFilter[],java.lang.String[][])"/>
         /// </summary>
@@ -260,23 +295,10 @@ void EnableForegroundDispatchEventHandler(object sender, CLRListenerEventArgs<CL
         /// <param name="arg1"><see cref="Android.App.PendingIntent"/></param>
         /// <param name="arg2"><see cref="Android.Content.IntentFilter"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        public virtual void EnableForegroundDispatch(Android.App.Activity arg0, Android.App.PendingIntent arg1, Android.Content.IntentFilter[] arg2, Java.Lang.String[][] arg3)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#enableReaderMode(android.app.Activity,android.nfc.NfcAdapter.ReaderCallback,int,android.os.Bundle)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnEnableReaderMode"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.App.Activity, Android.Nfc.NfcAdapter.ReaderCallback, int, Android.Os.Bundle> OnEnableReaderMode { get; set; } = null;
-
-        void EnableReaderModeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.App.Activity>> data)
+        public void EnableForegroundDispatch(Android.App.Activity arg0, Android.App.PendingIntent arg1, Android.Content.IntentFilter[] arg2, Java.Lang.String[][] arg3)
         {
-            var methodToExecute = (OnEnableReaderMode != null) ? OnEnableReaderMode : EnableReaderMode;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Nfc.NfcAdapter.ReaderCallback>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.Os.Bundle>(2));
+            IExecute("enableForegroundDispatch", arg0, arg1, arg2, arg3);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#enableReaderMode(android.app.Activity,android.nfc.NfcAdapter.ReaderCallback,int,android.os.Bundle)"/>
         /// </summary>
@@ -284,9 +306,9 @@ void EnableReaderModeEventHandler(object sender, CLRListenerEventArgs<CLREventDa
         /// <param name="arg1"><see cref="Android.Nfc.NfcAdapter.ReaderCallback"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Android.Os.Bundle"/></param>
-        public virtual void EnableReaderMode(Android.App.Activity arg0, Android.Nfc.NfcAdapter.ReaderCallback arg1, int arg2, Android.Os.Bundle arg3)
+        public void EnableReaderMode(Android.App.Activity arg0, Android.Nfc.NfcAdapter.ReaderCallback arg1, int arg2, Android.Os.Bundle arg3)
         {
-            
+            IExecute("enableReaderMode", arg0, arg1, arg2, arg3);
         }
 
         #endregion
@@ -317,7 +339,7 @@ public partial class CreateBeamUrisCallback
             /// </summary>
             /// <param name="arg0"><see cref="Android.Nfc.NfcEvent"/></param>
             /// <returns><see cref="Android.Net.Uri"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Net.Uri[] CreateBeamUris(Android.Nfc.NfcEvent arg0)
             {
                 return IExecuteWithSignatureArray<Android.Net.Uri>("createBeamUris", "(Landroid/nfc/NfcEvent;)[Landroid/net/Uri;", arg0);
@@ -358,7 +380,7 @@ public partial class CreateNdefMessageCallback
             /// </summary>
             /// <param name="arg0"><see cref="Android.Nfc.NfcEvent"/></param>
             /// <returns><see cref="Android.Nfc.NdefMessage"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Nfc.NdefMessage CreateNdefMessage(Android.Nfc.NfcEvent arg0)
             {
                 return IExecuteWithSignature<Android.Nfc.NdefMessage>("createNdefMessage", "(Landroid/nfc/NfcEvent;)Landroid/nfc/NdefMessage;", arg0);
@@ -398,7 +420,7 @@ public partial class OnNdefPushCompleteCallback
             /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.OnNdefPushCompleteCallback.html#onNdefPushComplete(android.nfc.NfcEvent)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Nfc.NfcEvent"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnNdefPushComplete(Android.Nfc.NfcEvent arg0)
             {
                 IExecuteWithSignature("onNdefPushComplete", "(Landroid/nfc/NfcEvent;)V", arg0);
@@ -439,7 +461,7 @@ public partial class OnTagRemovedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTagRemoved", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnTagRemovedEventHandler));
+                AddEventHandler("onTagRemoved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnTagRemovedEventHandler));
 
             }
 
@@ -447,7 +469,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.OnTagRemovedListener.html#onTagRemoved()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTagRemoved"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnTagRemoved { get; set; } = null;
+            public global::System.Action OnOnTagRemoved { get; set; } = null;
 
             void OnTagRemovedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -551,118 +573,6 @@ public void OnTagDiscovered(Android.Nfc.Tag arg0)
         #endregion
 
     
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region NfcAdapterDirect
-    public partial class NfcAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#getNfcAntennaInfo()"/> 
-        /// </summary>
-        public Android.Nfc.NfcAntennaInfo NfcAntennaInfo
-        {
-            get { return IExecuteWithSignature<Android.Nfc.NfcAntennaInfo>("getNfcAntennaInfo", "()Landroid/nfc/NfcAntennaInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#ignore(android.nfc.Tag,int,android.nfc.NfcAdapter.OnTagRemovedListener,android.os.Handler)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Nfc.Tag"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.Nfc.NfcAdapter.OnTagRemovedListener"/></param>
-        /// <param name="arg3"><see cref="Android.Os.Handler"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool Ignore(Android.Nfc.Tag arg0, int arg1, Android.Nfc.NfcAdapter.OnTagRemovedListener arg2, Android.Os.Handler arg3)
-        {
-            return IExecute<bool>("ignore", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEnabled()
-        {
-            return IExecuteWithSignature<bool>("isEnabled", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isSecureNfcEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsSecureNfcEnabled()
-        {
-            return IExecuteWithSignature<bool>("isSecureNfcEnabled", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#isSecureNfcSupported()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsSecureNfcSupported()
-        {
-            return IExecuteWithSignature<bool>("isSecureNfcSupported", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#disableForegroundDispatch(android.app.Activity)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        public override void DisableForegroundDispatch(Android.App.Activity arg0)
-        {
-            IExecuteWithSignature("disableForegroundDispatch", "(Landroid/app/Activity;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#disableReaderMode(android.app.Activity)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        public override void DisableReaderMode(Android.App.Activity arg0)
-        {
-            IExecuteWithSignature("disableReaderMode", "(Landroid/app/Activity;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#enableForegroundDispatch(android.app.Activity,android.app.PendingIntent,android.content.IntentFilter[],java.lang.String[][])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        /// <param name="arg1"><see cref="Android.App.PendingIntent"/></param>
-        /// <param name="arg2"><see cref="Android.Content.IntentFilter"/></param>
-        /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        public override void EnableForegroundDispatch(Android.App.Activity arg0, Android.App.PendingIntent arg1, Android.Content.IntentFilter[] arg2, Java.Lang.String[][] arg3)
-        {
-            IExecute("enableForegroundDispatch", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAdapter.html#enableReaderMode(android.app.Activity,android.nfc.NfcAdapter.ReaderCallback,int,android.os.Bundle)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.App.Activity"/></param>
-        /// <param name="arg1"><see cref="Android.Nfc.NfcAdapter.ReaderCallback"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Os.Bundle"/></param>
-        public override void EnableReaderMode(Android.App.Activity arg0, Android.Nfc.NfcAdapter.ReaderCallback arg1, int arg2, Android.Os.Bundle arg3)
-        {
-            IExecute("enableReaderMode", arg0, arg1, arg2, arg3);
-        }
-
-        #endregion
-
-        #region Nested classes
-
         #endregion
 
         // TODO: complete the class
diff --git a/src/net/Netdroid/Generated/Android/Nfc/NfcAntennaInfo.cs b/src/net/Netdroid/Generated/Android/Nfc/NfcAntennaInfo.cs
index b9bbf9092..ad3f66d51 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/NfcAntennaInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/NfcAntennaInfo.cs
@@ -63,41 +63,44 @@ public NfcAntennaInfo(int arg0, int arg1, bool arg2, Java.Util.List<Android.Nfc.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#getAvailableNfcAntennas()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#isDeviceFoldable()"/>
         /// </summary>
-        public Java.Util.List<Android.Nfc.AvailableNfcAntenna> AvailableNfcAntennas
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDeviceFoldable()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Nfc.AvailableNfcAntenna>>("getAvailableNfcAntennas", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("isDeviceFoldable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#getDeviceHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#describeContents()"/>
         /// </summary>
-        public int DeviceHeight
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDeviceHeight", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#getDeviceWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#getDeviceHeight()"/>
         /// </summary>
-        public int DeviceWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceHeight()
         {
-            get { return IExecuteWithSignature<int>("getDeviceWidth", "()I"); }
+            return IExecuteWithSignature<int>("getDeviceHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#isDeviceFoldable()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#getDeviceWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDeviceFoldable()
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceWidth()
         {
-            return IExecuteWithSignature<bool>("isDeviceFoldable", "()Z");
+            return IExecuteWithSignature<int>("getDeviceWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#getAvailableNfcAntennas()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Nfc.AvailableNfcAntenna> GetAvailableNfcAntennas()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Nfc.AvailableNfcAntenna>>("getAvailableNfcAntennas", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/NfcAntennaInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/NfcManager.cs b/src/net/Netdroid/Generated/Android/Nfc/NfcManager.cs
index 9c881c3ef..9c5f49362 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/NfcManager.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/NfcManager.cs
@@ -46,11 +46,12 @@ public partial class NfcManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/NfcManager.html#getDefaultAdapter()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/NfcManager.html#getDefaultAdapter()"/>
         /// </summary>
-        public Android.Nfc.NfcAdapter DefaultAdapter
+        /// <returns><see cref="Android.Nfc.NfcAdapter"/></returns>
+        public Android.Nfc.NfcAdapter GetDefaultAdapter()
         {
-            get { return IExecuteWithSignature<Android.Nfc.NfcAdapter>("getDefaultAdapter", "()Landroid/nfc/NfcAdapter;"); }
+            return IExecuteWithSignature<Android.Nfc.NfcAdapter>("getDefaultAdapter", "()Landroid/nfc/NfcAdapter;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tag.cs b/src/net/Netdroid/Generated/Android/Nfc/Tag.cs
index 41515ca06..29bb2a258 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tag.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tag.cs
@@ -52,18 +52,12 @@ public partial class Tag
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/Tag.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/Tag.html#getId()"/>
         /// </summary>
-        public byte[] Id
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetId()
         {
-            get { return IExecuteWithSignatureArray<byte>("getId", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/Tag.html#getTechList()"/> 
-        /// </summary>
-        public Java.Lang.String[] TechList
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getTechList", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getId", "()[B");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/Tag.html#describeContents()"/>
@@ -74,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/Tag.html#getTechList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetTechList()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getTechList", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/Tag.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/AllPackageClasses.cs
index a18c64f32..1e9aa5ec7 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/AllPackageClasses.cs
@@ -476,12 +476,12 @@ public partial class TagTechnology : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TagTechnology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TagTechnology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TagTechnology() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TagTechnology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TagTechnology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TagTechnology(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/IsoDep.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/IsoDep.cs
index 4a5c946da..fbfefadaf 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/IsoDep.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/IsoDep.cs
@@ -55,65 +55,70 @@ public static Android.Nfc.Tech.IsoDep Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getHiLayerResponse()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getTag()"/>
         /// </summary>
-        public byte[] HiLayerResponse
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignatureArray<byte>("getHiLayerResponse", "()[B"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getHistoricalBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#isConnected()"/>
         /// </summary>
-        public byte[] HistoricalBytes
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignatureArray<byte>("getHistoricalBytes", "()[B"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getMaxTransceiveLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#isExtendedLengthApduSupported()"/>
         /// </summary>
-        public int MaxTransceiveLength
+        /// <returns><see cref="bool"/></returns>
+        public bool IsExtendedLengthApduSupported()
         {
-            get { return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I"); }
+            return IExecuteWithSignature<bool>("isExtendedLengthApduSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getHiLayerResponse()"/>
         /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetHiLayerResponse()
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignatureArray<byte>("getHiLayerResponse", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getTimeout()"/> <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#setTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getHistoricalBytes()"/>
         /// </summary>
-        public int Timeout
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetHistoricalBytes()
         {
-            get { return IExecuteWithSignature<int>("getTimeout", "()I"); } set { IExecuteWithSignature("setTimeout", "(I)V", value); }
+            return IExecuteWithSignatureArray<byte>("getHistoricalBytes", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#transceive(byte[])"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public byte[] Transceive(byte[] arg0)
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#isExtendedLengthApduSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getMaxTransceiveLength()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsExtendedLengthApduSupported()
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTransceiveLength()
         {
-            return IExecuteWithSignature<bool>("isExtendedLengthApduSupported", "()Z");
+            return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#transceive(byte[])"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#getTimeout()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="byte"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public byte[] Transceive(byte[] arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTimeout()
         {
-            return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
+            return IExecuteWithSignature<int>("getTimeout", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#close()"/>
@@ -131,6 +136,14 @@ public void Connect()
         {
             IExecuteWithSignature("connect", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/IsoDep.html#setTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTimeout(int arg0)
+        {
+            IExecuteWithSignature("setTimeout", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/MifareClassic.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/MifareClassic.cs
index 0fbd88610..7c740b199 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/MifareClassic.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/MifareClassic.cs
@@ -127,53 +127,12 @@ public static Android.Nfc.Tech.MifareClassic Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getBlockCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getTag()"/>
         /// </summary>
-        public int BlockCount
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignature<int>("getBlockCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getMaxTransceiveLength()"/> 
-        /// </summary>
-        public int MaxTransceiveLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getSectorCount()"/> 
-        /// </summary>
-        public int SectorCount
-        {
-            get { return IExecuteWithSignature<int>("getSectorCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getSize()"/> 
-        /// </summary>
-        public int Size
-        {
-            get { return IExecuteWithSignature<int>("getSize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getTag()"/> 
-        /// </summary>
-        public Android.Nfc.Tag Tag
-        {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getTimeout()"/> <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#setTimeout(int)"/>
-        /// </summary>
-        public int Timeout
-        {
-            get { return IExecuteWithSignature<int>("getTimeout", "()I"); } set { IExecuteWithSignature("setTimeout", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#authenticateSectorWithKeyA(int,byte[])"/>
@@ -235,6 +194,14 @@ public int BlockToSector(int arg0)
             return IExecuteWithSignature<int>("blockToSector", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getBlockCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBlockCount()
+        {
+            return IExecuteWithSignature<int>("getBlockCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getBlockCountInSector(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -244,6 +211,46 @@ public int GetBlockCountInSector(int arg0)
             return IExecuteWithSignature<int>("getBlockCountInSector", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getMaxTransceiveLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTransceiveLength()
+        {
+            return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getSectorCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSectorCount()
+        {
+            return IExecuteWithSignature<int>("getSectorCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSize()
+        {
+            return IExecuteWithSignature<int>("getSize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getTimeout()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTimeout()
+        {
+            return IExecuteWithSignature<int>("getTimeout", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#sectorToBlock(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -298,6 +305,14 @@ public void Restore(int arg0)
             IExecuteWithSignature("restore", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#setTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTimeout(int arg0)
+        {
+            IExecuteWithSignature("setTimeout", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareClassic.html#transfer(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/MifareUltralight.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/MifareUltralight.cs
index 2882e2207..cbe91ab07 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/MifareUltralight.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/MifareUltralight.cs
@@ -79,32 +79,12 @@ public static Android.Nfc.Tech.MifareUltralight Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#getMaxTransceiveLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#getTag()"/>
         /// </summary>
-        public int MaxTransceiveLength
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#getTag()"/> 
-        /// </summary>
-        public Android.Nfc.Tag Tag
-        {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#getTimeout()"/> <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#setTimeout(int)"/>
-        /// </summary>
-        public int Timeout
-        {
-            get { return IExecuteWithSignature<int>("getTimeout", "()I"); } set { IExecuteWithSignature("setTimeout", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#isConnected()"/>
@@ -135,6 +115,30 @@ public byte[] Transceive(byte[] arg0)
             return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#getMaxTransceiveLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTransceiveLength()
+        {
+            return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#getTimeout()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTimeout()
+        {
+            return IExecuteWithSignature<int>("getTimeout", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
@@ -151,6 +155,14 @@ public void Connect()
             IExecuteWithSignature("connect", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#setTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTimeout(int arg0)
+        {
+            IExecuteWithSignature("setTimeout", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/MifareUltralight.html#writePage(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/Ndef.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/Ndef.cs
index 225cb789c..96a928bb7 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/Ndef.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/Ndef.cs
@@ -85,39 +85,30 @@ public static Android.Nfc.Tech.Ndef Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getCachedNdefMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getCachedNdefMessage()"/>
         /// </summary>
-        public Android.Nfc.NdefMessage CachedNdefMessage
+        /// <returns><see cref="Android.Nfc.NdefMessage"/></returns>
+        public Android.Nfc.NdefMessage GetCachedNdefMessage()
         {
-            get { return IExecuteWithSignature<Android.Nfc.NdefMessage>("getCachedNdefMessage", "()Landroid/nfc/NdefMessage;"); }
+            return IExecuteWithSignature<Android.Nfc.NdefMessage>("getCachedNdefMessage", "()Landroid/nfc/NdefMessage;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getMaxSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getNdefMessage()"/>
         /// </summary>
-        public int MaxSize
-        {
-            get { return IExecuteWithSignature<int>("getMaxSize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getNdefMessage()"/> 
-        /// </summary>
-        public Android.Nfc.NdefMessage NdefMessage
-        {
-            get { return IExecuteWithSignature<Android.Nfc.NdefMessage>("getNdefMessage", "()Landroid/nfc/NdefMessage;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getTag()"/> 
-        /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <returns><see cref="Android.Nfc.NdefMessage"/></returns>
+        /// <exception cref="Android.Nfc.FormatException"/>
+        /// <exception cref="Java.Io.IOException"/>
+        public Android.Nfc.NdefMessage GetNdefMessage()
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignature<Android.Nfc.NdefMessage>("getNdefMessage", "()Landroid/nfc/NdefMessage;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getTag()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#canMakeReadOnly()"/>
@@ -153,6 +144,22 @@ public bool MakeReadOnly()
             return IExecuteWithSignature<bool>("makeReadOnly", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getMaxSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSize()
+        {
+            return IExecuteWithSignature<int>("getMaxSize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/Ndef.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/NdefFormatable.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/NdefFormatable.cs
index 106efe624..b0c552dc9 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/NdefFormatable.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/NdefFormatable.cs
@@ -55,11 +55,12 @@ public static Android.Nfc.Tech.NdefFormatable Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NdefFormatable.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NdefFormatable.html#getTag()"/>
         /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/NdefFormatable.html#isConnected()"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcA.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcA.cs
index a71de30ad..816e1bd41 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcA.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcA.cs
@@ -55,57 +55,62 @@ public static Android.Nfc.Tech.NfcA Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getAtqa()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getTag()"/>
         /// </summary>
-        public byte[] Atqa
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignatureArray<byte>("getAtqa", "()[B"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getMaxTransceiveLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#isConnected()"/>
         /// </summary>
-        public int MaxTransceiveLength
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getSak()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getAtqa()"/>
         /// </summary>
-        public short Sak
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetAtqa()
         {
-            get { return IExecuteWithSignature<short>("getSak", "()S"); }
+            return IExecuteWithSignatureArray<byte>("getAtqa", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#transceive(byte[])"/>
         /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public byte[] Transceive(byte[] arg0)
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getTimeout()"/> <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#setTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getMaxTransceiveLength()"/>
         /// </summary>
-        public int Timeout
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTransceiveLength()
         {
-            get { return IExecuteWithSignature<int>("getTimeout", "()I"); } set { IExecuteWithSignature("setTimeout", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getTimeout()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <returns><see cref="int"/></returns>
+        public int GetTimeout()
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecuteWithSignature<int>("getTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#transceive(byte[])"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#getSak()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="byte"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public byte[] Transceive(byte[] arg0)
+        /// <returns><see cref="short"/></returns>
+        public short GetSak()
         {
-            return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
+            return IExecuteWithSignature<short>("getSak", "()S");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#close()"/>
@@ -123,6 +128,14 @@ public void Connect()
         {
             IExecuteWithSignature("connect", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcA.html#setTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTimeout(int arg0)
+        {
+            IExecuteWithSignature("setTimeout", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcB.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcB.cs
index 69987d7e4..0b5935e47 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcB.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcB.cs
@@ -55,40 +55,36 @@ public static Android.Nfc.Tech.NfcB Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#getApplicationData()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#getTag()"/>
         /// </summary>
-        public byte[] ApplicationData
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignatureArray<byte>("getApplicationData", "()[B"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#getMaxTransceiveLength()"/> 
-        /// </summary>
-        public int MaxTransceiveLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#getProtocolInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#isConnected()"/>
         /// </summary>
-        public byte[] ProtocolInfo
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignatureArray<byte>("getProtocolInfo", "()[B"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#getApplicationData()"/>
         /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetApplicationData()
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignatureArray<byte>("getApplicationData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#getProtocolInfo()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetProtocolInfo()
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecuteWithSignatureArray<byte>("getProtocolInfo", "()[B");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#transceive(byte[])"/>
@@ -101,6 +97,14 @@ public byte[] Transceive(byte[] arg0)
             return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#getMaxTransceiveLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTransceiveLength()
+        {
+            return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcB.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcBarcode.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcBarcode.cs
index fc9da202a..4f0a96d70 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcBarcode.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcBarcode.cs
@@ -67,33 +67,36 @@ public static Android.Nfc.Tech.NfcBarcode Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#getBarcode()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#getTag()"/>
         /// </summary>
-        public byte[] Barcode
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignatureArray<byte>("getBarcode", "()[B"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#isConnected()"/>
         /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#getBarcode()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetBarcode()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getBarcode", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcBarcode.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcF.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcF.cs
index 0a74ebb50..b0dab45c1 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcF.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcF.cs
@@ -55,57 +55,62 @@ public static Android.Nfc.Tech.NfcF Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getManufacturer()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getTag()"/>
         /// </summary>
-        public byte[] Manufacturer
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignatureArray<byte>("getManufacturer", "()[B"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getMaxTransceiveLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#isConnected()"/>
         /// </summary>
-        public int MaxTransceiveLength
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getSystemCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getManufacturer()"/>
         /// </summary>
-        public byte[] SystemCode
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetManufacturer()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSystemCode", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getManufacturer", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getSystemCode()"/>
         /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSystemCode()
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignatureArray<byte>("getSystemCode", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getTimeout()"/> <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#setTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#transceive(byte[])"/>
         /// </summary>
-        public int Timeout
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public byte[] Transceive(byte[] arg0)
         {
-            get { return IExecuteWithSignature<int>("getTimeout", "()I"); } set { IExecuteWithSignature("setTimeout", "(I)V", value); }
+            return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getMaxTransceiveLength()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTransceiveLength()
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#transceive(byte[])"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#getTimeout()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="byte"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public byte[] Transceive(byte[] arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTimeout()
         {
-            return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
+            return IExecuteWithSignature<int>("getTimeout", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#close()"/>
@@ -123,6 +128,14 @@ public void Connect()
         {
             IExecuteWithSignature("connect", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcF.html#setTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTimeout(int arg0)
+        {
+            IExecuteWithSignature("setTimeout", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcV.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcV.cs
index 0cb45302a..51fb40fb8 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcV.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/NfcV.cs
@@ -55,40 +55,36 @@ public static Android.Nfc.Tech.NfcV Get(Android.Nfc.Tag arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#getDsfId()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#getTag()"/>
         /// </summary>
-        public byte DsfId
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignature<byte>("getDsfId", "()B"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#getMaxTransceiveLength()"/> 
-        /// </summary>
-        public int MaxTransceiveLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#getResponseFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#isConnected()"/>
         /// </summary>
-        public byte ResponseFlags
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignature<byte>("getResponseFlags", "()B"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#getDsfId()"/>
         /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <returns><see cref="byte"/></returns>
+        public byte GetDsfId()
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignature<byte>("getDsfId", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#getResponseFlags()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <returns><see cref="byte"/></returns>
+        public byte GetResponseFlags()
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecuteWithSignature<byte>("getResponseFlags", "()B");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#transceive(byte[])"/>
@@ -101,6 +97,14 @@ public byte[] Transceive(byte[] arg0)
             return IExecuteWithSignatureArray<byte>("transceive", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#getMaxTransceiveLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTransceiveLength()
+        {
+            return IExecuteWithSignature<int>("getMaxTransceiveLength", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/NfcV.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Android/Nfc/Tech/TagTechnology.cs b/src/net/Netdroid/Generated/Android/Nfc/Tech/TagTechnology.cs
index f937c85bc..e7b540ff3 100644
--- a/src/net/Netdroid/Generated/Android/Nfc/Tech/TagTechnology.cs
+++ b/src/net/Netdroid/Generated/Android/Nfc/Tech/TagTechnology.cs
@@ -64,11 +64,12 @@ public partial class TagTechnology : Android.Nfc.Tech.ITagTechnology
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/nfc/tech/TagTechnology.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/nfc/tech/TagTechnology.html#getTag()"/>
         /// </summary>
-        public Android.Nfc.Tag Tag
+        /// <returns><see cref="Android.Nfc.Tag"/></returns>
+        public Android.Nfc.Tag GetTag()
         {
-            get { return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;"); }
+            return IExecuteWithSignature<Android.Nfc.Tag>("getTag", "()Landroid/nfc/Tag;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/nfc/tech/TagTechnology.html#isConnected()"/>
diff --git a/src/net/Netdroid/Generated/Android/Opengl/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Opengl/AllPackageClasses.cs
index 47b53a02f..d99df3e2d 100644
--- a/src/net/Netdroid/Generated/Android/Opengl/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Opengl/AllPackageClasses.cs
@@ -344,12 +344,12 @@ public partial class EGLObjectHandle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<E
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EGLObjectHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLObjectHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLObjectHandle() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EGLObjectHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLObjectHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLObjectHandle(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1002,12 +1002,12 @@ public partial class DebugProcKHR : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Debu
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("DebugProcKHR class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DebugProcKHR class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DebugProcKHR() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("DebugProcKHR class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DebugProcKHR class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DebugProcKHR(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1092,12 +1092,12 @@ public partial class DebugProc : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DebugPr
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("DebugProc class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DebugProc class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DebugProc() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("DebugProc class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DebugProc class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DebugProc(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1199,12 +1199,12 @@ public partial class EGLConfigChooser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("EGLConfigChooser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EGLConfigChooser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EGLConfigChooser() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("EGLConfigChooser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EGLConfigChooser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EGLConfigChooser(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1245,12 +1245,12 @@ public partial class EGLContextFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("EGLContextFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EGLContextFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EGLContextFactory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("EGLContextFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EGLContextFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EGLContextFactory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1291,12 +1291,12 @@ public partial class EGLWindowSurfaceFactory : MASES.JCOBridge.C2JBridge.JVMBrid
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("EGLWindowSurfaceFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EGLWindowSurfaceFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EGLWindowSurfaceFactory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("EGLWindowSurfaceFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EGLWindowSurfaceFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EGLWindowSurfaceFactory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1337,12 +1337,12 @@ public partial class GLWrapper : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GLWrapp
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("GLWrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GLWrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GLWrapper() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("GLWrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GLWrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GLWrapper(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1383,12 +1383,12 @@ public partial class Renderer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Renderer
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Renderer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Renderer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Renderer() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Renderer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Renderer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Renderer(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Opengl/EGL14.cs b/src/net/Netdroid/Generated/Android/Opengl/EGL14.cs
index d56e5af02..c7b886a50 100644
--- a/src/net/Netdroid/Generated/Android/Opengl/EGL14.cs
+++ b/src/net/Netdroid/Generated/Android/Opengl/EGL14.cs
@@ -805,7 +805,7 @@ public static Android.Opengl.EGLSurface EglCreatePbufferSurface(Android.Opengl.E
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <returns><see cref="Android.Opengl.EGLSurface"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Opengl.EGLSurface EglCreatePixmapSurface(Android.Opengl.EGLDisplay arg0, Android.Opengl.EGLConfig arg1, int arg2, int[] arg3, int arg4)
         {
             return SExecute<Android.Opengl.EGLSurface>(LocalBridgeClazz, "eglCreatePixmapSurface", arg0, arg1, arg2, arg3, arg4);
diff --git a/src/net/Netdroid/Generated/Android/Opengl/EGLObjectHandle.cs b/src/net/Netdroid/Generated/Android/Opengl/EGLObjectHandle.cs
index d247348ff..7f22b2712 100644
--- a/src/net/Netdroid/Generated/Android/Opengl/EGLObjectHandle.cs
+++ b/src/net/Netdroid/Generated/Android/Opengl/EGLObjectHandle.cs
@@ -46,19 +46,21 @@ public partial class EGLObjectHandle
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/opengl/EGLObjectHandle.html#getHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/opengl/EGLObjectHandle.html#getHandle()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Handle
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetHandle()
         {
-            get { return IExecuteWithSignature<int>("getHandle", "()I"); }
+            return IExecuteWithSignature<int>("getHandle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/opengl/EGLObjectHandle.html#getNativeHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/opengl/EGLObjectHandle.html#getNativeHandle()"/>
         /// </summary>
-        public long NativeHandle
+        /// <returns><see cref="long"/></returns>
+        public long GetNativeHandle()
         {
-            get { return IExecuteWithSignature<long>("getNativeHandle", "()J"); }
+            return IExecuteWithSignature<long>("getNativeHandle", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Opengl/ETC1Util.cs b/src/net/Netdroid/Generated/Android/Opengl/ETC1Util.cs
index 8865379a9..2ab49b6c1 100644
--- a/src/net/Netdroid/Generated/Android/Opengl/ETC1Util.cs
+++ b/src/net/Netdroid/Generated/Android/Opengl/ETC1Util.cs
@@ -148,25 +148,28 @@ public ETC1Texture(int arg0, int arg1, Java.Nio.ByteBuffer arg2)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/opengl/ETC1Util.ETC1Texture.html#getData()"/> 
+            /// <see href="https://developer.android.com/reference/android/opengl/ETC1Util.ETC1Texture.html#getHeight()"/>
             /// </summary>
-            public Java.Nio.ByteBuffer Data
+            /// <returns><see cref="int"/></returns>
+            public int GetHeight()
             {
-                get { return IExecuteWithSignature<Java.Nio.ByteBuffer>("getData", "()Ljava/nio/ByteBuffer;"); }
+                return IExecuteWithSignature<int>("getHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/opengl/ETC1Util.ETC1Texture.html#getHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/opengl/ETC1Util.ETC1Texture.html#getWidth()"/>
             /// </summary>
-            public int Height
+            /// <returns><see cref="int"/></returns>
+            public int GetWidth()
             {
-                get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+                return IExecuteWithSignature<int>("getWidth", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/opengl/ETC1Util.ETC1Texture.html#getWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/opengl/ETC1Util.ETC1Texture.html#getData()"/>
             /// </summary>
-            public int Width
+            /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
+            public Java.Nio.ByteBuffer GetData()
             {
-                get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+                return IExecuteWithSignature<Java.Nio.ByteBuffer>("getData", "()Ljava/nio/ByteBuffer;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Opengl/GLES20.cs b/src/net/Netdroid/Generated/Android/Opengl/GLES20.cs
index d24eacc51..780217cac 100644
--- a/src/net/Netdroid/Generated/Android/Opengl/GLES20.cs
+++ b/src/net/Netdroid/Generated/Android/Opengl/GLES20.cs
@@ -1366,7 +1366,7 @@ public partial class GLES20
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/opengl/GLES20.html#GL_STENCIL_INDEX"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GL_STENCIL_INDEX { get { if (!_GL_STENCIL_INDEXReady) { _GL_STENCIL_INDEXContent = SGetField<int>(LocalBridgeClazz, "GL_STENCIL_INDEX"); _GL_STENCIL_INDEXReady = true; } return _GL_STENCIL_INDEXContent; } }
         private static int _GL_STENCIL_INDEXContent = default;
         private static bool _GL_STENCIL_INDEXReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Opengl/GLES30.cs b/src/net/Netdroid/Generated/Android/Opengl/GLES30.cs
index eb6cb9f36..1857fc0de 100644
--- a/src/net/Netdroid/Generated/Android/Opengl/GLES30.cs
+++ b/src/net/Netdroid/Generated/Android/Opengl/GLES30.cs
@@ -2908,7 +2908,7 @@ public static void GlGetTransformFeedbackVarying(int arg0, int arg1, int arg2, i
         /// <param name="arg4"><see cref="Java.Nio.IntBuffer"/></param>
         /// <param name="arg5"><see cref="Java.Nio.IntBuffer"/></param>
         /// <param name="arg6"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void GlGetTransformFeedbackVarying(int arg0, int arg1, int arg2, Java.Nio.IntBuffer arg3, Java.Nio.IntBuffer arg4, Java.Nio.IntBuffer arg5, byte arg6)
         {
             SExecute(LocalBridgeClazz, "glGetTransformFeedbackVarying", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
diff --git a/src/net/Netdroid/Generated/Android/Opengl/GLSurfaceView.cs b/src/net/Netdroid/Generated/Android/Opengl/GLSurfaceView.cs
index 6a8ffd7f9..70d7f07cf 100644
--- a/src/net/Netdroid/Generated/Android/Opengl/GLSurfaceView.cs
+++ b/src/net/Netdroid/Generated/Android/Opengl/GLSurfaceView.cs
@@ -87,25 +87,28 @@ public GLSurfaceView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#getDebugFlags()"/> <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#setDebugFlags(int)"/>
+        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#getPreserveEGLContextOnPause()"/>
         /// </summary>
-        public int DebugFlags
+        /// <returns><see cref="bool"/></returns>
+        public bool GetPreserveEGLContextOnPause()
         {
-            get { return IExecuteWithSignature<int>("getDebugFlags", "()I"); } set { IExecuteWithSignature("setDebugFlags", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getPreserveEGLContextOnPause", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#getPreserveEGLContextOnPause()"/> <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#setPreserveEGLContextOnPause(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#getDebugFlags()"/>
         /// </summary>
-        public bool PreserveEGLContextOnPause
+        /// <returns><see cref="int"/></returns>
+        public int GetDebugFlags()
         {
-            get { return IExecuteWithSignature<bool>("getPreserveEGLContextOnPause", "()Z"); } set { IExecuteWithSignature("setPreserveEGLContextOnPause", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getDebugFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#getRenderMode()"/> <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#setRenderMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#getRenderMode()"/>
         /// </summary>
-        public int RenderMode
+        /// <returns><see cref="int"/></returns>
+        public int GetRenderMode()
         {
-            get { return IExecuteWithSignature<int>("getRenderMode", "()I"); } set { IExecuteWithSignature("setRenderMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("getRenderMode", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#onPause()"/>
@@ -137,6 +140,14 @@ public void RequestRender()
             IExecuteWithSignature("requestRender", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#setDebugFlags(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDebugFlags(int arg0)
+        {
+            IExecuteWithSignature("setDebugFlags", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#setEGLConfigChooser(android.opengl.GLSurfaceView.EGLConfigChooser)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Opengl.GLSurfaceView.EGLConfigChooser"/></param>
@@ -198,6 +209,14 @@ public void SetGLWrapper(Android.Opengl.GLSurfaceView.GLWrapper arg0)
             IExecuteWithSignature("setGLWrapper", "(Landroid/opengl/GLSurfaceView$GLWrapper;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#setPreserveEGLContextOnPause(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetPreserveEGLContextOnPause(bool arg0)
+        {
+            IExecuteWithSignature("setPreserveEGLContextOnPause", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#setRenderer(android.opengl.GLSurfaceView.Renderer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Opengl.GLSurfaceView.Renderer"/></param>
@@ -206,6 +225,14 @@ public void SetRenderer(Android.Opengl.GLSurfaceView.Renderer arg0)
             IExecuteWithSignature("setRenderer", "(Landroid/opengl/GLSurfaceView$Renderer;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#setRenderMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRenderMode(int arg0)
+        {
+            IExecuteWithSignature("setRenderMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#surfaceChanged(android.view.SurfaceHolder,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.SurfaceHolder"/></param>
@@ -236,7 +263,7 @@ public void SurfaceDestroyed(Android.View.SurfaceHolder arg0)
         /// <see href="https://developer.android.com/reference/android/opengl/GLSurfaceView.html#surfaceRedrawNeeded(android.view.SurfaceHolder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.SurfaceHolder"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SurfaceRedrawNeeded(Android.View.SurfaceHolder arg0)
         {
             IExecuteWithSignature("surfaceRedrawNeeded", "(Landroid/view/SurfaceHolder;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Opengl/Matrix.cs b/src/net/Netdroid/Generated/Android/Opengl/Matrix.cs
index 265716dc2..0839dca38 100644
--- a/src/net/Netdroid/Generated/Android/Opengl/Matrix.cs
+++ b/src/net/Netdroid/Generated/Android/Opengl/Matrix.cs
@@ -222,7 +222,7 @@ public static void SetLookAtM(float[] arg0, int arg1, float arg2, float arg3, fl
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
         /// <param name="arg4"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetRotateEulerM(float[] arg0, int arg1, float arg2, float arg3, float arg4)
         {
             SExecute(LocalBridgeClazz, "setRotateEulerM", arg0, arg1, arg2, arg3, arg4);
diff --git a/src/net/Netdroid/Generated/Android/Os/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Os/AllPackageClasses.cs
index 5a37a6436..662496bbd 100644
--- a/src/net/Netdroid/Generated/Android/Os/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Os/AllPackageClasses.cs
@@ -30,19 +30,19 @@ namespace Android.Os
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AsyncTask : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AsyncTask>
     {
         const string _bridgeClassName = "android.os.AsyncTask";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsyncTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncTask() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsyncTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncTask(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -73,7 +73,7 @@ public AsyncTask(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.Status.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Status : Java.Lang.Enum<Android.Os.AsyncTask.Status>
         {
             const string _bridgeClassName = "android.os.AsyncTask$Status";
@@ -125,19 +125,19 @@ public Status(params object[] args) : base(args) { }
     /// <typeparam name="Params"></typeparam>
     /// <typeparam name="Progress"></typeparam>
     /// <typeparam name="Result"></typeparam>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AsyncTask<Params, Progress, Result> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AsyncTask<Params, Progress, Result>>
     {
         const string _bridgeClassName = "android.os.AsyncTask";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsyncTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncTask() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsyncTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsyncTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsyncTask(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -367,12 +367,12 @@ public partial class BugreportCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("BugreportCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BugreportCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BugreportCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("BugreportCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BugreportCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BugreportCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -678,10 +678,13 @@ public partial class OnCancelListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public OnCancelListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.CancellationSignal_OnCancelListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.OnCancelListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -703,10 +706,13 @@ public partial class OnCancelListenerDirect : OnCancelListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.CancellationSignal$OnCancelListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.CancellationSignal$OnCancelListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -740,12 +746,12 @@ public partial class CombinedVibration : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CombinedVibration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CombinedVibration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CombinedVibration() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CombinedVibration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CombinedVibration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CombinedVibration(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -874,12 +880,12 @@ public partial class CountDownTimer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Co
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CountDownTimer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CountDownTimer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CountDownTimer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CountDownTimer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CountDownTimer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CountDownTimer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1032,7 +1038,7 @@ public Debug(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.InstructionCount.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class InstructionCount : MASES.JCOBridge.C2JBridge.JVMBridgeBase<InstructionCount>
         {
             const string _bridgeClassName = "android.os.Debug$InstructionCount";
@@ -1263,12 +1269,12 @@ public partial class FileObserver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<File
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileObserver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileObserver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1367,10 +1373,13 @@ public partial class ProgressListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public ProgressListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.FileUtils_ProgressListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.ProgressListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1392,10 +1401,13 @@ public partial class ProgressListenerDirect : ProgressListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.FileUtils$ProgressListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.FileUtils$ProgressListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1469,12 +1481,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1607,12 +1619,12 @@ public partial class IBinder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IBinder>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IBinder() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IBinder(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1649,12 +1661,12 @@ public partial class DeathRecipient : MASES.JCOBridge.C2JBridge.JVMBridgeBase<De
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("DeathRecipient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DeathRecipient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DeathRecipient() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("DeathRecipient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DeathRecipient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DeathRecipient(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1699,12 +1711,12 @@ public partial class IInterface : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IInter
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IInterface() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IInterface(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1978,12 +1990,12 @@ public partial class IdleHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IdleH
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("IdleHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IdleHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IdleHandler() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("IdleHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IdleHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IdleHandler(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2025,10 +2037,13 @@ public partial class OnFileDescriptorEventListener : MASES.JCOBridge.C2JBridge.J
             /// </summary>
             public OnFileDescriptorEventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.MessageQueue_OnFileDescriptorEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.OnFileDescriptorEventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2050,10 +2065,13 @@ public partial class OnFileDescriptorEventListenerDirect : OnFileDescriptorEvent
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.MessageQueue$OnFileDescriptorEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.MessageQueue$OnFileDescriptorEventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2165,12 +2183,12 @@ public partial class OutcomeReceiver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<O
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OutcomeReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OutcomeReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OutcomeReceiver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OutcomeReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OutcomeReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OutcomeReceiver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2207,18 +2225,18 @@ public OutcomeReceiver(params object[] args) : base(args) { }
     /// </summary>
     /// <typeparam name="R"></typeparam>
     /// <typeparam name="E"><see cref="Java.Lang.Throwable"/></typeparam>
-    public partial class OutcomeReceiver<R, E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OutcomeReceiver<R, E>> where E: Java.Lang.Throwable
+    public partial class OutcomeReceiver<R, E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OutcomeReceiver<R, E>> where E : Java.Lang.Throwable
     {
         const string _bridgeClassName = "android.os.OutcomeReceiver";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OutcomeReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OutcomeReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OutcomeReceiver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OutcomeReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OutcomeReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OutcomeReceiver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2303,12 +2321,12 @@ public partial class Parcelable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Parcel
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Parcelable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Parcelable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Parcelable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Parcelable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Parcelable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Parcelable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2345,12 +2363,12 @@ public partial class ClassLoaderCreator : Android.Os.Parcelable.Creator
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ClassLoaderCreator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ClassLoaderCreator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ClassLoaderCreator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ClassLoaderCreator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ClassLoaderCreator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ClassLoaderCreator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2392,12 +2410,12 @@ public partial class ClassLoaderCreator<T> : Android.Os.Parcelable.Creator<T>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ClassLoaderCreator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ClassLoaderCreator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ClassLoaderCreator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ClassLoaderCreator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ClassLoaderCreator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ClassLoaderCreator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2438,12 +2456,12 @@ public partial class Creator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Creator>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Creator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Creator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Creator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Creator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Creator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Creator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2485,12 +2503,12 @@ public partial class Creator<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Creato
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Creator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Creator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Creator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Creator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Creator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Creator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2681,10 +2699,13 @@ public partial class OnCloseListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnCloseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.ParcelFileDescriptor_OnCloseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.OnCloseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2706,10 +2727,13 @@ public partial class OnCloseListenerDirect : OnCloseListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.ParcelFileDescriptor$OnCloseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.ParcelFileDescriptor$OnCloseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3021,10 +3045,13 @@ public partial class OnThermalStatusChangedListener : MASES.JCOBridge.C2JBridge.
             /// </summary>
             public OnThermalStatusChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.PowerManager_OnThermalStatusChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.OnThermalStatusChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3046,10 +3073,13 @@ public partial class OnThermalStatusChangedListenerDirect : OnThermalStatusChang
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.PowerManager$OnThermalStatusChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.PowerManager$OnThermalStatusChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3124,10 +3154,13 @@ public partial class WakeLockStateListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public WakeLockStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.PowerManager_WakeLockStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.WakeLockStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3149,10 +3182,13 @@ public partial class WakeLockStateListenerDirect : WakeLockStateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.PowerManager$WakeLockStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.PowerManager$WakeLockStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3230,12 +3266,12 @@ public partial class ProxyFileDescriptorCallback : MASES.JCOBridge.C2JBridge.JVM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ProxyFileDescriptorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ProxyFileDescriptorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ProxyFileDescriptorCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ProxyFileDescriptorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ProxyFileDescriptorCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ProxyFileDescriptorCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3317,10 +3353,13 @@ public partial class ProgressListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public ProgressListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.RecoverySystem_ProgressListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.ProgressListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3342,10 +3381,13 @@ public partial class ProgressListenerDirect : ProgressListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.RecoverySystem$ProgressListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.RecoverySystem$ProgressListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3418,7 +3460,7 @@ public RemoteCallbackList(params object[] args) : base(args) { }
     /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html"/>
     /// </summary>
     /// <typeparam name="E"><see cref="Android.Os.IIInterface"/></typeparam>
-    public partial class RemoteCallbackList<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RemoteCallbackList<E>> where E: Android.Os.IIInterface, new()
+    public partial class RemoteCallbackList<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RemoteCallbackList<E>> where E : Android.Os.IIInterface, new()
     {
         const string _bridgeClassName = "android.os.RemoteCallbackList";
         /// <summary>
@@ -3658,10 +3700,13 @@ public partial class OnThreadViolationListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnThreadViolationListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.StrictMode_OnThreadViolationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.OnThreadViolationListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3683,10 +3728,13 @@ public partial class OnThreadViolationListenerDirect : OnThreadViolationListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.StrictMode$OnThreadViolationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.StrictMode$OnThreadViolationListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3717,10 +3765,13 @@ public partial class OnVmViolationListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnVmViolationListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.os.StrictMode_OnVmViolationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.os.OnVmViolationListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3742,10 +3793,13 @@ public partial class OnVmViolationListenerDirect : OnVmViolationListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.os.StrictMode$OnVmViolationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.os.StrictMode$OnVmViolationListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4043,12 +4097,12 @@ public partial class TokenWatcher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Toke
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TokenWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TokenWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TokenWatcher() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TokenWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TokenWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TokenWatcher(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4343,12 +4397,12 @@ public partial class VibrationEffect : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VibrationEffect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VibrationEffect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VibrationEffect() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VibrationEffect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VibrationEffect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VibrationEffect(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4433,12 +4487,12 @@ public partial class Vibrator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Vibrator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Vibrator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Vibrator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Vibrator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Vibrator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Vibrator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Vibrator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4479,12 +4533,12 @@ public partial class VibratorManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<V
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VibratorManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VibratorManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VibratorManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VibratorManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VibratorManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VibratorManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Os/AsyncTask.cs b/src/net/Netdroid/Generated/Android/Os/AsyncTask.cs
index bd9580757..8120e24dd 100644
--- a/src/net/Netdroid/Generated/Android/Os/AsyncTask.cs
+++ b/src/net/Netdroid/Generated/Android/Os/AsyncTask.cs
@@ -40,14 +40,14 @@ public partial class AsyncTask
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#SERIAL_EXECUTOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Util.Concurrent.Executor SERIAL_EXECUTOR { get { if (!_SERIAL_EXECUTORReady) { _SERIAL_EXECUTORContent = SGetField<Java.Util.Concurrent.Executor>(LocalBridgeClazz, "SERIAL_EXECUTOR"); _SERIAL_EXECUTORReady = true; } return _SERIAL_EXECUTORContent; } }
         private static Java.Util.Concurrent.Executor _SERIAL_EXECUTORContent = default;
         private static bool _SERIAL_EXECUTORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#THREAD_POOL_EXECUTOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Util.Concurrent.Executor THREAD_POOL_EXECUTOR { get { if (!_THREAD_POOL_EXECUTORReady) { _THREAD_POOL_EXECUTORContent = SGetField<Java.Util.Concurrent.Executor>(LocalBridgeClazz, "THREAD_POOL_EXECUTOR"); _THREAD_POOL_EXECUTORReady = true; } return _THREAD_POOL_EXECUTORContent; } }
         private static Java.Util.Concurrent.Executor _THREAD_POOL_EXECUTORContent = default;
         private static bool _THREAD_POOL_EXECUTORReady = false; // this is used because in case of generics 
@@ -59,7 +59,7 @@ public partial class AsyncTask
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#execute(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void Execute(Java.Lang.Runnable arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "execute", "(Ljava/lang/Runnable;)V", arg0);
@@ -69,19 +69,11 @@ public static void Execute(Java.Lang.Runnable arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#getStatus()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Os.AsyncTask.Status GetStatus
-        {
-            get { return IExecuteWithSignature<Android.Os.AsyncTask.Status>("getStatus", "()Landroid/os/AsyncTask$Status;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#execute(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Android.Os.AsyncTask"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.AsyncTask Execute(params object[] arg0)
         {
             if (arg0.Length == 0) return IExecuteWithSignature<Android.Os.AsyncTask>("execute", "([Ljava/lang/Object;)Landroid/os/AsyncTask;"); else return IExecuteWithSignature<Android.Os.AsyncTask>("execute", "([Ljava/lang/Object;)Landroid/os/AsyncTask;", arg0);
@@ -92,17 +84,26 @@ public Android.Os.AsyncTask Execute(params object[] arg0)
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="Android.Os.AsyncTask"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.AsyncTask ExecuteOnExecutor(Java.Util.Concurrent.Executor arg0, params object[] arg1)
         {
             if (arg1.Length == 0) return IExecute<Android.Os.AsyncTask>("executeOnExecutor", arg0); else return IExecute<Android.Os.AsyncTask>("executeOnExecutor", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#getStatus()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.AsyncTask.Status"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.AsyncTask.Status GetStatus()
+        {
+            return IExecuteWithSignature<Android.Os.AsyncTask.Status>("getStatus", "()Landroid/os/AsyncTask$Status;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Cancel(bool arg0)
         {
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
@@ -111,7 +112,7 @@ public bool Cancel(bool arg0)
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsCancelled()
         {
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
@@ -122,7 +123,7 @@ public bool IsCancelled()
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Util.Concurrent.ExecutionException"/>
         /// <exception cref="Java.Lang.InterruptedException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object Get()
         {
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
@@ -136,7 +137,7 @@ public object Get()
         /// <exception cref="Java.Util.Concurrent.ExecutionException"/>
         /// <exception cref="Java.Lang.InterruptedException"/>
         /// <exception cref="Java.Util.Concurrent.TimeoutException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object Get(long arg0, Java.Util.Concurrent.TimeUnit arg1)
         {
             return IExecute("get", arg0, arg1);
@@ -160,21 +161,21 @@ public partial class Status
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/os/AsyncTask.Status.html#FINISHED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Os.AsyncTask.Status FINISHED { get { if (!_FINISHEDReady) { _FINISHEDContent = SGetField<Android.Os.AsyncTask.Status>(LocalBridgeClazz, "FINISHED"); _FINISHEDReady = true; } return _FINISHEDContent; } }
             private static Android.Os.AsyncTask.Status _FINISHEDContent = default;
             private static bool _FINISHEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/os/AsyncTask.Status.html#PENDING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Os.AsyncTask.Status PENDING { get { if (!_PENDINGReady) { _PENDINGContent = SGetField<Android.Os.AsyncTask.Status>(LocalBridgeClazz, "PENDING"); _PENDINGReady = true; } return _PENDINGContent; } }
             private static Android.Os.AsyncTask.Status _PENDINGContent = default;
             private static bool _PENDINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/os/AsyncTask.Status.html#RUNNING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Os.AsyncTask.Status RUNNING { get { if (!_RUNNINGReady) { _RUNNINGContent = SGetField<Android.Os.AsyncTask.Status>(LocalBridgeClazz, "RUNNING"); _RUNNINGReady = true; } return _RUNNINGContent; } }
             private static Android.Os.AsyncTask.Status _RUNNINGContent = default;
             private static bool _RUNNINGReady = false; // this is used because in case of generics 
@@ -240,14 +241,14 @@ public partial class AsyncTask<Params, Progress, Result>
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#SERIAL_EXECUTOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Util.Concurrent.Executor SERIAL_EXECUTOR { get { if (!_SERIAL_EXECUTORReady) { _SERIAL_EXECUTORContent = SGetField<Java.Util.Concurrent.Executor>(LocalBridgeClazz, "SERIAL_EXECUTOR"); _SERIAL_EXECUTORReady = true; } return _SERIAL_EXECUTORContent; } }
         private static Java.Util.Concurrent.Executor _SERIAL_EXECUTORContent = default;
         private static bool _SERIAL_EXECUTORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#THREAD_POOL_EXECUTOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Util.Concurrent.Executor THREAD_POOL_EXECUTOR { get { if (!_THREAD_POOL_EXECUTORReady) { _THREAD_POOL_EXECUTORContent = SGetField<Java.Util.Concurrent.Executor>(LocalBridgeClazz, "THREAD_POOL_EXECUTOR"); _THREAD_POOL_EXECUTORReady = true; } return _THREAD_POOL_EXECUTORContent; } }
         private static Java.Util.Concurrent.Executor _THREAD_POOL_EXECUTORContent = default;
         private static bool _THREAD_POOL_EXECUTORReady = false; // this is used because in case of generics 
@@ -259,7 +260,7 @@ public partial class AsyncTask<Params, Progress, Result>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#execute(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void Execute(Java.Lang.Runnable arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "execute", "(Ljava/lang/Runnable;)V", arg0);
@@ -269,19 +270,11 @@ public static void Execute(Java.Lang.Runnable arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#getStatus()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Os.AsyncTask.Status GetStatus
-        {
-            get { return IExecuteWithSignature<Android.Os.AsyncTask.Status>("getStatus", "()Landroid/os/AsyncTask$Status;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#execute(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="Params"/></param>
         /// <returns><see cref="Android.Os.AsyncTask"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.AsyncTask<Params, Progress, Result> Execute(params Params[] arg0)
         {
             if (arg0.Length == 0) return IExecuteWithSignature<Android.Os.AsyncTask<Params, Progress, Result>>("execute", "([Ljava/lang/Object;)Landroid/os/AsyncTask;"); else return IExecuteWithSignature<Android.Os.AsyncTask<Params, Progress, Result>>("execute", "([Ljava/lang/Object;)Landroid/os/AsyncTask;", arg0);
@@ -292,17 +285,26 @@ public Android.Os.AsyncTask<Params, Progress, Result> Execute(params Params[] ar
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><typeparamref name="Params"/></param>
         /// <returns><see cref="Android.Os.AsyncTask"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.AsyncTask<Params, Progress, Result> ExecuteOnExecutor(Java.Util.Concurrent.Executor arg0, params Params[] arg1)
         {
             if (arg1.Length == 0) return IExecute<Android.Os.AsyncTask<Params, Progress, Result>>("executeOnExecutor", arg0); else return IExecute<Android.Os.AsyncTask<Params, Progress, Result>>("executeOnExecutor", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#getStatus()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.AsyncTask.Status"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.AsyncTask.Status GetStatus()
+        {
+            return IExecuteWithSignature<Android.Os.AsyncTask.Status>("getStatus", "()Landroid/os/AsyncTask$Status;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Cancel(bool arg0)
         {
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
@@ -311,7 +313,7 @@ public bool Cancel(bool arg0)
         /// <see href="https://developer.android.com/reference/android/os/AsyncTask.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsCancelled()
         {
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
@@ -322,7 +324,7 @@ public bool IsCancelled()
         /// <returns><typeparamref name="Result"/></returns>
         /// <exception cref="Java.Util.Concurrent.ExecutionException"/>
         /// <exception cref="Java.Lang.InterruptedException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Result Get()
         {
             return IExecuteWithSignature<Result>("get", "()Ljava/lang/Object;");
@@ -336,7 +338,7 @@ public Result Get()
         /// <exception cref="Java.Util.Concurrent.ExecutionException"/>
         /// <exception cref="Java.Lang.InterruptedException"/>
         /// <exception cref="Java.Util.Concurrent.TimeoutException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Result Get(long arg0, Java.Util.Concurrent.TimeUnit arg1)
         {
             return IExecute<Result>("get", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Os/BaseBundle.cs b/src/net/Netdroid/Generated/Android/Os/BaseBundle.cs
index 867dd2ff2..143ba9354 100644
--- a/src/net/Netdroid/Generated/Android/Os/BaseBundle.cs
+++ b/src/net/Netdroid/Generated/Android/Os/BaseBundle.cs
@@ -159,7 +159,7 @@ public int[] GetIntArray(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object Get(Java.Lang.String arg0)
         {
             return IExecuteWithSignature("get", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Os/Binder.cs b/src/net/Netdroid/Generated/Android/Os/Binder.cs
index 667029f83..9c97dc26b 100644
--- a/src/net/Netdroid/Generated/Android/Os/Binder.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Binder.cs
@@ -50,39 +50,44 @@ public Binder(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingPid()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingUserHandle()"/>
         /// </summary>
-        public static int CallingPid
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public static Android.Os.UserHandle GetCallingUserHandle()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getCallingPid", "()I"); }
+            return SExecuteWithSignature<Android.Os.UserHandle>(LocalBridgeClazz, "getCallingUserHandle", "()Landroid/os/UserHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingUidOrThrow()"/>
         /// </summary>
-        public static int CallingUid
+        /// <returns><see cref="int"/></returns>
+        public static int GetCallingUidOrThrow()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getCallingUid", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getCallingUidOrThrow", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingUidOrThrow()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingPid()"/>
         /// </summary>
-        public static int CallingUidOrThrow
+        /// <returns><see cref="int"/></returns>
+        public static int GetCallingPid()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getCallingUidOrThrow", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getCallingPid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingUserHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingUid()"/>
         /// </summary>
-        public static Android.Os.UserHandle CallingUserHandle
+        /// <returns><see cref="int"/></returns>
+        public static int GetCallingUid()
         {
-            get { return SExecuteWithSignature<Android.Os.UserHandle>(LocalBridgeClazz, "getCallingUserHandle", "()Landroid/os/UserHandle;"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getCallingUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingWorkSourceUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getCallingWorkSourceUid()"/>
         /// </summary>
-        public static int CallingWorkSourceUid
+        /// <returns><see cref="int"/></returns>
+        public static int GetCallingWorkSourceUid()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getCallingWorkSourceUid", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getCallingWorkSourceUid", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Binder.html#clearCallingIdentity()"/>
@@ -144,13 +149,6 @@ public static void JoinThreadPool()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getInterfaceDescriptor()"/> 
-        /// </summary>
-        public Java.Lang.String InterfaceDescriptor
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInterfaceDescriptor", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Binder.html#queryLocalInterface(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -199,6 +197,14 @@ public bool Transact(int arg0, Android.Os.Parcel arg1, Android.Os.Parcel arg2, i
             return IExecute<bool>("transact", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Binder.html#getInterfaceDescriptor()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInterfaceDescriptor()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInterfaceDescriptor", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Binder.html#attachInterface(android.os.IInterface,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.IInterface"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/Build.cs b/src/net/Netdroid/Generated/Android/Os/Build.cs
index 00d7c5a52..3c96adfd4 100644
--- a/src/net/Netdroid/Generated/Android/Os/Build.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Build.cs
@@ -58,14 +58,14 @@ public partial class Build
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Build.html#CPU_ABI"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String CPU_ABI { get { if (!_CPU_ABIReady) { _CPU_ABIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CPU_ABI"); _CPU_ABIReady = true; } return _CPU_ABIContent; } }
         private static Java.Lang.String _CPU_ABIContent = default;
         private static bool _CPU_ABIReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Build.html#CPU_ABI2"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String CPU_ABI2 { get { if (!_CPU_ABI2Ready) { _CPU_ABI2Content = SGetField<Java.Lang.String>(LocalBridgeClazz, "CPU_ABI2"); _CPU_ABI2Ready = true; } return _CPU_ABI2Content; } }
         private static Java.Lang.String _CPU_ABI2Content = default;
         private static bool _CPU_ABI2Ready = false; // this is used because in case of generics 
@@ -132,14 +132,14 @@ public partial class Build
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Build.html#RADIO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String RADIO { get { if (!_RADIOReady) { _RADIOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "RADIO"); _RADIOReady = true; } return _RADIOContent; } }
         private static Java.Lang.String _RADIOContent = default;
         private static bool _RADIOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Build.html#SERIAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SERIAL { get { if (!_SERIALReady) { _SERIALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SERIAL"); _SERIALReady = true; } return _SERIALContent; } }
         private static Java.Lang.String _SERIALContent = default;
         private static bool _SERIALReady = false; // this is used because in case of generics 
@@ -214,25 +214,28 @@ public partial class Build
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Build.html#getFingerprintedPartitions()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Build.html#getRadioVersion()"/>
         /// </summary>
-        public static Java.Util.List<Android.Os.Build.Partition> FingerprintedPartitions
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetRadioVersion()
         {
-            get { return SExecuteWithSignature<Java.Util.List<Android.Os.Build.Partition>>(LocalBridgeClazz, "getFingerprintedPartitions", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getRadioVersion", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Build.html#getRadioVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Build.html#getSerial()"/>
         /// </summary>
-        public static Java.Lang.String RadioVersion
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetSerial()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getRadioVersion", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getSerial", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Build.html#getSerial()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Build.html#getFingerprintedPartitions()"/>
         /// </summary>
-        public static Java.Lang.String Serial
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public static Java.Util.List<Android.Os.Build.Partition> GetFingerprintedPartitions()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getSerial", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Util.List<Android.Os.Build.Partition>>(LocalBridgeClazz, "getFingerprintedPartitions", "()Ljava/util/List;");
         }
 
         #endregion
@@ -269,25 +272,28 @@ public partial class Partition
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Build.Partition.html#getBuildTimeMillis()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Build.Partition.html#getFingerprint()"/>
             /// </summary>
-            public long BuildTimeMillis
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetFingerprint()
             {
-                get { return IExecuteWithSignature<long>("getBuildTimeMillis", "()J"); }
+                return IExecuteWithSignature<Java.Lang.String>("getFingerprint", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Build.Partition.html#getFingerprint()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Build.Partition.html#getName()"/>
             /// </summary>
-            public Java.Lang.String Fingerprint
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getFingerprint", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Build.Partition.html#getName()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Build.Partition.html#getBuildTimeMillis()"/>
             /// </summary>
-            public Java.Lang.String Name
+            /// <returns><see cref="long"/></returns>
+            public long GetBuildTimeMillis()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<long>("getBuildTimeMillis", "()J");
             }
 
             #endregion
@@ -369,7 +375,7 @@ public partial class VERSION
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/os/Build.VERSION.html#SDK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SDK { get { if (!_SDKReady) { _SDKContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SDK"); _SDKReady = true; } return _SDKContent; } }
             private static Java.Lang.String _SDKContent = default;
             private static bool _SDKReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Os/Bundle.cs b/src/net/Netdroid/Generated/Android/Os/Bundle.cs
index f4c1f7407..2fb38424b 100644
--- a/src/net/Netdroid/Generated/Android/Os/Bundle.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Bundle.cs
@@ -98,11 +98,15 @@ public Bundle(Java.Lang.ClassLoader arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getClassLoader()"/> <see href="https://developer.android.com/reference/android/os/Bundle.html#setClassLoader(java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getSparseParcelableArray(java.lang.String,java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.ClassLoader ClassLoader
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<T> GetSparseParcelableArray<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
         {
-            get { return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;"); } set { IExecuteWithSignature("setClassLoader", "(Ljava/lang/ClassLoader;)V", value); }
+            return IExecute<Android.Util.SparseArray<T>>("getSparseParcelableArray", arg0, arg1);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getSparseParcelableArray(java.lang.String)"/>
@@ -110,76 +114,65 @@ public Java.Lang.ClassLoader ClassLoader
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
         /// <returns><see cref="Android.Util.SparseArray"/></returns>
-        [System.Obsolete()]
-        public Android.Util.SparseArray<T> GetSparseParcelableArray<T>(Java.Lang.String arg0) where T: Android.Os.IParcelable, new()
+        [global::System.Obsolete()]
+        public Android.Util.SparseArray<T> GetSparseParcelableArray<T>(Java.Lang.String arg0) where T : Android.Os.IParcelable, new()
         {
-            return IExecuteWithSignature<Android.Util.SparseArray<T>>("getSparseParcelableArray", "(Ljava/lang/String;)Landroid/util/SparseArray;", arg0);
+            return IExecute<Android.Util.SparseArray<T>>("getSparseParcelableArray", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelableArrayList(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelableArrayList(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.ArrayList"/></returns>
-        [System.Obsolete()]
-        public Java.Util.ArrayList<T> GetParcelableArrayList<T>(Java.Lang.String arg0) where T: Android.Os.IParcelable, new()
+        public Java.Util.ArrayList<T> GetParcelableArrayList<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
         {
-            return IExecuteWithSignature<Java.Util.ArrayList<T>>("getParcelableArrayList", "(Ljava/lang/String;)Ljava/util/ArrayList;", arg0);
+            return IExecute<Java.Util.ArrayList<T>>("getParcelableArrayList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelable(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelableArrayList(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        [System.Obsolete()]
-        public T GetParcelable<T>(Java.Lang.String arg0) where T: Android.Os.IParcelable, new()
-        {
-            return IExecuteWithSignature<T>("getParcelable", "(Ljava/lang/String;)Landroid/os/Parcelable;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getSerializable(java.lang.String,java.lang.Class)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Java.Io.ISerializable"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T GetSerializable<T>(Java.Lang.String arg0, Java.Lang.Class arg1) where T: Java.Io.ISerializable, new()
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.ArrayList<T> GetParcelableArrayList<T>(Java.Lang.String arg0) where T : Android.Os.IParcelable, new()
         {
-            return IExecute<T>("getSerializable", arg0, arg1);
+            return IExecute<Java.Util.ArrayList<T>>("getParcelableArrayList", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getSparseParcelableArray(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelable(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="Android.Util.SparseArray"/></returns>
-        public Android.Util.SparseArray<T> GetSparseParcelableArray<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
+        /// <returns><typeparamref name="T"/></returns>
+        public T GetParcelable<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
         {
-            return IExecute<Android.Util.SparseArray<T>>("getSparseParcelableArray", arg0, arg1);
+            return IExecute<T>("getParcelable", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelableArrayList(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelable(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="Java.Util.ArrayList"/></returns>
-        public Java.Util.ArrayList<T> GetParcelableArrayList<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        [global::System.Obsolete()]
+        public T GetParcelable<T>(Java.Lang.String arg0) where T : Android.Os.IParcelable, new()
         {
-            return IExecute<Java.Util.ArrayList<T>>("getParcelableArrayList", arg0, arg1);
+            return IExecute<T>("getParcelable", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelable(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getSerializable(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T"><see cref="Java.Io.ISerializable"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T GetParcelable<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
+        public T GetSerializable<T>(Java.Lang.String arg0, Java.Lang.Class arg1) where T : Java.Io.ISerializable, new()
         {
-            return IExecute<T>("getParcelable", arg0, arg1);
+            return IExecute<T>("getSerializable", arg0, arg1);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getParcelableArray(java.lang.String,java.lang.Class)"/>
@@ -223,7 +216,7 @@ public Android.Os.IBinder GetBinder(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Os.Parcelable"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.Parcelable[] GetParcelableArray(Java.Lang.String arg0)
         {
             return IExecuteWithSignatureArray<Android.Os.Parcelable>("getParcelableArray", "(Ljava/lang/String;)[Landroid/os/Parcelable;", arg0);
@@ -341,7 +334,7 @@ public int DescribeContents()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.Serializable"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Io.Serializable GetSerializable(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Io.Serializable>("getSerializable", "(Ljava/lang/String;)Ljava/io/Serializable;", arg0);
@@ -385,6 +378,14 @@ public Java.Lang.CharSequence[] GetCharSequenceArray(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getCharSequenceArray", "(Ljava/lang/String;)[Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getClassLoader()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public Java.Lang.ClassLoader GetClassLoader()
+        {
+            return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Bundle.html#getCharSequenceArrayList(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -579,7 +580,7 @@ public void PutParcelableArray(Java.Lang.String arg0, Android.Os.Parcelable[] ar
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.ArrayList"/></param>
         /// <typeparam name="Arg1ExtendsAndroid_Os_Parcelable"><see cref="Android.Os.Parcelable"/></typeparam>
-        public void PutParcelableArrayList<Arg1ExtendsAndroid_Os_Parcelable>(Java.Lang.String arg0, Java.Util.ArrayList<Arg1ExtendsAndroid_Os_Parcelable> arg1) where Arg1ExtendsAndroid_Os_Parcelable: Android.Os.Parcelable
+        public void PutParcelableArrayList<Arg1ExtendsAndroid_Os_Parcelable>(Java.Lang.String arg0, Java.Util.ArrayList<Arg1ExtendsAndroid_Os_Parcelable> arg1) where Arg1ExtendsAndroid_Os_Parcelable : Android.Os.Parcelable
         {
             IExecute("putParcelableArrayList", arg0, arg1);
         }
@@ -634,7 +635,7 @@ public void PutSizeF(Java.Lang.String arg0, Android.Util.SizeF arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.Util.SparseArray"/></param>
         /// <typeparam name="Arg1ExtendsAndroid_Os_Parcelable"><see cref="Android.Os.Parcelable"/></typeparam>
-        public void PutSparseParcelableArray<Arg1ExtendsAndroid_Os_Parcelable>(Java.Lang.String arg0, Android.Util.SparseArray<Arg1ExtendsAndroid_Os_Parcelable> arg1) where Arg1ExtendsAndroid_Os_Parcelable: Android.Os.Parcelable
+        public void PutSparseParcelableArray<Arg1ExtendsAndroid_Os_Parcelable>(Java.Lang.String arg0, Android.Util.SparseArray<Arg1ExtendsAndroid_Os_Parcelable> arg1) where Arg1ExtendsAndroid_Os_Parcelable : Android.Os.Parcelable
         {
             IExecute("putSparseParcelableArray", arg0, arg1);
         }
@@ -656,6 +657,14 @@ public void ReadFromParcel(Android.Os.Parcel arg0)
             IExecuteWithSignature("readFromParcel", "(Landroid/os/Parcel;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Bundle.html#setClassLoader(java.lang.ClassLoader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
+        public void SetClassLoader(Java.Lang.ClassLoader arg0)
+        {
+            IExecuteWithSignature("setClassLoader", "(Ljava/lang/ClassLoader;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Bundle.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/CancellationSignal.cs b/src/net/Netdroid/Generated/Android/Os/CancellationSignal.cs
index bb324dfa0..dcb2b68f2 100644
--- a/src/net/Netdroid/Generated/Android/Os/CancellationSignal.cs
+++ b/src/net/Netdroid/Generated/Android/Os/CancellationSignal.cs
@@ -104,7 +104,7 @@ public partial class OnCancelListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCancel", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCancelEventHandler));
+                AddEventHandler("onCancel", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCancelEventHandler));
 
             }
 
@@ -112,7 +112,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/CancellationSignal.OnCancelListener.html#onCancel()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCancel"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnCancel { get; set; } = null;
+            public global::System.Action OnOnCancel { get; set; } = null;
 
             void OnCancelEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Os/CpuUsageInfo.cs b/src/net/Netdroid/Generated/Android/Os/CpuUsageInfo.cs
index 633aef9d8..897413098 100644
--- a/src/net/Netdroid/Generated/Android/Os/CpuUsageInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Os/CpuUsageInfo.cs
@@ -52,26 +52,28 @@ public partial class CpuUsageInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/CpuUsageInfo.html#getActive()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/CpuUsageInfo.html#describeContents()"/>
         /// </summary>
-        public long Active
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getActive", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/CpuUsageInfo.html#getTotal()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/CpuUsageInfo.html#getActive()"/>
         /// </summary>
-        public long Total
+        /// <returns><see cref="long"/></returns>
+        public long GetActive()
         {
-            get { return IExecuteWithSignature<long>("getTotal", "()J"); }
+            return IExecuteWithSignature<long>("getActive", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/CpuUsageInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/os/CpuUsageInfo.html#getTotal()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTotal()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTotal", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/CpuUsageInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Os/Debug.cs b/src/net/Netdroid/Generated/Android/Os/Debug.cs
index c67525c13..f141ea25b 100644
--- a/src/net/Netdroid/Generated/Android/Os/Debug.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Debug.cs
@@ -58,7 +58,7 @@ public partial class Debug
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#TRACE_COUNT_ALLOCS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRACE_COUNT_ALLOCS { get { if (!_TRACE_COUNT_ALLOCSReady) { _TRACE_COUNT_ALLOCSContent = SGetField<int>(LocalBridgeClazz, "TRACE_COUNT_ALLOCS"); _TRACE_COUNT_ALLOCSReady = true; } return _TRACE_COUNT_ALLOCSContent; } }
         private static int _TRACE_COUNT_ALLOCSContent = default;
         private static bool _TRACE_COUNT_ALLOCSReady = false; // this is used because in case of generics 
@@ -67,273 +67,300 @@ public partial class Debug
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderDeathObjectCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#dumpService(java.lang.String,java.io.FileDescriptor,java.lang.String[])"/>
         /// </summary>
-        public static int BinderDeathObjectCount
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
+        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public static bool DumpService(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Lang.String[] arg2)
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderDeathObjectCount", "()I"); }
+            return SExecute<bool>(LocalBridgeClazz, "dumpService", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderLocalObjectCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#isDebuggerConnected()"/>
         /// </summary>
-        public static int BinderLocalObjectCount
+        /// <returns><see cref="bool"/></returns>
+        public static bool IsDebuggerConnected()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderLocalObjectCount", "()I"); }
+            return SExecuteWithSignature<bool>(LocalBridgeClazz, "isDebuggerConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderProxyObjectCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#waitingForDebugger()"/>
         /// </summary>
-        public static int BinderProxyObjectCount
+        /// <returns><see cref="bool"/></returns>
+        public static bool WaitingForDebugger()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderProxyObjectCount", "()I"); }
+            return SExecuteWithSignature<bool>(LocalBridgeClazz, "waitingForDebugger", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderReceivedTransactions()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalAllocCount()"/>
         /// </summary>
-        public static int BinderReceivedTransactions
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalAllocCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderReceivedTransactions", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalAllocCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderSentTransactions()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalAllocSize()"/>
         /// </summary>
-        public static int BinderSentTransactions
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalAllocSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderSentTransactions", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalAllocSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalAllocCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalClassInitCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalAllocCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalClassInitCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalAllocCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalClassInitCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalAllocSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalClassInitTime()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalAllocSize
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalClassInitTime()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalAllocSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalClassInitTime", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalClassInitCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalExternalAllocCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalClassInitCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalExternalAllocCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalClassInitCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalExternalAllocCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalClassInitTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalExternalAllocSize()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalClassInitTime
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalExternalAllocSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalClassInitTime", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalExternalAllocSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalExternalAllocCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalExternalFreedCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalExternalAllocCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalExternalFreedCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalExternalAllocCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalExternalFreedCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalExternalAllocSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalExternalFreedSize()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalExternalAllocSize
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalExternalFreedSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalExternalAllocSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalExternalFreedSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalExternalFreedCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalFreedCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalExternalFreedCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalFreedCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalExternalFreedCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalFreedCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalExternalFreedSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalFreedSize()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalExternalFreedSize
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalFreedSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalExternalFreedSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalFreedSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalFreedCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalGcInvocationCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalFreedCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetGlobalGcInvocationCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalFreedCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalGcInvocationCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalFreedSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getLoadedClassCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalFreedSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetLoadedClassCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalFreedSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getLoadedClassCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getGlobalGcInvocationCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadAllocCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int GlobalGcInvocationCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetThreadAllocCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getGlobalGcInvocationCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadAllocCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getLoadedClassCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadAllocSize()"/>
         /// </summary>
-        public static int LoadedClassCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetThreadAllocSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getLoadedClassCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadAllocSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getNativeHeapAllocatedSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadExternalAllocCount()"/>
         /// </summary>
-        public static long NativeHeapAllocatedSize
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetThreadExternalAllocCount()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getNativeHeapAllocatedSize", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadExternalAllocCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getNativeHeapFreeSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadExternalAllocSize()"/>
         /// </summary>
-        public static long NativeHeapFreeSize
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetThreadExternalAllocSize()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getNativeHeapFreeSize", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadExternalAllocSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getNativeHeapSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadGcInvocationCount()"/>
         /// </summary>
-        public static long NativeHeapSize
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetThreadGcInvocationCount()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getNativeHeapSize", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadGcInvocationCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getPss()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#setAllocationLimit(int)"/>
         /// </summary>
-        public static long Pss
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int SetAllocationLimit(int arg0)
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getPss", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "setAllocationLimit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getRuntimeStats()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#setGlobalAllocationLimit(int)"/>
         /// </summary>
-        public static Java.Util.Map<Java.Lang.String, Java.Lang.String> RuntimeStats
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int SetGlobalAllocationLimit(int arg0)
         {
-            get { return SExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>(LocalBridgeClazz, "getRuntimeStats", "()Ljava/util/Map;"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "setGlobalAllocationLimit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadAllocCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getRuntimeStat(java.lang.String)"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int ThreadAllocCount
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetRuntimeStat(Java.Lang.String arg0)
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadAllocCount", "()I"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getRuntimeStat", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadAllocSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getRuntimeStats()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int ThreadAllocSize
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public static Java.Util.Map<Java.Lang.String, Java.Lang.String> GetRuntimeStats()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadAllocSize", "()I"); }
+            return SExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>(LocalBridgeClazz, "getRuntimeStats", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadExternalAllocCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#threadCpuTimeNanos()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int ThreadExternalAllocCount
+        /// <returns><see cref="long"/></returns>
+        public static long ThreadCpuTimeNanos()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadExternalAllocCount", "()I"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "threadCpuTimeNanos", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadExternalAllocSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderDeathObjectCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int ThreadExternalAllocSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetBinderDeathObjectCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadExternalAllocSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderDeathObjectCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getThreadGcInvocationCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderLocalObjectCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int ThreadGcInvocationCount
+        /// <returns><see cref="int"/></returns>
+        public static int GetBinderLocalObjectCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getThreadGcInvocationCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderLocalObjectCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#dumpService(java.lang.String,java.io.FileDescriptor,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderProxyObjectCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public static bool DumpService(Java.Lang.String arg0, Java.Io.FileDescriptor arg1, Java.Lang.String[] arg2)
+        /// <returns><see cref="int"/></returns>
+        public static int GetBinderProxyObjectCount()
         {
-            return SExecute<bool>(LocalBridgeClazz, "dumpService", arg0, arg1, arg2);
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderProxyObjectCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#isDebuggerConnected()"/>
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderReceivedTransactions()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public static bool IsDebuggerConnected()
+        /// <returns><see cref="int"/></returns>
+        public static int GetBinderReceivedTransactions()
         {
-            return SExecuteWithSignature<bool>(LocalBridgeClazz, "isDebuggerConnected", "()Z");
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderReceivedTransactions", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#waitingForDebugger()"/>
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getBinderSentTransactions()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public static bool WaitingForDebugger()
+        /// <returns><see cref="int"/></returns>
+        public static int GetBinderSentTransactions()
         {
-            return SExecuteWithSignature<bool>(LocalBridgeClazz, "waitingForDebugger", "()Z");
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getBinderSentTransactions", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#setAllocationLimit(int)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getNativeHeapAllocatedSize()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public static int SetAllocationLimit(int arg0)
+        /// <returns><see cref="long"/></returns>
+        public static long GetNativeHeapAllocatedSize()
         {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "setAllocationLimit", "(I)I", arg0);
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getNativeHeapAllocatedSize", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#setGlobalAllocationLimit(int)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getNativeHeapFreeSize()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public static int SetGlobalAllocationLimit(int arg0)
+        /// <returns><see cref="long"/></returns>
+        public static long GetNativeHeapFreeSize()
         {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "setGlobalAllocationLimit", "(I)I", arg0);
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getNativeHeapFreeSize", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getRuntimeStat(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getNativeHeapSize()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public static Java.Lang.String GetRuntimeStat(Java.Lang.String arg0)
+        /// <returns><see cref="long"/></returns>
+        public static long GetNativeHeapSize()
         {
-            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getRuntimeStat", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getNativeHeapSize", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Debug.html#threadCpuTimeNanos()"/>
+        /// <see href="https://developer.android.com/reference/android/os/Debug.html#getPss()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
-        public static long ThreadCpuTimeNanos()
+        public static long GetPss()
         {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "threadCpuTimeNanos", "()J");
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getPss", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#getMemoryInfo(android.os.Debug.MemoryInfo)"/>
@@ -358,7 +385,7 @@ public static void AttachJvmtiAgent(Java.Lang.String arg0, Java.Lang.String arg1
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#changeDebugPort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ChangeDebugPort(int arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "changeDebugPort", "(I)V", arg0);
@@ -375,7 +402,7 @@ public static void DumpHprofData(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#enableEmulatorTraceOutput()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void EnableEmulatorTraceOutput()
         {
             SExecuteWithSignature(LocalBridgeClazz, "enableEmulatorTraceOutput", "()V");
@@ -391,7 +418,7 @@ public static void PrintLoadedClasses(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetAllCounts()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetAllCounts()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetAllCounts", "()V");
@@ -399,7 +426,7 @@ public static void ResetAllCounts()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalAllocCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalAllocCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalAllocCount", "()V");
@@ -407,7 +434,7 @@ public static void ResetGlobalAllocCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalAllocSize()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalAllocSize()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalAllocSize", "()V");
@@ -415,7 +442,7 @@ public static void ResetGlobalAllocSize()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalClassInitCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalClassInitCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalClassInitCount", "()V");
@@ -423,7 +450,7 @@ public static void ResetGlobalClassInitCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalClassInitTime()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalClassInitTime()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalClassInitTime", "()V");
@@ -431,7 +458,7 @@ public static void ResetGlobalClassInitTime()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalExternalAllocCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalExternalAllocCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalExternalAllocCount", "()V");
@@ -439,7 +466,7 @@ public static void ResetGlobalExternalAllocCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalExternalAllocSize()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalExternalAllocSize()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalExternalAllocSize", "()V");
@@ -447,7 +474,7 @@ public static void ResetGlobalExternalAllocSize()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalExternalFreedCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalExternalFreedCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalExternalFreedCount", "()V");
@@ -455,7 +482,7 @@ public static void ResetGlobalExternalFreedCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalExternalFreedSize()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalExternalFreedSize()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalExternalFreedSize", "()V");
@@ -463,7 +490,7 @@ public static void ResetGlobalExternalFreedSize()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalFreedCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalFreedCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalFreedCount", "()V");
@@ -471,7 +498,7 @@ public static void ResetGlobalFreedCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalFreedSize()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalFreedSize()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalFreedSize", "()V");
@@ -479,7 +506,7 @@ public static void ResetGlobalFreedSize()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetGlobalGcInvocationCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetGlobalGcInvocationCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetGlobalGcInvocationCount", "()V");
@@ -487,7 +514,7 @@ public static void ResetGlobalGcInvocationCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetThreadAllocCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetThreadAllocCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetThreadAllocCount", "()V");
@@ -495,7 +522,7 @@ public static void ResetThreadAllocCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetThreadAllocSize()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetThreadAllocSize()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetThreadAllocSize", "()V");
@@ -503,7 +530,7 @@ public static void ResetThreadAllocSize()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetThreadExternalAllocCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetThreadExternalAllocCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetThreadExternalAllocCount", "()V");
@@ -511,7 +538,7 @@ public static void ResetThreadExternalAllocCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetThreadExternalAllocSize()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetThreadExternalAllocSize()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetThreadExternalAllocSize", "()V");
@@ -519,7 +546,7 @@ public static void ResetThreadExternalAllocSize()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#resetThreadGcInvocationCount()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ResetThreadGcInvocationCount()
         {
             SExecuteWithSignature(LocalBridgeClazz, "resetThreadGcInvocationCount", "()V");
@@ -527,7 +554,7 @@ public static void ResetThreadGcInvocationCount()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#startAllocCounting()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void StartAllocCounting()
         {
             SExecuteWithSignature(LocalBridgeClazz, "startAllocCounting", "()V");
@@ -586,7 +613,7 @@ public static void StartNativeTracing()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Debug.html#stopAllocCounting()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void StopAllocCounting()
         {
             SExecuteWithSignature(LocalBridgeClazz, "stopAllocCounting", "()V");
@@ -644,7 +671,7 @@ public partial class InstructionCount
             /// <see href="https://developer.android.com/reference/android/os/Debug.InstructionCount.html#collect()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool Collect()
             {
                 return IExecuteWithSignature<bool>("collect", "()Z");
@@ -653,7 +680,7 @@ public bool Collect()
             /// <see href="https://developer.android.com/reference/android/os/Debug.InstructionCount.html#resetAndStart()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool ResetAndStart()
             {
                 return IExecuteWithSignature<bool>("resetAndStart", "()Z");
@@ -662,7 +689,7 @@ public bool ResetAndStart()
             /// <see href="https://developer.android.com/reference/android/os/Debug.InstructionCount.html#globalMethodInvocations()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int GlobalMethodInvocations()
             {
                 return IExecuteWithSignature<int>("globalMethodInvocations", "()I");
@@ -671,7 +698,7 @@ public int GlobalMethodInvocations()
             /// <see href="https://developer.android.com/reference/android/os/Debug.InstructionCount.html#globalTotal()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int GlobalTotal()
             {
                 return IExecuteWithSignature<int>("globalTotal", "()I");
@@ -750,61 +777,60 @@ public partial class MemoryInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getMemoryStats()"/> 
-            /// </summary>
-            public Java.Util.Map<Java.Lang.String, Java.Lang.String> MemoryStats
-            {
-                get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getMemoryStats", "()Ljava/util/Map;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalPrivateClean()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#describeContents()"/>
             /// </summary>
-            public int TotalPrivateClean
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getTotalPrivateClean", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalPrivateDirty()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalPrivateClean()"/>
             /// </summary>
-            public int TotalPrivateDirty
+            /// <returns><see cref="int"/></returns>
+            public int GetTotalPrivateClean()
             {
-                get { return IExecuteWithSignature<int>("getTotalPrivateDirty", "()I"); }
+                return IExecuteWithSignature<int>("getTotalPrivateClean", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalPss()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalPrivateDirty()"/>
             /// </summary>
-            public int TotalPss
+            /// <returns><see cref="int"/></returns>
+            public int GetTotalPrivateDirty()
             {
-                get { return IExecuteWithSignature<int>("getTotalPss", "()I"); }
+                return IExecuteWithSignature<int>("getTotalPrivateDirty", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalSharedClean()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalPss()"/>
             /// </summary>
-            public int TotalSharedClean
+            /// <returns><see cref="int"/></returns>
+            public int GetTotalPss()
             {
-                get { return IExecuteWithSignature<int>("getTotalSharedClean", "()I"); }
+                return IExecuteWithSignature<int>("getTotalPss", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalSharedDirty()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalSharedClean()"/>
             /// </summary>
-            public int TotalSharedDirty
+            /// <returns><see cref="int"/></returns>
+            public int GetTotalSharedClean()
             {
-                get { return IExecuteWithSignature<int>("getTotalSharedDirty", "()I"); }
+                return IExecuteWithSignature<int>("getTotalSharedClean", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalSwappablePss()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalSharedDirty()"/>
             /// </summary>
-            public int TotalSwappablePss
+            /// <returns><see cref="int"/></returns>
+            public int GetTotalSharedDirty()
             {
-                get { return IExecuteWithSignature<int>("getTotalSwappablePss", "()I"); }
+                return IExecuteWithSignature<int>("getTotalSharedDirty", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getTotalSwappablePss()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetTotalSwappablePss()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getTotalSwappablePss", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getMemoryStat(java.lang.String)"/>
@@ -816,6 +842,14 @@ public Java.Lang.String GetMemoryStat(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Lang.String>("getMemoryStat", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#getMemoryStats()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.Map"/></returns>
+            public Java.Util.Map<Java.Lang.String, Java.Lang.String> GetMemoryStats()
+            {
+                return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getMemoryStats", "()Ljava/util/Map;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/os/Debug.MemoryInfo.html#readFromParcel(android.os.Parcel)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/DropBoxManager.cs b/src/net/Netdroid/Generated/Android/Os/DropBoxManager.cs
index acb80860e..760077d68 100644
--- a/src/net/Netdroid/Generated/Android/Os/DropBoxManager.cs
+++ b/src/net/Netdroid/Generated/Android/Os/DropBoxManager.cs
@@ -228,40 +228,37 @@ public Entry(Java.Lang.String arg0, long arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getFlags()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#describeContents()"/>
             /// </summary>
-            public int Flags
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getInputStream()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getFlags()"/>
             /// </summary>
-            public Java.Io.InputStream InputStream
+            /// <returns><see cref="int"/></returns>
+            public int GetFlags()
             {
-                get { return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;"); }
+                return IExecuteWithSignature<int>("getFlags", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getTag()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getInputStream()"/>
             /// </summary>
-            public Java.Lang.String Tag
+            /// <returns><see cref="Java.Io.InputStream"/></returns>
+            /// <exception cref="Java.Io.IOException"/>
+            public Java.Io.InputStream GetInputStream()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getTimeMillis()"/> 
+            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getTag()"/>
             /// </summary>
-            public long TimeMillis
-            {
-                get { return IExecuteWithSignature<long>("getTimeMillis", "()J"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#describeContents()"/>
-            /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetTag()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getText(int)"/>
@@ -273,6 +270,14 @@ public Java.Lang.String GetText(int arg0)
                 return IExecuteWithSignature<Java.Lang.String>("getText", "(I)Ljava/lang/String;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#getTimeMillis()"/>
+            /// </summary>
+            /// <returns><see cref="long"/></returns>
+            public long GetTimeMillis()
+            {
+                return IExecuteWithSignature<long>("getTimeMillis", "()J");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/os/DropBoxManager.Entry.html#close()"/>
             /// </summary>
             public void Close()
diff --git a/src/net/Netdroid/Generated/Android/Os/Environment.cs b/src/net/Netdroid/Generated/Android/Os/Environment.cs
index b23aa12ee..695b356c4 100644
--- a/src/net/Netdroid/Generated/Android/Os/Environment.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Environment.cs
@@ -160,48 +160,6 @@ public partial class Environment
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getDataDirectory()"/> 
-        /// </summary>
-        public static Java.Io.File DataDirectory
-        {
-            get { return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getDataDirectory", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getDownloadCacheDirectory()"/> 
-        /// </summary>
-        public static Java.Io.File DownloadCacheDirectory
-        {
-            get { return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getDownloadCacheDirectory", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getExternalStorageDirectory()"/> 
-        /// </summary>
-        public static Java.Io.File ExternalStorageDirectory
-        {
-            get { return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getExternalStorageDirectory", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getExternalStorageState()"/> 
-        /// </summary>
-        public static Java.Lang.String ExternalStorageState
-        {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getExternalStorageState", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getRootDirectory()"/> 
-        /// </summary>
-        public static Java.Io.File RootDirectory
-        {
-            get { return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getRootDirectory", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getStorageDirectory()"/> 
-        /// </summary>
-        public static Java.Io.File StorageDirectory
-        {
-            get { return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getStorageDirectory", "()Ljava/io/File;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Environment.html#isExternalStorageEmulated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -270,6 +228,30 @@ public static bool IsExternalStorageRemovable(Java.Io.File arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isExternalStorageRemovable", "(Ljava/io/File;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getDataDirectory()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public static Java.Io.File GetDataDirectory()
+        {
+            return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getDataDirectory", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getDownloadCacheDirectory()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public static Java.Io.File GetDownloadCacheDirectory()
+        {
+            return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getDownloadCacheDirectory", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getExternalStorageDirectory()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public static Java.Io.File GetExternalStorageDirectory()
+        {
+            return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getExternalStorageDirectory", "()Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Environment.html#getExternalStoragePublicDirectory(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -279,6 +261,30 @@ public static Java.Io.File GetExternalStoragePublicDirectory(Java.Lang.String ar
             return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getExternalStoragePublicDirectory", "(Ljava/lang/String;)Ljava/io/File;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getRootDirectory()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public static Java.Io.File GetRootDirectory()
+        {
+            return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getRootDirectory", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getStorageDirectory()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public static Java.Io.File GetStorageDirectory()
+        {
+            return SExecuteWithSignature<Java.Io.File>(LocalBridgeClazz, "getStorageDirectory", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Environment.html#getExternalStorageState()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetExternalStorageState()
+        {
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getExternalStorageState", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Environment.html#getExternalStorageState(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
@@ -292,7 +298,7 @@ public static Java.Lang.String GetExternalStorageState(Java.Io.File arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetStorageState(Java.Io.File arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getStorageState", "(Ljava/io/File;)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Os/Ext/SdkExtensions.cs b/src/net/Netdroid/Generated/Android/Os/Ext/SdkExtensions.cs
index 4593b1ff2..10514d5b8 100644
--- a/src/net/Netdroid/Generated/Android/Os/Ext/SdkExtensions.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Ext/SdkExtensions.cs
@@ -48,13 +48,6 @@ public partial class SdkExtensions
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/ext/SdkExtensions.html#getAllExtensionVersions()"/> 
-        /// </summary>
-        public static Java.Util.Map<Java.Lang.Integer, Java.Lang.Integer> AllExtensionVersions
-        {
-            get { return SExecuteWithSignature<Java.Util.Map<Java.Lang.Integer, Java.Lang.Integer>>(LocalBridgeClazz, "getAllExtensionVersions", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/ext/SdkExtensions.html#getExtensionVersion(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -63,6 +56,14 @@ public static int GetExtensionVersion(int arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getExtensionVersion", "(I)I", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/ext/SdkExtensions.html#getAllExtensionVersions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public static Java.Util.Map<Java.Lang.Integer, Java.Lang.Integer> GetAllExtensionVersions()
+        {
+            return SExecuteWithSignature<Java.Util.Map<Java.Lang.Integer, Java.Lang.Integer>>(LocalBridgeClazz, "getAllExtensionVersions", "()Ljava/util/Map;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Os/FileObserver.cs b/src/net/Netdroid/Generated/Android/Os/FileObserver.cs
index b18444a87..4c4ce239e 100644
--- a/src/net/Netdroid/Generated/Android/Os/FileObserver.cs
+++ b/src/net/Netdroid/Generated/Android/Os/FileObserver.cs
@@ -51,7 +51,7 @@ public FileObserver(Java.Io.File arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FileObserver(Java.Lang.String arg0, int arg1)
             : base(arg0, arg1)
         {
@@ -60,7 +60,7 @@ public FileObserver(Java.Lang.String arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/os/FileObserver.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FileObserver(Java.Lang.String arg0)
             : base(arg0)
         {
diff --git a/src/net/Netdroid/Generated/Android/Os/FileUtils.cs b/src/net/Netdroid/Generated/Android/Os/FileUtils.cs
index 3a2977814..eb2ef20e9 100644
--- a/src/net/Netdroid/Generated/Android/Os/FileUtils.cs
+++ b/src/net/Netdroid/Generated/Android/Os/FileUtils.cs
@@ -95,7 +95,7 @@ public static long Copy(Java.Io.InputStream arg0, Java.Io.OutputStream arg1)
         /// <see href="https://developer.android.com/reference/android/os/FileUtils.html#closeQuietly(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void CloseQuietly(Java.Io.FileDescriptor arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "closeQuietly", "(Ljava/io/FileDescriptor;)V", arg0);
@@ -104,7 +104,7 @@ public static void CloseQuietly(Java.Io.FileDescriptor arg0)
         /// <see href="https://developer.android.com/reference/android/os/FileUtils.html#closeQuietly(java.lang.AutoCloseable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.AutoCloseable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void CloseQuietly(Java.Lang.AutoCloseable arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "closeQuietly", "(Ljava/lang/AutoCloseable;)V", arg0);
@@ -142,7 +142,7 @@ public partial class ProgressListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onProgress", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(OnProgressEventHandler));
+                AddEventHandler("onProgress", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(OnProgressEventHandler));
 
             }
 
@@ -150,7 +150,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/FileUtils.ProgressListener.html#onProgress(long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnProgress"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<long> OnOnProgress { get; set; } = null;
+            public global::System.Action<long> OnOnProgress { get; set; } = null;
 
             void OnProgressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Os/Handler.cs b/src/net/Netdroid/Generated/Android/Os/Handler.cs
index 9d2d9c5c9..e20aa161d 100644
--- a/src/net/Netdroid/Generated/Android/Os/Handler.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Handler.cs
@@ -33,7 +33,7 @@ public partial class Handler
         /// <see href="https://developer.android.com/reference/android/os/Handler.html#%3Cinit%3E(android.os.Handler.Callback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Handler.Callback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Handler(Android.Os.Handler.Callback arg0)
             : base(arg0)
         {
@@ -91,13 +91,6 @@ public static Android.Os.Handler CreateAsync(Android.Os.Looper arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Handler.html#getLooper()"/> 
-        /// </summary>
-        public Android.Os.Looper Looper
-        {
-            get { return IExecuteWithSignature<Android.Os.Looper>("getLooper", "()Landroid/os/Looper;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Handler.html#sendMessageAtTime(android.os.Message,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Message"/></param>
@@ -108,6 +101,14 @@ public bool SendMessageAtTime(Android.Os.Message arg0, long arg1)
             return IExecute<bool>("sendMessageAtTime", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Handler.html#getLooper()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Looper"/></returns>
+        public Android.Os.Looper GetLooper()
+        {
+            return IExecuteWithSignature<Android.Os.Looper>("getLooper", "()Landroid/os/Looper;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Handler.html#obtainMessage()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.Message"/></returns>
diff --git a/src/net/Netdroid/Generated/Android/Os/HandlerThread.cs b/src/net/Netdroid/Generated/Android/Os/HandlerThread.cs
index d7838178b..650e01ae1 100644
--- a/src/net/Netdroid/Generated/Android/Os/HandlerThread.cs
+++ b/src/net/Netdroid/Generated/Android/Os/HandlerThread.cs
@@ -63,18 +63,12 @@ public HandlerThread(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/HandlerThread.html#getLooper()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/HandlerThread.html#getLooper()"/>
         /// </summary>
-        public Android.Os.Looper Looper
+        /// <returns><see cref="Android.Os.Looper"/></returns>
+        public Android.Os.Looper GetLooper()
         {
-            get { return IExecuteWithSignature<Android.Os.Looper>("getLooper", "()Landroid/os/Looper;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/HandlerThread.html#getThreadId()"/> 
-        /// </summary>
-        public int ThreadId
-        {
-            get { return IExecuteWithSignature<int>("getThreadId", "()I"); }
+            return IExecuteWithSignature<Android.Os.Looper>("getLooper", "()Landroid/os/Looper;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/HandlerThread.html#quit()"/>
@@ -92,6 +86,14 @@ public bool QuitSafely()
         {
             return IExecuteWithSignature<bool>("quitSafely", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/HandlerThread.html#getThreadId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetThreadId()
+        {
+            return IExecuteWithSignature<int>("getThreadId", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Os/HardwarePropertiesManager.cs b/src/net/Netdroid/Generated/Android/Os/HardwarePropertiesManager.cs
index 6b1955500..0684760e4 100644
--- a/src/net/Netdroid/Generated/Android/Os/HardwarePropertiesManager.cs
+++ b/src/net/Netdroid/Generated/Android/Os/HardwarePropertiesManager.cs
@@ -100,18 +100,12 @@ public partial class HardwarePropertiesManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/HardwarePropertiesManager.html#getCpuUsages()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/HardwarePropertiesManager.html#getCpuUsages()"/>
         /// </summary>
-        public Android.Os.CpuUsageInfo[] CpuUsages
+        /// <returns><see cref="Android.Os.CpuUsageInfo"/></returns>
+        public Android.Os.CpuUsageInfo[] GetCpuUsages()
         {
-            get { return IExecuteWithSignatureArray<Android.Os.CpuUsageInfo>("getCpuUsages", "()[Landroid/os/CpuUsageInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/HardwarePropertiesManager.html#getFanSpeeds()"/> 
-        /// </summary>
-        public float[] FanSpeeds
-        {
-            get { return IExecuteWithSignatureArray<float>("getFanSpeeds", "()[F"); }
+            return IExecuteWithSignatureArray<Android.Os.CpuUsageInfo>("getCpuUsages", "()[Landroid/os/CpuUsageInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/HardwarePropertiesManager.html#getDeviceTemperatures(int,int)"/>
@@ -123,6 +117,14 @@ public float[] GetDeviceTemperatures(int arg0, int arg1)
         {
             return IExecuteArray<float>("getDeviceTemperatures", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/HardwarePropertiesManager.html#getFanSpeeds()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float[] GetFanSpeeds()
+        {
+            return IExecuteWithSignatureArray<float>("getFanSpeeds", "()[F");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Os/Health/HealthStats.cs b/src/net/Netdroid/Generated/Android/Os/Health/HealthStats.cs
index d3975061a..a9b2f4843 100644
--- a/src/net/Netdroid/Generated/Android/Os/Health/HealthStats.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Health/HealthStats.cs
@@ -46,48 +46,6 @@ public partial class HealthStats
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getDataType()"/> 
-        /// </summary>
-        public Java.Lang.String DataType
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDataType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getMeasurementKeyCount()"/> 
-        /// </summary>
-        public int MeasurementKeyCount
-        {
-            get { return IExecuteWithSignature<int>("getMeasurementKeyCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getMeasurementsKeyCount()"/> 
-        /// </summary>
-        public int MeasurementsKeyCount
-        {
-            get { return IExecuteWithSignature<int>("getMeasurementsKeyCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getStatsKeyCount()"/> 
-        /// </summary>
-        public int StatsKeyCount
-        {
-            get { return IExecuteWithSignature<int>("getStatsKeyCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getTimerKeyCount()"/> 
-        /// </summary>
-        public int TimerKeyCount
-        {
-            get { return IExecuteWithSignature<int>("getTimerKeyCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getTimersKeyCount()"/> 
-        /// </summary>
-        public int TimersKeyCount
-        {
-            get { return IExecuteWithSignature<int>("getTimersKeyCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getTimer(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -151,6 +109,14 @@ public int GetMeasurementKeyAt(int arg0)
             return IExecuteWithSignature<int>("getMeasurementKeyAt", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getMeasurementKeyCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementKeyCount()
+        {
+            return IExecuteWithSignature<int>("getMeasurementKeyCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getMeasurementsKeyAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -160,6 +126,14 @@ public int GetMeasurementsKeyAt(int arg0)
             return IExecuteWithSignature<int>("getMeasurementsKeyAt", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getMeasurementsKeyCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasurementsKeyCount()
+        {
+            return IExecuteWithSignature<int>("getMeasurementsKeyCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getStatsKeyAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -169,6 +143,14 @@ public int GetStatsKeyAt(int arg0)
             return IExecuteWithSignature<int>("getStatsKeyAt", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getStatsKeyCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStatsKeyCount()
+        {
+            return IExecuteWithSignature<int>("getStatsKeyCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getTimerCount(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -187,6 +169,14 @@ public int GetTimerKeyAt(int arg0)
             return IExecuteWithSignature<int>("getTimerKeyAt", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getTimerKeyCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTimerKeyCount()
+        {
+            return IExecuteWithSignature<int>("getTimerKeyCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getTimersKeyAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -196,6 +186,22 @@ public int GetTimersKeyAt(int arg0)
             return IExecuteWithSignature<int>("getTimersKeyAt", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getTimersKeyCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTimersKeyCount()
+        {
+            return IExecuteWithSignature<int>("getTimersKeyCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getDataType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDataType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDataType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/health/HealthStats.html#getStats(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/Health/TimerStat.cs b/src/net/Netdroid/Generated/Android/Os/Health/TimerStat.cs
index 58906310d..05dc19dc9 100644
--- a/src/net/Netdroid/Generated/Android/Os/Health/TimerStat.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Health/TimerStat.cs
@@ -69,26 +69,44 @@ public TimerStat(int arg0, long arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#getCount()"/> <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#setCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#describeContents()"/>
         /// </summary>
-        public int Count
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); } set { IExecuteWithSignature("setCount", "(I)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#getTime()"/> <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#setTime(long)"/>
+        /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#getCount()"/>
         /// </summary>
-        public long Time
+        /// <returns><see cref="int"/></returns>
+        public int GetCount()
         {
-            get { return IExecuteWithSignature<long>("getTime", "()J"); } set { IExecuteWithSignature("setTime", "(J)V", value); }
+            return IExecuteWithSignature<int>("getCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#getTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#setCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCount(int arg0)
+        {
+            IExecuteWithSignature("setCount", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#setTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetTime(long arg0)
+        {
+            IExecuteWithSignature("setTime", "(J)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/health/TimerStat.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Os/Health/UidHealthStats.cs b/src/net/Netdroid/Generated/Android/Os/Health/UidHealthStats.cs
index 3cf20c39e..3d7ddcbf4 100644
--- a/src/net/Netdroid/Generated/Android/Os/Health/UidHealthStats.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Health/UidHealthStats.cs
@@ -94,7 +94,7 @@ public partial class UidHealthStats
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/health/UidHealthStats.html#MEASUREMENT_CPU_POWER_MAMS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MEASUREMENT_CPU_POWER_MAMS { get { if (!_MEASUREMENT_CPU_POWER_MAMSReady) { _MEASUREMENT_CPU_POWER_MAMSContent = SGetField<int>(LocalBridgeClazz, "MEASUREMENT_CPU_POWER_MAMS"); _MEASUREMENT_CPU_POWER_MAMSReady = true; } return _MEASUREMENT_CPU_POWER_MAMSContent; } }
         private static int _MEASUREMENT_CPU_POWER_MAMSContent = default;
         private static bool _MEASUREMENT_CPU_POWER_MAMSReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Os/IBinder.cs b/src/net/Netdroid/Generated/Android/Os/IBinder.cs
index 218a65a3e..3ee975591 100644
--- a/src/net/Netdroid/Generated/Android/Os/IBinder.cs
+++ b/src/net/Netdroid/Generated/Android/Os/IBinder.cs
@@ -108,24 +108,18 @@ public partial class IBinder : Android.Os.IIBinder
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/IBinder.html#getSuggestedMaxIpcSizeBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/IBinder.html#getSuggestedMaxIpcSizeBytes()"/>
         /// </summary>
-        public static int SuggestedMaxIpcSizeBytes
+        /// <returns><see cref="int"/></returns>
+        public static int GetSuggestedMaxIpcSizeBytes()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getSuggestedMaxIpcSizeBytes", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getSuggestedMaxIpcSizeBytes", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/IBinder.html#getInterfaceDescriptor()"/> 
-        /// </summary>
-        public Java.Lang.String InterfaceDescriptor
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInterfaceDescriptor", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/IBinder.html#queryLocalInterface(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -174,6 +168,15 @@ public bool UnlinkToDeath(Android.Os.IBinder.DeathRecipient arg0, int arg1)
             return IExecute<bool>("unlinkToDeath", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/IBinder.html#getInterfaceDescriptor()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Android.Os.RemoteException"/>
+        public Java.Lang.String GetInterfaceDescriptor()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInterfaceDescriptor", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/IBinder.html#dump(java.io.FileDescriptor,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/LocaleList.cs b/src/net/Netdroid/Generated/Android/Os/LocaleList.cs
index db5b8cbeb..cf5576d66 100644
--- a/src/net/Netdroid/Generated/Android/Os/LocaleList.cs
+++ b/src/net/Netdroid/Generated/Android/Os/LocaleList.cs
@@ -56,34 +56,37 @@ public LocaleList(params Java.Util.Locale[] arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#getAdjustedDefault()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#forLanguageTags(java.lang.String)"/>
         /// </summary>
-        public static Android.Os.LocaleList AdjustedDefault
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public static Android.Os.LocaleList ForLanguageTags(Java.Lang.String arg0)
         {
-            get { return SExecuteWithSignature<Android.Os.LocaleList>(LocalBridgeClazz, "getAdjustedDefault", "()Landroid/os/LocaleList;"); }
+            return SExecuteWithSignature<Android.Os.LocaleList>(LocalBridgeClazz, "forLanguageTags", "(Ljava/lang/String;)Landroid/os/LocaleList;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#getDefault()"/> <see href="https://developer.android.com/reference/android/os/LocaleList.html#setDefault(android.os.LocaleList)"/>
+        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#getAdjustedDefault()"/>
         /// </summary>
-        public static Android.Os.LocaleList Default
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public static Android.Os.LocaleList GetAdjustedDefault()
         {
-            get { return SExecuteWithSignature<Android.Os.LocaleList>(LocalBridgeClazz, "getDefault", "()Landroid/os/LocaleList;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Landroid/os/LocaleList;)V", value); }
+            return SExecuteWithSignature<Android.Os.LocaleList>(LocalBridgeClazz, "getAdjustedDefault", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#getEmptyLocaleList()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#getDefault()"/>
         /// </summary>
-        public static Android.Os.LocaleList EmptyLocaleList
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public static Android.Os.LocaleList GetDefault()
         {
-            get { return SExecuteWithSignature<Android.Os.LocaleList>(LocalBridgeClazz, "getEmptyLocaleList", "()Landroid/os/LocaleList;"); }
+            return SExecuteWithSignature<Android.Os.LocaleList>(LocalBridgeClazz, "getDefault", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#forLanguageTags(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#getEmptyLocaleList()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Os.LocaleList"/></returns>
-        public static Android.Os.LocaleList ForLanguageTags(Java.Lang.String arg0)
+        public static Android.Os.LocaleList GetEmptyLocaleList()
         {
-            return SExecuteWithSignature<Android.Os.LocaleList>(LocalBridgeClazz, "forLanguageTags", "(Ljava/lang/String;)Landroid/os/LocaleList;", arg0);
+            return SExecuteWithSignature<Android.Os.LocaleList>(LocalBridgeClazz, "getEmptyLocaleList", "()Landroid/os/LocaleList;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#isPseudoLocale(android.icu.util.ULocale)"/>
@@ -104,6 +107,14 @@ public static bool MatchesLanguageAndScript(Java.Util.Locale arg0, Java.Util.Loc
         {
             return SExecute<bool>(LocalBridgeClazz, "matchesLanguageAndScript", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/LocaleList.html#setDefault(android.os.LocaleList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.LocaleList"/></param>
+        public static void SetDefault(Android.Os.LocaleList arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Landroid/os/LocaleList;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Os/Looper.cs b/src/net/Netdroid/Generated/Android/Os/Looper.cs
index 39e482013..2519f3be4 100644
--- a/src/net/Netdroid/Generated/Android/Os/Looper.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Looper.cs
@@ -42,11 +42,12 @@ public partial class Looper
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Looper.html#getMainLooper()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Looper.html#getMainLooper()"/>
         /// </summary>
-        public static Android.Os.Looper MainLooper
+        /// <returns><see cref="Android.Os.Looper"/></returns>
+        public static Android.Os.Looper GetMainLooper()
         {
-            get { return SExecuteWithSignature<Android.Os.Looper>(LocalBridgeClazz, "getMainLooper", "()Landroid/os/Looper;"); }
+            return SExecuteWithSignature<Android.Os.Looper>(LocalBridgeClazz, "getMainLooper", "()Landroid/os/Looper;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Looper.html#myLooper()"/>
@@ -81,7 +82,7 @@ public static void Prepare()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Looper.html#prepareMainLooper()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void PrepareMainLooper()
         {
             SExecuteWithSignature(LocalBridgeClazz, "prepareMainLooper", "()V");
@@ -91,18 +92,12 @@ public static void PrepareMainLooper()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Looper.html#getQueue()"/> 
-        /// </summary>
-        public Android.Os.MessageQueue Queue
-        {
-            get { return IExecuteWithSignature<Android.Os.MessageQueue>("getQueue", "()Landroid/os/MessageQueue;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Looper.html#getThread()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Looper.html#getQueue()"/>
         /// </summary>
-        public Java.Lang.Thread Thread
+        /// <returns><see cref="Android.Os.MessageQueue"/></returns>
+        public Android.Os.MessageQueue GetQueue()
         {
-            get { return IExecuteWithSignature<Java.Lang.Thread>("getThread", "()Ljava/lang/Thread;"); }
+            return IExecuteWithSignature<Android.Os.MessageQueue>("getQueue", "()Landroid/os/MessageQueue;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Looper.html#isCurrentThread()"/>
@@ -113,6 +108,14 @@ public bool IsCurrentThread()
             return IExecuteWithSignature<bool>("isCurrentThread", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Looper.html#getThread()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Thread"/></returns>
+        public Java.Lang.Thread GetThread()
+        {
+            return IExecuteWithSignature<Java.Lang.Thread>("getThread", "()Ljava/lang/Thread;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Looper.html#dump(android.util.Printer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.Printer"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/MemoryFile.cs b/src/net/Netdroid/Generated/Android/Os/MemoryFile.cs
index d513685d9..8110a8aee 100644
--- a/src/net/Netdroid/Generated/Android/Os/MemoryFile.cs
+++ b/src/net/Netdroid/Generated/Android/Os/MemoryFile.cs
@@ -56,24 +56,10 @@ public MemoryFile(Java.Lang.String arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/MemoryFile.html#getInputStream()"/> 
-        /// </summary>
-        public Java.Io.InputStream InputStream
-        {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/MemoryFile.html#getOutputStream()"/> 
-        /// </summary>
-        public Java.Io.OutputStream OutputStream
-        {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/MemoryFile.html#isPurgingAllowed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsPurgingAllowed()
         {
             return IExecuteWithSignature<bool>("isPurgingAllowed", "()Z");
@@ -100,12 +86,28 @@ public int ReadBytes(byte[] arg0, int arg1, int arg2, int arg3)
             return IExecute<int>("readBytes", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/MemoryFile.html#getInputStream()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetInputStream()
+        {
+            return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/MemoryFile.html#getOutputStream()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        public Java.Io.OutputStream GetOutputStream()
+        {
+            return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/MemoryFile.html#allowPurging(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool AllowPurging(bool arg0)
         {
             return IExecuteWithSignature<bool>("allowPurging", "(Z)Z", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Os/Message.cs b/src/net/Netdroid/Generated/Android/Os/Message.cs
index 79115426b..425901c87 100644
--- a/src/net/Netdroid/Generated/Android/Os/Message.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Message.cs
@@ -158,32 +158,12 @@ public static Android.Os.Message Obtain(Android.Os.Message arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Message.html#getCallback()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Message.html#getData()"/>
         /// </summary>
-        public Java.Lang.Runnable Callback
-        {
-            get { return IExecuteWithSignature<Java.Lang.Runnable>("getCallback", "()Ljava/lang/Runnable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Message.html#getData()"/> <see href="https://developer.android.com/reference/android/os/Message.html#setData(android.os.Bundle)"/>
-        /// </summary>
-        public Android.Os.Bundle Data
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setData", "(Landroid/os/Bundle;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Message.html#getTarget()"/> <see href="https://developer.android.com/reference/android/os/Message.html#setTarget(android.os.Handler)"/>
-        /// </summary>
-        public Android.Os.Handler Target
-        {
-            get { return IExecuteWithSignature<Android.Os.Handler>("getTarget", "()Landroid/os/Handler;"); } set { IExecuteWithSignature("setTarget", "(Landroid/os/Handler;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Message.html#getWhen()"/> 
-        /// </summary>
-        public long When
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetData()
         {
-            get { return IExecuteWithSignature<long>("getWhen", "()J"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Message.html#peekData()"/>
@@ -194,6 +174,14 @@ public Android.Os.Bundle PeekData()
             return IExecuteWithSignature<Android.Os.Bundle>("peekData", "()Landroid/os/Bundle;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Message.html#getTarget()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Handler"/></returns>
+        public Android.Os.Handler GetTarget()
+        {
+            return IExecuteWithSignature<Android.Os.Handler>("getTarget", "()Landroid/os/Handler;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Message.html#isAsynchronous()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -210,6 +198,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Message.html#getCallback()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Runnable"/></returns>
+        public Java.Lang.Runnable GetCallback()
+        {
+            return IExecuteWithSignature<Java.Lang.Runnable>("getCallback", "()Ljava/lang/Runnable;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Message.html#getWhen()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetWhen()
+        {
+            return IExecuteWithSignature<long>("getWhen", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Message.html#copyFrom(android.os.Message)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Message"/></param>
@@ -240,6 +244,22 @@ public void SetAsynchronous(bool arg0)
             IExecuteWithSignature("setAsynchronous", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Message.html#setData(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        public void SetData(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setData", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Message.html#setTarget(android.os.Handler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Handler"/></param>
+        public void SetTarget(Android.Os.Handler arg0)
+        {
+            IExecuteWithSignature("setTarget", "(Landroid/os/Handler;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Message.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/MessageQueue.cs b/src/net/Netdroid/Generated/Android/Os/MessageQueue.cs
index 97346e249..f353487bd 100644
--- a/src/net/Netdroid/Generated/Android/Os/MessageQueue.cs
+++ b/src/net/Netdroid/Generated/Android/Os/MessageQueue.cs
@@ -155,7 +155,7 @@ public partial class OnFileDescriptorEventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFileDescriptorEvents", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Io.FileDescriptor>>>(OnFileDescriptorEventsEventHandler));
+                AddEventHandler("onFileDescriptorEvents", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Io.FileDescriptor>>>(OnFileDescriptorEventsEventHandler));
 
             }
 
@@ -163,7 +163,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/MessageQueue.OnFileDescriptorEventListener.html#onFileDescriptorEvents(java.io.FileDescriptor,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFileDescriptorEvents"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Java.Io.FileDescriptor, int, int> OnOnFileDescriptorEvents { get; set; } = null;
+            public global::System.Func<Java.Io.FileDescriptor, int, int> OnOnFileDescriptorEvents { get; set; } = null;
 
             void OnFileDescriptorEventsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Io.FileDescriptor>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Os/Messenger.cs b/src/net/Netdroid/Generated/Android/Os/Messenger.cs
index 5e6831e62..ed055b014 100644
--- a/src/net/Netdroid/Generated/Android/Os/Messenger.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Messenger.cs
@@ -86,11 +86,12 @@ public static void WriteMessengerOrNullToParcel(Android.Os.Messenger arg0, Andro
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Messenger.html#getBinder()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/Messenger.html#getBinder()"/>
         /// </summary>
-        public Android.Os.IBinder Binder
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetBinder()
         {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getBinder", "()Landroid/os/IBinder;"); }
+            return IExecuteWithSignature<Android.Os.IBinder>("getBinder", "()Landroid/os/IBinder;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Messenger.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Os/Parcel.cs b/src/net/Netdroid/Generated/Android/Os/Parcel.cs
index 7e6169026..2b9475316 100644
--- a/src/net/Netdroid/Generated/Android/Os/Parcel.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Parcel.cs
@@ -92,190 +92,22 @@ public Java.Util.HashMap<K, V> ReadHashMap<K, V>(Java.Lang.ClassLoader arg0, Jav
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="V"></typeparam>
-        public void ReadMap<Arg0objectSuperK, K, Arg0objectSuperV, V>(Java.Util.Map<Arg0objectSuperK, Arg0objectSuperV> arg0, Java.Lang.ClassLoader arg1, Java.Lang.Class arg2, Java.Lang.Class arg3) where Arg0objectSuperK: K where Arg0objectSuperV: V
+        public void ReadMap<Arg0objectSuperK, K, Arg0objectSuperV, V>(Java.Util.Map<Arg0objectSuperK, Arg0objectSuperV> arg0, Java.Lang.ClassLoader arg1, Java.Lang.Class arg2, Java.Lang.Class arg3) where Arg0objectSuperK : K where Arg0objectSuperV : V
         {
             IExecute("readMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createInterfaceArrayList(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
-        /// <returns><see cref="Java.Util.ArrayList"/></returns>
-        public Java.Util.ArrayList<T> CreateInterfaceArrayList<T>(Java.Util.Function.Function<Android.Os.IBinder, T> arg0) where T: Android.Os.IIInterface, new()
-        {
-            return IExecuteWithSignature<Java.Util.ArrayList<T>>("createInterfaceArrayList", "(Ljava/util/function/Function;)Ljava/util/ArrayList;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createInterfaceArray(java.util.function.IntFunction,java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.IntFunction"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T[] CreateInterfaceArray<T>(Java.Util.Function.IntFunction<T[]> arg0, Java.Util.Function.Function<Android.Os.IBinder, T> arg1) where T: Android.Os.IIInterface, new()
-        {
-            return IExecuteArray<T>("createInterfaceArray", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readInterfaceArray(android.os.IInterface[],java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
-        public void ReadInterfaceArray<T>(T[] arg0, Java.Util.Function.Function<Android.Os.IBinder, T> arg1) where T: Android.Os.IIInterface, new()
-        {
-            IExecute("readInterfaceArray", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readInterfaceList(java.util.List,java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
-        public void ReadInterfaceList<T>(Java.Util.List<T> arg0, Java.Util.Function.Function<Android.Os.IBinder, T> arg1) where T: Android.Os.IIInterface, new()
-        {
-            IExecute("readInterfaceList", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeInterfaceArray(android.os.IInterface[])"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
-        public void WriteInterfaceArray<T>(T[] arg0) where T: Android.Os.IIInterface, new()
-        {
-            IExecuteWithSignature("writeInterfaceArray", "([Landroid/os/IInterface;)V", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeInterfaceList(java.util.List)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
-        public void WriteInterfaceList<T>(Java.Util.List<T> arg0) where T: Android.Os.IIInterface, new()
-        {
-            IExecuteWithSignature("writeInterfaceList", "(Ljava/util/List;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createTypedArrayMap(android.os.Parcelable.Creator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Os.Parcelable.Creator"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        /// <returns><see cref="Android.Util.ArrayMap"/></returns>
-        public Android.Util.ArrayMap<Java.Lang.String, T> CreateTypedArrayMap<T>(Android.Os.Parcelable.Creator<T> arg0) where T: Android.Os.IParcelable, new()
-        {
-            return IExecuteWithSignature<Android.Util.ArrayMap<Java.Lang.String, T>>("createTypedArrayMap", "(Landroid/os/Parcelable$Creator;)Landroid/util/ArrayMap;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createTypedSparseArray(android.os.Parcelable.Creator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Os.Parcelable.Creator"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        /// <returns><see cref="Android.Util.SparseArray"/></returns>
-        public Android.Util.SparseArray<T> CreateTypedSparseArray<T>(Android.Os.Parcelable.Creator<T> arg0) where T: Android.Os.IParcelable, new()
-        {
-            return IExecuteWithSignature<Android.Util.SparseArray<T>>("createTypedSparseArray", "(Landroid/os/Parcelable$Creator;)Landroid/util/SparseArray;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readParcelableList(java.util.List,java.lang.ClassLoader)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        /// <returns><see cref="Java.Util.List"/></returns>
-        [System.Obsolete()]
-        public Java.Util.List<T> ReadParcelableList<T>(Java.Util.List<T> arg0, Java.Lang.ClassLoader arg1) where T: Android.Os.IParcelable, new()
-        {
-            return IExecute<Java.Util.List<T>>("readParcelableList", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readParcelable(java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createFixedArray(java.lang.Class,android.os.Parcelable.Creator,int[])"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <param name="arg1"><see cref="Android.Os.Parcelable.Creator"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="S"><see cref="Android.Os.IParcelable"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        [System.Obsolete()]
-        public T ReadParcelable<T>(Java.Lang.ClassLoader arg0) where T: Android.Os.IParcelable, new()
-        {
-            return IExecuteWithSignature<T>("readParcelable", "(Ljava/lang/ClassLoader;)Landroid/os/Parcelable;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeParcelableArray(android.os.Parcelable[],int)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void WriteParcelableArray<T>(T[] arg0, int arg1) where T: Android.Os.IParcelable, new()
-        {
-            IExecute("writeParcelableArray", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeParcelableList(java.util.List,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void WriteParcelableList<T>(Java.Util.List<T> arg0, int arg1) where T: Android.Os.IParcelable, new()
-        {
-            IExecute("writeParcelableList", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedArray(android.os.Parcelable[],int)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void WriteTypedArray<T>(T[] arg0, int arg1) where T: Android.Os.IParcelable, new()
+        public T CreateFixedArray<T, S>(Java.Lang.Class arg0, Android.Os.Parcelable.Creator<S> arg1, params int[] arg2) where S : Android.Os.IParcelable, new()
         {
-            IExecute("writeTypedArray", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedArrayMap(android.util.ArrayMap,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Util.ArrayMap"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void WriteTypedArrayMap<T>(Android.Util.ArrayMap<Java.Lang.String, T> arg0, int arg1) where T: Android.Os.IParcelable, new()
-        {
-            IExecute("writeTypedArrayMap", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedList(java.util.List,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void WriteTypedList<T>(Java.Util.List<T> arg0, int arg1) where T: Android.Os.IParcelable, new()
-        {
-            IExecute("writeTypedList", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedList(java.util.List)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void WriteTypedList<T>(Java.Util.List<T> arg0) where T: Android.Os.IParcelable, new()
-        {
-            IExecuteWithSignature("writeTypedList", "(Ljava/util/List;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedObject(android.os.Parcelable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void WriteTypedObject<T>(T arg0, int arg1) where T: Android.Os.IParcelable, new()
-        {
-            IExecute("writeTypedObject", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedSparseArray(android.util.SparseArray,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Util.SparseArray"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void WriteTypedSparseArray<T>(Android.Util.SparseArray<T> arg0, int arg1) where T: Android.Os.IParcelable, new()
-        {
-            IExecute("writeTypedSparseArray", arg0, arg1);
+            if (arg2.Length == 0) return IExecute<T>("createFixedArray", arg0, arg1); else return IExecute<T>("createFixedArray", arg0, arg1, arg2);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createFixedArray(java.lang.Class,java.util.function.Function,int[])"/>
@@ -286,42 +118,29 @@ public void ReadMap<Arg0objectSuperK, K, Arg0objectSuperV, V>(Java.Util.Map<Arg0
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="S"><see cref="Android.Os.IIInterface"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T CreateFixedArray<T, S>(Java.Lang.Class arg0, Java.Util.Function.Function<Android.Os.IBinder, S> arg1, params int[] arg2) where S: Android.Os.IIInterface, new()
+        public T CreateFixedArray<T, S>(Java.Lang.Class arg0, Java.Util.Function.Function<Android.Os.IBinder, S> arg1, params int[] arg2) where S : Android.Os.IIInterface, new()
         {
             if (arg2.Length == 0) return IExecute<T>("createFixedArray", arg0, arg1); else return IExecute<T>("createFixedArray", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readFixedArray(java.lang.Object,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readFixedArray(java.lang.Object,android.os.Parcelable.Creator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="S"><see cref="Android.Os.IIInterface"/></typeparam>
-        public void ReadFixedArray<T, S>(T arg0, Java.Util.Function.Function<Android.Os.IBinder, S> arg1) where S: Android.Os.IIInterface, new()
-        {
-            IExecute("readFixedArray", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createFixedArray(java.lang.Class,android.os.Parcelable.Creator,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Android.Os.Parcelable.Creator"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="S"><see cref="Android.Os.IParcelable"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T CreateFixedArray<T, S>(Java.Lang.Class arg0, Android.Os.Parcelable.Creator<S> arg1, params int[] arg2) where S: Android.Os.IParcelable, new()
+        public void ReadFixedArray<T, S>(T arg0, Android.Os.Parcelable.Creator<S> arg1) where S : Android.Os.IParcelable, new()
         {
-            if (arg2.Length == 0) return IExecute<T>("createFixedArray", arg0, arg1); else return IExecute<T>("createFixedArray", arg0, arg1, arg2);
+            IExecute("readFixedArray", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readFixedArray(java.lang.Object,android.os.Parcelable.Creator)"/>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readFixedArray(java.lang.Object,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><see cref="Android.Os.Parcelable.Creator"/></param>
+        /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="T"></typeparam>
-        /// <typeparam name="S"><see cref="Android.Os.IParcelable"/></typeparam>
-        public void ReadFixedArray<T, S>(T arg0, Android.Os.Parcelable.Creator<S> arg1) where S: Android.Os.IParcelable, new()
+        /// <typeparam name="S"><see cref="Android.Os.IIInterface"/></typeparam>
+        public void ReadFixedArray<T, S>(T arg0, Java.Util.Function.Function<Android.Os.IBinder, S> arg1) where S : Android.Os.IIInterface, new()
         {
             IExecute("readFixedArray", arg0, arg1);
         }
@@ -337,6 +156,26 @@ public Android.Os.Parcelable.Creator<T> ReadParcelableCreator<T>(Java.Lang.Class
             return IExecute<Android.Os.Parcelable.Creator<T>>("readParcelableCreator", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createTypedArrayMap(android.os.Parcelable.Creator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Parcelable.Creator"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        /// <returns><see cref="Android.Util.ArrayMap"/></returns>
+        public Android.Util.ArrayMap<Java.Lang.String, T> CreateTypedArrayMap<T>(Android.Os.Parcelable.Creator<T> arg0) where T : Android.Os.IParcelable, new()
+        {
+            return IExecute<Android.Util.ArrayMap<Java.Lang.String, T>>("createTypedArrayMap", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createTypedSparseArray(android.os.Parcelable.Creator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Parcelable.Creator"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<T> CreateTypedSparseArray<T>(Android.Os.Parcelable.Creator<T> arg0) where T : Android.Os.IParcelable, new()
+        {
+            return IExecute<Android.Util.SparseArray<T>>("createTypedSparseArray", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readSparseArray(java.lang.ClassLoader,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
@@ -353,12 +192,22 @@ public Android.Util.SparseArray<T> ReadSparseArray<T>(Java.Lang.ClassLoader arg0
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Android.Util.SparseArray"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Util.SparseArray<T> ReadSparseArray<T>(Java.Lang.ClassLoader arg0)
         {
             return IExecuteWithSignature<Android.Util.SparseArray<T>>("readSparseArray", "(Ljava/lang/ClassLoader;)Landroid/util/SparseArray;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createInterfaceArrayList(java.util.function.Function)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<T> CreateInterfaceArrayList<T>(Java.Util.Function.Function<Android.Os.IBinder, T> arg0) where T : Android.Os.IIInterface, new()
+        {
+            return IExecute<Java.Util.ArrayList<T>>("createInterfaceArrayList", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createTypedArrayList(android.os.Parcelable.Creator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcelable.Creator"/></param>
@@ -392,6 +241,18 @@ public Java.Util.List<T> ReadParcelableList<T>(Java.Util.List<T> arg0, Java.Lang
             return IExecute<Java.Util.List<T>>("readParcelableList", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readParcelableList(java.util.List,java.lang.ClassLoader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<T> ReadParcelableList<T>(Java.Util.List<T> arg0, Java.Lang.ClassLoader arg1) where T : Android.Os.IParcelable, new()
+        {
+            return IExecute<Java.Util.List<T>>("readParcelableList", arg0, arg1);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createFixedArray(java.lang.Class,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
@@ -414,6 +275,17 @@ public T ReadParcelable<T>(Java.Lang.ClassLoader arg0, Java.Lang.Class arg1)
             return IExecute<T>("readParcelable", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readParcelable(java.lang.ClassLoader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        [global::System.Obsolete()]
+        public T ReadParcelable<T>(Java.Lang.ClassLoader arg0) where T : Android.Os.IParcelable, new()
+        {
+            return IExecute<T>("readParcelable", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readSerializable(java.lang.ClassLoader,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
@@ -435,6 +307,17 @@ public T ReadTypedObject<T>(Android.Os.Parcelable.Creator<T> arg0)
             return IExecuteWithSignature<T>("readTypedObject", "(Landroid/os/Parcelable$Creator;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createInterfaceArray(java.util.function.IntFunction,java.util.function.Function)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Function.IntFunction"/></param>
+        /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T[] CreateInterfaceArray<T>(Java.Util.Function.IntFunction<T[]> arg0, Java.Util.Function.Function<Android.Os.IBinder, T> arg1) where T : Android.Os.IIInterface, new()
+        {
+            return IExecuteArray<T>("createInterfaceArray", arg0, arg1);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#createTypedArray(android.os.Parcelable.Creator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcelable.Creator"/></param>
@@ -476,6 +359,26 @@ public void ReadFixedArray<T>(T arg0)
             IExecuteWithSignature("readFixedArray", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readInterfaceArray(android.os.IInterface[],java.util.function.Function)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
+        public void ReadInterfaceArray<T>(T[] arg0, Java.Util.Function.Function<Android.Os.IBinder, T> arg1) where T : Android.Os.IIInterface, new()
+        {
+            IExecute("readInterfaceArray", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readInterfaceList(java.util.List,java.util.function.Function)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
+        public void ReadInterfaceList<T>(Java.Util.List<T> arg0, Java.Util.Function.Function<Android.Os.IBinder, T> arg1) where T : Android.Os.IIInterface, new()
+        {
+            IExecute("readInterfaceList", arg0, arg1);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readList(java.util.List,java.lang.ClassLoader,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
@@ -483,7 +386,7 @@ public void ReadFixedArray<T>(T arg0)
         /// <param name="arg2"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="T"></typeparam>
-        public void ReadList<Arg0objectSuperT, T>(Java.Util.List<Arg0objectSuperT> arg0, Java.Lang.ClassLoader arg1, Java.Lang.Class arg2) where Arg0objectSuperT: T
+        public void ReadList<Arg0objectSuperT, T>(Java.Util.List<Arg0objectSuperT> arg0, Java.Lang.ClassLoader arg1, Java.Lang.Class arg2) where Arg0objectSuperT : T
         {
             IExecute("readList", arg0, arg1, arg2);
         }
@@ -519,6 +422,44 @@ public void WriteFixedArray<T>(T arg0, int arg1, params int[] arg2)
             if (arg2.Length == 0) IExecute("writeFixedArray", arg0, arg1); else IExecute("writeFixedArray", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeInterfaceArray(android.os.IInterface[])"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
+        public void WriteInterfaceArray<T>(T[] arg0) where T : Android.Os.IIInterface, new()
+        {
+            IExecute("writeInterfaceArray", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeInterfaceList(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IIInterface"/></typeparam>
+        public void WriteInterfaceList<T>(Java.Util.List<T> arg0) where T : Android.Os.IIInterface, new()
+        {
+            IExecute("writeInterfaceList", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeParcelableArray(android.os.Parcelable[],int)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        public void WriteParcelableArray<T>(T[] arg0, int arg1) where T : Android.Os.IParcelable, new()
+        {
+            IExecute("writeParcelableArray", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeParcelableList(java.util.List,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        public void WriteParcelableList<T>(Java.Util.List<T> arg0, int arg1) where T : Android.Os.IParcelable, new()
+        {
+            IExecute("writeParcelableList", arg0, arg1);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeSparseArray(android.util.SparseArray)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.SparseArray"/></param>
@@ -528,6 +469,65 @@ public void WriteSparseArray<T>(Android.Util.SparseArray<T> arg0)
             IExecuteWithSignature("writeSparseArray", "(Landroid/util/SparseArray;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedArray(android.os.Parcelable[],int)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        public void WriteTypedArray<T>(T[] arg0, int arg1) where T : Android.Os.IParcelable, new()
+        {
+            IExecute("writeTypedArray", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedArrayMap(android.util.ArrayMap,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Util.ArrayMap"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        public void WriteTypedArrayMap<T>(Android.Util.ArrayMap<Java.Lang.String, T> arg0, int arg1) where T : Android.Os.IParcelable, new()
+        {
+            IExecute("writeTypedArrayMap", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedList(java.util.List,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        public void WriteTypedList<T>(Java.Util.List<T> arg0, int arg1) where T : Android.Os.IParcelable, new()
+        {
+            IExecute("writeTypedList", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedList(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        public void WriteTypedList<T>(Java.Util.List<T> arg0) where T : Android.Os.IParcelable, new()
+        {
+            IExecute("writeTypedList", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedObject(android.os.Parcelable,int)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        public void WriteTypedObject<T>(T arg0, int arg1) where T : Android.Os.IParcelable, new()
+        {
+            IExecute("writeTypedObject", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Parcel.html#writeTypedSparseArray(android.util.SparseArray,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Util.SparseArray"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.Os.IParcelable"/></typeparam>
+        public void WriteTypedSparseArray<T>(Android.Util.SparseArray<T> arg0, int arg1) where T : Android.Os.IParcelable, new()
+        {
+            IExecute("writeTypedSparseArray", arg0, arg1);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readBundle()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.Bundle"/></returns>
@@ -565,7 +565,7 @@ public Android.Os.IBinder[] CreateBinderArray()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         /// <returns><see cref="Android.Os.Parcelable"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.Parcelable[] ReadParcelableArray(Java.Lang.ClassLoader arg0)
         {
             return IExecuteWithSignatureArray<Android.Os.Parcelable>("readParcelableArray", "(Ljava/lang/ClassLoader;)[Landroid/os/Parcelable;", arg0);
@@ -575,7 +575,7 @@ public Android.Os.Parcelable[] ReadParcelableArray(Java.Lang.ClassLoader arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         /// <returns><see cref="Android.Os.Parcelable.Creator"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.Parcelable.Creator<object> ReadParcelableCreator(Java.Lang.ClassLoader arg0)
         {
             return IExecuteWithSignature<Android.Os.Parcelable.Creator<object>>("readParcelableCreator", "(Ljava/lang/ClassLoader;)Landroid/os/Parcelable$Creator;", arg0);
@@ -787,7 +787,7 @@ public int[] CreateIntArray()
         /// <see href="https://developer.android.com/reference/android/os/Parcel.html#readSerializable()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.Serializable"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Io.Serializable ReadSerializable()
         {
             return IExecuteWithSignature<Java.Io.Serializable>("readSerializable", "()Ljava/io/Serializable;");
@@ -806,7 +806,7 @@ public object ReadValue(Java.Lang.ClassLoader arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object[] ReadArray(Java.Lang.ClassLoader arg0)
         {
             return IExecuteWithSignatureArray<object>("readArray", "(Ljava/lang/ClassLoader;)[Ljava/lang/Object;", arg0);
@@ -832,7 +832,7 @@ public Java.Lang.String[] CreateStringArray()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         /// <returns><see cref="Java.Util.ArrayList"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.ArrayList ReadArrayList(Java.Lang.ClassLoader arg0)
         {
             return IExecuteWithSignature<Java.Util.ArrayList>("readArrayList", "(Ljava/lang/ClassLoader;)Ljava/util/ArrayList;", arg0);
@@ -858,7 +858,7 @@ public Java.Util.ArrayList ReadArrayList(Java.Lang.ClassLoader arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         /// <returns><see cref="Java.Util.HashMap"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.HashMap ReadHashMap(Java.Lang.ClassLoader arg0)
         {
             return IExecuteWithSignature<Java.Util.HashMap>("readHashMap", "(Ljava/lang/ClassLoader;)Ljava/util/HashMap;", arg0);
@@ -989,7 +989,7 @@ public void ReadIntArray(int[] arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ReadList(Java.Util.List arg0, Java.Lang.ClassLoader arg1)
         {
             IExecute("readList", arg0, arg1);
@@ -1007,7 +1007,7 @@ public void ReadLongArray(long[] arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ReadMap(Java.Util.Map arg0, Java.Lang.ClassLoader arg1)
         {
             IExecute("readMap", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Os/ParcelFileDescriptor.cs b/src/net/Netdroid/Generated/Android/Os/ParcelFileDescriptor.cs
index 7dc099adc..11d2d91d5 100644
--- a/src/net/Netdroid/Generated/Android/Os/ParcelFileDescriptor.cs
+++ b/src/net/Netdroid/Generated/Android/Os/ParcelFileDescriptor.cs
@@ -92,14 +92,14 @@ public ParcelFileDescriptor(Android.Os.ParcelFileDescriptor arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#MODE_WORLD_READABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_WORLD_READABLE { get { if (!_MODE_WORLD_READABLEReady) { _MODE_WORLD_READABLEContent = SGetField<int>(LocalBridgeClazz, "MODE_WORLD_READABLE"); _MODE_WORLD_READABLEReady = true; } return _MODE_WORLD_READABLEContent; } }
         private static int _MODE_WORLD_READABLEContent = default;
         private static bool _MODE_WORLD_READABLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#MODE_WORLD_WRITEABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MODE_WORLD_WRITEABLE { get { if (!_MODE_WORLD_WRITEABLEReady) { _MODE_WORLD_WRITEABLEContent = SGetField<int>(LocalBridgeClazz, "MODE_WORLD_WRITEABLE"); _MODE_WORLD_WRITEABLEReady = true; } return _MODE_WORLD_WRITEABLEContent; } }
         private static int _MODE_WORLD_WRITEABLEContent = default;
         private static bool _MODE_WORLD_WRITEABLEReady = false; // this is used because in case of generics 
@@ -246,27 +246,6 @@ public static int ParseMode(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#getFd()"/> 
-        /// </summary>
-        public int Fd
-        {
-            get { return IExecuteWithSignature<int>("getFd", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#getFileDescriptor()"/> 
-        /// </summary>
-        public Java.Io.FileDescriptor FileDescriptor
-        {
-            get { return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#getStatSize()"/> 
-        /// </summary>
-        public long StatSize
-        {
-            get { return IExecuteWithSignature<long>("getStatSize", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#dup()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.ParcelFileDescriptor"/></returns>
@@ -300,6 +279,30 @@ public int DetachFd()
             return IExecuteWithSignature<int>("detachFd", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#getFd()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFd()
+        {
+            return IExecuteWithSignature<int>("getFd", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#getFileDescriptor()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+        public Java.Io.FileDescriptor GetFileDescriptor()
+        {
+            return IExecuteWithSignature<Java.Io.FileDescriptor>("getFileDescriptor", "()Ljava/io/FileDescriptor;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#getStatSize()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetStatSize()
+        {
+            return IExecuteWithSignature<long>("getStatSize", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.html#checkError()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
@@ -471,7 +474,7 @@ public partial class OnCloseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onClose", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCloseEventHandler));
+                AddEventHandler("onClose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCloseEventHandler));
 
             }
 
@@ -479,7 +482,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/ParcelFileDescriptor.OnCloseListener.html#onClose(java.io.IOException)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClose"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnOnClose { get; set; } = null;
+            public global::System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnOnClose { get; set; } = null;
 
             void OnCloseEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Os/ParcelUuid.cs b/src/net/Netdroid/Generated/Android/Os/ParcelUuid.cs
index 1e9f5fbe3..78503921e 100644
--- a/src/net/Netdroid/Generated/Android/Os/ParcelUuid.cs
+++ b/src/net/Netdroid/Generated/Android/Os/ParcelUuid.cs
@@ -69,13 +69,6 @@ public static Android.Os.ParcelUuid FromString(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/ParcelUuid.html#getUuid()"/> 
-        /// </summary>
-        public Java.Util.UUID Uuid
-        {
-            get { return IExecuteWithSignature<Java.Util.UUID>("getUuid", "()Ljava/util/UUID;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/ParcelUuid.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -84,6 +77,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/ParcelUuid.html#getUuid()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.UUID"/></returns>
+        public Java.Util.UUID GetUuid()
+        {
+            return IExecuteWithSignature<Java.Util.UUID>("getUuid", "()Ljava/util/UUID;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/ParcelUuid.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/PatternMatcher.cs b/src/net/Netdroid/Generated/Android/Os/PatternMatcher.cs
index 0649fb814..4df921486 100644
--- a/src/net/Netdroid/Generated/Android/Os/PatternMatcher.cs
+++ b/src/net/Netdroid/Generated/Android/Os/PatternMatcher.cs
@@ -99,27 +99,29 @@ public PatternMatcher(Java.Lang.String arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/PatternMatcher.html#getPath()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/PatternMatcher.html#match(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String Path
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Match(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("match", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/PatternMatcher.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/PatternMatcher.html#getType()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/PatternMatcher.html#match(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/os/PatternMatcher.html#getPath()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Match(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPath()
         {
-            return IExecuteWithSignature<bool>("match", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/PatternMatcher.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Os/PerformanceHintManager.cs b/src/net/Netdroid/Generated/Android/Os/PerformanceHintManager.cs
index cdfe68b50..553cf8db4 100644
--- a/src/net/Netdroid/Generated/Android/Os/PerformanceHintManager.cs
+++ b/src/net/Netdroid/Generated/Android/Os/PerformanceHintManager.cs
@@ -46,13 +46,6 @@ public partial class PerformanceHintManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/PerformanceHintManager.html#getPreferredUpdateRateNanos()"/> 
-        /// </summary>
-        public long PreferredUpdateRateNanos
-        {
-            get { return IExecuteWithSignature<long>("getPreferredUpdateRateNanos", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/PerformanceHintManager.html#createHintSession(int[],long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -62,6 +55,14 @@ public Android.Os.PerformanceHintManager.Session CreateHintSession(int[] arg0, l
         {
             return IExecute<Android.Os.PerformanceHintManager.Session>("createHintSession", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/PerformanceHintManager.html#getPreferredUpdateRateNanos()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetPreferredUpdateRateNanos()
+        {
+            return IExecuteWithSignature<long>("getPreferredUpdateRateNanos", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Os/PowerManager.cs b/src/net/Netdroid/Generated/Android/Os/PowerManager.cs
index 538147406..83528436a 100644
--- a/src/net/Netdroid/Generated/Android/Os/PowerManager.cs
+++ b/src/net/Netdroid/Generated/Android/Os/PowerManager.cs
@@ -40,14 +40,14 @@ public partial class PowerManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#ACQUIRE_CAUSES_WAKEUP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACQUIRE_CAUSES_WAKEUP { get { if (!_ACQUIRE_CAUSES_WAKEUPReady) { _ACQUIRE_CAUSES_WAKEUPContent = SGetField<int>(LocalBridgeClazz, "ACQUIRE_CAUSES_WAKEUP"); _ACQUIRE_CAUSES_WAKEUPReady = true; } return _ACQUIRE_CAUSES_WAKEUPContent; } }
         private static int _ACQUIRE_CAUSES_WAKEUPContent = default;
         private static bool _ACQUIRE_CAUSES_WAKEUPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#FULL_WAKE_LOCK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FULL_WAKE_LOCK { get { if (!_FULL_WAKE_LOCKReady) { _FULL_WAKE_LOCKContent = SGetField<int>(LocalBridgeClazz, "FULL_WAKE_LOCK"); _FULL_WAKE_LOCKReady = true; } return _FULL_WAKE_LOCKContent; } }
         private static int _FULL_WAKE_LOCKContent = default;
         private static bool _FULL_WAKE_LOCKReady = false; // this is used because in case of generics 
@@ -126,14 +126,14 @@ public partial class PowerManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#SCREEN_BRIGHT_WAKE_LOCK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SCREEN_BRIGHT_WAKE_LOCK { get { if (!_SCREEN_BRIGHT_WAKE_LOCKReady) { _SCREEN_BRIGHT_WAKE_LOCKContent = SGetField<int>(LocalBridgeClazz, "SCREEN_BRIGHT_WAKE_LOCK"); _SCREEN_BRIGHT_WAKE_LOCKReady = true; } return _SCREEN_BRIGHT_WAKE_LOCKContent; } }
         private static int _SCREEN_BRIGHT_WAKE_LOCKContent = default;
         private static bool _SCREEN_BRIGHT_WAKE_LOCKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#SCREEN_DIM_WAKE_LOCK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SCREEN_DIM_WAKE_LOCK { get { if (!_SCREEN_DIM_WAKE_LOCKReady) { _SCREEN_DIM_WAKE_LOCKContent = SGetField<int>(LocalBridgeClazz, "SCREEN_DIM_WAKE_LOCK"); _SCREEN_DIM_WAKE_LOCKReady = true; } return _SCREEN_DIM_WAKE_LOCKContent; } }
         private static int _SCREEN_DIM_WAKE_LOCKContent = default;
         private static bool _SCREEN_DIM_WAKE_LOCKReady = false; // this is used because in case of generics 
@@ -224,27 +224,6 @@ public partial class PowerManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#getBatteryDischargePrediction()"/> 
-        /// </summary>
-        public Java.Time.Duration BatteryDischargePrediction
-        {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getBatteryDischargePrediction", "()Ljava/time/Duration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#getCurrentThermalStatus()"/> 
-        /// </summary>
-        public int CurrentThermalStatus
-        {
-            get { return IExecuteWithSignature<int>("getCurrentThermalStatus", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#getLocationPowerSaveMode()"/> 
-        /// </summary>
-        public int LocationPowerSaveMode
-        {
-            get { return IExecuteWithSignature<int>("getLocationPowerSaveMode", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#newWakeLock(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -349,7 +328,7 @@ public bool IsRebootingUserspaceSupported()
         /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#isScreenOn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsScreenOn()
         {
             return IExecuteWithSignature<bool>("isScreenOn", "()Z");
@@ -381,6 +360,30 @@ public float GetThermalHeadroom(int arg0)
             return IExecuteWithSignature<float>("getThermalHeadroom", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#getCurrentThermalStatus()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentThermalStatus()
+        {
+            return IExecuteWithSignature<int>("getCurrentThermalStatus", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#getLocationPowerSaveMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLocationPowerSaveMode()
+        {
+            return IExecuteWithSignature<int>("getLocationPowerSaveMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#getBatteryDischargePrediction()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetBatteryDischargePrediction()
+        {
+            return IExecuteWithSignature<Java.Time.Duration>("getBatteryDischargePrediction", "()Ljava/time/Duration;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/PowerManager.html#addThermalStatusListener(android.os.PowerManager.OnThermalStatusChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.PowerManager.OnThermalStatusChangedListener"/></param>
@@ -442,7 +445,7 @@ public partial class OnThermalStatusChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onThermalStatusChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnThermalStatusChangedEventHandler));
+                AddEventHandler("onThermalStatusChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnThermalStatusChangedEventHandler));
 
             }
 
@@ -450,7 +453,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/PowerManager.OnThermalStatusChangedListener.html#onThermalStatusChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnThermalStatusChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnThermalStatusChanged { get; set; } = null;
+            public global::System.Action<int> OnOnThermalStatusChanged { get; set; } = null;
 
             void OnThermalStatusChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -635,7 +638,7 @@ public partial class WakeLockStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnStateChangedEventHandler));
+                AddEventHandler("onStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnStateChangedEventHandler));
 
             }
 
@@ -643,7 +646,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/PowerManager.WakeLockStateListener.html#onStateChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnStateChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnStateChanged { get; set; } = null;
 
             void OnStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Os/Process.cs b/src/net/Netdroid/Generated/Android/Os/Process.cs
index a4d1d97c1..e30f7fa09 100644
--- a/src/net/Netdroid/Generated/Android/Os/Process.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Process.cs
@@ -186,48 +186,6 @@ public partial class Process
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Process.html#getElapsedCpuTime()"/> 
-        /// </summary>
-        public static long ElapsedCpuTime
-        {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getElapsedCpuTime", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Process.html#getExclusiveCores()"/> 
-        /// </summary>
-        public static int[] ExclusiveCores
-        {
-            get { return SExecuteWithSignatureArray<int>(LocalBridgeClazz, "getExclusiveCores", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Process.html#getStartElapsedRealtime()"/> 
-        /// </summary>
-        public static long StartElapsedRealtime
-        {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getStartElapsedRealtime", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Process.html#getStartRequestedElapsedRealtime()"/> 
-        /// </summary>
-        public static long StartRequestedElapsedRealtime
-        {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getStartRequestedElapsedRealtime", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Process.html#getStartRequestedUptimeMillis()"/> 
-        /// </summary>
-        public static long StartRequestedUptimeMillis
-        {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getStartRequestedUptimeMillis", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Process.html#getStartUptimeMillis()"/> 
-        /// </summary>
-        public static long StartUptimeMillis
-        {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getStartUptimeMillis", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Process.html#myUserHandle()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.UserHandle"/></returns>
@@ -281,7 +239,7 @@ public static bool IsSdkSandbox()
         /// <see href="https://developer.android.com/reference/android/os/Process.html#supportsProcesses()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool SupportsProcesses()
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "supportsProcesses", "()Z");
@@ -339,6 +297,22 @@ public static int GetUidForName(Java.Lang.String arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getUidForName", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Process.html#getExclusiveCores()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int[] GetExclusiveCores()
+        {
+            return SExecuteWithSignatureArray<int>(LocalBridgeClazz, "getExclusiveCores", "()[I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Process.html#getElapsedCpuTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public static long GetElapsedCpuTime()
+        {
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getElapsedCpuTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Process.html#sendSignal(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -384,6 +358,38 @@ public static Java.Lang.String MyProcessName()
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "myProcessName", "()Ljava/lang/String;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Process.html#getStartElapsedRealtime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public static long GetStartElapsedRealtime()
+        {
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getStartElapsedRealtime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Process.html#getStartRequestedElapsedRealtime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public static long GetStartRequestedElapsedRealtime()
+        {
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getStartRequestedElapsedRealtime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Process.html#getStartRequestedUptimeMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public static long GetStartRequestedUptimeMillis()
+        {
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getStartRequestedUptimeMillis", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Process.html#getStartUptimeMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public static long GetStartUptimeMillis()
+        {
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getStartUptimeMillis", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Os/ProxyFileDescriptorCallback.cs b/src/net/Netdroid/Generated/Android/Os/ProxyFileDescriptorCallback.cs
index b44d9839f..25de64844 100644
--- a/src/net/Netdroid/Generated/Android/Os/ProxyFileDescriptorCallback.cs
+++ b/src/net/Netdroid/Generated/Android/Os/ProxyFileDescriptorCallback.cs
@@ -59,7 +59,7 @@ public void OnRelease()
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public int OnRead(long arg0, int arg1, byte[] arg2)
         {
             return IExecute<int>("onRead", arg0, arg1, arg2);
@@ -71,7 +71,7 @@ public int OnRead(long arg0, int arg1, byte[] arg2)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public int OnWrite(long arg0, int arg1, byte[] arg2)
         {
             return IExecute<int>("onWrite", arg0, arg1, arg2);
@@ -80,7 +80,7 @@ public int OnWrite(long arg0, int arg1, byte[] arg2)
         /// <see href="https://developer.android.com/reference/android/os/ProxyFileDescriptorCallback.html#onGetSize()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public long OnGetSize()
         {
             return IExecuteWithSignature<long>("onGetSize", "()J");
@@ -88,7 +88,7 @@ public long OnGetSize()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/ProxyFileDescriptorCallback.html#onFsync()"/>
         /// </summary>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public void OnFsync()
         {
             IExecuteWithSignature("onFsync", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Os/RecoverySystem.cs b/src/net/Netdroid/Generated/Android/Os/RecoverySystem.cs
index 0edad4582..be5b31920 100644
--- a/src/net/Netdroid/Generated/Android/Os/RecoverySystem.cs
+++ b/src/net/Netdroid/Generated/Android/Os/RecoverySystem.cs
@@ -114,7 +114,7 @@ public partial class ProgressListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onProgress", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnProgressEventHandler));
+                AddEventHandler("onProgress", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnProgressEventHandler));
 
             }
 
@@ -122,7 +122,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/RecoverySystem.ProgressListener.html#onProgress(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnProgress"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnProgress { get; set; } = null;
+            public global::System.Action<int> OnOnProgress { get; set; } = null;
 
             void OnProgressEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Os/RemoteCallbackList.cs b/src/net/Netdroid/Generated/Android/Os/RemoteCallbackList.cs
index 7bed6a70a..6f0e39784 100644
--- a/src/net/Netdroid/Generated/Android/Os/RemoteCallbackList.cs
+++ b/src/net/Netdroid/Generated/Android/Os/RemoteCallbackList.cs
@@ -46,13 +46,6 @@ public partial class RemoteCallbackList
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html#getRegisteredCallbackCount()"/> 
-        /// </summary>
-        public int RegisteredCallbackCount
-        {
-            get { return IExecuteWithSignature<int>("getRegisteredCallbackCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html#register(android.os.IInterface,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.IInterface"/></param>
@@ -107,6 +100,14 @@ public int BeginBroadcast()
             return IExecuteWithSignature<int>("beginBroadcast", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html#getRegisteredCallbackCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRegisteredCallbackCount()
+        {
+            return IExecuteWithSignature<int>("getRegisteredCallbackCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html#getBroadcastCookie(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -191,13 +192,6 @@ public partial class RemoteCallbackList<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html#getRegisteredCallbackCount()"/> 
-        /// </summary>
-        public int RegisteredCallbackCount
-        {
-            get { return IExecuteWithSignature<int>("getRegisteredCallbackCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html#register(android.os.IInterface,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
@@ -252,6 +246,14 @@ public int BeginBroadcast()
             return IExecuteWithSignature<int>("beginBroadcast", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html#getRegisteredCallbackCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRegisteredCallbackCount()
+        {
+            return IExecuteWithSignature<int>("getRegisteredCallbackCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/RemoteCallbackList.html#getBroadcastCookie(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/SharedMemory.cs b/src/net/Netdroid/Generated/Android/Os/SharedMemory.cs
index ecc9e52a0..21f25b1ef 100644
--- a/src/net/Netdroid/Generated/Android/Os/SharedMemory.cs
+++ b/src/net/Netdroid/Generated/Android/Os/SharedMemory.cs
@@ -61,7 +61,7 @@ public partial class SharedMemory : Android.Os.IParcelable, Java.Io.ICloseable
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.Os.SharedMemory"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Android.Os.SharedMemory Create(Java.Lang.String arg0, int arg1)
         {
             return SExecute<Android.Os.SharedMemory>(LocalBridgeClazz, "create", arg0, arg1);
@@ -88,13 +88,6 @@ public static void Unmap(Java.Nio.ByteBuffer arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/SharedMemory.html#getSize()"/> 
-        /// </summary>
-        public int Size
-        {
-            get { return IExecuteWithSignature<int>("getSize", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/SharedMemory.html#setProtect(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -112,13 +105,21 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/SharedMemory.html#getSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSize()
+        {
+            return IExecuteWithSignature<int>("getSize", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/SharedMemory.html#map(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public Java.Nio.ByteBuffer Map(int arg0, int arg1, int arg2)
         {
             return IExecute<Java.Nio.ByteBuffer>("map", arg0, arg1, arg2);
@@ -127,7 +128,7 @@ public Java.Nio.ByteBuffer Map(int arg0, int arg1, int arg2)
         /// <see href="https://developer.android.com/reference/android/os/SharedMemory.html#mapReadOnly()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public Java.Nio.ByteBuffer MapReadOnly()
         {
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("mapReadOnly", "()Ljava/nio/ByteBuffer;");
@@ -136,7 +137,7 @@ public Java.Nio.ByteBuffer MapReadOnly()
         /// <see href="https://developer.android.com/reference/android/os/SharedMemory.html#mapReadWrite()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public Java.Nio.ByteBuffer MapReadWrite()
         {
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("mapReadWrite", "()Ljava/nio/ByteBuffer;");
diff --git a/src/net/Netdroid/Generated/Android/Os/StatFs.cs b/src/net/Netdroid/Generated/Android/Os/StatFs.cs
index c8e875e9b..de9ebc8fd 100644
--- a/src/net/Netdroid/Generated/Android/Os/StatFs.cs
+++ b/src/net/Netdroid/Generated/Android/Os/StatFs.cs
@@ -54,85 +54,96 @@ public StatFs(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getAvailableBlocks()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getAvailableBlocks()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int AvailableBlocks
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetAvailableBlocks()
         {
-            get { return IExecuteWithSignature<int>("getAvailableBlocks", "()I"); }
+            return IExecuteWithSignature<int>("getAvailableBlocks", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getAvailableBlocksLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getBlockCount()"/>
         /// </summary>
-        public long AvailableBlocksLong
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBlockCount()
         {
-            get { return IExecuteWithSignature<long>("getAvailableBlocksLong", "()J"); }
+            return IExecuteWithSignature<int>("getBlockCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getAvailableBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getBlockSize()"/>
         /// </summary>
-        public long AvailableBytes
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBlockSize()
         {
-            get { return IExecuteWithSignature<long>("getAvailableBytes", "()J"); }
+            return IExecuteWithSignature<int>("getBlockSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getBlockCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getFreeBlocks()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int BlockCount
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetFreeBlocks()
         {
-            get { return IExecuteWithSignature<int>("getBlockCount", "()I"); }
+            return IExecuteWithSignature<int>("getFreeBlocks", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getBlockCountLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getAvailableBlocksLong()"/>
         /// </summary>
-        public long BlockCountLong
+        /// <returns><see cref="long"/></returns>
+        public long GetAvailableBlocksLong()
         {
-            get { return IExecuteWithSignature<long>("getBlockCountLong", "()J"); }
+            return IExecuteWithSignature<long>("getAvailableBlocksLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getBlockSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getAvailableBytes()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int BlockSize
+        /// <returns><see cref="long"/></returns>
+        public long GetAvailableBytes()
         {
-            get { return IExecuteWithSignature<int>("getBlockSize", "()I"); }
+            return IExecuteWithSignature<long>("getAvailableBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getBlockSizeLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getBlockCountLong()"/>
         /// </summary>
-        public long BlockSizeLong
+        /// <returns><see cref="long"/></returns>
+        public long GetBlockCountLong()
         {
-            get { return IExecuteWithSignature<long>("getBlockSizeLong", "()J"); }
+            return IExecuteWithSignature<long>("getBlockCountLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getFreeBlocks()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getBlockSizeLong()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int FreeBlocks
+        /// <returns><see cref="long"/></returns>
+        public long GetBlockSizeLong()
         {
-            get { return IExecuteWithSignature<int>("getFreeBlocks", "()I"); }
+            return IExecuteWithSignature<long>("getBlockSizeLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getFreeBlocksLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getFreeBlocksLong()"/>
         /// </summary>
-        public long FreeBlocksLong
+        /// <returns><see cref="long"/></returns>
+        public long GetFreeBlocksLong()
         {
-            get { return IExecuteWithSignature<long>("getFreeBlocksLong", "()J"); }
+            return IExecuteWithSignature<long>("getFreeBlocksLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getFreeBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getFreeBytes()"/>
         /// </summary>
-        public long FreeBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetFreeBytes()
         {
-            get { return IExecuteWithSignature<long>("getFreeBytes", "()J"); }
+            return IExecuteWithSignature<long>("getFreeBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getTotalBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StatFs.html#getTotalBytes()"/>
         /// </summary>
-        public long TotalBytes
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalBytes()
         {
-            get { return IExecuteWithSignature<long>("getTotalBytes", "()J"); }
+            return IExecuteWithSignature<long>("getTotalBytes", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/StatFs.html#restat(java.lang.String)"/>
diff --git a/src/net/Netdroid/Generated/Android/Os/Storage/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Os/Storage/AllPackageClasses.cs
index 1e599873d..b6e33259c 100644
--- a/src/net/Netdroid/Generated/Android/Os/Storage/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Storage/AllPackageClasses.cs
@@ -30,38 +30,26 @@ namespace Android.Os.Storage
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html"/>
     /// </summary>
-    public partial class OnObbStateChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class OnObbStateChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnObbStateChangeListener>
     {
+        const string _bridgeClassName = "android.os.storage.OnObbStateChangeListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public OnObbStateChangeListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region OnObbStateChangeListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="OnObbStateChangeListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class OnObbStateChangeListenerDirect : OnObbStateChangeListener
-    {
+        [global::System.Obsolete("OnObbStateChangeListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public OnObbStateChangeListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("OnObbStateChangeListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public OnObbStateChangeListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.os.storage.OnObbStateChangeListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -78,6 +66,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Os/Storage/OnObbStateChangeListener.cs b/src/net/Netdroid/Generated/Android/Os/Storage/OnObbStateChangeListener.cs
index b88cac341..99be474e1 100644
--- a/src/net/Netdroid/Generated/Android/Os/Storage/OnObbStateChangeListener.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Storage/OnObbStateChangeListener.cs
@@ -37,67 +37,54 @@ public partial class OnObbStateChangeListener
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// Handlers initializer for <see cref="OnObbStateChangeListener"/>
+        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#ERROR_ALREADY_MOUNTED"/>
         /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onObbStateChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnObbStateChangeEventHandler));
-
-        }
-
+        public static int ERROR_ALREADY_MOUNTED { get { if (!_ERROR_ALREADY_MOUNTEDReady) { _ERROR_ALREADY_MOUNTEDContent = SGetField<int>(LocalBridgeClazz, "ERROR_ALREADY_MOUNTED"); _ERROR_ALREADY_MOUNTEDReady = true; } return _ERROR_ALREADY_MOUNTEDContent; } }
+        private static int _ERROR_ALREADY_MOUNTEDContent = default;
+        private static bool _ERROR_ALREADY_MOUNTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#onObbStateChange(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#ERROR_COULD_NOT_MOUNT"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnObbStateChange"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, int> OnOnObbStateChange { get; set; } = null;
-
-        void OnObbStateChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnObbStateChange != null) ? OnOnObbStateChange : OnObbStateChange;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
+        public static int ERROR_COULD_NOT_MOUNT { get { if (!_ERROR_COULD_NOT_MOUNTReady) { _ERROR_COULD_NOT_MOUNTContent = SGetField<int>(LocalBridgeClazz, "ERROR_COULD_NOT_MOUNT"); _ERROR_COULD_NOT_MOUNTReady = true; } return _ERROR_COULD_NOT_MOUNTContent; } }
+        private static int _ERROR_COULD_NOT_MOUNTContent = default;
+        private static bool _ERROR_COULD_NOT_MOUNTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#onObbStateChange(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#ERROR_COULD_NOT_UNMOUNT"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public virtual void OnObbStateChange(Java.Lang.String arg0, int arg1)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region OnObbStateChangeListenerDirect
-    public partial class OnObbStateChangeListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
+        public static int ERROR_COULD_NOT_UNMOUNT { get { if (!_ERROR_COULD_NOT_UNMOUNTReady) { _ERROR_COULD_NOT_UNMOUNTContent = SGetField<int>(LocalBridgeClazz, "ERROR_COULD_NOT_UNMOUNT"); _ERROR_COULD_NOT_UNMOUNTReady = true; } return _ERROR_COULD_NOT_UNMOUNTContent; } }
+        private static int _ERROR_COULD_NOT_UNMOUNTContent = default;
+        private static bool _ERROR_COULD_NOT_UNMOUNTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#ERROR_INTERNAL"/>
+        /// </summary>
+        public static int ERROR_INTERNAL { get { if (!_ERROR_INTERNALReady) { _ERROR_INTERNALContent = SGetField<int>(LocalBridgeClazz, "ERROR_INTERNAL"); _ERROR_INTERNALReady = true; } return _ERROR_INTERNALContent; } }
+        private static int _ERROR_INTERNALContent = default;
+        private static bool _ERROR_INTERNALReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#ERROR_NOT_MOUNTED"/>
+        /// </summary>
+        public static int ERROR_NOT_MOUNTED { get { if (!_ERROR_NOT_MOUNTEDReady) { _ERROR_NOT_MOUNTEDContent = SGetField<int>(LocalBridgeClazz, "ERROR_NOT_MOUNTED"); _ERROR_NOT_MOUNTEDReady = true; } return _ERROR_NOT_MOUNTEDContent; } }
+        private static int _ERROR_NOT_MOUNTEDContent = default;
+        private static bool _ERROR_NOT_MOUNTEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#ERROR_PERMISSION_DENIED"/>
+        /// </summary>
+        public static int ERROR_PERMISSION_DENIED { get { if (!_ERROR_PERMISSION_DENIEDReady) { _ERROR_PERMISSION_DENIEDContent = SGetField<int>(LocalBridgeClazz, "ERROR_PERMISSION_DENIED"); _ERROR_PERMISSION_DENIEDReady = true; } return _ERROR_PERMISSION_DENIEDContent; } }
+        private static int _ERROR_PERMISSION_DENIEDContent = default;
+        private static bool _ERROR_PERMISSION_DENIEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#MOUNTED"/>
+        /// </summary>
+        public static int MOUNTED { get { if (!_MOUNTEDReady) { _MOUNTEDContent = SGetField<int>(LocalBridgeClazz, "MOUNTED"); _MOUNTEDReady = true; } return _MOUNTEDContent; } }
+        private static int _MOUNTEDContent = default;
+        private static bool _MOUNTEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/OnObbStateChangeListener.html#UNMOUNTED"/>
+        /// </summary>
+        public static int UNMOUNTED { get { if (!_UNMOUNTEDReady) { _UNMOUNTEDContent = SGetField<int>(LocalBridgeClazz, "UNMOUNTED"); _UNMOUNTEDReady = true; } return _UNMOUNTEDContent; } }
+        private static int _UNMOUNTEDContent = default;
+        private static bool _UNMOUNTEDReady = false; // this is used because in case of generics 
 
         #endregion
 
@@ -111,7 +98,7 @@ public partial class OnObbStateChangeListenerDirect
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        public override void OnObbStateChange(Java.Lang.String arg0, int arg1)
+        public void OnObbStateChange(Java.Lang.String arg0, int arg1)
         {
             IExecute("onObbStateChange", arg0, arg1);
         }
diff --git a/src/net/Netdroid/Generated/Android/Os/Storage/StorageManager.cs b/src/net/Netdroid/Generated/Android/Os/Storage/StorageManager.cs
index 4c9ab55eb..c95636cf1 100644
--- a/src/net/Netdroid/Generated/Android/Os/Storage/StorageManager.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Storage/StorageManager.cs
@@ -76,34 +76,6 @@ public partial class StorageManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getPrimaryStorageVolume()"/> 
-        /// </summary>
-        public Android.Os.Storage.StorageVolume PrimaryStorageVolume
-        {
-            get { return IExecuteWithSignature<Android.Os.Storage.StorageVolume>("getPrimaryStorageVolume", "()Landroid/os/storage/StorageVolume;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getRecentStorageVolumes()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Os.Storage.StorageVolume> RecentStorageVolumes
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.Storage.StorageVolume>>("getRecentStorageVolumes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getStorageVolumes()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Os.Storage.StorageVolume> StorageVolumes
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.Storage.StorageVolume>>("getStorageVolumes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getStorageVolumesIncludingSharedProfiles()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Os.Storage.StorageVolume> StorageVolumesIncludingSharedProfiles
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.Storage.StorageVolume>>("getStorageVolumesIncludingSharedProfiles", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getManageSpaceActivityIntent(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -126,6 +98,14 @@ public Android.Os.ParcelFileDescriptor OpenProxyFileDescriptor(int arg0, Android
             return IExecute<Android.Os.ParcelFileDescriptor>("openProxyFileDescriptor", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getPrimaryStorageVolume()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Storage.StorageVolume"/></returns>
+        public Android.Os.Storage.StorageVolume GetPrimaryStorageVolume()
+        {
+            return IExecuteWithSignature<Android.Os.Storage.StorageVolume>("getPrimaryStorageVolume", "()Landroid/os/storage/StorageVolume;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getStorageVolume(android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
@@ -230,6 +210,30 @@ public Java.Lang.String GetMountedObbPath(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getMountedObbPath", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getRecentStorageVolumes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.Storage.StorageVolume> GetRecentStorageVolumes()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Os.Storage.StorageVolume>>("getRecentStorageVolumes", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getStorageVolumes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.Storage.StorageVolume> GetStorageVolumes()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Os.Storage.StorageVolume>>("getStorageVolumes", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getStorageVolumesIncludingSharedProfiles()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.Storage.StorageVolume> GetStorageVolumesIncludingSharedProfiles()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Os.Storage.StorageVolume>>("getStorageVolumesIncludingSharedProfiles", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/storage/StorageManager.html#getUuidForPath(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/Storage/StorageVolume.cs b/src/net/Netdroid/Generated/Android/Os/Storage/StorageVolume.cs
index d47f3e786..881726267 100644
--- a/src/net/Netdroid/Generated/Android/Os/Storage/StorageVolume.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Storage/StorageVolume.cs
@@ -58,53 +58,11 @@ public partial class StorageVolume
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getDirectory()"/> 
-        /// </summary>
-        public Java.Io.File Directory
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getDirectory", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getMediaStoreVolumeName()"/> 
-        /// </summary>
-        public Java.Lang.String MediaStoreVolumeName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMediaStoreVolumeName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getOwner()"/> 
-        /// </summary>
-        public Android.Os.UserHandle Owner
-        {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getOwner", "()Landroid/os/UserHandle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getState()"/> 
-        /// </summary>
-        public Java.Lang.String State
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getState", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getStorageUuid()"/> 
-        /// </summary>
-        public Java.Util.UUID StorageUuid
-        {
-            get { return IExecuteWithSignature<Java.Util.UUID>("getStorageUuid", "()Ljava/util/UUID;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getUuid()"/> 
-        /// </summary>
-        public Java.Lang.String Uuid
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUuid", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#createAccessIntent(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Content.Intent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Intent CreateAccessIntent(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Content.Intent>("createAccessIntent", "(Ljava/lang/String;)Landroid/content/Intent;", arg0);
@@ -118,6 +76,14 @@ public Android.Content.Intent CreateOpenDocumentTreeIntent()
             return IExecuteWithSignature<Android.Content.Intent>("createOpenDocumentTreeIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getOwner()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetOwner()
+        {
+            return IExecuteWithSignature<Android.Os.UserHandle>("getOwner", "()Landroid/os/UserHandle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#isEmulated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -150,6 +116,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getDirectory()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetDirectory()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getDirectory", "()Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getDescription(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -159,6 +133,38 @@ public Java.Lang.String GetDescription(Android.Content.Context arg0)
             return IExecuteWithSignature<Java.Lang.String>("getDescription", "(Landroid/content/Context;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getMediaStoreVolumeName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMediaStoreVolumeName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMediaStoreVolumeName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getState()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetState()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getState", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getUuid()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUuid()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUuid", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#getStorageUuid()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.UUID"/></returns>
+        public Java.Util.UUID GetStorageUuid()
+        {
+            return IExecuteWithSignature<Java.Util.UUID>("getStorageUuid", "()Ljava/util/UUID;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/storage/StorageVolume.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/StrictMode.cs b/src/net/Netdroid/Generated/Android/Os/StrictMode.cs
index e4ed4035a..30d09f77b 100644
--- a/src/net/Netdroid/Generated/Android/Os/StrictMode.cs
+++ b/src/net/Netdroid/Generated/Android/Os/StrictMode.cs
@@ -42,34 +42,36 @@ public partial class StrictMode
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#getThreadPolicy()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#allowThreadDiskReads()"/>
         /// </summary>
-        public static Android.Os.StrictMode.ThreadPolicy GetThreadPolicy
+        /// <returns><see cref="Android.Os.StrictMode.ThreadPolicy"/></returns>
+        public static Android.Os.StrictMode.ThreadPolicy AllowThreadDiskReads()
         {
-            get { return SExecuteWithSignature<Android.Os.StrictMode.ThreadPolicy>(LocalBridgeClazz, "getThreadPolicy", "()Landroid/os/StrictMode$ThreadPolicy;"); }
+            return SExecuteWithSignature<Android.Os.StrictMode.ThreadPolicy>(LocalBridgeClazz, "allowThreadDiskReads", "()Landroid/os/StrictMode$ThreadPolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#getVmPolicy()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#allowThreadDiskWrites()"/>
         /// </summary>
-        public static Android.Os.StrictMode.VmPolicy GetVmPolicy
+        /// <returns><see cref="Android.Os.StrictMode.ThreadPolicy"/></returns>
+        public static Android.Os.StrictMode.ThreadPolicy AllowThreadDiskWrites()
         {
-            get { return SExecuteWithSignature<Android.Os.StrictMode.VmPolicy>(LocalBridgeClazz, "getVmPolicy", "()Landroid/os/StrictMode$VmPolicy;"); }
+            return SExecuteWithSignature<Android.Os.StrictMode.ThreadPolicy>(LocalBridgeClazz, "allowThreadDiskWrites", "()Landroid/os/StrictMode$ThreadPolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#allowThreadDiskReads()"/>
+        /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#getThreadPolicy()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.StrictMode.ThreadPolicy"/></returns>
-        public static Android.Os.StrictMode.ThreadPolicy AllowThreadDiskReads()
+        public static Android.Os.StrictMode.ThreadPolicy GetThreadPolicy()
         {
-            return SExecuteWithSignature<Android.Os.StrictMode.ThreadPolicy>(LocalBridgeClazz, "allowThreadDiskReads", "()Landroid/os/StrictMode$ThreadPolicy;");
+            return SExecuteWithSignature<Android.Os.StrictMode.ThreadPolicy>(LocalBridgeClazz, "getThreadPolicy", "()Landroid/os/StrictMode$ThreadPolicy;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#allowThreadDiskWrites()"/>
+        /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#getVmPolicy()"/>
         /// </summary>
-        /// <returns><see cref="Android.Os.StrictMode.ThreadPolicy"/></returns>
-        public static Android.Os.StrictMode.ThreadPolicy AllowThreadDiskWrites()
+        /// <returns><see cref="Android.Os.StrictMode.VmPolicy"/></returns>
+        public static Android.Os.StrictMode.VmPolicy GetVmPolicy()
         {
-            return SExecuteWithSignature<Android.Os.StrictMode.ThreadPolicy>(LocalBridgeClazz, "allowThreadDiskWrites", "()Landroid/os/StrictMode$ThreadPolicy;");
+            return SExecuteWithSignature<Android.Os.StrictMode.VmPolicy>(LocalBridgeClazz, "getVmPolicy", "()Landroid/os/StrictMode$VmPolicy;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/StrictMode.html#enableDefaults()"/>
@@ -135,7 +137,7 @@ public partial class OnThreadViolationListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onThreadViolation", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnThreadViolationEventHandler));
+                AddEventHandler("onThreadViolation", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnThreadViolationEventHandler));
 
             }
 
@@ -143,7 +145,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/StrictMode.OnThreadViolationListener.html#onThreadViolation(android.os.strictmode.Violation)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnThreadViolation"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnOnThreadViolation { get; set; } = null;
+            public global::System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnOnThreadViolation { get; set; } = null;
 
             void OnThreadViolationEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -234,7 +236,7 @@ public partial class OnVmViolationListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onVmViolation", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnVmViolationEventHandler));
+                AddEventHandler("onVmViolation", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnVmViolationEventHandler));
 
             }
 
@@ -242,7 +244,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/os/StrictMode.OnVmViolationListener.html#onVmViolation(android.os.strictmode.Violation)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnVmViolation"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnOnVmViolation { get; set; } = null;
+            public global::System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnOnVmViolation { get; set; } = null;
 
             void OnVmViolationEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Os/TestLooperManager.cs b/src/net/Netdroid/Generated/Android/Os/TestLooperManager.cs
index 4de9a2da4..d580b51a8 100644
--- a/src/net/Netdroid/Generated/Android/Os/TestLooperManager.cs
+++ b/src/net/Netdroid/Generated/Android/Os/TestLooperManager.cs
@@ -46,13 +46,6 @@ public partial class TestLooperManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/TestLooperManager.html#getMessageQueue()"/> 
-        /// </summary>
-        public Android.Os.MessageQueue MessageQueue
-        {
-            get { return IExecuteWithSignature<Android.Os.MessageQueue>("getMessageQueue", "()Landroid/os/MessageQueue;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/TestLooperManager.html#next()"/>
         /// </summary>
         /// <returns><see cref="Android.Os.Message"/></returns>
@@ -61,6 +54,14 @@ public Android.Os.Message Next()
             return IExecuteWithSignature<Android.Os.Message>("next", "()Landroid/os/Message;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/TestLooperManager.html#getMessageQueue()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.MessageQueue"/></returns>
+        public Android.Os.MessageQueue GetMessageQueue()
+        {
+            return IExecuteWithSignature<Android.Os.MessageQueue>("getMessageQueue", "()Landroid/os/MessageQueue;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/TestLooperManager.html#hasMessages(android.os.Handler,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Handler"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Os/UserManager.cs b/src/net/Netdroid/Generated/Android/Os/UserManager.cs
index 8b87c70e5..bbbb95b1c 100644
--- a/src/net/Netdroid/Generated/Android/Os/UserManager.cs
+++ b/src/net/Netdroid/Generated/Android/Os/UserManager.cs
@@ -106,7 +106,7 @@ public partial class UserManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/UserManager.html#DISALLOW_ADD_MANAGED_PROFILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String DISALLOW_ADD_MANAGED_PROFILE { get { if (!_DISALLOW_ADD_MANAGED_PROFILEReady) { _DISALLOW_ADD_MANAGED_PROFILEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DISALLOW_ADD_MANAGED_PROFILE"); _DISALLOW_ADD_MANAGED_PROFILEReady = true; } return _DISALLOW_ADD_MANAGED_PROFILEContent; } }
         private static Java.Lang.String _DISALLOW_ADD_MANAGED_PROFILEContent = default;
         private static bool _DISALLOW_ADD_MANAGED_PROFILEReady = false; // this is used because in case of generics 
@@ -383,7 +383,7 @@ public partial class UserManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/UserManager.html#DISALLOW_REMOVE_MANAGED_PROFILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String DISALLOW_REMOVE_MANAGED_PROFILE { get { if (!_DISALLOW_REMOVE_MANAGED_PROFILEReady) { _DISALLOW_REMOVE_MANAGED_PROFILEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DISALLOW_REMOVE_MANAGED_PROFILE"); _DISALLOW_REMOVE_MANAGED_PROFILEReady = true; } return _DISALLOW_REMOVE_MANAGED_PROFILEContent; } }
         private static Java.Lang.String _DISALLOW_REMOVE_MANAGED_PROFILEContent = default;
         private static bool _DISALLOW_REMOVE_MANAGED_PROFILEReady = false; // this is used because in case of generics 
@@ -538,35 +538,6 @@ public static bool SupportsMultipleUsers()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserCount()"/> 
-        /// </summary>
-        public int UserCount
-        {
-            get { return IExecuteWithSignature<int>("getUserCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserName()"/> 
-        /// </summary>
-        public Java.Lang.String UserName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserProfiles()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Os.UserHandle> UserProfiles
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Os.UserHandle>>("getUserProfiles", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserRestrictions()"/> <see href="https://developer.android.com/reference/android/os/UserManager.html#setUserRestrictions(android.os.Bundle)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Os.Bundle UserRestrictions
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getUserRestrictions", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setUserRestrictions", "(Landroid/os/Bundle;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getApplicationRestrictions(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -576,6 +547,14 @@ public Android.Os.Bundle GetApplicationRestrictions(Java.Lang.String arg0)
             return IExecuteWithSignature<Android.Os.Bundle>("getApplicationRestrictions", "(Ljava/lang/String;)Landroid/os/Bundle;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserRestrictions()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetUserRestrictions()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getUserRestrictions", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserRestrictions(android.os.UserHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.UserHandle"/></param>
@@ -728,12 +707,36 @@ public bool RequestQuietModeEnabled(bool arg0, Android.Os.UserHandle arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetRestrictionsChallenge(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("setRestrictionsChallenge", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetUserCount()
+        {
+            return IExecuteWithSignature<int>("getUserCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUserName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUserName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getUserProfiles()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Os.UserHandle> GetUserProfiles()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Os.UserHandle>>("getUserProfiles", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/UserManager.html#getSerialNumberForUser(android.os.UserHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.UserHandle"/></param>
@@ -756,7 +759,7 @@ public long GetUserCreationTime(Android.Os.UserHandle arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetUserRestriction(Java.Lang.String arg0, bool arg1)
         {
             IExecute("setUserRestriction", arg0, arg1);
@@ -766,11 +769,20 @@ public void SetUserRestriction(Java.Lang.String arg0, bool arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
         /// <param name="arg1"><see cref="Android.Os.UserHandle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetUserRestrictions(Android.Os.Bundle arg0, Android.Os.UserHandle arg1)
         {
             IExecute("setUserRestrictions", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/UserManager.html#setUserRestrictions(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        [global::System.Obsolete()]
+        public void SetUserRestrictions(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setUserRestrictions", "(Landroid/os/Bundle;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Os/VibrationAttributes.cs b/src/net/Netdroid/Generated/Android/Os/VibrationAttributes.cs
index ca284e1e0..05e4c9b72 100644
--- a/src/net/Netdroid/Generated/Android/Os/VibrationAttributes.cs
+++ b/src/net/Netdroid/Generated/Android/Os/VibrationAttributes.cs
@@ -157,42 +157,45 @@ public static Android.Os.VibrationAttributes CreateForUsage(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#isFlagSet(int)"/>
         /// </summary>
-        public int Flags
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFlagSet(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<bool>("isFlagSet", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#getUsage()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#describeContents()"/>
         /// </summary>
-        public int Usage
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getUsage", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#getUsageClass()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#getFlags()"/>
         /// </summary>
-        public int UsageClass
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<int>("getUsageClass", "()I"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#isFlagSet(int)"/>
+        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#getUsage()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFlagSet(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetUsage()
         {
-            return IExecuteWithSignature<bool>("isFlagSet", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getUsage", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#getUsageClass()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetUsageClass()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getUsageClass", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/VibrationAttributes.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Os/Vibrator.cs b/src/net/Netdroid/Generated/Android/Os/Vibrator.cs
index fb6d9330d..54a807b5b 100644
--- a/src/net/Netdroid/Generated/Android/Os/Vibrator.cs
+++ b/src/net/Netdroid/Generated/Android/Os/Vibrator.cs
@@ -64,27 +64,6 @@ public partial class Vibrator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#getId()"/> 
-        /// </summary>
-        public int Id
-        {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#getQFactor()"/> 
-        /// </summary>
-        public float QFactor
-        {
-            get { return IExecuteWithSignature<float>("getQFactor", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#getResonantFrequency()"/> 
-        /// </summary>
-        public float ResonantFrequency
-        {
-            get { return IExecuteWithSignature<float>("getResonantFrequency", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#hasAmplitudeControl()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -135,6 +114,30 @@ public int AreAllEffectsSupported(params int[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature<int>("areAllEffectsSupported", "([I)I"); else return IExecuteWithSignature<int>("areAllEffectsSupported", "([I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#getQFactor()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetQFactor()
+        {
+            return IExecuteWithSignature<float>("getQFactor", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#getResonantFrequency()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetResonantFrequency()
+        {
+            return IExecuteWithSignature<float>("getResonantFrequency", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
+        {
+            return IExecuteWithSignature<int>("getId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#areEffectsSupported(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -157,7 +160,7 @@ public int[] GetPrimitiveDurations(params int[] arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.VibrationEffect"/></param>
         /// <param name="arg1"><see cref="Android.Media.AudioAttributes"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Vibrate(Android.Os.VibrationEffect arg0, Android.Media.AudioAttributes arg1)
         {
             IExecute("vibrate", arg0, arg1);
@@ -184,7 +187,7 @@ public void Vibrate(Android.Os.VibrationEffect arg0)
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Android.Media.AudioAttributes"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Vibrate(long arg0, Android.Media.AudioAttributes arg1)
         {
             IExecute("vibrate", arg0, arg1);
@@ -193,7 +196,7 @@ public void Vibrate(long arg0, Android.Media.AudioAttributes arg1)
         /// <see href="https://developer.android.com/reference/android/os/Vibrator.html#vibrate(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Vibrate(long arg0)
         {
             IExecuteWithSignature("vibrate", "(J)V", arg0);
@@ -204,7 +207,7 @@ public void Vibrate(long arg0)
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Media.AudioAttributes"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Vibrate(long[] arg0, int arg1, Android.Media.AudioAttributes arg2)
         {
             IExecute("vibrate", arg0, arg1, arg2);
@@ -214,7 +217,7 @@ public void Vibrate(long[] arg0, int arg1, Android.Media.AudioAttributes arg2)
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Vibrate(long[] arg0, int arg1)
         {
             IExecute("vibrate", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Os/VibratorManager.cs b/src/net/Netdroid/Generated/Android/Os/VibratorManager.cs
index 8ae7528a2..8b405b39f 100644
--- a/src/net/Netdroid/Generated/Android/Os/VibratorManager.cs
+++ b/src/net/Netdroid/Generated/Android/Os/VibratorManager.cs
@@ -46,18 +46,12 @@ public partial class VibratorManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/VibratorManager.html#getDefaultVibrator()"/> 
+        /// <see href="https://developer.android.com/reference/android/os/VibratorManager.html#getDefaultVibrator()"/>
         /// </summary>
-        public Android.Os.Vibrator DefaultVibrator
-        {
-            get { return IExecuteWithSignature<Android.Os.Vibrator>("getDefaultVibrator", "()Landroid/os/Vibrator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/os/VibratorManager.html#getVibratorIds()"/> 
-        /// </summary>
-        public int[] VibratorIds
+        /// <returns><see cref="Android.Os.Vibrator"/></returns>
+        public Android.Os.Vibrator GetDefaultVibrator()
         {
-            get { return IExecuteWithSignatureArray<int>("getVibratorIds", "()[I"); }
+            return IExecuteWithSignature<Android.Os.Vibrator>("getDefaultVibrator", "()Landroid/os/Vibrator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/VibratorManager.html#getVibrator(int)"/>
@@ -69,6 +63,14 @@ public Android.Os.Vibrator GetVibrator(int arg0)
             return IExecuteWithSignature<Android.Os.Vibrator>("getVibrator", "(I)Landroid/os/Vibrator;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/os/VibratorManager.html#getVibratorIds()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetVibratorIds()
+        {
+            return IExecuteWithSignatureArray<int>("getVibratorIds", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/os/VibratorManager.html#cancel()"/>
         /// </summary>
         public void Cancel()
diff --git a/src/net/Netdroid/Generated/Android/Preference/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Preference/AllPackageClasses.cs
index 5e07959d8..e23c22d57 100644
--- a/src/net/Netdroid/Generated/Android/Preference/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Preference
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/CheckBoxPreference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CheckBoxPreference : Android.Preference.TwoStatePreference
     {
         const string _bridgeClassName = "android.preference.CheckBoxPreference";
@@ -75,19 +75,19 @@ public CheckBoxPreference(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DialogPreference : Android.Preference.Preference
     {
         const string _bridgeClassName = "android.preference.DialogPreference";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DialogPreference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DialogPreference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DialogPreference() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DialogPreference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DialogPreference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DialogPreference(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -122,7 +122,7 @@ public DialogPreference(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/EditTextPreference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class EditTextPreference : Android.Preference.DialogPreference
     {
         const string _bridgeClassName = "android.preference.EditTextPreference";
@@ -167,7 +167,7 @@ public EditTextPreference(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ListPreference : Android.Preference.DialogPreference
     {
         const string _bridgeClassName = "android.preference.ListPreference";
@@ -212,7 +212,7 @@ public ListPreference(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MultiSelectListPreference : Android.Preference.DialogPreference
     {
         const string _bridgeClassName = "android.preference.MultiSelectListPreference";
@@ -257,7 +257,7 @@ public MultiSelectListPreference(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/Preference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Preference : Java.Lang.Comparable<Android.Preference.Preference>
     {
         const string _bridgeClassName = "android.preference.Preference";
@@ -298,7 +298,7 @@ public Preference(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.BaseSavedState.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class BaseSavedState : Android.View.AbsSavedState
         {
             const string _bridgeClassName = "android.preference.Preference$BaseSavedState";
@@ -343,7 +343,7 @@ public BaseSavedState(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.OnPreferenceChangeListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnPreferenceChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -351,10 +351,13 @@ public partial class OnPreferenceChangeListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public OnPreferenceChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.preference.Preference_OnPreferenceChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.preference.OnPreferenceChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -376,10 +379,13 @@ public partial class OnPreferenceChangeListenerDirect : OnPreferenceChangeListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.preference.Preference$OnPreferenceChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.preference.Preference$OnPreferenceChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -403,7 +409,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.OnPreferenceClickListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnPreferenceClickListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -411,10 +417,13 @@ public partial class OnPreferenceClickListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnPreferenceClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.preference.Preference_OnPreferenceClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.preference.OnPreferenceClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -436,10 +445,13 @@ public partial class OnPreferenceClickListenerDirect : OnPreferenceClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.preference.Preference$OnPreferenceClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.preference.Preference$OnPreferenceClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -467,19 +479,19 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class PreferenceActivity : Android.App.ListActivity
     {
         const string _bridgeClassName = "android.preference.PreferenceActivity";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PreferenceActivity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferenceActivity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferenceActivity() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PreferenceActivity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferenceActivity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferenceActivity(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -510,7 +522,7 @@ public PreferenceActivity(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Header : Android.Os.Parcelable
         {
             const string _bridgeClassName = "android.preference.PreferenceActivity$Header";
@@ -559,7 +571,7 @@ public Header(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/PreferenceCategory.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class PreferenceCategory : Android.Preference.PreferenceGroup
     {
         const string _bridgeClassName = "android.preference.PreferenceCategory";
@@ -604,19 +616,19 @@ public PreferenceCategory(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/PreferenceDataStore.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class PreferenceDataStore : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PreferenceDataStore>
     {
         const string _bridgeClassName = "android.preference.PreferenceDataStore";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PreferenceDataStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferenceDataStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferenceDataStore() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PreferenceDataStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferenceDataStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferenceDataStore(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -651,19 +663,19 @@ public PreferenceDataStore(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class PreferenceFragment : Android.App.Fragment
     {
         const string _bridgeClassName = "android.preference.PreferenceFragment";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PreferenceFragment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferenceFragment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferenceFragment() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PreferenceFragment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferenceFragment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferenceFragment(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -694,19 +706,19 @@ public PreferenceFragment(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.OnPreferenceStartFragmentCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnPreferenceStartFragmentCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnPreferenceStartFragmentCallback>
         {
             const string _bridgeClassName = "android.preference.PreferenceFragment$OnPreferenceStartFragmentCallback";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OnPreferenceStartFragmentCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnPreferenceStartFragmentCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnPreferenceStartFragmentCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OnPreferenceStartFragmentCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OnPreferenceStartFragmentCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OnPreferenceStartFragmentCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -745,19 +757,19 @@ public OnPreferenceStartFragmentCallback(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/PreferenceGroup.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class PreferenceGroup : Android.Preference.Preference
     {
         const string _bridgeClassName = "android.preference.PreferenceGroup";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PreferenceGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferenceGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferenceGroup() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PreferenceGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferenceGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferenceGroup(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -792,7 +804,7 @@ public PreferenceGroup(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class PreferenceManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PreferenceManager>
     {
         const string _bridgeClassName = "android.preference.PreferenceManager";
@@ -833,7 +845,7 @@ public PreferenceManager(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityDestroyListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnActivityDestroyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -841,10 +853,13 @@ public partial class OnActivityDestroyListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnActivityDestroyListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.preference.PreferenceManager_OnActivityDestroyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.preference.OnActivityDestroyListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -866,10 +881,13 @@ public partial class OnActivityDestroyListenerDirect : OnActivityDestroyListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.preference.PreferenceManager$OnActivityDestroyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.preference.PreferenceManager$OnActivityDestroyListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -893,7 +911,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityResultListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnActivityResultListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -901,10 +919,13 @@ public partial class OnActivityResultListener : MASES.JCOBridge.C2JBridge.JVMBri
             /// </summary>
             public OnActivityResultListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.preference.PreferenceManager_OnActivityResultListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.preference.OnActivityResultListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -926,10 +947,13 @@ public partial class OnActivityResultListenerDirect : OnActivityResultListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.preference.PreferenceManager$OnActivityResultListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.preference.PreferenceManager$OnActivityResultListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -953,7 +977,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityStopListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnActivityStopListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -961,10 +985,13 @@ public partial class OnActivityStopListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnActivityStopListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.preference.PreferenceManager_OnActivityStopListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.preference.OnActivityStopListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -986,10 +1013,13 @@ public partial class OnActivityStopListenerDirect : OnActivityStopListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.preference.PreferenceManager$OnActivityStopListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.preference.PreferenceManager$OnActivityStopListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1017,7 +1047,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/PreferenceScreen.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class PreferenceScreen : Android.Preference.PreferenceGroup
     {
         const string _bridgeClassName = "android.preference.PreferenceScreen";
@@ -1062,7 +1092,7 @@ public PreferenceScreen(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RingtonePreference : Android.Preference.Preference
     {
         const string _bridgeClassName = "android.preference.RingtonePreference";
@@ -1107,7 +1137,7 @@ public RingtonePreference(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SwitchPreference : Android.Preference.TwoStatePreference
     {
         const string _bridgeClassName = "android.preference.SwitchPreference";
@@ -1152,19 +1182,19 @@ public SwitchPreference(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class TwoStatePreference : Android.Preference.Preference
     {
         const string _bridgeClassName = "android.preference.TwoStatePreference";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TwoStatePreference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TwoStatePreference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TwoStatePreference() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TwoStatePreference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TwoStatePreference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TwoStatePreference(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Preference/CheckBoxPreference.cs b/src/net/Netdroid/Generated/Android/Preference/CheckBoxPreference.cs
index 76da153ad..dbeb8d4e8 100644
--- a/src/net/Netdroid/Generated/Android/Preference/CheckBoxPreference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/CheckBoxPreference.cs
@@ -36,7 +36,7 @@ public partial class CheckBoxPreference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public CheckBoxPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public CheckBoxPreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public CheckBoxPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public CheckBoxPreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public CheckBoxPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public CheckBoxPreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <see href="https://developer.android.com/reference/android/preference/CheckBoxPreference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public CheckBoxPreference(Android.Content.Context arg0)
             : base(arg0)
         {
diff --git a/src/net/Netdroid/Generated/Android/Preference/DialogPreference.cs b/src/net/Netdroid/Generated/Android/Preference/DialogPreference.cs
index c721b6c63..4cca526ed 100644
--- a/src/net/Netdroid/Generated/Android/Preference/DialogPreference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/DialogPreference.cs
@@ -36,7 +36,7 @@ public partial class DialogPreference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DialogPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public DialogPreference(Android.Content.Context arg0, Android.Util.AttributeSet
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DialogPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public DialogPreference(Android.Content.Context arg0, Android.Util.AttributeSet
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DialogPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public DialogPreference(Android.Content.Context arg0, Android.Util.AttributeSet
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DialogPreference(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,65 +88,72 @@ public DialogPreference(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialog()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialog()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.Dialog Dialog
+        /// <returns><see cref="Android.App.Dialog"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Dialog GetDialog()
         {
-            get { return IExecuteWithSignature<Android.App.Dialog>("getDialog", "()Landroid/app/Dialog;"); }
+            return IExecuteWithSignature<Android.App.Dialog>("getDialog", "()Landroid/app/Dialog;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialogIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialogIcon()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Drawable.Drawable DialogIcon
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Drawable.Drawable GetDialogIcon()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDialogIcon", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDialogIcon", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialogLayoutResource()"/> <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setDialogLayoutResource(int)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialogLayoutResource()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int DialogLayoutResource
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetDialogLayoutResource()
         {
-            get { return IExecuteWithSignature<int>("getDialogLayoutResource", "()I"); } set { IExecuteWithSignature("setDialogLayoutResource", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDialogLayoutResource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialogMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialogMessage()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence DialogMessage
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetDialogMessage()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDialogMessage", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDialogMessage", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialogTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getDialogTitle()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence DialogTitle
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetDialogTitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDialogTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDialogTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getNegativeButtonText()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getNegativeButtonText()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence NegativeButtonText
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetNegativeButtonText()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getNegativeButtonText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNegativeButtonText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getPositiveButtonText()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#getPositiveButtonText()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence PositiveButtonText
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetPositiveButtonText()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getPositiveButtonText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getPositiveButtonText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#onActivityDestroy()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnActivityDestroy()
         {
             IExecuteWithSignature("onActivityDestroy", "()V");
@@ -156,7 +163,7 @@ public void OnActivityDestroy()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.DialogInterface"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnClick(Android.Content.DialogInterface arg0, int arg1)
         {
             IExecute("onClick", arg0, arg1);
@@ -165,7 +172,7 @@ public void OnClick(Android.Content.DialogInterface arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#onDismiss(android.content.DialogInterface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.DialogInterface"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDismiss(Android.Content.DialogInterface arg0)
         {
             IExecuteWithSignature("onDismiss", "(Landroid/content/DialogInterface;)V", arg0);
@@ -174,7 +181,7 @@ public void OnDismiss(Android.Content.DialogInterface arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setDialogIcon(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDialogIcon(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setDialogIcon", "(Landroid/graphics/drawable/Drawable;)V", arg0);
@@ -183,16 +190,25 @@ public void SetDialogIcon(Android.Graphics.Drawable.Drawable arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setDialogIcon(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDialogIcon(int arg0)
         {
             IExecuteWithSignature("setDialogIcon", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setDialogLayoutResource(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetDialogLayoutResource(int arg0)
+        {
+            IExecuteWithSignature("setDialogLayoutResource", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setDialogMessage(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDialogMessage(int arg0)
         {
             IExecuteWithSignature("setDialogMessage", "(I)V", arg0);
@@ -201,7 +217,7 @@ public void SetDialogMessage(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setDialogMessage(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDialogMessage(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setDialogMessage", "(Ljava/lang/CharSequence;)V", arg0);
@@ -210,7 +226,7 @@ public void SetDialogMessage(Java.Lang.CharSequence arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setDialogTitle(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDialogTitle(int arg0)
         {
             IExecuteWithSignature("setDialogTitle", "(I)V", arg0);
@@ -219,7 +235,7 @@ public void SetDialogTitle(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setDialogTitle(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDialogTitle(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setDialogTitle", "(Ljava/lang/CharSequence;)V", arg0);
@@ -228,7 +244,7 @@ public void SetDialogTitle(Java.Lang.CharSequence arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setNegativeButtonText(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetNegativeButtonText(int arg0)
         {
             IExecuteWithSignature("setNegativeButtonText", "(I)V", arg0);
@@ -237,7 +253,7 @@ public void SetNegativeButtonText(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setNegativeButtonText(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetNegativeButtonText(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setNegativeButtonText", "(Ljava/lang/CharSequence;)V", arg0);
@@ -246,7 +262,7 @@ public void SetNegativeButtonText(Java.Lang.CharSequence arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setPositiveButtonText(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPositiveButtonText(int arg0)
         {
             IExecuteWithSignature("setPositiveButtonText", "(I)V", arg0);
@@ -255,7 +271,7 @@ public void SetPositiveButtonText(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/DialogPreference.html#setPositiveButtonText(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPositiveButtonText(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setPositiveButtonText", "(Ljava/lang/CharSequence;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Preference/EditTextPreference.cs b/src/net/Netdroid/Generated/Android/Preference/EditTextPreference.cs
index 64d7d4924..112476b28 100644
--- a/src/net/Netdroid/Generated/Android/Preference/EditTextPreference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/EditTextPreference.cs
@@ -36,7 +36,7 @@ public partial class EditTextPreference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public EditTextPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public EditTextPreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public EditTextPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public EditTextPreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public EditTextPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public EditTextPreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <see href="https://developer.android.com/reference/android/preference/EditTextPreference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public EditTextPreference(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,20 +88,31 @@ public EditTextPreference(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/EditTextPreference.html#getEditText()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/EditTextPreference.html#getEditText()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.EditText EditText
+        /// <returns><see cref="Android.Widget.EditText"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.EditText GetEditText()
         {
-            get { return IExecuteWithSignature<Android.Widget.EditText>("getEditText", "()Landroid/widget/EditText;"); }
+            return IExecuteWithSignature<Android.Widget.EditText>("getEditText", "()Landroid/widget/EditText;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/EditTextPreference.html#getText()"/> <see href="https://developer.android.com/reference/android/preference/EditTextPreference.html#setText(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/EditTextPreference.html#getText()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Text
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setText", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/EditTextPreference.html#setText(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetText(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setText", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Preference/ListPreference.cs b/src/net/Netdroid/Generated/Android/Preference/ListPreference.cs
index b1d30e092..40bb06b0a 100644
--- a/src/net/Netdroid/Generated/Android/Preference/ListPreference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/ListPreference.cs
@@ -36,7 +36,7 @@ public partial class ListPreference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ListPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public ListPreference(Android.Content.Context arg0, Android.Util.AttributeSet ar
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ListPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public ListPreference(Android.Content.Context arg0, Android.Util.AttributeSet ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ListPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public ListPreference(Android.Content.Context arg0, Android.Util.AttributeSet ar
         /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ListPreference(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,52 +88,56 @@ public ListPreference(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#getEntries()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#findIndexOfValue(java.lang.String)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence[] Entries
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int FindIndexOfValue(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getEntries", "()[Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("findIndexOfValue", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#getEntry()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#getEntry()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence Entry
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetEntry()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getEntry", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getEntry", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#getEntryValues()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#getEntries()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence[] EntryValues
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence[] GetEntries()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getEntryValues", "()[Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getEntries", "()[Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#getValue()"/> <see href="https://developer.android.com/reference/android/preference/ListPreference.html#setValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#getEntryValues()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Value
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence[] GetEntryValues()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setValue", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getEntryValues", "()[Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#findIndexOfValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#getValue()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public int FindIndexOfValue(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetValue()
         {
-            return IExecuteWithSignature<int>("findIndexOfValue", "(Ljava/lang/String;)I", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#setEntries(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEntries(int arg0)
         {
             IExecuteWithSignature("setEntries", "(I)V", arg0);
@@ -142,7 +146,7 @@ public void SetEntries(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#setEntries(java.lang.CharSequence[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEntries(Java.Lang.CharSequence[] arg0)
         {
             IExecuteWithSignature("setEntries", "([Ljava/lang/CharSequence;)V", new object[] { arg0 });
@@ -151,7 +155,7 @@ public void SetEntries(Java.Lang.CharSequence[] arg0)
         /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#setEntryValues(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEntryValues(int arg0)
         {
             IExecuteWithSignature("setEntryValues", "(I)V", arg0);
@@ -160,16 +164,25 @@ public void SetEntryValues(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#setEntryValues(java.lang.CharSequence[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEntryValues(Java.Lang.CharSequence[] arg0)
         {
             IExecuteWithSignature("setEntryValues", "([Ljava/lang/CharSequence;)V", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#setValue(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetValue(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setValue", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/ListPreference.html#setValueIndex(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetValueIndex(int arg0)
         {
             IExecuteWithSignature("setValueIndex", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Preference/MultiSelectListPreference.cs b/src/net/Netdroid/Generated/Android/Preference/MultiSelectListPreference.cs
index 7914c77a5..2f1212526 100644
--- a/src/net/Netdroid/Generated/Android/Preference/MultiSelectListPreference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/MultiSelectListPreference.cs
@@ -36,7 +36,7 @@ public partial class MultiSelectListPreference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MultiSelectListPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public MultiSelectListPreference(Android.Content.Context arg0, Android.Util.Attr
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MultiSelectListPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public MultiSelectListPreference(Android.Content.Context arg0, Android.Util.Attr
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MultiSelectListPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public MultiSelectListPreference(Android.Content.Context arg0, Android.Util.Attr
         /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MultiSelectListPreference(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,44 +88,47 @@ public MultiSelectListPreference(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#getEntries()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#findIndexOfValue(java.lang.String)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence[] Entries
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int FindIndexOfValue(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getEntries", "()[Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("findIndexOfValue", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#getEntryValues()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#getEntries()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence[] EntryValues
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence[] GetEntries()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getEntryValues", "()[Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getEntries", "()[Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#getValues()"/> <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#setValues(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#getEntryValues()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Set<Java.Lang.String> Values
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence[] GetEntryValues()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getValues", "()Ljava/util/Set;"); } set { IExecuteWithSignature("setValues", "(Ljava/util/Set;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getEntryValues", "()[Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#findIndexOfValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#getValues()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public int FindIndexOfValue(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Set<Java.Lang.String> GetValues()
         {
-            return IExecuteWithSignature<int>("findIndexOfValue", "(Ljava/lang/String;)I", arg0);
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getValues", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#setEntries(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEntries(int arg0)
         {
             IExecuteWithSignature("setEntries", "(I)V", arg0);
@@ -134,7 +137,7 @@ public void SetEntries(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#setEntries(java.lang.CharSequence[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEntries(Java.Lang.CharSequence[] arg0)
         {
             IExecuteWithSignature("setEntries", "([Ljava/lang/CharSequence;)V", new object[] { arg0 });
@@ -143,7 +146,7 @@ public void SetEntries(Java.Lang.CharSequence[] arg0)
         /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#setEntryValues(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEntryValues(int arg0)
         {
             IExecuteWithSignature("setEntryValues", "(I)V", arg0);
@@ -152,11 +155,20 @@ public void SetEntryValues(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#setEntryValues(java.lang.CharSequence[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEntryValues(Java.Lang.CharSequence[] arg0)
         {
             IExecuteWithSignature("setEntryValues", "([Ljava/lang/CharSequence;)V", new object[] { arg0 });
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/MultiSelectListPreference.html#setValues(java.util.Set)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Set"/></param>
+        [global::System.Obsolete()]
+        public void SetValues(Java.Util.Set<Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setValues", "(Ljava/util/Set;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Preference/Preference.cs b/src/net/Netdroid/Generated/Android/Preference/Preference.cs
index 3cd4743c9..466b95e97 100644
--- a/src/net/Netdroid/Generated/Android/Preference/Preference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/Preference.cs
@@ -36,7 +36,7 @@ public partial class Preference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Preference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public Preference(Android.Content.Context arg0, Android.Util.AttributeSet arg1,
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Preference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public Preference(Android.Content.Context arg0, Android.Util.AttributeSet arg1,
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Preference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public Preference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Preference(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -82,7 +82,7 @@ public Preference(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#DEFAULT_ORDER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DEFAULT_ORDER { get { if (!_DEFAULT_ORDERReady) { _DEFAULT_ORDERContent = SGetField<int>(LocalBridgeClazz, "DEFAULT_ORDER"); _DEFAULT_ORDERReady = true; } return _DEFAULT_ORDERContent; } }
         private static int _DEFAULT_ORDERContent = default;
         private static bool _DEFAULT_ORDERReady = false; // this is used because in case of generics 
@@ -95,181 +95,130 @@ public Preference(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getContext()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Context Context
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Context GetContext()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getDependency()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setDependency(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getIntent()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Dependency
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Intent GetIntent()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDependency", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDependency", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getEditor()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getSharedPreferences()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.SharedPreferences.Editor Editor
+        /// <returns><see cref="Android.Content.SharedPreferences"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.SharedPreferences GetSharedPreferences()
         {
-            get { return IExecuteWithSignature<Android.Content.SharedPreferences.Editor>("getEditor", "()Landroid/content/SharedPreferences$Editor;"); }
+            return IExecuteWithSignature<Android.Content.SharedPreferences>("getSharedPreferences", "()Landroid/content/SharedPreferences;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getEditor()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Content.SharedPreferences.Editor"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.SharedPreferences.Editor GetEditor()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Content.SharedPreferences.Editor>("getEditor", "()Landroid/content/SharedPreferences$Editor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getFragment()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setFragment(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getIcon()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Fragment
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Drawable.Drawable GetIcon()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFragment", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFragment", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getOnPreferenceChangeListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getExtras()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.Preference.OnPreferenceChangeListener GetOnPreferenceChangeListener
-        {
-            get { return IExecuteWithSignature<Android.Preference.Preference.OnPreferenceChangeListener>("getOnPreferenceChangeListener", "()Landroid/preference/Preference$OnPreferenceChangeListener;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getOnPreferenceClickListener()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.Preference.OnPreferenceClickListener GetOnPreferenceClickListener
-        {
-            get { return IExecuteWithSignature<Android.Preference.Preference.OnPreferenceClickListener>("getOnPreferenceClickListener", "()Landroid/preference/Preference$OnPreferenceClickListener;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getIcon()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Drawable.Drawable Icon
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getIntent()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setIntent(android.content.Intent)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Intent Intent
-        {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); } set { IExecuteWithSignature("setIntent", "(Landroid/content/Intent;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getKey()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setKey(java.lang.String)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Key
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setKey", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getLayoutResource()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setLayoutResource(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public int LayoutResource
-        {
-            get { return IExecuteWithSignature<int>("getLayoutResource", "()I"); } set { IExecuteWithSignature("setLayoutResource", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getOrder()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setOrder(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public int Order
-        {
-            get { return IExecuteWithSignature<int>("getOrder", "()I"); } set { IExecuteWithSignature("setOrder", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getParent()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.PreferenceGroup Parent
-        {
-            get { return IExecuteWithSignature<Android.Preference.PreferenceGroup>("getParent", "()Landroid/preference/PreferenceGroup;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getPreferenceDataStore()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setPreferenceDataStore(android.preference.PreferenceDataStore)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.PreferenceDataStore PreferenceDataStore
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Preference.PreferenceDataStore>("getPreferenceDataStore", "()Landroid/preference/PreferenceDataStore;"); } set { IExecuteWithSignature("setPreferenceDataStore", "(Landroid/preference/PreferenceDataStore;)V", value); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getPreferenceManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#peekExtras()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.PreferenceManager PreferenceManager
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.Bundle PeekExtras()
         {
-            get { return IExecuteWithSignature<Android.Preference.PreferenceManager>("getPreferenceManager", "()Landroid/preference/PreferenceManager;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("peekExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getSharedPreferences()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getOnPreferenceChangeListener()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.SharedPreferences SharedPreferences
+        /// <returns><see cref="Android.Preference.Preference.OnPreferenceChangeListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.Preference.OnPreferenceChangeListener GetOnPreferenceChangeListener()
         {
-            get { return IExecuteWithSignature<Android.Content.SharedPreferences>("getSharedPreferences", "()Landroid/content/SharedPreferences;"); }
+            return IExecuteWithSignature<Android.Preference.Preference.OnPreferenceChangeListener>("getOnPreferenceChangeListener", "()Landroid/preference/Preference$OnPreferenceChangeListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getShouldDisableView()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setShouldDisableView(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getOnPreferenceChangeListener()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool ShouldDisableView
+        /// <returns><see cref="Android.Preference.Preference.OnPreferenceChangeListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.Preference.OnPreferenceChangeListener GetOnPreferenceChangeListenerDirect()
         {
-            get { return IExecuteWithSignature<bool>("getShouldDisableView", "()Z"); } set { IExecuteWithSignature("setShouldDisableView", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Preference.Preference.OnPreferenceChangeListenerDirect, Android.Preference.Preference.OnPreferenceChangeListener>("getOnPreferenceChangeListener", "()Landroid/preference/Preference$OnPreferenceChangeListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getSummary()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getOnPreferenceClickListener()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence Summary
+        /// <returns><see cref="Android.Preference.Preference.OnPreferenceClickListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.Preference.OnPreferenceClickListener GetOnPreferenceClickListener()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSummary", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Preference.Preference.OnPreferenceClickListener>("getOnPreferenceClickListener", "()Landroid/preference/Preference$OnPreferenceClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getOnPreferenceClickListener()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="Android.Preference.Preference.OnPreferenceClickListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.Preference.OnPreferenceClickListener GetOnPreferenceClickListenerDirect()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Preference.Preference.OnPreferenceClickListenerDirect, Android.Preference.Preference.OnPreferenceClickListener>("getOnPreferenceClickListener", "()Landroid/preference/Preference$OnPreferenceClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getTitleRes()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getPreferenceDataStore()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int TitleRes
+        /// <returns><see cref="Android.Preference.PreferenceDataStore"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.PreferenceDataStore GetPreferenceDataStore()
         {
-            get { return IExecuteWithSignature<int>("getTitleRes", "()I"); }
+            return IExecuteWithSignature<Android.Preference.PreferenceDataStore>("getPreferenceDataStore", "()Landroid/preference/PreferenceDataStore;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getWidgetLayoutResource()"/> <see href="https://developer.android.com/reference/android/preference/Preference.html#setWidgetLayoutResource(int)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getParent()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int WidgetLayoutResource
+        /// <returns><see cref="Android.Preference.PreferenceGroup"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.PreferenceGroup GetParent()
         {
-            get { return IExecuteWithSignature<int>("getWidgetLayoutResource", "()I"); } set { IExecuteWithSignature("setWidgetLayoutResource", "(I)V", value); }
+            return IExecuteWithSignature<Android.Preference.PreferenceGroup>("getParent", "()Landroid/preference/PreferenceGroup;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#peekExtras()"/>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getPreferenceManager()"/>
         /// </summary>
-        /// <returns><see cref="Android.Os.Bundle"/></returns>
-        [System.Obsolete()]
-        public Android.Os.Bundle PeekExtras()
+        /// <returns><see cref="Android.Preference.PreferenceManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.PreferenceManager GetPreferenceManager()
         {
-            return IExecuteWithSignature<Android.Os.Bundle>("peekExtras", "()Landroid/os/Bundle;");
+            return IExecuteWithSignature<Android.Preference.PreferenceManager>("getPreferenceManager", "()Landroid/preference/PreferenceManager;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getView(android.view.View,android.view.ViewGroup)"/>
@@ -277,16 +226,25 @@ public Android.Os.Bundle PeekExtras()
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.View.ViewGroup"/></param>
         /// <returns><see cref="Android.View.View"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.View GetView(Android.View.View arg0, Android.View.ViewGroup arg1)
         {
             return IExecute<Android.View.View>("getView", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getShouldDisableView()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetShouldDisableView()
+        {
+            return IExecuteWithSignature<bool>("getShouldDisableView", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#hasKey()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasKey()
         {
             return IExecuteWithSignature<bool>("hasKey", "()Z");
@@ -295,7 +253,7 @@ public bool HasKey()
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#isEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsEnabled()
         {
             return IExecuteWithSignature<bool>("isEnabled", "()Z");
@@ -304,7 +262,7 @@ public bool IsEnabled()
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#isIconSpaceReserved()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsIconSpaceReserved()
         {
             return IExecuteWithSignature<bool>("isIconSpaceReserved", "()Z");
@@ -313,7 +271,7 @@ public bool IsIconSpaceReserved()
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#isPersistent()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsPersistent()
         {
             return IExecuteWithSignature<bool>("isPersistent", "()Z");
@@ -322,7 +280,7 @@ public bool IsPersistent()
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#isRecycleEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsRecycleEnabled()
         {
             return IExecuteWithSignature<bool>("isRecycleEnabled", "()Z");
@@ -331,7 +289,7 @@ public bool IsRecycleEnabled()
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#isSelectable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsSelectable()
         {
             return IExecuteWithSignature<bool>("isSelectable", "()Z");
@@ -340,7 +298,7 @@ public bool IsSelectable()
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#isSingleLineTitle()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsSingleLineTitle()
         {
             return IExecuteWithSignature<bool>("isSingleLineTitle", "()Z");
@@ -350,7 +308,7 @@ public bool IsSingleLineTitle()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool PersistStringSet(Java.Util.Set<Java.Lang.String> arg0)
         {
             return IExecuteWithSignature<bool>("persistStringSet", "(Ljava/util/Set;)Z", arg0);
@@ -359,7 +317,7 @@ public bool PersistStringSet(Java.Util.Set<Java.Lang.String> arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#shouldCommit()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ShouldCommit()
         {
             return IExecuteWithSignature<bool>("shouldCommit", "()Z");
@@ -368,7 +326,7 @@ public bool ShouldCommit()
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#shouldDisableDependents()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ShouldDisableDependents()
         {
             return IExecuteWithSignature<bool>("shouldDisableDependents", "()Z");
@@ -378,7 +336,7 @@ public bool ShouldDisableDependents()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CompareTo(Android.Preference.Preference arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Landroid/preference/Preference;)I", arg0);
@@ -388,17 +346,98 @@ public int CompareTo(Android.Preference.Preference arg0)
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CompareTo(object arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getLayoutResource()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetLayoutResource()
+        {
+            return IExecuteWithSignature<int>("getLayoutResource", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getOrder()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetOrder()
+        {
+            return IExecuteWithSignature<int>("getOrder", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getTitleRes()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetTitleRes()
+        {
+            return IExecuteWithSignature<int>("getTitleRes", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getWidgetLayoutResource()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetWidgetLayoutResource()
+        {
+            return IExecuteWithSignature<int>("getWidgetLayoutResource", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getSummary()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetSummary()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSummary", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getDependency()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDependency()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDependency", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getFragment()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetFragment()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getFragment", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getKey()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetKey()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#getPersistedStringSet(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Set<Java.Lang.String> GetPersistedStringSet(Java.Util.Set<Java.Lang.String> arg0)
         {
             return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPersistedStringSet", "(Ljava/util/Set;)Ljava/util/Set;", arg0);
@@ -407,7 +446,7 @@ public int CompareTo(object arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#notifyDependencyChange(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void NotifyDependencyChange(bool arg0)
         {
             IExecuteWithSignature("notifyDependencyChange", "(Z)V", arg0);
@@ -417,7 +456,7 @@ public void NotifyDependencyChange(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDependencyChanged(Android.Preference.Preference arg0, bool arg1)
         {
             IExecute("onDependencyChanged", arg0, arg1);
@@ -427,7 +466,7 @@ public void OnDependencyChanged(Android.Preference.Preference arg0, bool arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnParentChanged(Android.Preference.Preference arg0, bool arg1)
         {
             IExecute("onParentChanged", arg0, arg1);
@@ -436,7 +475,7 @@ public void OnParentChanged(Android.Preference.Preference arg0, bool arg1)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#restoreHierarchyState(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RestoreHierarchyState(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("restoreHierarchyState", "(Landroid/os/Bundle;)V", arg0);
@@ -445,7 +484,7 @@ public void RestoreHierarchyState(Android.Os.Bundle arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#saveHierarchyState(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SaveHierarchyState(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("saveHierarchyState", "(Landroid/os/Bundle;)V", arg0);
@@ -454,25 +493,43 @@ public void SaveHierarchyState(Android.Os.Bundle arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setDefaultValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDefaultValue(object arg0)
         {
             IExecuteWithSignature("setDefaultValue", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setDependency(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetDependency(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDependency", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEnabled(bool arg0)
         {
             IExecuteWithSignature("setEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setFragment(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetFragment(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFragment", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setIcon(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIcon(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setIcon", "(Landroid/graphics/drawable/Drawable;)V", arg0);
@@ -481,7 +538,7 @@ public void SetIcon(Android.Graphics.Drawable.Drawable arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setIcon(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIcon(int arg0)
         {
             IExecuteWithSignature("setIcon", "(I)V", arg0);
@@ -490,16 +547,43 @@ public void SetIcon(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setIconSpaceReserved(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIconSpaceReserved(bool arg0)
         {
             IExecuteWithSignature("setIconSpaceReserved", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setIntent(android.content.Intent)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
+        [global::System.Obsolete()]
+        public void SetIntent(Android.Content.Intent arg0)
+        {
+            IExecuteWithSignature("setIntent", "(Landroid/content/Intent;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setKey(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetKey(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setKey", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setLayoutResource(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetLayoutResource(int arg0)
+        {
+            IExecuteWithSignature("setLayoutResource", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setOnPreferenceChangeListener(android.preference.Preference.OnPreferenceChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.Preference.OnPreferenceChangeListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnPreferenceChangeListener(Android.Preference.Preference.OnPreferenceChangeListener arg0)
         {
             IExecuteWithSignature("setOnPreferenceChangeListener", "(Landroid/preference/Preference$OnPreferenceChangeListener;)V", arg0);
@@ -508,25 +592,43 @@ public void SetOnPreferenceChangeListener(Android.Preference.Preference.OnPrefer
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setOnPreferenceClickListener(android.preference.Preference.OnPreferenceClickListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.Preference.OnPreferenceClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnPreferenceClickListener(Android.Preference.Preference.OnPreferenceClickListener arg0)
         {
             IExecuteWithSignature("setOnPreferenceClickListener", "(Landroid/preference/Preference$OnPreferenceClickListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setOrder(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetOrder(int arg0)
+        {
+            IExecuteWithSignature("setOrder", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setPersistent(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPersistent(bool arg0)
         {
             IExecuteWithSignature("setPersistent", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setPreferenceDataStore(android.preference.PreferenceDataStore)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Preference.PreferenceDataStore"/></param>
+        [global::System.Obsolete()]
+        public void SetPreferenceDataStore(Android.Preference.PreferenceDataStore arg0)
+        {
+            IExecuteWithSignature("setPreferenceDataStore", "(Landroid/preference/PreferenceDataStore;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setRecycleEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRecycleEnabled(bool arg0)
         {
             IExecuteWithSignature("setRecycleEnabled", "(Z)V", arg0);
@@ -535,16 +637,25 @@ public void SetRecycleEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setSelectable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSelectable(bool arg0)
         {
             IExecuteWithSignature("setSelectable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setShouldDisableView(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetShouldDisableView(bool arg0)
+        {
+            IExecuteWithSignature("setShouldDisableView", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setSingleLineTitle(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSingleLineTitle(bool arg0)
         {
             IExecuteWithSignature("setSingleLineTitle", "(Z)V", arg0);
@@ -553,7 +664,7 @@ public void SetSingleLineTitle(bool arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setSummary(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSummary(int arg0)
         {
             IExecuteWithSignature("setSummary", "(I)V", arg0);
@@ -562,7 +673,7 @@ public void SetSummary(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setSummary(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSummary(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setSummary", "(Ljava/lang/CharSequence;)V", arg0);
@@ -571,7 +682,7 @@ public void SetSummary(Java.Lang.CharSequence arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setTitle(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTitle(int arg0)
         {
             IExecuteWithSignature("setTitle", "(I)V", arg0);
@@ -580,11 +691,20 @@ public void SetTitle(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setTitle(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTitle(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setTitle", "(Ljava/lang/CharSequence;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/Preference.html#setWidgetLayoutResource(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetWidgetLayoutResource(int arg0)
+        {
+            IExecuteWithSignature("setWidgetLayoutResource", "(I)V", arg0);
+        }
 
         #endregion
 
@@ -597,7 +717,7 @@ public partial class BaseSavedState
             /// <see href="https://developer.android.com/reference/android/preference/Preference.BaseSavedState.html#%3Cinit%3E(android.os.Parcel)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public BaseSavedState(Android.Os.Parcel arg0)
                 : base(arg0)
             {
@@ -606,7 +726,7 @@ public BaseSavedState(Android.Os.Parcel arg0)
             /// <see href="https://developer.android.com/reference/android/preference/Preference.BaseSavedState.html#%3Cinit%3E(android.os.Parcelable)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcelable"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public BaseSavedState(Android.Os.Parcelable arg0)
                 : base(arg0)
             {
@@ -622,7 +742,7 @@ public BaseSavedState(Android.Os.Parcelable arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/Preference.BaseSavedState.html#CREATOR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
             private static Android.Os.Parcelable.Creator _CREATORContent = default;
             private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -670,7 +790,7 @@ public partial class OnPreferenceChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPreferenceChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Preference.Preference>>>(OnPreferenceChangeEventHandler));
+                AddEventHandler("onPreferenceChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Preference.Preference>>>(OnPreferenceChangeEventHandler));
 
             }
 
@@ -678,7 +798,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/preference/Preference.OnPreferenceChangeListener.html#onPreferenceChange(android.preference.Preference,java.lang.Object)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPreferenceChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Preference.Preference, object, bool> OnOnPreferenceChange { get; set; } = null;
+            public global::System.Func<Android.Preference.Preference, object, bool> OnOnPreferenceChange { get; set; } = null;
 
             void OnPreferenceChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Preference.Preference>> data)
             {
@@ -693,7 +813,7 @@ void OnPreferenceChangeEventHandler(object sender, CLRListenerEventArgs<CLREvent
             /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
             /// <param name="arg1"><see cref="object"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual bool OnPreferenceChange(Android.Preference.Preference arg0, object arg1)
             {
                 return default;
@@ -735,7 +855,7 @@ public partial class OnPreferenceChangeListenerDirect
             /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
             /// <param name="arg1"><see cref="object"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override bool OnPreferenceChange(Android.Preference.Preference arg0, object arg1)
             {
                 return IExecute<bool>("onPreferenceChange", arg0, arg1);
@@ -776,7 +896,7 @@ public partial class OnPreferenceClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPreferenceClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Preference.Preference>>>(OnPreferenceClickEventHandler));
+                AddEventHandler("onPreferenceClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Preference.Preference>>>(OnPreferenceClickEventHandler));
 
             }
 
@@ -784,7 +904,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/preference/Preference.OnPreferenceClickListener.html#onPreferenceClick(android.preference.Preference)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPreferenceClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Preference.Preference, bool> OnOnPreferenceClick { get; set; } = null;
+            public global::System.Func<Android.Preference.Preference, bool> OnOnPreferenceClick { get; set; } = null;
 
             void OnPreferenceClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Preference.Preference>> data)
             {
@@ -798,7 +918,7 @@ void OnPreferenceClickEventHandler(object sender, CLRListenerEventArgs<CLREventD
             /// </summary>
             /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual bool OnPreferenceClick(Android.Preference.Preference arg0)
             {
                 return default;
@@ -839,7 +959,7 @@ public partial class OnPreferenceClickListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override bool OnPreferenceClick(Android.Preference.Preference arg0)
             {
                 return IExecuteWithSignature<bool>("onPreferenceClick", "(Landroid/preference/Preference;)Z", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Preference/PreferenceActivity.cs b/src/net/Netdroid/Generated/Android/Preference/PreferenceActivity.cs
index 7da8dac60..dae7af9f7 100644
--- a/src/net/Netdroid/Generated/Android/Preference/PreferenceActivity.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/PreferenceActivity.cs
@@ -40,42 +40,42 @@ public partial class PreferenceActivity
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#EXTRA_NO_HEADERS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_NO_HEADERS { get { if (!_EXTRA_NO_HEADERSReady) { _EXTRA_NO_HEADERSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_NO_HEADERS"); _EXTRA_NO_HEADERSReady = true; } return _EXTRA_NO_HEADERSContent; } }
         private static Java.Lang.String _EXTRA_NO_HEADERSContent = default;
         private static bool _EXTRA_NO_HEADERSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#EXTRA_SHOW_FRAGMENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SHOW_FRAGMENT { get { if (!_EXTRA_SHOW_FRAGMENTReady) { _EXTRA_SHOW_FRAGMENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SHOW_FRAGMENT"); _EXTRA_SHOW_FRAGMENTReady = true; } return _EXTRA_SHOW_FRAGMENTContent; } }
         private static Java.Lang.String _EXTRA_SHOW_FRAGMENTContent = default;
         private static bool _EXTRA_SHOW_FRAGMENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#EXTRA_SHOW_FRAGMENT_ARGUMENTS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SHOW_FRAGMENT_ARGUMENTS { get { if (!_EXTRA_SHOW_FRAGMENT_ARGUMENTSReady) { _EXTRA_SHOW_FRAGMENT_ARGUMENTSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SHOW_FRAGMENT_ARGUMENTS"); _EXTRA_SHOW_FRAGMENT_ARGUMENTSReady = true; } return _EXTRA_SHOW_FRAGMENT_ARGUMENTSContent; } }
         private static Java.Lang.String _EXTRA_SHOW_FRAGMENT_ARGUMENTSContent = default;
         private static bool _EXTRA_SHOW_FRAGMENT_ARGUMENTSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#EXTRA_SHOW_FRAGMENT_SHORT_TITLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SHOW_FRAGMENT_SHORT_TITLE { get { if (!_EXTRA_SHOW_FRAGMENT_SHORT_TITLEReady) { _EXTRA_SHOW_FRAGMENT_SHORT_TITLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SHOW_FRAGMENT_SHORT_TITLE"); _EXTRA_SHOW_FRAGMENT_SHORT_TITLEReady = true; } return _EXTRA_SHOW_FRAGMENT_SHORT_TITLEContent; } }
         private static Java.Lang.String _EXTRA_SHOW_FRAGMENT_SHORT_TITLEContent = default;
         private static bool _EXTRA_SHOW_FRAGMENT_SHORT_TITLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#EXTRA_SHOW_FRAGMENT_TITLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_SHOW_FRAGMENT_TITLE { get { if (!_EXTRA_SHOW_FRAGMENT_TITLEReady) { _EXTRA_SHOW_FRAGMENT_TITLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_SHOW_FRAGMENT_TITLE"); _EXTRA_SHOW_FRAGMENT_TITLEReady = true; } return _EXTRA_SHOW_FRAGMENT_TITLEContent; } }
         private static Java.Lang.String _EXTRA_SHOW_FRAGMENT_TITLEContent = default;
         private static bool _EXTRA_SHOW_FRAGMENT_TITLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#HEADER_ID_UNDEFINED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long HEADER_ID_UNDEFINED { get { if (!_HEADER_ID_UNDEFINEDReady) { _HEADER_ID_UNDEFINEDContent = SGetField<long>(LocalBridgeClazz, "HEADER_ID_UNDEFINED"); _HEADER_ID_UNDEFINEDReady = true; } return _HEADER_ID_UNDEFINEDContent; } }
         private static long _HEADER_ID_UNDEFINEDContent = default;
         private static bool _HEADER_ID_UNDEFINEDReady = false; // this is used because in case of generics 
@@ -88,22 +88,6 @@ public partial class PreferenceActivity
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#getPreferenceManager()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.PreferenceManager PreferenceManager
-        {
-            get { return IExecuteWithSignature<Android.Preference.PreferenceManager>("getPreferenceManager", "()Landroid/preference/PreferenceManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#getPreferenceScreen()"/> <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#setPreferenceScreen(android.preference.PreferenceScreen)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.PreferenceScreen PreferenceScreen
-        {
-            get { return IExecuteWithSignature<Android.Preference.PreferenceScreen>("getPreferenceScreen", "()Landroid/preference/PreferenceScreen;"); } set { IExecuteWithSignature("setPreferenceScreen", "(Landroid/preference/PreferenceScreen;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#onBuildStartFragmentIntent(java.lang.String,android.os.Bundle,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -111,7 +95,7 @@ public Android.Preference.PreferenceScreen PreferenceScreen
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Content.Intent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Content.Intent OnBuildStartFragmentIntent(Java.Lang.String arg0, Android.Os.Bundle arg1, int arg2, int arg3)
         {
             return IExecute<Android.Content.Intent>("onBuildStartFragmentIntent", arg0, arg1, arg2, arg3);
@@ -121,7 +105,7 @@ public Android.Content.Intent OnBuildStartFragmentIntent(Java.Lang.String arg0,
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Android.Preference.Preference"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Preference.Preference FindPreference(Java.Lang.CharSequence arg0)
         {
             return IExecuteWithSignature<Android.Preference.Preference>("findPreference", "(Ljava/lang/CharSequence;)Landroid/preference/Preference;", arg0);
@@ -130,7 +114,7 @@ public Android.Preference.Preference FindPreference(Java.Lang.CharSequence arg0)
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#onGetInitialHeader()"/>
         /// </summary>
         /// <returns><see cref="Android.Preference.PreferenceActivity.Header"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Preference.PreferenceActivity.Header OnGetInitialHeader()
         {
             return IExecuteWithSignature<Android.Preference.PreferenceActivity.Header>("onGetInitialHeader", "()Landroid/preference/PreferenceActivity$Header;");
@@ -139,16 +123,34 @@ public Android.Preference.PreferenceActivity.Header OnGetInitialHeader()
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#onGetNewHeader()"/>
         /// </summary>
         /// <returns><see cref="Android.Preference.PreferenceActivity.Header"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Preference.PreferenceActivity.Header OnGetNewHeader()
         {
             return IExecuteWithSignature<Android.Preference.PreferenceActivity.Header>("onGetNewHeader", "()Landroid/preference/PreferenceActivity$Header;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#getPreferenceManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Preference.PreferenceManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.PreferenceManager GetPreferenceManager()
+        {
+            return IExecuteWithSignature<Android.Preference.PreferenceManager>("getPreferenceManager", "()Landroid/preference/PreferenceManager;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#getPreferenceScreen()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Preference.PreferenceScreen"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.PreferenceScreen GetPreferenceScreen()
+        {
+            return IExecuteWithSignature<Android.Preference.PreferenceScreen>("getPreferenceScreen", "()Landroid/preference/PreferenceScreen;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#hasHeaders()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasHeaders()
         {
             return IExecuteWithSignature<bool>("hasHeaders", "()Z");
@@ -157,7 +159,7 @@ public bool HasHeaders()
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#isMultiPane()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsMultiPane()
         {
             return IExecuteWithSignature<bool>("isMultiPane", "()Z");
@@ -166,7 +168,7 @@ public bool IsMultiPane()
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#onIsHidingHeaders()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnIsHidingHeaders()
         {
             return IExecuteWithSignature<bool>("onIsHidingHeaders", "()Z");
@@ -175,7 +177,7 @@ public bool OnIsHidingHeaders()
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#onIsMultiPane()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnIsMultiPane()
         {
             return IExecuteWithSignature<bool>("onIsMultiPane", "()Z");
@@ -186,7 +188,7 @@ public bool OnIsMultiPane()
         /// <param name="arg0"><see cref="Android.Preference.PreferenceFragment"/></param>
         /// <param name="arg1"><see cref="Android.Preference.Preference"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnPreferenceStartFragment(Android.Preference.PreferenceFragment arg0, Android.Preference.Preference arg1)
         {
             return IExecute<bool>("onPreferenceStartFragment", arg0, arg1);
@@ -197,7 +199,7 @@ public bool OnPreferenceStartFragment(Android.Preference.PreferenceFragment arg0
         /// <param name="arg0"><see cref="Android.Preference.PreferenceScreen"/></param>
         /// <param name="arg1"><see cref="Android.Preference.Preference"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnPreferenceTreeClick(Android.Preference.PreferenceScreen arg0, Android.Preference.Preference arg1)
         {
             return IExecute<bool>("onPreferenceTreeClick", arg0, arg1);
@@ -206,7 +208,7 @@ public bool OnPreferenceTreeClick(Android.Preference.PreferenceScreen arg0, Andr
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#addPreferencesFromIntent(android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddPreferencesFromIntent(Android.Content.Intent arg0)
         {
             IExecuteWithSignature("addPreferencesFromIntent", "(Landroid/content/Intent;)V", arg0);
@@ -215,7 +217,7 @@ public void AddPreferencesFromIntent(Android.Content.Intent arg0)
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#addPreferencesFromResource(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddPreferencesFromResource(int arg0)
         {
             IExecuteWithSignature("addPreferencesFromResource", "(I)V", arg0);
@@ -226,7 +228,7 @@ public void AddPreferencesFromResource(int arg0)
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void FinishPreferencePanel(Android.App.Fragment arg0, int arg1, Android.Content.Intent arg2)
         {
             IExecute("finishPreferencePanel", arg0, arg1, arg2);
@@ -234,7 +236,7 @@ public void FinishPreferencePanel(Android.App.Fragment arg0, int arg1, Android.C
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#invalidateHeaders()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void InvalidateHeaders()
         {
             IExecuteWithSignature("invalidateHeaders", "()V");
@@ -244,7 +246,7 @@ public void InvalidateHeaders()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadHeadersFromResource(int arg0, Java.Util.List<Android.Preference.PreferenceActivity.Header> arg1)
         {
             IExecute("loadHeadersFromResource", arg0, arg1);
@@ -253,7 +255,7 @@ public void LoadHeadersFromResource(int arg0, Java.Util.List<Android.Preference.
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#onBuildHeaders(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnBuildHeaders(Java.Util.List<Android.Preference.PreferenceActivity.Header> arg0)
         {
             IExecuteWithSignature("onBuildHeaders", "(Ljava/util/List;)V", arg0);
@@ -263,7 +265,7 @@ public void OnBuildHeaders(Java.Util.List<Android.Preference.PreferenceActivity.
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.PreferenceActivity.Header"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnHeaderClick(Android.Preference.PreferenceActivity.Header arg0, int arg1)
         {
             IExecute("onHeaderClick", arg0, arg1);
@@ -272,7 +274,7 @@ public void OnHeaderClick(Android.Preference.PreferenceActivity.Header arg0, int
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#setListFooter(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetListFooter(Android.View.View arg0)
         {
             IExecuteWithSignature("setListFooter", "(Landroid/view/View;)V", arg0);
@@ -283,17 +285,26 @@ public void SetListFooter(Android.View.View arg0)
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg2"><see cref="Android.View.View.OnClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetParentTitle(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1, Android.View.View.OnClickListener arg2)
         {
             IExecute("setParentTitle", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#setPreferenceScreen(android.preference.PreferenceScreen)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Preference.PreferenceScreen"/></param>
+        [global::System.Obsolete()]
+        public void SetPreferenceScreen(Android.Preference.PreferenceScreen arg0)
+        {
+            IExecuteWithSignature("setPreferenceScreen", "(Landroid/preference/PreferenceScreen;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#showBreadCrumbs(java.lang.CharSequence,java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ShowBreadCrumbs(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1)
         {
             IExecute("showBreadCrumbs", arg0, arg1);
@@ -303,7 +314,7 @@ public void ShowBreadCrumbs(Java.Lang.CharSequence arg0, Java.Lang.CharSequence
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartPreferenceFragment(Android.App.Fragment arg0, bool arg1)
         {
             IExecute("startPreferenceFragment", arg0, arg1);
@@ -317,7 +328,7 @@ public void StartPreferenceFragment(Android.App.Fragment arg0, bool arg1)
         /// <param name="arg3"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg4"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartPreferencePanel(Java.Lang.String arg0, Android.Os.Bundle arg1, int arg2, Java.Lang.CharSequence arg3, Android.App.Fragment arg4, int arg5)
         {
             IExecute("startPreferencePanel", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -331,7 +342,7 @@ public void StartPreferencePanel(Java.Lang.String arg0, Android.Os.Bundle arg1,
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartWithFragment(Java.Lang.String arg0, Android.Os.Bundle arg1, Android.App.Fragment arg2, int arg3, int arg4, int arg5)
         {
             IExecute("startWithFragment", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -343,7 +354,7 @@ public void StartWithFragment(Java.Lang.String arg0, Android.Os.Bundle arg1, And
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
         /// <param name="arg2"><see cref="Android.App.Fragment"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartWithFragment(Java.Lang.String arg0, Android.Os.Bundle arg1, Android.App.Fragment arg2, int arg3)
         {
             IExecute("startWithFragment", arg0, arg1, arg2, arg3);
@@ -352,7 +363,7 @@ public void StartWithFragment(Java.Lang.String arg0, Android.Os.Bundle arg1, And
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.html#switchToHeader(android.preference.PreferenceActivity.Header)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.PreferenceActivity.Header"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SwitchToHeader(Android.Preference.PreferenceActivity.Header arg0)
         {
             IExecuteWithSignature("switchToHeader", "(Landroid/preference/PreferenceActivity$Header;)V", arg0);
@@ -362,7 +373,7 @@ public void SwitchToHeader(Android.Preference.PreferenceActivity.Header arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SwitchToHeader(Java.Lang.String arg0, Android.Os.Bundle arg1)
         {
             IExecute("switchToHeader", arg0, arg1);
@@ -386,77 +397,77 @@ public partial class Header
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#intent"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Content.Intent intent { get { return IGetField<Android.Content.Intent>("intent"); } set { ISetField("intent", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#extras"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Os.Bundle extras { get { return IGetField<Android.Os.Bundle>("extras"); } set { ISetField("extras", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#fragmentArguments"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Os.Bundle fragmentArguments { get { return IGetField<Android.Os.Bundle>("fragmentArguments"); } set { ISetField("fragmentArguments", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#breadCrumbShortTitleRes"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int breadCrumbShortTitleRes { get { return IGetField<int>("breadCrumbShortTitleRes"); } set { ISetField("breadCrumbShortTitleRes", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#breadCrumbTitleRes"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int breadCrumbTitleRes { get { return IGetField<int>("breadCrumbTitleRes"); } set { ISetField("breadCrumbTitleRes", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#iconRes"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int iconRes { get { return IGetField<int>("iconRes"); } set { ISetField("iconRes", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#summaryRes"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int summaryRes { get { return IGetField<int>("summaryRes"); } set { ISetField("summaryRes", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#titleRes"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int titleRes { get { return IGetField<int>("titleRes"); } set { ISetField("titleRes", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#breadCrumbShortTitle"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence breadCrumbShortTitle { get { return IGetField<Java.Lang.CharSequence>("breadCrumbShortTitle"); } set { ISetField("breadCrumbShortTitle", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#breadCrumbTitle"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence breadCrumbTitle { get { return IGetField<Java.Lang.CharSequence>("breadCrumbTitle"); } set { ISetField("breadCrumbTitle", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#summary"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence summary { get { return IGetField<Java.Lang.CharSequence>("summary"); } set { ISetField("summary", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#title"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence title { get { return IGetField<Java.Lang.CharSequence>("title"); } set { ISetField("title", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#fragment"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.String fragment { get { return IGetField<Java.Lang.String>("fragment"); } set { ISetField("fragment", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#id"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public long id { get { return IGetField<long>("id"); } set { ISetField("id", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#CREATOR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
             private static Android.Os.Parcelable.Creator _CREATORContent = default;
             private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -472,7 +483,7 @@ public partial class Header
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#describeContents()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int DescribeContents()
             {
                 return IExecuteWithSignature<int>("describeContents", "()I");
@@ -482,7 +493,7 @@ public int DescribeContents()
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
             /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence GetBreadCrumbShortTitle(Android.Content.Res.Resources arg0)
             {
                 return IExecuteWithSignature<Java.Lang.CharSequence>("getBreadCrumbShortTitle", "(Landroid/content/res/Resources;)Ljava/lang/CharSequence;", arg0);
@@ -492,7 +503,7 @@ public Java.Lang.CharSequence GetBreadCrumbShortTitle(Android.Content.Res.Resour
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
             /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence GetBreadCrumbTitle(Android.Content.Res.Resources arg0)
             {
                 return IExecuteWithSignature<Java.Lang.CharSequence>("getBreadCrumbTitle", "(Landroid/content/res/Resources;)Ljava/lang/CharSequence;", arg0);
@@ -502,7 +513,7 @@ public Java.Lang.CharSequence GetBreadCrumbTitle(Android.Content.Res.Resources a
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
             /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence GetSummary(Android.Content.Res.Resources arg0)
             {
                 return IExecuteWithSignature<Java.Lang.CharSequence>("getSummary", "(Landroid/content/res/Resources;)Ljava/lang/CharSequence;", arg0);
@@ -512,7 +523,7 @@ public Java.Lang.CharSequence GetSummary(Android.Content.Res.Resources arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Res.Resources"/></param>
             /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.CharSequence GetTitle(Android.Content.Res.Resources arg0)
             {
                 return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "(Landroid/content/res/Resources;)Ljava/lang/CharSequence;", arg0);
@@ -521,7 +532,7 @@ public Java.Lang.CharSequence GetTitle(Android.Content.Res.Resources arg0)
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceActivity.Header.html#readFromParcel(android.os.Parcel)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void ReadFromParcel(Android.Os.Parcel arg0)
             {
                 IExecuteWithSignature("readFromParcel", "(Landroid/os/Parcel;)V", arg0);
@@ -531,7 +542,7 @@ public void ReadFromParcel(Android.Os.Parcel arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
             {
                 IExecute("writeToParcel", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Preference/PreferenceCategory.cs b/src/net/Netdroid/Generated/Android/Preference/PreferenceCategory.cs
index e942f33ea..e14588ce1 100644
--- a/src/net/Netdroid/Generated/Android/Preference/PreferenceCategory.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/PreferenceCategory.cs
@@ -36,7 +36,7 @@ public partial class PreferenceCategory
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PreferenceCategory(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public PreferenceCategory(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PreferenceCategory(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public PreferenceCategory(Android.Content.Context arg0, Android.Util.AttributeSe
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PreferenceCategory(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public PreferenceCategory(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceCategory.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PreferenceCategory(Android.Content.Context arg0)
             : base(arg0)
         {
diff --git a/src/net/Netdroid/Generated/Android/Preference/PreferenceDataStore.cs b/src/net/Netdroid/Generated/Android/Preference/PreferenceDataStore.cs
index fffb0b31a..be78ef360 100644
--- a/src/net/Netdroid/Generated/Android/Preference/PreferenceDataStore.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/PreferenceDataStore.cs
@@ -69,7 +69,7 @@ public partial class PreferenceDataStore : Android.Preference.IPreferenceDataSto
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool GetBoolean(Java.Lang.String arg0, bool arg1)
         {
             return IExecute<bool>("getBoolean", arg0, arg1);
@@ -80,7 +80,7 @@ public bool GetBoolean(Java.Lang.String arg0, bool arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float GetFloat(Java.Lang.String arg0, float arg1)
         {
             return IExecute<float>("getFloat", arg0, arg1);
@@ -91,7 +91,7 @@ public float GetFloat(Java.Lang.String arg0, float arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetInt(Java.Lang.String arg0, int arg1)
         {
             return IExecute<int>("getInt", arg0, arg1);
@@ -102,7 +102,7 @@ public int GetInt(Java.Lang.String arg0, int arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetString(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecute<Java.Lang.String>("getString", arg0, arg1);
@@ -113,7 +113,7 @@ public Java.Lang.String GetString(Java.Lang.String arg0, Java.Lang.String arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Set<Java.Lang.String> GetStringSet(Java.Lang.String arg0, Java.Util.Set<Java.Lang.String> arg1)
         {
             return IExecute<Java.Util.Set<Java.Lang.String>>("getStringSet", arg0, arg1);
@@ -124,7 +124,7 @@ public Java.Lang.String GetString(Java.Lang.String arg0, Java.Lang.String arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long GetLong(Java.Lang.String arg0, long arg1)
         {
             return IExecute<long>("getLong", arg0, arg1);
@@ -134,7 +134,7 @@ public long GetLong(Java.Lang.String arg0, long arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PutBoolean(Java.Lang.String arg0, bool arg1)
         {
             IExecute("putBoolean", arg0, arg1);
@@ -144,7 +144,7 @@ public void PutBoolean(Java.Lang.String arg0, bool arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PutFloat(Java.Lang.String arg0, float arg1)
         {
             IExecute("putFloat", arg0, arg1);
@@ -154,7 +154,7 @@ public void PutFloat(Java.Lang.String arg0, float arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PutInt(Java.Lang.String arg0, int arg1)
         {
             IExecute("putInt", arg0, arg1);
@@ -164,7 +164,7 @@ public void PutInt(Java.Lang.String arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PutLong(Java.Lang.String arg0, long arg1)
         {
             IExecute("putLong", arg0, arg1);
@@ -174,7 +174,7 @@ public void PutLong(Java.Lang.String arg0, long arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PutString(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             IExecute("putString", arg0, arg1);
@@ -184,7 +184,7 @@ public void PutString(Java.Lang.String arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void PutStringSet(Java.Lang.String arg0, Java.Util.Set<Java.Lang.String> arg1)
         {
             IExecute("putStringSet", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Preference/PreferenceFragment.cs b/src/net/Netdroid/Generated/Android/Preference/PreferenceFragment.cs
index c33e3aa58..6451bff95 100644
--- a/src/net/Netdroid/Generated/Android/Preference/PreferenceFragment.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/PreferenceFragment.cs
@@ -46,30 +46,32 @@ public partial class PreferenceFragment
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#getPreferenceManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#findPreference(java.lang.CharSequence)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.PreferenceManager PreferenceManager
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        /// <returns><see cref="Android.Preference.Preference"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.Preference FindPreference(Java.Lang.CharSequence arg0)
         {
-            get { return IExecuteWithSignature<Android.Preference.PreferenceManager>("getPreferenceManager", "()Landroid/preference/PreferenceManager;"); }
+            return IExecuteWithSignature<Android.Preference.Preference>("findPreference", "(Ljava/lang/CharSequence;)Landroid/preference/Preference;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#getPreferenceScreen()"/> <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#setPreferenceScreen(android.preference.PreferenceScreen)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#getPreferenceManager()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.PreferenceScreen PreferenceScreen
+        /// <returns><see cref="Android.Preference.PreferenceManager"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.PreferenceManager GetPreferenceManager()
         {
-            get { return IExecuteWithSignature<Android.Preference.PreferenceScreen>("getPreferenceScreen", "()Landroid/preference/PreferenceScreen;"); } set { IExecuteWithSignature("setPreferenceScreen", "(Landroid/preference/PreferenceScreen;)V", value); }
+            return IExecuteWithSignature<Android.Preference.PreferenceManager>("getPreferenceManager", "()Landroid/preference/PreferenceManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#findPreference(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#getPreferenceScreen()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Preference.Preference"/></returns>
-        [System.Obsolete()]
-        public Android.Preference.Preference FindPreference(Java.Lang.CharSequence arg0)
+        /// <returns><see cref="Android.Preference.PreferenceScreen"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.PreferenceScreen GetPreferenceScreen()
         {
-            return IExecuteWithSignature<Android.Preference.Preference>("findPreference", "(Ljava/lang/CharSequence;)Landroid/preference/Preference;", arg0);
+            return IExecuteWithSignature<Android.Preference.PreferenceScreen>("getPreferenceScreen", "()Landroid/preference/PreferenceScreen;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#onPreferenceTreeClick(android.preference.PreferenceScreen,android.preference.Preference)"/>
@@ -77,7 +79,7 @@ public Android.Preference.Preference FindPreference(Java.Lang.CharSequence arg0)
         /// <param name="arg0"><see cref="Android.Preference.PreferenceScreen"/></param>
         /// <param name="arg1"><see cref="Android.Preference.Preference"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnPreferenceTreeClick(Android.Preference.PreferenceScreen arg0, Android.Preference.Preference arg1)
         {
             return IExecute<bool>("onPreferenceTreeClick", arg0, arg1);
@@ -86,7 +88,7 @@ public bool OnPreferenceTreeClick(Android.Preference.PreferenceScreen arg0, Andr
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#addPreferencesFromIntent(android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddPreferencesFromIntent(Android.Content.Intent arg0)
         {
             IExecuteWithSignature("addPreferencesFromIntent", "(Landroid/content/Intent;)V", arg0);
@@ -95,11 +97,20 @@ public void AddPreferencesFromIntent(Android.Content.Intent arg0)
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#addPreferencesFromResource(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddPreferencesFromResource(int arg0)
         {
             IExecuteWithSignature("addPreferencesFromResource", "(I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceFragment.html#setPreferenceScreen(android.preference.PreferenceScreen)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Preference.PreferenceScreen"/></param>
+        [global::System.Obsolete()]
+        public void SetPreferenceScreen(Android.Preference.PreferenceScreen arg0)
+        {
+            IExecuteWithSignature("setPreferenceScreen", "(Landroid/preference/PreferenceScreen;)V", arg0);
+        }
 
         #endregion
 
@@ -130,7 +141,7 @@ public partial class OnPreferenceStartFragmentCallback
             /// <param name="arg0"><see cref="Android.Preference.PreferenceFragment"/></param>
             /// <param name="arg1"><see cref="Android.Preference.Preference"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public bool OnPreferenceStartFragment(Android.Preference.PreferenceFragment arg0, Android.Preference.Preference arg1)
             {
                 return IExecute<bool>("onPreferenceStartFragment", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Preference/PreferenceGroup.cs b/src/net/Netdroid/Generated/Android/Preference/PreferenceGroup.cs
index 5b46434d9..39a5d3984 100644
--- a/src/net/Netdroid/Generated/Android/Preference/PreferenceGroup.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/PreferenceGroup.cs
@@ -36,7 +36,7 @@ public partial class PreferenceGroup
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PreferenceGroup(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public PreferenceGroup(Android.Content.Context arg0, Android.Util.AttributeSet a
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PreferenceGroup(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public PreferenceGroup(Android.Content.Context arg0, Android.Util.AttributeSet a
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public PreferenceGroup(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -79,19 +79,11 @@ public PreferenceGroup(Android.Content.Context arg0, Android.Util.AttributeSet a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceGroup.html#getPreferenceCount()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int PreferenceCount
-        {
-            get { return IExecuteWithSignature<int>("getPreferenceCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceGroup.html#findPreference(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Android.Preference.Preference"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Preference.Preference FindPreference(Java.Lang.CharSequence arg0)
         {
             return IExecuteWithSignature<Android.Preference.Preference>("findPreference", "(Ljava/lang/CharSequence;)Landroid/preference/Preference;", arg0);
@@ -101,7 +93,7 @@ public Android.Preference.Preference FindPreference(Java.Lang.CharSequence arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Preference.Preference"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Preference.Preference GetPreference(int arg0)
         {
             return IExecuteWithSignature<Android.Preference.Preference>("getPreference", "(I)Landroid/preference/Preference;", arg0);
@@ -111,7 +103,7 @@ public Android.Preference.Preference GetPreference(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool AddPreference(Android.Preference.Preference arg0)
         {
             return IExecuteWithSignature<bool>("addPreference", "(Landroid/preference/Preference;)Z", arg0);
@@ -120,7 +112,7 @@ public bool AddPreference(Android.Preference.Preference arg0)
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceGroup.html#isOrderingAsAdded()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsOrderingAsAdded()
         {
             return IExecuteWithSignature<bool>("isOrderingAsAdded", "()Z");
@@ -130,16 +122,25 @@ public bool IsOrderingAsAdded()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RemovePreference(Android.Preference.Preference arg0)
         {
             return IExecuteWithSignature<bool>("removePreference", "(Landroid/preference/Preference;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceGroup.html#getPreferenceCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPreferenceCount()
+        {
+            return IExecuteWithSignature<int>("getPreferenceCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceGroup.html#addItemFromInflater(android.preference.Preference)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Preference.Preference"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddItemFromInflater(Android.Preference.Preference arg0)
         {
             IExecuteWithSignature("addItemFromInflater", "(Landroid/preference/Preference;)V", arg0);
@@ -147,7 +148,7 @@ public void AddItemFromInflater(Android.Preference.Preference arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceGroup.html#removeAll()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveAll()
         {
             IExecuteWithSignature("removeAll", "()V");
@@ -156,7 +157,7 @@ public void RemoveAll()
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceGroup.html#setOrderingAsAdded(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOrderingAsAdded(bool arg0)
         {
             IExecuteWithSignature("setOrderingAsAdded", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Preference/PreferenceManager.cs b/src/net/Netdroid/Generated/Android/Preference/PreferenceManager.cs
index 6166559cc..9ebf7d4eb 100644
--- a/src/net/Netdroid/Generated/Android/Preference/PreferenceManager.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/PreferenceManager.cs
@@ -40,14 +40,14 @@ public partial class PreferenceManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#KEY_HAS_SET_DEFAULT_VALUES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_HAS_SET_DEFAULT_VALUES { get { if (!_KEY_HAS_SET_DEFAULT_VALUESReady) { _KEY_HAS_SET_DEFAULT_VALUESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_HAS_SET_DEFAULT_VALUES"); _KEY_HAS_SET_DEFAULT_VALUESReady = true; } return _KEY_HAS_SET_DEFAULT_VALUESContent; } }
         private static Java.Lang.String _KEY_HAS_SET_DEFAULT_VALUESContent = default;
         private static bool _KEY_HAS_SET_DEFAULT_VALUESReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#METADATA_KEY_PREFERENCES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String METADATA_KEY_PREFERENCES { get { if (!_METADATA_KEY_PREFERENCESReady) { _METADATA_KEY_PREFERENCESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "METADATA_KEY_PREFERENCES"); _METADATA_KEY_PREFERENCESReady = true; } return _METADATA_KEY_PREFERENCESContent; } }
         private static Java.Lang.String _METADATA_KEY_PREFERENCESContent = default;
         private static bool _METADATA_KEY_PREFERENCESReady = false; // this is used because in case of generics 
@@ -60,7 +60,7 @@ public partial class PreferenceManager
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Android.Content.SharedPreferences"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Content.SharedPreferences GetDefaultSharedPreferences(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<Android.Content.SharedPreferences>(LocalBridgeClazz, "getDefaultSharedPreferences", "(Landroid/content/Context;)Landroid/content/SharedPreferences;", arg0);
@@ -70,7 +70,7 @@ public static Android.Content.SharedPreferences GetDefaultSharedPreferences(Andr
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetDefaultSharedPreferencesName(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultSharedPreferencesName", "(Landroid/content/Context;)Ljava/lang/String;", arg0);
@@ -81,7 +81,7 @@ public static Java.Lang.String GetDefaultSharedPreferencesName(Android.Content.C
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetDefaultValues(Android.Content.Context arg0, int arg1, bool arg2)
         {
             SExecute(LocalBridgeClazz, "setDefaultValues", arg0, arg1, arg2);
@@ -94,7 +94,7 @@ public static void SetDefaultValues(Android.Content.Context arg0, int arg1, bool
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetDefaultValues(Android.Content.Context arg0, Java.Lang.String arg1, int arg2, int arg3, bool arg4)
         {
             SExecute(LocalBridgeClazz, "setDefaultValues", arg0, arg1, arg2, arg3, arg4);
@@ -104,53 +104,39 @@ public static void SetDefaultValues(Android.Content.Context arg0, Java.Lang.Stri
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#getPreferenceDataStore()"/> <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#setPreferenceDataStore(android.preference.PreferenceDataStore)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#getSharedPreferences()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Preference.PreferenceDataStore PreferenceDataStore
-        {
-            get { return IExecuteWithSignature<Android.Preference.PreferenceDataStore>("getPreferenceDataStore", "()Landroid/preference/PreferenceDataStore;"); } set { IExecuteWithSignature("setPreferenceDataStore", "(Landroid/preference/PreferenceDataStore;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#getSharedPreferences()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Content.SharedPreferences SharedPreferences
-        {
-            get { return IExecuteWithSignature<Android.Content.SharedPreferences>("getSharedPreferences", "()Landroid/content/SharedPreferences;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#getSharedPreferencesMode()"/> <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#setSharedPreferencesMode(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public int SharedPreferencesMode
-        {
-            get { return IExecuteWithSignature<int>("getSharedPreferencesMode", "()I"); } set { IExecuteWithSignature("setSharedPreferencesMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#getSharedPreferencesName()"/> <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#setSharedPreferencesName(java.lang.String)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String SharedPreferencesName
+        /// <returns><see cref="Android.Content.SharedPreferences"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.SharedPreferences GetSharedPreferences()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSharedPreferencesName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSharedPreferencesName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Content.SharedPreferences>("getSharedPreferences", "()Landroid/content/SharedPreferences;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#findPreference(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Android.Preference.Preference"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Preference.Preference FindPreference(Java.Lang.CharSequence arg0)
         {
             return IExecuteWithSignature<Android.Preference.Preference>("findPreference", "(Ljava/lang/CharSequence;)Landroid/preference/Preference;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#getPreferenceDataStore()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Preference.PreferenceDataStore"/></returns>
+        [global::System.Obsolete()]
+        public Android.Preference.PreferenceDataStore GetPreferenceDataStore()
+        {
+            return IExecuteWithSignature<Android.Preference.PreferenceDataStore>("getPreferenceDataStore", "()Landroid/preference/PreferenceDataStore;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#createPreferenceScreen(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Android.Preference.PreferenceScreen"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Preference.PreferenceScreen CreatePreferenceScreen(Android.Content.Context arg0)
         {
             return IExecuteWithSignature<Android.Preference.PreferenceScreen>("createPreferenceScreen", "(Landroid/content/Context;)Landroid/preference/PreferenceScreen;", arg0);
@@ -159,7 +145,7 @@ public Android.Preference.PreferenceScreen CreatePreferenceScreen(Android.Conten
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#isStorageDefault()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsStorageDefault()
         {
             return IExecuteWithSignature<bool>("isStorageDefault", "()Z");
@@ -168,15 +154,60 @@ public bool IsStorageDefault()
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#isStorageDeviceProtected()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsStorageDeviceProtected()
         {
             return IExecuteWithSignature<bool>("isStorageDeviceProtected", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#getSharedPreferencesMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSharedPreferencesMode()
+        {
+            return IExecuteWithSignature<int>("getSharedPreferencesMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#getSharedPreferencesName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetSharedPreferencesName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSharedPreferencesName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#setPreferenceDataStore(android.preference.PreferenceDataStore)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Preference.PreferenceDataStore"/></param>
+        [global::System.Obsolete()]
+        public void SetPreferenceDataStore(Android.Preference.PreferenceDataStore arg0)
+        {
+            IExecuteWithSignature("setPreferenceDataStore", "(Landroid/preference/PreferenceDataStore;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#setSharedPreferencesMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetSharedPreferencesMode(int arg0)
+        {
+            IExecuteWithSignature("setSharedPreferencesMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#setSharedPreferencesName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetSharedPreferencesName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSharedPreferencesName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#setStorageDefault()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetStorageDefault()
         {
             IExecuteWithSignature("setStorageDefault", "()V");
@@ -184,7 +215,7 @@ public void SetStorageDefault()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.html#setStorageDeviceProtected()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetStorageDeviceProtected()
         {
             IExecuteWithSignature("setStorageDeviceProtected", "()V");
@@ -218,7 +249,7 @@ public partial class OnActivityDestroyListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onActivityDestroy", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnActivityDestroyEventHandler));
+                AddEventHandler("onActivityDestroy", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnActivityDestroyEventHandler));
 
             }
 
@@ -226,7 +257,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityDestroyListener.html#onActivityDestroy()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnActivityDestroy"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnActivityDestroy { get; set; } = null;
+            public global::System.Action OnOnActivityDestroy { get; set; } = null;
 
             void OnActivityDestroyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -237,7 +268,7 @@ void OnActivityDestroyEventHandler(object sender, CLRListenerEventArgs<CLREventD
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityDestroyListener.html#onActivityDestroy()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnActivityDestroy()
             {
                 
@@ -276,7 +307,7 @@ public partial class OnActivityDestroyListenerDirect
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityDestroyListener.html#onActivityDestroy()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnActivityDestroy()
             {
                 IExecuteWithSignature("onActivityDestroy", "()V");
@@ -317,7 +348,7 @@ public partial class OnActivityResultListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onActivityResult", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnActivityResultEventHandler));
+                AddEventHandler("onActivityResult", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnActivityResultEventHandler));
 
             }
 
@@ -325,7 +356,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityResultListener.html#onActivityResult(int,int,android.content.Intent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnActivityResult"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<int, int, Android.Content.Intent, bool> OnOnActivityResult { get; set; } = null;
+            public global::System.Func<int, int, Android.Content.Intent, bool> OnOnActivityResult { get; set; } = null;
 
             void OnActivityResultEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -341,7 +372,7 @@ void OnActivityResultEventHandler(object sender, CLRListenerEventArgs<CLREventDa
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="Android.Content.Intent"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual bool OnActivityResult(int arg0, int arg1, Android.Content.Intent arg2)
             {
                 return default;
@@ -384,7 +415,7 @@ public partial class OnActivityResultListenerDirect
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="Android.Content.Intent"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override bool OnActivityResult(int arg0, int arg1, Android.Content.Intent arg2)
             {
                 return IExecute<bool>("onActivityResult", arg0, arg1, arg2);
@@ -425,7 +456,7 @@ public partial class OnActivityStopListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onActivityStop", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnActivityStopEventHandler));
+                AddEventHandler("onActivityStop", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnActivityStopEventHandler));
 
             }
 
@@ -433,7 +464,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityStopListener.html#onActivityStop()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnActivityStop"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnActivityStop { get; set; } = null;
+            public global::System.Action OnOnActivityStop { get; set; } = null;
 
             void OnActivityStopEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -444,7 +475,7 @@ void OnActivityStopEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityStopListener.html#onActivityStop()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnActivityStop()
             {
                 
@@ -483,7 +514,7 @@ public partial class OnActivityStopListenerDirect
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/preference/PreferenceManager.OnActivityStopListener.html#onActivityStop()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnActivityStop()
             {
                 IExecuteWithSignature("onActivityStop", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Preference/PreferenceScreen.cs b/src/net/Netdroid/Generated/Android/Preference/PreferenceScreen.cs
index 0f0fffdb4..999b5fdef 100644
--- a/src/net/Netdroid/Generated/Android/Preference/PreferenceScreen.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/PreferenceScreen.cs
@@ -46,26 +46,37 @@ public partial class PreferenceScreen
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceScreen.html#getDialog()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceScreen.html#getDialog()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.App.Dialog Dialog
+        /// <returns><see cref="Android.App.Dialog"/></returns>
+        [global::System.Obsolete()]
+        public Android.App.Dialog GetDialog()
         {
-            get { return IExecuteWithSignature<Android.App.Dialog>("getDialog", "()Landroid/app/Dialog;"); }
+            return IExecuteWithSignature<Android.App.Dialog>("getDialog", "()Landroid/app/Dialog;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/PreferenceScreen.html#getRootAdapter()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceScreen.html#getRootAdapter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.ListAdapter RootAdapter
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ListAdapter GetRootAdapter()
         {
-            get { return IExecuteWithSignature<Android.Widget.ListAdapter>("getRootAdapter", "()Landroid/widget/ListAdapter;"); }
+            return IExecuteWithSignature<Android.Widget.ListAdapter>("getRootAdapter", "()Landroid/widget/ListAdapter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/PreferenceScreen.html#getRootAdapter()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.ListAdapter GetRootAdapterDirect()
+        {
+            return IExecuteWithSignature<Android.Widget.ListAdapterDirect, Android.Widget.ListAdapter>("getRootAdapter", "()Landroid/widget/ListAdapter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceScreen.html#bind(android.widget.ListView)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.ListView"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Bind(Android.Widget.ListView arg0)
         {
             IExecuteWithSignature("bind", "(Landroid/widget/ListView;)V", arg0);
@@ -74,7 +85,7 @@ public void Bind(Android.Widget.ListView arg0)
         /// <see href="https://developer.android.com/reference/android/preference/PreferenceScreen.html#onDismiss(android.content.DialogInterface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.DialogInterface"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnDismiss(Android.Content.DialogInterface arg0)
         {
             IExecuteWithSignature("onDismiss", "(Landroid/content/DialogInterface;)V", arg0);
@@ -86,7 +97,7 @@ public void OnDismiss(Android.Content.DialogInterface arg0)
         /// <param name="arg1"><see cref="Android.View.View"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnItemClick(Android.Widget.AdapterView arg0, Android.View.View arg1, int arg2, long arg3)
         {
             IExecute("onItemClick", arg0, arg1, arg2, arg3);
diff --git a/src/net/Netdroid/Generated/Android/Preference/RingtonePreference.cs b/src/net/Netdroid/Generated/Android/Preference/RingtonePreference.cs
index fbfc7110d..91fc652cb 100644
--- a/src/net/Netdroid/Generated/Android/Preference/RingtonePreference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/RingtonePreference.cs
@@ -36,7 +36,7 @@ public partial class RingtonePreference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public RingtonePreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public RingtonePreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public RingtonePreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public RingtonePreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public RingtonePreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public RingtonePreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public RingtonePreference(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,28 +88,22 @@ public RingtonePreference(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#getRingtoneType()"/> <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#setRingtoneType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#getShowDefault()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int RingtoneType
-        {
-            get { return IExecuteWithSignature<int>("getRingtoneType", "()I"); } set { IExecuteWithSignature("setRingtoneType", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#getShowDefault()"/> <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#setShowDefault(boolean)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public bool ShowDefault
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetShowDefault()
         {
-            get { return IExecuteWithSignature<bool>("getShowDefault", "()Z"); } set { IExecuteWithSignature("setShowDefault", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getShowDefault", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#getShowSilent()"/> <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#setShowSilent(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#getShowSilent()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool ShowSilent
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetShowSilent()
         {
-            get { return IExecuteWithSignature<bool>("getShowSilent", "()Z"); } set { IExecuteWithSignature("setShowSilent", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getShowSilent", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#onActivityResult(int,int,android.content.Intent)"/>
@@ -118,11 +112,47 @@ public bool ShowSilent
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Content.Intent"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnActivityResult(int arg0, int arg1, Android.Content.Intent arg2)
         {
             return IExecute<bool>("onActivityResult", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#getRingtoneType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetRingtoneType()
+        {
+            return IExecuteWithSignature<int>("getRingtoneType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#setRingtoneType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetRingtoneType(int arg0)
+        {
+            IExecuteWithSignature("setRingtoneType", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#setShowDefault(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetShowDefault(bool arg0)
+        {
+            IExecuteWithSignature("setShowDefault", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/RingtonePreference.html#setShowSilent(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetShowSilent(bool arg0)
+        {
+            IExecuteWithSignature("setShowSilent", "(Z)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Preference/SwitchPreference.cs b/src/net/Netdroid/Generated/Android/Preference/SwitchPreference.cs
index b9b915719..9e6b45600 100644
--- a/src/net/Netdroid/Generated/Android/Preference/SwitchPreference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/SwitchPreference.cs
@@ -36,7 +36,7 @@ public partial class SwitchPreference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SwitchPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public SwitchPreference(Android.Content.Context arg0, Android.Util.AttributeSet
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SwitchPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public SwitchPreference(Android.Content.Context arg0, Android.Util.AttributeSet
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SwitchPreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public SwitchPreference(Android.Content.Context arg0, Android.Util.AttributeSet
         /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SwitchPreference(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,26 +88,28 @@ public SwitchPreference(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#getSwitchTextOff()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#getSwitchTextOff()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence SwitchTextOff
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetSwitchTextOff()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSwitchTextOff", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSwitchTextOff", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#getSwitchTextOn()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#getSwitchTextOn()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence SwitchTextOn
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetSwitchTextOn()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSwitchTextOn", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSwitchTextOn", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#setSwitchTextOff(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSwitchTextOff(int arg0)
         {
             IExecuteWithSignature("setSwitchTextOff", "(I)V", arg0);
@@ -116,7 +118,7 @@ public void SetSwitchTextOff(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#setSwitchTextOff(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSwitchTextOff(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setSwitchTextOff", "(Ljava/lang/CharSequence;)V", arg0);
@@ -125,7 +127,7 @@ public void SetSwitchTextOff(Java.Lang.CharSequence arg0)
         /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#setSwitchTextOn(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSwitchTextOn(int arg0)
         {
             IExecuteWithSignature("setSwitchTextOn", "(I)V", arg0);
@@ -134,7 +136,7 @@ public void SetSwitchTextOn(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/SwitchPreference.html#setSwitchTextOn(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSwitchTextOn(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setSwitchTextOn", "(Ljava/lang/CharSequence;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Preference/TwoStatePreference.cs b/src/net/Netdroid/Generated/Android/Preference/TwoStatePreference.cs
index a10df368b..41aa3a9bc 100644
--- a/src/net/Netdroid/Generated/Android/Preference/TwoStatePreference.cs
+++ b/src/net/Netdroid/Generated/Android/Preference/TwoStatePreference.cs
@@ -36,7 +36,7 @@ public partial class TwoStatePreference
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TwoStatePreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public TwoStatePreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TwoStatePreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public TwoStatePreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TwoStatePreference(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public TwoStatePreference(Android.Content.Context arg0, Android.Util.AttributeSe
         /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TwoStatePreference(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,52 +88,64 @@ public TwoStatePreference(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#getDisableDependentsState()"/> <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#setDisableDependentsState(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#getDisableDependentsState()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool DisableDependentsState
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetDisableDependentsState()
         {
-            get { return IExecuteWithSignature<bool>("getDisableDependentsState", "()Z"); } set { IExecuteWithSignature("setDisableDependentsState", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getDisableDependentsState", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#getSummaryOff()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#isChecked()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence SummaryOff
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsChecked()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSummaryOff", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isChecked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#getSummaryOn()"/> 
+        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#getSummaryOff()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence SummaryOn
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetSummaryOff()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSummaryOn", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSummaryOff", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#isChecked()"/>
+        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#getSummaryOn()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsChecked()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetSummaryOn()
         {
-            return IExecuteWithSignature<bool>("isChecked", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSummaryOn", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#setChecked(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetChecked(bool arg0)
         {
             IExecuteWithSignature("setChecked", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#setDisableDependentsState(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetDisableDependentsState(bool arg0)
+        {
+            IExecuteWithSignature("setDisableDependentsState", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#setSummaryOff(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSummaryOff(int arg0)
         {
             IExecuteWithSignature("setSummaryOff", "(I)V", arg0);
@@ -142,7 +154,7 @@ public void SetSummaryOff(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#setSummaryOff(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSummaryOff(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setSummaryOff", "(Ljava/lang/CharSequence;)V", arg0);
@@ -151,7 +163,7 @@ public void SetSummaryOff(Java.Lang.CharSequence arg0)
         /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#setSummaryOn(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSummaryOn(int arg0)
         {
             IExecuteWithSignature("setSummaryOn", "(I)V", arg0);
@@ -160,7 +172,7 @@ public void SetSummaryOn(int arg0)
         /// <see href="https://developer.android.com/reference/android/preference/TwoStatePreference.html#setSummaryOn(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSummaryOn(Java.Lang.CharSequence arg0)
         {
             IExecuteWithSignature("setSummaryOn", "(Ljava/lang/CharSequence;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Print/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Print/AllPackageClasses.cs
index 61ec2b2db..4062adf3c 100644
--- a/src/net/Netdroid/Generated/Android/Print/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Print/AllPackageClasses.cs
@@ -294,14 +294,42 @@ public Resolution(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html"/>
     /// </summary>
-    public partial class PrintDocumentAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class PrintDocumentAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PrintDocumentAdapter>
     {
+        const string _bridgeClassName = "android.print.PrintDocumentAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public PrintDocumentAdapter() { InitializeHandlers(); }
+        [global::System.Obsolete("PrintDocumentAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public PrintDocumentAdapter() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("PrintDocumentAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public PrintDocumentAdapter(params object[] args) : base(args) { }
 
-    #warning Remember to build the Java class for event listener
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
 
         // TODO: complete the class
         #region LayoutResultCallback
@@ -314,12 +342,12 @@ public partial class LayoutResultCallback : MASES.JCOBridge.C2JBridge.JVMBridgeB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("LayoutResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LayoutResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LayoutResultCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("LayoutResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LayoutResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LayoutResultCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -360,12 +388,12 @@ public partial class WriteResultCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("WriteResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WriteResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WriteResultCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("WriteResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WriteResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WriteResultCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -400,43 +428,6 @@ public WriteResultCallback(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region PrintDocumentAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="PrintDocumentAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class PrintDocumentAdapterDirect : PrintDocumentAdapter
-    {
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
-        /// </summary>
-        public override bool AutoInit => false;
-
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => "android.print.PrintDocumentAdapter";
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-    }
-    #endregion
-
     #region PrintDocumentInfo
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html"/>
diff --git a/src/net/Netdroid/Generated/Android/Print/PageRange.cs b/src/net/Netdroid/Generated/Android/Print/PageRange.cs
index 430470027..8d03c4b79 100644
--- a/src/net/Netdroid/Generated/Android/Print/PageRange.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PageRange.cs
@@ -67,26 +67,28 @@ public PageRange(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PageRange.html#getEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PageRange.html#describeContents()"/>
         /// </summary>
-        public int End
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getEnd", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PageRange.html#getStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PageRange.html#getEnd()"/>
         /// </summary>
-        public int Start
+        /// <returns><see cref="int"/></returns>
+        public int GetEnd()
         {
-            get { return IExecuteWithSignature<int>("getStart", "()I"); }
+            return IExecuteWithSignature<int>("getEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PageRange.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/print/PageRange.html#getStart()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetStart()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getStart", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PageRange.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Print/Pdf/PrintedPdfDocument.cs b/src/net/Netdroid/Generated/Android/Print/Pdf/PrintedPdfDocument.cs
index a1fabeabf..2637cc104 100644
--- a/src/net/Netdroid/Generated/Android/Print/Pdf/PrintedPdfDocument.cs
+++ b/src/net/Netdroid/Generated/Android/Print/Pdf/PrintedPdfDocument.cs
@@ -55,34 +55,37 @@ public PrintedPdfDocument(Android.Content.Context arg0, Android.Print.PrintAttri
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/pdf/PrintedPdfDocument.html#getPageContentRect()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/pdf/PrintedPdfDocument.html#startPage(int)"/>
         /// </summary>
-        public Android.Graphics.Rect PageContentRect
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Graphics.Pdf.PdfDocument.Page"/></returns>
+        public Android.Graphics.Pdf.PdfDocument.Page StartPage(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getPageContentRect", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Pdf.PdfDocument.Page>("startPage", "(I)Landroid/graphics/pdf/PdfDocument$Page;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/pdf/PrintedPdfDocument.html#getPageHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/pdf/PrintedPdfDocument.html#getPageContentRect()"/>
         /// </summary>
-        public int PageHeight
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetPageContentRect()
         {
-            get { return IExecuteWithSignature<int>("getPageHeight", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getPageContentRect", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/pdf/PrintedPdfDocument.html#getPageWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/pdf/PrintedPdfDocument.html#getPageHeight()"/>
         /// </summary>
-        public int PageWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetPageHeight()
         {
-            get { return IExecuteWithSignature<int>("getPageWidth", "()I"); }
+            return IExecuteWithSignature<int>("getPageHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/pdf/PrintedPdfDocument.html#startPage(int)"/>
+        /// <see href="https://developer.android.com/reference/android/print/pdf/PrintedPdfDocument.html#getPageWidth()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Graphics.Pdf.PdfDocument.Page"/></returns>
-        public Android.Graphics.Pdf.PdfDocument.Page StartPage(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPageWidth()
         {
-            return IExecuteWithSignature<Android.Graphics.Pdf.PdfDocument.Page>("startPage", "(I)Landroid/graphics/pdf/PdfDocument$Page;", arg0);
+            return IExecuteWithSignature<int>("getPageWidth", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Print/PrintAttributes.cs b/src/net/Netdroid/Generated/Android/Print/PrintAttributes.cs
index 2204d09a2..bb53072e7 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrintAttributes.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrintAttributes.cs
@@ -82,47 +82,52 @@ public partial class PrintAttributes
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getColorMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getMinMargins()"/>
         /// </summary>
-        public int ColorMode
+        /// <returns><see cref="Android.Print.PrintAttributes.Margins"/></returns>
+        public Android.Print.PrintAttributes.Margins GetMinMargins()
         {
-            get { return IExecuteWithSignature<int>("getColorMode", "()I"); }
+            return IExecuteWithSignature<Android.Print.PrintAttributes.Margins>("getMinMargins", "()Landroid/print/PrintAttributes$Margins;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getDuplexMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getMediaSize()"/>
         /// </summary>
-        public int DuplexMode
+        /// <returns><see cref="Android.Print.PrintAttributes.MediaSize"/></returns>
+        public Android.Print.PrintAttributes.MediaSize GetMediaSize()
         {
-            get { return IExecuteWithSignature<int>("getDuplexMode", "()I"); }
+            return IExecuteWithSignature<Android.Print.PrintAttributes.MediaSize>("getMediaSize", "()Landroid/print/PrintAttributes$MediaSize;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getMediaSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getResolution()"/>
         /// </summary>
-        public Android.Print.PrintAttributes.MediaSize GetMediaSize
+        /// <returns><see cref="Android.Print.PrintAttributes.Resolution"/></returns>
+        public Android.Print.PrintAttributes.Resolution GetResolution()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintAttributes.MediaSize>("getMediaSize", "()Landroid/print/PrintAttributes$MediaSize;"); }
+            return IExecuteWithSignature<Android.Print.PrintAttributes.Resolution>("getResolution", "()Landroid/print/PrintAttributes$Resolution;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getResolution()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#describeContents()"/>
         /// </summary>
-        public Android.Print.PrintAttributes.Resolution GetResolution
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintAttributes.Resolution>("getResolution", "()Landroid/print/PrintAttributes$Resolution;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getMinMargins()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getColorMode()"/>
         /// </summary>
-        public Android.Print.PrintAttributes.Margins MinMargins
+        /// <returns><see cref="int"/></returns>
+        public int GetColorMode()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintAttributes.Margins>("getMinMargins", "()Landroid/print/PrintAttributes$Margins;"); }
+            return IExecuteWithSignature<int>("getColorMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#getDuplexMode()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetDuplexMode()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getDuplexMode", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.html#writeToParcel(android.os.Parcel,int)"/>
@@ -259,32 +264,36 @@ public Margins(int arg0, int arg1, int arg2, int arg3)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Margins.html#getBottomMils()"/> 
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Margins.html#getBottomMils()"/>
             /// </summary>
-            public int BottomMils
+            /// <returns><see cref="int"/></returns>
+            public int GetBottomMils()
             {
-                get { return IExecuteWithSignature<int>("getBottomMils", "()I"); }
+                return IExecuteWithSignature<int>("getBottomMils", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Margins.html#getLeftMils()"/> 
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Margins.html#getLeftMils()"/>
             /// </summary>
-            public int LeftMils
+            /// <returns><see cref="int"/></returns>
+            public int GetLeftMils()
             {
-                get { return IExecuteWithSignature<int>("getLeftMils", "()I"); }
+                return IExecuteWithSignature<int>("getLeftMils", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Margins.html#getRightMils()"/> 
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Margins.html#getRightMils()"/>
             /// </summary>
-            public int RightMils
+            /// <returns><see cref="int"/></returns>
+            public int GetRightMils()
             {
-                get { return IExecuteWithSignature<int>("getRightMils", "()I"); }
+                return IExecuteWithSignature<int>("getRightMils", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Margins.html#getTopMils()"/> 
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Margins.html#getTopMils()"/>
             /// </summary>
-            public int TopMils
+            /// <returns><see cref="int"/></returns>
+            public int GetTopMils()
             {
-                get { return IExecuteWithSignature<int>("getTopMils", "()I"); }
+                return IExecuteWithSignature<int>("getTopMils", "()I");
             }
 
             #endregion
@@ -899,27 +908,6 @@ public MediaSize(Java.Lang.String arg0, Java.Lang.String arg1, int arg2, int arg
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.MediaSize.html#getHeightMils()"/> 
-            /// </summary>
-            public int HeightMils
-            {
-                get { return IExecuteWithSignature<int>("getHeightMils", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.MediaSize.html#getId()"/> 
-            /// </summary>
-            public Java.Lang.String Id
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.MediaSize.html#getWidthMils()"/> 
-            /// </summary>
-            public int WidthMils
-            {
-                get { return IExecuteWithSignature<int>("getWidthMils", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.MediaSize.html#asLandscape()"/>
             /// </summary>
             /// <returns><see cref="Android.Print.PrintAttributes.MediaSize"/></returns>
@@ -944,6 +932,30 @@ public bool IsPortrait()
                 return IExecuteWithSignature<bool>("isPortrait", "()Z");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.MediaSize.html#getHeightMils()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetHeightMils()
+            {
+                return IExecuteWithSignature<int>("getHeightMils", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.MediaSize.html#getWidthMils()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetWidthMils()
+            {
+                return IExecuteWithSignature<int>("getWidthMils", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.MediaSize.html#getId()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetId()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.MediaSize.html#getLabel(android.content.pm.PackageManager)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
@@ -995,32 +1007,36 @@ public Resolution(Java.Lang.String arg0, Java.Lang.String arg1, int arg2, int ar
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Resolution.html#getHorizontalDpi()"/> 
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Resolution.html#getHorizontalDpi()"/>
             /// </summary>
-            public int HorizontalDpi
+            /// <returns><see cref="int"/></returns>
+            public int GetHorizontalDpi()
             {
-                get { return IExecuteWithSignature<int>("getHorizontalDpi", "()I"); }
+                return IExecuteWithSignature<int>("getHorizontalDpi", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Resolution.html#getId()"/> 
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Resolution.html#getVerticalDpi()"/>
             /// </summary>
-            public Java.Lang.String Id
+            /// <returns><see cref="int"/></returns>
+            public int GetVerticalDpi()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getVerticalDpi", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Resolution.html#getLabel()"/> 
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Resolution.html#getId()"/>
             /// </summary>
-            public Java.Lang.String Label
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Resolution.html#getVerticalDpi()"/> 
+            /// <see href="https://developer.android.com/reference/android/print/PrintAttributes.Resolution.html#getLabel()"/>
             /// </summary>
-            public int VerticalDpi
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetLabel()
             {
-                get { return IExecuteWithSignature<int>("getVerticalDpi", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Print/PrintDocumentAdapter.cs b/src/net/Netdroid/Generated/Android/Print/PrintDocumentAdapter.cs
index 507bcacb8..f79eb4577 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrintDocumentAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrintDocumentAdapter.cs
@@ -37,6 +37,12 @@ public partial class PrintDocumentAdapter
         #endregion
 
         #region Fields
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#EXTRA_PRINT_PREVIEW"/>
+        /// </summary>
+        public static Java.Lang.String EXTRA_PRINT_PREVIEW { get { if (!_EXTRA_PRINT_PREVIEWReady) { _EXTRA_PRINT_PREVIEWContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_PRINT_PREVIEW"); _EXTRA_PRINT_PREVIEWReady = true; } return _EXTRA_PRINT_PREVIEWContent; } }
+        private static Java.Lang.String _EXTRA_PRINT_PREVIEWContent = default;
+        private static bool _EXTRA_PRINT_PREVIEWReady = false; // this is used because in case of generics 
 
         #endregion
 
@@ -45,30 +51,6 @@ public partial class PrintDocumentAdapter
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="PrintDocumentAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onLayout", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Print.PrintAttributes>>>(OnLayoutEventHandler));
-            AddEventHandler("onWrite", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Print.PageRange[]>>>(OnWriteEventHandler));
-            AddEventHandler("onFinish", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnFinishEventHandler));
-            AddEventHandler("onStart", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnStartEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onLayout(android.print.PrintAttributes,android.print.PrintAttributes,android.os.CancellationSignal,android.print.PrintDocumentAdapter.LayoutResultCallback,android.os.Bundle)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnLayout"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Print.PrintAttributes, Android.Print.PrintAttributes, Android.Os.CancellationSignal, Android.Print.PrintDocumentAdapter.LayoutResultCallback, Android.Os.Bundle> OnOnLayout { get; set; } = null;
-
-        void OnLayoutEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Print.PrintAttributes>> data)
-        {
-            var methodToExecute = (OnOnLayout != null) ? OnOnLayout : OnLayout;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Print.PrintAttributes>(0), data.EventData.GetAt<Android.Os.CancellationSignal>(1), data.EventData.GetAt<Android.Print.PrintDocumentAdapter.LayoutResultCallback>(2), data.EventData.GetAt<Android.Os.Bundle>(3));
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onLayout(android.print.PrintAttributes,android.print.PrintAttributes,android.os.CancellationSignal,android.print.PrintDocumentAdapter.LayoutResultCallback,android.os.Bundle)"/>
         /// </summary>
@@ -77,23 +59,10 @@ void OnLayoutEventHandler(object sender, CLRListenerEventArgs<CLREventData<Andro
         /// <param name="arg2"><see cref="Android.Os.CancellationSignal"/></param>
         /// <param name="arg3"><see cref="Android.Print.PrintDocumentAdapter.LayoutResultCallback"/></param>
         /// <param name="arg4"><see cref="Android.Os.Bundle"/></param>
-        public virtual void OnLayout(Android.Print.PrintAttributes arg0, Android.Print.PrintAttributes arg1, Android.Os.CancellationSignal arg2, Android.Print.PrintDocumentAdapter.LayoutResultCallback arg3, Android.Os.Bundle arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onWrite(android.print.PageRange[],android.os.ParcelFileDescriptor,android.os.CancellationSignal,android.print.PrintDocumentAdapter.WriteResultCallback)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnWrite"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Print.PageRange[], Android.Os.ParcelFileDescriptor, Android.Os.CancellationSignal, Android.Print.PrintDocumentAdapter.WriteResultCallback> OnOnWrite { get; set; } = null;
-
-        void OnWriteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Print.PageRange[]>> data)
+        public void OnLayout(Android.Print.PrintAttributes arg0, Android.Print.PrintAttributes arg1, Android.Os.CancellationSignal arg2, Android.Print.PrintDocumentAdapter.LayoutResultCallback arg3, Android.Os.Bundle arg4)
         {
-            var methodToExecute = (OnOnWrite != null) ? OnOnWrite : OnWrite;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Os.ParcelFileDescriptor>(0), data.EventData.GetAt<Android.Os.CancellationSignal>(1), data.EventData.GetAt<Android.Print.PrintDocumentAdapter.WriteResultCallback>(2));
+            IExecute("onLayout", arg0, arg1, arg2, arg3, arg4);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onWrite(android.print.PageRange[],android.os.ParcelFileDescriptor,android.os.CancellationSignal,android.print.PrintDocumentAdapter.WriteResultCallback)"/>
         /// </summary>
@@ -101,49 +70,23 @@ void OnWriteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Androi
         /// <param name="arg1"><see cref="Android.Os.ParcelFileDescriptor"/></param>
         /// <param name="arg2"><see cref="Android.Os.CancellationSignal"/></param>
         /// <param name="arg3"><see cref="Android.Print.PrintDocumentAdapter.WriteResultCallback"/></param>
-        public virtual void OnWrite(Android.Print.PageRange[] arg0, Android.Os.ParcelFileDescriptor arg1, Android.Os.CancellationSignal arg2, Android.Print.PrintDocumentAdapter.WriteResultCallback arg3)
+        public void OnWrite(Android.Print.PageRange[] arg0, Android.Os.ParcelFileDescriptor arg1, Android.Os.CancellationSignal arg2, Android.Print.PrintDocumentAdapter.WriteResultCallback arg3)
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onFinish()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnFinish"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnFinish { get; set; } = null;
-
-        void OnFinishEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnOnFinish != null) ? OnOnFinish : OnFinish;
-            methodToExecute.Invoke();
+            IExecute("onWrite", arg0, arg1, arg2, arg3);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onFinish()"/>
         /// </summary>
-        public virtual void OnFinish()
+        public void OnFinish()
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onStart()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnStart { get; set; } = null;
-
-        void OnStartEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnOnStart != null) ? OnOnStart : OnStart;
-            methodToExecute.Invoke();
+            IExecuteWithSignature("onFinish", "()V");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onStart()"/>
         /// </summary>
-        public virtual void OnStart()
+        public void OnStart()
         {
-            
+            IExecuteWithSignature("onStart", "()V");
         }
 
         #endregion
@@ -259,74 +202,6 @@ public void OnWriteFinished(Android.Print.PageRange[] arg0)
         #endregion
 
     
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region PrintDocumentAdapterDirect
-    public partial class PrintDocumentAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onLayout(android.print.PrintAttributes,android.print.PrintAttributes,android.os.CancellationSignal,android.print.PrintDocumentAdapter.LayoutResultCallback,android.os.Bundle)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Print.PrintAttributes"/></param>
-        /// <param name="arg1"><see cref="Android.Print.PrintAttributes"/></param>
-        /// <param name="arg2"><see cref="Android.Os.CancellationSignal"/></param>
-        /// <param name="arg3"><see cref="Android.Print.PrintDocumentAdapter.LayoutResultCallback"/></param>
-        /// <param name="arg4"><see cref="Android.Os.Bundle"/></param>
-        public override void OnLayout(Android.Print.PrintAttributes arg0, Android.Print.PrintAttributes arg1, Android.Os.CancellationSignal arg2, Android.Print.PrintDocumentAdapter.LayoutResultCallback arg3, Android.Os.Bundle arg4)
-        {
-            IExecute("onLayout", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onWrite(android.print.PageRange[],android.os.ParcelFileDescriptor,android.os.CancellationSignal,android.print.PrintDocumentAdapter.WriteResultCallback)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Print.PageRange"/></param>
-        /// <param name="arg1"><see cref="Android.Os.ParcelFileDescriptor"/></param>
-        /// <param name="arg2"><see cref="Android.Os.CancellationSignal"/></param>
-        /// <param name="arg3"><see cref="Android.Print.PrintDocumentAdapter.WriteResultCallback"/></param>
-        public override void OnWrite(Android.Print.PageRange[] arg0, Android.Os.ParcelFileDescriptor arg1, Android.Os.CancellationSignal arg2, Android.Print.PrintDocumentAdapter.WriteResultCallback arg3)
-        {
-            IExecute("onWrite", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onFinish()"/>
-        /// </summary>
-        public override void OnFinish()
-        {
-            IExecuteWithSignature("onFinish", "()V");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentAdapter.html#onStart()"/>
-        /// </summary>
-        public override void OnStart()
-        {
-            IExecuteWithSignature("onStart", "()V");
-        }
-
-        #endregion
-
-        #region Nested classes
-
         #endregion
 
         // TODO: complete the class
diff --git a/src/net/Netdroid/Generated/Android/Print/PrintDocumentInfo.cs b/src/net/Netdroid/Generated/Android/Print/PrintDocumentInfo.cs
index 511300d20..5cb08b356 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrintDocumentInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrintDocumentInfo.cs
@@ -76,40 +76,44 @@ public partial class PrintDocumentInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#getContentType()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#describeContents()"/>
         /// </summary>
-        public int ContentType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getContentType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#getDataSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#getContentType()"/>
         /// </summary>
-        public long DataSize
+        /// <returns><see cref="int"/></returns>
+        public int GetContentType()
         {
-            get { return IExecuteWithSignature<long>("getDataSize", "()J"); }
+            return IExecuteWithSignature<int>("getContentType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#getPageCount()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetPageCount()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPageCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#getPageCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#getName()"/>
         /// </summary>
-        public int PageCount
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<int>("getPageCount", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#getDataSize()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetDataSize()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getDataSize", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintDocumentInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Print/PrintJob.cs b/src/net/Netdroid/Generated/Android/Print/PrintJob.cs
index ea71cb494..2596def1d 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrintJob.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrintJob.cs
@@ -46,18 +46,20 @@ public partial class PrintJob
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJob.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintJob.html#getId()"/>
         /// </summary>
-        public Android.Print.PrintJobId Id
+        /// <returns><see cref="Android.Print.PrintJobId"/></returns>
+        public Android.Print.PrintJobId GetId()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintJobId>("getId", "()Landroid/print/PrintJobId;"); }
+            return IExecuteWithSignature<Android.Print.PrintJobId>("getId", "()Landroid/print/PrintJobId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJob.html#getInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintJob.html#getInfo()"/>
         /// </summary>
-        public Android.Print.PrintJobInfo Info
+        /// <returns><see cref="Android.Print.PrintJobInfo"/></returns>
+        public Android.Print.PrintJobInfo GetInfo()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintJobInfo>("getInfo", "()Landroid/print/PrintJobInfo;"); }
+            return IExecuteWithSignature<Android.Print.PrintJobInfo>("getInfo", "()Landroid/print/PrintJobInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintJob.html#isBlocked()"/>
diff --git a/src/net/Netdroid/Generated/Android/Print/PrintJobInfo.cs b/src/net/Netdroid/Generated/Android/Print/PrintJobInfo.cs
index f62ee2fe5..da4720199 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrintJobInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrintJobInfo.cs
@@ -94,60 +94,36 @@ public partial class PrintJobInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getPages()"/>
         /// </summary>
-        public Android.Print.PrintAttributes Attributes
+        /// <returns><see cref="Android.Print.PageRange"/></returns>
+        public Android.Print.PageRange[] GetPages()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintAttributes>("getAttributes", "()Landroid/print/PrintAttributes;"); }
+            return IExecuteWithSignatureArray<Android.Print.PageRange>("getPages", "()[Landroid/print/PageRange;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getCopies()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getAttributes()"/>
         /// </summary>
-        public int Copies
+        /// <returns><see cref="Android.Print.PrintAttributes"/></returns>
+        public Android.Print.PrintAttributes GetAttributes()
         {
-            get { return IExecuteWithSignature<int>("getCopies", "()I"); }
+            return IExecuteWithSignature<Android.Print.PrintAttributes>("getAttributes", "()Landroid/print/PrintAttributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getCreationTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getPrinterId()"/>
         /// </summary>
-        public long CreationTime
+        /// <returns><see cref="Android.Print.PrinterId"/></returns>
+        public Android.Print.PrinterId GetPrinterId()
         {
-            get { return IExecuteWithSignature<long>("getCreationTime", "()J"); }
+            return IExecuteWithSignature<Android.Print.PrinterId>("getPrinterId", "()Landroid/print/PrinterId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getId()"/>
         /// </summary>
-        public Android.Print.PrintJobId Id
+        /// <returns><see cref="Android.Print.PrintJobId"/></returns>
+        public Android.Print.PrintJobId GetId()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintJobId>("getId", "()Landroid/print/PrintJobId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getLabel()"/> 
-        /// </summary>
-        public Java.Lang.String Label
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getPages()"/> 
-        /// </summary>
-        public Android.Print.PageRange[] Pages
-        {
-            get { return IExecuteWithSignatureArray<Android.Print.PageRange>("getPages", "()[Landroid/print/PageRange;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getPrinterId()"/> 
-        /// </summary>
-        public Android.Print.PrinterId PrinterId
-        {
-            get { return IExecuteWithSignature<Android.Print.PrinterId>("getPrinterId", "()Landroid/print/PrinterId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getState()"/> 
-        /// </summary>
-        public int State
-        {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<Android.Print.PrintJobId>("getId", "()Landroid/print/PrintJobId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#hasAdvancedOption(java.lang.String)"/>
@@ -176,6 +152,22 @@ public int GetAdvancedIntOption(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getAdvancedIntOption", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getCopies()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCopies()
+        {
+            return IExecuteWithSignature<int>("getCopies", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
+        {
+            return IExecuteWithSignature<int>("getState", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getAdvancedStringOption(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -185,6 +177,22 @@ public Java.Lang.String GetAdvancedStringOption(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getAdvancedStringOption", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLabel", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#getCreationTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetCreationTime()
+        {
+            return IExecuteWithSignature<long>("getCreationTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintJobInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Print/PrintManager.cs b/src/net/Netdroid/Generated/Android/Print/PrintManager.cs
index 9a533c97f..0914d4750 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrintManager.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrintManager.cs
@@ -46,13 +46,6 @@ public partial class PrintManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrintManager.html#getPrintJobs()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Print.PrintJob> PrintJobs
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Print.PrintJob>>("getPrintJobs", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrintManager.html#print(java.lang.String,android.print.PrintDocumentAdapter,android.print.PrintAttributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -72,6 +65,14 @@ public bool IsPrintServiceEnabled(Android.Content.ComponentName arg0)
         {
             return IExecuteWithSignature<bool>("isPrintServiceEnabled", "(Landroid/content/ComponentName;)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/print/PrintManager.html#getPrintJobs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Print.PrintJob> GetPrintJobs()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Print.PrintJob>>("getPrintJobs", "()Ljava/util/List;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Print/PrinterCapabilitiesInfo.cs b/src/net/Netdroid/Generated/Android/Print/PrinterCapabilitiesInfo.cs
index 775732b21..5ecee64ef 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrinterCapabilitiesInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrinterCapabilitiesInfo.cs
@@ -52,54 +52,60 @@ public partial class PrinterCapabilitiesInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getColorModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getDefaults()"/>
         /// </summary>
-        public int ColorModes
+        /// <returns><see cref="Android.Print.PrintAttributes"/></returns>
+        public Android.Print.PrintAttributes GetDefaults()
         {
-            get { return IExecuteWithSignature<int>("getColorModes", "()I"); }
+            return IExecuteWithSignature<Android.Print.PrintAttributes>("getDefaults", "()Landroid/print/PrintAttributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getDefaults()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getMinMargins()"/>
         /// </summary>
-        public Android.Print.PrintAttributes Defaults
+        /// <returns><see cref="Android.Print.PrintAttributes.Margins"/></returns>
+        public Android.Print.PrintAttributes.Margins GetMinMargins()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintAttributes>("getDefaults", "()Landroid/print/PrintAttributes;"); }
+            return IExecuteWithSignature<Android.Print.PrintAttributes.Margins>("getMinMargins", "()Landroid/print/PrintAttributes$Margins;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getDuplexModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#describeContents()"/>
         /// </summary>
-        public int DuplexModes
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDuplexModes", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getMediaSizes()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getColorModes()"/>
         /// </summary>
-        public Java.Util.List<Android.Print.PrintAttributes.MediaSize> MediaSizes
+        /// <returns><see cref="int"/></returns>
+        public int GetColorModes()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Print.PrintAttributes.MediaSize>>("getMediaSizes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getColorModes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getMinMargins()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getDuplexModes()"/>
         /// </summary>
-        public Android.Print.PrintAttributes.Margins MinMargins
+        /// <returns><see cref="int"/></returns>
+        public int GetDuplexModes()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintAttributes.Margins>("getMinMargins", "()Landroid/print/PrintAttributes$Margins;"); }
+            return IExecuteWithSignature<int>("getDuplexModes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getResolutions()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getMediaSizes()"/>
         /// </summary>
-        public Java.Util.List<Android.Print.PrintAttributes.Resolution> Resolutions
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Print.PrintAttributes.MediaSize> GetMediaSizes()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Print.PrintAttributes.Resolution>>("getResolutions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Print.PrintAttributes.MediaSize>>("getMediaSizes", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#getResolutions()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Print.PrintAttributes.Resolution> GetResolutions()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Print.PrintAttributes.Resolution>>("getResolutions", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrinterCapabilitiesInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Print/PrinterId.cs b/src/net/Netdroid/Generated/Android/Print/PrinterId.cs
index 76619d819..588c8f74f 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrinterId.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrinterId.cs
@@ -52,13 +52,6 @@ public partial class PrinterId
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterId.html#getLocalId()"/> 
-        /// </summary>
-        public Java.Lang.String LocalId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocalId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrinterId.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -67,6 +60,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/print/PrinterId.html#getLocalId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLocalId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLocalId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrinterId.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Print/PrinterInfo.cs b/src/net/Netdroid/Generated/Android/Print/PrinterInfo.cs
index 7bb0094fb..f850d3a8c 100644
--- a/src/net/Netdroid/Generated/Android/Print/PrinterInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Print/PrinterInfo.cs
@@ -70,47 +70,52 @@ public partial class PrinterInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getCapabilities()"/>
         /// </summary>
-        public Android.Print.PrinterCapabilitiesInfo Capabilities
+        /// <returns><see cref="Android.Print.PrinterCapabilitiesInfo"/></returns>
+        public Android.Print.PrinterCapabilitiesInfo GetCapabilities()
         {
-            get { return IExecuteWithSignature<Android.Print.PrinterCapabilitiesInfo>("getCapabilities", "()Landroid/print/PrinterCapabilitiesInfo;"); }
+            return IExecuteWithSignature<Android.Print.PrinterCapabilitiesInfo>("getCapabilities", "()Landroid/print/PrinterCapabilitiesInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getId()"/>
         /// </summary>
-        public Java.Lang.String Description
+        /// <returns><see cref="Android.Print.PrinterId"/></returns>
+        public Android.Print.PrinterId GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Print.PrinterId>("getId", "()Landroid/print/PrinterId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#describeContents()"/>
         /// </summary>
-        public Android.Print.PrinterId Id
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Print.PrinterId>("getId", "()Landroid/print/PrinterId;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getStatus()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetStatus()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getDescription()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescription()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDescription", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/print/PrinterInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Printservice/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Printservice/AllPackageClasses.cs
index 4f634d59a..3f5d8a5a5 100644
--- a/src/net/Netdroid/Generated/Android/Printservice/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Printservice/AllPackageClasses.cs
@@ -124,12 +124,12 @@ public partial class PrinterDiscoverySession : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrinterDiscoverySession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrinterDiscoverySession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrinterDiscoverySession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrinterDiscoverySession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrinterDiscoverySession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrinterDiscoverySession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -214,12 +214,12 @@ public partial class PrintService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrintService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrintService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrintService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrintService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrintService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrintService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Printservice/PrintDocument.cs b/src/net/Netdroid/Generated/Android/Printservice/PrintDocument.cs
index abbe3549e..d0777ca7b 100644
--- a/src/net/Netdroid/Generated/Android/Printservice/PrintDocument.cs
+++ b/src/net/Netdroid/Generated/Android/Printservice/PrintDocument.cs
@@ -46,18 +46,20 @@ public partial class PrintDocument
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrintDocument.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/printservice/PrintDocument.html#getData()"/>
         /// </summary>
-        public Android.Os.ParcelFileDescriptor Data
+        /// <returns><see cref="Android.Os.ParcelFileDescriptor"/></returns>
+        public Android.Os.ParcelFileDescriptor GetData()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("getData", "()Landroid/os/ParcelFileDescriptor;"); }
+            return IExecuteWithSignature<Android.Os.ParcelFileDescriptor>("getData", "()Landroid/os/ParcelFileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrintDocument.html#getInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/printservice/PrintDocument.html#getInfo()"/>
         /// </summary>
-        public Android.Print.PrintDocumentInfo Info
+        /// <returns><see cref="Android.Print.PrintDocumentInfo"/></returns>
+        public Android.Print.PrintDocumentInfo GetInfo()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintDocumentInfo>("getInfo", "()Landroid/print/PrintDocumentInfo;"); }
+            return IExecuteWithSignature<Android.Print.PrintDocumentInfo>("getInfo", "()Landroid/print/PrintDocumentInfo;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Printservice/PrintJob.cs b/src/net/Netdroid/Generated/Android/Printservice/PrintJob.cs
index 00b26c886..4e8db7cad 100644
--- a/src/net/Netdroid/Generated/Android/Printservice/PrintJob.cs
+++ b/src/net/Netdroid/Generated/Android/Printservice/PrintJob.cs
@@ -46,32 +46,28 @@ public partial class PrintJob
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#getDocument()"/> 
+        /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#getId()"/>
         /// </summary>
-        public Android.Printservice.PrintDocument Document
+        /// <returns><see cref="Android.Print.PrintJobId"/></returns>
+        public Android.Print.PrintJobId GetId()
         {
-            get { return IExecuteWithSignature<Android.Printservice.PrintDocument>("getDocument", "()Landroid/printservice/PrintDocument;"); }
+            return IExecuteWithSignature<Android.Print.PrintJobId>("getId", "()Landroid/print/PrintJobId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#getInfo()"/>
         /// </summary>
-        public Android.Print.PrintJobId Id
+        /// <returns><see cref="Android.Print.PrintJobInfo"/></returns>
+        public Android.Print.PrintJobInfo GetInfo()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintJobId>("getId", "()Landroid/print/PrintJobId;"); }
+            return IExecuteWithSignature<Android.Print.PrintJobInfo>("getInfo", "()Landroid/print/PrintJobInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#getInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#getDocument()"/>
         /// </summary>
-        public Android.Print.PrintJobInfo Info
+        /// <returns><see cref="Android.Printservice.PrintDocument"/></returns>
+        public Android.Printservice.PrintDocument GetDocument()
         {
-            get { return IExecuteWithSignature<Android.Print.PrintJobInfo>("getInfo", "()Landroid/print/PrintJobInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#getTag()"/> 
-        /// </summary>
-        public Java.Lang.String Tag
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Printservice.PrintDocument>("getDocument", "()Landroid/printservice/PrintDocument;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#block(java.lang.String)"/>
@@ -200,6 +196,14 @@ public Java.Lang.String GetAdvancedStringOption(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getAdvancedStringOption", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#getTag()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTag()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/printservice/PrintJob.html#setProgress(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Printservice/PrintService.cs b/src/net/Netdroid/Generated/Android/Printservice/PrintService.cs
index 574117792..5bf67ff6c 100644
--- a/src/net/Netdroid/Generated/Android/Printservice/PrintService.cs
+++ b/src/net/Netdroid/Generated/Android/Printservice/PrintService.cs
@@ -88,13 +88,6 @@ public partial class PrintService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrintService.html#getActivePrintJobs()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Printservice.PrintJob> ActivePrintJobs
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Printservice.PrintJob>>("getActivePrintJobs", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/printservice/PrintService.html#generatePrinterId(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -103,6 +96,14 @@ public Android.Print.PrinterId GeneratePrinterId(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Print.PrinterId>("generatePrinterId", "(Ljava/lang/String;)Landroid/print/PrinterId;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/printservice/PrintService.html#getActivePrintJobs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Printservice.PrintJob> GetActivePrintJobs()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Printservice.PrintJob>>("getActivePrintJobs", "()Ljava/util/List;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Printservice/PrinterDiscoverySession.cs b/src/net/Netdroid/Generated/Android/Printservice/PrinterDiscoverySession.cs
index 86dff9b0c..040b387af 100644
--- a/src/net/Netdroid/Generated/Android/Printservice/PrinterDiscoverySession.cs
+++ b/src/net/Netdroid/Generated/Android/Printservice/PrinterDiscoverySession.cs
@@ -46,20 +46,6 @@ public partial class PrinterDiscoverySession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrinterDiscoverySession.html#getPrinters()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Print.PrinterInfo> Printers
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Print.PrinterInfo>>("getPrinters", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/printservice/PrinterDiscoverySession.html#getTrackedPrinters()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Print.PrinterId> TrackedPrinters
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Print.PrinterId>>("getTrackedPrinters", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/printservice/PrinterDiscoverySession.html#onDestroy()"/>
         /// </summary>
         public void OnDestroy()
@@ -122,6 +108,22 @@ public bool IsPrinterDiscoveryStarted()
             return IExecuteWithSignature<bool>("isPrinterDiscoveryStarted", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/printservice/PrinterDiscoverySession.html#getTrackedPrinters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Print.PrinterId> GetTrackedPrinters()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Print.PrinterId>>("getTrackedPrinters", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/printservice/PrinterDiscoverySession.html#getPrinters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Print.PrinterInfo> GetPrinters()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Print.PrinterInfo>>("getPrinters", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/printservice/PrinterDiscoverySession.html#addPrinters(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Provider/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Provider/AllPackageClasses.cs
index 9de147d11..a0750d189 100644
--- a/src/net/Netdroid/Generated/Android/Provider/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class BaseColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BaseC
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BaseColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BaseColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BaseColumns() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BaseColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BaseColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BaseColumns(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1006,12 +1006,12 @@ public partial class CloudMediaProvider : Android.Content.ContentProvider
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CloudMediaProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CloudMediaProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CloudMediaProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CloudMediaProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CloudMediaProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CloudMediaProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1048,12 +1048,12 @@ public partial class CloudMediaSurfaceController : MASES.JCOBridge.C2JBridge.JVM
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CloudMediaSurfaceController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CloudMediaSurfaceController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CloudMediaSurfaceController() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CloudMediaSurfaceController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CloudMediaSurfaceController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CloudMediaSurfaceController(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1312,7 +1312,7 @@ public MediaColumns(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/provider/Contacts.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Contacts : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Contacts>
     {
         const string _bridgeClassName = "android.provider.Contacts";
@@ -1353,7 +1353,7 @@ public Contacts(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ContactMethods : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ContactMethods>
         {
             const string _bridgeClassName = "android.provider.Contacts$ContactMethods";
@@ -1398,19 +1398,19 @@ public ContactMethods(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ContactMethodsColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ContactMethodsColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$ContactMethodsColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ContactMethodsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ContactMethodsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ContactMethodsColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ContactMethodsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ContactMethodsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ContactMethodsColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1445,7 +1445,7 @@ public ContactMethodsColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.Extensions.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Extensions : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Extensions>
         {
             const string _bridgeClassName = "android.provider.Contacts$Extensions";
@@ -1490,19 +1490,19 @@ public Extensions(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.ExtensionsColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ExtensionsColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ExtensionsColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$ExtensionsColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ExtensionsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ExtensionsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ExtensionsColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ExtensionsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ExtensionsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ExtensionsColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1537,7 +1537,7 @@ public ExtensionsColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class GroupMembership : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GroupMembership>
         {
             const string _bridgeClassName = "android.provider.Contacts$GroupMembership";
@@ -1582,7 +1582,7 @@ public GroupMembership(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.Groups.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Groups : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Groups>
         {
             const string _bridgeClassName = "android.provider.Contacts$Groups";
@@ -1627,19 +1627,19 @@ public Groups(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupsColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class GroupsColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GroupsColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$GroupsColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("GroupsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GroupsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GroupsColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("GroupsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GroupsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GroupsColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1674,7 +1674,7 @@ public GroupsColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Intents : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Intents>
         {
             const string _bridgeClassName = "android.provider.Contacts$Intents";
@@ -1715,7 +1715,7 @@ public Intents(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class UI : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UI>
             {
                 const string _bridgeClassName = "android.provider.Contacts$Intents$UI";
@@ -1760,7 +1760,7 @@ public UI(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class Insert : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Insert>
             {
                 const string _bridgeClassName = "android.provider.Contacts$Intents$Insert";
@@ -1809,19 +1809,19 @@ public Insert(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OrganizationColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OrganizationColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$OrganizationColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OrganizationColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OrganizationColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OrganizationColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OrganizationColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OrganizationColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OrganizationColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1856,7 +1856,7 @@ public OrganizationColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.Organizations.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Organizations : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Organizations>
         {
             const string _bridgeClassName = "android.provider.Contacts$Organizations";
@@ -1901,7 +1901,7 @@ public Organizations(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class People : MASES.JCOBridge.C2JBridge.JVMBridgeBase<People>
         {
             const string _bridgeClassName = "android.provider.Contacts$People";
@@ -1942,7 +1942,7 @@ public People(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.Phones.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class Phones : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Phones>
             {
                 const string _bridgeClassName = "android.provider.Contacts$People$Phones";
@@ -1987,7 +1987,7 @@ public Phones(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.Extensions.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class Extensions : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Extensions>
             {
                 const string _bridgeClassName = "android.provider.Contacts$People$Extensions";
@@ -2032,7 +2032,7 @@ public Extensions(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.ContactMethods.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class ContactMethods : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ContactMethods>
             {
                 const string _bridgeClassName = "android.provider.Contacts$People$ContactMethods";
@@ -2081,19 +2081,19 @@ public ContactMethods(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PeopleColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PeopleColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$PeopleColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PeopleColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PeopleColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PeopleColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PeopleColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PeopleColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PeopleColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2128,7 +2128,7 @@ public PeopleColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.Phones.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Phones : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Phones>
         {
             const string _bridgeClassName = "android.provider.Contacts$Phones";
@@ -2173,19 +2173,19 @@ public Phones(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PhonesColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PhonesColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$PhonesColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PhonesColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PhonesColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PhonesColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PhonesColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PhonesColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PhonesColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2220,7 +2220,7 @@ public PhonesColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.Photos.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Photos : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Photos>
         {
             const string _bridgeClassName = "android.provider.Contacts$Photos";
@@ -2265,19 +2265,19 @@ public Photos(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhotosColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PhotosColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PhotosColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$PhotosColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PhotosColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PhotosColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PhotosColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PhotosColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PhotosColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PhotosColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2312,19 +2312,19 @@ public PhotosColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PresenceColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PresenceColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$PresenceColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PresenceColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PresenceColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PresenceColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PresenceColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PresenceColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PresenceColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2359,7 +2359,7 @@ public PresenceColumns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.Settings.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Settings : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Settings>
         {
             const string _bridgeClassName = "android.provider.Contacts$Settings";
@@ -2404,19 +2404,19 @@ public Settings(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.SettingsColumns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class SettingsColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SettingsColumns>
         {
             const string _bridgeClassName = "android.provider.Contacts$SettingsColumns";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SettingsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SettingsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SettingsColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SettingsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SettingsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SettingsColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3333,12 +3333,12 @@ public partial class BaseTypes : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BaseTyp
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("BaseTypes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("BaseTypes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public BaseTypes() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("BaseTypes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("BaseTypes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public BaseTypes(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3685,7 +3685,7 @@ public Data(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.DataUsageFeedback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class DataUsageFeedback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DataUsageFeedback>
         {
             const string _bridgeClassName = "android.provider.ContactsContract$DataUsageFeedback";
@@ -3824,12 +3824,12 @@ public partial class DisplayNameSources : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("DisplayNameSources class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DisplayNameSources class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DisplayNameSources() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("DisplayNameSources class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DisplayNameSources class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DisplayNameSources(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3914,12 +3914,12 @@ public partial class FullNameStyle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ful
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FullNameStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FullNameStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FullNameStyle() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FullNameStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FullNameStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FullNameStyle(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4136,12 +4136,12 @@ public partial class PhoneticNameStyle : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PhoneticNameStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PhoneticNameStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PhoneticNameStyle() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PhoneticNameStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PhoneticNameStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PhoneticNameStyle(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4220,7 +4220,7 @@ public PinnedPositions(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.Presence.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Presence : Android.Provider.ContactsContract.StatusUpdates
         {
             const string _bridgeClassName = "android.provider.ContactsContract$Presence";
@@ -5111,12 +5111,12 @@ public partial class DocumentsProvider : Android.Content.ContentProvider
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DocumentsProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentsProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentsProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DocumentsProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentsProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentsProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5151,7 +5151,7 @@ public DocumentsProvider(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FontRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FontRequest>
     {
         const string _bridgeClassName = "android.provider.FontRequest";
@@ -5196,7 +5196,7 @@ public FontRequest(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/provider/FontsContract.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FontsContract : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FontsContract>
     {
         const string _bridgeClassName = "android.provider.FontsContract";
@@ -5237,7 +5237,7 @@ public FontsContract(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Columns : Android.Provider.BaseColumns
         {
             const string _bridgeClassName = "android.provider.FontsContract$Columns";
@@ -5282,7 +5282,7 @@ public Columns(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class FontFamilyResult : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FontFamilyResult>
         {
             const string _bridgeClassName = "android.provider.FontsContract$FontFamilyResult";
@@ -5327,7 +5327,7 @@ public FontFamilyResult(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class FontInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FontInfo>
         {
             const string _bridgeClassName = "android.provider.FontsContract$FontInfo";
@@ -5372,7 +5372,7 @@ public FontInfo(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class FontRequestCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FontRequestCallback>
         {
             const string _bridgeClassName = "android.provider.FontsContract$FontRequestCallback";
@@ -5421,7 +5421,7 @@ public FontRequestCallback(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LiveFolders : Android.Provider.BaseColumns
     {
         const string _bridgeClassName = "android.provider.LiveFolders";
@@ -5590,19 +5590,19 @@ public Radio(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.PlaylistsColumns.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class PlaylistsColumns : Android.Provider.MediaStore.MediaColumns
             {
                 const string _bridgeClassName = "android.provider.MediaStore$Audio$PlaylistsColumns";
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("PlaylistsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("PlaylistsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public PlaylistsColumns() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("PlaylistsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("PlaylistsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public PlaylistsColumns(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5637,7 +5637,7 @@ public PlaylistsColumns(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class Playlists : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Playlists>
             {
                 const string _bridgeClassName = "android.provider.MediaStore$Audio$Playlists";
@@ -5678,7 +5678,7 @@ public Playlists(params object[] args) : base(args) { }
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.Members.html"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public partial class Members : Android.Provider.MediaStore.Audio.AudioColumns
                 {
                     const string _bridgeClassName = "android.provider.MediaStore$Audio$Playlists$Members";
@@ -5777,12 +5777,12 @@ public partial class GenresColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Gen
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("GenresColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("GenresColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public GenresColumns() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("GenresColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("GenresColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public GenresColumns(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5911,12 +5911,12 @@ public partial class AudioColumns : Android.Provider.MediaStore.MediaColumns
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("AudioColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("AudioColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public AudioColumns() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("AudioColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("AudioColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public AudioColumns(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6045,12 +6045,12 @@ public partial class ArtistColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Art
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("ArtistColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("ArtistColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public ArtistColumns() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("ArtistColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("ArtistColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public ArtistColumns(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6135,12 +6135,12 @@ public partial class AlbumColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Albu
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("AlbumColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("AlbumColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public AlbumColumns() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("AlbumColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("AlbumColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public AlbumColumns(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6185,12 +6185,12 @@ public partial class DownloadColumns : Android.Provider.MediaStore.MediaColumns
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("DownloadColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DownloadColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DownloadColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("DownloadColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("DownloadColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public DownloadColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6315,12 +6315,12 @@ public partial class FileColumns : Android.Provider.MediaStore.MediaColumns
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("FileColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("FileColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public FileColumns() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("FileColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("FileColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public FileColumns(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6399,7 +6399,7 @@ public Images(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class Thumbnails : Android.Provider.BaseColumns
             {
                 const string _bridgeClassName = "android.provider.MediaStore$Images$Thumbnails";
@@ -6494,12 +6494,12 @@ public partial class ImageColumns : Android.Provider.MediaStore.MediaColumns
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("ImageColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("ImageColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public ImageColumns() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("ImageColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("ImageColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public ImageColumns(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6544,12 +6544,12 @@ public partial class MediaColumns : Android.Provider.BaseColumns
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("MediaColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("MediaColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public MediaColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("MediaColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("MediaColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public MediaColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6674,12 +6674,12 @@ public partial class VideoColumns : Android.Provider.MediaStore.MediaColumns
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("VideoColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("VideoColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public VideoColumns() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("VideoColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("VideoColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public VideoColumns(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6714,7 +6714,7 @@ public VideoColumns(params object[] args) : base(args) { }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public partial class Thumbnails : Android.Provider.BaseColumns
             {
                 const string _bridgeClassName = "android.provider.MediaStore$Video$Thumbnails";
@@ -6817,12 +6817,12 @@ public partial class OpenableColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBase<O
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OpenableColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OpenableColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OpenableColumns() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OpenableColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OpenableColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OpenableColumns(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7404,12 +7404,12 @@ public partial class Columns : Android.Provider.BaseColumns
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Columns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Columns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Columns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Columns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Columns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Columns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7582,12 +7582,12 @@ public partial class BaseMmsColumns : Android.Provider.BaseColumns
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("BaseMmsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BaseMmsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BaseMmsColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("BaseMmsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("BaseMmsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public BaseMmsColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7628,12 +7628,12 @@ public partial class CanonicalAddressesColumns : Android.Provider.BaseColumns
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CanonicalAddressesColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CanonicalAddressesColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CanonicalAddressesColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CanonicalAddressesColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CanonicalAddressesColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CanonicalAddressesColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8598,12 +8598,12 @@ public partial class TextBasedSmsColumns : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TextBasedSmsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TextBasedSmsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TextBasedSmsColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TextBasedSmsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TextBasedSmsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TextBasedSmsColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8688,12 +8688,12 @@ public partial class ThreadsColumns : Android.Provider.BaseColumns
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ThreadsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ThreadsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ThreadsColumns() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ThreadsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ThreadsColumns class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ThreadsColumns(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Provider/Contacts.cs b/src/net/Netdroid/Generated/Android/Provider/Contacts.cs
index cb0dacf42..7815a0cea 100644
--- a/src/net/Netdroid/Generated/Android/Provider/Contacts.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/Contacts.cs
@@ -40,49 +40,49 @@ public partial class Contacts
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.html#CONTENT_URI"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
         private static Android.Net.Uri _CONTENT_URIContent = default;
         private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.html#KIND_EMAIL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KIND_EMAIL { get { if (!_KIND_EMAILReady) { _KIND_EMAILContent = SGetField<int>(LocalBridgeClazz, "KIND_EMAIL"); _KIND_EMAILReady = true; } return _KIND_EMAILContent; } }
         private static int _KIND_EMAILContent = default;
         private static bool _KIND_EMAILReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.html#KIND_IM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KIND_IM { get { if (!_KIND_IMReady) { _KIND_IMContent = SGetField<int>(LocalBridgeClazz, "KIND_IM"); _KIND_IMReady = true; } return _KIND_IMContent; } }
         private static int _KIND_IMContent = default;
         private static bool _KIND_IMReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.html#KIND_ORGANIZATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KIND_ORGANIZATION { get { if (!_KIND_ORGANIZATIONReady) { _KIND_ORGANIZATIONContent = SGetField<int>(LocalBridgeClazz, "KIND_ORGANIZATION"); _KIND_ORGANIZATIONReady = true; } return _KIND_ORGANIZATIONContent; } }
         private static int _KIND_ORGANIZATIONContent = default;
         private static bool _KIND_ORGANIZATIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.html#KIND_PHONE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KIND_PHONE { get { if (!_KIND_PHONEReady) { _KIND_PHONEContent = SGetField<int>(LocalBridgeClazz, "KIND_PHONE"); _KIND_PHONEReady = true; } return _KIND_PHONEContent; } }
         private static int _KIND_PHONEContent = default;
         private static bool _KIND_PHONEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.html#KIND_POSTAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int KIND_POSTAL { get { if (!_KIND_POSTALReady) { _KIND_POSTALContent = SGetField<int>(LocalBridgeClazz, "KIND_POSTAL"); _KIND_POSTALReady = true; } return _KIND_POSTALContent; } }
         private static int _KIND_POSTALContent = default;
         private static bool _KIND_POSTALReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Contacts.html#AUTHORITY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String AUTHORITY { get { if (!_AUTHORITYReady) { _AUTHORITYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "AUTHORITY"); _AUTHORITYReady = true; } return _AUTHORITYContent; } }
         private static Java.Lang.String _AUTHORITYContent = default;
         private static bool _AUTHORITYReady = false; // this is used because in case of generics 
@@ -117,140 +117,140 @@ public partial class ContactMethods : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#CONTENT_EMAIL_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_EMAIL_URI { get { if (!_CONTENT_EMAIL_URIReady) { _CONTENT_EMAIL_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_EMAIL_URI"); _CONTENT_EMAIL_URIReady = true; } return _CONTENT_EMAIL_URIContent; } }
             private static Android.Net.Uri _CONTENT_EMAIL_URIContent = default;
             private static bool _CONTENT_EMAIL_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PROTOCOL_AIM"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PROTOCOL_AIM { get { if (!_PROTOCOL_AIMReady) { _PROTOCOL_AIMContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_AIM"); _PROTOCOL_AIMReady = true; } return _PROTOCOL_AIMContent; } }
             private static int _PROTOCOL_AIMContent = default;
             private static bool _PROTOCOL_AIMReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PROTOCOL_GOOGLE_TALK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PROTOCOL_GOOGLE_TALK { get { if (!_PROTOCOL_GOOGLE_TALKReady) { _PROTOCOL_GOOGLE_TALKContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_GOOGLE_TALK"); _PROTOCOL_GOOGLE_TALKReady = true; } return _PROTOCOL_GOOGLE_TALKContent; } }
             private static int _PROTOCOL_GOOGLE_TALKContent = default;
             private static bool _PROTOCOL_GOOGLE_TALKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PROTOCOL_ICQ"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PROTOCOL_ICQ { get { if (!_PROTOCOL_ICQReady) { _PROTOCOL_ICQContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_ICQ"); _PROTOCOL_ICQReady = true; } return _PROTOCOL_ICQContent; } }
             private static int _PROTOCOL_ICQContent = default;
             private static bool _PROTOCOL_ICQReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PROTOCOL_JABBER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PROTOCOL_JABBER { get { if (!_PROTOCOL_JABBERReady) { _PROTOCOL_JABBERContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_JABBER"); _PROTOCOL_JABBERReady = true; } return _PROTOCOL_JABBERContent; } }
             private static int _PROTOCOL_JABBERContent = default;
             private static bool _PROTOCOL_JABBERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PROTOCOL_MSN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PROTOCOL_MSN { get { if (!_PROTOCOL_MSNReady) { _PROTOCOL_MSNContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_MSN"); _PROTOCOL_MSNReady = true; } return _PROTOCOL_MSNContent; } }
             private static int _PROTOCOL_MSNContent = default;
             private static bool _PROTOCOL_MSNReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PROTOCOL_QQ"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PROTOCOL_QQ { get { if (!_PROTOCOL_QQReady) { _PROTOCOL_QQContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_QQ"); _PROTOCOL_QQReady = true; } return _PROTOCOL_QQContent; } }
             private static int _PROTOCOL_QQContent = default;
             private static bool _PROTOCOL_QQReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PROTOCOL_SKYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PROTOCOL_SKYPE { get { if (!_PROTOCOL_SKYPEReady) { _PROTOCOL_SKYPEContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_SKYPE"); _PROTOCOL_SKYPEReady = true; } return _PROTOCOL_SKYPEContent; } }
             private static int _PROTOCOL_SKYPEContent = default;
             private static bool _PROTOCOL_SKYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PROTOCOL_YAHOO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int PROTOCOL_YAHOO { get { if (!_PROTOCOL_YAHOOReady) { _PROTOCOL_YAHOOContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_YAHOO"); _PROTOCOL_YAHOOReady = true; } return _PROTOCOL_YAHOOContent; } }
             private static int _PROTOCOL_YAHOOContent = default;
             private static bool _PROTOCOL_YAHOOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#CONTENT_EMAIL_ITEM_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_EMAIL_ITEM_TYPE { get { if (!_CONTENT_EMAIL_ITEM_TYPEReady) { _CONTENT_EMAIL_ITEM_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_EMAIL_ITEM_TYPE"); _CONTENT_EMAIL_ITEM_TYPEReady = true; } return _CONTENT_EMAIL_ITEM_TYPEContent; } }
             private static Java.Lang.String _CONTENT_EMAIL_ITEM_TYPEContent = default;
             private static bool _CONTENT_EMAIL_ITEM_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#CONTENT_EMAIL_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_EMAIL_TYPE { get { if (!_CONTENT_EMAIL_TYPEReady) { _CONTENT_EMAIL_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_EMAIL_TYPE"); _CONTENT_EMAIL_TYPEReady = true; } return _CONTENT_EMAIL_TYPEContent; } }
             private static Java.Lang.String _CONTENT_EMAIL_TYPEContent = default;
             private static bool _CONTENT_EMAIL_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#CONTENT_IM_ITEM_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_IM_ITEM_TYPE { get { if (!_CONTENT_IM_ITEM_TYPEReady) { _CONTENT_IM_ITEM_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_IM_ITEM_TYPE"); _CONTENT_IM_ITEM_TYPEReady = true; } return _CONTENT_IM_ITEM_TYPEContent; } }
             private static Java.Lang.String _CONTENT_IM_ITEM_TYPEContent = default;
             private static bool _CONTENT_IM_ITEM_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#CONTENT_POSTAL_ITEM_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_POSTAL_ITEM_TYPE { get { if (!_CONTENT_POSTAL_ITEM_TYPEReady) { _CONTENT_POSTAL_ITEM_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_POSTAL_ITEM_TYPE"); _CONTENT_POSTAL_ITEM_TYPEReady = true; } return _CONTENT_POSTAL_ITEM_TYPEContent; } }
             private static Java.Lang.String _CONTENT_POSTAL_ITEM_TYPEContent = default;
             private static bool _CONTENT_POSTAL_ITEM_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#CONTENT_POSTAL_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_POSTAL_TYPE { get { if (!_CONTENT_POSTAL_TYPEReady) { _CONTENT_POSTAL_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_POSTAL_TYPE"); _CONTENT_POSTAL_TYPEReady = true; } return _CONTENT_POSTAL_TYPEContent; } }
             private static Java.Lang.String _CONTENT_POSTAL_TYPEContent = default;
             private static bool _CONTENT_POSTAL_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#CONTENT_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_TYPE { get { if (!_CONTENT_TYPEReady) { _CONTENT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_TYPE"); _CONTENT_TYPEReady = true; } return _CONTENT_TYPEContent; } }
             private static Java.Lang.String _CONTENT_TYPEContent = default;
             private static bool _CONTENT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#PERSON_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PERSON_ID { get { if (!_PERSON_IDReady) { _PERSON_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PERSON_ID"); _PERSON_IDReady = true; } return _PERSON_IDContent; } }
             private static Java.Lang.String _PERSON_IDContent = default;
             private static bool _PERSON_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#POSTAL_LOCATION_LATITUDE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String POSTAL_LOCATION_LATITUDE { get { if (!_POSTAL_LOCATION_LATITUDEReady) { _POSTAL_LOCATION_LATITUDEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "POSTAL_LOCATION_LATITUDE"); _POSTAL_LOCATION_LATITUDEReady = true; } return _POSTAL_LOCATION_LATITUDEContent; } }
             private static Java.Lang.String _POSTAL_LOCATION_LATITUDEContent = default;
             private static bool _POSTAL_LOCATION_LATITUDEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethods.html#POSTAL_LOCATION_LONGITUDE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String POSTAL_LOCATION_LONGITUDE { get { if (!_POSTAL_LOCATION_LONGITUDEReady) { _POSTAL_LOCATION_LONGITUDEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "POSTAL_LOCATION_LONGITUDE"); _POSTAL_LOCATION_LONGITUDEReady = true; } return _POSTAL_LOCATION_LONGITUDEContent; } }
             private static Java.Lang.String _POSTAL_LOCATION_LONGITUDEContent = default;
             private static bool _POSTAL_LOCATION_LONGITUDEReady = false; // this is used because in case of generics 
@@ -266,7 +266,7 @@ public partial class ContactMethods : Android.Provider.IBaseColumns
             /// <param name="arg2"><see cref="int"/></param>
             /// <param name="arg3"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.CharSequence GetDisplayLabel(Android.Content.Context arg0, int arg1, int arg2, Java.Lang.CharSequence arg3)
             {
                 return SExecute<Java.Lang.CharSequence>(LocalBridgeClazz, "getDisplayLabel", arg0, arg1, arg2, arg3);
@@ -276,7 +276,7 @@ public static Java.Lang.CharSequence GetDisplayLabel(Android.Content.Context arg
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="object"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static object DecodeImProtocol(Java.Lang.String arg0)
             {
                 return SExecuteWithSignature(LocalBridgeClazz, "decodeImProtocol", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
@@ -286,7 +286,7 @@ public static object DecodeImProtocol(Java.Lang.String arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EncodeCustomImProtocol(Java.Lang.String arg0)
             {
                 return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "encodeCustomImProtocol", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
@@ -296,7 +296,7 @@ public static Java.Lang.String EncodeCustomImProtocol(Java.Lang.String arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EncodePredefinedImProtocol(int arg0)
             {
                 return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "encodePredefinedImProtocol", "(I)Ljava/lang/String;", arg0);
@@ -312,7 +312,7 @@ public static Java.Lang.String EncodePredefinedImProtocol(int arg0)
             /// <param name="arg1"><see cref="long"/></param>
             /// <param name="arg2"><see cref="double"/></param>
             /// <param name="arg3"><see cref="double"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void AddPostalLocation(Android.Content.Context arg0, long arg1, double arg2, double arg3)
             {
                 IExecute("addPostalLocation", arg0, arg1, arg2, arg3);
@@ -343,70 +343,70 @@ public partial class ContactMethodsColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#TYPE_CUSTOM"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_CUSTOM { get { if (!_TYPE_CUSTOMReady) { _TYPE_CUSTOMContent = SGetField<int>(LocalBridgeClazz, "TYPE_CUSTOM"); _TYPE_CUSTOMReady = true; } return _TYPE_CUSTOMContent; } }
             private static int _TYPE_CUSTOMContent = default;
             private static bool _TYPE_CUSTOMReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#TYPE_HOME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_HOME { get { if (!_TYPE_HOMEReady) { _TYPE_HOMEContent = SGetField<int>(LocalBridgeClazz, "TYPE_HOME"); _TYPE_HOMEReady = true; } return _TYPE_HOMEContent; } }
             private static int _TYPE_HOMEContent = default;
             private static bool _TYPE_HOMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#TYPE_OTHER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_OTHER { get { if (!_TYPE_OTHERReady) { _TYPE_OTHERContent = SGetField<int>(LocalBridgeClazz, "TYPE_OTHER"); _TYPE_OTHERReady = true; } return _TYPE_OTHERContent; } }
             private static int _TYPE_OTHERContent = default;
             private static bool _TYPE_OTHERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#TYPE_WORK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_WORK { get { if (!_TYPE_WORKReady) { _TYPE_WORKContent = SGetField<int>(LocalBridgeClazz, "TYPE_WORK"); _TYPE_WORKReady = true; } return _TYPE_WORKContent; } }
             private static int _TYPE_WORKContent = default;
             private static bool _TYPE_WORKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#AUX_DATA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String AUX_DATA { get { if (!_AUX_DATAReady) { _AUX_DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "AUX_DATA"); _AUX_DATAReady = true; } return _AUX_DATAContent; } }
             private static Java.Lang.String _AUX_DATAContent = default;
             private static bool _AUX_DATAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#DATA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DATA { get { if (!_DATAReady) { _DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATA"); _DATAReady = true; } return _DATAContent; } }
             private static Java.Lang.String _DATAContent = default;
             private static bool _DATAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#ISPRIMARY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ISPRIMARY { get { if (!_ISPRIMARYReady) { _ISPRIMARYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ISPRIMARY"); _ISPRIMARYReady = true; } return _ISPRIMARYContent; } }
             private static Java.Lang.String _ISPRIMARYContent = default;
             private static bool _ISPRIMARYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#KIND"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String KIND { get { if (!_KINDReady) { _KINDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KIND"); _KINDReady = true; } return _KINDContent; } }
             private static Java.Lang.String _KINDContent = default;
             private static bool _KINDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#LABEL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LABEL { get { if (!_LABELReady) { _LABELContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LABEL"); _LABELReady = true; } return _LABELContent; } }
             private static Java.Lang.String _LABELContent = default;
             private static bool _LABELReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ContactMethodsColumns.html#TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
             private static Java.Lang.String _TYPEContent = default;
             private static bool _TYPEReady = false; // this is used because in case of generics 
@@ -448,35 +448,35 @@ public partial class Extensions : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Extensions.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Extensions.html#CONTENT_ITEM_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_ITEM_TYPE { get { if (!_CONTENT_ITEM_TYPEReady) { _CONTENT_ITEM_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_ITEM_TYPE"); _CONTENT_ITEM_TYPEReady = true; } return _CONTENT_ITEM_TYPEContent; } }
             private static Java.Lang.String _CONTENT_ITEM_TYPEContent = default;
             private static bool _CONTENT_ITEM_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Extensions.html#CONTENT_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_TYPE { get { if (!_CONTENT_TYPEReady) { _CONTENT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_TYPE"); _CONTENT_TYPEReady = true; } return _CONTENT_TYPEContent; } }
             private static Java.Lang.String _CONTENT_TYPEContent = default;
             private static bool _CONTENT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Extensions.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Extensions.html#PERSON_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PERSON_ID { get { if (!_PERSON_IDReady) { _PERSON_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PERSON_ID"); _PERSON_IDReady = true; } return _PERSON_IDContent; } }
             private static Java.Lang.String _PERSON_IDContent = default;
             private static bool _PERSON_IDReady = false; // this is used because in case of generics 
@@ -514,14 +514,14 @@ public partial class ExtensionsColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ExtensionsColumns.html#NAME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NAME { get { if (!_NAMEReady) { _NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NAME"); _NAMEReady = true; } return _NAMEContent; } }
             private static Java.Lang.String _NAMEContent = default;
             private static bool _NAMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.ExtensionsColumns.html#VALUE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String VALUE { get { if (!_VALUEReady) { _VALUEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "VALUE"); _VALUEReady = true; } return _VALUEContent; } }
             private static Java.Lang.String _VALUEContent = default;
             private static bool _VALUEReady = false; // this is used because in case of generics 
@@ -563,77 +563,77 @@ public partial class GroupMembership : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#RAW_CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri RAW_CONTENT_URI { get { if (!_RAW_CONTENT_URIReady) { _RAW_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "RAW_CONTENT_URI"); _RAW_CONTENT_URIReady = true; } return _RAW_CONTENT_URIContent; } }
             private static Android.Net.Uri _RAW_CONTENT_URIContent = default;
             private static bool _RAW_CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#CONTENT_DIRECTORY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_DIRECTORY { get { if (!_CONTENT_DIRECTORYReady) { _CONTENT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_DIRECTORY"); _CONTENT_DIRECTORYReady = true; } return _CONTENT_DIRECTORYContent; } }
             private static Java.Lang.String _CONTENT_DIRECTORYContent = default;
             private static bool _CONTENT_DIRECTORYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#CONTENT_ITEM_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_ITEM_TYPE { get { if (!_CONTENT_ITEM_TYPEReady) { _CONTENT_ITEM_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_ITEM_TYPE"); _CONTENT_ITEM_TYPEReady = true; } return _CONTENT_ITEM_TYPEContent; } }
             private static Java.Lang.String _CONTENT_ITEM_TYPEContent = default;
             private static bool _CONTENT_ITEM_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#CONTENT_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_TYPE { get { if (!_CONTENT_TYPEReady) { _CONTENT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_TYPE"); _CONTENT_TYPEReady = true; } return _CONTENT_TYPEContent; } }
             private static Java.Lang.String _CONTENT_TYPEContent = default;
             private static bool _CONTENT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#GROUP_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String GROUP_ID { get { if (!_GROUP_IDReady) { _GROUP_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GROUP_ID"); _GROUP_IDReady = true; } return _GROUP_IDContent; } }
             private static Java.Lang.String _GROUP_IDContent = default;
             private static bool _GROUP_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#GROUP_SYNC_ACCOUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String GROUP_SYNC_ACCOUNT { get { if (!_GROUP_SYNC_ACCOUNTReady) { _GROUP_SYNC_ACCOUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GROUP_SYNC_ACCOUNT"); _GROUP_SYNC_ACCOUNTReady = true; } return _GROUP_SYNC_ACCOUNTContent; } }
             private static Java.Lang.String _GROUP_SYNC_ACCOUNTContent = default;
             private static bool _GROUP_SYNC_ACCOUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#GROUP_SYNC_ACCOUNT_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String GROUP_SYNC_ACCOUNT_TYPE { get { if (!_GROUP_SYNC_ACCOUNT_TYPEReady) { _GROUP_SYNC_ACCOUNT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GROUP_SYNC_ACCOUNT_TYPE"); _GROUP_SYNC_ACCOUNT_TYPEReady = true; } return _GROUP_SYNC_ACCOUNT_TYPEContent; } }
             private static Java.Lang.String _GROUP_SYNC_ACCOUNT_TYPEContent = default;
             private static bool _GROUP_SYNC_ACCOUNT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#GROUP_SYNC_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String GROUP_SYNC_ID { get { if (!_GROUP_SYNC_IDReady) { _GROUP_SYNC_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GROUP_SYNC_ID"); _GROUP_SYNC_IDReady = true; } return _GROUP_SYNC_IDContent; } }
             private static Java.Lang.String _GROUP_SYNC_IDContent = default;
             private static bool _GROUP_SYNC_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupMembership.html#PERSON_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PERSON_ID { get { if (!_PERSON_IDReady) { _PERSON_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PERSON_ID"); _PERSON_IDReady = true; } return _PERSON_IDContent; } }
             private static Java.Lang.String _PERSON_IDContent = default;
             private static bool _PERSON_IDReady = false; // this is used because in case of generics 
@@ -675,49 +675,49 @@ public partial class Groups : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Groups.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Groups.html#DELETED_CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri DELETED_CONTENT_URI { get { if (!_DELETED_CONTENT_URIReady) { _DELETED_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "DELETED_CONTENT_URI"); _DELETED_CONTENT_URIReady = true; } return _DELETED_CONTENT_URIContent; } }
             private static Android.Net.Uri _DELETED_CONTENT_URIContent = default;
             private static bool _DELETED_CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Groups.html#CONTENT_ITEM_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_ITEM_TYPE { get { if (!_CONTENT_ITEM_TYPEReady) { _CONTENT_ITEM_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_ITEM_TYPE"); _CONTENT_ITEM_TYPEReady = true; } return _CONTENT_ITEM_TYPEContent; } }
             private static Java.Lang.String _CONTENT_ITEM_TYPEContent = default;
             private static bool _CONTENT_ITEM_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Groups.html#CONTENT_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_TYPE { get { if (!_CONTENT_TYPEReady) { _CONTENT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_TYPE"); _CONTENT_TYPEReady = true; } return _CONTENT_TYPEContent; } }
             private static Java.Lang.String _CONTENT_TYPEContent = default;
             private static bool _CONTENT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Groups.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Groups.html#GROUP_ANDROID_STARRED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String GROUP_ANDROID_STARRED { get { if (!_GROUP_ANDROID_STARREDReady) { _GROUP_ANDROID_STARREDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GROUP_ANDROID_STARRED"); _GROUP_ANDROID_STARREDReady = true; } return _GROUP_ANDROID_STARREDContent; } }
             private static Java.Lang.String _GROUP_ANDROID_STARREDContent = default;
             private static bool _GROUP_ANDROID_STARREDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Groups.html#GROUP_MY_CONTACTS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String GROUP_MY_CONTACTS { get { if (!_GROUP_MY_CONTACTSReady) { _GROUP_MY_CONTACTSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GROUP_MY_CONTACTS"); _GROUP_MY_CONTACTSReady = true; } return _GROUP_MY_CONTACTSContent; } }
             private static Java.Lang.String _GROUP_MY_CONTACTSContent = default;
             private static bool _GROUP_MY_CONTACTSReady = false; // this is used because in case of generics 
@@ -755,28 +755,28 @@ public partial class GroupsColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupsColumns.html#NAME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NAME { get { if (!_NAMEReady) { _NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NAME"); _NAMEReady = true; } return _NAMEContent; } }
             private static Java.Lang.String _NAMEContent = default;
             private static bool _NAMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupsColumns.html#NOTES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NOTES { get { if (!_NOTESReady) { _NOTESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NOTES"); _NOTESReady = true; } return _NOTESContent; } }
             private static Java.Lang.String _NOTESContent = default;
             private static bool _NOTESReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupsColumns.html#SHOULD_SYNC"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SHOULD_SYNC { get { if (!_SHOULD_SYNCReady) { _SHOULD_SYNCContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SHOULD_SYNC"); _SHOULD_SYNCReady = true; } return _SHOULD_SYNCContent; } }
             private static Java.Lang.String _SHOULD_SYNCContent = default;
             private static bool _SHOULD_SYNCReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.GroupsColumns.html#SYSTEM_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SYSTEM_ID { get { if (!_SYSTEM_IDReady) { _SYSTEM_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SYSTEM_ID"); _SYSTEM_IDReady = true; } return _SYSTEM_IDContent; } }
             private static Java.Lang.String _SYSTEM_IDContent = default;
             private static bool _SYSTEM_IDReady = false; // this is used because in case of generics 
@@ -814,49 +814,49 @@ public partial class Intents
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.html#ATTACH_IMAGE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ATTACH_IMAGE { get { if (!_ATTACH_IMAGEReady) { _ATTACH_IMAGEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ATTACH_IMAGE"); _ATTACH_IMAGEReady = true; } return _ATTACH_IMAGEContent; } }
             private static Java.Lang.String _ATTACH_IMAGEContent = default;
             private static bool _ATTACH_IMAGEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.html#EXTRA_CREATE_DESCRIPTION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXTRA_CREATE_DESCRIPTION { get { if (!_EXTRA_CREATE_DESCRIPTIONReady) { _EXTRA_CREATE_DESCRIPTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_CREATE_DESCRIPTION"); _EXTRA_CREATE_DESCRIPTIONReady = true; } return _EXTRA_CREATE_DESCRIPTIONContent; } }
             private static Java.Lang.String _EXTRA_CREATE_DESCRIPTIONContent = default;
             private static bool _EXTRA_CREATE_DESCRIPTIONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.html#EXTRA_FORCE_CREATE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXTRA_FORCE_CREATE { get { if (!_EXTRA_FORCE_CREATEReady) { _EXTRA_FORCE_CREATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_FORCE_CREATE"); _EXTRA_FORCE_CREATEReady = true; } return _EXTRA_FORCE_CREATEContent; } }
             private static Java.Lang.String _EXTRA_FORCE_CREATEContent = default;
             private static bool _EXTRA_FORCE_CREATEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.html#SEARCH_SUGGESTION_CLICKED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SEARCH_SUGGESTION_CLICKED { get { if (!_SEARCH_SUGGESTION_CLICKEDReady) { _SEARCH_SUGGESTION_CLICKEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SEARCH_SUGGESTION_CLICKED"); _SEARCH_SUGGESTION_CLICKEDReady = true; } return _SEARCH_SUGGESTION_CLICKEDContent; } }
             private static Java.Lang.String _SEARCH_SUGGESTION_CLICKEDContent = default;
             private static bool _SEARCH_SUGGESTION_CLICKEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.html#SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED { get { if (!_SEARCH_SUGGESTION_CREATE_CONTACT_CLICKEDReady) { _SEARCH_SUGGESTION_CREATE_CONTACT_CLICKEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED"); _SEARCH_SUGGESTION_CREATE_CONTACT_CLICKEDReady = true; } return _SEARCH_SUGGESTION_CREATE_CONTACT_CLICKEDContent; } }
             private static Java.Lang.String _SEARCH_SUGGESTION_CREATE_CONTACT_CLICKEDContent = default;
             private static bool _SEARCH_SUGGESTION_CREATE_CONTACT_CLICKEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.html#SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED { get { if (!_SEARCH_SUGGESTION_DIAL_NUMBER_CLICKEDReady) { _SEARCH_SUGGESTION_DIAL_NUMBER_CLICKEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED"); _SEARCH_SUGGESTION_DIAL_NUMBER_CLICKEDReady = true; } return _SEARCH_SUGGESTION_DIAL_NUMBER_CLICKEDContent; } }
             private static Java.Lang.String _SEARCH_SUGGESTION_DIAL_NUMBER_CLICKEDContent = default;
             private static bool _SEARCH_SUGGESTION_DIAL_NUMBER_CLICKEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.html#SHOW_OR_CREATE_CONTACT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SHOW_OR_CREATE_CONTACT { get { if (!_SHOW_OR_CREATE_CONTACTReady) { _SHOW_OR_CREATE_CONTACTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SHOW_OR_CREATE_CONTACT"); _SHOW_OR_CREATE_CONTACTReady = true; } return _SHOW_OR_CREATE_CONTACTContent; } }
             private static Java.Lang.String _SHOW_OR_CREATE_CONTACTContent = default;
             private static bool _SHOW_OR_CREATE_CONTACTReady = false; // this is used because in case of generics 
@@ -887,77 +887,77 @@ public partial class UI
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#FILTER_CONTACTS_ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String FILTER_CONTACTS_ACTION { get { if (!_FILTER_CONTACTS_ACTIONReady) { _FILTER_CONTACTS_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FILTER_CONTACTS_ACTION"); _FILTER_CONTACTS_ACTIONReady = true; } return _FILTER_CONTACTS_ACTIONContent; } }
                 private static Java.Lang.String _FILTER_CONTACTS_ACTIONContent = default;
                 private static bool _FILTER_CONTACTS_ACTIONReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#FILTER_TEXT_EXTRA_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String FILTER_TEXT_EXTRA_KEY { get { if (!_FILTER_TEXT_EXTRA_KEYReady) { _FILTER_TEXT_EXTRA_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FILTER_TEXT_EXTRA_KEY"); _FILTER_TEXT_EXTRA_KEYReady = true; } return _FILTER_TEXT_EXTRA_KEYContent; } }
                 private static Java.Lang.String _FILTER_TEXT_EXTRA_KEYContent = default;
                 private static bool _FILTER_TEXT_EXTRA_KEYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#GROUP_NAME_EXTRA_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String GROUP_NAME_EXTRA_KEY { get { if (!_GROUP_NAME_EXTRA_KEYReady) { _GROUP_NAME_EXTRA_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GROUP_NAME_EXTRA_KEY"); _GROUP_NAME_EXTRA_KEYReady = true; } return _GROUP_NAME_EXTRA_KEYContent; } }
                 private static Java.Lang.String _GROUP_NAME_EXTRA_KEYContent = default;
                 private static bool _GROUP_NAME_EXTRA_KEYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#LIST_ALL_CONTACTS_ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LIST_ALL_CONTACTS_ACTION { get { if (!_LIST_ALL_CONTACTS_ACTIONReady) { _LIST_ALL_CONTACTS_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LIST_ALL_CONTACTS_ACTION"); _LIST_ALL_CONTACTS_ACTIONReady = true; } return _LIST_ALL_CONTACTS_ACTIONContent; } }
                 private static Java.Lang.String _LIST_ALL_CONTACTS_ACTIONContent = default;
                 private static bool _LIST_ALL_CONTACTS_ACTIONReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#LIST_CONTACTS_WITH_PHONES_ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LIST_CONTACTS_WITH_PHONES_ACTION { get { if (!_LIST_CONTACTS_WITH_PHONES_ACTIONReady) { _LIST_CONTACTS_WITH_PHONES_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LIST_CONTACTS_WITH_PHONES_ACTION"); _LIST_CONTACTS_WITH_PHONES_ACTIONReady = true; } return _LIST_CONTACTS_WITH_PHONES_ACTIONContent; } }
                 private static Java.Lang.String _LIST_CONTACTS_WITH_PHONES_ACTIONContent = default;
                 private static bool _LIST_CONTACTS_WITH_PHONES_ACTIONReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#LIST_DEFAULT"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LIST_DEFAULT { get { if (!_LIST_DEFAULTReady) { _LIST_DEFAULTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LIST_DEFAULT"); _LIST_DEFAULTReady = true; } return _LIST_DEFAULTContent; } }
                 private static Java.Lang.String _LIST_DEFAULTContent = default;
                 private static bool _LIST_DEFAULTReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#LIST_FREQUENT_ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LIST_FREQUENT_ACTION { get { if (!_LIST_FREQUENT_ACTIONReady) { _LIST_FREQUENT_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LIST_FREQUENT_ACTION"); _LIST_FREQUENT_ACTIONReady = true; } return _LIST_FREQUENT_ACTIONContent; } }
                 private static Java.Lang.String _LIST_FREQUENT_ACTIONContent = default;
                 private static bool _LIST_FREQUENT_ACTIONReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#LIST_GROUP_ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LIST_GROUP_ACTION { get { if (!_LIST_GROUP_ACTIONReady) { _LIST_GROUP_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LIST_GROUP_ACTION"); _LIST_GROUP_ACTIONReady = true; } return _LIST_GROUP_ACTIONContent; } }
                 private static Java.Lang.String _LIST_GROUP_ACTIONContent = default;
                 private static bool _LIST_GROUP_ACTIONReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#LIST_STARRED_ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LIST_STARRED_ACTION { get { if (!_LIST_STARRED_ACTIONReady) { _LIST_STARRED_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LIST_STARRED_ACTION"); _LIST_STARRED_ACTIONReady = true; } return _LIST_STARRED_ACTIONContent; } }
                 private static Java.Lang.String _LIST_STARRED_ACTIONContent = default;
                 private static bool _LIST_STARRED_ACTIONReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#LIST_STREQUENT_ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LIST_STREQUENT_ACTION { get { if (!_LIST_STREQUENT_ACTIONReady) { _LIST_STREQUENT_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LIST_STREQUENT_ACTION"); _LIST_STREQUENT_ACTIONReady = true; } return _LIST_STREQUENT_ACTIONContent; } }
                 private static Java.Lang.String _LIST_STREQUENT_ACTIONContent = default;
                 private static bool _LIST_STREQUENT_ACTIONReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.UI.html#TITLE_EXTRA_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String TITLE_EXTRA_KEY { get { if (!_TITLE_EXTRA_KEYReady) { _TITLE_EXTRA_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TITLE_EXTRA_KEY"); _TITLE_EXTRA_KEYReady = true; } return _TITLE_EXTRA_KEYContent; } }
                 private static Java.Lang.String _TITLE_EXTRA_KEYContent = default;
                 private static bool _TITLE_EXTRA_KEYReady = false; // this is used because in case of generics 
@@ -995,189 +995,189 @@ public partial class Insert
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String ACTION { get { if (!_ACTIONReady) { _ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION"); _ACTIONReady = true; } return _ACTIONContent; } }
                 private static Java.Lang.String _ACTIONContent = default;
                 private static bool _ACTIONReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#COMPANY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String COMPANY { get { if (!_COMPANYReady) { _COMPANYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "COMPANY"); _COMPANYReady = true; } return _COMPANYContent; } }
                 private static Java.Lang.String _COMPANYContent = default;
                 private static bool _COMPANYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#EMAIL"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String EMAIL { get { if (!_EMAILReady) { _EMAILContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EMAIL"); _EMAILReady = true; } return _EMAILContent; } }
                 private static Java.Lang.String _EMAILContent = default;
                 private static bool _EMAILReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#EMAIL_ISPRIMARY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String EMAIL_ISPRIMARY { get { if (!_EMAIL_ISPRIMARYReady) { _EMAIL_ISPRIMARYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EMAIL_ISPRIMARY"); _EMAIL_ISPRIMARYReady = true; } return _EMAIL_ISPRIMARYContent; } }
                 private static Java.Lang.String _EMAIL_ISPRIMARYContent = default;
                 private static bool _EMAIL_ISPRIMARYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#EMAIL_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String EMAIL_TYPE { get { if (!_EMAIL_TYPEReady) { _EMAIL_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EMAIL_TYPE"); _EMAIL_TYPEReady = true; } return _EMAIL_TYPEContent; } }
                 private static Java.Lang.String _EMAIL_TYPEContent = default;
                 private static bool _EMAIL_TYPEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#FULL_MODE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String FULL_MODE { get { if (!_FULL_MODEReady) { _FULL_MODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FULL_MODE"); _FULL_MODEReady = true; } return _FULL_MODEContent; } }
                 private static Java.Lang.String _FULL_MODEContent = default;
                 private static bool _FULL_MODEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#IM_HANDLE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String IM_HANDLE { get { if (!_IM_HANDLEReady) { _IM_HANDLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "IM_HANDLE"); _IM_HANDLEReady = true; } return _IM_HANDLEContent; } }
                 private static Java.Lang.String _IM_HANDLEContent = default;
                 private static bool _IM_HANDLEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#IM_ISPRIMARY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String IM_ISPRIMARY { get { if (!_IM_ISPRIMARYReady) { _IM_ISPRIMARYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "IM_ISPRIMARY"); _IM_ISPRIMARYReady = true; } return _IM_ISPRIMARYContent; } }
                 private static Java.Lang.String _IM_ISPRIMARYContent = default;
                 private static bool _IM_ISPRIMARYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#IM_PROTOCOL"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String IM_PROTOCOL { get { if (!_IM_PROTOCOLReady) { _IM_PROTOCOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "IM_PROTOCOL"); _IM_PROTOCOLReady = true; } return _IM_PROTOCOLContent; } }
                 private static Java.Lang.String _IM_PROTOCOLContent = default;
                 private static bool _IM_PROTOCOLReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#JOB_TITLE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String JOB_TITLE { get { if (!_JOB_TITLEReady) { _JOB_TITLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "JOB_TITLE"); _JOB_TITLEReady = true; } return _JOB_TITLEContent; } }
                 private static Java.Lang.String _JOB_TITLEContent = default;
                 private static bool _JOB_TITLEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#NAME"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String NAME { get { if (!_NAMEReady) { _NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NAME"); _NAMEReady = true; } return _NAMEContent; } }
                 private static Java.Lang.String _NAMEContent = default;
                 private static bool _NAMEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#NOTES"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String NOTES { get { if (!_NOTESReady) { _NOTESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NOTES"); _NOTESReady = true; } return _NOTESContent; } }
                 private static Java.Lang.String _NOTESContent = default;
                 private static bool _NOTESReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#PHONE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String PHONE { get { if (!_PHONEReady) { _PHONEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PHONE"); _PHONEReady = true; } return _PHONEContent; } }
                 private static Java.Lang.String _PHONEContent = default;
                 private static bool _PHONEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#PHONE_ISPRIMARY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String PHONE_ISPRIMARY { get { if (!_PHONE_ISPRIMARYReady) { _PHONE_ISPRIMARYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PHONE_ISPRIMARY"); _PHONE_ISPRIMARYReady = true; } return _PHONE_ISPRIMARYContent; } }
                 private static Java.Lang.String _PHONE_ISPRIMARYContent = default;
                 private static bool _PHONE_ISPRIMARYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#PHONE_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String PHONE_TYPE { get { if (!_PHONE_TYPEReady) { _PHONE_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PHONE_TYPE"); _PHONE_TYPEReady = true; } return _PHONE_TYPEContent; } }
                 private static Java.Lang.String _PHONE_TYPEContent = default;
                 private static bool _PHONE_TYPEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#PHONETIC_NAME"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String PHONETIC_NAME { get { if (!_PHONETIC_NAMEReady) { _PHONETIC_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PHONETIC_NAME"); _PHONETIC_NAMEReady = true; } return _PHONETIC_NAMEContent; } }
                 private static Java.Lang.String _PHONETIC_NAMEContent = default;
                 private static bool _PHONETIC_NAMEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#POSTAL"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String POSTAL { get { if (!_POSTALReady) { _POSTALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "POSTAL"); _POSTALReady = true; } return _POSTALContent; } }
                 private static Java.Lang.String _POSTALContent = default;
                 private static bool _POSTALReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#POSTAL_ISPRIMARY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String POSTAL_ISPRIMARY { get { if (!_POSTAL_ISPRIMARYReady) { _POSTAL_ISPRIMARYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "POSTAL_ISPRIMARY"); _POSTAL_ISPRIMARYReady = true; } return _POSTAL_ISPRIMARYContent; } }
                 private static Java.Lang.String _POSTAL_ISPRIMARYContent = default;
                 private static bool _POSTAL_ISPRIMARYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#POSTAL_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String POSTAL_TYPE { get { if (!_POSTAL_TYPEReady) { _POSTAL_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "POSTAL_TYPE"); _POSTAL_TYPEReady = true; } return _POSTAL_TYPEContent; } }
                 private static Java.Lang.String _POSTAL_TYPEContent = default;
                 private static bool _POSTAL_TYPEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#SECONDARY_EMAIL"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String SECONDARY_EMAIL { get { if (!_SECONDARY_EMAILReady) { _SECONDARY_EMAILContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SECONDARY_EMAIL"); _SECONDARY_EMAILReady = true; } return _SECONDARY_EMAILContent; } }
                 private static Java.Lang.String _SECONDARY_EMAILContent = default;
                 private static bool _SECONDARY_EMAILReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#SECONDARY_EMAIL_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String SECONDARY_EMAIL_TYPE { get { if (!_SECONDARY_EMAIL_TYPEReady) { _SECONDARY_EMAIL_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SECONDARY_EMAIL_TYPE"); _SECONDARY_EMAIL_TYPEReady = true; } return _SECONDARY_EMAIL_TYPEContent; } }
                 private static Java.Lang.String _SECONDARY_EMAIL_TYPEContent = default;
                 private static bool _SECONDARY_EMAIL_TYPEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#SECONDARY_PHONE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String SECONDARY_PHONE { get { if (!_SECONDARY_PHONEReady) { _SECONDARY_PHONEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SECONDARY_PHONE"); _SECONDARY_PHONEReady = true; } return _SECONDARY_PHONEContent; } }
                 private static Java.Lang.String _SECONDARY_PHONEContent = default;
                 private static bool _SECONDARY_PHONEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#SECONDARY_PHONE_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String SECONDARY_PHONE_TYPE { get { if (!_SECONDARY_PHONE_TYPEReady) { _SECONDARY_PHONE_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SECONDARY_PHONE_TYPE"); _SECONDARY_PHONE_TYPEReady = true; } return _SECONDARY_PHONE_TYPEContent; } }
                 private static Java.Lang.String _SECONDARY_PHONE_TYPEContent = default;
                 private static bool _SECONDARY_PHONE_TYPEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#TERTIARY_EMAIL"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String TERTIARY_EMAIL { get { if (!_TERTIARY_EMAILReady) { _TERTIARY_EMAILContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TERTIARY_EMAIL"); _TERTIARY_EMAILReady = true; } return _TERTIARY_EMAILContent; } }
                 private static Java.Lang.String _TERTIARY_EMAILContent = default;
                 private static bool _TERTIARY_EMAILReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#TERTIARY_EMAIL_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String TERTIARY_EMAIL_TYPE { get { if (!_TERTIARY_EMAIL_TYPEReady) { _TERTIARY_EMAIL_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TERTIARY_EMAIL_TYPE"); _TERTIARY_EMAIL_TYPEReady = true; } return _TERTIARY_EMAIL_TYPEContent; } }
                 private static Java.Lang.String _TERTIARY_EMAIL_TYPEContent = default;
                 private static bool _TERTIARY_EMAIL_TYPEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#TERTIARY_PHONE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String TERTIARY_PHONE { get { if (!_TERTIARY_PHONEReady) { _TERTIARY_PHONEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TERTIARY_PHONE"); _TERTIARY_PHONEReady = true; } return _TERTIARY_PHONEContent; } }
                 private static Java.Lang.String _TERTIARY_PHONEContent = default;
                 private static bool _TERTIARY_PHONEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.Intents.Insert.html#TERTIARY_PHONE_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String TERTIARY_PHONE_TYPE { get { if (!_TERTIARY_PHONE_TYPEReady) { _TERTIARY_PHONE_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TERTIARY_PHONE_TYPE"); _TERTIARY_PHONE_TYPEReady = true; } return _TERTIARY_PHONE_TYPEContent; } }
                 private static Java.Lang.String _TERTIARY_PHONE_TYPEContent = default;
                 private static bool _TERTIARY_PHONE_TYPEReady = false; // this is used because in case of generics 
@@ -1222,63 +1222,63 @@ public partial class OrganizationColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#TYPE_CUSTOM"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_CUSTOM { get { if (!_TYPE_CUSTOMReady) { _TYPE_CUSTOMContent = SGetField<int>(LocalBridgeClazz, "TYPE_CUSTOM"); _TYPE_CUSTOMReady = true; } return _TYPE_CUSTOMContent; } }
             private static int _TYPE_CUSTOMContent = default;
             private static bool _TYPE_CUSTOMReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#TYPE_OTHER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_OTHER { get { if (!_TYPE_OTHERReady) { _TYPE_OTHERContent = SGetField<int>(LocalBridgeClazz, "TYPE_OTHER"); _TYPE_OTHERReady = true; } return _TYPE_OTHERContent; } }
             private static int _TYPE_OTHERContent = default;
             private static bool _TYPE_OTHERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#TYPE_WORK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_WORK { get { if (!_TYPE_WORKReady) { _TYPE_WORKContent = SGetField<int>(LocalBridgeClazz, "TYPE_WORK"); _TYPE_WORKReady = true; } return _TYPE_WORKContent; } }
             private static int _TYPE_WORKContent = default;
             private static bool _TYPE_WORKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#COMPANY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String COMPANY { get { if (!_COMPANYReady) { _COMPANYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "COMPANY"); _COMPANYReady = true; } return _COMPANYContent; } }
             private static Java.Lang.String _COMPANYContent = default;
             private static bool _COMPANYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#ISPRIMARY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ISPRIMARY { get { if (!_ISPRIMARYReady) { _ISPRIMARYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ISPRIMARY"); _ISPRIMARYReady = true; } return _ISPRIMARYContent; } }
             private static Java.Lang.String _ISPRIMARYContent = default;
             private static bool _ISPRIMARYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#LABEL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LABEL { get { if (!_LABELReady) { _LABELContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LABEL"); _LABELReady = true; } return _LABELContent; } }
             private static Java.Lang.String _LABELContent = default;
             private static bool _LABELReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#PERSON_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PERSON_ID { get { if (!_PERSON_IDReady) { _PERSON_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PERSON_ID"); _PERSON_IDReady = true; } return _PERSON_IDContent; } }
             private static Java.Lang.String _PERSON_IDContent = default;
             private static bool _PERSON_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#TITLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TITLE { get { if (!_TITLEReady) { _TITLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TITLE"); _TITLEReady = true; } return _TITLEContent; } }
             private static Java.Lang.String _TITLEContent = default;
             private static bool _TITLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.OrganizationColumns.html#TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
             private static Java.Lang.String _TYPEContent = default;
             private static bool _TYPEReady = false; // this is used because in case of generics 
@@ -1320,21 +1320,21 @@ public partial class Organizations : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Organizations.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Organizations.html#CONTENT_DIRECTORY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_DIRECTORY { get { if (!_CONTENT_DIRECTORYReady) { _CONTENT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_DIRECTORY"); _CONTENT_DIRECTORYReady = true; } return _CONTENT_DIRECTORYContent; } }
             private static Java.Lang.String _CONTENT_DIRECTORYContent = default;
             private static bool _CONTENT_DIRECTORYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Organizations.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
@@ -1349,7 +1349,7 @@ public partial class Organizations : Android.Provider.IBaseColumns
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.CharSequence GetDisplayLabel(Android.Content.Context arg0, int arg1, Java.Lang.CharSequence arg2)
             {
                 return SExecute<Java.Lang.CharSequence>(LocalBridgeClazz, "getDisplayLabel", arg0, arg1, arg2);
@@ -1388,63 +1388,63 @@ public partial class People : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#CONTENT_FILTER_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_FILTER_URI { get { if (!_CONTENT_FILTER_URIReady) { _CONTENT_FILTER_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_FILTER_URI"); _CONTENT_FILTER_URIReady = true; } return _CONTENT_FILTER_URIContent; } }
             private static Android.Net.Uri _CONTENT_FILTER_URIContent = default;
             private static bool _CONTENT_FILTER_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#DELETED_CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri DELETED_CONTENT_URI { get { if (!_DELETED_CONTENT_URIReady) { _DELETED_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "DELETED_CONTENT_URI"); _DELETED_CONTENT_URIReady = true; } return _DELETED_CONTENT_URIContent; } }
             private static Android.Net.Uri _DELETED_CONTENT_URIContent = default;
             private static bool _DELETED_CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#CONTENT_ITEM_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_ITEM_TYPE { get { if (!_CONTENT_ITEM_TYPEReady) { _CONTENT_ITEM_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_ITEM_TYPE"); _CONTENT_ITEM_TYPEReady = true; } return _CONTENT_ITEM_TYPEContent; } }
             private static Java.Lang.String _CONTENT_ITEM_TYPEContent = default;
             private static bool _CONTENT_ITEM_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#CONTENT_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_TYPE { get { if (!_CONTENT_TYPEReady) { _CONTENT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_TYPE"); _CONTENT_TYPEReady = true; } return _CONTENT_TYPEContent; } }
             private static Java.Lang.String _CONTENT_TYPEContent = default;
             private static bool _CONTENT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#PRIMARY_EMAIL_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PRIMARY_EMAIL_ID { get { if (!_PRIMARY_EMAIL_IDReady) { _PRIMARY_EMAIL_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PRIMARY_EMAIL_ID"); _PRIMARY_EMAIL_IDReady = true; } return _PRIMARY_EMAIL_IDContent; } }
             private static Java.Lang.String _PRIMARY_EMAIL_IDContent = default;
             private static bool _PRIMARY_EMAIL_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#PRIMARY_ORGANIZATION_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PRIMARY_ORGANIZATION_ID { get { if (!_PRIMARY_ORGANIZATION_IDReady) { _PRIMARY_ORGANIZATION_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PRIMARY_ORGANIZATION_ID"); _PRIMARY_ORGANIZATION_IDReady = true; } return _PRIMARY_ORGANIZATION_IDContent; } }
             private static Java.Lang.String _PRIMARY_ORGANIZATION_IDContent = default;
             private static bool _PRIMARY_ORGANIZATION_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.html#PRIMARY_PHONE_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PRIMARY_PHONE_ID { get { if (!_PRIMARY_PHONE_IDReady) { _PRIMARY_PHONE_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PRIMARY_PHONE_ID"); _PRIMARY_PHONE_IDReady = true; } return _PRIMARY_PHONE_IDContent; } }
             private static Java.Lang.String _PRIMARY_PHONE_IDContent = default;
             private static bool _PRIMARY_PHONE_IDReady = false; // this is used because in case of generics 
@@ -1458,7 +1458,7 @@ public partial class People : Android.Provider.IBaseColumns
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="long"/></param>
             /// <returns><see cref="Android.Database.Cursor"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Database.Cursor QueryGroups(Android.Content.ContentResolver arg0, long arg1)
             {
                 return SExecute<Android.Database.Cursor>(LocalBridgeClazz, "queryGroups", arg0, arg1);
@@ -1471,7 +1471,7 @@ public static Android.Database.Cursor QueryGroups(Android.Content.ContentResolve
             /// <param name="arg2"><see cref="int"/></param>
             /// <param name="arg3"><see cref="Android.Graphics.BitmapFactory.Options"/></param>
             /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Graphics.Bitmap LoadContactPhoto(Android.Content.Context arg0, Android.Net.Uri arg1, int arg2, Android.Graphics.BitmapFactory.Options arg3)
             {
                 return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "loadContactPhoto", arg0, arg1, arg2, arg3);
@@ -1483,7 +1483,7 @@ public static Android.Graphics.Bitmap LoadContactPhoto(Android.Content.Context a
             /// <param name="arg1"><see cref="long"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Net.Uri"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri AddToGroup(Android.Content.ContentResolver arg0, long arg1, Java.Lang.String arg2)
             {
                 return SExecute<Android.Net.Uri>(LocalBridgeClazz, "addToGroup", arg0, arg1, arg2);
@@ -1495,7 +1495,7 @@ public static Android.Net.Uri AddToGroup(Android.Content.ContentResolver arg0, l
             /// <param name="arg1"><see cref="long"/></param>
             /// <param name="arg2"><see cref="long"/></param>
             /// <returns><see cref="Android.Net.Uri"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri AddToGroup(Android.Content.ContentResolver arg0, long arg1, long arg2)
             {
                 return SExecute<Android.Net.Uri>(LocalBridgeClazz, "addToGroup", arg0, arg1, arg2);
@@ -1506,7 +1506,7 @@ public static Android.Net.Uri AddToGroup(Android.Content.ContentResolver arg0, l
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="long"/></param>
             /// <returns><see cref="Android.Net.Uri"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri AddToMyContactsGroup(Android.Content.ContentResolver arg0, long arg1)
             {
                 return SExecute<Android.Net.Uri>(LocalBridgeClazz, "addToMyContactsGroup", arg0, arg1);
@@ -1517,7 +1517,7 @@ public static Android.Net.Uri AddToMyContactsGroup(Android.Content.ContentResolv
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="Android.Content.ContentValues"/></param>
             /// <returns><see cref="Android.Net.Uri"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CreatePersonInMyContactsGroup(Android.Content.ContentResolver arg0, Android.Content.ContentValues arg1)
             {
                 return SExecute<Android.Net.Uri>(LocalBridgeClazz, "createPersonInMyContactsGroup", arg0, arg1);
@@ -1528,7 +1528,7 @@ public static Android.Net.Uri CreatePersonInMyContactsGroup(Android.Content.Cont
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
             /// <returns><see cref="Java.Io.InputStream"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Io.InputStream OpenContactPhotoInputStream(Android.Content.ContentResolver arg0, Android.Net.Uri arg1)
             {
                 return SExecute<Java.Io.InputStream>(LocalBridgeClazz, "openContactPhotoInputStream", arg0, arg1);
@@ -1538,7 +1538,7 @@ public static Java.Io.InputStream OpenContactPhotoInputStream(Android.Content.Co
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="long"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static void MarkAsContacted(Android.Content.ContentResolver arg0, long arg1)
             {
                 SExecute(LocalBridgeClazz, "markAsContacted", arg0, arg1);
@@ -1549,7 +1549,7 @@ public static void MarkAsContacted(Android.Content.ContentResolver arg0, long ar
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
             /// <param name="arg2"><see cref="byte"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static void SetPhotoData(Android.Content.ContentResolver arg0, Android.Net.Uri arg1, byte[] arg2)
             {
                 SExecute(LocalBridgeClazz, "setPhotoData", arg0, arg1, arg2);
@@ -1581,14 +1581,14 @@ public partial class Phones : Android.Provider.IBaseColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.Phones.html#CONTENT_DIRECTORY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String CONTENT_DIRECTORY { get { if (!_CONTENT_DIRECTORYReady) { _CONTENT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_DIRECTORY"); _CONTENT_DIRECTORYReady = true; } return _CONTENT_DIRECTORYContent; } }
                 private static Java.Lang.String _CONTENT_DIRECTORYContent = default;
                 private static bool _CONTENT_DIRECTORYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.Phones.html#DEFAULT_SORT_ORDER"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
                 private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
                 private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
@@ -1630,21 +1630,21 @@ public partial class Extensions : Android.Provider.IBaseColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.Extensions.html#CONTENT_DIRECTORY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String CONTENT_DIRECTORY { get { if (!_CONTENT_DIRECTORYReady) { _CONTENT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_DIRECTORY"); _CONTENT_DIRECTORYReady = true; } return _CONTENT_DIRECTORYContent; } }
                 private static Java.Lang.String _CONTENT_DIRECTORYContent = default;
                 private static bool _CONTENT_DIRECTORYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.Extensions.html#DEFAULT_SORT_ORDER"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
                 private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
                 private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.Extensions.html#PERSON_ID"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String PERSON_ID { get { if (!_PERSON_IDReady) { _PERSON_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PERSON_ID"); _PERSON_IDReady = true; } return _PERSON_IDContent; } }
                 private static Java.Lang.String _PERSON_IDContent = default;
                 private static bool _PERSON_IDReady = false; // this is used because in case of generics 
@@ -1686,14 +1686,14 @@ public partial class ContactMethods : Android.Provider.IBaseColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.ContactMethods.html#CONTENT_DIRECTORY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String CONTENT_DIRECTORY { get { if (!_CONTENT_DIRECTORYReady) { _CONTENT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_DIRECTORY"); _CONTENT_DIRECTORYReady = true; } return _CONTENT_DIRECTORYContent; } }
                 private static Java.Lang.String _CONTENT_DIRECTORYContent = default;
                 private static bool _CONTENT_DIRECTORYReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Contacts.People.ContactMethods.html#DEFAULT_SORT_ORDER"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
                 private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
                 private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
@@ -1738,70 +1738,70 @@ public partial class PeopleColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#CUSTOM_RINGTONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CUSTOM_RINGTONE { get { if (!_CUSTOM_RINGTONEReady) { _CUSTOM_RINGTONEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CUSTOM_RINGTONE"); _CUSTOM_RINGTONEReady = true; } return _CUSTOM_RINGTONEContent; } }
             private static Java.Lang.String _CUSTOM_RINGTONEContent = default;
             private static bool _CUSTOM_RINGTONEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#DISPLAY_NAME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DISPLAY_NAME { get { if (!_DISPLAY_NAMEReady) { _DISPLAY_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DISPLAY_NAME"); _DISPLAY_NAMEReady = true; } return _DISPLAY_NAMEContent; } }
             private static Java.Lang.String _DISPLAY_NAMEContent = default;
             private static bool _DISPLAY_NAMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#LAST_TIME_CONTACTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LAST_TIME_CONTACTED { get { if (!_LAST_TIME_CONTACTEDReady) { _LAST_TIME_CONTACTEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LAST_TIME_CONTACTED"); _LAST_TIME_CONTACTEDReady = true; } return _LAST_TIME_CONTACTEDContent; } }
             private static Java.Lang.String _LAST_TIME_CONTACTEDContent = default;
             private static bool _LAST_TIME_CONTACTEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#NAME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NAME { get { if (!_NAMEReady) { _NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NAME"); _NAMEReady = true; } return _NAMEContent; } }
             private static Java.Lang.String _NAMEContent = default;
             private static bool _NAMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#NOTES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NOTES { get { if (!_NOTESReady) { _NOTESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NOTES"); _NOTESReady = true; } return _NOTESContent; } }
             private static Java.Lang.String _NOTESContent = default;
             private static bool _NOTESReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#PHONETIC_NAME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PHONETIC_NAME { get { if (!_PHONETIC_NAMEReady) { _PHONETIC_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PHONETIC_NAME"); _PHONETIC_NAMEReady = true; } return _PHONETIC_NAMEContent; } }
             private static Java.Lang.String _PHONETIC_NAMEContent = default;
             private static bool _PHONETIC_NAMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#PHOTO_VERSION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PHOTO_VERSION { get { if (!_PHOTO_VERSIONReady) { _PHOTO_VERSIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PHOTO_VERSION"); _PHOTO_VERSIONReady = true; } return _PHOTO_VERSIONContent; } }
             private static Java.Lang.String _PHOTO_VERSIONContent = default;
             private static bool _PHOTO_VERSIONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#SEND_TO_VOICEMAIL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SEND_TO_VOICEMAIL { get { if (!_SEND_TO_VOICEMAILReady) { _SEND_TO_VOICEMAILContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SEND_TO_VOICEMAIL"); _SEND_TO_VOICEMAILReady = true; } return _SEND_TO_VOICEMAILContent; } }
             private static Java.Lang.String _SEND_TO_VOICEMAILContent = default;
             private static bool _SEND_TO_VOICEMAILReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#STARRED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String STARRED { get { if (!_STARREDReady) { _STARREDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "STARRED"); _STARREDReady = true; } return _STARREDContent; } }
             private static Java.Lang.String _STARREDContent = default;
             private static bool _STARREDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PeopleColumns.html#TIMES_CONTACTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TIMES_CONTACTED { get { if (!_TIMES_CONTACTEDReady) { _TIMES_CONTACTEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TIMES_CONTACTED"); _TIMES_CONTACTEDReady = true; } return _TIMES_CONTACTEDContent; } }
             private static Java.Lang.String _TIMES_CONTACTEDContent = default;
             private static bool _TIMES_CONTACTEDReady = false; // this is used because in case of generics 
@@ -1843,42 +1843,42 @@ public partial class Phones : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Phones.html#CONTENT_FILTER_URL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_FILTER_URL { get { if (!_CONTENT_FILTER_URLReady) { _CONTENT_FILTER_URLContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_FILTER_URL"); _CONTENT_FILTER_URLReady = true; } return _CONTENT_FILTER_URLContent; } }
             private static Android.Net.Uri _CONTENT_FILTER_URLContent = default;
             private static bool _CONTENT_FILTER_URLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Phones.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Phones.html#CONTENT_ITEM_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_ITEM_TYPE { get { if (!_CONTENT_ITEM_TYPEReady) { _CONTENT_ITEM_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_ITEM_TYPE"); _CONTENT_ITEM_TYPEReady = true; } return _CONTENT_ITEM_TYPEContent; } }
             private static Java.Lang.String _CONTENT_ITEM_TYPEContent = default;
             private static bool _CONTENT_ITEM_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Phones.html#CONTENT_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_TYPE { get { if (!_CONTENT_TYPEReady) { _CONTENT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_TYPE"); _CONTENT_TYPEReady = true; } return _CONTENT_TYPEContent; } }
             private static Java.Lang.String _CONTENT_TYPEContent = default;
             private static bool _CONTENT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Phones.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Phones.html#PERSON_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PERSON_ID { get { if (!_PERSON_IDReady) { _PERSON_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PERSON_ID"); _PERSON_IDReady = true; } return _PERSON_IDContent; } }
             private static Java.Lang.String _PERSON_IDContent = default;
             private static bool _PERSON_IDReady = false; // this is used because in case of generics 
@@ -1894,7 +1894,7 @@ public partial class Phones : Android.Provider.IBaseColumns
             /// <param name="arg2"><see cref="Java.Lang.CharSequence"/></param>
             /// <param name="arg3"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.CharSequence GetDisplayLabel(Android.Content.Context arg0, int arg1, Java.Lang.CharSequence arg2, Java.Lang.CharSequence[] arg3)
             {
                 return SExecute<Java.Lang.CharSequence>(LocalBridgeClazz, "getDisplayLabel", arg0, arg1, arg2, arg3);
@@ -1906,7 +1906,7 @@ public static Java.Lang.CharSequence GetDisplayLabel(Android.Content.Context arg
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.CharSequence GetDisplayLabel(Android.Content.Context arg0, int arg1, Java.Lang.CharSequence arg2)
             {
                 return SExecute<Java.Lang.CharSequence>(LocalBridgeClazz, "getDisplayLabel", arg0, arg1, arg2);
@@ -1941,91 +1941,91 @@ public partial class PhonesColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE_CUSTOM"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_CUSTOM { get { if (!_TYPE_CUSTOMReady) { _TYPE_CUSTOMContent = SGetField<int>(LocalBridgeClazz, "TYPE_CUSTOM"); _TYPE_CUSTOMReady = true; } return _TYPE_CUSTOMContent; } }
             private static int _TYPE_CUSTOMContent = default;
             private static bool _TYPE_CUSTOMReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE_FAX_HOME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_FAX_HOME { get { if (!_TYPE_FAX_HOMEReady) { _TYPE_FAX_HOMEContent = SGetField<int>(LocalBridgeClazz, "TYPE_FAX_HOME"); _TYPE_FAX_HOMEReady = true; } return _TYPE_FAX_HOMEContent; } }
             private static int _TYPE_FAX_HOMEContent = default;
             private static bool _TYPE_FAX_HOMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE_FAX_WORK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_FAX_WORK { get { if (!_TYPE_FAX_WORKReady) { _TYPE_FAX_WORKContent = SGetField<int>(LocalBridgeClazz, "TYPE_FAX_WORK"); _TYPE_FAX_WORKReady = true; } return _TYPE_FAX_WORKContent; } }
             private static int _TYPE_FAX_WORKContent = default;
             private static bool _TYPE_FAX_WORKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE_HOME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_HOME { get { if (!_TYPE_HOMEReady) { _TYPE_HOMEContent = SGetField<int>(LocalBridgeClazz, "TYPE_HOME"); _TYPE_HOMEReady = true; } return _TYPE_HOMEContent; } }
             private static int _TYPE_HOMEContent = default;
             private static bool _TYPE_HOMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE_MOBILE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_MOBILE { get { if (!_TYPE_MOBILEReady) { _TYPE_MOBILEContent = SGetField<int>(LocalBridgeClazz, "TYPE_MOBILE"); _TYPE_MOBILEReady = true; } return _TYPE_MOBILEContent; } }
             private static int _TYPE_MOBILEContent = default;
             private static bool _TYPE_MOBILEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE_OTHER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_OTHER { get { if (!_TYPE_OTHERReady) { _TYPE_OTHERContent = SGetField<int>(LocalBridgeClazz, "TYPE_OTHER"); _TYPE_OTHERReady = true; } return _TYPE_OTHERContent; } }
             private static int _TYPE_OTHERContent = default;
             private static bool _TYPE_OTHERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE_PAGER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_PAGER { get { if (!_TYPE_PAGERReady) { _TYPE_PAGERContent = SGetField<int>(LocalBridgeClazz, "TYPE_PAGER"); _TYPE_PAGERReady = true; } return _TYPE_PAGERContent; } }
             private static int _TYPE_PAGERContent = default;
             private static bool _TYPE_PAGERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE_WORK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_WORK { get { if (!_TYPE_WORKReady) { _TYPE_WORKContent = SGetField<int>(LocalBridgeClazz, "TYPE_WORK"); _TYPE_WORKReady = true; } return _TYPE_WORKContent; } }
             private static int _TYPE_WORKContent = default;
             private static bool _TYPE_WORKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#ISPRIMARY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ISPRIMARY { get { if (!_ISPRIMARYReady) { _ISPRIMARYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ISPRIMARY"); _ISPRIMARYReady = true; } return _ISPRIMARYContent; } }
             private static Java.Lang.String _ISPRIMARYContent = default;
             private static bool _ISPRIMARYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#LABEL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LABEL { get { if (!_LABELReady) { _LABELContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LABEL"); _LABELReady = true; } return _LABELContent; } }
             private static Java.Lang.String _LABELContent = default;
             private static bool _LABELReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#NUMBER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NUMBER { get { if (!_NUMBERReady) { _NUMBERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NUMBER"); _NUMBERReady = true; } return _NUMBERContent; } }
             private static Java.Lang.String _NUMBERContent = default;
             private static bool _NUMBERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#NUMBER_KEY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NUMBER_KEY { get { if (!_NUMBER_KEYReady) { _NUMBER_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NUMBER_KEY"); _NUMBER_KEYReady = true; } return _NUMBER_KEYContent; } }
             private static Java.Lang.String _NUMBER_KEYContent = default;
             private static bool _NUMBER_KEYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhonesColumns.html#TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
             private static Java.Lang.String _TYPEContent = default;
             private static bool _TYPEReady = false; // this is used because in case of generics 
@@ -2067,21 +2067,21 @@ public partial class Photos : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Photos.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Photos.html#CONTENT_DIRECTORY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_DIRECTORY { get { if (!_CONTENT_DIRECTORYReady) { _CONTENT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_DIRECTORY"); _CONTENT_DIRECTORYReady = true; } return _CONTENT_DIRECTORYContent; } }
             private static Java.Lang.String _CONTENT_DIRECTORYContent = default;
             private static bool _CONTENT_DIRECTORYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Photos.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
@@ -2119,42 +2119,42 @@ public partial class PhotosColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhotosColumns.html#DATA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DATA { get { if (!_DATAReady) { _DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATA"); _DATAReady = true; } return _DATAContent; } }
             private static Java.Lang.String _DATAContent = default;
             private static bool _DATAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhotosColumns.html#DOWNLOAD_REQUIRED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DOWNLOAD_REQUIRED { get { if (!_DOWNLOAD_REQUIREDReady) { _DOWNLOAD_REQUIREDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DOWNLOAD_REQUIRED"); _DOWNLOAD_REQUIREDReady = true; } return _DOWNLOAD_REQUIREDContent; } }
             private static Java.Lang.String _DOWNLOAD_REQUIREDContent = default;
             private static bool _DOWNLOAD_REQUIREDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhotosColumns.html#EXISTS_ON_SERVER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXISTS_ON_SERVER { get { if (!_EXISTS_ON_SERVERReady) { _EXISTS_ON_SERVERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXISTS_ON_SERVER"); _EXISTS_ON_SERVERReady = true; } return _EXISTS_ON_SERVERContent; } }
             private static Java.Lang.String _EXISTS_ON_SERVERContent = default;
             private static bool _EXISTS_ON_SERVERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhotosColumns.html#LOCAL_VERSION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCAL_VERSION { get { if (!_LOCAL_VERSIONReady) { _LOCAL_VERSIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCAL_VERSION"); _LOCAL_VERSIONReady = true; } return _LOCAL_VERSIONContent; } }
             private static Java.Lang.String _LOCAL_VERSIONContent = default;
             private static bool _LOCAL_VERSIONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhotosColumns.html#PERSON_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PERSON_ID { get { if (!_PERSON_IDReady) { _PERSON_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PERSON_ID"); _PERSON_IDReady = true; } return _PERSON_IDContent; } }
             private static Java.Lang.String _PERSON_IDContent = default;
             private static bool _PERSON_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PhotosColumns.html#SYNC_ERROR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SYNC_ERROR { get { if (!_SYNC_ERRORReady) { _SYNC_ERRORContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SYNC_ERROR"); _SYNC_ERRORReady = true; } return _SYNC_ERRORContent; } }
             private static Java.Lang.String _SYNC_ERRORContent = default;
             private static bool _SYNC_ERRORReady = false; // this is used because in case of generics 
@@ -2192,84 +2192,84 @@ public partial class PresenceColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#AVAILABLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int AVAILABLE { get { if (!_AVAILABLEReady) { _AVAILABLEContent = SGetField<int>(LocalBridgeClazz, "AVAILABLE"); _AVAILABLEReady = true; } return _AVAILABLEContent; } }
             private static int _AVAILABLEContent = default;
             private static bool _AVAILABLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#AWAY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int AWAY { get { if (!_AWAYReady) { _AWAYContent = SGetField<int>(LocalBridgeClazz, "AWAY"); _AWAYReady = true; } return _AWAYContent; } }
             private static int _AWAYContent = default;
             private static bool _AWAYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#DO_NOT_DISTURB"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int DO_NOT_DISTURB { get { if (!_DO_NOT_DISTURBReady) { _DO_NOT_DISTURBContent = SGetField<int>(LocalBridgeClazz, "DO_NOT_DISTURB"); _DO_NOT_DISTURBReady = true; } return _DO_NOT_DISTURBContent; } }
             private static int _DO_NOT_DISTURBContent = default;
             private static bool _DO_NOT_DISTURBReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#IDLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int IDLE { get { if (!_IDLEReady) { _IDLEContent = SGetField<int>(LocalBridgeClazz, "IDLE"); _IDLEReady = true; } return _IDLEContent; } }
             private static int _IDLEContent = default;
             private static bool _IDLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#INVISIBLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int INVISIBLE { get { if (!_INVISIBLEReady) { _INVISIBLEContent = SGetField<int>(LocalBridgeClazz, "INVISIBLE"); _INVISIBLEReady = true; } return _INVISIBLEContent; } }
             private static int _INVISIBLEContent = default;
             private static bool _INVISIBLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#OFFLINE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int OFFLINE { get { if (!_OFFLINEReady) { _OFFLINEContent = SGetField<int>(LocalBridgeClazz, "OFFLINE"); _OFFLINEReady = true; } return _OFFLINEContent; } }
             private static int _OFFLINEContent = default;
             private static bool _OFFLINEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#IM_ACCOUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String IM_ACCOUNT { get { if (!_IM_ACCOUNTReady) { _IM_ACCOUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "IM_ACCOUNT"); _IM_ACCOUNTReady = true; } return _IM_ACCOUNTContent; } }
             private static Java.Lang.String _IM_ACCOUNTContent = default;
             private static bool _IM_ACCOUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#IM_HANDLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String IM_HANDLE { get { if (!_IM_HANDLEReady) { _IM_HANDLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "IM_HANDLE"); _IM_HANDLEReady = true; } return _IM_HANDLEContent; } }
             private static Java.Lang.String _IM_HANDLEContent = default;
             private static bool _IM_HANDLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#IM_PROTOCOL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String IM_PROTOCOL { get { if (!_IM_PROTOCOLReady) { _IM_PROTOCOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "IM_PROTOCOL"); _IM_PROTOCOLReady = true; } return _IM_PROTOCOLContent; } }
             private static Java.Lang.String _IM_PROTOCOLContent = default;
             private static bool _IM_PROTOCOLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#PRESENCE_CUSTOM_STATUS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PRESENCE_CUSTOM_STATUS { get { if (!_PRESENCE_CUSTOM_STATUSReady) { _PRESENCE_CUSTOM_STATUSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PRESENCE_CUSTOM_STATUS"); _PRESENCE_CUSTOM_STATUSReady = true; } return _PRESENCE_CUSTOM_STATUSContent; } }
             private static Java.Lang.String _PRESENCE_CUSTOM_STATUSContent = default;
             private static bool _PRESENCE_CUSTOM_STATUSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#PRESENCE_STATUS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PRESENCE_STATUS { get { if (!_PRESENCE_STATUSReady) { _PRESENCE_STATUSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PRESENCE_STATUS"); _PRESENCE_STATUSReady = true; } return _PRESENCE_STATUSContent; } }
             private static Java.Lang.String _PRESENCE_STATUSContent = default;
             private static bool _PRESENCE_STATUSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.PresenceColumns.html#PRIORITY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PRIORITY { get { if (!_PRIORITYReady) { _PRIORITYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PRIORITY"); _PRIORITYReady = true; } return _PRIORITYContent; } }
             private static Java.Lang.String _PRIORITYContent = default;
             private static bool _PRIORITYReady = false; // this is used because in case of generics 
@@ -2311,28 +2311,28 @@ public partial class Settings : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Settings.html#CONTENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_URI { get { if (!_CONTENT_URIReady) { _CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_URI"); _CONTENT_URIReady = true; } return _CONTENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_URIContent = default;
             private static bool _CONTENT_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Settings.html#CONTENT_DIRECTORY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String CONTENT_DIRECTORY { get { if (!_CONTENT_DIRECTORYReady) { _CONTENT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_DIRECTORY"); _CONTENT_DIRECTORYReady = true; } return _CONTENT_DIRECTORYContent; } }
             private static Java.Lang.String _CONTENT_DIRECTORYContent = default;
             private static bool _CONTENT_DIRECTORYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Settings.html#DEFAULT_SORT_ORDER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
             private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
             private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.Settings.html#SYNC_EVERYTHING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SYNC_EVERYTHING { get { if (!_SYNC_EVERYTHINGReady) { _SYNC_EVERYTHINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SYNC_EVERYTHING"); _SYNC_EVERYTHINGReady = true; } return _SYNC_EVERYTHINGContent; } }
             private static Java.Lang.String _SYNC_EVERYTHINGContent = default;
             private static bool _SYNC_EVERYTHINGReady = false; // this is used because in case of generics 
@@ -2347,7 +2347,7 @@ public partial class Settings : Android.Provider.IBaseColumns
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String GetSetting(Android.Content.ContentResolver arg0, Java.Lang.String arg1, Java.Lang.String arg2)
             {
                 return SExecute<Java.Lang.String>(LocalBridgeClazz, "getSetting", arg0, arg1, arg2);
@@ -2359,7 +2359,7 @@ public static Java.Lang.String GetSetting(Android.Content.ContentResolver arg0,
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
             /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static void SetSetting(Android.Content.ContentResolver arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3)
             {
                 SExecute(LocalBridgeClazz, "setSetting", arg0, arg1, arg2, arg3);
@@ -2394,28 +2394,28 @@ public partial class SettingsColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.SettingsColumns.html#_SYNC_ACCOUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String _SYNC_ACCOUNT { get { if (!__SYNC_ACCOUNTReady) { __SYNC_ACCOUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "_SYNC_ACCOUNT"); __SYNC_ACCOUNTReady = true; } return __SYNC_ACCOUNTContent; } }
             private static Java.Lang.String __SYNC_ACCOUNTContent = default;
             private static bool __SYNC_ACCOUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.SettingsColumns.html#_SYNC_ACCOUNT_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String _SYNC_ACCOUNT_TYPE { get { if (!__SYNC_ACCOUNT_TYPEReady) { __SYNC_ACCOUNT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "_SYNC_ACCOUNT_TYPE"); __SYNC_ACCOUNT_TYPEReady = true; } return __SYNC_ACCOUNT_TYPEContent; } }
             private static Java.Lang.String __SYNC_ACCOUNT_TYPEContent = default;
             private static bool __SYNC_ACCOUNT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.SettingsColumns.html#KEY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String KEY { get { if (!_KEYReady) { _KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY"); _KEYReady = true; } return _KEYContent; } }
             private static Java.Lang.String _KEYContent = default;
             private static bool _KEYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Contacts.SettingsColumns.html#VALUE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String VALUE { get { if (!_VALUEReady) { _VALUEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "VALUE"); _VALUEReady = true; } return _VALUEContent; } }
             private static Java.Lang.String _VALUEContent = default;
             private static bool _VALUEReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Provider/ContactsContract.cs b/src/net/Netdroid/Generated/Android/Provider/ContactsContract.cs
index 887cc69f1..771b7657f 100644
--- a/src/net/Netdroid/Generated/Android/Provider/ContactsContract.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/ContactsContract.cs
@@ -1419,7 +1419,7 @@ public partial class Nickname
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Nickname.html#TYPE_MAINDEN_NAME"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int TYPE_MAINDEN_NAME { get { if (!_TYPE_MAINDEN_NAMEReady) { _TYPE_MAINDEN_NAMEContent = SGetField<int>(LocalBridgeClazz, "TYPE_MAINDEN_NAME"); _TYPE_MAINDEN_NAMEReady = true; } return _TYPE_MAINDEN_NAMEContent; } }
                 private static int _TYPE_MAINDEN_NAMEContent = default;
                 private static bool _TYPE_MAINDEN_NAMEReady = false; // this is used because in case of generics 
@@ -1499,7 +1499,7 @@ public partial class Im
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_AIM"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_AIM { get { if (!_PROTOCOL_AIMReady) { _PROTOCOL_AIMContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_AIM"); _PROTOCOL_AIMReady = true; } return _PROTOCOL_AIMContent; } }
                 private static int _PROTOCOL_AIMContent = default;
                 private static bool _PROTOCOL_AIMReady = false; // this is used because in case of generics 
@@ -1512,56 +1512,56 @@ public partial class Im
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_GOOGLE_TALK"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_GOOGLE_TALK { get { if (!_PROTOCOL_GOOGLE_TALKReady) { _PROTOCOL_GOOGLE_TALKContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_GOOGLE_TALK"); _PROTOCOL_GOOGLE_TALKReady = true; } return _PROTOCOL_GOOGLE_TALKContent; } }
                 private static int _PROTOCOL_GOOGLE_TALKContent = default;
                 private static bool _PROTOCOL_GOOGLE_TALKReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_ICQ"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_ICQ { get { if (!_PROTOCOL_ICQReady) { _PROTOCOL_ICQContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_ICQ"); _PROTOCOL_ICQReady = true; } return _PROTOCOL_ICQContent; } }
                 private static int _PROTOCOL_ICQContent = default;
                 private static bool _PROTOCOL_ICQReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_JABBER"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_JABBER { get { if (!_PROTOCOL_JABBERReady) { _PROTOCOL_JABBERContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_JABBER"); _PROTOCOL_JABBERReady = true; } return _PROTOCOL_JABBERContent; } }
                 private static int _PROTOCOL_JABBERContent = default;
                 private static bool _PROTOCOL_JABBERReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_MSN"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_MSN { get { if (!_PROTOCOL_MSNReady) { _PROTOCOL_MSNContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_MSN"); _PROTOCOL_MSNReady = true; } return _PROTOCOL_MSNContent; } }
                 private static int _PROTOCOL_MSNContent = default;
                 private static bool _PROTOCOL_MSNReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_NETMEETING"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_NETMEETING { get { if (!_PROTOCOL_NETMEETINGReady) { _PROTOCOL_NETMEETINGContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_NETMEETING"); _PROTOCOL_NETMEETINGReady = true; } return _PROTOCOL_NETMEETINGContent; } }
                 private static int _PROTOCOL_NETMEETINGContent = default;
                 private static bool _PROTOCOL_NETMEETINGReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_QQ"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_QQ { get { if (!_PROTOCOL_QQReady) { _PROTOCOL_QQContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_QQ"); _PROTOCOL_QQReady = true; } return _PROTOCOL_QQContent; } }
                 private static int _PROTOCOL_QQContent = default;
                 private static bool _PROTOCOL_QQReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_SKYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_SKYPE { get { if (!_PROTOCOL_SKYPEReady) { _PROTOCOL_SKYPEContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_SKYPE"); _PROTOCOL_SKYPEReady = true; } return _PROTOCOL_SKYPEContent; } }
                 private static int _PROTOCOL_SKYPEContent = default;
                 private static bool _PROTOCOL_SKYPEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.CommonDataKinds.Im.html#PROTOCOL_YAHOO"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int PROTOCOL_YAHOO { get { if (!_PROTOCOL_YAHOOReady) { _PROTOCOL_YAHOOContent = SGetField<int>(LocalBridgeClazz, "PROTOCOL_YAHOO"); _PROTOCOL_YAHOOReady = true; } return _PROTOCOL_YAHOOContent; } }
                 private static int _PROTOCOL_YAHOOContent = default;
                 private static bool _PROTOCOL_YAHOOReady = false; // this is used because in case of generics 
@@ -2261,7 +2261,7 @@ public partial class Contacts : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.Contacts.html#CONTENT_FREQUENT_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri CONTENT_FREQUENT_URI { get { if (!_CONTENT_FREQUENT_URIReady) { _CONTENT_FREQUENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "CONTENT_FREQUENT_URI"); _CONTENT_FREQUENT_URIReady = true; } return _CONTENT_FREQUENT_URIContent; } }
             private static Android.Net.Uri _CONTENT_FREQUENT_URIContent = default;
             private static bool _CONTENT_FREQUENT_URIReady = false; // this is used because in case of generics 
@@ -2430,7 +2430,7 @@ public static Java.Io.InputStream OpenContactPhotoInputStream(Android.Content.Co
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="long"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static void MarkAsContacted(Android.Content.ContentResolver arg0, long arg1)
             {
                 SExecute(LocalBridgeClazz, "markAsContacted", arg0, arg1);
@@ -2802,42 +2802,42 @@ public partial class DataUsageFeedback
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.DataUsageFeedback.html#DELETE_USAGE_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri DELETE_USAGE_URI { get { if (!_DELETE_USAGE_URIReady) { _DELETE_USAGE_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "DELETE_USAGE_URI"); _DELETE_USAGE_URIReady = true; } return _DELETE_USAGE_URIContent; } }
             private static Android.Net.Uri _DELETE_USAGE_URIContent = default;
             private static bool _DELETE_USAGE_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.DataUsageFeedback.html#FEEDBACK_URI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Net.Uri FEEDBACK_URI { get { if (!_FEEDBACK_URIReady) { _FEEDBACK_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "FEEDBACK_URI"); _FEEDBACK_URIReady = true; } return _FEEDBACK_URIContent; } }
             private static Android.Net.Uri _FEEDBACK_URIContent = default;
             private static bool _FEEDBACK_URIReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.DataUsageFeedback.html#USAGE_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USAGE_TYPE { get { if (!_USAGE_TYPEReady) { _USAGE_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USAGE_TYPE"); _USAGE_TYPEReady = true; } return _USAGE_TYPEContent; } }
             private static Java.Lang.String _USAGE_TYPEContent = default;
             private static bool _USAGE_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.DataUsageFeedback.html#USAGE_TYPE_CALL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USAGE_TYPE_CALL { get { if (!_USAGE_TYPE_CALLReady) { _USAGE_TYPE_CALLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USAGE_TYPE_CALL"); _USAGE_TYPE_CALLReady = true; } return _USAGE_TYPE_CALLContent; } }
             private static Java.Lang.String _USAGE_TYPE_CALLContent = default;
             private static bool _USAGE_TYPE_CALLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.DataUsageFeedback.html#USAGE_TYPE_LONG_TEXT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USAGE_TYPE_LONG_TEXT { get { if (!_USAGE_TYPE_LONG_TEXTReady) { _USAGE_TYPE_LONG_TEXTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USAGE_TYPE_LONG_TEXT"); _USAGE_TYPE_LONG_TEXTReady = true; } return _USAGE_TYPE_LONG_TEXTContent; } }
             private static Java.Lang.String _USAGE_TYPE_LONG_TEXTContent = default;
             private static bool _USAGE_TYPE_LONG_TEXTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.DataUsageFeedback.html#USAGE_TYPE_SHORT_TEXT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USAGE_TYPE_SHORT_TEXT { get { if (!_USAGE_TYPE_SHORT_TEXTReady) { _USAGE_TYPE_SHORT_TEXTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USAGE_TYPE_SHORT_TEXT"); _USAGE_TYPE_SHORT_TEXTReady = true; } return _USAGE_TYPE_SHORT_TEXTContent; } }
             private static Java.Lang.String _USAGE_TYPE_SHORT_TEXTContent = default;
             private static bool _USAGE_TYPE_SHORT_TEXTReady = false; // this is used because in case of generics 
@@ -4300,7 +4300,7 @@ public partial class RawContacts : Android.Provider.IBaseColumns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.RawContacts.html#AGGREGATION_MODE_IMMEDIATE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int AGGREGATION_MODE_IMMEDIATE { get { if (!_AGGREGATION_MODE_IMMEDIATEReady) { _AGGREGATION_MODE_IMMEDIATEContent = SGetField<int>(LocalBridgeClazz, "AGGREGATION_MODE_IMMEDIATE"); _AGGREGATION_MODE_IMMEDIATEReady = true; } return _AGGREGATION_MODE_IMMEDIATEContent; } }
             private static int _AGGREGATION_MODE_IMMEDIATEContent = default;
             private static bool _AGGREGATION_MODE_IMMEDIATEReady = false; // this is used because in case of generics 
@@ -4720,40 +4720,44 @@ public partial class SimAccount
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#getAccountName()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#describeContents()"/>
             /// </summary>
-            public Java.Lang.String AccountName
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getAccountName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#getAccountType()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#getEfType()"/>
             /// </summary>
-            public Java.Lang.String AccountType
+            /// <returns><see cref="int"/></returns>
+            public int GetEfType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getAccountType", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getEfType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#getEfType()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#getSimSlotIndex()"/>
             /// </summary>
-            public int EfType
+            /// <returns><see cref="int"/></returns>
+            public int GetSimSlotIndex()
             {
-                get { return IExecuteWithSignature<int>("getEfType", "()I"); }
+                return IExecuteWithSignature<int>("getSimSlotIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#getSimSlotIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#getAccountName()"/>
             /// </summary>
-            public int SimSlotIndex
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetAccountName()
             {
-                get { return IExecuteWithSignature<int>("getSimSlotIndex", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getAccountName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#getAccountType()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetAccountType()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getAccountType", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/ContactsContract.SimAccount.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Provider/DocumentsContract.cs b/src/net/Netdroid/Generated/Android/Provider/DocumentsContract.cs
index d930704ec..ce4c2b468 100644
--- a/src/net/Netdroid/Generated/Android/Provider/DocumentsContract.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/DocumentsContract.cs
@@ -680,26 +680,28 @@ public Path(Java.Lang.String arg0, Java.Util.List<Java.Lang.String> arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/DocumentsContract.Path.html#getPath()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/DocumentsContract.Path.html#describeContents()"/>
             /// </summary>
-            public Java.Util.List<Java.Lang.String> GetPath
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPath", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/DocumentsContract.Path.html#getRootId()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/DocumentsContract.Path.html#getRootId()"/>
             /// </summary>
-            public Java.Lang.String RootId
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetRootId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getRootId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getRootId", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/DocumentsContract.Path.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/provider/DocumentsContract.Path.html#getPath()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Java.Lang.String> GetPath()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPath", "()Ljava/util/List;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/DocumentsContract.Path.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Provider/FontRequest.cs b/src/net/Netdroid/Generated/Android/Provider/FontRequest.cs
index d0cb9d20c..a5261facd 100644
--- a/src/net/Netdroid/Generated/Android/Provider/FontRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/FontRequest.cs
@@ -36,7 +36,7 @@ public partial class FontRequest
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Util.List"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FontRequest(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Util.List<Java.Util.List<byte[]>> arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public FontRequest(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.Strin
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FontRequest(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
             : base(arg0, arg1, arg2)
         {
@@ -69,36 +69,40 @@ public FontRequest(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.Strin
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html#getCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html#getProviderAuthority()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Java.Util.List<byte[]>> Certificates
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetProviderAuthority()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Util.List<byte[]>>>("getCertificates", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProviderAuthority", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html#getProviderAuthority()"/> 
+        /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html#getProviderPackage()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String ProviderAuthority
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetProviderPackage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProviderAuthority", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProviderPackage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html#getProviderPackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html#getQuery()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String ProviderPackage
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetQuery()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProviderPackage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getQuery", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html#getQuery()"/> 
+        /// <see href="https://developer.android.com/reference/android/provider/FontRequest.html#getCertificates()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Query
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Java.Util.List<byte[]>> GetCertificates()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getQuery", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Util.List<byte[]>>>("getCertificates", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Provider/FontsContract.cs b/src/net/Netdroid/Generated/Android/Provider/FontsContract.cs
index cde8f5569..4c8a15c61 100644
--- a/src/net/Netdroid/Generated/Android/Provider/FontsContract.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/FontsContract.cs
@@ -48,7 +48,7 @@ public partial class FontsContract
         /// <param name="arg1"><see cref="Android.Os.CancellationSignal"/></param>
         /// <param name="arg2"><see cref="Android.Provider.FontsContract.FontInfo"/></param>
         /// <returns><see cref="Android.Graphics.Typeface"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Graphics.Typeface BuildTypeface(Android.Content.Context arg0, Android.Os.CancellationSignal arg1, Android.Provider.FontsContract.FontInfo[] arg2)
         {
             return SExecute<Android.Graphics.Typeface>(LocalBridgeClazz, "buildTypeface", arg0, arg1, arg2);
@@ -61,7 +61,7 @@ public static Android.Graphics.Typeface BuildTypeface(Android.Content.Context ar
         /// <param name="arg2"><see cref="Android.Provider.FontRequest"/></param>
         /// <returns><see cref="Android.Provider.FontsContract.FontFamilyResult"/></returns>
         /// <exception cref="Android.Content.Pm.PackageManager.NameNotFoundException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Provider.FontsContract.FontFamilyResult FetchFonts(Android.Content.Context arg0, Android.Os.CancellationSignal arg1, Android.Provider.FontRequest arg2)
         {
             return SExecute<Android.Provider.FontsContract.FontFamilyResult>(LocalBridgeClazz, "fetchFonts", arg0, arg1, arg2);
@@ -74,7 +74,7 @@ public static Android.Provider.FontsContract.FontFamilyResult FetchFonts(Android
         /// <param name="arg2"><see cref="Android.Os.Handler"/></param>
         /// <param name="arg3"><see cref="Android.Os.CancellationSignal"/></param>
         /// <param name="arg4"><see cref="Android.Provider.FontsContract.FontRequestCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void RequestFonts(Android.Content.Context arg0, Android.Provider.FontRequest arg1, Android.Os.Handler arg2, Android.Os.CancellationSignal arg3, Android.Provider.FontsContract.FontRequestCallback arg4)
         {
             SExecute(LocalBridgeClazz, "requestFonts", arg0, arg1, arg2, arg3, arg4);
@@ -102,70 +102,70 @@ public partial class Columns
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#RESULT_CODE_FONT_NOT_FOUND"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RESULT_CODE_FONT_NOT_FOUND { get { if (!_RESULT_CODE_FONT_NOT_FOUNDReady) { _RESULT_CODE_FONT_NOT_FOUNDContent = SGetField<int>(LocalBridgeClazz, "RESULT_CODE_FONT_NOT_FOUND"); _RESULT_CODE_FONT_NOT_FOUNDReady = true; } return _RESULT_CODE_FONT_NOT_FOUNDContent; } }
             private static int _RESULT_CODE_FONT_NOT_FOUNDContent = default;
             private static bool _RESULT_CODE_FONT_NOT_FOUNDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#RESULT_CODE_FONT_UNAVAILABLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RESULT_CODE_FONT_UNAVAILABLE { get { if (!_RESULT_CODE_FONT_UNAVAILABLEReady) { _RESULT_CODE_FONT_UNAVAILABLEContent = SGetField<int>(LocalBridgeClazz, "RESULT_CODE_FONT_UNAVAILABLE"); _RESULT_CODE_FONT_UNAVAILABLEReady = true; } return _RESULT_CODE_FONT_UNAVAILABLEContent; } }
             private static int _RESULT_CODE_FONT_UNAVAILABLEContent = default;
             private static bool _RESULT_CODE_FONT_UNAVAILABLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#RESULT_CODE_MALFORMED_QUERY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RESULT_CODE_MALFORMED_QUERY { get { if (!_RESULT_CODE_MALFORMED_QUERYReady) { _RESULT_CODE_MALFORMED_QUERYContent = SGetField<int>(LocalBridgeClazz, "RESULT_CODE_MALFORMED_QUERY"); _RESULT_CODE_MALFORMED_QUERYReady = true; } return _RESULT_CODE_MALFORMED_QUERYContent; } }
             private static int _RESULT_CODE_MALFORMED_QUERYContent = default;
             private static bool _RESULT_CODE_MALFORMED_QUERYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#RESULT_CODE_OK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int RESULT_CODE_OK { get { if (!_RESULT_CODE_OKReady) { _RESULT_CODE_OKContent = SGetField<int>(LocalBridgeClazz, "RESULT_CODE_OK"); _RESULT_CODE_OKReady = true; } return _RESULT_CODE_OKContent; } }
             private static int _RESULT_CODE_OKContent = default;
             private static bool _RESULT_CODE_OKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#FILE_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String FILE_ID { get { if (!_FILE_IDReady) { _FILE_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FILE_ID"); _FILE_IDReady = true; } return _FILE_IDContent; } }
             private static Java.Lang.String _FILE_IDContent = default;
             private static bool _FILE_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#ITALIC"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ITALIC { get { if (!_ITALICReady) { _ITALICContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ITALIC"); _ITALICReady = true; } return _ITALICContent; } }
             private static Java.Lang.String _ITALICContent = default;
             private static bool _ITALICReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#RESULT_CODE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String RESULT_CODE { get { if (!_RESULT_CODEReady) { _RESULT_CODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "RESULT_CODE"); _RESULT_CODEReady = true; } return _RESULT_CODEContent; } }
             private static Java.Lang.String _RESULT_CODEContent = default;
             private static bool _RESULT_CODEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#TTC_INDEX"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TTC_INDEX { get { if (!_TTC_INDEXReady) { _TTC_INDEXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TTC_INDEX"); _TTC_INDEXReady = true; } return _TTC_INDEXContent; } }
             private static Java.Lang.String _TTC_INDEXContent = default;
             private static bool _TTC_INDEXReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#VARIATION_SETTINGS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String VARIATION_SETTINGS { get { if (!_VARIATION_SETTINGSReady) { _VARIATION_SETTINGSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "VARIATION_SETTINGS"); _VARIATION_SETTINGSReady = true; } return _VARIATION_SETTINGSContent; } }
             private static Java.Lang.String _VARIATION_SETTINGSContent = default;
             private static bool _VARIATION_SETTINGSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.Columns.html#WEIGHT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WEIGHT { get { if (!_WEIGHTReady) { _WEIGHTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WEIGHT"); _WEIGHTReady = true; } return _WEIGHTContent; } }
             private static Java.Lang.String _WEIGHTContent = default;
             private static bool _WEIGHTReady = false; // this is used because in case of generics 
@@ -203,28 +203,28 @@ public partial class FontFamilyResult
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html#STATUS_OK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_OK { get { if (!_STATUS_OKReady) { _STATUS_OKContent = SGetField<int>(LocalBridgeClazz, "STATUS_OK"); _STATUS_OKReady = true; } return _STATUS_OKContent; } }
             private static int _STATUS_OKContent = default;
             private static bool _STATUS_OKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html#STATUS_REJECTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_REJECTED { get { if (!_STATUS_REJECTEDReady) { _STATUS_REJECTEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_REJECTED"); _STATUS_REJECTEDReady = true; } return _STATUS_REJECTEDContent; } }
             private static int _STATUS_REJECTEDContent = default;
             private static bool _STATUS_REJECTEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html#STATUS_UNEXPECTED_DATA_PROVIDED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_UNEXPECTED_DATA_PROVIDED { get { if (!_STATUS_UNEXPECTED_DATA_PROVIDEDReady) { _STATUS_UNEXPECTED_DATA_PROVIDEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_UNEXPECTED_DATA_PROVIDED"); _STATUS_UNEXPECTED_DATA_PROVIDEDReady = true; } return _STATUS_UNEXPECTED_DATA_PROVIDEDContent; } }
             private static int _STATUS_UNEXPECTED_DATA_PROVIDEDContent = default;
             private static bool _STATUS_UNEXPECTED_DATA_PROVIDEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html#STATUS_WRONG_CERTIFICATES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int STATUS_WRONG_CERTIFICATES { get { if (!_STATUS_WRONG_CERTIFICATESReady) { _STATUS_WRONG_CERTIFICATESContent = SGetField<int>(LocalBridgeClazz, "STATUS_WRONG_CERTIFICATES"); _STATUS_WRONG_CERTIFICATESReady = true; } return _STATUS_WRONG_CERTIFICATESContent; } }
             private static int _STATUS_WRONG_CERTIFICATESContent = default;
             private static bool _STATUS_WRONG_CERTIFICATESReady = false; // this is used because in case of generics 
@@ -237,20 +237,22 @@ public partial class FontFamilyResult
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html#getFonts()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html#getFonts()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Provider.FontsContract.FontInfo[] Fonts
+            /// <returns><see cref="Android.Provider.FontsContract.FontInfo"/></returns>
+            [global::System.Obsolete()]
+            public Android.Provider.FontsContract.FontInfo[] GetFonts()
             {
-                get { return IExecuteWithSignatureArray<Android.Provider.FontsContract.FontInfo>("getFonts", "()[Landroid/provider/FontsContract$FontInfo;"); }
+                return IExecuteWithSignatureArray<Android.Provider.FontsContract.FontInfo>("getFonts", "()[Landroid/provider/FontsContract$FontInfo;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html#getStatusCode()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontFamilyResult.html#getStatusCode()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int StatusCode
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetStatusCode()
             {
-                get { return IExecuteWithSignature<int>("getStatusCode", "()I"); }
+                return IExecuteWithSignature<int>("getStatusCode", "()I");
             }
 
             #endregion
@@ -284,53 +286,58 @@ public partial class FontInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getAxes()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getAxes()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Graphics.Fonts.FontVariationAxis[] Axes
+            /// <returns><see cref="Android.Graphics.Fonts.FontVariationAxis"/></returns>
+            [global::System.Obsolete()]
+            public Android.Graphics.Fonts.FontVariationAxis[] GetAxes()
             {
-                get { return IExecuteWithSignatureArray<Android.Graphics.Fonts.FontVariationAxis>("getAxes", "()[Landroid/graphics/fonts/FontVariationAxis;"); }
+                return IExecuteWithSignatureArray<Android.Graphics.Fonts.FontVariationAxis>("getAxes", "()[Landroid/graphics/fonts/FontVariationAxis;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getResultCode()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getUri()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int ResultCode
+            /// <returns><see cref="Android.Net.Uri"/></returns>
+            [global::System.Obsolete()]
+            public Android.Net.Uri GetUri()
             {
-                get { return IExecuteWithSignature<int>("getResultCode", "()I"); }
+                return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getTtcIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#isItalic()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int TtcIndex
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool IsItalic()
             {
-                get { return IExecuteWithSignature<int>("getTtcIndex", "()I"); }
+                return IExecuteWithSignature<bool>("isItalic", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getUri()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getResultCode()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Net.Uri Uri
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetResultCode()
             {
-                get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+                return IExecuteWithSignature<int>("getResultCode", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getWeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getTtcIndex()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int Weight
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetTtcIndex()
             {
-                get { return IExecuteWithSignature<int>("getWeight", "()I"); }
+                return IExecuteWithSignature<int>("getTtcIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#isItalic()"/>
+            /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontInfo.html#getWeight()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
-            public bool IsItalic()
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetWeight()
             {
-                return IExecuteWithSignature<bool>("isItalic", "()Z");
+                return IExecuteWithSignature<int>("getWeight", "()I");
             }
 
             #endregion
@@ -358,42 +365,42 @@ public partial class FontRequestCallback
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html#FAIL_REASON_FONT_LOAD_ERROR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FAIL_REASON_FONT_LOAD_ERROR { get { if (!_FAIL_REASON_FONT_LOAD_ERRORReady) { _FAIL_REASON_FONT_LOAD_ERRORContent = SGetField<int>(LocalBridgeClazz, "FAIL_REASON_FONT_LOAD_ERROR"); _FAIL_REASON_FONT_LOAD_ERRORReady = true; } return _FAIL_REASON_FONT_LOAD_ERRORContent; } }
             private static int _FAIL_REASON_FONT_LOAD_ERRORContent = default;
             private static bool _FAIL_REASON_FONT_LOAD_ERRORReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html#FAIL_REASON_FONT_NOT_FOUND"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FAIL_REASON_FONT_NOT_FOUND { get { if (!_FAIL_REASON_FONT_NOT_FOUNDReady) { _FAIL_REASON_FONT_NOT_FOUNDContent = SGetField<int>(LocalBridgeClazz, "FAIL_REASON_FONT_NOT_FOUND"); _FAIL_REASON_FONT_NOT_FOUNDReady = true; } return _FAIL_REASON_FONT_NOT_FOUNDContent; } }
             private static int _FAIL_REASON_FONT_NOT_FOUNDContent = default;
             private static bool _FAIL_REASON_FONT_NOT_FOUNDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html#FAIL_REASON_FONT_UNAVAILABLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FAIL_REASON_FONT_UNAVAILABLE { get { if (!_FAIL_REASON_FONT_UNAVAILABLEReady) { _FAIL_REASON_FONT_UNAVAILABLEContent = SGetField<int>(LocalBridgeClazz, "FAIL_REASON_FONT_UNAVAILABLE"); _FAIL_REASON_FONT_UNAVAILABLEReady = true; } return _FAIL_REASON_FONT_UNAVAILABLEContent; } }
             private static int _FAIL_REASON_FONT_UNAVAILABLEContent = default;
             private static bool _FAIL_REASON_FONT_UNAVAILABLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html#FAIL_REASON_MALFORMED_QUERY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FAIL_REASON_MALFORMED_QUERY { get { if (!_FAIL_REASON_MALFORMED_QUERYReady) { _FAIL_REASON_MALFORMED_QUERYContent = SGetField<int>(LocalBridgeClazz, "FAIL_REASON_MALFORMED_QUERY"); _FAIL_REASON_MALFORMED_QUERYReady = true; } return _FAIL_REASON_MALFORMED_QUERYContent; } }
             private static int _FAIL_REASON_MALFORMED_QUERYContent = default;
             private static bool _FAIL_REASON_MALFORMED_QUERYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html#FAIL_REASON_PROVIDER_NOT_FOUND"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FAIL_REASON_PROVIDER_NOT_FOUND { get { if (!_FAIL_REASON_PROVIDER_NOT_FOUNDReady) { _FAIL_REASON_PROVIDER_NOT_FOUNDContent = SGetField<int>(LocalBridgeClazz, "FAIL_REASON_PROVIDER_NOT_FOUND"); _FAIL_REASON_PROVIDER_NOT_FOUNDReady = true; } return _FAIL_REASON_PROVIDER_NOT_FOUNDContent; } }
             private static int _FAIL_REASON_PROVIDER_NOT_FOUNDContent = default;
             private static bool _FAIL_REASON_PROVIDER_NOT_FOUNDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html#FAIL_REASON_WRONG_CERTIFICATES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FAIL_REASON_WRONG_CERTIFICATES { get { if (!_FAIL_REASON_WRONG_CERTIFICATESReady) { _FAIL_REASON_WRONG_CERTIFICATESContent = SGetField<int>(LocalBridgeClazz, "FAIL_REASON_WRONG_CERTIFICATES"); _FAIL_REASON_WRONG_CERTIFICATESReady = true; } return _FAIL_REASON_WRONG_CERTIFICATESContent; } }
             private static int _FAIL_REASON_WRONG_CERTIFICATESContent = default;
             private static bool _FAIL_REASON_WRONG_CERTIFICATESReady = false; // this is used because in case of generics 
@@ -409,7 +416,7 @@ public partial class FontRequestCallback
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html#onTypefaceRequestFailed(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnTypefaceRequestFailed(int arg0)
             {
                 IExecuteWithSignature("onTypefaceRequestFailed", "(I)V", arg0);
@@ -418,7 +425,7 @@ public void OnTypefaceRequestFailed(int arg0)
             /// <see href="https://developer.android.com/reference/android/provider/FontsContract.FontRequestCallback.html#onTypefaceRetrieved(android.graphics.Typeface)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Typeface"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnTypefaceRetrieved(Android.Graphics.Typeface arg0)
             {
                 IExecuteWithSignature("onTypefaceRetrieved", "(Landroid/graphics/Typeface;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Provider/LiveFolders.cs b/src/net/Netdroid/Generated/Android/Provider/LiveFolders.cs
index 3d39832c6..9775c15dc 100644
--- a/src/net/Netdroid/Generated/Android/Provider/LiveFolders.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/LiveFolders.cs
@@ -40,91 +40,91 @@ public partial class LiveFolders
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#DISPLAY_MODE_GRID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DISPLAY_MODE_GRID { get { if (!_DISPLAY_MODE_GRIDReady) { _DISPLAY_MODE_GRIDContent = SGetField<int>(LocalBridgeClazz, "DISPLAY_MODE_GRID"); _DISPLAY_MODE_GRIDReady = true; } return _DISPLAY_MODE_GRIDContent; } }
         private static int _DISPLAY_MODE_GRIDContent = default;
         private static bool _DISPLAY_MODE_GRIDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#DISPLAY_MODE_LIST"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DISPLAY_MODE_LIST { get { if (!_DISPLAY_MODE_LISTReady) { _DISPLAY_MODE_LISTContent = SGetField<int>(LocalBridgeClazz, "DISPLAY_MODE_LIST"); _DISPLAY_MODE_LISTReady = true; } return _DISPLAY_MODE_LISTContent; } }
         private static int _DISPLAY_MODE_LISTContent = default;
         private static bool _DISPLAY_MODE_LISTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#ACTION_CREATE_LIVE_FOLDER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_CREATE_LIVE_FOLDER { get { if (!_ACTION_CREATE_LIVE_FOLDERReady) { _ACTION_CREATE_LIVE_FOLDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_CREATE_LIVE_FOLDER"); _ACTION_CREATE_LIVE_FOLDERReady = true; } return _ACTION_CREATE_LIVE_FOLDERContent; } }
         private static Java.Lang.String _ACTION_CREATE_LIVE_FOLDERContent = default;
         private static bool _ACTION_CREATE_LIVE_FOLDERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#DESCRIPTION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String DESCRIPTION { get { if (!_DESCRIPTIONReady) { _DESCRIPTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DESCRIPTION"); _DESCRIPTIONReady = true; } return _DESCRIPTIONContent; } }
         private static Java.Lang.String _DESCRIPTIONContent = default;
         private static bool _DESCRIPTIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#EXTRA_LIVE_FOLDER_BASE_INTENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_LIVE_FOLDER_BASE_INTENT { get { if (!_EXTRA_LIVE_FOLDER_BASE_INTENTReady) { _EXTRA_LIVE_FOLDER_BASE_INTENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_LIVE_FOLDER_BASE_INTENT"); _EXTRA_LIVE_FOLDER_BASE_INTENTReady = true; } return _EXTRA_LIVE_FOLDER_BASE_INTENTContent; } }
         private static Java.Lang.String _EXTRA_LIVE_FOLDER_BASE_INTENTContent = default;
         private static bool _EXTRA_LIVE_FOLDER_BASE_INTENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#EXTRA_LIVE_FOLDER_DISPLAY_MODE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_LIVE_FOLDER_DISPLAY_MODE { get { if (!_EXTRA_LIVE_FOLDER_DISPLAY_MODEReady) { _EXTRA_LIVE_FOLDER_DISPLAY_MODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_LIVE_FOLDER_DISPLAY_MODE"); _EXTRA_LIVE_FOLDER_DISPLAY_MODEReady = true; } return _EXTRA_LIVE_FOLDER_DISPLAY_MODEContent; } }
         private static Java.Lang.String _EXTRA_LIVE_FOLDER_DISPLAY_MODEContent = default;
         private static bool _EXTRA_LIVE_FOLDER_DISPLAY_MODEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#EXTRA_LIVE_FOLDER_ICON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_LIVE_FOLDER_ICON { get { if (!_EXTRA_LIVE_FOLDER_ICONReady) { _EXTRA_LIVE_FOLDER_ICONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_LIVE_FOLDER_ICON"); _EXTRA_LIVE_FOLDER_ICONReady = true; } return _EXTRA_LIVE_FOLDER_ICONContent; } }
         private static Java.Lang.String _EXTRA_LIVE_FOLDER_ICONContent = default;
         private static bool _EXTRA_LIVE_FOLDER_ICONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#EXTRA_LIVE_FOLDER_NAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_LIVE_FOLDER_NAME { get { if (!_EXTRA_LIVE_FOLDER_NAMEReady) { _EXTRA_LIVE_FOLDER_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_LIVE_FOLDER_NAME"); _EXTRA_LIVE_FOLDER_NAMEReady = true; } return _EXTRA_LIVE_FOLDER_NAMEContent; } }
         private static Java.Lang.String _EXTRA_LIVE_FOLDER_NAMEContent = default;
         private static bool _EXTRA_LIVE_FOLDER_NAMEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#ICON_BITMAP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ICON_BITMAP { get { if (!_ICON_BITMAPReady) { _ICON_BITMAPContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ICON_BITMAP"); _ICON_BITMAPReady = true; } return _ICON_BITMAPContent; } }
         private static Java.Lang.String _ICON_BITMAPContent = default;
         private static bool _ICON_BITMAPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#ICON_PACKAGE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ICON_PACKAGE { get { if (!_ICON_PACKAGEReady) { _ICON_PACKAGEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ICON_PACKAGE"); _ICON_PACKAGEReady = true; } return _ICON_PACKAGEContent; } }
         private static Java.Lang.String _ICON_PACKAGEContent = default;
         private static bool _ICON_PACKAGEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#ICON_RESOURCE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ICON_RESOURCE { get { if (!_ICON_RESOURCEReady) { _ICON_RESOURCEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ICON_RESOURCE"); _ICON_RESOURCEReady = true; } return _ICON_RESOURCEContent; } }
         private static Java.Lang.String _ICON_RESOURCEContent = default;
         private static bool _ICON_RESOURCEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#INTENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String INTENT { get { if (!_INTENTReady) { _INTENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "INTENT"); _INTENTReady = true; } return _INTENTContent; } }
         private static Java.Lang.String _INTENTContent = default;
         private static bool _INTENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/LiveFolders.html#NAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String NAME { get { if (!_NAMEReady) { _NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NAME"); _NAMEReady = true; } return _NAMEContent; } }
         private static Java.Lang.String _NAMEContent = default;
         private static bool _NAMEReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Provider/MediaStore.cs b/src/net/Netdroid/Generated/Android/Provider/MediaStore.cs
index 2fb00561c..5a81688e6 100644
--- a/src/net/Netdroid/Generated/Android/Provider/MediaStore.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/MediaStore.cs
@@ -184,7 +184,7 @@ public partial class MediaStore
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#EXTRA_MEDIA_PLAYLIST"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_MEDIA_PLAYLIST { get { if (!_EXTRA_MEDIA_PLAYLISTReady) { _EXTRA_MEDIA_PLAYLISTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_MEDIA_PLAYLIST"); _EXTRA_MEDIA_PLAYLISTReady = true; } return _EXTRA_MEDIA_PLAYLISTContent; } }
         private static Java.Lang.String _EXTRA_MEDIA_PLAYLISTContent = default;
         private static bool _EXTRA_MEDIA_PLAYLISTReady = false; // this is used because in case of generics 
@@ -251,7 +251,7 @@ public partial class MediaStore
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#INTENT_ACTION_MUSIC_PLAYER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String INTENT_ACTION_MUSIC_PLAYER { get { if (!_INTENT_ACTION_MUSIC_PLAYERReady) { _INTENT_ACTION_MUSIC_PLAYERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "INTENT_ACTION_MUSIC_PLAYER"); _INTENT_ACTION_MUSIC_PLAYERReady = true; } return _INTENT_ACTION_MUSIC_PLAYERContent; } }
         private static Java.Lang.String _INTENT_ACTION_MUSIC_PLAYERContent = default;
         private static bool _INTENT_ACTION_MUSIC_PLAYERReady = false; // this is used because in case of generics 
@@ -368,20 +368,6 @@ public partial class MediaStore
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#getMediaScannerUri()"/> 
-        /// </summary>
-        public static Android.Net.Uri MediaScannerUri
-        {
-            get { return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "getMediaScannerUri", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#getPickImagesMaxLimit()"/> 
-        /// </summary>
-        public static int PickImagesMaxLimit
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getPickImagesMaxLimit", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#createDeleteRequest(android.content.ContentResolver,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
@@ -434,6 +420,14 @@ public static Android.Net.Uri GetDocumentUri(Android.Content.Context arg0, Andro
             return SExecute<Android.Net.Uri>(LocalBridgeClazz, "getDocumentUri", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#getMediaScannerUri()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public static Android.Net.Uri GetMediaScannerUri()
+        {
+            return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "getMediaScannerUri", "()Landroid/net/Uri;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#getMediaUri(android.content.Context,android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -458,7 +452,7 @@ public static Android.Net.Uri GetRedactedUri(Android.Content.ContentResolver arg
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
         /// <returns><see cref="Android.Net.Uri"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Net.Uri SetIncludePending(Android.Net.Uri arg0)
         {
             return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "setIncludePending", "(Landroid/net/Uri;)Landroid/net/Uri;", arg0);
@@ -533,6 +527,14 @@ public static bool IsSupportedCloudMediaProviderAuthority(Android.Content.Conten
             return SExecute<bool>(LocalBridgeClazz, "isSupportedCloudMediaProviderAuthority", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#getPickImagesMaxLimit()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int GetPickImagesMaxLimit()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getPickImagesMaxLimit", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/MediaStore.html#getVersion(android.content.Context,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -638,7 +640,7 @@ public partial class Audio
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String KeyFor(Java.Lang.String arg0)
             {
                 return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "keyFor", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
@@ -703,28 +705,28 @@ public partial class PlaylistsColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.PlaylistsColumns.html#DATA"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DATA { get { if (!_DATAReady) { _DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATA"); _DATAReady = true; } return _DATAContent; } }
                 private static Java.Lang.String _DATAContent = default;
                 private static bool _DATAReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.PlaylistsColumns.html#DATE_ADDED"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DATE_ADDED { get { if (!_DATE_ADDEDReady) { _DATE_ADDEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATE_ADDED"); _DATE_ADDEDReady = true; } return _DATE_ADDEDContent; } }
                 private static Java.Lang.String _DATE_ADDEDContent = default;
                 private static bool _DATE_ADDEDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.PlaylistsColumns.html#DATE_MODIFIED"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DATE_MODIFIED { get { if (!_DATE_MODIFIEDReady) { _DATE_MODIFIEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATE_MODIFIED"); _DATE_MODIFIEDReady = true; } return _DATE_MODIFIEDContent; } }
                 private static Java.Lang.String _DATE_MODIFIEDContent = default;
                 private static bool _DATE_MODIFIEDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.PlaylistsColumns.html#NAME"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String NAME { get { if (!_NAMEReady) { _NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NAME"); _NAMEReady = true; } return _NAMEContent; } }
                 private static Java.Lang.String _NAMEContent = default;
                 private static bool _NAMEReady = false; // this is used because in case of generics 
@@ -766,35 +768,35 @@ public partial class Playlists : Android.Provider.IBaseColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.html#EXTERNAL_CONTENT_URI"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri EXTERNAL_CONTENT_URI { get { if (!_EXTERNAL_CONTENT_URIReady) { _EXTERNAL_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "EXTERNAL_CONTENT_URI"); _EXTERNAL_CONTENT_URIReady = true; } return _EXTERNAL_CONTENT_URIContent; } }
                 private static Android.Net.Uri _EXTERNAL_CONTENT_URIContent = default;
                 private static bool _EXTERNAL_CONTENT_URIReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.html#INTERNAL_CONTENT_URI"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri INTERNAL_CONTENT_URI { get { if (!_INTERNAL_CONTENT_URIReady) { _INTERNAL_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "INTERNAL_CONTENT_URI"); _INTERNAL_CONTENT_URIReady = true; } return _INTERNAL_CONTENT_URIContent; } }
                 private static Android.Net.Uri _INTERNAL_CONTENT_URIContent = default;
                 private static bool _INTERNAL_CONTENT_URIReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.html#CONTENT_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String CONTENT_TYPE { get { if (!_CONTENT_TYPEReady) { _CONTENT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_TYPE"); _CONTENT_TYPEReady = true; } return _CONTENT_TYPEContent; } }
                 private static Java.Lang.String _CONTENT_TYPEContent = default;
                 private static bool _CONTENT_TYPEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.html#DEFAULT_SORT_ORDER"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
                 private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
                 private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.html#ENTRY_CONTENT_TYPE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String ENTRY_CONTENT_TYPE { get { if (!_ENTRY_CONTENT_TYPEReady) { _ENTRY_CONTENT_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ENTRY_CONTENT_TYPE"); _ENTRY_CONTENT_TYPEReady = true; } return _ENTRY_CONTENT_TYPEContent; } }
                 private static Java.Lang.String _ENTRY_CONTENT_TYPEContent = default;
                 private static bool _ENTRY_CONTENT_TYPEReady = false; // this is used because in case of generics 
@@ -807,7 +809,7 @@ public partial class Playlists : Android.Provider.IBaseColumns
                 /// </summary>
                 /// <param name="arg0"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Net.Uri"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri GetContentUri(Java.Lang.String arg0)
                 {
                     return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "getContentUri", "(Ljava/lang/String;)Landroid/net/Uri;", arg0);
@@ -835,42 +837,42 @@ public partial class Members
                     /// <summary>
                     /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.Members.html#_ID"/>
                     /// </summary>
-                    [System.Obsolete()]
+                    [global::System.Obsolete()]
                     public static Java.Lang.String _ID { get { if (!__IDReady) { __IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "_ID"); __IDReady = true; } return __IDContent; } }
                     private static Java.Lang.String __IDContent = default;
                     private static bool __IDReady = false; // this is used because in case of generics 
                     /// <summary>
                     /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.Members.html#AUDIO_ID"/>
                     /// </summary>
-                    [System.Obsolete()]
+                    [global::System.Obsolete()]
                     public static Java.Lang.String AUDIO_ID { get { if (!_AUDIO_IDReady) { _AUDIO_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "AUDIO_ID"); _AUDIO_IDReady = true; } return _AUDIO_IDContent; } }
                     private static Java.Lang.String _AUDIO_IDContent = default;
                     private static bool _AUDIO_IDReady = false; // this is used because in case of generics 
                     /// <summary>
                     /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.Members.html#CONTENT_DIRECTORY"/>
                     /// </summary>
-                    [System.Obsolete()]
+                    [global::System.Obsolete()]
                     public static Java.Lang.String CONTENT_DIRECTORY { get { if (!_CONTENT_DIRECTORYReady) { _CONTENT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONTENT_DIRECTORY"); _CONTENT_DIRECTORYReady = true; } return _CONTENT_DIRECTORYContent; } }
                     private static Java.Lang.String _CONTENT_DIRECTORYContent = default;
                     private static bool _CONTENT_DIRECTORYReady = false; // this is used because in case of generics 
                     /// <summary>
                     /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.Members.html#DEFAULT_SORT_ORDER"/>
                     /// </summary>
-                    [System.Obsolete()]
+                    [global::System.Obsolete()]
                     public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
                     private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
                     private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
                     /// <summary>
                     /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.Members.html#PLAY_ORDER"/>
                     /// </summary>
-                    [System.Obsolete()]
+                    [global::System.Obsolete()]
                     public static Java.Lang.String PLAY_ORDER { get { if (!_PLAY_ORDERReady) { _PLAY_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PLAY_ORDER"); _PLAY_ORDERReady = true; } return _PLAY_ORDERContent; } }
                     private static Java.Lang.String _PLAY_ORDERContent = default;
                     private static bool _PLAY_ORDERReady = false; // this is used because in case of generics 
                     /// <summary>
                     /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.Playlists.Members.html#PLAYLIST_ID"/>
                     /// </summary>
-                    [System.Obsolete()]
+                    [global::System.Obsolete()]
                     public static Java.Lang.String PLAYLIST_ID { get { if (!_PLAYLIST_IDReady) { _PLAYLIST_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PLAYLIST_ID"); _PLAYLIST_IDReady = true; } return _PLAYLIST_IDContent; } }
                     private static Java.Lang.String _PLAYLIST_IDContent = default;
                     private static bool _PLAYLIST_IDReady = false; // this is used because in case of generics 
@@ -884,7 +886,7 @@ public partial class Members
                     /// <param name="arg0"><see cref="Java.Lang.String"/></param>
                     /// <param name="arg1"><see cref="long"/></param>
                     /// <returns><see cref="Android.Net.Uri"/></returns>
-                    [System.Obsolete()]
+                    [global::System.Obsolete()]
                     public static Android.Net.Uri GetContentUri(Java.Lang.String arg0, long arg1)
                     {
                         return SExecute<Android.Net.Uri>(LocalBridgeClazz, "getContentUri", arg0, arg1);
@@ -897,7 +899,7 @@ public static Android.Net.Uri GetContentUri(Java.Lang.String arg0, long arg1)
                     /// <param name="arg2"><see cref="int"/></param>
                     /// <param name="arg3"><see cref="int"/></param>
                     /// <returns><see cref="bool"/></returns>
-                    [System.Obsolete()]
+                    [global::System.Obsolete()]
                     public static bool MoveItem(Android.Content.ContentResolver arg0, long arg1, int arg2, int arg3)
                     {
                         return SExecute<bool>(LocalBridgeClazz, "moveItem", arg0, arg1, arg2, arg3);
@@ -1006,7 +1008,7 @@ public static Android.Net.Uri GetContentUri(Java.Lang.String arg0)
                 /// </summary>
                 /// <param name="arg0"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Net.Uri"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri GetContentUriForPath(Java.Lang.String arg0)
                 {
                     return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "getContentUriForPath", "(Ljava/lang/String;)Landroid/net/Uri;", arg0);
@@ -1233,7 +1235,7 @@ public partial class AudioColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.AudioColumns.html#ALBUM_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String ALBUM_KEY { get { if (!_ALBUM_KEYReady) { _ALBUM_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ALBUM_KEY"); _ALBUM_KEYReady = true; } return _ALBUM_KEYContent; } }
                 private static Java.Lang.String _ALBUM_KEYContent = default;
                 private static bool _ALBUM_KEYReady = false; // this is used because in case of generics 
@@ -1246,7 +1248,7 @@ public partial class AudioColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.AudioColumns.html#ARTIST_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String ARTIST_KEY { get { if (!_ARTIST_KEYReady) { _ARTIST_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARTIST_KEY"); _ARTIST_KEYReady = true; } return _ARTIST_KEYContent; } }
                 private static Java.Lang.String _ARTIST_KEYContent = default;
                 private static bool _ARTIST_KEYReady = false; // this is used because in case of generics 
@@ -1271,7 +1273,7 @@ public partial class AudioColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.AudioColumns.html#GENRE_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String GENRE_KEY { get { if (!_GENRE_KEYReady) { _GENRE_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GENRE_KEY"); _GENRE_KEYReady = true; } return _GENRE_KEYContent; } }
                 private static Java.Lang.String _GENRE_KEYContent = default;
                 private static bool _GENRE_KEYReady = false; // this is used because in case of generics 
@@ -1320,7 +1322,7 @@ public partial class AudioColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.AudioColumns.html#TITLE_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String TITLE_KEY { get { if (!_TITLE_KEYReady) { _TITLE_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TITLE_KEY"); _TITLE_KEYReady = true; } return _TITLE_KEYContent; } }
                 private static Java.Lang.String _TITLE_KEYContent = default;
                 private static bool _TITLE_KEYReady = false; // this is used because in case of generics 
@@ -1501,7 +1503,7 @@ public partial class ArtistColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.ArtistColumns.html#ARTIST_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String ARTIST_KEY { get { if (!_ARTIST_KEYReady) { _ARTIST_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARTIST_KEY"); _ARTIST_KEYReady = true; } return _ARTIST_KEYContent; } }
                 private static Java.Lang.String _ARTIST_KEYContent = default;
                 private static bool _ARTIST_KEYReady = false; // this is used because in case of generics 
@@ -1631,7 +1633,7 @@ public partial class AlbumColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.AlbumColumns.html#ALBUM_ART"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String ALBUM_ART { get { if (!_ALBUM_ARTReady) { _ALBUM_ARTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ALBUM_ART"); _ALBUM_ARTReady = true; } return _ALBUM_ARTContent; } }
                 private static Java.Lang.String _ALBUM_ARTContent = default;
                 private static bool _ALBUM_ARTReady = false; // this is used because in case of generics 
@@ -1644,7 +1646,7 @@ public partial class AlbumColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.AlbumColumns.html#ALBUM_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String ALBUM_KEY { get { if (!_ALBUM_KEYReady) { _ALBUM_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ALBUM_KEY"); _ALBUM_KEYReady = true; } return _ALBUM_KEYContent; } }
                 private static Java.Lang.String _ALBUM_KEYContent = default;
                 private static bool _ALBUM_KEYReady = false; // this is used because in case of generics 
@@ -1663,7 +1665,7 @@ public partial class AlbumColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Audio.AlbumColumns.html#ARTIST_KEY"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String ARTIST_KEY { get { if (!_ARTIST_KEYReady) { _ARTIST_KEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARTIST_KEY"); _ARTIST_KEYReady = true; } return _ARTIST_KEYContent; } }
                 private static Java.Lang.String _ARTIST_KEYContent = default;
                 private static bool _ARTIST_KEYReady = false; // this is used because in case of generics 
@@ -1910,7 +1912,7 @@ public partial class FileColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Files.FileColumns.html#MEDIA_TYPE_PLAYLIST"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int MEDIA_TYPE_PLAYLIST { get { if (!_MEDIA_TYPE_PLAYLISTReady) { _MEDIA_TYPE_PLAYLISTContent = SGetField<int>(LocalBridgeClazz, "MEDIA_TYPE_PLAYLIST"); _MEDIA_TYPE_PLAYLISTReady = true; } return _MEDIA_TYPE_PLAYLISTContent; } }
                 private static int _MEDIA_TYPE_PLAYLISTContent = default;
                 private static bool _MEDIA_TYPE_PLAYLISTReady = false; // this is used because in case of generics 
@@ -2009,84 +2011,84 @@ public partial class Thumbnails
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#EXTERNAL_CONTENT_URI"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri EXTERNAL_CONTENT_URI { get { if (!_EXTERNAL_CONTENT_URIReady) { _EXTERNAL_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "EXTERNAL_CONTENT_URI"); _EXTERNAL_CONTENT_URIReady = true; } return _EXTERNAL_CONTENT_URIContent; } }
                 private static Android.Net.Uri _EXTERNAL_CONTENT_URIContent = default;
                 private static bool _EXTERNAL_CONTENT_URIReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#INTERNAL_CONTENT_URI"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri INTERNAL_CONTENT_URI { get { if (!_INTERNAL_CONTENT_URIReady) { _INTERNAL_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "INTERNAL_CONTENT_URI"); _INTERNAL_CONTENT_URIReady = true; } return _INTERNAL_CONTENT_URIContent; } }
                 private static Android.Net.Uri _INTERNAL_CONTENT_URIContent = default;
                 private static bool _INTERNAL_CONTENT_URIReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#FULL_SCREEN_KIND"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int FULL_SCREEN_KIND { get { if (!_FULL_SCREEN_KINDReady) { _FULL_SCREEN_KINDContent = SGetField<int>(LocalBridgeClazz, "FULL_SCREEN_KIND"); _FULL_SCREEN_KINDReady = true; } return _FULL_SCREEN_KINDContent; } }
                 private static int _FULL_SCREEN_KINDContent = default;
                 private static bool _FULL_SCREEN_KINDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#MICRO_KIND"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int MICRO_KIND { get { if (!_MICRO_KINDReady) { _MICRO_KINDContent = SGetField<int>(LocalBridgeClazz, "MICRO_KIND"); _MICRO_KINDReady = true; } return _MICRO_KINDContent; } }
                 private static int _MICRO_KINDContent = default;
                 private static bool _MICRO_KINDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#MINI_KIND"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int MINI_KIND { get { if (!_MINI_KINDReady) { _MINI_KINDContent = SGetField<int>(LocalBridgeClazz, "MINI_KIND"); _MINI_KINDReady = true; } return _MINI_KINDContent; } }
                 private static int _MINI_KINDContent = default;
                 private static bool _MINI_KINDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#DATA"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DATA { get { if (!_DATAReady) { _DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATA"); _DATAReady = true; } return _DATAContent; } }
                 private static Java.Lang.String _DATAContent = default;
                 private static bool _DATAReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#DEFAULT_SORT_ORDER"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
                 private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
                 private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#HEIGHT"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String HEIGHT { get { if (!_HEIGHTReady) { _HEIGHTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "HEIGHT"); _HEIGHTReady = true; } return _HEIGHTContent; } }
                 private static Java.Lang.String _HEIGHTContent = default;
                 private static bool _HEIGHTReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#IMAGE_ID"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String IMAGE_ID { get { if (!_IMAGE_IDReady) { _IMAGE_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "IMAGE_ID"); _IMAGE_IDReady = true; } return _IMAGE_IDContent; } }
                 private static Java.Lang.String _IMAGE_IDContent = default;
                 private static bool _IMAGE_IDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#KIND"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String KIND { get { if (!_KINDReady) { _KINDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KIND"); _KINDReady = true; } return _KINDContent; } }
                 private static Java.Lang.String _KINDContent = default;
                 private static bool _KINDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#THUMB_DATA"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String THUMB_DATA { get { if (!_THUMB_DATAReady) { _THUMB_DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "THUMB_DATA"); _THUMB_DATAReady = true; } return _THUMB_DATAContent; } }
                 private static Java.Lang.String _THUMB_DATAContent = default;
                 private static bool _THUMB_DATAReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.Thumbnails.html#WIDTH"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String WIDTH { get { if (!_WIDTHReady) { _WIDTHContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIDTH"); _WIDTHReady = true; } return _WIDTHContent; } }
                 private static Java.Lang.String _WIDTHContent = default;
                 private static bool _WIDTHReady = false; // this is used because in case of generics 
@@ -2102,7 +2104,7 @@ public partial class Thumbnails
                 /// <param name="arg2"><see cref="int"/></param>
                 /// <param name="arg3"><see cref="Android.Graphics.BitmapFactory.Options"/></param>
                 /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Graphics.Bitmap GetThumbnail(Android.Content.ContentResolver arg0, long arg1, int arg2, Android.Graphics.BitmapFactory.Options arg3)
                 {
                     return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "getThumbnail", arg0, arg1, arg2, arg3);
@@ -2116,7 +2118,7 @@ public static Android.Graphics.Bitmap GetThumbnail(Android.Content.ContentResolv
                 /// <param name="arg3"><see cref="int"/></param>
                 /// <param name="arg4"><see cref="Android.Graphics.BitmapFactory.Options"/></param>
                 /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Graphics.Bitmap GetThumbnail(Android.Content.ContentResolver arg0, long arg1, long arg2, int arg3, Android.Graphics.BitmapFactory.Options arg4)
                 {
                     return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "getThumbnail", arg0, arg1, arg2, arg3, arg4);
@@ -2126,7 +2128,7 @@ public static Android.Graphics.Bitmap GetThumbnail(Android.Content.ContentResolv
                 /// </summary>
                 /// <param name="arg0"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Net.Uri"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri GetContentUri(Java.Lang.String arg0)
                 {
                     return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "getContentUri", "(Ljava/lang/String;)Landroid/net/Uri;", arg0);
@@ -2136,7 +2138,7 @@ public static Android.Net.Uri GetContentUri(Java.Lang.String arg0)
                 /// </summary>
                 /// <param name="arg0"><see cref="int"/></param>
                 /// <returns><see cref="Android.Util.Size"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Util.Size GetKindSize(int arg0)
                 {
                     return SExecuteWithSignature<Android.Util.Size>(LocalBridgeClazz, "getKindSize", "(I)Landroid/util/Size;", arg0);
@@ -2148,7 +2150,7 @@ public static Android.Util.Size GetKindSize(int arg0)
                 /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
                 /// <param name="arg2"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Database.Cursor"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0, Android.Net.Uri arg1, Java.Lang.String[] arg2)
                 {
                     return SExecute<Android.Database.Cursor>(LocalBridgeClazz, "query", arg0, arg1, arg2);
@@ -2161,7 +2163,7 @@ public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0
                 /// <param name="arg2"><see cref="int"/></param>
                 /// <param name="arg3"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Database.Cursor"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Database.Cursor QueryMiniThumbnail(Android.Content.ContentResolver arg0, long arg1, int arg2, Java.Lang.String[] arg3)
                 {
                     return SExecute<Android.Database.Cursor>(LocalBridgeClazz, "queryMiniThumbnail", arg0, arg1, arg2, arg3);
@@ -2174,7 +2176,7 @@ public static Android.Database.Cursor QueryMiniThumbnail(Android.Content.Content
                 /// <param name="arg2"><see cref="int"/></param>
                 /// <param name="arg3"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Database.Cursor"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Database.Cursor QueryMiniThumbnails(Android.Content.ContentResolver arg0, Android.Net.Uri arg1, int arg2, Java.Lang.String[] arg3)
                 {
                     return SExecute<Android.Database.Cursor>(LocalBridgeClazz, "queryMiniThumbnails", arg0, arg1, arg2, arg3);
@@ -2185,7 +2187,7 @@ public static Android.Database.Cursor QueryMiniThumbnails(Android.Content.Conten
                 /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
                 /// <param name="arg1"><see cref="long"/></param>
                 /// <param name="arg2"><see cref="long"/></param>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static void CancelThumbnailRequest(Android.Content.ContentResolver arg0, long arg1, long arg2)
                 {
                     SExecute(LocalBridgeClazz, "cancelThumbnailRequest", arg0, arg1, arg2);
@@ -2195,7 +2197,7 @@ public static void CancelThumbnailRequest(Android.Content.ContentResolver arg0,
                 /// </summary>
                 /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
                 /// <param name="arg1"><see cref="long"/></param>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static void CancelThumbnailRequest(Android.Content.ContentResolver arg0, long arg1)
                 {
                     SExecute(LocalBridgeClazz, "cancelThumbnailRequest", arg0, arg1);
@@ -2264,7 +2266,7 @@ public partial class Media
                 /// <param name="arg3"><see cref="Java.Lang.String"/></param>
                 /// <param name="arg4"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Database.Cursor"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0, Android.Net.Uri arg1, Java.Lang.String[] arg2, Java.Lang.String arg3, Java.Lang.String arg4)
                 {
                     return SExecute<Android.Database.Cursor>(LocalBridgeClazz, "query", arg0, arg1, arg2, arg3, arg4);
@@ -2279,7 +2281,7 @@ public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0
                 /// <param name="arg4"><see cref="Java.Lang.String"/></param>
                 /// <param name="arg5"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Database.Cursor"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0, Android.Net.Uri arg1, Java.Lang.String[] arg2, Java.Lang.String arg3, Java.Lang.String[] arg4, Java.Lang.String arg5)
                 {
                     return SExecute<Android.Database.Cursor>(LocalBridgeClazz, "query", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2291,7 +2293,7 @@ public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0
                 /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
                 /// <param name="arg2"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Database.Cursor"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0, Android.Net.Uri arg1, Java.Lang.String[] arg2)
                 {
                     return SExecute<Android.Database.Cursor>(LocalBridgeClazz, "query", arg0, arg1, arg2);
@@ -2304,7 +2306,7 @@ public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0
                 /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
                 /// <exception cref="Java.Io.FileNotFoundException"/>
                 /// <exception cref="Java.Io.IOException"/>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Graphics.Bitmap GetBitmap(Android.Content.ContentResolver arg0, Android.Net.Uri arg1)
                 {
                     return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "getBitmap", arg0, arg1);
@@ -2336,7 +2338,7 @@ public static Android.Net.Uri GetContentUri(Java.Lang.String arg0)
                 /// <param name="arg2"><see cref="Java.Lang.String"/></param>
                 /// <param name="arg3"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Java.Lang.String"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String InsertImage(Android.Content.ContentResolver arg0, Android.Graphics.Bitmap arg1, Java.Lang.String arg2, Java.Lang.String arg3)
                 {
                     return SExecute<Java.Lang.String>(LocalBridgeClazz, "insertImage", arg0, arg1, arg2, arg3);
@@ -2350,7 +2352,7 @@ public static Java.Lang.String InsertImage(Android.Content.ContentResolver arg0,
                 /// <param name="arg3"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Java.Lang.String"/></returns>
                 /// <exception cref="Java.Io.FileNotFoundException"/>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String InsertImage(Android.Content.ContentResolver arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3)
                 {
                     return SExecute<Java.Lang.String>(LocalBridgeClazz, "insertImage", arg0, arg1, arg2, arg3);
@@ -2415,28 +2417,28 @@ public partial class ImageColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.ImageColumns.html#LATITUDE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LATITUDE { get { if (!_LATITUDEReady) { _LATITUDEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LATITUDE"); _LATITUDEReady = true; } return _LATITUDEContent; } }
                 private static Java.Lang.String _LATITUDEContent = default;
                 private static bool _LATITUDEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.ImageColumns.html#LONGITUDE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LONGITUDE { get { if (!_LONGITUDEReady) { _LONGITUDEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LONGITUDE"); _LONGITUDEReady = true; } return _LONGITUDEContent; } }
                 private static Java.Lang.String _LONGITUDEContent = default;
                 private static bool _LONGITUDEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.ImageColumns.html#MINI_THUMB_MAGIC"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String MINI_THUMB_MAGIC { get { if (!_MINI_THUMB_MAGICReady) { _MINI_THUMB_MAGICContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MINI_THUMB_MAGIC"); _MINI_THUMB_MAGICReady = true; } return _MINI_THUMB_MAGICContent; } }
                 private static Java.Lang.String _MINI_THUMB_MAGICContent = default;
                 private static bool _MINI_THUMB_MAGICReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Images.ImageColumns.html#PICASA_ID"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String PICASA_ID { get { if (!_PICASA_IDReady) { _PICASA_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PICASA_ID"); _PICASA_IDReady = true; } return _PICASA_IDContent; } }
                 private static Java.Lang.String _PICASA_IDContent = default;
                 private static bool _PICASA_IDReady = false; // this is used because in case of generics 
@@ -2881,7 +2883,7 @@ public partial class Video
             /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
             /// <param name="arg2"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Database.Cursor"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Database.Cursor Query(Android.Content.ContentResolver arg0, Android.Net.Uri arg1, Java.Lang.String[] arg2)
             {
                 return SExecute<Android.Database.Cursor>(LocalBridgeClazz, "query", arg0, arg1, arg2);
@@ -2957,21 +2959,21 @@ public partial class VideoColumns
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.VideoColumns.html#LATITUDE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LATITUDE { get { if (!_LATITUDEReady) { _LATITUDEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LATITUDE"); _LATITUDEReady = true; } return _LATITUDEContent; } }
                 private static Java.Lang.String _LATITUDEContent = default;
                 private static bool _LATITUDEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.VideoColumns.html#LONGITUDE"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String LONGITUDE { get { if (!_LONGITUDEReady) { _LONGITUDEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LONGITUDE"); _LONGITUDEReady = true; } return _LONGITUDEContent; } }
                 private static Java.Lang.String _LONGITUDEContent = default;
                 private static bool _LONGITUDEReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.VideoColumns.html#MINI_THUMB_MAGIC"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String MINI_THUMB_MAGIC { get { if (!_MINI_THUMB_MAGICReady) { _MINI_THUMB_MAGICContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MINI_THUMB_MAGIC"); _MINI_THUMB_MAGICReady = true; } return _MINI_THUMB_MAGICContent; } }
                 private static Java.Lang.String _MINI_THUMB_MAGICContent = default;
                 private static bool _MINI_THUMB_MAGICReady = false; // this is used because in case of generics 
@@ -3015,77 +3017,77 @@ public partial class Thumbnails
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#EXTERNAL_CONTENT_URI"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri EXTERNAL_CONTENT_URI { get { if (!_EXTERNAL_CONTENT_URIReady) { _EXTERNAL_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "EXTERNAL_CONTENT_URI"); _EXTERNAL_CONTENT_URIReady = true; } return _EXTERNAL_CONTENT_URIContent; } }
                 private static Android.Net.Uri _EXTERNAL_CONTENT_URIContent = default;
                 private static bool _EXTERNAL_CONTENT_URIReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#INTERNAL_CONTENT_URI"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri INTERNAL_CONTENT_URI { get { if (!_INTERNAL_CONTENT_URIReady) { _INTERNAL_CONTENT_URIContent = SGetField<Android.Net.Uri>(LocalBridgeClazz, "INTERNAL_CONTENT_URI"); _INTERNAL_CONTENT_URIReady = true; } return _INTERNAL_CONTENT_URIContent; } }
                 private static Android.Net.Uri _INTERNAL_CONTENT_URIContent = default;
                 private static bool _INTERNAL_CONTENT_URIReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#FULL_SCREEN_KIND"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int FULL_SCREEN_KIND { get { if (!_FULL_SCREEN_KINDReady) { _FULL_SCREEN_KINDContent = SGetField<int>(LocalBridgeClazz, "FULL_SCREEN_KIND"); _FULL_SCREEN_KINDReady = true; } return _FULL_SCREEN_KINDContent; } }
                 private static int _FULL_SCREEN_KINDContent = default;
                 private static bool _FULL_SCREEN_KINDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#MICRO_KIND"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int MICRO_KIND { get { if (!_MICRO_KINDReady) { _MICRO_KINDContent = SGetField<int>(LocalBridgeClazz, "MICRO_KIND"); _MICRO_KINDReady = true; } return _MICRO_KINDContent; } }
                 private static int _MICRO_KINDContent = default;
                 private static bool _MICRO_KINDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#MINI_KIND"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static int MINI_KIND { get { if (!_MINI_KINDReady) { _MINI_KINDContent = SGetField<int>(LocalBridgeClazz, "MINI_KIND"); _MINI_KINDReady = true; } return _MINI_KINDContent; } }
                 private static int _MINI_KINDContent = default;
                 private static bool _MINI_KINDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#DATA"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DATA { get { if (!_DATAReady) { _DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATA"); _DATAReady = true; } return _DATAContent; } }
                 private static Java.Lang.String _DATAContent = default;
                 private static bool _DATAReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#DEFAULT_SORT_ORDER"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String DEFAULT_SORT_ORDER { get { if (!_DEFAULT_SORT_ORDERReady) { _DEFAULT_SORT_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_SORT_ORDER"); _DEFAULT_SORT_ORDERReady = true; } return _DEFAULT_SORT_ORDERContent; } }
                 private static Java.Lang.String _DEFAULT_SORT_ORDERContent = default;
                 private static bool _DEFAULT_SORT_ORDERReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#HEIGHT"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String HEIGHT { get { if (!_HEIGHTReady) { _HEIGHTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "HEIGHT"); _HEIGHTReady = true; } return _HEIGHTContent; } }
                 private static Java.Lang.String _HEIGHTContent = default;
                 private static bool _HEIGHTReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#KIND"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String KIND { get { if (!_KINDReady) { _KINDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KIND"); _KINDReady = true; } return _KINDContent; } }
                 private static Java.Lang.String _KINDContent = default;
                 private static bool _KINDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#VIDEO_ID"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String VIDEO_ID { get { if (!_VIDEO_IDReady) { _VIDEO_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "VIDEO_ID"); _VIDEO_IDReady = true; } return _VIDEO_IDContent; } }
                 private static Java.Lang.String _VIDEO_IDContent = default;
                 private static bool _VIDEO_IDReady = false; // this is used because in case of generics 
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/MediaStore.Video.Thumbnails.html#WIDTH"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String WIDTH { get { if (!_WIDTHReady) { _WIDTHContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIDTH"); _WIDTHReady = true; } return _WIDTHContent; } }
                 private static Java.Lang.String _WIDTHContent = default;
                 private static bool _WIDTHReady = false; // this is used because in case of generics 
@@ -3101,7 +3103,7 @@ public partial class Thumbnails
                 /// <param name="arg2"><see cref="int"/></param>
                 /// <param name="arg3"><see cref="Android.Graphics.BitmapFactory.Options"/></param>
                 /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Graphics.Bitmap GetThumbnail(Android.Content.ContentResolver arg0, long arg1, int arg2, Android.Graphics.BitmapFactory.Options arg3)
                 {
                     return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "getThumbnail", arg0, arg1, arg2, arg3);
@@ -3115,7 +3117,7 @@ public static Android.Graphics.Bitmap GetThumbnail(Android.Content.ContentResolv
                 /// <param name="arg3"><see cref="int"/></param>
                 /// <param name="arg4"><see cref="Android.Graphics.BitmapFactory.Options"/></param>
                 /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Graphics.Bitmap GetThumbnail(Android.Content.ContentResolver arg0, long arg1, long arg2, int arg3, Android.Graphics.BitmapFactory.Options arg4)
                 {
                     return SExecute<Android.Graphics.Bitmap>(LocalBridgeClazz, "getThumbnail", arg0, arg1, arg2, arg3, arg4);
@@ -3125,7 +3127,7 @@ public static Android.Graphics.Bitmap GetThumbnail(Android.Content.ContentResolv
                 /// </summary>
                 /// <param name="arg0"><see cref="Java.Lang.String"/></param>
                 /// <returns><see cref="Android.Net.Uri"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Net.Uri GetContentUri(Java.Lang.String arg0)
                 {
                     return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "getContentUri", "(Ljava/lang/String;)Landroid/net/Uri;", arg0);
@@ -3135,7 +3137,7 @@ public static Android.Net.Uri GetContentUri(Java.Lang.String arg0)
                 /// </summary>
                 /// <param name="arg0"><see cref="int"/></param>
                 /// <returns><see cref="Android.Util.Size"/></returns>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Android.Util.Size GetKindSize(int arg0)
                 {
                     return SExecuteWithSignature<Android.Util.Size>(LocalBridgeClazz, "getKindSize", "(I)Landroid/util/Size;", arg0);
@@ -3146,7 +3148,7 @@ public static Android.Util.Size GetKindSize(int arg0)
                 /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
                 /// <param name="arg1"><see cref="long"/></param>
                 /// <param name="arg2"><see cref="long"/></param>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static void CancelThumbnailRequest(Android.Content.ContentResolver arg0, long arg1, long arg2)
                 {
                     SExecute(LocalBridgeClazz, "cancelThumbnailRequest", arg0, arg1, arg2);
@@ -3156,7 +3158,7 @@ public static void CancelThumbnailRequest(Android.Content.ContentResolver arg0,
                 /// </summary>
                 /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
                 /// <param name="arg1"><see cref="long"/></param>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static void CancelThumbnailRequest(Android.Content.ContentResolver arg0, long arg1)
                 {
                     SExecute(LocalBridgeClazz, "cancelThumbnailRequest", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Provider/Settings.cs b/src/net/Netdroid/Generated/Android/Provider/Settings.cs
index c35d46a20..434102e95 100644
--- a/src/net/Netdroid/Generated/Android/Provider/Settings.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/Settings.cs
@@ -244,7 +244,7 @@ public partial class Settings
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Settings.html#ACTION_FINGERPRINT_ENROLL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_FINGERPRINT_ENROLL { get { if (!_ACTION_FINGERPRINT_ENROLLReady) { _ACTION_FINGERPRINT_ENROLLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_FINGERPRINT_ENROLL"); _ACTION_FINGERPRINT_ENROLLReady = true; } return _ACTION_FINGERPRINT_ENROLLContent; } }
         private static Java.Lang.String _ACTION_FINGERPRINT_ENROLLContent = default;
         private static bool _ACTION_FINGERPRINT_ENROLLReady = false; // this is used because in case of generics 
@@ -533,7 +533,7 @@ public partial class Settings
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/provider/Settings.html#ACTION_STORAGE_VOLUME_ACCESS_SETTINGS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_STORAGE_VOLUME_ACCESS_SETTINGS { get { if (!_ACTION_STORAGE_VOLUME_ACCESS_SETTINGSReady) { _ACTION_STORAGE_VOLUME_ACCESS_SETTINGSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_STORAGE_VOLUME_ACCESS_SETTINGS"); _ACTION_STORAGE_VOLUME_ACCESS_SETTINGSReady = true; } return _ACTION_STORAGE_VOLUME_ACCESS_SETTINGSContent; } }
         private static Java.Lang.String _ACTION_STORAGE_VOLUME_ACCESS_SETTINGSContent = default;
         private static bool _ACTION_STORAGE_VOLUME_ACCESS_SETTINGSReady = false; // this is used because in case of generics 
@@ -825,21 +825,21 @@ public partial class Global
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#WIFI_SLEEP_POLICY_DEFAULT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WIFI_SLEEP_POLICY_DEFAULT { get { if (!_WIFI_SLEEP_POLICY_DEFAULTReady) { _WIFI_SLEEP_POLICY_DEFAULTContent = SGetField<int>(LocalBridgeClazz, "WIFI_SLEEP_POLICY_DEFAULT"); _WIFI_SLEEP_POLICY_DEFAULTReady = true; } return _WIFI_SLEEP_POLICY_DEFAULTContent; } }
             private static int _WIFI_SLEEP_POLICY_DEFAULTContent = default;
             private static bool _WIFI_SLEEP_POLICY_DEFAULTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#WIFI_SLEEP_POLICY_NEVER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WIFI_SLEEP_POLICY_NEVER { get { if (!_WIFI_SLEEP_POLICY_NEVERReady) { _WIFI_SLEEP_POLICY_NEVERContent = SGetField<int>(LocalBridgeClazz, "WIFI_SLEEP_POLICY_NEVER"); _WIFI_SLEEP_POLICY_NEVERReady = true; } return _WIFI_SLEEP_POLICY_NEVERContent; } }
             private static int _WIFI_SLEEP_POLICY_NEVERContent = default;
             private static bool _WIFI_SLEEP_POLICY_NEVERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED { get { if (!_WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDReady) { _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDContent = SGetField<int>(LocalBridgeClazz, "WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED"); _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDReady = true; } return _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDContent; } }
             private static int _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDContent = default;
             private static bool _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDReady = false; // this is used because in case of generics 
@@ -876,7 +876,7 @@ public partial class Global
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#APPLY_RAMPING_RINGER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String APPLY_RAMPING_RINGER { get { if (!_APPLY_RAMPING_RINGERReady) { _APPLY_RAMPING_RINGERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "APPLY_RAMPING_RINGER"); _APPLY_RAMPING_RINGERReady = true; } return _APPLY_RAMPING_RINGERContent; } }
             private static Java.Lang.String _APPLY_RAMPING_RINGERContent = default;
             private static bool _APPLY_RAMPING_RINGERReady = false; // this is used because in case of generics 
@@ -949,7 +949,7 @@ public partial class Global
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#INSTALL_NON_MARKET_APPS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String INSTALL_NON_MARKET_APPS { get { if (!_INSTALL_NON_MARKET_APPSReady) { _INSTALL_NON_MARKET_APPSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "INSTALL_NON_MARKET_APPS"); _INSTALL_NON_MARKET_APPSReady = true; } return _INSTALL_NON_MARKET_APPSContent; } }
             private static Java.Lang.String _INSTALL_NON_MARKET_APPSContent = default;
             private static bool _INSTALL_NON_MARKET_APPSReady = false; // this is used because in case of generics 
@@ -998,7 +998,7 @@ public partial class Global
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#SHOW_PROCESSES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SHOW_PROCESSES { get { if (!_SHOW_PROCESSESReady) { _SHOW_PROCESSESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SHOW_PROCESSES"); _SHOW_PROCESSESReady = true; } return _SHOW_PROCESSESContent; } }
             private static Java.Lang.String _SHOW_PROCESSESContent = default;
             private static bool _SHOW_PROCESSESReady = false; // this is used because in case of generics 
@@ -1053,21 +1053,21 @@ public partial class Global
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON { get { if (!_WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady) { _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON"); _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady = true; } return _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent; } }
             private static Java.Lang.String _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent = default;
             private static bool _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY { get { if (!_WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady) { _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY"); _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady = true; } return _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent; } }
             private static Java.Lang.String _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent = default;
             private static bool _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#WIFI_NUM_OPEN_NETWORKS_KEPT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NUM_OPEN_NETWORKS_KEPT { get { if (!_WIFI_NUM_OPEN_NETWORKS_KEPTReady) { _WIFI_NUM_OPEN_NETWORKS_KEPTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NUM_OPEN_NETWORKS_KEPT"); _WIFI_NUM_OPEN_NETWORKS_KEPTReady = true; } return _WIFI_NUM_OPEN_NETWORKS_KEPTContent; } }
             private static Java.Lang.String _WIFI_NUM_OPEN_NETWORKS_KEPTContent = default;
             private static bool _WIFI_NUM_OPEN_NETWORKS_KEPTReady = false; // this is used because in case of generics 
@@ -1080,7 +1080,7 @@ public partial class Global
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Global.html#WIFI_SLEEP_POLICY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_SLEEP_POLICY { get { if (!_WIFI_SLEEP_POLICYReady) { _WIFI_SLEEP_POLICYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_SLEEP_POLICY"); _WIFI_SLEEP_POLICYReady = true; } return _WIFI_SLEEP_POLICYContent; } }
             private static Java.Lang.String _WIFI_SLEEP_POLICYContent = default;
             private static bool _WIFI_SLEEP_POLICYReady = false; // this is used because in case of generics 
@@ -1373,14 +1373,14 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOCATION_MODE_BATTERY_SAVING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int LOCATION_MODE_BATTERY_SAVING { get { if (!_LOCATION_MODE_BATTERY_SAVINGReady) { _LOCATION_MODE_BATTERY_SAVINGContent = SGetField<int>(LocalBridgeClazz, "LOCATION_MODE_BATTERY_SAVING"); _LOCATION_MODE_BATTERY_SAVINGReady = true; } return _LOCATION_MODE_BATTERY_SAVINGContent; } }
             private static int _LOCATION_MODE_BATTERY_SAVINGContent = default;
             private static bool _LOCATION_MODE_BATTERY_SAVINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOCATION_MODE_HIGH_ACCURACY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int LOCATION_MODE_HIGH_ACCURACY { get { if (!_LOCATION_MODE_HIGH_ACCURACYReady) { _LOCATION_MODE_HIGH_ACCURACYContent = SGetField<int>(LocalBridgeClazz, "LOCATION_MODE_HIGH_ACCURACY"); _LOCATION_MODE_HIGH_ACCURACYReady = true; } return _LOCATION_MODE_HIGH_ACCURACYContent; } }
             private static int _LOCATION_MODE_HIGH_ACCURACYContent = default;
             private static bool _LOCATION_MODE_HIGH_ACCURACYReady = false; // this is used because in case of generics 
@@ -1393,7 +1393,7 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOCATION_MODE_SENSORS_ONLY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int LOCATION_MODE_SENSORS_ONLY { get { if (!_LOCATION_MODE_SENSORS_ONLYReady) { _LOCATION_MODE_SENSORS_ONLYContent = SGetField<int>(LocalBridgeClazz, "LOCATION_MODE_SENSORS_ONLY"); _LOCATION_MODE_SENSORS_ONLYReady = true; } return _LOCATION_MODE_SENSORS_ONLYContent; } }
             private static int _LOCATION_MODE_SENSORS_ONLYContent = default;
             private static bool _LOCATION_MODE_SENSORS_ONLYReady = false; // this is used because in case of generics 
@@ -1412,21 +1412,21 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#ACCESSIBILITY_SPEAK_PASSWORD"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ACCESSIBILITY_SPEAK_PASSWORD { get { if (!_ACCESSIBILITY_SPEAK_PASSWORDReady) { _ACCESSIBILITY_SPEAK_PASSWORDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACCESSIBILITY_SPEAK_PASSWORD"); _ACCESSIBILITY_SPEAK_PASSWORDReady = true; } return _ACCESSIBILITY_SPEAK_PASSWORDContent; } }
             private static Java.Lang.String _ACCESSIBILITY_SPEAK_PASSWORDContent = default;
             private static bool _ACCESSIBILITY_SPEAK_PASSWORDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#ADB_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ADB_ENABLED { get { if (!_ADB_ENABLEDReady) { _ADB_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ADB_ENABLED"); _ADB_ENABLEDReady = true; } return _ADB_ENABLEDContent; } }
             private static Java.Lang.String _ADB_ENABLEDContent = default;
             private static bool _ADB_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#ALLOW_MOCK_LOCATION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ALLOW_MOCK_LOCATION { get { if (!_ALLOW_MOCK_LOCATIONReady) { _ALLOW_MOCK_LOCATIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ALLOW_MOCK_LOCATION"); _ALLOW_MOCK_LOCATIONReady = true; } return _ALLOW_MOCK_LOCATIONContent; } }
             private static Java.Lang.String _ALLOW_MOCK_LOCATIONContent = default;
             private static bool _ALLOW_MOCK_LOCATIONReady = false; // this is used because in case of generics 
@@ -1445,21 +1445,21 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#BACKGROUND_DATA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String BACKGROUND_DATA { get { if (!_BACKGROUND_DATAReady) { _BACKGROUND_DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "BACKGROUND_DATA"); _BACKGROUND_DATAReady = true; } return _BACKGROUND_DATAContent; } }
             private static Java.Lang.String _BACKGROUND_DATAContent = default;
             private static bool _BACKGROUND_DATAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#BLUETOOTH_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String BLUETOOTH_ON { get { if (!_BLUETOOTH_ONReady) { _BLUETOOTH_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "BLUETOOTH_ON"); _BLUETOOTH_ONReady = true; } return _BLUETOOTH_ONContent; } }
             private static Java.Lang.String _BLUETOOTH_ONContent = default;
             private static bool _BLUETOOTH_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#DATA_ROAMING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DATA_ROAMING { get { if (!_DATA_ROAMINGReady) { _DATA_ROAMINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATA_ROAMING"); _DATA_ROAMINGReady = true; } return _DATA_ROAMINGContent; } }
             private static Java.Lang.String _DATA_ROAMINGContent = default;
             private static bool _DATA_ROAMINGReady = false; // this is used because in case of generics 
@@ -1472,14 +1472,14 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#DEVELOPMENT_SETTINGS_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEVELOPMENT_SETTINGS_ENABLED { get { if (!_DEVELOPMENT_SETTINGS_ENABLEDReady) { _DEVELOPMENT_SETTINGS_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEVELOPMENT_SETTINGS_ENABLED"); _DEVELOPMENT_SETTINGS_ENABLEDReady = true; } return _DEVELOPMENT_SETTINGS_ENABLEDContent; } }
             private static Java.Lang.String _DEVELOPMENT_SETTINGS_ENABLEDContent = default;
             private static bool _DEVELOPMENT_SETTINGS_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#DEVICE_PROVISIONED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEVICE_PROVISIONED { get { if (!_DEVICE_PROVISIONEDReady) { _DEVICE_PROVISIONEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEVICE_PROVISIONED"); _DEVICE_PROVISIONEDReady = true; } return _DEVICE_PROVISIONEDContent; } }
             private static Java.Lang.String _DEVICE_PROVISIONEDContent = default;
             private static bool _DEVICE_PROVISIONEDReady = false; // this is used because in case of generics 
@@ -1498,7 +1498,7 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#HTTP_PROXY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String HTTP_PROXY { get { if (!_HTTP_PROXYReady) { _HTTP_PROXYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "HTTP_PROXY"); _HTTP_PROXYReady = true; } return _HTTP_PROXYContent; } }
             private static Java.Lang.String _HTTP_PROXYContent = default;
             private static bool _HTTP_PROXYReady = false; // this is used because in case of generics 
@@ -1511,56 +1511,56 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#INSTALL_NON_MARKET_APPS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String INSTALL_NON_MARKET_APPS { get { if (!_INSTALL_NON_MARKET_APPSReady) { _INSTALL_NON_MARKET_APPSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "INSTALL_NON_MARKET_APPS"); _INSTALL_NON_MARKET_APPSReady = true; } return _INSTALL_NON_MARKET_APPSContent; } }
             private static Java.Lang.String _INSTALL_NON_MARKET_APPSContent = default;
             private static bool _INSTALL_NON_MARKET_APPSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOCATION_MODE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCATION_MODE { get { if (!_LOCATION_MODEReady) { _LOCATION_MODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCATION_MODE"); _LOCATION_MODEReady = true; } return _LOCATION_MODEContent; } }
             private static Java.Lang.String _LOCATION_MODEContent = default;
             private static bool _LOCATION_MODEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOCATION_PROVIDERS_ALLOWED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCATION_PROVIDERS_ALLOWED { get { if (!_LOCATION_PROVIDERS_ALLOWEDReady) { _LOCATION_PROVIDERS_ALLOWEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCATION_PROVIDERS_ALLOWED"); _LOCATION_PROVIDERS_ALLOWEDReady = true; } return _LOCATION_PROVIDERS_ALLOWEDContent; } }
             private static Java.Lang.String _LOCATION_PROVIDERS_ALLOWEDContent = default;
             private static bool _LOCATION_PROVIDERS_ALLOWEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOCK_PATTERN_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCK_PATTERN_ENABLED { get { if (!_LOCK_PATTERN_ENABLEDReady) { _LOCK_PATTERN_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCK_PATTERN_ENABLED"); _LOCK_PATTERN_ENABLEDReady = true; } return _LOCK_PATTERN_ENABLEDContent; } }
             private static Java.Lang.String _LOCK_PATTERN_ENABLEDContent = default;
             private static bool _LOCK_PATTERN_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED { get { if (!_LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDReady) { _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED"); _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDReady = true; } return _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDContent; } }
             private static Java.Lang.String _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDContent = default;
             private static bool _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOCK_PATTERN_VISIBLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCK_PATTERN_VISIBLE { get { if (!_LOCK_PATTERN_VISIBLEReady) { _LOCK_PATTERN_VISIBLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCK_PATTERN_VISIBLE"); _LOCK_PATTERN_VISIBLEReady = true; } return _LOCK_PATTERN_VISIBLEContent; } }
             private static Java.Lang.String _LOCK_PATTERN_VISIBLEContent = default;
             private static bool _LOCK_PATTERN_VISIBLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#LOGGING_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOGGING_ID { get { if (!_LOGGING_IDReady) { _LOGGING_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOGGING_ID"); _LOGGING_IDReady = true; } return _LOGGING_IDContent; } }
             private static Java.Lang.String _LOGGING_IDContent = default;
             private static bool _LOGGING_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#NETWORK_PREFERENCE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NETWORK_PREFERENCE { get { if (!_NETWORK_PREFERENCEReady) { _NETWORK_PREFERENCEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NETWORK_PREFERENCE"); _NETWORK_PREFERENCEReady = true; } return _NETWORK_PREFERENCEContent; } }
             private static Java.Lang.String _NETWORK_PREFERENCEContent = default;
             private static bool _NETWORK_PREFERENCEReady = false; // this is used because in case of generics 
@@ -1591,7 +1591,7 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#SECURE_FRP_MODE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SECURE_FRP_MODE { get { if (!_SECURE_FRP_MODEReady) { _SECURE_FRP_MODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SECURE_FRP_MODE"); _SECURE_FRP_MODEReady = true; } return _SECURE_FRP_MODEContent; } }
             private static Java.Lang.String _SECURE_FRP_MODEContent = default;
             private static bool _SECURE_FRP_MODEReady = false; // this is used because in case of generics 
@@ -1622,14 +1622,14 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#TTS_DEFAULT_COUNTRY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TTS_DEFAULT_COUNTRY { get { if (!_TTS_DEFAULT_COUNTRYReady) { _TTS_DEFAULT_COUNTRYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TTS_DEFAULT_COUNTRY"); _TTS_DEFAULT_COUNTRYReady = true; } return _TTS_DEFAULT_COUNTRYContent; } }
             private static Java.Lang.String _TTS_DEFAULT_COUNTRYContent = default;
             private static bool _TTS_DEFAULT_COUNTRYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#TTS_DEFAULT_LANG"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TTS_DEFAULT_LANG { get { if (!_TTS_DEFAULT_LANGReady) { _TTS_DEFAULT_LANGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TTS_DEFAULT_LANG"); _TTS_DEFAULT_LANGReady = true; } return _TTS_DEFAULT_LANGContent; } }
             private static Java.Lang.String _TTS_DEFAULT_LANGContent = default;
             private static bool _TTS_DEFAULT_LANGReady = false; // this is used because in case of generics 
@@ -1654,7 +1654,7 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#TTS_DEFAULT_VARIANT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TTS_DEFAULT_VARIANT { get { if (!_TTS_DEFAULT_VARIANTReady) { _TTS_DEFAULT_VARIANTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TTS_DEFAULT_VARIANT"); _TTS_DEFAULT_VARIANTReady = true; } return _TTS_DEFAULT_VARIANTContent; } }
             private static Java.Lang.String _TTS_DEFAULT_VARIANTContent = default;
             private static bool _TTS_DEFAULT_VARIANTReady = false; // this is used because in case of generics 
@@ -1667,147 +1667,147 @@ public partial class Secure
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#TTS_USE_DEFAULTS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TTS_USE_DEFAULTS { get { if (!_TTS_USE_DEFAULTSReady) { _TTS_USE_DEFAULTSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TTS_USE_DEFAULTS"); _TTS_USE_DEFAULTSReady = true; } return _TTS_USE_DEFAULTSContent; } }
             private static Java.Lang.String _TTS_USE_DEFAULTSContent = default;
             private static bool _TTS_USE_DEFAULTSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#USB_MASS_STORAGE_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USB_MASS_STORAGE_ENABLED { get { if (!_USB_MASS_STORAGE_ENABLEDReady) { _USB_MASS_STORAGE_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USB_MASS_STORAGE_ENABLED"); _USB_MASS_STORAGE_ENABLEDReady = true; } return _USB_MASS_STORAGE_ENABLEDContent; } }
             private static Java.Lang.String _USB_MASS_STORAGE_ENABLEDContent = default;
             private static bool _USB_MASS_STORAGE_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#USE_GOOGLE_MAIL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USE_GOOGLE_MAIL { get { if (!_USE_GOOGLE_MAILReady) { _USE_GOOGLE_MAILContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USE_GOOGLE_MAIL"); _USE_GOOGLE_MAILReady = true; } return _USE_GOOGLE_MAILContent; } }
             private static Java.Lang.String _USE_GOOGLE_MAILContent = default;
             private static bool _USE_GOOGLE_MAILReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_MAX_DHCP_RETRY_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_MAX_DHCP_RETRY_COUNT { get { if (!_WIFI_MAX_DHCP_RETRY_COUNTReady) { _WIFI_MAX_DHCP_RETRY_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_MAX_DHCP_RETRY_COUNT"); _WIFI_MAX_DHCP_RETRY_COUNTReady = true; } return _WIFI_MAX_DHCP_RETRY_COUNTContent; } }
             private static Java.Lang.String _WIFI_MAX_DHCP_RETRY_COUNTContent = default;
             private static bool _WIFI_MAX_DHCP_RETRY_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS { get { if (!_WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSReady) { _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS"); _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSReady = true; } return _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSContent; } }
             private static Java.Lang.String _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSContent = default;
             private static bool _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON { get { if (!_WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady) { _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON"); _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady = true; } return _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent; } }
             private static Java.Lang.String _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent = default;
             private static bool _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY { get { if (!_WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady) { _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY"); _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady = true; } return _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent; } }
             private static Java.Lang.String _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent = default;
             private static bool _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_NUM_OPEN_NETWORKS_KEPT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NUM_OPEN_NETWORKS_KEPT { get { if (!_WIFI_NUM_OPEN_NETWORKS_KEPTReady) { _WIFI_NUM_OPEN_NETWORKS_KEPTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NUM_OPEN_NETWORKS_KEPT"); _WIFI_NUM_OPEN_NETWORKS_KEPTReady = true; } return _WIFI_NUM_OPEN_NETWORKS_KEPTContent; } }
             private static Java.Lang.String _WIFI_NUM_OPEN_NETWORKS_KEPTContent = default;
             private static bool _WIFI_NUM_OPEN_NETWORKS_KEPTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_ON { get { if (!_WIFI_ONReady) { _WIFI_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_ON"); _WIFI_ONReady = true; } return _WIFI_ONContent; } }
             private static Java.Lang.String _WIFI_ONContent = default;
             private static bool _WIFI_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE { get { if (!_WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEReady) { _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE"); _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEReady = true; } return _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEContent = default;
             private static bool _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_AP_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_AP_COUNT { get { if (!_WIFI_WATCHDOG_AP_COUNTReady) { _WIFI_WATCHDOG_AP_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_AP_COUNT"); _WIFI_WATCHDOG_AP_COUNTReady = true; } return _WIFI_WATCHDOG_AP_COUNTContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_AP_COUNTContent = default;
             private static bool _WIFI_WATCHDOG_AP_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS { get { if (!_WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSReady) { _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS"); _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSReady = true; } return _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSContent = default;
             private static bool _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED { get { if (!_WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDReady) { _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED"); _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDReady = true; } return _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDContent = default;
             private static bool _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS { get { if (!_WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSReady) { _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS"); _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSReady = true; } return _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSContent = default;
             private static bool _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT { get { if (!_WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTReady) { _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT"); _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTReady = true; } return _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTContent = default;
             private static bool _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_MAX_AP_CHECKS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_MAX_AP_CHECKS { get { if (!_WIFI_WATCHDOG_MAX_AP_CHECKSReady) { _WIFI_WATCHDOG_MAX_AP_CHECKSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_MAX_AP_CHECKS"); _WIFI_WATCHDOG_MAX_AP_CHECKSReady = true; } return _WIFI_WATCHDOG_MAX_AP_CHECKSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_MAX_AP_CHECKSContent = default;
             private static bool _WIFI_WATCHDOG_MAX_AP_CHECKSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_ON { get { if (!_WIFI_WATCHDOG_ONReady) { _WIFI_WATCHDOG_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_ON"); _WIFI_WATCHDOG_ONReady = true; } return _WIFI_WATCHDOG_ONContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_ONContent = default;
             private static bool _WIFI_WATCHDOG_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_PING_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_PING_COUNT { get { if (!_WIFI_WATCHDOG_PING_COUNTReady) { _WIFI_WATCHDOG_PING_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_PING_COUNT"); _WIFI_WATCHDOG_PING_COUNTReady = true; } return _WIFI_WATCHDOG_PING_COUNTContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_PING_COUNTContent = default;
             private static bool _WIFI_WATCHDOG_PING_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_PING_DELAY_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_PING_DELAY_MS { get { if (!_WIFI_WATCHDOG_PING_DELAY_MSReady) { _WIFI_WATCHDOG_PING_DELAY_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_PING_DELAY_MS"); _WIFI_WATCHDOG_PING_DELAY_MSReady = true; } return _WIFI_WATCHDOG_PING_DELAY_MSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_PING_DELAY_MSContent = default;
             private static bool _WIFI_WATCHDOG_PING_DELAY_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_PING_TIMEOUT_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS { get { if (!_WIFI_WATCHDOG_PING_TIMEOUT_MSReady) { _WIFI_WATCHDOG_PING_TIMEOUT_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_PING_TIMEOUT_MS"); _WIFI_WATCHDOG_PING_TIMEOUT_MSReady = true; } return _WIFI_WATCHDOG_PING_TIMEOUT_MSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_PING_TIMEOUT_MSContent = default;
             private static bool _WIFI_WATCHDOG_PING_TIMEOUT_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.Secure.html#WIFI_WATCHDOG_WATCH_LIST"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_WATCH_LIST { get { if (!_WIFI_WATCHDOG_WATCH_LISTReady) { _WIFI_WATCHDOG_WATCH_LISTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_WATCH_LIST"); _WIFI_WATCHDOG_WATCH_LISTReady = true; } return _WIFI_WATCHDOG_WATCH_LISTContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_WATCH_LISTContent = default;
             private static bool _WIFI_WATCHDOG_WATCH_LISTReady = false; // this is used because in case of generics 
@@ -1830,7 +1830,7 @@ public static Android.Net.Uri GetUriFor(Java.Lang.String arg0)
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static bool IsLocationProviderEnabled(Android.Content.ContentResolver arg0, Java.Lang.String arg1)
             {
                 return SExecute<bool>(LocalBridgeClazz, "isLocationProviderEnabled", arg0, arg1);
@@ -1961,7 +1961,7 @@ public static long GetLong(Android.Content.ContentResolver arg0, Java.Lang.Strin
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
             /// <param name="arg2"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static void SetLocationProviderEnabled(Android.Content.ContentResolver arg0, Java.Lang.String arg1, bool arg2)
             {
                 SExecute(LocalBridgeClazz, "setLocationProviderEnabled", arg0, arg1, arg2);
@@ -2063,21 +2063,21 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_SLEEP_POLICY_DEFAULT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WIFI_SLEEP_POLICY_DEFAULT { get { if (!_WIFI_SLEEP_POLICY_DEFAULTReady) { _WIFI_SLEEP_POLICY_DEFAULTContent = SGetField<int>(LocalBridgeClazz, "WIFI_SLEEP_POLICY_DEFAULT"); _WIFI_SLEEP_POLICY_DEFAULTReady = true; } return _WIFI_SLEEP_POLICY_DEFAULTContent; } }
             private static int _WIFI_SLEEP_POLICY_DEFAULTContent = default;
             private static bool _WIFI_SLEEP_POLICY_DEFAULTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_SLEEP_POLICY_NEVER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WIFI_SLEEP_POLICY_NEVER { get { if (!_WIFI_SLEEP_POLICY_NEVERReady) { _WIFI_SLEEP_POLICY_NEVERContent = SGetField<int>(LocalBridgeClazz, "WIFI_SLEEP_POLICY_NEVER"); _WIFI_SLEEP_POLICY_NEVERReady = true; } return _WIFI_SLEEP_POLICY_NEVERContent; } }
             private static int _WIFI_SLEEP_POLICY_NEVERContent = default;
             private static bool _WIFI_SLEEP_POLICY_NEVERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED { get { if (!_WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDReady) { _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDContent = SGetField<int>(LocalBridgeClazz, "WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED"); _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDReady = true; } return _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDContent; } }
             private static int _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDContent = default;
             private static bool _WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGEDReady = false; // this is used because in case of generics 
@@ -2090,21 +2090,21 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#ADB_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ADB_ENABLED { get { if (!_ADB_ENABLEDReady) { _ADB_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ADB_ENABLED"); _ADB_ENABLEDReady = true; } return _ADB_ENABLEDContent; } }
             private static Java.Lang.String _ADB_ENABLEDContent = default;
             private static bool _ADB_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#AIRPLANE_MODE_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String AIRPLANE_MODE_ON { get { if (!_AIRPLANE_MODE_ONReady) { _AIRPLANE_MODE_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "AIRPLANE_MODE_ON"); _AIRPLANE_MODE_ONReady = true; } return _AIRPLANE_MODE_ONContent; } }
             private static Java.Lang.String _AIRPLANE_MODE_ONContent = default;
             private static bool _AIRPLANE_MODE_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#AIRPLANE_MODE_RADIOS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String AIRPLANE_MODE_RADIOS { get { if (!_AIRPLANE_MODE_RADIOSReady) { _AIRPLANE_MODE_RADIOSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "AIRPLANE_MODE_RADIOS"); _AIRPLANE_MODE_RADIOSReady = true; } return _AIRPLANE_MODE_RADIOSContent; } }
             private static Java.Lang.String _AIRPLANE_MODE_RADIOSContent = default;
             private static bool _AIRPLANE_MODE_RADIOSReady = false; // this is used because in case of generics 
@@ -2117,35 +2117,35 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#ALWAYS_FINISH_ACTIVITIES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ALWAYS_FINISH_ACTIVITIES { get { if (!_ALWAYS_FINISH_ACTIVITIESReady) { _ALWAYS_FINISH_ACTIVITIESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ALWAYS_FINISH_ACTIVITIES"); _ALWAYS_FINISH_ACTIVITIESReady = true; } return _ALWAYS_FINISH_ACTIVITIESContent; } }
             private static Java.Lang.String _ALWAYS_FINISH_ACTIVITIESContent = default;
             private static bool _ALWAYS_FINISH_ACTIVITIESReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#ANDROID_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ANDROID_ID { get { if (!_ANDROID_IDReady) { _ANDROID_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ANDROID_ID"); _ANDROID_IDReady = true; } return _ANDROID_IDContent; } }
             private static Java.Lang.String _ANDROID_IDContent = default;
             private static bool _ANDROID_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#ANIMATOR_DURATION_SCALE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String ANIMATOR_DURATION_SCALE { get { if (!_ANIMATOR_DURATION_SCALEReady) { _ANIMATOR_DURATION_SCALEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ANIMATOR_DURATION_SCALE"); _ANIMATOR_DURATION_SCALEReady = true; } return _ANIMATOR_DURATION_SCALEContent; } }
             private static Java.Lang.String _ANIMATOR_DURATION_SCALEContent = default;
             private static bool _ANIMATOR_DURATION_SCALEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#AUTO_TIME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String AUTO_TIME { get { if (!_AUTO_TIMEReady) { _AUTO_TIMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "AUTO_TIME"); _AUTO_TIMEReady = true; } return _AUTO_TIMEContent; } }
             private static Java.Lang.String _AUTO_TIMEContent = default;
             private static bool _AUTO_TIMEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#AUTO_TIME_ZONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String AUTO_TIME_ZONE { get { if (!_AUTO_TIME_ZONEReady) { _AUTO_TIME_ZONEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "AUTO_TIME_ZONE"); _AUTO_TIME_ZONEReady = true; } return _AUTO_TIME_ZONEContent; } }
             private static Java.Lang.String _AUTO_TIME_ZONEContent = default;
             private static bool _AUTO_TIME_ZONEReady = false; // this is used because in case of generics 
@@ -2164,42 +2164,42 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#BLUETOOTH_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String BLUETOOTH_ON { get { if (!_BLUETOOTH_ONReady) { _BLUETOOTH_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "BLUETOOTH_ON"); _BLUETOOTH_ONReady = true; } return _BLUETOOTH_ONContent; } }
             private static Java.Lang.String _BLUETOOTH_ONContent = default;
             private static bool _BLUETOOTH_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#DATA_ROAMING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DATA_ROAMING { get { if (!_DATA_ROAMINGReady) { _DATA_ROAMINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATA_ROAMING"); _DATA_ROAMINGReady = true; } return _DATA_ROAMINGContent; } }
             private static Java.Lang.String _DATA_ROAMINGContent = default;
             private static bool _DATA_ROAMINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#DATE_FORMAT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DATE_FORMAT { get { if (!_DATE_FORMATReady) { _DATE_FORMATContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATE_FORMAT"); _DATE_FORMATReady = true; } return _DATE_FORMATContent; } }
             private static Java.Lang.String _DATE_FORMATContent = default;
             private static bool _DATE_FORMATReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#DEBUG_APP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEBUG_APP { get { if (!_DEBUG_APPReady) { _DEBUG_APPContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEBUG_APP"); _DEBUG_APPReady = true; } return _DEBUG_APPContent; } }
             private static Java.Lang.String _DEBUG_APPContent = default;
             private static bool _DEBUG_APPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#DEVICE_PROVISIONED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DEVICE_PROVISIONED { get { if (!_DEVICE_PROVISIONEDReady) { _DEVICE_PROVISIONEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEVICE_PROVISIONED"); _DEVICE_PROVISIONEDReady = true; } return _DEVICE_PROVISIONEDContent; } }
             private static Java.Lang.String _DEVICE_PROVISIONEDContent = default;
             private static bool _DEVICE_PROVISIONEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#DIM_SCREEN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String DIM_SCREEN { get { if (!_DIM_SCREENReady) { _DIM_SCREENContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DIM_SCREEN"); _DIM_SCREENReady = true; } return _DIM_SCREENContent; } }
             private static Java.Lang.String _DIM_SCREENContent = default;
             private static bool _DIM_SCREENReady = false; // this is used because in case of generics 
@@ -2230,63 +2230,63 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#HAPTIC_FEEDBACK_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String HAPTIC_FEEDBACK_ENABLED { get { if (!_HAPTIC_FEEDBACK_ENABLEDReady) { _HAPTIC_FEEDBACK_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "HAPTIC_FEEDBACK_ENABLED"); _HAPTIC_FEEDBACK_ENABLEDReady = true; } return _HAPTIC_FEEDBACK_ENABLEDContent; } }
             private static Java.Lang.String _HAPTIC_FEEDBACK_ENABLEDContent = default;
             private static bool _HAPTIC_FEEDBACK_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#HTTP_PROXY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String HTTP_PROXY { get { if (!_HTTP_PROXYReady) { _HTTP_PROXYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "HTTP_PROXY"); _HTTP_PROXYReady = true; } return _HTTP_PROXYContent; } }
             private static Java.Lang.String _HTTP_PROXYContent = default;
             private static bool _HTTP_PROXYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#INSTALL_NON_MARKET_APPS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String INSTALL_NON_MARKET_APPS { get { if (!_INSTALL_NON_MARKET_APPSReady) { _INSTALL_NON_MARKET_APPSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "INSTALL_NON_MARKET_APPS"); _INSTALL_NON_MARKET_APPSReady = true; } return _INSTALL_NON_MARKET_APPSContent; } }
             private static Java.Lang.String _INSTALL_NON_MARKET_APPSContent = default;
             private static bool _INSTALL_NON_MARKET_APPSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#LOCATION_PROVIDERS_ALLOWED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCATION_PROVIDERS_ALLOWED { get { if (!_LOCATION_PROVIDERS_ALLOWEDReady) { _LOCATION_PROVIDERS_ALLOWEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCATION_PROVIDERS_ALLOWED"); _LOCATION_PROVIDERS_ALLOWEDReady = true; } return _LOCATION_PROVIDERS_ALLOWEDContent; } }
             private static Java.Lang.String _LOCATION_PROVIDERS_ALLOWEDContent = default;
             private static bool _LOCATION_PROVIDERS_ALLOWEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#LOCK_PATTERN_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCK_PATTERN_ENABLED { get { if (!_LOCK_PATTERN_ENABLEDReady) { _LOCK_PATTERN_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCK_PATTERN_ENABLED"); _LOCK_PATTERN_ENABLEDReady = true; } return _LOCK_PATTERN_ENABLEDContent; } }
             private static Java.Lang.String _LOCK_PATTERN_ENABLEDContent = default;
             private static bool _LOCK_PATTERN_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED { get { if (!_LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDReady) { _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED"); _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDReady = true; } return _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDContent; } }
             private static Java.Lang.String _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDContent = default;
             private static bool _LOCK_PATTERN_TACTILE_FEEDBACK_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#LOCK_PATTERN_VISIBLE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOCK_PATTERN_VISIBLE { get { if (!_LOCK_PATTERN_VISIBLEReady) { _LOCK_PATTERN_VISIBLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOCK_PATTERN_VISIBLE"); _LOCK_PATTERN_VISIBLEReady = true; } return _LOCK_PATTERN_VISIBLEContent; } }
             private static Java.Lang.String _LOCK_PATTERN_VISIBLEContent = default;
             private static bool _LOCK_PATTERN_VISIBLEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#LOGGING_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String LOGGING_ID { get { if (!_LOGGING_IDReady) { _LOGGING_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOGGING_ID"); _LOGGING_IDReady = true; } return _LOGGING_IDContent; } }
             private static Java.Lang.String _LOGGING_IDContent = default;
             private static bool _LOGGING_IDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#MODE_RINGER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String MODE_RINGER { get { if (!_MODE_RINGERReady) { _MODE_RINGERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MODE_RINGER"); _MODE_RINGERReady = true; } return _MODE_RINGERContent; } }
             private static Java.Lang.String _MODE_RINGERContent = default;
             private static bool _MODE_RINGERReady = false; // this is used because in case of generics 
@@ -2305,14 +2305,14 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#NETWORK_PREFERENCE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NETWORK_PREFERENCE { get { if (!_NETWORK_PREFERENCEReady) { _NETWORK_PREFERENCEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NETWORK_PREFERENCE"); _NETWORK_PREFERENCEReady = true; } return _NETWORK_PREFERENCEContent; } }
             private static Java.Lang.String _NETWORK_PREFERENCEContent = default;
             private static bool _NETWORK_PREFERENCEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#NEXT_ALARM_FORMATTED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NEXT_ALARM_FORMATTED { get { if (!_NEXT_ALARM_FORMATTEDReady) { _NEXT_ALARM_FORMATTEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NEXT_ALARM_FORMATTED"); _NEXT_ALARM_FORMATTEDReady = true; } return _NEXT_ALARM_FORMATTEDContent; } }
             private static Java.Lang.String _NEXT_ALARM_FORMATTEDContent = default;
             private static bool _NEXT_ALARM_FORMATTEDReady = false; // this is used because in case of generics 
@@ -2325,49 +2325,49 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#PARENTAL_CONTROL_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PARENTAL_CONTROL_ENABLED { get { if (!_PARENTAL_CONTROL_ENABLEDReady) { _PARENTAL_CONTROL_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PARENTAL_CONTROL_ENABLED"); _PARENTAL_CONTROL_ENABLEDReady = true; } return _PARENTAL_CONTROL_ENABLEDContent; } }
             private static Java.Lang.String _PARENTAL_CONTROL_ENABLEDContent = default;
             private static bool _PARENTAL_CONTROL_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#PARENTAL_CONTROL_LAST_UPDATE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PARENTAL_CONTROL_LAST_UPDATE { get { if (!_PARENTAL_CONTROL_LAST_UPDATEReady) { _PARENTAL_CONTROL_LAST_UPDATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PARENTAL_CONTROL_LAST_UPDATE"); _PARENTAL_CONTROL_LAST_UPDATEReady = true; } return _PARENTAL_CONTROL_LAST_UPDATEContent; } }
             private static Java.Lang.String _PARENTAL_CONTROL_LAST_UPDATEContent = default;
             private static bool _PARENTAL_CONTROL_LAST_UPDATEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#PARENTAL_CONTROL_REDIRECT_URL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String PARENTAL_CONTROL_REDIRECT_URL { get { if (!_PARENTAL_CONTROL_REDIRECT_URLReady) { _PARENTAL_CONTROL_REDIRECT_URLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PARENTAL_CONTROL_REDIRECT_URL"); _PARENTAL_CONTROL_REDIRECT_URLReady = true; } return _PARENTAL_CONTROL_REDIRECT_URLContent; } }
             private static Java.Lang.String _PARENTAL_CONTROL_REDIRECT_URLContent = default;
             private static bool _PARENTAL_CONTROL_REDIRECT_URLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#RADIO_BLUETOOTH"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String RADIO_BLUETOOTH { get { if (!_RADIO_BLUETOOTHReady) { _RADIO_BLUETOOTHContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "RADIO_BLUETOOTH"); _RADIO_BLUETOOTHReady = true; } return _RADIO_BLUETOOTHContent; } }
             private static Java.Lang.String _RADIO_BLUETOOTHContent = default;
             private static bool _RADIO_BLUETOOTHReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#RADIO_CELL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String RADIO_CELL { get { if (!_RADIO_CELLReady) { _RADIO_CELLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "RADIO_CELL"); _RADIO_CELLReady = true; } return _RADIO_CELLContent; } }
             private static Java.Lang.String _RADIO_CELLContent = default;
             private static bool _RADIO_CELLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#RADIO_NFC"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String RADIO_NFC { get { if (!_RADIO_NFCReady) { _RADIO_NFCContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "RADIO_NFC"); _RADIO_NFCReady = true; } return _RADIO_NFCContent; } }
             private static Java.Lang.String _RADIO_NFCContent = default;
             private static bool _RADIO_NFCReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#RADIO_WIFI"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String RADIO_WIFI { get { if (!_RADIO_WIFIReady) { _RADIO_WIFIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "RADIO_WIFI"); _RADIO_WIFIReady = true; } return _RADIO_WIFIContent; } }
             private static Java.Lang.String _RADIO_WIFIContent = default;
             private static bool _RADIO_WIFIReady = false; // this is used because in case of generics 
@@ -2398,7 +2398,7 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#SETTINGS_CLASSNAME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SETTINGS_CLASSNAME { get { if (!_SETTINGS_CLASSNAMEReady) { _SETTINGS_CLASSNAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SETTINGS_CLASSNAME"); _SETTINGS_CLASSNAMEReady = true; } return _SETTINGS_CLASSNAMEContent; } }
             private static Java.Lang.String _SETTINGS_CLASSNAMEContent = default;
             private static bool _SETTINGS_CLASSNAMEReady = false; // this is used because in case of generics 
@@ -2417,14 +2417,14 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#SHOW_PROCESSES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SHOW_PROCESSES { get { if (!_SHOW_PROCESSESReady) { _SHOW_PROCESSESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SHOW_PROCESSES"); _SHOW_PROCESSESReady = true; } return _SHOW_PROCESSESContent; } }
             private static Java.Lang.String _SHOW_PROCESSESContent = default;
             private static bool _SHOW_PROCESSESReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#SHOW_WEB_SUGGESTIONS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String SHOW_WEB_SUGGESTIONS { get { if (!_SHOW_WEB_SUGGESTIONSReady) { _SHOW_WEB_SUGGESTIONSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SHOW_WEB_SUGGESTIONS"); _SHOW_WEB_SUGGESTIONSReady = true; } return _SHOW_WEB_SUGGESTIONSContent; } }
             private static Java.Lang.String _SHOW_WEB_SUGGESTIONSContent = default;
             private static bool _SHOW_WEB_SUGGESTIONSReady = false; // this is used because in case of generics 
@@ -2437,7 +2437,7 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#STAY_ON_WHILE_PLUGGED_IN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String STAY_ON_WHILE_PLUGGED_IN { get { if (!_STAY_ON_WHILE_PLUGGED_INReady) { _STAY_ON_WHILE_PLUGGED_INContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "STAY_ON_WHILE_PLUGGED_IN"); _STAY_ON_WHILE_PLUGGED_INReady = true; } return _STAY_ON_WHILE_PLUGGED_INContent; } }
             private static Java.Lang.String _STAY_ON_WHILE_PLUGGED_INContent = default;
             private static bool _STAY_ON_WHILE_PLUGGED_INReady = false; // this is used because in case of generics 
@@ -2474,21 +2474,21 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#TRANSITION_ANIMATION_SCALE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String TRANSITION_ANIMATION_SCALE { get { if (!_TRANSITION_ANIMATION_SCALEReady) { _TRANSITION_ANIMATION_SCALEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TRANSITION_ANIMATION_SCALE"); _TRANSITION_ANIMATION_SCALEReady = true; } return _TRANSITION_ANIMATION_SCALEContent; } }
             private static Java.Lang.String _TRANSITION_ANIMATION_SCALEContent = default;
             private static bool _TRANSITION_ANIMATION_SCALEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#USB_MASS_STORAGE_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USB_MASS_STORAGE_ENABLED { get { if (!_USB_MASS_STORAGE_ENABLEDReady) { _USB_MASS_STORAGE_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USB_MASS_STORAGE_ENABLED"); _USB_MASS_STORAGE_ENABLEDReady = true; } return _USB_MASS_STORAGE_ENABLEDContent; } }
             private static Java.Lang.String _USB_MASS_STORAGE_ENABLEDContent = default;
             private static bool _USB_MASS_STORAGE_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#USE_GOOGLE_MAIL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String USE_GOOGLE_MAIL { get { if (!_USE_GOOGLE_MAILReady) { _USE_GOOGLE_MAILContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USE_GOOGLE_MAIL"); _USE_GOOGLE_MAILReady = true; } return _USE_GOOGLE_MAILContent; } }
             private static Java.Lang.String _USE_GOOGLE_MAILContent = default;
             private static bool _USE_GOOGLE_MAILReady = false; // this is used because in case of generics 
@@ -2507,196 +2507,196 @@ public partial class System
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#VIBRATE_WHEN_RINGING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String VIBRATE_WHEN_RINGING { get { if (!_VIBRATE_WHEN_RINGINGReady) { _VIBRATE_WHEN_RINGINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "VIBRATE_WHEN_RINGING"); _VIBRATE_WHEN_RINGINGReady = true; } return _VIBRATE_WHEN_RINGINGContent; } }
             private static Java.Lang.String _VIBRATE_WHEN_RINGINGContent = default;
             private static bool _VIBRATE_WHEN_RINGINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WAIT_FOR_DEBUGGER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WAIT_FOR_DEBUGGER { get { if (!_WAIT_FOR_DEBUGGERReady) { _WAIT_FOR_DEBUGGERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WAIT_FOR_DEBUGGER"); _WAIT_FOR_DEBUGGERReady = true; } return _WAIT_FOR_DEBUGGERContent; } }
             private static Java.Lang.String _WAIT_FOR_DEBUGGERContent = default;
             private static bool _WAIT_FOR_DEBUGGERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WALLPAPER_ACTIVITY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WALLPAPER_ACTIVITY { get { if (!_WALLPAPER_ACTIVITYReady) { _WALLPAPER_ACTIVITYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WALLPAPER_ACTIVITY"); _WALLPAPER_ACTIVITYReady = true; } return _WALLPAPER_ACTIVITYContent; } }
             private static Java.Lang.String _WALLPAPER_ACTIVITYContent = default;
             private static bool _WALLPAPER_ACTIVITYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_MAX_DHCP_RETRY_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_MAX_DHCP_RETRY_COUNT { get { if (!_WIFI_MAX_DHCP_RETRY_COUNTReady) { _WIFI_MAX_DHCP_RETRY_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_MAX_DHCP_RETRY_COUNT"); _WIFI_MAX_DHCP_RETRY_COUNTReady = true; } return _WIFI_MAX_DHCP_RETRY_COUNTContent; } }
             private static Java.Lang.String _WIFI_MAX_DHCP_RETRY_COUNTContent = default;
             private static bool _WIFI_MAX_DHCP_RETRY_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS { get { if (!_WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSReady) { _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS"); _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSReady = true; } return _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSContent; } }
             private static Java.Lang.String _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSContent = default;
             private static bool _WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON { get { if (!_WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady) { _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON"); _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady = true; } return _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent; } }
             private static Java.Lang.String _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONContent = default;
             private static bool _WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY { get { if (!_WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady) { _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY"); _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady = true; } return _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent; } }
             private static Java.Lang.String _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYContent = default;
             private static bool _WIFI_NETWORKS_AVAILABLE_REPEAT_DELAYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_NUM_OPEN_NETWORKS_KEPT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_NUM_OPEN_NETWORKS_KEPT { get { if (!_WIFI_NUM_OPEN_NETWORKS_KEPTReady) { _WIFI_NUM_OPEN_NETWORKS_KEPTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_NUM_OPEN_NETWORKS_KEPT"); _WIFI_NUM_OPEN_NETWORKS_KEPTReady = true; } return _WIFI_NUM_OPEN_NETWORKS_KEPTContent; } }
             private static Java.Lang.String _WIFI_NUM_OPEN_NETWORKS_KEPTContent = default;
             private static bool _WIFI_NUM_OPEN_NETWORKS_KEPTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_ON { get { if (!_WIFI_ONReady) { _WIFI_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_ON"); _WIFI_ONReady = true; } return _WIFI_ONContent; } }
             private static Java.Lang.String _WIFI_ONContent = default;
             private static bool _WIFI_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_SLEEP_POLICY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_SLEEP_POLICY { get { if (!_WIFI_SLEEP_POLICYReady) { _WIFI_SLEEP_POLICYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_SLEEP_POLICY"); _WIFI_SLEEP_POLICYReady = true; } return _WIFI_SLEEP_POLICYContent; } }
             private static Java.Lang.String _WIFI_SLEEP_POLICYContent = default;
             private static bool _WIFI_SLEEP_POLICYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_STATIC_DNS1"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_STATIC_DNS1 { get { if (!_WIFI_STATIC_DNS1Ready) { _WIFI_STATIC_DNS1Content = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_STATIC_DNS1"); _WIFI_STATIC_DNS1Ready = true; } return _WIFI_STATIC_DNS1Content; } }
             private static Java.Lang.String _WIFI_STATIC_DNS1Content = default;
             private static bool _WIFI_STATIC_DNS1Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_STATIC_DNS2"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_STATIC_DNS2 { get { if (!_WIFI_STATIC_DNS2Ready) { _WIFI_STATIC_DNS2Content = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_STATIC_DNS2"); _WIFI_STATIC_DNS2Ready = true; } return _WIFI_STATIC_DNS2Content; } }
             private static Java.Lang.String _WIFI_STATIC_DNS2Content = default;
             private static bool _WIFI_STATIC_DNS2Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_STATIC_GATEWAY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_STATIC_GATEWAY { get { if (!_WIFI_STATIC_GATEWAYReady) { _WIFI_STATIC_GATEWAYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_STATIC_GATEWAY"); _WIFI_STATIC_GATEWAYReady = true; } return _WIFI_STATIC_GATEWAYContent; } }
             private static Java.Lang.String _WIFI_STATIC_GATEWAYContent = default;
             private static bool _WIFI_STATIC_GATEWAYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_STATIC_IP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_STATIC_IP { get { if (!_WIFI_STATIC_IPReady) { _WIFI_STATIC_IPContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_STATIC_IP"); _WIFI_STATIC_IPReady = true; } return _WIFI_STATIC_IPContent; } }
             private static Java.Lang.String _WIFI_STATIC_IPContent = default;
             private static bool _WIFI_STATIC_IPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_STATIC_NETMASK"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_STATIC_NETMASK { get { if (!_WIFI_STATIC_NETMASKReady) { _WIFI_STATIC_NETMASKContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_STATIC_NETMASK"); _WIFI_STATIC_NETMASKReady = true; } return _WIFI_STATIC_NETMASKContent; } }
             private static Java.Lang.String _WIFI_STATIC_NETMASKContent = default;
             private static bool _WIFI_STATIC_NETMASKReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_USE_STATIC_IP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_USE_STATIC_IP { get { if (!_WIFI_USE_STATIC_IPReady) { _WIFI_USE_STATIC_IPContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_USE_STATIC_IP"); _WIFI_USE_STATIC_IPReady = true; } return _WIFI_USE_STATIC_IPContent; } }
             private static Java.Lang.String _WIFI_USE_STATIC_IPContent = default;
             private static bool _WIFI_USE_STATIC_IPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE { get { if (!_WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEReady) { _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE"); _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEReady = true; } return _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEContent = default;
             private static bool _WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_AP_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_AP_COUNT { get { if (!_WIFI_WATCHDOG_AP_COUNTReady) { _WIFI_WATCHDOG_AP_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_AP_COUNT"); _WIFI_WATCHDOG_AP_COUNTReady = true; } return _WIFI_WATCHDOG_AP_COUNTContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_AP_COUNTContent = default;
             private static bool _WIFI_WATCHDOG_AP_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS { get { if (!_WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSReady) { _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS"); _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSReady = true; } return _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSContent = default;
             private static bool _WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED { get { if (!_WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDReady) { _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED"); _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDReady = true; } return _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDContent = default;
             private static bool _WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLEDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS { get { if (!_WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSReady) { _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS"); _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSReady = true; } return _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSContent = default;
             private static bool _WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT { get { if (!_WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTReady) { _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT"); _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTReady = true; } return _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTContent = default;
             private static bool _WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_MAX_AP_CHECKS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_MAX_AP_CHECKS { get { if (!_WIFI_WATCHDOG_MAX_AP_CHECKSReady) { _WIFI_WATCHDOG_MAX_AP_CHECKSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_MAX_AP_CHECKS"); _WIFI_WATCHDOG_MAX_AP_CHECKSReady = true; } return _WIFI_WATCHDOG_MAX_AP_CHECKSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_MAX_AP_CHECKSContent = default;
             private static bool _WIFI_WATCHDOG_MAX_AP_CHECKSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_ON { get { if (!_WIFI_WATCHDOG_ONReady) { _WIFI_WATCHDOG_ONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_ON"); _WIFI_WATCHDOG_ONReady = true; } return _WIFI_WATCHDOG_ONContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_ONContent = default;
             private static bool _WIFI_WATCHDOG_ONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_PING_COUNT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_PING_COUNT { get { if (!_WIFI_WATCHDOG_PING_COUNTReady) { _WIFI_WATCHDOG_PING_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_PING_COUNT"); _WIFI_WATCHDOG_PING_COUNTReady = true; } return _WIFI_WATCHDOG_PING_COUNTContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_PING_COUNTContent = default;
             private static bool _WIFI_WATCHDOG_PING_COUNTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_PING_DELAY_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_PING_DELAY_MS { get { if (!_WIFI_WATCHDOG_PING_DELAY_MSReady) { _WIFI_WATCHDOG_PING_DELAY_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_PING_DELAY_MS"); _WIFI_WATCHDOG_PING_DELAY_MSReady = true; } return _WIFI_WATCHDOG_PING_DELAY_MSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_PING_DELAY_MSContent = default;
             private static bool _WIFI_WATCHDOG_PING_DELAY_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WIFI_WATCHDOG_PING_TIMEOUT_MS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS { get { if (!_WIFI_WATCHDOG_PING_TIMEOUT_MSReady) { _WIFI_WATCHDOG_PING_TIMEOUT_MSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WIFI_WATCHDOG_PING_TIMEOUT_MS"); _WIFI_WATCHDOG_PING_TIMEOUT_MSReady = true; } return _WIFI_WATCHDOG_PING_TIMEOUT_MSContent; } }
             private static Java.Lang.String _WIFI_WATCHDOG_PING_TIMEOUT_MSContent = default;
             private static bool _WIFI_WATCHDOG_PING_TIMEOUT_MSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Settings.System.html#WINDOW_ANIMATION_SCALE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String WINDOW_ANIMATION_SCALE { get { if (!_WINDOW_ANIMATION_SCALEReady) { _WINDOW_ANIMATION_SCALEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "WINDOW_ANIMATION_SCALE"); _WINDOW_ANIMATION_SCALEReady = true; } return _WINDOW_ANIMATION_SCALEContent; } }
             private static Java.Lang.String _WINDOW_ANIMATION_SCALEContent = default;
             private static bool _WINDOW_ANIMATION_SCALEReady = false; // this is used because in case of generics 
@@ -2727,7 +2727,7 @@ public static bool CanWrite(Android.Content.Context arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static bool GetShowGTalkServiceStatus(Android.Content.ContentResolver arg0)
             {
                 return SExecuteWithSignature<bool>(LocalBridgeClazz, "getShowGTalkServiceStatus", "(Landroid/content/ContentResolver;)Z", arg0);
@@ -2876,7 +2876,7 @@ public static void GetConfiguration(Android.Content.ContentResolver arg0, Androi
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.ContentResolver"/></param>
             /// <param name="arg1"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static void SetShowGTalkServiceStatus(Android.Content.ContentResolver arg0, bool arg1)
             {
                 SExecute(LocalBridgeClazz, "setShowGTalkServiceStatus", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Provider/Telephony.cs b/src/net/Netdroid/Generated/Android/Provider/Telephony.cs
index ce8de194e..2275ac28b 100644
--- a/src/net/Netdroid/Generated/Android/Provider/Telephony.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/Telephony.cs
@@ -475,7 +475,7 @@ public partial class Carriers
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Telephony.Carriers.html#BEARER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String BEARER { get { if (!_BEARERReady) { _BEARERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "BEARER"); _BEARERReady = true; } return _BEARERContent; } }
             private static Java.Lang.String _BEARERContent = default;
             private static bool _BEARERReady = false; // this is used because in case of generics 
@@ -506,7 +506,7 @@ public partial class Carriers
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Telephony.Carriers.html#MCC"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String MCC { get { if (!_MCCReady) { _MCCContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MCC"); _MCCReady = true; } return _MCCContent; } }
             private static Java.Lang.String _MCCContent = default;
             private static bool _MCCReady = false; // this is used because in case of generics 
@@ -531,21 +531,21 @@ public partial class Carriers
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Telephony.Carriers.html#MNC"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String MNC { get { if (!_MNCReady) { _MNCContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MNC"); _MNCReady = true; } return _MNCContent; } }
             private static Java.Lang.String _MNCContent = default;
             private static bool _MNCReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Telephony.Carriers.html#MVNO_MATCH_DATA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String MVNO_MATCH_DATA { get { if (!_MVNO_MATCH_DATAReady) { _MVNO_MATCH_DATAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MVNO_MATCH_DATA"); _MVNO_MATCH_DATAReady = true; } return _MVNO_MATCH_DATAContent; } }
             private static Java.Lang.String _MVNO_MATCH_DATAContent = default;
             private static bool _MVNO_MATCH_DATAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Telephony.Carriers.html#MVNO_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String MVNO_TYPE { get { if (!_MVNO_TYPEReady) { _MVNO_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MVNO_TYPE"); _MVNO_TYPEReady = true; } return _MVNO_TYPEContent; } }
             private static Java.Lang.String _MVNO_TYPEContent = default;
             private static bool _MVNO_TYPEReady = false; // this is used because in case of generics 
@@ -564,7 +564,7 @@ public partial class Carriers
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/Telephony.Carriers.html#NUMERIC"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String NUMERIC { get { if (!_NUMERICReady) { _NUMERICContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NUMERIC"); _NUMERICReady = true; } return _NUMERICContent; } }
             private static Java.Lang.String _NUMERICContent = default;
             private static bool _NUMERICReady = false; // this is used because in case of generics 
@@ -1736,7 +1736,7 @@ public partial class Intents
                 /// <summary>
                 /// <see href="https://developer.android.com/reference/android/provider/Telephony.Sms.Intents.html#SECRET_CODE_ACTION"/>
                 /// </summary>
-                [System.Obsolete()]
+                [global::System.Obsolete()]
                 public static Java.Lang.String SECRET_CODE_ACTION { get { if (!_SECRET_CODE_ACTIONReady) { _SECRET_CODE_ACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SECRET_CODE_ACTION"); _SECRET_CODE_ACTIONReady = true; } return _SECRET_CODE_ACTIONContent; } }
                 private static Java.Lang.String _SECRET_CODE_ACTIONContent = default;
                 private static bool _SECRET_CODE_ACTIONReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Provider/UserDictionary.cs b/src/net/Netdroid/Generated/Android/Provider/UserDictionary.cs
index 1881e2be8..3d8efe59f 100644
--- a/src/net/Netdroid/Generated/Android/Provider/UserDictionary.cs
+++ b/src/net/Netdroid/Generated/Android/Provider/UserDictionary.cs
@@ -82,14 +82,14 @@ public partial class Words
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/UserDictionary.Words.html#LOCALE_TYPE_ALL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int LOCALE_TYPE_ALL { get { if (!_LOCALE_TYPE_ALLReady) { _LOCALE_TYPE_ALLContent = SGetField<int>(LocalBridgeClazz, "LOCALE_TYPE_ALL"); _LOCALE_TYPE_ALLReady = true; } return _LOCALE_TYPE_ALLContent; } }
             private static int _LOCALE_TYPE_ALLContent = default;
             private static bool _LOCALE_TYPE_ALLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/provider/UserDictionary.Words.html#LOCALE_TYPE_CURRENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int LOCALE_TYPE_CURRENT { get { if (!_LOCALE_TYPE_CURRENTReady) { _LOCALE_TYPE_CURRENTContent = SGetField<int>(LocalBridgeClazz, "LOCALE_TYPE_CURRENT"); _LOCALE_TYPE_CURRENTReady = true; } return _LOCALE_TYPE_CURRENTContent; } }
             private static int _LOCALE_TYPE_CURRENTContent = default;
             private static bool _LOCALE_TYPE_CURRENTReady = false; // this is used because in case of generics 
@@ -158,7 +158,7 @@ public partial class Words
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
             /// <param name="arg2"><see cref="int"/></param>
             /// <param name="arg3"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static void AddWord(Android.Content.Context arg0, Java.Lang.String arg1, int arg2, int arg3)
             {
                 SExecute(LocalBridgeClazz, "addWord", arg0, arg1, arg2, arg3);
diff --git a/src/net/Netdroid/Generated/Android/R.cs b/src/net/Netdroid/Generated/Android/R.cs
new file mode 100644
index 000000000..3e4f288db
--- /dev/null
+++ b/src/net/Netdroid/Generated/Android/R.cs
@@ -0,0 +1,17824 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android
+{
+    #region R
+    public partial class R
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+        #region anim
+        public partial class anim
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#accelerate_decelerate_interpolator"/>
+            /// </summary>
+            public static int accelerate_decelerate_interpolator { get { if (!_accelerate_decelerate_interpolatorReady) { _accelerate_decelerate_interpolatorContent = SGetField<int>(LocalBridgeClazz, "accelerate_decelerate_interpolator"); _accelerate_decelerate_interpolatorReady = true; } return _accelerate_decelerate_interpolatorContent; } }
+            private static int _accelerate_decelerate_interpolatorContent = default;
+            private static bool _accelerate_decelerate_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#accelerate_interpolator"/>
+            /// </summary>
+            public static int accelerate_interpolator { get { if (!_accelerate_interpolatorReady) { _accelerate_interpolatorContent = SGetField<int>(LocalBridgeClazz, "accelerate_interpolator"); _accelerate_interpolatorReady = true; } return _accelerate_interpolatorContent; } }
+            private static int _accelerate_interpolatorContent = default;
+            private static bool _accelerate_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#anticipate_interpolator"/>
+            /// </summary>
+            public static int anticipate_interpolator { get { if (!_anticipate_interpolatorReady) { _anticipate_interpolatorContent = SGetField<int>(LocalBridgeClazz, "anticipate_interpolator"); _anticipate_interpolatorReady = true; } return _anticipate_interpolatorContent; } }
+            private static int _anticipate_interpolatorContent = default;
+            private static bool _anticipate_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#anticipate_overshoot_interpolator"/>
+            /// </summary>
+            public static int anticipate_overshoot_interpolator { get { if (!_anticipate_overshoot_interpolatorReady) { _anticipate_overshoot_interpolatorContent = SGetField<int>(LocalBridgeClazz, "anticipate_overshoot_interpolator"); _anticipate_overshoot_interpolatorReady = true; } return _anticipate_overshoot_interpolatorContent; } }
+            private static int _anticipate_overshoot_interpolatorContent = default;
+            private static bool _anticipate_overshoot_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#bounce_interpolator"/>
+            /// </summary>
+            public static int bounce_interpolator { get { if (!_bounce_interpolatorReady) { _bounce_interpolatorContent = SGetField<int>(LocalBridgeClazz, "bounce_interpolator"); _bounce_interpolatorReady = true; } return _bounce_interpolatorContent; } }
+            private static int _bounce_interpolatorContent = default;
+            private static bool _bounce_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#cycle_interpolator"/>
+            /// </summary>
+            public static int cycle_interpolator { get { if (!_cycle_interpolatorReady) { _cycle_interpolatorContent = SGetField<int>(LocalBridgeClazz, "cycle_interpolator"); _cycle_interpolatorReady = true; } return _cycle_interpolatorContent; } }
+            private static int _cycle_interpolatorContent = default;
+            private static bool _cycle_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#decelerate_interpolator"/>
+            /// </summary>
+            public static int decelerate_interpolator { get { if (!_decelerate_interpolatorReady) { _decelerate_interpolatorContent = SGetField<int>(LocalBridgeClazz, "decelerate_interpolator"); _decelerate_interpolatorReady = true; } return _decelerate_interpolatorContent; } }
+            private static int _decelerate_interpolatorContent = default;
+            private static bool _decelerate_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#fade_in"/>
+            /// </summary>
+            public static int fade_in { get { if (!_fade_inReady) { _fade_inContent = SGetField<int>(LocalBridgeClazz, "fade_in"); _fade_inReady = true; } return _fade_inContent; } }
+            private static int _fade_inContent = default;
+            private static bool _fade_inReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#fade_out"/>
+            /// </summary>
+            public static int fade_out { get { if (!_fade_outReady) { _fade_outContent = SGetField<int>(LocalBridgeClazz, "fade_out"); _fade_outReady = true; } return _fade_outContent; } }
+            private static int _fade_outContent = default;
+            private static bool _fade_outReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#linear_interpolator"/>
+            /// </summary>
+            public static int linear_interpolator { get { if (!_linear_interpolatorReady) { _linear_interpolatorContent = SGetField<int>(LocalBridgeClazz, "linear_interpolator"); _linear_interpolatorReady = true; } return _linear_interpolatorContent; } }
+            private static int _linear_interpolatorContent = default;
+            private static bool _linear_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#overshoot_interpolator"/>
+            /// </summary>
+            public static int overshoot_interpolator { get { if (!_overshoot_interpolatorReady) { _overshoot_interpolatorContent = SGetField<int>(LocalBridgeClazz, "overshoot_interpolator"); _overshoot_interpolatorReady = true; } return _overshoot_interpolatorContent; } }
+            private static int _overshoot_interpolatorContent = default;
+            private static bool _overshoot_interpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#slide_in_left"/>
+            /// </summary>
+            public static int slide_in_left { get { if (!_slide_in_leftReady) { _slide_in_leftContent = SGetField<int>(LocalBridgeClazz, "slide_in_left"); _slide_in_leftReady = true; } return _slide_in_leftContent; } }
+            private static int _slide_in_leftContent = default;
+            private static bool _slide_in_leftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.anim.html#slide_out_right"/>
+            /// </summary>
+            public static int slide_out_right { get { if (!_slide_out_rightReady) { _slide_out_rightContent = SGetField<int>(LocalBridgeClazz, "slide_out_right"); _slide_out_rightReady = true; } return _slide_out_rightContent; } }
+            private static int _slide_out_rightContent = default;
+            private static bool _slide_out_rightReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region animator
+        public partial class animator
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.animator.html#fade_in"/>
+            /// </summary>
+            public static int fade_in { get { if (!_fade_inReady) { _fade_inContent = SGetField<int>(LocalBridgeClazz, "fade_in"); _fade_inReady = true; } return _fade_inContent; } }
+            private static int _fade_inContent = default;
+            private static bool _fade_inReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.animator.html#fade_out"/>
+            /// </summary>
+            public static int fade_out { get { if (!_fade_outReady) { _fade_outContent = SGetField<int>(LocalBridgeClazz, "fade_out"); _fade_outReady = true; } return _fade_outContent; } }
+            private static int _fade_outContent = default;
+            private static bool _fade_outReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region array
+        public partial class array
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.array.html#emailAddressTypes"/>
+            /// </summary>
+            public static int emailAddressTypes { get { if (!_emailAddressTypesReady) { _emailAddressTypesContent = SGetField<int>(LocalBridgeClazz, "emailAddressTypes"); _emailAddressTypesReady = true; } return _emailAddressTypesContent; } }
+            private static int _emailAddressTypesContent = default;
+            private static bool _emailAddressTypesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.array.html#imProtocols"/>
+            /// </summary>
+            public static int imProtocols { get { if (!_imProtocolsReady) { _imProtocolsContent = SGetField<int>(LocalBridgeClazz, "imProtocols"); _imProtocolsReady = true; } return _imProtocolsContent; } }
+            private static int _imProtocolsContent = default;
+            private static bool _imProtocolsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.array.html#organizationTypes"/>
+            /// </summary>
+            public static int organizationTypes { get { if (!_organizationTypesReady) { _organizationTypesContent = SGetField<int>(LocalBridgeClazz, "organizationTypes"); _organizationTypesReady = true; } return _organizationTypesContent; } }
+            private static int _organizationTypesContent = default;
+            private static bool _organizationTypesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.array.html#phoneTypes"/>
+            /// </summary>
+            public static int phoneTypes { get { if (!_phoneTypesReady) { _phoneTypesContent = SGetField<int>(LocalBridgeClazz, "phoneTypes"); _phoneTypesReady = true; } return _phoneTypesContent; } }
+            private static int _phoneTypesContent = default;
+            private static bool _phoneTypesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.array.html#postalAddressTypes"/>
+            /// </summary>
+            public static int postalAddressTypes { get { if (!_postalAddressTypesReady) { _postalAddressTypesContent = SGetField<int>(LocalBridgeClazz, "postalAddressTypes"); _postalAddressTypesReady = true; } return _postalAddressTypesContent; } }
+            private static int _postalAddressTypesContent = default;
+            private static bool _postalAddressTypesReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region attr
+        public partial class attr
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#absListViewStyle"/>
+            /// </summary>
+            public static int absListViewStyle { get { if (!_absListViewStyleReady) { _absListViewStyleContent = SGetField<int>(LocalBridgeClazz, "absListViewStyle"); _absListViewStyleReady = true; } return _absListViewStyleContent; } }
+            private static int _absListViewStyleContent = default;
+            private static bool _absListViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityDataSensitive"/>
+            /// </summary>
+            public static int accessibilityDataSensitive { get { if (!_accessibilityDataSensitiveReady) { _accessibilityDataSensitiveContent = SGetField<int>(LocalBridgeClazz, "accessibilityDataSensitive"); _accessibilityDataSensitiveReady = true; } return _accessibilityDataSensitiveContent; } }
+            private static int _accessibilityDataSensitiveContent = default;
+            private static bool _accessibilityDataSensitiveReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityEventTypes"/>
+            /// </summary>
+            public static int accessibilityEventTypes { get { if (!_accessibilityEventTypesReady) { _accessibilityEventTypesContent = SGetField<int>(LocalBridgeClazz, "accessibilityEventTypes"); _accessibilityEventTypesReady = true; } return _accessibilityEventTypesContent; } }
+            private static int _accessibilityEventTypesContent = default;
+            private static bool _accessibilityEventTypesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityFeedbackType"/>
+            /// </summary>
+            public static int accessibilityFeedbackType { get { if (!_accessibilityFeedbackTypeReady) { _accessibilityFeedbackTypeContent = SGetField<int>(LocalBridgeClazz, "accessibilityFeedbackType"); _accessibilityFeedbackTypeReady = true; } return _accessibilityFeedbackTypeContent; } }
+            private static int _accessibilityFeedbackTypeContent = default;
+            private static bool _accessibilityFeedbackTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityFlags"/>
+            /// </summary>
+            public static int accessibilityFlags { get { if (!_accessibilityFlagsReady) { _accessibilityFlagsContent = SGetField<int>(LocalBridgeClazz, "accessibilityFlags"); _accessibilityFlagsReady = true; } return _accessibilityFlagsContent; } }
+            private static int _accessibilityFlagsContent = default;
+            private static bool _accessibilityFlagsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityHeading"/>
+            /// </summary>
+            public static int accessibilityHeading { get { if (!_accessibilityHeadingReady) { _accessibilityHeadingContent = SGetField<int>(LocalBridgeClazz, "accessibilityHeading"); _accessibilityHeadingReady = true; } return _accessibilityHeadingContent; } }
+            private static int _accessibilityHeadingContent = default;
+            private static bool _accessibilityHeadingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityLiveRegion"/>
+            /// </summary>
+            public static int accessibilityLiveRegion { get { if (!_accessibilityLiveRegionReady) { _accessibilityLiveRegionContent = SGetField<int>(LocalBridgeClazz, "accessibilityLiveRegion"); _accessibilityLiveRegionReady = true; } return _accessibilityLiveRegionContent; } }
+            private static int _accessibilityLiveRegionContent = default;
+            private static bool _accessibilityLiveRegionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityPaneTitle"/>
+            /// </summary>
+            public static int accessibilityPaneTitle { get { if (!_accessibilityPaneTitleReady) { _accessibilityPaneTitleContent = SGetField<int>(LocalBridgeClazz, "accessibilityPaneTitle"); _accessibilityPaneTitleReady = true; } return _accessibilityPaneTitleContent; } }
+            private static int _accessibilityPaneTitleContent = default;
+            private static bool _accessibilityPaneTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityTraversalAfter"/>
+            /// </summary>
+            public static int accessibilityTraversalAfter { get { if (!_accessibilityTraversalAfterReady) { _accessibilityTraversalAfterContent = SGetField<int>(LocalBridgeClazz, "accessibilityTraversalAfter"); _accessibilityTraversalAfterReady = true; } return _accessibilityTraversalAfterContent; } }
+            private static int _accessibilityTraversalAfterContent = default;
+            private static bool _accessibilityTraversalAfterReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accessibilityTraversalBefore"/>
+            /// </summary>
+            public static int accessibilityTraversalBefore { get { if (!_accessibilityTraversalBeforeReady) { _accessibilityTraversalBeforeContent = SGetField<int>(LocalBridgeClazz, "accessibilityTraversalBefore"); _accessibilityTraversalBeforeReady = true; } return _accessibilityTraversalBeforeContent; } }
+            private static int _accessibilityTraversalBeforeContent = default;
+            private static bool _accessibilityTraversalBeforeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accountPreferences"/>
+            /// </summary>
+            public static int accountPreferences { get { if (!_accountPreferencesReady) { _accountPreferencesContent = SGetField<int>(LocalBridgeClazz, "accountPreferences"); _accountPreferencesReady = true; } return _accountPreferencesContent; } }
+            private static int _accountPreferencesContent = default;
+            private static bool _accountPreferencesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#accountType"/>
+            /// </summary>
+            public static int accountType { get { if (!_accountTypeReady) { _accountTypeContent = SGetField<int>(LocalBridgeClazz, "accountType"); _accountTypeReady = true; } return _accountTypeContent; } }
+            private static int _accountTypeContent = default;
+            private static bool _accountTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#action"/>
+            /// </summary>
+            public static int action { get { if (!_actionReady) { _actionContent = SGetField<int>(LocalBridgeClazz, "action"); _actionReady = true; } return _actionContent; } }
+            private static int _actionContent = default;
+            private static bool _actionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarDivider"/>
+            /// </summary>
+            public static int actionBarDivider { get { if (!_actionBarDividerReady) { _actionBarDividerContent = SGetField<int>(LocalBridgeClazz, "actionBarDivider"); _actionBarDividerReady = true; } return _actionBarDividerContent; } }
+            private static int _actionBarDividerContent = default;
+            private static bool _actionBarDividerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarItemBackground"/>
+            /// </summary>
+            public static int actionBarItemBackground { get { if (!_actionBarItemBackgroundReady) { _actionBarItemBackgroundContent = SGetField<int>(LocalBridgeClazz, "actionBarItemBackground"); _actionBarItemBackgroundReady = true; } return _actionBarItemBackgroundContent; } }
+            private static int _actionBarItemBackgroundContent = default;
+            private static bool _actionBarItemBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarPopupTheme"/>
+            /// </summary>
+            public static int actionBarPopupTheme { get { if (!_actionBarPopupThemeReady) { _actionBarPopupThemeContent = SGetField<int>(LocalBridgeClazz, "actionBarPopupTheme"); _actionBarPopupThemeReady = true; } return _actionBarPopupThemeContent; } }
+            private static int _actionBarPopupThemeContent = default;
+            private static bool _actionBarPopupThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarSize"/>
+            /// </summary>
+            public static int actionBarSize { get { if (!_actionBarSizeReady) { _actionBarSizeContent = SGetField<int>(LocalBridgeClazz, "actionBarSize"); _actionBarSizeReady = true; } return _actionBarSizeContent; } }
+            private static int _actionBarSizeContent = default;
+            private static bool _actionBarSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarSplitStyle"/>
+            /// </summary>
+            public static int actionBarSplitStyle { get { if (!_actionBarSplitStyleReady) { _actionBarSplitStyleContent = SGetField<int>(LocalBridgeClazz, "actionBarSplitStyle"); _actionBarSplitStyleReady = true; } return _actionBarSplitStyleContent; } }
+            private static int _actionBarSplitStyleContent = default;
+            private static bool _actionBarSplitStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarStyle"/>
+            /// </summary>
+            public static int actionBarStyle { get { if (!_actionBarStyleReady) { _actionBarStyleContent = SGetField<int>(LocalBridgeClazz, "actionBarStyle"); _actionBarStyleReady = true; } return _actionBarStyleContent; } }
+            private static int _actionBarStyleContent = default;
+            private static bool _actionBarStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarTabBarStyle"/>
+            /// </summary>
+            public static int actionBarTabBarStyle { get { if (!_actionBarTabBarStyleReady) { _actionBarTabBarStyleContent = SGetField<int>(LocalBridgeClazz, "actionBarTabBarStyle"); _actionBarTabBarStyleReady = true; } return _actionBarTabBarStyleContent; } }
+            private static int _actionBarTabBarStyleContent = default;
+            private static bool _actionBarTabBarStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarTabStyle"/>
+            /// </summary>
+            public static int actionBarTabStyle { get { if (!_actionBarTabStyleReady) { _actionBarTabStyleContent = SGetField<int>(LocalBridgeClazz, "actionBarTabStyle"); _actionBarTabStyleReady = true; } return _actionBarTabStyleContent; } }
+            private static int _actionBarTabStyleContent = default;
+            private static bool _actionBarTabStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarTabTextStyle"/>
+            /// </summary>
+            public static int actionBarTabTextStyle { get { if (!_actionBarTabTextStyleReady) { _actionBarTabTextStyleContent = SGetField<int>(LocalBridgeClazz, "actionBarTabTextStyle"); _actionBarTabTextStyleReady = true; } return _actionBarTabTextStyleContent; } }
+            private static int _actionBarTabTextStyleContent = default;
+            private static bool _actionBarTabTextStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarTheme"/>
+            /// </summary>
+            public static int actionBarTheme { get { if (!_actionBarThemeReady) { _actionBarThemeContent = SGetField<int>(LocalBridgeClazz, "actionBarTheme"); _actionBarThemeReady = true; } return _actionBarThemeContent; } }
+            private static int _actionBarThemeContent = default;
+            private static bool _actionBarThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionBarWidgetTheme"/>
+            /// </summary>
+            public static int actionBarWidgetTheme { get { if (!_actionBarWidgetThemeReady) { _actionBarWidgetThemeContent = SGetField<int>(LocalBridgeClazz, "actionBarWidgetTheme"); _actionBarWidgetThemeReady = true; } return _actionBarWidgetThemeContent; } }
+            private static int _actionBarWidgetThemeContent = default;
+            private static bool _actionBarWidgetThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionButtonStyle"/>
+            /// </summary>
+            public static int actionButtonStyle { get { if (!_actionButtonStyleReady) { _actionButtonStyleContent = SGetField<int>(LocalBridgeClazz, "actionButtonStyle"); _actionButtonStyleReady = true; } return _actionButtonStyleContent; } }
+            private static int _actionButtonStyleContent = default;
+            private static bool _actionButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionDropDownStyle"/>
+            /// </summary>
+            public static int actionDropDownStyle { get { if (!_actionDropDownStyleReady) { _actionDropDownStyleContent = SGetField<int>(LocalBridgeClazz, "actionDropDownStyle"); _actionDropDownStyleReady = true; } return _actionDropDownStyleContent; } }
+            private static int _actionDropDownStyleContent = default;
+            private static bool _actionDropDownStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionLayout"/>
+            /// </summary>
+            public static int actionLayout { get { if (!_actionLayoutReady) { _actionLayoutContent = SGetField<int>(LocalBridgeClazz, "actionLayout"); _actionLayoutReady = true; } return _actionLayoutContent; } }
+            private static int _actionLayoutContent = default;
+            private static bool _actionLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionMenuTextAppearance"/>
+            /// </summary>
+            public static int actionMenuTextAppearance { get { if (!_actionMenuTextAppearanceReady) { _actionMenuTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "actionMenuTextAppearance"); _actionMenuTextAppearanceReady = true; } return _actionMenuTextAppearanceContent; } }
+            private static int _actionMenuTextAppearanceContent = default;
+            private static bool _actionMenuTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionMenuTextColor"/>
+            /// </summary>
+            public static int actionMenuTextColor { get { if (!_actionMenuTextColorReady) { _actionMenuTextColorContent = SGetField<int>(LocalBridgeClazz, "actionMenuTextColor"); _actionMenuTextColorReady = true; } return _actionMenuTextColorContent; } }
+            private static int _actionMenuTextColorContent = default;
+            private static bool _actionMenuTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeBackground"/>
+            /// </summary>
+            public static int actionModeBackground { get { if (!_actionModeBackgroundReady) { _actionModeBackgroundContent = SGetField<int>(LocalBridgeClazz, "actionModeBackground"); _actionModeBackgroundReady = true; } return _actionModeBackgroundContent; } }
+            private static int _actionModeBackgroundContent = default;
+            private static bool _actionModeBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeCloseButtonStyle"/>
+            /// </summary>
+            public static int actionModeCloseButtonStyle { get { if (!_actionModeCloseButtonStyleReady) { _actionModeCloseButtonStyleContent = SGetField<int>(LocalBridgeClazz, "actionModeCloseButtonStyle"); _actionModeCloseButtonStyleReady = true; } return _actionModeCloseButtonStyleContent; } }
+            private static int _actionModeCloseButtonStyleContent = default;
+            private static bool _actionModeCloseButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeCloseDrawable"/>
+            /// </summary>
+            public static int actionModeCloseDrawable { get { if (!_actionModeCloseDrawableReady) { _actionModeCloseDrawableContent = SGetField<int>(LocalBridgeClazz, "actionModeCloseDrawable"); _actionModeCloseDrawableReady = true; } return _actionModeCloseDrawableContent; } }
+            private static int _actionModeCloseDrawableContent = default;
+            private static bool _actionModeCloseDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeCopyDrawable"/>
+            /// </summary>
+            public static int actionModeCopyDrawable { get { if (!_actionModeCopyDrawableReady) { _actionModeCopyDrawableContent = SGetField<int>(LocalBridgeClazz, "actionModeCopyDrawable"); _actionModeCopyDrawableReady = true; } return _actionModeCopyDrawableContent; } }
+            private static int _actionModeCopyDrawableContent = default;
+            private static bool _actionModeCopyDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeCutDrawable"/>
+            /// </summary>
+            public static int actionModeCutDrawable { get { if (!_actionModeCutDrawableReady) { _actionModeCutDrawableContent = SGetField<int>(LocalBridgeClazz, "actionModeCutDrawable"); _actionModeCutDrawableReady = true; } return _actionModeCutDrawableContent; } }
+            private static int _actionModeCutDrawableContent = default;
+            private static bool _actionModeCutDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeFindDrawable"/>
+            /// </summary>
+            public static int actionModeFindDrawable { get { if (!_actionModeFindDrawableReady) { _actionModeFindDrawableContent = SGetField<int>(LocalBridgeClazz, "actionModeFindDrawable"); _actionModeFindDrawableReady = true; } return _actionModeFindDrawableContent; } }
+            private static int _actionModeFindDrawableContent = default;
+            private static bool _actionModeFindDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModePasteDrawable"/>
+            /// </summary>
+            public static int actionModePasteDrawable { get { if (!_actionModePasteDrawableReady) { _actionModePasteDrawableContent = SGetField<int>(LocalBridgeClazz, "actionModePasteDrawable"); _actionModePasteDrawableReady = true; } return _actionModePasteDrawableContent; } }
+            private static int _actionModePasteDrawableContent = default;
+            private static bool _actionModePasteDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeSelectAllDrawable"/>
+            /// </summary>
+            public static int actionModeSelectAllDrawable { get { if (!_actionModeSelectAllDrawableReady) { _actionModeSelectAllDrawableContent = SGetField<int>(LocalBridgeClazz, "actionModeSelectAllDrawable"); _actionModeSelectAllDrawableReady = true; } return _actionModeSelectAllDrawableContent; } }
+            private static int _actionModeSelectAllDrawableContent = default;
+            private static bool _actionModeSelectAllDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeShareDrawable"/>
+            /// </summary>
+            public static int actionModeShareDrawable { get { if (!_actionModeShareDrawableReady) { _actionModeShareDrawableContent = SGetField<int>(LocalBridgeClazz, "actionModeShareDrawable"); _actionModeShareDrawableReady = true; } return _actionModeShareDrawableContent; } }
+            private static int _actionModeShareDrawableContent = default;
+            private static bool _actionModeShareDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeSplitBackground"/>
+            /// </summary>
+            public static int actionModeSplitBackground { get { if (!_actionModeSplitBackgroundReady) { _actionModeSplitBackgroundContent = SGetField<int>(LocalBridgeClazz, "actionModeSplitBackground"); _actionModeSplitBackgroundReady = true; } return _actionModeSplitBackgroundContent; } }
+            private static int _actionModeSplitBackgroundContent = default;
+            private static bool _actionModeSplitBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeStyle"/>
+            /// </summary>
+            public static int actionModeStyle { get { if (!_actionModeStyleReady) { _actionModeStyleContent = SGetField<int>(LocalBridgeClazz, "actionModeStyle"); _actionModeStyleReady = true; } return _actionModeStyleContent; } }
+            private static int _actionModeStyleContent = default;
+            private static bool _actionModeStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionModeWebSearchDrawable"/>
+            /// </summary>
+            public static int actionModeWebSearchDrawable { get { if (!_actionModeWebSearchDrawableReady) { _actionModeWebSearchDrawableContent = SGetField<int>(LocalBridgeClazz, "actionModeWebSearchDrawable"); _actionModeWebSearchDrawableReady = true; } return _actionModeWebSearchDrawableContent; } }
+            private static int _actionModeWebSearchDrawableContent = default;
+            private static bool _actionModeWebSearchDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionOverflowButtonStyle"/>
+            /// </summary>
+            public static int actionOverflowButtonStyle { get { if (!_actionOverflowButtonStyleReady) { _actionOverflowButtonStyleContent = SGetField<int>(LocalBridgeClazz, "actionOverflowButtonStyle"); _actionOverflowButtonStyleReady = true; } return _actionOverflowButtonStyleContent; } }
+            private static int _actionOverflowButtonStyleContent = default;
+            private static bool _actionOverflowButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionOverflowMenuStyle"/>
+            /// </summary>
+            public static int actionOverflowMenuStyle { get { if (!_actionOverflowMenuStyleReady) { _actionOverflowMenuStyleContent = SGetField<int>(LocalBridgeClazz, "actionOverflowMenuStyle"); _actionOverflowMenuStyleReady = true; } return _actionOverflowMenuStyleContent; } }
+            private static int _actionOverflowMenuStyleContent = default;
+            private static bool _actionOverflowMenuStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionProviderClass"/>
+            /// </summary>
+            public static int actionProviderClass { get { if (!_actionProviderClassReady) { _actionProviderClassContent = SGetField<int>(LocalBridgeClazz, "actionProviderClass"); _actionProviderClassReady = true; } return _actionProviderClassContent; } }
+            private static int _actionProviderClassContent = default;
+            private static bool _actionProviderClassReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#actionViewClass"/>
+            /// </summary>
+            public static int actionViewClass { get { if (!_actionViewClassReady) { _actionViewClassContent = SGetField<int>(LocalBridgeClazz, "actionViewClass"); _actionViewClassReady = true; } return _actionViewClassContent; } }
+            private static int _actionViewClassContent = default;
+            private static bool _actionViewClassReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#activatedBackgroundIndicator"/>
+            /// </summary>
+            public static int activatedBackgroundIndicator { get { if (!_activatedBackgroundIndicatorReady) { _activatedBackgroundIndicatorContent = SGetField<int>(LocalBridgeClazz, "activatedBackgroundIndicator"); _activatedBackgroundIndicatorReady = true; } return _activatedBackgroundIndicatorContent; } }
+            private static int _activatedBackgroundIndicatorContent = default;
+            private static bool _activatedBackgroundIndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#activityCloseEnterAnimation"/>
+            /// </summary>
+            public static int activityCloseEnterAnimation { get { if (!_activityCloseEnterAnimationReady) { _activityCloseEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "activityCloseEnterAnimation"); _activityCloseEnterAnimationReady = true; } return _activityCloseEnterAnimationContent; } }
+            private static int _activityCloseEnterAnimationContent = default;
+            private static bool _activityCloseEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#activityCloseExitAnimation"/>
+            /// </summary>
+            public static int activityCloseExitAnimation { get { if (!_activityCloseExitAnimationReady) { _activityCloseExitAnimationContent = SGetField<int>(LocalBridgeClazz, "activityCloseExitAnimation"); _activityCloseExitAnimationReady = true; } return _activityCloseExitAnimationContent; } }
+            private static int _activityCloseExitAnimationContent = default;
+            private static bool _activityCloseExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#activityOpenEnterAnimation"/>
+            /// </summary>
+            public static int activityOpenEnterAnimation { get { if (!_activityOpenEnterAnimationReady) { _activityOpenEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "activityOpenEnterAnimation"); _activityOpenEnterAnimationReady = true; } return _activityOpenEnterAnimationContent; } }
+            private static int _activityOpenEnterAnimationContent = default;
+            private static bool _activityOpenEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#activityOpenExitAnimation"/>
+            /// </summary>
+            public static int activityOpenExitAnimation { get { if (!_activityOpenExitAnimationReady) { _activityOpenExitAnimationContent = SGetField<int>(LocalBridgeClazz, "activityOpenExitAnimation"); _activityOpenExitAnimationReady = true; } return _activityOpenExitAnimationContent; } }
+            private static int _activityOpenExitAnimationContent = default;
+            private static bool _activityOpenExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#addPrintersActivity"/>
+            /// </summary>
+            public static int addPrintersActivity { get { if (!_addPrintersActivityReady) { _addPrintersActivityContent = SGetField<int>(LocalBridgeClazz, "addPrintersActivity"); _addPrintersActivityReady = true; } return _addPrintersActivityContent; } }
+            private static int _addPrintersActivityContent = default;
+            private static bool _addPrintersActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#addStatesFromChildren"/>
+            /// </summary>
+            public static int addStatesFromChildren { get { if (!_addStatesFromChildrenReady) { _addStatesFromChildrenContent = SGetField<int>(LocalBridgeClazz, "addStatesFromChildren"); _addStatesFromChildrenReady = true; } return _addStatesFromChildrenContent; } }
+            private static int _addStatesFromChildrenContent = default;
+            private static bool _addStatesFromChildrenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#adjustViewBounds"/>
+            /// </summary>
+            public static int adjustViewBounds { get { if (!_adjustViewBoundsReady) { _adjustViewBoundsContent = SGetField<int>(LocalBridgeClazz, "adjustViewBounds"); _adjustViewBoundsReady = true; } return _adjustViewBoundsContent; } }
+            private static int _adjustViewBoundsContent = default;
+            private static bool _adjustViewBoundsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#advancedPrintOptionsActivity"/>
+            /// </summary>
+            public static int advancedPrintOptionsActivity { get { if (!_advancedPrintOptionsActivityReady) { _advancedPrintOptionsActivityContent = SGetField<int>(LocalBridgeClazz, "advancedPrintOptionsActivity"); _advancedPrintOptionsActivityReady = true; } return _advancedPrintOptionsActivityContent; } }
+            private static int _advancedPrintOptionsActivityContent = default;
+            private static bool _advancedPrintOptionsActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alertDialogIcon"/>
+            /// </summary>
+            public static int alertDialogIcon { get { if (!_alertDialogIconReady) { _alertDialogIconContent = SGetField<int>(LocalBridgeClazz, "alertDialogIcon"); _alertDialogIconReady = true; } return _alertDialogIconContent; } }
+            private static int _alertDialogIconContent = default;
+            private static bool _alertDialogIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alertDialogStyle"/>
+            /// </summary>
+            public static int alertDialogStyle { get { if (!_alertDialogStyleReady) { _alertDialogStyleContent = SGetField<int>(LocalBridgeClazz, "alertDialogStyle"); _alertDialogStyleReady = true; } return _alertDialogStyleContent; } }
+            private static int _alertDialogStyleContent = default;
+            private static bool _alertDialogStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alertDialogTheme"/>
+            /// </summary>
+            public static int alertDialogTheme { get { if (!_alertDialogThemeReady) { _alertDialogThemeContent = SGetField<int>(LocalBridgeClazz, "alertDialogTheme"); _alertDialogThemeReady = true; } return _alertDialogThemeContent; } }
+            private static int _alertDialogThemeContent = default;
+            private static bool _alertDialogThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alignmentMode"/>
+            /// </summary>
+            public static int alignmentMode { get { if (!_alignmentModeReady) { _alignmentModeContent = SGetField<int>(LocalBridgeClazz, "alignmentMode"); _alignmentModeReady = true; } return _alignmentModeContent; } }
+            private static int _alignmentModeContent = default;
+            private static bool _alignmentModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allContactsName"/>
+            /// </summary>
+            public static int allContactsName { get { if (!_allContactsNameReady) { _allContactsNameContent = SGetField<int>(LocalBridgeClazz, "allContactsName"); _allContactsNameReady = true; } return _allContactsNameContent; } }
+            private static int _allContactsNameContent = default;
+            private static bool _allContactsNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowAudioPlaybackCapture"/>
+            /// </summary>
+            public static int allowAudioPlaybackCapture { get { if (!_allowAudioPlaybackCaptureReady) { _allowAudioPlaybackCaptureContent = SGetField<int>(LocalBridgeClazz, "allowAudioPlaybackCapture"); _allowAudioPlaybackCaptureReady = true; } return _allowAudioPlaybackCaptureContent; } }
+            private static int _allowAudioPlaybackCaptureContent = default;
+            private static bool _allowAudioPlaybackCaptureReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowBackup"/>
+            /// </summary>
+            public static int allowBackup { get { if (!_allowBackupReady) { _allowBackupContent = SGetField<int>(LocalBridgeClazz, "allowBackup"); _allowBackupReady = true; } return _allowBackupContent; } }
+            private static int _allowBackupContent = default;
+            private static bool _allowBackupReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowClearUserData"/>
+            /// </summary>
+            public static int allowClearUserData { get { if (!_allowClearUserDataReady) { _allowClearUserDataContent = SGetField<int>(LocalBridgeClazz, "allowClearUserData"); _allowClearUserDataReady = true; } return _allowClearUserDataContent; } }
+            private static int _allowClearUserDataContent = default;
+            private static bool _allowClearUserDataReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowClickWhenDisabled"/>
+            /// </summary>
+            public static int allowClickWhenDisabled { get { if (!_allowClickWhenDisabledReady) { _allowClickWhenDisabledContent = SGetField<int>(LocalBridgeClazz, "allowClickWhenDisabled"); _allowClickWhenDisabledReady = true; } return _allowClickWhenDisabledContent; } }
+            private static int _allowClickWhenDisabledContent = default;
+            private static bool _allowClickWhenDisabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowEmbedded"/>
+            /// </summary>
+            public static int allowEmbedded { get { if (!_allowEmbeddedReady) { _allowEmbeddedContent = SGetField<int>(LocalBridgeClazz, "allowEmbedded"); _allowEmbeddedReady = true; } return _allowEmbeddedContent; } }
+            private static int _allowEmbeddedContent = default;
+            private static bool _allowEmbeddedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowGameAngleDriver"/>
+            /// </summary>
+            public static int allowGameAngleDriver { get { if (!_allowGameAngleDriverReady) { _allowGameAngleDriverContent = SGetField<int>(LocalBridgeClazz, "allowGameAngleDriver"); _allowGameAngleDriverReady = true; } return _allowGameAngleDriverContent; } }
+            private static int _allowGameAngleDriverContent = default;
+            private static bool _allowGameAngleDriverReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowGameDownscaling"/>
+            /// </summary>
+            public static int allowGameDownscaling { get { if (!_allowGameDownscalingReady) { _allowGameDownscalingContent = SGetField<int>(LocalBridgeClazz, "allowGameDownscaling"); _allowGameDownscalingReady = true; } return _allowGameDownscalingContent; } }
+            private static int _allowGameDownscalingContent = default;
+            private static bool _allowGameDownscalingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowGameFpsOverride"/>
+            /// </summary>
+            public static int allowGameFpsOverride { get { if (!_allowGameFpsOverrideReady) { _allowGameFpsOverrideContent = SGetField<int>(LocalBridgeClazz, "allowGameFpsOverride"); _allowGameFpsOverrideReady = true; } return _allowGameFpsOverrideContent; } }
+            private static int _allowGameFpsOverrideContent = default;
+            private static bool _allowGameFpsOverrideReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowNativeHeapPointerTagging"/>
+            /// </summary>
+            public static int allowNativeHeapPointerTagging { get { if (!_allowNativeHeapPointerTaggingReady) { _allowNativeHeapPointerTaggingContent = SGetField<int>(LocalBridgeClazz, "allowNativeHeapPointerTagging"); _allowNativeHeapPointerTaggingReady = true; } return _allowNativeHeapPointerTaggingContent; } }
+            private static int _allowNativeHeapPointerTaggingContent = default;
+            private static bool _allowNativeHeapPointerTaggingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowParallelSyncs"/>
+            /// </summary>
+            public static int allowParallelSyncs { get { if (!_allowParallelSyncsReady) { _allowParallelSyncsContent = SGetField<int>(LocalBridgeClazz, "allowParallelSyncs"); _allowParallelSyncsReady = true; } return _allowParallelSyncsContent; } }
+            private static int _allowParallelSyncsContent = default;
+            private static bool _allowParallelSyncsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowSharedIsolatedProcess"/>
+            /// </summary>
+            public static int allowSharedIsolatedProcess { get { if (!_allowSharedIsolatedProcessReady) { _allowSharedIsolatedProcessContent = SGetField<int>(LocalBridgeClazz, "allowSharedIsolatedProcess"); _allowSharedIsolatedProcessReady = true; } return _allowSharedIsolatedProcessContent; } }
+            private static int _allowSharedIsolatedProcessContent = default;
+            private static bool _allowSharedIsolatedProcessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowSingleTap"/>
+            /// </summary>
+            public static int allowSingleTap { get { if (!_allowSingleTapReady) { _allowSingleTapContent = SGetField<int>(LocalBridgeClazz, "allowSingleTap"); _allowSingleTapReady = true; } return _allowSingleTapContent; } }
+            private static int _allowSingleTapContent = default;
+            private static bool _allowSingleTapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowTaskReparenting"/>
+            /// </summary>
+            public static int allowTaskReparenting { get { if (!_allowTaskReparentingReady) { _allowTaskReparentingContent = SGetField<int>(LocalBridgeClazz, "allowTaskReparenting"); _allowTaskReparentingReady = true; } return _allowTaskReparentingContent; } }
+            private static int _allowTaskReparentingContent = default;
+            private static bool _allowTaskReparentingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowUndo"/>
+            /// </summary>
+            public static int allowUndo { get { if (!_allowUndoReady) { _allowUndoContent = SGetField<int>(LocalBridgeClazz, "allowUndo"); _allowUndoReady = true; } return _allowUndoContent; } }
+            private static int _allowUndoContent = default;
+            private static bool _allowUndoReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowUntrustedActivityEmbedding"/>
+            /// </summary>
+            public static int allowUntrustedActivityEmbedding { get { if (!_allowUntrustedActivityEmbeddingReady) { _allowUntrustedActivityEmbeddingContent = SGetField<int>(LocalBridgeClazz, "allowUntrustedActivityEmbedding"); _allowUntrustedActivityEmbeddingReady = true; } return _allowUntrustedActivityEmbeddingContent; } }
+            private static int _allowUntrustedActivityEmbeddingContent = default;
+            private static bool _allowUntrustedActivityEmbeddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#allowUpdateOwnership"/>
+            /// </summary>
+            public static int allowUpdateOwnership { get { if (!_allowUpdateOwnershipReady) { _allowUpdateOwnershipContent = SGetField<int>(LocalBridgeClazz, "allowUpdateOwnership"); _allowUpdateOwnershipReady = true; } return _allowUpdateOwnershipContent; } }
+            private static int _allowUpdateOwnershipContent = default;
+            private static bool _allowUpdateOwnershipReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alpha"/>
+            /// </summary>
+            public static int alpha { get { if (!_alphaReady) { _alphaContent = SGetField<int>(LocalBridgeClazz, "alpha"); _alphaReady = true; } return _alphaContent; } }
+            private static int _alphaContent = default;
+            private static bool _alphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alphabeticModifiers"/>
+            /// </summary>
+            public static int alphabeticModifiers { get { if (!_alphabeticModifiersReady) { _alphabeticModifiersContent = SGetField<int>(LocalBridgeClazz, "alphabeticModifiers"); _alphabeticModifiersReady = true; } return _alphabeticModifiersContent; } }
+            private static int _alphabeticModifiersContent = default;
+            private static bool _alphabeticModifiersReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alphabeticShortcut"/>
+            /// </summary>
+            public static int alphabeticShortcut { get { if (!_alphabeticShortcutReady) { _alphabeticShortcutContent = SGetField<int>(LocalBridgeClazz, "alphabeticShortcut"); _alphabeticShortcutReady = true; } return _alphabeticShortcutContent; } }
+            private static int _alphabeticShortcutContent = default;
+            private static bool _alphabeticShortcutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alwaysDrawnWithCache"/>
+            /// </summary>
+            public static int alwaysDrawnWithCache { get { if (!_alwaysDrawnWithCacheReady) { _alwaysDrawnWithCacheContent = SGetField<int>(LocalBridgeClazz, "alwaysDrawnWithCache"); _alwaysDrawnWithCacheReady = true; } return _alwaysDrawnWithCacheContent; } }
+            private static int _alwaysDrawnWithCacheContent = default;
+            private static bool _alwaysDrawnWithCacheReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#alwaysRetainTaskState"/>
+            /// </summary>
+            public static int alwaysRetainTaskState { get { if (!_alwaysRetainTaskStateReady) { _alwaysRetainTaskStateContent = SGetField<int>(LocalBridgeClazz, "alwaysRetainTaskState"); _alwaysRetainTaskStateReady = true; } return _alwaysRetainTaskStateContent; } }
+            private static int _alwaysRetainTaskStateContent = default;
+            private static bool _alwaysRetainTaskStateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ambientShadowAlpha"/>
+            /// </summary>
+            public static int ambientShadowAlpha { get { if (!_ambientShadowAlphaReady) { _ambientShadowAlphaContent = SGetField<int>(LocalBridgeClazz, "ambientShadowAlpha"); _ambientShadowAlphaReady = true; } return _ambientShadowAlphaContent; } }
+            private static int _ambientShadowAlphaContent = default;
+            private static bool _ambientShadowAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#amPmBackgroundColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int amPmBackgroundColor { get { if (!_amPmBackgroundColorReady) { _amPmBackgroundColorContent = SGetField<int>(LocalBridgeClazz, "amPmBackgroundColor"); _amPmBackgroundColorReady = true; } return _amPmBackgroundColorContent; } }
+            private static int _amPmBackgroundColorContent = default;
+            private static bool _amPmBackgroundColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#amPmTextColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int amPmTextColor { get { if (!_amPmTextColorReady) { _amPmTextColorContent = SGetField<int>(LocalBridgeClazz, "amPmTextColor"); _amPmTextColorReady = true; } return _amPmTextColorContent; } }
+            private static int _amPmTextColorContent = default;
+            private static bool _amPmTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#angle"/>
+            /// </summary>
+            public static int angle { get { if (!_angleReady) { _angleContent = SGetField<int>(LocalBridgeClazz, "angle"); _angleReady = true; } return _angleContent; } }
+            private static int _angleContent = default;
+            private static bool _angleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animatedImageDrawable"/>
+            /// </summary>
+            public static int animatedImageDrawable { get { if (!_animatedImageDrawableReady) { _animatedImageDrawableContent = SGetField<int>(LocalBridgeClazz, "animatedImageDrawable"); _animatedImageDrawableReady = true; } return _animatedImageDrawableContent; } }
+            private static int _animatedImageDrawableContent = default;
+            private static bool _animatedImageDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animateFirstView"/>
+            /// </summary>
+            public static int animateFirstView { get { if (!_animateFirstViewReady) { _animateFirstViewContent = SGetField<int>(LocalBridgeClazz, "animateFirstView"); _animateFirstViewReady = true; } return _animateFirstViewContent; } }
+            private static int _animateFirstViewContent = default;
+            private static bool _animateFirstViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animateLayoutChanges"/>
+            /// </summary>
+            public static int animateLayoutChanges { get { if (!_animateLayoutChangesReady) { _animateLayoutChangesContent = SGetField<int>(LocalBridgeClazz, "animateLayoutChanges"); _animateLayoutChangesReady = true; } return _animateLayoutChangesContent; } }
+            private static int _animateLayoutChangesContent = default;
+            private static bool _animateLayoutChangesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animateOnClick"/>
+            /// </summary>
+            public static int animateOnClick { get { if (!_animateOnClickReady) { _animateOnClickContent = SGetField<int>(LocalBridgeClazz, "animateOnClick"); _animateOnClickReady = true; } return _animateOnClickContent; } }
+            private static int _animateOnClickContent = default;
+            private static bool _animateOnClickReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animation"/>
+            /// </summary>
+            public static int animation { get { if (!_animationReady) { _animationContent = SGetField<int>(LocalBridgeClazz, "animation"); _animationReady = true; } return _animationContent; } }
+            private static int _animationContent = default;
+            private static bool _animationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animationCache"/>
+            /// </summary>
+            public static int animationCache { get { if (!_animationCacheReady) { _animationCacheContent = SGetField<int>(LocalBridgeClazz, "animationCache"); _animationCacheReady = true; } return _animationCacheContent; } }
+            private static int _animationCacheContent = default;
+            private static bool _animationCacheReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animationDuration"/>
+            /// </summary>
+            public static int animationDuration { get { if (!_animationDurationReady) { _animationDurationContent = SGetField<int>(LocalBridgeClazz, "animationDuration"); _animationDurationReady = true; } return _animationDurationContent; } }
+            private static int _animationDurationContent = default;
+            private static bool _animationDurationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animationOrder"/>
+            /// </summary>
+            public static int animationOrder { get { if (!_animationOrderReady) { _animationOrderContent = SGetField<int>(LocalBridgeClazz, "animationOrder"); _animationOrderReady = true; } return _animationOrderContent; } }
+            private static int _animationOrderContent = default;
+            private static bool _animationOrderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#animationResolution"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int animationResolution { get { if (!_animationResolutionReady) { _animationResolutionContent = SGetField<int>(LocalBridgeClazz, "animationResolution"); _animationResolutionReady = true; } return _animationResolutionContent; } }
+            private static int _animationResolutionContent = default;
+            private static bool _animationResolutionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#antialias"/>
+            /// </summary>
+            public static int antialias { get { if (!_antialiasReady) { _antialiasContent = SGetField<int>(LocalBridgeClazz, "antialias"); _antialiasReady = true; } return _antialiasContent; } }
+            private static int _antialiasContent = default;
+            private static bool _antialiasReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#anyDensity"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int anyDensity { get { if (!_anyDensityReady) { _anyDensityContent = SGetField<int>(LocalBridgeClazz, "anyDensity"); _anyDensityReady = true; } return _anyDensityContent; } }
+            private static int _anyDensityContent = default;
+            private static bool _anyDensityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#apduServiceBanner"/>
+            /// </summary>
+            public static int apduServiceBanner { get { if (!_apduServiceBannerReady) { _apduServiceBannerContent = SGetField<int>(LocalBridgeClazz, "apduServiceBanner"); _apduServiceBannerReady = true; } return _apduServiceBannerContent; } }
+            private static int _apduServiceBannerContent = default;
+            private static bool _apduServiceBannerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#apiKey"/>
+            /// </summary>
+            public static int apiKey { get { if (!_apiKeyReady) { _apiKeyContent = SGetField<int>(LocalBridgeClazz, "apiKey"); _apiKeyReady = true; } return _apiKeyContent; } }
+            private static int _apiKeyContent = default;
+            private static bool _apiKeyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#appCategory"/>
+            /// </summary>
+            public static int appCategory { get { if (!_appCategoryReady) { _appCategoryContent = SGetField<int>(LocalBridgeClazz, "appCategory"); _appCategoryReady = true; } return _appCategoryContent; } }
+            private static int _appCategoryContent = default;
+            private static bool _appCategoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#appComponentFactory"/>
+            /// </summary>
+            public static int appComponentFactory { get { if (!_appComponentFactoryReady) { _appComponentFactoryContent = SGetField<int>(LocalBridgeClazz, "appComponentFactory"); _appComponentFactoryReady = true; } return _appComponentFactoryContent; } }
+            private static int _appComponentFactoryContent = default;
+            private static bool _appComponentFactoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#attributionsAreUserVisible"/>
+            /// </summary>
+            public static int attributionsAreUserVisible { get { if (!_attributionsAreUserVisibleReady) { _attributionsAreUserVisibleContent = SGetField<int>(LocalBridgeClazz, "attributionsAreUserVisible"); _attributionsAreUserVisibleReady = true; } return _attributionsAreUserVisibleContent; } }
+            private static int _attributionsAreUserVisibleContent = default;
+            private static bool _attributionsAreUserVisibleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#attributionTags"/>
+            /// </summary>
+            public static int attributionTags { get { if (!_attributionTagsReady) { _attributionTagsContent = SGetField<int>(LocalBridgeClazz, "attributionTags"); _attributionTagsReady = true; } return _attributionTagsContent; } }
+            private static int _attributionTagsContent = default;
+            private static bool _attributionTagsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#author"/>
+            /// </summary>
+            public static int author { get { if (!_authorReady) { _authorContent = SGetField<int>(LocalBridgeClazz, "author"); _authorReady = true; } return _authorContent; } }
+            private static int _authorContent = default;
+            private static bool _authorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#authorities"/>
+            /// </summary>
+            public static int authorities { get { if (!_authoritiesReady) { _authoritiesContent = SGetField<int>(LocalBridgeClazz, "authorities"); _authoritiesReady = true; } return _authoritiesContent; } }
+            private static int _authoritiesContent = default;
+            private static bool _authoritiesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoAdvanceViewId"/>
+            /// </summary>
+            public static int autoAdvanceViewId { get { if (!_autoAdvanceViewIdReady) { _autoAdvanceViewIdContent = SGetField<int>(LocalBridgeClazz, "autoAdvanceViewId"); _autoAdvanceViewIdReady = true; } return _autoAdvanceViewIdContent; } }
+            private static int _autoAdvanceViewIdContent = default;
+            private static bool _autoAdvanceViewIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoCompleteTextViewStyle"/>
+            /// </summary>
+            public static int autoCompleteTextViewStyle { get { if (!_autoCompleteTextViewStyleReady) { _autoCompleteTextViewStyleContent = SGetField<int>(LocalBridgeClazz, "autoCompleteTextViewStyle"); _autoCompleteTextViewStyleReady = true; } return _autoCompleteTextViewStyleContent; } }
+            private static int _autoCompleteTextViewStyleContent = default;
+            private static bool _autoCompleteTextViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autofilledHighlight"/>
+            /// </summary>
+            public static int autofilledHighlight { get { if (!_autofilledHighlightReady) { _autofilledHighlightContent = SGetField<int>(LocalBridgeClazz, "autofilledHighlight"); _autofilledHighlightReady = true; } return _autofilledHighlightContent; } }
+            private static int _autofilledHighlightContent = default;
+            private static bool _autofilledHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autofillHints"/>
+            /// </summary>
+            public static int autofillHints { get { if (!_autofillHintsReady) { _autofillHintsContent = SGetField<int>(LocalBridgeClazz, "autofillHints"); _autofillHintsReady = true; } return _autofillHintsContent; } }
+            private static int _autofillHintsContent = default;
+            private static bool _autofillHintsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoHandwritingEnabled"/>
+            /// </summary>
+            public static int autoHandwritingEnabled { get { if (!_autoHandwritingEnabledReady) { _autoHandwritingEnabledContent = SGetField<int>(LocalBridgeClazz, "autoHandwritingEnabled"); _autoHandwritingEnabledReady = true; } return _autoHandwritingEnabledContent; } }
+            private static int _autoHandwritingEnabledContent = default;
+            private static bool _autoHandwritingEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoLink"/>
+            /// </summary>
+            public static int autoLink { get { if (!_autoLinkReady) { _autoLinkContent = SGetField<int>(LocalBridgeClazz, "autoLink"); _autoLinkReady = true; } return _autoLinkContent; } }
+            private static int _autoLinkContent = default;
+            private static bool _autoLinkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoMirrored"/>
+            /// </summary>
+            public static int autoMirrored { get { if (!_autoMirroredReady) { _autoMirroredContent = SGetField<int>(LocalBridgeClazz, "autoMirrored"); _autoMirroredReady = true; } return _autoMirroredContent; } }
+            private static int _autoMirroredContent = default;
+            private static bool _autoMirroredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoRemoveFromRecents"/>
+            /// </summary>
+            public static int autoRemoveFromRecents { get { if (!_autoRemoveFromRecentsReady) { _autoRemoveFromRecentsContent = SGetField<int>(LocalBridgeClazz, "autoRemoveFromRecents"); _autoRemoveFromRecentsReady = true; } return _autoRemoveFromRecentsContent; } }
+            private static int _autoRemoveFromRecentsContent = default;
+            private static bool _autoRemoveFromRecentsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoRevokePermissions"/>
+            /// </summary>
+            public static int autoRevokePermissions { get { if (!_autoRevokePermissionsReady) { _autoRevokePermissionsContent = SGetField<int>(LocalBridgeClazz, "autoRevokePermissions"); _autoRevokePermissionsReady = true; } return _autoRevokePermissionsContent; } }
+            private static int _autoRevokePermissionsContent = default;
+            private static bool _autoRevokePermissionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoSizeMaxTextSize"/>
+            /// </summary>
+            public static int autoSizeMaxTextSize { get { if (!_autoSizeMaxTextSizeReady) { _autoSizeMaxTextSizeContent = SGetField<int>(LocalBridgeClazz, "autoSizeMaxTextSize"); _autoSizeMaxTextSizeReady = true; } return _autoSizeMaxTextSizeContent; } }
+            private static int _autoSizeMaxTextSizeContent = default;
+            private static bool _autoSizeMaxTextSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoSizeMinTextSize"/>
+            /// </summary>
+            public static int autoSizeMinTextSize { get { if (!_autoSizeMinTextSizeReady) { _autoSizeMinTextSizeContent = SGetField<int>(LocalBridgeClazz, "autoSizeMinTextSize"); _autoSizeMinTextSizeReady = true; } return _autoSizeMinTextSizeContent; } }
+            private static int _autoSizeMinTextSizeContent = default;
+            private static bool _autoSizeMinTextSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoSizePresetSizes"/>
+            /// </summary>
+            public static int autoSizePresetSizes { get { if (!_autoSizePresetSizesReady) { _autoSizePresetSizesContent = SGetField<int>(LocalBridgeClazz, "autoSizePresetSizes"); _autoSizePresetSizesReady = true; } return _autoSizePresetSizesContent; } }
+            private static int _autoSizePresetSizesContent = default;
+            private static bool _autoSizePresetSizesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoSizeStepGranularity"/>
+            /// </summary>
+            public static int autoSizeStepGranularity { get { if (!_autoSizeStepGranularityReady) { _autoSizeStepGranularityContent = SGetField<int>(LocalBridgeClazz, "autoSizeStepGranularity"); _autoSizeStepGranularityReady = true; } return _autoSizeStepGranularityContent; } }
+            private static int _autoSizeStepGranularityContent = default;
+            private static bool _autoSizeStepGranularityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoSizeTextType"/>
+            /// </summary>
+            public static int autoSizeTextType { get { if (!_autoSizeTextTypeReady) { _autoSizeTextTypeContent = SGetField<int>(LocalBridgeClazz, "autoSizeTextType"); _autoSizeTextTypeReady = true; } return _autoSizeTextTypeContent; } }
+            private static int _autoSizeTextTypeContent = default;
+            private static bool _autoSizeTextTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoStart"/>
+            /// </summary>
+            public static int autoStart { get { if (!_autoStartReady) { _autoStartContent = SGetField<int>(LocalBridgeClazz, "autoStart"); _autoStartReady = true; } return _autoStartContent; } }
+            private static int _autoStartContent = default;
+            private static bool _autoStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoText"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int autoText { get { if (!_autoTextReady) { _autoTextContent = SGetField<int>(LocalBridgeClazz, "autoText"); _autoTextReady = true; } return _autoTextContent; } }
+            private static int _autoTextContent = default;
+            private static bool _autoTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoUrlDetect"/>
+            /// </summary>
+            public static int autoUrlDetect { get { if (!_autoUrlDetectReady) { _autoUrlDetectContent = SGetField<int>(LocalBridgeClazz, "autoUrlDetect"); _autoUrlDetectReady = true; } return _autoUrlDetectContent; } }
+            private static int _autoUrlDetectContent = default;
+            private static bool _autoUrlDetectReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#autoVerify"/>
+            /// </summary>
+            public static int autoVerify { get { if (!_autoVerifyReady) { _autoVerifyContent = SGetField<int>(LocalBridgeClazz, "autoVerify"); _autoVerifyReady = true; } return _autoVerifyContent; } }
+            private static int _autoVerifyContent = default;
+            private static bool _autoVerifyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backdropColor"/>
+            /// </summary>
+            public static int backdropColor { get { if (!_backdropColorReady) { _backdropColorContent = SGetField<int>(LocalBridgeClazz, "backdropColor"); _backdropColorReady = true; } return _backdropColorContent; } }
+            private static int _backdropColorContent = default;
+            private static bool _backdropColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#background"/>
+            /// </summary>
+            public static int background { get { if (!_backgroundReady) { _backgroundContent = SGetField<int>(LocalBridgeClazz, "background"); _backgroundReady = true; } return _backgroundContent; } }
+            private static int _backgroundContent = default;
+            private static bool _backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backgroundDimAmount"/>
+            /// </summary>
+            public static int backgroundDimAmount { get { if (!_backgroundDimAmountReady) { _backgroundDimAmountContent = SGetField<int>(LocalBridgeClazz, "backgroundDimAmount"); _backgroundDimAmountReady = true; } return _backgroundDimAmountContent; } }
+            private static int _backgroundDimAmountContent = default;
+            private static bool _backgroundDimAmountReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backgroundDimEnabled"/>
+            /// </summary>
+            public static int backgroundDimEnabled { get { if (!_backgroundDimEnabledReady) { _backgroundDimEnabledContent = SGetField<int>(LocalBridgeClazz, "backgroundDimEnabled"); _backgroundDimEnabledReady = true; } return _backgroundDimEnabledContent; } }
+            private static int _backgroundDimEnabledContent = default;
+            private static bool _backgroundDimEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backgroundSplit"/>
+            /// </summary>
+            public static int backgroundSplit { get { if (!_backgroundSplitReady) { _backgroundSplitContent = SGetField<int>(LocalBridgeClazz, "backgroundSplit"); _backgroundSplitReady = true; } return _backgroundSplitContent; } }
+            private static int _backgroundSplitContent = default;
+            private static bool _backgroundSplitReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backgroundStacked"/>
+            /// </summary>
+            public static int backgroundStacked { get { if (!_backgroundStackedReady) { _backgroundStackedContent = SGetField<int>(LocalBridgeClazz, "backgroundStacked"); _backgroundStackedReady = true; } return _backgroundStackedContent; } }
+            private static int _backgroundStackedContent = default;
+            private static bool _backgroundStackedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backgroundTint"/>
+            /// </summary>
+            public static int backgroundTint { get { if (!_backgroundTintReady) { _backgroundTintContent = SGetField<int>(LocalBridgeClazz, "backgroundTint"); _backgroundTintReady = true; } return _backgroundTintContent; } }
+            private static int _backgroundTintContent = default;
+            private static bool _backgroundTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backgroundTintMode"/>
+            /// </summary>
+            public static int backgroundTintMode { get { if (!_backgroundTintModeReady) { _backgroundTintModeContent = SGetField<int>(LocalBridgeClazz, "backgroundTintMode"); _backgroundTintModeReady = true; } return _backgroundTintModeContent; } }
+            private static int _backgroundTintModeContent = default;
+            private static bool _backgroundTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backupAgent"/>
+            /// </summary>
+            public static int backupAgent { get { if (!_backupAgentReady) { _backupAgentContent = SGetField<int>(LocalBridgeClazz, "backupAgent"); _backupAgentReady = true; } return _backupAgentContent; } }
+            private static int _backupAgentContent = default;
+            private static bool _backupAgentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#backupInForeground"/>
+            /// </summary>
+            public static int backupInForeground { get { if (!_backupInForegroundReady) { _backupInForegroundContent = SGetField<int>(LocalBridgeClazz, "backupInForeground"); _backupInForegroundReady = true; } return _backupInForegroundContent; } }
+            private static int _backupInForegroundContent = default;
+            private static bool _backupInForegroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#banner"/>
+            /// </summary>
+            public static int banner { get { if (!_bannerReady) { _bannerContent = SGetField<int>(LocalBridgeClazz, "banner"); _bannerReady = true; } return _bannerContent; } }
+            private static int _bannerContent = default;
+            private static bool _bannerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#baseline"/>
+            /// </summary>
+            public static int baseline { get { if (!_baselineReady) { _baselineContent = SGetField<int>(LocalBridgeClazz, "baseline"); _baselineReady = true; } return _baselineContent; } }
+            private static int _baselineContent = default;
+            private static bool _baselineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#baselineAlignBottom"/>
+            /// </summary>
+            public static int baselineAlignBottom { get { if (!_baselineAlignBottomReady) { _baselineAlignBottomContent = SGetField<int>(LocalBridgeClazz, "baselineAlignBottom"); _baselineAlignBottomReady = true; } return _baselineAlignBottomContent; } }
+            private static int _baselineAlignBottomContent = default;
+            private static bool _baselineAlignBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#baselineAligned"/>
+            /// </summary>
+            public static int baselineAligned { get { if (!_baselineAlignedReady) { _baselineAlignedContent = SGetField<int>(LocalBridgeClazz, "baselineAligned"); _baselineAlignedReady = true; } return _baselineAlignedContent; } }
+            private static int _baselineAlignedContent = default;
+            private static bool _baselineAlignedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#baselineAlignedChildIndex"/>
+            /// </summary>
+            public static int baselineAlignedChildIndex { get { if (!_baselineAlignedChildIndexReady) { _baselineAlignedChildIndexContent = SGetField<int>(LocalBridgeClazz, "baselineAlignedChildIndex"); _baselineAlignedChildIndexReady = true; } return _baselineAlignedChildIndexContent; } }
+            private static int _baselineAlignedChildIndexContent = default;
+            private static bool _baselineAlignedChildIndexReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bitmap"/>
+            /// </summary>
+            public static int bitmap { get { if (!_bitmapReady) { _bitmapContent = SGetField<int>(LocalBridgeClazz, "bitmap"); _bitmapReady = true; } return _bitmapContent; } }
+            private static int _bitmapContent = default;
+            private static bool _bitmapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#borderlessButtonStyle"/>
+            /// </summary>
+            public static int borderlessButtonStyle { get { if (!_borderlessButtonStyleReady) { _borderlessButtonStyleContent = SGetField<int>(LocalBridgeClazz, "borderlessButtonStyle"); _borderlessButtonStyleReady = true; } return _borderlessButtonStyleContent; } }
+            private static int _borderlessButtonStyleContent = default;
+            private static bool _borderlessButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bottom"/>
+            /// </summary>
+            public static int bottom { get { if (!_bottomReady) { _bottomContent = SGetField<int>(LocalBridgeClazz, "bottom"); _bottomReady = true; } return _bottomContent; } }
+            private static int _bottomContent = default;
+            private static bool _bottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bottomBright"/>
+            /// </summary>
+            public static int bottomBright { get { if (!_bottomBrightReady) { _bottomBrightContent = SGetField<int>(LocalBridgeClazz, "bottomBright"); _bottomBrightReady = true; } return _bottomBrightContent; } }
+            private static int _bottomBrightContent = default;
+            private static bool _bottomBrightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bottomDark"/>
+            /// </summary>
+            public static int bottomDark { get { if (!_bottomDarkReady) { _bottomDarkContent = SGetField<int>(LocalBridgeClazz, "bottomDark"); _bottomDarkReady = true; } return _bottomDarkContent; } }
+            private static int _bottomDarkContent = default;
+            private static bool _bottomDarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bottomLeftRadius"/>
+            /// </summary>
+            public static int bottomLeftRadius { get { if (!_bottomLeftRadiusReady) { _bottomLeftRadiusContent = SGetField<int>(LocalBridgeClazz, "bottomLeftRadius"); _bottomLeftRadiusReady = true; } return _bottomLeftRadiusContent; } }
+            private static int _bottomLeftRadiusContent = default;
+            private static bool _bottomLeftRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bottomMedium"/>
+            /// </summary>
+            public static int bottomMedium { get { if (!_bottomMediumReady) { _bottomMediumContent = SGetField<int>(LocalBridgeClazz, "bottomMedium"); _bottomMediumReady = true; } return _bottomMediumContent; } }
+            private static int _bottomMediumContent = default;
+            private static bool _bottomMediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bottomOffset"/>
+            /// </summary>
+            public static int bottomOffset { get { if (!_bottomOffsetReady) { _bottomOffsetContent = SGetField<int>(LocalBridgeClazz, "bottomOffset"); _bottomOffsetReady = true; } return _bottomOffsetContent; } }
+            private static int _bottomOffsetContent = default;
+            private static bool _bottomOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bottomRightRadius"/>
+            /// </summary>
+            public static int bottomRightRadius { get { if (!_bottomRightRadiusReady) { _bottomRightRadiusContent = SGetField<int>(LocalBridgeClazz, "bottomRightRadius"); _bottomRightRadiusReady = true; } return _bottomRightRadiusContent; } }
+            private static int _bottomRightRadiusContent = default;
+            private static bool _bottomRightRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#breadCrumbShortTitle"/>
+            /// </summary>
+            public static int breadCrumbShortTitle { get { if (!_breadCrumbShortTitleReady) { _breadCrumbShortTitleContent = SGetField<int>(LocalBridgeClazz, "breadCrumbShortTitle"); _breadCrumbShortTitleReady = true; } return _breadCrumbShortTitleContent; } }
+            private static int _breadCrumbShortTitleContent = default;
+            private static bool _breadCrumbShortTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#breadCrumbTitle"/>
+            /// </summary>
+            public static int breadCrumbTitle { get { if (!_breadCrumbTitleReady) { _breadCrumbTitleContent = SGetField<int>(LocalBridgeClazz, "breadCrumbTitle"); _breadCrumbTitleReady = true; } return _breadCrumbTitleContent; } }
+            private static int _breadCrumbTitleContent = default;
+            private static bool _breadCrumbTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#breakStrategy"/>
+            /// </summary>
+            public static int breakStrategy { get { if (!_breakStrategyReady) { _breakStrategyContent = SGetField<int>(LocalBridgeClazz, "breakStrategy"); _breakStrategyReady = true; } return _breakStrategyContent; } }
+            private static int _breakStrategyContent = default;
+            private static bool _breakStrategyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#bufferType"/>
+            /// </summary>
+            public static int bufferType { get { if (!_bufferTypeReady) { _bufferTypeContent = SGetField<int>(LocalBridgeClazz, "bufferType"); _bufferTypeReady = true; } return _bufferTypeContent; } }
+            private static int _bufferTypeContent = default;
+            private static bool _bufferTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#button"/>
+            /// </summary>
+            public static int button { get { if (!_buttonReady) { _buttonContent = SGetField<int>(LocalBridgeClazz, "button"); _buttonReady = true; } return _buttonContent; } }
+            private static int _buttonContent = default;
+            private static bool _buttonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonBarButtonStyle"/>
+            /// </summary>
+            public static int buttonBarButtonStyle { get { if (!_buttonBarButtonStyleReady) { _buttonBarButtonStyleContent = SGetField<int>(LocalBridgeClazz, "buttonBarButtonStyle"); _buttonBarButtonStyleReady = true; } return _buttonBarButtonStyleContent; } }
+            private static int _buttonBarButtonStyleContent = default;
+            private static bool _buttonBarButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonBarNegativeButtonStyle"/>
+            /// </summary>
+            public static int buttonBarNegativeButtonStyle { get { if (!_buttonBarNegativeButtonStyleReady) { _buttonBarNegativeButtonStyleContent = SGetField<int>(LocalBridgeClazz, "buttonBarNegativeButtonStyle"); _buttonBarNegativeButtonStyleReady = true; } return _buttonBarNegativeButtonStyleContent; } }
+            private static int _buttonBarNegativeButtonStyleContent = default;
+            private static bool _buttonBarNegativeButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonBarNeutralButtonStyle"/>
+            /// </summary>
+            public static int buttonBarNeutralButtonStyle { get { if (!_buttonBarNeutralButtonStyleReady) { _buttonBarNeutralButtonStyleContent = SGetField<int>(LocalBridgeClazz, "buttonBarNeutralButtonStyle"); _buttonBarNeutralButtonStyleReady = true; } return _buttonBarNeutralButtonStyleContent; } }
+            private static int _buttonBarNeutralButtonStyleContent = default;
+            private static bool _buttonBarNeutralButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonBarPositiveButtonStyle"/>
+            /// </summary>
+            public static int buttonBarPositiveButtonStyle { get { if (!_buttonBarPositiveButtonStyleReady) { _buttonBarPositiveButtonStyleContent = SGetField<int>(LocalBridgeClazz, "buttonBarPositiveButtonStyle"); _buttonBarPositiveButtonStyleReady = true; } return _buttonBarPositiveButtonStyleContent; } }
+            private static int _buttonBarPositiveButtonStyleContent = default;
+            private static bool _buttonBarPositiveButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonBarStyle"/>
+            /// </summary>
+            public static int buttonBarStyle { get { if (!_buttonBarStyleReady) { _buttonBarStyleContent = SGetField<int>(LocalBridgeClazz, "buttonBarStyle"); _buttonBarStyleReady = true; } return _buttonBarStyleContent; } }
+            private static int _buttonBarStyleContent = default;
+            private static bool _buttonBarStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonCornerRadius"/>
+            /// </summary>
+            public static int buttonCornerRadius { get { if (!_buttonCornerRadiusReady) { _buttonCornerRadiusContent = SGetField<int>(LocalBridgeClazz, "buttonCornerRadius"); _buttonCornerRadiusReady = true; } return _buttonCornerRadiusContent; } }
+            private static int _buttonCornerRadiusContent = default;
+            private static bool _buttonCornerRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonGravity"/>
+            /// </summary>
+            public static int buttonGravity { get { if (!_buttonGravityReady) { _buttonGravityContent = SGetField<int>(LocalBridgeClazz, "buttonGravity"); _buttonGravityReady = true; } return _buttonGravityContent; } }
+            private static int _buttonGravityContent = default;
+            private static bool _buttonGravityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonStyle"/>
+            /// </summary>
+            public static int buttonStyle { get { if (!_buttonStyleReady) { _buttonStyleContent = SGetField<int>(LocalBridgeClazz, "buttonStyle"); _buttonStyleReady = true; } return _buttonStyleContent; } }
+            private static int _buttonStyleContent = default;
+            private static bool _buttonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonStyleInset"/>
+            /// </summary>
+            public static int buttonStyleInset { get { if (!_buttonStyleInsetReady) { _buttonStyleInsetContent = SGetField<int>(LocalBridgeClazz, "buttonStyleInset"); _buttonStyleInsetReady = true; } return _buttonStyleInsetContent; } }
+            private static int _buttonStyleInsetContent = default;
+            private static bool _buttonStyleInsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonStyleSmall"/>
+            /// </summary>
+            public static int buttonStyleSmall { get { if (!_buttonStyleSmallReady) { _buttonStyleSmallContent = SGetField<int>(LocalBridgeClazz, "buttonStyleSmall"); _buttonStyleSmallReady = true; } return _buttonStyleSmallContent; } }
+            private static int _buttonStyleSmallContent = default;
+            private static bool _buttonStyleSmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonStyleToggle"/>
+            /// </summary>
+            public static int buttonStyleToggle { get { if (!_buttonStyleToggleReady) { _buttonStyleToggleContent = SGetField<int>(LocalBridgeClazz, "buttonStyleToggle"); _buttonStyleToggleReady = true; } return _buttonStyleToggleContent; } }
+            private static int _buttonStyleToggleContent = default;
+            private static bool _buttonStyleToggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonTint"/>
+            /// </summary>
+            public static int buttonTint { get { if (!_buttonTintReady) { _buttonTintContent = SGetField<int>(LocalBridgeClazz, "buttonTint"); _buttonTintReady = true; } return _buttonTintContent; } }
+            private static int _buttonTintContent = default;
+            private static bool _buttonTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#buttonTintMode"/>
+            /// </summary>
+            public static int buttonTintMode { get { if (!_buttonTintModeReady) { _buttonTintModeContent = SGetField<int>(LocalBridgeClazz, "buttonTintMode"); _buttonTintModeReady = true; } return _buttonTintModeContent; } }
+            private static int _buttonTintModeContent = default;
+            private static bool _buttonTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#cacheColorHint"/>
+            /// </summary>
+            public static int cacheColorHint { get { if (!_cacheColorHintReady) { _cacheColorHintContent = SGetField<int>(LocalBridgeClazz, "cacheColorHint"); _cacheColorHintReady = true; } return _cacheColorHintContent; } }
+            private static int _cacheColorHintContent = default;
+            private static bool _cacheColorHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#calendarTextColor"/>
+            /// </summary>
+            public static int calendarTextColor { get { if (!_calendarTextColorReady) { _calendarTextColorContent = SGetField<int>(LocalBridgeClazz, "calendarTextColor"); _calendarTextColorReady = true; } return _calendarTextColorContent; } }
+            private static int _calendarTextColorContent = default;
+            private static bool _calendarTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#calendarViewShown"/>
+            /// </summary>
+            public static int calendarViewShown { get { if (!_calendarViewShownReady) { _calendarViewShownContent = SGetField<int>(LocalBridgeClazz, "calendarViewShown"); _calendarViewShownReady = true; } return _calendarViewShownContent; } }
+            private static int _calendarViewShownContent = default;
+            private static bool _calendarViewShownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#calendarViewStyle"/>
+            /// </summary>
+            public static int calendarViewStyle { get { if (!_calendarViewStyleReady) { _calendarViewStyleContent = SGetField<int>(LocalBridgeClazz, "calendarViewStyle"); _calendarViewStyleReady = true; } return _calendarViewStyleContent; } }
+            private static int _calendarViewStyleContent = default;
+            private static bool _calendarViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canControlMagnification"/>
+            /// </summary>
+            public static int canControlMagnification { get { if (!_canControlMagnificationReady) { _canControlMagnificationContent = SGetField<int>(LocalBridgeClazz, "canControlMagnification"); _canControlMagnificationReady = true; } return _canControlMagnificationContent; } }
+            private static int _canControlMagnificationContent = default;
+            private static bool _canControlMagnificationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#candidatesTextStyleSpans"/>
+            /// </summary>
+            public static int candidatesTextStyleSpans { get { if (!_candidatesTextStyleSpansReady) { _candidatesTextStyleSpansContent = SGetField<int>(LocalBridgeClazz, "candidatesTextStyleSpans"); _candidatesTextStyleSpansReady = true; } return _candidatesTextStyleSpansContent; } }
+            private static int _candidatesTextStyleSpansContent = default;
+            private static bool _candidatesTextStyleSpansReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canDisplayOnRemoteDevices"/>
+            /// </summary>
+            public static int canDisplayOnRemoteDevices { get { if (!_canDisplayOnRemoteDevicesReady) { _canDisplayOnRemoteDevicesContent = SGetField<int>(LocalBridgeClazz, "canDisplayOnRemoteDevices"); _canDisplayOnRemoteDevicesReady = true; } return _canDisplayOnRemoteDevicesContent; } }
+            private static int _canDisplayOnRemoteDevicesContent = default;
+            private static bool _canDisplayOnRemoteDevicesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canPauseRecording"/>
+            /// </summary>
+            public static int canPauseRecording { get { if (!_canPauseRecordingReady) { _canPauseRecordingContent = SGetField<int>(LocalBridgeClazz, "canPauseRecording"); _canPauseRecordingReady = true; } return _canPauseRecordingContent; } }
+            private static int _canPauseRecordingContent = default;
+            private static bool _canPauseRecordingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canPerformGestures"/>
+            /// </summary>
+            public static int canPerformGestures { get { if (!_canPerformGesturesReady) { _canPerformGesturesContent = SGetField<int>(LocalBridgeClazz, "canPerformGestures"); _canPerformGesturesReady = true; } return _canPerformGesturesContent; } }
+            private static int _canPerformGesturesContent = default;
+            private static bool _canPerformGesturesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canRecord"/>
+            /// </summary>
+            public static int canRecord { get { if (!_canRecordReady) { _canRecordContent = SGetField<int>(LocalBridgeClazz, "canRecord"); _canRecordReady = true; } return _canRecordContent; } }
+            private static int _canRecordContent = default;
+            private static bool _canRecordReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canRequestEnhancedWebAccessibility"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int canRequestEnhancedWebAccessibility { get { if (!_canRequestEnhancedWebAccessibilityReady) { _canRequestEnhancedWebAccessibilityContent = SGetField<int>(LocalBridgeClazz, "canRequestEnhancedWebAccessibility"); _canRequestEnhancedWebAccessibilityReady = true; } return _canRequestEnhancedWebAccessibilityContent; } }
+            private static int _canRequestEnhancedWebAccessibilityContent = default;
+            private static bool _canRequestEnhancedWebAccessibilityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canRequestFilterKeyEvents"/>
+            /// </summary>
+            public static int canRequestFilterKeyEvents { get { if (!_canRequestFilterKeyEventsReady) { _canRequestFilterKeyEventsContent = SGetField<int>(LocalBridgeClazz, "canRequestFilterKeyEvents"); _canRequestFilterKeyEventsReady = true; } return _canRequestFilterKeyEventsContent; } }
+            private static int _canRequestFilterKeyEventsContent = default;
+            private static bool _canRequestFilterKeyEventsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canRequestFingerprintGestures"/>
+            /// </summary>
+            public static int canRequestFingerprintGestures { get { if (!_canRequestFingerprintGesturesReady) { _canRequestFingerprintGesturesContent = SGetField<int>(LocalBridgeClazz, "canRequestFingerprintGestures"); _canRequestFingerprintGesturesReady = true; } return _canRequestFingerprintGesturesContent; } }
+            private static int _canRequestFingerprintGesturesContent = default;
+            private static bool _canRequestFingerprintGesturesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canRequestTouchExplorationMode"/>
+            /// </summary>
+            public static int canRequestTouchExplorationMode { get { if (!_canRequestTouchExplorationModeReady) { _canRequestTouchExplorationModeContent = SGetField<int>(LocalBridgeClazz, "canRequestTouchExplorationMode"); _canRequestTouchExplorationModeReady = true; } return _canRequestTouchExplorationModeContent; } }
+            private static int _canRequestTouchExplorationModeContent = default;
+            private static bool _canRequestTouchExplorationModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canRetrieveWindowContent"/>
+            /// </summary>
+            public static int canRetrieveWindowContent { get { if (!_canRetrieveWindowContentReady) { _canRetrieveWindowContentContent = SGetField<int>(LocalBridgeClazz, "canRetrieveWindowContent"); _canRetrieveWindowContentReady = true; } return _canRetrieveWindowContentContent; } }
+            private static int _canRetrieveWindowContentContent = default;
+            private static bool _canRetrieveWindowContentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#canTakeScreenshot"/>
+            /// </summary>
+            public static int canTakeScreenshot { get { if (!_canTakeScreenshotReady) { _canTakeScreenshotContent = SGetField<int>(LocalBridgeClazz, "canTakeScreenshot"); _canTakeScreenshotReady = true; } return _canTakeScreenshotContent; } }
+            private static int _canTakeScreenshotContent = default;
+            private static bool _canTakeScreenshotReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#cantSaveState"/>
+            /// </summary>
+            public static int cantSaveState { get { if (!_cantSaveStateReady) { _cantSaveStateContent = SGetField<int>(LocalBridgeClazz, "cantSaveState"); _cantSaveStateReady = true; } return _cantSaveStateContent; } }
+            private static int _cantSaveStateContent = default;
+            private static bool _cantSaveStateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#capability"/>
+            /// </summary>
+            public static int capability { get { if (!_capabilityReady) { _capabilityContent = SGetField<int>(LocalBridgeClazz, "capability"); _capabilityReady = true; } return _capabilityContent; } }
+            private static int _capabilityContent = default;
+            private static bool _capabilityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#capitalize"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int capitalize { get { if (!_capitalizeReady) { _capitalizeContent = SGetField<int>(LocalBridgeClazz, "capitalize"); _capitalizeReady = true; } return _capitalizeContent; } }
+            private static int _capitalizeContent = default;
+            private static bool _capitalizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#category"/>
+            /// </summary>
+            public static int category { get { if (!_categoryReady) { _categoryContent = SGetField<int>(LocalBridgeClazz, "category"); _categoryReady = true; } return _categoryContent; } }
+            private static int _categoryContent = default;
+            private static bool _categoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#centerBright"/>
+            /// </summary>
+            public static int centerBright { get { if (!_centerBrightReady) { _centerBrightContent = SGetField<int>(LocalBridgeClazz, "centerBright"); _centerBrightReady = true; } return _centerBrightContent; } }
+            private static int _centerBrightContent = default;
+            private static bool _centerBrightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#centerColor"/>
+            /// </summary>
+            public static int centerColor { get { if (!_centerColorReady) { _centerColorContent = SGetField<int>(LocalBridgeClazz, "centerColor"); _centerColorReady = true; } return _centerColorContent; } }
+            private static int _centerColorContent = default;
+            private static bool _centerColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#centerDark"/>
+            /// </summary>
+            public static int centerDark { get { if (!_centerDarkReady) { _centerDarkContent = SGetField<int>(LocalBridgeClazz, "centerDark"); _centerDarkReady = true; } return _centerDarkContent; } }
+            private static int _centerDarkContent = default;
+            private static bool _centerDarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#centerMedium"/>
+            /// </summary>
+            public static int centerMedium { get { if (!_centerMediumReady) { _centerMediumContent = SGetField<int>(LocalBridgeClazz, "centerMedium"); _centerMediumReady = true; } return _centerMediumContent; } }
+            private static int _centerMediumContent = default;
+            private static bool _centerMediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#centerX"/>
+            /// </summary>
+            public static int centerX { get { if (!_centerXReady) { _centerXContent = SGetField<int>(LocalBridgeClazz, "centerX"); _centerXReady = true; } return _centerXContent; } }
+            private static int _centerXContent = default;
+            private static bool _centerXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#centerY"/>
+            /// </summary>
+            public static int centerY { get { if (!_centerYReady) { _centerYContent = SGetField<int>(LocalBridgeClazz, "centerY"); _centerYReady = true; } return _centerYContent; } }
+            private static int _centerYContent = default;
+            private static bool _centerYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#certDigest"/>
+            /// </summary>
+            public static int certDigest { get { if (!_certDigestReady) { _certDigestContent = SGetField<int>(LocalBridgeClazz, "certDigest"); _certDigestReady = true; } return _certDigestContent; } }
+            private static int _certDigestContent = default;
+            private static bool _certDigestReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkable"/>
+            /// </summary>
+            public static int checkable { get { if (!_checkableReady) { _checkableContent = SGetField<int>(LocalBridgeClazz, "checkable"); _checkableReady = true; } return _checkableContent; } }
+            private static int _checkableContent = default;
+            private static bool _checkableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkableBehavior"/>
+            /// </summary>
+            public static int checkableBehavior { get { if (!_checkableBehaviorReady) { _checkableBehaviorContent = SGetField<int>(LocalBridgeClazz, "checkableBehavior"); _checkableBehaviorReady = true; } return _checkableBehaviorContent; } }
+            private static int _checkableBehaviorContent = default;
+            private static bool _checkableBehaviorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkBoxPreferenceStyle"/>
+            /// </summary>
+            public static int checkBoxPreferenceStyle { get { if (!_checkBoxPreferenceStyleReady) { _checkBoxPreferenceStyleContent = SGetField<int>(LocalBridgeClazz, "checkBoxPreferenceStyle"); _checkBoxPreferenceStyleReady = true; } return _checkBoxPreferenceStyleContent; } }
+            private static int _checkBoxPreferenceStyleContent = default;
+            private static bool _checkBoxPreferenceStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkboxStyle"/>
+            /// </summary>
+            public static int checkboxStyle { get { if (!_checkboxStyleReady) { _checkboxStyleContent = SGetField<int>(LocalBridgeClazz, "checkboxStyle"); _checkboxStyleReady = true; } return _checkboxStyleContent; } }
+            private static int _checkboxStyleContent = default;
+            private static bool _checkboxStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checked"/>
+            /// </summary>
+            public static int checkedField { get { if (!_checkedFieldReady) { _checkedFieldContent = SGetField<int>(LocalBridgeClazz, "checked"); _checkedFieldReady = true; } return _checkedFieldContent; } }
+            private static int _checkedFieldContent = default;
+            private static bool _checkedFieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkedButton"/>
+            /// </summary>
+            public static int checkedButton { get { if (!_checkedButtonReady) { _checkedButtonContent = SGetField<int>(LocalBridgeClazz, "checkedButton"); _checkedButtonReady = true; } return _checkedButtonContent; } }
+            private static int _checkedButtonContent = default;
+            private static bool _checkedButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkedTextViewStyle"/>
+            /// </summary>
+            public static int checkedTextViewStyle { get { if (!_checkedTextViewStyleReady) { _checkedTextViewStyleContent = SGetField<int>(LocalBridgeClazz, "checkedTextViewStyle"); _checkedTextViewStyleReady = true; } return _checkedTextViewStyleContent; } }
+            private static int _checkedTextViewStyleContent = default;
+            private static bool _checkedTextViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkMark"/>
+            /// </summary>
+            public static int checkMark { get { if (!_checkMarkReady) { _checkMarkContent = SGetField<int>(LocalBridgeClazz, "checkMark"); _checkMarkReady = true; } return _checkMarkContent; } }
+            private static int _checkMarkContent = default;
+            private static bool _checkMarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkMarkTint"/>
+            /// </summary>
+            public static int checkMarkTint { get { if (!_checkMarkTintReady) { _checkMarkTintContent = SGetField<int>(LocalBridgeClazz, "checkMarkTint"); _checkMarkTintReady = true; } return _checkMarkTintContent; } }
+            private static int _checkMarkTintContent = default;
+            private static bool _checkMarkTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#checkMarkTintMode"/>
+            /// </summary>
+            public static int checkMarkTintMode { get { if (!_checkMarkTintModeReady) { _checkMarkTintModeContent = SGetField<int>(LocalBridgeClazz, "checkMarkTintMode"); _checkMarkTintModeReady = true; } return _checkMarkTintModeContent; } }
+            private static int _checkMarkTintModeContent = default;
+            private static bool _checkMarkTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#childDivider"/>
+            /// </summary>
+            public static int childDivider { get { if (!_childDividerReady) { _childDividerContent = SGetField<int>(LocalBridgeClazz, "childDivider"); _childDividerReady = true; } return _childDividerContent; } }
+            private static int _childDividerContent = default;
+            private static bool _childDividerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#childIndicator"/>
+            /// </summary>
+            public static int childIndicator { get { if (!_childIndicatorReady) { _childIndicatorContent = SGetField<int>(LocalBridgeClazz, "childIndicator"); _childIndicatorReady = true; } return _childIndicatorContent; } }
+            private static int _childIndicatorContent = default;
+            private static bool _childIndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#childIndicatorEnd"/>
+            /// </summary>
+            public static int childIndicatorEnd { get { if (!_childIndicatorEndReady) { _childIndicatorEndContent = SGetField<int>(LocalBridgeClazz, "childIndicatorEnd"); _childIndicatorEndReady = true; } return _childIndicatorEndContent; } }
+            private static int _childIndicatorEndContent = default;
+            private static bool _childIndicatorEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#childIndicatorLeft"/>
+            /// </summary>
+            public static int childIndicatorLeft { get { if (!_childIndicatorLeftReady) { _childIndicatorLeftContent = SGetField<int>(LocalBridgeClazz, "childIndicatorLeft"); _childIndicatorLeftReady = true; } return _childIndicatorLeftContent; } }
+            private static int _childIndicatorLeftContent = default;
+            private static bool _childIndicatorLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#childIndicatorRight"/>
+            /// </summary>
+            public static int childIndicatorRight { get { if (!_childIndicatorRightReady) { _childIndicatorRightContent = SGetField<int>(LocalBridgeClazz, "childIndicatorRight"); _childIndicatorRightReady = true; } return _childIndicatorRightContent; } }
+            private static int _childIndicatorRightContent = default;
+            private static bool _childIndicatorRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#childIndicatorStart"/>
+            /// </summary>
+            public static int childIndicatorStart { get { if (!_childIndicatorStartReady) { _childIndicatorStartContent = SGetField<int>(LocalBridgeClazz, "childIndicatorStart"); _childIndicatorStartReady = true; } return _childIndicatorStartContent; } }
+            private static int _childIndicatorStartContent = default;
+            private static bool _childIndicatorStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#choiceMode"/>
+            /// </summary>
+            public static int choiceMode { get { if (!_choiceModeReady) { _choiceModeContent = SGetField<int>(LocalBridgeClazz, "choiceMode"); _choiceModeReady = true; } return _choiceModeContent; } }
+            private static int _choiceModeContent = default;
+            private static bool _choiceModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#classLoader"/>
+            /// </summary>
+            public static int classLoader { get { if (!_classLoaderReady) { _classLoaderContent = SGetField<int>(LocalBridgeClazz, "classLoader"); _classLoaderReady = true; } return _classLoaderContent; } }
+            private static int _classLoaderContent = default;
+            private static bool _classLoaderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#clearTaskOnLaunch"/>
+            /// </summary>
+            public static int clearTaskOnLaunch { get { if (!_clearTaskOnLaunchReady) { _clearTaskOnLaunchContent = SGetField<int>(LocalBridgeClazz, "clearTaskOnLaunch"); _clearTaskOnLaunchReady = true; } return _clearTaskOnLaunchContent; } }
+            private static int _clearTaskOnLaunchContent = default;
+            private static bool _clearTaskOnLaunchReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#clickable"/>
+            /// </summary>
+            public static int clickable { get { if (!_clickableReady) { _clickableContent = SGetField<int>(LocalBridgeClazz, "clickable"); _clickableReady = true; } return _clickableContent; } }
+            private static int _clickableContent = default;
+            private static bool _clickableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#clipChildren"/>
+            /// </summary>
+            public static int clipChildren { get { if (!_clipChildrenReady) { _clipChildrenContent = SGetField<int>(LocalBridgeClazz, "clipChildren"); _clipChildrenReady = true; } return _clipChildrenContent; } }
+            private static int _clipChildrenContent = default;
+            private static bool _clipChildrenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#clipOrientation"/>
+            /// </summary>
+            public static int clipOrientation { get { if (!_clipOrientationReady) { _clipOrientationContent = SGetField<int>(LocalBridgeClazz, "clipOrientation"); _clipOrientationReady = true; } return _clipOrientationContent; } }
+            private static int _clipOrientationContent = default;
+            private static bool _clipOrientationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#clipToOutline"/>
+            /// </summary>
+            public static int clipToOutline { get { if (!_clipToOutlineReady) { _clipToOutlineContent = SGetField<int>(LocalBridgeClazz, "clipToOutline"); _clipToOutlineReady = true; } return _clipToOutlineContent; } }
+            private static int _clipToOutlineContent = default;
+            private static bool _clipToOutlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#clipToPadding"/>
+            /// </summary>
+            public static int clipToPadding { get { if (!_clipToPaddingReady) { _clipToPaddingContent = SGetField<int>(LocalBridgeClazz, "clipToPadding"); _clipToPaddingReady = true; } return _clipToPaddingContent; } }
+            private static int _clipToPaddingContent = default;
+            private static bool _clipToPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#closeIcon"/>
+            /// </summary>
+            public static int closeIcon { get { if (!_closeIconReady) { _closeIconContent = SGetField<int>(LocalBridgeClazz, "closeIcon"); _closeIconReady = true; } return _closeIconContent; } }
+            private static int _closeIconContent = default;
+            private static bool _closeIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#codes"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int codes { get { if (!_codesReady) { _codesContent = SGetField<int>(LocalBridgeClazz, "codes"); _codesReady = true; } return _codesContent; } }
+            private static int _codesContent = default;
+            private static bool _codesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#collapseColumns"/>
+            /// </summary>
+            public static int collapseColumns { get { if (!_collapseColumnsReady) { _collapseColumnsContent = SGetField<int>(LocalBridgeClazz, "collapseColumns"); _collapseColumnsReady = true; } return _collapseColumnsContent; } }
+            private static int _collapseColumnsContent = default;
+            private static bool _collapseColumnsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#collapseContentDescription"/>
+            /// </summary>
+            public static int collapseContentDescription { get { if (!_collapseContentDescriptionReady) { _collapseContentDescriptionContent = SGetField<int>(LocalBridgeClazz, "collapseContentDescription"); _collapseContentDescriptionReady = true; } return _collapseContentDescriptionContent; } }
+            private static int _collapseContentDescriptionContent = default;
+            private static bool _collapseContentDescriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#collapseIcon"/>
+            /// </summary>
+            public static int collapseIcon { get { if (!_collapseIconReady) { _collapseIconContent = SGetField<int>(LocalBridgeClazz, "collapseIcon"); _collapseIconReady = true; } return _collapseIconContent; } }
+            private static int _collapseIconContent = default;
+            private static bool _collapseIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#color"/>
+            /// </summary>
+            public static int colorField { get { if (!_colorFieldReady) { _colorFieldContent = SGetField<int>(LocalBridgeClazz, "color"); _colorFieldReady = true; } return _colorFieldContent; } }
+            private static int _colorFieldContent = default;
+            private static bool _colorFieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorAccent"/>
+            /// </summary>
+            public static int colorAccent { get { if (!_colorAccentReady) { _colorAccentContent = SGetField<int>(LocalBridgeClazz, "colorAccent"); _colorAccentReady = true; } return _colorAccentContent; } }
+            private static int _colorAccentContent = default;
+            private static bool _colorAccentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorActivatedHighlight"/>
+            /// </summary>
+            public static int colorActivatedHighlight { get { if (!_colorActivatedHighlightReady) { _colorActivatedHighlightContent = SGetField<int>(LocalBridgeClazz, "colorActivatedHighlight"); _colorActivatedHighlightReady = true; } return _colorActivatedHighlightContent; } }
+            private static int _colorActivatedHighlightContent = default;
+            private static bool _colorActivatedHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorBackground"/>
+            /// </summary>
+            public static int colorBackground { get { if (!_colorBackgroundReady) { _colorBackgroundContent = SGetField<int>(LocalBridgeClazz, "colorBackground"); _colorBackgroundReady = true; } return _colorBackgroundContent; } }
+            private static int _colorBackgroundContent = default;
+            private static bool _colorBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorBackgroundCacheHint"/>
+            /// </summary>
+            public static int colorBackgroundCacheHint { get { if (!_colorBackgroundCacheHintReady) { _colorBackgroundCacheHintContent = SGetField<int>(LocalBridgeClazz, "colorBackgroundCacheHint"); _colorBackgroundCacheHintReady = true; } return _colorBackgroundCacheHintContent; } }
+            private static int _colorBackgroundCacheHintContent = default;
+            private static bool _colorBackgroundCacheHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorBackgroundFloating"/>
+            /// </summary>
+            public static int colorBackgroundFloating { get { if (!_colorBackgroundFloatingReady) { _colorBackgroundFloatingContent = SGetField<int>(LocalBridgeClazz, "colorBackgroundFloating"); _colorBackgroundFloatingReady = true; } return _colorBackgroundFloatingContent; } }
+            private static int _colorBackgroundFloatingContent = default;
+            private static bool _colorBackgroundFloatingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorButtonNormal"/>
+            /// </summary>
+            public static int colorButtonNormal { get { if (!_colorButtonNormalReady) { _colorButtonNormalContent = SGetField<int>(LocalBridgeClazz, "colorButtonNormal"); _colorButtonNormalReady = true; } return _colorButtonNormalContent; } }
+            private static int _colorButtonNormalContent = default;
+            private static bool _colorButtonNormalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorControlActivated"/>
+            /// </summary>
+            public static int colorControlActivated { get { if (!_colorControlActivatedReady) { _colorControlActivatedContent = SGetField<int>(LocalBridgeClazz, "colorControlActivated"); _colorControlActivatedReady = true; } return _colorControlActivatedContent; } }
+            private static int _colorControlActivatedContent = default;
+            private static bool _colorControlActivatedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorControlHighlight"/>
+            /// </summary>
+            public static int colorControlHighlight { get { if (!_colorControlHighlightReady) { _colorControlHighlightContent = SGetField<int>(LocalBridgeClazz, "colorControlHighlight"); _colorControlHighlightReady = true; } return _colorControlHighlightContent; } }
+            private static int _colorControlHighlightContent = default;
+            private static bool _colorControlHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorControlNormal"/>
+            /// </summary>
+            public static int colorControlNormal { get { if (!_colorControlNormalReady) { _colorControlNormalContent = SGetField<int>(LocalBridgeClazz, "colorControlNormal"); _colorControlNormalReady = true; } return _colorControlNormalContent; } }
+            private static int _colorControlNormalContent = default;
+            private static bool _colorControlNormalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorEdgeEffect"/>
+            /// </summary>
+            public static int colorEdgeEffect { get { if (!_colorEdgeEffectReady) { _colorEdgeEffectContent = SGetField<int>(LocalBridgeClazz, "colorEdgeEffect"); _colorEdgeEffectReady = true; } return _colorEdgeEffectContent; } }
+            private static int _colorEdgeEffectContent = default;
+            private static bool _colorEdgeEffectReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorError"/>
+            /// </summary>
+            public static int colorError { get { if (!_colorErrorReady) { _colorErrorContent = SGetField<int>(LocalBridgeClazz, "colorError"); _colorErrorReady = true; } return _colorErrorContent; } }
+            private static int _colorErrorContent = default;
+            private static bool _colorErrorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorFocusedHighlight"/>
+            /// </summary>
+            public static int colorFocusedHighlight { get { if (!_colorFocusedHighlightReady) { _colorFocusedHighlightContent = SGetField<int>(LocalBridgeClazz, "colorFocusedHighlight"); _colorFocusedHighlightReady = true; } return _colorFocusedHighlightContent; } }
+            private static int _colorFocusedHighlightContent = default;
+            private static bool _colorFocusedHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorForeground"/>
+            /// </summary>
+            public static int colorForeground { get { if (!_colorForegroundReady) { _colorForegroundContent = SGetField<int>(LocalBridgeClazz, "colorForeground"); _colorForegroundReady = true; } return _colorForegroundContent; } }
+            private static int _colorForegroundContent = default;
+            private static bool _colorForegroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorForegroundInverse"/>
+            /// </summary>
+            public static int colorForegroundInverse { get { if (!_colorForegroundInverseReady) { _colorForegroundInverseContent = SGetField<int>(LocalBridgeClazz, "colorForegroundInverse"); _colorForegroundInverseReady = true; } return _colorForegroundInverseContent; } }
+            private static int _colorForegroundInverseContent = default;
+            private static bool _colorForegroundInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorLongPressedHighlight"/>
+            /// </summary>
+            public static int colorLongPressedHighlight { get { if (!_colorLongPressedHighlightReady) { _colorLongPressedHighlightContent = SGetField<int>(LocalBridgeClazz, "colorLongPressedHighlight"); _colorLongPressedHighlightReady = true; } return _colorLongPressedHighlightContent; } }
+            private static int _colorLongPressedHighlightContent = default;
+            private static bool _colorLongPressedHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorMode"/>
+            /// </summary>
+            public static int colorMode { get { if (!_colorModeReady) { _colorModeContent = SGetField<int>(LocalBridgeClazz, "colorMode"); _colorModeReady = true; } return _colorModeContent; } }
+            private static int _colorModeContent = default;
+            private static bool _colorModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorMultiSelectHighlight"/>
+            /// </summary>
+            public static int colorMultiSelectHighlight { get { if (!_colorMultiSelectHighlightReady) { _colorMultiSelectHighlightContent = SGetField<int>(LocalBridgeClazz, "colorMultiSelectHighlight"); _colorMultiSelectHighlightReady = true; } return _colorMultiSelectHighlightContent; } }
+            private static int _colorMultiSelectHighlightContent = default;
+            private static bool _colorMultiSelectHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorPressedHighlight"/>
+            /// </summary>
+            public static int colorPressedHighlight { get { if (!_colorPressedHighlightReady) { _colorPressedHighlightContent = SGetField<int>(LocalBridgeClazz, "colorPressedHighlight"); _colorPressedHighlightReady = true; } return _colorPressedHighlightContent; } }
+            private static int _colorPressedHighlightContent = default;
+            private static bool _colorPressedHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorPrimary"/>
+            /// </summary>
+            public static int colorPrimary { get { if (!_colorPrimaryReady) { _colorPrimaryContent = SGetField<int>(LocalBridgeClazz, "colorPrimary"); _colorPrimaryReady = true; } return _colorPrimaryContent; } }
+            private static int _colorPrimaryContent = default;
+            private static bool _colorPrimaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorPrimaryDark"/>
+            /// </summary>
+            public static int colorPrimaryDark { get { if (!_colorPrimaryDarkReady) { _colorPrimaryDarkContent = SGetField<int>(LocalBridgeClazz, "colorPrimaryDark"); _colorPrimaryDarkReady = true; } return _colorPrimaryDarkContent; } }
+            private static int _colorPrimaryDarkContent = default;
+            private static bool _colorPrimaryDarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#colorSecondary"/>
+            /// </summary>
+            public static int colorSecondary { get { if (!_colorSecondaryReady) { _colorSecondaryContent = SGetField<int>(LocalBridgeClazz, "colorSecondary"); _colorSecondaryReady = true; } return _colorSecondaryContent; } }
+            private static int _colorSecondaryContent = default;
+            private static bool _colorSecondaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#columnCount"/>
+            /// </summary>
+            public static int columnCount { get { if (!_columnCountReady) { _columnCountContent = SGetField<int>(LocalBridgeClazz, "columnCount"); _columnCountReady = true; } return _columnCountContent; } }
+            private static int _columnCountContent = default;
+            private static bool _columnCountReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#columnDelay"/>
+            /// </summary>
+            public static int columnDelay { get { if (!_columnDelayReady) { _columnDelayContent = SGetField<int>(LocalBridgeClazz, "columnDelay"); _columnDelayReady = true; } return _columnDelayContent; } }
+            private static int _columnDelayContent = default;
+            private static bool _columnDelayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#columnOrderPreserved"/>
+            /// </summary>
+            public static int columnOrderPreserved { get { if (!_columnOrderPreservedReady) { _columnOrderPreservedContent = SGetField<int>(LocalBridgeClazz, "columnOrderPreserved"); _columnOrderPreservedReady = true; } return _columnOrderPreservedContent; } }
+            private static int _columnOrderPreservedContent = default;
+            private static bool _columnOrderPreservedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#columnWidth"/>
+            /// </summary>
+            public static int columnWidth { get { if (!_columnWidthReady) { _columnWidthContent = SGetField<int>(LocalBridgeClazz, "columnWidth"); _columnWidthReady = true; } return _columnWidthContent; } }
+            private static int _columnWidthContent = default;
+            private static bool _columnWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#commitIcon"/>
+            /// </summary>
+            public static int commitIcon { get { if (!_commitIconReady) { _commitIconContent = SGetField<int>(LocalBridgeClazz, "commitIcon"); _commitIconReady = true; } return _commitIconContent; } }
+            private static int _commitIconContent = default;
+            private static bool _commitIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#compatibleWidthLimitDp"/>
+            /// </summary>
+            public static int compatibleWidthLimitDp { get { if (!_compatibleWidthLimitDpReady) { _compatibleWidthLimitDpContent = SGetField<int>(LocalBridgeClazz, "compatibleWidthLimitDp"); _compatibleWidthLimitDpReady = true; } return _compatibleWidthLimitDpContent; } }
+            private static int _compatibleWidthLimitDpContent = default;
+            private static bool _compatibleWidthLimitDpReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#completionHint"/>
+            /// </summary>
+            public static int completionHint { get { if (!_completionHintReady) { _completionHintContent = SGetField<int>(LocalBridgeClazz, "completionHint"); _completionHintReady = true; } return _completionHintContent; } }
+            private static int _completionHintContent = default;
+            private static bool _completionHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#completionHintView"/>
+            /// </summary>
+            public static int completionHintView { get { if (!_completionHintViewReady) { _completionHintViewContent = SGetField<int>(LocalBridgeClazz, "completionHintView"); _completionHintViewReady = true; } return _completionHintViewContent; } }
+            private static int _completionHintViewContent = default;
+            private static bool _completionHintViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#completionThreshold"/>
+            /// </summary>
+            public static int completionThreshold { get { if (!_completionThresholdReady) { _completionThresholdContent = SGetField<int>(LocalBridgeClazz, "completionThreshold"); _completionThresholdReady = true; } return _completionThresholdContent; } }
+            private static int _completionThresholdContent = default;
+            private static bool _completionThresholdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#configChanges"/>
+            /// </summary>
+            public static int configChanges { get { if (!_configChangesReady) { _configChangesContent = SGetField<int>(LocalBridgeClazz, "configChanges"); _configChangesReady = true; } return _configChangesContent; } }
+            private static int _configChangesContent = default;
+            private static bool _configChangesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#configure"/>
+            /// </summary>
+            public static int configure { get { if (!_configureReady) { _configureContent = SGetField<int>(LocalBridgeClazz, "configure"); _configureReady = true; } return _configureContent; } }
+            private static int _configureContent = default;
+            private static bool _configureReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#constantSize"/>
+            /// </summary>
+            public static int constantSize { get { if (!_constantSizeReady) { _constantSizeContent = SGetField<int>(LocalBridgeClazz, "constantSize"); _constantSizeReady = true; } return _constantSizeContent; } }
+            private static int _constantSizeContent = default;
+            private static bool _constantSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#content"/>
+            /// </summary>
+            public static int content { get { if (!_contentReady) { _contentContent = SGetField<int>(LocalBridgeClazz, "content"); _contentReady = true; } return _contentContent; } }
+            private static int _contentContent = default;
+            private static bool _contentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentAgeHint"/>
+            /// </summary>
+            public static int contentAgeHint { get { if (!_contentAgeHintReady) { _contentAgeHintContent = SGetField<int>(LocalBridgeClazz, "contentAgeHint"); _contentAgeHintReady = true; } return _contentAgeHintContent; } }
+            private static int _contentAgeHintContent = default;
+            private static bool _contentAgeHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentAuthority"/>
+            /// </summary>
+            public static int contentAuthority { get { if (!_contentAuthorityReady) { _contentAuthorityContent = SGetField<int>(LocalBridgeClazz, "contentAuthority"); _contentAuthorityReady = true; } return _contentAuthorityContent; } }
+            private static int _contentAuthorityContent = default;
+            private static bool _contentAuthorityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentDescription"/>
+            /// </summary>
+            public static int contentDescription { get { if (!_contentDescriptionReady) { _contentDescriptionContent = SGetField<int>(LocalBridgeClazz, "contentDescription"); _contentDescriptionReady = true; } return _contentDescriptionContent; } }
+            private static int _contentDescriptionContent = default;
+            private static bool _contentDescriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentInsetEnd"/>
+            /// </summary>
+            public static int contentInsetEnd { get { if (!_contentInsetEndReady) { _contentInsetEndContent = SGetField<int>(LocalBridgeClazz, "contentInsetEnd"); _contentInsetEndReady = true; } return _contentInsetEndContent; } }
+            private static int _contentInsetEndContent = default;
+            private static bool _contentInsetEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentInsetEndWithActions"/>
+            /// </summary>
+            public static int contentInsetEndWithActions { get { if (!_contentInsetEndWithActionsReady) { _contentInsetEndWithActionsContent = SGetField<int>(LocalBridgeClazz, "contentInsetEndWithActions"); _contentInsetEndWithActionsReady = true; } return _contentInsetEndWithActionsContent; } }
+            private static int _contentInsetEndWithActionsContent = default;
+            private static bool _contentInsetEndWithActionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentInsetLeft"/>
+            /// </summary>
+            public static int contentInsetLeft { get { if (!_contentInsetLeftReady) { _contentInsetLeftContent = SGetField<int>(LocalBridgeClazz, "contentInsetLeft"); _contentInsetLeftReady = true; } return _contentInsetLeftContent; } }
+            private static int _contentInsetLeftContent = default;
+            private static bool _contentInsetLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentInsetRight"/>
+            /// </summary>
+            public static int contentInsetRight { get { if (!_contentInsetRightReady) { _contentInsetRightContent = SGetField<int>(LocalBridgeClazz, "contentInsetRight"); _contentInsetRightReady = true; } return _contentInsetRightContent; } }
+            private static int _contentInsetRightContent = default;
+            private static bool _contentInsetRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentInsetStart"/>
+            /// </summary>
+            public static int contentInsetStart { get { if (!_contentInsetStartReady) { _contentInsetStartContent = SGetField<int>(LocalBridgeClazz, "contentInsetStart"); _contentInsetStartReady = true; } return _contentInsetStartContent; } }
+            private static int _contentInsetStartContent = default;
+            private static bool _contentInsetStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contentInsetStartWithNavigation"/>
+            /// </summary>
+            public static int contentInsetStartWithNavigation { get { if (!_contentInsetStartWithNavigationReady) { _contentInsetStartWithNavigationContent = SGetField<int>(LocalBridgeClazz, "contentInsetStartWithNavigation"); _contentInsetStartWithNavigationReady = true; } return _contentInsetStartWithNavigationContent; } }
+            private static int _contentInsetStartWithNavigationContent = default;
+            private static bool _contentInsetStartWithNavigationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contextClickable"/>
+            /// </summary>
+            public static int contextClickable { get { if (!_contextClickableReady) { _contextClickableContent = SGetField<int>(LocalBridgeClazz, "contextClickable"); _contextClickableReady = true; } return _contextClickableContent; } }
+            private static int _contextClickableContent = default;
+            private static bool _contextClickableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contextDescription"/>
+            /// </summary>
+            public static int contextDescription { get { if (!_contextDescriptionReady) { _contextDescriptionContent = SGetField<int>(LocalBridgeClazz, "contextDescription"); _contextDescriptionReady = true; } return _contextDescriptionContent; } }
+            private static int _contextDescriptionContent = default;
+            private static bool _contextDescriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contextPopupMenuStyle"/>
+            /// </summary>
+            public static int contextPopupMenuStyle { get { if (!_contextPopupMenuStyleReady) { _contextPopupMenuStyleContent = SGetField<int>(LocalBridgeClazz, "contextPopupMenuStyle"); _contextPopupMenuStyleReady = true; } return _contextPopupMenuStyleContent; } }
+            private static int _contextPopupMenuStyleContent = default;
+            private static bool _contextPopupMenuStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#contextUri"/>
+            /// </summary>
+            public static int contextUri { get { if (!_contextUriReady) { _contextUriContent = SGetField<int>(LocalBridgeClazz, "contextUri"); _contextUriReady = true; } return _contextUriContent; } }
+            private static int _contextUriContent = default;
+            private static bool _contextUriReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#controlX1"/>
+            /// </summary>
+            public static int controlX1 { get { if (!_controlX1Ready) { _controlX1Content = SGetField<int>(LocalBridgeClazz, "controlX1"); _controlX1Ready = true; } return _controlX1Content; } }
+            private static int _controlX1Content = default;
+            private static bool _controlX1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#controlX2"/>
+            /// </summary>
+            public static int controlX2 { get { if (!_controlX2Ready) { _controlX2Content = SGetField<int>(LocalBridgeClazz, "controlX2"); _controlX2Ready = true; } return _controlX2Content; } }
+            private static int _controlX2Content = default;
+            private static bool _controlX2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#controlY1"/>
+            /// </summary>
+            public static int controlY1 { get { if (!_controlY1Ready) { _controlY1Content = SGetField<int>(LocalBridgeClazz, "controlY1"); _controlY1Ready = true; } return _controlY1Content; } }
+            private static int _controlY1Content = default;
+            private static bool _controlY1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#controlY2"/>
+            /// </summary>
+            public static int controlY2 { get { if (!_controlY2Ready) { _controlY2Content = SGetField<int>(LocalBridgeClazz, "controlY2"); _controlY2Ready = true; } return _controlY2Content; } }
+            private static int _controlY2Content = default;
+            private static bool _controlY2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#countDown"/>
+            /// </summary>
+            public static int countDown { get { if (!_countDownReady) { _countDownContent = SGetField<int>(LocalBridgeClazz, "countDown"); _countDownReady = true; } return _countDownContent; } }
+            private static int _countDownContent = default;
+            private static bool _countDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#country"/>
+            /// </summary>
+            public static int country { get { if (!_countryReady) { _countryContent = SGetField<int>(LocalBridgeClazz, "country"); _countryReady = true; } return _countryContent; } }
+            private static int _countryContent = default;
+            private static bool _countryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#cropToPadding"/>
+            /// </summary>
+            public static int cropToPadding { get { if (!_cropToPaddingReady) { _cropToPaddingContent = SGetField<int>(LocalBridgeClazz, "cropToPadding"); _cropToPaddingReady = true; } return _cropToPaddingContent; } }
+            private static int _cropToPaddingContent = default;
+            private static bool _cropToPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#crossProfile"/>
+            /// </summary>
+            public static int crossProfile { get { if (!_crossProfileReady) { _crossProfileContent = SGetField<int>(LocalBridgeClazz, "crossProfile"); _crossProfileReady = true; } return _crossProfileContent; } }
+            private static int _crossProfileContent = default;
+            private static bool _crossProfileReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#cursorVisible"/>
+            /// </summary>
+            public static int cursorVisible { get { if (!_cursorVisibleReady) { _cursorVisibleContent = SGetField<int>(LocalBridgeClazz, "cursorVisible"); _cursorVisibleReady = true; } return _cursorVisibleContent; } }
+            private static int _cursorVisibleContent = default;
+            private static bool _cursorVisibleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#customNavigationLayout"/>
+            /// </summary>
+            public static int customNavigationLayout { get { if (!_customNavigationLayoutReady) { _customNavigationLayoutContent = SGetField<int>(LocalBridgeClazz, "customNavigationLayout"); _customNavigationLayoutReady = true; } return _customNavigationLayoutContent; } }
+            private static int _customNavigationLayoutContent = default;
+            private static bool _customNavigationLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#customTokens"/>
+            /// </summary>
+            public static int customTokens { get { if (!_customTokensReady) { _customTokensContent = SGetField<int>(LocalBridgeClazz, "customTokens"); _customTokensReady = true; } return _customTokensContent; } }
+            private static int _customTokensContent = default;
+            private static bool _customTokensReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#cycles"/>
+            /// </summary>
+            public static int cycles { get { if (!_cyclesReady) { _cyclesContent = SGetField<int>(LocalBridgeClazz, "cycles"); _cyclesReady = true; } return _cyclesContent; } }
+            private static int _cyclesContent = default;
+            private static bool _cyclesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dashGap"/>
+            /// </summary>
+            public static int dashGap { get { if (!_dashGapReady) { _dashGapContent = SGetField<int>(LocalBridgeClazz, "dashGap"); _dashGapReady = true; } return _dashGapContent; } }
+            private static int _dashGapContent = default;
+            private static bool _dashGapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dashWidth"/>
+            /// </summary>
+            public static int dashWidth { get { if (!_dashWidthReady) { _dashWidthContent = SGetField<int>(LocalBridgeClazz, "dashWidth"); _dashWidthReady = true; } return _dashWidthContent; } }
+            private static int _dashWidthContent = default;
+            private static bool _dashWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#data"/>
+            /// </summary>
+            public static int data { get { if (!_dataReady) { _dataContent = SGetField<int>(LocalBridgeClazz, "data"); _dataReady = true; } return _dataContent; } }
+            private static int _dataContent = default;
+            private static bool _dataReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dataExtractionRules"/>
+            /// </summary>
+            public static int dataExtractionRules { get { if (!_dataExtractionRulesReady) { _dataExtractionRulesContent = SGetField<int>(LocalBridgeClazz, "dataExtractionRules"); _dataExtractionRulesReady = true; } return _dataExtractionRulesContent; } }
+            private static int _dataExtractionRulesContent = default;
+            private static bool _dataExtractionRulesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#datePickerDialogTheme"/>
+            /// </summary>
+            public static int datePickerDialogTheme { get { if (!_datePickerDialogThemeReady) { _datePickerDialogThemeContent = SGetField<int>(LocalBridgeClazz, "datePickerDialogTheme"); _datePickerDialogThemeReady = true; } return _datePickerDialogThemeContent; } }
+            private static int _datePickerDialogThemeContent = default;
+            private static bool _datePickerDialogThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#datePickerMode"/>
+            /// </summary>
+            public static int datePickerMode { get { if (!_datePickerModeReady) { _datePickerModeContent = SGetField<int>(LocalBridgeClazz, "datePickerMode"); _datePickerModeReady = true; } return _datePickerModeContent; } }
+            private static int _datePickerModeContent = default;
+            private static bool _datePickerModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#datePickerStyle"/>
+            /// </summary>
+            public static int datePickerStyle { get { if (!_datePickerStyleReady) { _datePickerStyleContent = SGetField<int>(LocalBridgeClazz, "datePickerStyle"); _datePickerStyleReady = true; } return _datePickerStyleContent; } }
+            private static int _datePickerStyleContent = default;
+            private static bool _datePickerStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dateTextAppearance"/>
+            /// </summary>
+            public static int dateTextAppearance { get { if (!_dateTextAppearanceReady) { _dateTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "dateTextAppearance"); _dateTextAppearanceReady = true; } return _dateTextAppearanceContent; } }
+            private static int _dateTextAppearanceContent = default;
+            private static bool _dateTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dayOfWeekBackground"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int dayOfWeekBackground { get { if (!_dayOfWeekBackgroundReady) { _dayOfWeekBackgroundContent = SGetField<int>(LocalBridgeClazz, "dayOfWeekBackground"); _dayOfWeekBackgroundReady = true; } return _dayOfWeekBackgroundContent; } }
+            private static int _dayOfWeekBackgroundContent = default;
+            private static bool _dayOfWeekBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dayOfWeekTextAppearance"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int dayOfWeekTextAppearance { get { if (!_dayOfWeekTextAppearanceReady) { _dayOfWeekTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "dayOfWeekTextAppearance"); _dayOfWeekTextAppearanceReady = true; } return _dayOfWeekTextAppearanceContent; } }
+            private static int _dayOfWeekTextAppearanceContent = default;
+            private static bool _dayOfWeekTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#debuggable"/>
+            /// </summary>
+            public static int debuggable { get { if (!_debuggableReady) { _debuggableContent = SGetField<int>(LocalBridgeClazz, "debuggable"); _debuggableReady = true; } return _debuggableContent; } }
+            private static int _debuggableContent = default;
+            private static bool _debuggableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#defaultFocusHighlightEnabled"/>
+            /// </summary>
+            public static int defaultFocusHighlightEnabled { get { if (!_defaultFocusHighlightEnabledReady) { _defaultFocusHighlightEnabledContent = SGetField<int>(LocalBridgeClazz, "defaultFocusHighlightEnabled"); _defaultFocusHighlightEnabledReady = true; } return _defaultFocusHighlightEnabledContent; } }
+            private static int _defaultFocusHighlightEnabledContent = default;
+            private static bool _defaultFocusHighlightEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#defaultHeight"/>
+            /// </summary>
+            public static int defaultHeight { get { if (!_defaultHeightReady) { _defaultHeightContent = SGetField<int>(LocalBridgeClazz, "defaultHeight"); _defaultHeightReady = true; } return _defaultHeightContent; } }
+            private static int _defaultHeightContent = default;
+            private static bool _defaultHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#defaultToDeviceProtectedStorage"/>
+            /// </summary>
+            public static int defaultToDeviceProtectedStorage { get { if (!_defaultToDeviceProtectedStorageReady) { _defaultToDeviceProtectedStorageContent = SGetField<int>(LocalBridgeClazz, "defaultToDeviceProtectedStorage"); _defaultToDeviceProtectedStorageReady = true; } return _defaultToDeviceProtectedStorageContent; } }
+            private static int _defaultToDeviceProtectedStorageContent = default;
+            private static bool _defaultToDeviceProtectedStorageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#defaultValue"/>
+            /// </summary>
+            public static int defaultValue { get { if (!_defaultValueReady) { _defaultValueContent = SGetField<int>(LocalBridgeClazz, "defaultValue"); _defaultValueReady = true; } return _defaultValueContent; } }
+            private static int _defaultValueContent = default;
+            private static bool _defaultValueReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#defaultWidth"/>
+            /// </summary>
+            public static int defaultWidth { get { if (!_defaultWidthReady) { _defaultWidthContent = SGetField<int>(LocalBridgeClazz, "defaultWidth"); _defaultWidthReady = true; } return _defaultWidthContent; } }
+            private static int _defaultWidthContent = default;
+            private static bool _defaultWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#delay"/>
+            /// </summary>
+            public static int delay { get { if (!_delayReady) { _delayContent = SGetField<int>(LocalBridgeClazz, "delay"); _delayReady = true; } return _delayContent; } }
+            private static int _delayContent = default;
+            private static bool _delayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dependency"/>
+            /// </summary>
+            public static int dependency { get { if (!_dependencyReady) { _dependencyContent = SGetField<int>(LocalBridgeClazz, "dependency"); _dependencyReady = true; } return _dependencyContent; } }
+            private static int _dependencyContent = default;
+            private static bool _dependencyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#descendantFocusability"/>
+            /// </summary>
+            public static int descendantFocusability { get { if (!_descendantFocusabilityReady) { _descendantFocusabilityContent = SGetField<int>(LocalBridgeClazz, "descendantFocusability"); _descendantFocusabilityReady = true; } return _descendantFocusabilityContent; } }
+            private static int _descendantFocusabilityContent = default;
+            private static bool _descendantFocusabilityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#description"/>
+            /// </summary>
+            public static int description { get { if (!_descriptionReady) { _descriptionContent = SGetField<int>(LocalBridgeClazz, "description"); _descriptionReady = true; } return _descriptionContent; } }
+            private static int _descriptionContent = default;
+            private static bool _descriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#detachWallpaper"/>
+            /// </summary>
+            public static int detachWallpaper { get { if (!_detachWallpaperReady) { _detachWallpaperContent = SGetField<int>(LocalBridgeClazz, "detachWallpaper"); _detachWallpaperReady = true; } return _detachWallpaperContent; } }
+            private static int _detachWallpaperContent = default;
+            private static bool _detachWallpaperReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#detailColumn"/>
+            /// </summary>
+            public static int detailColumn { get { if (!_detailColumnReady) { _detailColumnContent = SGetField<int>(LocalBridgeClazz, "detailColumn"); _detailColumnReady = true; } return _detailColumnContent; } }
+            private static int _detailColumnContent = default;
+            private static bool _detailColumnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#detailsElementBackground"/>
+            /// </summary>
+            public static int detailsElementBackground { get { if (!_detailsElementBackgroundReady) { _detailsElementBackgroundContent = SGetField<int>(LocalBridgeClazz, "detailsElementBackground"); _detailsElementBackgroundReady = true; } return _detailsElementBackgroundContent; } }
+            private static int _detailsElementBackgroundContent = default;
+            private static bool _detailsElementBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#detailSocialSummary"/>
+            /// </summary>
+            public static int detailSocialSummary { get { if (!_detailSocialSummaryReady) { _detailSocialSummaryContent = SGetField<int>(LocalBridgeClazz, "detailSocialSummary"); _detailSocialSummaryReady = true; } return _detailSocialSummaryContent; } }
+            private static int _detailSocialSummaryContent = default;
+            private static bool _detailSocialSummaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dial"/>
+            /// </summary>
+            public static int dial { get { if (!_dialReady) { _dialContent = SGetField<int>(LocalBridgeClazz, "dial"); _dialReady = true; } return _dialContent; } }
+            private static int _dialContent = default;
+            private static bool _dialReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialogCornerRadius"/>
+            /// </summary>
+            public static int dialogCornerRadius { get { if (!_dialogCornerRadiusReady) { _dialogCornerRadiusContent = SGetField<int>(LocalBridgeClazz, "dialogCornerRadius"); _dialogCornerRadiusReady = true; } return _dialogCornerRadiusContent; } }
+            private static int _dialogCornerRadiusContent = default;
+            private static bool _dialogCornerRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialogIcon"/>
+            /// </summary>
+            public static int dialogIcon { get { if (!_dialogIconReady) { _dialogIconContent = SGetField<int>(LocalBridgeClazz, "dialogIcon"); _dialogIconReady = true; } return _dialogIconContent; } }
+            private static int _dialogIconContent = default;
+            private static bool _dialogIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialogLayout"/>
+            /// </summary>
+            public static int dialogLayout { get { if (!_dialogLayoutReady) { _dialogLayoutContent = SGetField<int>(LocalBridgeClazz, "dialogLayout"); _dialogLayoutReady = true; } return _dialogLayoutContent; } }
+            private static int _dialogLayoutContent = default;
+            private static bool _dialogLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialogMessage"/>
+            /// </summary>
+            public static int dialogMessage { get { if (!_dialogMessageReady) { _dialogMessageContent = SGetField<int>(LocalBridgeClazz, "dialogMessage"); _dialogMessageReady = true; } return _dialogMessageContent; } }
+            private static int _dialogMessageContent = default;
+            private static bool _dialogMessageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialogPreferenceStyle"/>
+            /// </summary>
+            public static int dialogPreferenceStyle { get { if (!_dialogPreferenceStyleReady) { _dialogPreferenceStyleContent = SGetField<int>(LocalBridgeClazz, "dialogPreferenceStyle"); _dialogPreferenceStyleReady = true; } return _dialogPreferenceStyleContent; } }
+            private static int _dialogPreferenceStyleContent = default;
+            private static bool _dialogPreferenceStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialogPreferredPadding"/>
+            /// </summary>
+            public static int dialogPreferredPadding { get { if (!_dialogPreferredPaddingReady) { _dialogPreferredPaddingContent = SGetField<int>(LocalBridgeClazz, "dialogPreferredPadding"); _dialogPreferredPaddingReady = true; } return _dialogPreferredPaddingContent; } }
+            private static int _dialogPreferredPaddingContent = default;
+            private static bool _dialogPreferredPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialogTheme"/>
+            /// </summary>
+            public static int dialogTheme { get { if (!_dialogThemeReady) { _dialogThemeContent = SGetField<int>(LocalBridgeClazz, "dialogTheme"); _dialogThemeReady = true; } return _dialogThemeContent; } }
+            private static int _dialogThemeContent = default;
+            private static bool _dialogThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialogTitle"/>
+            /// </summary>
+            public static int dialogTitle { get { if (!_dialogTitleReady) { _dialogTitleContent = SGetField<int>(LocalBridgeClazz, "dialogTitle"); _dialogTitleReady = true; } return _dialogTitleContent; } }
+            private static int _dialogTitleContent = default;
+            private static bool _dialogTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialTint"/>
+            /// </summary>
+            public static int dialTint { get { if (!_dialTintReady) { _dialTintContent = SGetField<int>(LocalBridgeClazz, "dialTint"); _dialTintReady = true; } return _dialTintContent; } }
+            private static int _dialTintContent = default;
+            private static bool _dialTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dialTintMode"/>
+            /// </summary>
+            public static int dialTintMode { get { if (!_dialTintModeReady) { _dialTintModeContent = SGetField<int>(LocalBridgeClazz, "dialTintMode"); _dialTintModeReady = true; } return _dialTintModeContent; } }
+            private static int _dialTintModeContent = default;
+            private static bool _dialTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#digits"/>
+            /// </summary>
+            public static int digits { get { if (!_digitsReady) { _digitsContent = SGetField<int>(LocalBridgeClazz, "digits"); _digitsReady = true; } return _digitsContent; } }
+            private static int _digitsContent = default;
+            private static bool _digitsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#directBootAware"/>
+            /// </summary>
+            public static int directBootAware { get { if (!_directBootAwareReady) { _directBootAwareContent = SGetField<int>(LocalBridgeClazz, "directBootAware"); _directBootAwareReady = true; } return _directBootAwareContent; } }
+            private static int _directBootAwareContent = default;
+            private static bool _directBootAwareReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#direction"/>
+            /// </summary>
+            public static int direction { get { if (!_directionReady) { _directionContent = SGetField<int>(LocalBridgeClazz, "direction"); _directionReady = true; } return _directionContent; } }
+            private static int _directionContent = default;
+            private static bool _directionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#directionDescriptions"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int directionDescriptions { get { if (!_directionDescriptionsReady) { _directionDescriptionsContent = SGetField<int>(LocalBridgeClazz, "directionDescriptions"); _directionDescriptionsReady = true; } return _directionDescriptionsContent; } }
+            private static int _directionDescriptionsContent = default;
+            private static bool _directionDescriptionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#directionPriority"/>
+            /// </summary>
+            public static int directionPriority { get { if (!_directionPriorityReady) { _directionPriorityContent = SGetField<int>(LocalBridgeClazz, "directionPriority"); _directionPriorityReady = true; } return _directionPriorityContent; } }
+            private static int _directionPriorityContent = default;
+            private static bool _directionPriorityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#disabledAlpha"/>
+            /// </summary>
+            public static int disabledAlpha { get { if (!_disabledAlphaReady) { _disabledAlphaContent = SGetField<int>(LocalBridgeClazz, "disabledAlpha"); _disabledAlphaReady = true; } return _disabledAlphaContent; } }
+            private static int _disabledAlphaContent = default;
+            private static bool _disabledAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#disableDependentsState"/>
+            /// </summary>
+            public static int disableDependentsState { get { if (!_disableDependentsStateReady) { _disableDependentsStateContent = SGetField<int>(LocalBridgeClazz, "disableDependentsState"); _disableDependentsStateReady = true; } return _disableDependentsStateContent; } }
+            private static int _disableDependentsStateContent = default;
+            private static bool _disableDependentsStateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#displayOptions"/>
+            /// </summary>
+            public static int displayOptions { get { if (!_displayOptionsReady) { _displayOptionsContent = SGetField<int>(LocalBridgeClazz, "displayOptions"); _displayOptionsReady = true; } return _displayOptionsContent; } }
+            private static int _displayOptionsContent = default;
+            private static bool _displayOptionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dither"/>
+            /// </summary>
+            public static int dither { get { if (!_ditherReady) { _ditherContent = SGetField<int>(LocalBridgeClazz, "dither"); _ditherReady = true; } return _ditherContent; } }
+            private static int _ditherContent = default;
+            private static bool _ditherReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#divider"/>
+            /// </summary>
+            public static int divider { get { if (!_dividerReady) { _dividerContent = SGetField<int>(LocalBridgeClazz, "divider"); _dividerReady = true; } return _dividerContent; } }
+            private static int _dividerContent = default;
+            private static bool _dividerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dividerHeight"/>
+            /// </summary>
+            public static int dividerHeight { get { if (!_dividerHeightReady) { _dividerHeightContent = SGetField<int>(LocalBridgeClazz, "dividerHeight"); _dividerHeightReady = true; } return _dividerHeightContent; } }
+            private static int _dividerHeightContent = default;
+            private static bool _dividerHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dividerHorizontal"/>
+            /// </summary>
+            public static int dividerHorizontal { get { if (!_dividerHorizontalReady) { _dividerHorizontalContent = SGetField<int>(LocalBridgeClazz, "dividerHorizontal"); _dividerHorizontalReady = true; } return _dividerHorizontalContent; } }
+            private static int _dividerHorizontalContent = default;
+            private static bool _dividerHorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dividerPadding"/>
+            /// </summary>
+            public static int dividerPadding { get { if (!_dividerPaddingReady) { _dividerPaddingContent = SGetField<int>(LocalBridgeClazz, "dividerPadding"); _dividerPaddingReady = true; } return _dividerPaddingContent; } }
+            private static int _dividerPaddingContent = default;
+            private static bool _dividerPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dividerVertical"/>
+            /// </summary>
+            public static int dividerVertical { get { if (!_dividerVerticalReady) { _dividerVerticalContent = SGetField<int>(LocalBridgeClazz, "dividerVertical"); _dividerVerticalReady = true; } return _dividerVerticalContent; } }
+            private static int _dividerVerticalContent = default;
+            private static bool _dividerVerticalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#documentLaunchMode"/>
+            /// </summary>
+            public static int documentLaunchMode { get { if (!_documentLaunchModeReady) { _documentLaunchModeContent = SGetField<int>(LocalBridgeClazz, "documentLaunchMode"); _documentLaunchModeReady = true; } return _documentLaunchModeContent; } }
+            private static int _documentLaunchModeContent = default;
+            private static bool _documentLaunchModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawable"/>
+            /// </summary>
+            public static int drawableField { get { if (!_drawableFieldReady) { _drawableFieldContent = SGetField<int>(LocalBridgeClazz, "drawable"); _drawableFieldReady = true; } return _drawableFieldContent; } }
+            private static int _drawableFieldContent = default;
+            private static bool _drawableFieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawableBottom"/>
+            /// </summary>
+            public static int drawableBottom { get { if (!_drawableBottomReady) { _drawableBottomContent = SGetField<int>(LocalBridgeClazz, "drawableBottom"); _drawableBottomReady = true; } return _drawableBottomContent; } }
+            private static int _drawableBottomContent = default;
+            private static bool _drawableBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawableEnd"/>
+            /// </summary>
+            public static int drawableEnd { get { if (!_drawableEndReady) { _drawableEndContent = SGetField<int>(LocalBridgeClazz, "drawableEnd"); _drawableEndReady = true; } return _drawableEndContent; } }
+            private static int _drawableEndContent = default;
+            private static bool _drawableEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawableLeft"/>
+            /// </summary>
+            public static int drawableLeft { get { if (!_drawableLeftReady) { _drawableLeftContent = SGetField<int>(LocalBridgeClazz, "drawableLeft"); _drawableLeftReady = true; } return _drawableLeftContent; } }
+            private static int _drawableLeftContent = default;
+            private static bool _drawableLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawablePadding"/>
+            /// </summary>
+            public static int drawablePadding { get { if (!_drawablePaddingReady) { _drawablePaddingContent = SGetField<int>(LocalBridgeClazz, "drawablePadding"); _drawablePaddingReady = true; } return _drawablePaddingContent; } }
+            private static int _drawablePaddingContent = default;
+            private static bool _drawablePaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawableRight"/>
+            /// </summary>
+            public static int drawableRight { get { if (!_drawableRightReady) { _drawableRightContent = SGetField<int>(LocalBridgeClazz, "drawableRight"); _drawableRightReady = true; } return _drawableRightContent; } }
+            private static int _drawableRightContent = default;
+            private static bool _drawableRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawableStart"/>
+            /// </summary>
+            public static int drawableStart { get { if (!_drawableStartReady) { _drawableStartContent = SGetField<int>(LocalBridgeClazz, "drawableStart"); _drawableStartReady = true; } return _drawableStartContent; } }
+            private static int _drawableStartContent = default;
+            private static bool _drawableStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawableTint"/>
+            /// </summary>
+            public static int drawableTint { get { if (!_drawableTintReady) { _drawableTintContent = SGetField<int>(LocalBridgeClazz, "drawableTint"); _drawableTintReady = true; } return _drawableTintContent; } }
+            private static int _drawableTintContent = default;
+            private static bool _drawableTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawableTintMode"/>
+            /// </summary>
+            public static int drawableTintMode { get { if (!_drawableTintModeReady) { _drawableTintModeContent = SGetField<int>(LocalBridgeClazz, "drawableTintMode"); _drawableTintModeReady = true; } return _drawableTintModeContent; } }
+            private static int _drawableTintModeContent = default;
+            private static bool _drawableTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawableTop"/>
+            /// </summary>
+            public static int drawableTop { get { if (!_drawableTopReady) { _drawableTopContent = SGetField<int>(LocalBridgeClazz, "drawableTop"); _drawableTopReady = true; } return _drawableTopContent; } }
+            private static int _drawableTopContent = default;
+            private static bool _drawableTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawingCacheQuality"/>
+            /// </summary>
+            public static int drawingCacheQuality { get { if (!_drawingCacheQualityReady) { _drawingCacheQualityContent = SGetField<int>(LocalBridgeClazz, "drawingCacheQuality"); _drawingCacheQualityReady = true; } return _drawingCacheQualityContent; } }
+            private static int _drawingCacheQualityContent = default;
+            private static bool _drawingCacheQualityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#drawSelectorOnTop"/>
+            /// </summary>
+            public static int drawSelectorOnTop { get { if (!_drawSelectorOnTopReady) { _drawSelectorOnTopContent = SGetField<int>(LocalBridgeClazz, "drawSelectorOnTop"); _drawSelectorOnTopReady = true; } return _drawSelectorOnTopContent; } }
+            private static int _drawSelectorOnTopContent = default;
+            private static bool _drawSelectorOnTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownAnchor"/>
+            /// </summary>
+            public static int dropDownAnchor { get { if (!_dropDownAnchorReady) { _dropDownAnchorContent = SGetField<int>(LocalBridgeClazz, "dropDownAnchor"); _dropDownAnchorReady = true; } return _dropDownAnchorContent; } }
+            private static int _dropDownAnchorContent = default;
+            private static bool _dropDownAnchorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownHeight"/>
+            /// </summary>
+            public static int dropDownHeight { get { if (!_dropDownHeightReady) { _dropDownHeightContent = SGetField<int>(LocalBridgeClazz, "dropDownHeight"); _dropDownHeightReady = true; } return _dropDownHeightContent; } }
+            private static int _dropDownHeightContent = default;
+            private static bool _dropDownHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownHintAppearance"/>
+            /// </summary>
+            public static int dropDownHintAppearance { get { if (!_dropDownHintAppearanceReady) { _dropDownHintAppearanceContent = SGetField<int>(LocalBridgeClazz, "dropDownHintAppearance"); _dropDownHintAppearanceReady = true; } return _dropDownHintAppearanceContent; } }
+            private static int _dropDownHintAppearanceContent = default;
+            private static bool _dropDownHintAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownHorizontalOffset"/>
+            /// </summary>
+            public static int dropDownHorizontalOffset { get { if (!_dropDownHorizontalOffsetReady) { _dropDownHorizontalOffsetContent = SGetField<int>(LocalBridgeClazz, "dropDownHorizontalOffset"); _dropDownHorizontalOffsetReady = true; } return _dropDownHorizontalOffsetContent; } }
+            private static int _dropDownHorizontalOffsetContent = default;
+            private static bool _dropDownHorizontalOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownItemStyle"/>
+            /// </summary>
+            public static int dropDownItemStyle { get { if (!_dropDownItemStyleReady) { _dropDownItemStyleContent = SGetField<int>(LocalBridgeClazz, "dropDownItemStyle"); _dropDownItemStyleReady = true; } return _dropDownItemStyleContent; } }
+            private static int _dropDownItemStyleContent = default;
+            private static bool _dropDownItemStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownListViewStyle"/>
+            /// </summary>
+            public static int dropDownListViewStyle { get { if (!_dropDownListViewStyleReady) { _dropDownListViewStyleContent = SGetField<int>(LocalBridgeClazz, "dropDownListViewStyle"); _dropDownListViewStyleReady = true; } return _dropDownListViewStyleContent; } }
+            private static int _dropDownListViewStyleContent = default;
+            private static bool _dropDownListViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownSelector"/>
+            /// </summary>
+            public static int dropDownSelector { get { if (!_dropDownSelectorReady) { _dropDownSelectorContent = SGetField<int>(LocalBridgeClazz, "dropDownSelector"); _dropDownSelectorReady = true; } return _dropDownSelectorContent; } }
+            private static int _dropDownSelectorContent = default;
+            private static bool _dropDownSelectorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownSpinnerStyle"/>
+            /// </summary>
+            public static int dropDownSpinnerStyle { get { if (!_dropDownSpinnerStyleReady) { _dropDownSpinnerStyleContent = SGetField<int>(LocalBridgeClazz, "dropDownSpinnerStyle"); _dropDownSpinnerStyleReady = true; } return _dropDownSpinnerStyleContent; } }
+            private static int _dropDownSpinnerStyleContent = default;
+            private static bool _dropDownSpinnerStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownVerticalOffset"/>
+            /// </summary>
+            public static int dropDownVerticalOffset { get { if (!_dropDownVerticalOffsetReady) { _dropDownVerticalOffsetContent = SGetField<int>(LocalBridgeClazz, "dropDownVerticalOffset"); _dropDownVerticalOffsetReady = true; } return _dropDownVerticalOffsetContent; } }
+            private static int _dropDownVerticalOffsetContent = default;
+            private static bool _dropDownVerticalOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#dropDownWidth"/>
+            /// </summary>
+            public static int dropDownWidth { get { if (!_dropDownWidthReady) { _dropDownWidthContent = SGetField<int>(LocalBridgeClazz, "dropDownWidth"); _dropDownWidthReady = true; } return _dropDownWidthContent; } }
+            private static int _dropDownWidthContent = default;
+            private static bool _dropDownWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#duplicateParentState"/>
+            /// </summary>
+            public static int duplicateParentState { get { if (!_duplicateParentStateReady) { _duplicateParentStateContent = SGetField<int>(LocalBridgeClazz, "duplicateParentState"); _duplicateParentStateReady = true; } return _duplicateParentStateContent; } }
+            private static int _duplicateParentStateContent = default;
+            private static bool _duplicateParentStateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#duration"/>
+            /// </summary>
+            public static int duration { get { if (!_durationReady) { _durationContent = SGetField<int>(LocalBridgeClazz, "duration"); _durationReady = true; } return _durationContent; } }
+            private static int _durationContent = default;
+            private static bool _durationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#editable"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int editable { get { if (!_editableReady) { _editableContent = SGetField<int>(LocalBridgeClazz, "editable"); _editableReady = true; } return _editableContent; } }
+            private static int _editableContent = default;
+            private static bool _editableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#editorExtras"/>
+            /// </summary>
+            public static int editorExtras { get { if (!_editorExtrasReady) { _editorExtrasContent = SGetField<int>(LocalBridgeClazz, "editorExtras"); _editorExtrasReady = true; } return _editorExtrasContent; } }
+            private static int _editorExtrasContent = default;
+            private static bool _editorExtrasReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#editTextBackground"/>
+            /// </summary>
+            public static int editTextBackground { get { if (!_editTextBackgroundReady) { _editTextBackgroundContent = SGetField<int>(LocalBridgeClazz, "editTextBackground"); _editTextBackgroundReady = true; } return _editTextBackgroundContent; } }
+            private static int _editTextBackgroundContent = default;
+            private static bool _editTextBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#editTextColor"/>
+            /// </summary>
+            public static int editTextColor { get { if (!_editTextColorReady) { _editTextColorContent = SGetField<int>(LocalBridgeClazz, "editTextColor"); _editTextColorReady = true; } return _editTextColorContent; } }
+            private static int _editTextColorContent = default;
+            private static bool _editTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#editTextPreferenceStyle"/>
+            /// </summary>
+            public static int editTextPreferenceStyle { get { if (!_editTextPreferenceStyleReady) { _editTextPreferenceStyleContent = SGetField<int>(LocalBridgeClazz, "editTextPreferenceStyle"); _editTextPreferenceStyleReady = true; } return _editTextPreferenceStyleContent; } }
+            private static int _editTextPreferenceStyleContent = default;
+            private static bool _editTextPreferenceStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#editTextStyle"/>
+            /// </summary>
+            public static int editTextStyle { get { if (!_editTextStyleReady) { _editTextStyleContent = SGetField<int>(LocalBridgeClazz, "editTextStyle"); _editTextStyleReady = true; } return _editTextStyleContent; } }
+            private static int _editTextStyleContent = default;
+            private static bool _editTextStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#effectColor"/>
+            /// </summary>
+            public static int effectColor { get { if (!_effectColorReady) { _effectColorContent = SGetField<int>(LocalBridgeClazz, "effectColor"); _effectColorReady = true; } return _effectColorContent; } }
+            private static int _effectColorContent = default;
+            private static bool _effectColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#elegantTextHeight"/>
+            /// </summary>
+            public static int elegantTextHeight { get { if (!_elegantTextHeightReady) { _elegantTextHeightContent = SGetField<int>(LocalBridgeClazz, "elegantTextHeight"); _elegantTextHeightReady = true; } return _elegantTextHeightContent; } }
+            private static int _elegantTextHeightContent = default;
+            private static bool _elegantTextHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#elevation"/>
+            /// </summary>
+            public static int elevation { get { if (!_elevationReady) { _elevationContent = SGetField<int>(LocalBridgeClazz, "elevation"); _elevationReady = true; } return _elevationContent; } }
+            private static int _elevationContent = default;
+            private static bool _elevationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ellipsize"/>
+            /// </summary>
+            public static int ellipsize { get { if (!_ellipsizeReady) { _ellipsizeContent = SGetField<int>(LocalBridgeClazz, "ellipsize"); _ellipsizeReady = true; } return _ellipsizeContent; } }
+            private static int _ellipsizeContent = default;
+            private static bool _ellipsizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ems"/>
+            /// </summary>
+            public static int ems { get { if (!_emsReady) { _emsContent = SGetField<int>(LocalBridgeClazz, "ems"); _emsReady = true; } return _emsContent; } }
+            private static int _emsContent = default;
+            private static bool _emsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#enabled"/>
+            /// </summary>
+            public static int enabled { get { if (!_enabledReady) { _enabledContent = SGetField<int>(LocalBridgeClazz, "enabled"); _enabledReady = true; } return _enabledContent; } }
+            private static int _enabledContent = default;
+            private static bool _enabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#enableOnBackInvokedCallback"/>
+            /// </summary>
+            public static int enableOnBackInvokedCallback { get { if (!_enableOnBackInvokedCallbackReady) { _enableOnBackInvokedCallbackContent = SGetField<int>(LocalBridgeClazz, "enableOnBackInvokedCallback"); _enableOnBackInvokedCallbackReady = true; } return _enableOnBackInvokedCallbackContent; } }
+            private static int _enableOnBackInvokedCallbackContent = default;
+            private static bool _enableOnBackInvokedCallbackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#enableTextStylingShortcuts"/>
+            /// </summary>
+            public static int enableTextStylingShortcuts { get { if (!_enableTextStylingShortcutsReady) { _enableTextStylingShortcutsContent = SGetField<int>(LocalBridgeClazz, "enableTextStylingShortcuts"); _enableTextStylingShortcutsReady = true; } return _enableTextStylingShortcutsContent; } }
+            private static int _enableTextStylingShortcutsContent = default;
+            private static bool _enableTextStylingShortcutsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#enableVrMode"/>
+            /// </summary>
+            public static int enableVrMode { get { if (!_enableVrModeReady) { _enableVrModeContent = SGetField<int>(LocalBridgeClazz, "enableVrMode"); _enableVrModeReady = true; } return _enableVrModeContent; } }
+            private static int _enableVrModeContent = default;
+            private static bool _enableVrModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#end"/>
+            /// </summary>
+            public static int end { get { if (!_endReady) { _endContent = SGetField<int>(LocalBridgeClazz, "end"); _endReady = true; } return _endContent; } }
+            private static int _endContent = default;
+            private static bool _endReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#endColor"/>
+            /// </summary>
+            public static int endColor { get { if (!_endColorReady) { _endColorContent = SGetField<int>(LocalBridgeClazz, "endColor"); _endColorReady = true; } return _endColorContent; } }
+            private static int _endColorContent = default;
+            private static bool _endColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#endX"/>
+            /// </summary>
+            public static int endX { get { if (!_endXReady) { _endXContent = SGetField<int>(LocalBridgeClazz, "endX"); _endXReady = true; } return _endXContent; } }
+            private static int _endXContent = default;
+            private static bool _endXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#endY"/>
+            /// </summary>
+            public static int endY { get { if (!_endYReady) { _endYContent = SGetField<int>(LocalBridgeClazz, "endY"); _endYReady = true; } return _endYContent; } }
+            private static int _endYContent = default;
+            private static bool _endYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#endYear"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int endYear { get { if (!_endYearReady) { _endYearContent = SGetField<int>(LocalBridgeClazz, "endYear"); _endYearReady = true; } return _endYearContent; } }
+            private static int _endYearContent = default;
+            private static bool _endYearReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#enforceNavigationBarContrast"/>
+            /// </summary>
+            public static int enforceNavigationBarContrast { get { if (!_enforceNavigationBarContrastReady) { _enforceNavigationBarContrastContent = SGetField<int>(LocalBridgeClazz, "enforceNavigationBarContrast"); _enforceNavigationBarContrastReady = true; } return _enforceNavigationBarContrastContent; } }
+            private static int _enforceNavigationBarContrastContent = default;
+            private static bool _enforceNavigationBarContrastReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#enforceStatusBarContrast"/>
+            /// </summary>
+            public static int enforceStatusBarContrast { get { if (!_enforceStatusBarContrastReady) { _enforceStatusBarContrastContent = SGetField<int>(LocalBridgeClazz, "enforceStatusBarContrast"); _enforceStatusBarContrastReady = true; } return _enforceStatusBarContrastContent; } }
+            private static int _enforceStatusBarContrastContent = default;
+            private static bool _enforceStatusBarContrastReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#enterFadeDuration"/>
+            /// </summary>
+            public static int enterFadeDuration { get { if (!_enterFadeDurationReady) { _enterFadeDurationContent = SGetField<int>(LocalBridgeClazz, "enterFadeDuration"); _enterFadeDurationReady = true; } return _enterFadeDurationContent; } }
+            private static int _enterFadeDurationContent = default;
+            private static bool _enterFadeDurationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#entries"/>
+            /// </summary>
+            public static int entries { get { if (!_entriesReady) { _entriesContent = SGetField<int>(LocalBridgeClazz, "entries"); _entriesReady = true; } return _entriesContent; } }
+            private static int _entriesContent = default;
+            private static bool _entriesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#entryValues"/>
+            /// </summary>
+            public static int entryValues { get { if (!_entryValuesReady) { _entryValuesContent = SGetField<int>(LocalBridgeClazz, "entryValues"); _entryValuesReady = true; } return _entryValuesContent; } }
+            private static int _entryValuesContent = default;
+            private static bool _entryValuesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#eventsInterceptionEnabled"/>
+            /// </summary>
+            public static int eventsInterceptionEnabled { get { if (!_eventsInterceptionEnabledReady) { _eventsInterceptionEnabledContent = SGetField<int>(LocalBridgeClazz, "eventsInterceptionEnabled"); _eventsInterceptionEnabledReady = true; } return _eventsInterceptionEnabledContent; } }
+            private static int _eventsInterceptionEnabledContent = default;
+            private static bool _eventsInterceptionEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#excludeClass"/>
+            /// </summary>
+            public static int excludeClass { get { if (!_excludeClassReady) { _excludeClassContent = SGetField<int>(LocalBridgeClazz, "excludeClass"); _excludeClassReady = true; } return _excludeClassContent; } }
+            private static int _excludeClassContent = default;
+            private static bool _excludeClassReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#excludeFromRecents"/>
+            /// </summary>
+            public static int excludeFromRecents { get { if (!_excludeFromRecentsReady) { _excludeFromRecentsContent = SGetField<int>(LocalBridgeClazz, "excludeFromRecents"); _excludeFromRecentsReady = true; } return _excludeFromRecentsContent; } }
+            private static int _excludeFromRecentsContent = default;
+            private static bool _excludeFromRecentsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#excludeId"/>
+            /// </summary>
+            public static int excludeId { get { if (!_excludeIdReady) { _excludeIdContent = SGetField<int>(LocalBridgeClazz, "excludeId"); _excludeIdReady = true; } return _excludeIdContent; } }
+            private static int _excludeIdContent = default;
+            private static bool _excludeIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#excludeName"/>
+            /// </summary>
+            public static int excludeName { get { if (!_excludeNameReady) { _excludeNameContent = SGetField<int>(LocalBridgeClazz, "excludeName"); _excludeNameReady = true; } return _excludeNameContent; } }
+            private static int _excludeNameContent = default;
+            private static bool _excludeNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#exitFadeDuration"/>
+            /// </summary>
+            public static int exitFadeDuration { get { if (!_exitFadeDurationReady) { _exitFadeDurationContent = SGetField<int>(LocalBridgeClazz, "exitFadeDuration"); _exitFadeDurationReady = true; } return _exitFadeDurationContent; } }
+            private static int _exitFadeDurationContent = default;
+            private static bool _exitFadeDurationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#expandableListPreferredChildIndicatorLeft"/>
+            /// </summary>
+            public static int expandableListPreferredChildIndicatorLeft { get { if (!_expandableListPreferredChildIndicatorLeftReady) { _expandableListPreferredChildIndicatorLeftContent = SGetField<int>(LocalBridgeClazz, "expandableListPreferredChildIndicatorLeft"); _expandableListPreferredChildIndicatorLeftReady = true; } return _expandableListPreferredChildIndicatorLeftContent; } }
+            private static int _expandableListPreferredChildIndicatorLeftContent = default;
+            private static bool _expandableListPreferredChildIndicatorLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#expandableListPreferredChildIndicatorRight"/>
+            /// </summary>
+            public static int expandableListPreferredChildIndicatorRight { get { if (!_expandableListPreferredChildIndicatorRightReady) { _expandableListPreferredChildIndicatorRightContent = SGetField<int>(LocalBridgeClazz, "expandableListPreferredChildIndicatorRight"); _expandableListPreferredChildIndicatorRightReady = true; } return _expandableListPreferredChildIndicatorRightContent; } }
+            private static int _expandableListPreferredChildIndicatorRightContent = default;
+            private static bool _expandableListPreferredChildIndicatorRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#expandableListPreferredChildPaddingLeft"/>
+            /// </summary>
+            public static int expandableListPreferredChildPaddingLeft { get { if (!_expandableListPreferredChildPaddingLeftReady) { _expandableListPreferredChildPaddingLeftContent = SGetField<int>(LocalBridgeClazz, "expandableListPreferredChildPaddingLeft"); _expandableListPreferredChildPaddingLeftReady = true; } return _expandableListPreferredChildPaddingLeftContent; } }
+            private static int _expandableListPreferredChildPaddingLeftContent = default;
+            private static bool _expandableListPreferredChildPaddingLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#expandableListPreferredItemIndicatorLeft"/>
+            /// </summary>
+            public static int expandableListPreferredItemIndicatorLeft { get { if (!_expandableListPreferredItemIndicatorLeftReady) { _expandableListPreferredItemIndicatorLeftContent = SGetField<int>(LocalBridgeClazz, "expandableListPreferredItemIndicatorLeft"); _expandableListPreferredItemIndicatorLeftReady = true; } return _expandableListPreferredItemIndicatorLeftContent; } }
+            private static int _expandableListPreferredItemIndicatorLeftContent = default;
+            private static bool _expandableListPreferredItemIndicatorLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#expandableListPreferredItemIndicatorRight"/>
+            /// </summary>
+            public static int expandableListPreferredItemIndicatorRight { get { if (!_expandableListPreferredItemIndicatorRightReady) { _expandableListPreferredItemIndicatorRightContent = SGetField<int>(LocalBridgeClazz, "expandableListPreferredItemIndicatorRight"); _expandableListPreferredItemIndicatorRightReady = true; } return _expandableListPreferredItemIndicatorRightContent; } }
+            private static int _expandableListPreferredItemIndicatorRightContent = default;
+            private static bool _expandableListPreferredItemIndicatorRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#expandableListPreferredItemPaddingLeft"/>
+            /// </summary>
+            public static int expandableListPreferredItemPaddingLeft { get { if (!_expandableListPreferredItemPaddingLeftReady) { _expandableListPreferredItemPaddingLeftContent = SGetField<int>(LocalBridgeClazz, "expandableListPreferredItemPaddingLeft"); _expandableListPreferredItemPaddingLeftReady = true; } return _expandableListPreferredItemPaddingLeftContent; } }
+            private static int _expandableListPreferredItemPaddingLeftContent = default;
+            private static bool _expandableListPreferredItemPaddingLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#expandableListViewStyle"/>
+            /// </summary>
+            public static int expandableListViewStyle { get { if (!_expandableListViewStyleReady) { _expandableListViewStyleContent = SGetField<int>(LocalBridgeClazz, "expandableListViewStyle"); _expandableListViewStyleReady = true; } return _expandableListViewStyleContent; } }
+            private static int _expandableListViewStyleContent = default;
+            private static bool _expandableListViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#expandableListViewWhiteStyle"/>
+            /// </summary>
+            public static int expandableListViewWhiteStyle { get { if (!_expandableListViewWhiteStyleReady) { _expandableListViewWhiteStyleContent = SGetField<int>(LocalBridgeClazz, "expandableListViewWhiteStyle"); _expandableListViewWhiteStyleReady = true; } return _expandableListViewWhiteStyleContent; } }
+            private static int _expandableListViewWhiteStyleContent = default;
+            private static bool _expandableListViewWhiteStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#exported"/>
+            /// </summary>
+            public static int exported { get { if (!_exportedReady) { _exportedContent = SGetField<int>(LocalBridgeClazz, "exported"); _exportedReady = true; } return _exportedContent; } }
+            private static int _exportedContent = default;
+            private static bool _exportedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#externalService"/>
+            /// </summary>
+            public static int externalService { get { if (!_externalServiceReady) { _externalServiceContent = SGetField<int>(LocalBridgeClazz, "externalService"); _externalServiceReady = true; } return _externalServiceContent; } }
+            private static int _externalServiceContent = default;
+            private static bool _externalServiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#extractNativeLibs"/>
+            /// </summary>
+            public static int extractNativeLibs { get { if (!_extractNativeLibsReady) { _extractNativeLibsContent = SGetField<int>(LocalBridgeClazz, "extractNativeLibs"); _extractNativeLibsReady = true; } return _extractNativeLibsContent; } }
+            private static int _extractNativeLibsContent = default;
+            private static bool _extractNativeLibsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#extraTension"/>
+            /// </summary>
+            public static int extraTension { get { if (!_extraTensionReady) { _extraTensionContent = SGetField<int>(LocalBridgeClazz, "extraTension"); _extraTensionReady = true; } return _extraTensionContent; } }
+            private static int _extraTensionContent = default;
+            private static bool _extraTensionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#factor"/>
+            /// </summary>
+            public static int factor { get { if (!_factorReady) { _factorContent = SGetField<int>(LocalBridgeClazz, "factor"); _factorReady = true; } return _factorContent; } }
+            private static int _factorContent = default;
+            private static bool _factorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fadeDuration"/>
+            /// </summary>
+            public static int fadeDuration { get { if (!_fadeDurationReady) { _fadeDurationContent = SGetField<int>(LocalBridgeClazz, "fadeDuration"); _fadeDurationReady = true; } return _fadeDurationContent; } }
+            private static int _fadeDurationContent = default;
+            private static bool _fadeDurationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fadeEnabled"/>
+            /// </summary>
+            public static int fadeEnabled { get { if (!_fadeEnabledReady) { _fadeEnabledContent = SGetField<int>(LocalBridgeClazz, "fadeEnabled"); _fadeEnabledReady = true; } return _fadeEnabledContent; } }
+            private static int _fadeEnabledContent = default;
+            private static bool _fadeEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fadeOffset"/>
+            /// </summary>
+            public static int fadeOffset { get { if (!_fadeOffsetReady) { _fadeOffsetContent = SGetField<int>(LocalBridgeClazz, "fadeOffset"); _fadeOffsetReady = true; } return _fadeOffsetContent; } }
+            private static int _fadeOffsetContent = default;
+            private static bool _fadeOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fadeScrollbars"/>
+            /// </summary>
+            public static int fadeScrollbars { get { if (!_fadeScrollbarsReady) { _fadeScrollbarsContent = SGetField<int>(LocalBridgeClazz, "fadeScrollbars"); _fadeScrollbarsReady = true; } return _fadeScrollbarsContent; } }
+            private static int _fadeScrollbarsContent = default;
+            private static bool _fadeScrollbarsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fadingEdge"/>
+            /// </summary>
+            public static int fadingEdge { get { if (!_fadingEdgeReady) { _fadingEdgeContent = SGetField<int>(LocalBridgeClazz, "fadingEdge"); _fadingEdgeReady = true; } return _fadingEdgeContent; } }
+            private static int _fadingEdgeContent = default;
+            private static bool _fadingEdgeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fadingEdgeLength"/>
+            /// </summary>
+            public static int fadingEdgeLength { get { if (!_fadingEdgeLengthReady) { _fadingEdgeLengthContent = SGetField<int>(LocalBridgeClazz, "fadingEdgeLength"); _fadingEdgeLengthReady = true; } return _fadingEdgeLengthContent; } }
+            private static int _fadingEdgeLengthContent = default;
+            private static bool _fadingEdgeLengthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fadingMode"/>
+            /// </summary>
+            public static int fadingMode { get { if (!_fadingModeReady) { _fadingModeContent = SGetField<int>(LocalBridgeClazz, "fadingMode"); _fadingModeReady = true; } return _fadingModeContent; } }
+            private static int _fadingModeContent = default;
+            private static bool _fadingModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fallbackLineSpacing"/>
+            /// </summary>
+            public static int fallbackLineSpacing { get { if (!_fallbackLineSpacingReady) { _fallbackLineSpacingContent = SGetField<int>(LocalBridgeClazz, "fallbackLineSpacing"); _fallbackLineSpacingReady = true; } return _fallbackLineSpacingContent; } }
+            private static int _fallbackLineSpacingContent = default;
+            private static bool _fallbackLineSpacingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollAlwaysVisible"/>
+            /// </summary>
+            public static int fastScrollAlwaysVisible { get { if (!_fastScrollAlwaysVisibleReady) { _fastScrollAlwaysVisibleContent = SGetField<int>(LocalBridgeClazz, "fastScrollAlwaysVisible"); _fastScrollAlwaysVisibleReady = true; } return _fastScrollAlwaysVisibleContent; } }
+            private static int _fastScrollAlwaysVisibleContent = default;
+            private static bool _fastScrollAlwaysVisibleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollEnabled"/>
+            /// </summary>
+            public static int fastScrollEnabled { get { if (!_fastScrollEnabledReady) { _fastScrollEnabledContent = SGetField<int>(LocalBridgeClazz, "fastScrollEnabled"); _fastScrollEnabledReady = true; } return _fastScrollEnabledContent; } }
+            private static int _fastScrollEnabledContent = default;
+            private static bool _fastScrollEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollOverlayPosition"/>
+            /// </summary>
+            public static int fastScrollOverlayPosition { get { if (!_fastScrollOverlayPositionReady) { _fastScrollOverlayPositionContent = SGetField<int>(LocalBridgeClazz, "fastScrollOverlayPosition"); _fastScrollOverlayPositionReady = true; } return _fastScrollOverlayPositionContent; } }
+            private static int _fastScrollOverlayPositionContent = default;
+            private static bool _fastScrollOverlayPositionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollPreviewBackgroundLeft"/>
+            /// </summary>
+            public static int fastScrollPreviewBackgroundLeft { get { if (!_fastScrollPreviewBackgroundLeftReady) { _fastScrollPreviewBackgroundLeftContent = SGetField<int>(LocalBridgeClazz, "fastScrollPreviewBackgroundLeft"); _fastScrollPreviewBackgroundLeftReady = true; } return _fastScrollPreviewBackgroundLeftContent; } }
+            private static int _fastScrollPreviewBackgroundLeftContent = default;
+            private static bool _fastScrollPreviewBackgroundLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollPreviewBackgroundRight"/>
+            /// </summary>
+            public static int fastScrollPreviewBackgroundRight { get { if (!_fastScrollPreviewBackgroundRightReady) { _fastScrollPreviewBackgroundRightContent = SGetField<int>(LocalBridgeClazz, "fastScrollPreviewBackgroundRight"); _fastScrollPreviewBackgroundRightReady = true; } return _fastScrollPreviewBackgroundRightContent; } }
+            private static int _fastScrollPreviewBackgroundRightContent = default;
+            private static bool _fastScrollPreviewBackgroundRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollStyle"/>
+            /// </summary>
+            public static int fastScrollStyle { get { if (!_fastScrollStyleReady) { _fastScrollStyleContent = SGetField<int>(LocalBridgeClazz, "fastScrollStyle"); _fastScrollStyleReady = true; } return _fastScrollStyleContent; } }
+            private static int _fastScrollStyleContent = default;
+            private static bool _fastScrollStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollTextColor"/>
+            /// </summary>
+            public static int fastScrollTextColor { get { if (!_fastScrollTextColorReady) { _fastScrollTextColorContent = SGetField<int>(LocalBridgeClazz, "fastScrollTextColor"); _fastScrollTextColorReady = true; } return _fastScrollTextColorContent; } }
+            private static int _fastScrollTextColorContent = default;
+            private static bool _fastScrollTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollThumbDrawable"/>
+            /// </summary>
+            public static int fastScrollThumbDrawable { get { if (!_fastScrollThumbDrawableReady) { _fastScrollThumbDrawableContent = SGetField<int>(LocalBridgeClazz, "fastScrollThumbDrawable"); _fastScrollThumbDrawableReady = true; } return _fastScrollThumbDrawableContent; } }
+            private static int _fastScrollThumbDrawableContent = default;
+            private static bool _fastScrollThumbDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fastScrollTrackDrawable"/>
+            /// </summary>
+            public static int fastScrollTrackDrawable { get { if (!_fastScrollTrackDrawableReady) { _fastScrollTrackDrawableContent = SGetField<int>(LocalBridgeClazz, "fastScrollTrackDrawable"); _fastScrollTrackDrawableReady = true; } return _fastScrollTrackDrawableContent; } }
+            private static int _fastScrollTrackDrawableContent = default;
+            private static bool _fastScrollTrackDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fillAfter"/>
+            /// </summary>
+            public static int fillAfter { get { if (!_fillAfterReady) { _fillAfterContent = SGetField<int>(LocalBridgeClazz, "fillAfter"); _fillAfterReady = true; } return _fillAfterContent; } }
+            private static int _fillAfterContent = default;
+            private static bool _fillAfterReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fillAlpha"/>
+            /// </summary>
+            public static int fillAlpha { get { if (!_fillAlphaReady) { _fillAlphaContent = SGetField<int>(LocalBridgeClazz, "fillAlpha"); _fillAlphaReady = true; } return _fillAlphaContent; } }
+            private static int _fillAlphaContent = default;
+            private static bool _fillAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fillBefore"/>
+            /// </summary>
+            public static int fillBefore { get { if (!_fillBeforeReady) { _fillBeforeContent = SGetField<int>(LocalBridgeClazz, "fillBefore"); _fillBeforeReady = true; } return _fillBeforeContent; } }
+            private static int _fillBeforeContent = default;
+            private static bool _fillBeforeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fillColor"/>
+            /// </summary>
+            public static int fillColor { get { if (!_fillColorReady) { _fillColorContent = SGetField<int>(LocalBridgeClazz, "fillColor"); _fillColorReady = true; } return _fillColorContent; } }
+            private static int _fillColorContent = default;
+            private static bool _fillColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fillEnabled"/>
+            /// </summary>
+            public static int fillEnabled { get { if (!_fillEnabledReady) { _fillEnabledContent = SGetField<int>(LocalBridgeClazz, "fillEnabled"); _fillEnabledReady = true; } return _fillEnabledContent; } }
+            private static int _fillEnabledContent = default;
+            private static bool _fillEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fillType"/>
+            /// </summary>
+            public static int fillType { get { if (!_fillTypeReady) { _fillTypeContent = SGetField<int>(LocalBridgeClazz, "fillType"); _fillTypeReady = true; } return _fillTypeContent; } }
+            private static int _fillTypeContent = default;
+            private static bool _fillTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fillViewport"/>
+            /// </summary>
+            public static int fillViewport { get { if (!_fillViewportReady) { _fillViewportContent = SGetField<int>(LocalBridgeClazz, "fillViewport"); _fillViewportReady = true; } return _fillViewportContent; } }
+            private static int _fillViewportContent = default;
+            private static bool _fillViewportReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#filter"/>
+            /// </summary>
+            public static int filter { get { if (!_filterReady) { _filterContent = SGetField<int>(LocalBridgeClazz, "filter"); _filterReady = true; } return _filterContent; } }
+            private static int _filterContent = default;
+            private static bool _filterReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#filterTouchesWhenObscured"/>
+            /// </summary>
+            public static int filterTouchesWhenObscured { get { if (!_filterTouchesWhenObscuredReady) { _filterTouchesWhenObscuredContent = SGetField<int>(LocalBridgeClazz, "filterTouchesWhenObscured"); _filterTouchesWhenObscuredReady = true; } return _filterTouchesWhenObscuredContent; } }
+            private static int _filterTouchesWhenObscuredContent = default;
+            private static bool _filterTouchesWhenObscuredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fingerprintAuthDrawable"/>
+            /// </summary>
+            public static int fingerprintAuthDrawable { get { if (!_fingerprintAuthDrawableReady) { _fingerprintAuthDrawableContent = SGetField<int>(LocalBridgeClazz, "fingerprintAuthDrawable"); _fingerprintAuthDrawableReady = true; } return _fingerprintAuthDrawableContent; } }
+            private static int _fingerprintAuthDrawableContent = default;
+            private static bool _fingerprintAuthDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#finishOnCloseSystemDialogs"/>
+            /// </summary>
+            public static int finishOnCloseSystemDialogs { get { if (!_finishOnCloseSystemDialogsReady) { _finishOnCloseSystemDialogsContent = SGetField<int>(LocalBridgeClazz, "finishOnCloseSystemDialogs"); _finishOnCloseSystemDialogsReady = true; } return _finishOnCloseSystemDialogsContent; } }
+            private static int _finishOnCloseSystemDialogsContent = default;
+            private static bool _finishOnCloseSystemDialogsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#finishOnTaskLaunch"/>
+            /// </summary>
+            public static int finishOnTaskLaunch { get { if (!_finishOnTaskLaunchReady) { _finishOnTaskLaunchContent = SGetField<int>(LocalBridgeClazz, "finishOnTaskLaunch"); _finishOnTaskLaunchReady = true; } return _finishOnTaskLaunchContent; } }
+            private static int _finishOnTaskLaunchContent = default;
+            private static bool _finishOnTaskLaunchReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#firstBaselineToTopHeight"/>
+            /// </summary>
+            public static int firstBaselineToTopHeight { get { if (!_firstBaselineToTopHeightReady) { _firstBaselineToTopHeightContent = SGetField<int>(LocalBridgeClazz, "firstBaselineToTopHeight"); _firstBaselineToTopHeightReady = true; } return _firstBaselineToTopHeightContent; } }
+            private static int _firstBaselineToTopHeightContent = default;
+            private static bool _firstBaselineToTopHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#firstDayOfWeek"/>
+            /// </summary>
+            public static int firstDayOfWeek { get { if (!_firstDayOfWeekReady) { _firstDayOfWeekContent = SGetField<int>(LocalBridgeClazz, "firstDayOfWeek"); _firstDayOfWeekReady = true; } return _firstDayOfWeekContent; } }
+            private static int _firstDayOfWeekContent = default;
+            private static bool _firstDayOfWeekReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fitsSystemWindows"/>
+            /// </summary>
+            public static int fitsSystemWindows { get { if (!_fitsSystemWindowsReady) { _fitsSystemWindowsContent = SGetField<int>(LocalBridgeClazz, "fitsSystemWindows"); _fitsSystemWindowsReady = true; } return _fitsSystemWindowsContent; } }
+            private static int _fitsSystemWindowsContent = default;
+            private static bool _fitsSystemWindowsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#flipInterval"/>
+            /// </summary>
+            public static int flipInterval { get { if (!_flipIntervalReady) { _flipIntervalContent = SGetField<int>(LocalBridgeClazz, "flipInterval"); _flipIntervalReady = true; } return _flipIntervalContent; } }
+            private static int _flipIntervalContent = default;
+            private static bool _flipIntervalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#focusable"/>
+            /// </summary>
+            public static int focusable { get { if (!_focusableReady) { _focusableContent = SGetField<int>(LocalBridgeClazz, "focusable"); _focusableReady = true; } return _focusableContent; } }
+            private static int _focusableContent = default;
+            private static bool _focusableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#focusableInTouchMode"/>
+            /// </summary>
+            public static int focusableInTouchMode { get { if (!_focusableInTouchModeReady) { _focusableInTouchModeContent = SGetField<int>(LocalBridgeClazz, "focusableInTouchMode"); _focusableInTouchModeReady = true; } return _focusableInTouchModeContent; } }
+            private static int _focusableInTouchModeContent = default;
+            private static bool _focusableInTouchModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#focusedByDefault"/>
+            /// </summary>
+            public static int focusedByDefault { get { if (!_focusedByDefaultReady) { _focusedByDefaultContent = SGetField<int>(LocalBridgeClazz, "focusedByDefault"); _focusedByDefaultReady = true; } return _focusedByDefaultContent; } }
+            private static int _focusedByDefaultContent = default;
+            private static bool _focusedByDefaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#focusedMonthDateColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int focusedMonthDateColor { get { if (!_focusedMonthDateColorReady) { _focusedMonthDateColorContent = SGetField<int>(LocalBridgeClazz, "focusedMonthDateColor"); _focusedMonthDateColorReady = true; } return _focusedMonthDateColorContent; } }
+            private static int _focusedMonthDateColorContent = default;
+            private static bool _focusedMonthDateColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#focusedSearchResultHighlightColor"/>
+            /// </summary>
+            public static int focusedSearchResultHighlightColor { get { if (!_focusedSearchResultHighlightColorReady) { _focusedSearchResultHighlightColorContent = SGetField<int>(LocalBridgeClazz, "focusedSearchResultHighlightColor"); _focusedSearchResultHighlightColorReady = true; } return _focusedSearchResultHighlightColorContent; } }
+            private static int _focusedSearchResultHighlightColorContent = default;
+            private static bool _focusedSearchResultHighlightColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#font"/>
+            /// </summary>
+            public static int font { get { if (!_fontReady) { _fontContent = SGetField<int>(LocalBridgeClazz, "font"); _fontReady = true; } return _fontContent; } }
+            private static int _fontContent = default;
+            private static bool _fontReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontFamily"/>
+            /// </summary>
+            public static int fontFamily { get { if (!_fontFamilyReady) { _fontFamilyContent = SGetField<int>(LocalBridgeClazz, "fontFamily"); _fontFamilyReady = true; } return _fontFamilyContent; } }
+            private static int _fontFamilyContent = default;
+            private static bool _fontFamilyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontFeatureSettings"/>
+            /// </summary>
+            public static int fontFeatureSettings { get { if (!_fontFeatureSettingsReady) { _fontFeatureSettingsContent = SGetField<int>(LocalBridgeClazz, "fontFeatureSettings"); _fontFeatureSettingsReady = true; } return _fontFeatureSettingsContent; } }
+            private static int _fontFeatureSettingsContent = default;
+            private static bool _fontFeatureSettingsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontProviderAuthority"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int fontProviderAuthority { get { if (!_fontProviderAuthorityReady) { _fontProviderAuthorityContent = SGetField<int>(LocalBridgeClazz, "fontProviderAuthority"); _fontProviderAuthorityReady = true; } return _fontProviderAuthorityContent; } }
+            private static int _fontProviderAuthorityContent = default;
+            private static bool _fontProviderAuthorityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontProviderCerts"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int fontProviderCerts { get { if (!_fontProviderCertsReady) { _fontProviderCertsContent = SGetField<int>(LocalBridgeClazz, "fontProviderCerts"); _fontProviderCertsReady = true; } return _fontProviderCertsContent; } }
+            private static int _fontProviderCertsContent = default;
+            private static bool _fontProviderCertsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontProviderPackage"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int fontProviderPackage { get { if (!_fontProviderPackageReady) { _fontProviderPackageContent = SGetField<int>(LocalBridgeClazz, "fontProviderPackage"); _fontProviderPackageReady = true; } return _fontProviderPackageContent; } }
+            private static int _fontProviderPackageContent = default;
+            private static bool _fontProviderPackageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontProviderQuery"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int fontProviderQuery { get { if (!_fontProviderQueryReady) { _fontProviderQueryContent = SGetField<int>(LocalBridgeClazz, "fontProviderQuery"); _fontProviderQueryReady = true; } return _fontProviderQueryContent; } }
+            private static int _fontProviderQueryContent = default;
+            private static bool _fontProviderQueryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontProviderSystemFontFamily"/>
+            /// </summary>
+            public static int fontProviderSystemFontFamily { get { if (!_fontProviderSystemFontFamilyReady) { _fontProviderSystemFontFamilyContent = SGetField<int>(LocalBridgeClazz, "fontProviderSystemFontFamily"); _fontProviderSystemFontFamilyReady = true; } return _fontProviderSystemFontFamilyContent; } }
+            private static int _fontProviderSystemFontFamilyContent = default;
+            private static bool _fontProviderSystemFontFamilyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontStyle"/>
+            /// </summary>
+            public static int fontStyle { get { if (!_fontStyleReady) { _fontStyleContent = SGetField<int>(LocalBridgeClazz, "fontStyle"); _fontStyleReady = true; } return _fontStyleContent; } }
+            private static int _fontStyleContent = default;
+            private static bool _fontStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontVariationSettings"/>
+            /// </summary>
+            public static int fontVariationSettings { get { if (!_fontVariationSettingsReady) { _fontVariationSettingsContent = SGetField<int>(LocalBridgeClazz, "fontVariationSettings"); _fontVariationSettingsReady = true; } return _fontVariationSettingsContent; } }
+            private static int _fontVariationSettingsContent = default;
+            private static bool _fontVariationSettingsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fontWeight"/>
+            /// </summary>
+            public static int fontWeight { get { if (!_fontWeightReady) { _fontWeightContent = SGetField<int>(LocalBridgeClazz, "fontWeight"); _fontWeightReady = true; } return _fontWeightContent; } }
+            private static int _fontWeightContent = default;
+            private static bool _fontWeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#footerDividersEnabled"/>
+            /// </summary>
+            public static int footerDividersEnabled { get { if (!_footerDividersEnabledReady) { _footerDividersEnabledContent = SGetField<int>(LocalBridgeClazz, "footerDividersEnabled"); _footerDividersEnabledReady = true; } return _footerDividersEnabledContent; } }
+            private static int _footerDividersEnabledContent = default;
+            private static bool _footerDividersEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#forceDarkAllowed"/>
+            /// </summary>
+            public static int forceDarkAllowed { get { if (!_forceDarkAllowedReady) { _forceDarkAllowedContent = SGetField<int>(LocalBridgeClazz, "forceDarkAllowed"); _forceDarkAllowedReady = true; } return _forceDarkAllowedContent; } }
+            private static int _forceDarkAllowedContent = default;
+            private static bool _forceDarkAllowedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#forceHasOverlappingRendering"/>
+            /// </summary>
+            public static int forceHasOverlappingRendering { get { if (!_forceHasOverlappingRenderingReady) { _forceHasOverlappingRenderingContent = SGetField<int>(LocalBridgeClazz, "forceHasOverlappingRendering"); _forceHasOverlappingRenderingReady = true; } return _forceHasOverlappingRenderingContent; } }
+            private static int _forceHasOverlappingRenderingContent = default;
+            private static bool _forceHasOverlappingRenderingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#forceQueryable"/>
+            /// </summary>
+            public static int forceQueryable { get { if (!_forceQueryableReady) { _forceQueryableContent = SGetField<int>(LocalBridgeClazz, "forceQueryable"); _forceQueryableReady = true; } return _forceQueryableContent; } }
+            private static int _forceQueryableContent = default;
+            private static bool _forceQueryableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#forceUriPermissions"/>
+            /// </summary>
+            public static int forceUriPermissions { get { if (!_forceUriPermissionsReady) { _forceUriPermissionsContent = SGetField<int>(LocalBridgeClazz, "forceUriPermissions"); _forceUriPermissionsReady = true; } return _forceUriPermissionsContent; } }
+            private static int _forceUriPermissionsContent = default;
+            private static bool _forceUriPermissionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#foreground"/>
+            /// </summary>
+            public static int foreground { get { if (!_foregroundReady) { _foregroundContent = SGetField<int>(LocalBridgeClazz, "foreground"); _foregroundReady = true; } return _foregroundContent; } }
+            private static int _foregroundContent = default;
+            private static bool _foregroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#foregroundGravity"/>
+            /// </summary>
+            public static int foregroundGravity { get { if (!_foregroundGravityReady) { _foregroundGravityContent = SGetField<int>(LocalBridgeClazz, "foregroundGravity"); _foregroundGravityReady = true; } return _foregroundGravityContent; } }
+            private static int _foregroundGravityContent = default;
+            private static bool _foregroundGravityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#foregroundServiceType"/>
+            /// </summary>
+            public static int foregroundServiceType { get { if (!_foregroundServiceTypeReady) { _foregroundServiceTypeContent = SGetField<int>(LocalBridgeClazz, "foregroundServiceType"); _foregroundServiceTypeReady = true; } return _foregroundServiceTypeContent; } }
+            private static int _foregroundServiceTypeContent = default;
+            private static bool _foregroundServiceTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#foregroundTint"/>
+            /// </summary>
+            public static int foregroundTint { get { if (!_foregroundTintReady) { _foregroundTintContent = SGetField<int>(LocalBridgeClazz, "foregroundTint"); _foregroundTintReady = true; } return _foregroundTintContent; } }
+            private static int _foregroundTintContent = default;
+            private static bool _foregroundTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#foregroundTintMode"/>
+            /// </summary>
+            public static int foregroundTintMode { get { if (!_foregroundTintModeReady) { _foregroundTintModeContent = SGetField<int>(LocalBridgeClazz, "foregroundTintMode"); _foregroundTintModeReady = true; } return _foregroundTintModeContent; } }
+            private static int _foregroundTintModeContent = default;
+            private static bool _foregroundTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#format"/>
+            /// </summary>
+            public static int format { get { if (!_formatReady) { _formatContent = SGetField<int>(LocalBridgeClazz, "format"); _formatReady = true; } return _formatContent; } }
+            private static int _formatContent = default;
+            private static bool _formatReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#format12Hour"/>
+            /// </summary>
+            public static int format12Hour { get { if (!_format12HourReady) { _format12HourContent = SGetField<int>(LocalBridgeClazz, "format12Hour"); _format12HourReady = true; } return _format12HourContent; } }
+            private static int _format12HourContent = default;
+            private static bool _format12HourReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#format24Hour"/>
+            /// </summary>
+            public static int format24Hour { get { if (!_format24HourReady) { _format24HourContent = SGetField<int>(LocalBridgeClazz, "format24Hour"); _format24HourReady = true; } return _format24HourContent; } }
+            private static int _format24HourContent = default;
+            private static bool _format24HourReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fraction"/>
+            /// </summary>
+            public static int fractionField { get { if (!_fractionFieldReady) { _fractionFieldContent = SGetField<int>(LocalBridgeClazz, "fraction"); _fractionFieldReady = true; } return _fractionFieldContent; } }
+            private static int _fractionFieldContent = default;
+            private static bool _fractionFieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragment"/>
+            /// </summary>
+            public static int fragment { get { if (!_fragmentReady) { _fragmentContent = SGetField<int>(LocalBridgeClazz, "fragment"); _fragmentReady = true; } return _fragmentContent; } }
+            private static int _fragmentContent = default;
+            private static bool _fragmentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentAllowEnterTransitionOverlap"/>
+            /// </summary>
+            public static int fragmentAllowEnterTransitionOverlap { get { if (!_fragmentAllowEnterTransitionOverlapReady) { _fragmentAllowEnterTransitionOverlapContent = SGetField<int>(LocalBridgeClazz, "fragmentAllowEnterTransitionOverlap"); _fragmentAllowEnterTransitionOverlapReady = true; } return _fragmentAllowEnterTransitionOverlapContent; } }
+            private static int _fragmentAllowEnterTransitionOverlapContent = default;
+            private static bool _fragmentAllowEnterTransitionOverlapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentAllowReturnTransitionOverlap"/>
+            /// </summary>
+            public static int fragmentAllowReturnTransitionOverlap { get { if (!_fragmentAllowReturnTransitionOverlapReady) { _fragmentAllowReturnTransitionOverlapContent = SGetField<int>(LocalBridgeClazz, "fragmentAllowReturnTransitionOverlap"); _fragmentAllowReturnTransitionOverlapReady = true; } return _fragmentAllowReturnTransitionOverlapContent; } }
+            private static int _fragmentAllowReturnTransitionOverlapContent = default;
+            private static bool _fragmentAllowReturnTransitionOverlapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentCloseEnterAnimation"/>
+            /// </summary>
+            public static int fragmentCloseEnterAnimation { get { if (!_fragmentCloseEnterAnimationReady) { _fragmentCloseEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "fragmentCloseEnterAnimation"); _fragmentCloseEnterAnimationReady = true; } return _fragmentCloseEnterAnimationContent; } }
+            private static int _fragmentCloseEnterAnimationContent = default;
+            private static bool _fragmentCloseEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentCloseExitAnimation"/>
+            /// </summary>
+            public static int fragmentCloseExitAnimation { get { if (!_fragmentCloseExitAnimationReady) { _fragmentCloseExitAnimationContent = SGetField<int>(LocalBridgeClazz, "fragmentCloseExitAnimation"); _fragmentCloseExitAnimationReady = true; } return _fragmentCloseExitAnimationContent; } }
+            private static int _fragmentCloseExitAnimationContent = default;
+            private static bool _fragmentCloseExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentEnterTransition"/>
+            /// </summary>
+            public static int fragmentEnterTransition { get { if (!_fragmentEnterTransitionReady) { _fragmentEnterTransitionContent = SGetField<int>(LocalBridgeClazz, "fragmentEnterTransition"); _fragmentEnterTransitionReady = true; } return _fragmentEnterTransitionContent; } }
+            private static int _fragmentEnterTransitionContent = default;
+            private static bool _fragmentEnterTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentExitTransition"/>
+            /// </summary>
+            public static int fragmentExitTransition { get { if (!_fragmentExitTransitionReady) { _fragmentExitTransitionContent = SGetField<int>(LocalBridgeClazz, "fragmentExitTransition"); _fragmentExitTransitionReady = true; } return _fragmentExitTransitionContent; } }
+            private static int _fragmentExitTransitionContent = default;
+            private static bool _fragmentExitTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentFadeEnterAnimation"/>
+            /// </summary>
+            public static int fragmentFadeEnterAnimation { get { if (!_fragmentFadeEnterAnimationReady) { _fragmentFadeEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "fragmentFadeEnterAnimation"); _fragmentFadeEnterAnimationReady = true; } return _fragmentFadeEnterAnimationContent; } }
+            private static int _fragmentFadeEnterAnimationContent = default;
+            private static bool _fragmentFadeEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentFadeExitAnimation"/>
+            /// </summary>
+            public static int fragmentFadeExitAnimation { get { if (!_fragmentFadeExitAnimationReady) { _fragmentFadeExitAnimationContent = SGetField<int>(LocalBridgeClazz, "fragmentFadeExitAnimation"); _fragmentFadeExitAnimationReady = true; } return _fragmentFadeExitAnimationContent; } }
+            private static int _fragmentFadeExitAnimationContent = default;
+            private static bool _fragmentFadeExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentOpenEnterAnimation"/>
+            /// </summary>
+            public static int fragmentOpenEnterAnimation { get { if (!_fragmentOpenEnterAnimationReady) { _fragmentOpenEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "fragmentOpenEnterAnimation"); _fragmentOpenEnterAnimationReady = true; } return _fragmentOpenEnterAnimationContent; } }
+            private static int _fragmentOpenEnterAnimationContent = default;
+            private static bool _fragmentOpenEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentOpenExitAnimation"/>
+            /// </summary>
+            public static int fragmentOpenExitAnimation { get { if (!_fragmentOpenExitAnimationReady) { _fragmentOpenExitAnimationContent = SGetField<int>(LocalBridgeClazz, "fragmentOpenExitAnimation"); _fragmentOpenExitAnimationReady = true; } return _fragmentOpenExitAnimationContent; } }
+            private static int _fragmentOpenExitAnimationContent = default;
+            private static bool _fragmentOpenExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentReenterTransition"/>
+            /// </summary>
+            public static int fragmentReenterTransition { get { if (!_fragmentReenterTransitionReady) { _fragmentReenterTransitionContent = SGetField<int>(LocalBridgeClazz, "fragmentReenterTransition"); _fragmentReenterTransitionReady = true; } return _fragmentReenterTransitionContent; } }
+            private static int _fragmentReenterTransitionContent = default;
+            private static bool _fragmentReenterTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentReturnTransition"/>
+            /// </summary>
+            public static int fragmentReturnTransition { get { if (!_fragmentReturnTransitionReady) { _fragmentReturnTransitionContent = SGetField<int>(LocalBridgeClazz, "fragmentReturnTransition"); _fragmentReturnTransitionReady = true; } return _fragmentReturnTransitionContent; } }
+            private static int _fragmentReturnTransitionContent = default;
+            private static bool _fragmentReturnTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentSharedElementEnterTransition"/>
+            /// </summary>
+            public static int fragmentSharedElementEnterTransition { get { if (!_fragmentSharedElementEnterTransitionReady) { _fragmentSharedElementEnterTransitionContent = SGetField<int>(LocalBridgeClazz, "fragmentSharedElementEnterTransition"); _fragmentSharedElementEnterTransitionReady = true; } return _fragmentSharedElementEnterTransitionContent; } }
+            private static int _fragmentSharedElementEnterTransitionContent = default;
+            private static bool _fragmentSharedElementEnterTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fragmentSharedElementReturnTransition"/>
+            /// </summary>
+            public static int fragmentSharedElementReturnTransition { get { if (!_fragmentSharedElementReturnTransitionReady) { _fragmentSharedElementReturnTransitionContent = SGetField<int>(LocalBridgeClazz, "fragmentSharedElementReturnTransition"); _fragmentSharedElementReturnTransitionReady = true; } return _fragmentSharedElementReturnTransitionContent; } }
+            private static int _fragmentSharedElementReturnTransitionContent = default;
+            private static bool _fragmentSharedElementReturnTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#freezesText"/>
+            /// </summary>
+            public static int freezesText { get { if (!_freezesTextReady) { _freezesTextContent = SGetField<int>(LocalBridgeClazz, "freezesText"); _freezesTextReady = true; } return _freezesTextContent; } }
+            private static int _freezesTextContent = default;
+            private static bool _freezesTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromAlpha"/>
+            /// </summary>
+            public static int fromAlpha { get { if (!_fromAlphaReady) { _fromAlphaContent = SGetField<int>(LocalBridgeClazz, "fromAlpha"); _fromAlphaReady = true; } return _fromAlphaContent; } }
+            private static int _fromAlphaContent = default;
+            private static bool _fromAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromDegrees"/>
+            /// </summary>
+            public static int fromDegrees { get { if (!_fromDegreesReady) { _fromDegreesContent = SGetField<int>(LocalBridgeClazz, "fromDegrees"); _fromDegreesReady = true; } return _fromDegreesContent; } }
+            private static int _fromDegreesContent = default;
+            private static bool _fromDegreesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromExtendBottom"/>
+            /// </summary>
+            public static int fromExtendBottom { get { if (!_fromExtendBottomReady) { _fromExtendBottomContent = SGetField<int>(LocalBridgeClazz, "fromExtendBottom"); _fromExtendBottomReady = true; } return _fromExtendBottomContent; } }
+            private static int _fromExtendBottomContent = default;
+            private static bool _fromExtendBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromExtendLeft"/>
+            /// </summary>
+            public static int fromExtendLeft { get { if (!_fromExtendLeftReady) { _fromExtendLeftContent = SGetField<int>(LocalBridgeClazz, "fromExtendLeft"); _fromExtendLeftReady = true; } return _fromExtendLeftContent; } }
+            private static int _fromExtendLeftContent = default;
+            private static bool _fromExtendLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromExtendRight"/>
+            /// </summary>
+            public static int fromExtendRight { get { if (!_fromExtendRightReady) { _fromExtendRightContent = SGetField<int>(LocalBridgeClazz, "fromExtendRight"); _fromExtendRightReady = true; } return _fromExtendRightContent; } }
+            private static int _fromExtendRightContent = default;
+            private static bool _fromExtendRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromExtendTop"/>
+            /// </summary>
+            public static int fromExtendTop { get { if (!_fromExtendTopReady) { _fromExtendTopContent = SGetField<int>(LocalBridgeClazz, "fromExtendTop"); _fromExtendTopReady = true; } return _fromExtendTopContent; } }
+            private static int _fromExtendTopContent = default;
+            private static bool _fromExtendTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromId"/>
+            /// </summary>
+            public static int fromId { get { if (!_fromIdReady) { _fromIdContent = SGetField<int>(LocalBridgeClazz, "fromId"); _fromIdReady = true; } return _fromIdContent; } }
+            private static int _fromIdContent = default;
+            private static bool _fromIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromScene"/>
+            /// </summary>
+            public static int fromScene { get { if (!_fromSceneReady) { _fromSceneContent = SGetField<int>(LocalBridgeClazz, "fromScene"); _fromSceneReady = true; } return _fromSceneContent; } }
+            private static int _fromSceneContent = default;
+            private static bool _fromSceneReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromXDelta"/>
+            /// </summary>
+            public static int fromXDelta { get { if (!_fromXDeltaReady) { _fromXDeltaContent = SGetField<int>(LocalBridgeClazz, "fromXDelta"); _fromXDeltaReady = true; } return _fromXDeltaContent; } }
+            private static int _fromXDeltaContent = default;
+            private static bool _fromXDeltaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromXScale"/>
+            /// </summary>
+            public static int fromXScale { get { if (!_fromXScaleReady) { _fromXScaleContent = SGetField<int>(LocalBridgeClazz, "fromXScale"); _fromXScaleReady = true; } return _fromXScaleContent; } }
+            private static int _fromXScaleContent = default;
+            private static bool _fromXScaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromYDelta"/>
+            /// </summary>
+            public static int fromYDelta { get { if (!_fromYDeltaReady) { _fromYDeltaContent = SGetField<int>(LocalBridgeClazz, "fromYDelta"); _fromYDeltaReady = true; } return _fromYDeltaContent; } }
+            private static int _fromYDeltaContent = default;
+            private static bool _fromYDeltaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fromYScale"/>
+            /// </summary>
+            public static int fromYScale { get { if (!_fromYScaleReady) { _fromYScaleContent = SGetField<int>(LocalBridgeClazz, "fromYScale"); _fromYScaleReady = true; } return _fromYScaleContent; } }
+            private static int _fromYScaleContent = default;
+            private static bool _fromYScaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fullBackupContent"/>
+            /// </summary>
+            public static int fullBackupContent { get { if (!_fullBackupContentReady) { _fullBackupContentContent = SGetField<int>(LocalBridgeClazz, "fullBackupContent"); _fullBackupContentReady = true; } return _fullBackupContentContent; } }
+            private static int _fullBackupContentContent = default;
+            private static bool _fullBackupContentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fullBackupOnly"/>
+            /// </summary>
+            public static int fullBackupOnly { get { if (!_fullBackupOnlyReady) { _fullBackupOnlyContent = SGetField<int>(LocalBridgeClazz, "fullBackupOnly"); _fullBackupOnlyReady = true; } return _fullBackupOnlyContent; } }
+            private static int _fullBackupOnlyContent = default;
+            private static bool _fullBackupOnlyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fullBright"/>
+            /// </summary>
+            public static int fullBright { get { if (!_fullBrightReady) { _fullBrightContent = SGetField<int>(LocalBridgeClazz, "fullBright"); _fullBrightReady = true; } return _fullBrightContent; } }
+            private static int _fullBrightContent = default;
+            private static bool _fullBrightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#fullDark"/>
+            /// </summary>
+            public static int fullDark { get { if (!_fullDarkReady) { _fullDarkContent = SGetField<int>(LocalBridgeClazz, "fullDark"); _fullDarkReady = true; } return _fullDarkContent; } }
+            private static int _fullDarkContent = default;
+            private static bool _fullDarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#functionalTest"/>
+            /// </summary>
+            public static int functionalTest { get { if (!_functionalTestReady) { _functionalTestContent = SGetField<int>(LocalBridgeClazz, "functionalTest"); _functionalTestReady = true; } return _functionalTestContent; } }
+            private static int _functionalTestContent = default;
+            private static bool _functionalTestReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#galleryItemBackground"/>
+            /// </summary>
+            public static int galleryItemBackground { get { if (!_galleryItemBackgroundReady) { _galleryItemBackgroundContent = SGetField<int>(LocalBridgeClazz, "galleryItemBackground"); _galleryItemBackgroundReady = true; } return _galleryItemBackgroundContent; } }
+            private static int _galleryItemBackgroundContent = default;
+            private static bool _galleryItemBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#galleryStyle"/>
+            /// </summary>
+            public static int galleryStyle { get { if (!_galleryStyleReady) { _galleryStyleContent = SGetField<int>(LocalBridgeClazz, "galleryStyle"); _galleryStyleReady = true; } return _galleryStyleContent; } }
+            private static int _galleryStyleContent = default;
+            private static bool _galleryStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gestureColor"/>
+            /// </summary>
+            public static int gestureColor { get { if (!_gestureColorReady) { _gestureColorContent = SGetField<int>(LocalBridgeClazz, "gestureColor"); _gestureColorReady = true; } return _gestureColorContent; } }
+            private static int _gestureColorContent = default;
+            private static bool _gestureColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gestureStrokeAngleThreshold"/>
+            /// </summary>
+            public static int gestureStrokeAngleThreshold { get { if (!_gestureStrokeAngleThresholdReady) { _gestureStrokeAngleThresholdContent = SGetField<int>(LocalBridgeClazz, "gestureStrokeAngleThreshold"); _gestureStrokeAngleThresholdReady = true; } return _gestureStrokeAngleThresholdContent; } }
+            private static int _gestureStrokeAngleThresholdContent = default;
+            private static bool _gestureStrokeAngleThresholdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gestureStrokeLengthThreshold"/>
+            /// </summary>
+            public static int gestureStrokeLengthThreshold { get { if (!_gestureStrokeLengthThresholdReady) { _gestureStrokeLengthThresholdContent = SGetField<int>(LocalBridgeClazz, "gestureStrokeLengthThreshold"); _gestureStrokeLengthThresholdReady = true; } return _gestureStrokeLengthThresholdContent; } }
+            private static int _gestureStrokeLengthThresholdContent = default;
+            private static bool _gestureStrokeLengthThresholdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gestureStrokeSquarenessThreshold"/>
+            /// </summary>
+            public static int gestureStrokeSquarenessThreshold { get { if (!_gestureStrokeSquarenessThresholdReady) { _gestureStrokeSquarenessThresholdContent = SGetField<int>(LocalBridgeClazz, "gestureStrokeSquarenessThreshold"); _gestureStrokeSquarenessThresholdReady = true; } return _gestureStrokeSquarenessThresholdContent; } }
+            private static int _gestureStrokeSquarenessThresholdContent = default;
+            private static bool _gestureStrokeSquarenessThresholdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gestureStrokeType"/>
+            /// </summary>
+            public static int gestureStrokeType { get { if (!_gestureStrokeTypeReady) { _gestureStrokeTypeContent = SGetField<int>(LocalBridgeClazz, "gestureStrokeType"); _gestureStrokeTypeReady = true; } return _gestureStrokeTypeContent; } }
+            private static int _gestureStrokeTypeContent = default;
+            private static bool _gestureStrokeTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gestureStrokeWidth"/>
+            /// </summary>
+            public static int gestureStrokeWidth { get { if (!_gestureStrokeWidthReady) { _gestureStrokeWidthContent = SGetField<int>(LocalBridgeClazz, "gestureStrokeWidth"); _gestureStrokeWidthReady = true; } return _gestureStrokeWidthContent; } }
+            private static int _gestureStrokeWidthContent = default;
+            private static bool _gestureStrokeWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#glEsVersion"/>
+            /// </summary>
+            public static int glEsVersion { get { if (!_glEsVersionReady) { _glEsVersionContent = SGetField<int>(LocalBridgeClazz, "glEsVersion"); _glEsVersionReady = true; } return _glEsVersionContent; } }
+            private static int _glEsVersionContent = default;
+            private static bool _glEsVersionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#goIcon"/>
+            /// </summary>
+            public static int goIcon { get { if (!_goIconReady) { _goIconContent = SGetField<int>(LocalBridgeClazz, "goIcon"); _goIconReady = true; } return _goIconContent; } }
+            private static int _goIconContent = default;
+            private static bool _goIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gradientRadius"/>
+            /// </summary>
+            public static int gradientRadius { get { if (!_gradientRadiusReady) { _gradientRadiusContent = SGetField<int>(LocalBridgeClazz, "gradientRadius"); _gradientRadiusReady = true; } return _gradientRadiusContent; } }
+            private static int _gradientRadiusContent = default;
+            private static bool _gradientRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#grantUriPermissions"/>
+            /// </summary>
+            public static int grantUriPermissions { get { if (!_grantUriPermissionsReady) { _grantUriPermissionsContent = SGetField<int>(LocalBridgeClazz, "grantUriPermissions"); _grantUriPermissionsReady = true; } return _grantUriPermissionsContent; } }
+            private static int _grantUriPermissionsContent = default;
+            private static bool _grantUriPermissionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gravity"/>
+            /// </summary>
+            public static int gravity { get { if (!_gravityReady) { _gravityContent = SGetField<int>(LocalBridgeClazz, "gravity"); _gravityReady = true; } return _gravityContent; } }
+            private static int _gravityContent = default;
+            private static bool _gravityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gridViewStyle"/>
+            /// </summary>
+            public static int gridViewStyle { get { if (!_gridViewStyleReady) { _gridViewStyleContent = SGetField<int>(LocalBridgeClazz, "gridViewStyle"); _gridViewStyleReady = true; } return _gridViewStyleContent; } }
+            private static int _gridViewStyleContent = default;
+            private static bool _gridViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#groupIndicator"/>
+            /// </summary>
+            public static int groupIndicator { get { if (!_groupIndicatorReady) { _groupIndicatorContent = SGetField<int>(LocalBridgeClazz, "groupIndicator"); _groupIndicatorReady = true; } return _groupIndicatorContent; } }
+            private static int _groupIndicatorContent = default;
+            private static bool _groupIndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#gwpAsanMode"/>
+            /// </summary>
+            public static int gwpAsanMode { get { if (!_gwpAsanModeReady) { _gwpAsanModeContent = SGetField<int>(LocalBridgeClazz, "gwpAsanMode"); _gwpAsanModeReady = true; } return _gwpAsanModeContent; } }
+            private static int _gwpAsanModeContent = default;
+            private static bool _gwpAsanModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_hour"/>
+            /// </summary>
+            public static int hand_hour { get { if (!_hand_hourReady) { _hand_hourContent = SGetField<int>(LocalBridgeClazz, "hand_hour"); _hand_hourReady = true; } return _hand_hourContent; } }
+            private static int _hand_hourContent = default;
+            private static bool _hand_hourReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_hourTint"/>
+            /// </summary>
+            public static int hand_hourTint { get { if (!_hand_hourTintReady) { _hand_hourTintContent = SGetField<int>(LocalBridgeClazz, "hand_hourTint"); _hand_hourTintReady = true; } return _hand_hourTintContent; } }
+            private static int _hand_hourTintContent = default;
+            private static bool _hand_hourTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_hourTintMode"/>
+            /// </summary>
+            public static int hand_hourTintMode { get { if (!_hand_hourTintModeReady) { _hand_hourTintModeContent = SGetField<int>(LocalBridgeClazz, "hand_hourTintMode"); _hand_hourTintModeReady = true; } return _hand_hourTintModeContent; } }
+            private static int _hand_hourTintModeContent = default;
+            private static bool _hand_hourTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_minute"/>
+            /// </summary>
+            public static int hand_minute { get { if (!_hand_minuteReady) { _hand_minuteContent = SGetField<int>(LocalBridgeClazz, "hand_minute"); _hand_minuteReady = true; } return _hand_minuteContent; } }
+            private static int _hand_minuteContent = default;
+            private static bool _hand_minuteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_minuteTint"/>
+            /// </summary>
+            public static int hand_minuteTint { get { if (!_hand_minuteTintReady) { _hand_minuteTintContent = SGetField<int>(LocalBridgeClazz, "hand_minuteTint"); _hand_minuteTintReady = true; } return _hand_minuteTintContent; } }
+            private static int _hand_minuteTintContent = default;
+            private static bool _hand_minuteTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_minuteTintMode"/>
+            /// </summary>
+            public static int hand_minuteTintMode { get { if (!_hand_minuteTintModeReady) { _hand_minuteTintModeContent = SGetField<int>(LocalBridgeClazz, "hand_minuteTintMode"); _hand_minuteTintModeReady = true; } return _hand_minuteTintModeContent; } }
+            private static int _hand_minuteTintModeContent = default;
+            private static bool _hand_minuteTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_second"/>
+            /// </summary>
+            public static int hand_second { get { if (!_hand_secondReady) { _hand_secondContent = SGetField<int>(LocalBridgeClazz, "hand_second"); _hand_secondReady = true; } return _hand_secondContent; } }
+            private static int _hand_secondContent = default;
+            private static bool _hand_secondReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_secondTint"/>
+            /// </summary>
+            public static int hand_secondTint { get { if (!_hand_secondTintReady) { _hand_secondTintContent = SGetField<int>(LocalBridgeClazz, "hand_secondTint"); _hand_secondTintReady = true; } return _hand_secondTintContent; } }
+            private static int _hand_secondTintContent = default;
+            private static bool _hand_secondTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hand_secondTintMode"/>
+            /// </summary>
+            public static int hand_secondTintMode { get { if (!_hand_secondTintModeReady) { _hand_secondTintModeContent = SGetField<int>(LocalBridgeClazz, "hand_secondTintMode"); _hand_secondTintModeReady = true; } return _hand_secondTintModeContent; } }
+            private static int _hand_secondTintModeContent = default;
+            private static bool _hand_secondTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#handle"/>
+            /// </summary>
+            public static int handle { get { if (!_handleReady) { _handleContent = SGetField<int>(LocalBridgeClazz, "handle"); _handleReady = true; } return _handleContent; } }
+            private static int _handleContent = default;
+            private static bool _handleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#handleProfiling"/>
+            /// </summary>
+            public static int handleProfiling { get { if (!_handleProfilingReady) { _handleProfilingContent = SGetField<int>(LocalBridgeClazz, "handleProfiling"); _handleProfilingReady = true; } return _handleProfilingContent; } }
+            private static int _handleProfilingContent = default;
+            private static bool _handleProfilingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#handwritingBoundsOffsetBottom"/>
+            /// </summary>
+            public static int handwritingBoundsOffsetBottom { get { if (!_handwritingBoundsOffsetBottomReady) { _handwritingBoundsOffsetBottomContent = SGetField<int>(LocalBridgeClazz, "handwritingBoundsOffsetBottom"); _handwritingBoundsOffsetBottomReady = true; } return _handwritingBoundsOffsetBottomContent; } }
+            private static int _handwritingBoundsOffsetBottomContent = default;
+            private static bool _handwritingBoundsOffsetBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#handwritingBoundsOffsetLeft"/>
+            /// </summary>
+            public static int handwritingBoundsOffsetLeft { get { if (!_handwritingBoundsOffsetLeftReady) { _handwritingBoundsOffsetLeftContent = SGetField<int>(LocalBridgeClazz, "handwritingBoundsOffsetLeft"); _handwritingBoundsOffsetLeftReady = true; } return _handwritingBoundsOffsetLeftContent; } }
+            private static int _handwritingBoundsOffsetLeftContent = default;
+            private static bool _handwritingBoundsOffsetLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#handwritingBoundsOffsetRight"/>
+            /// </summary>
+            public static int handwritingBoundsOffsetRight { get { if (!_handwritingBoundsOffsetRightReady) { _handwritingBoundsOffsetRightContent = SGetField<int>(LocalBridgeClazz, "handwritingBoundsOffsetRight"); _handwritingBoundsOffsetRightReady = true; } return _handwritingBoundsOffsetRightContent; } }
+            private static int _handwritingBoundsOffsetRightContent = default;
+            private static bool _handwritingBoundsOffsetRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#handwritingBoundsOffsetTop"/>
+            /// </summary>
+            public static int handwritingBoundsOffsetTop { get { if (!_handwritingBoundsOffsetTopReady) { _handwritingBoundsOffsetTopContent = SGetField<int>(LocalBridgeClazz, "handwritingBoundsOffsetTop"); _handwritingBoundsOffsetTopReady = true; } return _handwritingBoundsOffsetTopContent; } }
+            private static int _handwritingBoundsOffsetTopContent = default;
+            private static bool _handwritingBoundsOffsetTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hapticFeedbackEnabled"/>
+            /// </summary>
+            public static int hapticFeedbackEnabled { get { if (!_hapticFeedbackEnabledReady) { _hapticFeedbackEnabledContent = SGetField<int>(LocalBridgeClazz, "hapticFeedbackEnabled"); _hapticFeedbackEnabledReady = true; } return _hapticFeedbackEnabledContent; } }
+            private static int _hapticFeedbackEnabledContent = default;
+            private static bool _hapticFeedbackEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hardwareAccelerated"/>
+            /// </summary>
+            public static int hardwareAccelerated { get { if (!_hardwareAcceleratedReady) { _hardwareAcceleratedContent = SGetField<int>(LocalBridgeClazz, "hardwareAccelerated"); _hardwareAcceleratedReady = true; } return _hardwareAcceleratedContent; } }
+            private static int _hardwareAcceleratedContent = default;
+            private static bool _hardwareAcceleratedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hasCode"/>
+            /// </summary>
+            public static int hasCode { get { if (!_hasCodeReady) { _hasCodeContent = SGetField<int>(LocalBridgeClazz, "hasCode"); _hasCodeReady = true; } return _hasCodeContent; } }
+            private static int _hasCodeContent = default;
+            private static bool _hasCodeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hasFragileUserData"/>
+            /// </summary>
+            public static int hasFragileUserData { get { if (!_hasFragileUserDataReady) { _hasFragileUserDataContent = SGetField<int>(LocalBridgeClazz, "hasFragileUserData"); _hasFragileUserDataReady = true; } return _hasFragileUserDataContent; } }
+            private static int _hasFragileUserDataContent = default;
+            private static bool _hasFragileUserDataReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#headerAmPmTextAppearance"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int headerAmPmTextAppearance { get { if (!_headerAmPmTextAppearanceReady) { _headerAmPmTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "headerAmPmTextAppearance"); _headerAmPmTextAppearanceReady = true; } return _headerAmPmTextAppearanceContent; } }
+            private static int _headerAmPmTextAppearanceContent = default;
+            private static bool _headerAmPmTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#headerBackground"/>
+            /// </summary>
+            public static int headerBackground { get { if (!_headerBackgroundReady) { _headerBackgroundContent = SGetField<int>(LocalBridgeClazz, "headerBackground"); _headerBackgroundReady = true; } return _headerBackgroundContent; } }
+            private static int _headerBackgroundContent = default;
+            private static bool _headerBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#headerDayOfMonthTextAppearance"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int headerDayOfMonthTextAppearance { get { if (!_headerDayOfMonthTextAppearanceReady) { _headerDayOfMonthTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "headerDayOfMonthTextAppearance"); _headerDayOfMonthTextAppearanceReady = true; } return _headerDayOfMonthTextAppearanceContent; } }
+            private static int _headerDayOfMonthTextAppearanceContent = default;
+            private static bool _headerDayOfMonthTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#headerDividersEnabled"/>
+            /// </summary>
+            public static int headerDividersEnabled { get { if (!_headerDividersEnabledReady) { _headerDividersEnabledContent = SGetField<int>(LocalBridgeClazz, "headerDividersEnabled"); _headerDividersEnabledReady = true; } return _headerDividersEnabledContent; } }
+            private static int _headerDividersEnabledContent = default;
+            private static bool _headerDividersEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#headerMonthTextAppearance"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int headerMonthTextAppearance { get { if (!_headerMonthTextAppearanceReady) { _headerMonthTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "headerMonthTextAppearance"); _headerMonthTextAppearanceReady = true; } return _headerMonthTextAppearanceContent; } }
+            private static int _headerMonthTextAppearanceContent = default;
+            private static bool _headerMonthTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#headerTimeTextAppearance"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int headerTimeTextAppearance { get { if (!_headerTimeTextAppearanceReady) { _headerTimeTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "headerTimeTextAppearance"); _headerTimeTextAppearanceReady = true; } return _headerTimeTextAppearanceContent; } }
+            private static int _headerTimeTextAppearanceContent = default;
+            private static bool _headerTimeTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#headerYearTextAppearance"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int headerYearTextAppearance { get { if (!_headerYearTextAppearanceReady) { _headerYearTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "headerYearTextAppearance"); _headerYearTextAppearanceReady = true; } return _headerYearTextAppearanceContent; } }
+            private static int _headerYearTextAppearanceContent = default;
+            private static bool _headerYearTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#height"/>
+            /// </summary>
+            public static int height { get { if (!_heightReady) { _heightContent = SGetField<int>(LocalBridgeClazz, "height"); _heightReady = true; } return _heightContent; } }
+            private static int _heightContent = default;
+            private static bool _heightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hideOnContentScroll"/>
+            /// </summary>
+            public static int hideOnContentScroll { get { if (!_hideOnContentScrollReady) { _hideOnContentScrollContent = SGetField<int>(LocalBridgeClazz, "hideOnContentScroll"); _hideOnContentScrollReady = true; } return _hideOnContentScrollContent; } }
+            private static int _hideOnContentScrollContent = default;
+            private static bool _hideOnContentScrollReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hint"/>
+            /// </summary>
+            public static int hint { get { if (!_hintReady) { _hintContent = SGetField<int>(LocalBridgeClazz, "hint"); _hintReady = true; } return _hintContent; } }
+            private static int _hintContent = default;
+            private static bool _hintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#homeAsUpIndicator"/>
+            /// </summary>
+            public static int homeAsUpIndicator { get { if (!_homeAsUpIndicatorReady) { _homeAsUpIndicatorContent = SGetField<int>(LocalBridgeClazz, "homeAsUpIndicator"); _homeAsUpIndicatorReady = true; } return _homeAsUpIndicatorContent; } }
+            private static int _homeAsUpIndicatorContent = default;
+            private static bool _homeAsUpIndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#homeLayout"/>
+            /// </summary>
+            public static int homeLayout { get { if (!_homeLayoutReady) { _homeLayoutContent = SGetField<int>(LocalBridgeClazz, "homeLayout"); _homeLayoutReady = true; } return _homeLayoutContent; } }
+            private static int _homeLayoutContent = default;
+            private static bool _homeLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#horizontalDivider"/>
+            /// </summary>
+            public static int horizontalDivider { get { if (!_horizontalDividerReady) { _horizontalDividerContent = SGetField<int>(LocalBridgeClazz, "horizontalDivider"); _horizontalDividerReady = true; } return _horizontalDividerContent; } }
+            private static int _horizontalDividerContent = default;
+            private static bool _horizontalDividerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#horizontalGap"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int horizontalGap { get { if (!_horizontalGapReady) { _horizontalGapContent = SGetField<int>(LocalBridgeClazz, "horizontalGap"); _horizontalGapReady = true; } return _horizontalGapContent; } }
+            private static int _horizontalGapContent = default;
+            private static bool _horizontalGapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#horizontalScrollViewStyle"/>
+            /// </summary>
+            public static int horizontalScrollViewStyle { get { if (!_horizontalScrollViewStyleReady) { _horizontalScrollViewStyleContent = SGetField<int>(LocalBridgeClazz, "horizontalScrollViewStyle"); _horizontalScrollViewStyleReady = true; } return _horizontalScrollViewStyleContent; } }
+            private static int _horizontalScrollViewStyleContent = default;
+            private static bool _horizontalScrollViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#horizontalSpacing"/>
+            /// </summary>
+            public static int horizontalSpacing { get { if (!_horizontalSpacingReady) { _horizontalSpacingContent = SGetField<int>(LocalBridgeClazz, "horizontalSpacing"); _horizontalSpacingReady = true; } return _horizontalSpacingContent; } }
+            private static int _horizontalSpacingContent = default;
+            private static bool _horizontalSpacingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#host"/>
+            /// </summary>
+            public static int host { get { if (!_hostReady) { _hostContent = SGetField<int>(LocalBridgeClazz, "host"); _hostReady = true; } return _hostContent; } }
+            private static int _hostContent = default;
+            private static bool _hostReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hotSpotX"/>
+            /// </summary>
+            public static int hotSpotX { get { if (!_hotSpotXReady) { _hotSpotXContent = SGetField<int>(LocalBridgeClazz, "hotSpotX"); _hotSpotXReady = true; } return _hotSpotXContent; } }
+            private static int _hotSpotXContent = default;
+            private static bool _hotSpotXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hotSpotY"/>
+            /// </summary>
+            public static int hotSpotY { get { if (!_hotSpotYReady) { _hotSpotYContent = SGetField<int>(LocalBridgeClazz, "hotSpotY"); _hotSpotYReady = true; } return _hotSpotYContent; } }
+            private static int _hotSpotYContent = default;
+            private static bool _hotSpotYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#htmlDescription"/>
+            /// </summary>
+            public static int htmlDescription { get { if (!_htmlDescriptionReady) { _htmlDescriptionContent = SGetField<int>(LocalBridgeClazz, "htmlDescription"); _htmlDescriptionReady = true; } return _htmlDescriptionContent; } }
+            private static int _htmlDescriptionContent = default;
+            private static bool _htmlDescriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#hyphenationFrequency"/>
+            /// </summary>
+            public static int hyphenationFrequency { get { if (!_hyphenationFrequencyReady) { _hyphenationFrequencyContent = SGetField<int>(LocalBridgeClazz, "hyphenationFrequency"); _hyphenationFrequencyReady = true; } return _hyphenationFrequencyContent; } }
+            private static int _hyphenationFrequencyContent = default;
+            private static bool _hyphenationFrequencyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#icon"/>
+            /// </summary>
+            public static int icon { get { if (!_iconReady) { _iconContent = SGetField<int>(LocalBridgeClazz, "icon"); _iconReady = true; } return _iconContent; } }
+            private static int _iconContent = default;
+            private static bool _iconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#iconifiedByDefault"/>
+            /// </summary>
+            public static int iconifiedByDefault { get { if (!_iconifiedByDefaultReady) { _iconifiedByDefaultContent = SGetField<int>(LocalBridgeClazz, "iconifiedByDefault"); _iconifiedByDefaultReady = true; } return _iconifiedByDefaultContent; } }
+            private static int _iconifiedByDefaultContent = default;
+            private static bool _iconifiedByDefaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#iconPreview"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int iconPreview { get { if (!_iconPreviewReady) { _iconPreviewContent = SGetField<int>(LocalBridgeClazz, "iconPreview"); _iconPreviewReady = true; } return _iconPreviewContent; } }
+            private static int _iconPreviewContent = default;
+            private static bool _iconPreviewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#iconSpaceReserved"/>
+            /// </summary>
+            public static int iconSpaceReserved { get { if (!_iconSpaceReservedReady) { _iconSpaceReservedContent = SGetField<int>(LocalBridgeClazz, "iconSpaceReserved"); _iconSpaceReservedReady = true; } return _iconSpaceReservedContent; } }
+            private static int _iconSpaceReservedContent = default;
+            private static bool _iconSpaceReservedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#iconTint"/>
+            /// </summary>
+            public static int iconTint { get { if (!_iconTintReady) { _iconTintContent = SGetField<int>(LocalBridgeClazz, "iconTint"); _iconTintReady = true; } return _iconTintContent; } }
+            private static int _iconTintContent = default;
+            private static bool _iconTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#iconTintMode"/>
+            /// </summary>
+            public static int iconTintMode { get { if (!_iconTintModeReady) { _iconTintModeContent = SGetField<int>(LocalBridgeClazz, "iconTintMode"); _iconTintModeReady = true; } return _iconTintModeContent; } }
+            private static int _iconTintModeContent = default;
+            private static bool _iconTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#id"/>
+            /// </summary>
+            public static int idField { get { if (!_idFieldReady) { _idFieldContent = SGetField<int>(LocalBridgeClazz, "id"); _idFieldReady = true; } return _idFieldContent; } }
+            private static int _idFieldContent = default;
+            private static bool _idFieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#identifier"/>
+            /// </summary>
+            public static int identifier { get { if (!_identifierReady) { _identifierContent = SGetField<int>(LocalBridgeClazz, "identifier"); _identifierReady = true; } return _identifierContent; } }
+            private static int _identifierContent = default;
+            private static bool _identifierReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ignoreGravity"/>
+            /// </summary>
+            public static int ignoreGravity { get { if (!_ignoreGravityReady) { _ignoreGravityContent = SGetField<int>(LocalBridgeClazz, "ignoreGravity"); _ignoreGravityReady = true; } return _ignoreGravityContent; } }
+            private static int _ignoreGravityContent = default;
+            private static bool _ignoreGravityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imageButtonStyle"/>
+            /// </summary>
+            public static int imageButtonStyle { get { if (!_imageButtonStyleReady) { _imageButtonStyleContent = SGetField<int>(LocalBridgeClazz, "imageButtonStyle"); _imageButtonStyleReady = true; } return _imageButtonStyleContent; } }
+            private static int _imageButtonStyleContent = default;
+            private static bool _imageButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imageWellStyle"/>
+            /// </summary>
+            public static int imageWellStyle { get { if (!_imageWellStyleReady) { _imageWellStyleContent = SGetField<int>(LocalBridgeClazz, "imageWellStyle"); _imageWellStyleReady = true; } return _imageWellStyleContent; } }
+            private static int _imageWellStyleContent = default;
+            private static bool _imageWellStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeActionId"/>
+            /// </summary>
+            public static int imeActionId { get { if (!_imeActionIdReady) { _imeActionIdContent = SGetField<int>(LocalBridgeClazz, "imeActionId"); _imeActionIdReady = true; } return _imeActionIdContent; } }
+            private static int _imeActionIdContent = default;
+            private static bool _imeActionIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeActionLabel"/>
+            /// </summary>
+            public static int imeActionLabel { get { if (!_imeActionLabelReady) { _imeActionLabelContent = SGetField<int>(LocalBridgeClazz, "imeActionLabel"); _imeActionLabelReady = true; } return _imeActionLabelContent; } }
+            private static int _imeActionLabelContent = default;
+            private static bool _imeActionLabelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeExtractEnterAnimation"/>
+            /// </summary>
+            public static int imeExtractEnterAnimation { get { if (!_imeExtractEnterAnimationReady) { _imeExtractEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "imeExtractEnterAnimation"); _imeExtractEnterAnimationReady = true; } return _imeExtractEnterAnimationContent; } }
+            private static int _imeExtractEnterAnimationContent = default;
+            private static bool _imeExtractEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeExtractExitAnimation"/>
+            /// </summary>
+            public static int imeExtractExitAnimation { get { if (!_imeExtractExitAnimationReady) { _imeExtractExitAnimationContent = SGetField<int>(LocalBridgeClazz, "imeExtractExitAnimation"); _imeExtractExitAnimationReady = true; } return _imeExtractExitAnimationContent; } }
+            private static int _imeExtractExitAnimationContent = default;
+            private static bool _imeExtractExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeFullscreenBackground"/>
+            /// </summary>
+            public static int imeFullscreenBackground { get { if (!_imeFullscreenBackgroundReady) { _imeFullscreenBackgroundContent = SGetField<int>(LocalBridgeClazz, "imeFullscreenBackground"); _imeFullscreenBackgroundReady = true; } return _imeFullscreenBackgroundContent; } }
+            private static int _imeFullscreenBackgroundContent = default;
+            private static bool _imeFullscreenBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeOptions"/>
+            /// </summary>
+            public static int imeOptions { get { if (!_imeOptionsReady) { _imeOptionsContent = SGetField<int>(LocalBridgeClazz, "imeOptions"); _imeOptionsReady = true; } return _imeOptionsContent; } }
+            private static int _imeOptionsContent = default;
+            private static bool _imeOptionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeSubtypeExtraValue"/>
+            /// </summary>
+            public static int imeSubtypeExtraValue { get { if (!_imeSubtypeExtraValueReady) { _imeSubtypeExtraValueContent = SGetField<int>(LocalBridgeClazz, "imeSubtypeExtraValue"); _imeSubtypeExtraValueReady = true; } return _imeSubtypeExtraValueContent; } }
+            private static int _imeSubtypeExtraValueContent = default;
+            private static bool _imeSubtypeExtraValueReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeSubtypeLocale"/>
+            /// </summary>
+            public static int imeSubtypeLocale { get { if (!_imeSubtypeLocaleReady) { _imeSubtypeLocaleContent = SGetField<int>(LocalBridgeClazz, "imeSubtypeLocale"); _imeSubtypeLocaleReady = true; } return _imeSubtypeLocaleContent; } }
+            private static int _imeSubtypeLocaleContent = default;
+            private static bool _imeSubtypeLocaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#imeSubtypeMode"/>
+            /// </summary>
+            public static int imeSubtypeMode { get { if (!_imeSubtypeModeReady) { _imeSubtypeModeContent = SGetField<int>(LocalBridgeClazz, "imeSubtypeMode"); _imeSubtypeModeReady = true; } return _imeSubtypeModeContent; } }
+            private static int _imeSubtypeModeContent = default;
+            private static bool _imeSubtypeModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#immersive"/>
+            /// </summary>
+            public static int immersive { get { if (!_immersiveReady) { _immersiveContent = SGetField<int>(LocalBridgeClazz, "immersive"); _immersiveReady = true; } return _immersiveContent; } }
+            private static int _immersiveContent = default;
+            private static bool _immersiveReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#importantForAccessibility"/>
+            /// </summary>
+            public static int importantForAccessibility { get { if (!_importantForAccessibilityReady) { _importantForAccessibilityContent = SGetField<int>(LocalBridgeClazz, "importantForAccessibility"); _importantForAccessibilityReady = true; } return _importantForAccessibilityContent; } }
+            private static int _importantForAccessibilityContent = default;
+            private static bool _importantForAccessibilityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#importantForAutofill"/>
+            /// </summary>
+            public static int importantForAutofill { get { if (!_importantForAutofillReady) { _importantForAutofillContent = SGetField<int>(LocalBridgeClazz, "importantForAutofill"); _importantForAutofillReady = true; } return _importantForAutofillContent; } }
+            private static int _importantForAutofillContent = default;
+            private static bool _importantForAutofillReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#importantForContentCapture"/>
+            /// </summary>
+            public static int importantForContentCapture { get { if (!_importantForContentCaptureReady) { _importantForContentCaptureContent = SGetField<int>(LocalBridgeClazz, "importantForContentCapture"); _importantForContentCaptureReady = true; } return _importantForContentCaptureContent; } }
+            private static int _importantForContentCaptureContent = default;
+            private static bool _importantForContentCaptureReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#inAnimation"/>
+            /// </summary>
+            public static int inAnimation { get { if (!_inAnimationReady) { _inAnimationContent = SGetField<int>(LocalBridgeClazz, "inAnimation"); _inAnimationReady = true; } return _inAnimationContent; } }
+            private static int _inAnimationContent = default;
+            private static bool _inAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#includeFontPadding"/>
+            /// </summary>
+            public static int includeFontPadding { get { if (!_includeFontPaddingReady) { _includeFontPaddingContent = SGetField<int>(LocalBridgeClazz, "includeFontPadding"); _includeFontPaddingReady = true; } return _includeFontPaddingContent; } }
+            private static int _includeFontPaddingContent = default;
+            private static bool _includeFontPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#includeInGlobalSearch"/>
+            /// </summary>
+            public static int includeInGlobalSearch { get { if (!_includeInGlobalSearchReady) { _includeInGlobalSearchContent = SGetField<int>(LocalBridgeClazz, "includeInGlobalSearch"); _includeInGlobalSearchReady = true; } return _includeInGlobalSearchContent; } }
+            private static int _includeInGlobalSearchContent = default;
+            private static bool _includeInGlobalSearchReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indeterminate"/>
+            /// </summary>
+            public static int indeterminate { get { if (!_indeterminateReady) { _indeterminateContent = SGetField<int>(LocalBridgeClazz, "indeterminate"); _indeterminateReady = true; } return _indeterminateContent; } }
+            private static int _indeterminateContent = default;
+            private static bool _indeterminateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indeterminateBehavior"/>
+            /// </summary>
+            public static int indeterminateBehavior { get { if (!_indeterminateBehaviorReady) { _indeterminateBehaviorContent = SGetField<int>(LocalBridgeClazz, "indeterminateBehavior"); _indeterminateBehaviorReady = true; } return _indeterminateBehaviorContent; } }
+            private static int _indeterminateBehaviorContent = default;
+            private static bool _indeterminateBehaviorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indeterminateDrawable"/>
+            /// </summary>
+            public static int indeterminateDrawable { get { if (!_indeterminateDrawableReady) { _indeterminateDrawableContent = SGetField<int>(LocalBridgeClazz, "indeterminateDrawable"); _indeterminateDrawableReady = true; } return _indeterminateDrawableContent; } }
+            private static int _indeterminateDrawableContent = default;
+            private static bool _indeterminateDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indeterminateDuration"/>
+            /// </summary>
+            public static int indeterminateDuration { get { if (!_indeterminateDurationReady) { _indeterminateDurationContent = SGetField<int>(LocalBridgeClazz, "indeterminateDuration"); _indeterminateDurationReady = true; } return _indeterminateDurationContent; } }
+            private static int _indeterminateDurationContent = default;
+            private static bool _indeterminateDurationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indeterminateOnly"/>
+            /// </summary>
+            public static int indeterminateOnly { get { if (!_indeterminateOnlyReady) { _indeterminateOnlyContent = SGetField<int>(LocalBridgeClazz, "indeterminateOnly"); _indeterminateOnlyReady = true; } return _indeterminateOnlyContent; } }
+            private static int _indeterminateOnlyContent = default;
+            private static bool _indeterminateOnlyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indeterminateProgressStyle"/>
+            /// </summary>
+            public static int indeterminateProgressStyle { get { if (!_indeterminateProgressStyleReady) { _indeterminateProgressStyleContent = SGetField<int>(LocalBridgeClazz, "indeterminateProgressStyle"); _indeterminateProgressStyleReady = true; } return _indeterminateProgressStyleContent; } }
+            private static int _indeterminateProgressStyleContent = default;
+            private static bool _indeterminateProgressStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indeterminateTint"/>
+            /// </summary>
+            public static int indeterminateTint { get { if (!_indeterminateTintReady) { _indeterminateTintContent = SGetField<int>(LocalBridgeClazz, "indeterminateTint"); _indeterminateTintReady = true; } return _indeterminateTintContent; } }
+            private static int _indeterminateTintContent = default;
+            private static bool _indeterminateTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indeterminateTintMode"/>
+            /// </summary>
+            public static int indeterminateTintMode { get { if (!_indeterminateTintModeReady) { _indeterminateTintModeContent = SGetField<int>(LocalBridgeClazz, "indeterminateTintMode"); _indeterminateTintModeReady = true; } return _indeterminateTintModeContent; } }
+            private static int _indeterminateTintModeContent = default;
+            private static bool _indeterminateTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indicatorEnd"/>
+            /// </summary>
+            public static int indicatorEnd { get { if (!_indicatorEndReady) { _indicatorEndContent = SGetField<int>(LocalBridgeClazz, "indicatorEnd"); _indicatorEndReady = true; } return _indicatorEndContent; } }
+            private static int _indicatorEndContent = default;
+            private static bool _indicatorEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indicatorLeft"/>
+            /// </summary>
+            public static int indicatorLeft { get { if (!_indicatorLeftReady) { _indicatorLeftContent = SGetField<int>(LocalBridgeClazz, "indicatorLeft"); _indicatorLeftReady = true; } return _indicatorLeftContent; } }
+            private static int _indicatorLeftContent = default;
+            private static bool _indicatorLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indicatorRight"/>
+            /// </summary>
+            public static int indicatorRight { get { if (!_indicatorRightReady) { _indicatorRightContent = SGetField<int>(LocalBridgeClazz, "indicatorRight"); _indicatorRightReady = true; } return _indicatorRightContent; } }
+            private static int _indicatorRightContent = default;
+            private static bool _indicatorRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#indicatorStart"/>
+            /// </summary>
+            public static int indicatorStart { get { if (!_indicatorStartReady) { _indicatorStartContent = SGetField<int>(LocalBridgeClazz, "indicatorStart"); _indicatorStartReady = true; } return _indicatorStartContent; } }
+            private static int _indicatorStartContent = default;
+            private static bool _indicatorStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#inflatedId"/>
+            /// </summary>
+            public static int inflatedId { get { if (!_inflatedIdReady) { _inflatedIdContent = SGetField<int>(LocalBridgeClazz, "inflatedId"); _inflatedIdReady = true; } return _inflatedIdContent; } }
+            private static int _inflatedIdContent = default;
+            private static bool _inflatedIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#inheritShowWhenLocked"/>
+            /// </summary>
+            public static int inheritShowWhenLocked { get { if (!_inheritShowWhenLockedReady) { _inheritShowWhenLockedContent = SGetField<int>(LocalBridgeClazz, "inheritShowWhenLocked"); _inheritShowWhenLockedReady = true; } return _inheritShowWhenLockedContent; } }
+            private static int _inheritShowWhenLockedContent = default;
+            private static bool _inheritShowWhenLockedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#initialKeyguardLayout"/>
+            /// </summary>
+            public static int initialKeyguardLayout { get { if (!_initialKeyguardLayoutReady) { _initialKeyguardLayoutContent = SGetField<int>(LocalBridgeClazz, "initialKeyguardLayout"); _initialKeyguardLayoutReady = true; } return _initialKeyguardLayoutContent; } }
+            private static int _initialKeyguardLayoutContent = default;
+            private static bool _initialKeyguardLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#initialLayout"/>
+            /// </summary>
+            public static int initialLayout { get { if (!_initialLayoutReady) { _initialLayoutContent = SGetField<int>(LocalBridgeClazz, "initialLayout"); _initialLayoutReady = true; } return _initialLayoutContent; } }
+            private static int _initialLayoutContent = default;
+            private static bool _initialLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#initOrder"/>
+            /// </summary>
+            public static int initOrder { get { if (!_initOrderReady) { _initOrderContent = SGetField<int>(LocalBridgeClazz, "initOrder"); _initOrderReady = true; } return _initOrderContent; } }
+            private static int _initOrderContent = default;
+            private static bool _initOrderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#innerRadius"/>
+            /// </summary>
+            public static int innerRadius { get { if (!_innerRadiusReady) { _innerRadiusContent = SGetField<int>(LocalBridgeClazz, "innerRadius"); _innerRadiusReady = true; } return _innerRadiusContent; } }
+            private static int _innerRadiusContent = default;
+            private static bool _innerRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#innerRadiusRatio"/>
+            /// </summary>
+            public static int innerRadiusRatio { get { if (!_innerRadiusRatioReady) { _innerRadiusRatioContent = SGetField<int>(LocalBridgeClazz, "innerRadiusRatio"); _innerRadiusRatioReady = true; } return _innerRadiusRatioContent; } }
+            private static int _innerRadiusRatioContent = default;
+            private static bool _innerRadiusRatioReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#inputMethod"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int inputMethod { get { if (!_inputMethodReady) { _inputMethodContent = SGetField<int>(LocalBridgeClazz, "inputMethod"); _inputMethodReady = true; } return _inputMethodContent; } }
+            private static int _inputMethodContent = default;
+            private static bool _inputMethodReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#inputType"/>
+            /// </summary>
+            public static int inputType { get { if (!_inputTypeReady) { _inputTypeContent = SGetField<int>(LocalBridgeClazz, "inputType"); _inputTypeReady = true; } return _inputTypeContent; } }
+            private static int _inputTypeContent = default;
+            private static bool _inputTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#inset"/>
+            /// </summary>
+            public static int inset { get { if (!_insetReady) { _insetContent = SGetField<int>(LocalBridgeClazz, "inset"); _insetReady = true; } return _insetContent; } }
+            private static int _insetContent = default;
+            private static bool _insetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#insetBottom"/>
+            /// </summary>
+            public static int insetBottom { get { if (!_insetBottomReady) { _insetBottomContent = SGetField<int>(LocalBridgeClazz, "insetBottom"); _insetBottomReady = true; } return _insetBottomContent; } }
+            private static int _insetBottomContent = default;
+            private static bool _insetBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#insetLeft"/>
+            /// </summary>
+            public static int insetLeft { get { if (!_insetLeftReady) { _insetLeftContent = SGetField<int>(LocalBridgeClazz, "insetLeft"); _insetLeftReady = true; } return _insetLeftContent; } }
+            private static int _insetLeftContent = default;
+            private static bool _insetLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#insetRight"/>
+            /// </summary>
+            public static int insetRight { get { if (!_insetRightReady) { _insetRightContent = SGetField<int>(LocalBridgeClazz, "insetRight"); _insetRightReady = true; } return _insetRightContent; } }
+            private static int _insetRightContent = default;
+            private static bool _insetRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#insetTop"/>
+            /// </summary>
+            public static int insetTop { get { if (!_insetTopReady) { _insetTopContent = SGetField<int>(LocalBridgeClazz, "insetTop"); _insetTopReady = true; } return _insetTopContent; } }
+            private static int _insetTopContent = default;
+            private static bool _insetTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#installLocation"/>
+            /// </summary>
+            public static int installLocation { get { if (!_installLocationReady) { _installLocationContent = SGetField<int>(LocalBridgeClazz, "installLocation"); _installLocationReady = true; } return _installLocationContent; } }
+            private static int _installLocationContent = default;
+            private static bool _installLocationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#interactiveUiTimeout"/>
+            /// </summary>
+            public static int interactiveUiTimeout { get { if (!_interactiveUiTimeoutReady) { _interactiveUiTimeoutContent = SGetField<int>(LocalBridgeClazz, "interactiveUiTimeout"); _interactiveUiTimeoutReady = true; } return _interactiveUiTimeoutContent; } }
+            private static int _interactiveUiTimeoutContent = default;
+            private static bool _interactiveUiTimeoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#interpolator"/>
+            /// </summary>
+            public static int interpolatorField { get { if (!_interpolatorFieldReady) { _interpolatorFieldContent = SGetField<int>(LocalBridgeClazz, "interpolator"); _interpolatorFieldReady = true; } return _interpolatorFieldContent; } }
+            private static int _interpolatorFieldContent = default;
+            private static bool _interpolatorFieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#intro"/>
+            /// </summary>
+            public static int intro { get { if (!_introReady) { _introContent = SGetField<int>(LocalBridgeClazz, "intro"); _introReady = true; } return _introContent; } }
+            private static int _introContent = default;
+            private static bool _introReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isAccessibilityTool"/>
+            /// </summary>
+            public static int isAccessibilityTool { get { if (!_isAccessibilityToolReady) { _isAccessibilityToolContent = SGetField<int>(LocalBridgeClazz, "isAccessibilityTool"); _isAccessibilityToolReady = true; } return _isAccessibilityToolContent; } }
+            private static int _isAccessibilityToolContent = default;
+            private static bool _isAccessibilityToolReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isAlwaysSyncable"/>
+            /// </summary>
+            public static int isAlwaysSyncable { get { if (!_isAlwaysSyncableReady) { _isAlwaysSyncableContent = SGetField<int>(LocalBridgeClazz, "isAlwaysSyncable"); _isAlwaysSyncableReady = true; } return _isAlwaysSyncableContent; } }
+            private static int _isAlwaysSyncableContent = default;
+            private static bool _isAlwaysSyncableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isAsciiCapable"/>
+            /// </summary>
+            public static int isAsciiCapable { get { if (!_isAsciiCapableReady) { _isAsciiCapableContent = SGetField<int>(LocalBridgeClazz, "isAsciiCapable"); _isAsciiCapableReady = true; } return _isAsciiCapableContent; } }
+            private static int _isAsciiCapableContent = default;
+            private static bool _isAsciiCapableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isAuxiliary"/>
+            /// </summary>
+            public static int isAuxiliary { get { if (!_isAuxiliaryReady) { _isAuxiliaryContent = SGetField<int>(LocalBridgeClazz, "isAuxiliary"); _isAuxiliaryReady = true; } return _isAuxiliaryContent; } }
+            private static int _isAuxiliaryContent = default;
+            private static bool _isAuxiliaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isCredential"/>
+            /// </summary>
+            public static int isCredential { get { if (!_isCredentialReady) { _isCredentialContent = SGetField<int>(LocalBridgeClazz, "isCredential"); _isCredentialReady = true; } return _isCredentialContent; } }
+            private static int _isCredentialContent = default;
+            private static bool _isCredentialReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isDefault"/>
+            /// </summary>
+            public static int isDefault { get { if (!_isDefaultReady) { _isDefaultContent = SGetField<int>(LocalBridgeClazz, "isDefault"); _isDefaultReady = true; } return _isDefaultContent; } }
+            private static int _isDefaultContent = default;
+            private static bool _isDefaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isFeatureSplit"/>
+            /// </summary>
+            public static int isFeatureSplit { get { if (!_isFeatureSplitReady) { _isFeatureSplitContent = SGetField<int>(LocalBridgeClazz, "isFeatureSplit"); _isFeatureSplitReady = true; } return _isFeatureSplitContent; } }
+            private static int _isFeatureSplitContent = default;
+            private static bool _isFeatureSplitReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isGame"/>
+            /// </summary>
+            public static int isGame { get { if (!_isGameReady) { _isGameContent = SGetField<int>(LocalBridgeClazz, "isGame"); _isGameReady = true; } return _isGameContent; } }
+            private static int _isGameContent = default;
+            private static bool _isGameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isIndicator"/>
+            /// </summary>
+            public static int isIndicator { get { if (!_isIndicatorReady) { _isIndicatorContent = SGetField<int>(LocalBridgeClazz, "isIndicator"); _isIndicatorReady = true; } return _isIndicatorContent; } }
+            private static int _isIndicatorContent = default;
+            private static bool _isIndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isLightTheme"/>
+            /// </summary>
+            public static int isLightTheme { get { if (!_isLightThemeReady) { _isLightThemeContent = SGetField<int>(LocalBridgeClazz, "isLightTheme"); _isLightThemeReady = true; } return _isLightThemeContent; } }
+            private static int _isLightThemeContent = default;
+            private static bool _isLightThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isModifier"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int isModifier { get { if (!_isModifierReady) { _isModifierContent = SGetField<int>(LocalBridgeClazz, "isModifier"); _isModifierReady = true; } return _isModifierContent; } }
+            private static int _isModifierContent = default;
+            private static bool _isModifierReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isolatedProcess"/>
+            /// </summary>
+            public static int isolatedProcess { get { if (!_isolatedProcessReady) { _isolatedProcessContent = SGetField<int>(LocalBridgeClazz, "isolatedProcess"); _isolatedProcessReady = true; } return _isolatedProcessContent; } }
+            private static int _isolatedProcessContent = default;
+            private static bool _isolatedProcessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isolatedSplits"/>
+            /// </summary>
+            public static int isolatedSplits { get { if (!_isolatedSplitsReady) { _isolatedSplitsContent = SGetField<int>(LocalBridgeClazz, "isolatedSplits"); _isolatedSplitsReady = true; } return _isolatedSplitsContent; } }
+            private static int _isolatedSplitsContent = default;
+            private static bool _isolatedSplitsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isRepeatable"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int isRepeatable { get { if (!_isRepeatableReady) { _isRepeatableContent = SGetField<int>(LocalBridgeClazz, "isRepeatable"); _isRepeatableReady = true; } return _isRepeatableContent; } }
+            private static int _isRepeatableContent = default;
+            private static bool _isRepeatableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isScrollContainer"/>
+            /// </summary>
+            public static int isScrollContainer { get { if (!_isScrollContainerReady) { _isScrollContainerContent = SGetField<int>(LocalBridgeClazz, "isScrollContainer"); _isScrollContainerReady = true; } return _isScrollContainerContent; } }
+            private static int _isScrollContainerContent = default;
+            private static bool _isScrollContainerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isSplitRequired"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int isSplitRequired { get { if (!_isSplitRequiredReady) { _isSplitRequiredContent = SGetField<int>(LocalBridgeClazz, "isSplitRequired"); _isSplitRequiredReady = true; } return _isSplitRequiredContent; } }
+            private static int _isSplitRequiredContent = default;
+            private static bool _isSplitRequiredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isStatic"/>
+            /// </summary>
+            public static int isStatic { get { if (!_isStaticReady) { _isStaticContent = SGetField<int>(LocalBridgeClazz, "isStatic"); _isStaticReady = true; } return _isStaticContent; } }
+            private static int _isStaticContent = default;
+            private static bool _isStaticReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#isSticky"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int isSticky { get { if (!_isStickyReady) { _isStickyContent = SGetField<int>(LocalBridgeClazz, "isSticky"); _isStickyReady = true; } return _isStickyContent; } }
+            private static int _isStickyContent = default;
+            private static bool _isStickyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#itemBackground"/>
+            /// </summary>
+            public static int itemBackground { get { if (!_itemBackgroundReady) { _itemBackgroundContent = SGetField<int>(LocalBridgeClazz, "itemBackground"); _itemBackgroundReady = true; } return _itemBackgroundContent; } }
+            private static int _itemBackgroundContent = default;
+            private static bool _itemBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#itemIconDisabledAlpha"/>
+            /// </summary>
+            public static int itemIconDisabledAlpha { get { if (!_itemIconDisabledAlphaReady) { _itemIconDisabledAlphaContent = SGetField<int>(LocalBridgeClazz, "itemIconDisabledAlpha"); _itemIconDisabledAlphaReady = true; } return _itemIconDisabledAlphaContent; } }
+            private static int _itemIconDisabledAlphaContent = default;
+            private static bool _itemIconDisabledAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#itemPadding"/>
+            /// </summary>
+            public static int itemPadding { get { if (!_itemPaddingReady) { _itemPaddingContent = SGetField<int>(LocalBridgeClazz, "itemPadding"); _itemPaddingReady = true; } return _itemPaddingContent; } }
+            private static int _itemPaddingContent = default;
+            private static bool _itemPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#itemTextAppearance"/>
+            /// </summary>
+            public static int itemTextAppearance { get { if (!_itemTextAppearanceReady) { _itemTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "itemTextAppearance"); _itemTextAppearanceReady = true; } return _itemTextAppearanceContent; } }
+            private static int _itemTextAppearanceContent = default;
+            private static bool _itemTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#justificationMode"/>
+            /// </summary>
+            public static int justificationMode { get { if (!_justificationModeReady) { _justificationModeContent = SGetField<int>(LocalBridgeClazz, "justificationMode"); _justificationModeReady = true; } return _justificationModeContent; } }
+            private static int _justificationModeContent = default;
+            private static bool _justificationModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keepScreenOn"/>
+            /// </summary>
+            public static int keepScreenOn { get { if (!_keepScreenOnReady) { _keepScreenOnContent = SGetField<int>(LocalBridgeClazz, "keepScreenOn"); _keepScreenOnReady = true; } return _keepScreenOnContent; } }
+            private static int _keepScreenOnContent = default;
+            private static bool _keepScreenOnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#key"/>
+            /// </summary>
+            public static int key { get { if (!_keyReady) { _keyContent = SGetField<int>(LocalBridgeClazz, "key"); _keyReady = true; } return _keyContent; } }
+            private static int _keyContent = default;
+            private static bool _keyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyBackground"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyBackground { get { if (!_keyBackgroundReady) { _keyBackgroundContent = SGetField<int>(LocalBridgeClazz, "keyBackground"); _keyBackgroundReady = true; } return _keyBackgroundContent; } }
+            private static int _keyBackgroundContent = default;
+            private static bool _keyBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyboardLayout"/>
+            /// </summary>
+            public static int keyboardLayout { get { if (!_keyboardLayoutReady) { _keyboardLayoutContent = SGetField<int>(LocalBridgeClazz, "keyboardLayout"); _keyboardLayoutReady = true; } return _keyboardLayoutContent; } }
+            private static int _keyboardLayoutContent = default;
+            private static bool _keyboardLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyboardLayoutType"/>
+            /// </summary>
+            public static int keyboardLayoutType { get { if (!_keyboardLayoutTypeReady) { _keyboardLayoutTypeContent = SGetField<int>(LocalBridgeClazz, "keyboardLayoutType"); _keyboardLayoutTypeReady = true; } return _keyboardLayoutTypeContent; } }
+            private static int _keyboardLayoutTypeContent = default;
+            private static bool _keyboardLayoutTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyboardLocale"/>
+            /// </summary>
+            public static int keyboardLocale { get { if (!_keyboardLocaleReady) { _keyboardLocaleContent = SGetField<int>(LocalBridgeClazz, "keyboardLocale"); _keyboardLocaleReady = true; } return _keyboardLocaleContent; } }
+            private static int _keyboardLocaleContent = default;
+            private static bool _keyboardLocaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyboardMode"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyboardMode { get { if (!_keyboardModeReady) { _keyboardModeContent = SGetField<int>(LocalBridgeClazz, "keyboardMode"); _keyboardModeReady = true; } return _keyboardModeContent; } }
+            private static int _keyboardModeContent = default;
+            private static bool _keyboardModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyboardNavigationCluster"/>
+            /// </summary>
+            public static int keyboardNavigationCluster { get { if (!_keyboardNavigationClusterReady) { _keyboardNavigationClusterContent = SGetField<int>(LocalBridgeClazz, "keyboardNavigationCluster"); _keyboardNavigationClusterReady = true; } return _keyboardNavigationClusterContent; } }
+            private static int _keyboardNavigationClusterContent = default;
+            private static bool _keyboardNavigationClusterReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keycode"/>
+            /// </summary>
+            public static int keycode { get { if (!_keycodeReady) { _keycodeContent = SGetField<int>(LocalBridgeClazz, "keycode"); _keycodeReady = true; } return _keycodeContent; } }
+            private static int _keycodeContent = default;
+            private static bool _keycodeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyEdgeFlags"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyEdgeFlags { get { if (!_keyEdgeFlagsReady) { _keyEdgeFlagsContent = SGetField<int>(LocalBridgeClazz, "keyEdgeFlags"); _keyEdgeFlagsReady = true; } return _keyEdgeFlagsContent; } }
+            private static int _keyEdgeFlagsContent = default;
+            private static bool _keyEdgeFlagsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyHeight"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyHeight { get { if (!_keyHeightReady) { _keyHeightContent = SGetField<int>(LocalBridgeClazz, "keyHeight"); _keyHeightReady = true; } return _keyHeightContent; } }
+            private static int _keyHeightContent = default;
+            private static bool _keyHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyIcon"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyIcon { get { if (!_keyIconReady) { _keyIconContent = SGetField<int>(LocalBridgeClazz, "keyIcon"); _keyIconReady = true; } return _keyIconContent; } }
+            private static int _keyIconContent = default;
+            private static bool _keyIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyLabel"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyLabel { get { if (!_keyLabelReady) { _keyLabelContent = SGetField<int>(LocalBridgeClazz, "keyLabel"); _keyLabelReady = true; } return _keyLabelContent; } }
+            private static int _keyLabelContent = default;
+            private static bool _keyLabelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyOutputText"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyOutputText { get { if (!_keyOutputTextReady) { _keyOutputTextContent = SGetField<int>(LocalBridgeClazz, "keyOutputText"); _keyOutputTextReady = true; } return _keyOutputTextContent; } }
+            private static int _keyOutputTextContent = default;
+            private static bool _keyOutputTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyPreviewHeight"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyPreviewHeight { get { if (!_keyPreviewHeightReady) { _keyPreviewHeightContent = SGetField<int>(LocalBridgeClazz, "keyPreviewHeight"); _keyPreviewHeightReady = true; } return _keyPreviewHeightContent; } }
+            private static int _keyPreviewHeightContent = default;
+            private static bool _keyPreviewHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyPreviewLayout"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyPreviewLayout { get { if (!_keyPreviewLayoutReady) { _keyPreviewLayoutContent = SGetField<int>(LocalBridgeClazz, "keyPreviewLayout"); _keyPreviewLayoutReady = true; } return _keyPreviewLayoutContent; } }
+            private static int _keyPreviewLayoutContent = default;
+            private static bool _keyPreviewLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyPreviewOffset"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyPreviewOffset { get { if (!_keyPreviewOffsetReady) { _keyPreviewOffsetContent = SGetField<int>(LocalBridgeClazz, "keyPreviewOffset"); _keyPreviewOffsetReady = true; } return _keyPreviewOffsetContent; } }
+            private static int _keyPreviewOffsetContent = default;
+            private static bool _keyPreviewOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keySet"/>
+            /// </summary>
+            public static int keySet { get { if (!_keySetReady) { _keySetContent = SGetField<int>(LocalBridgeClazz, "keySet"); _keySetReady = true; } return _keySetContent; } }
+            private static int _keySetContent = default;
+            private static bool _keySetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyTextColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyTextColor { get { if (!_keyTextColorReady) { _keyTextColorContent = SGetField<int>(LocalBridgeClazz, "keyTextColor"); _keyTextColorReady = true; } return _keyTextColorContent; } }
+            private static int _keyTextColorContent = default;
+            private static bool _keyTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyTextSize"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyTextSize { get { if (!_keyTextSizeReady) { _keyTextSizeContent = SGetField<int>(LocalBridgeClazz, "keyTextSize"); _keyTextSizeReady = true; } return _keyTextSizeContent; } }
+            private static int _keyTextSizeContent = default;
+            private static bool _keyTextSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#keyWidth"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyWidth { get { if (!_keyWidthReady) { _keyWidthContent = SGetField<int>(LocalBridgeClazz, "keyWidth"); _keyWidthReady = true; } return _keyWidthContent; } }
+            private static int _keyWidthContent = default;
+            private static bool _keyWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#killAfterRestore"/>
+            /// </summary>
+            public static int killAfterRestore { get { if (!_killAfterRestoreReady) { _killAfterRestoreContent = SGetField<int>(LocalBridgeClazz, "killAfterRestore"); _killAfterRestoreReady = true; } return _killAfterRestoreContent; } }
+            private static int _killAfterRestoreContent = default;
+            private static bool _killAfterRestoreReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#knownActivityEmbeddingCerts"/>
+            /// </summary>
+            public static int knownActivityEmbeddingCerts { get { if (!_knownActivityEmbeddingCertsReady) { _knownActivityEmbeddingCertsContent = SGetField<int>(LocalBridgeClazz, "knownActivityEmbeddingCerts"); _knownActivityEmbeddingCertsReady = true; } return _knownActivityEmbeddingCertsContent; } }
+            private static int _knownActivityEmbeddingCertsContent = default;
+            private static bool _knownActivityEmbeddingCertsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#knownCerts"/>
+            /// </summary>
+            public static int knownCerts { get { if (!_knownCertsReady) { _knownCertsContent = SGetField<int>(LocalBridgeClazz, "knownCerts"); _knownCertsReady = true; } return _knownCertsContent; } }
+            private static int _knownCertsContent = default;
+            private static bool _knownCertsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#label"/>
+            /// </summary>
+            public static int label { get { if (!_labelReady) { _labelContent = SGetField<int>(LocalBridgeClazz, "label"); _labelReady = true; } return _labelContent; } }
+            private static int _labelContent = default;
+            private static bool _labelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#labelFor"/>
+            /// </summary>
+            public static int labelFor { get { if (!_labelForReady) { _labelForContent = SGetField<int>(LocalBridgeClazz, "labelFor"); _labelForReady = true; } return _labelForContent; } }
+            private static int _labelForContent = default;
+            private static bool _labelForReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#labelTextSize"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int labelTextSize { get { if (!_labelTextSizeReady) { _labelTextSizeContent = SGetField<int>(LocalBridgeClazz, "labelTextSize"); _labelTextSizeReady = true; } return _labelTextSizeContent; } }
+            private static int _labelTextSizeContent = default;
+            private static bool _labelTextSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#languageTag"/>
+            /// </summary>
+            public static int languageTag { get { if (!_languageTagReady) { _languageTagContent = SGetField<int>(LocalBridgeClazz, "languageTag"); _languageTagReady = true; } return _languageTagContent; } }
+            private static int _languageTagContent = default;
+            private static bool _languageTagReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#largeHeap"/>
+            /// </summary>
+            public static int largeHeap { get { if (!_largeHeapReady) { _largeHeapContent = SGetField<int>(LocalBridgeClazz, "largeHeap"); _largeHeapReady = true; } return _largeHeapContent; } }
+            private static int _largeHeapContent = default;
+            private static bool _largeHeapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#largeScreens"/>
+            /// </summary>
+            public static int largeScreens { get { if (!_largeScreensReady) { _largeScreensContent = SGetField<int>(LocalBridgeClazz, "largeScreens"); _largeScreensReady = true; } return _largeScreensContent; } }
+            private static int _largeScreensContent = default;
+            private static bool _largeScreensReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#largestWidthLimitDp"/>
+            /// </summary>
+            public static int largestWidthLimitDp { get { if (!_largestWidthLimitDpReady) { _largestWidthLimitDpContent = SGetField<int>(LocalBridgeClazz, "largestWidthLimitDp"); _largestWidthLimitDpReady = true; } return _largestWidthLimitDpContent; } }
+            private static int _largestWidthLimitDpContent = default;
+            private static bool _largestWidthLimitDpReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lastBaselineToBottomHeight"/>
+            /// </summary>
+            public static int lastBaselineToBottomHeight { get { if (!_lastBaselineToBottomHeightReady) { _lastBaselineToBottomHeightContent = SGetField<int>(LocalBridgeClazz, "lastBaselineToBottomHeight"); _lastBaselineToBottomHeightReady = true; } return _lastBaselineToBottomHeightContent; } }
+            private static int _lastBaselineToBottomHeightContent = default;
+            private static bool _lastBaselineToBottomHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#launchMode"/>
+            /// </summary>
+            public static int launchMode { get { if (!_launchModeReady) { _launchModeContent = SGetField<int>(LocalBridgeClazz, "launchMode"); _launchModeReady = true; } return _launchModeContent; } }
+            private static int _launchModeContent = default;
+            private static bool _launchModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#launchTaskBehindSourceAnimation"/>
+            /// </summary>
+            public static int launchTaskBehindSourceAnimation { get { if (!_launchTaskBehindSourceAnimationReady) { _launchTaskBehindSourceAnimationContent = SGetField<int>(LocalBridgeClazz, "launchTaskBehindSourceAnimation"); _launchTaskBehindSourceAnimationReady = true; } return _launchTaskBehindSourceAnimationContent; } }
+            private static int _launchTaskBehindSourceAnimationContent = default;
+            private static bool _launchTaskBehindSourceAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#launchTaskBehindTargetAnimation"/>
+            /// </summary>
+            public static int launchTaskBehindTargetAnimation { get { if (!_launchTaskBehindTargetAnimationReady) { _launchTaskBehindTargetAnimationContent = SGetField<int>(LocalBridgeClazz, "launchTaskBehindTargetAnimation"); _launchTaskBehindTargetAnimationReady = true; } return _launchTaskBehindTargetAnimationContent; } }
+            private static int _launchTaskBehindTargetAnimationContent = default;
+            private static bool _launchTaskBehindTargetAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layerType"/>
+            /// </summary>
+            public static int layerType { get { if (!_layerTypeReady) { _layerTypeContent = SGetField<int>(LocalBridgeClazz, "layerType"); _layerTypeReady = true; } return _layerTypeContent; } }
+            private static int _layerTypeContent = default;
+            private static bool _layerTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout"/>
+            /// </summary>
+            public static int layoutField { get { if (!_layoutFieldReady) { _layoutFieldContent = SGetField<int>(LocalBridgeClazz, "layout"); _layoutFieldReady = true; } return _layoutFieldContent; } }
+            private static int _layoutFieldContent = default;
+            private static bool _layoutFieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_above"/>
+            /// </summary>
+            public static int layout_above { get { if (!_layout_aboveReady) { _layout_aboveContent = SGetField<int>(LocalBridgeClazz, "layout_above"); _layout_aboveReady = true; } return _layout_aboveContent; } }
+            private static int _layout_aboveContent = default;
+            private static bool _layout_aboveReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignBaseline"/>
+            /// </summary>
+            public static int layout_alignBaseline { get { if (!_layout_alignBaselineReady) { _layout_alignBaselineContent = SGetField<int>(LocalBridgeClazz, "layout_alignBaseline"); _layout_alignBaselineReady = true; } return _layout_alignBaselineContent; } }
+            private static int _layout_alignBaselineContent = default;
+            private static bool _layout_alignBaselineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignBottom"/>
+            /// </summary>
+            public static int layout_alignBottom { get { if (!_layout_alignBottomReady) { _layout_alignBottomContent = SGetField<int>(LocalBridgeClazz, "layout_alignBottom"); _layout_alignBottomReady = true; } return _layout_alignBottomContent; } }
+            private static int _layout_alignBottomContent = default;
+            private static bool _layout_alignBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignEnd"/>
+            /// </summary>
+            public static int layout_alignEnd { get { if (!_layout_alignEndReady) { _layout_alignEndContent = SGetField<int>(LocalBridgeClazz, "layout_alignEnd"); _layout_alignEndReady = true; } return _layout_alignEndContent; } }
+            private static int _layout_alignEndContent = default;
+            private static bool _layout_alignEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignLeft"/>
+            /// </summary>
+            public static int layout_alignLeft { get { if (!_layout_alignLeftReady) { _layout_alignLeftContent = SGetField<int>(LocalBridgeClazz, "layout_alignLeft"); _layout_alignLeftReady = true; } return _layout_alignLeftContent; } }
+            private static int _layout_alignLeftContent = default;
+            private static bool _layout_alignLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignParentBottom"/>
+            /// </summary>
+            public static int layout_alignParentBottom { get { if (!_layout_alignParentBottomReady) { _layout_alignParentBottomContent = SGetField<int>(LocalBridgeClazz, "layout_alignParentBottom"); _layout_alignParentBottomReady = true; } return _layout_alignParentBottomContent; } }
+            private static int _layout_alignParentBottomContent = default;
+            private static bool _layout_alignParentBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignParentEnd"/>
+            /// </summary>
+            public static int layout_alignParentEnd { get { if (!_layout_alignParentEndReady) { _layout_alignParentEndContent = SGetField<int>(LocalBridgeClazz, "layout_alignParentEnd"); _layout_alignParentEndReady = true; } return _layout_alignParentEndContent; } }
+            private static int _layout_alignParentEndContent = default;
+            private static bool _layout_alignParentEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignParentLeft"/>
+            /// </summary>
+            public static int layout_alignParentLeft { get { if (!_layout_alignParentLeftReady) { _layout_alignParentLeftContent = SGetField<int>(LocalBridgeClazz, "layout_alignParentLeft"); _layout_alignParentLeftReady = true; } return _layout_alignParentLeftContent; } }
+            private static int _layout_alignParentLeftContent = default;
+            private static bool _layout_alignParentLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignParentRight"/>
+            /// </summary>
+            public static int layout_alignParentRight { get { if (!_layout_alignParentRightReady) { _layout_alignParentRightContent = SGetField<int>(LocalBridgeClazz, "layout_alignParentRight"); _layout_alignParentRightReady = true; } return _layout_alignParentRightContent; } }
+            private static int _layout_alignParentRightContent = default;
+            private static bool _layout_alignParentRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignParentStart"/>
+            /// </summary>
+            public static int layout_alignParentStart { get { if (!_layout_alignParentStartReady) { _layout_alignParentStartContent = SGetField<int>(LocalBridgeClazz, "layout_alignParentStart"); _layout_alignParentStartReady = true; } return _layout_alignParentStartContent; } }
+            private static int _layout_alignParentStartContent = default;
+            private static bool _layout_alignParentStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignParentTop"/>
+            /// </summary>
+            public static int layout_alignParentTop { get { if (!_layout_alignParentTopReady) { _layout_alignParentTopContent = SGetField<int>(LocalBridgeClazz, "layout_alignParentTop"); _layout_alignParentTopReady = true; } return _layout_alignParentTopContent; } }
+            private static int _layout_alignParentTopContent = default;
+            private static bool _layout_alignParentTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignRight"/>
+            /// </summary>
+            public static int layout_alignRight { get { if (!_layout_alignRightReady) { _layout_alignRightContent = SGetField<int>(LocalBridgeClazz, "layout_alignRight"); _layout_alignRightReady = true; } return _layout_alignRightContent; } }
+            private static int _layout_alignRightContent = default;
+            private static bool _layout_alignRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignStart"/>
+            /// </summary>
+            public static int layout_alignStart { get { if (!_layout_alignStartReady) { _layout_alignStartContent = SGetField<int>(LocalBridgeClazz, "layout_alignStart"); _layout_alignStartReady = true; } return _layout_alignStartContent; } }
+            private static int _layout_alignStartContent = default;
+            private static bool _layout_alignStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignTop"/>
+            /// </summary>
+            public static int layout_alignTop { get { if (!_layout_alignTopReady) { _layout_alignTopContent = SGetField<int>(LocalBridgeClazz, "layout_alignTop"); _layout_alignTopReady = true; } return _layout_alignTopContent; } }
+            private static int _layout_alignTopContent = default;
+            private static bool _layout_alignTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_alignWithParentIfMissing"/>
+            /// </summary>
+            public static int layout_alignWithParentIfMissing { get { if (!_layout_alignWithParentIfMissingReady) { _layout_alignWithParentIfMissingContent = SGetField<int>(LocalBridgeClazz, "layout_alignWithParentIfMissing"); _layout_alignWithParentIfMissingReady = true; } return _layout_alignWithParentIfMissingContent; } }
+            private static int _layout_alignWithParentIfMissingContent = default;
+            private static bool _layout_alignWithParentIfMissingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_below"/>
+            /// </summary>
+            public static int layout_below { get { if (!_layout_belowReady) { _layout_belowContent = SGetField<int>(LocalBridgeClazz, "layout_below"); _layout_belowReady = true; } return _layout_belowContent; } }
+            private static int _layout_belowContent = default;
+            private static bool _layout_belowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_centerHorizontal"/>
+            /// </summary>
+            public static int layout_centerHorizontal { get { if (!_layout_centerHorizontalReady) { _layout_centerHorizontalContent = SGetField<int>(LocalBridgeClazz, "layout_centerHorizontal"); _layout_centerHorizontalReady = true; } return _layout_centerHorizontalContent; } }
+            private static int _layout_centerHorizontalContent = default;
+            private static bool _layout_centerHorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_centerInParent"/>
+            /// </summary>
+            public static int layout_centerInParent { get { if (!_layout_centerInParentReady) { _layout_centerInParentContent = SGetField<int>(LocalBridgeClazz, "layout_centerInParent"); _layout_centerInParentReady = true; } return _layout_centerInParentContent; } }
+            private static int _layout_centerInParentContent = default;
+            private static bool _layout_centerInParentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_centerVertical"/>
+            /// </summary>
+            public static int layout_centerVertical { get { if (!_layout_centerVerticalReady) { _layout_centerVerticalContent = SGetField<int>(LocalBridgeClazz, "layout_centerVertical"); _layout_centerVerticalReady = true; } return _layout_centerVerticalContent; } }
+            private static int _layout_centerVerticalContent = default;
+            private static bool _layout_centerVerticalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_column"/>
+            /// </summary>
+            public static int layout_column { get { if (!_layout_columnReady) { _layout_columnContent = SGetField<int>(LocalBridgeClazz, "layout_column"); _layout_columnReady = true; } return _layout_columnContent; } }
+            private static int _layout_columnContent = default;
+            private static bool _layout_columnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_columnSpan"/>
+            /// </summary>
+            public static int layout_columnSpan { get { if (!_layout_columnSpanReady) { _layout_columnSpanContent = SGetField<int>(LocalBridgeClazz, "layout_columnSpan"); _layout_columnSpanReady = true; } return _layout_columnSpanContent; } }
+            private static int _layout_columnSpanContent = default;
+            private static bool _layout_columnSpanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_columnWeight"/>
+            /// </summary>
+            public static int layout_columnWeight { get { if (!_layout_columnWeightReady) { _layout_columnWeightContent = SGetField<int>(LocalBridgeClazz, "layout_columnWeight"); _layout_columnWeightReady = true; } return _layout_columnWeightContent; } }
+            private static int _layout_columnWeightContent = default;
+            private static bool _layout_columnWeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_gravity"/>
+            /// </summary>
+            public static int layout_gravity { get { if (!_layout_gravityReady) { _layout_gravityContent = SGetField<int>(LocalBridgeClazz, "layout_gravity"); _layout_gravityReady = true; } return _layout_gravityContent; } }
+            private static int _layout_gravityContent = default;
+            private static bool _layout_gravityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_height"/>
+            /// </summary>
+            public static int layout_height { get { if (!_layout_heightReady) { _layout_heightContent = SGetField<int>(LocalBridgeClazz, "layout_height"); _layout_heightReady = true; } return _layout_heightContent; } }
+            private static int _layout_heightContent = default;
+            private static bool _layout_heightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_margin"/>
+            /// </summary>
+            public static int layout_margin { get { if (!_layout_marginReady) { _layout_marginContent = SGetField<int>(LocalBridgeClazz, "layout_margin"); _layout_marginReady = true; } return _layout_marginContent; } }
+            private static int _layout_marginContent = default;
+            private static bool _layout_marginReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_marginBottom"/>
+            /// </summary>
+            public static int layout_marginBottom { get { if (!_layout_marginBottomReady) { _layout_marginBottomContent = SGetField<int>(LocalBridgeClazz, "layout_marginBottom"); _layout_marginBottomReady = true; } return _layout_marginBottomContent; } }
+            private static int _layout_marginBottomContent = default;
+            private static bool _layout_marginBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_marginEnd"/>
+            /// </summary>
+            public static int layout_marginEnd { get { if (!_layout_marginEndReady) { _layout_marginEndContent = SGetField<int>(LocalBridgeClazz, "layout_marginEnd"); _layout_marginEndReady = true; } return _layout_marginEndContent; } }
+            private static int _layout_marginEndContent = default;
+            private static bool _layout_marginEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_marginHorizontal"/>
+            /// </summary>
+            public static int layout_marginHorizontal { get { if (!_layout_marginHorizontalReady) { _layout_marginHorizontalContent = SGetField<int>(LocalBridgeClazz, "layout_marginHorizontal"); _layout_marginHorizontalReady = true; } return _layout_marginHorizontalContent; } }
+            private static int _layout_marginHorizontalContent = default;
+            private static bool _layout_marginHorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_marginLeft"/>
+            /// </summary>
+            public static int layout_marginLeft { get { if (!_layout_marginLeftReady) { _layout_marginLeftContent = SGetField<int>(LocalBridgeClazz, "layout_marginLeft"); _layout_marginLeftReady = true; } return _layout_marginLeftContent; } }
+            private static int _layout_marginLeftContent = default;
+            private static bool _layout_marginLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_marginRight"/>
+            /// </summary>
+            public static int layout_marginRight { get { if (!_layout_marginRightReady) { _layout_marginRightContent = SGetField<int>(LocalBridgeClazz, "layout_marginRight"); _layout_marginRightReady = true; } return _layout_marginRightContent; } }
+            private static int _layout_marginRightContent = default;
+            private static bool _layout_marginRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_marginStart"/>
+            /// </summary>
+            public static int layout_marginStart { get { if (!_layout_marginStartReady) { _layout_marginStartContent = SGetField<int>(LocalBridgeClazz, "layout_marginStart"); _layout_marginStartReady = true; } return _layout_marginStartContent; } }
+            private static int _layout_marginStartContent = default;
+            private static bool _layout_marginStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_marginTop"/>
+            /// </summary>
+            public static int layout_marginTop { get { if (!_layout_marginTopReady) { _layout_marginTopContent = SGetField<int>(LocalBridgeClazz, "layout_marginTop"); _layout_marginTopReady = true; } return _layout_marginTopContent; } }
+            private static int _layout_marginTopContent = default;
+            private static bool _layout_marginTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_marginVertical"/>
+            /// </summary>
+            public static int layout_marginVertical { get { if (!_layout_marginVerticalReady) { _layout_marginVerticalContent = SGetField<int>(LocalBridgeClazz, "layout_marginVertical"); _layout_marginVerticalReady = true; } return _layout_marginVerticalContent; } }
+            private static int _layout_marginVerticalContent = default;
+            private static bool _layout_marginVerticalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_row"/>
+            /// </summary>
+            public static int layout_row { get { if (!_layout_rowReady) { _layout_rowContent = SGetField<int>(LocalBridgeClazz, "layout_row"); _layout_rowReady = true; } return _layout_rowContent; } }
+            private static int _layout_rowContent = default;
+            private static bool _layout_rowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_rowSpan"/>
+            /// </summary>
+            public static int layout_rowSpan { get { if (!_layout_rowSpanReady) { _layout_rowSpanContent = SGetField<int>(LocalBridgeClazz, "layout_rowSpan"); _layout_rowSpanReady = true; } return _layout_rowSpanContent; } }
+            private static int _layout_rowSpanContent = default;
+            private static bool _layout_rowSpanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_rowWeight"/>
+            /// </summary>
+            public static int layout_rowWeight { get { if (!_layout_rowWeightReady) { _layout_rowWeightContent = SGetField<int>(LocalBridgeClazz, "layout_rowWeight"); _layout_rowWeightReady = true; } return _layout_rowWeightContent; } }
+            private static int _layout_rowWeightContent = default;
+            private static bool _layout_rowWeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_scale"/>
+            /// </summary>
+            public static int layout_scale { get { if (!_layout_scaleReady) { _layout_scaleContent = SGetField<int>(LocalBridgeClazz, "layout_scale"); _layout_scaleReady = true; } return _layout_scaleContent; } }
+            private static int _layout_scaleContent = default;
+            private static bool _layout_scaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_span"/>
+            /// </summary>
+            public static int layout_span { get { if (!_layout_spanReady) { _layout_spanContent = SGetField<int>(LocalBridgeClazz, "layout_span"); _layout_spanReady = true; } return _layout_spanContent; } }
+            private static int _layout_spanContent = default;
+            private static bool _layout_spanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_toEndOf"/>
+            /// </summary>
+            public static int layout_toEndOf { get { if (!_layout_toEndOfReady) { _layout_toEndOfContent = SGetField<int>(LocalBridgeClazz, "layout_toEndOf"); _layout_toEndOfReady = true; } return _layout_toEndOfContent; } }
+            private static int _layout_toEndOfContent = default;
+            private static bool _layout_toEndOfReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_toLeftOf"/>
+            /// </summary>
+            public static int layout_toLeftOf { get { if (!_layout_toLeftOfReady) { _layout_toLeftOfContent = SGetField<int>(LocalBridgeClazz, "layout_toLeftOf"); _layout_toLeftOfReady = true; } return _layout_toLeftOfContent; } }
+            private static int _layout_toLeftOfContent = default;
+            private static bool _layout_toLeftOfReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_toRightOf"/>
+            /// </summary>
+            public static int layout_toRightOf { get { if (!_layout_toRightOfReady) { _layout_toRightOfContent = SGetField<int>(LocalBridgeClazz, "layout_toRightOf"); _layout_toRightOfReady = true; } return _layout_toRightOfContent; } }
+            private static int _layout_toRightOfContent = default;
+            private static bool _layout_toRightOfReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_toStartOf"/>
+            /// </summary>
+            public static int layout_toStartOf { get { if (!_layout_toStartOfReady) { _layout_toStartOfContent = SGetField<int>(LocalBridgeClazz, "layout_toStartOf"); _layout_toStartOfReady = true; } return _layout_toStartOfContent; } }
+            private static int _layout_toStartOfContent = default;
+            private static bool _layout_toStartOfReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_weight"/>
+            /// </summary>
+            public static int layout_weight { get { if (!_layout_weightReady) { _layout_weightContent = SGetField<int>(LocalBridgeClazz, "layout_weight"); _layout_weightReady = true; } return _layout_weightContent; } }
+            private static int _layout_weightContent = default;
+            private static bool _layout_weightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_width"/>
+            /// </summary>
+            public static int layout_width { get { if (!_layout_widthReady) { _layout_widthContent = SGetField<int>(LocalBridgeClazz, "layout_width"); _layout_widthReady = true; } return _layout_widthContent; } }
+            private static int _layout_widthContent = default;
+            private static bool _layout_widthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_x"/>
+            /// </summary>
+            public static int layout_x { get { if (!_layout_xReady) { _layout_xContent = SGetField<int>(LocalBridgeClazz, "layout_x"); _layout_xReady = true; } return _layout_xContent; } }
+            private static int _layout_xContent = default;
+            private static bool _layout_xReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layout_y"/>
+            /// </summary>
+            public static int layout_y { get { if (!_layout_yReady) { _layout_yContent = SGetField<int>(LocalBridgeClazz, "layout_y"); _layout_yReady = true; } return _layout_yContent; } }
+            private static int _layout_yContent = default;
+            private static bool _layout_yReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layoutAnimation"/>
+            /// </summary>
+            public static int layoutAnimation { get { if (!_layoutAnimationReady) { _layoutAnimationContent = SGetField<int>(LocalBridgeClazz, "layoutAnimation"); _layoutAnimationReady = true; } return _layoutAnimationContent; } }
+            private static int _layoutAnimationContent = default;
+            private static bool _layoutAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layoutDirection"/>
+            /// </summary>
+            public static int layoutDirection { get { if (!_layoutDirectionReady) { _layoutDirectionContent = SGetField<int>(LocalBridgeClazz, "layoutDirection"); _layoutDirectionReady = true; } return _layoutDirectionContent; } }
+            private static int _layoutDirectionContent = default;
+            private static bool _layoutDirectionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#layoutMode"/>
+            /// </summary>
+            public static int layoutMode { get { if (!_layoutModeReady) { _layoutModeContent = SGetField<int>(LocalBridgeClazz, "layoutMode"); _layoutModeReady = true; } return _layoutModeContent; } }
+            private static int _layoutModeContent = default;
+            private static bool _layoutModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#left"/>
+            /// </summary>
+            public static int left { get { if (!_leftReady) { _leftContent = SGetField<int>(LocalBridgeClazz, "left"); _leftReady = true; } return _leftContent; } }
+            private static int _leftContent = default;
+            private static bool _leftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#letterSpacing"/>
+            /// </summary>
+            public static int letterSpacing { get { if (!_letterSpacingReady) { _letterSpacingContent = SGetField<int>(LocalBridgeClazz, "letterSpacing"); _letterSpacingReady = true; } return _letterSpacingContent; } }
+            private static int _letterSpacingContent = default;
+            private static bool _letterSpacingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#level"/>
+            /// </summary>
+            public static int level { get { if (!_levelReady) { _levelContent = SGetField<int>(LocalBridgeClazz, "level"); _levelReady = true; } return _levelContent; } }
+            private static int _levelContent = default;
+            private static bool _levelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lineBreakStyle"/>
+            /// </summary>
+            public static int lineBreakStyle { get { if (!_lineBreakStyleReady) { _lineBreakStyleContent = SGetField<int>(LocalBridgeClazz, "lineBreakStyle"); _lineBreakStyleReady = true; } return _lineBreakStyleContent; } }
+            private static int _lineBreakStyleContent = default;
+            private static bool _lineBreakStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lineBreakWordStyle"/>
+            /// </summary>
+            public static int lineBreakWordStyle { get { if (!_lineBreakWordStyleReady) { _lineBreakWordStyleContent = SGetField<int>(LocalBridgeClazz, "lineBreakWordStyle"); _lineBreakWordStyleReady = true; } return _lineBreakWordStyleContent; } }
+            private static int _lineBreakWordStyleContent = default;
+            private static bool _lineBreakWordStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lineHeight"/>
+            /// </summary>
+            public static int lineHeight { get { if (!_lineHeightReady) { _lineHeightContent = SGetField<int>(LocalBridgeClazz, "lineHeight"); _lineHeightReady = true; } return _lineHeightContent; } }
+            private static int _lineHeightContent = default;
+            private static bool _lineHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lines"/>
+            /// </summary>
+            public static int lines { get { if (!_linesReady) { _linesContent = SGetField<int>(LocalBridgeClazz, "lines"); _linesReady = true; } return _linesContent; } }
+            private static int _linesContent = default;
+            private static bool _linesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lineSpacingExtra"/>
+            /// </summary>
+            public static int lineSpacingExtra { get { if (!_lineSpacingExtraReady) { _lineSpacingExtraContent = SGetField<int>(LocalBridgeClazz, "lineSpacingExtra"); _lineSpacingExtraReady = true; } return _lineSpacingExtraContent; } }
+            private static int _lineSpacingExtraContent = default;
+            private static bool _lineSpacingExtraReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lineSpacingMultiplier"/>
+            /// </summary>
+            public static int lineSpacingMultiplier { get { if (!_lineSpacingMultiplierReady) { _lineSpacingMultiplierContent = SGetField<int>(LocalBridgeClazz, "lineSpacingMultiplier"); _lineSpacingMultiplierReady = true; } return _lineSpacingMultiplierContent; } }
+            private static int _lineSpacingMultiplierContent = default;
+            private static bool _lineSpacingMultiplierReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#linksClickable"/>
+            /// </summary>
+            public static int linksClickable { get { if (!_linksClickableReady) { _linksClickableContent = SGetField<int>(LocalBridgeClazz, "linksClickable"); _linksClickableReady = true; } return _linksClickableContent; } }
+            private static int _linksClickableContent = default;
+            private static bool _linksClickableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listChoiceBackgroundIndicator"/>
+            /// </summary>
+            public static int listChoiceBackgroundIndicator { get { if (!_listChoiceBackgroundIndicatorReady) { _listChoiceBackgroundIndicatorContent = SGetField<int>(LocalBridgeClazz, "listChoiceBackgroundIndicator"); _listChoiceBackgroundIndicatorReady = true; } return _listChoiceBackgroundIndicatorContent; } }
+            private static int _listChoiceBackgroundIndicatorContent = default;
+            private static bool _listChoiceBackgroundIndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listChoiceIndicatorMultiple"/>
+            /// </summary>
+            public static int listChoiceIndicatorMultiple { get { if (!_listChoiceIndicatorMultipleReady) { _listChoiceIndicatorMultipleContent = SGetField<int>(LocalBridgeClazz, "listChoiceIndicatorMultiple"); _listChoiceIndicatorMultipleReady = true; } return _listChoiceIndicatorMultipleContent; } }
+            private static int _listChoiceIndicatorMultipleContent = default;
+            private static bool _listChoiceIndicatorMultipleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listChoiceIndicatorSingle"/>
+            /// </summary>
+            public static int listChoiceIndicatorSingle { get { if (!_listChoiceIndicatorSingleReady) { _listChoiceIndicatorSingleContent = SGetField<int>(LocalBridgeClazz, "listChoiceIndicatorSingle"); _listChoiceIndicatorSingleReady = true; } return _listChoiceIndicatorSingleContent; } }
+            private static int _listChoiceIndicatorSingleContent = default;
+            private static bool _listChoiceIndicatorSingleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listDivider"/>
+            /// </summary>
+            public static int listDivider { get { if (!_listDividerReady) { _listDividerContent = SGetField<int>(LocalBridgeClazz, "listDivider"); _listDividerReady = true; } return _listDividerContent; } }
+            private static int _listDividerContent = default;
+            private static bool _listDividerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listDividerAlertDialog"/>
+            /// </summary>
+            public static int listDividerAlertDialog { get { if (!_listDividerAlertDialogReady) { _listDividerAlertDialogContent = SGetField<int>(LocalBridgeClazz, "listDividerAlertDialog"); _listDividerAlertDialogReady = true; } return _listDividerAlertDialogContent; } }
+            private static int _listDividerAlertDialogContent = default;
+            private static bool _listDividerAlertDialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listMenuViewStyle"/>
+            /// </summary>
+            public static int listMenuViewStyle { get { if (!_listMenuViewStyleReady) { _listMenuViewStyleContent = SGetField<int>(LocalBridgeClazz, "listMenuViewStyle"); _listMenuViewStyleReady = true; } return _listMenuViewStyleContent; } }
+            private static int _listMenuViewStyleContent = default;
+            private static bool _listMenuViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listPopupWindowStyle"/>
+            /// </summary>
+            public static int listPopupWindowStyle { get { if (!_listPopupWindowStyleReady) { _listPopupWindowStyleContent = SGetField<int>(LocalBridgeClazz, "listPopupWindowStyle"); _listPopupWindowStyleReady = true; } return _listPopupWindowStyleContent; } }
+            private static int _listPopupWindowStyleContent = default;
+            private static bool _listPopupWindowStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listPreferredItemHeight"/>
+            /// </summary>
+            public static int listPreferredItemHeight { get { if (!_listPreferredItemHeightReady) { _listPreferredItemHeightContent = SGetField<int>(LocalBridgeClazz, "listPreferredItemHeight"); _listPreferredItemHeightReady = true; } return _listPreferredItemHeightContent; } }
+            private static int _listPreferredItemHeightContent = default;
+            private static bool _listPreferredItemHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listPreferredItemHeightLarge"/>
+            /// </summary>
+            public static int listPreferredItemHeightLarge { get { if (!_listPreferredItemHeightLargeReady) { _listPreferredItemHeightLargeContent = SGetField<int>(LocalBridgeClazz, "listPreferredItemHeightLarge"); _listPreferredItemHeightLargeReady = true; } return _listPreferredItemHeightLargeContent; } }
+            private static int _listPreferredItemHeightLargeContent = default;
+            private static bool _listPreferredItemHeightLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listPreferredItemHeightSmall"/>
+            /// </summary>
+            public static int listPreferredItemHeightSmall { get { if (!_listPreferredItemHeightSmallReady) { _listPreferredItemHeightSmallContent = SGetField<int>(LocalBridgeClazz, "listPreferredItemHeightSmall"); _listPreferredItemHeightSmallReady = true; } return _listPreferredItemHeightSmallContent; } }
+            private static int _listPreferredItemHeightSmallContent = default;
+            private static bool _listPreferredItemHeightSmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listPreferredItemPaddingEnd"/>
+            /// </summary>
+            public static int listPreferredItemPaddingEnd { get { if (!_listPreferredItemPaddingEndReady) { _listPreferredItemPaddingEndContent = SGetField<int>(LocalBridgeClazz, "listPreferredItemPaddingEnd"); _listPreferredItemPaddingEndReady = true; } return _listPreferredItemPaddingEndContent; } }
+            private static int _listPreferredItemPaddingEndContent = default;
+            private static bool _listPreferredItemPaddingEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listPreferredItemPaddingLeft"/>
+            /// </summary>
+            public static int listPreferredItemPaddingLeft { get { if (!_listPreferredItemPaddingLeftReady) { _listPreferredItemPaddingLeftContent = SGetField<int>(LocalBridgeClazz, "listPreferredItemPaddingLeft"); _listPreferredItemPaddingLeftReady = true; } return _listPreferredItemPaddingLeftContent; } }
+            private static int _listPreferredItemPaddingLeftContent = default;
+            private static bool _listPreferredItemPaddingLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listPreferredItemPaddingRight"/>
+            /// </summary>
+            public static int listPreferredItemPaddingRight { get { if (!_listPreferredItemPaddingRightReady) { _listPreferredItemPaddingRightContent = SGetField<int>(LocalBridgeClazz, "listPreferredItemPaddingRight"); _listPreferredItemPaddingRightReady = true; } return _listPreferredItemPaddingRightContent; } }
+            private static int _listPreferredItemPaddingRightContent = default;
+            private static bool _listPreferredItemPaddingRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listPreferredItemPaddingStart"/>
+            /// </summary>
+            public static int listPreferredItemPaddingStart { get { if (!_listPreferredItemPaddingStartReady) { _listPreferredItemPaddingStartContent = SGetField<int>(LocalBridgeClazz, "listPreferredItemPaddingStart"); _listPreferredItemPaddingStartReady = true; } return _listPreferredItemPaddingStartContent; } }
+            private static int _listPreferredItemPaddingStartContent = default;
+            private static bool _listPreferredItemPaddingStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listSelector"/>
+            /// </summary>
+            public static int listSelector { get { if (!_listSelectorReady) { _listSelectorContent = SGetField<int>(LocalBridgeClazz, "listSelector"); _listSelectorReady = true; } return _listSelectorContent; } }
+            private static int _listSelectorContent = default;
+            private static bool _listSelectorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listSeparatorTextViewStyle"/>
+            /// </summary>
+            public static int listSeparatorTextViewStyle { get { if (!_listSeparatorTextViewStyleReady) { _listSeparatorTextViewStyleContent = SGetField<int>(LocalBridgeClazz, "listSeparatorTextViewStyle"); _listSeparatorTextViewStyleReady = true; } return _listSeparatorTextViewStyleContent; } }
+            private static int _listSeparatorTextViewStyleContent = default;
+            private static bool _listSeparatorTextViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listViewStyle"/>
+            /// </summary>
+            public static int listViewStyle { get { if (!_listViewStyleReady) { _listViewStyleContent = SGetField<int>(LocalBridgeClazz, "listViewStyle"); _listViewStyleReady = true; } return _listViewStyleContent; } }
+            private static int _listViewStyleContent = default;
+            private static bool _listViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#listViewWhiteStyle"/>
+            /// </summary>
+            public static int listViewWhiteStyle { get { if (!_listViewWhiteStyleReady) { _listViewWhiteStyleContent = SGetField<int>(LocalBridgeClazz, "listViewWhiteStyle"); _listViewWhiteStyleReady = true; } return _listViewWhiteStyleContent; } }
+            private static int _listViewWhiteStyleContent = default;
+            private static bool _listViewWhiteStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#localeConfig"/>
+            /// </summary>
+            public static int localeConfig { get { if (!_localeConfigReady) { _localeConfigContent = SGetField<int>(LocalBridgeClazz, "localeConfig"); _localeConfigReady = true; } return _localeConfigContent; } }
+            private static int _localeConfigContent = default;
+            private static bool _localeConfigReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lockTaskMode"/>
+            /// </summary>
+            public static int lockTaskMode { get { if (!_lockTaskModeReady) { _lockTaskModeContent = SGetField<int>(LocalBridgeClazz, "lockTaskMode"); _lockTaskModeReady = true; } return _lockTaskModeContent; } }
+            private static int _lockTaskModeContent = default;
+            private static bool _lockTaskModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#logo"/>
+            /// </summary>
+            public static int logo { get { if (!_logoReady) { _logoContent = SGetField<int>(LocalBridgeClazz, "logo"); _logoReady = true; } return _logoContent; } }
+            private static int _logoContent = default;
+            private static bool _logoReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#logoDescription"/>
+            /// </summary>
+            public static int logoDescription { get { if (!_logoDescriptionReady) { _logoDescriptionContent = SGetField<int>(LocalBridgeClazz, "logoDescription"); _logoDescriptionReady = true; } return _logoDescriptionContent; } }
+            private static int _logoDescriptionContent = default;
+            private static bool _logoDescriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#longClickable"/>
+            /// </summary>
+            public static int longClickable { get { if (!_longClickableReady) { _longClickableContent = SGetField<int>(LocalBridgeClazz, "longClickable"); _longClickableReady = true; } return _longClickableContent; } }
+            private static int _longClickableContent = default;
+            private static bool _longClickableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#loopViews"/>
+            /// </summary>
+            public static int loopViews { get { if (!_loopViewsReady) { _loopViewsContent = SGetField<int>(LocalBridgeClazz, "loopViews"); _loopViewsReady = true; } return _loopViewsContent; } }
+            private static int _loopViewsContent = default;
+            private static bool _loopViewsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#lStar"/>
+            /// </summary>
+            public static int lStar { get { if (!_lStarReady) { _lStarContent = SGetField<int>(LocalBridgeClazz, "lStar"); _lStarReady = true; } return _lStarContent; } }
+            private static int _lStarContent = default;
+            private static bool _lStarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#manageSpaceActivity"/>
+            /// </summary>
+            public static int manageSpaceActivity { get { if (!_manageSpaceActivityReady) { _manageSpaceActivityContent = SGetField<int>(LocalBridgeClazz, "manageSpaceActivity"); _manageSpaceActivityReady = true; } return _manageSpaceActivityContent; } }
+            private static int _manageSpaceActivityContent = default;
+            private static bool _manageSpaceActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#mapViewStyle"/>
+            /// </summary>
+            public static int mapViewStyle { get { if (!_mapViewStyleReady) { _mapViewStyleContent = SGetField<int>(LocalBridgeClazz, "mapViewStyle"); _mapViewStyleReady = true; } return _mapViewStyleContent; } }
+            private static int _mapViewStyleContent = default;
+            private static bool _mapViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#marqueeRepeatLimit"/>
+            /// </summary>
+            public static int marqueeRepeatLimit { get { if (!_marqueeRepeatLimitReady) { _marqueeRepeatLimitContent = SGetField<int>(LocalBridgeClazz, "marqueeRepeatLimit"); _marqueeRepeatLimitReady = true; } return _marqueeRepeatLimitContent; } }
+            private static int _marqueeRepeatLimitContent = default;
+            private static bool _marqueeRepeatLimitReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#matchOrder"/>
+            /// </summary>
+            public static int matchOrder { get { if (!_matchOrderReady) { _matchOrderContent = SGetField<int>(LocalBridgeClazz, "matchOrder"); _matchOrderReady = true; } return _matchOrderContent; } }
+            private static int _matchOrderContent = default;
+            private static bool _matchOrderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#max"/>
+            /// </summary>
+            public static int max { get { if (!_maxReady) { _maxContent = SGetField<int>(LocalBridgeClazz, "max"); _maxReady = true; } return _maxContent; } }
+            private static int _maxContent = default;
+            private static bool _maxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxAspectRatio"/>
+            /// </summary>
+            public static int maxAspectRatio { get { if (!_maxAspectRatioReady) { _maxAspectRatioContent = SGetField<int>(LocalBridgeClazz, "maxAspectRatio"); _maxAspectRatioReady = true; } return _maxAspectRatioContent; } }
+            private static int _maxAspectRatioContent = default;
+            private static bool _maxAspectRatioReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxButtonHeight"/>
+            /// </summary>
+            public static int maxButtonHeight { get { if (!_maxButtonHeightReady) { _maxButtonHeightContent = SGetField<int>(LocalBridgeClazz, "maxButtonHeight"); _maxButtonHeightReady = true; } return _maxButtonHeightContent; } }
+            private static int _maxButtonHeightContent = default;
+            private static bool _maxButtonHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxDate"/>
+            /// </summary>
+            public static int maxDate { get { if (!_maxDateReady) { _maxDateContent = SGetField<int>(LocalBridgeClazz, "maxDate"); _maxDateReady = true; } return _maxDateContent; } }
+            private static int _maxDateContent = default;
+            private static bool _maxDateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxEms"/>
+            /// </summary>
+            public static int maxEms { get { if (!_maxEmsReady) { _maxEmsContent = SGetField<int>(LocalBridgeClazz, "maxEms"); _maxEmsReady = true; } return _maxEmsContent; } }
+            private static int _maxEmsContent = default;
+            private static bool _maxEmsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxHeight"/>
+            /// </summary>
+            public static int maxHeight { get { if (!_maxHeightReady) { _maxHeightContent = SGetField<int>(LocalBridgeClazz, "maxHeight"); _maxHeightReady = true; } return _maxHeightContent; } }
+            private static int _maxHeightContent = default;
+            private static bool _maxHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maximumAngle"/>
+            /// </summary>
+            public static int maximumAngle { get { if (!_maximumAngleReady) { _maximumAngleContent = SGetField<int>(LocalBridgeClazz, "maximumAngle"); _maximumAngleReady = true; } return _maximumAngleContent; } }
+            private static int _maximumAngleContent = default;
+            private static bool _maximumAngleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxItemsPerRow"/>
+            /// </summary>
+            public static int maxItemsPerRow { get { if (!_maxItemsPerRowReady) { _maxItemsPerRowContent = SGetField<int>(LocalBridgeClazz, "maxItemsPerRow"); _maxItemsPerRowReady = true; } return _maxItemsPerRowContent; } }
+            private static int _maxItemsPerRowContent = default;
+            private static bool _maxItemsPerRowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxLength"/>
+            /// </summary>
+            public static int maxLength { get { if (!_maxLengthReady) { _maxLengthContent = SGetField<int>(LocalBridgeClazz, "maxLength"); _maxLengthReady = true; } return _maxLengthContent; } }
+            private static int _maxLengthContent = default;
+            private static bool _maxLengthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxLevel"/>
+            /// </summary>
+            public static int maxLevel { get { if (!_maxLevelReady) { _maxLevelContent = SGetField<int>(LocalBridgeClazz, "maxLevel"); _maxLevelReady = true; } return _maxLevelContent; } }
+            private static int _maxLevelContent = default;
+            private static bool _maxLevelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxLines"/>
+            /// </summary>
+            public static int maxLines { get { if (!_maxLinesReady) { _maxLinesContent = SGetField<int>(LocalBridgeClazz, "maxLines"); _maxLinesReady = true; } return _maxLinesContent; } }
+            private static int _maxLinesContent = default;
+            private static bool _maxLinesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxLongVersionCode"/>
+            /// </summary>
+            public static int maxLongVersionCode { get { if (!_maxLongVersionCodeReady) { _maxLongVersionCodeContent = SGetField<int>(LocalBridgeClazz, "maxLongVersionCode"); _maxLongVersionCodeReady = true; } return _maxLongVersionCodeContent; } }
+            private static int _maxLongVersionCodeContent = default;
+            private static bool _maxLongVersionCodeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxRecents"/>
+            /// </summary>
+            public static int maxRecents { get { if (!_maxRecentsReady) { _maxRecentsContent = SGetField<int>(LocalBridgeClazz, "maxRecents"); _maxRecentsReady = true; } return _maxRecentsContent; } }
+            private static int _maxRecentsContent = default;
+            private static bool _maxRecentsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxResizeHeight"/>
+            /// </summary>
+            public static int maxResizeHeight { get { if (!_maxResizeHeightReady) { _maxResizeHeightContent = SGetField<int>(LocalBridgeClazz, "maxResizeHeight"); _maxResizeHeightReady = true; } return _maxResizeHeightContent; } }
+            private static int _maxResizeHeightContent = default;
+            private static bool _maxResizeHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxResizeWidth"/>
+            /// </summary>
+            public static int maxResizeWidth { get { if (!_maxResizeWidthReady) { _maxResizeWidthContent = SGetField<int>(LocalBridgeClazz, "maxResizeWidth"); _maxResizeWidthReady = true; } return _maxResizeWidthContent; } }
+            private static int _maxResizeWidthContent = default;
+            private static bool _maxResizeWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxRows"/>
+            /// </summary>
+            public static int maxRows { get { if (!_maxRowsReady) { _maxRowsContent = SGetField<int>(LocalBridgeClazz, "maxRows"); _maxRowsReady = true; } return _maxRowsContent; } }
+            private static int _maxRowsContent = default;
+            private static bool _maxRowsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxSdkVersion"/>
+            /// </summary>
+            public static int maxSdkVersion { get { if (!_maxSdkVersionReady) { _maxSdkVersionContent = SGetField<int>(LocalBridgeClazz, "maxSdkVersion"); _maxSdkVersionReady = true; } return _maxSdkVersionContent; } }
+            private static int _maxSdkVersionContent = default;
+            private static bool _maxSdkVersionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#maxWidth"/>
+            /// </summary>
+            public static int maxWidth { get { if (!_maxWidthReady) { _maxWidthContent = SGetField<int>(LocalBridgeClazz, "maxWidth"); _maxWidthReady = true; } return _maxWidthContent; } }
+            private static int _maxWidthContent = default;
+            private static bool _maxWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#measureAllChildren"/>
+            /// </summary>
+            public static int measureAllChildren { get { if (!_measureAllChildrenReady) { _measureAllChildrenContent = SGetField<int>(LocalBridgeClazz, "measureAllChildren"); _measureAllChildrenReady = true; } return _measureAllChildrenContent; } }
+            private static int _measureAllChildrenContent = default;
+            private static bool _measureAllChildrenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#measureWithLargestChild"/>
+            /// </summary>
+            public static int measureWithLargestChild { get { if (!_measureWithLargestChildReady) { _measureWithLargestChildContent = SGetField<int>(LocalBridgeClazz, "measureWithLargestChild"); _measureWithLargestChildReady = true; } return _measureWithLargestChildContent; } }
+            private static int _measureWithLargestChildContent = default;
+            private static bool _measureWithLargestChildReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#mediaRouteButtonStyle"/>
+            /// </summary>
+            public static int mediaRouteButtonStyle { get { if (!_mediaRouteButtonStyleReady) { _mediaRouteButtonStyleContent = SGetField<int>(LocalBridgeClazz, "mediaRouteButtonStyle"); _mediaRouteButtonStyleReady = true; } return _mediaRouteButtonStyleContent; } }
+            private static int _mediaRouteButtonStyleContent = default;
+            private static bool _mediaRouteButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#mediaRouteTypes"/>
+            /// </summary>
+            public static int mediaRouteTypes { get { if (!_mediaRouteTypesReady) { _mediaRouteTypesContent = SGetField<int>(LocalBridgeClazz, "mediaRouteTypes"); _mediaRouteTypesReady = true; } return _mediaRouteTypesContent; } }
+            private static int _mediaRouteTypesContent = default;
+            private static bool _mediaRouteTypesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#memtagMode"/>
+            /// </summary>
+            public static int memtagMode { get { if (!_memtagModeReady) { _memtagModeContent = SGetField<int>(LocalBridgeClazz, "memtagMode"); _memtagModeReady = true; } return _memtagModeContent; } }
+            private static int _memtagModeContent = default;
+            private static bool _memtagModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#menuCategory"/>
+            /// </summary>
+            public static int menuCategory { get { if (!_menuCategoryReady) { _menuCategoryContent = SGetField<int>(LocalBridgeClazz, "menuCategory"); _menuCategoryReady = true; } return _menuCategoryContent; } }
+            private static int _menuCategoryContent = default;
+            private static bool _menuCategoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#mimeGroup"/>
+            /// </summary>
+            public static int mimeGroup { get { if (!_mimeGroupReady) { _mimeGroupContent = SGetField<int>(LocalBridgeClazz, "mimeGroup"); _mimeGroupReady = true; } return _mimeGroupContent; } }
+            private static int _mimeGroupContent = default;
+            private static bool _mimeGroupReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#mimeType"/>
+            /// </summary>
+            public static int mimeType { get { if (!_mimeTypeReady) { _mimeTypeContent = SGetField<int>(LocalBridgeClazz, "mimeType"); _mimeTypeReady = true; } return _mimeTypeContent; } }
+            private static int _mimeTypeContent = default;
+            private static bool _mimeTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#min"/>
+            /// </summary>
+            public static int min { get { if (!_minReady) { _minContent = SGetField<int>(LocalBridgeClazz, "min"); _minReady = true; } return _minContent; } }
+            private static int _minContent = default;
+            private static bool _minReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minAspectRatio"/>
+            /// </summary>
+            public static int minAspectRatio { get { if (!_minAspectRatioReady) { _minAspectRatioContent = SGetField<int>(LocalBridgeClazz, "minAspectRatio"); _minAspectRatioReady = true; } return _minAspectRatioContent; } }
+            private static int _minAspectRatioContent = default;
+            private static bool _minAspectRatioReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minDate"/>
+            /// </summary>
+            public static int minDate { get { if (!_minDateReady) { _minDateContent = SGetField<int>(LocalBridgeClazz, "minDate"); _minDateReady = true; } return _minDateContent; } }
+            private static int _minDateContent = default;
+            private static bool _minDateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minEms"/>
+            /// </summary>
+            public static int minEms { get { if (!_minEmsReady) { _minEmsContent = SGetField<int>(LocalBridgeClazz, "minEms"); _minEmsReady = true; } return _minEmsContent; } }
+            private static int _minEmsContent = default;
+            private static bool _minEmsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minHeight"/>
+            /// </summary>
+            public static int minHeight { get { if (!_minHeightReady) { _minHeightContent = SGetField<int>(LocalBridgeClazz, "minHeight"); _minHeightReady = true; } return _minHeightContent; } }
+            private static int _minHeightContent = default;
+            private static bool _minHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minimumHorizontalAngle"/>
+            /// </summary>
+            public static int minimumHorizontalAngle { get { if (!_minimumHorizontalAngleReady) { _minimumHorizontalAngleContent = SGetField<int>(LocalBridgeClazz, "minimumHorizontalAngle"); _minimumHorizontalAngleReady = true; } return _minimumHorizontalAngleContent; } }
+            private static int _minimumHorizontalAngleContent = default;
+            private static bool _minimumHorizontalAngleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minimumVerticalAngle"/>
+            /// </summary>
+            public static int minimumVerticalAngle { get { if (!_minimumVerticalAngleReady) { _minimumVerticalAngleContent = SGetField<int>(LocalBridgeClazz, "minimumVerticalAngle"); _minimumVerticalAngleReady = true; } return _minimumVerticalAngleContent; } }
+            private static int _minimumVerticalAngleContent = default;
+            private static bool _minimumVerticalAngleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minLevel"/>
+            /// </summary>
+            public static int minLevel { get { if (!_minLevelReady) { _minLevelContent = SGetField<int>(LocalBridgeClazz, "minLevel"); _minLevelReady = true; } return _minLevelContent; } }
+            private static int _minLevelContent = default;
+            private static bool _minLevelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minLines"/>
+            /// </summary>
+            public static int minLines { get { if (!_minLinesReady) { _minLinesContent = SGetField<int>(LocalBridgeClazz, "minLines"); _minLinesReady = true; } return _minLinesContent; } }
+            private static int _minLinesContent = default;
+            private static bool _minLinesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minResizeHeight"/>
+            /// </summary>
+            public static int minResizeHeight { get { if (!_minResizeHeightReady) { _minResizeHeightContent = SGetField<int>(LocalBridgeClazz, "minResizeHeight"); _minResizeHeightReady = true; } return _minResizeHeightContent; } }
+            private static int _minResizeHeightContent = default;
+            private static bool _minResizeHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minResizeWidth"/>
+            /// </summary>
+            public static int minResizeWidth { get { if (!_minResizeWidthReady) { _minResizeWidthContent = SGetField<int>(LocalBridgeClazz, "minResizeWidth"); _minResizeWidthReady = true; } return _minResizeWidthContent; } }
+            private static int _minResizeWidthContent = default;
+            private static bool _minResizeWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minSdkVersion"/>
+            /// </summary>
+            public static int minSdkVersion { get { if (!_minSdkVersionReady) { _minSdkVersionContent = SGetField<int>(LocalBridgeClazz, "minSdkVersion"); _minSdkVersionReady = true; } return _minSdkVersionContent; } }
+            private static int _minSdkVersionContent = default;
+            private static bool _minSdkVersionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#minWidth"/>
+            /// </summary>
+            public static int minWidth { get { if (!_minWidthReady) { _minWidthContent = SGetField<int>(LocalBridgeClazz, "minWidth"); _minWidthReady = true; } return _minWidthContent; } }
+            private static int _minWidthContent = default;
+            private static bool _minWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#mipMap"/>
+            /// </summary>
+            public static int mipMap { get { if (!_mipMapReady) { _mipMapContent = SGetField<int>(LocalBridgeClazz, "mipMap"); _mipMapReady = true; } return _mipMapContent; } }
+            private static int _mipMapContent = default;
+            private static bool _mipMapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#mirrorForRtl"/>
+            /// </summary>
+            public static int mirrorForRtl { get { if (!_mirrorForRtlReady) { _mirrorForRtlContent = SGetField<int>(LocalBridgeClazz, "mirrorForRtl"); _mirrorForRtlReady = true; } return _mirrorForRtlContent; } }
+            private static int _mirrorForRtlContent = default;
+            private static bool _mirrorForRtlReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#mode"/>
+            /// </summary>
+            public static int mode { get { if (!_modeReady) { _modeContent = SGetField<int>(LocalBridgeClazz, "mode"); _modeReady = true; } return _modeContent; } }
+            private static int _modeContent = default;
+            private static bool _modeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#moreIcon"/>
+            /// </summary>
+            public static int moreIcon { get { if (!_moreIconReady) { _moreIconContent = SGetField<int>(LocalBridgeClazz, "moreIcon"); _moreIconReady = true; } return _moreIconContent; } }
+            private static int _moreIconContent = default;
+            private static bool _moreIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#multiArch"/>
+            /// </summary>
+            public static int multiArch { get { if (!_multiArchReady) { _multiArchContent = SGetField<int>(LocalBridgeClazz, "multiArch"); _multiArchReady = true; } return _multiArchContent; } }
+            private static int _multiArchContent = default;
+            private static bool _multiArchReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#multiprocess"/>
+            /// </summary>
+            public static int multiprocess { get { if (!_multiprocessReady) { _multiprocessContent = SGetField<int>(LocalBridgeClazz, "multiprocess"); _multiprocessReady = true; } return _multiprocessContent; } }
+            private static int _multiprocessContent = default;
+            private static bool _multiprocessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#name"/>
+            /// </summary>
+            public static int name { get { if (!_nameReady) { _nameContent = SGetField<int>(LocalBridgeClazz, "name"); _nameReady = true; } return _nameContent; } }
+            private static int _nameContent = default;
+            private static bool _nameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nativeHeapZeroInitialized"/>
+            /// </summary>
+            public static int nativeHeapZeroInitialized { get { if (!_nativeHeapZeroInitializedReady) { _nativeHeapZeroInitializedContent = SGetField<int>(LocalBridgeClazz, "nativeHeapZeroInitialized"); _nativeHeapZeroInitializedReady = true; } return _nativeHeapZeroInitializedContent; } }
+            private static int _nativeHeapZeroInitializedContent = default;
+            private static bool _nativeHeapZeroInitializedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#navigationBarColor"/>
+            /// </summary>
+            public static int navigationBarColor { get { if (!_navigationBarColorReady) { _navigationBarColorContent = SGetField<int>(LocalBridgeClazz, "navigationBarColor"); _navigationBarColorReady = true; } return _navigationBarColorContent; } }
+            private static int _navigationBarColorContent = default;
+            private static bool _navigationBarColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#navigationBarDividerColor"/>
+            /// </summary>
+            public static int navigationBarDividerColor { get { if (!_navigationBarDividerColorReady) { _navigationBarDividerColorContent = SGetField<int>(LocalBridgeClazz, "navigationBarDividerColor"); _navigationBarDividerColorReady = true; } return _navigationBarDividerColorContent; } }
+            private static int _navigationBarDividerColorContent = default;
+            private static bool _navigationBarDividerColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#navigationContentDescription"/>
+            /// </summary>
+            public static int navigationContentDescription { get { if (!_navigationContentDescriptionReady) { _navigationContentDescriptionContent = SGetField<int>(LocalBridgeClazz, "navigationContentDescription"); _navigationContentDescriptionReady = true; } return _navigationContentDescriptionContent; } }
+            private static int _navigationContentDescriptionContent = default;
+            private static bool _navigationContentDescriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#navigationIcon"/>
+            /// </summary>
+            public static int navigationIcon { get { if (!_navigationIconReady) { _navigationIconContent = SGetField<int>(LocalBridgeClazz, "navigationIcon"); _navigationIconReady = true; } return _navigationIconContent; } }
+            private static int _navigationIconContent = default;
+            private static bool _navigationIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#navigationMode"/>
+            /// </summary>
+            public static int navigationMode { get { if (!_navigationModeReady) { _navigationModeContent = SGetField<int>(LocalBridgeClazz, "navigationMode"); _navigationModeReady = true; } return _navigationModeContent; } }
+            private static int _navigationModeContent = default;
+            private static bool _navigationModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#negativeButtonText"/>
+            /// </summary>
+            public static int negativeButtonText { get { if (!_negativeButtonTextReady) { _negativeButtonTextContent = SGetField<int>(LocalBridgeClazz, "negativeButtonText"); _negativeButtonTextReady = true; } return _negativeButtonTextContent; } }
+            private static int _negativeButtonTextContent = default;
+            private static bool _negativeButtonTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nestedScrollingEnabled"/>
+            /// </summary>
+            public static int nestedScrollingEnabled { get { if (!_nestedScrollingEnabledReady) { _nestedScrollingEnabledContent = SGetField<int>(LocalBridgeClazz, "nestedScrollingEnabled"); _nestedScrollingEnabledReady = true; } return _nestedScrollingEnabledContent; } }
+            private static int _nestedScrollingEnabledContent = default;
+            private static bool _nestedScrollingEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#networkSecurityConfig"/>
+            /// </summary>
+            public static int networkSecurityConfig { get { if (!_networkSecurityConfigReady) { _networkSecurityConfigContent = SGetField<int>(LocalBridgeClazz, "networkSecurityConfig"); _networkSecurityConfigReady = true; } return _networkSecurityConfigContent; } }
+            private static int _networkSecurityConfigContent = default;
+            private static bool _networkSecurityConfigReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nextClusterForward"/>
+            /// </summary>
+            public static int nextClusterForward { get { if (!_nextClusterForwardReady) { _nextClusterForwardContent = SGetField<int>(LocalBridgeClazz, "nextClusterForward"); _nextClusterForwardReady = true; } return _nextClusterForwardContent; } }
+            private static int _nextClusterForwardContent = default;
+            private static bool _nextClusterForwardReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nextFocusDown"/>
+            /// </summary>
+            public static int nextFocusDown { get { if (!_nextFocusDownReady) { _nextFocusDownContent = SGetField<int>(LocalBridgeClazz, "nextFocusDown"); _nextFocusDownReady = true; } return _nextFocusDownContent; } }
+            private static int _nextFocusDownContent = default;
+            private static bool _nextFocusDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nextFocusForward"/>
+            /// </summary>
+            public static int nextFocusForward { get { if (!_nextFocusForwardReady) { _nextFocusForwardContent = SGetField<int>(LocalBridgeClazz, "nextFocusForward"); _nextFocusForwardReady = true; } return _nextFocusForwardContent; } }
+            private static int _nextFocusForwardContent = default;
+            private static bool _nextFocusForwardReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nextFocusLeft"/>
+            /// </summary>
+            public static int nextFocusLeft { get { if (!_nextFocusLeftReady) { _nextFocusLeftContent = SGetField<int>(LocalBridgeClazz, "nextFocusLeft"); _nextFocusLeftReady = true; } return _nextFocusLeftContent; } }
+            private static int _nextFocusLeftContent = default;
+            private static bool _nextFocusLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nextFocusRight"/>
+            /// </summary>
+            public static int nextFocusRight { get { if (!_nextFocusRightReady) { _nextFocusRightContent = SGetField<int>(LocalBridgeClazz, "nextFocusRight"); _nextFocusRightReady = true; } return _nextFocusRightContent; } }
+            private static int _nextFocusRightContent = default;
+            private static bool _nextFocusRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nextFocusUp"/>
+            /// </summary>
+            public static int nextFocusUp { get { if (!_nextFocusUpReady) { _nextFocusUpContent = SGetField<int>(LocalBridgeClazz, "nextFocusUp"); _nextFocusUpReady = true; } return _nextFocusUpContent; } }
+            private static int _nextFocusUpContent = default;
+            private static bool _nextFocusUpReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#noHistory"/>
+            /// </summary>
+            public static int noHistory { get { if (!_noHistoryReady) { _noHistoryContent = SGetField<int>(LocalBridgeClazz, "noHistory"); _noHistoryReady = true; } return _noHistoryContent; } }
+            private static int _noHistoryContent = default;
+            private static bool _noHistoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#nonInteractiveUiTimeout"/>
+            /// </summary>
+            public static int nonInteractiveUiTimeout { get { if (!_nonInteractiveUiTimeoutReady) { _nonInteractiveUiTimeoutContent = SGetField<int>(LocalBridgeClazz, "nonInteractiveUiTimeout"); _nonInteractiveUiTimeoutReady = true; } return _nonInteractiveUiTimeoutContent; } }
+            private static int _nonInteractiveUiTimeoutContent = default;
+            private static bool _nonInteractiveUiTimeoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#normalScreens"/>
+            /// </summary>
+            public static int normalScreens { get { if (!_normalScreensReady) { _normalScreensContent = SGetField<int>(LocalBridgeClazz, "normalScreens"); _normalScreensReady = true; } return _normalScreensContent; } }
+            private static int _normalScreensContent = default;
+            private static bool _normalScreensReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#notificationTimeout"/>
+            /// </summary>
+            public static int notificationTimeout { get { if (!_notificationTimeoutReady) { _notificationTimeoutContent = SGetField<int>(LocalBridgeClazz, "notificationTimeout"); _notificationTimeoutReady = true; } return _notificationTimeoutContent; } }
+            private static int _notificationTimeoutContent = default;
+            private static bool _notificationTimeoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numberPickerStyle"/>
+            /// </summary>
+            public static int numberPickerStyle { get { if (!_numberPickerStyleReady) { _numberPickerStyleContent = SGetField<int>(LocalBridgeClazz, "numberPickerStyle"); _numberPickerStyleReady = true; } return _numberPickerStyleContent; } }
+            private static int _numberPickerStyleContent = default;
+            private static bool _numberPickerStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numbersBackgroundColor"/>
+            /// </summary>
+            public static int numbersBackgroundColor { get { if (!_numbersBackgroundColorReady) { _numbersBackgroundColorContent = SGetField<int>(LocalBridgeClazz, "numbersBackgroundColor"); _numbersBackgroundColorReady = true; } return _numbersBackgroundColorContent; } }
+            private static int _numbersBackgroundColorContent = default;
+            private static bool _numbersBackgroundColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numbersInnerTextColor"/>
+            /// </summary>
+            public static int numbersInnerTextColor { get { if (!_numbersInnerTextColorReady) { _numbersInnerTextColorContent = SGetField<int>(LocalBridgeClazz, "numbersInnerTextColor"); _numbersInnerTextColorReady = true; } return _numbersInnerTextColorContent; } }
+            private static int _numbersInnerTextColorContent = default;
+            private static bool _numbersInnerTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numbersSelectorColor"/>
+            /// </summary>
+            public static int numbersSelectorColor { get { if (!_numbersSelectorColorReady) { _numbersSelectorColorContent = SGetField<int>(LocalBridgeClazz, "numbersSelectorColor"); _numbersSelectorColorReady = true; } return _numbersSelectorColorContent; } }
+            private static int _numbersSelectorColorContent = default;
+            private static bool _numbersSelectorColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numbersTextColor"/>
+            /// </summary>
+            public static int numbersTextColor { get { if (!_numbersTextColorReady) { _numbersTextColorContent = SGetField<int>(LocalBridgeClazz, "numbersTextColor"); _numbersTextColorReady = true; } return _numbersTextColorContent; } }
+            private static int _numbersTextColorContent = default;
+            private static bool _numbersTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numColumns"/>
+            /// </summary>
+            public static int numColumns { get { if (!_numColumnsReady) { _numColumnsContent = SGetField<int>(LocalBridgeClazz, "numColumns"); _numColumnsReady = true; } return _numColumnsContent; } }
+            private static int _numColumnsContent = default;
+            private static bool _numColumnsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numeric"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int numeric { get { if (!_numericReady) { _numericContent = SGetField<int>(LocalBridgeClazz, "numeric"); _numericReady = true; } return _numericContent; } }
+            private static int _numericContent = default;
+            private static bool _numericReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numericModifiers"/>
+            /// </summary>
+            public static int numericModifiers { get { if (!_numericModifiersReady) { _numericModifiersContent = SGetField<int>(LocalBridgeClazz, "numericModifiers"); _numericModifiersReady = true; } return _numericModifiersContent; } }
+            private static int _numericModifiersContent = default;
+            private static bool _numericModifiersReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numericShortcut"/>
+            /// </summary>
+            public static int numericShortcut { get { if (!_numericShortcutReady) { _numericShortcutContent = SGetField<int>(LocalBridgeClazz, "numericShortcut"); _numericShortcutReady = true; } return _numericShortcutContent; } }
+            private static int _numericShortcutContent = default;
+            private static bool _numericShortcutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#numStars"/>
+            /// </summary>
+            public static int numStars { get { if (!_numStarsReady) { _numStarsContent = SGetField<int>(LocalBridgeClazz, "numStars"); _numStarsReady = true; } return _numStarsContent; } }
+            private static int _numStarsContent = default;
+            private static bool _numStarsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#offset"/>
+            /// </summary>
+            public static int offset { get { if (!_offsetReady) { _offsetContent = SGetField<int>(LocalBridgeClazz, "offset"); _offsetReady = true; } return _offsetContent; } }
+            private static int _offsetContent = default;
+            private static bool _offsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#onClick"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int onClick { get { if (!_onClickReady) { _onClickContent = SGetField<int>(LocalBridgeClazz, "onClick"); _onClickReady = true; } return _onClickContent; } }
+            private static int _onClickContent = default;
+            private static bool _onClickReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#oneshot"/>
+            /// </summary>
+            public static int oneshot { get { if (!_oneshotReady) { _oneshotContent = SGetField<int>(LocalBridgeClazz, "oneshot"); _oneshotReady = true; } return _oneshotContent; } }
+            private static int _oneshotContent = default;
+            private static bool _oneshotReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#opacity"/>
+            /// </summary>
+            public static int opacity { get { if (!_opacityReady) { _opacityContent = SGetField<int>(LocalBridgeClazz, "opacity"); _opacityReady = true; } return _opacityContent; } }
+            private static int _opacityContent = default;
+            private static bool _opacityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#opticalInsetBottom"/>
+            /// </summary>
+            public static int opticalInsetBottom { get { if (!_opticalInsetBottomReady) { _opticalInsetBottomContent = SGetField<int>(LocalBridgeClazz, "opticalInsetBottom"); _opticalInsetBottomReady = true; } return _opticalInsetBottomContent; } }
+            private static int _opticalInsetBottomContent = default;
+            private static bool _opticalInsetBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#opticalInsetLeft"/>
+            /// </summary>
+            public static int opticalInsetLeft { get { if (!_opticalInsetLeftReady) { _opticalInsetLeftContent = SGetField<int>(LocalBridgeClazz, "opticalInsetLeft"); _opticalInsetLeftReady = true; } return _opticalInsetLeftContent; } }
+            private static int _opticalInsetLeftContent = default;
+            private static bool _opticalInsetLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#opticalInsetRight"/>
+            /// </summary>
+            public static int opticalInsetRight { get { if (!_opticalInsetRightReady) { _opticalInsetRightContent = SGetField<int>(LocalBridgeClazz, "opticalInsetRight"); _opticalInsetRightReady = true; } return _opticalInsetRightContent; } }
+            private static int _opticalInsetRightContent = default;
+            private static bool _opticalInsetRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#opticalInsetTop"/>
+            /// </summary>
+            public static int opticalInsetTop { get { if (!_opticalInsetTopReady) { _opticalInsetTopContent = SGetField<int>(LocalBridgeClazz, "opticalInsetTop"); _opticalInsetTopReady = true; } return _opticalInsetTopContent; } }
+            private static int _opticalInsetTopContent = default;
+            private static bool _opticalInsetTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#order"/>
+            /// </summary>
+            public static int order { get { if (!_orderReady) { _orderContent = SGetField<int>(LocalBridgeClazz, "order"); _orderReady = true; } return _orderContent; } }
+            private static int _orderContent = default;
+            private static bool _orderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#orderInCategory"/>
+            /// </summary>
+            public static int orderInCategory { get { if (!_orderInCategoryReady) { _orderInCategoryContent = SGetField<int>(LocalBridgeClazz, "orderInCategory"); _orderInCategoryReady = true; } return _orderInCategoryContent; } }
+            private static int _orderInCategoryContent = default;
+            private static bool _orderInCategoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ordering"/>
+            /// </summary>
+            public static int ordering { get { if (!_orderingReady) { _orderingContent = SGetField<int>(LocalBridgeClazz, "ordering"); _orderingReady = true; } return _orderingContent; } }
+            private static int _orderingContent = default;
+            private static bool _orderingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#orderingFromXml"/>
+            /// </summary>
+            public static int orderingFromXml { get { if (!_orderingFromXmlReady) { _orderingFromXmlContent = SGetField<int>(LocalBridgeClazz, "orderingFromXml"); _orderingFromXmlReady = true; } return _orderingFromXmlContent; } }
+            private static int _orderingFromXmlContent = default;
+            private static bool _orderingFromXmlReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#orientation"/>
+            /// </summary>
+            public static int orientation { get { if (!_orientationReady) { _orientationContent = SGetField<int>(LocalBridgeClazz, "orientation"); _orientationReady = true; } return _orientationContent; } }
+            private static int _orientationContent = default;
+            private static bool _orientationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#outAnimation"/>
+            /// </summary>
+            public static int outAnimation { get { if (!_outAnimationReady) { _outAnimationContent = SGetField<int>(LocalBridgeClazz, "outAnimation"); _outAnimationReady = true; } return _outAnimationContent; } }
+            private static int _outAnimationContent = default;
+            private static bool _outAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#outlineAmbientShadowColor"/>
+            /// </summary>
+            public static int outlineAmbientShadowColor { get { if (!_outlineAmbientShadowColorReady) { _outlineAmbientShadowColorContent = SGetField<int>(LocalBridgeClazz, "outlineAmbientShadowColor"); _outlineAmbientShadowColorReady = true; } return _outlineAmbientShadowColorContent; } }
+            private static int _outlineAmbientShadowColorContent = default;
+            private static bool _outlineAmbientShadowColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#outlineProvider"/>
+            /// </summary>
+            public static int outlineProvider { get { if (!_outlineProviderReady) { _outlineProviderContent = SGetField<int>(LocalBridgeClazz, "outlineProvider"); _outlineProviderReady = true; } return _outlineProviderContent; } }
+            private static int _outlineProviderContent = default;
+            private static bool _outlineProviderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#outlineSpotShadowColor"/>
+            /// </summary>
+            public static int outlineSpotShadowColor { get { if (!_outlineSpotShadowColorReady) { _outlineSpotShadowColorContent = SGetField<int>(LocalBridgeClazz, "outlineSpotShadowColor"); _outlineSpotShadowColorReady = true; } return _outlineSpotShadowColorContent; } }
+            private static int _outlineSpotShadowColorContent = default;
+            private static bool _outlineSpotShadowColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#overlapAnchor"/>
+            /// </summary>
+            public static int overlapAnchor { get { if (!_overlapAnchorReady) { _overlapAnchorContent = SGetField<int>(LocalBridgeClazz, "overlapAnchor"); _overlapAnchorReady = true; } return _overlapAnchorContent; } }
+            private static int _overlapAnchorContent = default;
+            private static bool _overlapAnchorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#overridesImplicitlyEnabledSubtype"/>
+            /// </summary>
+            public static int overridesImplicitlyEnabledSubtype { get { if (!_overridesImplicitlyEnabledSubtypeReady) { _overridesImplicitlyEnabledSubtypeContent = SGetField<int>(LocalBridgeClazz, "overridesImplicitlyEnabledSubtype"); _overridesImplicitlyEnabledSubtypeReady = true; } return _overridesImplicitlyEnabledSubtypeContent; } }
+            private static int _overridesImplicitlyEnabledSubtypeContent = default;
+            private static bool _overridesImplicitlyEnabledSubtypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#overScrollFooter"/>
+            /// </summary>
+            public static int overScrollFooter { get { if (!_overScrollFooterReady) { _overScrollFooterContent = SGetField<int>(LocalBridgeClazz, "overScrollFooter"); _overScrollFooterReady = true; } return _overScrollFooterContent; } }
+            private static int _overScrollFooterContent = default;
+            private static bool _overScrollFooterReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#overScrollHeader"/>
+            /// </summary>
+            public static int overScrollHeader { get { if (!_overScrollHeaderReady) { _overScrollHeaderContent = SGetField<int>(LocalBridgeClazz, "overScrollHeader"); _overScrollHeaderReady = true; } return _overScrollHeaderContent; } }
+            private static int _overScrollHeaderContent = default;
+            private static bool _overScrollHeaderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#overScrollMode"/>
+            /// </summary>
+            public static int overScrollMode { get { if (!_overScrollModeReady) { _overScrollModeContent = SGetField<int>(LocalBridgeClazz, "overScrollMode"); _overScrollModeReady = true; } return _overScrollModeContent; } }
+            private static int _overScrollModeContent = default;
+            private static bool _overScrollModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#packageNames"/>
+            /// </summary>
+            public static int packageNames { get { if (!_packageNamesReady) { _packageNamesContent = SGetField<int>(LocalBridgeClazz, "packageNames"); _packageNamesReady = true; } return _packageNamesContent; } }
+            private static int _packageNamesContent = default;
+            private static bool _packageNamesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#packageType"/>
+            /// </summary>
+            public static int packageType { get { if (!_packageTypeReady) { _packageTypeContent = SGetField<int>(LocalBridgeClazz, "packageType"); _packageTypeReady = true; } return _packageTypeContent; } }
+            private static int _packageTypeContent = default;
+            private static bool _packageTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#padding"/>
+            /// </summary>
+            public static int padding { get { if (!_paddingReady) { _paddingContent = SGetField<int>(LocalBridgeClazz, "padding"); _paddingReady = true; } return _paddingContent; } }
+            private static int _paddingContent = default;
+            private static bool _paddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingBottom"/>
+            /// </summary>
+            public static int paddingBottom { get { if (!_paddingBottomReady) { _paddingBottomContent = SGetField<int>(LocalBridgeClazz, "paddingBottom"); _paddingBottomReady = true; } return _paddingBottomContent; } }
+            private static int _paddingBottomContent = default;
+            private static bool _paddingBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingEnd"/>
+            /// </summary>
+            public static int paddingEnd { get { if (!_paddingEndReady) { _paddingEndContent = SGetField<int>(LocalBridgeClazz, "paddingEnd"); _paddingEndReady = true; } return _paddingEndContent; } }
+            private static int _paddingEndContent = default;
+            private static bool _paddingEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingHorizontal"/>
+            /// </summary>
+            public static int paddingHorizontal { get { if (!_paddingHorizontalReady) { _paddingHorizontalContent = SGetField<int>(LocalBridgeClazz, "paddingHorizontal"); _paddingHorizontalReady = true; } return _paddingHorizontalContent; } }
+            private static int _paddingHorizontalContent = default;
+            private static bool _paddingHorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingLeft"/>
+            /// </summary>
+            public static int paddingLeft { get { if (!_paddingLeftReady) { _paddingLeftContent = SGetField<int>(LocalBridgeClazz, "paddingLeft"); _paddingLeftReady = true; } return _paddingLeftContent; } }
+            private static int _paddingLeftContent = default;
+            private static bool _paddingLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingMode"/>
+            /// </summary>
+            public static int paddingMode { get { if (!_paddingModeReady) { _paddingModeContent = SGetField<int>(LocalBridgeClazz, "paddingMode"); _paddingModeReady = true; } return _paddingModeContent; } }
+            private static int _paddingModeContent = default;
+            private static bool _paddingModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingRight"/>
+            /// </summary>
+            public static int paddingRight { get { if (!_paddingRightReady) { _paddingRightContent = SGetField<int>(LocalBridgeClazz, "paddingRight"); _paddingRightReady = true; } return _paddingRightContent; } }
+            private static int _paddingRightContent = default;
+            private static bool _paddingRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingStart"/>
+            /// </summary>
+            public static int paddingStart { get { if (!_paddingStartReady) { _paddingStartContent = SGetField<int>(LocalBridgeClazz, "paddingStart"); _paddingStartReady = true; } return _paddingStartContent; } }
+            private static int _paddingStartContent = default;
+            private static bool _paddingStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingTop"/>
+            /// </summary>
+            public static int paddingTop { get { if (!_paddingTopReady) { _paddingTopContent = SGetField<int>(LocalBridgeClazz, "paddingTop"); _paddingTopReady = true; } return _paddingTopContent; } }
+            private static int _paddingTopContent = default;
+            private static bool _paddingTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#paddingVertical"/>
+            /// </summary>
+            public static int paddingVertical { get { if (!_paddingVerticalReady) { _paddingVerticalContent = SGetField<int>(LocalBridgeClazz, "paddingVertical"); _paddingVerticalReady = true; } return _paddingVerticalContent; } }
+            private static int _paddingVerticalContent = default;
+            private static bool _paddingVerticalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#panelBackground"/>
+            /// </summary>
+            public static int panelBackground { get { if (!_panelBackgroundReady) { _panelBackgroundContent = SGetField<int>(LocalBridgeClazz, "panelBackground"); _panelBackgroundReady = true; } return _panelBackgroundContent; } }
+            private static int _panelBackgroundContent = default;
+            private static bool _panelBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#panelColorBackground"/>
+            /// </summary>
+            public static int panelColorBackground { get { if (!_panelColorBackgroundReady) { _panelColorBackgroundContent = SGetField<int>(LocalBridgeClazz, "panelColorBackground"); _panelColorBackgroundReady = true; } return _panelColorBackgroundContent; } }
+            private static int _panelColorBackgroundContent = default;
+            private static bool _panelColorBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#panelColorForeground"/>
+            /// </summary>
+            public static int panelColorForeground { get { if (!_panelColorForegroundReady) { _panelColorForegroundContent = SGetField<int>(LocalBridgeClazz, "panelColorForeground"); _panelColorForegroundReady = true; } return _panelColorForegroundContent; } }
+            private static int _panelColorForegroundContent = default;
+            private static bool _panelColorForegroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#panelFullBackground"/>
+            /// </summary>
+            public static int panelFullBackground { get { if (!_panelFullBackgroundReady) { _panelFullBackgroundContent = SGetField<int>(LocalBridgeClazz, "panelFullBackground"); _panelFullBackgroundReady = true; } return _panelFullBackgroundContent; } }
+            private static int _panelFullBackgroundContent = default;
+            private static bool _panelFullBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#panelTextAppearance"/>
+            /// </summary>
+            public static int panelTextAppearance { get { if (!_panelTextAppearanceReady) { _panelTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "panelTextAppearance"); _panelTextAppearanceReady = true; } return _panelTextAppearanceContent; } }
+            private static int _panelTextAppearanceContent = default;
+            private static bool _panelTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#parentActivityName"/>
+            /// </summary>
+            public static int parentActivityName { get { if (!_parentActivityNameReady) { _parentActivityNameContent = SGetField<int>(LocalBridgeClazz, "parentActivityName"); _parentActivityNameReady = true; } return _parentActivityNameContent; } }
+            private static int _parentActivityNameContent = default;
+            private static bool _parentActivityNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#password"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int password { get { if (!_passwordReady) { _passwordContent = SGetField<int>(LocalBridgeClazz, "password"); _passwordReady = true; } return _passwordContent; } }
+            private static int _passwordContent = default;
+            private static bool _passwordReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#passwordsActivity"/>
+            /// </summary>
+            public static int passwordsActivity { get { if (!_passwordsActivityReady) { _passwordsActivityContent = SGetField<int>(LocalBridgeClazz, "passwordsActivity"); _passwordsActivityReady = true; } return _passwordsActivityContent; } }
+            private static int _passwordsActivityContent = default;
+            private static bool _passwordsActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#path"/>
+            /// </summary>
+            public static int path { get { if (!_pathReady) { _pathContent = SGetField<int>(LocalBridgeClazz, "path"); _pathReady = true; } return _pathContent; } }
+            private static int _pathContent = default;
+            private static bool _pathReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#pathAdvancedPattern"/>
+            /// </summary>
+            public static int pathAdvancedPattern { get { if (!_pathAdvancedPatternReady) { _pathAdvancedPatternContent = SGetField<int>(LocalBridgeClazz, "pathAdvancedPattern"); _pathAdvancedPatternReady = true; } return _pathAdvancedPatternContent; } }
+            private static int _pathAdvancedPatternContent = default;
+            private static bool _pathAdvancedPatternReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#pathData"/>
+            /// </summary>
+            public static int pathData { get { if (!_pathDataReady) { _pathDataContent = SGetField<int>(LocalBridgeClazz, "pathData"); _pathDataReady = true; } return _pathDataContent; } }
+            private static int _pathDataContent = default;
+            private static bool _pathDataReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#pathPattern"/>
+            /// </summary>
+            public static int pathPattern { get { if (!_pathPatternReady) { _pathPatternContent = SGetField<int>(LocalBridgeClazz, "pathPattern"); _pathPatternReady = true; } return _pathPatternContent; } }
+            private static int _pathPatternContent = default;
+            private static bool _pathPatternReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#pathPrefix"/>
+            /// </summary>
+            public static int pathPrefix { get { if (!_pathPrefixReady) { _pathPrefixContent = SGetField<int>(LocalBridgeClazz, "pathPrefix"); _pathPrefixReady = true; } return _pathPrefixContent; } }
+            private static int _pathPrefixContent = default;
+            private static bool _pathPrefixReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#pathSuffix"/>
+            /// </summary>
+            public static int pathSuffix { get { if (!_pathSuffixReady) { _pathSuffixContent = SGetField<int>(LocalBridgeClazz, "pathSuffix"); _pathSuffixReady = true; } return _pathSuffixContent; } }
+            private static int _pathSuffixContent = default;
+            private static bool _pathSuffixReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#patternPathData"/>
+            /// </summary>
+            public static int patternPathData { get { if (!_patternPathDataReady) { _patternPathDataContent = SGetField<int>(LocalBridgeClazz, "patternPathData"); _patternPathDataReady = true; } return _patternPathDataContent; } }
+            private static int _patternPathDataContent = default;
+            private static bool _patternPathDataReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#permission"/>
+            /// </summary>
+            public static int permission { get { if (!_permissionReady) { _permissionContent = SGetField<int>(LocalBridgeClazz, "permission"); _permissionReady = true; } return _permissionContent; } }
+            private static int _permissionContent = default;
+            private static bool _permissionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#permissionFlags"/>
+            /// </summary>
+            public static int permissionFlags { get { if (!_permissionFlagsReady) { _permissionFlagsContent = SGetField<int>(LocalBridgeClazz, "permissionFlags"); _permissionFlagsReady = true; } return _permissionFlagsContent; } }
+            private static int _permissionFlagsContent = default;
+            private static bool _permissionFlagsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#permissionGroup"/>
+            /// </summary>
+            public static int permissionGroup { get { if (!_permissionGroupReady) { _permissionGroupContent = SGetField<int>(LocalBridgeClazz, "permissionGroup"); _permissionGroupReady = true; } return _permissionGroupContent; } }
+            private static int _permissionGroupContent = default;
+            private static bool _permissionGroupReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#permissionGroupFlags"/>
+            /// </summary>
+            public static int permissionGroupFlags { get { if (!_permissionGroupFlagsReady) { _permissionGroupFlagsContent = SGetField<int>(LocalBridgeClazz, "permissionGroupFlags"); _permissionGroupFlagsReady = true; } return _permissionGroupFlagsContent; } }
+            private static int _permissionGroupFlagsContent = default;
+            private static bool _permissionGroupFlagsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#persistableMode"/>
+            /// </summary>
+            public static int persistableMode { get { if (!_persistableModeReady) { _persistableModeContent = SGetField<int>(LocalBridgeClazz, "persistableMode"); _persistableModeReady = true; } return _persistableModeContent; } }
+            private static int _persistableModeContent = default;
+            private static bool _persistableModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#persistent"/>
+            /// </summary>
+            public static int persistent { get { if (!_persistentReady) { _persistentContent = SGetField<int>(LocalBridgeClazz, "persistent"); _persistentReady = true; } return _persistentContent; } }
+            private static int _persistentContent = default;
+            private static bool _persistentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#persistentDrawingCache"/>
+            /// </summary>
+            public static int persistentDrawingCache { get { if (!_persistentDrawingCacheReady) { _persistentDrawingCacheContent = SGetField<int>(LocalBridgeClazz, "persistentDrawingCache"); _persistentDrawingCacheReady = true; } return _persistentDrawingCacheContent; } }
+            private static int _persistentDrawingCacheContent = default;
+            private static bool _persistentDrawingCacheReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#persistentWhenFeatureAvailable"/>
+            /// </summary>
+            public static int persistentWhenFeatureAvailable { get { if (!_persistentWhenFeatureAvailableReady) { _persistentWhenFeatureAvailableContent = SGetField<int>(LocalBridgeClazz, "persistentWhenFeatureAvailable"); _persistentWhenFeatureAvailableReady = true; } return _persistentWhenFeatureAvailableContent; } }
+            private static int _persistentWhenFeatureAvailableContent = default;
+            private static bool _persistentWhenFeatureAvailableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#phoneNumber"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int phoneNumber { get { if (!_phoneNumberReady) { _phoneNumberContent = SGetField<int>(LocalBridgeClazz, "phoneNumber"); _phoneNumberReady = true; } return _phoneNumberContent; } }
+            private static int _phoneNumberContent = default;
+            private static bool _phoneNumberReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#physicalKeyboardHintLanguageTag"/>
+            /// </summary>
+            public static int physicalKeyboardHintLanguageTag { get { if (!_physicalKeyboardHintLanguageTagReady) { _physicalKeyboardHintLanguageTagContent = SGetField<int>(LocalBridgeClazz, "physicalKeyboardHintLanguageTag"); _physicalKeyboardHintLanguageTagReady = true; } return _physicalKeyboardHintLanguageTagContent; } }
+            private static int _physicalKeyboardHintLanguageTagContent = default;
+            private static bool _physicalKeyboardHintLanguageTagReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#physicalKeyboardHintLayoutType"/>
+            /// </summary>
+            public static int physicalKeyboardHintLayoutType { get { if (!_physicalKeyboardHintLayoutTypeReady) { _physicalKeyboardHintLayoutTypeContent = SGetField<int>(LocalBridgeClazz, "physicalKeyboardHintLayoutType"); _physicalKeyboardHintLayoutTypeReady = true; } return _physicalKeyboardHintLayoutTypeContent; } }
+            private static int _physicalKeyboardHintLayoutTypeContent = default;
+            private static bool _physicalKeyboardHintLayoutTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#pivotX"/>
+            /// </summary>
+            public static int pivotX { get { if (!_pivotXReady) { _pivotXContent = SGetField<int>(LocalBridgeClazz, "pivotX"); _pivotXReady = true; } return _pivotXContent; } }
+            private static int _pivotXContent = default;
+            private static bool _pivotXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#pivotY"/>
+            /// </summary>
+            public static int pivotY { get { if (!_pivotYReady) { _pivotYContent = SGetField<int>(LocalBridgeClazz, "pivotY"); _pivotYReady = true; } return _pivotYContent; } }
+            private static int _pivotYContent = default;
+            private static bool _pivotYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#pointerIcon"/>
+            /// </summary>
+            public static int pointerIcon { get { if (!_pointerIconReady) { _pointerIconContent = SGetField<int>(LocalBridgeClazz, "pointerIcon"); _pointerIconReady = true; } return _pointerIconContent; } }
+            private static int _pointerIconContent = default;
+            private static bool _pointerIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupAnimationStyle"/>
+            /// </summary>
+            public static int popupAnimationStyle { get { if (!_popupAnimationStyleReady) { _popupAnimationStyleContent = SGetField<int>(LocalBridgeClazz, "popupAnimationStyle"); _popupAnimationStyleReady = true; } return _popupAnimationStyleContent; } }
+            private static int _popupAnimationStyleContent = default;
+            private static bool _popupAnimationStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupBackground"/>
+            /// </summary>
+            public static int popupBackground { get { if (!_popupBackgroundReady) { _popupBackgroundContent = SGetField<int>(LocalBridgeClazz, "popupBackground"); _popupBackgroundReady = true; } return _popupBackgroundContent; } }
+            private static int _popupBackgroundContent = default;
+            private static bool _popupBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupCharacters"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int popupCharacters { get { if (!_popupCharactersReady) { _popupCharactersContent = SGetField<int>(LocalBridgeClazz, "popupCharacters"); _popupCharactersReady = true; } return _popupCharactersContent; } }
+            private static int _popupCharactersContent = default;
+            private static bool _popupCharactersReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupElevation"/>
+            /// </summary>
+            public static int popupElevation { get { if (!_popupElevationReady) { _popupElevationContent = SGetField<int>(LocalBridgeClazz, "popupElevation"); _popupElevationReady = true; } return _popupElevationContent; } }
+            private static int _popupElevationContent = default;
+            private static bool _popupElevationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupEnterTransition"/>
+            /// </summary>
+            public static int popupEnterTransition { get { if (!_popupEnterTransitionReady) { _popupEnterTransitionContent = SGetField<int>(LocalBridgeClazz, "popupEnterTransition"); _popupEnterTransitionReady = true; } return _popupEnterTransitionContent; } }
+            private static int _popupEnterTransitionContent = default;
+            private static bool _popupEnterTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupExitTransition"/>
+            /// </summary>
+            public static int popupExitTransition { get { if (!_popupExitTransitionReady) { _popupExitTransitionContent = SGetField<int>(LocalBridgeClazz, "popupExitTransition"); _popupExitTransitionReady = true; } return _popupExitTransitionContent; } }
+            private static int _popupExitTransitionContent = default;
+            private static bool _popupExitTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupKeyboard"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int popupKeyboard { get { if (!_popupKeyboardReady) { _popupKeyboardContent = SGetField<int>(LocalBridgeClazz, "popupKeyboard"); _popupKeyboardReady = true; } return _popupKeyboardContent; } }
+            private static int _popupKeyboardContent = default;
+            private static bool _popupKeyboardReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupLayout"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int popupLayout { get { if (!_popupLayoutReady) { _popupLayoutContent = SGetField<int>(LocalBridgeClazz, "popupLayout"); _popupLayoutReady = true; } return _popupLayoutContent; } }
+            private static int _popupLayoutContent = default;
+            private static bool _popupLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupMenuStyle"/>
+            /// </summary>
+            public static int popupMenuStyle { get { if (!_popupMenuStyleReady) { _popupMenuStyleContent = SGetField<int>(LocalBridgeClazz, "popupMenuStyle"); _popupMenuStyleReady = true; } return _popupMenuStyleContent; } }
+            private static int _popupMenuStyleContent = default;
+            private static bool _popupMenuStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupTheme"/>
+            /// </summary>
+            public static int popupTheme { get { if (!_popupThemeReady) { _popupThemeContent = SGetField<int>(LocalBridgeClazz, "popupTheme"); _popupThemeReady = true; } return _popupThemeContent; } }
+            private static int _popupThemeContent = default;
+            private static bool _popupThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#popupWindowStyle"/>
+            /// </summary>
+            public static int popupWindowStyle { get { if (!_popupWindowStyleReady) { _popupWindowStyleContent = SGetField<int>(LocalBridgeClazz, "popupWindowStyle"); _popupWindowStyleReady = true; } return _popupWindowStyleContent; } }
+            private static int _popupWindowStyleContent = default;
+            private static bool _popupWindowStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#port"/>
+            /// </summary>
+            public static int port { get { if (!_portReady) { _portContent = SGetField<int>(LocalBridgeClazz, "port"); _portReady = true; } return _portContent; } }
+            private static int _portContent = default;
+            private static bool _portReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#positiveButtonText"/>
+            /// </summary>
+            public static int positiveButtonText { get { if (!_positiveButtonTextReady) { _positiveButtonTextContent = SGetField<int>(LocalBridgeClazz, "positiveButtonText"); _positiveButtonTextReady = true; } return _positiveButtonTextContent; } }
+            private static int _positiveButtonTextContent = default;
+            private static bool _positiveButtonTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preferenceCategoryStyle"/>
+            /// </summary>
+            public static int preferenceCategoryStyle { get { if (!_preferenceCategoryStyleReady) { _preferenceCategoryStyleContent = SGetField<int>(LocalBridgeClazz, "preferenceCategoryStyle"); _preferenceCategoryStyleReady = true; } return _preferenceCategoryStyleContent; } }
+            private static int _preferenceCategoryStyleContent = default;
+            private static bool _preferenceCategoryStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preferenceFragmentStyle"/>
+            /// </summary>
+            public static int preferenceFragmentStyle { get { if (!_preferenceFragmentStyleReady) { _preferenceFragmentStyleContent = SGetField<int>(LocalBridgeClazz, "preferenceFragmentStyle"); _preferenceFragmentStyleReady = true; } return _preferenceFragmentStyleContent; } }
+            private static int _preferenceFragmentStyleContent = default;
+            private static bool _preferenceFragmentStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preferenceInformationStyle"/>
+            /// </summary>
+            public static int preferenceInformationStyle { get { if (!_preferenceInformationStyleReady) { _preferenceInformationStyleContent = SGetField<int>(LocalBridgeClazz, "preferenceInformationStyle"); _preferenceInformationStyleReady = true; } return _preferenceInformationStyleContent; } }
+            private static int _preferenceInformationStyleContent = default;
+            private static bool _preferenceInformationStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preferenceLayoutChild"/>
+            /// </summary>
+            public static int preferenceLayoutChild { get { if (!_preferenceLayoutChildReady) { _preferenceLayoutChildContent = SGetField<int>(LocalBridgeClazz, "preferenceLayoutChild"); _preferenceLayoutChildReady = true; } return _preferenceLayoutChildContent; } }
+            private static int _preferenceLayoutChildContent = default;
+            private static bool _preferenceLayoutChildReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preferenceScreenStyle"/>
+            /// </summary>
+            public static int preferenceScreenStyle { get { if (!_preferenceScreenStyleReady) { _preferenceScreenStyleContent = SGetField<int>(LocalBridgeClazz, "preferenceScreenStyle"); _preferenceScreenStyleReady = true; } return _preferenceScreenStyleContent; } }
+            private static int _preferenceScreenStyleContent = default;
+            private static bool _preferenceScreenStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preferenceStyle"/>
+            /// </summary>
+            public static int preferenceStyle { get { if (!_preferenceStyleReady) { _preferenceStyleContent = SGetField<int>(LocalBridgeClazz, "preferenceStyle"); _preferenceStyleReady = true; } return _preferenceStyleContent; } }
+            private static int _preferenceStyleContent = default;
+            private static bool _preferenceStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preferKeepClear"/>
+            /// </summary>
+            public static int preferKeepClear { get { if (!_preferKeepClearReady) { _preferKeepClearContent = SGetField<int>(LocalBridgeClazz, "preferKeepClear"); _preferKeepClearReady = true; } return _preferKeepClearContent; } }
+            private static int _preferKeepClearContent = default;
+            private static bool _preferKeepClearReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preferMinimalPostProcessing"/>
+            /// </summary>
+            public static int preferMinimalPostProcessing { get { if (!_preferMinimalPostProcessingReady) { _preferMinimalPostProcessingContent = SGetField<int>(LocalBridgeClazz, "preferMinimalPostProcessing"); _preferMinimalPostProcessingReady = true; } return _preferMinimalPostProcessingContent; } }
+            private static int _preferMinimalPostProcessingContent = default;
+            private static bool _preferMinimalPostProcessingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#presentationTheme"/>
+            /// </summary>
+            public static int presentationTheme { get { if (!_presentationThemeReady) { _presentationThemeContent = SGetField<int>(LocalBridgeClazz, "presentationTheme"); _presentationThemeReady = true; } return _presentationThemeContent; } }
+            private static int _presentationThemeContent = default;
+            private static bool _presentationThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#preserveLegacyExternalStorage"/>
+            /// </summary>
+            public static int preserveLegacyExternalStorage { get { if (!_preserveLegacyExternalStorageReady) { _preserveLegacyExternalStorageContent = SGetField<int>(LocalBridgeClazz, "preserveLegacyExternalStorage"); _preserveLegacyExternalStorageReady = true; } return _preserveLegacyExternalStorageContent; } }
+            private static int _preserveLegacyExternalStorageContent = default;
+            private static bool _preserveLegacyExternalStorageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#previewImage"/>
+            /// </summary>
+            public static int previewImage { get { if (!_previewImageReady) { _previewImageContent = SGetField<int>(LocalBridgeClazz, "previewImage"); _previewImageReady = true; } return _previewImageContent; } }
+            private static int _previewImageContent = default;
+            private static bool _previewImageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#previewLayout"/>
+            /// </summary>
+            public static int previewLayout { get { if (!_previewLayoutReady) { _previewLayoutContent = SGetField<int>(LocalBridgeClazz, "previewLayout"); _previewLayoutReady = true; } return _previewLayoutContent; } }
+            private static int _previewLayoutContent = default;
+            private static bool _previewLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#primaryContentAlpha"/>
+            /// </summary>
+            public static int primaryContentAlpha { get { if (!_primaryContentAlphaReady) { _primaryContentAlphaContent = SGetField<int>(LocalBridgeClazz, "primaryContentAlpha"); _primaryContentAlphaReady = true; } return _primaryContentAlphaContent; } }
+            private static int _primaryContentAlphaContent = default;
+            private static bool _primaryContentAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#priority"/>
+            /// </summary>
+            public static int priority { get { if (!_priorityReady) { _priorityContent = SGetField<int>(LocalBridgeClazz, "priority"); _priorityReady = true; } return _priorityContent; } }
+            private static int _priorityContent = default;
+            private static bool _priorityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#privateImeOptions"/>
+            /// </summary>
+            public static int privateImeOptions { get { if (!_privateImeOptionsReady) { _privateImeOptionsContent = SGetField<int>(LocalBridgeClazz, "privateImeOptions"); _privateImeOptionsReady = true; } return _privateImeOptionsContent; } }
+            private static int _privateImeOptionsContent = default;
+            private static bool _privateImeOptionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#process"/>
+            /// </summary>
+            public static int process { get { if (!_processReady) { _processContent = SGetField<int>(LocalBridgeClazz, "process"); _processReady = true; } return _processContent; } }
+            private static int _processContent = default;
+            private static bool _processReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progress"/>
+            /// </summary>
+            public static int progress { get { if (!_progressReady) { _progressContent = SGetField<int>(LocalBridgeClazz, "progress"); _progressReady = true; } return _progressContent; } }
+            private static int _progressContent = default;
+            private static bool _progressReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBackgroundTint"/>
+            /// </summary>
+            public static int progressBackgroundTint { get { if (!_progressBackgroundTintReady) { _progressBackgroundTintContent = SGetField<int>(LocalBridgeClazz, "progressBackgroundTint"); _progressBackgroundTintReady = true; } return _progressBackgroundTintContent; } }
+            private static int _progressBackgroundTintContent = default;
+            private static bool _progressBackgroundTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBackgroundTintMode"/>
+            /// </summary>
+            public static int progressBackgroundTintMode { get { if (!_progressBackgroundTintModeReady) { _progressBackgroundTintModeContent = SGetField<int>(LocalBridgeClazz, "progressBackgroundTintMode"); _progressBackgroundTintModeReady = true; } return _progressBackgroundTintModeContent; } }
+            private static int _progressBackgroundTintModeContent = default;
+            private static bool _progressBackgroundTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarPadding"/>
+            /// </summary>
+            public static int progressBarPadding { get { if (!_progressBarPaddingReady) { _progressBarPaddingContent = SGetField<int>(LocalBridgeClazz, "progressBarPadding"); _progressBarPaddingReady = true; } return _progressBarPaddingContent; } }
+            private static int _progressBarPaddingContent = default;
+            private static bool _progressBarPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarStyle"/>
+            /// </summary>
+            public static int progressBarStyle { get { if (!_progressBarStyleReady) { _progressBarStyleContent = SGetField<int>(LocalBridgeClazz, "progressBarStyle"); _progressBarStyleReady = true; } return _progressBarStyleContent; } }
+            private static int _progressBarStyleContent = default;
+            private static bool _progressBarStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarStyleHorizontal"/>
+            /// </summary>
+            public static int progressBarStyleHorizontal { get { if (!_progressBarStyleHorizontalReady) { _progressBarStyleHorizontalContent = SGetField<int>(LocalBridgeClazz, "progressBarStyleHorizontal"); _progressBarStyleHorizontalReady = true; } return _progressBarStyleHorizontalContent; } }
+            private static int _progressBarStyleHorizontalContent = default;
+            private static bool _progressBarStyleHorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarStyleInverse"/>
+            /// </summary>
+            public static int progressBarStyleInverse { get { if (!_progressBarStyleInverseReady) { _progressBarStyleInverseContent = SGetField<int>(LocalBridgeClazz, "progressBarStyleInverse"); _progressBarStyleInverseReady = true; } return _progressBarStyleInverseContent; } }
+            private static int _progressBarStyleInverseContent = default;
+            private static bool _progressBarStyleInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarStyleLarge"/>
+            /// </summary>
+            public static int progressBarStyleLarge { get { if (!_progressBarStyleLargeReady) { _progressBarStyleLargeContent = SGetField<int>(LocalBridgeClazz, "progressBarStyleLarge"); _progressBarStyleLargeReady = true; } return _progressBarStyleLargeContent; } }
+            private static int _progressBarStyleLargeContent = default;
+            private static bool _progressBarStyleLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarStyleLargeInverse"/>
+            /// </summary>
+            public static int progressBarStyleLargeInverse { get { if (!_progressBarStyleLargeInverseReady) { _progressBarStyleLargeInverseContent = SGetField<int>(LocalBridgeClazz, "progressBarStyleLargeInverse"); _progressBarStyleLargeInverseReady = true; } return _progressBarStyleLargeInverseContent; } }
+            private static int _progressBarStyleLargeInverseContent = default;
+            private static bool _progressBarStyleLargeInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarStyleSmall"/>
+            /// </summary>
+            public static int progressBarStyleSmall { get { if (!_progressBarStyleSmallReady) { _progressBarStyleSmallContent = SGetField<int>(LocalBridgeClazz, "progressBarStyleSmall"); _progressBarStyleSmallReady = true; } return _progressBarStyleSmallContent; } }
+            private static int _progressBarStyleSmallContent = default;
+            private static bool _progressBarStyleSmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarStyleSmallInverse"/>
+            /// </summary>
+            public static int progressBarStyleSmallInverse { get { if (!_progressBarStyleSmallInverseReady) { _progressBarStyleSmallInverseContent = SGetField<int>(LocalBridgeClazz, "progressBarStyleSmallInverse"); _progressBarStyleSmallInverseReady = true; } return _progressBarStyleSmallInverseContent; } }
+            private static int _progressBarStyleSmallInverseContent = default;
+            private static bool _progressBarStyleSmallInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressBarStyleSmallTitle"/>
+            /// </summary>
+            public static int progressBarStyleSmallTitle { get { if (!_progressBarStyleSmallTitleReady) { _progressBarStyleSmallTitleContent = SGetField<int>(LocalBridgeClazz, "progressBarStyleSmallTitle"); _progressBarStyleSmallTitleReady = true; } return _progressBarStyleSmallTitleContent; } }
+            private static int _progressBarStyleSmallTitleContent = default;
+            private static bool _progressBarStyleSmallTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressDrawable"/>
+            /// </summary>
+            public static int progressDrawable { get { if (!_progressDrawableReady) { _progressDrawableContent = SGetField<int>(LocalBridgeClazz, "progressDrawable"); _progressDrawableReady = true; } return _progressDrawableContent; } }
+            private static int _progressDrawableContent = default;
+            private static bool _progressDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressTint"/>
+            /// </summary>
+            public static int progressTint { get { if (!_progressTintReady) { _progressTintContent = SGetField<int>(LocalBridgeClazz, "progressTint"); _progressTintReady = true; } return _progressTintContent; } }
+            private static int _progressTintContent = default;
+            private static bool _progressTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#progressTintMode"/>
+            /// </summary>
+            public static int progressTintMode { get { if (!_progressTintModeReady) { _progressTintModeContent = SGetField<int>(LocalBridgeClazz, "progressTintMode"); _progressTintModeReady = true; } return _progressTintModeContent; } }
+            private static int _progressTintModeContent = default;
+            private static bool _progressTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#prompt"/>
+            /// </summary>
+            public static int prompt { get { if (!_promptReady) { _promptContent = SGetField<int>(LocalBridgeClazz, "prompt"); _promptReady = true; } return _promptContent; } }
+            private static int _promptContent = default;
+            private static bool _promptReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#propertyName"/>
+            /// </summary>
+            public static int propertyName { get { if (!_propertyNameReady) { _propertyNameContent = SGetField<int>(LocalBridgeClazz, "propertyName"); _propertyNameReady = true; } return _propertyNameContent; } }
+            private static int _propertyNameContent = default;
+            private static bool _propertyNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#propertyXName"/>
+            /// </summary>
+            public static int propertyXName { get { if (!_propertyXNameReady) { _propertyXNameContent = SGetField<int>(LocalBridgeClazz, "propertyXName"); _propertyXNameReady = true; } return _propertyXNameContent; } }
+            private static int _propertyXNameContent = default;
+            private static bool _propertyXNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#propertyYName"/>
+            /// </summary>
+            public static int propertyYName { get { if (!_propertyYNameReady) { _propertyYNameContent = SGetField<int>(LocalBridgeClazz, "propertyYName"); _propertyYNameReady = true; } return _propertyYNameContent; } }
+            private static int _propertyYNameContent = default;
+            private static bool _propertyYNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#protectionLevel"/>
+            /// </summary>
+            public static int protectionLevel { get { if (!_protectionLevelReady) { _protectionLevelContent = SGetField<int>(LocalBridgeClazz, "protectionLevel"); _protectionLevelReady = true; } return _protectionLevelContent; } }
+            private static int _protectionLevelContent = default;
+            private static bool _protectionLevelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#publicKey"/>
+            /// </summary>
+            public static int publicKey { get { if (!_publicKeyReady) { _publicKeyContent = SGetField<int>(LocalBridgeClazz, "publicKey"); _publicKeyReady = true; } return _publicKeyContent; } }
+            private static int _publicKeyContent = default;
+            private static bool _publicKeyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#queryActionMsg"/>
+            /// </summary>
+            public static int queryActionMsg { get { if (!_queryActionMsgReady) { _queryActionMsgContent = SGetField<int>(LocalBridgeClazz, "queryActionMsg"); _queryActionMsgReady = true; } return _queryActionMsgContent; } }
+            private static int _queryActionMsgContent = default;
+            private static bool _queryActionMsgReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#queryAfterZeroResults"/>
+            /// </summary>
+            public static int queryAfterZeroResults { get { if (!_queryAfterZeroResultsReady) { _queryAfterZeroResultsContent = SGetField<int>(LocalBridgeClazz, "queryAfterZeroResults"); _queryAfterZeroResultsReady = true; } return _queryAfterZeroResultsContent; } }
+            private static int _queryAfterZeroResultsContent = default;
+            private static bool _queryAfterZeroResultsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#queryBackground"/>
+            /// </summary>
+            public static int queryBackground { get { if (!_queryBackgroundReady) { _queryBackgroundContent = SGetField<int>(LocalBridgeClazz, "queryBackground"); _queryBackgroundReady = true; } return _queryBackgroundContent; } }
+            private static int _queryBackgroundContent = default;
+            private static bool _queryBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#queryHint"/>
+            /// </summary>
+            public static int queryHint { get { if (!_queryHintReady) { _queryHintContent = SGetField<int>(LocalBridgeClazz, "queryHint"); _queryHintReady = true; } return _queryHintContent; } }
+            private static int _queryHintContent = default;
+            private static bool _queryHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#quickContactBadgeStyleSmallWindowLarge"/>
+            /// </summary>
+            public static int quickContactBadgeStyleSmallWindowLarge { get { if (!_quickContactBadgeStyleSmallWindowLargeReady) { _quickContactBadgeStyleSmallWindowLargeContent = SGetField<int>(LocalBridgeClazz, "quickContactBadgeStyleSmallWindowLarge"); _quickContactBadgeStyleSmallWindowLargeReady = true; } return _quickContactBadgeStyleSmallWindowLargeContent; } }
+            private static int _quickContactBadgeStyleSmallWindowLargeContent = default;
+            private static bool _quickContactBadgeStyleSmallWindowLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#quickContactBadgeStyleSmallWindowMedium"/>
+            /// </summary>
+            public static int quickContactBadgeStyleSmallWindowMedium { get { if (!_quickContactBadgeStyleSmallWindowMediumReady) { _quickContactBadgeStyleSmallWindowMediumContent = SGetField<int>(LocalBridgeClazz, "quickContactBadgeStyleSmallWindowMedium"); _quickContactBadgeStyleSmallWindowMediumReady = true; } return _quickContactBadgeStyleSmallWindowMediumContent; } }
+            private static int _quickContactBadgeStyleSmallWindowMediumContent = default;
+            private static bool _quickContactBadgeStyleSmallWindowMediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#quickContactBadgeStyleSmallWindowSmall"/>
+            /// </summary>
+            public static int quickContactBadgeStyleSmallWindowSmall { get { if (!_quickContactBadgeStyleSmallWindowSmallReady) { _quickContactBadgeStyleSmallWindowSmallContent = SGetField<int>(LocalBridgeClazz, "quickContactBadgeStyleSmallWindowSmall"); _quickContactBadgeStyleSmallWindowSmallReady = true; } return _quickContactBadgeStyleSmallWindowSmallContent; } }
+            private static int _quickContactBadgeStyleSmallWindowSmallContent = default;
+            private static bool _quickContactBadgeStyleSmallWindowSmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#quickContactBadgeStyleWindowLarge"/>
+            /// </summary>
+            public static int quickContactBadgeStyleWindowLarge { get { if (!_quickContactBadgeStyleWindowLargeReady) { _quickContactBadgeStyleWindowLargeContent = SGetField<int>(LocalBridgeClazz, "quickContactBadgeStyleWindowLarge"); _quickContactBadgeStyleWindowLargeReady = true; } return _quickContactBadgeStyleWindowLargeContent; } }
+            private static int _quickContactBadgeStyleWindowLargeContent = default;
+            private static bool _quickContactBadgeStyleWindowLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#quickContactBadgeStyleWindowMedium"/>
+            /// </summary>
+            public static int quickContactBadgeStyleWindowMedium { get { if (!_quickContactBadgeStyleWindowMediumReady) { _quickContactBadgeStyleWindowMediumContent = SGetField<int>(LocalBridgeClazz, "quickContactBadgeStyleWindowMedium"); _quickContactBadgeStyleWindowMediumReady = true; } return _quickContactBadgeStyleWindowMediumContent; } }
+            private static int _quickContactBadgeStyleWindowMediumContent = default;
+            private static bool _quickContactBadgeStyleWindowMediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#quickContactBadgeStyleWindowSmall"/>
+            /// </summary>
+            public static int quickContactBadgeStyleWindowSmall { get { if (!_quickContactBadgeStyleWindowSmallReady) { _quickContactBadgeStyleWindowSmallContent = SGetField<int>(LocalBridgeClazz, "quickContactBadgeStyleWindowSmall"); _quickContactBadgeStyleWindowSmallReady = true; } return _quickContactBadgeStyleWindowSmallContent; } }
+            private static int _quickContactBadgeStyleWindowSmallContent = default;
+            private static bool _quickContactBadgeStyleWindowSmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#radioButtonStyle"/>
+            /// </summary>
+            public static int radioButtonStyle { get { if (!_radioButtonStyleReady) { _radioButtonStyleContent = SGetField<int>(LocalBridgeClazz, "radioButtonStyle"); _radioButtonStyleReady = true; } return _radioButtonStyleContent; } }
+            private static int _radioButtonStyleContent = default;
+            private static bool _radioButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#radius"/>
+            /// </summary>
+            public static int radius { get { if (!_radiusReady) { _radiusContent = SGetField<int>(LocalBridgeClazz, "radius"); _radiusReady = true; } return _radiusContent; } }
+            private static int _radiusContent = default;
+            private static bool _radiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rating"/>
+            /// </summary>
+            public static int rating { get { if (!_ratingReady) { _ratingContent = SGetField<int>(LocalBridgeClazz, "rating"); _ratingReady = true; } return _ratingContent; } }
+            private static int _ratingContent = default;
+            private static bool _ratingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ratingBarStyle"/>
+            /// </summary>
+            public static int ratingBarStyle { get { if (!_ratingBarStyleReady) { _ratingBarStyleContent = SGetField<int>(LocalBridgeClazz, "ratingBarStyle"); _ratingBarStyleReady = true; } return _ratingBarStyleContent; } }
+            private static int _ratingBarStyleContent = default;
+            private static bool _ratingBarStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ratingBarStyleIndicator"/>
+            /// </summary>
+            public static int ratingBarStyleIndicator { get { if (!_ratingBarStyleIndicatorReady) { _ratingBarStyleIndicatorContent = SGetField<int>(LocalBridgeClazz, "ratingBarStyleIndicator"); _ratingBarStyleIndicatorReady = true; } return _ratingBarStyleIndicatorContent; } }
+            private static int _ratingBarStyleIndicatorContent = default;
+            private static bool _ratingBarStyleIndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ratingBarStyleSmall"/>
+            /// </summary>
+            public static int ratingBarStyleSmall { get { if (!_ratingBarStyleSmallReady) { _ratingBarStyleSmallContent = SGetField<int>(LocalBridgeClazz, "ratingBarStyleSmall"); _ratingBarStyleSmallReady = true; } return _ratingBarStyleSmallContent; } }
+            private static int _ratingBarStyleSmallContent = default;
+            private static bool _ratingBarStyleSmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#readPermission"/>
+            /// </summary>
+            public static int readPermission { get { if (!_readPermissionReady) { _readPermissionContent = SGetField<int>(LocalBridgeClazz, "readPermission"); _readPermissionReady = true; } return _readPermissionContent; } }
+            private static int _readPermissionContent = default;
+            private static bool _readPermissionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#recognitionService"/>
+            /// </summary>
+            public static int recognitionService { get { if (!_recognitionServiceReady) { _recognitionServiceContent = SGetField<int>(LocalBridgeClazz, "recognitionService"); _recognitionServiceReady = true; } return _recognitionServiceContent; } }
+            private static int _recognitionServiceContent = default;
+            private static bool _recognitionServiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#recreateOnConfigChanges"/>
+            /// </summary>
+            public static int recreateOnConfigChanges { get { if (!_recreateOnConfigChangesReady) { _recreateOnConfigChangesContent = SGetField<int>(LocalBridgeClazz, "recreateOnConfigChanges"); _recreateOnConfigChangesReady = true; } return _recreateOnConfigChangesContent; } }
+            private static int _recreateOnConfigChangesContent = default;
+            private static bool _recreateOnConfigChangesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#recycleEnabled"/>
+            /// </summary>
+            public static int recycleEnabled { get { if (!_recycleEnabledReady) { _recycleEnabledContent = SGetField<int>(LocalBridgeClazz, "recycleEnabled"); _recycleEnabledReady = true; } return _recycleEnabledContent; } }
+            private static int _recycleEnabledContent = default;
+            private static bool _recycleEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#relinquishTaskIdentity"/>
+            /// </summary>
+            public static int relinquishTaskIdentity { get { if (!_relinquishTaskIdentityReady) { _relinquishTaskIdentityContent = SGetField<int>(LocalBridgeClazz, "relinquishTaskIdentity"); _relinquishTaskIdentityReady = true; } return _relinquishTaskIdentityContent; } }
+            private static int _relinquishTaskIdentityContent = default;
+            private static bool _relinquishTaskIdentityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#reparent"/>
+            /// </summary>
+            public static int reparent { get { if (!_reparentReady) { _reparentContent = SGetField<int>(LocalBridgeClazz, "reparent"); _reparentReady = true; } return _reparentContent; } }
+            private static int _reparentContent = default;
+            private static bool _reparentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#reparentWithOverlay"/>
+            /// </summary>
+            public static int reparentWithOverlay { get { if (!_reparentWithOverlayReady) { _reparentWithOverlayContent = SGetField<int>(LocalBridgeClazz, "reparentWithOverlay"); _reparentWithOverlayReady = true; } return _reparentWithOverlayContent; } }
+            private static int _reparentWithOverlayContent = default;
+            private static bool _reparentWithOverlayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#repeatCount"/>
+            /// </summary>
+            public static int repeatCount { get { if (!_repeatCountReady) { _repeatCountContent = SGetField<int>(LocalBridgeClazz, "repeatCount"); _repeatCountReady = true; } return _repeatCountContent; } }
+            private static int _repeatCountContent = default;
+            private static bool _repeatCountReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#repeatMode"/>
+            /// </summary>
+            public static int repeatMode { get { if (!_repeatModeReady) { _repeatModeContent = SGetField<int>(LocalBridgeClazz, "repeatMode"); _repeatModeReady = true; } return _repeatModeContent; } }
+            private static int _repeatModeContent = default;
+            private static bool _repeatModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#reqFiveWayNav"/>
+            /// </summary>
+            public static int reqFiveWayNav { get { if (!_reqFiveWayNavReady) { _reqFiveWayNavContent = SGetField<int>(LocalBridgeClazz, "reqFiveWayNav"); _reqFiveWayNavReady = true; } return _reqFiveWayNavContent; } }
+            private static int _reqFiveWayNavContent = default;
+            private static bool _reqFiveWayNavReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#reqHardKeyboard"/>
+            /// </summary>
+            public static int reqHardKeyboard { get { if (!_reqHardKeyboardReady) { _reqHardKeyboardContent = SGetField<int>(LocalBridgeClazz, "reqHardKeyboard"); _reqHardKeyboardReady = true; } return _reqHardKeyboardContent; } }
+            private static int _reqHardKeyboardContent = default;
+            private static bool _reqHardKeyboardReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#reqKeyboardType"/>
+            /// </summary>
+            public static int reqKeyboardType { get { if (!_reqKeyboardTypeReady) { _reqKeyboardTypeContent = SGetField<int>(LocalBridgeClazz, "reqKeyboardType"); _reqKeyboardTypeReady = true; } return _reqKeyboardTypeContent; } }
+            private static int _reqKeyboardTypeContent = default;
+            private static bool _reqKeyboardTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#reqNavigation"/>
+            /// </summary>
+            public static int reqNavigation { get { if (!_reqNavigationReady) { _reqNavigationContent = SGetField<int>(LocalBridgeClazz, "reqNavigation"); _reqNavigationReady = true; } return _reqNavigationContent; } }
+            private static int _reqNavigationContent = default;
+            private static bool _reqNavigationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#reqTouchScreen"/>
+            /// </summary>
+            public static int reqTouchScreen { get { if (!_reqTouchScreenReady) { _reqTouchScreenContent = SGetField<int>(LocalBridgeClazz, "reqTouchScreen"); _reqTouchScreenReady = true; } return _reqTouchScreenContent; } }
+            private static int _reqTouchScreenContent = default;
+            private static bool _reqTouchScreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requestLegacyExternalStorage"/>
+            /// </summary>
+            public static int requestLegacyExternalStorage { get { if (!_requestLegacyExternalStorageReady) { _requestLegacyExternalStorageContent = SGetField<int>(LocalBridgeClazz, "requestLegacyExternalStorage"); _requestLegacyExternalStorageReady = true; } return _requestLegacyExternalStorageContent; } }
+            private static int _requestLegacyExternalStorageContent = default;
+            private static bool _requestLegacyExternalStorageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requestRawExternalStorageAccess"/>
+            /// </summary>
+            public static int requestRawExternalStorageAccess { get { if (!_requestRawExternalStorageAccessReady) { _requestRawExternalStorageAccessContent = SGetField<int>(LocalBridgeClazz, "requestRawExternalStorageAccess"); _requestRawExternalStorageAccessReady = true; } return _requestRawExternalStorageAccessContent; } }
+            private static int _requestRawExternalStorageAccessContent = default;
+            private static bool _requestRawExternalStorageAccessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#required"/>
+            /// </summary>
+            public static int required { get { if (!_requiredReady) { _requiredContent = SGetField<int>(LocalBridgeClazz, "required"); _requiredReady = true; } return _requiredContent; } }
+            private static int _requiredContent = default;
+            private static bool _requiredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requiredAccountType"/>
+            /// </summary>
+            public static int requiredAccountType { get { if (!_requiredAccountTypeReady) { _requiredAccountTypeContent = SGetField<int>(LocalBridgeClazz, "requiredAccountType"); _requiredAccountTypeReady = true; } return _requiredAccountTypeContent; } }
+            private static int _requiredAccountTypeContent = default;
+            private static bool _requiredAccountTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requiredDisplayCategory"/>
+            /// </summary>
+            public static int requiredDisplayCategory { get { if (!_requiredDisplayCategoryReady) { _requiredDisplayCategoryContent = SGetField<int>(LocalBridgeClazz, "requiredDisplayCategory"); _requiredDisplayCategoryReady = true; } return _requiredDisplayCategoryContent; } }
+            private static int _requiredDisplayCategoryContent = default;
+            private static bool _requiredDisplayCategoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requireDeviceScreenOn"/>
+            /// </summary>
+            public static int requireDeviceScreenOn { get { if (!_requireDeviceScreenOnReady) { _requireDeviceScreenOnContent = SGetField<int>(LocalBridgeClazz, "requireDeviceScreenOn"); _requireDeviceScreenOnReady = true; } return _requireDeviceScreenOnContent; } }
+            private static int _requireDeviceScreenOnContent = default;
+            private static bool _requireDeviceScreenOnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requireDeviceUnlock"/>
+            /// </summary>
+            public static int requireDeviceUnlock { get { if (!_requireDeviceUnlockReady) { _requireDeviceUnlockContent = SGetField<int>(LocalBridgeClazz, "requireDeviceUnlock"); _requireDeviceUnlockReady = true; } return _requireDeviceUnlockContent; } }
+            private static int _requireDeviceUnlockContent = default;
+            private static bool _requireDeviceUnlockReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requiredFeature"/>
+            /// </summary>
+            public static int requiredFeature { get { if (!_requiredFeatureReady) { _requiredFeatureContent = SGetField<int>(LocalBridgeClazz, "requiredFeature"); _requiredFeatureReady = true; } return _requiredFeatureContent; } }
+            private static int _requiredFeatureContent = default;
+            private static bool _requiredFeatureReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requiredForAllUsers"/>
+            /// </summary>
+            public static int requiredForAllUsers { get { if (!_requiredForAllUsersReady) { _requiredForAllUsersContent = SGetField<int>(LocalBridgeClazz, "requiredForAllUsers"); _requiredForAllUsersReady = true; } return _requiredForAllUsersContent; } }
+            private static int _requiredForAllUsersContent = default;
+            private static bool _requiredForAllUsersReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requiredNotFeature"/>
+            /// </summary>
+            public static int requiredNotFeature { get { if (!_requiredNotFeatureReady) { _requiredNotFeatureContent = SGetField<int>(LocalBridgeClazz, "requiredNotFeature"); _requiredNotFeatureReady = true; } return _requiredNotFeatureContent; } }
+            private static int _requiredNotFeatureContent = default;
+            private static bool _requiredNotFeatureReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requiredSplitTypes"/>
+            /// </summary>
+            public static int requiredSplitTypes { get { if (!_requiredSplitTypesReady) { _requiredSplitTypesContent = SGetField<int>(LocalBridgeClazz, "requiredSplitTypes"); _requiredSplitTypesReady = true; } return _requiredSplitTypesContent; } }
+            private static int _requiredSplitTypesContent = default;
+            private static bool _requiredSplitTypesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requiresFadingEdge"/>
+            /// </summary>
+            public static int requiresFadingEdge { get { if (!_requiresFadingEdgeReady) { _requiresFadingEdgeContent = SGetField<int>(LocalBridgeClazz, "requiresFadingEdge"); _requiresFadingEdgeReady = true; } return _requiresFadingEdgeContent; } }
+            private static int _requiresFadingEdgeContent = default;
+            private static bool _requiresFadingEdgeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#requiresSmallestWidthDp"/>
+            /// </summary>
+            public static int requiresSmallestWidthDp { get { if (!_requiresSmallestWidthDpReady) { _requiresSmallestWidthDpContent = SGetField<int>(LocalBridgeClazz, "requiresSmallestWidthDp"); _requiresSmallestWidthDpReady = true; } return _requiresSmallestWidthDpContent; } }
+            private static int _requiresSmallestWidthDpContent = default;
+            private static bool _requiresSmallestWidthDpReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#resetEnabledSettingsOnAppDataCleared"/>
+            /// </summary>
+            public static int resetEnabledSettingsOnAppDataCleared { get { if (!_resetEnabledSettingsOnAppDataClearedReady) { _resetEnabledSettingsOnAppDataClearedContent = SGetField<int>(LocalBridgeClazz, "resetEnabledSettingsOnAppDataCleared"); _resetEnabledSettingsOnAppDataClearedReady = true; } return _resetEnabledSettingsOnAppDataClearedContent; } }
+            private static int _resetEnabledSettingsOnAppDataClearedContent = default;
+            private static bool _resetEnabledSettingsOnAppDataClearedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#resizeable"/>
+            /// </summary>
+            public static int resizeable { get { if (!_resizeableReady) { _resizeableContent = SGetField<int>(LocalBridgeClazz, "resizeable"); _resizeableReady = true; } return _resizeableContent; } }
+            private static int _resizeableContent = default;
+            private static bool _resizeableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#resizeableActivity"/>
+            /// </summary>
+            public static int resizeableActivity { get { if (!_resizeableActivityReady) { _resizeableActivityContent = SGetField<int>(LocalBridgeClazz, "resizeableActivity"); _resizeableActivityReady = true; } return _resizeableActivityContent; } }
+            private static int _resizeableActivityContent = default;
+            private static bool _resizeableActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#resizeClip"/>
+            /// </summary>
+            public static int resizeClip { get { if (!_resizeClipReady) { _resizeClipContent = SGetField<int>(LocalBridgeClazz, "resizeClip"); _resizeClipReady = true; } return _resizeClipContent; } }
+            private static int _resizeClipContent = default;
+            private static bool _resizeClipReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#resizeMode"/>
+            /// </summary>
+            public static int resizeMode { get { if (!_resizeModeReady) { _resizeModeContent = SGetField<int>(LocalBridgeClazz, "resizeMode"); _resizeModeReady = true; } return _resizeModeContent; } }
+            private static int _resizeModeContent = default;
+            private static bool _resizeModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#resource"/>
+            /// </summary>
+            public static int resource { get { if (!_resourceReady) { _resourceContent = SGetField<int>(LocalBridgeClazz, "resource"); _resourceReady = true; } return _resourceContent; } }
+            private static int _resourceContent = default;
+            private static bool _resourceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#resourcesMap"/>
+            /// </summary>
+            public static int resourcesMap { get { if (!_resourcesMapReady) { _resourcesMapContent = SGetField<int>(LocalBridgeClazz, "resourcesMap"); _resourcesMapReady = true; } return _resourcesMapContent; } }
+            private static int _resourcesMapContent = default;
+            private static bool _resourcesMapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#restoreAnyVersion"/>
+            /// </summary>
+            public static int restoreAnyVersion { get { if (!_restoreAnyVersionReady) { _restoreAnyVersionContent = SGetField<int>(LocalBridgeClazz, "restoreAnyVersion"); _restoreAnyVersionReady = true; } return _restoreAnyVersionContent; } }
+            private static int _restoreAnyVersionContent = default;
+            private static bool _restoreAnyVersionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#restoreNeedsApplication"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int restoreNeedsApplication { get { if (!_restoreNeedsApplicationReady) { _restoreNeedsApplicationContent = SGetField<int>(LocalBridgeClazz, "restoreNeedsApplication"); _restoreNeedsApplicationReady = true; } return _restoreNeedsApplicationContent; } }
+            private static int _restoreNeedsApplicationContent = default;
+            private static bool _restoreNeedsApplicationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#restrictedAccountType"/>
+            /// </summary>
+            public static int restrictedAccountType { get { if (!_restrictedAccountTypeReady) { _restrictedAccountTypeContent = SGetField<int>(LocalBridgeClazz, "restrictedAccountType"); _restrictedAccountTypeReady = true; } return _restrictedAccountTypeContent; } }
+            private static int _restrictedAccountTypeContent = default;
+            private static bool _restrictedAccountTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#restrictionType"/>
+            /// </summary>
+            public static int restrictionType { get { if (!_restrictionTypeReady) { _restrictionTypeContent = SGetField<int>(LocalBridgeClazz, "restrictionType"); _restrictionTypeReady = true; } return _restrictionTypeContent; } }
+            private static int _restrictionTypeContent = default;
+            private static bool _restrictionTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#resumeWhilePausing"/>
+            /// </summary>
+            public static int resumeWhilePausing { get { if (!_resumeWhilePausingReady) { _resumeWhilePausingContent = SGetField<int>(LocalBridgeClazz, "resumeWhilePausing"); _resumeWhilePausingReady = true; } return _resumeWhilePausingContent; } }
+            private static int _resumeWhilePausingContent = default;
+            private static bool _resumeWhilePausingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#reversible"/>
+            /// </summary>
+            public static int reversible { get { if (!_reversibleReady) { _reversibleContent = SGetField<int>(LocalBridgeClazz, "reversible"); _reversibleReady = true; } return _reversibleContent; } }
+            private static int _reversibleContent = default;
+            private static bool _reversibleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#revisionCode"/>
+            /// </summary>
+            public static int revisionCode { get { if (!_revisionCodeReady) { _revisionCodeContent = SGetField<int>(LocalBridgeClazz, "revisionCode"); _revisionCodeReady = true; } return _revisionCodeContent; } }
+            private static int _revisionCodeContent = default;
+            private static bool _revisionCodeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#right"/>
+            /// </summary>
+            public static int right { get { if (!_rightReady) { _rightContent = SGetField<int>(LocalBridgeClazz, "right"); _rightReady = true; } return _rightContent; } }
+            private static int _rightContent = default;
+            private static bool _rightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ringtonePreferenceStyle"/>
+            /// </summary>
+            public static int ringtonePreferenceStyle { get { if (!_ringtonePreferenceStyleReady) { _ringtonePreferenceStyleContent = SGetField<int>(LocalBridgeClazz, "ringtonePreferenceStyle"); _ringtonePreferenceStyleReady = true; } return _ringtonePreferenceStyleContent; } }
+            private static int _ringtonePreferenceStyleContent = default;
+            private static bool _ringtonePreferenceStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ringtoneType"/>
+            /// </summary>
+            public static int ringtoneType { get { if (!_ringtoneTypeReady) { _ringtoneTypeContent = SGetField<int>(LocalBridgeClazz, "ringtoneType"); _ringtoneTypeReady = true; } return _ringtoneTypeContent; } }
+            private static int _ringtoneTypeContent = default;
+            private static bool _ringtoneTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rollbackDataPolicy"/>
+            /// </summary>
+            public static int rollbackDataPolicy { get { if (!_rollbackDataPolicyReady) { _rollbackDataPolicyContent = SGetField<int>(LocalBridgeClazz, "rollbackDataPolicy"); _rollbackDataPolicyReady = true; } return _rollbackDataPolicyContent; } }
+            private static int _rollbackDataPolicyContent = default;
+            private static bool _rollbackDataPolicyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rotation"/>
+            /// </summary>
+            public static int rotation { get { if (!_rotationReady) { _rotationContent = SGetField<int>(LocalBridgeClazz, "rotation"); _rotationReady = true; } return _rotationContent; } }
+            private static int _rotationContent = default;
+            private static bool _rotationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rotationAnimation"/>
+            /// </summary>
+            public static int rotationAnimation { get { if (!_rotationAnimationReady) { _rotationAnimationContent = SGetField<int>(LocalBridgeClazz, "rotationAnimation"); _rotationAnimationReady = true; } return _rotationAnimationContent; } }
+            private static int _rotationAnimationContent = default;
+            private static bool _rotationAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rotationX"/>
+            /// </summary>
+            public static int rotationX { get { if (!_rotationXReady) { _rotationXContent = SGetField<int>(LocalBridgeClazz, "rotationX"); _rotationXReady = true; } return _rotationXContent; } }
+            private static int _rotationXContent = default;
+            private static bool _rotationXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rotationY"/>
+            /// </summary>
+            public static int rotationY { get { if (!_rotationYReady) { _rotationYContent = SGetField<int>(LocalBridgeClazz, "rotationY"); _rotationYReady = true; } return _rotationYContent; } }
+            private static int _rotationYContent = default;
+            private static bool _rotationYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#roundIcon"/>
+            /// </summary>
+            public static int roundIcon { get { if (!_roundIconReady) { _roundIconContent = SGetField<int>(LocalBridgeClazz, "roundIcon"); _roundIconReady = true; } return _roundIconContent; } }
+            private static int _roundIconContent = default;
+            private static bool _roundIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rowCount"/>
+            /// </summary>
+            public static int rowCount { get { if (!_rowCountReady) { _rowCountContent = SGetField<int>(LocalBridgeClazz, "rowCount"); _rowCountReady = true; } return _rowCountContent; } }
+            private static int _rowCountContent = default;
+            private static bool _rowCountReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rowDelay"/>
+            /// </summary>
+            public static int rowDelay { get { if (!_rowDelayReady) { _rowDelayContent = SGetField<int>(LocalBridgeClazz, "rowDelay"); _rowDelayReady = true; } return _rowDelayContent; } }
+            private static int _rowDelayContent = default;
+            private static bool _rowDelayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rowEdgeFlags"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int rowEdgeFlags { get { if (!_rowEdgeFlagsReady) { _rowEdgeFlagsContent = SGetField<int>(LocalBridgeClazz, "rowEdgeFlags"); _rowEdgeFlagsReady = true; } return _rowEdgeFlagsContent; } }
+            private static int _rowEdgeFlagsContent = default;
+            private static bool _rowEdgeFlagsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rowHeight"/>
+            /// </summary>
+            public static int rowHeight { get { if (!_rowHeightReady) { _rowHeightContent = SGetField<int>(LocalBridgeClazz, "rowHeight"); _rowHeightReady = true; } return _rowHeightContent; } }
+            private static int _rowHeightContent = default;
+            private static bool _rowHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#rowOrderPreserved"/>
+            /// </summary>
+            public static int rowOrderPreserved { get { if (!_rowOrderPreservedReady) { _rowOrderPreservedContent = SGetField<int>(LocalBridgeClazz, "rowOrderPreserved"); _rowOrderPreservedReady = true; } return _rowOrderPreservedContent; } }
+            private static int _rowOrderPreservedContent = default;
+            private static bool _rowOrderPreservedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#saveEnabled"/>
+            /// </summary>
+            public static int saveEnabled { get { if (!_saveEnabledReady) { _saveEnabledContent = SGetField<int>(LocalBridgeClazz, "saveEnabled"); _saveEnabledReady = true; } return _saveEnabledContent; } }
+            private static int _saveEnabledContent = default;
+            private static bool _saveEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scaleGravity"/>
+            /// </summary>
+            public static int scaleGravity { get { if (!_scaleGravityReady) { _scaleGravityContent = SGetField<int>(LocalBridgeClazz, "scaleGravity"); _scaleGravityReady = true; } return _scaleGravityContent; } }
+            private static int _scaleGravityContent = default;
+            private static bool _scaleGravityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scaleHeight"/>
+            /// </summary>
+            public static int scaleHeight { get { if (!_scaleHeightReady) { _scaleHeightContent = SGetField<int>(LocalBridgeClazz, "scaleHeight"); _scaleHeightReady = true; } return _scaleHeightContent; } }
+            private static int _scaleHeightContent = default;
+            private static bool _scaleHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scaleType"/>
+            /// </summary>
+            public static int scaleType { get { if (!_scaleTypeReady) { _scaleTypeContent = SGetField<int>(LocalBridgeClazz, "scaleType"); _scaleTypeReady = true; } return _scaleTypeContent; } }
+            private static int _scaleTypeContent = default;
+            private static bool _scaleTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scaleWidth"/>
+            /// </summary>
+            public static int scaleWidth { get { if (!_scaleWidthReady) { _scaleWidthContent = SGetField<int>(LocalBridgeClazz, "scaleWidth"); _scaleWidthReady = true; } return _scaleWidthContent; } }
+            private static int _scaleWidthContent = default;
+            private static bool _scaleWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scaleX"/>
+            /// </summary>
+            public static int scaleX { get { if (!_scaleXReady) { _scaleXContent = SGetField<int>(LocalBridgeClazz, "scaleX"); _scaleXReady = true; } return _scaleXContent; } }
+            private static int _scaleXContent = default;
+            private static bool _scaleXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scaleY"/>
+            /// </summary>
+            public static int scaleY { get { if (!_scaleYReady) { _scaleYContent = SGetField<int>(LocalBridgeClazz, "scaleY"); _scaleYReady = true; } return _scaleYContent; } }
+            private static int _scaleYContent = default;
+            private static bool _scaleYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scheme"/>
+            /// </summary>
+            public static int scheme { get { if (!_schemeReady) { _schemeContent = SGetField<int>(LocalBridgeClazz, "scheme"); _schemeReady = true; } return _schemeContent; } }
+            private static int _schemeContent = default;
+            private static bool _schemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#screenDensity"/>
+            /// </summary>
+            public static int screenDensity { get { if (!_screenDensityReady) { _screenDensityContent = SGetField<int>(LocalBridgeClazz, "screenDensity"); _screenDensityReady = true; } return _screenDensityContent; } }
+            private static int _screenDensityContent = default;
+            private static bool _screenDensityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#screenOrientation"/>
+            /// </summary>
+            public static int screenOrientation { get { if (!_screenOrientationReady) { _screenOrientationContent = SGetField<int>(LocalBridgeClazz, "screenOrientation"); _screenOrientationReady = true; } return _screenOrientationContent; } }
+            private static int _screenOrientationContent = default;
+            private static bool _screenOrientationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#screenReaderFocusable"/>
+            /// </summary>
+            public static int screenReaderFocusable { get { if (!_screenReaderFocusableReady) { _screenReaderFocusableContent = SGetField<int>(LocalBridgeClazz, "screenReaderFocusable"); _screenReaderFocusableReady = true; } return _screenReaderFocusableContent; } }
+            private static int _screenReaderFocusableContent = default;
+            private static bool _screenReaderFocusableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#screenSize"/>
+            /// </summary>
+            public static int screenSize { get { if (!_screenSizeReady) { _screenSizeContent = SGetField<int>(LocalBridgeClazz, "screenSize"); _screenSizeReady = true; } return _screenSizeContent; } }
+            private static int _screenSizeContent = default;
+            private static bool _screenSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarAlwaysDrawHorizontalTrack"/>
+            /// </summary>
+            public static int scrollbarAlwaysDrawHorizontalTrack { get { if (!_scrollbarAlwaysDrawHorizontalTrackReady) { _scrollbarAlwaysDrawHorizontalTrackContent = SGetField<int>(LocalBridgeClazz, "scrollbarAlwaysDrawHorizontalTrack"); _scrollbarAlwaysDrawHorizontalTrackReady = true; } return _scrollbarAlwaysDrawHorizontalTrackContent; } }
+            private static int _scrollbarAlwaysDrawHorizontalTrackContent = default;
+            private static bool _scrollbarAlwaysDrawHorizontalTrackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarAlwaysDrawVerticalTrack"/>
+            /// </summary>
+            public static int scrollbarAlwaysDrawVerticalTrack { get { if (!_scrollbarAlwaysDrawVerticalTrackReady) { _scrollbarAlwaysDrawVerticalTrackContent = SGetField<int>(LocalBridgeClazz, "scrollbarAlwaysDrawVerticalTrack"); _scrollbarAlwaysDrawVerticalTrackReady = true; } return _scrollbarAlwaysDrawVerticalTrackContent; } }
+            private static int _scrollbarAlwaysDrawVerticalTrackContent = default;
+            private static bool _scrollbarAlwaysDrawVerticalTrackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarDefaultDelayBeforeFade"/>
+            /// </summary>
+            public static int scrollbarDefaultDelayBeforeFade { get { if (!_scrollbarDefaultDelayBeforeFadeReady) { _scrollbarDefaultDelayBeforeFadeContent = SGetField<int>(LocalBridgeClazz, "scrollbarDefaultDelayBeforeFade"); _scrollbarDefaultDelayBeforeFadeReady = true; } return _scrollbarDefaultDelayBeforeFadeContent; } }
+            private static int _scrollbarDefaultDelayBeforeFadeContent = default;
+            private static bool _scrollbarDefaultDelayBeforeFadeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarFadeDuration"/>
+            /// </summary>
+            public static int scrollbarFadeDuration { get { if (!_scrollbarFadeDurationReady) { _scrollbarFadeDurationContent = SGetField<int>(LocalBridgeClazz, "scrollbarFadeDuration"); _scrollbarFadeDurationReady = true; } return _scrollbarFadeDurationContent; } }
+            private static int _scrollbarFadeDurationContent = default;
+            private static bool _scrollbarFadeDurationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbars"/>
+            /// </summary>
+            public static int scrollbars { get { if (!_scrollbarsReady) { _scrollbarsContent = SGetField<int>(LocalBridgeClazz, "scrollbars"); _scrollbarsReady = true; } return _scrollbarsContent; } }
+            private static int _scrollbarsContent = default;
+            private static bool _scrollbarsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarSize"/>
+            /// </summary>
+            public static int scrollbarSize { get { if (!_scrollbarSizeReady) { _scrollbarSizeContent = SGetField<int>(LocalBridgeClazz, "scrollbarSize"); _scrollbarSizeReady = true; } return _scrollbarSizeContent; } }
+            private static int _scrollbarSizeContent = default;
+            private static bool _scrollbarSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarStyle"/>
+            /// </summary>
+            public static int scrollbarStyle { get { if (!_scrollbarStyleReady) { _scrollbarStyleContent = SGetField<int>(LocalBridgeClazz, "scrollbarStyle"); _scrollbarStyleReady = true; } return _scrollbarStyleContent; } }
+            private static int _scrollbarStyleContent = default;
+            private static bool _scrollbarStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarThumbHorizontal"/>
+            /// </summary>
+            public static int scrollbarThumbHorizontal { get { if (!_scrollbarThumbHorizontalReady) { _scrollbarThumbHorizontalContent = SGetField<int>(LocalBridgeClazz, "scrollbarThumbHorizontal"); _scrollbarThumbHorizontalReady = true; } return _scrollbarThumbHorizontalContent; } }
+            private static int _scrollbarThumbHorizontalContent = default;
+            private static bool _scrollbarThumbHorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarThumbVertical"/>
+            /// </summary>
+            public static int scrollbarThumbVertical { get { if (!_scrollbarThumbVerticalReady) { _scrollbarThumbVerticalContent = SGetField<int>(LocalBridgeClazz, "scrollbarThumbVertical"); _scrollbarThumbVerticalReady = true; } return _scrollbarThumbVerticalContent; } }
+            private static int _scrollbarThumbVerticalContent = default;
+            private static bool _scrollbarThumbVerticalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarTrackHorizontal"/>
+            /// </summary>
+            public static int scrollbarTrackHorizontal { get { if (!_scrollbarTrackHorizontalReady) { _scrollbarTrackHorizontalContent = SGetField<int>(LocalBridgeClazz, "scrollbarTrackHorizontal"); _scrollbarTrackHorizontalReady = true; } return _scrollbarTrackHorizontalContent; } }
+            private static int _scrollbarTrackHorizontalContent = default;
+            private static bool _scrollbarTrackHorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollbarTrackVertical"/>
+            /// </summary>
+            public static int scrollbarTrackVertical { get { if (!_scrollbarTrackVerticalReady) { _scrollbarTrackVerticalContent = SGetField<int>(LocalBridgeClazz, "scrollbarTrackVertical"); _scrollbarTrackVerticalReady = true; } return _scrollbarTrackVerticalContent; } }
+            private static int _scrollbarTrackVerticalContent = default;
+            private static bool _scrollbarTrackVerticalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollHorizontally"/>
+            /// </summary>
+            public static int scrollHorizontally { get { if (!_scrollHorizontallyReady) { _scrollHorizontallyContent = SGetField<int>(LocalBridgeClazz, "scrollHorizontally"); _scrollHorizontallyReady = true; } return _scrollHorizontallyContent; } }
+            private static int _scrollHorizontallyContent = default;
+            private static bool _scrollHorizontallyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollIndicators"/>
+            /// </summary>
+            public static int scrollIndicators { get { if (!_scrollIndicatorsReady) { _scrollIndicatorsContent = SGetField<int>(LocalBridgeClazz, "scrollIndicators"); _scrollIndicatorsReady = true; } return _scrollIndicatorsContent; } }
+            private static int _scrollIndicatorsContent = default;
+            private static bool _scrollIndicatorsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollingCache"/>
+            /// </summary>
+            public static int scrollingCache { get { if (!_scrollingCacheReady) { _scrollingCacheContent = SGetField<int>(LocalBridgeClazz, "scrollingCache"); _scrollingCacheReady = true; } return _scrollingCacheContent; } }
+            private static int _scrollingCacheContent = default;
+            private static bool _scrollingCacheReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollViewStyle"/>
+            /// </summary>
+            public static int scrollViewStyle { get { if (!_scrollViewStyleReady) { _scrollViewStyleContent = SGetField<int>(LocalBridgeClazz, "scrollViewStyle"); _scrollViewStyleReady = true; } return _scrollViewStyleContent; } }
+            private static int _scrollViewStyleContent = default;
+            private static bool _scrollViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollX"/>
+            /// </summary>
+            public static int scrollX { get { if (!_scrollXReady) { _scrollXContent = SGetField<int>(LocalBridgeClazz, "scrollX"); _scrollXReady = true; } return _scrollXContent; } }
+            private static int _scrollXContent = default;
+            private static bool _scrollXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#scrollY"/>
+            /// </summary>
+            public static int scrollY { get { if (!_scrollYReady) { _scrollYContent = SGetField<int>(LocalBridgeClazz, "scrollY"); _scrollYReady = true; } return _scrollYContent; } }
+            private static int _scrollYContent = default;
+            private static bool _scrollYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchButtonText"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int searchButtonText { get { if (!_searchButtonTextReady) { _searchButtonTextContent = SGetField<int>(LocalBridgeClazz, "searchButtonText"); _searchButtonTextReady = true; } return _searchButtonTextContent; } }
+            private static int _searchButtonTextContent = default;
+            private static bool _searchButtonTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchHintIcon"/>
+            /// </summary>
+            public static int searchHintIcon { get { if (!_searchHintIconReady) { _searchHintIconContent = SGetField<int>(LocalBridgeClazz, "searchHintIcon"); _searchHintIconReady = true; } return _searchHintIconContent; } }
+            private static int _searchHintIconContent = default;
+            private static bool _searchHintIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchIcon"/>
+            /// </summary>
+            public static int searchIcon { get { if (!_searchIconReady) { _searchIconContent = SGetField<int>(LocalBridgeClazz, "searchIcon"); _searchIconReady = true; } return _searchIconContent; } }
+            private static int _searchIconContent = default;
+            private static bool _searchIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchMode"/>
+            /// </summary>
+            public static int searchMode { get { if (!_searchModeReady) { _searchModeContent = SGetField<int>(LocalBridgeClazz, "searchMode"); _searchModeReady = true; } return _searchModeContent; } }
+            private static int _searchModeContent = default;
+            private static bool _searchModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchResultHighlightColor"/>
+            /// </summary>
+            public static int searchResultHighlightColor { get { if (!_searchResultHighlightColorReady) { _searchResultHighlightColorContent = SGetField<int>(LocalBridgeClazz, "searchResultHighlightColor"); _searchResultHighlightColorReady = true; } return _searchResultHighlightColorContent; } }
+            private static int _searchResultHighlightColorContent = default;
+            private static bool _searchResultHighlightColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchSettingsDescription"/>
+            /// </summary>
+            public static int searchSettingsDescription { get { if (!_searchSettingsDescriptionReady) { _searchSettingsDescriptionContent = SGetField<int>(LocalBridgeClazz, "searchSettingsDescription"); _searchSettingsDescriptionReady = true; } return _searchSettingsDescriptionContent; } }
+            private static int _searchSettingsDescriptionContent = default;
+            private static bool _searchSettingsDescriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchSuggestAuthority"/>
+            /// </summary>
+            public static int searchSuggestAuthority { get { if (!_searchSuggestAuthorityReady) { _searchSuggestAuthorityContent = SGetField<int>(LocalBridgeClazz, "searchSuggestAuthority"); _searchSuggestAuthorityReady = true; } return _searchSuggestAuthorityContent; } }
+            private static int _searchSuggestAuthorityContent = default;
+            private static bool _searchSuggestAuthorityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchSuggestIntentAction"/>
+            /// </summary>
+            public static int searchSuggestIntentAction { get { if (!_searchSuggestIntentActionReady) { _searchSuggestIntentActionContent = SGetField<int>(LocalBridgeClazz, "searchSuggestIntentAction"); _searchSuggestIntentActionReady = true; } return _searchSuggestIntentActionContent; } }
+            private static int _searchSuggestIntentActionContent = default;
+            private static bool _searchSuggestIntentActionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchSuggestIntentData"/>
+            /// </summary>
+            public static int searchSuggestIntentData { get { if (!_searchSuggestIntentDataReady) { _searchSuggestIntentDataContent = SGetField<int>(LocalBridgeClazz, "searchSuggestIntentData"); _searchSuggestIntentDataReady = true; } return _searchSuggestIntentDataContent; } }
+            private static int _searchSuggestIntentDataContent = default;
+            private static bool _searchSuggestIntentDataReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchSuggestPath"/>
+            /// </summary>
+            public static int searchSuggestPath { get { if (!_searchSuggestPathReady) { _searchSuggestPathContent = SGetField<int>(LocalBridgeClazz, "searchSuggestPath"); _searchSuggestPathReady = true; } return _searchSuggestPathContent; } }
+            private static int _searchSuggestPathContent = default;
+            private static bool _searchSuggestPathReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchSuggestSelection"/>
+            /// </summary>
+            public static int searchSuggestSelection { get { if (!_searchSuggestSelectionReady) { _searchSuggestSelectionContent = SGetField<int>(LocalBridgeClazz, "searchSuggestSelection"); _searchSuggestSelectionReady = true; } return _searchSuggestSelectionContent; } }
+            private static int _searchSuggestSelectionContent = default;
+            private static bool _searchSuggestSelectionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchSuggestThreshold"/>
+            /// </summary>
+            public static int searchSuggestThreshold { get { if (!_searchSuggestThresholdReady) { _searchSuggestThresholdContent = SGetField<int>(LocalBridgeClazz, "searchSuggestThreshold"); _searchSuggestThresholdReady = true; } return _searchSuggestThresholdContent; } }
+            private static int _searchSuggestThresholdContent = default;
+            private static bool _searchSuggestThresholdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#searchViewStyle"/>
+            /// </summary>
+            public static int searchViewStyle { get { if (!_searchViewStyleReady) { _searchViewStyleContent = SGetField<int>(LocalBridgeClazz, "searchViewStyle"); _searchViewStyleReady = true; } return _searchViewStyleContent; } }
+            private static int _searchViewStyleContent = default;
+            private static bool _searchViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#secondaryContentAlpha"/>
+            /// </summary>
+            public static int secondaryContentAlpha { get { if (!_secondaryContentAlphaReady) { _secondaryContentAlphaContent = SGetField<int>(LocalBridgeClazz, "secondaryContentAlpha"); _secondaryContentAlphaReady = true; } return _secondaryContentAlphaContent; } }
+            private static int _secondaryContentAlphaContent = default;
+            private static bool _secondaryContentAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#secondaryProgress"/>
+            /// </summary>
+            public static int secondaryProgress { get { if (!_secondaryProgressReady) { _secondaryProgressContent = SGetField<int>(LocalBridgeClazz, "secondaryProgress"); _secondaryProgressReady = true; } return _secondaryProgressContent; } }
+            private static int _secondaryProgressContent = default;
+            private static bool _secondaryProgressReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#secondaryProgressTint"/>
+            /// </summary>
+            public static int secondaryProgressTint { get { if (!_secondaryProgressTintReady) { _secondaryProgressTintContent = SGetField<int>(LocalBridgeClazz, "secondaryProgressTint"); _secondaryProgressTintReady = true; } return _secondaryProgressTintContent; } }
+            private static int _secondaryProgressTintContent = default;
+            private static bool _secondaryProgressTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#secondaryProgressTintMode"/>
+            /// </summary>
+            public static int secondaryProgressTintMode { get { if (!_secondaryProgressTintModeReady) { _secondaryProgressTintModeContent = SGetField<int>(LocalBridgeClazz, "secondaryProgressTintMode"); _secondaryProgressTintModeReady = true; } return _secondaryProgressTintModeContent; } }
+            private static int _secondaryProgressTintModeContent = default;
+            private static bool _secondaryProgressTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#secureElementName"/>
+            /// </summary>
+            public static int secureElementName { get { if (!_secureElementNameReady) { _secureElementNameContent = SGetField<int>(LocalBridgeClazz, "secureElementName"); _secureElementNameReady = true; } return _secureElementNameContent; } }
+            private static int _secureElementNameContent = default;
+            private static bool _secureElementNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#seekBarStyle"/>
+            /// </summary>
+            public static int seekBarStyle { get { if (!_seekBarStyleReady) { _seekBarStyleContent = SGetField<int>(LocalBridgeClazz, "seekBarStyle"); _seekBarStyleReady = true; } return _seekBarStyleContent; } }
+            private static int _seekBarStyleContent = default;
+            private static bool _seekBarStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#segmentedButtonStyle"/>
+            /// </summary>
+            public static int segmentedButtonStyle { get { if (!_segmentedButtonStyleReady) { _segmentedButtonStyleContent = SGetField<int>(LocalBridgeClazz, "segmentedButtonStyle"); _segmentedButtonStyleReady = true; } return _segmentedButtonStyleContent; } }
+            private static int _segmentedButtonStyleContent = default;
+            private static bool _segmentedButtonStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#selectable"/>
+            /// </summary>
+            public static int selectable { get { if (!_selectableReady) { _selectableContent = SGetField<int>(LocalBridgeClazz, "selectable"); _selectableReady = true; } return _selectableContent; } }
+            private static int _selectableContent = default;
+            private static bool _selectableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#selectableAsDefault"/>
+            /// </summary>
+            public static int selectableAsDefault { get { if (!_selectableAsDefaultReady) { _selectableAsDefaultContent = SGetField<int>(LocalBridgeClazz, "selectableAsDefault"); _selectableAsDefaultReady = true; } return _selectableAsDefaultContent; } }
+            private static int _selectableAsDefaultContent = default;
+            private static bool _selectableAsDefaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#selectableItemBackground"/>
+            /// </summary>
+            public static int selectableItemBackground { get { if (!_selectableItemBackgroundReady) { _selectableItemBackgroundContent = SGetField<int>(LocalBridgeClazz, "selectableItemBackground"); _selectableItemBackgroundReady = true; } return _selectableItemBackgroundContent; } }
+            private static int _selectableItemBackgroundContent = default;
+            private static bool _selectableItemBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#selectableItemBackgroundBorderless"/>
+            /// </summary>
+            public static int selectableItemBackgroundBorderless { get { if (!_selectableItemBackgroundBorderlessReady) { _selectableItemBackgroundBorderlessContent = SGetField<int>(LocalBridgeClazz, "selectableItemBackgroundBorderless"); _selectableItemBackgroundBorderlessReady = true; } return _selectableItemBackgroundBorderlessContent; } }
+            private static int _selectableItemBackgroundBorderlessContent = default;
+            private static bool _selectableItemBackgroundBorderlessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#selectAllOnFocus"/>
+            /// </summary>
+            public static int selectAllOnFocus { get { if (!_selectAllOnFocusReady) { _selectAllOnFocusContent = SGetField<int>(LocalBridgeClazz, "selectAllOnFocus"); _selectAllOnFocusReady = true; } return _selectAllOnFocusContent; } }
+            private static int _selectAllOnFocusContent = default;
+            private static bool _selectAllOnFocusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#selectedDateVerticalBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int selectedDateVerticalBar { get { if (!_selectedDateVerticalBarReady) { _selectedDateVerticalBarContent = SGetField<int>(LocalBridgeClazz, "selectedDateVerticalBar"); _selectedDateVerticalBarReady = true; } return _selectedDateVerticalBarContent; } }
+            private static int _selectedDateVerticalBarContent = default;
+            private static bool _selectedDateVerticalBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#selectedWeekBackgroundColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int selectedWeekBackgroundColor { get { if (!_selectedWeekBackgroundColorReady) { _selectedWeekBackgroundColorContent = SGetField<int>(LocalBridgeClazz, "selectedWeekBackgroundColor"); _selectedWeekBackgroundColorReady = true; } return _selectedWeekBackgroundColorContent; } }
+            private static int _selectedWeekBackgroundColorContent = default;
+            private static bool _selectedWeekBackgroundColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#selectionDividerHeight"/>
+            /// </summary>
+            public static int selectionDividerHeight { get { if (!_selectionDividerHeightReady) { _selectionDividerHeightContent = SGetField<int>(LocalBridgeClazz, "selectionDividerHeight"); _selectionDividerHeightReady = true; } return _selectionDividerHeightContent; } }
+            private static int _selectionDividerHeightContent = default;
+            private static bool _selectionDividerHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#sessionService"/>
+            /// </summary>
+            public static int sessionService { get { if (!_sessionServiceReady) { _sessionServiceContent = SGetField<int>(LocalBridgeClazz, "sessionService"); _sessionServiceReady = true; } return _sessionServiceContent; } }
+            private static int _sessionServiceContent = default;
+            private static bool _sessionServiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#settingsActivity"/>
+            /// </summary>
+            public static int settingsActivity { get { if (!_settingsActivityReady) { _settingsActivityContent = SGetField<int>(LocalBridgeClazz, "settingsActivity"); _settingsActivityReady = true; } return _settingsActivityContent; } }
+            private static int _settingsActivityContent = default;
+            private static bool _settingsActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#settingsSliceUri"/>
+            /// </summary>
+            public static int settingsSliceUri { get { if (!_settingsSliceUriReady) { _settingsSliceUriContent = SGetField<int>(LocalBridgeClazz, "settingsSliceUri"); _settingsSliceUriReady = true; } return _settingsSliceUriContent; } }
+            private static int _settingsSliceUriContent = default;
+            private static bool _settingsSliceUriReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#settingsSubtitle"/>
+            /// </summary>
+            public static int settingsSubtitle { get { if (!_settingsSubtitleReady) { _settingsSubtitleContent = SGetField<int>(LocalBridgeClazz, "settingsSubtitle"); _settingsSubtitleReady = true; } return _settingsSubtitleContent; } }
+            private static int _settingsSubtitleContent = default;
+            private static bool _settingsSubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#setupActivity"/>
+            /// </summary>
+            public static int setupActivity { get { if (!_setupActivityReady) { _setupActivityContent = SGetField<int>(LocalBridgeClazz, "setupActivity"); _setupActivityReady = true; } return _setupActivityContent; } }
+            private static int _setupActivityContent = default;
+            private static bool _setupActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shadowColor"/>
+            /// </summary>
+            public static int shadowColor { get { if (!_shadowColorReady) { _shadowColorContent = SGetField<int>(LocalBridgeClazz, "shadowColor"); _shadowColorReady = true; } return _shadowColorContent; } }
+            private static int _shadowColorContent = default;
+            private static bool _shadowColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shadowDx"/>
+            /// </summary>
+            public static int shadowDx { get { if (!_shadowDxReady) { _shadowDxContent = SGetField<int>(LocalBridgeClazz, "shadowDx"); _shadowDxReady = true; } return _shadowDxContent; } }
+            private static int _shadowDxContent = default;
+            private static bool _shadowDxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shadowDy"/>
+            /// </summary>
+            public static int shadowDy { get { if (!_shadowDyReady) { _shadowDyContent = SGetField<int>(LocalBridgeClazz, "shadowDy"); _shadowDyReady = true; } return _shadowDyContent; } }
+            private static int _shadowDyContent = default;
+            private static bool _shadowDyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shadowRadius"/>
+            /// </summary>
+            public static int shadowRadius { get { if (!_shadowRadiusReady) { _shadowRadiusContent = SGetField<int>(LocalBridgeClazz, "shadowRadius"); _shadowRadiusReady = true; } return _shadowRadiusContent; } }
+            private static int _shadowRadiusContent = default;
+            private static bool _shadowRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shape"/>
+            /// </summary>
+            public static int shape { get { if (!_shapeReady) { _shapeContent = SGetField<int>(LocalBridgeClazz, "shape"); _shapeReady = true; } return _shapeContent; } }
+            private static int _shapeContent = default;
+            private static bool _shapeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#sharedUserId"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int sharedUserId { get { if (!_sharedUserIdReady) { _sharedUserIdContent = SGetField<int>(LocalBridgeClazz, "sharedUserId"); _sharedUserIdReady = true; } return _sharedUserIdContent; } }
+            private static int _sharedUserIdContent = default;
+            private static bool _sharedUserIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#sharedUserLabel"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int sharedUserLabel { get { if (!_sharedUserLabelReady) { _sharedUserLabelContent = SGetField<int>(LocalBridgeClazz, "sharedUserLabel"); _sharedUserLabelReady = true; } return _sharedUserLabelContent; } }
+            private static int _sharedUserLabelContent = default;
+            private static bool _sharedUserLabelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#sharedUserMaxSdkVersion"/>
+            /// </summary>
+            public static int sharedUserMaxSdkVersion { get { if (!_sharedUserMaxSdkVersionReady) { _sharedUserMaxSdkVersionContent = SGetField<int>(LocalBridgeClazz, "sharedUserMaxSdkVersion"); _sharedUserMaxSdkVersionReady = true; } return _sharedUserMaxSdkVersionContent; } }
+            private static int _sharedUserMaxSdkVersionContent = default;
+            private static bool _sharedUserMaxSdkVersionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shareInterpolator"/>
+            /// </summary>
+            public static int shareInterpolator { get { if (!_shareInterpolatorReady) { _shareInterpolatorContent = SGetField<int>(LocalBridgeClazz, "shareInterpolator"); _shareInterpolatorReady = true; } return _shareInterpolatorContent; } }
+            private static int _shareInterpolatorContent = default;
+            private static bool _shareInterpolatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shell"/>
+            /// </summary>
+            public static int shell { get { if (!_shellReady) { _shellContent = SGetField<int>(LocalBridgeClazz, "shell"); _shellReady = true; } return _shellContent; } }
+            private static int _shellContent = default;
+            private static bool _shellReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shortcutDisabledMessage"/>
+            /// </summary>
+            public static int shortcutDisabledMessage { get { if (!_shortcutDisabledMessageReady) { _shortcutDisabledMessageContent = SGetField<int>(LocalBridgeClazz, "shortcutDisabledMessage"); _shortcutDisabledMessageReady = true; } return _shortcutDisabledMessageContent; } }
+            private static int _shortcutDisabledMessageContent = default;
+            private static bool _shortcutDisabledMessageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shortcutId"/>
+            /// </summary>
+            public static int shortcutId { get { if (!_shortcutIdReady) { _shortcutIdContent = SGetField<int>(LocalBridgeClazz, "shortcutId"); _shortcutIdReady = true; } return _shortcutIdContent; } }
+            private static int _shortcutIdContent = default;
+            private static bool _shortcutIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shortcutLongLabel"/>
+            /// </summary>
+            public static int shortcutLongLabel { get { if (!_shortcutLongLabelReady) { _shortcutLongLabelContent = SGetField<int>(LocalBridgeClazz, "shortcutLongLabel"); _shortcutLongLabelReady = true; } return _shortcutLongLabelContent; } }
+            private static int _shortcutLongLabelContent = default;
+            private static bool _shortcutLongLabelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shortcutShortLabel"/>
+            /// </summary>
+            public static int shortcutShortLabel { get { if (!_shortcutShortLabelReady) { _shortcutShortLabelContent = SGetField<int>(LocalBridgeClazz, "shortcutShortLabel"); _shortcutShortLabelReady = true; } return _shortcutShortLabelContent; } }
+            private static int _shortcutShortLabelContent = default;
+            private static bool _shortcutShortLabelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shouldDisableView"/>
+            /// </summary>
+            public static int shouldDisableView { get { if (!_shouldDisableViewReady) { _shouldDisableViewContent = SGetField<int>(LocalBridgeClazz, "shouldDisableView"); _shouldDisableViewReady = true; } return _shouldDisableViewContent; } }
+            private static int _shouldDisableViewContent = default;
+            private static bool _shouldDisableViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shouldUseDefaultUnfoldTransition"/>
+            /// </summary>
+            public static int shouldUseDefaultUnfoldTransition { get { if (!_shouldUseDefaultUnfoldTransitionReady) { _shouldUseDefaultUnfoldTransitionContent = SGetField<int>(LocalBridgeClazz, "shouldUseDefaultUnfoldTransition"); _shouldUseDefaultUnfoldTransitionReady = true; } return _shouldUseDefaultUnfoldTransitionContent; } }
+            private static int _shouldUseDefaultUnfoldTransitionContent = default;
+            private static bool _shouldUseDefaultUnfoldTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showAsAction"/>
+            /// </summary>
+            public static int showAsAction { get { if (!_showAsActionReady) { _showAsActionContent = SGetField<int>(LocalBridgeClazz, "showAsAction"); _showAsActionReady = true; } return _showAsActionContent; } }
+            private static int _showAsActionContent = default;
+            private static bool _showAsActionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showBackdrop"/>
+            /// </summary>
+            public static int showBackdrop { get { if (!_showBackdropReady) { _showBackdropContent = SGetField<int>(LocalBridgeClazz, "showBackdrop"); _showBackdropReady = true; } return _showBackdropContent; } }
+            private static int _showBackdropContent = default;
+            private static bool _showBackdropReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showClockAndComplications"/>
+            /// </summary>
+            public static int showClockAndComplications { get { if (!_showClockAndComplicationsReady) { _showClockAndComplicationsContent = SGetField<int>(LocalBridgeClazz, "showClockAndComplications"); _showClockAndComplicationsReady = true; } return _showClockAndComplicationsContent; } }
+            private static int _showClockAndComplicationsContent = default;
+            private static bool _showClockAndComplicationsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showDefault"/>
+            /// </summary>
+            public static int showDefault { get { if (!_showDefaultReady) { _showDefaultContent = SGetField<int>(LocalBridgeClazz, "showDefault"); _showDefaultReady = true; } return _showDefaultContent; } }
+            private static int _showDefaultContent = default;
+            private static bool _showDefaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showDividers"/>
+            /// </summary>
+            public static int showDividers { get { if (!_showDividersReady) { _showDividersContent = SGetField<int>(LocalBridgeClazz, "showDividers"); _showDividersReady = true; } return _showDividersContent; } }
+            private static int _showDividersContent = default;
+            private static bool _showDividersReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showForAllUsers"/>
+            /// </summary>
+            public static int showForAllUsers { get { if (!_showForAllUsersReady) { _showForAllUsersContent = SGetField<int>(LocalBridgeClazz, "showForAllUsers"); _showForAllUsersReady = true; } return _showForAllUsersContent; } }
+            private static int _showForAllUsersContent = default;
+            private static bool _showForAllUsersReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showInInputMethodPicker"/>
+            /// </summary>
+            public static int showInInputMethodPicker { get { if (!_showInInputMethodPickerReady) { _showInInputMethodPickerContent = SGetField<int>(LocalBridgeClazz, "showInInputMethodPicker"); _showInInputMethodPickerReady = true; } return _showInInputMethodPickerContent; } }
+            private static int _showInInputMethodPickerContent = default;
+            private static bool _showInInputMethodPickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showMetadataInPreview"/>
+            /// </summary>
+            public static int showMetadataInPreview { get { if (!_showMetadataInPreviewReady) { _showMetadataInPreviewContent = SGetField<int>(LocalBridgeClazz, "showMetadataInPreview"); _showMetadataInPreviewReady = true; } return _showMetadataInPreviewContent; } }
+            private static int _showMetadataInPreviewContent = default;
+            private static bool _showMetadataInPreviewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shownWeekCount"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int shownWeekCount { get { if (!_shownWeekCountReady) { _shownWeekCountContent = SGetField<int>(LocalBridgeClazz, "shownWeekCount"); _shownWeekCountReady = true; } return _shownWeekCountContent; } }
+            private static int _shownWeekCountContent = default;
+            private static bool _shownWeekCountReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showOnLockScreen"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int showOnLockScreen { get { if (!_showOnLockScreenReady) { _showOnLockScreenContent = SGetField<int>(LocalBridgeClazz, "showOnLockScreen"); _showOnLockScreenReady = true; } return _showOnLockScreenContent; } }
+            private static int _showOnLockScreenContent = default;
+            private static bool _showOnLockScreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showSilent"/>
+            /// </summary>
+            public static int showSilent { get { if (!_showSilentReady) { _showSilentContent = SGetField<int>(LocalBridgeClazz, "showSilent"); _showSilentReady = true; } return _showSilentContent; } }
+            private static int _showSilentContent = default;
+            private static bool _showSilentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showText"/>
+            /// </summary>
+            public static int showText { get { if (!_showTextReady) { _showTextContent = SGetField<int>(LocalBridgeClazz, "showText"); _showTextReady = true; } return _showTextContent; } }
+            private static int _showTextContent = default;
+            private static bool _showTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showWeekNumber"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int showWeekNumber { get { if (!_showWeekNumberReady) { _showWeekNumberContent = SGetField<int>(LocalBridgeClazz, "showWeekNumber"); _showWeekNumberReady = true; } return _showWeekNumberContent; } }
+            private static int _showWeekNumberContent = default;
+            private static bool _showWeekNumberReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#showWhenLocked"/>
+            /// </summary>
+            public static int showWhenLocked { get { if (!_showWhenLockedReady) { _showWhenLockedContent = SGetField<int>(LocalBridgeClazz, "showWhenLocked"); _showWhenLockedReady = true; } return _showWhenLockedContent; } }
+            private static int _showWhenLockedContent = default;
+            private static bool _showWhenLockedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#shrinkColumns"/>
+            /// </summary>
+            public static int shrinkColumns { get { if (!_shrinkColumnsReady) { _shrinkColumnsContent = SGetField<int>(LocalBridgeClazz, "shrinkColumns"); _shrinkColumnsReady = true; } return _shrinkColumnsContent; } }
+            private static int _shrinkColumnsContent = default;
+            private static bool _shrinkColumnsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#singleLine"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int singleLine { get { if (!_singleLineReady) { _singleLineContent = SGetField<int>(LocalBridgeClazz, "singleLine"); _singleLineReady = true; } return _singleLineContent; } }
+            private static int _singleLineContent = default;
+            private static bool _singleLineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#singleLineTitle"/>
+            /// </summary>
+            public static int singleLineTitle { get { if (!_singleLineTitleReady) { _singleLineTitleContent = SGetField<int>(LocalBridgeClazz, "singleLineTitle"); _singleLineTitleReady = true; } return _singleLineTitleContent; } }
+            private static int _singleLineTitleContent = default;
+            private static bool _singleLineTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#singleUser"/>
+            /// </summary>
+            public static int singleUser { get { if (!_singleUserReady) { _singleUserContent = SGetField<int>(LocalBridgeClazz, "singleUser"); _singleUserReady = true; } return _singleUserContent; } }
+            private static int _singleUserContent = default;
+            private static bool _singleUserReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#slideEdge"/>
+            /// </summary>
+            public static int slideEdge { get { if (!_slideEdgeReady) { _slideEdgeContent = SGetField<int>(LocalBridgeClazz, "slideEdge"); _slideEdgeReady = true; } return _slideEdgeContent; } }
+            private static int _slideEdgeContent = default;
+            private static bool _slideEdgeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#smallIcon"/>
+            /// </summary>
+            public static int smallIcon { get { if (!_smallIconReady) { _smallIconContent = SGetField<int>(LocalBridgeClazz, "smallIcon"); _smallIconReady = true; } return _smallIconContent; } }
+            private static int _smallIconContent = default;
+            private static bool _smallIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#smallScreens"/>
+            /// </summary>
+            public static int smallScreens { get { if (!_smallScreensReady) { _smallScreensContent = SGetField<int>(LocalBridgeClazz, "smallScreens"); _smallScreensReady = true; } return _smallScreensContent; } }
+            private static int _smallScreensContent = default;
+            private static bool _smallScreensReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#smoothScrollbar"/>
+            /// </summary>
+            public static int smoothScrollbar { get { if (!_smoothScrollbarReady) { _smoothScrollbarContent = SGetField<int>(LocalBridgeClazz, "smoothScrollbar"); _smoothScrollbarReady = true; } return _smoothScrollbarContent; } }
+            private static int _smoothScrollbarContent = default;
+            private static bool _smoothScrollbarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#soundEffectsEnabled"/>
+            /// </summary>
+            public static int soundEffectsEnabled { get { if (!_soundEffectsEnabledReady) { _soundEffectsEnabledContent = SGetField<int>(LocalBridgeClazz, "soundEffectsEnabled"); _soundEffectsEnabledReady = true; } return _soundEffectsEnabledContent; } }
+            private static int _soundEffectsEnabledContent = default;
+            private static bool _soundEffectsEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#spacing"/>
+            /// </summary>
+            public static int spacing { get { if (!_spacingReady) { _spacingContent = SGetField<int>(LocalBridgeClazz, "spacing"); _spacingReady = true; } return _spacingContent; } }
+            private static int _spacingContent = default;
+            private static bool _spacingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#spinnerDropDownItemStyle"/>
+            /// </summary>
+            public static int spinnerDropDownItemStyle { get { if (!_spinnerDropDownItemStyleReady) { _spinnerDropDownItemStyleContent = SGetField<int>(LocalBridgeClazz, "spinnerDropDownItemStyle"); _spinnerDropDownItemStyleReady = true; } return _spinnerDropDownItemStyleContent; } }
+            private static int _spinnerDropDownItemStyleContent = default;
+            private static bool _spinnerDropDownItemStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#spinnerItemStyle"/>
+            /// </summary>
+            public static int spinnerItemStyle { get { if (!_spinnerItemStyleReady) { _spinnerItemStyleContent = SGetField<int>(LocalBridgeClazz, "spinnerItemStyle"); _spinnerItemStyleReady = true; } return _spinnerItemStyleContent; } }
+            private static int _spinnerItemStyleContent = default;
+            private static bool _spinnerItemStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#spinnerMode"/>
+            /// </summary>
+            public static int spinnerMode { get { if (!_spinnerModeReady) { _spinnerModeContent = SGetField<int>(LocalBridgeClazz, "spinnerMode"); _spinnerModeReady = true; } return _spinnerModeContent; } }
+            private static int _spinnerModeContent = default;
+            private static bool _spinnerModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#spinnersShown"/>
+            /// </summary>
+            public static int spinnersShown { get { if (!_spinnersShownReady) { _spinnersShownContent = SGetField<int>(LocalBridgeClazz, "spinnersShown"); _spinnersShownReady = true; } return _spinnersShownContent; } }
+            private static int _spinnersShownContent = default;
+            private static bool _spinnersShownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#spinnerStyle"/>
+            /// </summary>
+            public static int spinnerStyle { get { if (!_spinnerStyleReady) { _spinnerStyleContent = SGetField<int>(LocalBridgeClazz, "spinnerStyle"); _spinnerStyleReady = true; } return _spinnerStyleContent; } }
+            private static int _spinnerStyleContent = default;
+            private static bool _spinnerStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#splashScreenTheme"/>
+            /// </summary>
+            public static int splashScreenTheme { get { if (!_splashScreenThemeReady) { _splashScreenThemeContent = SGetField<int>(LocalBridgeClazz, "splashScreenTheme"); _splashScreenThemeReady = true; } return _splashScreenThemeContent; } }
+            private static int _splashScreenThemeContent = default;
+            private static bool _splashScreenThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#splitMotionEvents"/>
+            /// </summary>
+            public static int splitMotionEvents { get { if (!_splitMotionEventsReady) { _splitMotionEventsContent = SGetField<int>(LocalBridgeClazz, "splitMotionEvents"); _splitMotionEventsReady = true; } return _splitMotionEventsContent; } }
+            private static int _splitMotionEventsContent = default;
+            private static bool _splitMotionEventsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#splitName"/>
+            /// </summary>
+            public static int splitName { get { if (!_splitNameReady) { _splitNameContent = SGetField<int>(LocalBridgeClazz, "splitName"); _splitNameReady = true; } return _splitNameContent; } }
+            private static int _splitNameContent = default;
+            private static bool _splitNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#splitTrack"/>
+            /// </summary>
+            public static int splitTrack { get { if (!_splitTrackReady) { _splitTrackContent = SGetField<int>(LocalBridgeClazz, "splitTrack"); _splitTrackReady = true; } return _splitTrackContent; } }
+            private static int _splitTrackContent = default;
+            private static bool _splitTrackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#splitTypes"/>
+            /// </summary>
+            public static int splitTypes { get { if (!_splitTypesReady) { _splitTypesContent = SGetField<int>(LocalBridgeClazz, "splitTypes"); _splitTypesReady = true; } return _splitTypesContent; } }
+            private static int _splitTypesContent = default;
+            private static bool _splitTypesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#spotShadowAlpha"/>
+            /// </summary>
+            public static int spotShadowAlpha { get { if (!_spotShadowAlphaReady) { _spotShadowAlphaContent = SGetField<int>(LocalBridgeClazz, "spotShadowAlpha"); _spotShadowAlphaReady = true; } return _spotShadowAlphaContent; } }
+            private static int _spotShadowAlphaContent = default;
+            private static bool _spotShadowAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#src"/>
+            /// </summary>
+            public static int src { get { if (!_srcReady) { _srcContent = SGetField<int>(LocalBridgeClazz, "src"); _srcReady = true; } return _srcContent; } }
+            private static int _srcContent = default;
+            private static bool _srcReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ssp"/>
+            /// </summary>
+            public static int ssp { get { if (!_sspReady) { _sspContent = SGetField<int>(LocalBridgeClazz, "ssp"); _sspReady = true; } return _sspContent; } }
+            private static int _sspContent = default;
+            private static bool _sspReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#sspAdvancedPattern"/>
+            /// </summary>
+            public static int sspAdvancedPattern { get { if (!_sspAdvancedPatternReady) { _sspAdvancedPatternContent = SGetField<int>(LocalBridgeClazz, "sspAdvancedPattern"); _sspAdvancedPatternReady = true; } return _sspAdvancedPatternContent; } }
+            private static int _sspAdvancedPatternContent = default;
+            private static bool _sspAdvancedPatternReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#sspPattern"/>
+            /// </summary>
+            public static int sspPattern { get { if (!_sspPatternReady) { _sspPatternContent = SGetField<int>(LocalBridgeClazz, "sspPattern"); _sspPatternReady = true; } return _sspPatternContent; } }
+            private static int _sspPatternContent = default;
+            private static bool _sspPatternReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#sspPrefix"/>
+            /// </summary>
+            public static int sspPrefix { get { if (!_sspPrefixReady) { _sspPrefixContent = SGetField<int>(LocalBridgeClazz, "sspPrefix"); _sspPrefixReady = true; } return _sspPrefixContent; } }
+            private static int _sspPrefixContent = default;
+            private static bool _sspPrefixReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#sspSuffix"/>
+            /// </summary>
+            public static int sspSuffix { get { if (!_sspSuffixReady) { _sspSuffixContent = SGetField<int>(LocalBridgeClazz, "sspSuffix"); _sspSuffixReady = true; } return _sspSuffixContent; } }
+            private static int _sspSuffixContent = default;
+            private static bool _sspSuffixReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stackFromBottom"/>
+            /// </summary>
+            public static int stackFromBottom { get { if (!_stackFromBottomReady) { _stackFromBottomContent = SGetField<int>(LocalBridgeClazz, "stackFromBottom"); _stackFromBottomReady = true; } return _stackFromBottomContent; } }
+            private static int _stackFromBottomContent = default;
+            private static bool _stackFromBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stackViewStyle"/>
+            /// </summary>
+            public static int stackViewStyle { get { if (!_stackViewStyleReady) { _stackViewStyleContent = SGetField<int>(LocalBridgeClazz, "stackViewStyle"); _stackViewStyleReady = true; } return _stackViewStyleContent; } }
+            private static int _stackViewStyleContent = default;
+            private static bool _stackViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#starStyle"/>
+            /// </summary>
+            public static int starStyle { get { if (!_starStyleReady) { _starStyleContent = SGetField<int>(LocalBridgeClazz, "starStyle"); _starStyleReady = true; } return _starStyleContent; } }
+            private static int _starStyleContent = default;
+            private static bool _starStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#start"/>
+            /// </summary>
+            public static int start { get { if (!_startReady) { _startContent = SGetField<int>(LocalBridgeClazz, "start"); _startReady = true; } return _startContent; } }
+            private static int _startContent = default;
+            private static bool _startReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#startColor"/>
+            /// </summary>
+            public static int startColor { get { if (!_startColorReady) { _startColorContent = SGetField<int>(LocalBridgeClazz, "startColor"); _startColorReady = true; } return _startColorContent; } }
+            private static int _startColorContent = default;
+            private static bool _startColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#startDelay"/>
+            /// </summary>
+            public static int startDelay { get { if (!_startDelayReady) { _startDelayContent = SGetField<int>(LocalBridgeClazz, "startDelay"); _startDelayReady = true; } return _startDelayContent; } }
+            private static int _startDelayContent = default;
+            private static bool _startDelayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#startOffset"/>
+            /// </summary>
+            public static int startOffset { get { if (!_startOffsetReady) { _startOffsetContent = SGetField<int>(LocalBridgeClazz, "startOffset"); _startOffsetReady = true; } return _startOffsetContent; } }
+            private static int _startOffsetContent = default;
+            private static bool _startOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#startX"/>
+            /// </summary>
+            public static int startX { get { if (!_startXReady) { _startXContent = SGetField<int>(LocalBridgeClazz, "startX"); _startXReady = true; } return _startXContent; } }
+            private static int _startXContent = default;
+            private static bool _startXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#startY"/>
+            /// </summary>
+            public static int startY { get { if (!_startYReady) { _startYContent = SGetField<int>(LocalBridgeClazz, "startY"); _startYReady = true; } return _startYContent; } }
+            private static int _startYContent = default;
+            private static bool _startYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#startYear"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int startYear { get { if (!_startYearReady) { _startYearContent = SGetField<int>(LocalBridgeClazz, "startYear"); _startYearReady = true; } return _startYearContent; } }
+            private static int _startYearContent = default;
+            private static bool _startYearReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_above_anchor"/>
+            /// </summary>
+            public static int state_above_anchor { get { if (!_state_above_anchorReady) { _state_above_anchorContent = SGetField<int>(LocalBridgeClazz, "state_above_anchor"); _state_above_anchorReady = true; } return _state_above_anchorContent; } }
+            private static int _state_above_anchorContent = default;
+            private static bool _state_above_anchorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_accelerated"/>
+            /// </summary>
+            public static int state_accelerated { get { if (!_state_acceleratedReady) { _state_acceleratedContent = SGetField<int>(LocalBridgeClazz, "state_accelerated"); _state_acceleratedReady = true; } return _state_acceleratedContent; } }
+            private static int _state_acceleratedContent = default;
+            private static bool _state_acceleratedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_activated"/>
+            /// </summary>
+            public static int state_activated { get { if (!_state_activatedReady) { _state_activatedContent = SGetField<int>(LocalBridgeClazz, "state_activated"); _state_activatedReady = true; } return _state_activatedContent; } }
+            private static int _state_activatedContent = default;
+            private static bool _state_activatedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_active"/>
+            /// </summary>
+            public static int state_active { get { if (!_state_activeReady) { _state_activeContent = SGetField<int>(LocalBridgeClazz, "state_active"); _state_activeReady = true; } return _state_activeContent; } }
+            private static int _state_activeContent = default;
+            private static bool _state_activeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_checkable"/>
+            /// </summary>
+            public static int state_checkable { get { if (!_state_checkableReady) { _state_checkableContent = SGetField<int>(LocalBridgeClazz, "state_checkable"); _state_checkableReady = true; } return _state_checkableContent; } }
+            private static int _state_checkableContent = default;
+            private static bool _state_checkableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_checked"/>
+            /// </summary>
+            public static int state_checked { get { if (!_state_checkedReady) { _state_checkedContent = SGetField<int>(LocalBridgeClazz, "state_checked"); _state_checkedReady = true; } return _state_checkedContent; } }
+            private static int _state_checkedContent = default;
+            private static bool _state_checkedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_drag_can_accept"/>
+            /// </summary>
+            public static int state_drag_can_accept { get { if (!_state_drag_can_acceptReady) { _state_drag_can_acceptContent = SGetField<int>(LocalBridgeClazz, "state_drag_can_accept"); _state_drag_can_acceptReady = true; } return _state_drag_can_acceptContent; } }
+            private static int _state_drag_can_acceptContent = default;
+            private static bool _state_drag_can_acceptReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_drag_hovered"/>
+            /// </summary>
+            public static int state_drag_hovered { get { if (!_state_drag_hoveredReady) { _state_drag_hoveredContent = SGetField<int>(LocalBridgeClazz, "state_drag_hovered"); _state_drag_hoveredReady = true; } return _state_drag_hoveredContent; } }
+            private static int _state_drag_hoveredContent = default;
+            private static bool _state_drag_hoveredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_empty"/>
+            /// </summary>
+            public static int state_empty { get { if (!_state_emptyReady) { _state_emptyContent = SGetField<int>(LocalBridgeClazz, "state_empty"); _state_emptyReady = true; } return _state_emptyContent; } }
+            private static int _state_emptyContent = default;
+            private static bool _state_emptyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_enabled"/>
+            /// </summary>
+            public static int state_enabled { get { if (!_state_enabledReady) { _state_enabledContent = SGetField<int>(LocalBridgeClazz, "state_enabled"); _state_enabledReady = true; } return _state_enabledContent; } }
+            private static int _state_enabledContent = default;
+            private static bool _state_enabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_expanded"/>
+            /// </summary>
+            public static int state_expanded { get { if (!_state_expandedReady) { _state_expandedContent = SGetField<int>(LocalBridgeClazz, "state_expanded"); _state_expandedReady = true; } return _state_expandedContent; } }
+            private static int _state_expandedContent = default;
+            private static bool _state_expandedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_first"/>
+            /// </summary>
+            public static int state_first { get { if (!_state_firstReady) { _state_firstContent = SGetField<int>(LocalBridgeClazz, "state_first"); _state_firstReady = true; } return _state_firstContent; } }
+            private static int _state_firstContent = default;
+            private static bool _state_firstReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_focused"/>
+            /// </summary>
+            public static int state_focused { get { if (!_state_focusedReady) { _state_focusedContent = SGetField<int>(LocalBridgeClazz, "state_focused"); _state_focusedReady = true; } return _state_focusedContent; } }
+            private static int _state_focusedContent = default;
+            private static bool _state_focusedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_hovered"/>
+            /// </summary>
+            public static int state_hovered { get { if (!_state_hoveredReady) { _state_hoveredContent = SGetField<int>(LocalBridgeClazz, "state_hovered"); _state_hoveredReady = true; } return _state_hoveredContent; } }
+            private static int _state_hoveredContent = default;
+            private static bool _state_hoveredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_last"/>
+            /// </summary>
+            public static int state_last { get { if (!_state_lastReady) { _state_lastContent = SGetField<int>(LocalBridgeClazz, "state_last"); _state_lastReady = true; } return _state_lastContent; } }
+            private static int _state_lastContent = default;
+            private static bool _state_lastReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_long_pressable"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int state_long_pressable { get { if (!_state_long_pressableReady) { _state_long_pressableContent = SGetField<int>(LocalBridgeClazz, "state_long_pressable"); _state_long_pressableReady = true; } return _state_long_pressableContent; } }
+            private static int _state_long_pressableContent = default;
+            private static bool _state_long_pressableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_middle"/>
+            /// </summary>
+            public static int state_middle { get { if (!_state_middleReady) { _state_middleContent = SGetField<int>(LocalBridgeClazz, "state_middle"); _state_middleReady = true; } return _state_middleContent; } }
+            private static int _state_middleContent = default;
+            private static bool _state_middleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_multiline"/>
+            /// </summary>
+            public static int state_multiline { get { if (!_state_multilineReady) { _state_multilineContent = SGetField<int>(LocalBridgeClazz, "state_multiline"); _state_multilineReady = true; } return _state_multilineContent; } }
+            private static int _state_multilineContent = default;
+            private static bool _state_multilineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_pressed"/>
+            /// </summary>
+            public static int state_pressed { get { if (!_state_pressedReady) { _state_pressedContent = SGetField<int>(LocalBridgeClazz, "state_pressed"); _state_pressedReady = true; } return _state_pressedContent; } }
+            private static int _state_pressedContent = default;
+            private static bool _state_pressedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_selected"/>
+            /// </summary>
+            public static int state_selected { get { if (!_state_selectedReady) { _state_selectedContent = SGetField<int>(LocalBridgeClazz, "state_selected"); _state_selectedReady = true; } return _state_selectedContent; } }
+            private static int _state_selectedContent = default;
+            private static bool _state_selectedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_single"/>
+            /// </summary>
+            public static int state_single { get { if (!_state_singleReady) { _state_singleContent = SGetField<int>(LocalBridgeClazz, "state_single"); _state_singleReady = true; } return _state_singleContent; } }
+            private static int _state_singleContent = default;
+            private static bool _state_singleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#state_window_focused"/>
+            /// </summary>
+            public static int state_window_focused { get { if (!_state_window_focusedReady) { _state_window_focusedContent = SGetField<int>(LocalBridgeClazz, "state_window_focused"); _state_window_focusedReady = true; } return _state_window_focusedContent; } }
+            private static int _state_window_focusedContent = default;
+            private static bool _state_window_focusedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stateListAnimator"/>
+            /// </summary>
+            public static int stateListAnimator { get { if (!_stateListAnimatorReady) { _stateListAnimatorContent = SGetField<int>(LocalBridgeClazz, "stateListAnimator"); _stateListAnimatorReady = true; } return _stateListAnimatorContent; } }
+            private static int _stateListAnimatorContent = default;
+            private static bool _stateListAnimatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stateNotNeeded"/>
+            /// </summary>
+            public static int stateNotNeeded { get { if (!_stateNotNeededReady) { _stateNotNeededContent = SGetField<int>(LocalBridgeClazz, "stateNotNeeded"); _stateNotNeededReady = true; } return _stateNotNeededContent; } }
+            private static int _stateNotNeededContent = default;
+            private static bool _stateNotNeededReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#staticWallpaperPreview"/>
+            /// </summary>
+            public static int staticWallpaperPreview { get { if (!_staticWallpaperPreviewReady) { _staticWallpaperPreviewContent = SGetField<int>(LocalBridgeClazz, "staticWallpaperPreview"); _staticWallpaperPreviewReady = true; } return _staticWallpaperPreviewContent; } }
+            private static int _staticWallpaperPreviewContent = default;
+            private static bool _staticWallpaperPreviewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#statusBarColor"/>
+            /// </summary>
+            public static int statusBarColor { get { if (!_statusBarColorReady) { _statusBarColorContent = SGetField<int>(LocalBridgeClazz, "statusBarColor"); _statusBarColorReady = true; } return _statusBarColorContent; } }
+            private static int _statusBarColorContent = default;
+            private static bool _statusBarColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stepSize"/>
+            /// </summary>
+            public static int stepSize { get { if (!_stepSizeReady) { _stepSizeContent = SGetField<int>(LocalBridgeClazz, "stepSize"); _stepSizeReady = true; } return _stepSizeContent; } }
+            private static int _stepSizeContent = default;
+            private static bool _stepSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stopWithTask"/>
+            /// </summary>
+            public static int stopWithTask { get { if (!_stopWithTaskReady) { _stopWithTaskContent = SGetField<int>(LocalBridgeClazz, "stopWithTask"); _stopWithTaskReady = true; } return _stopWithTaskContent; } }
+            private static int _stopWithTaskContent = default;
+            private static bool _stopWithTaskReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#streamType"/>
+            /// </summary>
+            public static int streamType { get { if (!_streamTypeReady) { _streamTypeContent = SGetField<int>(LocalBridgeClazz, "streamType"); _streamTypeReady = true; } return _streamTypeContent; } }
+            private static int _streamTypeContent = default;
+            private static bool _streamTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stretchColumns"/>
+            /// </summary>
+            public static int stretchColumns { get { if (!_stretchColumnsReady) { _stretchColumnsContent = SGetField<int>(LocalBridgeClazz, "stretchColumns"); _stretchColumnsReady = true; } return _stretchColumnsContent; } }
+            private static int _stretchColumnsContent = default;
+            private static bool _stretchColumnsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stretchMode"/>
+            /// </summary>
+            public static int stretchMode { get { if (!_stretchModeReady) { _stretchModeContent = SGetField<int>(LocalBridgeClazz, "stretchMode"); _stretchModeReady = true; } return _stretchModeContent; } }
+            private static int _stretchModeContent = default;
+            private static bool _stretchModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#strokeAlpha"/>
+            /// </summary>
+            public static int strokeAlpha { get { if (!_strokeAlphaReady) { _strokeAlphaContent = SGetField<int>(LocalBridgeClazz, "strokeAlpha"); _strokeAlphaReady = true; } return _strokeAlphaContent; } }
+            private static int _strokeAlphaContent = default;
+            private static bool _strokeAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#strokeColor"/>
+            /// </summary>
+            public static int strokeColor { get { if (!_strokeColorReady) { _strokeColorContent = SGetField<int>(LocalBridgeClazz, "strokeColor"); _strokeColorReady = true; } return _strokeColorContent; } }
+            private static int _strokeColorContent = default;
+            private static bool _strokeColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#strokeLineCap"/>
+            /// </summary>
+            public static int strokeLineCap { get { if (!_strokeLineCapReady) { _strokeLineCapContent = SGetField<int>(LocalBridgeClazz, "strokeLineCap"); _strokeLineCapReady = true; } return _strokeLineCapContent; } }
+            private static int _strokeLineCapContent = default;
+            private static bool _strokeLineCapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#strokeLineJoin"/>
+            /// </summary>
+            public static int strokeLineJoin { get { if (!_strokeLineJoinReady) { _strokeLineJoinContent = SGetField<int>(LocalBridgeClazz, "strokeLineJoin"); _strokeLineJoinReady = true; } return _strokeLineJoinContent; } }
+            private static int _strokeLineJoinContent = default;
+            private static bool _strokeLineJoinReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#strokeMiterLimit"/>
+            /// </summary>
+            public static int strokeMiterLimit { get { if (!_strokeMiterLimitReady) { _strokeMiterLimitContent = SGetField<int>(LocalBridgeClazz, "strokeMiterLimit"); _strokeMiterLimitReady = true; } return _strokeMiterLimitContent; } }
+            private static int _strokeMiterLimitContent = default;
+            private static bool _strokeMiterLimitReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#strokeWidth"/>
+            /// </summary>
+            public static int strokeWidth { get { if (!_strokeWidthReady) { _strokeWidthContent = SGetField<int>(LocalBridgeClazz, "strokeWidth"); _strokeWidthReady = true; } return _strokeWidthContent; } }
+            private static int _strokeWidthContent = default;
+            private static bool _strokeWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#stylusHandwritingSettingsActivity"/>
+            /// </summary>
+            public static int stylusHandwritingSettingsActivity { get { if (!_stylusHandwritingSettingsActivityReady) { _stylusHandwritingSettingsActivityContent = SGetField<int>(LocalBridgeClazz, "stylusHandwritingSettingsActivity"); _stylusHandwritingSettingsActivityReady = true; } return _stylusHandwritingSettingsActivityContent; } }
+            private static int _stylusHandwritingSettingsActivityContent = default;
+            private static bool _stylusHandwritingSettingsActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#subMenuArrow"/>
+            /// </summary>
+            public static int subMenuArrow { get { if (!_subMenuArrowReady) { _subMenuArrowContent = SGetField<int>(LocalBridgeClazz, "subMenuArrow"); _subMenuArrowReady = true; } return _subMenuArrowContent; } }
+            private static int _subMenuArrowContent = default;
+            private static bool _subMenuArrowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#submitBackground"/>
+            /// </summary>
+            public static int submitBackground { get { if (!_submitBackgroundReady) { _submitBackgroundContent = SGetField<int>(LocalBridgeClazz, "submitBackground"); _submitBackgroundReady = true; } return _submitBackgroundContent; } }
+            private static int _submitBackgroundContent = default;
+            private static bool _submitBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#subtitle"/>
+            /// </summary>
+            public static int subtitle { get { if (!_subtitleReady) { _subtitleContent = SGetField<int>(LocalBridgeClazz, "subtitle"); _subtitleReady = true; } return _subtitleContent; } }
+            private static int _subtitleContent = default;
+            private static bool _subtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#subtitleTextAppearance"/>
+            /// </summary>
+            public static int subtitleTextAppearance { get { if (!_subtitleTextAppearanceReady) { _subtitleTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "subtitleTextAppearance"); _subtitleTextAppearanceReady = true; } return _subtitleTextAppearanceContent; } }
+            private static int _subtitleTextAppearanceContent = default;
+            private static bool _subtitleTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#subtitleTextColor"/>
+            /// </summary>
+            public static int subtitleTextColor { get { if (!_subtitleTextColorReady) { _subtitleTextColorContent = SGetField<int>(LocalBridgeClazz, "subtitleTextColor"); _subtitleTextColorReady = true; } return _subtitleTextColorContent; } }
+            private static int _subtitleTextColorContent = default;
+            private static bool _subtitleTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#subtitleTextStyle"/>
+            /// </summary>
+            public static int subtitleTextStyle { get { if (!_subtitleTextStyleReady) { _subtitleTextStyleContent = SGetField<int>(LocalBridgeClazz, "subtitleTextStyle"); _subtitleTextStyleReady = true; } return _subtitleTextStyleContent; } }
+            private static int _subtitleTextStyleContent = default;
+            private static bool _subtitleTextStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#subtypeExtraValue"/>
+            /// </summary>
+            public static int subtypeExtraValue { get { if (!_subtypeExtraValueReady) { _subtypeExtraValueContent = SGetField<int>(LocalBridgeClazz, "subtypeExtraValue"); _subtypeExtraValueReady = true; } return _subtypeExtraValueContent; } }
+            private static int _subtypeExtraValueContent = default;
+            private static bool _subtypeExtraValueReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#subtypeId"/>
+            /// </summary>
+            public static int subtypeId { get { if (!_subtypeIdReady) { _subtypeIdContent = SGetField<int>(LocalBridgeClazz, "subtypeId"); _subtypeIdReady = true; } return _subtypeIdContent; } }
+            private static int _subtypeIdContent = default;
+            private static bool _subtypeIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#subtypeLocale"/>
+            /// </summary>
+            public static int subtypeLocale { get { if (!_subtypeLocaleReady) { _subtypeLocaleContent = SGetField<int>(LocalBridgeClazz, "subtypeLocale"); _subtypeLocaleReady = true; } return _subtypeLocaleContent; } }
+            private static int _subtypeLocaleContent = default;
+            private static bool _subtypeLocaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#suggestActionMsg"/>
+            /// </summary>
+            public static int suggestActionMsg { get { if (!_suggestActionMsgReady) { _suggestActionMsgContent = SGetField<int>(LocalBridgeClazz, "suggestActionMsg"); _suggestActionMsgReady = true; } return _suggestActionMsgContent; } }
+            private static int _suggestActionMsgContent = default;
+            private static bool _suggestActionMsgReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#suggestActionMsgColumn"/>
+            /// </summary>
+            public static int suggestActionMsgColumn { get { if (!_suggestActionMsgColumnReady) { _suggestActionMsgColumnContent = SGetField<int>(LocalBridgeClazz, "suggestActionMsgColumn"); _suggestActionMsgColumnReady = true; } return _suggestActionMsgColumnContent; } }
+            private static int _suggestActionMsgColumnContent = default;
+            private static bool _suggestActionMsgColumnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#suggestionRowLayout"/>
+            /// </summary>
+            public static int suggestionRowLayout { get { if (!_suggestionRowLayoutReady) { _suggestionRowLayoutContent = SGetField<int>(LocalBridgeClazz, "suggestionRowLayout"); _suggestionRowLayoutReady = true; } return _suggestionRowLayoutContent; } }
+            private static int _suggestionRowLayoutContent = default;
+            private static bool _suggestionRowLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#summary"/>
+            /// </summary>
+            public static int summary { get { if (!_summaryReady) { _summaryContent = SGetField<int>(LocalBridgeClazz, "summary"); _summaryReady = true; } return _summaryContent; } }
+            private static int _summaryContent = default;
+            private static bool _summaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#summaryColumn"/>
+            /// </summary>
+            public static int summaryColumn { get { if (!_summaryColumnReady) { _summaryColumnContent = SGetField<int>(LocalBridgeClazz, "summaryColumn"); _summaryColumnReady = true; } return _summaryColumnContent; } }
+            private static int _summaryColumnContent = default;
+            private static bool _summaryColumnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#summaryOff"/>
+            /// </summary>
+            public static int summaryOff { get { if (!_summaryOffReady) { _summaryOffContent = SGetField<int>(LocalBridgeClazz, "summaryOff"); _summaryOffReady = true; } return _summaryOffContent; } }
+            private static int _summaryOffContent = default;
+            private static bool _summaryOffReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#summaryOn"/>
+            /// </summary>
+            public static int summaryOn { get { if (!_summaryOnReady) { _summaryOnContent = SGetField<int>(LocalBridgeClazz, "summaryOn"); _summaryOnReady = true; } return _summaryOnContent; } }
+            private static int _summaryOnContent = default;
+            private static bool _summaryOnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportedTypes"/>
+            /// </summary>
+            public static int supportedTypes { get { if (!_supportedTypesReady) { _supportedTypesContent = SGetField<int>(LocalBridgeClazz, "supportedTypes"); _supportedTypesReady = true; } return _supportedTypesContent; } }
+            private static int _supportedTypesContent = default;
+            private static bool _supportedTypesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsAssist"/>
+            /// </summary>
+            public static int supportsAssist { get { if (!_supportsAssistReady) { _supportsAssistContent = SGetField<int>(LocalBridgeClazz, "supportsAssist"); _supportsAssistReady = true; } return _supportsAssistContent; } }
+            private static int _supportsAssistContent = default;
+            private static bool _supportsAssistReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsBatteryGameMode"/>
+            /// </summary>
+            public static int supportsBatteryGameMode { get { if (!_supportsBatteryGameModeReady) { _supportsBatteryGameModeContent = SGetField<int>(LocalBridgeClazz, "supportsBatteryGameMode"); _supportsBatteryGameModeReady = true; } return _supportsBatteryGameModeContent; } }
+            private static int _supportsBatteryGameModeContent = default;
+            private static bool _supportsBatteryGameModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsInlineSuggestions"/>
+            /// </summary>
+            public static int supportsInlineSuggestions { get { if (!_supportsInlineSuggestionsReady) { _supportsInlineSuggestionsContent = SGetField<int>(LocalBridgeClazz, "supportsInlineSuggestions"); _supportsInlineSuggestionsReady = true; } return _supportsInlineSuggestionsContent; } }
+            private static int _supportsInlineSuggestionsContent = default;
+            private static bool _supportsInlineSuggestionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsInlineSuggestionsWithTouchExploration"/>
+            /// </summary>
+            public static int supportsInlineSuggestionsWithTouchExploration { get { if (!_supportsInlineSuggestionsWithTouchExplorationReady) { _supportsInlineSuggestionsWithTouchExplorationContent = SGetField<int>(LocalBridgeClazz, "supportsInlineSuggestionsWithTouchExploration"); _supportsInlineSuggestionsWithTouchExplorationReady = true; } return _supportsInlineSuggestionsWithTouchExplorationContent; } }
+            private static int _supportsInlineSuggestionsWithTouchExplorationContent = default;
+            private static bool _supportsInlineSuggestionsWithTouchExplorationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsLaunchVoiceAssistFromKeyguard"/>
+            /// </summary>
+            public static int supportsLaunchVoiceAssistFromKeyguard { get { if (!_supportsLaunchVoiceAssistFromKeyguardReady) { _supportsLaunchVoiceAssistFromKeyguardContent = SGetField<int>(LocalBridgeClazz, "supportsLaunchVoiceAssistFromKeyguard"); _supportsLaunchVoiceAssistFromKeyguardReady = true; } return _supportsLaunchVoiceAssistFromKeyguardContent; } }
+            private static int _supportsLaunchVoiceAssistFromKeyguardContent = default;
+            private static bool _supportsLaunchVoiceAssistFromKeyguardReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsLocalInteraction"/>
+            /// </summary>
+            public static int supportsLocalInteraction { get { if (!_supportsLocalInteractionReady) { _supportsLocalInteractionContent = SGetField<int>(LocalBridgeClazz, "supportsLocalInteraction"); _supportsLocalInteractionReady = true; } return _supportsLocalInteractionContent; } }
+            private static int _supportsLocalInteractionContent = default;
+            private static bool _supportsLocalInteractionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsMultipleDisplays"/>
+            /// </summary>
+            public static int supportsMultipleDisplays { get { if (!_supportsMultipleDisplaysReady) { _supportsMultipleDisplaysContent = SGetField<int>(LocalBridgeClazz, "supportsMultipleDisplays"); _supportsMultipleDisplaysReady = true; } return _supportsMultipleDisplaysContent; } }
+            private static int _supportsMultipleDisplaysContent = default;
+            private static bool _supportsMultipleDisplaysReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsPerformanceGameMode"/>
+            /// </summary>
+            public static int supportsPerformanceGameMode { get { if (!_supportsPerformanceGameModeReady) { _supportsPerformanceGameModeContent = SGetField<int>(LocalBridgeClazz, "supportsPerformanceGameMode"); _supportsPerformanceGameModeReady = true; } return _supportsPerformanceGameModeContent; } }
+            private static int _supportsPerformanceGameModeContent = default;
+            private static bool _supportsPerformanceGameModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsPictureInPicture"/>
+            /// </summary>
+            public static int supportsPictureInPicture { get { if (!_supportsPictureInPictureReady) { _supportsPictureInPictureContent = SGetField<int>(LocalBridgeClazz, "supportsPictureInPicture"); _supportsPictureInPictureReady = true; } return _supportsPictureInPictureContent; } }
+            private static int _supportsPictureInPictureContent = default;
+            private static bool _supportsPictureInPictureReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsRtl"/>
+            /// </summary>
+            public static int supportsRtl { get { if (!_supportsRtlReady) { _supportsRtlContent = SGetField<int>(LocalBridgeClazz, "supportsRtl"); _supportsRtlReady = true; } return _supportsRtlContent; } }
+            private static int _supportsRtlContent = default;
+            private static bool _supportsRtlReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsStylusHandwriting"/>
+            /// </summary>
+            public static int supportsStylusHandwriting { get { if (!_supportsStylusHandwritingReady) { _supportsStylusHandwritingContent = SGetField<int>(LocalBridgeClazz, "supportsStylusHandwriting"); _supportsStylusHandwritingReady = true; } return _supportsStylusHandwritingContent; } }
+            private static int _supportsStylusHandwritingContent = default;
+            private static bool _supportsStylusHandwritingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsSwitchingToNextInputMethod"/>
+            /// </summary>
+            public static int supportsSwitchingToNextInputMethod { get { if (!_supportsSwitchingToNextInputMethodReady) { _supportsSwitchingToNextInputMethodContent = SGetField<int>(LocalBridgeClazz, "supportsSwitchingToNextInputMethod"); _supportsSwitchingToNextInputMethodReady = true; } return _supportsSwitchingToNextInputMethodContent; } }
+            private static int _supportsSwitchingToNextInputMethodContent = default;
+            private static bool _supportsSwitchingToNextInputMethodReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#supportsUploading"/>
+            /// </summary>
+            public static int supportsUploading { get { if (!_supportsUploadingReady) { _supportsUploadingContent = SGetField<int>(LocalBridgeClazz, "supportsUploading"); _supportsUploadingReady = true; } return _supportsUploadingContent; } }
+            private static int _supportsUploadingContent = default;
+            private static bool _supportsUploadingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#suppressesSpellChecker"/>
+            /// </summary>
+            public static int suppressesSpellChecker { get { if (!_suppressesSpellCheckerReady) { _suppressesSpellCheckerContent = SGetField<int>(LocalBridgeClazz, "suppressesSpellChecker"); _suppressesSpellCheckerReady = true; } return _suppressesSpellCheckerContent; } }
+            private static int _suppressesSpellCheckerContent = default;
+            private static bool _suppressesSpellCheckerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#switchMinWidth"/>
+            /// </summary>
+            public static int switchMinWidth { get { if (!_switchMinWidthReady) { _switchMinWidthContent = SGetField<int>(LocalBridgeClazz, "switchMinWidth"); _switchMinWidthReady = true; } return _switchMinWidthContent; } }
+            private static int _switchMinWidthContent = default;
+            private static bool _switchMinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#switchPadding"/>
+            /// </summary>
+            public static int switchPadding { get { if (!_switchPaddingReady) { _switchPaddingContent = SGetField<int>(LocalBridgeClazz, "switchPadding"); _switchPaddingReady = true; } return _switchPaddingContent; } }
+            private static int _switchPaddingContent = default;
+            private static bool _switchPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#switchPreferenceStyle"/>
+            /// </summary>
+            public static int switchPreferenceStyle { get { if (!_switchPreferenceStyleReady) { _switchPreferenceStyleContent = SGetField<int>(LocalBridgeClazz, "switchPreferenceStyle"); _switchPreferenceStyleReady = true; } return _switchPreferenceStyleContent; } }
+            private static int _switchPreferenceStyleContent = default;
+            private static bool _switchPreferenceStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#switchStyle"/>
+            /// </summary>
+            public static int switchStyle { get { if (!_switchStyleReady) { _switchStyleContent = SGetField<int>(LocalBridgeClazz, "switchStyle"); _switchStyleReady = true; } return _switchStyleContent; } }
+            private static int _switchStyleContent = default;
+            private static bool _switchStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#switchTextAppearance"/>
+            /// </summary>
+            public static int switchTextAppearance { get { if (!_switchTextAppearanceReady) { _switchTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "switchTextAppearance"); _switchTextAppearanceReady = true; } return _switchTextAppearanceContent; } }
+            private static int _switchTextAppearanceContent = default;
+            private static bool _switchTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#switchTextOff"/>
+            /// </summary>
+            public static int switchTextOff { get { if (!_switchTextOffReady) { _switchTextOffContent = SGetField<int>(LocalBridgeClazz, "switchTextOff"); _switchTextOffReady = true; } return _switchTextOffContent; } }
+            private static int _switchTextOffContent = default;
+            private static bool _switchTextOffReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#switchTextOn"/>
+            /// </summary>
+            public static int switchTextOn { get { if (!_switchTextOnReady) { _switchTextOnContent = SGetField<int>(LocalBridgeClazz, "switchTextOn"); _switchTextOnReady = true; } return _switchTextOnContent; } }
+            private static int _switchTextOnContent = default;
+            private static bool _switchTextOnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#syncable"/>
+            /// </summary>
+            public static int syncable { get { if (!_syncableReady) { _syncableContent = SGetField<int>(LocalBridgeClazz, "syncable"); _syncableReady = true; } return _syncableContent; } }
+            private static int _syncableContent = default;
+            private static bool _syncableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tabStripEnabled"/>
+            /// </summary>
+            public static int tabStripEnabled { get { if (!_tabStripEnabledReady) { _tabStripEnabledContent = SGetField<int>(LocalBridgeClazz, "tabStripEnabled"); _tabStripEnabledReady = true; } return _tabStripEnabledContent; } }
+            private static int _tabStripEnabledContent = default;
+            private static bool _tabStripEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tabStripLeft"/>
+            /// </summary>
+            public static int tabStripLeft { get { if (!_tabStripLeftReady) { _tabStripLeftContent = SGetField<int>(LocalBridgeClazz, "tabStripLeft"); _tabStripLeftReady = true; } return _tabStripLeftContent; } }
+            private static int _tabStripLeftContent = default;
+            private static bool _tabStripLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tabStripRight"/>
+            /// </summary>
+            public static int tabStripRight { get { if (!_tabStripRightReady) { _tabStripRightContent = SGetField<int>(LocalBridgeClazz, "tabStripRight"); _tabStripRightReady = true; } return _tabStripRightContent; } }
+            private static int _tabStripRightContent = default;
+            private static bool _tabStripRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tabWidgetStyle"/>
+            /// </summary>
+            public static int tabWidgetStyle { get { if (!_tabWidgetStyleReady) { _tabWidgetStyleContent = SGetField<int>(LocalBridgeClazz, "tabWidgetStyle"); _tabWidgetStyleReady = true; } return _tabWidgetStyleContent; } }
+            private static int _tabWidgetStyleContent = default;
+            private static bool _tabWidgetStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tag"/>
+            /// </summary>
+            public static int tag { get { if (!_tagReady) { _tagContent = SGetField<int>(LocalBridgeClazz, "tag"); _tagReady = true; } return _tagContent; } }
+            private static int _tagContent = default;
+            private static bool _tagReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetActivity"/>
+            /// </summary>
+            public static int targetActivity { get { if (!_targetActivityReady) { _targetActivityContent = SGetField<int>(LocalBridgeClazz, "targetActivity"); _targetActivityReady = true; } return _targetActivityContent; } }
+            private static int _targetActivityContent = default;
+            private static bool _targetActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetCellHeight"/>
+            /// </summary>
+            public static int targetCellHeight { get { if (!_targetCellHeightReady) { _targetCellHeightContent = SGetField<int>(LocalBridgeClazz, "targetCellHeight"); _targetCellHeightReady = true; } return _targetCellHeightContent; } }
+            private static int _targetCellHeightContent = default;
+            private static bool _targetCellHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetCellWidth"/>
+            /// </summary>
+            public static int targetCellWidth { get { if (!_targetCellWidthReady) { _targetCellWidthContent = SGetField<int>(LocalBridgeClazz, "targetCellWidth"); _targetCellWidthReady = true; } return _targetCellWidthContent; } }
+            private static int _targetCellWidthContent = default;
+            private static bool _targetCellWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetClass"/>
+            /// </summary>
+            public static int targetClass { get { if (!_targetClassReady) { _targetClassContent = SGetField<int>(LocalBridgeClazz, "targetClass"); _targetClassReady = true; } return _targetClassContent; } }
+            private static int _targetClassContent = default;
+            private static bool _targetClassReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetDescriptions"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int targetDescriptions { get { if (!_targetDescriptionsReady) { _targetDescriptionsContent = SGetField<int>(LocalBridgeClazz, "targetDescriptions"); _targetDescriptionsReady = true; } return _targetDescriptionsContent; } }
+            private static int _targetDescriptionsContent = default;
+            private static bool _targetDescriptionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetId"/>
+            /// </summary>
+            public static int targetId { get { if (!_targetIdReady) { _targetIdContent = SGetField<int>(LocalBridgeClazz, "targetId"); _targetIdReady = true; } return _targetIdContent; } }
+            private static int _targetIdContent = default;
+            private static bool _targetIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetName"/>
+            /// </summary>
+            public static int targetName { get { if (!_targetNameReady) { _targetNameContent = SGetField<int>(LocalBridgeClazz, "targetName"); _targetNameReady = true; } return _targetNameContent; } }
+            private static int _targetNameContent = default;
+            private static bool _targetNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetPackage"/>
+            /// </summary>
+            public static int targetPackage { get { if (!_targetPackageReady) { _targetPackageContent = SGetField<int>(LocalBridgeClazz, "targetPackage"); _targetPackageReady = true; } return _targetPackageContent; } }
+            private static int _targetPackageContent = default;
+            private static bool _targetPackageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetProcesses"/>
+            /// </summary>
+            public static int targetProcesses { get { if (!_targetProcessesReady) { _targetProcessesContent = SGetField<int>(LocalBridgeClazz, "targetProcesses"); _targetProcessesReady = true; } return _targetProcessesContent; } }
+            private static int _targetProcessesContent = default;
+            private static bool _targetProcessesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetSandboxVersion"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int targetSandboxVersion { get { if (!_targetSandboxVersionReady) { _targetSandboxVersionContent = SGetField<int>(LocalBridgeClazz, "targetSandboxVersion"); _targetSandboxVersionReady = true; } return _targetSandboxVersionContent; } }
+            private static int _targetSandboxVersionContent = default;
+            private static bool _targetSandboxVersionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#targetSdkVersion"/>
+            /// </summary>
+            public static int targetSdkVersion { get { if (!_targetSdkVersionReady) { _targetSdkVersionContent = SGetField<int>(LocalBridgeClazz, "targetSdkVersion"); _targetSdkVersionReady = true; } return _targetSdkVersionContent; } }
+            private static int _targetSdkVersionContent = default;
+            private static bool _targetSdkVersionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskAffinity"/>
+            /// </summary>
+            public static int taskAffinity { get { if (!_taskAffinityReady) { _taskAffinityContent = SGetField<int>(LocalBridgeClazz, "taskAffinity"); _taskAffinityReady = true; } return _taskAffinityContent; } }
+            private static int _taskAffinityContent = default;
+            private static bool _taskAffinityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskCloseEnterAnimation"/>
+            /// </summary>
+            public static int taskCloseEnterAnimation { get { if (!_taskCloseEnterAnimationReady) { _taskCloseEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "taskCloseEnterAnimation"); _taskCloseEnterAnimationReady = true; } return _taskCloseEnterAnimationContent; } }
+            private static int _taskCloseEnterAnimationContent = default;
+            private static bool _taskCloseEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskCloseExitAnimation"/>
+            /// </summary>
+            public static int taskCloseExitAnimation { get { if (!_taskCloseExitAnimationReady) { _taskCloseExitAnimationContent = SGetField<int>(LocalBridgeClazz, "taskCloseExitAnimation"); _taskCloseExitAnimationReady = true; } return _taskCloseExitAnimationContent; } }
+            private static int _taskCloseExitAnimationContent = default;
+            private static bool _taskCloseExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskOpenEnterAnimation"/>
+            /// </summary>
+            public static int taskOpenEnterAnimation { get { if (!_taskOpenEnterAnimationReady) { _taskOpenEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "taskOpenEnterAnimation"); _taskOpenEnterAnimationReady = true; } return _taskOpenEnterAnimationContent; } }
+            private static int _taskOpenEnterAnimationContent = default;
+            private static bool _taskOpenEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskOpenExitAnimation"/>
+            /// </summary>
+            public static int taskOpenExitAnimation { get { if (!_taskOpenExitAnimationReady) { _taskOpenExitAnimationContent = SGetField<int>(LocalBridgeClazz, "taskOpenExitAnimation"); _taskOpenExitAnimationReady = true; } return _taskOpenExitAnimationContent; } }
+            private static int _taskOpenExitAnimationContent = default;
+            private static bool _taskOpenExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskToBackEnterAnimation"/>
+            /// </summary>
+            public static int taskToBackEnterAnimation { get { if (!_taskToBackEnterAnimationReady) { _taskToBackEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "taskToBackEnterAnimation"); _taskToBackEnterAnimationReady = true; } return _taskToBackEnterAnimationContent; } }
+            private static int _taskToBackEnterAnimationContent = default;
+            private static bool _taskToBackEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskToBackExitAnimation"/>
+            /// </summary>
+            public static int taskToBackExitAnimation { get { if (!_taskToBackExitAnimationReady) { _taskToBackExitAnimationContent = SGetField<int>(LocalBridgeClazz, "taskToBackExitAnimation"); _taskToBackExitAnimationReady = true; } return _taskToBackExitAnimationContent; } }
+            private static int _taskToBackExitAnimationContent = default;
+            private static bool _taskToBackExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskToFrontEnterAnimation"/>
+            /// </summary>
+            public static int taskToFrontEnterAnimation { get { if (!_taskToFrontEnterAnimationReady) { _taskToFrontEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "taskToFrontEnterAnimation"); _taskToFrontEnterAnimationReady = true; } return _taskToFrontEnterAnimationContent; } }
+            private static int _taskToFrontEnterAnimationContent = default;
+            private static bool _taskToFrontEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#taskToFrontExitAnimation"/>
+            /// </summary>
+            public static int taskToFrontExitAnimation { get { if (!_taskToFrontExitAnimationReady) { _taskToFrontExitAnimationContent = SGetField<int>(LocalBridgeClazz, "taskToFrontExitAnimation"); _taskToFrontExitAnimationReady = true; } return _taskToFrontExitAnimationContent; } }
+            private static int _taskToFrontExitAnimationContent = default;
+            private static bool _taskToFrontExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tension"/>
+            /// </summary>
+            public static int tension { get { if (!_tensionReady) { _tensionContent = SGetField<int>(LocalBridgeClazz, "tension"); _tensionReady = true; } return _tensionContent; } }
+            private static int _tensionContent = default;
+            private static bool _tensionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#testOnly"/>
+            /// </summary>
+            public static int testOnly { get { if (!_testOnlyReady) { _testOnlyContent = SGetField<int>(LocalBridgeClazz, "testOnly"); _testOnlyReady = true; } return _testOnlyContent; } }
+            private static int _testOnlyContent = default;
+            private static bool _testOnlyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#text"/>
+            /// </summary>
+            public static int text { get { if (!_textReady) { _textContent = SGetField<int>(LocalBridgeClazz, "text"); _textReady = true; } return _textContent; } }
+            private static int _textContent = default;
+            private static bool _textReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAlignment"/>
+            /// </summary>
+            public static int textAlignment { get { if (!_textAlignmentReady) { _textAlignmentContent = SGetField<int>(LocalBridgeClazz, "textAlignment"); _textAlignmentReady = true; } return _textAlignmentContent; } }
+            private static int _textAlignmentContent = default;
+            private static bool _textAlignmentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAllCaps"/>
+            /// </summary>
+            public static int textAllCaps { get { if (!_textAllCapsReady) { _textAllCapsContent = SGetField<int>(LocalBridgeClazz, "textAllCaps"); _textAllCapsReady = true; } return _textAllCapsContent; } }
+            private static int _textAllCapsContent = default;
+            private static bool _textAllCapsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearance"/>
+            /// </summary>
+            public static int textAppearance { get { if (!_textAppearanceReady) { _textAppearanceContent = SGetField<int>(LocalBridgeClazz, "textAppearance"); _textAppearanceReady = true; } return _textAppearanceContent; } }
+            private static int _textAppearanceContent = default;
+            private static bool _textAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceButton"/>
+            /// </summary>
+            public static int textAppearanceButton { get { if (!_textAppearanceButtonReady) { _textAppearanceButtonContent = SGetField<int>(LocalBridgeClazz, "textAppearanceButton"); _textAppearanceButtonReady = true; } return _textAppearanceButtonContent; } }
+            private static int _textAppearanceButtonContent = default;
+            private static bool _textAppearanceButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceInverse"/>
+            /// </summary>
+            public static int textAppearanceInverse { get { if (!_textAppearanceInverseReady) { _textAppearanceInverseContent = SGetField<int>(LocalBridgeClazz, "textAppearanceInverse"); _textAppearanceInverseReady = true; } return _textAppearanceInverseContent; } }
+            private static int _textAppearanceInverseContent = default;
+            private static bool _textAppearanceInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceLarge"/>
+            /// </summary>
+            public static int textAppearanceLarge { get { if (!_textAppearanceLargeReady) { _textAppearanceLargeContent = SGetField<int>(LocalBridgeClazz, "textAppearanceLarge"); _textAppearanceLargeReady = true; } return _textAppearanceLargeContent; } }
+            private static int _textAppearanceLargeContent = default;
+            private static bool _textAppearanceLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceLargeInverse"/>
+            /// </summary>
+            public static int textAppearanceLargeInverse { get { if (!_textAppearanceLargeInverseReady) { _textAppearanceLargeInverseContent = SGetField<int>(LocalBridgeClazz, "textAppearanceLargeInverse"); _textAppearanceLargeInverseReady = true; } return _textAppearanceLargeInverseContent; } }
+            private static int _textAppearanceLargeInverseContent = default;
+            private static bool _textAppearanceLargeInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceLargePopupMenu"/>
+            /// </summary>
+            public static int textAppearanceLargePopupMenu { get { if (!_textAppearanceLargePopupMenuReady) { _textAppearanceLargePopupMenuContent = SGetField<int>(LocalBridgeClazz, "textAppearanceLargePopupMenu"); _textAppearanceLargePopupMenuReady = true; } return _textAppearanceLargePopupMenuContent; } }
+            private static int _textAppearanceLargePopupMenuContent = default;
+            private static bool _textAppearanceLargePopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceListItem"/>
+            /// </summary>
+            public static int textAppearanceListItem { get { if (!_textAppearanceListItemReady) { _textAppearanceListItemContent = SGetField<int>(LocalBridgeClazz, "textAppearanceListItem"); _textAppearanceListItemReady = true; } return _textAppearanceListItemContent; } }
+            private static int _textAppearanceListItemContent = default;
+            private static bool _textAppearanceListItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceListItemSecondary"/>
+            /// </summary>
+            public static int textAppearanceListItemSecondary { get { if (!_textAppearanceListItemSecondaryReady) { _textAppearanceListItemSecondaryContent = SGetField<int>(LocalBridgeClazz, "textAppearanceListItemSecondary"); _textAppearanceListItemSecondaryReady = true; } return _textAppearanceListItemSecondaryContent; } }
+            private static int _textAppearanceListItemSecondaryContent = default;
+            private static bool _textAppearanceListItemSecondaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceListItemSmall"/>
+            /// </summary>
+            public static int textAppearanceListItemSmall { get { if (!_textAppearanceListItemSmallReady) { _textAppearanceListItemSmallContent = SGetField<int>(LocalBridgeClazz, "textAppearanceListItemSmall"); _textAppearanceListItemSmallReady = true; } return _textAppearanceListItemSmallContent; } }
+            private static int _textAppearanceListItemSmallContent = default;
+            private static bool _textAppearanceListItemSmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceMedium"/>
+            /// </summary>
+            public static int textAppearanceMedium { get { if (!_textAppearanceMediumReady) { _textAppearanceMediumContent = SGetField<int>(LocalBridgeClazz, "textAppearanceMedium"); _textAppearanceMediumReady = true; } return _textAppearanceMediumContent; } }
+            private static int _textAppearanceMediumContent = default;
+            private static bool _textAppearanceMediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceMediumInverse"/>
+            /// </summary>
+            public static int textAppearanceMediumInverse { get { if (!_textAppearanceMediumInverseReady) { _textAppearanceMediumInverseContent = SGetField<int>(LocalBridgeClazz, "textAppearanceMediumInverse"); _textAppearanceMediumInverseReady = true; } return _textAppearanceMediumInverseContent; } }
+            private static int _textAppearanceMediumInverseContent = default;
+            private static bool _textAppearanceMediumInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearancePopupMenuHeader"/>
+            /// </summary>
+            public static int textAppearancePopupMenuHeader { get { if (!_textAppearancePopupMenuHeaderReady) { _textAppearancePopupMenuHeaderContent = SGetField<int>(LocalBridgeClazz, "textAppearancePopupMenuHeader"); _textAppearancePopupMenuHeaderReady = true; } return _textAppearancePopupMenuHeaderContent; } }
+            private static int _textAppearancePopupMenuHeaderContent = default;
+            private static bool _textAppearancePopupMenuHeaderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceSearchResultSubtitle"/>
+            /// </summary>
+            public static int textAppearanceSearchResultSubtitle { get { if (!_textAppearanceSearchResultSubtitleReady) { _textAppearanceSearchResultSubtitleContent = SGetField<int>(LocalBridgeClazz, "textAppearanceSearchResultSubtitle"); _textAppearanceSearchResultSubtitleReady = true; } return _textAppearanceSearchResultSubtitleContent; } }
+            private static int _textAppearanceSearchResultSubtitleContent = default;
+            private static bool _textAppearanceSearchResultSubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceSearchResultTitle"/>
+            /// </summary>
+            public static int textAppearanceSearchResultTitle { get { if (!_textAppearanceSearchResultTitleReady) { _textAppearanceSearchResultTitleContent = SGetField<int>(LocalBridgeClazz, "textAppearanceSearchResultTitle"); _textAppearanceSearchResultTitleReady = true; } return _textAppearanceSearchResultTitleContent; } }
+            private static int _textAppearanceSearchResultTitleContent = default;
+            private static bool _textAppearanceSearchResultTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceSmall"/>
+            /// </summary>
+            public static int textAppearanceSmall { get { if (!_textAppearanceSmallReady) { _textAppearanceSmallContent = SGetField<int>(LocalBridgeClazz, "textAppearanceSmall"); _textAppearanceSmallReady = true; } return _textAppearanceSmallContent; } }
+            private static int _textAppearanceSmallContent = default;
+            private static bool _textAppearanceSmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceSmallInverse"/>
+            /// </summary>
+            public static int textAppearanceSmallInverse { get { if (!_textAppearanceSmallInverseReady) { _textAppearanceSmallInverseContent = SGetField<int>(LocalBridgeClazz, "textAppearanceSmallInverse"); _textAppearanceSmallInverseReady = true; } return _textAppearanceSmallInverseContent; } }
+            private static int _textAppearanceSmallInverseContent = default;
+            private static bool _textAppearanceSmallInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textAppearanceSmallPopupMenu"/>
+            /// </summary>
+            public static int textAppearanceSmallPopupMenu { get { if (!_textAppearanceSmallPopupMenuReady) { _textAppearanceSmallPopupMenuContent = SGetField<int>(LocalBridgeClazz, "textAppearanceSmallPopupMenu"); _textAppearanceSmallPopupMenuReady = true; } return _textAppearanceSmallPopupMenuContent; } }
+            private static int _textAppearanceSmallPopupMenuContent = default;
+            private static bool _textAppearanceSmallPopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textCheckMark"/>
+            /// </summary>
+            public static int textCheckMark { get { if (!_textCheckMarkReady) { _textCheckMarkContent = SGetField<int>(LocalBridgeClazz, "textCheckMark"); _textCheckMarkReady = true; } return _textCheckMarkContent; } }
+            private static int _textCheckMarkContent = default;
+            private static bool _textCheckMarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textCheckMarkInverse"/>
+            /// </summary>
+            public static int textCheckMarkInverse { get { if (!_textCheckMarkInverseReady) { _textCheckMarkInverseContent = SGetField<int>(LocalBridgeClazz, "textCheckMarkInverse"); _textCheckMarkInverseReady = true; } return _textCheckMarkInverseContent; } }
+            private static int _textCheckMarkInverseContent = default;
+            private static bool _textCheckMarkInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColor"/>
+            /// </summary>
+            public static int textColor { get { if (!_textColorReady) { _textColorContent = SGetField<int>(LocalBridgeClazz, "textColor"); _textColorReady = true; } return _textColorContent; } }
+            private static int _textColorContent = default;
+            private static bool _textColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorAlertDialogListItem"/>
+            /// </summary>
+            public static int textColorAlertDialogListItem { get { if (!_textColorAlertDialogListItemReady) { _textColorAlertDialogListItemContent = SGetField<int>(LocalBridgeClazz, "textColorAlertDialogListItem"); _textColorAlertDialogListItemReady = true; } return _textColorAlertDialogListItemContent; } }
+            private static int _textColorAlertDialogListItemContent = default;
+            private static bool _textColorAlertDialogListItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorHighlight"/>
+            /// </summary>
+            public static int textColorHighlight { get { if (!_textColorHighlightReady) { _textColorHighlightContent = SGetField<int>(LocalBridgeClazz, "textColorHighlight"); _textColorHighlightReady = true; } return _textColorHighlightContent; } }
+            private static int _textColorHighlightContent = default;
+            private static bool _textColorHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorHighlightInverse"/>
+            /// </summary>
+            public static int textColorHighlightInverse { get { if (!_textColorHighlightInverseReady) { _textColorHighlightInverseContent = SGetField<int>(LocalBridgeClazz, "textColorHighlightInverse"); _textColorHighlightInverseReady = true; } return _textColorHighlightInverseContent; } }
+            private static int _textColorHighlightInverseContent = default;
+            private static bool _textColorHighlightInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorHint"/>
+            /// </summary>
+            public static int textColorHint { get { if (!_textColorHintReady) { _textColorHintContent = SGetField<int>(LocalBridgeClazz, "textColorHint"); _textColorHintReady = true; } return _textColorHintContent; } }
+            private static int _textColorHintContent = default;
+            private static bool _textColorHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorHintInverse"/>
+            /// </summary>
+            public static int textColorHintInverse { get { if (!_textColorHintInverseReady) { _textColorHintInverseContent = SGetField<int>(LocalBridgeClazz, "textColorHintInverse"); _textColorHintInverseReady = true; } return _textColorHintInverseContent; } }
+            private static int _textColorHintInverseContent = default;
+            private static bool _textColorHintInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorLink"/>
+            /// </summary>
+            public static int textColorLink { get { if (!_textColorLinkReady) { _textColorLinkContent = SGetField<int>(LocalBridgeClazz, "textColorLink"); _textColorLinkReady = true; } return _textColorLinkContent; } }
+            private static int _textColorLinkContent = default;
+            private static bool _textColorLinkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorLinkInverse"/>
+            /// </summary>
+            public static int textColorLinkInverse { get { if (!_textColorLinkInverseReady) { _textColorLinkInverseContent = SGetField<int>(LocalBridgeClazz, "textColorLinkInverse"); _textColorLinkInverseReady = true; } return _textColorLinkInverseContent; } }
+            private static int _textColorLinkInverseContent = default;
+            private static bool _textColorLinkInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorPrimary"/>
+            /// </summary>
+            public static int textColorPrimary { get { if (!_textColorPrimaryReady) { _textColorPrimaryContent = SGetField<int>(LocalBridgeClazz, "textColorPrimary"); _textColorPrimaryReady = true; } return _textColorPrimaryContent; } }
+            private static int _textColorPrimaryContent = default;
+            private static bool _textColorPrimaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorPrimaryDisableOnly"/>
+            /// </summary>
+            public static int textColorPrimaryDisableOnly { get { if (!_textColorPrimaryDisableOnlyReady) { _textColorPrimaryDisableOnlyContent = SGetField<int>(LocalBridgeClazz, "textColorPrimaryDisableOnly"); _textColorPrimaryDisableOnlyReady = true; } return _textColorPrimaryDisableOnlyContent; } }
+            private static int _textColorPrimaryDisableOnlyContent = default;
+            private static bool _textColorPrimaryDisableOnlyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorPrimaryInverse"/>
+            /// </summary>
+            public static int textColorPrimaryInverse { get { if (!_textColorPrimaryInverseReady) { _textColorPrimaryInverseContent = SGetField<int>(LocalBridgeClazz, "textColorPrimaryInverse"); _textColorPrimaryInverseReady = true; } return _textColorPrimaryInverseContent; } }
+            private static int _textColorPrimaryInverseContent = default;
+            private static bool _textColorPrimaryInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorPrimaryInverseDisableOnly"/>
+            /// </summary>
+            public static int textColorPrimaryInverseDisableOnly { get { if (!_textColorPrimaryInverseDisableOnlyReady) { _textColorPrimaryInverseDisableOnlyContent = SGetField<int>(LocalBridgeClazz, "textColorPrimaryInverseDisableOnly"); _textColorPrimaryInverseDisableOnlyReady = true; } return _textColorPrimaryInverseDisableOnlyContent; } }
+            private static int _textColorPrimaryInverseDisableOnlyContent = default;
+            private static bool _textColorPrimaryInverseDisableOnlyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorPrimaryInverseNoDisable"/>
+            /// </summary>
+            public static int textColorPrimaryInverseNoDisable { get { if (!_textColorPrimaryInverseNoDisableReady) { _textColorPrimaryInverseNoDisableContent = SGetField<int>(LocalBridgeClazz, "textColorPrimaryInverseNoDisable"); _textColorPrimaryInverseNoDisableReady = true; } return _textColorPrimaryInverseNoDisableContent; } }
+            private static int _textColorPrimaryInverseNoDisableContent = default;
+            private static bool _textColorPrimaryInverseNoDisableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorPrimaryNoDisable"/>
+            /// </summary>
+            public static int textColorPrimaryNoDisable { get { if (!_textColorPrimaryNoDisableReady) { _textColorPrimaryNoDisableContent = SGetField<int>(LocalBridgeClazz, "textColorPrimaryNoDisable"); _textColorPrimaryNoDisableReady = true; } return _textColorPrimaryNoDisableContent; } }
+            private static int _textColorPrimaryNoDisableContent = default;
+            private static bool _textColorPrimaryNoDisableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorSecondary"/>
+            /// </summary>
+            public static int textColorSecondary { get { if (!_textColorSecondaryReady) { _textColorSecondaryContent = SGetField<int>(LocalBridgeClazz, "textColorSecondary"); _textColorSecondaryReady = true; } return _textColorSecondaryContent; } }
+            private static int _textColorSecondaryContent = default;
+            private static bool _textColorSecondaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorSecondaryInverse"/>
+            /// </summary>
+            public static int textColorSecondaryInverse { get { if (!_textColorSecondaryInverseReady) { _textColorSecondaryInverseContent = SGetField<int>(LocalBridgeClazz, "textColorSecondaryInverse"); _textColorSecondaryInverseReady = true; } return _textColorSecondaryInverseContent; } }
+            private static int _textColorSecondaryInverseContent = default;
+            private static bool _textColorSecondaryInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorSecondaryInverseNoDisable"/>
+            /// </summary>
+            public static int textColorSecondaryInverseNoDisable { get { if (!_textColorSecondaryInverseNoDisableReady) { _textColorSecondaryInverseNoDisableContent = SGetField<int>(LocalBridgeClazz, "textColorSecondaryInverseNoDisable"); _textColorSecondaryInverseNoDisableReady = true; } return _textColorSecondaryInverseNoDisableContent; } }
+            private static int _textColorSecondaryInverseNoDisableContent = default;
+            private static bool _textColorSecondaryInverseNoDisableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorSecondaryNoDisable"/>
+            /// </summary>
+            public static int textColorSecondaryNoDisable { get { if (!_textColorSecondaryNoDisableReady) { _textColorSecondaryNoDisableContent = SGetField<int>(LocalBridgeClazz, "textColorSecondaryNoDisable"); _textColorSecondaryNoDisableReady = true; } return _textColorSecondaryNoDisableContent; } }
+            private static int _textColorSecondaryNoDisableContent = default;
+            private static bool _textColorSecondaryNoDisableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorTertiary"/>
+            /// </summary>
+            public static int textColorTertiary { get { if (!_textColorTertiaryReady) { _textColorTertiaryContent = SGetField<int>(LocalBridgeClazz, "textColorTertiary"); _textColorTertiaryReady = true; } return _textColorTertiaryContent; } }
+            private static int _textColorTertiaryContent = default;
+            private static bool _textColorTertiaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textColorTertiaryInverse"/>
+            /// </summary>
+            public static int textColorTertiaryInverse { get { if (!_textColorTertiaryInverseReady) { _textColorTertiaryInverseContent = SGetField<int>(LocalBridgeClazz, "textColorTertiaryInverse"); _textColorTertiaryInverseReady = true; } return _textColorTertiaryInverseContent; } }
+            private static int _textColorTertiaryInverseContent = default;
+            private static bool _textColorTertiaryInverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textCursorDrawable"/>
+            /// </summary>
+            public static int textCursorDrawable { get { if (!_textCursorDrawableReady) { _textCursorDrawableContent = SGetField<int>(LocalBridgeClazz, "textCursorDrawable"); _textCursorDrawableReady = true; } return _textCursorDrawableContent; } }
+            private static int _textCursorDrawableContent = default;
+            private static bool _textCursorDrawableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textDirection"/>
+            /// </summary>
+            public static int textDirection { get { if (!_textDirectionReady) { _textDirectionContent = SGetField<int>(LocalBridgeClazz, "textDirection"); _textDirectionReady = true; } return _textDirectionContent; } }
+            private static int _textDirectionContent = default;
+            private static bool _textDirectionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textEditNoPasteWindowLayout"/>
+            /// </summary>
+            public static int textEditNoPasteWindowLayout { get { if (!_textEditNoPasteWindowLayoutReady) { _textEditNoPasteWindowLayoutContent = SGetField<int>(LocalBridgeClazz, "textEditNoPasteWindowLayout"); _textEditNoPasteWindowLayoutReady = true; } return _textEditNoPasteWindowLayoutContent; } }
+            private static int _textEditNoPasteWindowLayoutContent = default;
+            private static bool _textEditNoPasteWindowLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textEditPasteWindowLayout"/>
+            /// </summary>
+            public static int textEditPasteWindowLayout { get { if (!_textEditPasteWindowLayoutReady) { _textEditPasteWindowLayoutContent = SGetField<int>(LocalBridgeClazz, "textEditPasteWindowLayout"); _textEditPasteWindowLayoutReady = true; } return _textEditPasteWindowLayoutContent; } }
+            private static int _textEditPasteWindowLayoutContent = default;
+            private static bool _textEditPasteWindowLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textEditSideNoPasteWindowLayout"/>
+            /// </summary>
+            public static int textEditSideNoPasteWindowLayout { get { if (!_textEditSideNoPasteWindowLayoutReady) { _textEditSideNoPasteWindowLayoutContent = SGetField<int>(LocalBridgeClazz, "textEditSideNoPasteWindowLayout"); _textEditSideNoPasteWindowLayoutReady = true; } return _textEditSideNoPasteWindowLayoutContent; } }
+            private static int _textEditSideNoPasteWindowLayoutContent = default;
+            private static bool _textEditSideNoPasteWindowLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textEditSidePasteWindowLayout"/>
+            /// </summary>
+            public static int textEditSidePasteWindowLayout { get { if (!_textEditSidePasteWindowLayoutReady) { _textEditSidePasteWindowLayoutContent = SGetField<int>(LocalBridgeClazz, "textEditSidePasteWindowLayout"); _textEditSidePasteWindowLayoutReady = true; } return _textEditSidePasteWindowLayoutContent; } }
+            private static int _textEditSidePasteWindowLayoutContent = default;
+            private static bool _textEditSidePasteWindowLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textEditSuggestionItemLayout"/>
+            /// </summary>
+            public static int textEditSuggestionItemLayout { get { if (!_textEditSuggestionItemLayoutReady) { _textEditSuggestionItemLayoutContent = SGetField<int>(LocalBridgeClazz, "textEditSuggestionItemLayout"); _textEditSuggestionItemLayoutReady = true; } return _textEditSuggestionItemLayoutContent; } }
+            private static int _textEditSuggestionItemLayoutContent = default;
+            private static bool _textEditSuggestionItemLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textFilterEnabled"/>
+            /// </summary>
+            public static int textFilterEnabled { get { if (!_textFilterEnabledReady) { _textFilterEnabledContent = SGetField<int>(LocalBridgeClazz, "textFilterEnabled"); _textFilterEnabledReady = true; } return _textFilterEnabledContent; } }
+            private static int _textFilterEnabledContent = default;
+            private static bool _textFilterEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textFontWeight"/>
+            /// </summary>
+            public static int textFontWeight { get { if (!_textFontWeightReady) { _textFontWeightContent = SGetField<int>(LocalBridgeClazz, "textFontWeight"); _textFontWeightReady = true; } return _textFontWeightContent; } }
+            private static int _textFontWeightContent = default;
+            private static bool _textFontWeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textIsSelectable"/>
+            /// </summary>
+            public static int textIsSelectable { get { if (!_textIsSelectableReady) { _textIsSelectableContent = SGetField<int>(LocalBridgeClazz, "textIsSelectable"); _textIsSelectableReady = true; } return _textIsSelectableContent; } }
+            private static int _textIsSelectableContent = default;
+            private static bool _textIsSelectableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textLocale"/>
+            /// </summary>
+            public static int textLocale { get { if (!_textLocaleReady) { _textLocaleContent = SGetField<int>(LocalBridgeClazz, "textLocale"); _textLocaleReady = true; } return _textLocaleContent; } }
+            private static int _textLocaleContent = default;
+            private static bool _textLocaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textOff"/>
+            /// </summary>
+            public static int textOff { get { if (!_textOffReady) { _textOffContent = SGetField<int>(LocalBridgeClazz, "textOff"); _textOffReady = true; } return _textOffContent; } }
+            private static int _textOffContent = default;
+            private static bool _textOffReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textOn"/>
+            /// </summary>
+            public static int textOn { get { if (!_textOnReady) { _textOnContent = SGetField<int>(LocalBridgeClazz, "textOn"); _textOnReady = true; } return _textOnContent; } }
+            private static int _textOnContent = default;
+            private static bool _textOnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textScaleX"/>
+            /// </summary>
+            public static int textScaleX { get { if (!_textScaleXReady) { _textScaleXContent = SGetField<int>(LocalBridgeClazz, "textScaleX"); _textScaleXReady = true; } return _textScaleXContent; } }
+            private static int _textScaleXContent = default;
+            private static bool _textScaleXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textSelectHandle"/>
+            /// </summary>
+            public static int textSelectHandle { get { if (!_textSelectHandleReady) { _textSelectHandleContent = SGetField<int>(LocalBridgeClazz, "textSelectHandle"); _textSelectHandleReady = true; } return _textSelectHandleContent; } }
+            private static int _textSelectHandleContent = default;
+            private static bool _textSelectHandleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textSelectHandleLeft"/>
+            /// </summary>
+            public static int textSelectHandleLeft { get { if (!_textSelectHandleLeftReady) { _textSelectHandleLeftContent = SGetField<int>(LocalBridgeClazz, "textSelectHandleLeft"); _textSelectHandleLeftReady = true; } return _textSelectHandleLeftContent; } }
+            private static int _textSelectHandleLeftContent = default;
+            private static bool _textSelectHandleLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textSelectHandleRight"/>
+            /// </summary>
+            public static int textSelectHandleRight { get { if (!_textSelectHandleRightReady) { _textSelectHandleRightContent = SGetField<int>(LocalBridgeClazz, "textSelectHandleRight"); _textSelectHandleRightReady = true; } return _textSelectHandleRightContent; } }
+            private static int _textSelectHandleRightContent = default;
+            private static bool _textSelectHandleRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textSelectHandleWindowStyle"/>
+            /// </summary>
+            public static int textSelectHandleWindowStyle { get { if (!_textSelectHandleWindowStyleReady) { _textSelectHandleWindowStyleContent = SGetField<int>(LocalBridgeClazz, "textSelectHandleWindowStyle"); _textSelectHandleWindowStyleReady = true; } return _textSelectHandleWindowStyleContent; } }
+            private static int _textSelectHandleWindowStyleContent = default;
+            private static bool _textSelectHandleWindowStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textSize"/>
+            /// </summary>
+            public static int textSize { get { if (!_textSizeReady) { _textSizeContent = SGetField<int>(LocalBridgeClazz, "textSize"); _textSizeReady = true; } return _textSizeContent; } }
+            private static int _textSizeContent = default;
+            private static bool _textSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textStyle"/>
+            /// </summary>
+            public static int textStyle { get { if (!_textStyleReady) { _textStyleContent = SGetField<int>(LocalBridgeClazz, "textStyle"); _textStyleReady = true; } return _textStyleContent; } }
+            private static int _textStyleContent = default;
+            private static bool _textStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textSuggestionsWindowStyle"/>
+            /// </summary>
+            public static int textSuggestionsWindowStyle { get { if (!_textSuggestionsWindowStyleReady) { _textSuggestionsWindowStyleContent = SGetField<int>(LocalBridgeClazz, "textSuggestionsWindowStyle"); _textSuggestionsWindowStyleReady = true; } return _textSuggestionsWindowStyleContent; } }
+            private static int _textSuggestionsWindowStyleContent = default;
+            private static bool _textSuggestionsWindowStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#textViewStyle"/>
+            /// </summary>
+            public static int textViewStyle { get { if (!_textViewStyleReady) { _textViewStyleContent = SGetField<int>(LocalBridgeClazz, "textViewStyle"); _textViewStyleReady = true; } return _textViewStyleContent; } }
+            private static int _textViewStyleContent = default;
+            private static bool _textViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#theme"/>
+            /// </summary>
+            public static int theme { get { if (!_themeReady) { _themeContent = SGetField<int>(LocalBridgeClazz, "theme"); _themeReady = true; } return _themeContent; } }
+            private static int _themeContent = default;
+            private static bool _themeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thickness"/>
+            /// </summary>
+            public static int thickness { get { if (!_thicknessReady) { _thicknessContent = SGetField<int>(LocalBridgeClazz, "thickness"); _thicknessReady = true; } return _thicknessContent; } }
+            private static int _thicknessContent = default;
+            private static bool _thicknessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thicknessRatio"/>
+            /// </summary>
+            public static int thicknessRatio { get { if (!_thicknessRatioReady) { _thicknessRatioContent = SGetField<int>(LocalBridgeClazz, "thicknessRatio"); _thicknessRatioReady = true; } return _thicknessRatioContent; } }
+            private static int _thicknessRatioContent = default;
+            private static bool _thicknessRatioReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thumb"/>
+            /// </summary>
+            public static int thumb { get { if (!_thumbReady) { _thumbContent = SGetField<int>(LocalBridgeClazz, "thumb"); _thumbReady = true; } return _thumbContent; } }
+            private static int _thumbContent = default;
+            private static bool _thumbReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thumbnail"/>
+            /// </summary>
+            public static int thumbnail { get { if (!_thumbnailReady) { _thumbnailContent = SGetField<int>(LocalBridgeClazz, "thumbnail"); _thumbnailReady = true; } return _thumbnailContent; } }
+            private static int _thumbnailContent = default;
+            private static bool _thumbnailReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thumbOffset"/>
+            /// </summary>
+            public static int thumbOffset { get { if (!_thumbOffsetReady) { _thumbOffsetContent = SGetField<int>(LocalBridgeClazz, "thumbOffset"); _thumbOffsetReady = true; } return _thumbOffsetContent; } }
+            private static int _thumbOffsetContent = default;
+            private static bool _thumbOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thumbPosition"/>
+            /// </summary>
+            public static int thumbPosition { get { if (!_thumbPositionReady) { _thumbPositionContent = SGetField<int>(LocalBridgeClazz, "thumbPosition"); _thumbPositionReady = true; } return _thumbPositionContent; } }
+            private static int _thumbPositionContent = default;
+            private static bool _thumbPositionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thumbTextPadding"/>
+            /// </summary>
+            public static int thumbTextPadding { get { if (!_thumbTextPaddingReady) { _thumbTextPaddingContent = SGetField<int>(LocalBridgeClazz, "thumbTextPadding"); _thumbTextPaddingReady = true; } return _thumbTextPaddingContent; } }
+            private static int _thumbTextPaddingContent = default;
+            private static bool _thumbTextPaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thumbTint"/>
+            /// </summary>
+            public static int thumbTint { get { if (!_thumbTintReady) { _thumbTintContent = SGetField<int>(LocalBridgeClazz, "thumbTint"); _thumbTintReady = true; } return _thumbTintContent; } }
+            private static int _thumbTintContent = default;
+            private static bool _thumbTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#thumbTintMode"/>
+            /// </summary>
+            public static int thumbTintMode { get { if (!_thumbTintModeReady) { _thumbTintModeContent = SGetField<int>(LocalBridgeClazz, "thumbTintMode"); _thumbTintModeReady = true; } return _thumbTintModeContent; } }
+            private static int _thumbTintModeContent = default;
+            private static bool _thumbTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tickMark"/>
+            /// </summary>
+            public static int tickMark { get { if (!_tickMarkReady) { _tickMarkContent = SGetField<int>(LocalBridgeClazz, "tickMark"); _tickMarkReady = true; } return _tickMarkContent; } }
+            private static int _tickMarkContent = default;
+            private static bool _tickMarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tickMarkTint"/>
+            /// </summary>
+            public static int tickMarkTint { get { if (!_tickMarkTintReady) { _tickMarkTintContent = SGetField<int>(LocalBridgeClazz, "tickMarkTint"); _tickMarkTintReady = true; } return _tickMarkTintContent; } }
+            private static int _tickMarkTintContent = default;
+            private static bool _tickMarkTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tickMarkTintMode"/>
+            /// </summary>
+            public static int tickMarkTintMode { get { if (!_tickMarkTintModeReady) { _tickMarkTintModeContent = SGetField<int>(LocalBridgeClazz, "tickMarkTintMode"); _tickMarkTintModeReady = true; } return _tickMarkTintModeContent; } }
+            private static int _tickMarkTintModeContent = default;
+            private static bool _tickMarkTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tileMode"/>
+            /// </summary>
+            public static int tileMode { get { if (!_tileModeReady) { _tileModeContent = SGetField<int>(LocalBridgeClazz, "tileMode"); _tileModeReady = true; } return _tileModeContent; } }
+            private static int _tileModeContent = default;
+            private static bool _tileModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tileModeX"/>
+            /// </summary>
+            public static int tileModeX { get { if (!_tileModeXReady) { _tileModeXContent = SGetField<int>(LocalBridgeClazz, "tileModeX"); _tileModeXReady = true; } return _tileModeXContent; } }
+            private static int _tileModeXContent = default;
+            private static bool _tileModeXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tileModeY"/>
+            /// </summary>
+            public static int tileModeY { get { if (!_tileModeYReady) { _tileModeYContent = SGetField<int>(LocalBridgeClazz, "tileModeY"); _tileModeYReady = true; } return _tileModeYContent; } }
+            private static int _tileModeYContent = default;
+            private static bool _tileModeYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tileService"/>
+            /// </summary>
+            public static int tileService { get { if (!_tileServiceReady) { _tileServiceContent = SGetField<int>(LocalBridgeClazz, "tileService"); _tileServiceReady = true; } return _tileServiceContent; } }
+            private static int _tileServiceContent = default;
+            private static bool _tileServiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#timePickerDialogTheme"/>
+            /// </summary>
+            public static int timePickerDialogTheme { get { if (!_timePickerDialogThemeReady) { _timePickerDialogThemeContent = SGetField<int>(LocalBridgeClazz, "timePickerDialogTheme"); _timePickerDialogThemeReady = true; } return _timePickerDialogThemeContent; } }
+            private static int _timePickerDialogThemeContent = default;
+            private static bool _timePickerDialogThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#timePickerMode"/>
+            /// </summary>
+            public static int timePickerMode { get { if (!_timePickerModeReady) { _timePickerModeContent = SGetField<int>(LocalBridgeClazz, "timePickerMode"); _timePickerModeReady = true; } return _timePickerModeContent; } }
+            private static int _timePickerModeContent = default;
+            private static bool _timePickerModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#timePickerStyle"/>
+            /// </summary>
+            public static int timePickerStyle { get { if (!_timePickerStyleReady) { _timePickerStyleContent = SGetField<int>(LocalBridgeClazz, "timePickerStyle"); _timePickerStyleReady = true; } return _timePickerStyleContent; } }
+            private static int _timePickerStyleContent = default;
+            private static bool _timePickerStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#timeZone"/>
+            /// </summary>
+            public static int timeZone { get { if (!_timeZoneReady) { _timeZoneContent = SGetField<int>(LocalBridgeClazz, "timeZone"); _timeZoneReady = true; } return _timeZoneContent; } }
+            private static int _timeZoneContent = default;
+            private static bool _timeZoneReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tint"/>
+            /// </summary>
+            public static int tint { get { if (!_tintReady) { _tintContent = SGetField<int>(LocalBridgeClazz, "tint"); _tintReady = true; } return _tintContent; } }
+            private static int _tintContent = default;
+            private static bool _tintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tintMode"/>
+            /// </summary>
+            public static int tintMode { get { if (!_tintModeReady) { _tintModeContent = SGetField<int>(LocalBridgeClazz, "tintMode"); _tintModeReady = true; } return _tintModeContent; } }
+            private static int _tintModeContent = default;
+            private static bool _tintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#title"/>
+            /// </summary>
+            public static int title { get { if (!_titleReady) { _titleContent = SGetField<int>(LocalBridgeClazz, "title"); _titleReady = true; } return _titleContent; } }
+            private static int _titleContent = default;
+            private static bool _titleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleCondensed"/>
+            /// </summary>
+            public static int titleCondensed { get { if (!_titleCondensedReady) { _titleCondensedContent = SGetField<int>(LocalBridgeClazz, "titleCondensed"); _titleCondensedReady = true; } return _titleCondensedContent; } }
+            private static int _titleCondensedContent = default;
+            private static bool _titleCondensedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleMargin"/>
+            /// </summary>
+            public static int titleMargin { get { if (!_titleMarginReady) { _titleMarginContent = SGetField<int>(LocalBridgeClazz, "titleMargin"); _titleMarginReady = true; } return _titleMarginContent; } }
+            private static int _titleMarginContent = default;
+            private static bool _titleMarginReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleMarginBottom"/>
+            /// </summary>
+            public static int titleMarginBottom { get { if (!_titleMarginBottomReady) { _titleMarginBottomContent = SGetField<int>(LocalBridgeClazz, "titleMarginBottom"); _titleMarginBottomReady = true; } return _titleMarginBottomContent; } }
+            private static int _titleMarginBottomContent = default;
+            private static bool _titleMarginBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleMarginEnd"/>
+            /// </summary>
+            public static int titleMarginEnd { get { if (!_titleMarginEndReady) { _titleMarginEndContent = SGetField<int>(LocalBridgeClazz, "titleMarginEnd"); _titleMarginEndReady = true; } return _titleMarginEndContent; } }
+            private static int _titleMarginEndContent = default;
+            private static bool _titleMarginEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleMarginStart"/>
+            /// </summary>
+            public static int titleMarginStart { get { if (!_titleMarginStartReady) { _titleMarginStartContent = SGetField<int>(LocalBridgeClazz, "titleMarginStart"); _titleMarginStartReady = true; } return _titleMarginStartContent; } }
+            private static int _titleMarginStartContent = default;
+            private static bool _titleMarginStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleMarginTop"/>
+            /// </summary>
+            public static int titleMarginTop { get { if (!_titleMarginTopReady) { _titleMarginTopContent = SGetField<int>(LocalBridgeClazz, "titleMarginTop"); _titleMarginTopReady = true; } return _titleMarginTopContent; } }
+            private static int _titleMarginTopContent = default;
+            private static bool _titleMarginTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleTextAppearance"/>
+            /// </summary>
+            public static int titleTextAppearance { get { if (!_titleTextAppearanceReady) { _titleTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "titleTextAppearance"); _titleTextAppearanceReady = true; } return _titleTextAppearanceContent; } }
+            private static int _titleTextAppearanceContent = default;
+            private static bool _titleTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleTextColor"/>
+            /// </summary>
+            public static int titleTextColor { get { if (!_titleTextColorReady) { _titleTextColorContent = SGetField<int>(LocalBridgeClazz, "titleTextColor"); _titleTextColorReady = true; } return _titleTextColorContent; } }
+            private static int _titleTextColorContent = default;
+            private static bool _titleTextColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#titleTextStyle"/>
+            /// </summary>
+            public static int titleTextStyle { get { if (!_titleTextStyleReady) { _titleTextStyleContent = SGetField<int>(LocalBridgeClazz, "titleTextStyle"); _titleTextStyleReady = true; } return _titleTextStyleContent; } }
+            private static int _titleTextStyleContent = default;
+            private static bool _titleTextStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toAlpha"/>
+            /// </summary>
+            public static int toAlpha { get { if (!_toAlphaReady) { _toAlphaContent = SGetField<int>(LocalBridgeClazz, "toAlpha"); _toAlphaReady = true; } return _toAlphaContent; } }
+            private static int _toAlphaContent = default;
+            private static bool _toAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toDegrees"/>
+            /// </summary>
+            public static int toDegrees { get { if (!_toDegreesReady) { _toDegreesContent = SGetField<int>(LocalBridgeClazz, "toDegrees"); _toDegreesReady = true; } return _toDegreesContent; } }
+            private static int _toDegreesContent = default;
+            private static bool _toDegreesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toExtendBottom"/>
+            /// </summary>
+            public static int toExtendBottom { get { if (!_toExtendBottomReady) { _toExtendBottomContent = SGetField<int>(LocalBridgeClazz, "toExtendBottom"); _toExtendBottomReady = true; } return _toExtendBottomContent; } }
+            private static int _toExtendBottomContent = default;
+            private static bool _toExtendBottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toExtendLeft"/>
+            /// </summary>
+            public static int toExtendLeft { get { if (!_toExtendLeftReady) { _toExtendLeftContent = SGetField<int>(LocalBridgeClazz, "toExtendLeft"); _toExtendLeftReady = true; } return _toExtendLeftContent; } }
+            private static int _toExtendLeftContent = default;
+            private static bool _toExtendLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toExtendRight"/>
+            /// </summary>
+            public static int toExtendRight { get { if (!_toExtendRightReady) { _toExtendRightContent = SGetField<int>(LocalBridgeClazz, "toExtendRight"); _toExtendRightReady = true; } return _toExtendRightContent; } }
+            private static int _toExtendRightContent = default;
+            private static bool _toExtendRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toExtendTop"/>
+            /// </summary>
+            public static int toExtendTop { get { if (!_toExtendTopReady) { _toExtendTopContent = SGetField<int>(LocalBridgeClazz, "toExtendTop"); _toExtendTopReady = true; } return _toExtendTopContent; } }
+            private static int _toExtendTopContent = default;
+            private static bool _toExtendTopReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toId"/>
+            /// </summary>
+            public static int toId { get { if (!_toIdReady) { _toIdContent = SGetField<int>(LocalBridgeClazz, "toId"); _toIdReady = true; } return _toIdContent; } }
+            private static int _toIdContent = default;
+            private static bool _toIdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toolbarStyle"/>
+            /// </summary>
+            public static int toolbarStyle { get { if (!_toolbarStyleReady) { _toolbarStyleContent = SGetField<int>(LocalBridgeClazz, "toolbarStyle"); _toolbarStyleReady = true; } return _toolbarStyleContent; } }
+            private static int _toolbarStyleContent = default;
+            private static bool _toolbarStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tooltipText"/>
+            /// </summary>
+            public static int tooltipText { get { if (!_tooltipTextReady) { _tooltipTextContent = SGetField<int>(LocalBridgeClazz, "tooltipText"); _tooltipTextReady = true; } return _tooltipTextContent; } }
+            private static int _tooltipTextContent = default;
+            private static bool _tooltipTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#top"/>
+            /// </summary>
+            public static int top { get { if (!_topReady) { _topContent = SGetField<int>(LocalBridgeClazz, "top"); _topReady = true; } return _topContent; } }
+            private static int _topContent = default;
+            private static bool _topReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#topBright"/>
+            /// </summary>
+            public static int topBright { get { if (!_topBrightReady) { _topBrightContent = SGetField<int>(LocalBridgeClazz, "topBright"); _topBrightReady = true; } return _topBrightContent; } }
+            private static int _topBrightContent = default;
+            private static bool _topBrightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#topDark"/>
+            /// </summary>
+            public static int topDark { get { if (!_topDarkReady) { _topDarkContent = SGetField<int>(LocalBridgeClazz, "topDark"); _topDarkReady = true; } return _topDarkContent; } }
+            private static int _topDarkContent = default;
+            private static bool _topDarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#topLeftRadius"/>
+            /// </summary>
+            public static int topLeftRadius { get { if (!_topLeftRadiusReady) { _topLeftRadiusContent = SGetField<int>(LocalBridgeClazz, "topLeftRadius"); _topLeftRadiusReady = true; } return _topLeftRadiusContent; } }
+            private static int _topLeftRadiusContent = default;
+            private static bool _topLeftRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#topOffset"/>
+            /// </summary>
+            public static int topOffset { get { if (!_topOffsetReady) { _topOffsetContent = SGetField<int>(LocalBridgeClazz, "topOffset"); _topOffsetReady = true; } return _topOffsetContent; } }
+            private static int _topOffsetContent = default;
+            private static bool _topOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#topRightRadius"/>
+            /// </summary>
+            public static int topRightRadius { get { if (!_topRightRadiusReady) { _topRightRadiusContent = SGetField<int>(LocalBridgeClazz, "topRightRadius"); _topRightRadiusReady = true; } return _topRightRadiusContent; } }
+            private static int _topRightRadiusContent = default;
+            private static bool _topRightRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toScene"/>
+            /// </summary>
+            public static int toScene { get { if (!_toSceneReady) { _toSceneContent = SGetField<int>(LocalBridgeClazz, "toScene"); _toSceneReady = true; } return _toSceneContent; } }
+            private static int _toSceneContent = default;
+            private static bool _toSceneReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#touchscreenBlocksFocus"/>
+            /// </summary>
+            public static int touchscreenBlocksFocus { get { if (!_touchscreenBlocksFocusReady) { _touchscreenBlocksFocusContent = SGetField<int>(LocalBridgeClazz, "touchscreenBlocksFocus"); _touchscreenBlocksFocusReady = true; } return _touchscreenBlocksFocusContent; } }
+            private static int _touchscreenBlocksFocusContent = default;
+            private static bool _touchscreenBlocksFocusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toXDelta"/>
+            /// </summary>
+            public static int toXDelta { get { if (!_toXDeltaReady) { _toXDeltaContent = SGetField<int>(LocalBridgeClazz, "toXDelta"); _toXDeltaReady = true; } return _toXDeltaContent; } }
+            private static int _toXDeltaContent = default;
+            private static bool _toXDeltaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toXScale"/>
+            /// </summary>
+            public static int toXScale { get { if (!_toXScaleReady) { _toXScaleContent = SGetField<int>(LocalBridgeClazz, "toXScale"); _toXScaleReady = true; } return _toXScaleContent; } }
+            private static int _toXScaleContent = default;
+            private static bool _toXScaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toYDelta"/>
+            /// </summary>
+            public static int toYDelta { get { if (!_toYDeltaReady) { _toYDeltaContent = SGetField<int>(LocalBridgeClazz, "toYDelta"); _toYDeltaReady = true; } return _toYDeltaContent; } }
+            private static int _toYDeltaContent = default;
+            private static bool _toYDeltaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#toYScale"/>
+            /// </summary>
+            public static int toYScale { get { if (!_toYScaleReady) { _toYScaleContent = SGetField<int>(LocalBridgeClazz, "toYScale"); _toYScaleReady = true; } return _toYScaleContent; } }
+            private static int _toYScaleContent = default;
+            private static bool _toYScaleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#track"/>
+            /// </summary>
+            public static int track { get { if (!_trackReady) { _trackContent = SGetField<int>(LocalBridgeClazz, "track"); _trackReady = true; } return _trackContent; } }
+            private static int _trackContent = default;
+            private static bool _trackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#trackTint"/>
+            /// </summary>
+            public static int trackTint { get { if (!_trackTintReady) { _trackTintContent = SGetField<int>(LocalBridgeClazz, "trackTint"); _trackTintReady = true; } return _trackTintContent; } }
+            private static int _trackTintContent = default;
+            private static bool _trackTintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#trackTintMode"/>
+            /// </summary>
+            public static int trackTintMode { get { if (!_trackTintModeReady) { _trackTintModeContent = SGetField<int>(LocalBridgeClazz, "trackTintMode"); _trackTintModeReady = true; } return _trackTintModeContent; } }
+            private static int _trackTintModeContent = default;
+            private static bool _trackTintModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#transcriptMode"/>
+            /// </summary>
+            public static int transcriptMode { get { if (!_transcriptModeReady) { _transcriptModeContent = SGetField<int>(LocalBridgeClazz, "transcriptMode"); _transcriptModeReady = true; } return _transcriptModeContent; } }
+            private static int _transcriptModeContent = default;
+            private static bool _transcriptModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#transformPivotX"/>
+            /// </summary>
+            public static int transformPivotX { get { if (!_transformPivotXReady) { _transformPivotXContent = SGetField<int>(LocalBridgeClazz, "transformPivotX"); _transformPivotXReady = true; } return _transformPivotXContent; } }
+            private static int _transformPivotXContent = default;
+            private static bool _transformPivotXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#transformPivotY"/>
+            /// </summary>
+            public static int transformPivotY { get { if (!_transformPivotYReady) { _transformPivotYContent = SGetField<int>(LocalBridgeClazz, "transformPivotY"); _transformPivotYReady = true; } return _transformPivotYContent; } }
+            private static int _transformPivotYContent = default;
+            private static bool _transformPivotYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#transition"/>
+            /// </summary>
+            public static int transitionField { get { if (!_transitionFieldReady) { _transitionFieldContent = SGetField<int>(LocalBridgeClazz, "transition"); _transitionFieldReady = true; } return _transitionFieldContent; } }
+            private static int _transitionFieldContent = default;
+            private static bool _transitionFieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#transitionGroup"/>
+            /// </summary>
+            public static int transitionGroup { get { if (!_transitionGroupReady) { _transitionGroupContent = SGetField<int>(LocalBridgeClazz, "transitionGroup"); _transitionGroupReady = true; } return _transitionGroupContent; } }
+            private static int _transitionGroupContent = default;
+            private static bool _transitionGroupReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#transitionName"/>
+            /// </summary>
+            public static int transitionName { get { if (!_transitionNameReady) { _transitionNameContent = SGetField<int>(LocalBridgeClazz, "transitionName"); _transitionNameReady = true; } return _transitionNameContent; } }
+            private static int _transitionNameContent = default;
+            private static bool _transitionNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#transitionOrdering"/>
+            /// </summary>
+            public static int transitionOrdering { get { if (!_transitionOrderingReady) { _transitionOrderingContent = SGetField<int>(LocalBridgeClazz, "transitionOrdering"); _transitionOrderingReady = true; } return _transitionOrderingContent; } }
+            private static int _transitionOrderingContent = default;
+            private static bool _transitionOrderingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#transitionVisibilityMode"/>
+            /// </summary>
+            public static int transitionVisibilityMode { get { if (!_transitionVisibilityModeReady) { _transitionVisibilityModeContent = SGetField<int>(LocalBridgeClazz, "transitionVisibilityMode"); _transitionVisibilityModeReady = true; } return _transitionVisibilityModeContent; } }
+            private static int _transitionVisibilityModeContent = default;
+            private static bool _transitionVisibilityModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#translateX"/>
+            /// </summary>
+            public static int translateX { get { if (!_translateXReady) { _translateXContent = SGetField<int>(LocalBridgeClazz, "translateX"); _translateXReady = true; } return _translateXContent; } }
+            private static int _translateXContent = default;
+            private static bool _translateXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#translateY"/>
+            /// </summary>
+            public static int translateY { get { if (!_translateYReady) { _translateYContent = SGetField<int>(LocalBridgeClazz, "translateY"); _translateYReady = true; } return _translateYContent; } }
+            private static int _translateYContent = default;
+            private static bool _translateYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#translationX"/>
+            /// </summary>
+            public static int translationX { get { if (!_translationXReady) { _translationXContent = SGetField<int>(LocalBridgeClazz, "translationX"); _translationXReady = true; } return _translationXContent; } }
+            private static int _translationXContent = default;
+            private static bool _translationXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#translationY"/>
+            /// </summary>
+            public static int translationY { get { if (!_translationYReady) { _translationYContent = SGetField<int>(LocalBridgeClazz, "translationY"); _translationYReady = true; } return _translationYContent; } }
+            private static int _translationYContent = default;
+            private static bool _translationYReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#translationZ"/>
+            /// </summary>
+            public static int translationZ { get { if (!_translationZReady) { _translationZContent = SGetField<int>(LocalBridgeClazz, "translationZ"); _translationZReady = true; } return _translationZContent; } }
+            private static int _translationZContent = default;
+            private static bool _translationZReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#trimPathEnd"/>
+            /// </summary>
+            public static int trimPathEnd { get { if (!_trimPathEndReady) { _trimPathEndContent = SGetField<int>(LocalBridgeClazz, "trimPathEnd"); _trimPathEndReady = true; } return _trimPathEndContent; } }
+            private static int _trimPathEndContent = default;
+            private static bool _trimPathEndReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#trimPathOffset"/>
+            /// </summary>
+            public static int trimPathOffset { get { if (!_trimPathOffsetReady) { _trimPathOffsetContent = SGetField<int>(LocalBridgeClazz, "trimPathOffset"); _trimPathOffsetReady = true; } return _trimPathOffsetContent; } }
+            private static int _trimPathOffsetContent = default;
+            private static bool _trimPathOffsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#trimPathStart"/>
+            /// </summary>
+            public static int trimPathStart { get { if (!_trimPathStartReady) { _trimPathStartContent = SGetField<int>(LocalBridgeClazz, "trimPathStart"); _trimPathStartReady = true; } return _trimPathStartContent; } }
+            private static int _trimPathStartContent = default;
+            private static bool _trimPathStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#ttcIndex"/>
+            /// </summary>
+            public static int ttcIndex { get { if (!_ttcIndexReady) { _ttcIndexContent = SGetField<int>(LocalBridgeClazz, "ttcIndex"); _ttcIndexReady = true; } return _ttcIndexContent; } }
+            private static int _ttcIndexContent = default;
+            private static bool _ttcIndexReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#tunerCount"/>
+            /// </summary>
+            public static int tunerCount { get { if (!_tunerCountReady) { _tunerCountContent = SGetField<int>(LocalBridgeClazz, "tunerCount"); _tunerCountReady = true; } return _tunerCountContent; } }
+            private static int _tunerCountContent = default;
+            private static bool _tunerCountReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#turnScreenOn"/>
+            /// </summary>
+            public static int turnScreenOn { get { if (!_turnScreenOnReady) { _turnScreenOnContent = SGetField<int>(LocalBridgeClazz, "turnScreenOn"); _turnScreenOnReady = true; } return _turnScreenOnContent; } }
+            private static int _turnScreenOnContent = default;
+            private static bool _turnScreenOnReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#type"/>
+            /// </summary>
+            public static int type { get { if (!_typeReady) { _typeContent = SGetField<int>(LocalBridgeClazz, "type"); _typeReady = true; } return _typeContent; } }
+            private static int _typeContent = default;
+            private static bool _typeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#typeface"/>
+            /// </summary>
+            public static int typeface { get { if (!_typefaceReady) { _typefaceContent = SGetField<int>(LocalBridgeClazz, "typeface"); _typefaceReady = true; } return _typefaceContent; } }
+            private static int _typefaceContent = default;
+            private static bool _typefaceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#uiOptions"/>
+            /// </summary>
+            public static int uiOptions { get { if (!_uiOptionsReady) { _uiOptionsContent = SGetField<int>(LocalBridgeClazz, "uiOptions"); _uiOptionsReady = true; } return _uiOptionsContent; } }
+            private static int _uiOptionsContent = default;
+            private static bool _uiOptionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#uncertainGestureColor"/>
+            /// </summary>
+            public static int uncertainGestureColor { get { if (!_uncertainGestureColorReady) { _uncertainGestureColorContent = SGetField<int>(LocalBridgeClazz, "uncertainGestureColor"); _uncertainGestureColorReady = true; } return _uncertainGestureColorContent; } }
+            private static int _uncertainGestureColorContent = default;
+            private static bool _uncertainGestureColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#unfocusedMonthDateColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int unfocusedMonthDateColor { get { if (!_unfocusedMonthDateColorReady) { _unfocusedMonthDateColorContent = SGetField<int>(LocalBridgeClazz, "unfocusedMonthDateColor"); _unfocusedMonthDateColorReady = true; } return _unfocusedMonthDateColorContent; } }
+            private static int _unfocusedMonthDateColorContent = default;
+            private static bool _unfocusedMonthDateColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#unselectedAlpha"/>
+            /// </summary>
+            public static int unselectedAlpha { get { if (!_unselectedAlphaReady) { _unselectedAlphaContent = SGetField<int>(LocalBridgeClazz, "unselectedAlpha"); _unselectedAlphaReady = true; } return _unselectedAlphaContent; } }
+            private static int _unselectedAlphaContent = default;
+            private static bool _unselectedAlphaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#updatePeriodMillis"/>
+            /// </summary>
+            public static int updatePeriodMillis { get { if (!_updatePeriodMillisReady) { _updatePeriodMillisContent = SGetField<int>(LocalBridgeClazz, "updatePeriodMillis"); _updatePeriodMillisReady = true; } return _updatePeriodMillisContent; } }
+            private static int _updatePeriodMillisContent = default;
+            private static bool _updatePeriodMillisReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#use32bitAbi"/>
+            /// </summary>
+            public static int use32bitAbi { get { if (!_use32bitAbiReady) { _use32bitAbiContent = SGetField<int>(LocalBridgeClazz, "use32bitAbi"); _use32bitAbiReady = true; } return _use32bitAbiContent; } }
+            private static int _use32bitAbiContent = default;
+            private static bool _use32bitAbiReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#useAppZygote"/>
+            /// </summary>
+            public static int useAppZygote { get { if (!_useAppZygoteReady) { _useAppZygoteContent = SGetField<int>(LocalBridgeClazz, "useAppZygote"); _useAppZygoteReady = true; } return _useAppZygoteContent; } }
+            private static int _useAppZygoteContent = default;
+            private static bool _useAppZygoteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#useDefaultMargins"/>
+            /// </summary>
+            public static int useDefaultMargins { get { if (!_useDefaultMarginsReady) { _useDefaultMarginsContent = SGetField<int>(LocalBridgeClazz, "useDefaultMargins"); _useDefaultMarginsReady = true; } return _useDefaultMarginsContent; } }
+            private static int _useDefaultMarginsContent = default;
+            private static bool _useDefaultMarginsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#useEmbeddedDex"/>
+            /// </summary>
+            public static int useEmbeddedDex { get { if (!_useEmbeddedDexReady) { _useEmbeddedDexContent = SGetField<int>(LocalBridgeClazz, "useEmbeddedDex"); _useEmbeddedDexReady = true; } return _useEmbeddedDexContent; } }
+            private static int _useEmbeddedDexContent = default;
+            private static bool _useEmbeddedDexReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#useIntrinsicSizeAsMinimum"/>
+            /// </summary>
+            public static int useIntrinsicSizeAsMinimum { get { if (!_useIntrinsicSizeAsMinimumReady) { _useIntrinsicSizeAsMinimumContent = SGetField<int>(LocalBridgeClazz, "useIntrinsicSizeAsMinimum"); _useIntrinsicSizeAsMinimumReady = true; } return _useIntrinsicSizeAsMinimumContent; } }
+            private static int _useIntrinsicSizeAsMinimumContent = default;
+            private static bool _useIntrinsicSizeAsMinimumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#useLevel"/>
+            /// </summary>
+            public static int useLevel { get { if (!_useLevelReady) { _useLevelContent = SGetField<int>(LocalBridgeClazz, "useLevel"); _useLevelReady = true; } return _useLevelContent; } }
+            private static int _useLevelContent = default;
+            private static bool _useLevelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#userVisible"/>
+            /// </summary>
+            public static int userVisible { get { if (!_userVisibleReady) { _userVisibleContent = SGetField<int>(LocalBridgeClazz, "userVisible"); _userVisibleReady = true; } return _userVisibleContent; } }
+            private static int _userVisibleContent = default;
+            private static bool _userVisibleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#usesCleartextTraffic"/>
+            /// </summary>
+            public static int usesCleartextTraffic { get { if (!_usesCleartextTrafficReady) { _usesCleartextTrafficContent = SGetField<int>(LocalBridgeClazz, "usesCleartextTraffic"); _usesCleartextTrafficReady = true; } return _usesCleartextTrafficContent; } }
+            private static int _usesCleartextTrafficContent = default;
+            private static bool _usesCleartextTrafficReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#usesPermissionFlags"/>
+            /// </summary>
+            public static int usesPermissionFlags { get { if (!_usesPermissionFlagsReady) { _usesPermissionFlagsContent = SGetField<int>(LocalBridgeClazz, "usesPermissionFlags"); _usesPermissionFlagsReady = true; } return _usesPermissionFlagsContent; } }
+            private static int _usesPermissionFlagsContent = default;
+            private static bool _usesPermissionFlagsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#value"/>
+            /// </summary>
+            public static int value { get { if (!_valueReady) { _valueContent = SGetField<int>(LocalBridgeClazz, "value"); _valueReady = true; } return _valueContent; } }
+            private static int _valueContent = default;
+            private static bool _valueReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#valueFrom"/>
+            /// </summary>
+            public static int valueFrom { get { if (!_valueFromReady) { _valueFromContent = SGetField<int>(LocalBridgeClazz, "valueFrom"); _valueFromReady = true; } return _valueFromContent; } }
+            private static int _valueFromContent = default;
+            private static bool _valueFromReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#valueTo"/>
+            /// </summary>
+            public static int valueTo { get { if (!_valueToReady) { _valueToContent = SGetField<int>(LocalBridgeClazz, "valueTo"); _valueToReady = true; } return _valueToContent; } }
+            private static int _valueToContent = default;
+            private static bool _valueToReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#valueType"/>
+            /// </summary>
+            public static int valueType { get { if (!_valueTypeReady) { _valueTypeContent = SGetField<int>(LocalBridgeClazz, "valueType"); _valueTypeReady = true; } return _valueTypeContent; } }
+            private static int _valueTypeContent = default;
+            private static bool _valueTypeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#variablePadding"/>
+            /// </summary>
+            public static int variablePadding { get { if (!_variablePaddingReady) { _variablePaddingContent = SGetField<int>(LocalBridgeClazz, "variablePadding"); _variablePaddingReady = true; } return _variablePaddingContent; } }
+            private static int _variablePaddingContent = default;
+            private static bool _variablePaddingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#vendor"/>
+            /// </summary>
+            public static int vendor { get { if (!_vendorReady) { _vendorContent = SGetField<int>(LocalBridgeClazz, "vendor"); _vendorReady = true; } return _vendorContent; } }
+            private static int _vendorContent = default;
+            private static bool _vendorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#version"/>
+            /// </summary>
+            public static int version { get { if (!_versionReady) { _versionContent = SGetField<int>(LocalBridgeClazz, "version"); _versionReady = true; } return _versionContent; } }
+            private static int _versionContent = default;
+            private static bool _versionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#versionCode"/>
+            /// </summary>
+            public static int versionCode { get { if (!_versionCodeReady) { _versionCodeContent = SGetField<int>(LocalBridgeClazz, "versionCode"); _versionCodeReady = true; } return _versionCodeContent; } }
+            private static int _versionCodeContent = default;
+            private static bool _versionCodeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#versionCodeMajor"/>
+            /// </summary>
+            public static int versionCodeMajor { get { if (!_versionCodeMajorReady) { _versionCodeMajorContent = SGetField<int>(LocalBridgeClazz, "versionCodeMajor"); _versionCodeMajorReady = true; } return _versionCodeMajorContent; } }
+            private static int _versionCodeMajorContent = default;
+            private static bool _versionCodeMajorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#versionMajor"/>
+            /// </summary>
+            public static int versionMajor { get { if (!_versionMajorReady) { _versionMajorContent = SGetField<int>(LocalBridgeClazz, "versionMajor"); _versionMajorReady = true; } return _versionMajorContent; } }
+            private static int _versionMajorContent = default;
+            private static bool _versionMajorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#versionName"/>
+            /// </summary>
+            public static int versionName { get { if (!_versionNameReady) { _versionNameContent = SGetField<int>(LocalBridgeClazz, "versionName"); _versionNameReady = true; } return _versionNameContent; } }
+            private static int _versionNameContent = default;
+            private static bool _versionNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#verticalCorrection"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int verticalCorrection { get { if (!_verticalCorrectionReady) { _verticalCorrectionContent = SGetField<int>(LocalBridgeClazz, "verticalCorrection"); _verticalCorrectionReady = true; } return _verticalCorrectionContent; } }
+            private static int _verticalCorrectionContent = default;
+            private static bool _verticalCorrectionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#verticalDivider"/>
+            /// </summary>
+            public static int verticalDivider { get { if (!_verticalDividerReady) { _verticalDividerContent = SGetField<int>(LocalBridgeClazz, "verticalDivider"); _verticalDividerReady = true; } return _verticalDividerContent; } }
+            private static int _verticalDividerContent = default;
+            private static bool _verticalDividerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#verticalGap"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int verticalGap { get { if (!_verticalGapReady) { _verticalGapContent = SGetField<int>(LocalBridgeClazz, "verticalGap"); _verticalGapReady = true; } return _verticalGapContent; } }
+            private static int _verticalGapContent = default;
+            private static bool _verticalGapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#verticalScrollbarPosition"/>
+            /// </summary>
+            public static int verticalScrollbarPosition { get { if (!_verticalScrollbarPositionReady) { _verticalScrollbarPositionContent = SGetField<int>(LocalBridgeClazz, "verticalScrollbarPosition"); _verticalScrollbarPositionReady = true; } return _verticalScrollbarPositionContent; } }
+            private static int _verticalScrollbarPositionContent = default;
+            private static bool _verticalScrollbarPositionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#verticalSpacing"/>
+            /// </summary>
+            public static int verticalSpacing { get { if (!_verticalSpacingReady) { _verticalSpacingContent = SGetField<int>(LocalBridgeClazz, "verticalSpacing"); _verticalSpacingReady = true; } return _verticalSpacingContent; } }
+            private static int _verticalSpacingContent = default;
+            private static bool _verticalSpacingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#viewportHeight"/>
+            /// </summary>
+            public static int viewportHeight { get { if (!_viewportHeightReady) { _viewportHeightContent = SGetField<int>(LocalBridgeClazz, "viewportHeight"); _viewportHeightReady = true; } return _viewportHeightContent; } }
+            private static int _viewportHeightContent = default;
+            private static bool _viewportHeightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#viewportWidth"/>
+            /// </summary>
+            public static int viewportWidth { get { if (!_viewportWidthReady) { _viewportWidthContent = SGetField<int>(LocalBridgeClazz, "viewportWidth"); _viewportWidthReady = true; } return _viewportWidthContent; } }
+            private static int _viewportWidthContent = default;
+            private static bool _viewportWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#visibility"/>
+            /// </summary>
+            public static int visibility { get { if (!_visibilityReady) { _visibilityContent = SGetField<int>(LocalBridgeClazz, "visibility"); _visibilityReady = true; } return _visibilityContent; } }
+            private static int _visibilityContent = default;
+            private static bool _visibilityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#visible"/>
+            /// </summary>
+            public static int visible { get { if (!_visibleReady) { _visibleContent = SGetField<int>(LocalBridgeClazz, "visible"); _visibleReady = true; } return _visibleContent; } }
+            private static int _visibleContent = default;
+            private static bool _visibleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#visibleToInstantApps"/>
+            /// </summary>
+            public static int visibleToInstantApps { get { if (!_visibleToInstantAppsReady) { _visibleToInstantAppsContent = SGetField<int>(LocalBridgeClazz, "visibleToInstantApps"); _visibleToInstantAppsReady = true; } return _visibleToInstantAppsContent; } }
+            private static int _visibleToInstantAppsContent = default;
+            private static bool _visibleToInstantAppsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#vmSafeMode"/>
+            /// </summary>
+            public static int vmSafeMode { get { if (!_vmSafeModeReady) { _vmSafeModeContent = SGetField<int>(LocalBridgeClazz, "vmSafeMode"); _vmSafeModeReady = true; } return _vmSafeModeContent; } }
+            private static int _vmSafeModeContent = default;
+            private static bool _vmSafeModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#voiceIcon"/>
+            /// </summary>
+            public static int voiceIcon { get { if (!_voiceIconReady) { _voiceIconContent = SGetField<int>(LocalBridgeClazz, "voiceIcon"); _voiceIconReady = true; } return _voiceIconContent; } }
+            private static int _voiceIconContent = default;
+            private static bool _voiceIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#voiceLanguage"/>
+            /// </summary>
+            public static int voiceLanguage { get { if (!_voiceLanguageReady) { _voiceLanguageContent = SGetField<int>(LocalBridgeClazz, "voiceLanguage"); _voiceLanguageReady = true; } return _voiceLanguageContent; } }
+            private static int _voiceLanguageContent = default;
+            private static bool _voiceLanguageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#voiceLanguageModel"/>
+            /// </summary>
+            public static int voiceLanguageModel { get { if (!_voiceLanguageModelReady) { _voiceLanguageModelContent = SGetField<int>(LocalBridgeClazz, "voiceLanguageModel"); _voiceLanguageModelReady = true; } return _voiceLanguageModelContent; } }
+            private static int _voiceLanguageModelContent = default;
+            private static bool _voiceLanguageModelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#voiceMaxResults"/>
+            /// </summary>
+            public static int voiceMaxResults { get { if (!_voiceMaxResultsReady) { _voiceMaxResultsContent = SGetField<int>(LocalBridgeClazz, "voiceMaxResults"); _voiceMaxResultsReady = true; } return _voiceMaxResultsContent; } }
+            private static int _voiceMaxResultsContent = default;
+            private static bool _voiceMaxResultsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#voicePromptText"/>
+            /// </summary>
+            public static int voicePromptText { get { if (!_voicePromptTextReady) { _voicePromptTextContent = SGetField<int>(LocalBridgeClazz, "voicePromptText"); _voicePromptTextReady = true; } return _voicePromptTextContent; } }
+            private static int _voicePromptTextContent = default;
+            private static bool _voicePromptTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#voiceSearchMode"/>
+            /// </summary>
+            public static int voiceSearchMode { get { if (!_voiceSearchModeReady) { _voiceSearchModeContent = SGetField<int>(LocalBridgeClazz, "voiceSearchMode"); _voiceSearchModeReady = true; } return _voiceSearchModeContent; } }
+            private static int _voiceSearchModeContent = default;
+            private static bool _voiceSearchModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#wallpaperCloseEnterAnimation"/>
+            /// </summary>
+            public static int wallpaperCloseEnterAnimation { get { if (!_wallpaperCloseEnterAnimationReady) { _wallpaperCloseEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "wallpaperCloseEnterAnimation"); _wallpaperCloseEnterAnimationReady = true; } return _wallpaperCloseEnterAnimationContent; } }
+            private static int _wallpaperCloseEnterAnimationContent = default;
+            private static bool _wallpaperCloseEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#wallpaperCloseExitAnimation"/>
+            /// </summary>
+            public static int wallpaperCloseExitAnimation { get { if (!_wallpaperCloseExitAnimationReady) { _wallpaperCloseExitAnimationContent = SGetField<int>(LocalBridgeClazz, "wallpaperCloseExitAnimation"); _wallpaperCloseExitAnimationReady = true; } return _wallpaperCloseExitAnimationContent; } }
+            private static int _wallpaperCloseExitAnimationContent = default;
+            private static bool _wallpaperCloseExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#wallpaperIntraCloseEnterAnimation"/>
+            /// </summary>
+            public static int wallpaperIntraCloseEnterAnimation { get { if (!_wallpaperIntraCloseEnterAnimationReady) { _wallpaperIntraCloseEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "wallpaperIntraCloseEnterAnimation"); _wallpaperIntraCloseEnterAnimationReady = true; } return _wallpaperIntraCloseEnterAnimationContent; } }
+            private static int _wallpaperIntraCloseEnterAnimationContent = default;
+            private static bool _wallpaperIntraCloseEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#wallpaperIntraCloseExitAnimation"/>
+            /// </summary>
+            public static int wallpaperIntraCloseExitAnimation { get { if (!_wallpaperIntraCloseExitAnimationReady) { _wallpaperIntraCloseExitAnimationContent = SGetField<int>(LocalBridgeClazz, "wallpaperIntraCloseExitAnimation"); _wallpaperIntraCloseExitAnimationReady = true; } return _wallpaperIntraCloseExitAnimationContent; } }
+            private static int _wallpaperIntraCloseExitAnimationContent = default;
+            private static bool _wallpaperIntraCloseExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#wallpaperIntraOpenEnterAnimation"/>
+            /// </summary>
+            public static int wallpaperIntraOpenEnterAnimation { get { if (!_wallpaperIntraOpenEnterAnimationReady) { _wallpaperIntraOpenEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "wallpaperIntraOpenEnterAnimation"); _wallpaperIntraOpenEnterAnimationReady = true; } return _wallpaperIntraOpenEnterAnimationContent; } }
+            private static int _wallpaperIntraOpenEnterAnimationContent = default;
+            private static bool _wallpaperIntraOpenEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#wallpaperIntraOpenExitAnimation"/>
+            /// </summary>
+            public static int wallpaperIntraOpenExitAnimation { get { if (!_wallpaperIntraOpenExitAnimationReady) { _wallpaperIntraOpenExitAnimationContent = SGetField<int>(LocalBridgeClazz, "wallpaperIntraOpenExitAnimation"); _wallpaperIntraOpenExitAnimationReady = true; } return _wallpaperIntraOpenExitAnimationContent; } }
+            private static int _wallpaperIntraOpenExitAnimationContent = default;
+            private static bool _wallpaperIntraOpenExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#wallpaperOpenEnterAnimation"/>
+            /// </summary>
+            public static int wallpaperOpenEnterAnimation { get { if (!_wallpaperOpenEnterAnimationReady) { _wallpaperOpenEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "wallpaperOpenEnterAnimation"); _wallpaperOpenEnterAnimationReady = true; } return _wallpaperOpenEnterAnimationContent; } }
+            private static int _wallpaperOpenEnterAnimationContent = default;
+            private static bool _wallpaperOpenEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#wallpaperOpenExitAnimation"/>
+            /// </summary>
+            public static int wallpaperOpenExitAnimation { get { if (!_wallpaperOpenExitAnimationReady) { _wallpaperOpenExitAnimationContent = SGetField<int>(LocalBridgeClazz, "wallpaperOpenExitAnimation"); _wallpaperOpenExitAnimationReady = true; } return _wallpaperOpenExitAnimationContent; } }
+            private static int _wallpaperOpenExitAnimationContent = default;
+            private static bool _wallpaperOpenExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#webTextViewStyle"/>
+            /// </summary>
+            public static int webTextViewStyle { get { if (!_webTextViewStyleReady) { _webTextViewStyleContent = SGetField<int>(LocalBridgeClazz, "webTextViewStyle"); _webTextViewStyleReady = true; } return _webTextViewStyleContent; } }
+            private static int _webTextViewStyleContent = default;
+            private static bool _webTextViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#webViewStyle"/>
+            /// </summary>
+            public static int webViewStyle { get { if (!_webViewStyleReady) { _webViewStyleContent = SGetField<int>(LocalBridgeClazz, "webViewStyle"); _webViewStyleReady = true; } return _webViewStyleContent; } }
+            private static int _webViewStyleContent = default;
+            private static bool _webViewStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#weekDayTextAppearance"/>
+            /// </summary>
+            public static int weekDayTextAppearance { get { if (!_weekDayTextAppearanceReady) { _weekDayTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "weekDayTextAppearance"); _weekDayTextAppearanceReady = true; } return _weekDayTextAppearanceContent; } }
+            private static int _weekDayTextAppearanceContent = default;
+            private static bool _weekDayTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#weekNumberColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int weekNumberColor { get { if (!_weekNumberColorReady) { _weekNumberColorContent = SGetField<int>(LocalBridgeClazz, "weekNumberColor"); _weekNumberColorReady = true; } return _weekNumberColorContent; } }
+            private static int _weekNumberColorContent = default;
+            private static bool _weekNumberColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#weekSeparatorLineColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int weekSeparatorLineColor { get { if (!_weekSeparatorLineColorReady) { _weekSeparatorLineColorContent = SGetField<int>(LocalBridgeClazz, "weekSeparatorLineColor"); _weekSeparatorLineColorReady = true; } return _weekSeparatorLineColorContent; } }
+            private static int _weekSeparatorLineColorContent = default;
+            private static bool _weekSeparatorLineColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#weightSum"/>
+            /// </summary>
+            public static int weightSum { get { if (!_weightSumReady) { _weightSumContent = SGetField<int>(LocalBridgeClazz, "weightSum"); _weightSumReady = true; } return _weightSumContent; } }
+            private static int _weightSumContent = default;
+            private static bool _weightSumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#widgetCategory"/>
+            /// </summary>
+            public static int widgetCategory { get { if (!_widgetCategoryReady) { _widgetCategoryContent = SGetField<int>(LocalBridgeClazz, "widgetCategory"); _widgetCategoryReady = true; } return _widgetCategoryContent; } }
+            private static int _widgetCategoryContent = default;
+            private static bool _widgetCategoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#widgetFeatures"/>
+            /// </summary>
+            public static int widgetFeatures { get { if (!_widgetFeaturesReady) { _widgetFeaturesContent = SGetField<int>(LocalBridgeClazz, "widgetFeatures"); _widgetFeaturesReady = true; } return _widgetFeaturesContent; } }
+            private static int _widgetFeaturesContent = default;
+            private static bool _widgetFeaturesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#widgetLayout"/>
+            /// </summary>
+            public static int widgetLayout { get { if (!_widgetLayoutReady) { _widgetLayoutContent = SGetField<int>(LocalBridgeClazz, "widgetLayout"); _widgetLayoutReady = true; } return _widgetLayoutContent; } }
+            private static int _widgetLayoutContent = default;
+            private static bool _widgetLayoutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#width"/>
+            /// </summary>
+            public static int width { get { if (!_widthReady) { _widthContent = SGetField<int>(LocalBridgeClazz, "width"); _widthReady = true; } return _widthContent; } }
+            private static int _widthContent = default;
+            private static bool _widthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowActionBar"/>
+            /// </summary>
+            public static int windowActionBar { get { if (!_windowActionBarReady) { _windowActionBarContent = SGetField<int>(LocalBridgeClazz, "windowActionBar"); _windowActionBarReady = true; } return _windowActionBarContent; } }
+            private static int _windowActionBarContent = default;
+            private static bool _windowActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowActionBarOverlay"/>
+            /// </summary>
+            public static int windowActionBarOverlay { get { if (!_windowActionBarOverlayReady) { _windowActionBarOverlayContent = SGetField<int>(LocalBridgeClazz, "windowActionBarOverlay"); _windowActionBarOverlayReady = true; } return _windowActionBarOverlayContent; } }
+            private static int _windowActionBarOverlayContent = default;
+            private static bool _windowActionBarOverlayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowActionModeOverlay"/>
+            /// </summary>
+            public static int windowActionModeOverlay { get { if (!_windowActionModeOverlayReady) { _windowActionModeOverlayContent = SGetField<int>(LocalBridgeClazz, "windowActionModeOverlay"); _windowActionModeOverlayReady = true; } return _windowActionModeOverlayContent; } }
+            private static int _windowActionModeOverlayContent = default;
+            private static bool _windowActionModeOverlayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowActivityTransitions"/>
+            /// </summary>
+            public static int windowActivityTransitions { get { if (!_windowActivityTransitionsReady) { _windowActivityTransitionsContent = SGetField<int>(LocalBridgeClazz, "windowActivityTransitions"); _windowActivityTransitionsReady = true; } return _windowActivityTransitionsContent; } }
+            private static int _windowActivityTransitionsContent = default;
+            private static bool _windowActivityTransitionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowAllowEnterTransitionOverlap"/>
+            /// </summary>
+            public static int windowAllowEnterTransitionOverlap { get { if (!_windowAllowEnterTransitionOverlapReady) { _windowAllowEnterTransitionOverlapContent = SGetField<int>(LocalBridgeClazz, "windowAllowEnterTransitionOverlap"); _windowAllowEnterTransitionOverlapReady = true; } return _windowAllowEnterTransitionOverlapContent; } }
+            private static int _windowAllowEnterTransitionOverlapContent = default;
+            private static bool _windowAllowEnterTransitionOverlapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowAllowReturnTransitionOverlap"/>
+            /// </summary>
+            public static int windowAllowReturnTransitionOverlap { get { if (!_windowAllowReturnTransitionOverlapReady) { _windowAllowReturnTransitionOverlapContent = SGetField<int>(LocalBridgeClazz, "windowAllowReturnTransitionOverlap"); _windowAllowReturnTransitionOverlapReady = true; } return _windowAllowReturnTransitionOverlapContent; } }
+            private static int _windowAllowReturnTransitionOverlapContent = default;
+            private static bool _windowAllowReturnTransitionOverlapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowAnimationStyle"/>
+            /// </summary>
+            public static int windowAnimationStyle { get { if (!_windowAnimationStyleReady) { _windowAnimationStyleContent = SGetField<int>(LocalBridgeClazz, "windowAnimationStyle"); _windowAnimationStyleReady = true; } return _windowAnimationStyleContent; } }
+            private static int _windowAnimationStyleContent = default;
+            private static bool _windowAnimationStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowBackground"/>
+            /// </summary>
+            public static int windowBackground { get { if (!_windowBackgroundReady) { _windowBackgroundContent = SGetField<int>(LocalBridgeClazz, "windowBackground"); _windowBackgroundReady = true; } return _windowBackgroundContent; } }
+            private static int _windowBackgroundContent = default;
+            private static bool _windowBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowBackgroundBlurRadius"/>
+            /// </summary>
+            public static int windowBackgroundBlurRadius { get { if (!_windowBackgroundBlurRadiusReady) { _windowBackgroundBlurRadiusContent = SGetField<int>(LocalBridgeClazz, "windowBackgroundBlurRadius"); _windowBackgroundBlurRadiusReady = true; } return _windowBackgroundBlurRadiusContent; } }
+            private static int _windowBackgroundBlurRadiusContent = default;
+            private static bool _windowBackgroundBlurRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowBackgroundFallback"/>
+            /// </summary>
+            public static int windowBackgroundFallback { get { if (!_windowBackgroundFallbackReady) { _windowBackgroundFallbackContent = SGetField<int>(LocalBridgeClazz, "windowBackgroundFallback"); _windowBackgroundFallbackReady = true; } return _windowBackgroundFallbackContent; } }
+            private static int _windowBackgroundFallbackContent = default;
+            private static bool _windowBackgroundFallbackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowBlurBehindEnabled"/>
+            /// </summary>
+            public static int windowBlurBehindEnabled { get { if (!_windowBlurBehindEnabledReady) { _windowBlurBehindEnabledContent = SGetField<int>(LocalBridgeClazz, "windowBlurBehindEnabled"); _windowBlurBehindEnabledReady = true; } return _windowBlurBehindEnabledContent; } }
+            private static int _windowBlurBehindEnabledContent = default;
+            private static bool _windowBlurBehindEnabledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowBlurBehindRadius"/>
+            /// </summary>
+            public static int windowBlurBehindRadius { get { if (!_windowBlurBehindRadiusReady) { _windowBlurBehindRadiusContent = SGetField<int>(LocalBridgeClazz, "windowBlurBehindRadius"); _windowBlurBehindRadiusReady = true; } return _windowBlurBehindRadiusContent; } }
+            private static int _windowBlurBehindRadiusContent = default;
+            private static bool _windowBlurBehindRadiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowClipToOutline"/>
+            /// </summary>
+            public static int windowClipToOutline { get { if (!_windowClipToOutlineReady) { _windowClipToOutlineContent = SGetField<int>(LocalBridgeClazz, "windowClipToOutline"); _windowClipToOutlineReady = true; } return _windowClipToOutlineContent; } }
+            private static int _windowClipToOutlineContent = default;
+            private static bool _windowClipToOutlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowCloseOnTouchOutside"/>
+            /// </summary>
+            public static int windowCloseOnTouchOutside { get { if (!_windowCloseOnTouchOutsideReady) { _windowCloseOnTouchOutsideContent = SGetField<int>(LocalBridgeClazz, "windowCloseOnTouchOutside"); _windowCloseOnTouchOutsideReady = true; } return _windowCloseOnTouchOutsideContent; } }
+            private static int _windowCloseOnTouchOutsideContent = default;
+            private static bool _windowCloseOnTouchOutsideReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowContentOverlay"/>
+            /// </summary>
+            public static int windowContentOverlay { get { if (!_windowContentOverlayReady) { _windowContentOverlayContent = SGetField<int>(LocalBridgeClazz, "windowContentOverlay"); _windowContentOverlayReady = true; } return _windowContentOverlayContent; } }
+            private static int _windowContentOverlayContent = default;
+            private static bool _windowContentOverlayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowContentTransitionManager"/>
+            /// </summary>
+            public static int windowContentTransitionManager { get { if (!_windowContentTransitionManagerReady) { _windowContentTransitionManagerContent = SGetField<int>(LocalBridgeClazz, "windowContentTransitionManager"); _windowContentTransitionManagerReady = true; } return _windowContentTransitionManagerContent; } }
+            private static int _windowContentTransitionManagerContent = default;
+            private static bool _windowContentTransitionManagerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowContentTransitions"/>
+            /// </summary>
+            public static int windowContentTransitions { get { if (!_windowContentTransitionsReady) { _windowContentTransitionsContent = SGetField<int>(LocalBridgeClazz, "windowContentTransitions"); _windowContentTransitionsReady = true; } return _windowContentTransitionsContent; } }
+            private static int _windowContentTransitionsContent = default;
+            private static bool _windowContentTransitionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowDisablePreview"/>
+            /// </summary>
+            public static int windowDisablePreview { get { if (!_windowDisablePreviewReady) { _windowDisablePreviewContent = SGetField<int>(LocalBridgeClazz, "windowDisablePreview"); _windowDisablePreviewReady = true; } return _windowDisablePreviewContent; } }
+            private static int _windowDisablePreviewContent = default;
+            private static bool _windowDisablePreviewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowDrawsSystemBarBackgrounds"/>
+            /// </summary>
+            public static int windowDrawsSystemBarBackgrounds { get { if (!_windowDrawsSystemBarBackgroundsReady) { _windowDrawsSystemBarBackgroundsContent = SGetField<int>(LocalBridgeClazz, "windowDrawsSystemBarBackgrounds"); _windowDrawsSystemBarBackgroundsReady = true; } return _windowDrawsSystemBarBackgroundsContent; } }
+            private static int _windowDrawsSystemBarBackgroundsContent = default;
+            private static bool _windowDrawsSystemBarBackgroundsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowElevation"/>
+            /// </summary>
+            public static int windowElevation { get { if (!_windowElevationReady) { _windowElevationContent = SGetField<int>(LocalBridgeClazz, "windowElevation"); _windowElevationReady = true; } return _windowElevationContent; } }
+            private static int _windowElevationContent = default;
+            private static bool _windowElevationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowEnableSplitTouch"/>
+            /// </summary>
+            public static int windowEnableSplitTouch { get { if (!_windowEnableSplitTouchReady) { _windowEnableSplitTouchContent = SGetField<int>(LocalBridgeClazz, "windowEnableSplitTouch"); _windowEnableSplitTouchReady = true; } return _windowEnableSplitTouchContent; } }
+            private static int _windowEnableSplitTouchContent = default;
+            private static bool _windowEnableSplitTouchReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowEnterAnimation"/>
+            /// </summary>
+            public static int windowEnterAnimation { get { if (!_windowEnterAnimationReady) { _windowEnterAnimationContent = SGetField<int>(LocalBridgeClazz, "windowEnterAnimation"); _windowEnterAnimationReady = true; } return _windowEnterAnimationContent; } }
+            private static int _windowEnterAnimationContent = default;
+            private static bool _windowEnterAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowEnterTransition"/>
+            /// </summary>
+            public static int windowEnterTransition { get { if (!_windowEnterTransitionReady) { _windowEnterTransitionContent = SGetField<int>(LocalBridgeClazz, "windowEnterTransition"); _windowEnterTransitionReady = true; } return _windowEnterTransitionContent; } }
+            private static int _windowEnterTransitionContent = default;
+            private static bool _windowEnterTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowExitAnimation"/>
+            /// </summary>
+            public static int windowExitAnimation { get { if (!_windowExitAnimationReady) { _windowExitAnimationContent = SGetField<int>(LocalBridgeClazz, "windowExitAnimation"); _windowExitAnimationReady = true; } return _windowExitAnimationContent; } }
+            private static int _windowExitAnimationContent = default;
+            private static bool _windowExitAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowExitTransition"/>
+            /// </summary>
+            public static int windowExitTransition { get { if (!_windowExitTransitionReady) { _windowExitTransitionContent = SGetField<int>(LocalBridgeClazz, "windowExitTransition"); _windowExitTransitionReady = true; } return _windowExitTransitionContent; } }
+            private static int _windowExitTransitionContent = default;
+            private static bool _windowExitTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowFrame"/>
+            /// </summary>
+            public static int windowFrame { get { if (!_windowFrameReady) { _windowFrameContent = SGetField<int>(LocalBridgeClazz, "windowFrame"); _windowFrameReady = true; } return _windowFrameContent; } }
+            private static int _windowFrameContent = default;
+            private static bool _windowFrameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowFullscreen"/>
+            /// </summary>
+            public static int windowFullscreen { get { if (!_windowFullscreenReady) { _windowFullscreenContent = SGetField<int>(LocalBridgeClazz, "windowFullscreen"); _windowFullscreenReady = true; } return _windowFullscreenContent; } }
+            private static int _windowFullscreenContent = default;
+            private static bool _windowFullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowHideAnimation"/>
+            /// </summary>
+            public static int windowHideAnimation { get { if (!_windowHideAnimationReady) { _windowHideAnimationContent = SGetField<int>(LocalBridgeClazz, "windowHideAnimation"); _windowHideAnimationReady = true; } return _windowHideAnimationContent; } }
+            private static int _windowHideAnimationContent = default;
+            private static bool _windowHideAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowIsFloating"/>
+            /// </summary>
+            public static int windowIsFloating { get { if (!_windowIsFloatingReady) { _windowIsFloatingContent = SGetField<int>(LocalBridgeClazz, "windowIsFloating"); _windowIsFloatingReady = true; } return _windowIsFloatingContent; } }
+            private static int _windowIsFloatingContent = default;
+            private static bool _windowIsFloatingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowIsTranslucent"/>
+            /// </summary>
+            public static int windowIsTranslucent { get { if (!_windowIsTranslucentReady) { _windowIsTranslucentContent = SGetField<int>(LocalBridgeClazz, "windowIsTranslucent"); _windowIsTranslucentReady = true; } return _windowIsTranslucentContent; } }
+            private static int _windowIsTranslucentContent = default;
+            private static bool _windowIsTranslucentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowLayoutAffinity"/>
+            /// </summary>
+            public static int windowLayoutAffinity { get { if (!_windowLayoutAffinityReady) { _windowLayoutAffinityContent = SGetField<int>(LocalBridgeClazz, "windowLayoutAffinity"); _windowLayoutAffinityReady = true; } return _windowLayoutAffinityContent; } }
+            private static int _windowLayoutAffinityContent = default;
+            private static bool _windowLayoutAffinityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowLayoutInDisplayCutoutMode"/>
+            /// </summary>
+            public static int windowLayoutInDisplayCutoutMode { get { if (!_windowLayoutInDisplayCutoutModeReady) { _windowLayoutInDisplayCutoutModeContent = SGetField<int>(LocalBridgeClazz, "windowLayoutInDisplayCutoutMode"); _windowLayoutInDisplayCutoutModeReady = true; } return _windowLayoutInDisplayCutoutModeContent; } }
+            private static int _windowLayoutInDisplayCutoutModeContent = default;
+            private static bool _windowLayoutInDisplayCutoutModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowLightNavigationBar"/>
+            /// </summary>
+            public static int windowLightNavigationBar { get { if (!_windowLightNavigationBarReady) { _windowLightNavigationBarContent = SGetField<int>(LocalBridgeClazz, "windowLightNavigationBar"); _windowLightNavigationBarReady = true; } return _windowLightNavigationBarContent; } }
+            private static int _windowLightNavigationBarContent = default;
+            private static bool _windowLightNavigationBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowLightStatusBar"/>
+            /// </summary>
+            public static int windowLightStatusBar { get { if (!_windowLightStatusBarReady) { _windowLightStatusBarContent = SGetField<int>(LocalBridgeClazz, "windowLightStatusBar"); _windowLightStatusBarReady = true; } return _windowLightStatusBarContent; } }
+            private static int _windowLightStatusBarContent = default;
+            private static bool _windowLightStatusBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowMinWidthMajor"/>
+            /// </summary>
+            public static int windowMinWidthMajor { get { if (!_windowMinWidthMajorReady) { _windowMinWidthMajorContent = SGetField<int>(LocalBridgeClazz, "windowMinWidthMajor"); _windowMinWidthMajorReady = true; } return _windowMinWidthMajorContent; } }
+            private static int _windowMinWidthMajorContent = default;
+            private static bool _windowMinWidthMajorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowMinWidthMinor"/>
+            /// </summary>
+            public static int windowMinWidthMinor { get { if (!_windowMinWidthMinorReady) { _windowMinWidthMinorContent = SGetField<int>(LocalBridgeClazz, "windowMinWidthMinor"); _windowMinWidthMinorReady = true; } return _windowMinWidthMinorContent; } }
+            private static int _windowMinWidthMinorContent = default;
+            private static bool _windowMinWidthMinorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowNoDisplay"/>
+            /// </summary>
+            public static int windowNoDisplay { get { if (!_windowNoDisplayReady) { _windowNoDisplayContent = SGetField<int>(LocalBridgeClazz, "windowNoDisplay"); _windowNoDisplayReady = true; } return _windowNoDisplayContent; } }
+            private static int _windowNoDisplayContent = default;
+            private static bool _windowNoDisplayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowNoMoveAnimation"/>
+            /// </summary>
+            public static int windowNoMoveAnimation { get { if (!_windowNoMoveAnimationReady) { _windowNoMoveAnimationContent = SGetField<int>(LocalBridgeClazz, "windowNoMoveAnimation"); _windowNoMoveAnimationReady = true; } return _windowNoMoveAnimationContent; } }
+            private static int _windowNoMoveAnimationContent = default;
+            private static bool _windowNoMoveAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowNoTitle"/>
+            /// </summary>
+            public static int windowNoTitle { get { if (!_windowNoTitleReady) { _windowNoTitleContent = SGetField<int>(LocalBridgeClazz, "windowNoTitle"); _windowNoTitleReady = true; } return _windowNoTitleContent; } }
+            private static int _windowNoTitleContent = default;
+            private static bool _windowNoTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowOverscan"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int windowOverscan { get { if (!_windowOverscanReady) { _windowOverscanContent = SGetField<int>(LocalBridgeClazz, "windowOverscan"); _windowOverscanReady = true; } return _windowOverscanContent; } }
+            private static int _windowOverscanContent = default;
+            private static bool _windowOverscanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowReenterTransition"/>
+            /// </summary>
+            public static int windowReenterTransition { get { if (!_windowReenterTransitionReady) { _windowReenterTransitionContent = SGetField<int>(LocalBridgeClazz, "windowReenterTransition"); _windowReenterTransitionReady = true; } return _windowReenterTransitionContent; } }
+            private static int _windowReenterTransitionContent = default;
+            private static bool _windowReenterTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowReturnTransition"/>
+            /// </summary>
+            public static int windowReturnTransition { get { if (!_windowReturnTransitionReady) { _windowReturnTransitionContent = SGetField<int>(LocalBridgeClazz, "windowReturnTransition"); _windowReturnTransitionReady = true; } return _windowReturnTransitionContent; } }
+            private static int _windowReturnTransitionContent = default;
+            private static bool _windowReturnTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSharedElementEnterTransition"/>
+            /// </summary>
+            public static int windowSharedElementEnterTransition { get { if (!_windowSharedElementEnterTransitionReady) { _windowSharedElementEnterTransitionContent = SGetField<int>(LocalBridgeClazz, "windowSharedElementEnterTransition"); _windowSharedElementEnterTransitionReady = true; } return _windowSharedElementEnterTransitionContent; } }
+            private static int _windowSharedElementEnterTransitionContent = default;
+            private static bool _windowSharedElementEnterTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSharedElementExitTransition"/>
+            /// </summary>
+            public static int windowSharedElementExitTransition { get { if (!_windowSharedElementExitTransitionReady) { _windowSharedElementExitTransitionContent = SGetField<int>(LocalBridgeClazz, "windowSharedElementExitTransition"); _windowSharedElementExitTransitionReady = true; } return _windowSharedElementExitTransitionContent; } }
+            private static int _windowSharedElementExitTransitionContent = default;
+            private static bool _windowSharedElementExitTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSharedElementReenterTransition"/>
+            /// </summary>
+            public static int windowSharedElementReenterTransition { get { if (!_windowSharedElementReenterTransitionReady) { _windowSharedElementReenterTransitionContent = SGetField<int>(LocalBridgeClazz, "windowSharedElementReenterTransition"); _windowSharedElementReenterTransitionReady = true; } return _windowSharedElementReenterTransitionContent; } }
+            private static int _windowSharedElementReenterTransitionContent = default;
+            private static bool _windowSharedElementReenterTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSharedElementReturnTransition"/>
+            /// </summary>
+            public static int windowSharedElementReturnTransition { get { if (!_windowSharedElementReturnTransitionReady) { _windowSharedElementReturnTransitionContent = SGetField<int>(LocalBridgeClazz, "windowSharedElementReturnTransition"); _windowSharedElementReturnTransitionReady = true; } return _windowSharedElementReturnTransitionContent; } }
+            private static int _windowSharedElementReturnTransitionContent = default;
+            private static bool _windowSharedElementReturnTransitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSharedElementsUseOverlay"/>
+            /// </summary>
+            public static int windowSharedElementsUseOverlay { get { if (!_windowSharedElementsUseOverlayReady) { _windowSharedElementsUseOverlayContent = SGetField<int>(LocalBridgeClazz, "windowSharedElementsUseOverlay"); _windowSharedElementsUseOverlayReady = true; } return _windowSharedElementsUseOverlayContent; } }
+            private static int _windowSharedElementsUseOverlayContent = default;
+            private static bool _windowSharedElementsUseOverlayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowShowAnimation"/>
+            /// </summary>
+            public static int windowShowAnimation { get { if (!_windowShowAnimationReady) { _windowShowAnimationContent = SGetField<int>(LocalBridgeClazz, "windowShowAnimation"); _windowShowAnimationReady = true; } return _windowShowAnimationContent; } }
+            private static int _windowShowAnimationContent = default;
+            private static bool _windowShowAnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowShowWallpaper"/>
+            /// </summary>
+            public static int windowShowWallpaper { get { if (!_windowShowWallpaperReady) { _windowShowWallpaperContent = SGetField<int>(LocalBridgeClazz, "windowShowWallpaper"); _windowShowWallpaperReady = true; } return _windowShowWallpaperContent; } }
+            private static int _windowShowWallpaperContent = default;
+            private static bool _windowShowWallpaperReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSoftInputMode"/>
+            /// </summary>
+            public static int windowSoftInputMode { get { if (!_windowSoftInputModeReady) { _windowSoftInputModeContent = SGetField<int>(LocalBridgeClazz, "windowSoftInputMode"); _windowSoftInputModeReady = true; } return _windowSoftInputModeContent; } }
+            private static int _windowSoftInputModeContent = default;
+            private static bool _windowSoftInputModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSplashScreenAnimatedIcon"/>
+            /// </summary>
+            public static int windowSplashScreenAnimatedIcon { get { if (!_windowSplashScreenAnimatedIconReady) { _windowSplashScreenAnimatedIconContent = SGetField<int>(LocalBridgeClazz, "windowSplashScreenAnimatedIcon"); _windowSplashScreenAnimatedIconReady = true; } return _windowSplashScreenAnimatedIconContent; } }
+            private static int _windowSplashScreenAnimatedIconContent = default;
+            private static bool _windowSplashScreenAnimatedIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSplashScreenAnimationDuration"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int windowSplashScreenAnimationDuration { get { if (!_windowSplashScreenAnimationDurationReady) { _windowSplashScreenAnimationDurationContent = SGetField<int>(LocalBridgeClazz, "windowSplashScreenAnimationDuration"); _windowSplashScreenAnimationDurationReady = true; } return _windowSplashScreenAnimationDurationContent; } }
+            private static int _windowSplashScreenAnimationDurationContent = default;
+            private static bool _windowSplashScreenAnimationDurationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSplashScreenBackground"/>
+            /// </summary>
+            public static int windowSplashScreenBackground { get { if (!_windowSplashScreenBackgroundReady) { _windowSplashScreenBackgroundContent = SGetField<int>(LocalBridgeClazz, "windowSplashScreenBackground"); _windowSplashScreenBackgroundReady = true; } return _windowSplashScreenBackgroundContent; } }
+            private static int _windowSplashScreenBackgroundContent = default;
+            private static bool _windowSplashScreenBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSplashScreenBehavior"/>
+            /// </summary>
+            public static int windowSplashScreenBehavior { get { if (!_windowSplashScreenBehaviorReady) { _windowSplashScreenBehaviorContent = SGetField<int>(LocalBridgeClazz, "windowSplashScreenBehavior"); _windowSplashScreenBehaviorReady = true; } return _windowSplashScreenBehaviorContent; } }
+            private static int _windowSplashScreenBehaviorContent = default;
+            private static bool _windowSplashScreenBehaviorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSplashScreenBrandingImage"/>
+            /// </summary>
+            public static int windowSplashScreenBrandingImage { get { if (!_windowSplashScreenBrandingImageReady) { _windowSplashScreenBrandingImageContent = SGetField<int>(LocalBridgeClazz, "windowSplashScreenBrandingImage"); _windowSplashScreenBrandingImageReady = true; } return _windowSplashScreenBrandingImageContent; } }
+            private static int _windowSplashScreenBrandingImageContent = default;
+            private static bool _windowSplashScreenBrandingImageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSplashscreenContent"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int windowSplashscreenContent { get { if (!_windowSplashscreenContentReady) { _windowSplashscreenContentContent = SGetField<int>(LocalBridgeClazz, "windowSplashscreenContent"); _windowSplashscreenContentReady = true; } return _windowSplashscreenContentContent; } }
+            private static int _windowSplashscreenContentContent = default;
+            private static bool _windowSplashscreenContentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSplashScreenIconBackgroundColor"/>
+            /// </summary>
+            public static int windowSplashScreenIconBackgroundColor { get { if (!_windowSplashScreenIconBackgroundColorReady) { _windowSplashScreenIconBackgroundColorContent = SGetField<int>(LocalBridgeClazz, "windowSplashScreenIconBackgroundColor"); _windowSplashScreenIconBackgroundColorReady = true; } return _windowSplashScreenIconBackgroundColorContent; } }
+            private static int _windowSplashScreenIconBackgroundColorContent = default;
+            private static bool _windowSplashScreenIconBackgroundColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowSwipeToDismiss"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int windowSwipeToDismiss { get { if (!_windowSwipeToDismissReady) { _windowSwipeToDismissContent = SGetField<int>(LocalBridgeClazz, "windowSwipeToDismiss"); _windowSwipeToDismissReady = true; } return _windowSwipeToDismissContent; } }
+            private static int _windowSwipeToDismissContent = default;
+            private static bool _windowSwipeToDismissReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowTitleBackgroundStyle"/>
+            /// </summary>
+            public static int windowTitleBackgroundStyle { get { if (!_windowTitleBackgroundStyleReady) { _windowTitleBackgroundStyleContent = SGetField<int>(LocalBridgeClazz, "windowTitleBackgroundStyle"); _windowTitleBackgroundStyleReady = true; } return _windowTitleBackgroundStyleContent; } }
+            private static int _windowTitleBackgroundStyleContent = default;
+            private static bool _windowTitleBackgroundStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowTitleSize"/>
+            /// </summary>
+            public static int windowTitleSize { get { if (!_windowTitleSizeReady) { _windowTitleSizeContent = SGetField<int>(LocalBridgeClazz, "windowTitleSize"); _windowTitleSizeReady = true; } return _windowTitleSizeContent; } }
+            private static int _windowTitleSizeContent = default;
+            private static bool _windowTitleSizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowTitleStyle"/>
+            /// </summary>
+            public static int windowTitleStyle { get { if (!_windowTitleStyleReady) { _windowTitleStyleContent = SGetField<int>(LocalBridgeClazz, "windowTitleStyle"); _windowTitleStyleReady = true; } return _windowTitleStyleContent; } }
+            private static int _windowTitleStyleContent = default;
+            private static bool _windowTitleStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowTransitionBackgroundFadeDuration"/>
+            /// </summary>
+            public static int windowTransitionBackgroundFadeDuration { get { if (!_windowTransitionBackgroundFadeDurationReady) { _windowTransitionBackgroundFadeDurationContent = SGetField<int>(LocalBridgeClazz, "windowTransitionBackgroundFadeDuration"); _windowTransitionBackgroundFadeDurationReady = true; } return _windowTransitionBackgroundFadeDurationContent; } }
+            private static int _windowTransitionBackgroundFadeDurationContent = default;
+            private static bool _windowTransitionBackgroundFadeDurationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowTranslucentNavigation"/>
+            /// </summary>
+            public static int windowTranslucentNavigation { get { if (!_windowTranslucentNavigationReady) { _windowTranslucentNavigationContent = SGetField<int>(LocalBridgeClazz, "windowTranslucentNavigation"); _windowTranslucentNavigationReady = true; } return _windowTranslucentNavigationContent; } }
+            private static int _windowTranslucentNavigationContent = default;
+            private static bool _windowTranslucentNavigationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#windowTranslucentStatus"/>
+            /// </summary>
+            public static int windowTranslucentStatus { get { if (!_windowTranslucentStatusReady) { _windowTranslucentStatusContent = SGetField<int>(LocalBridgeClazz, "windowTranslucentStatus"); _windowTranslucentStatusReady = true; } return _windowTranslucentStatusContent; } }
+            private static int _windowTranslucentStatusContent = default;
+            private static bool _windowTranslucentStatusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#writePermission"/>
+            /// </summary>
+            public static int writePermission { get { if (!_writePermissionReady) { _writePermissionContent = SGetField<int>(LocalBridgeClazz, "writePermission"); _writePermissionReady = true; } return _writePermissionContent; } }
+            private static int _writePermissionContent = default;
+            private static bool _writePermissionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#x"/>
+            /// </summary>
+            public static int x { get { if (!_xReady) { _xContent = SGetField<int>(LocalBridgeClazz, "x"); _xReady = true; } return _xContent; } }
+            private static int _xContent = default;
+            private static bool _xReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#xlargeScreens"/>
+            /// </summary>
+            public static int xlargeScreens { get { if (!_xlargeScreensReady) { _xlargeScreensContent = SGetField<int>(LocalBridgeClazz, "xlargeScreens"); _xlargeScreensReady = true; } return _xlargeScreensContent; } }
+            private static int _xlargeScreensContent = default;
+            private static bool _xlargeScreensReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#y"/>
+            /// </summary>
+            public static int y { get { if (!_yReady) { _yContent = SGetField<int>(LocalBridgeClazz, "y"); _yReady = true; } return _yContent; } }
+            private static int _yContent = default;
+            private static bool _yReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#yearListItemTextAppearance"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int yearListItemTextAppearance { get { if (!_yearListItemTextAppearanceReady) { _yearListItemTextAppearanceContent = SGetField<int>(LocalBridgeClazz, "yearListItemTextAppearance"); _yearListItemTextAppearanceReady = true; } return _yearListItemTextAppearanceContent; } }
+            private static int _yearListItemTextAppearanceContent = default;
+            private static bool _yearListItemTextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#yearListSelectorColor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int yearListSelectorColor { get { if (!_yearListSelectorColorReady) { _yearListSelectorColorContent = SGetField<int>(LocalBridgeClazz, "yearListSelectorColor"); _yearListSelectorColorReady = true; } return _yearListSelectorColorContent; } }
+            private static int _yearListSelectorColorContent = default;
+            private static bool _yearListSelectorColorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#yesNoPreferenceStyle"/>
+            /// </summary>
+            public static int yesNoPreferenceStyle { get { if (!_yesNoPreferenceStyleReady) { _yesNoPreferenceStyleContent = SGetField<int>(LocalBridgeClazz, "yesNoPreferenceStyle"); _yesNoPreferenceStyleReady = true; } return _yesNoPreferenceStyleContent; } }
+            private static int _yesNoPreferenceStyleContent = default;
+            private static bool _yesNoPreferenceStyleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#zAdjustment"/>
+            /// </summary>
+            public static int zAdjustment { get { if (!_zAdjustmentReady) { _zAdjustmentContent = SGetField<int>(LocalBridgeClazz, "zAdjustment"); _zAdjustmentReady = true; } return _zAdjustmentContent; } }
+            private static int _zAdjustmentContent = default;
+            private static bool _zAdjustmentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.attr.html#zygotePreloadName"/>
+            /// </summary>
+            public static int zygotePreloadName { get { if (!_zygotePreloadNameReady) { _zygotePreloadNameContent = SGetField<int>(LocalBridgeClazz, "zygotePreloadName"); _zygotePreloadNameReady = true; } return _zygotePreloadNameContent; } }
+            private static int _zygotePreloadNameContent = default;
+            private static bool _zygotePreloadNameReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region boolClass
+        public partial class boolClass
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region color
+        public partial class color
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#background_dark"/>
+            /// </summary>
+            public static int background_dark { get { if (!_background_darkReady) { _background_darkContent = SGetField<int>(LocalBridgeClazz, "background_dark"); _background_darkReady = true; } return _background_darkContent; } }
+            private static int _background_darkContent = default;
+            private static bool _background_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#background_light"/>
+            /// </summary>
+            public static int background_light { get { if (!_background_lightReady) { _background_lightContent = SGetField<int>(LocalBridgeClazz, "background_light"); _background_lightReady = true; } return _background_lightContent; } }
+            private static int _background_lightContent = default;
+            private static bool _background_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#black"/>
+            /// </summary>
+            public static int black { get { if (!_blackReady) { _blackContent = SGetField<int>(LocalBridgeClazz, "black"); _blackReady = true; } return _blackContent; } }
+            private static int _blackContent = default;
+            private static bool _blackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#darker_gray"/>
+            /// </summary>
+            public static int darker_gray { get { if (!_darker_grayReady) { _darker_grayContent = SGetField<int>(LocalBridgeClazz, "darker_gray"); _darker_grayReady = true; } return _darker_grayContent; } }
+            private static int _darker_grayContent = default;
+            private static bool _darker_grayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_blue_bright"/>
+            /// </summary>
+            public static int holo_blue_bright { get { if (!_holo_blue_brightReady) { _holo_blue_brightContent = SGetField<int>(LocalBridgeClazz, "holo_blue_bright"); _holo_blue_brightReady = true; } return _holo_blue_brightContent; } }
+            private static int _holo_blue_brightContent = default;
+            private static bool _holo_blue_brightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_blue_dark"/>
+            /// </summary>
+            public static int holo_blue_dark { get { if (!_holo_blue_darkReady) { _holo_blue_darkContent = SGetField<int>(LocalBridgeClazz, "holo_blue_dark"); _holo_blue_darkReady = true; } return _holo_blue_darkContent; } }
+            private static int _holo_blue_darkContent = default;
+            private static bool _holo_blue_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_blue_light"/>
+            /// </summary>
+            public static int holo_blue_light { get { if (!_holo_blue_lightReady) { _holo_blue_lightContent = SGetField<int>(LocalBridgeClazz, "holo_blue_light"); _holo_blue_lightReady = true; } return _holo_blue_lightContent; } }
+            private static int _holo_blue_lightContent = default;
+            private static bool _holo_blue_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_green_dark"/>
+            /// </summary>
+            public static int holo_green_dark { get { if (!_holo_green_darkReady) { _holo_green_darkContent = SGetField<int>(LocalBridgeClazz, "holo_green_dark"); _holo_green_darkReady = true; } return _holo_green_darkContent; } }
+            private static int _holo_green_darkContent = default;
+            private static bool _holo_green_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_green_light"/>
+            /// </summary>
+            public static int holo_green_light { get { if (!_holo_green_lightReady) { _holo_green_lightContent = SGetField<int>(LocalBridgeClazz, "holo_green_light"); _holo_green_lightReady = true; } return _holo_green_lightContent; } }
+            private static int _holo_green_lightContent = default;
+            private static bool _holo_green_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_orange_dark"/>
+            /// </summary>
+            public static int holo_orange_dark { get { if (!_holo_orange_darkReady) { _holo_orange_darkContent = SGetField<int>(LocalBridgeClazz, "holo_orange_dark"); _holo_orange_darkReady = true; } return _holo_orange_darkContent; } }
+            private static int _holo_orange_darkContent = default;
+            private static bool _holo_orange_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_orange_light"/>
+            /// </summary>
+            public static int holo_orange_light { get { if (!_holo_orange_lightReady) { _holo_orange_lightContent = SGetField<int>(LocalBridgeClazz, "holo_orange_light"); _holo_orange_lightReady = true; } return _holo_orange_lightContent; } }
+            private static int _holo_orange_lightContent = default;
+            private static bool _holo_orange_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_purple"/>
+            /// </summary>
+            public static int holo_purple { get { if (!_holo_purpleReady) { _holo_purpleContent = SGetField<int>(LocalBridgeClazz, "holo_purple"); _holo_purpleReady = true; } return _holo_purpleContent; } }
+            private static int _holo_purpleContent = default;
+            private static bool _holo_purpleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_red_dark"/>
+            /// </summary>
+            public static int holo_red_dark { get { if (!_holo_red_darkReady) { _holo_red_darkContent = SGetField<int>(LocalBridgeClazz, "holo_red_dark"); _holo_red_darkReady = true; } return _holo_red_darkContent; } }
+            private static int _holo_red_darkContent = default;
+            private static bool _holo_red_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#holo_red_light"/>
+            /// </summary>
+            public static int holo_red_light { get { if (!_holo_red_lightReady) { _holo_red_lightContent = SGetField<int>(LocalBridgeClazz, "holo_red_light"); _holo_red_lightReady = true; } return _holo_red_lightContent; } }
+            private static int _holo_red_lightContent = default;
+            private static bool _holo_red_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#primary_text_dark"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int primary_text_dark { get { if (!_primary_text_darkReady) { _primary_text_darkContent = SGetField<int>(LocalBridgeClazz, "primary_text_dark"); _primary_text_darkReady = true; } return _primary_text_darkContent; } }
+            private static int _primary_text_darkContent = default;
+            private static bool _primary_text_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#primary_text_dark_nodisable"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int primary_text_dark_nodisable { get { if (!_primary_text_dark_nodisableReady) { _primary_text_dark_nodisableContent = SGetField<int>(LocalBridgeClazz, "primary_text_dark_nodisable"); _primary_text_dark_nodisableReady = true; } return _primary_text_dark_nodisableContent; } }
+            private static int _primary_text_dark_nodisableContent = default;
+            private static bool _primary_text_dark_nodisableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#primary_text_light"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int primary_text_light { get { if (!_primary_text_lightReady) { _primary_text_lightContent = SGetField<int>(LocalBridgeClazz, "primary_text_light"); _primary_text_lightReady = true; } return _primary_text_lightContent; } }
+            private static int _primary_text_lightContent = default;
+            private static bool _primary_text_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#primary_text_light_nodisable"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int primary_text_light_nodisable { get { if (!_primary_text_light_nodisableReady) { _primary_text_light_nodisableContent = SGetField<int>(LocalBridgeClazz, "primary_text_light_nodisable"); _primary_text_light_nodisableReady = true; } return _primary_text_light_nodisableContent; } }
+            private static int _primary_text_light_nodisableContent = default;
+            private static bool _primary_text_light_nodisableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#secondary_text_dark"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int secondary_text_dark { get { if (!_secondary_text_darkReady) { _secondary_text_darkContent = SGetField<int>(LocalBridgeClazz, "secondary_text_dark"); _secondary_text_darkReady = true; } return _secondary_text_darkContent; } }
+            private static int _secondary_text_darkContent = default;
+            private static bool _secondary_text_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#secondary_text_dark_nodisable"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int secondary_text_dark_nodisable { get { if (!_secondary_text_dark_nodisableReady) { _secondary_text_dark_nodisableContent = SGetField<int>(LocalBridgeClazz, "secondary_text_dark_nodisable"); _secondary_text_dark_nodisableReady = true; } return _secondary_text_dark_nodisableContent; } }
+            private static int _secondary_text_dark_nodisableContent = default;
+            private static bool _secondary_text_dark_nodisableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#secondary_text_light"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int secondary_text_light { get { if (!_secondary_text_lightReady) { _secondary_text_lightContent = SGetField<int>(LocalBridgeClazz, "secondary_text_light"); _secondary_text_lightReady = true; } return _secondary_text_lightContent; } }
+            private static int _secondary_text_lightContent = default;
+            private static bool _secondary_text_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#secondary_text_light_nodisable"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int secondary_text_light_nodisable { get { if (!_secondary_text_light_nodisableReady) { _secondary_text_light_nodisableContent = SGetField<int>(LocalBridgeClazz, "secondary_text_light_nodisable"); _secondary_text_light_nodisableReady = true; } return _secondary_text_light_nodisableContent; } }
+            private static int _secondary_text_light_nodisableContent = default;
+            private static bool _secondary_text_light_nodisableReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_0"/>
+            /// </summary>
+            public static int system_accent1_0 { get { if (!_system_accent1_0Ready) { _system_accent1_0Content = SGetField<int>(LocalBridgeClazz, "system_accent1_0"); _system_accent1_0Ready = true; } return _system_accent1_0Content; } }
+            private static int _system_accent1_0Content = default;
+            private static bool _system_accent1_0Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_10"/>
+            /// </summary>
+            public static int system_accent1_10 { get { if (!_system_accent1_10Ready) { _system_accent1_10Content = SGetField<int>(LocalBridgeClazz, "system_accent1_10"); _system_accent1_10Ready = true; } return _system_accent1_10Content; } }
+            private static int _system_accent1_10Content = default;
+            private static bool _system_accent1_10Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_100"/>
+            /// </summary>
+            public static int system_accent1_100 { get { if (!_system_accent1_100Ready) { _system_accent1_100Content = SGetField<int>(LocalBridgeClazz, "system_accent1_100"); _system_accent1_100Ready = true; } return _system_accent1_100Content; } }
+            private static int _system_accent1_100Content = default;
+            private static bool _system_accent1_100Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_1000"/>
+            /// </summary>
+            public static int system_accent1_1000 { get { if (!_system_accent1_1000Ready) { _system_accent1_1000Content = SGetField<int>(LocalBridgeClazz, "system_accent1_1000"); _system_accent1_1000Ready = true; } return _system_accent1_1000Content; } }
+            private static int _system_accent1_1000Content = default;
+            private static bool _system_accent1_1000Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_200"/>
+            /// </summary>
+            public static int system_accent1_200 { get { if (!_system_accent1_200Ready) { _system_accent1_200Content = SGetField<int>(LocalBridgeClazz, "system_accent1_200"); _system_accent1_200Ready = true; } return _system_accent1_200Content; } }
+            private static int _system_accent1_200Content = default;
+            private static bool _system_accent1_200Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_300"/>
+            /// </summary>
+            public static int system_accent1_300 { get { if (!_system_accent1_300Ready) { _system_accent1_300Content = SGetField<int>(LocalBridgeClazz, "system_accent1_300"); _system_accent1_300Ready = true; } return _system_accent1_300Content; } }
+            private static int _system_accent1_300Content = default;
+            private static bool _system_accent1_300Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_400"/>
+            /// </summary>
+            public static int system_accent1_400 { get { if (!_system_accent1_400Ready) { _system_accent1_400Content = SGetField<int>(LocalBridgeClazz, "system_accent1_400"); _system_accent1_400Ready = true; } return _system_accent1_400Content; } }
+            private static int _system_accent1_400Content = default;
+            private static bool _system_accent1_400Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_50"/>
+            /// </summary>
+            public static int system_accent1_50 { get { if (!_system_accent1_50Ready) { _system_accent1_50Content = SGetField<int>(LocalBridgeClazz, "system_accent1_50"); _system_accent1_50Ready = true; } return _system_accent1_50Content; } }
+            private static int _system_accent1_50Content = default;
+            private static bool _system_accent1_50Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_500"/>
+            /// </summary>
+            public static int system_accent1_500 { get { if (!_system_accent1_500Ready) { _system_accent1_500Content = SGetField<int>(LocalBridgeClazz, "system_accent1_500"); _system_accent1_500Ready = true; } return _system_accent1_500Content; } }
+            private static int _system_accent1_500Content = default;
+            private static bool _system_accent1_500Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_600"/>
+            /// </summary>
+            public static int system_accent1_600 { get { if (!_system_accent1_600Ready) { _system_accent1_600Content = SGetField<int>(LocalBridgeClazz, "system_accent1_600"); _system_accent1_600Ready = true; } return _system_accent1_600Content; } }
+            private static int _system_accent1_600Content = default;
+            private static bool _system_accent1_600Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_700"/>
+            /// </summary>
+            public static int system_accent1_700 { get { if (!_system_accent1_700Ready) { _system_accent1_700Content = SGetField<int>(LocalBridgeClazz, "system_accent1_700"); _system_accent1_700Ready = true; } return _system_accent1_700Content; } }
+            private static int _system_accent1_700Content = default;
+            private static bool _system_accent1_700Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_800"/>
+            /// </summary>
+            public static int system_accent1_800 { get { if (!_system_accent1_800Ready) { _system_accent1_800Content = SGetField<int>(LocalBridgeClazz, "system_accent1_800"); _system_accent1_800Ready = true; } return _system_accent1_800Content; } }
+            private static int _system_accent1_800Content = default;
+            private static bool _system_accent1_800Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent1_900"/>
+            /// </summary>
+            public static int system_accent1_900 { get { if (!_system_accent1_900Ready) { _system_accent1_900Content = SGetField<int>(LocalBridgeClazz, "system_accent1_900"); _system_accent1_900Ready = true; } return _system_accent1_900Content; } }
+            private static int _system_accent1_900Content = default;
+            private static bool _system_accent1_900Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_0"/>
+            /// </summary>
+            public static int system_accent2_0 { get { if (!_system_accent2_0Ready) { _system_accent2_0Content = SGetField<int>(LocalBridgeClazz, "system_accent2_0"); _system_accent2_0Ready = true; } return _system_accent2_0Content; } }
+            private static int _system_accent2_0Content = default;
+            private static bool _system_accent2_0Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_10"/>
+            /// </summary>
+            public static int system_accent2_10 { get { if (!_system_accent2_10Ready) { _system_accent2_10Content = SGetField<int>(LocalBridgeClazz, "system_accent2_10"); _system_accent2_10Ready = true; } return _system_accent2_10Content; } }
+            private static int _system_accent2_10Content = default;
+            private static bool _system_accent2_10Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_100"/>
+            /// </summary>
+            public static int system_accent2_100 { get { if (!_system_accent2_100Ready) { _system_accent2_100Content = SGetField<int>(LocalBridgeClazz, "system_accent2_100"); _system_accent2_100Ready = true; } return _system_accent2_100Content; } }
+            private static int _system_accent2_100Content = default;
+            private static bool _system_accent2_100Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_1000"/>
+            /// </summary>
+            public static int system_accent2_1000 { get { if (!_system_accent2_1000Ready) { _system_accent2_1000Content = SGetField<int>(LocalBridgeClazz, "system_accent2_1000"); _system_accent2_1000Ready = true; } return _system_accent2_1000Content; } }
+            private static int _system_accent2_1000Content = default;
+            private static bool _system_accent2_1000Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_200"/>
+            /// </summary>
+            public static int system_accent2_200 { get { if (!_system_accent2_200Ready) { _system_accent2_200Content = SGetField<int>(LocalBridgeClazz, "system_accent2_200"); _system_accent2_200Ready = true; } return _system_accent2_200Content; } }
+            private static int _system_accent2_200Content = default;
+            private static bool _system_accent2_200Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_300"/>
+            /// </summary>
+            public static int system_accent2_300 { get { if (!_system_accent2_300Ready) { _system_accent2_300Content = SGetField<int>(LocalBridgeClazz, "system_accent2_300"); _system_accent2_300Ready = true; } return _system_accent2_300Content; } }
+            private static int _system_accent2_300Content = default;
+            private static bool _system_accent2_300Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_400"/>
+            /// </summary>
+            public static int system_accent2_400 { get { if (!_system_accent2_400Ready) { _system_accent2_400Content = SGetField<int>(LocalBridgeClazz, "system_accent2_400"); _system_accent2_400Ready = true; } return _system_accent2_400Content; } }
+            private static int _system_accent2_400Content = default;
+            private static bool _system_accent2_400Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_50"/>
+            /// </summary>
+            public static int system_accent2_50 { get { if (!_system_accent2_50Ready) { _system_accent2_50Content = SGetField<int>(LocalBridgeClazz, "system_accent2_50"); _system_accent2_50Ready = true; } return _system_accent2_50Content; } }
+            private static int _system_accent2_50Content = default;
+            private static bool _system_accent2_50Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_500"/>
+            /// </summary>
+            public static int system_accent2_500 { get { if (!_system_accent2_500Ready) { _system_accent2_500Content = SGetField<int>(LocalBridgeClazz, "system_accent2_500"); _system_accent2_500Ready = true; } return _system_accent2_500Content; } }
+            private static int _system_accent2_500Content = default;
+            private static bool _system_accent2_500Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_600"/>
+            /// </summary>
+            public static int system_accent2_600 { get { if (!_system_accent2_600Ready) { _system_accent2_600Content = SGetField<int>(LocalBridgeClazz, "system_accent2_600"); _system_accent2_600Ready = true; } return _system_accent2_600Content; } }
+            private static int _system_accent2_600Content = default;
+            private static bool _system_accent2_600Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_700"/>
+            /// </summary>
+            public static int system_accent2_700 { get { if (!_system_accent2_700Ready) { _system_accent2_700Content = SGetField<int>(LocalBridgeClazz, "system_accent2_700"); _system_accent2_700Ready = true; } return _system_accent2_700Content; } }
+            private static int _system_accent2_700Content = default;
+            private static bool _system_accent2_700Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_800"/>
+            /// </summary>
+            public static int system_accent2_800 { get { if (!_system_accent2_800Ready) { _system_accent2_800Content = SGetField<int>(LocalBridgeClazz, "system_accent2_800"); _system_accent2_800Ready = true; } return _system_accent2_800Content; } }
+            private static int _system_accent2_800Content = default;
+            private static bool _system_accent2_800Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent2_900"/>
+            /// </summary>
+            public static int system_accent2_900 { get { if (!_system_accent2_900Ready) { _system_accent2_900Content = SGetField<int>(LocalBridgeClazz, "system_accent2_900"); _system_accent2_900Ready = true; } return _system_accent2_900Content; } }
+            private static int _system_accent2_900Content = default;
+            private static bool _system_accent2_900Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_0"/>
+            /// </summary>
+            public static int system_accent3_0 { get { if (!_system_accent3_0Ready) { _system_accent3_0Content = SGetField<int>(LocalBridgeClazz, "system_accent3_0"); _system_accent3_0Ready = true; } return _system_accent3_0Content; } }
+            private static int _system_accent3_0Content = default;
+            private static bool _system_accent3_0Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_10"/>
+            /// </summary>
+            public static int system_accent3_10 { get { if (!_system_accent3_10Ready) { _system_accent3_10Content = SGetField<int>(LocalBridgeClazz, "system_accent3_10"); _system_accent3_10Ready = true; } return _system_accent3_10Content; } }
+            private static int _system_accent3_10Content = default;
+            private static bool _system_accent3_10Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_100"/>
+            /// </summary>
+            public static int system_accent3_100 { get { if (!_system_accent3_100Ready) { _system_accent3_100Content = SGetField<int>(LocalBridgeClazz, "system_accent3_100"); _system_accent3_100Ready = true; } return _system_accent3_100Content; } }
+            private static int _system_accent3_100Content = default;
+            private static bool _system_accent3_100Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_1000"/>
+            /// </summary>
+            public static int system_accent3_1000 { get { if (!_system_accent3_1000Ready) { _system_accent3_1000Content = SGetField<int>(LocalBridgeClazz, "system_accent3_1000"); _system_accent3_1000Ready = true; } return _system_accent3_1000Content; } }
+            private static int _system_accent3_1000Content = default;
+            private static bool _system_accent3_1000Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_200"/>
+            /// </summary>
+            public static int system_accent3_200 { get { if (!_system_accent3_200Ready) { _system_accent3_200Content = SGetField<int>(LocalBridgeClazz, "system_accent3_200"); _system_accent3_200Ready = true; } return _system_accent3_200Content; } }
+            private static int _system_accent3_200Content = default;
+            private static bool _system_accent3_200Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_300"/>
+            /// </summary>
+            public static int system_accent3_300 { get { if (!_system_accent3_300Ready) { _system_accent3_300Content = SGetField<int>(LocalBridgeClazz, "system_accent3_300"); _system_accent3_300Ready = true; } return _system_accent3_300Content; } }
+            private static int _system_accent3_300Content = default;
+            private static bool _system_accent3_300Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_400"/>
+            /// </summary>
+            public static int system_accent3_400 { get { if (!_system_accent3_400Ready) { _system_accent3_400Content = SGetField<int>(LocalBridgeClazz, "system_accent3_400"); _system_accent3_400Ready = true; } return _system_accent3_400Content; } }
+            private static int _system_accent3_400Content = default;
+            private static bool _system_accent3_400Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_50"/>
+            /// </summary>
+            public static int system_accent3_50 { get { if (!_system_accent3_50Ready) { _system_accent3_50Content = SGetField<int>(LocalBridgeClazz, "system_accent3_50"); _system_accent3_50Ready = true; } return _system_accent3_50Content; } }
+            private static int _system_accent3_50Content = default;
+            private static bool _system_accent3_50Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_500"/>
+            /// </summary>
+            public static int system_accent3_500 { get { if (!_system_accent3_500Ready) { _system_accent3_500Content = SGetField<int>(LocalBridgeClazz, "system_accent3_500"); _system_accent3_500Ready = true; } return _system_accent3_500Content; } }
+            private static int _system_accent3_500Content = default;
+            private static bool _system_accent3_500Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_600"/>
+            /// </summary>
+            public static int system_accent3_600 { get { if (!_system_accent3_600Ready) { _system_accent3_600Content = SGetField<int>(LocalBridgeClazz, "system_accent3_600"); _system_accent3_600Ready = true; } return _system_accent3_600Content; } }
+            private static int _system_accent3_600Content = default;
+            private static bool _system_accent3_600Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_700"/>
+            /// </summary>
+            public static int system_accent3_700 { get { if (!_system_accent3_700Ready) { _system_accent3_700Content = SGetField<int>(LocalBridgeClazz, "system_accent3_700"); _system_accent3_700Ready = true; } return _system_accent3_700Content; } }
+            private static int _system_accent3_700Content = default;
+            private static bool _system_accent3_700Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_800"/>
+            /// </summary>
+            public static int system_accent3_800 { get { if (!_system_accent3_800Ready) { _system_accent3_800Content = SGetField<int>(LocalBridgeClazz, "system_accent3_800"); _system_accent3_800Ready = true; } return _system_accent3_800Content; } }
+            private static int _system_accent3_800Content = default;
+            private static bool _system_accent3_800Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_accent3_900"/>
+            /// </summary>
+            public static int system_accent3_900 { get { if (!_system_accent3_900Ready) { _system_accent3_900Content = SGetField<int>(LocalBridgeClazz, "system_accent3_900"); _system_accent3_900Ready = true; } return _system_accent3_900Content; } }
+            private static int _system_accent3_900Content = default;
+            private static bool _system_accent3_900Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_background_dark"/>
+            /// </summary>
+            public static int system_background_dark { get { if (!_system_background_darkReady) { _system_background_darkContent = SGetField<int>(LocalBridgeClazz, "system_background_dark"); _system_background_darkReady = true; } return _system_background_darkContent; } }
+            private static int _system_background_darkContent = default;
+            private static bool _system_background_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_background_light"/>
+            /// </summary>
+            public static int system_background_light { get { if (!_system_background_lightReady) { _system_background_lightContent = SGetField<int>(LocalBridgeClazz, "system_background_light"); _system_background_lightReady = true; } return _system_background_lightContent; } }
+            private static int _system_background_lightContent = default;
+            private static bool _system_background_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_control_activated_dark"/>
+            /// </summary>
+            public static int system_control_activated_dark { get { if (!_system_control_activated_darkReady) { _system_control_activated_darkContent = SGetField<int>(LocalBridgeClazz, "system_control_activated_dark"); _system_control_activated_darkReady = true; } return _system_control_activated_darkContent; } }
+            private static int _system_control_activated_darkContent = default;
+            private static bool _system_control_activated_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_control_activated_light"/>
+            /// </summary>
+            public static int system_control_activated_light { get { if (!_system_control_activated_lightReady) { _system_control_activated_lightContent = SGetField<int>(LocalBridgeClazz, "system_control_activated_light"); _system_control_activated_lightReady = true; } return _system_control_activated_lightContent; } }
+            private static int _system_control_activated_lightContent = default;
+            private static bool _system_control_activated_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_control_highlight_dark"/>
+            /// </summary>
+            public static int system_control_highlight_dark { get { if (!_system_control_highlight_darkReady) { _system_control_highlight_darkContent = SGetField<int>(LocalBridgeClazz, "system_control_highlight_dark"); _system_control_highlight_darkReady = true; } return _system_control_highlight_darkContent; } }
+            private static int _system_control_highlight_darkContent = default;
+            private static bool _system_control_highlight_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_control_highlight_light"/>
+            /// </summary>
+            public static int system_control_highlight_light { get { if (!_system_control_highlight_lightReady) { _system_control_highlight_lightContent = SGetField<int>(LocalBridgeClazz, "system_control_highlight_light"); _system_control_highlight_lightReady = true; } return _system_control_highlight_lightContent; } }
+            private static int _system_control_highlight_lightContent = default;
+            private static bool _system_control_highlight_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_control_normal_dark"/>
+            /// </summary>
+            public static int system_control_normal_dark { get { if (!_system_control_normal_darkReady) { _system_control_normal_darkContent = SGetField<int>(LocalBridgeClazz, "system_control_normal_dark"); _system_control_normal_darkReady = true; } return _system_control_normal_darkContent; } }
+            private static int _system_control_normal_darkContent = default;
+            private static bool _system_control_normal_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_control_normal_light"/>
+            /// </summary>
+            public static int system_control_normal_light { get { if (!_system_control_normal_lightReady) { _system_control_normal_lightContent = SGetField<int>(LocalBridgeClazz, "system_control_normal_light"); _system_control_normal_lightReady = true; } return _system_control_normal_lightContent; } }
+            private static int _system_control_normal_lightContent = default;
+            private static bool _system_control_normal_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_error_container_dark"/>
+            /// </summary>
+            public static int system_error_container_dark { get { if (!_system_error_container_darkReady) { _system_error_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_error_container_dark"); _system_error_container_darkReady = true; } return _system_error_container_darkContent; } }
+            private static int _system_error_container_darkContent = default;
+            private static bool _system_error_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_error_container_light"/>
+            /// </summary>
+            public static int system_error_container_light { get { if (!_system_error_container_lightReady) { _system_error_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_error_container_light"); _system_error_container_lightReady = true; } return _system_error_container_lightContent; } }
+            private static int _system_error_container_lightContent = default;
+            private static bool _system_error_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_error_dark"/>
+            /// </summary>
+            public static int system_error_dark { get { if (!_system_error_darkReady) { _system_error_darkContent = SGetField<int>(LocalBridgeClazz, "system_error_dark"); _system_error_darkReady = true; } return _system_error_darkContent; } }
+            private static int _system_error_darkContent = default;
+            private static bool _system_error_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_error_light"/>
+            /// </summary>
+            public static int system_error_light { get { if (!_system_error_lightReady) { _system_error_lightContent = SGetField<int>(LocalBridgeClazz, "system_error_light"); _system_error_lightReady = true; } return _system_error_lightContent; } }
+            private static int _system_error_lightContent = default;
+            private static bool _system_error_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_0"/>
+            /// </summary>
+            public static int system_neutral1_0 { get { if (!_system_neutral1_0Ready) { _system_neutral1_0Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_0"); _system_neutral1_0Ready = true; } return _system_neutral1_0Content; } }
+            private static int _system_neutral1_0Content = default;
+            private static bool _system_neutral1_0Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_10"/>
+            /// </summary>
+            public static int system_neutral1_10 { get { if (!_system_neutral1_10Ready) { _system_neutral1_10Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_10"); _system_neutral1_10Ready = true; } return _system_neutral1_10Content; } }
+            private static int _system_neutral1_10Content = default;
+            private static bool _system_neutral1_10Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_100"/>
+            /// </summary>
+            public static int system_neutral1_100 { get { if (!_system_neutral1_100Ready) { _system_neutral1_100Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_100"); _system_neutral1_100Ready = true; } return _system_neutral1_100Content; } }
+            private static int _system_neutral1_100Content = default;
+            private static bool _system_neutral1_100Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_1000"/>
+            /// </summary>
+            public static int system_neutral1_1000 { get { if (!_system_neutral1_1000Ready) { _system_neutral1_1000Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_1000"); _system_neutral1_1000Ready = true; } return _system_neutral1_1000Content; } }
+            private static int _system_neutral1_1000Content = default;
+            private static bool _system_neutral1_1000Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_200"/>
+            /// </summary>
+            public static int system_neutral1_200 { get { if (!_system_neutral1_200Ready) { _system_neutral1_200Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_200"); _system_neutral1_200Ready = true; } return _system_neutral1_200Content; } }
+            private static int _system_neutral1_200Content = default;
+            private static bool _system_neutral1_200Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_300"/>
+            /// </summary>
+            public static int system_neutral1_300 { get { if (!_system_neutral1_300Ready) { _system_neutral1_300Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_300"); _system_neutral1_300Ready = true; } return _system_neutral1_300Content; } }
+            private static int _system_neutral1_300Content = default;
+            private static bool _system_neutral1_300Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_400"/>
+            /// </summary>
+            public static int system_neutral1_400 { get { if (!_system_neutral1_400Ready) { _system_neutral1_400Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_400"); _system_neutral1_400Ready = true; } return _system_neutral1_400Content; } }
+            private static int _system_neutral1_400Content = default;
+            private static bool _system_neutral1_400Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_50"/>
+            /// </summary>
+            public static int system_neutral1_50 { get { if (!_system_neutral1_50Ready) { _system_neutral1_50Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_50"); _system_neutral1_50Ready = true; } return _system_neutral1_50Content; } }
+            private static int _system_neutral1_50Content = default;
+            private static bool _system_neutral1_50Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_500"/>
+            /// </summary>
+            public static int system_neutral1_500 { get { if (!_system_neutral1_500Ready) { _system_neutral1_500Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_500"); _system_neutral1_500Ready = true; } return _system_neutral1_500Content; } }
+            private static int _system_neutral1_500Content = default;
+            private static bool _system_neutral1_500Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_600"/>
+            /// </summary>
+            public static int system_neutral1_600 { get { if (!_system_neutral1_600Ready) { _system_neutral1_600Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_600"); _system_neutral1_600Ready = true; } return _system_neutral1_600Content; } }
+            private static int _system_neutral1_600Content = default;
+            private static bool _system_neutral1_600Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_700"/>
+            /// </summary>
+            public static int system_neutral1_700 { get { if (!_system_neutral1_700Ready) { _system_neutral1_700Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_700"); _system_neutral1_700Ready = true; } return _system_neutral1_700Content; } }
+            private static int _system_neutral1_700Content = default;
+            private static bool _system_neutral1_700Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_800"/>
+            /// </summary>
+            public static int system_neutral1_800 { get { if (!_system_neutral1_800Ready) { _system_neutral1_800Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_800"); _system_neutral1_800Ready = true; } return _system_neutral1_800Content; } }
+            private static int _system_neutral1_800Content = default;
+            private static bool _system_neutral1_800Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral1_900"/>
+            /// </summary>
+            public static int system_neutral1_900 { get { if (!_system_neutral1_900Ready) { _system_neutral1_900Content = SGetField<int>(LocalBridgeClazz, "system_neutral1_900"); _system_neutral1_900Ready = true; } return _system_neutral1_900Content; } }
+            private static int _system_neutral1_900Content = default;
+            private static bool _system_neutral1_900Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_0"/>
+            /// </summary>
+            public static int system_neutral2_0 { get { if (!_system_neutral2_0Ready) { _system_neutral2_0Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_0"); _system_neutral2_0Ready = true; } return _system_neutral2_0Content; } }
+            private static int _system_neutral2_0Content = default;
+            private static bool _system_neutral2_0Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_10"/>
+            /// </summary>
+            public static int system_neutral2_10 { get { if (!_system_neutral2_10Ready) { _system_neutral2_10Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_10"); _system_neutral2_10Ready = true; } return _system_neutral2_10Content; } }
+            private static int _system_neutral2_10Content = default;
+            private static bool _system_neutral2_10Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_100"/>
+            /// </summary>
+            public static int system_neutral2_100 { get { if (!_system_neutral2_100Ready) { _system_neutral2_100Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_100"); _system_neutral2_100Ready = true; } return _system_neutral2_100Content; } }
+            private static int _system_neutral2_100Content = default;
+            private static bool _system_neutral2_100Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_1000"/>
+            /// </summary>
+            public static int system_neutral2_1000 { get { if (!_system_neutral2_1000Ready) { _system_neutral2_1000Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_1000"); _system_neutral2_1000Ready = true; } return _system_neutral2_1000Content; } }
+            private static int _system_neutral2_1000Content = default;
+            private static bool _system_neutral2_1000Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_200"/>
+            /// </summary>
+            public static int system_neutral2_200 { get { if (!_system_neutral2_200Ready) { _system_neutral2_200Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_200"); _system_neutral2_200Ready = true; } return _system_neutral2_200Content; } }
+            private static int _system_neutral2_200Content = default;
+            private static bool _system_neutral2_200Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_300"/>
+            /// </summary>
+            public static int system_neutral2_300 { get { if (!_system_neutral2_300Ready) { _system_neutral2_300Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_300"); _system_neutral2_300Ready = true; } return _system_neutral2_300Content; } }
+            private static int _system_neutral2_300Content = default;
+            private static bool _system_neutral2_300Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_400"/>
+            /// </summary>
+            public static int system_neutral2_400 { get { if (!_system_neutral2_400Ready) { _system_neutral2_400Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_400"); _system_neutral2_400Ready = true; } return _system_neutral2_400Content; } }
+            private static int _system_neutral2_400Content = default;
+            private static bool _system_neutral2_400Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_50"/>
+            /// </summary>
+            public static int system_neutral2_50 { get { if (!_system_neutral2_50Ready) { _system_neutral2_50Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_50"); _system_neutral2_50Ready = true; } return _system_neutral2_50Content; } }
+            private static int _system_neutral2_50Content = default;
+            private static bool _system_neutral2_50Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_500"/>
+            /// </summary>
+            public static int system_neutral2_500 { get { if (!_system_neutral2_500Ready) { _system_neutral2_500Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_500"); _system_neutral2_500Ready = true; } return _system_neutral2_500Content; } }
+            private static int _system_neutral2_500Content = default;
+            private static bool _system_neutral2_500Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_600"/>
+            /// </summary>
+            public static int system_neutral2_600 { get { if (!_system_neutral2_600Ready) { _system_neutral2_600Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_600"); _system_neutral2_600Ready = true; } return _system_neutral2_600Content; } }
+            private static int _system_neutral2_600Content = default;
+            private static bool _system_neutral2_600Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_700"/>
+            /// </summary>
+            public static int system_neutral2_700 { get { if (!_system_neutral2_700Ready) { _system_neutral2_700Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_700"); _system_neutral2_700Ready = true; } return _system_neutral2_700Content; } }
+            private static int _system_neutral2_700Content = default;
+            private static bool _system_neutral2_700Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_800"/>
+            /// </summary>
+            public static int system_neutral2_800 { get { if (!_system_neutral2_800Ready) { _system_neutral2_800Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_800"); _system_neutral2_800Ready = true; } return _system_neutral2_800Content; } }
+            private static int _system_neutral2_800Content = default;
+            private static bool _system_neutral2_800Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_neutral2_900"/>
+            /// </summary>
+            public static int system_neutral2_900 { get { if (!_system_neutral2_900Ready) { _system_neutral2_900Content = SGetField<int>(LocalBridgeClazz, "system_neutral2_900"); _system_neutral2_900Ready = true; } return _system_neutral2_900Content; } }
+            private static int _system_neutral2_900Content = default;
+            private static bool _system_neutral2_900Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_background_dark"/>
+            /// </summary>
+            public static int system_on_background_dark { get { if (!_system_on_background_darkReady) { _system_on_background_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_background_dark"); _system_on_background_darkReady = true; } return _system_on_background_darkContent; } }
+            private static int _system_on_background_darkContent = default;
+            private static bool _system_on_background_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_background_light"/>
+            /// </summary>
+            public static int system_on_background_light { get { if (!_system_on_background_lightReady) { _system_on_background_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_background_light"); _system_on_background_lightReady = true; } return _system_on_background_lightContent; } }
+            private static int _system_on_background_lightContent = default;
+            private static bool _system_on_background_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_error_container_dark"/>
+            /// </summary>
+            public static int system_on_error_container_dark { get { if (!_system_on_error_container_darkReady) { _system_on_error_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_error_container_dark"); _system_on_error_container_darkReady = true; } return _system_on_error_container_darkContent; } }
+            private static int _system_on_error_container_darkContent = default;
+            private static bool _system_on_error_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_error_container_light"/>
+            /// </summary>
+            public static int system_on_error_container_light { get { if (!_system_on_error_container_lightReady) { _system_on_error_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_error_container_light"); _system_on_error_container_lightReady = true; } return _system_on_error_container_lightContent; } }
+            private static int _system_on_error_container_lightContent = default;
+            private static bool _system_on_error_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_error_dark"/>
+            /// </summary>
+            public static int system_on_error_dark { get { if (!_system_on_error_darkReady) { _system_on_error_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_error_dark"); _system_on_error_darkReady = true; } return _system_on_error_darkContent; } }
+            private static int _system_on_error_darkContent = default;
+            private static bool _system_on_error_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_error_light"/>
+            /// </summary>
+            public static int system_on_error_light { get { if (!_system_on_error_lightReady) { _system_on_error_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_error_light"); _system_on_error_lightReady = true; } return _system_on_error_lightContent; } }
+            private static int _system_on_error_lightContent = default;
+            private static bool _system_on_error_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_primary_container_dark"/>
+            /// </summary>
+            public static int system_on_primary_container_dark { get { if (!_system_on_primary_container_darkReady) { _system_on_primary_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_primary_container_dark"); _system_on_primary_container_darkReady = true; } return _system_on_primary_container_darkContent; } }
+            private static int _system_on_primary_container_darkContent = default;
+            private static bool _system_on_primary_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_primary_container_light"/>
+            /// </summary>
+            public static int system_on_primary_container_light { get { if (!_system_on_primary_container_lightReady) { _system_on_primary_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_primary_container_light"); _system_on_primary_container_lightReady = true; } return _system_on_primary_container_lightContent; } }
+            private static int _system_on_primary_container_lightContent = default;
+            private static bool _system_on_primary_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_primary_dark"/>
+            /// </summary>
+            public static int system_on_primary_dark { get { if (!_system_on_primary_darkReady) { _system_on_primary_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_primary_dark"); _system_on_primary_darkReady = true; } return _system_on_primary_darkContent; } }
+            private static int _system_on_primary_darkContent = default;
+            private static bool _system_on_primary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_primary_fixed"/>
+            /// </summary>
+            public static int system_on_primary_fixed { get { if (!_system_on_primary_fixedReady) { _system_on_primary_fixedContent = SGetField<int>(LocalBridgeClazz, "system_on_primary_fixed"); _system_on_primary_fixedReady = true; } return _system_on_primary_fixedContent; } }
+            private static int _system_on_primary_fixedContent = default;
+            private static bool _system_on_primary_fixedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_primary_fixed_variant"/>
+            /// </summary>
+            public static int system_on_primary_fixed_variant { get { if (!_system_on_primary_fixed_variantReady) { _system_on_primary_fixed_variantContent = SGetField<int>(LocalBridgeClazz, "system_on_primary_fixed_variant"); _system_on_primary_fixed_variantReady = true; } return _system_on_primary_fixed_variantContent; } }
+            private static int _system_on_primary_fixed_variantContent = default;
+            private static bool _system_on_primary_fixed_variantReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_primary_light"/>
+            /// </summary>
+            public static int system_on_primary_light { get { if (!_system_on_primary_lightReady) { _system_on_primary_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_primary_light"); _system_on_primary_lightReady = true; } return _system_on_primary_lightContent; } }
+            private static int _system_on_primary_lightContent = default;
+            private static bool _system_on_primary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_secondary_container_dark"/>
+            /// </summary>
+            public static int system_on_secondary_container_dark { get { if (!_system_on_secondary_container_darkReady) { _system_on_secondary_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_secondary_container_dark"); _system_on_secondary_container_darkReady = true; } return _system_on_secondary_container_darkContent; } }
+            private static int _system_on_secondary_container_darkContent = default;
+            private static bool _system_on_secondary_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_secondary_container_light"/>
+            /// </summary>
+            public static int system_on_secondary_container_light { get { if (!_system_on_secondary_container_lightReady) { _system_on_secondary_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_secondary_container_light"); _system_on_secondary_container_lightReady = true; } return _system_on_secondary_container_lightContent; } }
+            private static int _system_on_secondary_container_lightContent = default;
+            private static bool _system_on_secondary_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_secondary_dark"/>
+            /// </summary>
+            public static int system_on_secondary_dark { get { if (!_system_on_secondary_darkReady) { _system_on_secondary_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_secondary_dark"); _system_on_secondary_darkReady = true; } return _system_on_secondary_darkContent; } }
+            private static int _system_on_secondary_darkContent = default;
+            private static bool _system_on_secondary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_secondary_fixed"/>
+            /// </summary>
+            public static int system_on_secondary_fixed { get { if (!_system_on_secondary_fixedReady) { _system_on_secondary_fixedContent = SGetField<int>(LocalBridgeClazz, "system_on_secondary_fixed"); _system_on_secondary_fixedReady = true; } return _system_on_secondary_fixedContent; } }
+            private static int _system_on_secondary_fixedContent = default;
+            private static bool _system_on_secondary_fixedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_secondary_fixed_variant"/>
+            /// </summary>
+            public static int system_on_secondary_fixed_variant { get { if (!_system_on_secondary_fixed_variantReady) { _system_on_secondary_fixed_variantContent = SGetField<int>(LocalBridgeClazz, "system_on_secondary_fixed_variant"); _system_on_secondary_fixed_variantReady = true; } return _system_on_secondary_fixed_variantContent; } }
+            private static int _system_on_secondary_fixed_variantContent = default;
+            private static bool _system_on_secondary_fixed_variantReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_secondary_light"/>
+            /// </summary>
+            public static int system_on_secondary_light { get { if (!_system_on_secondary_lightReady) { _system_on_secondary_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_secondary_light"); _system_on_secondary_lightReady = true; } return _system_on_secondary_lightContent; } }
+            private static int _system_on_secondary_lightContent = default;
+            private static bool _system_on_secondary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_surface_dark"/>
+            /// </summary>
+            public static int system_on_surface_dark { get { if (!_system_on_surface_darkReady) { _system_on_surface_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_surface_dark"); _system_on_surface_darkReady = true; } return _system_on_surface_darkContent; } }
+            private static int _system_on_surface_darkContent = default;
+            private static bool _system_on_surface_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_surface_light"/>
+            /// </summary>
+            public static int system_on_surface_light { get { if (!_system_on_surface_lightReady) { _system_on_surface_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_surface_light"); _system_on_surface_lightReady = true; } return _system_on_surface_lightContent; } }
+            private static int _system_on_surface_lightContent = default;
+            private static bool _system_on_surface_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_surface_variant_dark"/>
+            /// </summary>
+            public static int system_on_surface_variant_dark { get { if (!_system_on_surface_variant_darkReady) { _system_on_surface_variant_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_surface_variant_dark"); _system_on_surface_variant_darkReady = true; } return _system_on_surface_variant_darkContent; } }
+            private static int _system_on_surface_variant_darkContent = default;
+            private static bool _system_on_surface_variant_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_surface_variant_light"/>
+            /// </summary>
+            public static int system_on_surface_variant_light { get { if (!_system_on_surface_variant_lightReady) { _system_on_surface_variant_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_surface_variant_light"); _system_on_surface_variant_lightReady = true; } return _system_on_surface_variant_lightContent; } }
+            private static int _system_on_surface_variant_lightContent = default;
+            private static bool _system_on_surface_variant_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_tertiary_container_dark"/>
+            /// </summary>
+            public static int system_on_tertiary_container_dark { get { if (!_system_on_tertiary_container_darkReady) { _system_on_tertiary_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_tertiary_container_dark"); _system_on_tertiary_container_darkReady = true; } return _system_on_tertiary_container_darkContent; } }
+            private static int _system_on_tertiary_container_darkContent = default;
+            private static bool _system_on_tertiary_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_tertiary_container_light"/>
+            /// </summary>
+            public static int system_on_tertiary_container_light { get { if (!_system_on_tertiary_container_lightReady) { _system_on_tertiary_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_tertiary_container_light"); _system_on_tertiary_container_lightReady = true; } return _system_on_tertiary_container_lightContent; } }
+            private static int _system_on_tertiary_container_lightContent = default;
+            private static bool _system_on_tertiary_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_tertiary_dark"/>
+            /// </summary>
+            public static int system_on_tertiary_dark { get { if (!_system_on_tertiary_darkReady) { _system_on_tertiary_darkContent = SGetField<int>(LocalBridgeClazz, "system_on_tertiary_dark"); _system_on_tertiary_darkReady = true; } return _system_on_tertiary_darkContent; } }
+            private static int _system_on_tertiary_darkContent = default;
+            private static bool _system_on_tertiary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_tertiary_fixed"/>
+            /// </summary>
+            public static int system_on_tertiary_fixed { get { if (!_system_on_tertiary_fixedReady) { _system_on_tertiary_fixedContent = SGetField<int>(LocalBridgeClazz, "system_on_tertiary_fixed"); _system_on_tertiary_fixedReady = true; } return _system_on_tertiary_fixedContent; } }
+            private static int _system_on_tertiary_fixedContent = default;
+            private static bool _system_on_tertiary_fixedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_tertiary_fixed_variant"/>
+            /// </summary>
+            public static int system_on_tertiary_fixed_variant { get { if (!_system_on_tertiary_fixed_variantReady) { _system_on_tertiary_fixed_variantContent = SGetField<int>(LocalBridgeClazz, "system_on_tertiary_fixed_variant"); _system_on_tertiary_fixed_variantReady = true; } return _system_on_tertiary_fixed_variantContent; } }
+            private static int _system_on_tertiary_fixed_variantContent = default;
+            private static bool _system_on_tertiary_fixed_variantReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_on_tertiary_light"/>
+            /// </summary>
+            public static int system_on_tertiary_light { get { if (!_system_on_tertiary_lightReady) { _system_on_tertiary_lightContent = SGetField<int>(LocalBridgeClazz, "system_on_tertiary_light"); _system_on_tertiary_lightReady = true; } return _system_on_tertiary_lightContent; } }
+            private static int _system_on_tertiary_lightContent = default;
+            private static bool _system_on_tertiary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_outline_dark"/>
+            /// </summary>
+            public static int system_outline_dark { get { if (!_system_outline_darkReady) { _system_outline_darkContent = SGetField<int>(LocalBridgeClazz, "system_outline_dark"); _system_outline_darkReady = true; } return _system_outline_darkContent; } }
+            private static int _system_outline_darkContent = default;
+            private static bool _system_outline_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_outline_light"/>
+            /// </summary>
+            public static int system_outline_light { get { if (!_system_outline_lightReady) { _system_outline_lightContent = SGetField<int>(LocalBridgeClazz, "system_outline_light"); _system_outline_lightReady = true; } return _system_outline_lightContent; } }
+            private static int _system_outline_lightContent = default;
+            private static bool _system_outline_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_outline_variant_dark"/>
+            /// </summary>
+            public static int system_outline_variant_dark { get { if (!_system_outline_variant_darkReady) { _system_outline_variant_darkContent = SGetField<int>(LocalBridgeClazz, "system_outline_variant_dark"); _system_outline_variant_darkReady = true; } return _system_outline_variant_darkContent; } }
+            private static int _system_outline_variant_darkContent = default;
+            private static bool _system_outline_variant_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_outline_variant_light"/>
+            /// </summary>
+            public static int system_outline_variant_light { get { if (!_system_outline_variant_lightReady) { _system_outline_variant_lightContent = SGetField<int>(LocalBridgeClazz, "system_outline_variant_light"); _system_outline_variant_lightReady = true; } return _system_outline_variant_lightContent; } }
+            private static int _system_outline_variant_lightContent = default;
+            private static bool _system_outline_variant_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_neutral_dark"/>
+            /// </summary>
+            public static int system_palette_key_color_neutral_dark { get { if (!_system_palette_key_color_neutral_darkReady) { _system_palette_key_color_neutral_darkContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_neutral_dark"); _system_palette_key_color_neutral_darkReady = true; } return _system_palette_key_color_neutral_darkContent; } }
+            private static int _system_palette_key_color_neutral_darkContent = default;
+            private static bool _system_palette_key_color_neutral_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_neutral_light"/>
+            /// </summary>
+            public static int system_palette_key_color_neutral_light { get { if (!_system_palette_key_color_neutral_lightReady) { _system_palette_key_color_neutral_lightContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_neutral_light"); _system_palette_key_color_neutral_lightReady = true; } return _system_palette_key_color_neutral_lightContent; } }
+            private static int _system_palette_key_color_neutral_lightContent = default;
+            private static bool _system_palette_key_color_neutral_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_neutral_variant_dark"/>
+            /// </summary>
+            public static int system_palette_key_color_neutral_variant_dark { get { if (!_system_palette_key_color_neutral_variant_darkReady) { _system_palette_key_color_neutral_variant_darkContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_neutral_variant_dark"); _system_palette_key_color_neutral_variant_darkReady = true; } return _system_palette_key_color_neutral_variant_darkContent; } }
+            private static int _system_palette_key_color_neutral_variant_darkContent = default;
+            private static bool _system_palette_key_color_neutral_variant_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_neutral_variant_light"/>
+            /// </summary>
+            public static int system_palette_key_color_neutral_variant_light { get { if (!_system_palette_key_color_neutral_variant_lightReady) { _system_palette_key_color_neutral_variant_lightContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_neutral_variant_light"); _system_palette_key_color_neutral_variant_lightReady = true; } return _system_palette_key_color_neutral_variant_lightContent; } }
+            private static int _system_palette_key_color_neutral_variant_lightContent = default;
+            private static bool _system_palette_key_color_neutral_variant_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_primary_dark"/>
+            /// </summary>
+            public static int system_palette_key_color_primary_dark { get { if (!_system_palette_key_color_primary_darkReady) { _system_palette_key_color_primary_darkContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_primary_dark"); _system_palette_key_color_primary_darkReady = true; } return _system_palette_key_color_primary_darkContent; } }
+            private static int _system_palette_key_color_primary_darkContent = default;
+            private static bool _system_palette_key_color_primary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_primary_light"/>
+            /// </summary>
+            public static int system_palette_key_color_primary_light { get { if (!_system_palette_key_color_primary_lightReady) { _system_palette_key_color_primary_lightContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_primary_light"); _system_palette_key_color_primary_lightReady = true; } return _system_palette_key_color_primary_lightContent; } }
+            private static int _system_palette_key_color_primary_lightContent = default;
+            private static bool _system_palette_key_color_primary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_secondary_dark"/>
+            /// </summary>
+            public static int system_palette_key_color_secondary_dark { get { if (!_system_palette_key_color_secondary_darkReady) { _system_palette_key_color_secondary_darkContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_secondary_dark"); _system_palette_key_color_secondary_darkReady = true; } return _system_palette_key_color_secondary_darkContent; } }
+            private static int _system_palette_key_color_secondary_darkContent = default;
+            private static bool _system_palette_key_color_secondary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_secondary_light"/>
+            /// </summary>
+            public static int system_palette_key_color_secondary_light { get { if (!_system_palette_key_color_secondary_lightReady) { _system_palette_key_color_secondary_lightContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_secondary_light"); _system_palette_key_color_secondary_lightReady = true; } return _system_palette_key_color_secondary_lightContent; } }
+            private static int _system_palette_key_color_secondary_lightContent = default;
+            private static bool _system_palette_key_color_secondary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_tertiary_dark"/>
+            /// </summary>
+            public static int system_palette_key_color_tertiary_dark { get { if (!_system_palette_key_color_tertiary_darkReady) { _system_palette_key_color_tertiary_darkContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_tertiary_dark"); _system_palette_key_color_tertiary_darkReady = true; } return _system_palette_key_color_tertiary_darkContent; } }
+            private static int _system_palette_key_color_tertiary_darkContent = default;
+            private static bool _system_palette_key_color_tertiary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_palette_key_color_tertiary_light"/>
+            /// </summary>
+            public static int system_palette_key_color_tertiary_light { get { if (!_system_palette_key_color_tertiary_lightReady) { _system_palette_key_color_tertiary_lightContent = SGetField<int>(LocalBridgeClazz, "system_palette_key_color_tertiary_light"); _system_palette_key_color_tertiary_lightReady = true; } return _system_palette_key_color_tertiary_lightContent; } }
+            private static int _system_palette_key_color_tertiary_lightContent = default;
+            private static bool _system_palette_key_color_tertiary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_primary_container_dark"/>
+            /// </summary>
+            public static int system_primary_container_dark { get { if (!_system_primary_container_darkReady) { _system_primary_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_primary_container_dark"); _system_primary_container_darkReady = true; } return _system_primary_container_darkContent; } }
+            private static int _system_primary_container_darkContent = default;
+            private static bool _system_primary_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_primary_container_light"/>
+            /// </summary>
+            public static int system_primary_container_light { get { if (!_system_primary_container_lightReady) { _system_primary_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_primary_container_light"); _system_primary_container_lightReady = true; } return _system_primary_container_lightContent; } }
+            private static int _system_primary_container_lightContent = default;
+            private static bool _system_primary_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_primary_dark"/>
+            /// </summary>
+            public static int system_primary_dark { get { if (!_system_primary_darkReady) { _system_primary_darkContent = SGetField<int>(LocalBridgeClazz, "system_primary_dark"); _system_primary_darkReady = true; } return _system_primary_darkContent; } }
+            private static int _system_primary_darkContent = default;
+            private static bool _system_primary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_primary_fixed"/>
+            /// </summary>
+            public static int system_primary_fixed { get { if (!_system_primary_fixedReady) { _system_primary_fixedContent = SGetField<int>(LocalBridgeClazz, "system_primary_fixed"); _system_primary_fixedReady = true; } return _system_primary_fixedContent; } }
+            private static int _system_primary_fixedContent = default;
+            private static bool _system_primary_fixedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_primary_fixed_dim"/>
+            /// </summary>
+            public static int system_primary_fixed_dim { get { if (!_system_primary_fixed_dimReady) { _system_primary_fixed_dimContent = SGetField<int>(LocalBridgeClazz, "system_primary_fixed_dim"); _system_primary_fixed_dimReady = true; } return _system_primary_fixed_dimContent; } }
+            private static int _system_primary_fixed_dimContent = default;
+            private static bool _system_primary_fixed_dimReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_primary_light"/>
+            /// </summary>
+            public static int system_primary_light { get { if (!_system_primary_lightReady) { _system_primary_lightContent = SGetField<int>(LocalBridgeClazz, "system_primary_light"); _system_primary_lightReady = true; } return _system_primary_lightContent; } }
+            private static int _system_primary_lightContent = default;
+            private static bool _system_primary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_secondary_container_dark"/>
+            /// </summary>
+            public static int system_secondary_container_dark { get { if (!_system_secondary_container_darkReady) { _system_secondary_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_secondary_container_dark"); _system_secondary_container_darkReady = true; } return _system_secondary_container_darkContent; } }
+            private static int _system_secondary_container_darkContent = default;
+            private static bool _system_secondary_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_secondary_container_light"/>
+            /// </summary>
+            public static int system_secondary_container_light { get { if (!_system_secondary_container_lightReady) { _system_secondary_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_secondary_container_light"); _system_secondary_container_lightReady = true; } return _system_secondary_container_lightContent; } }
+            private static int _system_secondary_container_lightContent = default;
+            private static bool _system_secondary_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_secondary_dark"/>
+            /// </summary>
+            public static int system_secondary_dark { get { if (!_system_secondary_darkReady) { _system_secondary_darkContent = SGetField<int>(LocalBridgeClazz, "system_secondary_dark"); _system_secondary_darkReady = true; } return _system_secondary_darkContent; } }
+            private static int _system_secondary_darkContent = default;
+            private static bool _system_secondary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_secondary_fixed"/>
+            /// </summary>
+            public static int system_secondary_fixed { get { if (!_system_secondary_fixedReady) { _system_secondary_fixedContent = SGetField<int>(LocalBridgeClazz, "system_secondary_fixed"); _system_secondary_fixedReady = true; } return _system_secondary_fixedContent; } }
+            private static int _system_secondary_fixedContent = default;
+            private static bool _system_secondary_fixedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_secondary_fixed_dim"/>
+            /// </summary>
+            public static int system_secondary_fixed_dim { get { if (!_system_secondary_fixed_dimReady) { _system_secondary_fixed_dimContent = SGetField<int>(LocalBridgeClazz, "system_secondary_fixed_dim"); _system_secondary_fixed_dimReady = true; } return _system_secondary_fixed_dimContent; } }
+            private static int _system_secondary_fixed_dimContent = default;
+            private static bool _system_secondary_fixed_dimReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_secondary_light"/>
+            /// </summary>
+            public static int system_secondary_light { get { if (!_system_secondary_lightReady) { _system_secondary_lightContent = SGetField<int>(LocalBridgeClazz, "system_secondary_light"); _system_secondary_lightReady = true; } return _system_secondary_lightContent; } }
+            private static int _system_secondary_lightContent = default;
+            private static bool _system_secondary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_bright_dark"/>
+            /// </summary>
+            public static int system_surface_bright_dark { get { if (!_system_surface_bright_darkReady) { _system_surface_bright_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_bright_dark"); _system_surface_bright_darkReady = true; } return _system_surface_bright_darkContent; } }
+            private static int _system_surface_bright_darkContent = default;
+            private static bool _system_surface_bright_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_bright_light"/>
+            /// </summary>
+            public static int system_surface_bright_light { get { if (!_system_surface_bright_lightReady) { _system_surface_bright_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_bright_light"); _system_surface_bright_lightReady = true; } return _system_surface_bright_lightContent; } }
+            private static int _system_surface_bright_lightContent = default;
+            private static bool _system_surface_bright_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_dark"/>
+            /// </summary>
+            public static int system_surface_container_dark { get { if (!_system_surface_container_darkReady) { _system_surface_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_dark"); _system_surface_container_darkReady = true; } return _system_surface_container_darkContent; } }
+            private static int _system_surface_container_darkContent = default;
+            private static bool _system_surface_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_high_dark"/>
+            /// </summary>
+            public static int system_surface_container_high_dark { get { if (!_system_surface_container_high_darkReady) { _system_surface_container_high_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_high_dark"); _system_surface_container_high_darkReady = true; } return _system_surface_container_high_darkContent; } }
+            private static int _system_surface_container_high_darkContent = default;
+            private static bool _system_surface_container_high_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_high_light"/>
+            /// </summary>
+            public static int system_surface_container_high_light { get { if (!_system_surface_container_high_lightReady) { _system_surface_container_high_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_high_light"); _system_surface_container_high_lightReady = true; } return _system_surface_container_high_lightContent; } }
+            private static int _system_surface_container_high_lightContent = default;
+            private static bool _system_surface_container_high_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_highest_dark"/>
+            /// </summary>
+            public static int system_surface_container_highest_dark { get { if (!_system_surface_container_highest_darkReady) { _system_surface_container_highest_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_highest_dark"); _system_surface_container_highest_darkReady = true; } return _system_surface_container_highest_darkContent; } }
+            private static int _system_surface_container_highest_darkContent = default;
+            private static bool _system_surface_container_highest_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_highest_light"/>
+            /// </summary>
+            public static int system_surface_container_highest_light { get { if (!_system_surface_container_highest_lightReady) { _system_surface_container_highest_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_highest_light"); _system_surface_container_highest_lightReady = true; } return _system_surface_container_highest_lightContent; } }
+            private static int _system_surface_container_highest_lightContent = default;
+            private static bool _system_surface_container_highest_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_light"/>
+            /// </summary>
+            public static int system_surface_container_light { get { if (!_system_surface_container_lightReady) { _system_surface_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_light"); _system_surface_container_lightReady = true; } return _system_surface_container_lightContent; } }
+            private static int _system_surface_container_lightContent = default;
+            private static bool _system_surface_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_low_dark"/>
+            /// </summary>
+            public static int system_surface_container_low_dark { get { if (!_system_surface_container_low_darkReady) { _system_surface_container_low_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_low_dark"); _system_surface_container_low_darkReady = true; } return _system_surface_container_low_darkContent; } }
+            private static int _system_surface_container_low_darkContent = default;
+            private static bool _system_surface_container_low_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_low_light"/>
+            /// </summary>
+            public static int system_surface_container_low_light { get { if (!_system_surface_container_low_lightReady) { _system_surface_container_low_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_low_light"); _system_surface_container_low_lightReady = true; } return _system_surface_container_low_lightContent; } }
+            private static int _system_surface_container_low_lightContent = default;
+            private static bool _system_surface_container_low_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_lowest_dark"/>
+            /// </summary>
+            public static int system_surface_container_lowest_dark { get { if (!_system_surface_container_lowest_darkReady) { _system_surface_container_lowest_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_lowest_dark"); _system_surface_container_lowest_darkReady = true; } return _system_surface_container_lowest_darkContent; } }
+            private static int _system_surface_container_lowest_darkContent = default;
+            private static bool _system_surface_container_lowest_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_container_lowest_light"/>
+            /// </summary>
+            public static int system_surface_container_lowest_light { get { if (!_system_surface_container_lowest_lightReady) { _system_surface_container_lowest_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_container_lowest_light"); _system_surface_container_lowest_lightReady = true; } return _system_surface_container_lowest_lightContent; } }
+            private static int _system_surface_container_lowest_lightContent = default;
+            private static bool _system_surface_container_lowest_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_dark"/>
+            /// </summary>
+            public static int system_surface_dark { get { if (!_system_surface_darkReady) { _system_surface_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_dark"); _system_surface_darkReady = true; } return _system_surface_darkContent; } }
+            private static int _system_surface_darkContent = default;
+            private static bool _system_surface_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_dim_dark"/>
+            /// </summary>
+            public static int system_surface_dim_dark { get { if (!_system_surface_dim_darkReady) { _system_surface_dim_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_dim_dark"); _system_surface_dim_darkReady = true; } return _system_surface_dim_darkContent; } }
+            private static int _system_surface_dim_darkContent = default;
+            private static bool _system_surface_dim_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_dim_light"/>
+            /// </summary>
+            public static int system_surface_dim_light { get { if (!_system_surface_dim_lightReady) { _system_surface_dim_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_dim_light"); _system_surface_dim_lightReady = true; } return _system_surface_dim_lightContent; } }
+            private static int _system_surface_dim_lightContent = default;
+            private static bool _system_surface_dim_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_light"/>
+            /// </summary>
+            public static int system_surface_light { get { if (!_system_surface_lightReady) { _system_surface_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_light"); _system_surface_lightReady = true; } return _system_surface_lightContent; } }
+            private static int _system_surface_lightContent = default;
+            private static bool _system_surface_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_variant_dark"/>
+            /// </summary>
+            public static int system_surface_variant_dark { get { if (!_system_surface_variant_darkReady) { _system_surface_variant_darkContent = SGetField<int>(LocalBridgeClazz, "system_surface_variant_dark"); _system_surface_variant_darkReady = true; } return _system_surface_variant_darkContent; } }
+            private static int _system_surface_variant_darkContent = default;
+            private static bool _system_surface_variant_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_surface_variant_light"/>
+            /// </summary>
+            public static int system_surface_variant_light { get { if (!_system_surface_variant_lightReady) { _system_surface_variant_lightContent = SGetField<int>(LocalBridgeClazz, "system_surface_variant_light"); _system_surface_variant_lightReady = true; } return _system_surface_variant_lightContent; } }
+            private static int _system_surface_variant_lightContent = default;
+            private static bool _system_surface_variant_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_tertiary_container_dark"/>
+            /// </summary>
+            public static int system_tertiary_container_dark { get { if (!_system_tertiary_container_darkReady) { _system_tertiary_container_darkContent = SGetField<int>(LocalBridgeClazz, "system_tertiary_container_dark"); _system_tertiary_container_darkReady = true; } return _system_tertiary_container_darkContent; } }
+            private static int _system_tertiary_container_darkContent = default;
+            private static bool _system_tertiary_container_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_tertiary_container_light"/>
+            /// </summary>
+            public static int system_tertiary_container_light { get { if (!_system_tertiary_container_lightReady) { _system_tertiary_container_lightContent = SGetField<int>(LocalBridgeClazz, "system_tertiary_container_light"); _system_tertiary_container_lightReady = true; } return _system_tertiary_container_lightContent; } }
+            private static int _system_tertiary_container_lightContent = default;
+            private static bool _system_tertiary_container_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_tertiary_dark"/>
+            /// </summary>
+            public static int system_tertiary_dark { get { if (!_system_tertiary_darkReady) { _system_tertiary_darkContent = SGetField<int>(LocalBridgeClazz, "system_tertiary_dark"); _system_tertiary_darkReady = true; } return _system_tertiary_darkContent; } }
+            private static int _system_tertiary_darkContent = default;
+            private static bool _system_tertiary_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_tertiary_fixed"/>
+            /// </summary>
+            public static int system_tertiary_fixed { get { if (!_system_tertiary_fixedReady) { _system_tertiary_fixedContent = SGetField<int>(LocalBridgeClazz, "system_tertiary_fixed"); _system_tertiary_fixedReady = true; } return _system_tertiary_fixedContent; } }
+            private static int _system_tertiary_fixedContent = default;
+            private static bool _system_tertiary_fixedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_tertiary_fixed_dim"/>
+            /// </summary>
+            public static int system_tertiary_fixed_dim { get { if (!_system_tertiary_fixed_dimReady) { _system_tertiary_fixed_dimContent = SGetField<int>(LocalBridgeClazz, "system_tertiary_fixed_dim"); _system_tertiary_fixed_dimReady = true; } return _system_tertiary_fixed_dimContent; } }
+            private static int _system_tertiary_fixed_dimContent = default;
+            private static bool _system_tertiary_fixed_dimReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_tertiary_light"/>
+            /// </summary>
+            public static int system_tertiary_light { get { if (!_system_tertiary_lightReady) { _system_tertiary_lightContent = SGetField<int>(LocalBridgeClazz, "system_tertiary_light"); _system_tertiary_lightReady = true; } return _system_tertiary_lightContent; } }
+            private static int _system_tertiary_lightContent = default;
+            private static bool _system_tertiary_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_hint_inverse_dark"/>
+            /// </summary>
+            public static int system_text_hint_inverse_dark { get { if (!_system_text_hint_inverse_darkReady) { _system_text_hint_inverse_darkContent = SGetField<int>(LocalBridgeClazz, "system_text_hint_inverse_dark"); _system_text_hint_inverse_darkReady = true; } return _system_text_hint_inverse_darkContent; } }
+            private static int _system_text_hint_inverse_darkContent = default;
+            private static bool _system_text_hint_inverse_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_hint_inverse_light"/>
+            /// </summary>
+            public static int system_text_hint_inverse_light { get { if (!_system_text_hint_inverse_lightReady) { _system_text_hint_inverse_lightContent = SGetField<int>(LocalBridgeClazz, "system_text_hint_inverse_light"); _system_text_hint_inverse_lightReady = true; } return _system_text_hint_inverse_lightContent; } }
+            private static int _system_text_hint_inverse_lightContent = default;
+            private static bool _system_text_hint_inverse_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_primary_inverse_dark"/>
+            /// </summary>
+            public static int system_text_primary_inverse_dark { get { if (!_system_text_primary_inverse_darkReady) { _system_text_primary_inverse_darkContent = SGetField<int>(LocalBridgeClazz, "system_text_primary_inverse_dark"); _system_text_primary_inverse_darkReady = true; } return _system_text_primary_inverse_darkContent; } }
+            private static int _system_text_primary_inverse_darkContent = default;
+            private static bool _system_text_primary_inverse_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_primary_inverse_disable_only_dark"/>
+            /// </summary>
+            public static int system_text_primary_inverse_disable_only_dark { get { if (!_system_text_primary_inverse_disable_only_darkReady) { _system_text_primary_inverse_disable_only_darkContent = SGetField<int>(LocalBridgeClazz, "system_text_primary_inverse_disable_only_dark"); _system_text_primary_inverse_disable_only_darkReady = true; } return _system_text_primary_inverse_disable_only_darkContent; } }
+            private static int _system_text_primary_inverse_disable_only_darkContent = default;
+            private static bool _system_text_primary_inverse_disable_only_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_primary_inverse_disable_only_light"/>
+            /// </summary>
+            public static int system_text_primary_inverse_disable_only_light { get { if (!_system_text_primary_inverse_disable_only_lightReady) { _system_text_primary_inverse_disable_only_lightContent = SGetField<int>(LocalBridgeClazz, "system_text_primary_inverse_disable_only_light"); _system_text_primary_inverse_disable_only_lightReady = true; } return _system_text_primary_inverse_disable_only_lightContent; } }
+            private static int _system_text_primary_inverse_disable_only_lightContent = default;
+            private static bool _system_text_primary_inverse_disable_only_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_primary_inverse_light"/>
+            /// </summary>
+            public static int system_text_primary_inverse_light { get { if (!_system_text_primary_inverse_lightReady) { _system_text_primary_inverse_lightContent = SGetField<int>(LocalBridgeClazz, "system_text_primary_inverse_light"); _system_text_primary_inverse_lightReady = true; } return _system_text_primary_inverse_lightContent; } }
+            private static int _system_text_primary_inverse_lightContent = default;
+            private static bool _system_text_primary_inverse_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_secondary_and_tertiary_inverse_dark"/>
+            /// </summary>
+            public static int system_text_secondary_and_tertiary_inverse_dark { get { if (!_system_text_secondary_and_tertiary_inverse_darkReady) { _system_text_secondary_and_tertiary_inverse_darkContent = SGetField<int>(LocalBridgeClazz, "system_text_secondary_and_tertiary_inverse_dark"); _system_text_secondary_and_tertiary_inverse_darkReady = true; } return _system_text_secondary_and_tertiary_inverse_darkContent; } }
+            private static int _system_text_secondary_and_tertiary_inverse_darkContent = default;
+            private static bool _system_text_secondary_and_tertiary_inverse_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_secondary_and_tertiary_inverse_disabled_dark"/>
+            /// </summary>
+            public static int system_text_secondary_and_tertiary_inverse_disabled_dark { get { if (!_system_text_secondary_and_tertiary_inverse_disabled_darkReady) { _system_text_secondary_and_tertiary_inverse_disabled_darkContent = SGetField<int>(LocalBridgeClazz, "system_text_secondary_and_tertiary_inverse_disabled_dark"); _system_text_secondary_and_tertiary_inverse_disabled_darkReady = true; } return _system_text_secondary_and_tertiary_inverse_disabled_darkContent; } }
+            private static int _system_text_secondary_and_tertiary_inverse_disabled_darkContent = default;
+            private static bool _system_text_secondary_and_tertiary_inverse_disabled_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_secondary_and_tertiary_inverse_disabled_light"/>
+            /// </summary>
+            public static int system_text_secondary_and_tertiary_inverse_disabled_light { get { if (!_system_text_secondary_and_tertiary_inverse_disabled_lightReady) { _system_text_secondary_and_tertiary_inverse_disabled_lightContent = SGetField<int>(LocalBridgeClazz, "system_text_secondary_and_tertiary_inverse_disabled_light"); _system_text_secondary_and_tertiary_inverse_disabled_lightReady = true; } return _system_text_secondary_and_tertiary_inverse_disabled_lightContent; } }
+            private static int _system_text_secondary_and_tertiary_inverse_disabled_lightContent = default;
+            private static bool _system_text_secondary_and_tertiary_inverse_disabled_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#system_text_secondary_and_tertiary_inverse_light"/>
+            /// </summary>
+            public static int system_text_secondary_and_tertiary_inverse_light { get { if (!_system_text_secondary_and_tertiary_inverse_lightReady) { _system_text_secondary_and_tertiary_inverse_lightContent = SGetField<int>(LocalBridgeClazz, "system_text_secondary_and_tertiary_inverse_light"); _system_text_secondary_and_tertiary_inverse_lightReady = true; } return _system_text_secondary_and_tertiary_inverse_lightContent; } }
+            private static int _system_text_secondary_and_tertiary_inverse_lightContent = default;
+            private static bool _system_text_secondary_and_tertiary_inverse_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#tab_indicator_text"/>
+            /// </summary>
+            public static int tab_indicator_text { get { if (!_tab_indicator_textReady) { _tab_indicator_textContent = SGetField<int>(LocalBridgeClazz, "tab_indicator_text"); _tab_indicator_textReady = true; } return _tab_indicator_textContent; } }
+            private static int _tab_indicator_textContent = default;
+            private static bool _tab_indicator_textReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#tertiary_text_dark"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int tertiary_text_dark { get { if (!_tertiary_text_darkReady) { _tertiary_text_darkContent = SGetField<int>(LocalBridgeClazz, "tertiary_text_dark"); _tertiary_text_darkReady = true; } return _tertiary_text_darkContent; } }
+            private static int _tertiary_text_darkContent = default;
+            private static bool _tertiary_text_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#tertiary_text_light"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int tertiary_text_light { get { if (!_tertiary_text_lightReady) { _tertiary_text_lightContent = SGetField<int>(LocalBridgeClazz, "tertiary_text_light"); _tertiary_text_lightReady = true; } return _tertiary_text_lightContent; } }
+            private static int _tertiary_text_lightContent = default;
+            private static bool _tertiary_text_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#transparent"/>
+            /// </summary>
+            public static int transparent { get { if (!_transparentReady) { _transparentContent = SGetField<int>(LocalBridgeClazz, "transparent"); _transparentReady = true; } return _transparentContent; } }
+            private static int _transparentContent = default;
+            private static bool _transparentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#white"/>
+            /// </summary>
+            public static int white { get { if (!_whiteReady) { _whiteContent = SGetField<int>(LocalBridgeClazz, "white"); _whiteReady = true; } return _whiteContent; } }
+            private static int _whiteContent = default;
+            private static bool _whiteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.color.html#widget_edittext_dark"/>
+            /// </summary>
+            public static int widget_edittext_dark { get { if (!_widget_edittext_darkReady) { _widget_edittext_darkContent = SGetField<int>(LocalBridgeClazz, "widget_edittext_dark"); _widget_edittext_darkReady = true; } return _widget_edittext_darkContent; } }
+            private static int _widget_edittext_darkContent = default;
+            private static bool _widget_edittext_darkReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region dimen
+        public partial class dimen
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#app_icon_size"/>
+            /// </summary>
+            public static int app_icon_size { get { if (!_app_icon_sizeReady) { _app_icon_sizeContent = SGetField<int>(LocalBridgeClazz, "app_icon_size"); _app_icon_sizeReady = true; } return _app_icon_sizeContent; } }
+            private static int _app_icon_sizeContent = default;
+            private static bool _app_icon_sizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#dialog_min_width_major"/>
+            /// </summary>
+            public static int dialog_min_width_major { get { if (!_dialog_min_width_majorReady) { _dialog_min_width_majorContent = SGetField<int>(LocalBridgeClazz, "dialog_min_width_major"); _dialog_min_width_majorReady = true; } return _dialog_min_width_majorContent; } }
+            private static int _dialog_min_width_majorContent = default;
+            private static bool _dialog_min_width_majorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#dialog_min_width_minor"/>
+            /// </summary>
+            public static int dialog_min_width_minor { get { if (!_dialog_min_width_minorReady) { _dialog_min_width_minorContent = SGetField<int>(LocalBridgeClazz, "dialog_min_width_minor"); _dialog_min_width_minorReady = true; } return _dialog_min_width_minorContent; } }
+            private static int _dialog_min_width_minorContent = default;
+            private static bool _dialog_min_width_minorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#notification_large_icon_height"/>
+            /// </summary>
+            public static int notification_large_icon_height { get { if (!_notification_large_icon_heightReady) { _notification_large_icon_heightContent = SGetField<int>(LocalBridgeClazz, "notification_large_icon_height"); _notification_large_icon_heightReady = true; } return _notification_large_icon_heightContent; } }
+            private static int _notification_large_icon_heightContent = default;
+            private static bool _notification_large_icon_heightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#notification_large_icon_width"/>
+            /// </summary>
+            public static int notification_large_icon_width { get { if (!_notification_large_icon_widthReady) { _notification_large_icon_widthContent = SGetField<int>(LocalBridgeClazz, "notification_large_icon_width"); _notification_large_icon_widthReady = true; } return _notification_large_icon_widthContent; } }
+            private static int _notification_large_icon_widthContent = default;
+            private static bool _notification_large_icon_widthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#system_app_widget_background_radius"/>
+            /// </summary>
+            public static int system_app_widget_background_radius { get { if (!_system_app_widget_background_radiusReady) { _system_app_widget_background_radiusContent = SGetField<int>(LocalBridgeClazz, "system_app_widget_background_radius"); _system_app_widget_background_radiusReady = true; } return _system_app_widget_background_radiusContent; } }
+            private static int _system_app_widget_background_radiusContent = default;
+            private static bool _system_app_widget_background_radiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#system_app_widget_inner_radius"/>
+            /// </summary>
+            public static int system_app_widget_inner_radius { get { if (!_system_app_widget_inner_radiusReady) { _system_app_widget_inner_radiusContent = SGetField<int>(LocalBridgeClazz, "system_app_widget_inner_radius"); _system_app_widget_inner_radiusReady = true; } return _system_app_widget_inner_radiusContent; } }
+            private static int _system_app_widget_inner_radiusContent = default;
+            private static bool _system_app_widget_inner_radiusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#thumbnail_height"/>
+            /// </summary>
+            public static int thumbnail_height { get { if (!_thumbnail_heightReady) { _thumbnail_heightContent = SGetField<int>(LocalBridgeClazz, "thumbnail_height"); _thumbnail_heightReady = true; } return _thumbnail_heightContent; } }
+            private static int _thumbnail_heightContent = default;
+            private static bool _thumbnail_heightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.dimen.html#thumbnail_width"/>
+            /// </summary>
+            public static int thumbnail_width { get { if (!_thumbnail_widthReady) { _thumbnail_widthContent = SGetField<int>(LocalBridgeClazz, "thumbnail_width"); _thumbnail_widthReady = true; } return _thumbnail_widthContent; } }
+            private static int _thumbnail_widthContent = default;
+            private static bool _thumbnail_widthReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region drawable
+        public partial class drawable
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#alert_dark_frame"/>
+            /// </summary>
+            public static int alert_dark_frame { get { if (!_alert_dark_frameReady) { _alert_dark_frameContent = SGetField<int>(LocalBridgeClazz, "alert_dark_frame"); _alert_dark_frameReady = true; } return _alert_dark_frameContent; } }
+            private static int _alert_dark_frameContent = default;
+            private static bool _alert_dark_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#alert_light_frame"/>
+            /// </summary>
+            public static int alert_light_frame { get { if (!_alert_light_frameReady) { _alert_light_frameContent = SGetField<int>(LocalBridgeClazz, "alert_light_frame"); _alert_light_frameReady = true; } return _alert_light_frameContent; } }
+            private static int _alert_light_frameContent = default;
+            private static bool _alert_light_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#arrow_down_float"/>
+            /// </summary>
+            public static int arrow_down_float { get { if (!_arrow_down_floatReady) { _arrow_down_floatContent = SGetField<int>(LocalBridgeClazz, "arrow_down_float"); _arrow_down_floatReady = true; } return _arrow_down_floatContent; } }
+            private static int _arrow_down_floatContent = default;
+            private static bool _arrow_down_floatReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#arrow_up_float"/>
+            /// </summary>
+            public static int arrow_up_float { get { if (!_arrow_up_floatReady) { _arrow_up_floatContent = SGetField<int>(LocalBridgeClazz, "arrow_up_float"); _arrow_up_floatReady = true; } return _arrow_up_floatContent; } }
+            private static int _arrow_up_floatContent = default;
+            private static bool _arrow_up_floatReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#bottom_bar"/>
+            /// </summary>
+            public static int bottom_bar { get { if (!_bottom_barReady) { _bottom_barContent = SGetField<int>(LocalBridgeClazz, "bottom_bar"); _bottom_barReady = true; } return _bottom_barContent; } }
+            private static int _bottom_barContent = default;
+            private static bool _bottom_barReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_default"/>
+            /// </summary>
+            public static int btn_default { get { if (!_btn_defaultReady) { _btn_defaultContent = SGetField<int>(LocalBridgeClazz, "btn_default"); _btn_defaultReady = true; } return _btn_defaultContent; } }
+            private static int _btn_defaultContent = default;
+            private static bool _btn_defaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_default_small"/>
+            /// </summary>
+            public static int btn_default_small { get { if (!_btn_default_smallReady) { _btn_default_smallContent = SGetField<int>(LocalBridgeClazz, "btn_default_small"); _btn_default_smallReady = true; } return _btn_default_smallContent; } }
+            private static int _btn_default_smallContent = default;
+            private static bool _btn_default_smallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_dialog"/>
+            /// </summary>
+            public static int btn_dialog { get { if (!_btn_dialogReady) { _btn_dialogContent = SGetField<int>(LocalBridgeClazz, "btn_dialog"); _btn_dialogReady = true; } return _btn_dialogContent; } }
+            private static int _btn_dialogContent = default;
+            private static bool _btn_dialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_dropdown"/>
+            /// </summary>
+            public static int btn_dropdown { get { if (!_btn_dropdownReady) { _btn_dropdownContent = SGetField<int>(LocalBridgeClazz, "btn_dropdown"); _btn_dropdownReady = true; } return _btn_dropdownContent; } }
+            private static int _btn_dropdownContent = default;
+            private static bool _btn_dropdownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_minus"/>
+            /// </summary>
+            public static int btn_minus { get { if (!_btn_minusReady) { _btn_minusContent = SGetField<int>(LocalBridgeClazz, "btn_minus"); _btn_minusReady = true; } return _btn_minusContent; } }
+            private static int _btn_minusContent = default;
+            private static bool _btn_minusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_plus"/>
+            /// </summary>
+            public static int btn_plus { get { if (!_btn_plusReady) { _btn_plusContent = SGetField<int>(LocalBridgeClazz, "btn_plus"); _btn_plusReady = true; } return _btn_plusContent; } }
+            private static int _btn_plusContent = default;
+            private static bool _btn_plusReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_radio"/>
+            /// </summary>
+            public static int btn_radio { get { if (!_btn_radioReady) { _btn_radioContent = SGetField<int>(LocalBridgeClazz, "btn_radio"); _btn_radioReady = true; } return _btn_radioContent; } }
+            private static int _btn_radioContent = default;
+            private static bool _btn_radioReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_star"/>
+            /// </summary>
+            public static int btn_star { get { if (!_btn_starReady) { _btn_starContent = SGetField<int>(LocalBridgeClazz, "btn_star"); _btn_starReady = true; } return _btn_starContent; } }
+            private static int _btn_starContent = default;
+            private static bool _btn_starReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_star_big_off"/>
+            /// </summary>
+            public static int btn_star_big_off { get { if (!_btn_star_big_offReady) { _btn_star_big_offContent = SGetField<int>(LocalBridgeClazz, "btn_star_big_off"); _btn_star_big_offReady = true; } return _btn_star_big_offContent; } }
+            private static int _btn_star_big_offContent = default;
+            private static bool _btn_star_big_offReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#btn_star_big_on"/>
+            /// </summary>
+            public static int btn_star_big_on { get { if (!_btn_star_big_onReady) { _btn_star_big_onContent = SGetField<int>(LocalBridgeClazz, "btn_star_big_on"); _btn_star_big_onReady = true; } return _btn_star_big_onContent; } }
+            private static int _btn_star_big_onContent = default;
+            private static bool _btn_star_big_onReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#button_onoff_indicator_off"/>
+            /// </summary>
+            public static int button_onoff_indicator_off { get { if (!_button_onoff_indicator_offReady) { _button_onoff_indicator_offContent = SGetField<int>(LocalBridgeClazz, "button_onoff_indicator_off"); _button_onoff_indicator_offReady = true; } return _button_onoff_indicator_offContent; } }
+            private static int _button_onoff_indicator_offContent = default;
+            private static bool _button_onoff_indicator_offReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#button_onoff_indicator_on"/>
+            /// </summary>
+            public static int button_onoff_indicator_on { get { if (!_button_onoff_indicator_onReady) { _button_onoff_indicator_onContent = SGetField<int>(LocalBridgeClazz, "button_onoff_indicator_on"); _button_onoff_indicator_onReady = true; } return _button_onoff_indicator_onContent; } }
+            private static int _button_onoff_indicator_onContent = default;
+            private static bool _button_onoff_indicator_onReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#checkbox_off_background"/>
+            /// </summary>
+            public static int checkbox_off_background { get { if (!_checkbox_off_backgroundReady) { _checkbox_off_backgroundContent = SGetField<int>(LocalBridgeClazz, "checkbox_off_background"); _checkbox_off_backgroundReady = true; } return _checkbox_off_backgroundContent; } }
+            private static int _checkbox_off_backgroundContent = default;
+            private static bool _checkbox_off_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#checkbox_on_background"/>
+            /// </summary>
+            public static int checkbox_on_background { get { if (!_checkbox_on_backgroundReady) { _checkbox_on_backgroundContent = SGetField<int>(LocalBridgeClazz, "checkbox_on_background"); _checkbox_on_backgroundReady = true; } return _checkbox_on_backgroundContent; } }
+            private static int _checkbox_on_backgroundContent = default;
+            private static bool _checkbox_on_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#dark_header"/>
+            /// </summary>
+            public static int dark_header { get { if (!_dark_headerReady) { _dark_headerContent = SGetField<int>(LocalBridgeClazz, "dark_header"); _dark_headerReady = true; } return _dark_headerContent; } }
+            private static int _dark_headerContent = default;
+            private static bool _dark_headerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#dialog_frame"/>
+            /// </summary>
+            public static int dialog_frame { get { if (!_dialog_frameReady) { _dialog_frameContent = SGetField<int>(LocalBridgeClazz, "dialog_frame"); _dialog_frameReady = true; } return _dialog_frameContent; } }
+            private static int _dialog_frameContent = default;
+            private static bool _dialog_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#dialog_holo_dark_frame"/>
+            /// </summary>
+            public static int dialog_holo_dark_frame { get { if (!_dialog_holo_dark_frameReady) { _dialog_holo_dark_frameContent = SGetField<int>(LocalBridgeClazz, "dialog_holo_dark_frame"); _dialog_holo_dark_frameReady = true; } return _dialog_holo_dark_frameContent; } }
+            private static int _dialog_holo_dark_frameContent = default;
+            private static bool _dialog_holo_dark_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#dialog_holo_light_frame"/>
+            /// </summary>
+            public static int dialog_holo_light_frame { get { if (!_dialog_holo_light_frameReady) { _dialog_holo_light_frameContent = SGetField<int>(LocalBridgeClazz, "dialog_holo_light_frame"); _dialog_holo_light_frameReady = true; } return _dialog_holo_light_frameContent; } }
+            private static int _dialog_holo_light_frameContent = default;
+            private static bool _dialog_holo_light_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#divider_horizontal_bright"/>
+            /// </summary>
+            public static int divider_horizontal_bright { get { if (!_divider_horizontal_brightReady) { _divider_horizontal_brightContent = SGetField<int>(LocalBridgeClazz, "divider_horizontal_bright"); _divider_horizontal_brightReady = true; } return _divider_horizontal_brightContent; } }
+            private static int _divider_horizontal_brightContent = default;
+            private static bool _divider_horizontal_brightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#divider_horizontal_dark"/>
+            /// </summary>
+            public static int divider_horizontal_dark { get { if (!_divider_horizontal_darkReady) { _divider_horizontal_darkContent = SGetField<int>(LocalBridgeClazz, "divider_horizontal_dark"); _divider_horizontal_darkReady = true; } return _divider_horizontal_darkContent; } }
+            private static int _divider_horizontal_darkContent = default;
+            private static bool _divider_horizontal_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#divider_horizontal_dim_dark"/>
+            /// </summary>
+            public static int divider_horizontal_dim_dark { get { if (!_divider_horizontal_dim_darkReady) { _divider_horizontal_dim_darkContent = SGetField<int>(LocalBridgeClazz, "divider_horizontal_dim_dark"); _divider_horizontal_dim_darkReady = true; } return _divider_horizontal_dim_darkContent; } }
+            private static int _divider_horizontal_dim_darkContent = default;
+            private static bool _divider_horizontal_dim_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#divider_horizontal_textfield"/>
+            /// </summary>
+            public static int divider_horizontal_textfield { get { if (!_divider_horizontal_textfieldReady) { _divider_horizontal_textfieldContent = SGetField<int>(LocalBridgeClazz, "divider_horizontal_textfield"); _divider_horizontal_textfieldReady = true; } return _divider_horizontal_textfieldContent; } }
+            private static int _divider_horizontal_textfieldContent = default;
+            private static bool _divider_horizontal_textfieldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#edit_text"/>
+            /// </summary>
+            public static int edit_text { get { if (!_edit_textReady) { _edit_textContent = SGetField<int>(LocalBridgeClazz, "edit_text"); _edit_textReady = true; } return _edit_textContent; } }
+            private static int _edit_textContent = default;
+            private static bool _edit_textReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#editbox_background"/>
+            /// </summary>
+            public static int editbox_background { get { if (!_editbox_backgroundReady) { _editbox_backgroundContent = SGetField<int>(LocalBridgeClazz, "editbox_background"); _editbox_backgroundReady = true; } return _editbox_backgroundContent; } }
+            private static int _editbox_backgroundContent = default;
+            private static bool _editbox_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#editbox_background_normal"/>
+            /// </summary>
+            public static int editbox_background_normal { get { if (!_editbox_background_normalReady) { _editbox_background_normalContent = SGetField<int>(LocalBridgeClazz, "editbox_background_normal"); _editbox_background_normalReady = true; } return _editbox_background_normalContent; } }
+            private static int _editbox_background_normalContent = default;
+            private static bool _editbox_background_normalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#editbox_dropdown_dark_frame"/>
+            /// </summary>
+            public static int editbox_dropdown_dark_frame { get { if (!_editbox_dropdown_dark_frameReady) { _editbox_dropdown_dark_frameContent = SGetField<int>(LocalBridgeClazz, "editbox_dropdown_dark_frame"); _editbox_dropdown_dark_frameReady = true; } return _editbox_dropdown_dark_frameContent; } }
+            private static int _editbox_dropdown_dark_frameContent = default;
+            private static bool _editbox_dropdown_dark_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#editbox_dropdown_light_frame"/>
+            /// </summary>
+            public static int editbox_dropdown_light_frame { get { if (!_editbox_dropdown_light_frameReady) { _editbox_dropdown_light_frameContent = SGetField<int>(LocalBridgeClazz, "editbox_dropdown_light_frame"); _editbox_dropdown_light_frameReady = true; } return _editbox_dropdown_light_frameContent; } }
+            private static int _editbox_dropdown_light_frameContent = default;
+            private static bool _editbox_dropdown_light_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#gallery_thumb"/>
+            /// </summary>
+            public static int gallery_thumb { get { if (!_gallery_thumbReady) { _gallery_thumbContent = SGetField<int>(LocalBridgeClazz, "gallery_thumb"); _gallery_thumbReady = true; } return _gallery_thumbContent; } }
+            private static int _gallery_thumbContent = default;
+            private static bool _gallery_thumbReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_btn_speak_now"/>
+            /// </summary>
+            public static int ic_btn_speak_now { get { if (!_ic_btn_speak_nowReady) { _ic_btn_speak_nowContent = SGetField<int>(LocalBridgeClazz, "ic_btn_speak_now"); _ic_btn_speak_nowReady = true; } return _ic_btn_speak_nowContent; } }
+            private static int _ic_btn_speak_nowContent = default;
+            private static bool _ic_btn_speak_nowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_delete"/>
+            /// </summary>
+            public static int ic_delete { get { if (!_ic_deleteReady) { _ic_deleteContent = SGetField<int>(LocalBridgeClazz, "ic_delete"); _ic_deleteReady = true; } return _ic_deleteContent; } }
+            private static int _ic_deleteContent = default;
+            private static bool _ic_deleteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_dialog_alert"/>
+            /// </summary>
+            public static int ic_dialog_alert { get { if (!_ic_dialog_alertReady) { _ic_dialog_alertContent = SGetField<int>(LocalBridgeClazz, "ic_dialog_alert"); _ic_dialog_alertReady = true; } return _ic_dialog_alertContent; } }
+            private static int _ic_dialog_alertContent = default;
+            private static bool _ic_dialog_alertReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_dialog_dialer"/>
+            /// </summary>
+            public static int ic_dialog_dialer { get { if (!_ic_dialog_dialerReady) { _ic_dialog_dialerContent = SGetField<int>(LocalBridgeClazz, "ic_dialog_dialer"); _ic_dialog_dialerReady = true; } return _ic_dialog_dialerContent; } }
+            private static int _ic_dialog_dialerContent = default;
+            private static bool _ic_dialog_dialerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_dialog_email"/>
+            /// </summary>
+            public static int ic_dialog_email { get { if (!_ic_dialog_emailReady) { _ic_dialog_emailContent = SGetField<int>(LocalBridgeClazz, "ic_dialog_email"); _ic_dialog_emailReady = true; } return _ic_dialog_emailContent; } }
+            private static int _ic_dialog_emailContent = default;
+            private static bool _ic_dialog_emailReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_dialog_info"/>
+            /// </summary>
+            public static int ic_dialog_info { get { if (!_ic_dialog_infoReady) { _ic_dialog_infoContent = SGetField<int>(LocalBridgeClazz, "ic_dialog_info"); _ic_dialog_infoReady = true; } return _ic_dialog_infoContent; } }
+            private static int _ic_dialog_infoContent = default;
+            private static bool _ic_dialog_infoReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_dialog_map"/>
+            /// </summary>
+            public static int ic_dialog_map { get { if (!_ic_dialog_mapReady) { _ic_dialog_mapContent = SGetField<int>(LocalBridgeClazz, "ic_dialog_map"); _ic_dialog_mapReady = true; } return _ic_dialog_mapContent; } }
+            private static int _ic_dialog_mapContent = default;
+            private static bool _ic_dialog_mapReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_input_add"/>
+            /// </summary>
+            public static int ic_input_add { get { if (!_ic_input_addReady) { _ic_input_addContent = SGetField<int>(LocalBridgeClazz, "ic_input_add"); _ic_input_addReady = true; } return _ic_input_addContent; } }
+            private static int _ic_input_addContent = default;
+            private static bool _ic_input_addReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_input_delete"/>
+            /// </summary>
+            public static int ic_input_delete { get { if (!_ic_input_deleteReady) { _ic_input_deleteContent = SGetField<int>(LocalBridgeClazz, "ic_input_delete"); _ic_input_deleteReady = true; } return _ic_input_deleteContent; } }
+            private static int _ic_input_deleteContent = default;
+            private static bool _ic_input_deleteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_input_get"/>
+            /// </summary>
+            public static int ic_input_get { get { if (!_ic_input_getReady) { _ic_input_getContent = SGetField<int>(LocalBridgeClazz, "ic_input_get"); _ic_input_getReady = true; } return _ic_input_getContent; } }
+            private static int _ic_input_getContent = default;
+            private static bool _ic_input_getReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_lock_idle_alarm"/>
+            /// </summary>
+            public static int ic_lock_idle_alarm { get { if (!_ic_lock_idle_alarmReady) { _ic_lock_idle_alarmContent = SGetField<int>(LocalBridgeClazz, "ic_lock_idle_alarm"); _ic_lock_idle_alarmReady = true; } return _ic_lock_idle_alarmContent; } }
+            private static int _ic_lock_idle_alarmContent = default;
+            private static bool _ic_lock_idle_alarmReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_lock_idle_charging"/>
+            /// </summary>
+            public static int ic_lock_idle_charging { get { if (!_ic_lock_idle_chargingReady) { _ic_lock_idle_chargingContent = SGetField<int>(LocalBridgeClazz, "ic_lock_idle_charging"); _ic_lock_idle_chargingReady = true; } return _ic_lock_idle_chargingContent; } }
+            private static int _ic_lock_idle_chargingContent = default;
+            private static bool _ic_lock_idle_chargingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_lock_idle_lock"/>
+            /// </summary>
+            public static int ic_lock_idle_lock { get { if (!_ic_lock_idle_lockReady) { _ic_lock_idle_lockContent = SGetField<int>(LocalBridgeClazz, "ic_lock_idle_lock"); _ic_lock_idle_lockReady = true; } return _ic_lock_idle_lockContent; } }
+            private static int _ic_lock_idle_lockContent = default;
+            private static bool _ic_lock_idle_lockReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_lock_idle_low_battery"/>
+            /// </summary>
+            public static int ic_lock_idle_low_battery { get { if (!_ic_lock_idle_low_batteryReady) { _ic_lock_idle_low_batteryContent = SGetField<int>(LocalBridgeClazz, "ic_lock_idle_low_battery"); _ic_lock_idle_low_batteryReady = true; } return _ic_lock_idle_low_batteryContent; } }
+            private static int _ic_lock_idle_low_batteryContent = default;
+            private static bool _ic_lock_idle_low_batteryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_lock_lock"/>
+            /// </summary>
+            public static int ic_lock_lock { get { if (!_ic_lock_lockReady) { _ic_lock_lockContent = SGetField<int>(LocalBridgeClazz, "ic_lock_lock"); _ic_lock_lockReady = true; } return _ic_lock_lockContent; } }
+            private static int _ic_lock_lockContent = default;
+            private static bool _ic_lock_lockReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_lock_power_off"/>
+            /// </summary>
+            public static int ic_lock_power_off { get { if (!_ic_lock_power_offReady) { _ic_lock_power_offContent = SGetField<int>(LocalBridgeClazz, "ic_lock_power_off"); _ic_lock_power_offReady = true; } return _ic_lock_power_offContent; } }
+            private static int _ic_lock_power_offContent = default;
+            private static bool _ic_lock_power_offReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_lock_silent_mode"/>
+            /// </summary>
+            public static int ic_lock_silent_mode { get { if (!_ic_lock_silent_modeReady) { _ic_lock_silent_modeContent = SGetField<int>(LocalBridgeClazz, "ic_lock_silent_mode"); _ic_lock_silent_modeReady = true; } return _ic_lock_silent_modeContent; } }
+            private static int _ic_lock_silent_modeContent = default;
+            private static bool _ic_lock_silent_modeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_lock_silent_mode_off"/>
+            /// </summary>
+            public static int ic_lock_silent_mode_off { get { if (!_ic_lock_silent_mode_offReady) { _ic_lock_silent_mode_offContent = SGetField<int>(LocalBridgeClazz, "ic_lock_silent_mode_off"); _ic_lock_silent_mode_offReady = true; } return _ic_lock_silent_mode_offContent; } }
+            private static int _ic_lock_silent_mode_offContent = default;
+            private static bool _ic_lock_silent_mode_offReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_media_ff"/>
+            /// </summary>
+            public static int ic_media_ff { get { if (!_ic_media_ffReady) { _ic_media_ffContent = SGetField<int>(LocalBridgeClazz, "ic_media_ff"); _ic_media_ffReady = true; } return _ic_media_ffContent; } }
+            private static int _ic_media_ffContent = default;
+            private static bool _ic_media_ffReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_media_next"/>
+            /// </summary>
+            public static int ic_media_next { get { if (!_ic_media_nextReady) { _ic_media_nextContent = SGetField<int>(LocalBridgeClazz, "ic_media_next"); _ic_media_nextReady = true; } return _ic_media_nextContent; } }
+            private static int _ic_media_nextContent = default;
+            private static bool _ic_media_nextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_media_pause"/>
+            /// </summary>
+            public static int ic_media_pause { get { if (!_ic_media_pauseReady) { _ic_media_pauseContent = SGetField<int>(LocalBridgeClazz, "ic_media_pause"); _ic_media_pauseReady = true; } return _ic_media_pauseContent; } }
+            private static int _ic_media_pauseContent = default;
+            private static bool _ic_media_pauseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_media_play"/>
+            /// </summary>
+            public static int ic_media_play { get { if (!_ic_media_playReady) { _ic_media_playContent = SGetField<int>(LocalBridgeClazz, "ic_media_play"); _ic_media_playReady = true; } return _ic_media_playContent; } }
+            private static int _ic_media_playContent = default;
+            private static bool _ic_media_playReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_media_previous"/>
+            /// </summary>
+            public static int ic_media_previous { get { if (!_ic_media_previousReady) { _ic_media_previousContent = SGetField<int>(LocalBridgeClazz, "ic_media_previous"); _ic_media_previousReady = true; } return _ic_media_previousContent; } }
+            private static int _ic_media_previousContent = default;
+            private static bool _ic_media_previousReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_media_rew"/>
+            /// </summary>
+            public static int ic_media_rew { get { if (!_ic_media_rewReady) { _ic_media_rewContent = SGetField<int>(LocalBridgeClazz, "ic_media_rew"); _ic_media_rewReady = true; } return _ic_media_rewContent; } }
+            private static int _ic_media_rewContent = default;
+            private static bool _ic_media_rewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_add"/>
+            /// </summary>
+            public static int ic_menu_add { get { if (!_ic_menu_addReady) { _ic_menu_addContent = SGetField<int>(LocalBridgeClazz, "ic_menu_add"); _ic_menu_addReady = true; } return _ic_menu_addContent; } }
+            private static int _ic_menu_addContent = default;
+            private static bool _ic_menu_addReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_agenda"/>
+            /// </summary>
+            public static int ic_menu_agenda { get { if (!_ic_menu_agendaReady) { _ic_menu_agendaContent = SGetField<int>(LocalBridgeClazz, "ic_menu_agenda"); _ic_menu_agendaReady = true; } return _ic_menu_agendaContent; } }
+            private static int _ic_menu_agendaContent = default;
+            private static bool _ic_menu_agendaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_always_landscape_portrait"/>
+            /// </summary>
+            public static int ic_menu_always_landscape_portrait { get { if (!_ic_menu_always_landscape_portraitReady) { _ic_menu_always_landscape_portraitContent = SGetField<int>(LocalBridgeClazz, "ic_menu_always_landscape_portrait"); _ic_menu_always_landscape_portraitReady = true; } return _ic_menu_always_landscape_portraitContent; } }
+            private static int _ic_menu_always_landscape_portraitContent = default;
+            private static bool _ic_menu_always_landscape_portraitReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_call"/>
+            /// </summary>
+            public static int ic_menu_call { get { if (!_ic_menu_callReady) { _ic_menu_callContent = SGetField<int>(LocalBridgeClazz, "ic_menu_call"); _ic_menu_callReady = true; } return _ic_menu_callContent; } }
+            private static int _ic_menu_callContent = default;
+            private static bool _ic_menu_callReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_camera"/>
+            /// </summary>
+            public static int ic_menu_camera { get { if (!_ic_menu_cameraReady) { _ic_menu_cameraContent = SGetField<int>(LocalBridgeClazz, "ic_menu_camera"); _ic_menu_cameraReady = true; } return _ic_menu_cameraContent; } }
+            private static int _ic_menu_cameraContent = default;
+            private static bool _ic_menu_cameraReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_close_clear_cancel"/>
+            /// </summary>
+            public static int ic_menu_close_clear_cancel { get { if (!_ic_menu_close_clear_cancelReady) { _ic_menu_close_clear_cancelContent = SGetField<int>(LocalBridgeClazz, "ic_menu_close_clear_cancel"); _ic_menu_close_clear_cancelReady = true; } return _ic_menu_close_clear_cancelContent; } }
+            private static int _ic_menu_close_clear_cancelContent = default;
+            private static bool _ic_menu_close_clear_cancelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_compass"/>
+            /// </summary>
+            public static int ic_menu_compass { get { if (!_ic_menu_compassReady) { _ic_menu_compassContent = SGetField<int>(LocalBridgeClazz, "ic_menu_compass"); _ic_menu_compassReady = true; } return _ic_menu_compassContent; } }
+            private static int _ic_menu_compassContent = default;
+            private static bool _ic_menu_compassReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_crop"/>
+            /// </summary>
+            public static int ic_menu_crop { get { if (!_ic_menu_cropReady) { _ic_menu_cropContent = SGetField<int>(LocalBridgeClazz, "ic_menu_crop"); _ic_menu_cropReady = true; } return _ic_menu_cropContent; } }
+            private static int _ic_menu_cropContent = default;
+            private static bool _ic_menu_cropReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_day"/>
+            /// </summary>
+            public static int ic_menu_day { get { if (!_ic_menu_dayReady) { _ic_menu_dayContent = SGetField<int>(LocalBridgeClazz, "ic_menu_day"); _ic_menu_dayReady = true; } return _ic_menu_dayContent; } }
+            private static int _ic_menu_dayContent = default;
+            private static bool _ic_menu_dayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_delete"/>
+            /// </summary>
+            public static int ic_menu_delete { get { if (!_ic_menu_deleteReady) { _ic_menu_deleteContent = SGetField<int>(LocalBridgeClazz, "ic_menu_delete"); _ic_menu_deleteReady = true; } return _ic_menu_deleteContent; } }
+            private static int _ic_menu_deleteContent = default;
+            private static bool _ic_menu_deleteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_directions"/>
+            /// </summary>
+            public static int ic_menu_directions { get { if (!_ic_menu_directionsReady) { _ic_menu_directionsContent = SGetField<int>(LocalBridgeClazz, "ic_menu_directions"); _ic_menu_directionsReady = true; } return _ic_menu_directionsContent; } }
+            private static int _ic_menu_directionsContent = default;
+            private static bool _ic_menu_directionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_edit"/>
+            /// </summary>
+            public static int ic_menu_edit { get { if (!_ic_menu_editReady) { _ic_menu_editContent = SGetField<int>(LocalBridgeClazz, "ic_menu_edit"); _ic_menu_editReady = true; } return _ic_menu_editContent; } }
+            private static int _ic_menu_editContent = default;
+            private static bool _ic_menu_editReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_gallery"/>
+            /// </summary>
+            public static int ic_menu_gallery { get { if (!_ic_menu_galleryReady) { _ic_menu_galleryContent = SGetField<int>(LocalBridgeClazz, "ic_menu_gallery"); _ic_menu_galleryReady = true; } return _ic_menu_galleryContent; } }
+            private static int _ic_menu_galleryContent = default;
+            private static bool _ic_menu_galleryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_help"/>
+            /// </summary>
+            public static int ic_menu_help { get { if (!_ic_menu_helpReady) { _ic_menu_helpContent = SGetField<int>(LocalBridgeClazz, "ic_menu_help"); _ic_menu_helpReady = true; } return _ic_menu_helpContent; } }
+            private static int _ic_menu_helpContent = default;
+            private static bool _ic_menu_helpReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_info_details"/>
+            /// </summary>
+            public static int ic_menu_info_details { get { if (!_ic_menu_info_detailsReady) { _ic_menu_info_detailsContent = SGetField<int>(LocalBridgeClazz, "ic_menu_info_details"); _ic_menu_info_detailsReady = true; } return _ic_menu_info_detailsContent; } }
+            private static int _ic_menu_info_detailsContent = default;
+            private static bool _ic_menu_info_detailsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_manage"/>
+            /// </summary>
+            public static int ic_menu_manage { get { if (!_ic_menu_manageReady) { _ic_menu_manageContent = SGetField<int>(LocalBridgeClazz, "ic_menu_manage"); _ic_menu_manageReady = true; } return _ic_menu_manageContent; } }
+            private static int _ic_menu_manageContent = default;
+            private static bool _ic_menu_manageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_mapmode"/>
+            /// </summary>
+            public static int ic_menu_mapmode { get { if (!_ic_menu_mapmodeReady) { _ic_menu_mapmodeContent = SGetField<int>(LocalBridgeClazz, "ic_menu_mapmode"); _ic_menu_mapmodeReady = true; } return _ic_menu_mapmodeContent; } }
+            private static int _ic_menu_mapmodeContent = default;
+            private static bool _ic_menu_mapmodeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_month"/>
+            /// </summary>
+            public static int ic_menu_month { get { if (!_ic_menu_monthReady) { _ic_menu_monthContent = SGetField<int>(LocalBridgeClazz, "ic_menu_month"); _ic_menu_monthReady = true; } return _ic_menu_monthContent; } }
+            private static int _ic_menu_monthContent = default;
+            private static bool _ic_menu_monthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_more"/>
+            /// </summary>
+            public static int ic_menu_more { get { if (!_ic_menu_moreReady) { _ic_menu_moreContent = SGetField<int>(LocalBridgeClazz, "ic_menu_more"); _ic_menu_moreReady = true; } return _ic_menu_moreContent; } }
+            private static int _ic_menu_moreContent = default;
+            private static bool _ic_menu_moreReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_my_calendar"/>
+            /// </summary>
+            public static int ic_menu_my_calendar { get { if (!_ic_menu_my_calendarReady) { _ic_menu_my_calendarContent = SGetField<int>(LocalBridgeClazz, "ic_menu_my_calendar"); _ic_menu_my_calendarReady = true; } return _ic_menu_my_calendarContent; } }
+            private static int _ic_menu_my_calendarContent = default;
+            private static bool _ic_menu_my_calendarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_mylocation"/>
+            /// </summary>
+            public static int ic_menu_mylocation { get { if (!_ic_menu_mylocationReady) { _ic_menu_mylocationContent = SGetField<int>(LocalBridgeClazz, "ic_menu_mylocation"); _ic_menu_mylocationReady = true; } return _ic_menu_mylocationContent; } }
+            private static int _ic_menu_mylocationContent = default;
+            private static bool _ic_menu_mylocationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_myplaces"/>
+            /// </summary>
+            public static int ic_menu_myplaces { get { if (!_ic_menu_myplacesReady) { _ic_menu_myplacesContent = SGetField<int>(LocalBridgeClazz, "ic_menu_myplaces"); _ic_menu_myplacesReady = true; } return _ic_menu_myplacesContent; } }
+            private static int _ic_menu_myplacesContent = default;
+            private static bool _ic_menu_myplacesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_preferences"/>
+            /// </summary>
+            public static int ic_menu_preferences { get { if (!_ic_menu_preferencesReady) { _ic_menu_preferencesContent = SGetField<int>(LocalBridgeClazz, "ic_menu_preferences"); _ic_menu_preferencesReady = true; } return _ic_menu_preferencesContent; } }
+            private static int _ic_menu_preferencesContent = default;
+            private static bool _ic_menu_preferencesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_recent_history"/>
+            /// </summary>
+            public static int ic_menu_recent_history { get { if (!_ic_menu_recent_historyReady) { _ic_menu_recent_historyContent = SGetField<int>(LocalBridgeClazz, "ic_menu_recent_history"); _ic_menu_recent_historyReady = true; } return _ic_menu_recent_historyContent; } }
+            private static int _ic_menu_recent_historyContent = default;
+            private static bool _ic_menu_recent_historyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_report_image"/>
+            /// </summary>
+            public static int ic_menu_report_image { get { if (!_ic_menu_report_imageReady) { _ic_menu_report_imageContent = SGetField<int>(LocalBridgeClazz, "ic_menu_report_image"); _ic_menu_report_imageReady = true; } return _ic_menu_report_imageContent; } }
+            private static int _ic_menu_report_imageContent = default;
+            private static bool _ic_menu_report_imageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_revert"/>
+            /// </summary>
+            public static int ic_menu_revert { get { if (!_ic_menu_revertReady) { _ic_menu_revertContent = SGetField<int>(LocalBridgeClazz, "ic_menu_revert"); _ic_menu_revertReady = true; } return _ic_menu_revertContent; } }
+            private static int _ic_menu_revertContent = default;
+            private static bool _ic_menu_revertReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_rotate"/>
+            /// </summary>
+            public static int ic_menu_rotate { get { if (!_ic_menu_rotateReady) { _ic_menu_rotateContent = SGetField<int>(LocalBridgeClazz, "ic_menu_rotate"); _ic_menu_rotateReady = true; } return _ic_menu_rotateContent; } }
+            private static int _ic_menu_rotateContent = default;
+            private static bool _ic_menu_rotateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_save"/>
+            /// </summary>
+            public static int ic_menu_save { get { if (!_ic_menu_saveReady) { _ic_menu_saveContent = SGetField<int>(LocalBridgeClazz, "ic_menu_save"); _ic_menu_saveReady = true; } return _ic_menu_saveContent; } }
+            private static int _ic_menu_saveContent = default;
+            private static bool _ic_menu_saveReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_search"/>
+            /// </summary>
+            public static int ic_menu_search { get { if (!_ic_menu_searchReady) { _ic_menu_searchContent = SGetField<int>(LocalBridgeClazz, "ic_menu_search"); _ic_menu_searchReady = true; } return _ic_menu_searchContent; } }
+            private static int _ic_menu_searchContent = default;
+            private static bool _ic_menu_searchReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_send"/>
+            /// </summary>
+            public static int ic_menu_send { get { if (!_ic_menu_sendReady) { _ic_menu_sendContent = SGetField<int>(LocalBridgeClazz, "ic_menu_send"); _ic_menu_sendReady = true; } return _ic_menu_sendContent; } }
+            private static int _ic_menu_sendContent = default;
+            private static bool _ic_menu_sendReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_set_as"/>
+            /// </summary>
+            public static int ic_menu_set_as { get { if (!_ic_menu_set_asReady) { _ic_menu_set_asContent = SGetField<int>(LocalBridgeClazz, "ic_menu_set_as"); _ic_menu_set_asReady = true; } return _ic_menu_set_asContent; } }
+            private static int _ic_menu_set_asContent = default;
+            private static bool _ic_menu_set_asReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_share"/>
+            /// </summary>
+            public static int ic_menu_share { get { if (!_ic_menu_shareReady) { _ic_menu_shareContent = SGetField<int>(LocalBridgeClazz, "ic_menu_share"); _ic_menu_shareReady = true; } return _ic_menu_shareContent; } }
+            private static int _ic_menu_shareContent = default;
+            private static bool _ic_menu_shareReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_slideshow"/>
+            /// </summary>
+            public static int ic_menu_slideshow { get { if (!_ic_menu_slideshowReady) { _ic_menu_slideshowContent = SGetField<int>(LocalBridgeClazz, "ic_menu_slideshow"); _ic_menu_slideshowReady = true; } return _ic_menu_slideshowContent; } }
+            private static int _ic_menu_slideshowContent = default;
+            private static bool _ic_menu_slideshowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_sort_alphabetically"/>
+            /// </summary>
+            public static int ic_menu_sort_alphabetically { get { if (!_ic_menu_sort_alphabeticallyReady) { _ic_menu_sort_alphabeticallyContent = SGetField<int>(LocalBridgeClazz, "ic_menu_sort_alphabetically"); _ic_menu_sort_alphabeticallyReady = true; } return _ic_menu_sort_alphabeticallyContent; } }
+            private static int _ic_menu_sort_alphabeticallyContent = default;
+            private static bool _ic_menu_sort_alphabeticallyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_sort_by_size"/>
+            /// </summary>
+            public static int ic_menu_sort_by_size { get { if (!_ic_menu_sort_by_sizeReady) { _ic_menu_sort_by_sizeContent = SGetField<int>(LocalBridgeClazz, "ic_menu_sort_by_size"); _ic_menu_sort_by_sizeReady = true; } return _ic_menu_sort_by_sizeContent; } }
+            private static int _ic_menu_sort_by_sizeContent = default;
+            private static bool _ic_menu_sort_by_sizeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_today"/>
+            /// </summary>
+            public static int ic_menu_today { get { if (!_ic_menu_todayReady) { _ic_menu_todayContent = SGetField<int>(LocalBridgeClazz, "ic_menu_today"); _ic_menu_todayReady = true; } return _ic_menu_todayContent; } }
+            private static int _ic_menu_todayContent = default;
+            private static bool _ic_menu_todayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_upload"/>
+            /// </summary>
+            public static int ic_menu_upload { get { if (!_ic_menu_uploadReady) { _ic_menu_uploadContent = SGetField<int>(LocalBridgeClazz, "ic_menu_upload"); _ic_menu_uploadReady = true; } return _ic_menu_uploadContent; } }
+            private static int _ic_menu_uploadContent = default;
+            private static bool _ic_menu_uploadReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_upload_you_tube"/>
+            /// </summary>
+            public static int ic_menu_upload_you_tube { get { if (!_ic_menu_upload_you_tubeReady) { _ic_menu_upload_you_tubeContent = SGetField<int>(LocalBridgeClazz, "ic_menu_upload_you_tube"); _ic_menu_upload_you_tubeReady = true; } return _ic_menu_upload_you_tubeContent; } }
+            private static int _ic_menu_upload_you_tubeContent = default;
+            private static bool _ic_menu_upload_you_tubeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_view"/>
+            /// </summary>
+            public static int ic_menu_view { get { if (!_ic_menu_viewReady) { _ic_menu_viewContent = SGetField<int>(LocalBridgeClazz, "ic_menu_view"); _ic_menu_viewReady = true; } return _ic_menu_viewContent; } }
+            private static int _ic_menu_viewContent = default;
+            private static bool _ic_menu_viewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_week"/>
+            /// </summary>
+            public static int ic_menu_week { get { if (!_ic_menu_weekReady) { _ic_menu_weekContent = SGetField<int>(LocalBridgeClazz, "ic_menu_week"); _ic_menu_weekReady = true; } return _ic_menu_weekContent; } }
+            private static int _ic_menu_weekContent = default;
+            private static bool _ic_menu_weekReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_menu_zoom"/>
+            /// </summary>
+            public static int ic_menu_zoom { get { if (!_ic_menu_zoomReady) { _ic_menu_zoomContent = SGetField<int>(LocalBridgeClazz, "ic_menu_zoom"); _ic_menu_zoomReady = true; } return _ic_menu_zoomContent; } }
+            private static int _ic_menu_zoomContent = default;
+            private static bool _ic_menu_zoomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_notification_clear_all"/>
+            /// </summary>
+            public static int ic_notification_clear_all { get { if (!_ic_notification_clear_allReady) { _ic_notification_clear_allContent = SGetField<int>(LocalBridgeClazz, "ic_notification_clear_all"); _ic_notification_clear_allReady = true; } return _ic_notification_clear_allContent; } }
+            private static int _ic_notification_clear_allContent = default;
+            private static bool _ic_notification_clear_allReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_notification_overlay"/>
+            /// </summary>
+            public static int ic_notification_overlay { get { if (!_ic_notification_overlayReady) { _ic_notification_overlayContent = SGetField<int>(LocalBridgeClazz, "ic_notification_overlay"); _ic_notification_overlayReady = true; } return _ic_notification_overlayContent; } }
+            private static int _ic_notification_overlayContent = default;
+            private static bool _ic_notification_overlayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_partial_secure"/>
+            /// </summary>
+            public static int ic_partial_secure { get { if (!_ic_partial_secureReady) { _ic_partial_secureContent = SGetField<int>(LocalBridgeClazz, "ic_partial_secure"); _ic_partial_secureReady = true; } return _ic_partial_secureContent; } }
+            private static int _ic_partial_secureContent = default;
+            private static bool _ic_partial_secureReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_popup_disk_full"/>
+            /// </summary>
+            public static int ic_popup_disk_full { get { if (!_ic_popup_disk_fullReady) { _ic_popup_disk_fullContent = SGetField<int>(LocalBridgeClazz, "ic_popup_disk_full"); _ic_popup_disk_fullReady = true; } return _ic_popup_disk_fullContent; } }
+            private static int _ic_popup_disk_fullContent = default;
+            private static bool _ic_popup_disk_fullReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_popup_reminder"/>
+            /// </summary>
+            public static int ic_popup_reminder { get { if (!_ic_popup_reminderReady) { _ic_popup_reminderContent = SGetField<int>(LocalBridgeClazz, "ic_popup_reminder"); _ic_popup_reminderReady = true; } return _ic_popup_reminderContent; } }
+            private static int _ic_popup_reminderContent = default;
+            private static bool _ic_popup_reminderReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_popup_sync"/>
+            /// </summary>
+            public static int ic_popup_sync { get { if (!_ic_popup_syncReady) { _ic_popup_syncContent = SGetField<int>(LocalBridgeClazz, "ic_popup_sync"); _ic_popup_syncReady = true; } return _ic_popup_syncContent; } }
+            private static int _ic_popup_syncContent = default;
+            private static bool _ic_popup_syncReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_search_category_default"/>
+            /// </summary>
+            public static int ic_search_category_default { get { if (!_ic_search_category_defaultReady) { _ic_search_category_defaultContent = SGetField<int>(LocalBridgeClazz, "ic_search_category_default"); _ic_search_category_defaultReady = true; } return _ic_search_category_defaultContent; } }
+            private static int _ic_search_category_defaultContent = default;
+            private static bool _ic_search_category_defaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#ic_secure"/>
+            /// </summary>
+            public static int ic_secure { get { if (!_ic_secureReady) { _ic_secureContent = SGetField<int>(LocalBridgeClazz, "ic_secure"); _ic_secureReady = true; } return _ic_secureContent; } }
+            private static int _ic_secureContent = default;
+            private static bool _ic_secureReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#list_selector_background"/>
+            /// </summary>
+            public static int list_selector_background { get { if (!_list_selector_backgroundReady) { _list_selector_backgroundContent = SGetField<int>(LocalBridgeClazz, "list_selector_background"); _list_selector_backgroundReady = true; } return _list_selector_backgroundContent; } }
+            private static int _list_selector_backgroundContent = default;
+            private static bool _list_selector_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#menu_frame"/>
+            /// </summary>
+            public static int menu_frame { get { if (!_menu_frameReady) { _menu_frameContent = SGetField<int>(LocalBridgeClazz, "menu_frame"); _menu_frameReady = true; } return _menu_frameContent; } }
+            private static int _menu_frameContent = default;
+            private static bool _menu_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#menu_full_frame"/>
+            /// </summary>
+            public static int menu_full_frame { get { if (!_menu_full_frameReady) { _menu_full_frameContent = SGetField<int>(LocalBridgeClazz, "menu_full_frame"); _menu_full_frameReady = true; } return _menu_full_frameContent; } }
+            private static int _menu_full_frameContent = default;
+            private static bool _menu_full_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#menuitem_background"/>
+            /// </summary>
+            public static int menuitem_background { get { if (!_menuitem_backgroundReady) { _menuitem_backgroundContent = SGetField<int>(LocalBridgeClazz, "menuitem_background"); _menuitem_backgroundReady = true; } return _menuitem_backgroundContent; } }
+            private static int _menuitem_backgroundContent = default;
+            private static bool _menuitem_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#picture_frame"/>
+            /// </summary>
+            public static int picture_frame { get { if (!_picture_frameReady) { _picture_frameContent = SGetField<int>(LocalBridgeClazz, "picture_frame"); _picture_frameReady = true; } return _picture_frameContent; } }
+            private static int _picture_frameContent = default;
+            private static bool _picture_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_audio_away"/>
+            /// </summary>
+            public static int presence_audio_away { get { if (!_presence_audio_awayReady) { _presence_audio_awayContent = SGetField<int>(LocalBridgeClazz, "presence_audio_away"); _presence_audio_awayReady = true; } return _presence_audio_awayContent; } }
+            private static int _presence_audio_awayContent = default;
+            private static bool _presence_audio_awayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_audio_busy"/>
+            /// </summary>
+            public static int presence_audio_busy { get { if (!_presence_audio_busyReady) { _presence_audio_busyContent = SGetField<int>(LocalBridgeClazz, "presence_audio_busy"); _presence_audio_busyReady = true; } return _presence_audio_busyContent; } }
+            private static int _presence_audio_busyContent = default;
+            private static bool _presence_audio_busyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_audio_online"/>
+            /// </summary>
+            public static int presence_audio_online { get { if (!_presence_audio_onlineReady) { _presence_audio_onlineContent = SGetField<int>(LocalBridgeClazz, "presence_audio_online"); _presence_audio_onlineReady = true; } return _presence_audio_onlineContent; } }
+            private static int _presence_audio_onlineContent = default;
+            private static bool _presence_audio_onlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_away"/>
+            /// </summary>
+            public static int presence_away { get { if (!_presence_awayReady) { _presence_awayContent = SGetField<int>(LocalBridgeClazz, "presence_away"); _presence_awayReady = true; } return _presence_awayContent; } }
+            private static int _presence_awayContent = default;
+            private static bool _presence_awayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_busy"/>
+            /// </summary>
+            public static int presence_busy { get { if (!_presence_busyReady) { _presence_busyContent = SGetField<int>(LocalBridgeClazz, "presence_busy"); _presence_busyReady = true; } return _presence_busyContent; } }
+            private static int _presence_busyContent = default;
+            private static bool _presence_busyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_invisible"/>
+            /// </summary>
+            public static int presence_invisible { get { if (!_presence_invisibleReady) { _presence_invisibleContent = SGetField<int>(LocalBridgeClazz, "presence_invisible"); _presence_invisibleReady = true; } return _presence_invisibleContent; } }
+            private static int _presence_invisibleContent = default;
+            private static bool _presence_invisibleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_offline"/>
+            /// </summary>
+            public static int presence_offline { get { if (!_presence_offlineReady) { _presence_offlineContent = SGetField<int>(LocalBridgeClazz, "presence_offline"); _presence_offlineReady = true; } return _presence_offlineContent; } }
+            private static int _presence_offlineContent = default;
+            private static bool _presence_offlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_online"/>
+            /// </summary>
+            public static int presence_online { get { if (!_presence_onlineReady) { _presence_onlineContent = SGetField<int>(LocalBridgeClazz, "presence_online"); _presence_onlineReady = true; } return _presence_onlineContent; } }
+            private static int _presence_onlineContent = default;
+            private static bool _presence_onlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_video_away"/>
+            /// </summary>
+            public static int presence_video_away { get { if (!_presence_video_awayReady) { _presence_video_awayContent = SGetField<int>(LocalBridgeClazz, "presence_video_away"); _presence_video_awayReady = true; } return _presence_video_awayContent; } }
+            private static int _presence_video_awayContent = default;
+            private static bool _presence_video_awayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_video_busy"/>
+            /// </summary>
+            public static int presence_video_busy { get { if (!_presence_video_busyReady) { _presence_video_busyContent = SGetField<int>(LocalBridgeClazz, "presence_video_busy"); _presence_video_busyReady = true; } return _presence_video_busyContent; } }
+            private static int _presence_video_busyContent = default;
+            private static bool _presence_video_busyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#presence_video_online"/>
+            /// </summary>
+            public static int presence_video_online { get { if (!_presence_video_onlineReady) { _presence_video_onlineContent = SGetField<int>(LocalBridgeClazz, "presence_video_online"); _presence_video_onlineReady = true; } return _presence_video_onlineContent; } }
+            private static int _presence_video_onlineContent = default;
+            private static bool _presence_video_onlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#progress_horizontal"/>
+            /// </summary>
+            public static int progress_horizontal { get { if (!_progress_horizontalReady) { _progress_horizontalContent = SGetField<int>(LocalBridgeClazz, "progress_horizontal"); _progress_horizontalReady = true; } return _progress_horizontalContent; } }
+            private static int _progress_horizontalContent = default;
+            private static bool _progress_horizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#progress_indeterminate_horizontal"/>
+            /// </summary>
+            public static int progress_indeterminate_horizontal { get { if (!_progress_indeterminate_horizontalReady) { _progress_indeterminate_horizontalContent = SGetField<int>(LocalBridgeClazz, "progress_indeterminate_horizontal"); _progress_indeterminate_horizontalReady = true; } return _progress_indeterminate_horizontalContent; } }
+            private static int _progress_indeterminate_horizontalContent = default;
+            private static bool _progress_indeterminate_horizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#radiobutton_off_background"/>
+            /// </summary>
+            public static int radiobutton_off_background { get { if (!_radiobutton_off_backgroundReady) { _radiobutton_off_backgroundContent = SGetField<int>(LocalBridgeClazz, "radiobutton_off_background"); _radiobutton_off_backgroundReady = true; } return _radiobutton_off_backgroundContent; } }
+            private static int _radiobutton_off_backgroundContent = default;
+            private static bool _radiobutton_off_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#radiobutton_on_background"/>
+            /// </summary>
+            public static int radiobutton_on_background { get { if (!_radiobutton_on_backgroundReady) { _radiobutton_on_backgroundContent = SGetField<int>(LocalBridgeClazz, "radiobutton_on_background"); _radiobutton_on_backgroundReady = true; } return _radiobutton_on_backgroundContent; } }
+            private static int _radiobutton_on_backgroundContent = default;
+            private static bool _radiobutton_on_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#screen_background_dark"/>
+            /// </summary>
+            public static int screen_background_dark { get { if (!_screen_background_darkReady) { _screen_background_darkContent = SGetField<int>(LocalBridgeClazz, "screen_background_dark"); _screen_background_darkReady = true; } return _screen_background_darkContent; } }
+            private static int _screen_background_darkContent = default;
+            private static bool _screen_background_darkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#screen_background_dark_transparent"/>
+            /// </summary>
+            public static int screen_background_dark_transparent { get { if (!_screen_background_dark_transparentReady) { _screen_background_dark_transparentContent = SGetField<int>(LocalBridgeClazz, "screen_background_dark_transparent"); _screen_background_dark_transparentReady = true; } return _screen_background_dark_transparentContent; } }
+            private static int _screen_background_dark_transparentContent = default;
+            private static bool _screen_background_dark_transparentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#screen_background_light"/>
+            /// </summary>
+            public static int screen_background_light { get { if (!_screen_background_lightReady) { _screen_background_lightContent = SGetField<int>(LocalBridgeClazz, "screen_background_light"); _screen_background_lightReady = true; } return _screen_background_lightContent; } }
+            private static int _screen_background_lightContent = default;
+            private static bool _screen_background_lightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#screen_background_light_transparent"/>
+            /// </summary>
+            public static int screen_background_light_transparent { get { if (!_screen_background_light_transparentReady) { _screen_background_light_transparentContent = SGetField<int>(LocalBridgeClazz, "screen_background_light_transparent"); _screen_background_light_transparentReady = true; } return _screen_background_light_transparentContent; } }
+            private static int _screen_background_light_transparentContent = default;
+            private static bool _screen_background_light_transparentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#spinner_background"/>
+            /// </summary>
+            public static int spinner_background { get { if (!_spinner_backgroundReady) { _spinner_backgroundContent = SGetField<int>(LocalBridgeClazz, "spinner_background"); _spinner_backgroundReady = true; } return _spinner_backgroundContent; } }
+            private static int _spinner_backgroundContent = default;
+            private static bool _spinner_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#spinner_dropdown_background"/>
+            /// </summary>
+            public static int spinner_dropdown_background { get { if (!_spinner_dropdown_backgroundReady) { _spinner_dropdown_backgroundContent = SGetField<int>(LocalBridgeClazz, "spinner_dropdown_background"); _spinner_dropdown_backgroundReady = true; } return _spinner_dropdown_backgroundContent; } }
+            private static int _spinner_dropdown_backgroundContent = default;
+            private static bool _spinner_dropdown_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#star_big_off"/>
+            /// </summary>
+            public static int star_big_off { get { if (!_star_big_offReady) { _star_big_offContent = SGetField<int>(LocalBridgeClazz, "star_big_off"); _star_big_offReady = true; } return _star_big_offContent; } }
+            private static int _star_big_offContent = default;
+            private static bool _star_big_offReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#star_big_on"/>
+            /// </summary>
+            public static int star_big_on { get { if (!_star_big_onReady) { _star_big_onContent = SGetField<int>(LocalBridgeClazz, "star_big_on"); _star_big_onReady = true; } return _star_big_onContent; } }
+            private static int _star_big_onContent = default;
+            private static bool _star_big_onReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#star_off"/>
+            /// </summary>
+            public static int star_off { get { if (!_star_offReady) { _star_offContent = SGetField<int>(LocalBridgeClazz, "star_off"); _star_offReady = true; } return _star_offContent; } }
+            private static int _star_offContent = default;
+            private static bool _star_offReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#star_on"/>
+            /// </summary>
+            public static int star_on { get { if (!_star_onReady) { _star_onContent = SGetField<int>(LocalBridgeClazz, "star_on"); _star_onReady = true; } return _star_onContent; } }
+            private static int _star_onContent = default;
+            private static bool _star_onReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_call_mute"/>
+            /// </summary>
+            public static int stat_notify_call_mute { get { if (!_stat_notify_call_muteReady) { _stat_notify_call_muteContent = SGetField<int>(LocalBridgeClazz, "stat_notify_call_mute"); _stat_notify_call_muteReady = true; } return _stat_notify_call_muteContent; } }
+            private static int _stat_notify_call_muteContent = default;
+            private static bool _stat_notify_call_muteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_chat"/>
+            /// </summary>
+            public static int stat_notify_chat { get { if (!_stat_notify_chatReady) { _stat_notify_chatContent = SGetField<int>(LocalBridgeClazz, "stat_notify_chat"); _stat_notify_chatReady = true; } return _stat_notify_chatContent; } }
+            private static int _stat_notify_chatContent = default;
+            private static bool _stat_notify_chatReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_error"/>
+            /// </summary>
+            public static int stat_notify_error { get { if (!_stat_notify_errorReady) { _stat_notify_errorContent = SGetField<int>(LocalBridgeClazz, "stat_notify_error"); _stat_notify_errorReady = true; } return _stat_notify_errorContent; } }
+            private static int _stat_notify_errorContent = default;
+            private static bool _stat_notify_errorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_missed_call"/>
+            /// </summary>
+            public static int stat_notify_missed_call { get { if (!_stat_notify_missed_callReady) { _stat_notify_missed_callContent = SGetField<int>(LocalBridgeClazz, "stat_notify_missed_call"); _stat_notify_missed_callReady = true; } return _stat_notify_missed_callContent; } }
+            private static int _stat_notify_missed_callContent = default;
+            private static bool _stat_notify_missed_callReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_more"/>
+            /// </summary>
+            public static int stat_notify_more { get { if (!_stat_notify_moreReady) { _stat_notify_moreContent = SGetField<int>(LocalBridgeClazz, "stat_notify_more"); _stat_notify_moreReady = true; } return _stat_notify_moreContent; } }
+            private static int _stat_notify_moreContent = default;
+            private static bool _stat_notify_moreReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_sdcard"/>
+            /// </summary>
+            public static int stat_notify_sdcard { get { if (!_stat_notify_sdcardReady) { _stat_notify_sdcardContent = SGetField<int>(LocalBridgeClazz, "stat_notify_sdcard"); _stat_notify_sdcardReady = true; } return _stat_notify_sdcardContent; } }
+            private static int _stat_notify_sdcardContent = default;
+            private static bool _stat_notify_sdcardReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_sdcard_prepare"/>
+            /// </summary>
+            public static int stat_notify_sdcard_prepare { get { if (!_stat_notify_sdcard_prepareReady) { _stat_notify_sdcard_prepareContent = SGetField<int>(LocalBridgeClazz, "stat_notify_sdcard_prepare"); _stat_notify_sdcard_prepareReady = true; } return _stat_notify_sdcard_prepareContent; } }
+            private static int _stat_notify_sdcard_prepareContent = default;
+            private static bool _stat_notify_sdcard_prepareReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_sdcard_usb"/>
+            /// </summary>
+            public static int stat_notify_sdcard_usb { get { if (!_stat_notify_sdcard_usbReady) { _stat_notify_sdcard_usbContent = SGetField<int>(LocalBridgeClazz, "stat_notify_sdcard_usb"); _stat_notify_sdcard_usbReady = true; } return _stat_notify_sdcard_usbContent; } }
+            private static int _stat_notify_sdcard_usbContent = default;
+            private static bool _stat_notify_sdcard_usbReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_sync"/>
+            /// </summary>
+            public static int stat_notify_sync { get { if (!_stat_notify_syncReady) { _stat_notify_syncContent = SGetField<int>(LocalBridgeClazz, "stat_notify_sync"); _stat_notify_syncReady = true; } return _stat_notify_syncContent; } }
+            private static int _stat_notify_syncContent = default;
+            private static bool _stat_notify_syncReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_sync_noanim"/>
+            /// </summary>
+            public static int stat_notify_sync_noanim { get { if (!_stat_notify_sync_noanimReady) { _stat_notify_sync_noanimContent = SGetField<int>(LocalBridgeClazz, "stat_notify_sync_noanim"); _stat_notify_sync_noanimReady = true; } return _stat_notify_sync_noanimContent; } }
+            private static int _stat_notify_sync_noanimContent = default;
+            private static bool _stat_notify_sync_noanimReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_notify_voicemail"/>
+            /// </summary>
+            public static int stat_notify_voicemail { get { if (!_stat_notify_voicemailReady) { _stat_notify_voicemailContent = SGetField<int>(LocalBridgeClazz, "stat_notify_voicemail"); _stat_notify_voicemailReady = true; } return _stat_notify_voicemailContent; } }
+            private static int _stat_notify_voicemailContent = default;
+            private static bool _stat_notify_voicemailReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_data_bluetooth"/>
+            /// </summary>
+            public static int stat_sys_data_bluetooth { get { if (!_stat_sys_data_bluetoothReady) { _stat_sys_data_bluetoothContent = SGetField<int>(LocalBridgeClazz, "stat_sys_data_bluetooth"); _stat_sys_data_bluetoothReady = true; } return _stat_sys_data_bluetoothContent; } }
+            private static int _stat_sys_data_bluetoothContent = default;
+            private static bool _stat_sys_data_bluetoothReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_download"/>
+            /// </summary>
+            public static int stat_sys_download { get { if (!_stat_sys_downloadReady) { _stat_sys_downloadContent = SGetField<int>(LocalBridgeClazz, "stat_sys_download"); _stat_sys_downloadReady = true; } return _stat_sys_downloadContent; } }
+            private static int _stat_sys_downloadContent = default;
+            private static bool _stat_sys_downloadReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_download_done"/>
+            /// </summary>
+            public static int stat_sys_download_done { get { if (!_stat_sys_download_doneReady) { _stat_sys_download_doneContent = SGetField<int>(LocalBridgeClazz, "stat_sys_download_done"); _stat_sys_download_doneReady = true; } return _stat_sys_download_doneContent; } }
+            private static int _stat_sys_download_doneContent = default;
+            private static bool _stat_sys_download_doneReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_headset"/>
+            /// </summary>
+            public static int stat_sys_headset { get { if (!_stat_sys_headsetReady) { _stat_sys_headsetContent = SGetField<int>(LocalBridgeClazz, "stat_sys_headset"); _stat_sys_headsetReady = true; } return _stat_sys_headsetContent; } }
+            private static int _stat_sys_headsetContent = default;
+            private static bool _stat_sys_headsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_phone_call"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int stat_sys_phone_call { get { if (!_stat_sys_phone_callReady) { _stat_sys_phone_callContent = SGetField<int>(LocalBridgeClazz, "stat_sys_phone_call"); _stat_sys_phone_callReady = true; } return _stat_sys_phone_callContent; } }
+            private static int _stat_sys_phone_callContent = default;
+            private static bool _stat_sys_phone_callReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_phone_call_forward"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int stat_sys_phone_call_forward { get { if (!_stat_sys_phone_call_forwardReady) { _stat_sys_phone_call_forwardContent = SGetField<int>(LocalBridgeClazz, "stat_sys_phone_call_forward"); _stat_sys_phone_call_forwardReady = true; } return _stat_sys_phone_call_forwardContent; } }
+            private static int _stat_sys_phone_call_forwardContent = default;
+            private static bool _stat_sys_phone_call_forwardReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_phone_call_on_hold"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int stat_sys_phone_call_on_hold { get { if (!_stat_sys_phone_call_on_holdReady) { _stat_sys_phone_call_on_holdContent = SGetField<int>(LocalBridgeClazz, "stat_sys_phone_call_on_hold"); _stat_sys_phone_call_on_holdReady = true; } return _stat_sys_phone_call_on_holdContent; } }
+            private static int _stat_sys_phone_call_on_holdContent = default;
+            private static bool _stat_sys_phone_call_on_holdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_speakerphone"/>
+            /// </summary>
+            public static int stat_sys_speakerphone { get { if (!_stat_sys_speakerphoneReady) { _stat_sys_speakerphoneContent = SGetField<int>(LocalBridgeClazz, "stat_sys_speakerphone"); _stat_sys_speakerphoneReady = true; } return _stat_sys_speakerphoneContent; } }
+            private static int _stat_sys_speakerphoneContent = default;
+            private static bool _stat_sys_speakerphoneReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_upload"/>
+            /// </summary>
+            public static int stat_sys_upload { get { if (!_stat_sys_uploadReady) { _stat_sys_uploadContent = SGetField<int>(LocalBridgeClazz, "stat_sys_upload"); _stat_sys_uploadReady = true; } return _stat_sys_uploadContent; } }
+            private static int _stat_sys_uploadContent = default;
+            private static bool _stat_sys_uploadReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_upload_done"/>
+            /// </summary>
+            public static int stat_sys_upload_done { get { if (!_stat_sys_upload_doneReady) { _stat_sys_upload_doneContent = SGetField<int>(LocalBridgeClazz, "stat_sys_upload_done"); _stat_sys_upload_doneReady = true; } return _stat_sys_upload_doneContent; } }
+            private static int _stat_sys_upload_doneContent = default;
+            private static bool _stat_sys_upload_doneReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_vp_phone_call"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int stat_sys_vp_phone_call { get { if (!_stat_sys_vp_phone_callReady) { _stat_sys_vp_phone_callContent = SGetField<int>(LocalBridgeClazz, "stat_sys_vp_phone_call"); _stat_sys_vp_phone_callReady = true; } return _stat_sys_vp_phone_callContent; } }
+            private static int _stat_sys_vp_phone_callContent = default;
+            private static bool _stat_sys_vp_phone_callReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_vp_phone_call_on_hold"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int stat_sys_vp_phone_call_on_hold { get { if (!_stat_sys_vp_phone_call_on_holdReady) { _stat_sys_vp_phone_call_on_holdContent = SGetField<int>(LocalBridgeClazz, "stat_sys_vp_phone_call_on_hold"); _stat_sys_vp_phone_call_on_holdReady = true; } return _stat_sys_vp_phone_call_on_holdContent; } }
+            private static int _stat_sys_vp_phone_call_on_holdContent = default;
+            private static bool _stat_sys_vp_phone_call_on_holdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#stat_sys_warning"/>
+            /// </summary>
+            public static int stat_sys_warning { get { if (!_stat_sys_warningReady) { _stat_sys_warningContent = SGetField<int>(LocalBridgeClazz, "stat_sys_warning"); _stat_sys_warningReady = true; } return _stat_sys_warningContent; } }
+            private static int _stat_sys_warningContent = default;
+            private static bool _stat_sys_warningReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#status_bar_item_app_background"/>
+            /// </summary>
+            public static int status_bar_item_app_background { get { if (!_status_bar_item_app_backgroundReady) { _status_bar_item_app_backgroundContent = SGetField<int>(LocalBridgeClazz, "status_bar_item_app_background"); _status_bar_item_app_backgroundReady = true; } return _status_bar_item_app_backgroundContent; } }
+            private static int _status_bar_item_app_backgroundContent = default;
+            private static bool _status_bar_item_app_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#status_bar_item_background"/>
+            /// </summary>
+            public static int status_bar_item_background { get { if (!_status_bar_item_backgroundReady) { _status_bar_item_backgroundContent = SGetField<int>(LocalBridgeClazz, "status_bar_item_background"); _status_bar_item_backgroundReady = true; } return _status_bar_item_backgroundContent; } }
+            private static int _status_bar_item_backgroundContent = default;
+            private static bool _status_bar_item_backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#sym_action_call"/>
+            /// </summary>
+            public static int sym_action_call { get { if (!_sym_action_callReady) { _sym_action_callContent = SGetField<int>(LocalBridgeClazz, "sym_action_call"); _sym_action_callReady = true; } return _sym_action_callContent; } }
+            private static int _sym_action_callContent = default;
+            private static bool _sym_action_callReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#sym_action_chat"/>
+            /// </summary>
+            public static int sym_action_chat { get { if (!_sym_action_chatReady) { _sym_action_chatContent = SGetField<int>(LocalBridgeClazz, "sym_action_chat"); _sym_action_chatReady = true; } return _sym_action_chatContent; } }
+            private static int _sym_action_chatContent = default;
+            private static bool _sym_action_chatReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#sym_action_email"/>
+            /// </summary>
+            public static int sym_action_email { get { if (!_sym_action_emailReady) { _sym_action_emailContent = SGetField<int>(LocalBridgeClazz, "sym_action_email"); _sym_action_emailReady = true; } return _sym_action_emailContent; } }
+            private static int _sym_action_emailContent = default;
+            private static bool _sym_action_emailReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#sym_call_incoming"/>
+            /// </summary>
+            public static int sym_call_incoming { get { if (!_sym_call_incomingReady) { _sym_call_incomingContent = SGetField<int>(LocalBridgeClazz, "sym_call_incoming"); _sym_call_incomingReady = true; } return _sym_call_incomingContent; } }
+            private static int _sym_call_incomingContent = default;
+            private static bool _sym_call_incomingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#sym_call_missed"/>
+            /// </summary>
+            public static int sym_call_missed { get { if (!_sym_call_missedReady) { _sym_call_missedContent = SGetField<int>(LocalBridgeClazz, "sym_call_missed"); _sym_call_missedReady = true; } return _sym_call_missedContent; } }
+            private static int _sym_call_missedContent = default;
+            private static bool _sym_call_missedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#sym_call_outgoing"/>
+            /// </summary>
+            public static int sym_call_outgoing { get { if (!_sym_call_outgoingReady) { _sym_call_outgoingContent = SGetField<int>(LocalBridgeClazz, "sym_call_outgoing"); _sym_call_outgoingReady = true; } return _sym_call_outgoingContent; } }
+            private static int _sym_call_outgoingContent = default;
+            private static bool _sym_call_outgoingReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#sym_contact_card"/>
+            /// </summary>
+            public static int sym_contact_card { get { if (!_sym_contact_cardReady) { _sym_contact_cardContent = SGetField<int>(LocalBridgeClazz, "sym_contact_card"); _sym_contact_cardReady = true; } return _sym_contact_cardContent; } }
+            private static int _sym_contact_cardContent = default;
+            private static bool _sym_contact_cardReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#sym_def_app_icon"/>
+            /// </summary>
+            public static int sym_def_app_icon { get { if (!_sym_def_app_iconReady) { _sym_def_app_iconContent = SGetField<int>(LocalBridgeClazz, "sym_def_app_icon"); _sym_def_app_iconReady = true; } return _sym_def_app_iconContent; } }
+            private static int _sym_def_app_iconContent = default;
+            private static bool _sym_def_app_iconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#title_bar"/>
+            /// </summary>
+            public static int title_bar { get { if (!_title_barReady) { _title_barContent = SGetField<int>(LocalBridgeClazz, "title_bar"); _title_barReady = true; } return _title_barContent; } }
+            private static int _title_barContent = default;
+            private static bool _title_barReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#title_bar_tall"/>
+            /// </summary>
+            public static int title_bar_tall { get { if (!_title_bar_tallReady) { _title_bar_tallContent = SGetField<int>(LocalBridgeClazz, "title_bar_tall"); _title_bar_tallReady = true; } return _title_bar_tallContent; } }
+            private static int _title_bar_tallContent = default;
+            private static bool _title_bar_tallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#toast_frame"/>
+            /// </summary>
+            public static int toast_frame { get { if (!_toast_frameReady) { _toast_frameContent = SGetField<int>(LocalBridgeClazz, "toast_frame"); _toast_frameReady = true; } return _toast_frameContent; } }
+            private static int _toast_frameContent = default;
+            private static bool _toast_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.drawable.html#zoom_plate"/>
+            /// </summary>
+            public static int zoom_plate { get { if (!_zoom_plateReady) { _zoom_plateContent = SGetField<int>(LocalBridgeClazz, "zoom_plate"); _zoom_plateReady = true; } return _zoom_plateContent; } }
+            private static int _zoom_plateContent = default;
+            private static bool _zoom_plateReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region fraction
+        public partial class fraction
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region id
+        public partial class id
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionContextClick"/>
+            /// </summary>
+            public static int accessibilityActionContextClick { get { if (!_accessibilityActionContextClickReady) { _accessibilityActionContextClickContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionContextClick"); _accessibilityActionContextClickReady = true; } return _accessibilityActionContextClickContent; } }
+            private static int _accessibilityActionContextClickContent = default;
+            private static bool _accessibilityActionContextClickReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionDragCancel"/>
+            /// </summary>
+            public static int accessibilityActionDragCancel { get { if (!_accessibilityActionDragCancelReady) { _accessibilityActionDragCancelContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionDragCancel"); _accessibilityActionDragCancelReady = true; } return _accessibilityActionDragCancelContent; } }
+            private static int _accessibilityActionDragCancelContent = default;
+            private static bool _accessibilityActionDragCancelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionDragDrop"/>
+            /// </summary>
+            public static int accessibilityActionDragDrop { get { if (!_accessibilityActionDragDropReady) { _accessibilityActionDragDropContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionDragDrop"); _accessibilityActionDragDropReady = true; } return _accessibilityActionDragDropContent; } }
+            private static int _accessibilityActionDragDropContent = default;
+            private static bool _accessibilityActionDragDropReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionDragStart"/>
+            /// </summary>
+            public static int accessibilityActionDragStart { get { if (!_accessibilityActionDragStartReady) { _accessibilityActionDragStartContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionDragStart"); _accessibilityActionDragStartReady = true; } return _accessibilityActionDragStartContent; } }
+            private static int _accessibilityActionDragStartContent = default;
+            private static bool _accessibilityActionDragStartReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionHideTooltip"/>
+            /// </summary>
+            public static int accessibilityActionHideTooltip { get { if (!_accessibilityActionHideTooltipReady) { _accessibilityActionHideTooltipContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionHideTooltip"); _accessibilityActionHideTooltipReady = true; } return _accessibilityActionHideTooltipContent; } }
+            private static int _accessibilityActionHideTooltipContent = default;
+            private static bool _accessibilityActionHideTooltipReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionImeEnter"/>
+            /// </summary>
+            public static int accessibilityActionImeEnter { get { if (!_accessibilityActionImeEnterReady) { _accessibilityActionImeEnterContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionImeEnter"); _accessibilityActionImeEnterReady = true; } return _accessibilityActionImeEnterContent; } }
+            private static int _accessibilityActionImeEnterContent = default;
+            private static bool _accessibilityActionImeEnterReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionMoveWindow"/>
+            /// </summary>
+            public static int accessibilityActionMoveWindow { get { if (!_accessibilityActionMoveWindowReady) { _accessibilityActionMoveWindowContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionMoveWindow"); _accessibilityActionMoveWindowReady = true; } return _accessibilityActionMoveWindowContent; } }
+            private static int _accessibilityActionMoveWindowContent = default;
+            private static bool _accessibilityActionMoveWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionPageDown"/>
+            /// </summary>
+            public static int accessibilityActionPageDown { get { if (!_accessibilityActionPageDownReady) { _accessibilityActionPageDownContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionPageDown"); _accessibilityActionPageDownReady = true; } return _accessibilityActionPageDownContent; } }
+            private static int _accessibilityActionPageDownContent = default;
+            private static bool _accessibilityActionPageDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionPageLeft"/>
+            /// </summary>
+            public static int accessibilityActionPageLeft { get { if (!_accessibilityActionPageLeftReady) { _accessibilityActionPageLeftContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionPageLeft"); _accessibilityActionPageLeftReady = true; } return _accessibilityActionPageLeftContent; } }
+            private static int _accessibilityActionPageLeftContent = default;
+            private static bool _accessibilityActionPageLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionPageRight"/>
+            /// </summary>
+            public static int accessibilityActionPageRight { get { if (!_accessibilityActionPageRightReady) { _accessibilityActionPageRightContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionPageRight"); _accessibilityActionPageRightReady = true; } return _accessibilityActionPageRightContent; } }
+            private static int _accessibilityActionPageRightContent = default;
+            private static bool _accessibilityActionPageRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionPageUp"/>
+            /// </summary>
+            public static int accessibilityActionPageUp { get { if (!_accessibilityActionPageUpReady) { _accessibilityActionPageUpContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionPageUp"); _accessibilityActionPageUpReady = true; } return _accessibilityActionPageUpContent; } }
+            private static int _accessibilityActionPageUpContent = default;
+            private static bool _accessibilityActionPageUpReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionPressAndHold"/>
+            /// </summary>
+            public static int accessibilityActionPressAndHold { get { if (!_accessibilityActionPressAndHoldReady) { _accessibilityActionPressAndHoldContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionPressAndHold"); _accessibilityActionPressAndHoldReady = true; } return _accessibilityActionPressAndHoldContent; } }
+            private static int _accessibilityActionPressAndHoldContent = default;
+            private static bool _accessibilityActionPressAndHoldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionScrollDown"/>
+            /// </summary>
+            public static int accessibilityActionScrollDown { get { if (!_accessibilityActionScrollDownReady) { _accessibilityActionScrollDownContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionScrollDown"); _accessibilityActionScrollDownReady = true; } return _accessibilityActionScrollDownContent; } }
+            private static int _accessibilityActionScrollDownContent = default;
+            private static bool _accessibilityActionScrollDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionScrollInDirection"/>
+            /// </summary>
+            public static int accessibilityActionScrollInDirection { get { if (!_accessibilityActionScrollInDirectionReady) { _accessibilityActionScrollInDirectionContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionScrollInDirection"); _accessibilityActionScrollInDirectionReady = true; } return _accessibilityActionScrollInDirectionContent; } }
+            private static int _accessibilityActionScrollInDirectionContent = default;
+            private static bool _accessibilityActionScrollInDirectionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionScrollLeft"/>
+            /// </summary>
+            public static int accessibilityActionScrollLeft { get { if (!_accessibilityActionScrollLeftReady) { _accessibilityActionScrollLeftContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionScrollLeft"); _accessibilityActionScrollLeftReady = true; } return _accessibilityActionScrollLeftContent; } }
+            private static int _accessibilityActionScrollLeftContent = default;
+            private static bool _accessibilityActionScrollLeftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionScrollRight"/>
+            /// </summary>
+            public static int accessibilityActionScrollRight { get { if (!_accessibilityActionScrollRightReady) { _accessibilityActionScrollRightContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionScrollRight"); _accessibilityActionScrollRightReady = true; } return _accessibilityActionScrollRightContent; } }
+            private static int _accessibilityActionScrollRightContent = default;
+            private static bool _accessibilityActionScrollRightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionScrollToPosition"/>
+            /// </summary>
+            public static int accessibilityActionScrollToPosition { get { if (!_accessibilityActionScrollToPositionReady) { _accessibilityActionScrollToPositionContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionScrollToPosition"); _accessibilityActionScrollToPositionReady = true; } return _accessibilityActionScrollToPositionContent; } }
+            private static int _accessibilityActionScrollToPositionContent = default;
+            private static bool _accessibilityActionScrollToPositionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionScrollUp"/>
+            /// </summary>
+            public static int accessibilityActionScrollUp { get { if (!_accessibilityActionScrollUpReady) { _accessibilityActionScrollUpContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionScrollUp"); _accessibilityActionScrollUpReady = true; } return _accessibilityActionScrollUpContent; } }
+            private static int _accessibilityActionScrollUpContent = default;
+            private static bool _accessibilityActionScrollUpReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionSetProgress"/>
+            /// </summary>
+            public static int accessibilityActionSetProgress { get { if (!_accessibilityActionSetProgressReady) { _accessibilityActionSetProgressContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionSetProgress"); _accessibilityActionSetProgressReady = true; } return _accessibilityActionSetProgressContent; } }
+            private static int _accessibilityActionSetProgressContent = default;
+            private static bool _accessibilityActionSetProgressReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionShowOnScreen"/>
+            /// </summary>
+            public static int accessibilityActionShowOnScreen { get { if (!_accessibilityActionShowOnScreenReady) { _accessibilityActionShowOnScreenContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionShowOnScreen"); _accessibilityActionShowOnScreenReady = true; } return _accessibilityActionShowOnScreenContent; } }
+            private static int _accessibilityActionShowOnScreenContent = default;
+            private static bool _accessibilityActionShowOnScreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionShowTextSuggestions"/>
+            /// </summary>
+            public static int accessibilityActionShowTextSuggestions { get { if (!_accessibilityActionShowTextSuggestionsReady) { _accessibilityActionShowTextSuggestionsContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionShowTextSuggestions"); _accessibilityActionShowTextSuggestionsReady = true; } return _accessibilityActionShowTextSuggestionsContent; } }
+            private static int _accessibilityActionShowTextSuggestionsContent = default;
+            private static bool _accessibilityActionShowTextSuggestionsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilityActionShowTooltip"/>
+            /// </summary>
+            public static int accessibilityActionShowTooltip { get { if (!_accessibilityActionShowTooltipReady) { _accessibilityActionShowTooltipContent = SGetField<int>(LocalBridgeClazz, "accessibilityActionShowTooltip"); _accessibilityActionShowTooltipReady = true; } return _accessibilityActionShowTooltipContent; } }
+            private static int _accessibilityActionShowTooltipContent = default;
+            private static bool _accessibilityActionShowTooltipReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionBack"/>
+            /// </summary>
+            public static int accessibilitySystemActionBack { get { if (!_accessibilitySystemActionBackReady) { _accessibilitySystemActionBackContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionBack"); _accessibilitySystemActionBackReady = true; } return _accessibilitySystemActionBackContent; } }
+            private static int _accessibilitySystemActionBackContent = default;
+            private static bool _accessibilitySystemActionBackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionHome"/>
+            /// </summary>
+            public static int accessibilitySystemActionHome { get { if (!_accessibilitySystemActionHomeReady) { _accessibilitySystemActionHomeContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionHome"); _accessibilitySystemActionHomeReady = true; } return _accessibilitySystemActionHomeContent; } }
+            private static int _accessibilitySystemActionHomeContent = default;
+            private static bool _accessibilitySystemActionHomeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionLockScreen"/>
+            /// </summary>
+            public static int accessibilitySystemActionLockScreen { get { if (!_accessibilitySystemActionLockScreenReady) { _accessibilitySystemActionLockScreenContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionLockScreen"); _accessibilitySystemActionLockScreenReady = true; } return _accessibilitySystemActionLockScreenContent; } }
+            private static int _accessibilitySystemActionLockScreenContent = default;
+            private static bool _accessibilitySystemActionLockScreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionNotifications"/>
+            /// </summary>
+            public static int accessibilitySystemActionNotifications { get { if (!_accessibilitySystemActionNotificationsReady) { _accessibilitySystemActionNotificationsContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionNotifications"); _accessibilitySystemActionNotificationsReady = true; } return _accessibilitySystemActionNotificationsContent; } }
+            private static int _accessibilitySystemActionNotificationsContent = default;
+            private static bool _accessibilitySystemActionNotificationsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionPowerDialog"/>
+            /// </summary>
+            public static int accessibilitySystemActionPowerDialog { get { if (!_accessibilitySystemActionPowerDialogReady) { _accessibilitySystemActionPowerDialogContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionPowerDialog"); _accessibilitySystemActionPowerDialogReady = true; } return _accessibilitySystemActionPowerDialogContent; } }
+            private static int _accessibilitySystemActionPowerDialogContent = default;
+            private static bool _accessibilitySystemActionPowerDialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionQuickSettings"/>
+            /// </summary>
+            public static int accessibilitySystemActionQuickSettings { get { if (!_accessibilitySystemActionQuickSettingsReady) { _accessibilitySystemActionQuickSettingsContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionQuickSettings"); _accessibilitySystemActionQuickSettingsReady = true; } return _accessibilitySystemActionQuickSettingsContent; } }
+            private static int _accessibilitySystemActionQuickSettingsContent = default;
+            private static bool _accessibilitySystemActionQuickSettingsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionRecents"/>
+            /// </summary>
+            public static int accessibilitySystemActionRecents { get { if (!_accessibilitySystemActionRecentsReady) { _accessibilitySystemActionRecentsContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionRecents"); _accessibilitySystemActionRecentsReady = true; } return _accessibilitySystemActionRecentsContent; } }
+            private static int _accessibilitySystemActionRecentsContent = default;
+            private static bool _accessibilitySystemActionRecentsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionTakeScreenshot"/>
+            /// </summary>
+            public static int accessibilitySystemActionTakeScreenshot { get { if (!_accessibilitySystemActionTakeScreenshotReady) { _accessibilitySystemActionTakeScreenshotContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionTakeScreenshot"); _accessibilitySystemActionTakeScreenshotReady = true; } return _accessibilitySystemActionTakeScreenshotContent; } }
+            private static int _accessibilitySystemActionTakeScreenshotContent = default;
+            private static bool _accessibilitySystemActionTakeScreenshotReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#accessibilitySystemActionToggleSplitScreen"/>
+            /// </summary>
+            public static int accessibilitySystemActionToggleSplitScreen { get { if (!_accessibilitySystemActionToggleSplitScreenReady) { _accessibilitySystemActionToggleSplitScreenContent = SGetField<int>(LocalBridgeClazz, "accessibilitySystemActionToggleSplitScreen"); _accessibilitySystemActionToggleSplitScreenReady = true; } return _accessibilitySystemActionToggleSplitScreenContent; } }
+            private static int _accessibilitySystemActionToggleSplitScreenContent = default;
+            private static bool _accessibilitySystemActionToggleSplitScreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#addToDictionary"/>
+            /// </summary>
+            public static int addToDictionary { get { if (!_addToDictionaryReady) { _addToDictionaryContent = SGetField<int>(LocalBridgeClazz, "addToDictionary"); _addToDictionaryReady = true; } return _addToDictionaryContent; } }
+            private static int _addToDictionaryContent = default;
+            private static bool _addToDictionaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#autofill"/>
+            /// </summary>
+            public static int autofill { get { if (!_autofillReady) { _autofillContent = SGetField<int>(LocalBridgeClazz, "autofill"); _autofillReady = true; } return _autofillContent; } }
+            private static int _autofillContent = default;
+            private static bool _autofillReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#background"/>
+            /// </summary>
+            public static int background { get { if (!_backgroundReady) { _backgroundContent = SGetField<int>(LocalBridgeClazz, "background"); _backgroundReady = true; } return _backgroundContent; } }
+            private static int _backgroundContent = default;
+            private static bool _backgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#bold"/>
+            /// </summary>
+            public static int bold { get { if (!_boldReady) { _boldContent = SGetField<int>(LocalBridgeClazz, "bold"); _boldReady = true; } return _boldContent; } }
+            private static int _boldContent = default;
+            private static bool _boldReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#button1"/>
+            /// </summary>
+            public static int button1 { get { if (!_button1Ready) { _button1Content = SGetField<int>(LocalBridgeClazz, "button1"); _button1Ready = true; } return _button1Content; } }
+            private static int _button1Content = default;
+            private static bool _button1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#button2"/>
+            /// </summary>
+            public static int button2 { get { if (!_button2Ready) { _button2Content = SGetField<int>(LocalBridgeClazz, "button2"); _button2Ready = true; } return _button2Content; } }
+            private static int _button2Content = default;
+            private static bool _button2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#button3"/>
+            /// </summary>
+            public static int button3 { get { if (!_button3Ready) { _button3Content = SGetField<int>(LocalBridgeClazz, "button3"); _button3Ready = true; } return _button3Content; } }
+            private static int _button3Content = default;
+            private static bool _button3Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#candidatesArea"/>
+            /// </summary>
+            public static int candidatesArea { get { if (!_candidatesAreaReady) { _candidatesAreaContent = SGetField<int>(LocalBridgeClazz, "candidatesArea"); _candidatesAreaReady = true; } return _candidatesAreaContent; } }
+            private static int _candidatesAreaContent = default;
+            private static bool _candidatesAreaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#checkbox"/>
+            /// </summary>
+            public static int checkbox { get { if (!_checkboxReady) { _checkboxContent = SGetField<int>(LocalBridgeClazz, "checkbox"); _checkboxReady = true; } return _checkboxContent; } }
+            private static int _checkboxContent = default;
+            private static bool _checkboxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#closeButton"/>
+            /// </summary>
+            public static int closeButton { get { if (!_closeButtonReady) { _closeButtonContent = SGetField<int>(LocalBridgeClazz, "closeButton"); _closeButtonReady = true; } return _closeButtonContent; } }
+            private static int _closeButtonContent = default;
+            private static bool _closeButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#content"/>
+            /// </summary>
+            public static int content { get { if (!_contentReady) { _contentContent = SGetField<int>(LocalBridgeClazz, "content"); _contentReady = true; } return _contentContent; } }
+            private static int _contentContent = default;
+            private static bool _contentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#copy"/>
+            /// </summary>
+            public static int copy { get { if (!_copyReady) { _copyContent = SGetField<int>(LocalBridgeClazz, "copy"); _copyReady = true; } return _copyContent; } }
+            private static int _copyContent = default;
+            private static bool _copyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#copyUrl"/>
+            /// </summary>
+            public static int copyUrl { get { if (!_copyUrlReady) { _copyUrlContent = SGetField<int>(LocalBridgeClazz, "copyUrl"); _copyUrlReady = true; } return _copyUrlContent; } }
+            private static int _copyUrlContent = default;
+            private static bool _copyUrlReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#custom"/>
+            /// </summary>
+            public static int custom { get { if (!_customReady) { _customContent = SGetField<int>(LocalBridgeClazz, "custom"); _customReady = true; } return _customContent; } }
+            private static int _customContent = default;
+            private static bool _customReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#cut"/>
+            /// </summary>
+            public static int cut { get { if (!_cutReady) { _cutContent = SGetField<int>(LocalBridgeClazz, "cut"); _cutReady = true; } return _cutContent; } }
+            private static int _cutContent = default;
+            private static bool _cutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#edit"/>
+            /// </summary>
+            public static int edit { get { if (!_editReady) { _editContent = SGetField<int>(LocalBridgeClazz, "edit"); _editReady = true; } return _editContent; } }
+            private static int _editContent = default;
+            private static bool _editReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#empty"/>
+            /// </summary>
+            public static int empty { get { if (!_emptyReady) { _emptyContent = SGetField<int>(LocalBridgeClazz, "empty"); _emptyReady = true; } return _emptyContent; } }
+            private static int _emptyContent = default;
+            private static bool _emptyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#extractArea"/>
+            /// </summary>
+            public static int extractArea { get { if (!_extractAreaReady) { _extractAreaContent = SGetField<int>(LocalBridgeClazz, "extractArea"); _extractAreaReady = true; } return _extractAreaContent; } }
+            private static int _extractAreaContent = default;
+            private static bool _extractAreaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#hint"/>
+            /// </summary>
+            public static int hint { get { if (!_hintReady) { _hintContent = SGetField<int>(LocalBridgeClazz, "hint"); _hintReady = true; } return _hintContent; } }
+            private static int _hintContent = default;
+            private static bool _hintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#home"/>
+            /// </summary>
+            public static int home { get { if (!_homeReady) { _homeContent = SGetField<int>(LocalBridgeClazz, "home"); _homeReady = true; } return _homeContent; } }
+            private static int _homeContent = default;
+            private static bool _homeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#icon"/>
+            /// </summary>
+            public static int icon { get { if (!_iconReady) { _iconContent = SGetField<int>(LocalBridgeClazz, "icon"); _iconReady = true; } return _iconContent; } }
+            private static int _iconContent = default;
+            private static bool _iconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#icon_frame"/>
+            /// </summary>
+            public static int icon_frame { get { if (!_icon_frameReady) { _icon_frameContent = SGetField<int>(LocalBridgeClazz, "icon_frame"); _icon_frameReady = true; } return _icon_frameContent; } }
+            private static int _icon_frameContent = default;
+            private static bool _icon_frameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#icon1"/>
+            /// </summary>
+            public static int icon1 { get { if (!_icon1Ready) { _icon1Content = SGetField<int>(LocalBridgeClazz, "icon1"); _icon1Ready = true; } return _icon1Content; } }
+            private static int _icon1Content = default;
+            private static bool _icon1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#icon2"/>
+            /// </summary>
+            public static int icon2 { get { if (!_icon2Ready) { _icon2Content = SGetField<int>(LocalBridgeClazz, "icon2"); _icon2Ready = true; } return _icon2Content; } }
+            private static int _icon2Content = default;
+            private static bool _icon2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#input"/>
+            /// </summary>
+            public static int input { get { if (!_inputReady) { _inputContent = SGetField<int>(LocalBridgeClazz, "input"); _inputReady = true; } return _inputContent; } }
+            private static int _inputContent = default;
+            private static bool _inputReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#inputArea"/>
+            /// </summary>
+            public static int inputArea { get { if (!_inputAreaReady) { _inputAreaContent = SGetField<int>(LocalBridgeClazz, "inputArea"); _inputAreaReady = true; } return _inputAreaContent; } }
+            private static int _inputAreaContent = default;
+            private static bool _inputAreaReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#inputExtractAccessories"/>
+            /// </summary>
+            public static int inputExtractAccessories { get { if (!_inputExtractAccessoriesReady) { _inputExtractAccessoriesContent = SGetField<int>(LocalBridgeClazz, "inputExtractAccessories"); _inputExtractAccessoriesReady = true; } return _inputExtractAccessoriesContent; } }
+            private static int _inputExtractAccessoriesContent = default;
+            private static bool _inputExtractAccessoriesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#inputExtractAction"/>
+            /// </summary>
+            public static int inputExtractAction { get { if (!_inputExtractActionReady) { _inputExtractActionContent = SGetField<int>(LocalBridgeClazz, "inputExtractAction"); _inputExtractActionReady = true; } return _inputExtractActionContent; } }
+            private static int _inputExtractActionContent = default;
+            private static bool _inputExtractActionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#inputExtractEditText"/>
+            /// </summary>
+            public static int inputExtractEditText { get { if (!_inputExtractEditTextReady) { _inputExtractEditTextContent = SGetField<int>(LocalBridgeClazz, "inputExtractEditText"); _inputExtractEditTextReady = true; } return _inputExtractEditTextContent; } }
+            private static int _inputExtractEditTextContent = default;
+            private static bool _inputExtractEditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#italic"/>
+            /// </summary>
+            public static int italic { get { if (!_italicReady) { _italicContent = SGetField<int>(LocalBridgeClazz, "italic"); _italicReady = true; } return _italicContent; } }
+            private static int _italicContent = default;
+            private static bool _italicReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#keyboardView"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int keyboardView { get { if (!_keyboardViewReady) { _keyboardViewContent = SGetField<int>(LocalBridgeClazz, "keyboardView"); _keyboardViewReady = true; } return _keyboardViewContent; } }
+            private static int _keyboardViewContent = default;
+            private static bool _keyboardViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#list"/>
+            /// </summary>
+            public static int list { get { if (!_listReady) { _listContent = SGetField<int>(LocalBridgeClazz, "list"); _listReady = true; } return _listContent; } }
+            private static int _listContent = default;
+            private static bool _listReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#list_container"/>
+            /// </summary>
+            public static int list_container { get { if (!_list_containerReady) { _list_containerContent = SGetField<int>(LocalBridgeClazz, "list_container"); _list_containerReady = true; } return _list_containerContent; } }
+            private static int _list_containerContent = default;
+            private static bool _list_containerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#mask"/>
+            /// </summary>
+            public static int mask { get { if (!_maskReady) { _maskContent = SGetField<int>(LocalBridgeClazz, "mask"); _maskReady = true; } return _maskContent; } }
+            private static int _maskContent = default;
+            private static bool _maskReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#message"/>
+            /// </summary>
+            public static int message { get { if (!_messageReady) { _messageContent = SGetField<int>(LocalBridgeClazz, "message"); _messageReady = true; } return _messageContent; } }
+            private static int _messageContent = default;
+            private static bool _messageReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#navigationBarBackground"/>
+            /// </summary>
+            public static int navigationBarBackground { get { if (!_navigationBarBackgroundReady) { _navigationBarBackgroundContent = SGetField<int>(LocalBridgeClazz, "navigationBarBackground"); _navigationBarBackgroundReady = true; } return _navigationBarBackgroundContent; } }
+            private static int _navigationBarBackgroundContent = default;
+            private static bool _navigationBarBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#paste"/>
+            /// </summary>
+            public static int paste { get { if (!_pasteReady) { _pasteContent = SGetField<int>(LocalBridgeClazz, "paste"); _pasteReady = true; } return _pasteContent; } }
+            private static int _pasteContent = default;
+            private static bool _pasteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#pasteAsPlainText"/>
+            /// </summary>
+            public static int pasteAsPlainText { get { if (!_pasteAsPlainTextReady) { _pasteAsPlainTextContent = SGetField<int>(LocalBridgeClazz, "pasteAsPlainText"); _pasteAsPlainTextReady = true; } return _pasteAsPlainTextContent; } }
+            private static int _pasteAsPlainTextContent = default;
+            private static bool _pasteAsPlainTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#primary"/>
+            /// </summary>
+            public static int primary { get { if (!_primaryReady) { _primaryContent = SGetField<int>(LocalBridgeClazz, "primary"); _primaryReady = true; } return _primaryContent; } }
+            private static int _primaryContent = default;
+            private static bool _primaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#progress"/>
+            /// </summary>
+            public static int progress { get { if (!_progressReady) { _progressContent = SGetField<int>(LocalBridgeClazz, "progress"); _progressReady = true; } return _progressContent; } }
+            private static int _progressContent = default;
+            private static bool _progressReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#redo"/>
+            /// </summary>
+            public static int redo { get { if (!_redoReady) { _redoContent = SGetField<int>(LocalBridgeClazz, "redo"); _redoReady = true; } return _redoContent; } }
+            private static int _redoContent = default;
+            private static bool _redoReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#replaceText"/>
+            /// </summary>
+            public static int replaceText { get { if (!_replaceTextReady) { _replaceTextContent = SGetField<int>(LocalBridgeClazz, "replaceText"); _replaceTextReady = true; } return _replaceTextContent; } }
+            private static int _replaceTextContent = default;
+            private static bool _replaceTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#secondaryProgress"/>
+            /// </summary>
+            public static int secondaryProgress { get { if (!_secondaryProgressReady) { _secondaryProgressContent = SGetField<int>(LocalBridgeClazz, "secondaryProgress"); _secondaryProgressReady = true; } return _secondaryProgressContent; } }
+            private static int _secondaryProgressContent = default;
+            private static bool _secondaryProgressReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#selectAll"/>
+            /// </summary>
+            public static int selectAll { get { if (!_selectAllReady) { _selectAllContent = SGetField<int>(LocalBridgeClazz, "selectAll"); _selectAllReady = true; } return _selectAllContent; } }
+            private static int _selectAllContent = default;
+            private static bool _selectAllReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#selectedIcon"/>
+            /// </summary>
+            public static int selectedIcon { get { if (!_selectedIconReady) { _selectedIconContent = SGetField<int>(LocalBridgeClazz, "selectedIcon"); _selectedIconReady = true; } return _selectedIconContent; } }
+            private static int _selectedIconContent = default;
+            private static bool _selectedIconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#selectTextMode"/>
+            /// </summary>
+            public static int selectTextMode { get { if (!_selectTextModeReady) { _selectTextModeContent = SGetField<int>(LocalBridgeClazz, "selectTextMode"); _selectTextModeReady = true; } return _selectTextModeContent; } }
+            private static int _selectTextModeContent = default;
+            private static bool _selectTextModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#shareText"/>
+            /// </summary>
+            public static int shareText { get { if (!_shareTextReady) { _shareTextContent = SGetField<int>(LocalBridgeClazz, "shareText"); _shareTextReady = true; } return _shareTextContent; } }
+            private static int _shareTextContent = default;
+            private static bool _shareTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#startSelectingText"/>
+            /// </summary>
+            public static int startSelectingText { get { if (!_startSelectingTextReady) { _startSelectingTextContent = SGetField<int>(LocalBridgeClazz, "startSelectingText"); _startSelectingTextReady = true; } return _startSelectingTextContent; } }
+            private static int _startSelectingTextContent = default;
+            private static bool _startSelectingTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#statusBarBackground"/>
+            /// </summary>
+            public static int statusBarBackground { get { if (!_statusBarBackgroundReady) { _statusBarBackgroundContent = SGetField<int>(LocalBridgeClazz, "statusBarBackground"); _statusBarBackgroundReady = true; } return _statusBarBackgroundContent; } }
+            private static int _statusBarBackgroundContent = default;
+            private static bool _statusBarBackgroundReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#stopSelectingText"/>
+            /// </summary>
+            public static int stopSelectingText { get { if (!_stopSelectingTextReady) { _stopSelectingTextContent = SGetField<int>(LocalBridgeClazz, "stopSelectingText"); _stopSelectingTextReady = true; } return _stopSelectingTextContent; } }
+            private static int _stopSelectingTextContent = default;
+            private static bool _stopSelectingTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#summary"/>
+            /// </summary>
+            public static int summary { get { if (!_summaryReady) { _summaryContent = SGetField<int>(LocalBridgeClazz, "summary"); _summaryReady = true; } return _summaryContent; } }
+            private static int _summaryContent = default;
+            private static bool _summaryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#switch_widget"/>
+            /// </summary>
+            public static int switch_widget { get { if (!_switch_widgetReady) { _switch_widgetContent = SGetField<int>(LocalBridgeClazz, "switch_widget"); _switch_widgetReady = true; } return _switch_widgetContent; } }
+            private static int _switch_widgetContent = default;
+            private static bool _switch_widgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#switchInputMethod"/>
+            /// </summary>
+            public static int switchInputMethod { get { if (!_switchInputMethodReady) { _switchInputMethodContent = SGetField<int>(LocalBridgeClazz, "switchInputMethod"); _switchInputMethodReady = true; } return _switchInputMethodContent; } }
+            private static int _switchInputMethodContent = default;
+            private static bool _switchInputMethodReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#tabcontent"/>
+            /// </summary>
+            public static int tabcontent { get { if (!_tabcontentReady) { _tabcontentContent = SGetField<int>(LocalBridgeClazz, "tabcontent"); _tabcontentReady = true; } return _tabcontentContent; } }
+            private static int _tabcontentContent = default;
+            private static bool _tabcontentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#tabhost"/>
+            /// </summary>
+            public static int tabhost { get { if (!_tabhostReady) { _tabhostContent = SGetField<int>(LocalBridgeClazz, "tabhost"); _tabhostReady = true; } return _tabhostContent; } }
+            private static int _tabhostContent = default;
+            private static bool _tabhostReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#tabs"/>
+            /// </summary>
+            public static int tabs { get { if (!_tabsReady) { _tabsContent = SGetField<int>(LocalBridgeClazz, "tabs"); _tabsReady = true; } return _tabsContent; } }
+            private static int _tabsContent = default;
+            private static bool _tabsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#text1"/>
+            /// </summary>
+            public static int text1 { get { if (!_text1Ready) { _text1Content = SGetField<int>(LocalBridgeClazz, "text1"); _text1Ready = true; } return _text1Content; } }
+            private static int _text1Content = default;
+            private static bool _text1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#text2"/>
+            /// </summary>
+            public static int text2 { get { if (!_text2Ready) { _text2Content = SGetField<int>(LocalBridgeClazz, "text2"); _text2Ready = true; } return _text2Content; } }
+            private static int _text2Content = default;
+            private static bool _text2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#textAssist"/>
+            /// </summary>
+            public static int textAssist { get { if (!_textAssistReady) { _textAssistContent = SGetField<int>(LocalBridgeClazz, "textAssist"); _textAssistReady = true; } return _textAssistContent; } }
+            private static int _textAssistContent = default;
+            private static bool _textAssistReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#title"/>
+            /// </summary>
+            public static int title { get { if (!_titleReady) { _titleContent = SGetField<int>(LocalBridgeClazz, "title"); _titleReady = true; } return _titleContent; } }
+            private static int _titleContent = default;
+            private static bool _titleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#toggle"/>
+            /// </summary>
+            public static int toggle { get { if (!_toggleReady) { _toggleContent = SGetField<int>(LocalBridgeClazz, "toggle"); _toggleReady = true; } return _toggleContent; } }
+            private static int _toggleContent = default;
+            private static bool _toggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#underline"/>
+            /// </summary>
+            public static int underline { get { if (!_underlineReady) { _underlineContent = SGetField<int>(LocalBridgeClazz, "underline"); _underlineReady = true; } return _underlineContent; } }
+            private static int _underlineContent = default;
+            private static bool _underlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#undo"/>
+            /// </summary>
+            public static int undo { get { if (!_undoReady) { _undoContent = SGetField<int>(LocalBridgeClazz, "undo"); _undoReady = true; } return _undoContent; } }
+            private static int _undoContent = default;
+            private static bool _undoReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.id.html#widget_frame"/>
+            /// </summary>
+            public static int widget_frame { get { if (!_widget_frameReady) { _widget_frameContent = SGetField<int>(LocalBridgeClazz, "widget_frame"); _widget_frameReady = true; } return _widget_frameContent; } }
+            private static int _widget_frameContent = default;
+            private static bool _widget_frameReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region integer
+        public partial class integer
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.integer.html#config_longAnimTime"/>
+            /// </summary>
+            public static int config_longAnimTime { get { if (!_config_longAnimTimeReady) { _config_longAnimTimeContent = SGetField<int>(LocalBridgeClazz, "config_longAnimTime"); _config_longAnimTimeReady = true; } return _config_longAnimTimeContent; } }
+            private static int _config_longAnimTimeContent = default;
+            private static bool _config_longAnimTimeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.integer.html#config_mediumAnimTime"/>
+            /// </summary>
+            public static int config_mediumAnimTime { get { if (!_config_mediumAnimTimeReady) { _config_mediumAnimTimeContent = SGetField<int>(LocalBridgeClazz, "config_mediumAnimTime"); _config_mediumAnimTimeReady = true; } return _config_mediumAnimTimeContent; } }
+            private static int _config_mediumAnimTimeContent = default;
+            private static bool _config_mediumAnimTimeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.integer.html#config_shortAnimTime"/>
+            /// </summary>
+            public static int config_shortAnimTime { get { if (!_config_shortAnimTimeReady) { _config_shortAnimTimeContent = SGetField<int>(LocalBridgeClazz, "config_shortAnimTime"); _config_shortAnimTimeReady = true; } return _config_shortAnimTimeContent; } }
+            private static int _config_shortAnimTimeContent = default;
+            private static bool _config_shortAnimTimeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.integer.html#status_bar_notification_info_maxnum"/>
+            /// </summary>
+            public static int status_bar_notification_info_maxnum { get { if (!_status_bar_notification_info_maxnumReady) { _status_bar_notification_info_maxnumContent = SGetField<int>(LocalBridgeClazz, "status_bar_notification_info_maxnum"); _status_bar_notification_info_maxnumReady = true; } return _status_bar_notification_info_maxnumContent; } }
+            private static int _status_bar_notification_info_maxnumContent = default;
+            private static bool _status_bar_notification_info_maxnumReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region interpolator
+        public partial class interpolator
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#accelerate_cubic"/>
+            /// </summary>
+            public static int accelerate_cubic { get { if (!_accelerate_cubicReady) { _accelerate_cubicContent = SGetField<int>(LocalBridgeClazz, "accelerate_cubic"); _accelerate_cubicReady = true; } return _accelerate_cubicContent; } }
+            private static int _accelerate_cubicContent = default;
+            private static bool _accelerate_cubicReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#accelerate_decelerate"/>
+            /// </summary>
+            public static int accelerate_decelerate { get { if (!_accelerate_decelerateReady) { _accelerate_decelerateContent = SGetField<int>(LocalBridgeClazz, "accelerate_decelerate"); _accelerate_decelerateReady = true; } return _accelerate_decelerateContent; } }
+            private static int _accelerate_decelerateContent = default;
+            private static bool _accelerate_decelerateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#accelerate_quad"/>
+            /// </summary>
+            public static int accelerate_quad { get { if (!_accelerate_quadReady) { _accelerate_quadContent = SGetField<int>(LocalBridgeClazz, "accelerate_quad"); _accelerate_quadReady = true; } return _accelerate_quadContent; } }
+            private static int _accelerate_quadContent = default;
+            private static bool _accelerate_quadReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#accelerate_quint"/>
+            /// </summary>
+            public static int accelerate_quint { get { if (!_accelerate_quintReady) { _accelerate_quintContent = SGetField<int>(LocalBridgeClazz, "accelerate_quint"); _accelerate_quintReady = true; } return _accelerate_quintContent; } }
+            private static int _accelerate_quintContent = default;
+            private static bool _accelerate_quintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#anticipate"/>
+            /// </summary>
+            public static int anticipate { get { if (!_anticipateReady) { _anticipateContent = SGetField<int>(LocalBridgeClazz, "anticipate"); _anticipateReady = true; } return _anticipateContent; } }
+            private static int _anticipateContent = default;
+            private static bool _anticipateReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#anticipate_overshoot"/>
+            /// </summary>
+            public static int anticipate_overshoot { get { if (!_anticipate_overshootReady) { _anticipate_overshootContent = SGetField<int>(LocalBridgeClazz, "anticipate_overshoot"); _anticipate_overshootReady = true; } return _anticipate_overshootContent; } }
+            private static int _anticipate_overshootContent = default;
+            private static bool _anticipate_overshootReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#bounce"/>
+            /// </summary>
+            public static int bounce { get { if (!_bounceReady) { _bounceContent = SGetField<int>(LocalBridgeClazz, "bounce"); _bounceReady = true; } return _bounceContent; } }
+            private static int _bounceContent = default;
+            private static bool _bounceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#cycle"/>
+            /// </summary>
+            public static int cycle { get { if (!_cycleReady) { _cycleContent = SGetField<int>(LocalBridgeClazz, "cycle"); _cycleReady = true; } return _cycleContent; } }
+            private static int _cycleContent = default;
+            private static bool _cycleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#decelerate_cubic"/>
+            /// </summary>
+            public static int decelerate_cubic { get { if (!_decelerate_cubicReady) { _decelerate_cubicContent = SGetField<int>(LocalBridgeClazz, "decelerate_cubic"); _decelerate_cubicReady = true; } return _decelerate_cubicContent; } }
+            private static int _decelerate_cubicContent = default;
+            private static bool _decelerate_cubicReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#decelerate_quad"/>
+            /// </summary>
+            public static int decelerate_quad { get { if (!_decelerate_quadReady) { _decelerate_quadContent = SGetField<int>(LocalBridgeClazz, "decelerate_quad"); _decelerate_quadReady = true; } return _decelerate_quadContent; } }
+            private static int _decelerate_quadContent = default;
+            private static bool _decelerate_quadReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#decelerate_quint"/>
+            /// </summary>
+            public static int decelerate_quint { get { if (!_decelerate_quintReady) { _decelerate_quintContent = SGetField<int>(LocalBridgeClazz, "decelerate_quint"); _decelerate_quintReady = true; } return _decelerate_quintContent; } }
+            private static int _decelerate_quintContent = default;
+            private static bool _decelerate_quintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#fast_out_extra_slow_in"/>
+            /// </summary>
+            public static int fast_out_extra_slow_in { get { if (!_fast_out_extra_slow_inReady) { _fast_out_extra_slow_inContent = SGetField<int>(LocalBridgeClazz, "fast_out_extra_slow_in"); _fast_out_extra_slow_inReady = true; } return _fast_out_extra_slow_inContent; } }
+            private static int _fast_out_extra_slow_inContent = default;
+            private static bool _fast_out_extra_slow_inReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#fast_out_linear_in"/>
+            /// </summary>
+            public static int fast_out_linear_in { get { if (!_fast_out_linear_inReady) { _fast_out_linear_inContent = SGetField<int>(LocalBridgeClazz, "fast_out_linear_in"); _fast_out_linear_inReady = true; } return _fast_out_linear_inContent; } }
+            private static int _fast_out_linear_inContent = default;
+            private static bool _fast_out_linear_inReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#fast_out_slow_in"/>
+            /// </summary>
+            public static int fast_out_slow_in { get { if (!_fast_out_slow_inReady) { _fast_out_slow_inContent = SGetField<int>(LocalBridgeClazz, "fast_out_slow_in"); _fast_out_slow_inReady = true; } return _fast_out_slow_inContent; } }
+            private static int _fast_out_slow_inContent = default;
+            private static bool _fast_out_slow_inReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#linear"/>
+            /// </summary>
+            public static int linear { get { if (!_linearReady) { _linearContent = SGetField<int>(LocalBridgeClazz, "linear"); _linearReady = true; } return _linearContent; } }
+            private static int _linearContent = default;
+            private static bool _linearReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#linear_out_slow_in"/>
+            /// </summary>
+            public static int linear_out_slow_in { get { if (!_linear_out_slow_inReady) { _linear_out_slow_inContent = SGetField<int>(LocalBridgeClazz, "linear_out_slow_in"); _linear_out_slow_inReady = true; } return _linear_out_slow_inContent; } }
+            private static int _linear_out_slow_inContent = default;
+            private static bool _linear_out_slow_inReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.interpolator.html#overshoot"/>
+            /// </summary>
+            public static int overshoot { get { if (!_overshootReady) { _overshootContent = SGetField<int>(LocalBridgeClazz, "overshoot"); _overshootReady = true; } return _overshootContent; } }
+            private static int _overshootContent = default;
+            private static bool _overshootReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region layout
+        public partial class layout
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#activity_list_item"/>
+            /// </summary>
+            public static int activity_list_item { get { if (!_activity_list_itemReady) { _activity_list_itemContent = SGetField<int>(LocalBridgeClazz, "activity_list_item"); _activity_list_itemReady = true; } return _activity_list_itemContent; } }
+            private static int _activity_list_itemContent = default;
+            private static bool _activity_list_itemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#browser_link_context_header"/>
+            /// </summary>
+            public static int browser_link_context_header { get { if (!_browser_link_context_headerReady) { _browser_link_context_headerContent = SGetField<int>(LocalBridgeClazz, "browser_link_context_header"); _browser_link_context_headerReady = true; } return _browser_link_context_headerContent; } }
+            private static int _browser_link_context_headerContent = default;
+            private static bool _browser_link_context_headerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#expandable_list_content"/>
+            /// </summary>
+            public static int expandable_list_content { get { if (!_expandable_list_contentReady) { _expandable_list_contentContent = SGetField<int>(LocalBridgeClazz, "expandable_list_content"); _expandable_list_contentReady = true; } return _expandable_list_contentContent; } }
+            private static int _expandable_list_contentContent = default;
+            private static bool _expandable_list_contentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#list_content"/>
+            /// </summary>
+            public static int list_content { get { if (!_list_contentReady) { _list_contentContent = SGetField<int>(LocalBridgeClazz, "list_content"); _list_contentReady = true; } return _list_contentContent; } }
+            private static int _list_contentContent = default;
+            private static bool _list_contentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#preference_category"/>
+            /// </summary>
+            public static int preference_category { get { if (!_preference_categoryReady) { _preference_categoryContent = SGetField<int>(LocalBridgeClazz, "preference_category"); _preference_categoryReady = true; } return _preference_categoryContent; } }
+            private static int _preference_categoryContent = default;
+            private static bool _preference_categoryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#select_dialog_item"/>
+            /// </summary>
+            public static int select_dialog_item { get { if (!_select_dialog_itemReady) { _select_dialog_itemContent = SGetField<int>(LocalBridgeClazz, "select_dialog_item"); _select_dialog_itemReady = true; } return _select_dialog_itemContent; } }
+            private static int _select_dialog_itemContent = default;
+            private static bool _select_dialog_itemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#select_dialog_multichoice"/>
+            /// </summary>
+            public static int select_dialog_multichoice { get { if (!_select_dialog_multichoiceReady) { _select_dialog_multichoiceContent = SGetField<int>(LocalBridgeClazz, "select_dialog_multichoice"); _select_dialog_multichoiceReady = true; } return _select_dialog_multichoiceContent; } }
+            private static int _select_dialog_multichoiceContent = default;
+            private static bool _select_dialog_multichoiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#select_dialog_singlechoice"/>
+            /// </summary>
+            public static int select_dialog_singlechoice { get { if (!_select_dialog_singlechoiceReady) { _select_dialog_singlechoiceContent = SGetField<int>(LocalBridgeClazz, "select_dialog_singlechoice"); _select_dialog_singlechoiceReady = true; } return _select_dialog_singlechoiceContent; } }
+            private static int _select_dialog_singlechoiceContent = default;
+            private static bool _select_dialog_singlechoiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_dropdown_item_1line"/>
+            /// </summary>
+            public static int simple_dropdown_item_1line { get { if (!_simple_dropdown_item_1lineReady) { _simple_dropdown_item_1lineContent = SGetField<int>(LocalBridgeClazz, "simple_dropdown_item_1line"); _simple_dropdown_item_1lineReady = true; } return _simple_dropdown_item_1lineContent; } }
+            private static int _simple_dropdown_item_1lineContent = default;
+            private static bool _simple_dropdown_item_1lineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_expandable_list_item_1"/>
+            /// </summary>
+            public static int simple_expandable_list_item_1 { get { if (!_simple_expandable_list_item_1Ready) { _simple_expandable_list_item_1Content = SGetField<int>(LocalBridgeClazz, "simple_expandable_list_item_1"); _simple_expandable_list_item_1Ready = true; } return _simple_expandable_list_item_1Content; } }
+            private static int _simple_expandable_list_item_1Content = default;
+            private static bool _simple_expandable_list_item_1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_expandable_list_item_2"/>
+            /// </summary>
+            public static int simple_expandable_list_item_2 { get { if (!_simple_expandable_list_item_2Ready) { _simple_expandable_list_item_2Content = SGetField<int>(LocalBridgeClazz, "simple_expandable_list_item_2"); _simple_expandable_list_item_2Ready = true; } return _simple_expandable_list_item_2Content; } }
+            private static int _simple_expandable_list_item_2Content = default;
+            private static bool _simple_expandable_list_item_2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_gallery_item"/>
+            /// </summary>
+            public static int simple_gallery_item { get { if (!_simple_gallery_itemReady) { _simple_gallery_itemContent = SGetField<int>(LocalBridgeClazz, "simple_gallery_item"); _simple_gallery_itemReady = true; } return _simple_gallery_itemContent; } }
+            private static int _simple_gallery_itemContent = default;
+            private static bool _simple_gallery_itemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_list_item_1"/>
+            /// </summary>
+            public static int simple_list_item_1 { get { if (!_simple_list_item_1Ready) { _simple_list_item_1Content = SGetField<int>(LocalBridgeClazz, "simple_list_item_1"); _simple_list_item_1Ready = true; } return _simple_list_item_1Content; } }
+            private static int _simple_list_item_1Content = default;
+            private static bool _simple_list_item_1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_list_item_2"/>
+            /// </summary>
+            public static int simple_list_item_2 { get { if (!_simple_list_item_2Ready) { _simple_list_item_2Content = SGetField<int>(LocalBridgeClazz, "simple_list_item_2"); _simple_list_item_2Ready = true; } return _simple_list_item_2Content; } }
+            private static int _simple_list_item_2Content = default;
+            private static bool _simple_list_item_2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_list_item_activated_1"/>
+            /// </summary>
+            public static int simple_list_item_activated_1 { get { if (!_simple_list_item_activated_1Ready) { _simple_list_item_activated_1Content = SGetField<int>(LocalBridgeClazz, "simple_list_item_activated_1"); _simple_list_item_activated_1Ready = true; } return _simple_list_item_activated_1Content; } }
+            private static int _simple_list_item_activated_1Content = default;
+            private static bool _simple_list_item_activated_1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_list_item_activated_2"/>
+            /// </summary>
+            public static int simple_list_item_activated_2 { get { if (!_simple_list_item_activated_2Ready) { _simple_list_item_activated_2Content = SGetField<int>(LocalBridgeClazz, "simple_list_item_activated_2"); _simple_list_item_activated_2Ready = true; } return _simple_list_item_activated_2Content; } }
+            private static int _simple_list_item_activated_2Content = default;
+            private static bool _simple_list_item_activated_2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_list_item_checked"/>
+            /// </summary>
+            public static int simple_list_item_checked { get { if (!_simple_list_item_checkedReady) { _simple_list_item_checkedContent = SGetField<int>(LocalBridgeClazz, "simple_list_item_checked"); _simple_list_item_checkedReady = true; } return _simple_list_item_checkedContent; } }
+            private static int _simple_list_item_checkedContent = default;
+            private static bool _simple_list_item_checkedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_list_item_multiple_choice"/>
+            /// </summary>
+            public static int simple_list_item_multiple_choice { get { if (!_simple_list_item_multiple_choiceReady) { _simple_list_item_multiple_choiceContent = SGetField<int>(LocalBridgeClazz, "simple_list_item_multiple_choice"); _simple_list_item_multiple_choiceReady = true; } return _simple_list_item_multiple_choiceContent; } }
+            private static int _simple_list_item_multiple_choiceContent = default;
+            private static bool _simple_list_item_multiple_choiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_list_item_single_choice"/>
+            /// </summary>
+            public static int simple_list_item_single_choice { get { if (!_simple_list_item_single_choiceReady) { _simple_list_item_single_choiceContent = SGetField<int>(LocalBridgeClazz, "simple_list_item_single_choice"); _simple_list_item_single_choiceReady = true; } return _simple_list_item_single_choiceContent; } }
+            private static int _simple_list_item_single_choiceContent = default;
+            private static bool _simple_list_item_single_choiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_selectable_list_item"/>
+            /// </summary>
+            public static int simple_selectable_list_item { get { if (!_simple_selectable_list_itemReady) { _simple_selectable_list_itemContent = SGetField<int>(LocalBridgeClazz, "simple_selectable_list_item"); _simple_selectable_list_itemReady = true; } return _simple_selectable_list_itemContent; } }
+            private static int _simple_selectable_list_itemContent = default;
+            private static bool _simple_selectable_list_itemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_spinner_dropdown_item"/>
+            /// </summary>
+            public static int simple_spinner_dropdown_item { get { if (!_simple_spinner_dropdown_itemReady) { _simple_spinner_dropdown_itemContent = SGetField<int>(LocalBridgeClazz, "simple_spinner_dropdown_item"); _simple_spinner_dropdown_itemReady = true; } return _simple_spinner_dropdown_itemContent; } }
+            private static int _simple_spinner_dropdown_itemContent = default;
+            private static bool _simple_spinner_dropdown_itemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#simple_spinner_item"/>
+            /// </summary>
+            public static int simple_spinner_item { get { if (!_simple_spinner_itemReady) { _simple_spinner_itemContent = SGetField<int>(LocalBridgeClazz, "simple_spinner_item"); _simple_spinner_itemReady = true; } return _simple_spinner_itemContent; } }
+            private static int _simple_spinner_itemContent = default;
+            private static bool _simple_spinner_itemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#test_list_item"/>
+            /// </summary>
+            public static int test_list_item { get { if (!_test_list_itemReady) { _test_list_itemContent = SGetField<int>(LocalBridgeClazz, "test_list_item"); _test_list_itemReady = true; } return _test_list_itemContent; } }
+            private static int _test_list_itemContent = default;
+            private static bool _test_list_itemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.layout.html#two_line_list_item"/>
+            /// </summary>
+            public static int two_line_list_item { get { if (!_two_line_list_itemReady) { _two_line_list_itemContent = SGetField<int>(LocalBridgeClazz, "two_line_list_item"); _two_line_list_itemReady = true; } return _two_line_list_itemContent; } }
+            private static int _two_line_list_itemContent = default;
+            private static bool _two_line_list_itemReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region menu
+        public partial class menu
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region mipmap
+        public partial class mipmap
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.mipmap.html#sym_def_app_icon"/>
+            /// </summary>
+            public static int sym_def_app_icon { get { if (!_sym_def_app_iconReady) { _sym_def_app_iconContent = SGetField<int>(LocalBridgeClazz, "sym_def_app_icon"); _sym_def_app_iconReady = true; } return _sym_def_app_iconContent; } }
+            private static int _sym_def_app_iconContent = default;
+            private static bool _sym_def_app_iconReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region plurals
+        public partial class plurals
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region raw
+        public partial class raw
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region stringClass
+        public partial class stringClass
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#autofill"/>
+            /// </summary>
+            public static int autofill { get { if (!_autofillReady) { _autofillContent = SGetField<int>(LocalBridgeClazz, "autofill"); _autofillReady = true; } return _autofillContent; } }
+            private static int _autofillContent = default;
+            private static bool _autofillReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#cancel"/>
+            /// </summary>
+            public static int cancel { get { if (!_cancelReady) { _cancelContent = SGetField<int>(LocalBridgeClazz, "cancel"); _cancelReady = true; } return _cancelContent; } }
+            private static int _cancelContent = default;
+            private static bool _cancelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#copy"/>
+            /// </summary>
+            public static int copy { get { if (!_copyReady) { _copyContent = SGetField<int>(LocalBridgeClazz, "copy"); _copyReady = true; } return _copyContent; } }
+            private static int _copyContent = default;
+            private static bool _copyReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#copyUrl"/>
+            /// </summary>
+            public static int copyUrl { get { if (!_copyUrlReady) { _copyUrlContent = SGetField<int>(LocalBridgeClazz, "copyUrl"); _copyUrlReady = true; } return _copyUrlContent; } }
+            private static int _copyUrlContent = default;
+            private static bool _copyUrlReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#cut"/>
+            /// </summary>
+            public static int cut { get { if (!_cutReady) { _cutContent = SGetField<int>(LocalBridgeClazz, "cut"); _cutReady = true; } return _cutContent; } }
+            private static int _cutContent = default;
+            private static bool _cutReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#defaultMsisdnAlphaTag"/>
+            /// </summary>
+            public static int defaultMsisdnAlphaTag { get { if (!_defaultMsisdnAlphaTagReady) { _defaultMsisdnAlphaTagContent = SGetField<int>(LocalBridgeClazz, "defaultMsisdnAlphaTag"); _defaultMsisdnAlphaTagReady = true; } return _defaultMsisdnAlphaTagContent; } }
+            private static int _defaultMsisdnAlphaTagContent = default;
+            private static bool _defaultMsisdnAlphaTagReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#defaultVoiceMailAlphaTag"/>
+            /// </summary>
+            public static int defaultVoiceMailAlphaTag { get { if (!_defaultVoiceMailAlphaTagReady) { _defaultVoiceMailAlphaTagContent = SGetField<int>(LocalBridgeClazz, "defaultVoiceMailAlphaTag"); _defaultVoiceMailAlphaTagReady = true; } return _defaultVoiceMailAlphaTagContent; } }
+            private static int _defaultVoiceMailAlphaTagContent = default;
+            private static bool _defaultVoiceMailAlphaTagReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#dialog_alert_title"/>
+            /// </summary>
+            public static int dialog_alert_title { get { if (!_dialog_alert_titleReady) { _dialog_alert_titleContent = SGetField<int>(LocalBridgeClazz, "dialog_alert_title"); _dialog_alert_titleReady = true; } return _dialog_alert_titleContent; } }
+            private static int _dialog_alert_titleContent = default;
+            private static bool _dialog_alert_titleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#emptyPhoneNumber"/>
+            /// </summary>
+            public static int emptyPhoneNumber { get { if (!_emptyPhoneNumberReady) { _emptyPhoneNumberContent = SGetField<int>(LocalBridgeClazz, "emptyPhoneNumber"); _emptyPhoneNumberReady = true; } return _emptyPhoneNumberContent; } }
+            private static int _emptyPhoneNumberContent = default;
+            private static bool _emptyPhoneNumberReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#fingerprint_icon_content_description"/>
+            /// </summary>
+            public static int fingerprint_icon_content_description { get { if (!_fingerprint_icon_content_descriptionReady) { _fingerprint_icon_content_descriptionContent = SGetField<int>(LocalBridgeClazz, "fingerprint_icon_content_description"); _fingerprint_icon_content_descriptionReady = true; } return _fingerprint_icon_content_descriptionContent; } }
+            private static int _fingerprint_icon_content_descriptionContent = default;
+            private static bool _fingerprint_icon_content_descriptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#httpErrorBadUrl"/>
+            /// </summary>
+            public static int httpErrorBadUrl { get { if (!_httpErrorBadUrlReady) { _httpErrorBadUrlContent = SGetField<int>(LocalBridgeClazz, "httpErrorBadUrl"); _httpErrorBadUrlReady = true; } return _httpErrorBadUrlContent; } }
+            private static int _httpErrorBadUrlContent = default;
+            private static bool _httpErrorBadUrlReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#httpErrorUnsupportedScheme"/>
+            /// </summary>
+            public static int httpErrorUnsupportedScheme { get { if (!_httpErrorUnsupportedSchemeReady) { _httpErrorUnsupportedSchemeContent = SGetField<int>(LocalBridgeClazz, "httpErrorUnsupportedScheme"); _httpErrorUnsupportedSchemeReady = true; } return _httpErrorUnsupportedSchemeContent; } }
+            private static int _httpErrorUnsupportedSchemeContent = default;
+            private static bool _httpErrorUnsupportedSchemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#no"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int no { get { if (!_noReady) { _noContent = SGetField<int>(LocalBridgeClazz, "no"); _noReady = true; } return _noContent; } }
+            private static int _noContent = default;
+            private static bool _noReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#ok"/>
+            /// </summary>
+            public static int ok { get { if (!_okReady) { _okContent = SGetField<int>(LocalBridgeClazz, "ok"); _okReady = true; } return _okContent; } }
+            private static int _okContent = default;
+            private static bool _okReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#paste"/>
+            /// </summary>
+            public static int paste { get { if (!_pasteReady) { _pasteContent = SGetField<int>(LocalBridgeClazz, "paste"); _pasteReady = true; } return _pasteContent; } }
+            private static int _pasteContent = default;
+            private static bool _pasteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#paste_as_plain_text"/>
+            /// </summary>
+            public static int paste_as_plain_text { get { if (!_paste_as_plain_textReady) { _paste_as_plain_textContent = SGetField<int>(LocalBridgeClazz, "paste_as_plain_text"); _paste_as_plain_textReady = true; } return _paste_as_plain_textContent; } }
+            private static int _paste_as_plain_textContent = default;
+            private static bool _paste_as_plain_textReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#search_go"/>
+            /// </summary>
+            public static int search_go { get { if (!_search_goReady) { _search_goContent = SGetField<int>(LocalBridgeClazz, "search_go"); _search_goReady = true; } return _search_goContent; } }
+            private static int _search_goContent = default;
+            private static bool _search_goReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#selectAll"/>
+            /// </summary>
+            public static int selectAll { get { if (!_selectAllReady) { _selectAllContent = SGetField<int>(LocalBridgeClazz, "selectAll"); _selectAllReady = true; } return _selectAllContent; } }
+            private static int _selectAllContent = default;
+            private static bool _selectAllReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#selectTextMode"/>
+            /// </summary>
+            public static int selectTextMode { get { if (!_selectTextModeReady) { _selectTextModeContent = SGetField<int>(LocalBridgeClazz, "selectTextMode"); _selectTextModeReady = true; } return _selectTextModeContent; } }
+            private static int _selectTextModeContent = default;
+            private static bool _selectTextModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#status_bar_notification_info_overflow"/>
+            /// </summary>
+            public static int status_bar_notification_info_overflow { get { if (!_status_bar_notification_info_overflowReady) { _status_bar_notification_info_overflowContent = SGetField<int>(LocalBridgeClazz, "status_bar_notification_info_overflow"); _status_bar_notification_info_overflowReady = true; } return _status_bar_notification_info_overflowContent; } }
+            private static int _status_bar_notification_info_overflowContent = default;
+            private static bool _status_bar_notification_info_overflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#unknownName"/>
+            /// </summary>
+            public static int unknownName { get { if (!_unknownNameReady) { _unknownNameContent = SGetField<int>(LocalBridgeClazz, "unknownName"); _unknownNameReady = true; } return _unknownNameContent; } }
+            private static int _unknownNameContent = default;
+            private static bool _unknownNameReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#untitled"/>
+            /// </summary>
+            public static int untitled { get { if (!_untitledReady) { _untitledContent = SGetField<int>(LocalBridgeClazz, "untitled"); _untitledReady = true; } return _untitledContent; } }
+            private static int _untitledContent = default;
+            private static bool _untitledReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#VideoView_error_button"/>
+            /// </summary>
+            public static int VideoView_error_button { get { if (!_VideoView_error_buttonReady) { _VideoView_error_buttonContent = SGetField<int>(LocalBridgeClazz, "VideoView_error_button"); _VideoView_error_buttonReady = true; } return _VideoView_error_buttonContent; } }
+            private static int _VideoView_error_buttonContent = default;
+            private static bool _VideoView_error_buttonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#VideoView_error_text_invalid_progressive_playback"/>
+            /// </summary>
+            public static int VideoView_error_text_invalid_progressive_playback { get { if (!_VideoView_error_text_invalid_progressive_playbackReady) { _VideoView_error_text_invalid_progressive_playbackContent = SGetField<int>(LocalBridgeClazz, "VideoView_error_text_invalid_progressive_playback"); _VideoView_error_text_invalid_progressive_playbackReady = true; } return _VideoView_error_text_invalid_progressive_playbackContent; } }
+            private static int _VideoView_error_text_invalid_progressive_playbackContent = default;
+            private static bool _VideoView_error_text_invalid_progressive_playbackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#VideoView_error_text_unknown"/>
+            /// </summary>
+            public static int VideoView_error_text_unknown { get { if (!_VideoView_error_text_unknownReady) { _VideoView_error_text_unknownContent = SGetField<int>(LocalBridgeClazz, "VideoView_error_text_unknown"); _VideoView_error_text_unknownReady = true; } return _VideoView_error_text_unknownContent; } }
+            private static int _VideoView_error_text_unknownContent = default;
+            private static bool _VideoView_error_text_unknownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#VideoView_error_title"/>
+            /// </summary>
+            public static int VideoView_error_title { get { if (!_VideoView_error_titleReady) { _VideoView_error_titleContent = SGetField<int>(LocalBridgeClazz, "VideoView_error_title"); _VideoView_error_titleReady = true; } return _VideoView_error_titleContent; } }
+            private static int _VideoView_error_titleContent = default;
+            private static bool _VideoView_error_titleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.string.html#yes"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int yes { get { if (!_yesReady) { _yesContent = SGetField<int>(LocalBridgeClazz, "yes"); _yesReady = true; } return _yesContent; } }
+            private static int _yesContent = default;
+            private static bool _yesReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region style
+        public partial class style
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Animation"/>
+            /// </summary>
+            public static int Animation { get { if (!_AnimationReady) { _AnimationContent = SGetField<int>(LocalBridgeClazz, "Animation"); _AnimationReady = true; } return _AnimationContent; } }
+            private static int _AnimationContent = default;
+            private static bool _AnimationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Animation_Activity"/>
+            /// </summary>
+            public static int Animation_Activity { get { if (!_Animation_ActivityReady) { _Animation_ActivityContent = SGetField<int>(LocalBridgeClazz, "Animation_Activity"); _Animation_ActivityReady = true; } return _Animation_ActivityContent; } }
+            private static int _Animation_ActivityContent = default;
+            private static bool _Animation_ActivityReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Animation_Dialog"/>
+            /// </summary>
+            public static int Animation_Dialog { get { if (!_Animation_DialogReady) { _Animation_DialogContent = SGetField<int>(LocalBridgeClazz, "Animation_Dialog"); _Animation_DialogReady = true; } return _Animation_DialogContent; } }
+            private static int _Animation_DialogContent = default;
+            private static bool _Animation_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Animation_InputMethod"/>
+            /// </summary>
+            public static int Animation_InputMethod { get { if (!_Animation_InputMethodReady) { _Animation_InputMethodContent = SGetField<int>(LocalBridgeClazz, "Animation_InputMethod"); _Animation_InputMethodReady = true; } return _Animation_InputMethodContent; } }
+            private static int _Animation_InputMethodContent = default;
+            private static bool _Animation_InputMethodReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Animation_Toast"/>
+            /// </summary>
+            public static int Animation_Toast { get { if (!_Animation_ToastReady) { _Animation_ToastContent = SGetField<int>(LocalBridgeClazz, "Animation_Toast"); _Animation_ToastReady = true; } return _Animation_ToastContent; } }
+            private static int _Animation_ToastContent = default;
+            private static bool _Animation_ToastReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Animation_Translucent"/>
+            /// </summary>
+            public static int Animation_Translucent { get { if (!_Animation_TranslucentReady) { _Animation_TranslucentContent = SGetField<int>(LocalBridgeClazz, "Animation_Translucent"); _Animation_TranslucentReady = true; } return _Animation_TranslucentContent; } }
+            private static int _Animation_TranslucentContent = default;
+            private static bool _Animation_TranslucentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#DeviceDefault_ButtonBar"/>
+            /// </summary>
+            public static int DeviceDefault_ButtonBar { get { if (!_DeviceDefault_ButtonBarReady) { _DeviceDefault_ButtonBarContent = SGetField<int>(LocalBridgeClazz, "DeviceDefault_ButtonBar"); _DeviceDefault_ButtonBarReady = true; } return _DeviceDefault_ButtonBarContent; } }
+            private static int _DeviceDefault_ButtonBarContent = default;
+            private static bool _DeviceDefault_ButtonBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#DeviceDefault_ButtonBar_AlertDialog"/>
+            /// </summary>
+            public static int DeviceDefault_ButtonBar_AlertDialog { get { if (!_DeviceDefault_ButtonBar_AlertDialogReady) { _DeviceDefault_ButtonBar_AlertDialogContent = SGetField<int>(LocalBridgeClazz, "DeviceDefault_ButtonBar_AlertDialog"); _DeviceDefault_ButtonBar_AlertDialogReady = true; } return _DeviceDefault_ButtonBar_AlertDialogContent; } }
+            private static int _DeviceDefault_ButtonBar_AlertDialogContent = default;
+            private static bool _DeviceDefault_ButtonBar_AlertDialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#DeviceDefault_Light_ButtonBar"/>
+            /// </summary>
+            public static int DeviceDefault_Light_ButtonBar { get { if (!_DeviceDefault_Light_ButtonBarReady) { _DeviceDefault_Light_ButtonBarContent = SGetField<int>(LocalBridgeClazz, "DeviceDefault_Light_ButtonBar"); _DeviceDefault_Light_ButtonBarReady = true; } return _DeviceDefault_Light_ButtonBarContent; } }
+            private static int _DeviceDefault_Light_ButtonBarContent = default;
+            private static bool _DeviceDefault_Light_ButtonBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#DeviceDefault_Light_ButtonBar_AlertDialog"/>
+            /// </summary>
+            public static int DeviceDefault_Light_ButtonBar_AlertDialog { get { if (!_DeviceDefault_Light_ButtonBar_AlertDialogReady) { _DeviceDefault_Light_ButtonBar_AlertDialogContent = SGetField<int>(LocalBridgeClazz, "DeviceDefault_Light_ButtonBar_AlertDialog"); _DeviceDefault_Light_ButtonBar_AlertDialogReady = true; } return _DeviceDefault_Light_ButtonBar_AlertDialogContent; } }
+            private static int _DeviceDefault_Light_ButtonBar_AlertDialogContent = default;
+            private static bool _DeviceDefault_Light_ButtonBar_AlertDialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#DeviceDefault_Light_SegmentedButton"/>
+            /// </summary>
+            public static int DeviceDefault_Light_SegmentedButton { get { if (!_DeviceDefault_Light_SegmentedButtonReady) { _DeviceDefault_Light_SegmentedButtonContent = SGetField<int>(LocalBridgeClazz, "DeviceDefault_Light_SegmentedButton"); _DeviceDefault_Light_SegmentedButtonReady = true; } return _DeviceDefault_Light_SegmentedButtonContent; } }
+            private static int _DeviceDefault_Light_SegmentedButtonContent = default;
+            private static bool _DeviceDefault_Light_SegmentedButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#DeviceDefault_SegmentedButton"/>
+            /// </summary>
+            public static int DeviceDefault_SegmentedButton { get { if (!_DeviceDefault_SegmentedButtonReady) { _DeviceDefault_SegmentedButtonContent = SGetField<int>(LocalBridgeClazz, "DeviceDefault_SegmentedButton"); _DeviceDefault_SegmentedButtonReady = true; } return _DeviceDefault_SegmentedButtonContent; } }
+            private static int _DeviceDefault_SegmentedButtonContent = default;
+            private static bool _DeviceDefault_SegmentedButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Holo_ButtonBar"/>
+            /// </summary>
+            public static int Holo_ButtonBar { get { if (!_Holo_ButtonBarReady) { _Holo_ButtonBarContent = SGetField<int>(LocalBridgeClazz, "Holo_ButtonBar"); _Holo_ButtonBarReady = true; } return _Holo_ButtonBarContent; } }
+            private static int _Holo_ButtonBarContent = default;
+            private static bool _Holo_ButtonBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Holo_ButtonBar_AlertDialog"/>
+            /// </summary>
+            public static int Holo_ButtonBar_AlertDialog { get { if (!_Holo_ButtonBar_AlertDialogReady) { _Holo_ButtonBar_AlertDialogContent = SGetField<int>(LocalBridgeClazz, "Holo_ButtonBar_AlertDialog"); _Holo_ButtonBar_AlertDialogReady = true; } return _Holo_ButtonBar_AlertDialogContent; } }
+            private static int _Holo_ButtonBar_AlertDialogContent = default;
+            private static bool _Holo_ButtonBar_AlertDialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Holo_Light_ButtonBar"/>
+            /// </summary>
+            public static int Holo_Light_ButtonBar { get { if (!_Holo_Light_ButtonBarReady) { _Holo_Light_ButtonBarContent = SGetField<int>(LocalBridgeClazz, "Holo_Light_ButtonBar"); _Holo_Light_ButtonBarReady = true; } return _Holo_Light_ButtonBarContent; } }
+            private static int _Holo_Light_ButtonBarContent = default;
+            private static bool _Holo_Light_ButtonBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Holo_Light_ButtonBar_AlertDialog"/>
+            /// </summary>
+            public static int Holo_Light_ButtonBar_AlertDialog { get { if (!_Holo_Light_ButtonBar_AlertDialogReady) { _Holo_Light_ButtonBar_AlertDialogContent = SGetField<int>(LocalBridgeClazz, "Holo_Light_ButtonBar_AlertDialog"); _Holo_Light_ButtonBar_AlertDialogReady = true; } return _Holo_Light_ButtonBar_AlertDialogContent; } }
+            private static int _Holo_Light_ButtonBar_AlertDialogContent = default;
+            private static bool _Holo_Light_ButtonBar_AlertDialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Holo_Light_SegmentedButton"/>
+            /// </summary>
+            public static int Holo_Light_SegmentedButton { get { if (!_Holo_Light_SegmentedButtonReady) { _Holo_Light_SegmentedButtonContent = SGetField<int>(LocalBridgeClazz, "Holo_Light_SegmentedButton"); _Holo_Light_SegmentedButtonReady = true; } return _Holo_Light_SegmentedButtonContent; } }
+            private static int _Holo_Light_SegmentedButtonContent = default;
+            private static bool _Holo_Light_SegmentedButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Holo_SegmentedButton"/>
+            /// </summary>
+            public static int Holo_SegmentedButton { get { if (!_Holo_SegmentedButtonReady) { _Holo_SegmentedButtonContent = SGetField<int>(LocalBridgeClazz, "Holo_SegmentedButton"); _Holo_SegmentedButtonReady = true; } return _Holo_SegmentedButtonContent; } }
+            private static int _Holo_SegmentedButtonContent = default;
+            private static bool _Holo_SegmentedButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#MediaButton"/>
+            /// </summary>
+            public static int MediaButton { get { if (!_MediaButtonReady) { _MediaButtonContent = SGetField<int>(LocalBridgeClazz, "MediaButton"); _MediaButtonReady = true; } return _MediaButtonContent; } }
+            private static int _MediaButtonContent = default;
+            private static bool _MediaButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#MediaButton_Ffwd"/>
+            /// </summary>
+            public static int MediaButton_Ffwd { get { if (!_MediaButton_FfwdReady) { _MediaButton_FfwdContent = SGetField<int>(LocalBridgeClazz, "MediaButton_Ffwd"); _MediaButton_FfwdReady = true; } return _MediaButton_FfwdContent; } }
+            private static int _MediaButton_FfwdContent = default;
+            private static bool _MediaButton_FfwdReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#MediaButton_Next"/>
+            /// </summary>
+            public static int MediaButton_Next { get { if (!_MediaButton_NextReady) { _MediaButton_NextContent = SGetField<int>(LocalBridgeClazz, "MediaButton_Next"); _MediaButton_NextReady = true; } return _MediaButton_NextContent; } }
+            private static int _MediaButton_NextContent = default;
+            private static bool _MediaButton_NextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#MediaButton_Pause"/>
+            /// </summary>
+            public static int MediaButton_Pause { get { if (!_MediaButton_PauseReady) { _MediaButton_PauseContent = SGetField<int>(LocalBridgeClazz, "MediaButton_Pause"); _MediaButton_PauseReady = true; } return _MediaButton_PauseContent; } }
+            private static int _MediaButton_PauseContent = default;
+            private static bool _MediaButton_PauseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#MediaButton_Play"/>
+            /// </summary>
+            public static int MediaButton_Play { get { if (!_MediaButton_PlayReady) { _MediaButton_PlayContent = SGetField<int>(LocalBridgeClazz, "MediaButton_Play"); _MediaButton_PlayReady = true; } return _MediaButton_PlayContent; } }
+            private static int _MediaButton_PlayContent = default;
+            private static bool _MediaButton_PlayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#MediaButton_Previous"/>
+            /// </summary>
+            public static int MediaButton_Previous { get { if (!_MediaButton_PreviousReady) { _MediaButton_PreviousContent = SGetField<int>(LocalBridgeClazz, "MediaButton_Previous"); _MediaButton_PreviousReady = true; } return _MediaButton_PreviousContent; } }
+            private static int _MediaButton_PreviousContent = default;
+            private static bool _MediaButton_PreviousReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#MediaButton_Rew"/>
+            /// </summary>
+            public static int MediaButton_Rew { get { if (!_MediaButton_RewReady) { _MediaButton_RewContent = SGetField<int>(LocalBridgeClazz, "MediaButton_Rew"); _MediaButton_RewReady = true; } return _MediaButton_RewContent; } }
+            private static int _MediaButton_RewContent = default;
+            private static bool _MediaButton_RewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance"/>
+            /// </summary>
+            public static int TextAppearance { get { if (!_TextAppearanceReady) { _TextAppearanceContent = SGetField<int>(LocalBridgeClazz, "TextAppearance"); _TextAppearanceReady = true; } return _TextAppearanceContent; } }
+            private static int _TextAppearanceContent = default;
+            private static bool _TextAppearanceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault { get { if (!_TextAppearance_DeviceDefaultReady) { _TextAppearance_DeviceDefaultContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault"); _TextAppearance_DeviceDefaultReady = true; } return _TextAppearance_DeviceDefaultContent; } }
+            private static int _TextAppearance_DeviceDefaultContent = default;
+            private static bool _TextAppearance_DeviceDefaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_DialogWindowTitle"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_DialogWindowTitle { get { if (!_TextAppearance_DeviceDefault_DialogWindowTitleReady) { _TextAppearance_DeviceDefault_DialogWindowTitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_DialogWindowTitle"); _TextAppearance_DeviceDefault_DialogWindowTitleReady = true; } return _TextAppearance_DeviceDefault_DialogWindowTitleContent; } }
+            private static int _TextAppearance_DeviceDefault_DialogWindowTitleContent = default;
+            private static bool _TextAppearance_DeviceDefault_DialogWindowTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Headline"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Headline { get { if (!_TextAppearance_DeviceDefault_HeadlineReady) { _TextAppearance_DeviceDefault_HeadlineContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Headline"); _TextAppearance_DeviceDefault_HeadlineReady = true; } return _TextAppearance_DeviceDefault_HeadlineContent; } }
+            private static int _TextAppearance_DeviceDefault_HeadlineContent = default;
+            private static bool _TextAppearance_DeviceDefault_HeadlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Inverse { get { if (!_TextAppearance_DeviceDefault_InverseReady) { _TextAppearance_DeviceDefault_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Inverse"); _TextAppearance_DeviceDefault_InverseReady = true; } return _TextAppearance_DeviceDefault_InverseContent; } }
+            private static int _TextAppearance_DeviceDefault_InverseContent = default;
+            private static bool _TextAppearance_DeviceDefault_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Large"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Large { get { if (!_TextAppearance_DeviceDefault_LargeReady) { _TextAppearance_DeviceDefault_LargeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Large"); _TextAppearance_DeviceDefault_LargeReady = true; } return _TextAppearance_DeviceDefault_LargeContent; } }
+            private static int _TextAppearance_DeviceDefault_LargeContent = default;
+            private static bool _TextAppearance_DeviceDefault_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Large_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Large_Inverse { get { if (!_TextAppearance_DeviceDefault_Large_InverseReady) { _TextAppearance_DeviceDefault_Large_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Large_Inverse"); _TextAppearance_DeviceDefault_Large_InverseReady = true; } return _TextAppearance_DeviceDefault_Large_InverseContent; } }
+            private static int _TextAppearance_DeviceDefault_Large_InverseContent = default;
+            private static bool _TextAppearance_DeviceDefault_Large_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Medium"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Medium { get { if (!_TextAppearance_DeviceDefault_MediumReady) { _TextAppearance_DeviceDefault_MediumContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Medium"); _TextAppearance_DeviceDefault_MediumReady = true; } return _TextAppearance_DeviceDefault_MediumContent; } }
+            private static int _TextAppearance_DeviceDefault_MediumContent = default;
+            private static bool _TextAppearance_DeviceDefault_MediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Medium_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Medium_Inverse { get { if (!_TextAppearance_DeviceDefault_Medium_InverseReady) { _TextAppearance_DeviceDefault_Medium_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Medium_Inverse"); _TextAppearance_DeviceDefault_Medium_InverseReady = true; } return _TextAppearance_DeviceDefault_Medium_InverseContent; } }
+            private static int _TextAppearance_DeviceDefault_Medium_InverseContent = default;
+            private static bool _TextAppearance_DeviceDefault_Medium_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_SearchResult_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_SearchResult_Subtitle { get { if (!_TextAppearance_DeviceDefault_SearchResult_SubtitleReady) { _TextAppearance_DeviceDefault_SearchResult_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_SearchResult_Subtitle"); _TextAppearance_DeviceDefault_SearchResult_SubtitleReady = true; } return _TextAppearance_DeviceDefault_SearchResult_SubtitleContent; } }
+            private static int _TextAppearance_DeviceDefault_SearchResult_SubtitleContent = default;
+            private static bool _TextAppearance_DeviceDefault_SearchResult_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_SearchResult_Title"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_SearchResult_Title { get { if (!_TextAppearance_DeviceDefault_SearchResult_TitleReady) { _TextAppearance_DeviceDefault_SearchResult_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_SearchResult_Title"); _TextAppearance_DeviceDefault_SearchResult_TitleReady = true; } return _TextAppearance_DeviceDefault_SearchResult_TitleContent; } }
+            private static int _TextAppearance_DeviceDefault_SearchResult_TitleContent = default;
+            private static bool _TextAppearance_DeviceDefault_SearchResult_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Small"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Small { get { if (!_TextAppearance_DeviceDefault_SmallReady) { _TextAppearance_DeviceDefault_SmallContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Small"); _TextAppearance_DeviceDefault_SmallReady = true; } return _TextAppearance_DeviceDefault_SmallContent; } }
+            private static int _TextAppearance_DeviceDefault_SmallContent = default;
+            private static bool _TextAppearance_DeviceDefault_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Small_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Small_Inverse { get { if (!_TextAppearance_DeviceDefault_Small_InverseReady) { _TextAppearance_DeviceDefault_Small_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Small_Inverse"); _TextAppearance_DeviceDefault_Small_InverseReady = true; } return _TextAppearance_DeviceDefault_Small_InverseContent; } }
+            private static int _TextAppearance_DeviceDefault_Small_InverseContent = default;
+            private static bool _TextAppearance_DeviceDefault_Small_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget { get { if (!_TextAppearance_DeviceDefault_WidgetReady) { _TextAppearance_DeviceDefault_WidgetContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget"); _TextAppearance_DeviceDefault_WidgetReady = true; } return _TextAppearance_DeviceDefault_WidgetContent; } }
+            private static int _TextAppearance_DeviceDefault_WidgetContent = default;
+            private static bool _TextAppearance_DeviceDefault_WidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionBar_Menu"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_ActionBar_Menu { get { if (!_TextAppearance_DeviceDefault_Widget_ActionBar_MenuReady) { _TextAppearance_DeviceDefault_Widget_ActionBar_MenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionBar_Menu"); _TextAppearance_DeviceDefault_Widget_ActionBar_MenuReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionBar_MenuContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionBar_MenuContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionBar_MenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle { get { if (!_TextAppearance_DeviceDefault_Widget_ActionBar_SubtitleReady) { _TextAppearance_DeviceDefault_Widget_ActionBar_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle"); _TextAppearance_DeviceDefault_Widget_ActionBar_SubtitleReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionBar_SubtitleContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionBar_SubtitleContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionBar_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_Inverse { get { if (!_TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_InverseReady) { _TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_Inverse"); _TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_InverseReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_InverseContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_InverseContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionBar_Title"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_ActionBar_Title { get { if (!_TextAppearance_DeviceDefault_Widget_ActionBar_TitleReady) { _TextAppearance_DeviceDefault_Widget_ActionBar_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionBar_Title"); _TextAppearance_DeviceDefault_Widget_ActionBar_TitleReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionBar_TitleContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionBar_TitleContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionBar_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionBar_Title_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int TextAppearance_DeviceDefault_Widget_ActionBar_Title_Inverse { get { if (!_TextAppearance_DeviceDefault_Widget_ActionBar_Title_InverseReady) { _TextAppearance_DeviceDefault_Widget_ActionBar_Title_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionBar_Title_Inverse"); _TextAppearance_DeviceDefault_Widget_ActionBar_Title_InverseReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionBar_Title_InverseContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionBar_Title_InverseContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionBar_Title_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle { get { if (!_TextAppearance_DeviceDefault_Widget_ActionMode_SubtitleReady) { _TextAppearance_DeviceDefault_Widget_ActionMode_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle"); _TextAppearance_DeviceDefault_Widget_ActionMode_SubtitleReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionMode_SubtitleContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionMode_SubtitleContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionMode_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_Inverse { get { if (!_TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_InverseReady) { _TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_Inverse"); _TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_InverseReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_InverseContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_InverseContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionMode_Title"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_ActionMode_Title { get { if (!_TextAppearance_DeviceDefault_Widget_ActionMode_TitleReady) { _TextAppearance_DeviceDefault_Widget_ActionMode_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionMode_Title"); _TextAppearance_DeviceDefault_Widget_ActionMode_TitleReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionMode_TitleContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionMode_TitleContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionMode_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_ActionMode_Title_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int TextAppearance_DeviceDefault_Widget_ActionMode_Title_Inverse { get { if (!_TextAppearance_DeviceDefault_Widget_ActionMode_Title_InverseReady) { _TextAppearance_DeviceDefault_Widget_ActionMode_Title_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_ActionMode_Title_Inverse"); _TextAppearance_DeviceDefault_Widget_ActionMode_Title_InverseReady = true; } return _TextAppearance_DeviceDefault_Widget_ActionMode_Title_InverseContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ActionMode_Title_InverseContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ActionMode_Title_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_Button"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_Button { get { if (!_TextAppearance_DeviceDefault_Widget_ButtonReady) { _TextAppearance_DeviceDefault_Widget_ButtonContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_Button"); _TextAppearance_DeviceDefault_Widget_ButtonReady = true; } return _TextAppearance_DeviceDefault_Widget_ButtonContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_ButtonContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_DropDownHint"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_DropDownHint { get { if (!_TextAppearance_DeviceDefault_Widget_DropDownHintReady) { _TextAppearance_DeviceDefault_Widget_DropDownHintContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_DropDownHint"); _TextAppearance_DeviceDefault_Widget_DropDownHintReady = true; } return _TextAppearance_DeviceDefault_Widget_DropDownHintContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_DropDownHintContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_DropDownHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_DropDownItem"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_DropDownItem { get { if (!_TextAppearance_DeviceDefault_Widget_DropDownItemReady) { _TextAppearance_DeviceDefault_Widget_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_DropDownItem"); _TextAppearance_DeviceDefault_Widget_DropDownItemReady = true; } return _TextAppearance_DeviceDefault_Widget_DropDownItemContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_DropDownItemContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_EditText"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_EditText { get { if (!_TextAppearance_DeviceDefault_Widget_EditTextReady) { _TextAppearance_DeviceDefault_Widget_EditTextContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_EditText"); _TextAppearance_DeviceDefault_Widget_EditTextReady = true; } return _TextAppearance_DeviceDefault_Widget_EditTextContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_EditTextContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_IconMenu_Item"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_IconMenu_Item { get { if (!_TextAppearance_DeviceDefault_Widget_IconMenu_ItemReady) { _TextAppearance_DeviceDefault_Widget_IconMenu_ItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_IconMenu_Item"); _TextAppearance_DeviceDefault_Widget_IconMenu_ItemReady = true; } return _TextAppearance_DeviceDefault_Widget_IconMenu_ItemContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_IconMenu_ItemContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_IconMenu_ItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_PopupMenu"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_PopupMenu { get { if (!_TextAppearance_DeviceDefault_Widget_PopupMenuReady) { _TextAppearance_DeviceDefault_Widget_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_PopupMenu"); _TextAppearance_DeviceDefault_Widget_PopupMenuReady = true; } return _TextAppearance_DeviceDefault_Widget_PopupMenuContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_PopupMenuContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_PopupMenu_Large"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_PopupMenu_Large { get { if (!_TextAppearance_DeviceDefault_Widget_PopupMenu_LargeReady) { _TextAppearance_DeviceDefault_Widget_PopupMenu_LargeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_PopupMenu_Large"); _TextAppearance_DeviceDefault_Widget_PopupMenu_LargeReady = true; } return _TextAppearance_DeviceDefault_Widget_PopupMenu_LargeContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_PopupMenu_LargeContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_PopupMenu_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_PopupMenu_Small"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_PopupMenu_Small { get { if (!_TextAppearance_DeviceDefault_Widget_PopupMenu_SmallReady) { _TextAppearance_DeviceDefault_Widget_PopupMenu_SmallContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_PopupMenu_Small"); _TextAppearance_DeviceDefault_Widget_PopupMenu_SmallReady = true; } return _TextAppearance_DeviceDefault_Widget_PopupMenu_SmallContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_PopupMenu_SmallContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_PopupMenu_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_TabWidget"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_TabWidget { get { if (!_TextAppearance_DeviceDefault_Widget_TabWidgetReady) { _TextAppearance_DeviceDefault_Widget_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_TabWidget"); _TextAppearance_DeviceDefault_Widget_TabWidgetReady = true; } return _TextAppearance_DeviceDefault_Widget_TabWidgetContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_TabWidgetContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_TextView"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_TextView { get { if (!_TextAppearance_DeviceDefault_Widget_TextViewReady) { _TextAppearance_DeviceDefault_Widget_TextViewContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_TextView"); _TextAppearance_DeviceDefault_Widget_TextViewReady = true; } return _TextAppearance_DeviceDefault_Widget_TextViewContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_TextViewContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_TextView_PopupMenu"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_TextView_PopupMenu { get { if (!_TextAppearance_DeviceDefault_Widget_TextView_PopupMenuReady) { _TextAppearance_DeviceDefault_Widget_TextView_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_TextView_PopupMenu"); _TextAppearance_DeviceDefault_Widget_TextView_PopupMenuReady = true; } return _TextAppearance_DeviceDefault_Widget_TextView_PopupMenuContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_TextView_PopupMenuContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_TextView_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_Widget_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_Widget_TextView_SpinnerItem { get { if (!_TextAppearance_DeviceDefault_Widget_TextView_SpinnerItemReady) { _TextAppearance_DeviceDefault_Widget_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_Widget_TextView_SpinnerItem"); _TextAppearance_DeviceDefault_Widget_TextView_SpinnerItemReady = true; } return _TextAppearance_DeviceDefault_Widget_TextView_SpinnerItemContent; } }
+            private static int _TextAppearance_DeviceDefault_Widget_TextView_SpinnerItemContent = default;
+            private static bool _TextAppearance_DeviceDefault_Widget_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DeviceDefault_WindowTitle"/>
+            /// </summary>
+            public static int TextAppearance_DeviceDefault_WindowTitle { get { if (!_TextAppearance_DeviceDefault_WindowTitleReady) { _TextAppearance_DeviceDefault_WindowTitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DeviceDefault_WindowTitle"); _TextAppearance_DeviceDefault_WindowTitleReady = true; } return _TextAppearance_DeviceDefault_WindowTitleContent; } }
+            private static int _TextAppearance_DeviceDefault_WindowTitleContent = default;
+            private static bool _TextAppearance_DeviceDefault_WindowTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_DialogWindowTitle"/>
+            /// </summary>
+            public static int TextAppearance_DialogWindowTitle { get { if (!_TextAppearance_DialogWindowTitleReady) { _TextAppearance_DialogWindowTitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_DialogWindowTitle"); _TextAppearance_DialogWindowTitleReady = true; } return _TextAppearance_DialogWindowTitleContent; } }
+            private static int _TextAppearance_DialogWindowTitleContent = default;
+            private static bool _TextAppearance_DialogWindowTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo"/>
+            /// </summary>
+            public static int TextAppearance_Holo { get { if (!_TextAppearance_HoloReady) { _TextAppearance_HoloContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo"); _TextAppearance_HoloReady = true; } return _TextAppearance_HoloContent; } }
+            private static int _TextAppearance_HoloContent = default;
+            private static bool _TextAppearance_HoloReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_DialogWindowTitle"/>
+            /// </summary>
+            public static int TextAppearance_Holo_DialogWindowTitle { get { if (!_TextAppearance_Holo_DialogWindowTitleReady) { _TextAppearance_Holo_DialogWindowTitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_DialogWindowTitle"); _TextAppearance_Holo_DialogWindowTitleReady = true; } return _TextAppearance_Holo_DialogWindowTitleContent; } }
+            private static int _TextAppearance_Holo_DialogWindowTitleContent = default;
+            private static bool _TextAppearance_Holo_DialogWindowTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Inverse { get { if (!_TextAppearance_Holo_InverseReady) { _TextAppearance_Holo_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Inverse"); _TextAppearance_Holo_InverseReady = true; } return _TextAppearance_Holo_InverseContent; } }
+            private static int _TextAppearance_Holo_InverseContent = default;
+            private static bool _TextAppearance_Holo_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Large"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Large { get { if (!_TextAppearance_Holo_LargeReady) { _TextAppearance_Holo_LargeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Large"); _TextAppearance_Holo_LargeReady = true; } return _TextAppearance_Holo_LargeContent; } }
+            private static int _TextAppearance_Holo_LargeContent = default;
+            private static bool _TextAppearance_Holo_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Large_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Large_Inverse { get { if (!_TextAppearance_Holo_Large_InverseReady) { _TextAppearance_Holo_Large_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Large_Inverse"); _TextAppearance_Holo_Large_InverseReady = true; } return _TextAppearance_Holo_Large_InverseContent; } }
+            private static int _TextAppearance_Holo_Large_InverseContent = default;
+            private static bool _TextAppearance_Holo_Large_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Medium"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Medium { get { if (!_TextAppearance_Holo_MediumReady) { _TextAppearance_Holo_MediumContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Medium"); _TextAppearance_Holo_MediumReady = true; } return _TextAppearance_Holo_MediumContent; } }
+            private static int _TextAppearance_Holo_MediumContent = default;
+            private static bool _TextAppearance_Holo_MediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Medium_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Medium_Inverse { get { if (!_TextAppearance_Holo_Medium_InverseReady) { _TextAppearance_Holo_Medium_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Medium_Inverse"); _TextAppearance_Holo_Medium_InverseReady = true; } return _TextAppearance_Holo_Medium_InverseContent; } }
+            private static int _TextAppearance_Holo_Medium_InverseContent = default;
+            private static bool _TextAppearance_Holo_Medium_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_SearchResult_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_Holo_SearchResult_Subtitle { get { if (!_TextAppearance_Holo_SearchResult_SubtitleReady) { _TextAppearance_Holo_SearchResult_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_SearchResult_Subtitle"); _TextAppearance_Holo_SearchResult_SubtitleReady = true; } return _TextAppearance_Holo_SearchResult_SubtitleContent; } }
+            private static int _TextAppearance_Holo_SearchResult_SubtitleContent = default;
+            private static bool _TextAppearance_Holo_SearchResult_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_SearchResult_Title"/>
+            /// </summary>
+            public static int TextAppearance_Holo_SearchResult_Title { get { if (!_TextAppearance_Holo_SearchResult_TitleReady) { _TextAppearance_Holo_SearchResult_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_SearchResult_Title"); _TextAppearance_Holo_SearchResult_TitleReady = true; } return _TextAppearance_Holo_SearchResult_TitleContent; } }
+            private static int _TextAppearance_Holo_SearchResult_TitleContent = default;
+            private static bool _TextAppearance_Holo_SearchResult_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Small"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Small { get { if (!_TextAppearance_Holo_SmallReady) { _TextAppearance_Holo_SmallContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Small"); _TextAppearance_Holo_SmallReady = true; } return _TextAppearance_Holo_SmallContent; } }
+            private static int _TextAppearance_Holo_SmallContent = default;
+            private static bool _TextAppearance_Holo_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Small_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Small_Inverse { get { if (!_TextAppearance_Holo_Small_InverseReady) { _TextAppearance_Holo_Small_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Small_Inverse"); _TextAppearance_Holo_Small_InverseReady = true; } return _TextAppearance_Holo_Small_InverseContent; } }
+            private static int _TextAppearance_Holo_Small_InverseContent = default;
+            private static bool _TextAppearance_Holo_Small_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget { get { if (!_TextAppearance_Holo_WidgetReady) { _TextAppearance_Holo_WidgetContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget"); _TextAppearance_Holo_WidgetReady = true; } return _TextAppearance_Holo_WidgetContent; } }
+            private static int _TextAppearance_Holo_WidgetContent = default;
+            private static bool _TextAppearance_Holo_WidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionBar_Menu"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionBar_Menu { get { if (!_TextAppearance_Holo_Widget_ActionBar_MenuReady) { _TextAppearance_Holo_Widget_ActionBar_MenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionBar_Menu"); _TextAppearance_Holo_Widget_ActionBar_MenuReady = true; } return _TextAppearance_Holo_Widget_ActionBar_MenuContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionBar_MenuContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionBar_MenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionBar_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionBar_Subtitle { get { if (!_TextAppearance_Holo_Widget_ActionBar_SubtitleReady) { _TextAppearance_Holo_Widget_ActionBar_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionBar_Subtitle"); _TextAppearance_Holo_Widget_ActionBar_SubtitleReady = true; } return _TextAppearance_Holo_Widget_ActionBar_SubtitleContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionBar_SubtitleContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionBar_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionBar_Subtitle_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionBar_Subtitle_Inverse { get { if (!_TextAppearance_Holo_Widget_ActionBar_Subtitle_InverseReady) { _TextAppearance_Holo_Widget_ActionBar_Subtitle_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionBar_Subtitle_Inverse"); _TextAppearance_Holo_Widget_ActionBar_Subtitle_InverseReady = true; } return _TextAppearance_Holo_Widget_ActionBar_Subtitle_InverseContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionBar_Subtitle_InverseContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionBar_Subtitle_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionBar_Title"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionBar_Title { get { if (!_TextAppearance_Holo_Widget_ActionBar_TitleReady) { _TextAppearance_Holo_Widget_ActionBar_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionBar_Title"); _TextAppearance_Holo_Widget_ActionBar_TitleReady = true; } return _TextAppearance_Holo_Widget_ActionBar_TitleContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionBar_TitleContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionBar_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionBar_Title_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionBar_Title_Inverse { get { if (!_TextAppearance_Holo_Widget_ActionBar_Title_InverseReady) { _TextAppearance_Holo_Widget_ActionBar_Title_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionBar_Title_Inverse"); _TextAppearance_Holo_Widget_ActionBar_Title_InverseReady = true; } return _TextAppearance_Holo_Widget_ActionBar_Title_InverseContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionBar_Title_InverseContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionBar_Title_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionMode_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionMode_Subtitle { get { if (!_TextAppearance_Holo_Widget_ActionMode_SubtitleReady) { _TextAppearance_Holo_Widget_ActionMode_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionMode_Subtitle"); _TextAppearance_Holo_Widget_ActionMode_SubtitleReady = true; } return _TextAppearance_Holo_Widget_ActionMode_SubtitleContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionMode_SubtitleContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionMode_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionMode_Subtitle_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionMode_Subtitle_Inverse { get { if (!_TextAppearance_Holo_Widget_ActionMode_Subtitle_InverseReady) { _TextAppearance_Holo_Widget_ActionMode_Subtitle_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionMode_Subtitle_Inverse"); _TextAppearance_Holo_Widget_ActionMode_Subtitle_InverseReady = true; } return _TextAppearance_Holo_Widget_ActionMode_Subtitle_InverseContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionMode_Subtitle_InverseContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionMode_Subtitle_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionMode_Title"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionMode_Title { get { if (!_TextAppearance_Holo_Widget_ActionMode_TitleReady) { _TextAppearance_Holo_Widget_ActionMode_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionMode_Title"); _TextAppearance_Holo_Widget_ActionMode_TitleReady = true; } return _TextAppearance_Holo_Widget_ActionMode_TitleContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionMode_TitleContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionMode_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_ActionMode_Title_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_ActionMode_Title_Inverse { get { if (!_TextAppearance_Holo_Widget_ActionMode_Title_InverseReady) { _TextAppearance_Holo_Widget_ActionMode_Title_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_ActionMode_Title_Inverse"); _TextAppearance_Holo_Widget_ActionMode_Title_InverseReady = true; } return _TextAppearance_Holo_Widget_ActionMode_Title_InverseContent; } }
+            private static int _TextAppearance_Holo_Widget_ActionMode_Title_InverseContent = default;
+            private static bool _TextAppearance_Holo_Widget_ActionMode_Title_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_Button"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_Button { get { if (!_TextAppearance_Holo_Widget_ButtonReady) { _TextAppearance_Holo_Widget_ButtonContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_Button"); _TextAppearance_Holo_Widget_ButtonReady = true; } return _TextAppearance_Holo_Widget_ButtonContent; } }
+            private static int _TextAppearance_Holo_Widget_ButtonContent = default;
+            private static bool _TextAppearance_Holo_Widget_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_DropDownHint"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_DropDownHint { get { if (!_TextAppearance_Holo_Widget_DropDownHintReady) { _TextAppearance_Holo_Widget_DropDownHintContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_DropDownHint"); _TextAppearance_Holo_Widget_DropDownHintReady = true; } return _TextAppearance_Holo_Widget_DropDownHintContent; } }
+            private static int _TextAppearance_Holo_Widget_DropDownHintContent = default;
+            private static bool _TextAppearance_Holo_Widget_DropDownHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_DropDownItem"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_DropDownItem { get { if (!_TextAppearance_Holo_Widget_DropDownItemReady) { _TextAppearance_Holo_Widget_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_DropDownItem"); _TextAppearance_Holo_Widget_DropDownItemReady = true; } return _TextAppearance_Holo_Widget_DropDownItemContent; } }
+            private static int _TextAppearance_Holo_Widget_DropDownItemContent = default;
+            private static bool _TextAppearance_Holo_Widget_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_EditText"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_EditText { get { if (!_TextAppearance_Holo_Widget_EditTextReady) { _TextAppearance_Holo_Widget_EditTextContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_EditText"); _TextAppearance_Holo_Widget_EditTextReady = true; } return _TextAppearance_Holo_Widget_EditTextContent; } }
+            private static int _TextAppearance_Holo_Widget_EditTextContent = default;
+            private static bool _TextAppearance_Holo_Widget_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_IconMenu_Item"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_IconMenu_Item { get { if (!_TextAppearance_Holo_Widget_IconMenu_ItemReady) { _TextAppearance_Holo_Widget_IconMenu_ItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_IconMenu_Item"); _TextAppearance_Holo_Widget_IconMenu_ItemReady = true; } return _TextAppearance_Holo_Widget_IconMenu_ItemContent; } }
+            private static int _TextAppearance_Holo_Widget_IconMenu_ItemContent = default;
+            private static bool _TextAppearance_Holo_Widget_IconMenu_ItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_PopupMenu"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_PopupMenu { get { if (!_TextAppearance_Holo_Widget_PopupMenuReady) { _TextAppearance_Holo_Widget_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_PopupMenu"); _TextAppearance_Holo_Widget_PopupMenuReady = true; } return _TextAppearance_Holo_Widget_PopupMenuContent; } }
+            private static int _TextAppearance_Holo_Widget_PopupMenuContent = default;
+            private static bool _TextAppearance_Holo_Widget_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_PopupMenu_Large"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_PopupMenu_Large { get { if (!_TextAppearance_Holo_Widget_PopupMenu_LargeReady) { _TextAppearance_Holo_Widget_PopupMenu_LargeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_PopupMenu_Large"); _TextAppearance_Holo_Widget_PopupMenu_LargeReady = true; } return _TextAppearance_Holo_Widget_PopupMenu_LargeContent; } }
+            private static int _TextAppearance_Holo_Widget_PopupMenu_LargeContent = default;
+            private static bool _TextAppearance_Holo_Widget_PopupMenu_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_PopupMenu_Small"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_PopupMenu_Small { get { if (!_TextAppearance_Holo_Widget_PopupMenu_SmallReady) { _TextAppearance_Holo_Widget_PopupMenu_SmallContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_PopupMenu_Small"); _TextAppearance_Holo_Widget_PopupMenu_SmallReady = true; } return _TextAppearance_Holo_Widget_PopupMenu_SmallContent; } }
+            private static int _TextAppearance_Holo_Widget_PopupMenu_SmallContent = default;
+            private static bool _TextAppearance_Holo_Widget_PopupMenu_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_TabWidget"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_TabWidget { get { if (!_TextAppearance_Holo_Widget_TabWidgetReady) { _TextAppearance_Holo_Widget_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_TabWidget"); _TextAppearance_Holo_Widget_TabWidgetReady = true; } return _TextAppearance_Holo_Widget_TabWidgetContent; } }
+            private static int _TextAppearance_Holo_Widget_TabWidgetContent = default;
+            private static bool _TextAppearance_Holo_Widget_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_TextView"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_TextView { get { if (!_TextAppearance_Holo_Widget_TextViewReady) { _TextAppearance_Holo_Widget_TextViewContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_TextView"); _TextAppearance_Holo_Widget_TextViewReady = true; } return _TextAppearance_Holo_Widget_TextViewContent; } }
+            private static int _TextAppearance_Holo_Widget_TextViewContent = default;
+            private static bool _TextAppearance_Holo_Widget_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_TextView_PopupMenu"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_TextView_PopupMenu { get { if (!_TextAppearance_Holo_Widget_TextView_PopupMenuReady) { _TextAppearance_Holo_Widget_TextView_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_TextView_PopupMenu"); _TextAppearance_Holo_Widget_TextView_PopupMenuReady = true; } return _TextAppearance_Holo_Widget_TextView_PopupMenuContent; } }
+            private static int _TextAppearance_Holo_Widget_TextView_PopupMenuContent = default;
+            private static bool _TextAppearance_Holo_Widget_TextView_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_Widget_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int TextAppearance_Holo_Widget_TextView_SpinnerItem { get { if (!_TextAppearance_Holo_Widget_TextView_SpinnerItemReady) { _TextAppearance_Holo_Widget_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_Widget_TextView_SpinnerItem"); _TextAppearance_Holo_Widget_TextView_SpinnerItemReady = true; } return _TextAppearance_Holo_Widget_TextView_SpinnerItemContent; } }
+            private static int _TextAppearance_Holo_Widget_TextView_SpinnerItemContent = default;
+            private static bool _TextAppearance_Holo_Widget_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Holo_WindowTitle"/>
+            /// </summary>
+            public static int TextAppearance_Holo_WindowTitle { get { if (!_TextAppearance_Holo_WindowTitleReady) { _TextAppearance_Holo_WindowTitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Holo_WindowTitle"); _TextAppearance_Holo_WindowTitleReady = true; } return _TextAppearance_Holo_WindowTitleContent; } }
+            private static int _TextAppearance_Holo_WindowTitleContent = default;
+            private static bool _TextAppearance_Holo_WindowTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Inverse { get { if (!_TextAppearance_InverseReady) { _TextAppearance_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Inverse"); _TextAppearance_InverseReady = true; } return _TextAppearance_InverseContent; } }
+            private static int _TextAppearance_InverseContent = default;
+            private static bool _TextAppearance_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Large"/>
+            /// </summary>
+            public static int TextAppearance_Large { get { if (!_TextAppearance_LargeReady) { _TextAppearance_LargeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Large"); _TextAppearance_LargeReady = true; } return _TextAppearance_LargeContent; } }
+            private static int _TextAppearance_LargeContent = default;
+            private static bool _TextAppearance_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Large_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Large_Inverse { get { if (!_TextAppearance_Large_InverseReady) { _TextAppearance_Large_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Large_Inverse"); _TextAppearance_Large_InverseReady = true; } return _TextAppearance_Large_InverseContent; } }
+            private static int _TextAppearance_Large_InverseContent = default;
+            private static bool _TextAppearance_Large_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material"/>
+            /// </summary>
+            public static int TextAppearance_Material { get { if (!_TextAppearance_MaterialReady) { _TextAppearance_MaterialContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material"); _TextAppearance_MaterialReady = true; } return _TextAppearance_MaterialContent; } }
+            private static int _TextAppearance_MaterialContent = default;
+            private static bool _TextAppearance_MaterialReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Body1"/>
+            /// </summary>
+            public static int TextAppearance_Material_Body1 { get { if (!_TextAppearance_Material_Body1Ready) { _TextAppearance_Material_Body1Content = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Body1"); _TextAppearance_Material_Body1Ready = true; } return _TextAppearance_Material_Body1Content; } }
+            private static int _TextAppearance_Material_Body1Content = default;
+            private static bool _TextAppearance_Material_Body1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Body2"/>
+            /// </summary>
+            public static int TextAppearance_Material_Body2 { get { if (!_TextAppearance_Material_Body2Ready) { _TextAppearance_Material_Body2Content = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Body2"); _TextAppearance_Material_Body2Ready = true; } return _TextAppearance_Material_Body2Content; } }
+            private static int _TextAppearance_Material_Body2Content = default;
+            private static bool _TextAppearance_Material_Body2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Button"/>
+            /// </summary>
+            public static int TextAppearance_Material_Button { get { if (!_TextAppearance_Material_ButtonReady) { _TextAppearance_Material_ButtonContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Button"); _TextAppearance_Material_ButtonReady = true; } return _TextAppearance_Material_ButtonContent; } }
+            private static int _TextAppearance_Material_ButtonContent = default;
+            private static bool _TextAppearance_Material_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Caption"/>
+            /// </summary>
+            public static int TextAppearance_Material_Caption { get { if (!_TextAppearance_Material_CaptionReady) { _TextAppearance_Material_CaptionContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Caption"); _TextAppearance_Material_CaptionReady = true; } return _TextAppearance_Material_CaptionContent; } }
+            private static int _TextAppearance_Material_CaptionContent = default;
+            private static bool _TextAppearance_Material_CaptionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_DialogWindowTitle"/>
+            /// </summary>
+            public static int TextAppearance_Material_DialogWindowTitle { get { if (!_TextAppearance_Material_DialogWindowTitleReady) { _TextAppearance_Material_DialogWindowTitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_DialogWindowTitle"); _TextAppearance_Material_DialogWindowTitleReady = true; } return _TextAppearance_Material_DialogWindowTitleContent; } }
+            private static int _TextAppearance_Material_DialogWindowTitleContent = default;
+            private static bool _TextAppearance_Material_DialogWindowTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Display1"/>
+            /// </summary>
+            public static int TextAppearance_Material_Display1 { get { if (!_TextAppearance_Material_Display1Ready) { _TextAppearance_Material_Display1Content = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Display1"); _TextAppearance_Material_Display1Ready = true; } return _TextAppearance_Material_Display1Content; } }
+            private static int _TextAppearance_Material_Display1Content = default;
+            private static bool _TextAppearance_Material_Display1Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Display2"/>
+            /// </summary>
+            public static int TextAppearance_Material_Display2 { get { if (!_TextAppearance_Material_Display2Ready) { _TextAppearance_Material_Display2Content = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Display2"); _TextAppearance_Material_Display2Ready = true; } return _TextAppearance_Material_Display2Content; } }
+            private static int _TextAppearance_Material_Display2Content = default;
+            private static bool _TextAppearance_Material_Display2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Display3"/>
+            /// </summary>
+            public static int TextAppearance_Material_Display3 { get { if (!_TextAppearance_Material_Display3Ready) { _TextAppearance_Material_Display3Content = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Display3"); _TextAppearance_Material_Display3Ready = true; } return _TextAppearance_Material_Display3Content; } }
+            private static int _TextAppearance_Material_Display3Content = default;
+            private static bool _TextAppearance_Material_Display3Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Display4"/>
+            /// </summary>
+            public static int TextAppearance_Material_Display4 { get { if (!_TextAppearance_Material_Display4Ready) { _TextAppearance_Material_Display4Content = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Display4"); _TextAppearance_Material_Display4Ready = true; } return _TextAppearance_Material_Display4Content; } }
+            private static int _TextAppearance_Material_Display4Content = default;
+            private static bool _TextAppearance_Material_Display4Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Headline"/>
+            /// </summary>
+            public static int TextAppearance_Material_Headline { get { if (!_TextAppearance_Material_HeadlineReady) { _TextAppearance_Material_HeadlineContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Headline"); _TextAppearance_Material_HeadlineReady = true; } return _TextAppearance_Material_HeadlineContent; } }
+            private static int _TextAppearance_Material_HeadlineContent = default;
+            private static bool _TextAppearance_Material_HeadlineReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Inverse { get { if (!_TextAppearance_Material_InverseReady) { _TextAppearance_Material_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Inverse"); _TextAppearance_Material_InverseReady = true; } return _TextAppearance_Material_InverseContent; } }
+            private static int _TextAppearance_Material_InverseContent = default;
+            private static bool _TextAppearance_Material_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Large"/>
+            /// </summary>
+            public static int TextAppearance_Material_Large { get { if (!_TextAppearance_Material_LargeReady) { _TextAppearance_Material_LargeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Large"); _TextAppearance_Material_LargeReady = true; } return _TextAppearance_Material_LargeContent; } }
+            private static int _TextAppearance_Material_LargeContent = default;
+            private static bool _TextAppearance_Material_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Large_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Large_Inverse { get { if (!_TextAppearance_Material_Large_InverseReady) { _TextAppearance_Material_Large_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Large_Inverse"); _TextAppearance_Material_Large_InverseReady = true; } return _TextAppearance_Material_Large_InverseContent; } }
+            private static int _TextAppearance_Material_Large_InverseContent = default;
+            private static bool _TextAppearance_Material_Large_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Medium"/>
+            /// </summary>
+            public static int TextAppearance_Material_Medium { get { if (!_TextAppearance_Material_MediumReady) { _TextAppearance_Material_MediumContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Medium"); _TextAppearance_Material_MediumReady = true; } return _TextAppearance_Material_MediumContent; } }
+            private static int _TextAppearance_Material_MediumContent = default;
+            private static bool _TextAppearance_Material_MediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Medium_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Medium_Inverse { get { if (!_TextAppearance_Material_Medium_InverseReady) { _TextAppearance_Material_Medium_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Medium_Inverse"); _TextAppearance_Material_Medium_InverseReady = true; } return _TextAppearance_Material_Medium_InverseContent; } }
+            private static int _TextAppearance_Material_Medium_InverseContent = default;
+            private static bool _TextAppearance_Material_Medium_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Menu"/>
+            /// </summary>
+            public static int TextAppearance_Material_Menu { get { if (!_TextAppearance_Material_MenuReady) { _TextAppearance_Material_MenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Menu"); _TextAppearance_Material_MenuReady = true; } return _TextAppearance_Material_MenuContent; } }
+            private static int _TextAppearance_Material_MenuContent = default;
+            private static bool _TextAppearance_Material_MenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Notification"/>
+            /// </summary>
+            public static int TextAppearance_Material_Notification { get { if (!_TextAppearance_Material_NotificationReady) { _TextAppearance_Material_NotificationContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Notification"); _TextAppearance_Material_NotificationReady = true; } return _TextAppearance_Material_NotificationContent; } }
+            private static int _TextAppearance_Material_NotificationContent = default;
+            private static bool _TextAppearance_Material_NotificationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Notification_Emphasis"/>
+            /// </summary>
+            public static int TextAppearance_Material_Notification_Emphasis { get { if (!_TextAppearance_Material_Notification_EmphasisReady) { _TextAppearance_Material_Notification_EmphasisContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Notification_Emphasis"); _TextAppearance_Material_Notification_EmphasisReady = true; } return _TextAppearance_Material_Notification_EmphasisContent; } }
+            private static int _TextAppearance_Material_Notification_EmphasisContent = default;
+            private static bool _TextAppearance_Material_Notification_EmphasisReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Notification_Info"/>
+            /// </summary>
+            public static int TextAppearance_Material_Notification_Info { get { if (!_TextAppearance_Material_Notification_InfoReady) { _TextAppearance_Material_Notification_InfoContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Notification_Info"); _TextAppearance_Material_Notification_InfoReady = true; } return _TextAppearance_Material_Notification_InfoContent; } }
+            private static int _TextAppearance_Material_Notification_InfoContent = default;
+            private static bool _TextAppearance_Material_Notification_InfoReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Notification_Line2"/>
+            /// </summary>
+            public static int TextAppearance_Material_Notification_Line2 { get { if (!_TextAppearance_Material_Notification_Line2Ready) { _TextAppearance_Material_Notification_Line2Content = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Notification_Line2"); _TextAppearance_Material_Notification_Line2Ready = true; } return _TextAppearance_Material_Notification_Line2Content; } }
+            private static int _TextAppearance_Material_Notification_Line2Content = default;
+            private static bool _TextAppearance_Material_Notification_Line2Ready = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Notification_Time"/>
+            /// </summary>
+            public static int TextAppearance_Material_Notification_Time { get { if (!_TextAppearance_Material_Notification_TimeReady) { _TextAppearance_Material_Notification_TimeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Notification_Time"); _TextAppearance_Material_Notification_TimeReady = true; } return _TextAppearance_Material_Notification_TimeContent; } }
+            private static int _TextAppearance_Material_Notification_TimeContent = default;
+            private static bool _TextAppearance_Material_Notification_TimeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Notification_Title"/>
+            /// </summary>
+            public static int TextAppearance_Material_Notification_Title { get { if (!_TextAppearance_Material_Notification_TitleReady) { _TextAppearance_Material_Notification_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Notification_Title"); _TextAppearance_Material_Notification_TitleReady = true; } return _TextAppearance_Material_Notification_TitleContent; } }
+            private static int _TextAppearance_Material_Notification_TitleContent = default;
+            private static bool _TextAppearance_Material_Notification_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_SearchResult_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_Material_SearchResult_Subtitle { get { if (!_TextAppearance_Material_SearchResult_SubtitleReady) { _TextAppearance_Material_SearchResult_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_SearchResult_Subtitle"); _TextAppearance_Material_SearchResult_SubtitleReady = true; } return _TextAppearance_Material_SearchResult_SubtitleContent; } }
+            private static int _TextAppearance_Material_SearchResult_SubtitleContent = default;
+            private static bool _TextAppearance_Material_SearchResult_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_SearchResult_Title"/>
+            /// </summary>
+            public static int TextAppearance_Material_SearchResult_Title { get { if (!_TextAppearance_Material_SearchResult_TitleReady) { _TextAppearance_Material_SearchResult_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_SearchResult_Title"); _TextAppearance_Material_SearchResult_TitleReady = true; } return _TextAppearance_Material_SearchResult_TitleContent; } }
+            private static int _TextAppearance_Material_SearchResult_TitleContent = default;
+            private static bool _TextAppearance_Material_SearchResult_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Small"/>
+            /// </summary>
+            public static int TextAppearance_Material_Small { get { if (!_TextAppearance_Material_SmallReady) { _TextAppearance_Material_SmallContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Small"); _TextAppearance_Material_SmallReady = true; } return _TextAppearance_Material_SmallContent; } }
+            private static int _TextAppearance_Material_SmallContent = default;
+            private static bool _TextAppearance_Material_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Small_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Small_Inverse { get { if (!_TextAppearance_Material_Small_InverseReady) { _TextAppearance_Material_Small_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Small_Inverse"); _TextAppearance_Material_Small_InverseReady = true; } return _TextAppearance_Material_Small_InverseContent; } }
+            private static int _TextAppearance_Material_Small_InverseContent = default;
+            private static bool _TextAppearance_Material_Small_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Subhead"/>
+            /// </summary>
+            public static int TextAppearance_Material_Subhead { get { if (!_TextAppearance_Material_SubheadReady) { _TextAppearance_Material_SubheadContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Subhead"); _TextAppearance_Material_SubheadReady = true; } return _TextAppearance_Material_SubheadContent; } }
+            private static int _TextAppearance_Material_SubheadContent = default;
+            private static bool _TextAppearance_Material_SubheadReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Title"/>
+            /// </summary>
+            public static int TextAppearance_Material_Title { get { if (!_TextAppearance_Material_TitleReady) { _TextAppearance_Material_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Title"); _TextAppearance_Material_TitleReady = true; } return _TextAppearance_Material_TitleContent; } }
+            private static int _TextAppearance_Material_TitleContent = default;
+            private static bool _TextAppearance_Material_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget { get { if (!_TextAppearance_Material_WidgetReady) { _TextAppearance_Material_WidgetContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget"); _TextAppearance_Material_WidgetReady = true; } return _TextAppearance_Material_WidgetContent; } }
+            private static int _TextAppearance_Material_WidgetContent = default;
+            private static bool _TextAppearance_Material_WidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionBar_Menu"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionBar_Menu { get { if (!_TextAppearance_Material_Widget_ActionBar_MenuReady) { _TextAppearance_Material_Widget_ActionBar_MenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionBar_Menu"); _TextAppearance_Material_Widget_ActionBar_MenuReady = true; } return _TextAppearance_Material_Widget_ActionBar_MenuContent; } }
+            private static int _TextAppearance_Material_Widget_ActionBar_MenuContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionBar_MenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionBar_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionBar_Subtitle { get { if (!_TextAppearance_Material_Widget_ActionBar_SubtitleReady) { _TextAppearance_Material_Widget_ActionBar_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionBar_Subtitle"); _TextAppearance_Material_Widget_ActionBar_SubtitleReady = true; } return _TextAppearance_Material_Widget_ActionBar_SubtitleContent; } }
+            private static int _TextAppearance_Material_Widget_ActionBar_SubtitleContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionBar_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionBar_Subtitle_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionBar_Subtitle_Inverse { get { if (!_TextAppearance_Material_Widget_ActionBar_Subtitle_InverseReady) { _TextAppearance_Material_Widget_ActionBar_Subtitle_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionBar_Subtitle_Inverse"); _TextAppearance_Material_Widget_ActionBar_Subtitle_InverseReady = true; } return _TextAppearance_Material_Widget_ActionBar_Subtitle_InverseContent; } }
+            private static int _TextAppearance_Material_Widget_ActionBar_Subtitle_InverseContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionBar_Subtitle_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionBar_Title"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionBar_Title { get { if (!_TextAppearance_Material_Widget_ActionBar_TitleReady) { _TextAppearance_Material_Widget_ActionBar_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionBar_Title"); _TextAppearance_Material_Widget_ActionBar_TitleReady = true; } return _TextAppearance_Material_Widget_ActionBar_TitleContent; } }
+            private static int _TextAppearance_Material_Widget_ActionBar_TitleContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionBar_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionBar_Title_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionBar_Title_Inverse { get { if (!_TextAppearance_Material_Widget_ActionBar_Title_InverseReady) { _TextAppearance_Material_Widget_ActionBar_Title_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionBar_Title_Inverse"); _TextAppearance_Material_Widget_ActionBar_Title_InverseReady = true; } return _TextAppearance_Material_Widget_ActionBar_Title_InverseContent; } }
+            private static int _TextAppearance_Material_Widget_ActionBar_Title_InverseContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionBar_Title_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionMode_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionMode_Subtitle { get { if (!_TextAppearance_Material_Widget_ActionMode_SubtitleReady) { _TextAppearance_Material_Widget_ActionMode_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionMode_Subtitle"); _TextAppearance_Material_Widget_ActionMode_SubtitleReady = true; } return _TextAppearance_Material_Widget_ActionMode_SubtitleContent; } }
+            private static int _TextAppearance_Material_Widget_ActionMode_SubtitleContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionMode_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionMode_Subtitle_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionMode_Subtitle_Inverse { get { if (!_TextAppearance_Material_Widget_ActionMode_Subtitle_InverseReady) { _TextAppearance_Material_Widget_ActionMode_Subtitle_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionMode_Subtitle_Inverse"); _TextAppearance_Material_Widget_ActionMode_Subtitle_InverseReady = true; } return _TextAppearance_Material_Widget_ActionMode_Subtitle_InverseContent; } }
+            private static int _TextAppearance_Material_Widget_ActionMode_Subtitle_InverseContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionMode_Subtitle_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionMode_Title"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionMode_Title { get { if (!_TextAppearance_Material_Widget_ActionMode_TitleReady) { _TextAppearance_Material_Widget_ActionMode_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionMode_Title"); _TextAppearance_Material_Widget_ActionMode_TitleReady = true; } return _TextAppearance_Material_Widget_ActionMode_TitleContent; } }
+            private static int _TextAppearance_Material_Widget_ActionMode_TitleContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionMode_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_ActionMode_Title_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_ActionMode_Title_Inverse { get { if (!_TextAppearance_Material_Widget_ActionMode_Title_InverseReady) { _TextAppearance_Material_Widget_ActionMode_Title_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_ActionMode_Title_Inverse"); _TextAppearance_Material_Widget_ActionMode_Title_InverseReady = true; } return _TextAppearance_Material_Widget_ActionMode_Title_InverseContent; } }
+            private static int _TextAppearance_Material_Widget_ActionMode_Title_InverseContent = default;
+            private static bool _TextAppearance_Material_Widget_ActionMode_Title_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_Button"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_Button { get { if (!_TextAppearance_Material_Widget_ButtonReady) { _TextAppearance_Material_Widget_ButtonContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_Button"); _TextAppearance_Material_Widget_ButtonReady = true; } return _TextAppearance_Material_Widget_ButtonContent; } }
+            private static int _TextAppearance_Material_Widget_ButtonContent = default;
+            private static bool _TextAppearance_Material_Widget_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_Button_Borderless_Colored"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_Button_Borderless_Colored { get { if (!_TextAppearance_Material_Widget_Button_Borderless_ColoredReady) { _TextAppearance_Material_Widget_Button_Borderless_ColoredContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_Button_Borderless_Colored"); _TextAppearance_Material_Widget_Button_Borderless_ColoredReady = true; } return _TextAppearance_Material_Widget_Button_Borderless_ColoredContent; } }
+            private static int _TextAppearance_Material_Widget_Button_Borderless_ColoredContent = default;
+            private static bool _TextAppearance_Material_Widget_Button_Borderless_ColoredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_Button_Colored"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_Button_Colored { get { if (!_TextAppearance_Material_Widget_Button_ColoredReady) { _TextAppearance_Material_Widget_Button_ColoredContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_Button_Colored"); _TextAppearance_Material_Widget_Button_ColoredReady = true; } return _TextAppearance_Material_Widget_Button_ColoredContent; } }
+            private static int _TextAppearance_Material_Widget_Button_ColoredContent = default;
+            private static bool _TextAppearance_Material_Widget_Button_ColoredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_Button_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_Button_Inverse { get { if (!_TextAppearance_Material_Widget_Button_InverseReady) { _TextAppearance_Material_Widget_Button_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_Button_Inverse"); _TextAppearance_Material_Widget_Button_InverseReady = true; } return _TextAppearance_Material_Widget_Button_InverseContent; } }
+            private static int _TextAppearance_Material_Widget_Button_InverseContent = default;
+            private static bool _TextAppearance_Material_Widget_Button_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_DropDownHint"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_DropDownHint { get { if (!_TextAppearance_Material_Widget_DropDownHintReady) { _TextAppearance_Material_Widget_DropDownHintContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_DropDownHint"); _TextAppearance_Material_Widget_DropDownHintReady = true; } return _TextAppearance_Material_Widget_DropDownHintContent; } }
+            private static int _TextAppearance_Material_Widget_DropDownHintContent = default;
+            private static bool _TextAppearance_Material_Widget_DropDownHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_DropDownItem"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_DropDownItem { get { if (!_TextAppearance_Material_Widget_DropDownItemReady) { _TextAppearance_Material_Widget_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_DropDownItem"); _TextAppearance_Material_Widget_DropDownItemReady = true; } return _TextAppearance_Material_Widget_DropDownItemContent; } }
+            private static int _TextAppearance_Material_Widget_DropDownItemContent = default;
+            private static bool _TextAppearance_Material_Widget_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_EditText"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_EditText { get { if (!_TextAppearance_Material_Widget_EditTextReady) { _TextAppearance_Material_Widget_EditTextContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_EditText"); _TextAppearance_Material_Widget_EditTextReady = true; } return _TextAppearance_Material_Widget_EditTextContent; } }
+            private static int _TextAppearance_Material_Widget_EditTextContent = default;
+            private static bool _TextAppearance_Material_Widget_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_IconMenu_Item"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_IconMenu_Item { get { if (!_TextAppearance_Material_Widget_IconMenu_ItemReady) { _TextAppearance_Material_Widget_IconMenu_ItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_IconMenu_Item"); _TextAppearance_Material_Widget_IconMenu_ItemReady = true; } return _TextAppearance_Material_Widget_IconMenu_ItemContent; } }
+            private static int _TextAppearance_Material_Widget_IconMenu_ItemContent = default;
+            private static bool _TextAppearance_Material_Widget_IconMenu_ItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_PopupMenu"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_PopupMenu { get { if (!_TextAppearance_Material_Widget_PopupMenuReady) { _TextAppearance_Material_Widget_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_PopupMenu"); _TextAppearance_Material_Widget_PopupMenuReady = true; } return _TextAppearance_Material_Widget_PopupMenuContent; } }
+            private static int _TextAppearance_Material_Widget_PopupMenuContent = default;
+            private static bool _TextAppearance_Material_Widget_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_PopupMenu_Large"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_PopupMenu_Large { get { if (!_TextAppearance_Material_Widget_PopupMenu_LargeReady) { _TextAppearance_Material_Widget_PopupMenu_LargeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_PopupMenu_Large"); _TextAppearance_Material_Widget_PopupMenu_LargeReady = true; } return _TextAppearance_Material_Widget_PopupMenu_LargeContent; } }
+            private static int _TextAppearance_Material_Widget_PopupMenu_LargeContent = default;
+            private static bool _TextAppearance_Material_Widget_PopupMenu_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_PopupMenu_Small"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_PopupMenu_Small { get { if (!_TextAppearance_Material_Widget_PopupMenu_SmallReady) { _TextAppearance_Material_Widget_PopupMenu_SmallContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_PopupMenu_Small"); _TextAppearance_Material_Widget_PopupMenu_SmallReady = true; } return _TextAppearance_Material_Widget_PopupMenu_SmallContent; } }
+            private static int _TextAppearance_Material_Widget_PopupMenu_SmallContent = default;
+            private static bool _TextAppearance_Material_Widget_PopupMenu_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_TabWidget"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_TabWidget { get { if (!_TextAppearance_Material_Widget_TabWidgetReady) { _TextAppearance_Material_Widget_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_TabWidget"); _TextAppearance_Material_Widget_TabWidgetReady = true; } return _TextAppearance_Material_Widget_TabWidgetContent; } }
+            private static int _TextAppearance_Material_Widget_TabWidgetContent = default;
+            private static bool _TextAppearance_Material_Widget_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_TextView"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_TextView { get { if (!_TextAppearance_Material_Widget_TextViewReady) { _TextAppearance_Material_Widget_TextViewContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_TextView"); _TextAppearance_Material_Widget_TextViewReady = true; } return _TextAppearance_Material_Widget_TextViewContent; } }
+            private static int _TextAppearance_Material_Widget_TextViewContent = default;
+            private static bool _TextAppearance_Material_Widget_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_TextView_PopupMenu"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_TextView_PopupMenu { get { if (!_TextAppearance_Material_Widget_TextView_PopupMenuReady) { _TextAppearance_Material_Widget_TextView_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_TextView_PopupMenu"); _TextAppearance_Material_Widget_TextView_PopupMenuReady = true; } return _TextAppearance_Material_Widget_TextView_PopupMenuContent; } }
+            private static int _TextAppearance_Material_Widget_TextView_PopupMenuContent = default;
+            private static bool _TextAppearance_Material_Widget_TextView_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_TextView_SpinnerItem { get { if (!_TextAppearance_Material_Widget_TextView_SpinnerItemReady) { _TextAppearance_Material_Widget_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_TextView_SpinnerItem"); _TextAppearance_Material_Widget_TextView_SpinnerItemReady = true; } return _TextAppearance_Material_Widget_TextView_SpinnerItemContent; } }
+            private static int _TextAppearance_Material_Widget_TextView_SpinnerItemContent = default;
+            private static bool _TextAppearance_Material_Widget_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_Toolbar_Subtitle"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_Toolbar_Subtitle { get { if (!_TextAppearance_Material_Widget_Toolbar_SubtitleReady) { _TextAppearance_Material_Widget_Toolbar_SubtitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_Toolbar_Subtitle"); _TextAppearance_Material_Widget_Toolbar_SubtitleReady = true; } return _TextAppearance_Material_Widget_Toolbar_SubtitleContent; } }
+            private static int _TextAppearance_Material_Widget_Toolbar_SubtitleContent = default;
+            private static bool _TextAppearance_Material_Widget_Toolbar_SubtitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_Widget_Toolbar_Title"/>
+            /// </summary>
+            public static int TextAppearance_Material_Widget_Toolbar_Title { get { if (!_TextAppearance_Material_Widget_Toolbar_TitleReady) { _TextAppearance_Material_Widget_Toolbar_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_Widget_Toolbar_Title"); _TextAppearance_Material_Widget_Toolbar_TitleReady = true; } return _TextAppearance_Material_Widget_Toolbar_TitleContent; } }
+            private static int _TextAppearance_Material_Widget_Toolbar_TitleContent = default;
+            private static bool _TextAppearance_Material_Widget_Toolbar_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Material_WindowTitle"/>
+            /// </summary>
+            public static int TextAppearance_Material_WindowTitle { get { if (!_TextAppearance_Material_WindowTitleReady) { _TextAppearance_Material_WindowTitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Material_WindowTitle"); _TextAppearance_Material_WindowTitleReady = true; } return _TextAppearance_Material_WindowTitleContent; } }
+            private static int _TextAppearance_Material_WindowTitleContent = default;
+            private static bool _TextAppearance_Material_WindowTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Medium"/>
+            /// </summary>
+            public static int TextAppearance_Medium { get { if (!_TextAppearance_MediumReady) { _TextAppearance_MediumContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Medium"); _TextAppearance_MediumReady = true; } return _TextAppearance_MediumContent; } }
+            private static int _TextAppearance_MediumContent = default;
+            private static bool _TextAppearance_MediumReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Medium_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Medium_Inverse { get { if (!_TextAppearance_Medium_InverseReady) { _TextAppearance_Medium_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Medium_Inverse"); _TextAppearance_Medium_InverseReady = true; } return _TextAppearance_Medium_InverseContent; } }
+            private static int _TextAppearance_Medium_InverseContent = default;
+            private static bool _TextAppearance_Medium_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Small"/>
+            /// </summary>
+            public static int TextAppearance_Small { get { if (!_TextAppearance_SmallReady) { _TextAppearance_SmallContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Small"); _TextAppearance_SmallReady = true; } return _TextAppearance_SmallContent; } }
+            private static int _TextAppearance_SmallContent = default;
+            private static bool _TextAppearance_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Small_Inverse"/>
+            /// </summary>
+            public static int TextAppearance_Small_Inverse { get { if (!_TextAppearance_Small_InverseReady) { _TextAppearance_Small_InverseContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Small_Inverse"); _TextAppearance_Small_InverseReady = true; } return _TextAppearance_Small_InverseContent; } }
+            private static int _TextAppearance_Small_InverseContent = default;
+            private static bool _TextAppearance_Small_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_StatusBar_EventContent"/>
+            /// </summary>
+            public static int TextAppearance_StatusBar_EventContent { get { if (!_TextAppearance_StatusBar_EventContentReady) { _TextAppearance_StatusBar_EventContentContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_StatusBar_EventContent"); _TextAppearance_StatusBar_EventContentReady = true; } return _TextAppearance_StatusBar_EventContentContent; } }
+            private static int _TextAppearance_StatusBar_EventContentContent = default;
+            private static bool _TextAppearance_StatusBar_EventContentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_StatusBar_EventContent_Title"/>
+            /// </summary>
+            public static int TextAppearance_StatusBar_EventContent_Title { get { if (!_TextAppearance_StatusBar_EventContent_TitleReady) { _TextAppearance_StatusBar_EventContent_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_StatusBar_EventContent_Title"); _TextAppearance_StatusBar_EventContent_TitleReady = true; } return _TextAppearance_StatusBar_EventContent_TitleContent; } }
+            private static int _TextAppearance_StatusBar_EventContent_TitleContent = default;
+            private static bool _TextAppearance_StatusBar_EventContent_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_StatusBar_Icon"/>
+            /// </summary>
+            public static int TextAppearance_StatusBar_Icon { get { if (!_TextAppearance_StatusBar_IconReady) { _TextAppearance_StatusBar_IconContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_StatusBar_Icon"); _TextAppearance_StatusBar_IconReady = true; } return _TextAppearance_StatusBar_IconContent; } }
+            private static int _TextAppearance_StatusBar_IconContent = default;
+            private static bool _TextAppearance_StatusBar_IconReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_StatusBar_Title"/>
+            /// </summary>
+            public static int TextAppearance_StatusBar_Title { get { if (!_TextAppearance_StatusBar_TitleReady) { _TextAppearance_StatusBar_TitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_StatusBar_Title"); _TextAppearance_StatusBar_TitleReady = true; } return _TextAppearance_StatusBar_TitleContent; } }
+            private static int _TextAppearance_StatusBar_TitleContent = default;
+            private static bool _TextAppearance_StatusBar_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_SuggestionHighlight"/>
+            /// </summary>
+            public static int TextAppearance_SuggestionHighlight { get { if (!_TextAppearance_SuggestionHighlightReady) { _TextAppearance_SuggestionHighlightContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_SuggestionHighlight"); _TextAppearance_SuggestionHighlightReady = true; } return _TextAppearance_SuggestionHighlightContent; } }
+            private static int _TextAppearance_SuggestionHighlightContent = default;
+            private static bool _TextAppearance_SuggestionHighlightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Theme"/>
+            /// </summary>
+            public static int TextAppearance_Theme { get { if (!_TextAppearance_ThemeReady) { _TextAppearance_ThemeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Theme"); _TextAppearance_ThemeReady = true; } return _TextAppearance_ThemeContent; } }
+            private static int _TextAppearance_ThemeContent = default;
+            private static bool _TextAppearance_ThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Theme_Dialog"/>
+            /// </summary>
+            public static int TextAppearance_Theme_Dialog { get { if (!_TextAppearance_Theme_DialogReady) { _TextAppearance_Theme_DialogContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Theme_Dialog"); _TextAppearance_Theme_DialogReady = true; } return _TextAppearance_Theme_DialogContent; } }
+            private static int _TextAppearance_Theme_DialogContent = default;
+            private static bool _TextAppearance_Theme_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget"/>
+            /// </summary>
+            public static int TextAppearance_Widget { get { if (!_TextAppearance_WidgetReady) { _TextAppearance_WidgetContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget"); _TextAppearance_WidgetReady = true; } return _TextAppearance_WidgetContent; } }
+            private static int _TextAppearance_WidgetContent = default;
+            private static bool _TextAppearance_WidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_Button"/>
+            /// </summary>
+            public static int TextAppearance_Widget_Button { get { if (!_TextAppearance_Widget_ButtonReady) { _TextAppearance_Widget_ButtonContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_Button"); _TextAppearance_Widget_ButtonReady = true; } return _TextAppearance_Widget_ButtonContent; } }
+            private static int _TextAppearance_Widget_ButtonContent = default;
+            private static bool _TextAppearance_Widget_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_DropDownHint"/>
+            /// </summary>
+            public static int TextAppearance_Widget_DropDownHint { get { if (!_TextAppearance_Widget_DropDownHintReady) { _TextAppearance_Widget_DropDownHintContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_DropDownHint"); _TextAppearance_Widget_DropDownHintReady = true; } return _TextAppearance_Widget_DropDownHintContent; } }
+            private static int _TextAppearance_Widget_DropDownHintContent = default;
+            private static bool _TextAppearance_Widget_DropDownHintReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_DropDownItem"/>
+            /// </summary>
+            public static int TextAppearance_Widget_DropDownItem { get { if (!_TextAppearance_Widget_DropDownItemReady) { _TextAppearance_Widget_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_DropDownItem"); _TextAppearance_Widget_DropDownItemReady = true; } return _TextAppearance_Widget_DropDownItemContent; } }
+            private static int _TextAppearance_Widget_DropDownItemContent = default;
+            private static bool _TextAppearance_Widget_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_EditText"/>
+            /// </summary>
+            public static int TextAppearance_Widget_EditText { get { if (!_TextAppearance_Widget_EditTextReady) { _TextAppearance_Widget_EditTextContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_EditText"); _TextAppearance_Widget_EditTextReady = true; } return _TextAppearance_Widget_EditTextContent; } }
+            private static int _TextAppearance_Widget_EditTextContent = default;
+            private static bool _TextAppearance_Widget_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_IconMenu_Item"/>
+            /// </summary>
+            public static int TextAppearance_Widget_IconMenu_Item { get { if (!_TextAppearance_Widget_IconMenu_ItemReady) { _TextAppearance_Widget_IconMenu_ItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_IconMenu_Item"); _TextAppearance_Widget_IconMenu_ItemReady = true; } return _TextAppearance_Widget_IconMenu_ItemContent; } }
+            private static int _TextAppearance_Widget_IconMenu_ItemContent = default;
+            private static bool _TextAppearance_Widget_IconMenu_ItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_PopupMenu_Large"/>
+            /// </summary>
+            public static int TextAppearance_Widget_PopupMenu_Large { get { if (!_TextAppearance_Widget_PopupMenu_LargeReady) { _TextAppearance_Widget_PopupMenu_LargeContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_PopupMenu_Large"); _TextAppearance_Widget_PopupMenu_LargeReady = true; } return _TextAppearance_Widget_PopupMenu_LargeContent; } }
+            private static int _TextAppearance_Widget_PopupMenu_LargeContent = default;
+            private static bool _TextAppearance_Widget_PopupMenu_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_PopupMenu_Small"/>
+            /// </summary>
+            public static int TextAppearance_Widget_PopupMenu_Small { get { if (!_TextAppearance_Widget_PopupMenu_SmallReady) { _TextAppearance_Widget_PopupMenu_SmallContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_PopupMenu_Small"); _TextAppearance_Widget_PopupMenu_SmallReady = true; } return _TextAppearance_Widget_PopupMenu_SmallContent; } }
+            private static int _TextAppearance_Widget_PopupMenu_SmallContent = default;
+            private static bool _TextAppearance_Widget_PopupMenu_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_TabWidget"/>
+            /// </summary>
+            public static int TextAppearance_Widget_TabWidget { get { if (!_TextAppearance_Widget_TabWidgetReady) { _TextAppearance_Widget_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_TabWidget"); _TextAppearance_Widget_TabWidgetReady = true; } return _TextAppearance_Widget_TabWidgetContent; } }
+            private static int _TextAppearance_Widget_TabWidgetContent = default;
+            private static bool _TextAppearance_Widget_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_TextView"/>
+            /// </summary>
+            public static int TextAppearance_Widget_TextView { get { if (!_TextAppearance_Widget_TextViewReady) { _TextAppearance_Widget_TextViewContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_TextView"); _TextAppearance_Widget_TextViewReady = true; } return _TextAppearance_Widget_TextViewContent; } }
+            private static int _TextAppearance_Widget_TextViewContent = default;
+            private static bool _TextAppearance_Widget_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_TextView_PopupMenu"/>
+            /// </summary>
+            public static int TextAppearance_Widget_TextView_PopupMenu { get { if (!_TextAppearance_Widget_TextView_PopupMenuReady) { _TextAppearance_Widget_TextView_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_TextView_PopupMenu"); _TextAppearance_Widget_TextView_PopupMenuReady = true; } return _TextAppearance_Widget_TextView_PopupMenuContent; } }
+            private static int _TextAppearance_Widget_TextView_PopupMenuContent = default;
+            private static bool _TextAppearance_Widget_TextView_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_Widget_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int TextAppearance_Widget_TextView_SpinnerItem { get { if (!_TextAppearance_Widget_TextView_SpinnerItemReady) { _TextAppearance_Widget_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_Widget_TextView_SpinnerItem"); _TextAppearance_Widget_TextView_SpinnerItemReady = true; } return _TextAppearance_Widget_TextView_SpinnerItemContent; } }
+            private static int _TextAppearance_Widget_TextView_SpinnerItemContent = default;
+            private static bool _TextAppearance_Widget_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#TextAppearance_WindowTitle"/>
+            /// </summary>
+            public static int TextAppearance_WindowTitle { get { if (!_TextAppearance_WindowTitleReady) { _TextAppearance_WindowTitleContent = SGetField<int>(LocalBridgeClazz, "TextAppearance_WindowTitle"); _TextAppearance_WindowTitleReady = true; } return _TextAppearance_WindowTitleContent; } }
+            private static int _TextAppearance_WindowTitleContent = default;
+            private static bool _TextAppearance_WindowTitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme"/>
+            /// </summary>
+            public static int Theme { get { if (!_ThemeReady) { _ThemeContent = SGetField<int>(LocalBridgeClazz, "Theme"); _ThemeReady = true; } return _ThemeContent; } }
+            private static int _ThemeContent = default;
+            private static bool _ThemeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Black"/>
+            /// </summary>
+            public static int Theme_Black { get { if (!_Theme_BlackReady) { _Theme_BlackContent = SGetField<int>(LocalBridgeClazz, "Theme_Black"); _Theme_BlackReady = true; } return _Theme_BlackContent; } }
+            private static int _Theme_BlackContent = default;
+            private static bool _Theme_BlackReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Black_NoTitleBar"/>
+            /// </summary>
+            public static int Theme_Black_NoTitleBar { get { if (!_Theme_Black_NoTitleBarReady) { _Theme_Black_NoTitleBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Black_NoTitleBar"); _Theme_Black_NoTitleBarReady = true; } return _Theme_Black_NoTitleBarContent; } }
+            private static int _Theme_Black_NoTitleBarContent = default;
+            private static bool _Theme_Black_NoTitleBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Black_NoTitleBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_Black_NoTitleBar_Fullscreen { get { if (!_Theme_Black_NoTitleBar_FullscreenReady) { _Theme_Black_NoTitleBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_Black_NoTitleBar_Fullscreen"); _Theme_Black_NoTitleBar_FullscreenReady = true; } return _Theme_Black_NoTitleBar_FullscreenContent; } }
+            private static int _Theme_Black_NoTitleBar_FullscreenContent = default;
+            private static bool _Theme_Black_NoTitleBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault"/>
+            /// </summary>
+            public static int Theme_DeviceDefault { get { if (!_Theme_DeviceDefaultReady) { _Theme_DeviceDefaultContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault"); _Theme_DeviceDefaultReady = true; } return _Theme_DeviceDefaultContent; } }
+            private static int _Theme_DeviceDefaultContent = default;
+            private static bool _Theme_DeviceDefaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_DayNight"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_DayNight { get { if (!_Theme_DeviceDefault_DayNightReady) { _Theme_DeviceDefault_DayNightContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_DayNight"); _Theme_DeviceDefault_DayNightReady = true; } return _Theme_DeviceDefault_DayNightContent; } }
+            private static int _Theme_DeviceDefault_DayNightContent = default;
+            private static bool _Theme_DeviceDefault_DayNightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Dialog"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Dialog { get { if (!_Theme_DeviceDefault_DialogReady) { _Theme_DeviceDefault_DialogContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Dialog"); _Theme_DeviceDefault_DialogReady = true; } return _Theme_DeviceDefault_DialogContent; } }
+            private static int _Theme_DeviceDefault_DialogContent = default;
+            private static bool _Theme_DeviceDefault_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Dialog_Alert"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Dialog_Alert { get { if (!_Theme_DeviceDefault_Dialog_AlertReady) { _Theme_DeviceDefault_Dialog_AlertContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Dialog_Alert"); _Theme_DeviceDefault_Dialog_AlertReady = true; } return _Theme_DeviceDefault_Dialog_AlertContent; } }
+            private static int _Theme_DeviceDefault_Dialog_AlertContent = default;
+            private static bool _Theme_DeviceDefault_Dialog_AlertReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Dialog_MinWidth"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Dialog_MinWidth { get { if (!_Theme_DeviceDefault_Dialog_MinWidthReady) { _Theme_DeviceDefault_Dialog_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Dialog_MinWidth"); _Theme_DeviceDefault_Dialog_MinWidthReady = true; } return _Theme_DeviceDefault_Dialog_MinWidthContent; } }
+            private static int _Theme_DeviceDefault_Dialog_MinWidthContent = default;
+            private static bool _Theme_DeviceDefault_Dialog_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Dialog_NoActionBar"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Dialog_NoActionBar { get { if (!_Theme_DeviceDefault_Dialog_NoActionBarReady) { _Theme_DeviceDefault_Dialog_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Dialog_NoActionBar"); _Theme_DeviceDefault_Dialog_NoActionBarReady = true; } return _Theme_DeviceDefault_Dialog_NoActionBarContent; } }
+            private static int _Theme_DeviceDefault_Dialog_NoActionBarContent = default;
+            private static bool _Theme_DeviceDefault_Dialog_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Dialog_NoActionBar_MinWidth"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Dialog_NoActionBar_MinWidth { get { if (!_Theme_DeviceDefault_Dialog_NoActionBar_MinWidthReady) { _Theme_DeviceDefault_Dialog_NoActionBar_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Dialog_NoActionBar_MinWidth"); _Theme_DeviceDefault_Dialog_NoActionBar_MinWidthReady = true; } return _Theme_DeviceDefault_Dialog_NoActionBar_MinWidthContent; } }
+            private static int _Theme_DeviceDefault_Dialog_NoActionBar_MinWidthContent = default;
+            private static bool _Theme_DeviceDefault_Dialog_NoActionBar_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_DialogWhenLarge"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_DialogWhenLarge { get { if (!_Theme_DeviceDefault_DialogWhenLargeReady) { _Theme_DeviceDefault_DialogWhenLargeContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_DialogWhenLarge"); _Theme_DeviceDefault_DialogWhenLargeReady = true; } return _Theme_DeviceDefault_DialogWhenLargeContent; } }
+            private static int _Theme_DeviceDefault_DialogWhenLargeContent = default;
+            private static bool _Theme_DeviceDefault_DialogWhenLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_DialogWhenLarge_NoActionBar"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_DialogWhenLarge_NoActionBar { get { if (!_Theme_DeviceDefault_DialogWhenLarge_NoActionBarReady) { _Theme_DeviceDefault_DialogWhenLarge_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_DialogWhenLarge_NoActionBar"); _Theme_DeviceDefault_DialogWhenLarge_NoActionBarReady = true; } return _Theme_DeviceDefault_DialogWhenLarge_NoActionBarContent; } }
+            private static int _Theme_DeviceDefault_DialogWhenLarge_NoActionBarContent = default;
+            private static bool _Theme_DeviceDefault_DialogWhenLarge_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_InputMethod"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_InputMethod { get { if (!_Theme_DeviceDefault_InputMethodReady) { _Theme_DeviceDefault_InputMethodContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_InputMethod"); _Theme_DeviceDefault_InputMethodReady = true; } return _Theme_DeviceDefault_InputMethodContent; } }
+            private static int _Theme_DeviceDefault_InputMethodContent = default;
+            private static bool _Theme_DeviceDefault_InputMethodReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light { get { if (!_Theme_DeviceDefault_LightReady) { _Theme_DeviceDefault_LightContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light"); _Theme_DeviceDefault_LightReady = true; } return _Theme_DeviceDefault_LightContent; } }
+            private static int _Theme_DeviceDefault_LightContent = default;
+            private static bool _Theme_DeviceDefault_LightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_DarkActionBar"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_DarkActionBar { get { if (!_Theme_DeviceDefault_Light_DarkActionBarReady) { _Theme_DeviceDefault_Light_DarkActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_DarkActionBar"); _Theme_DeviceDefault_Light_DarkActionBarReady = true; } return _Theme_DeviceDefault_Light_DarkActionBarContent; } }
+            private static int _Theme_DeviceDefault_Light_DarkActionBarContent = default;
+            private static bool _Theme_DeviceDefault_Light_DarkActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_Dialog"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_Dialog { get { if (!_Theme_DeviceDefault_Light_DialogReady) { _Theme_DeviceDefault_Light_DialogContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_Dialog"); _Theme_DeviceDefault_Light_DialogReady = true; } return _Theme_DeviceDefault_Light_DialogContent; } }
+            private static int _Theme_DeviceDefault_Light_DialogContent = default;
+            private static bool _Theme_DeviceDefault_Light_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_Dialog_Alert"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_Dialog_Alert { get { if (!_Theme_DeviceDefault_Light_Dialog_AlertReady) { _Theme_DeviceDefault_Light_Dialog_AlertContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_Dialog_Alert"); _Theme_DeviceDefault_Light_Dialog_AlertReady = true; } return _Theme_DeviceDefault_Light_Dialog_AlertContent; } }
+            private static int _Theme_DeviceDefault_Light_Dialog_AlertContent = default;
+            private static bool _Theme_DeviceDefault_Light_Dialog_AlertReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_Dialog_MinWidth"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_Dialog_MinWidth { get { if (!_Theme_DeviceDefault_Light_Dialog_MinWidthReady) { _Theme_DeviceDefault_Light_Dialog_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_Dialog_MinWidth"); _Theme_DeviceDefault_Light_Dialog_MinWidthReady = true; } return _Theme_DeviceDefault_Light_Dialog_MinWidthContent; } }
+            private static int _Theme_DeviceDefault_Light_Dialog_MinWidthContent = default;
+            private static bool _Theme_DeviceDefault_Light_Dialog_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_Dialog_NoActionBar"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_Dialog_NoActionBar { get { if (!_Theme_DeviceDefault_Light_Dialog_NoActionBarReady) { _Theme_DeviceDefault_Light_Dialog_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_Dialog_NoActionBar"); _Theme_DeviceDefault_Light_Dialog_NoActionBarReady = true; } return _Theme_DeviceDefault_Light_Dialog_NoActionBarContent; } }
+            private static int _Theme_DeviceDefault_Light_Dialog_NoActionBarContent = default;
+            private static bool _Theme_DeviceDefault_Light_Dialog_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth { get { if (!_Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidthReady) { _Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth"); _Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidthReady = true; } return _Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidthContent; } }
+            private static int _Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidthContent = default;
+            private static bool _Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_DialogWhenLarge"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_DialogWhenLarge { get { if (!_Theme_DeviceDefault_Light_DialogWhenLargeReady) { _Theme_DeviceDefault_Light_DialogWhenLargeContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_DialogWhenLarge"); _Theme_DeviceDefault_Light_DialogWhenLargeReady = true; } return _Theme_DeviceDefault_Light_DialogWhenLargeContent; } }
+            private static int _Theme_DeviceDefault_Light_DialogWhenLargeContent = default;
+            private static bool _Theme_DeviceDefault_Light_DialogWhenLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBar"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBar { get { if (!_Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBarReady) { _Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBar"); _Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBarReady = true; } return _Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBarContent; } }
+            private static int _Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBarContent = default;
+            private static bool _Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_NoActionBar"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_NoActionBar { get { if (!_Theme_DeviceDefault_Light_NoActionBarReady) { _Theme_DeviceDefault_Light_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_NoActionBar"); _Theme_DeviceDefault_Light_NoActionBarReady = true; } return _Theme_DeviceDefault_Light_NoActionBarContent; } }
+            private static int _Theme_DeviceDefault_Light_NoActionBarContent = default;
+            private static bool _Theme_DeviceDefault_Light_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_NoActionBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_NoActionBar_Fullscreen { get { if (!_Theme_DeviceDefault_Light_NoActionBar_FullscreenReady) { _Theme_DeviceDefault_Light_NoActionBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_NoActionBar_Fullscreen"); _Theme_DeviceDefault_Light_NoActionBar_FullscreenReady = true; } return _Theme_DeviceDefault_Light_NoActionBar_FullscreenContent; } }
+            private static int _Theme_DeviceDefault_Light_NoActionBar_FullscreenContent = default;
+            private static bool _Theme_DeviceDefault_Light_NoActionBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_NoActionBar_Overscan"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_NoActionBar_Overscan { get { if (!_Theme_DeviceDefault_Light_NoActionBar_OverscanReady) { _Theme_DeviceDefault_Light_NoActionBar_OverscanContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_NoActionBar_Overscan"); _Theme_DeviceDefault_Light_NoActionBar_OverscanReady = true; } return _Theme_DeviceDefault_Light_NoActionBar_OverscanContent; } }
+            private static int _Theme_DeviceDefault_Light_NoActionBar_OverscanContent = default;
+            private static bool _Theme_DeviceDefault_Light_NoActionBar_OverscanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_NoActionBar_TranslucentDecor"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_NoActionBar_TranslucentDecor { get { if (!_Theme_DeviceDefault_Light_NoActionBar_TranslucentDecorReady) { _Theme_DeviceDefault_Light_NoActionBar_TranslucentDecorContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_NoActionBar_TranslucentDecor"); _Theme_DeviceDefault_Light_NoActionBar_TranslucentDecorReady = true; } return _Theme_DeviceDefault_Light_NoActionBar_TranslucentDecorContent; } }
+            private static int _Theme_DeviceDefault_Light_NoActionBar_TranslucentDecorContent = default;
+            private static bool _Theme_DeviceDefault_Light_NoActionBar_TranslucentDecorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Light_Panel"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Light_Panel { get { if (!_Theme_DeviceDefault_Light_PanelReady) { _Theme_DeviceDefault_Light_PanelContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Light_Panel"); _Theme_DeviceDefault_Light_PanelReady = true; } return _Theme_DeviceDefault_Light_PanelContent; } }
+            private static int _Theme_DeviceDefault_Light_PanelContent = default;
+            private static bool _Theme_DeviceDefault_Light_PanelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_NoActionBar"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_NoActionBar { get { if (!_Theme_DeviceDefault_NoActionBarReady) { _Theme_DeviceDefault_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_NoActionBar"); _Theme_DeviceDefault_NoActionBarReady = true; } return _Theme_DeviceDefault_NoActionBarContent; } }
+            private static int _Theme_DeviceDefault_NoActionBarContent = default;
+            private static bool _Theme_DeviceDefault_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_NoActionBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_NoActionBar_Fullscreen { get { if (!_Theme_DeviceDefault_NoActionBar_FullscreenReady) { _Theme_DeviceDefault_NoActionBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_NoActionBar_Fullscreen"); _Theme_DeviceDefault_NoActionBar_FullscreenReady = true; } return _Theme_DeviceDefault_NoActionBar_FullscreenContent; } }
+            private static int _Theme_DeviceDefault_NoActionBar_FullscreenContent = default;
+            private static bool _Theme_DeviceDefault_NoActionBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_NoActionBar_Overscan"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_NoActionBar_Overscan { get { if (!_Theme_DeviceDefault_NoActionBar_OverscanReady) { _Theme_DeviceDefault_NoActionBar_OverscanContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_NoActionBar_Overscan"); _Theme_DeviceDefault_NoActionBar_OverscanReady = true; } return _Theme_DeviceDefault_NoActionBar_OverscanContent; } }
+            private static int _Theme_DeviceDefault_NoActionBar_OverscanContent = default;
+            private static bool _Theme_DeviceDefault_NoActionBar_OverscanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_NoActionBar_TranslucentDecor"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_NoActionBar_TranslucentDecor { get { if (!_Theme_DeviceDefault_NoActionBar_TranslucentDecorReady) { _Theme_DeviceDefault_NoActionBar_TranslucentDecorContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_NoActionBar_TranslucentDecor"); _Theme_DeviceDefault_NoActionBar_TranslucentDecorReady = true; } return _Theme_DeviceDefault_NoActionBar_TranslucentDecorContent; } }
+            private static int _Theme_DeviceDefault_NoActionBar_TranslucentDecorContent = default;
+            private static bool _Theme_DeviceDefault_NoActionBar_TranslucentDecorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Panel"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Panel { get { if (!_Theme_DeviceDefault_PanelReady) { _Theme_DeviceDefault_PanelContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Panel"); _Theme_DeviceDefault_PanelReady = true; } return _Theme_DeviceDefault_PanelContent; } }
+            private static int _Theme_DeviceDefault_PanelContent = default;
+            private static bool _Theme_DeviceDefault_PanelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Settings"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Settings { get { if (!_Theme_DeviceDefault_SettingsReady) { _Theme_DeviceDefault_SettingsContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Settings"); _Theme_DeviceDefault_SettingsReady = true; } return _Theme_DeviceDefault_SettingsContent; } }
+            private static int _Theme_DeviceDefault_SettingsContent = default;
+            private static bool _Theme_DeviceDefault_SettingsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Wallpaper"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Wallpaper { get { if (!_Theme_DeviceDefault_WallpaperReady) { _Theme_DeviceDefault_WallpaperContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Wallpaper"); _Theme_DeviceDefault_WallpaperReady = true; } return _Theme_DeviceDefault_WallpaperContent; } }
+            private static int _Theme_DeviceDefault_WallpaperContent = default;
+            private static bool _Theme_DeviceDefault_WallpaperReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_DeviceDefault_Wallpaper_NoTitleBar"/>
+            /// </summary>
+            public static int Theme_DeviceDefault_Wallpaper_NoTitleBar { get { if (!_Theme_DeviceDefault_Wallpaper_NoTitleBarReady) { _Theme_DeviceDefault_Wallpaper_NoTitleBarContent = SGetField<int>(LocalBridgeClazz, "Theme_DeviceDefault_Wallpaper_NoTitleBar"); _Theme_DeviceDefault_Wallpaper_NoTitleBarReady = true; } return _Theme_DeviceDefault_Wallpaper_NoTitleBarContent; } }
+            private static int _Theme_DeviceDefault_Wallpaper_NoTitleBarContent = default;
+            private static bool _Theme_DeviceDefault_Wallpaper_NoTitleBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Dialog"/>
+            /// </summary>
+            public static int Theme_Dialog { get { if (!_Theme_DialogReady) { _Theme_DialogContent = SGetField<int>(LocalBridgeClazz, "Theme_Dialog"); _Theme_DialogReady = true; } return _Theme_DialogContent; } }
+            private static int _Theme_DialogContent = default;
+            private static bool _Theme_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo { get { if (!_Theme_HoloReady) { _Theme_HoloContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo"); _Theme_HoloReady = true; } return _Theme_HoloContent; } }
+            private static int _Theme_HoloContent = default;
+            private static bool _Theme_HoloReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Dialog"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Dialog { get { if (!_Theme_Holo_DialogReady) { _Theme_Holo_DialogContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Dialog"); _Theme_Holo_DialogReady = true; } return _Theme_Holo_DialogContent; } }
+            private static int _Theme_Holo_DialogContent = default;
+            private static bool _Theme_Holo_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Dialog_MinWidth"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Dialog_MinWidth { get { if (!_Theme_Holo_Dialog_MinWidthReady) { _Theme_Holo_Dialog_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Dialog_MinWidth"); _Theme_Holo_Dialog_MinWidthReady = true; } return _Theme_Holo_Dialog_MinWidthContent; } }
+            private static int _Theme_Holo_Dialog_MinWidthContent = default;
+            private static bool _Theme_Holo_Dialog_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Dialog_NoActionBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Dialog_NoActionBar { get { if (!_Theme_Holo_Dialog_NoActionBarReady) { _Theme_Holo_Dialog_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Dialog_NoActionBar"); _Theme_Holo_Dialog_NoActionBarReady = true; } return _Theme_Holo_Dialog_NoActionBarContent; } }
+            private static int _Theme_Holo_Dialog_NoActionBarContent = default;
+            private static bool _Theme_Holo_Dialog_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Dialog_NoActionBar_MinWidth"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Dialog_NoActionBar_MinWidth { get { if (!_Theme_Holo_Dialog_NoActionBar_MinWidthReady) { _Theme_Holo_Dialog_NoActionBar_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Dialog_NoActionBar_MinWidth"); _Theme_Holo_Dialog_NoActionBar_MinWidthReady = true; } return _Theme_Holo_Dialog_NoActionBar_MinWidthContent; } }
+            private static int _Theme_Holo_Dialog_NoActionBar_MinWidthContent = default;
+            private static bool _Theme_Holo_Dialog_NoActionBar_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_DialogWhenLarge"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_DialogWhenLarge { get { if (!_Theme_Holo_DialogWhenLargeReady) { _Theme_Holo_DialogWhenLargeContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_DialogWhenLarge"); _Theme_Holo_DialogWhenLargeReady = true; } return _Theme_Holo_DialogWhenLargeContent; } }
+            private static int _Theme_Holo_DialogWhenLargeContent = default;
+            private static bool _Theme_Holo_DialogWhenLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_DialogWhenLarge_NoActionBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_DialogWhenLarge_NoActionBar { get { if (!_Theme_Holo_DialogWhenLarge_NoActionBarReady) { _Theme_Holo_DialogWhenLarge_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_DialogWhenLarge_NoActionBar"); _Theme_Holo_DialogWhenLarge_NoActionBarReady = true; } return _Theme_Holo_DialogWhenLarge_NoActionBarContent; } }
+            private static int _Theme_Holo_DialogWhenLarge_NoActionBarContent = default;
+            private static bool _Theme_Holo_DialogWhenLarge_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_InputMethod"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_InputMethod { get { if (!_Theme_Holo_InputMethodReady) { _Theme_Holo_InputMethodContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_InputMethod"); _Theme_Holo_InputMethodReady = true; } return _Theme_Holo_InputMethodContent; } }
+            private static int _Theme_Holo_InputMethodContent = default;
+            private static bool _Theme_Holo_InputMethodReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light { get { if (!_Theme_Holo_LightReady) { _Theme_Holo_LightContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light"); _Theme_Holo_LightReady = true; } return _Theme_Holo_LightContent; } }
+            private static int _Theme_Holo_LightContent = default;
+            private static bool _Theme_Holo_LightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_DarkActionBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_DarkActionBar { get { if (!_Theme_Holo_Light_DarkActionBarReady) { _Theme_Holo_Light_DarkActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_DarkActionBar"); _Theme_Holo_Light_DarkActionBarReady = true; } return _Theme_Holo_Light_DarkActionBarContent; } }
+            private static int _Theme_Holo_Light_DarkActionBarContent = default;
+            private static bool _Theme_Holo_Light_DarkActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_Dialog"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_Dialog { get { if (!_Theme_Holo_Light_DialogReady) { _Theme_Holo_Light_DialogContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_Dialog"); _Theme_Holo_Light_DialogReady = true; } return _Theme_Holo_Light_DialogContent; } }
+            private static int _Theme_Holo_Light_DialogContent = default;
+            private static bool _Theme_Holo_Light_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_Dialog_MinWidth"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_Dialog_MinWidth { get { if (!_Theme_Holo_Light_Dialog_MinWidthReady) { _Theme_Holo_Light_Dialog_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_Dialog_MinWidth"); _Theme_Holo_Light_Dialog_MinWidthReady = true; } return _Theme_Holo_Light_Dialog_MinWidthContent; } }
+            private static int _Theme_Holo_Light_Dialog_MinWidthContent = default;
+            private static bool _Theme_Holo_Light_Dialog_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_Dialog_NoActionBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_Dialog_NoActionBar { get { if (!_Theme_Holo_Light_Dialog_NoActionBarReady) { _Theme_Holo_Light_Dialog_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_Dialog_NoActionBar"); _Theme_Holo_Light_Dialog_NoActionBarReady = true; } return _Theme_Holo_Light_Dialog_NoActionBarContent; } }
+            private static int _Theme_Holo_Light_Dialog_NoActionBarContent = default;
+            private static bool _Theme_Holo_Light_Dialog_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_Dialog_NoActionBar_MinWidth"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_Dialog_NoActionBar_MinWidth { get { if (!_Theme_Holo_Light_Dialog_NoActionBar_MinWidthReady) { _Theme_Holo_Light_Dialog_NoActionBar_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_Dialog_NoActionBar_MinWidth"); _Theme_Holo_Light_Dialog_NoActionBar_MinWidthReady = true; } return _Theme_Holo_Light_Dialog_NoActionBar_MinWidthContent; } }
+            private static int _Theme_Holo_Light_Dialog_NoActionBar_MinWidthContent = default;
+            private static bool _Theme_Holo_Light_Dialog_NoActionBar_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_DialogWhenLarge"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_DialogWhenLarge { get { if (!_Theme_Holo_Light_DialogWhenLargeReady) { _Theme_Holo_Light_DialogWhenLargeContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_DialogWhenLarge"); _Theme_Holo_Light_DialogWhenLargeReady = true; } return _Theme_Holo_Light_DialogWhenLargeContent; } }
+            private static int _Theme_Holo_Light_DialogWhenLargeContent = default;
+            private static bool _Theme_Holo_Light_DialogWhenLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_DialogWhenLarge_NoActionBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_DialogWhenLarge_NoActionBar { get { if (!_Theme_Holo_Light_DialogWhenLarge_NoActionBarReady) { _Theme_Holo_Light_DialogWhenLarge_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_DialogWhenLarge_NoActionBar"); _Theme_Holo_Light_DialogWhenLarge_NoActionBarReady = true; } return _Theme_Holo_Light_DialogWhenLarge_NoActionBarContent; } }
+            private static int _Theme_Holo_Light_DialogWhenLarge_NoActionBarContent = default;
+            private static bool _Theme_Holo_Light_DialogWhenLarge_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_NoActionBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_NoActionBar { get { if (!_Theme_Holo_Light_NoActionBarReady) { _Theme_Holo_Light_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_NoActionBar"); _Theme_Holo_Light_NoActionBarReady = true; } return _Theme_Holo_Light_NoActionBarContent; } }
+            private static int _Theme_Holo_Light_NoActionBarContent = default;
+            private static bool _Theme_Holo_Light_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_NoActionBar_Fullscreen"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_NoActionBar_Fullscreen { get { if (!_Theme_Holo_Light_NoActionBar_FullscreenReady) { _Theme_Holo_Light_NoActionBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_NoActionBar_Fullscreen"); _Theme_Holo_Light_NoActionBar_FullscreenReady = true; } return _Theme_Holo_Light_NoActionBar_FullscreenContent; } }
+            private static int _Theme_Holo_Light_NoActionBar_FullscreenContent = default;
+            private static bool _Theme_Holo_Light_NoActionBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_NoActionBar_Overscan"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_NoActionBar_Overscan { get { if (!_Theme_Holo_Light_NoActionBar_OverscanReady) { _Theme_Holo_Light_NoActionBar_OverscanContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_NoActionBar_Overscan"); _Theme_Holo_Light_NoActionBar_OverscanReady = true; } return _Theme_Holo_Light_NoActionBar_OverscanContent; } }
+            private static int _Theme_Holo_Light_NoActionBar_OverscanContent = default;
+            private static bool _Theme_Holo_Light_NoActionBar_OverscanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_NoActionBar_TranslucentDecor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_NoActionBar_TranslucentDecor { get { if (!_Theme_Holo_Light_NoActionBar_TranslucentDecorReady) { _Theme_Holo_Light_NoActionBar_TranslucentDecorContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_NoActionBar_TranslucentDecor"); _Theme_Holo_Light_NoActionBar_TranslucentDecorReady = true; } return _Theme_Holo_Light_NoActionBar_TranslucentDecorContent; } }
+            private static int _Theme_Holo_Light_NoActionBar_TranslucentDecorContent = default;
+            private static bool _Theme_Holo_Light_NoActionBar_TranslucentDecorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Light_Panel"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Light_Panel { get { if (!_Theme_Holo_Light_PanelReady) { _Theme_Holo_Light_PanelContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Light_Panel"); _Theme_Holo_Light_PanelReady = true; } return _Theme_Holo_Light_PanelContent; } }
+            private static int _Theme_Holo_Light_PanelContent = default;
+            private static bool _Theme_Holo_Light_PanelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_NoActionBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_NoActionBar { get { if (!_Theme_Holo_NoActionBarReady) { _Theme_Holo_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_NoActionBar"); _Theme_Holo_NoActionBarReady = true; } return _Theme_Holo_NoActionBarContent; } }
+            private static int _Theme_Holo_NoActionBarContent = default;
+            private static bool _Theme_Holo_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_NoActionBar_Fullscreen"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_NoActionBar_Fullscreen { get { if (!_Theme_Holo_NoActionBar_FullscreenReady) { _Theme_Holo_NoActionBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_NoActionBar_Fullscreen"); _Theme_Holo_NoActionBar_FullscreenReady = true; } return _Theme_Holo_NoActionBar_FullscreenContent; } }
+            private static int _Theme_Holo_NoActionBar_FullscreenContent = default;
+            private static bool _Theme_Holo_NoActionBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_NoActionBar_Overscan"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_NoActionBar_Overscan { get { if (!_Theme_Holo_NoActionBar_OverscanReady) { _Theme_Holo_NoActionBar_OverscanContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_NoActionBar_Overscan"); _Theme_Holo_NoActionBar_OverscanReady = true; } return _Theme_Holo_NoActionBar_OverscanContent; } }
+            private static int _Theme_Holo_NoActionBar_OverscanContent = default;
+            private static bool _Theme_Holo_NoActionBar_OverscanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_NoActionBar_TranslucentDecor"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_NoActionBar_TranslucentDecor { get { if (!_Theme_Holo_NoActionBar_TranslucentDecorReady) { _Theme_Holo_NoActionBar_TranslucentDecorContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_NoActionBar_TranslucentDecor"); _Theme_Holo_NoActionBar_TranslucentDecorReady = true; } return _Theme_Holo_NoActionBar_TranslucentDecorContent; } }
+            private static int _Theme_Holo_NoActionBar_TranslucentDecorContent = default;
+            private static bool _Theme_Holo_NoActionBar_TranslucentDecorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Panel"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Panel { get { if (!_Theme_Holo_PanelReady) { _Theme_Holo_PanelContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Panel"); _Theme_Holo_PanelReady = true; } return _Theme_Holo_PanelContent; } }
+            private static int _Theme_Holo_PanelContent = default;
+            private static bool _Theme_Holo_PanelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Wallpaper"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Wallpaper { get { if (!_Theme_Holo_WallpaperReady) { _Theme_Holo_WallpaperContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Wallpaper"); _Theme_Holo_WallpaperReady = true; } return _Theme_Holo_WallpaperContent; } }
+            private static int _Theme_Holo_WallpaperContent = default;
+            private static bool _Theme_Holo_WallpaperReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Holo_Wallpaper_NoTitleBar"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Holo_Wallpaper_NoTitleBar { get { if (!_Theme_Holo_Wallpaper_NoTitleBarReady) { _Theme_Holo_Wallpaper_NoTitleBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Holo_Wallpaper_NoTitleBar"); _Theme_Holo_Wallpaper_NoTitleBarReady = true; } return _Theme_Holo_Wallpaper_NoTitleBarContent; } }
+            private static int _Theme_Holo_Wallpaper_NoTitleBarContent = default;
+            private static bool _Theme_Holo_Wallpaper_NoTitleBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_InputMethod"/>
+            /// </summary>
+            public static int Theme_InputMethod { get { if (!_Theme_InputMethodReady) { _Theme_InputMethodContent = SGetField<int>(LocalBridgeClazz, "Theme_InputMethod"); _Theme_InputMethodReady = true; } return _Theme_InputMethodContent; } }
+            private static int _Theme_InputMethodContent = default;
+            private static bool _Theme_InputMethodReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Light"/>
+            /// </summary>
+            public static int Theme_Light { get { if (!_Theme_LightReady) { _Theme_LightContent = SGetField<int>(LocalBridgeClazz, "Theme_Light"); _Theme_LightReady = true; } return _Theme_LightContent; } }
+            private static int _Theme_LightContent = default;
+            private static bool _Theme_LightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Light_NoTitleBar"/>
+            /// </summary>
+            public static int Theme_Light_NoTitleBar { get { if (!_Theme_Light_NoTitleBarReady) { _Theme_Light_NoTitleBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Light_NoTitleBar"); _Theme_Light_NoTitleBarReady = true; } return _Theme_Light_NoTitleBarContent; } }
+            private static int _Theme_Light_NoTitleBarContent = default;
+            private static bool _Theme_Light_NoTitleBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Light_NoTitleBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_Light_NoTitleBar_Fullscreen { get { if (!_Theme_Light_NoTitleBar_FullscreenReady) { _Theme_Light_NoTitleBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_Light_NoTitleBar_Fullscreen"); _Theme_Light_NoTitleBar_FullscreenReady = true; } return _Theme_Light_NoTitleBar_FullscreenContent; } }
+            private static int _Theme_Light_NoTitleBar_FullscreenContent = default;
+            private static bool _Theme_Light_NoTitleBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Light_Panel"/>
+            /// </summary>
+            public static int Theme_Light_Panel { get { if (!_Theme_Light_PanelReady) { _Theme_Light_PanelContent = SGetField<int>(LocalBridgeClazz, "Theme_Light_Panel"); _Theme_Light_PanelReady = true; } return _Theme_Light_PanelContent; } }
+            private static int _Theme_Light_PanelContent = default;
+            private static bool _Theme_Light_PanelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Light_WallpaperSettings"/>
+            /// </summary>
+            public static int Theme_Light_WallpaperSettings { get { if (!_Theme_Light_WallpaperSettingsReady) { _Theme_Light_WallpaperSettingsContent = SGetField<int>(LocalBridgeClazz, "Theme_Light_WallpaperSettings"); _Theme_Light_WallpaperSettingsReady = true; } return _Theme_Light_WallpaperSettingsContent; } }
+            private static int _Theme_Light_WallpaperSettingsContent = default;
+            private static bool _Theme_Light_WallpaperSettingsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material"/>
+            /// </summary>
+            public static int Theme_Material { get { if (!_Theme_MaterialReady) { _Theme_MaterialContent = SGetField<int>(LocalBridgeClazz, "Theme_Material"); _Theme_MaterialReady = true; } return _Theme_MaterialContent; } }
+            private static int _Theme_MaterialContent = default;
+            private static bool _Theme_MaterialReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Dialog"/>
+            /// </summary>
+            public static int Theme_Material_Dialog { get { if (!_Theme_Material_DialogReady) { _Theme_Material_DialogContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Dialog"); _Theme_Material_DialogReady = true; } return _Theme_Material_DialogContent; } }
+            private static int _Theme_Material_DialogContent = default;
+            private static bool _Theme_Material_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Dialog_Alert"/>
+            /// </summary>
+            public static int Theme_Material_Dialog_Alert { get { if (!_Theme_Material_Dialog_AlertReady) { _Theme_Material_Dialog_AlertContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Dialog_Alert"); _Theme_Material_Dialog_AlertReady = true; } return _Theme_Material_Dialog_AlertContent; } }
+            private static int _Theme_Material_Dialog_AlertContent = default;
+            private static bool _Theme_Material_Dialog_AlertReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Dialog_MinWidth"/>
+            /// </summary>
+            public static int Theme_Material_Dialog_MinWidth { get { if (!_Theme_Material_Dialog_MinWidthReady) { _Theme_Material_Dialog_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Dialog_MinWidth"); _Theme_Material_Dialog_MinWidthReady = true; } return _Theme_Material_Dialog_MinWidthContent; } }
+            private static int _Theme_Material_Dialog_MinWidthContent = default;
+            private static bool _Theme_Material_Dialog_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Dialog_NoActionBar"/>
+            /// </summary>
+            public static int Theme_Material_Dialog_NoActionBar { get { if (!_Theme_Material_Dialog_NoActionBarReady) { _Theme_Material_Dialog_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Dialog_NoActionBar"); _Theme_Material_Dialog_NoActionBarReady = true; } return _Theme_Material_Dialog_NoActionBarContent; } }
+            private static int _Theme_Material_Dialog_NoActionBarContent = default;
+            private static bool _Theme_Material_Dialog_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Dialog_NoActionBar_MinWidth"/>
+            /// </summary>
+            public static int Theme_Material_Dialog_NoActionBar_MinWidth { get { if (!_Theme_Material_Dialog_NoActionBar_MinWidthReady) { _Theme_Material_Dialog_NoActionBar_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Dialog_NoActionBar_MinWidth"); _Theme_Material_Dialog_NoActionBar_MinWidthReady = true; } return _Theme_Material_Dialog_NoActionBar_MinWidthContent; } }
+            private static int _Theme_Material_Dialog_NoActionBar_MinWidthContent = default;
+            private static bool _Theme_Material_Dialog_NoActionBar_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Dialog_Presentation"/>
+            /// </summary>
+            public static int Theme_Material_Dialog_Presentation { get { if (!_Theme_Material_Dialog_PresentationReady) { _Theme_Material_Dialog_PresentationContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Dialog_Presentation"); _Theme_Material_Dialog_PresentationReady = true; } return _Theme_Material_Dialog_PresentationContent; } }
+            private static int _Theme_Material_Dialog_PresentationContent = default;
+            private static bool _Theme_Material_Dialog_PresentationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_DialogWhenLarge"/>
+            /// </summary>
+            public static int Theme_Material_DialogWhenLarge { get { if (!_Theme_Material_DialogWhenLargeReady) { _Theme_Material_DialogWhenLargeContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_DialogWhenLarge"); _Theme_Material_DialogWhenLargeReady = true; } return _Theme_Material_DialogWhenLargeContent; } }
+            private static int _Theme_Material_DialogWhenLargeContent = default;
+            private static bool _Theme_Material_DialogWhenLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_DialogWhenLarge_NoActionBar"/>
+            /// </summary>
+            public static int Theme_Material_DialogWhenLarge_NoActionBar { get { if (!_Theme_Material_DialogWhenLarge_NoActionBarReady) { _Theme_Material_DialogWhenLarge_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_DialogWhenLarge_NoActionBar"); _Theme_Material_DialogWhenLarge_NoActionBarReady = true; } return _Theme_Material_DialogWhenLarge_NoActionBarContent; } }
+            private static int _Theme_Material_DialogWhenLarge_NoActionBarContent = default;
+            private static bool _Theme_Material_DialogWhenLarge_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_InputMethod"/>
+            /// </summary>
+            public static int Theme_Material_InputMethod { get { if (!_Theme_Material_InputMethodReady) { _Theme_Material_InputMethodContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_InputMethod"); _Theme_Material_InputMethodReady = true; } return _Theme_Material_InputMethodContent; } }
+            private static int _Theme_Material_InputMethodContent = default;
+            private static bool _Theme_Material_InputMethodReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light"/>
+            /// </summary>
+            public static int Theme_Material_Light { get { if (!_Theme_Material_LightReady) { _Theme_Material_LightContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light"); _Theme_Material_LightReady = true; } return _Theme_Material_LightContent; } }
+            private static int _Theme_Material_LightContent = default;
+            private static bool _Theme_Material_LightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_DarkActionBar"/>
+            /// </summary>
+            public static int Theme_Material_Light_DarkActionBar { get { if (!_Theme_Material_Light_DarkActionBarReady) { _Theme_Material_Light_DarkActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_DarkActionBar"); _Theme_Material_Light_DarkActionBarReady = true; } return _Theme_Material_Light_DarkActionBarContent; } }
+            private static int _Theme_Material_Light_DarkActionBarContent = default;
+            private static bool _Theme_Material_Light_DarkActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_Dialog"/>
+            /// </summary>
+            public static int Theme_Material_Light_Dialog { get { if (!_Theme_Material_Light_DialogReady) { _Theme_Material_Light_DialogContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_Dialog"); _Theme_Material_Light_DialogReady = true; } return _Theme_Material_Light_DialogContent; } }
+            private static int _Theme_Material_Light_DialogContent = default;
+            private static bool _Theme_Material_Light_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_Dialog_Alert"/>
+            /// </summary>
+            public static int Theme_Material_Light_Dialog_Alert { get { if (!_Theme_Material_Light_Dialog_AlertReady) { _Theme_Material_Light_Dialog_AlertContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_Dialog_Alert"); _Theme_Material_Light_Dialog_AlertReady = true; } return _Theme_Material_Light_Dialog_AlertContent; } }
+            private static int _Theme_Material_Light_Dialog_AlertContent = default;
+            private static bool _Theme_Material_Light_Dialog_AlertReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_Dialog_MinWidth"/>
+            /// </summary>
+            public static int Theme_Material_Light_Dialog_MinWidth { get { if (!_Theme_Material_Light_Dialog_MinWidthReady) { _Theme_Material_Light_Dialog_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_Dialog_MinWidth"); _Theme_Material_Light_Dialog_MinWidthReady = true; } return _Theme_Material_Light_Dialog_MinWidthContent; } }
+            private static int _Theme_Material_Light_Dialog_MinWidthContent = default;
+            private static bool _Theme_Material_Light_Dialog_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_Dialog_NoActionBar"/>
+            /// </summary>
+            public static int Theme_Material_Light_Dialog_NoActionBar { get { if (!_Theme_Material_Light_Dialog_NoActionBarReady) { _Theme_Material_Light_Dialog_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_Dialog_NoActionBar"); _Theme_Material_Light_Dialog_NoActionBarReady = true; } return _Theme_Material_Light_Dialog_NoActionBarContent; } }
+            private static int _Theme_Material_Light_Dialog_NoActionBarContent = default;
+            private static bool _Theme_Material_Light_Dialog_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_Dialog_NoActionBar_MinWidth"/>
+            /// </summary>
+            public static int Theme_Material_Light_Dialog_NoActionBar_MinWidth { get { if (!_Theme_Material_Light_Dialog_NoActionBar_MinWidthReady) { _Theme_Material_Light_Dialog_NoActionBar_MinWidthContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_Dialog_NoActionBar_MinWidth"); _Theme_Material_Light_Dialog_NoActionBar_MinWidthReady = true; } return _Theme_Material_Light_Dialog_NoActionBar_MinWidthContent; } }
+            private static int _Theme_Material_Light_Dialog_NoActionBar_MinWidthContent = default;
+            private static bool _Theme_Material_Light_Dialog_NoActionBar_MinWidthReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_Dialog_Presentation"/>
+            /// </summary>
+            public static int Theme_Material_Light_Dialog_Presentation { get { if (!_Theme_Material_Light_Dialog_PresentationReady) { _Theme_Material_Light_Dialog_PresentationContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_Dialog_Presentation"); _Theme_Material_Light_Dialog_PresentationReady = true; } return _Theme_Material_Light_Dialog_PresentationContent; } }
+            private static int _Theme_Material_Light_Dialog_PresentationContent = default;
+            private static bool _Theme_Material_Light_Dialog_PresentationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_DialogWhenLarge"/>
+            /// </summary>
+            public static int Theme_Material_Light_DialogWhenLarge { get { if (!_Theme_Material_Light_DialogWhenLargeReady) { _Theme_Material_Light_DialogWhenLargeContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_DialogWhenLarge"); _Theme_Material_Light_DialogWhenLargeReady = true; } return _Theme_Material_Light_DialogWhenLargeContent; } }
+            private static int _Theme_Material_Light_DialogWhenLargeContent = default;
+            private static bool _Theme_Material_Light_DialogWhenLargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_DialogWhenLarge_DarkActionBar"/>
+            /// </summary>
+            public static int Theme_Material_Light_DialogWhenLarge_DarkActionBar { get { if (!_Theme_Material_Light_DialogWhenLarge_DarkActionBarReady) { _Theme_Material_Light_DialogWhenLarge_DarkActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_DialogWhenLarge_DarkActionBar"); _Theme_Material_Light_DialogWhenLarge_DarkActionBarReady = true; } return _Theme_Material_Light_DialogWhenLarge_DarkActionBarContent; } }
+            private static int _Theme_Material_Light_DialogWhenLarge_DarkActionBarContent = default;
+            private static bool _Theme_Material_Light_DialogWhenLarge_DarkActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_DialogWhenLarge_NoActionBar"/>
+            /// </summary>
+            public static int Theme_Material_Light_DialogWhenLarge_NoActionBar { get { if (!_Theme_Material_Light_DialogWhenLarge_NoActionBarReady) { _Theme_Material_Light_DialogWhenLarge_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_DialogWhenLarge_NoActionBar"); _Theme_Material_Light_DialogWhenLarge_NoActionBarReady = true; } return _Theme_Material_Light_DialogWhenLarge_NoActionBarContent; } }
+            private static int _Theme_Material_Light_DialogWhenLarge_NoActionBarContent = default;
+            private static bool _Theme_Material_Light_DialogWhenLarge_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_LightStatusBar"/>
+            /// </summary>
+            public static int Theme_Material_Light_LightStatusBar { get { if (!_Theme_Material_Light_LightStatusBarReady) { _Theme_Material_Light_LightStatusBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_LightStatusBar"); _Theme_Material_Light_LightStatusBarReady = true; } return _Theme_Material_Light_LightStatusBarContent; } }
+            private static int _Theme_Material_Light_LightStatusBarContent = default;
+            private static bool _Theme_Material_Light_LightStatusBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_NoActionBar"/>
+            /// </summary>
+            public static int Theme_Material_Light_NoActionBar { get { if (!_Theme_Material_Light_NoActionBarReady) { _Theme_Material_Light_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_NoActionBar"); _Theme_Material_Light_NoActionBarReady = true; } return _Theme_Material_Light_NoActionBarContent; } }
+            private static int _Theme_Material_Light_NoActionBarContent = default;
+            private static bool _Theme_Material_Light_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_NoActionBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_Material_Light_NoActionBar_Fullscreen { get { if (!_Theme_Material_Light_NoActionBar_FullscreenReady) { _Theme_Material_Light_NoActionBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_NoActionBar_Fullscreen"); _Theme_Material_Light_NoActionBar_FullscreenReady = true; } return _Theme_Material_Light_NoActionBar_FullscreenContent; } }
+            private static int _Theme_Material_Light_NoActionBar_FullscreenContent = default;
+            private static bool _Theme_Material_Light_NoActionBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_NoActionBar_Overscan"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Material_Light_NoActionBar_Overscan { get { if (!_Theme_Material_Light_NoActionBar_OverscanReady) { _Theme_Material_Light_NoActionBar_OverscanContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_NoActionBar_Overscan"); _Theme_Material_Light_NoActionBar_OverscanReady = true; } return _Theme_Material_Light_NoActionBar_OverscanContent; } }
+            private static int _Theme_Material_Light_NoActionBar_OverscanContent = default;
+            private static bool _Theme_Material_Light_NoActionBar_OverscanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_NoActionBar_TranslucentDecor"/>
+            /// </summary>
+            public static int Theme_Material_Light_NoActionBar_TranslucentDecor { get { if (!_Theme_Material_Light_NoActionBar_TranslucentDecorReady) { _Theme_Material_Light_NoActionBar_TranslucentDecorContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_NoActionBar_TranslucentDecor"); _Theme_Material_Light_NoActionBar_TranslucentDecorReady = true; } return _Theme_Material_Light_NoActionBar_TranslucentDecorContent; } }
+            private static int _Theme_Material_Light_NoActionBar_TranslucentDecorContent = default;
+            private static bool _Theme_Material_Light_NoActionBar_TranslucentDecorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_Panel"/>
+            /// </summary>
+            public static int Theme_Material_Light_Panel { get { if (!_Theme_Material_Light_PanelReady) { _Theme_Material_Light_PanelContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_Panel"); _Theme_Material_Light_PanelReady = true; } return _Theme_Material_Light_PanelContent; } }
+            private static int _Theme_Material_Light_PanelContent = default;
+            private static bool _Theme_Material_Light_PanelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Light_Voice"/>
+            /// </summary>
+            public static int Theme_Material_Light_Voice { get { if (!_Theme_Material_Light_VoiceReady) { _Theme_Material_Light_VoiceContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Light_Voice"); _Theme_Material_Light_VoiceReady = true; } return _Theme_Material_Light_VoiceContent; } }
+            private static int _Theme_Material_Light_VoiceContent = default;
+            private static bool _Theme_Material_Light_VoiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_NoActionBar"/>
+            /// </summary>
+            public static int Theme_Material_NoActionBar { get { if (!_Theme_Material_NoActionBarReady) { _Theme_Material_NoActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_NoActionBar"); _Theme_Material_NoActionBarReady = true; } return _Theme_Material_NoActionBarContent; } }
+            private static int _Theme_Material_NoActionBarContent = default;
+            private static bool _Theme_Material_NoActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_NoActionBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_Material_NoActionBar_Fullscreen { get { if (!_Theme_Material_NoActionBar_FullscreenReady) { _Theme_Material_NoActionBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_NoActionBar_Fullscreen"); _Theme_Material_NoActionBar_FullscreenReady = true; } return _Theme_Material_NoActionBar_FullscreenContent; } }
+            private static int _Theme_Material_NoActionBar_FullscreenContent = default;
+            private static bool _Theme_Material_NoActionBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_NoActionBar_Overscan"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Theme_Material_NoActionBar_Overscan { get { if (!_Theme_Material_NoActionBar_OverscanReady) { _Theme_Material_NoActionBar_OverscanContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_NoActionBar_Overscan"); _Theme_Material_NoActionBar_OverscanReady = true; } return _Theme_Material_NoActionBar_OverscanContent; } }
+            private static int _Theme_Material_NoActionBar_OverscanContent = default;
+            private static bool _Theme_Material_NoActionBar_OverscanReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_NoActionBar_TranslucentDecor"/>
+            /// </summary>
+            public static int Theme_Material_NoActionBar_TranslucentDecor { get { if (!_Theme_Material_NoActionBar_TranslucentDecorReady) { _Theme_Material_NoActionBar_TranslucentDecorContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_NoActionBar_TranslucentDecor"); _Theme_Material_NoActionBar_TranslucentDecorReady = true; } return _Theme_Material_NoActionBar_TranslucentDecorContent; } }
+            private static int _Theme_Material_NoActionBar_TranslucentDecorContent = default;
+            private static bool _Theme_Material_NoActionBar_TranslucentDecorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Panel"/>
+            /// </summary>
+            public static int Theme_Material_Panel { get { if (!_Theme_Material_PanelReady) { _Theme_Material_PanelContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Panel"); _Theme_Material_PanelReady = true; } return _Theme_Material_PanelContent; } }
+            private static int _Theme_Material_PanelContent = default;
+            private static bool _Theme_Material_PanelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Settings"/>
+            /// </summary>
+            public static int Theme_Material_Settings { get { if (!_Theme_Material_SettingsReady) { _Theme_Material_SettingsContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Settings"); _Theme_Material_SettingsReady = true; } return _Theme_Material_SettingsContent; } }
+            private static int _Theme_Material_SettingsContent = default;
+            private static bool _Theme_Material_SettingsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Voice"/>
+            /// </summary>
+            public static int Theme_Material_Voice { get { if (!_Theme_Material_VoiceReady) { _Theme_Material_VoiceContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Voice"); _Theme_Material_VoiceReady = true; } return _Theme_Material_VoiceContent; } }
+            private static int _Theme_Material_VoiceContent = default;
+            private static bool _Theme_Material_VoiceReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Wallpaper"/>
+            /// </summary>
+            public static int Theme_Material_Wallpaper { get { if (!_Theme_Material_WallpaperReady) { _Theme_Material_WallpaperContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Wallpaper"); _Theme_Material_WallpaperReady = true; } return _Theme_Material_WallpaperContent; } }
+            private static int _Theme_Material_WallpaperContent = default;
+            private static bool _Theme_Material_WallpaperReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Material_Wallpaper_NoTitleBar"/>
+            /// </summary>
+            public static int Theme_Material_Wallpaper_NoTitleBar { get { if (!_Theme_Material_Wallpaper_NoTitleBarReady) { _Theme_Material_Wallpaper_NoTitleBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Material_Wallpaper_NoTitleBar"); _Theme_Material_Wallpaper_NoTitleBarReady = true; } return _Theme_Material_Wallpaper_NoTitleBarContent; } }
+            private static int _Theme_Material_Wallpaper_NoTitleBarContent = default;
+            private static bool _Theme_Material_Wallpaper_NoTitleBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_NoDisplay"/>
+            /// </summary>
+            public static int Theme_NoDisplay { get { if (!_Theme_NoDisplayReady) { _Theme_NoDisplayContent = SGetField<int>(LocalBridgeClazz, "Theme_NoDisplay"); _Theme_NoDisplayReady = true; } return _Theme_NoDisplayContent; } }
+            private static int _Theme_NoDisplayContent = default;
+            private static bool _Theme_NoDisplayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_NoTitleBar"/>
+            /// </summary>
+            public static int Theme_NoTitleBar { get { if (!_Theme_NoTitleBarReady) { _Theme_NoTitleBarContent = SGetField<int>(LocalBridgeClazz, "Theme_NoTitleBar"); _Theme_NoTitleBarReady = true; } return _Theme_NoTitleBarContent; } }
+            private static int _Theme_NoTitleBarContent = default;
+            private static bool _Theme_NoTitleBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_NoTitleBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_NoTitleBar_Fullscreen { get { if (!_Theme_NoTitleBar_FullscreenReady) { _Theme_NoTitleBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_NoTitleBar_Fullscreen"); _Theme_NoTitleBar_FullscreenReady = true; } return _Theme_NoTitleBar_FullscreenContent; } }
+            private static int _Theme_NoTitleBar_FullscreenContent = default;
+            private static bool _Theme_NoTitleBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_NoTitleBar_OverlayActionModes"/>
+            /// </summary>
+            public static int Theme_NoTitleBar_OverlayActionModes { get { if (!_Theme_NoTitleBar_OverlayActionModesReady) { _Theme_NoTitleBar_OverlayActionModesContent = SGetField<int>(LocalBridgeClazz, "Theme_NoTitleBar_OverlayActionModes"); _Theme_NoTitleBar_OverlayActionModesReady = true; } return _Theme_NoTitleBar_OverlayActionModesContent; } }
+            private static int _Theme_NoTitleBar_OverlayActionModesContent = default;
+            private static bool _Theme_NoTitleBar_OverlayActionModesReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Panel"/>
+            /// </summary>
+            public static int Theme_Panel { get { if (!_Theme_PanelReady) { _Theme_PanelContent = SGetField<int>(LocalBridgeClazz, "Theme_Panel"); _Theme_PanelReady = true; } return _Theme_PanelContent; } }
+            private static int _Theme_PanelContent = default;
+            private static bool _Theme_PanelReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Translucent"/>
+            /// </summary>
+            public static int Theme_Translucent { get { if (!_Theme_TranslucentReady) { _Theme_TranslucentContent = SGetField<int>(LocalBridgeClazz, "Theme_Translucent"); _Theme_TranslucentReady = true; } return _Theme_TranslucentContent; } }
+            private static int _Theme_TranslucentContent = default;
+            private static bool _Theme_TranslucentReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Translucent_NoTitleBar"/>
+            /// </summary>
+            public static int Theme_Translucent_NoTitleBar { get { if (!_Theme_Translucent_NoTitleBarReady) { _Theme_Translucent_NoTitleBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Translucent_NoTitleBar"); _Theme_Translucent_NoTitleBarReady = true; } return _Theme_Translucent_NoTitleBarContent; } }
+            private static int _Theme_Translucent_NoTitleBarContent = default;
+            private static bool _Theme_Translucent_NoTitleBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Translucent_NoTitleBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_Translucent_NoTitleBar_Fullscreen { get { if (!_Theme_Translucent_NoTitleBar_FullscreenReady) { _Theme_Translucent_NoTitleBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_Translucent_NoTitleBar_Fullscreen"); _Theme_Translucent_NoTitleBar_FullscreenReady = true; } return _Theme_Translucent_NoTitleBar_FullscreenContent; } }
+            private static int _Theme_Translucent_NoTitleBar_FullscreenContent = default;
+            private static bool _Theme_Translucent_NoTitleBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Wallpaper"/>
+            /// </summary>
+            public static int Theme_Wallpaper { get { if (!_Theme_WallpaperReady) { _Theme_WallpaperContent = SGetField<int>(LocalBridgeClazz, "Theme_Wallpaper"); _Theme_WallpaperReady = true; } return _Theme_WallpaperContent; } }
+            private static int _Theme_WallpaperContent = default;
+            private static bool _Theme_WallpaperReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Wallpaper_NoTitleBar"/>
+            /// </summary>
+            public static int Theme_Wallpaper_NoTitleBar { get { if (!_Theme_Wallpaper_NoTitleBarReady) { _Theme_Wallpaper_NoTitleBarContent = SGetField<int>(LocalBridgeClazz, "Theme_Wallpaper_NoTitleBar"); _Theme_Wallpaper_NoTitleBarReady = true; } return _Theme_Wallpaper_NoTitleBarContent; } }
+            private static int _Theme_Wallpaper_NoTitleBarContent = default;
+            private static bool _Theme_Wallpaper_NoTitleBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_Wallpaper_NoTitleBar_Fullscreen"/>
+            /// </summary>
+            public static int Theme_Wallpaper_NoTitleBar_Fullscreen { get { if (!_Theme_Wallpaper_NoTitleBar_FullscreenReady) { _Theme_Wallpaper_NoTitleBar_FullscreenContent = SGetField<int>(LocalBridgeClazz, "Theme_Wallpaper_NoTitleBar_Fullscreen"); _Theme_Wallpaper_NoTitleBar_FullscreenReady = true; } return _Theme_Wallpaper_NoTitleBar_FullscreenContent; } }
+            private static int _Theme_Wallpaper_NoTitleBar_FullscreenContent = default;
+            private static bool _Theme_Wallpaper_NoTitleBar_FullscreenReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_WallpaperSettings"/>
+            /// </summary>
+            public static int Theme_WallpaperSettings { get { if (!_Theme_WallpaperSettingsReady) { _Theme_WallpaperSettingsContent = SGetField<int>(LocalBridgeClazz, "Theme_WallpaperSettings"); _Theme_WallpaperSettingsReady = true; } return _Theme_WallpaperSettingsContent; } }
+            private static int _Theme_WallpaperSettingsContent = default;
+            private static bool _Theme_WallpaperSettingsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Theme_WithActionBar"/>
+            /// </summary>
+            public static int Theme_WithActionBar { get { if (!_Theme_WithActionBarReady) { _Theme_WithActionBarContent = SGetField<int>(LocalBridgeClazz, "Theme_WithActionBar"); _Theme_WithActionBarReady = true; } return _Theme_WithActionBarContent; } }
+            private static int _Theme_WithActionBarContent = default;
+            private static bool _Theme_WithActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay"/>
+            /// </summary>
+            public static int ThemeOverlay { get { if (!_ThemeOverlayReady) { _ThemeOverlayContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay"); _ThemeOverlayReady = true; } return _ThemeOverlayContent; } }
+            private static int _ThemeOverlayContent = default;
+            private static bool _ThemeOverlayReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay_DeviceDefault_Accent_DayNight"/>
+            /// </summary>
+            public static int ThemeOverlay_DeviceDefault_Accent_DayNight { get { if (!_ThemeOverlay_DeviceDefault_Accent_DayNightReady) { _ThemeOverlay_DeviceDefault_Accent_DayNightContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay_DeviceDefault_Accent_DayNight"); _ThemeOverlay_DeviceDefault_Accent_DayNightReady = true; } return _ThemeOverlay_DeviceDefault_Accent_DayNightContent; } }
+            private static int _ThemeOverlay_DeviceDefault_Accent_DayNightContent = default;
+            private static bool _ThemeOverlay_DeviceDefault_Accent_DayNightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay_Material"/>
+            /// </summary>
+            public static int ThemeOverlay_Material { get { if (!_ThemeOverlay_MaterialReady) { _ThemeOverlay_MaterialContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay_Material"); _ThemeOverlay_MaterialReady = true; } return _ThemeOverlay_MaterialContent; } }
+            private static int _ThemeOverlay_MaterialContent = default;
+            private static bool _ThemeOverlay_MaterialReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay_Material_ActionBar"/>
+            /// </summary>
+            public static int ThemeOverlay_Material_ActionBar { get { if (!_ThemeOverlay_Material_ActionBarReady) { _ThemeOverlay_Material_ActionBarContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay_Material_ActionBar"); _ThemeOverlay_Material_ActionBarReady = true; } return _ThemeOverlay_Material_ActionBarContent; } }
+            private static int _ThemeOverlay_Material_ActionBarContent = default;
+            private static bool _ThemeOverlay_Material_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay_Material_Dark"/>
+            /// </summary>
+            public static int ThemeOverlay_Material_Dark { get { if (!_ThemeOverlay_Material_DarkReady) { _ThemeOverlay_Material_DarkContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay_Material_Dark"); _ThemeOverlay_Material_DarkReady = true; } return _ThemeOverlay_Material_DarkContent; } }
+            private static int _ThemeOverlay_Material_DarkContent = default;
+            private static bool _ThemeOverlay_Material_DarkReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay_Material_Dark_ActionBar"/>
+            /// </summary>
+            public static int ThemeOverlay_Material_Dark_ActionBar { get { if (!_ThemeOverlay_Material_Dark_ActionBarReady) { _ThemeOverlay_Material_Dark_ActionBarContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay_Material_Dark_ActionBar"); _ThemeOverlay_Material_Dark_ActionBarReady = true; } return _ThemeOverlay_Material_Dark_ActionBarContent; } }
+            private static int _ThemeOverlay_Material_Dark_ActionBarContent = default;
+            private static bool _ThemeOverlay_Material_Dark_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay_Material_Dialog"/>
+            /// </summary>
+            public static int ThemeOverlay_Material_Dialog { get { if (!_ThemeOverlay_Material_DialogReady) { _ThemeOverlay_Material_DialogContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay_Material_Dialog"); _ThemeOverlay_Material_DialogReady = true; } return _ThemeOverlay_Material_DialogContent; } }
+            private static int _ThemeOverlay_Material_DialogContent = default;
+            private static bool _ThemeOverlay_Material_DialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay_Material_Dialog_Alert"/>
+            /// </summary>
+            public static int ThemeOverlay_Material_Dialog_Alert { get { if (!_ThemeOverlay_Material_Dialog_AlertReady) { _ThemeOverlay_Material_Dialog_AlertContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay_Material_Dialog_Alert"); _ThemeOverlay_Material_Dialog_AlertReady = true; } return _ThemeOverlay_Material_Dialog_AlertContent; } }
+            private static int _ThemeOverlay_Material_Dialog_AlertContent = default;
+            private static bool _ThemeOverlay_Material_Dialog_AlertReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#ThemeOverlay_Material_Light"/>
+            /// </summary>
+            public static int ThemeOverlay_Material_Light { get { if (!_ThemeOverlay_Material_LightReady) { _ThemeOverlay_Material_LightContent = SGetField<int>(LocalBridgeClazz, "ThemeOverlay_Material_Light"); _ThemeOverlay_Material_LightReady = true; } return _ThemeOverlay_Material_LightContent; } }
+            private static int _ThemeOverlay_Material_LightContent = default;
+            private static bool _ThemeOverlay_Material_LightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget"/>
+            /// </summary>
+            public static int Widget { get { if (!_WidgetReady) { _WidgetContent = SGetField<int>(LocalBridgeClazz, "Widget"); _WidgetReady = true; } return _WidgetContent; } }
+            private static int _WidgetContent = default;
+            private static bool _WidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_AbsListView"/>
+            /// </summary>
+            public static int Widget_AbsListView { get { if (!_Widget_AbsListViewReady) { _Widget_AbsListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_AbsListView"); _Widget_AbsListViewReady = true; } return _Widget_AbsListViewContent; } }
+            private static int _Widget_AbsListViewContent = default;
+            private static bool _Widget_AbsListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ActionBar"/>
+            /// </summary>
+            public static int Widget_ActionBar { get { if (!_Widget_ActionBarReady) { _Widget_ActionBarContent = SGetField<int>(LocalBridgeClazz, "Widget_ActionBar"); _Widget_ActionBarReady = true; } return _Widget_ActionBarContent; } }
+            private static int _Widget_ActionBarContent = default;
+            private static bool _Widget_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ActionBar_TabBar"/>
+            /// </summary>
+            public static int Widget_ActionBar_TabBar { get { if (!_Widget_ActionBar_TabBarReady) { _Widget_ActionBar_TabBarContent = SGetField<int>(LocalBridgeClazz, "Widget_ActionBar_TabBar"); _Widget_ActionBar_TabBarReady = true; } return _Widget_ActionBar_TabBarContent; } }
+            private static int _Widget_ActionBar_TabBarContent = default;
+            private static bool _Widget_ActionBar_TabBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ActionBar_TabText"/>
+            /// </summary>
+            public static int Widget_ActionBar_TabText { get { if (!_Widget_ActionBar_TabTextReady) { _Widget_ActionBar_TabTextContent = SGetField<int>(LocalBridgeClazz, "Widget_ActionBar_TabText"); _Widget_ActionBar_TabTextReady = true; } return _Widget_ActionBar_TabTextContent; } }
+            private static int _Widget_ActionBar_TabTextContent = default;
+            private static bool _Widget_ActionBar_TabTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ActionBar_TabView"/>
+            /// </summary>
+            public static int Widget_ActionBar_TabView { get { if (!_Widget_ActionBar_TabViewReady) { _Widget_ActionBar_TabViewContent = SGetField<int>(LocalBridgeClazz, "Widget_ActionBar_TabView"); _Widget_ActionBar_TabViewReady = true; } return _Widget_ActionBar_TabViewContent; } }
+            private static int _Widget_ActionBar_TabViewContent = default;
+            private static bool _Widget_ActionBar_TabViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ActionButton"/>
+            /// </summary>
+            public static int Widget_ActionButton { get { if (!_Widget_ActionButtonReady) { _Widget_ActionButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_ActionButton"); _Widget_ActionButtonReady = true; } return _Widget_ActionButtonContent; } }
+            private static int _Widget_ActionButtonContent = default;
+            private static bool _Widget_ActionButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ActionButton_CloseMode"/>
+            /// </summary>
+            public static int Widget_ActionButton_CloseMode { get { if (!_Widget_ActionButton_CloseModeReady) { _Widget_ActionButton_CloseModeContent = SGetField<int>(LocalBridgeClazz, "Widget_ActionButton_CloseMode"); _Widget_ActionButton_CloseModeReady = true; } return _Widget_ActionButton_CloseModeContent; } }
+            private static int _Widget_ActionButton_CloseModeContent = default;
+            private static bool _Widget_ActionButton_CloseModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ActionButton_Overflow"/>
+            /// </summary>
+            public static int Widget_ActionButton_Overflow { get { if (!_Widget_ActionButton_OverflowReady) { _Widget_ActionButton_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_ActionButton_Overflow"); _Widget_ActionButton_OverflowReady = true; } return _Widget_ActionButton_OverflowContent; } }
+            private static int _Widget_ActionButton_OverflowContent = default;
+            private static bool _Widget_ActionButton_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_AutoCompleteTextView"/>
+            /// </summary>
+            public static int Widget_AutoCompleteTextView { get { if (!_Widget_AutoCompleteTextViewReady) { _Widget_AutoCompleteTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_AutoCompleteTextView"); _Widget_AutoCompleteTextViewReady = true; } return _Widget_AutoCompleteTextViewContent; } }
+            private static int _Widget_AutoCompleteTextViewContent = default;
+            private static bool _Widget_AutoCompleteTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Button"/>
+            /// </summary>
+            public static int Widget_Button { get { if (!_Widget_ButtonReady) { _Widget_ButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Button"); _Widget_ButtonReady = true; } return _Widget_ButtonContent; } }
+            private static int _Widget_ButtonContent = default;
+            private static bool _Widget_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Button_Inset"/>
+            /// </summary>
+            public static int Widget_Button_Inset { get { if (!_Widget_Button_InsetReady) { _Widget_Button_InsetContent = SGetField<int>(LocalBridgeClazz, "Widget_Button_Inset"); _Widget_Button_InsetReady = true; } return _Widget_Button_InsetContent; } }
+            private static int _Widget_Button_InsetContent = default;
+            private static bool _Widget_Button_InsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Button_Small"/>
+            /// </summary>
+            public static int Widget_Button_Small { get { if (!_Widget_Button_SmallReady) { _Widget_Button_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Button_Small"); _Widget_Button_SmallReady = true; } return _Widget_Button_SmallContent; } }
+            private static int _Widget_Button_SmallContent = default;
+            private static bool _Widget_Button_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Button_Toggle"/>
+            /// </summary>
+            public static int Widget_Button_Toggle { get { if (!_Widget_Button_ToggleReady) { _Widget_Button_ToggleContent = SGetField<int>(LocalBridgeClazz, "Widget_Button_Toggle"); _Widget_Button_ToggleReady = true; } return _Widget_Button_ToggleContent; } }
+            private static int _Widget_Button_ToggleContent = default;
+            private static bool _Widget_Button_ToggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_CalendarView"/>
+            /// </summary>
+            public static int Widget_CalendarView { get { if (!_Widget_CalendarViewReady) { _Widget_CalendarViewContent = SGetField<int>(LocalBridgeClazz, "Widget_CalendarView"); _Widget_CalendarViewReady = true; } return _Widget_CalendarViewContent; } }
+            private static int _Widget_CalendarViewContent = default;
+            private static bool _Widget_CalendarViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_CompoundButton"/>
+            /// </summary>
+            public static int Widget_CompoundButton { get { if (!_Widget_CompoundButtonReady) { _Widget_CompoundButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_CompoundButton"); _Widget_CompoundButtonReady = true; } return _Widget_CompoundButtonContent; } }
+            private static int _Widget_CompoundButtonContent = default;
+            private static bool _Widget_CompoundButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_CompoundButton_CheckBox"/>
+            /// </summary>
+            public static int Widget_CompoundButton_CheckBox { get { if (!_Widget_CompoundButton_CheckBoxReady) { _Widget_CompoundButton_CheckBoxContent = SGetField<int>(LocalBridgeClazz, "Widget_CompoundButton_CheckBox"); _Widget_CompoundButton_CheckBoxReady = true; } return _Widget_CompoundButton_CheckBoxContent; } }
+            private static int _Widget_CompoundButton_CheckBoxContent = default;
+            private static bool _Widget_CompoundButton_CheckBoxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_CompoundButton_RadioButton"/>
+            /// </summary>
+            public static int Widget_CompoundButton_RadioButton { get { if (!_Widget_CompoundButton_RadioButtonReady) { _Widget_CompoundButton_RadioButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_CompoundButton_RadioButton"); _Widget_CompoundButton_RadioButtonReady = true; } return _Widget_CompoundButton_RadioButtonContent; } }
+            private static int _Widget_CompoundButton_RadioButtonContent = default;
+            private static bool _Widget_CompoundButton_RadioButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_CompoundButton_Star"/>
+            /// </summary>
+            public static int Widget_CompoundButton_Star { get { if (!_Widget_CompoundButton_StarReady) { _Widget_CompoundButton_StarContent = SGetField<int>(LocalBridgeClazz, "Widget_CompoundButton_Star"); _Widget_CompoundButton_StarReady = true; } return _Widget_CompoundButton_StarContent; } }
+            private static int _Widget_CompoundButton_StarContent = default;
+            private static bool _Widget_CompoundButton_StarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DatePicker"/>
+            /// </summary>
+            public static int Widget_DatePicker { get { if (!_Widget_DatePickerReady) { _Widget_DatePickerContent = SGetField<int>(LocalBridgeClazz, "Widget_DatePicker"); _Widget_DatePickerReady = true; } return _Widget_DatePickerContent; } }
+            private static int _Widget_DatePickerContent = default;
+            private static bool _Widget_DatePickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault"/>
+            /// </summary>
+            public static int Widget_DeviceDefault { get { if (!_Widget_DeviceDefaultReady) { _Widget_DeviceDefaultContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault"); _Widget_DeviceDefaultReady = true; } return _Widget_DeviceDefaultContent; } }
+            private static int _Widget_DeviceDefaultContent = default;
+            private static bool _Widget_DeviceDefaultReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionBar { get { if (!_Widget_DeviceDefault_ActionBarReady) { _Widget_DeviceDefault_ActionBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionBar"); _Widget_DeviceDefault_ActionBarReady = true; } return _Widget_DeviceDefault_ActionBarContent; } }
+            private static int _Widget_DeviceDefault_ActionBarContent = default;
+            private static bool _Widget_DeviceDefault_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionBar_Solid"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionBar_Solid { get { if (!_Widget_DeviceDefault_ActionBar_SolidReady) { _Widget_DeviceDefault_ActionBar_SolidContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionBar_Solid"); _Widget_DeviceDefault_ActionBar_SolidReady = true; } return _Widget_DeviceDefault_ActionBar_SolidContent; } }
+            private static int _Widget_DeviceDefault_ActionBar_SolidContent = default;
+            private static bool _Widget_DeviceDefault_ActionBar_SolidReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionBar_TabBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionBar_TabBar { get { if (!_Widget_DeviceDefault_ActionBar_TabBarReady) { _Widget_DeviceDefault_ActionBar_TabBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionBar_TabBar"); _Widget_DeviceDefault_ActionBar_TabBarReady = true; } return _Widget_DeviceDefault_ActionBar_TabBarContent; } }
+            private static int _Widget_DeviceDefault_ActionBar_TabBarContent = default;
+            private static bool _Widget_DeviceDefault_ActionBar_TabBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionBar_TabText"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionBar_TabText { get { if (!_Widget_DeviceDefault_ActionBar_TabTextReady) { _Widget_DeviceDefault_ActionBar_TabTextContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionBar_TabText"); _Widget_DeviceDefault_ActionBar_TabTextReady = true; } return _Widget_DeviceDefault_ActionBar_TabTextContent; } }
+            private static int _Widget_DeviceDefault_ActionBar_TabTextContent = default;
+            private static bool _Widget_DeviceDefault_ActionBar_TabTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionBar_TabView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionBar_TabView { get { if (!_Widget_DeviceDefault_ActionBar_TabViewReady) { _Widget_DeviceDefault_ActionBar_TabViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionBar_TabView"); _Widget_DeviceDefault_ActionBar_TabViewReady = true; } return _Widget_DeviceDefault_ActionBar_TabViewContent; } }
+            private static int _Widget_DeviceDefault_ActionBar_TabViewContent = default;
+            private static bool _Widget_DeviceDefault_ActionBar_TabViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionButton { get { if (!_Widget_DeviceDefault_ActionButtonReady) { _Widget_DeviceDefault_ActionButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionButton"); _Widget_DeviceDefault_ActionButtonReady = true; } return _Widget_DeviceDefault_ActionButtonContent; } }
+            private static int _Widget_DeviceDefault_ActionButtonContent = default;
+            private static bool _Widget_DeviceDefault_ActionButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionButton_CloseMode"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionButton_CloseMode { get { if (!_Widget_DeviceDefault_ActionButton_CloseModeReady) { _Widget_DeviceDefault_ActionButton_CloseModeContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionButton_CloseMode"); _Widget_DeviceDefault_ActionButton_CloseModeReady = true; } return _Widget_DeviceDefault_ActionButton_CloseModeContent; } }
+            private static int _Widget_DeviceDefault_ActionButton_CloseModeContent = default;
+            private static bool _Widget_DeviceDefault_ActionButton_CloseModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionButton_Overflow"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionButton_Overflow { get { if (!_Widget_DeviceDefault_ActionButton_OverflowReady) { _Widget_DeviceDefault_ActionButton_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionButton_Overflow"); _Widget_DeviceDefault_ActionButton_OverflowReady = true; } return _Widget_DeviceDefault_ActionButton_OverflowContent; } }
+            private static int _Widget_DeviceDefault_ActionButton_OverflowContent = default;
+            private static bool _Widget_DeviceDefault_ActionButton_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionButton_TextButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionButton_TextButton { get { if (!_Widget_DeviceDefault_ActionButton_TextButtonReady) { _Widget_DeviceDefault_ActionButton_TextButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionButton_TextButton"); _Widget_DeviceDefault_ActionButton_TextButtonReady = true; } return _Widget_DeviceDefault_ActionButton_TextButtonContent; } }
+            private static int _Widget_DeviceDefault_ActionButton_TextButtonContent = default;
+            private static bool _Widget_DeviceDefault_ActionButton_TextButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ActionMode"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ActionMode { get { if (!_Widget_DeviceDefault_ActionModeReady) { _Widget_DeviceDefault_ActionModeContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ActionMode"); _Widget_DeviceDefault_ActionModeReady = true; } return _Widget_DeviceDefault_ActionModeContent; } }
+            private static int _Widget_DeviceDefault_ActionModeContent = default;
+            private static bool _Widget_DeviceDefault_ActionModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_AutoCompleteTextView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_AutoCompleteTextView { get { if (!_Widget_DeviceDefault_AutoCompleteTextViewReady) { _Widget_DeviceDefault_AutoCompleteTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_AutoCompleteTextView"); _Widget_DeviceDefault_AutoCompleteTextViewReady = true; } return _Widget_DeviceDefault_AutoCompleteTextViewContent; } }
+            private static int _Widget_DeviceDefault_AutoCompleteTextViewContent = default;
+            private static bool _Widget_DeviceDefault_AutoCompleteTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Button"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Button { get { if (!_Widget_DeviceDefault_ButtonReady) { _Widget_DeviceDefault_ButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Button"); _Widget_DeviceDefault_ButtonReady = true; } return _Widget_DeviceDefault_ButtonContent; } }
+            private static int _Widget_DeviceDefault_ButtonContent = default;
+            private static bool _Widget_DeviceDefault_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Button_Borderless"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Button_Borderless { get { if (!_Widget_DeviceDefault_Button_BorderlessReady) { _Widget_DeviceDefault_Button_BorderlessContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Button_Borderless"); _Widget_DeviceDefault_Button_BorderlessReady = true; } return _Widget_DeviceDefault_Button_BorderlessContent; } }
+            private static int _Widget_DeviceDefault_Button_BorderlessContent = default;
+            private static bool _Widget_DeviceDefault_Button_BorderlessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Button_Borderless_Colored"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Button_Borderless_Colored { get { if (!_Widget_DeviceDefault_Button_Borderless_ColoredReady) { _Widget_DeviceDefault_Button_Borderless_ColoredContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Button_Borderless_Colored"); _Widget_DeviceDefault_Button_Borderless_ColoredReady = true; } return _Widget_DeviceDefault_Button_Borderless_ColoredContent; } }
+            private static int _Widget_DeviceDefault_Button_Borderless_ColoredContent = default;
+            private static bool _Widget_DeviceDefault_Button_Borderless_ColoredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Button_Borderless_Small"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Button_Borderless_Small { get { if (!_Widget_DeviceDefault_Button_Borderless_SmallReady) { _Widget_DeviceDefault_Button_Borderless_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Button_Borderless_Small"); _Widget_DeviceDefault_Button_Borderless_SmallReady = true; } return _Widget_DeviceDefault_Button_Borderless_SmallContent; } }
+            private static int _Widget_DeviceDefault_Button_Borderless_SmallContent = default;
+            private static bool _Widget_DeviceDefault_Button_Borderless_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Button_Colored"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Button_Colored { get { if (!_Widget_DeviceDefault_Button_ColoredReady) { _Widget_DeviceDefault_Button_ColoredContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Button_Colored"); _Widget_DeviceDefault_Button_ColoredReady = true; } return _Widget_DeviceDefault_Button_ColoredContent; } }
+            private static int _Widget_DeviceDefault_Button_ColoredContent = default;
+            private static bool _Widget_DeviceDefault_Button_ColoredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Button_Inset"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Button_Inset { get { if (!_Widget_DeviceDefault_Button_InsetReady) { _Widget_DeviceDefault_Button_InsetContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Button_Inset"); _Widget_DeviceDefault_Button_InsetReady = true; } return _Widget_DeviceDefault_Button_InsetContent; } }
+            private static int _Widget_DeviceDefault_Button_InsetContent = default;
+            private static bool _Widget_DeviceDefault_Button_InsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Button_Small"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Button_Small { get { if (!_Widget_DeviceDefault_Button_SmallReady) { _Widget_DeviceDefault_Button_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Button_Small"); _Widget_DeviceDefault_Button_SmallReady = true; } return _Widget_DeviceDefault_Button_SmallContent; } }
+            private static int _Widget_DeviceDefault_Button_SmallContent = default;
+            private static bool _Widget_DeviceDefault_Button_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Button_Toggle"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Button_Toggle { get { if (!_Widget_DeviceDefault_Button_ToggleReady) { _Widget_DeviceDefault_Button_ToggleContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Button_Toggle"); _Widget_DeviceDefault_Button_ToggleReady = true; } return _Widget_DeviceDefault_Button_ToggleContent; } }
+            private static int _Widget_DeviceDefault_Button_ToggleContent = default;
+            private static bool _Widget_DeviceDefault_Button_ToggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_CalendarView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_CalendarView { get { if (!_Widget_DeviceDefault_CalendarViewReady) { _Widget_DeviceDefault_CalendarViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_CalendarView"); _Widget_DeviceDefault_CalendarViewReady = true; } return _Widget_DeviceDefault_CalendarViewContent; } }
+            private static int _Widget_DeviceDefault_CalendarViewContent = default;
+            private static bool _Widget_DeviceDefault_CalendarViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_CheckedTextView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_CheckedTextView { get { if (!_Widget_DeviceDefault_CheckedTextViewReady) { _Widget_DeviceDefault_CheckedTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_CheckedTextView"); _Widget_DeviceDefault_CheckedTextViewReady = true; } return _Widget_DeviceDefault_CheckedTextViewContent; } }
+            private static int _Widget_DeviceDefault_CheckedTextViewContent = default;
+            private static bool _Widget_DeviceDefault_CheckedTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_CompoundButton_CheckBox"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_CompoundButton_CheckBox { get { if (!_Widget_DeviceDefault_CompoundButton_CheckBoxReady) { _Widget_DeviceDefault_CompoundButton_CheckBoxContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_CompoundButton_CheckBox"); _Widget_DeviceDefault_CompoundButton_CheckBoxReady = true; } return _Widget_DeviceDefault_CompoundButton_CheckBoxContent; } }
+            private static int _Widget_DeviceDefault_CompoundButton_CheckBoxContent = default;
+            private static bool _Widget_DeviceDefault_CompoundButton_CheckBoxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_CompoundButton_RadioButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_CompoundButton_RadioButton { get { if (!_Widget_DeviceDefault_CompoundButton_RadioButtonReady) { _Widget_DeviceDefault_CompoundButton_RadioButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_CompoundButton_RadioButton"); _Widget_DeviceDefault_CompoundButton_RadioButtonReady = true; } return _Widget_DeviceDefault_CompoundButton_RadioButtonContent; } }
+            private static int _Widget_DeviceDefault_CompoundButton_RadioButtonContent = default;
+            private static bool _Widget_DeviceDefault_CompoundButton_RadioButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_CompoundButton_Star"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_CompoundButton_Star { get { if (!_Widget_DeviceDefault_CompoundButton_StarReady) { _Widget_DeviceDefault_CompoundButton_StarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_CompoundButton_Star"); _Widget_DeviceDefault_CompoundButton_StarReady = true; } return _Widget_DeviceDefault_CompoundButton_StarContent; } }
+            private static int _Widget_DeviceDefault_CompoundButton_StarContent = default;
+            private static bool _Widget_DeviceDefault_CompoundButton_StarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_DatePicker"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_DatePicker { get { if (!_Widget_DeviceDefault_DatePickerReady) { _Widget_DeviceDefault_DatePickerContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_DatePicker"); _Widget_DeviceDefault_DatePickerReady = true; } return _Widget_DeviceDefault_DatePickerContent; } }
+            private static int _Widget_DeviceDefault_DatePickerContent = default;
+            private static bool _Widget_DeviceDefault_DatePickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_DropDownItem"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_DropDownItem { get { if (!_Widget_DeviceDefault_DropDownItemReady) { _Widget_DeviceDefault_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_DropDownItem"); _Widget_DeviceDefault_DropDownItemReady = true; } return _Widget_DeviceDefault_DropDownItemContent; } }
+            private static int _Widget_DeviceDefault_DropDownItemContent = default;
+            private static bool _Widget_DeviceDefault_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_DropDownItem_Spinner"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_DropDownItem_Spinner { get { if (!_Widget_DeviceDefault_DropDownItem_SpinnerReady) { _Widget_DeviceDefault_DropDownItem_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_DropDownItem_Spinner"); _Widget_DeviceDefault_DropDownItem_SpinnerReady = true; } return _Widget_DeviceDefault_DropDownItem_SpinnerContent; } }
+            private static int _Widget_DeviceDefault_DropDownItem_SpinnerContent = default;
+            private static bool _Widget_DeviceDefault_DropDownItem_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_EditText"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_EditText { get { if (!_Widget_DeviceDefault_EditTextReady) { _Widget_DeviceDefault_EditTextContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_EditText"); _Widget_DeviceDefault_EditTextReady = true; } return _Widget_DeviceDefault_EditTextContent; } }
+            private static int _Widget_DeviceDefault_EditTextContent = default;
+            private static bool _Widget_DeviceDefault_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ExpandableListView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ExpandableListView { get { if (!_Widget_DeviceDefault_ExpandableListViewReady) { _Widget_DeviceDefault_ExpandableListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ExpandableListView"); _Widget_DeviceDefault_ExpandableListViewReady = true; } return _Widget_DeviceDefault_ExpandableListViewContent; } }
+            private static int _Widget_DeviceDefault_ExpandableListViewContent = default;
+            private static bool _Widget_DeviceDefault_ExpandableListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_FastScroll"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_FastScroll { get { if (!_Widget_DeviceDefault_FastScrollReady) { _Widget_DeviceDefault_FastScrollContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_FastScroll"); _Widget_DeviceDefault_FastScrollReady = true; } return _Widget_DeviceDefault_FastScrollContent; } }
+            private static int _Widget_DeviceDefault_FastScrollContent = default;
+            private static bool _Widget_DeviceDefault_FastScrollReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_GridView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_GridView { get { if (!_Widget_DeviceDefault_GridViewReady) { _Widget_DeviceDefault_GridViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_GridView"); _Widget_DeviceDefault_GridViewReady = true; } return _Widget_DeviceDefault_GridViewContent; } }
+            private static int _Widget_DeviceDefault_GridViewContent = default;
+            private static bool _Widget_DeviceDefault_GridViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_HorizontalScrollView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_HorizontalScrollView { get { if (!_Widget_DeviceDefault_HorizontalScrollViewReady) { _Widget_DeviceDefault_HorizontalScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_HorizontalScrollView"); _Widget_DeviceDefault_HorizontalScrollViewReady = true; } return _Widget_DeviceDefault_HorizontalScrollViewContent; } }
+            private static int _Widget_DeviceDefault_HorizontalScrollViewContent = default;
+            private static bool _Widget_DeviceDefault_HorizontalScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ImageButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ImageButton { get { if (!_Widget_DeviceDefault_ImageButtonReady) { _Widget_DeviceDefault_ImageButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ImageButton"); _Widget_DeviceDefault_ImageButtonReady = true; } return _Widget_DeviceDefault_ImageButtonContent; } }
+            private static int _Widget_DeviceDefault_ImageButtonContent = default;
+            private static bool _Widget_DeviceDefault_ImageButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light { get { if (!_Widget_DeviceDefault_LightReady) { _Widget_DeviceDefault_LightContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light"); _Widget_DeviceDefault_LightReady = true; } return _Widget_DeviceDefault_LightContent; } }
+            private static int _Widget_DeviceDefault_LightContent = default;
+            private static bool _Widget_DeviceDefault_LightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionBar { get { if (!_Widget_DeviceDefault_Light_ActionBarReady) { _Widget_DeviceDefault_Light_ActionBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar"); _Widget_DeviceDefault_Light_ActionBarReady = true; } return _Widget_DeviceDefault_Light_ActionBarContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBarContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar_Solid"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionBar_Solid { get { if (!_Widget_DeviceDefault_Light_ActionBar_SolidReady) { _Widget_DeviceDefault_Light_ActionBar_SolidContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar_Solid"); _Widget_DeviceDefault_Light_ActionBar_SolidReady = true; } return _Widget_DeviceDefault_Light_ActionBar_SolidContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBar_SolidContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBar_SolidReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar_Solid_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Widget_DeviceDefault_Light_ActionBar_Solid_Inverse { get { if (!_Widget_DeviceDefault_Light_ActionBar_Solid_InverseReady) { _Widget_DeviceDefault_Light_ActionBar_Solid_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar_Solid_Inverse"); _Widget_DeviceDefault_Light_ActionBar_Solid_InverseReady = true; } return _Widget_DeviceDefault_Light_ActionBar_Solid_InverseContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBar_Solid_InverseContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBar_Solid_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar_TabBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionBar_TabBar { get { if (!_Widget_DeviceDefault_Light_ActionBar_TabBarReady) { _Widget_DeviceDefault_Light_ActionBar_TabBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar_TabBar"); _Widget_DeviceDefault_Light_ActionBar_TabBarReady = true; } return _Widget_DeviceDefault_Light_ActionBar_TabBarContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBar_TabBarContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBar_TabBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar_TabBar_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Widget_DeviceDefault_Light_ActionBar_TabBar_Inverse { get { if (!_Widget_DeviceDefault_Light_ActionBar_TabBar_InverseReady) { _Widget_DeviceDefault_Light_ActionBar_TabBar_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar_TabBar_Inverse"); _Widget_DeviceDefault_Light_ActionBar_TabBar_InverseReady = true; } return _Widget_DeviceDefault_Light_ActionBar_TabBar_InverseContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBar_TabBar_InverseContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBar_TabBar_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar_TabText"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionBar_TabText { get { if (!_Widget_DeviceDefault_Light_ActionBar_TabTextReady) { _Widget_DeviceDefault_Light_ActionBar_TabTextContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar_TabText"); _Widget_DeviceDefault_Light_ActionBar_TabTextReady = true; } return _Widget_DeviceDefault_Light_ActionBar_TabTextContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBar_TabTextContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBar_TabTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar_TabText_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Widget_DeviceDefault_Light_ActionBar_TabText_Inverse { get { if (!_Widget_DeviceDefault_Light_ActionBar_TabText_InverseReady) { _Widget_DeviceDefault_Light_ActionBar_TabText_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar_TabText_Inverse"); _Widget_DeviceDefault_Light_ActionBar_TabText_InverseReady = true; } return _Widget_DeviceDefault_Light_ActionBar_TabText_InverseContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBar_TabText_InverseContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBar_TabText_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar_TabView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionBar_TabView { get { if (!_Widget_DeviceDefault_Light_ActionBar_TabViewReady) { _Widget_DeviceDefault_Light_ActionBar_TabViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar_TabView"); _Widget_DeviceDefault_Light_ActionBar_TabViewReady = true; } return _Widget_DeviceDefault_Light_ActionBar_TabViewContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBar_TabViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBar_TabViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionBar_TabView_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Widget_DeviceDefault_Light_ActionBar_TabView_Inverse { get { if (!_Widget_DeviceDefault_Light_ActionBar_TabView_InverseReady) { _Widget_DeviceDefault_Light_ActionBar_TabView_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionBar_TabView_Inverse"); _Widget_DeviceDefault_Light_ActionBar_TabView_InverseReady = true; } return _Widget_DeviceDefault_Light_ActionBar_TabView_InverseContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionBar_TabView_InverseContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionBar_TabView_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionButton { get { if (!_Widget_DeviceDefault_Light_ActionButtonReady) { _Widget_DeviceDefault_Light_ActionButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionButton"); _Widget_DeviceDefault_Light_ActionButtonReady = true; } return _Widget_DeviceDefault_Light_ActionButtonContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionButtonContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionButton_CloseMode"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionButton_CloseMode { get { if (!_Widget_DeviceDefault_Light_ActionButton_CloseModeReady) { _Widget_DeviceDefault_Light_ActionButton_CloseModeContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionButton_CloseMode"); _Widget_DeviceDefault_Light_ActionButton_CloseModeReady = true; } return _Widget_DeviceDefault_Light_ActionButton_CloseModeContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionButton_CloseModeContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionButton_CloseModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionButton_Overflow"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionButton_Overflow { get { if (!_Widget_DeviceDefault_Light_ActionButton_OverflowReady) { _Widget_DeviceDefault_Light_ActionButton_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionButton_Overflow"); _Widget_DeviceDefault_Light_ActionButton_OverflowReady = true; } return _Widget_DeviceDefault_Light_ActionButton_OverflowContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionButton_OverflowContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionButton_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionMode"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ActionMode { get { if (!_Widget_DeviceDefault_Light_ActionModeReady) { _Widget_DeviceDefault_Light_ActionModeContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionMode"); _Widget_DeviceDefault_Light_ActionModeReady = true; } return _Widget_DeviceDefault_Light_ActionModeContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionModeContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ActionMode_Inverse"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Widget_DeviceDefault_Light_ActionMode_Inverse { get { if (!_Widget_DeviceDefault_Light_ActionMode_InverseReady) { _Widget_DeviceDefault_Light_ActionMode_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ActionMode_Inverse"); _Widget_DeviceDefault_Light_ActionMode_InverseReady = true; } return _Widget_DeviceDefault_Light_ActionMode_InverseContent; } }
+            private static int _Widget_DeviceDefault_Light_ActionMode_InverseContent = default;
+            private static bool _Widget_DeviceDefault_Light_ActionMode_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_AutoCompleteTextView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_AutoCompleteTextView { get { if (!_Widget_DeviceDefault_Light_AutoCompleteTextViewReady) { _Widget_DeviceDefault_Light_AutoCompleteTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_AutoCompleteTextView"); _Widget_DeviceDefault_Light_AutoCompleteTextViewReady = true; } return _Widget_DeviceDefault_Light_AutoCompleteTextViewContent; } }
+            private static int _Widget_DeviceDefault_Light_AutoCompleteTextViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_AutoCompleteTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_Button"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_Button { get { if (!_Widget_DeviceDefault_Light_ButtonReady) { _Widget_DeviceDefault_Light_ButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_Button"); _Widget_DeviceDefault_Light_ButtonReady = true; } return _Widget_DeviceDefault_Light_ButtonContent; } }
+            private static int _Widget_DeviceDefault_Light_ButtonContent = default;
+            private static bool _Widget_DeviceDefault_Light_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_Button_Borderless_Small"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_Button_Borderless_Small { get { if (!_Widget_DeviceDefault_Light_Button_Borderless_SmallReady) { _Widget_DeviceDefault_Light_Button_Borderless_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_Button_Borderless_Small"); _Widget_DeviceDefault_Light_Button_Borderless_SmallReady = true; } return _Widget_DeviceDefault_Light_Button_Borderless_SmallContent; } }
+            private static int _Widget_DeviceDefault_Light_Button_Borderless_SmallContent = default;
+            private static bool _Widget_DeviceDefault_Light_Button_Borderless_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_Button_Inset"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_Button_Inset { get { if (!_Widget_DeviceDefault_Light_Button_InsetReady) { _Widget_DeviceDefault_Light_Button_InsetContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_Button_Inset"); _Widget_DeviceDefault_Light_Button_InsetReady = true; } return _Widget_DeviceDefault_Light_Button_InsetContent; } }
+            private static int _Widget_DeviceDefault_Light_Button_InsetContent = default;
+            private static bool _Widget_DeviceDefault_Light_Button_InsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_Button_Small"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_Button_Small { get { if (!_Widget_DeviceDefault_Light_Button_SmallReady) { _Widget_DeviceDefault_Light_Button_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_Button_Small"); _Widget_DeviceDefault_Light_Button_SmallReady = true; } return _Widget_DeviceDefault_Light_Button_SmallContent; } }
+            private static int _Widget_DeviceDefault_Light_Button_SmallContent = default;
+            private static bool _Widget_DeviceDefault_Light_Button_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_Button_Toggle"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_Button_Toggle { get { if (!_Widget_DeviceDefault_Light_Button_ToggleReady) { _Widget_DeviceDefault_Light_Button_ToggleContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_Button_Toggle"); _Widget_DeviceDefault_Light_Button_ToggleReady = true; } return _Widget_DeviceDefault_Light_Button_ToggleContent; } }
+            private static int _Widget_DeviceDefault_Light_Button_ToggleContent = default;
+            private static bool _Widget_DeviceDefault_Light_Button_ToggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_CalendarView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_CalendarView { get { if (!_Widget_DeviceDefault_Light_CalendarViewReady) { _Widget_DeviceDefault_Light_CalendarViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_CalendarView"); _Widget_DeviceDefault_Light_CalendarViewReady = true; } return _Widget_DeviceDefault_Light_CalendarViewContent; } }
+            private static int _Widget_DeviceDefault_Light_CalendarViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_CalendarViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_CheckedTextView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_CheckedTextView { get { if (!_Widget_DeviceDefault_Light_CheckedTextViewReady) { _Widget_DeviceDefault_Light_CheckedTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_CheckedTextView"); _Widget_DeviceDefault_Light_CheckedTextViewReady = true; } return _Widget_DeviceDefault_Light_CheckedTextViewContent; } }
+            private static int _Widget_DeviceDefault_Light_CheckedTextViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_CheckedTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_CompoundButton_CheckBox"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_CompoundButton_CheckBox { get { if (!_Widget_DeviceDefault_Light_CompoundButton_CheckBoxReady) { _Widget_DeviceDefault_Light_CompoundButton_CheckBoxContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_CompoundButton_CheckBox"); _Widget_DeviceDefault_Light_CompoundButton_CheckBoxReady = true; } return _Widget_DeviceDefault_Light_CompoundButton_CheckBoxContent; } }
+            private static int _Widget_DeviceDefault_Light_CompoundButton_CheckBoxContent = default;
+            private static bool _Widget_DeviceDefault_Light_CompoundButton_CheckBoxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_CompoundButton_RadioButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_CompoundButton_RadioButton { get { if (!_Widget_DeviceDefault_Light_CompoundButton_RadioButtonReady) { _Widget_DeviceDefault_Light_CompoundButton_RadioButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_CompoundButton_RadioButton"); _Widget_DeviceDefault_Light_CompoundButton_RadioButtonReady = true; } return _Widget_DeviceDefault_Light_CompoundButton_RadioButtonContent; } }
+            private static int _Widget_DeviceDefault_Light_CompoundButton_RadioButtonContent = default;
+            private static bool _Widget_DeviceDefault_Light_CompoundButton_RadioButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_CompoundButton_Star"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_CompoundButton_Star { get { if (!_Widget_DeviceDefault_Light_CompoundButton_StarReady) { _Widget_DeviceDefault_Light_CompoundButton_StarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_CompoundButton_Star"); _Widget_DeviceDefault_Light_CompoundButton_StarReady = true; } return _Widget_DeviceDefault_Light_CompoundButton_StarContent; } }
+            private static int _Widget_DeviceDefault_Light_CompoundButton_StarContent = default;
+            private static bool _Widget_DeviceDefault_Light_CompoundButton_StarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_DropDownItem"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_DropDownItem { get { if (!_Widget_DeviceDefault_Light_DropDownItemReady) { _Widget_DeviceDefault_Light_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_DropDownItem"); _Widget_DeviceDefault_Light_DropDownItemReady = true; } return _Widget_DeviceDefault_Light_DropDownItemContent; } }
+            private static int _Widget_DeviceDefault_Light_DropDownItemContent = default;
+            private static bool _Widget_DeviceDefault_Light_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_DropDownItem_Spinner"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_DropDownItem_Spinner { get { if (!_Widget_DeviceDefault_Light_DropDownItem_SpinnerReady) { _Widget_DeviceDefault_Light_DropDownItem_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_DropDownItem_Spinner"); _Widget_DeviceDefault_Light_DropDownItem_SpinnerReady = true; } return _Widget_DeviceDefault_Light_DropDownItem_SpinnerContent; } }
+            private static int _Widget_DeviceDefault_Light_DropDownItem_SpinnerContent = default;
+            private static bool _Widget_DeviceDefault_Light_DropDownItem_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_EditText"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_EditText { get { if (!_Widget_DeviceDefault_Light_EditTextReady) { _Widget_DeviceDefault_Light_EditTextContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_EditText"); _Widget_DeviceDefault_Light_EditTextReady = true; } return _Widget_DeviceDefault_Light_EditTextContent; } }
+            private static int _Widget_DeviceDefault_Light_EditTextContent = default;
+            private static bool _Widget_DeviceDefault_Light_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ExpandableListView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ExpandableListView { get { if (!_Widget_DeviceDefault_Light_ExpandableListViewReady) { _Widget_DeviceDefault_Light_ExpandableListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ExpandableListView"); _Widget_DeviceDefault_Light_ExpandableListViewReady = true; } return _Widget_DeviceDefault_Light_ExpandableListViewContent; } }
+            private static int _Widget_DeviceDefault_Light_ExpandableListViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_ExpandableListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_FastScroll"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_FastScroll { get { if (!_Widget_DeviceDefault_Light_FastScrollReady) { _Widget_DeviceDefault_Light_FastScrollContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_FastScroll"); _Widget_DeviceDefault_Light_FastScrollReady = true; } return _Widget_DeviceDefault_Light_FastScrollContent; } }
+            private static int _Widget_DeviceDefault_Light_FastScrollContent = default;
+            private static bool _Widget_DeviceDefault_Light_FastScrollReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_GridView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_GridView { get { if (!_Widget_DeviceDefault_Light_GridViewReady) { _Widget_DeviceDefault_Light_GridViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_GridView"); _Widget_DeviceDefault_Light_GridViewReady = true; } return _Widget_DeviceDefault_Light_GridViewContent; } }
+            private static int _Widget_DeviceDefault_Light_GridViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_GridViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_HorizontalScrollView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_HorizontalScrollView { get { if (!_Widget_DeviceDefault_Light_HorizontalScrollViewReady) { _Widget_DeviceDefault_Light_HorizontalScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_HorizontalScrollView"); _Widget_DeviceDefault_Light_HorizontalScrollViewReady = true; } return _Widget_DeviceDefault_Light_HorizontalScrollViewContent; } }
+            private static int _Widget_DeviceDefault_Light_HorizontalScrollViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_HorizontalScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ImageButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ImageButton { get { if (!_Widget_DeviceDefault_Light_ImageButtonReady) { _Widget_DeviceDefault_Light_ImageButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ImageButton"); _Widget_DeviceDefault_Light_ImageButtonReady = true; } return _Widget_DeviceDefault_Light_ImageButtonContent; } }
+            private static int _Widget_DeviceDefault_Light_ImageButtonContent = default;
+            private static bool _Widget_DeviceDefault_Light_ImageButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ListPopupWindow"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ListPopupWindow { get { if (!_Widget_DeviceDefault_Light_ListPopupWindowReady) { _Widget_DeviceDefault_Light_ListPopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ListPopupWindow"); _Widget_DeviceDefault_Light_ListPopupWindowReady = true; } return _Widget_DeviceDefault_Light_ListPopupWindowContent; } }
+            private static int _Widget_DeviceDefault_Light_ListPopupWindowContent = default;
+            private static bool _Widget_DeviceDefault_Light_ListPopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ListView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ListView { get { if (!_Widget_DeviceDefault_Light_ListViewReady) { _Widget_DeviceDefault_Light_ListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ListView"); _Widget_DeviceDefault_Light_ListViewReady = true; } return _Widget_DeviceDefault_Light_ListViewContent; } }
+            private static int _Widget_DeviceDefault_Light_ListViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_ListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ListView_DropDown"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ListView_DropDown { get { if (!_Widget_DeviceDefault_Light_ListView_DropDownReady) { _Widget_DeviceDefault_Light_ListView_DropDownContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ListView_DropDown"); _Widget_DeviceDefault_Light_ListView_DropDownReady = true; } return _Widget_DeviceDefault_Light_ListView_DropDownContent; } }
+            private static int _Widget_DeviceDefault_Light_ListView_DropDownContent = default;
+            private static bool _Widget_DeviceDefault_Light_ListView_DropDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_MediaRouteButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_MediaRouteButton { get { if (!_Widget_DeviceDefault_Light_MediaRouteButtonReady) { _Widget_DeviceDefault_Light_MediaRouteButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_MediaRouteButton"); _Widget_DeviceDefault_Light_MediaRouteButtonReady = true; } return _Widget_DeviceDefault_Light_MediaRouteButtonContent; } }
+            private static int _Widget_DeviceDefault_Light_MediaRouteButtonContent = default;
+            private static bool _Widget_DeviceDefault_Light_MediaRouteButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_PopupMenu"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_PopupMenu { get { if (!_Widget_DeviceDefault_Light_PopupMenuReady) { _Widget_DeviceDefault_Light_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_PopupMenu"); _Widget_DeviceDefault_Light_PopupMenuReady = true; } return _Widget_DeviceDefault_Light_PopupMenuContent; } }
+            private static int _Widget_DeviceDefault_Light_PopupMenuContent = default;
+            private static bool _Widget_DeviceDefault_Light_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_PopupWindow"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_PopupWindow { get { if (!_Widget_DeviceDefault_Light_PopupWindowReady) { _Widget_DeviceDefault_Light_PopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_PopupWindow"); _Widget_DeviceDefault_Light_PopupWindowReady = true; } return _Widget_DeviceDefault_Light_PopupWindowContent; } }
+            private static int _Widget_DeviceDefault_Light_PopupWindowContent = default;
+            private static bool _Widget_DeviceDefault_Light_PopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ProgressBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ProgressBar { get { if (!_Widget_DeviceDefault_Light_ProgressBarReady) { _Widget_DeviceDefault_Light_ProgressBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ProgressBar"); _Widget_DeviceDefault_Light_ProgressBarReady = true; } return _Widget_DeviceDefault_Light_ProgressBarContent; } }
+            private static int _Widget_DeviceDefault_Light_ProgressBarContent = default;
+            private static bool _Widget_DeviceDefault_Light_ProgressBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ProgressBar_Horizontal"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ProgressBar_Horizontal { get { if (!_Widget_DeviceDefault_Light_ProgressBar_HorizontalReady) { _Widget_DeviceDefault_Light_ProgressBar_HorizontalContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ProgressBar_Horizontal"); _Widget_DeviceDefault_Light_ProgressBar_HorizontalReady = true; } return _Widget_DeviceDefault_Light_ProgressBar_HorizontalContent; } }
+            private static int _Widget_DeviceDefault_Light_ProgressBar_HorizontalContent = default;
+            private static bool _Widget_DeviceDefault_Light_ProgressBar_HorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ProgressBar_Inverse"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ProgressBar_Inverse { get { if (!_Widget_DeviceDefault_Light_ProgressBar_InverseReady) { _Widget_DeviceDefault_Light_ProgressBar_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ProgressBar_Inverse"); _Widget_DeviceDefault_Light_ProgressBar_InverseReady = true; } return _Widget_DeviceDefault_Light_ProgressBar_InverseContent; } }
+            private static int _Widget_DeviceDefault_Light_ProgressBar_InverseContent = default;
+            private static bool _Widget_DeviceDefault_Light_ProgressBar_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ProgressBar_Large"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ProgressBar_Large { get { if (!_Widget_DeviceDefault_Light_ProgressBar_LargeReady) { _Widget_DeviceDefault_Light_ProgressBar_LargeContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ProgressBar_Large"); _Widget_DeviceDefault_Light_ProgressBar_LargeReady = true; } return _Widget_DeviceDefault_Light_ProgressBar_LargeContent; } }
+            private static int _Widget_DeviceDefault_Light_ProgressBar_LargeContent = default;
+            private static bool _Widget_DeviceDefault_Light_ProgressBar_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ProgressBar_Large_Inverse"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ProgressBar_Large_Inverse { get { if (!_Widget_DeviceDefault_Light_ProgressBar_Large_InverseReady) { _Widget_DeviceDefault_Light_ProgressBar_Large_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ProgressBar_Large_Inverse"); _Widget_DeviceDefault_Light_ProgressBar_Large_InverseReady = true; } return _Widget_DeviceDefault_Light_ProgressBar_Large_InverseContent; } }
+            private static int _Widget_DeviceDefault_Light_ProgressBar_Large_InverseContent = default;
+            private static bool _Widget_DeviceDefault_Light_ProgressBar_Large_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ProgressBar_Small"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ProgressBar_Small { get { if (!_Widget_DeviceDefault_Light_ProgressBar_SmallReady) { _Widget_DeviceDefault_Light_ProgressBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ProgressBar_Small"); _Widget_DeviceDefault_Light_ProgressBar_SmallReady = true; } return _Widget_DeviceDefault_Light_ProgressBar_SmallContent; } }
+            private static int _Widget_DeviceDefault_Light_ProgressBar_SmallContent = default;
+            private static bool _Widget_DeviceDefault_Light_ProgressBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ProgressBar_Small_Inverse"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ProgressBar_Small_Inverse { get { if (!_Widget_DeviceDefault_Light_ProgressBar_Small_InverseReady) { _Widget_DeviceDefault_Light_ProgressBar_Small_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ProgressBar_Small_Inverse"); _Widget_DeviceDefault_Light_ProgressBar_Small_InverseReady = true; } return _Widget_DeviceDefault_Light_ProgressBar_Small_InverseContent; } }
+            private static int _Widget_DeviceDefault_Light_ProgressBar_Small_InverseContent = default;
+            private static bool _Widget_DeviceDefault_Light_ProgressBar_Small_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ProgressBar_Small_Title"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ProgressBar_Small_Title { get { if (!_Widget_DeviceDefault_Light_ProgressBar_Small_TitleReady) { _Widget_DeviceDefault_Light_ProgressBar_Small_TitleContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ProgressBar_Small_Title"); _Widget_DeviceDefault_Light_ProgressBar_Small_TitleReady = true; } return _Widget_DeviceDefault_Light_ProgressBar_Small_TitleContent; } }
+            private static int _Widget_DeviceDefault_Light_ProgressBar_Small_TitleContent = default;
+            private static bool _Widget_DeviceDefault_Light_ProgressBar_Small_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_RatingBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_RatingBar { get { if (!_Widget_DeviceDefault_Light_RatingBarReady) { _Widget_DeviceDefault_Light_RatingBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_RatingBar"); _Widget_DeviceDefault_Light_RatingBarReady = true; } return _Widget_DeviceDefault_Light_RatingBarContent; } }
+            private static int _Widget_DeviceDefault_Light_RatingBarContent = default;
+            private static bool _Widget_DeviceDefault_Light_RatingBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_RatingBar_Indicator"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_RatingBar_Indicator { get { if (!_Widget_DeviceDefault_Light_RatingBar_IndicatorReady) { _Widget_DeviceDefault_Light_RatingBar_IndicatorContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_RatingBar_Indicator"); _Widget_DeviceDefault_Light_RatingBar_IndicatorReady = true; } return _Widget_DeviceDefault_Light_RatingBar_IndicatorContent; } }
+            private static int _Widget_DeviceDefault_Light_RatingBar_IndicatorContent = default;
+            private static bool _Widget_DeviceDefault_Light_RatingBar_IndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_RatingBar_Small"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_RatingBar_Small { get { if (!_Widget_DeviceDefault_Light_RatingBar_SmallReady) { _Widget_DeviceDefault_Light_RatingBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_RatingBar_Small"); _Widget_DeviceDefault_Light_RatingBar_SmallReady = true; } return _Widget_DeviceDefault_Light_RatingBar_SmallContent; } }
+            private static int _Widget_DeviceDefault_Light_RatingBar_SmallContent = default;
+            private static bool _Widget_DeviceDefault_Light_RatingBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_ScrollView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_ScrollView { get { if (!_Widget_DeviceDefault_Light_ScrollViewReady) { _Widget_DeviceDefault_Light_ScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_ScrollView"); _Widget_DeviceDefault_Light_ScrollViewReady = true; } return _Widget_DeviceDefault_Light_ScrollViewContent; } }
+            private static int _Widget_DeviceDefault_Light_ScrollViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_ScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_SeekBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_SeekBar { get { if (!_Widget_DeviceDefault_Light_SeekBarReady) { _Widget_DeviceDefault_Light_SeekBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_SeekBar"); _Widget_DeviceDefault_Light_SeekBarReady = true; } return _Widget_DeviceDefault_Light_SeekBarContent; } }
+            private static int _Widget_DeviceDefault_Light_SeekBarContent = default;
+            private static bool _Widget_DeviceDefault_Light_SeekBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_Spinner"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_Spinner { get { if (!_Widget_DeviceDefault_Light_SpinnerReady) { _Widget_DeviceDefault_Light_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_Spinner"); _Widget_DeviceDefault_Light_SpinnerReady = true; } return _Widget_DeviceDefault_Light_SpinnerContent; } }
+            private static int _Widget_DeviceDefault_Light_SpinnerContent = default;
+            private static bool _Widget_DeviceDefault_Light_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_StackView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_StackView { get { if (!_Widget_DeviceDefault_Light_StackViewReady) { _Widget_DeviceDefault_Light_StackViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_StackView"); _Widget_DeviceDefault_Light_StackViewReady = true; } return _Widget_DeviceDefault_Light_StackViewContent; } }
+            private static int _Widget_DeviceDefault_Light_StackViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_StackViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_Tab"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_Tab { get { if (!_Widget_DeviceDefault_Light_TabReady) { _Widget_DeviceDefault_Light_TabContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_Tab"); _Widget_DeviceDefault_Light_TabReady = true; } return _Widget_DeviceDefault_Light_TabContent; } }
+            private static int _Widget_DeviceDefault_Light_TabContent = default;
+            private static bool _Widget_DeviceDefault_Light_TabReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_TabWidget"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_TabWidget { get { if (!_Widget_DeviceDefault_Light_TabWidgetReady) { _Widget_DeviceDefault_Light_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_TabWidget"); _Widget_DeviceDefault_Light_TabWidgetReady = true; } return _Widget_DeviceDefault_Light_TabWidgetContent; } }
+            private static int _Widget_DeviceDefault_Light_TabWidgetContent = default;
+            private static bool _Widget_DeviceDefault_Light_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_TextView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_TextView { get { if (!_Widget_DeviceDefault_Light_TextViewReady) { _Widget_DeviceDefault_Light_TextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_TextView"); _Widget_DeviceDefault_Light_TextViewReady = true; } return _Widget_DeviceDefault_Light_TextViewContent; } }
+            private static int _Widget_DeviceDefault_Light_TextViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_TextView_SpinnerItem { get { if (!_Widget_DeviceDefault_Light_TextView_SpinnerItemReady) { _Widget_DeviceDefault_Light_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_TextView_SpinnerItem"); _Widget_DeviceDefault_Light_TextView_SpinnerItemReady = true; } return _Widget_DeviceDefault_Light_TextView_SpinnerItemContent; } }
+            private static int _Widget_DeviceDefault_Light_TextView_SpinnerItemContent = default;
+            private static bool _Widget_DeviceDefault_Light_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_WebTextView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_WebTextView { get { if (!_Widget_DeviceDefault_Light_WebTextViewReady) { _Widget_DeviceDefault_Light_WebTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_WebTextView"); _Widget_DeviceDefault_Light_WebTextViewReady = true; } return _Widget_DeviceDefault_Light_WebTextViewContent; } }
+            private static int _Widget_DeviceDefault_Light_WebTextViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_WebTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Light_WebView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Light_WebView { get { if (!_Widget_DeviceDefault_Light_WebViewReady) { _Widget_DeviceDefault_Light_WebViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Light_WebView"); _Widget_DeviceDefault_Light_WebViewReady = true; } return _Widget_DeviceDefault_Light_WebViewContent; } }
+            private static int _Widget_DeviceDefault_Light_WebViewContent = default;
+            private static bool _Widget_DeviceDefault_Light_WebViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ListPopupWindow"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ListPopupWindow { get { if (!_Widget_DeviceDefault_ListPopupWindowReady) { _Widget_DeviceDefault_ListPopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ListPopupWindow"); _Widget_DeviceDefault_ListPopupWindowReady = true; } return _Widget_DeviceDefault_ListPopupWindowContent; } }
+            private static int _Widget_DeviceDefault_ListPopupWindowContent = default;
+            private static bool _Widget_DeviceDefault_ListPopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ListView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ListView { get { if (!_Widget_DeviceDefault_ListViewReady) { _Widget_DeviceDefault_ListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ListView"); _Widget_DeviceDefault_ListViewReady = true; } return _Widget_DeviceDefault_ListViewContent; } }
+            private static int _Widget_DeviceDefault_ListViewContent = default;
+            private static bool _Widget_DeviceDefault_ListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ListView_DropDown"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ListView_DropDown { get { if (!_Widget_DeviceDefault_ListView_DropDownReady) { _Widget_DeviceDefault_ListView_DropDownContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ListView_DropDown"); _Widget_DeviceDefault_ListView_DropDownReady = true; } return _Widget_DeviceDefault_ListView_DropDownContent; } }
+            private static int _Widget_DeviceDefault_ListView_DropDownContent = default;
+            private static bool _Widget_DeviceDefault_ListView_DropDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_MediaRouteButton"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_MediaRouteButton { get { if (!_Widget_DeviceDefault_MediaRouteButtonReady) { _Widget_DeviceDefault_MediaRouteButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_MediaRouteButton"); _Widget_DeviceDefault_MediaRouteButtonReady = true; } return _Widget_DeviceDefault_MediaRouteButtonContent; } }
+            private static int _Widget_DeviceDefault_MediaRouteButtonContent = default;
+            private static bool _Widget_DeviceDefault_MediaRouteButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_PopupMenu"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_PopupMenu { get { if (!_Widget_DeviceDefault_PopupMenuReady) { _Widget_DeviceDefault_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_PopupMenu"); _Widget_DeviceDefault_PopupMenuReady = true; } return _Widget_DeviceDefault_PopupMenuContent; } }
+            private static int _Widget_DeviceDefault_PopupMenuContent = default;
+            private static bool _Widget_DeviceDefault_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_PopupWindow"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_PopupWindow { get { if (!_Widget_DeviceDefault_PopupWindowReady) { _Widget_DeviceDefault_PopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_PopupWindow"); _Widget_DeviceDefault_PopupWindowReady = true; } return _Widget_DeviceDefault_PopupWindowContent; } }
+            private static int _Widget_DeviceDefault_PopupWindowContent = default;
+            private static bool _Widget_DeviceDefault_PopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ProgressBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ProgressBar { get { if (!_Widget_DeviceDefault_ProgressBarReady) { _Widget_DeviceDefault_ProgressBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ProgressBar"); _Widget_DeviceDefault_ProgressBarReady = true; } return _Widget_DeviceDefault_ProgressBarContent; } }
+            private static int _Widget_DeviceDefault_ProgressBarContent = default;
+            private static bool _Widget_DeviceDefault_ProgressBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ProgressBar_Horizontal"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ProgressBar_Horizontal { get { if (!_Widget_DeviceDefault_ProgressBar_HorizontalReady) { _Widget_DeviceDefault_ProgressBar_HorizontalContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ProgressBar_Horizontal"); _Widget_DeviceDefault_ProgressBar_HorizontalReady = true; } return _Widget_DeviceDefault_ProgressBar_HorizontalContent; } }
+            private static int _Widget_DeviceDefault_ProgressBar_HorizontalContent = default;
+            private static bool _Widget_DeviceDefault_ProgressBar_HorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ProgressBar_Large"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ProgressBar_Large { get { if (!_Widget_DeviceDefault_ProgressBar_LargeReady) { _Widget_DeviceDefault_ProgressBar_LargeContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ProgressBar_Large"); _Widget_DeviceDefault_ProgressBar_LargeReady = true; } return _Widget_DeviceDefault_ProgressBar_LargeContent; } }
+            private static int _Widget_DeviceDefault_ProgressBar_LargeContent = default;
+            private static bool _Widget_DeviceDefault_ProgressBar_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ProgressBar_Small"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ProgressBar_Small { get { if (!_Widget_DeviceDefault_ProgressBar_SmallReady) { _Widget_DeviceDefault_ProgressBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ProgressBar_Small"); _Widget_DeviceDefault_ProgressBar_SmallReady = true; } return _Widget_DeviceDefault_ProgressBar_SmallContent; } }
+            private static int _Widget_DeviceDefault_ProgressBar_SmallContent = default;
+            private static bool _Widget_DeviceDefault_ProgressBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ProgressBar_Small_Title"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ProgressBar_Small_Title { get { if (!_Widget_DeviceDefault_ProgressBar_Small_TitleReady) { _Widget_DeviceDefault_ProgressBar_Small_TitleContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ProgressBar_Small_Title"); _Widget_DeviceDefault_ProgressBar_Small_TitleReady = true; } return _Widget_DeviceDefault_ProgressBar_Small_TitleContent; } }
+            private static int _Widget_DeviceDefault_ProgressBar_Small_TitleContent = default;
+            private static bool _Widget_DeviceDefault_ProgressBar_Small_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_RatingBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_RatingBar { get { if (!_Widget_DeviceDefault_RatingBarReady) { _Widget_DeviceDefault_RatingBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_RatingBar"); _Widget_DeviceDefault_RatingBarReady = true; } return _Widget_DeviceDefault_RatingBarContent; } }
+            private static int _Widget_DeviceDefault_RatingBarContent = default;
+            private static bool _Widget_DeviceDefault_RatingBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_RatingBar_Indicator"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_RatingBar_Indicator { get { if (!_Widget_DeviceDefault_RatingBar_IndicatorReady) { _Widget_DeviceDefault_RatingBar_IndicatorContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_RatingBar_Indicator"); _Widget_DeviceDefault_RatingBar_IndicatorReady = true; } return _Widget_DeviceDefault_RatingBar_IndicatorContent; } }
+            private static int _Widget_DeviceDefault_RatingBar_IndicatorContent = default;
+            private static bool _Widget_DeviceDefault_RatingBar_IndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_RatingBar_Small"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_RatingBar_Small { get { if (!_Widget_DeviceDefault_RatingBar_SmallReady) { _Widget_DeviceDefault_RatingBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_RatingBar_Small"); _Widget_DeviceDefault_RatingBar_SmallReady = true; } return _Widget_DeviceDefault_RatingBar_SmallContent; } }
+            private static int _Widget_DeviceDefault_RatingBar_SmallContent = default;
+            private static bool _Widget_DeviceDefault_RatingBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_ScrollView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_ScrollView { get { if (!_Widget_DeviceDefault_ScrollViewReady) { _Widget_DeviceDefault_ScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_ScrollView"); _Widget_DeviceDefault_ScrollViewReady = true; } return _Widget_DeviceDefault_ScrollViewContent; } }
+            private static int _Widget_DeviceDefault_ScrollViewContent = default;
+            private static bool _Widget_DeviceDefault_ScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_SeekBar"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_SeekBar { get { if (!_Widget_DeviceDefault_SeekBarReady) { _Widget_DeviceDefault_SeekBarContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_SeekBar"); _Widget_DeviceDefault_SeekBarReady = true; } return _Widget_DeviceDefault_SeekBarContent; } }
+            private static int _Widget_DeviceDefault_SeekBarContent = default;
+            private static bool _Widget_DeviceDefault_SeekBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Spinner"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Spinner { get { if (!_Widget_DeviceDefault_SpinnerReady) { _Widget_DeviceDefault_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Spinner"); _Widget_DeviceDefault_SpinnerReady = true; } return _Widget_DeviceDefault_SpinnerContent; } }
+            private static int _Widget_DeviceDefault_SpinnerContent = default;
+            private static bool _Widget_DeviceDefault_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_StackView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_StackView { get { if (!_Widget_DeviceDefault_StackViewReady) { _Widget_DeviceDefault_StackViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_StackView"); _Widget_DeviceDefault_StackViewReady = true; } return _Widget_DeviceDefault_StackViewContent; } }
+            private static int _Widget_DeviceDefault_StackViewContent = default;
+            private static bool _Widget_DeviceDefault_StackViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_Tab"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_Tab { get { if (!_Widget_DeviceDefault_TabReady) { _Widget_DeviceDefault_TabContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_Tab"); _Widget_DeviceDefault_TabReady = true; } return _Widget_DeviceDefault_TabContent; } }
+            private static int _Widget_DeviceDefault_TabContent = default;
+            private static bool _Widget_DeviceDefault_TabReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_TabWidget"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_TabWidget { get { if (!_Widget_DeviceDefault_TabWidgetReady) { _Widget_DeviceDefault_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_TabWidget"); _Widget_DeviceDefault_TabWidgetReady = true; } return _Widget_DeviceDefault_TabWidgetContent; } }
+            private static int _Widget_DeviceDefault_TabWidgetContent = default;
+            private static bool _Widget_DeviceDefault_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_TextView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_TextView { get { if (!_Widget_DeviceDefault_TextViewReady) { _Widget_DeviceDefault_TextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_TextView"); _Widget_DeviceDefault_TextViewReady = true; } return _Widget_DeviceDefault_TextViewContent; } }
+            private static int _Widget_DeviceDefault_TextViewContent = default;
+            private static bool _Widget_DeviceDefault_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_TextView_SpinnerItem { get { if (!_Widget_DeviceDefault_TextView_SpinnerItemReady) { _Widget_DeviceDefault_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_TextView_SpinnerItem"); _Widget_DeviceDefault_TextView_SpinnerItemReady = true; } return _Widget_DeviceDefault_TextView_SpinnerItemContent; } }
+            private static int _Widget_DeviceDefault_TextView_SpinnerItemContent = default;
+            private static bool _Widget_DeviceDefault_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_WebTextView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_WebTextView { get { if (!_Widget_DeviceDefault_WebTextViewReady) { _Widget_DeviceDefault_WebTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_WebTextView"); _Widget_DeviceDefault_WebTextViewReady = true; } return _Widget_DeviceDefault_WebTextViewContent; } }
+            private static int _Widget_DeviceDefault_WebTextViewContent = default;
+            private static bool _Widget_DeviceDefault_WebTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DeviceDefault_WebView"/>
+            /// </summary>
+            public static int Widget_DeviceDefault_WebView { get { if (!_Widget_DeviceDefault_WebViewReady) { _Widget_DeviceDefault_WebViewContent = SGetField<int>(LocalBridgeClazz, "Widget_DeviceDefault_WebView"); _Widget_DeviceDefault_WebViewReady = true; } return _Widget_DeviceDefault_WebViewContent; } }
+            private static int _Widget_DeviceDefault_WebViewContent = default;
+            private static bool _Widget_DeviceDefault_WebViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DropDownItem"/>
+            /// </summary>
+            public static int Widget_DropDownItem { get { if (!_Widget_DropDownItemReady) { _Widget_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "Widget_DropDownItem"); _Widget_DropDownItemReady = true; } return _Widget_DropDownItemContent; } }
+            private static int _Widget_DropDownItemContent = default;
+            private static bool _Widget_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_DropDownItem_Spinner"/>
+            /// </summary>
+            public static int Widget_DropDownItem_Spinner { get { if (!_Widget_DropDownItem_SpinnerReady) { _Widget_DropDownItem_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_DropDownItem_Spinner"); _Widget_DropDownItem_SpinnerReady = true; } return _Widget_DropDownItem_SpinnerContent; } }
+            private static int _Widget_DropDownItem_SpinnerContent = default;
+            private static bool _Widget_DropDownItem_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_EditText"/>
+            /// </summary>
+            public static int Widget_EditText { get { if (!_Widget_EditTextReady) { _Widget_EditTextContent = SGetField<int>(LocalBridgeClazz, "Widget_EditText"); _Widget_EditTextReady = true; } return _Widget_EditTextContent; } }
+            private static int _Widget_EditTextContent = default;
+            private static bool _Widget_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ExpandableListView"/>
+            /// </summary>
+            public static int Widget_ExpandableListView { get { if (!_Widget_ExpandableListViewReady) { _Widget_ExpandableListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_ExpandableListView"); _Widget_ExpandableListViewReady = true; } return _Widget_ExpandableListViewContent; } }
+            private static int _Widget_ExpandableListViewContent = default;
+            private static bool _Widget_ExpandableListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_FastScroll"/>
+            /// </summary>
+            public static int Widget_FastScroll { get { if (!_Widget_FastScrollReady) { _Widget_FastScrollContent = SGetField<int>(LocalBridgeClazz, "Widget_FastScroll"); _Widget_FastScrollReady = true; } return _Widget_FastScrollContent; } }
+            private static int _Widget_FastScrollContent = default;
+            private static bool _Widget_FastScrollReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_FragmentBreadCrumbs"/>
+            /// </summary>
+            public static int Widget_FragmentBreadCrumbs { get { if (!_Widget_FragmentBreadCrumbsReady) { _Widget_FragmentBreadCrumbsContent = SGetField<int>(LocalBridgeClazz, "Widget_FragmentBreadCrumbs"); _Widget_FragmentBreadCrumbsReady = true; } return _Widget_FragmentBreadCrumbsContent; } }
+            private static int _Widget_FragmentBreadCrumbsContent = default;
+            private static bool _Widget_FragmentBreadCrumbsReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Gallery"/>
+            /// </summary>
+            public static int Widget_Gallery { get { if (!_Widget_GalleryReady) { _Widget_GalleryContent = SGetField<int>(LocalBridgeClazz, "Widget_Gallery"); _Widget_GalleryReady = true; } return _Widget_GalleryContent; } }
+            private static int _Widget_GalleryContent = default;
+            private static bool _Widget_GalleryReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_GridView"/>
+            /// </summary>
+            public static int Widget_GridView { get { if (!_Widget_GridViewReady) { _Widget_GridViewContent = SGetField<int>(LocalBridgeClazz, "Widget_GridView"); _Widget_GridViewReady = true; } return _Widget_GridViewContent; } }
+            private static int _Widget_GridViewContent = default;
+            private static bool _Widget_GridViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo"/>
+            /// </summary>
+            public static int Widget_Holo { get { if (!_Widget_HoloReady) { _Widget_HoloContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo"); _Widget_HoloReady = true; } return _Widget_HoloContent; } }
+            private static int _Widget_HoloContent = default;
+            private static bool _Widget_HoloReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionBar"/>
+            /// </summary>
+            public static int Widget_Holo_ActionBar { get { if (!_Widget_Holo_ActionBarReady) { _Widget_Holo_ActionBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionBar"); _Widget_Holo_ActionBarReady = true; } return _Widget_Holo_ActionBarContent; } }
+            private static int _Widget_Holo_ActionBarContent = default;
+            private static bool _Widget_Holo_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionBar_Solid"/>
+            /// </summary>
+            public static int Widget_Holo_ActionBar_Solid { get { if (!_Widget_Holo_ActionBar_SolidReady) { _Widget_Holo_ActionBar_SolidContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionBar_Solid"); _Widget_Holo_ActionBar_SolidReady = true; } return _Widget_Holo_ActionBar_SolidContent; } }
+            private static int _Widget_Holo_ActionBar_SolidContent = default;
+            private static bool _Widget_Holo_ActionBar_SolidReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionBar_TabBar"/>
+            /// </summary>
+            public static int Widget_Holo_ActionBar_TabBar { get { if (!_Widget_Holo_ActionBar_TabBarReady) { _Widget_Holo_ActionBar_TabBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionBar_TabBar"); _Widget_Holo_ActionBar_TabBarReady = true; } return _Widget_Holo_ActionBar_TabBarContent; } }
+            private static int _Widget_Holo_ActionBar_TabBarContent = default;
+            private static bool _Widget_Holo_ActionBar_TabBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionBar_TabText"/>
+            /// </summary>
+            public static int Widget_Holo_ActionBar_TabText { get { if (!_Widget_Holo_ActionBar_TabTextReady) { _Widget_Holo_ActionBar_TabTextContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionBar_TabText"); _Widget_Holo_ActionBar_TabTextReady = true; } return _Widget_Holo_ActionBar_TabTextContent; } }
+            private static int _Widget_Holo_ActionBar_TabTextContent = default;
+            private static bool _Widget_Holo_ActionBar_TabTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionBar_TabView"/>
+            /// </summary>
+            public static int Widget_Holo_ActionBar_TabView { get { if (!_Widget_Holo_ActionBar_TabViewReady) { _Widget_Holo_ActionBar_TabViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionBar_TabView"); _Widget_Holo_ActionBar_TabViewReady = true; } return _Widget_Holo_ActionBar_TabViewContent; } }
+            private static int _Widget_Holo_ActionBar_TabViewContent = default;
+            private static bool _Widget_Holo_ActionBar_TabViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionButton"/>
+            /// </summary>
+            public static int Widget_Holo_ActionButton { get { if (!_Widget_Holo_ActionButtonReady) { _Widget_Holo_ActionButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionButton"); _Widget_Holo_ActionButtonReady = true; } return _Widget_Holo_ActionButtonContent; } }
+            private static int _Widget_Holo_ActionButtonContent = default;
+            private static bool _Widget_Holo_ActionButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionButton_CloseMode"/>
+            /// </summary>
+            public static int Widget_Holo_ActionButton_CloseMode { get { if (!_Widget_Holo_ActionButton_CloseModeReady) { _Widget_Holo_ActionButton_CloseModeContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionButton_CloseMode"); _Widget_Holo_ActionButton_CloseModeReady = true; } return _Widget_Holo_ActionButton_CloseModeContent; } }
+            private static int _Widget_Holo_ActionButton_CloseModeContent = default;
+            private static bool _Widget_Holo_ActionButton_CloseModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionButton_Overflow"/>
+            /// </summary>
+            public static int Widget_Holo_ActionButton_Overflow { get { if (!_Widget_Holo_ActionButton_OverflowReady) { _Widget_Holo_ActionButton_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionButton_Overflow"); _Widget_Holo_ActionButton_OverflowReady = true; } return _Widget_Holo_ActionButton_OverflowContent; } }
+            private static int _Widget_Holo_ActionButton_OverflowContent = default;
+            private static bool _Widget_Holo_ActionButton_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionButton_TextButton"/>
+            /// </summary>
+            public static int Widget_Holo_ActionButton_TextButton { get { if (!_Widget_Holo_ActionButton_TextButtonReady) { _Widget_Holo_ActionButton_TextButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionButton_TextButton"); _Widget_Holo_ActionButton_TextButtonReady = true; } return _Widget_Holo_ActionButton_TextButtonContent; } }
+            private static int _Widget_Holo_ActionButton_TextButtonContent = default;
+            private static bool _Widget_Holo_ActionButton_TextButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ActionMode"/>
+            /// </summary>
+            public static int Widget_Holo_ActionMode { get { if (!_Widget_Holo_ActionModeReady) { _Widget_Holo_ActionModeContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ActionMode"); _Widget_Holo_ActionModeReady = true; } return _Widget_Holo_ActionModeContent; } }
+            private static int _Widget_Holo_ActionModeContent = default;
+            private static bool _Widget_Holo_ActionModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_AutoCompleteTextView"/>
+            /// </summary>
+            public static int Widget_Holo_AutoCompleteTextView { get { if (!_Widget_Holo_AutoCompleteTextViewReady) { _Widget_Holo_AutoCompleteTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_AutoCompleteTextView"); _Widget_Holo_AutoCompleteTextViewReady = true; } return _Widget_Holo_AutoCompleteTextViewContent; } }
+            private static int _Widget_Holo_AutoCompleteTextViewContent = default;
+            private static bool _Widget_Holo_AutoCompleteTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Button"/>
+            /// </summary>
+            public static int Widget_Holo_Button { get { if (!_Widget_Holo_ButtonReady) { _Widget_Holo_ButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Button"); _Widget_Holo_ButtonReady = true; } return _Widget_Holo_ButtonContent; } }
+            private static int _Widget_Holo_ButtonContent = default;
+            private static bool _Widget_Holo_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Button_Borderless"/>
+            /// </summary>
+            public static int Widget_Holo_Button_Borderless { get { if (!_Widget_Holo_Button_BorderlessReady) { _Widget_Holo_Button_BorderlessContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Button_Borderless"); _Widget_Holo_Button_BorderlessReady = true; } return _Widget_Holo_Button_BorderlessContent; } }
+            private static int _Widget_Holo_Button_BorderlessContent = default;
+            private static bool _Widget_Holo_Button_BorderlessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Button_Borderless_Small"/>
+            /// </summary>
+            public static int Widget_Holo_Button_Borderless_Small { get { if (!_Widget_Holo_Button_Borderless_SmallReady) { _Widget_Holo_Button_Borderless_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Button_Borderless_Small"); _Widget_Holo_Button_Borderless_SmallReady = true; } return _Widget_Holo_Button_Borderless_SmallContent; } }
+            private static int _Widget_Holo_Button_Borderless_SmallContent = default;
+            private static bool _Widget_Holo_Button_Borderless_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Button_Inset"/>
+            /// </summary>
+            public static int Widget_Holo_Button_Inset { get { if (!_Widget_Holo_Button_InsetReady) { _Widget_Holo_Button_InsetContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Button_Inset"); _Widget_Holo_Button_InsetReady = true; } return _Widget_Holo_Button_InsetContent; } }
+            private static int _Widget_Holo_Button_InsetContent = default;
+            private static bool _Widget_Holo_Button_InsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Button_Small"/>
+            /// </summary>
+            public static int Widget_Holo_Button_Small { get { if (!_Widget_Holo_Button_SmallReady) { _Widget_Holo_Button_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Button_Small"); _Widget_Holo_Button_SmallReady = true; } return _Widget_Holo_Button_SmallContent; } }
+            private static int _Widget_Holo_Button_SmallContent = default;
+            private static bool _Widget_Holo_Button_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Button_Toggle"/>
+            /// </summary>
+            public static int Widget_Holo_Button_Toggle { get { if (!_Widget_Holo_Button_ToggleReady) { _Widget_Holo_Button_ToggleContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Button_Toggle"); _Widget_Holo_Button_ToggleReady = true; } return _Widget_Holo_Button_ToggleContent; } }
+            private static int _Widget_Holo_Button_ToggleContent = default;
+            private static bool _Widget_Holo_Button_ToggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_CalendarView"/>
+            /// </summary>
+            public static int Widget_Holo_CalendarView { get { if (!_Widget_Holo_CalendarViewReady) { _Widget_Holo_CalendarViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_CalendarView"); _Widget_Holo_CalendarViewReady = true; } return _Widget_Holo_CalendarViewContent; } }
+            private static int _Widget_Holo_CalendarViewContent = default;
+            private static bool _Widget_Holo_CalendarViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_CheckedTextView"/>
+            /// </summary>
+            public static int Widget_Holo_CheckedTextView { get { if (!_Widget_Holo_CheckedTextViewReady) { _Widget_Holo_CheckedTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_CheckedTextView"); _Widget_Holo_CheckedTextViewReady = true; } return _Widget_Holo_CheckedTextViewContent; } }
+            private static int _Widget_Holo_CheckedTextViewContent = default;
+            private static bool _Widget_Holo_CheckedTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_CompoundButton_CheckBox"/>
+            /// </summary>
+            public static int Widget_Holo_CompoundButton_CheckBox { get { if (!_Widget_Holo_CompoundButton_CheckBoxReady) { _Widget_Holo_CompoundButton_CheckBoxContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_CompoundButton_CheckBox"); _Widget_Holo_CompoundButton_CheckBoxReady = true; } return _Widget_Holo_CompoundButton_CheckBoxContent; } }
+            private static int _Widget_Holo_CompoundButton_CheckBoxContent = default;
+            private static bool _Widget_Holo_CompoundButton_CheckBoxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_CompoundButton_RadioButton"/>
+            /// </summary>
+            public static int Widget_Holo_CompoundButton_RadioButton { get { if (!_Widget_Holo_CompoundButton_RadioButtonReady) { _Widget_Holo_CompoundButton_RadioButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_CompoundButton_RadioButton"); _Widget_Holo_CompoundButton_RadioButtonReady = true; } return _Widget_Holo_CompoundButton_RadioButtonContent; } }
+            private static int _Widget_Holo_CompoundButton_RadioButtonContent = default;
+            private static bool _Widget_Holo_CompoundButton_RadioButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_CompoundButton_Star"/>
+            /// </summary>
+            public static int Widget_Holo_CompoundButton_Star { get { if (!_Widget_Holo_CompoundButton_StarReady) { _Widget_Holo_CompoundButton_StarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_CompoundButton_Star"); _Widget_Holo_CompoundButton_StarReady = true; } return _Widget_Holo_CompoundButton_StarContent; } }
+            private static int _Widget_Holo_CompoundButton_StarContent = default;
+            private static bool _Widget_Holo_CompoundButton_StarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_DatePicker"/>
+            /// </summary>
+            public static int Widget_Holo_DatePicker { get { if (!_Widget_Holo_DatePickerReady) { _Widget_Holo_DatePickerContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_DatePicker"); _Widget_Holo_DatePickerReady = true; } return _Widget_Holo_DatePickerContent; } }
+            private static int _Widget_Holo_DatePickerContent = default;
+            private static bool _Widget_Holo_DatePickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_DropDownItem"/>
+            /// </summary>
+            public static int Widget_Holo_DropDownItem { get { if (!_Widget_Holo_DropDownItemReady) { _Widget_Holo_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_DropDownItem"); _Widget_Holo_DropDownItemReady = true; } return _Widget_Holo_DropDownItemContent; } }
+            private static int _Widget_Holo_DropDownItemContent = default;
+            private static bool _Widget_Holo_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_DropDownItem_Spinner"/>
+            /// </summary>
+            public static int Widget_Holo_DropDownItem_Spinner { get { if (!_Widget_Holo_DropDownItem_SpinnerReady) { _Widget_Holo_DropDownItem_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_DropDownItem_Spinner"); _Widget_Holo_DropDownItem_SpinnerReady = true; } return _Widget_Holo_DropDownItem_SpinnerContent; } }
+            private static int _Widget_Holo_DropDownItem_SpinnerContent = default;
+            private static bool _Widget_Holo_DropDownItem_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_EditText"/>
+            /// </summary>
+            public static int Widget_Holo_EditText { get { if (!_Widget_Holo_EditTextReady) { _Widget_Holo_EditTextContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_EditText"); _Widget_Holo_EditTextReady = true; } return _Widget_Holo_EditTextContent; } }
+            private static int _Widget_Holo_EditTextContent = default;
+            private static bool _Widget_Holo_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ExpandableListView"/>
+            /// </summary>
+            public static int Widget_Holo_ExpandableListView { get { if (!_Widget_Holo_ExpandableListViewReady) { _Widget_Holo_ExpandableListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ExpandableListView"); _Widget_Holo_ExpandableListViewReady = true; } return _Widget_Holo_ExpandableListViewContent; } }
+            private static int _Widget_Holo_ExpandableListViewContent = default;
+            private static bool _Widget_Holo_ExpandableListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_GridView"/>
+            /// </summary>
+            public static int Widget_Holo_GridView { get { if (!_Widget_Holo_GridViewReady) { _Widget_Holo_GridViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_GridView"); _Widget_Holo_GridViewReady = true; } return _Widget_Holo_GridViewContent; } }
+            private static int _Widget_Holo_GridViewContent = default;
+            private static bool _Widget_Holo_GridViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_HorizontalScrollView"/>
+            /// </summary>
+            public static int Widget_Holo_HorizontalScrollView { get { if (!_Widget_Holo_HorizontalScrollViewReady) { _Widget_Holo_HorizontalScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_HorizontalScrollView"); _Widget_Holo_HorizontalScrollViewReady = true; } return _Widget_Holo_HorizontalScrollViewContent; } }
+            private static int _Widget_Holo_HorizontalScrollViewContent = default;
+            private static bool _Widget_Holo_HorizontalScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ImageButton"/>
+            /// </summary>
+            public static int Widget_Holo_ImageButton { get { if (!_Widget_Holo_ImageButtonReady) { _Widget_Holo_ImageButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ImageButton"); _Widget_Holo_ImageButtonReady = true; } return _Widget_Holo_ImageButtonContent; } }
+            private static int _Widget_Holo_ImageButtonContent = default;
+            private static bool _Widget_Holo_ImageButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light"/>
+            /// </summary>
+            public static int Widget_Holo_Light { get { if (!_Widget_Holo_LightReady) { _Widget_Holo_LightContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light"); _Widget_Holo_LightReady = true; } return _Widget_Holo_LightContent; } }
+            private static int _Widget_Holo_LightContent = default;
+            private static bool _Widget_Holo_LightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar { get { if (!_Widget_Holo_Light_ActionBarReady) { _Widget_Holo_Light_ActionBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar"); _Widget_Holo_Light_ActionBarReady = true; } return _Widget_Holo_Light_ActionBarContent; } }
+            private static int _Widget_Holo_Light_ActionBarContent = default;
+            private static bool _Widget_Holo_Light_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar_Solid"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar_Solid { get { if (!_Widget_Holo_Light_ActionBar_SolidReady) { _Widget_Holo_Light_ActionBar_SolidContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar_Solid"); _Widget_Holo_Light_ActionBar_SolidReady = true; } return _Widget_Holo_Light_ActionBar_SolidContent; } }
+            private static int _Widget_Holo_Light_ActionBar_SolidContent = default;
+            private static bool _Widget_Holo_Light_ActionBar_SolidReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar_Solid_Inverse"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar_Solid_Inverse { get { if (!_Widget_Holo_Light_ActionBar_Solid_InverseReady) { _Widget_Holo_Light_ActionBar_Solid_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar_Solid_Inverse"); _Widget_Holo_Light_ActionBar_Solid_InverseReady = true; } return _Widget_Holo_Light_ActionBar_Solid_InverseContent; } }
+            private static int _Widget_Holo_Light_ActionBar_Solid_InverseContent = default;
+            private static bool _Widget_Holo_Light_ActionBar_Solid_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar_TabBar"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar_TabBar { get { if (!_Widget_Holo_Light_ActionBar_TabBarReady) { _Widget_Holo_Light_ActionBar_TabBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar_TabBar"); _Widget_Holo_Light_ActionBar_TabBarReady = true; } return _Widget_Holo_Light_ActionBar_TabBarContent; } }
+            private static int _Widget_Holo_Light_ActionBar_TabBarContent = default;
+            private static bool _Widget_Holo_Light_ActionBar_TabBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar_TabBar_Inverse"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar_TabBar_Inverse { get { if (!_Widget_Holo_Light_ActionBar_TabBar_InverseReady) { _Widget_Holo_Light_ActionBar_TabBar_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar_TabBar_Inverse"); _Widget_Holo_Light_ActionBar_TabBar_InverseReady = true; } return _Widget_Holo_Light_ActionBar_TabBar_InverseContent; } }
+            private static int _Widget_Holo_Light_ActionBar_TabBar_InverseContent = default;
+            private static bool _Widget_Holo_Light_ActionBar_TabBar_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar_TabText"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar_TabText { get { if (!_Widget_Holo_Light_ActionBar_TabTextReady) { _Widget_Holo_Light_ActionBar_TabTextContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar_TabText"); _Widget_Holo_Light_ActionBar_TabTextReady = true; } return _Widget_Holo_Light_ActionBar_TabTextContent; } }
+            private static int _Widget_Holo_Light_ActionBar_TabTextContent = default;
+            private static bool _Widget_Holo_Light_ActionBar_TabTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar_TabText_Inverse"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar_TabText_Inverse { get { if (!_Widget_Holo_Light_ActionBar_TabText_InverseReady) { _Widget_Holo_Light_ActionBar_TabText_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar_TabText_Inverse"); _Widget_Holo_Light_ActionBar_TabText_InverseReady = true; } return _Widget_Holo_Light_ActionBar_TabText_InverseContent; } }
+            private static int _Widget_Holo_Light_ActionBar_TabText_InverseContent = default;
+            private static bool _Widget_Holo_Light_ActionBar_TabText_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar_TabView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar_TabView { get { if (!_Widget_Holo_Light_ActionBar_TabViewReady) { _Widget_Holo_Light_ActionBar_TabViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar_TabView"); _Widget_Holo_Light_ActionBar_TabViewReady = true; } return _Widget_Holo_Light_ActionBar_TabViewContent; } }
+            private static int _Widget_Holo_Light_ActionBar_TabViewContent = default;
+            private static bool _Widget_Holo_Light_ActionBar_TabViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionBar_TabView_Inverse"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionBar_TabView_Inverse { get { if (!_Widget_Holo_Light_ActionBar_TabView_InverseReady) { _Widget_Holo_Light_ActionBar_TabView_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionBar_TabView_Inverse"); _Widget_Holo_Light_ActionBar_TabView_InverseReady = true; } return _Widget_Holo_Light_ActionBar_TabView_InverseContent; } }
+            private static int _Widget_Holo_Light_ActionBar_TabView_InverseContent = default;
+            private static bool _Widget_Holo_Light_ActionBar_TabView_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionButton"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionButton { get { if (!_Widget_Holo_Light_ActionButtonReady) { _Widget_Holo_Light_ActionButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionButton"); _Widget_Holo_Light_ActionButtonReady = true; } return _Widget_Holo_Light_ActionButtonContent; } }
+            private static int _Widget_Holo_Light_ActionButtonContent = default;
+            private static bool _Widget_Holo_Light_ActionButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionButton_CloseMode"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionButton_CloseMode { get { if (!_Widget_Holo_Light_ActionButton_CloseModeReady) { _Widget_Holo_Light_ActionButton_CloseModeContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionButton_CloseMode"); _Widget_Holo_Light_ActionButton_CloseModeReady = true; } return _Widget_Holo_Light_ActionButton_CloseModeContent; } }
+            private static int _Widget_Holo_Light_ActionButton_CloseModeContent = default;
+            private static bool _Widget_Holo_Light_ActionButton_CloseModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionButton_Overflow"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionButton_Overflow { get { if (!_Widget_Holo_Light_ActionButton_OverflowReady) { _Widget_Holo_Light_ActionButton_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionButton_Overflow"); _Widget_Holo_Light_ActionButton_OverflowReady = true; } return _Widget_Holo_Light_ActionButton_OverflowContent; } }
+            private static int _Widget_Holo_Light_ActionButton_OverflowContent = default;
+            private static bool _Widget_Holo_Light_ActionButton_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionMode"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionMode { get { if (!_Widget_Holo_Light_ActionModeReady) { _Widget_Holo_Light_ActionModeContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionMode"); _Widget_Holo_Light_ActionModeReady = true; } return _Widget_Holo_Light_ActionModeContent; } }
+            private static int _Widget_Holo_Light_ActionModeContent = default;
+            private static bool _Widget_Holo_Light_ActionModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ActionMode_Inverse"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ActionMode_Inverse { get { if (!_Widget_Holo_Light_ActionMode_InverseReady) { _Widget_Holo_Light_ActionMode_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ActionMode_Inverse"); _Widget_Holo_Light_ActionMode_InverseReady = true; } return _Widget_Holo_Light_ActionMode_InverseContent; } }
+            private static int _Widget_Holo_Light_ActionMode_InverseContent = default;
+            private static bool _Widget_Holo_Light_ActionMode_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_AutoCompleteTextView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_AutoCompleteTextView { get { if (!_Widget_Holo_Light_AutoCompleteTextViewReady) { _Widget_Holo_Light_AutoCompleteTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_AutoCompleteTextView"); _Widget_Holo_Light_AutoCompleteTextViewReady = true; } return _Widget_Holo_Light_AutoCompleteTextViewContent; } }
+            private static int _Widget_Holo_Light_AutoCompleteTextViewContent = default;
+            private static bool _Widget_Holo_Light_AutoCompleteTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_Button"/>
+            /// </summary>
+            public static int Widget_Holo_Light_Button { get { if (!_Widget_Holo_Light_ButtonReady) { _Widget_Holo_Light_ButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_Button"); _Widget_Holo_Light_ButtonReady = true; } return _Widget_Holo_Light_ButtonContent; } }
+            private static int _Widget_Holo_Light_ButtonContent = default;
+            private static bool _Widget_Holo_Light_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_Button_Borderless_Small"/>
+            /// </summary>
+            public static int Widget_Holo_Light_Button_Borderless_Small { get { if (!_Widget_Holo_Light_Button_Borderless_SmallReady) { _Widget_Holo_Light_Button_Borderless_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_Button_Borderless_Small"); _Widget_Holo_Light_Button_Borderless_SmallReady = true; } return _Widget_Holo_Light_Button_Borderless_SmallContent; } }
+            private static int _Widget_Holo_Light_Button_Borderless_SmallContent = default;
+            private static bool _Widget_Holo_Light_Button_Borderless_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_Button_Inset"/>
+            /// </summary>
+            public static int Widget_Holo_Light_Button_Inset { get { if (!_Widget_Holo_Light_Button_InsetReady) { _Widget_Holo_Light_Button_InsetContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_Button_Inset"); _Widget_Holo_Light_Button_InsetReady = true; } return _Widget_Holo_Light_Button_InsetContent; } }
+            private static int _Widget_Holo_Light_Button_InsetContent = default;
+            private static bool _Widget_Holo_Light_Button_InsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_Button_Small"/>
+            /// </summary>
+            public static int Widget_Holo_Light_Button_Small { get { if (!_Widget_Holo_Light_Button_SmallReady) { _Widget_Holo_Light_Button_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_Button_Small"); _Widget_Holo_Light_Button_SmallReady = true; } return _Widget_Holo_Light_Button_SmallContent; } }
+            private static int _Widget_Holo_Light_Button_SmallContent = default;
+            private static bool _Widget_Holo_Light_Button_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_Button_Toggle"/>
+            /// </summary>
+            public static int Widget_Holo_Light_Button_Toggle { get { if (!_Widget_Holo_Light_Button_ToggleReady) { _Widget_Holo_Light_Button_ToggleContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_Button_Toggle"); _Widget_Holo_Light_Button_ToggleReady = true; } return _Widget_Holo_Light_Button_ToggleContent; } }
+            private static int _Widget_Holo_Light_Button_ToggleContent = default;
+            private static bool _Widget_Holo_Light_Button_ToggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_CalendarView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_CalendarView { get { if (!_Widget_Holo_Light_CalendarViewReady) { _Widget_Holo_Light_CalendarViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_CalendarView"); _Widget_Holo_Light_CalendarViewReady = true; } return _Widget_Holo_Light_CalendarViewContent; } }
+            private static int _Widget_Holo_Light_CalendarViewContent = default;
+            private static bool _Widget_Holo_Light_CalendarViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_CheckedTextView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_CheckedTextView { get { if (!_Widget_Holo_Light_CheckedTextViewReady) { _Widget_Holo_Light_CheckedTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_CheckedTextView"); _Widget_Holo_Light_CheckedTextViewReady = true; } return _Widget_Holo_Light_CheckedTextViewContent; } }
+            private static int _Widget_Holo_Light_CheckedTextViewContent = default;
+            private static bool _Widget_Holo_Light_CheckedTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_CompoundButton_CheckBox"/>
+            /// </summary>
+            public static int Widget_Holo_Light_CompoundButton_CheckBox { get { if (!_Widget_Holo_Light_CompoundButton_CheckBoxReady) { _Widget_Holo_Light_CompoundButton_CheckBoxContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_CompoundButton_CheckBox"); _Widget_Holo_Light_CompoundButton_CheckBoxReady = true; } return _Widget_Holo_Light_CompoundButton_CheckBoxContent; } }
+            private static int _Widget_Holo_Light_CompoundButton_CheckBoxContent = default;
+            private static bool _Widget_Holo_Light_CompoundButton_CheckBoxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_CompoundButton_RadioButton"/>
+            /// </summary>
+            public static int Widget_Holo_Light_CompoundButton_RadioButton { get { if (!_Widget_Holo_Light_CompoundButton_RadioButtonReady) { _Widget_Holo_Light_CompoundButton_RadioButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_CompoundButton_RadioButton"); _Widget_Holo_Light_CompoundButton_RadioButtonReady = true; } return _Widget_Holo_Light_CompoundButton_RadioButtonContent; } }
+            private static int _Widget_Holo_Light_CompoundButton_RadioButtonContent = default;
+            private static bool _Widget_Holo_Light_CompoundButton_RadioButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_CompoundButton_Star"/>
+            /// </summary>
+            public static int Widget_Holo_Light_CompoundButton_Star { get { if (!_Widget_Holo_Light_CompoundButton_StarReady) { _Widget_Holo_Light_CompoundButton_StarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_CompoundButton_Star"); _Widget_Holo_Light_CompoundButton_StarReady = true; } return _Widget_Holo_Light_CompoundButton_StarContent; } }
+            private static int _Widget_Holo_Light_CompoundButton_StarContent = default;
+            private static bool _Widget_Holo_Light_CompoundButton_StarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_DropDownItem"/>
+            /// </summary>
+            public static int Widget_Holo_Light_DropDownItem { get { if (!_Widget_Holo_Light_DropDownItemReady) { _Widget_Holo_Light_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_DropDownItem"); _Widget_Holo_Light_DropDownItemReady = true; } return _Widget_Holo_Light_DropDownItemContent; } }
+            private static int _Widget_Holo_Light_DropDownItemContent = default;
+            private static bool _Widget_Holo_Light_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_DropDownItem_Spinner"/>
+            /// </summary>
+            public static int Widget_Holo_Light_DropDownItem_Spinner { get { if (!_Widget_Holo_Light_DropDownItem_SpinnerReady) { _Widget_Holo_Light_DropDownItem_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_DropDownItem_Spinner"); _Widget_Holo_Light_DropDownItem_SpinnerReady = true; } return _Widget_Holo_Light_DropDownItem_SpinnerContent; } }
+            private static int _Widget_Holo_Light_DropDownItem_SpinnerContent = default;
+            private static bool _Widget_Holo_Light_DropDownItem_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_EditText"/>
+            /// </summary>
+            public static int Widget_Holo_Light_EditText { get { if (!_Widget_Holo_Light_EditTextReady) { _Widget_Holo_Light_EditTextContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_EditText"); _Widget_Holo_Light_EditTextReady = true; } return _Widget_Holo_Light_EditTextContent; } }
+            private static int _Widget_Holo_Light_EditTextContent = default;
+            private static bool _Widget_Holo_Light_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ExpandableListView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ExpandableListView { get { if (!_Widget_Holo_Light_ExpandableListViewReady) { _Widget_Holo_Light_ExpandableListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ExpandableListView"); _Widget_Holo_Light_ExpandableListViewReady = true; } return _Widget_Holo_Light_ExpandableListViewContent; } }
+            private static int _Widget_Holo_Light_ExpandableListViewContent = default;
+            private static bool _Widget_Holo_Light_ExpandableListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_GridView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_GridView { get { if (!_Widget_Holo_Light_GridViewReady) { _Widget_Holo_Light_GridViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_GridView"); _Widget_Holo_Light_GridViewReady = true; } return _Widget_Holo_Light_GridViewContent; } }
+            private static int _Widget_Holo_Light_GridViewContent = default;
+            private static bool _Widget_Holo_Light_GridViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_HorizontalScrollView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_HorizontalScrollView { get { if (!_Widget_Holo_Light_HorizontalScrollViewReady) { _Widget_Holo_Light_HorizontalScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_HorizontalScrollView"); _Widget_Holo_Light_HorizontalScrollViewReady = true; } return _Widget_Holo_Light_HorizontalScrollViewContent; } }
+            private static int _Widget_Holo_Light_HorizontalScrollViewContent = default;
+            private static bool _Widget_Holo_Light_HorizontalScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ImageButton"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ImageButton { get { if (!_Widget_Holo_Light_ImageButtonReady) { _Widget_Holo_Light_ImageButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ImageButton"); _Widget_Holo_Light_ImageButtonReady = true; } return _Widget_Holo_Light_ImageButtonContent; } }
+            private static int _Widget_Holo_Light_ImageButtonContent = default;
+            private static bool _Widget_Holo_Light_ImageButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ListPopupWindow"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ListPopupWindow { get { if (!_Widget_Holo_Light_ListPopupWindowReady) { _Widget_Holo_Light_ListPopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ListPopupWindow"); _Widget_Holo_Light_ListPopupWindowReady = true; } return _Widget_Holo_Light_ListPopupWindowContent; } }
+            private static int _Widget_Holo_Light_ListPopupWindowContent = default;
+            private static bool _Widget_Holo_Light_ListPopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ListView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ListView { get { if (!_Widget_Holo_Light_ListViewReady) { _Widget_Holo_Light_ListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ListView"); _Widget_Holo_Light_ListViewReady = true; } return _Widget_Holo_Light_ListViewContent; } }
+            private static int _Widget_Holo_Light_ListViewContent = default;
+            private static bool _Widget_Holo_Light_ListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ListView_DropDown"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ListView_DropDown { get { if (!_Widget_Holo_Light_ListView_DropDownReady) { _Widget_Holo_Light_ListView_DropDownContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ListView_DropDown"); _Widget_Holo_Light_ListView_DropDownReady = true; } return _Widget_Holo_Light_ListView_DropDownContent; } }
+            private static int _Widget_Holo_Light_ListView_DropDownContent = default;
+            private static bool _Widget_Holo_Light_ListView_DropDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_MediaRouteButton"/>
+            /// </summary>
+            public static int Widget_Holo_Light_MediaRouteButton { get { if (!_Widget_Holo_Light_MediaRouteButtonReady) { _Widget_Holo_Light_MediaRouteButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_MediaRouteButton"); _Widget_Holo_Light_MediaRouteButtonReady = true; } return _Widget_Holo_Light_MediaRouteButtonContent; } }
+            private static int _Widget_Holo_Light_MediaRouteButtonContent = default;
+            private static bool _Widget_Holo_Light_MediaRouteButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_PopupMenu"/>
+            /// </summary>
+            public static int Widget_Holo_Light_PopupMenu { get { if (!_Widget_Holo_Light_PopupMenuReady) { _Widget_Holo_Light_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_PopupMenu"); _Widget_Holo_Light_PopupMenuReady = true; } return _Widget_Holo_Light_PopupMenuContent; } }
+            private static int _Widget_Holo_Light_PopupMenuContent = default;
+            private static bool _Widget_Holo_Light_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_PopupWindow"/>
+            /// </summary>
+            public static int Widget_Holo_Light_PopupWindow { get { if (!_Widget_Holo_Light_PopupWindowReady) { _Widget_Holo_Light_PopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_PopupWindow"); _Widget_Holo_Light_PopupWindowReady = true; } return _Widget_Holo_Light_PopupWindowContent; } }
+            private static int _Widget_Holo_Light_PopupWindowContent = default;
+            private static bool _Widget_Holo_Light_PopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ProgressBar"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ProgressBar { get { if (!_Widget_Holo_Light_ProgressBarReady) { _Widget_Holo_Light_ProgressBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ProgressBar"); _Widget_Holo_Light_ProgressBarReady = true; } return _Widget_Holo_Light_ProgressBarContent; } }
+            private static int _Widget_Holo_Light_ProgressBarContent = default;
+            private static bool _Widget_Holo_Light_ProgressBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ProgressBar_Horizontal"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ProgressBar_Horizontal { get { if (!_Widget_Holo_Light_ProgressBar_HorizontalReady) { _Widget_Holo_Light_ProgressBar_HorizontalContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ProgressBar_Horizontal"); _Widget_Holo_Light_ProgressBar_HorizontalReady = true; } return _Widget_Holo_Light_ProgressBar_HorizontalContent; } }
+            private static int _Widget_Holo_Light_ProgressBar_HorizontalContent = default;
+            private static bool _Widget_Holo_Light_ProgressBar_HorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ProgressBar_Inverse"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ProgressBar_Inverse { get { if (!_Widget_Holo_Light_ProgressBar_InverseReady) { _Widget_Holo_Light_ProgressBar_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ProgressBar_Inverse"); _Widget_Holo_Light_ProgressBar_InverseReady = true; } return _Widget_Holo_Light_ProgressBar_InverseContent; } }
+            private static int _Widget_Holo_Light_ProgressBar_InverseContent = default;
+            private static bool _Widget_Holo_Light_ProgressBar_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ProgressBar_Large"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ProgressBar_Large { get { if (!_Widget_Holo_Light_ProgressBar_LargeReady) { _Widget_Holo_Light_ProgressBar_LargeContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ProgressBar_Large"); _Widget_Holo_Light_ProgressBar_LargeReady = true; } return _Widget_Holo_Light_ProgressBar_LargeContent; } }
+            private static int _Widget_Holo_Light_ProgressBar_LargeContent = default;
+            private static bool _Widget_Holo_Light_ProgressBar_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ProgressBar_Large_Inverse"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ProgressBar_Large_Inverse { get { if (!_Widget_Holo_Light_ProgressBar_Large_InverseReady) { _Widget_Holo_Light_ProgressBar_Large_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ProgressBar_Large_Inverse"); _Widget_Holo_Light_ProgressBar_Large_InverseReady = true; } return _Widget_Holo_Light_ProgressBar_Large_InverseContent; } }
+            private static int _Widget_Holo_Light_ProgressBar_Large_InverseContent = default;
+            private static bool _Widget_Holo_Light_ProgressBar_Large_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ProgressBar_Small"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ProgressBar_Small { get { if (!_Widget_Holo_Light_ProgressBar_SmallReady) { _Widget_Holo_Light_ProgressBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ProgressBar_Small"); _Widget_Holo_Light_ProgressBar_SmallReady = true; } return _Widget_Holo_Light_ProgressBar_SmallContent; } }
+            private static int _Widget_Holo_Light_ProgressBar_SmallContent = default;
+            private static bool _Widget_Holo_Light_ProgressBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ProgressBar_Small_Inverse"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ProgressBar_Small_Inverse { get { if (!_Widget_Holo_Light_ProgressBar_Small_InverseReady) { _Widget_Holo_Light_ProgressBar_Small_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ProgressBar_Small_Inverse"); _Widget_Holo_Light_ProgressBar_Small_InverseReady = true; } return _Widget_Holo_Light_ProgressBar_Small_InverseContent; } }
+            private static int _Widget_Holo_Light_ProgressBar_Small_InverseContent = default;
+            private static bool _Widget_Holo_Light_ProgressBar_Small_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ProgressBar_Small_Title"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ProgressBar_Small_Title { get { if (!_Widget_Holo_Light_ProgressBar_Small_TitleReady) { _Widget_Holo_Light_ProgressBar_Small_TitleContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ProgressBar_Small_Title"); _Widget_Holo_Light_ProgressBar_Small_TitleReady = true; } return _Widget_Holo_Light_ProgressBar_Small_TitleContent; } }
+            private static int _Widget_Holo_Light_ProgressBar_Small_TitleContent = default;
+            private static bool _Widget_Holo_Light_ProgressBar_Small_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_RatingBar"/>
+            /// </summary>
+            public static int Widget_Holo_Light_RatingBar { get { if (!_Widget_Holo_Light_RatingBarReady) { _Widget_Holo_Light_RatingBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_RatingBar"); _Widget_Holo_Light_RatingBarReady = true; } return _Widget_Holo_Light_RatingBarContent; } }
+            private static int _Widget_Holo_Light_RatingBarContent = default;
+            private static bool _Widget_Holo_Light_RatingBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_RatingBar_Indicator"/>
+            /// </summary>
+            public static int Widget_Holo_Light_RatingBar_Indicator { get { if (!_Widget_Holo_Light_RatingBar_IndicatorReady) { _Widget_Holo_Light_RatingBar_IndicatorContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_RatingBar_Indicator"); _Widget_Holo_Light_RatingBar_IndicatorReady = true; } return _Widget_Holo_Light_RatingBar_IndicatorContent; } }
+            private static int _Widget_Holo_Light_RatingBar_IndicatorContent = default;
+            private static bool _Widget_Holo_Light_RatingBar_IndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_RatingBar_Small"/>
+            /// </summary>
+            public static int Widget_Holo_Light_RatingBar_Small { get { if (!_Widget_Holo_Light_RatingBar_SmallReady) { _Widget_Holo_Light_RatingBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_RatingBar_Small"); _Widget_Holo_Light_RatingBar_SmallReady = true; } return _Widget_Holo_Light_RatingBar_SmallContent; } }
+            private static int _Widget_Holo_Light_RatingBar_SmallContent = default;
+            private static bool _Widget_Holo_Light_RatingBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_ScrollView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_ScrollView { get { if (!_Widget_Holo_Light_ScrollViewReady) { _Widget_Holo_Light_ScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_ScrollView"); _Widget_Holo_Light_ScrollViewReady = true; } return _Widget_Holo_Light_ScrollViewContent; } }
+            private static int _Widget_Holo_Light_ScrollViewContent = default;
+            private static bool _Widget_Holo_Light_ScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_SeekBar"/>
+            /// </summary>
+            public static int Widget_Holo_Light_SeekBar { get { if (!_Widget_Holo_Light_SeekBarReady) { _Widget_Holo_Light_SeekBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_SeekBar"); _Widget_Holo_Light_SeekBarReady = true; } return _Widget_Holo_Light_SeekBarContent; } }
+            private static int _Widget_Holo_Light_SeekBarContent = default;
+            private static bool _Widget_Holo_Light_SeekBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_Spinner"/>
+            /// </summary>
+            public static int Widget_Holo_Light_Spinner { get { if (!_Widget_Holo_Light_SpinnerReady) { _Widget_Holo_Light_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_Spinner"); _Widget_Holo_Light_SpinnerReady = true; } return _Widget_Holo_Light_SpinnerContent; } }
+            private static int _Widget_Holo_Light_SpinnerContent = default;
+            private static bool _Widget_Holo_Light_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_Tab"/>
+            /// </summary>
+            public static int Widget_Holo_Light_Tab { get { if (!_Widget_Holo_Light_TabReady) { _Widget_Holo_Light_TabContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_Tab"); _Widget_Holo_Light_TabReady = true; } return _Widget_Holo_Light_TabContent; } }
+            private static int _Widget_Holo_Light_TabContent = default;
+            private static bool _Widget_Holo_Light_TabReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_TabWidget"/>
+            /// </summary>
+            public static int Widget_Holo_Light_TabWidget { get { if (!_Widget_Holo_Light_TabWidgetReady) { _Widget_Holo_Light_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_TabWidget"); _Widget_Holo_Light_TabWidgetReady = true; } return _Widget_Holo_Light_TabWidgetContent; } }
+            private static int _Widget_Holo_Light_TabWidgetContent = default;
+            private static bool _Widget_Holo_Light_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_TextView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_TextView { get { if (!_Widget_Holo_Light_TextViewReady) { _Widget_Holo_Light_TextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_TextView"); _Widget_Holo_Light_TextViewReady = true; } return _Widget_Holo_Light_TextViewContent; } }
+            private static int _Widget_Holo_Light_TextViewContent = default;
+            private static bool _Widget_Holo_Light_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int Widget_Holo_Light_TextView_SpinnerItem { get { if (!_Widget_Holo_Light_TextView_SpinnerItemReady) { _Widget_Holo_Light_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_TextView_SpinnerItem"); _Widget_Holo_Light_TextView_SpinnerItemReady = true; } return _Widget_Holo_Light_TextView_SpinnerItemContent; } }
+            private static int _Widget_Holo_Light_TextView_SpinnerItemContent = default;
+            private static bool _Widget_Holo_Light_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_WebTextView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_WebTextView { get { if (!_Widget_Holo_Light_WebTextViewReady) { _Widget_Holo_Light_WebTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_WebTextView"); _Widget_Holo_Light_WebTextViewReady = true; } return _Widget_Holo_Light_WebTextViewContent; } }
+            private static int _Widget_Holo_Light_WebTextViewContent = default;
+            private static bool _Widget_Holo_Light_WebTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Light_WebView"/>
+            /// </summary>
+            public static int Widget_Holo_Light_WebView { get { if (!_Widget_Holo_Light_WebViewReady) { _Widget_Holo_Light_WebViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Light_WebView"); _Widget_Holo_Light_WebViewReady = true; } return _Widget_Holo_Light_WebViewContent; } }
+            private static int _Widget_Holo_Light_WebViewContent = default;
+            private static bool _Widget_Holo_Light_WebViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ListPopupWindow"/>
+            /// </summary>
+            public static int Widget_Holo_ListPopupWindow { get { if (!_Widget_Holo_ListPopupWindowReady) { _Widget_Holo_ListPopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ListPopupWindow"); _Widget_Holo_ListPopupWindowReady = true; } return _Widget_Holo_ListPopupWindowContent; } }
+            private static int _Widget_Holo_ListPopupWindowContent = default;
+            private static bool _Widget_Holo_ListPopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ListView"/>
+            /// </summary>
+            public static int Widget_Holo_ListView { get { if (!_Widget_Holo_ListViewReady) { _Widget_Holo_ListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ListView"); _Widget_Holo_ListViewReady = true; } return _Widget_Holo_ListViewContent; } }
+            private static int _Widget_Holo_ListViewContent = default;
+            private static bool _Widget_Holo_ListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ListView_DropDown"/>
+            /// </summary>
+            public static int Widget_Holo_ListView_DropDown { get { if (!_Widget_Holo_ListView_DropDownReady) { _Widget_Holo_ListView_DropDownContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ListView_DropDown"); _Widget_Holo_ListView_DropDownReady = true; } return _Widget_Holo_ListView_DropDownContent; } }
+            private static int _Widget_Holo_ListView_DropDownContent = default;
+            private static bool _Widget_Holo_ListView_DropDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_MediaRouteButton"/>
+            /// </summary>
+            public static int Widget_Holo_MediaRouteButton { get { if (!_Widget_Holo_MediaRouteButtonReady) { _Widget_Holo_MediaRouteButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_MediaRouteButton"); _Widget_Holo_MediaRouteButtonReady = true; } return _Widget_Holo_MediaRouteButtonContent; } }
+            private static int _Widget_Holo_MediaRouteButtonContent = default;
+            private static bool _Widget_Holo_MediaRouteButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_PopupMenu"/>
+            /// </summary>
+            public static int Widget_Holo_PopupMenu { get { if (!_Widget_Holo_PopupMenuReady) { _Widget_Holo_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_PopupMenu"); _Widget_Holo_PopupMenuReady = true; } return _Widget_Holo_PopupMenuContent; } }
+            private static int _Widget_Holo_PopupMenuContent = default;
+            private static bool _Widget_Holo_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_PopupWindow"/>
+            /// </summary>
+            public static int Widget_Holo_PopupWindow { get { if (!_Widget_Holo_PopupWindowReady) { _Widget_Holo_PopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_PopupWindow"); _Widget_Holo_PopupWindowReady = true; } return _Widget_Holo_PopupWindowContent; } }
+            private static int _Widget_Holo_PopupWindowContent = default;
+            private static bool _Widget_Holo_PopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ProgressBar"/>
+            /// </summary>
+            public static int Widget_Holo_ProgressBar { get { if (!_Widget_Holo_ProgressBarReady) { _Widget_Holo_ProgressBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ProgressBar"); _Widget_Holo_ProgressBarReady = true; } return _Widget_Holo_ProgressBarContent; } }
+            private static int _Widget_Holo_ProgressBarContent = default;
+            private static bool _Widget_Holo_ProgressBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ProgressBar_Horizontal"/>
+            /// </summary>
+            public static int Widget_Holo_ProgressBar_Horizontal { get { if (!_Widget_Holo_ProgressBar_HorizontalReady) { _Widget_Holo_ProgressBar_HorizontalContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ProgressBar_Horizontal"); _Widget_Holo_ProgressBar_HorizontalReady = true; } return _Widget_Holo_ProgressBar_HorizontalContent; } }
+            private static int _Widget_Holo_ProgressBar_HorizontalContent = default;
+            private static bool _Widget_Holo_ProgressBar_HorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ProgressBar_Large"/>
+            /// </summary>
+            public static int Widget_Holo_ProgressBar_Large { get { if (!_Widget_Holo_ProgressBar_LargeReady) { _Widget_Holo_ProgressBar_LargeContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ProgressBar_Large"); _Widget_Holo_ProgressBar_LargeReady = true; } return _Widget_Holo_ProgressBar_LargeContent; } }
+            private static int _Widget_Holo_ProgressBar_LargeContent = default;
+            private static bool _Widget_Holo_ProgressBar_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ProgressBar_Small"/>
+            /// </summary>
+            public static int Widget_Holo_ProgressBar_Small { get { if (!_Widget_Holo_ProgressBar_SmallReady) { _Widget_Holo_ProgressBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ProgressBar_Small"); _Widget_Holo_ProgressBar_SmallReady = true; } return _Widget_Holo_ProgressBar_SmallContent; } }
+            private static int _Widget_Holo_ProgressBar_SmallContent = default;
+            private static bool _Widget_Holo_ProgressBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ProgressBar_Small_Title"/>
+            /// </summary>
+            public static int Widget_Holo_ProgressBar_Small_Title { get { if (!_Widget_Holo_ProgressBar_Small_TitleReady) { _Widget_Holo_ProgressBar_Small_TitleContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ProgressBar_Small_Title"); _Widget_Holo_ProgressBar_Small_TitleReady = true; } return _Widget_Holo_ProgressBar_Small_TitleContent; } }
+            private static int _Widget_Holo_ProgressBar_Small_TitleContent = default;
+            private static bool _Widget_Holo_ProgressBar_Small_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_RatingBar"/>
+            /// </summary>
+            public static int Widget_Holo_RatingBar { get { if (!_Widget_Holo_RatingBarReady) { _Widget_Holo_RatingBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_RatingBar"); _Widget_Holo_RatingBarReady = true; } return _Widget_Holo_RatingBarContent; } }
+            private static int _Widget_Holo_RatingBarContent = default;
+            private static bool _Widget_Holo_RatingBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_RatingBar_Indicator"/>
+            /// </summary>
+            public static int Widget_Holo_RatingBar_Indicator { get { if (!_Widget_Holo_RatingBar_IndicatorReady) { _Widget_Holo_RatingBar_IndicatorContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_RatingBar_Indicator"); _Widget_Holo_RatingBar_IndicatorReady = true; } return _Widget_Holo_RatingBar_IndicatorContent; } }
+            private static int _Widget_Holo_RatingBar_IndicatorContent = default;
+            private static bool _Widget_Holo_RatingBar_IndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_RatingBar_Small"/>
+            /// </summary>
+            public static int Widget_Holo_RatingBar_Small { get { if (!_Widget_Holo_RatingBar_SmallReady) { _Widget_Holo_RatingBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_RatingBar_Small"); _Widget_Holo_RatingBar_SmallReady = true; } return _Widget_Holo_RatingBar_SmallContent; } }
+            private static int _Widget_Holo_RatingBar_SmallContent = default;
+            private static bool _Widget_Holo_RatingBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_ScrollView"/>
+            /// </summary>
+            public static int Widget_Holo_ScrollView { get { if (!_Widget_Holo_ScrollViewReady) { _Widget_Holo_ScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_ScrollView"); _Widget_Holo_ScrollViewReady = true; } return _Widget_Holo_ScrollViewContent; } }
+            private static int _Widget_Holo_ScrollViewContent = default;
+            private static bool _Widget_Holo_ScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_SeekBar"/>
+            /// </summary>
+            public static int Widget_Holo_SeekBar { get { if (!_Widget_Holo_SeekBarReady) { _Widget_Holo_SeekBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_SeekBar"); _Widget_Holo_SeekBarReady = true; } return _Widget_Holo_SeekBarContent; } }
+            private static int _Widget_Holo_SeekBarContent = default;
+            private static bool _Widget_Holo_SeekBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Spinner"/>
+            /// </summary>
+            public static int Widget_Holo_Spinner { get { if (!_Widget_Holo_SpinnerReady) { _Widget_Holo_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Spinner"); _Widget_Holo_SpinnerReady = true; } return _Widget_Holo_SpinnerContent; } }
+            private static int _Widget_Holo_SpinnerContent = default;
+            private static bool _Widget_Holo_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_Tab"/>
+            /// </summary>
+            public static int Widget_Holo_Tab { get { if (!_Widget_Holo_TabReady) { _Widget_Holo_TabContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_Tab"); _Widget_Holo_TabReady = true; } return _Widget_Holo_TabContent; } }
+            private static int _Widget_Holo_TabContent = default;
+            private static bool _Widget_Holo_TabReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_TabWidget"/>
+            /// </summary>
+            public static int Widget_Holo_TabWidget { get { if (!_Widget_Holo_TabWidgetReady) { _Widget_Holo_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_TabWidget"); _Widget_Holo_TabWidgetReady = true; } return _Widget_Holo_TabWidgetContent; } }
+            private static int _Widget_Holo_TabWidgetContent = default;
+            private static bool _Widget_Holo_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_TextView"/>
+            /// </summary>
+            public static int Widget_Holo_TextView { get { if (!_Widget_Holo_TextViewReady) { _Widget_Holo_TextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_TextView"); _Widget_Holo_TextViewReady = true; } return _Widget_Holo_TextViewContent; } }
+            private static int _Widget_Holo_TextViewContent = default;
+            private static bool _Widget_Holo_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int Widget_Holo_TextView_SpinnerItem { get { if (!_Widget_Holo_TextView_SpinnerItemReady) { _Widget_Holo_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_TextView_SpinnerItem"); _Widget_Holo_TextView_SpinnerItemReady = true; } return _Widget_Holo_TextView_SpinnerItemContent; } }
+            private static int _Widget_Holo_TextView_SpinnerItemContent = default;
+            private static bool _Widget_Holo_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_WebTextView"/>
+            /// </summary>
+            public static int Widget_Holo_WebTextView { get { if (!_Widget_Holo_WebTextViewReady) { _Widget_Holo_WebTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_WebTextView"); _Widget_Holo_WebTextViewReady = true; } return _Widget_Holo_WebTextViewContent; } }
+            private static int _Widget_Holo_WebTextViewContent = default;
+            private static bool _Widget_Holo_WebTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Holo_WebView"/>
+            /// </summary>
+            public static int Widget_Holo_WebView { get { if (!_Widget_Holo_WebViewReady) { _Widget_Holo_WebViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Holo_WebView"); _Widget_Holo_WebViewReady = true; } return _Widget_Holo_WebViewContent; } }
+            private static int _Widget_Holo_WebViewContent = default;
+            private static bool _Widget_Holo_WebViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ImageButton"/>
+            /// </summary>
+            public static int Widget_ImageButton { get { if (!_Widget_ImageButtonReady) { _Widget_ImageButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_ImageButton"); _Widget_ImageButtonReady = true; } return _Widget_ImageButtonContent; } }
+            private static int _Widget_ImageButtonContent = default;
+            private static bool _Widget_ImageButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ImageWell"/>
+            /// </summary>
+            public static int Widget_ImageWell { get { if (!_Widget_ImageWellReady) { _Widget_ImageWellContent = SGetField<int>(LocalBridgeClazz, "Widget_ImageWell"); _Widget_ImageWellReady = true; } return _Widget_ImageWellContent; } }
+            private static int _Widget_ImageWellContent = default;
+            private static bool _Widget_ImageWellReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_KeyboardView"/>
+            /// </summary>
+            [global::System.Obsolete()]
+            public static int Widget_KeyboardView { get { if (!_Widget_KeyboardViewReady) { _Widget_KeyboardViewContent = SGetField<int>(LocalBridgeClazz, "Widget_KeyboardView"); _Widget_KeyboardViewReady = true; } return _Widget_KeyboardViewContent; } }
+            private static int _Widget_KeyboardViewContent = default;
+            private static bool _Widget_KeyboardViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ListPopupWindow"/>
+            /// </summary>
+            public static int Widget_ListPopupWindow { get { if (!_Widget_ListPopupWindowReady) { _Widget_ListPopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_ListPopupWindow"); _Widget_ListPopupWindowReady = true; } return _Widget_ListPopupWindowContent; } }
+            private static int _Widget_ListPopupWindowContent = default;
+            private static bool _Widget_ListPopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ListView"/>
+            /// </summary>
+            public static int Widget_ListView { get { if (!_Widget_ListViewReady) { _Widget_ListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_ListView"); _Widget_ListViewReady = true; } return _Widget_ListViewContent; } }
+            private static int _Widget_ListViewContent = default;
+            private static bool _Widget_ListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ListView_DropDown"/>
+            /// </summary>
+            public static int Widget_ListView_DropDown { get { if (!_Widget_ListView_DropDownReady) { _Widget_ListView_DropDownContent = SGetField<int>(LocalBridgeClazz, "Widget_ListView_DropDown"); _Widget_ListView_DropDownReady = true; } return _Widget_ListView_DropDownContent; } }
+            private static int _Widget_ListView_DropDownContent = default;
+            private static bool _Widget_ListView_DropDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ListView_Menu"/>
+            /// </summary>
+            public static int Widget_ListView_Menu { get { if (!_Widget_ListView_MenuReady) { _Widget_ListView_MenuContent = SGetField<int>(LocalBridgeClazz, "Widget_ListView_Menu"); _Widget_ListView_MenuReady = true; } return _Widget_ListView_MenuContent; } }
+            private static int _Widget_ListView_MenuContent = default;
+            private static bool _Widget_ListView_MenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ListView_White"/>
+            /// </summary>
+            public static int Widget_ListView_White { get { if (!_Widget_ListView_WhiteReady) { _Widget_ListView_WhiteContent = SGetField<int>(LocalBridgeClazz, "Widget_ListView_White"); _Widget_ListView_WhiteReady = true; } return _Widget_ListView_WhiteContent; } }
+            private static int _Widget_ListView_WhiteContent = default;
+            private static bool _Widget_ListView_WhiteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material"/>
+            /// </summary>
+            public static int Widget_Material { get { if (!_Widget_MaterialReady) { _Widget_MaterialContent = SGetField<int>(LocalBridgeClazz, "Widget_Material"); _Widget_MaterialReady = true; } return _Widget_MaterialContent; } }
+            private static int _Widget_MaterialContent = default;
+            private static bool _Widget_MaterialReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionBar"/>
+            /// </summary>
+            public static int Widget_Material_ActionBar { get { if (!_Widget_Material_ActionBarReady) { _Widget_Material_ActionBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionBar"); _Widget_Material_ActionBarReady = true; } return _Widget_Material_ActionBarContent; } }
+            private static int _Widget_Material_ActionBarContent = default;
+            private static bool _Widget_Material_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionBar_Solid"/>
+            /// </summary>
+            public static int Widget_Material_ActionBar_Solid { get { if (!_Widget_Material_ActionBar_SolidReady) { _Widget_Material_ActionBar_SolidContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionBar_Solid"); _Widget_Material_ActionBar_SolidReady = true; } return _Widget_Material_ActionBar_SolidContent; } }
+            private static int _Widget_Material_ActionBar_SolidContent = default;
+            private static bool _Widget_Material_ActionBar_SolidReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionBar_TabBar"/>
+            /// </summary>
+            public static int Widget_Material_ActionBar_TabBar { get { if (!_Widget_Material_ActionBar_TabBarReady) { _Widget_Material_ActionBar_TabBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionBar_TabBar"); _Widget_Material_ActionBar_TabBarReady = true; } return _Widget_Material_ActionBar_TabBarContent; } }
+            private static int _Widget_Material_ActionBar_TabBarContent = default;
+            private static bool _Widget_Material_ActionBar_TabBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionBar_TabText"/>
+            /// </summary>
+            public static int Widget_Material_ActionBar_TabText { get { if (!_Widget_Material_ActionBar_TabTextReady) { _Widget_Material_ActionBar_TabTextContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionBar_TabText"); _Widget_Material_ActionBar_TabTextReady = true; } return _Widget_Material_ActionBar_TabTextContent; } }
+            private static int _Widget_Material_ActionBar_TabTextContent = default;
+            private static bool _Widget_Material_ActionBar_TabTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionBar_TabView"/>
+            /// </summary>
+            public static int Widget_Material_ActionBar_TabView { get { if (!_Widget_Material_ActionBar_TabViewReady) { _Widget_Material_ActionBar_TabViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionBar_TabView"); _Widget_Material_ActionBar_TabViewReady = true; } return _Widget_Material_ActionBar_TabViewContent; } }
+            private static int _Widget_Material_ActionBar_TabViewContent = default;
+            private static bool _Widget_Material_ActionBar_TabViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionButton"/>
+            /// </summary>
+            public static int Widget_Material_ActionButton { get { if (!_Widget_Material_ActionButtonReady) { _Widget_Material_ActionButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionButton"); _Widget_Material_ActionButtonReady = true; } return _Widget_Material_ActionButtonContent; } }
+            private static int _Widget_Material_ActionButtonContent = default;
+            private static bool _Widget_Material_ActionButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionButton_CloseMode"/>
+            /// </summary>
+            public static int Widget_Material_ActionButton_CloseMode { get { if (!_Widget_Material_ActionButton_CloseModeReady) { _Widget_Material_ActionButton_CloseModeContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionButton_CloseMode"); _Widget_Material_ActionButton_CloseModeReady = true; } return _Widget_Material_ActionButton_CloseModeContent; } }
+            private static int _Widget_Material_ActionButton_CloseModeContent = default;
+            private static bool _Widget_Material_ActionButton_CloseModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionButton_Overflow"/>
+            /// </summary>
+            public static int Widget_Material_ActionButton_Overflow { get { if (!_Widget_Material_ActionButton_OverflowReady) { _Widget_Material_ActionButton_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionButton_Overflow"); _Widget_Material_ActionButton_OverflowReady = true; } return _Widget_Material_ActionButton_OverflowContent; } }
+            private static int _Widget_Material_ActionButton_OverflowContent = default;
+            private static bool _Widget_Material_ActionButton_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ActionMode"/>
+            /// </summary>
+            public static int Widget_Material_ActionMode { get { if (!_Widget_Material_ActionModeReady) { _Widget_Material_ActionModeContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ActionMode"); _Widget_Material_ActionModeReady = true; } return _Widget_Material_ActionModeContent; } }
+            private static int _Widget_Material_ActionModeContent = default;
+            private static bool _Widget_Material_ActionModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_AutoCompleteTextView"/>
+            /// </summary>
+            public static int Widget_Material_AutoCompleteTextView { get { if (!_Widget_Material_AutoCompleteTextViewReady) { _Widget_Material_AutoCompleteTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_AutoCompleteTextView"); _Widget_Material_AutoCompleteTextViewReady = true; } return _Widget_Material_AutoCompleteTextViewContent; } }
+            private static int _Widget_Material_AutoCompleteTextViewContent = default;
+            private static bool _Widget_Material_AutoCompleteTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Button"/>
+            /// </summary>
+            public static int Widget_Material_Button { get { if (!_Widget_Material_ButtonReady) { _Widget_Material_ButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Button"); _Widget_Material_ButtonReady = true; } return _Widget_Material_ButtonContent; } }
+            private static int _Widget_Material_ButtonContent = default;
+            private static bool _Widget_Material_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Button_Borderless"/>
+            /// </summary>
+            public static int Widget_Material_Button_Borderless { get { if (!_Widget_Material_Button_BorderlessReady) { _Widget_Material_Button_BorderlessContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Button_Borderless"); _Widget_Material_Button_BorderlessReady = true; } return _Widget_Material_Button_BorderlessContent; } }
+            private static int _Widget_Material_Button_BorderlessContent = default;
+            private static bool _Widget_Material_Button_BorderlessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Button_Borderless_Colored"/>
+            /// </summary>
+            public static int Widget_Material_Button_Borderless_Colored { get { if (!_Widget_Material_Button_Borderless_ColoredReady) { _Widget_Material_Button_Borderless_ColoredContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Button_Borderless_Colored"); _Widget_Material_Button_Borderless_ColoredReady = true; } return _Widget_Material_Button_Borderless_ColoredContent; } }
+            private static int _Widget_Material_Button_Borderless_ColoredContent = default;
+            private static bool _Widget_Material_Button_Borderless_ColoredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Button_Borderless_Small"/>
+            /// </summary>
+            public static int Widget_Material_Button_Borderless_Small { get { if (!_Widget_Material_Button_Borderless_SmallReady) { _Widget_Material_Button_Borderless_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Button_Borderless_Small"); _Widget_Material_Button_Borderless_SmallReady = true; } return _Widget_Material_Button_Borderless_SmallContent; } }
+            private static int _Widget_Material_Button_Borderless_SmallContent = default;
+            private static bool _Widget_Material_Button_Borderless_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Button_Colored"/>
+            /// </summary>
+            public static int Widget_Material_Button_Colored { get { if (!_Widget_Material_Button_ColoredReady) { _Widget_Material_Button_ColoredContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Button_Colored"); _Widget_Material_Button_ColoredReady = true; } return _Widget_Material_Button_ColoredContent; } }
+            private static int _Widget_Material_Button_ColoredContent = default;
+            private static bool _Widget_Material_Button_ColoredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Button_Inset"/>
+            /// </summary>
+            public static int Widget_Material_Button_Inset { get { if (!_Widget_Material_Button_InsetReady) { _Widget_Material_Button_InsetContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Button_Inset"); _Widget_Material_Button_InsetReady = true; } return _Widget_Material_Button_InsetContent; } }
+            private static int _Widget_Material_Button_InsetContent = default;
+            private static bool _Widget_Material_Button_InsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Button_Small"/>
+            /// </summary>
+            public static int Widget_Material_Button_Small { get { if (!_Widget_Material_Button_SmallReady) { _Widget_Material_Button_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Button_Small"); _Widget_Material_Button_SmallReady = true; } return _Widget_Material_Button_SmallContent; } }
+            private static int _Widget_Material_Button_SmallContent = default;
+            private static bool _Widget_Material_Button_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Button_Toggle"/>
+            /// </summary>
+            public static int Widget_Material_Button_Toggle { get { if (!_Widget_Material_Button_ToggleReady) { _Widget_Material_Button_ToggleContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Button_Toggle"); _Widget_Material_Button_ToggleReady = true; } return _Widget_Material_Button_ToggleContent; } }
+            private static int _Widget_Material_Button_ToggleContent = default;
+            private static bool _Widget_Material_Button_ToggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ButtonBar"/>
+            /// </summary>
+            public static int Widget_Material_ButtonBar { get { if (!_Widget_Material_ButtonBarReady) { _Widget_Material_ButtonBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ButtonBar"); _Widget_Material_ButtonBarReady = true; } return _Widget_Material_ButtonBarContent; } }
+            private static int _Widget_Material_ButtonBarContent = default;
+            private static bool _Widget_Material_ButtonBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ButtonBar_AlertDialog"/>
+            /// </summary>
+            public static int Widget_Material_ButtonBar_AlertDialog { get { if (!_Widget_Material_ButtonBar_AlertDialogReady) { _Widget_Material_ButtonBar_AlertDialogContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ButtonBar_AlertDialog"); _Widget_Material_ButtonBar_AlertDialogReady = true; } return _Widget_Material_ButtonBar_AlertDialogContent; } }
+            private static int _Widget_Material_ButtonBar_AlertDialogContent = default;
+            private static bool _Widget_Material_ButtonBar_AlertDialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_CalendarView"/>
+            /// </summary>
+            public static int Widget_Material_CalendarView { get { if (!_Widget_Material_CalendarViewReady) { _Widget_Material_CalendarViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_CalendarView"); _Widget_Material_CalendarViewReady = true; } return _Widget_Material_CalendarViewContent; } }
+            private static int _Widget_Material_CalendarViewContent = default;
+            private static bool _Widget_Material_CalendarViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_CheckedTextView"/>
+            /// </summary>
+            public static int Widget_Material_CheckedTextView { get { if (!_Widget_Material_CheckedTextViewReady) { _Widget_Material_CheckedTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_CheckedTextView"); _Widget_Material_CheckedTextViewReady = true; } return _Widget_Material_CheckedTextViewContent; } }
+            private static int _Widget_Material_CheckedTextViewContent = default;
+            private static bool _Widget_Material_CheckedTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_CompoundButton_CheckBox"/>
+            /// </summary>
+            public static int Widget_Material_CompoundButton_CheckBox { get { if (!_Widget_Material_CompoundButton_CheckBoxReady) { _Widget_Material_CompoundButton_CheckBoxContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_CompoundButton_CheckBox"); _Widget_Material_CompoundButton_CheckBoxReady = true; } return _Widget_Material_CompoundButton_CheckBoxContent; } }
+            private static int _Widget_Material_CompoundButton_CheckBoxContent = default;
+            private static bool _Widget_Material_CompoundButton_CheckBoxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_CompoundButton_RadioButton"/>
+            /// </summary>
+            public static int Widget_Material_CompoundButton_RadioButton { get { if (!_Widget_Material_CompoundButton_RadioButtonReady) { _Widget_Material_CompoundButton_RadioButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_CompoundButton_RadioButton"); _Widget_Material_CompoundButton_RadioButtonReady = true; } return _Widget_Material_CompoundButton_RadioButtonContent; } }
+            private static int _Widget_Material_CompoundButton_RadioButtonContent = default;
+            private static bool _Widget_Material_CompoundButton_RadioButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_CompoundButton_Star"/>
+            /// </summary>
+            public static int Widget_Material_CompoundButton_Star { get { if (!_Widget_Material_CompoundButton_StarReady) { _Widget_Material_CompoundButton_StarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_CompoundButton_Star"); _Widget_Material_CompoundButton_StarReady = true; } return _Widget_Material_CompoundButton_StarContent; } }
+            private static int _Widget_Material_CompoundButton_StarContent = default;
+            private static bool _Widget_Material_CompoundButton_StarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_CompoundButton_Switch"/>
+            /// </summary>
+            public static int Widget_Material_CompoundButton_Switch { get { if (!_Widget_Material_CompoundButton_SwitchReady) { _Widget_Material_CompoundButton_SwitchContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_CompoundButton_Switch"); _Widget_Material_CompoundButton_SwitchReady = true; } return _Widget_Material_CompoundButton_SwitchContent; } }
+            private static int _Widget_Material_CompoundButton_SwitchContent = default;
+            private static bool _Widget_Material_CompoundButton_SwitchReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_DatePicker"/>
+            /// </summary>
+            public static int Widget_Material_DatePicker { get { if (!_Widget_Material_DatePickerReady) { _Widget_Material_DatePickerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_DatePicker"); _Widget_Material_DatePickerReady = true; } return _Widget_Material_DatePickerContent; } }
+            private static int _Widget_Material_DatePickerContent = default;
+            private static bool _Widget_Material_DatePickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_DropDownItem"/>
+            /// </summary>
+            public static int Widget_Material_DropDownItem { get { if (!_Widget_Material_DropDownItemReady) { _Widget_Material_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_DropDownItem"); _Widget_Material_DropDownItemReady = true; } return _Widget_Material_DropDownItemContent; } }
+            private static int _Widget_Material_DropDownItemContent = default;
+            private static bool _Widget_Material_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_DropDownItem_Spinner"/>
+            /// </summary>
+            public static int Widget_Material_DropDownItem_Spinner { get { if (!_Widget_Material_DropDownItem_SpinnerReady) { _Widget_Material_DropDownItem_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_DropDownItem_Spinner"); _Widget_Material_DropDownItem_SpinnerReady = true; } return _Widget_Material_DropDownItem_SpinnerContent; } }
+            private static int _Widget_Material_DropDownItem_SpinnerContent = default;
+            private static bool _Widget_Material_DropDownItem_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_EditText"/>
+            /// </summary>
+            public static int Widget_Material_EditText { get { if (!_Widget_Material_EditTextReady) { _Widget_Material_EditTextContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_EditText"); _Widget_Material_EditTextReady = true; } return _Widget_Material_EditTextContent; } }
+            private static int _Widget_Material_EditTextContent = default;
+            private static bool _Widget_Material_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ExpandableListView"/>
+            /// </summary>
+            public static int Widget_Material_ExpandableListView { get { if (!_Widget_Material_ExpandableListViewReady) { _Widget_Material_ExpandableListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ExpandableListView"); _Widget_Material_ExpandableListViewReady = true; } return _Widget_Material_ExpandableListViewContent; } }
+            private static int _Widget_Material_ExpandableListViewContent = default;
+            private static bool _Widget_Material_ExpandableListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_FastScroll"/>
+            /// </summary>
+            public static int Widget_Material_FastScroll { get { if (!_Widget_Material_FastScrollReady) { _Widget_Material_FastScrollContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_FastScroll"); _Widget_Material_FastScrollReady = true; } return _Widget_Material_FastScrollContent; } }
+            private static int _Widget_Material_FastScrollContent = default;
+            private static bool _Widget_Material_FastScrollReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_GridView"/>
+            /// </summary>
+            public static int Widget_Material_GridView { get { if (!_Widget_Material_GridViewReady) { _Widget_Material_GridViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_GridView"); _Widget_Material_GridViewReady = true; } return _Widget_Material_GridViewContent; } }
+            private static int _Widget_Material_GridViewContent = default;
+            private static bool _Widget_Material_GridViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_HorizontalScrollView"/>
+            /// </summary>
+            public static int Widget_Material_HorizontalScrollView { get { if (!_Widget_Material_HorizontalScrollViewReady) { _Widget_Material_HorizontalScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_HorizontalScrollView"); _Widget_Material_HorizontalScrollViewReady = true; } return _Widget_Material_HorizontalScrollViewContent; } }
+            private static int _Widget_Material_HorizontalScrollViewContent = default;
+            private static bool _Widget_Material_HorizontalScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ImageButton"/>
+            /// </summary>
+            public static int Widget_Material_ImageButton { get { if (!_Widget_Material_ImageButtonReady) { _Widget_Material_ImageButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ImageButton"); _Widget_Material_ImageButtonReady = true; } return _Widget_Material_ImageButtonContent; } }
+            private static int _Widget_Material_ImageButtonContent = default;
+            private static bool _Widget_Material_ImageButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light"/>
+            /// </summary>
+            public static int Widget_Material_Light { get { if (!_Widget_Material_LightReady) { _Widget_Material_LightContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light"); _Widget_Material_LightReady = true; } return _Widget_Material_LightContent; } }
+            private static int _Widget_Material_LightContent = default;
+            private static bool _Widget_Material_LightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionBar"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionBar { get { if (!_Widget_Material_Light_ActionBarReady) { _Widget_Material_Light_ActionBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionBar"); _Widget_Material_Light_ActionBarReady = true; } return _Widget_Material_Light_ActionBarContent; } }
+            private static int _Widget_Material_Light_ActionBarContent = default;
+            private static bool _Widget_Material_Light_ActionBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionBar_Solid"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionBar_Solid { get { if (!_Widget_Material_Light_ActionBar_SolidReady) { _Widget_Material_Light_ActionBar_SolidContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionBar_Solid"); _Widget_Material_Light_ActionBar_SolidReady = true; } return _Widget_Material_Light_ActionBar_SolidContent; } }
+            private static int _Widget_Material_Light_ActionBar_SolidContent = default;
+            private static bool _Widget_Material_Light_ActionBar_SolidReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionBar_TabBar"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionBar_TabBar { get { if (!_Widget_Material_Light_ActionBar_TabBarReady) { _Widget_Material_Light_ActionBar_TabBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionBar_TabBar"); _Widget_Material_Light_ActionBar_TabBarReady = true; } return _Widget_Material_Light_ActionBar_TabBarContent; } }
+            private static int _Widget_Material_Light_ActionBar_TabBarContent = default;
+            private static bool _Widget_Material_Light_ActionBar_TabBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionBar_TabText"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionBar_TabText { get { if (!_Widget_Material_Light_ActionBar_TabTextReady) { _Widget_Material_Light_ActionBar_TabTextContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionBar_TabText"); _Widget_Material_Light_ActionBar_TabTextReady = true; } return _Widget_Material_Light_ActionBar_TabTextContent; } }
+            private static int _Widget_Material_Light_ActionBar_TabTextContent = default;
+            private static bool _Widget_Material_Light_ActionBar_TabTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionBar_TabView"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionBar_TabView { get { if (!_Widget_Material_Light_ActionBar_TabViewReady) { _Widget_Material_Light_ActionBar_TabViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionBar_TabView"); _Widget_Material_Light_ActionBar_TabViewReady = true; } return _Widget_Material_Light_ActionBar_TabViewContent; } }
+            private static int _Widget_Material_Light_ActionBar_TabViewContent = default;
+            private static bool _Widget_Material_Light_ActionBar_TabViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionButton"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionButton { get { if (!_Widget_Material_Light_ActionButtonReady) { _Widget_Material_Light_ActionButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionButton"); _Widget_Material_Light_ActionButtonReady = true; } return _Widget_Material_Light_ActionButtonContent; } }
+            private static int _Widget_Material_Light_ActionButtonContent = default;
+            private static bool _Widget_Material_Light_ActionButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionButton_CloseMode"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionButton_CloseMode { get { if (!_Widget_Material_Light_ActionButton_CloseModeReady) { _Widget_Material_Light_ActionButton_CloseModeContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionButton_CloseMode"); _Widget_Material_Light_ActionButton_CloseModeReady = true; } return _Widget_Material_Light_ActionButton_CloseModeContent; } }
+            private static int _Widget_Material_Light_ActionButton_CloseModeContent = default;
+            private static bool _Widget_Material_Light_ActionButton_CloseModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionButton_Overflow"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionButton_Overflow { get { if (!_Widget_Material_Light_ActionButton_OverflowReady) { _Widget_Material_Light_ActionButton_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionButton_Overflow"); _Widget_Material_Light_ActionButton_OverflowReady = true; } return _Widget_Material_Light_ActionButton_OverflowContent; } }
+            private static int _Widget_Material_Light_ActionButton_OverflowContent = default;
+            private static bool _Widget_Material_Light_ActionButton_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ActionMode"/>
+            /// </summary>
+            public static int Widget_Material_Light_ActionMode { get { if (!_Widget_Material_Light_ActionModeReady) { _Widget_Material_Light_ActionModeContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ActionMode"); _Widget_Material_Light_ActionModeReady = true; } return _Widget_Material_Light_ActionModeContent; } }
+            private static int _Widget_Material_Light_ActionModeContent = default;
+            private static bool _Widget_Material_Light_ActionModeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_AutoCompleteTextView"/>
+            /// </summary>
+            public static int Widget_Material_Light_AutoCompleteTextView { get { if (!_Widget_Material_Light_AutoCompleteTextViewReady) { _Widget_Material_Light_AutoCompleteTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_AutoCompleteTextView"); _Widget_Material_Light_AutoCompleteTextViewReady = true; } return _Widget_Material_Light_AutoCompleteTextViewContent; } }
+            private static int _Widget_Material_Light_AutoCompleteTextViewContent = default;
+            private static bool _Widget_Material_Light_AutoCompleteTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Button"/>
+            /// </summary>
+            public static int Widget_Material_Light_Button { get { if (!_Widget_Material_Light_ButtonReady) { _Widget_Material_Light_ButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Button"); _Widget_Material_Light_ButtonReady = true; } return _Widget_Material_Light_ButtonContent; } }
+            private static int _Widget_Material_Light_ButtonContent = default;
+            private static bool _Widget_Material_Light_ButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Button_Borderless"/>
+            /// </summary>
+            public static int Widget_Material_Light_Button_Borderless { get { if (!_Widget_Material_Light_Button_BorderlessReady) { _Widget_Material_Light_Button_BorderlessContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Button_Borderless"); _Widget_Material_Light_Button_BorderlessReady = true; } return _Widget_Material_Light_Button_BorderlessContent; } }
+            private static int _Widget_Material_Light_Button_BorderlessContent = default;
+            private static bool _Widget_Material_Light_Button_BorderlessReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Button_Borderless_Colored"/>
+            /// </summary>
+            public static int Widget_Material_Light_Button_Borderless_Colored { get { if (!_Widget_Material_Light_Button_Borderless_ColoredReady) { _Widget_Material_Light_Button_Borderless_ColoredContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Button_Borderless_Colored"); _Widget_Material_Light_Button_Borderless_ColoredReady = true; } return _Widget_Material_Light_Button_Borderless_ColoredContent; } }
+            private static int _Widget_Material_Light_Button_Borderless_ColoredContent = default;
+            private static bool _Widget_Material_Light_Button_Borderless_ColoredReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Button_Borderless_Small"/>
+            /// </summary>
+            public static int Widget_Material_Light_Button_Borderless_Small { get { if (!_Widget_Material_Light_Button_Borderless_SmallReady) { _Widget_Material_Light_Button_Borderless_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Button_Borderless_Small"); _Widget_Material_Light_Button_Borderless_SmallReady = true; } return _Widget_Material_Light_Button_Borderless_SmallContent; } }
+            private static int _Widget_Material_Light_Button_Borderless_SmallContent = default;
+            private static bool _Widget_Material_Light_Button_Borderless_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Button_Inset"/>
+            /// </summary>
+            public static int Widget_Material_Light_Button_Inset { get { if (!_Widget_Material_Light_Button_InsetReady) { _Widget_Material_Light_Button_InsetContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Button_Inset"); _Widget_Material_Light_Button_InsetReady = true; } return _Widget_Material_Light_Button_InsetContent; } }
+            private static int _Widget_Material_Light_Button_InsetContent = default;
+            private static bool _Widget_Material_Light_Button_InsetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Button_Small"/>
+            /// </summary>
+            public static int Widget_Material_Light_Button_Small { get { if (!_Widget_Material_Light_Button_SmallReady) { _Widget_Material_Light_Button_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Button_Small"); _Widget_Material_Light_Button_SmallReady = true; } return _Widget_Material_Light_Button_SmallContent; } }
+            private static int _Widget_Material_Light_Button_SmallContent = default;
+            private static bool _Widget_Material_Light_Button_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Button_Toggle"/>
+            /// </summary>
+            public static int Widget_Material_Light_Button_Toggle { get { if (!_Widget_Material_Light_Button_ToggleReady) { _Widget_Material_Light_Button_ToggleContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Button_Toggle"); _Widget_Material_Light_Button_ToggleReady = true; } return _Widget_Material_Light_Button_ToggleContent; } }
+            private static int _Widget_Material_Light_Button_ToggleContent = default;
+            private static bool _Widget_Material_Light_Button_ToggleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ButtonBar"/>
+            /// </summary>
+            public static int Widget_Material_Light_ButtonBar { get { if (!_Widget_Material_Light_ButtonBarReady) { _Widget_Material_Light_ButtonBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ButtonBar"); _Widget_Material_Light_ButtonBarReady = true; } return _Widget_Material_Light_ButtonBarContent; } }
+            private static int _Widget_Material_Light_ButtonBarContent = default;
+            private static bool _Widget_Material_Light_ButtonBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ButtonBar_AlertDialog"/>
+            /// </summary>
+            public static int Widget_Material_Light_ButtonBar_AlertDialog { get { if (!_Widget_Material_Light_ButtonBar_AlertDialogReady) { _Widget_Material_Light_ButtonBar_AlertDialogContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ButtonBar_AlertDialog"); _Widget_Material_Light_ButtonBar_AlertDialogReady = true; } return _Widget_Material_Light_ButtonBar_AlertDialogContent; } }
+            private static int _Widget_Material_Light_ButtonBar_AlertDialogContent = default;
+            private static bool _Widget_Material_Light_ButtonBar_AlertDialogReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_CalendarView"/>
+            /// </summary>
+            public static int Widget_Material_Light_CalendarView { get { if (!_Widget_Material_Light_CalendarViewReady) { _Widget_Material_Light_CalendarViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_CalendarView"); _Widget_Material_Light_CalendarViewReady = true; } return _Widget_Material_Light_CalendarViewContent; } }
+            private static int _Widget_Material_Light_CalendarViewContent = default;
+            private static bool _Widget_Material_Light_CalendarViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_CheckedTextView"/>
+            /// </summary>
+            public static int Widget_Material_Light_CheckedTextView { get { if (!_Widget_Material_Light_CheckedTextViewReady) { _Widget_Material_Light_CheckedTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_CheckedTextView"); _Widget_Material_Light_CheckedTextViewReady = true; } return _Widget_Material_Light_CheckedTextViewContent; } }
+            private static int _Widget_Material_Light_CheckedTextViewContent = default;
+            private static bool _Widget_Material_Light_CheckedTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_CompoundButton_CheckBox"/>
+            /// </summary>
+            public static int Widget_Material_Light_CompoundButton_CheckBox { get { if (!_Widget_Material_Light_CompoundButton_CheckBoxReady) { _Widget_Material_Light_CompoundButton_CheckBoxContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_CompoundButton_CheckBox"); _Widget_Material_Light_CompoundButton_CheckBoxReady = true; } return _Widget_Material_Light_CompoundButton_CheckBoxContent; } }
+            private static int _Widget_Material_Light_CompoundButton_CheckBoxContent = default;
+            private static bool _Widget_Material_Light_CompoundButton_CheckBoxReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_CompoundButton_RadioButton"/>
+            /// </summary>
+            public static int Widget_Material_Light_CompoundButton_RadioButton { get { if (!_Widget_Material_Light_CompoundButton_RadioButtonReady) { _Widget_Material_Light_CompoundButton_RadioButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_CompoundButton_RadioButton"); _Widget_Material_Light_CompoundButton_RadioButtonReady = true; } return _Widget_Material_Light_CompoundButton_RadioButtonContent; } }
+            private static int _Widget_Material_Light_CompoundButton_RadioButtonContent = default;
+            private static bool _Widget_Material_Light_CompoundButton_RadioButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_CompoundButton_Star"/>
+            /// </summary>
+            public static int Widget_Material_Light_CompoundButton_Star { get { if (!_Widget_Material_Light_CompoundButton_StarReady) { _Widget_Material_Light_CompoundButton_StarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_CompoundButton_Star"); _Widget_Material_Light_CompoundButton_StarReady = true; } return _Widget_Material_Light_CompoundButton_StarContent; } }
+            private static int _Widget_Material_Light_CompoundButton_StarContent = default;
+            private static bool _Widget_Material_Light_CompoundButton_StarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_CompoundButton_Switch"/>
+            /// </summary>
+            public static int Widget_Material_Light_CompoundButton_Switch { get { if (!_Widget_Material_Light_CompoundButton_SwitchReady) { _Widget_Material_Light_CompoundButton_SwitchContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_CompoundButton_Switch"); _Widget_Material_Light_CompoundButton_SwitchReady = true; } return _Widget_Material_Light_CompoundButton_SwitchContent; } }
+            private static int _Widget_Material_Light_CompoundButton_SwitchContent = default;
+            private static bool _Widget_Material_Light_CompoundButton_SwitchReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_DatePicker"/>
+            /// </summary>
+            public static int Widget_Material_Light_DatePicker { get { if (!_Widget_Material_Light_DatePickerReady) { _Widget_Material_Light_DatePickerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_DatePicker"); _Widget_Material_Light_DatePickerReady = true; } return _Widget_Material_Light_DatePickerContent; } }
+            private static int _Widget_Material_Light_DatePickerContent = default;
+            private static bool _Widget_Material_Light_DatePickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_DropDownItem"/>
+            /// </summary>
+            public static int Widget_Material_Light_DropDownItem { get { if (!_Widget_Material_Light_DropDownItemReady) { _Widget_Material_Light_DropDownItemContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_DropDownItem"); _Widget_Material_Light_DropDownItemReady = true; } return _Widget_Material_Light_DropDownItemContent; } }
+            private static int _Widget_Material_Light_DropDownItemContent = default;
+            private static bool _Widget_Material_Light_DropDownItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_DropDownItem_Spinner"/>
+            /// </summary>
+            public static int Widget_Material_Light_DropDownItem_Spinner { get { if (!_Widget_Material_Light_DropDownItem_SpinnerReady) { _Widget_Material_Light_DropDownItem_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_DropDownItem_Spinner"); _Widget_Material_Light_DropDownItem_SpinnerReady = true; } return _Widget_Material_Light_DropDownItem_SpinnerContent; } }
+            private static int _Widget_Material_Light_DropDownItem_SpinnerContent = default;
+            private static bool _Widget_Material_Light_DropDownItem_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_EditText"/>
+            /// </summary>
+            public static int Widget_Material_Light_EditText { get { if (!_Widget_Material_Light_EditTextReady) { _Widget_Material_Light_EditTextContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_EditText"); _Widget_Material_Light_EditTextReady = true; } return _Widget_Material_Light_EditTextContent; } }
+            private static int _Widget_Material_Light_EditTextContent = default;
+            private static bool _Widget_Material_Light_EditTextReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ExpandableListView"/>
+            /// </summary>
+            public static int Widget_Material_Light_ExpandableListView { get { if (!_Widget_Material_Light_ExpandableListViewReady) { _Widget_Material_Light_ExpandableListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ExpandableListView"); _Widget_Material_Light_ExpandableListViewReady = true; } return _Widget_Material_Light_ExpandableListViewContent; } }
+            private static int _Widget_Material_Light_ExpandableListViewContent = default;
+            private static bool _Widget_Material_Light_ExpandableListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_FastScroll"/>
+            /// </summary>
+            public static int Widget_Material_Light_FastScroll { get { if (!_Widget_Material_Light_FastScrollReady) { _Widget_Material_Light_FastScrollContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_FastScroll"); _Widget_Material_Light_FastScrollReady = true; } return _Widget_Material_Light_FastScrollContent; } }
+            private static int _Widget_Material_Light_FastScrollContent = default;
+            private static bool _Widget_Material_Light_FastScrollReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_GridView"/>
+            /// </summary>
+            public static int Widget_Material_Light_GridView { get { if (!_Widget_Material_Light_GridViewReady) { _Widget_Material_Light_GridViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_GridView"); _Widget_Material_Light_GridViewReady = true; } return _Widget_Material_Light_GridViewContent; } }
+            private static int _Widget_Material_Light_GridViewContent = default;
+            private static bool _Widget_Material_Light_GridViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_HorizontalScrollView"/>
+            /// </summary>
+            public static int Widget_Material_Light_HorizontalScrollView { get { if (!_Widget_Material_Light_HorizontalScrollViewReady) { _Widget_Material_Light_HorizontalScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_HorizontalScrollView"); _Widget_Material_Light_HorizontalScrollViewReady = true; } return _Widget_Material_Light_HorizontalScrollViewContent; } }
+            private static int _Widget_Material_Light_HorizontalScrollViewContent = default;
+            private static bool _Widget_Material_Light_HorizontalScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ImageButton"/>
+            /// </summary>
+            public static int Widget_Material_Light_ImageButton { get { if (!_Widget_Material_Light_ImageButtonReady) { _Widget_Material_Light_ImageButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ImageButton"); _Widget_Material_Light_ImageButtonReady = true; } return _Widget_Material_Light_ImageButtonContent; } }
+            private static int _Widget_Material_Light_ImageButtonContent = default;
+            private static bool _Widget_Material_Light_ImageButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ListPopupWindow"/>
+            /// </summary>
+            public static int Widget_Material_Light_ListPopupWindow { get { if (!_Widget_Material_Light_ListPopupWindowReady) { _Widget_Material_Light_ListPopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ListPopupWindow"); _Widget_Material_Light_ListPopupWindowReady = true; } return _Widget_Material_Light_ListPopupWindowContent; } }
+            private static int _Widget_Material_Light_ListPopupWindowContent = default;
+            private static bool _Widget_Material_Light_ListPopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ListView"/>
+            /// </summary>
+            public static int Widget_Material_Light_ListView { get { if (!_Widget_Material_Light_ListViewReady) { _Widget_Material_Light_ListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ListView"); _Widget_Material_Light_ListViewReady = true; } return _Widget_Material_Light_ListViewContent; } }
+            private static int _Widget_Material_Light_ListViewContent = default;
+            private static bool _Widget_Material_Light_ListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ListView_DropDown"/>
+            /// </summary>
+            public static int Widget_Material_Light_ListView_DropDown { get { if (!_Widget_Material_Light_ListView_DropDownReady) { _Widget_Material_Light_ListView_DropDownContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ListView_DropDown"); _Widget_Material_Light_ListView_DropDownReady = true; } return _Widget_Material_Light_ListView_DropDownContent; } }
+            private static int _Widget_Material_Light_ListView_DropDownContent = default;
+            private static bool _Widget_Material_Light_ListView_DropDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_MediaRouteButton"/>
+            /// </summary>
+            public static int Widget_Material_Light_MediaRouteButton { get { if (!_Widget_Material_Light_MediaRouteButtonReady) { _Widget_Material_Light_MediaRouteButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_MediaRouteButton"); _Widget_Material_Light_MediaRouteButtonReady = true; } return _Widget_Material_Light_MediaRouteButtonContent; } }
+            private static int _Widget_Material_Light_MediaRouteButtonContent = default;
+            private static bool _Widget_Material_Light_MediaRouteButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_NumberPicker"/>
+            /// </summary>
+            public static int Widget_Material_Light_NumberPicker { get { if (!_Widget_Material_Light_NumberPickerReady) { _Widget_Material_Light_NumberPickerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_NumberPicker"); _Widget_Material_Light_NumberPickerReady = true; } return _Widget_Material_Light_NumberPickerContent; } }
+            private static int _Widget_Material_Light_NumberPickerContent = default;
+            private static bool _Widget_Material_Light_NumberPickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_PopupMenu"/>
+            /// </summary>
+            public static int Widget_Material_Light_PopupMenu { get { if (!_Widget_Material_Light_PopupMenuReady) { _Widget_Material_Light_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_PopupMenu"); _Widget_Material_Light_PopupMenuReady = true; } return _Widget_Material_Light_PopupMenuContent; } }
+            private static int _Widget_Material_Light_PopupMenuContent = default;
+            private static bool _Widget_Material_Light_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_PopupMenu_Overflow"/>
+            /// </summary>
+            public static int Widget_Material_Light_PopupMenu_Overflow { get { if (!_Widget_Material_Light_PopupMenu_OverflowReady) { _Widget_Material_Light_PopupMenu_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_PopupMenu_Overflow"); _Widget_Material_Light_PopupMenu_OverflowReady = true; } return _Widget_Material_Light_PopupMenu_OverflowContent; } }
+            private static int _Widget_Material_Light_PopupMenu_OverflowContent = default;
+            private static bool _Widget_Material_Light_PopupMenu_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_PopupWindow"/>
+            /// </summary>
+            public static int Widget_Material_Light_PopupWindow { get { if (!_Widget_Material_Light_PopupWindowReady) { _Widget_Material_Light_PopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_PopupWindow"); _Widget_Material_Light_PopupWindowReady = true; } return _Widget_Material_Light_PopupWindowContent; } }
+            private static int _Widget_Material_Light_PopupWindowContent = default;
+            private static bool _Widget_Material_Light_PopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ProgressBar"/>
+            /// </summary>
+            public static int Widget_Material_Light_ProgressBar { get { if (!_Widget_Material_Light_ProgressBarReady) { _Widget_Material_Light_ProgressBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ProgressBar"); _Widget_Material_Light_ProgressBarReady = true; } return _Widget_Material_Light_ProgressBarContent; } }
+            private static int _Widget_Material_Light_ProgressBarContent = default;
+            private static bool _Widget_Material_Light_ProgressBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ProgressBar_Horizontal"/>
+            /// </summary>
+            public static int Widget_Material_Light_ProgressBar_Horizontal { get { if (!_Widget_Material_Light_ProgressBar_HorizontalReady) { _Widget_Material_Light_ProgressBar_HorizontalContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ProgressBar_Horizontal"); _Widget_Material_Light_ProgressBar_HorizontalReady = true; } return _Widget_Material_Light_ProgressBar_HorizontalContent; } }
+            private static int _Widget_Material_Light_ProgressBar_HorizontalContent = default;
+            private static bool _Widget_Material_Light_ProgressBar_HorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ProgressBar_Inverse"/>
+            /// </summary>
+            public static int Widget_Material_Light_ProgressBar_Inverse { get { if (!_Widget_Material_Light_ProgressBar_InverseReady) { _Widget_Material_Light_ProgressBar_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ProgressBar_Inverse"); _Widget_Material_Light_ProgressBar_InverseReady = true; } return _Widget_Material_Light_ProgressBar_InverseContent; } }
+            private static int _Widget_Material_Light_ProgressBar_InverseContent = default;
+            private static bool _Widget_Material_Light_ProgressBar_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ProgressBar_Large"/>
+            /// </summary>
+            public static int Widget_Material_Light_ProgressBar_Large { get { if (!_Widget_Material_Light_ProgressBar_LargeReady) { _Widget_Material_Light_ProgressBar_LargeContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ProgressBar_Large"); _Widget_Material_Light_ProgressBar_LargeReady = true; } return _Widget_Material_Light_ProgressBar_LargeContent; } }
+            private static int _Widget_Material_Light_ProgressBar_LargeContent = default;
+            private static bool _Widget_Material_Light_ProgressBar_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ProgressBar_Large_Inverse"/>
+            /// </summary>
+            public static int Widget_Material_Light_ProgressBar_Large_Inverse { get { if (!_Widget_Material_Light_ProgressBar_Large_InverseReady) { _Widget_Material_Light_ProgressBar_Large_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ProgressBar_Large_Inverse"); _Widget_Material_Light_ProgressBar_Large_InverseReady = true; } return _Widget_Material_Light_ProgressBar_Large_InverseContent; } }
+            private static int _Widget_Material_Light_ProgressBar_Large_InverseContent = default;
+            private static bool _Widget_Material_Light_ProgressBar_Large_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ProgressBar_Small"/>
+            /// </summary>
+            public static int Widget_Material_Light_ProgressBar_Small { get { if (!_Widget_Material_Light_ProgressBar_SmallReady) { _Widget_Material_Light_ProgressBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ProgressBar_Small"); _Widget_Material_Light_ProgressBar_SmallReady = true; } return _Widget_Material_Light_ProgressBar_SmallContent; } }
+            private static int _Widget_Material_Light_ProgressBar_SmallContent = default;
+            private static bool _Widget_Material_Light_ProgressBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ProgressBar_Small_Inverse"/>
+            /// </summary>
+            public static int Widget_Material_Light_ProgressBar_Small_Inverse { get { if (!_Widget_Material_Light_ProgressBar_Small_InverseReady) { _Widget_Material_Light_ProgressBar_Small_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ProgressBar_Small_Inverse"); _Widget_Material_Light_ProgressBar_Small_InverseReady = true; } return _Widget_Material_Light_ProgressBar_Small_InverseContent; } }
+            private static int _Widget_Material_Light_ProgressBar_Small_InverseContent = default;
+            private static bool _Widget_Material_Light_ProgressBar_Small_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ProgressBar_Small_Title"/>
+            /// </summary>
+            public static int Widget_Material_Light_ProgressBar_Small_Title { get { if (!_Widget_Material_Light_ProgressBar_Small_TitleReady) { _Widget_Material_Light_ProgressBar_Small_TitleContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ProgressBar_Small_Title"); _Widget_Material_Light_ProgressBar_Small_TitleReady = true; } return _Widget_Material_Light_ProgressBar_Small_TitleContent; } }
+            private static int _Widget_Material_Light_ProgressBar_Small_TitleContent = default;
+            private static bool _Widget_Material_Light_ProgressBar_Small_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_RatingBar"/>
+            /// </summary>
+            public static int Widget_Material_Light_RatingBar { get { if (!_Widget_Material_Light_RatingBarReady) { _Widget_Material_Light_RatingBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_RatingBar"); _Widget_Material_Light_RatingBarReady = true; } return _Widget_Material_Light_RatingBarContent; } }
+            private static int _Widget_Material_Light_RatingBarContent = default;
+            private static bool _Widget_Material_Light_RatingBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_RatingBar_Indicator"/>
+            /// </summary>
+            public static int Widget_Material_Light_RatingBar_Indicator { get { if (!_Widget_Material_Light_RatingBar_IndicatorReady) { _Widget_Material_Light_RatingBar_IndicatorContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_RatingBar_Indicator"); _Widget_Material_Light_RatingBar_IndicatorReady = true; } return _Widget_Material_Light_RatingBar_IndicatorContent; } }
+            private static int _Widget_Material_Light_RatingBar_IndicatorContent = default;
+            private static bool _Widget_Material_Light_RatingBar_IndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_RatingBar_Small"/>
+            /// </summary>
+            public static int Widget_Material_Light_RatingBar_Small { get { if (!_Widget_Material_Light_RatingBar_SmallReady) { _Widget_Material_Light_RatingBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_RatingBar_Small"); _Widget_Material_Light_RatingBar_SmallReady = true; } return _Widget_Material_Light_RatingBar_SmallContent; } }
+            private static int _Widget_Material_Light_RatingBar_SmallContent = default;
+            private static bool _Widget_Material_Light_RatingBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_ScrollView"/>
+            /// </summary>
+            public static int Widget_Material_Light_ScrollView { get { if (!_Widget_Material_Light_ScrollViewReady) { _Widget_Material_Light_ScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_ScrollView"); _Widget_Material_Light_ScrollViewReady = true; } return _Widget_Material_Light_ScrollViewContent; } }
+            private static int _Widget_Material_Light_ScrollViewContent = default;
+            private static bool _Widget_Material_Light_ScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_SearchView"/>
+            /// </summary>
+            public static int Widget_Material_Light_SearchView { get { if (!_Widget_Material_Light_SearchViewReady) { _Widget_Material_Light_SearchViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_SearchView"); _Widget_Material_Light_SearchViewReady = true; } return _Widget_Material_Light_SearchViewContent; } }
+            private static int _Widget_Material_Light_SearchViewContent = default;
+            private static bool _Widget_Material_Light_SearchViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_SeekBar"/>
+            /// </summary>
+            public static int Widget_Material_Light_SeekBar { get { if (!_Widget_Material_Light_SeekBarReady) { _Widget_Material_Light_SeekBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_SeekBar"); _Widget_Material_Light_SeekBarReady = true; } return _Widget_Material_Light_SeekBarContent; } }
+            private static int _Widget_Material_Light_SeekBarContent = default;
+            private static bool _Widget_Material_Light_SeekBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_SegmentedButton"/>
+            /// </summary>
+            public static int Widget_Material_Light_SegmentedButton { get { if (!_Widget_Material_Light_SegmentedButtonReady) { _Widget_Material_Light_SegmentedButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_SegmentedButton"); _Widget_Material_Light_SegmentedButtonReady = true; } return _Widget_Material_Light_SegmentedButtonContent; } }
+            private static int _Widget_Material_Light_SegmentedButtonContent = default;
+            private static bool _Widget_Material_Light_SegmentedButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Spinner"/>
+            /// </summary>
+            public static int Widget_Material_Light_Spinner { get { if (!_Widget_Material_Light_SpinnerReady) { _Widget_Material_Light_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Spinner"); _Widget_Material_Light_SpinnerReady = true; } return _Widget_Material_Light_SpinnerContent; } }
+            private static int _Widget_Material_Light_SpinnerContent = default;
+            private static bool _Widget_Material_Light_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Spinner_Underlined"/>
+            /// </summary>
+            public static int Widget_Material_Light_Spinner_Underlined { get { if (!_Widget_Material_Light_Spinner_UnderlinedReady) { _Widget_Material_Light_Spinner_UnderlinedContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Spinner_Underlined"); _Widget_Material_Light_Spinner_UnderlinedReady = true; } return _Widget_Material_Light_Spinner_UnderlinedContent; } }
+            private static int _Widget_Material_Light_Spinner_UnderlinedContent = default;
+            private static bool _Widget_Material_Light_Spinner_UnderlinedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_StackView"/>
+            /// </summary>
+            public static int Widget_Material_Light_StackView { get { if (!_Widget_Material_Light_StackViewReady) { _Widget_Material_Light_StackViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_StackView"); _Widget_Material_Light_StackViewReady = true; } return _Widget_Material_Light_StackViewContent; } }
+            private static int _Widget_Material_Light_StackViewContent = default;
+            private static bool _Widget_Material_Light_StackViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_Tab"/>
+            /// </summary>
+            public static int Widget_Material_Light_Tab { get { if (!_Widget_Material_Light_TabReady) { _Widget_Material_Light_TabContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_Tab"); _Widget_Material_Light_TabReady = true; } return _Widget_Material_Light_TabContent; } }
+            private static int _Widget_Material_Light_TabContent = default;
+            private static bool _Widget_Material_Light_TabReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_TabWidget"/>
+            /// </summary>
+            public static int Widget_Material_Light_TabWidget { get { if (!_Widget_Material_Light_TabWidgetReady) { _Widget_Material_Light_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_TabWidget"); _Widget_Material_Light_TabWidgetReady = true; } return _Widget_Material_Light_TabWidgetContent; } }
+            private static int _Widget_Material_Light_TabWidgetContent = default;
+            private static bool _Widget_Material_Light_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_TextView"/>
+            /// </summary>
+            public static int Widget_Material_Light_TextView { get { if (!_Widget_Material_Light_TextViewReady) { _Widget_Material_Light_TextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_TextView"); _Widget_Material_Light_TextViewReady = true; } return _Widget_Material_Light_TextViewContent; } }
+            private static int _Widget_Material_Light_TextViewContent = default;
+            private static bool _Widget_Material_Light_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int Widget_Material_Light_TextView_SpinnerItem { get { if (!_Widget_Material_Light_TextView_SpinnerItemReady) { _Widget_Material_Light_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_TextView_SpinnerItem"); _Widget_Material_Light_TextView_SpinnerItemReady = true; } return _Widget_Material_Light_TextView_SpinnerItemContent; } }
+            private static int _Widget_Material_Light_TextView_SpinnerItemContent = default;
+            private static bool _Widget_Material_Light_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_TimePicker"/>
+            /// </summary>
+            public static int Widget_Material_Light_TimePicker { get { if (!_Widget_Material_Light_TimePickerReady) { _Widget_Material_Light_TimePickerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_TimePicker"); _Widget_Material_Light_TimePickerReady = true; } return _Widget_Material_Light_TimePickerContent; } }
+            private static int _Widget_Material_Light_TimePickerContent = default;
+            private static bool _Widget_Material_Light_TimePickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_WebTextView"/>
+            /// </summary>
+            public static int Widget_Material_Light_WebTextView { get { if (!_Widget_Material_Light_WebTextViewReady) { _Widget_Material_Light_WebTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_WebTextView"); _Widget_Material_Light_WebTextViewReady = true; } return _Widget_Material_Light_WebTextViewContent; } }
+            private static int _Widget_Material_Light_WebTextViewContent = default;
+            private static bool _Widget_Material_Light_WebTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Light_WebView"/>
+            /// </summary>
+            public static int Widget_Material_Light_WebView { get { if (!_Widget_Material_Light_WebViewReady) { _Widget_Material_Light_WebViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Light_WebView"); _Widget_Material_Light_WebViewReady = true; } return _Widget_Material_Light_WebViewContent; } }
+            private static int _Widget_Material_Light_WebViewContent = default;
+            private static bool _Widget_Material_Light_WebViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ListPopupWindow"/>
+            /// </summary>
+            public static int Widget_Material_ListPopupWindow { get { if (!_Widget_Material_ListPopupWindowReady) { _Widget_Material_ListPopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ListPopupWindow"); _Widget_Material_ListPopupWindowReady = true; } return _Widget_Material_ListPopupWindowContent; } }
+            private static int _Widget_Material_ListPopupWindowContent = default;
+            private static bool _Widget_Material_ListPopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ListView"/>
+            /// </summary>
+            public static int Widget_Material_ListView { get { if (!_Widget_Material_ListViewReady) { _Widget_Material_ListViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ListView"); _Widget_Material_ListViewReady = true; } return _Widget_Material_ListViewContent; } }
+            private static int _Widget_Material_ListViewContent = default;
+            private static bool _Widget_Material_ListViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ListView_DropDown"/>
+            /// </summary>
+            public static int Widget_Material_ListView_DropDown { get { if (!_Widget_Material_ListView_DropDownReady) { _Widget_Material_ListView_DropDownContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ListView_DropDown"); _Widget_Material_ListView_DropDownReady = true; } return _Widget_Material_ListView_DropDownContent; } }
+            private static int _Widget_Material_ListView_DropDownContent = default;
+            private static bool _Widget_Material_ListView_DropDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_MediaRouteButton"/>
+            /// </summary>
+            public static int Widget_Material_MediaRouteButton { get { if (!_Widget_Material_MediaRouteButtonReady) { _Widget_Material_MediaRouteButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_MediaRouteButton"); _Widget_Material_MediaRouteButtonReady = true; } return _Widget_Material_MediaRouteButtonContent; } }
+            private static int _Widget_Material_MediaRouteButtonContent = default;
+            private static bool _Widget_Material_MediaRouteButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_NumberPicker"/>
+            /// </summary>
+            public static int Widget_Material_NumberPicker { get { if (!_Widget_Material_NumberPickerReady) { _Widget_Material_NumberPickerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_NumberPicker"); _Widget_Material_NumberPickerReady = true; } return _Widget_Material_NumberPickerContent; } }
+            private static int _Widget_Material_NumberPickerContent = default;
+            private static bool _Widget_Material_NumberPickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_PopupMenu"/>
+            /// </summary>
+            public static int Widget_Material_PopupMenu { get { if (!_Widget_Material_PopupMenuReady) { _Widget_Material_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_PopupMenu"); _Widget_Material_PopupMenuReady = true; } return _Widget_Material_PopupMenuContent; } }
+            private static int _Widget_Material_PopupMenuContent = default;
+            private static bool _Widget_Material_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_PopupMenu_Overflow"/>
+            /// </summary>
+            public static int Widget_Material_PopupMenu_Overflow { get { if (!_Widget_Material_PopupMenu_OverflowReady) { _Widget_Material_PopupMenu_OverflowContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_PopupMenu_Overflow"); _Widget_Material_PopupMenu_OverflowReady = true; } return _Widget_Material_PopupMenu_OverflowContent; } }
+            private static int _Widget_Material_PopupMenu_OverflowContent = default;
+            private static bool _Widget_Material_PopupMenu_OverflowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_PopupWindow"/>
+            /// </summary>
+            public static int Widget_Material_PopupWindow { get { if (!_Widget_Material_PopupWindowReady) { _Widget_Material_PopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_PopupWindow"); _Widget_Material_PopupWindowReady = true; } return _Widget_Material_PopupWindowContent; } }
+            private static int _Widget_Material_PopupWindowContent = default;
+            private static bool _Widget_Material_PopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ProgressBar"/>
+            /// </summary>
+            public static int Widget_Material_ProgressBar { get { if (!_Widget_Material_ProgressBarReady) { _Widget_Material_ProgressBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ProgressBar"); _Widget_Material_ProgressBarReady = true; } return _Widget_Material_ProgressBarContent; } }
+            private static int _Widget_Material_ProgressBarContent = default;
+            private static bool _Widget_Material_ProgressBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ProgressBar_Horizontal"/>
+            /// </summary>
+            public static int Widget_Material_ProgressBar_Horizontal { get { if (!_Widget_Material_ProgressBar_HorizontalReady) { _Widget_Material_ProgressBar_HorizontalContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ProgressBar_Horizontal"); _Widget_Material_ProgressBar_HorizontalReady = true; } return _Widget_Material_ProgressBar_HorizontalContent; } }
+            private static int _Widget_Material_ProgressBar_HorizontalContent = default;
+            private static bool _Widget_Material_ProgressBar_HorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ProgressBar_Large"/>
+            /// </summary>
+            public static int Widget_Material_ProgressBar_Large { get { if (!_Widget_Material_ProgressBar_LargeReady) { _Widget_Material_ProgressBar_LargeContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ProgressBar_Large"); _Widget_Material_ProgressBar_LargeReady = true; } return _Widget_Material_ProgressBar_LargeContent; } }
+            private static int _Widget_Material_ProgressBar_LargeContent = default;
+            private static bool _Widget_Material_ProgressBar_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ProgressBar_Small"/>
+            /// </summary>
+            public static int Widget_Material_ProgressBar_Small { get { if (!_Widget_Material_ProgressBar_SmallReady) { _Widget_Material_ProgressBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ProgressBar_Small"); _Widget_Material_ProgressBar_SmallReady = true; } return _Widget_Material_ProgressBar_SmallContent; } }
+            private static int _Widget_Material_ProgressBar_SmallContent = default;
+            private static bool _Widget_Material_ProgressBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ProgressBar_Small_Title"/>
+            /// </summary>
+            public static int Widget_Material_ProgressBar_Small_Title { get { if (!_Widget_Material_ProgressBar_Small_TitleReady) { _Widget_Material_ProgressBar_Small_TitleContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ProgressBar_Small_Title"); _Widget_Material_ProgressBar_Small_TitleReady = true; } return _Widget_Material_ProgressBar_Small_TitleContent; } }
+            private static int _Widget_Material_ProgressBar_Small_TitleContent = default;
+            private static bool _Widget_Material_ProgressBar_Small_TitleReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_RatingBar"/>
+            /// </summary>
+            public static int Widget_Material_RatingBar { get { if (!_Widget_Material_RatingBarReady) { _Widget_Material_RatingBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_RatingBar"); _Widget_Material_RatingBarReady = true; } return _Widget_Material_RatingBarContent; } }
+            private static int _Widget_Material_RatingBarContent = default;
+            private static bool _Widget_Material_RatingBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_RatingBar_Indicator"/>
+            /// </summary>
+            public static int Widget_Material_RatingBar_Indicator { get { if (!_Widget_Material_RatingBar_IndicatorReady) { _Widget_Material_RatingBar_IndicatorContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_RatingBar_Indicator"); _Widget_Material_RatingBar_IndicatorReady = true; } return _Widget_Material_RatingBar_IndicatorContent; } }
+            private static int _Widget_Material_RatingBar_IndicatorContent = default;
+            private static bool _Widget_Material_RatingBar_IndicatorReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_RatingBar_Small"/>
+            /// </summary>
+            public static int Widget_Material_RatingBar_Small { get { if (!_Widget_Material_RatingBar_SmallReady) { _Widget_Material_RatingBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_RatingBar_Small"); _Widget_Material_RatingBar_SmallReady = true; } return _Widget_Material_RatingBar_SmallContent; } }
+            private static int _Widget_Material_RatingBar_SmallContent = default;
+            private static bool _Widget_Material_RatingBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_ScrollView"/>
+            /// </summary>
+            public static int Widget_Material_ScrollView { get { if (!_Widget_Material_ScrollViewReady) { _Widget_Material_ScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_ScrollView"); _Widget_Material_ScrollViewReady = true; } return _Widget_Material_ScrollViewContent; } }
+            private static int _Widget_Material_ScrollViewContent = default;
+            private static bool _Widget_Material_ScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_SearchView"/>
+            /// </summary>
+            public static int Widget_Material_SearchView { get { if (!_Widget_Material_SearchViewReady) { _Widget_Material_SearchViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_SearchView"); _Widget_Material_SearchViewReady = true; } return _Widget_Material_SearchViewContent; } }
+            private static int _Widget_Material_SearchViewContent = default;
+            private static bool _Widget_Material_SearchViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_SeekBar"/>
+            /// </summary>
+            public static int Widget_Material_SeekBar { get { if (!_Widget_Material_SeekBarReady) { _Widget_Material_SeekBarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_SeekBar"); _Widget_Material_SeekBarReady = true; } return _Widget_Material_SeekBarContent; } }
+            private static int _Widget_Material_SeekBarContent = default;
+            private static bool _Widget_Material_SeekBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_SeekBar_Discrete"/>
+            /// </summary>
+            public static int Widget_Material_SeekBar_Discrete { get { if (!_Widget_Material_SeekBar_DiscreteReady) { _Widget_Material_SeekBar_DiscreteContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_SeekBar_Discrete"); _Widget_Material_SeekBar_DiscreteReady = true; } return _Widget_Material_SeekBar_DiscreteContent; } }
+            private static int _Widget_Material_SeekBar_DiscreteContent = default;
+            private static bool _Widget_Material_SeekBar_DiscreteReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_SegmentedButton"/>
+            /// </summary>
+            public static int Widget_Material_SegmentedButton { get { if (!_Widget_Material_SegmentedButtonReady) { _Widget_Material_SegmentedButtonContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_SegmentedButton"); _Widget_Material_SegmentedButtonReady = true; } return _Widget_Material_SegmentedButtonContent; } }
+            private static int _Widget_Material_SegmentedButtonContent = default;
+            private static bool _Widget_Material_SegmentedButtonReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Spinner"/>
+            /// </summary>
+            public static int Widget_Material_Spinner { get { if (!_Widget_Material_SpinnerReady) { _Widget_Material_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Spinner"); _Widget_Material_SpinnerReady = true; } return _Widget_Material_SpinnerContent; } }
+            private static int _Widget_Material_SpinnerContent = default;
+            private static bool _Widget_Material_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Spinner_Underlined"/>
+            /// </summary>
+            public static int Widget_Material_Spinner_Underlined { get { if (!_Widget_Material_Spinner_UnderlinedReady) { _Widget_Material_Spinner_UnderlinedContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Spinner_Underlined"); _Widget_Material_Spinner_UnderlinedReady = true; } return _Widget_Material_Spinner_UnderlinedContent; } }
+            private static int _Widget_Material_Spinner_UnderlinedContent = default;
+            private static bool _Widget_Material_Spinner_UnderlinedReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_StackView"/>
+            /// </summary>
+            public static int Widget_Material_StackView { get { if (!_Widget_Material_StackViewReady) { _Widget_Material_StackViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_StackView"); _Widget_Material_StackViewReady = true; } return _Widget_Material_StackViewContent; } }
+            private static int _Widget_Material_StackViewContent = default;
+            private static bool _Widget_Material_StackViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Tab"/>
+            /// </summary>
+            public static int Widget_Material_Tab { get { if (!_Widget_Material_TabReady) { _Widget_Material_TabContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Tab"); _Widget_Material_TabReady = true; } return _Widget_Material_TabContent; } }
+            private static int _Widget_Material_TabContent = default;
+            private static bool _Widget_Material_TabReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_TabWidget"/>
+            /// </summary>
+            public static int Widget_Material_TabWidget { get { if (!_Widget_Material_TabWidgetReady) { _Widget_Material_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_TabWidget"); _Widget_Material_TabWidgetReady = true; } return _Widget_Material_TabWidgetContent; } }
+            private static int _Widget_Material_TabWidgetContent = default;
+            private static bool _Widget_Material_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_TextView"/>
+            /// </summary>
+            public static int Widget_Material_TextView { get { if (!_Widget_Material_TextViewReady) { _Widget_Material_TextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_TextView"); _Widget_Material_TextViewReady = true; } return _Widget_Material_TextViewContent; } }
+            private static int _Widget_Material_TextViewContent = default;
+            private static bool _Widget_Material_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int Widget_Material_TextView_SpinnerItem { get { if (!_Widget_Material_TextView_SpinnerItemReady) { _Widget_Material_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_TextView_SpinnerItem"); _Widget_Material_TextView_SpinnerItemReady = true; } return _Widget_Material_TextView_SpinnerItemContent; } }
+            private static int _Widget_Material_TextView_SpinnerItemContent = default;
+            private static bool _Widget_Material_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_TimePicker"/>
+            /// </summary>
+            public static int Widget_Material_TimePicker { get { if (!_Widget_Material_TimePickerReady) { _Widget_Material_TimePickerContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_TimePicker"); _Widget_Material_TimePickerReady = true; } return _Widget_Material_TimePickerContent; } }
+            private static int _Widget_Material_TimePickerContent = default;
+            private static bool _Widget_Material_TimePickerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Toolbar"/>
+            /// </summary>
+            public static int Widget_Material_Toolbar { get { if (!_Widget_Material_ToolbarReady) { _Widget_Material_ToolbarContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Toolbar"); _Widget_Material_ToolbarReady = true; } return _Widget_Material_ToolbarContent; } }
+            private static int _Widget_Material_ToolbarContent = default;
+            private static bool _Widget_Material_ToolbarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_Toolbar_Button_Navigation"/>
+            /// </summary>
+            public static int Widget_Material_Toolbar_Button_Navigation { get { if (!_Widget_Material_Toolbar_Button_NavigationReady) { _Widget_Material_Toolbar_Button_NavigationContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_Toolbar_Button_Navigation"); _Widget_Material_Toolbar_Button_NavigationReady = true; } return _Widget_Material_Toolbar_Button_NavigationContent; } }
+            private static int _Widget_Material_Toolbar_Button_NavigationContent = default;
+            private static bool _Widget_Material_Toolbar_Button_NavigationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_WebTextView"/>
+            /// </summary>
+            public static int Widget_Material_WebTextView { get { if (!_Widget_Material_WebTextViewReady) { _Widget_Material_WebTextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_WebTextView"); _Widget_Material_WebTextViewReady = true; } return _Widget_Material_WebTextViewContent; } }
+            private static int _Widget_Material_WebTextViewContent = default;
+            private static bool _Widget_Material_WebTextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Material_WebView"/>
+            /// </summary>
+            public static int Widget_Material_WebView { get { if (!_Widget_Material_WebViewReady) { _Widget_Material_WebViewContent = SGetField<int>(LocalBridgeClazz, "Widget_Material_WebView"); _Widget_Material_WebViewReady = true; } return _Widget_Material_WebViewContent; } }
+            private static int _Widget_Material_WebViewContent = default;
+            private static bool _Widget_Material_WebViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_PopupMenu"/>
+            /// </summary>
+            public static int Widget_PopupMenu { get { if (!_Widget_PopupMenuReady) { _Widget_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "Widget_PopupMenu"); _Widget_PopupMenuReady = true; } return _Widget_PopupMenuContent; } }
+            private static int _Widget_PopupMenuContent = default;
+            private static bool _Widget_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_PopupWindow"/>
+            /// </summary>
+            public static int Widget_PopupWindow { get { if (!_Widget_PopupWindowReady) { _Widget_PopupWindowContent = SGetField<int>(LocalBridgeClazz, "Widget_PopupWindow"); _Widget_PopupWindowReady = true; } return _Widget_PopupWindowContent; } }
+            private static int _Widget_PopupWindowContent = default;
+            private static bool _Widget_PopupWindowReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ProgressBar"/>
+            /// </summary>
+            public static int Widget_ProgressBar { get { if (!_Widget_ProgressBarReady) { _Widget_ProgressBarContent = SGetField<int>(LocalBridgeClazz, "Widget_ProgressBar"); _Widget_ProgressBarReady = true; } return _Widget_ProgressBarContent; } }
+            private static int _Widget_ProgressBarContent = default;
+            private static bool _Widget_ProgressBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ProgressBar_Horizontal"/>
+            /// </summary>
+            public static int Widget_ProgressBar_Horizontal { get { if (!_Widget_ProgressBar_HorizontalReady) { _Widget_ProgressBar_HorizontalContent = SGetField<int>(LocalBridgeClazz, "Widget_ProgressBar_Horizontal"); _Widget_ProgressBar_HorizontalReady = true; } return _Widget_ProgressBar_HorizontalContent; } }
+            private static int _Widget_ProgressBar_HorizontalContent = default;
+            private static bool _Widget_ProgressBar_HorizontalReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ProgressBar_Inverse"/>
+            /// </summary>
+            public static int Widget_ProgressBar_Inverse { get { if (!_Widget_ProgressBar_InverseReady) { _Widget_ProgressBar_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_ProgressBar_Inverse"); _Widget_ProgressBar_InverseReady = true; } return _Widget_ProgressBar_InverseContent; } }
+            private static int _Widget_ProgressBar_InverseContent = default;
+            private static bool _Widget_ProgressBar_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ProgressBar_Large"/>
+            /// </summary>
+            public static int Widget_ProgressBar_Large { get { if (!_Widget_ProgressBar_LargeReady) { _Widget_ProgressBar_LargeContent = SGetField<int>(LocalBridgeClazz, "Widget_ProgressBar_Large"); _Widget_ProgressBar_LargeReady = true; } return _Widget_ProgressBar_LargeContent; } }
+            private static int _Widget_ProgressBar_LargeContent = default;
+            private static bool _Widget_ProgressBar_LargeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ProgressBar_Large_Inverse"/>
+            /// </summary>
+            public static int Widget_ProgressBar_Large_Inverse { get { if (!_Widget_ProgressBar_Large_InverseReady) { _Widget_ProgressBar_Large_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_ProgressBar_Large_Inverse"); _Widget_ProgressBar_Large_InverseReady = true; } return _Widget_ProgressBar_Large_InverseContent; } }
+            private static int _Widget_ProgressBar_Large_InverseContent = default;
+            private static bool _Widget_ProgressBar_Large_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ProgressBar_Small"/>
+            /// </summary>
+            public static int Widget_ProgressBar_Small { get { if (!_Widget_ProgressBar_SmallReady) { _Widget_ProgressBar_SmallContent = SGetField<int>(LocalBridgeClazz, "Widget_ProgressBar_Small"); _Widget_ProgressBar_SmallReady = true; } return _Widget_ProgressBar_SmallContent; } }
+            private static int _Widget_ProgressBar_SmallContent = default;
+            private static bool _Widget_ProgressBar_SmallReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ProgressBar_Small_Inverse"/>
+            /// </summary>
+            public static int Widget_ProgressBar_Small_Inverse { get { if (!_Widget_ProgressBar_Small_InverseReady) { _Widget_ProgressBar_Small_InverseContent = SGetField<int>(LocalBridgeClazz, "Widget_ProgressBar_Small_Inverse"); _Widget_ProgressBar_Small_InverseReady = true; } return _Widget_ProgressBar_Small_InverseContent; } }
+            private static int _Widget_ProgressBar_Small_InverseContent = default;
+            private static bool _Widget_ProgressBar_Small_InverseReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_RatingBar"/>
+            /// </summary>
+            public static int Widget_RatingBar { get { if (!_Widget_RatingBarReady) { _Widget_RatingBarContent = SGetField<int>(LocalBridgeClazz, "Widget_RatingBar"); _Widget_RatingBarReady = true; } return _Widget_RatingBarContent; } }
+            private static int _Widget_RatingBarContent = default;
+            private static bool _Widget_RatingBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_ScrollView"/>
+            /// </summary>
+            public static int Widget_ScrollView { get { if (!_Widget_ScrollViewReady) { _Widget_ScrollViewContent = SGetField<int>(LocalBridgeClazz, "Widget_ScrollView"); _Widget_ScrollViewReady = true; } return _Widget_ScrollViewContent; } }
+            private static int _Widget_ScrollViewContent = default;
+            private static bool _Widget_ScrollViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_SeekBar"/>
+            /// </summary>
+            public static int Widget_SeekBar { get { if (!_Widget_SeekBarReady) { _Widget_SeekBarContent = SGetField<int>(LocalBridgeClazz, "Widget_SeekBar"); _Widget_SeekBarReady = true; } return _Widget_SeekBarContent; } }
+            private static int _Widget_SeekBarContent = default;
+            private static bool _Widget_SeekBarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Spinner"/>
+            /// </summary>
+            public static int Widget_Spinner { get { if (!_Widget_SpinnerReady) { _Widget_SpinnerContent = SGetField<int>(LocalBridgeClazz, "Widget_Spinner"); _Widget_SpinnerReady = true; } return _Widget_SpinnerContent; } }
+            private static int _Widget_SpinnerContent = default;
+            private static bool _Widget_SpinnerReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Spinner_DropDown"/>
+            /// </summary>
+            public static int Widget_Spinner_DropDown { get { if (!_Widget_Spinner_DropDownReady) { _Widget_Spinner_DropDownContent = SGetField<int>(LocalBridgeClazz, "Widget_Spinner_DropDown"); _Widget_Spinner_DropDownReady = true; } return _Widget_Spinner_DropDownContent; } }
+            private static int _Widget_Spinner_DropDownContent = default;
+            private static bool _Widget_Spinner_DropDownReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_StackView"/>
+            /// </summary>
+            public static int Widget_StackView { get { if (!_Widget_StackViewReady) { _Widget_StackViewContent = SGetField<int>(LocalBridgeClazz, "Widget_StackView"); _Widget_StackViewReady = true; } return _Widget_StackViewContent; } }
+            private static int _Widget_StackViewContent = default;
+            private static bool _Widget_StackViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_TabWidget"/>
+            /// </summary>
+            public static int Widget_TabWidget { get { if (!_Widget_TabWidgetReady) { _Widget_TabWidgetContent = SGetField<int>(LocalBridgeClazz, "Widget_TabWidget"); _Widget_TabWidgetReady = true; } return _Widget_TabWidgetContent; } }
+            private static int _Widget_TabWidgetContent = default;
+            private static bool _Widget_TabWidgetReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_TextView"/>
+            /// </summary>
+            public static int Widget_TextView { get { if (!_Widget_TextViewReady) { _Widget_TextViewContent = SGetField<int>(LocalBridgeClazz, "Widget_TextView"); _Widget_TextViewReady = true; } return _Widget_TextViewContent; } }
+            private static int _Widget_TextViewContent = default;
+            private static bool _Widget_TextViewReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_TextView_PopupMenu"/>
+            /// </summary>
+            public static int Widget_TextView_PopupMenu { get { if (!_Widget_TextView_PopupMenuReady) { _Widget_TextView_PopupMenuContent = SGetField<int>(LocalBridgeClazz, "Widget_TextView_PopupMenu"); _Widget_TextView_PopupMenuReady = true; } return _Widget_TextView_PopupMenuContent; } }
+            private static int _Widget_TextView_PopupMenuContent = default;
+            private static bool _Widget_TextView_PopupMenuReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_TextView_SpinnerItem"/>
+            /// </summary>
+            public static int Widget_TextView_SpinnerItem { get { if (!_Widget_TextView_SpinnerItemReady) { _Widget_TextView_SpinnerItemContent = SGetField<int>(LocalBridgeClazz, "Widget_TextView_SpinnerItem"); _Widget_TextView_SpinnerItemReady = true; } return _Widget_TextView_SpinnerItemContent; } }
+            private static int _Widget_TextView_SpinnerItemContent = default;
+            private static bool _Widget_TextView_SpinnerItemReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Toolbar"/>
+            /// </summary>
+            public static int Widget_Toolbar { get { if (!_Widget_ToolbarReady) { _Widget_ToolbarContent = SGetField<int>(LocalBridgeClazz, "Widget_Toolbar"); _Widget_ToolbarReady = true; } return _Widget_ToolbarContent; } }
+            private static int _Widget_ToolbarContent = default;
+            private static bool _Widget_ToolbarReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_Toolbar_Button_Navigation"/>
+            /// </summary>
+            public static int Widget_Toolbar_Button_Navigation { get { if (!_Widget_Toolbar_Button_NavigationReady) { _Widget_Toolbar_Button_NavigationContent = SGetField<int>(LocalBridgeClazz, "Widget_Toolbar_Button_Navigation"); _Widget_Toolbar_Button_NavigationReady = true; } return _Widget_Toolbar_Button_NavigationContent; } }
+            private static int _Widget_Toolbar_Button_NavigationContent = default;
+            private static bool _Widget_Toolbar_Button_NavigationReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.style.html#Widget_WebView"/>
+            /// </summary>
+            public static int Widget_WebView { get { if (!_Widget_WebViewReady) { _Widget_WebViewContent = SGetField<int>(LocalBridgeClazz, "Widget_WebView"); _Widget_WebViewReady = true; } return _Widget_WebViewContent; } }
+            private static int _Widget_WebViewContent = default;
+            private static bool _Widget_WebViewReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region transition
+        public partial class transition
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.transition.html#explode"/>
+            /// </summary>
+            public static int explode { get { if (!_explodeReady) { _explodeContent = SGetField<int>(LocalBridgeClazz, "explode"); _explodeReady = true; } return _explodeContent; } }
+            private static int _explodeContent = default;
+            private static bool _explodeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.transition.html#fade"/>
+            /// </summary>
+            public static int fade { get { if (!_fadeReady) { _fadeContent = SGetField<int>(LocalBridgeClazz, "fade"); _fadeReady = true; } return _fadeContent; } }
+            private static int _fadeContent = default;
+            private static bool _fadeReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.transition.html#move"/>
+            /// </summary>
+            public static int move { get { if (!_moveReady) { _moveContent = SGetField<int>(LocalBridgeClazz, "move"); _moveReady = true; } return _moveContent; } }
+            private static int _moveContent = default;
+            private static bool _moveReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.transition.html#no_transition"/>
+            /// </summary>
+            public static int no_transition { get { if (!_no_transitionReady) { _no_transitionContent = SGetField<int>(LocalBridgeClazz, "no_transition"); _no_transitionReady = true; } return _no_transitionContent; } }
+            private static int _no_transitionContent = default;
+            private static bool _no_transitionReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.transition.html#slide_bottom"/>
+            /// </summary>
+            public static int slide_bottom { get { if (!_slide_bottomReady) { _slide_bottomContent = SGetField<int>(LocalBridgeClazz, "slide_bottom"); _slide_bottomReady = true; } return _slide_bottomContent; } }
+            private static int _slide_bottomContent = default;
+            private static bool _slide_bottomReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.transition.html#slide_left"/>
+            /// </summary>
+            public static int slide_left { get { if (!_slide_leftReady) { _slide_leftContent = SGetField<int>(LocalBridgeClazz, "slide_left"); _slide_leftReady = true; } return _slide_leftContent; } }
+            private static int _slide_leftContent = default;
+            private static bool _slide_leftReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.transition.html#slide_right"/>
+            /// </summary>
+            public static int slide_right { get { if (!_slide_rightReady) { _slide_rightContent = SGetField<int>(LocalBridgeClazz, "slide_right"); _slide_rightReady = true; } return _slide_rightContent; } }
+            private static int _slide_rightContent = default;
+            private static bool _slide_rightReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/R.transition.html#slide_top"/>
+            /// </summary>
+            public static int slide_top { get { if (!_slide_topReady) { _slide_topContent = SGetField<int>(LocalBridgeClazz, "slide_top"); _slide_topReady = true; } return _slide_topContent; } }
+            private static int _slide_topContent = default;
+            private static bool _slide_topReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region xml
+        public partial class xml
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+    
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Renderscript/AllPackageClasses.cs
index 464c3fcf8..24e1c9e22 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Renderscript
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Allocation : Android.Renderscript.BaseObj
     {
         const string _bridgeClassName = "android.renderscript.Allocation";
@@ -71,7 +71,7 @@ public Allocation(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.MipmapControl.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class MipmapControl : Java.Lang.Enum<Android.Renderscript.Allocation.MipmapControl>
         {
             const string _bridgeClassName = "android.renderscript.Allocation$MipmapControl";
@@ -116,7 +116,7 @@ public MipmapControl(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.OnBufferAvailableListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnBufferAvailableListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -124,10 +124,13 @@ public partial class OnBufferAvailableListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnBufferAvailableListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.renderscript.Allocation_OnBufferAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.renderscript.OnBufferAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -149,10 +152,13 @@ public partial class OnBufferAvailableListenerDirect : OnBufferAvailableListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.renderscript.Allocation$OnBufferAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.renderscript.Allocation$OnBufferAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -180,39 +186,25 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html"/>
     /// </summary>
-    [System.Obsolete()]
-    public partial class AllocationAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    [global::System.Obsolete()]
+    public partial class AllocationAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AllocationAdapter>
     {
+        const string _bridgeClassName = "android.renderscript.AllocationAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public AllocationAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region AllocationAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="AllocationAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class AllocationAdapterDirect : AllocationAdapter
-    {
+        public AllocationAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public AllocationAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.renderscript.AllocationAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -229,6 +221,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -236,7 +231,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class BaseObj : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BaseObj>
     {
         const string _bridgeClassName = "android.renderscript.BaseObj";
@@ -281,7 +276,7 @@ public BaseObj(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Byte2.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Byte2 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Byte2>
     {
         const string _bridgeClassName = "android.renderscript.Byte2";
@@ -326,7 +321,7 @@ public Byte2(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Byte3.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Byte3 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Byte3>
     {
         const string _bridgeClassName = "android.renderscript.Byte3";
@@ -371,7 +366,7 @@ public Byte3(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Byte4.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Byte4 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Byte4>
     {
         const string _bridgeClassName = "android.renderscript.Byte4";
@@ -416,7 +411,7 @@ public Byte4(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Double2.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Double2 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Double2>
     {
         const string _bridgeClassName = "android.renderscript.Double2";
@@ -461,7 +456,7 @@ public Double2(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Double3.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Double3 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Double3>
     {
         const string _bridgeClassName = "android.renderscript.Double3";
@@ -506,7 +501,7 @@ public Double3(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Double4.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Double4 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Double4>
     {
         const string _bridgeClassName = "android.renderscript.Double4";
@@ -551,7 +546,7 @@ public Double4(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Element.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Element : Android.Renderscript.BaseObj
     {
         const string _bridgeClassName = "android.renderscript.Element";
@@ -592,7 +587,7 @@ public Element(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Element.Builder.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
             const string _bridgeClassName = "android.renderscript.Element$Builder";
@@ -637,7 +632,7 @@ public Builder(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class DataKind : Java.Lang.Enum<Android.Renderscript.Element.DataKind>
         {
             const string _bridgeClassName = "android.renderscript.Element$DataKind";
@@ -682,7 +677,7 @@ public DataKind(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class DataType : Java.Lang.Enum<Android.Renderscript.Element.DataType>
         {
             const string _bridgeClassName = "android.renderscript.Element$DataType";
@@ -731,7 +726,7 @@ public DataType(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FieldPacker : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FieldPacker>
     {
         const string _bridgeClassName = "android.renderscript.FieldPacker";
@@ -776,7 +771,7 @@ public FieldPacker(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Float2.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Float2 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Float2>
     {
         const string _bridgeClassName = "android.renderscript.Float2";
@@ -821,7 +816,7 @@ public Float2(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Float3.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Float3 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Float3>
     {
         const string _bridgeClassName = "android.renderscript.Float3";
@@ -866,7 +861,7 @@ public Float3(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Float4.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Float4 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Float4>
     {
         const string _bridgeClassName = "android.renderscript.Float4";
@@ -911,7 +906,7 @@ public Float4(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Int2.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Int2 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Int2>
     {
         const string _bridgeClassName = "android.renderscript.Int2";
@@ -956,7 +951,7 @@ public Int2(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Int3.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Int3 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Int3>
     {
         const string _bridgeClassName = "android.renderscript.Int3";
@@ -1001,7 +996,7 @@ public Int3(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Int4.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Int4 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Int4>
     {
         const string _bridgeClassName = "android.renderscript.Int4";
@@ -1046,7 +1041,7 @@ public Int4(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Long2.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Long2 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Long2>
     {
         const string _bridgeClassName = "android.renderscript.Long2";
@@ -1091,7 +1086,7 @@ public Long2(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Long3.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Long3 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Long3>
     {
         const string _bridgeClassName = "android.renderscript.Long3";
@@ -1136,7 +1131,7 @@ public Long3(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Long4.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Long4 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Long4>
     {
         const string _bridgeClassName = "android.renderscript.Long4";
@@ -1181,7 +1176,7 @@ public Long4(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Matrix2f : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Matrix2f>
     {
         const string _bridgeClassName = "android.renderscript.Matrix2f";
@@ -1226,7 +1221,7 @@ public Matrix2f(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Matrix3f : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Matrix3f>
     {
         const string _bridgeClassName = "android.renderscript.Matrix3f";
@@ -1271,7 +1266,7 @@ public Matrix3f(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Matrix4f : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Matrix4f>
     {
         const string _bridgeClassName = "android.renderscript.Matrix4f";
@@ -1316,7 +1311,7 @@ public Matrix4f(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RenderScript : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RenderScript>
     {
         const string _bridgeClassName = "android.renderscript.RenderScript";
@@ -1357,7 +1352,7 @@ public RenderScript(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.ContextType.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class ContextType : Java.Lang.Enum<Android.Renderscript.RenderScript.ContextType>
         {
             const string _bridgeClassName = "android.renderscript.RenderScript$ContextType";
@@ -1402,7 +1397,7 @@ public ContextType(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.Priority.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Priority : Java.Lang.Enum<Android.Renderscript.RenderScript.Priority>
         {
             const string _bridgeClassName = "android.renderscript.RenderScript$Priority";
@@ -1447,7 +1442,7 @@ public Priority(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.RSErrorHandler.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class RSErrorHandler : Java.Lang.Runnable
         {
             const string _bridgeClassName = "android.renderscript.RenderScript$RSErrorHandler";
@@ -1492,7 +1487,7 @@ public RSErrorHandler(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.RSMessageHandler.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class RSMessageHandler : Java.Lang.Runnable
         {
             const string _bridgeClassName = "android.renderscript.RenderScript$RSMessageHandler";
@@ -1541,7 +1536,7 @@ public RSMessageHandler(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/RSDriverException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RSDriverException : Android.Renderscript.RSRuntimeException
     {
         const string _bridgeClassName = "android.renderscript.RSDriverException";
@@ -1559,7 +1554,7 @@ public partial class RSDriverException : Android.Renderscript.RSRuntimeException
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/RSIllegalArgumentException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RSIllegalArgumentException : Android.Renderscript.RSRuntimeException
     {
         const string _bridgeClassName = "android.renderscript.RSIllegalArgumentException";
@@ -1577,7 +1572,7 @@ public partial class RSIllegalArgumentException : Android.Renderscript.RSRuntime
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/RSInvalidStateException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RSInvalidStateException : Android.Renderscript.RSRuntimeException
     {
         const string _bridgeClassName = "android.renderscript.RSInvalidStateException";
@@ -1595,7 +1590,7 @@ public partial class RSInvalidStateException : Android.Renderscript.RSRuntimeExc
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/RSRuntimeException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class RSRuntimeException : Java.Lang.RuntimeException
     {
         const string _bridgeClassName = "android.renderscript.RSRuntimeException";
@@ -1613,7 +1608,7 @@ public partial class RSRuntimeException : Java.Lang.RuntimeException
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Sampler : Android.Renderscript.BaseObj
     {
         const string _bridgeClassName = "android.renderscript.Sampler";
@@ -1654,7 +1649,7 @@ public Sampler(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Builder.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
             const string _bridgeClassName = "android.renderscript.Sampler$Builder";
@@ -1699,7 +1694,7 @@ public Builder(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Value.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Value : Java.Lang.Enum<Android.Renderscript.Sampler.Value>
         {
             const string _bridgeClassName = "android.renderscript.Sampler$Value";
@@ -1748,7 +1743,7 @@ public Value(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Script.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Script : Android.Renderscript.BaseObj
     {
         const string _bridgeClassName = "android.renderscript.Script";
@@ -1789,7 +1784,7 @@ public Script(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Script.Builder.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
             const string _bridgeClassName = "android.renderscript.Script$Builder";
@@ -1834,7 +1829,7 @@ public Builder(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldBase.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class FieldBase : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FieldBase>
         {
             const string _bridgeClassName = "android.renderscript.Script$FieldBase";
@@ -1879,7 +1874,7 @@ public FieldBase(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldID.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class FieldID : Android.Renderscript.BaseObj
         {
             const string _bridgeClassName = "android.renderscript.Script$FieldID";
@@ -1924,7 +1919,7 @@ public FieldID(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Script.InvokeID.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class InvokeID : Android.Renderscript.BaseObj
         {
             const string _bridgeClassName = "android.renderscript.Script$InvokeID";
@@ -1969,7 +1964,7 @@ public InvokeID(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Script.KernelID.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class KernelID : Android.Renderscript.BaseObj
         {
             const string _bridgeClassName = "android.renderscript.Script$KernelID";
@@ -2014,7 +2009,7 @@ public KernelID(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class LaunchOptions : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LaunchOptions>
         {
             const string _bridgeClassName = "android.renderscript.Script$LaunchOptions";
@@ -2063,7 +2058,7 @@ public LaunchOptions(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptC.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptC : Android.Renderscript.Script
     {
         const string _bridgeClassName = "android.renderscript.ScriptC";
@@ -2108,7 +2103,7 @@ public ScriptC(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptGroup : Android.Renderscript.BaseObj
     {
         const string _bridgeClassName = "android.renderscript.ScriptGroup";
@@ -2149,7 +2144,7 @@ public ScriptGroup(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Binding.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Binding : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Binding>
         {
             const string _bridgeClassName = "android.renderscript.ScriptGroup$Binding";
@@ -2194,7 +2189,7 @@ public Binding(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Builder.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
             const string _bridgeClassName = "android.renderscript.ScriptGroup$Builder";
@@ -2239,7 +2234,7 @@ public Builder(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Builder2.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder2 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder2>
         {
             const string _bridgeClassName = "android.renderscript.ScriptGroup$Builder2";
@@ -2284,7 +2279,7 @@ public Builder2(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Closure.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Closure : Android.Renderscript.BaseObj
         {
             const string _bridgeClassName = "android.renderscript.ScriptGroup$Closure";
@@ -2329,7 +2324,7 @@ public Closure(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Future.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Future : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Future>
         {
             const string _bridgeClassName = "android.renderscript.ScriptGroup$Future";
@@ -2374,7 +2369,7 @@ public Future(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Input.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Input : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Input>
         {
             const string _bridgeClassName = "android.renderscript.ScriptGroup$Input";
@@ -2423,19 +2418,19 @@ public Input(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsic.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsic : Android.Renderscript.Script
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsic";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ScriptIntrinsic class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScriptIntrinsic class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScriptIntrinsic() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ScriptIntrinsic class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScriptIntrinsic class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScriptIntrinsic(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2470,7 +2465,7 @@ public ScriptIntrinsic(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsic3DLUT.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsic3DLUT : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsic3DLUT";
@@ -2515,7 +2510,7 @@ public ScriptIntrinsic3DLUT(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicBLAS : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicBLAS";
@@ -2560,7 +2555,7 @@ public ScriptIntrinsicBLAS(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicBlend : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicBlend";
@@ -2605,7 +2600,7 @@ public ScriptIntrinsicBlend(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicBlur : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicBlur";
@@ -2650,7 +2645,7 @@ public ScriptIntrinsicBlur(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicColorMatrix : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicColorMatrix";
@@ -2695,7 +2690,7 @@ public ScriptIntrinsicColorMatrix(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicConvolve3x3 : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicConvolve3x3";
@@ -2740,7 +2735,7 @@ public ScriptIntrinsicConvolve3x3(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicConvolve5x5 : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicConvolve5x5";
@@ -2785,7 +2780,7 @@ public ScriptIntrinsicConvolve5x5(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicHistogram : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicHistogram";
@@ -2830,7 +2825,7 @@ public ScriptIntrinsicHistogram(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicLUT.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicLUT : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicLUT";
@@ -2875,7 +2870,7 @@ public ScriptIntrinsicLUT(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicResize.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicResize : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicResize";
@@ -2920,7 +2915,7 @@ public ScriptIntrinsicResize(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicYuvToRGB.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ScriptIntrinsicYuvToRGB : Android.Renderscript.ScriptIntrinsic
     {
         const string _bridgeClassName = "android.renderscript.ScriptIntrinsicYuvToRGB";
@@ -2965,7 +2960,7 @@ public ScriptIntrinsicYuvToRGB(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Short2.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Short2 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Short2>
     {
         const string _bridgeClassName = "android.renderscript.Short2";
@@ -3010,7 +3005,7 @@ public Short2(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Short3.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Short3 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Short3>
     {
         const string _bridgeClassName = "android.renderscript.Short3";
@@ -3055,7 +3050,7 @@ public Short3(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Short4.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Short4 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Short4>
     {
         const string _bridgeClassName = "android.renderscript.Short4";
@@ -3100,7 +3095,7 @@ public Short4(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/renderscript/Type.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Type : Android.Renderscript.BaseObj
     {
         const string _bridgeClassName = "android.renderscript.Type";
@@ -3141,7 +3136,7 @@ public Type(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Type.Builder.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
             const string _bridgeClassName = "android.renderscript.Type$Builder";
@@ -3186,7 +3181,7 @@ public Builder(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class CubemapFace : Java.Lang.Enum<Android.Renderscript.Type.CubemapFace>
         {
             const string _bridgeClassName = "android.renderscript.Type$CubemapFace";
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Allocation.cs b/src/net/Netdroid/Generated/Android/Renderscript/Allocation.cs
index d5f8d8e72..6b86aaa3c 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Allocation.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Allocation.cs
@@ -40,56 +40,56 @@ public partial class Allocation
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#USAGE_GRAPHICS_CONSTANTS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_GRAPHICS_CONSTANTS { get { if (!_USAGE_GRAPHICS_CONSTANTSReady) { _USAGE_GRAPHICS_CONSTANTSContent = SGetField<int>(LocalBridgeClazz, "USAGE_GRAPHICS_CONSTANTS"); _USAGE_GRAPHICS_CONSTANTSReady = true; } return _USAGE_GRAPHICS_CONSTANTSContent; } }
         private static int _USAGE_GRAPHICS_CONSTANTSContent = default;
         private static bool _USAGE_GRAPHICS_CONSTANTSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#USAGE_GRAPHICS_RENDER_TARGET"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_GRAPHICS_RENDER_TARGET { get { if (!_USAGE_GRAPHICS_RENDER_TARGETReady) { _USAGE_GRAPHICS_RENDER_TARGETContent = SGetField<int>(LocalBridgeClazz, "USAGE_GRAPHICS_RENDER_TARGET"); _USAGE_GRAPHICS_RENDER_TARGETReady = true; } return _USAGE_GRAPHICS_RENDER_TARGETContent; } }
         private static int _USAGE_GRAPHICS_RENDER_TARGETContent = default;
         private static bool _USAGE_GRAPHICS_RENDER_TARGETReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#USAGE_GRAPHICS_TEXTURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_GRAPHICS_TEXTURE { get { if (!_USAGE_GRAPHICS_TEXTUREReady) { _USAGE_GRAPHICS_TEXTUREContent = SGetField<int>(LocalBridgeClazz, "USAGE_GRAPHICS_TEXTURE"); _USAGE_GRAPHICS_TEXTUREReady = true; } return _USAGE_GRAPHICS_TEXTUREContent; } }
         private static int _USAGE_GRAPHICS_TEXTUREContent = default;
         private static bool _USAGE_GRAPHICS_TEXTUREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#USAGE_GRAPHICS_VERTEX"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_GRAPHICS_VERTEX { get { if (!_USAGE_GRAPHICS_VERTEXReady) { _USAGE_GRAPHICS_VERTEXContent = SGetField<int>(LocalBridgeClazz, "USAGE_GRAPHICS_VERTEX"); _USAGE_GRAPHICS_VERTEXReady = true; } return _USAGE_GRAPHICS_VERTEXContent; } }
         private static int _USAGE_GRAPHICS_VERTEXContent = default;
         private static bool _USAGE_GRAPHICS_VERTEXReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#USAGE_IO_INPUT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_IO_INPUT { get { if (!_USAGE_IO_INPUTReady) { _USAGE_IO_INPUTContent = SGetField<int>(LocalBridgeClazz, "USAGE_IO_INPUT"); _USAGE_IO_INPUTReady = true; } return _USAGE_IO_INPUTContent; } }
         private static int _USAGE_IO_INPUTContent = default;
         private static bool _USAGE_IO_INPUTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#USAGE_IO_OUTPUT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_IO_OUTPUT { get { if (!_USAGE_IO_OUTPUTReady) { _USAGE_IO_OUTPUTContent = SGetField<int>(LocalBridgeClazz, "USAGE_IO_OUTPUT"); _USAGE_IO_OUTPUTReady = true; } return _USAGE_IO_OUTPUTContent; } }
         private static int _USAGE_IO_OUTPUTContent = default;
         private static bool _USAGE_IO_OUTPUTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#USAGE_SCRIPT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_SCRIPT { get { if (!_USAGE_SCRIPTReady) { _USAGE_SCRIPTContent = SGetField<int>(LocalBridgeClazz, "USAGE_SCRIPT"); _USAGE_SCRIPTReady = true; } return _USAGE_SCRIPTContent; } }
         private static int _USAGE_SCRIPTContent = default;
         private static bool _USAGE_SCRIPTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#USAGE_SHARED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int USAGE_SHARED { get { if (!_USAGE_SHAREDReady) { _USAGE_SHAREDContent = SGetField<int>(LocalBridgeClazz, "USAGE_SHARED"); _USAGE_SHAREDReady = true; } return _USAGE_SHAREDContent; } }
         private static int _USAGE_SHAREDContent = default;
         private static bool _USAGE_SHAREDReady = false; // this is used because in case of generics 
@@ -105,7 +105,7 @@ public partial class Allocation
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateCubemapFromBitmap(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1, Android.Renderscript.Allocation.MipmapControl arg2, int arg3)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createCubemapFromBitmap", arg0, arg1, arg2, arg3);
@@ -116,7 +116,7 @@ public static Android.Renderscript.Allocation CreateCubemapFromBitmap(Android.Re
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateCubemapFromBitmap(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createCubemapFromBitmap", arg0, arg1);
@@ -134,7 +134,7 @@ public static Android.Renderscript.Allocation CreateCubemapFromBitmap(Android.Re
         /// <param name="arg7"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
         /// <param name="arg8"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateCubemapFromCubeFaces(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1, Android.Graphics.Bitmap arg2, Android.Graphics.Bitmap arg3, Android.Graphics.Bitmap arg4, Android.Graphics.Bitmap arg5, Android.Graphics.Bitmap arg6, Android.Renderscript.Allocation.MipmapControl arg7, int arg8)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createCubemapFromCubeFaces", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -150,7 +150,7 @@ public static Android.Renderscript.Allocation CreateCubemapFromCubeFaces(Android
         /// <param name="arg5"><see cref="Android.Graphics.Bitmap"/></param>
         /// <param name="arg6"><see cref="Android.Graphics.Bitmap"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateCubemapFromCubeFaces(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1, Android.Graphics.Bitmap arg2, Android.Graphics.Bitmap arg3, Android.Graphics.Bitmap arg4, Android.Graphics.Bitmap arg5, Android.Graphics.Bitmap arg6)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createCubemapFromCubeFaces", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -163,7 +163,7 @@ public static Android.Renderscript.Allocation CreateCubemapFromCubeFaces(Android
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateFromBitmap(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1, Android.Renderscript.Allocation.MipmapControl arg2, int arg3)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createFromBitmap", arg0, arg1, arg2, arg3);
@@ -174,7 +174,7 @@ public static Android.Renderscript.Allocation CreateFromBitmap(Android.Renderscr
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateFromBitmap(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createFromBitmap", arg0, arg1);
@@ -188,7 +188,7 @@ public static Android.Renderscript.Allocation CreateFromBitmap(Android.Renderscr
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateFromBitmapResource(Android.Renderscript.RenderScript arg0, Android.Content.Res.Resources arg1, int arg2, Android.Renderscript.Allocation.MipmapControl arg3, int arg4)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createFromBitmapResource", arg0, arg1, arg2, arg3, arg4);
@@ -200,7 +200,7 @@ public static Android.Renderscript.Allocation CreateFromBitmapResource(Android.R
         /// <param name="arg1"><see cref="Android.Content.Res.Resources"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateFromBitmapResource(Android.Renderscript.RenderScript arg0, Android.Content.Res.Resources arg1, int arg2)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createFromBitmapResource", arg0, arg1, arg2);
@@ -212,7 +212,7 @@ public static Android.Renderscript.Allocation CreateFromBitmapResource(Android.R
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateFromString(Android.Renderscript.RenderScript arg0, Java.Lang.String arg1, int arg2)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createFromString", arg0, arg1, arg2);
@@ -225,7 +225,7 @@ public static Android.Renderscript.Allocation CreateFromString(Android.Renderscr
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateSized(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1, int arg2, int arg3)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createSized", arg0, arg1, arg2, arg3);
@@ -237,7 +237,7 @@ public static Android.Renderscript.Allocation CreateSized(Android.Renderscript.R
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateSized(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1, int arg2)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createSized", arg0, arg1, arg2);
@@ -250,7 +250,7 @@ public static Android.Renderscript.Allocation CreateSized(Android.Renderscript.R
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateTyped(Android.Renderscript.RenderScript arg0, Android.Renderscript.Type arg1, Android.Renderscript.Allocation.MipmapControl arg2, int arg3)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createTyped", arg0, arg1, arg2, arg3);
@@ -262,7 +262,7 @@ public static Android.Renderscript.Allocation CreateTyped(Android.Renderscript.R
         /// <param name="arg1"><see cref="Android.Renderscript.Type"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateTyped(Android.Renderscript.RenderScript arg0, Android.Renderscript.Type arg1, int arg2)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createTyped", arg0, arg1, arg2);
@@ -273,7 +273,7 @@ public static Android.Renderscript.Allocation CreateTyped(Android.Renderscript.R
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Type"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation CreateTyped(Android.Renderscript.RenderScript arg0, Android.Renderscript.Type arg1)
         {
             return SExecute<Android.Renderscript.Allocation>(LocalBridgeClazz, "createTyped", arg0, arg1);
@@ -286,7 +286,7 @@ public static Android.Renderscript.Allocation CreateTyped(Android.Renderscript.R
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Allocation[] CreateAllocations(Android.Renderscript.RenderScript arg0, Android.Renderscript.Type arg1, int arg2, int arg3)
         {
             return SExecuteArray<Android.Renderscript.Allocation>(LocalBridgeClazz, "createAllocations", arg0, arg1, arg2, arg3);
@@ -296,74 +296,82 @@ public static Android.Renderscript.Allocation[] CreateAllocations(Android.Render
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getByteBuffer()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getElement()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Nio.ByteBuffer ByteBuffer
+        /// <returns><see cref="Android.Renderscript.Element"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Element GetElement()
         {
-            get { return IExecuteWithSignature<Java.Nio.ByteBuffer>("getByteBuffer", "()Ljava/nio/ByteBuffer;"); }
+            return IExecuteWithSignature<Android.Renderscript.Element>("getElement", "()Landroid/renderscript/Element;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getBytesSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int BytesSize
+        /// <returns><see cref="Android.Renderscript.Type"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Type GetType()
         {
-            get { return IExecuteWithSignature<int>("getBytesSize", "()I"); }
+            return IExecuteWithSignature<Android.Renderscript.Type>("getType", "()Landroid/renderscript/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getElement()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getSurface()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Element Element
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.Surface GetSurface()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Element>("getElement", "()Landroid/renderscript/Element;"); }
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getStride()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getBytesSize()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long Stride
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBytesSize()
         {
-            get { return IExecuteWithSignature<long>("getStride", "()J"); }
+            return IExecuteWithSignature<int>("getBytesSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getSurface()"/> <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setSurface(android.view.Surface)"/>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getUsage()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.Surface Surface
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetUsage()
         {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); } set { IExecuteWithSignature("setSurface", "(Landroid/view/Surface;)V", value); }
+            return IExecuteWithSignature<int>("getUsage", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getTimeStamp()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getByteBuffer()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long TimeStamp
+        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
+        [global::System.Obsolete()]
+        public Java.Nio.ByteBuffer GetByteBuffer()
         {
-            get { return IExecuteWithSignature<long>("getTimeStamp", "()J"); }
+            return IExecuteWithSignature<Java.Nio.ByteBuffer>("getByteBuffer", "()Ljava/nio/ByteBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getStride()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Type Type
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetStride()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Type>("getType", "()Landroid/renderscript/Type;"); }
+            return IExecuteWithSignature<long>("getStride", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getUsage()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getTimeStamp()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Usage
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetTimeStamp()
         {
-            get { return IExecuteWithSignature<int>("getUsage", "()I"); }
+            return IExecuteWithSignature<long>("getTimeStamp", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#resize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Resize(int arg0)
         {
             IExecuteWithSignature("resize", "(I)V", arg0);
@@ -375,7 +383,7 @@ public void Resize(int arg0)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFrom(int arg0, int arg1, Android.Renderscript.Allocation arg2, int arg3)
         {
             IExecute("copy1DRangeFrom", arg0, arg1, arg2, arg3);
@@ -386,7 +394,7 @@ public void Copy1DRangeFrom(int arg0, int arg1, Android.Renderscript.Allocation
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFrom(int arg0, int arg1, byte[] arg2)
         {
             IExecute("copy1DRangeFrom", arg0, arg1, arg2);
@@ -397,7 +405,7 @@ public void Copy1DRangeFrom(int arg0, int arg1, byte[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFrom(int arg0, int arg1, float[] arg2)
         {
             IExecute("copy1DRangeFrom", arg0, arg1, arg2);
@@ -408,7 +416,7 @@ public void Copy1DRangeFrom(int arg0, int arg1, float[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFrom(int arg0, int arg1, int[] arg2)
         {
             IExecute("copy1DRangeFrom", arg0, arg1, arg2);
@@ -419,7 +427,7 @@ public void Copy1DRangeFrom(int arg0, int arg1, int[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFrom(int arg0, int arg1, object arg2)
         {
             IExecute("copy1DRangeFrom", arg0, arg1, arg2);
@@ -430,7 +438,7 @@ public void Copy1DRangeFrom(int arg0, int arg1, object arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFrom(int arg0, int arg1, short[] arg2)
         {
             IExecute("copy1DRangeFrom", arg0, arg1, arg2);
@@ -441,7 +449,7 @@ public void Copy1DRangeFrom(int arg0, int arg1, short[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFromUnchecked(int arg0, int arg1, byte[] arg2)
         {
             IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
@@ -452,7 +460,7 @@ public void Copy1DRangeFromUnchecked(int arg0, int arg1, byte[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFromUnchecked(int arg0, int arg1, float[] arg2)
         {
             IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
@@ -463,7 +471,7 @@ public void Copy1DRangeFromUnchecked(int arg0, int arg1, float[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFromUnchecked(int arg0, int arg1, int[] arg2)
         {
             IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
@@ -474,7 +482,7 @@ public void Copy1DRangeFromUnchecked(int arg0, int arg1, int[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFromUnchecked(int arg0, int arg1, object arg2)
         {
             IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
@@ -485,7 +493,7 @@ public void Copy1DRangeFromUnchecked(int arg0, int arg1, object arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeFromUnchecked(int arg0, int arg1, short[] arg2)
         {
             IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
@@ -496,7 +504,7 @@ public void Copy1DRangeFromUnchecked(int arg0, int arg1, short[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeTo(int arg0, int arg1, byte[] arg2)
         {
             IExecute("copy1DRangeTo", arg0, arg1, arg2);
@@ -507,7 +515,7 @@ public void Copy1DRangeTo(int arg0, int arg1, byte[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeTo(int arg0, int arg1, float[] arg2)
         {
             IExecute("copy1DRangeTo", arg0, arg1, arg2);
@@ -518,7 +526,7 @@ public void Copy1DRangeTo(int arg0, int arg1, float[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeTo(int arg0, int arg1, int[] arg2)
         {
             IExecute("copy1DRangeTo", arg0, arg1, arg2);
@@ -529,7 +537,7 @@ public void Copy1DRangeTo(int arg0, int arg1, int[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeTo(int arg0, int arg1, object arg2)
         {
             IExecute("copy1DRangeTo", arg0, arg1, arg2);
@@ -540,7 +548,7 @@ public void Copy1DRangeTo(int arg0, int arg1, object arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeTo(int arg0, int arg1, short[] arg2)
         {
             IExecute("copy1DRangeTo", arg0, arg1, arg2);
@@ -551,7 +559,7 @@ public void Copy1DRangeTo(int arg0, int arg1, short[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeToUnchecked(int arg0, int arg1, byte[] arg2)
         {
             IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
@@ -562,7 +570,7 @@ public void Copy1DRangeToUnchecked(int arg0, int arg1, byte[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeToUnchecked(int arg0, int arg1, float[] arg2)
         {
             IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
@@ -573,7 +581,7 @@ public void Copy1DRangeToUnchecked(int arg0, int arg1, float[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeToUnchecked(int arg0, int arg1, int[] arg2)
         {
             IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
@@ -584,7 +592,7 @@ public void Copy1DRangeToUnchecked(int arg0, int arg1, int[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeToUnchecked(int arg0, int arg1, object arg2)
         {
             IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
@@ -595,7 +603,7 @@ public void Copy1DRangeToUnchecked(int arg0, int arg1, object arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy1DRangeToUnchecked(int arg0, int arg1, short[] arg2)
         {
             IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
@@ -606,7 +614,7 @@ public void Copy1DRangeToUnchecked(int arg0, int arg1, short[] arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeFrom(int arg0, int arg1, Android.Graphics.Bitmap arg2)
         {
             IExecute("copy2DRangeFrom", arg0, arg1, arg2);
@@ -621,7 +629,7 @@ public void Copy2DRangeFrom(int arg0, int arg1, Android.Graphics.Bitmap arg2)
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, int arg6)
         {
             IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -634,7 +642,7 @@ public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, Android.Rend
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, byte[] arg4)
         {
             IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
@@ -647,7 +655,7 @@ public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, byte[] arg4)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, float[] arg4)
         {
             IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
@@ -660,7 +668,7 @@ public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, float[] arg4
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, int[] arg4)
         {
             IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
@@ -673,7 +681,7 @@ public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, int[] arg4)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, object arg4)
         {
             IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
@@ -686,7 +694,7 @@ public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, object arg4)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, short[] arg4)
         {
             IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
@@ -699,7 +707,7 @@ public void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, short[] arg4
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, byte[] arg4)
         {
             IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
@@ -712,7 +720,7 @@ public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, byte[] arg4)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, float[] arg4)
         {
             IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
@@ -725,7 +733,7 @@ public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, float[] arg4)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, int[] arg4)
         {
             IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
@@ -738,7 +746,7 @@ public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, int[] arg4)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, object arg4)
         {
             IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
@@ -751,7 +759,7 @@ public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, object arg4)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, short[] arg4)
         {
             IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
@@ -769,7 +777,7 @@ public void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, short[] arg4)
         /// <param name="arg7"><see cref="int"/></param>
         /// <param name="arg8"><see cref="int"/></param>
         /// <param name="arg9"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy3DRangeFrom(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, Android.Renderscript.Allocation arg6, int arg7, int arg8, int arg9)
         {
             IExecute("copy3DRangeFrom", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -784,7 +792,7 @@ public void Copy3DRangeFrom(int arg0, int arg1, int arg2, int arg3, int arg4, in
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy3DRangeFrom(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, object arg6)
         {
             IExecute("copy3DRangeFrom", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -799,7 +807,7 @@ public void Copy3DRangeFrom(int arg0, int arg1, int arg2, int arg3, int arg4, in
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Copy3DRangeTo(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, object arg6)
         {
             IExecute("copy3DRangeTo", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -808,7 +816,7 @@ public void Copy3DRangeTo(int arg0, int arg1, int arg2, int arg3, int arg4, int
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.graphics.Bitmap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFrom(Android.Graphics.Bitmap arg0)
         {
             IExecuteWithSignature("copyFrom", "(Landroid/graphics/Bitmap;)V", arg0);
@@ -817,7 +825,7 @@ public void CopyFrom(Android.Graphics.Bitmap arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFrom(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("copyFrom", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -826,7 +834,7 @@ public void CopyFrom(Android.Renderscript.Allocation arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.renderscript.BaseObj[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.BaseObj"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFrom(Android.Renderscript.BaseObj[] arg0)
         {
             IExecuteWithSignature("copyFrom", "([Landroid/renderscript/BaseObj;)V", new object[] { arg0 });
@@ -835,7 +843,7 @@ public void CopyFrom(Android.Renderscript.BaseObj[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFrom(byte[] arg0)
         {
             IExecuteWithSignature("copyFrom", "([B)V", new object[] { arg0 });
@@ -844,7 +852,7 @@ public void CopyFrom(byte[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFrom(float[] arg0)
         {
             IExecuteWithSignature("copyFrom", "([F)V", new object[] { arg0 });
@@ -853,7 +861,7 @@ public void CopyFrom(float[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFrom(int[] arg0)
         {
             IExecuteWithSignature("copyFrom", "([I)V", new object[] { arg0 });
@@ -862,7 +870,7 @@ public void CopyFrom(int[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFrom(object arg0)
         {
             IExecuteWithSignature("copyFrom", "(Ljava/lang/Object;)V", arg0);
@@ -871,7 +879,7 @@ public void CopyFrom(object arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFrom(short[] arg0)
         {
             IExecuteWithSignature("copyFrom", "([S)V", new object[] { arg0 });
@@ -880,7 +888,7 @@ public void CopyFrom(short[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFromUnchecked(byte[] arg0)
         {
             IExecuteWithSignature("copyFromUnchecked", "([B)V", new object[] { arg0 });
@@ -889,7 +897,7 @@ public void CopyFromUnchecked(byte[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFromUnchecked(float[] arg0)
         {
             IExecuteWithSignature("copyFromUnchecked", "([F)V", new object[] { arg0 });
@@ -898,7 +906,7 @@ public void CopyFromUnchecked(float[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFromUnchecked(int[] arg0)
         {
             IExecuteWithSignature("copyFromUnchecked", "([I)V", new object[] { arg0 });
@@ -907,7 +915,7 @@ public void CopyFromUnchecked(int[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFromUnchecked(object arg0)
         {
             IExecuteWithSignature("copyFromUnchecked", "(Ljava/lang/Object;)V", arg0);
@@ -916,7 +924,7 @@ public void CopyFromUnchecked(object arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyFromUnchecked(short[] arg0)
         {
             IExecuteWithSignature("copyFromUnchecked", "([S)V", new object[] { arg0 });
@@ -925,7 +933,7 @@ public void CopyFromUnchecked(short[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(android.graphics.Bitmap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyTo(Android.Graphics.Bitmap arg0)
         {
             IExecuteWithSignature("copyTo", "(Landroid/graphics/Bitmap;)V", arg0);
@@ -934,7 +942,7 @@ public void CopyTo(Android.Graphics.Bitmap arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyTo(byte[] arg0)
         {
             IExecuteWithSignature("copyTo", "([B)V", new object[] { arg0 });
@@ -943,7 +951,7 @@ public void CopyTo(byte[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyTo(float[] arg0)
         {
             IExecuteWithSignature("copyTo", "([F)V", new object[] { arg0 });
@@ -952,7 +960,7 @@ public void CopyTo(float[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyTo(int[] arg0)
         {
             IExecuteWithSignature("copyTo", "([I)V", new object[] { arg0 });
@@ -961,7 +969,7 @@ public void CopyTo(int[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyTo(object arg0)
         {
             IExecuteWithSignature("copyTo", "(Ljava/lang/Object;)V", arg0);
@@ -970,7 +978,7 @@ public void CopyTo(object arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CopyTo(short[] arg0)
         {
             IExecuteWithSignature("copyTo", "([S)V", new object[] { arg0 });
@@ -978,7 +986,7 @@ public void CopyTo(short[] arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#generateMipmaps()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GenerateMipmaps()
         {
             IExecuteWithSignature("generateMipmaps", "()V");
@@ -986,7 +994,7 @@ public void GenerateMipmaps()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#ioReceive()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void IoReceive()
         {
             IExecuteWithSignature("ioReceive", "()V");
@@ -994,7 +1002,7 @@ public void IoReceive()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#ioSend()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void IoSend()
         {
             IExecuteWithSignature("ioSend", "()V");
@@ -1003,7 +1011,7 @@ public void IoSend()
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setAutoPadding(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAutoPadding(bool arg0)
         {
             IExecuteWithSignature("setAutoPadding", "(Z)V", arg0);
@@ -1013,7 +1021,7 @@ public void SetAutoPadding(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetFromFieldPacker(int arg0, Android.Renderscript.FieldPacker arg1)
         {
             IExecute("setFromFieldPacker", arg0, arg1);
@@ -1024,7 +1032,7 @@ public void SetFromFieldPacker(int arg0, Android.Renderscript.FieldPacker arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetFromFieldPacker(int arg0, int arg1, Android.Renderscript.FieldPacker arg2)
         {
             IExecute("setFromFieldPacker", arg0, arg1, arg2);
@@ -1037,7 +1045,7 @@ public void SetFromFieldPacker(int arg0, int arg1, Android.Renderscript.FieldPac
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetFromFieldPacker(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.FieldPacker arg4)
         {
             IExecute("setFromFieldPacker", arg0, arg1, arg2, arg3, arg4);
@@ -1046,16 +1054,25 @@ public void SetFromFieldPacker(int arg0, int arg1, int arg2, int arg3, Android.R
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setOnBufferAvailableListener(android.renderscript.Allocation.OnBufferAvailableListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation.OnBufferAvailableListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnBufferAvailableListener(Android.Renderscript.Allocation.OnBufferAvailableListener arg0)
         {
             IExecuteWithSignature("setOnBufferAvailableListener", "(Landroid/renderscript/Allocation$OnBufferAvailableListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setSurface(android.view.Surface)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Surface"/></param>
+        [global::System.Obsolete()]
+        public void SetSurface(Android.View.Surface arg0)
+        {
+            IExecuteWithSignature("setSurface", "(Landroid/view/Surface;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#syncAll(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SyncAll(int arg0)
         {
             IExecuteWithSignature("syncAll", "(I)V", arg0);
@@ -1079,21 +1096,21 @@ public partial class MipmapControl
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.MipmapControl.html#MIPMAP_FULL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Allocation.MipmapControl MIPMAP_FULL { get { if (!_MIPMAP_FULLReady) { _MIPMAP_FULLContent = SGetField<Android.Renderscript.Allocation.MipmapControl>(LocalBridgeClazz, "MIPMAP_FULL"); _MIPMAP_FULLReady = true; } return _MIPMAP_FULLContent; } }
             private static Android.Renderscript.Allocation.MipmapControl _MIPMAP_FULLContent = default;
             private static bool _MIPMAP_FULLReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.MipmapControl.html#MIPMAP_NONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Allocation.MipmapControl MIPMAP_NONE { get { if (!_MIPMAP_NONEReady) { _MIPMAP_NONEContent = SGetField<Android.Renderscript.Allocation.MipmapControl>(LocalBridgeClazz, "MIPMAP_NONE"); _MIPMAP_NONEReady = true; } return _MIPMAP_NONEContent; } }
             private static Android.Renderscript.Allocation.MipmapControl _MIPMAP_NONEContent = default;
             private static bool _MIPMAP_NONEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.MipmapControl.html#MIPMAP_ON_SYNC_TO_TEXTURE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Allocation.MipmapControl MIPMAP_ON_SYNC_TO_TEXTURE { get { if (!_MIPMAP_ON_SYNC_TO_TEXTUREReady) { _MIPMAP_ON_SYNC_TO_TEXTUREContent = SGetField<Android.Renderscript.Allocation.MipmapControl>(LocalBridgeClazz, "MIPMAP_ON_SYNC_TO_TEXTURE"); _MIPMAP_ON_SYNC_TO_TEXTUREReady = true; } return _MIPMAP_ON_SYNC_TO_TEXTUREContent; } }
             private static Android.Renderscript.Allocation.MipmapControl _MIPMAP_ON_SYNC_TO_TEXTUREContent = default;
             private static bool _MIPMAP_ON_SYNC_TO_TEXTUREReady = false; // this is used because in case of generics 
@@ -1158,7 +1175,7 @@ public partial class OnBufferAvailableListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onBufferAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Renderscript.Allocation>>>(OnBufferAvailableEventHandler));
+                AddEventHandler("onBufferAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Renderscript.Allocation>>>(OnBufferAvailableEventHandler));
 
             }
 
@@ -1166,7 +1183,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.OnBufferAvailableListener.html#onBufferAvailable(android.renderscript.Allocation)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnBufferAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Renderscript.Allocation> OnOnBufferAvailable { get; set; } = null;
+            public global::System.Action<Android.Renderscript.Allocation> OnOnBufferAvailable { get; set; } = null;
 
             void OnBufferAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.Allocation>> data)
             {
@@ -1178,7 +1195,7 @@ void OnBufferAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventD
             /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.OnBufferAvailableListener.html#onBufferAvailable(android.renderscript.Allocation)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnBufferAvailable(Android.Renderscript.Allocation arg0)
             {
                 
@@ -1218,7 +1235,7 @@ public partial class OnBufferAvailableListenerDirect
             /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.OnBufferAvailableListener.html#onBufferAvailable(android.renderscript.Allocation)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnBufferAvailable(Android.Renderscript.Allocation arg0)
             {
                 IExecuteWithSignature("onBufferAvailable", "(Landroid/renderscript/Allocation;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/AllocationAdapter.cs b/src/net/Netdroid/Generated/Android/Renderscript/AllocationAdapter.cs
index 24ce4a4c9..58033b578 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/AllocationAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/AllocationAdapter.cs
@@ -41,474 +41,28 @@ public partial class AllocationAdapter
         #endregion
 
         #region Static methods
-        
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createCubemapFromBitmap(android.renderscript.RenderScript,android.graphics.Bitmap,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateCubemapFromBitmap"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Graphics.Bitmap, Android.Renderscript.Allocation.MipmapControl, int, Android.Renderscript.Allocation> OnCreateCubemapFromBitmap { get; set; } = null;
-
-        void CreateCubemapFromBitmapEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateCubemapFromBitmap != null) ? OnCreateCubemapFromBitmap : CreateCubemapFromBitmap;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Graphics.Bitmap>(0), data.EventData.GetAt<Android.Renderscript.Allocation.MipmapControl>(1), data.EventData.GetAt<int>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createCubemapFromBitmap(android.renderscript.RenderScript,android.graphics.Bitmap,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg2"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateCubemapFromBitmap(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1, Android.Renderscript.Allocation.MipmapControl arg2, int arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createCubemapFromBitmap(android.renderscript.RenderScript,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateCubemapFromBitmap2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Graphics.Bitmap, Android.Renderscript.Allocation> OnCreateCubemapFromBitmap2 { get; set; } = null;
-
-        void CreateCubemapFromBitmap2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateCubemapFromBitmap2 != null) ? OnCreateCubemapFromBitmap2 : CreateCubemapFromBitmap;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Graphics.Bitmap>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createCubemapFromBitmap(android.renderscript.RenderScript,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateCubemapFromBitmap(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createCubemapFromCubeFaces(android.renderscript.RenderScript,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateCubemapFromCubeFaces"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Renderscript.Allocation.MipmapControl, int, Android.Renderscript.Allocation> OnCreateCubemapFromCubeFaces { get; set; } = null;
-
-        void CreateCubemapFromCubeFacesEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateCubemapFromCubeFaces != null) ? OnCreateCubemapFromCubeFaces : CreateCubemapFromCubeFaces;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Graphics.Bitmap>(0), data.EventData.GetAt<Android.Graphics.Bitmap>(1), data.EventData.GetAt<Android.Graphics.Bitmap>(2), data.EventData.GetAt<Android.Graphics.Bitmap>(3), data.EventData.GetAt<Android.Graphics.Bitmap>(4), data.EventData.GetAt<Android.Graphics.Bitmap>(5), data.EventData.GetAt<Android.Renderscript.Allocation.MipmapControl>(6), data.EventData.GetAt<int>(7));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createCubemapFromCubeFaces(android.renderscript.RenderScript,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg2"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg3"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg4"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg5"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg6"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg7"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
-        /// <param name="arg8"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateCubemapFromCubeFaces(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1, Android.Graphics.Bitmap arg2, Android.Graphics.Bitmap arg3, Android.Graphics.Bitmap arg4, Android.Graphics.Bitmap arg5, Android.Graphics.Bitmap arg6, Android.Renderscript.Allocation.MipmapControl arg7, int arg8)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createCubemapFromCubeFaces(android.renderscript.RenderScript,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateCubemapFromCubeFaces7"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Graphics.Bitmap, Android.Renderscript.Allocation> OnCreateCubemapFromCubeFaces7 { get; set; } = null;
-
-        void CreateCubemapFromCubeFaces7EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateCubemapFromCubeFaces7 != null) ? OnCreateCubemapFromCubeFaces7 : CreateCubemapFromCubeFaces;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Graphics.Bitmap>(0), data.EventData.GetAt<Android.Graphics.Bitmap>(1), data.EventData.GetAt<Android.Graphics.Bitmap>(2), data.EventData.GetAt<Android.Graphics.Bitmap>(3), data.EventData.GetAt<Android.Graphics.Bitmap>(4), data.EventData.GetAt<Android.Graphics.Bitmap>(5));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createCubemapFromCubeFaces(android.renderscript.RenderScript,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg2"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg3"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg4"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg5"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg6"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateCubemapFromCubeFaces(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1, Android.Graphics.Bitmap arg2, Android.Graphics.Bitmap arg3, Android.Graphics.Bitmap arg4, Android.Graphics.Bitmap arg5, Android.Graphics.Bitmap arg6)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromBitmap(android.renderscript.RenderScript,android.graphics.Bitmap,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateFromBitmap"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Graphics.Bitmap, Android.Renderscript.Allocation.MipmapControl, int, Android.Renderscript.Allocation> OnCreateFromBitmap { get; set; } = null;
-
-        void CreateFromBitmapEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateFromBitmap != null) ? OnCreateFromBitmap : CreateFromBitmap;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Graphics.Bitmap>(0), data.EventData.GetAt<Android.Renderscript.Allocation.MipmapControl>(1), data.EventData.GetAt<int>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromBitmap(android.renderscript.RenderScript,android.graphics.Bitmap,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <param name="arg2"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateFromBitmap(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1, Android.Renderscript.Allocation.MipmapControl arg2, int arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromBitmap(android.renderscript.RenderScript,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateFromBitmap2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Graphics.Bitmap, Android.Renderscript.Allocation> OnCreateFromBitmap2 { get; set; } = null;
-
-        void CreateFromBitmap2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateFromBitmap2 != null) ? OnCreateFromBitmap2 : CreateFromBitmap;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Graphics.Bitmap>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromBitmap(android.renderscript.RenderScript,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateFromBitmap(Android.Renderscript.RenderScript arg0, Android.Graphics.Bitmap arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromBitmapResource(android.renderscript.RenderScript,android.content.res.Resources,int,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateFromBitmapResource"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Content.Res.Resources, int, Android.Renderscript.Allocation.MipmapControl, int, Android.Renderscript.Allocation> OnCreateFromBitmapResource { get; set; } = null;
-
-        void CreateFromBitmapResourceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateFromBitmapResource != null) ? OnCreateFromBitmapResource : CreateFromBitmapResource;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Content.Res.Resources>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.Renderscript.Allocation.MipmapControl>(2), data.EventData.GetAt<int>(3));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromBitmapResource(android.renderscript.RenderScript,android.content.res.Resources,int,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Content.Res.Resources"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateFromBitmapResource(Android.Renderscript.RenderScript arg0, Android.Content.Res.Resources arg1, int arg2, Android.Renderscript.Allocation.MipmapControl arg3, int arg4)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromBitmapResource(android.renderscript.RenderScript,android.content.res.Resources,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateFromBitmapResource3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Content.Res.Resources, int, Android.Renderscript.Allocation> OnCreateFromBitmapResource3 { get; set; } = null;
-
-        void CreateFromBitmapResource3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateFromBitmapResource3 != null) ? OnCreateFromBitmapResource3 : CreateFromBitmapResource;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Content.Res.Resources>(0), data.EventData.GetAt<int>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromBitmapResource(android.renderscript.RenderScript,android.content.res.Resources,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Content.Res.Resources"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateFromBitmapResource(Android.Renderscript.RenderScript arg0, Android.Content.Res.Resources arg1, int arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromString(android.renderscript.RenderScript,java.lang.String,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateFromString"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Java.Lang.String, int, Android.Renderscript.Allocation> OnCreateFromString { get; set; } = null;
-
-        void CreateFromStringEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateFromString != null) ? OnCreateFromString : CreateFromString;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0), data.EventData.GetAt<int>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createFromString(android.renderscript.RenderScript,java.lang.String,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateFromString(Android.Renderscript.RenderScript arg0, Java.Lang.String arg1, int arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createSized(android.renderscript.RenderScript,android.renderscript.Element,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateSized"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Element, int, int, Android.Renderscript.Allocation> OnCreateSized { get; set; } = null;
-
-        void CreateSizedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateSized != null) ? OnCreateSized : CreateSized;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Element>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createSized(android.renderscript.RenderScript,android.renderscript.Element,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateSized(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1, int arg2, int arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createSized(android.renderscript.RenderScript,android.renderscript.Element,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateSized3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Element, int, Android.Renderscript.Allocation> OnCreateSized3 { get; set; } = null;
-
-        void CreateSized3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateSized3 != null) ? OnCreateSized3 : CreateSized;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Element>(0), data.EventData.GetAt<int>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createSized(android.renderscript.RenderScript,android.renderscript.Element,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateSized(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1, int arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createTyped(android.renderscript.RenderScript,android.renderscript.Type,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateTyped"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Type, Android.Renderscript.Allocation.MipmapControl, int, Android.Renderscript.Allocation> OnCreateTyped { get; set; } = null;
-
-        void CreateTypedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateTyped != null) ? OnCreateTyped : CreateTyped;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Type>(0), data.EventData.GetAt<Android.Renderscript.Allocation.MipmapControl>(1), data.EventData.GetAt<int>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createTyped(android.renderscript.RenderScript,android.renderscript.Type,android.renderscript.Allocation.MipmapControl,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Renderscript.Type"/></param>
-        /// <param name="arg2"><see cref="Android.Renderscript.Allocation.MipmapControl"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateTyped(Android.Renderscript.RenderScript arg0, Android.Renderscript.Type arg1, Android.Renderscript.Allocation.MipmapControl arg2, int arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createTyped(android.renderscript.RenderScript,android.renderscript.Type,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateTyped3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Type, int, Android.Renderscript.Allocation> OnCreateTyped3 { get; set; } = null;
-
-        void CreateTyped3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateTyped3 != null) ? OnCreateTyped3 : CreateTyped;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Type>(0), data.EventData.GetAt<int>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createTyped(android.renderscript.RenderScript,android.renderscript.Type,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Renderscript.Type"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateTyped(Android.Renderscript.RenderScript arg0, Android.Renderscript.Type arg1, int arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createTyped(android.renderscript.RenderScript,android.renderscript.Type)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateTyped2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Type, Android.Renderscript.Allocation> OnCreateTyped2_2 { get; set; } = null;
-
-        void CreateTyped2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateTyped2_2 != null) ? OnCreateTyped2_2 : CreateTyped;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Type>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createTyped(android.renderscript.RenderScript,android.renderscript.Type)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Renderscript.Type"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation CreateTyped(Android.Renderscript.RenderScript arg0, Android.Renderscript.Type arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createAllocations(android.renderscript.RenderScript,android.renderscript.Type,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateAllocations"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Type, int, int, Android.Renderscript.Allocation[]> OnCreateAllocations { get; set; } = null;
-
-        void CreateAllocationsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreateAllocations != null) ? OnCreateAllocations : CreateAllocations;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Type>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#createAllocations(android.renderscript.RenderScript,android.renderscript.Type,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-        /// <param name="arg1"><see cref="Android.Renderscript.Type"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Allocation[] CreateAllocations(Android.Renderscript.RenderScript arg0, Android.Renderscript.Type arg1, int arg2, int arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#create1D(android.renderscript.RenderScript,android.renderscript.Allocation)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreate1D"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Allocation, Android.Renderscript.AllocationAdapter> OnCreate1D { get; set; } = null;
-
-        void Create1DEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
-        {
-            var methodToExecute = (OnCreate1D != null) ? OnCreate1D : Create1D;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Allocation>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#create1D(android.renderscript.RenderScript,android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <returns><see cref="Android.Renderscript.AllocationAdapter"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.AllocationAdapter Create1D(Android.Renderscript.RenderScript arg0, Android.Renderscript.Allocation arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#create2D(android.renderscript.RenderScript,android.renderscript.Allocation)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreate2D"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Allocation, Android.Renderscript.AllocationAdapter> OnCreate2D { get; set; } = null;
-
-        void Create2DEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
+        [global::System.Obsolete()]
+        public static Android.Renderscript.AllocationAdapter Create1D(Android.Renderscript.RenderScript arg0, Android.Renderscript.Allocation arg1)
         {
-            var methodToExecute = (OnCreate2D != null) ? OnCreate2D : Create2D;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Allocation>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<Android.Renderscript.AllocationAdapter>(LocalBridgeClazz, "create1D", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#create2D(android.renderscript.RenderScript,android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <returns><see cref="Android.Renderscript.AllocationAdapter"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.AllocationAdapter Create2D(Android.Renderscript.RenderScript arg0, Android.Renderscript.Allocation arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#createTyped(android.renderscript.RenderScript,android.renderscript.Allocation,android.renderscript.Type)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCreateTyped3_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.RenderScript, Android.Renderscript.Allocation, Android.Renderscript.Type, Android.Renderscript.AllocationAdapter> OnCreateTyped3_3 { get; set; } = null;
-
-        void CreateTyped3_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.RenderScript>> data)
+        [global::System.Obsolete()]
+        public static Android.Renderscript.AllocationAdapter Create2D(Android.Renderscript.RenderScript arg0, Android.Renderscript.Allocation arg1)
         {
-            var methodToExecute = (OnCreateTyped3_3 != null) ? OnCreateTyped3_3 : CreateTyped;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.Allocation>(0), data.EventData.GetAt<Android.Renderscript.Type>(1));
-            data.SetReturnValue(executionResult);
+            return SExecute<Android.Renderscript.AllocationAdapter>(LocalBridgeClazz, "create2D", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#createTyped(android.renderscript.RenderScript,android.renderscript.Allocation,android.renderscript.Type)"/>
         /// </summary>
@@ -516,2788 +70,21 @@ void CreateTyped3_3EventHandler(object sender, CLRListenerEventArgs<CLREventData
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Type"/></param>
         /// <returns><see cref="Android.Renderscript.AllocationAdapter"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.AllocationAdapter CreateTyped(Android.Renderscript.RenderScript arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Type arg2)
+        [global::System.Obsolete()]
+        public static Android.Renderscript.AllocationAdapter CreateTyped(Android.Renderscript.RenderScript arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Type arg2)
         {
-            return default;
+            return SExecute<Android.Renderscript.AllocationAdapter>(LocalBridgeClazz, "createTyped", arg0, arg1, arg2);
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// Handlers initializer for <see cref="AllocationAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("getElement", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetElementEventHandler));
-            AddEventHandler("getType", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetTypeEventHandler));
-            AddEventHandler("getSurface", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetSurfaceEventHandler));
-            AddEventHandler("getBytesSize", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetBytesSizeEventHandler));
-            AddEventHandler("getUsage", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetUsageEventHandler));
-            AddEventHandler("getName", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetNameEventHandler));
-            AddEventHandler("getByteBuffer", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetByteBufferEventHandler));
-            AddEventHandler("getStride", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetStrideEventHandler));
-            AddEventHandler("getTimeStamp", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetTimeStampEventHandler));
-            AddEventHandler("copy1DRangeFrom", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFromEventHandler));
-            AddEventHandler("copy1DRangeFrom3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFrom3EventHandler));
-            AddEventHandler("copy1DRangeFrom3_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFrom3_2EventHandler));
-            AddEventHandler("copy1DRangeFrom3_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFrom3_3EventHandler));
-            AddEventHandler("copy1DRangeFrom3_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFrom3_4EventHandler));
-            AddEventHandler("copy1DRangeFrom3_5", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFrom3_5EventHandler));
-            AddEventHandler("copy1DRangeFromUnchecked", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFromUncheckedEventHandler));
-            AddEventHandler("copy1DRangeFromUnchecked3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFromUnchecked3EventHandler));
-            AddEventHandler("copy1DRangeFromUnchecked3_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFromUnchecked3_2EventHandler));
-            AddEventHandler("copy1DRangeFromUnchecked3_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFromUnchecked3_3EventHandler));
-            AddEventHandler("copy1DRangeFromUnchecked3_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeFromUnchecked3_4EventHandler));
-            AddEventHandler("copy1DRangeTo", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeToEventHandler));
-            AddEventHandler("copy1DRangeTo3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeTo3EventHandler));
-            AddEventHandler("copy1DRangeTo3_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeTo3_2EventHandler));
-            AddEventHandler("copy1DRangeTo3_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeTo3_3EventHandler));
-            AddEventHandler("copy1DRangeTo3_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeTo3_4EventHandler));
-            AddEventHandler("copy1DRangeToUnchecked", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeToUncheckedEventHandler));
-            AddEventHandler("copy1DRangeToUnchecked3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeToUnchecked3EventHandler));
-            AddEventHandler("copy1DRangeToUnchecked3_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeToUnchecked3_2EventHandler));
-            AddEventHandler("copy1DRangeToUnchecked3_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeToUnchecked3_3EventHandler));
-            AddEventHandler("copy1DRangeToUnchecked3_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy1DRangeToUnchecked3_4EventHandler));
-            AddEventHandler("copy2DRangeFrom", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeFromEventHandler));
-            AddEventHandler("copy2DRangeFrom7", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeFrom7EventHandler));
-            AddEventHandler("copy2DRangeFrom5_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeFrom5_2EventHandler));
-            AddEventHandler("copy2DRangeFrom5_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeFrom5_3EventHandler));
-            AddEventHandler("copy2DRangeFrom5_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeFrom5_4EventHandler));
-            AddEventHandler("copy2DRangeFrom5_5", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeFrom5_5EventHandler));
-            AddEventHandler("copy2DRangeFrom5_6", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeFrom5_6EventHandler));
-            AddEventHandler("copy2DRangeTo", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeToEventHandler));
-            AddEventHandler("copy2DRangeTo5", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeTo5EventHandler));
-            AddEventHandler("copy2DRangeTo5_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeTo5_2EventHandler));
-            AddEventHandler("copy2DRangeTo5_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeTo5_3EventHandler));
-            AddEventHandler("copy2DRangeTo5_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy2DRangeTo5_4EventHandler));
-            AddEventHandler("copy3DRangeFrom", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy3DRangeFromEventHandler));
-            AddEventHandler("copy3DRangeFrom7", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy3DRangeFrom7EventHandler));
-            AddEventHandler("copy3DRangeTo", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(Copy3DRangeToEventHandler));
-            AddEventHandler("copyFrom", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.Bitmap>>>(CopyFromEventHandler));
-            AddEventHandler("copyFrom1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Renderscript.Allocation>>>(CopyFrom1EventHandler));
-            AddEventHandler("copyFrom1_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Renderscript.BaseObj[]>>>(CopyFrom1_2EventHandler));
-            AddEventHandler("copyFrom1_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<byte[]>>>(CopyFrom1_3EventHandler));
-            AddEventHandler("copyFrom1_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<float[]>>>(CopyFrom1_4EventHandler));
-            AddEventHandler("copyFrom1_5", new System.EventHandler<CLRListenerEventArgs<CLREventData<int[]>>>(CopyFrom1_5EventHandler));
-            AddEventHandler("copyFrom1_6", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(CopyFrom1_6EventHandler));
-            AddEventHandler("copyFrom1_7", new System.EventHandler<CLRListenerEventArgs<CLREventData<short[]>>>(CopyFrom1_7EventHandler));
-            AddEventHandler("copyFromUnchecked", new System.EventHandler<CLRListenerEventArgs<CLREventData<byte[]>>>(CopyFromUncheckedEventHandler));
-            AddEventHandler("copyFromUnchecked1", new System.EventHandler<CLRListenerEventArgs<CLREventData<float[]>>>(CopyFromUnchecked1EventHandler));
-            AddEventHandler("copyFromUnchecked1_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<int[]>>>(CopyFromUnchecked1_2EventHandler));
-            AddEventHandler("copyFromUnchecked1_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(CopyFromUnchecked1_3EventHandler));
-            AddEventHandler("copyFromUnchecked1_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<short[]>>>(CopyFromUnchecked1_4EventHandler));
-            AddEventHandler("copyTo", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.Bitmap>>>(CopyToEventHandler));
-            AddEventHandler("copyTo1", new System.EventHandler<CLRListenerEventArgs<CLREventData<byte[]>>>(CopyTo1EventHandler));
-            AddEventHandler("copyTo1_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<float[]>>>(CopyTo1_2EventHandler));
-            AddEventHandler("copyTo1_3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int[]>>>(CopyTo1_3EventHandler));
-            AddEventHandler("copyTo1_4", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(CopyTo1_4EventHandler));
-            AddEventHandler("copyTo1_5", new System.EventHandler<CLRListenerEventArgs<CLREventData<short[]>>>(CopyTo1_5EventHandler));
-            AddEventHandler("generateMipmaps", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GenerateMipmapsEventHandler));
-            AddEventHandler("ioReceive", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IoReceiveEventHandler));
-            AddEventHandler("ioSend", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IoSendEventHandler));
-            AddEventHandler("setAutoPadding", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(SetAutoPaddingEventHandler));
-            AddEventHandler("setFromFieldPacker", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetFromFieldPackerEventHandler));
-            AddEventHandler("setFromFieldPacker3", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetFromFieldPacker3EventHandler));
-            AddEventHandler("setFromFieldPacker5_2", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetFromFieldPacker5_2EventHandler));
-            AddEventHandler("setOnBufferAvailableListener", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Renderscript.Allocation.OnBufferAvailableListener>>>(SetOnBufferAvailableListenerEventHandler));
-            AddEventHandler("setSurface", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Surface>>>(SetSurfaceEventHandler));
-            AddEventHandler("syncAll", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SyncAllEventHandler));
-            AddEventHandler("setFace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Renderscript.Type.CubemapFace>>>(SetFaceEventHandler));
-            AddEventHandler("setLOD", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetLODEventHandler));
-            AddEventHandler("setX", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetXEventHandler));
-            AddEventHandler("setY", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetYEventHandler));
-            AddEventHandler("setZ", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetZEventHandler));
-            AddEventHandler("setName", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(SetNameEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getElement()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetElement"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.Element> OnGetElement { get; set; } = null;
-
-        void GetElementEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetElement != null) ? OnGetElement : GetElement;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getElement()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Element GetElement()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getType()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Renderscript.Type> OnGetType { get; set; } = null;
-
-        void GetTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetType != null) ? OnGetType : GetType;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getType()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Renderscript.Type"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Renderscript.Type GetType()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getSurface()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetSurface"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.Surface> OnGetSurface { get; set; } = null;
-
-        void GetSurfaceEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetSurface != null) ? OnGetSurface : GetSurface;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getSurface()"/>
-        /// </summary>
-        /// <returns><see cref="Android.View.Surface"/></returns>
-        [System.Obsolete()]
-        public virtual Android.View.Surface GetSurface()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getBytesSize()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetBytesSize"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetBytesSize { get; set; } = null;
-
-        void GetBytesSizeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetBytesSize != null) ? OnGetBytesSize : GetBytesSize;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getBytesSize()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public virtual int GetBytesSize()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getUsage()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetUsage"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetUsage { get; set; } = null;
-
-        void GetUsageEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetUsage != null) ? OnGetUsage : GetUsage;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getUsage()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public virtual int GetUsage()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#getName()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetName"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String> OnGetName { get; set; } = null;
-
-        void GetNameEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetName != null) ? OnGetName : GetName;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#getName()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
-        public virtual Java.Lang.String GetName()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getByteBuffer()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetByteBuffer"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Nio.ByteBuffer> OnGetByteBuffer { get; set; } = null;
-
-        void GetByteBufferEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetByteBuffer != null) ? OnGetByteBuffer : GetByteBuffer;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getByteBuffer()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        [System.Obsolete()]
-        public virtual Java.Nio.ByteBuffer GetByteBuffer()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getStride()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetStride"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long> OnGetStride { get; set; } = null;
-
-        void GetStrideEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetStride != null) ? OnGetStride : GetStride;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getStride()"/>
-        /// </summary>
-        /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
-        public virtual long GetStride()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getTimeStamp()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetTimeStamp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long> OnGetTimeStamp { get; set; } = null;
-
-        void GetTimeStampEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetTimeStamp != null) ? OnGetTimeStamp : GetTimeStamp;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getTimeStamp()"/>
-        /// </summary>
-        /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
-        public virtual long GetTimeStamp()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,android.renderscript.Allocation,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFrom"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, Android.Renderscript.Allocation, int> OnCopy1DRangeFrom { get; set; } = null;
-
-        void Copy1DRangeFromEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFrom != null) ? OnCopy1DRangeFrom : Copy1DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.Renderscript.Allocation>(1), data.EventData.GetAt<int>(2));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,android.renderscript.Allocation,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFrom(int arg0, int arg1, Android.Renderscript.Allocation arg2, int arg3)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFrom3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, byte[]> OnCopy1DRangeFrom3 { get; set; } = null;
-
-        void Copy1DRangeFrom3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFrom3 != null) ? OnCopy1DRangeFrom3 : Copy1DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<byte[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFrom(int arg0, int arg1, byte[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFrom3_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, float[]> OnCopy1DRangeFrom3_2 { get; set; } = null;
-
-        void Copy1DRangeFrom3_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFrom3_2 != null) ? OnCopy1DRangeFrom3_2 : Copy1DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<float[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFrom(int arg0, int arg1, float[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFrom3_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int[]> OnCopy1DRangeFrom3_3 { get; set; } = null;
-
-        void Copy1DRangeFrom3_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFrom3_3 != null) ? OnCopy1DRangeFrom3_3 : Copy1DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFrom(int arg0, int arg1, int[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFrom3_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, object> OnCopy1DRangeFrom3_4 { get; set; } = null;
-
-        void Copy1DRangeFrom3_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFrom3_4 != null) ? OnCopy1DRangeFrom3_4 : Copy1DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<object>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFrom(int arg0, int arg1, object arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFrom3_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, short[]> OnCopy1DRangeFrom3_5 { get; set; } = null;
-
-        void Copy1DRangeFrom3_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFrom3_5 != null) ? OnCopy1DRangeFrom3_5 : Copy1DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<short[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFrom(int arg0, int arg1, short[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFromUnchecked"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, byte[]> OnCopy1DRangeFromUnchecked { get; set; } = null;
-
-        void Copy1DRangeFromUncheckedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFromUnchecked != null) ? OnCopy1DRangeFromUnchecked : Copy1DRangeFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<byte[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFromUnchecked(int arg0, int arg1, byte[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFromUnchecked3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, float[]> OnCopy1DRangeFromUnchecked3 { get; set; } = null;
-
-        void Copy1DRangeFromUnchecked3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFromUnchecked3 != null) ? OnCopy1DRangeFromUnchecked3 : Copy1DRangeFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<float[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFromUnchecked(int arg0, int arg1, float[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFromUnchecked3_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int[]> OnCopy1DRangeFromUnchecked3_2 { get; set; } = null;
-
-        void Copy1DRangeFromUnchecked3_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFromUnchecked3_2 != null) ? OnCopy1DRangeFromUnchecked3_2 : Copy1DRangeFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFromUnchecked(int arg0, int arg1, int[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFromUnchecked3_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, object> OnCopy1DRangeFromUnchecked3_3 { get; set; } = null;
-
-        void Copy1DRangeFromUnchecked3_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFromUnchecked3_3 != null) ? OnCopy1DRangeFromUnchecked3_3 : Copy1DRangeFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<object>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFromUnchecked(int arg0, int arg1, object arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeFromUnchecked3_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, short[]> OnCopy1DRangeFromUnchecked3_4 { get; set; } = null;
-
-        void Copy1DRangeFromUnchecked3_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeFromUnchecked3_4 != null) ? OnCopy1DRangeFromUnchecked3_4 : Copy1DRangeFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<short[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeFromUnchecked(int arg0, int arg1, short[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeTo"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, byte[]> OnCopy1DRangeTo { get; set; } = null;
-
-        void Copy1DRangeToEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeTo != null) ? OnCopy1DRangeTo : Copy1DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<byte[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeTo(int arg0, int arg1, byte[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeTo3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, float[]> OnCopy1DRangeTo3 { get; set; } = null;
-
-        void Copy1DRangeTo3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeTo3 != null) ? OnCopy1DRangeTo3 : Copy1DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<float[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeTo(int arg0, int arg1, float[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeTo3_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int[]> OnCopy1DRangeTo3_2 { get; set; } = null;
-
-        void Copy1DRangeTo3_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeTo3_2 != null) ? OnCopy1DRangeTo3_2 : Copy1DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeTo(int arg0, int arg1, int[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeTo3_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, object> OnCopy1DRangeTo3_3 { get; set; } = null;
-
-        void Copy1DRangeTo3_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeTo3_3 != null) ? OnCopy1DRangeTo3_3 : Copy1DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<object>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeTo(int arg0, int arg1, object arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeTo3_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, short[]> OnCopy1DRangeTo3_4 { get; set; } = null;
-
-        void Copy1DRangeTo3_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeTo3_4 != null) ? OnCopy1DRangeTo3_4 : Copy1DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<short[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeTo(int arg0, int arg1, short[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeToUnchecked"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, byte[]> OnCopy1DRangeToUnchecked { get; set; } = null;
-
-        void Copy1DRangeToUncheckedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeToUnchecked != null) ? OnCopy1DRangeToUnchecked : Copy1DRangeToUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<byte[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeToUnchecked(int arg0, int arg1, byte[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeToUnchecked3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, float[]> OnCopy1DRangeToUnchecked3 { get; set; } = null;
-
-        void Copy1DRangeToUnchecked3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeToUnchecked3 != null) ? OnCopy1DRangeToUnchecked3 : Copy1DRangeToUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<float[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeToUnchecked(int arg0, int arg1, float[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeToUnchecked3_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int[]> OnCopy1DRangeToUnchecked3_2 { get; set; } = null;
-
-        void Copy1DRangeToUnchecked3_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeToUnchecked3_2 != null) ? OnCopy1DRangeToUnchecked3_2 : Copy1DRangeToUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeToUnchecked(int arg0, int arg1, int[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeToUnchecked3_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, object> OnCopy1DRangeToUnchecked3_3 { get; set; } = null;
-
-        void Copy1DRangeToUnchecked3_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeToUnchecked3_3 != null) ? OnCopy1DRangeToUnchecked3_3 : Copy1DRangeToUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<object>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeToUnchecked(int arg0, int arg1, object arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy1DRangeToUnchecked3_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, short[]> OnCopy1DRangeToUnchecked3_4 { get; set; } = null;
-
-        void Copy1DRangeToUnchecked3_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy1DRangeToUnchecked3_4 != null) ? OnCopy1DRangeToUnchecked3_4 : Copy1DRangeToUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<short[]>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void Copy1DRangeToUnchecked(int arg0, int arg1, short[] arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeFrom"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, Android.Graphics.Bitmap> OnCopy2DRangeFrom { get; set; } = null;
-
-        void Copy2DRangeFromEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeFrom != null) ? OnCopy2DRangeFrom : Copy2DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.Graphics.Bitmap>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeFrom(int arg0, int arg1, Android.Graphics.Bitmap arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,android.renderscript.Allocation,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeFrom7"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, Android.Renderscript.Allocation, int, int> OnCopy2DRangeFrom7 { get; set; } = null;
-
-        void Copy2DRangeFrom7EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeFrom7 != null) ? OnCopy2DRangeFrom7 : Copy2DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<Android.Renderscript.Allocation>(3), data.EventData.GetAt<int>(4), data.EventData.GetAt<int>(5));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,android.renderscript.Allocation,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, int arg6)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeFrom5_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, byte[]> OnCopy2DRangeFrom5_2 { get; set; } = null;
-
-        void Copy2DRangeFrom5_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeFrom5_2 != null) ? OnCopy2DRangeFrom5_2 : Copy2DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<byte[]>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, byte[] arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeFrom5_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, float[]> OnCopy2DRangeFrom5_3 { get; set; } = null;
-
-        void Copy2DRangeFrom5_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeFrom5_3 != null) ? OnCopy2DRangeFrom5_3 : Copy2DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<float[]>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, float[] arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeFrom5_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, int[]> OnCopy2DRangeFrom5_4 { get; set; } = null;
-
-        void Copy2DRangeFrom5_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeFrom5_4 != null) ? OnCopy2DRangeFrom5_4 : Copy2DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<int[]>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, int[] arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeFrom5_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, object> OnCopy2DRangeFrom5_5 { get; set; } = null;
-
-        void Copy2DRangeFrom5_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeFrom5_5 != null) ? OnCopy2DRangeFrom5_5 : Copy2DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<object>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, object arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeFrom5_6"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, short[]> OnCopy2DRangeFrom5_6 { get; set; } = null;
-
-        void Copy2DRangeFrom5_6EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeFrom5_6 != null) ? OnCopy2DRangeFrom5_6 : Copy2DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<short[]>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, short[] arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeTo"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, byte[]> OnCopy2DRangeTo { get; set; } = null;
-
-        void Copy2DRangeToEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeTo != null) ? OnCopy2DRangeTo : Copy2DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<byte[]>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, byte[] arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeTo5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, float[]> OnCopy2DRangeTo5 { get; set; } = null;
-
-        void Copy2DRangeTo5EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeTo5 != null) ? OnCopy2DRangeTo5 : Copy2DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<float[]>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, float[] arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeTo5_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, int[]> OnCopy2DRangeTo5_2 { get; set; } = null;
-
-        void Copy2DRangeTo5_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeTo5_2 != null) ? OnCopy2DRangeTo5_2 : Copy2DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<int[]>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, int[] arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeTo5_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, object> OnCopy2DRangeTo5_3 { get; set; } = null;
-
-        void Copy2DRangeTo5_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeTo5_3 != null) ? OnCopy2DRangeTo5_3 : Copy2DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<object>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, object arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy2DRangeTo5_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, short[]> OnCopy2DRangeTo5_4 { get; set; } = null;
-
-        void Copy2DRangeTo5_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy2DRangeTo5_4 != null) ? OnCopy2DRangeTo5_4 : Copy2DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<short[]>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, short[] arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeFrom(int,int,int,int,int,int,android.renderscript.Allocation,int,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy3DRangeFrom"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, int, int, Android.Renderscript.Allocation, int, int, int> OnCopy3DRangeFrom { get; set; } = null;
-
-        void Copy3DRangeFromEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy3DRangeFrom != null) ? OnCopy3DRangeFrom : Copy3DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<int>(3), data.EventData.GetAt<int>(4), data.EventData.GetAt<Android.Renderscript.Allocation>(5), data.EventData.GetAt<int>(6), data.EventData.GetAt<int>(7), data.EventData.GetAt<int>(8));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeFrom(int,int,int,int,int,int,android.renderscript.Allocation,int,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        /// <param name="arg7"><see cref="int"/></param>
-        /// <param name="arg8"><see cref="int"/></param>
-        /// <param name="arg9"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void Copy3DRangeFrom(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, Android.Renderscript.Allocation arg6, int arg7, int arg8, int arg9)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeFrom(int,int,int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy3DRangeFrom7"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, int, int, object> OnCopy3DRangeFrom7 { get; set; } = null;
-
-        void Copy3DRangeFrom7EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy3DRangeFrom7 != null) ? OnCopy3DRangeFrom7 : Copy3DRangeFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<int>(3), data.EventData.GetAt<int>(4), data.EventData.GetAt<object>(5));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeFrom(int,int,int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <param name="arg6"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void Copy3DRangeFrom(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, object arg6)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeTo(int,int,int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopy3DRangeTo"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, int, int, object> OnCopy3DRangeTo { get; set; } = null;
-
-        void Copy3DRangeToEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnCopy3DRangeTo != null) ? OnCopy3DRangeTo : Copy3DRangeTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<int>(3), data.EventData.GetAt<int>(4), data.EventData.GetAt<object>(5));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeTo(int,int,int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <param name="arg6"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void Copy3DRangeTo(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, object arg6)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFrom"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Graphics.Bitmap> OnCopyFrom { get; set; } = null;
-
-        void CopyFromEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.Bitmap>> data)
-        {
-            var methodToExecute = (OnCopyFrom != null) ? OnCopyFrom : CopyFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFrom(Android.Graphics.Bitmap arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.renderscript.Allocation)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFrom1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Renderscript.Allocation> OnCopyFrom1 { get; set; } = null;
-
-        void CopyFrom1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.Allocation>> data)
-        {
-            var methodToExecute = (OnCopyFrom1 != null) ? OnCopyFrom1 : CopyFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.renderscript.Allocation)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFrom(Android.Renderscript.Allocation arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.renderscript.BaseObj[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFrom1_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Renderscript.BaseObj[]> OnCopyFrom1_2 { get; set; } = null;
-
-        void CopyFrom1_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.BaseObj[]>> data)
-        {
-            var methodToExecute = (OnCopyFrom1_2 != null) ? OnCopyFrom1_2 : CopyFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.renderscript.BaseObj[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.BaseObj"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFrom(Android.Renderscript.BaseObj[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFrom1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<byte[]> OnCopyFrom1_3 { get; set; } = null;
-
-        void CopyFrom1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<byte[]>> data)
-        {
-            var methodToExecute = (OnCopyFrom1_3 != null) ? OnCopyFrom1_3 : CopyFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFrom(byte[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFrom1_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<float[]> OnCopyFrom1_4 { get; set; } = null;
-
-        void CopyFrom1_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<float[]>> data)
-        {
-            var methodToExecute = (OnCopyFrom1_4 != null) ? OnCopyFrom1_4 : CopyFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFrom(float[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFrom1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int[]> OnCopyFrom1_5 { get; set; } = null;
-
-        void CopyFrom1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<int[]>> data)
-        {
-            var methodToExecute = (OnCopyFrom1_5 != null) ? OnCopyFrom1_5 : CopyFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFrom(int[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFrom1_6"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<object> OnCopyFrom1_6 { get; set; } = null;
-
-        void CopyFrom1_6EventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
-        {
-            var methodToExecute = (OnCopyFrom1_6 != null) ? OnCopyFrom1_6 : CopyFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFrom(object arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFrom1_7"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<short[]> OnCopyFrom1_7 { get; set; } = null;
-
-        void CopyFrom1_7EventHandler(object sender, CLRListenerEventArgs<CLREventData<short[]>> data)
-        {
-            var methodToExecute = (OnCopyFrom1_7 != null) ? OnCopyFrom1_7 : CopyFrom;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFrom(short[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFromUnchecked"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<byte[]> OnCopyFromUnchecked { get; set; } = null;
-
-        void CopyFromUncheckedEventHandler(object sender, CLRListenerEventArgs<CLREventData<byte[]>> data)
-        {
-            var methodToExecute = (OnCopyFromUnchecked != null) ? OnCopyFromUnchecked : CopyFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFromUnchecked(byte[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFromUnchecked1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<float[]> OnCopyFromUnchecked1 { get; set; } = null;
-
-        void CopyFromUnchecked1EventHandler(object sender, CLRListenerEventArgs<CLREventData<float[]>> data)
-        {
-            var methodToExecute = (OnCopyFromUnchecked1 != null) ? OnCopyFromUnchecked1 : CopyFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFromUnchecked(float[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFromUnchecked1_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int[]> OnCopyFromUnchecked1_2 { get; set; } = null;
-
-        void CopyFromUnchecked1_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<int[]>> data)
-        {
-            var methodToExecute = (OnCopyFromUnchecked1_2 != null) ? OnCopyFromUnchecked1_2 : CopyFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFromUnchecked(int[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFromUnchecked1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<object> OnCopyFromUnchecked1_3 { get; set; } = null;
-
-        void CopyFromUnchecked1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
-        {
-            var methodToExecute = (OnCopyFromUnchecked1_3 != null) ? OnCopyFromUnchecked1_3 : CopyFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFromUnchecked(object arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyFromUnchecked1_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<short[]> OnCopyFromUnchecked1_4 { get; set; } = null;
-
-        void CopyFromUnchecked1_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<short[]>> data)
-        {
-            var methodToExecute = (OnCopyFromUnchecked1_4 != null) ? OnCopyFromUnchecked1_4 : CopyFromUnchecked;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void CopyFromUnchecked(short[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyTo"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Graphics.Bitmap> OnCopyTo { get; set; } = null;
-
-        void CopyToEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.Bitmap>> data)
-        {
-            var methodToExecute = (OnCopyTo != null) ? OnCopyTo : CopyTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
-        public virtual void CopyTo(Android.Graphics.Bitmap arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyTo1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<byte[]> OnCopyTo1 { get; set; } = null;
-
-        void CopyTo1EventHandler(object sender, CLRListenerEventArgs<CLREventData<byte[]>> data)
-        {
-            var methodToExecute = (OnCopyTo1 != null) ? OnCopyTo1 : CopyTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public virtual void CopyTo(byte[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(float[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyTo1_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<float[]> OnCopyTo1_2 { get; set; } = null;
-
-        void CopyTo1_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<float[]>> data)
-        {
-            var methodToExecute = (OnCopyTo1_2 != null) ? OnCopyTo1_2 : CopyTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
-        public virtual void CopyTo(float[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyTo1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int[]> OnCopyTo1_3 { get; set; } = null;
-
-        void CopyTo1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int[]>> data)
-        {
-            var methodToExecute = (OnCopyTo1_3 != null) ? OnCopyTo1_3 : CopyTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void CopyTo(int[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyTo1_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<object> OnCopyTo1_4 { get; set; } = null;
-
-        void CopyTo1_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
-        {
-            var methodToExecute = (OnCopyTo1_4 != null) ? OnCopyTo1_4 : CopyTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
-        public virtual void CopyTo(object arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(short[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCopyTo1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<short[]> OnCopyTo1_5 { get; set; } = null;
-
-        void CopyTo1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<short[]>> data)
-        {
-            var methodToExecute = (OnCopyTo1_5 != null) ? OnCopyTo1_5 : CopyTo;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
-        public virtual void CopyTo(short[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#generateMipmaps()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGenerateMipmaps"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnGenerateMipmaps { get; set; } = null;
-
-        void GenerateMipmapsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGenerateMipmaps != null) ? OnGenerateMipmaps : GenerateMipmaps;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#generateMipmaps()"/>
-        /// </summary>
-        [System.Obsolete()]
-        public virtual void GenerateMipmaps()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#ioReceive()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIoReceive"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnIoReceive { get; set; } = null;
-
-        void IoReceiveEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIoReceive != null) ? OnIoReceive : IoReceive;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#ioReceive()"/>
-        /// </summary>
-        [System.Obsolete()]
-        public virtual void IoReceive()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#ioSend()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIoSend"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnIoSend { get; set; } = null;
-
-        void IoSendEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIoSend != null) ? OnIoSend : IoSend;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#ioSend()"/>
-        /// </summary>
-        [System.Obsolete()]
-        public virtual void IoSend()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setAutoPadding(boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetAutoPadding"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<bool> OnSetAutoPadding { get; set; } = null;
-
-        void SetAutoPaddingEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnSetAutoPadding != null) ? OnSetAutoPadding : SetAutoPadding;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setAutoPadding(boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
-        public virtual void SetAutoPadding(bool arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFromFieldPacker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, Android.Renderscript.FieldPacker> OnSetFromFieldPacker { get; set; } = null;
-
-        void SetFromFieldPackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetFromFieldPacker != null) ? OnSetFromFieldPacker : SetFromFieldPacker;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Renderscript.FieldPacker>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
-        public virtual void SetFromFieldPacker(int arg0, Android.Renderscript.FieldPacker arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFromFieldPacker3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, Android.Renderscript.FieldPacker> OnSetFromFieldPacker3 { get; set; } = null;
-
-        void SetFromFieldPacker3EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetFromFieldPacker3 != null) ? OnSetFromFieldPacker3 : SetFromFieldPacker;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.Renderscript.FieldPacker>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
-        public virtual void SetFromFieldPacker(int arg0, int arg1, Android.Renderscript.FieldPacker arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,int,int,int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFromFieldPacker5_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int, int, int, Android.Renderscript.FieldPacker> OnSetFromFieldPacker5_2 { get; set; } = null;
-
-        void SetFromFieldPacker5_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetFromFieldPacker5_2 != null) ? OnSetFromFieldPacker5_2 : SetFromFieldPacker;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<Android.Renderscript.FieldPacker>(3));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,int,int,int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
-        public virtual void SetFromFieldPacker(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.FieldPacker arg4)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setOnBufferAvailableListener(android.renderscript.Allocation.OnBufferAvailableListener)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetOnBufferAvailableListener"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Renderscript.Allocation.OnBufferAvailableListener> OnSetOnBufferAvailableListener { get; set; } = null;
-
-        void SetOnBufferAvailableListenerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.Allocation.OnBufferAvailableListener>> data)
-        {
-            var methodToExecute = (OnSetOnBufferAvailableListener != null) ? OnSetOnBufferAvailableListener : SetOnBufferAvailableListener;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setOnBufferAvailableListener(android.renderscript.Allocation.OnBufferAvailableListener)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.Allocation.OnBufferAvailableListener"/></param>
-        [System.Obsolete()]
-        public virtual void SetOnBufferAvailableListener(Android.Renderscript.Allocation.OnBufferAvailableListener arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setSurface(android.view.Surface)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetSurface"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.Surface> OnSetSurface { get; set; } = null;
-
-        void SetSurfaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Surface>> data)
-        {
-            var methodToExecute = (OnSetSurface != null) ? OnSetSurface : SetSurface;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setSurface(android.view.Surface)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.Surface"/></param>
-        [System.Obsolete()]
-        public virtual void SetSurface(Android.View.Surface arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#syncAll(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSyncAll"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSyncAll { get; set; } = null;
-
-        void SyncAllEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSyncAll != null) ? OnSyncAll : SyncAll;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#syncAll(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void SyncAll(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setFace(android.renderscript.Type.CubemapFace)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Renderscript.Type.CubemapFace> OnSetFace { get; set; } = null;
-
-        void SetFaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Renderscript.Type.CubemapFace>> data)
-        {
-            var methodToExecute = (OnSetFace != null) ? OnSetFace : SetFace;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setFace(android.renderscript.Type.CubemapFace)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.Type.CubemapFace"/></param>
-        [System.Obsolete()]
-        public virtual void SetFace(Android.Renderscript.Type.CubemapFace arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setLOD(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetLOD"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetLOD { get; set; } = null;
-
-        void SetLODEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetLOD != null) ? OnSetLOD : SetLOD;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setLOD(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void SetLOD(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setX(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetX"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetX { get; set; } = null;
-
-        void SetXEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetX != null) ? OnSetX : SetX;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setX(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void SetX(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setY(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetY"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetY { get; set; } = null;
-
-        void SetYEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetY != null) ? OnSetY : SetY;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setY(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void SetY(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setZ(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetZ"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetZ { get; set; } = null;
-
-        void SetZEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetZ != null) ? OnSetZ : SetZ;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setZ(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void SetZ(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#setName(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetName"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnSetName { get; set; } = null;
-
-        void SetNameEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnSetName != null) ? OnSetName : SetName;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#setName(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
-        public virtual void SetName(Java.Lang.String arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region AllocationAdapterDirect
-    public partial class AllocationAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getByteBuffer()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Nio.ByteBuffer ByteBuffer
-        {
-            get { return IExecute<Java.Nio.ByteBuffer>("getByteBuffer"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getBytesSize()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int BytesSize
-        {
-            get { return IExecute<int>("getBytesSize"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getElement()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Element Element
-        {
-            get { return IExecute<Android.Renderscript.Element>("getElement"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#getName()"/> <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#setName(java.lang.String)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Name
-        {
-            get { return IExecute<Java.Lang.String>("getName"); } set { IExecute("setName", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getStride()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public long Stride
-        {
-            get { return IExecute<long>("getStride"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getSurface()"/> <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setSurface(android.view.Surface)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Android.View.Surface Surface
-        {
-            get { return IExecute<Android.View.Surface>("getSurface"); } set { IExecute("setSurface", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getTimeStamp()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public long TimeStamp
-        {
-            get { return IExecute<long>("getTimeStamp"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getType()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Type Type
-        {
-            get { return IExecute<Android.Renderscript.Type>("getType"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#getUsage()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Usage
-        {
-            get { return IExecute<int>("getUsage"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,android.renderscript.Allocation,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFrom(int arg0, int arg1, Android.Renderscript.Allocation arg2, int arg3)
-        {
-            IExecute("copy1DRangeFrom", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFrom(int arg0, int arg1, byte[] arg2)
-        {
-            IExecute("copy1DRangeFrom", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFrom(int arg0, int arg1, float[] arg2)
-        {
-            IExecute("copy1DRangeFrom", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFrom(int arg0, int arg1, int[] arg2)
-        {
-            IExecute("copy1DRangeFrom", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFrom(int arg0, int arg1, object arg2)
-        {
-            IExecute("copy1DRangeFrom", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFrom(int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFrom(int arg0, int arg1, short[] arg2)
-        {
-            IExecute("copy1DRangeFrom", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFromUnchecked(int arg0, int arg1, byte[] arg2)
-        {
-            IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFromUnchecked(int arg0, int arg1, float[] arg2)
-        {
-            IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFromUnchecked(int arg0, int arg1, int[] arg2)
-        {
-            IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFromUnchecked(int arg0, int arg1, object arg2)
-        {
-            IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeFromUnchecked(int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeFromUnchecked(int arg0, int arg1, short[] arg2)
-        {
-            IExecute("copy1DRangeFromUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeTo(int arg0, int arg1, byte[] arg2)
-        {
-            IExecute("copy1DRangeTo", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeTo(int arg0, int arg1, float[] arg2)
-        {
-            IExecute("copy1DRangeTo", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeTo(int arg0, int arg1, int[] arg2)
-        {
-            IExecute("copy1DRangeTo", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeTo(int arg0, int arg1, object arg2)
-        {
-            IExecute("copy1DRangeTo", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeTo(int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeTo(int arg0, int arg1, short[] arg2)
-        {
-            IExecute("copy1DRangeTo", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeToUnchecked(int arg0, int arg1, byte[] arg2)
-        {
-            IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeToUnchecked(int arg0, int arg1, float[] arg2)
-        {
-            IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeToUnchecked(int arg0, int arg1, int[] arg2)
-        {
-            IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeToUnchecked(int arg0, int arg1, object arg2)
-        {
-            IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy1DRangeToUnchecked(int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void Copy1DRangeToUnchecked(int arg0, int arg1, short[] arg2)
-        {
-            IExecute("copy1DRangeToUnchecked", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeFrom(int arg0, int arg1, Android.Graphics.Bitmap arg2)
-        {
-            IExecute("copy2DRangeFrom", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,android.renderscript.Allocation,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, int arg6)
-        {
-            IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, byte[] arg4)
-        {
-            IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, float[] arg4)
-        {
-            IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, int[] arg4)
-        {
-            IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, object arg4)
-        {
-            IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeFrom(int,int,int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeFrom(int arg0, int arg1, int arg2, int arg3, short[] arg4)
-        {
-            IExecute("copy2DRangeFrom", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, byte[] arg4)
-        {
-            IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, float[] arg4)
-        {
-            IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, int[] arg4)
-        {
-            IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, object arg4)
-        {
-            IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy2DRangeTo(int,int,int,int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void Copy2DRangeTo(int arg0, int arg1, int arg2, int arg3, short[] arg4)
-        {
-            IExecute("copy2DRangeTo", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeFrom(int,int,int,int,int,int,android.renderscript.Allocation,int,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        /// <param name="arg7"><see cref="int"/></param>
-        /// <param name="arg8"><see cref="int"/></param>
-        /// <param name="arg9"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void Copy3DRangeFrom(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, Android.Renderscript.Allocation arg6, int arg7, int arg8, int arg9)
-        {
-            IExecute("copy3DRangeFrom", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeFrom(int,int,int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <param name="arg6"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void Copy3DRangeFrom(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, object arg6)
-        {
-            IExecute("copy3DRangeFrom", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copy3DRangeTo(int,int,int,int,int,int,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <param name="arg6"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void Copy3DRangeTo(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, object arg6)
-        {
-            IExecute("copy3DRangeTo", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
-        public override void CopyFrom(Android.Graphics.Bitmap arg0)
-        {
-            IExecute("copyFrom", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.renderscript.Allocation)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
-        public override void CopyFrom(Android.Renderscript.Allocation arg0)
-        {
-            IExecute("copyFrom", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(android.renderscript.BaseObj[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.BaseObj"/></param>
-        [System.Obsolete()]
-        public override void CopyFrom(Android.Renderscript.BaseObj[] arg0)
-        {
-            IExecute("copyFrom", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void CopyFrom(byte[] arg0)
-        {
-            IExecute("copyFrom", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void CopyFrom(float[] arg0)
-        {
-            IExecute("copyFrom", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void CopyFrom(int[] arg0)
-        {
-            IExecute("copyFrom", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void CopyFrom(object arg0)
-        {
-            IExecute("copyFrom", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFrom(short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void CopyFrom(short[] arg0)
-        {
-            IExecute("copyFrom", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void CopyFromUnchecked(byte[] arg0)
-        {
-            IExecute("copyFromUnchecked", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void CopyFromUnchecked(float[] arg0)
-        {
-            IExecute("copyFromUnchecked", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void CopyFromUnchecked(int[] arg0)
-        {
-            IExecute("copyFromUnchecked", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void CopyFromUnchecked(object arg0)
-        {
-            IExecute("copyFromUnchecked", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyFromUnchecked(short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void CopyFromUnchecked(short[] arg0)
-        {
-            IExecute("copyFromUnchecked", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(android.graphics.Bitmap)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
-        public override void CopyTo(Android.Graphics.Bitmap arg0)
-        {
-            IExecute("copyTo", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
-        public override void CopyTo(byte[] arg0)
-        {
-            IExecute("copyTo", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
-        public override void CopyTo(float[] arg0)
-        {
-            IExecute("copyTo", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void CopyTo(int[] arg0)
-        {
-            IExecute("copyTo", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        [System.Obsolete()]
-        public override void CopyTo(object arg0)
-        {
-            IExecute("copyTo", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#copyTo(short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
-        public override void CopyTo(short[] arg0)
-        {
-            IExecute("copyTo", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#generateMipmaps()"/>
-        /// </summary>
-        [System.Obsolete()]
-        public override void GenerateMipmaps()
-        {
-            IExecute("generateMipmaps");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#ioReceive()"/>
-        /// </summary>
-        [System.Obsolete()]
-        public override void IoReceive()
-        {
-            IExecute("ioReceive");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#ioSend()"/>
-        /// </summary>
-        [System.Obsolete()]
-        public override void IoSend()
-        {
-            IExecute("ioSend");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setAutoPadding(boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
-        public override void SetAutoPadding(bool arg0)
-        {
-            IExecute("setAutoPadding", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
-        public override void SetFromFieldPacker(int arg0, Android.Renderscript.FieldPacker arg1)
-        {
-            IExecute("setFromFieldPacker", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
-        public override void SetFromFieldPacker(int arg0, int arg1, Android.Renderscript.FieldPacker arg2)
-        {
-            IExecute("setFromFieldPacker", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setFromFieldPacker(int,int,int,int,android.renderscript.FieldPacker)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
-        public override void SetFromFieldPacker(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.FieldPacker arg4)
-        {
-            IExecute("setFromFieldPacker", arg0, arg1, arg2, arg3, arg4);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#setOnBufferAvailableListener(android.renderscript.Allocation.OnBufferAvailableListener)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Renderscript.Allocation.OnBufferAvailableListener"/></param>
-        [System.Obsolete()]
-        public override void SetOnBufferAvailableListener(Android.Renderscript.Allocation.OnBufferAvailableListener arg0)
-        {
-            IExecute("setOnBufferAvailableListener", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Allocation.html#syncAll(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void SyncAll(int arg0)
-        {
-            IExecute("syncAll", arg0);
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setFace(android.renderscript.Type.CubemapFace)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Type.CubemapFace"/></param>
-        [System.Obsolete()]
-        public override void SetFace(Android.Renderscript.Type.CubemapFace arg0)
+        [global::System.Obsolete()]
+        public void SetFace(Android.Renderscript.Type.CubemapFace arg0)
         {
             IExecuteWithSignature("setFace", "(Landroid/renderscript/Type$CubemapFace;)V", arg0);
         }
@@ -3305,8 +92,8 @@ public override void SetFace(Android.Renderscript.Type.CubemapFace arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setLOD(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void SetLOD(int arg0)
+        [global::System.Obsolete()]
+        public void SetLOD(int arg0)
         {
             IExecuteWithSignature("setLOD", "(I)V", arg0);
         }
@@ -3314,8 +101,8 @@ public override void SetLOD(int arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setX(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void SetX(int arg0)
+        [global::System.Obsolete()]
+        public void SetX(int arg0)
         {
             IExecuteWithSignature("setX", "(I)V", arg0);
         }
@@ -3323,8 +110,8 @@ public override void SetX(int arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setY(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void SetY(int arg0)
+        [global::System.Obsolete()]
+        public void SetY(int arg0)
         {
             IExecuteWithSignature("setY", "(I)V", arg0);
         }
@@ -3332,8 +119,8 @@ public override void SetY(int arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/AllocationAdapter.html#setZ(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void SetZ(int arg0)
+        [global::System.Obsolete()]
+        public void SetZ(int arg0)
         {
             IExecuteWithSignature("setZ", "(I)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/BaseObj.cs b/src/net/Netdroid/Generated/Android/Renderscript/BaseObj.cs
index a9e7fc768..46d207e66 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/BaseObj.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/BaseObj.cs
@@ -46,21 +46,31 @@ public partial class BaseObj
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#getName()"/> <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#setName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#getName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#destroy()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Destroy()
         {
             IExecuteWithSignature("destroy", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/BaseObj.html#setName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setName", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Byte2.cs b/src/net/Netdroid/Generated/Android/Renderscript/Byte2.cs
index f060a6171..1b9117129 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Byte2.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Byte2.cs
@@ -34,7 +34,7 @@ public partial class Byte2
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Byte2(byte arg0, byte arg1)
             : base(arg0, arg1)
         {
@@ -50,12 +50,12 @@ public Byte2(byte arg0, byte arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte2.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte x { get { return IGetField<byte>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte2.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte y { get { return IGetField<byte>("y"); } set { ISetField("y", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Byte3.cs b/src/net/Netdroid/Generated/Android/Renderscript/Byte3.cs
index 985afb407..3989feb7e 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Byte3.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Byte3.cs
@@ -35,7 +35,7 @@ public partial class Byte3
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Byte3(byte arg0, byte arg1, byte arg2)
             : base(arg0, arg1, arg2)
         {
@@ -51,17 +51,17 @@ public Byte3(byte arg0, byte arg1, byte arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte3.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte x { get { return IGetField<byte>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte3.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte y { get { return IGetField<byte>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte3.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte z { get { return IGetField<byte>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Byte4.cs b/src/net/Netdroid/Generated/Android/Renderscript/Byte4.cs
index c98154e58..64d319537 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Byte4.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Byte4.cs
@@ -36,7 +36,7 @@ public partial class Byte4
         /// <param name="arg1"><see cref="byte"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
         /// <param name="arg3"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Byte4(byte arg0, byte arg1, byte arg2, byte arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -52,22 +52,22 @@ public Byte4(byte arg0, byte arg1, byte arg2, byte arg3)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte4.html#w"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte w { get { return IGetField<byte>("w"); } set { ISetField("w", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte4.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte x { get { return IGetField<byte>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte4.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte y { get { return IGetField<byte>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Byte4.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte z { get { return IGetField<byte>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Double2.cs b/src/net/Netdroid/Generated/Android/Renderscript/Double2.cs
index 37ab7d2bf..43469705a 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Double2.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Double2.cs
@@ -34,7 +34,7 @@ public partial class Double2
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Double2(double arg0, double arg1)
             : base(arg0, arg1)
         {
@@ -50,12 +50,12 @@ public Double2(double arg0, double arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double2.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double x { get { return IGetField<double>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double2.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double y { get { return IGetField<double>("y"); } set { ISetField("y", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Double3.cs b/src/net/Netdroid/Generated/Android/Renderscript/Double3.cs
index 9782875bc..cb9511cdc 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Double3.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Double3.cs
@@ -35,7 +35,7 @@ public partial class Double3
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
         /// <param name="arg2"><see cref="double"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Double3(double arg0, double arg1, double arg2)
             : base(arg0, arg1, arg2)
         {
@@ -51,17 +51,17 @@ public Double3(double arg0, double arg1, double arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double3.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double x { get { return IGetField<double>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double3.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double y { get { return IGetField<double>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double3.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double z { get { return IGetField<double>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Double4.cs b/src/net/Netdroid/Generated/Android/Renderscript/Double4.cs
index 4d2b7ccd2..de1162617 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Double4.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Double4.cs
@@ -36,7 +36,7 @@ public partial class Double4
         /// <param name="arg1"><see cref="double"/></param>
         /// <param name="arg2"><see cref="double"/></param>
         /// <param name="arg3"><see cref="double"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Double4(double arg0, double arg1, double arg2, double arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -52,22 +52,22 @@ public Double4(double arg0, double arg1, double arg2, double arg3)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double4.html#w"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double w { get { return IGetField<double>("w"); } set { ISetField("w", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double4.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double x { get { return IGetField<double>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double4.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double y { get { return IGetField<double>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Double4.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double z { get { return IGetField<double>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Element.cs b/src/net/Netdroid/Generated/Android/Renderscript/Element.cs
index 2fab045cb..4764b277a 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Element.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Element.cs
@@ -46,7 +46,7 @@ public partial class Element
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element A_8(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "A_8", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -56,7 +56,7 @@ public static Android.Renderscript.Element A_8(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element ALLOCATION(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "ALLOCATION", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -66,7 +66,7 @@ public static Android.Renderscript.Element ALLOCATION(Android.Renderscript.Rende
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element BOOLEAN(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "BOOLEAN", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -78,7 +78,7 @@ public static Android.Renderscript.Element BOOLEAN(Android.Renderscript.RenderSc
         /// <param name="arg1"><see cref="Android.Renderscript.Element.DataType"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Element.DataKind"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element CreatePixel(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element.DataType arg1, Android.Renderscript.Element.DataKind arg2)
         {
             return SExecute<Android.Renderscript.Element>(LocalBridgeClazz, "createPixel", arg0, arg1, arg2);
@@ -90,7 +90,7 @@ public static Android.Renderscript.Element CreatePixel(Android.Renderscript.Rend
         /// <param name="arg1"><see cref="Android.Renderscript.Element.DataType"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element CreateVector(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element.DataType arg1, int arg2)
         {
             return SExecute<Android.Renderscript.Element>(LocalBridgeClazz, "createVector", arg0, arg1, arg2);
@@ -100,7 +100,7 @@ public static Android.Renderscript.Element CreateVector(Android.Renderscript.Ren
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element ELEMENT(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "ELEMENT", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -110,7 +110,7 @@ public static Android.Renderscript.Element ELEMENT(Android.Renderscript.RenderSc
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F16_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F16_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -120,7 +120,7 @@ public static Android.Renderscript.Element F16_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F16_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F16_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -130,7 +130,7 @@ public static Android.Renderscript.Element F16_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F16_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F16_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -140,7 +140,7 @@ public static Android.Renderscript.Element F16_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F16(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F16", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -150,7 +150,7 @@ public static Android.Renderscript.Element F16(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F32_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F32_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -160,7 +160,7 @@ public static Android.Renderscript.Element F32_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F32_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F32_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -170,7 +170,7 @@ public static Android.Renderscript.Element F32_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F32_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F32_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -180,7 +180,7 @@ public static Android.Renderscript.Element F32_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F32(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F32", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -190,7 +190,7 @@ public static Android.Renderscript.Element F32(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F64_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F64_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -200,7 +200,7 @@ public static Android.Renderscript.Element F64_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F64_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F64_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -210,7 +210,7 @@ public static Android.Renderscript.Element F64_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F64_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F64_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -220,7 +220,7 @@ public static Android.Renderscript.Element F64_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element F64(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "F64", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -230,7 +230,7 @@ public static Android.Renderscript.Element F64(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element FONT(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "FONT", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -240,7 +240,7 @@ public static Android.Renderscript.Element FONT(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I16_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I16_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -250,7 +250,7 @@ public static Android.Renderscript.Element I16_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I16_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I16_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -260,7 +260,7 @@ public static Android.Renderscript.Element I16_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I16_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I16_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -270,7 +270,7 @@ public static Android.Renderscript.Element I16_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I16(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I16", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -280,7 +280,7 @@ public static Android.Renderscript.Element I16(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I32_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I32_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -290,7 +290,7 @@ public static Android.Renderscript.Element I32_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I32_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I32_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -300,7 +300,7 @@ public static Android.Renderscript.Element I32_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I32_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I32_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -310,7 +310,7 @@ public static Android.Renderscript.Element I32_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I32(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I32", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -320,7 +320,7 @@ public static Android.Renderscript.Element I32(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I64_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I64_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -330,7 +330,7 @@ public static Android.Renderscript.Element I64_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I64_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I64_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -340,7 +340,7 @@ public static Android.Renderscript.Element I64_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I64_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I64_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -350,7 +350,7 @@ public static Android.Renderscript.Element I64_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I64(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I64", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -360,7 +360,7 @@ public static Android.Renderscript.Element I64(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I8_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I8_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -370,7 +370,7 @@ public static Android.Renderscript.Element I8_2(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I8_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I8_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -380,7 +380,7 @@ public static Android.Renderscript.Element I8_3(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I8_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I8_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -390,7 +390,7 @@ public static Android.Renderscript.Element I8_4(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element I8(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "I8", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -400,7 +400,7 @@ public static Android.Renderscript.Element I8(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element MATRIX_2X2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "MATRIX_2X2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -410,7 +410,7 @@ public static Android.Renderscript.Element MATRIX_2X2(Android.Renderscript.Rende
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element MATRIX_3X3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "MATRIX_3X3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -420,7 +420,7 @@ public static Android.Renderscript.Element MATRIX_3X3(Android.Renderscript.Rende
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element MATRIX_4X4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "MATRIX_4X4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -430,7 +430,7 @@ public static Android.Renderscript.Element MATRIX_4X4(Android.Renderscript.Rende
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element MATRIX4X4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "MATRIX4X4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -440,7 +440,7 @@ public static Android.Renderscript.Element MATRIX4X4(Android.Renderscript.Render
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element MESH(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "MESH", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -450,7 +450,7 @@ public static Android.Renderscript.Element MESH(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element PROGRAM_FRAGMENT(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "PROGRAM_FRAGMENT", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -460,7 +460,7 @@ public static Android.Renderscript.Element PROGRAM_FRAGMENT(Android.Renderscript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element PROGRAM_RASTER(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "PROGRAM_RASTER", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -470,7 +470,7 @@ public static Android.Renderscript.Element PROGRAM_RASTER(Android.Renderscript.R
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element PROGRAM_STORE(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "PROGRAM_STORE", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -480,7 +480,7 @@ public static Android.Renderscript.Element PROGRAM_STORE(Android.Renderscript.Re
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element PROGRAM_VERTEX(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "PROGRAM_VERTEX", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -490,7 +490,7 @@ public static Android.Renderscript.Element PROGRAM_VERTEX(Android.Renderscript.R
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element RGB_565(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "RGB_565", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -500,7 +500,7 @@ public static Android.Renderscript.Element RGB_565(Android.Renderscript.RenderSc
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element RGB_888(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "RGB_888", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -510,7 +510,7 @@ public static Android.Renderscript.Element RGB_888(Android.Renderscript.RenderSc
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element RGBA_4444(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "RGBA_4444", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -520,7 +520,7 @@ public static Android.Renderscript.Element RGBA_4444(Android.Renderscript.Render
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element RGBA_5551(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "RGBA_5551", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -530,7 +530,7 @@ public static Android.Renderscript.Element RGBA_5551(Android.Renderscript.Render
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element RGBA_8888(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "RGBA_8888", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -540,7 +540,7 @@ public static Android.Renderscript.Element RGBA_8888(Android.Renderscript.Render
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element SAMPLER(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "SAMPLER", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -550,7 +550,7 @@ public static Android.Renderscript.Element SAMPLER(Android.Renderscript.RenderSc
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element SCRIPT(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "SCRIPT", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -560,7 +560,7 @@ public static Android.Renderscript.Element SCRIPT(Android.Renderscript.RenderScr
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element TYPE(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "TYPE", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -570,7 +570,7 @@ public static Android.Renderscript.Element TYPE(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U16_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U16_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -580,7 +580,7 @@ public static Android.Renderscript.Element U16_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U16_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U16_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -590,7 +590,7 @@ public static Android.Renderscript.Element U16_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U16_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U16_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -600,7 +600,7 @@ public static Android.Renderscript.Element U16_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U16(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U16", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -610,7 +610,7 @@ public static Android.Renderscript.Element U16(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U32_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U32_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -620,7 +620,7 @@ public static Android.Renderscript.Element U32_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U32_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U32_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -630,7 +630,7 @@ public static Android.Renderscript.Element U32_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U32_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U32_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -640,7 +640,7 @@ public static Android.Renderscript.Element U32_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U32(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U32", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -650,7 +650,7 @@ public static Android.Renderscript.Element U32(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U64_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U64_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -660,7 +660,7 @@ public static Android.Renderscript.Element U64_2(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U64_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U64_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -670,7 +670,7 @@ public static Android.Renderscript.Element U64_3(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U64_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U64_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -680,7 +680,7 @@ public static Android.Renderscript.Element U64_4(Android.Renderscript.RenderScri
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U64(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U64", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -690,7 +690,7 @@ public static Android.Renderscript.Element U64(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U8_2(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U8_2", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -700,7 +700,7 @@ public static Android.Renderscript.Element U8_2(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U8_3(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U8_3", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -710,7 +710,7 @@ public static Android.Renderscript.Element U8_3(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U8_4(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U8_4", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -720,7 +720,7 @@ public static Android.Renderscript.Element U8_4(Android.Renderscript.RenderScrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element U8(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "U8", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -730,7 +730,7 @@ public static Android.Renderscript.Element U8(Android.Renderscript.RenderScript
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Element YUV(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Element>(LocalBridgeClazz, "YUV", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Element;", arg0);
@@ -740,61 +740,39 @@ public static Android.Renderscript.Element YUV(Android.Renderscript.RenderScript
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getBytesSize()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int BytesSize
-        {
-            get { return IExecuteWithSignature<int>("getBytesSize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getDataKind()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Element.DataKind GetDataKind
-        {
-            get { return IExecuteWithSignature<Android.Renderscript.Element.DataKind>("getDataKind", "()Landroid/renderscript/Element$DataKind;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getDataType()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getSubElement(int)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Element.DataType GetDataType
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Renderscript.Element"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Element GetSubElement(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Element.DataType>("getDataType", "()Landroid/renderscript/Element$DataType;"); }
+            return IExecuteWithSignature<Android.Renderscript.Element>("getSubElement", "(I)Landroid/renderscript/Element;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getSubElementCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getDataKind()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SubElementCount
+        /// <returns><see cref="Android.Renderscript.Element.DataKind"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Element.DataKind GetDataKind()
         {
-            get { return IExecuteWithSignature<int>("getSubElementCount", "()I"); }
+            return IExecuteWithSignature<Android.Renderscript.Element.DataKind>("getDataKind", "()Landroid/renderscript/Element$DataKind;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getVectorSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getDataType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int VectorSize
+        /// <returns><see cref="Android.Renderscript.Element.DataType"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Element.DataType GetDataType()
         {
-            get { return IExecuteWithSignature<int>("getVectorSize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getSubElement(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Renderscript.Element"/></returns>
-        [System.Obsolete()]
-        public Android.Renderscript.Element GetSubElement(int arg0)
-        {
-            return IExecuteWithSignature<Android.Renderscript.Element>("getSubElement", "(I)Landroid/renderscript/Element;", arg0);
+            return IExecuteWithSignature<Android.Renderscript.Element.DataType>("getDataType", "()Landroid/renderscript/Element$DataType;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#isCompatible(android.renderscript.Element)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsCompatible(Android.Renderscript.Element arg0)
         {
             return IExecuteWithSignature<bool>("isCompatible", "(Landroid/renderscript/Element;)Z", arg0);
@@ -803,37 +781,64 @@ public bool IsCompatible(Android.Renderscript.Element arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#isComplex()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsComplex()
         {
             return IExecuteWithSignature<bool>("isComplex", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getBytesSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBytesSize()
+        {
+            return IExecuteWithSignature<int>("getBytesSize", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getSubElementArraySize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetSubElementArraySize(int arg0)
         {
             return IExecuteWithSignature<int>("getSubElementArraySize", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getSubElementCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSubElementCount()
+        {
+            return IExecuteWithSignature<int>("getSubElementCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getSubElementOffsetBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetSubElementOffsetBytes(int arg0)
         {
             return IExecuteWithSignature<int>("getSubElementOffsetBytes", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getVectorSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetVectorSize()
+        {
+            return IExecuteWithSignature<int>("getVectorSize", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Element.html#getSubElementName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetSubElementName(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getSubElementName", "(I)Ljava/lang/String;", arg0);
@@ -850,7 +855,7 @@ public partial class Builder
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.Builder.html#%3Cinit%3E(android.renderscript.RenderScript)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Renderscript.RenderScript arg0)
                 : base(arg0)
             {
@@ -875,7 +880,7 @@ public Builder(Android.Renderscript.RenderScript arg0)
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.Builder.html#create()"/>
             /// </summary>
             /// <returns><see cref="Android.Renderscript.Element"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Element Create()
             {
                 return IExecuteWithSignature<Android.Renderscript.Element>("create", "()Landroid/renderscript/Element;");
@@ -887,7 +892,7 @@ public Android.Renderscript.Element Create()
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
             /// <param name="arg2"><see cref="int"/></param>
             /// <returns><see cref="Android.Renderscript.Element.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Element.Builder Add(Android.Renderscript.Element arg0, Java.Lang.String arg1, int arg2)
             {
                 return IExecute<Android.Renderscript.Element.Builder>("add", arg0, arg1, arg2);
@@ -898,7 +903,7 @@ public Android.Renderscript.Element.Builder Add(Android.Renderscript.Element arg
             /// <param name="arg0"><see cref="Android.Renderscript.Element"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Renderscript.Element.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Element.Builder Add(Android.Renderscript.Element arg0, Java.Lang.String arg1)
             {
                 return IExecute<Android.Renderscript.Element.Builder>("add", arg0, arg1);
@@ -929,56 +934,56 @@ public partial class DataKind
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html#PIXEL_A"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataKind PIXEL_A { get { if (!_PIXEL_AReady) { _PIXEL_AContent = SGetField<Android.Renderscript.Element.DataKind>(LocalBridgeClazz, "PIXEL_A"); _PIXEL_AReady = true; } return _PIXEL_AContent; } }
             private static Android.Renderscript.Element.DataKind _PIXEL_AContent = default;
             private static bool _PIXEL_AReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html#PIXEL_DEPTH"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataKind PIXEL_DEPTH { get { if (!_PIXEL_DEPTHReady) { _PIXEL_DEPTHContent = SGetField<Android.Renderscript.Element.DataKind>(LocalBridgeClazz, "PIXEL_DEPTH"); _PIXEL_DEPTHReady = true; } return _PIXEL_DEPTHContent; } }
             private static Android.Renderscript.Element.DataKind _PIXEL_DEPTHContent = default;
             private static bool _PIXEL_DEPTHReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html#PIXEL_L"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataKind PIXEL_L { get { if (!_PIXEL_LReady) { _PIXEL_LContent = SGetField<Android.Renderscript.Element.DataKind>(LocalBridgeClazz, "PIXEL_L"); _PIXEL_LReady = true; } return _PIXEL_LContent; } }
             private static Android.Renderscript.Element.DataKind _PIXEL_LContent = default;
             private static bool _PIXEL_LReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html#PIXEL_LA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataKind PIXEL_LA { get { if (!_PIXEL_LAReady) { _PIXEL_LAContent = SGetField<Android.Renderscript.Element.DataKind>(LocalBridgeClazz, "PIXEL_LA"); _PIXEL_LAReady = true; } return _PIXEL_LAContent; } }
             private static Android.Renderscript.Element.DataKind _PIXEL_LAContent = default;
             private static bool _PIXEL_LAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html#PIXEL_RGB"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataKind PIXEL_RGB { get { if (!_PIXEL_RGBReady) { _PIXEL_RGBContent = SGetField<Android.Renderscript.Element.DataKind>(LocalBridgeClazz, "PIXEL_RGB"); _PIXEL_RGBReady = true; } return _PIXEL_RGBContent; } }
             private static Android.Renderscript.Element.DataKind _PIXEL_RGBContent = default;
             private static bool _PIXEL_RGBReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html#PIXEL_RGBA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataKind PIXEL_RGBA { get { if (!_PIXEL_RGBAReady) { _PIXEL_RGBAContent = SGetField<Android.Renderscript.Element.DataKind>(LocalBridgeClazz, "PIXEL_RGBA"); _PIXEL_RGBAReady = true; } return _PIXEL_RGBAContent; } }
             private static Android.Renderscript.Element.DataKind _PIXEL_RGBAContent = default;
             private static bool _PIXEL_RGBAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html#PIXEL_YUV"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataKind PIXEL_YUV { get { if (!_PIXEL_YUVReady) { _PIXEL_YUVContent = SGetField<Android.Renderscript.Element.DataKind>(LocalBridgeClazz, "PIXEL_YUV"); _PIXEL_YUVReady = true; } return _PIXEL_YUVContent; } }
             private static Android.Renderscript.Element.DataKind _PIXEL_YUVContent = default;
             private static bool _PIXEL_YUVReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataKind.html#USER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataKind USER { get { if (!_USERReady) { _USERContent = SGetField<Android.Renderscript.Element.DataKind>(LocalBridgeClazz, "USER"); _USERReady = true; } return _USERContent; } }
             private static Android.Renderscript.Element.DataKind _USERContent = default;
             private static bool _USERReady = false; // this is used because in case of generics 
@@ -1033,210 +1038,210 @@ public partial class DataType
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#BOOLEAN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType BOOLEAN { get { if (!_BOOLEANReady) { _BOOLEANContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "BOOLEAN"); _BOOLEANReady = true; } return _BOOLEANContent; } }
             private static Android.Renderscript.Element.DataType _BOOLEANContent = default;
             private static bool _BOOLEANReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#FLOAT_16"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType FLOAT_16 { get { if (!_FLOAT_16Ready) { _FLOAT_16Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "FLOAT_16"); _FLOAT_16Ready = true; } return _FLOAT_16Content; } }
             private static Android.Renderscript.Element.DataType _FLOAT_16Content = default;
             private static bool _FLOAT_16Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#FLOAT_32"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType FLOAT_32 { get { if (!_FLOAT_32Ready) { _FLOAT_32Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "FLOAT_32"); _FLOAT_32Ready = true; } return _FLOAT_32Content; } }
             private static Android.Renderscript.Element.DataType _FLOAT_32Content = default;
             private static bool _FLOAT_32Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#FLOAT_64"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType FLOAT_64 { get { if (!_FLOAT_64Ready) { _FLOAT_64Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "FLOAT_64"); _FLOAT_64Ready = true; } return _FLOAT_64Content; } }
             private static Android.Renderscript.Element.DataType _FLOAT_64Content = default;
             private static bool _FLOAT_64Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#MATRIX_2X2"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType MATRIX_2X2 { get { if (!_MATRIX_2X2Ready) { _MATRIX_2X2Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "MATRIX_2X2"); _MATRIX_2X2Ready = true; } return _MATRIX_2X2Content; } }
             private static Android.Renderscript.Element.DataType _MATRIX_2X2Content = default;
             private static bool _MATRIX_2X2Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#MATRIX_3X3"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType MATRIX_3X3 { get { if (!_MATRIX_3X3Ready) { _MATRIX_3X3Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "MATRIX_3X3"); _MATRIX_3X3Ready = true; } return _MATRIX_3X3Content; } }
             private static Android.Renderscript.Element.DataType _MATRIX_3X3Content = default;
             private static bool _MATRIX_3X3Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#MATRIX_4X4"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType MATRIX_4X4 { get { if (!_MATRIX_4X4Ready) { _MATRIX_4X4Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "MATRIX_4X4"); _MATRIX_4X4Ready = true; } return _MATRIX_4X4Content; } }
             private static Android.Renderscript.Element.DataType _MATRIX_4X4Content = default;
             private static bool _MATRIX_4X4Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#NONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType NONE { get { if (!_NONEReady) { _NONEContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "NONE"); _NONEReady = true; } return _NONEContent; } }
             private static Android.Renderscript.Element.DataType _NONEContent = default;
             private static bool _NONEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_ALLOCATION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_ALLOCATION { get { if (!_RS_ALLOCATIONReady) { _RS_ALLOCATIONContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_ALLOCATION"); _RS_ALLOCATIONReady = true; } return _RS_ALLOCATIONContent; } }
             private static Android.Renderscript.Element.DataType _RS_ALLOCATIONContent = default;
             private static bool _RS_ALLOCATIONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_ELEMENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_ELEMENT { get { if (!_RS_ELEMENTReady) { _RS_ELEMENTContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_ELEMENT"); _RS_ELEMENTReady = true; } return _RS_ELEMENTContent; } }
             private static Android.Renderscript.Element.DataType _RS_ELEMENTContent = default;
             private static bool _RS_ELEMENTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_FONT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_FONT { get { if (!_RS_FONTReady) { _RS_FONTContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_FONT"); _RS_FONTReady = true; } return _RS_FONTContent; } }
             private static Android.Renderscript.Element.DataType _RS_FONTContent = default;
             private static bool _RS_FONTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_MESH"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_MESH { get { if (!_RS_MESHReady) { _RS_MESHContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_MESH"); _RS_MESHReady = true; } return _RS_MESHContent; } }
             private static Android.Renderscript.Element.DataType _RS_MESHContent = default;
             private static bool _RS_MESHReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_PROGRAM_FRAGMENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_PROGRAM_FRAGMENT { get { if (!_RS_PROGRAM_FRAGMENTReady) { _RS_PROGRAM_FRAGMENTContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_PROGRAM_FRAGMENT"); _RS_PROGRAM_FRAGMENTReady = true; } return _RS_PROGRAM_FRAGMENTContent; } }
             private static Android.Renderscript.Element.DataType _RS_PROGRAM_FRAGMENTContent = default;
             private static bool _RS_PROGRAM_FRAGMENTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_PROGRAM_RASTER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_PROGRAM_RASTER { get { if (!_RS_PROGRAM_RASTERReady) { _RS_PROGRAM_RASTERContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_PROGRAM_RASTER"); _RS_PROGRAM_RASTERReady = true; } return _RS_PROGRAM_RASTERContent; } }
             private static Android.Renderscript.Element.DataType _RS_PROGRAM_RASTERContent = default;
             private static bool _RS_PROGRAM_RASTERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_PROGRAM_STORE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_PROGRAM_STORE { get { if (!_RS_PROGRAM_STOREReady) { _RS_PROGRAM_STOREContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_PROGRAM_STORE"); _RS_PROGRAM_STOREReady = true; } return _RS_PROGRAM_STOREContent; } }
             private static Android.Renderscript.Element.DataType _RS_PROGRAM_STOREContent = default;
             private static bool _RS_PROGRAM_STOREReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_PROGRAM_VERTEX"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_PROGRAM_VERTEX { get { if (!_RS_PROGRAM_VERTEXReady) { _RS_PROGRAM_VERTEXContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_PROGRAM_VERTEX"); _RS_PROGRAM_VERTEXReady = true; } return _RS_PROGRAM_VERTEXContent; } }
             private static Android.Renderscript.Element.DataType _RS_PROGRAM_VERTEXContent = default;
             private static bool _RS_PROGRAM_VERTEXReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_SAMPLER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_SAMPLER { get { if (!_RS_SAMPLERReady) { _RS_SAMPLERContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_SAMPLER"); _RS_SAMPLERReady = true; } return _RS_SAMPLERContent; } }
             private static Android.Renderscript.Element.DataType _RS_SAMPLERContent = default;
             private static bool _RS_SAMPLERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_SCRIPT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_SCRIPT { get { if (!_RS_SCRIPTReady) { _RS_SCRIPTContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_SCRIPT"); _RS_SCRIPTReady = true; } return _RS_SCRIPTContent; } }
             private static Android.Renderscript.Element.DataType _RS_SCRIPTContent = default;
             private static bool _RS_SCRIPTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#RS_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType RS_TYPE { get { if (!_RS_TYPEReady) { _RS_TYPEContent = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "RS_TYPE"); _RS_TYPEReady = true; } return _RS_TYPEContent; } }
             private static Android.Renderscript.Element.DataType _RS_TYPEContent = default;
             private static bool _RS_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#SIGNED_16"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType SIGNED_16 { get { if (!_SIGNED_16Ready) { _SIGNED_16Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "SIGNED_16"); _SIGNED_16Ready = true; } return _SIGNED_16Content; } }
             private static Android.Renderscript.Element.DataType _SIGNED_16Content = default;
             private static bool _SIGNED_16Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#SIGNED_32"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType SIGNED_32 { get { if (!_SIGNED_32Ready) { _SIGNED_32Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "SIGNED_32"); _SIGNED_32Ready = true; } return _SIGNED_32Content; } }
             private static Android.Renderscript.Element.DataType _SIGNED_32Content = default;
             private static bool _SIGNED_32Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#SIGNED_64"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType SIGNED_64 { get { if (!_SIGNED_64Ready) { _SIGNED_64Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "SIGNED_64"); _SIGNED_64Ready = true; } return _SIGNED_64Content; } }
             private static Android.Renderscript.Element.DataType _SIGNED_64Content = default;
             private static bool _SIGNED_64Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#SIGNED_8"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType SIGNED_8 { get { if (!_SIGNED_8Ready) { _SIGNED_8Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "SIGNED_8"); _SIGNED_8Ready = true; } return _SIGNED_8Content; } }
             private static Android.Renderscript.Element.DataType _SIGNED_8Content = default;
             private static bool _SIGNED_8Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#UNSIGNED_16"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType UNSIGNED_16 { get { if (!_UNSIGNED_16Ready) { _UNSIGNED_16Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "UNSIGNED_16"); _UNSIGNED_16Ready = true; } return _UNSIGNED_16Content; } }
             private static Android.Renderscript.Element.DataType _UNSIGNED_16Content = default;
             private static bool _UNSIGNED_16Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#UNSIGNED_32"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType UNSIGNED_32 { get { if (!_UNSIGNED_32Ready) { _UNSIGNED_32Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "UNSIGNED_32"); _UNSIGNED_32Ready = true; } return _UNSIGNED_32Content; } }
             private static Android.Renderscript.Element.DataType _UNSIGNED_32Content = default;
             private static bool _UNSIGNED_32Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#UNSIGNED_4_4_4_4"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType UNSIGNED_4_4_4_4 { get { if (!_UNSIGNED_4_4_4_4Ready) { _UNSIGNED_4_4_4_4Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "UNSIGNED_4_4_4_4"); _UNSIGNED_4_4_4_4Ready = true; } return _UNSIGNED_4_4_4_4Content; } }
             private static Android.Renderscript.Element.DataType _UNSIGNED_4_4_4_4Content = default;
             private static bool _UNSIGNED_4_4_4_4Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#UNSIGNED_5_5_5_1"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType UNSIGNED_5_5_5_1 { get { if (!_UNSIGNED_5_5_5_1Ready) { _UNSIGNED_5_5_5_1Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "UNSIGNED_5_5_5_1"); _UNSIGNED_5_5_5_1Ready = true; } return _UNSIGNED_5_5_5_1Content; } }
             private static Android.Renderscript.Element.DataType _UNSIGNED_5_5_5_1Content = default;
             private static bool _UNSIGNED_5_5_5_1Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#UNSIGNED_5_6_5"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType UNSIGNED_5_6_5 { get { if (!_UNSIGNED_5_6_5Ready) { _UNSIGNED_5_6_5Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "UNSIGNED_5_6_5"); _UNSIGNED_5_6_5Ready = true; } return _UNSIGNED_5_6_5Content; } }
             private static Android.Renderscript.Element.DataType _UNSIGNED_5_6_5Content = default;
             private static bool _UNSIGNED_5_6_5Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#UNSIGNED_64"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType UNSIGNED_64 { get { if (!_UNSIGNED_64Ready) { _UNSIGNED_64Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "UNSIGNED_64"); _UNSIGNED_64Ready = true; } return _UNSIGNED_64Content; } }
             private static Android.Renderscript.Element.DataType _UNSIGNED_64Content = default;
             private static bool _UNSIGNED_64Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Element.DataType.html#UNSIGNED_8"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Element.DataType UNSIGNED_8 { get { if (!_UNSIGNED_8Ready) { _UNSIGNED_8Content = SGetField<Android.Renderscript.Element.DataType>(LocalBridgeClazz, "UNSIGNED_8"); _UNSIGNED_8Ready = true; } return _UNSIGNED_8Content; } }
             private static Android.Renderscript.Element.DataType _UNSIGNED_8Content = default;
             private static bool _UNSIGNED_8Ready = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/FieldPacker.cs b/src/net/Netdroid/Generated/Android/Renderscript/FieldPacker.cs
index ac30b6181..d1cd822c0 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/FieldPacker.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/FieldPacker.cs
@@ -33,7 +33,7 @@ public partial class FieldPacker
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FieldPacker(byte[] arg0)
             : base(arg0)
         {
@@ -42,7 +42,7 @@ public FieldPacker(byte[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public FieldPacker(int arg0)
             : base(arg0)
         {
@@ -64,18 +64,10 @@ public FieldPacker(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#getData()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public byte[] Data
-        {
-            get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subByte2()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Byte2"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Byte2 SubByte2()
         {
             return IExecuteWithSignature<Android.Renderscript.Byte2>("subByte2", "()Landroid/renderscript/Byte2;");
@@ -84,7 +76,7 @@ public Android.Renderscript.Byte2 SubByte2()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subByte3()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Byte3"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Byte3 SubByte3()
         {
             return IExecuteWithSignature<Android.Renderscript.Byte3>("subByte3", "()Landroid/renderscript/Byte3;");
@@ -93,7 +85,7 @@ public Android.Renderscript.Byte3 SubByte3()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subByte4()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Byte4"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Byte4 SubByte4()
         {
             return IExecuteWithSignature<Android.Renderscript.Byte4>("subByte4", "()Landroid/renderscript/Byte4;");
@@ -102,7 +94,7 @@ public Android.Renderscript.Byte4 SubByte4()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subDouble2()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Double2"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Double2 SubDouble2()
         {
             return IExecuteWithSignature<Android.Renderscript.Double2>("subDouble2", "()Landroid/renderscript/Double2;");
@@ -111,7 +103,7 @@ public Android.Renderscript.Double2 SubDouble2()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subDouble3()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Double3"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Double3 SubDouble3()
         {
             return IExecuteWithSignature<Android.Renderscript.Double3>("subDouble3", "()Landroid/renderscript/Double3;");
@@ -120,7 +112,7 @@ public Android.Renderscript.Double3 SubDouble3()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subDouble4()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Double4"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Double4 SubDouble4()
         {
             return IExecuteWithSignature<Android.Renderscript.Double4>("subDouble4", "()Landroid/renderscript/Double4;");
@@ -129,7 +121,7 @@ public Android.Renderscript.Double4 SubDouble4()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subFloat2()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Float2"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Float2 SubFloat2()
         {
             return IExecuteWithSignature<Android.Renderscript.Float2>("subFloat2", "()Landroid/renderscript/Float2;");
@@ -138,7 +130,7 @@ public Android.Renderscript.Float2 SubFloat2()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subFloat3()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Float3"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Float3 SubFloat3()
         {
             return IExecuteWithSignature<Android.Renderscript.Float3>("subFloat3", "()Landroid/renderscript/Float3;");
@@ -147,7 +139,7 @@ public Android.Renderscript.Float3 SubFloat3()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subFloat4()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Float4"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Float4 SubFloat4()
         {
             return IExecuteWithSignature<Android.Renderscript.Float4>("subFloat4", "()Landroid/renderscript/Float4;");
@@ -156,7 +148,7 @@ public Android.Renderscript.Float4 SubFloat4()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subInt2()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Int2"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Int2 SubInt2()
         {
             return IExecuteWithSignature<Android.Renderscript.Int2>("subInt2", "()Landroid/renderscript/Int2;");
@@ -165,7 +157,7 @@ public Android.Renderscript.Int2 SubInt2()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subInt3()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Int3"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Int3 SubInt3()
         {
             return IExecuteWithSignature<Android.Renderscript.Int3>("subInt3", "()Landroid/renderscript/Int3;");
@@ -174,7 +166,7 @@ public Android.Renderscript.Int3 SubInt3()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subInt4()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Int4"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Int4 SubInt4()
         {
             return IExecuteWithSignature<Android.Renderscript.Int4>("subInt4", "()Landroid/renderscript/Int4;");
@@ -183,7 +175,7 @@ public Android.Renderscript.Int4 SubInt4()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subLong2()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Long2"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Long2 SubLong2()
         {
             return IExecuteWithSignature<Android.Renderscript.Long2>("subLong2", "()Landroid/renderscript/Long2;");
@@ -192,7 +184,7 @@ public Android.Renderscript.Long2 SubLong2()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subLong3()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Long3"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Long3 SubLong3()
         {
             return IExecuteWithSignature<Android.Renderscript.Long3>("subLong3", "()Landroid/renderscript/Long3;");
@@ -201,7 +193,7 @@ public Android.Renderscript.Long3 SubLong3()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subLong4()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Long4"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Long4 SubLong4()
         {
             return IExecuteWithSignature<Android.Renderscript.Long4>("subLong4", "()Landroid/renderscript/Long4;");
@@ -210,7 +202,7 @@ public Android.Renderscript.Long4 SubLong4()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subMatrix2f()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Matrix2f"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Matrix2f SubMatrix2f()
         {
             return IExecuteWithSignature<Android.Renderscript.Matrix2f>("subMatrix2f", "()Landroid/renderscript/Matrix2f;");
@@ -219,7 +211,7 @@ public Android.Renderscript.Matrix2f SubMatrix2f()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subMatrix3f()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Matrix3f"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Matrix3f SubMatrix3f()
         {
             return IExecuteWithSignature<Android.Renderscript.Matrix3f>("subMatrix3f", "()Landroid/renderscript/Matrix3f;");
@@ -228,7 +220,7 @@ public Android.Renderscript.Matrix3f SubMatrix3f()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subMatrix4f()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Matrix4f"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Matrix4f SubMatrix4f()
         {
             return IExecuteWithSignature<Android.Renderscript.Matrix4f>("subMatrix4f", "()Landroid/renderscript/Matrix4f;");
@@ -237,7 +229,7 @@ public Android.Renderscript.Matrix4f SubMatrix4f()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subShort2()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Short2"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Short2 SubShort2()
         {
             return IExecuteWithSignature<Android.Renderscript.Short2>("subShort2", "()Landroid/renderscript/Short2;");
@@ -246,7 +238,7 @@ public Android.Renderscript.Short2 SubShort2()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subShort3()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Short3"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Short3 SubShort3()
         {
             return IExecuteWithSignature<Android.Renderscript.Short3>("subShort3", "()Landroid/renderscript/Short3;");
@@ -255,7 +247,7 @@ public Android.Renderscript.Short3 SubShort3()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subShort4()"/>
         /// </summary>
         /// <returns><see cref="Android.Renderscript.Short4"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Renderscript.Short4 SubShort4()
         {
             return IExecuteWithSignature<Android.Renderscript.Short4>("subShort4", "()Landroid/renderscript/Short4;");
@@ -264,7 +256,7 @@ public Android.Renderscript.Short4 SubShort4()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SubBoolean()
         {
             return IExecuteWithSignature<bool>("subBoolean", "()Z");
@@ -273,7 +265,7 @@ public bool SubBoolean()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subI8()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte SubI8()
         {
             return IExecuteWithSignature<byte>("subI8", "()B");
@@ -282,16 +274,25 @@ public byte SubI8()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subF64()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double SubF64()
         {
             return IExecuteWithSignature<double>("subF64", "()D");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#getData()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetData()
+        {
+            return IExecuteWithSignatureArray<byte>("getData", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subF32()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float SubF32()
         {
             return IExecuteWithSignature<float>("subF32", "()F");
@@ -300,7 +301,7 @@ public float SubF32()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subI32()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SubI32()
         {
             return IExecuteWithSignature<int>("subI32", "()I");
@@ -309,7 +310,7 @@ public int SubI32()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subI64()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long SubI64()
         {
             return IExecuteWithSignature<long>("subI64", "()J");
@@ -318,7 +319,7 @@ public long SubI64()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subI16()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short SubI16()
         {
             return IExecuteWithSignature<short>("subI16", "()S");
@@ -327,7 +328,7 @@ public short SubI16()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addBoolean(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddBoolean(bool arg0)
         {
             IExecuteWithSignature("addBoolean", "(Z)V", arg0);
@@ -336,7 +337,7 @@ public void AddBoolean(bool arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addF32(android.renderscript.Float2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Float2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddF32(Android.Renderscript.Float2 arg0)
         {
             IExecuteWithSignature("addF32", "(Landroid/renderscript/Float2;)V", arg0);
@@ -345,7 +346,7 @@ public void AddF32(Android.Renderscript.Float2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addF32(android.renderscript.Float3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Float3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddF32(Android.Renderscript.Float3 arg0)
         {
             IExecuteWithSignature("addF32", "(Landroid/renderscript/Float3;)V", arg0);
@@ -354,7 +355,7 @@ public void AddF32(Android.Renderscript.Float3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addF32(android.renderscript.Float4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Float4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddF32(Android.Renderscript.Float4 arg0)
         {
             IExecuteWithSignature("addF32", "(Landroid/renderscript/Float4;)V", arg0);
@@ -363,7 +364,7 @@ public void AddF32(Android.Renderscript.Float4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addF32(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddF32(float arg0)
         {
             IExecuteWithSignature("addF32", "(F)V", arg0);
@@ -372,7 +373,7 @@ public void AddF32(float arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addF64(android.renderscript.Double2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Double2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddF64(Android.Renderscript.Double2 arg0)
         {
             IExecuteWithSignature("addF64", "(Landroid/renderscript/Double2;)V", arg0);
@@ -381,7 +382,7 @@ public void AddF64(Android.Renderscript.Double2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addF64(android.renderscript.Double3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Double3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddF64(Android.Renderscript.Double3 arg0)
         {
             IExecuteWithSignature("addF64", "(Landroid/renderscript/Double3;)V", arg0);
@@ -390,7 +391,7 @@ public void AddF64(Android.Renderscript.Double3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addF64(android.renderscript.Double4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Double4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddF64(Android.Renderscript.Double4 arg0)
         {
             IExecuteWithSignature("addF64", "(Landroid/renderscript/Double4;)V", arg0);
@@ -399,7 +400,7 @@ public void AddF64(Android.Renderscript.Double4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addF64(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddF64(double arg0)
         {
             IExecuteWithSignature("addF64", "(D)V", arg0);
@@ -408,7 +409,7 @@ public void AddF64(double arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI16(android.renderscript.Short2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Short2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI16(Android.Renderscript.Short2 arg0)
         {
             IExecuteWithSignature("addI16", "(Landroid/renderscript/Short2;)V", arg0);
@@ -417,7 +418,7 @@ public void AddI16(Android.Renderscript.Short2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI16(android.renderscript.Short3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Short3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI16(Android.Renderscript.Short3 arg0)
         {
             IExecuteWithSignature("addI16", "(Landroid/renderscript/Short3;)V", arg0);
@@ -426,7 +427,7 @@ public void AddI16(Android.Renderscript.Short3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI16(android.renderscript.Short4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Short4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI16(Android.Renderscript.Short4 arg0)
         {
             IExecuteWithSignature("addI16", "(Landroid/renderscript/Short4;)V", arg0);
@@ -435,7 +436,7 @@ public void AddI16(Android.Renderscript.Short4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI16(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI16(short arg0)
         {
             IExecuteWithSignature("addI16", "(S)V", arg0);
@@ -444,7 +445,7 @@ public void AddI16(short arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI32(android.renderscript.Int2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Int2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI32(Android.Renderscript.Int2 arg0)
         {
             IExecuteWithSignature("addI32", "(Landroid/renderscript/Int2;)V", arg0);
@@ -453,7 +454,7 @@ public void AddI32(Android.Renderscript.Int2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI32(android.renderscript.Int3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Int3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI32(Android.Renderscript.Int3 arg0)
         {
             IExecuteWithSignature("addI32", "(Landroid/renderscript/Int3;)V", arg0);
@@ -462,7 +463,7 @@ public void AddI32(Android.Renderscript.Int3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI32(android.renderscript.Int4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Int4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI32(Android.Renderscript.Int4 arg0)
         {
             IExecuteWithSignature("addI32", "(Landroid/renderscript/Int4;)V", arg0);
@@ -471,7 +472,7 @@ public void AddI32(Android.Renderscript.Int4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI32(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI32(int arg0)
         {
             IExecuteWithSignature("addI32", "(I)V", arg0);
@@ -480,7 +481,7 @@ public void AddI32(int arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI64(android.renderscript.Long2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI64(Android.Renderscript.Long2 arg0)
         {
             IExecuteWithSignature("addI64", "(Landroid/renderscript/Long2;)V", arg0);
@@ -489,7 +490,7 @@ public void AddI64(Android.Renderscript.Long2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI64(android.renderscript.Long3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI64(Android.Renderscript.Long3 arg0)
         {
             IExecuteWithSignature("addI64", "(Landroid/renderscript/Long3;)V", arg0);
@@ -498,7 +499,7 @@ public void AddI64(Android.Renderscript.Long3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI64(android.renderscript.Long4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI64(Android.Renderscript.Long4 arg0)
         {
             IExecuteWithSignature("addI64", "(Landroid/renderscript/Long4;)V", arg0);
@@ -507,7 +508,7 @@ public void AddI64(Android.Renderscript.Long4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI64(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI64(long arg0)
         {
             IExecuteWithSignature("addI64", "(J)V", arg0);
@@ -516,7 +517,7 @@ public void AddI64(long arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI8(android.renderscript.Byte2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Byte2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI8(Android.Renderscript.Byte2 arg0)
         {
             IExecuteWithSignature("addI8", "(Landroid/renderscript/Byte2;)V", arg0);
@@ -525,7 +526,7 @@ public void AddI8(Android.Renderscript.Byte2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI8(android.renderscript.Byte3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Byte3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI8(Android.Renderscript.Byte3 arg0)
         {
             IExecuteWithSignature("addI8", "(Landroid/renderscript/Byte3;)V", arg0);
@@ -534,7 +535,7 @@ public void AddI8(Android.Renderscript.Byte3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI8(android.renderscript.Byte4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Byte4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI8(Android.Renderscript.Byte4 arg0)
         {
             IExecuteWithSignature("addI8", "(Landroid/renderscript/Byte4;)V", arg0);
@@ -543,7 +544,7 @@ public void AddI8(Android.Renderscript.Byte4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addI8(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddI8(byte arg0)
         {
             IExecuteWithSignature("addI8", "(B)V", arg0);
@@ -552,7 +553,7 @@ public void AddI8(byte arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addMatrix(android.renderscript.Matrix2f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix2f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddMatrix(Android.Renderscript.Matrix2f arg0)
         {
             IExecuteWithSignature("addMatrix", "(Landroid/renderscript/Matrix2f;)V", arg0);
@@ -561,7 +562,7 @@ public void AddMatrix(Android.Renderscript.Matrix2f arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addMatrix(android.renderscript.Matrix3f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix3f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddMatrix(Android.Renderscript.Matrix3f arg0)
         {
             IExecuteWithSignature("addMatrix", "(Landroid/renderscript/Matrix3f;)V", arg0);
@@ -570,7 +571,7 @@ public void AddMatrix(Android.Renderscript.Matrix3f arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addMatrix(android.renderscript.Matrix4f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix4f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddMatrix(Android.Renderscript.Matrix4f arg0)
         {
             IExecuteWithSignature("addMatrix", "(Landroid/renderscript/Matrix4f;)V", arg0);
@@ -579,7 +580,7 @@ public void AddMatrix(Android.Renderscript.Matrix4f arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addObj(android.renderscript.BaseObj)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.BaseObj"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddObj(Android.Renderscript.BaseObj arg0)
         {
             IExecuteWithSignature("addObj", "(Landroid/renderscript/BaseObj;)V", arg0);
@@ -588,7 +589,7 @@ public void AddObj(Android.Renderscript.BaseObj arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU16(android.renderscript.Int2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Int2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU16(Android.Renderscript.Int2 arg0)
         {
             IExecuteWithSignature("addU16", "(Landroid/renderscript/Int2;)V", arg0);
@@ -597,7 +598,7 @@ public void AddU16(Android.Renderscript.Int2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU16(android.renderscript.Int3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Int3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU16(Android.Renderscript.Int3 arg0)
         {
             IExecuteWithSignature("addU16", "(Landroid/renderscript/Int3;)V", arg0);
@@ -606,7 +607,7 @@ public void AddU16(Android.Renderscript.Int3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU16(android.renderscript.Int4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Int4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU16(Android.Renderscript.Int4 arg0)
         {
             IExecuteWithSignature("addU16", "(Landroid/renderscript/Int4;)V", arg0);
@@ -615,7 +616,7 @@ public void AddU16(Android.Renderscript.Int4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU16(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU16(int arg0)
         {
             IExecuteWithSignature("addU16", "(I)V", arg0);
@@ -624,7 +625,7 @@ public void AddU16(int arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU32(android.renderscript.Long2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU32(Android.Renderscript.Long2 arg0)
         {
             IExecuteWithSignature("addU32", "(Landroid/renderscript/Long2;)V", arg0);
@@ -633,7 +634,7 @@ public void AddU32(Android.Renderscript.Long2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU32(android.renderscript.Long3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU32(Android.Renderscript.Long3 arg0)
         {
             IExecuteWithSignature("addU32", "(Landroid/renderscript/Long3;)V", arg0);
@@ -642,7 +643,7 @@ public void AddU32(Android.Renderscript.Long3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU32(android.renderscript.Long4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU32(Android.Renderscript.Long4 arg0)
         {
             IExecuteWithSignature("addU32", "(Landroid/renderscript/Long4;)V", arg0);
@@ -651,7 +652,7 @@ public void AddU32(Android.Renderscript.Long4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU32(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU32(long arg0)
         {
             IExecuteWithSignature("addU32", "(J)V", arg0);
@@ -660,7 +661,7 @@ public void AddU32(long arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU64(android.renderscript.Long2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU64(Android.Renderscript.Long2 arg0)
         {
             IExecuteWithSignature("addU64", "(Landroid/renderscript/Long2;)V", arg0);
@@ -669,7 +670,7 @@ public void AddU64(Android.Renderscript.Long2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU64(android.renderscript.Long3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU64(Android.Renderscript.Long3 arg0)
         {
             IExecuteWithSignature("addU64", "(Landroid/renderscript/Long3;)V", arg0);
@@ -678,7 +679,7 @@ public void AddU64(Android.Renderscript.Long3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU64(android.renderscript.Long4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Long4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU64(Android.Renderscript.Long4 arg0)
         {
             IExecuteWithSignature("addU64", "(Landroid/renderscript/Long4;)V", arg0);
@@ -687,7 +688,7 @@ public void AddU64(Android.Renderscript.Long4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU64(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU64(long arg0)
         {
             IExecuteWithSignature("addU64", "(J)V", arg0);
@@ -696,7 +697,7 @@ public void AddU64(long arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU8(android.renderscript.Short2)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Short2"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU8(Android.Renderscript.Short2 arg0)
         {
             IExecuteWithSignature("addU8", "(Landroid/renderscript/Short2;)V", arg0);
@@ -705,7 +706,7 @@ public void AddU8(Android.Renderscript.Short2 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU8(android.renderscript.Short3)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Short3"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU8(Android.Renderscript.Short3 arg0)
         {
             IExecuteWithSignature("addU8", "(Landroid/renderscript/Short3;)V", arg0);
@@ -714,7 +715,7 @@ public void AddU8(Android.Renderscript.Short3 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU8(android.renderscript.Short4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Short4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU8(Android.Renderscript.Short4 arg0)
         {
             IExecuteWithSignature("addU8", "(Landroid/renderscript/Short4;)V", arg0);
@@ -723,7 +724,7 @@ public void AddU8(Android.Renderscript.Short4 arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#addU8(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddU8(short arg0)
         {
             IExecuteWithSignature("addU8", "(S)V", arg0);
@@ -732,7 +733,7 @@ public void AddU8(short arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#align(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Align(int arg0)
         {
             IExecuteWithSignature("align", "(I)V", arg0);
@@ -740,7 +741,7 @@ public void Align(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#reset()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
@@ -749,7 +750,7 @@ public void Reset()
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#reset(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Reset(int arg0)
         {
             IExecuteWithSignature("reset", "(I)V", arg0);
@@ -758,7 +759,7 @@ public void Reset(int arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#skip(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Skip(int arg0)
         {
             IExecuteWithSignature("skip", "(I)V", arg0);
@@ -767,7 +768,7 @@ public void Skip(int arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/FieldPacker.html#subalign(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Subalign(int arg0)
         {
             IExecuteWithSignature("subalign", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Float2.cs b/src/net/Netdroid/Generated/Android/Renderscript/Float2.cs
index 128d19272..790d87065 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Float2.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Float2.cs
@@ -34,7 +34,7 @@ public partial class Float2
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Float2(float arg0, float arg1)
             : base(arg0, arg1)
         {
@@ -50,12 +50,12 @@ public Float2(float arg0, float arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float2.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float x { get { return IGetField<float>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float2.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float y { get { return IGetField<float>("y"); } set { ISetField("y", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Float3.cs b/src/net/Netdroid/Generated/Android/Renderscript/Float3.cs
index 78f6ed400..397aa6e75 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Float3.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Float3.cs
@@ -35,7 +35,7 @@ public partial class Float3
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Float3(float arg0, float arg1, float arg2)
             : base(arg0, arg1, arg2)
         {
@@ -51,17 +51,17 @@ public Float3(float arg0, float arg1, float arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float3.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float x { get { return IGetField<float>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float3.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float y { get { return IGetField<float>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float3.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float z { get { return IGetField<float>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Float4.cs b/src/net/Netdroid/Generated/Android/Renderscript/Float4.cs
index 6f8a87817..2a5ba90e6 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Float4.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Float4.cs
@@ -36,7 +36,7 @@ public partial class Float4
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Float4(float arg0, float arg1, float arg2, float arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -52,22 +52,22 @@ public Float4(float arg0, float arg1, float arg2, float arg3)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float4.html#w"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float w { get { return IGetField<float>("w"); } set { ISetField("w", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float4.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float x { get { return IGetField<float>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float4.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float y { get { return IGetField<float>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Float4.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float z { get { return IGetField<float>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Int2.cs b/src/net/Netdroid/Generated/Android/Renderscript/Int2.cs
index 99c9dede6..b914662a4 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Int2.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Int2.cs
@@ -34,7 +34,7 @@ public partial class Int2
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Int2(int arg0, int arg1)
             : base(arg0, arg1)
         {
@@ -50,12 +50,12 @@ public Int2(int arg0, int arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int2.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int x { get { return IGetField<int>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int2.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int y { get { return IGetField<int>("y"); } set { ISetField("y", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Int3.cs b/src/net/Netdroid/Generated/Android/Renderscript/Int3.cs
index 01b288fb8..3be4bc28c 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Int3.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Int3.cs
@@ -35,7 +35,7 @@ public partial class Int3
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Int3(int arg0, int arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -51,17 +51,17 @@ public Int3(int arg0, int arg1, int arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int3.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int x { get { return IGetField<int>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int3.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int y { get { return IGetField<int>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int3.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int z { get { return IGetField<int>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Int4.cs b/src/net/Netdroid/Generated/Android/Renderscript/Int4.cs
index 970da0351..a1a70e1ed 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Int4.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Int4.cs
@@ -36,7 +36,7 @@ public partial class Int4
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Int4(int arg0, int arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -52,22 +52,22 @@ public Int4(int arg0, int arg1, int arg2, int arg3)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int4.html#w"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int w { get { return IGetField<int>("w"); } set { ISetField("w", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int4.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int x { get { return IGetField<int>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int4.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int y { get { return IGetField<int>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Int4.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int z { get { return IGetField<int>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Long2.cs b/src/net/Netdroid/Generated/Android/Renderscript/Long2.cs
index 02d4c3d16..3ea519fda 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Long2.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Long2.cs
@@ -34,7 +34,7 @@ public partial class Long2
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Long2(long arg0, long arg1)
             : base(arg0, arg1)
         {
@@ -50,12 +50,12 @@ public Long2(long arg0, long arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long2.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long x { get { return IGetField<long>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long2.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long y { get { return IGetField<long>("y"); } set { ISetField("y", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Long3.cs b/src/net/Netdroid/Generated/Android/Renderscript/Long3.cs
index e7f28238e..0dd7f7cfa 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Long3.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Long3.cs
@@ -35,7 +35,7 @@ public partial class Long3
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Long3(long arg0, long arg1, long arg2)
             : base(arg0, arg1, arg2)
         {
@@ -51,17 +51,17 @@ public Long3(long arg0, long arg1, long arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long3.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long x { get { return IGetField<long>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long3.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long y { get { return IGetField<long>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long3.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long z { get { return IGetField<long>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Long4.cs b/src/net/Netdroid/Generated/Android/Renderscript/Long4.cs
index a0e6269c9..c690f94bf 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Long4.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Long4.cs
@@ -36,7 +36,7 @@ public partial class Long4
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="long"/></param>
         /// <param name="arg3"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Long4(long arg0, long arg1, long arg2, long arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -52,22 +52,22 @@ public Long4(long arg0, long arg1, long arg2, long arg3)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long4.html#w"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long w { get { return IGetField<long>("w"); } set { ISetField("w", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long4.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long x { get { return IGetField<long>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long4.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long y { get { return IGetField<long>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Long4.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long z { get { return IGetField<long>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Matrix2f.cs b/src/net/Netdroid/Generated/Android/Renderscript/Matrix2f.cs
index 643fbbd22..4f5172cee 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Matrix2f.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Matrix2f.cs
@@ -33,7 +33,7 @@ public partial class Matrix2f
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#%3Cinit%3E(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Matrix2f(float[] arg0)
             : base(arg0)
         {
@@ -55,29 +55,30 @@ public Matrix2f(float[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#getArray()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public float[] Array
-        {
-            get { return IExecuteWithSignatureArray<float>("getArray", "()[F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#get(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float Get(int arg0, int arg1)
         {
             return IExecute<float>("get", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#getArray()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float[] GetArray()
+        {
+            return IExecuteWithSignatureArray<float>("getArray", "()[F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#load(android.renderscript.Matrix2f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix2f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Load(Android.Renderscript.Matrix2f arg0)
         {
             IExecuteWithSignature("load", "(Landroid/renderscript/Matrix2f;)V", arg0);
@@ -85,7 +86,7 @@ public void Load(Android.Renderscript.Matrix2f arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#loadIdentity()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadIdentity()
         {
             IExecuteWithSignature("loadIdentity", "()V");
@@ -95,7 +96,7 @@ public void LoadIdentity()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix2f"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Matrix2f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadMultiply(Android.Renderscript.Matrix2f arg0, Android.Renderscript.Matrix2f arg1)
         {
             IExecute("loadMultiply", arg0, arg1);
@@ -104,7 +105,7 @@ public void LoadMultiply(Android.Renderscript.Matrix2f arg0, Android.Renderscrip
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#loadRotate(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadRotate(float arg0)
         {
             IExecuteWithSignature("loadRotate", "(F)V", arg0);
@@ -114,7 +115,7 @@ public void LoadRotate(float arg0)
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadScale(float arg0, float arg1)
         {
             IExecute("loadScale", arg0, arg1);
@@ -123,7 +124,7 @@ public void LoadScale(float arg0, float arg1)
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#multiply(android.renderscript.Matrix2f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix2f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Multiply(Android.Renderscript.Matrix2f arg0)
         {
             IExecuteWithSignature("multiply", "(Landroid/renderscript/Matrix2f;)V", arg0);
@@ -132,7 +133,7 @@ public void Multiply(Android.Renderscript.Matrix2f arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#rotate(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Rotate(float arg0)
         {
             IExecuteWithSignature("rotate", "(F)V", arg0);
@@ -142,7 +143,7 @@ public void Rotate(float arg0)
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Scale(float arg0, float arg1)
         {
             IExecute("scale", arg0, arg1);
@@ -153,7 +154,7 @@ public void Scale(float arg0, float arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Set(int arg0, int arg1, float arg2)
         {
             IExecute("set", arg0, arg1, arg2);
@@ -161,7 +162,7 @@ public void Set(int arg0, int arg1, float arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix2f.html#transpose()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Transpose()
         {
             IExecuteWithSignature("transpose", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Matrix3f.cs b/src/net/Netdroid/Generated/Android/Renderscript/Matrix3f.cs
index d792bdd5c..b548292b0 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Matrix3f.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Matrix3f.cs
@@ -33,7 +33,7 @@ public partial class Matrix3f
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#%3Cinit%3E(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Matrix3f(float[] arg0)
             : base(arg0)
         {
@@ -55,29 +55,30 @@ public Matrix3f(float[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#getArray()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public float[] Array
-        {
-            get { return IExecuteWithSignatureArray<float>("getArray", "()[F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#get(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float Get(int arg0, int arg1)
         {
             return IExecute<float>("get", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#getArray()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float[] GetArray()
+        {
+            return IExecuteWithSignatureArray<float>("getArray", "()[F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#load(android.renderscript.Matrix3f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix3f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Load(Android.Renderscript.Matrix3f arg0)
         {
             IExecuteWithSignature("load", "(Landroid/renderscript/Matrix3f;)V", arg0);
@@ -85,7 +86,7 @@ public void Load(Android.Renderscript.Matrix3f arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#loadIdentity()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadIdentity()
         {
             IExecuteWithSignature("loadIdentity", "()V");
@@ -95,7 +96,7 @@ public void LoadIdentity()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix3f"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Matrix3f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadMultiply(Android.Renderscript.Matrix3f arg0, Android.Renderscript.Matrix3f arg1)
         {
             IExecute("loadMultiply", arg0, arg1);
@@ -107,7 +108,7 @@ public void LoadMultiply(Android.Renderscript.Matrix3f arg0, Android.Renderscrip
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadRotate(float arg0, float arg1, float arg2, float arg3)
         {
             IExecute("loadRotate", arg0, arg1, arg2, arg3);
@@ -116,7 +117,7 @@ public void LoadRotate(float arg0, float arg1, float arg2, float arg3)
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#loadRotate(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadRotate(float arg0)
         {
             IExecuteWithSignature("loadRotate", "(F)V", arg0);
@@ -127,7 +128,7 @@ public void LoadRotate(float arg0)
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadScale(float arg0, float arg1, float arg2)
         {
             IExecute("loadScale", arg0, arg1, arg2);
@@ -137,7 +138,7 @@ public void LoadScale(float arg0, float arg1, float arg2)
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadScale(float arg0, float arg1)
         {
             IExecute("loadScale", arg0, arg1);
@@ -147,7 +148,7 @@ public void LoadScale(float arg0, float arg1)
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadTranslate(float arg0, float arg1)
         {
             IExecute("loadTranslate", arg0, arg1);
@@ -156,7 +157,7 @@ public void LoadTranslate(float arg0, float arg1)
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#multiply(android.renderscript.Matrix3f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix3f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Multiply(Android.Renderscript.Matrix3f arg0)
         {
             IExecuteWithSignature("multiply", "(Landroid/renderscript/Matrix3f;)V", arg0);
@@ -168,7 +169,7 @@ public void Multiply(Android.Renderscript.Matrix3f arg0)
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Rotate(float arg0, float arg1, float arg2, float arg3)
         {
             IExecute("rotate", arg0, arg1, arg2, arg3);
@@ -177,7 +178,7 @@ public void Rotate(float arg0, float arg1, float arg2, float arg3)
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#rotate(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Rotate(float arg0)
         {
             IExecuteWithSignature("rotate", "(F)V", arg0);
@@ -188,7 +189,7 @@ public void Rotate(float arg0)
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Scale(float arg0, float arg1, float arg2)
         {
             IExecute("scale", arg0, arg1, arg2);
@@ -198,7 +199,7 @@ public void Scale(float arg0, float arg1, float arg2)
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Scale(float arg0, float arg1)
         {
             IExecute("scale", arg0, arg1);
@@ -209,7 +210,7 @@ public void Scale(float arg0, float arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Set(int arg0, int arg1, float arg2)
         {
             IExecute("set", arg0, arg1, arg2);
@@ -219,7 +220,7 @@ public void Set(int arg0, int arg1, float arg2)
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Translate(float arg0, float arg1)
         {
             IExecute("translate", arg0, arg1);
@@ -227,7 +228,7 @@ public void Translate(float arg0, float arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix3f.html#transpose()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Transpose()
         {
             IExecuteWithSignature("transpose", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Matrix4f.cs b/src/net/Netdroid/Generated/Android/Renderscript/Matrix4f.cs
index 3bd1440b9..a0ce32c1f 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Matrix4f.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Matrix4f.cs
@@ -33,7 +33,7 @@ public partial class Matrix4f
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#%3Cinit%3E(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Matrix4f(float[] arg0)
             : base(arg0)
         {
@@ -55,18 +55,10 @@ public Matrix4f(float[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#getArray()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public float[] Array
-        {
-            get { return IExecuteWithSignatureArray<float>("getArray", "()[F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#inverse()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Inverse()
         {
             return IExecuteWithSignature<bool>("inverse", "()Z");
@@ -75,7 +67,7 @@ public bool Inverse()
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#inverseTranspose()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool InverseTranspose()
         {
             return IExecuteWithSignature<bool>("inverseTranspose", "()Z");
@@ -86,16 +78,25 @@ public bool InverseTranspose()
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float Get(int arg0, int arg1)
         {
             return IExecute<float>("get", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#getArray()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float[] GetArray()
+        {
+            return IExecuteWithSignatureArray<float>("getArray", "()[F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#load(android.renderscript.Matrix4f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix4f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Load(Android.Renderscript.Matrix4f arg0)
         {
             IExecuteWithSignature("load", "(Landroid/renderscript/Matrix4f;)V", arg0);
@@ -109,7 +110,7 @@ public void Load(Android.Renderscript.Matrix4f arg0)
         /// <param name="arg3"><see cref="float"/></param>
         /// <param name="arg4"><see cref="float"/></param>
         /// <param name="arg5"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadFrustum(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5)
         {
             IExecute("loadFrustum", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -117,7 +118,7 @@ public void LoadFrustum(float arg0, float arg1, float arg2, float arg3, float ar
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#loadIdentity()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadIdentity()
         {
             IExecuteWithSignature("loadIdentity", "()V");
@@ -127,7 +128,7 @@ public void LoadIdentity()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix4f"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Matrix4f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadMultiply(Android.Renderscript.Matrix4f arg0, Android.Renderscript.Matrix4f arg1)
         {
             IExecute("loadMultiply", arg0, arg1);
@@ -141,7 +142,7 @@ public void LoadMultiply(Android.Renderscript.Matrix4f arg0, Android.Renderscrip
         /// <param name="arg3"><see cref="float"/></param>
         /// <param name="arg4"><see cref="float"/></param>
         /// <param name="arg5"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadOrtho(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5)
         {
             IExecute("loadOrtho", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -151,7 +152,7 @@ public void LoadOrtho(float arg0, float arg1, float arg2, float arg3, float arg4
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadOrthoWindow(int arg0, int arg1)
         {
             IExecute("loadOrthoWindow", arg0, arg1);
@@ -163,7 +164,7 @@ public void LoadOrthoWindow(int arg0, int arg1)
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadPerspective(float arg0, float arg1, float arg2, float arg3)
         {
             IExecute("loadPerspective", arg0, arg1, arg2, arg3);
@@ -173,7 +174,7 @@ public void LoadPerspective(float arg0, float arg1, float arg2, float arg3)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadProjectionNormalized(int arg0, int arg1)
         {
             IExecute("loadProjectionNormalized", arg0, arg1);
@@ -185,7 +186,7 @@ public void LoadProjectionNormalized(int arg0, int arg1)
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadRotate(float arg0, float arg1, float arg2, float arg3)
         {
             IExecute("loadRotate", arg0, arg1, arg2, arg3);
@@ -196,7 +197,7 @@ public void LoadRotate(float arg0, float arg1, float arg2, float arg3)
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadScale(float arg0, float arg1, float arg2)
         {
             IExecute("loadScale", arg0, arg1, arg2);
@@ -207,7 +208,7 @@ public void LoadScale(float arg0, float arg1, float arg2)
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void LoadTranslate(float arg0, float arg1, float arg2)
         {
             IExecute("loadTranslate", arg0, arg1, arg2);
@@ -216,7 +217,7 @@ public void LoadTranslate(float arg0, float arg1, float arg2)
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#multiply(android.renderscript.Matrix4f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix4f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Multiply(Android.Renderscript.Matrix4f arg0)
         {
             IExecuteWithSignature("multiply", "(Landroid/renderscript/Matrix4f;)V", arg0);
@@ -228,7 +229,7 @@ public void Multiply(Android.Renderscript.Matrix4f arg0)
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Rotate(float arg0, float arg1, float arg2, float arg3)
         {
             IExecute("rotate", arg0, arg1, arg2, arg3);
@@ -239,7 +240,7 @@ public void Rotate(float arg0, float arg1, float arg2, float arg3)
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Scale(float arg0, float arg1, float arg2)
         {
             IExecute("scale", arg0, arg1, arg2);
@@ -250,7 +251,7 @@ public void Scale(float arg0, float arg1, float arg2)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Set(int arg0, int arg1, float arg2)
         {
             IExecute("set", arg0, arg1, arg2);
@@ -261,7 +262,7 @@ public void Set(int arg0, int arg1, float arg2)
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Translate(float arg0, float arg1, float arg2)
         {
             IExecute("translate", arg0, arg1, arg2);
@@ -269,7 +270,7 @@ public void Translate(float arg0, float arg1, float arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Matrix4f.html#transpose()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Transpose()
         {
             IExecuteWithSignature("transpose", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/RenderScript.cs b/src/net/Netdroid/Generated/Android/Renderscript/RenderScript.cs
index 45ec2f7c7..80f17dc6b 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/RenderScript.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/RenderScript.cs
@@ -40,21 +40,21 @@ public partial class RenderScript
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#CREATE_FLAG_LOW_LATENCY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CREATE_FLAG_LOW_LATENCY { get { if (!_CREATE_FLAG_LOW_LATENCYReady) { _CREATE_FLAG_LOW_LATENCYContent = SGetField<int>(LocalBridgeClazz, "CREATE_FLAG_LOW_LATENCY"); _CREATE_FLAG_LOW_LATENCYReady = true; } return _CREATE_FLAG_LOW_LATENCYContent; } }
         private static int _CREATE_FLAG_LOW_LATENCYContent = default;
         private static bool _CREATE_FLAG_LOW_LATENCYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#CREATE_FLAG_LOW_POWER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CREATE_FLAG_LOW_POWER { get { if (!_CREATE_FLAG_LOW_POWERReady) { _CREATE_FLAG_LOW_POWERContent = SGetField<int>(LocalBridgeClazz, "CREATE_FLAG_LOW_POWER"); _CREATE_FLAG_LOW_POWERReady = true; } return _CREATE_FLAG_LOW_POWERContent; } }
         private static int _CREATE_FLAG_LOW_POWERContent = default;
         private static bool _CREATE_FLAG_LOW_POWERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#CREATE_FLAG_NONE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CREATE_FLAG_NONE { get { if (!_CREATE_FLAG_NONEReady) { _CREATE_FLAG_NONEContent = SGetField<int>(LocalBridgeClazz, "CREATE_FLAG_NONE"); _CREATE_FLAG_NONEReady = true; } return _CREATE_FLAG_NONEContent; } }
         private static int _CREATE_FLAG_NONEContent = default;
         private static bool _CREATE_FLAG_NONEReady = false; // this is used because in case of generics 
@@ -63,21 +63,13 @@ public partial class RenderScript
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#getMinorVersion()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static long MinorVersion
-        {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMinorVersion", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#create(android.content.Context,android.renderscript.RenderScript.ContextType,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.RenderScript.ContextType"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.RenderScript"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.RenderScript Create(Android.Content.Context arg0, Android.Renderscript.RenderScript.ContextType arg1, int arg2)
         {
             return SExecute<Android.Renderscript.RenderScript>(LocalBridgeClazz, "create", arg0, arg1, arg2);
@@ -88,7 +80,7 @@ public static Android.Renderscript.RenderScript Create(Android.Content.Context a
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.RenderScript.ContextType"/></param>
         /// <returns><see cref="Android.Renderscript.RenderScript"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.RenderScript Create(Android.Content.Context arg0, Android.Renderscript.RenderScript.ContextType arg1)
         {
             return SExecute<Android.Renderscript.RenderScript>(LocalBridgeClazz, "create", arg0, arg1);
@@ -98,7 +90,7 @@ public static Android.Renderscript.RenderScript Create(Android.Content.Context a
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Android.Renderscript.RenderScript"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.RenderScript Create(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.RenderScript>(LocalBridgeClazz, "create", "(Landroid/content/Context;)Landroid/renderscript/RenderScript;", arg0);
@@ -111,15 +103,24 @@ public static Android.Renderscript.RenderScript Create(Android.Content.Context a
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.RenderScript"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.RenderScript CreateMultiContext(Android.Content.Context arg0, Android.Renderscript.RenderScript.ContextType arg1, int arg2, int arg3)
         {
             return SExecute<Android.Renderscript.RenderScript>(LocalBridgeClazz, "createMultiContext", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#getMinorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public static long GetMinorVersion()
+        {
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMinorVersion", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#releaseAllContexts()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void ReleaseAllContexts()
         {
             SExecuteWithSignature(LocalBridgeClazz, "releaseAllContexts", "()V");
@@ -129,33 +130,36 @@ public static void ReleaseAllContexts()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#getApplicationContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#getErrorHandler()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Context ApplicationContext
+        /// <returns><see cref="Android.Renderscript.RenderScript.RSErrorHandler"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.RenderScript.RSErrorHandler GetErrorHandler()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getApplicationContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<Android.Renderscript.RenderScript.RSErrorHandler>("getErrorHandler", "()Landroid/renderscript/RenderScript$RSErrorHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#getErrorHandler()"/> <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#setErrorHandler(android.renderscript.RenderScript.RSErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#getMessageHandler()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.RenderScript.RSErrorHandler ErrorHandler
+        /// <returns><see cref="Android.Renderscript.RenderScript.RSMessageHandler"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.RenderScript.RSMessageHandler GetMessageHandler()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.RenderScript.RSErrorHandler>("getErrorHandler", "()Landroid/renderscript/RenderScript$RSErrorHandler;"); } set { IExecuteWithSignature("setErrorHandler", "(Landroid/renderscript/RenderScript$RSErrorHandler;)V", value); }
+            return IExecuteWithSignature<Android.Renderscript.RenderScript.RSMessageHandler>("getMessageHandler", "()Landroid/renderscript/RenderScript$RSMessageHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#getMessageHandler()"/> <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#setMessageHandler(android.renderscript.RenderScript.RSMessageHandler)"/>
+        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#getApplicationContext()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.RenderScript.RSMessageHandler MessageHandler
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Context GetApplicationContext()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.RenderScript.RSMessageHandler>("getMessageHandler", "()Landroid/renderscript/RenderScript$RSMessageHandler;"); } set { IExecuteWithSignature("setMessageHandler", "(Landroid/renderscript/RenderScript$RSMessageHandler;)V", value); }
+            return IExecuteWithSignature<Android.Content.Context>("getApplicationContext", "()Landroid/content/Context;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#contextDump()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ContextDump()
         {
             IExecuteWithSignature("contextDump", "()V");
@@ -163,7 +167,7 @@ public void ContextDump()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#destroy()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Destroy()
         {
             IExecuteWithSignature("destroy", "()V");
@@ -171,7 +175,7 @@ public void Destroy()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#finish()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Finish()
         {
             IExecuteWithSignature("finish", "()V");
@@ -181,16 +185,34 @@ public void Finish()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendMessage(int arg0, int[] arg1)
         {
             IExecute("sendMessage", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#setErrorHandler(android.renderscript.RenderScript.RSErrorHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript.RSErrorHandler"/></param>
+        [global::System.Obsolete()]
+        public void SetErrorHandler(Android.Renderscript.RenderScript.RSErrorHandler arg0)
+        {
+            IExecuteWithSignature("setErrorHandler", "(Landroid/renderscript/RenderScript$RSErrorHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#setMessageHandler(android.renderscript.RenderScript.RSMessageHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Renderscript.RenderScript.RSMessageHandler"/></param>
+        [global::System.Obsolete()]
+        public void SetMessageHandler(Android.Renderscript.RenderScript.RSMessageHandler arg0)
+        {
+            IExecuteWithSignature("setMessageHandler", "(Landroid/renderscript/RenderScript$RSMessageHandler;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.html#setPriority(android.renderscript.RenderScript.Priority)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript.Priority"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPriority(Android.Renderscript.RenderScript.Priority arg0)
         {
             IExecuteWithSignature("setPriority", "(Landroid/renderscript/RenderScript$Priority;)V", arg0);
@@ -214,21 +236,21 @@ public partial class ContextType
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.ContextType.html#DEBUG"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.RenderScript.ContextType DEBUG { get { if (!_DEBUGReady) { _DEBUGContent = SGetField<Android.Renderscript.RenderScript.ContextType>(LocalBridgeClazz, "DEBUG"); _DEBUGReady = true; } return _DEBUGContent; } }
             private static Android.Renderscript.RenderScript.ContextType _DEBUGContent = default;
             private static bool _DEBUGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.ContextType.html#NORMAL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.RenderScript.ContextType NORMAL { get { if (!_NORMALReady) { _NORMALContent = SGetField<Android.Renderscript.RenderScript.ContextType>(LocalBridgeClazz, "NORMAL"); _NORMALReady = true; } return _NORMALContent; } }
             private static Android.Renderscript.RenderScript.ContextType _NORMALContent = default;
             private static bool _NORMALReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.ContextType.html#PROFILE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.RenderScript.ContextType PROFILE { get { if (!_PROFILEReady) { _PROFILEContent = SGetField<Android.Renderscript.RenderScript.ContextType>(LocalBridgeClazz, "PROFILE"); _PROFILEReady = true; } return _PROFILEContent; } }
             private static Android.Renderscript.RenderScript.ContextType _PROFILEContent = default;
             private static bool _PROFILEReady = false; // this is used because in case of generics 
@@ -283,14 +305,14 @@ public partial class Priority
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.Priority.html#LOW"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.RenderScript.Priority LOW { get { if (!_LOWReady) { _LOWContent = SGetField<Android.Renderscript.RenderScript.Priority>(LocalBridgeClazz, "LOW"); _LOWReady = true; } return _LOWContent; } }
             private static Android.Renderscript.RenderScript.Priority _LOWContent = default;
             private static bool _LOWReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.Priority.html#NORMAL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.RenderScript.Priority NORMAL { get { if (!_NORMALReady) { _NORMALContent = SGetField<Android.Renderscript.RenderScript.Priority>(LocalBridgeClazz, "NORMAL"); _NORMALReady = true; } return _NORMALContent; } }
             private static Android.Renderscript.RenderScript.Priority _NORMALContent = default;
             private static bool _NORMALReady = false; // this is used because in case of generics 
@@ -353,7 +375,7 @@ public partial class RSErrorHandler
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.RSErrorHandler.html#run()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Run()
             {
                 IExecuteWithSignature("run", "()V");
@@ -392,7 +414,7 @@ public partial class RSMessageHandler
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/RenderScript.RSMessageHandler.html#run()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Run()
             {
                 IExecuteWithSignature("run", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Sampler.cs b/src/net/Netdroid/Generated/Android/Renderscript/Sampler.cs
index f9d4bf896..ccfd69eed 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Sampler.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Sampler.cs
@@ -46,7 +46,7 @@ public partial class Sampler
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler CLAMP_LINEAR_MIP_LINEAR(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "CLAMP_LINEAR_MIP_LINEAR", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -56,7 +56,7 @@ public static Android.Renderscript.Sampler CLAMP_LINEAR_MIP_LINEAR(Android.Rende
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler CLAMP_LINEAR(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "CLAMP_LINEAR", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -66,7 +66,7 @@ public static Android.Renderscript.Sampler CLAMP_LINEAR(Android.Renderscript.Ren
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler CLAMP_NEAREST(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "CLAMP_NEAREST", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -76,7 +76,7 @@ public static Android.Renderscript.Sampler CLAMP_NEAREST(Android.Renderscript.Re
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler MIRRORED_REPEAT_LINEAR_MIP_LINEAR(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "MIRRORED_REPEAT_LINEAR_MIP_LINEAR", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -86,7 +86,7 @@ public static Android.Renderscript.Sampler MIRRORED_REPEAT_LINEAR_MIP_LINEAR(And
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler MIRRORED_REPEAT_LINEAR(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "MIRRORED_REPEAT_LINEAR", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -96,7 +96,7 @@ public static Android.Renderscript.Sampler MIRRORED_REPEAT_LINEAR(Android.Render
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler MIRRORED_REPEAT_NEAREST(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "MIRRORED_REPEAT_NEAREST", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -106,7 +106,7 @@ public static Android.Renderscript.Sampler MIRRORED_REPEAT_NEAREST(Android.Rende
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler WRAP_LINEAR_MIP_LINEAR(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "WRAP_LINEAR_MIP_LINEAR", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -116,7 +116,7 @@ public static Android.Renderscript.Sampler WRAP_LINEAR_MIP_LINEAR(Android.Render
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler WRAP_LINEAR(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "WRAP_LINEAR", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -126,7 +126,7 @@ public static Android.Renderscript.Sampler WRAP_LINEAR(Android.Renderscript.Rend
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Sampler WRAP_NEAREST(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.Sampler>(LocalBridgeClazz, "WRAP_NEAREST", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/Sampler;", arg0);
@@ -136,44 +136,49 @@ public static Android.Renderscript.Sampler WRAP_NEAREST(Android.Renderscript.Ren
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getAnisotropy()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getMagnification()"/>
         /// </summary>
-        [System.Obsolete()]
-        public float Anisotropy
+        /// <returns><see cref="Android.Renderscript.Sampler.Value"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Sampler.Value GetMagnification()
         {
-            get { return IExecuteWithSignature<float>("getAnisotropy", "()F"); }
+            return IExecuteWithSignature<Android.Renderscript.Sampler.Value>("getMagnification", "()Landroid/renderscript/Sampler$Value;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getMagnification()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getMinification()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Sampler.Value Magnification
+        /// <returns><see cref="Android.Renderscript.Sampler.Value"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Sampler.Value GetMinification()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Sampler.Value>("getMagnification", "()Landroid/renderscript/Sampler$Value;"); }
+            return IExecuteWithSignature<Android.Renderscript.Sampler.Value>("getMinification", "()Landroid/renderscript/Sampler$Value;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getMinification()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getWrapS()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Sampler.Value Minification
+        /// <returns><see cref="Android.Renderscript.Sampler.Value"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Sampler.Value GetWrapS()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Sampler.Value>("getMinification", "()Landroid/renderscript/Sampler$Value;"); }
+            return IExecuteWithSignature<Android.Renderscript.Sampler.Value>("getWrapS", "()Landroid/renderscript/Sampler$Value;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getWrapS()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getWrapT()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Sampler.Value WrapS
+        /// <returns><see cref="Android.Renderscript.Sampler.Value"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Sampler.Value GetWrapT()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Sampler.Value>("getWrapS", "()Landroid/renderscript/Sampler$Value;"); }
+            return IExecuteWithSignature<Android.Renderscript.Sampler.Value>("getWrapT", "()Landroid/renderscript/Sampler$Value;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getWrapT()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.html#getAnisotropy()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Sampler.Value WrapT
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float GetAnisotropy()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Sampler.Value>("getWrapT", "()Landroid/renderscript/Sampler$Value;"); }
+            return IExecuteWithSignature<float>("getAnisotropy", "()F");
         }
 
         #endregion
@@ -187,7 +192,7 @@ public partial class Builder
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Builder.html#%3Cinit%3E(android.renderscript.RenderScript)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Renderscript.RenderScript arg0)
                 : base(arg0)
             {
@@ -212,7 +217,7 @@ public Builder(Android.Renderscript.RenderScript arg0)
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Builder.html#create()"/>
             /// </summary>
             /// <returns><see cref="Android.Renderscript.Sampler"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Sampler Create()
             {
                 return IExecuteWithSignature<Android.Renderscript.Sampler>("create", "()Landroid/renderscript/Sampler;");
@@ -221,7 +226,7 @@ public Android.Renderscript.Sampler Create()
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Builder.html#setAnisotropy(float)"/>
             /// </summary>
             /// <param name="arg0"><see cref="float"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetAnisotropy(float arg0)
             {
                 IExecuteWithSignature("setAnisotropy", "(F)V", arg0);
@@ -230,7 +235,7 @@ public void SetAnisotropy(float arg0)
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Builder.html#setMagnification(android.renderscript.Sampler.Value)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Sampler.Value"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetMagnification(Android.Renderscript.Sampler.Value arg0)
             {
                 IExecuteWithSignature("setMagnification", "(Landroid/renderscript/Sampler$Value;)V", arg0);
@@ -239,7 +244,7 @@ public void SetMagnification(Android.Renderscript.Sampler.Value arg0)
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Builder.html#setMinification(android.renderscript.Sampler.Value)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Sampler.Value"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetMinification(Android.Renderscript.Sampler.Value arg0)
             {
                 IExecuteWithSignature("setMinification", "(Landroid/renderscript/Sampler$Value;)V", arg0);
@@ -248,7 +253,7 @@ public void SetMinification(Android.Renderscript.Sampler.Value arg0)
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Builder.html#setWrapS(android.renderscript.Sampler.Value)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Sampler.Value"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetWrapS(Android.Renderscript.Sampler.Value arg0)
             {
                 IExecuteWithSignature("setWrapS", "(Landroid/renderscript/Sampler$Value;)V", arg0);
@@ -257,7 +262,7 @@ public void SetWrapS(Android.Renderscript.Sampler.Value arg0)
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Builder.html#setWrapT(android.renderscript.Sampler.Value)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Sampler.Value"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void SetWrapT(Android.Renderscript.Sampler.Value arg0)
             {
                 IExecuteWithSignature("setWrapT", "(Landroid/renderscript/Sampler$Value;)V", arg0);
@@ -288,49 +293,49 @@ public partial class Value
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Value.html#CLAMP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Sampler.Value CLAMP { get { if (!_CLAMPReady) { _CLAMPContent = SGetField<Android.Renderscript.Sampler.Value>(LocalBridgeClazz, "CLAMP"); _CLAMPReady = true; } return _CLAMPContent; } }
             private static Android.Renderscript.Sampler.Value _CLAMPContent = default;
             private static bool _CLAMPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Value.html#LINEAR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Sampler.Value LINEAR { get { if (!_LINEARReady) { _LINEARContent = SGetField<Android.Renderscript.Sampler.Value>(LocalBridgeClazz, "LINEAR"); _LINEARReady = true; } return _LINEARContent; } }
             private static Android.Renderscript.Sampler.Value _LINEARContent = default;
             private static bool _LINEARReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Value.html#LINEAR_MIP_LINEAR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Sampler.Value LINEAR_MIP_LINEAR { get { if (!_LINEAR_MIP_LINEARReady) { _LINEAR_MIP_LINEARContent = SGetField<Android.Renderscript.Sampler.Value>(LocalBridgeClazz, "LINEAR_MIP_LINEAR"); _LINEAR_MIP_LINEARReady = true; } return _LINEAR_MIP_LINEARContent; } }
             private static Android.Renderscript.Sampler.Value _LINEAR_MIP_LINEARContent = default;
             private static bool _LINEAR_MIP_LINEARReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Value.html#LINEAR_MIP_NEAREST"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Sampler.Value LINEAR_MIP_NEAREST { get { if (!_LINEAR_MIP_NEARESTReady) { _LINEAR_MIP_NEARESTContent = SGetField<Android.Renderscript.Sampler.Value>(LocalBridgeClazz, "LINEAR_MIP_NEAREST"); _LINEAR_MIP_NEARESTReady = true; } return _LINEAR_MIP_NEARESTContent; } }
             private static Android.Renderscript.Sampler.Value _LINEAR_MIP_NEARESTContent = default;
             private static bool _LINEAR_MIP_NEARESTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Value.html#MIRRORED_REPEAT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Sampler.Value MIRRORED_REPEAT { get { if (!_MIRRORED_REPEATReady) { _MIRRORED_REPEATContent = SGetField<Android.Renderscript.Sampler.Value>(LocalBridgeClazz, "MIRRORED_REPEAT"); _MIRRORED_REPEATReady = true; } return _MIRRORED_REPEATContent; } }
             private static Android.Renderscript.Sampler.Value _MIRRORED_REPEATContent = default;
             private static bool _MIRRORED_REPEATReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Value.html#NEAREST"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Sampler.Value NEAREST { get { if (!_NEARESTReady) { _NEARESTContent = SGetField<Android.Renderscript.Sampler.Value>(LocalBridgeClazz, "NEAREST"); _NEARESTReady = true; } return _NEARESTContent; } }
             private static Android.Renderscript.Sampler.Value _NEARESTContent = default;
             private static bool _NEARESTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Sampler.Value.html#WRAP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Sampler.Value WRAP { get { if (!_WRAPReady) { _WRAPContent = SGetField<Android.Renderscript.Sampler.Value>(LocalBridgeClazz, "WRAP"); _WRAPReady = true; } return _WRAPContent; } }
             private static Android.Renderscript.Sampler.Value _WRAPContent = default;
             private static bool _WRAPReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Script.cs b/src/net/Netdroid/Generated/Android/Renderscript/Script.cs
index 1232d6e18..75b99709e 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Script.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Script.cs
@@ -50,7 +50,7 @@ public partial class Script
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool GetVarB(int arg0)
         {
             return IExecuteWithSignature<bool>("getVarB", "(I)Z", arg0);
@@ -60,7 +60,7 @@ public bool GetVarB(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="double"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double GetVarD(int arg0)
         {
             return IExecuteWithSignature<double>("getVarD", "(I)D", arg0);
@@ -70,7 +70,7 @@ public double GetVarD(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float GetVarF(int arg0)
         {
             return IExecuteWithSignature<float>("getVarF", "(I)F", arg0);
@@ -80,7 +80,7 @@ public float GetVarF(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetVarI(int arg0)
         {
             return IExecuteWithSignature<int>("getVarI", "(I)I", arg0);
@@ -90,7 +90,7 @@ public int GetVarI(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long GetVarJ(int arg0)
         {
             return IExecuteWithSignature<long>("getVarJ", "(I)J", arg0);
@@ -100,7 +100,7 @@ public long GetVarJ(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void BindAllocation(Android.Renderscript.Allocation arg0, int arg1)
         {
             IExecute("bindAllocation", arg0, arg1);
@@ -110,7 +110,7 @@ public void BindAllocation(Android.Renderscript.Allocation arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetVarV(int arg0, Android.Renderscript.FieldPacker arg1)
         {
             IExecute("getVarV", arg0, arg1);
@@ -119,7 +119,7 @@ public void GetVarV(int arg0, Android.Renderscript.FieldPacker arg1)
         /// <see href="https://developer.android.com/reference/android/renderscript/Script.html#setTimeZone(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTimeZone(Java.Lang.String arg0)
         {
             IExecuteWithSignature("setTimeZone", "(Ljava/lang/String;)V", arg0);
@@ -129,7 +129,7 @@ public void SetTimeZone(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.BaseObj"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVar(int arg0, Android.Renderscript.BaseObj arg1)
         {
             IExecute("setVar", arg0, arg1);
@@ -141,7 +141,7 @@ public void SetVar(int arg0, Android.Renderscript.BaseObj arg1)
         /// <param name="arg1"><see cref="Android.Renderscript.FieldPacker"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Element"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVar(int arg0, Android.Renderscript.FieldPacker arg1, Android.Renderscript.Element arg2, int[] arg3)
         {
             IExecute("setVar", arg0, arg1, arg2, arg3);
@@ -151,7 +151,7 @@ public void SetVar(int arg0, Android.Renderscript.FieldPacker arg1, Android.Rend
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.FieldPacker"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVar(int arg0, Android.Renderscript.FieldPacker arg1)
         {
             IExecute("setVar", arg0, arg1);
@@ -161,7 +161,7 @@ public void SetVar(int arg0, Android.Renderscript.FieldPacker arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVar(int arg0, bool arg1)
         {
             IExecute("setVar", arg0, arg1);
@@ -171,7 +171,7 @@ public void SetVar(int arg0, bool arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="double"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVar(int arg0, double arg1)
         {
             IExecute("setVar", arg0, arg1);
@@ -181,7 +181,7 @@ public void SetVar(int arg0, double arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVar(int arg0, float arg1)
         {
             IExecute("setVar", arg0, arg1);
@@ -191,7 +191,7 @@ public void SetVar(int arg0, float arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVar(int arg0, int arg1)
         {
             IExecute("setVar", arg0, arg1);
@@ -201,7 +201,7 @@ public void SetVar(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVar(int arg0, long arg1)
         {
             IExecute("setVar", arg0, arg1);
@@ -262,33 +262,36 @@ public partial class FieldBase
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldBase.html#getAllocation()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldBase.html#getAllocation()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Renderscript.Allocation Allocation
+            /// <returns><see cref="Android.Renderscript.Allocation"/></returns>
+            [global::System.Obsolete()]
+            public Android.Renderscript.Allocation GetAllocation()
             {
-                get { return IExecuteWithSignature<Android.Renderscript.Allocation>("getAllocation", "()Landroid/renderscript/Allocation;"); }
+                return IExecuteWithSignature<Android.Renderscript.Allocation>("getAllocation", "()Landroid/renderscript/Allocation;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldBase.html#getElement()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldBase.html#getElement()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Renderscript.Element Element
+            /// <returns><see cref="Android.Renderscript.Element"/></returns>
+            [global::System.Obsolete()]
+            public Android.Renderscript.Element GetElement()
             {
-                get { return IExecuteWithSignature<Android.Renderscript.Element>("getElement", "()Landroid/renderscript/Element;"); }
+                return IExecuteWithSignature<Android.Renderscript.Element>("getElement", "()Landroid/renderscript/Element;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldBase.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldBase.html#getType()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Android.Renderscript.Type Type
+            /// <returns><see cref="Android.Renderscript.Type"/></returns>
+            [global::System.Obsolete()]
+            public Android.Renderscript.Type GetType()
             {
-                get { return IExecuteWithSignature<Android.Renderscript.Type>("getType", "()Landroid/renderscript/Type;"); }
+                return IExecuteWithSignature<Android.Renderscript.Type>("getType", "()Landroid/renderscript/Type;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Script.FieldBase.html#updateAllocation()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void UpdateAllocation()
             {
                 IExecuteWithSignature("updateAllocation", "()V");
@@ -418,85 +421,91 @@ public partial class LaunchOptions
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getXEnd()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#setX(int,int)"/>
             /// </summary>
-            [System.Obsolete()]
-            public int XEnd
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            /// <returns><see cref="Android.Renderscript.Script.LaunchOptions"/></returns>
+            [global::System.Obsolete()]
+            public Android.Renderscript.Script.LaunchOptions SetX(int arg0, int arg1)
             {
-                get { return IExecuteWithSignature<int>("getXEnd", "()I"); }
+                return IExecute<Android.Renderscript.Script.LaunchOptions>("setX", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getXStart()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#setY(int,int)"/>
             /// </summary>
-            [System.Obsolete()]
-            public int XStart
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            /// <returns><see cref="Android.Renderscript.Script.LaunchOptions"/></returns>
+            [global::System.Obsolete()]
+            public Android.Renderscript.Script.LaunchOptions SetY(int arg0, int arg1)
             {
-                get { return IExecuteWithSignature<int>("getXStart", "()I"); }
+                return IExecute<Android.Renderscript.Script.LaunchOptions>("setY", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getYEnd()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#setZ(int,int)"/>
             /// </summary>
-            [System.Obsolete()]
-            public int YEnd
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            /// <returns><see cref="Android.Renderscript.Script.LaunchOptions"/></returns>
+            [global::System.Obsolete()]
+            public Android.Renderscript.Script.LaunchOptions SetZ(int arg0, int arg1)
             {
-                get { return IExecuteWithSignature<int>("getYEnd", "()I"); }
+                return IExecute<Android.Renderscript.Script.LaunchOptions>("setZ", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getYStart()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getXEnd()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int YStart
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetXEnd()
             {
-                get { return IExecuteWithSignature<int>("getYStart", "()I"); }
+                return IExecuteWithSignature<int>("getXEnd", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getZEnd()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getXStart()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int ZEnd
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetXStart()
             {
-                get { return IExecuteWithSignature<int>("getZEnd", "()I"); }
+                return IExecuteWithSignature<int>("getXStart", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getZStart()"/> 
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getYEnd()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int ZStart
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetYEnd()
             {
-                get { return IExecuteWithSignature<int>("getZStart", "()I"); }
+                return IExecuteWithSignature<int>("getYEnd", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#setX(int,int)"/>
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getYStart()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <returns><see cref="Android.Renderscript.Script.LaunchOptions"/></returns>
-            [System.Obsolete()]
-            public Android.Renderscript.Script.LaunchOptions SetX(int arg0, int arg1)
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetYStart()
             {
-                return IExecute<Android.Renderscript.Script.LaunchOptions>("setX", arg0, arg1);
+                return IExecuteWithSignature<int>("getYStart", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#setY(int,int)"/>
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getZEnd()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <returns><see cref="Android.Renderscript.Script.LaunchOptions"/></returns>
-            [System.Obsolete()]
-            public Android.Renderscript.Script.LaunchOptions SetY(int arg0, int arg1)
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetZEnd()
             {
-                return IExecute<Android.Renderscript.Script.LaunchOptions>("setY", arg0, arg1);
+                return IExecuteWithSignature<int>("getZEnd", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#setZ(int,int)"/>
+            /// <see href="https://developer.android.com/reference/android/renderscript/Script.LaunchOptions.html#getZStart()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <returns><see cref="Android.Renderscript.Script.LaunchOptions"/></returns>
-            [System.Obsolete()]
-            public Android.Renderscript.Script.LaunchOptions SetZ(int arg0, int arg1)
+            /// <returns><see cref="int"/></returns>
+            [global::System.Obsolete()]
+            public int GetZStart()
             {
-                return IExecute<Android.Renderscript.Script.LaunchOptions>("setZ", arg0, arg1);
+                return IExecuteWithSignature<int>("getZStart", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptGroup.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptGroup.cs
index c9b4abc16..fdd4e23dc 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptGroup.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptGroup.cs
@@ -50,7 +50,7 @@ public partial class ScriptGroup
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object[] Execute(params object[] arg0)
         {
             if (arg0.Length == 0) return IExecuteWithSignatureArray<object>("execute", "([Ljava/lang/Object;)[Ljava/lang/Object;"); else return IExecuteWithSignatureArray<object>("execute", "([Ljava/lang/Object;)[Ljava/lang/Object;", arg0);
@@ -58,7 +58,7 @@ public object[] Execute(params object[] arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.html#execute()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Execute()
         {
             IExecuteWithSignature("execute", "()V");
@@ -68,7 +68,7 @@ public void Execute()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Script.KernelID"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInput(Android.Renderscript.Script.KernelID arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("setInput", arg0, arg1);
@@ -78,7 +78,7 @@ public void SetInput(Android.Renderscript.Script.KernelID arg0, Android.Rendersc
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Script.KernelID"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOutput(Android.Renderscript.Script.KernelID arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("setOutput", arg0, arg1);
@@ -96,7 +96,7 @@ public partial class Binding
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Script.FieldID"/></param>
             /// <param name="arg1"><see cref="object"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Binding(Android.Renderscript.Script.FieldID arg0, object arg1)
                 : base(arg0, arg1)
             {
@@ -136,7 +136,7 @@ public partial class Builder
             /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Builder.html#%3Cinit%3E(android.renderscript.RenderScript)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Renderscript.RenderScript arg0)
                 : base(arg0)
             {
@@ -161,7 +161,7 @@ public Builder(Android.Renderscript.RenderScript arg0)
             /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Builder.html#create()"/>
             /// </summary>
             /// <returns><see cref="Android.Renderscript.ScriptGroup"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup Create()
             {
                 return IExecuteWithSignature<Android.Renderscript.ScriptGroup>("create", "()Landroid/renderscript/ScriptGroup;");
@@ -173,7 +173,7 @@ public Android.Renderscript.ScriptGroup Create()
             /// <param name="arg1"><see cref="Android.Renderscript.Script.KernelID"/></param>
             /// <param name="arg2"><see cref="Android.Renderscript.Script.FieldID"/></param>
             /// <returns><see cref="Android.Renderscript.ScriptGroup.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup.Builder AddConnection(Android.Renderscript.Type arg0, Android.Renderscript.Script.KernelID arg1, Android.Renderscript.Script.FieldID arg2)
             {
                 return IExecute<Android.Renderscript.ScriptGroup.Builder>("addConnection", arg0, arg1, arg2);
@@ -185,7 +185,7 @@ public Android.Renderscript.ScriptGroup.Builder AddConnection(Android.Renderscri
             /// <param name="arg1"><see cref="Android.Renderscript.Script.KernelID"/></param>
             /// <param name="arg2"><see cref="Android.Renderscript.Script.KernelID"/></param>
             /// <returns><see cref="Android.Renderscript.ScriptGroup.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup.Builder AddConnection(Android.Renderscript.Type arg0, Android.Renderscript.Script.KernelID arg1, Android.Renderscript.Script.KernelID arg2)
             {
                 return IExecute<Android.Renderscript.ScriptGroup.Builder>("addConnection", arg0, arg1, arg2);
@@ -195,7 +195,7 @@ public Android.Renderscript.ScriptGroup.Builder AddConnection(Android.Renderscri
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Script.KernelID"/></param>
             /// <returns><see cref="Android.Renderscript.ScriptGroup.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup.Builder AddKernel(Android.Renderscript.Script.KernelID arg0)
             {
                 return IExecuteWithSignature<Android.Renderscript.ScriptGroup.Builder>("addKernel", "(Landroid/renderscript/Script$KernelID;)Landroid/renderscript/ScriptGroup$Builder;", arg0);
@@ -219,7 +219,7 @@ public partial class Builder2
             /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Builder2.html#%3Cinit%3E(android.renderscript.RenderScript)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder2(Android.Renderscript.RenderScript arg0)
                 : base(arg0)
             {
@@ -246,7 +246,7 @@ public Builder2(Android.Renderscript.RenderScript arg0)
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Android.Renderscript.ScriptGroup.Future"/></param>
             /// <returns><see cref="Android.Renderscript.ScriptGroup"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup Create(Java.Lang.String arg0, params Android.Renderscript.ScriptGroup.Future[] arg1)
             {
                 if (arg1.Length == 0) return IExecute<Android.Renderscript.ScriptGroup>("create", arg0); else return IExecute<Android.Renderscript.ScriptGroup>("create", arg0, arg1);
@@ -257,7 +257,7 @@ public Android.Renderscript.ScriptGroup Create(Java.Lang.String arg0, params And
             /// <param name="arg0"><see cref="Android.Renderscript.Script.InvokeID"/></param>
             /// <param name="arg1"><see cref="object"/></param>
             /// <returns><see cref="Android.Renderscript.ScriptGroup.Closure"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup.Closure AddInvoke(Android.Renderscript.Script.InvokeID arg0, params object[] arg1)
             {
                 if (arg1.Length == 0) return IExecute<Android.Renderscript.ScriptGroup.Closure>("addInvoke", arg0); else return IExecute<Android.Renderscript.ScriptGroup.Closure>("addInvoke", arg0, arg1);
@@ -269,7 +269,7 @@ public Android.Renderscript.ScriptGroup.Closure AddInvoke(Android.Renderscript.S
             /// <param name="arg1"><see cref="Android.Renderscript.Type"/></param>
             /// <param name="arg2"><see cref="object"/></param>
             /// <returns><see cref="Android.Renderscript.ScriptGroup.Closure"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup.Closure AddKernel(Android.Renderscript.Script.KernelID arg0, Android.Renderscript.Type arg1, params object[] arg2)
             {
                 if (arg2.Length == 0) return IExecute<Android.Renderscript.ScriptGroup.Closure>("addKernel", arg0, arg1); else return IExecute<Android.Renderscript.ScriptGroup.Closure>("addKernel", arg0, arg1, arg2);
@@ -278,7 +278,7 @@ public Android.Renderscript.ScriptGroup.Closure AddKernel(Android.Renderscript.S
             /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Builder2.html#addInput()"/>
             /// </summary>
             /// <returns><see cref="Android.Renderscript.ScriptGroup.Input"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup.Input AddInput()
             {
                 return IExecuteWithSignature<Android.Renderscript.ScriptGroup.Input>("addInput", "()Landroid/renderscript/ScriptGroup$Input;");
@@ -315,23 +315,24 @@ public partial class Closure
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Closure.html#getReturn()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Android.Renderscript.ScriptGroup.Future Return
-            {
-                get { return IExecuteWithSignature<Android.Renderscript.ScriptGroup.Future>("getReturn", "()Landroid/renderscript/ScriptGroup$Future;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Closure.html#getGlobal(android.renderscript.Script.FieldID)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.Script.FieldID"/></param>
             /// <returns><see cref="Android.Renderscript.ScriptGroup.Future"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.ScriptGroup.Future GetGlobal(Android.Renderscript.Script.FieldID arg0)
             {
                 return IExecuteWithSignature<Android.Renderscript.ScriptGroup.Future>("getGlobal", "(Landroid/renderscript/Script$FieldID;)Landroid/renderscript/ScriptGroup$Future;", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/renderscript/ScriptGroup.Closure.html#getReturn()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Renderscript.ScriptGroup.Future"/></returns>
+            [global::System.Obsolete()]
+            public Android.Renderscript.ScriptGroup.Future GetReturn()
+            {
+                return IExecuteWithSignature<Android.Renderscript.ScriptGroup.Future>("getReturn", "()Landroid/renderscript/ScriptGroup$Future;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsic3DLUT.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsic3DLUT.cs
index ccfad05bf..baa8f190d 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsic3DLUT.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsic3DLUT.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsic3DLUT
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsic3DLUT"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsic3DLUT Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsic3DLUT>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,12 +57,13 @@ public static Android.Renderscript.ScriptIntrinsic3DLUT Create(Android.Renderscr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsic3DLUT.html#getKernelID()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsic3DLUT.html#getKernelID()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsic3DLUT.html#forEach(android.renderscript.Allocation,android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
@@ -70,7 +71,7 @@ public Android.Renderscript.Script.KernelID KernelID
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEach", arg0, arg1, arg2);
@@ -80,7 +81,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.A
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEach", arg0, arg1);
@@ -89,7 +90,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.A
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsic3DLUT.html#setLUT(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetLUT(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("setLUT", "(Landroid/renderscript/Allocation;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBLAS.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBLAS.cs
index 0184a1413..d64e4a0fe 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBLAS.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBLAS.cs
@@ -40,63 +40,63 @@ public partial class ScriptIntrinsicBLAS
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#CONJ_TRANSPOSE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CONJ_TRANSPOSE { get { if (!_CONJ_TRANSPOSEReady) { _CONJ_TRANSPOSEContent = SGetField<int>(LocalBridgeClazz, "CONJ_TRANSPOSE"); _CONJ_TRANSPOSEReady = true; } return _CONJ_TRANSPOSEContent; } }
         private static int _CONJ_TRANSPOSEContent = default;
         private static bool _CONJ_TRANSPOSEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#LEFT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LEFT { get { if (!_LEFTReady) { _LEFTContent = SGetField<int>(LocalBridgeClazz, "LEFT"); _LEFTReady = true; } return _LEFTContent; } }
         private static int _LEFTContent = default;
         private static bool _LEFTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#LOWER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LOWER { get { if (!_LOWERReady) { _LOWERContent = SGetField<int>(LocalBridgeClazz, "LOWER"); _LOWERReady = true; } return _LOWERContent; } }
         private static int _LOWERContent = default;
         private static bool _LOWERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#NO_TRANSPOSE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NO_TRANSPOSE { get { if (!_NO_TRANSPOSEReady) { _NO_TRANSPOSEContent = SGetField<int>(LocalBridgeClazz, "NO_TRANSPOSE"); _NO_TRANSPOSEReady = true; } return _NO_TRANSPOSEContent; } }
         private static int _NO_TRANSPOSEContent = default;
         private static bool _NO_TRANSPOSEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#NON_UNIT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NON_UNIT { get { if (!_NON_UNITReady) { _NON_UNITContent = SGetField<int>(LocalBridgeClazz, "NON_UNIT"); _NON_UNITReady = true; } return _NON_UNITContent; } }
         private static int _NON_UNITContent = default;
         private static bool _NON_UNITReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#RIGHT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RIGHT { get { if (!_RIGHTReady) { _RIGHTContent = SGetField<int>(LocalBridgeClazz, "RIGHT"); _RIGHTReady = true; } return _RIGHTContent; } }
         private static int _RIGHTContent = default;
         private static bool _RIGHTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#TRANSPOSE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TRANSPOSE { get { if (!_TRANSPOSEReady) { _TRANSPOSEContent = SGetField<int>(LocalBridgeClazz, "TRANSPOSE"); _TRANSPOSEReady = true; } return _TRANSPOSEContent; } }
         private static int _TRANSPOSEContent = default;
         private static bool _TRANSPOSEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#UNIT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int UNIT { get { if (!_UNITReady) { _UNITContent = SGetField<int>(LocalBridgeClazz, "UNIT"); _UNITReady = true; } return _UNITContent; } }
         private static int _UNITContent = default;
         private static bool _UNITReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBLAS.html#UPPER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int UPPER { get { if (!_UPPERReady) { _UPPERContent = SGetField<int>(LocalBridgeClazz, "UPPER"); _UPPERReady = true; } return _UPPERContent; } }
         private static int _UPPERContent = default;
         private static bool _UPPERReady = false; // this is used because in case of generics 
@@ -109,7 +109,7 @@ public partial class ScriptIntrinsicBLAS
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicBLAS"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicBLAS Create(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.ScriptIntrinsicBLAS>(LocalBridgeClazz, "create", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/ScriptIntrinsicBLAS;", arg0);
@@ -128,7 +128,7 @@ public static Android.Renderscript.ScriptIntrinsicBLAS Create(Android.Renderscri
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void BNNM(Android.Renderscript.Allocation arg0, int arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, int arg6)
         {
             IExecute("BNNM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -146,7 +146,7 @@ public void BNNM(Android.Renderscript.Allocation arg0, int arg1, Android.Renders
         /// <param name="arg7"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg8"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg9"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CGBMV(int arg0, int arg1, int arg2, Android.Renderscript.Float2 arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6, Android.Renderscript.Float2 arg7, Android.Renderscript.Allocation arg8, int arg9)
         {
             IExecute("CGBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -161,7 +161,7 @@ public void CGBMV(int arg0, int arg1, int arg2, Android.Renderscript.Float2 arg3
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CGEMM(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Float2 arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CGEMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -177,7 +177,7 @@ public void CGEMM(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.
         /// <param name="arg5"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CGEMV(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Float2 arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("CGEMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -191,7 +191,7 @@ public void CGEMV(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscri
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CGERC(Android.Renderscript.Float2 arg0, Android.Renderscript.Allocation arg1, int arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("CGERC", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -205,7 +205,7 @@ public void CGERC(Android.Renderscript.Float2 arg0, Android.Renderscript.Allocat
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CGERU(Android.Renderscript.Float2 arg0, Android.Renderscript.Allocation arg1, int arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("CGERU", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -222,7 +222,7 @@ public void CGERU(Android.Renderscript.Float2 arg0, Android.Renderscript.Allocat
         /// <param name="arg6"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg7"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg8"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHBMV(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Float2 arg6, Android.Renderscript.Allocation arg7, int arg8)
         {
             IExecute("CHBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -237,7 +237,7 @@ public void CHBMV(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHEMM(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Float2 arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CHEMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -253,7 +253,7 @@ public void CHEMM(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.
         /// <param name="arg5"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHEMV(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Float2 arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("CHEMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -266,7 +266,7 @@ public void CHEMV(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscri
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHER(int arg0, float arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4)
         {
             IExecute("CHER", arg0, arg1, arg2, arg3, arg4);
@@ -281,7 +281,7 @@ public void CHER(int arg0, float arg1, Android.Renderscript.Allocation arg2, int
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHER2(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CHER2", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -296,7 +296,7 @@ public void CHER2(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscri
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHER2K(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, float arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CHER2K", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -310,7 +310,7 @@ public void CHER2K(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="float"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHERK(int arg0, int arg1, float arg2, Android.Renderscript.Allocation arg3, float arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("CHERK", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -326,7 +326,7 @@ public void CHERK(int arg0, int arg1, float arg2, Android.Renderscript.Allocatio
         /// <param name="arg5"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHPMV(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Float2 arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("CHPMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -339,7 +339,7 @@ public void CHPMV(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscri
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHPR(int arg0, float arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4)
         {
             IExecute("CHPR", arg0, arg1, arg2, arg3, arg4);
@@ -354,7 +354,7 @@ public void CHPR(int arg0, float arg1, Android.Renderscript.Allocation arg2, int
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CHPR2(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CHPR2", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -369,7 +369,7 @@ public void CHPR2(int arg0, Android.Renderscript.Float2 arg1, Android.Renderscri
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CSYMM(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Float2 arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CSYMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -384,7 +384,7 @@ public void CSYMM(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CSYR2K(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Float2 arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CSYR2K", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -398,7 +398,7 @@ public void CSYR2K(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CSYRK(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Float2 arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("CSYRK", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -413,7 +413,7 @@ public void CSYRK(int arg0, int arg1, Android.Renderscript.Float2 arg2, Android.
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CTBMV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6)
         {
             IExecute("CTBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -428,7 +428,7 @@ public void CTBMV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.A
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CTBSV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6)
         {
             IExecute("CTBSV", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -442,7 +442,7 @@ public void CTBSV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.A
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CTPMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("CTPMV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -456,7 +456,7 @@ public void CTPMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CTPSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("CTPSV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -471,7 +471,7 @@ public void CTPSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg4"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CTRMM(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Float2 arg4, Android.Renderscript.Allocation arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CTRMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -485,7 +485,7 @@ public void CTRMM(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.F
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CTRMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("CTRMV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -500,7 +500,7 @@ public void CTRMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg4"><see cref="Android.Renderscript.Float2"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CTRSM(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Float2 arg4, Android.Renderscript.Allocation arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("CTRSM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -514,7 +514,7 @@ public void CTRSM(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.F
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CTRSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("CTRSV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -532,7 +532,7 @@ public void CTRSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg7"><see cref="double"/></param>
         /// <param name="arg8"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg9"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DGBMV(int arg0, int arg1, int arg2, double arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6, double arg7, Android.Renderscript.Allocation arg8, int arg9)
         {
             IExecute("DGBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -547,7 +547,7 @@ public void DGBMV(int arg0, int arg1, int arg2, double arg3, Android.Renderscrip
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="double"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DGEMM(int arg0, int arg1, double arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, double arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("DGEMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -563,7 +563,7 @@ public void DGEMM(int arg0, int arg1, double arg2, Android.Renderscript.Allocati
         /// <param name="arg5"><see cref="double"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DGEMV(int arg0, double arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, double arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("DGEMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -577,7 +577,7 @@ public void DGEMV(int arg0, double arg1, Android.Renderscript.Allocation arg2, A
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DGER(double arg0, Android.Renderscript.Allocation arg1, int arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("DGER", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -594,7 +594,7 @@ public void DGER(double arg0, Android.Renderscript.Allocation arg1, int arg2, An
         /// <param name="arg6"><see cref="double"/></param>
         /// <param name="arg7"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg8"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSBMV(int arg0, int arg1, double arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5, double arg6, Android.Renderscript.Allocation arg7, int arg8)
         {
             IExecute("DSBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -610,7 +610,7 @@ public void DSBMV(int arg0, int arg1, double arg2, Android.Renderscript.Allocati
         /// <param name="arg5"><see cref="double"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSPMV(int arg0, double arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, double arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("DSPMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -623,7 +623,7 @@ public void DSPMV(int arg0, double arg1, Android.Renderscript.Allocation arg2, A
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSPR(int arg0, double arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4)
         {
             IExecute("DSPR", arg0, arg1, arg2, arg3, arg4);
@@ -638,7 +638,7 @@ public void DSPR(int arg0, double arg1, Android.Renderscript.Allocation arg2, in
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSPR2(int arg0, double arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("DSPR2", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -653,7 +653,7 @@ public void DSPR2(int arg0, double arg1, Android.Renderscript.Allocation arg2, i
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="double"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSYMM(int arg0, int arg1, double arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, double arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("DSYMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -669,7 +669,7 @@ public void DSYMM(int arg0, int arg1, double arg2, Android.Renderscript.Allocati
         /// <param name="arg5"><see cref="double"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSYMV(int arg0, double arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, double arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("DSYMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -682,7 +682,7 @@ public void DSYMV(int arg0, double arg1, Android.Renderscript.Allocation arg2, A
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSYR(int arg0, double arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4)
         {
             IExecute("DSYR", arg0, arg1, arg2, arg3, arg4);
@@ -697,7 +697,7 @@ public void DSYR(int arg0, double arg1, Android.Renderscript.Allocation arg2, in
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSYR2(int arg0, double arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("DSYR2", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -712,7 +712,7 @@ public void DSYR2(int arg0, double arg1, Android.Renderscript.Allocation arg2, i
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="double"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSYR2K(int arg0, int arg1, double arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, double arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("DSYR2K", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -726,7 +726,7 @@ public void DSYR2K(int arg0, int arg1, double arg2, Android.Renderscript.Allocat
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="double"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DSYRK(int arg0, int arg1, double arg2, Android.Renderscript.Allocation arg3, double arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("DSYRK", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -741,7 +741,7 @@ public void DSYRK(int arg0, int arg1, double arg2, Android.Renderscript.Allocati
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DTBMV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6)
         {
             IExecute("DTBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -756,7 +756,7 @@ public void DTBMV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.A
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DTBSV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6)
         {
             IExecute("DTBSV", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -770,7 +770,7 @@ public void DTBSV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.A
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DTPMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("DTPMV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -784,7 +784,7 @@ public void DTPMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DTPSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("DTPSV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -799,7 +799,7 @@ public void DTPSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg4"><see cref="double"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DTRMM(int arg0, int arg1, int arg2, int arg3, double arg4, Android.Renderscript.Allocation arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("DTRMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -813,7 +813,7 @@ public void DTRMM(int arg0, int arg1, int arg2, int arg3, double arg4, Android.R
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DTRMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("DTRMV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -828,7 +828,7 @@ public void DTRMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg4"><see cref="double"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DTRSM(int arg0, int arg1, int arg2, int arg3, double arg4, Android.Renderscript.Allocation arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("DTRSM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -842,7 +842,7 @@ public void DTRSM(int arg0, int arg1, int arg2, int arg3, double arg4, Android.R
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DTRSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("DTRSV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -860,7 +860,7 @@ public void DTRSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg7"><see cref="float"/></param>
         /// <param name="arg8"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg9"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SGBMV(int arg0, int arg1, int arg2, float arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6, float arg7, Android.Renderscript.Allocation arg8, int arg9)
         {
             IExecute("SGBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -875,7 +875,7 @@ public void SGBMV(int arg0, int arg1, int arg2, float arg3, Android.Renderscript
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SGEMM(int arg0, int arg1, float arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, float arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("SGEMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -891,7 +891,7 @@ public void SGEMM(int arg0, int arg1, float arg2, Android.Renderscript.Allocatio
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SGEMV(int arg0, float arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, float arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("SGEMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -905,7 +905,7 @@ public void SGEMV(int arg0, float arg1, Android.Renderscript.Allocation arg2, An
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SGER(float arg0, Android.Renderscript.Allocation arg1, int arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("SGER", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -922,7 +922,7 @@ public void SGER(float arg0, Android.Renderscript.Allocation arg1, int arg2, And
         /// <param name="arg6"><see cref="float"/></param>
         /// <param name="arg7"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg8"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSBMV(int arg0, int arg1, float arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5, float arg6, Android.Renderscript.Allocation arg7, int arg8)
         {
             IExecute("SSBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -938,7 +938,7 @@ public void SSBMV(int arg0, int arg1, float arg2, Android.Renderscript.Allocatio
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSPMV(int arg0, float arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, float arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("SSPMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -951,7 +951,7 @@ public void SSPMV(int arg0, float arg1, Android.Renderscript.Allocation arg2, An
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSPR(int arg0, float arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4)
         {
             IExecute("SSPR", arg0, arg1, arg2, arg3, arg4);
@@ -966,7 +966,7 @@ public void SSPR(int arg0, float arg1, Android.Renderscript.Allocation arg2, int
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSPR2(int arg0, float arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("SSPR2", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -981,7 +981,7 @@ public void SSPR2(int arg0, float arg1, Android.Renderscript.Allocation arg2, in
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSYMM(int arg0, int arg1, float arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, float arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("SSYMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -997,7 +997,7 @@ public void SSYMM(int arg0, int arg1, float arg2, Android.Renderscript.Allocatio
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSYMV(int arg0, float arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, float arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("SSYMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -1010,7 +1010,7 @@ public void SSYMV(int arg0, float arg1, Android.Renderscript.Allocation arg2, An
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSYR(int arg0, float arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4)
         {
             IExecute("SSYR", arg0, arg1, arg2, arg3, arg4);
@@ -1025,7 +1025,7 @@ public void SSYR(int arg0, float arg1, Android.Renderscript.Allocation arg2, int
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSYR2(int arg0, float arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("SSYR2", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1040,7 +1040,7 @@ public void SSYR2(int arg0, float arg1, Android.Renderscript.Allocation arg2, in
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSYR2K(int arg0, int arg1, float arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, float arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("SSYR2K", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1054,7 +1054,7 @@ public void SSYR2K(int arg0, int arg1, float arg2, Android.Renderscript.Allocati
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="float"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SSYRK(int arg0, int arg1, float arg2, Android.Renderscript.Allocation arg3, float arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("SSYRK", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1069,7 +1069,7 @@ public void SSYRK(int arg0, int arg1, float arg2, Android.Renderscript.Allocatio
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void STBMV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6)
         {
             IExecute("STBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1084,7 +1084,7 @@ public void STBMV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.A
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void STBSV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6)
         {
             IExecute("STBSV", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1098,7 +1098,7 @@ public void STBSV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.A
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void STPMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("STPMV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1112,7 +1112,7 @@ public void STPMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void STPSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("STPSV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1127,7 +1127,7 @@ public void STPSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg4"><see cref="float"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void STRMM(int arg0, int arg1, int arg2, int arg3, float arg4, Android.Renderscript.Allocation arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("STRMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1141,7 +1141,7 @@ public void STRMM(int arg0, int arg1, int arg2, int arg3, float arg4, Android.Re
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void STRMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("STRMV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1156,7 +1156,7 @@ public void STRMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg4"><see cref="float"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void STRSM(int arg0, int arg1, int arg2, int arg3, float arg4, Android.Renderscript.Allocation arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("STRSM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1170,7 +1170,7 @@ public void STRSM(int arg0, int arg1, int arg2, int arg3, float arg4, Android.Re
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void STRSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("STRSV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1188,7 +1188,7 @@ public void STRSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg7"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg8"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg9"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZGBMV(int arg0, int arg1, int arg2, Android.Renderscript.Double2 arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6, Android.Renderscript.Double2 arg7, Android.Renderscript.Allocation arg8, int arg9)
         {
             IExecute("ZGBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -1203,7 +1203,7 @@ public void ZGBMV(int arg0, int arg1, int arg2, Android.Renderscript.Double2 arg
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZGEMM(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Double2 arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZGEMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1219,7 +1219,7 @@ public void ZGEMM(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android
         /// <param name="arg5"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZGEMV(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Double2 arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("ZGEMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -1233,7 +1233,7 @@ public void ZGEMV(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscr
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZGERC(Android.Renderscript.Double2 arg0, Android.Renderscript.Allocation arg1, int arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("ZGERC", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1247,7 +1247,7 @@ public void ZGERC(Android.Renderscript.Double2 arg0, Android.Renderscript.Alloca
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZGERU(Android.Renderscript.Double2 arg0, Android.Renderscript.Allocation arg1, int arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("ZGERU", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1264,7 +1264,7 @@ public void ZGERU(Android.Renderscript.Double2 arg0, Android.Renderscript.Alloca
         /// <param name="arg6"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg7"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg8"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHBMV(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Double2 arg6, Android.Renderscript.Allocation arg7, int arg8)
         {
             IExecute("ZHBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -1279,7 +1279,7 @@ public void ZHBMV(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHEMM(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Double2 arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZHEMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1295,7 +1295,7 @@ public void ZHEMM(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android
         /// <param name="arg5"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHEMV(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Double2 arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("ZHEMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -1308,7 +1308,7 @@ public void ZHEMV(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscr
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHER(int arg0, double arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4)
         {
             IExecute("ZHER", arg0, arg1, arg2, arg3, arg4);
@@ -1323,7 +1323,7 @@ public void ZHER(int arg0, double arg1, Android.Renderscript.Allocation arg2, in
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHER2(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZHER2", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1338,7 +1338,7 @@ public void ZHER2(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscr
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="double"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHER2K(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, double arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZHER2K", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1352,7 +1352,7 @@ public void ZHER2K(int arg0, int arg1, Android.Renderscript.Double2 arg2, Androi
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="double"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHERK(int arg0, int arg1, double arg2, Android.Renderscript.Allocation arg3, double arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("ZHERK", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1368,7 +1368,7 @@ public void ZHERK(int arg0, int arg1, double arg2, Android.Renderscript.Allocati
         /// <param name="arg5"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHPMV(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscript.Allocation arg2, Android.Renderscript.Allocation arg3, int arg4, Android.Renderscript.Double2 arg5, Android.Renderscript.Allocation arg6, int arg7)
         {
             IExecute("ZHPMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -1381,7 +1381,7 @@ public void ZHPMV(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscr
         /// <param name="arg2"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHPR(int arg0, double arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4)
         {
             IExecute("ZHPR", arg0, arg1, arg2, arg3, arg4);
@@ -1396,7 +1396,7 @@ public void ZHPR(int arg0, double arg1, Android.Renderscript.Allocation arg2, in
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZHPR2(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscript.Allocation arg2, int arg3, Android.Renderscript.Allocation arg4, int arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZHPR2", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1411,7 +1411,7 @@ public void ZHPR2(int arg0, Android.Renderscript.Double2 arg1, Android.Renderscr
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZSYMM(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Double2 arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZSYMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1426,7 +1426,7 @@ public void ZSYMM(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZSYR2K(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Double2 arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZSYR2K", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1440,7 +1440,7 @@ public void ZSYR2K(int arg0, int arg1, Android.Renderscript.Double2 arg2, Androi
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZSYRK(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Double2 arg4, Android.Renderscript.Allocation arg5)
         {
             IExecute("ZSYRK", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1455,7 +1455,7 @@ public void ZSYRK(int arg0, int arg1, Android.Renderscript.Double2 arg2, Android
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZTBMV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6)
         {
             IExecute("ZTBMV", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1470,7 +1470,7 @@ public void ZTBMV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.A
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZTBSV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Allocation arg4, Android.Renderscript.Allocation arg5, int arg6)
         {
             IExecute("ZTBSV", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1484,7 +1484,7 @@ public void ZTBSV(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.A
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZTPMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("ZTPMV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1498,7 +1498,7 @@ public void ZTPMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZTPSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("ZTPSV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1513,7 +1513,7 @@ public void ZTPSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg4"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZTRMM(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Double2 arg4, Android.Renderscript.Allocation arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZTRMM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1527,7 +1527,7 @@ public void ZTRMM(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.D
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZTRMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("ZTRMV", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -1542,7 +1542,7 @@ public void ZTRMV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation
         /// <param name="arg4"><see cref="Android.Renderscript.Double2"/></param>
         /// <param name="arg5"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg6"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZTRSM(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.Double2 arg4, Android.Renderscript.Allocation arg5, Android.Renderscript.Allocation arg6)
         {
             IExecute("ZTRSM", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1556,7 +1556,7 @@ public void ZTRSM(int arg0, int arg1, int arg2, int arg3, Android.Renderscript.D
         /// <param name="arg3"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg4"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ZTRSV(int arg0, int arg1, int arg2, Android.Renderscript.Allocation arg3, Android.Renderscript.Allocation arg4, int arg5)
         {
             IExecute("ZTRSV", arg0, arg1, arg2, arg3, arg4, arg5);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBlend.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBlend.cs
index 78af463e5..b85234280 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBlend.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBlend.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsicBlend
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicBlend"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicBlend Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsicBlend>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,124 +57,139 @@ public static Android.Renderscript.ScriptIntrinsicBlend Create(Android.Renderscr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDAdd()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDAdd()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDAdd
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDAdd()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDAdd", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDAdd", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDClear()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDClear()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDClear
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDClear()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDClear", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDClear", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDst()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDst()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDDst
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDDst()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDst", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDst", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDstAtop()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDstAtop()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDDstAtop
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDDstAtop()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDstAtop", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDstAtop", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDstIn()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDstIn()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDDstIn
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDDstIn()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDstIn", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDstIn", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDstOut()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDstOut()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDDstOut
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDDstOut()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDstOut", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDstOut", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDstOver()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDDstOver()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDDstOver
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDDstOver()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDstOver", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDDstOver", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDMultiply()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDMultiply()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDMultiply
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDMultiply()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDMultiply", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDMultiply", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrc()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrc()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDSrc
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDSrc()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrc", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrc", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrcAtop()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrcAtop()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDSrcAtop
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDSrcAtop()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrcAtop", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrcAtop", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrcIn()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrcIn()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDSrcIn
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDSrcIn()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrcIn", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrcIn", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrcOut()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrcOut()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDSrcOut
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDSrcOut()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrcOut", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrcOut", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrcOver()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSrcOver()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDSrcOver
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDSrcOver()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrcOver", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSrcOver", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSubtract()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDSubtract()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDSubtract
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDSubtract()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSubtract", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDSubtract", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDXor()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#getKernelIDXor()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelIDXor
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelIDXor()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDXor", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelIDXor", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlend.html#forEachAdd(android.renderscript.Allocation,android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
@@ -182,7 +197,7 @@ public Android.Renderscript.Script.KernelID KernelIDXor
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachAdd(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachAdd", arg0, arg1, arg2);
@@ -192,7 +207,7 @@ public void ForEachAdd(Android.Renderscript.Allocation arg0, Android.Renderscrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachAdd(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachAdd", arg0, arg1);
@@ -203,7 +218,7 @@ public void ForEachAdd(Android.Renderscript.Allocation arg0, Android.Renderscrip
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachClear(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachClear", arg0, arg1, arg2);
@@ -213,7 +228,7 @@ public void ForEachClear(Android.Renderscript.Allocation arg0, Android.Renderscr
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachClear(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachClear", arg0, arg1);
@@ -224,7 +239,7 @@ public void ForEachClear(Android.Renderscript.Allocation arg0, Android.Renderscr
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDst(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachDst", arg0, arg1, arg2);
@@ -234,7 +249,7 @@ public void ForEachDst(Android.Renderscript.Allocation arg0, Android.Renderscrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDst(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachDst", arg0, arg1);
@@ -245,7 +260,7 @@ public void ForEachDst(Android.Renderscript.Allocation arg0, Android.Renderscrip
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDstAtop(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachDstAtop", arg0, arg1, arg2);
@@ -255,7 +270,7 @@ public void ForEachDstAtop(Android.Renderscript.Allocation arg0, Android.Renders
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDstAtop(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachDstAtop", arg0, arg1);
@@ -266,7 +281,7 @@ public void ForEachDstAtop(Android.Renderscript.Allocation arg0, Android.Renders
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDstIn(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachDstIn", arg0, arg1, arg2);
@@ -276,7 +291,7 @@ public void ForEachDstIn(Android.Renderscript.Allocation arg0, Android.Renderscr
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDstIn(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachDstIn", arg0, arg1);
@@ -287,7 +302,7 @@ public void ForEachDstIn(Android.Renderscript.Allocation arg0, Android.Renderscr
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDstOut(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachDstOut", arg0, arg1, arg2);
@@ -297,7 +312,7 @@ public void ForEachDstOut(Android.Renderscript.Allocation arg0, Android.Rendersc
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDstOut(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachDstOut", arg0, arg1);
@@ -308,7 +323,7 @@ public void ForEachDstOut(Android.Renderscript.Allocation arg0, Android.Rendersc
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDstOver(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachDstOver", arg0, arg1, arg2);
@@ -318,7 +333,7 @@ public void ForEachDstOver(Android.Renderscript.Allocation arg0, Android.Renders
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachDstOver(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachDstOver", arg0, arg1);
@@ -329,7 +344,7 @@ public void ForEachDstOver(Android.Renderscript.Allocation arg0, Android.Renders
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachMultiply(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachMultiply", arg0, arg1, arg2);
@@ -339,7 +354,7 @@ public void ForEachMultiply(Android.Renderscript.Allocation arg0, Android.Render
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachMultiply(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachMultiply", arg0, arg1);
@@ -350,7 +365,7 @@ public void ForEachMultiply(Android.Renderscript.Allocation arg0, Android.Render
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrc(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachSrc", arg0, arg1, arg2);
@@ -360,7 +375,7 @@ public void ForEachSrc(Android.Renderscript.Allocation arg0, Android.Renderscrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrc(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachSrc", arg0, arg1);
@@ -371,7 +386,7 @@ public void ForEachSrc(Android.Renderscript.Allocation arg0, Android.Renderscrip
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrcAtop(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachSrcAtop", arg0, arg1, arg2);
@@ -381,7 +396,7 @@ public void ForEachSrcAtop(Android.Renderscript.Allocation arg0, Android.Renders
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrcAtop(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachSrcAtop", arg0, arg1);
@@ -392,7 +407,7 @@ public void ForEachSrcAtop(Android.Renderscript.Allocation arg0, Android.Renders
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrcIn(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachSrcIn", arg0, arg1, arg2);
@@ -402,7 +417,7 @@ public void ForEachSrcIn(Android.Renderscript.Allocation arg0, Android.Renderscr
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrcIn(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachSrcIn", arg0, arg1);
@@ -413,7 +428,7 @@ public void ForEachSrcIn(Android.Renderscript.Allocation arg0, Android.Renderscr
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrcOut(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachSrcOut", arg0, arg1, arg2);
@@ -423,7 +438,7 @@ public void ForEachSrcOut(Android.Renderscript.Allocation arg0, Android.Rendersc
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrcOut(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachSrcOut", arg0, arg1);
@@ -434,7 +449,7 @@ public void ForEachSrcOut(Android.Renderscript.Allocation arg0, Android.Rendersc
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrcOver(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachSrcOver", arg0, arg1, arg2);
@@ -444,7 +459,7 @@ public void ForEachSrcOver(Android.Renderscript.Allocation arg0, Android.Renders
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSrcOver(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachSrcOver", arg0, arg1);
@@ -455,7 +470,7 @@ public void ForEachSrcOver(Android.Renderscript.Allocation arg0, Android.Renders
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSubtract(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachSubtract", arg0, arg1, arg2);
@@ -465,7 +480,7 @@ public void ForEachSubtract(Android.Renderscript.Allocation arg0, Android.Render
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachSubtract(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachSubtract", arg0, arg1);
@@ -476,7 +491,7 @@ public void ForEachSubtract(Android.Renderscript.Allocation arg0, Android.Render
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachXor(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEachXor", arg0, arg1, arg2);
@@ -486,7 +501,7 @@ public void ForEachXor(Android.Renderscript.Allocation arg0, Android.Renderscrip
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEachXor(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEachXor", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBlur.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBlur.cs
index b0decac81..f3c90c96e 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBlur.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicBlur.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsicBlur
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicBlur"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicBlur Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsicBlur>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,27 +57,29 @@ public static Android.Renderscript.ScriptIntrinsicBlur Create(Android.Renderscri
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html#getFieldID_Input()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html#getFieldID_Input()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.FieldID FieldID_Input
+        /// <returns><see cref="Android.Renderscript.Script.FieldID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.FieldID GetFieldID_Input()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html#getKernelID()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html#getKernelID()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html#forEach(android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Script.LaunchOptions arg1)
         {
             IExecute("forEach", arg0, arg1);
@@ -86,7 +88,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.S
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html#forEach(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("forEach", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -95,7 +97,7 @@ public void ForEach(Android.Renderscript.Allocation arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html#setInput(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInput(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("setInput", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -104,7 +106,7 @@ public void SetInput(Android.Renderscript.Allocation arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicBlur.html#setRadius(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRadius(float arg0)
         {
             IExecuteWithSignature("setRadius", "(F)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicColorMatrix.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicColorMatrix.cs
index a240fd851..771865182 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicColorMatrix.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicColorMatrix.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsicColorMatrix
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicColorMatrix"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicColorMatrix Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsicColorMatrix>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,7 +57,7 @@ public static Android.Renderscript.ScriptIntrinsicColorMatrix Create(Android.Ren
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicColorMatrix"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicColorMatrix Create(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.ScriptIntrinsicColorMatrix>(LocalBridgeClazz, "create", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/ScriptIntrinsicColorMatrix;", arg0);
@@ -67,12 +67,13 @@ public static Android.Renderscript.ScriptIntrinsicColorMatrix Create(Android.Ren
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#getKernelID()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#getKernelID()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#forEach(android.renderscript.Allocation,android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
@@ -80,7 +81,7 @@ public Android.Renderscript.Script.KernelID KernelID
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEach", arg0, arg1, arg2);
@@ -90,7 +91,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.A
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEach", arg0, arg1);
@@ -99,7 +100,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.A
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#setAdd(android.renderscript.Float4)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Float4"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAdd(Android.Renderscript.Float4 arg0)
         {
             IExecuteWithSignature("setAdd", "(Landroid/renderscript/Float4;)V", arg0);
@@ -111,7 +112,7 @@ public void SetAdd(Android.Renderscript.Float4 arg0)
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAdd(float arg0, float arg1, float arg2, float arg3)
         {
             IExecute("setAdd", arg0, arg1, arg2, arg3);
@@ -120,7 +121,7 @@ public void SetAdd(float arg0, float arg1, float arg2, float arg3)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#setColorMatrix(android.renderscript.Matrix3f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix3f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetColorMatrix(Android.Renderscript.Matrix3f arg0)
         {
             IExecuteWithSignature("setColorMatrix", "(Landroid/renderscript/Matrix3f;)V", arg0);
@@ -129,7 +130,7 @@ public void SetColorMatrix(Android.Renderscript.Matrix3f arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#setColorMatrix(android.renderscript.Matrix4f)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Matrix4f"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetColorMatrix(Android.Renderscript.Matrix4f arg0)
         {
             IExecuteWithSignature("setColorMatrix", "(Landroid/renderscript/Matrix4f;)V", arg0);
@@ -137,7 +138,7 @@ public void SetColorMatrix(Android.Renderscript.Matrix4f arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#setGreyscale()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetGreyscale()
         {
             IExecuteWithSignature("setGreyscale", "()V");
@@ -145,7 +146,7 @@ public void SetGreyscale()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#setRGBtoYUV()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRGBtoYUV()
         {
             IExecuteWithSignature("setRGBtoYUV", "()V");
@@ -153,7 +154,7 @@ public void SetRGBtoYUV()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicColorMatrix.html#setYUVtoRGB()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetYUVtoRGB()
         {
             IExecuteWithSignature("setYUVtoRGB", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicConvolve3x3.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicConvolve3x3.cs
index 0a27baedf..ddfdf1607 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicConvolve3x3.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicConvolve3x3.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsicConvolve3x3
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicConvolve3x3"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicConvolve3x3 Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsicConvolve3x3>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,27 +57,29 @@ public static Android.Renderscript.ScriptIntrinsicConvolve3x3 Create(Android.Ren
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html#getFieldID_Input()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html#getFieldID_Input()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.FieldID FieldID_Input
+        /// <returns><see cref="Android.Renderscript.Script.FieldID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.FieldID GetFieldID_Input()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html#getKernelID()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html#getKernelID()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html#forEach(android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Script.LaunchOptions arg1)
         {
             IExecute("forEach", arg0, arg1);
@@ -86,7 +88,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.S
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html#forEach(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("forEach", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -95,7 +97,7 @@ public void ForEach(Android.Renderscript.Allocation arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html#setCoefficients(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCoefficients(float[] arg0)
         {
             IExecuteWithSignature("setCoefficients", "([F)V", new object[] { arg0 });
@@ -104,7 +106,7 @@ public void SetCoefficients(float[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve3x3.html#setInput(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInput(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("setInput", "(Landroid/renderscript/Allocation;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicConvolve5x5.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicConvolve5x5.cs
index 8114e5438..6bca382c6 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicConvolve5x5.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicConvolve5x5.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsicConvolve5x5
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicConvolve5x5"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicConvolve5x5 Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsicConvolve5x5>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,27 +57,29 @@ public static Android.Renderscript.ScriptIntrinsicConvolve5x5 Create(Android.Ren
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html#getFieldID_Input()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html#getFieldID_Input()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.FieldID FieldID_Input
+        /// <returns><see cref="Android.Renderscript.Script.FieldID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.FieldID GetFieldID_Input()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html#getKernelID()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html#getKernelID()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html#forEach(android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Script.LaunchOptions arg1)
         {
             IExecute("forEach", arg0, arg1);
@@ -86,7 +88,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.S
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html#forEach(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("forEach", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -95,7 +97,7 @@ public void ForEach(Android.Renderscript.Allocation arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html#setCoefficients(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCoefficients(float[] arg0)
         {
             IExecuteWithSignature("setCoefficients", "([F)V", new object[] { arg0 });
@@ -104,7 +106,7 @@ public void SetCoefficients(float[] arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicConvolve5x5.html#setInput(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInput(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("setInput", "(Landroid/renderscript/Allocation;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicHistogram.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicHistogram.cs
index 8ecd62ed1..814bec71d 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicHistogram.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicHistogram.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsicHistogram
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicHistogram"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicHistogram Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsicHistogram>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,27 +57,29 @@ public static Android.Renderscript.ScriptIntrinsicHistogram Create(Android.Rende
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html#getFieldID_Input()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html#getFieldID_Input()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.FieldID FieldID_Input
+        /// <returns><see cref="Android.Renderscript.Script.FieldID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.FieldID GetFieldID_Input()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html#getKernelID_Separate()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html#getKernelID_Separate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID_Separate
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID_Separate()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID_Separate", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID_Separate", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html#forEach_Dot(android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach_Dot(Android.Renderscript.Allocation arg0, Android.Renderscript.Script.LaunchOptions arg1)
         {
             IExecute("forEach_Dot", arg0, arg1);
@@ -86,7 +88,7 @@ public void ForEach_Dot(Android.Renderscript.Allocation arg0, Android.Renderscri
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html#forEach_Dot(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach_Dot(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("forEach_Dot", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -96,7 +98,7 @@ public void ForEach_Dot(Android.Renderscript.Allocation arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Script.LaunchOptions arg1)
         {
             IExecute("forEach", arg0, arg1);
@@ -105,7 +107,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.S
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html#forEach(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("forEach", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -117,7 +119,7 @@ public void ForEach(Android.Renderscript.Allocation arg0)
         /// <param name="arg1"><see cref="float"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDotCoefficients(float arg0, float arg1, float arg2, float arg3)
         {
             IExecute("setDotCoefficients", arg0, arg1, arg2, arg3);
@@ -126,7 +128,7 @@ public void SetDotCoefficients(float arg0, float arg1, float arg2, float arg3)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicHistogram.html#setOutput(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOutput(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("setOutput", "(Landroid/renderscript/Allocation;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicLUT.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicLUT.cs
index bcf9e4d8c..13d5f4432 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicLUT.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicLUT.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsicLUT
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicLUT"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicLUT Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsicLUT>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,12 +57,13 @@ public static Android.Renderscript.ScriptIntrinsicLUT Create(Android.Renderscrip
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicLUT.html#getKernelID()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicLUT.html#getKernelID()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicLUT.html#forEach(android.renderscript.Allocation,android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
@@ -70,7 +71,7 @@ public Android.Renderscript.Script.KernelID KernelID
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg2"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1, Android.Renderscript.Script.LaunchOptions arg2)
         {
             IExecute("forEach", arg0, arg1, arg2);
@@ -80,7 +81,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.A
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.Allocation arg1)
         {
             IExecute("forEach", arg0, arg1);
@@ -90,7 +91,7 @@ public void ForEach(Android.Renderscript.Allocation arg0, Android.Renderscript.A
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAlpha(int arg0, int arg1)
         {
             IExecute("setAlpha", arg0, arg1);
@@ -100,7 +101,7 @@ public void SetAlpha(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetBlue(int arg0, int arg1)
         {
             IExecute("setBlue", arg0, arg1);
@@ -110,7 +111,7 @@ public void SetBlue(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetGreen(int arg0, int arg1)
         {
             IExecute("setGreen", arg0, arg1);
@@ -120,7 +121,7 @@ public void SetGreen(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRed(int arg0, int arg1)
         {
             IExecute("setRed", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicResize.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicResize.cs
index e29db9076..1145569f8 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicResize.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicResize.cs
@@ -46,7 +46,7 @@ public partial class ScriptIntrinsicResize
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicResize"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicResize Create(Android.Renderscript.RenderScript arg0)
         {
             return SExecuteWithSignature<Android.Renderscript.ScriptIntrinsicResize>(LocalBridgeClazz, "create", "(Landroid/renderscript/RenderScript;)Landroid/renderscript/ScriptIntrinsicResize;", arg0);
@@ -56,27 +56,29 @@ public static Android.Renderscript.ScriptIntrinsicResize Create(Android.Rendersc
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicResize.html#getFieldID_Input()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicResize.html#getFieldID_Input()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.FieldID FieldID_Input
+        /// <returns><see cref="Android.Renderscript.Script.FieldID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.FieldID GetFieldID_Input()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicResize.html#getKernelID_bicubic()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicResize.html#getKernelID_bicubic()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID_bicubic
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID_bicubic()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID_bicubic", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID_bicubic", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicResize.html#forEach_bicubic(android.renderscript.Allocation,android.renderscript.Script.LaunchOptions)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Script.LaunchOptions"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach_bicubic(Android.Renderscript.Allocation arg0, Android.Renderscript.Script.LaunchOptions arg1)
         {
             IExecute("forEach_bicubic", arg0, arg1);
@@ -85,7 +87,7 @@ public void ForEach_bicubic(Android.Renderscript.Allocation arg0, Android.Render
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicResize.html#forEach_bicubic(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach_bicubic(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("forEach_bicubic", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -94,7 +96,7 @@ public void ForEach_bicubic(Android.Renderscript.Allocation arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicResize.html#setInput(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInput(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("setInput", "(Landroid/renderscript/Allocation;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicYuvToRGB.cs b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicYuvToRGB.cs
index 93d0c4f84..2897d3570 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicYuvToRGB.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/ScriptIntrinsicYuvToRGB.cs
@@ -47,7 +47,7 @@ public partial class ScriptIntrinsicYuvToRGB
         /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <returns><see cref="Android.Renderscript.ScriptIntrinsicYuvToRGB"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.ScriptIntrinsicYuvToRGB Create(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
         {
             return SExecute<Android.Renderscript.ScriptIntrinsicYuvToRGB>(LocalBridgeClazz, "create", arg0, arg1);
@@ -57,26 +57,28 @@ public static Android.Renderscript.ScriptIntrinsicYuvToRGB Create(Android.Render
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicYuvToRGB.html#getFieldID_Input()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicYuvToRGB.html#getFieldID_Input()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.FieldID FieldID_Input
+        /// <returns><see cref="Android.Renderscript.Script.FieldID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.FieldID GetFieldID_Input()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.FieldID>("getFieldID_Input", "()Landroid/renderscript/Script$FieldID;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicYuvToRGB.html#getKernelID()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicYuvToRGB.html#getKernelID()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Script.KernelID KernelID
+        /// <returns><see cref="Android.Renderscript.Script.KernelID"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Script.KernelID GetKernelID()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;"); }
+            return IExecuteWithSignature<Android.Renderscript.Script.KernelID>("getKernelID", "()Landroid/renderscript/Script$KernelID;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicYuvToRGB.html#forEach(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ForEach(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("forEach", "(Landroid/renderscript/Allocation;)V", arg0);
@@ -85,7 +87,7 @@ public void ForEach(Android.Renderscript.Allocation arg0)
         /// <see href="https://developer.android.com/reference/android/renderscript/ScriptIntrinsicYuvToRGB.html#setInput(android.renderscript.Allocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Renderscript.Allocation"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInput(Android.Renderscript.Allocation arg0)
         {
             IExecuteWithSignature("setInput", "(Landroid/renderscript/Allocation;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Short2.cs b/src/net/Netdroid/Generated/Android/Renderscript/Short2.cs
index 26a4a397b..97cf1cbae 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Short2.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Short2.cs
@@ -34,7 +34,7 @@ public partial class Short2
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Short2(short arg0, short arg1)
             : base(arg0, arg1)
         {
@@ -50,12 +50,12 @@ public Short2(short arg0, short arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short2.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short x { get { return IGetField<short>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short2.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short y { get { return IGetField<short>("y"); } set { ISetField("y", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Short3.cs b/src/net/Netdroid/Generated/Android/Renderscript/Short3.cs
index 0f63b9357..ac6e7568c 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Short3.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Short3.cs
@@ -35,7 +35,7 @@ public partial class Short3
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
         /// <param name="arg2"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Short3(short arg0, short arg1, short arg2)
             : base(arg0, arg1, arg2)
         {
@@ -51,17 +51,17 @@ public Short3(short arg0, short arg1, short arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short3.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short x { get { return IGetField<short>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short3.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short y { get { return IGetField<short>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short3.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short z { get { return IGetField<short>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Short4.cs b/src/net/Netdroid/Generated/Android/Renderscript/Short4.cs
index edd71fc22..03a769233 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Short4.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Short4.cs
@@ -36,7 +36,7 @@ public partial class Short4
         /// <param name="arg1"><see cref="short"/></param>
         /// <param name="arg2"><see cref="short"/></param>
         /// <param name="arg3"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Short4(short arg0, short arg1, short arg2, short arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -52,22 +52,22 @@ public Short4(short arg0, short arg1, short arg2, short arg3)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short4.html#w"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short w { get { return IGetField<short>("w"); } set { ISetField("w", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short4.html#x"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short x { get { return IGetField<short>("x"); } set { ISetField("x", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short4.html#y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short y { get { return IGetField<short>("y"); } set { ISetField("y", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/renderscript/Short4.html#z"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short z { get { return IGetField<short>("z"); } set { ISetField("z", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Renderscript/Type.cs b/src/net/Netdroid/Generated/Android/Renderscript/Type.cs
index 85bc521c9..d59dc08ca 100644
--- a/src/net/Netdroid/Generated/Android/Renderscript/Type.cs
+++ b/src/net/Netdroid/Generated/Android/Renderscript/Type.cs
@@ -48,7 +48,7 @@ public partial class Type
         /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Type"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Type CreateX(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1, int arg2)
         {
             return SExecute<Android.Renderscript.Type>(LocalBridgeClazz, "createX", arg0, arg1, arg2);
@@ -61,7 +61,7 @@ public static Android.Renderscript.Type CreateX(Android.Renderscript.RenderScrip
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Type"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Type CreateXY(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1, int arg2, int arg3)
         {
             return SExecute<Android.Renderscript.Type>(LocalBridgeClazz, "createXY", arg0, arg1, arg2, arg3);
@@ -75,7 +75,7 @@ public static Android.Renderscript.Type CreateXY(Android.Renderscript.RenderScri
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <returns><see cref="Android.Renderscript.Type"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Renderscript.Type CreateXYZ(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1, int arg2, int arg3, int arg4)
         {
             return SExecute<Android.Renderscript.Type>(LocalBridgeClazz, "createXYZ", arg0, arg1, arg2, arg3, arg4);
@@ -85,70 +85,76 @@ public static Android.Renderscript.Type CreateXYZ(Android.Renderscript.RenderScr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getElement()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Count
+        /// <returns><see cref="Android.Renderscript.Element"/></returns>
+        [global::System.Obsolete()]
+        public Android.Renderscript.Element GetElement()
         {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
+            return IExecuteWithSignature<Android.Renderscript.Element>("getElement", "()Landroid/renderscript/Element;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getElement()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#hasFaces()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Renderscript.Element Element
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool HasFaces()
         {
-            get { return IExecuteWithSignature<Android.Renderscript.Element>("getElement", "()Landroid/renderscript/Element;"); }
+            return IExecuteWithSignature<bool>("hasFaces", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getX()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#hasMipmaps()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int X
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool HasMipmaps()
         {
-            get { return IExecuteWithSignature<int>("getX", "()I"); }
+            return IExecuteWithSignature<bool>("hasMipmaps", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getY()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Y
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetCount()
         {
-            get { return IExecuteWithSignature<int>("getY", "()I"); }
+            return IExecuteWithSignature<int>("getCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getYuv()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getX()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Yuv
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetX()
         {
-            get { return IExecuteWithSignature<int>("getYuv", "()I"); }
+            return IExecuteWithSignature<int>("getX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getZ()"/> 
+        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getY()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Z
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetY()
         {
-            get { return IExecuteWithSignature<int>("getZ", "()I"); }
+            return IExecuteWithSignature<int>("getY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#hasFaces()"/>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getYuv()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool HasFaces()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetYuv()
         {
-            return IExecuteWithSignature<bool>("hasFaces", "()Z");
+            return IExecuteWithSignature<int>("getYuv", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#hasMipmaps()"/>
+        /// <see href="https://developer.android.com/reference/android/renderscript/Type.html#getZ()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool HasMipmaps()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetZ()
         {
-            return IExecuteWithSignature<bool>("hasMipmaps", "()Z");
+            return IExecuteWithSignature<int>("getZ", "()I");
         }
 
         #endregion
@@ -163,7 +169,7 @@ public partial class Builder
             /// </summary>
             /// <param name="arg0"><see cref="Android.Renderscript.RenderScript"/></param>
             /// <param name="arg1"><see cref="Android.Renderscript.Element"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Renderscript.RenderScript arg0, Android.Renderscript.Element arg1)
                 : base(arg0, arg1)
             {
@@ -188,7 +194,7 @@ public Builder(Android.Renderscript.RenderScript arg0, Android.Renderscript.Elem
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.Builder.html#create()"/>
             /// </summary>
             /// <returns><see cref="Android.Renderscript.Type"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Type Create()
             {
                 return IExecuteWithSignature<Android.Renderscript.Type>("create", "()Landroid/renderscript/Type;");
@@ -198,7 +204,7 @@ public Android.Renderscript.Type Create()
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.Renderscript.Type.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Type.Builder SetFaces(bool arg0)
             {
                 return IExecuteWithSignature<Android.Renderscript.Type.Builder>("setFaces", "(Z)Landroid/renderscript/Type$Builder;", arg0);
@@ -208,7 +214,7 @@ public Android.Renderscript.Type.Builder SetFaces(bool arg0)
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.Renderscript.Type.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Type.Builder SetMipmaps(bool arg0)
             {
                 return IExecuteWithSignature<Android.Renderscript.Type.Builder>("setMipmaps", "(Z)Landroid/renderscript/Type$Builder;", arg0);
@@ -218,7 +224,7 @@ public Android.Renderscript.Type.Builder SetMipmaps(bool arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Renderscript.Type.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Type.Builder SetX(int arg0)
             {
                 return IExecuteWithSignature<Android.Renderscript.Type.Builder>("setX", "(I)Landroid/renderscript/Type$Builder;", arg0);
@@ -228,7 +234,7 @@ public Android.Renderscript.Type.Builder SetX(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Renderscript.Type.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Type.Builder SetY(int arg0)
             {
                 return IExecuteWithSignature<Android.Renderscript.Type.Builder>("setY", "(I)Landroid/renderscript/Type$Builder;", arg0);
@@ -238,7 +244,7 @@ public Android.Renderscript.Type.Builder SetY(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Renderscript.Type.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Type.Builder SetYuvFormat(int arg0)
             {
                 return IExecuteWithSignature<Android.Renderscript.Type.Builder>("setYuvFormat", "(I)Landroid/renderscript/Type$Builder;", arg0);
@@ -248,7 +254,7 @@ public Android.Renderscript.Type.Builder SetYuvFormat(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Renderscript.Type.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Renderscript.Type.Builder SetZ(int arg0)
             {
                 return IExecuteWithSignature<Android.Renderscript.Type.Builder>("setZ", "(I)Landroid/renderscript/Type$Builder;", arg0);
@@ -279,63 +285,63 @@ public partial class CubemapFace
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#NEGATIVE_X"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace NEGATIVE_X { get { if (!_NEGATIVE_XReady) { _NEGATIVE_XContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "NEGATIVE_X"); _NEGATIVE_XReady = true; } return _NEGATIVE_XContent; } }
             private static Android.Renderscript.Type.CubemapFace _NEGATIVE_XContent = default;
             private static bool _NEGATIVE_XReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#NEGATIVE_Y"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace NEGATIVE_Y { get { if (!_NEGATIVE_YReady) { _NEGATIVE_YContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "NEGATIVE_Y"); _NEGATIVE_YReady = true; } return _NEGATIVE_YContent; } }
             private static Android.Renderscript.Type.CubemapFace _NEGATIVE_YContent = default;
             private static bool _NEGATIVE_YReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#NEGATIVE_Z"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace NEGATIVE_Z { get { if (!_NEGATIVE_ZReady) { _NEGATIVE_ZContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "NEGATIVE_Z"); _NEGATIVE_ZReady = true; } return _NEGATIVE_ZContent; } }
             private static Android.Renderscript.Type.CubemapFace _NEGATIVE_ZContent = default;
             private static bool _NEGATIVE_ZReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#POSITIVE_X"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace POSITIVE_X { get { if (!_POSITIVE_XReady) { _POSITIVE_XContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "POSITIVE_X"); _POSITIVE_XReady = true; } return _POSITIVE_XContent; } }
             private static Android.Renderscript.Type.CubemapFace _POSITIVE_XContent = default;
             private static bool _POSITIVE_XReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#POSITIVE_Y"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace POSITIVE_Y { get { if (!_POSITIVE_YReady) { _POSITIVE_YContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "POSITIVE_Y"); _POSITIVE_YReady = true; } return _POSITIVE_YContent; } }
             private static Android.Renderscript.Type.CubemapFace _POSITIVE_YContent = default;
             private static bool _POSITIVE_YReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#POSITIVE_Z"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace POSITIVE_Z { get { if (!_POSITIVE_ZReady) { _POSITIVE_ZContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "POSITIVE_Z"); _POSITIVE_ZReady = true; } return _POSITIVE_ZContent; } }
             private static Android.Renderscript.Type.CubemapFace _POSITIVE_ZContent = default;
             private static bool _POSITIVE_ZReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#POSITVE_X"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace POSITVE_X { get { if (!_POSITVE_XReady) { _POSITVE_XContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "POSITVE_X"); _POSITVE_XReady = true; } return _POSITVE_XContent; } }
             private static Android.Renderscript.Type.CubemapFace _POSITVE_XContent = default;
             private static bool _POSITVE_XReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#POSITVE_Y"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace POSITVE_Y { get { if (!_POSITVE_YReady) { _POSITVE_YContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "POSITVE_Y"); _POSITVE_YReady = true; } return _POSITVE_YContent; } }
             private static Android.Renderscript.Type.CubemapFace _POSITVE_YContent = default;
             private static bool _POSITVE_YReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/renderscript/Type.CubemapFace.html#POSITVE_Z"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Renderscript.Type.CubemapFace POSITVE_Z { get { if (!_POSITVE_ZReady) { _POSITVE_ZContent = SGetField<Android.Renderscript.Type.CubemapFace>(LocalBridgeClazz, "POSITVE_Z"); _POSITVE_ZReady = true; } return _POSITVE_ZContent; } }
             private static Android.Renderscript.Type.CubemapFace _POSITVE_ZContent = default;
             private static bool _POSITVE_ZReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Sax/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Sax/AllPackageClasses.cs
index cfe45e1c6..a4378e87c 100644
--- a/src/net/Netdroid/Generated/Android/Sax/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Sax/AllPackageClasses.cs
@@ -81,10 +81,13 @@ public partial class ElementListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
         /// </summary>
         public ElementListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.sax.ElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.sax.ElementListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -106,10 +109,13 @@ public partial class ElementListenerDirect : ElementListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.sax.ElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.sax.ElementListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -140,10 +146,13 @@ public partial class EndElementListener : MASES.JCOBridge.C2JBridge.JVMBridgeLis
         /// </summary>
         public EndElementListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.sax.EndElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.sax.EndElementListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -165,10 +174,13 @@ public partial class EndElementListenerDirect : EndElementListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.sax.EndElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.sax.EndElementListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -199,10 +211,13 @@ public partial class EndTextElementListener : MASES.JCOBridge.C2JBridge.JVMBridg
         /// </summary>
         public EndTextElementListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.sax.EndTextElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.sax.EndTextElementListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -224,10 +239,13 @@ public partial class EndTextElementListenerDirect : EndTextElementListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.sax.EndTextElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.sax.EndTextElementListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -302,10 +320,13 @@ public partial class StartElementListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
         /// </summary>
         public StartElementListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.sax.StartElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.sax.StartElementListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -327,10 +348,13 @@ public partial class StartElementListenerDirect : StartElementListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.sax.StartElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.sax.StartElementListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -361,10 +385,13 @@ public partial class TextElementListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public TextElementListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.sax.TextElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.sax.TextElementListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -386,10 +413,13 @@ public partial class TextElementListenerDirect : TextElementListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.sax.TextElementListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.sax.TextElementListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Sax/ElementListener.cs b/src/net/Netdroid/Generated/Android/Sax/ElementListener.cs
index 9b1829335..1e8163fc8 100644
--- a/src/net/Netdroid/Generated/Android/Sax/ElementListener.cs
+++ b/src/net/Netdroid/Generated/Android/Sax/ElementListener.cs
@@ -68,8 +68,8 @@ public partial class ElementListener : Android.Sax.IElementListener, Android.Sax
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("end", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(EndEventHandler));
-            AddEventHandler("start", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>>>(StartEventHandler));
+            AddEventHandler("end", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(EndEventHandler));
+            AddEventHandler("start", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>>>(StartEventHandler));
 
         }
 
@@ -77,7 +77,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/sax/EndElementListener.html#end()"/>
         /// </summary>
         /// <remarks>If <see cref="OnEnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnEnd { get; set; } = null;
+        public global::System.Action OnEnd { get; set; } = null;
 
         void EndEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -97,7 +97,7 @@ public virtual void End()
         /// Handler for <see href="https://developer.android.com/reference/android/sax/StartElementListener.html#start(org.xml.sax.Attributes)"/>
         /// </summary>
         /// <remarks>If <see cref="OnStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.Attributes> OnStart { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.Attributes> OnStart { get; set; } = null;
 
         void StartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Sax/EndElementListener.cs b/src/net/Netdroid/Generated/Android/Sax/EndElementListener.cs
index e81a365f5..6a4398a9d 100644
--- a/src/net/Netdroid/Generated/Android/Sax/EndElementListener.cs
+++ b/src/net/Netdroid/Generated/Android/Sax/EndElementListener.cs
@@ -68,7 +68,7 @@ public partial class EndElementListener : Android.Sax.IEndElementListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("end", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(EndEventHandler));
+            AddEventHandler("end", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(EndEventHandler));
 
         }
 
@@ -76,7 +76,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/sax/EndElementListener.html#end()"/>
         /// </summary>
         /// <remarks>If <see cref="OnEnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnEnd { get; set; } = null;
+        public global::System.Action OnEnd { get; set; } = null;
 
         void EndEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Sax/EndTextElementListener.cs b/src/net/Netdroid/Generated/Android/Sax/EndTextElementListener.cs
index 4111d69a6..a29d229b3 100644
--- a/src/net/Netdroid/Generated/Android/Sax/EndTextElementListener.cs
+++ b/src/net/Netdroid/Generated/Android/Sax/EndTextElementListener.cs
@@ -68,7 +68,7 @@ public partial class EndTextElementListener : Android.Sax.IEndTextElementListene
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("end", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(EndEventHandler));
+            AddEventHandler("end", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(EndEventHandler));
 
         }
 
@@ -76,7 +76,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/sax/EndTextElementListener.html#end(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnEnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnEnd { get; set; } = null;
+        public global::System.Action<Java.Lang.String> OnEnd { get; set; } = null;
 
         void EndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Sax/RootElement.cs b/src/net/Netdroid/Generated/Android/Sax/RootElement.cs
index c6b3ee44c..babbc798b 100644
--- a/src/net/Netdroid/Generated/Android/Sax/RootElement.cs
+++ b/src/net/Netdroid/Generated/Android/Sax/RootElement.cs
@@ -63,11 +63,12 @@ public RootElement(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/sax/RootElement.html#getContentHandler()"/> 
+        /// <see href="https://developer.android.com/reference/android/sax/RootElement.html#getContentHandler()"/>
         /// </summary>
-        public Org.Xml.Sax.ContentHandler ContentHandler
+        /// <returns><see cref="Org.Xml.Sax.ContentHandler"/></returns>
+        public Org.Xml.Sax.ContentHandler GetContentHandler()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;"); }
+            return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Sax/StartElementListener.cs b/src/net/Netdroid/Generated/Android/Sax/StartElementListener.cs
index 192d02d53..0392ddfc6 100644
--- a/src/net/Netdroid/Generated/Android/Sax/StartElementListener.cs
+++ b/src/net/Netdroid/Generated/Android/Sax/StartElementListener.cs
@@ -68,7 +68,7 @@ public partial class StartElementListener : Android.Sax.IStartElementListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("start", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>>>(StartEventHandler));
+            AddEventHandler("start", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>>>(StartEventHandler));
 
         }
 
@@ -76,7 +76,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/sax/StartElementListener.html#start(org.xml.sax.Attributes)"/>
         /// </summary>
         /// <remarks>If <see cref="OnStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.Attributes> OnStart { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.Attributes> OnStart { get; set; } = null;
 
         void StartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Sax/TextElementListener.cs b/src/net/Netdroid/Generated/Android/Sax/TextElementListener.cs
index 778fa2dfd..3ae633d68 100644
--- a/src/net/Netdroid/Generated/Android/Sax/TextElementListener.cs
+++ b/src/net/Netdroid/Generated/Android/Sax/TextElementListener.cs
@@ -68,8 +68,8 @@ public partial class TextElementListener : Android.Sax.ITextElementListener, And
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("end", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(EndEventHandler));
-            AddEventHandler("start", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>>>(StartEventHandler));
+            AddEventHandler("end", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(EndEventHandler));
+            AddEventHandler("start", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>>>(StartEventHandler));
 
         }
 
@@ -77,7 +77,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/sax/EndTextElementListener.html#end(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnEnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnEnd { get; set; } = null;
+        public global::System.Action<Java.Lang.String> OnEnd { get; set; } = null;
 
         void EndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -98,7 +98,7 @@ public virtual void End(Java.Lang.String arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/sax/StartElementListener.html#start(org.xml.sax.Attributes)"/>
         /// </summary>
         /// <remarks>If <see cref="OnStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.Attributes> OnStart { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.Attributes> OnStart { get; set; } = null;
 
         void StartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Attributes>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Se/Omapi/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Se/Omapi/AllPackageClasses.cs
index 52a528ac4..61fabc45a 100644
--- a/src/net/Netdroid/Generated/Android/Se/Omapi/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Se/Omapi/AllPackageClasses.cs
@@ -165,10 +165,13 @@ public partial class OnConnectedListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnConnectedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.se.omapi.SEService_OnConnectedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.se.omapi.OnConnectedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -190,10 +193,13 @@ public partial class OnConnectedListenerDirect : OnConnectedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.se.omapi.SEService$OnConnectedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.se.omapi.SEService$OnConnectedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Se/Omapi/Channel.cs b/src/net/Netdroid/Generated/Android/Se/Omapi/Channel.cs
index 5c1d24002..41ebeb897 100644
--- a/src/net/Netdroid/Generated/Android/Se/Omapi/Channel.cs
+++ b/src/net/Netdroid/Generated/Android/Se/Omapi/Channel.cs
@@ -46,18 +46,12 @@ public partial class Channel
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/se/omapi/Channel.html#getSelectResponse()"/> 
+        /// <see href="https://developer.android.com/reference/android/se/omapi/Channel.html#getSession()"/>
         /// </summary>
-        public byte[] SelectResponse
+        /// <returns><see cref="Android.Se.Omapi.Session"/></returns>
+        public Android.Se.Omapi.Session GetSession()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSelectResponse", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/se/omapi/Channel.html#getSession()"/> 
-        /// </summary>
-        public Android.Se.Omapi.Session Session
-        {
-            get { return IExecuteWithSignature<Android.Se.Omapi.Session>("getSession", "()Landroid/se/omapi/Session;"); }
+            return IExecuteWithSignature<Android.Se.Omapi.Session>("getSession", "()Landroid/se/omapi/Session;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/Channel.html#isBasicChannel()"/>
@@ -85,6 +79,14 @@ public bool SelectNext()
             return IExecuteWithSignature<bool>("selectNext", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/se/omapi/Channel.html#getSelectResponse()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSelectResponse()
+        {
+            return IExecuteWithSignatureArray<byte>("getSelectResponse", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/Channel.html#transmit(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Se/Omapi/Reader.cs b/src/net/Netdroid/Generated/Android/Se/Omapi/Reader.cs
index c8c7308e4..50e54781c 100644
--- a/src/net/Netdroid/Generated/Android/Se/Omapi/Reader.cs
+++ b/src/net/Netdroid/Generated/Android/Se/Omapi/Reader.cs
@@ -46,18 +46,12 @@ public partial class Reader
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/se/omapi/Reader.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/se/omapi/Reader.html#getSEService()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Android.Se.Omapi.SEService"/></returns>
+        public Android.Se.Omapi.SEService GetSEService()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/se/omapi/Reader.html#getSEService()"/> 
-        /// </summary>
-        public Android.Se.Omapi.SEService SEService
-        {
-            get { return IExecuteWithSignature<Android.Se.Omapi.SEService>("getSEService", "()Landroid/se/omapi/SEService;"); }
+            return IExecuteWithSignature<Android.Se.Omapi.SEService>("getSEService", "()Landroid/se/omapi/SEService;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/Reader.html#openSession()"/>
@@ -77,6 +71,14 @@ public bool IsSecureElementPresent()
             return IExecuteWithSignature<bool>("isSecureElementPresent", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/se/omapi/Reader.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/Reader.html#closeSessions()"/>
         /// </summary>
         public void CloseSessions()
diff --git a/src/net/Netdroid/Generated/Android/Se/Omapi/SEService.cs b/src/net/Netdroid/Generated/Android/Se/Omapi/SEService.cs
index 31a77ccd5..800c13926 100644
--- a/src/net/Netdroid/Generated/Android/Se/Omapi/SEService.cs
+++ b/src/net/Netdroid/Generated/Android/Se/Omapi/SEService.cs
@@ -74,20 +74,6 @@ public SEService(Android.Content.Context arg0, Java.Util.Concurrent.Executor arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/se/omapi/SEService.html#getReaders()"/> 
-        /// </summary>
-        public Android.Se.Omapi.Reader[] Readers
-        {
-            get { return IExecuteWithSignatureArray<Android.Se.Omapi.Reader>("getReaders", "()[Landroid/se/omapi/Reader;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/se/omapi/SEService.html#getVersion()"/> 
-        /// </summary>
-        public Java.Lang.String Version
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVersion", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/SEService.html#getUiccReader(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -97,6 +83,14 @@ public Android.Se.Omapi.Reader GetUiccReader(int arg0)
             return IExecuteWithSignature<Android.Se.Omapi.Reader>("getUiccReader", "(I)Landroid/se/omapi/Reader;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/se/omapi/SEService.html#getReaders()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Se.Omapi.Reader"/></returns>
+        public Android.Se.Omapi.Reader[] GetReaders()
+        {
+            return IExecuteWithSignatureArray<Android.Se.Omapi.Reader>("getReaders", "()[Landroid/se/omapi/Reader;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/SEService.html#isConnected()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -105,6 +99,14 @@ public bool IsConnected()
             return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/se/omapi/SEService.html#getVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVersion()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/SEService.html#shutdown()"/>
         /// </summary>
         public void Shutdown()
@@ -140,7 +142,7 @@ public partial class OnConnectedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onConnected", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnConnectedEventHandler));
+                AddEventHandler("onConnected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnConnectedEventHandler));
 
             }
 
@@ -148,7 +150,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/se/omapi/SEService.OnConnectedListener.html#onConnected()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnConnected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnConnected { get; set; } = null;
+            public global::System.Action OnOnConnected { get; set; } = null;
 
             void OnConnectedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Se/Omapi/Session.cs b/src/net/Netdroid/Generated/Android/Se/Omapi/Session.cs
index 143d3f565..2d31956ff 100644
--- a/src/net/Netdroid/Generated/Android/Se/Omapi/Session.cs
+++ b/src/net/Netdroid/Generated/Android/Se/Omapi/Session.cs
@@ -46,20 +46,6 @@ public partial class Session
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/se/omapi/Session.html#getATR()"/> 
-        /// </summary>
-        public byte[] ATR
-        {
-            get { return IExecuteWithSignatureArray<byte>("getATR", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/se/omapi/Session.html#getReader()"/> 
-        /// </summary>
-        public Android.Se.Omapi.Reader Reader
-        {
-            get { return IExecuteWithSignature<Android.Se.Omapi.Reader>("getReader", "()Landroid/se/omapi/Reader;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/Session.html#openBasicChannel(byte[],byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
@@ -102,6 +88,14 @@ public Android.Se.Omapi.Channel OpenLogicalChannel(byte[] arg0)
             return IExecuteWithSignature<Android.Se.Omapi.Channel>("openLogicalChannel", "([B)Landroid/se/omapi/Channel;", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/se/omapi/Session.html#getReader()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Se.Omapi.Reader"/></returns>
+        public Android.Se.Omapi.Reader GetReader()
+        {
+            return IExecuteWithSignature<Android.Se.Omapi.Reader>("getReader", "()Landroid/se/omapi/Reader;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/Session.html#isClosed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -110,6 +104,14 @@ public bool IsClosed()
             return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/se/omapi/Session.html#getATR()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetATR()
+        {
+            return IExecuteWithSignatureArray<byte>("getATR", "()[B");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/se/omapi/Session.html#close()"/>
         /// </summary>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Android/Security/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Security/AllPackageClasses.cs
index 7aa12a39d..8d6e84ea6 100644
--- a/src/net/Netdroid/Generated/Android/Security/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Security/AllPackageClasses.cs
@@ -185,12 +185,12 @@ public partial class ConfirmationCallback : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ConfirmationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConfirmationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConfirmationCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ConfirmationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConfirmationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConfirmationCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -424,12 +424,12 @@ public partial class KeyChainAliasCallback : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyChainAliasCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyChainAliasCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyChainAliasCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyChainAliasCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyChainAliasCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyChainAliasCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -481,7 +481,7 @@ public partial class KeyChainException : Java.Lang.Exception
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class KeyPairGeneratorSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
         const string _bridgeClassName = "android.security.KeyPairGeneratorSpec";
@@ -522,7 +522,7 @@ public KeyPairGeneratorSpec(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.Builder.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
             const string _bridgeClassName = "android.security.KeyPairGeneratorSpec$Builder";
@@ -588,7 +588,7 @@ public partial class KeyStoreException : Java.Lang.Exception
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/security/KeyStoreParameter.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class KeyStoreParameter : Java.Security.KeyStore.ProtectionParameter
     {
         const string _bridgeClassName = "android.security.KeyStoreParameter";
@@ -629,7 +629,7 @@ public KeyStoreParameter(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/KeyStoreParameter.Builder.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
             const string _bridgeClassName = "android.security.KeyStoreParameter$Builder";
diff --git a/src/net/Netdroid/Generated/Android/Security/AppUriAuthenticationPolicy.cs b/src/net/Netdroid/Generated/Android/Security/AppUriAuthenticationPolicy.cs
index 877e2412c..53a222361 100644
--- a/src/net/Netdroid/Generated/Android/Security/AppUriAuthenticationPolicy.cs
+++ b/src/net/Netdroid/Generated/Android/Security/AppUriAuthenticationPolicy.cs
@@ -52,13 +52,6 @@ public partial class AppUriAuthenticationPolicy
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/AppUriAuthenticationPolicy.html#getAppAndUriMappings()"/> 
-        /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Map<Android.Net.Uri, Java.Lang.String>> AppAndUriMappings
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Map<Android.Net.Uri, Java.Lang.String>>>("getAppAndUriMappings", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/AppUriAuthenticationPolicy.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -67,6 +60,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/security/AppUriAuthenticationPolicy.html#getAppAndUriMappings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Map<Android.Net.Uri, Java.Lang.String>> GetAppAndUriMappings()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Map<Android.Net.Uri, Java.Lang.String>>>("getAppAndUriMappings", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/AppUriAuthenticationPolicy.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Security/AttestedKeyPair.cs b/src/net/Netdroid/Generated/Android/Security/AttestedKeyPair.cs
index dcf48ee09..eae2beaf9 100644
--- a/src/net/Netdroid/Generated/Android/Security/AttestedKeyPair.cs
+++ b/src/net/Netdroid/Generated/Android/Security/AttestedKeyPair.cs
@@ -55,18 +55,20 @@ public AttestedKeyPair(Java.Security.KeyPair arg0, Java.Util.List<Java.Security.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/AttestedKeyPair.html#getAttestationRecord()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/AttestedKeyPair.html#getKeyPair()"/>
         /// </summary>
-        public Java.Util.List<Java.Security.Cert.Certificate> AttestationRecord
+        /// <returns><see cref="Java.Security.KeyPair"/></returns>
+        public Java.Security.KeyPair GetKeyPair()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.Certificate>>("getAttestationRecord", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Security.KeyPair>("getKeyPair", "()Ljava/security/KeyPair;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/AttestedKeyPair.html#getKeyPair()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/AttestedKeyPair.html#getAttestationRecord()"/>
         /// </summary>
-        public Java.Security.KeyPair KeyPair
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Security.Cert.Certificate> GetAttestationRecord()
         {
-            get { return IExecuteWithSignature<Java.Security.KeyPair>("getKeyPair", "()Ljava/security/KeyPair;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.Certificate>>("getAttestationRecord", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/AccessControlProfileId.cs b/src/net/Netdroid/Generated/Android/Security/Identity/AccessControlProfileId.cs
index ab6e6dd89..721513e5e 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/AccessControlProfileId.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/AccessControlProfileId.cs
@@ -54,11 +54,12 @@ public AccessControlProfileId(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/AccessControlProfileId.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/AccessControlProfileId.html#getId()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Security/Identity/AllPackageClasses.cs
index a4ec41a5c..e75d07426 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/AllPackageClasses.cs
@@ -334,12 +334,12 @@ public partial class CredentialDataResult : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CredentialDataResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CredentialDataResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CredentialDataResult() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CredentialDataResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CredentialDataResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CredentialDataResult(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -376,12 +376,12 @@ public partial class Entries : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Entries>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Entries class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Entries class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Entries() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Entries class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Entries class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Entries(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -460,12 +460,12 @@ public partial class IdentityCredential : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IdentityCredential class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IdentityCredential class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IdentityCredential() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IdentityCredential class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IdentityCredential class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IdentityCredential(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -523,12 +523,12 @@ public partial class IdentityCredentialStore : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IdentityCredentialStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IdentityCredentialStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IdentityCredentialStore() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IdentityCredentialStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IdentityCredentialStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IdentityCredentialStore(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -725,12 +725,12 @@ public partial class PresentationSession : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PresentationSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PresentationSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PresentationSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PresentationSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PresentationSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PresentationSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -765,19 +765,19 @@ public PresentationSession(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ResultData : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ResultData>
     {
         const string _bridgeClassName = "android.security.identity.ResultData";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ResultData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResultData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResultData() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ResultData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResultData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResultData(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -852,12 +852,12 @@ public partial class WritableIdentityCredential : MASES.JCOBridge.C2JBridge.JVMB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WritableIdentityCredential class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WritableIdentityCredential class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WritableIdentityCredential() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WritableIdentityCredential class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WritableIdentityCredential class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WritableIdentityCredential(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/AuthenticationKeyMetadata.cs b/src/net/Netdroid/Generated/Android/Security/Identity/AuthenticationKeyMetadata.cs
index a4c3eaf4a..9b19d35cd 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/AuthenticationKeyMetadata.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/AuthenticationKeyMetadata.cs
@@ -46,18 +46,20 @@ public partial class AuthenticationKeyMetadata
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/AuthenticationKeyMetadata.html#getExpirationDate()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/AuthenticationKeyMetadata.html#getUsageCount()"/>
         /// </summary>
-        public Java.Time.Instant ExpirationDate
+        /// <returns><see cref="int"/></returns>
+        public int GetUsageCount()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getExpirationDate", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<int>("getUsageCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/AuthenticationKeyMetadata.html#getUsageCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/AuthenticationKeyMetadata.html#getExpirationDate()"/>
         /// </summary>
-        public int UsageCount
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetExpirationDate()
         {
-            get { return IExecuteWithSignature<int>("getUsageCount", "()I"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getExpirationDate", "()Ljava/time/Instant;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/CredentialDataRequest.cs b/src/net/Netdroid/Generated/Android/Security/Identity/CredentialDataRequest.cs
index e9a631685..1485d2735 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/CredentialDataRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/CredentialDataRequest.cs
@@ -46,56 +46,60 @@ public partial class CredentialDataRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#getDeviceSignedEntriesToRequest()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#isAllowUsingExhaustedKeys()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>> DeviceSignedEntriesToRequest
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAllowUsingExhaustedKeys()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>>>("getDeviceSignedEntriesToRequest", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<bool>("isAllowUsingExhaustedKeys", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#getIssuerSignedEntriesToRequest()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#isAllowUsingExpiredKeys()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>> IssuerSignedEntriesToRequest
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAllowUsingExpiredKeys()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>>>("getIssuerSignedEntriesToRequest", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<bool>("isAllowUsingExpiredKeys", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#getReaderSignature()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#isIncrementUseCount()"/>
         /// </summary>
-        public byte[] ReaderSignature
+        /// <returns><see cref="bool"/></returns>
+        public bool IsIncrementUseCount()
         {
-            get { return IExecuteWithSignatureArray<byte>("getReaderSignature", "()[B"); }
+            return IExecuteWithSignature<bool>("isIncrementUseCount", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#getRequestMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#getReaderSignature()"/>
         /// </summary>
-        public byte[] RequestMessage
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetReaderSignature()
         {
-            get { return IExecuteWithSignatureArray<byte>("getRequestMessage", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getReaderSignature", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#isAllowUsingExhaustedKeys()"/>
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#getRequestMessage()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAllowUsingExhaustedKeys()
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetRequestMessage()
         {
-            return IExecuteWithSignature<bool>("isAllowUsingExhaustedKeys", "()Z");
+            return IExecuteWithSignatureArray<byte>("getRequestMessage", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#isAllowUsingExpiredKeys()"/>
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#getDeviceSignedEntriesToRequest()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAllowUsingExpiredKeys()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>> GetDeviceSignedEntriesToRequest()
         {
-            return IExecuteWithSignature<bool>("isAllowUsingExpiredKeys", "()Z");
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>>>("getDeviceSignedEntriesToRequest", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#isIncrementUseCount()"/>
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataRequest.html#getIssuerSignedEntriesToRequest()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsIncrementUseCount()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>> GetIssuerSignedEntriesToRequest()
         {
-            return IExecuteWithSignature<bool>("isIncrementUseCount", "()Z");
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>>>("getIssuerSignedEntriesToRequest", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/CredentialDataResult.cs b/src/net/Netdroid/Generated/Android/Security/Identity/CredentialDataResult.cs
index 08cbb9351..03a65d959 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/CredentialDataResult.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/CredentialDataResult.cs
@@ -46,46 +46,52 @@ public partial class CredentialDataResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getDeviceMac()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getDeviceSignedEntries()"/>
         /// </summary>
-        public byte[] DeviceMac
+        /// <returns><see cref="Android.Security.Identity.CredentialDataResult.Entries"/></returns>
+        public Android.Security.Identity.CredentialDataResult.Entries GetDeviceSignedEntries()
         {
-            get { return IExecuteWithSignatureArray<byte>("getDeviceMac", "()[B"); }
+            return IExecuteWithSignature<Android.Security.Identity.CredentialDataResult.Entries>("getDeviceSignedEntries", "()Landroid/security/identity/CredentialDataResult$Entries;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getDeviceNameSpaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getIssuerSignedEntries()"/>
         /// </summary>
-        public byte[] DeviceNameSpaces
+        /// <returns><see cref="Android.Security.Identity.CredentialDataResult.Entries"/></returns>
+        public Android.Security.Identity.CredentialDataResult.Entries GetIssuerSignedEntries()
         {
-            get { return IExecuteWithSignatureArray<byte>("getDeviceNameSpaces", "()[B"); }
+            return IExecuteWithSignature<Android.Security.Identity.CredentialDataResult.Entries>("getIssuerSignedEntries", "()Landroid/security/identity/CredentialDataResult$Entries;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getDeviceSignature()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getDeviceMac()"/>
         /// </summary>
-        public byte[] DeviceSignature
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetDeviceMac()
         {
-            get { return IExecuteWithSignatureArray<byte>("getDeviceSignature", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getDeviceMac", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getDeviceSignedEntries()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getDeviceNameSpaces()"/>
         /// </summary>
-        public Android.Security.Identity.CredentialDataResult.Entries DeviceSignedEntries
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetDeviceNameSpaces()
         {
-            get { return IExecuteWithSignature<Android.Security.Identity.CredentialDataResult.Entries>("getDeviceSignedEntries", "()Landroid/security/identity/CredentialDataResult$Entries;"); }
+            return IExecuteWithSignatureArray<byte>("getDeviceNameSpaces", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getIssuerSignedEntries()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getStaticAuthenticationData()"/>
         /// </summary>
-        public Android.Security.Identity.CredentialDataResult.Entries IssuerSignedEntries
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetStaticAuthenticationData()
         {
-            get { return IExecuteWithSignature<Android.Security.Identity.CredentialDataResult.Entries>("getIssuerSignedEntries", "()Landroid/security/identity/CredentialDataResult$Entries;"); }
+            return IExecuteWithSignatureArray<byte>("getStaticAuthenticationData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getStaticAuthenticationData()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.html#getDeviceSignature()"/>
         /// </summary>
-        public byte[] StaticAuthenticationData
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetDeviceSignature()
         {
-            get { return IExecuteWithSignatureArray<byte>("getStaticAuthenticationData", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getDeviceSignature", "()[B");
         }
 
         #endregion
@@ -154,13 +160,6 @@ public partial class Entries
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.Entries.html#getNamespaces()"/> 
-            /// </summary>
-            public Java.Util.Collection<Java.Lang.String> Namespaces
-            {
-                get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getNamespaces", "()Ljava/util/Collection;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.Entries.html#getEntry(java.lang.String,java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -190,6 +189,14 @@ public int GetStatus(Java.Lang.String arg0, Java.Lang.String arg1)
                 return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getEntryNames", "(Ljava/lang/String;)Ljava/util/Collection;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.Entries.html#getNamespaces()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.Collection"/></returns>
+            public Java.Util.Collection<Java.Lang.String> GetNamespaces()
+            {
+                return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getNamespaces", "()Ljava/util/Collection;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/security/identity/CredentialDataResult.Entries.html#getRetrievedEntryNames(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/IdentityCredential.cs b/src/net/Netdroid/Generated/Android/Security/Identity/IdentityCredential.cs
index b50c9d459..77813c57a 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/IdentityCredential.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/IdentityCredential.cs
@@ -46,35 +46,6 @@ public partial class IdentityCredential
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getAuthenticationDataUsageCount()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int[] AuthenticationDataUsageCount
-        {
-            get { return IExecuteWithSignatureArray<int>("getAuthenticationDataUsageCount", "()[I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getAuthenticationKeyMetadata()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Security.Identity.AuthenticationKeyMetadata> AuthenticationKeyMetadata
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Security.Identity.AuthenticationKeyMetadata>>("getAuthenticationKeyMetadata", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getAuthKeysNeedingCertification()"/> 
-        /// </summary>
-        public Java.Util.Collection<Java.Security.Cert.X509Certificate> AuthKeysNeedingCertification
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Security.Cert.X509Certificate>>("getAuthKeysNeedingCertification", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getCredentialKeyCertificateChain()"/> 
-        /// </summary>
-        public Java.Util.Collection<Java.Security.Cert.X509Certificate> CredentialKeyCertificateChain
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Security.Cert.X509Certificate>>("getCredentialKeyCertificateChain", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getEntries(byte[],java.util.Map,byte[],byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
@@ -87,7 +58,7 @@ public Java.Util.Collection<Java.Security.Cert.X509Certificate> CredentialKeyCer
         /// <exception cref="Android.Security.Identity.InvalidRequestMessageException"/>
         /// <exception cref="Android.Security.Identity.NoAuthenticationKeyAvailableException"/>
         /// <exception cref="Android.Security.Identity.SessionTranscriptMismatchException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Security.Identity.ResultData GetEntries(byte[] arg0, Java.Util.Map<Java.Lang.String, Java.Util.Collection<Java.Lang.String>> arg1, byte[] arg2, byte[] arg3)
         {
             return IExecute<Android.Security.Identity.ResultData>("getEntries", arg0, arg1, arg2, arg3);
@@ -98,7 +69,7 @@ public Android.Security.Identity.ResultData GetEntries(byte[] arg0, Java.Util.Ma
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Android.Security.Identity.MessageDecryptionException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte[] DecryptMessageFromReader(byte[] arg0)
         {
             return IExecuteWithSignatureArray<byte>("decryptMessageFromReader", "([B)[B", new object[] { arg0 });
@@ -108,25 +79,50 @@ public byte[] DecryptMessageFromReader(byte[] arg0)
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="byte"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte[] EncryptMessageToReader(byte[] arg0)
         {
             return IExecuteWithSignatureArray<byte>("encryptMessageToReader", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getAuthenticationDataUsageCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int[] GetAuthenticationDataUsageCount()
+        {
+            return IExecuteWithSignatureArray<int>("getAuthenticationDataUsageCount", "()[I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#createEphemeralKeyPair()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.KeyPair"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Security.KeyPair CreateEphemeralKeyPair()
         {
             return IExecuteWithSignature<Java.Security.KeyPair>("createEphemeralKeyPair", "()Ljava/security/KeyPair;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getAuthKeysNeedingCertification()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Security.Cert.X509Certificate> GetAuthKeysNeedingCertification()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Security.Cert.X509Certificate>>("getAuthKeysNeedingCertification", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getCredentialKeyCertificateChain()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Security.Cert.X509Certificate> GetCredentialKeyCertificateChain()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Security.Cert.X509Certificate>>("getCredentialKeyCertificateChain", "()Ljava/util/Collection;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#setAllowUsingExhaustedKeys(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAllowUsingExhaustedKeys(bool arg0)
         {
             IExecuteWithSignature("setAllowUsingExhaustedKeys", "(Z)V", arg0);
@@ -136,7 +132,7 @@ public void SetAllowUsingExhaustedKeys(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAvailableAuthenticationKeys(int arg0, int arg1)
         {
             IExecute("setAvailableAuthenticationKeys", arg0, arg1);
@@ -146,7 +142,7 @@ public void SetAvailableAuthenticationKeys(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetReaderEphemeralPublicKey(Java.Security.PublicKey arg0)
         {
             IExecuteWithSignature("setReaderEphemeralPublicKey", "(Ljava/security/PublicKey;)V", arg0);
@@ -157,7 +153,7 @@ public void SetReaderEphemeralPublicKey(Java.Security.PublicKey arg0)
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
         /// <exception cref="Android.Security.Identity.UnknownAuthenticationKeyException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StoreStaticAuthenticationData(Java.Security.Cert.X509Certificate arg0, byte[] arg1)
         {
             IExecute("storeStaticAuthenticationData", arg0, arg1);
@@ -190,10 +186,18 @@ public byte[] Update(Android.Security.Identity.PersonalizationData arg0)
             return IExecuteWithSignatureArray<byte>("update", "(Landroid/security/identity/PersonalizationData;)[B", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#getAuthenticationKeyMetadata()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Security.Identity.AuthenticationKeyMetadata> GetAuthenticationKeyMetadata()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Security.Identity.AuthenticationKeyMetadata>>("getAuthenticationKeyMetadata", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredential.html#setAllowUsingExpiredKeys(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAllowUsingExpiredKeys(bool arg0)
         {
             IExecuteWithSignature("setAllowUsingExpiredKeys", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/IdentityCredentialStore.cs b/src/net/Netdroid/Generated/Android/Security/Identity/IdentityCredentialStore.cs
index 56a3d396e..cf079125a 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/IdentityCredentialStore.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/IdentityCredentialStore.cs
@@ -70,13 +70,6 @@ public static Android.Security.Identity.IdentityCredentialStore GetInstance(Andr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredentialStore.html#getSupportedDocTypes()"/> 
-        /// </summary>
-        public Java.Lang.String[] SupportedDocTypes
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedDocTypes", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredentialStore.html#getCredentialByName(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -104,12 +97,20 @@ public Android.Security.Identity.WritableIdentityCredential CreateCredential(Jav
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte[] DeleteCredentialByName(Java.Lang.String arg0)
         {
             return IExecuteWithSignatureArray<byte>("deleteCredentialByName", "(Ljava/lang/String;)[B", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredentialStore.html#getSupportedDocTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedDocTypes()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedDocTypes", "()[Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/IdentityCredentialStore.html#createPresentationSession(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/PresentationSession.cs b/src/net/Netdroid/Generated/Android/Security/Identity/PresentationSession.cs
index acea990e8..16a6bc747 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/PresentationSession.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/PresentationSession.cs
@@ -46,13 +46,6 @@ public partial class PresentationSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/PresentationSession.html#getEphemeralKeyPair()"/> 
-        /// </summary>
-        public Java.Security.KeyPair EphemeralKeyPair
-        {
-            get { return IExecuteWithSignature<Java.Security.KeyPair>("getEphemeralKeyPair", "()Ljava/security/KeyPair;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/PresentationSession.html#getCredentialData(java.lang.String,android.security.identity.CredentialDataRequest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -67,6 +60,14 @@ public Android.Security.Identity.CredentialDataResult GetCredentialData(Java.Lan
             return IExecute<Android.Security.Identity.CredentialDataResult>("getCredentialData", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/security/identity/PresentationSession.html#getEphemeralKeyPair()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.KeyPair"/></returns>
+        public Java.Security.KeyPair GetEphemeralKeyPair()
+        {
+            return IExecuteWithSignature<Java.Security.KeyPair>("getEphemeralKeyPair", "()Ljava/security/KeyPair;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/PresentationSession.html#setReaderEphemeralPublicKey(java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Security/Identity/ResultData.cs b/src/net/Netdroid/Generated/Android/Security/Identity/ResultData.cs
index f6478553e..a4801df60 100644
--- a/src/net/Netdroid/Generated/Android/Security/Identity/ResultData.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Identity/ResultData.cs
@@ -40,49 +40,49 @@ public partial class ResultData
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#STATUS_NO_ACCESS_CONTROL_PROFILES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_NO_ACCESS_CONTROL_PROFILES { get { if (!_STATUS_NO_ACCESS_CONTROL_PROFILESReady) { _STATUS_NO_ACCESS_CONTROL_PROFILESContent = SGetField<int>(LocalBridgeClazz, "STATUS_NO_ACCESS_CONTROL_PROFILES"); _STATUS_NO_ACCESS_CONTROL_PROFILESReady = true; } return _STATUS_NO_ACCESS_CONTROL_PROFILESContent; } }
         private static int _STATUS_NO_ACCESS_CONTROL_PROFILESContent = default;
         private static bool _STATUS_NO_ACCESS_CONTROL_PROFILESReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#STATUS_NO_SUCH_ENTRY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_NO_SUCH_ENTRY { get { if (!_STATUS_NO_SUCH_ENTRYReady) { _STATUS_NO_SUCH_ENTRYContent = SGetField<int>(LocalBridgeClazz, "STATUS_NO_SUCH_ENTRY"); _STATUS_NO_SUCH_ENTRYReady = true; } return _STATUS_NO_SUCH_ENTRYContent; } }
         private static int _STATUS_NO_SUCH_ENTRYContent = default;
         private static bool _STATUS_NO_SUCH_ENTRYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#STATUS_NOT_IN_REQUEST_MESSAGE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_NOT_IN_REQUEST_MESSAGE { get { if (!_STATUS_NOT_IN_REQUEST_MESSAGEReady) { _STATUS_NOT_IN_REQUEST_MESSAGEContent = SGetField<int>(LocalBridgeClazz, "STATUS_NOT_IN_REQUEST_MESSAGE"); _STATUS_NOT_IN_REQUEST_MESSAGEReady = true; } return _STATUS_NOT_IN_REQUEST_MESSAGEContent; } }
         private static int _STATUS_NOT_IN_REQUEST_MESSAGEContent = default;
         private static bool _STATUS_NOT_IN_REQUEST_MESSAGEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#STATUS_NOT_REQUESTED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_NOT_REQUESTED { get { if (!_STATUS_NOT_REQUESTEDReady) { _STATUS_NOT_REQUESTEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_NOT_REQUESTED"); _STATUS_NOT_REQUESTEDReady = true; } return _STATUS_NOT_REQUESTEDContent; } }
         private static int _STATUS_NOT_REQUESTEDContent = default;
         private static bool _STATUS_NOT_REQUESTEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#STATUS_OK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_OK { get { if (!_STATUS_OKReady) { _STATUS_OKContent = SGetField<int>(LocalBridgeClazz, "STATUS_OK"); _STATUS_OKReady = true; } return _STATUS_OKContent; } }
         private static int _STATUS_OKContent = default;
         private static bool _STATUS_OKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#STATUS_READER_AUTHENTICATION_FAILED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_READER_AUTHENTICATION_FAILED { get { if (!_STATUS_READER_AUTHENTICATION_FAILEDReady) { _STATUS_READER_AUTHENTICATION_FAILEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_READER_AUTHENTICATION_FAILED"); _STATUS_READER_AUTHENTICATION_FAILEDReady = true; } return _STATUS_READER_AUTHENTICATION_FAILEDContent; } }
         private static int _STATUS_READER_AUTHENTICATION_FAILEDContent = default;
         private static bool _STATUS_READER_AUTHENTICATION_FAILEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#STATUS_USER_AUTHENTICATION_FAILED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_USER_AUTHENTICATION_FAILED { get { if (!_STATUS_USER_AUTHENTICATION_FAILEDReady) { _STATUS_USER_AUTHENTICATION_FAILEDContent = SGetField<int>(LocalBridgeClazz, "STATUS_USER_AUTHENTICATION_FAILED"); _STATUS_USER_AUTHENTICATION_FAILEDReady = true; } return _STATUS_USER_AUTHENTICATION_FAILEDContent; } }
         private static int _STATUS_USER_AUTHENTICATION_FAILEDContent = default;
         private static bool _STATUS_USER_AUTHENTICATION_FAILEDReady = false; // this is used because in case of generics 
@@ -95,47 +95,42 @@ public partial class ResultData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getAuthenticatedData()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getAuthenticatedData()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte[] AuthenticatedData
-        {
-            get { return IExecuteWithSignatureArray<byte>("getAuthenticatedData", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getMessageAuthenticationCode()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public byte[] MessageAuthenticationCode
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetAuthenticatedData()
         {
-            get { return IExecuteWithSignatureArray<byte>("getMessageAuthenticationCode", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getAuthenticatedData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getNamespaces()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getEntry(java.lang.String,java.lang.String)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Collection<Java.Lang.String> Namespaces
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetEntry(Java.Lang.String arg0, Java.Lang.String arg1)
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getNamespaces", "()Ljava/util/Collection;"); }
+            return IExecuteArray<byte>("getEntry", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getStaticAuthenticationData()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getMessageAuthenticationCode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte[] StaticAuthenticationData
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetMessageAuthenticationCode()
         {
-            get { return IExecuteWithSignatureArray<byte>("getStaticAuthenticationData", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getMessageAuthenticationCode", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getEntry(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getStaticAuthenticationData()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
-        [System.Obsolete()]
-        public byte[] GetEntry(Java.Lang.String arg0, Java.Lang.String arg1)
+        [global::System.Obsolete()]
+        public byte[] GetStaticAuthenticationData()
         {
-            return IExecuteArray<byte>("getEntry", arg0, arg1);
+            return IExecuteWithSignatureArray<byte>("getStaticAuthenticationData", "()[B");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getStatus(java.lang.String,java.lang.String)"/>
@@ -143,7 +138,7 @@ public byte[] GetEntry(Java.Lang.String arg0, Java.Lang.String arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetStatus(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecute<int>("getStatus", arg0, arg1);
@@ -153,17 +148,26 @@ public int GetStatus(Java.Lang.String arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Collection"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Collection<Java.Lang.String> GetEntryNames(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getEntryNames", "(Ljava/lang/String;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getNamespaces()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Collection<Java.Lang.String> GetNamespaces()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getNamespaces", "()Ljava/util/Collection;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/identity/ResultData.html#getRetrievedEntryNames(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Collection"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Collection<Java.Lang.String> GetRetrievedEntryNames(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getRetrievedEntryNames", "(Ljava/lang/String;)Ljava/util/Collection;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Security/KeyChain.cs b/src/net/Netdroid/Generated/Android/Security/KeyChain.cs
index 098a9e57f..7b344a194 100644
--- a/src/net/Netdroid/Generated/Android/Security/KeyChain.cs
+++ b/src/net/Netdroid/Generated/Android/Security/KeyChain.cs
@@ -52,7 +52,7 @@ public partial class KeyChain
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/KeyChain.html#ACTION_STORAGE_CHANGED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_STORAGE_CHANGED { get { if (!_ACTION_STORAGE_CHANGEDReady) { _ACTION_STORAGE_CHANGEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_STORAGE_CHANGED"); _ACTION_STORAGE_CHANGEDReady = true; } return _ACTION_STORAGE_CHANGEDContent; } }
         private static Java.Lang.String _ACTION_STORAGE_CHANGEDContent = default;
         private static bool _ACTION_STORAGE_CHANGEDReady = false; // this is used because in case of generics 
@@ -134,7 +134,7 @@ public static Android.Security.AppUriAuthenticationPolicy GetCredentialManagemen
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsBoundKeyAlgorithm(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isBoundKeyAlgorithm", "(Ljava/lang/String;)Z", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Security/KeyPairGeneratorSpec.cs b/src/net/Netdroid/Generated/Android/Security/KeyPairGeneratorSpec.cs
index 9192c4f2c..70536412b 100644
--- a/src/net/Netdroid/Generated/Android/Security/KeyPairGeneratorSpec.cs
+++ b/src/net/Netdroid/Generated/Android/Security/KeyPairGeneratorSpec.cs
@@ -46,85 +46,94 @@ public partial class KeyPairGeneratorSpec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getAlgorithmParameterSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getContext()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Security.Spec.AlgorithmParameterSpec AlgorithmParameterSpec
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Context GetContext()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getAlgorithmParameterSpec", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#isEncryptionRequired()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Context Context
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsEncryptionRequired()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<bool>("isEncryptionRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getEndDate()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getKeySize()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Date EndDate
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetKeySize()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getEndDate", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<int>("getKeySize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getKeySize()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getKeystoreAlias()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int KeySize
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetKeystoreAlias()
         {
-            get { return IExecuteWithSignature<int>("getKeySize", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getKeystoreAlias", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getKeystoreAlias()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getKeyType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String KeystoreAlias
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetKeyType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKeystoreAlias", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getKeyType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getKeyType()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getSerialNumber()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String KeyType
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        [global::System.Obsolete()]
+        public Java.Math.BigInteger GetSerialNumber()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKeyType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getSerialNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getAlgorithmParameterSpec()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Math.BigInteger SerialNumber
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        [global::System.Obsolete()]
+        public Java.Security.Spec.AlgorithmParameterSpec GetAlgorithmParameterSpec()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getAlgorithmParameterSpec", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getStartDate()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getEndDate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Date StartDate
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Date GetEndDate()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getStartDate", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getEndDate", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getSubjectDN()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getStartDate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Javax.Security.Auth.X500.X500Principal SubjectDN
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Date GetStartDate()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getSubjectDN", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getStartDate", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#isEncryptionRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.html#getSubjectDN()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsEncryptionRequired()
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        [global::System.Obsolete()]
+        public Javax.Security.Auth.X500.X500Principal GetSubjectDN()
         {
-            return IExecuteWithSignature<bool>("isEncryptionRequired", "()Z");
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getSubjectDN", "()Ljavax/security/auth/x500/X500Principal;");
         }
 
         #endregion
@@ -138,7 +147,7 @@ public partial class Builder
             /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.Builder.html#%3Cinit%3E(android.content.Context)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Content.Context arg0)
                 : base(arg0)
             {
@@ -163,7 +172,7 @@ public Builder(Android.Content.Context arg0)
             /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.Builder.html#build()"/>
             /// </summary>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec Build()
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec>("build", "()Landroid/security/KeyPairGeneratorSpec;");
@@ -173,7 +182,7 @@ public Android.Security.KeyPairGeneratorSpec Build()
             /// </summary>
             /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetAlgorithmParameterSpec(Java.Security.Spec.AlgorithmParameterSpec arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setAlgorithmParameterSpec", "(Ljava/security/spec/AlgorithmParameterSpec;)Landroid/security/KeyPairGeneratorSpec$Builder;", arg0);
@@ -183,7 +192,7 @@ public Android.Security.KeyPairGeneratorSpec.Builder SetAlgorithmParameterSpec(J
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetAlias(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setAlias", "(Ljava/lang/String;)Landroid/security/KeyPairGeneratorSpec$Builder;", arg0);
@@ -192,7 +201,7 @@ public Android.Security.KeyPairGeneratorSpec.Builder SetAlias(Java.Lang.String a
             /// <see href="https://developer.android.com/reference/android/security/KeyPairGeneratorSpec.Builder.html#setEncryptionRequired()"/>
             /// </summary>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetEncryptionRequired()
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setEncryptionRequired", "()Landroid/security/KeyPairGeneratorSpec$Builder;");
@@ -202,7 +211,7 @@ public Android.Security.KeyPairGeneratorSpec.Builder SetEncryptionRequired()
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Date"/></param>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetEndDate(Java.Util.Date arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setEndDate", "(Ljava/util/Date;)Landroid/security/KeyPairGeneratorSpec$Builder;", arg0);
@@ -212,7 +221,7 @@ public Android.Security.KeyPairGeneratorSpec.Builder SetEndDate(Java.Util.Date a
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetKeySize(int arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setKeySize", "(I)Landroid/security/KeyPairGeneratorSpec$Builder;", arg0);
@@ -223,7 +232,7 @@ public Android.Security.KeyPairGeneratorSpec.Builder SetKeySize(int arg0)
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
             /// <exception cref="Java.Security.NoSuchAlgorithmException"/>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetKeyType(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setKeyType", "(Ljava/lang/String;)Landroid/security/KeyPairGeneratorSpec$Builder;", arg0);
@@ -233,7 +242,7 @@ public Android.Security.KeyPairGeneratorSpec.Builder SetKeyType(Java.Lang.String
             /// </summary>
             /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetSerialNumber(Java.Math.BigInteger arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setSerialNumber", "(Ljava/math/BigInteger;)Landroid/security/KeyPairGeneratorSpec$Builder;", arg0);
@@ -243,7 +252,7 @@ public Android.Security.KeyPairGeneratorSpec.Builder SetSerialNumber(Java.Math.B
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Date"/></param>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetStartDate(Java.Util.Date arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setStartDate", "(Ljava/util/Date;)Landroid/security/KeyPairGeneratorSpec$Builder;", arg0);
@@ -253,7 +262,7 @@ public Android.Security.KeyPairGeneratorSpec.Builder SetStartDate(Java.Util.Date
             /// </summary>
             /// <param name="arg0"><see cref="Javax.Security.Auth.X500.X500Principal"/></param>
             /// <returns><see cref="Android.Security.KeyPairGeneratorSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyPairGeneratorSpec.Builder SetSubject(Javax.Security.Auth.X500.X500Principal arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyPairGeneratorSpec.Builder>("setSubject", "(Ljavax/security/auth/x500/X500Principal;)Landroid/security/KeyPairGeneratorSpec$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Security/KeyStoreParameter.cs b/src/net/Netdroid/Generated/Android/Security/KeyStoreParameter.cs
index 491eac367..09ef0bf36 100644
--- a/src/net/Netdroid/Generated/Android/Security/KeyStoreParameter.cs
+++ b/src/net/Netdroid/Generated/Android/Security/KeyStoreParameter.cs
@@ -49,7 +49,7 @@ public partial class KeyStoreParameter
         /// <see href="https://developer.android.com/reference/android/security/KeyStoreParameter.html#isEncryptionRequired()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsEncryptionRequired()
         {
             return IExecuteWithSignature<bool>("isEncryptionRequired", "()Z");
@@ -66,7 +66,7 @@ public partial class Builder
             /// <see href="https://developer.android.com/reference/android/security/KeyStoreParameter.Builder.html#%3Cinit%3E(android.content.Context)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Content.Context arg0)
                 : base(arg0)
             {
@@ -91,7 +91,7 @@ public Builder(Android.Content.Context arg0)
             /// <see href="https://developer.android.com/reference/android/security/KeyStoreParameter.Builder.html#build()"/>
             /// </summary>
             /// <returns><see cref="Android.Security.KeyStoreParameter"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyStoreParameter Build()
             {
                 return IExecuteWithSignature<Android.Security.KeyStoreParameter>("build", "()Landroid/security/KeyStoreParameter;");
@@ -101,7 +101,7 @@ public Android.Security.KeyStoreParameter Build()
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Android.Security.KeyStoreParameter.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.KeyStoreParameter.Builder SetEncryptionRequired(bool arg0)
             {
                 return IExecuteWithSignature<Android.Security.KeyStoreParameter.Builder>("setEncryptionRequired", "(Z)Landroid/security/KeyStoreParameter$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Security/Keystore/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Security/Keystore/AllPackageClasses.cs
index 178a2a303..70bd7142d 100644
--- a/src/net/Netdroid/Generated/Android/Security/Keystore/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Keystore/AllPackageClasses.cs
@@ -236,12 +236,12 @@ public partial class KeyProperties : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Key
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyProperties class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyProperties class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyProperties() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyProperties class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyProperties class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyProperties(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Security/Keystore/KeyGenParameterSpec.cs b/src/net/Netdroid/Generated/Android/Security/Keystore/KeyGenParameterSpec.cs
index 969d734f5..a8b05dfa9 100644
--- a/src/net/Netdroid/Generated/Android/Security/Keystore/KeyGenParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Keystore/KeyGenParameterSpec.cs
@@ -46,224 +46,244 @@ public partial class KeyGenParameterSpec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getAlgorithmParameterSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isDevicePropertiesAttestationIncluded()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec AlgorithmParameterSpec
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDevicePropertiesAttestationIncluded()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getAlgorithmParameterSpec", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<bool>("isDevicePropertiesAttestationIncluded", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getAttestationChallenge()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isDigestsSpecified()"/>
         /// </summary>
-        public byte[] AttestationChallenge
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDigestsSpecified()
         {
-            get { return IExecuteWithSignatureArray<byte>("getAttestationChallenge", "()[B"); }
+            return IExecuteWithSignature<bool>("isDigestsSpecified", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getAttestKeyAlias()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isInvalidatedByBiometricEnrollment()"/>
         /// </summary>
-        public Java.Lang.String AttestKeyAlias
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInvalidatedByBiometricEnrollment()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAttestKeyAlias", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isInvalidatedByBiometricEnrollment", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getBlockModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isRandomizedEncryptionRequired()"/>
         /// </summary>
-        public Java.Lang.String[] BlockModes
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRandomizedEncryptionRequired()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getBlockModes", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isRandomizedEncryptionRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getCertificateNotAfter()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isStrongBoxBacked()"/>
         /// </summary>
-        public Java.Util.Date CertificateNotAfter
+        /// <returns><see cref="bool"/></returns>
+        public bool IsStrongBoxBacked()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getCertificateNotAfter", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<bool>("isStrongBoxBacked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getCertificateNotBefore()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUnlockedDeviceRequired()"/>
         /// </summary>
-        public Java.Util.Date CertificateNotBefore
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUnlockedDeviceRequired()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getCertificateNotBefore", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<bool>("isUnlockedDeviceRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getCertificateSerialNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUserAuthenticationRequired()"/>
         /// </summary>
-        public Java.Math.BigInteger CertificateSerialNumber
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserAuthenticationRequired()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getCertificateSerialNumber", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<bool>("isUserAuthenticationRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getCertificateSubject()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUserAuthenticationValidWhileOnBody()"/>
         /// </summary>
-        public Javax.Security.Auth.X500.X500Principal CertificateSubject
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserAuthenticationValidWhileOnBody()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getCertificateSubject", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignature<bool>("isUserAuthenticationValidWhileOnBody", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getDigests()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUserConfirmationRequired()"/>
         /// </summary>
-        public Java.Lang.String[] Digests
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserConfirmationRequired()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getDigests", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isUserConfirmationRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getEncryptionPaddings()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUserPresenceRequired()"/>
         /// </summary>
-        public Java.Lang.String[] EncryptionPaddings
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserPresenceRequired()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEncryptionPaddings", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isUserPresenceRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeySize()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getAttestationChallenge()"/>
         /// </summary>
-        public int KeySize
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetAttestationChallenge()
         {
-            get { return IExecuteWithSignature<int>("getKeySize", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getAttestationChallenge", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeystoreAlias()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeySize()"/>
         /// </summary>
-        public Java.Lang.String KeystoreAlias
+        /// <returns><see cref="int"/></returns>
+        public int GetKeySize()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKeystoreAlias", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getKeySize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeyValidityForConsumptionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getMaxUsageCount()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityForConsumptionEnd
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxUsageCount()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForConsumptionEnd", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<int>("getMaxUsageCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeyValidityForOriginationEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getPurposes()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityForOriginationEnd
+        /// <returns><see cref="int"/></returns>
+        public int GetPurposes()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForOriginationEnd", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<int>("getPurposes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeyValidityStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getUserAuthenticationType()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityStart
+        /// <returns><see cref="int"/></returns>
+        public int GetUserAuthenticationType()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityStart", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<int>("getUserAuthenticationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getMaxUsageCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getUserAuthenticationValidityDurationSeconds()"/>
         /// </summary>
-        public int MaxUsageCount
+        /// <returns><see cref="int"/></returns>
+        public int GetUserAuthenticationValidityDurationSeconds()
         {
-            get { return IExecuteWithSignature<int>("getMaxUsageCount", "()I"); }
+            return IExecuteWithSignature<int>("getUserAuthenticationValidityDurationSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getPurposes()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getAttestKeyAlias()"/>
         /// </summary>
-        public int Purposes
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAttestKeyAlias()
         {
-            get { return IExecuteWithSignature<int>("getPurposes", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAttestKeyAlias", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getSignaturePaddings()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeystoreAlias()"/>
         /// </summary>
-        public Java.Lang.String[] SignaturePaddings
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKeystoreAlias()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSignaturePaddings", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getKeystoreAlias", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getUserAuthenticationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getBlockModes()"/>
         /// </summary>
-        public int UserAuthenticationType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetBlockModes()
         {
-            get { return IExecuteWithSignature<int>("getUserAuthenticationType", "()I"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getBlockModes", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getUserAuthenticationValidityDurationSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getDigests()"/>
         /// </summary>
-        public int UserAuthenticationValidityDurationSeconds
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetDigests()
         {
-            get { return IExecuteWithSignature<int>("getUserAuthenticationValidityDurationSeconds", "()I"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getDigests", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isDevicePropertiesAttestationIncluded()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getEncryptionPaddings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDevicePropertiesAttestationIncluded()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEncryptionPaddings()
         {
-            return IExecuteWithSignature<bool>("isDevicePropertiesAttestationIncluded", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEncryptionPaddings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isDigestsSpecified()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getSignaturePaddings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDigestsSpecified()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSignaturePaddings()
         {
-            return IExecuteWithSignature<bool>("isDigestsSpecified", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSignaturePaddings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isInvalidatedByBiometricEnrollment()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getCertificateSerialNumber()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInvalidatedByBiometricEnrollment()
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetCertificateSerialNumber()
         {
-            return IExecuteWithSignature<bool>("isInvalidatedByBiometricEnrollment", "()Z");
+            return IExecuteWithSignature<Java.Math.BigInteger>("getCertificateSerialNumber", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isRandomizedEncryptionRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getAlgorithmParameterSpec()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRandomizedEncryptionRequired()
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetAlgorithmParameterSpec()
         {
-            return IExecuteWithSignature<bool>("isRandomizedEncryptionRequired", "()Z");
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getAlgorithmParameterSpec", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isStrongBoxBacked()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getCertificateNotAfter()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsStrongBoxBacked()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetCertificateNotAfter()
         {
-            return IExecuteWithSignature<bool>("isStrongBoxBacked", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getCertificateNotAfter", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUnlockedDeviceRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getCertificateNotBefore()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUnlockedDeviceRequired()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetCertificateNotBefore()
         {
-            return IExecuteWithSignature<bool>("isUnlockedDeviceRequired", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getCertificateNotBefore", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUserAuthenticationRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeyValidityForConsumptionEnd()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserAuthenticationRequired()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityForConsumptionEnd()
         {
-            return IExecuteWithSignature<bool>("isUserAuthenticationRequired", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForConsumptionEnd", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUserAuthenticationValidWhileOnBody()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeyValidityForOriginationEnd()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserAuthenticationValidWhileOnBody()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityForOriginationEnd()
         {
-            return IExecuteWithSignature<bool>("isUserAuthenticationValidWhileOnBody", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForOriginationEnd", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUserConfirmationRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getKeyValidityStart()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserConfirmationRequired()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityStart()
         {
-            return IExecuteWithSignature<bool>("isUserConfirmationRequired", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityStart", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#isUserPresenceRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyGenParameterSpec.html#getCertificateSubject()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserPresenceRequired()
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        public Javax.Security.Auth.X500.X500Principal GetCertificateSubject()
         {
-            return IExecuteWithSignature<bool>("isUserPresenceRequired", "()Z");
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getCertificateSubject", "()Ljavax/security/auth/x500/X500Principal;");
         }
 
         #endregion
@@ -528,7 +548,7 @@ public Android.Security.Keystore.KeyGenParameterSpec.Builder SetUserAuthenticati
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Security.Keystore.KeyGenParameterSpec.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.Keystore.KeyGenParameterSpec.Builder SetUserAuthenticationValidityDurationSeconds(int arg0)
             {
                 return IExecuteWithSignature<Android.Security.Keystore.KeyGenParameterSpec.Builder>("setUserAuthenticationValidityDurationSeconds", "(I)Landroid/security/keystore/KeyGenParameterSpec$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Security/Keystore/KeyInfo.cs b/src/net/Netdroid/Generated/Android/Security/Keystore/KeyInfo.cs
index d00358113..0a1f84d7a 100644
--- a/src/net/Netdroid/Generated/Android/Security/Keystore/KeyInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Keystore/KeyInfo.cs
@@ -46,166 +46,181 @@ public partial class KeyInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getBlockModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isInsideSecureHardware()"/>
         /// </summary>
-        public Java.Lang.String[] BlockModes
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsInsideSecureHardware()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getBlockModes", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isInsideSecureHardware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getDigests()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isInvalidatedByBiometricEnrollment()"/>
         /// </summary>
-        public Java.Lang.String[] Digests
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInvalidatedByBiometricEnrollment()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getDigests", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isInvalidatedByBiometricEnrollment", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getEncryptionPaddings()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isTrustedUserPresenceRequired()"/>
         /// </summary>
-        public Java.Lang.String[] EncryptionPaddings
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTrustedUserPresenceRequired()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEncryptionPaddings", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isTrustedUserPresenceRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeySize()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isUserAuthenticationRequired()"/>
         /// </summary>
-        public int KeySize
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserAuthenticationRequired()
         {
-            get { return IExecuteWithSignature<int>("getKeySize", "()I"); }
+            return IExecuteWithSignature<bool>("isUserAuthenticationRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeystoreAlias()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isUserAuthenticationRequirementEnforcedBySecureHardware()"/>
         /// </summary>
-        public Java.Lang.String KeystoreAlias
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserAuthenticationRequirementEnforcedBySecureHardware()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKeystoreAlias", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isUserAuthenticationRequirementEnforcedBySecureHardware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeyValidityForConsumptionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isUserAuthenticationValidWhileOnBody()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityForConsumptionEnd
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserAuthenticationValidWhileOnBody()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForConsumptionEnd", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<bool>("isUserAuthenticationValidWhileOnBody", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeyValidityForOriginationEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isUserConfirmationRequired()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityForOriginationEnd
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserConfirmationRequired()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForOriginationEnd", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<bool>("isUserConfirmationRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeyValidityStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeySize()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityStart
+        /// <returns><see cref="int"/></returns>
+        public int GetKeySize()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityStart", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<int>("getKeySize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getOrigin()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getOrigin()"/>
         /// </summary>
-        public int Origin
+        /// <returns><see cref="int"/></returns>
+        public int GetOrigin()
         {
-            get { return IExecuteWithSignature<int>("getOrigin", "()I"); }
+            return IExecuteWithSignature<int>("getOrigin", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getPurposes()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getPurposes()"/>
         /// </summary>
-        public int Purposes
+        /// <returns><see cref="int"/></returns>
+        public int GetPurposes()
         {
-            get { return IExecuteWithSignature<int>("getPurposes", "()I"); }
+            return IExecuteWithSignature<int>("getPurposes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getRemainingUsageCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getRemainingUsageCount()"/>
         /// </summary>
-        public int RemainingUsageCount
+        /// <returns><see cref="int"/></returns>
+        public int GetRemainingUsageCount()
         {
-            get { return IExecuteWithSignature<int>("getRemainingUsageCount", "()I"); }
+            return IExecuteWithSignature<int>("getRemainingUsageCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getSecurityLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getSecurityLevel()"/>
         /// </summary>
-        public int SecurityLevel
+        /// <returns><see cref="int"/></returns>
+        public int GetSecurityLevel()
         {
-            get { return IExecuteWithSignature<int>("getSecurityLevel", "()I"); }
+            return IExecuteWithSignature<int>("getSecurityLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getSignaturePaddings()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getUserAuthenticationType()"/>
         /// </summary>
-        public Java.Lang.String[] SignaturePaddings
+        /// <returns><see cref="int"/></returns>
+        public int GetUserAuthenticationType()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSignaturePaddings", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getUserAuthenticationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getUserAuthenticationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getUserAuthenticationValidityDurationSeconds()"/>
         /// </summary>
-        public int UserAuthenticationType
+        /// <returns><see cref="int"/></returns>
+        public int GetUserAuthenticationValidityDurationSeconds()
         {
-            get { return IExecuteWithSignature<int>("getUserAuthenticationType", "()I"); }
+            return IExecuteWithSignature<int>("getUserAuthenticationValidityDurationSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getUserAuthenticationValidityDurationSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeystoreAlias()"/>
         /// </summary>
-        public int UserAuthenticationValidityDurationSeconds
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKeystoreAlias()
         {
-            get { return IExecuteWithSignature<int>("getUserAuthenticationValidityDurationSeconds", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getKeystoreAlias", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isInsideSecureHardware()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getBlockModes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsInsideSecureHardware()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetBlockModes()
         {
-            return IExecuteWithSignature<bool>("isInsideSecureHardware", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getBlockModes", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isInvalidatedByBiometricEnrollment()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getDigests()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInvalidatedByBiometricEnrollment()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetDigests()
         {
-            return IExecuteWithSignature<bool>("isInvalidatedByBiometricEnrollment", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getDigests", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isTrustedUserPresenceRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getEncryptionPaddings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTrustedUserPresenceRequired()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEncryptionPaddings()
         {
-            return IExecuteWithSignature<bool>("isTrustedUserPresenceRequired", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEncryptionPaddings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isUserAuthenticationRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getSignaturePaddings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserAuthenticationRequired()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSignaturePaddings()
         {
-            return IExecuteWithSignature<bool>("isUserAuthenticationRequired", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSignaturePaddings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isUserAuthenticationRequirementEnforcedBySecureHardware()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeyValidityForConsumptionEnd()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserAuthenticationRequirementEnforcedBySecureHardware()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityForConsumptionEnd()
         {
-            return IExecuteWithSignature<bool>("isUserAuthenticationRequirementEnforcedBySecureHardware", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForConsumptionEnd", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isUserAuthenticationValidWhileOnBody()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeyValidityForOriginationEnd()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserAuthenticationValidWhileOnBody()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityForOriginationEnd()
         {
-            return IExecuteWithSignature<bool>("isUserAuthenticationValidWhileOnBody", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForOriginationEnd", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#isUserConfirmationRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyInfo.html#getKeyValidityStart()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserConfirmationRequired()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityStart()
         {
-            return IExecuteWithSignature<bool>("isUserConfirmationRequired", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityStart", "()Ljava/util/Date;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Security/Keystore/KeyProperties.cs b/src/net/Netdroid/Generated/Android/Security/Keystore/KeyProperties.cs
index 60f986002..fc76809d6 100644
--- a/src/net/Netdroid/Generated/Android/Security/Keystore/KeyProperties.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Keystore/KeyProperties.cs
@@ -244,7 +244,7 @@ public partial class KeyProperties
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProperties.html#KEY_ALGORITHM_3DES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_ALGORITHM_3DES { get { if (!_KEY_ALGORITHM_3DESReady) { _KEY_ALGORITHM_3DESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_ALGORITHM_3DES"); _KEY_ALGORITHM_3DESReady = true; } return _KEY_ALGORITHM_3DESContent; } }
         private static Java.Lang.String _KEY_ALGORITHM_3DESContent = default;
         private static bool _KEY_ALGORITHM_3DESReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Security/Keystore/KeyProtection.cs b/src/net/Netdroid/Generated/Android/Security/Keystore/KeyProtection.cs
index a25541110..8e51217ac 100644
--- a/src/net/Netdroid/Generated/Android/Security/Keystore/KeyProtection.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Keystore/KeyProtection.cs
@@ -46,145 +46,156 @@ public partial class KeyProtection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getBlockModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isDigestsSpecified()"/>
         /// </summary>
-        public Java.Lang.String[] BlockModes
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDigestsSpecified()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getBlockModes", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isDigestsSpecified", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getDigests()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isInvalidatedByBiometricEnrollment()"/>
         /// </summary>
-        public Java.Lang.String[] Digests
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInvalidatedByBiometricEnrollment()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getDigests", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isInvalidatedByBiometricEnrollment", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getEncryptionPaddings()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isRandomizedEncryptionRequired()"/>
         /// </summary>
-        public Java.Lang.String[] EncryptionPaddings
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRandomizedEncryptionRequired()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEncryptionPaddings", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isRandomizedEncryptionRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getKeyValidityForConsumptionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUnlockedDeviceRequired()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityForConsumptionEnd
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUnlockedDeviceRequired()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForConsumptionEnd", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<bool>("isUnlockedDeviceRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getKeyValidityForOriginationEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUserAuthenticationRequired()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityForOriginationEnd
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserAuthenticationRequired()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForOriginationEnd", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<bool>("isUserAuthenticationRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getKeyValidityStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUserAuthenticationValidWhileOnBody()"/>
         /// </summary>
-        public Java.Util.Date KeyValidityStart
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserAuthenticationValidWhileOnBody()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getKeyValidityStart", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<bool>("isUserAuthenticationValidWhileOnBody", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getMaxUsageCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUserConfirmationRequired()"/>
         /// </summary>
-        public int MaxUsageCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserConfirmationRequired()
         {
-            get { return IExecuteWithSignature<int>("getMaxUsageCount", "()I"); }
+            return IExecuteWithSignature<bool>("isUserConfirmationRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getPurposes()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUserPresenceRequired()"/>
         /// </summary>
-        public int Purposes
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUserPresenceRequired()
         {
-            get { return IExecuteWithSignature<int>("getPurposes", "()I"); }
+            return IExecuteWithSignature<bool>("isUserPresenceRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getSignaturePaddings()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getMaxUsageCount()"/>
         /// </summary>
-        public Java.Lang.String[] SignaturePaddings
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxUsageCount()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSignaturePaddings", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getMaxUsageCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getUserAuthenticationType()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getPurposes()"/>
         /// </summary>
-        public int UserAuthenticationType
+        /// <returns><see cref="int"/></returns>
+        public int GetPurposes()
         {
-            get { return IExecuteWithSignature<int>("getUserAuthenticationType", "()I"); }
+            return IExecuteWithSignature<int>("getPurposes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getUserAuthenticationValidityDurationSeconds()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getUserAuthenticationType()"/>
         /// </summary>
-        public int UserAuthenticationValidityDurationSeconds
+        /// <returns><see cref="int"/></returns>
+        public int GetUserAuthenticationType()
         {
-            get { return IExecuteWithSignature<int>("getUserAuthenticationValidityDurationSeconds", "()I"); }
+            return IExecuteWithSignature<int>("getUserAuthenticationType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isDigestsSpecified()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getUserAuthenticationValidityDurationSeconds()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDigestsSpecified()
+        /// <returns><see cref="int"/></returns>
+        public int GetUserAuthenticationValidityDurationSeconds()
         {
-            return IExecuteWithSignature<bool>("isDigestsSpecified", "()Z");
+            return IExecuteWithSignature<int>("getUserAuthenticationValidityDurationSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isInvalidatedByBiometricEnrollment()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getBlockModes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInvalidatedByBiometricEnrollment()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetBlockModes()
         {
-            return IExecuteWithSignature<bool>("isInvalidatedByBiometricEnrollment", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getBlockModes", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isRandomizedEncryptionRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getDigests()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRandomizedEncryptionRequired()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetDigests()
         {
-            return IExecuteWithSignature<bool>("isRandomizedEncryptionRequired", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getDigests", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUnlockedDeviceRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getEncryptionPaddings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUnlockedDeviceRequired()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEncryptionPaddings()
         {
-            return IExecuteWithSignature<bool>("isUnlockedDeviceRequired", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEncryptionPaddings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUserAuthenticationRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getSignaturePaddings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserAuthenticationRequired()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSignaturePaddings()
         {
-            return IExecuteWithSignature<bool>("isUserAuthenticationRequired", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSignaturePaddings", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUserAuthenticationValidWhileOnBody()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getKeyValidityForConsumptionEnd()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserAuthenticationValidWhileOnBody()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityForConsumptionEnd()
         {
-            return IExecuteWithSignature<bool>("isUserAuthenticationValidWhileOnBody", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForConsumptionEnd", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUserConfirmationRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getKeyValidityForOriginationEnd()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserConfirmationRequired()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityForOriginationEnd()
         {
-            return IExecuteWithSignature<bool>("isUserConfirmationRequired", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityForOriginationEnd", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#isUserPresenceRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/security/keystore/KeyProtection.html#getKeyValidityStart()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUserPresenceRequired()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetKeyValidityStart()
         {
-            return IExecuteWithSignature<bool>("isUserPresenceRequired", "()Z");
+            return IExecuteWithSignature<Java.Util.Date>("getKeyValidityStart", "()Ljava/util/Date;");
         }
 
         #endregion
@@ -367,7 +378,7 @@ public Android.Security.Keystore.KeyProtection.Builder SetUserAuthenticationRequ
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Security.Keystore.KeyProtection.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Security.Keystore.KeyProtection.Builder SetUserAuthenticationValidityDurationSeconds(int arg0)
             {
                 return IExecuteWithSignature<Android.Security.Keystore.KeyProtection.Builder>("setUserAuthenticationValidityDurationSeconds", "(I)Landroid/security/keystore/KeyProtection$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Security/Keystore/WrappedKeyEntry.cs b/src/net/Netdroid/Generated/Android/Security/Keystore/WrappedKeyEntry.cs
index 17ae253e3..a3a513f8b 100644
--- a/src/net/Netdroid/Generated/Android/Security/Keystore/WrappedKeyEntry.cs
+++ b/src/net/Netdroid/Generated/Android/Security/Keystore/WrappedKeyEntry.cs
@@ -57,32 +57,36 @@ public WrappedKeyEntry(byte[] arg0, Java.Lang.String arg1, Java.Lang.String arg2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/WrappedKeyEntry.html#getAlgorithmParameterSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/WrappedKeyEntry.html#getWrappedKeyBytes()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec AlgorithmParameterSpec
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetWrappedKeyBytes()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getAlgorithmParameterSpec", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignatureArray<byte>("getWrappedKeyBytes", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/WrappedKeyEntry.html#getTransformation()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/WrappedKeyEntry.html#getTransformation()"/>
         /// </summary>
-        public Java.Lang.String Transformation
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTransformation()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTransformation", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTransformation", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/WrappedKeyEntry.html#getWrappedKeyBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/WrappedKeyEntry.html#getWrappingKeyAlias()"/>
         /// </summary>
-        public byte[] WrappedKeyBytes
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetWrappingKeyAlias()
         {
-            get { return IExecuteWithSignatureArray<byte>("getWrappedKeyBytes", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getWrappingKeyAlias", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/keystore/WrappedKeyEntry.html#getWrappingKeyAlias()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/keystore/WrappedKeyEntry.html#getAlgorithmParameterSpec()"/>
         /// </summary>
-        public Java.Lang.String WrappingKeyAlias
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetAlgorithmParameterSpec()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getWrappingKeyAlias", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getAlgorithmParameterSpec", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Security/NetworkSecurityPolicy.cs b/src/net/Netdroid/Generated/Android/Security/NetworkSecurityPolicy.cs
index 0e60ac15f..b0493cd7a 100644
--- a/src/net/Netdroid/Generated/Android/Security/NetworkSecurityPolicy.cs
+++ b/src/net/Netdroid/Generated/Android/Security/NetworkSecurityPolicy.cs
@@ -42,11 +42,12 @@ public partial class NetworkSecurityPolicy
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/security/NetworkSecurityPolicy.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/security/NetworkSecurityPolicy.html#getInstance()"/>
         /// </summary>
-        public static Android.Security.NetworkSecurityPolicy Instance
+        /// <returns><see cref="Android.Security.NetworkSecurityPolicy"/></returns>
+        public static Android.Security.NetworkSecurityPolicy GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Security.NetworkSecurityPolicy>(LocalBridgeClazz, "getInstance", "()Landroid/security/NetworkSecurityPolicy;"); }
+            return SExecuteWithSignature<Android.Security.NetworkSecurityPolicy>(LocalBridgeClazz, "getInstance", "()Landroid/security/NetworkSecurityPolicy;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Assist/Classification/FieldClassification.cs b/src/net/Netdroid/Generated/Android/Service/Assist/Classification/FieldClassification.cs
index 47e511af5..d020697d3 100644
--- a/src/net/Netdroid/Generated/Android/Service/Assist/Classification/FieldClassification.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Assist/Classification/FieldClassification.cs
@@ -61,18 +61,12 @@ public FieldClassification(Android.View.Autofill.AutofillId arg0, Java.Util.Set<
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/assist/classification/FieldClassification.html#getAutofillId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/assist/classification/FieldClassification.html#getAutofillId()"/>
         /// </summary>
-        public Android.View.Autofill.AutofillId AutofillId
+        /// <returns><see cref="Android.View.Autofill.AutofillId"/></returns>
+        public Android.View.Autofill.AutofillId GetAutofillId()
         {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/assist/classification/FieldClassification.html#getHints()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> Hints
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getHints", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/assist/classification/FieldClassification.html#describeContents()"/>
@@ -83,6 +77,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/assist/classification/FieldClassification.html#getHints()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetHints()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getHints", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/assist/classification/FieldClassification.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/AllPackageClasses.cs
index 18508c268..c7d3a2a78 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class AutofillService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AutofillService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AutofillService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AutofillService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AutofillService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AutofillService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AutofillService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1182,12 +1182,12 @@ public partial class OnClickAction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnC
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OnClickAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OnClickAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OnClickAction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OnClickAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OnClickAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OnClickAction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1360,12 +1360,12 @@ public partial class Sanitizer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sanitiz
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Sanitizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Sanitizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Sanitizer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Sanitizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Sanitizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Sanitizer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1494,12 +1494,12 @@ public partial class SavedDatasetsInfoCallback : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SavedDatasetsInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SavedDatasetsInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SavedDatasetsInfoCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SavedDatasetsInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SavedDatasetsInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SavedDatasetsInfoCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1716,12 +1716,12 @@ public partial class Transformation : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Tr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Transformation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Transformation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Transformation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Transformation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Transformation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Transformation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1850,12 +1850,12 @@ public partial class Validator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Validat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Validator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Validator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/AutofillService.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/AutofillService.cs
index ce9da51f2..2b93111e4 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/AutofillService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/AutofillService.cs
@@ -64,13 +64,6 @@ public partial class AutofillService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/AutofillService.html#getFillEventHistory()"/> 
-        /// </summary>
-        public Android.Service.Autofill.FillEventHistory FillEventHistory
-        {
-            get { return IExecuteWithSignature<Android.Service.Autofill.FillEventHistory>("getFillEventHistory", "()Landroid/service/autofill/FillEventHistory;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/AutofillService.html#onFillRequest(android.service.autofill.FillRequest,android.os.CancellationSignal,android.service.autofill.FillCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Service.Autofill.FillRequest"/></param>
@@ -90,6 +83,14 @@ public void OnSaveRequest(Android.Service.Autofill.SaveRequest arg0, Android.Ser
             IExecute("onSaveRequest", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/autofill/AutofillService.html#getFillEventHistory()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Service.Autofill.FillEventHistory"/></returns>
+        public Android.Service.Autofill.FillEventHistory GetFillEventHistory()
+        {
+            return IExecuteWithSignature<Android.Service.Autofill.FillEventHistory>("getFillEventHistory", "()Landroid/service/autofill/FillEventHistory;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/AutofillService.html#onConnected()"/>
         /// </summary>
         public void OnConnected()
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/Dataset.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/Dataset.cs
index 3951092c8..e6aeb3bfc 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/Dataset.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/Dataset.cs
@@ -88,7 +88,7 @@ public Builder(Android.Service.Autofill.Presentations arg0)
             /// <see href="https://developer.android.com/reference/android/service/autofill/Dataset.Builder.html#%3Cinit%3E(android.widget.RemoteViews)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Widget.RemoteViews"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.Widget.RemoteViews arg0)
                 : base(arg0)
             {
@@ -170,7 +170,7 @@ public Android.Service.Autofill.Dataset.Builder SetId(Java.Lang.String arg0)
             /// <param name="arg0"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <param name="arg1"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetInlinePresentation(Android.Service.Autofill.InlinePresentation arg0, Android.Service.Autofill.InlinePresentation arg1)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setInlinePresentation", arg0, arg1);
@@ -180,7 +180,7 @@ public Android.Service.Autofill.Dataset.Builder SetInlinePresentation(Android.Se
             /// </summary>
             /// <param name="arg0"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetInlinePresentation(Android.Service.Autofill.InlinePresentation arg0)
             {
                 return IExecuteWithSignature<Android.Service.Autofill.Dataset.Builder>("setInlinePresentation", "(Landroid/service/autofill/InlinePresentation;)Landroid/service/autofill/Dataset$Builder;", arg0);
@@ -194,7 +194,7 @@ public Android.Service.Autofill.Dataset.Builder SetInlinePresentation(Android.Se
             /// <param name="arg3"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <param name="arg4"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.AutofillId arg0, Android.View.Autofill.AutofillValue arg1, Android.Widget.RemoteViews arg2, Android.Service.Autofill.InlinePresentation arg3, Android.Service.Autofill.InlinePresentation arg4)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setValue", arg0, arg1, arg2, arg3, arg4);
@@ -207,7 +207,7 @@ public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.A
             /// <param name="arg2"><see cref="Android.Widget.RemoteViews"/></param>
             /// <param name="arg3"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.AutofillId arg0, Android.View.Autofill.AutofillValue arg1, Android.Widget.RemoteViews arg2, Android.Service.Autofill.InlinePresentation arg3)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setValue", arg0, arg1, arg2, arg3);
@@ -219,7 +219,7 @@ public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.A
             /// <param name="arg1"><see cref="Android.View.Autofill.AutofillValue"/></param>
             /// <param name="arg2"><see cref="Android.Widget.RemoteViews"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.AutofillId arg0, Android.View.Autofill.AutofillValue arg1, Android.Widget.RemoteViews arg2)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setValue", arg0, arg1, arg2);
@@ -234,7 +234,7 @@ public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.A
             /// <param name="arg4"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <param name="arg5"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.AutofillId arg0, Android.View.Autofill.AutofillValue arg1, Java.Util.Regex.Pattern arg2, Android.Widget.RemoteViews arg3, Android.Service.Autofill.InlinePresentation arg4, Android.Service.Autofill.InlinePresentation arg5)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setValue", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -248,7 +248,7 @@ public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.A
             /// <param name="arg3"><see cref="Android.Widget.RemoteViews"/></param>
             /// <param name="arg4"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.AutofillId arg0, Android.View.Autofill.AutofillValue arg1, Java.Util.Regex.Pattern arg2, Android.Widget.RemoteViews arg3, Android.Service.Autofill.InlinePresentation arg4)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setValue", arg0, arg1, arg2, arg3, arg4);
@@ -261,7 +261,7 @@ public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.A
             /// <param name="arg2"><see cref="Java.Util.Regex.Pattern"/></param>
             /// <param name="arg3"><see cref="Android.Widget.RemoteViews"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.AutofillId arg0, Android.View.Autofill.AutofillValue arg1, Java.Util.Regex.Pattern arg2, Android.Widget.RemoteViews arg3)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setValue", arg0, arg1, arg2, arg3);
@@ -273,7 +273,7 @@ public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.A
             /// <param name="arg1"><see cref="Android.View.Autofill.AutofillValue"/></param>
             /// <param name="arg2"><see cref="Java.Util.Regex.Pattern"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.AutofillId arg0, Android.View.Autofill.AutofillValue arg1, Java.Util.Regex.Pattern arg2)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setValue", arg0, arg1, arg2);
@@ -284,7 +284,7 @@ public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.A
             /// <param name="arg0"><see cref="Android.View.Autofill.AutofillId"/></param>
             /// <param name="arg1"><see cref="Android.View.Autofill.AutofillValue"/></param>
             /// <returns><see cref="Android.Service.Autofill.Dataset.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.Dataset.Builder SetValue(Android.View.Autofill.AutofillId arg0, Android.View.Autofill.AutofillValue arg1)
             {
                 return IExecute<Android.Service.Autofill.Dataset.Builder>("setValue", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/Field.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/Field.cs
index 38bdf0bcc..b0c3ce5ce 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/Field.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/Field.cs
@@ -46,25 +46,28 @@ public partial class Field
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/Field.html#getFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/Field.html#getPresentations()"/>
         /// </summary>
-        public Java.Util.Regex.Pattern Filter
+        /// <returns><see cref="Android.Service.Autofill.Presentations"/></returns>
+        public Android.Service.Autofill.Presentations GetPresentations()
         {
-            get { return IExecuteWithSignature<Java.Util.Regex.Pattern>("getFilter", "()Ljava/util/regex/Pattern;"); }
+            return IExecuteWithSignature<Android.Service.Autofill.Presentations>("getPresentations", "()Landroid/service/autofill/Presentations;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/Field.html#getPresentations()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/Field.html#getValue()"/>
         /// </summary>
-        public Android.Service.Autofill.Presentations Presentations
+        /// <returns><see cref="Android.View.Autofill.AutofillValue"/></returns>
+        public Android.View.Autofill.AutofillValue GetValue()
         {
-            get { return IExecuteWithSignature<Android.Service.Autofill.Presentations>("getPresentations", "()Landroid/service/autofill/Presentations;"); }
+            return IExecuteWithSignature<Android.View.Autofill.AutofillValue>("getValue", "()Landroid/view/autofill/AutofillValue;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/Field.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/Field.html#getFilter()"/>
         /// </summary>
-        public Android.View.Autofill.AutofillValue Value
+        /// <returns><see cref="Java.Util.Regex.Pattern"/></returns>
+        public Java.Util.Regex.Pattern GetFilter()
         {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillValue>("getValue", "()Landroid/view/autofill/AutofillValue;"); }
+            return IExecuteWithSignature<Java.Util.Regex.Pattern>("getFilter", "()Ljava/util/regex/Pattern;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/FieldClassification.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/FieldClassification.cs
index afcff623e..5caeb2bed 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/FieldClassification.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/FieldClassification.cs
@@ -46,11 +46,12 @@ public partial class FieldClassification
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FieldClassification.html#getMatches()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FieldClassification.html#getMatches()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Autofill.FieldClassification.Match> Matches
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Autofill.FieldClassification.Match> GetMatches()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Autofill.FieldClassification.Match>>("getMatches", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Autofill.FieldClassification.Match>>("getMatches", "()Ljava/util/List;");
         }
 
         #endregion
@@ -77,18 +78,20 @@ public partial class Match
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FieldClassification.Match.html#getCategoryId()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FieldClassification.Match.html#getScore()"/>
             /// </summary>
-            public Java.Lang.String CategoryId
+            /// <returns><see cref="float"/></returns>
+            public float GetScore()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCategoryId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<float>("getScore", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FieldClassification.Match.html#getScore()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FieldClassification.Match.html#getCategoryId()"/>
             /// </summary>
-            public float Score
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCategoryId()
             {
-                get { return IExecuteWithSignature<float>("getScore", "()F"); }
+                return IExecuteWithSignature<Java.Lang.String>("getCategoryId", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/FillContext.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/FillContext.cs
index 11e8c1964..24f90521d 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/FillContext.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/FillContext.cs
@@ -52,33 +52,36 @@ public partial class FillContext
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#getFocusedId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#getStructure()"/>
         /// </summary>
-        public Android.View.Autofill.AutofillId FocusedId
+        /// <returns><see cref="Android.App.Assist.AssistStructure"/></returns>
+        public Android.App.Assist.AssistStructure GetStructure()
         {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getFocusedId", "()Landroid/view/autofill/AutofillId;"); }
+            return IExecuteWithSignature<Android.App.Assist.AssistStructure>("getStructure", "()Landroid/app/assist/AssistStructure;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#getRequestId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#getFocusedId()"/>
         /// </summary>
-        public int RequestId
+        /// <returns><see cref="Android.View.Autofill.AutofillId"/></returns>
+        public Android.View.Autofill.AutofillId GetFocusedId()
         {
-            get { return IExecuteWithSignature<int>("getRequestId", "()I"); }
+            return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getFocusedId", "()Landroid/view/autofill/AutofillId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#getStructure()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#describeContents()"/>
         /// </summary>
-        public Android.App.Assist.AssistStructure Structure
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.App.Assist.AssistStructure>("getStructure", "()Landroid/app/assist/AssistStructure;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#getRequestId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetRequestId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getRequestId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/FillContext.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/FillEventHistory.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/FillEventHistory.cs
index 16e1ee45c..a94221c6f 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/FillEventHistory.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/FillEventHistory.cs
@@ -52,19 +52,13 @@ public partial class FillEventHistory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.html#getClientState()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.html#getClientState()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Os.Bundle ClientState
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.Bundle GetClientState()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getClientState", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.html#getEvents()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Service.Autofill.FillEventHistory.Event> Events
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Autofill.FillEventHistory.Event>>("getEvents", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getClientState", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.html#describeContents()"/>
@@ -75,6 +69,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.html#getEvents()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Autofill.FillEventHistory.Event> GetEvents()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Autofill.FillEventHistory.Event>>("getEvents", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -216,74 +218,84 @@ public partial class Event
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getChangedFields()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getClientState()"/>
             /// </summary>
-            public Java.Util.Map<Android.View.Autofill.AutofillId, Java.Lang.String> ChangedFields
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetClientState()
             {
-                get { return IExecuteWithSignature<Java.Util.Map<Android.View.Autofill.AutofillId, Java.Lang.String>>("getChangedFields", "()Ljava/util/Map;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getClientState", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getClientState()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getNoSaveUiReason()"/>
             /// </summary>
-            public Android.Os.Bundle ClientState
+            /// <returns><see cref="int"/></returns>
+            public int GetNoSaveUiReason()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getClientState", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("getNoSaveUiReason", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getDatasetId()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getType()"/>
             /// </summary>
-            public Java.Lang.String DatasetId
+            /// <returns><see cref="int"/></returns>
+            public int GetType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDatasetId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getFieldsClassification()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getUiType()"/>
             /// </summary>
-            public Java.Util.Map<Android.View.Autofill.AutofillId, Android.Service.Autofill.FieldClassification> FieldsClassification
+            /// <returns><see cref="int"/></returns>
+            public int GetUiType()
             {
-                get { return IExecuteWithSignature<Java.Util.Map<Android.View.Autofill.AutofillId, Android.Service.Autofill.FieldClassification>>("getFieldsClassification", "()Ljava/util/Map;"); }
+                return IExecuteWithSignature<int>("getUiType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getIgnoredDatasetIds()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getDatasetId()"/>
             /// </summary>
-            public Java.Util.Set<Java.Lang.String> IgnoredDatasetIds
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDatasetId()
             {
-                get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getIgnoredDatasetIds", "()Ljava/util/Set;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getDatasetId", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getManuallyEnteredField()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getFieldsClassification()"/>
             /// </summary>
-            public Java.Util.Map<Android.View.Autofill.AutofillId, Java.Util.Set<Java.Lang.String>> ManuallyEnteredField
+            /// <returns><see cref="Java.Util.Map"/></returns>
+            public Java.Util.Map<Android.View.Autofill.AutofillId, Android.Service.Autofill.FieldClassification> GetFieldsClassification()
             {
-                get { return IExecuteWithSignature<Java.Util.Map<Android.View.Autofill.AutofillId, Java.Util.Set<Java.Lang.String>>>("getManuallyEnteredField", "()Ljava/util/Map;"); }
+                return IExecuteWithSignature<Java.Util.Map<Android.View.Autofill.AutofillId, Android.Service.Autofill.FieldClassification>>("getFieldsClassification", "()Ljava/util/Map;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getNoSaveUiReason()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getChangedFields()"/>
             /// </summary>
-            public int NoSaveUiReason
+            /// <returns><see cref="Java.Util.Map"/></returns>
+            public Java.Util.Map<Android.View.Autofill.AutofillId, Java.Lang.String> GetChangedFields()
             {
-                get { return IExecuteWithSignature<int>("getNoSaveUiReason", "()I"); }
+                return IExecuteWithSignature<Java.Util.Map<Android.View.Autofill.AutofillId, Java.Lang.String>>("getChangedFields", "()Ljava/util/Map;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getSelectedDatasetIds()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getManuallyEnteredField()"/>
             /// </summary>
-            public Java.Util.Set<Java.Lang.String> SelectedDatasetIds
+            /// <returns><see cref="Java.Util.Map"/></returns>
+            public Java.Util.Map<Android.View.Autofill.AutofillId, Java.Util.Set<Java.Lang.String>> GetManuallyEnteredField()
             {
-                get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSelectedDatasetIds", "()Ljava/util/Set;"); }
+                return IExecuteWithSignature<Java.Util.Map<Android.View.Autofill.AutofillId, Java.Util.Set<Java.Lang.String>>>("getManuallyEnteredField", "()Ljava/util/Map;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getIgnoredDatasetIds()"/>
             /// </summary>
-            public int Type
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Java.Lang.String> GetIgnoredDatasetIds()
             {
-                get { return IExecuteWithSignature<int>("getType", "()I"); }
+                return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getIgnoredDatasetIds", "()Ljava/util/Set;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getUiType()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/autofill/FillEventHistory.Event.html#getSelectedDatasetIds()"/>
             /// </summary>
-            public int UiType
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Java.Lang.String> GetSelectedDatasetIds()
             {
-                get { return IExecuteWithSignature<int>("getUiType", "()I"); }
+                return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSelectedDatasetIds", "()Ljava/util/Set;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/FillRequest.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/FillRequest.cs
index 0931b49ce..4550c3241 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/FillRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/FillRequest.cs
@@ -70,61 +70,68 @@ public partial class FillRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getClientState()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getDelayedFillIntentSender()"/>
         /// </summary>
-        public Android.Os.Bundle ClientState
+        /// <returns><see cref="Android.Content.IntentSender"/></returns>
+        public Android.Content.IntentSender GetDelayedFillIntentSender()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getClientState", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Content.IntentSender>("getDelayedFillIntentSender", "()Landroid/content/IntentSender;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getDelayedFillIntentSender()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getClientState()"/>
         /// </summary>
-        public Android.Content.IntentSender DelayedFillIntentSender
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetClientState()
         {
-            get { return IExecuteWithSignature<Android.Content.IntentSender>("getDelayedFillIntentSender", "()Landroid/content/IntentSender;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getClientState", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getFillContexts()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getInlineSuggestionsRequest()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Autofill.FillContext> FillContexts
+        /// <returns><see cref="Android.View.Inputmethod.InlineSuggestionsRequest"/></returns>
+        public Android.View.Inputmethod.InlineSuggestionsRequest GetInlineSuggestionsRequest()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Autofill.FillContext>>("getFillContexts", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InlineSuggestionsRequest>("getInlineSuggestionsRequest", "()Landroid/view/inputmethod/InlineSuggestionsRequest;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#describeContents()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getFlags()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> Hints
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getHints", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getId()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getInlineSuggestionsRequest()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getFillContexts()"/>
         /// </summary>
-        public Android.View.Inputmethod.InlineSuggestionsRequest InlineSuggestionsRequest
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Autofill.FillContext> GetFillContexts()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.InlineSuggestionsRequest>("getInlineSuggestionsRequest", "()Landroid/view/inputmethod/InlineSuggestionsRequest;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Autofill.FillContext>>("getFillContexts", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#getHints()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetHints()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getHints", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/FillRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/FillResponse.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/FillResponse.cs
index 819d3e8c4..c6f39948e 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/FillResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/FillResponse.cs
@@ -156,7 +156,7 @@ public Android.Service.Autofill.FillResponse.Builder SetAuthentication(Android.V
             /// <param name="arg3"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <param name="arg4"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <returns><see cref="Android.Service.Autofill.FillResponse.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.FillResponse.Builder SetAuthentication(Android.View.Autofill.AutofillId[] arg0, Android.Content.IntentSender arg1, Android.Widget.RemoteViews arg2, Android.Service.Autofill.InlinePresentation arg3, Android.Service.Autofill.InlinePresentation arg4)
             {
                 return IExecute<Android.Service.Autofill.FillResponse.Builder>("setAuthentication", arg0, arg1, arg2, arg3, arg4);
@@ -169,7 +169,7 @@ public Android.Service.Autofill.FillResponse.Builder SetAuthentication(Android.V
             /// <param name="arg2"><see cref="Android.Widget.RemoteViews"/></param>
             /// <param name="arg3"><see cref="Android.Service.Autofill.InlinePresentation"/></param>
             /// <returns><see cref="Android.Service.Autofill.FillResponse.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.FillResponse.Builder SetAuthentication(Android.View.Autofill.AutofillId[] arg0, Android.Content.IntentSender arg1, Android.Widget.RemoteViews arg2, Android.Service.Autofill.InlinePresentation arg3)
             {
                 return IExecute<Android.Service.Autofill.FillResponse.Builder>("setAuthentication", arg0, arg1, arg2, arg3);
@@ -181,7 +181,7 @@ public Android.Service.Autofill.FillResponse.Builder SetAuthentication(Android.V
             /// <param name="arg1"><see cref="Android.Content.IntentSender"/></param>
             /// <param name="arg2"><see cref="Android.Widget.RemoteViews"/></param>
             /// <returns><see cref="Android.Service.Autofill.FillResponse.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.FillResponse.Builder SetAuthentication(Android.View.Autofill.AutofillId[] arg0, Android.Content.IntentSender arg1, Android.Widget.RemoteViews arg2)
             {
                 return IExecute<Android.Service.Autofill.FillResponse.Builder>("setAuthentication", arg0, arg1, arg2);
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/ImageTransformation.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/ImageTransformation.cs
index bf62237a6..785b398e4 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/ImageTransformation.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/ImageTransformation.cs
@@ -101,7 +101,7 @@ public Builder(Android.View.Autofill.AutofillId arg0, Java.Util.Regex.Pattern ar
             /// <param name="arg0"><see cref="Android.View.Autofill.AutofillId"/></param>
             /// <param name="arg1"><see cref="Java.Util.Regex.Pattern"/></param>
             /// <param name="arg2"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Builder(Android.View.Autofill.AutofillId arg0, Java.Util.Regex.Pattern arg1, int arg2)
                 : base(arg0, arg1, arg2)
             {
@@ -147,7 +147,7 @@ public Android.Service.Autofill.ImageTransformation.Builder AddOption(Java.Util.
             /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
             /// <param name="arg1"><see cref="int"/></param>
             /// <returns><see cref="Android.Service.Autofill.ImageTransformation.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Service.Autofill.ImageTransformation.Builder AddOption(Java.Util.Regex.Pattern arg0, int arg1)
             {
                 return IExecute<Android.Service.Autofill.ImageTransformation.Builder>("addOption", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/InlinePresentation.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/InlinePresentation.cs
index 41c729dc4..199d1feab 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/InlinePresentation.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/InlinePresentation.cs
@@ -72,18 +72,20 @@ public static Android.Service.Autofill.InlinePresentation CreateTooltipPresentat
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/InlinePresentation.html#getInlinePresentationSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/InlinePresentation.html#getSlice()"/>
         /// </summary>
-        public Android.Widget.Inline.InlinePresentationSpec InlinePresentationSpec
+        /// <returns><see cref="Android.App.Slice.Slice"/></returns>
+        public Android.App.Slice.Slice GetSlice()
         {
-            get { return IExecuteWithSignature<Android.Widget.Inline.InlinePresentationSpec>("getInlinePresentationSpec", "()Landroid/widget/inline/InlinePresentationSpec;"); }
+            return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/InlinePresentation.html#getSlice()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/InlinePresentation.html#getInlinePresentationSpec()"/>
         /// </summary>
-        public Android.App.Slice.Slice Slice
+        /// <returns><see cref="Android.Widget.Inline.InlinePresentationSpec"/></returns>
+        public Android.Widget.Inline.InlinePresentationSpec GetInlinePresentationSpec()
         {
-            get { return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;"); }
+            return IExecuteWithSignature<Android.Widget.Inline.InlinePresentationSpec>("getInlinePresentationSpec", "()Landroid/widget/inline/InlinePresentationSpec;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/InlinePresentation.html#isPinned()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/Presentations.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/Presentations.cs
index 2ce3c9ce3..b10757f9d 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/Presentations.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/Presentations.cs
@@ -46,32 +46,36 @@ public partial class Presentations
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/Presentations.html#getDialogPresentation()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/Presentations.html#getInlinePresentation()"/>
         /// </summary>
-        public Android.Widget.RemoteViews DialogPresentation
+        /// <returns><see cref="Android.Service.Autofill.InlinePresentation"/></returns>
+        public Android.Service.Autofill.InlinePresentation GetInlinePresentation()
         {
-            get { return IExecuteWithSignature<Android.Widget.RemoteViews>("getDialogPresentation", "()Landroid/widget/RemoteViews;"); }
+            return IExecuteWithSignature<Android.Service.Autofill.InlinePresentation>("getInlinePresentation", "()Landroid/service/autofill/InlinePresentation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/Presentations.html#getInlinePresentation()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/Presentations.html#getInlineTooltipPresentation()"/>
         /// </summary>
-        public Android.Service.Autofill.InlinePresentation InlinePresentation
+        /// <returns><see cref="Android.Service.Autofill.InlinePresentation"/></returns>
+        public Android.Service.Autofill.InlinePresentation GetInlineTooltipPresentation()
         {
-            get { return IExecuteWithSignature<Android.Service.Autofill.InlinePresentation>("getInlinePresentation", "()Landroid/service/autofill/InlinePresentation;"); }
+            return IExecuteWithSignature<Android.Service.Autofill.InlinePresentation>("getInlineTooltipPresentation", "()Landroid/service/autofill/InlinePresentation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/Presentations.html#getInlineTooltipPresentation()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/Presentations.html#getDialogPresentation()"/>
         /// </summary>
-        public Android.Service.Autofill.InlinePresentation InlineTooltipPresentation
+        /// <returns><see cref="Android.Widget.RemoteViews"/></returns>
+        public Android.Widget.RemoteViews GetDialogPresentation()
         {
-            get { return IExecuteWithSignature<Android.Service.Autofill.InlinePresentation>("getInlineTooltipPresentation", "()Landroid/service/autofill/InlinePresentation;"); }
+            return IExecuteWithSignature<Android.Widget.RemoteViews>("getDialogPresentation", "()Landroid/widget/RemoteViews;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/Presentations.html#getMenuPresentation()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/Presentations.html#getMenuPresentation()"/>
         /// </summary>
-        public Android.Widget.RemoteViews MenuPresentation
+        /// <returns><see cref="Android.Widget.RemoteViews"/></returns>
+        public Android.Widget.RemoteViews GetMenuPresentation()
         {
-            get { return IExecuteWithSignature<Android.Widget.RemoteViews>("getMenuPresentation", "()Landroid/widget/RemoteViews;"); }
+            return IExecuteWithSignature<Android.Widget.RemoteViews>("getMenuPresentation", "()Landroid/widget/RemoteViews;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/SaveRequest.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/SaveRequest.cs
index 4a2f8e72a..6c1e51f87 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/SaveRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/SaveRequest.cs
@@ -52,33 +52,36 @@ public partial class SaveRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#getClientState()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#getClientState()"/>
         /// </summary>
-        public Android.Os.Bundle ClientState
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetClientState()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getClientState", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getClientState", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#getDatasetIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> DatasetIds
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getDatasetIds", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#getFillContexts()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#getFillContexts()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Autofill.FillContext> FillContexts
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Autofill.FillContext> GetFillContexts()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Autofill.FillContext>>("getFillContexts", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Autofill.FillContext>>("getFillContexts", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#getDatasetIds()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetDatasetIds()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getDatasetIds", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/SaveRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/SavedDatasetsInfo.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/SavedDatasetsInfo.cs
index 689169dda..54067b918 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/SavedDatasetsInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/SavedDatasetsInfo.cs
@@ -67,18 +67,20 @@ public SavedDatasetsInfo(Java.Lang.String arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/SavedDatasetsInfo.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/SavedDatasetsInfo.html#getCount()"/>
         /// </summary>
-        public int Count
+        /// <returns><see cref="int"/></returns>
+        public int GetCount()
         {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
+            return IExecuteWithSignature<int>("getCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/SavedDatasetsInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/SavedDatasetsInfo.html#getType()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Autofill/UserData.cs b/src/net/Netdroid/Generated/Android/Service/Autofill/UserData.cs
index 3288975ab..38507017e 100644
--- a/src/net/Netdroid/Generated/Android/Service/Autofill/UserData.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Autofill/UserData.cs
@@ -48,59 +48,50 @@ public partial class UserData
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMaxCategoryCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMaxCategoryCount()"/>
         /// </summary>
-        public static int MaxCategoryCount
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxCategoryCount()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxCategoryCount", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxCategoryCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMaxFieldClassificationIdsSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMaxFieldClassificationIdsSize()"/>
         /// </summary>
-        public static int MaxFieldClassificationIdsSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxFieldClassificationIdsSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxFieldClassificationIdsSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxFieldClassificationIdsSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMaxUserDataSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMaxUserDataSize()"/>
         /// </summary>
-        public static int MaxUserDataSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxUserDataSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxUserDataSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxUserDataSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMaxValueLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMaxValueLength()"/>
         /// </summary>
-        public static int MaxValueLength
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxValueLength()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxValueLength", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxValueLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMinValueLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getMinValueLength()"/>
         /// </summary>
-        public static int MinValueLength
+        /// <returns><see cref="int"/></returns>
+        public static int GetMinValueLength()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMinValueLength", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMinValueLength", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getFieldClassificationAlgorithm()"/> 
-        /// </summary>
-        public Java.Lang.String FieldClassificationAlgorithm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFieldClassificationAlgorithm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -109,6 +100,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getFieldClassificationAlgorithm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFieldClassificationAlgorithm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getFieldClassificationAlgorithm", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getFieldClassificationAlgorithmForCategory(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -118,6 +117,14 @@ public Java.Lang.String GetFieldClassificationAlgorithmForCategory(Java.Lang.Str
             return IExecuteWithSignature<Java.Lang.String>("getFieldClassificationAlgorithmForCategory", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/autofill/UserData.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Carrier/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Carrier/AllPackageClasses.cs
index 72df915b1..7599f4441 100644
--- a/src/net/Netdroid/Generated/Android/Service/Carrier/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Carrier/AllPackageClasses.cs
@@ -124,12 +124,12 @@ public partial class CarrierMessagingService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CarrierMessagingService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CarrierMessagingService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CarrierMessagingService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CarrierMessagingService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CarrierMessagingService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CarrierMessagingService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -166,12 +166,12 @@ public partial class ResultCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Re
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ResultCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ResultCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -213,12 +213,12 @@ public partial class ResultCallback<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ResultCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ResultCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -395,12 +395,12 @@ public partial class CarrierService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CarrierService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CarrierService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CarrierService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CarrierService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CarrierService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CarrierService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierIdentifier.cs b/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierIdentifier.cs
index 1169c4a7f..469625f54 100644
--- a/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierIdentifier.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierIdentifier.cs
@@ -90,68 +90,76 @@ public CarrierIdentifier(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getCarrierId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#describeContents()"/>
         /// </summary>
-        public int CarrierId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCarrierId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getGid1()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getCarrierId()"/>
         /// </summary>
-        public Java.Lang.String Gid1
+        /// <returns><see cref="int"/></returns>
+        public int GetCarrierId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGid1", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getCarrierId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getGid2()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getSpecificCarrierId()"/>
         /// </summary>
-        public Java.Lang.String Gid2
+        /// <returns><see cref="int"/></returns>
+        public int GetSpecificCarrierId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGid2", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getSpecificCarrierId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getImsi()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getGid1()"/>
         /// </summary>
-        public Java.Lang.String Imsi
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGid1()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getImsi", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getGid1", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getMcc()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getGid2()"/>
         /// </summary>
-        public Java.Lang.String Mcc
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGid2()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMcc", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getGid2", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getMnc()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getImsi()"/>
         /// </summary>
-        public Java.Lang.String Mnc
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetImsi()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMnc", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getImsi", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getSpecificCarrierId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getMcc()"/>
         /// </summary>
-        public int SpecificCarrierId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMcc()
         {
-            get { return IExecuteWithSignature<int>("getSpecificCarrierId", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMcc", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getSpn()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getMnc()"/>
         /// </summary>
-        public Java.Lang.String Spn
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMnc()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSpn", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMnc", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#getSpn()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSpn()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getSpn", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierIdentifier.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierMessagingService.cs b/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierMessagingService.cs
index b42dd46d6..231e885ef 100644
--- a/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierMessagingService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierMessagingService.cs
@@ -130,7 +130,7 @@ public void OnDownloadMms(Android.Net.Uri arg0, int arg1, Android.Net.Uri arg2,
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Service.Carrier.CarrierMessagingService.ResultCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnFilterSms(Android.Service.Carrier.MessagePdu arg0, Java.Lang.String arg1, int arg2, int arg3, Android.Service.Carrier.CarrierMessagingService.ResultCallback<Java.Lang.Boolean> arg4)
         {
             IExecute("onFilterSms", arg0, arg1, arg2, arg3, arg4);
@@ -155,7 +155,7 @@ public void OnReceiveTextSms(Android.Service.Carrier.MessagePdu arg0, Java.Lang.
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="Android.Service.Carrier.CarrierMessagingService.ResultCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnSendDataSms(byte[] arg0, int arg1, Java.Lang.String arg2, int arg3, Android.Service.Carrier.CarrierMessagingService.ResultCallback<Android.Service.Carrier.CarrierMessagingService.SendSmsResult> arg4)
         {
             IExecute("onSendDataSms", arg0, arg1, arg2, arg3, arg4);
@@ -191,7 +191,7 @@ public void OnSendMms(Android.Net.Uri arg0, int arg1, Android.Net.Uri arg2, Andr
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Android.Service.Carrier.CarrierMessagingService.ResultCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnSendMultipartTextSms(Java.Util.List<Java.Lang.String> arg0, int arg1, Java.Lang.String arg2, Android.Service.Carrier.CarrierMessagingService.ResultCallback<Android.Service.Carrier.CarrierMessagingService.SendMultipartSmsResult> arg3)
         {
             IExecute("onSendMultipartTextSms", arg0, arg1, arg2, arg3);
@@ -215,7 +215,7 @@ public void OnSendMultipartTextSms(Java.Util.List<Java.Lang.String> arg0, int ar
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Android.Service.Carrier.CarrierMessagingService.ResultCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnSendTextSms(Java.Lang.String arg0, int arg1, Java.Lang.String arg2, Android.Service.Carrier.CarrierMessagingService.ResultCallback<Android.Service.Carrier.CarrierMessagingService.SendSmsResult> arg3)
         {
             IExecute("onSendTextSms", arg0, arg1, arg2, arg3);
@@ -350,18 +350,20 @@ public SendMmsResult(int arg0, byte[] arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendMmsResult.html#getSendConfPdu()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendMmsResult.html#getSendConfPdu()"/>
             /// </summary>
-            public byte[] SendConfPdu
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetSendConfPdu()
             {
-                get { return IExecuteWithSignatureArray<byte>("getSendConfPdu", "()[B"); }
+                return IExecuteWithSignatureArray<byte>("getSendConfPdu", "()[B");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendMmsResult.html#getSendStatus()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendMmsResult.html#getSendStatus()"/>
             /// </summary>
-            public int SendStatus
+            /// <returns><see cref="int"/></returns>
+            public int GetSendStatus()
             {
-                get { return IExecuteWithSignature<int>("getSendStatus", "()I"); }
+                return IExecuteWithSignature<int>("getSendStatus", "()I");
             }
 
             #endregion
@@ -404,18 +406,20 @@ public SendMultipartSmsResult(int arg0, int[] arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendMultipartSmsResult.html#getMessageRefs()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendMultipartSmsResult.html#getSendStatus()"/>
             /// </summary>
-            public int[] MessageRefs
+            /// <returns><see cref="int"/></returns>
+            public int GetSendStatus()
             {
-                get { return IExecuteWithSignatureArray<int>("getMessageRefs", "()[I"); }
+                return IExecuteWithSignature<int>("getSendStatus", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendMultipartSmsResult.html#getSendStatus()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendMultipartSmsResult.html#getMessageRefs()"/>
             /// </summary>
-            public int SendStatus
+            /// <returns><see cref="int"/></returns>
+            public int[] GetMessageRefs()
             {
-                get { return IExecuteWithSignature<int>("getSendStatus", "()I"); }
+                return IExecuteWithSignatureArray<int>("getMessageRefs", "()[I");
             }
 
             #endregion
@@ -458,18 +462,20 @@ public SendSmsResult(int arg0, int arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendSmsResult.html#getMessageRef()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendSmsResult.html#getMessageRef()"/>
             /// </summary>
-            public int MessageRef
+            /// <returns><see cref="int"/></returns>
+            public int GetMessageRef()
             {
-                get { return IExecuteWithSignature<int>("getMessageRef", "()I"); }
+                return IExecuteWithSignature<int>("getMessageRef", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendSmsResult.html#getSendStatus()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierMessagingService.SendSmsResult.html#getSendStatus()"/>
             /// </summary>
-            public int SendStatus
+            /// <returns><see cref="int"/></returns>
+            public int GetSendStatus()
             {
-                get { return IExecuteWithSignature<int>("getSendStatus", "()I"); }
+                return IExecuteWithSignature<int>("getSendStatus", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierService.cs b/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierService.cs
index ed8151285..f99294af4 100644
--- a/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Carrier/CarrierService.cs
@@ -56,7 +56,7 @@ public partial class CarrierService
         /// </summary>
         /// <param name="arg0"><see cref="Android.Service.Carrier.CarrierIdentifier"/></param>
         /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.PersistableBundle OnLoadConfig(Android.Service.Carrier.CarrierIdentifier arg0)
         {
             return IExecuteWithSignature<Android.Os.PersistableBundle>("onLoadConfig", "(Landroid/service/carrier/CarrierIdentifier;)Landroid/os/PersistableBundle;", arg0);
@@ -75,7 +75,7 @@ public Android.Os.PersistableBundle OnLoadConfig(int arg0, Android.Service.Carri
         /// <see href="https://developer.android.com/reference/android/service/carrier/CarrierService.html#notifyCarrierNetworkChange(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void NotifyCarrierNetworkChange(bool arg0)
         {
             IExecuteWithSignature("notifyCarrierNetworkChange", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Service/Carrier/MessagePdu.cs b/src/net/Netdroid/Generated/Android/Service/Carrier/MessagePdu.cs
index ca999c9b2..494aa945a 100644
--- a/src/net/Netdroid/Generated/Android/Service/Carrier/MessagePdu.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Carrier/MessagePdu.cs
@@ -60,13 +60,6 @@ public MessagePdu(Java.Util.List<byte[]> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/carrier/MessagePdu.html#getPdus()"/> 
-        /// </summary>
-        public Java.Util.List<byte[]> Pdus
-        {
-            get { return IExecuteWithSignature<Java.Util.List<byte[]>>("getPdus", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/carrier/MessagePdu.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/carrier/MessagePdu.html#getPdus()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<byte[]> GetPdus()
+        {
+            return IExecuteWithSignature<Java.Util.List<byte[]>>("getPdus", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/carrier/MessagePdu.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Chooser/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Chooser/AllPackageClasses.cs
index 8803e69f9..14212d47c 100644
--- a/src/net/Netdroid/Generated/Android/Service/Chooser/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Chooser/AllPackageClasses.cs
@@ -118,7 +118,7 @@ public Builder(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ChooserTarget : Android.Os.Parcelable
     {
         const string _bridgeClassName = "android.service.chooser.ChooserTarget";
@@ -163,19 +163,19 @@ public ChooserTarget(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTargetService.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ChooserTargetService : Android.App.Service
     {
         const string _bridgeClassName = "android.service.chooser.ChooserTargetService";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ChooserTargetService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChooserTargetService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChooserTargetService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ChooserTargetService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChooserTargetService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChooserTargetService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserAction.cs b/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserAction.cs
index 794731f21..094a54f97 100644
--- a/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserAction.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserAction.cs
@@ -52,25 +52,20 @@ public partial class ChooserAction
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserAction.html#getAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserAction.html#getAction()"/>
         /// </summary>
-        public Android.App.PendingIntent Action
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetAction()
         {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getAction", "()Landroid/app/PendingIntent;"); }
+            return IExecuteWithSignature<Android.App.PendingIntent>("getAction", "()Landroid/app/PendingIntent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserAction.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserAction.html#getIcon()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserAction.html#getLabel()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Label
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserAction.html#describeContents()"/>
@@ -81,6 +76,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserAction.html#getLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserAction.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserTarget.cs b/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserTarget.cs
index cd2d17f6d..1024ddccc 100644
--- a/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserTarget.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserTarget.cs
@@ -37,7 +37,7 @@ public partial class ChooserTarget
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg4"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ChooserTarget(Java.Lang.CharSequence arg0, Android.Graphics.Drawable.Icon arg1, float arg2, Android.Content.ComponentName arg3, Android.Os.Bundle arg4)
             : base(arg0, arg1, arg2, arg3, arg4)
         {
@@ -53,7 +53,7 @@ public ChooserTarget(Java.Lang.CharSequence arg0, Android.Graphics.Drawable.Icon
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#CREATOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
         private static Android.Os.Parcelable.Creator _CREATORContent = default;
         private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -66,60 +66,65 @@ public ChooserTarget(Java.Lang.CharSequence arg0, Android.Graphics.Drawable.Icon
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getComponentName()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getComponentName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.ComponentName ComponentName
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.ComponentName GetComponentName()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getIcon()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Drawable.Icon Icon
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Drawable.Icon GetIcon()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getIntentExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getIntentExtras()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Os.Bundle IntentExtras
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.Bundle GetIntentExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getIntentExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getIntentExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getScore()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getScore()"/>
         /// </summary>
-        [System.Obsolete()]
-        public float Score
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float GetScore()
         {
-            get { return IExecuteWithSignature<float>("getScore", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getTitle()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence Title
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<float>("getScore", "()F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int DescribeContents()
         {
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#getTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTarget.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
             IExecute("writeToParcel", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserTargetService.cs b/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserTargetService.cs
index 384622086..908253f10 100644
--- a/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserTargetService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Chooser/ChooserTargetService.cs
@@ -40,21 +40,21 @@ public partial class ChooserTargetService
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTargetService.html#BIND_PERMISSION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String BIND_PERMISSION { get { if (!_BIND_PERMISSIONReady) { _BIND_PERMISSIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "BIND_PERMISSION"); _BIND_PERMISSIONReady = true; } return _BIND_PERMISSIONContent; } }
         private static Java.Lang.String _BIND_PERMISSIONContent = default;
         private static bool _BIND_PERMISSIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTargetService.html#META_DATA_NAME"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String META_DATA_NAME { get { if (!_META_DATA_NAMEReady) { _META_DATA_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "META_DATA_NAME"); _META_DATA_NAMEReady = true; } return _META_DATA_NAMEContent; } }
         private static Java.Lang.String _META_DATA_NAMEContent = default;
         private static bool _META_DATA_NAMEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/chooser/ChooserTargetService.html#SERVICE_INTERFACE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SERVICE_INTERFACE { get { if (!_SERVICE_INTERFACEReady) { _SERVICE_INTERFACEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SERVICE_INTERFACE"); _SERVICE_INTERFACEReady = true; } return _SERVICE_INTERFACEContent; } }
         private static Java.Lang.String _SERVICE_INTERFACEContent = default;
         private static bool _SERVICE_INTERFACEReady = false; // this is used because in case of generics 
@@ -72,7 +72,7 @@ public partial class ChooserTargetService
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
         /// <param name="arg1"><see cref="Android.Content.IntentFilter"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.List<Android.Service.Chooser.ChooserTarget> OnGetChooserTargets(Android.Content.ComponentName arg0, Android.Content.IntentFilter arg1)
         {
             return IExecute<Java.Util.List<Android.Service.Chooser.ChooserTarget>>("onGetChooserTargets", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/AllPackageClasses.cs
index e7fb57312..d24a858ff 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/AllPackageClasses.cs
@@ -124,12 +124,12 @@ public partial class ControlAction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Con
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ControlAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ControlAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ControlAction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ControlAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ControlAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ControlAction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/BooleanAction.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/BooleanAction.cs
index 819333084..d6f1eac03 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/BooleanAction.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/BooleanAction.cs
@@ -65,11 +65,12 @@ public BooleanAction(Java.Lang.String arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/actions/BooleanAction.html#getNewState()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/actions/BooleanAction.html#getNewState()"/>
         /// </summary>
-        public bool NewState
+        /// <returns><see cref="bool"/></returns>
+        public bool GetNewState()
         {
-            get { return IExecuteWithSignature<bool>("getNewState", "()Z"); }
+            return IExecuteWithSignature<bool>("getNewState", "()Z");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/ControlAction.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/ControlAction.cs
index d3b299130..052683897 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/ControlAction.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/ControlAction.cs
@@ -108,11 +108,12 @@ public partial class ControlAction
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#getErrorAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#getErrorAction()"/>
         /// </summary>
-        public static Android.Service.Controls.Actions.ControlAction ErrorAction
+        /// <returns><see cref="Android.Service.Controls.Actions.ControlAction"/></returns>
+        public static Android.Service.Controls.Actions.ControlAction GetErrorAction()
         {
-            get { return SExecuteWithSignature<Android.Service.Controls.Actions.ControlAction>(LocalBridgeClazz, "getErrorAction", "()Landroid/service/controls/actions/ControlAction;"); }
+            return SExecuteWithSignature<Android.Service.Controls.Actions.ControlAction>(LocalBridgeClazz, "getErrorAction", "()Landroid/service/controls/actions/ControlAction;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#isValidResponse(int)"/>
@@ -128,25 +129,28 @@ public static bool IsValidResponse(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#getActionType()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#getActionType()"/>
         /// </summary>
-        public int ActionType
+        /// <returns><see cref="int"/></returns>
+        public int GetActionType()
         {
-            get { return IExecuteWithSignature<int>("getActionType", "()I"); }
+            return IExecuteWithSignature<int>("getActionType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#getChallengeValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#getChallengeValue()"/>
         /// </summary>
-        public Java.Lang.String ChallengeValue
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetChallengeValue()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getChallengeValue", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getChallengeValue", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#getTemplateId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ControlAction.html#getTemplateId()"/>
         /// </summary>
-        public Java.Lang.String TemplateId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTemplateId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTemplateId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTemplateId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/FloatAction.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/FloatAction.cs
index baccd8880..513584c10 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/FloatAction.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/FloatAction.cs
@@ -65,11 +65,12 @@ public FloatAction(Java.Lang.String arg0, float arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/actions/FloatAction.html#getNewValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/actions/FloatAction.html#getNewValue()"/>
         /// </summary>
-        public float NewValue
+        /// <returns><see cref="float"/></returns>
+        public float GetNewValue()
         {
-            get { return IExecuteWithSignature<float>("getNewValue", "()F"); }
+            return IExecuteWithSignature<float>("getNewValue", "()F");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/ModeAction.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/ModeAction.cs
index d8a8d10c1..d69775893 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Actions/ModeAction.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Actions/ModeAction.cs
@@ -65,11 +65,12 @@ public ModeAction(Java.Lang.String arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ModeAction.html#getNewMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/actions/ModeAction.html#getNewMode()"/>
         /// </summary>
-        public int NewMode
+        /// <returns><see cref="int"/></returns>
+        public int GetNewMode()
         {
-            get { return IExecuteWithSignature<int>("getNewMode", "()I"); }
+            return IExecuteWithSignature<int>("getNewMode", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Controls/AllPackageClasses.cs
index abb02a476..cc60535c0 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/AllPackageClasses.cs
@@ -168,12 +168,12 @@ public partial class ControlsProviderService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ControlsProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ControlsProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ControlsProviderService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ControlsProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ControlsProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ControlsProviderService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Control.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Control.cs
index 80c95c5e2..c83cca2f3 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Control.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Control.cs
@@ -82,104 +82,116 @@ public partial class Control
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getAppIntent()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getAppIntent()"/>
         /// </summary>
-        public Android.App.PendingIntent AppIntent
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetAppIntent()
         {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getAppIntent", "()Landroid/app/PendingIntent;"); }
+            return IExecuteWithSignature<Android.App.PendingIntent>("getAppIntent", "()Landroid/app/PendingIntent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getControlId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getCustomColor()"/>
         /// </summary>
-        public Java.Lang.String ControlId
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetCustomColor()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getControlId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getCustomColor", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getControlTemplate()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getCustomIcon()"/>
         /// </summary>
-        public Android.Service.Controls.Templates.ControlTemplate ControlTemplate
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetCustomIcon()
         {
-            get { return IExecuteWithSignature<Android.Service.Controls.Templates.ControlTemplate>("getControlTemplate", "()Landroid/service/controls/templates/ControlTemplate;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getCustomIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getCustomColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getControlTemplate()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList CustomColor
+        /// <returns><see cref="Android.Service.Controls.Templates.ControlTemplate"/></returns>
+        public Android.Service.Controls.Templates.ControlTemplate GetControlTemplate()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getCustomColor", "()Landroid/content/res/ColorStateList;"); }
+            return IExecuteWithSignature<Android.Service.Controls.Templates.ControlTemplate>("getControlTemplate", "()Landroid/service/controls/templates/ControlTemplate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getCustomIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#isAuthRequired()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon CustomIcon
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAuthRequired()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getCustomIcon", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<bool>("isAuthRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getDeviceType()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#describeContents()"/>
         /// </summary>
-        public int DeviceType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDeviceType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getDeviceType()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceType()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<int>("getDeviceType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getStatusText()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getStatus()"/>
         /// </summary>
-        public Java.Lang.CharSequence StatusText
+        /// <returns><see cref="int"/></returns>
+        public int GetStatus()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getStatusText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getStructure()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getStatusText()"/>
         /// </summary>
-        public Java.Lang.CharSequence Structure
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetStatusText()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getStructure", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getStatusText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getSubtitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getStructure()"/>
         /// </summary>
-        public Java.Lang.CharSequence Subtitle
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetStructure()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getStructure", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getSubtitle()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSubtitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getZone()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getTitle()"/>
         /// </summary>
-        public Java.Lang.CharSequence Zone
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getZone", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#isAuthRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getZone()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAuthRequired()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetZone()
         {
-            return IExecuteWithSignature<bool>("isAuthRequired", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getZone", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#getControlId()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetControlId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getControlId", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/controls/Control.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/AllPackageClasses.cs
index 93471224f..4f3b28d91 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class ControlTemplate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ControlTemplate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ControlTemplate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ControlTemplate() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ControlTemplate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ControlTemplate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ControlTemplate(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ControlButton.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ControlButton.cs
index 75e8d60ab..4f5976fe5 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ControlButton.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ControlButton.cs
@@ -61,13 +61,6 @@ public ControlButton(bool arg0, Java.Lang.CharSequence arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlButton.html#getActionDescription()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence ActionDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getActionDescription", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlButton.html#isChecked()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -84,6 +77,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlButton.html#getActionDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetActionDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getActionDescription", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlButton.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ControlTemplate.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ControlTemplate.cs
index 4911c7cbf..7418a70c3 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ControlTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ControlTemplate.cs
@@ -90,36 +90,40 @@ public partial class ControlTemplate
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlTemplate.html#getErrorTemplate()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlTemplate.html#getErrorTemplate()"/>
         /// </summary>
-        public static Android.Service.Controls.Templates.ControlTemplate ErrorTemplate
+        /// <returns><see cref="Android.Service.Controls.Templates.ControlTemplate"/></returns>
+        public static Android.Service.Controls.Templates.ControlTemplate GetErrorTemplate()
         {
-            get { return SExecuteWithSignature<Android.Service.Controls.Templates.ControlTemplate>(LocalBridgeClazz, "getErrorTemplate", "()Landroid/service/controls/templates/ControlTemplate;"); }
+            return SExecuteWithSignature<Android.Service.Controls.Templates.ControlTemplate>(LocalBridgeClazz, "getErrorTemplate", "()Landroid/service/controls/templates/ControlTemplate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlTemplate.html#getNoTemplateObject()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlTemplate.html#getNoTemplateObject()"/>
         /// </summary>
-        public static Android.Service.Controls.Templates.ControlTemplate NoTemplateObject
+        /// <returns><see cref="Android.Service.Controls.Templates.ControlTemplate"/></returns>
+        public static Android.Service.Controls.Templates.ControlTemplate GetNoTemplateObject()
         {
-            get { return SExecuteWithSignature<Android.Service.Controls.Templates.ControlTemplate>(LocalBridgeClazz, "getNoTemplateObject", "()Landroid/service/controls/templates/ControlTemplate;"); }
+            return SExecuteWithSignature<Android.Service.Controls.Templates.ControlTemplate>(LocalBridgeClazz, "getNoTemplateObject", "()Landroid/service/controls/templates/ControlTemplate;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlTemplate.html#getTemplateId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlTemplate.html#getTemplateType()"/>
         /// </summary>
-        public Java.Lang.String TemplateId
+        /// <returns><see cref="int"/></returns>
+        public int GetTemplateType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTemplateId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getTemplateType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlTemplate.html#getTemplateType()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ControlTemplate.html#getTemplateId()"/>
         /// </summary>
-        public int TemplateType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTemplateId()
         {
-            get { return IExecuteWithSignature<int>("getTemplateType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTemplateId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/RangeTemplate.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/RangeTemplate.cs
index bf91afae1..0a9e0ee69 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/RangeTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/RangeTemplate.cs
@@ -59,39 +59,44 @@ public RangeTemplate(Java.Lang.String arg0, float arg1, float arg2, float arg3,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getCurrentValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getCurrentValue()"/>
         /// </summary>
-        public float CurrentValue
+        /// <returns><see cref="float"/></returns>
+        public float GetCurrentValue()
         {
-            get { return IExecuteWithSignature<float>("getCurrentValue", "()F"); }
+            return IExecuteWithSignature<float>("getCurrentValue", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getFormatString()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getMaxValue()"/>
         /// </summary>
-        public Java.Lang.CharSequence FormatString
+        /// <returns><see cref="float"/></returns>
+        public float GetMaxValue()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getFormatString", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<float>("getMaxValue", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getMaxValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getMinValue()"/>
         /// </summary>
-        public float MaxValue
+        /// <returns><see cref="float"/></returns>
+        public float GetMinValue()
         {
-            get { return IExecuteWithSignature<float>("getMaxValue", "()F"); }
+            return IExecuteWithSignature<float>("getMinValue", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getMinValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getStepValue()"/>
         /// </summary>
-        public float MinValue
+        /// <returns><see cref="float"/></returns>
+        public float GetStepValue()
         {
-            get { return IExecuteWithSignature<float>("getMinValue", "()F"); }
+            return IExecuteWithSignature<float>("getStepValue", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getStepValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/RangeTemplate.html#getFormatString()"/>
         /// </summary>
-        public float StepValue
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetFormatString()
         {
-            get { return IExecuteWithSignature<float>("getStepValue", "()F"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getFormatString", "()Ljava/lang/CharSequence;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/TemperatureControlTemplate.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/TemperatureControlTemplate.cs
index 30c711b76..6c5223d98 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/TemperatureControlTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/TemperatureControlTemplate.cs
@@ -124,32 +124,36 @@ public TemperatureControlTemplate(Java.Lang.String arg0, Android.Service.Control
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate.html#getCurrentActiveMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate.html#getTemplate()"/>
         /// </summary>
-        public int CurrentActiveMode
+        /// <returns><see cref="Android.Service.Controls.Templates.ControlTemplate"/></returns>
+        public Android.Service.Controls.Templates.ControlTemplate GetTemplate()
         {
-            get { return IExecuteWithSignature<int>("getCurrentActiveMode", "()I"); }
+            return IExecuteWithSignature<Android.Service.Controls.Templates.ControlTemplate>("getTemplate", "()Landroid/service/controls/templates/ControlTemplate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate.html#getCurrentMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate.html#getCurrentActiveMode()"/>
         /// </summary>
-        public int CurrentMode
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentActiveMode()
         {
-            get { return IExecuteWithSignature<int>("getCurrentMode", "()I"); }
+            return IExecuteWithSignature<int>("getCurrentActiveMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate.html#getModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate.html#getCurrentMode()"/>
         /// </summary>
-        public int Modes
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentMode()
         {
-            get { return IExecuteWithSignature<int>("getModes", "()I"); }
+            return IExecuteWithSignature<int>("getCurrentMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate.html#getTemplate()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/TemperatureControlTemplate.html#getModes()"/>
         /// </summary>
-        public Android.Service.Controls.Templates.ControlTemplate Template
+        /// <returns><see cref="int"/></returns>
+        public int GetModes()
         {
-            get { return IExecuteWithSignature<Android.Service.Controls.Templates.ControlTemplate>("getTemplate", "()Landroid/service/controls/templates/ControlTemplate;"); }
+            return IExecuteWithSignature<int>("getModes", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ThumbnailTemplate.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ThumbnailTemplate.cs
index ac37964b6..dbaaf1dbb 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ThumbnailTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ThumbnailTemplate.cs
@@ -57,18 +57,12 @@ public ThumbnailTemplate(Java.Lang.String arg0, bool arg1, Android.Graphics.Draw
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ThumbnailTemplate.html#getContentDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ThumbnailTemplate.html#getThumbnail()"/>
         /// </summary>
-        public Java.Lang.CharSequence ContentDescription
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetThumbnail()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ThumbnailTemplate.html#getThumbnail()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Icon Thumbnail
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getThumbnail", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getThumbnail", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/controls/templates/ThumbnailTemplate.html#isActive()"/>
@@ -78,6 +72,14 @@ public bool IsActive()
         {
             return IExecuteWithSignature<bool>("isActive", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ThumbnailTemplate.html#getContentDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ToggleRangeTemplate.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ToggleRangeTemplate.cs
index 47014d01c..be015cd49 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ToggleRangeTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ToggleRangeTemplate.cs
@@ -67,18 +67,12 @@ public ToggleRangeTemplate(Java.Lang.String arg0, bool arg1, Java.Lang.CharSeque
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ToggleRangeTemplate.html#getActionDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ToggleRangeTemplate.html#getRange()"/>
         /// </summary>
-        public Java.Lang.CharSequence ActionDescription
+        /// <returns><see cref="Android.Service.Controls.Templates.RangeTemplate"/></returns>
+        public Android.Service.Controls.Templates.RangeTemplate GetRange()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getActionDescription", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ToggleRangeTemplate.html#getRange()"/> 
-        /// </summary>
-        public Android.Service.Controls.Templates.RangeTemplate Range
-        {
-            get { return IExecuteWithSignature<Android.Service.Controls.Templates.RangeTemplate>("getRange", "()Landroid/service/controls/templates/RangeTemplate;"); }
+            return IExecuteWithSignature<Android.Service.Controls.Templates.RangeTemplate>("getRange", "()Landroid/service/controls/templates/RangeTemplate;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/controls/templates/ToggleRangeTemplate.html#isChecked()"/>
@@ -88,6 +82,14 @@ public bool IsChecked()
         {
             return IExecuteWithSignature<bool>("isChecked", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ToggleRangeTemplate.html#getActionDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetActionDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getActionDescription", "()Ljava/lang/CharSequence;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ToggleTemplate.cs b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ToggleTemplate.cs
index 9266b54f7..426d240b0 100644
--- a/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ToggleTemplate.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Controls/Templates/ToggleTemplate.cs
@@ -55,13 +55,6 @@ public ToggleTemplate(Java.Lang.String arg0, Android.Service.Controls.Templates.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ToggleTemplate.html#getContentDescription()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence ContentDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/controls/templates/ToggleTemplate.html#isChecked()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -69,6 +62,14 @@ public bool IsChecked()
         {
             return IExecuteWithSignature<bool>("isChecked", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/controls/templates/ToggleTemplate.html#getContentDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/Action.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/Action.cs
index 96906ffb3..3ed04e1ec 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/Action.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/Action.cs
@@ -60,11 +60,12 @@ public Action(Android.App.Slice.Slice arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/Action.html#getSlice()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/Action.html#getSlice()"/>
         /// </summary>
-        public Android.App.Slice.Slice Slice
+        /// <returns><see cref="Android.App.Slice.Slice"/></returns>
+        public Android.App.Slice.Slice GetSlice()
         {
-            get { return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;"); }
+            return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/Action.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/AllPackageClasses.cs
index d09d519ac..dde2bec8e 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/AllPackageClasses.cs
@@ -652,12 +652,12 @@ public partial class CredentialProviderService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CredentialProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CredentialProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CredentialProviderService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CredentialProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CredentialProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CredentialProviderService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginCreateCredentialRequest.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginCreateCredentialRequest.cs
index 197f0f7f1..0730e565f 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginCreateCredentialRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginCreateCredentialRequest.cs
@@ -71,25 +71,20 @@ public BeginCreateCredentialRequest(Java.Lang.String arg0, Android.Os.Bundle arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialRequest.html#getCallingAppInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialRequest.html#getData()"/>
         /// </summary>
-        public Android.Service.Credentials.CallingAppInfo CallingAppInfo
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetData()
         {
-            get { return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialRequest.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialRequest.html#getCallingAppInfo()"/>
         /// </summary>
-        public Android.Os.Bundle Data
+        /// <returns><see cref="Android.Service.Credentials.CallingAppInfo"/></returns>
+        public Android.Service.Credentials.CallingAppInfo GetCallingAppInfo()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialRequest.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialRequest.html#describeContents()"/>
@@ -100,6 +95,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialRequest.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginCreateCredentialResponse.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginCreateCredentialResponse.cs
index 45dfef69b..82bec7ed9 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginCreateCredentialResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginCreateCredentialResponse.cs
@@ -52,18 +52,12 @@ public partial class BeginCreateCredentialResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialResponse.html#getCreateEntries()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialResponse.html#getRemoteCreateEntry()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Credentials.CreateEntry> CreateEntries
+        /// <returns><see cref="Android.Service.Credentials.RemoteEntry"/></returns>
+        public Android.Service.Credentials.RemoteEntry GetRemoteCreateEntry()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.CreateEntry>>("getCreateEntries", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialResponse.html#getRemoteCreateEntry()"/> 
-        /// </summary>
-        public Android.Service.Credentials.RemoteEntry RemoteCreateEntry
-        {
-            get { return IExecuteWithSignature<Android.Service.Credentials.RemoteEntry>("getRemoteCreateEntry", "()Landroid/service/credentials/RemoteEntry;"); }
+            return IExecuteWithSignature<Android.Service.Credentials.RemoteEntry>("getRemoteCreateEntry", "()Landroid/service/credentials/RemoteEntry;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialResponse.html#describeContents()"/>
@@ -74,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialResponse.html#getCreateEntries()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Credentials.CreateEntry> GetCreateEntries()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.CreateEntry>>("getCreateEntries", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/BeginCreateCredentialResponse.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialOption.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialOption.cs
index b2eff24f8..c87112e4e 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialOption.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialOption.cs
@@ -62,33 +62,36 @@ public BeginGetCredentialOption(Java.Lang.String arg0, Java.Lang.String arg1, An
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#getCandidateQueryData()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#getCandidateQueryData()"/>
         /// </summary>
-        public Android.Os.Bundle CandidateQueryData
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetCandidateQueryData()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getCandidateQueryData", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getCandidateQueryData", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#getId()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialOption.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialRequest.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialRequest.cs
index 3d07a59fb..f02d8f5b4 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialRequest.cs
@@ -52,18 +52,12 @@ public partial class BeginGetCredentialRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialRequest.html#getBeginGetCredentialOptions()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialRequest.html#getCallingAppInfo()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Credentials.BeginGetCredentialOption> BeginGetCredentialOptions
+        /// <returns><see cref="Android.Service.Credentials.CallingAppInfo"/></returns>
+        public Android.Service.Credentials.CallingAppInfo GetCallingAppInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.BeginGetCredentialOption>>("getBeginGetCredentialOptions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialRequest.html#getCallingAppInfo()"/> 
-        /// </summary>
-        public Android.Service.Credentials.CallingAppInfo CallingAppInfo
-        {
-            get { return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;"); }
+            return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialRequest.html#describeContents()"/>
@@ -74,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialRequest.html#getBeginGetCredentialOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Credentials.BeginGetCredentialOption> GetBeginGetCredentialOptions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.BeginGetCredentialOption>>("getBeginGetCredentialOptions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialResponse.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialResponse.cs
index 88cff4cf7..be7d63ba1 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/BeginGetCredentialResponse.cs
@@ -52,40 +52,44 @@ public partial class BeginGetCredentialResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#getActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#getRemoteCredentialEntry()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Credentials.Action> Actions
+        /// <returns><see cref="Android.Service.Credentials.RemoteEntry"/></returns>
+        public Android.Service.Credentials.RemoteEntry GetRemoteCredentialEntry()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.Action>>("getActions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Service.Credentials.RemoteEntry>("getRemoteCredentialEntry", "()Landroid/service/credentials/RemoteEntry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#getAuthenticationActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Credentials.Action> AuthenticationActions
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.Action>>("getAuthenticationActions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#getCredentialEntries()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#getActions()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Credentials.CredentialEntry> CredentialEntries
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Credentials.Action> GetActions()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.CredentialEntry>>("getCredentialEntries", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.Action>>("getActions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#getRemoteCredentialEntry()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#getAuthenticationActions()"/>
         /// </summary>
-        public Android.Service.Credentials.RemoteEntry RemoteCredentialEntry
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Credentials.Action> GetAuthenticationActions()
         {
-            get { return IExecuteWithSignature<Android.Service.Credentials.RemoteEntry>("getRemoteCredentialEntry", "()Landroid/service/credentials/RemoteEntry;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.Action>>("getAuthenticationActions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#getCredentialEntries()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Credentials.CredentialEntry> GetCredentialEntries()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Credentials.CredentialEntry>>("getCredentialEntries", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/BeginGetCredentialResponse.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/CallingAppInfo.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/CallingAppInfo.cs
index 1a0dbabcc..5465b9573 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/CallingAppInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/CallingAppInfo.cs
@@ -71,33 +71,36 @@ public CallingAppInfo(Java.Lang.String arg0, Android.Content.Pm.SigningInfo arg1
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#getOrigin()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#getSigningInfo()"/>
         /// </summary>
-        public Java.Lang.String Origin
+        /// <returns><see cref="Android.Content.Pm.SigningInfo"/></returns>
+        public Android.Content.Pm.SigningInfo GetSigningInfo()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOrigin", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.Pm.SigningInfo>("getSigningInfo", "()Landroid/content/pm/SigningInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#getSigningInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#getOrigin()"/>
         /// </summary>
-        public Android.Content.Pm.SigningInfo SigningInfo
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOrigin()
         {
-            get { return IExecuteWithSignature<Android.Content.Pm.SigningInfo>("getSigningInfo", "()Landroid/content/pm/SigningInfo;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getOrigin", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#getPackageName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/CallingAppInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/ClearCredentialStateRequest.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/ClearCredentialStateRequest.cs
index 746f2bba8..e78852467 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/ClearCredentialStateRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/ClearCredentialStateRequest.cs
@@ -61,18 +61,20 @@ public ClearCredentialStateRequest(Android.Service.Credentials.CallingAppInfo ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/ClearCredentialStateRequest.html#getCallingAppInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/ClearCredentialStateRequest.html#getData()"/>
         /// </summary>
-        public Android.Service.Credentials.CallingAppInfo CallingAppInfo
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetData()
         {
-            get { return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/ClearCredentialStateRequest.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/ClearCredentialStateRequest.html#getCallingAppInfo()"/>
         /// </summary>
-        public Android.Os.Bundle Data
+        /// <returns><see cref="Android.Service.Credentials.CallingAppInfo"/></returns>
+        public Android.Service.Credentials.CallingAppInfo GetCallingAppInfo()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/ClearCredentialStateRequest.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/CreateCredentialRequest.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/CreateCredentialRequest.cs
index 594e064c9..089034e71 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/CreateCredentialRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/CreateCredentialRequest.cs
@@ -62,25 +62,20 @@ public CreateCredentialRequest(Android.Service.Credentials.CallingAppInfo arg0,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CreateCredentialRequest.html#getCallingAppInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CreateCredentialRequest.html#getData()"/>
         /// </summary>
-        public Android.Service.Credentials.CallingAppInfo CallingAppInfo
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetData()
         {
-            get { return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CreateCredentialRequest.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CreateCredentialRequest.html#getCallingAppInfo()"/>
         /// </summary>
-        public Android.Os.Bundle Data
+        /// <returns><see cref="Android.Service.Credentials.CallingAppInfo"/></returns>
+        public Android.Service.Credentials.CallingAppInfo GetCallingAppInfo()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getData", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CreateCredentialRequest.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/CreateCredentialRequest.html#describeContents()"/>
@@ -91,6 +86,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CreateCredentialRequest.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/CreateCredentialRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/CreateEntry.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/CreateEntry.cs
index 2da3605bb..6250ca9dc 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/CreateEntry.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/CreateEntry.cs
@@ -60,11 +60,12 @@ public CreateEntry(Android.App.Slice.Slice arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CreateEntry.html#getSlice()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CreateEntry.html#getSlice()"/>
         /// </summary>
-        public Android.App.Slice.Slice Slice
+        /// <returns><see cref="Android.App.Slice.Slice"/></returns>
+        public Android.App.Slice.Slice GetSlice()
         {
-            get { return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;"); }
+            return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/CreateEntry.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/CredentialEntry.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/CredentialEntry.cs
index 17f245b01..68ca66b9b 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/CredentialEntry.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/CredentialEntry.cs
@@ -80,33 +80,36 @@ public CredentialEntry(Java.Lang.String arg0, Java.Lang.String arg1, Android.App
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#getBeginGetCredentialOptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#getSlice()"/>
         /// </summary>
-        public Java.Lang.String BeginGetCredentialOptionId
+        /// <returns><see cref="Android.App.Slice.Slice"/></returns>
+        public Android.App.Slice.Slice GetSlice()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBeginGetCredentialOptionId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#getSlice()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#describeContents()"/>
         /// </summary>
-        public Android.App.Slice.Slice Slice
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#getBeginGetCredentialOptionId()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBeginGetCredentialOptionId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getBeginGetCredentialOptionId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/CredentialEntry.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/GetCredentialRequest.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/GetCredentialRequest.cs
index f71128b23..00d9edff2 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/GetCredentialRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/GetCredentialRequest.cs
@@ -61,18 +61,12 @@ public GetCredentialRequest(Android.Service.Credentials.CallingAppInfo arg0, Jav
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/GetCredentialRequest.html#getCallingAppInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/GetCredentialRequest.html#getCallingAppInfo()"/>
         /// </summary>
-        public Android.Service.Credentials.CallingAppInfo CallingAppInfo
+        /// <returns><see cref="Android.Service.Credentials.CallingAppInfo"/></returns>
+        public Android.Service.Credentials.CallingAppInfo GetCallingAppInfo()
         {
-            get { return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/GetCredentialRequest.html#getCredentialOptions()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Credentials.CredentialOption> CredentialOptions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Credentials.CredentialOption>>("getCredentialOptions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Service.Credentials.CallingAppInfo>("getCallingAppInfo", "()Landroid/service/credentials/CallingAppInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/GetCredentialRequest.html#describeContents()"/>
@@ -83,6 +77,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/credentials/GetCredentialRequest.html#getCredentialOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Credentials.CredentialOption> GetCredentialOptions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Credentials.CredentialOption>>("getCredentialOptions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/GetCredentialRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Credentials/RemoteEntry.cs b/src/net/Netdroid/Generated/Android/Service/Credentials/RemoteEntry.cs
index c6e60fe80..6d865704d 100644
--- a/src/net/Netdroid/Generated/Android/Service/Credentials/RemoteEntry.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Credentials/RemoteEntry.cs
@@ -60,11 +60,12 @@ public RemoteEntry(Android.App.Slice.Slice arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/credentials/RemoteEntry.html#getSlice()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/credentials/RemoteEntry.html#getSlice()"/>
         /// </summary>
-        public Android.App.Slice.Slice Slice
+        /// <returns><see cref="Android.App.Slice.Slice"/></returns>
+        public Android.App.Slice.Slice GetSlice()
         {
-            get { return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;"); }
+            return IExecuteWithSignature<Android.App.Slice.Slice>("getSlice", "()Landroid/app/slice/Slice;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/credentials/RemoteEntry.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Dreams/DreamService.cs b/src/net/Netdroid/Generated/Android/Service/Dreams/DreamService.cs
index 293dbf2d9..aefc5a756 100644
--- a/src/net/Netdroid/Generated/Android/Service/Dreams/DreamService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Dreams/DreamService.cs
@@ -58,28 +58,14 @@ public partial class DreamService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/dreams/DreamService.html#getWindow()"/> 
-        /// </summary>
-        public Android.View.Window Window
-        {
-            get { return IExecuteWithSignature<Android.View.Window>("getWindow", "()Landroid/view/Window;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/dreams/DreamService.html#getWindowManager()"/> 
-        /// </summary>
-        public Android.View.WindowManager WindowManager
-        {
-            get { return IExecuteWithSignature<Android.View.WindowManager>("getWindowManager", "()Landroid/view/WindowManager;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/dreams/DreamService.html#findViewById(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T FindViewById<T>(int arg0) where T: Android.View.View
+        public T FindViewById<T>(int arg0) where T : Android.View.View
         {
-            return IExecuteWithSignature<T>("findViewById", "(I)Landroid/view/View;", arg0);
+            return IExecute<T>("findViewById", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/dreams/DreamService.html#onWindowStartingActionMode(android.view.ActionMode.Callback,int)"/>
@@ -110,6 +96,22 @@ public Android.View.View OnCreatePanelView(int arg0)
             return IExecuteWithSignature<Android.View.View>("onCreatePanelView", "(I)Landroid/view/View;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/dreams/DreamService.html#getWindow()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Window"/></returns>
+        public Android.View.Window GetWindow()
+        {
+            return IExecuteWithSignature<Android.View.Window>("getWindow", "()Landroid/view/Window;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/dreams/DreamService.html#getWindowManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.WindowManager"/></returns>
+        public Android.View.WindowManager GetWindowManager()
+        {
+            return IExecuteWithSignature<Android.View.WindowManager>("getWindowManager", "()Landroid/view/WindowManager;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/dreams/DreamService.html#dispatchGenericMotionEvent(android.view.MotionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
@@ -251,9 +253,9 @@ public bool OnSearchRequested(Android.View.SearchEvent arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T RequireViewById<T>(int arg0) where T: Android.View.View
+        public T RequireViewById<T>(int arg0) where T : Android.View.View
         {
-            return IExecuteWithSignature<T>("requireViewById", "(I)Landroid/view/View;", arg0);
+            return IExecute<T>("requireViewById", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/dreams/DreamService.html#finish()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Media/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Media/AllPackageClasses.cs
index f4be79c9a..8bdd7bea7 100644
--- a/src/net/Netdroid/Generated/Android/Service/Media/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Media/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class CameraPrewarmService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CameraPrewarmService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraPrewarmService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraPrewarmService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CameraPrewarmService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CameraPrewarmService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CameraPrewarmService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -82,12 +82,12 @@ public partial class MediaBrowserService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MediaBrowserService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaBrowserService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaBrowserService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MediaBrowserService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MediaBrowserService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MediaBrowserService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Media/MediaBrowserService.cs b/src/net/Netdroid/Generated/Android/Service/Media/MediaBrowserService.cs
index 1faf85fb0..612897881 100644
--- a/src/net/Netdroid/Generated/Android/Service/Media/MediaBrowserService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Media/MediaBrowserService.cs
@@ -52,27 +52,6 @@ public partial class MediaBrowserService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#getBrowserRootHints()"/> 
-        /// </summary>
-        public Android.Os.Bundle BrowserRootHints
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getBrowserRootHints", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#getCurrentBrowserInfo()"/> 
-        /// </summary>
-        public Android.Media.Session.MediaSessionManager.RemoteUserInfo CurrentBrowserInfo
-        {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaSessionManager.RemoteUserInfo>("getCurrentBrowserInfo", "()Landroid/media/session/MediaSessionManager$RemoteUserInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#getSessionToken()"/> <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#setSessionToken(android.media.session.MediaSession.Token)"/>
-        /// </summary>
-        public Android.Media.Session.MediaSession.Token SessionToken
-        {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getSessionToken", "()Landroid/media/session/MediaSession$Token;"); } set { IExecuteWithSignature("setSessionToken", "(Landroid/media/session/MediaSession$Token;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#onGetRoot(java.lang.String,int,android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -93,6 +72,30 @@ public void OnLoadChildren(Java.Lang.String arg0, Android.Service.Media.MediaBro
             IExecute("onLoadChildren", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#getSessionToken()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Session.MediaSession.Token"/></returns>
+        public Android.Media.Session.MediaSession.Token GetSessionToken()
+        {
+            return IExecuteWithSignature<Android.Media.Session.MediaSession.Token>("getSessionToken", "()Landroid/media/session/MediaSession$Token;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#getCurrentBrowserInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Session.MediaSessionManager.RemoteUserInfo"/></returns>
+        public Android.Media.Session.MediaSessionManager.RemoteUserInfo GetCurrentBrowserInfo()
+        {
+            return IExecuteWithSignature<Android.Media.Session.MediaSessionManager.RemoteUserInfo>("getCurrentBrowserInfo", "()Landroid/media/session/MediaSessionManager$RemoteUserInfo;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#getBrowserRootHints()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetBrowserRootHints()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getBrowserRootHints", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#dump(java.io.FileDescriptor,java.io.PrintWriter,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
@@ -138,6 +141,14 @@ public void OnLoadItem(Java.Lang.String arg0, Android.Service.Media.MediaBrowser
         {
             IExecute("onLoadItem", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.html#setSessionToken(android.media.session.MediaSession.Token)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Session.MediaSession.Token"/></param>
+        public void SetSessionToken(Android.Media.Session.MediaSession.Token arg0)
+        {
+            IExecuteWithSignature("setSessionToken", "(Landroid/media/session/MediaSession$Token;)V", arg0);
+        }
 
         #endregion
 
@@ -190,18 +201,20 @@ public BrowserRoot(Java.Lang.String arg0, Android.Os.Bundle arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.BrowserRoot.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.BrowserRoot.html#getExtras()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.BrowserRoot.html#getRootId()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/media/MediaBrowserService.BrowserRoot.html#getRootId()"/>
             /// </summary>
-            public Java.Lang.String RootId
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetRootId()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getRootId", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getRootId", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Service/Notification/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Notification/AllPackageClasses.cs
index 95f060397..b8ea01532 100644
--- a/src/net/Netdroid/Generated/Android/Service/Notification/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Notification/AllPackageClasses.cs
@@ -74,19 +74,19 @@ public Condition(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ConditionProviderService : Android.App.Service
     {
         const string _bridgeClassName = "android.service.notification.ConditionProviderService";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ConditionProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConditionProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConditionProviderService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ConditionProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConditionProviderService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConditionProviderService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -127,12 +127,12 @@ public partial class NotificationListenerService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NotificationListenerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NotificationListenerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NotificationListenerService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NotificationListenerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NotificationListenerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NotificationListenerService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Notification/ConditionProviderService.cs b/src/net/Netdroid/Generated/Android/Service/Notification/ConditionProviderService.cs
index 25d944078..f5870e937 100644
--- a/src/net/Netdroid/Generated/Android/Service/Notification/ConditionProviderService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Notification/ConditionProviderService.cs
@@ -40,35 +40,35 @@ public partial class ConditionProviderService
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#EXTRA_RULE_ID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_RULE_ID { get { if (!_EXTRA_RULE_IDReady) { _EXTRA_RULE_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_RULE_ID"); _EXTRA_RULE_IDReady = true; } return _EXTRA_RULE_IDContent; } }
         private static Java.Lang.String _EXTRA_RULE_IDContent = default;
         private static bool _EXTRA_RULE_IDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#META_DATA_CONFIGURATION_ACTIVITY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String META_DATA_CONFIGURATION_ACTIVITY { get { if (!_META_DATA_CONFIGURATION_ACTIVITYReady) { _META_DATA_CONFIGURATION_ACTIVITYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "META_DATA_CONFIGURATION_ACTIVITY"); _META_DATA_CONFIGURATION_ACTIVITYReady = true; } return _META_DATA_CONFIGURATION_ACTIVITYContent; } }
         private static Java.Lang.String _META_DATA_CONFIGURATION_ACTIVITYContent = default;
         private static bool _META_DATA_CONFIGURATION_ACTIVITYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#META_DATA_RULE_INSTANCE_LIMIT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String META_DATA_RULE_INSTANCE_LIMIT { get { if (!_META_DATA_RULE_INSTANCE_LIMITReady) { _META_DATA_RULE_INSTANCE_LIMITContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "META_DATA_RULE_INSTANCE_LIMIT"); _META_DATA_RULE_INSTANCE_LIMITReady = true; } return _META_DATA_RULE_INSTANCE_LIMITContent; } }
         private static Java.Lang.String _META_DATA_RULE_INSTANCE_LIMITContent = default;
         private static bool _META_DATA_RULE_INSTANCE_LIMITReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#META_DATA_RULE_TYPE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String META_DATA_RULE_TYPE { get { if (!_META_DATA_RULE_TYPEReady) { _META_DATA_RULE_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "META_DATA_RULE_TYPE"); _META_DATA_RULE_TYPEReady = true; } return _META_DATA_RULE_TYPEContent; } }
         private static Java.Lang.String _META_DATA_RULE_TYPEContent = default;
         private static bool _META_DATA_RULE_TYPEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#SERVICE_INTERFACE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SERVICE_INTERFACE { get { if (!_SERVICE_INTERFACEReady) { _SERVICE_INTERFACEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SERVICE_INTERFACE"); _SERVICE_INTERFACEReady = true; } return _SERVICE_INTERFACEContent; } }
         private static Java.Lang.String _SERVICE_INTERFACEContent = default;
         private static bool _SERVICE_INTERFACEReady = false; // this is used because in case of generics 
@@ -80,7 +80,7 @@ public partial class ConditionProviderService
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#requestRebind(android.content.ComponentName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.ComponentName"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void RequestRebind(Android.Content.ComponentName arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "requestRebind", "(Landroid/content/ComponentName;)V", arg0);
@@ -92,7 +92,7 @@ public static void RequestRebind(Android.Content.ComponentName arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#onConnected()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnConnected()
         {
             IExecuteWithSignature("onConnected", "()V");
@@ -101,7 +101,7 @@ public void OnConnected()
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#onSubscribe(android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnSubscribe(Android.Net.Uri arg0)
         {
             IExecuteWithSignature("onSubscribe", "(Landroid/net/Uri;)V", arg0);
@@ -110,7 +110,7 @@ public void OnSubscribe(Android.Net.Uri arg0)
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#onUnsubscribe(android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnUnsubscribe(Android.Net.Uri arg0)
         {
             IExecuteWithSignature("onUnsubscribe", "(Landroid/net/Uri;)V", arg0);
@@ -119,7 +119,7 @@ public void OnUnsubscribe(Android.Net.Uri arg0)
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#notifyCondition(android.service.notification.Condition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Service.Notification.Condition"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void NotifyCondition(Android.Service.Notification.Condition arg0)
         {
             IExecuteWithSignature("notifyCondition", "(Landroid/service/notification/Condition;)V", arg0);
@@ -128,7 +128,7 @@ public void NotifyCondition(Android.Service.Notification.Condition arg0)
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#notifyConditions(android.service.notification.Condition[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Service.Notification.Condition"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void NotifyConditions(params Android.Service.Notification.Condition[] arg0)
         {
             if (arg0.Length == 0) IExecuteWithSignature("notifyConditions", "([Landroid/service/notification/Condition;)V"); else IExecuteWithSignature("notifyConditions", "([Landroid/service/notification/Condition;)V", arg0);
@@ -136,7 +136,7 @@ public void NotifyConditions(params Android.Service.Notification.Condition[] arg
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#requestUnbind()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestUnbind()
         {
             IExecuteWithSignature("requestUnbind", "()V");
@@ -145,7 +145,7 @@ public void RequestUnbind()
         /// <see href="https://developer.android.com/reference/android/service/notification/ConditionProviderService.html#onRequestConditions(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnRequestConditions(int arg0)
         {
             IExecuteWithSignature("onRequestConditions", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Service/Notification/NotificationListenerService.cs b/src/net/Netdroid/Generated/Android/Service/Notification/NotificationListenerService.cs
index 47a19f5e6..8fd073274 100644
--- a/src/net/Netdroid/Generated/Android/Service/Notification/NotificationListenerService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Notification/NotificationListenerService.cs
@@ -268,14 +268,14 @@ public partial class NotificationListenerService
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#SUPPRESSED_EFFECT_SCREEN_OFF"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SUPPRESSED_EFFECT_SCREEN_OFF { get { if (!_SUPPRESSED_EFFECT_SCREEN_OFFReady) { _SUPPRESSED_EFFECT_SCREEN_OFFContent = SGetField<int>(LocalBridgeClazz, "SUPPRESSED_EFFECT_SCREEN_OFF"); _SUPPRESSED_EFFECT_SCREEN_OFFReady = true; } return _SUPPRESSED_EFFECT_SCREEN_OFFContent; } }
         private static int _SUPPRESSED_EFFECT_SCREEN_OFFContent = default;
         private static bool _SUPPRESSED_EFFECT_SCREEN_OFFReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#SUPPRESSED_EFFECT_SCREEN_ON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SUPPRESSED_EFFECT_SCREEN_ON { get { if (!_SUPPRESSED_EFFECT_SCREEN_ONReady) { _SUPPRESSED_EFFECT_SCREEN_ONContent = SGetField<int>(LocalBridgeClazz, "SUPPRESSED_EFFECT_SCREEN_ON"); _SUPPRESSED_EFFECT_SCREEN_ONReady = true; } return _SUPPRESSED_EFFECT_SCREEN_ONContent; } }
         private static int _SUPPRESSED_EFFECT_SCREEN_ONContent = default;
         private static bool _SUPPRESSED_EFFECT_SCREEN_ONReady = false; // this is used because in case of generics 
@@ -334,48 +334,53 @@ public static void RequestUnbind(Android.Content.ComponentName arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getActiveNotifications()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getCurrentRanking()"/>
         /// </summary>
-        public Android.Service.Notification.StatusBarNotification[] ActiveNotifications
+        /// <returns><see cref="Android.Service.Notification.NotificationListenerService.RankingMap"/></returns>
+        public Android.Service.Notification.NotificationListenerService.RankingMap GetCurrentRanking()
         {
-            get { return IExecuteWithSignatureArray<Android.Service.Notification.StatusBarNotification>("getActiveNotifications", "()[Landroid/service/notification/StatusBarNotification;"); }
+            return IExecuteWithSignature<Android.Service.Notification.NotificationListenerService.RankingMap>("getCurrentRanking", "()Landroid/service/notification/NotificationListenerService$RankingMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getCurrentInterruptionFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getActiveNotifications()"/>
         /// </summary>
-        public int CurrentInterruptionFilter
+        /// <returns><see cref="Android.Service.Notification.StatusBarNotification"/></returns>
+        public Android.Service.Notification.StatusBarNotification[] GetActiveNotifications()
         {
-            get { return IExecuteWithSignature<int>("getCurrentInterruptionFilter", "()I"); }
+            return IExecuteWithSignatureArray<Android.Service.Notification.StatusBarNotification>("getActiveNotifications", "()[Landroid/service/notification/StatusBarNotification;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getCurrentListenerHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getActiveNotifications(java.lang.String[])"/>
         /// </summary>
-        public int CurrentListenerHints
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Service.Notification.StatusBarNotification"/></returns>
+        public Android.Service.Notification.StatusBarNotification[] GetActiveNotifications(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignature<int>("getCurrentListenerHints", "()I"); }
+            return IExecuteWithSignatureArray<Android.Service.Notification.StatusBarNotification>("getActiveNotifications", "([Ljava/lang/String;)[Landroid/service/notification/StatusBarNotification;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getCurrentRanking()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getSnoozedNotifications()"/>
         /// </summary>
-        public Android.Service.Notification.NotificationListenerService.RankingMap CurrentRanking
+        /// <returns><see cref="Android.Service.Notification.StatusBarNotification"/></returns>
+        public Android.Service.Notification.StatusBarNotification[] GetSnoozedNotifications()
         {
-            get { return IExecuteWithSignature<Android.Service.Notification.NotificationListenerService.RankingMap>("getCurrentRanking", "()Landroid/service/notification/NotificationListenerService$RankingMap;"); }
+            return IExecuteWithSignatureArray<Android.Service.Notification.StatusBarNotification>("getSnoozedNotifications", "()[Landroid/service/notification/StatusBarNotification;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getSnoozedNotifications()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getCurrentInterruptionFilter()"/>
         /// </summary>
-        public Android.Service.Notification.StatusBarNotification[] SnoozedNotifications
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentInterruptionFilter()
         {
-            get { return IExecuteWithSignatureArray<Android.Service.Notification.StatusBarNotification>("getSnoozedNotifications", "()[Landroid/service/notification/StatusBarNotification;"); }
+            return IExecuteWithSignature<int>("getCurrentInterruptionFilter", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getActiveNotifications(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getCurrentListenerHints()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Service.Notification.StatusBarNotification"/></returns>
-        public Android.Service.Notification.StatusBarNotification[] GetActiveNotifications(Java.Lang.String[] arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentListenerHints()
         {
-            return IExecuteWithSignatureArray<Android.Service.Notification.StatusBarNotification>("getActiveNotifications", "([Ljava/lang/String;)[Landroid/service/notification/StatusBarNotification;", new object[] { arg0 });
+            return IExecuteWithSignature<int>("getCurrentListenerHints", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.html#getNotificationChannels(java.lang.String,android.os.UserHandle)"/>
@@ -410,7 +415,7 @@ public void CancelAllNotifications()
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CancelNotification(Java.Lang.String arg0, Java.Lang.String arg1, int arg2)
         {
             IExecute("cancelNotification", arg0, arg1, arg2);
@@ -658,143 +663,156 @@ public partial class Ranking
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getChannel()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getChannel()"/>
             /// </summary>
-            public Android.App.NotificationChannel Channel
+            /// <returns><see cref="Android.App.NotificationChannel"/></returns>
+            public Android.App.NotificationChannel GetChannel()
             {
-                get { return IExecuteWithSignature<Android.App.NotificationChannel>("getChannel", "()Landroid/app/NotificationChannel;"); }
+                return IExecuteWithSignature<Android.App.NotificationChannel>("getChannel", "()Landroid/app/NotificationChannel;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getConversationShortcutInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getConversationShortcutInfo()"/>
             /// </summary>
-            public Android.Content.Pm.ShortcutInfo ConversationShortcutInfo
+            /// <returns><see cref="Android.Content.Pm.ShortcutInfo"/></returns>
+            public Android.Content.Pm.ShortcutInfo GetConversationShortcutInfo()
             {
-                get { return IExecuteWithSignature<Android.Content.Pm.ShortcutInfo>("getConversationShortcutInfo", "()Landroid/content/pm/ShortcutInfo;"); }
+                return IExecuteWithSignature<Android.Content.Pm.ShortcutInfo>("getConversationShortcutInfo", "()Landroid/content/pm/ShortcutInfo;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getImportance()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#canBubble()"/>
             /// </summary>
-            public int Importance
+            /// <returns><see cref="bool"/></returns>
+            public bool CanBubble()
             {
-                get { return IExecuteWithSignature<int>("getImportance", "()I"); }
+                return IExecuteWithSignature<bool>("canBubble", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getImportanceExplanation()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#canShowBadge()"/>
             /// </summary>
-            public Java.Lang.CharSequence ImportanceExplanation
+            /// <returns><see cref="bool"/></returns>
+            public bool CanShowBadge()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getImportanceExplanation", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<bool>("canShowBadge", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getKey()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#isAmbient()"/>
             /// </summary>
-            public Java.Lang.String Key
+            /// <returns><see cref="bool"/></returns>
+            public bool IsAmbient()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isAmbient", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getLastAudiblyAlertedMillis()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#isConversation()"/>
             /// </summary>
-            public long LastAudiblyAlertedMillis
+            /// <returns><see cref="bool"/></returns>
+            public bool IsConversation()
             {
-                get { return IExecuteWithSignature<long>("getLastAudiblyAlertedMillis", "()J"); }
+                return IExecuteWithSignature<bool>("isConversation", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getLockscreenVisibilityOverride()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#isSuspended()"/>
             /// </summary>
-            public int LockscreenVisibilityOverride
+            /// <returns><see cref="bool"/></returns>
+            public bool IsSuspended()
             {
-                get { return IExecuteWithSignature<int>("getLockscreenVisibilityOverride", "()I"); }
+                return IExecuteWithSignature<bool>("isSuspended", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getOverrideGroupKey()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#matchesInterruptionFilter()"/>
             /// </summary>
-            public Java.Lang.String OverrideGroupKey
+            /// <returns><see cref="bool"/></returns>
+            public bool MatchesInterruptionFilter()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getOverrideGroupKey", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("matchesInterruptionFilter", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getRank()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getImportance()"/>
             /// </summary>
-            public int Rank
+            /// <returns><see cref="int"/></returns>
+            public int GetImportance()
             {
-                get { return IExecuteWithSignature<int>("getRank", "()I"); }
+                return IExecuteWithSignature<int>("getImportance", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getSmartActions()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getLockscreenVisibilityOverride()"/>
             /// </summary>
-            public Java.Util.List<Android.App.Notification.Action> SmartActions
+            /// <returns><see cref="int"/></returns>
+            public int GetLockscreenVisibilityOverride()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.App.Notification.Action>>("getSmartActions", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("getLockscreenVisibilityOverride", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getSmartReplies()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getRank()"/>
             /// </summary>
-            public Java.Util.List<Java.Lang.CharSequence> SmartReplies
+            /// <returns><see cref="int"/></returns>
+            public int GetRank()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.CharSequence>>("getSmartReplies", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("getRank", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getSuppressedVisualEffects()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getSuppressedVisualEffects()"/>
             /// </summary>
-            public int SuppressedVisualEffects
+            /// <returns><see cref="int"/></returns>
+            public int GetSuppressedVisualEffects()
             {
-                get { return IExecuteWithSignature<int>("getSuppressedVisualEffects", "()I"); }
+                return IExecuteWithSignature<int>("getSuppressedVisualEffects", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getUserSentiment()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getUserSentiment()"/>
             /// </summary>
-            public int UserSentiment
+            /// <returns><see cref="int"/></returns>
+            public int GetUserSentiment()
             {
-                get { return IExecuteWithSignature<int>("getUserSentiment", "()I"); }
+                return IExecuteWithSignature<int>("getUserSentiment", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#canBubble()"/>
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getImportanceExplanation()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool CanBubble()
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetImportanceExplanation()
             {
-                return IExecuteWithSignature<bool>("canBubble", "()Z");
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getImportanceExplanation", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#canShowBadge()"/>
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getKey()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool CanShowBadge()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetKey()
             {
-                return IExecuteWithSignature<bool>("canShowBadge", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#isAmbient()"/>
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getOverrideGroupKey()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsAmbient()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetOverrideGroupKey()
             {
-                return IExecuteWithSignature<bool>("isAmbient", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getOverrideGroupKey", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#isConversation()"/>
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getSmartActions()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsConversation()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.App.Notification.Action> GetSmartActions()
             {
-                return IExecuteWithSignature<bool>("isConversation", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Android.App.Notification.Action>>("getSmartActions", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#isSuspended()"/>
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getSmartReplies()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsSuspended()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Java.Lang.CharSequence> GetSmartReplies()
             {
-                return IExecuteWithSignature<bool>("isSuspended", "()Z");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.CharSequence>>("getSmartReplies", "()Ljava/util/List;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#matchesInterruptionFilter()"/>
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.Ranking.html#getLastAudiblyAlertedMillis()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool MatchesInterruptionFilter()
+            /// <returns><see cref="long"/></returns>
+            public long GetLastAudiblyAlertedMillis()
             {
-                return IExecuteWithSignature<bool>("matchesInterruptionFilter", "()Z");
+                return IExecuteWithSignature<long>("getLastAudiblyAlertedMillis", "()J");
             }
 
             #endregion
@@ -834,13 +852,6 @@ public partial class RankingMap
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.RankingMap.html#getOrderedKeys()"/> 
-            /// </summary>
-            public Java.Lang.String[] OrderedKeys
-            {
-                get { return IExecuteWithSignatureArray<Java.Lang.String>("getOrderedKeys", "()[Ljava/lang/String;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.RankingMap.html#getRanking(java.lang.String,android.service.notification.NotificationListenerService.Ranking)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -859,6 +870,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.RankingMap.html#getOrderedKeys()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String[] GetOrderedKeys()
+            {
+                return IExecuteWithSignatureArray<Java.Lang.String>("getOrderedKeys", "()[Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/notification/NotificationListenerService.RankingMap.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Notification/StatusBarNotification.cs b/src/net/Netdroid/Generated/Android/Service/Notification/StatusBarNotification.cs
index de6b02fcf..8b56b6a02 100644
--- a/src/net/Netdroid/Generated/Android/Service/Notification/StatusBarNotification.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Notification/StatusBarNotification.cs
@@ -50,7 +50,7 @@ public StatusBarNotification(Android.Os.Parcel arg0)
         /// <param name="arg7"><see cref="Android.App.Notification"/></param>
         /// <param name="arg8"><see cref="Android.Os.UserHandle"/></param>
         /// <param name="arg9"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public StatusBarNotification(Java.Lang.String arg0, Java.Lang.String arg1, int arg2, Java.Lang.String arg3, int arg4, int arg5, int arg6, Android.App.Notification arg7, Android.Os.UserHandle arg8, long arg9)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
         {
@@ -78,137 +78,157 @@ public StatusBarNotification(Java.Lang.String arg0, Java.Lang.String arg1, int a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getGroupKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getNotification()"/>
         /// </summary>
-        public Java.Lang.String GroupKey
+        /// <returns><see cref="Android.App.Notification"/></returns>
+        public Android.App.Notification GetNotification()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGroupKey", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.App.Notification>("getNotification", "()Landroid/app/Notification;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getUser()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetUser()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.Os.UserHandle>("getUser", "()Landroid/os/UserHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#clone()"/>
         /// </summary>
-        public Java.Lang.String Key
+        /// <returns><see cref="Android.Service.Notification.StatusBarNotification"/></returns>
+        public Android.Service.Notification.StatusBarNotification Clone()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Service.Notification.StatusBarNotification>("clone", "()Landroid/service/notification/StatusBarNotification;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getNotification()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#isAppGroup()"/>
         /// </summary>
-        public Android.App.Notification Notification
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAppGroup()
         {
-            get { return IExecuteWithSignature<Android.App.Notification>("getNotification", "()Landroid/app/Notification;"); }
+            return IExecuteWithSignature<bool>("isAppGroup", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getOpPkg()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#isClearable()"/>
         /// </summary>
-        public Java.Lang.String OpPkg
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClearable()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOpPkg", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isClearable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getOverrideGroupKey()"/> <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#setOverrideGroupKey(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#isGroup()"/>
         /// </summary>
-        public Java.Lang.String OverrideGroupKey
+        /// <returns><see cref="bool"/></returns>
+        public bool IsGroup()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOverrideGroupKey", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setOverrideGroupKey", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isGroup", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#isOngoing()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOngoing()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isOngoing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getPostTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#describeContents()"/>
         /// </summary>
-        public long PostTime
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getPostTime", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getId()"/>
         /// </summary>
-        public Java.Lang.String Tag
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getUid()"/>
         /// </summary>
-        public int Uid
+        /// <returns><see cref="int"/></returns>
+        public int GetUid()
         {
-            get { return IExecuteWithSignature<int>("getUid", "()I"); }
+            return IExecuteWithSignature<int>("getUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getUser()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getUserId()"/>
         /// </summary>
-        public Android.Os.UserHandle User
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetUserId()
         {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getUser", "()Landroid/os/UserHandle;"); }
+            return IExecuteWithSignature<int>("getUserId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getUserId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getGroupKey()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int UserId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGroupKey()
         {
-            get { return IExecuteWithSignature<int>("getUserId", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getGroupKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getKey()"/>
         /// </summary>
-        /// <returns><see cref="Android.Service.Notification.StatusBarNotification"/></returns>
-        public Android.Service.Notification.StatusBarNotification Clone()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKey()
         {
-            return IExecuteWithSignature<Android.Service.Notification.StatusBarNotification>("clone", "()Landroid/service/notification/StatusBarNotification;");
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#isAppGroup()"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getOpPkg()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAppGroup()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOpPkg()
         {
-            return IExecuteWithSignature<bool>("isAppGroup", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getOpPkg", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#isClearable()"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getOverrideGroupKey()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClearable()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOverrideGroupKey()
         {
-            return IExecuteWithSignature<bool>("isClearable", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getOverrideGroupKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#isGroup()"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getPackageName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsGroup()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            return IExecuteWithSignature<bool>("isGroup", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#isOngoing()"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getTag()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOngoing()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTag()
         {
-            return IExecuteWithSignature<bool>("isOngoing", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#getPostTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetPostTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getPostTime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#setOverrideGroupKey(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetOverrideGroupKey(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setOverrideGroupKey", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/StatusBarNotification.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Notification/ZenPolicy.cs b/src/net/Netdroid/Generated/Android/Service/Notification/ZenPolicy.cs
index 4f6b4bdb5..aa28e4976 100644
--- a/src/net/Netdroid/Generated/Android/Service/Notification/ZenPolicy.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Notification/ZenPolicy.cs
@@ -124,145 +124,164 @@ public partial class ZenPolicy
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCallSenders()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#describeContents()"/>
         /// </summary>
-        public int PriorityCallSenders
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCallSenders", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryAlarms()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCallSenders()"/>
         /// </summary>
-        public int PriorityCategoryAlarms
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCallSenders()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategoryAlarms", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCallSenders", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryCalls()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryAlarms()"/>
         /// </summary>
-        public int PriorityCategoryCalls
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategoryAlarms()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategoryCalls", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategoryAlarms", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryConversations()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryCalls()"/>
         /// </summary>
-        public int PriorityCategoryConversations
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategoryCalls()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategoryConversations", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategoryCalls", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryEvents()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryConversations()"/>
         /// </summary>
-        public int PriorityCategoryEvents
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategoryConversations()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategoryEvents", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategoryConversations", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryMedia()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryEvents()"/>
         /// </summary>
-        public int PriorityCategoryMedia
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategoryEvents()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategoryMedia", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategoryEvents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryMessages()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryMedia()"/>
         /// </summary>
-        public int PriorityCategoryMessages
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategoryMedia()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategoryMessages", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategoryMedia", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryReminders()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryMessages()"/>
         /// </summary>
-        public int PriorityCategoryReminders
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategoryMessages()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategoryReminders", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategoryMessages", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryRepeatCallers()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryReminders()"/>
         /// </summary>
-        public int PriorityCategoryRepeatCallers
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategoryReminders()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategoryRepeatCallers", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategoryReminders", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategorySystem()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategoryRepeatCallers()"/>
         /// </summary>
-        public int PriorityCategorySystem
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategoryRepeatCallers()
         {
-            get { return IExecuteWithSignature<int>("getPriorityCategorySystem", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategoryRepeatCallers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityConversationSenders()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityCategorySystem()"/>
         /// </summary>
-        public int PriorityConversationSenders
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityCategorySystem()
         {
-            get { return IExecuteWithSignature<int>("getPriorityConversationSenders", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityCategorySystem", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityMessageSenders()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityConversationSenders()"/>
         /// </summary>
-        public int PriorityMessageSenders
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityConversationSenders()
         {
-            get { return IExecuteWithSignature<int>("getPriorityMessageSenders", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityConversationSenders", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectAmbient()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getPriorityMessageSenders()"/>
         /// </summary>
-        public int VisualEffectAmbient
+        /// <returns><see cref="int"/></returns>
+        public int GetPriorityMessageSenders()
         {
-            get { return IExecuteWithSignature<int>("getVisualEffectAmbient", "()I"); }
+            return IExecuteWithSignature<int>("getPriorityMessageSenders", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectBadge()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectAmbient()"/>
         /// </summary>
-        public int VisualEffectBadge
+        /// <returns><see cref="int"/></returns>
+        public int GetVisualEffectAmbient()
         {
-            get { return IExecuteWithSignature<int>("getVisualEffectBadge", "()I"); }
+            return IExecuteWithSignature<int>("getVisualEffectAmbient", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectFullScreenIntent()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectBadge()"/>
         /// </summary>
-        public int VisualEffectFullScreenIntent
+        /// <returns><see cref="int"/></returns>
+        public int GetVisualEffectBadge()
         {
-            get { return IExecuteWithSignature<int>("getVisualEffectFullScreenIntent", "()I"); }
+            return IExecuteWithSignature<int>("getVisualEffectBadge", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectLights()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectFullScreenIntent()"/>
         /// </summary>
-        public int VisualEffectLights
+        /// <returns><see cref="int"/></returns>
+        public int GetVisualEffectFullScreenIntent()
         {
-            get { return IExecuteWithSignature<int>("getVisualEffectLights", "()I"); }
+            return IExecuteWithSignature<int>("getVisualEffectFullScreenIntent", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectNotificationList()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectLights()"/>
         /// </summary>
-        public int VisualEffectNotificationList
+        /// <returns><see cref="int"/></returns>
+        public int GetVisualEffectLights()
         {
-            get { return IExecuteWithSignature<int>("getVisualEffectNotificationList", "()I"); }
+            return IExecuteWithSignature<int>("getVisualEffectLights", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectPeek()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectNotificationList()"/>
         /// </summary>
-        public int VisualEffectPeek
+        /// <returns><see cref="int"/></returns>
+        public int GetVisualEffectNotificationList()
         {
-            get { return IExecuteWithSignature<int>("getVisualEffectPeek", "()I"); }
+            return IExecuteWithSignature<int>("getVisualEffectNotificationList", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectStatusBar()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectPeek()"/>
         /// </summary>
-        public int VisualEffectStatusBar
+        /// <returns><see cref="int"/></returns>
+        public int GetVisualEffectPeek()
         {
-            get { return IExecuteWithSignature<int>("getVisualEffectStatusBar", "()I"); }
+            return IExecuteWithSignature<int>("getVisualEffectPeek", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#getVisualEffectStatusBar()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetVisualEffectStatusBar()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getVisualEffectStatusBar", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/notification/ZenPolicy.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/AllPackageClasses.cs
index 0666faebd..621b52b03 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class GetWalletCardsCallback : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GetWalletCardsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GetWalletCardsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GetWalletCardsCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GetWalletCardsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GetWalletCardsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GetWalletCardsCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -214,12 +214,12 @@ public partial class QuickAccessWalletService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("QuickAccessWalletService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("QuickAccessWalletService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public QuickAccessWalletService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("QuickAccessWalletService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("QuickAccessWalletService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public QuickAccessWalletService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsError.cs b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsError.cs
index c419e5977..f8b4fe6a6 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsError.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsError.cs
@@ -61,18 +61,12 @@ public GetWalletCardsError(Android.Graphics.Drawable.Icon arg0, Java.Lang.CharSe
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsError.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsError.html#getIcon()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsError.html#getMessage()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Message
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getMessage", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsError.html#describeContents()"/>
@@ -83,6 +77,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsError.html#getMessage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetMessage()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getMessage", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsError.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsRequest.cs b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsRequest.cs
index 1c9a960a5..59fafde92 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsRequest.cs
@@ -63,40 +63,44 @@ public GetWalletCardsRequest(int arg0, int arg1, int arg2, int arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#getCardHeightPx()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#describeContents()"/>
         /// </summary>
-        public int CardHeightPx
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCardHeightPx", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#getCardWidthPx()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#getCardHeightPx()"/>
         /// </summary>
-        public int CardWidthPx
+        /// <returns><see cref="int"/></returns>
+        public int GetCardHeightPx()
         {
-            get { return IExecuteWithSignature<int>("getCardWidthPx", "()I"); }
+            return IExecuteWithSignature<int>("getCardHeightPx", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#getIconSizePx()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#getCardWidthPx()"/>
         /// </summary>
-        public int IconSizePx
+        /// <returns><see cref="int"/></returns>
+        public int GetCardWidthPx()
         {
-            get { return IExecuteWithSignature<int>("getIconSizePx", "()I"); }
+            return IExecuteWithSignature<int>("getCardWidthPx", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#getMaxCards()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#getIconSizePx()"/>
         /// </summary>
-        public int MaxCards
+        /// <returns><see cref="int"/></returns>
+        public int GetIconSizePx()
         {
-            get { return IExecuteWithSignature<int>("getMaxCards", "()I"); }
+            return IExecuteWithSignature<int>("getIconSizePx", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#getMaxCards()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetMaxCards()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getMaxCards", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsResponse.cs b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsResponse.cs
index dd1e233d4..e3346fb7f 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/GetWalletCardsResponse.cs
@@ -61,26 +61,28 @@ public GetWalletCardsResponse(Java.Util.List<Android.Service.Quickaccesswallet.W
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsResponse.html#getSelectedIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsResponse.html#describeContents()"/>
         /// </summary>
-        public int SelectedIndex
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSelectedIndex", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsResponse.html#getWalletCards()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsResponse.html#getSelectedIndex()"/>
         /// </summary>
-        public Java.Util.List<Android.Service.Quickaccesswallet.WalletCard> WalletCards
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectedIndex()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Service.Quickaccesswallet.WalletCard>>("getWalletCards", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getSelectedIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsResponse.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsResponse.html#getWalletCards()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Service.Quickaccesswallet.WalletCard> GetWalletCards()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Service.Quickaccesswallet.WalletCard>>("getWalletCards", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/GetWalletCardsResponse.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/QuickAccessWalletService.cs b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/QuickAccessWalletService.cs
index 39b3a81fe..feb6ce984 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/QuickAccessWalletService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/QuickAccessWalletService.cs
@@ -70,13 +70,6 @@ public partial class QuickAccessWalletService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/QuickAccessWalletService.html#getTargetActivityPendingIntent()"/> 
-        /// </summary>
-        public Android.App.PendingIntent TargetActivityPendingIntent
-        {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getTargetActivityPendingIntent", "()Landroid/app/PendingIntent;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/QuickAccessWalletService.html#onWalletCardSelected(android.service.quickaccesswallet.SelectWalletCardRequest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Service.Quickaccesswallet.SelectWalletCardRequest"/></param>
@@ -101,6 +94,14 @@ public void OnWalletDismissed()
             IExecuteWithSignature("onWalletDismissed", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/QuickAccessWalletService.html#getTargetActivityPendingIntent()"/>
+        /// </summary>
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetTargetActivityPendingIntent()
+        {
+            return IExecuteWithSignature<Android.App.PendingIntent>("getTargetActivityPendingIntent", "()Landroid/app/PendingIntent;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/QuickAccessWalletService.html#sendWalletServiceEvent(android.service.quickaccesswallet.WalletServiceEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Service.Quickaccesswallet.WalletServiceEvent"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/SelectWalletCardRequest.cs b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/SelectWalletCardRequest.cs
index ee4161fc6..7b02899be 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/SelectWalletCardRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/SelectWalletCardRequest.cs
@@ -60,13 +60,6 @@ public SelectWalletCardRequest(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/SelectWalletCardRequest.html#getCardId()"/> 
-        /// </summary>
-        public Java.Lang.String CardId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCardId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/SelectWalletCardRequest.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/SelectWalletCardRequest.html#getCardId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCardId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCardId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/SelectWalletCardRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/WalletCard.cs b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/WalletCard.cs
index 397071ccb..0c8059ad7 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/WalletCard.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/WalletCard.cs
@@ -70,75 +70,84 @@ public partial class WalletCard
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getPendingIntent()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon CardIcon
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetPendingIntent()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getCardIcon", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Android.App.PendingIntent>("getPendingIntent", "()Landroid/app/PendingIntent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardIcon()"/>
         /// </summary>
-        public Java.Lang.String CardId
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetCardIcon()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCardId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getCardIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardImage()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardImage()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon CardImage
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetCardImage()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getCardImage", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getCardImage", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getNonPaymentCardSecondaryImage()"/>
         /// </summary>
-        public Java.Lang.CharSequence CardLabel
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetNonPaymentCardSecondaryImage()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCardLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getNonPaymentCardSecondaryImage", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardLocations()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Location.Location> CardLocations
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Location.Location>>("getCardLocations", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardType()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardType()"/>
         /// </summary>
-        public int CardType
+        /// <returns><see cref="int"/></returns>
+        public int GetCardType()
         {
-            get { return IExecuteWithSignature<int>("getCardType", "()I"); }
+            return IExecuteWithSignature<int>("getCardType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getContentDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardLabel()"/>
         /// </summary>
-        public Java.Lang.CharSequence ContentDescription
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetCardLabel()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getCardLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getNonPaymentCardSecondaryImage()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getContentDescription()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon NonPaymentCardSecondaryImage
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getNonPaymentCardSecondaryImage", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getPendingIntent()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardId()"/>
         /// </summary>
-        public Android.App.PendingIntent PendingIntent
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCardId()
         {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getPendingIntent", "()Landroid/app/PendingIntent;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCardId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#getCardLocations()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Location.Location> GetCardLocations()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Location.Location>>("getCardLocations", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletCard.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/WalletServiceEvent.cs b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/WalletServiceEvent.cs
index 1eb1d966a..ae531d39e 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/WalletServiceEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quickaccesswallet/WalletServiceEvent.cs
@@ -66,19 +66,20 @@ public WalletServiceEvent(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletServiceEvent.html#getEventType()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletServiceEvent.html#describeContents()"/>
         /// </summary>
-        public int EventType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getEventType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletServiceEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletServiceEvent.html#getEventType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetEventType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getEventType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quickaccesswallet/WalletServiceEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quicksettings/Tile.cs b/src/net/Netdroid/Generated/Android/Service/Quicksettings/Tile.cs
index cb17470ac..ec54df67a 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quicksettings/Tile.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quicksettings/Tile.cs
@@ -70,61 +70,124 @@ public partial class Tile
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getActivityLaunchForClick()"/> <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setActivityLaunchForClick(android.app.PendingIntent)"/>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getActivityLaunchForClick()"/>
         /// </summary>
-        public Android.App.PendingIntent ActivityLaunchForClick
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetActivityLaunchForClick()
         {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getActivityLaunchForClick", "()Landroid/app/PendingIntent;"); } set { IExecuteWithSignature("setActivityLaunchForClick", "(Landroid/app/PendingIntent;)V", value); }
+            return IExecuteWithSignature<Android.App.PendingIntent>("getActivityLaunchForClick", "()Landroid/app/PendingIntent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getContentDescription()"/> <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setContentDescription(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getIcon()"/>
         /// </summary>
-        public Java.Lang.CharSequence ContentDescription
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getIcon()"/> <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setIcon(android.graphics.drawable.Icon)"/>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#describeContents()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); } set { IExecuteWithSignature("setIcon", "(Landroid/graphics/drawable/Icon;)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getLabel()"/> <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setLabel(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getState()"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setLabel", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getState()"/> <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setState(int)"/>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getContentDescription()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); } set { IExecuteWithSignature("setState", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getStateDescription()"/> <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setStateDescription(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getLabel()"/>
         /// </summary>
-        public Java.Lang.CharSequence StateDescription
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getStateDescription", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setStateDescription", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getSubtitle()"/> <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setSubtitle(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getStateDescription()"/>
         /// </summary>
-        public Java.Lang.CharSequence Subtitle
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetStateDescription()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setSubtitle", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getStateDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#getSubtitle()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSubtitle()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setActivityLaunchForClick(android.app.PendingIntent)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
+        public void SetActivityLaunchForClick(Android.App.PendingIntent arg0)
+        {
+            IExecuteWithSignature("setActivityLaunchForClick", "(Landroid/app/PendingIntent;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setContentDescription(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetContentDescription(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setIcon(android.graphics.drawable.Icon)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Icon"/></param>
+        public void SetIcon(Android.Graphics.Drawable.Icon arg0)
+        {
+            IExecuteWithSignature("setIcon", "(Landroid/graphics/drawable/Icon;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setLabel(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetLabel(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setLabel", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setState(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetState(int arg0)
+        {
+            IExecuteWithSignature("setState", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setStateDescription(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetStateDescription(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setStateDescription", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#setSubtitle(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetSubtitle(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setSubtitle", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quicksettings/Tile.html#updateTile()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Quicksettings/TileService.cs b/src/net/Netdroid/Generated/Android/Service/Quicksettings/TileService.cs
index c85be8f8b..029ac61eb 100644
--- a/src/net/Netdroid/Generated/Android/Service/Quicksettings/TileService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Quicksettings/TileService.cs
@@ -79,11 +79,12 @@ public static void RequestListeningState(Android.Content.Context arg0, Android.C
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/quicksettings/TileService.html#getQsTile()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/quicksettings/TileService.html#getQsTile()"/>
         /// </summary>
-        public Android.Service.Quicksettings.Tile QsTile
+        /// <returns><see cref="Android.Service.Quicksettings.Tile"/></returns>
+        public Android.Service.Quicksettings.Tile GetQsTile()
         {
-            get { return IExecuteWithSignature<Android.Service.Quicksettings.Tile>("getQsTile", "()Landroid/service/quicksettings/Tile;"); }
+            return IExecuteWithSignature<Android.Service.Quicksettings.Tile>("getQsTile", "()Landroid/service/quicksettings/Tile;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/quicksettings/TileService.html#isLocked()"/>
@@ -121,7 +122,7 @@ public void StartActivityAndCollapse(Android.App.PendingIntent arg0)
         /// <see href="https://developer.android.com/reference/android/service/quicksettings/TileService.html#startActivityAndCollapse(android.content.Intent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartActivityAndCollapse(Android.Content.Intent arg0)
         {
             IExecuteWithSignature("startActivityAndCollapse", "(Landroid/content/Intent;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Service/Restrictions/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Restrictions/AllPackageClasses.cs
index 1da37088c..d0b3bdc03 100644
--- a/src/net/Netdroid/Generated/Android/Service/Restrictions/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Restrictions/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class RestrictionsReceiver : Android.Content.BroadcastReceiver
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RestrictionsReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RestrictionsReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RestrictionsReceiver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RestrictionsReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RestrictionsReceiver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RestrictionsReceiver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Textservice/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Textservice/AllPackageClasses.cs
index 86324b68a..3e5aebe8e 100644
--- a/src/net/Netdroid/Generated/Android/Service/Textservice/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Textservice/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class SpellCheckerService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SpellCheckerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SpellCheckerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SpellCheckerService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SpellCheckerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SpellCheckerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SpellCheckerService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -78,12 +78,12 @@ public partial class Session : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Session>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Session() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Session class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Session(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Textservice/SpellCheckerService.cs b/src/net/Netdroid/Generated/Android/Service/Textservice/SpellCheckerService.cs
index 4d2b5a689..7891d328d 100644
--- a/src/net/Netdroid/Generated/Android/Service/Textservice/SpellCheckerService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Textservice/SpellCheckerService.cs
@@ -84,27 +84,6 @@ public partial class Session
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#getBundle()"/> 
-            /// </summary>
-            public Android.Os.Bundle Bundle
-            {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getBundle", "()Landroid/os/Bundle;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#getLocale()"/> 
-            /// </summary>
-            public Java.Lang.String Locale
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getLocale", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#getSupportedAttributes()"/> 
-            /// </summary>
-            public int SupportedAttributes
-            {
-                get { return IExecuteWithSignature<int>("getSupportedAttributes", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#onGetSuggestions(android.view.textservice.TextInfo,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.Textservice.TextInfo"/></param>
@@ -122,6 +101,14 @@ public void OnCreate()
                 IExecuteWithSignature("onCreate", "()V");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#getBundle()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetBundle()
+            {
+                return IExecuteWithSignature<Android.Os.Bundle>("getBundle", "()Landroid/os/Bundle;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#onGetSentenceSuggestionsMultiple(android.view.textservice.TextInfo[],int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.Textservice.TextInfo"/></param>
@@ -143,6 +130,22 @@ public Android.View.Textservice.SuggestionsInfo[] OnGetSuggestionsMultiple(Andro
                 return IExecuteArray<Android.View.Textservice.SuggestionsInfo>("onGetSuggestionsMultiple", arg0, arg1, arg2);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#getSupportedAttributes()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetSupportedAttributes()
+            {
+                return IExecuteWithSignature<int>("getSupportedAttributes", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#getLocale()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetLocale()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getLocale", "()Ljava/lang/String;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/textservice/SpellCheckerService.Session.html#onCancel()"/>
             /// </summary>
             public void OnCancel()
diff --git a/src/net/Netdroid/Generated/Android/Service/Voice/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Voice/AllPackageClasses.cs
index a9400bcd5..828d37edb 100644
--- a/src/net/Netdroid/Generated/Android/Service/Voice/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Voice/AllPackageClasses.cs
@@ -560,12 +560,12 @@ public partial class VisibleActivityCallback : MASES.JCOBridge.C2JBridge.JVMBrid
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("VisibleActivityCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VisibleActivityCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VisibleActivityCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("VisibleActivityCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VisibleActivityCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VisibleActivityCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -610,12 +610,12 @@ public partial class VoiceInteractionSessionService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VoiceInteractionSessionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VoiceInteractionSessionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VoiceInteractionSessionService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VoiceInteractionSessionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VoiceInteractionSessionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VoiceInteractionSessionService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Voice/VisibleActivityInfo.cs b/src/net/Netdroid/Generated/Android/Service/Voice/VisibleActivityInfo.cs
index aee0d4d80..ac0125a35 100644
--- a/src/net/Netdroid/Generated/Android/Service/Voice/VisibleActivityInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Voice/VisibleActivityInfo.cs
@@ -52,11 +52,12 @@ public partial class VisibleActivityInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/voice/VisibleActivityInfo.html#getActivityId()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/voice/VisibleActivityInfo.html#getActivityId()"/>
         /// </summary>
-        public Android.Service.Voice.VoiceInteractionSession.ActivityId ActivityId
+        /// <returns><see cref="Android.Service.Voice.VoiceInteractionSession.ActivityId"/></returns>
+        public Android.Service.Voice.VoiceInteractionSession.ActivityId GetActivityId()
         {
-            get { return IExecuteWithSignature<Android.Service.Voice.VoiceInteractionSession.ActivityId>("getActivityId", "()Landroid/service/voice/VoiceInteractionSession$ActivityId;"); }
+            return IExecuteWithSignature<Android.Service.Voice.VoiceInteractionSession.ActivityId>("getActivityId", "()Landroid/service/voice/VoiceInteractionSession$ActivityId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/voice/VisibleActivityInfo.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Voice/VoiceInteractionService.cs b/src/net/Netdroid/Generated/Android/Service/Voice/VoiceInteractionService.cs
index 72eeef33c..8cb64e279 100644
--- a/src/net/Netdroid/Generated/Android/Service/Voice/VoiceInteractionService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Voice/VoiceInteractionService.cs
@@ -68,13 +68,6 @@ public static bool IsActiveService(Android.Content.Context arg0, Android.Content
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionService.html#getDisabledShowContext()"/> <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionService.html#setDisabledShowContext(int)"/>
-        /// </summary>
-        public int DisabledShowContext
-        {
-            get { return IExecuteWithSignature<int>("getDisabledShowContext", "()I"); } set { IExecuteWithSignature("setDisabledShowContext", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionService.html#setUiHints(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
@@ -83,6 +76,14 @@ public void SetUiHints(Android.Os.Bundle arg0)
             IExecuteWithSignature("setUiHints", "(Landroid/os/Bundle;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionService.html#getDisabledShowContext()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDisabledShowContext()
+        {
+            return IExecuteWithSignature<int>("getDisabledShowContext", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionService.html#onGetSupportedVoiceActions(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
@@ -130,6 +131,14 @@ public void OnShutdown()
             IExecuteWithSignature("onShutdown", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionService.html#setDisabledShowContext(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDisabledShowContext(int arg0)
+        {
+            IExecuteWithSignature("setDisabledShowContext", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionService.html#showSession(android.os.Bundle,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Service/Voice/VoiceInteractionSession.cs b/src/net/Netdroid/Generated/Android/Service/Voice/VoiceInteractionSession.cs
index 75a61be21..8711c9992 100644
--- a/src/net/Netdroid/Generated/Android/Service/Voice/VoiceInteractionSession.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Voice/VoiceInteractionSession.cs
@@ -121,39 +121,28 @@ public VoiceInteractionSession(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getWindow()"/>
         /// </summary>
-        public Android.Content.Context Context
+        /// <returns><see cref="Android.App.Dialog"/></returns>
+        public Android.App.Dialog GetWindow()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<Android.App.Dialog>("getWindow", "()Landroid/app/Dialog;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getDisabledShowContext()"/> <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#setDisabledShowContext(int)"/>
+        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getContext()"/>
         /// </summary>
-        public int DisabledShowContext
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
         {
-            get { return IExecuteWithSignature<int>("getDisabledShowContext", "()I"); } set { IExecuteWithSignature("setDisabledShowContext", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getLayoutInflater()"/> 
+        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getLayoutInflater()"/>
         /// </summary>
-        public Android.View.LayoutInflater LayoutInflater
+        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
+        public Android.View.LayoutInflater GetLayoutInflater()
         {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getUserDisabledShowContext()"/> 
-        /// </summary>
-        public int UserDisabledShowContext
-        {
-            get { return IExecuteWithSignature<int>("getUserDisabledShowContext", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getWindow()"/> 
-        /// </summary>
-        public Android.App.Dialog Window
-        {
-            get { return IExecuteWithSignature<Android.App.Dialog>("getWindow", "()Landroid/app/Dialog;"); }
+            return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#onCreateContentView()"/>
@@ -254,6 +243,22 @@ public void UnregisterVisibleActivityCallback(Android.Service.Voice.VoiceInterac
             IExecuteWithSignature("unregisterVisibleActivityCallback", "(Landroid/service/voice/VoiceInteractionSession$VisibleActivityCallback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getDisabledShowContext()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDisabledShowContext()
+        {
+            return IExecuteWithSignature<int>("getDisabledShowContext", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#getUserDisabledShowContext()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetUserDisabledShowContext()
+        {
+            return IExecuteWithSignature<int>("getUserDisabledShowContext", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#closeSystemDialogs()"/>
         /// </summary>
         public void CloseSystemDialogs()
@@ -359,7 +364,7 @@ public void OnDirectActionsInvalidated(Android.Service.Voice.VoiceInteractionSes
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
         /// <param name="arg1"><see cref="Android.App.Assist.AssistStructure"/></param>
         /// <param name="arg2"><see cref="Android.App.Assist.AssistContent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnHandleAssist(Android.Os.Bundle arg0, Android.App.Assist.AssistStructure arg1, Android.App.Assist.AssistContent arg2)
         {
             IExecute("onHandleAssist", arg0, arg1, arg2);
@@ -380,7 +385,7 @@ public void OnHandleAssist(Android.Service.Voice.VoiceInteractionSession.AssistS
         /// <param name="arg2"><see cref="Android.App.Assist.AssistContent"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnHandleAssistSecondary(Android.Os.Bundle arg0, Android.App.Assist.AssistStructure arg1, Android.App.Assist.AssistContent arg2, int arg3, int arg4)
         {
             IExecute("onHandleAssistSecondary", arg0, arg1, arg2, arg3, arg4);
@@ -507,6 +512,14 @@ public void SetContentView(Android.View.View arg0)
             IExecuteWithSignature("setContentView", "(Landroid/view/View;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#setDisabledShowContext(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDisabledShowContext(int arg0)
+        {
+            IExecuteWithSignature("setDisabledShowContext", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.html#setKeepAwake(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -589,19 +602,21 @@ public partial class AbortVoiceRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AbortVoiceRequest.html#getMessage()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AbortVoiceRequest.html#getVoicePrompt()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence Message
+            /// <returns><see cref="Android.App.VoiceInteractor.Prompt"/></returns>
+            public Android.App.VoiceInteractor.Prompt GetVoicePrompt()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getMessage", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.App.VoiceInteractor.Prompt>("getVoicePrompt", "()Landroid/app/VoiceInteractor$Prompt;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AbortVoiceRequest.html#getVoicePrompt()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AbortVoiceRequest.html#getMessage()"/>
             /// </summary>
-            public Android.App.VoiceInteractor.Prompt VoicePrompt
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetMessage()
             {
-                get { return IExecuteWithSignature<Android.App.VoiceInteractor.Prompt>("getVoicePrompt", "()Landroid/app/VoiceInteractor$Prompt;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getMessage", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AbortVoiceRequest.html#sendAbortResult(android.os.Bundle)"/>
@@ -674,54 +689,60 @@ public partial class AssistState
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getAssistContent()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getAssistContent()"/>
             /// </summary>
-            public Android.App.Assist.AssistContent AssistContent
+            /// <returns><see cref="Android.App.Assist.AssistContent"/></returns>
+            public Android.App.Assist.AssistContent GetAssistContent()
             {
-                get { return IExecuteWithSignature<Android.App.Assist.AssistContent>("getAssistContent", "()Landroid/app/assist/AssistContent;"); }
+                return IExecuteWithSignature<Android.App.Assist.AssistContent>("getAssistContent", "()Landroid/app/assist/AssistContent;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getAssistData()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getAssistStructure()"/>
             /// </summary>
-            public Android.Os.Bundle AssistData
+            /// <returns><see cref="Android.App.Assist.AssistStructure"/></returns>
+            public Android.App.Assist.AssistStructure GetAssistStructure()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getAssistData", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<Android.App.Assist.AssistStructure>("getAssistStructure", "()Landroid/app/assist/AssistStructure;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getAssistStructure()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getAssistData()"/>
             /// </summary>
-            public Android.App.Assist.AssistStructure AssistStructure
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetAssistData()
             {
-                get { return IExecuteWithSignature<Android.App.Assist.AssistStructure>("getAssistStructure", "()Landroid/app/assist/AssistStructure;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getAssistData", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getActivityId()"/>
             /// </summary>
-            public int Count
+            /// <returns><see cref="Android.Service.Voice.VoiceInteractionSession.ActivityId"/></returns>
+            public Android.Service.Voice.VoiceInteractionSession.ActivityId GetActivityId()
             {
-                get { return IExecuteWithSignature<int>("getCount", "()I"); }
+                return IExecuteWithSignature<Android.Service.Voice.VoiceInteractionSession.ActivityId>("getActivityId", "()Landroid/service/voice/VoiceInteractionSession$ActivityId;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getActivityId()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#isFocused()"/>
             /// </summary>
-            public Android.Service.Voice.VoiceInteractionSession.ActivityId GetActivityId
+            /// <returns><see cref="bool"/></returns>
+            public bool IsFocused()
             {
-                get { return IExecuteWithSignature<Android.Service.Voice.VoiceInteractionSession.ActivityId>("getActivityId", "()Landroid/service/voice/VoiceInteractionSession$ActivityId;"); }
+                return IExecuteWithSignature<bool>("isFocused", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getCount()"/>
             /// </summary>
-            public int Index
+            /// <returns><see cref="int"/></returns>
+            public int GetCount()
             {
-                get { return IExecuteWithSignature<int>("getIndex", "()I"); }
+                return IExecuteWithSignature<int>("getCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#isFocused()"/>
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.AssistState.html#getIndex()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsFocused()
+            /// <returns><see cref="int"/></returns>
+            public int GetIndex()
             {
-                return IExecuteWithSignature<bool>("isFocused", "()Z");
+                return IExecuteWithSignature<int>("getIndex", "()I");
             }
 
             #endregion
@@ -755,11 +776,12 @@ public partial class CommandRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.CommandRequest.html#getCommand()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.CommandRequest.html#getCommand()"/>
             /// </summary>
-            public Java.Lang.String Command
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCommand()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCommand", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getCommand", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.CommandRequest.html#sendIntermediateResult(android.os.Bundle)"/>
@@ -809,19 +831,21 @@ public partial class CompleteVoiceRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.CompleteVoiceRequest.html#getMessage()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.CompleteVoiceRequest.html#getVoicePrompt()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence Message
+            /// <returns><see cref="Android.App.VoiceInteractor.Prompt"/></returns>
+            public Android.App.VoiceInteractor.Prompt GetVoicePrompt()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getMessage", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.App.VoiceInteractor.Prompt>("getVoicePrompt", "()Landroid/app/VoiceInteractor$Prompt;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.CompleteVoiceRequest.html#getVoicePrompt()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.CompleteVoiceRequest.html#getMessage()"/>
             /// </summary>
-            public Android.App.VoiceInteractor.Prompt VoicePrompt
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetMessage()
             {
-                get { return IExecuteWithSignature<Android.App.VoiceInteractor.Prompt>("getVoicePrompt", "()Landroid/app/VoiceInteractor$Prompt;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getMessage", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.CompleteVoiceRequest.html#sendCompleteResult(android.os.Bundle)"/>
@@ -863,19 +887,21 @@ public partial class ConfirmationRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.ConfirmationRequest.html#getPrompt()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.ConfirmationRequest.html#getVoicePrompt()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence Prompt
+            /// <returns><see cref="Android.App.VoiceInteractor.Prompt"/></returns>
+            public Android.App.VoiceInteractor.Prompt GetVoicePrompt()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getPrompt", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.App.VoiceInteractor.Prompt>("getVoicePrompt", "()Landroid/app/VoiceInteractor$Prompt;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.ConfirmationRequest.html#getVoicePrompt()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.ConfirmationRequest.html#getPrompt()"/>
             /// </summary>
-            public Android.App.VoiceInteractor.Prompt VoicePrompt
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetPrompt()
             {
-                get { return IExecuteWithSignature<Android.App.VoiceInteractor.Prompt>("getVoicePrompt", "()Landroid/app/VoiceInteractor$Prompt;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getPrompt", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.ConfirmationRequest.html#sendConfirmationResult(boolean,android.os.Bundle)"/>
@@ -983,26 +1009,29 @@ public partial class PickOptionRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.PickOptionRequest.html#getOptions()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.PickOptionRequest.html#getOptions()"/>
             /// </summary>
-            public Android.App.VoiceInteractor.PickOptionRequest.Option[] Options
+            /// <returns><see cref="Android.App.VoiceInteractor.PickOptionRequest.Option"/></returns>
+            public Android.App.VoiceInteractor.PickOptionRequest.Option[] GetOptions()
             {
-                get { return IExecuteWithSignatureArray<Android.App.VoiceInteractor.PickOptionRequest.Option>("getOptions", "()[Landroid/app/VoiceInteractor$PickOptionRequest$Option;"); }
+                return IExecuteWithSignatureArray<Android.App.VoiceInteractor.PickOptionRequest.Option>("getOptions", "()[Landroid/app/VoiceInteractor$PickOptionRequest$Option;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.PickOptionRequest.html#getPrompt()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.PickOptionRequest.html#getVoicePrompt()"/>
             /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.CharSequence Prompt
+            /// <returns><see cref="Android.App.VoiceInteractor.Prompt"/></returns>
+            public Android.App.VoiceInteractor.Prompt GetVoicePrompt()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getPrompt", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Android.App.VoiceInteractor.Prompt>("getVoicePrompt", "()Landroid/app/VoiceInteractor$Prompt;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.PickOptionRequest.html#getVoicePrompt()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.PickOptionRequest.html#getPrompt()"/>
             /// </summary>
-            public Android.App.VoiceInteractor.Prompt VoicePrompt
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.CharSequence GetPrompt()
             {
-                get { return IExecuteWithSignature<Android.App.VoiceInteractor.Prompt>("getVoicePrompt", "()Landroid/app/VoiceInteractor$Prompt;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getPrompt", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.PickOptionRequest.html#sendIntermediatePickOptionResult(android.app.VoiceInteractor.PickOptionRequest.Option[],android.os.Bundle)"/>
@@ -1054,33 +1083,36 @@ public partial class Request
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#getCallingPackage()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#getExtras()"/>
             /// </summary>
-            public Java.Lang.String CallingPackage
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackage", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#getCallingUid()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#isActive()"/>
             /// </summary>
-            public int CallingUid
+            /// <returns><see cref="bool"/></returns>
+            public bool IsActive()
             {
-                get { return IExecuteWithSignature<int>("getCallingUid", "()I"); }
+                return IExecuteWithSignature<bool>("isActive", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#getCallingUid()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int GetCallingUid()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("getCallingUid", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#isActive()"/>
+            /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#getCallingPackage()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsActive()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCallingPackage()
             {
-                return IExecuteWithSignature<bool>("isActive", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getCallingPackage", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/voice/VoiceInteractionSession.Request.html#cancel()"/>
diff --git a/src/net/Netdroid/Generated/Android/Service/Vr/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Vr/AllPackageClasses.cs
index 01843f439..686b0051f 100644
--- a/src/net/Netdroid/Generated/Android/Service/Vr/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Vr/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class VrListenerService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VrListenerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VrListenerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VrListenerService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VrListenerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VrListenerService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VrListenerService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Wallpaper/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Service/Wallpaper/AllPackageClasses.cs
index 1c5e5b69d..235ee8212 100644
--- a/src/net/Netdroid/Generated/Android/Service/Wallpaper/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Wallpaper/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class WallpaperService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WallpaperService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WallpaperService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WallpaperService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WallpaperService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WallpaperService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WallpaperService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Service/Wallpaper/WallpaperService.cs b/src/net/Netdroid/Generated/Android/Service/Wallpaper/WallpaperService.cs
index d383a772c..d1addefa3 100644
--- a/src/net/Netdroid/Generated/Android/Service/Wallpaper/WallpaperService.cs
+++ b/src/net/Netdroid/Generated/Android/Service/Wallpaper/WallpaperService.cs
@@ -98,41 +98,6 @@ public Engine(Android.Service.Wallpaper.WallpaperService arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getDesiredMinimumHeight()"/> 
-            /// </summary>
-            public int DesiredMinimumHeight
-            {
-                get { return IExecuteWithSignature<int>("getDesiredMinimumHeight", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getDesiredMinimumWidth()"/> 
-            /// </summary>
-            public int DesiredMinimumWidth
-            {
-                get { return IExecuteWithSignature<int>("getDesiredMinimumWidth", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getDisplayContext()"/> 
-            /// </summary>
-            public Android.Content.Context DisplayContext
-            {
-                get { return IExecuteWithSignature<Android.Content.Context>("getDisplayContext", "()Landroid/content/Context;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getSurfaceHolder()"/> 
-            /// </summary>
-            public Android.View.SurfaceHolder SurfaceHolder
-            {
-                get { return IExecuteWithSignature<Android.View.SurfaceHolder>("getSurfaceHolder", "()Landroid/view/SurfaceHolder;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getWallpaperFlags()"/> 
-            /// </summary>
-            public int WallpaperFlags
-            {
-                get { return IExecuteWithSignature<int>("getWallpaperFlags", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#onComputeColors()"/>
             /// </summary>
             /// <returns><see cref="Android.App.WallpaperColors"/></returns>
@@ -141,6 +106,14 @@ public Android.App.WallpaperColors OnComputeColors()
                 return IExecuteWithSignature<Android.App.WallpaperColors>("onComputeColors", "()Landroid/app/WallpaperColors;");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getDisplayContext()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Content.Context"/></returns>
+            public Android.Content.Context GetDisplayContext()
+            {
+                return IExecuteWithSignature<Android.Content.Context>("getDisplayContext", "()Landroid/content/Context;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#onCommand(java.lang.String,int,int,int,android.os.Bundle,boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -155,6 +128,14 @@ public Android.Os.Bundle OnCommand(Java.Lang.String arg0, int arg1, int arg2, in
                 return IExecute<Android.Os.Bundle>("onCommand", arg0, arg1, arg2, arg3, arg4, arg5);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getSurfaceHolder()"/>
+            /// </summary>
+            /// <returns><see cref="Android.View.SurfaceHolder"/></returns>
+            public Android.View.SurfaceHolder GetSurfaceHolder()
+            {
+                return IExecuteWithSignature<Android.View.SurfaceHolder>("getSurfaceHolder", "()Landroid/view/SurfaceHolder;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#isPreview()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -171,6 +152,30 @@ public bool IsVisible()
                 return IExecuteWithSignature<bool>("isVisible", "()Z");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getDesiredMinimumHeight()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetDesiredMinimumHeight()
+            {
+                return IExecuteWithSignature<int>("getDesiredMinimumHeight", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getDesiredMinimumWidth()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetDesiredMinimumWidth()
+            {
+                return IExecuteWithSignature<int>("getDesiredMinimumWidth", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#getWallpaperFlags()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetWallpaperFlags()
+            {
+                return IExecuteWithSignature<int>("getWallpaperFlags", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html#notifyColorsChanged()"/>
             /// </summary>
             public void NotifyColorsChanged()
diff --git a/src/net/Netdroid/Generated/Android/Speech/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Speech/AllPackageClasses.cs
index 920d400b2..03b274c03 100644
--- a/src/net/Netdroid/Generated/Android/Speech/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/AllPackageClasses.cs
@@ -125,10 +125,13 @@ public partial class ModelDownloadListener : MASES.JCOBridge.C2JBridge.JVMBridge
         /// </summary>
         public ModelDownloadListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.speech.ModelDownloadListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.speech.ModelDownloadListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -150,10 +153,13 @@ public partial class ModelDownloadListenerDirect : ModelDownloadListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.speech.ModelDownloadListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.speech.ModelDownloadListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -184,10 +190,13 @@ public partial class RecognitionListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public RecognitionListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.speech.RecognitionListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.speech.RecognitionListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -209,10 +218,13 @@ public partial class RecognitionListenerDirect : RecognitionListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.speech.RecognitionListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.speech.RecognitionListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -330,12 +342,12 @@ public partial class RecognitionService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RecognitionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecognitionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecognitionService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RecognitionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecognitionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecognitionService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -552,12 +564,12 @@ public partial class RecognitionSupportCallback : MASES.JCOBridge.C2JBridge.JVMB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RecognitionSupportCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecognitionSupportCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecognitionSupportCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RecognitionSupportCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecognitionSupportCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecognitionSupportCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Speech/AlternativeSpan.cs b/src/net/Netdroid/Generated/Android/Speech/AlternativeSpan.cs
index b7ea729df..9c28c5486 100644
--- a/src/net/Netdroid/Generated/Android/Speech/AlternativeSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/AlternativeSpan.cs
@@ -62,33 +62,36 @@ public AlternativeSpan(int arg0, int arg1, Java.Util.List<Java.Lang.String> arg2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#getAlternatives()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> Alternatives
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAlternatives", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#getEndPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#getEndPosition()"/>
         /// </summary>
-        public int EndPosition
+        /// <returns><see cref="int"/></returns>
+        public int GetEndPosition()
         {
-            get { return IExecuteWithSignature<int>("getEndPosition", "()I"); }
+            return IExecuteWithSignature<int>("getEndPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#getStartPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#getStartPosition()"/>
         /// </summary>
-        public int StartPosition
+        /// <returns><see cref="int"/></returns>
+        public int GetStartPosition()
         {
-            get { return IExecuteWithSignature<int>("getStartPosition", "()I"); }
+            return IExecuteWithSignature<int>("getStartPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#getAlternatives()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetAlternatives()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAlternatives", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Speech/AlternativeSpans.cs b/src/net/Netdroid/Generated/Android/Speech/AlternativeSpans.cs
index 69c3a8a0a..fbcae72a2 100644
--- a/src/net/Netdroid/Generated/Android/Speech/AlternativeSpans.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/AlternativeSpans.cs
@@ -60,13 +60,6 @@ public AlternativeSpans(Java.Util.List<Android.Speech.AlternativeSpan> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpans.html#getSpans()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Speech.AlternativeSpan> Spans
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Speech.AlternativeSpan>>("getSpans", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpans.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpans.html#getSpans()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Speech.AlternativeSpan> GetSpans()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Speech.AlternativeSpan>>("getSpans", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/AlternativeSpans.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Speech/ModelDownloadListener.cs b/src/net/Netdroid/Generated/Android/Speech/ModelDownloadListener.cs
index f4a48b0f2..baa9f55a8 100644
--- a/src/net/Netdroid/Generated/Android/Speech/ModelDownloadListener.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/ModelDownloadListener.cs
@@ -68,10 +68,10 @@ public partial class ModelDownloadListener : Android.Speech.IModelDownloadListen
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnErrorEventHandler));
-            AddEventHandler("onProgress", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnProgressEventHandler));
-            AddEventHandler("onScheduled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnScheduledEventHandler));
-            AddEventHandler("onSuccess", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnSuccessEventHandler));
+            AddEventHandler("onError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnErrorEventHandler));
+            AddEventHandler("onProgress", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnProgressEventHandler));
+            AddEventHandler("onScheduled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnScheduledEventHandler));
+            AddEventHandler("onSuccess", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnSuccessEventHandler));
 
         }
 
@@ -79,7 +79,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/speech/ModelDownloadListener.html#onError(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnError { get; set; } = null;
+        public global::System.Action<int> OnOnError { get; set; } = null;
 
         void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -100,7 +100,7 @@ public virtual void OnError(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/ModelDownloadListener.html#onProgress(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnProgress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnProgress { get; set; } = null;
+        public global::System.Action<int> OnOnProgress { get; set; } = null;
 
         void OnProgressEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -121,7 +121,7 @@ public virtual void OnProgress(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/ModelDownloadListener.html#onScheduled()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnScheduled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnScheduled { get; set; } = null;
+        public global::System.Action OnOnScheduled { get; set; } = null;
 
         void OnScheduledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -141,7 +141,7 @@ public virtual void OnScheduled()
         /// Handler for <see href="https://developer.android.com/reference/android/speech/ModelDownloadListener.html#onSuccess()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSuccess"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnSuccess { get; set; } = null;
+        public global::System.Action OnOnSuccess { get; set; } = null;
 
         void OnSuccessEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Speech/RecognitionListener.cs b/src/net/Netdroid/Generated/Android/Speech/RecognitionListener.cs
index f9078e0cb..70da7ba02 100644
--- a/src/net/Netdroid/Generated/Android/Speech/RecognitionListener.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/RecognitionListener.cs
@@ -68,18 +68,18 @@ public partial class RecognitionListener : Android.Speech.IRecognitionListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onBeginningOfSpeech", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnBeginningOfSpeechEventHandler));
-            AddEventHandler("onBufferReceived", new System.EventHandler<CLRListenerEventArgs<CLREventData<byte[]>>>(OnBufferReceivedEventHandler));
-            AddEventHandler("onEndOfSpeech", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnEndOfSpeechEventHandler));
-            AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnErrorEventHandler));
-            AddEventHandler("onEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnEventEventHandler));
-            AddEventHandler("onPartialResults", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnPartialResultsEventHandler));
-            AddEventHandler("onReadyForSpeech", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnReadyForSpeechEventHandler));
-            AddEventHandler("onResults", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnResultsEventHandler));
-            AddEventHandler("onRmsChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<float>>>(OnRmsChangedEventHandler));
-            AddEventHandler("onEndOfSegmentedSession", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnEndOfSegmentedSessionEventHandler));
-            AddEventHandler("onLanguageDetection", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnLanguageDetectionEventHandler));
-            AddEventHandler("onSegmentResults", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnSegmentResultsEventHandler));
+            AddEventHandler("onBeginningOfSpeech", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnBeginningOfSpeechEventHandler));
+            AddEventHandler("onBufferReceived", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<byte[]>>>(OnBufferReceivedEventHandler));
+            AddEventHandler("onEndOfSpeech", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnEndOfSpeechEventHandler));
+            AddEventHandler("onError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnErrorEventHandler));
+            AddEventHandler("onEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnEventEventHandler));
+            AddEventHandler("onPartialResults", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnPartialResultsEventHandler));
+            AddEventHandler("onReadyForSpeech", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnReadyForSpeechEventHandler));
+            AddEventHandler("onResults", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnResultsEventHandler));
+            AddEventHandler("onRmsChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<float>>>(OnRmsChangedEventHandler));
+            AddEventHandler("onEndOfSegmentedSession", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnEndOfSegmentedSessionEventHandler));
+            AddEventHandler("onLanguageDetection", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnLanguageDetectionEventHandler));
+            AddEventHandler("onSegmentResults", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.Bundle>>>(OnSegmentResultsEventHandler));
 
         }
 
@@ -87,7 +87,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onBeginningOfSpeech()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnBeginningOfSpeech"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnBeginningOfSpeech { get; set; } = null;
+        public global::System.Action OnOnBeginningOfSpeech { get; set; } = null;
 
         void OnBeginningOfSpeechEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -107,7 +107,7 @@ public virtual void OnBeginningOfSpeech()
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onBufferReceived(byte[])"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnBufferReceived"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<byte[]> OnOnBufferReceived { get; set; } = null;
+        public global::System.Action<byte[]> OnOnBufferReceived { get; set; } = null;
 
         void OnBufferReceivedEventHandler(object sender, CLRListenerEventArgs<CLREventData<byte[]>> data)
         {
@@ -128,7 +128,7 @@ public virtual void OnBufferReceived(byte[] arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onEndOfSpeech()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnEndOfSpeech"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnEndOfSpeech { get; set; } = null;
+        public global::System.Action OnOnEndOfSpeech { get; set; } = null;
 
         void OnEndOfSpeechEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -148,7 +148,7 @@ public virtual void OnEndOfSpeech()
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onError(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnError { get; set; } = null;
+        public global::System.Action<int> OnOnError { get; set; } = null;
 
         void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -169,7 +169,7 @@ public virtual void OnError(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onEvent(int,android.os.Bundle)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnEvent"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, Android.Os.Bundle> OnOnEvent { get; set; } = null;
+        public global::System.Action<int, Android.Os.Bundle> OnOnEvent { get; set; } = null;
 
         void OnEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -191,7 +191,7 @@ public virtual void OnEvent(int arg0, Android.Os.Bundle arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onPartialResults(android.os.Bundle)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnPartialResults"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Os.Bundle> OnOnPartialResults { get; set; } = null;
+        public global::System.Action<Android.Os.Bundle> OnOnPartialResults { get; set; } = null;
 
         void OnPartialResultsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Os.Bundle>> data)
         {
@@ -212,7 +212,7 @@ public virtual void OnPartialResults(Android.Os.Bundle arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onReadyForSpeech(android.os.Bundle)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnReadyForSpeech"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Os.Bundle> OnOnReadyForSpeech { get; set; } = null;
+        public global::System.Action<Android.Os.Bundle> OnOnReadyForSpeech { get; set; } = null;
 
         void OnReadyForSpeechEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Os.Bundle>> data)
         {
@@ -233,7 +233,7 @@ public virtual void OnReadyForSpeech(Android.Os.Bundle arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onResults(android.os.Bundle)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnResults"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Os.Bundle> OnOnResults { get; set; } = null;
+        public global::System.Action<Android.Os.Bundle> OnOnResults { get; set; } = null;
 
         void OnResultsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Os.Bundle>> data)
         {
@@ -254,7 +254,7 @@ public virtual void OnResults(Android.Os.Bundle arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onRmsChanged(float)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnRmsChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<float> OnOnRmsChanged { get; set; } = null;
+        public global::System.Action<float> OnOnRmsChanged { get; set; } = null;
 
         void OnRmsChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<float>> data)
         {
@@ -283,7 +283,7 @@ public void OnEndOfSegmentedSessionDefault()
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onEndOfSegmentedSession()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnEndOfSegmentedSession"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnEndOfSegmentedSession { get; set; } = null;
+        public global::System.Action OnOnEndOfSegmentedSession { get; set; } = null;
 
         void OnEndOfSegmentedSessionEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -313,7 +313,7 @@ public void OnLanguageDetectionDefault(Android.Os.Bundle arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onLanguageDetection(android.os.Bundle)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnLanguageDetection"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Os.Bundle> OnOnLanguageDetection { get; set; } = null;
+        public global::System.Action<Android.Os.Bundle> OnOnLanguageDetection { get; set; } = null;
 
         void OnLanguageDetectionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Os.Bundle>> data)
         {
@@ -344,7 +344,7 @@ public void OnSegmentResultsDefault(Android.Os.Bundle arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/speech/RecognitionListener.html#onSegmentResults(android.os.Bundle)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSegmentResults"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Os.Bundle> OnOnSegmentResults { get; set; } = null;
+        public global::System.Action<Android.Os.Bundle> OnOnSegmentResults { get; set; } = null;
 
         void OnSegmentResultsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Os.Bundle>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Speech/RecognitionPart.cs b/src/net/Netdroid/Generated/Android/Speech/RecognitionPart.cs
index ce42a92ed..890f83d78 100644
--- a/src/net/Netdroid/Generated/Android/Speech/RecognitionPart.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/RecognitionPart.cs
@@ -88,40 +88,44 @@ public partial class RecognitionPart
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#getConfidenceLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#describeContents()"/>
         /// </summary>
-        public int ConfidenceLevel
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getConfidenceLevel", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#getFormattedText()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#getConfidenceLevel()"/>
         /// </summary>
-        public Java.Lang.String FormattedText
+        /// <returns><see cref="int"/></returns>
+        public int GetConfidenceLevel()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFormattedText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getConfidenceLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#getRawText()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#getFormattedText()"/>
         /// </summary>
-        public Java.Lang.String RawText
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFormattedText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRawText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFormattedText", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#getTimestampMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#getRawText()"/>
         /// </summary>
-        public long TimestampMillis
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRawText()
         {
-            get { return IExecuteWithSignature<long>("getTimestampMillis", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRawText", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#getTimestampMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestampMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTimestampMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/RecognitionPart.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Speech/RecognitionService.cs b/src/net/Netdroid/Generated/Android/Speech/RecognitionService.cs
index 0553d9600..da0078a50 100644
--- a/src/net/Netdroid/Generated/Android/Speech/RecognitionService.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/RecognitionService.cs
@@ -58,11 +58,12 @@ public partial class RecognitionService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionService.html#getMaxConcurrentSessionsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionService.html#getMaxConcurrentSessionsCount()"/>
         /// </summary>
-        public int MaxConcurrentSessionsCount
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxConcurrentSessionsCount()
         {
-            get { return IExecuteWithSignature<int>("getMaxConcurrentSessionsCount", "()I"); }
+            return IExecuteWithSignature<int>("getMaxConcurrentSessionsCount", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/RecognitionService.html#onCheckRecognitionSupport(android.content.Intent,android.content.AttributionSource,android.speech.RecognitionService.SupportCallback)"/>
@@ -135,18 +136,20 @@ public partial class Callback
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/speech/RecognitionService.Callback.html#getCallingAttributionSource()"/> 
+            /// <see href="https://developer.android.com/reference/android/speech/RecognitionService.Callback.html#getCallingAttributionSource()"/>
             /// </summary>
-            public Android.Content.AttributionSource CallingAttributionSource
+            /// <returns><see cref="Android.Content.AttributionSource"/></returns>
+            public Android.Content.AttributionSource GetCallingAttributionSource()
             {
-                get { return IExecuteWithSignature<Android.Content.AttributionSource>("getCallingAttributionSource", "()Landroid/content/AttributionSource;"); }
+                return IExecuteWithSignature<Android.Content.AttributionSource>("getCallingAttributionSource", "()Landroid/content/AttributionSource;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/speech/RecognitionService.Callback.html#getCallingUid()"/> 
+            /// <see href="https://developer.android.com/reference/android/speech/RecognitionService.Callback.html#getCallingUid()"/>
             /// </summary>
-            public int CallingUid
+            /// <returns><see cref="int"/></returns>
+            public int GetCallingUid()
             {
-                get { return IExecuteWithSignature<int>("getCallingUid", "()I"); }
+                return IExecuteWithSignature<int>("getCallingUid", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/RecognitionService.Callback.html#beginningOfSpeech()"/>
diff --git a/src/net/Netdroid/Generated/Android/Speech/RecognitionSupport.cs b/src/net/Netdroid/Generated/Android/Speech/RecognitionSupport.cs
index 4091d76ef..ae80e6f1a 100644
--- a/src/net/Netdroid/Generated/Android/Speech/RecognitionSupport.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/RecognitionSupport.cs
@@ -52,40 +52,44 @@ public partial class RecognitionSupport
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#getInstalledOnDeviceLanguages()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> InstalledOnDeviceLanguages
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getInstalledOnDeviceLanguages", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#getOnlineLanguages()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#getInstalledOnDeviceLanguages()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> OnlineLanguages
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetInstalledOnDeviceLanguages()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getOnlineLanguages", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getInstalledOnDeviceLanguages", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#getPendingOnDeviceLanguages()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#getOnlineLanguages()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> PendingOnDeviceLanguages
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetOnlineLanguages()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPendingOnDeviceLanguages", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getOnlineLanguages", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#getSupportedOnDeviceLanguages()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#getPendingOnDeviceLanguages()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> SupportedOnDeviceLanguages
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetPendingOnDeviceLanguages()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedOnDeviceLanguages", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getPendingOnDeviceLanguages", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#getSupportedOnDeviceLanguages()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetSupportedOnDeviceLanguages()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedOnDeviceLanguages", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/RecognitionSupport.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Speech/RecognizerIntent.cs b/src/net/Netdroid/Generated/Android/Speech/RecognizerIntent.cs
index 68f7d45ce..ef05f93e0 100644
--- a/src/net/Netdroid/Generated/Android/Speech/RecognizerIntent.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/RecognizerIntent.cs
@@ -100,7 +100,7 @@ public partial class RecognizerIntent
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/RecognizerIntent.html#EXTRA_AUDIO_INJECT_SOURCE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_AUDIO_INJECT_SOURCE { get { if (!_EXTRA_AUDIO_INJECT_SOURCEReady) { _EXTRA_AUDIO_INJECT_SOURCEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_AUDIO_INJECT_SOURCE"); _EXTRA_AUDIO_INJECT_SOURCEReady = true; } return _EXTRA_AUDIO_INJECT_SOURCEContent; } }
         private static Java.Lang.String _EXTRA_AUDIO_INJECT_SOURCEContent = default;
         private static bool _EXTRA_AUDIO_INJECT_SOURCEReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Speech/Tts/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Speech/Tts/AllPackageClasses.cs
index 5b15522b1..560b622de 100644
--- a/src/net/Netdroid/Generated/Android/Speech/Tts/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/Tts/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class SynthesisCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SynthesisCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SynthesisCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SynthesisCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SynthesisCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SynthesisCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SynthesisCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -255,10 +255,13 @@ public partial class OnInitListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public OnInitListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.speech.tts.TextToSpeech_OnInitListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.speech.tts.OnInitListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -280,10 +283,13 @@ public partial class OnInitListenerDirect : OnInitListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.speech.tts.TextToSpeech$OnInitListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.speech.tts.TextToSpeech$OnInitListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -307,7 +313,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.OnUtteranceCompletedListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnUtteranceCompletedListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -315,10 +321,13 @@ public partial class OnUtteranceCompletedListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public OnUtteranceCompletedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.speech.tts.TextToSpeech_OnUtteranceCompletedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.speech.tts.OnUtteranceCompletedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -340,10 +349,13 @@ public partial class OnUtteranceCompletedListenerDirect : OnUtteranceCompletedLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.speech.tts.TextToSpeech$OnUtteranceCompletedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.speech.tts.TextToSpeech$OnUtteranceCompletedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -377,12 +389,12 @@ public partial class TextToSpeechService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TextToSpeechService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextToSpeechService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextToSpeechService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TextToSpeechService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextToSpeechService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextToSpeechService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -417,38 +429,26 @@ public TextToSpeechService(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html"/>
     /// </summary>
-    public partial class UtteranceProgressListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class UtteranceProgressListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UtteranceProgressListener>
     {
+        const string _bridgeClassName = "android.speech.tts.UtteranceProgressListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public UtteranceProgressListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region UtteranceProgressListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="UtteranceProgressListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class UtteranceProgressListenerDirect : UtteranceProgressListener
-    {
+        [global::System.Obsolete("UtteranceProgressListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public UtteranceProgressListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("UtteranceProgressListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public UtteranceProgressListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.speech.tts.UtteranceProgressListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -465,6 +465,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Speech/Tts/SynthesisCallback.cs b/src/net/Netdroid/Generated/Android/Speech/Tts/SynthesisCallback.cs
index 047253602..b9f055c97 100644
--- a/src/net/Netdroid/Generated/Android/Speech/Tts/SynthesisCallback.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/Tts/SynthesisCallback.cs
@@ -64,13 +64,6 @@ public partial class SynthesisCallback : Android.Speech.Tts.ISynthesisCallback
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisCallback.html#getMaxBufferSize()"/> 
-        /// </summary>
-        public int MaxBufferSize
-        {
-            get { return IExecuteWithSignature<int>("getMaxBufferSize", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisCallback.html#hasFinished()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -106,6 +99,14 @@ public int Done()
             return IExecuteWithSignature<int>("done", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisCallback.html#getMaxBufferSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxBufferSize()
+        {
+            return IExecuteWithSignature<int>("getMaxBufferSize", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisCallback.html#start(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Speech/Tts/SynthesisRequest.cs b/src/net/Netdroid/Generated/Android/Speech/Tts/SynthesisRequest.cs
index 48fa336a8..2a03629e9 100644
--- a/src/net/Netdroid/Generated/Android/Speech/Tts/SynthesisRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/Tts/SynthesisRequest.cs
@@ -64,75 +64,85 @@ public SynthesisRequest(Java.Lang.String arg0, Android.Os.Bundle arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getCallerUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getParams()"/>
         /// </summary>
-        public int CallerUid
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetParams()
         {
-            get { return IExecuteWithSignature<int>("getCallerUid", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getParams", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getCharSequenceText()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getCallerUid()"/>
         /// </summary>
-        public Java.Lang.CharSequence CharSequenceText
+        /// <returns><see cref="int"/></returns>
+        public int GetCallerUid()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCharSequenceText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getCallerUid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getCountry()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getPitch()"/>
         /// </summary>
-        public Java.Lang.String Country
+        /// <returns><see cref="int"/></returns>
+        public int GetPitch()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCountry", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPitch", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getLanguage()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getSpeechRate()"/>
         /// </summary>
-        public Java.Lang.String Language
+        /// <returns><see cref="int"/></returns>
+        public int GetSpeechRate()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getSpeechRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getCharSequenceText()"/>
         /// </summary>
-        public Android.Os.Bundle Params
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetCharSequenceText()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getParams", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getCharSequenceText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getPitch()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getCountry()"/>
         /// </summary>
-        public int Pitch
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCountry()
         {
-            get { return IExecuteWithSignature<int>("getPitch", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCountry", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getSpeechRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getLanguage()"/>
         /// </summary>
-        public int SpeechRate
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLanguage()
         {
-            get { return IExecuteWithSignature<int>("getSpeechRate", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getText()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Text
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getVariant()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getVariant()"/>
         /// </summary>
-        public Java.Lang.String Variant
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVariant()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVariant", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getVariant", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getVoiceName()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/SynthesisRequest.html#getVoiceName()"/>
         /// </summary>
-        public Java.Lang.String VoiceName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVoiceName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVoiceName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getVoiceName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Speech/Tts/TextToSpeech.cs b/src/net/Netdroid/Generated/Android/Speech/Tts/TextToSpeech.cs
index 79b3fa908..efdd1c717 100644
--- a/src/net/Netdroid/Generated/Android/Speech/Tts/TextToSpeech.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/Tts/TextToSpeech.cs
@@ -169,79 +169,38 @@ public TextToSpeech(Android.Content.Context arg0, Android.Speech.Tts.TextToSpeec
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getMaxSpeechInputLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getMaxSpeechInputLength()"/>
         /// </summary>
-        public static int MaxSpeechInputLength
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxSpeechInputLength()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxSpeechInputLength", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxSpeechInputLength", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getAvailableLanguages()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Util.Locale> AvailableLanguages
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Util.Locale>>("getAvailableLanguages", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getDefaultEngine()"/> 
-        /// </summary>
-        public Java.Lang.String DefaultEngine
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDefaultEngine", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getDefaultLanguage()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Locale DefaultLanguage
-        {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getDefaultLanguage", "()Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getDefaultVoice()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getDefaultVoice()"/>
         /// </summary>
-        public Android.Speech.Tts.Voice DefaultVoice
+        /// <returns><see cref="Android.Speech.Tts.Voice"/></returns>
+        public Android.Speech.Tts.Voice GetDefaultVoice()
         {
-            get { return IExecuteWithSignature<Android.Speech.Tts.Voice>("getDefaultVoice", "()Landroid/speech/tts/Voice;"); }
+            return IExecuteWithSignature<Android.Speech.Tts.Voice>("getDefaultVoice", "()Landroid/speech/tts/Voice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getEngines()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getVoice()"/>
         /// </summary>
-        public Java.Util.List<Android.Speech.Tts.TextToSpeech.EngineInfo> Engines
+        /// <returns><see cref="Android.Speech.Tts.Voice"/></returns>
+        public Android.Speech.Tts.Voice GetVoice()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Speech.Tts.TextToSpeech.EngineInfo>>("getEngines", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getLanguage()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.Locale Language
-        {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLanguage", "()Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getVoice()"/> 
-        /// </summary>
-        public Android.Speech.Tts.Voice Voice
-        {
-            get { return IExecuteWithSignature<Android.Speech.Tts.Voice>("getVoice", "()Landroid/speech/tts/Voice;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getVoices()"/> 
-        /// </summary>
-        public Java.Util.Set<Android.Speech.Tts.Voice> Voices
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.Speech.Tts.Voice>>("getVoices", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Speech.Tts.Voice>("getVoice", "()Landroid/speech/tts/Voice;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#areDefaultsEnforced()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool AreDefaultsEnforced()
         {
             return IExecuteWithSignature<bool>("areDefaultsEnforced", "()Z");
@@ -291,7 +250,7 @@ public int AddEarcon(Java.Lang.String arg0, Java.Lang.String arg1, int arg2)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int AddEarcon(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecute<int>("addEarcon", arg0, arg1);
@@ -376,7 +335,7 @@ public int PlayEarcon(Java.Lang.String arg0, int arg1, Android.Os.Bundle arg2, J
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Util.HashMap"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int PlayEarcon(Java.Lang.String arg0, int arg1, Java.Util.HashMap<Java.Lang.String, Java.Lang.String> arg2)
         {
             return IExecute<int>("playEarcon", arg0, arg1, arg2);
@@ -388,7 +347,7 @@ public int PlayEarcon(Java.Lang.String arg0, int arg1, Java.Util.HashMap<Java.La
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Util.HashMap"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int PlaySilence(long arg0, int arg1, Java.Util.HashMap<Java.Lang.String, Java.Lang.String> arg2)
         {
             return IExecute<int>("playSilence", arg0, arg1, arg2);
@@ -418,7 +377,7 @@ public int SetAudioAttributes(Android.Media.AudioAttributes arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SetEngineByPackageName(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<int>("setEngineByPackageName", "(Ljava/lang/String;)I", arg0);
@@ -437,7 +396,7 @@ public int SetLanguage(Java.Util.Locale arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Speech.Tts.TextToSpeech.OnUtteranceCompletedListener"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SetOnUtteranceCompletedListener(Android.Speech.Tts.TextToSpeech.OnUtteranceCompletedListener arg0)
         {
             return IExecuteWithSignature<int>("setOnUtteranceCompletedListener", "(Landroid/speech/tts/TextToSpeech$OnUtteranceCompletedListener;)I", arg0);
@@ -497,7 +456,7 @@ public int Speak(Java.Lang.CharSequence arg0, int arg1, Android.Os.Bundle arg2,
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Util.HashMap"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int Speak(Java.Lang.String arg0, int arg1, Java.Util.HashMap<Java.Lang.String, Java.Lang.String> arg2)
         {
             return IExecute<int>("speak", arg0, arg1, arg2);
@@ -541,22 +500,72 @@ public int SynthesizeToFile(Java.Lang.CharSequence arg0, Android.Os.Bundle arg1,
         /// <param name="arg1"><see cref="Java.Util.HashMap"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int SynthesizeToFile(Java.Lang.String arg0, Java.Util.HashMap<Java.Lang.String, Java.Lang.String> arg1, Java.Lang.String arg2)
         {
             return IExecute<int>("synthesizeToFile", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getDefaultEngine()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDefaultEngine()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDefaultEngine", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getEngines()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Speech.Tts.TextToSpeech.EngineInfo> GetEngines()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Speech.Tts.TextToSpeech.EngineInfo>>("getEngines", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getDefaultLanguage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Locale GetDefaultLanguage()
+        {
+            return IExecuteWithSignature<Java.Util.Locale>("getDefaultLanguage", "()Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getLanguage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.Locale GetLanguage()
+        {
+            return IExecuteWithSignature<Java.Util.Locale>("getLanguage", "()Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getVoices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.Speech.Tts.Voice> GetVoices()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Android.Speech.Tts.Voice>>("getVoices", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getFeatures(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Set<Java.Lang.String> GetFeatures(Java.Util.Locale arg0)
         {
             return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFeatures", "(Ljava/util/Locale;)Ljava/util/Set;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#getAvailableLanguages()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Util.Locale> GetAvailableLanguages()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Util.Locale>>("getAvailableLanguages", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.html#shutdown()"/>
         /// </summary>
         public void Shutdown()
@@ -590,7 +599,7 @@ public Engine(Android.Speech.Tts.TextToSpeech arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#CHECK_VOICE_DATA_BAD_DATA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CHECK_VOICE_DATA_BAD_DATA { get { if (!_CHECK_VOICE_DATA_BAD_DATAReady) { _CHECK_VOICE_DATA_BAD_DATAContent = SGetField<int>(LocalBridgeClazz, "CHECK_VOICE_DATA_BAD_DATA"); _CHECK_VOICE_DATA_BAD_DATAReady = true; } return _CHECK_VOICE_DATA_BAD_DATAContent; } }
             private static int _CHECK_VOICE_DATA_BAD_DATAContent = default;
             private static bool _CHECK_VOICE_DATA_BAD_DATAReady = false; // this is used because in case of generics 
@@ -603,14 +612,14 @@ public Engine(Android.Speech.Tts.TextToSpeech arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#CHECK_VOICE_DATA_MISSING_DATA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CHECK_VOICE_DATA_MISSING_DATA { get { if (!_CHECK_VOICE_DATA_MISSING_DATAReady) { _CHECK_VOICE_DATA_MISSING_DATAContent = SGetField<int>(LocalBridgeClazz, "CHECK_VOICE_DATA_MISSING_DATA"); _CHECK_VOICE_DATA_MISSING_DATAReady = true; } return _CHECK_VOICE_DATA_MISSING_DATAContent; } }
             private static int _CHECK_VOICE_DATA_MISSING_DATAContent = default;
             private static bool _CHECK_VOICE_DATA_MISSING_DATAReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#CHECK_VOICE_DATA_MISSING_VOLUME"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int CHECK_VOICE_DATA_MISSING_VOLUME { get { if (!_CHECK_VOICE_DATA_MISSING_VOLUMEReady) { _CHECK_VOICE_DATA_MISSING_VOLUMEContent = SGetField<int>(LocalBridgeClazz, "CHECK_VOICE_DATA_MISSING_VOLUME"); _CHECK_VOICE_DATA_MISSING_VOLUMEReady = true; } return _CHECK_VOICE_DATA_MISSING_VOLUMEContent; } }
             private static int _CHECK_VOICE_DATA_MISSING_VOLUMEContent = default;
             private static bool _CHECK_VOICE_DATA_MISSING_VOLUMEReady = false; // this is used because in case of generics 
@@ -659,7 +668,7 @@ public Engine(Android.Speech.Tts.TextToSpeech arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#EXTRA_CHECK_VOICE_DATA_FOR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXTRA_CHECK_VOICE_DATA_FOR { get { if (!_EXTRA_CHECK_VOICE_DATA_FORReady) { _EXTRA_CHECK_VOICE_DATA_FORContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_CHECK_VOICE_DATA_FOR"); _EXTRA_CHECK_VOICE_DATA_FORReady = true; } return _EXTRA_CHECK_VOICE_DATA_FORContent; } }
             private static Java.Lang.String _EXTRA_CHECK_VOICE_DATA_FORContent = default;
             private static bool _EXTRA_CHECK_VOICE_DATA_FORReady = false; // this is used because in case of generics 
@@ -672,7 +681,7 @@ public Engine(Android.Speech.Tts.TextToSpeech arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#EXTRA_TTS_DATA_INSTALLED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXTRA_TTS_DATA_INSTALLED { get { if (!_EXTRA_TTS_DATA_INSTALLEDReady) { _EXTRA_TTS_DATA_INSTALLEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_TTS_DATA_INSTALLED"); _EXTRA_TTS_DATA_INSTALLEDReady = true; } return _EXTRA_TTS_DATA_INSTALLEDContent; } }
             private static Java.Lang.String _EXTRA_TTS_DATA_INSTALLEDContent = default;
             private static bool _EXTRA_TTS_DATA_INSTALLEDReady = false; // this is used because in case of generics 
@@ -685,21 +694,21 @@ public Engine(Android.Speech.Tts.TextToSpeech arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#EXTRA_VOICE_DATA_FILES"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXTRA_VOICE_DATA_FILES { get { if (!_EXTRA_VOICE_DATA_FILESReady) { _EXTRA_VOICE_DATA_FILESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_VOICE_DATA_FILES"); _EXTRA_VOICE_DATA_FILESReady = true; } return _EXTRA_VOICE_DATA_FILESContent; } }
             private static Java.Lang.String _EXTRA_VOICE_DATA_FILESContent = default;
             private static bool _EXTRA_VOICE_DATA_FILESReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#EXTRA_VOICE_DATA_FILES_INFO"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXTRA_VOICE_DATA_FILES_INFO { get { if (!_EXTRA_VOICE_DATA_FILES_INFOReady) { _EXTRA_VOICE_DATA_FILES_INFOContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_VOICE_DATA_FILES_INFO"); _EXTRA_VOICE_DATA_FILES_INFOReady = true; } return _EXTRA_VOICE_DATA_FILES_INFOContent; } }
             private static Java.Lang.String _EXTRA_VOICE_DATA_FILES_INFOContent = default;
             private static bool _EXTRA_VOICE_DATA_FILES_INFOReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#EXTRA_VOICE_DATA_ROOT_DIRECTORY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String EXTRA_VOICE_DATA_ROOT_DIRECTORY { get { if (!_EXTRA_VOICE_DATA_ROOT_DIRECTORYReady) { _EXTRA_VOICE_DATA_ROOT_DIRECTORYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_VOICE_DATA_ROOT_DIRECTORY"); _EXTRA_VOICE_DATA_ROOT_DIRECTORYReady = true; } return _EXTRA_VOICE_DATA_ROOT_DIRECTORYContent; } }
             private static Java.Lang.String _EXTRA_VOICE_DATA_ROOT_DIRECTORYContent = default;
             private static bool _EXTRA_VOICE_DATA_ROOT_DIRECTORYReady = false; // this is used because in case of generics 
@@ -712,7 +721,7 @@ public Engine(Android.Speech.Tts.TextToSpeech arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#KEY_FEATURE_EMBEDDED_SYNTHESIS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String KEY_FEATURE_EMBEDDED_SYNTHESIS { get { if (!_KEY_FEATURE_EMBEDDED_SYNTHESISReady) { _KEY_FEATURE_EMBEDDED_SYNTHESISContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_FEATURE_EMBEDDED_SYNTHESIS"); _KEY_FEATURE_EMBEDDED_SYNTHESISReady = true; } return _KEY_FEATURE_EMBEDDED_SYNTHESISContent; } }
             private static Java.Lang.String _KEY_FEATURE_EMBEDDED_SYNTHESISContent = default;
             private static bool _KEY_FEATURE_EMBEDDED_SYNTHESISReady = false; // this is used because in case of generics 
@@ -725,7 +734,7 @@ public Engine(Android.Speech.Tts.TextToSpeech arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.Engine.html#KEY_FEATURE_NETWORK_SYNTHESIS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String KEY_FEATURE_NETWORK_SYNTHESIS { get { if (!_KEY_FEATURE_NETWORK_SYNTHESISReady) { _KEY_FEATURE_NETWORK_SYNTHESISContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_FEATURE_NETWORK_SYNTHESIS"); _KEY_FEATURE_NETWORK_SYNTHESISReady = true; } return _KEY_FEATURE_NETWORK_SYNTHESISContent; } }
             private static Java.Lang.String _KEY_FEATURE_NETWORK_SYNTHESISContent = default;
             private static bool _KEY_FEATURE_NETWORK_SYNTHESISReady = false; // this is used because in case of generics 
@@ -864,7 +873,7 @@ public partial class OnInitListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onInit", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnInitEventHandler));
+                AddEventHandler("onInit", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnInitEventHandler));
 
             }
 
@@ -872,7 +881,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.OnInitListener.html#onInit(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnInit"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnInit { get; set; } = null;
+            public global::System.Action<int> OnOnInit { get; set; } = null;
 
             void OnInitEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -963,7 +972,7 @@ public partial class OnUtteranceCompletedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onUtteranceCompleted", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnUtteranceCompletedEventHandler));
+                AddEventHandler("onUtteranceCompleted", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnUtteranceCompletedEventHandler));
 
             }
 
@@ -971,7 +980,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.OnUtteranceCompletedListener.html#onUtteranceCompleted(java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnUtteranceCompleted"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String> OnOnUtteranceCompleted { get; set; } = null;
+            public global::System.Action<Java.Lang.String> OnOnUtteranceCompleted { get; set; } = null;
 
             void OnUtteranceCompletedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -983,7 +992,7 @@ void OnUtteranceCompletedEventHandler(object sender, CLRListenerEventArgs<CLREve
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.OnUtteranceCompletedListener.html#onUtteranceCompleted(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnUtteranceCompleted(Java.Lang.String arg0)
             {
                 
@@ -1023,7 +1032,7 @@ public partial class OnUtteranceCompletedListenerDirect
             /// <see href="https://developer.android.com/reference/android/speech/tts/TextToSpeech.OnUtteranceCompletedListener.html#onUtteranceCompleted(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnUtteranceCompleted(Java.Lang.String arg0)
             {
                 IExecuteWithSignature("onUtteranceCompleted", "(Ljava/lang/String;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Speech/Tts/UtteranceProgressListener.cs b/src/net/Netdroid/Generated/Android/Speech/Tts/UtteranceProgressListener.cs
index e3d17ab23..84588382d 100644
--- a/src/net/Netdroid/Generated/Android/Speech/Tts/UtteranceProgressListener.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/Tts/UtteranceProgressListener.cs
@@ -44,236 +44,12 @@ public partial class UtteranceProgressListener
 
         #endregion
 
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="UtteranceProgressListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onDone", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDoneEventHandler));
-            AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnErrorEventHandler));
-            AddEventHandler("onStart", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnStartEventHandler));
-            AddEventHandler("onAudioAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnAudioAvailableEventHandler));
-            AddEventHandler("onBeginSynthesis", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnBeginSynthesisEventHandler));
-            AddEventHandler("onError2", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnError2EventHandler));
-            AddEventHandler("onRangeStart", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnRangeStartEventHandler));
-            AddEventHandler("onStop", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnStopEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onDone(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnDone"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnOnDone { get; set; } = null;
-
-        void OnDoneEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnDone != null) ? OnOnDone : OnDone;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onDone(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        public virtual void OnDone(Java.Lang.String arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onError(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnOnError { get; set; } = null;
-
-        void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnError != null) ? OnOnError : OnError;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onError(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
-        public virtual void OnError(Java.Lang.String arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onStart(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnOnStart { get; set; } = null;
-
-        void OnStartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnStart != null) ? OnOnStart : OnStart;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onStart(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        public virtual void OnStart(Java.Lang.String arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onAudioAvailable(java.lang.String,byte[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnAudioAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, byte[]> OnOnAudioAvailable { get; set; } = null;
-
-        void OnAudioAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnAudioAvailable != null) ? OnOnAudioAvailable : OnAudioAvailable;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<byte[]>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onAudioAvailable(java.lang.String,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        public virtual void OnAudioAvailable(Java.Lang.String arg0, byte[] arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onBeginSynthesis(java.lang.String,int,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnBeginSynthesis"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, int, int, int> OnOnBeginSynthesis { get; set; } = null;
-
-        void OnBeginSynthesisEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnBeginSynthesis != null) ? OnOnBeginSynthesis : OnBeginSynthesis;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onBeginSynthesis(java.lang.String,int,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        public virtual void OnBeginSynthesis(Java.Lang.String arg0, int arg1, int arg2, int arg3)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onError(java.lang.String,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnError2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, int> OnOnError2 { get; set; } = null;
-
-        void OnError2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnError2 != null) ? OnOnError2 : OnError;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onError(java.lang.String,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public virtual void OnError(Java.Lang.String arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onRangeStart(java.lang.String,int,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnRangeStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, int, int, int> OnOnRangeStart { get; set; } = null;
-
-        void OnRangeStartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnRangeStart != null) ? OnOnRangeStart : OnRangeStart;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onRangeStart(java.lang.String,int,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        public virtual void OnRangeStart(Java.Lang.String arg0, int arg1, int arg2, int arg3)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onStop(java.lang.String,boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnStop"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, bool> OnOnStop { get; set; } = null;
-
-        void OnStopEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnOnStop != null) ? OnOnStop : OnStop;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<bool>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onStop(java.lang.String,boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        public virtual void OnStop(Java.Lang.String arg0, bool arg1)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region UtteranceProgressListenerDirect
-    public partial class UtteranceProgressListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
         #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onDone(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        public override void OnDone(Java.Lang.String arg0)
+        public void OnDone(Java.Lang.String arg0)
         {
             IExecuteWithSignature("onDone", "(Ljava/lang/String;)V", arg0);
         }
@@ -281,8 +57,8 @@ public override void OnDone(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onError(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
-        public override void OnError(Java.Lang.String arg0)
+        [global::System.Obsolete()]
+        public void OnError(Java.Lang.String arg0)
         {
             IExecuteWithSignature("onError", "(Ljava/lang/String;)V", arg0);
         }
@@ -290,7 +66,7 @@ public override void OnError(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/speech/tts/UtteranceProgressListener.html#onStart(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        public override void OnStart(Java.Lang.String arg0)
+        public void OnStart(Java.Lang.String arg0)
         {
             IExecuteWithSignature("onStart", "(Ljava/lang/String;)V", arg0);
         }
@@ -299,7 +75,7 @@ public override void OnStart(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
-        public override void OnAudioAvailable(Java.Lang.String arg0, byte[] arg1)
+        public void OnAudioAvailable(Java.Lang.String arg0, byte[] arg1)
         {
             IExecute("onAudioAvailable", arg0, arg1);
         }
@@ -310,7 +86,7 @@ public override void OnAudioAvailable(Java.Lang.String arg0, byte[] arg1)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        public override void OnBeginSynthesis(Java.Lang.String arg0, int arg1, int arg2, int arg3)
+        public void OnBeginSynthesis(Java.Lang.String arg0, int arg1, int arg2, int arg3)
         {
             IExecute("onBeginSynthesis", arg0, arg1, arg2, arg3);
         }
@@ -319,7 +95,7 @@ public override void OnBeginSynthesis(Java.Lang.String arg0, int arg1, int arg2,
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        public override void OnError(Java.Lang.String arg0, int arg1)
+        public void OnError(Java.Lang.String arg0, int arg1)
         {
             IExecute("onError", arg0, arg1);
         }
@@ -330,7 +106,7 @@ public override void OnError(Java.Lang.String arg0, int arg1)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        public override void OnRangeStart(Java.Lang.String arg0, int arg1, int arg2, int arg3)
+        public void OnRangeStart(Java.Lang.String arg0, int arg1, int arg2, int arg3)
         {
             IExecute("onRangeStart", arg0, arg1, arg2, arg3);
         }
@@ -339,7 +115,7 @@ public override void OnRangeStart(Java.Lang.String arg0, int arg1, int arg2, int
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        public override void OnStop(Java.Lang.String arg0, bool arg1)
+        public void OnStop(Java.Lang.String arg0, bool arg1)
         {
             IExecute("onStop", arg0, arg1);
         }
diff --git a/src/net/Netdroid/Generated/Android/Speech/Tts/Voice.cs b/src/net/Netdroid/Generated/Android/Speech/Tts/Voice.cs
index cbbbe55ad..0897bbc3e 100644
--- a/src/net/Netdroid/Generated/Android/Speech/Tts/Voice.cs
+++ b/src/net/Netdroid/Generated/Android/Speech/Tts/Voice.cs
@@ -125,55 +125,60 @@ public Voice(Java.Lang.String arg0, Java.Util.Locale arg1, int arg2, int arg3, b
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getFeatures()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#isNetworkConnectionRequired()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> Features
+        /// <returns><see cref="bool"/></returns>
+        public bool IsNetworkConnectionRequired()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFeatures", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<bool>("isNetworkConnectionRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getLatency()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#describeContents()"/>
         /// </summary>
-        public int Latency
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getLatency", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getLatency()"/>
         /// </summary>
-        public Java.Util.Locale Locale
+        /// <returns><see cref="int"/></returns>
+        public int GetLatency()
         {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
+            return IExecuteWithSignature<int>("getLatency", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getQuality()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetQuality()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getQuality", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getQuality()"/> 
+        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getName()"/>
         /// </summary>
-        public int Quality
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<int>("getQuality", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#isNetworkConnectionRequired()"/>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getLocale()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsNetworkConnectionRequired()
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
         {
-            return IExecuteWithSignature<bool>("isNetworkConnectionRequired", "()Z");
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#getFeatures()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetFeatures()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFeatures", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/speech/tts/Voice.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/System/AllPackageClasses.cs
similarity index 99%
rename from src/net/Netdroid/Generated/Android/SystemNs/AllPackageClasses.cs
rename to src/net/Netdroid/Generated/Android/System/AllPackageClasses.cs
index 7ed484d86..ba0c81f57 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/System/AllPackageClasses.cs
@@ -24,7 +24,7 @@
 using MASES.JCOBridge.C2JBridge.JVMInterop;
 using System;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region ErrnoException
     /// <summary>
@@ -399,7 +399,7 @@ public StructStatVfs(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/system/StructTimespec.html"/>
     /// </summary>
-    public partial class StructTimespec : Java.Lang.Comparable<Android.SystemNs.StructTimespec>
+    public partial class StructTimespec : Java.Lang.Comparable<Android.System.StructTimespec>
     {
         const string _bridgeClassName = "android.system.StructTimespec";
         /// <summary>
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/ErrnoException.cs b/src/net/Netdroid/Generated/Android/System/ErrnoException.cs
similarity index 97%
rename from src/net/Netdroid/Generated/Android/SystemNs/ErrnoException.cs
rename to src/net/Netdroid/Generated/Android/System/ErrnoException.cs
index a20da6cbc..550a5f595 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/ErrnoException.cs
+++ b/src/net/Netdroid/Generated/Android/System/ErrnoException.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region ErrnoException
     public partial class ErrnoException
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/Int64Ref.cs b/src/net/Netdroid/Generated/Android/System/Int64Ref.cs
similarity index 98%
rename from src/net/Netdroid/Generated/Android/SystemNs/Int64Ref.cs
rename to src/net/Netdroid/Generated/Android/System/Int64Ref.cs
index 8fc5dddc8..caa8bbe2d 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/Int64Ref.cs
+++ b/src/net/Netdroid/Generated/Android/System/Int64Ref.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region Int64Ref
     public partial class Int64Ref
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/Os.cs b/src/net/Netdroid/Generated/Android/System/Os.cs
similarity index 82%
rename from src/net/Netdroid/Generated/Android/SystemNs/Os.cs
rename to src/net/Netdroid/Generated/Android/System/Os.cs
index 67ec6f556..3a83f7754 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/Os.cs
+++ b/src/net/Netdroid/Generated/Android/System/Os.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region Os
     public partial class Os
@@ -42,107 +42,54 @@ public partial class Os
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/Os.html#getegid()"/> <see href="https://developer.android.com/reference/android/system/Os.html#setegid(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public static int Egid
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getegid", "()I"); } set { SExecuteWithSignature(LocalBridgeClazz, "setegid", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/Os.html#geteuid()"/> <see href="https://developer.android.com/reference/android/system/Os.html#seteuid(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public static int Euid
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "geteuid", "()I"); } set { SExecuteWithSignature(LocalBridgeClazz, "seteuid", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/Os.html#getgid()"/> <see href="https://developer.android.com/reference/android/system/Os.html#setgid(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public static int Gid
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getgid", "()I"); } set { SExecuteWithSignature(LocalBridgeClazz, "setgid", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/Os.html#getpid()"/> 
-        /// </summary>
-        public static int Pid
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getpid", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/Os.html#getppid()"/> 
-        /// </summary>
-        public static int Ppid
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getppid", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/Os.html#gettid()"/> 
-        /// </summary>
-        public static int Tid
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "gettid", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/Os.html#getuid()"/> <see href="https://developer.android.com/reference/android/system/Os.html#setuid(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public static int Uid
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getuid", "()I"); } set { SExecuteWithSignature(LocalBridgeClazz, "setuid", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#fstat(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <returns><see cref="Android.SystemNs.StructStat"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static Android.SystemNs.StructStat Fstat(Java.Io.FileDescriptor arg0)
+        /// <returns><see cref="Android.System.StructStat"/></returns>
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static Android.System.StructStat Fstat(Java.Io.FileDescriptor arg0)
         {
-            return SExecuteWithSignature<Android.SystemNs.StructStat>(LocalBridgeClazz, "fstat", "(Ljava/io/FileDescriptor;)Landroid/system/StructStat;", arg0);
+            return SExecuteWithSignature<Android.System.StructStat>(LocalBridgeClazz, "fstat", "(Ljava/io/FileDescriptor;)Landroid/system/StructStat;", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#lstat(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.SystemNs.StructStat"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static Android.SystemNs.StructStat Lstat(Java.Lang.String arg0)
+        /// <returns><see cref="Android.System.StructStat"/></returns>
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static Android.System.StructStat Lstat(Java.Lang.String arg0)
         {
-            return SExecuteWithSignature<Android.SystemNs.StructStat>(LocalBridgeClazz, "lstat", "(Ljava/lang/String;)Landroid/system/StructStat;", arg0);
+            return SExecuteWithSignature<Android.System.StructStat>(LocalBridgeClazz, "lstat", "(Ljava/lang/String;)Landroid/system/StructStat;", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#stat(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.SystemNs.StructStat"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static Android.SystemNs.StructStat Stat(Java.Lang.String arg0)
+        /// <returns><see cref="Android.System.StructStat"/></returns>
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static Android.System.StructStat Stat(Java.Lang.String arg0)
         {
-            return SExecuteWithSignature<Android.SystemNs.StructStat>(LocalBridgeClazz, "stat", "(Ljava/lang/String;)Landroid/system/StructStat;", arg0);
+            return SExecuteWithSignature<Android.System.StructStat>(LocalBridgeClazz, "stat", "(Ljava/lang/String;)Landroid/system/StructStat;", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#fstatvfs(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <returns><see cref="Android.SystemNs.StructStatVfs"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static Android.SystemNs.StructStatVfs Fstatvfs(Java.Io.FileDescriptor arg0)
+        /// <returns><see cref="Android.System.StructStatVfs"/></returns>
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static Android.System.StructStatVfs Fstatvfs(Java.Io.FileDescriptor arg0)
         {
-            return SExecuteWithSignature<Android.SystemNs.StructStatVfs>(LocalBridgeClazz, "fstatvfs", "(Ljava/io/FileDescriptor;)Landroid/system/StructStatVfs;", arg0);
+            return SExecuteWithSignature<Android.System.StructStatVfs>(LocalBridgeClazz, "fstatvfs", "(Ljava/io/FileDescriptor;)Landroid/system/StructStatVfs;", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#statvfs(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.SystemNs.StructStatVfs"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static Android.SystemNs.StructStatVfs Statvfs(Java.Lang.String arg0)
+        /// <returns><see cref="Android.System.StructStatVfs"/></returns>
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static Android.System.StructStatVfs Statvfs(Java.Lang.String arg0)
         {
-            return SExecuteWithSignature<Android.SystemNs.StructStatVfs>(LocalBridgeClazz, "statvfs", "(Ljava/lang/String;)Landroid/system/StructStatVfs;", arg0);
+            return SExecuteWithSignature<Android.System.StructStatVfs>(LocalBridgeClazz, "statvfs", "(Ljava/lang/String;)Landroid/system/StructStatVfs;", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#getsockoptTimeval(java.io.FileDescriptor,int,int)"/>
@@ -150,19 +97,19 @@ public static Android.SystemNs.StructStatVfs Statvfs(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Android.SystemNs.StructTimeval"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static Android.SystemNs.StructTimeval GetsockoptTimeval(Java.Io.FileDescriptor arg0, int arg1, int arg2)
+        /// <returns><see cref="Android.System.StructTimeval"/></returns>
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static Android.System.StructTimeval GetsockoptTimeval(Java.Io.FileDescriptor arg0, int arg1, int arg2)
         {
-            return SExecute<Android.SystemNs.StructTimeval>(LocalBridgeClazz, "getsockoptTimeval", arg0, arg1, arg2);
+            return SExecute<Android.System.StructTimeval>(LocalBridgeClazz, "getsockoptTimeval", arg0, arg1, arg2);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#uname()"/>
         /// </summary>
-        /// <returns><see cref="Android.SystemNs.StructUtsname"/></returns>
-        public static Android.SystemNs.StructUtsname Uname()
+        /// <returns><see cref="Android.System.StructUtsname"/></returns>
+        public static Android.System.StructUtsname Uname()
         {
-            return SExecuteWithSignature<Android.SystemNs.StructUtsname>(LocalBridgeClazz, "uname", "()Landroid/system/StructUtsname;");
+            return SExecuteWithSignature<Android.System.StructUtsname>(LocalBridgeClazz, "uname", "()Landroid/system/StructUtsname;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#access(java.lang.String,int)"/>
@@ -170,7 +117,7 @@ public static Android.SystemNs.StructUtsname Uname()
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static bool Access(Java.Lang.String arg0, int arg1)
         {
             return SExecute<bool>(LocalBridgeClazz, "access", arg0, arg1);
@@ -190,7 +137,7 @@ public static bool Isatty(Java.Io.FileDescriptor arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static byte[] Getxattr(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return SExecuteArray<byte>(LocalBridgeClazz, "getxattr", arg0, arg1);
@@ -202,12 +149,68 @@ public static byte[] Getxattr(Java.Lang.String arg0, Java.Lang.String arg1)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static int FcntlInt(Java.Io.FileDescriptor arg0, int arg1, int arg2)
         {
             return SExecute<int>(LocalBridgeClazz, "fcntlInt", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#getegid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int Getegid()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getegid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#geteuid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int Geteuid()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "geteuid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#getgid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int Getgid()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getgid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#getpid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int Getpid()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getpid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#getppid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int Getppid()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getppid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#gettid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int Gettid()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "gettid", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#getuid()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int Getuid()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getuid", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#if_nametoindex(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -219,11 +222,11 @@ public static int If_nametoindex(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#poll(android.system.StructPollfd[],int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.SystemNs.StructPollfd"/></param>
+        /// <param name="arg0"><see cref="Android.System.StructPollfd"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static int Poll(Android.SystemNs.StructPollfd[] arg0, int arg1)
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static int Poll(Android.System.StructPollfd[] arg0, int arg1)
         {
             return SExecute<int>(LocalBridgeClazz, "poll", arg0, arg1);
         }
@@ -236,7 +239,7 @@ public static int Poll(Android.SystemNs.StructPollfd[] arg0, int arg1)
         /// <param name="arg3"><see cref="long"/></param>
         /// <param name="arg4"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static int Prctl(int arg0, long arg1, long arg2, long arg3, long arg4)
         {
             return SExecute<int>(LocalBridgeClazz, "prctl", arg0, arg1, arg2, arg3, arg4);
@@ -250,7 +253,7 @@ public static int Prctl(int arg0, long arg1, long arg2, long arg3, long arg4)
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Pread(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int arg3, long arg4)
         {
@@ -263,7 +266,7 @@ public static int Pread(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg2"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Pread(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1, long arg2)
         {
@@ -278,7 +281,7 @@ public static int Pread(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1, l
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Pwrite(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int arg3, long arg4)
         {
@@ -291,7 +294,7 @@ public static int Pwrite(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg2"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Pwrite(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1, long arg2)
         {
@@ -305,7 +308,7 @@ public static int Pwrite(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1,
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Read(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int arg3)
         {
@@ -317,7 +320,7 @@ public static int Read(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int a
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Read(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1)
         {
@@ -331,7 +334,7 @@ public static int Read(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Readv(Java.Io.FileDescriptor arg0, object[] arg1, int[] arg2, int[] arg3)
         {
@@ -347,7 +350,7 @@ public static int Readv(Java.Io.FileDescriptor arg0, object[] arg1, int[] arg2,
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Java.Net.InetSocketAddress"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static int Recvfrom(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int arg3, int arg4, Java.Net.InetSocketAddress arg5)
         {
@@ -361,7 +364,7 @@ public static int Recvfrom(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, i
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Java.Net.InetSocketAddress"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static int Recvfrom(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1, int arg2, Java.Net.InetSocketAddress arg3)
         {
@@ -371,12 +374,12 @@ public static int Recvfrom(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1
         /// <see href="https://developer.android.com/reference/android/system/Os.html#recvmsg(java.io.FileDescriptor,android.system.StructMsghdr,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <param name="arg1"><see cref="Android.SystemNs.StructMsghdr"/></param>
+        /// <param name="arg1"><see cref="Android.System.StructMsghdr"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
-        public static int Recvmsg(Java.Io.FileDescriptor arg0, Android.SystemNs.StructMsghdr arg1, int arg2)
+        public static int Recvmsg(Java.Io.FileDescriptor arg0, Android.System.StructMsghdr arg1, int arg2)
         {
             return SExecute<int>(LocalBridgeClazz, "recvmsg", arg0, arg1, arg2);
         }
@@ -384,12 +387,12 @@ public static int Recvmsg(Java.Io.FileDescriptor arg0, Android.SystemNs.StructMs
         /// <see href="https://developer.android.com/reference/android/system/Os.html#sendmsg(java.io.FileDescriptor,android.system.StructMsghdr,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <param name="arg1"><see cref="Android.SystemNs.StructMsghdr"/></param>
+        /// <param name="arg1"><see cref="Android.System.StructMsghdr"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
-        public static int Sendmsg(Java.Io.FileDescriptor arg0, Android.SystemNs.StructMsghdr arg1, int arg2)
+        public static int Sendmsg(Java.Io.FileDescriptor arg0, Android.System.StructMsghdr arg1, int arg2)
         {
             return SExecute<int>(LocalBridgeClazz, "sendmsg", arg0, arg1, arg2);
         }
@@ -404,7 +407,7 @@ public static int Sendmsg(Java.Io.FileDescriptor arg0, Android.SystemNs.StructMs
         /// <param name="arg5"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg6"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static int Sendto(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int arg3, int arg4, Java.Net.InetAddress arg5, int arg6)
         {
@@ -420,7 +423,7 @@ public static int Sendto(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static int Sendto(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int arg3, int arg4, Java.Net.SocketAddress arg5)
         {
@@ -435,7 +438,7 @@ public static int Sendto(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int
         /// <param name="arg3"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static int Sendto(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1, int arg2, Java.Net.InetAddress arg3, int arg4)
         {
@@ -445,7 +448,7 @@ public static int Sendto(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1,
         /// <see href="https://developer.android.com/reference/android/system/Os.html#setsid()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static int Setsid()
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "setsid", "()I");
@@ -467,7 +470,7 @@ public static int Umask(int arg0)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Write(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int arg3)
         {
@@ -479,7 +482,7 @@ public static int Write(Java.Io.FileDescriptor arg0, byte[] arg1, int arg2, int
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Write(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1)
         {
@@ -493,7 +496,7 @@ public static int Write(Java.Io.FileDescriptor arg0, Java.Nio.ByteBuffer arg1)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Io.InterruptedIOException"/>
         public static int Writev(Java.Io.FileDescriptor arg0, object[] arg1, int[] arg2, int[] arg3)
         {
@@ -505,7 +508,7 @@ public static int Writev(Java.Io.FileDescriptor arg0, object[] arg1, int[] arg2,
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="Java.Net.InetSocketAddress"/></param>
         /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static Java.Io.FileDescriptor Accept(Java.Io.FileDescriptor arg0, Java.Net.InetSocketAddress arg1)
         {
@@ -516,7 +519,7 @@ public static Java.Io.FileDescriptor Accept(Java.Io.FileDescriptor arg0, Java.Ne
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Io.FileDescriptor Dup(Java.Io.FileDescriptor arg0)
         {
             return SExecuteWithSignature<Java.Io.FileDescriptor>(LocalBridgeClazz, "dup", "(Ljava/io/FileDescriptor;)Ljava/io/FileDescriptor;", arg0);
@@ -527,7 +530,7 @@ public static Java.Io.FileDescriptor Dup(Java.Io.FileDescriptor arg0)
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Io.FileDescriptor Dup2(Java.Io.FileDescriptor arg0, int arg1)
         {
             return SExecute<Java.Io.FileDescriptor>(LocalBridgeClazz, "dup2", arg0, arg1);
@@ -538,7 +541,7 @@ public static Java.Io.FileDescriptor Dup2(Java.Io.FileDescriptor arg0, int arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Io.FileDescriptor Memfd_create(Java.Lang.String arg0, int arg1)
         {
             return SExecute<Java.Io.FileDescriptor>(LocalBridgeClazz, "memfd_create", arg0, arg1);
@@ -550,7 +553,7 @@ public static Java.Io.FileDescriptor Memfd_create(Java.Lang.String arg0, int arg
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Io.FileDescriptor Open(Java.Lang.String arg0, int arg1, int arg2)
         {
             return SExecute<Java.Io.FileDescriptor>(LocalBridgeClazz, "open", arg0, arg1, arg2);
@@ -562,7 +565,7 @@ public static Java.Io.FileDescriptor Open(Java.Lang.String arg0, int arg1, int a
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Io.FileDescriptor Socket(int arg0, int arg1, int arg2)
         {
             return SExecute<Java.Io.FileDescriptor>(LocalBridgeClazz, "socket", arg0, arg1, arg2);
@@ -571,7 +574,7 @@ public static Java.Io.FileDescriptor Socket(int arg0, int arg1, int arg2)
         /// <see href="https://developer.android.com/reference/android/system/Os.html#pipe()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Io.FileDescriptor[] Pipe()
         {
             return SExecuteWithSignatureArray<Java.Io.FileDescriptor>(LocalBridgeClazz, "pipe", "()[Ljava/io/FileDescriptor;");
@@ -608,7 +611,7 @@ public static Java.Lang.String If_indextoname(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Lang.String Readlink(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "readlink", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
@@ -644,7 +647,7 @@ public static Java.Lang.String[] Environ()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Lang.String[] Listxattr(Java.Lang.String arg0)
         {
             return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "listxattr", "(Ljava/lang/String;)[Ljava/lang/String;", arg0);
@@ -664,7 +667,7 @@ public static Java.Net.InetAddress Inet_pton(int arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <returns><see cref="Java.Net.SocketAddress"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Net.SocketAddress Getpeername(Java.Io.FileDescriptor arg0)
         {
             return SExecuteWithSignature<Java.Net.SocketAddress>(LocalBridgeClazz, "getpeername", "(Ljava/io/FileDescriptor;)Ljava/net/SocketAddress;", arg0);
@@ -674,7 +677,7 @@ public static Java.Net.SocketAddress Getpeername(Java.Io.FileDescriptor arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <returns><see cref="Java.Net.SocketAddress"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static Java.Net.SocketAddress Getsockname(Java.Io.FileDescriptor arg0)
         {
             return SExecuteWithSignature<Java.Net.SocketAddress>(LocalBridgeClazz, "getsockname", "(Ljava/io/FileDescriptor;)Ljava/net/SocketAddress;", arg0);
@@ -686,7 +689,7 @@ public static Java.Net.SocketAddress Getsockname(Java.Io.FileDescriptor arg0)
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static long Lseek(Java.Io.FileDescriptor arg0, long arg1, int arg2)
         {
             return SExecute<long>(LocalBridgeClazz, "lseek", arg0, arg1, arg2);
@@ -701,7 +704,7 @@ public static long Lseek(Java.Io.FileDescriptor arg0, long arg1, int arg2)
         /// <param name="arg4"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg5"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static long Mmap(long arg0, long arg1, int arg2, int arg3, Java.Io.FileDescriptor arg4, long arg5)
         {
             return SExecute<long>(LocalBridgeClazz, "mmap", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -711,11 +714,11 @@ public static long Mmap(long arg0, long arg1, int arg2, int arg3, Java.Io.FileDe
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <param name="arg2"><see cref="Android.SystemNs.Int64Ref"/></param>
+        /// <param name="arg2"><see cref="Android.System.Int64Ref"/></param>
         /// <param name="arg3"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static long Sendfile(Java.Io.FileDescriptor arg0, Java.Io.FileDescriptor arg1, Android.SystemNs.Int64Ref arg2, long arg3)
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static long Sendfile(Java.Io.FileDescriptor arg0, Java.Io.FileDescriptor arg1, Android.System.Int64Ref arg2, long arg3)
         {
             return SExecute<long>(LocalBridgeClazz, "sendfile", arg0, arg1, arg2, arg3);
         }
@@ -734,7 +737,7 @@ public static long Sysconf(int arg0)
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static void Bind(Java.Io.FileDescriptor arg0, Java.Net.InetAddress arg1, int arg2)
         {
@@ -745,7 +748,7 @@ public static void Bind(Java.Io.FileDescriptor arg0, Java.Net.InetAddress arg1,
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="Java.Net.SocketAddress"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static void Bind(Java.Io.FileDescriptor arg0, Java.Net.SocketAddress arg1)
         {
@@ -756,7 +759,7 @@ public static void Bind(Java.Io.FileDescriptor arg0, Java.Net.SocketAddress arg1
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Chmod(Java.Lang.String arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "chmod", arg0, arg1);
@@ -767,7 +770,7 @@ public static void Chmod(Java.Lang.String arg0, int arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Chown(Java.Lang.String arg0, int arg1, int arg2)
         {
             SExecute(LocalBridgeClazz, "chown", arg0, arg1, arg2);
@@ -776,7 +779,7 @@ public static void Chown(Java.Lang.String arg0, int arg1, int arg2)
         /// <see href="https://developer.android.com/reference/android/system/Os.html#close(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Close(Java.Io.FileDescriptor arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "close", "(Ljava/io/FileDescriptor;)V", arg0);
@@ -787,7 +790,7 @@ public static void Close(Java.Io.FileDescriptor arg0)
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static void Connect(Java.Io.FileDescriptor arg0, Java.Net.InetAddress arg1, int arg2)
         {
@@ -798,7 +801,7 @@ public static void Connect(Java.Io.FileDescriptor arg0, Java.Net.InetAddress arg
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="Java.Net.SocketAddress"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         /// <exception cref="Java.Net.SocketException"/>
         public static void Connect(Java.Io.FileDescriptor arg0, Java.Net.SocketAddress arg1)
         {
@@ -809,7 +812,7 @@ public static void Connect(Java.Io.FileDescriptor arg0, Java.Net.SocketAddress a
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Execv(Java.Lang.String arg0, Java.Lang.String[] arg1)
         {
             SExecute(LocalBridgeClazz, "execv", arg0, arg1);
@@ -820,7 +823,7 @@ public static void Execv(Java.Lang.String arg0, Java.Lang.String[] arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Execve(Java.Lang.String arg0, Java.Lang.String[] arg1, Java.Lang.String[] arg2)
         {
             SExecute(LocalBridgeClazz, "execve", arg0, arg1, arg2);
@@ -830,7 +833,7 @@ public static void Execve(Java.Lang.String arg0, Java.Lang.String[] arg1, Java.L
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Fchmod(Java.Io.FileDescriptor arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "fchmod", arg0, arg1);
@@ -841,7 +844,7 @@ public static void Fchmod(Java.Io.FileDescriptor arg0, int arg1)
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Fchown(Java.Io.FileDescriptor arg0, int arg1, int arg2)
         {
             SExecute(LocalBridgeClazz, "fchown", arg0, arg1, arg2);
@@ -850,7 +853,7 @@ public static void Fchown(Java.Io.FileDescriptor arg0, int arg1, int arg2)
         /// <see href="https://developer.android.com/reference/android/system/Os.html#fdatasync(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Fdatasync(Java.Io.FileDescriptor arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "fdatasync", "(Ljava/io/FileDescriptor;)V", arg0);
@@ -859,7 +862,7 @@ public static void Fdatasync(Java.Io.FileDescriptor arg0)
         /// <see href="https://developer.android.com/reference/android/system/Os.html#fsync(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Fsync(Java.Io.FileDescriptor arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "fsync", "(Ljava/io/FileDescriptor;)V", arg0);
@@ -869,7 +872,7 @@ public static void Fsync(Java.Io.FileDescriptor arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Ftruncate(Java.Io.FileDescriptor arg0, long arg1)
         {
             SExecute(LocalBridgeClazz, "ftruncate", arg0, arg1);
@@ -879,7 +882,7 @@ public static void Ftruncate(Java.Io.FileDescriptor arg0, long arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Kill(int arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "kill", arg0, arg1);
@@ -890,7 +893,7 @@ public static void Kill(int arg0, int arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Lchown(Java.Lang.String arg0, int arg1, int arg2)
         {
             SExecute(LocalBridgeClazz, "lchown", arg0, arg1, arg2);
@@ -900,7 +903,7 @@ public static void Lchown(Java.Lang.String arg0, int arg1, int arg2)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Link(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             SExecute(LocalBridgeClazz, "link", arg0, arg1);
@@ -910,7 +913,7 @@ public static void Link(Java.Lang.String arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Listen(Java.Io.FileDescriptor arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "listen", arg0, arg1);
@@ -921,7 +924,7 @@ public static void Listen(Java.Io.FileDescriptor arg0, int arg1)
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Mincore(long arg0, long arg1, byte[] arg2)
         {
             SExecute(LocalBridgeClazz, "mincore", arg0, arg1, arg2);
@@ -931,7 +934,7 @@ public static void Mincore(long arg0, long arg1, byte[] arg2)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Mkdir(Java.Lang.String arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "mkdir", arg0, arg1);
@@ -941,7 +944,7 @@ public static void Mkdir(Java.Lang.String arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Mkfifo(Java.Lang.String arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "mkfifo", arg0, arg1);
@@ -951,7 +954,7 @@ public static void Mkfifo(Java.Lang.String arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Mlock(long arg0, long arg1)
         {
             SExecute(LocalBridgeClazz, "mlock", arg0, arg1);
@@ -962,7 +965,7 @@ public static void Mlock(long arg0, long arg1)
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Msync(long arg0, long arg1, int arg2)
         {
             SExecute(LocalBridgeClazz, "msync", arg0, arg1, arg2);
@@ -972,7 +975,7 @@ public static void Msync(long arg0, long arg1, int arg2)
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Munlock(long arg0, long arg1)
         {
             SExecute(LocalBridgeClazz, "munlock", arg0, arg1);
@@ -982,7 +985,7 @@ public static void Munlock(long arg0, long arg1)
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Munmap(long arg0, long arg1)
         {
             SExecute(LocalBridgeClazz, "munmap", arg0, arg1);
@@ -993,7 +996,7 @@ public static void Munmap(long arg0, long arg1)
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="long"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Posix_fallocate(Java.Io.FileDescriptor arg0, long arg1, long arg2)
         {
             SExecute(LocalBridgeClazz, "posix_fallocate", arg0, arg1, arg2);
@@ -1002,7 +1005,7 @@ public static void Posix_fallocate(Java.Io.FileDescriptor arg0, long arg1, long
         /// <see href="https://developer.android.com/reference/android/system/Os.html#remove(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Remove(Java.Lang.String arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "remove", "(Ljava/lang/String;)V", arg0);
@@ -1012,7 +1015,7 @@ public static void Remove(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Removexattr(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             SExecute(LocalBridgeClazz, "removexattr", arg0, arg1);
@@ -1022,30 +1025,60 @@ public static void Removexattr(Java.Lang.String arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Rename(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             SExecute(LocalBridgeClazz, "rename", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#setegid(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Android.System.ErrnoException"/>
+        [global::System.Obsolete()]
+        public static void Setegid(int arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setegid", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#setenv(java.lang.String,java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Setenv(Java.Lang.String arg0, Java.Lang.String arg1, bool arg2)
         {
             SExecute(LocalBridgeClazz, "setenv", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#seteuid(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Android.System.ErrnoException"/>
+        [global::System.Obsolete()]
+        public static void Seteuid(int arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "seteuid", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#setgid(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Android.System.ErrnoException"/>
+        [global::System.Obsolete()]
+        public static void Setgid(int arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setgid", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#setsockoptInt(java.io.FileDescriptor,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void SetsockoptInt(Java.Io.FileDescriptor arg0, int arg1, int arg2, int arg3)
         {
             SExecute(LocalBridgeClazz, "setsockoptInt", arg0, arg1, arg2, arg3);
@@ -1056,20 +1089,30 @@ public static void SetsockoptInt(Java.Io.FileDescriptor arg0, int arg1, int arg2
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.SystemNs.StructTimeval"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
-        public static void SetsockoptTimeval(Java.Io.FileDescriptor arg0, int arg1, int arg2, Android.SystemNs.StructTimeval arg3)
+        /// <param name="arg3"><see cref="Android.System.StructTimeval"/></param>
+        /// <exception cref="Android.System.ErrnoException"/>
+        public static void SetsockoptTimeval(Java.Io.FileDescriptor arg0, int arg1, int arg2, Android.System.StructTimeval arg3)
         {
             SExecute(LocalBridgeClazz, "setsockoptTimeval", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/system/Os.html#setuid(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Android.System.ErrnoException"/>
+        [global::System.Obsolete()]
+        public static void Setuid(int arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setuid", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/Os.html#setxattr(java.lang.String,java.lang.String,byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Setxattr(Java.Lang.String arg0, Java.Lang.String arg1, byte[] arg2, int arg3)
         {
             SExecute(LocalBridgeClazz, "setxattr", arg0, arg1, arg2, arg3);
@@ -1079,7 +1122,7 @@ public static void Setxattr(Java.Lang.String arg0, Java.Lang.String arg1, byte[]
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Shutdown(Java.Io.FileDescriptor arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "shutdown", arg0, arg1);
@@ -1092,7 +1135,7 @@ public static void Shutdown(Java.Io.FileDescriptor arg0, int arg1)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg4"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Socketpair(int arg0, int arg1, int arg2, Java.Io.FileDescriptor arg3, Java.Io.FileDescriptor arg4)
         {
             SExecute(LocalBridgeClazz, "socketpair", arg0, arg1, arg2, arg3, arg4);
@@ -1102,7 +1145,7 @@ public static void Socketpair(int arg0, int arg1, int arg2, Java.Io.FileDescript
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Symlink(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             SExecute(LocalBridgeClazz, "symlink", arg0, arg1);
@@ -1111,7 +1154,7 @@ public static void Symlink(Java.Lang.String arg0, Java.Lang.String arg1)
         /// <see href="https://developer.android.com/reference/android/system/Os.html#tcdrain(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Tcdrain(Java.Io.FileDescriptor arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "tcdrain", "(Ljava/io/FileDescriptor;)V", arg0);
@@ -1121,7 +1164,7 @@ public static void Tcdrain(Java.Io.FileDescriptor arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Tcsendbreak(Java.Io.FileDescriptor arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "tcsendbreak", arg0, arg1);
@@ -1130,7 +1173,7 @@ public static void Tcsendbreak(Java.Io.FileDescriptor arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/system/Os.html#unsetenv(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Android.SystemNs.ErrnoException"/>
+        /// <exception cref="Android.System.ErrnoException"/>
         public static void Unsetenv(Java.Lang.String arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "unsetenv", "(Ljava/lang/String;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/OsConstants.cs b/src/net/Netdroid/Generated/Android/System/OsConstants.cs
similarity index 99%
rename from src/net/Netdroid/Generated/Android/SystemNs/OsConstants.cs
rename to src/net/Netdroid/Generated/Android/System/OsConstants.cs
index b577c6e35..499eeb573 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/OsConstants.cs
+++ b/src/net/Netdroid/Generated/Android/System/OsConstants.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region OsConstants
     public partial class OsConstants
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/StructCmsghdr.cs b/src/net/Netdroid/Generated/Android/System/StructCmsghdr.cs
similarity index 99%
rename from src/net/Netdroid/Generated/Android/SystemNs/StructCmsghdr.cs
rename to src/net/Netdroid/Generated/Android/System/StructCmsghdr.cs
index 9c2f04d35..704857824 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/StructCmsghdr.cs
+++ b/src/net/Netdroid/Generated/Android/System/StructCmsghdr.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region StructCmsghdr
     public partial class StructCmsghdr
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/StructMsghdr.cs b/src/net/Netdroid/Generated/Android/System/StructMsghdr.cs
similarity index 89%
rename from src/net/Netdroid/Generated/Android/SystemNs/StructMsghdr.cs
rename to src/net/Netdroid/Generated/Android/System/StructMsghdr.cs
index 32f9f0f5b..12481c507 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/StructMsghdr.cs
+++ b/src/net/Netdroid/Generated/Android/System/StructMsghdr.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region StructMsghdr
     public partial class StructMsghdr
@@ -34,9 +34,9 @@ public partial class StructMsghdr
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
-        /// <param name="arg2"><see cref="Android.SystemNs.StructCmsghdr"/></param>
+        /// <param name="arg2"><see cref="Android.System.StructCmsghdr"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        public StructMsghdr(Java.Net.SocketAddress arg0, Java.Nio.ByteBuffer[] arg1, Android.SystemNs.StructCmsghdr[] arg2, int arg3)
+        public StructMsghdr(Java.Net.SocketAddress arg0, Java.Nio.ByteBuffer[] arg1, Android.System.StructCmsghdr[] arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
         }
@@ -51,7 +51,7 @@ public StructMsghdr(Java.Net.SocketAddress arg0, Java.Nio.ByteBuffer[] arg1, And
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/StructMsghdr.html#msg_control"/>
         /// </summary>
-        public Android.SystemNs.StructCmsghdr[] msg_control { get { return IGetFieldArray<Android.SystemNs.StructCmsghdr>("msg_control"); } set { ISetField("msg_control", value); } }
+        public Android.System.StructCmsghdr[] msg_control { get { return IGetFieldArray<Android.System.StructCmsghdr>("msg_control"); } set { ISetField("msg_control", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/StructMsghdr.html#msg_iov"/>
         /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/StructPollfd.cs b/src/net/Netdroid/Generated/Android/System/StructPollfd.cs
similarity index 98%
rename from src/net/Netdroid/Generated/Android/SystemNs/StructPollfd.cs
rename to src/net/Netdroid/Generated/Android/System/StructPollfd.cs
index 4a98cc62d..1fc5c9ee9 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/StructPollfd.cs
+++ b/src/net/Netdroid/Generated/Android/System/StructPollfd.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region StructPollfd
     public partial class StructPollfd
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/StructStat.cs b/src/net/Netdroid/Generated/Android/System/StructStat.cs
similarity index 88%
rename from src/net/Netdroid/Generated/Android/SystemNs/StructStat.cs
rename to src/net/Netdroid/Generated/Android/System/StructStat.cs
index d8e06e8c9..5784f923f 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/StructStat.cs
+++ b/src/net/Netdroid/Generated/Android/System/StructStat.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region StructStat
     public partial class StructStat
@@ -40,12 +40,12 @@ public partial class StructStat
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="long"/></param>
         /// <param name="arg7"><see cref="long"/></param>
-        /// <param name="arg8"><see cref="Android.SystemNs.StructTimespec"/></param>
-        /// <param name="arg9"><see cref="Android.SystemNs.StructTimespec"/></param>
-        /// <param name="arg10"><see cref="Android.SystemNs.StructTimespec"/></param>
+        /// <param name="arg8"><see cref="Android.System.StructTimespec"/></param>
+        /// <param name="arg9"><see cref="Android.System.StructTimespec"/></param>
+        /// <param name="arg10"><see cref="Android.System.StructTimespec"/></param>
         /// <param name="arg11"><see cref="long"/></param>
         /// <param name="arg12"><see cref="long"/></param>
-        public StructStat(long arg0, long arg1, int arg2, long arg3, int arg4, int arg5, long arg6, long arg7, Android.SystemNs.StructTimespec arg8, Android.SystemNs.StructTimespec arg9, Android.SystemNs.StructTimespec arg10, long arg11, long arg12)
+        public StructStat(long arg0, long arg1, int arg2, long arg3, int arg4, int arg5, long arg6, long arg7, Android.System.StructTimespec arg8, Android.System.StructTimespec arg9, Android.System.StructTimespec arg10, long arg11, long arg12)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12)
         {
         }
@@ -80,20 +80,20 @@ public StructStat(long arg0, long arg1, int arg2, long arg3, int arg4, int arg5,
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/StructStat.html#st_atim"/>
         /// </summary>
-        public Android.SystemNs.StructTimespec st_atim { get { if (!_st_atimReady) { _st_atimContent = IGetField<Android.SystemNs.StructTimespec>("st_atim"); _st_atimReady = true; } return _st_atimContent; } }
-        private Android.SystemNs.StructTimespec _st_atimContent = default;
+        public Android.System.StructTimespec st_atim { get { if (!_st_atimReady) { _st_atimContent = IGetField<Android.System.StructTimespec>("st_atim"); _st_atimReady = true; } return _st_atimContent; } }
+        private Android.System.StructTimespec _st_atimContent = default;
         private bool _st_atimReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/StructStat.html#st_ctim"/>
         /// </summary>
-        public Android.SystemNs.StructTimespec st_ctim { get { if (!_st_ctimReady) { _st_ctimContent = IGetField<Android.SystemNs.StructTimespec>("st_ctim"); _st_ctimReady = true; } return _st_ctimContent; } }
-        private Android.SystemNs.StructTimespec _st_ctimContent = default;
+        public Android.System.StructTimespec st_ctim { get { if (!_st_ctimReady) { _st_ctimContent = IGetField<Android.System.StructTimespec>("st_ctim"); _st_ctimReady = true; } return _st_ctimContent; } }
+        private Android.System.StructTimespec _st_ctimContent = default;
         private bool _st_ctimReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/StructStat.html#st_mtim"/>
         /// </summary>
-        public Android.SystemNs.StructTimespec st_mtim { get { if (!_st_mtimReady) { _st_mtimContent = IGetField<Android.SystemNs.StructTimespec>("st_mtim"); _st_mtimReady = true; } return _st_mtimContent; } }
-        private Android.SystemNs.StructTimespec _st_mtimContent = default;
+        public Android.System.StructTimespec st_mtim { get { if (!_st_mtimReady) { _st_mtimContent = IGetField<Android.System.StructTimespec>("st_mtim"); _st_mtimReady = true; } return _st_mtimContent; } }
+        private Android.System.StructTimespec _st_mtimContent = default;
         private bool _st_mtimReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/StructStat.html#st_gid"/>
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/StructStatVfs.cs b/src/net/Netdroid/Generated/Android/System/StructStatVfs.cs
similarity index 99%
rename from src/net/Netdroid/Generated/Android/SystemNs/StructStatVfs.cs
rename to src/net/Netdroid/Generated/Android/System/StructStatVfs.cs
index e6f56d92b..72f8a9df8 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/StructStatVfs.cs
+++ b/src/net/Netdroid/Generated/Android/System/StructStatVfs.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region StructStatVfs
     public partial class StructStatVfs
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/StructTimespec.cs b/src/net/Netdroid/Generated/Android/System/StructTimespec.cs
similarity index 94%
rename from src/net/Netdroid/Generated/Android/SystemNs/StructTimespec.cs
rename to src/net/Netdroid/Generated/Android/System/StructTimespec.cs
index 9107db91c..e2a387495 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/StructTimespec.cs
+++ b/src/net/Netdroid/Generated/Android/System/StructTimespec.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region StructTimespec
     public partial class StructTimespec
@@ -69,9 +69,9 @@ public StructTimespec(long arg0, long arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/system/StructTimespec.html#compareTo(android.system.StructTimespec)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.SystemNs.StructTimespec"/></param>
+        /// <param name="arg0"><see cref="Android.System.StructTimespec"/></param>
         /// <returns><see cref="int"/></returns>
-        public int CompareTo(Android.SystemNs.StructTimespec arg0)
+        public int CompareTo(Android.System.StructTimespec arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Landroid/system/StructTimespec;)I", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/StructTimeval.cs b/src/net/Netdroid/Generated/Android/System/StructTimeval.cs
similarity index 89%
rename from src/net/Netdroid/Generated/Android/SystemNs/StructTimeval.cs
rename to src/net/Netdroid/Generated/Android/System/StructTimeval.cs
index 9a871f17a..2f73168e7 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/StructTimeval.cs
+++ b/src/net/Netdroid/Generated/Android/System/StructTimeval.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region StructTimeval
     public partial class StructTimeval
@@ -57,10 +57,10 @@ public partial class StructTimeval
         /// <see href="https://developer.android.com/reference/android/system/StructTimeval.html#fromMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="Android.SystemNs.StructTimeval"/></returns>
-        public static Android.SystemNs.StructTimeval FromMillis(long arg0)
+        /// <returns><see cref="Android.System.StructTimeval"/></returns>
+        public static Android.System.StructTimeval FromMillis(long arg0)
         {
-            return SExecuteWithSignature<Android.SystemNs.StructTimeval>(LocalBridgeClazz, "fromMillis", "(J)Landroid/system/StructTimeval;", arg0);
+            return SExecuteWithSignature<Android.System.StructTimeval>(LocalBridgeClazz, "fromMillis", "(J)Landroid/system/StructTimeval;", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/StructUtsname.cs b/src/net/Netdroid/Generated/Android/System/StructUtsname.cs
similarity index 99%
rename from src/net/Netdroid/Generated/Android/SystemNs/StructUtsname.cs
rename to src/net/Netdroid/Generated/Android/System/StructUtsname.cs
index 325d9fb29..b92ca9b00 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/StructUtsname.cs
+++ b/src/net/Netdroid/Generated/Android/System/StructUtsname.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region StructUtsname
     public partial class StructUtsname
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/SystemCleaner.cs b/src/net/Netdroid/Generated/Android/System/SystemCleaner.cs
similarity index 98%
rename from src/net/Netdroid/Generated/Android/SystemNs/SystemCleaner.cs
rename to src/net/Netdroid/Generated/Android/System/SystemCleaner.cs
index a29559248..114f14bd2 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/SystemCleaner.cs
+++ b/src/net/Netdroid/Generated/Android/System/SystemCleaner.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region SystemCleaner
     public partial class SystemCleaner
diff --git a/src/net/Netdroid/Generated/Android/SystemNs/VmSocketAddress.cs b/src/net/Netdroid/Generated/Android/System/VmSocketAddress.cs
similarity index 81%
rename from src/net/Netdroid/Generated/Android/SystemNs/VmSocketAddress.cs
rename to src/net/Netdroid/Generated/Android/System/VmSocketAddress.cs
index e7745b979..fb2b127ae 100644
--- a/src/net/Netdroid/Generated/Android/SystemNs/VmSocketAddress.cs
+++ b/src/net/Netdroid/Generated/Android/System/VmSocketAddress.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Android.SystemNs
+namespace Android.System
 {
     #region VmSocketAddress
     public partial class VmSocketAddress
@@ -55,18 +55,20 @@ public VmSocketAddress(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/VmSocketAddress.html#getSvmCid()"/> 
+        /// <see href="https://developer.android.com/reference/android/system/VmSocketAddress.html#getSvmCid()"/>
         /// </summary>
-        public int SvmCid
+        /// <returns><see cref="int"/></returns>
+        public int GetSvmCid()
         {
-            get { return IExecuteWithSignature<int>("getSvmCid", "()I"); }
+            return IExecuteWithSignature<int>("getSvmCid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/system/VmSocketAddress.html#getSvmPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/system/VmSocketAddress.html#getSvmPort()"/>
         /// </summary>
-        public int SvmPort
+        /// <returns><see cref="int"/></returns>
+        public int GetSvmPort()
         {
-            get { return IExecuteWithSignature<int>("getSvmPort", "()I"); }
+            return IExecuteWithSignature<int>("getSvmPort", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telecom/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Telecom/AllPackageClasses.cs
index 0a5ab710f..d6a8caac5 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/AllPackageClasses.cs
@@ -76,12 +76,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -390,12 +390,12 @@ public partial class CallControlCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CallControlCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallControlCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallControlCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CallControlCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallControlCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallControlCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -497,12 +497,12 @@ public partial class CallEventCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CallEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallEventCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CallEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallEventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallEventCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -560,12 +560,12 @@ public partial class CallRedirectionService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CallRedirectionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallRedirectionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallRedirectionService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CallRedirectionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallRedirectionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallRedirectionService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -606,12 +606,12 @@ public partial class CallScreeningService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CallScreeningService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallScreeningService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallScreeningService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CallScreeningService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallScreeningService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallScreeningService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -740,12 +740,12 @@ public partial class Conference : Android.Telecom.Conferenceable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Conference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Conference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Conference() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Conference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Conference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Conference(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -786,12 +786,12 @@ public partial class Conferenceable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Co
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Conferenceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Conferenceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Conferenceable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Conferenceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Conferenceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Conferenceable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -832,12 +832,12 @@ public partial class Connection : Android.Telecom.Conferenceable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Connection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Connection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Connection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Connection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Connection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Connection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -962,12 +962,12 @@ public partial class VideoProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Vid
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("VideoProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VideoProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VideoProvider() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("VideoProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VideoProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VideoProvider(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1056,12 +1056,12 @@ public partial class ConnectionService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ConnectionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConnectionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConnectionService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ConnectionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConnectionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConnectionService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1190,12 +1190,12 @@ public partial class InCallService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InCallService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InCallService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InCallService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InCallService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InCallService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InCallService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1232,12 +1232,12 @@ public partial class VideoCall : MASES.JCOBridge.C2JBridge.JVMBridgeBase<VideoCa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("VideoCall class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VideoCall class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VideoCall() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("VideoCall class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VideoCall class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VideoCall(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1274,12 +1274,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Callback() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Callback(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1561,12 +1561,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1651,12 +1651,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1737,12 +1737,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Callback() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Callback(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Telecom/Call.cs b/src/net/Netdroid/Generated/Android/Telecom/Call.cs
index 1a537570c..0a5f93354 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/Call.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/Call.cs
@@ -124,7 +124,7 @@ public partial class Call
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Call.html#AVAILABLE_PHONE_ACCOUNTS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String AVAILABLE_PHONE_ACCOUNTS { get { if (!_AVAILABLE_PHONE_ACCOUNTSReady) { _AVAILABLE_PHONE_ACCOUNTSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "AVAILABLE_PHONE_ACCOUNTS"); _AVAILABLE_PHONE_ACCOUNTSReady = true; } return _AVAILABLE_PHONE_ACCOUNTSContent; } }
         private static Java.Lang.String _AVAILABLE_PHONE_ACCOUNTSContent = default;
         private static bool _AVAILABLE_PHONE_ACCOUNTSReady = false; // this is used because in case of generics 
@@ -185,83 +185,93 @@ public partial class Call
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getCannedTextResponses()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getGenericConferenceActiveChildCall()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> CannedTextResponses
+        /// <returns><see cref="Android.Telecom.Call"/></returns>
+        public Android.Telecom.Call GetGenericConferenceActiveChildCall()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getCannedTextResponses", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Telecom.Call>("getGenericConferenceActiveChildCall", "()Landroid/telecom/Call;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getChildren()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getParent()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.Call> Children
+        /// <returns><see cref="Android.Telecom.Call"/></returns>
+        public Android.Telecom.Call GetParent()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.Call>>("getChildren", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Telecom.Call>("getParent", "()Landroid/telecom/Call;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getConferenceableCalls()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getDetails()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.Call> ConferenceableCalls
+        /// <returns><see cref="Android.Telecom.Call.Details"/></returns>
+        public Android.Telecom.Call.Details GetDetails()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.Call>>("getConferenceableCalls", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Telecom.Call.Details>("getDetails", "()Landroid/telecom/Call$Details;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getGenericConferenceActiveChildCall()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getRttCall()"/>
         /// </summary>
-        public Android.Telecom.Call GenericConferenceActiveChildCall
+        /// <returns><see cref="Android.Telecom.Call.RttCall"/></returns>
+        public Android.Telecom.Call.RttCall GetRttCall()
         {
-            get { return IExecuteWithSignature<Android.Telecom.Call>("getGenericConferenceActiveChildCall", "()Landroid/telecom/Call;"); }
+            return IExecuteWithSignature<Android.Telecom.Call.RttCall>("getRttCall", "()Landroid/telecom/Call$RttCall;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getDetails()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getVideoCall()"/>
         /// </summary>
-        public Android.Telecom.Call.Details GetDetails
+        /// <returns><see cref="Android.Telecom.InCallService.VideoCall"/></returns>
+        public Android.Telecom.InCallService.VideoCall GetVideoCall()
         {
-            get { return IExecuteWithSignature<Android.Telecom.Call.Details>("getDetails", "()Landroid/telecom/Call$Details;"); }
+            return IExecuteWithSignature<Android.Telecom.InCallService.VideoCall>("getVideoCall", "()Landroid/telecom/InCallService$VideoCall;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getRttCall()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#isRttActive()"/>
         /// </summary>
-        public Android.Telecom.Call.RttCall GetRttCall
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRttActive()
         {
-            get { return IExecuteWithSignature<Android.Telecom.Call.RttCall>("getRttCall", "()Landroid/telecom/Call$RttCall;"); }
+            return IExecuteWithSignature<bool>("isRttActive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getState()"/>
         /// </summary>
-        public Android.Telecom.Call Parent
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetState()
         {
-            get { return IExecuteWithSignature<Android.Telecom.Call>("getParent", "()Landroid/telecom/Call;"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getRemainingPostDialSequence()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getRemainingPostDialSequence()"/>
         /// </summary>
-        public Java.Lang.String RemainingPostDialSequence
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRemainingPostDialSequence()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRemainingPostDialSequence", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRemainingPostDialSequence", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getChildren()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int State
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.Call> GetChildren()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.Call>>("getChildren", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getVideoCall()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getConferenceableCalls()"/>
         /// </summary>
-        public Android.Telecom.InCallService.VideoCall VideoCall
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.Call> GetConferenceableCalls()
         {
-            get { return IExecuteWithSignature<Android.Telecom.InCallService.VideoCall>("getVideoCall", "()Landroid/telecom/InCallService$VideoCall;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.Call>>("getConferenceableCalls", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#isRttActive()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Call.html#getCannedTextResponses()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRttActive()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetCannedTextResponses()
         {
-            return IExecuteWithSignature<bool>("isRttActive", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getCannedTextResponses", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Call.html#addConferenceParticipants(java.util.List)"/>
@@ -986,162 +996,182 @@ public static Java.Lang.String PropertiesToString(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getAccountHandle()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getContactPhotoUri()"/>
             /// </summary>
-            public Android.Telecom.PhoneAccountHandle AccountHandle
+            /// <returns><see cref="Android.Net.Uri"/></returns>
+            public Android.Net.Uri GetContactPhotoUri()
             {
-                get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getAccountHandle", "()Landroid/telecom/PhoneAccountHandle;"); }
+                return IExecuteWithSignature<Android.Net.Uri>("getContactPhotoUri", "()Landroid/net/Uri;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallCapabilities()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getHandle()"/>
             /// </summary>
-            public int CallCapabilities
+            /// <returns><see cref="Android.Net.Uri"/></returns>
+            public Android.Net.Uri GetHandle()
             {
-                get { return IExecuteWithSignature<int>("getCallCapabilities", "()I"); }
+                return IExecuteWithSignature<Android.Net.Uri>("getHandle", "()Landroid/net/Uri;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallDirection()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getExtras()"/>
             /// </summary>
-            public int CallDirection
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<int>("getCallDirection", "()I"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallerDisplayName()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getIntentExtras()"/>
             /// </summary>
-            public Java.Lang.String CallerDisplayName
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetIntentExtras()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCallerDisplayName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getIntentExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallerDisplayNamePresentation()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getDisconnectCause()"/>
             /// </summary>
-            public int CallerDisplayNamePresentation
+            /// <returns><see cref="Android.Telecom.DisconnectCause"/></returns>
+            public Android.Telecom.DisconnectCause GetDisconnectCause()
             {
-                get { return IExecuteWithSignature<int>("getCallerDisplayNamePresentation", "()I"); }
+                return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallerNumberVerificationStatus()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getGatewayInfo()"/>
             /// </summary>
-            public int CallerNumberVerificationStatus
+            /// <returns><see cref="Android.Telecom.GatewayInfo"/></returns>
+            public Android.Telecom.GatewayInfo GetGatewayInfo()
             {
-                get { return IExecuteWithSignature<int>("getCallerNumberVerificationStatus", "()I"); }
+                return IExecuteWithSignature<Android.Telecom.GatewayInfo>("getGatewayInfo", "()Landroid/telecom/GatewayInfo;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallProperties()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getAccountHandle()"/>
             /// </summary>
-            public int CallProperties
+            /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+            public Android.Telecom.PhoneAccountHandle GetAccountHandle()
             {
-                get { return IExecuteWithSignature<int>("getCallProperties", "()I"); }
+                return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getAccountHandle", "()Landroid/telecom/PhoneAccountHandle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getConnectTimeMillis()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getStatusHints()"/>
             /// </summary>
-            public long ConnectTimeMillis
+            /// <returns><see cref="Android.Telecom.StatusHints"/></returns>
+            public Android.Telecom.StatusHints GetStatusHints()
             {
-                get { return IExecuteWithSignature<long>("getConnectTimeMillis", "()J"); }
+                return IExecuteWithSignature<Android.Telecom.StatusHints>("getStatusHints", "()Landroid/telecom/StatusHints;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getContactDisplayName()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#can(int)"/>
             /// </summary>
-            public Java.Lang.String ContactDisplayName
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="bool"/></returns>
+            public bool Can(int arg0)
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getContactDisplayName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("can", "(I)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getContactPhotoUri()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#hasProperty(int)"/>
             /// </summary>
-            public Android.Net.Uri ContactPhotoUri
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="bool"/></returns>
+            public bool HasProperty(int arg0)
             {
-                get { return IExecuteWithSignature<Android.Net.Uri>("getContactPhotoUri", "()Landroid/net/Uri;"); }
+                return IExecuteWithSignature<bool>("hasProperty", "(I)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCreationTimeMillis()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getState()"/>
             /// </summary>
-            public long CreationTimeMillis
+            /// <returns><see cref="int"/></returns>
+            public int GetState()
             {
-                get { return IExecuteWithSignature<long>("getCreationTimeMillis", "()J"); }
+                return IExecuteWithSignature<int>("getState", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getDisconnectCause()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getConnectTimeMillis()"/>
             /// </summary>
-            public Android.Telecom.DisconnectCause DisconnectCause
+            /// <returns><see cref="long"/></returns>
+            public long GetConnectTimeMillis()
             {
-                get { return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;"); }
+                return IExecuteWithSignature<long>("getConnectTimeMillis", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallCapabilities()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int GetCallCapabilities()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("getCallCapabilities", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getGatewayInfo()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallDirection()"/>
             /// </summary>
-            public Android.Telecom.GatewayInfo GatewayInfo
+            /// <returns><see cref="int"/></returns>
+            public int GetCallDirection()
             {
-                get { return IExecuteWithSignature<Android.Telecom.GatewayInfo>("getGatewayInfo", "()Landroid/telecom/GatewayInfo;"); }
+                return IExecuteWithSignature<int>("getCallDirection", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getHandle()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallerDisplayNamePresentation()"/>
             /// </summary>
-            public Android.Net.Uri Handle
+            /// <returns><see cref="int"/></returns>
+            public int GetCallerDisplayNamePresentation()
             {
-                get { return IExecuteWithSignature<Android.Net.Uri>("getHandle", "()Landroid/net/Uri;"); }
+                return IExecuteWithSignature<int>("getCallerDisplayNamePresentation", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getHandlePresentation()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallerNumberVerificationStatus()"/>
             /// </summary>
-            public int HandlePresentation
+            /// <returns><see cref="int"/></returns>
+            public int GetCallerNumberVerificationStatus()
             {
-                get { return IExecuteWithSignature<int>("getHandlePresentation", "()I"); }
+                return IExecuteWithSignature<int>("getCallerNumberVerificationStatus", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getIntentExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallProperties()"/>
             /// </summary>
-            public Android.Os.Bundle IntentExtras
+            /// <returns><see cref="int"/></returns>
+            public int GetCallProperties()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getIntentExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("getCallProperties", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getState()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getHandlePresentation()"/>
             /// </summary>
-            public int State
+            /// <returns><see cref="int"/></returns>
+            public int GetHandlePresentation()
             {
-                get { return IExecuteWithSignature<int>("getState", "()I"); }
+                return IExecuteWithSignature<int>("getHandlePresentation", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getStatusHints()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getVideoState()"/>
             /// </summary>
-            public Android.Telecom.StatusHints StatusHints
+            /// <returns><see cref="int"/></returns>
+            public int GetVideoState()
             {
-                get { return IExecuteWithSignature<Android.Telecom.StatusHints>("getStatusHints", "()Landroid/telecom/StatusHints;"); }
+                return IExecuteWithSignature<int>("getVideoState", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getVideoState()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCallerDisplayName()"/>
             /// </summary>
-            public int VideoState
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCallerDisplayName()
             {
-                get { return IExecuteWithSignature<int>("getVideoState", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getCallerDisplayName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#can(int)"/>
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getContactDisplayName()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <returns><see cref="bool"/></returns>
-            public bool Can(int arg0)
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetContactDisplayName()
             {
-                return IExecuteWithSignature<bool>("can", "(I)Z", arg0);
+                return IExecuteWithSignature<Java.Lang.String>("getContactDisplayName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#hasProperty(int)"/>
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.Details.html#getCreationTimeMillis()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <returns><see cref="bool"/></returns>
-            public bool HasProperty(int arg0)
+            /// <returns><see cref="long"/></returns>
+            public long GetCreationTimeMillis()
             {
-                return IExecuteWithSignature<bool>("hasProperty", "(I)Z", arg0);
+                return IExecuteWithSignature<long>("getCreationTimeMillis", "()J");
             }
 
             #endregion
@@ -1193,11 +1223,12 @@ public partial class RttCall
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/Call.RttCall.html#getRttAudioMode()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/Call.RttCall.html#getRttAudioMode()"/>
             /// </summary>
-            public int RttAudioMode
+            /// <returns><see cref="int"/></returns>
+            public int GetRttAudioMode()
             {
-                get { return IExecuteWithSignature<int>("getRttAudioMode", "()I"); }
+                return IExecuteWithSignature<int>("getRttAudioMode", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telecom/Call.RttCall.html#read()"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/CallAttributes.cs b/src/net/Netdroid/Generated/Android/Telecom/CallAttributes.cs
index 3de3a323e..21061bc20 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/CallAttributes.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/CallAttributes.cs
@@ -94,54 +94,60 @@ public partial class CallAttributes
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getAddress()"/>
         /// </summary>
-        public Android.Net.Uri Address
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getCallCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getPhoneAccountHandle()"/>
         /// </summary>
-        public int CallCapabilities
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetPhoneAccountHandle()
         {
-            get { return IExecuteWithSignature<int>("getCallCapabilities", "()I"); }
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getCallType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#describeContents()"/>
         /// </summary>
-        public int CallType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCallType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getDirection()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getCallCapabilities()"/>
         /// </summary>
-        public int Direction
+        /// <returns><see cref="int"/></returns>
+        public int GetCallCapabilities()
         {
-            get { return IExecuteWithSignature<int>("getDirection", "()I"); }
+            return IExecuteWithSignature<int>("getCallCapabilities", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getCallType()"/>
         /// </summary>
-        public Java.Lang.CharSequence DisplayName
+        /// <returns><see cref="int"/></returns>
+        public int GetCallType()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDisplayName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getCallType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getPhoneAccountHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getDirection()"/>
         /// </summary>
-        public Android.Telecom.PhoneAccountHandle PhoneAccountHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetDirection()
         {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;"); }
+            return IExecuteWithSignature<int>("getDirection", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#getDisplayName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDisplayName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDisplayName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/CallAttributes.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/CallAudioState.cs b/src/net/Netdroid/Generated/Android/Telecom/CallAudioState.cs
index 425973e98..99fb56c93 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/CallAudioState.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/CallAudioState.cs
@@ -107,48 +107,52 @@ public static Java.Lang.String AudioRouteToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#getActiveBluetoothDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#getActiveBluetoothDevice()"/>
         /// </summary>
-        public Android.Bluetooth.BluetoothDevice ActiveBluetoothDevice
+        /// <returns><see cref="Android.Bluetooth.BluetoothDevice"/></returns>
+        public Android.Bluetooth.BluetoothDevice GetActiveBluetoothDevice()
         {
-            get { return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getActiveBluetoothDevice", "()Landroid/bluetooth/BluetoothDevice;"); }
+            return IExecuteWithSignature<Android.Bluetooth.BluetoothDevice>("getActiveBluetoothDevice", "()Landroid/bluetooth/BluetoothDevice;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#getRoute()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#isMuted()"/>
         /// </summary>
-        public int Route
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMuted()
         {
-            get { return IExecuteWithSignature<int>("getRoute", "()I"); }
+            return IExecuteWithSignature<bool>("isMuted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#getSupportedBluetoothDevices()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#describeContents()"/>
         /// </summary>
-        public Java.Util.Collection<Android.Bluetooth.BluetoothDevice> SupportedBluetoothDevices
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Bluetooth.BluetoothDevice>>("getSupportedBluetoothDevices", "()Ljava/util/Collection;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#getSupportedRouteMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#getRoute()"/>
         /// </summary>
-        public int SupportedRouteMask
+        /// <returns><see cref="int"/></returns>
+        public int GetRoute()
         {
-            get { return IExecuteWithSignature<int>("getSupportedRouteMask", "()I"); }
+            return IExecuteWithSignature<int>("getRoute", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#isMuted()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#getSupportedRouteMask()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMuted()
+        /// <returns><see cref="int"/></returns>
+        public int GetSupportedRouteMask()
         {
-            return IExecuteWithSignature<bool>("isMuted", "()Z");
+            return IExecuteWithSignature<int>("getSupportedRouteMask", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#getSupportedBluetoothDevices()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Bluetooth.BluetoothDevice> GetSupportedBluetoothDevices()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Collection<Android.Bluetooth.BluetoothDevice>>("getSupportedBluetoothDevices", "()Ljava/util/Collection;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/CallAudioState.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/CallControl.cs b/src/net/Netdroid/Generated/Android/Telecom/CallControl.cs
index 6596aad38..4b7510f91 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/CallControl.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/CallControl.cs
@@ -46,11 +46,12 @@ public partial class CallControl
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallControl.html#getCallId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallControl.html#getCallId()"/>
         /// </summary>
-        public Android.Os.ParcelUuid CallId
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetCallId()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getCallId", "()Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getCallId", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/CallControl.html#answer(int,java.util.concurrent.Executor,android.os.OutcomeReceiver)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/CallEndpoint.cs b/src/net/Netdroid/Generated/Android/Telecom/CallEndpoint.cs
index 9c1745a05..32c9d8ae5 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/CallEndpoint.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/CallEndpoint.cs
@@ -98,33 +98,36 @@ public CallEndpoint(Java.Lang.CharSequence arg0, int arg1, Android.Os.ParcelUuid
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#getEndpointName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#getIdentifier()"/>
         /// </summary>
-        public Java.Lang.CharSequence EndpointName
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetIdentifier()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getEndpointName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getIdentifier", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#getEndpointType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#describeContents()"/>
         /// </summary>
-        public int EndpointType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getEndpointType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#getIdentifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#getEndpointType()"/>
         /// </summary>
-        public Android.Os.ParcelUuid Identifier
+        /// <returns><see cref="int"/></returns>
+        public int GetEndpointType()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getIdentifier", "()Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignature<int>("getEndpointType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#getEndpointName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetEndpointName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getEndpointName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/CallEndpoint.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/CallScreeningService.cs b/src/net/Netdroid/Generated/Android/Telecom/CallScreeningService.cs
index 3b97115bf..a302c4e91 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/CallScreeningService.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/CallScreeningService.cs
@@ -117,46 +117,52 @@ public partial class CallResponse
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getCallComposerAttachmentsToShow()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getDisallowCall()"/>
             /// </summary>
-            public int CallComposerAttachmentsToShow
+            /// <returns><see cref="bool"/></returns>
+            public bool GetDisallowCall()
             {
-                get { return IExecuteWithSignature<int>("getCallComposerAttachmentsToShow", "()I"); }
+                return IExecuteWithSignature<bool>("getDisallowCall", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getDisallowCall()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getRejectCall()"/>
             /// </summary>
-            public bool DisallowCall
+            /// <returns><see cref="bool"/></returns>
+            public bool GetRejectCall()
             {
-                get { return IExecuteWithSignature<bool>("getDisallowCall", "()Z"); }
+                return IExecuteWithSignature<bool>("getRejectCall", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getRejectCall()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getSilenceCall()"/>
             /// </summary>
-            public bool RejectCall
+            /// <returns><see cref="bool"/></returns>
+            public bool GetSilenceCall()
             {
-                get { return IExecuteWithSignature<bool>("getRejectCall", "()Z"); }
+                return IExecuteWithSignature<bool>("getSilenceCall", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getSilenceCall()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getSkipCallLog()"/>
             /// </summary>
-            public bool SilenceCall
+            /// <returns><see cref="bool"/></returns>
+            public bool GetSkipCallLog()
             {
-                get { return IExecuteWithSignature<bool>("getSilenceCall", "()Z"); }
+                return IExecuteWithSignature<bool>("getSkipCallLog", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getSkipCallLog()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getSkipNotification()"/>
             /// </summary>
-            public bool SkipCallLog
+            /// <returns><see cref="bool"/></returns>
+            public bool GetSkipNotification()
             {
-                get { return IExecuteWithSignature<bool>("getSkipCallLog", "()Z"); }
+                return IExecuteWithSignature<bool>("getSkipNotification", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getSkipNotification()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/CallScreeningService.CallResponse.html#getCallComposerAttachmentsToShow()"/>
             /// </summary>
-            public bool SkipNotification
+            /// <returns><see cref="int"/></returns>
+            public int GetCallComposerAttachmentsToShow()
             {
-                get { return IExecuteWithSignature<bool>("getSkipNotification", "()Z"); }
+                return IExecuteWithSignature<int>("getCallComposerAttachmentsToShow", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telecom/Conference.cs b/src/net/Netdroid/Generated/Android/Telecom/Conference.cs
index 5b4d44598..147d3e347 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/Conference.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/Conference.cs
@@ -70,127 +70,134 @@ public static Android.Telecom.Conference CreateFailedConference(Android.Telecom.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getCallAudioState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getVideoProvider()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Telecom.CallAudioState CallAudioState
+        /// <returns><see cref="Android.Telecom.Connection.VideoProvider"/></returns>
+        public Android.Telecom.Connection.VideoProvider GetVideoProvider()
         {
-            get { return IExecuteWithSignature<Android.Telecom.CallAudioState>("getCallAudioState", "()Landroid/telecom/CallAudioState;"); }
+            return IExecuteWithSignature<Android.Telecom.Connection.VideoProvider>("getVideoProvider", "()Landroid/telecom/Connection$VideoProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConferenceableConnections()"/> <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConferenceableConnections(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getExtras()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.Connection> ConferenceableConnections
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.Connection>>("getConferenceableConnections", "()Ljava/util/List;"); } set { IExecuteWithSignature("setConferenceableConnections", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnectionCapabilities()"/> <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionCapabilities(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getCallAudioState()"/>
         /// </summary>
-        public int ConnectionCapabilities
+        /// <returns><see cref="Android.Telecom.CallAudioState"/></returns>
+        [global::System.Obsolete()]
+        public Android.Telecom.CallAudioState GetCallAudioState()
         {
-            get { return IExecuteWithSignature<int>("getConnectionCapabilities", "()I"); } set { IExecuteWithSignature("setConnectionCapabilities", "(I)V", value); }
+            return IExecuteWithSignature<Android.Telecom.CallAudioState>("getCallAudioState", "()Landroid/telecom/CallAudioState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnectionProperties()"/> <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionProperties(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getCurrentCallEndpoint()"/>
         /// </summary>
-        public int ConnectionProperties
+        /// <returns><see cref="Android.Telecom.CallEndpoint"/></returns>
+        public Android.Telecom.CallEndpoint GetCurrentCallEndpoint()
         {
-            get { return IExecuteWithSignature<int>("getConnectionProperties", "()I"); } set { IExecuteWithSignature("setConnectionProperties", "(I)V", value); }
+            return IExecuteWithSignature<Android.Telecom.CallEndpoint>("getCurrentCallEndpoint", "()Landroid/telecom/CallEndpoint;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnections()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getDisconnectCause()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.Connection> Connections
+        /// <returns><see cref="Android.Telecom.DisconnectCause"/></returns>
+        public Android.Telecom.DisconnectCause GetDisconnectCause()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.Connection>>("getConnections", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnectionStartElapsedRealtimeMillis()"/> <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionStartElapsedRealtimeMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getPhoneAccountHandle()"/>
         /// </summary>
-        public long ConnectionStartElapsedRealtimeMillis
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetPhoneAccountHandle()
         {
-            get { return IExecuteWithSignature<long>("getConnectionStartElapsedRealtimeMillis", "()J"); } set { IExecuteWithSignature("setConnectionStartElapsedRealtimeMillis", "(J)V", value); }
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnectionTime()"/> <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionTime(long)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getStatusHints()"/>
         /// </summary>
-        public long ConnectionTime
+        /// <returns><see cref="Android.Telecom.StatusHints"/></returns>
+        public Android.Telecom.StatusHints GetStatusHints()
         {
-            get { return IExecuteWithSignature<long>("getConnectionTime", "()J"); } set { IExecuteWithSignature("setConnectionTime", "(J)V", value); }
+            return IExecuteWithSignature<Android.Telecom.StatusHints>("getStatusHints", "()Landroid/telecom/StatusHints;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getCurrentCallEndpoint()"/> 
-        /// </summary>
-        public Android.Telecom.CallEndpoint CurrentCallEndpoint
-        {
-            get { return IExecuteWithSignature<Android.Telecom.CallEndpoint>("getCurrentCallEndpoint", "()Landroid/telecom/CallEndpoint;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getDisconnectCause()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#addConnection(android.telecom.Connection)"/>
         /// </summary>
-        public Android.Telecom.DisconnectCause DisconnectCause
+        /// <param name="arg0"><see cref="Android.Telecom.Connection"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool AddConnection(Android.Telecom.Connection arg0)
         {
-            get { return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;"); }
+            return IExecuteWithSignature<bool>("addConnection", "(Landroid/telecom/Connection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getExtras()"/> <see href="https://developer.android.com/reference/android/telecom/Conference.html#setExtras(android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#isRingbackRequested()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRingbackRequested()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", value); }
+            return IExecuteWithSignature<bool>("isRingbackRequested", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getPhoneAccountHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnectionCapabilities()"/>
         /// </summary>
-        public Android.Telecom.PhoneAccountHandle PhoneAccountHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionCapabilities()
         {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;"); }
+            return IExecuteWithSignature<int>("getConnectionCapabilities", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnectionProperties()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionProperties()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getConnectionProperties", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getStatusHints()"/> <see href="https://developer.android.com/reference/android/telecom/Conference.html#setStatusHints(android.telecom.StatusHints)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getState()"/>
         /// </summary>
-        public Android.Telecom.StatusHints StatusHints
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<Android.Telecom.StatusHints>("getStatusHints", "()Landroid/telecom/StatusHints;"); } set { IExecuteWithSignature("setStatusHints", "(Landroid/telecom/StatusHints;)V", value); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getVideoProvider()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConferenceableConnections()"/>
         /// </summary>
-        public Android.Telecom.Connection.VideoProvider VideoProvider
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.Connection> GetConferenceableConnections()
         {
-            get { return IExecuteWithSignature<Android.Telecom.Connection.VideoProvider>("getVideoProvider", "()Landroid/telecom/Connection$VideoProvider;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.Connection>>("getConferenceableConnections", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getVideoState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnections()"/>
         /// </summary>
-        public int VideoState
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.Connection> GetConnections()
         {
-            get { return IExecuteWithSignature<int>("getVideoState", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.Connection>>("getConnections", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#addConnection(android.telecom.Connection)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnectionStartElapsedRealtimeMillis()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telecom.Connection"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool AddConnection(Android.Telecom.Connection arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetConnectionStartElapsedRealtimeMillis()
         {
-            return IExecuteWithSignature<bool>("addConnection", "(Landroid/telecom/Connection;)Z", arg0);
+            return IExecuteWithSignature<long>("getConnectionStartElapsedRealtimeMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#isRingbackRequested()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getConnectionTime()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRingbackRequested()
+        /// <returns><see cref="long"/></returns>
+        public long GetConnectionTime()
         {
-            return IExecuteWithSignature<bool>("isRingbackRequested", "()Z");
+            return IExecuteWithSignature<long>("getConnectionTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#destroy()"/>
@@ -239,15 +246,55 @@ public void SetActive()
             IExecuteWithSignature("setActive", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConferenceableConnections(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetConferenceableConnections(Java.Util.List<Android.Telecom.Connection> arg0)
+        {
+            IExecuteWithSignature("setConferenceableConnections", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionCapabilities(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetConnectionCapabilities(int arg0)
+        {
+            IExecuteWithSignature("setConnectionCapabilities", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionProperties(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetConnectionProperties(int arg0)
+        {
+            IExecuteWithSignature("setConnectionProperties", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionStartElapsedRealTime(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetConnectionStartElapsedRealTime(long arg0)
         {
             IExecuteWithSignature("setConnectionStartElapsedRealTime", "(J)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionStartElapsedRealtimeMillis(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetConnectionStartElapsedRealtimeMillis(long arg0)
+        {
+            IExecuteWithSignature("setConnectionStartElapsedRealtimeMillis", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setConnectionTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetConnectionTime(long arg0)
+        {
+            IExecuteWithSignature("setConnectionTime", "(J)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setDialing()"/>
         /// </summary>
         public void SetDialing()
@@ -263,6 +310,14 @@ public void SetDisconnected(Android.Telecom.DisconnectCause arg0)
             IExecuteWithSignature("setDisconnected", "(Landroid/telecom/DisconnectCause;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setExtras(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        public void SetExtras(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setOnHold()"/>
         /// </summary>
         public void SetOnHold()
@@ -285,6 +340,14 @@ public void SetRinging()
             IExecuteWithSignature("setRinging", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setStatusHints(android.telecom.StatusHints)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Telecom.StatusHints"/></param>
+        public void SetStatusHints(Android.Telecom.StatusHints arg0)
+        {
+            IExecuteWithSignature("setStatusHints", "(Landroid/telecom/StatusHints;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#setVideoProvider(android.telecom.Connection,android.telecom.Connection.VideoProvider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.Connection"/></param>
@@ -303,6 +366,14 @@ public void SetVideoState(Android.Telecom.Connection arg0, int arg1)
             IExecute("setVideoState", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#getVideoState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoState()
+        {
+            return IExecuteWithSignature<int>("getVideoState", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#onAddConferenceParticipants(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
@@ -330,7 +401,7 @@ public void OnAvailableCallEndpointsChanged(Java.Util.List<Android.Telecom.CallE
         /// <see href="https://developer.android.com/reference/android/telecom/Conference.html#onCallAudioStateChanged(android.telecom.CallAudioState)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.CallAudioState"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCallAudioStateChanged(Android.Telecom.CallAudioState arg0)
         {
             IExecuteWithSignature("onCallAudioStateChanged", "(Landroid/telecom/CallAudioState;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Telecom/Connection.cs b/src/net/Netdroid/Generated/Android/Telecom/Connection.cs
index b448f76aa..6ca131320 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/Connection.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/Connection.cs
@@ -190,7 +190,7 @@ public partial class Connection
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#CAPABILITY_CAN_UPGRADE_TO_VIDEO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CAPABILITY_CAN_UPGRADE_TO_VIDEO { get { if (!_CAPABILITY_CAN_UPGRADE_TO_VIDEOReady) { _CAPABILITY_CAN_UPGRADE_TO_VIDEOContent = SGetField<int>(LocalBridgeClazz, "CAPABILITY_CAN_UPGRADE_TO_VIDEO"); _CAPABILITY_CAN_UPGRADE_TO_VIDEOReady = true; } return _CAPABILITY_CAN_UPGRADE_TO_VIDEOContent; } }
         private static int _CAPABILITY_CAN_UPGRADE_TO_VIDEOContent = default;
         private static bool _CAPABILITY_CAN_UPGRADE_TO_VIDEOReady = false; // this is used because in case of generics 
@@ -613,139 +613,157 @@ public static Java.Lang.String StateToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getAddress()"/>
         /// </summary>
-        public Android.Net.Uri Address
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getAddressPresentation()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getExtras()"/>
         /// </summary>
-        public int AddressPresentation
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<int>("getAddressPresentation", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getAudioModeIsVoip()"/> <see href="https://developer.android.com/reference/android/telecom/Connection.html#setAudioModeIsVoip(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCallAudioState()"/>
         /// </summary>
-        public bool AudioModeIsVoip
+        /// <returns><see cref="Android.Telecom.CallAudioState"/></returns>
+        [global::System.Obsolete()]
+        public Android.Telecom.CallAudioState GetCallAudioState()
         {
-            get { return IExecuteWithSignature<bool>("getAudioModeIsVoip", "()Z"); } set { IExecuteWithSignature("setAudioModeIsVoip", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Telecom.CallAudioState>("getCallAudioState", "()Landroid/telecom/CallAudioState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCallAudioState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCurrentCallEndpoint()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Telecom.CallAudioState CallAudioState
+        /// <returns><see cref="Android.Telecom.CallEndpoint"/></returns>
+        public Android.Telecom.CallEndpoint GetCurrentCallEndpoint()
         {
-            get { return IExecuteWithSignature<Android.Telecom.CallAudioState>("getCallAudioState", "()Landroid/telecom/CallAudioState;"); }
+            return IExecuteWithSignature<Android.Telecom.CallEndpoint>("getCurrentCallEndpoint", "()Landroid/telecom/CallEndpoint;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCallerDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getConference()"/>
         /// </summary>
-        public Java.Lang.String CallerDisplayName
+        /// <returns><see cref="Android.Telecom.Conference"/></returns>
+        public Android.Telecom.Conference GetConference()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCallerDisplayName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Telecom.Conference>("getConference", "()Landroid/telecom/Conference;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCallerDisplayNamePresentation()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getVideoProvider()"/>
         /// </summary>
-        public int CallerDisplayNamePresentation
+        /// <returns><see cref="Android.Telecom.Connection.VideoProvider"/></returns>
+        public Android.Telecom.Connection.VideoProvider GetVideoProvider()
         {
-            get { return IExecuteWithSignature<int>("getCallerDisplayNamePresentation", "()I"); }
+            return IExecuteWithSignature<Android.Telecom.Connection.VideoProvider>("getVideoProvider", "()Landroid/telecom/Connection$VideoProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCallerNumberVerificationStatus()"/> <see href="https://developer.android.com/reference/android/telecom/Connection.html#setCallerNumberVerificationStatus(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getDisconnectCause()"/>
         /// </summary>
-        public int CallerNumberVerificationStatus
+        /// <returns><see cref="Android.Telecom.DisconnectCause"/></returns>
+        public Android.Telecom.DisconnectCause GetDisconnectCause()
         {
-            get { return IExecuteWithSignature<int>("getCallerNumberVerificationStatus", "()I"); } set { IExecuteWithSignature("setCallerNumberVerificationStatus", "(I)V", value); }
+            return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getConference()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getStatusHints()"/>
         /// </summary>
-        public Android.Telecom.Conference Conference
+        /// <returns><see cref="Android.Telecom.StatusHints"/></returns>
+        public Android.Telecom.StatusHints GetStatusHints()
         {
-            get { return IExecuteWithSignature<Android.Telecom.Conference>("getConference", "()Landroid/telecom/Conference;"); }
+            return IExecuteWithSignature<Android.Telecom.StatusHints>("getStatusHints", "()Landroid/telecom/StatusHints;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getConferenceables()"/> <see href="https://developer.android.com/reference/android/telecom/Connection.html#setConferenceables(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getAudioModeIsVoip()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.Conferenceable> Conferenceables
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAudioModeIsVoip()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.Conferenceable>>("getConferenceables", "()Ljava/util/List;"); } set { IExecuteWithSignature("setConferenceables", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<bool>("getAudioModeIsVoip", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getConnectionCapabilities()"/> <see href="https://developer.android.com/reference/android/telecom/Connection.html#setConnectionCapabilities(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#isRingbackRequested()"/>
         /// </summary>
-        public int ConnectionCapabilities
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRingbackRequested()
         {
-            get { return IExecuteWithSignature<int>("getConnectionCapabilities", "()I"); } set { IExecuteWithSignature("setConnectionCapabilities", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isRingbackRequested", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getConnectionProperties()"/> <see href="https://developer.android.com/reference/android/telecom/Connection.html#setConnectionProperties(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getAddressPresentation()"/>
         /// </summary>
-        public int ConnectionProperties
+        /// <returns><see cref="int"/></returns>
+        public int GetAddressPresentation()
         {
-            get { return IExecuteWithSignature<int>("getConnectionProperties", "()I"); } set { IExecuteWithSignature("setConnectionProperties", "(I)V", value); }
+            return IExecuteWithSignature<int>("getAddressPresentation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCurrentCallEndpoint()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCallerDisplayNamePresentation()"/>
         /// </summary>
-        public Android.Telecom.CallEndpoint CurrentCallEndpoint
+        /// <returns><see cref="int"/></returns>
+        public int GetCallerDisplayNamePresentation()
         {
-            get { return IExecuteWithSignature<Android.Telecom.CallEndpoint>("getCurrentCallEndpoint", "()Landroid/telecom/CallEndpoint;"); }
+            return IExecuteWithSignature<int>("getCallerDisplayNamePresentation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getDisconnectCause()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCallerNumberVerificationStatus()"/>
         /// </summary>
-        public Android.Telecom.DisconnectCause DisconnectCause
+        /// <returns><see cref="int"/></returns>
+        public int GetCallerNumberVerificationStatus()
         {
-            get { return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;"); }
+            return IExecuteWithSignature<int>("getCallerNumberVerificationStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getExtras()"/> <see href="https://developer.android.com/reference/android/telecom/Connection.html#setExtras(android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getConnectionCapabilities()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionCapabilities()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); } set { IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", value); }
+            return IExecuteWithSignature<int>("getConnectionCapabilities", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getVideoProvider()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getConnectionProperties()"/>
         /// </summary>
-        public Android.Telecom.Connection.VideoProvider GetVideoProvider
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionProperties()
         {
-            get { return IExecuteWithSignature<Android.Telecom.Connection.VideoProvider>("getVideoProvider", "()Landroid/telecom/Connection$VideoProvider;"); }
+            return IExecuteWithSignature<int>("getConnectionProperties", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getState()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getStatusHints()"/> <see href="https://developer.android.com/reference/android/telecom/Connection.html#setStatusHints(android.telecom.StatusHints)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getVideoState()"/>
         /// </summary>
-        public Android.Telecom.StatusHints StatusHints
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoState()
         {
-            get { return IExecuteWithSignature<Android.Telecom.StatusHints>("getStatusHints", "()Landroid/telecom/StatusHints;"); } set { IExecuteWithSignature("setStatusHints", "(Landroid/telecom/StatusHints;)V", value); }
+            return IExecuteWithSignature<int>("getVideoState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getVideoState()"/> <see href="https://developer.android.com/reference/android/telecom/Connection.html#setVideoState(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getCallerDisplayName()"/>
         /// </summary>
-        public int VideoState
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCallerDisplayName()
         {
-            get { return IExecuteWithSignature<int>("getVideoState", "()I"); } set { IExecuteWithSignature("setVideoState", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getCallerDisplayName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#isRingbackRequested()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#getConferenceables()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRingbackRequested()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.Conferenceable> GetConferenceables()
         {
-            return IExecuteWithSignature<bool>("isRingbackRequested", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.Conferenceable>>("getConferenceables", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#destroy()"/>
@@ -852,10 +870,18 @@ public void SetAddress(Android.Net.Uri arg0, int arg1)
             IExecute("setAddress", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setAudioModeIsVoip(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAudioModeIsVoip(bool arg0)
+        {
+            IExecuteWithSignature("setAudioModeIsVoip", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setAudioRoute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAudioRoute(int arg0)
         {
             IExecuteWithSignature("setAudioRoute", "(I)V", arg0);
@@ -870,6 +896,14 @@ public void SetCallerDisplayName(Java.Lang.String arg0, int arg1)
             IExecute("setCallerDisplayName", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setCallerNumberVerificationStatus(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCallerNumberVerificationStatus(int arg0)
+        {
+            IExecuteWithSignature("setCallerNumberVerificationStatus", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setConferenceableConnections(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
@@ -878,6 +912,30 @@ public void SetConferenceableConnections(Java.Util.List<Android.Telecom.Connecti
             IExecuteWithSignature("setConferenceableConnections", "(Ljava/util/List;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setConferenceables(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetConferenceables(Java.Util.List<Android.Telecom.Conferenceable> arg0)
+        {
+            IExecuteWithSignature("setConferenceables", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setConnectionCapabilities(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetConnectionCapabilities(int arg0)
+        {
+            IExecuteWithSignature("setConnectionCapabilities", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setConnectionProperties(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetConnectionProperties(int arg0)
+        {
+            IExecuteWithSignature("setConnectionProperties", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setDialing()"/>
         /// </summary>
         public void SetDialing()
@@ -893,6 +951,14 @@ public void SetDisconnected(Android.Telecom.DisconnectCause arg0)
             IExecuteWithSignature("setDisconnected", "(Landroid/telecom/DisconnectCause;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setExtras(android.os.Bundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
+        public void SetExtras(Android.Os.Bundle arg0)
+        {
+            IExecuteWithSignature("setExtras", "(Landroid/os/Bundle;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setInitialized()"/>
         /// </summary>
         public void SetInitialized()
@@ -952,6 +1018,14 @@ public void SetRinging()
             IExecuteWithSignature("setRinging", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setStatusHints(android.telecom.StatusHints)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Telecom.StatusHints"/></param>
+        public void SetStatusHints(Android.Telecom.StatusHints arg0)
+        {
+            IExecuteWithSignature("setStatusHints", "(Landroid/telecom/StatusHints;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setVideoProvider(android.telecom.Connection.VideoProvider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.Connection.VideoProvider"/></param>
@@ -960,6 +1034,14 @@ public void SetVideoProvider(Android.Telecom.Connection.VideoProvider arg0)
             IExecuteWithSignature("setVideoProvider", "(Landroid/telecom/Connection$VideoProvider;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#setVideoState(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVideoState(int arg0)
+        {
+            IExecuteWithSignature("setVideoState", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#handleRttUpgradeResponse(android.telecom.Connection.RttTextStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.Connection.RttTextStream"/></param>
@@ -1009,7 +1091,7 @@ public void OnAvailableCallEndpointsChanged(Java.Util.List<Android.Telecom.CallE
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#onCallAudioStateChanged(android.telecom.CallAudioState)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.CallAudioState"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCallAudioStateChanged(Android.Telecom.CallAudioState arg0)
         {
             IExecuteWithSignature("onCallAudioStateChanged", "(Landroid/telecom/CallAudioState;)V", arg0);
@@ -1200,7 +1282,7 @@ public void OnUsingAlternativeUi(bool arg0)
         /// <see href="https://developer.android.com/reference/android/telecom/Connection.html#requestBluetoothAudio(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestBluetoothAudio(Android.Bluetooth.BluetoothDevice arg0)
         {
             IExecuteWithSignature("requestBluetoothAudio", "(Landroid/bluetooth/BluetoothDevice;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Telecom/ConnectionRequest.cs b/src/net/Netdroid/Generated/Android/Telecom/ConnectionRequest.cs
index 40c5ba8d8..fd73725ee 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/ConnectionRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/ConnectionRequest.cs
@@ -73,46 +73,36 @@ public ConnectionRequest(Android.Telecom.PhoneAccountHandle arg0, Android.Net.Ur
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getAccountHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getAddress()"/>
         /// </summary>
-        public Android.Telecom.PhoneAccountHandle AccountHandle
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetAddress()
         {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getAccountHandle", "()Landroid/telecom/PhoneAccountHandle;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getExtras()"/>
         /// </summary>
-        public Android.Net.Uri Address
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getRttTextStream()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Telecom.Connection.RttTextStream"/></returns>
+        public Android.Telecom.Connection.RttTextStream GetRttTextStream()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Telecom.Connection.RttTextStream>("getRttTextStream", "()Landroid/telecom/Connection$RttTextStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getParticipants()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getAccountHandle()"/>
         /// </summary>
-        public Java.Util.List<Android.Net.Uri> Participants
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetAccountHandle()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getParticipants", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getRttTextStream()"/> 
-        /// </summary>
-        public Android.Telecom.Connection.RttTextStream RttTextStream
-        {
-            get { return IExecuteWithSignature<Android.Telecom.Connection.RttTextStream>("getRttTextStream", "()Landroid/telecom/Connection$RttTextStream;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getVideoState()"/> 
-        /// </summary>
-        public int VideoState
-        {
-            get { return IExecuteWithSignature<int>("getVideoState", "()I"); }
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getAccountHandle", "()Landroid/telecom/PhoneAccountHandle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#isAdhocConferenceCall()"/>
@@ -139,6 +129,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getVideoState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoState()
+        {
+            return IExecuteWithSignature<int>("getVideoState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#getParticipants()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Net.Uri> GetParticipants()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getParticipants", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/ConnectionRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/ConnectionService.cs b/src/net/Netdroid/Generated/Android/Telecom/ConnectionService.cs
index 71edfb5b3..b8419991b 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/ConnectionService.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/ConnectionService.cs
@@ -52,20 +52,6 @@ public partial class ConnectionService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionService.html#getAllConferences()"/> 
-        /// </summary>
-        public Java.Util.Collection<Android.Telecom.Conference> AllConferences
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Telecom.Conference>>("getAllConferences", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionService.html#getAllConnections()"/> 
-        /// </summary>
-        public Java.Util.Collection<Android.Telecom.Connection> AllConnections
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Telecom.Connection>>("getAllConnections", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/ConnectionService.html#onCreateIncomingConference(android.telecom.PhoneAccountHandle,android.telecom.ConnectionRequest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
@@ -166,6 +152,22 @@ public Android.Telecom.RemoteConnection CreateRemoteOutgoingConnection(Android.T
             return IExecute<Android.Telecom.RemoteConnection>("createRemoteOutgoingConnection", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionService.html#getAllConferences()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Telecom.Conference> GetAllConferences()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Android.Telecom.Conference>>("getAllConferences", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/ConnectionService.html#getAllConnections()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Telecom.Connection> GetAllConnections()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Android.Telecom.Connection>>("getAllConnections", "()Ljava/util/Collection;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/ConnectionService.html#addConference(android.telecom.Conference)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.Conference"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/DisconnectCause.cs b/src/net/Netdroid/Generated/Android/Telecom/DisconnectCause.cs
index 6ae2f873a..59d060931 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/DisconnectCause.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/DisconnectCause.cs
@@ -194,47 +194,52 @@ public DisconnectCause(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#describeContents()"/>
         /// </summary>
-        public int Code
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getCode()"/>
         /// </summary>
-        public Java.Lang.CharSequence Description
+        /// <returns><see cref="int"/></returns>
+        public int GetCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getTone()"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <returns><see cref="int"/></returns>
+        public int GetTone()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getTone", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getReason()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getDescription()"/>
         /// </summary>
-        public Java.Lang.String Reason
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescription()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getReason", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getTone()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getLabel()"/>
         /// </summary>
-        public int Tone
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            get { return IExecuteWithSignature<int>("getTone", "()I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#getReason()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetReason()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getReason", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/DisconnectCause.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/GatewayInfo.cs b/src/net/Netdroid/Generated/Android/Telecom/GatewayInfo.cs
index 0a063e97f..d3c2a1029 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/GatewayInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/GatewayInfo.cs
@@ -62,25 +62,20 @@ public GatewayInfo(Java.Lang.String arg0, Android.Net.Uri arg1, Android.Net.Uri
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/GatewayInfo.html#getGatewayAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/GatewayInfo.html#getGatewayAddress()"/>
         /// </summary>
-        public Android.Net.Uri GatewayAddress
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetGatewayAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getGatewayAddress", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getGatewayAddress", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/GatewayInfo.html#getGatewayProviderPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/GatewayInfo.html#getOriginalAddress()"/>
         /// </summary>
-        public Java.Lang.String GatewayProviderPackageName
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetOriginalAddress()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGatewayProviderPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/GatewayInfo.html#getOriginalAddress()"/> 
-        /// </summary>
-        public Android.Net.Uri OriginalAddress
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getOriginalAddress", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getOriginalAddress", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/GatewayInfo.html#isEmpty()"/>
@@ -99,6 +94,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/GatewayInfo.html#getGatewayProviderPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGatewayProviderPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGatewayProviderPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/GatewayInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/InCallService.cs b/src/net/Netdroid/Generated/Android/Telecom/InCallService.cs
index 9cc177fcd..9a9ced33c 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/InCallService.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/InCallService.cs
@@ -52,26 +52,21 @@ public partial class InCallService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#getCallAudioState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#getCallAudioState()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Telecom.CallAudioState CallAudioState
+        /// <returns><see cref="Android.Telecom.CallAudioState"/></returns>
+        [global::System.Obsolete()]
+        public Android.Telecom.CallAudioState GetCallAudioState()
         {
-            get { return IExecuteWithSignature<Android.Telecom.CallAudioState>("getCallAudioState", "()Landroid/telecom/CallAudioState;"); }
+            return IExecuteWithSignature<Android.Telecom.CallAudioState>("getCallAudioState", "()Landroid/telecom/CallAudioState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#getCalls()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#getCurrentCallEndpoint()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.Call> Calls
+        /// <returns><see cref="Android.Telecom.CallEndpoint"/></returns>
+        public Android.Telecom.CallEndpoint GetCurrentCallEndpoint()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.Call>>("getCalls", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#getCurrentCallEndpoint()"/> 
-        /// </summary>
-        public Android.Telecom.CallEndpoint CurrentCallEndpoint
-        {
-            get { return IExecuteWithSignature<Android.Telecom.CallEndpoint>("getCurrentCallEndpoint", "()Landroid/telecom/CallEndpoint;"); }
+            return IExecuteWithSignature<Android.Telecom.CallEndpoint>("getCurrentCallEndpoint", "()Landroid/telecom/CallEndpoint;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#canAddCall()"/>
@@ -82,10 +77,18 @@ public bool CanAddCall()
             return IExecuteWithSignature<bool>("canAddCall", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#getCalls()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.Call> GetCalls()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.Call>>("getCalls", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#requestBluetoothAudio(android.bluetooth.BluetoothDevice)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Bluetooth.BluetoothDevice"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestBluetoothAudio(Android.Bluetooth.BluetoothDevice arg0)
         {
             IExecuteWithSignature("requestBluetoothAudio", "(Landroid/bluetooth/BluetoothDevice;)V", arg0);
@@ -104,7 +107,7 @@ public void RequestCallEndpointChange(Android.Telecom.CallEndpoint arg0, Java.Ut
         /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#setAudioRoute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAudioRoute(int arg0)
         {
             IExecuteWithSignature("setAudioRoute", "(I)V", arg0);
@@ -145,7 +148,7 @@ public void OnCallAdded(Android.Telecom.Call arg0)
         /// <see href="https://developer.android.com/reference/android/telecom/InCallService.html#onCallAudioStateChanged(android.telecom.CallAudioState)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.CallAudioState"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnCallAudioStateChanged(Android.Telecom.CallAudioState arg0)
         {
             IExecuteWithSignature("onCallAudioStateChanged", "(Landroid/telecom/CallAudioState;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Telecom/PhoneAccount.cs b/src/net/Netdroid/Generated/Android/Telecom/PhoneAccount.cs
index 2f22bb1d3..18fb84bef 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/PhoneAccount.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/PhoneAccount.cs
@@ -230,116 +230,126 @@ public static Android.Telecom.PhoneAccount.Builder BuilderMethod(Android.Telecom
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getAccountHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getIcon()"/>
         /// </summary>
-        public Android.Telecom.PhoneAccountHandle AccountHandle
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
         {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getAccountHandle", "()Landroid/telecom/PhoneAccountHandle;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getAddress()"/>
         /// </summary>
-        public Android.Net.Uri Address
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getSubscriptionAddress()"/>
         /// </summary>
-        public int Capabilities
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetSubscriptionAddress()
         {
-            get { return IExecuteWithSignature<int>("getCapabilities", "()I"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getSubscriptionAddress", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getExtras()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getHighlightColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#toBuilder()"/>
         /// </summary>
-        public int HighlightColor
+        /// <returns><see cref="Android.Telecom.PhoneAccount.Builder"/></returns>
+        public Android.Telecom.PhoneAccount.Builder ToBuilder()
         {
-            get { return IExecuteWithSignature<int>("getHighlightColor", "()I"); }
+            return IExecuteWithSignature<Android.Telecom.PhoneAccount.Builder>("toBuilder", "()Landroid/telecom/PhoneAccount$Builder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getAccountHandle()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetAccountHandle()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getAccountHandle", "()Landroid/telecom/PhoneAccountHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#hasCapabilities(int)"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool HasCapabilities(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("hasCapabilities", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getShortDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#isEnabled()"/>
         /// </summary>
-        public Java.Lang.CharSequence ShortDescription
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEnabled()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getShortDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getSubscriptionAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#supportsUriScheme(java.lang.String)"/>
         /// </summary>
-        public Android.Net.Uri SubscriptionAddress
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SupportsUriScheme(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getSubscriptionAddress", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<bool>("supportsUriScheme", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getSupportedUriSchemes()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> SupportedUriSchemes
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedUriSchemes", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#toBuilder()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getCapabilities()"/>
         /// </summary>
-        /// <returns><see cref="Android.Telecom.PhoneAccount.Builder"/></returns>
-        public Android.Telecom.PhoneAccount.Builder ToBuilder()
+        /// <returns><see cref="int"/></returns>
+        public int GetCapabilities()
         {
-            return IExecuteWithSignature<Android.Telecom.PhoneAccount.Builder>("toBuilder", "()Landroid/telecom/PhoneAccount$Builder;");
+            return IExecuteWithSignature<int>("getCapabilities", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#hasCapabilities(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getHighlightColor()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasCapabilities(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetHighlightColor()
         {
-            return IExecuteWithSignature<bool>("hasCapabilities", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getHighlightColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#isEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getLabel()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEnabled()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            return IExecuteWithSignature<bool>("isEnabled", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#supportsUriScheme(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getShortDescription()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SupportsUriScheme(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetShortDescription()
         {
-            return IExecuteWithSignature<bool>("supportsUriScheme", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getShortDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#getSupportedUriSchemes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetSupportedUriSchemes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getSupportedUriSchemes", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccount.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/PhoneAccountHandle.cs b/src/net/Netdroid/Generated/Android/Telecom/PhoneAccountHandle.cs
index 1afba7767..f27c38d6a 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/PhoneAccountHandle.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/PhoneAccountHandle.cs
@@ -71,25 +71,20 @@ public PhoneAccountHandle(Android.Content.ComponentName arg0, Java.Lang.String a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountHandle.html#getComponentName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountHandle.html#getComponentName()"/>
         /// </summary>
-        public Android.Content.ComponentName ComponentName
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponentName()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponentName", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountHandle.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountHandle.html#getUserHandle()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Android.Os.UserHandle"/></returns>
+        public Android.Os.UserHandle GetUserHandle()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountHandle.html#getUserHandle()"/> 
-        /// </summary>
-        public Android.Os.UserHandle UserHandle
-        {
-            get { return IExecuteWithSignature<Android.Os.UserHandle>("getUserHandle", "()Landroid/os/UserHandle;"); }
+            return IExecuteWithSignature<Android.Os.UserHandle>("getUserHandle", "()Landroid/os/UserHandle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountHandle.html#describeContents()"/>
@@ -100,6 +95,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountHandle.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountHandle.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/PhoneAccountSuggestion.cs b/src/net/Netdroid/Generated/Android/Telecom/PhoneAccountSuggestion.cs
index f01489e79..9d157bd8c 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/PhoneAccountSuggestion.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/PhoneAccountSuggestion.cs
@@ -92,18 +92,12 @@ public PhoneAccountSuggestion(Android.Telecom.PhoneAccountHandle arg0, int arg1,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountSuggestion.html#getPhoneAccountHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountSuggestion.html#getPhoneAccountHandle()"/>
         /// </summary>
-        public Android.Telecom.PhoneAccountHandle PhoneAccountHandle
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetPhoneAccountHandle()
         {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountSuggestion.html#getReason()"/> 
-        /// </summary>
-        public int Reason
-        {
-            get { return IExecuteWithSignature<int>("getReason", "()I"); }
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountSuggestion.html#shouldAutoSelect()"/>
@@ -122,6 +116,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountSuggestion.html#getReason()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetReason()
+        {
+            return IExecuteWithSignature<int>("getReason", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/PhoneAccountSuggestion.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/RemoteConference.cs b/src/net/Netdroid/Generated/Android/Telecom/RemoteConference.cs
index a104e0014..3e1990a53 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/RemoteConference.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/RemoteConference.cs
@@ -46,53 +46,60 @@ public partial class RemoteConference
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getConferenceableConnections()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getExtras()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.RemoteConnection> ConferenceableConnections
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.RemoteConnection>>("getConferenceableConnections", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getConnectionCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getDisconnectCause()"/>
         /// </summary>
-        public int ConnectionCapabilities
+        /// <returns><see cref="Android.Telecom.DisconnectCause"/></returns>
+        public Android.Telecom.DisconnectCause GetDisconnectCause()
         {
-            get { return IExecuteWithSignature<int>("getConnectionCapabilities", "()I"); }
+            return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getConnectionProperties()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getConnectionCapabilities()"/>
         /// </summary>
-        public int ConnectionProperties
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionCapabilities()
         {
-            get { return IExecuteWithSignature<int>("getConnectionProperties", "()I"); }
+            return IExecuteWithSignature<int>("getConnectionCapabilities", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getConnections()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getConnectionProperties()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.RemoteConnection> Connections
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionProperties()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.RemoteConnection>>("getConnections", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getConnectionProperties", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getDisconnectCause()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getState()"/>
         /// </summary>
-        public Android.Telecom.DisconnectCause DisconnectCause
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getConferenceableConnections()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.RemoteConnection> GetConferenceableConnections()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.RemoteConnection>>("getConferenceableConnections", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#getConnections()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.RemoteConnection> GetConnections()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.RemoteConnection>>("getConnections", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/RemoteConference.html#disconnect()"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/RemoteConnection.cs b/src/net/Netdroid/Generated/Android/Telecom/RemoteConnection.cs
index 1b4ca0430..9b8077a0a 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/RemoteConnection.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/RemoteConnection.cs
@@ -46,118 +46,132 @@ public partial class RemoteConnection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getAddress()"/>
         /// </summary>
-        public Android.Net.Uri Address
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetAddress()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getAddress", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getAddressPresentation()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getExtras()"/>
         /// </summary>
-        public int AddressPresentation
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<int>("getAddressPresentation", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getCallerDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getDisconnectCause()"/>
         /// </summary>
-        public Java.Lang.CharSequence CallerDisplayName
+        /// <returns><see cref="Android.Telecom.DisconnectCause"/></returns>
+        public Android.Telecom.DisconnectCause GetDisconnectCause()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCallerDisplayName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getCallerDisplayNamePresentation()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getConference()"/>
         /// </summary>
-        public int CallerDisplayNamePresentation
+        /// <returns><see cref="Android.Telecom.RemoteConference"/></returns>
+        public Android.Telecom.RemoteConference GetConference()
         {
-            get { return IExecuteWithSignature<int>("getCallerDisplayNamePresentation", "()I"); }
+            return IExecuteWithSignature<Android.Telecom.RemoteConference>("getConference", "()Landroid/telecom/RemoteConference;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getConference()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getVideoProvider()"/>
         /// </summary>
-        public Android.Telecom.RemoteConference Conference
+        /// <returns><see cref="Android.Telecom.RemoteConnection.VideoProvider"/></returns>
+        public Android.Telecom.RemoteConnection.VideoProvider GetVideoProvider()
         {
-            get { return IExecuteWithSignature<Android.Telecom.RemoteConference>("getConference", "()Landroid/telecom/RemoteConference;"); }
+            return IExecuteWithSignature<Android.Telecom.RemoteConnection.VideoProvider>("getVideoProvider", "()Landroid/telecom/RemoteConnection$VideoProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getConferenceableConnections()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getStatusHints()"/>
         /// </summary>
-        public Java.Util.List<Android.Telecom.RemoteConnection> ConferenceableConnections
+        /// <returns><see cref="Android.Telecom.StatusHints"/></returns>
+        public Android.Telecom.StatusHints GetStatusHints()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.RemoteConnection>>("getConferenceableConnections", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Telecom.StatusHints>("getStatusHints", "()Landroid/telecom/StatusHints;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getConnectionCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#isRingbackRequested()"/>
         /// </summary>
-        public int ConnectionCapabilities
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRingbackRequested()
         {
-            get { return IExecuteWithSignature<int>("getConnectionCapabilities", "()I"); }
+            return IExecuteWithSignature<bool>("isRingbackRequested", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getConnectionProperties()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#isVoipAudioMode()"/>
         /// </summary>
-        public int ConnectionProperties
+        /// <returns><see cref="bool"/></returns>
+        public bool IsVoipAudioMode()
         {
-            get { return IExecuteWithSignature<int>("getConnectionProperties", "()I"); }
+            return IExecuteWithSignature<bool>("isVoipAudioMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getDisconnectCause()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getAddressPresentation()"/>
         /// </summary>
-        public Android.Telecom.DisconnectCause DisconnectCause
+        /// <returns><see cref="int"/></returns>
+        public int GetAddressPresentation()
         {
-            get { return IExecuteWithSignature<Android.Telecom.DisconnectCause>("getDisconnectCause", "()Landroid/telecom/DisconnectCause;"); }
+            return IExecuteWithSignature<int>("getAddressPresentation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getCallerDisplayNamePresentation()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="int"/></returns>
+        public int GetCallerDisplayNamePresentation()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getCallerDisplayNamePresentation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getVideoProvider()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getConnectionCapabilities()"/>
         /// </summary>
-        public Android.Telecom.RemoteConnection.VideoProvider GetVideoProvider
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionCapabilities()
         {
-            get { return IExecuteWithSignature<Android.Telecom.RemoteConnection.VideoProvider>("getVideoProvider", "()Landroid/telecom/RemoteConnection$VideoProvider;"); }
+            return IExecuteWithSignature<int>("getConnectionCapabilities", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getConnectionProperties()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionProperties()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getConnectionProperties", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getStatusHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getState()"/>
         /// </summary>
-        public Android.Telecom.StatusHints StatusHints
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<Android.Telecom.StatusHints>("getStatusHints", "()Landroid/telecom/StatusHints;"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getVideoState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getVideoState()"/>
         /// </summary>
-        public int VideoState
+        /// <returns><see cref="int"/></returns>
+        public int GetVideoState()
         {
-            get { return IExecuteWithSignature<int>("getVideoState", "()I"); }
+            return IExecuteWithSignature<int>("getVideoState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#isRingbackRequested()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getCallerDisplayName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRingbackRequested()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetCallerDisplayName()
         {
-            return IExecuteWithSignature<bool>("isRingbackRequested", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getCallerDisplayName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#isVoipAudioMode()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#getConferenceableConnections()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsVoipAudioMode()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.RemoteConnection> GetConferenceableConnections()
         {
-            return IExecuteWithSignature<bool>("isVoipAudioMode", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.RemoteConnection>>("getConferenceableConnections", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/RemoteConnection.html#abort()"/>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/StatusHints.cs b/src/net/Netdroid/Generated/Android/Telecom/StatusHints.cs
index 6a8a12a7a..7ee9a683c 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/StatusHints.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/StatusHints.cs
@@ -62,25 +62,20 @@ public StatusHints(Java.Lang.CharSequence arg0, Android.Graphics.Drawable.Icon a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/StatusHints.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/StatusHints.html#getIcon()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Graphics.Drawable.Icon"/></returns>
+        public Android.Graphics.Drawable.Icon GetIcon()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/StatusHints.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/StatusHints.html#getExtras()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Icon Icon
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Icon>("getIcon", "()Landroid/graphics/drawable/Icon;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/StatusHints.html#getLabel()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Label
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/StatusHints.html#describeContents()"/>
@@ -91,6 +86,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/StatusHints.html#getLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/StatusHints.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telecom/TelecomManager.cs b/src/net/Netdroid/Generated/Android/Telecom/TelecomManager.cs
index cafc88ccf..51cd702df 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/TelecomManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/TelecomManager.cs
@@ -148,7 +148,7 @@ public partial class TelecomManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#ACTION_INCOMING_CALL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_INCOMING_CALL { get { if (!_ACTION_INCOMING_CALLReady) { _ACTION_INCOMING_CALLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_INCOMING_CALL"); _ACTION_INCOMING_CALLReady = true; } return _ACTION_INCOMING_CALLContent; } }
         private static Java.Lang.String _ACTION_INCOMING_CALLContent = default;
         private static bool _ACTION_INCOMING_CALLReady = false; // this is used because in case of generics 
@@ -407,55 +407,6 @@ public partial class TelecomManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getCallCapablePhoneAccounts()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Telecom.PhoneAccountHandle> CallCapablePhoneAccounts
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.PhoneAccountHandle>>("getCallCapablePhoneAccounts", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getDefaultDialerPackage()"/> 
-        /// </summary>
-        public Java.Lang.String DefaultDialerPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDefaultDialerPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getOwnSelfManagedPhoneAccounts()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Telecom.PhoneAccountHandle> OwnSelfManagedPhoneAccounts
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.PhoneAccountHandle>>("getOwnSelfManagedPhoneAccounts", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getSelfManagedPhoneAccounts()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Telecom.PhoneAccountHandle> SelfManagedPhoneAccounts
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telecom.PhoneAccountHandle>>("getSelfManagedPhoneAccounts", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getSimCallManager()"/> 
-        /// </summary>
-        public Android.Telecom.PhoneAccountHandle SimCallManager
-        {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getSimCallManager", "()Landroid/telecom/PhoneAccountHandle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getSystemDialerPackage()"/> 
-        /// </summary>
-        public Java.Lang.String SystemDialerPackage
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemDialerPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getUserSelectedOutgoingPhoneAccount()"/> 
-        /// </summary>
-        public Android.Telecom.PhoneAccountHandle UserSelectedOutgoingPhoneAccount
-        {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getUserSelectedOutgoingPhoneAccount", "()Landroid/telecom/PhoneAccountHandle;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#createManageBlockedNumbersIntent()"/>
         /// </summary>
         /// <returns><see cref="Android.Content.Intent"/></returns>
@@ -491,6 +442,14 @@ public Android.Telecom.PhoneAccountHandle GetDefaultOutgoingPhoneAccount(Java.La
             return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getDefaultOutgoingPhoneAccount", "(Ljava/lang/String;)Landroid/telecom/PhoneAccountHandle;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getSimCallManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetSimCallManager()
+        {
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getSimCallManager", "()Landroid/telecom/PhoneAccountHandle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getSimCallManagerForSubscription(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -500,10 +459,18 @@ public Android.Telecom.PhoneAccountHandle GetSimCallManagerForSubscription(int a
             return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getSimCallManagerForSubscription", "(I)Landroid/telecom/PhoneAccountHandle;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getUserSelectedOutgoingPhoneAccount()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetUserSelectedOutgoingPhoneAccount()
+        {
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getUserSelectedOutgoingPhoneAccount", "()Landroid/telecom/PhoneAccountHandle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#endCall()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool EndCall()
         {
             return IExecuteWithSignature<bool>("endCall", "()Z");
@@ -588,16 +555,32 @@ public bool IsVoiceMailNumber(Android.Telecom.PhoneAccountHandle arg0, Java.Lang
             return IExecute<bool>("isVoiceMailNumber", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getDefaultDialerPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDefaultDialerPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDefaultDialerPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getLine1Number(android.telecom.PhoneAccountHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetLine1Number(Android.Telecom.PhoneAccountHandle arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getLine1Number", "(Landroid/telecom/PhoneAccountHandle;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getSystemDialerPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemDialerPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSystemDialerPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getVoiceMailNumber(android.telecom.PhoneAccountHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
@@ -607,6 +590,30 @@ public Java.Lang.String GetVoiceMailNumber(Android.Telecom.PhoneAccountHandle ar
             return IExecuteWithSignature<Java.Lang.String>("getVoiceMailNumber", "(Landroid/telecom/PhoneAccountHandle;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getCallCapablePhoneAccounts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.PhoneAccountHandle> GetCallCapablePhoneAccounts()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.PhoneAccountHandle>>("getCallCapablePhoneAccounts", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getOwnSelfManagedPhoneAccounts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.PhoneAccountHandle> GetOwnSelfManagedPhoneAccounts()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.PhoneAccountHandle>>("getOwnSelfManagedPhoneAccounts", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#getSelfManagedPhoneAccounts()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telecom.PhoneAccountHandle> GetSelfManagedPhoneAccounts()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telecom.PhoneAccountHandle>>("getSelfManagedPhoneAccounts", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#acceptHandover(android.net.Uri,int,android.telecom.PhoneAccountHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
@@ -619,7 +626,7 @@ public void AcceptHandover(Android.Net.Uri arg0, int arg1, Android.Telecom.Phone
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#acceptRingingCall()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AcceptRingingCall()
         {
             IExecuteWithSignature("acceptRingingCall", "()V");
@@ -628,7 +635,7 @@ public void AcceptRingingCall()
         /// <see href="https://developer.android.com/reference/android/telecom/TelecomManager.html#acceptRingingCall(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AcceptRingingCall(int arg0)
         {
             IExecuteWithSignature("acceptRingingCall", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Telecom/VideoProfile.cs b/src/net/Netdroid/Generated/Android/Telecom/VideoProfile.cs
index f108fd536..2d672647b 100644
--- a/src/net/Netdroid/Generated/Android/Telecom/VideoProfile.cs
+++ b/src/net/Netdroid/Generated/Android/Telecom/VideoProfile.cs
@@ -186,26 +186,28 @@ public static Java.Lang.String VideoStateToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.html#getQuality()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.html#describeContents()"/>
         /// </summary>
-        public int Quality
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getQuality", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.html#getVideoState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.html#getQuality()"/>
         /// </summary>
-        public int VideoState
+        /// <returns><see cref="int"/></returns>
+        public int GetQuality()
         {
-            get { return IExecuteWithSignature<int>("getVideoState", "()I"); }
+            return IExecuteWithSignature<int>("getQuality", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.html#getVideoState()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetVideoState()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getVideoState", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.html#writeToParcel(android.os.Parcel,int)"/>
@@ -267,41 +269,44 @@ public CameraCapabilities(int arg0, int arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#getHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#isZoomSupported()"/>
             /// </summary>
-            public int Height
+            /// <returns><see cref="bool"/></returns>
+            public bool IsZoomSupported()
             {
-                get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+                return IExecuteWithSignature<bool>("isZoomSupported", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#getMaxZoom()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#getMaxZoom()"/>
             /// </summary>
-            public float MaxZoom
+            /// <returns><see cref="float"/></returns>
+            public float GetMaxZoom()
             {
-                get { return IExecuteWithSignature<float>("getMaxZoom", "()F"); }
+                return IExecuteWithSignature<float>("getMaxZoom", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#getWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#describeContents()"/>
             /// </summary>
-            public int Width
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#isZoomSupported()"/>
+            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#getHeight()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsZoomSupported()
+            /// <returns><see cref="int"/></returns>
+            public int GetHeight()
             {
-                return IExecuteWithSignature<bool>("isZoomSupported", "()Z");
+                return IExecuteWithSignature<int>("getHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#getWidth()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetWidth()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getWidth", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telecom/VideoProfile.CameraCapabilities.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Telephony/AllPackageClasses.cs
index 6b9dd3585..40214614a 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/AllPackageClasses.cs
@@ -605,10 +605,13 @@ public partial class CarrierConfigChangeListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public CarrierConfigChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.CarrierConfigManager_CarrierConfigChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.CarrierConfigChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -630,10 +633,13 @@ public partial class CarrierConfigChangeListenerDirect : CarrierConfigChangeList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.CarrierConfigManager$CarrierConfigChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.CarrierConfigManager$CarrierConfigChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1151,12 +1157,12 @@ public partial class CellIdentity : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CellIdentity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CellIdentity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CellIdentity() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CellIdentity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CellIdentity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CellIdentity(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1461,12 +1467,12 @@ public partial class CellInfo : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CellInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CellInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CellInfo() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CellInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CellInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CellInfo(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1765,19 +1771,19 @@ public CellInfoWcdma(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/CellLocation.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CellLocation : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CellLocation>
     {
         const string _bridgeClassName = "android.telephony.CellLocation";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CellLocation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CellLocation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CellLocation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CellLocation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CellLocation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CellLocation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1818,12 +1824,12 @@ public partial class CellSignalStrength : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CellSignalStrength class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CellSignalStrength class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CellSignalStrength() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CellSignalStrength class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CellSignalStrength class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CellSignalStrength(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2430,7 +2436,7 @@ public MbmsStreamingSession(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class NeighboringCellInfo : Android.Os.Parcelable
     {
         const string _bridgeClassName = "android.telephony.NeighboringCellInfo";
@@ -2695,39 +2701,25 @@ public PhoneNumberUtils(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html"/>
     /// </summary>
-    [System.Obsolete()]
-    public partial class PhoneStateListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    [global::System.Obsolete()]
+    public partial class PhoneStateListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PhoneStateListener>
     {
+        const string _bridgeClassName = "android.telephony.PhoneStateListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public PhoneStateListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region PhoneStateListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="PhoneStateListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class PhoneStateListenerDirect : PhoneStateListener
-    {
+        public PhoneStateListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public PhoneStateListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.telephony.PhoneStateListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2744,6 +2736,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -3193,12 +3188,12 @@ public partial class FinancialSmsCallback : MASES.JCOBridge.C2JBridge.JVMBridgeB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FinancialSmsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FinancialSmsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FinancialSmsCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FinancialSmsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FinancialSmsCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FinancialSmsCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3453,38 +3448,24 @@ public SubscriptionManager(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.OnOpportunisticSubscriptionsChangedListener.html"/>
         /// </summary>
-        public partial class OnOpportunisticSubscriptionsChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+        public partial class OnOpportunisticSubscriptionsChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnOpportunisticSubscriptionsChangedListener>
         {
+            const string _bridgeClassName = "android.telephony.SubscriptionManager$OnOpportunisticSubscriptionsChangedListener";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            public OnOpportunisticSubscriptionsChangedListener() { InitializeHandlers(); }
-
-        #warning Remember to build the Java class for event listener
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-        #region OnOpportunisticSubscriptionsChangedListenerDirect
-        /// <summary>
-        /// Direct override of <see cref="OnOpportunisticSubscriptionsChangedListener"/> or its generic type if there is one
-        /// </summary>
-        public partial class OnOpportunisticSubscriptionsChangedListenerDirect : OnOpportunisticSubscriptionsChangedListener
-        {
+            public OnOpportunisticSubscriptionsChangedListener() { }
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            public override bool AutoInit => false;
+            public OnOpportunisticSubscriptionsChangedListener(params object[] args) : base(args) { }
 
-            /// <inheritdoc />
-            protected override void InitializeHandlers() { }
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.SubscriptionManager$OnOpportunisticSubscriptionsChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3501,6 +3482,9 @@ protected override void InitializeHandlers() { }
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
             /// </summary>
             public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
         }
         #endregion
 
@@ -3508,38 +3492,24 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.OnSubscriptionsChangedListener.html"/>
         /// </summary>
-        public partial class OnSubscriptionsChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+        public partial class OnSubscriptionsChangedListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OnSubscriptionsChangedListener>
         {
+            const string _bridgeClassName = "android.telephony.SubscriptionManager$OnSubscriptionsChangedListener";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            public OnSubscriptionsChangedListener() { InitializeHandlers(); }
-
-        #warning Remember to build the Java class for event listener
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-        #region OnSubscriptionsChangedListenerDirect
-        /// <summary>
-        /// Direct override of <see cref="OnSubscriptionsChangedListener"/> or its generic type if there is one
-        /// </summary>
-        public partial class OnSubscriptionsChangedListenerDirect : OnSubscriptionsChangedListener
-        {
+            public OnSubscriptionsChangedListener() { }
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            public override bool AutoInit => false;
+            public OnSubscriptionsChangedListener(params object[] args) : base(args) { }
 
-            /// <inheritdoc />
-            protected override void InitializeHandlers() { }
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.SubscriptionManager$OnSubscriptionsChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3556,6 +3526,9 @@ protected override void InitializeHandlers() { }
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
             /// </summary>
             public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
         }
         #endregion
 
@@ -3702,10 +3675,13 @@ public partial class ActiveDataSubscriptionIdListener : MASES.JCOBridge.C2JBridg
             /// </summary>
             public ActiveDataSubscriptionIdListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_ActiveDataSubscriptionIdListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.ActiveDataSubscriptionIdListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3727,10 +3703,13 @@ public partial class ActiveDataSubscriptionIdListenerDirect : ActiveDataSubscrip
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$ActiveDataSubscriptionIdListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$ActiveDataSubscriptionIdListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3761,10 +3740,13 @@ public partial class BarringInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public BarringInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_BarringInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.BarringInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3786,10 +3768,13 @@ public partial class BarringInfoListenerDirect : BarringInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$BarringInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$BarringInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3820,10 +3805,13 @@ public partial class CallDisconnectCauseListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public CallDisconnectCauseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_CallDisconnectCauseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.CallDisconnectCauseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3845,10 +3833,13 @@ public partial class CallDisconnectCauseListenerDirect : CallDisconnectCauseList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$CallDisconnectCauseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$CallDisconnectCauseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3879,10 +3870,13 @@ public partial class CallForwardingIndicatorListener : MASES.JCOBridge.C2JBridge
             /// </summary>
             public CallForwardingIndicatorListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_CallForwardingIndicatorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.CallForwardingIndicatorListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3904,10 +3898,13 @@ public partial class CallForwardingIndicatorListenerDirect : CallForwardingIndic
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$CallForwardingIndicatorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$CallForwardingIndicatorListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3938,10 +3935,13 @@ public partial class CallStateListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public CallStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_CallStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.CallStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3963,10 +3963,13 @@ public partial class CallStateListenerDirect : CallStateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$CallStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$CallStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3997,10 +4000,13 @@ public partial class CarrierNetworkListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public CarrierNetworkListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_CarrierNetworkListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.CarrierNetworkListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4022,10 +4028,13 @@ public partial class CarrierNetworkListenerDirect : CarrierNetworkListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$CarrierNetworkListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$CarrierNetworkListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4056,10 +4065,13 @@ public partial class CellInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public CellInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_CellInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.CellInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4081,10 +4093,13 @@ public partial class CellInfoListenerDirect : CellInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$CellInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$CellInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4115,10 +4130,13 @@ public partial class CellLocationListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public CellLocationListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_CellLocationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.CellLocationListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4140,10 +4158,13 @@ public partial class CellLocationListenerDirect : CellLocationListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$CellLocationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$CellLocationListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4174,10 +4195,13 @@ public partial class DataActivationStateListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public DataActivationStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_DataActivationStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.DataActivationStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4199,10 +4223,13 @@ public partial class DataActivationStateListenerDirect : DataActivationStateList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$DataActivationStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$DataActivationStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4233,10 +4260,13 @@ public partial class DataActivityListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public DataActivityListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_DataActivityListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.DataActivityListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4258,10 +4288,13 @@ public partial class DataActivityListenerDirect : DataActivityListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$DataActivityListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$DataActivityListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4292,10 +4325,13 @@ public partial class DataConnectionStateListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public DataConnectionStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_DataConnectionStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.DataConnectionStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4317,10 +4353,13 @@ public partial class DataConnectionStateListenerDirect : DataConnectionStateList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$DataConnectionStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$DataConnectionStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4351,10 +4390,13 @@ public partial class DisplayInfoListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public DisplayInfoListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_DisplayInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.DisplayInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4376,10 +4418,13 @@ public partial class DisplayInfoListenerDirect : DisplayInfoListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$DisplayInfoListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$DisplayInfoListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4410,10 +4455,13 @@ public partial class EmergencyNumberListListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public EmergencyNumberListListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_EmergencyNumberListListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.EmergencyNumberListListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4435,10 +4483,13 @@ public partial class EmergencyNumberListListenerDirect : EmergencyNumberListList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$EmergencyNumberListListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$EmergencyNumberListListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4469,10 +4520,13 @@ public partial class ImsCallDisconnectCauseListener : MASES.JCOBridge.C2JBridge.
             /// </summary>
             public ImsCallDisconnectCauseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_ImsCallDisconnectCauseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.ImsCallDisconnectCauseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4494,10 +4548,13 @@ public partial class ImsCallDisconnectCauseListenerDirect : ImsCallDisconnectCau
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$ImsCallDisconnectCauseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$ImsCallDisconnectCauseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4528,10 +4585,13 @@ public partial class MessageWaitingIndicatorListener : MASES.JCOBridge.C2JBridge
             /// </summary>
             public MessageWaitingIndicatorListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_MessageWaitingIndicatorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.MessageWaitingIndicatorListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4553,10 +4613,13 @@ public partial class MessageWaitingIndicatorListenerDirect : MessageWaitingIndic
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$MessageWaitingIndicatorListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$MessageWaitingIndicatorListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4587,10 +4650,13 @@ public partial class PhysicalChannelConfigListener : MASES.JCOBridge.C2JBridge.J
             /// </summary>
             public PhysicalChannelConfigListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_PhysicalChannelConfigListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.PhysicalChannelConfigListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4612,10 +4678,13 @@ public partial class PhysicalChannelConfigListenerDirect : PhysicalChannelConfig
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$PhysicalChannelConfigListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$PhysicalChannelConfigListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4646,10 +4715,13 @@ public partial class PreciseDataConnectionStateListener : MASES.JCOBridge.C2JBri
             /// </summary>
             public PreciseDataConnectionStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_PreciseDataConnectionStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.PreciseDataConnectionStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4671,10 +4743,13 @@ public partial class PreciseDataConnectionStateListenerDirect : PreciseDataConne
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$PreciseDataConnectionStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$PreciseDataConnectionStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4705,10 +4780,13 @@ public partial class RegistrationFailedListener : MASES.JCOBridge.C2JBridge.JVMB
             /// </summary>
             public RegistrationFailedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_RegistrationFailedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.RegistrationFailedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4730,10 +4808,13 @@ public partial class RegistrationFailedListenerDirect : RegistrationFailedListen
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$RegistrationFailedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$RegistrationFailedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4764,10 +4845,13 @@ public partial class ServiceStateListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public ServiceStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_ServiceStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.ServiceStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4789,10 +4873,13 @@ public partial class ServiceStateListenerDirect : ServiceStateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$ServiceStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$ServiceStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4823,10 +4910,13 @@ public partial class SignalStrengthsListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public SignalStrengthsListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_SignalStrengthsListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.SignalStrengthsListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4848,10 +4938,13 @@ public partial class SignalStrengthsListenerDirect : SignalStrengthsListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$SignalStrengthsListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$SignalStrengthsListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4882,10 +4975,13 @@ public partial class UserMobileDataStateListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public UserMobileDataStateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.telephony.TelephonyCallback_UserMobileDataStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.telephony.UserMobileDataStateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4907,10 +5003,13 @@ public partial class UserMobileDataStateListenerDirect : UserMobileDataStateList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.telephony.TelephonyCallback$UserMobileDataStateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.telephony.TelephonyCallback$UserMobileDataStateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5045,12 +5144,12 @@ public partial class CellInfoCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CellInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CellInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CellInfoCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CellInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CellInfoCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CellInfoCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5142,12 +5241,12 @@ public partial class UssdResponseCallback : MASES.JCOBridge.C2JBridge.JVMBridgeB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("UssdResponseCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("UssdResponseCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public UssdResponseCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("UssdResponseCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("UssdResponseCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public UssdResponseCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5232,12 +5331,12 @@ public partial class NetworkScanCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("NetworkScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("NetworkScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public NetworkScanCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("NetworkScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("NetworkScanCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public NetworkScanCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5370,12 +5469,12 @@ public partial class VisualVoicemailService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VisualVoicemailService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VisualVoicemailService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VisualVoicemailService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VisualVoicemailService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VisualVoicemailService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VisualVoicemailService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/AvailableNetworkInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/AvailableNetworkInfo.cs
index 5eec1b37a..215e198a6 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/AvailableNetworkInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/AvailableNetworkInfo.cs
@@ -81,47 +81,52 @@ public AvailableNetworkInfo(int arg0, int arg1, Java.Util.List<Java.Lang.String>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getBands()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.Integer> Bands
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getBands", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getMccMncs()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getPriority()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> MccMncs
+        /// <returns><see cref="int"/></returns>
+        public int GetPriority()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getMccMncs", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getPriority", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getPriority()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getSubId()"/>
         /// </summary>
-        public int Priority
+        /// <returns><see cref="int"/></returns>
+        public int GetSubId()
         {
-            get { return IExecuteWithSignature<int>("getPriority", "()I"); }
+            return IExecuteWithSignature<int>("getSubId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getRadioAccessSpecifiers()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getRadioAccessSpecifiers()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.RadioAccessSpecifier> RadioAccessSpecifiers
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.RadioAccessSpecifier> GetRadioAccessSpecifiers()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.RadioAccessSpecifier>>("getRadioAccessSpecifiers", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.RadioAccessSpecifier>>("getRadioAccessSpecifiers", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getSubId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getBands()"/>
         /// </summary>
-        public int SubId
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetBands()
         {
-            get { return IExecuteWithSignature<int>("getSubId", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getBands", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#getMccMncs()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetMccMncs()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getMccMncs", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/AvailableNetworkInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/BarringInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/BarringInfo.cs
index cf216d4b3..b33f0f6ba 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/BarringInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/BarringInfo.cs
@@ -192,49 +192,52 @@ public partial class BarringServiceInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#getBarringType()"/> 
+            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#isBarred()"/>
             /// </summary>
-            public int BarringType
+            /// <returns><see cref="bool"/></returns>
+            public bool IsBarred()
             {
-                get { return IExecuteWithSignature<int>("getBarringType", "()I"); }
+                return IExecuteWithSignature<bool>("isBarred", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#getConditionalBarringFactor()"/> 
+            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#isConditionallyBarred()"/>
             /// </summary>
-            public int ConditionalBarringFactor
+            /// <returns><see cref="bool"/></returns>
+            public bool IsConditionallyBarred()
             {
-                get { return IExecuteWithSignature<int>("getConditionalBarringFactor", "()I"); }
+                return IExecuteWithSignature<bool>("isConditionallyBarred", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#getConditionalBarringTimeSeconds()"/> 
+            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#describeContents()"/>
             /// </summary>
-            public int ConditionalBarringTimeSeconds
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getConditionalBarringTimeSeconds", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#isBarred()"/>
+            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#getBarringType()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsBarred()
+            /// <returns><see cref="int"/></returns>
+            public int GetBarringType()
             {
-                return IExecuteWithSignature<bool>("isBarred", "()Z");
+                return IExecuteWithSignature<int>("getBarringType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#isConditionallyBarred()"/>
+            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#getConditionalBarringFactor()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsConditionallyBarred()
+            /// <returns><see cref="int"/></returns>
+            public int GetConditionalBarringFactor()
             {
-                return IExecuteWithSignature<bool>("isConditionallyBarred", "()Z");
+                return IExecuteWithSignature<int>("getConditionalBarringFactor", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#getConditionalBarringTimeSeconds()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetConditionalBarringTimeSeconds()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getConditionalBarringTimeSeconds", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/BarringInfo.BarringServiceInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CarrierConfigManager.cs b/src/net/Netdroid/Generated/Android/Telephony/CarrierConfigManager.cs
index 4eddbd205..6a31b8bb1 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CarrierConfigManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CarrierConfigManager.cs
@@ -250,7 +250,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL { get { if (!_KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOLReady) { _KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL"); _KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOLReady = true; } return _KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOLContent; } }
         private static Java.Lang.String _KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOLContent = default;
         private static bool _KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOLReady = false; // this is used because in case of generics 
@@ -377,7 +377,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS { get { if (!_KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGSReady) { _KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS"); _KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGSReady = true; } return _KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGSContent; } }
         private static Java.Lang.String _KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGSContent = default;
         private static bool _KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGSReady = false; // this is used because in case of generics 
@@ -432,7 +432,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL { get { if (!_KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOLReady) { _KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"); _KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOLReady = true; } return _KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOLContent; } }
         private static Java.Lang.String _KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOLContent = default;
         private static bool _KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOLReady = false; // this is used because in case of generics 
@@ -571,7 +571,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL { get { if (!_KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOLReady) { _KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL"); _KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOLReady = true; } return _KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOLContent; } }
         private static Java.Lang.String _KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOLContent = default;
         private static bool _KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOLReady = false; // this is used because in case of generics 
@@ -590,14 +590,14 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_CARRIER_VOLTE_PROVISIONED_BOOL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_CARRIER_VOLTE_PROVISIONED_BOOL { get { if (!_KEY_CARRIER_VOLTE_PROVISIONED_BOOLReady) { _KEY_CARRIER_VOLTE_PROVISIONED_BOOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_CARRIER_VOLTE_PROVISIONED_BOOL"); _KEY_CARRIER_VOLTE_PROVISIONED_BOOLReady = true; } return _KEY_CARRIER_VOLTE_PROVISIONED_BOOLContent; } }
         private static Java.Lang.String _KEY_CARRIER_VOLTE_PROVISIONED_BOOLContent = default;
         private static bool _KEY_CARRIER_VOLTE_PROVISIONED_BOOLReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL { get { if (!_KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOLReady) { _KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL"); _KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOLReady = true; } return _KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOLContent; } }
         private static Java.Lang.String _KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOLContent = default;
         private static bool _KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOLReady = false; // this is used because in case of generics 
@@ -616,7 +616,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_CARRIER_VVM_PACKAGE_NAME_STRING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING { get { if (!_KEY_CARRIER_VVM_PACKAGE_NAME_STRINGReady) { _KEY_CARRIER_VVM_PACKAGE_NAME_STRINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_CARRIER_VVM_PACKAGE_NAME_STRING"); _KEY_CARRIER_VVM_PACKAGE_NAME_STRINGReady = true; } return _KEY_CARRIER_VVM_PACKAGE_NAME_STRINGContent; } }
         private static Java.Lang.String _KEY_CARRIER_VVM_PACKAGE_NAME_STRINGContent = default;
         private static bool _KEY_CARRIER_VVM_PACKAGE_NAME_STRINGReady = false; // this is used because in case of generics 
@@ -713,7 +713,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING { get { if (!_KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRINGReady) { _KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING"); _KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRINGReady = true; } return _KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRINGContent; } }
         private static Java.Lang.String _KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRINGContent = default;
         private static bool _KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRINGReady = false; // this is used because in case of generics 
@@ -990,7 +990,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_HIDE_ENABLE_2G"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_HIDE_ENABLE_2G { get { if (!_KEY_HIDE_ENABLE_2GReady) { _KEY_HIDE_ENABLE_2GContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_HIDE_ENABLE_2G"); _KEY_HIDE_ENABLE_2GReady = true; } return _KEY_HIDE_ENABLE_2GContent; } }
         private static Java.Lang.String _KEY_HIDE_ENABLE_2GContent = default;
         private static bool _KEY_HIDE_ENABLE_2GReady = false; // this is used because in case of generics 
@@ -1501,7 +1501,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL { get { if (!_KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOLReady) { _KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL"); _KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOLReady = true; } return _KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOLContent; } }
         private static Java.Lang.String _KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOLContent = default;
         private static bool _KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOLReady = false; // this is used because in case of generics 
@@ -1640,7 +1640,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL { get { if (!_KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOLReady) { _KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL"); _KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOLReady = true; } return _KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOLContent; } }
         private static Java.Lang.String _KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOLContent = default;
         private static bool _KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOLReady = false; // this is used because in case of generics 
@@ -1815,7 +1815,7 @@ public partial class CarrierConfigManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#KEY_USE_RCS_PRESENCE_BOOL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String KEY_USE_RCS_PRESENCE_BOOL { get { if (!_KEY_USE_RCS_PRESENCE_BOOLReady) { _KEY_USE_RCS_PRESENCE_BOOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_USE_RCS_PRESENCE_BOOL"); _KEY_USE_RCS_PRESENCE_BOOLReady = true; } return _KEY_USE_RCS_PRESENCE_BOOLContent; } }
         private static Java.Lang.String _KEY_USE_RCS_PRESENCE_BOOLContent = default;
         private static bool _KEY_USE_RCS_PRESENCE_BOOLReady = false; // this is used because in case of generics 
@@ -1969,12 +1969,13 @@ public static bool IsConfigForIdentifiedCarrier(Android.Os.PersistableBundle arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#getConfig()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#getConfig()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Os.PersistableBundle Config
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.PersistableBundle GetConfig()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getConfig", "()Landroid/os/PersistableBundle;"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getConfig", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.html#getConfig(java.lang.String[])"/>
@@ -2010,7 +2011,7 @@ public Android.Os.PersistableBundle GetConfigForSubId(int arg0, params Java.Lang
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Os.PersistableBundle GetConfigForSubId(int arg0)
         {
             return IExecuteWithSignature<Android.Os.PersistableBundle>("getConfigForSubId", "(I)Landroid/os/PersistableBundle;", arg0);
@@ -2059,7 +2060,7 @@ public partial class Apn
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.Apn.html#KEY_PREFIX"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.String KEY_PREFIX { get { if (!_KEY_PREFIXReady) { _KEY_PREFIXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEY_PREFIX"); _KEY_PREFIXReady = true; } return _KEY_PREFIXContent; } }
             private static Java.Lang.String _KEY_PREFIXContent = default;
             private static bool _KEY_PREFIXReady = false; // this is used because in case of generics 
@@ -2192,7 +2193,7 @@ public partial class CarrierConfigChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCarrierConfigChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnCarrierConfigChangedEventHandler));
+                AddEventHandler("onCarrierConfigChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnCarrierConfigChangedEventHandler));
 
             }
 
@@ -2200,7 +2201,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/CarrierConfigManager.CarrierConfigChangeListener.html#onCarrierConfigChanged(int,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCarrierConfigChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, int, int, int> OnOnCarrierConfigChanged { get; set; } = null;
+            public global::System.Action<int, int, int, int> OnOnCarrierConfigChanged { get; set; } = null;
 
             void OnCarrierConfigChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Cdma/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Telephony/Cdma/AllPackageClasses.cs
index 2db211d90..5aeb9e3ae 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Cdma/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Cdma/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Telephony.Cdma
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CdmaCellLocation : Android.Telephony.CellLocation
     {
         const string _bridgeClassName = "android.telephony.cdma.CdmaCellLocation";
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Cdma/CdmaCellLocation.cs b/src/net/Netdroid/Generated/Android/Telephony/Cdma/CdmaCellLocation.cs
index 6d1e18a68..b7784d001 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Cdma/CdmaCellLocation.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Cdma/CdmaCellLocation.cs
@@ -33,7 +33,7 @@ public partial class CdmaCellLocation
         /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#%3Cinit%3E(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public CdmaCellLocation(Android.Os.Bundle arg0)
             : base(arg0)
         {
@@ -55,7 +55,7 @@ public CdmaCellLocation(Android.Os.Bundle arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="double"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static double ConvertQuartSecToDecDegrees(int arg0)
         {
             return SExecuteWithSignature<double>(LocalBridgeClazz, "convertQuartSecToDecDegrees", "(I)D", arg0);
@@ -65,50 +65,55 @@ public static double ConvertQuartSecToDecDegrees(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getBaseStationId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getBaseStationId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int BaseStationId
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBaseStationId()
         {
-            get { return IExecuteWithSignature<int>("getBaseStationId", "()I"); }
+            return IExecuteWithSignature<int>("getBaseStationId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getBaseStationLatitude()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getBaseStationLatitude()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int BaseStationLatitude
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBaseStationLatitude()
         {
-            get { return IExecuteWithSignature<int>("getBaseStationLatitude", "()I"); }
+            return IExecuteWithSignature<int>("getBaseStationLatitude", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getBaseStationLongitude()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getBaseStationLongitude()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int BaseStationLongitude
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBaseStationLongitude()
         {
-            get { return IExecuteWithSignature<int>("getBaseStationLongitude", "()I"); }
+            return IExecuteWithSignature<int>("getBaseStationLongitude", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getNetworkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getNetworkId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int NetworkId
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetNetworkId()
         {
-            get { return IExecuteWithSignature<int>("getNetworkId", "()I"); }
+            return IExecuteWithSignature<int>("getNetworkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#getSystemId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SystemId
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSystemId()
         {
-            get { return IExecuteWithSignature<int>("getSystemId", "()I"); }
+            return IExecuteWithSignature<int>("getSystemId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#fillInNotifierBundle(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void FillInNotifierBundle(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("fillInNotifierBundle", "(Landroid/os/Bundle;)V", arg0);
@@ -121,7 +126,7 @@ public void FillInNotifierBundle(Android.Os.Bundle arg0)
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCellLocationData(int arg0, int arg1, int arg2, int arg3, int arg4)
         {
             IExecute("setCellLocationData", arg0, arg1, arg2, arg3, arg4);
@@ -132,7 +137,7 @@ public void SetCellLocationData(int arg0, int arg1, int arg2, int arg3, int arg4
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCellLocationData(int arg0, int arg1, int arg2)
         {
             IExecute("setCellLocationData", arg0, arg1, arg2);
@@ -140,7 +145,7 @@ public void SetCellLocationData(int arg0, int arg1, int arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html#setStateInvalid()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetStateInvalid()
         {
             IExecuteWithSignature("setStateInvalid", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellIdentity.cs b/src/net/Netdroid/Generated/Android/Telephony/CellIdentity.cs
index accafb523..af8976528 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellIdentity.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellIdentity.cs
@@ -52,26 +52,28 @@ public partial class CellIdentity
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentity.html#getOperatorAlphaLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentity.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.CharSequence OperatorAlphaLong
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getOperatorAlphaLong", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentity.html#getOperatorAlphaShort()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentity.html#getOperatorAlphaLong()"/>
         /// </summary>
-        public Java.Lang.CharSequence OperatorAlphaShort
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetOperatorAlphaLong()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getOperatorAlphaShort", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getOperatorAlphaLong", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentity.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentity.html#getOperatorAlphaShort()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetOperatorAlphaShort()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getOperatorAlphaShort", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellIdentity.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityCdma.cs b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityCdma.cs
index d158f9fcd..7ac518e4e 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityCdma.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityCdma.cs
@@ -52,39 +52,44 @@ public partial class CellIdentityCdma
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getBasestationId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getBasestationId()"/>
         /// </summary>
-        public int BasestationId
+        /// <returns><see cref="int"/></returns>
+        public int GetBasestationId()
         {
-            get { return IExecuteWithSignature<int>("getBasestationId", "()I"); }
+            return IExecuteWithSignature<int>("getBasestationId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getLatitude()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getLatitude()"/>
         /// </summary>
-        public int Latitude
+        /// <returns><see cref="int"/></returns>
+        public int GetLatitude()
         {
-            get { return IExecuteWithSignature<int>("getLatitude", "()I"); }
+            return IExecuteWithSignature<int>("getLatitude", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getLongitude()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getLongitude()"/>
         /// </summary>
-        public int Longitude
+        /// <returns><see cref="int"/></returns>
+        public int GetLongitude()
         {
-            get { return IExecuteWithSignature<int>("getLongitude", "()I"); }
+            return IExecuteWithSignature<int>("getLongitude", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getNetworkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getNetworkId()"/>
         /// </summary>
-        public int NetworkId
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkId()
         {
-            get { return IExecuteWithSignature<int>("getNetworkId", "()I"); }
+            return IExecuteWithSignature<int>("getNetworkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityCdma.html#getSystemId()"/>
         /// </summary>
-        public int SystemId
+        /// <returns><see cref="int"/></returns>
+        public int GetSystemId()
         {
-            get { return IExecuteWithSignature<int>("getSystemId", "()I"); }
+            return IExecuteWithSignature<int>("getSystemId", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityGsm.cs b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityGsm.cs
index eb84618fb..7f7846ed5 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityGsm.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityGsm.cs
@@ -52,84 +52,95 @@ public partial class CellIdentityGsm
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getAdditionalPlmns()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getArfcn()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> AdditionalPlmns
+        /// <returns><see cref="int"/></returns>
+        public int GetArfcn()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("getArfcn", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getArfcn()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getBsic()"/>
         /// </summary>
-        public int Arfcn
+        /// <returns><see cref="int"/></returns>
+        public int GetBsic()
         {
-            get { return IExecuteWithSignature<int>("getArfcn", "()I"); }
+            return IExecuteWithSignature<int>("getBsic", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getBsic()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getCid()"/>
         /// </summary>
-        public int Bsic
+        /// <returns><see cref="int"/></returns>
+        public int GetCid()
         {
-            get { return IExecuteWithSignature<int>("getBsic", "()I"); }
+            return IExecuteWithSignature<int>("getCid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getCid()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getLac()"/>
         /// </summary>
-        public int Cid
+        /// <returns><see cref="int"/></returns>
+        public int GetLac()
         {
-            get { return IExecuteWithSignature<int>("getCid", "()I"); }
+            return IExecuteWithSignature<int>("getLac", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getLac()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMcc()"/>
         /// </summary>
-        public int Lac
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMcc()
         {
-            get { return IExecuteWithSignature<int>("getLac", "()I"); }
+            return IExecuteWithSignature<int>("getMcc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMcc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMnc()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mcc
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMnc()
         {
-            get { return IExecuteWithSignature<int>("getMcc", "()I"); }
+            return IExecuteWithSignature<int>("getMnc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMccString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getPsc()"/>
         /// </summary>
-        public Java.Lang.String MccString
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPsc()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPsc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMnc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMccString()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mnc
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMccString()
         {
-            get { return IExecuteWithSignature<int>("getMnc", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMncString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMncString()"/>
         /// </summary>
-        public Java.Lang.String MncString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMncString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMobileNetworkOperator()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getMobileNetworkOperator()"/>
         /// </summary>
-        public Java.Lang.String MobileNetworkOperator
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMobileNetworkOperator()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMobileNetworkOperator", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMobileNetworkOperator", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getPsc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityGsm.html#getAdditionalPlmns()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Psc
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetAdditionalPlmns()
         {
-            get { return IExecuteWithSignature<int>("getPsc", "()I"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityLte.cs b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityLte.cs
index cb3c5693c..415168b09 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityLte.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityLte.cs
@@ -52,97 +52,110 @@ public partial class CellIdentityLte
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getAdditionalPlmns()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getClosedSubscriberGroupInfo()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> AdditionalPlmns
+        /// <returns><see cref="Android.Telephony.ClosedSubscriberGroupInfo"/></returns>
+        public Android.Telephony.ClosedSubscriberGroupInfo GetClosedSubscriberGroupInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Telephony.ClosedSubscriberGroupInfo>("getClosedSubscriberGroupInfo", "()Landroid/telephony/ClosedSubscriberGroupInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getBands()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getBandwidth()"/>
         /// </summary>
-        public int[] Bands
+        /// <returns><see cref="int"/></returns>
+        public int GetBandwidth()
         {
-            get { return IExecuteWithSignatureArray<int>("getBands", "()[I"); }
+            return IExecuteWithSignature<int>("getBandwidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getBandwidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getCi()"/>
         /// </summary>
-        public int Bandwidth
+        /// <returns><see cref="int"/></returns>
+        public int GetCi()
         {
-            get { return IExecuteWithSignature<int>("getBandwidth", "()I"); }
+            return IExecuteWithSignature<int>("getCi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getCi()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getEarfcn()"/>
         /// </summary>
-        public int Ci
+        /// <returns><see cref="int"/></returns>
+        public int GetEarfcn()
         {
-            get { return IExecuteWithSignature<int>("getCi", "()I"); }
+            return IExecuteWithSignature<int>("getEarfcn", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getClosedSubscriberGroupInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMcc()"/>
         /// </summary>
-        public Android.Telephony.ClosedSubscriberGroupInfo ClosedSubscriberGroupInfo
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMcc()
         {
-            get { return IExecuteWithSignature<Android.Telephony.ClosedSubscriberGroupInfo>("getClosedSubscriberGroupInfo", "()Landroid/telephony/ClosedSubscriberGroupInfo;"); }
+            return IExecuteWithSignature<int>("getMcc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getEarfcn()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMnc()"/>
         /// </summary>
-        public int Earfcn
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMnc()
         {
-            get { return IExecuteWithSignature<int>("getEarfcn", "()I"); }
+            return IExecuteWithSignature<int>("getMnc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMcc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getPci()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mcc
+        /// <returns><see cref="int"/></returns>
+        public int GetPci()
         {
-            get { return IExecuteWithSignature<int>("getMcc", "()I"); }
+            return IExecuteWithSignature<int>("getPci", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMccString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getTac()"/>
         /// </summary>
-        public Java.Lang.String MccString
+        /// <returns><see cref="int"/></returns>
+        public int GetTac()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getTac", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMnc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getBands()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mnc
+        /// <returns><see cref="int"/></returns>
+        public int[] GetBands()
         {
-            get { return IExecuteWithSignature<int>("getMnc", "()I"); }
+            return IExecuteWithSignatureArray<int>("getBands", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMncString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMccString()"/>
         /// </summary>
-        public Java.Lang.String MncString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMccString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMobileNetworkOperator()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMncString()"/>
         /// </summary>
-        public Java.Lang.String MobileNetworkOperator
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMncString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMobileNetworkOperator", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getPci()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getMobileNetworkOperator()"/>
         /// </summary>
-        public int Pci
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMobileNetworkOperator()
         {
-            get { return IExecuteWithSignature<int>("getPci", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMobileNetworkOperator", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getTac()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityLte.html#getAdditionalPlmns()"/>
         /// </summary>
-        public int Tac
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetAdditionalPlmns()
         {
-            get { return IExecuteWithSignature<int>("getTac", "()I"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityNr.cs b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityNr.cs
index bfde18fd0..05d32ec5d 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityNr.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityNr.cs
@@ -52,60 +52,68 @@ public partial class CellIdentityNr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getAdditionalPlmns()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getNrarfcn()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> AdditionalPlmns
+        /// <returns><see cref="int"/></returns>
+        public int GetNrarfcn()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("getNrarfcn", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getBands()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getPci()"/>
         /// </summary>
-        public int[] Bands
+        /// <returns><see cref="int"/></returns>
+        public int GetPci()
         {
-            get { return IExecuteWithSignatureArray<int>("getBands", "()[I"); }
+            return IExecuteWithSignature<int>("getPci", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getMccString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getTac()"/>
         /// </summary>
-        public Java.Lang.String MccString
+        /// <returns><see cref="int"/></returns>
+        public int GetTac()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getTac", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getMncString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getBands()"/>
         /// </summary>
-        public Java.Lang.String MncString
+        /// <returns><see cref="int"/></returns>
+        public int[] GetBands()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<int>("getBands", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getNci()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getMccString()"/>
         /// </summary>
-        public long Nci
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMccString()
         {
-            get { return IExecuteWithSignature<long>("getNci", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getNrarfcn()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getMncString()"/>
         /// </summary>
-        public int Nrarfcn
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMncString()
         {
-            get { return IExecuteWithSignature<int>("getNrarfcn", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getPci()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getAdditionalPlmns()"/>
         /// </summary>
-        public int Pci
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetAdditionalPlmns()
         {
-            get { return IExecuteWithSignature<int>("getPci", "()I"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getTac()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityNr.html#getNci()"/>
         /// </summary>
-        public int Tac
+        /// <returns><see cref="long"/></returns>
+        public long GetNci()
         {
-            get { return IExecuteWithSignature<int>("getTac", "()I"); }
+            return IExecuteWithSignature<long>("getNci", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityTdscdma.cs b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityTdscdma.cs
index 7c30cf7fc..5ca9dbca2 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityTdscdma.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityTdscdma.cs
@@ -52,67 +52,76 @@ public partial class CellIdentityTdscdma
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getAdditionalPlmns()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getClosedSubscriberGroupInfo()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> AdditionalPlmns
+        /// <returns><see cref="Android.Telephony.ClosedSubscriberGroupInfo"/></returns>
+        public Android.Telephony.ClosedSubscriberGroupInfo GetClosedSubscriberGroupInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Telephony.ClosedSubscriberGroupInfo>("getClosedSubscriberGroupInfo", "()Landroid/telephony/ClosedSubscriberGroupInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getCid()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getCid()"/>
         /// </summary>
-        public int Cid
+        /// <returns><see cref="int"/></returns>
+        public int GetCid()
         {
-            get { return IExecuteWithSignature<int>("getCid", "()I"); }
+            return IExecuteWithSignature<int>("getCid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getClosedSubscriberGroupInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getCpid()"/>
         /// </summary>
-        public Android.Telephony.ClosedSubscriberGroupInfo ClosedSubscriberGroupInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetCpid()
         {
-            get { return IExecuteWithSignature<Android.Telephony.ClosedSubscriberGroupInfo>("getClosedSubscriberGroupInfo", "()Landroid/telephony/ClosedSubscriberGroupInfo;"); }
+            return IExecuteWithSignature<int>("getCpid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getCpid()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getLac()"/>
         /// </summary>
-        public int Cpid
+        /// <returns><see cref="int"/></returns>
+        public int GetLac()
         {
-            get { return IExecuteWithSignature<int>("getCpid", "()I"); }
+            return IExecuteWithSignature<int>("getLac", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getLac()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getUarfcn()"/>
         /// </summary>
-        public int Lac
+        /// <returns><see cref="int"/></returns>
+        public int GetUarfcn()
         {
-            get { return IExecuteWithSignature<int>("getLac", "()I"); }
+            return IExecuteWithSignature<int>("getUarfcn", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getMccString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getMccString()"/>
         /// </summary>
-        public Java.Lang.String MccString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMccString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getMncString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getMncString()"/>
         /// </summary>
-        public Java.Lang.String MncString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMncString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getMobileNetworkOperator()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getMobileNetworkOperator()"/>
         /// </summary>
-        public Java.Lang.String MobileNetworkOperator
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMobileNetworkOperator()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMobileNetworkOperator", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMobileNetworkOperator", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getUarfcn()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityTdscdma.html#getAdditionalPlmns()"/>
         /// </summary>
-        public int Uarfcn
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetAdditionalPlmns()
         {
-            get { return IExecuteWithSignature<int>("getUarfcn", "()I"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityWcdma.cs b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityWcdma.cs
index c6a589b4e..1e1ac8237 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellIdentityWcdma.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellIdentityWcdma.cs
@@ -52,83 +52,94 @@ public partial class CellIdentityWcdma
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getAdditionalPlmns()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getClosedSubscriberGroupInfo()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> AdditionalPlmns
+        /// <returns><see cref="Android.Telephony.ClosedSubscriberGroupInfo"/></returns>
+        public Android.Telephony.ClosedSubscriberGroupInfo GetClosedSubscriberGroupInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.Telephony.ClosedSubscriberGroupInfo>("getClosedSubscriberGroupInfo", "()Landroid/telephony/ClosedSubscriberGroupInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getCid()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getCid()"/>
         /// </summary>
-        public int Cid
+        /// <returns><see cref="int"/></returns>
+        public int GetCid()
         {
-            get { return IExecuteWithSignature<int>("getCid", "()I"); }
+            return IExecuteWithSignature<int>("getCid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getClosedSubscriberGroupInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getLac()"/>
         /// </summary>
-        public Android.Telephony.ClosedSubscriberGroupInfo ClosedSubscriberGroupInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetLac()
         {
-            get { return IExecuteWithSignature<Android.Telephony.ClosedSubscriberGroupInfo>("getClosedSubscriberGroupInfo", "()Landroid/telephony/ClosedSubscriberGroupInfo;"); }
+            return IExecuteWithSignature<int>("getLac", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getLac()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMcc()"/>
         /// </summary>
-        public int Lac
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMcc()
         {
-            get { return IExecuteWithSignature<int>("getLac", "()I"); }
+            return IExecuteWithSignature<int>("getMcc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMcc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMnc()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mcc
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMnc()
         {
-            get { return IExecuteWithSignature<int>("getMcc", "()I"); }
+            return IExecuteWithSignature<int>("getMnc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMccString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getPsc()"/>
         /// </summary>
-        public Java.Lang.String MccString
+        /// <returns><see cref="int"/></returns>
+        public int GetPsc()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPsc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMnc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getUarfcn()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mnc
+        /// <returns><see cref="int"/></returns>
+        public int GetUarfcn()
         {
-            get { return IExecuteWithSignature<int>("getMnc", "()I"); }
+            return IExecuteWithSignature<int>("getUarfcn", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMncString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMccString()"/>
         /// </summary>
-        public Java.Lang.String MncString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMccString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMobileNetworkOperator()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMncString()"/>
         /// </summary>
-        public Java.Lang.String MobileNetworkOperator
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMncString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMobileNetworkOperator", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getPsc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getMobileNetworkOperator()"/>
         /// </summary>
-        public int Psc
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMobileNetworkOperator()
         {
-            get { return IExecuteWithSignature<int>("getPsc", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMobileNetworkOperator", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getUarfcn()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellIdentityWcdma.html#getAdditionalPlmns()"/>
         /// </summary>
-        public int Uarfcn
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetAdditionalPlmns()
         {
-            get { return IExecuteWithSignature<int>("getUarfcn", "()I"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getAdditionalPlmns", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/CellInfo.cs
index 8d8c651e8..4a7075a6d 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellInfo.cs
@@ -88,40 +88,20 @@ public partial class CellInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getCellConnectionStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getCellIdentity()"/>
         /// </summary>
-        public int CellConnectionStatus
+        /// <returns><see cref="Android.Telephony.CellIdentity"/></returns>
+        public Android.Telephony.CellIdentity GetCellIdentity()
         {
-            get { return IExecuteWithSignature<int>("getCellConnectionStatus", "()I"); }
+            return IExecuteWithSignature<Android.Telephony.CellIdentity>("getCellIdentity", "()Landroid/telephony/CellIdentity;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getCellIdentity()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getCellSignalStrength()"/>
         /// </summary>
-        public Android.Telephony.CellIdentity CellIdentity
+        /// <returns><see cref="Android.Telephony.CellSignalStrength"/></returns>
+        public Android.Telephony.CellSignalStrength GetCellSignalStrength()
         {
-            get { return IExecuteWithSignature<Android.Telephony.CellIdentity>("getCellIdentity", "()Landroid/telephony/CellIdentity;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getCellSignalStrength()"/> 
-        /// </summary>
-        public Android.Telephony.CellSignalStrength CellSignalStrength
-        {
-            get { return IExecuteWithSignature<Android.Telephony.CellSignalStrength>("getCellSignalStrength", "()Landroid/telephony/CellSignalStrength;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getTimeStamp()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public long TimeStamp
-        {
-            get { return IExecuteWithSignature<long>("getTimeStamp", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getTimestampMillis()"/> 
-        /// </summary>
-        public long TimestampMillis
-        {
-            get { return IExecuteWithSignature<long>("getTimestampMillis", "()J"); }
+            return IExecuteWithSignature<Android.Telephony.CellSignalStrength>("getCellSignalStrength", "()Landroid/telephony/CellSignalStrength;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#writeToParcel(android.os.Parcel,int)"/>
@@ -148,6 +128,31 @@ public int DescribeContents()
         {
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getCellConnectionStatus()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCellConnectionStatus()
+        {
+            return IExecuteWithSignature<int>("getCellConnectionStatus", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getTimeStamp()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetTimeStamp()
+        {
+            return IExecuteWithSignature<long>("getTimeStamp", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellInfo.html#getTimestampMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestampMillis()
+        {
+            return IExecuteWithSignature<long>("getTimestampMillis", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellLocation.cs b/src/net/Netdroid/Generated/Android/Telephony/CellLocation.cs
index 21677e781..d00c92806 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellLocation.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellLocation.cs
@@ -42,17 +42,18 @@ public partial class CellLocation
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellLocation.html#getEmpty()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellLocation.html#getEmpty()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Android.Telephony.CellLocation Empty
+        /// <returns><see cref="Android.Telephony.CellLocation"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Telephony.CellLocation GetEmpty()
         {
-            get { return SExecuteWithSignature<Android.Telephony.CellLocation>(LocalBridgeClazz, "getEmpty", "()Landroid/telephony/CellLocation;"); }
+            return SExecuteWithSignature<Android.Telephony.CellLocation>(LocalBridgeClazz, "getEmpty", "()Landroid/telephony/CellLocation;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellLocation.html#requestLocationUpdate()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void RequestLocationUpdate()
         {
             SExecuteWithSignature(LocalBridgeClazz, "requestLocationUpdate", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrength.cs b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrength.cs
index a388ad791..10d757c4c 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrength.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrength.cs
@@ -76,25 +76,28 @@ public partial class CellSignalStrength
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrength.html#getAsuLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrength.html#getAsuLevel()"/>
         /// </summary>
-        public int AsuLevel
+        /// <returns><see cref="int"/></returns>
+        public int GetAsuLevel()
         {
-            get { return IExecuteWithSignature<int>("getAsuLevel", "()I"); }
+            return IExecuteWithSignature<int>("getAsuLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrength.html#getDbm()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrength.html#getDbm()"/>
         /// </summary>
-        public int Dbm
+        /// <returns><see cref="int"/></returns>
+        public int GetDbm()
         {
-            get { return IExecuteWithSignature<int>("getDbm", "()I"); }
+            return IExecuteWithSignature<int>("getDbm", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrength.html#getLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrength.html#getLevel()"/>
         /// </summary>
-        public int Level
+        /// <returns><see cref="int"/></returns>
+        public int GetLevel()
         {
-            get { return IExecuteWithSignature<int>("getLevel", "()I"); }
+            return IExecuteWithSignature<int>("getLevel", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthCdma.cs b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthCdma.cs
index ef7a01da0..490b46b19 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthCdma.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthCdma.cs
@@ -56,61 +56,68 @@ public partial class CellSignalStrengthCdma
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getCdmaDbm()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#describeContents()"/>
         /// </summary>
-        public int CdmaDbm
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCdmaDbm", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getCdmaEcio()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getCdmaDbm()"/>
         /// </summary>
-        public int CdmaEcio
+        /// <returns><see cref="int"/></returns>
+        public int GetCdmaDbm()
         {
-            get { return IExecuteWithSignature<int>("getCdmaEcio", "()I"); }
+            return IExecuteWithSignature<int>("getCdmaDbm", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getCdmaLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getCdmaEcio()"/>
         /// </summary>
-        public int CdmaLevel
+        /// <returns><see cref="int"/></returns>
+        public int GetCdmaEcio()
         {
-            get { return IExecuteWithSignature<int>("getCdmaLevel", "()I"); }
+            return IExecuteWithSignature<int>("getCdmaEcio", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getEvdoDbm()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getCdmaLevel()"/>
         /// </summary>
-        public int EvdoDbm
+        /// <returns><see cref="int"/></returns>
+        public int GetCdmaLevel()
         {
-            get { return IExecuteWithSignature<int>("getEvdoDbm", "()I"); }
+            return IExecuteWithSignature<int>("getCdmaLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getEvdoEcio()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getEvdoDbm()"/>
         /// </summary>
-        public int EvdoEcio
+        /// <returns><see cref="int"/></returns>
+        public int GetEvdoDbm()
         {
-            get { return IExecuteWithSignature<int>("getEvdoEcio", "()I"); }
+            return IExecuteWithSignature<int>("getEvdoDbm", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getEvdoLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getEvdoEcio()"/>
         /// </summary>
-        public int EvdoLevel
+        /// <returns><see cref="int"/></returns>
+        public int GetEvdoEcio()
         {
-            get { return IExecuteWithSignature<int>("getEvdoLevel", "()I"); }
+            return IExecuteWithSignature<int>("getEvdoEcio", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getEvdoSnr()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getEvdoLevel()"/>
         /// </summary>
-        public int EvdoSnr
+        /// <returns><see cref="int"/></returns>
+        public int GetEvdoLevel()
         {
-            get { return IExecuteWithSignature<int>("getEvdoSnr", "()I"); }
+            return IExecuteWithSignature<int>("getEvdoLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#getEvdoSnr()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetEvdoSnr()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getEvdoSnr", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthCdma.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthGsm.cs b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthGsm.cs
index 71f44a4ce..b1637ad4b 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthGsm.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthGsm.cs
@@ -56,33 +56,36 @@ public partial class CellSignalStrengthGsm
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#getBitErrorRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#describeContents()"/>
         /// </summary>
-        public int BitErrorRate
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getBitErrorRate", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#getRssi()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#getBitErrorRate()"/>
         /// </summary>
-        public int Rssi
+        /// <returns><see cref="int"/></returns>
+        public int GetBitErrorRate()
         {
-            get { return IExecuteWithSignature<int>("getRssi", "()I"); }
+            return IExecuteWithSignature<int>("getBitErrorRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#getTimingAdvance()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#getRssi()"/>
         /// </summary>
-        public int TimingAdvance
+        /// <returns><see cref="int"/></returns>
+        public int GetRssi()
         {
-            get { return IExecuteWithSignature<int>("getTimingAdvance", "()I"); }
+            return IExecuteWithSignature<int>("getRssi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#getTimingAdvance()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetTimingAdvance()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getTimingAdvance", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthGsm.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthLte.cs b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthLte.cs
index 87d0bf725..16285001a 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthLte.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthLte.cs
@@ -56,61 +56,68 @@ public partial class CellSignalStrengthLte
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getCqi()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#describeContents()"/>
         /// </summary>
-        public int Cqi
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCqi", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getCqiTableIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getCqi()"/>
         /// </summary>
-        public int CqiTableIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetCqi()
         {
-            get { return IExecuteWithSignature<int>("getCqiTableIndex", "()I"); }
+            return IExecuteWithSignature<int>("getCqi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getRsrp()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getCqiTableIndex()"/>
         /// </summary>
-        public int Rsrp
+        /// <returns><see cref="int"/></returns>
+        public int GetCqiTableIndex()
         {
-            get { return IExecuteWithSignature<int>("getRsrp", "()I"); }
+            return IExecuteWithSignature<int>("getCqiTableIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getRsrq()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getRsrp()"/>
         /// </summary>
-        public int Rsrq
+        /// <returns><see cref="int"/></returns>
+        public int GetRsrp()
         {
-            get { return IExecuteWithSignature<int>("getRsrq", "()I"); }
+            return IExecuteWithSignature<int>("getRsrp", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getRssi()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getRsrq()"/>
         /// </summary>
-        public int Rssi
+        /// <returns><see cref="int"/></returns>
+        public int GetRsrq()
         {
-            get { return IExecuteWithSignature<int>("getRssi", "()I"); }
+            return IExecuteWithSignature<int>("getRsrq", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getRssnr()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getRssi()"/>
         /// </summary>
-        public int Rssnr
+        /// <returns><see cref="int"/></returns>
+        public int GetRssi()
         {
-            get { return IExecuteWithSignature<int>("getRssnr", "()I"); }
+            return IExecuteWithSignature<int>("getRssi", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getTimingAdvance()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getRssnr()"/>
         /// </summary>
-        public int TimingAdvance
+        /// <returns><see cref="int"/></returns>
+        public int GetRssnr()
         {
-            get { return IExecuteWithSignature<int>("getTimingAdvance", "()I"); }
+            return IExecuteWithSignature<int>("getRssnr", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#getTimingAdvance()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetTimingAdvance()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getTimingAdvance", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthLte.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthNr.cs b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthNr.cs
index 9fad651b6..6d56a5a27 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthNr.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthNr.cs
@@ -56,75 +56,84 @@ public partial class CellSignalStrengthNr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiCqiReport()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.Integer> CsiCqiReport
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getCsiCqiReport", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiCqiTableIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiCqiTableIndex()"/>
         /// </summary>
-        public int CsiCqiTableIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetCsiCqiTableIndex()
         {
-            get { return IExecuteWithSignature<int>("getCsiCqiTableIndex", "()I"); }
+            return IExecuteWithSignature<int>("getCsiCqiTableIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiRsrp()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiRsrp()"/>
         /// </summary>
-        public int CsiRsrp
+        /// <returns><see cref="int"/></returns>
+        public int GetCsiRsrp()
         {
-            get { return IExecuteWithSignature<int>("getCsiRsrp", "()I"); }
+            return IExecuteWithSignature<int>("getCsiRsrp", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiRsrq()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiRsrq()"/>
         /// </summary>
-        public int CsiRsrq
+        /// <returns><see cref="int"/></returns>
+        public int GetCsiRsrq()
         {
-            get { return IExecuteWithSignature<int>("getCsiRsrq", "()I"); }
+            return IExecuteWithSignature<int>("getCsiRsrq", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiSinr()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiSinr()"/>
         /// </summary>
-        public int CsiSinr
+        /// <returns><see cref="int"/></returns>
+        public int GetCsiSinr()
         {
-            get { return IExecuteWithSignature<int>("getCsiSinr", "()I"); }
+            return IExecuteWithSignature<int>("getCsiSinr", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getSsRsrp()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getSsRsrp()"/>
         /// </summary>
-        public int SsRsrp
+        /// <returns><see cref="int"/></returns>
+        public int GetSsRsrp()
         {
-            get { return IExecuteWithSignature<int>("getSsRsrp", "()I"); }
+            return IExecuteWithSignature<int>("getSsRsrp", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getSsRsrq()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getSsRsrq()"/>
         /// </summary>
-        public int SsRsrq
+        /// <returns><see cref="int"/></returns>
+        public int GetSsRsrq()
         {
-            get { return IExecuteWithSignature<int>("getSsRsrq", "()I"); }
+            return IExecuteWithSignature<int>("getSsRsrq", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getSsSinr()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getSsSinr()"/>
         /// </summary>
-        public int SsSinr
+        /// <returns><see cref="int"/></returns>
+        public int GetSsSinr()
         {
-            get { return IExecuteWithSignature<int>("getSsSinr", "()I"); }
+            return IExecuteWithSignature<int>("getSsSinr", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getTimingAdvanceMicros()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getTimingAdvanceMicros()"/>
         /// </summary>
-        public int TimingAdvanceMicros
+        /// <returns><see cref="int"/></returns>
+        public int GetTimingAdvanceMicros()
         {
-            get { return IExecuteWithSignature<int>("getTimingAdvanceMicros", "()I"); }
+            return IExecuteWithSignature<int>("getTimingAdvanceMicros", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#getCsiCqiReport()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetCsiCqiReport()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getCsiCqiReport", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthNr.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthTdscdma.cs b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthTdscdma.cs
index c6a71819f..486fe386f 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthTdscdma.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthTdscdma.cs
@@ -56,19 +56,20 @@ public partial class CellSignalStrengthTdscdma
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthTdscdma.html#getRscp()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthTdscdma.html#describeContents()"/>
         /// </summary>
-        public int Rscp
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getRscp", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthTdscdma.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthTdscdma.html#getRscp()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetRscp()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getRscp", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthTdscdma.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthWcdma.cs b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthWcdma.cs
index b256afd40..b306f2588 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthWcdma.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/CellSignalStrengthWcdma.cs
@@ -56,19 +56,20 @@ public partial class CellSignalStrengthWcdma
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthWcdma.html#getEcNo()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthWcdma.html#describeContents()"/>
         /// </summary>
-        public int EcNo
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getEcNo", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthWcdma.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthWcdma.html#getEcNo()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetEcNo()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getEcNo", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/CellSignalStrengthWcdma.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/ClosedSubscriberGroupInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/ClosedSubscriberGroupInfo.cs
index 621e3701e..5daf7f336 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/ClosedSubscriberGroupInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/ClosedSubscriberGroupInfo.cs
@@ -52,33 +52,36 @@ public partial class ClosedSubscriberGroupInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#getCsgIdentity()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#getCsgIndicator()"/>
         /// </summary>
-        public int CsgIdentity
+        /// <returns><see cref="bool"/></returns>
+        public bool GetCsgIndicator()
         {
-            get { return IExecuteWithSignature<int>("getCsgIdentity", "()I"); }
+            return IExecuteWithSignature<bool>("getCsgIndicator", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#getCsgIndicator()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#describeContents()"/>
         /// </summary>
-        public bool CsgIndicator
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<bool>("getCsgIndicator", "()Z"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#getHomeNodebName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#getCsgIdentity()"/>
         /// </summary>
-        public Java.Lang.String HomeNodebName
+        /// <returns><see cref="int"/></returns>
+        public int GetCsgIdentity()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHomeNodebName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getCsgIdentity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#getHomeNodebName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHomeNodebName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getHomeNodebName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ClosedSubscriberGroupInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Data/ApnSetting.cs b/src/net/Netdroid/Generated/Android/Telephony/Data/ApnSetting.cs
index ebc601469..266943bd7 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Data/ApnSetting.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Data/ApnSetting.cs
@@ -226,191 +226,214 @@ public partial class ApnSetting
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getApnName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMmsc()"/>
         /// </summary>
-        public Java.Lang.String ApnName
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetMmsc()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getApnName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getMmsc", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getApnTypeBitmask()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#isEnabled()"/>
         /// </summary>
-        public int ApnTypeBitmask
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEnabled()
         {
-            get { return IExecuteWithSignature<int>("getApnTypeBitmask", "()I"); }
+            return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getAuthType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#isPersistent()"/>
         /// </summary>
-        public int AuthType
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPersistent()
         {
-            get { return IExecuteWithSignature<int>("getAuthType", "()I"); }
+            return IExecuteWithSignature<bool>("isPersistent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getCarrierId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#describeContents()"/>
         /// </summary>
-        public int CarrierId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCarrierId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getEntryName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getApnTypeBitmask()"/>
         /// </summary>
-        public Java.Lang.String EntryName
+        /// <returns><see cref="int"/></returns>
+        public int GetApnTypeBitmask()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEntryName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getApnTypeBitmask", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getAuthType()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="int"/></returns>
+        public int GetAuthType()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<int>("getAuthType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMmsc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getCarrierId()"/>
         /// </summary>
-        public Android.Net.Uri Mmsc
+        /// <returns><see cref="int"/></returns>
+        public int GetCarrierId()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getMmsc", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<int>("getCarrierId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMmsProxyAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Net.InetAddress MmsProxyAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getMmsProxyAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMmsProxyAddressAsString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMmsProxyPort()"/>
         /// </summary>
-        public Java.Lang.String MmsProxyAddressAsString
+        /// <returns><see cref="int"/></returns>
+        public int GetMmsProxyPort()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMmsProxyAddressAsString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getMmsProxyPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMmsProxyPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMtuV4()"/>
         /// </summary>
-        public int MmsProxyPort
+        /// <returns><see cref="int"/></returns>
+        public int GetMtuV4()
         {
-            get { return IExecuteWithSignature<int>("getMmsProxyPort", "()I"); }
+            return IExecuteWithSignature<int>("getMtuV4", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMtuV4()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMtuV6()"/>
         /// </summary>
-        public int MtuV4
+        /// <returns><see cref="int"/></returns>
+        public int GetMtuV6()
         {
-            get { return IExecuteWithSignature<int>("getMtuV4", "()I"); }
+            return IExecuteWithSignature<int>("getMtuV6", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMtuV6()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMvnoType()"/>
         /// </summary>
-        public int MtuV6
+        /// <returns><see cref="int"/></returns>
+        public int GetMvnoType()
         {
-            get { return IExecuteWithSignature<int>("getMtuV6", "()I"); }
+            return IExecuteWithSignature<int>("getMvnoType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMvnoType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getNetworkTypeBitmask()"/>
         /// </summary>
-        public int MvnoType
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkTypeBitmask()
         {
-            get { return IExecuteWithSignature<int>("getMvnoType", "()I"); }
+            return IExecuteWithSignature<int>("getNetworkTypeBitmask", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getNetworkTypeBitmask()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProfileId()"/>
         /// </summary>
-        public int NetworkTypeBitmask
+        /// <returns><see cref="int"/></returns>
+        public int GetProfileId()
         {
-            get { return IExecuteWithSignature<int>("getNetworkTypeBitmask", "()I"); }
+            return IExecuteWithSignature<int>("getProfileId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getOperatorNumeric()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProtocol()"/>
         /// </summary>
-        public Java.Lang.String OperatorNumeric
+        /// <returns><see cref="int"/></returns>
+        public int GetProtocol()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOperatorNumeric", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getProtocol", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getPassword()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProxyPort()"/>
         /// </summary>
-        public Java.Lang.String Password
+        /// <returns><see cref="int"/></returns>
+        public int GetProxyPort()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getProxyPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProfileId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getRoamingProtocol()"/>
         /// </summary>
-        public int ProfileId
+        /// <returns><see cref="int"/></returns>
+        public int GetRoamingProtocol()
         {
-            get { return IExecuteWithSignature<int>("getProfileId", "()I"); }
+            return IExecuteWithSignature<int>("getRoamingProtocol", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getApnName()"/>
         /// </summary>
-        public int Protocol
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetApnName()
         {
-            get { return IExecuteWithSignature<int>("getProtocol", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getApnName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProxyAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getEntryName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Net.InetAddress ProxyAddress
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEntryName()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getProxyAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEntryName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProxyAddressAsString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMmsProxyAddressAsString()"/>
         /// </summary>
-        public Java.Lang.String ProxyAddressAsString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMmsProxyAddressAsString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProxyAddressAsString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMmsProxyAddressAsString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProxyPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getOperatorNumeric()"/>
         /// </summary>
-        public int ProxyPort
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOperatorNumeric()
         {
-            get { return IExecuteWithSignature<int>("getProxyPort", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getOperatorNumeric", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getRoamingProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getPassword()"/>
         /// </summary>
-        public int RoamingProtocol
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPassword()
         {
-            get { return IExecuteWithSignature<int>("getRoamingProtocol", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getUser()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProxyAddressAsString()"/>
         /// </summary>
-        public Java.Lang.String User
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProxyAddressAsString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUser", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProxyAddressAsString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#isEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getUser()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEnabled()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUser()
         {
-            return IExecuteWithSignature<bool>("isEnabled", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getUser", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#isPersistent()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getMmsProxyAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPersistent()
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        [global::System.Obsolete()]
+        public Java.Net.InetAddress GetMmsProxyAddress()
         {
-            return IExecuteWithSignature<bool>("isPersistent", "()Z");
+            return IExecuteWithSignature<Java.Net.InetAddress>("getMmsProxyAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#getProxyAddress()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        [global::System.Obsolete()]
+        public Java.Net.InetAddress GetProxyAddress()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Net.InetAddress>("getProxyAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/data/ApnSetting.html#writeToParcel(android.os.Parcel,int)"/>
@@ -530,7 +553,7 @@ public Android.Telephony.Data.ApnSetting.Builder SetMmsProxyAddress(Java.Lang.St
             /// </summary>
             /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
             /// <returns><see cref="Android.Telephony.Data.ApnSetting.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Telephony.Data.ApnSetting.Builder SetMmsProxyAddress(Java.Net.InetAddress arg0)
             {
                 return IExecuteWithSignature<Android.Telephony.Data.ApnSetting.Builder>("setMmsProxyAddress", "(Ljava/net/InetAddress;)Landroid/telephony/data/ApnSetting$Builder;", arg0);
@@ -639,7 +662,7 @@ public Android.Telephony.Data.ApnSetting.Builder SetProxyAddress(Java.Lang.Strin
             /// </summary>
             /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
             /// <returns><see cref="Android.Telephony.Data.ApnSetting.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Telephony.Data.ApnSetting.Builder SetProxyAddress(Java.Net.InetAddress arg0)
             {
                 return IExecuteWithSignature<Android.Telephony.Data.ApnSetting.Builder>("setProxyAddress", "(Ljava/net/InetAddress;)Landroid/telephony/data/ApnSetting$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Data/NetworkSliceInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/Data/NetworkSliceInfo.cs
index 135efc4b2..25ca46bbf 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Data/NetworkSliceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Data/NetworkSliceInfo.cs
@@ -118,47 +118,52 @@ public partial class NetworkSliceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getMappedHplmnSliceDifferentiator()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#describeContents()"/>
         /// </summary>
-        public int MappedHplmnSliceDifferentiator
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getMappedHplmnSliceDifferentiator", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getMappedHplmnSliceServiceType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getMappedHplmnSliceDifferentiator()"/>
         /// </summary>
-        public int MappedHplmnSliceServiceType
+        /// <returns><see cref="int"/></returns>
+        public int GetMappedHplmnSliceDifferentiator()
         {
-            get { return IExecuteWithSignature<int>("getMappedHplmnSliceServiceType", "()I"); }
+            return IExecuteWithSignature<int>("getMappedHplmnSliceDifferentiator", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getSliceDifferentiator()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getMappedHplmnSliceServiceType()"/>
         /// </summary>
-        public int SliceDifferentiator
+        /// <returns><see cref="int"/></returns>
+        public int GetMappedHplmnSliceServiceType()
         {
-            get { return IExecuteWithSignature<int>("getSliceDifferentiator", "()I"); }
+            return IExecuteWithSignature<int>("getMappedHplmnSliceServiceType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getSliceServiceType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getSliceDifferentiator()"/>
         /// </summary>
-        public int SliceServiceType
+        /// <returns><see cref="int"/></returns>
+        public int GetSliceDifferentiator()
         {
-            get { return IExecuteWithSignature<int>("getSliceServiceType", "()I"); }
+            return IExecuteWithSignature<int>("getSliceDifferentiator", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getSliceServiceType()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="int"/></returns>
+        public int GetSliceServiceType()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<int>("getSliceServiceType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#getStatus()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetStatus()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSliceInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Data/NetworkSlicingConfig.cs b/src/net/Netdroid/Generated/Android/Telephony/Data/NetworkSlicingConfig.cs
index 23710caa1..78010b12e 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Data/NetworkSlicingConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Data/NetworkSlicingConfig.cs
@@ -52,26 +52,28 @@ public partial class NetworkSlicingConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSlicingConfig.html#getSliceInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSlicingConfig.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.Data.NetworkSliceInfo> SliceInfo
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.NetworkSliceInfo>>("getSliceInfo", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSlicingConfig.html#getUrspRules()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSlicingConfig.html#getSliceInfo()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.Data.UrspRule> UrspRules
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.Data.NetworkSliceInfo> GetSliceInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.UrspRule>>("getUrspRules", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.NetworkSliceInfo>>("getSliceInfo", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSlicingConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSlicingConfig.html#getUrspRules()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.Data.UrspRule> GetUrspRules()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.UrspRule>>("getUrspRules", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/data/NetworkSlicingConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Data/RouteSelectionDescriptor.cs b/src/net/Netdroid/Generated/Android/Telephony/Data/RouteSelectionDescriptor.cs
index 3279c2545..752d22cab 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Data/RouteSelectionDescriptor.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Data/RouteSelectionDescriptor.cs
@@ -88,47 +88,52 @@ public partial class RouteSelectionDescriptor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getDataNetworkName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> DataNetworkName
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getDataNetworkName", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getPrecedence()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getPrecedence()"/>
         /// </summary>
-        public int Precedence
+        /// <returns><see cref="int"/></returns>
+        public int GetPrecedence()
         {
-            get { return IExecuteWithSignature<int>("getPrecedence", "()I"); }
+            return IExecuteWithSignature<int>("getPrecedence", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getSessionType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getSessionType()"/>
         /// </summary>
-        public int SessionType
+        /// <returns><see cref="int"/></returns>
+        public int GetSessionType()
         {
-            get { return IExecuteWithSignature<int>("getSessionType", "()I"); }
+            return IExecuteWithSignature<int>("getSessionType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getSliceInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getSscMode()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.Data.NetworkSliceInfo> SliceInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetSscMode()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.NetworkSliceInfo>>("getSliceInfo", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getSscMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getSscMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getSliceInfo()"/>
         /// </summary>
-        public int SscMode
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.Data.NetworkSliceInfo> GetSliceInfo()
         {
-            get { return IExecuteWithSignature<int>("getSscMode", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.NetworkSliceInfo>>("getSliceInfo", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#getDataNetworkName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetDataNetworkName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getDataNetworkName", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/data/RouteSelectionDescriptor.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Data/TrafficDescriptor.cs b/src/net/Netdroid/Generated/Android/Telephony/Data/TrafficDescriptor.cs
index 47685b8de..5986ce25c 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Data/TrafficDescriptor.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Data/TrafficDescriptor.cs
@@ -52,18 +52,12 @@ public partial class TrafficDescriptor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/TrafficDescriptor.html#getDataNetworkName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/TrafficDescriptor.html#getOsAppId()"/>
         /// </summary>
-        public Java.Lang.String DataNetworkName
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetOsAppId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDataNetworkName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/TrafficDescriptor.html#getOsAppId()"/> 
-        /// </summary>
-        public byte[] OsAppId
-        {
-            get { return IExecuteWithSignatureArray<byte>("getOsAppId", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getOsAppId", "()[B");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/data/TrafficDescriptor.html#describeContents()"/>
@@ -74,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/data/TrafficDescriptor.html#getDataNetworkName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDataNetworkName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDataNetworkName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/data/TrafficDescriptor.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Data/UrspRule.cs b/src/net/Netdroid/Generated/Android/Telephony/Data/UrspRule.cs
index 4dc413f82..61b8b00a6 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Data/UrspRule.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Data/UrspRule.cs
@@ -52,33 +52,36 @@ public partial class UrspRule
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#getPrecedence()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#describeContents()"/>
         /// </summary>
-        public int Precedence
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPrecedence", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#getRouteSelectionDescriptor()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#getPrecedence()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.Data.RouteSelectionDescriptor> RouteSelectionDescriptor
+        /// <returns><see cref="int"/></returns>
+        public int GetPrecedence()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.RouteSelectionDescriptor>>("getRouteSelectionDescriptor", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getPrecedence", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#getTrafficDescriptors()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#getRouteSelectionDescriptor()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.Data.TrafficDescriptor> TrafficDescriptors
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.Data.RouteSelectionDescriptor> GetRouteSelectionDescriptor()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.TrafficDescriptor>>("getTrafficDescriptors", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.RouteSelectionDescriptor>>("getRouteSelectionDescriptor", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#getTrafficDescriptors()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.Data.TrafficDescriptor> GetTrafficDescriptors()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.Data.TrafficDescriptor>>("getTrafficDescriptors", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/data/UrspRule.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Emergency/EmergencyNumber.cs b/src/net/Netdroid/Generated/Android/Telephony/Emergency/EmergencyNumber.cs
index 0cd4e8496..8dec491a7 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Emergency/EmergencyNumber.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Emergency/EmergencyNumber.cs
@@ -156,97 +156,104 @@ public partial class EmergencyNumber : Android.Os.IParcelable, Java.Lang.ICompar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getCountryIso()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#isFromSources(int)"/>
         /// </summary>
-        public Java.Lang.String CountryIso
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFromSources(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCountryIso", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isFromSources", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getEmergencyCallRouting()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#isInEmergencyServiceCategories(int)"/>
         /// </summary>
-        public int EmergencyCallRouting
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInEmergencyServiceCategories(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getEmergencyCallRouting", "()I"); }
+            return IExecuteWithSignature<bool>("isInEmergencyServiceCategories", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getEmergencyNumberSources()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#compareTo(android.telephony.emergency.EmergencyNumber)"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.Integer> EmergencyNumberSources
+        /// <param name="arg0"><see cref="Android.Telephony.Emergency.EmergencyNumber"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(Android.Telephony.Emergency.EmergencyNumber arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getEmergencyNumberSources", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("compareTo", "(Landroid/telephony/emergency/EmergencyNumber;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getEmergencyServiceCategories()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#compareTo(java.lang.Object)"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.Integer> EmergencyServiceCategories
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getEmergencyServiceCategories", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getEmergencyUrns()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> EmergencyUrns
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getEmergencyUrns", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getMnc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getEmergencyCallRouting()"/>
         /// </summary>
-        public Java.Lang.String Mnc
+        /// <returns><see cref="int"/></returns>
+        public int GetEmergencyCallRouting()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMnc", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getEmergencyCallRouting", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getCountryIso()"/>
         /// </summary>
-        public Java.Lang.String Number
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCountryIso()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNumber", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCountryIso", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#isFromSources(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getMnc()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFromSources(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMnc()
         {
-            return IExecuteWithSignature<bool>("isFromSources", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getMnc", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#isInEmergencyServiceCategories(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getNumber()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInEmergencyServiceCategories(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNumber()
         {
-            return IExecuteWithSignature<bool>("isInEmergencyServiceCategories", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getNumber", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#compareTo(android.telephony.emergency.EmergencyNumber)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getEmergencyNumberSources()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.Emergency.EmergencyNumber"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(Android.Telephony.Emergency.EmergencyNumber arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetEmergencyNumberSources()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Landroid/telephony/emergency/EmergencyNumber;)I", arg0);
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getEmergencyNumberSources", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getEmergencyServiceCategories()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(object arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetEmergencyServiceCategories()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getEmergencyServiceCategories", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#getEmergencyUrns()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetEmergencyUrns()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getEmergencyUrns", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/emergency/EmergencyNumber.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Euicc/DownloadableSubscription.cs b/src/net/Netdroid/Generated/Android/Telephony/Euicc/DownloadableSubscription.cs
index a0e7eefa6..1663a121e 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Euicc/DownloadableSubscription.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Euicc/DownloadableSubscription.cs
@@ -61,26 +61,28 @@ public static Android.Telephony.Euicc.DownloadableSubscription ForActivationCode
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/euicc/DownloadableSubscription.html#getConfirmationCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/euicc/DownloadableSubscription.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String ConfirmationCode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getConfirmationCode", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/euicc/DownloadableSubscription.html#getEncodedActivationCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/euicc/DownloadableSubscription.html#getConfirmationCode()"/>
         /// </summary>
-        public Java.Lang.String EncodedActivationCode
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetConfirmationCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncodedActivationCode", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getConfirmationCode", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/euicc/DownloadableSubscription.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/euicc/DownloadableSubscription.html#getEncodedActivationCode()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncodedActivationCode()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getEncodedActivationCode", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/euicc/DownloadableSubscription.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Euicc/EuiccInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/Euicc/EuiccInfo.cs
index ffac08c7d..d72d421f8 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Euicc/EuiccInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Euicc/EuiccInfo.cs
@@ -60,13 +60,6 @@ public EuiccInfo(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccInfo.html#getOsVersion()"/> 
-        /// </summary>
-        public Java.Lang.String OsVersion
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOsVersion", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccInfo.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccInfo.html#getOsVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOsVersion()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getOsVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Euicc/EuiccManager.cs b/src/net/Netdroid/Generated/Android/Telephony/Euicc/EuiccManager.cs
index 5d2919155..4a80249ae 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Euicc/EuiccManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Euicc/EuiccManager.cs
@@ -304,18 +304,12 @@ public partial class EuiccManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccManager.html#getEid()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccManager.html#getEuiccInfo()"/>
         /// </summary>
-        public Java.Lang.String Eid
+        /// <returns><see cref="Android.Telephony.Euicc.EuiccInfo"/></returns>
+        public Android.Telephony.Euicc.EuiccInfo GetEuiccInfo()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEid", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccManager.html#getEuiccInfo()"/> 
-        /// </summary>
-        public Android.Telephony.Euicc.EuiccInfo EuiccInfo
-        {
-            get { return IExecuteWithSignature<Android.Telephony.Euicc.EuiccInfo>("getEuiccInfo", "()Landroid/telephony/euicc/EuiccInfo;"); }
+            return IExecuteWithSignature<Android.Telephony.Euicc.EuiccInfo>("getEuiccInfo", "()Landroid/telephony/euicc/EuiccInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccManager.html#createForCardId(int)"/>
@@ -344,6 +338,14 @@ public bool IsSimPortAvailable(int arg0)
             return IExecuteWithSignature<bool>("isSimPortAvailable", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccManager.html#getEid()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEid()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getEid", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/euicc/EuiccManager.html#deleteSubscription(int,android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Gsm/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Telephony/Gsm/AllPackageClasses.cs
index de2033d28..ae01ff214 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Gsm/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Gsm/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Telephony.Gsm
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class GsmCellLocation : Android.Telephony.CellLocation
     {
         const string _bridgeClassName = "android.telephony.gsm.GsmCellLocation";
@@ -75,7 +75,7 @@ public GsmCellLocation(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SmsManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SmsManager>
     {
         const string _bridgeClassName = "android.telephony.gsm.SmsManager";
@@ -120,7 +120,7 @@ public SmsManager(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SmsMessage : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SmsMessage>
     {
         const string _bridgeClassName = "android.telephony.gsm.SmsMessage";
@@ -161,7 +161,7 @@ public SmsMessage(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.MessageClass.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class MessageClass : Java.Lang.Enum<Android.Telephony.Gsm.SmsMessage.MessageClass>
         {
             const string _bridgeClassName = "android.telephony.gsm.SmsMessage$MessageClass";
@@ -206,7 +206,7 @@ public MessageClass(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.SubmitPdu.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class SubmitPdu : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SubmitPdu>
         {
             const string _bridgeClassName = "android.telephony.gsm.SmsMessage$SubmitPdu";
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Gsm/GsmCellLocation.cs b/src/net/Netdroid/Generated/Android/Telephony/Gsm/GsmCellLocation.cs
index b24517f27..2c73c12cc 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Gsm/GsmCellLocation.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Gsm/GsmCellLocation.cs
@@ -33,7 +33,7 @@ public partial class GsmCellLocation
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#%3Cinit%3E(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public GsmCellLocation(Android.Os.Bundle arg0)
             : base(arg0)
         {
@@ -55,34 +55,37 @@ public GsmCellLocation(Android.Os.Bundle arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#getCid()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#getCid()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Cid
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetCid()
         {
-            get { return IExecuteWithSignature<int>("getCid", "()I"); }
+            return IExecuteWithSignature<int>("getCid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#getLac()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#getLac()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Lac
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetLac()
         {
-            get { return IExecuteWithSignature<int>("getLac", "()I"); }
+            return IExecuteWithSignature<int>("getLac", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#getPsc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#getPsc()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Psc
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPsc()
         {
-            get { return IExecuteWithSignature<int>("getPsc", "()I"); }
+            return IExecuteWithSignature<int>("getPsc", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#fillInNotifierBundle(android.os.Bundle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Bundle"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void FillInNotifierBundle(Android.Os.Bundle arg0)
         {
             IExecuteWithSignature("fillInNotifierBundle", "(Landroid/os/Bundle;)V", arg0);
@@ -92,7 +95,7 @@ public void FillInNotifierBundle(Android.Os.Bundle arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetLacAndCid(int arg0, int arg1)
         {
             IExecute("setLacAndCid", arg0, arg1);
@@ -100,7 +103,7 @@ public void SetLacAndCid(int arg0, int arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/GsmCellLocation.html#setStateInvalid()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetStateInvalid()
         {
             IExecuteWithSignature("setStateInvalid", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Gsm/SmsManager.cs b/src/net/Netdroid/Generated/Android/Telephony/Gsm/SmsManager.cs
index 257bcae0d..241877c47 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Gsm/SmsManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Gsm/SmsManager.cs
@@ -40,63 +40,63 @@ public partial class SmsManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#RESULT_ERROR_GENERIC_FAILURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RESULT_ERROR_GENERIC_FAILURE { get { if (!_RESULT_ERROR_GENERIC_FAILUREReady) { _RESULT_ERROR_GENERIC_FAILUREContent = SGetField<int>(LocalBridgeClazz, "RESULT_ERROR_GENERIC_FAILURE"); _RESULT_ERROR_GENERIC_FAILUREReady = true; } return _RESULT_ERROR_GENERIC_FAILUREContent; } }
         private static int _RESULT_ERROR_GENERIC_FAILUREContent = default;
         private static bool _RESULT_ERROR_GENERIC_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#RESULT_ERROR_NO_SERVICE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RESULT_ERROR_NO_SERVICE { get { if (!_RESULT_ERROR_NO_SERVICEReady) { _RESULT_ERROR_NO_SERVICEContent = SGetField<int>(LocalBridgeClazz, "RESULT_ERROR_NO_SERVICE"); _RESULT_ERROR_NO_SERVICEReady = true; } return _RESULT_ERROR_NO_SERVICEContent; } }
         private static int _RESULT_ERROR_NO_SERVICEContent = default;
         private static bool _RESULT_ERROR_NO_SERVICEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#RESULT_ERROR_NULL_PDU"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RESULT_ERROR_NULL_PDU { get { if (!_RESULT_ERROR_NULL_PDUReady) { _RESULT_ERROR_NULL_PDUContent = SGetField<int>(LocalBridgeClazz, "RESULT_ERROR_NULL_PDU"); _RESULT_ERROR_NULL_PDUReady = true; } return _RESULT_ERROR_NULL_PDUContent; } }
         private static int _RESULT_ERROR_NULL_PDUContent = default;
         private static bool _RESULT_ERROR_NULL_PDUReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#RESULT_ERROR_RADIO_OFF"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int RESULT_ERROR_RADIO_OFF { get { if (!_RESULT_ERROR_RADIO_OFFReady) { _RESULT_ERROR_RADIO_OFFContent = SGetField<int>(LocalBridgeClazz, "RESULT_ERROR_RADIO_OFF"); _RESULT_ERROR_RADIO_OFFReady = true; } return _RESULT_ERROR_RADIO_OFFContent; } }
         private static int _RESULT_ERROR_RADIO_OFFContent = default;
         private static bool _RESULT_ERROR_RADIO_OFFReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#STATUS_ON_SIM_FREE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_ON_SIM_FREE { get { if (!_STATUS_ON_SIM_FREEReady) { _STATUS_ON_SIM_FREEContent = SGetField<int>(LocalBridgeClazz, "STATUS_ON_SIM_FREE"); _STATUS_ON_SIM_FREEReady = true; } return _STATUS_ON_SIM_FREEContent; } }
         private static int _STATUS_ON_SIM_FREEContent = default;
         private static bool _STATUS_ON_SIM_FREEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#STATUS_ON_SIM_READ"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_ON_SIM_READ { get { if (!_STATUS_ON_SIM_READReady) { _STATUS_ON_SIM_READContent = SGetField<int>(LocalBridgeClazz, "STATUS_ON_SIM_READ"); _STATUS_ON_SIM_READReady = true; } return _STATUS_ON_SIM_READContent; } }
         private static int _STATUS_ON_SIM_READContent = default;
         private static bool _STATUS_ON_SIM_READReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#STATUS_ON_SIM_SENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_ON_SIM_SENT { get { if (!_STATUS_ON_SIM_SENTReady) { _STATUS_ON_SIM_SENTContent = SGetField<int>(LocalBridgeClazz, "STATUS_ON_SIM_SENT"); _STATUS_ON_SIM_SENTReady = true; } return _STATUS_ON_SIM_SENTContent; } }
         private static int _STATUS_ON_SIM_SENTContent = default;
         private static bool _STATUS_ON_SIM_SENTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#STATUS_ON_SIM_UNREAD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_ON_SIM_UNREAD { get { if (!_STATUS_ON_SIM_UNREADReady) { _STATUS_ON_SIM_UNREADContent = SGetField<int>(LocalBridgeClazz, "STATUS_ON_SIM_UNREAD"); _STATUS_ON_SIM_UNREADReady = true; } return _STATUS_ON_SIM_UNREADContent; } }
         private static int _STATUS_ON_SIM_UNREADContent = default;
         private static bool _STATUS_ON_SIM_UNREADReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#STATUS_ON_SIM_UNSENT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_ON_SIM_UNSENT { get { if (!_STATUS_ON_SIM_UNSENTReady) { _STATUS_ON_SIM_UNSENTContent = SGetField<int>(LocalBridgeClazz, "STATUS_ON_SIM_UNSENT"); _STATUS_ON_SIM_UNSENTReady = true; } return _STATUS_ON_SIM_UNSENTContent; } }
         private static int _STATUS_ON_SIM_UNSENTContent = default;
         private static bool _STATUS_ON_SIM_UNSENTReady = false; // this is used because in case of generics 
@@ -105,12 +105,13 @@ public partial class SmsManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#getDefault()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsManager.html#getDefault()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Android.Telephony.Gsm.SmsManager Default
+        /// <returns><see cref="Android.Telephony.Gsm.SmsManager"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Telephony.Gsm.SmsManager GetDefault()
         {
-            get { return SExecuteWithSignature<Android.Telephony.Gsm.SmsManager>(LocalBridgeClazz, "getDefault", "()Landroid/telephony/gsm/SmsManager;"); }
+            return SExecuteWithSignature<Android.Telephony.Gsm.SmsManager>(LocalBridgeClazz, "getDefault", "()Landroid/telephony/gsm/SmsManager;");
         }
 
         #endregion
@@ -121,7 +122,7 @@ public static Android.Telephony.Gsm.SmsManager Default
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.ArrayList"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.ArrayList<Java.Lang.String> DivideMessage(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Util.ArrayList<Java.Lang.String>>("divideMessage", "(Ljava/lang/String;)Ljava/util/ArrayList;", arg0);
@@ -135,7 +136,7 @@ public static Android.Telephony.Gsm.SmsManager Default
         /// <param name="arg3"><see cref="byte"/></param>
         /// <param name="arg4"><see cref="Android.App.PendingIntent"/></param>
         /// <param name="arg5"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendDataMessage(Java.Lang.String arg0, Java.Lang.String arg1, short arg2, byte[] arg3, Android.App.PendingIntent arg4, Android.App.PendingIntent arg5)
         {
             IExecute("sendDataMessage", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -148,7 +149,7 @@ public void SendDataMessage(Java.Lang.String arg0, Java.Lang.String arg1, short
         /// <param name="arg2"><see cref="Java.Util.ArrayList"/></param>
         /// <param name="arg3"><see cref="Java.Util.ArrayList"/></param>
         /// <param name="arg4"><see cref="Java.Util.ArrayList"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendMultipartTextMessage(Java.Lang.String arg0, Java.Lang.String arg1, Java.Util.ArrayList<Java.Lang.String> arg2, Java.Util.ArrayList<Android.App.PendingIntent> arg3, Java.Util.ArrayList<Android.App.PendingIntent> arg4)
         {
             IExecute("sendMultipartTextMessage", arg0, arg1, arg2, arg3, arg4);
@@ -161,7 +162,7 @@ public void SendMultipartTextMessage(Java.Lang.String arg0, Java.Lang.String arg
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Android.App.PendingIntent"/></param>
         /// <param name="arg4"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SendTextMessage(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, Android.App.PendingIntent arg3, Android.App.PendingIntent arg4)
         {
             IExecute("sendTextMessage", arg0, arg1, arg2, arg3, arg4);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Gsm/SmsMessage.cs b/src/net/Netdroid/Generated/Android/Telephony/Gsm/SmsMessage.cs
index 074c8309f..a753d2d72 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Gsm/SmsMessage.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Gsm/SmsMessage.cs
@@ -40,49 +40,49 @@ public partial class SmsMessage
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#ENCODING_16BIT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ENCODING_16BIT { get { if (!_ENCODING_16BITReady) { _ENCODING_16BITContent = SGetField<int>(LocalBridgeClazz, "ENCODING_16BIT"); _ENCODING_16BITReady = true; } return _ENCODING_16BITContent; } }
         private static int _ENCODING_16BITContent = default;
         private static bool _ENCODING_16BITReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#ENCODING_7BIT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ENCODING_7BIT { get { if (!_ENCODING_7BITReady) { _ENCODING_7BITContent = SGetField<int>(LocalBridgeClazz, "ENCODING_7BIT"); _ENCODING_7BITReady = true; } return _ENCODING_7BITContent; } }
         private static int _ENCODING_7BITContent = default;
         private static bool _ENCODING_7BITReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#ENCODING_8BIT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ENCODING_8BIT { get { if (!_ENCODING_8BITReady) { _ENCODING_8BITContent = SGetField<int>(LocalBridgeClazz, "ENCODING_8BIT"); _ENCODING_8BITReady = true; } return _ENCODING_8BITContent; } }
         private static int _ENCODING_8BITContent = default;
         private static bool _ENCODING_8BITReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#ENCODING_UNKNOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ENCODING_UNKNOWN { get { if (!_ENCODING_UNKNOWNReady) { _ENCODING_UNKNOWNContent = SGetField<int>(LocalBridgeClazz, "ENCODING_UNKNOWN"); _ENCODING_UNKNOWNReady = true; } return _ENCODING_UNKNOWNContent; } }
         private static int _ENCODING_UNKNOWNContent = default;
         private static bool _ENCODING_UNKNOWNReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#MAX_USER_DATA_BYTES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MAX_USER_DATA_BYTES { get { if (!_MAX_USER_DATA_BYTESReady) { _MAX_USER_DATA_BYTESContent = SGetField<int>(LocalBridgeClazz, "MAX_USER_DATA_BYTES"); _MAX_USER_DATA_BYTESReady = true; } return _MAX_USER_DATA_BYTESContent; } }
         private static int _MAX_USER_DATA_BYTESContent = default;
         private static bool _MAX_USER_DATA_BYTESReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#MAX_USER_DATA_SEPTETS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MAX_USER_DATA_SEPTETS { get { if (!_MAX_USER_DATA_SEPTETSReady) { _MAX_USER_DATA_SEPTETSContent = SGetField<int>(LocalBridgeClazz, "MAX_USER_DATA_SEPTETS"); _MAX_USER_DATA_SEPTETSReady = true; } return _MAX_USER_DATA_SEPTETSContent; } }
         private static int _MAX_USER_DATA_SEPTETSContent = default;
         private static bool _MAX_USER_DATA_SEPTETSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#MAX_USER_DATA_SEPTETS_WITH_HEADER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MAX_USER_DATA_SEPTETS_WITH_HEADER { get { if (!_MAX_USER_DATA_SEPTETS_WITH_HEADERReady) { _MAX_USER_DATA_SEPTETS_WITH_HEADERContent = SGetField<int>(LocalBridgeClazz, "MAX_USER_DATA_SEPTETS_WITH_HEADER"); _MAX_USER_DATA_SEPTETS_WITH_HEADERReady = true; } return _MAX_USER_DATA_SEPTETS_WITH_HEADERContent; } }
         private static int _MAX_USER_DATA_SEPTETS_WITH_HEADERContent = default;
         private static bool _MAX_USER_DATA_SEPTETS_WITH_HEADERReady = false; // this is used because in case of generics 
@@ -95,7 +95,7 @@ public partial class SmsMessage
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Android.Telephony.Gsm.SmsMessage"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Telephony.Gsm.SmsMessage CreateFromPdu(byte[] arg0)
         {
             return SExecuteWithSignature<Android.Telephony.Gsm.SmsMessage>(LocalBridgeClazz, "createFromPdu", "([B)Landroid/telephony/gsm/SmsMessage;", new object[] { arg0 });
@@ -108,7 +108,7 @@ public static Android.Telephony.Gsm.SmsMessage CreateFromPdu(byte[] arg0)
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="bool"/></param>
         /// <returns><see cref="Android.Telephony.Gsm.SmsMessage.SubmitPdu"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Telephony.Gsm.SmsMessage.SubmitPdu GetSubmitPdu(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, bool arg3)
         {
             return SExecute<Android.Telephony.Gsm.SmsMessage.SubmitPdu>(LocalBridgeClazz, "getSubmitPdu", arg0, arg1, arg2, arg3);
@@ -122,7 +122,7 @@ public static Android.Telephony.Gsm.SmsMessage.SubmitPdu GetSubmitPdu(Java.Lang.
         /// <param name="arg3"><see cref="byte"/></param>
         /// <param name="arg4"><see cref="bool"/></param>
         /// <returns><see cref="Android.Telephony.Gsm.SmsMessage.SubmitPdu"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Telephony.Gsm.SmsMessage.SubmitPdu GetSubmitPdu(Java.Lang.String arg0, Java.Lang.String arg1, short arg2, byte[] arg3, bool arg4)
         {
             return SExecute<Android.Telephony.Gsm.SmsMessage.SubmitPdu>(LocalBridgeClazz, "getSubmitPdu", arg0, arg1, arg2, arg3, arg4);
@@ -132,7 +132,7 @@ public static Android.Telephony.Gsm.SmsMessage.SubmitPdu GetSubmitPdu(Java.Lang.
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetTPLayerLengthForPDU(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getTPLayerLengthForPDU", "(Ljava/lang/String;)I", arg0);
@@ -143,7 +143,7 @@ public static int GetTPLayerLengthForPDU(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int[] CalculateLength(Java.Lang.CharSequence arg0, bool arg1)
         {
             return SExecuteArray<int>(LocalBridgeClazz, "calculateLength", arg0, arg1);
@@ -154,7 +154,7 @@ public static int[] CalculateLength(Java.Lang.CharSequence arg0, bool arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int[] CalculateLength(Java.Lang.String arg0, bool arg1)
         {
             return SExecuteArray<int>(LocalBridgeClazz, "calculateLength", arg0, arg1);
@@ -164,204 +164,220 @@ public static int[] CalculateLength(Java.Lang.String arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getDisplayMessageBody()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getMessageClass()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String DisplayMessageBody
+        /// <returns><see cref="Android.Telephony.Gsm.SmsMessage.MessageClass"/></returns>
+        [global::System.Obsolete()]
+        public Android.Telephony.Gsm.SmsMessage.MessageClass GetMessageClass()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayMessageBody", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Telephony.Gsm.SmsMessage.MessageClass>("getMessageClass", "()Landroid/telephony/gsm/SmsMessage$MessageClass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getDisplayOriginatingAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isCphsMwiMessage()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String DisplayOriginatingAddress
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsCphsMwiMessage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayOriginatingAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isCphsMwiMessage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getEmailBody()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isEmail()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String EmailBody
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsEmail()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEmailBody", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isEmail", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getEmailFrom()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isMWIClearMessage()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String EmailFrom
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsMWIClearMessage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEmailFrom", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isMWIClearMessage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getMessageClass()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isMwiDontStore()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Telephony.Gsm.SmsMessage.MessageClass GetMessageClass
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsMwiDontStore()
         {
-            get { return IExecuteWithSignature<Android.Telephony.Gsm.SmsMessage.MessageClass>("getMessageClass", "()Landroid/telephony/gsm/SmsMessage$MessageClass;"); }
+            return IExecuteWithSignature<bool>("isMwiDontStore", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getIndexOnSim()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isMWISetMessage()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int IndexOnSim
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsMWISetMessage()
         {
-            get { return IExecuteWithSignature<int>("getIndexOnSim", "()I"); }
+            return IExecuteWithSignature<bool>("isMWISetMessage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getMessageBody()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isReplace()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String MessageBody
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsReplace()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMessageBody", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isReplace", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getOriginatingAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isReplyPathPresent()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String OriginatingAddress
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsReplyPathPresent()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOriginatingAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isReplyPathPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getPdu()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isStatusReportMessage()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte[] Pdu
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsStatusReportMessage()
         {
-            get { return IExecuteWithSignatureArray<byte>("getPdu", "()[B"); }
+            return IExecuteWithSignature<bool>("isStatusReportMessage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getProtocolIdentifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getPdu()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int ProtocolIdentifier
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetPdu()
         {
-            get { return IExecuteWithSignature<int>("getProtocolIdentifier", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getPdu", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getPseudoSubject()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getUserData()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String PseudoSubject
+        /// <returns><see cref="byte"/></returns>
+        [global::System.Obsolete()]
+        public byte[] GetUserData()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPseudoSubject", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getUserData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getServiceCenterAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getIndexOnSim()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String ServiceCenterAddress
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetIndexOnSim()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceCenterAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getIndexOnSim", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getProtocolIdentifier()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Status
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetProtocolIdentifier()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<int>("getProtocolIdentifier", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getStatusOnSim()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getStatus()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int StatusOnSim
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetStatus()
         {
-            get { return IExecuteWithSignature<int>("getStatusOnSim", "()I"); }
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getTimestampMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getStatusOnSim()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long TimestampMillis
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetStatusOnSim()
         {
-            get { return IExecuteWithSignature<long>("getTimestampMillis", "()J"); }
+            return IExecuteWithSignature<int>("getStatusOnSim", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getUserData()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getDisplayMessageBody()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte[] UserData
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDisplayMessageBody()
         {
-            get { return IExecuteWithSignatureArray<byte>("getUserData", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayMessageBody", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isCphsMwiMessage()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getDisplayOriginatingAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsCphsMwiMessage()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDisplayOriginatingAddress()
         {
-            return IExecuteWithSignature<bool>("isCphsMwiMessage", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayOriginatingAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isEmail()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getEmailBody()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsEmail()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetEmailBody()
         {
-            return IExecuteWithSignature<bool>("isEmail", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getEmailBody", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isMWIClearMessage()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getEmailFrom()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsMWIClearMessage()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetEmailFrom()
         {
-            return IExecuteWithSignature<bool>("isMWIClearMessage", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getEmailFrom", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isMwiDontStore()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getMessageBody()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsMwiDontStore()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetMessageBody()
         {
-            return IExecuteWithSignature<bool>("isMwiDontStore", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getMessageBody", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isMWISetMessage()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getOriginatingAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsMWISetMessage()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetOriginatingAddress()
         {
-            return IExecuteWithSignature<bool>("isMWISetMessage", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getOriginatingAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isReplace()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getPseudoSubject()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsReplace()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetPseudoSubject()
         {
-            return IExecuteWithSignature<bool>("isReplace", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPseudoSubject", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isReplyPathPresent()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getServiceCenterAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsReplyPathPresent()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetServiceCenterAddress()
         {
-            return IExecuteWithSignature<bool>("isReplyPathPresent", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getServiceCenterAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#isStatusReportMessage()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.html#getTimestampMillis()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsStatusReportMessage()
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long GetTimestampMillis()
         {
-            return IExecuteWithSignature<bool>("isStatusReportMessage", "()Z");
+            return IExecuteWithSignature<long>("getTimestampMillis", "()J");
         }
 
         #endregion
@@ -382,35 +398,35 @@ public partial class MessageClass
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.MessageClass.html#CLASS_0"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Telephony.Gsm.SmsMessage.MessageClass CLASS_0 { get { if (!_CLASS_0Ready) { _CLASS_0Content = SGetField<Android.Telephony.Gsm.SmsMessage.MessageClass>(LocalBridgeClazz, "CLASS_0"); _CLASS_0Ready = true; } return _CLASS_0Content; } }
             private static Android.Telephony.Gsm.SmsMessage.MessageClass _CLASS_0Content = default;
             private static bool _CLASS_0Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.MessageClass.html#CLASS_1"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Telephony.Gsm.SmsMessage.MessageClass CLASS_1 { get { if (!_CLASS_1Ready) { _CLASS_1Content = SGetField<Android.Telephony.Gsm.SmsMessage.MessageClass>(LocalBridgeClazz, "CLASS_1"); _CLASS_1Ready = true; } return _CLASS_1Content; } }
             private static Android.Telephony.Gsm.SmsMessage.MessageClass _CLASS_1Content = default;
             private static bool _CLASS_1Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.MessageClass.html#CLASS_2"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Telephony.Gsm.SmsMessage.MessageClass CLASS_2 { get { if (!_CLASS_2Ready) { _CLASS_2Content = SGetField<Android.Telephony.Gsm.SmsMessage.MessageClass>(LocalBridgeClazz, "CLASS_2"); _CLASS_2Ready = true; } return _CLASS_2Content; } }
             private static Android.Telephony.Gsm.SmsMessage.MessageClass _CLASS_2Content = default;
             private static bool _CLASS_2Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.MessageClass.html#CLASS_3"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Telephony.Gsm.SmsMessage.MessageClass CLASS_3 { get { if (!_CLASS_3Ready) { _CLASS_3Content = SGetField<Android.Telephony.Gsm.SmsMessage.MessageClass>(LocalBridgeClazz, "CLASS_3"); _CLASS_3Ready = true; } return _CLASS_3Content; } }
             private static Android.Telephony.Gsm.SmsMessage.MessageClass _CLASS_3Content = default;
             private static bool _CLASS_3Ready = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.MessageClass.html#UNKNOWN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Telephony.Gsm.SmsMessage.MessageClass UNKNOWN { get { if (!_UNKNOWNReady) { _UNKNOWNContent = SGetField<Android.Telephony.Gsm.SmsMessage.MessageClass>(LocalBridgeClazz, "UNKNOWN"); _UNKNOWNReady = true; } return _UNKNOWNContent; } }
             private static Android.Telephony.Gsm.SmsMessage.MessageClass _UNKNOWNContent = default;
             private static bool _UNKNOWNReady = false; // this is used because in case of generics 
@@ -465,12 +481,12 @@ public partial class SubmitPdu
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.SubmitPdu.html#encodedMessage"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public byte[] encodedMessage { get { return IGetFieldArray<byte>("encodedMessage"); } set { ISetField("encodedMessage", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/gsm/SmsMessage.SubmitPdu.html#encodedScAddress"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public byte[] encodedScAddress { get { return IGetFieldArray<byte>("encodedScAddress"); } set { ISetField("encodedScAddress", value); } }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/IccOpenLogicalChannelResponse.cs b/src/net/Netdroid/Generated/Android/Telephony/IccOpenLogicalChannelResponse.cs
index 1d6202f94..aabaecb44 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/IccOpenLogicalChannelResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/IccOpenLogicalChannelResponse.cs
@@ -82,33 +82,36 @@ public partial class IccOpenLogicalChannelResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#getChannel()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#getSelectResponse()"/>
         /// </summary>
-        public int Channel
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSelectResponse()
         {
-            get { return IExecuteWithSignature<int>("getChannel", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getSelectResponse", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#getSelectResponse()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#describeContents()"/>
         /// </summary>
-        public byte[] SelectResponse
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSelectResponse", "()[B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#getChannel()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="int"/></returns>
+        public int GetChannel()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<int>("getChannel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#getStatus()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetStatus()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/IccOpenLogicalChannelResponse.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Ims/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Telephony/Ims/AllPackageClasses.cs
index ccdcdd9c6..a27132204 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Ims/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Ims/AllPackageClasses.cs
@@ -317,12 +317,12 @@ public partial class ImsStateCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ImsStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ImsStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ImsStateCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ImsStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ImsStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ImsStateCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -403,12 +403,12 @@ public partial class FeatureProvisioningCallback : MASES.JCOBridge.C2JBridge.JVM
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FeatureProvisioningCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FeatureProvisioningCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FeatureProvisioningCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FeatureProvisioningCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FeatureProvisioningCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FeatureProvisioningCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -447,38 +447,24 @@ public FeatureProvisioningCallback(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/ims/RcsUceAdapter.html"/>
     /// </summary>
-    public partial class RcsUceAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class RcsUceAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RcsUceAdapter>
     {
+        const string _bridgeClassName = "android.telephony.ims.RcsUceAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public RcsUceAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region RcsUceAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="RcsUceAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class RcsUceAdapterDirect : RcsUceAdapter
-    {
+        public RcsUceAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public RcsUceAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.telephony.ims.RcsUceAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -495,6 +481,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -508,12 +497,12 @@ public partial class RegistrationManager : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RegistrationManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RegistrationManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RegistrationManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RegistrationManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RegistrationManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RegistrationManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsMmTelManager.cs b/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsMmTelManager.cs
index 0d760c89a..d9cf56dc6 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsMmTelManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsMmTelManager.cs
@@ -64,13 +64,6 @@ public partial class ImsMmTelManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsMmTelManager.html#getVoWiFiModeSetting()"/> 
-        /// </summary>
-        public int VoWiFiModeSetting
-        {
-            get { return IExecuteWithSignature<int>("getVoWiFiModeSetting", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsMmTelManager.html#isAdvancedCallingSettingEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -120,6 +113,14 @@ public bool IsVtSettingEnabled()
             return IExecuteWithSignature<bool>("isVtSettingEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsMmTelManager.html#getVoWiFiModeSetting()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVoWiFiModeSetting()
+        {
+            return IExecuteWithSignature<int>("getVoWiFiModeSetting", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsMmTelManager.html#getRegistrationState(java.util.concurrent.Executor,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsRcsManager.cs b/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsRcsManager.cs
index 6cf610ea5..1ca3c3370 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsRcsManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsRcsManager.cs
@@ -70,11 +70,12 @@ public partial class ImsRcsManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRcsManager.html#getUceAdapter()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRcsManager.html#getUceAdapter()"/>
         /// </summary>
-        public Android.Telephony.Ims.RcsUceAdapter UceAdapter
+        /// <returns><see cref="Android.Telephony.Ims.RcsUceAdapter"/></returns>
+        public Android.Telephony.Ims.RcsUceAdapter GetUceAdapter()
         {
-            get { return IExecuteWithSignature<Android.Telephony.Ims.RcsUceAdapter>("getUceAdapter", "()Landroid/telephony/ims/RcsUceAdapter;"); }
+            return IExecuteWithSignature<Android.Telephony.Ims.RcsUceAdapter>("getUceAdapter", "()Landroid/telephony/ims/RcsUceAdapter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRcsManager.html#getRegistrationState(java.util.concurrent.Executor,java.util.function.Consumer)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsReasonInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsReasonInfo.cs
index 8ceb4c5a5..6d56909f0 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsReasonInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsReasonInfo.cs
@@ -1112,33 +1112,36 @@ public ImsReasonInfo(int arg0, int arg1, Java.Lang.String arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#getCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#describeContents()"/>
         /// </summary>
-        public int Code
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#getExtraCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#getCode()"/>
         /// </summary>
-        public int ExtraCode
+        /// <returns><see cref="int"/></returns>
+        public int GetCode()
         {
-            get { return IExecuteWithSignature<int>("getExtraCode", "()I"); }
+            return IExecuteWithSignature<int>("getCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#getExtraMessage()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#getExtraCode()"/>
         /// </summary>
-        public Java.Lang.String ExtraMessage
+        /// <returns><see cref="int"/></returns>
+        public int GetExtraCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getExtraMessage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getExtraCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#getExtraMessage()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetExtraMessage()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getExtraMessage", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsReasonInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsRegistrationAttributes.cs b/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsRegistrationAttributes.cs
index 9b4700c80..0ff91182b 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsRegistrationAttributes.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Ims/ImsRegistrationAttributes.cs
@@ -58,40 +58,44 @@ public partial class ImsRegistrationAttributes
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#getAttributeFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#getSipDetails()"/>
         /// </summary>
-        public int AttributeFlags
+        /// <returns><see cref="Android.Telephony.Ims.SipDetails"/></returns>
+        public Android.Telephony.Ims.SipDetails GetSipDetails()
         {
-            get { return IExecuteWithSignature<int>("getAttributeFlags", "()I"); }
+            return IExecuteWithSignature<Android.Telephony.Ims.SipDetails>("getSipDetails", "()Landroid/telephony/ims/SipDetails;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#getFeatureTags()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#describeContents()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> FeatureTags
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFeatureTags", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#getSipDetails()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#getAttributeFlags()"/>
         /// </summary>
-        public Android.Telephony.Ims.SipDetails SipDetails
+        /// <returns><see cref="int"/></returns>
+        public int GetAttributeFlags()
         {
-            get { return IExecuteWithSignature<Android.Telephony.Ims.SipDetails>("getSipDetails", "()Landroid/telephony/ims/SipDetails;"); }
+            return IExecuteWithSignature<int>("getAttributeFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#getTransportType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#getTransportType()"/>
         /// </summary>
-        public int TransportType
+        /// <returns><see cref="int"/></returns>
+        public int GetTransportType()
         {
-            get { return IExecuteWithSignature<int>("getTransportType", "()I"); }
+            return IExecuteWithSignature<int>("getTransportType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#getFeatureTags()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetFeatureTags()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getFeatureTags", "()Ljava/util/Set;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ims/ImsRegistrationAttributes.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Ims/RcsUceAdapter.cs b/src/net/Netdroid/Generated/Android/Telephony/Ims/RcsUceAdapter.cs
index 0bd8325f8..1bbcbde16 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Ims/RcsUceAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Ims/RcsUceAdapter.cs
@@ -44,75 +44,13 @@ public partial class RcsUceAdapter
 
         #endregion
 
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="RcsUceAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("isUceSettingEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsUceSettingEnabledEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/ims/RcsUceAdapter.html#isUceSettingEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsUceSettingEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsUceSettingEnabled { get; set; } = null;
-
-        void IsUceSettingEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsUceSettingEnabled != null) ? OnIsUceSettingEnabled : IsUceSettingEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/RcsUceAdapter.html#isUceSettingEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Android.Telephony.Ims.ImsException"/>
-        public virtual bool IsUceSettingEnabled()
-        {
-            return default;
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region RcsUceAdapterDirect
-    public partial class RcsUceAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
         #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ims/RcsUceAdapter.html#isUceSettingEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Android.Telephony.Ims.ImsException"/>
-        public override bool IsUceSettingEnabled()
+        public bool IsUceSettingEnabled()
         {
             return IExecuteWithSignature<bool>("isUceSettingEnabled", "()Z");
         }
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Ims/RegistrationManager.cs b/src/net/Netdroid/Generated/Android/Telephony/Ims/RegistrationManager.cs
index 6fae0d90d..01cde85af 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Ims/RegistrationManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Ims/RegistrationManager.cs
@@ -153,7 +153,7 @@ public void OnRegistered(Android.Telephony.Ims.ImsRegistrationAttributes arg0)
             /// <see href="https://developer.android.com/reference/android/telephony/ims/RegistrationManager.RegistrationCallback.html#onRegistered(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnRegistered(int arg0)
             {
                 IExecuteWithSignature("onRegistered", "(I)V", arg0);
@@ -170,7 +170,7 @@ public void OnRegistering(Android.Telephony.Ims.ImsRegistrationAttributes arg0)
             /// <see href="https://developer.android.com/reference/android/telephony/ims/RegistrationManager.RegistrationCallback.html#onRegistering(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void OnRegistering(int arg0)
             {
                 IExecuteWithSignature("onRegistering", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Ims/SipDetails.cs b/src/net/Netdroid/Generated/Android/Telephony/Ims/SipDetails.cs
index ef26a4b64..4f254371e 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Ims/SipDetails.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Ims/SipDetails.cs
@@ -76,61 +76,68 @@ public partial class SipDetails
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getCallId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String CallId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCallId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getCSeq()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getCSeq()"/>
         /// </summary>
-        public int CSeq
+        /// <returns><see cref="int"/></returns>
+        public int GetCSeq()
         {
-            get { return IExecuteWithSignature<int>("getCSeq", "()I"); }
+            return IExecuteWithSignature<int>("getCSeq", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getMethod()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getMethod()"/>
         /// </summary>
-        public int Method
+        /// <returns><see cref="int"/></returns>
+        public int GetMethod()
         {
-            get { return IExecuteWithSignature<int>("getMethod", "()I"); }
+            return IExecuteWithSignature<int>("getMethod", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getReasonHeaderCause()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getReasonHeaderCause()"/>
         /// </summary>
-        public int ReasonHeaderCause
+        /// <returns><see cref="int"/></returns>
+        public int GetReasonHeaderCause()
         {
-            get { return IExecuteWithSignature<int>("getReasonHeaderCause", "()I"); }
+            return IExecuteWithSignature<int>("getReasonHeaderCause", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getReasonHeaderText()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getResponseCode()"/>
         /// </summary>
-        public Java.Lang.String ReasonHeaderText
+        /// <returns><see cref="int"/></returns>
+        public int GetResponseCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getReasonHeaderText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getResponseCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getResponseCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getCallId()"/>
         /// </summary>
-        public int ResponseCode
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCallId()
         {
-            get { return IExecuteWithSignature<int>("getResponseCode", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCallId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getResponsePhrase()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getReasonHeaderText()"/>
         /// </summary>
-        public Java.Lang.String ResponsePhrase
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetReasonHeaderText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResponsePhrase", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getReasonHeaderText", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#getResponsePhrase()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResponsePhrase()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getResponsePhrase", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ims/SipDetails.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/AllPackageClasses.cs
index 8ebe5b5c0..27e95cd61 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/AllPackageClasses.cs
@@ -30,38 +30,24 @@ namespace Android.Telephony.Mbms
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadProgressListener.html"/>
     /// </summary>
-    public partial class DownloadProgressListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class DownloadProgressListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DownloadProgressListener>
     {
+        const string _bridgeClassName = "android.telephony.mbms.DownloadProgressListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public DownloadProgressListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region DownloadProgressListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="DownloadProgressListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class DownloadProgressListenerDirect : DownloadProgressListener
-    {
+        public DownloadProgressListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public DownloadProgressListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.telephony.mbms.DownloadProgressListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -78,6 +64,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -173,38 +162,24 @@ public Builder(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadStatusListener.html"/>
     /// </summary>
-    public partial class DownloadStatusListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class DownloadStatusListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DownloadStatusListener>
     {
+        const string _bridgeClassName = "android.telephony.mbms.DownloadStatusListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public DownloadStatusListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region DownloadStatusListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="DownloadStatusListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class DownloadStatusListenerDirect : DownloadStatusListener
-    {
+        public DownloadStatusListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public DownloadStatusListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.telephony.mbms.DownloadStatusListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -221,6 +196,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -366,12 +344,12 @@ public partial class GroupCallCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GroupCallCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GroupCallCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GroupCallCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GroupCallCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GroupCallCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GroupCallCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -764,12 +742,12 @@ public partial class MbmsGroupCallSessionCallback : MASES.JCOBridge.C2JBridge.JV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MbmsGroupCallSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MbmsGroupCallSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MbmsGroupCallSessionCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MbmsGroupCallSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MbmsGroupCallSessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MbmsGroupCallSessionCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadProgressListener.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadProgressListener.cs
index 7443d8714..961b36c7b 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadProgressListener.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadProgressListener.cs
@@ -44,71 +44,6 @@ public partial class DownloadProgressListener
 
         #endregion
 
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="DownloadProgressListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onProgressUpdated", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.Mbms.DownloadRequest>>>(OnProgressUpdatedEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadProgressListener.html#onProgressUpdated(android.telephony.mbms.DownloadRequest,android.telephony.mbms.FileInfo,int,int,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnProgressUpdated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.Mbms.DownloadRequest, Android.Telephony.Mbms.FileInfo, int, int, int, int> OnOnProgressUpdated { get; set; } = null;
-
-        void OnProgressUpdatedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.Mbms.DownloadRequest>> data)
-        {
-            var methodToExecute = (OnOnProgressUpdated != null) ? OnOnProgressUpdated : OnProgressUpdated;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Telephony.Mbms.FileInfo>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<int>(3), data.EventData.GetAt<int>(4));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadProgressListener.html#onProgressUpdated(android.telephony.mbms.DownloadRequest,android.telephony.mbms.FileInfo,int,int,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.Mbms.DownloadRequest"/></param>
-        /// <param name="arg1"><see cref="Android.Telephony.Mbms.FileInfo"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        public virtual void OnProgressUpdated(Android.Telephony.Mbms.DownloadRequest arg0, Android.Telephony.Mbms.FileInfo arg1, int arg2, int arg3, int arg4, int arg5)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region DownloadProgressListenerDirect
-    public partial class DownloadProgressListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
         #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadProgressListener.html#onProgressUpdated(android.telephony.mbms.DownloadRequest,android.telephony.mbms.FileInfo,int,int,int,int)"/>
@@ -119,7 +54,7 @@ public partial class DownloadProgressListenerDirect
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        public override void OnProgressUpdated(Android.Telephony.Mbms.DownloadRequest arg0, Android.Telephony.Mbms.FileInfo arg1, int arg2, int arg3, int arg4, int arg5)
+        public void OnProgressUpdated(Android.Telephony.Mbms.DownloadRequest arg0, Android.Telephony.Mbms.FileInfo arg1, int arg2, int arg3, int arg4, int arg5)
         {
             IExecute("onProgressUpdated", arg0, arg1, arg2, arg3, arg4, arg5);
         }
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadRequest.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadRequest.cs
index d0b4b612a..5967dee03 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadRequest.cs
@@ -48,50 +48,40 @@ public partial class DownloadRequest
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getMaxAppIntentSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getMaxAppIntentSize()"/>
         /// </summary>
-        public static int MaxAppIntentSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxAppIntentSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxAppIntentSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxAppIntentSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getMaxDestinationUriSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getMaxDestinationUriSize()"/>
         /// </summary>
-        public static int MaxDestinationUriSize
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxDestinationUriSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxDestinationUriSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxDestinationUriSize", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getDestinationUri()"/> 
-        /// </summary>
-        public Android.Net.Uri DestinationUri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getDestinationUri", "()Landroid/net/Uri;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getFileServiceId()"/> 
-        /// </summary>
-        public Java.Lang.String FileServiceId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFileServiceId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getSourceUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getDestinationUri()"/>
         /// </summary>
-        public Android.Net.Uri SourceUri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetDestinationUri()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getSourceUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getDestinationUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getSubscriptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getSourceUri()"/>
         /// </summary>
-        public int SubscriptionId
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetSourceUri()
         {
-            get { return IExecuteWithSignature<int>("getSubscriptionId", "()I"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getSourceUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#toByteArray()"/>
@@ -110,6 +100,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getSubscriptionId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSubscriptionId()
+        {
+            return IExecuteWithSignature<int>("getSubscriptionId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#getFileServiceId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFileServiceId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getFileServiceId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadStatusListener.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadStatusListener.cs
index ceb2261af..c068004a7 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadStatusListener.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/DownloadStatusListener.cs
@@ -44,68 +44,6 @@ public partial class DownloadStatusListener
 
         #endregion
 
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="DownloadStatusListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onStatusUpdated", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.Mbms.DownloadRequest>>>(OnStatusUpdatedEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadStatusListener.html#onStatusUpdated(android.telephony.mbms.DownloadRequest,android.telephony.mbms.FileInfo,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnStatusUpdated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.Mbms.DownloadRequest, Android.Telephony.Mbms.FileInfo, int> OnOnStatusUpdated { get; set; } = null;
-
-        void OnStatusUpdatedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.Mbms.DownloadRequest>> data)
-        {
-            var methodToExecute = (OnOnStatusUpdated != null) ? OnOnStatusUpdated : OnStatusUpdated;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Telephony.Mbms.FileInfo>(0), data.EventData.GetAt<int>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadStatusListener.html#onStatusUpdated(android.telephony.mbms.DownloadRequest,android.telephony.mbms.FileInfo,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.Mbms.DownloadRequest"/></param>
-        /// <param name="arg1"><see cref="Android.Telephony.Mbms.FileInfo"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public virtual void OnStatusUpdated(Android.Telephony.Mbms.DownloadRequest arg0, Android.Telephony.Mbms.FileInfo arg1, int arg2)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region DownloadStatusListenerDirect
-    public partial class DownloadStatusListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
         #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/DownloadStatusListener.html#onStatusUpdated(android.telephony.mbms.DownloadRequest,android.telephony.mbms.FileInfo,int)"/>
@@ -113,7 +51,7 @@ public partial class DownloadStatusListenerDirect
         /// <param name="arg0"><see cref="Android.Telephony.Mbms.DownloadRequest"/></param>
         /// <param name="arg1"><see cref="Android.Telephony.Mbms.FileInfo"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        public override void OnStatusUpdated(Android.Telephony.Mbms.DownloadRequest arg0, Android.Telephony.Mbms.FileInfo arg1, int arg2)
+        public void OnStatusUpdated(Android.Telephony.Mbms.DownloadRequest arg0, Android.Telephony.Mbms.FileInfo arg1, int arg2)
         {
             IExecute("onStatusUpdated", arg0, arg1, arg2);
         }
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/FileInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/FileInfo.cs
index 7e8b10cfe..e98f4eef5 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/FileInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/FileInfo.cs
@@ -52,18 +52,12 @@ public partial class FileInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileInfo.html#getMimeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileInfo.html#getUri()"/>
         /// </summary>
-        public Java.Lang.String MimeType
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUri()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileInfo.html#getUri()"/> 
-        /// </summary>
-        public Android.Net.Uri Uri
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileInfo.html#describeContents()"/>
@@ -74,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileInfo.html#getMimeType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMimeType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/FileServiceInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/FileServiceInfo.cs
index f4cffa0d3..a102c2ba9 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/FileServiceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/FileServiceInfo.cs
@@ -56,13 +56,6 @@ public partial class FileServiceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileServiceInfo.html#getFiles()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Telephony.Mbms.FileInfo> Files
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.Mbms.FileInfo>>("getFiles", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileServiceInfo.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -71,6 +64,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileServiceInfo.html#getFiles()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.Mbms.FileInfo> GetFiles()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.Mbms.FileInfo>>("getFiles", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/FileServiceInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/GroupCall.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/GroupCall.cs
index a4633cab1..a4dad2422 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/GroupCall.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/GroupCall.cs
@@ -100,11 +100,12 @@ public partial class GroupCall
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/GroupCall.html#getTmgi()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/GroupCall.html#getTmgi()"/>
         /// </summary>
-        public long Tmgi
+        /// <returns><see cref="long"/></returns>
+        public long GetTmgi()
         {
-            get { return IExecuteWithSignature<long>("getTmgi", "()J"); }
+            return IExecuteWithSignature<long>("getTmgi", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/GroupCall.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/ServiceInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/ServiceInfo.cs
index f4bd31650..caf186c57 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/ServiceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/ServiceInfo.cs
@@ -46,55 +46,61 @@ public partial class ServiceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getNameForLocale(java.util.Locale)"/>
         /// </summary>
-        public Java.Util.List<Java.Util.Locale> Locales
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetNameForLocale(Java.Util.Locale arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Util.Locale>>("getLocales", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNameForLocale", "(Ljava/util/Locale;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getNamedContentLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getServiceClassName()"/>
         /// </summary>
-        public Java.Util.Set<Java.Util.Locale> NamedContentLocales
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServiceClassName()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Util.Locale>>("getNamedContentLocales", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getServiceClassName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getServiceClassName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getServiceId()"/>
         /// </summary>
-        public Java.Lang.String ServiceClassName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServiceId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceClassName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getServiceId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getServiceId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getSessionEndTime()"/>
         /// </summary>
-        public Java.Lang.String ServiceId
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetSessionEndTime()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getSessionEndTime", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getSessionEndTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getSessionStartTime()"/>
         /// </summary>
-        public Java.Util.Date SessionEndTime
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetSessionStartTime()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getSessionEndTime", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getSessionStartTime", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getSessionStartTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getLocales()"/>
         /// </summary>
-        public Java.Util.Date SessionStartTime
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Util.Locale> GetLocales()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getSessionStartTime", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Util.Locale>>("getLocales", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getNameForLocale(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/ServiceInfo.html#getNamedContentLocales()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public Java.Lang.CharSequence GetNameForLocale(Java.Util.Locale arg0)
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Util.Locale> GetNamedContentLocales()
         {
-            return IExecuteWithSignature<Java.Lang.CharSequence>("getNameForLocale", "(Ljava/util/Locale;)Ljava/lang/CharSequence;", arg0);
+            return IExecuteWithSignature<Java.Util.Set<Java.Util.Locale>>("getNamedContentLocales", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/Mbms/StreamingService.cs b/src/net/Netdroid/Generated/Android/Telephony/Mbms/StreamingService.cs
index ab83ba803..dea9825c6 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/Mbms/StreamingService.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/Mbms/StreamingService.cs
@@ -118,18 +118,20 @@ public partial class StreamingService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/StreamingService.html#getInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/StreamingService.html#getPlaybackUri()"/>
         /// </summary>
-        public Android.Telephony.Mbms.StreamingServiceInfo Info
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetPlaybackUri()
         {
-            get { return IExecuteWithSignature<Android.Telephony.Mbms.StreamingServiceInfo>("getInfo", "()Landroid/telephony/mbms/StreamingServiceInfo;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getPlaybackUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/mbms/StreamingService.html#getPlaybackUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/mbms/StreamingService.html#getInfo()"/>
         /// </summary>
-        public Android.Net.Uri PlaybackUri
+        /// <returns><see cref="Android.Telephony.Mbms.StreamingServiceInfo"/></returns>
+        public Android.Telephony.Mbms.StreamingServiceInfo GetInfo()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getPlaybackUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Telephony.Mbms.StreamingServiceInfo>("getInfo", "()Landroid/telephony/mbms/StreamingServiceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/mbms/StreamingService.html#close()"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/MbmsDownloadSession.cs b/src/net/Netdroid/Generated/Android/Telephony/MbmsDownloadSession.cs
index 24b99bbf6..2cd4d7144 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/MbmsDownloadSession.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/MbmsDownloadSession.cs
@@ -150,13 +150,6 @@ public partial class MbmsDownloadSession
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession.html#getMaximumServiceAnnouncementSize()"/> 
-        /// </summary>
-        public static int MaximumServiceAnnouncementSize
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumServiceAnnouncementSize", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession.html#create(android.content.Context,java.util.concurrent.Executor,android.telephony.mbms.MbmsDownloadSessionCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -179,16 +172,25 @@ public static Android.Telephony.MbmsDownloadSession Create(Android.Content.Conte
         {
             return SExecute<Android.Telephony.MbmsDownloadSession>(LocalBridgeClazz, "create", arg0, arg1, arg2, arg3);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession.html#getMaximumServiceAnnouncementSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaximumServiceAnnouncementSize()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumServiceAnnouncementSize", "()I");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession.html#getTempFileRootDirectory()"/> <see href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession.html#setTempFileRootDirectory(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession.html#getTempFileRootDirectory()"/>
         /// </summary>
-        public Java.Io.File TempFileRootDirectory
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetTempFileRootDirectory()
         {
-            get { return IExecuteWithSignature<Java.Io.File>("getTempFileRootDirectory", "()Ljava/io/File;"); } set { IExecuteWithSignature("setTempFileRootDirectory", "(Ljava/io/File;)V", value); }
+            return IExecuteWithSignature<Java.Io.File>("getTempFileRootDirectory", "()Ljava/io/File;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession.html#listPendingDownloads()"/>
@@ -292,6 +294,14 @@ public void ResetDownloadKnowledge(Android.Telephony.Mbms.DownloadRequest arg0)
         {
             IExecuteWithSignature("resetDownloadKnowledge", "(Landroid/telephony/mbms/DownloadRequest;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/MbmsDownloadSession.html#setTempFileRootDirectory(java.io.File)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.File"/></param>
+        public void SetTempFileRootDirectory(Java.Io.File arg0)
+        {
+            IExecuteWithSignature("setTempFileRootDirectory", "(Ljava/io/File;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Telephony/NeighboringCellInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/NeighboringCellInfo.cs
index 14816082e..3bd1371ca 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/NeighboringCellInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/NeighboringCellInfo.cs
@@ -33,7 +33,7 @@ public partial class NeighboringCellInfo
         /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#%3Cinit%3E(android.os.Parcel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public NeighboringCellInfo(Android.Os.Parcel arg0)
             : base(arg0)
         {
@@ -43,7 +43,7 @@ public NeighboringCellInfo(Android.Os.Parcel arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public NeighboringCellInfo(int arg0, int arg1)
             : base(arg0, arg1)
         {
@@ -54,7 +54,7 @@ public NeighboringCellInfo(int arg0, int arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public NeighboringCellInfo(int arg0, Java.Lang.String arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -70,21 +70,21 @@ public NeighboringCellInfo(int arg0, Java.Lang.String arg1, int arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#CREATOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
         private static Android.Os.Parcelable.Creator _CREATORContent = default;
         private static bool _CREATORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#UNKNOWN_CID"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int UNKNOWN_CID { get { if (!_UNKNOWN_CIDReady) { _UNKNOWN_CIDContent = SGetField<int>(LocalBridgeClazz, "UNKNOWN_CID"); _UNKNOWN_CIDReady = true; } return _UNKNOWN_CIDContent; } }
         private static int _UNKNOWN_CIDContent = default;
         private static bool _UNKNOWN_CIDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#UNKNOWN_RSSI"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int UNKNOWN_RSSI { get { if (!_UNKNOWN_RSSIReady) { _UNKNOWN_RSSIContent = SGetField<int>(LocalBridgeClazz, "UNKNOWN_RSSI"); _UNKNOWN_RSSIReady = true; } return _UNKNOWN_RSSIContent; } }
         private static int _UNKNOWN_RSSIContent = default;
         private static bool _UNKNOWN_RSSIReady = false; // this is used because in case of generics 
@@ -97,60 +97,83 @@ public NeighboringCellInfo(int arg0, Java.Lang.String arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getCid()"/> <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#setCid(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#describeContents()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Cid
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCid", "()I"); } set { IExecuteWithSignature("setCid", "(I)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getLac()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getCid()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Lac
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetCid()
         {
-            get { return IExecuteWithSignature<int>("getLac", "()I"); }
+            return IExecuteWithSignature<int>("getCid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getLac()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int NetworkType
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetLac()
         {
-            get { return IExecuteWithSignature<int>("getNetworkType", "()I"); }
+            return IExecuteWithSignature<int>("getLac", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getPsc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getNetworkType()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Psc
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetNetworkType()
         {
-            get { return IExecuteWithSignature<int>("getPsc", "()I"); }
+            return IExecuteWithSignature<int>("getNetworkType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getRssi()"/> <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#setRssi(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getPsc()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Rssi
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPsc()
         {
-            get { return IExecuteWithSignature<int>("getRssi", "()I"); } set { IExecuteWithSignature("setRssi", "(I)V", value); }
+            return IExecuteWithSignature<int>("getPsc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#getRssi()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
-        public int DescribeContents()
+        [global::System.Obsolete()]
+        public int GetRssi()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getRssi", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#setCid(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetCid(int arg0)
+        {
+            IExecuteWithSignature("setCid", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#setRssi(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetRssi(int arg0)
+        {
+            IExecuteWithSignature("setRssi", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/NeighboringCellInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
             IExecute("writeToParcel", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/NetworkRegistrationInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/NetworkRegistrationInfo.cs
index edded1fa6..787906c4b 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/NetworkRegistrationInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/NetworkRegistrationInfo.cs
@@ -136,46 +136,12 @@ public partial class NetworkRegistrationInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getAccessNetworkTechnology()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getCellIdentity()"/>
         /// </summary>
-        public int AccessNetworkTechnology
+        /// <returns><see cref="Android.Telephony.CellIdentity"/></returns>
+        public Android.Telephony.CellIdentity GetCellIdentity()
         {
-            get { return IExecuteWithSignature<int>("getAccessNetworkTechnology", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getAvailableServices()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.Integer> AvailableServices
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getAvailableServices", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getCellIdentity()"/> 
-        /// </summary>
-        public Android.Telephony.CellIdentity CellIdentity
-        {
-            get { return IExecuteWithSignature<Android.Telephony.CellIdentity>("getCellIdentity", "()Landroid/telephony/CellIdentity;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getDomain()"/> 
-        /// </summary>
-        public int Domain
-        {
-            get { return IExecuteWithSignature<int>("getDomain", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getRegisteredPlmn()"/> 
-        /// </summary>
-        public Java.Lang.String RegisteredPlmn
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRegisteredPlmn", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getTransportType()"/> 
-        /// </summary>
-        public int TransportType
-        {
-            get { return IExecuteWithSignature<int>("getTransportType", "()I"); }
+            return IExecuteWithSignature<Android.Telephony.CellIdentity>("getCellIdentity", "()Landroid/telephony/CellIdentity;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#isNetworkRegistered()"/>
@@ -205,7 +171,7 @@ public bool IsNetworkSearching()
         /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#isRegistered()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsRegistered()
         {
             return IExecuteWithSignature<bool>("isRegistered", "()Z");
@@ -214,7 +180,7 @@ public bool IsRegistered()
         /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#isRoaming()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsRoaming()
         {
             return IExecuteWithSignature<bool>("isRoaming", "()Z");
@@ -223,7 +189,7 @@ public bool IsRoaming()
         /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#isSearching()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsSearching()
         {
             return IExecuteWithSignature<bool>("isSearching", "()Z");
@@ -237,6 +203,46 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getAccessNetworkTechnology()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAccessNetworkTechnology()
+        {
+            return IExecuteWithSignature<int>("getAccessNetworkTechnology", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getDomain()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDomain()
+        {
+            return IExecuteWithSignature<int>("getDomain", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getTransportType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTransportType()
+        {
+            return IExecuteWithSignature<int>("getTransportType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getRegisteredPlmn()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRegisteredPlmn()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getRegisteredPlmn", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#getAvailableServices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetAvailableServices()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getAvailableServices", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/NetworkRegistrationInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/NetworkScanRequest.cs b/src/net/Netdroid/Generated/Android/Telephony/NetworkScanRequest.cs
index 01609e5f4..7a5ada9fd 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/NetworkScanRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/NetworkScanRequest.cs
@@ -78,61 +78,68 @@ public NetworkScanRequest(int arg0, Android.Telephony.RadioAccessSpecifier[] arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getIncrementalResults()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getSpecifiers()"/>
         /// </summary>
-        public bool IncrementalResults
+        /// <returns><see cref="Android.Telephony.RadioAccessSpecifier"/></returns>
+        public Android.Telephony.RadioAccessSpecifier[] GetSpecifiers()
         {
-            get { return IExecuteWithSignature<bool>("getIncrementalResults", "()Z"); }
+            return IExecuteWithSignatureArray<Android.Telephony.RadioAccessSpecifier>("getSpecifiers", "()[Landroid/telephony/RadioAccessSpecifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getIncrementalResultsPeriodicity()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getIncrementalResults()"/>
         /// </summary>
-        public int IncrementalResultsPeriodicity
+        /// <returns><see cref="bool"/></returns>
+        public bool GetIncrementalResults()
         {
-            get { return IExecuteWithSignature<int>("getIncrementalResultsPeriodicity", "()I"); }
+            return IExecuteWithSignature<bool>("getIncrementalResults", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getMaxSearchTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#describeContents()"/>
         /// </summary>
-        public int MaxSearchTime
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getMaxSearchTime", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getPlmns()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getIncrementalResultsPeriodicity()"/>
         /// </summary>
-        public Java.Util.ArrayList<Java.Lang.String> Plmns
+        /// <returns><see cref="int"/></returns>
+        public int GetIncrementalResultsPeriodicity()
         {
-            get { return IExecuteWithSignature<Java.Util.ArrayList<Java.Lang.String>>("getPlmns", "()Ljava/util/ArrayList;"); }
+            return IExecuteWithSignature<int>("getIncrementalResultsPeriodicity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getScanType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getMaxSearchTime()"/>
         /// </summary>
-        public int ScanType
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSearchTime()
         {
-            get { return IExecuteWithSignature<int>("getScanType", "()I"); }
+            return IExecuteWithSignature<int>("getMaxSearchTime", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getSearchPeriodicity()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getScanType()"/>
         /// </summary>
-        public int SearchPeriodicity
+        /// <returns><see cref="int"/></returns>
+        public int GetScanType()
         {
-            get { return IExecuteWithSignature<int>("getSearchPeriodicity", "()I"); }
+            return IExecuteWithSignature<int>("getScanType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getSpecifiers()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getSearchPeriodicity()"/>
         /// </summary>
-        public Android.Telephony.RadioAccessSpecifier[] Specifiers
+        /// <returns><see cref="int"/></returns>
+        public int GetSearchPeriodicity()
         {
-            get { return IExecuteWithSignatureArray<Android.Telephony.RadioAccessSpecifier>("getSpecifiers", "()[Landroid/telephony/RadioAccessSpecifier;"); }
+            return IExecuteWithSignature<int>("getSearchPeriodicity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#getPlmns()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<Java.Lang.String> GetPlmns()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.ArrayList<Java.Lang.String>>("getPlmns", "()Ljava/util/ArrayList;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/NetworkScanRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/PhoneNumberUtils.cs b/src/net/Netdroid/Generated/Android/Telephony/PhoneNumberUtils.cs
index 88b7e7b70..221be4fd6 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/PhoneNumberUtils.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/PhoneNumberUtils.cs
@@ -102,6 +102,15 @@ public partial class PhoneNumberUtils
 
         #region Static methods
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils.html#createTtsSpan(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Text.Style.TtsSpan"/></returns>
+        public static Android.Text.Style.TtsSpan CreateTtsSpan(Java.Lang.String arg0)
+        {
+            return SExecuteWithSignature<Android.Text.Style.TtsSpan>(LocalBridgeClazz, "createTtsSpan", "(Ljava/lang/String;)Landroid/text/style/TtsSpan;", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils.html#areSamePhoneNumber(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -119,7 +128,7 @@ public static bool AreSamePhoneNumber(Java.Lang.String arg0, Java.Lang.String ar
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool Compare(Android.Content.Context arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
             return SExecute<bool>(LocalBridgeClazz, "compare", arg0, arg1, arg2);
@@ -130,7 +139,7 @@ public static bool Compare(Android.Content.Context arg0, Java.Lang.String arg1,
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool Compare(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return SExecute<bool>(LocalBridgeClazz, "compare", arg0, arg1);
@@ -140,7 +149,7 @@ public static bool Compare(Java.Lang.String arg0, Java.Lang.String arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsEmergencyNumber(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isEmergencyNumber", "(Ljava/lang/String;)Z", arg0);
@@ -169,7 +178,7 @@ public static bool IsISODigit(char arg0)
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsLocalEmergencyNumber(Android.Content.Context arg0, Java.Lang.String arg1)
         {
             return SExecute<bool>(LocalBridgeClazz, "isLocalEmergencyNumber", arg0, arg1);
@@ -225,7 +234,7 @@ public static byte[] NumberToCalledPartyBCD(Java.Lang.String arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static byte[] NumberToCalledPartyBCD(Java.Lang.String arg0)
         {
             return SExecuteWithSignatureArray<byte>(LocalBridgeClazz, "numberToCalledPartyBCD", "(Ljava/lang/String;)[B", arg0);
@@ -280,7 +289,7 @@ public static bool IsStartsPostDial(char arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetFormatTypeForLocale(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getFormatTypeForLocale", "(Ljava/util/Locale;)I", arg0);
@@ -322,7 +331,7 @@ public static Java.Lang.String CalledPartyBCDFragmentToString(byte[] arg0, int a
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String CalledPartyBCDFragmentToString(byte[] arg0, int arg1, int arg2)
         {
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "calledPartyBCDFragmentToString", arg0, arg1, arg2);
@@ -346,7 +355,7 @@ public static Java.Lang.String CalledPartyBCDToString(byte[] arg0, int arg1, int
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String CalledPartyBCDToString(byte[] arg0, int arg1, int arg2)
         {
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "calledPartyBCDToString", arg0, arg1, arg2);
@@ -404,7 +413,7 @@ public static Java.Lang.String FormatNumber(Java.Lang.String arg0, Java.Lang.Str
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String FormatNumber(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "formatNumber", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
@@ -508,7 +517,7 @@ public static void AddTtsSpan(Android.Text.Spannable arg0, int arg1, int arg2)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils.html#formatJapaneseNumber(android.text.Editable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void FormatJapaneseNumber(Android.Text.Editable arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "formatJapaneseNumber", "(Landroid/text/Editable;)V", arg0);
@@ -517,7 +526,7 @@ public static void FormatJapaneseNumber(Android.Text.Editable arg0)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneNumberUtils.html#formatNanpNumber(android.text.Editable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void FormatNanpNumber(Android.Text.Editable arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "formatNanpNumber", "(Landroid/text/Editable;)V", arg0);
@@ -527,7 +536,7 @@ public static void FormatNanpNumber(Android.Text.Editable arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void FormatNumber(Android.Text.Editable arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "formatNumber", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/PhoneStateListener.cs b/src/net/Netdroid/Generated/Android/Telephony/PhoneStateListener.cs
index 76a3a4c3a..d912bb414 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/PhoneStateListener.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/PhoneStateListener.cs
@@ -29,519 +29,163 @@ namespace Android.Telephony
     public partial class PhoneStateListener
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="PhoneStateListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onActiveDataSubscriptionIdChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnActiveDataSubscriptionIdChangedEventHandler));
-            AddEventHandler("onBarringInfoChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.BarringInfo>>>(OnBarringInfoChangedEventHandler));
-            AddEventHandler("onCallDisconnectCauseChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnCallDisconnectCauseChangedEventHandler));
-            AddEventHandler("onCallForwardingIndicatorChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnCallForwardingIndicatorChangedEventHandler));
-            AddEventHandler("onCallStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnCallStateChangedEventHandler));
-            AddEventHandler("onCellInfoChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Telephony.CellInfo>>>>(OnCellInfoChangedEventHandler));
-            AddEventHandler("onCellLocationChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.CellLocation>>>(OnCellLocationChangedEventHandler));
-            AddEventHandler("onDataActivity", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataActivityEventHandler));
-            AddEventHandler("onDataConnectionStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataConnectionStateChangedEventHandler));
-            AddEventHandler("onDataConnectionStateChanged1", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataConnectionStateChanged1EventHandler));
-            AddEventHandler("onDisplayInfoChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.TelephonyDisplayInfo>>>(OnDisplayInfoChangedEventHandler));
-            AddEventHandler("onEmergencyNumberListChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>>>>(OnEmergencyNumberListChangedEventHandler));
-            AddEventHandler("onImsCallDisconnectCauseChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.Ims.ImsReasonInfo>>>(OnImsCallDisconnectCauseChangedEventHandler));
-            AddEventHandler("onMessageWaitingIndicatorChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnMessageWaitingIndicatorChangedEventHandler));
-            AddEventHandler("onPreciseDataConnectionStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.PreciseDataConnectionState>>>(OnPreciseDataConnectionStateChangedEventHandler));
-            AddEventHandler("onRegistrationFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.CellIdentity>>>(OnRegistrationFailedEventHandler));
-            AddEventHandler("onServiceStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.ServiceState>>>(OnServiceStateChangedEventHandler));
-            AddEventHandler("onSignalStrengthChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSignalStrengthChangedEventHandler));
-            AddEventHandler("onSignalStrengthsChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.SignalStrength>>>(OnSignalStrengthsChangedEventHandler));
-            AddEventHandler("onUserMobileDataStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnUserMobileDataStateChangedEventHandler));
-
-        }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onActiveDataSubscriptionIdChanged(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#%3Cinit%3E(java.util.concurrent.Executor)"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnActiveDataSubscriptionIdChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnActiveDataSubscriptionIdChanged { get; set; } = null;
-
-        void OnActiveDataSubscriptionIdChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
+        /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
+        [global::System.Obsolete()]
+        public PhoneStateListener(Java.Util.Concurrent.Executor arg0)
+            : base(arg0)
         {
-            var methodToExecute = (OnOnActiveDataSubscriptionIdChanged != null) ? OnOnActiveDataSubscriptionIdChanged : OnActiveDataSubscriptionIdChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
         }
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onActiveDataSubscriptionIdChanged(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void OnActiveDataSubscriptionIdChanged(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onBarringInfoChanged(android.telephony.BarringInfo)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnBarringInfoChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.BarringInfo> OnOnBarringInfoChanged { get; set; } = null;
-
-        void OnBarringInfoChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.BarringInfo>> data)
-        {
-            var methodToExecute = (OnOnBarringInfoChanged != null) ? OnOnBarringInfoChanged : OnBarringInfoChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onBarringInfoChanged(android.telephony.BarringInfo)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.BarringInfo"/></param>
-        [System.Obsolete()]
-        public virtual void OnBarringInfoChanged(Android.Telephony.BarringInfo arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCallDisconnectCauseChanged(int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnCallDisconnectCauseChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int> OnOnCallDisconnectCauseChanged { get; set; } = null;
-
-        void OnCallDisconnectCauseChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnCallDisconnectCauseChanged != null) ? OnOnCallDisconnectCauseChanged : OnCallDisconnectCauseChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCallDisconnectCauseChanged(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void OnCallDisconnectCauseChanged(int arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCallForwardingIndicatorChanged(boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnCallForwardingIndicatorChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<bool> OnOnCallForwardingIndicatorChanged { get; set; } = null;
-
-        void OnCallForwardingIndicatorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnOnCallForwardingIndicatorChanged != null) ? OnOnCallForwardingIndicatorChanged : OnCallForwardingIndicatorChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCallForwardingIndicatorChanged(boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
-        public virtual void OnCallForwardingIndicatorChanged(bool arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCallStateChanged(int,java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnCallStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, Java.Lang.String> OnOnCallStateChanged { get; set; } = null;
-
-        void OnCallStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnCallStateChanged != null) ? OnOnCallStateChanged : OnCallStateChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCallStateChanged(int,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
-        public virtual void OnCallStateChanged(int arg0, Java.Lang.String arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCellInfoChanged(java.util.List)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnCellInfoChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Util.List<Android.Telephony.CellInfo>> OnOnCellInfoChanged { get; set; } = null;
-
-        void OnCellInfoChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Telephony.CellInfo>>> data)
-        {
-            var methodToExecute = (OnOnCellInfoChanged != null) ? OnOnCellInfoChanged : OnCellInfoChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCellInfoChanged(java.util.List)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        [System.Obsolete()]
-        public virtual void OnCellInfoChanged(Java.Util.List<Android.Telephony.CellInfo> arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCellLocationChanged(android.telephony.CellLocation)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnCellLocationChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.CellLocation> OnOnCellLocationChanged { get; set; } = null;
-
-        void OnCellLocationChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.CellLocation>> data)
-        {
-            var methodToExecute = (OnOnCellLocationChanged != null) ? OnOnCellLocationChanged : OnCellLocationChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCellLocationChanged(android.telephony.CellLocation)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.CellLocation"/></param>
-        [System.Obsolete()]
-        public virtual void OnCellLocationChanged(Android.Telephony.CellLocation arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDataActivity(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnDataActivity"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnDataActivity { get; set; } = null;
-
-        void OnDataActivityEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnDataActivity != null) ? OnOnDataActivity : OnDataActivity;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDataActivity(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void OnDataActivity(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDataConnectionStateChanged(int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnDataConnectionStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int> OnOnDataConnectionStateChanged { get; set; } = null;
-
-        void OnDataConnectionStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnDataConnectionStateChanged != null) ? OnOnDataConnectionStateChanged : OnDataConnectionStateChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDataConnectionStateChanged(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void OnDataConnectionStateChanged(int arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDataConnectionStateChanged(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnDataConnectionStateChanged1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnDataConnectionStateChanged1 { get; set; } = null;
+        #endregion
 
-        void OnDataConnectionStateChanged1EventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnDataConnectionStateChanged1 != null) ? OnOnDataConnectionStateChanged1 : OnDataConnectionStateChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
+        #region Class/Interface conversion operators
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDataConnectionStateChanged(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void OnDataConnectionStateChanged(int arg0)
-        {
-            
-        }
+        #endregion
 
+        #region Fields
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDisplayInfoChanged(android.telephony.TelephonyDisplayInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnDisplayInfoChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.TelephonyDisplayInfo> OnOnDisplayInfoChanged { get; set; } = null;
-
-        void OnDisplayInfoChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.TelephonyDisplayInfo>> data)
-        {
-            var methodToExecute = (OnOnDisplayInfoChanged != null) ? OnOnDisplayInfoChanged : OnDisplayInfoChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE { get { if (!_LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGEReady) { _LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGEContent = SGetField<int>(LocalBridgeClazz, "LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE"); _LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGEReady = true; } return _LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGEContent; } }
+        private static int _LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGEContent = default;
+        private static bool _LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDisplayInfoChanged(android.telephony.TelephonyDisplayInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_BARRING_INFO"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.TelephonyDisplayInfo"/></param>
-        [System.Obsolete()]
-        public virtual void OnDisplayInfoChanged(Android.Telephony.TelephonyDisplayInfo arg0)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_BARRING_INFO { get { if (!_LISTEN_BARRING_INFOReady) { _LISTEN_BARRING_INFOContent = SGetField<int>(LocalBridgeClazz, "LISTEN_BARRING_INFO"); _LISTEN_BARRING_INFOReady = true; } return _LISTEN_BARRING_INFOContent; } }
+        private static int _LISTEN_BARRING_INFOContent = default;
+        private static bool _LISTEN_BARRING_INFOReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onEmergencyNumberListChanged(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_CALL_DISCONNECT_CAUSES"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnEmergencyNumberListChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>> OnOnEmergencyNumberListChanged { get; set; } = null;
-
-        void OnEmergencyNumberListChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>>> data)
-        {
-            var methodToExecute = (OnOnEmergencyNumberListChanged != null) ? OnOnEmergencyNumberListChanged : OnEmergencyNumberListChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_CALL_DISCONNECT_CAUSES { get { if (!_LISTEN_CALL_DISCONNECT_CAUSESReady) { _LISTEN_CALL_DISCONNECT_CAUSESContent = SGetField<int>(LocalBridgeClazz, "LISTEN_CALL_DISCONNECT_CAUSES"); _LISTEN_CALL_DISCONNECT_CAUSESReady = true; } return _LISTEN_CALL_DISCONNECT_CAUSESContent; } }
+        private static int _LISTEN_CALL_DISCONNECT_CAUSESContent = default;
+        private static bool _LISTEN_CALL_DISCONNECT_CAUSESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onEmergencyNumberListChanged(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_CALL_FORWARDING_INDICATOR"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Map"/></param>
-        [System.Obsolete()]
-        public virtual void OnEmergencyNumberListChanged(Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>> arg0)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_CALL_FORWARDING_INDICATOR { get { if (!_LISTEN_CALL_FORWARDING_INDICATORReady) { _LISTEN_CALL_FORWARDING_INDICATORContent = SGetField<int>(LocalBridgeClazz, "LISTEN_CALL_FORWARDING_INDICATOR"); _LISTEN_CALL_FORWARDING_INDICATORReady = true; } return _LISTEN_CALL_FORWARDING_INDICATORContent; } }
+        private static int _LISTEN_CALL_FORWARDING_INDICATORContent = default;
+        private static bool _LISTEN_CALL_FORWARDING_INDICATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onImsCallDisconnectCauseChanged(android.telephony.ims.ImsReasonInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_CALL_STATE"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnImsCallDisconnectCauseChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.Ims.ImsReasonInfo> OnOnImsCallDisconnectCauseChanged { get; set; } = null;
-
-        void OnImsCallDisconnectCauseChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.Ims.ImsReasonInfo>> data)
-        {
-            var methodToExecute = (OnOnImsCallDisconnectCauseChanged != null) ? OnOnImsCallDisconnectCauseChanged : OnImsCallDisconnectCauseChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_CALL_STATE { get { if (!_LISTEN_CALL_STATEReady) { _LISTEN_CALL_STATEContent = SGetField<int>(LocalBridgeClazz, "LISTEN_CALL_STATE"); _LISTEN_CALL_STATEReady = true; } return _LISTEN_CALL_STATEContent; } }
+        private static int _LISTEN_CALL_STATEContent = default;
+        private static bool _LISTEN_CALL_STATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onImsCallDisconnectCauseChanged(android.telephony.ims.ImsReasonInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_CELL_INFO"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.Ims.ImsReasonInfo"/></param>
-        [System.Obsolete()]
-        public virtual void OnImsCallDisconnectCauseChanged(Android.Telephony.Ims.ImsReasonInfo arg0)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_CELL_INFO { get { if (!_LISTEN_CELL_INFOReady) { _LISTEN_CELL_INFOContent = SGetField<int>(LocalBridgeClazz, "LISTEN_CELL_INFO"); _LISTEN_CELL_INFOReady = true; } return _LISTEN_CELL_INFOContent; } }
+        private static int _LISTEN_CELL_INFOContent = default;
+        private static bool _LISTEN_CELL_INFOReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onMessageWaitingIndicatorChanged(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_CELL_LOCATION"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnMessageWaitingIndicatorChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<bool> OnOnMessageWaitingIndicatorChanged { get; set; } = null;
-
-        void OnMessageWaitingIndicatorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnOnMessageWaitingIndicatorChanged != null) ? OnOnMessageWaitingIndicatorChanged : OnMessageWaitingIndicatorChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_CELL_LOCATION { get { if (!_LISTEN_CELL_LOCATIONReady) { _LISTEN_CELL_LOCATIONContent = SGetField<int>(LocalBridgeClazz, "LISTEN_CELL_LOCATION"); _LISTEN_CELL_LOCATIONReady = true; } return _LISTEN_CELL_LOCATIONContent; } }
+        private static int _LISTEN_CELL_LOCATIONContent = default;
+        private static bool _LISTEN_CELL_LOCATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onMessageWaitingIndicatorChanged(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_DATA_ACTIVITY"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
-        public virtual void OnMessageWaitingIndicatorChanged(bool arg0)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_DATA_ACTIVITY { get { if (!_LISTEN_DATA_ACTIVITYReady) { _LISTEN_DATA_ACTIVITYContent = SGetField<int>(LocalBridgeClazz, "LISTEN_DATA_ACTIVITY"); _LISTEN_DATA_ACTIVITYReady = true; } return _LISTEN_DATA_ACTIVITYContent; } }
+        private static int _LISTEN_DATA_ACTIVITYContent = default;
+        private static bool _LISTEN_DATA_ACTIVITYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_DATA_CONNECTION_STATE"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnPreciseDataConnectionStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.PreciseDataConnectionState> OnOnPreciseDataConnectionStateChanged { get; set; } = null;
-
-        void OnPreciseDataConnectionStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.PreciseDataConnectionState>> data)
-        {
-            var methodToExecute = (OnOnPreciseDataConnectionStateChanged != null) ? OnOnPreciseDataConnectionStateChanged : OnPreciseDataConnectionStateChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_DATA_CONNECTION_STATE { get { if (!_LISTEN_DATA_CONNECTION_STATEReady) { _LISTEN_DATA_CONNECTION_STATEContent = SGetField<int>(LocalBridgeClazz, "LISTEN_DATA_CONNECTION_STATE"); _LISTEN_DATA_CONNECTION_STATEReady = true; } return _LISTEN_DATA_CONNECTION_STATEContent; } }
+        private static int _LISTEN_DATA_CONNECTION_STATEContent = default;
+        private static bool _LISTEN_DATA_CONNECTION_STATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_DISPLAY_INFO_CHANGED"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.PreciseDataConnectionState"/></param>
-        [System.Obsolete()]
-        public virtual void OnPreciseDataConnectionStateChanged(Android.Telephony.PreciseDataConnectionState arg0)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_DISPLAY_INFO_CHANGED { get { if (!_LISTEN_DISPLAY_INFO_CHANGEDReady) { _LISTEN_DISPLAY_INFO_CHANGEDContent = SGetField<int>(LocalBridgeClazz, "LISTEN_DISPLAY_INFO_CHANGED"); _LISTEN_DISPLAY_INFO_CHANGEDReady = true; } return _LISTEN_DISPLAY_INFO_CHANGEDContent; } }
+        private static int _LISTEN_DISPLAY_INFO_CHANGEDContent = default;
+        private static bool _LISTEN_DISPLAY_INFO_CHANGEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onRegistrationFailed(android.telephony.CellIdentity,java.lang.String,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_EMERGENCY_NUMBER_LIST"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnRegistrationFailed"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.CellIdentity, Java.Lang.String, int, int, int> OnOnRegistrationFailed { get; set; } = null;
-
-        void OnRegistrationFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.CellIdentity>> data)
-        {
-            var methodToExecute = (OnOnRegistrationFailed != null) ? OnOnRegistrationFailed : OnRegistrationFailed;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<int>(2), data.EventData.GetAt<int>(3));
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_EMERGENCY_NUMBER_LIST { get { if (!_LISTEN_EMERGENCY_NUMBER_LISTReady) { _LISTEN_EMERGENCY_NUMBER_LISTContent = SGetField<int>(LocalBridgeClazz, "LISTEN_EMERGENCY_NUMBER_LIST"); _LISTEN_EMERGENCY_NUMBER_LISTReady = true; } return _LISTEN_EMERGENCY_NUMBER_LISTContent; } }
+        private static int _LISTEN_EMERGENCY_NUMBER_LISTContent = default;
+        private static bool _LISTEN_EMERGENCY_NUMBER_LISTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onRegistrationFailed(android.telephony.CellIdentity,java.lang.String,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_IMS_CALL_DISCONNECT_CAUSES"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.CellIdentity"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void OnRegistrationFailed(Android.Telephony.CellIdentity arg0, Java.Lang.String arg1, int arg2, int arg3, int arg4)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_IMS_CALL_DISCONNECT_CAUSES { get { if (!_LISTEN_IMS_CALL_DISCONNECT_CAUSESReady) { _LISTEN_IMS_CALL_DISCONNECT_CAUSESContent = SGetField<int>(LocalBridgeClazz, "LISTEN_IMS_CALL_DISCONNECT_CAUSES"); _LISTEN_IMS_CALL_DISCONNECT_CAUSESReady = true; } return _LISTEN_IMS_CALL_DISCONNECT_CAUSESContent; } }
+        private static int _LISTEN_IMS_CALL_DISCONNECT_CAUSESContent = default;
+        private static bool _LISTEN_IMS_CALL_DISCONNECT_CAUSESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onServiceStateChanged(android.telephony.ServiceState)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_MESSAGE_WAITING_INDICATOR"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnServiceStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.ServiceState> OnOnServiceStateChanged { get; set; } = null;
-
-        void OnServiceStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.ServiceState>> data)
-        {
-            var methodToExecute = (OnOnServiceStateChanged != null) ? OnOnServiceStateChanged : OnServiceStateChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_MESSAGE_WAITING_INDICATOR { get { if (!_LISTEN_MESSAGE_WAITING_INDICATORReady) { _LISTEN_MESSAGE_WAITING_INDICATORContent = SGetField<int>(LocalBridgeClazz, "LISTEN_MESSAGE_WAITING_INDICATOR"); _LISTEN_MESSAGE_WAITING_INDICATORReady = true; } return _LISTEN_MESSAGE_WAITING_INDICATORContent; } }
+        private static int _LISTEN_MESSAGE_WAITING_INDICATORContent = default;
+        private static bool _LISTEN_MESSAGE_WAITING_INDICATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onServiceStateChanged(android.telephony.ServiceState)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_NONE"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.ServiceState"/></param>
-        [System.Obsolete()]
-        public virtual void OnServiceStateChanged(Android.Telephony.ServiceState arg0)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_NONE { get { if (!_LISTEN_NONEReady) { _LISTEN_NONEContent = SGetField<int>(LocalBridgeClazz, "LISTEN_NONE"); _LISTEN_NONEReady = true; } return _LISTEN_NONEContent; } }
+        private static int _LISTEN_NONEContent = default;
+        private static bool _LISTEN_NONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onSignalStrengthChanged(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_PRECISE_DATA_CONNECTION_STATE"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnSignalStrengthChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnSignalStrengthChanged { get; set; } = null;
-
-        void OnSignalStrengthChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnSignalStrengthChanged != null) ? OnOnSignalStrengthChanged : OnSignalStrengthChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_PRECISE_DATA_CONNECTION_STATE { get { if (!_LISTEN_PRECISE_DATA_CONNECTION_STATEReady) { _LISTEN_PRECISE_DATA_CONNECTION_STATEContent = SGetField<int>(LocalBridgeClazz, "LISTEN_PRECISE_DATA_CONNECTION_STATE"); _LISTEN_PRECISE_DATA_CONNECTION_STATEReady = true; } return _LISTEN_PRECISE_DATA_CONNECTION_STATEContent; } }
+        private static int _LISTEN_PRECISE_DATA_CONNECTION_STATEContent = default;
+        private static bool _LISTEN_PRECISE_DATA_CONNECTION_STATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onSignalStrengthChanged(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_REGISTRATION_FAILURE"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public virtual void OnSignalStrengthChanged(int arg0)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_REGISTRATION_FAILURE { get { if (!_LISTEN_REGISTRATION_FAILUREReady) { _LISTEN_REGISTRATION_FAILUREContent = SGetField<int>(LocalBridgeClazz, "LISTEN_REGISTRATION_FAILURE"); _LISTEN_REGISTRATION_FAILUREReady = true; } return _LISTEN_REGISTRATION_FAILUREContent; } }
+        private static int _LISTEN_REGISTRATION_FAILUREContent = default;
+        private static bool _LISTEN_REGISTRATION_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onSignalStrengthsChanged(android.telephony.SignalStrength)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_SERVICE_STATE"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnSignalStrengthsChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Telephony.SignalStrength> OnOnSignalStrengthsChanged { get; set; } = null;
-
-        void OnSignalStrengthsChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.SignalStrength>> data)
-        {
-            var methodToExecute = (OnOnSignalStrengthsChanged != null) ? OnOnSignalStrengthsChanged : OnSignalStrengthsChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_SERVICE_STATE { get { if (!_LISTEN_SERVICE_STATEReady) { _LISTEN_SERVICE_STATEContent = SGetField<int>(LocalBridgeClazz, "LISTEN_SERVICE_STATE"); _LISTEN_SERVICE_STATEReady = true; } return _LISTEN_SERVICE_STATEContent; } }
+        private static int _LISTEN_SERVICE_STATEContent = default;
+        private static bool _LISTEN_SERVICE_STATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onSignalStrengthsChanged(android.telephony.SignalStrength)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_SIGNAL_STRENGTH"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telephony.SignalStrength"/></param>
-        [System.Obsolete()]
-        public virtual void OnSignalStrengthsChanged(Android.Telephony.SignalStrength arg0)
-        {
-            
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_SIGNAL_STRENGTH { get { if (!_LISTEN_SIGNAL_STRENGTHReady) { _LISTEN_SIGNAL_STRENGTHContent = SGetField<int>(LocalBridgeClazz, "LISTEN_SIGNAL_STRENGTH"); _LISTEN_SIGNAL_STRENGTHReady = true; } return _LISTEN_SIGNAL_STRENGTHContent; } }
+        private static int _LISTEN_SIGNAL_STRENGTHContent = default;
+        private static bool _LISTEN_SIGNAL_STRENGTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onUserMobileDataStateChanged(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_SIGNAL_STRENGTHS"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnUserMobileDataStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<bool> OnOnUserMobileDataStateChanged { get; set; } = null;
-
-        void OnUserMobileDataStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnOnUserMobileDataStateChanged != null) ? OnOnUserMobileDataStateChanged : OnUserMobileDataStateChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
+        [global::System.Obsolete()]
+        public static int LISTEN_SIGNAL_STRENGTHS { get { if (!_LISTEN_SIGNAL_STRENGTHSReady) { _LISTEN_SIGNAL_STRENGTHSContent = SGetField<int>(LocalBridgeClazz, "LISTEN_SIGNAL_STRENGTHS"); _LISTEN_SIGNAL_STRENGTHSReady = true; } return _LISTEN_SIGNAL_STRENGTHSContent; } }
+        private static int _LISTEN_SIGNAL_STRENGTHSContent = default;
+        private static bool _LISTEN_SIGNAL_STRENGTHSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onUserMobileDataStateChanged(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#LISTEN_USER_MOBILE_DATA_STATE"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
-        public virtual void OnUserMobileDataStateChanged(bool arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region PhoneStateListenerDirect
-    public partial class PhoneStateListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
+        [global::System.Obsolete()]
+        public static int LISTEN_USER_MOBILE_DATA_STATE { get { if (!_LISTEN_USER_MOBILE_DATA_STATEReady) { _LISTEN_USER_MOBILE_DATA_STATEContent = SGetField<int>(LocalBridgeClazz, "LISTEN_USER_MOBILE_DATA_STATE"); _LISTEN_USER_MOBILE_DATA_STATEReady = true; } return _LISTEN_USER_MOBILE_DATA_STATEContent; } }
+        private static int _LISTEN_USER_MOBILE_DATA_STATEContent = default;
+        private static bool _LISTEN_USER_MOBILE_DATA_STATEReady = false; // this is used because in case of generics 
 
         #endregion
 
@@ -554,8 +198,8 @@ public partial class PhoneStateListenerDirect
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onActiveDataSubscriptionIdChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void OnActiveDataSubscriptionIdChanged(int arg0)
+        [global::System.Obsolete()]
+        public void OnActiveDataSubscriptionIdChanged(int arg0)
         {
             IExecuteWithSignature("onActiveDataSubscriptionIdChanged", "(I)V", arg0);
         }
@@ -563,8 +207,8 @@ public override void OnActiveDataSubscriptionIdChanged(int arg0)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onBarringInfoChanged(android.telephony.BarringInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.BarringInfo"/></param>
-        [System.Obsolete()]
-        public override void OnBarringInfoChanged(Android.Telephony.BarringInfo arg0)
+        [global::System.Obsolete()]
+        public void OnBarringInfoChanged(Android.Telephony.BarringInfo arg0)
         {
             IExecuteWithSignature("onBarringInfoChanged", "(Landroid/telephony/BarringInfo;)V", arg0);
         }
@@ -573,8 +217,8 @@ public override void OnBarringInfoChanged(Android.Telephony.BarringInfo arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void OnCallDisconnectCauseChanged(int arg0, int arg1)
+        [global::System.Obsolete()]
+        public void OnCallDisconnectCauseChanged(int arg0, int arg1)
         {
             IExecute("onCallDisconnectCauseChanged", arg0, arg1);
         }
@@ -582,8 +226,8 @@ public override void OnCallDisconnectCauseChanged(int arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCallForwardingIndicatorChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
-        public override void OnCallForwardingIndicatorChanged(bool arg0)
+        [global::System.Obsolete()]
+        public void OnCallForwardingIndicatorChanged(bool arg0)
         {
             IExecuteWithSignature("onCallForwardingIndicatorChanged", "(Z)V", arg0);
         }
@@ -592,8 +236,8 @@ public override void OnCallForwardingIndicatorChanged(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
-        public override void OnCallStateChanged(int arg0, Java.Lang.String arg1)
+        [global::System.Obsolete()]
+        public void OnCallStateChanged(int arg0, Java.Lang.String arg1)
         {
             IExecute("onCallStateChanged", arg0, arg1);
         }
@@ -601,8 +245,8 @@ public override void OnCallStateChanged(int arg0, Java.Lang.String arg1)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCellInfoChanged(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        [System.Obsolete()]
-        public override void OnCellInfoChanged(Java.Util.List<Android.Telephony.CellInfo> arg0)
+        [global::System.Obsolete()]
+        public void OnCellInfoChanged(Java.Util.List<Android.Telephony.CellInfo> arg0)
         {
             IExecuteWithSignature("onCellInfoChanged", "(Ljava/util/List;)V", arg0);
         }
@@ -610,8 +254,8 @@ public override void OnCellInfoChanged(Java.Util.List<Android.Telephony.CellInfo
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onCellLocationChanged(android.telephony.CellLocation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.CellLocation"/></param>
-        [System.Obsolete()]
-        public override void OnCellLocationChanged(Android.Telephony.CellLocation arg0)
+        [global::System.Obsolete()]
+        public void OnCellLocationChanged(Android.Telephony.CellLocation arg0)
         {
             IExecuteWithSignature("onCellLocationChanged", "(Landroid/telephony/CellLocation;)V", arg0);
         }
@@ -619,8 +263,8 @@ public override void OnCellLocationChanged(Android.Telephony.CellLocation arg0)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDataActivity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void OnDataActivity(int arg0)
+        [global::System.Obsolete()]
+        public void OnDataActivity(int arg0)
         {
             IExecuteWithSignature("onDataActivity", "(I)V", arg0);
         }
@@ -629,8 +273,8 @@ public override void OnDataActivity(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void OnDataConnectionStateChanged(int arg0, int arg1)
+        [global::System.Obsolete()]
+        public void OnDataConnectionStateChanged(int arg0, int arg1)
         {
             IExecute("onDataConnectionStateChanged", arg0, arg1);
         }
@@ -638,8 +282,8 @@ public override void OnDataConnectionStateChanged(int arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDataConnectionStateChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void OnDataConnectionStateChanged(int arg0)
+        [global::System.Obsolete()]
+        public void OnDataConnectionStateChanged(int arg0)
         {
             IExecuteWithSignature("onDataConnectionStateChanged", "(I)V", arg0);
         }
@@ -647,8 +291,8 @@ public override void OnDataConnectionStateChanged(int arg0)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onDisplayInfoChanged(android.telephony.TelephonyDisplayInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.TelephonyDisplayInfo"/></param>
-        [System.Obsolete()]
-        public override void OnDisplayInfoChanged(Android.Telephony.TelephonyDisplayInfo arg0)
+        [global::System.Obsolete()]
+        public void OnDisplayInfoChanged(Android.Telephony.TelephonyDisplayInfo arg0)
         {
             IExecuteWithSignature("onDisplayInfoChanged", "(Landroid/telephony/TelephonyDisplayInfo;)V", arg0);
         }
@@ -656,8 +300,8 @@ public override void OnDisplayInfoChanged(Android.Telephony.TelephonyDisplayInfo
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onEmergencyNumberListChanged(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
-        [System.Obsolete()]
-        public override void OnEmergencyNumberListChanged(Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>> arg0)
+        [global::System.Obsolete()]
+        public void OnEmergencyNumberListChanged(Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>> arg0)
         {
             IExecuteWithSignature("onEmergencyNumberListChanged", "(Ljava/util/Map;)V", arg0);
         }
@@ -665,8 +309,8 @@ public override void OnEmergencyNumberListChanged(Java.Util.Map<Java.Lang.Intege
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onImsCallDisconnectCauseChanged(android.telephony.ims.ImsReasonInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.Ims.ImsReasonInfo"/></param>
-        [System.Obsolete()]
-        public override void OnImsCallDisconnectCauseChanged(Android.Telephony.Ims.ImsReasonInfo arg0)
+        [global::System.Obsolete()]
+        public void OnImsCallDisconnectCauseChanged(Android.Telephony.Ims.ImsReasonInfo arg0)
         {
             IExecuteWithSignature("onImsCallDisconnectCauseChanged", "(Landroid/telephony/ims/ImsReasonInfo;)V", arg0);
         }
@@ -674,8 +318,8 @@ public override void OnImsCallDisconnectCauseChanged(Android.Telephony.Ims.ImsRe
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onMessageWaitingIndicatorChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
-        public override void OnMessageWaitingIndicatorChanged(bool arg0)
+        [global::System.Obsolete()]
+        public void OnMessageWaitingIndicatorChanged(bool arg0)
         {
             IExecuteWithSignature("onMessageWaitingIndicatorChanged", "(Z)V", arg0);
         }
@@ -683,8 +327,8 @@ public override void OnMessageWaitingIndicatorChanged(bool arg0)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.PreciseDataConnectionState"/></param>
-        [System.Obsolete()]
-        public override void OnPreciseDataConnectionStateChanged(Android.Telephony.PreciseDataConnectionState arg0)
+        [global::System.Obsolete()]
+        public void OnPreciseDataConnectionStateChanged(Android.Telephony.PreciseDataConnectionState arg0)
         {
             IExecuteWithSignature("onPreciseDataConnectionStateChanged", "(Landroid/telephony/PreciseDataConnectionState;)V", arg0);
         }
@@ -696,8 +340,8 @@ public override void OnPreciseDataConnectionStateChanged(Android.Telephony.Preci
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void OnRegistrationFailed(Android.Telephony.CellIdentity arg0, Java.Lang.String arg1, int arg2, int arg3, int arg4)
+        [global::System.Obsolete()]
+        public void OnRegistrationFailed(Android.Telephony.CellIdentity arg0, Java.Lang.String arg1, int arg2, int arg3, int arg4)
         {
             IExecute("onRegistrationFailed", arg0, arg1, arg2, arg3, arg4);
         }
@@ -705,8 +349,8 @@ public override void OnRegistrationFailed(Android.Telephony.CellIdentity arg0, J
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onServiceStateChanged(android.telephony.ServiceState)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.ServiceState"/></param>
-        [System.Obsolete()]
-        public override void OnServiceStateChanged(Android.Telephony.ServiceState arg0)
+        [global::System.Obsolete()]
+        public void OnServiceStateChanged(Android.Telephony.ServiceState arg0)
         {
             IExecuteWithSignature("onServiceStateChanged", "(Landroid/telephony/ServiceState;)V", arg0);
         }
@@ -714,8 +358,8 @@ public override void OnServiceStateChanged(Android.Telephony.ServiceState arg0)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onSignalStrengthChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
-        public override void OnSignalStrengthChanged(int arg0)
+        [global::System.Obsolete()]
+        public void OnSignalStrengthChanged(int arg0)
         {
             IExecuteWithSignature("onSignalStrengthChanged", "(I)V", arg0);
         }
@@ -723,8 +367,8 @@ public override void OnSignalStrengthChanged(int arg0)
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onSignalStrengthsChanged(android.telephony.SignalStrength)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.SignalStrength"/></param>
-        [System.Obsolete()]
-        public override void OnSignalStrengthsChanged(Android.Telephony.SignalStrength arg0)
+        [global::System.Obsolete()]
+        public void OnSignalStrengthsChanged(Android.Telephony.SignalStrength arg0)
         {
             IExecuteWithSignature("onSignalStrengthsChanged", "(Landroid/telephony/SignalStrength;)V", arg0);
         }
@@ -732,8 +376,8 @@ public override void OnSignalStrengthsChanged(Android.Telephony.SignalStrength a
         /// <see href="https://developer.android.com/reference/android/telephony/PhoneStateListener.html#onUserMobileDataStateChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
-        public override void OnUserMobileDataStateChanged(bool arg0)
+        [global::System.Obsolete()]
+        public void OnUserMobileDataStateChanged(bool arg0)
         {
             IExecuteWithSignature("onUserMobileDataStateChanged", "(Z)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Telephony/PhysicalChannelConfig.cs b/src/net/Netdroid/Generated/Android/Telephony/PhysicalChannelConfig.cs
index cc547ec28..710568ef4 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/PhysicalChannelConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/PhysicalChannelConfig.cs
@@ -64,21 +64,21 @@ public partial class PhysicalChannelConfig
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#CONNECTION_PRIMARY_SERVING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CONNECTION_PRIMARY_SERVING { get { if (!_CONNECTION_PRIMARY_SERVINGReady) { _CONNECTION_PRIMARY_SERVINGContent = SGetField<int>(LocalBridgeClazz, "CONNECTION_PRIMARY_SERVING"); _CONNECTION_PRIMARY_SERVINGReady = true; } return _CONNECTION_PRIMARY_SERVINGContent; } }
         private static int _CONNECTION_PRIMARY_SERVINGContent = default;
         private static bool _CONNECTION_PRIMARY_SERVINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#CONNECTION_SECONDARY_SERVING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CONNECTION_SECONDARY_SERVING { get { if (!_CONNECTION_SECONDARY_SERVINGReady) { _CONNECTION_SECONDARY_SERVINGContent = SGetField<int>(LocalBridgeClazz, "CONNECTION_SECONDARY_SERVING"); _CONNECTION_SECONDARY_SERVINGReady = true; } return _CONNECTION_SECONDARY_SERVINGContent; } }
         private static int _CONNECTION_SECONDARY_SERVINGContent = default;
         private static bool _CONNECTION_SECONDARY_SERVINGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#CONNECTION_UNKNOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CONNECTION_UNKNOWN { get { if (!_CONNECTION_UNKNOWNReady) { _CONNECTION_UNKNOWNContent = SGetField<int>(LocalBridgeClazz, "CONNECTION_UNKNOWN"); _CONNECTION_UNKNOWNReady = true; } return _CONNECTION_UNKNOWNContent; } }
         private static int _CONNECTION_UNKNOWNContent = default;
         private static bool _CONNECTION_UNKNOWNReady = false; // this is used because in case of generics 
@@ -109,82 +109,92 @@ public partial class PhysicalChannelConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getBand()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#describeContents()"/>
         /// </summary>
-        public int Band
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getBand", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getCellBandwidthDownlinkKhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getBand()"/>
         /// </summary>
-        public int CellBandwidthDownlinkKhz
+        /// <returns><see cref="int"/></returns>
+        public int GetBand()
         {
-            get { return IExecuteWithSignature<int>("getCellBandwidthDownlinkKhz", "()I"); }
+            return IExecuteWithSignature<int>("getBand", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getCellBandwidthUplinkKhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getCellBandwidthDownlinkKhz()"/>
         /// </summary>
-        public int CellBandwidthUplinkKhz
+        /// <returns><see cref="int"/></returns>
+        public int GetCellBandwidthDownlinkKhz()
         {
-            get { return IExecuteWithSignature<int>("getCellBandwidthUplinkKhz", "()I"); }
+            return IExecuteWithSignature<int>("getCellBandwidthDownlinkKhz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getConnectionStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getCellBandwidthUplinkKhz()"/>
         /// </summary>
-        public int ConnectionStatus
+        /// <returns><see cref="int"/></returns>
+        public int GetCellBandwidthUplinkKhz()
         {
-            get { return IExecuteWithSignature<int>("getConnectionStatus", "()I"); }
+            return IExecuteWithSignature<int>("getCellBandwidthUplinkKhz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getDownlinkChannelNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getConnectionStatus()"/>
         /// </summary>
-        public int DownlinkChannelNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectionStatus()
         {
-            get { return IExecuteWithSignature<int>("getDownlinkChannelNumber", "()I"); }
+            return IExecuteWithSignature<int>("getConnectionStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getDownlinkFrequencyKhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getDownlinkChannelNumber()"/>
         /// </summary>
-        public int DownlinkFrequencyKhz
+        /// <returns><see cref="int"/></returns>
+        public int GetDownlinkChannelNumber()
         {
-            get { return IExecuteWithSignature<int>("getDownlinkFrequencyKhz", "()I"); }
+            return IExecuteWithSignature<int>("getDownlinkChannelNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getDownlinkFrequencyKhz()"/>
         /// </summary>
-        public int NetworkType
+        /// <returns><see cref="int"/></returns>
+        public int GetDownlinkFrequencyKhz()
         {
-            get { return IExecuteWithSignature<int>("getNetworkType", "()I"); }
+            return IExecuteWithSignature<int>("getDownlinkFrequencyKhz", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getPhysicalCellId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getNetworkType()"/>
         /// </summary>
-        public int PhysicalCellId
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkType()
         {
-            get { return IExecuteWithSignature<int>("getPhysicalCellId", "()I"); }
+            return IExecuteWithSignature<int>("getNetworkType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getUplinkChannelNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getPhysicalCellId()"/>
         /// </summary>
-        public int UplinkChannelNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetPhysicalCellId()
         {
-            get { return IExecuteWithSignature<int>("getUplinkChannelNumber", "()I"); }
+            return IExecuteWithSignature<int>("getPhysicalCellId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getUplinkFrequencyKhz()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getUplinkChannelNumber()"/>
         /// </summary>
-        public int UplinkFrequencyKhz
+        /// <returns><see cref="int"/></returns>
+        public int GetUplinkChannelNumber()
         {
-            get { return IExecuteWithSignature<int>("getUplinkFrequencyKhz", "()I"); }
+            return IExecuteWithSignature<int>("getUplinkChannelNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#getUplinkFrequencyKhz()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetUplinkFrequencyKhz()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getUplinkFrequencyKhz", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/PhysicalChannelConfig.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/PreciseDataConnectionState.cs b/src/net/Netdroid/Generated/Android/Telephony/PreciseDataConnectionState.cs
index e507c3213..435d8fe33 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/PreciseDataConnectionState.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/PreciseDataConnectionState.cs
@@ -52,61 +52,68 @@ public partial class PreciseDataConnectionState
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getApnSetting()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getLinkProperties()"/>
         /// </summary>
-        public Android.Telephony.Data.ApnSetting ApnSetting
+        /// <returns><see cref="Android.Net.LinkProperties"/></returns>
+        public Android.Net.LinkProperties GetLinkProperties()
         {
-            get { return IExecuteWithSignature<Android.Telephony.Data.ApnSetting>("getApnSetting", "()Landroid/telephony/data/ApnSetting;"); }
+            return IExecuteWithSignature<Android.Net.LinkProperties>("getLinkProperties", "()Landroid/net/LinkProperties;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getApnSetting()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="Android.Telephony.Data.ApnSetting"/></returns>
+        public Android.Telephony.Data.ApnSetting GetApnSetting()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.Telephony.Data.ApnSetting>("getApnSetting", "()Landroid/telephony/data/ApnSetting;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getLastCauseCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#describeContents()"/>
         /// </summary>
-        public int LastCauseCode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getLastCauseCode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getLinkProperties()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getId()"/>
         /// </summary>
-        public Android.Net.LinkProperties LinkProperties
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            get { return IExecuteWithSignature<Android.Net.LinkProperties>("getLinkProperties", "()Landroid/net/LinkProperties;"); }
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getLastCauseCode()"/>
         /// </summary>
-        public int NetworkType
+        /// <returns><see cref="int"/></returns>
+        public int GetLastCauseCode()
         {
-            get { return IExecuteWithSignature<int>("getNetworkType", "()I"); }
+            return IExecuteWithSignature<int>("getLastCauseCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getNetworkType()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkType()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getNetworkType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getTransportType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getState()"/>
         /// </summary>
-        public int TransportType
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<int>("getTransportType", "()I"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#getTransportType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetTransportType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getTransportType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/PreciseDataConnectionState.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/RadioAccessSpecifier.cs b/src/net/Netdroid/Generated/Android/Telephony/RadioAccessSpecifier.cs
index 299fb3ca6..3441c0210 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/RadioAccessSpecifier.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/RadioAccessSpecifier.cs
@@ -62,33 +62,36 @@ public RadioAccessSpecifier(int arg0, int[] arg1, int[] arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#getBands()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#describeContents()"/>
         /// </summary>
-        public int[] Bands
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<int>("getBands", "()[I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#getChannels()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#getRadioAccessNetwork()"/>
         /// </summary>
-        public int[] Channels
+        /// <returns><see cref="int"/></returns>
+        public int GetRadioAccessNetwork()
         {
-            get { return IExecuteWithSignatureArray<int>("getChannels", "()[I"); }
+            return IExecuteWithSignature<int>("getRadioAccessNetwork", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#getRadioAccessNetwork()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#getBands()"/>
         /// </summary>
-        public int RadioAccessNetwork
+        /// <returns><see cref="int"/></returns>
+        public int[] GetBands()
         {
-            get { return IExecuteWithSignature<int>("getRadioAccessNetwork", "()I"); }
+            return IExecuteWithSignatureArray<int>("getBands", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#getChannels()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int[] GetChannels()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<int>("getChannels", "()[I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/RadioAccessSpecifier.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/ServiceState.cs b/src/net/Netdroid/Generated/Android/Telephony/ServiceState.cs
index 64c7fe2c7..6efbc44ee 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/ServiceState.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/ServiceState.cs
@@ -33,7 +33,7 @@ public partial class ServiceState
         /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#%3Cinit%3E(android.os.Parcel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ServiceState(Android.Os.Parcel arg0)
             : base(arg0)
         {
@@ -117,104 +117,124 @@ public ServiceState(Android.Telephony.ServiceState arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getCdmaNetworkId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getIsManualSelection()"/>
         /// </summary>
-        public int CdmaNetworkId
+        /// <returns><see cref="bool"/></returns>
+        public bool GetIsManualSelection()
         {
-            get { return IExecuteWithSignature<int>("getCdmaNetworkId", "()I"); }
+            return IExecuteWithSignature<bool>("getIsManualSelection", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getCdmaSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getRoaming()"/>
         /// </summary>
-        public int CdmaSystemId
+        /// <returns><see cref="bool"/></returns>
+        public bool GetRoaming()
         {
-            get { return IExecuteWithSignature<int>("getCdmaSystemId", "()I"); }
+            return IExecuteWithSignature<bool>("getRoaming", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getCellBandwidths()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#isSearching()"/>
         /// </summary>
-        public int[] CellBandwidths
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSearching()
         {
-            get { return IExecuteWithSignatureArray<int>("getCellBandwidths", "()[I"); }
+            return IExecuteWithSignature<bool>("isSearching", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getChannelNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#describeContents()"/>
         /// </summary>
-        public int ChannelNumber
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getChannelNumber", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getDuplexMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getCdmaNetworkId()"/>
         /// </summary>
-        public int DuplexMode
+        /// <returns><see cref="int"/></returns>
+        public int GetCdmaNetworkId()
         {
-            get { return IExecuteWithSignature<int>("getDuplexMode", "()I"); }
+            return IExecuteWithSignature<int>("getCdmaNetworkId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getIsManualSelection()"/> <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#setIsManualSelection(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getCdmaSystemId()"/>
         /// </summary>
-        public bool IsManualSelection
+        /// <returns><see cref="int"/></returns>
+        public int GetCdmaSystemId()
         {
-            get { return IExecuteWithSignature<bool>("getIsManualSelection", "()Z"); } set { IExecuteWithSignature("setIsManualSelection", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getCdmaSystemId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getNetworkRegistrationInfoList()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getChannelNumber()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.NetworkRegistrationInfo> NetworkRegistrationInfoList
+        /// <returns><see cref="int"/></returns>
+        public int GetChannelNumber()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.NetworkRegistrationInfo>>("getNetworkRegistrationInfoList", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getChannelNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getOperatorAlphaLong()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getDuplexMode()"/>
         /// </summary>
-        public Java.Lang.String OperatorAlphaLong
+        /// <returns><see cref="int"/></returns>
+        public int GetDuplexMode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOperatorAlphaLong", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getDuplexMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getOperatorAlphaShort()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getState()"/>
         /// </summary>
-        public Java.Lang.String OperatorAlphaShort
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOperatorAlphaShort", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getOperatorNumeric()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getCellBandwidths()"/>
         /// </summary>
-        public Java.Lang.String OperatorNumeric
+        /// <returns><see cref="int"/></returns>
+        public int[] GetCellBandwidths()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOperatorNumeric", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<int>("getCellBandwidths", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getRoaming()"/> <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#setRoaming(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getOperatorAlphaLong()"/>
         /// </summary>
-        public bool Roaming
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOperatorAlphaLong()
         {
-            get { return IExecuteWithSignature<bool>("getRoaming", "()Z"); } set { IExecuteWithSignature("setRoaming", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getOperatorAlphaLong", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getState()"/> <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#setState(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getOperatorAlphaShort()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOperatorAlphaShort()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); } set { IExecuteWithSignature("setState", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getOperatorAlphaShort", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#isSearching()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getOperatorNumeric()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSearching()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOperatorNumeric()
         {
-            return IExecuteWithSignature<bool>("isSearching", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getOperatorNumeric", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#getNetworkRegistrationInfoList()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.NetworkRegistrationInfo> GetNetworkRegistrationInfoList()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.NetworkRegistrationInfo>>("getNetworkRegistrationInfoList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#setIsManualSelection(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetIsManualSelection(bool arg0)
+        {
+            IExecuteWithSignature("setIsManualSelection", "(Z)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#setOperatorName(java.lang.String,java.lang.String,java.lang.String)"/>
@@ -227,6 +247,22 @@ public void SetOperatorName(Java.Lang.String arg0, Java.Lang.String arg1, Java.L
             IExecute("setOperatorName", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#setRoaming(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetRoaming(bool arg0)
+        {
+            IExecuteWithSignature("setRoaming", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#setState(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetState(int arg0)
+        {
+            IExecuteWithSignature("setState", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/ServiceState.html#setStateOff()"/>
         /// </summary>
         public void SetStateOff()
diff --git a/src/net/Netdroid/Generated/Android/Telephony/SignalStrength.cs b/src/net/Netdroid/Generated/Android/Telephony/SignalStrength.cs
index 5823edecf..ffe0da217 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/SignalStrength.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/SignalStrength.cs
@@ -66,108 +66,118 @@ public SignalStrength(Android.Telephony.SignalStrength arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getCdmaDbm()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getCellSignalStrengths(java.lang.Class)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int CdmaDbm
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"><see cref="Android.Telephony.CellSignalStrength"/></typeparam>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<T> GetCellSignalStrengths<T>(Java.Lang.Class arg0) where T : Android.Telephony.CellSignalStrength
         {
-            get { return IExecuteWithSignature<int>("getCdmaDbm", "()I"); }
+            return IExecute<Java.Util.List<T>>("getCellSignalStrengths", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getCdmaEcio()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#isGsm()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int CdmaEcio
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsGsm()
         {
-            get { return IExecuteWithSignature<int>("getCdmaEcio", "()I"); }
+            return IExecuteWithSignature<bool>("isGsm", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getCellSignalStrengths()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.CellSignalStrength> CellSignalStrengths
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.CellSignalStrength>>("getCellSignalStrengths", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getEvdoDbm()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getCdmaDbm()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int EvdoDbm
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetCdmaDbm()
         {
-            get { return IExecuteWithSignature<int>("getEvdoDbm", "()I"); }
+            return IExecuteWithSignature<int>("getCdmaDbm", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getEvdoEcio()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getCdmaEcio()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int EvdoEcio
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetCdmaEcio()
         {
-            get { return IExecuteWithSignature<int>("getEvdoEcio", "()I"); }
+            return IExecuteWithSignature<int>("getCdmaEcio", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getEvdoSnr()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getEvdoDbm()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int EvdoSnr
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetEvdoDbm()
         {
-            get { return IExecuteWithSignature<int>("getEvdoSnr", "()I"); }
+            return IExecuteWithSignature<int>("getEvdoDbm", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getGsmBitErrorRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getEvdoEcio()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int GsmBitErrorRate
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetEvdoEcio()
         {
-            get { return IExecuteWithSignature<int>("getGsmBitErrorRate", "()I"); }
+            return IExecuteWithSignature<int>("getEvdoEcio", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getGsmSignalStrength()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getEvdoSnr()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int GsmSignalStrength
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetEvdoSnr()
         {
-            get { return IExecuteWithSignature<int>("getGsmSignalStrength", "()I"); }
+            return IExecuteWithSignature<int>("getEvdoSnr", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getLevel()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getGsmBitErrorRate()"/>
         /// </summary>
-        public int Level
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetGsmBitErrorRate()
         {
-            get { return IExecuteWithSignature<int>("getLevel", "()I"); }
+            return IExecuteWithSignature<int>("getGsmBitErrorRate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getTimestampMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getGsmSignalStrength()"/>
         /// </summary>
-        public long TimestampMillis
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetGsmSignalStrength()
         {
-            get { return IExecuteWithSignature<long>("getTimestampMillis", "()J"); }
+            return IExecuteWithSignature<int>("getGsmSignalStrength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getCellSignalStrengths(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getLevel()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Android.Telephony.CellSignalStrength"/></typeparam>
-        /// <returns><see cref="Java.Util.List"/></returns>
-        public Java.Util.List<T> GetCellSignalStrengths<T>(Java.Lang.Class arg0) where T: Android.Telephony.CellSignalStrength
+        /// <returns><see cref="int"/></returns>
+        public int GetLevel()
         {
-            return IExecuteWithSignature<Java.Util.List<T>>("getCellSignalStrengths", "(Ljava/lang/Class;)Ljava/util/List;", arg0);
+            return IExecuteWithSignature<int>("getLevel", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#isGsm()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getCellSignalStrengths()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsGsm()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.CellSignalStrength> GetCellSignalStrengths()
         {
-            return IExecuteWithSignature<bool>("isGsm", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.CellSignalStrength>>("getCellSignalStrengths", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#getTimestampMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestampMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTimestampMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SignalStrength.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/SignalStrengthUpdateRequest.cs b/src/net/Netdroid/Generated/Android/Telephony/SignalStrengthUpdateRequest.cs
index 9e8241a61..7fbc422b7 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/SignalStrengthUpdateRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/SignalStrengthUpdateRequest.cs
@@ -52,13 +52,6 @@ public partial class SignalStrengthUpdateRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrengthUpdateRequest.html#getSignalThresholdInfos()"/> 
-        /// </summary>
-        public Java.Util.Collection<Android.Telephony.SignalThresholdInfo> SignalThresholdInfos
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Telephony.SignalThresholdInfo>>("getSignalThresholdInfos", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SignalStrengthUpdateRequest.html#isReportingRequestedWhileIdle()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -75,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalStrengthUpdateRequest.html#getSignalThresholdInfos()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Telephony.SignalThresholdInfo> GetSignalThresholdInfos()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Android.Telephony.SignalThresholdInfo>>("getSignalThresholdInfos", "()Ljava/util/Collection;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SignalStrengthUpdateRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/SignalThresholdInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/SignalThresholdInfo.cs
index 03ebceaf9..cc228cf91 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/SignalThresholdInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/SignalThresholdInfo.cs
@@ -108,58 +108,64 @@ public partial class SignalThresholdInfo
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getMaximumNumberOfThresholdsAllowed()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getMaximumNumberOfThresholdsAllowed()"/>
         /// </summary>
-        public static int MaximumNumberOfThresholdsAllowed
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaximumNumberOfThresholdsAllowed()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumNumberOfThresholdsAllowed", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumNumberOfThresholdsAllowed", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getMinimumNumberOfThresholdsAllowed()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getMinimumNumberOfThresholdsAllowed()"/>
         /// </summary>
-        public static int MinimumNumberOfThresholdsAllowed
+        /// <returns><see cref="int"/></returns>
+        public static int GetMinimumNumberOfThresholdsAllowed()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMinimumNumberOfThresholdsAllowed", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMinimumNumberOfThresholdsAllowed", "()I");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getHysteresisDb()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#describeContents()"/>
         /// </summary>
-        public int HysteresisDb
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getHysteresisDb", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getRadioAccessNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getHysteresisDb()"/>
         /// </summary>
-        public int RadioAccessNetworkType
+        /// <returns><see cref="int"/></returns>
+        public int GetHysteresisDb()
         {
-            get { return IExecuteWithSignature<int>("getRadioAccessNetworkType", "()I"); }
+            return IExecuteWithSignature<int>("getHysteresisDb", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getSignalMeasurementType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getRadioAccessNetworkType()"/>
         /// </summary>
-        public int SignalMeasurementType
+        /// <returns><see cref="int"/></returns>
+        public int GetRadioAccessNetworkType()
         {
-            get { return IExecuteWithSignature<int>("getSignalMeasurementType", "()I"); }
+            return IExecuteWithSignature<int>("getRadioAccessNetworkType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getThresholds()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getSignalMeasurementType()"/>
         /// </summary>
-        public int[] Thresholds
+        /// <returns><see cref="int"/></returns>
+        public int GetSignalMeasurementType()
         {
-            get { return IExecuteWithSignatureArray<int>("getThresholds", "()[I"); }
+            return IExecuteWithSignature<int>("getSignalMeasurementType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#getThresholds()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int[] GetThresholds()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<int>("getThresholds", "()[I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SignalThresholdInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/SmsManager.cs b/src/net/Netdroid/Generated/Android/Telephony/SmsManager.cs
index 16dec6acf..a290e18f7 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/SmsManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/SmsManager.cs
@@ -948,61 +948,43 @@ public partial class SmsManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getDefault()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getDefault()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Android.Telephony.SmsManager Default
-        {
-            get { return SExecuteWithSignature<Android.Telephony.SmsManager>(LocalBridgeClazz, "getDefault", "()Landroid/telephony/SmsManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getDefaultSmsSubscriptionId()"/> 
-        /// </summary>
-        public static int DefaultSmsSubscriptionId
+        /// <returns><see cref="Android.Telephony.SmsManager"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Telephony.SmsManager GetDefault()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultSmsSubscriptionId", "()I"); }
+            return SExecuteWithSignature<Android.Telephony.SmsManager>(LocalBridgeClazz, "getDefault", "()Landroid/telephony/SmsManager;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getSmsManagerForSubscriptionId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Telephony.SmsManager"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Telephony.SmsManager GetSmsManagerForSubscriptionId(int arg0)
         {
             return SExecuteWithSignature<Android.Telephony.SmsManager>(LocalBridgeClazz, "getSmsManagerForSubscriptionId", "(I)Landroid/telephony/SmsManager;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getCarrierConfigValues()"/> 
-        /// </summary>
-        public Android.Os.Bundle CarrierConfigValues
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getCarrierConfigValues", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getSmscAddress()"/> 
-        /// </summary>
-        public Java.Lang.String SmscAddress
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSmscAddress", "()Ljava/lang/String;"); }
-        }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getSmsCapacityOnIcc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getDefaultSmsSubscriptionId()"/>
         /// </summary>
-        public int SmsCapacityOnIcc
+        /// <returns><see cref="int"/></returns>
+        public static int GetDefaultSmsSubscriptionId()
         {
-            get { return IExecuteWithSignature<int>("getSmsCapacityOnIcc", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultSmsSubscriptionId", "()I");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getSubscriptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getCarrierConfigValues()"/>
         /// </summary>
-        public int SubscriptionId
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetCarrierConfigValues()
         {
-            get { return IExecuteWithSignature<int>("getSubscriptionId", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getCarrierConfigValues", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#createForSubscriptionId(int)"/>
@@ -1023,6 +1005,22 @@ public bool SetSmscAddress(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("setSmscAddress", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getSmsCapacityOnIcc()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSmsCapacityOnIcc()
+        {
+            return IExecuteWithSignature<int>("getSmsCapacityOnIcc", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getSubscriptionId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSubscriptionId()
+        {
+            return IExecuteWithSignature<int>("getSubscriptionId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#createAppSpecificSmsToken(android.app.PendingIntent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.PendingIntent"/></param>
@@ -1042,6 +1040,14 @@ public Java.Lang.String CreateAppSpecificSmsTokenWithPackageInfo(Java.Lang.Strin
             return IExecute<Java.Lang.String>("createAppSpecificSmsTokenWithPackageInfo", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#getSmscAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSmscAddress()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSmscAddress", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SmsManager.html#divideMessage(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/SmsMessage.cs b/src/net/Netdroid/Generated/Android/Telephony/SmsMessage.cs
index 7b060e808..7b4e70928 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/SmsMessage.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/SmsMessage.cs
@@ -122,7 +122,7 @@ public static Android.Telephony.SmsMessage CreateFromPdu(byte[] arg0, Java.Lang.
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Android.Telephony.SmsMessage"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Telephony.SmsMessage CreateFromPdu(byte[] arg0)
         {
             return SExecuteWithSignature<Android.Telephony.SmsMessage>(LocalBridgeClazz, "createFromPdu", "([B)Landroid/telephony/SmsMessage;", new object[] { arg0 });
@@ -186,196 +186,214 @@ public static int[] CalculateLength(Java.Lang.String arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getDisplayMessageBody()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getMessageClass()"/>
         /// </summary>
-        public Java.Lang.String DisplayMessageBody
+        /// <returns><see cref="Android.Telephony.SmsMessage.MessageClass"/></returns>
+        public Android.Telephony.SmsMessage.MessageClass GetMessageClass()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayMessageBody", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Telephony.SmsMessage.MessageClass>("getMessageClass", "()Landroid/telephony/SmsMessage$MessageClass;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getDisplayOriginatingAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isCphsMwiMessage()"/>
         /// </summary>
-        public Java.Lang.String DisplayOriginatingAddress
+        /// <returns><see cref="bool"/></returns>
+        public bool IsCphsMwiMessage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayOriginatingAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isCphsMwiMessage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getEmailBody()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isEmail()"/>
         /// </summary>
-        public Java.Lang.String EmailBody
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEmail()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEmailBody", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isEmail", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getEmailFrom()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isMWIClearMessage()"/>
         /// </summary>
-        public Java.Lang.String EmailFrom
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMWIClearMessage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEmailFrom", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isMWIClearMessage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getMessageClass()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isMwiDontStore()"/>
         /// </summary>
-        public Android.Telephony.SmsMessage.MessageClass GetMessageClass
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMwiDontStore()
         {
-            get { return IExecuteWithSignature<Android.Telephony.SmsMessage.MessageClass>("getMessageClass", "()Landroid/telephony/SmsMessage$MessageClass;"); }
+            return IExecuteWithSignature<bool>("isMwiDontStore", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getIndexOnIcc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isMWISetMessage()"/>
         /// </summary>
-        public int IndexOnIcc
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMWISetMessage()
         {
-            get { return IExecuteWithSignature<int>("getIndexOnIcc", "()I"); }
+            return IExecuteWithSignature<bool>("isMWISetMessage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getIndexOnSim()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isReplace()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int IndexOnSim
+        /// <returns><see cref="bool"/></returns>
+        public bool IsReplace()
         {
-            get { return IExecuteWithSignature<int>("getIndexOnSim", "()I"); }
+            return IExecuteWithSignature<bool>("isReplace", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getMessageBody()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isReplyPathPresent()"/>
         /// </summary>
-        public Java.Lang.String MessageBody
+        /// <returns><see cref="bool"/></returns>
+        public bool IsReplyPathPresent()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMessageBody", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isReplyPathPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getOriginatingAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isStatusReportMessage()"/>
         /// </summary>
-        public Java.Lang.String OriginatingAddress
+        /// <returns><see cref="bool"/></returns>
+        public bool IsStatusReportMessage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOriginatingAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isStatusReportMessage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getPdu()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getPdu()"/>
         /// </summary>
-        public byte[] Pdu
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetPdu()
         {
-            get { return IExecuteWithSignatureArray<byte>("getPdu", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getPdu", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getProtocolIdentifier()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getUserData()"/>
         /// </summary>
-        public int ProtocolIdentifier
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetUserData()
         {
-            get { return IExecuteWithSignature<int>("getProtocolIdentifier", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getUserData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getPseudoSubject()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getIndexOnIcc()"/>
         /// </summary>
-        public Java.Lang.String PseudoSubject
+        /// <returns><see cref="int"/></returns>
+        public int GetIndexOnIcc()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPseudoSubject", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getIndexOnIcc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getServiceCenterAddress()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getIndexOnSim()"/>
         /// </summary>
-        public Java.Lang.String ServiceCenterAddress
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetIndexOnSim()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceCenterAddress", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getIndexOnSim", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getProtocolIdentifier()"/>
         /// </summary>
-        public int Status
+        /// <returns><see cref="int"/></returns>
+        public int GetProtocolIdentifier()
         {
-            get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+            return IExecuteWithSignature<int>("getProtocolIdentifier", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getStatusOnIcc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getStatus()"/>
         /// </summary>
-        public int StatusOnIcc
+        /// <returns><see cref="int"/></returns>
+        public int GetStatus()
         {
-            get { return IExecuteWithSignature<int>("getStatusOnIcc", "()I"); }
+            return IExecuteWithSignature<int>("getStatus", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getStatusOnSim()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getStatusOnIcc()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int StatusOnSim
+        /// <returns><see cref="int"/></returns>
+        public int GetStatusOnIcc()
         {
-            get { return IExecuteWithSignature<int>("getStatusOnSim", "()I"); }
+            return IExecuteWithSignature<int>("getStatusOnIcc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getTimestampMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getStatusOnSim()"/>
         /// </summary>
-        public long TimestampMillis
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetStatusOnSim()
         {
-            get { return IExecuteWithSignature<long>("getTimestampMillis", "()J"); }
+            return IExecuteWithSignature<int>("getStatusOnSim", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getUserData()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getDisplayMessageBody()"/>
         /// </summary>
-        public byte[] UserData
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayMessageBody()
         {
-            get { return IExecuteWithSignatureArray<byte>("getUserData", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayMessageBody", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isCphsMwiMessage()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getDisplayOriginatingAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsCphsMwiMessage()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayOriginatingAddress()
         {
-            return IExecuteWithSignature<bool>("isCphsMwiMessage", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayOriginatingAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isEmail()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getEmailBody()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEmail()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEmailBody()
         {
-            return IExecuteWithSignature<bool>("isEmail", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getEmailBody", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isMWIClearMessage()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getEmailFrom()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMWIClearMessage()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEmailFrom()
         {
-            return IExecuteWithSignature<bool>("isMWIClearMessage", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getEmailFrom", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isMwiDontStore()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getMessageBody()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMwiDontStore()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMessageBody()
         {
-            return IExecuteWithSignature<bool>("isMwiDontStore", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getMessageBody", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isMWISetMessage()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getOriginatingAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMWISetMessage()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOriginatingAddress()
         {
-            return IExecuteWithSignature<bool>("isMWISetMessage", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getOriginatingAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isReplace()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getPseudoSubject()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsReplace()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPseudoSubject()
         {
-            return IExecuteWithSignature<bool>("isReplace", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPseudoSubject", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isReplyPathPresent()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getServiceCenterAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsReplyPathPresent()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServiceCenterAddress()
         {
-            return IExecuteWithSignature<bool>("isReplyPathPresent", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getServiceCenterAddress", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#isStatusReportMessage()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SmsMessage.html#getTimestampMillis()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsStatusReportMessage()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimestampMillis()
         {
-            return IExecuteWithSignature<bool>("isStatusReportMessage", "()Z");
+            return IExecuteWithSignature<long>("getTimestampMillis", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Telephony/SubscriptionInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/SubscriptionInfo.cs
index e3cc5c0ef..4ad46aa16 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/SubscriptionInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/SubscriptionInfo.cs
@@ -52,173 +52,192 @@ public partial class SubscriptionInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getCardId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#createIconBitmap(android.content.Context)"/>
         /// </summary>
-        public int CardId
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap CreateIconBitmap(Android.Content.Context arg0)
         {
-            get { return IExecuteWithSignature<int>("getCardId", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("createIconBitmap", "(Landroid/content/Context;)Landroid/graphics/Bitmap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getCarrierId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getGroupUuid()"/>
         /// </summary>
-        public int CarrierId
+        /// <returns><see cref="Android.Os.ParcelUuid"/></returns>
+        public Android.Os.ParcelUuid GetGroupUuid()
         {
-            get { return IExecuteWithSignature<int>("getCarrierId", "()I"); }
+            return IExecuteWithSignature<Android.Os.ParcelUuid>("getGroupUuid", "()Landroid/os/ParcelUuid;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getCarrierName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#isEmbedded()"/>
         /// </summary>
-        public Java.Lang.CharSequence CarrierName
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEmbedded()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCarrierName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isEmbedded", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getCountryIso()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#isOpportunistic()"/>
         /// </summary>
-        public Java.Lang.String CountryIso
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOpportunistic()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCountryIso", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isOpportunistic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getDataRoaming()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#describeContents()"/>
         /// </summary>
-        public int DataRoaming
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDataRoaming", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getCardId()"/>
         /// </summary>
-        public Java.Lang.CharSequence DisplayName
+        /// <returns><see cref="int"/></returns>
+        public int GetCardId()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDisplayName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getCardId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getGroupUuid()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getCarrierId()"/>
         /// </summary>
-        public Android.Os.ParcelUuid GroupUuid
+        /// <returns><see cref="int"/></returns>
+        public int GetCarrierId()
         {
-            get { return IExecuteWithSignature<Android.Os.ParcelUuid>("getGroupUuid", "()Landroid/os/ParcelUuid;"); }
+            return IExecuteWithSignature<int>("getCarrierId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getIccId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getDataRoaming()"/>
         /// </summary>
-        public Java.Lang.String IccId
+        /// <returns><see cref="int"/></returns>
+        public int GetDataRoaming()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIccId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getDataRoaming", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getIconTint()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getIconTint()"/>
         /// </summary>
-        public int IconTint
+        /// <returns><see cref="int"/></returns>
+        public int GetIconTint()
         {
-            get { return IExecuteWithSignature<int>("getIconTint", "()I"); }
+            return IExecuteWithSignature<int>("getIconTint", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getMcc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getMcc()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mcc
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMcc()
         {
-            get { return IExecuteWithSignature<int>("getMcc", "()I"); }
+            return IExecuteWithSignature<int>("getMcc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getMccString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getMnc()"/>
         /// </summary>
-        public Java.Lang.String MccString
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMnc()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getMnc", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getMnc()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getPortIndex()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mnc
+        /// <returns><see cref="int"/></returns>
+        public int GetPortIndex()
         {
-            get { return IExecuteWithSignature<int>("getMnc", "()I"); }
+            return IExecuteWithSignature<int>("getPortIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getMncString()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getSimSlotIndex()"/>
         /// </summary>
-        public Java.Lang.String MncString
+        /// <returns><see cref="int"/></returns>
+        public int GetSimSlotIndex()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getSimSlotIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getSubscriptionId()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Number
+        /// <returns><see cref="int"/></returns>
+        public int GetSubscriptionId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNumber", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getSubscriptionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getPortIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getSubscriptionType()"/>
         /// </summary>
-        public int PortIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetSubscriptionType()
         {
-            get { return IExecuteWithSignature<int>("getPortIndex", "()I"); }
+            return IExecuteWithSignature<int>("getSubscriptionType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getSimSlotIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getUsageSetting()"/>
         /// </summary>
-        public int SimSlotIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetUsageSetting()
         {
-            get { return IExecuteWithSignature<int>("getSimSlotIndex", "()I"); }
+            return IExecuteWithSignature<int>("getUsageSetting", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getSubscriptionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getCarrierName()"/>
         /// </summary>
-        public int SubscriptionId
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetCarrierName()
         {
-            get { return IExecuteWithSignature<int>("getSubscriptionId", "()I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getCarrierName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getSubscriptionType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getDisplayName()"/>
         /// </summary>
-        public int SubscriptionType
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDisplayName()
         {
-            get { return IExecuteWithSignature<int>("getSubscriptionType", "()I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDisplayName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getUsageSetting()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getCountryIso()"/>
         /// </summary>
-        public int UsageSetting
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCountryIso()
         {
-            get { return IExecuteWithSignature<int>("getUsageSetting", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCountryIso", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#createIconBitmap(android.content.Context)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getIccId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-        public Android.Graphics.Bitmap CreateIconBitmap(Android.Content.Context arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetIccId()
         {
-            return IExecuteWithSignature<Android.Graphics.Bitmap>("createIconBitmap", "(Landroid/content/Context;)Landroid/graphics/Bitmap;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getIccId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#isEmbedded()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getMccString()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEmbedded()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMccString()
         {
-            return IExecuteWithSignature<bool>("isEmbedded", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getMccString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#isOpportunistic()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getMncString()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOpportunistic()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMncString()
         {
-            return IExecuteWithSignature<bool>("isOpportunistic", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getMncString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#getNumber()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetNumber()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getNumber", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/SubscriptionManager.cs b/src/net/Netdroid/Generated/Android/Telephony/SubscriptionManager.cs
index ea22a2da7..f174441d1 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/SubscriptionManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/SubscriptionManager.cs
@@ -198,46 +198,11 @@ public partial class SubscriptionManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getActiveDataSubscriptionId()"/> 
-        /// </summary>
-        public static int ActiveDataSubscriptionId
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getActiveDataSubscriptionId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDefaultDataSubscriptionId()"/> 
-        /// </summary>
-        public static int DefaultDataSubscriptionId
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultDataSubscriptionId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDefaultSmsSubscriptionId()"/> 
-        /// </summary>
-        public static int DefaultSmsSubscriptionId
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultSmsSubscriptionId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDefaultSubscriptionId()"/> 
-        /// </summary>
-        public static int DefaultSubscriptionId
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultSubscriptionId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDefaultVoiceSubscriptionId()"/> 
-        /// </summary>
-        public static int DefaultVoiceSubscriptionId
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultVoiceSubscriptionId", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#from(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Android.Telephony.SubscriptionManager"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Telephony.SubscriptionManager From(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<Android.Telephony.SubscriptionManager>(LocalBridgeClazz, "from", "(Landroid/content/Context;)Landroid/telephony/SubscriptionManager;", arg0);
@@ -261,76 +226,67 @@ public static bool IsValidSubscriptionId(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isValidSubscriptionId", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getSlotIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getActiveDataSubscriptionId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public static int GetSlotIndex(int arg0)
+        public static int GetActiveDataSubscriptionId()
         {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "getSlotIndex", "(I)I", arg0);
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getActiveDataSubscriptionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getSubscriptionId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDefaultDataSubscriptionId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public static int GetSubscriptionId(int arg0)
+        public static int GetDefaultDataSubscriptionId()
         {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "getSubscriptionId", "(I)I", arg0);
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultDataSubscriptionId", "()I");
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getAccessibleSubscriptionInfoList()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDefaultSmsSubscriptionId()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.SubscriptionInfo> AccessibleSubscriptionInfoList
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getAccessibleSubscriptionInfoList", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getActiveSubscriptionInfoCount()"/> 
-        /// </summary>
-        public int ActiveSubscriptionInfoCount
-        {
-            get { return IExecuteWithSignature<int>("getActiveSubscriptionInfoCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getActiveSubscriptionInfoCountMax()"/> 
-        /// </summary>
-        public int ActiveSubscriptionInfoCountMax
+        /// <returns><see cref="int"/></returns>
+        public static int GetDefaultSmsSubscriptionId()
         {
-            get { return IExecuteWithSignature<int>("getActiveSubscriptionInfoCountMax", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultSmsSubscriptionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getActiveSubscriptionInfoList()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDefaultSubscriptionId()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.SubscriptionInfo> ActiveSubscriptionInfoList
+        /// <returns><see cref="int"/></returns>
+        public static int GetDefaultSubscriptionId()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getActiveSubscriptionInfoList", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultSubscriptionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getAllSubscriptionInfoList()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDefaultVoiceSubscriptionId()"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.SubscriptionInfo> AllSubscriptionInfoList
+        /// <returns><see cref="int"/></returns>
+        public static int GetDefaultVoiceSubscriptionId()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getAllSubscriptionInfoList", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getDefaultVoiceSubscriptionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getCompleteActiveSubscriptionInfoList()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getSlotIndex(int)"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.SubscriptionInfo> CompleteActiveSubscriptionInfoList
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public static int GetSlotIndex(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getCompleteActiveSubscriptionInfoList", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getSlotIndex", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getOpportunisticSubscriptions()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getSubscriptionId(int)"/>
         /// </summary>
-        public Java.Util.List<Android.Telephony.SubscriptionInfo> OpportunisticSubscriptions
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public static int GetSubscriptionId(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getOpportunisticSubscriptions", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getSubscriptionId", "(I)I", arg0);
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#createSubscriptionGroup(java.util.List)"/>
         /// </summary>
@@ -396,6 +352,22 @@ public bool SetOpportunistic(bool arg0, int arg1)
             return IExecute<bool>("setOpportunistic", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getActiveSubscriptionInfoCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetActiveSubscriptionInfoCount()
+        {
+            return IExecuteWithSignature<int>("getActiveSubscriptionInfoCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getActiveSubscriptionInfoCountMax()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetActiveSubscriptionInfoCountMax()
+        {
+            return IExecuteWithSignature<int>("getActiveSubscriptionInfoCountMax", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getDeviceToDeviceStatusSharingPreference(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -409,7 +381,7 @@ public int GetDeviceToDeviceStatusSharingPreference(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int[] GetSubscriptionIds(int arg0)
         {
             return IExecuteWithSignatureArray<int>("getSubscriptionIds", "(I)[I", arg0);
@@ -443,6 +415,46 @@ public Java.Lang.String GetPhoneNumber(int arg0)
             return IExecuteWithSignature<Java.Util.List<Android.Net.Uri>>("getDeviceToDeviceStatusSharingContacts", "(I)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getAccessibleSubscriptionInfoList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.SubscriptionInfo> GetAccessibleSubscriptionInfoList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getAccessibleSubscriptionInfoList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getActiveSubscriptionInfoList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.SubscriptionInfo> GetActiveSubscriptionInfoList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getActiveSubscriptionInfoList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getAllSubscriptionInfoList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.SubscriptionInfo> GetAllSubscriptionInfoList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getAllSubscriptionInfoList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getCompleteActiveSubscriptionInfoList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.SubscriptionInfo> GetCompleteActiveSubscriptionInfoList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getCompleteActiveSubscriptionInfoList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getOpportunisticSubscriptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.SubscriptionInfo> GetOpportunisticSubscriptions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.SubscriptionInfo>>("getOpportunisticSubscriptions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#getSubscriptionsInGroup(android.os.ParcelUuid)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.ParcelUuid"/></param>
@@ -473,7 +485,7 @@ public void AddOnOpportunisticSubscriptionsChangedListener(Java.Util.Concurrent.
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.html#addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.SubscriptionManager.OnSubscriptionsChangedListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddOnSubscriptionsChangedListener(Android.Telephony.SubscriptionManager.OnSubscriptionsChangedListener arg0)
         {
             IExecuteWithSignature("addOnSubscriptionsChangedListener", "(Landroid/telephony/SubscriptionManager$OnSubscriptionsChangedListener;)V", arg0);
@@ -605,7 +617,7 @@ public void SetSubscriptionPlans(int arg0, Java.Util.List<Android.Telephony.Subs
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSubscriptionPlans(int arg0, Java.Util.List<Android.Telephony.SubscriptionPlan> arg1)
         {
             IExecute("setSubscriptionPlans", arg0, arg1);
@@ -615,7 +627,7 @@ public void SetSubscriptionPlans(int arg0, Java.Util.List<Android.Telephony.Subs
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.App.PendingIntent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SwitchToSubscription(int arg0, Android.App.PendingIntent arg1)
         {
             IExecute("switchToSubscription", arg0, arg1);
@@ -643,70 +655,11 @@ public partial class OnOpportunisticSubscriptionsChangedListener
 
             #endregion
 
-            #region Instance methods
-            /// <summary>
-            /// Handlers initializer for <see cref="OnOpportunisticSubscriptionsChangedListener"/>
-            /// </summary>
-            protected virtual void InitializeHandlers()
-            {
-                AddEventHandler("onOpportunisticSubscriptionsChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnOpportunisticSubscriptionsChangedEventHandler));
-
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.OnOpportunisticSubscriptionsChangedListener.html#onOpportunisticSubscriptionsChanged()"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnOpportunisticSubscriptionsChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnOpportunisticSubscriptionsChanged { get; set; } = null;
-
-            void OnOpportunisticSubscriptionsChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-            {
-                var methodToExecute = (OnOnOpportunisticSubscriptionsChanged != null) ? OnOnOpportunisticSubscriptionsChanged : OnOpportunisticSubscriptionsChanged;
-                methodToExecute.Invoke();
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.OnOpportunisticSubscriptionsChangedListener.html#onOpportunisticSubscriptionsChanged()"/>
-            /// </summary>
-            public virtual void OnOpportunisticSubscriptionsChanged()
-            {
-                
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-        #region OnOpportunisticSubscriptionsChangedListenerDirect
-        public partial class OnOpportunisticSubscriptionsChangedListenerDirect
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
             #region Instance methods
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.OnOpportunisticSubscriptionsChangedListener.html#onOpportunisticSubscriptionsChanged()"/>
             /// </summary>
-            public override void OnOpportunisticSubscriptionsChanged()
+            public void OnOpportunisticSubscriptionsChanged()
             {
                 IExecuteWithSignature("onOpportunisticSubscriptionsChanged", "()V");
             }
@@ -740,70 +693,11 @@ public partial class OnSubscriptionsChangedListener
 
             #endregion
 
-            #region Instance methods
-            /// <summary>
-            /// Handlers initializer for <see cref="OnSubscriptionsChangedListener"/>
-            /// </summary>
-            protected virtual void InitializeHandlers()
-            {
-                AddEventHandler("onSubscriptionsChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnSubscriptionsChangedEventHandler));
-
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.OnSubscriptionsChangedListener.html#onSubscriptionsChanged()"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnSubscriptionsChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnSubscriptionsChanged { get; set; } = null;
-
-            void OnSubscriptionsChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-            {
-                var methodToExecute = (OnOnSubscriptionsChanged != null) ? OnOnSubscriptionsChanged : OnSubscriptionsChanged;
-                methodToExecute.Invoke();
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.OnSubscriptionsChangedListener.html#onSubscriptionsChanged()"/>
-            /// </summary>
-            public virtual void OnSubscriptionsChanged()
-            {
-                
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-        #region OnSubscriptionsChangedListenerDirect
-        public partial class OnSubscriptionsChangedListenerDirect
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
             #region Instance methods
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionManager.OnSubscriptionsChangedListener.html#onSubscriptionsChanged()"/>
             /// </summary>
-            public override void OnSubscriptionsChanged()
+            public void OnSubscriptionsChanged()
             {
                 IExecuteWithSignature("onSubscriptionsChanged", "()V");
             }
diff --git a/src/net/Netdroid/Generated/Android/Telephony/SubscriptionPlan.cs b/src/net/Netdroid/Generated/Android/Telephony/SubscriptionPlan.cs
index b4f95b287..533821635 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/SubscriptionPlan.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/SubscriptionPlan.cs
@@ -94,61 +94,68 @@ public partial class SubscriptionPlan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getDataLimitBehavior()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#describeContents()"/>
         /// </summary>
-        public int DataLimitBehavior
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDataLimitBehavior", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getDataLimitBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getDataLimitBehavior()"/>
         /// </summary>
-        public long DataLimitBytes
+        /// <returns><see cref="int"/></returns>
+        public int GetDataLimitBehavior()
         {
-            get { return IExecuteWithSignature<long>("getDataLimitBytes", "()J"); }
+            return IExecuteWithSignature<int>("getDataLimitBehavior", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getDataUsageBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getNetworkTypes()"/>
         /// </summary>
-        public long DataUsageBytes
+        /// <returns><see cref="int"/></returns>
+        public int[] GetNetworkTypes()
         {
-            get { return IExecuteWithSignature<long>("getDataUsageBytes", "()J"); }
+            return IExecuteWithSignatureArray<int>("getNetworkTypes", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getDataUsageTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getSummary()"/>
         /// </summary>
-        public long DataUsageTime
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSummary()
         {
-            get { return IExecuteWithSignature<long>("getDataUsageTime", "()J"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSummary", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getNetworkTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getTitle()"/>
         /// </summary>
-        public int[] NetworkTypes
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            get { return IExecuteWithSignatureArray<int>("getNetworkTypes", "()[I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getSummary()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getDataLimitBytes()"/>
         /// </summary>
-        public Java.Lang.CharSequence Summary
+        /// <returns><see cref="long"/></returns>
+        public long GetDataLimitBytes()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSummary", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<long>("getDataLimitBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getDataUsageBytes()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="long"/></returns>
+        public long GetDataUsageBytes()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<long>("getDataUsageBytes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#getDataUsageTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetDataUsageTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getDataUsageTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/SubscriptionPlan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/TelephonyCallback.cs b/src/net/Netdroid/Generated/Android/Telephony/TelephonyCallback.cs
index c1f59cf64..16bbec29a 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/TelephonyCallback.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/TelephonyCallback.cs
@@ -74,7 +74,7 @@ public partial class ActiveDataSubscriptionIdListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onActiveDataSubscriptionIdChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnActiveDataSubscriptionIdChangedEventHandler));
+                AddEventHandler("onActiveDataSubscriptionIdChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnActiveDataSubscriptionIdChangedEventHandler));
 
             }
 
@@ -82,7 +82,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.ActiveDataSubscriptionIdListener.html#onActiveDataSubscriptionIdChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnActiveDataSubscriptionIdChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnActiveDataSubscriptionIdChanged { get; set; } = null;
+            public global::System.Action<int> OnOnActiveDataSubscriptionIdChanged { get; set; } = null;
 
             void OnActiveDataSubscriptionIdChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -173,7 +173,7 @@ public partial class BarringInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onBarringInfoChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.BarringInfo>>>(OnBarringInfoChangedEventHandler));
+                AddEventHandler("onBarringInfoChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.BarringInfo>>>(OnBarringInfoChangedEventHandler));
 
             }
 
@@ -181,7 +181,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.BarringInfoListener.html#onBarringInfoChanged(android.telephony.BarringInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnBarringInfoChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Telephony.BarringInfo> OnOnBarringInfoChanged { get; set; } = null;
+            public global::System.Action<Android.Telephony.BarringInfo> OnOnBarringInfoChanged { get; set; } = null;
 
             void OnBarringInfoChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.BarringInfo>> data)
             {
@@ -272,7 +272,7 @@ public partial class CallDisconnectCauseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCallDisconnectCauseChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnCallDisconnectCauseChangedEventHandler));
+                AddEventHandler("onCallDisconnectCauseChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnCallDisconnectCauseChangedEventHandler));
 
             }
 
@@ -280,7 +280,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.CallDisconnectCauseListener.html#onCallDisconnectCauseChanged(int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCallDisconnectCauseChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, int> OnOnCallDisconnectCauseChanged { get; set; } = null;
+            public global::System.Action<int, int> OnOnCallDisconnectCauseChanged { get; set; } = null;
 
             void OnCallDisconnectCauseChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -373,7 +373,7 @@ public partial class CallForwardingIndicatorListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCallForwardingIndicatorChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnCallForwardingIndicatorChangedEventHandler));
+                AddEventHandler("onCallForwardingIndicatorChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnCallForwardingIndicatorChangedEventHandler));
 
             }
 
@@ -381,7 +381,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.CallForwardingIndicatorListener.html#onCallForwardingIndicatorChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCallForwardingIndicatorChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnCallForwardingIndicatorChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnCallForwardingIndicatorChanged { get; set; } = null;
 
             void OnCallForwardingIndicatorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -472,7 +472,7 @@ public partial class CallStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCallStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnCallStateChangedEventHandler));
+                AddEventHandler("onCallStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnCallStateChangedEventHandler));
 
             }
 
@@ -480,7 +480,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.CallStateListener.html#onCallStateChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCallStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnCallStateChanged { get; set; } = null;
+            public global::System.Action<int> OnOnCallStateChanged { get; set; } = null;
 
             void OnCallStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -571,7 +571,7 @@ public partial class CarrierNetworkListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCarrierNetworkChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnCarrierNetworkChangeEventHandler));
+                AddEventHandler("onCarrierNetworkChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnCarrierNetworkChangeEventHandler));
 
             }
 
@@ -579,7 +579,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.CarrierNetworkListener.html#onCarrierNetworkChange(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCarrierNetworkChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnCarrierNetworkChange { get; set; } = null;
+            public global::System.Action<bool> OnOnCarrierNetworkChange { get; set; } = null;
 
             void OnCarrierNetworkChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -670,7 +670,7 @@ public partial class CellInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCellInfoChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Telephony.CellInfo>>>>(OnCellInfoChangedEventHandler));
+                AddEventHandler("onCellInfoChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Telephony.CellInfo>>>>(OnCellInfoChangedEventHandler));
 
             }
 
@@ -678,7 +678,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.CellInfoListener.html#onCellInfoChanged(java.util.List)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCellInfoChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.List<Android.Telephony.CellInfo>> OnOnCellInfoChanged { get; set; } = null;
+            public global::System.Action<Java.Util.List<Android.Telephony.CellInfo>> OnOnCellInfoChanged { get; set; } = null;
 
             void OnCellInfoChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Telephony.CellInfo>>> data)
             {
@@ -769,7 +769,7 @@ public partial class CellLocationListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCellLocationChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.CellLocation>>>(OnCellLocationChangedEventHandler));
+                AddEventHandler("onCellLocationChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.CellLocation>>>(OnCellLocationChangedEventHandler));
 
             }
 
@@ -777,7 +777,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.CellLocationListener.html#onCellLocationChanged(android.telephony.CellLocation)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCellLocationChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Telephony.CellLocation> OnOnCellLocationChanged { get; set; } = null;
+            public global::System.Action<Android.Telephony.CellLocation> OnOnCellLocationChanged { get; set; } = null;
 
             void OnCellLocationChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.CellLocation>> data)
             {
@@ -868,7 +868,7 @@ public partial class DataActivationStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDataActivationStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataActivationStateChangedEventHandler));
+                AddEventHandler("onDataActivationStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataActivationStateChangedEventHandler));
 
             }
 
@@ -876,7 +876,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.DataActivationStateListener.html#onDataActivationStateChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDataActivationStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnDataActivationStateChanged { get; set; } = null;
+            public global::System.Action<int> OnOnDataActivationStateChanged { get; set; } = null;
 
             void OnDataActivationStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -967,7 +967,7 @@ public partial class DataActivityListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDataActivity", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataActivityEventHandler));
+                AddEventHandler("onDataActivity", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataActivityEventHandler));
 
             }
 
@@ -975,7 +975,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.DataActivityListener.html#onDataActivity(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDataActivity"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnDataActivity { get; set; } = null;
+            public global::System.Action<int> OnOnDataActivity { get; set; } = null;
 
             void OnDataActivityEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -1066,7 +1066,7 @@ public partial class DataConnectionStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDataConnectionStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataConnectionStateChangedEventHandler));
+                AddEventHandler("onDataConnectionStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnDataConnectionStateChangedEventHandler));
 
             }
 
@@ -1074,7 +1074,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.DataConnectionStateListener.html#onDataConnectionStateChanged(int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDataConnectionStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, int> OnOnDataConnectionStateChanged { get; set; } = null;
+            public global::System.Action<int, int> OnOnDataConnectionStateChanged { get; set; } = null;
 
             void OnDataConnectionStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -1167,7 +1167,7 @@ public partial class DisplayInfoListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDisplayInfoChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.TelephonyDisplayInfo>>>(OnDisplayInfoChangedEventHandler));
+                AddEventHandler("onDisplayInfoChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.TelephonyDisplayInfo>>>(OnDisplayInfoChangedEventHandler));
 
             }
 
@@ -1175,7 +1175,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.DisplayInfoListener.html#onDisplayInfoChanged(android.telephony.TelephonyDisplayInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDisplayInfoChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Telephony.TelephonyDisplayInfo> OnOnDisplayInfoChanged { get; set; } = null;
+            public global::System.Action<Android.Telephony.TelephonyDisplayInfo> OnOnDisplayInfoChanged { get; set; } = null;
 
             void OnDisplayInfoChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.TelephonyDisplayInfo>> data)
             {
@@ -1266,7 +1266,7 @@ public partial class EmergencyNumberListListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onEmergencyNumberListChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>>>>(OnEmergencyNumberListChangedEventHandler));
+                AddEventHandler("onEmergencyNumberListChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>>>>(OnEmergencyNumberListChangedEventHandler));
 
             }
 
@@ -1274,7 +1274,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.EmergencyNumberListListener.html#onEmergencyNumberListChanged(java.util.Map)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnEmergencyNumberListChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>> OnOnEmergencyNumberListChanged { get; set; } = null;
+            public global::System.Action<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>> OnOnEmergencyNumberListChanged { get; set; } = null;
 
             void OnEmergencyNumberListChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>>> data)
             {
@@ -1365,7 +1365,7 @@ public partial class ImsCallDisconnectCauseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onImsCallDisconnectCauseChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.Ims.ImsReasonInfo>>>(OnImsCallDisconnectCauseChangedEventHandler));
+                AddEventHandler("onImsCallDisconnectCauseChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.Ims.ImsReasonInfo>>>(OnImsCallDisconnectCauseChangedEventHandler));
 
             }
 
@@ -1373,7 +1373,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.ImsCallDisconnectCauseListener.html#onImsCallDisconnectCauseChanged(android.telephony.ims.ImsReasonInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnImsCallDisconnectCauseChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Telephony.Ims.ImsReasonInfo> OnOnImsCallDisconnectCauseChanged { get; set; } = null;
+            public global::System.Action<Android.Telephony.Ims.ImsReasonInfo> OnOnImsCallDisconnectCauseChanged { get; set; } = null;
 
             void OnImsCallDisconnectCauseChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.Ims.ImsReasonInfo>> data)
             {
@@ -1464,7 +1464,7 @@ public partial class MessageWaitingIndicatorListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMessageWaitingIndicatorChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnMessageWaitingIndicatorChangedEventHandler));
+                AddEventHandler("onMessageWaitingIndicatorChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnMessageWaitingIndicatorChangedEventHandler));
 
             }
 
@@ -1472,7 +1472,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.MessageWaitingIndicatorListener.html#onMessageWaitingIndicatorChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMessageWaitingIndicatorChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnMessageWaitingIndicatorChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnMessageWaitingIndicatorChanged { get; set; } = null;
 
             void OnMessageWaitingIndicatorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -1563,7 +1563,7 @@ public partial class PhysicalChannelConfigListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPhysicalChannelConfigChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Telephony.PhysicalChannelConfig>>>>(OnPhysicalChannelConfigChangedEventHandler));
+                AddEventHandler("onPhysicalChannelConfigChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Telephony.PhysicalChannelConfig>>>>(OnPhysicalChannelConfigChangedEventHandler));
 
             }
 
@@ -1571,7 +1571,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.PhysicalChannelConfigListener.html#onPhysicalChannelConfigChanged(java.util.List)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPhysicalChannelConfigChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.List<Android.Telephony.PhysicalChannelConfig>> OnOnPhysicalChannelConfigChanged { get; set; } = null;
+            public global::System.Action<Java.Util.List<Android.Telephony.PhysicalChannelConfig>> OnOnPhysicalChannelConfigChanged { get; set; } = null;
 
             void OnPhysicalChannelConfigChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.List<Android.Telephony.PhysicalChannelConfig>>> data)
             {
@@ -1662,7 +1662,7 @@ public partial class PreciseDataConnectionStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPreciseDataConnectionStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.PreciseDataConnectionState>>>(OnPreciseDataConnectionStateChangedEventHandler));
+                AddEventHandler("onPreciseDataConnectionStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.PreciseDataConnectionState>>>(OnPreciseDataConnectionStateChangedEventHandler));
 
             }
 
@@ -1670,7 +1670,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.PreciseDataConnectionStateListener.html#onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPreciseDataConnectionStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Telephony.PreciseDataConnectionState> OnOnPreciseDataConnectionStateChanged { get; set; } = null;
+            public global::System.Action<Android.Telephony.PreciseDataConnectionState> OnOnPreciseDataConnectionStateChanged { get; set; } = null;
 
             void OnPreciseDataConnectionStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.PreciseDataConnectionState>> data)
             {
@@ -1761,7 +1761,7 @@ public partial class RegistrationFailedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onRegistrationFailed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.CellIdentity>>>(OnRegistrationFailedEventHandler));
+                AddEventHandler("onRegistrationFailed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.CellIdentity>>>(OnRegistrationFailedEventHandler));
 
             }
 
@@ -1769,7 +1769,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.RegistrationFailedListener.html#onRegistrationFailed(android.telephony.CellIdentity,java.lang.String,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRegistrationFailed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Telephony.CellIdentity, Java.Lang.String, int, int, int> OnOnRegistrationFailed { get; set; } = null;
+            public global::System.Action<Android.Telephony.CellIdentity, Java.Lang.String, int, int, int> OnOnRegistrationFailed { get; set; } = null;
 
             void OnRegistrationFailedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.CellIdentity>> data)
             {
@@ -1868,7 +1868,7 @@ public partial class ServiceStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onServiceStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.ServiceState>>>(OnServiceStateChangedEventHandler));
+                AddEventHandler("onServiceStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.ServiceState>>>(OnServiceStateChangedEventHandler));
 
             }
 
@@ -1876,7 +1876,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.ServiceStateListener.html#onServiceStateChanged(android.telephony.ServiceState)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnServiceStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Telephony.ServiceState> OnOnServiceStateChanged { get; set; } = null;
+            public global::System.Action<Android.Telephony.ServiceState> OnOnServiceStateChanged { get; set; } = null;
 
             void OnServiceStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.ServiceState>> data)
             {
@@ -1967,7 +1967,7 @@ public partial class SignalStrengthsListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSignalStrengthsChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.SignalStrength>>>(OnSignalStrengthsChangedEventHandler));
+                AddEventHandler("onSignalStrengthsChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Telephony.SignalStrength>>>(OnSignalStrengthsChangedEventHandler));
 
             }
 
@@ -1975,7 +1975,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.SignalStrengthsListener.html#onSignalStrengthsChanged(android.telephony.SignalStrength)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSignalStrengthsChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Telephony.SignalStrength> OnOnSignalStrengthsChanged { get; set; } = null;
+            public global::System.Action<Android.Telephony.SignalStrength> OnOnSignalStrengthsChanged { get; set; } = null;
 
             void OnSignalStrengthsChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Telephony.SignalStrength>> data)
             {
@@ -2066,7 +2066,7 @@ public partial class UserMobileDataStateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onUserMobileDataStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnUserMobileDataStateChangedEventHandler));
+                AddEventHandler("onUserMobileDataStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnUserMobileDataStateChangedEventHandler));
 
             }
 
@@ -2074,7 +2074,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/telephony/TelephonyCallback.UserMobileDataStateListener.html#onUserMobileDataStateChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnUserMobileDataStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnUserMobileDataStateChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnUserMobileDataStateChanged { get; set; } = null;
 
             void OnUserMobileDataStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Telephony/TelephonyDisplayInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/TelephonyDisplayInfo.cs
index 0cdab08d8..73b39579d 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/TelephonyDisplayInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/TelephonyDisplayInfo.cs
@@ -76,7 +76,7 @@ public partial class TelephonyDisplayInfo
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE { get { if (!_OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVEReady) { _OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVEContent = SGetField<int>(LocalBridgeClazz, "OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE"); _OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVEReady = true; } return _OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVEContent; } }
         private static int _OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVEContent = default;
         private static bool _OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVEReady = false; // this is used because in case of generics 
@@ -89,34 +89,36 @@ public partial class TelephonyDisplayInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#getNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#isRoaming()"/>
         /// </summary>
-        public int NetworkType
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRoaming()
         {
-            get { return IExecuteWithSignature<int>("getNetworkType", "()I"); }
+            return IExecuteWithSignature<bool>("isRoaming", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#getOverrideNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#describeContents()"/>
         /// </summary>
-        public int OverrideNetworkType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getOverrideNetworkType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#isRoaming()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#getNetworkType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRoaming()
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkType()
         {
-            return IExecuteWithSignature<bool>("isRoaming", "()Z");
+            return IExecuteWithSignature<int>("getNetworkType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#getOverrideNetworkType()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetOverrideNetworkType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getOverrideNetworkType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyDisplayInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/TelephonyManager.cs b/src/net/Netdroid/Generated/Android/Telephony/TelephonyManager.cs
index 5e2e04096..98d41e9f5 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/TelephonyManager.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/TelephonyManager.cs
@@ -454,7 +454,7 @@ public partial class TelephonyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#NETWORK_TYPE_IDEN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int NETWORK_TYPE_IDEN { get { if (!_NETWORK_TYPE_IDENReady) { _NETWORK_TYPE_IDENContent = SGetField<int>(LocalBridgeClazz, "NETWORK_TYPE_IDEN"); _NETWORK_TYPE_IDENReady = true; } return _NETWORK_TYPE_IDENContent; } }
         private static int _NETWORK_TYPE_IDENContent = default;
         private static bool _NETWORK_TYPE_IDENReady = false; // this is used because in case of generics 
@@ -953,7 +953,7 @@ public partial class TelephonyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#EXTRA_INCOMING_NUMBER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String EXTRA_INCOMING_NUMBER { get { if (!_EXTRA_INCOMING_NUMBERReady) { _EXTRA_INCOMING_NUMBERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EXTRA_INCOMING_NUMBER"); _EXTRA_INCOMING_NUMBERReady = true; } return _EXTRA_INCOMING_NUMBERContent; } }
         private static Java.Lang.String _EXTRA_INCOMING_NUMBERContent = default;
         private static bool _EXTRA_INCOMING_NUMBERReady = false; // this is used because in case of generics 
@@ -1170,7 +1170,7 @@ public partial class TelephonyManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#NETWORK_TYPE_BITMASK_LTE_CA"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long NETWORK_TYPE_BITMASK_LTE_CA { get { if (!_NETWORK_TYPE_BITMASK_LTE_CAReady) { _NETWORK_TYPE_BITMASK_LTE_CAContent = SGetField<long>(LocalBridgeClazz, "NETWORK_TYPE_BITMASK_LTE_CA"); _NETWORK_TYPE_BITMASK_LTE_CAReady = true; } return _NETWORK_TYPE_BITMASK_LTE_CAContent; } }
         private static long _NETWORK_TYPE_BITMASK_LTE_CAContent = default;
         private static bool _NETWORK_TYPE_BITMASK_LTE_CAReady = false; // this is used because in case of generics 
@@ -1203,436 +1203,50 @@ public partial class TelephonyManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMaximumCallComposerPictureSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMaximumCallComposerPictureSize()"/>
         /// </summary>
-        public static long MaximumCallComposerPictureSize
+        /// <returns><see cref="long"/></returns>
+        public static long GetMaximumCallComposerPictureSize()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getMaximumCallComposerPictureSize", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getMaximumCallComposerPictureSize", "()J");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getActiveModemCount()"/> 
-        /// </summary>
-        public int ActiveModemCount
-        {
-            get { return IExecuteWithSignature<int>("getActiveModemCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getAllCellInfo()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Telephony.CellInfo> AllCellInfo
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.CellInfo>>("getAllCellInfo", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCallComposerStatus()"/> <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#setCallComposerStatus(int)"/>
-        /// </summary>
-        public int CallComposerStatus
-        {
-            get { return IExecuteWithSignature<int>("getCallComposerStatus", "()I"); } set { IExecuteWithSignature("setCallComposerStatus", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCallState()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int CallState
-        {
-            get { return IExecuteWithSignature<int>("getCallState", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCallStateForSubscription()"/> 
-        /// </summary>
-        public int CallStateForSubscription
-        {
-            get { return IExecuteWithSignature<int>("getCallStateForSubscription", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCardIdForDefaultEuicc()"/> 
-        /// </summary>
-        public int CardIdForDefaultEuicc
-        {
-            get { return IExecuteWithSignature<int>("getCardIdForDefaultEuicc", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCarrierConfig()"/> 
-        /// </summary>
-        public Android.Os.PersistableBundle CarrierConfig
-        {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getCarrierConfig", "()Landroid/os/PersistableBundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCarrierIdFromSimMccMnc()"/> 
-        /// </summary>
-        public int CarrierIdFromSimMccMnc
-        {
-            get { return IExecuteWithSignature<int>("getCarrierIdFromSimMccMnc", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCellLocation()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Telephony.CellLocation CellLocation
-        {
-            get { return IExecuteWithSignature<Android.Telephony.CellLocation>("getCellLocation", "()Landroid/telephony/CellLocation;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDataActivity()"/> 
-        /// </summary>
-        public int DataActivity
-        {
-            get { return IExecuteWithSignature<int>("getDataActivity", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDataNetworkType()"/> 
-        /// </summary>
-        public int DataNetworkType
-        {
-            get { return IExecuteWithSignature<int>("getDataNetworkType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDataState()"/> 
-        /// </summary>
-        public int DataState
-        {
-            get { return IExecuteWithSignature<int>("getDataState", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDeviceId()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String DeviceId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDeviceSoftwareVersion()"/> 
-        /// </summary>
-        public Java.Lang.String DeviceSoftwareVersion
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDeviceSoftwareVersion", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getEmergencyNumberList()"/> 
-        /// </summary>
-        public Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>> EmergencyNumberList
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>>("getEmergencyNumberList", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getEquivalentHomePlmns()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> EquivalentHomePlmns
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getEquivalentHomePlmns", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getForbiddenPlmns()"/> 
-        /// </summary>
-        public Java.Lang.String[] ForbiddenPlmns
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getForbiddenPlmns", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getGroupIdLevel1()"/> 
-        /// </summary>
-        public Java.Lang.String GroupIdLevel1
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGroupIdLevel1", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getImei()"/> 
-        /// </summary>
-        public Java.Lang.String Imei
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getImei", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getLine1Number()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Line1Number
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLine1Number", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getManualNetworkSelectionPlmn()"/> 
-        /// </summary>
-        public Java.Lang.String ManualNetworkSelectionPlmn
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getManualNetworkSelectionPlmn", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getManufacturerCode()"/> 
-        /// </summary>
-        public Java.Lang.String ManufacturerCode
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getManufacturerCode", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMeid()"/> 
-        /// </summary>
-        public Java.Lang.String Meid
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMeid", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMmsUAProfUrl()"/> 
-        /// </summary>
-        public Java.Lang.String MmsUAProfUrl
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMmsUAProfUrl", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMmsUserAgent()"/> 
-        /// </summary>
-        public Java.Lang.String MmsUserAgent
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMmsUserAgent", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNai()"/> 
-        /// </summary>
-        public Java.Lang.String Nai
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNai", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkCountryIso()"/> 
-        /// </summary>
-        public Java.Lang.String NetworkCountryIso
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNetworkCountryIso", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkOperator()"/> 
-        /// </summary>
-        public Java.Lang.String NetworkOperator
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNetworkOperator", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkOperatorName()"/> 
-        /// </summary>
-        public Java.Lang.String NetworkOperatorName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNetworkOperatorName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkSelectionMode()"/> 
-        /// </summary>
-        public int NetworkSelectionMode
-        {
-            get { return IExecuteWithSignature<int>("getNetworkSelectionMode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkSpecifier()"/> 
-        /// </summary>
-        public Java.Lang.String NetworkSpecifier
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNetworkSpecifier", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkType()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int NetworkType
-        {
-            get { return IExecuteWithSignature<int>("getNetworkType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPhoneAccountHandle()"/> 
-        /// </summary>
-        public Android.Telecom.PhoneAccountHandle PhoneAccountHandle
-        {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPhoneCount()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int PhoneCount
-        {
-            get { return IExecuteWithSignature<int>("getPhoneCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPhoneType()"/> 
-        /// </summary>
-        public int PhoneType
-        {
-            get { return IExecuteWithSignature<int>("getPhoneType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPreferredOpportunisticDataSubscription()"/> 
-        /// </summary>
-        public int PreferredOpportunisticDataSubscription
-        {
-            get { return IExecuteWithSignature<int>("getPreferredOpportunisticDataSubscription", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPrimaryImei()"/> 
-        /// </summary>
-        public Java.Lang.String PrimaryImei
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPrimaryImei", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getServiceState()"/> 
-        /// </summary>
-        public Android.Telephony.ServiceState ServiceState
-        {
-            get { return IExecuteWithSignature<Android.Telephony.ServiceState>("getServiceState", "()Landroid/telephony/ServiceState;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSignalStrength()"/> 
-        /// </summary>
-        public Android.Telephony.SignalStrength SignalStrength
-        {
-            get { return IExecuteWithSignature<Android.Telephony.SignalStrength>("getSignalStrength", "()Landroid/telephony/SignalStrength;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimCarrierId()"/> 
-        /// </summary>
-        public int SimCarrierId
-        {
-            get { return IExecuteWithSignature<int>("getSimCarrierId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimCarrierIdName()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence SimCarrierIdName
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSimCarrierIdName", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimCountryIso()"/> 
-        /// </summary>
-        public Java.Lang.String SimCountryIso
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSimCountryIso", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimOperator()"/> 
-        /// </summary>
-        public Java.Lang.String SimOperator
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSimOperator", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimOperatorName()"/> 
-        /// </summary>
-        public Java.Lang.String SimOperatorName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSimOperatorName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimSerialNumber()"/> 
-        /// </summary>
-        public Java.Lang.String SimSerialNumber
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSimSerialNumber", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimSpecificCarrierId()"/> 
-        /// </summary>
-        public int SimSpecificCarrierId
-        {
-            get { return IExecuteWithSignature<int>("getSimSpecificCarrierId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimSpecificCarrierIdName()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence SimSpecificCarrierIdName
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSimSpecificCarrierIdName", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimState()"/> 
-        /// </summary>
-        public int SimState
-        {
-            get { return IExecuteWithSignature<int>("getSimState", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSubscriberId()"/> 
-        /// </summary>
-        public Java.Lang.String SubscriberId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubscriberId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSubscriptionId()"/> 
-        /// </summary>
-        public int SubscriptionId
-        {
-            get { return IExecuteWithSignature<int>("getSubscriptionId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSupportedModemCount()"/> 
-        /// </summary>
-        public int SupportedModemCount
-        {
-            get { return IExecuteWithSignature<int>("getSupportedModemCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSupportedRadioAccessFamily()"/> 
-        /// </summary>
-        public long SupportedRadioAccessFamily
-        {
-            get { return IExecuteWithSignature<long>("getSupportedRadioAccessFamily", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getTypeAllocationCode()"/> 
-        /// </summary>
-        public Java.Lang.String TypeAllocationCode
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeAllocationCode", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getUiccCardsInfo()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Telephony.UiccCardInfo> UiccCardsInfo
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Telephony.UiccCardInfo>>("getUiccCardsInfo", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVisualVoicemailPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String VisualVoicemailPackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVisualVoicemailPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVoiceMailAlphaTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle)"/>
         /// </summary>
-        public Java.Lang.String VoiceMailAlphaTag
+        /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetVoicemailRingtoneUri(Android.Telecom.PhoneAccountHandle arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVoiceMailAlphaTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getVoicemailRingtoneUri", "(Landroid/telecom/PhoneAccountHandle;)Landroid/net/Uri;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVoiceMailNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCarrierConfig()"/>
         /// </summary>
-        public Java.Lang.String VoiceMailNumber
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetCarrierConfig()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVoiceMailNumber", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getCarrierConfig", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVoiceNetworkType()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPhoneAccountHandle()"/>
         /// </summary>
-        public int VoiceNetworkType
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetPhoneAccountHandle()
         {
-            get { return IExecuteWithSignature<int>("getVoiceNetworkType", "()I"); }
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle)"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCellLocation()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
-        /// <returns><see cref="Android.Net.Uri"/></returns>
-        public Android.Net.Uri GetVoicemailRingtoneUri(Android.Telecom.PhoneAccountHandle arg0)
+        /// <returns><see cref="Android.Telephony.CellLocation"/></returns>
+        [global::System.Obsolete()]
+        public Android.Telephony.CellLocation GetCellLocation()
         {
-            return IExecuteWithSignature<Android.Net.Uri>("getVoicemailRingtoneUri", "(Landroid/telecom/PhoneAccountHandle;)Landroid/net/Uri;", arg0);
+            return IExecuteWithSignature<Android.Telephony.CellLocation>("getCellLocation", "()Landroid/telephony/CellLocation;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#iccOpenLogicalChannel(java.lang.String,int)"/>
@@ -1649,7 +1263,7 @@ public Android.Telephony.IccOpenLogicalChannelResponse IccOpenLogicalChannel(Jav
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Telephony.IccOpenLogicalChannelResponse"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Telephony.IccOpenLogicalChannelResponse IccOpenLogicalChannel(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Telephony.IccOpenLogicalChannelResponse>("iccOpenLogicalChannel", "(Ljava/lang/String;)Landroid/telephony/IccOpenLogicalChannelResponse;", arg0);
@@ -1678,6 +1292,14 @@ public Android.Telephony.NetworkScan RequestNetworkScan(int arg0, Android.Teleph
             return IExecute<Android.Telephony.NetworkScan>("requestNetworkScan", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getServiceState()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Telephony.ServiceState"/></returns>
+        public Android.Telephony.ServiceState GetServiceState()
+        {
+            return IExecuteWithSignature<Android.Telephony.ServiceState>("getServiceState", "()Landroid/telephony/ServiceState;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getServiceState(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1687,6 +1309,14 @@ public Android.Telephony.ServiceState GetServiceState(int arg0)
             return IExecuteWithSignature<Android.Telephony.ServiceState>("getServiceState", "(I)Landroid/telephony/ServiceState;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSignalStrength()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Telephony.SignalStrength"/></returns>
+        public Android.Telephony.SignalStrength GetSignalStrength()
+        {
+            return IExecuteWithSignature<Android.Telephony.SignalStrength>("getSignalStrength", "()Landroid/telephony/SignalStrength;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#createForPhoneAccountHandle(android.telecom.PhoneAccountHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
@@ -1874,7 +1504,7 @@ public bool IsSmsCapable()
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#isTtyModeSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsTtyModeSupported()
         {
             return IExecuteWithSignature<bool>("isTtyModeSupported", "()Z");
@@ -1910,7 +1540,7 @@ public bool IsWorldPhone()
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetLine1NumberForDisplay(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecute<bool>("setLine1NumberForDisplay", arg0, arg1);
@@ -1978,6 +1608,145 @@ public byte[] IccExchangeSimIO(int arg0, int arg1, int arg2, int arg3, int arg4,
             return IExecuteArray<byte>("iccExchangeSimIO", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getActiveModemCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetActiveModemCount()
+        {
+            return IExecuteWithSignature<int>("getActiveModemCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCallComposerStatus()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCallComposerStatus()
+        {
+            return IExecuteWithSignature<int>("getCallComposerStatus", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCallState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetCallState()
+        {
+            return IExecuteWithSignature<int>("getCallState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCallStateForSubscription()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCallStateForSubscription()
+        {
+            return IExecuteWithSignature<int>("getCallStateForSubscription", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCardIdForDefaultEuicc()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCardIdForDefaultEuicc()
+        {
+            return IExecuteWithSignature<int>("getCardIdForDefaultEuicc", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getCarrierIdFromSimMccMnc()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCarrierIdFromSimMccMnc()
+        {
+            return IExecuteWithSignature<int>("getCarrierIdFromSimMccMnc", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDataActivity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDataActivity()
+        {
+            return IExecuteWithSignature<int>("getDataActivity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDataNetworkType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDataNetworkType()
+        {
+            return IExecuteWithSignature<int>("getDataNetworkType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDataState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDataState()
+        {
+            return IExecuteWithSignature<int>("getDataState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkSelectionMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNetworkSelectionMode()
+        {
+            return IExecuteWithSignature<int>("getNetworkSelectionMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetNetworkType()
+        {
+            return IExecuteWithSignature<int>("getNetworkType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPhoneCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPhoneCount()
+        {
+            return IExecuteWithSignature<int>("getPhoneCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPhoneType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPhoneType()
+        {
+            return IExecuteWithSignature<int>("getPhoneType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPreferredOpportunisticDataSubscription()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPreferredOpportunisticDataSubscription()
+        {
+            return IExecuteWithSignature<int>("getPreferredOpportunisticDataSubscription", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimCarrierId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSimCarrierId()
+        {
+            return IExecuteWithSignature<int>("getSimCarrierId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimSpecificCarrierId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSimSpecificCarrierId()
+        {
+            return IExecuteWithSignature<int>("getSimSpecificCarrierId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSimState()
+        {
+            return IExecuteWithSignature<int>("getSimState", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimState(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1987,6 +1756,14 @@ public int GetSimState(int arg0)
             return IExecuteWithSignature<int>("getSimState", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSubscriptionId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSubscriptionId()
+        {
+            return IExecuteWithSignature<int>("getSubscriptionId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSubscriptionId(android.telecom.PhoneAccountHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
@@ -1996,6 +1773,22 @@ public int GetSubscriptionId(Android.Telecom.PhoneAccountHandle arg0)
             return IExecuteWithSignature<int>("getSubscriptionId", "(Landroid/telecom/PhoneAccountHandle;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSupportedModemCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSupportedModemCount()
+        {
+            return IExecuteWithSignature<int>("getSupportedModemCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVoiceNetworkType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVoiceNetworkType()
+        {
+            return IExecuteWithSignature<int>("getVoiceNetworkType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#isMultiSimSupported()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -2013,16 +1806,57 @@ public int SetForbiddenPlmns(Java.Util.List<Java.Lang.String> arg0)
             return IExecuteWithSignature<int>("setForbiddenPlmns", "(Ljava/util/List;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimCarrierIdName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSimCarrierIdName()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSimCarrierIdName", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimSpecificCarrierIdName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSimSpecificCarrierIdName()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSimSpecificCarrierIdName", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDeviceId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDeviceId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDeviceId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String GetDeviceId(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("getDeviceId", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getDeviceSoftwareVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDeviceSoftwareVersion()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDeviceSoftwareVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getGroupIdLevel1()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetGroupIdLevel1()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getGroupIdLevel1", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getIccAuthentication(int,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2034,6 +1868,14 @@ public Java.Lang.String GetIccAuthentication(int arg0, int arg1, Java.Lang.Strin
             return IExecute<Java.Lang.String>("getIccAuthentication", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getImei()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetImei()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getImei", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getImei(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2043,6 +1885,31 @@ public Java.Lang.String GetImei(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getImei", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getLine1Number()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetLine1Number()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLine1Number", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getManualNetworkSelectionPlmn()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetManualNetworkSelectionPlmn()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getManualNetworkSelectionPlmn", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getManufacturerCode()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetManufacturerCode()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getManufacturerCode", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getManufacturerCode(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2052,6 +1919,14 @@ public Java.Lang.String GetManufacturerCode(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getManufacturerCode", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMeid()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMeid()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMeid", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMeid(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2061,6 +1936,38 @@ public Java.Lang.String GetMeid(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getMeid", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMmsUAProfUrl()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMmsUAProfUrl()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMmsUAProfUrl", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getMmsUserAgent()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMmsUserAgent()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMmsUserAgent", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNai()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNai()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNai", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkCountryIso()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNetworkCountryIso()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNetworkCountryIso", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkCountryIso(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2070,6 +1977,86 @@ public Java.Lang.String GetNetworkCountryIso(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getNetworkCountryIso", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkOperator()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNetworkOperator()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNetworkOperator", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkOperatorName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNetworkOperatorName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNetworkOperatorName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getNetworkSpecifier()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNetworkSpecifier()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNetworkSpecifier", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getPrimaryImei()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPrimaryImei()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPrimaryImei", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimCountryIso()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSimCountryIso()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSimCountryIso", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimOperator()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSimOperator()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSimOperator", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimOperatorName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSimOperatorName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSimOperatorName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSimSerialNumber()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSimSerialNumber()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSimSerialNumber", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSubscriberId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubscriberId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSubscriberId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getTypeAllocationCode()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTypeAllocationCode()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTypeAllocationCode", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getTypeAllocationCode(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2079,6 +2066,30 @@ public Java.Lang.String GetTypeAllocationCode(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getTypeAllocationCode", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVisualVoicemailPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVisualVoicemailPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getVisualVoicemailPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVoiceMailAlphaTag()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVoiceMailAlphaTag()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getVoiceMailAlphaTag", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getVoiceMailNumber()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVoiceMailNumber()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getVoiceMailNumber", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#iccTransmitApduBasicChannel(int,int,int,int,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2117,6 +2128,46 @@ public Java.Lang.String SendEnvelopeWithStatus(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("sendEnvelopeWithStatus", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getForbiddenPlmns()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetForbiddenPlmns()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getForbiddenPlmns", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getAllCellInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.CellInfo> GetAllCellInfo()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.CellInfo>>("getAllCellInfo", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getUiccCardsInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Telephony.UiccCardInfo> GetUiccCardsInfo()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Telephony.UiccCardInfo>>("getUiccCardsInfo", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getEquivalentHomePlmns()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetEquivalentHomePlmns()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getEquivalentHomePlmns", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getEmergencyNumberList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>> GetEmergencyNumberList()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.Integer, Java.Util.List<Android.Telephony.Emergency.EmergencyNumber>>>("getEmergencyNumberList", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getEmergencyNumberList(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2135,6 +2186,14 @@ public long GetAllowedNetworkTypesForReason(int arg0)
             return IExecuteWithSignature<long>("getAllowedNetworkTypesForReason", "(I)J", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#getSupportedRadioAccessFamily()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetSupportedRadioAccessFamily()
+        {
+            return IExecuteWithSignature<long>("getSupportedRadioAccessFamily", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#clearSignalStrengthUpdateRequest(android.telephony.SignalStrengthUpdateRequest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.SignalStrengthUpdateRequest"/></param>
@@ -2165,7 +2224,7 @@ public void GetNetworkSlicingConfiguration(Java.Util.Concurrent.Executor arg0, A
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telephony.PhoneStateListener"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Listen(Android.Telephony.PhoneStateListener arg0, int arg1)
         {
             IExecute("listen", arg0, arg1);
@@ -2254,10 +2313,18 @@ public void SetAllowedNetworkTypesForReason(int arg0, long arg1)
             IExecute("setAllowedNetworkTypesForReason", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#setCallComposerStatus(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCallComposerStatus(int arg0)
+        {
+            IExecuteWithSignature("setCallComposerStatus", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/TelephonyManager.html#setDataEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDataEnabled(bool arg0)
         {
             IExecuteWithSignature("setDataEnabled", "(Z)V", arg0);
@@ -2310,7 +2377,7 @@ public void SetVisualVoicemailSmsFilterSettings(Android.Telephony.VisualVoicemai
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
         /// <param name="arg1"><see cref="Android.Net.Uri"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVoicemailRingtoneUri(Android.Telecom.PhoneAccountHandle arg0, Android.Net.Uri arg1)
         {
             IExecute("setVoicemailRingtoneUri", arg0, arg1);
@@ -2320,7 +2387,7 @@ public void SetVoicemailRingtoneUri(Android.Telecom.PhoneAccountHandle arg0, And
         /// </summary>
         /// <param name="arg0"><see cref="Android.Telecom.PhoneAccountHandle"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVoicemailVibrationEnabled(Android.Telecom.PhoneAccountHandle arg0, bool arg1)
         {
             IExecute("setVoicemailVibrationEnabled", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Telephony/UiccCardInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/UiccCardInfo.cs
index 2093993d4..4d74d2a13 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/UiccCardInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/UiccCardInfo.cs
@@ -52,80 +52,86 @@ public partial class UiccCardInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getCardId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#isEuicc()"/>
         /// </summary>
-        public int CardId
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEuicc()
         {
-            get { return IExecuteWithSignature<int>("getCardId", "()I"); }
+            return IExecuteWithSignature<bool>("isEuicc", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getEid()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#isMultipleEnabledProfilesSupported()"/>
         /// </summary>
-        public Java.Lang.String Eid
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMultipleEnabledProfilesSupported()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEid", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isMultipleEnabledProfilesSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getIccId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#isRemovable()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String IccId
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRemovable()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIccId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isRemovable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getPhysicalSlotIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#describeContents()"/>
         /// </summary>
-        public int PhysicalSlotIndex
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPhysicalSlotIndex", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getPorts()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getCardId()"/>
         /// </summary>
-        public Java.Util.Collection<Android.Telephony.UiccPortInfo> Ports
+        /// <returns><see cref="int"/></returns>
+        public int GetCardId()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Android.Telephony.UiccPortInfo>>("getPorts", "()Ljava/util/Collection;"); }
+            return IExecuteWithSignature<int>("getCardId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getSlotIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getPhysicalSlotIndex()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SlotIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetPhysicalSlotIndex()
         {
-            get { return IExecuteWithSignature<int>("getSlotIndex", "()I"); }
+            return IExecuteWithSignature<int>("getPhysicalSlotIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#isEuicc()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getSlotIndex()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEuicc()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSlotIndex()
         {
-            return IExecuteWithSignature<bool>("isEuicc", "()Z");
+            return IExecuteWithSignature<int>("getSlotIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#isMultipleEnabledProfilesSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getEid()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMultipleEnabledProfilesSupported()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEid()
         {
-            return IExecuteWithSignature<bool>("isMultipleEnabledProfilesSupported", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getEid", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#isRemovable()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getIccId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRemovable()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetIccId()
         {
-            return IExecuteWithSignature<bool>("isRemovable", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getIccId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#getPorts()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.Telephony.UiccPortInfo> GetPorts()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Collection<Android.Telephony.UiccPortInfo>>("getPorts", "()Ljava/util/Collection;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/UiccCardInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/UiccPortInfo.cs b/src/net/Netdroid/Generated/Android/Telephony/UiccPortInfo.cs
index 63c173489..64f118e0e 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/UiccPortInfo.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/UiccPortInfo.cs
@@ -58,41 +58,44 @@ public partial class UiccPortInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#getIccId()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#isActive()"/>
         /// </summary>
-        public Java.Lang.String IccId
+        /// <returns><see cref="bool"/></returns>
+        public bool IsActive()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIccId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isActive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#getLogicalSlotIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#describeContents()"/>
         /// </summary>
-        public int LogicalSlotIndex
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getLogicalSlotIndex", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#getPortIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#getLogicalSlotIndex()"/>
         /// </summary>
-        public int PortIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetLogicalSlotIndex()
         {
-            get { return IExecuteWithSignature<int>("getPortIndex", "()I"); }
+            return IExecuteWithSignature<int>("getLogicalSlotIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#isActive()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#getPortIndex()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsActive()
+        /// <returns><see cref="int"/></returns>
+        public int GetPortIndex()
         {
-            return IExecuteWithSignature<bool>("isActive", "()Z");
+            return IExecuteWithSignature<int>("getPortIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#getIccId()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetIccId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getIccId", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/UiccPortInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Telephony/VisualVoicemailSms.cs b/src/net/Netdroid/Generated/Android/Telephony/VisualVoicemailSms.cs
index a3357bbef..74c8d161d 100644
--- a/src/net/Netdroid/Generated/Android/Telephony/VisualVoicemailSms.cs
+++ b/src/net/Netdroid/Generated/Android/Telephony/VisualVoicemailSms.cs
@@ -52,40 +52,44 @@ public partial class VisualVoicemailSms
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#getFields()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#getFields()"/>
         /// </summary>
-        public Android.Os.Bundle Fields
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetFields()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getFields", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getFields", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#getMessageBody()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#getPhoneAccountHandle()"/>
         /// </summary>
-        public Java.Lang.String MessageBody
+        /// <returns><see cref="Android.Telecom.PhoneAccountHandle"/></returns>
+        public Android.Telecom.PhoneAccountHandle GetPhoneAccountHandle()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMessageBody", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#getPhoneAccountHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#describeContents()"/>
         /// </summary>
-        public Android.Telecom.PhoneAccountHandle PhoneAccountHandle
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Telecom.PhoneAccountHandle>("getPhoneAccountHandle", "()Landroid/telecom/PhoneAccountHandle;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#getPrefix()"/> 
+        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#getMessageBody()"/>
         /// </summary>
-        public Java.Lang.String Prefix
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMessageBody()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPrefix", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMessageBody", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#getPrefix()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPrefix()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getPrefix", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/telephony/VisualVoicemailSms.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Text/AllPackageClasses.cs
index 9c0b5c649..17ed7768f 100644
--- a/src/net/Netdroid/Generated/Android/Text/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Text/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Android.Text
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/AlteredCharSequence.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AlteredCharSequence : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AlteredCharSequence>
     {
         const string _bridgeClassName = "android.text.AlteredCharSequence";
@@ -75,7 +75,7 @@ public AlteredCharSequence(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/AndroidCharacter.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AndroidCharacter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AndroidCharacter>
     {
         const string _bridgeClassName = "android.text.AndroidCharacter";
@@ -384,19 +384,19 @@ public Metrics(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/ClipboardManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ClipboardManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ClipboardManager>
     {
         const string _bridgeClassName = "android.text.ClipboardManager";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ClipboardManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClipboardManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClipboardManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ClipboardManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClipboardManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClipboardManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -525,12 +525,12 @@ public partial class Editable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Editable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Editable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Editable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Editable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Editable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Editable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Editable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -659,12 +659,12 @@ public partial class GetChars : Java.Lang.CharSequence
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GetChars class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GetChars class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GetChars() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GetChars class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GetChars class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GetChars(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -877,12 +877,12 @@ public partial class ImageGetter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Image
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ImageGetter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ImageGetter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ImageGetter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ImageGetter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ImageGetter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ImageGetter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -923,12 +923,12 @@ public partial class TagHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TagHan
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TagHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TagHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TagHandler() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TagHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TagHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TagHandler(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -973,12 +973,12 @@ public partial class InputFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Input
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InputFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InputFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1107,12 +1107,12 @@ public partial class InputType : MASES.JCOBridge.C2JBridge.JVMBridgeBase<InputTy
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InputType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputType() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InputType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputType(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1153,12 +1153,12 @@ public partial class Layout : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Layout>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Layout class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Layout class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Layout() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Layout class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Layout class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Layout(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1283,12 +1283,12 @@ public partial class TextInclusionStrategy : MASES.JCOBridge.C2JBridge.JVMBridge
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TextInclusionStrategy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TextInclusionStrategy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TextInclusionStrategy() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TextInclusionStrategy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TextInclusionStrategy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TextInclusionStrategy(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1327,19 +1327,19 @@ public TextInclusionStrategy(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/LoginFilter.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LoginFilter : Android.Text.InputFilter
     {
         const string _bridgeClassName = "android.text.LoginFilter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LoginFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LoginFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LoginFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LoginFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LoginFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LoginFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1370,7 +1370,7 @@ public LoginFilter(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/LoginFilter.PasswordFilterGMail.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PasswordFilterGMail : Android.Text.LoginFilter
         {
             const string _bridgeClassName = "android.text.LoginFilter$PasswordFilterGMail";
@@ -1415,7 +1415,7 @@ public PasswordFilterGMail(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/LoginFilter.UsernameFilterGeneric.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class UsernameFilterGeneric : Android.Text.LoginFilter
         {
             const string _bridgeClassName = "android.text.LoginFilter$UsernameFilterGeneric";
@@ -1460,7 +1460,7 @@ public UsernameFilterGeneric(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/LoginFilter.UsernameFilterGMail.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class UsernameFilterGMail : Android.Text.LoginFilter
         {
             const string _bridgeClassName = "android.text.LoginFilter$UsernameFilterGMail";
@@ -1515,12 +1515,12 @@ public partial class NoCopySpan : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NoCopy
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NoCopySpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NoCopySpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NoCopySpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NoCopySpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NoCopySpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NoCopySpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1605,12 +1605,12 @@ public partial class ParcelableSpan : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ParcelableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ParcelableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ParcelableSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ParcelableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ParcelableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ParcelableSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1783,12 +1783,12 @@ public partial class SegmentFinder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Seg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SegmentFinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SegmentFinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SegmentFinder() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SegmentFinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SegmentFinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SegmentFinder(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1917,12 +1917,12 @@ public partial class Spannable : Android.Text.Spanned
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Spannable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Spannable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Spannable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Spannable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Spannable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Spannable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2095,12 +2095,12 @@ public partial class Spanned : Java.Lang.CharSequence
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Spanned class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Spanned class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Spanned() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Spanned class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Spanned class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Spanned(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2185,12 +2185,12 @@ public partial class SpanWatcher : Android.Text.NoCopySpan
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SpanWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SpanWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SpanWatcher() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SpanWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SpanWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SpanWatcher(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2319,12 +2319,12 @@ public partial class TextDirectionHeuristic : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TextDirectionHeuristic class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextDirectionHeuristic class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextDirectionHeuristic() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TextDirectionHeuristic class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextDirectionHeuristic class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextDirectionHeuristic(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2493,12 +2493,12 @@ public partial class GlyphsConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Gl
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("GlyphsConsumer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GlyphsConsumer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GlyphsConsumer() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("GlyphsConsumer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GlyphsConsumer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GlyphsConsumer(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2583,12 +2583,12 @@ public partial class EllipsizeCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("EllipsizeCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EllipsizeCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EllipsizeCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("EllipsizeCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EllipsizeCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EllipsizeCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2673,12 +2673,12 @@ public partial class StringSplitter : Java.Lang.Iterable<Java.Lang.String>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("StringSplitter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StringSplitter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StringSplitter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("StringSplitter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StringSplitter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StringSplitter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2767,12 +2767,12 @@ public partial class TextWatcher : Android.Text.NoCopySpan
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TextWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextWatcher() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TextWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextWatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextWatcher(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Text/AlteredCharSequence.cs b/src/net/Netdroid/Generated/Android/Text/AlteredCharSequence.cs
index 4bf880ffd..1d54f98ee 100644
--- a/src/net/Netdroid/Generated/Android/Text/AlteredCharSequence.cs
+++ b/src/net/Netdroid/Generated/Android/Text/AlteredCharSequence.cs
@@ -57,7 +57,7 @@ public partial class AlteredCharSequence : Java.Lang.ICharSequence, Android.Text
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.Text.AlteredCharSequence"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Text.AlteredCharSequence Make(Java.Lang.CharSequence arg0, char[] arg1, int arg2, int arg3)
         {
             return SExecute<Android.Text.AlteredCharSequence>(LocalBridgeClazz, "make", arg0, arg1, arg2, arg3);
@@ -71,7 +71,7 @@ public static Android.Text.AlteredCharSequence Make(Java.Lang.CharSequence arg0,
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public char CharAt(int arg0)
         {
             return IExecuteWithSignature<char>("charAt", "(I)C", arg0);
@@ -80,7 +80,7 @@ public char CharAt(int arg0)
         /// <see href="https://developer.android.com/reference/android/text/AlteredCharSequence.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int Length()
         {
             return IExecuteWithSignature<int>("length", "()I");
@@ -91,7 +91,7 @@ public int Length()
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.CharSequence SubSequence(int arg0, int arg1)
         {
             return IExecute<Java.Lang.CharSequence>("subSequence", arg0, arg1);
@@ -103,7 +103,7 @@ public Java.Lang.CharSequence SubSequence(int arg0, int arg1)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="char"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetChars(int arg0, int arg1, char[] arg2, int arg3)
         {
             IExecute("getChars", arg0, arg1, arg2, arg3);
diff --git a/src/net/Netdroid/Generated/Android/Text/AndroidCharacter.cs b/src/net/Netdroid/Generated/Android/Text/AndroidCharacter.cs
index 38574cfba..bc3920341 100644
--- a/src/net/Netdroid/Generated/Android/Text/AndroidCharacter.cs
+++ b/src/net/Netdroid/Generated/Android/Text/AndroidCharacter.cs
@@ -40,42 +40,42 @@ public partial class AndroidCharacter
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/AndroidCharacter.html#EAST_ASIAN_WIDTH_AMBIGUOUS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EAST_ASIAN_WIDTH_AMBIGUOUS { get { if (!_EAST_ASIAN_WIDTH_AMBIGUOUSReady) { _EAST_ASIAN_WIDTH_AMBIGUOUSContent = SGetField<int>(LocalBridgeClazz, "EAST_ASIAN_WIDTH_AMBIGUOUS"); _EAST_ASIAN_WIDTH_AMBIGUOUSReady = true; } return _EAST_ASIAN_WIDTH_AMBIGUOUSContent; } }
         private static int _EAST_ASIAN_WIDTH_AMBIGUOUSContent = default;
         private static bool _EAST_ASIAN_WIDTH_AMBIGUOUSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/AndroidCharacter.html#EAST_ASIAN_WIDTH_FULL_WIDTH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EAST_ASIAN_WIDTH_FULL_WIDTH { get { if (!_EAST_ASIAN_WIDTH_FULL_WIDTHReady) { _EAST_ASIAN_WIDTH_FULL_WIDTHContent = SGetField<int>(LocalBridgeClazz, "EAST_ASIAN_WIDTH_FULL_WIDTH"); _EAST_ASIAN_WIDTH_FULL_WIDTHReady = true; } return _EAST_ASIAN_WIDTH_FULL_WIDTHContent; } }
         private static int _EAST_ASIAN_WIDTH_FULL_WIDTHContent = default;
         private static bool _EAST_ASIAN_WIDTH_FULL_WIDTHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/AndroidCharacter.html#EAST_ASIAN_WIDTH_HALF_WIDTH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EAST_ASIAN_WIDTH_HALF_WIDTH { get { if (!_EAST_ASIAN_WIDTH_HALF_WIDTHReady) { _EAST_ASIAN_WIDTH_HALF_WIDTHContent = SGetField<int>(LocalBridgeClazz, "EAST_ASIAN_WIDTH_HALF_WIDTH"); _EAST_ASIAN_WIDTH_HALF_WIDTHReady = true; } return _EAST_ASIAN_WIDTH_HALF_WIDTHContent; } }
         private static int _EAST_ASIAN_WIDTH_HALF_WIDTHContent = default;
         private static bool _EAST_ASIAN_WIDTH_HALF_WIDTHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/AndroidCharacter.html#EAST_ASIAN_WIDTH_NARROW"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EAST_ASIAN_WIDTH_NARROW { get { if (!_EAST_ASIAN_WIDTH_NARROWReady) { _EAST_ASIAN_WIDTH_NARROWContent = SGetField<int>(LocalBridgeClazz, "EAST_ASIAN_WIDTH_NARROW"); _EAST_ASIAN_WIDTH_NARROWReady = true; } return _EAST_ASIAN_WIDTH_NARROWContent; } }
         private static int _EAST_ASIAN_WIDTH_NARROWContent = default;
         private static bool _EAST_ASIAN_WIDTH_NARROWReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/AndroidCharacter.html#EAST_ASIAN_WIDTH_NEUTRAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EAST_ASIAN_WIDTH_NEUTRAL { get { if (!_EAST_ASIAN_WIDTH_NEUTRALReady) { _EAST_ASIAN_WIDTH_NEUTRALContent = SGetField<int>(LocalBridgeClazz, "EAST_ASIAN_WIDTH_NEUTRAL"); _EAST_ASIAN_WIDTH_NEUTRALReady = true; } return _EAST_ASIAN_WIDTH_NEUTRALContent; } }
         private static int _EAST_ASIAN_WIDTH_NEUTRALContent = default;
         private static bool _EAST_ASIAN_WIDTH_NEUTRALReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/AndroidCharacter.html#EAST_ASIAN_WIDTH_WIDE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EAST_ASIAN_WIDTH_WIDE { get { if (!_EAST_ASIAN_WIDTH_WIDEReady) { _EAST_ASIAN_WIDTH_WIDEContent = SGetField<int>(LocalBridgeClazz, "EAST_ASIAN_WIDTH_WIDE"); _EAST_ASIAN_WIDTH_WIDEReady = true; } return _EAST_ASIAN_WIDTH_WIDEContent; } }
         private static int _EAST_ASIAN_WIDTH_WIDEContent = default;
         private static bool _EAST_ASIAN_WIDTH_WIDEReady = false; // this is used because in case of generics 
@@ -90,7 +90,7 @@ public partial class AndroidCharacter
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool Mirror(char[] arg0, int arg1, int arg2)
         {
             return SExecute<bool>(LocalBridgeClazz, "mirror", arg0, arg1, arg2);
@@ -100,7 +100,7 @@ public static bool Mirror(char[] arg0, int arg1, int arg2)
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="char"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static char GetMirror(char arg0)
         {
             return SExecuteWithSignature<char>(LocalBridgeClazz, "getMirror", "(C)C", arg0);
@@ -110,7 +110,7 @@ public static char GetMirror(char arg0)
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetEastAsianWidth(char arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getEastAsianWidth", "(C)I", arg0);
@@ -121,7 +121,7 @@ public static int GetEastAsianWidth(char arg0)
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void GetDirectionalities(char[] arg0, byte[] arg1, int arg2)
         {
             SExecute(LocalBridgeClazz, "getDirectionalities", arg0, arg1, arg2);
@@ -133,7 +133,7 @@ public static void GetDirectionalities(char[] arg0, byte[] arg1, int arg2)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void GetEastAsianWidths(char[] arg0, int arg1, int arg2, byte[] arg3)
         {
             SExecute(LocalBridgeClazz, "getEastAsianWidths", arg0, arg1, arg2, arg3);
diff --git a/src/net/Netdroid/Generated/Android/Text/Annotation.cs b/src/net/Netdroid/Generated/Android/Text/Annotation.cs
index 53069b0ae..3caca5df9 100644
--- a/src/net/Netdroid/Generated/Android/Text/Annotation.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Annotation.cs
@@ -63,33 +63,36 @@ public Annotation(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Annotation.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/Annotation.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Key
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Annotation.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/Annotation.html#getSpanTypeId()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Annotation.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/Annotation.html#getKey()"/>
         /// </summary>
-        public Java.Lang.String Value
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKey()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Annotation.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/Annotation.html#getValue()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetValue()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Annotation.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/BidiFormatter.cs b/src/net/Netdroid/Generated/Android/Text/BidiFormatter.cs
index cce098e03..906a3a0b0 100644
--- a/src/net/Netdroid/Generated/Android/Text/BidiFormatter.cs
+++ b/src/net/Netdroid/Generated/Android/Text/BidiFormatter.cs
@@ -42,11 +42,12 @@ public partial class BidiFormatter
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/BidiFormatter.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/BidiFormatter.html#getInstance()"/>
         /// </summary>
-        public static Android.Text.BidiFormatter Instance
+        /// <returns><see cref="Android.Text.BidiFormatter"/></returns>
+        public static Android.Text.BidiFormatter GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Text.BidiFormatter>(LocalBridgeClazz, "getInstance", "()Landroid/text/BidiFormatter;"); }
+            return SExecuteWithSignature<Android.Text.BidiFormatter>(LocalBridgeClazz, "getInstance", "()Landroid/text/BidiFormatter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/BidiFormatter.html#getInstance(boolean)"/>
@@ -71,11 +72,12 @@ public static Android.Text.BidiFormatter GetInstance(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/BidiFormatter.html#getStereoReset()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/BidiFormatter.html#getStereoReset()"/>
         /// </summary>
-        public bool StereoReset
+        /// <returns><see cref="bool"/></returns>
+        public bool GetStereoReset()
         {
-            get { return IExecuteWithSignature<bool>("getStereoReset", "()Z"); }
+            return IExecuteWithSignature<bool>("getStereoReset", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/BidiFormatter.html#isRtl(java.lang.CharSequence)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/ClipboardManager.cs b/src/net/Netdroid/Generated/Android/Text/ClipboardManager.cs
index 733a7f442..3efed5143 100644
--- a/src/net/Netdroid/Generated/Android/Text/ClipboardManager.cs
+++ b/src/net/Netdroid/Generated/Android/Text/ClipboardManager.cs
@@ -46,22 +46,32 @@ public partial class ClipboardManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/ClipboardManager.html#getText()"/> <see href="https://developer.android.com/reference/android/text/ClipboardManager.html#setText(java.lang.CharSequence)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence Text
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/ClipboardManager.html#hasText()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasText()
         {
             return IExecuteWithSignature<bool>("hasText", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/ClipboardManager.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/ClipboardManager.html#setText(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        [global::System.Obsolete()]
+        public void SetText(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/DynamicLayout.cs b/src/net/Netdroid/Generated/Android/Text/DynamicLayout.cs
index 6dc859246..6ad240b31 100644
--- a/src/net/Netdroid/Generated/Android/Text/DynamicLayout.cs
+++ b/src/net/Netdroid/Generated/Android/Text/DynamicLayout.cs
@@ -39,7 +39,7 @@ public partial class DynamicLayout
         /// <param name="arg4"><see cref="float"/></param>
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DynamicLayout(Java.Lang.CharSequence arg0, Android.Text.TextPaint arg1, int arg2, Android.Text.Layout.Alignment arg3, float arg4, float arg5, bool arg6)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
         {
@@ -57,7 +57,7 @@ public DynamicLayout(Java.Lang.CharSequence arg0, Android.Text.TextPaint arg1, i
         /// <param name="arg7"><see cref="bool"/></param>
         /// <param name="arg8"><see cref="Android.Text.TextUtils.TruncateAt"/></param>
         /// <param name="arg9"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DynamicLayout(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1, Android.Text.TextPaint arg2, int arg3, Android.Text.Layout.Alignment arg4, float arg5, float arg6, bool arg7, Android.Text.TextUtils.TruncateAt arg8, int arg9)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
         {
@@ -73,7 +73,7 @@ public DynamicLayout(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1, A
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="float"/></param>
         /// <param name="arg7"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DynamicLayout(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1, Android.Text.TextPaint arg2, int arg3, Android.Text.Layout.Alignment arg4, float arg5, float arg6, bool arg7)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
         {
diff --git a/src/net/Netdroid/Generated/Android/Text/Editable.cs b/src/net/Netdroid/Generated/Android/Text/Editable.cs
index bf7092837..49b7595e6 100644
--- a/src/net/Netdroid/Generated/Android/Text/Editable.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Editable.cs
@@ -80,13 +80,6 @@ public partial class Editable : Android.Text.IEditable, Java.Lang.ICharSequence,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Editable.html#getFilters()"/> <see href="https://developer.android.com/reference/android/text/Editable.html#setFilters(android.text.InputFilter[])"/>
-        /// </summary>
-        public Android.Text.InputFilter[] Filters
-        {
-            get { return IExecuteWithSignatureArray<Android.Text.InputFilter>("getFilters", "()[Landroid/text/InputFilter;"); } set { IExecuteWithSignature("setFilters", "([Landroid/text/InputFilter;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Editable.html#delete(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -143,6 +136,14 @@ public Android.Text.Editable Replace(int arg0, int arg1, Java.Lang.CharSequence
             return IExecute<Android.Text.Editable>("replace", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Editable.html#getFilters()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Text.InputFilter"/></returns>
+        public Android.Text.InputFilter[] GetFilters()
+        {
+            return IExecuteWithSignatureArray<Android.Text.InputFilter>("getFilters", "()[Landroid/text/InputFilter;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Editable.html#clear()"/>
         /// </summary>
         public void Clear()
@@ -157,6 +158,14 @@ public void ClearSpans()
             IExecuteWithSignature("clearSpans", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Editable.html#setFilters(android.text.InputFilter[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Text.InputFilter"/></param>
+        public void SetFilters(Android.Text.InputFilter[] arg0)
+        {
+            IExecuteWithSignature("setFilters", "([Landroid/text/InputFilter;)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Editable.html#append(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -209,11 +218,12 @@ public partial class Factory
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/Editable.Factory.html#getInstance()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/Editable.Factory.html#getInstance()"/>
             /// </summary>
-            public static Android.Text.Editable.Factory Instance
+            /// <returns><see cref="Android.Text.Editable.Factory"/></returns>
+            public static Android.Text.Editable.Factory GetInstance()
             {
-                get { return SExecuteWithSignature<Android.Text.Editable.Factory>(LocalBridgeClazz, "getInstance", "()Landroid/text/Editable$Factory;"); }
+                return SExecuteWithSignature<Android.Text.Editable.Factory>(LocalBridgeClazz, "getInstance", "()Landroid/text/Editable$Factory;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/EmojiConsistency.cs b/src/net/Netdroid/Generated/Android/Text/EmojiConsistency.cs
index 56cf18412..88ff90bb8 100644
--- a/src/net/Netdroid/Generated/Android/Text/EmojiConsistency.cs
+++ b/src/net/Netdroid/Generated/Android/Text/EmojiConsistency.cs
@@ -42,11 +42,12 @@ public partial class EmojiConsistency
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/EmojiConsistency.html#getEmojiConsistencySet()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/EmojiConsistency.html#getEmojiConsistencySet()"/>
         /// </summary>
-        public static Java.Util.Set<int[]> EmojiConsistencySet
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<int[]> GetEmojiConsistencySet()
         {
-            get { return SExecuteWithSignature<Java.Util.Set<int[]>>(LocalBridgeClazz, "getEmojiConsistencySet", "()Ljava/util/Set;"); }
+            return SExecuteWithSignature<Java.Util.Set<int[]>>(LocalBridgeClazz, "getEmojiConsistencySet", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Format/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Text/Format/AllPackageClasses.cs
index 45e8bedf1..c4b4d4dad 100644
--- a/src/net/Netdroid/Generated/Android/Text/Format/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Format/AllPackageClasses.cs
@@ -162,7 +162,7 @@ public Formatter(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/format/Time.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Time : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Time>
     {
         const string _bridgeClassName = "android.text.format.Time";
diff --git a/src/net/Netdroid/Generated/Android/Text/Format/DateUtils.cs b/src/net/Netdroid/Generated/Android/Text/Format/DateUtils.cs
index a96be4db3..75728accf 100644
--- a/src/net/Netdroid/Generated/Android/Text/Format/DateUtils.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Format/DateUtils.cs
@@ -40,14 +40,14 @@ public partial class DateUtils
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#FORMAT_12HOUR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORMAT_12HOUR { get { if (!_FORMAT_12HOURReady) { _FORMAT_12HOURContent = SGetField<int>(LocalBridgeClazz, "FORMAT_12HOUR"); _FORMAT_12HOURReady = true; } return _FORMAT_12HOURContent; } }
         private static int _FORMAT_12HOURContent = default;
         private static bool _FORMAT_12HOURReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#FORMAT_24HOUR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORMAT_24HOUR { get { if (!_FORMAT_24HOURReady) { _FORMAT_24HOURContent = SGetField<int>(LocalBridgeClazz, "FORMAT_24HOUR"); _FORMAT_24HOURReady = true; } return _FORMAT_24HOURContent; } }
         private static int _FORMAT_24HOURContent = default;
         private static bool _FORMAT_24HOURReady = false; // this is used because in case of generics 
@@ -84,28 +84,28 @@ public partial class DateUtils
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#FORMAT_CAP_AMPM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORMAT_CAP_AMPM { get { if (!_FORMAT_CAP_AMPMReady) { _FORMAT_CAP_AMPMContent = SGetField<int>(LocalBridgeClazz, "FORMAT_CAP_AMPM"); _FORMAT_CAP_AMPMReady = true; } return _FORMAT_CAP_AMPMContent; } }
         private static int _FORMAT_CAP_AMPMContent = default;
         private static bool _FORMAT_CAP_AMPMReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#FORMAT_CAP_MIDNIGHT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORMAT_CAP_MIDNIGHT { get { if (!_FORMAT_CAP_MIDNIGHTReady) { _FORMAT_CAP_MIDNIGHTContent = SGetField<int>(LocalBridgeClazz, "FORMAT_CAP_MIDNIGHT"); _FORMAT_CAP_MIDNIGHTReady = true; } return _FORMAT_CAP_MIDNIGHTContent; } }
         private static int _FORMAT_CAP_MIDNIGHTContent = default;
         private static bool _FORMAT_CAP_MIDNIGHTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#FORMAT_CAP_NOON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORMAT_CAP_NOON { get { if (!_FORMAT_CAP_NOONReady) { _FORMAT_CAP_NOONContent = SGetField<int>(LocalBridgeClazz, "FORMAT_CAP_NOON"); _FORMAT_CAP_NOONReady = true; } return _FORMAT_CAP_NOONContent; } }
         private static int _FORMAT_CAP_NOONContent = default;
         private static bool _FORMAT_CAP_NOONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#FORMAT_CAP_NOON_MIDNIGHT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORMAT_CAP_NOON_MIDNIGHT { get { if (!_FORMAT_CAP_NOON_MIDNIGHTReady) { _FORMAT_CAP_NOON_MIDNIGHTContent = SGetField<int>(LocalBridgeClazz, "FORMAT_CAP_NOON_MIDNIGHT"); _FORMAT_CAP_NOON_MIDNIGHTReady = true; } return _FORMAT_CAP_NOON_MIDNIGHTContent; } }
         private static int _FORMAT_CAP_NOON_MIDNIGHTContent = default;
         private static bool _FORMAT_CAP_NOON_MIDNIGHTReady = false; // this is used because in case of generics 
@@ -130,7 +130,7 @@ public partial class DateUtils
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#FORMAT_NO_NOON_MIDNIGHT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORMAT_NO_NOON_MIDNIGHT { get { if (!_FORMAT_NO_NOON_MIDNIGHTReady) { _FORMAT_NO_NOON_MIDNIGHTContent = SGetField<int>(LocalBridgeClazz, "FORMAT_NO_NOON_MIDNIGHT"); _FORMAT_NO_NOON_MIDNIGHTReady = true; } return _FORMAT_NO_NOON_MIDNIGHTContent; } }
         private static int _FORMAT_NO_NOON_MIDNIGHTContent = default;
         private static bool _FORMAT_NO_NOON_MIDNIGHTReady = false; // this is used because in case of generics 
@@ -173,63 +173,63 @@ public partial class DateUtils
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#FORMAT_UTC"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORMAT_UTC { get { if (!_FORMAT_UTCReady) { _FORMAT_UTCContent = SGetField<int>(LocalBridgeClazz, "FORMAT_UTC"); _FORMAT_UTCReady = true; } return _FORMAT_UTCContent; } }
         private static int _FORMAT_UTCContent = default;
         private static bool _FORMAT_UTCReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#LENGTH_LONG"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LENGTH_LONG { get { if (!_LENGTH_LONGReady) { _LENGTH_LONGContent = SGetField<int>(LocalBridgeClazz, "LENGTH_LONG"); _LENGTH_LONGReady = true; } return _LENGTH_LONGContent; } }
         private static int _LENGTH_LONGContent = default;
         private static bool _LENGTH_LONGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#LENGTH_MEDIUM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LENGTH_MEDIUM { get { if (!_LENGTH_MEDIUMReady) { _LENGTH_MEDIUMContent = SGetField<int>(LocalBridgeClazz, "LENGTH_MEDIUM"); _LENGTH_MEDIUMReady = true; } return _LENGTH_MEDIUMContent; } }
         private static int _LENGTH_MEDIUMContent = default;
         private static bool _LENGTH_MEDIUMReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#LENGTH_SHORT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LENGTH_SHORT { get { if (!_LENGTH_SHORTReady) { _LENGTH_SHORTContent = SGetField<int>(LocalBridgeClazz, "LENGTH_SHORT"); _LENGTH_SHORTReady = true; } return _LENGTH_SHORTContent; } }
         private static int _LENGTH_SHORTContent = default;
         private static bool _LENGTH_SHORTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#LENGTH_SHORTER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LENGTH_SHORTER { get { if (!_LENGTH_SHORTERReady) { _LENGTH_SHORTERContent = SGetField<int>(LocalBridgeClazz, "LENGTH_SHORTER"); _LENGTH_SHORTERReady = true; } return _LENGTH_SHORTERContent; } }
         private static int _LENGTH_SHORTERContent = default;
         private static bool _LENGTH_SHORTERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#LENGTH_SHORTEST"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LENGTH_SHORTEST { get { if (!_LENGTH_SHORTESTReady) { _LENGTH_SHORTESTContent = SGetField<int>(LocalBridgeClazz, "LENGTH_SHORTEST"); _LENGTH_SHORTESTReady = true; } return _LENGTH_SHORTESTContent; } }
         private static int _LENGTH_SHORTESTContent = default;
         private static bool _LENGTH_SHORTESTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#sameMonthTable"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int[] sameMonthTable { get { if (!_sameMonthTableReady) { _sameMonthTableContent = SGetFieldArray<int>(LocalBridgeClazz, "sameMonthTable"); _sameMonthTableReady = true; } return _sameMonthTableContent; } }
         private static int[] _sameMonthTableContent = default;
         private static bool _sameMonthTableReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#sameYearTable"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int[] sameYearTable { get { if (!_sameYearTableReady) { _sameYearTableContent = SGetFieldArray<int>(LocalBridgeClazz, "sameYearTable"); _sameYearTableReady = true; } return _sameYearTableContent; } }
         private static int[] _sameYearTableContent = default;
         private static bool _sameYearTableReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#ABBREV_MONTH_FORMAT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ABBREV_MONTH_FORMAT { get { if (!_ABBREV_MONTH_FORMATReady) { _ABBREV_MONTH_FORMATContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ABBREV_MONTH_FORMAT"); _ABBREV_MONTH_FORMATReady = true; } return _ABBREV_MONTH_FORMATContent; } }
         private static Java.Lang.String _ABBREV_MONTH_FORMATContent = default;
         private static bool _ABBREV_MONTH_FORMATReady = false; // this is used because in case of generics 
@@ -242,7 +242,7 @@ public partial class DateUtils
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#HOUR_MINUTE_24"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String HOUR_MINUTE_24 { get { if (!_HOUR_MINUTE_24Ready) { _HOUR_MINUTE_24Content = SGetField<Java.Lang.String>(LocalBridgeClazz, "HOUR_MINUTE_24"); _HOUR_MINUTE_24Ready = true; } return _HOUR_MINUTE_24Content; } }
         private static Java.Lang.String _HOUR_MINUTE_24Content = default;
         private static bool _HOUR_MINUTE_24Ready = false; // this is used because in case of generics 
@@ -315,7 +315,7 @@ public partial class DateUtils
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/DateUtils.html#YEAR_IN_MILLIS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long YEAR_IN_MILLIS { get { if (!_YEAR_IN_MILLISReady) { _YEAR_IN_MILLISContent = SGetField<long>(LocalBridgeClazz, "YEAR_IN_MILLIS"); _YEAR_IN_MILLISReady = true; } return _YEAR_IN_MILLISContent; } }
         private static long _YEAR_IN_MILLISContent = default;
         private static bool _YEAR_IN_MILLISReady = false; // this is used because in case of generics 
@@ -457,7 +457,7 @@ public static Java.Lang.String FormatElapsedTime(long arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetAMPMString(int arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getAMPMString", "(I)Ljava/lang/String;", arg0);
@@ -468,7 +468,7 @@ public static Java.Lang.String GetAMPMString(int arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetDayOfWeekString(int arg0, int arg1)
         {
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "getDayOfWeekString", arg0, arg1);
@@ -479,7 +479,7 @@ public static Java.Lang.String GetDayOfWeekString(int arg0, int arg1)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetMonthString(int arg0, int arg1)
         {
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "getMonthString", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Text/Format/Formatter.cs b/src/net/Netdroid/Generated/Android/Text/Format/Formatter.cs
index 73c55bf4f..4d1790ff0 100644
--- a/src/net/Netdroid/Generated/Android/Text/Format/Formatter.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Format/Formatter.cs
@@ -56,7 +56,7 @@ public static Java.Lang.String FormatFileSize(Android.Content.Context arg0, long
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String FormatIpAddress(int arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "formatIpAddress", "(I)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Text/Format/Time.cs b/src/net/Netdroid/Generated/Android/Text/Format/Time.cs
index 3e827841d..7ce21dc50 100644
--- a/src/net/Netdroid/Generated/Android/Text/Format/Time.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Format/Time.cs
@@ -33,7 +33,7 @@ public partial class Time
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#%3Cinit%3E(android.text.format.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Format.Time"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Time(Android.Text.Format.Time arg0)
             : base(arg0)
         {
@@ -42,7 +42,7 @@ public Time(Android.Text.Format.Time arg0)
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Time(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -58,193 +58,193 @@ public Time(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#allDay"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool allDay { get { return IGetField<bool>("allDay"); } set { ISetField("allDay", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#hour"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int hour { get { return IGetField<int>("hour"); } set { ISetField("hour", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#isDst"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int isDst { get { return IGetField<int>("isDst"); } set { ISetField("isDst", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#minute"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int minute { get { return IGetField<int>("minute"); } set { ISetField("minute", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#month"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int month { get { return IGetField<int>("month"); } set { ISetField("month", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#monthDay"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int monthDay { get { return IGetField<int>("monthDay"); } set { ISetField("monthDay", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#second"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int second { get { return IGetField<int>("second"); } set { ISetField("second", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#weekDay"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int weekDay { get { return IGetField<int>("weekDay"); } set { ISetField("weekDay", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#year"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int year { get { return IGetField<int>("year"); } set { ISetField("year", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#yearDay"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int yearDay { get { return IGetField<int>("yearDay"); } set { ISetField("yearDay", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#timezone"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String timezone { get { return IGetField<Java.Lang.String>("timezone"); } set { ISetField("timezone", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#gmtoff"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long gmtoff { get { return IGetField<long>("gmtoff"); } set { ISetField("gmtoff", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#EPOCH_JULIAN_DAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int EPOCH_JULIAN_DAY { get { if (!_EPOCH_JULIAN_DAYReady) { _EPOCH_JULIAN_DAYContent = SGetField<int>(LocalBridgeClazz, "EPOCH_JULIAN_DAY"); _EPOCH_JULIAN_DAYReady = true; } return _EPOCH_JULIAN_DAYContent; } }
         private static int _EPOCH_JULIAN_DAYContent = default;
         private static bool _EPOCH_JULIAN_DAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#FRIDAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FRIDAY { get { if (!_FRIDAYReady) { _FRIDAYContent = SGetField<int>(LocalBridgeClazz, "FRIDAY"); _FRIDAYReady = true; } return _FRIDAYContent; } }
         private static int _FRIDAYContent = default;
         private static bool _FRIDAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#HOUR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int HOUR { get { if (!_HOURReady) { _HOURContent = SGetField<int>(LocalBridgeClazz, "HOUR"); _HOURReady = true; } return _HOURContent; } }
         private static int _HOURContent = default;
         private static bool _HOURReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#MINUTE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MINUTE { get { if (!_MINUTEReady) { _MINUTEContent = SGetField<int>(LocalBridgeClazz, "MINUTE"); _MINUTEReady = true; } return _MINUTEContent; } }
         private static int _MINUTEContent = default;
         private static bool _MINUTEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#MONDAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MONDAY { get { if (!_MONDAYReady) { _MONDAYContent = SGetField<int>(LocalBridgeClazz, "MONDAY"); _MONDAYReady = true; } return _MONDAYContent; } }
         private static int _MONDAYContent = default;
         private static bool _MONDAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#MONDAY_BEFORE_JULIAN_EPOCH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MONDAY_BEFORE_JULIAN_EPOCH { get { if (!_MONDAY_BEFORE_JULIAN_EPOCHReady) { _MONDAY_BEFORE_JULIAN_EPOCHContent = SGetField<int>(LocalBridgeClazz, "MONDAY_BEFORE_JULIAN_EPOCH"); _MONDAY_BEFORE_JULIAN_EPOCHReady = true; } return _MONDAY_BEFORE_JULIAN_EPOCHContent; } }
         private static int _MONDAY_BEFORE_JULIAN_EPOCHContent = default;
         private static bool _MONDAY_BEFORE_JULIAN_EPOCHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#MONTH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MONTH { get { if (!_MONTHReady) { _MONTHContent = SGetField<int>(LocalBridgeClazz, "MONTH"); _MONTHReady = true; } return _MONTHContent; } }
         private static int _MONTHContent = default;
         private static bool _MONTHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#MONTH_DAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MONTH_DAY { get { if (!_MONTH_DAYReady) { _MONTH_DAYContent = SGetField<int>(LocalBridgeClazz, "MONTH_DAY"); _MONTH_DAYReady = true; } return _MONTH_DAYContent; } }
         private static int _MONTH_DAYContent = default;
         private static bool _MONTH_DAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#SATURDAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SATURDAY { get { if (!_SATURDAYReady) { _SATURDAYContent = SGetField<int>(LocalBridgeClazz, "SATURDAY"); _SATURDAYReady = true; } return _SATURDAYContent; } }
         private static int _SATURDAYContent = default;
         private static bool _SATURDAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#SECOND"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SECOND { get { if (!_SECONDReady) { _SECONDContent = SGetField<int>(LocalBridgeClazz, "SECOND"); _SECONDReady = true; } return _SECONDContent; } }
         private static int _SECONDContent = default;
         private static bool _SECONDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#SUNDAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SUNDAY { get { if (!_SUNDAYReady) { _SUNDAYContent = SGetField<int>(LocalBridgeClazz, "SUNDAY"); _SUNDAYReady = true; } return _SUNDAYContent; } }
         private static int _SUNDAYContent = default;
         private static bool _SUNDAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#THURSDAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int THURSDAY { get { if (!_THURSDAYReady) { _THURSDAYContent = SGetField<int>(LocalBridgeClazz, "THURSDAY"); _THURSDAYReady = true; } return _THURSDAYContent; } }
         private static int _THURSDAYContent = default;
         private static bool _THURSDAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#TUESDAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int TUESDAY { get { if (!_TUESDAYReady) { _TUESDAYContent = SGetField<int>(LocalBridgeClazz, "TUESDAY"); _TUESDAYReady = true; } return _TUESDAYContent; } }
         private static int _TUESDAYContent = default;
         private static bool _TUESDAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#WEDNESDAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WEDNESDAY { get { if (!_WEDNESDAYReady) { _WEDNESDAYContent = SGetField<int>(LocalBridgeClazz, "WEDNESDAY"); _WEDNESDAYReady = true; } return _WEDNESDAYContent; } }
         private static int _WEDNESDAYContent = default;
         private static bool _WEDNESDAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#WEEK_DAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WEEK_DAY { get { if (!_WEEK_DAYReady) { _WEEK_DAYContent = SGetField<int>(LocalBridgeClazz, "WEEK_DAY"); _WEEK_DAYReady = true; } return _WEEK_DAYContent; } }
         private static int _WEEK_DAYContent = default;
         private static bool _WEEK_DAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#WEEK_NUM"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int WEEK_NUM { get { if (!_WEEK_NUMReady) { _WEEK_NUMContent = SGetField<int>(LocalBridgeClazz, "WEEK_NUM"); _WEEK_NUMReady = true; } return _WEEK_NUMContent; } }
         private static int _WEEK_NUMContent = default;
         private static bool _WEEK_NUMReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#YEAR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int YEAR { get { if (!_YEARReady) { _YEARContent = SGetField<int>(LocalBridgeClazz, "YEAR"); _YEARReady = true; } return _YEARContent; } }
         private static int _YEARContent = default;
         private static bool _YEARReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#YEAR_DAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int YEAR_DAY { get { if (!_YEAR_DAYReady) { _YEAR_DAYContent = SGetField<int>(LocalBridgeClazz, "YEAR_DAY"); _YEAR_DAYReady = true; } return _YEAR_DAYContent; } }
         private static int _YEAR_DAYContent = default;
         private static bool _YEAR_DAYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#TIMEZONE_UTC"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TIMEZONE_UTC { get { if (!_TIMEZONE_UTCReady) { _TIMEZONE_UTCContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TIMEZONE_UTC"); _TIMEZONE_UTCReady = true; } return _TIMEZONE_UTCContent; } }
         private static Java.Lang.String _TIMEZONE_UTCContent = default;
         private static bool _TIMEZONE_UTCReady = false; // this is used because in case of generics 
@@ -253,19 +253,11 @@ public Time(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/format/Time.html#getCurrentTimezone()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static Java.Lang.String CurrentTimezone
-        {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getCurrentTimezone", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#isEpoch(android.text.format.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Format.Time"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsEpoch(Android.Text.Format.Time arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isEpoch", "(Landroid/text/format/Time;)Z", arg0);
@@ -276,7 +268,7 @@ public static bool IsEpoch(Android.Text.Format.Time arg0)
         /// <param name="arg0"><see cref="Android.Text.Format.Time"/></param>
         /// <param name="arg1"><see cref="Android.Text.Format.Time"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int Compare(Android.Text.Format.Time arg0, Android.Text.Format.Time arg1)
         {
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
@@ -287,7 +279,7 @@ public static int Compare(Android.Text.Format.Time arg0, Android.Text.Format.Tim
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetJulianDay(long arg0, long arg1)
         {
             return SExecute<int>(LocalBridgeClazz, "getJulianDay", arg0, arg1);
@@ -297,7 +289,7 @@ public static int GetJulianDay(long arg0, long arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetJulianMondayFromWeeksSinceEpoch(int arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getJulianMondayFromWeeksSinceEpoch", "(I)I", arg0);
@@ -308,29 +300,30 @@ public static int GetJulianMondayFromWeeksSinceEpoch(int arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetWeeksSinceEpochFromJulianDay(int arg0, int arg1)
         {
             return SExecute<int>(LocalBridgeClazz, "getWeeksSinceEpochFromJulianDay", arg0, arg1);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/format/Time.html#getWeekNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/format/Time.html#getCurrentTimezone()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int WeekNumber
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public static Java.Lang.String GetCurrentTimezone()
         {
-            get { return IExecuteWithSignature<int>("getWeekNumber", "()I"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getCurrentTimezone", "()Ljava/lang/String;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#after(android.text.format.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Format.Time"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool After(Android.Text.Format.Time arg0)
         {
             return IExecuteWithSignature<bool>("after", "(Landroid/text/format/Time;)Z", arg0);
@@ -340,7 +333,7 @@ public bool After(Android.Text.Format.Time arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Format.Time"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Before(Android.Text.Format.Time arg0)
         {
             return IExecuteWithSignature<bool>("before", "(Landroid/text/format/Time;)Z", arg0);
@@ -350,7 +343,7 @@ public bool Before(Android.Text.Format.Time arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Parse(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("parse", "(Ljava/lang/String;)Z", arg0);
@@ -360,7 +353,7 @@ public bool Parse(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Parse3339(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("parse3339", "(Ljava/lang/String;)Z", arg0);
@@ -370,17 +363,26 @@ public bool Parse3339(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetActualMaximum(int arg0)
         {
             return IExecuteWithSignature<int>("getActualMaximum", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/format/Time.html#getWeekNumber()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetWeekNumber()
+        {
+            return IExecuteWithSignature<int>("getWeekNumber", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#format(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String Format(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
@@ -389,7 +391,7 @@ public Java.Lang.String Format(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#format2445()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String Format2445()
         {
             return IExecuteWithSignature<Java.Lang.String>("format2445", "()Ljava/lang/String;");
@@ -399,7 +401,7 @@ public Java.Lang.String Format2445()
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String Format3339(bool arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("format3339", "(Z)Ljava/lang/String;", arg0);
@@ -409,7 +411,7 @@ public Java.Lang.String Format3339(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long Normalize(bool arg0)
         {
             return IExecuteWithSignature<long>("normalize", "(Z)J", arg0);
@@ -419,7 +421,7 @@ public long Normalize(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long SetJulianDay(int arg0)
         {
             return IExecuteWithSignature<long>("setJulianDay", "(I)J", arg0);
@@ -429,7 +431,7 @@ public long SetJulianDay(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long ToMillis(bool arg0)
         {
             return IExecuteWithSignature<long>("toMillis", "(Z)J", arg0);
@@ -438,7 +440,7 @@ public long ToMillis(bool arg0)
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#clear(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Clear(Java.Lang.String arg0)
         {
             IExecuteWithSignature("clear", "(Ljava/lang/String;)V", arg0);
@@ -447,7 +449,7 @@ public void Clear(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#set(android.text.format.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Format.Time"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Set(Android.Text.Format.Time arg0)
         {
             IExecuteWithSignature("set", "(Landroid/text/format/Time;)V", arg0);
@@ -461,7 +463,7 @@ public void Set(Android.Text.Format.Time arg0)
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Set(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
         {
             IExecute("set", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -472,7 +474,7 @@ public void Set(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Set(int arg0, int arg1, int arg2)
         {
             IExecute("set", arg0, arg1, arg2);
@@ -481,7 +483,7 @@ public void Set(int arg0, int arg1, int arg2)
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#set(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Set(long arg0)
         {
             IExecuteWithSignature("set", "(J)V", arg0);
@@ -489,7 +491,7 @@ public void Set(long arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#setToNow()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetToNow()
         {
             IExecuteWithSignature("setToNow", "()V");
@@ -498,7 +500,7 @@ public void SetToNow()
         /// <see href="https://developer.android.com/reference/android/text/format/Time.html#switchTimezone(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SwitchTimezone(Java.Lang.String arg0)
         {
             IExecuteWithSignature("switchTimezone", "(Ljava/lang/String;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Text/Highlights.cs b/src/net/Netdroid/Generated/Android/Text/Highlights.cs
index 2d1e49eb8..f2adfcb79 100644
--- a/src/net/Netdroid/Generated/Android/Text/Highlights.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Highlights.cs
@@ -46,13 +46,6 @@ public partial class Highlights
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Highlights.html#getSize()"/> 
-        /// </summary>
-        public int Size
-        {
-            get { return IExecuteWithSignature<int>("getSize", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Highlights.html#getPaint(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -62,6 +55,14 @@ public Android.Graphics.Paint GetPaint(int arg0)
             return IExecuteWithSignature<Android.Graphics.Paint>("getPaint", "(I)Landroid/graphics/Paint;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Highlights.html#getSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSize()
+        {
+            return IExecuteWithSignature<int>("getSize", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Highlights.html#getRanges(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Text/Html.cs b/src/net/Netdroid/Generated/Android/Text/Html.cs
index 9a0876058..624587561 100644
--- a/src/net/Netdroid/Generated/Android/Text/Html.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Html.cs
@@ -114,7 +114,7 @@ public partial class Html
         /// <param name="arg1"><see cref="Android.Text.Html.ImageGetter"/></param>
         /// <param name="arg2"><see cref="Android.Text.Html.TagHandler"/></param>
         /// <returns><see cref="Android.Text.Spanned"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Text.Spanned FromHtml(Java.Lang.String arg0, Android.Text.Html.ImageGetter arg1, Android.Text.Html.TagHandler arg2)
         {
             return SExecute<Android.Text.Spanned>(LocalBridgeClazz, "fromHtml", arg0, arg1, arg2);
@@ -146,7 +146,7 @@ public static Android.Text.Spanned FromHtml(Java.Lang.String arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Text.Spanned"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Text.Spanned FromHtml(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Android.Text.Spanned>(LocalBridgeClazz, "fromHtml", "(Ljava/lang/String;)Landroid/text/Spanned;", arg0);
@@ -175,7 +175,7 @@ public static Java.Lang.String ToHtml(Android.Text.Spanned arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spanned"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ToHtml(Android.Text.Spanned arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toHtml", "(Landroid/text/Spanned;)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Text/InputFilter.cs b/src/net/Netdroid/Generated/Android/Text/InputFilter.cs
index 16dc83f22..8f446256d 100644
--- a/src/net/Netdroid/Generated/Android/Text/InputFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Text/InputFilter.cs
@@ -163,11 +163,12 @@ public LengthFilter(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/InputFilter.LengthFilter.html#getMax()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/InputFilter.LengthFilter.html#getMax()"/>
             /// </summary>
-            public int Max
+            /// <returns><see cref="int"/></returns>
+            public int GetMax()
             {
-                get { return IExecuteWithSignature<int>("getMax", "()I"); }
+                return IExecuteWithSignature<int>("getMax", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/text/InputFilter.LengthFilter.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Layout.cs b/src/net/Netdroid/Generated/Android/Text/Layout.cs
index 5de197e4a..23ad75dc8 100644
--- a/src/net/Netdroid/Generated/Android/Text/Layout.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Layout.cs
@@ -170,83 +170,6 @@ public static float GetDesiredWidth(Java.Lang.CharSequence arg0, int arg1, int a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getBottomPadding()"/> 
-        /// </summary>
-        public int BottomPadding
-        {
-            get { return IExecuteWithSignature<int>("getBottomPadding", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getEllipsizedWidth()"/> 
-        /// </summary>
-        public int EllipsizedWidth
-        {
-            get { return IExecuteWithSignature<int>("getEllipsizedWidth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getAlignment()"/> 
-        /// </summary>
-        public Android.Text.Layout.Alignment GetAlignment
-        {
-            get { return IExecuteWithSignature<Android.Text.Layout.Alignment>("getAlignment", "()Landroid/text/Layout$Alignment;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getHeight()"/> 
-        /// </summary>
-        public int Height
-        {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getLineCount()"/> 
-        /// </summary>
-        public int LineCount
-        {
-            get { return IExecuteWithSignature<int>("getLineCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getPaint()"/> 
-        /// </summary>
-        public Android.Text.TextPaint Paint
-        {
-            get { return IExecuteWithSignature<Android.Text.TextPaint>("getPaint", "()Landroid/text/TextPaint;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getSpacingAdd()"/> 
-        /// </summary>
-        public float SpacingAdd
-        {
-            get { return IExecuteWithSignature<float>("getSpacingAdd", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getSpacingMultiplier()"/> 
-        /// </summary>
-        public float SpacingMultiplier
-        {
-            get { return IExecuteWithSignature<float>("getSpacingMultiplier", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getText()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Text
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getTopPadding()"/> 
-        /// </summary>
-        public int TopPadding
-        {
-            get { return IExecuteWithSignature<int>("getTopPadding", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getWidth()"/> 
-        /// </summary>
-        public int Width
-        {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Layout.html#getLineDirections(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -265,6 +188,14 @@ public bool GetLineContainsTab(int arg0)
             return IExecuteWithSignature<bool>("getLineContainsTab", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getBottomPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBottomPadding()
+        {
+            return IExecuteWithSignature<int>("getBottomPadding", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Layout.html#getEllipsisCount(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -283,6 +214,14 @@ public int GetEllipsisStart(int arg0)
             return IExecuteWithSignature<int>("getEllipsisStart", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getLineCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLineCount()
+        {
+            return IExecuteWithSignature<int>("getLineCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Layout.html#getLineDescent(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -319,6 +258,14 @@ public int GetParagraphDirection(int arg0)
             return IExecuteWithSignature<int>("getParagraphDirection", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getTopPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTopPadding()
+        {
+            return IExecuteWithSignature<int>("getTopPadding", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Layout.html#isFallbackLineSpacingEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -336,6 +283,14 @@ public bool IsRtlCharAt(int arg0)
             return IExecuteWithSignature<bool>("isRtlCharAt", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getAlignment()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Text.Layout.Alignment"/></returns>
+        public Android.Text.Layout.Alignment GetAlignment()
+        {
+            return IExecuteWithSignature<Android.Text.Layout.Alignment>("getAlignment", "()Landroid/text/Layout$Alignment;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Layout.html#getParagraphAlignment(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -345,6 +300,30 @@ public Android.Text.Layout.Alignment GetParagraphAlignment(int arg0)
             return IExecuteWithSignature<Android.Text.Layout.Alignment>("getParagraphAlignment", "(I)Landroid/text/Layout$Alignment;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getPaint()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Text.TextPaint"/></returns>
+        public Android.Text.TextPaint GetPaint()
+        {
+            return IExecuteWithSignature<Android.Text.TextPaint>("getPaint", "()Landroid/text/TextPaint;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getSpacingAdd()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetSpacingAdd()
+        {
+            return IExecuteWithSignature<float>("getSpacingAdd", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getSpacingMultiplier()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetSpacingMultiplier()
+        {
+            return IExecuteWithSignature<float>("getSpacingMultiplier", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Layout.html#getLineAscent(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -399,6 +378,22 @@ public int GetParagraphRight(int arg0)
             return IExecuteWithSignature<int>("getParagraphRight", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
+        {
+            return IExecuteWithSignature<int>("getWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Layout.html#increaseWidthTo(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -461,6 +456,22 @@ public float GetSecondaryHorizontal(int arg0)
             return IExecuteWithSignature<float>("getSecondaryHorizontal", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getEllipsizedWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetEllipsizedWidth()
+        {
+            return IExecuteWithSignature<int>("getEllipsizedWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/Layout.html#getHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
+        {
+            return IExecuteWithSignature<int>("getHeight", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/Layout.html#getLineBottom(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Text/LoginFilter.cs b/src/net/Netdroid/Generated/Android/Text/LoginFilter.cs
index 61ee21672..0a7b15afb 100644
--- a/src/net/Netdroid/Generated/Android/Text/LoginFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Text/LoginFilter.cs
@@ -50,7 +50,7 @@ public partial class LoginFilter
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAllowed(char arg0)
         {
             return IExecuteWithSignature<bool>("isAllowed", "(C)Z", arg0);
@@ -65,7 +65,7 @@ public bool IsAllowed(char arg0)
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
         {
             return IExecute<Java.Lang.CharSequence>("filter", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -74,7 +74,7 @@ public Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int
         /// <see href="https://developer.android.com/reference/android/text/LoginFilter.html#onInvalidCharacter(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnInvalidCharacter(char arg0)
         {
             IExecuteWithSignature("onInvalidCharacter", "(C)V", arg0);
@@ -82,7 +82,7 @@ public void OnInvalidCharacter(char arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/LoginFilter.html#onStart()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStart()
         {
             IExecuteWithSignature("onStart", "()V");
@@ -90,7 +90,7 @@ public void OnStart()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/LoginFilter.html#onStop()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnStop()
         {
             IExecuteWithSignature("onStop", "()V");
@@ -107,7 +107,7 @@ public partial class PasswordFilterGMail
             /// <see href="https://developer.android.com/reference/android/text/LoginFilter.PasswordFilterGMail.html#%3Cinit%3E(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public PasswordFilterGMail(bool arg0)
                 : base(arg0)
             {
@@ -147,7 +147,7 @@ public partial class UsernameFilterGeneric
             /// <see href="https://developer.android.com/reference/android/text/LoginFilter.UsernameFilterGeneric.html#%3Cinit%3E(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public UsernameFilterGeneric(bool arg0)
                 : base(arg0)
             {
@@ -187,7 +187,7 @@ public partial class UsernameFilterGMail
             /// <see href="https://developer.android.com/reference/android/text/LoginFilter.UsernameFilterGMail.html#%3Cinit%3E(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public UsernameFilterGMail(bool arg0)
                 : base(arg0)
             {
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Text/Method/AllPackageClasses.cs
index 713ad2995..d5acaaafa 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/AllPackageClasses.cs
@@ -81,10 +81,13 @@ public partial class BaseKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
         /// </summary>
         public BaseKeyListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.text.method.BaseKeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.text.method.BaseKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -106,10 +109,13 @@ public partial class BaseKeyListenerDirect : BaseKeyListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.text.method.BaseKeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.BaseKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -221,38 +227,24 @@ public CharacterPickerDialog(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/method/DateKeyListener.html"/>
     /// </summary>
-    public partial class DateKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class DateKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DateKeyListener>
     {
+        const string _bridgeClassName = "android.text.method.DateKeyListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public DateKeyListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region DateKeyListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="DateKeyListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class DateKeyListenerDirect : DateKeyListener
-    {
+        public DateKeyListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public DateKeyListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.DateKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -269,6 +261,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -276,38 +271,24 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener.html"/>
     /// </summary>
-    public partial class DateTimeKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class DateTimeKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DateTimeKeyListener>
     {
+        const string _bridgeClassName = "android.text.method.DateTimeKeyListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public DateTimeKeyListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region DateTimeKeyListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="DateTimeKeyListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class DateTimeKeyListenerDirect : DateTimeKeyListener
-    {
+        public DateTimeKeyListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public DateTimeKeyListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.DateTimeKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -324,6 +305,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -331,38 +315,24 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/method/DialerKeyListener.html"/>
     /// </summary>
-    public partial class DialerKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class DialerKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DialerKeyListener>
     {
+        const string _bridgeClassName = "android.text.method.DialerKeyListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public DialerKeyListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region DialerKeyListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="DialerKeyListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class DialerKeyListenerDirect : DialerKeyListener
-    {
+        public DialerKeyListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public DialerKeyListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.DialerKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -379,6 +349,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -386,38 +359,24 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html"/>
     /// </summary>
-    public partial class DigitsKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class DigitsKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DigitsKeyListener>
     {
+        const string _bridgeClassName = "android.text.method.DigitsKeyListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public DigitsKeyListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region DigitsKeyListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="DigitsKeyListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class DigitsKeyListenerDirect : DigitsKeyListener
-    {
+        public DigitsKeyListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public DigitsKeyListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.DigitsKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -434,6 +393,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -492,10 +454,13 @@ public partial class KeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public KeyListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.text.method.KeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.text.method.KeyListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -517,10 +482,13 @@ public partial class KeyListenerDirect : KeyListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.text.method.KeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.KeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -588,38 +556,26 @@ public LinkMovementMethod(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html"/>
     /// </summary>
-    public partial class MetaKeyKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class MetaKeyKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MetaKeyKeyListener>
     {
+        const string _bridgeClassName = "android.text.method.MetaKeyKeyListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public MetaKeyKeyListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region MetaKeyKeyListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="MetaKeyKeyListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class MetaKeyKeyListenerDirect : MetaKeyKeyListener
-    {
+        [global::System.Obsolete("MetaKeyKeyListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public MetaKeyKeyListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("MetaKeyKeyListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public MetaKeyKeyListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.MetaKeyKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -636,6 +592,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -649,12 +608,12 @@ public partial class MovementMethod : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Mo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MovementMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MovementMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MovementMethod() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MovementMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MovementMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MovementMethod(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -696,10 +655,13 @@ public partial class MultiTapKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public MultiTapKeyListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.text.method.MultiTapKeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.text.method.MultiTapKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -721,10 +683,13 @@ public partial class MultiTapKeyListenerDirect : MultiTapKeyListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.text.method.MultiTapKeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.MultiTapKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -755,10 +720,13 @@ public partial class NumberKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public NumberKeyListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.text.method.NumberKeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.text.method.NumberKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -780,10 +748,13 @@ public partial class NumberKeyListenerDirect : NumberKeyListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.text.method.NumberKeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.NumberKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -851,38 +822,24 @@ public PasswordTransformationMethod(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/method/QwertyKeyListener.html"/>
     /// </summary>
-    public partial class QwertyKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class QwertyKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<QwertyKeyListener>
     {
+        const string _bridgeClassName = "android.text.method.QwertyKeyListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public QwertyKeyListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region QwertyKeyListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="QwertyKeyListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class QwertyKeyListenerDirect : QwertyKeyListener
-    {
+        public QwertyKeyListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public QwertyKeyListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.QwertyKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -899,6 +856,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -912,12 +872,12 @@ public partial class ReplacementTransformationMethod : Android.Text.Method.Trans
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ReplacementTransformationMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReplacementTransformationMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReplacementTransformationMethod() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ReplacementTransformationMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReplacementTransformationMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReplacementTransformationMethod(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1047,10 +1007,13 @@ public partial class TextKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
         /// </summary>
         public TextKeyListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.text.method.TextKeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.text.method.TextKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1116,10 +1079,13 @@ public partial class TextKeyListenerDirect : TextKeyListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.text.method.TextKeyListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.TextKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1143,38 +1109,24 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/method/TimeKeyListener.html"/>
     /// </summary>
-    public partial class TimeKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class TimeKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TimeKeyListener>
     {
+        const string _bridgeClassName = "android.text.method.TimeKeyListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public TimeKeyListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region TimeKeyListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="TimeKeyListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class TimeKeyListenerDirect : TimeKeyListener
-    {
+        public TimeKeyListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public TimeKeyListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.text.method.TimeKeyListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1191,6 +1143,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -1248,12 +1203,12 @@ public partial class TransformationMethod : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TransformationMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransformationMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransformationMethod() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TransformationMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransformationMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransformationMethod(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/ArrowKeyMovementMethod.cs b/src/net/Netdroid/Generated/Android/Text/Method/ArrowKeyMovementMethod.cs
index 6cf87ddbb..5e272b737 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/ArrowKeyMovementMethod.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/ArrowKeyMovementMethod.cs
@@ -42,11 +42,12 @@ public partial class ArrowKeyMovementMethod
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/ArrowKeyMovementMethod.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/method/ArrowKeyMovementMethod.html#getInstance()"/>
         /// </summary>
-        public static Android.Text.Method.MovementMethod Instance
+        /// <returns><see cref="Android.Text.Method.MovementMethod"/></returns>
+        public static Android.Text.Method.MovementMethod GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Text.Method.MovementMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/MovementMethod;"); }
+            return SExecuteWithSignature<Android.Text.Method.MovementMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/MovementMethod;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/BaseKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/BaseKeyListener.cs
index fb867d428..791039ec9 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/BaseKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/BaseKeyListener.cs
@@ -41,92 +41,39 @@ public partial class BaseKeyListener
         #endregion
 
         #region Static methods
-        
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<bool>(LocalBridgeClazz, "isMetaTracker", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            return default;
+            return SExecute<bool>(LocalBridgeClazz, "isSelectingMetaTracker", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -134,141 +81,63 @@ void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(long arg0, int arg1)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(long arg0)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long AdjustMetaAfterKeypress(long arg0)
         {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
+            return SExecute<long>(LocalBridgeClazz, "adjustMetaAfterKeypress", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -276,24 +145,11 @@ void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "handleKeyDown", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -301,96 +157,48 @@ void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<lo
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecute<long>(LocalBridgeClazz, "handleKeyUp", arg0, arg1, arg2);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long ResetLockedMeta(long arg0)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "resetLockedMeta", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
         {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
+            SExecute(LocalBridgeClazz, "adjustMetaAfterKeypress", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
         {
-            
+            SExecute(LocalBridgeClazz, "clearMetaKeyState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void ResetMetaState(Android.Text.Spannable arg0)
         {
-            
+            SExecute(LocalBridgeClazz, "resetMetaState", arg0);
         }
 
         #endregion
@@ -401,13 +209,13 @@ public virtual void ResetMetaState(Android.Text.Spannable arg0)
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getInputType", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetInputTypeEventHandler));
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
+            AddEventHandler("getInputType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetInputTypeEventHandler));
+            AddEventHandler("backspace", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
+            AddEventHandler("forwardDelete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
+            AddEventHandler("onKeyOther", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
+            AddEventHandler("onKeyUp", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
+            AddEventHandler("clearMetaKeyState", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
+            AddEventHandler("clearMetaKeyState3", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
 
         }
 
@@ -415,7 +223,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetInputType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetInputType { get; set; } = null;
+        public global::System.Func<int> OnGetInputType { get; set; } = null;
 
         void GetInputTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -437,7 +245,7 @@ public virtual int GetInputType()
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
 
         void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -463,7 +271,7 @@ public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
 
         void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -489,7 +297,7 @@ public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
 
         void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -514,7 +322,7 @@ public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
 
         void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -540,7 +348,7 @@ public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1,
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
+        public global::System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
 
         void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -564,7 +372,7 @@ public virtual long ClearMetaKeyState(long arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
+        public global::System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
 
         void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -614,11 +422,12 @@ public partial class BaseKeyListenerDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/>
         /// </summary>
-        public int InputType
+        /// <returns><see cref="int"/></returns>
+        public override int GetInputType()
         {
-            get { return IExecute<int>("getInputType"); }
+            return IExecute<int>("getInputType");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/DateKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/DateKeyListener.cs
index 2f64bf327..eafea6581 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/DateKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/DateKeyListener.cs
@@ -29,6 +29,14 @@ namespace Android.Text.Method
     public partial class DateKeyListener
     {
         #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/DateKeyListener.html#%3Cinit%3E(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public DateKeyListener(Java.Util.Locale arg0)
+            : base(arg0)
+        {
+        }
 
         #endregion
 
@@ -37,715 +45,39 @@ public partial class DateKeyListener
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DateKeyListener.html#getInstance()"/>
+        /// <see href="https://developer.android.com/reference/android/text/method/DateKeyListener.html#CHARACTERS"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetInstance"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Text.Method.DateKeyListener> OnGetInstance { get; set; } = null;
+        [global::System.Obsolete()]
+        public static char[] CHARACTERS { get { if (!_CHARACTERSReady) { _CHARACTERSContent = SGetFieldArray<char>(LocalBridgeClazz, "CHARACTERS"); _CHARACTERSReady = true; } return _CHARACTERSContent; } }
+        private static char[] _CHARACTERSContent = default;
+        private static bool _CHARACTERSReady = false; // this is used because in case of generics 
 
-        void GetInstanceEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetInstance != null) ? OnGetInstance : GetInstance;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
+        #region Static methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DateKeyListener.html#getInstance()"/>
         /// </summary>
         /// <returns><see cref="Android.Text.Method.DateKeyListener"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Text.Method.DateKeyListener GetInstance()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DateKeyListener.html#getInstance(java.util.Locale)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Locale, Android.Text.Method.DateKeyListener> OnGetInstance1 { get; set; } = null;
-
-        void GetInstance1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Locale>> data)
+        [global::System.Obsolete()]
+        public static Android.Text.Method.DateKeyListener GetInstance()
         {
-            var methodToExecute = (OnGetInstance1 != null) ? OnGetInstance1 : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecuteWithSignature<Android.Text.Method.DateKeyListener>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/DateKeyListener;");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DateKeyListener.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Android.Text.Method.DateKeyListener"/></returns>
-        public virtual Android.Text.Method.DateKeyListener GetInstance(Java.Util.Locale arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="DateKeyListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("filter", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(FilterEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
-
-        void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnBackspace != null) ? OnBackspace : Backspace;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
-
-        void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnForwardDelete != null) ? OnForwardDelete : ForwardDelete;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
-
-        void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyOther != null) ? OnOnKeyOther : OnKeyOther;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
-
-        void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyUp != null) ? OnOnKeyUp : OnKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int, Android.Text.Spanned, int, int, Java.Lang.CharSequence> OnFilter { get; set; } = null;
-
-        void FilterEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnFilter != null) ? OnFilter : Filter;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.Text.Spanned>(2), data.EventData.GetAt<int>(3), data.EventData.GetAt<int>(4));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Text.Spanned"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public virtual Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
+        public static Android.Text.Method.DateKeyListener GetInstance(Java.Util.Locale arg0)
         {
-            return default;
+            return SExecuteWithSignature<Android.Text.Method.DateKeyListener>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Landroid/text/method/DateKeyListener;", arg0);
         }
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
-
-        void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState3 != null) ? OnClearMetaKeyState3 : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region DateKeyListenerDirect
-    public partial class DateKeyListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("backspace", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("forwardDelete", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return IExecute<bool>("onKeyOther", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("onKeyUp", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Text.Spanned"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public override Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
-        {
-            return IExecute<Java.Lang.CharSequence>("filter", arg0, arg1, arg2, arg3, arg4, arg5);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return IExecute<long>("clearMetaKeyState", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public override void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            IExecute("clearMetaKeyState", arg0, arg1, arg2);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/DateTimeKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/DateTimeKeyListener.cs
index 9737dd447..950663df0 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/DateTimeKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/DateTimeKeyListener.cs
@@ -29,6 +29,14 @@ namespace Android.Text.Method
     public partial class DateTimeKeyListener
     {
         #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener.html#%3Cinit%3E(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public DateTimeKeyListener(Java.Util.Locale arg0)
+            : base(arg0)
+        {
+        }
 
         #endregion
 
@@ -37,715 +45,39 @@ public partial class DateTimeKeyListener
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener.html#getInstance()"/>
+        /// <see href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener.html#CHARACTERS"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetInstance"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Text.Method.DateTimeKeyListener> OnGetInstance { get; set; } = null;
+        [global::System.Obsolete()]
+        public static char[] CHARACTERS { get { if (!_CHARACTERSReady) { _CHARACTERSContent = SGetFieldArray<char>(LocalBridgeClazz, "CHARACTERS"); _CHARACTERSReady = true; } return _CHARACTERSContent; } }
+        private static char[] _CHARACTERSContent = default;
+        private static bool _CHARACTERSReady = false; // this is used because in case of generics 
 
-        void GetInstanceEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetInstance != null) ? OnGetInstance : GetInstance;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
+        #region Static methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener.html#getInstance()"/>
         /// </summary>
         /// <returns><see cref="Android.Text.Method.DateTimeKeyListener"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Text.Method.DateTimeKeyListener GetInstance()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener.html#getInstance(java.util.Locale)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Locale, Android.Text.Method.DateTimeKeyListener> OnGetInstance1 { get; set; } = null;
-
-        void GetInstance1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Locale>> data)
+        [global::System.Obsolete()]
+        public static Android.Text.Method.DateTimeKeyListener GetInstance()
         {
-            var methodToExecute = (OnGetInstance1 != null) ? OnGetInstance1 : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecuteWithSignature<Android.Text.Method.DateTimeKeyListener>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/DateTimeKeyListener;");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DateTimeKeyListener.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Android.Text.Method.DateTimeKeyListener"/></returns>
-        public virtual Android.Text.Method.DateTimeKeyListener GetInstance(Java.Util.Locale arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="DateTimeKeyListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("filter", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(FilterEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
-
-        void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnBackspace != null) ? OnBackspace : Backspace;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
-
-        void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnForwardDelete != null) ? OnForwardDelete : ForwardDelete;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
-
-        void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyOther != null) ? OnOnKeyOther : OnKeyOther;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
-
-        void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyUp != null) ? OnOnKeyUp : OnKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int, Android.Text.Spanned, int, int, Java.Lang.CharSequence> OnFilter { get; set; } = null;
-
-        void FilterEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnFilter != null) ? OnFilter : Filter;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.Text.Spanned>(2), data.EventData.GetAt<int>(3), data.EventData.GetAt<int>(4));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Text.Spanned"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public virtual Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
+        public static Android.Text.Method.DateTimeKeyListener GetInstance(Java.Util.Locale arg0)
         {
-            return default;
+            return SExecuteWithSignature<Android.Text.Method.DateTimeKeyListener>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Landroid/text/method/DateTimeKeyListener;", arg0);
         }
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
-
-        void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState3 != null) ? OnClearMetaKeyState3 : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region DateTimeKeyListenerDirect
-    public partial class DateTimeKeyListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("backspace", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("forwardDelete", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return IExecute<bool>("onKeyOther", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("onKeyUp", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Text.Spanned"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public override Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
-        {
-            return IExecute<Java.Lang.CharSequence>("filter", arg0, arg1, arg2, arg3, arg4, arg5);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return IExecute<long>("clearMetaKeyState", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public override void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            IExecute("clearMetaKeyState", arg0, arg1, arg2);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/DialerKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/DialerKeyListener.cs
index 6331cac10..b98b15743 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/DialerKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/DialerKeyListener.cs
@@ -37,691 +37,28 @@ public partial class DialerKeyListener
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DialerKeyListener.html#getInstance()"/>
+        /// <see href="https://developer.android.com/reference/android/text/method/DialerKeyListener.html#CHARACTERS"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetInstance"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Text.Method.DialerKeyListener> OnGetInstance { get; set; } = null;
+        public static char[] CHARACTERS { get { if (!_CHARACTERSReady) { _CHARACTERSContent = SGetFieldArray<char>(LocalBridgeClazz, "CHARACTERS"); _CHARACTERSReady = true; } return _CHARACTERSContent; } }
+        private static char[] _CHARACTERSContent = default;
+        private static bool _CHARACTERSReady = false; // this is used because in case of generics 
 
-        void GetInstanceEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetInstance != null) ? OnGetInstance : GetInstance;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
+        #region Static methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DialerKeyListener.html#getInstance()"/>
         /// </summary>
         /// <returns><see cref="Android.Text.Method.DialerKeyListener"/></returns>
-        public virtual Android.Text.Method.DialerKeyListener GetInstance()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="DialerKeyListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("filter", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(FilterEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
-
-        void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnBackspace != null) ? OnBackspace : Backspace;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
-
-        void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnForwardDelete != null) ? OnForwardDelete : ForwardDelete;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
-
-        void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyOther != null) ? OnOnKeyOther : OnKeyOther;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
-
-        void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyUp != null) ? OnOnKeyUp : OnKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int, Android.Text.Spanned, int, int, Java.Lang.CharSequence> OnFilter { get; set; } = null;
-
-        void FilterEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnFilter != null) ? OnFilter : Filter;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.Text.Spanned>(2), data.EventData.GetAt<int>(3), data.EventData.GetAt<int>(4));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Text.Spanned"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public virtual Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
-
-        void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
+        public static Android.Text.Method.DialerKeyListener GetInstance()
         {
-            var methodToExecute = (OnClearMetaKeyState3 != null) ? OnClearMetaKeyState3 : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1));
+            return SExecuteWithSignature<Android.Text.Method.DialerKeyListener>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/DialerKeyListener;");
         }
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region DialerKeyListenerDirect
-    public partial class DialerKeyListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("backspace", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("forwardDelete", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return IExecute<bool>("onKeyOther", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("onKeyUp", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Text.Spanned"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public override Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
-        {
-            return IExecute<Java.Lang.CharSequence>("filter", arg0, arg1, arg2, arg3, arg4, arg5);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return IExecute<long>("clearMetaKeyState", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public override void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            IExecute("clearMetaKeyState", arg0, arg1, arg2);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/DigitsKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/DigitsKeyListener.cs
index 7355871d2..1ffb979a4 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/DigitsKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/DigitsKeyListener.cs
@@ -29,6 +29,34 @@ namespace Android.Text.Method
     public partial class DigitsKeyListener
     {
         #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#%3Cinit%3E(boolean,boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public DigitsKeyListener(bool arg0, bool arg1)
+            : base(arg0, arg1)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#%3Cinit%3E(java.util.Locale,boolean,boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        /// <param name="arg2"><see cref="bool"/></param>
+        public DigitsKeyListener(Java.Util.Locale arg0, bool arg1, bool arg2)
+            : base(arg0, arg1, arg2)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#%3Cinit%3E(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public DigitsKeyListener(Java.Util.Locale arg0)
+            : base(arg0)
+        {
+        }
 
         #endregion
 
@@ -41,91 +69,35 @@ public partial class DigitsKeyListener
         #endregion
 
         #region Static methods
-        
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Text.Method.DigitsKeyListener> OnGetInstance { get; set; } = null;
-
-        void GetInstanceEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetInstance != null) ? OnGetInstance : GetInstance;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance()"/>
         /// </summary>
         /// <returns><see cref="Android.Text.Method.DigitsKeyListener"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Text.Method.DigitsKeyListener GetInstance()
+        [global::System.Obsolete()]
+        public static Android.Text.Method.DigitsKeyListener GetInstance()
         {
-            return default;
+            return SExecuteWithSignature<Android.Text.Method.DigitsKeyListener>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/DigitsKeyListener;");
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance(boolean,boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool, bool, Android.Text.Method.DigitsKeyListener> OnGetInstance2 { get; set; } = null;
-
-        void GetInstance2EventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnGetInstance2 != null) ? OnGetInstance2 : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<bool>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="Android.Text.Method.DigitsKeyListener"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Text.Method.DigitsKeyListener GetInstance(bool arg0, bool arg1)
+        [global::System.Obsolete()]
+        public static Android.Text.Method.DigitsKeyListener GetInstance(bool arg0, bool arg1)
         {
-            return default;
+            return SExecute<Android.Text.Method.DigitsKeyListener>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance1_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, Android.Text.Method.DigitsKeyListener> OnGetInstance1_2 { get; set; } = null;
-
-        void GetInstance1_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnGetInstance1_2 != null) ? OnGetInstance1_2 : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Text.Method.DigitsKeyListener"/></returns>
-        public virtual Android.Text.Method.DigitsKeyListener GetInstance(Java.Lang.String arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance(java.util.Locale,boolean,boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance3_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Locale, bool, bool, Android.Text.Method.DigitsKeyListener> OnGetInstance3_3 { get; set; } = null;
-
-        void GetInstance3_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Locale>> data)
+        public static Android.Text.Method.DigitsKeyListener GetInstance(Java.Lang.String arg0)
         {
-            var methodToExecute = (OnGetInstance3_3 != null) ? OnGetInstance3_3 : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<bool>(0), data.EventData.GetAt<bool>(1));
-            data.SetReturnValue(executionResult);
+            return SExecuteWithSignature<Android.Text.Method.DigitsKeyListener>(LocalBridgeClazz, "getInstance", "(Ljava/lang/String;)Landroid/text/method/DigitsKeyListener;", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance(java.util.Locale,boolean,boolean)"/>
         /// </summary>
@@ -133,649 +105,23 @@ void GetInstance3_3EventHandler(object sender, CLRListenerEventArgs<CLREventData
         /// <param name="arg1"><see cref="bool"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <returns><see cref="Android.Text.Method.DigitsKeyListener"/></returns>
-        public virtual Android.Text.Method.DigitsKeyListener GetInstance(Java.Util.Locale arg0, bool arg1, bool arg2)
+        public static Android.Text.Method.DigitsKeyListener GetInstance(Java.Util.Locale arg0, bool arg1, bool arg2)
         {
-            return default;
+            return SExecute<Android.Text.Method.DigitsKeyListener>(LocalBridgeClazz, "getInstance", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance(java.util.Locale)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance1_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Locale, Android.Text.Method.DigitsKeyListener> OnGetInstance1_4 { get; set; } = null;
-
-        void GetInstance1_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Locale>> data)
-        {
-            var methodToExecute = (OnGetInstance1_4 != null) ? OnGetInstance1_4 : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/DigitsKeyListener.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Android.Text.Method.DigitsKeyListener"/></returns>
-        public virtual Android.Text.Method.DigitsKeyListener GetInstance(Java.Util.Locale arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        public static Android.Text.Method.DigitsKeyListener GetInstance(Java.Util.Locale arg0)
         {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
+            return SExecuteWithSignature<Android.Text.Method.DigitsKeyListener>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Landroid/text/method/DigitsKeyListener;", arg0);
         }
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="DigitsKeyListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
-
-        void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnBackspace != null) ? OnBackspace : Backspace;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
-
-        void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnForwardDelete != null) ? OnForwardDelete : ForwardDelete;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
-
-        void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyOther != null) ? OnOnKeyOther : OnKeyOther;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
-
-        void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyUp != null) ? OnOnKeyUp : OnKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
-
-        void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState3 != null) ? OnClearMetaKeyState3 : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region DigitsKeyListenerDirect
-    public partial class DigitsKeyListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("backspace", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("forwardDelete", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return IExecute<bool>("onKeyOther", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("onKeyUp", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return IExecute<long>("clearMetaKeyState", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public override void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            IExecute("clearMetaKeyState", arg0, arg1, arg2);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/HideReturnsTransformationMethod.cs b/src/net/Netdroid/Generated/Android/Text/Method/HideReturnsTransformationMethod.cs
index fa85f9704..e1531a354 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/HideReturnsTransformationMethod.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/HideReturnsTransformationMethod.cs
@@ -42,11 +42,12 @@ public partial class HideReturnsTransformationMethod
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/HideReturnsTransformationMethod.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/method/HideReturnsTransformationMethod.html#getInstance()"/>
         /// </summary>
-        public static Android.Text.Method.HideReturnsTransformationMethod Instance
+        /// <returns><see cref="Android.Text.Method.HideReturnsTransformationMethod"/></returns>
+        public static Android.Text.Method.HideReturnsTransformationMethod GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Text.Method.HideReturnsTransformationMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/HideReturnsTransformationMethod;"); }
+            return SExecuteWithSignature<Android.Text.Method.HideReturnsTransformationMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/HideReturnsTransformationMethod;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/KeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/KeyListener.cs
index c2635bfa6..1543f4a76 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/KeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/KeyListener.cs
@@ -68,11 +68,11 @@ public partial class KeyListener : Android.Text.Method.IKeyListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onKeyDown", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyDownEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("getInputType", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetInputTypeEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyStateEventHandler));
+            AddEventHandler("onKeyDown", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyDownEventHandler));
+            AddEventHandler("onKeyOther", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
+            AddEventHandler("onKeyUp", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
+            AddEventHandler("getInputType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetInputTypeEventHandler));
+            AddEventHandler("clearMetaKeyState", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyStateEventHandler));
 
         }
 
@@ -80,7 +80,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#onKeyDown(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyDown { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyDown { get; set; } = null;
 
         void OnKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -106,7 +106,7 @@ public virtual bool OnKeyDown(Android.View.View arg0, Android.Text.Editable arg1
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
 
         void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -131,7 +131,7 @@ public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
 
         void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -157,7 +157,7 @@ public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1,
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetInputType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetInputType { get; set; } = null;
+        public global::System.Func<int> OnGetInputType { get; set; } = null;
 
         void GetInputTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -179,7 +179,7 @@ public virtual int GetInputType()
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
+        public global::System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
 
         void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -229,13 +229,6 @@ public partial class KeyListenerDirect : Android.Text.Method.IKeyListener
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/> 
-        /// </summary>
-        public int InputType
-        {
-            get { return IExecuteWithSignature<int>("getInputType", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#onKeyDown(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -271,6 +264,14 @@ public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1,
             return IExecute<bool>("onKeyUp", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetInputType()
+        {
+            return IExecuteWithSignature<int>("getInputType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/MetaKeyKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/MetaKeyKeyListener.cs
index f2e57b1f1..a6e76fe9f 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/MetaKeyKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/MetaKeyKeyListener.cs
@@ -37,96 +37,76 @@ public partial class MetaKeyKeyListener
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#META_ALT_LOCKED"/>
+        /// </summary>
+        public static int META_ALT_LOCKED { get { if (!_META_ALT_LOCKEDReady) { _META_ALT_LOCKEDContent = SGetField<int>(LocalBridgeClazz, "META_ALT_LOCKED"); _META_ALT_LOCKEDReady = true; } return _META_ALT_LOCKEDContent; } }
+        private static int _META_ALT_LOCKEDContent = default;
+        private static bool _META_ALT_LOCKEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#META_ALT_ON"/>
+        /// </summary>
+        public static int META_ALT_ON { get { if (!_META_ALT_ONReady) { _META_ALT_ONContent = SGetField<int>(LocalBridgeClazz, "META_ALT_ON"); _META_ALT_ONReady = true; } return _META_ALT_ONContent; } }
+        private static int _META_ALT_ONContent = default;
+        private static bool _META_ALT_ONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#META_CAP_LOCKED"/>
+        /// </summary>
+        public static int META_CAP_LOCKED { get { if (!_META_CAP_LOCKEDReady) { _META_CAP_LOCKEDContent = SGetField<int>(LocalBridgeClazz, "META_CAP_LOCKED"); _META_CAP_LOCKEDReady = true; } return _META_CAP_LOCKEDContent; } }
+        private static int _META_CAP_LOCKEDContent = default;
+        private static bool _META_CAP_LOCKEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#META_SHIFT_ON"/>
+        /// </summary>
+        public static int META_SHIFT_ON { get { if (!_META_SHIFT_ONReady) { _META_SHIFT_ONContent = SGetField<int>(LocalBridgeClazz, "META_SHIFT_ON"); _META_SHIFT_ONReady = true; } return _META_SHIFT_ONContent; } }
+        private static int _META_SHIFT_ONContent = default;
+        private static bool _META_SHIFT_ONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#META_SYM_LOCKED"/>
+        /// </summary>
+        public static int META_SYM_LOCKED { get { if (!_META_SYM_LOCKEDReady) { _META_SYM_LOCKEDContent = SGetField<int>(LocalBridgeClazz, "META_SYM_LOCKED"); _META_SYM_LOCKEDReady = true; } return _META_SYM_LOCKEDContent; } }
+        private static int _META_SYM_LOCKEDContent = default;
+        private static bool _META_SYM_LOCKEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#META_SYM_ON"/>
         /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
+        public static int META_SYM_ON { get { if (!_META_SYM_ONReady) { _META_SYM_ONContent = SGetField<int>(LocalBridgeClazz, "META_SYM_ON"); _META_SYM_ONReady = true; } return _META_SYM_ONContent; } }
+        private static int _META_SYM_ONContent = default;
+        private static bool _META_SYM_ONReady = false; // this is used because in case of generics 
 
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
+        #region Static methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
+        public static bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            return default;
+            return SExecute<bool>(LocalBridgeClazz, "isMetaTracker", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        public static bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<bool>(LocalBridgeClazz, "isSelectingMetaTracker", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        public static int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
         {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -134,141 +114,57 @@ void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
+        public static int GetMetaState(Java.Lang.CharSequence arg0)
         {
-            return default;
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMetaState", "(Ljava/lang/CharSequence;)I", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        public static int GetMetaState(long arg0, int arg1)
         {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
+        public static int GetMetaState(long arg0)
         {
-            return default;
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMetaState", "(J)I", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
+        public static long AdjustMetaAfterKeypress(long arg0)
         {
-            return default;
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "adjustMetaAfterKeypress", "(J)J", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -276,24 +172,10 @@ void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
+        public static long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "handleKeyDown", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -301,239 +183,45 @@ void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<lo
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        public static long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecute<long>(LocalBridgeClazz, "handleKeyUp", arg0, arg1, arg2);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
+        public static long ResetLockedMeta(long arg0)
         {
-            return default;
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "resetLockedMeta", "(J)J", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
+        public static void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
         {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
+            SExecuteWithSignature(LocalBridgeClazz, "adjustMetaAfterKeypress", "(Landroid/text/Spannable;)V", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
+        public static void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
         {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
+            SExecute(LocalBridgeClazz, "clearMetaKeyState", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="MetaKeyKeyListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onKeyDown", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyDownEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyDown(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyDown { get; set; } = null;
-
-        void OnKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyDown != null) ? OnOnKeyDown : OnKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyDown(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyDown(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
-
-        void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
+        public static void ResetMetaState(Android.Text.Spannable arg0)
         {
-            var methodToExecute = (OnOnKeyUp != null) ? OnOnKeyUp : OnKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
+            SExecuteWithSignature(LocalBridgeClazz, "resetMetaState", "(Landroid/text/Spannable;)V", arg0);
         }
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
-
-        void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState3 != null) ? OnClearMetaKeyState3 : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region MetaKeyKeyListenerDirect
-    public partial class MetaKeyKeyListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
         #endregion
 
         #region Instance methods
@@ -545,7 +233,7 @@ public partial class MetaKeyKeyListenerDirect
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyDown(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
+        public bool OnKeyDown(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
         {
             return IExecute<bool>("onKeyDown", arg0, arg1, arg2, arg3);
         }
@@ -557,7 +245,7 @@ public override bool OnKeyDown(Android.View.View arg0, Android.Text.Editable arg
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
+        public bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
         {
             return IExecute<bool>("onKeyUp", arg0, arg1, arg2, arg3);
         }
@@ -567,7 +255,7 @@ public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1,
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        public override long ClearMetaKeyState(long arg0, int arg1)
+        public long ClearMetaKeyState(long arg0, int arg1)
         {
             return IExecute<long>("clearMetaKeyState", arg0, arg1);
         }
@@ -577,7 +265,7 @@ public override long ClearMetaKeyState(long arg0, int arg1)
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        public override void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
+        public void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
         {
             IExecute("clearMetaKeyState", arg0, arg1, arg2);
         }
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/MultiTapKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/MultiTapKeyListener.cs
index 9e0a7f23a..608e1193a 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/MultiTapKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/MultiTapKeyListener.cs
@@ -41,116 +41,50 @@ public partial class MultiTapKeyListener
         #endregion
 
         #region Static methods
-        
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MultiTapKeyListener.html#getInstance(boolean,android.text.method.TextKeyListener.Capitalize)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool, Android.Text.Method.TextKeyListener.Capitalize, Android.Text.Method.MultiTapKeyListener> OnGetInstance { get; set; } = null;
-
-        void GetInstanceEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnGetInstance != null) ? OnGetInstance : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Method.TextKeyListener.Capitalize>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MultiTapKeyListener.html#getInstance(boolean,android.text.method.TextKeyListener.Capitalize)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.Text.Method.TextKeyListener.Capitalize"/></param>
         /// <returns><see cref="Android.Text.Method.MultiTapKeyListener"/></returns>
-        public virtual Android.Text.Method.MultiTapKeyListener GetInstance(bool arg0, Android.Text.Method.TextKeyListener.Capitalize arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Android.Text.Method.MultiTapKeyListener GetInstance(bool arg0, Android.Text.Method.TextKeyListener.Capitalize arg1)
         {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<Android.Text.Method.MultiTapKeyListener>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<bool>(LocalBridgeClazz, "isMetaTracker", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<bool>(LocalBridgeClazz, "isSelectingMetaTracker", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
         {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -158,141 +92,63 @@ void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1, arg2);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
         {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0)
         {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(long arg0, int arg1)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(long arg0)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long AdjustMetaAfterKeypress(long arg0)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "adjustMetaAfterKeypress", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -300,24 +156,11 @@ void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "handleKeyDown", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -325,96 +168,48 @@ void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<lo
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "handleKeyUp", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long ResetLockedMeta(long arg0)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "resetLockedMeta", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
         {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
+            SExecute(LocalBridgeClazz, "adjustMetaAfterKeypress", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
         {
-            
+            SExecute(LocalBridgeClazz, "clearMetaKeyState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void ResetMetaState(Android.Text.Spannable arg0)
         {
-            
+            SExecute(LocalBridgeClazz, "resetMetaState", arg0);
         }
 
         #endregion
@@ -425,15 +220,15 @@ public virtual void ResetMetaState(Android.Text.Spannable arg0)
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-            AddEventHandler("onSpanAdded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanAddedEventHandler));
-            AddEventHandler("onSpanChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanChangedEventHandler));
-            AddEventHandler("onSpanRemoved", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanRemovedEventHandler));
+            AddEventHandler("backspace", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
+            AddEventHandler("forwardDelete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
+            AddEventHandler("onKeyOther", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
+            AddEventHandler("onKeyUp", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
+            AddEventHandler("clearMetaKeyState", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
+            AddEventHandler("clearMetaKeyState3", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
+            AddEventHandler("onSpanAdded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanAddedEventHandler));
+            AddEventHandler("onSpanChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanChangedEventHandler));
+            AddEventHandler("onSpanRemoved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanRemovedEventHandler));
 
         }
 
@@ -441,7 +236,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
 
         void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -467,7 +262,7 @@ public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
 
         void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -493,7 +288,7 @@ public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
 
         void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -518,7 +313,7 @@ public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
 
         void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -544,7 +339,7 @@ public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1,
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
+        public global::System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
 
         void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -568,7 +363,7 @@ public virtual long ClearMetaKeyState(long arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
+        public global::System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
 
         void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -591,7 +386,7 @@ public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Edita
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MultiTapKeyListener.html#onSpanAdded(android.text.Spannable,java.lang.Object,int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSpanAdded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable, object, int, int> OnOnSpanAdded { get; set; } = null;
+        public global::System.Action<Android.Text.Spannable, object, int, int> OnOnSpanAdded { get; set; } = null;
 
         void OnSpanAddedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
         {
@@ -615,7 +410,7 @@ public virtual void OnSpanAdded(Android.Text.Spannable arg0, object arg1, int ar
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MultiTapKeyListener.html#onSpanChanged(android.text.Spannable,java.lang.Object,int,int,int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSpanChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable, object, int, int, int, int> OnOnSpanChanged { get; set; } = null;
+        public global::System.Action<Android.Text.Spannable, object, int, int, int, int> OnOnSpanChanged { get; set; } = null;
 
         void OnSpanChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
         {
@@ -641,7 +436,7 @@ public virtual void OnSpanChanged(Android.Text.Spannable arg0, object arg1, int
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MultiTapKeyListener.html#onSpanRemoved(android.text.Spannable,java.lang.Object,int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSpanRemoved"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable, object, int, int> OnOnSpanRemoved { get; set; } = null;
+        public global::System.Action<Android.Text.Spannable, object, int, int> OnOnSpanRemoved { get; set; } = null;
 
         void OnSpanRemovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/NumberKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/NumberKeyListener.cs
index b0a0537c0..74f50bcbe 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/NumberKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/NumberKeyListener.cs
@@ -41,92 +41,39 @@ public partial class NumberKeyListener
         #endregion
 
         #region Static methods
-        
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<bool>(LocalBridgeClazz, "isMetaTracker", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            return default;
+            return SExecute<bool>(LocalBridgeClazz, "isSelectingMetaTracker", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -134,141 +81,63 @@ void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(long arg0, int arg1)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(long arg0)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long AdjustMetaAfterKeypress(long arg0)
         {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
+            return SExecute<long>(LocalBridgeClazz, "adjustMetaAfterKeypress", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -276,24 +145,11 @@ void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "handleKeyDown", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -301,96 +157,48 @@ void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<lo
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecute<long>(LocalBridgeClazz, "handleKeyUp", arg0, arg1, arg2);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long ResetLockedMeta(long arg0)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "resetLockedMeta", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
         {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
+            SExecute(LocalBridgeClazz, "adjustMetaAfterKeypress", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
         {
-            
+            SExecute(LocalBridgeClazz, "clearMetaKeyState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void ResetMetaState(Android.Text.Spannable arg0)
         {
-            
+            SExecute(LocalBridgeClazz, "resetMetaState", arg0);
         }
 
         #endregion
@@ -401,14 +209,14 @@ public virtual void ResetMetaState(Android.Text.Spannable arg0)
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getInputType", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetInputTypeEventHandler));
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("filter", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(FilterEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
+            AddEventHandler("getInputType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetInputTypeEventHandler));
+            AddEventHandler("backspace", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
+            AddEventHandler("forwardDelete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
+            AddEventHandler("onKeyOther", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
+            AddEventHandler("onKeyUp", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
+            AddEventHandler("filter", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(FilterEventHandler));
+            AddEventHandler("clearMetaKeyState", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
+            AddEventHandler("clearMetaKeyState3", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
 
         }
 
@@ -416,7 +224,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetInputType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetInputType { get; set; } = null;
+        public global::System.Func<int> OnGetInputType { get; set; } = null;
 
         void GetInputTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -438,7 +246,7 @@ public virtual int GetInputType()
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
 
         void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -464,7 +272,7 @@ public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
 
         void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -490,7 +298,7 @@ public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
 
         void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -515,7 +323,7 @@ public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
 
         void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -541,7 +349,7 @@ public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1,
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int, Android.Text.Spanned, int, int, Java.Lang.CharSequence> OnFilter { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence, int, int, Android.Text.Spanned, int, int, Java.Lang.CharSequence> OnFilter { get; set; } = null;
 
         void FilterEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
         {
@@ -569,7 +377,7 @@ public virtual Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int ar
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
+        public global::System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
 
         void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -593,7 +401,7 @@ public virtual long ClearMetaKeyState(long arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
+        public global::System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
 
         void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -643,11 +451,12 @@ public partial class NumberKeyListenerDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/method/KeyListener.html#getInputType()"/>
         /// </summary>
-        public int InputType
+        /// <returns><see cref="int"/></returns>
+        public override int GetInputType()
         {
-            get { return IExecute<int>("getInputType"); }
+            return IExecute<int>("getInputType");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/PasswordTransformationMethod.cs b/src/net/Netdroid/Generated/Android/Text/Method/PasswordTransformationMethod.cs
index 040a65806..aff7d90a1 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/PasswordTransformationMethod.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/PasswordTransformationMethod.cs
@@ -50,11 +50,12 @@ public partial class PasswordTransformationMethod : Android.Text.Method.ITransfo
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/PasswordTransformationMethod.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/method/PasswordTransformationMethod.html#getInstance()"/>
         /// </summary>
-        public static Android.Text.Method.PasswordTransformationMethod Instance
+        /// <returns><see cref="Android.Text.Method.PasswordTransformationMethod"/></returns>
+        public static Android.Text.Method.PasswordTransformationMethod GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Text.Method.PasswordTransformationMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/PasswordTransformationMethod;"); }
+            return SExecuteWithSignature<Android.Text.Method.PasswordTransformationMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/PasswordTransformationMethod;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/QwertyKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/QwertyKeyListener.cs
index 43608646c..a66138bc2 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/QwertyKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/QwertyKeyListener.cs
@@ -29,6 +29,15 @@ namespace Android.Text.Method
     public partial class QwertyKeyListener
     {
         #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/QwertyKeyListener.html#%3Cinit%3E(android.text.method.TextKeyListener.Capitalize,boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Text.Method.TextKeyListener.Capitalize"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        public QwertyKeyListener(Android.Text.Method.TextKeyListener.Capitalize arg0, bool arg1)
+            : base(arg0, arg1)
+        {
+        }
 
         #endregion
 
@@ -41,416 +50,24 @@ public partial class QwertyKeyListener
         #endregion
 
         #region Static methods
-        
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/QwertyKeyListener.html#getInstance(boolean,android.text.method.TextKeyListener.Capitalize)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool, Android.Text.Method.TextKeyListener.Capitalize, Android.Text.Method.QwertyKeyListener> OnGetInstance { get; set; } = null;
-
-        void GetInstanceEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnGetInstance != null) ? OnGetInstance : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Method.TextKeyListener.Capitalize>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/QwertyKeyListener.html#getInstance(boolean,android.text.method.TextKeyListener.Capitalize)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.Text.Method.TextKeyListener.Capitalize"/></param>
         /// <returns><see cref="Android.Text.Method.QwertyKeyListener"/></returns>
-        public virtual Android.Text.Method.QwertyKeyListener GetInstance(bool arg0, Android.Text.Method.TextKeyListener.Capitalize arg1)
+        public static Android.Text.Method.QwertyKeyListener GetInstance(bool arg0, Android.Text.Method.TextKeyListener.Capitalize arg1)
         {
-            return default;
+            return SExecute<Android.Text.Method.QwertyKeyListener>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/QwertyKeyListener.html#getInstanceForFullKeyboard()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstanceForFullKeyboard"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Text.Method.QwertyKeyListener> OnGetInstanceForFullKeyboard { get; set; } = null;
-
-        void GetInstanceForFullKeyboardEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetInstanceForFullKeyboard != null) ? OnGetInstanceForFullKeyboard : GetInstanceForFullKeyboard;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/QwertyKeyListener.html#getInstanceForFullKeyboard()"/>
         /// </summary>
         /// <returns><see cref="Android.Text.Method.QwertyKeyListener"/></returns>
-        public virtual Android.Text.Method.QwertyKeyListener GetInstanceForFullKeyboard()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
+        public static Android.Text.Method.QwertyKeyListener GetInstanceForFullKeyboard()
         {
-            return default;
+            return SExecuteWithSignature<Android.Text.Method.QwertyKeyListener>(LocalBridgeClazz, "getInstanceForFullKeyboard", "()Landroid/text/method/QwertyKeyListener;");
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/QwertyKeyListener.html#markAsReplaced(android.text.Spannable,int,int,java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnMarkAsReplaced"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable, int, int, Java.Lang.String> OnMarkAsReplaced { get; set; } = null;
-
-        void MarkAsReplacedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnMarkAsReplaced != null) ? OnMarkAsReplaced : MarkAsReplaced;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Java.Lang.String>(2));
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/QwertyKeyListener.html#markAsReplaced(android.text.Spannable,int,int,java.lang.String)"/>
         /// </summary>
@@ -458,275 +75,14 @@ void MarkAsReplacedEventHandler(object sender, CLRListenerEventArgs<CLREventData
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        public virtual void MarkAsReplaced(Android.Text.Spannable arg0, int arg1, int arg2, Java.Lang.String arg3)
+        public static void MarkAsReplaced(Android.Text.Spannable arg0, int arg1, int arg2, Java.Lang.String arg3)
         {
-            
+            SExecute(LocalBridgeClazz, "markAsReplaced", arg0, arg1, arg2, arg3);
         }
 
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="QwertyKeyListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
-
-        void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnBackspace != null) ? OnBackspace : Backspace;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
-
-        void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnForwardDelete != null) ? OnForwardDelete : ForwardDelete;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
-
-        void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyOther != null) ? OnOnKeyOther : OnKeyOther;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
-
-        void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyUp != null) ? OnOnKeyUp : OnKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
-
-        void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState3 != null) ? OnClearMetaKeyState3 : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region QwertyKeyListenerDirect
-    public partial class QwertyKeyListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("backspace", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("forwardDelete", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return IExecute<bool>("onKeyOther", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("onKeyUp", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return IExecute<long>("clearMetaKeyState", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public override void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            IExecute("clearMetaKeyState", arg0, arg1, arg2);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/ScrollingMovementMethod.cs b/src/net/Netdroid/Generated/Android/Text/Method/ScrollingMovementMethod.cs
index 08737c8bf..9db455fa1 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/ScrollingMovementMethod.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/ScrollingMovementMethod.cs
@@ -42,11 +42,12 @@ public partial class ScrollingMovementMethod
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/ScrollingMovementMethod.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/method/ScrollingMovementMethod.html#getInstance()"/>
         /// </summary>
-        public static Android.Text.Method.MovementMethod Instance
+        /// <returns><see cref="Android.Text.Method.MovementMethod"/></returns>
+        public static Android.Text.Method.MovementMethod GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Text.Method.MovementMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/MovementMethod;"); }
+            return SExecuteWithSignature<Android.Text.Method.MovementMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/MovementMethod;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/SingleLineTransformationMethod.cs b/src/net/Netdroid/Generated/Android/Text/Method/SingleLineTransformationMethod.cs
index cb3f84d41..a5e6a44dc 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/SingleLineTransformationMethod.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/SingleLineTransformationMethod.cs
@@ -42,11 +42,12 @@ public partial class SingleLineTransformationMethod
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/SingleLineTransformationMethod.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/method/SingleLineTransformationMethod.html#getInstance()"/>
         /// </summary>
-        public static Android.Text.Method.SingleLineTransformationMethod Instance
+        /// <returns><see cref="Android.Text.Method.SingleLineTransformationMethod"/></returns>
+        public static Android.Text.Method.SingleLineTransformationMethod GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Text.Method.SingleLineTransformationMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/SingleLineTransformationMethod;"); }
+            return SExecuteWithSignature<Android.Text.Method.SingleLineTransformationMethod>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/SingleLineTransformationMethod;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/TextKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/TextKeyListener.cs
index 41053a582..425547104 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/TextKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/TextKeyListener.cs
@@ -41,114 +41,48 @@ public partial class TextKeyListener
         #endregion
 
         #region Static methods
-        
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#getInstance()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Text.Method.TextKeyListener> OnGetInstance { get; set; } = null;
-
-        void GetInstanceEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetInstance != null) ? OnGetInstance : GetInstance;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#getInstance()"/>
         /// </summary>
         /// <returns><see cref="Android.Text.Method.TextKeyListener"/></returns>
-        public virtual Android.Text.Method.TextKeyListener GetInstance()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#getInstance(boolean,android.text.method.TextKeyListener.Capitalize)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool, Android.Text.Method.TextKeyListener.Capitalize, Android.Text.Method.TextKeyListener> OnGetInstance2 { get; set; } = null;
-
-        void GetInstance2EventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Android.Text.Method.TextKeyListener GetInstance()
         {
-            var methodToExecute = (OnGetInstance2 != null) ? OnGetInstance2 : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Method.TextKeyListener.Capitalize>(0));
-            data.SetReturnValue(executionResult);
+            return SExecuteWithSignature<Android.Text.Method.TextKeyListener>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/TextKeyListener;");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#getInstance(boolean,android.text.method.TextKeyListener.Capitalize)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.Text.Method.TextKeyListener.Capitalize"/></param>
         /// <returns><see cref="Android.Text.Method.TextKeyListener"/></returns>
-        public virtual Android.Text.Method.TextKeyListener GetInstance(bool arg0, Android.Text.Method.TextKeyListener.Capitalize arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Android.Text.Method.TextKeyListener GetInstance(bool arg0, Android.Text.Method.TextKeyListener.Capitalize arg1)
         {
-            return default;
+            return SExecute<Android.Text.Method.TextKeyListener>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            return default;
+            return SExecute<bool>(LocalBridgeClazz, "isMetaTracker", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#shouldCap(android.text.method.TextKeyListener.Capitalize,java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnShouldCap"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Text.Method.TextKeyListener.Capitalize, Java.Lang.CharSequence, int, bool> OnShouldCap { get; set; } = null;
-
-        void ShouldCapEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Method.TextKeyListener.Capitalize>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
         {
-            var methodToExecute = (OnShouldCap != null) ? OnShouldCap : ShouldCap;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.CharSequence>(0), data.EventData.GetAt<int>(1));
-            data.SetReturnValue(executionResult);
+            return SExecute<bool>(LocalBridgeClazz, "isSelectingMetaTracker", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#shouldCap(android.text.method.TextKeyListener.Capitalize,java.lang.CharSequence,int)"/>
         /// </summary>
@@ -156,48 +90,22 @@ void ShouldCapEventHandler(object sender, CLRListenerEventArgs<CLREventData<Andr
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool ShouldCap(Android.Text.Method.TextKeyListener.Capitalize arg0, Java.Lang.CharSequence arg1, int arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static bool ShouldCap(Android.Text.Method.TextKeyListener.Capitalize arg0, Java.Lang.CharSequence arg1, int arg2)
         {
-            return default;
+            return SExecute<bool>(LocalBridgeClazz, "shouldCap", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -205,141 +113,63 @@ void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1, arg2);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(Java.Lang.CharSequence arg0)
         {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(long arg0, int arg1)
         {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static int GetMetaState(long arg0)
         {
-            return default;
+            return SExecute<int>(LocalBridgeClazz, "getMetaState", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long AdjustMetaAfterKeypress(long arg0)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "adjustMetaAfterKeypress", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -347,24 +177,11 @@ void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "handleKeyDown", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
         /// </summary>
@@ -372,117 +189,57 @@ void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<lo
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "handleKeyUp", arg0, arg1, arg2);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static long ResetLockedMeta(long arg0)
         {
-            return default;
+            return SExecute<long>(LocalBridgeClazz, "resetLockedMeta", arg0);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
         {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
+            SExecute(LocalBridgeClazz, "adjustMetaAfterKeypress", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
         {
-            
+            SExecute(LocalBridgeClazz, "clearMetaKeyState", arg0, arg1);
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#clear(android.text.Editable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClear"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable> OnClear { get; set; } = null;
-
-        void ClearEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void ResetMetaState(Android.Text.Spannable arg0)
         {
-            var methodToExecute = (OnClear != null) ? OnClear : Clear;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
+            SExecute(LocalBridgeClazz, "resetMetaState", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#clear(android.text.Editable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        public virtual void Clear(Android.Text.Editable arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static void Clear(Android.Text.Editable arg0)
         {
-            
+            SExecuteWithSignature(LocalBridgeClazz, "clear", "(Landroid/text/Editable;)V", arg0);
         }
 
         #endregion
@@ -493,14 +250,14 @@ public virtual void Clear(Android.Text.Editable arg0)
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-            AddEventHandler("onSpanAdded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanAddedEventHandler));
-            AddEventHandler("onSpanChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanChangedEventHandler));
-            AddEventHandler("onSpanRemoved", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanRemovedEventHandler));
-            AddEventHandler("release", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(ReleaseEventHandler));
+            AddEventHandler("backspace", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
+            AddEventHandler("forwardDelete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
+            AddEventHandler("clearMetaKeyState", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
+            AddEventHandler("clearMetaKeyState3", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
+            AddEventHandler("onSpanAdded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanAddedEventHandler));
+            AddEventHandler("onSpanChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanChangedEventHandler));
+            AddEventHandler("onSpanRemoved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Text.Spannable>>>(OnSpanRemovedEventHandler));
+            AddEventHandler("release", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(ReleaseEventHandler));
 
         }
 
@@ -508,7 +265,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
 
         void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -534,7 +291,7 @@ public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
 
         void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -560,7 +317,7 @@ public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
+        public global::System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
 
         void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -584,7 +341,7 @@ public virtual long ClearMetaKeyState(long arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
+        public global::System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
 
         void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -607,7 +364,7 @@ public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Edita
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#onSpanAdded(android.text.Spannable,java.lang.Object,int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSpanAdded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable, object, int, int> OnOnSpanAdded { get; set; } = null;
+        public global::System.Action<Android.Text.Spannable, object, int, int> OnOnSpanAdded { get; set; } = null;
 
         void OnSpanAddedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
         {
@@ -631,7 +388,7 @@ public virtual void OnSpanAdded(Android.Text.Spannable arg0, object arg1, int ar
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#onSpanChanged(android.text.Spannable,java.lang.Object,int,int,int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSpanChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable, object, int, int, int, int> OnOnSpanChanged { get; set; } = null;
+        public global::System.Action<Android.Text.Spannable, object, int, int, int, int> OnOnSpanChanged { get; set; } = null;
 
         void OnSpanChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
         {
@@ -657,7 +414,7 @@ public virtual void OnSpanChanged(Android.Text.Spannable arg0, object arg1, int
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#onSpanRemoved(android.text.Spannable,java.lang.Object,int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSpanRemoved"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable, object, int, int> OnOnSpanRemoved { get; set; } = null;
+        public global::System.Action<Android.Text.Spannable, object, int, int> OnOnSpanRemoved { get; set; } = null;
 
         void OnSpanRemovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
         {
@@ -681,7 +438,7 @@ public virtual void OnSpanRemoved(Android.Text.Spannable arg0, object arg1, int
         /// Handler for <see href="https://developer.android.com/reference/android/text/method/TextKeyListener.html#release()"/>
         /// </summary>
         /// <remarks>If <see cref="OnRelease"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnRelease { get; set; } = null;
+        public global::System.Action OnRelease { get; set; } = null;
 
         void ReleaseEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Text/Method/TimeKeyListener.cs b/src/net/Netdroid/Generated/Android/Text/Method/TimeKeyListener.cs
index 59f587384..7bc069757 100644
--- a/src/net/Netdroid/Generated/Android/Text/Method/TimeKeyListener.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Method/TimeKeyListener.cs
@@ -29,6 +29,14 @@ namespace Android.Text.Method
     public partial class TimeKeyListener
     {
         #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/method/TimeKeyListener.html#%3Cinit%3E(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public TimeKeyListener(Java.Util.Locale arg0)
+            : base(arg0)
+        {
+        }
 
         #endregion
 
@@ -37,715 +45,39 @@ public partial class TimeKeyListener
         #endregion
 
         #region Fields
-
-        #endregion
-
-        #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/TimeKeyListener.html#getInstance()"/>
+        /// <see href="https://developer.android.com/reference/android/text/method/TimeKeyListener.html#CHARACTERS"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetInstance"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Text.Method.TimeKeyListener> OnGetInstance { get; set; } = null;
+        [global::System.Obsolete()]
+        public static char[] CHARACTERS { get { if (!_CHARACTERSReady) { _CHARACTERSContent = SGetFieldArray<char>(LocalBridgeClazz, "CHARACTERS"); _CHARACTERSReady = true; } return _CHARACTERSContent; } }
+        private static char[] _CHARACTERSContent = default;
+        private static bool _CHARACTERSReady = false; // this is used because in case of generics 
 
-        void GetInstanceEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetInstance != null) ? OnGetInstance : GetInstance;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
+        #region Static methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/TimeKeyListener.html#getInstance()"/>
         /// </summary>
         /// <returns><see cref="Android.Text.Method.TimeKeyListener"/></returns>
-        [System.Obsolete()]
-        public virtual Android.Text.Method.TimeKeyListener GetInstance()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/TimeKeyListener.html#getInstance(java.util.Locale)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetInstance1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Locale, Android.Text.Method.TimeKeyListener> OnGetInstance1 { get; set; } = null;
-
-        void GetInstance1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Locale>> data)
+        [global::System.Obsolete()]
+        public static Android.Text.Method.TimeKeyListener GetInstance()
         {
-            var methodToExecute = (OnGetInstance1 != null) ? OnGetInstance1 : GetInstance;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return SExecuteWithSignature<Android.Text.Method.TimeKeyListener>(LocalBridgeClazz, "getInstance", "()Landroid/text/method/TimeKeyListener;");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/method/TimeKeyListener.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Android.Text.Method.TimeKeyListener"/></returns>
-        public virtual Android.Text.Method.TimeKeyListener GetInstance(Java.Util.Locale arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsMetaTracker { get; set; } = null;
-
-        void IsMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsMetaTracker != null) ? OnIsMetaTracker : IsMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsSelectingMetaTracker"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, object, bool> OnIsSelectingMetaTracker { get; set; } = null;
-
-        void IsSelectingMetaTrackerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnIsSelectingMetaTracker != null) ? OnIsSelectingMetaTracker : IsSelectingMetaTracker;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<object>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#isSelectingMetaTracker(java.lang.CharSequence,java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsSelectingMetaTracker(Java.Lang.CharSequence arg0, object arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.View.KeyEvent, int> OnGetMetaState { get; set; } = null;
-
-        void GetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState != null) ? OnGetMetaState : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.KeyEvent>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, Android.View.KeyEvent arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, Android.View.KeyEvent, int> OnGetMetaState3 { get; set; } = null;
-
-        void GetMetaState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState3 != null) ? OnGetMetaState3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int> OnGetMetaState2_2 { get; set; } = null;
-
-        void GetMetaState2_2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_2 != null) ? OnGetMetaState2_2 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int> OnGetMetaState1_3 { get; set; } = null;
-
-        void GetMetaState1_3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_3 != null) ? OnGetMetaState1_3 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState2_4"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, int> OnGetMetaState2_4 { get; set; } = null;
-
-        void GetMetaState2_4EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState2_4 != null) ? OnGetMetaState2_4 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetMetaState1_5"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnGetMetaState1_5 { get; set; } = null;
-
-        void GetMetaState1_5EventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetMetaState1_5 != null) ? OnGetMetaState1_5 : GetMetaState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#getMetaState(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetMetaState(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnAdjustMetaAfterKeypress { get; set; } = null;
-
-        void AdjustMetaAfterKeypressEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress != null) ? OnAdjustMetaAfterKeypress : AdjustMetaAfterKeypress;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long AdjustMetaAfterKeypress(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyDown"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyDown { get; set; } = null;
-
-        void HandleKeyDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyDown != null) ? OnHandleKeyDown : HandleKeyDown;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyDown(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyDown(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHandleKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, Android.View.KeyEvent, long> OnHandleKeyUp { get; set; } = null;
-
-        void HandleKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnHandleKeyUp != null) ? OnHandleKeyUp : HandleKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#handleKeyUp(long,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long HandleKeyUp(long arg0, int arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetLockedMeta"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnResetLockedMeta { get; set; } = null;
-
-        void ResetLockedMetaEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnResetLockedMeta != null) ? OnResetLockedMeta : ResetLockedMeta;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetLockedMeta(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ResetLockedMeta(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAdjustMetaAfterKeypress1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnAdjustMetaAfterKeypress1 { get; set; } = null;
-
-        void AdjustMetaAfterKeypress1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnAdjustMetaAfterKeypress1 != null) ? OnAdjustMetaAfterKeypress1 : AdjustMetaAfterKeypress;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#adjustMetaAfterKeypress(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void AdjustMetaAfterKeypress(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Editable, int> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Editable>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.Text.Editable arg0, int arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnResetMetaState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Text.Spannable> OnResetMetaState { get; set; } = null;
-
-        void ResetMetaStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Text.Spannable>> data)
-        {
-            var methodToExecute = (OnResetMetaState != null) ? OnResetMetaState : ResetMetaState;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#resetMetaState(android.text.Spannable)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable"/></param>
-        public virtual void ResetMetaState(Android.Text.Spannable arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="TimeKeyListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("backspace", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BackspaceEventHandler));
-            AddEventHandler("forwardDelete", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ForwardDeleteEventHandler));
-            AddEventHandler("onKeyOther", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyOtherEventHandler));
-            AddEventHandler("onKeyUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyUpEventHandler));
-            AddEventHandler("filter", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(FilterEventHandler));
-            AddEventHandler("clearMetaKeyState", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ClearMetaKeyStateEventHandler));
-            AddEventHandler("clearMetaKeyState3", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(ClearMetaKeyState3EventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnBackspace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnBackspace { get; set; } = null;
-
-        void BackspaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnBackspace != null) ? OnBackspace : Backspace;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnForwardDelete"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnForwardDelete { get; set; } = null;
-
-        void ForwardDeleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnForwardDelete != null) ? OnForwardDelete : ForwardDelete;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyOther"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, Android.View.KeyEvent, bool> OnOnKeyOther { get; set; } = null;
-
-        void OnKeyOtherEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyOther != null) ? OnOnKeyOther : OnKeyOther;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<Android.View.KeyEvent>(1));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnKeyUp"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.Text.Editable, int, Android.View.KeyEvent, bool> OnOnKeyUp { get; set; } = null;
-
-        void OnKeyUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnOnKeyUp != null) ? OnOnKeyUp : OnKeyUp;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.View.KeyEvent>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, int, int, Android.Text.Spanned, int, int, Java.Lang.CharSequence> OnFilter { get; set; } = null;
-
-        void FilterEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnFilter != null) ? OnFilter : Filter;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1), data.EventData.GetAt<Android.Text.Spanned>(2), data.EventData.GetAt<int>(3), data.EventData.GetAt<int>(4));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Text.Spanned"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public virtual Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
+        public static Android.Text.Method.TimeKeyListener GetInstance(Java.Util.Locale arg0)
         {
-            return default;
+            return SExecuteWithSignature<Android.Text.Method.TimeKeyListener>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Landroid/text/method/TimeKeyListener;", arg0);
         }
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int, long> OnClearMetaKeyState { get; set; } = null;
-
-        void ClearMetaKeyStateEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState != null) ? OnClearMetaKeyState : ClearMetaKeyState;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnClearMetaKeyState3"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Text.Editable, int> OnClearMetaKeyState3 { get; set; } = null;
-
-        void ClearMetaKeyState3EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnClearMetaKeyState3 != null) ? OnClearMetaKeyState3 : ClearMetaKeyState;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Text.Editable>(0), data.EventData.GetAt<int>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public virtual void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region TimeKeyListenerDirect
-    public partial class TimeKeyListenerDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#backspace(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool Backspace(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("backspace", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#forwardDelete(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool ForwardDelete(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("forwardDelete", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/BaseKeyListener.html#onKeyOther(android.view.View,android.text.Editable,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyOther(Android.View.View arg0, Android.Text.Editable arg1, Android.View.KeyEvent arg2)
-        {
-            return IExecute<bool>("onKeyOther", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#onKeyUp(android.view.View,android.text.Editable,int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool OnKeyUp(Android.View.View arg0, Android.Text.Editable arg1, int arg2, Android.View.KeyEvent arg3)
-        {
-            return IExecute<bool>("onKeyUp", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/NumberKeyListener.html#filter(java.lang.CharSequence,int,int,android.text.Spanned,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Android.Text.Spanned"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public override Java.Lang.CharSequence Filter(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.Spanned arg3, int arg4, int arg5)
-        {
-            return IExecute<Java.Lang.CharSequence>("filter", arg0, arg1, arg2, arg3, arg4, arg5);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long ClearMetaKeyState(long arg0, int arg1)
-        {
-            return IExecute<long>("clearMetaKeyState", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/method/MetaKeyKeyListener.html#clearMetaKeyState(android.view.View,android.text.Editable,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Text.Editable"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public override void ClearMetaKeyState(Android.View.View arg0, Android.Text.Editable arg1, int arg2)
-        {
-            IExecute("clearMetaKeyState", arg0, arg1, arg2);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/ParcelableSpan.cs b/src/net/Netdroid/Generated/Android/Text/ParcelableSpan.cs
index 68a94c112..e37cbb620 100644
--- a/src/net/Netdroid/Generated/Android/Text/ParcelableSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/ParcelableSpan.cs
@@ -64,11 +64,12 @@ public partial class ParcelableSpan : Android.Text.IParcelableSpan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/ParcelableSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/ParcelableSpan.html#getSpanTypeId()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/PrecomputedText.cs b/src/net/Netdroid/Generated/Android/Text/PrecomputedText.cs
index 1e24cc1bb..6f746a59f 100644
--- a/src/net/Netdroid/Generated/Android/Text/PrecomputedText.cs
+++ b/src/net/Netdroid/Generated/Android/Text/PrecomputedText.cs
@@ -56,20 +56,6 @@ public static Android.Text.PrecomputedText Create(Java.Lang.CharSequence arg0, A
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.html#getParams()"/> 
-        /// </summary>
-        public Android.Text.PrecomputedText.Params GetParams
-        {
-            get { return IExecuteWithSignature<Android.Text.PrecomputedText.Params>("getParams", "()Landroid/text/PrecomputedText$Params;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.html#getParagraphCount()"/> 
-        /// </summary>
-        public int ParagraphCount
-        {
-            get { return IExecuteWithSignature<int>("getParagraphCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.html#getSpans(int,int,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -82,6 +68,14 @@ public T[] GetSpans<T>(int arg0, int arg1, Java.Lang.Class arg2)
             return IExecuteArray<T>("getSpans", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.html#getParams()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Text.PrecomputedText.Params"/></returns>
+        public Android.Text.PrecomputedText.Params GetParams()
+        {
+            return IExecuteWithSignature<Android.Text.PrecomputedText.Params>("getParams", "()Landroid/text/PrecomputedText$Params;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.html#charAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -101,6 +95,14 @@ public float GetWidth(int arg0, int arg1)
             return IExecute<float>("getWidth", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.html#getParagraphCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetParagraphCount()
+        {
+            return IExecuteWithSignature<int>("getParagraphCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.html#getParagraphEnd(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -238,39 +240,44 @@ public partial class Params
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getBreakStrategy()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getLineBreakConfig()"/>
             /// </summary>
-            public int BreakStrategy
+            /// <returns><see cref="Android.Graphics.Text.LineBreakConfig"/></returns>
+            public Android.Graphics.Text.LineBreakConfig GetLineBreakConfig()
             {
-                get { return IExecuteWithSignature<int>("getBreakStrategy", "()I"); }
+                return IExecuteWithSignature<Android.Graphics.Text.LineBreakConfig>("getLineBreakConfig", "()Landroid/graphics/text/LineBreakConfig;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getHyphenationFrequency()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getTextDirection()"/>
             /// </summary>
-            public int HyphenationFrequency
+            /// <returns><see cref="Android.Text.TextDirectionHeuristic"/></returns>
+            public Android.Text.TextDirectionHeuristic GetTextDirection()
             {
-                get { return IExecuteWithSignature<int>("getHyphenationFrequency", "()I"); }
+                return IExecuteWithSignature<Android.Text.TextDirectionHeuristic>("getTextDirection", "()Landroid/text/TextDirectionHeuristic;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getLineBreakConfig()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getTextPaint()"/>
             /// </summary>
-            public Android.Graphics.Text.LineBreakConfig LineBreakConfig
+            /// <returns><see cref="Android.Text.TextPaint"/></returns>
+            public Android.Text.TextPaint GetTextPaint()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Text.LineBreakConfig>("getLineBreakConfig", "()Landroid/graphics/text/LineBreakConfig;"); }
+                return IExecuteWithSignature<Android.Text.TextPaint>("getTextPaint", "()Landroid/text/TextPaint;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getTextDirection()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getBreakStrategy()"/>
             /// </summary>
-            public Android.Text.TextDirectionHeuristic TextDirection
+            /// <returns><see cref="int"/></returns>
+            public int GetBreakStrategy()
             {
-                get { return IExecuteWithSignature<Android.Text.TextDirectionHeuristic>("getTextDirection", "()Landroid/text/TextDirectionHeuristic;"); }
+                return IExecuteWithSignature<int>("getBreakStrategy", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getTextPaint()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/PrecomputedText.Params.html#getHyphenationFrequency()"/>
             /// </summary>
-            public Android.Text.TextPaint TextPaint
+            /// <returns><see cref="int"/></returns>
+            public int GetHyphenationFrequency()
             {
-                get { return IExecuteWithSignature<Android.Text.TextPaint>("getTextPaint", "()Landroid/text/TextPaint;"); }
+                return IExecuteWithSignature<int>("getHyphenationFrequency", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Spannable.cs b/src/net/Netdroid/Generated/Android/Text/Spannable.cs
index d3d506639..73fa2021c 100644
--- a/src/net/Netdroid/Generated/Android/Text/Spannable.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Spannable.cs
@@ -103,11 +103,12 @@ public partial class Factory
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/Spannable.Factory.html#getInstance()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/Spannable.Factory.html#getInstance()"/>
             /// </summary>
-            public static Android.Text.Spannable.Factory Instance
+            /// <returns><see cref="Android.Text.Spannable.Factory"/></returns>
+            public static Android.Text.Spannable.Factory GetInstance()
             {
-                get { return SExecuteWithSignature<Android.Text.Spannable.Factory>(LocalBridgeClazz, "getInstance", "()Landroid/text/Spannable$Factory;"); }
+                return SExecuteWithSignature<Android.Text.Spannable.Factory>(LocalBridgeClazz, "getInstance", "()Landroid/text/Spannable$Factory;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/SpannableStringBuilder.cs b/src/net/Netdroid/Generated/Android/Text/SpannableStringBuilder.cs
index 23b6b4816..061ef23c8 100644
--- a/src/net/Netdroid/Generated/Android/Text/SpannableStringBuilder.cs
+++ b/src/net/Netdroid/Generated/Android/Text/SpannableStringBuilder.cs
@@ -93,20 +93,6 @@ public static Android.Text.SpannableStringBuilder ValueOf(Java.Lang.CharSequence
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#getFilters()"/> <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#setFilters(android.text.InputFilter[])"/>
-        /// </summary>
-        public Android.Text.InputFilter[] Filters
-        {
-            get { return IExecuteWithSignatureArray<Android.Text.InputFilter>("getFilters", "()[Landroid/text/InputFilter;"); } set { IExecuteWithSignature("setFilters", "([Landroid/text/InputFilter;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#getTextWatcherDepth()"/> 
-        /// </summary>
-        public int TextWatcherDepth
-        {
-            get { return IExecuteWithSignature<int>("getTextWatcherDepth", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#getSpans(int,int,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -175,6 +161,14 @@ public Android.Text.Editable Replace(int arg0, int arg1, Java.Lang.CharSequence
             return IExecute<Android.Text.Editable>("replace", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#getFilters()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Text.InputFilter"/></returns>
+        public Android.Text.InputFilter[] GetFilters()
+        {
+            return IExecuteWithSignatureArray<Android.Text.InputFilter>("getFilters", "()[Landroid/text/InputFilter;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#append(java.lang.CharSequence,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -231,12 +225,20 @@ public int GetSpanStart(object arg0)
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="Android.Graphics.Paint"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetTextRunCursor(int arg0, int arg1, int arg2, int arg3, int arg4, Android.Graphics.Paint arg5)
         {
             return IExecute<int>("getTextRunCursor", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#getTextWatcherDepth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTextWatcherDepth()
+        {
+            return IExecuteWithSignature<int>("getTextWatcherDepth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -299,6 +301,14 @@ public void RemoveSpan(object arg0)
             IExecuteWithSignature("removeSpan", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#setFilters(android.text.InputFilter[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Text.InputFilter"/></param>
+        public void SetFilters(Android.Text.InputFilter[] arg0)
+        {
+            IExecuteWithSignature("setFilters", "([Landroid/text/InputFilter;)V", new object[] { arg0 });
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/SpannableStringBuilder.html#setSpan(java.lang.Object,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Text/StaticLayout.cs b/src/net/Netdroid/Generated/Android/Text/StaticLayout.cs
index 988122234..6b573f1e0 100644
--- a/src/net/Netdroid/Generated/Android/Text/StaticLayout.cs
+++ b/src/net/Netdroid/Generated/Android/Text/StaticLayout.cs
@@ -39,7 +39,7 @@ public partial class StaticLayout
         /// <param name="arg4"><see cref="float"/></param>
         /// <param name="arg5"><see cref="float"/></param>
         /// <param name="arg6"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public StaticLayout(Java.Lang.CharSequence arg0, Android.Text.TextPaint arg1, int arg2, Android.Text.Layout.Alignment arg3, float arg4, float arg5, bool arg6)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
         {
@@ -58,7 +58,7 @@ public StaticLayout(Java.Lang.CharSequence arg0, Android.Text.TextPaint arg1, in
         /// <param name="arg8"><see cref="bool"/></param>
         /// <param name="arg9"><see cref="Android.Text.TextUtils.TruncateAt"/></param>
         /// <param name="arg10"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public StaticLayout(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.TextPaint arg3, int arg4, Android.Text.Layout.Alignment arg5, float arg6, float arg7, bool arg8, Android.Text.TextUtils.TruncateAt arg9, int arg10)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10)
         {
@@ -75,7 +75,7 @@ public StaticLayout(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Tex
         /// <param name="arg6"><see cref="float"/></param>
         /// <param name="arg7"><see cref="float"/></param>
         /// <param name="arg8"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public StaticLayout(Java.Lang.CharSequence arg0, int arg1, int arg2, Android.Text.TextPaint arg3, int arg4, Android.Text.Layout.Alignment arg5, float arg6, float arg7, bool arg8)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8)
         {
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/AbsoluteSizeSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/AbsoluteSizeSpan.cs
index f5b6bfaba..42c6c8a71 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/AbsoluteSizeSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/AbsoluteSizeSpan.cs
@@ -75,33 +75,36 @@ public AbsoluteSizeSpan(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#getDip()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#getDip()"/>
         /// </summary>
-        public bool Dip
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDip()
         {
-            get { return IExecuteWithSignature<bool>("getDip", "()Z"); }
+            return IExecuteWithSignature<bool>("getDip", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#getSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#describeContents()"/>
         /// </summary>
-        public int Size
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSize", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#getSize()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetSize()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/AbsoluteSizeSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/AlignmentSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/AlignmentSpan.cs
index dfcb3cd8e..e390d0858 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/AlignmentSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/AlignmentSpan.cs
@@ -64,11 +64,12 @@ public partial class AlignmentSpan : Android.Text.Style.IAlignmentSpan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.html#getAlignment()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.html#getAlignment()"/>
         /// </summary>
-        public Android.Text.Layout.Alignment Alignment
+        /// <returns><see cref="Android.Text.Layout.Alignment"/></returns>
+        public Android.Text.Layout.Alignment GetAlignment()
         {
-            get { return IExecuteWithSignature<Android.Text.Layout.Alignment>("getAlignment", "()Landroid/text/Layout$Alignment;"); }
+            return IExecuteWithSignature<Android.Text.Layout.Alignment>("getAlignment", "()Landroid/text/Layout$Alignment;");
         }
 
         #endregion
@@ -119,26 +120,28 @@ public Standard(Android.Text.Layout.Alignment arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.Standard.html#getAlignment()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.Standard.html#getAlignment()"/>
             /// </summary>
-            public Android.Text.Layout.Alignment Alignment
+            /// <returns><see cref="Android.Text.Layout.Alignment"/></returns>
+            public Android.Text.Layout.Alignment GetAlignment()
             {
-                get { return IExecuteWithSignature<Android.Text.Layout.Alignment>("getAlignment", "()Landroid/text/Layout$Alignment;"); }
+                return IExecuteWithSignature<Android.Text.Layout.Alignment>("getAlignment", "()Landroid/text/Layout$Alignment;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.Standard.html#getSpanTypeId()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.Standard.html#describeContents()"/>
             /// </summary>
-            public int SpanTypeId
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.Standard.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.Standard.html#getSpanTypeId()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetSpanTypeId()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getSpanTypeId", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/text/style/AlignmentSpan.Standard.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Text/Style/AllPackageClasses.cs
index 8cb52d249..dc9bf12d4 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class AlignmentSpan : Android.Text.Style.ParagraphStyle
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AlignmentSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlignmentSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlignmentSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AlignmentSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlignmentSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlignmentSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,12 +258,12 @@ public partial class CharacterStyle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ch
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CharacterStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharacterStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharacterStyle() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CharacterStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharacterStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharacterStyle(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -304,12 +304,12 @@ public partial class ClickableSpan : Android.Text.Style.CharacterStyle
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ClickableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClickableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClickableSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ClickableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClickableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClickableSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -394,12 +394,12 @@ public partial class DynamicDrawableSpan : Android.Text.Style.ReplacementSpan
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DynamicDrawableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DynamicDrawableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DynamicDrawableSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DynamicDrawableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DynamicDrawableSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DynamicDrawableSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -616,12 +616,12 @@ public partial class LeadingMarginSpan : Android.Text.Style.ParagraphStyle
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LeadingMarginSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LeadingMarginSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LeadingMarginSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LeadingMarginSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LeadingMarginSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LeadingMarginSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -658,12 +658,12 @@ public partial class LeadingMarginSpan2 : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("LeadingMarginSpan2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LeadingMarginSpan2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LeadingMarginSpan2() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("LeadingMarginSpan2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LeadingMarginSpan2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LeadingMarginSpan2(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -752,12 +752,12 @@ public partial class LineBackgroundSpan : Android.Text.Style.ParagraphStyle
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LineBackgroundSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LineBackgroundSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LineBackgroundSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LineBackgroundSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LineBackgroundSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LineBackgroundSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -842,12 +842,12 @@ public partial class LineHeightSpan : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Li
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LineHeightSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LineHeightSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LineHeightSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LineHeightSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LineHeightSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LineHeightSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -928,12 +928,12 @@ public partial class WithDensity : Android.Text.Style.LineHeightSpan
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("WithDensity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WithDensity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WithDensity() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("WithDensity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WithDensity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WithDensity(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1066,12 +1066,12 @@ public partial class MetricAffectingSpan : Android.Text.Style.CharacterStyle
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MetricAffectingSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MetricAffectingSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MetricAffectingSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MetricAffectingSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MetricAffectingSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MetricAffectingSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1112,12 +1112,12 @@ public partial class ParagraphStyle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ParagraphStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ParagraphStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ParagraphStyle() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ParagraphStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ParagraphStyle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ParagraphStyle(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1246,12 +1246,12 @@ public partial class ReplacementSpan : Android.Text.Style.MetricAffectingSpan
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ReplacementSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReplacementSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReplacementSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ReplacementSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReplacementSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReplacementSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1600,12 +1600,12 @@ public partial class TabStopSpan : Android.Text.Style.ParagraphStyle
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TabStopSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TabStopSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TabStopSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TabStopSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TabStopSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TabStopSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1724,6 +1724,800 @@ public TextAppearanceSpan(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region TtsSpan
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html"/>
+    /// </summary>
+    public partial class TtsSpan : Android.Text.ParcelableSpan
+    {
+        const string _bridgeClassName = "android.text.style.TtsSpan";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        public TtsSpan() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public TtsSpan(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+        #region Builder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html"/>
+        /// </summary>
+        public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$Builder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public Builder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public Builder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region Builder<C>
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html"/>
+        /// </summary>
+        /// <typeparam name="C"></typeparam>
+        public partial class Builder<C> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<C>> where C : Android.Text.Style.TtsSpan.Builder<C>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$Builder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public Builder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public Builder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region CardinalBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.CardinalBuilder.html"/>
+        /// </summary>
+        public partial class CardinalBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.CardinalBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$CardinalBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public CardinalBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public CardinalBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region DateBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DateBuilder.html"/>
+        /// </summary>
+        public partial class DateBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.DateBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$DateBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public DateBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public DateBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region DecimalBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DecimalBuilder.html"/>
+        /// </summary>
+        public partial class DecimalBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.DecimalBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$DecimalBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public DecimalBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public DecimalBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region DigitsBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DigitsBuilder.html"/>
+        /// </summary>
+        public partial class DigitsBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.DigitsBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$DigitsBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public DigitsBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public DigitsBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region ElectronicBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html"/>
+        /// </summary>
+        public partial class ElectronicBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.ElectronicBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$ElectronicBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public ElectronicBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public ElectronicBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region FractionBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.FractionBuilder.html"/>
+        /// </summary>
+        public partial class FractionBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.FractionBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$FractionBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public FractionBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public FractionBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region MeasureBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html"/>
+        /// </summary>
+        public partial class MeasureBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.MeasureBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$MeasureBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public MeasureBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public MeasureBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region MoneyBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MoneyBuilder.html"/>
+        /// </summary>
+        public partial class MoneyBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.MoneyBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$MoneyBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public MoneyBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public MoneyBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region OrdinalBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.OrdinalBuilder.html"/>
+        /// </summary>
+        public partial class OrdinalBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.OrdinalBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$OrdinalBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public OrdinalBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public OrdinalBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region SemioticClassBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html"/>
+        /// </summary>
+        public partial class SemioticClassBuilder : Android.Text.Style.TtsSpan.Builder
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$SemioticClassBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public SemioticClassBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public SemioticClassBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region SemioticClassBuilder<C>
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html"/>
+        /// </summary>
+        /// <typeparam name="C"></typeparam>
+        public partial class SemioticClassBuilder<C> : Android.Text.Style.TtsSpan.Builder<C> where C : Android.Text.Style.TtsSpan.SemioticClassBuilder<C>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$SemioticClassBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public SemioticClassBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public SemioticClassBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region TelephoneBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TelephoneBuilder.html"/>
+        /// </summary>
+        public partial class TelephoneBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.TelephoneBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$TelephoneBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public TelephoneBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public TelephoneBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region TextBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TextBuilder.html"/>
+        /// </summary>
+        public partial class TextBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.TextBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$TextBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public TextBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public TextBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region TimeBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TimeBuilder.html"/>
+        /// </summary>
+        public partial class TimeBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.TimeBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$TimeBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public TimeBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public TimeBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region VerbatimBuilder
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.VerbatimBuilder.html"/>
+        /// </summary>
+        public partial class VerbatimBuilder : Android.Text.Style.TtsSpan.SemioticClassBuilder<Android.Text.Style.TtsSpan.VerbatimBuilder>
+        {
+            const string _bridgeClassName = "android.text.style.TtsSpan$VerbatimBuilder";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            public VerbatimBuilder() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            public VerbatimBuilder(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+    
+    }
+    #endregion
+
     #region TypefaceSpan
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html"/>
@@ -1822,12 +2616,12 @@ public partial class UpdateAppearance : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UpdateAppearance class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UpdateAppearance class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UpdateAppearance() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UpdateAppearance class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UpdateAppearance class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UpdateAppearance(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1868,12 +2662,12 @@ public partial class UpdateLayout : Android.Text.Style.UpdateAppearance
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UpdateLayout class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UpdateLayout class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UpdateLayout() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UpdateLayout class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UpdateLayout class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UpdateLayout(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1958,12 +2752,12 @@ public partial class WrapTogetherSpan : Android.Text.Style.ParagraphStyle
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WrapTogetherSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WrapTogetherSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WrapTogetherSpan() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WrapTogetherSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WrapTogetherSpan class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WrapTogetherSpan(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/BackgroundColorSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/BackgroundColorSpan.cs
index 768b51919..d3605b4f8 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/BackgroundColorSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/BackgroundColorSpan.cs
@@ -70,26 +70,28 @@ public BackgroundColorSpan(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan.html#getBackgroundColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan.html#describeContents()"/>
         /// </summary>
-        public int BackgroundColor
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getBackgroundColor", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan.html#getBackgroundColor()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetBackgroundColor()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getBackgroundColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/BackgroundColorSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/BulletSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/BulletSpan.cs
index 5c58fc3f7..deee5e245 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/BulletSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/BulletSpan.cs
@@ -95,40 +95,36 @@ public BulletSpan(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getBulletRadius()"/> 
-        /// </summary>
-        public int BulletRadius
-        {
-            get { return IExecuteWithSignature<int>("getBulletRadius", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#describeContents()"/>
         /// </summary>
-        public int Color
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getColor", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getGapWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getBulletRadius()"/>
         /// </summary>
-        public int GapWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetBulletRadius()
         {
-            get { return IExecuteWithSignature<int>("getGapWidth", "()I"); }
+            return IExecuteWithSignature<int>("getBulletRadius", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getColor()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetColor()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getGapWidth()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetGapWidth()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getGapWidth", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getLeadingMargin(boolean)"/>
@@ -140,6 +136,14 @@ public int GetLeadingMargin(bool arg0)
             return IExecuteWithSignature<int>("getLeadingMargin", "(Z)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#getSpanTypeId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
+        {
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/BulletSpan.html#drawLeadingMargin(android.graphics.Canvas,android.graphics.Paint,int,int,int,int,int,java.lang.CharSequence,int,int,boolean,android.text.Layout)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/CharacterStyle.cs b/src/net/Netdroid/Generated/Android/Text/Style/CharacterStyle.cs
index 888e0e6cc..a3598020a 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/CharacterStyle.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/CharacterStyle.cs
@@ -55,13 +55,6 @@ public static Android.Text.Style.CharacterStyle Wrap(Android.Text.Style.Characte
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/CharacterStyle.html#getUnderlying()"/> 
-        /// </summary>
-        public Android.Text.Style.CharacterStyle Underlying
-        {
-            get { return IExecuteWithSignature<Android.Text.Style.CharacterStyle>("getUnderlying", "()Landroid/text/style/CharacterStyle;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/CharacterStyle.html#updateDrawState(android.text.TextPaint)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.TextPaint"/></param>
@@ -69,6 +62,14 @@ public void UpdateDrawState(Android.Text.TextPaint arg0)
         {
             IExecuteWithSignature("updateDrawState", "(Landroid/text/TextPaint;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/CharacterStyle.html#getUnderlying()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Text.Style.CharacterStyle"/></returns>
+        public Android.Text.Style.CharacterStyle GetUnderlying()
+        {
+            return IExecuteWithSignature<Android.Text.Style.CharacterStyle>("getUnderlying", "()Landroid/text/style/CharacterStyle;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/DrawableMarginSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/DrawableMarginSpan.cs
index 0534c55ed..f05393127 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/DrawableMarginSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/DrawableMarginSpan.cs
@@ -71,18 +71,12 @@ public DrawableMarginSpan(Android.Graphics.Drawable.Drawable arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/DrawableMarginSpan.html#getDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/DrawableMarginSpan.html#getDrawable()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Drawable
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDrawable()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/DrawableMarginSpan.html#getPadding()"/> 
-        /// </summary>
-        public int Padding
-        {
-            get { return IExecuteWithSignature<int>("getPadding", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/DrawableMarginSpan.html#getLeadingMargin(boolean)"/>
@@ -94,6 +88,14 @@ public int GetLeadingMargin(bool arg0)
             return IExecuteWithSignature<int>("getLeadingMargin", "(Z)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/DrawableMarginSpan.html#getPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPadding()
+        {
+            return IExecuteWithSignature<int>("getPadding", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/DrawableMarginSpan.html#chooseHeight(java.lang.CharSequence,int,int,int,int,android.graphics.Paint.FontMetricsInt)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/DynamicDrawableSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/DynamicDrawableSpan.cs
index 61b4b33bb..cfe5cee37 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/DynamicDrawableSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/DynamicDrawableSpan.cs
@@ -64,18 +64,20 @@ public partial class DynamicDrawableSpan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/DynamicDrawableSpan.html#getDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/DynamicDrawableSpan.html#getDrawable()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Drawable
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDrawable()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/DynamicDrawableSpan.html#getVerticalAlignment()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/DynamicDrawableSpan.html#getVerticalAlignment()"/>
         /// </summary>
-        public int VerticalAlignment
+        /// <returns><see cref="int"/></returns>
+        public int GetVerticalAlignment()
         {
-            get { return IExecuteWithSignature<int>("getVerticalAlignment", "()I"); }
+            return IExecuteWithSignature<int>("getVerticalAlignment", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/EasyEditSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/EasyEditSpan.cs
index e8fb93e83..27b041506 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/EasyEditSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/EasyEditSpan.cs
@@ -80,19 +80,20 @@ public EasyEditSpan(Android.Os.Parcel arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/EasyEditSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/EasyEditSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/EasyEditSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/EasyEditSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/EasyEditSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/ForegroundColorSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/ForegroundColorSpan.cs
index bd4761101..e88e2a3cb 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/ForegroundColorSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/ForegroundColorSpan.cs
@@ -70,26 +70,28 @@ public ForegroundColorSpan(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan.html#getForegroundColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan.html#describeContents()"/>
         /// </summary>
-        public int ForegroundColor
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getForegroundColor", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan.html#getForegroundColor()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetForegroundColor()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getForegroundColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/ForegroundColorSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/IconMarginSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/IconMarginSpan.cs
index 16d74afda..663da8c10 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/IconMarginSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/IconMarginSpan.cs
@@ -71,18 +71,12 @@ public IconMarginSpan(Android.Graphics.Bitmap arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/IconMarginSpan.html#getBitmap()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/IconMarginSpan.html#getBitmap()"/>
         /// </summary>
-        public Android.Graphics.Bitmap Bitmap
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetBitmap()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/IconMarginSpan.html#getPadding()"/> 
-        /// </summary>
-        public int Padding
-        {
-            get { return IExecuteWithSignature<int>("getPadding", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/IconMarginSpan.html#getLeadingMargin(boolean)"/>
@@ -94,6 +88,14 @@ public int GetLeadingMargin(bool arg0)
             return IExecuteWithSignature<int>("getLeadingMargin", "(Z)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/IconMarginSpan.html#getPadding()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPadding()
+        {
+            return IExecuteWithSignature<int>("getPadding", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/IconMarginSpan.html#chooseHeight(java.lang.CharSequence,int,int,int,int,android.graphics.Paint.FontMetricsInt)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/ImageSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/ImageSpan.cs
index 551da27fc..06d5ddb76 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/ImageSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/ImageSpan.cs
@@ -91,7 +91,7 @@ public ImageSpan(Android.Content.Context arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ImageSpan(Android.Graphics.Bitmap arg0, int arg1)
             : base(arg0, arg1)
         {
@@ -100,7 +100,7 @@ public ImageSpan(Android.Graphics.Bitmap arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/text/style/ImageSpan.html#%3Cinit%3E(android.graphics.Bitmap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ImageSpan(Android.Graphics.Bitmap arg0)
             : base(arg0)
         {
@@ -158,11 +158,12 @@ public ImageSpan(Android.Graphics.Drawable.Drawable arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/ImageSpan.html#getSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/ImageSpan.html#getSource()"/>
         /// </summary>
-        public Java.Lang.String Source
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSource()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSource", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSource", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/LeadingMarginSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/LeadingMarginSpan.cs
index b5cb6cc32..da7ea6bc3 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/LeadingMarginSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/LeadingMarginSpan.cs
@@ -124,11 +124,12 @@ public partial class LeadingMarginSpan2 : Android.Text.Style.ILeadingMarginSpan,
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/LeadingMarginSpan.LeadingMarginSpan2.html#getLeadingMarginLineCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/style/LeadingMarginSpan.LeadingMarginSpan2.html#getLeadingMarginLineCount()"/>
             /// </summary>
-            public int LeadingMarginLineCount
+            /// <returns><see cref="int"/></returns>
+            public int GetLeadingMarginLineCount()
             {
-                get { return IExecuteWithSignature<int>("getLeadingMarginLineCount", "()I"); }
+                return IExecuteWithSignature<int>("getLeadingMarginLineCount", "()I");
             }
 
             #endregion
@@ -195,13 +196,6 @@ public Standard(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/LeadingMarginSpan.Standard.html#getSpanTypeId()"/> 
-            /// </summary>
-            public int SpanTypeId
-            {
-                get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/text/style/LeadingMarginSpan.Standard.html#describeContents()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
@@ -219,6 +213,14 @@ public int GetLeadingMargin(bool arg0)
                 return IExecuteWithSignature<int>("getLeadingMargin", "(Z)I", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/LeadingMarginSpan.Standard.html#getSpanTypeId()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetSpanTypeId()
+            {
+                return IExecuteWithSignature<int>("getSpanTypeId", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/text/style/LeadingMarginSpan.Standard.html#drawLeadingMargin(android.graphics.Canvas,android.graphics.Paint,int,int,int,int,int,java.lang.CharSequence,int,int,boolean,android.text.Layout)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/LineBackgroundSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/LineBackgroundSpan.cs
index 549d7b129..550f2650d 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/LineBackgroundSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/LineBackgroundSpan.cs
@@ -130,26 +130,28 @@ public Standard(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/LineBackgroundSpan.Standard.html#getColor()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/style/LineBackgroundSpan.Standard.html#getColor()"/>
             /// </summary>
-            public int Color
+            /// <returns><see cref="int"/></returns>
+            public int GetColor()
             {
-                get { return IExecuteWithSignature<int>("getColor", "()I"); }
+                return IExecuteWithSignature<int>("getColor", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/LineBackgroundSpan.Standard.html#getSpanTypeId()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/style/LineBackgroundSpan.Standard.html#describeContents()"/>
             /// </summary>
-            public int SpanTypeId
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/LineBackgroundSpan.Standard.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/text/style/LineBackgroundSpan.Standard.html#getSpanTypeId()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetSpanTypeId()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getSpanTypeId", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/text/style/LineBackgroundSpan.Standard.html#drawBackground(android.graphics.Canvas,android.graphics.Paint,int,int,int,int,int,java.lang.CharSequence,int,int,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/LineHeightSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/LineHeightSpan.cs
index a4d6c452b..cc88cd02a 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/LineHeightSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/LineHeightSpan.cs
@@ -133,26 +133,28 @@ public Standard(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/LineHeightSpan.Standard.html#getHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/style/LineHeightSpan.Standard.html#describeContents()"/>
             /// </summary>
-            public int Height
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/LineHeightSpan.Standard.html#getSpanTypeId()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/style/LineHeightSpan.Standard.html#getHeight()"/>
             /// </summary>
-            public int SpanTypeId
+            /// <returns><see cref="int"/></returns>
+            public int GetHeight()
             {
-                get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+                return IExecuteWithSignature<int>("getHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/LineHeightSpan.Standard.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/text/style/LineHeightSpan.Standard.html#getSpanTypeId()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetSpanTypeId()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getSpanTypeId", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/text/style/LineHeightSpan.Standard.html#chooseHeight(java.lang.CharSequence,int,int,int,int,android.graphics.Paint.FontMetricsInt)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/LocaleSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/LocaleSpan.cs
index a8e680d7d..741ae791d 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/LocaleSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/LocaleSpan.cs
@@ -74,33 +74,36 @@ public LocaleSpan(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#getLocales()"/>
         /// </summary>
-        public Java.Util.Locale Locale
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetLocales()
         {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#getLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#describeContents()"/>
         /// </summary>
-        public Android.Os.LocaleList Locales
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getLocales", "()Landroid/os/LocaleList;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#getSpanTypeId()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#getLocale()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/LocaleSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/MaskFilterSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/MaskFilterSpan.cs
index 98cbe9a43..4eab8596d 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/MaskFilterSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/MaskFilterSpan.cs
@@ -58,11 +58,12 @@ public MaskFilterSpan(Android.Graphics.MaskFilter arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/MaskFilterSpan.html#getMaskFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/MaskFilterSpan.html#getMaskFilter()"/>
         /// </summary>
-        public Android.Graphics.MaskFilter MaskFilter
+        /// <returns><see cref="Android.Graphics.MaskFilter"/></returns>
+        public Android.Graphics.MaskFilter GetMaskFilter()
         {
-            get { return IExecuteWithSignature<Android.Graphics.MaskFilter>("getMaskFilter", "()Landroid/graphics/MaskFilter;"); }
+            return IExecuteWithSignature<Android.Graphics.MaskFilter>("getMaskFilter", "()Landroid/graphics/MaskFilter;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/QuoteSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/QuoteSpan.cs
index eccaa3df8..4b05be936 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/QuoteSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/QuoteSpan.cs
@@ -98,49 +98,53 @@ public QuoteSpan(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#describeContents()"/>
         /// </summary>
-        public int Color
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getColor", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getGapWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getColor()"/>
         /// </summary>
-        public int GapWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetColor()
         {
-            get { return IExecuteWithSignature<int>("getGapWidth", "()I"); }
+            return IExecuteWithSignature<int>("getColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getGapWidth()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetGapWidth()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getGapWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getStripeWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getLeadingMargin(boolean)"/>
         /// </summary>
-        public int StripeWidth
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetLeadingMargin(bool arg0)
         {
-            get { return IExecuteWithSignature<int>("getStripeWidth", "()I"); }
+            return IExecuteWithSignature<int>("getLeadingMargin", "(Z)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getLeadingMargin(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#getStripeWidth()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="int"/></returns>
-        public int GetLeadingMargin(bool arg0)
+        public int GetStripeWidth()
         {
-            return IExecuteWithSignature<int>("getLeadingMargin", "(Z)I", arg0);
+            return IExecuteWithSignature<int>("getStripeWidth", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/QuoteSpan.html#drawLeadingMargin(android.graphics.Canvas,android.graphics.Paint,int,int,int,int,int,java.lang.CharSequence,int,int,boolean,android.text.Layout)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/RelativeSizeSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/RelativeSizeSpan.cs
index 237d22884..0e2595050 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/RelativeSizeSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/RelativeSizeSpan.cs
@@ -66,26 +66,28 @@ public RelativeSizeSpan(float arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan.html#getSizeChange()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan.html#getSizeChange()"/>
         /// </summary>
-        public float SizeChange
+        /// <returns><see cref="float"/></returns>
+        public float GetSizeChange()
         {
-            get { return IExecuteWithSignature<float>("getSizeChange", "()F"); }
+            return IExecuteWithSignature<float>("getSizeChange", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/RelativeSizeSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/ReplacementSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/ReplacementSpan.cs
index ad7ada179..4306a6b85 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/ReplacementSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/ReplacementSpan.cs
@@ -46,13 +46,6 @@ public partial class ReplacementSpan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/ReplacementSpan.html#getContentDescription()"/> <see href="https://developer.android.com/reference/android/text/style/ReplacementSpan.html#setContentDescription(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence ContentDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/ReplacementSpan.html#getSize(android.graphics.Paint,java.lang.CharSequence,int,int,android.graphics.Paint.FontMetricsInt)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Paint"/></param>
@@ -81,6 +74,22 @@ public void Draw(Android.Graphics.Canvas arg0, Java.Lang.CharSequence arg1, int
         {
             IExecute("draw", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/ReplacementSpan.html#getContentDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/ReplacementSpan.html#setContentDescription(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetContentDescription(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/ScaleXSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/ScaleXSpan.cs
index adb24b6ad..42bdcb5fa 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/ScaleXSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/ScaleXSpan.cs
@@ -66,26 +66,28 @@ public ScaleXSpan(float arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/ScaleXSpan.html#getScaleX()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/ScaleXSpan.html#getScaleX()"/>
         /// </summary>
-        public float ScaleX
+        /// <returns><see cref="float"/></returns>
+        public float GetScaleX()
         {
-            get { return IExecuteWithSignature<float>("getScaleX", "()F"); }
+            return IExecuteWithSignature<float>("getScaleX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/ScaleXSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/ScaleXSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/ScaleXSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/ScaleXSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/ScaleXSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/StrikethroughSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/StrikethroughSpan.cs
index fdc1bbb32..38646a6e8 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/StrikethroughSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/StrikethroughSpan.cs
@@ -62,19 +62,20 @@ public StrikethroughSpan(Android.Os.Parcel arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/StrikethroughSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/StrikethroughSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/StrikethroughSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/StrikethroughSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/StrikethroughSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/StyleSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/StyleSpan.cs
index 8f828b147..644cf5fd3 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/StyleSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/StyleSpan.cs
@@ -75,33 +75,36 @@ public StyleSpan(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#getFontWeightAdjustment()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#describeContents()"/>
         /// </summary>
-        public int FontWeightAdjustment
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getFontWeightAdjustment", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#getFontWeightAdjustment()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetFontWeightAdjustment()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getFontWeightAdjustment", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#getStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#getSpanTypeId()"/>
         /// </summary>
-        public int Style
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
         {
-            get { return IExecuteWithSignature<int>("getStyle", "()I"); }
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#getStyle()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetStyle()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getStyle", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/StyleSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/SubscriptSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/SubscriptSpan.cs
index 6111f1cf5..32f89825f 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/SubscriptSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/SubscriptSpan.cs
@@ -58,19 +58,20 @@ public SubscriptSpan(Android.Os.Parcel arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SubscriptSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/SubscriptSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SubscriptSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/SubscriptSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/SubscriptSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/SuggestionRangeSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/SuggestionRangeSpan.cs
index ac5b115bb..d6eaa9338 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/SuggestionRangeSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/SuggestionRangeSpan.cs
@@ -56,26 +56,36 @@ public partial class SuggestionRangeSpan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#getBackgroundColor()"/> <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#setBackgroundColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#describeContents()"/>
         /// </summary>
-        public int BackgroundColor
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getBackgroundColor", "()I"); } set { IExecuteWithSignature("setBackgroundColor", "(I)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#getBackgroundColor()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetBackgroundColor()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getBackgroundColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#setBackgroundColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBackgroundColor(int arg0)
+        {
+            IExecuteWithSignature("setBackgroundColor", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/SuggestionRangeSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/SuggestionSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/SuggestionSpan.cs
index 01f766e98..2687f0b10 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/SuggestionSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/SuggestionSpan.cs
@@ -120,28 +120,28 @@ public SuggestionSpan(Java.Util.Locale arg0, Java.Lang.String[] arg1, int arg2)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#ACTION_SUGGESTION_PICKED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String ACTION_SUGGESTION_PICKED { get { if (!_ACTION_SUGGESTION_PICKEDReady) { _ACTION_SUGGESTION_PICKEDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACTION_SUGGESTION_PICKED"); _ACTION_SUGGESTION_PICKEDReady = true; } return _ACTION_SUGGESTION_PICKEDContent; } }
         private static Java.Lang.String _ACTION_SUGGESTION_PICKEDContent = default;
         private static bool _ACTION_SUGGESTION_PICKEDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#SUGGESTION_SPAN_PICKED_AFTER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SUGGESTION_SPAN_PICKED_AFTER { get { if (!_SUGGESTION_SPAN_PICKED_AFTERReady) { _SUGGESTION_SPAN_PICKED_AFTERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SUGGESTION_SPAN_PICKED_AFTER"); _SUGGESTION_SPAN_PICKED_AFTERReady = true; } return _SUGGESTION_SPAN_PICKED_AFTERContent; } }
         private static Java.Lang.String _SUGGESTION_SPAN_PICKED_AFTERContent = default;
         private static bool _SUGGESTION_SPAN_PICKED_AFTERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#SUGGESTION_SPAN_PICKED_BEFORE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SUGGESTION_SPAN_PICKED_BEFORE { get { if (!_SUGGESTION_SPAN_PICKED_BEFOREReady) { _SUGGESTION_SPAN_PICKED_BEFOREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SUGGESTION_SPAN_PICKED_BEFORE"); _SUGGESTION_SPAN_PICKED_BEFOREReady = true; } return _SUGGESTION_SPAN_PICKED_BEFOREContent; } }
         private static Java.Lang.String _SUGGESTION_SPAN_PICKED_BEFOREContent = default;
         private static bool _SUGGESTION_SPAN_PICKED_BEFOREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#SUGGESTION_SPAN_PICKED_HASHCODE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SUGGESTION_SPAN_PICKED_HASHCODE { get { if (!_SUGGESTION_SPAN_PICKED_HASHCODEReady) { _SUGGESTION_SPAN_PICKED_HASHCODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SUGGESTION_SPAN_PICKED_HASHCODE"); _SUGGESTION_SPAN_PICKED_HASHCODEReady = true; } return _SUGGESTION_SPAN_PICKED_HASHCODEContent; } }
         private static Java.Lang.String _SUGGESTION_SPAN_PICKED_HASHCODEContent = default;
         private static bool _SUGGESTION_SPAN_PICKED_HASHCODEReady = false; // this is used because in case of generics 
@@ -154,55 +154,69 @@ public SuggestionSpan(Java.Util.Locale arg0, Java.Lang.String[] arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getFlags()"/> <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#setFlags(int)"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#describeContents()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); } set { IExecuteWithSignature("setFlags", "(I)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getFlags()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Locale
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocale", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getLocaleObject()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getSpanTypeId()"/>
         /// </summary>
-        public Java.Util.Locale LocaleObject
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
         {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocaleObject", "()Ljava/util/Locale;"); }
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getUnderlineColor()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int GetUnderlineColor()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("getUnderlineColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getSuggestions()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getLocale()"/>
         /// </summary>
-        public Java.Lang.String[] Suggestions
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetLocale()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSuggestions", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getLocale", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getUnderlineColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getSuggestions()"/>
         /// </summary>
-        public int UnderlineColor
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSuggestions()
         {
-            get { return IExecuteWithSignature<int>("getUnderlineColor", "()I"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSuggestions", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#getLocaleObject()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocaleObject()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.Locale>("getLocaleObject", "()Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#setFlags(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFlags(int arg0)
+        {
+            IExecuteWithSignature("setFlags", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/SuggestionSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/SuperscriptSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/SuperscriptSpan.cs
index c98226e2c..9b98e124e 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/SuperscriptSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/SuperscriptSpan.cs
@@ -58,19 +58,20 @@ public SuperscriptSpan(Android.Os.Parcel arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuperscriptSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/SuperscriptSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/SuperscriptSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/SuperscriptSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/SuperscriptSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/TabStopSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/TabStopSpan.cs
index f96b258d3..f399ea4c6 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/TabStopSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/TabStopSpan.cs
@@ -64,11 +64,12 @@ public partial class TabStopSpan : Android.Text.Style.ITabStopSpan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TabStopSpan.html#getTabStop()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TabStopSpan.html#getTabStop()"/>
         /// </summary>
-        public int TabStop
+        /// <returns><see cref="int"/></returns>
+        public int GetTabStop()
         {
-            get { return IExecuteWithSignature<int>("getTabStop", "()I"); }
+            return IExecuteWithSignature<int>("getTabStop", "()I");
         }
 
         #endregion
@@ -103,11 +104,12 @@ public Standard(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/text/style/TabStopSpan.Standard.html#getTabStop()"/> 
+            /// <see href="https://developer.android.com/reference/android/text/style/TabStopSpan.Standard.html#getTabStop()"/>
             /// </summary>
-            public int TabStop
+            /// <returns><see cref="int"/></returns>
+            public int GetTabStop()
             {
-                get { return IExecuteWithSignature<int>("getTabStop", "()I"); }
+                return IExecuteWithSignature<int>("getTabStop", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/TextAppearanceSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/TextAppearanceSpan.cs
index 738d83496..5f5ac7a4e 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/TextAppearanceSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/TextAppearanceSpan.cs
@@ -89,132 +89,148 @@ public TextAppearanceSpan(Java.Lang.String arg0, int arg1, int arg2, Android.Con
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getFamily()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getLinkTextColor()"/>
         /// </summary>
-        public Java.Lang.String Family
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetLinkTextColor()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFamily", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getLinkTextColor", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getFontFeatureSettings()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextColor()"/>
         /// </summary>
-        public Java.Lang.String FontFeatureSettings
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetTextColor()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFontFeatureSettings", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getTextColor", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getFontVariationSettings()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTypeface()"/>
         /// </summary>
-        public Java.Lang.String FontVariationSettings
+        /// <returns><see cref="Android.Graphics.Typeface"/></returns>
+        public Android.Graphics.Typeface GetTypeface()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFontVariationSettings", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getLetterSpacing()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextLocales()"/>
         /// </summary>
-        public float LetterSpacing
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetTextLocales()
         {
-            get { return IExecuteWithSignature<float>("getLetterSpacing", "()F"); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getTextLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getLinkTextColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#isElegantTextHeight()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList LinkTextColor
+        /// <returns><see cref="bool"/></returns>
+        public bool IsElegantTextHeight()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getLinkTextColor", "()Landroid/content/res/ColorStateList;"); }
+            return IExecuteWithSignature<bool>("isElegantTextHeight", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getShadowColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getLetterSpacing()"/>
         /// </summary>
-        public int ShadowColor
+        /// <returns><see cref="float"/></returns>
+        public float GetLetterSpacing()
         {
-            get { return IExecuteWithSignature<int>("getShadowColor", "()I"); }
+            return IExecuteWithSignature<float>("getLetterSpacing", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getShadowDx()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getShadowDx()"/>
         /// </summary>
-        public float ShadowDx
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowDx()
         {
-            get { return IExecuteWithSignature<float>("getShadowDx", "()F"); }
+            return IExecuteWithSignature<float>("getShadowDx", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getShadowDy()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getShadowDy()"/>
         /// </summary>
-        public float ShadowDy
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowDy()
         {
-            get { return IExecuteWithSignature<float>("getShadowDy", "()F"); }
+            return IExecuteWithSignature<float>("getShadowDy", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getShadowRadius()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getShadowRadius()"/>
         /// </summary>
-        public float ShadowRadius
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowRadius()
         {
-            get { return IExecuteWithSignature<float>("getShadowRadius", "()F"); }
+            return IExecuteWithSignature<float>("getShadowRadius", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getShadowColor()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList TextColor
+        /// <returns><see cref="int"/></returns>
+        public int GetShadowColor()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getTextColor", "()Landroid/content/res/ColorStateList;"); }
+            return IExecuteWithSignature<int>("getShadowColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextFontWeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getSpanTypeId()"/>
         /// </summary>
-        public int TextFontWeight
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
         {
-            get { return IExecuteWithSignature<int>("getTextFontWeight", "()I"); }
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextFontWeight()"/>
         /// </summary>
-        public Android.Os.LocaleList TextLocales
+        /// <returns><see cref="int"/></returns>
+        public int GetTextFontWeight()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getTextLocales", "()Landroid/os/LocaleList;"); }
+            return IExecuteWithSignature<int>("getTextFontWeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextSize()"/>
         /// </summary>
-        public int TextSize
+        /// <returns><see cref="int"/></returns>
+        public int GetTextSize()
         {
-            get { return IExecuteWithSignature<int>("getTextSize", "()I"); }
+            return IExecuteWithSignature<int>("getTextSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTextStyle()"/>
         /// </summary>
-        public int TextStyle
+        /// <returns><see cref="int"/></returns>
+        public int GetTextStyle()
         {
-            get { return IExecuteWithSignature<int>("getTextStyle", "()I"); }
+            return IExecuteWithSignature<int>("getTextStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getTypeface()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getFamily()"/>
         /// </summary>
-        public Android.Graphics.Typeface Typeface
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFamily()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFamily", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#isElegantTextHeight()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getFontFeatureSettings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsElegantTextHeight()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFontFeatureSettings()
         {
-            return IExecuteWithSignature<bool>("isElegantTextHeight", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getFontFeatureSettings", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#getFontVariationSettings()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFontVariationSettings()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getFontVariationSettings", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/TextAppearanceSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/TtsSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/TtsSpan.cs
new file mode 100644
index 000000000..fd54f5496
--- /dev/null
+++ b/src/net/Netdroid/Generated/Android/Text/Style/TtsSpan.cs
@@ -0,0 +1,1877 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android.Text.Style
+{
+    #region TtsSpan
+    public partial class TtsSpan
+    {
+        #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#%3Cinit%3E(android.os.Parcel)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
+        public TtsSpan(Android.Os.Parcel arg0)
+            : base(arg0)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#%3Cinit%3E(java.lang.String,android.os.PersistableBundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Android.Os.PersistableBundle"/></param>
+        public TtsSpan(Java.Lang.String arg0, Android.Os.PersistableBundle arg1)
+            : base(arg0, arg1)
+        {
+        }
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_APRIL"/>
+        /// </summary>
+        public static int MONTH_APRIL { get { if (!_MONTH_APRILReady) { _MONTH_APRILContent = SGetField<int>(LocalBridgeClazz, "MONTH_APRIL"); _MONTH_APRILReady = true; } return _MONTH_APRILContent; } }
+        private static int _MONTH_APRILContent = default;
+        private static bool _MONTH_APRILReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_AUGUST"/>
+        /// </summary>
+        public static int MONTH_AUGUST { get { if (!_MONTH_AUGUSTReady) { _MONTH_AUGUSTContent = SGetField<int>(LocalBridgeClazz, "MONTH_AUGUST"); _MONTH_AUGUSTReady = true; } return _MONTH_AUGUSTContent; } }
+        private static int _MONTH_AUGUSTContent = default;
+        private static bool _MONTH_AUGUSTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_DECEMBER"/>
+        /// </summary>
+        public static int MONTH_DECEMBER { get { if (!_MONTH_DECEMBERReady) { _MONTH_DECEMBERContent = SGetField<int>(LocalBridgeClazz, "MONTH_DECEMBER"); _MONTH_DECEMBERReady = true; } return _MONTH_DECEMBERContent; } }
+        private static int _MONTH_DECEMBERContent = default;
+        private static bool _MONTH_DECEMBERReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_FEBRUARY"/>
+        /// </summary>
+        public static int MONTH_FEBRUARY { get { if (!_MONTH_FEBRUARYReady) { _MONTH_FEBRUARYContent = SGetField<int>(LocalBridgeClazz, "MONTH_FEBRUARY"); _MONTH_FEBRUARYReady = true; } return _MONTH_FEBRUARYContent; } }
+        private static int _MONTH_FEBRUARYContent = default;
+        private static bool _MONTH_FEBRUARYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_JANUARY"/>
+        /// </summary>
+        public static int MONTH_JANUARY { get { if (!_MONTH_JANUARYReady) { _MONTH_JANUARYContent = SGetField<int>(LocalBridgeClazz, "MONTH_JANUARY"); _MONTH_JANUARYReady = true; } return _MONTH_JANUARYContent; } }
+        private static int _MONTH_JANUARYContent = default;
+        private static bool _MONTH_JANUARYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_JULY"/>
+        /// </summary>
+        public static int MONTH_JULY { get { if (!_MONTH_JULYReady) { _MONTH_JULYContent = SGetField<int>(LocalBridgeClazz, "MONTH_JULY"); _MONTH_JULYReady = true; } return _MONTH_JULYContent; } }
+        private static int _MONTH_JULYContent = default;
+        private static bool _MONTH_JULYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_JUNE"/>
+        /// </summary>
+        public static int MONTH_JUNE { get { if (!_MONTH_JUNEReady) { _MONTH_JUNEContent = SGetField<int>(LocalBridgeClazz, "MONTH_JUNE"); _MONTH_JUNEReady = true; } return _MONTH_JUNEContent; } }
+        private static int _MONTH_JUNEContent = default;
+        private static bool _MONTH_JUNEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_MARCH"/>
+        /// </summary>
+        public static int MONTH_MARCH { get { if (!_MONTH_MARCHReady) { _MONTH_MARCHContent = SGetField<int>(LocalBridgeClazz, "MONTH_MARCH"); _MONTH_MARCHReady = true; } return _MONTH_MARCHContent; } }
+        private static int _MONTH_MARCHContent = default;
+        private static bool _MONTH_MARCHReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_MAY"/>
+        /// </summary>
+        public static int MONTH_MAY { get { if (!_MONTH_MAYReady) { _MONTH_MAYContent = SGetField<int>(LocalBridgeClazz, "MONTH_MAY"); _MONTH_MAYReady = true; } return _MONTH_MAYContent; } }
+        private static int _MONTH_MAYContent = default;
+        private static bool _MONTH_MAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_NOVEMBER"/>
+        /// </summary>
+        public static int MONTH_NOVEMBER { get { if (!_MONTH_NOVEMBERReady) { _MONTH_NOVEMBERContent = SGetField<int>(LocalBridgeClazz, "MONTH_NOVEMBER"); _MONTH_NOVEMBERReady = true; } return _MONTH_NOVEMBERContent; } }
+        private static int _MONTH_NOVEMBERContent = default;
+        private static bool _MONTH_NOVEMBERReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_OCTOBER"/>
+        /// </summary>
+        public static int MONTH_OCTOBER { get { if (!_MONTH_OCTOBERReady) { _MONTH_OCTOBERContent = SGetField<int>(LocalBridgeClazz, "MONTH_OCTOBER"); _MONTH_OCTOBERReady = true; } return _MONTH_OCTOBERContent; } }
+        private static int _MONTH_OCTOBERContent = default;
+        private static bool _MONTH_OCTOBERReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MONTH_SEPTEMBER"/>
+        /// </summary>
+        public static int MONTH_SEPTEMBER { get { if (!_MONTH_SEPTEMBERReady) { _MONTH_SEPTEMBERContent = SGetField<int>(LocalBridgeClazz, "MONTH_SEPTEMBER"); _MONTH_SEPTEMBERReady = true; } return _MONTH_SEPTEMBERContent; } }
+        private static int _MONTH_SEPTEMBERContent = default;
+        private static bool _MONTH_SEPTEMBERReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#WEEKDAY_FRIDAY"/>
+        /// </summary>
+        public static int WEEKDAY_FRIDAY { get { if (!_WEEKDAY_FRIDAYReady) { _WEEKDAY_FRIDAYContent = SGetField<int>(LocalBridgeClazz, "WEEKDAY_FRIDAY"); _WEEKDAY_FRIDAYReady = true; } return _WEEKDAY_FRIDAYContent; } }
+        private static int _WEEKDAY_FRIDAYContent = default;
+        private static bool _WEEKDAY_FRIDAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#WEEKDAY_MONDAY"/>
+        /// </summary>
+        public static int WEEKDAY_MONDAY { get { if (!_WEEKDAY_MONDAYReady) { _WEEKDAY_MONDAYContent = SGetField<int>(LocalBridgeClazz, "WEEKDAY_MONDAY"); _WEEKDAY_MONDAYReady = true; } return _WEEKDAY_MONDAYContent; } }
+        private static int _WEEKDAY_MONDAYContent = default;
+        private static bool _WEEKDAY_MONDAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#WEEKDAY_SATURDAY"/>
+        /// </summary>
+        public static int WEEKDAY_SATURDAY { get { if (!_WEEKDAY_SATURDAYReady) { _WEEKDAY_SATURDAYContent = SGetField<int>(LocalBridgeClazz, "WEEKDAY_SATURDAY"); _WEEKDAY_SATURDAYReady = true; } return _WEEKDAY_SATURDAYContent; } }
+        private static int _WEEKDAY_SATURDAYContent = default;
+        private static bool _WEEKDAY_SATURDAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#WEEKDAY_SUNDAY"/>
+        /// </summary>
+        public static int WEEKDAY_SUNDAY { get { if (!_WEEKDAY_SUNDAYReady) { _WEEKDAY_SUNDAYContent = SGetField<int>(LocalBridgeClazz, "WEEKDAY_SUNDAY"); _WEEKDAY_SUNDAYReady = true; } return _WEEKDAY_SUNDAYContent; } }
+        private static int _WEEKDAY_SUNDAYContent = default;
+        private static bool _WEEKDAY_SUNDAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#WEEKDAY_THURSDAY"/>
+        /// </summary>
+        public static int WEEKDAY_THURSDAY { get { if (!_WEEKDAY_THURSDAYReady) { _WEEKDAY_THURSDAYContent = SGetField<int>(LocalBridgeClazz, "WEEKDAY_THURSDAY"); _WEEKDAY_THURSDAYReady = true; } return _WEEKDAY_THURSDAYContent; } }
+        private static int _WEEKDAY_THURSDAYContent = default;
+        private static bool _WEEKDAY_THURSDAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#WEEKDAY_TUESDAY"/>
+        /// </summary>
+        public static int WEEKDAY_TUESDAY { get { if (!_WEEKDAY_TUESDAYReady) { _WEEKDAY_TUESDAYContent = SGetField<int>(LocalBridgeClazz, "WEEKDAY_TUESDAY"); _WEEKDAY_TUESDAYReady = true; } return _WEEKDAY_TUESDAYContent; } }
+        private static int _WEEKDAY_TUESDAYContent = default;
+        private static bool _WEEKDAY_TUESDAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#WEEKDAY_WEDNESDAY"/>
+        /// </summary>
+        public static int WEEKDAY_WEDNESDAY { get { if (!_WEEKDAY_WEDNESDAYReady) { _WEEKDAY_WEDNESDAYContent = SGetField<int>(LocalBridgeClazz, "WEEKDAY_WEDNESDAY"); _WEEKDAY_WEDNESDAYReady = true; } return _WEEKDAY_WEDNESDAYContent; } }
+        private static int _WEEKDAY_WEDNESDAYContent = default;
+        private static bool _WEEKDAY_WEDNESDAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ANIMACY_ANIMATE"/>
+        /// </summary>
+        public static Java.Lang.String ANIMACY_ANIMATE { get { if (!_ANIMACY_ANIMATEReady) { _ANIMACY_ANIMATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ANIMACY_ANIMATE"); _ANIMACY_ANIMATEReady = true; } return _ANIMACY_ANIMATEContent; } }
+        private static Java.Lang.String _ANIMACY_ANIMATEContent = default;
+        private static bool _ANIMACY_ANIMATEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ANIMACY_INANIMATE"/>
+        /// </summary>
+        public static Java.Lang.String ANIMACY_INANIMATE { get { if (!_ANIMACY_INANIMATEReady) { _ANIMACY_INANIMATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ANIMACY_INANIMATE"); _ANIMACY_INANIMATEReady = true; } return _ANIMACY_INANIMATEContent; } }
+        private static Java.Lang.String _ANIMACY_INANIMATEContent = default;
+        private static bool _ANIMACY_INANIMATEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_ANIMACY"/>
+        /// </summary>
+        public static Java.Lang.String ARG_ANIMACY { get { if (!_ARG_ANIMACYReady) { _ARG_ANIMACYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_ANIMACY"); _ARG_ANIMACYReady = true; } return _ARG_ANIMACYContent; } }
+        private static Java.Lang.String _ARG_ANIMACYContent = default;
+        private static bool _ARG_ANIMACYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_CASE"/>
+        /// </summary>
+        public static Java.Lang.String ARG_CASE { get { if (!_ARG_CASEReady) { _ARG_CASEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_CASE"); _ARG_CASEReady = true; } return _ARG_CASEContent; } }
+        private static Java.Lang.String _ARG_CASEContent = default;
+        private static bool _ARG_CASEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_COUNTRY_CODE"/>
+        /// </summary>
+        public static Java.Lang.String ARG_COUNTRY_CODE { get { if (!_ARG_COUNTRY_CODEReady) { _ARG_COUNTRY_CODEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_COUNTRY_CODE"); _ARG_COUNTRY_CODEReady = true; } return _ARG_COUNTRY_CODEContent; } }
+        private static Java.Lang.String _ARG_COUNTRY_CODEContent = default;
+        private static bool _ARG_COUNTRY_CODEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_CURRENCY"/>
+        /// </summary>
+        public static Java.Lang.String ARG_CURRENCY { get { if (!_ARG_CURRENCYReady) { _ARG_CURRENCYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_CURRENCY"); _ARG_CURRENCYReady = true; } return _ARG_CURRENCYContent; } }
+        private static Java.Lang.String _ARG_CURRENCYContent = default;
+        private static bool _ARG_CURRENCYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_DAY"/>
+        /// </summary>
+        public static Java.Lang.String ARG_DAY { get { if (!_ARG_DAYReady) { _ARG_DAYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_DAY"); _ARG_DAYReady = true; } return _ARG_DAYContent; } }
+        private static Java.Lang.String _ARG_DAYContent = default;
+        private static bool _ARG_DAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_DENOMINATOR"/>
+        /// </summary>
+        public static Java.Lang.String ARG_DENOMINATOR { get { if (!_ARG_DENOMINATORReady) { _ARG_DENOMINATORContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_DENOMINATOR"); _ARG_DENOMINATORReady = true; } return _ARG_DENOMINATORContent; } }
+        private static Java.Lang.String _ARG_DENOMINATORContent = default;
+        private static bool _ARG_DENOMINATORReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_DIGITS"/>
+        /// </summary>
+        public static Java.Lang.String ARG_DIGITS { get { if (!_ARG_DIGITSReady) { _ARG_DIGITSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_DIGITS"); _ARG_DIGITSReady = true; } return _ARG_DIGITSContent; } }
+        private static Java.Lang.String _ARG_DIGITSContent = default;
+        private static bool _ARG_DIGITSReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_DOMAIN"/>
+        /// </summary>
+        public static Java.Lang.String ARG_DOMAIN { get { if (!_ARG_DOMAINReady) { _ARG_DOMAINContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_DOMAIN"); _ARG_DOMAINReady = true; } return _ARG_DOMAINContent; } }
+        private static Java.Lang.String _ARG_DOMAINContent = default;
+        private static bool _ARG_DOMAINReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_EXTENSION"/>
+        /// </summary>
+        public static Java.Lang.String ARG_EXTENSION { get { if (!_ARG_EXTENSIONReady) { _ARG_EXTENSIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_EXTENSION"); _ARG_EXTENSIONReady = true; } return _ARG_EXTENSIONContent; } }
+        private static Java.Lang.String _ARG_EXTENSIONContent = default;
+        private static bool _ARG_EXTENSIONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_FRACTIONAL_PART"/>
+        /// </summary>
+        public static Java.Lang.String ARG_FRACTIONAL_PART { get { if (!_ARG_FRACTIONAL_PARTReady) { _ARG_FRACTIONAL_PARTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_FRACTIONAL_PART"); _ARG_FRACTIONAL_PARTReady = true; } return _ARG_FRACTIONAL_PARTContent; } }
+        private static Java.Lang.String _ARG_FRACTIONAL_PARTContent = default;
+        private static bool _ARG_FRACTIONAL_PARTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_FRAGMENT_ID"/>
+        /// </summary>
+        public static Java.Lang.String ARG_FRAGMENT_ID { get { if (!_ARG_FRAGMENT_IDReady) { _ARG_FRAGMENT_IDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_FRAGMENT_ID"); _ARG_FRAGMENT_IDReady = true; } return _ARG_FRAGMENT_IDContent; } }
+        private static Java.Lang.String _ARG_FRAGMENT_IDContent = default;
+        private static bool _ARG_FRAGMENT_IDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_GENDER"/>
+        /// </summary>
+        public static Java.Lang.String ARG_GENDER { get { if (!_ARG_GENDERReady) { _ARG_GENDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_GENDER"); _ARG_GENDERReady = true; } return _ARG_GENDERContent; } }
+        private static Java.Lang.String _ARG_GENDERContent = default;
+        private static bool _ARG_GENDERReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_HOURS"/>
+        /// </summary>
+        public static Java.Lang.String ARG_HOURS { get { if (!_ARG_HOURSReady) { _ARG_HOURSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_HOURS"); _ARG_HOURSReady = true; } return _ARG_HOURSContent; } }
+        private static Java.Lang.String _ARG_HOURSContent = default;
+        private static bool _ARG_HOURSReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_INTEGER_PART"/>
+        /// </summary>
+        public static Java.Lang.String ARG_INTEGER_PART { get { if (!_ARG_INTEGER_PARTReady) { _ARG_INTEGER_PARTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_INTEGER_PART"); _ARG_INTEGER_PARTReady = true; } return _ARG_INTEGER_PARTContent; } }
+        private static Java.Lang.String _ARG_INTEGER_PARTContent = default;
+        private static bool _ARG_INTEGER_PARTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_MINUTES"/>
+        /// </summary>
+        public static Java.Lang.String ARG_MINUTES { get { if (!_ARG_MINUTESReady) { _ARG_MINUTESContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_MINUTES"); _ARG_MINUTESReady = true; } return _ARG_MINUTESContent; } }
+        private static Java.Lang.String _ARG_MINUTESContent = default;
+        private static bool _ARG_MINUTESReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_MONTH"/>
+        /// </summary>
+        public static Java.Lang.String ARG_MONTH { get { if (!_ARG_MONTHReady) { _ARG_MONTHContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_MONTH"); _ARG_MONTHReady = true; } return _ARG_MONTHContent; } }
+        private static Java.Lang.String _ARG_MONTHContent = default;
+        private static bool _ARG_MONTHReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_MULTIPLICITY"/>
+        /// </summary>
+        public static Java.Lang.String ARG_MULTIPLICITY { get { if (!_ARG_MULTIPLICITYReady) { _ARG_MULTIPLICITYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_MULTIPLICITY"); _ARG_MULTIPLICITYReady = true; } return _ARG_MULTIPLICITYContent; } }
+        private static Java.Lang.String _ARG_MULTIPLICITYContent = default;
+        private static bool _ARG_MULTIPLICITYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_NUMBER"/>
+        /// </summary>
+        public static Java.Lang.String ARG_NUMBER { get { if (!_ARG_NUMBERReady) { _ARG_NUMBERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_NUMBER"); _ARG_NUMBERReady = true; } return _ARG_NUMBERContent; } }
+        private static Java.Lang.String _ARG_NUMBERContent = default;
+        private static bool _ARG_NUMBERReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_NUMBER_PARTS"/>
+        /// </summary>
+        public static Java.Lang.String ARG_NUMBER_PARTS { get { if (!_ARG_NUMBER_PARTSReady) { _ARG_NUMBER_PARTSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_NUMBER_PARTS"); _ARG_NUMBER_PARTSReady = true; } return _ARG_NUMBER_PARTSContent; } }
+        private static Java.Lang.String _ARG_NUMBER_PARTSContent = default;
+        private static bool _ARG_NUMBER_PARTSReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_NUMERATOR"/>
+        /// </summary>
+        public static Java.Lang.String ARG_NUMERATOR { get { if (!_ARG_NUMERATORReady) { _ARG_NUMERATORContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_NUMERATOR"); _ARG_NUMERATORReady = true; } return _ARG_NUMERATORContent; } }
+        private static Java.Lang.String _ARG_NUMERATORContent = default;
+        private static bool _ARG_NUMERATORReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_PASSWORD"/>
+        /// </summary>
+        public static Java.Lang.String ARG_PASSWORD { get { if (!_ARG_PASSWORDReady) { _ARG_PASSWORDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_PASSWORD"); _ARG_PASSWORDReady = true; } return _ARG_PASSWORDContent; } }
+        private static Java.Lang.String _ARG_PASSWORDContent = default;
+        private static bool _ARG_PASSWORDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_PATH"/>
+        /// </summary>
+        public static Java.Lang.String ARG_PATH { get { if (!_ARG_PATHReady) { _ARG_PATHContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_PATH"); _ARG_PATHReady = true; } return _ARG_PATHContent; } }
+        private static Java.Lang.String _ARG_PATHContent = default;
+        private static bool _ARG_PATHReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_PORT"/>
+        /// </summary>
+        public static Java.Lang.String ARG_PORT { get { if (!_ARG_PORTReady) { _ARG_PORTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_PORT"); _ARG_PORTReady = true; } return _ARG_PORTContent; } }
+        private static Java.Lang.String _ARG_PORTContent = default;
+        private static bool _ARG_PORTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_PROTOCOL"/>
+        /// </summary>
+        public static Java.Lang.String ARG_PROTOCOL { get { if (!_ARG_PROTOCOLReady) { _ARG_PROTOCOLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_PROTOCOL"); _ARG_PROTOCOLReady = true; } return _ARG_PROTOCOLContent; } }
+        private static Java.Lang.String _ARG_PROTOCOLContent = default;
+        private static bool _ARG_PROTOCOLReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_QUANTITY"/>
+        /// </summary>
+        public static Java.Lang.String ARG_QUANTITY { get { if (!_ARG_QUANTITYReady) { _ARG_QUANTITYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_QUANTITY"); _ARG_QUANTITYReady = true; } return _ARG_QUANTITYContent; } }
+        private static Java.Lang.String _ARG_QUANTITYContent = default;
+        private static bool _ARG_QUANTITYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_QUERY_STRING"/>
+        /// </summary>
+        public static Java.Lang.String ARG_QUERY_STRING { get { if (!_ARG_QUERY_STRINGReady) { _ARG_QUERY_STRINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_QUERY_STRING"); _ARG_QUERY_STRINGReady = true; } return _ARG_QUERY_STRINGContent; } }
+        private static Java.Lang.String _ARG_QUERY_STRINGContent = default;
+        private static bool _ARG_QUERY_STRINGReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_TEXT"/>
+        /// </summary>
+        public static Java.Lang.String ARG_TEXT { get { if (!_ARG_TEXTReady) { _ARG_TEXTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_TEXT"); _ARG_TEXTReady = true; } return _ARG_TEXTContent; } }
+        private static Java.Lang.String _ARG_TEXTContent = default;
+        private static bool _ARG_TEXTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_UNIT"/>
+        /// </summary>
+        public static Java.Lang.String ARG_UNIT { get { if (!_ARG_UNITReady) { _ARG_UNITContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_UNIT"); _ARG_UNITReady = true; } return _ARG_UNITContent; } }
+        private static Java.Lang.String _ARG_UNITContent = default;
+        private static bool _ARG_UNITReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_USERNAME"/>
+        /// </summary>
+        public static Java.Lang.String ARG_USERNAME { get { if (!_ARG_USERNAMEReady) { _ARG_USERNAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_USERNAME"); _ARG_USERNAMEReady = true; } return _ARG_USERNAMEContent; } }
+        private static Java.Lang.String _ARG_USERNAMEContent = default;
+        private static bool _ARG_USERNAMEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_VERBATIM"/>
+        /// </summary>
+        public static Java.Lang.String ARG_VERBATIM { get { if (!_ARG_VERBATIMReady) { _ARG_VERBATIMContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_VERBATIM"); _ARG_VERBATIMReady = true; } return _ARG_VERBATIMContent; } }
+        private static Java.Lang.String _ARG_VERBATIMContent = default;
+        private static bool _ARG_VERBATIMReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_WEEKDAY"/>
+        /// </summary>
+        public static Java.Lang.String ARG_WEEKDAY { get { if (!_ARG_WEEKDAYReady) { _ARG_WEEKDAYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_WEEKDAY"); _ARG_WEEKDAYReady = true; } return _ARG_WEEKDAYContent; } }
+        private static Java.Lang.String _ARG_WEEKDAYContent = default;
+        private static bool _ARG_WEEKDAYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#ARG_YEAR"/>
+        /// </summary>
+        public static Java.Lang.String ARG_YEAR { get { if (!_ARG_YEARReady) { _ARG_YEARContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ARG_YEAR"); _ARG_YEARReady = true; } return _ARG_YEARContent; } }
+        private static Java.Lang.String _ARG_YEARContent = default;
+        private static bool _ARG_YEARReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#CASE_ABLATIVE"/>
+        /// </summary>
+        public static Java.Lang.String CASE_ABLATIVE { get { if (!_CASE_ABLATIVEReady) { _CASE_ABLATIVEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CASE_ABLATIVE"); _CASE_ABLATIVEReady = true; } return _CASE_ABLATIVEContent; } }
+        private static Java.Lang.String _CASE_ABLATIVEContent = default;
+        private static bool _CASE_ABLATIVEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#CASE_ACCUSATIVE"/>
+        /// </summary>
+        public static Java.Lang.String CASE_ACCUSATIVE { get { if (!_CASE_ACCUSATIVEReady) { _CASE_ACCUSATIVEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CASE_ACCUSATIVE"); _CASE_ACCUSATIVEReady = true; } return _CASE_ACCUSATIVEContent; } }
+        private static Java.Lang.String _CASE_ACCUSATIVEContent = default;
+        private static bool _CASE_ACCUSATIVEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#CASE_DATIVE"/>
+        /// </summary>
+        public static Java.Lang.String CASE_DATIVE { get { if (!_CASE_DATIVEReady) { _CASE_DATIVEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CASE_DATIVE"); _CASE_DATIVEReady = true; } return _CASE_DATIVEContent; } }
+        private static Java.Lang.String _CASE_DATIVEContent = default;
+        private static bool _CASE_DATIVEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#CASE_GENITIVE"/>
+        /// </summary>
+        public static Java.Lang.String CASE_GENITIVE { get { if (!_CASE_GENITIVEReady) { _CASE_GENITIVEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CASE_GENITIVE"); _CASE_GENITIVEReady = true; } return _CASE_GENITIVEContent; } }
+        private static Java.Lang.String _CASE_GENITIVEContent = default;
+        private static bool _CASE_GENITIVEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#CASE_INSTRUMENTAL"/>
+        /// </summary>
+        public static Java.Lang.String CASE_INSTRUMENTAL { get { if (!_CASE_INSTRUMENTALReady) { _CASE_INSTRUMENTALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CASE_INSTRUMENTAL"); _CASE_INSTRUMENTALReady = true; } return _CASE_INSTRUMENTALContent; } }
+        private static Java.Lang.String _CASE_INSTRUMENTALContent = default;
+        private static bool _CASE_INSTRUMENTALReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#CASE_LOCATIVE"/>
+        /// </summary>
+        public static Java.Lang.String CASE_LOCATIVE { get { if (!_CASE_LOCATIVEReady) { _CASE_LOCATIVEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CASE_LOCATIVE"); _CASE_LOCATIVEReady = true; } return _CASE_LOCATIVEContent; } }
+        private static Java.Lang.String _CASE_LOCATIVEContent = default;
+        private static bool _CASE_LOCATIVEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#CASE_NOMINATIVE"/>
+        /// </summary>
+        public static Java.Lang.String CASE_NOMINATIVE { get { if (!_CASE_NOMINATIVEReady) { _CASE_NOMINATIVEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CASE_NOMINATIVE"); _CASE_NOMINATIVEReady = true; } return _CASE_NOMINATIVEContent; } }
+        private static Java.Lang.String _CASE_NOMINATIVEContent = default;
+        private static bool _CASE_NOMINATIVEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#CASE_VOCATIVE"/>
+        /// </summary>
+        public static Java.Lang.String CASE_VOCATIVE { get { if (!_CASE_VOCATIVEReady) { _CASE_VOCATIVEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CASE_VOCATIVE"); _CASE_VOCATIVEReady = true; } return _CASE_VOCATIVEContent; } }
+        private static Java.Lang.String _CASE_VOCATIVEContent = default;
+        private static bool _CASE_VOCATIVEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#GENDER_FEMALE"/>
+        /// </summary>
+        public static Java.Lang.String GENDER_FEMALE { get { if (!_GENDER_FEMALEReady) { _GENDER_FEMALEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GENDER_FEMALE"); _GENDER_FEMALEReady = true; } return _GENDER_FEMALEContent; } }
+        private static Java.Lang.String _GENDER_FEMALEContent = default;
+        private static bool _GENDER_FEMALEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#GENDER_MALE"/>
+        /// </summary>
+        public static Java.Lang.String GENDER_MALE { get { if (!_GENDER_MALEReady) { _GENDER_MALEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GENDER_MALE"); _GENDER_MALEReady = true; } return _GENDER_MALEContent; } }
+        private static Java.Lang.String _GENDER_MALEContent = default;
+        private static bool _GENDER_MALEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#GENDER_NEUTRAL"/>
+        /// </summary>
+        public static Java.Lang.String GENDER_NEUTRAL { get { if (!_GENDER_NEUTRALReady) { _GENDER_NEUTRALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GENDER_NEUTRAL"); _GENDER_NEUTRALReady = true; } return _GENDER_NEUTRALContent; } }
+        private static Java.Lang.String _GENDER_NEUTRALContent = default;
+        private static bool _GENDER_NEUTRALReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MULTIPLICITY_DUAL"/>
+        /// </summary>
+        public static Java.Lang.String MULTIPLICITY_DUAL { get { if (!_MULTIPLICITY_DUALReady) { _MULTIPLICITY_DUALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MULTIPLICITY_DUAL"); _MULTIPLICITY_DUALReady = true; } return _MULTIPLICITY_DUALContent; } }
+        private static Java.Lang.String _MULTIPLICITY_DUALContent = default;
+        private static bool _MULTIPLICITY_DUALReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MULTIPLICITY_PLURAL"/>
+        /// </summary>
+        public static Java.Lang.String MULTIPLICITY_PLURAL { get { if (!_MULTIPLICITY_PLURALReady) { _MULTIPLICITY_PLURALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MULTIPLICITY_PLURAL"); _MULTIPLICITY_PLURALReady = true; } return _MULTIPLICITY_PLURALContent; } }
+        private static Java.Lang.String _MULTIPLICITY_PLURALContent = default;
+        private static bool _MULTIPLICITY_PLURALReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#MULTIPLICITY_SINGLE"/>
+        /// </summary>
+        public static Java.Lang.String MULTIPLICITY_SINGLE { get { if (!_MULTIPLICITY_SINGLEReady) { _MULTIPLICITY_SINGLEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MULTIPLICITY_SINGLE"); _MULTIPLICITY_SINGLEReady = true; } return _MULTIPLICITY_SINGLEContent; } }
+        private static Java.Lang.String _MULTIPLICITY_SINGLEContent = default;
+        private static bool _MULTIPLICITY_SINGLEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_CARDINAL"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_CARDINAL { get { if (!_TYPE_CARDINALReady) { _TYPE_CARDINALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_CARDINAL"); _TYPE_CARDINALReady = true; } return _TYPE_CARDINALContent; } }
+        private static Java.Lang.String _TYPE_CARDINALContent = default;
+        private static bool _TYPE_CARDINALReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_DATE"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_DATE { get { if (!_TYPE_DATEReady) { _TYPE_DATEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_DATE"); _TYPE_DATEReady = true; } return _TYPE_DATEContent; } }
+        private static Java.Lang.String _TYPE_DATEContent = default;
+        private static bool _TYPE_DATEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_DECIMAL"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_DECIMAL { get { if (!_TYPE_DECIMALReady) { _TYPE_DECIMALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_DECIMAL"); _TYPE_DECIMALReady = true; } return _TYPE_DECIMALContent; } }
+        private static Java.Lang.String _TYPE_DECIMALContent = default;
+        private static bool _TYPE_DECIMALReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_DIGITS"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_DIGITS { get { if (!_TYPE_DIGITSReady) { _TYPE_DIGITSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_DIGITS"); _TYPE_DIGITSReady = true; } return _TYPE_DIGITSContent; } }
+        private static Java.Lang.String _TYPE_DIGITSContent = default;
+        private static bool _TYPE_DIGITSReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_ELECTRONIC"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_ELECTRONIC { get { if (!_TYPE_ELECTRONICReady) { _TYPE_ELECTRONICContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_ELECTRONIC"); _TYPE_ELECTRONICReady = true; } return _TYPE_ELECTRONICContent; } }
+        private static Java.Lang.String _TYPE_ELECTRONICContent = default;
+        private static bool _TYPE_ELECTRONICReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_FRACTION"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_FRACTION { get { if (!_TYPE_FRACTIONReady) { _TYPE_FRACTIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_FRACTION"); _TYPE_FRACTIONReady = true; } return _TYPE_FRACTIONContent; } }
+        private static Java.Lang.String _TYPE_FRACTIONContent = default;
+        private static bool _TYPE_FRACTIONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_MEASURE"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_MEASURE { get { if (!_TYPE_MEASUREReady) { _TYPE_MEASUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_MEASURE"); _TYPE_MEASUREReady = true; } return _TYPE_MEASUREContent; } }
+        private static Java.Lang.String _TYPE_MEASUREContent = default;
+        private static bool _TYPE_MEASUREReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_MONEY"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_MONEY { get { if (!_TYPE_MONEYReady) { _TYPE_MONEYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_MONEY"); _TYPE_MONEYReady = true; } return _TYPE_MONEYContent; } }
+        private static Java.Lang.String _TYPE_MONEYContent = default;
+        private static bool _TYPE_MONEYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_ORDINAL"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_ORDINAL { get { if (!_TYPE_ORDINALReady) { _TYPE_ORDINALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_ORDINAL"); _TYPE_ORDINALReady = true; } return _TYPE_ORDINALContent; } }
+        private static Java.Lang.String _TYPE_ORDINALContent = default;
+        private static bool _TYPE_ORDINALReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_TELEPHONE"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_TELEPHONE { get { if (!_TYPE_TELEPHONEReady) { _TYPE_TELEPHONEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_TELEPHONE"); _TYPE_TELEPHONEReady = true; } return _TYPE_TELEPHONEContent; } }
+        private static Java.Lang.String _TYPE_TELEPHONEContent = default;
+        private static bool _TYPE_TELEPHONEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_TEXT"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_TEXT { get { if (!_TYPE_TEXTReady) { _TYPE_TEXTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_TEXT"); _TYPE_TEXTReady = true; } return _TYPE_TEXTContent; } }
+        private static Java.Lang.String _TYPE_TEXTContent = default;
+        private static bool _TYPE_TEXTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_TIME"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_TIME { get { if (!_TYPE_TIMEReady) { _TYPE_TIMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_TIME"); _TYPE_TIMEReady = true; } return _TYPE_TIMEContent; } }
+        private static Java.Lang.String _TYPE_TIMEContent = default;
+        private static bool _TYPE_TIMEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#TYPE_VERBATIM"/>
+        /// </summary>
+        public static Java.Lang.String TYPE_VERBATIM { get { if (!_TYPE_VERBATIMReady) { _TYPE_VERBATIMContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TYPE_VERBATIM"); _TYPE_VERBATIMReady = true; } return _TYPE_VERBATIMContent; } }
+        private static Java.Lang.String _TYPE_VERBATIMContent = default;
+        private static bool _TYPE_VERBATIMReady = false; // this is used because in case of generics 
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#getArgs()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetArgs()
+        {
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getArgs", "()Landroid/os/PersistableBundle;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#describeContents()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
+        {
+            return IExecuteWithSignature<int>("describeContents", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#getSpanTypeId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
+        {
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.html#writeToParcel(android.os.Parcel,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
+        {
+            IExecute("writeToParcel", arg0, arg1);
+        }
+
+        #endregion
+
+        #region Nested classes
+        #region Builder
+        public partial class Builder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public Builder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#build()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Text.Style.TtsSpan"/></returns>
+            public Android.Text.Style.TtsSpan Build()
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan>("build", "()Landroid/text/style/TtsSpan;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#setIntArgument(java.lang.String,int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.Builder"/></returns>
+            public Android.Text.Style.TtsSpan.Builder SetIntArgument(Java.Lang.String arg0, int arg1)
+            {
+                return IExecute<Android.Text.Style.TtsSpan.Builder>("setIntArgument", arg0, arg1);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#setLongArgument(java.lang.String,long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <param name="arg1"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.Builder"/></returns>
+            public Android.Text.Style.TtsSpan.Builder SetLongArgument(Java.Lang.String arg0, long arg1)
+            {
+                return IExecute<Android.Text.Style.TtsSpan.Builder>("setLongArgument", arg0, arg1);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#setStringArgument(java.lang.String,java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.Builder"/></returns>
+            public Android.Text.Style.TtsSpan.Builder SetStringArgument(Java.Lang.String arg0, Java.Lang.String arg1)
+            {
+                return IExecute<Android.Text.Style.TtsSpan.Builder>("setStringArgument", arg0, arg1);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region Builder<C>
+        public partial class Builder<C>
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public Builder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+            /// <summary>
+            /// Converter from <see cref="Android.Text.Style.TtsSpan.Builder{C}"/> to <see cref="Android.Text.Style.TtsSpan.Builder"/>
+            /// </summary>
+            public static implicit operator Android.Text.Style.TtsSpan.Builder(Android.Text.Style.TtsSpan.Builder<C> t) => t.Cast<Android.Text.Style.TtsSpan.Builder>();
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#build()"/>
+            /// </summary>
+            /// <returns><see cref="Android.Text.Style.TtsSpan"/></returns>
+            public Android.Text.Style.TtsSpan Build()
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan>("build", "()Landroid/text/style/TtsSpan;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#setIntArgument(java.lang.String,int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            /// <returns><typeparamref name="C"/></returns>
+            public C SetIntArgument(Java.Lang.String arg0, int arg1)
+            {
+                return IExecute<C>("setIntArgument", arg0, arg1);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#setLongArgument(java.lang.String,long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <param name="arg1"><see cref="long"/></param>
+            /// <returns><typeparamref name="C"/></returns>
+            public C SetLongArgument(Java.Lang.String arg0, long arg1)
+            {
+                return IExecute<C>("setLongArgument", arg0, arg1);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.Builder.html#setStringArgument(java.lang.String,java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+            /// <returns><typeparamref name="C"/></returns>
+            public C SetStringArgument(Java.Lang.String arg0, Java.Lang.String arg1)
+            {
+                return IExecute<C>("setStringArgument", arg0, arg1);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region CardinalBuilder
+        public partial class CardinalBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.CardinalBuilder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public CardinalBuilder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.CardinalBuilder.html#%3Cinit%3E(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            public CardinalBuilder(long arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.CardinalBuilder.html#setNumber(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.CardinalBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.CardinalBuilder SetNumber(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.CardinalBuilder>("setNumber", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$CardinalBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.CardinalBuilder.html#setNumber(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.CardinalBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.CardinalBuilder SetNumber(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.CardinalBuilder>("setNumber", "(J)Landroid/text/style/TtsSpan$CardinalBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region DateBuilder
+        public partial class DateBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DateBuilder.html#%3Cinit%3E(java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.Integer)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.Integer"/></param>
+            /// <param name="arg1"><see cref="Java.Lang.Integer"/></param>
+            /// <param name="arg2"><see cref="Java.Lang.Integer"/></param>
+            /// <param name="arg3"><see cref="Java.Lang.Integer"/></param>
+            public DateBuilder(Java.Lang.Integer arg0, Java.Lang.Integer arg1, Java.Lang.Integer arg2, Java.Lang.Integer arg3)
+                : base(arg0, arg1, arg2, arg3)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DateBuilder.html#setDay(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DateBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DateBuilder SetDay(int arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.DateBuilder>("setDay", "(I)Landroid/text/style/TtsSpan$DateBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DateBuilder.html#setMonth(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DateBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DateBuilder SetMonth(int arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.DateBuilder>("setMonth", "(I)Landroid/text/style/TtsSpan$DateBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DateBuilder.html#setWeekday(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DateBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DateBuilder SetWeekday(int arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.DateBuilder>("setWeekday", "(I)Landroid/text/style/TtsSpan$DateBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DateBuilder.html#setYear(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DateBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DateBuilder SetYear(int arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.DateBuilder>("setYear", "(I)Landroid/text/style/TtsSpan$DateBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region DecimalBuilder
+        public partial class DecimalBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DecimalBuilder.html#%3Cinit%3E(double,int,int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="double"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            /// <param name="arg2"><see cref="int"/></param>
+            public DecimalBuilder(double arg0, int arg1, int arg2)
+                : base(arg0, arg1, arg2)
+            {
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DecimalBuilder.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+            public DecimalBuilder(Java.Lang.String arg0, Java.Lang.String arg1)
+                : base(arg0, arg1)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DecimalBuilder.html#setArgumentsFromDouble(double,int,int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="double"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            /// <param name="arg2"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DecimalBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DecimalBuilder SetArgumentsFromDouble(double arg0, int arg1, int arg2)
+            {
+                return IExecute<Android.Text.Style.TtsSpan.DecimalBuilder>("setArgumentsFromDouble", arg0, arg1, arg2);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DecimalBuilder.html#setFractionalPart(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DecimalBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DecimalBuilder SetFractionalPart(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.DecimalBuilder>("setFractionalPart", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$DecimalBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DecimalBuilder.html#setIntegerPart(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DecimalBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DecimalBuilder SetIntegerPart(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.DecimalBuilder>("setIntegerPart", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$DecimalBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DecimalBuilder.html#setIntegerPart(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DecimalBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DecimalBuilder SetIntegerPart(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.DecimalBuilder>("setIntegerPart", "(J)Landroid/text/style/TtsSpan$DecimalBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region DigitsBuilder
+        public partial class DigitsBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DigitsBuilder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public DigitsBuilder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.DigitsBuilder.html#setDigits(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.DigitsBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.DigitsBuilder SetDigits(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.DigitsBuilder>("setDigits", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$DigitsBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region ElectronicBuilder
+        public partial class ElectronicBuilder
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setDomain(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetDomain(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.ElectronicBuilder>("setDomain", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$ElectronicBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setEmailArguments(java.lang.String,java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetEmailArguments(Java.Lang.String arg0, Java.Lang.String arg1)
+            {
+                return IExecute<Android.Text.Style.TtsSpan.ElectronicBuilder>("setEmailArguments", arg0, arg1);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setFragmentId(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetFragmentId(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.ElectronicBuilder>("setFragmentId", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$ElectronicBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setPassword(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetPassword(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.ElectronicBuilder>("setPassword", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$ElectronicBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setPath(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetPath(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.ElectronicBuilder>("setPath", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$ElectronicBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setPort(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetPort(int arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.ElectronicBuilder>("setPort", "(I)Landroid/text/style/TtsSpan$ElectronicBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setProtocol(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetProtocol(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.ElectronicBuilder>("setProtocol", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$ElectronicBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setQueryString(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetQueryString(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.ElectronicBuilder>("setQueryString", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$ElectronicBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.ElectronicBuilder.html#setUsername(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.ElectronicBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.ElectronicBuilder SetUsername(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.ElectronicBuilder>("setUsername", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$ElectronicBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region FractionBuilder
+        public partial class FractionBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.FractionBuilder.html#%3Cinit%3E(long,long,long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <param name="arg1"><see cref="long"/></param>
+            /// <param name="arg2"><see cref="long"/></param>
+            public FractionBuilder(long arg0, long arg1, long arg2)
+                : base(arg0, arg1, arg2)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.FractionBuilder.html#setDenominator(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.FractionBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.FractionBuilder SetDenominator(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.FractionBuilder>("setDenominator", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$FractionBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.FractionBuilder.html#setDenominator(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.FractionBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.FractionBuilder SetDenominator(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.FractionBuilder>("setDenominator", "(J)Landroid/text/style/TtsSpan$FractionBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.FractionBuilder.html#setIntegerPart(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.FractionBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.FractionBuilder SetIntegerPart(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.FractionBuilder>("setIntegerPart", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$FractionBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.FractionBuilder.html#setIntegerPart(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.FractionBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.FractionBuilder SetIntegerPart(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.FractionBuilder>("setIntegerPart", "(J)Landroid/text/style/TtsSpan$FractionBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.FractionBuilder.html#setNumerator(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.FractionBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.FractionBuilder SetNumerator(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.FractionBuilder>("setNumerator", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$FractionBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.FractionBuilder.html#setNumerator(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.FractionBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.FractionBuilder SetNumerator(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.FractionBuilder>("setNumerator", "(J)Landroid/text/style/TtsSpan$FractionBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region MeasureBuilder
+        public partial class MeasureBuilder
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setDenominator(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetDenominator(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setDenominator", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setDenominator(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetDenominator(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setDenominator", "(J)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setFractionalPart(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetFractionalPart(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setFractionalPart", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setIntegerPart(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetIntegerPart(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setIntegerPart", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setIntegerPart(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetIntegerPart(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setIntegerPart", "(J)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setNumber(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetNumber(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setNumber", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setNumber(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetNumber(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setNumber", "(J)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setNumerator(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetNumerator(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setNumerator", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setNumerator(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetNumerator(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setNumerator", "(J)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MeasureBuilder.html#setUnit(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MeasureBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MeasureBuilder SetUnit(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MeasureBuilder>("setUnit", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MeasureBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region MoneyBuilder
+        public partial class MoneyBuilder
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MoneyBuilder.html#setCurrency(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MoneyBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MoneyBuilder SetCurrency(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MoneyBuilder>("setCurrency", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MoneyBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MoneyBuilder.html#setFractionalPart(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MoneyBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MoneyBuilder SetFractionalPart(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MoneyBuilder>("setFractionalPart", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MoneyBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MoneyBuilder.html#setIntegerPart(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MoneyBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MoneyBuilder SetIntegerPart(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MoneyBuilder>("setIntegerPart", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MoneyBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MoneyBuilder.html#setIntegerPart(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MoneyBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MoneyBuilder SetIntegerPart(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MoneyBuilder>("setIntegerPart", "(J)Landroid/text/style/TtsSpan$MoneyBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.MoneyBuilder.html#setQuantity(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.MoneyBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.MoneyBuilder SetQuantity(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.MoneyBuilder>("setQuantity", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$MoneyBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region OrdinalBuilder
+        public partial class OrdinalBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.OrdinalBuilder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public OrdinalBuilder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.OrdinalBuilder.html#%3Cinit%3E(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            public OrdinalBuilder(long arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.OrdinalBuilder.html#setNumber(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.OrdinalBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.OrdinalBuilder SetNumber(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.OrdinalBuilder>("setNumber", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$OrdinalBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.OrdinalBuilder.html#setNumber(long)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="long"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.OrdinalBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.OrdinalBuilder SetNumber(long arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.OrdinalBuilder>("setNumber", "(J)Landroid/text/style/TtsSpan$OrdinalBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region SemioticClassBuilder
+        public partial class SemioticClassBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public SemioticClassBuilder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#setAnimacy(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.SemioticClassBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.SemioticClassBuilder SetAnimacy(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.SemioticClassBuilder>("setAnimacy", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$SemioticClassBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#setCase(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.SemioticClassBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.SemioticClassBuilder SetCase(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.SemioticClassBuilder>("setCase", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$SemioticClassBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#setGender(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.SemioticClassBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.SemioticClassBuilder SetGender(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.SemioticClassBuilder>("setGender", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$SemioticClassBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#setMultiplicity(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.SemioticClassBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.SemioticClassBuilder SetMultiplicity(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.SemioticClassBuilder>("setMultiplicity", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$SemioticClassBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region SemioticClassBuilder<C>
+        public partial class SemioticClassBuilder<C>
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public SemioticClassBuilder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+            /// <summary>
+            /// Converter from <see cref="Android.Text.Style.TtsSpan.SemioticClassBuilder{C}"/> to <see cref="Android.Text.Style.TtsSpan.SemioticClassBuilder"/>
+            /// </summary>
+            public static implicit operator Android.Text.Style.TtsSpan.SemioticClassBuilder(Android.Text.Style.TtsSpan.SemioticClassBuilder<C> t) => t.Cast<Android.Text.Style.TtsSpan.SemioticClassBuilder>();
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#setAnimacy(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><typeparamref name="C"/></returns>
+            public C SetAnimacy(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<C>("setAnimacy", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$SemioticClassBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#setCase(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><typeparamref name="C"/></returns>
+            public C SetCase(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<C>("setCase", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$SemioticClassBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#setGender(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><typeparamref name="C"/></returns>
+            public C SetGender(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<C>("setGender", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$SemioticClassBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.SemioticClassBuilder.html#setMultiplicity(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><typeparamref name="C"/></returns>
+            public C SetMultiplicity(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<C>("setMultiplicity", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$SemioticClassBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region TelephoneBuilder
+        public partial class TelephoneBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TelephoneBuilder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public TelephoneBuilder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TelephoneBuilder.html#setCountryCode(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.TelephoneBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.TelephoneBuilder SetCountryCode(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.TelephoneBuilder>("setCountryCode", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$TelephoneBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TelephoneBuilder.html#setExtension(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.TelephoneBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.TelephoneBuilder SetExtension(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.TelephoneBuilder>("setExtension", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$TelephoneBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TelephoneBuilder.html#setNumberParts(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.TelephoneBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.TelephoneBuilder SetNumberParts(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.TelephoneBuilder>("setNumberParts", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$TelephoneBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region TextBuilder
+        public partial class TextBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TextBuilder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public TextBuilder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TextBuilder.html#setText(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.TextBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.TextBuilder SetText(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.TextBuilder>("setText", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$TextBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region TimeBuilder
+        public partial class TimeBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TimeBuilder.html#%3Cinit%3E(int,int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <param name="arg1"><see cref="int"/></param>
+            public TimeBuilder(int arg0, int arg1)
+                : base(arg0, arg1)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TimeBuilder.html#setHours(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.TimeBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.TimeBuilder SetHours(int arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.TimeBuilder>("setHours", "(I)Landroid/text/style/TtsSpan$TimeBuilder;", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.TimeBuilder.html#setMinutes(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.TimeBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.TimeBuilder SetMinutes(int arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.TimeBuilder>("setMinutes", "(I)Landroid/text/style/TtsSpan$TimeBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region VerbatimBuilder
+        public partial class VerbatimBuilder
+        {
+            #region Constructors
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.VerbatimBuilder.html#%3Cinit%3E(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            public VerbatimBuilder(Java.Lang.String arg0)
+                : base(arg0)
+            {
+            }
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/text/style/TtsSpan.VerbatimBuilder.html#setVerbatim(java.lang.String)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Android.Text.Style.TtsSpan.VerbatimBuilder"/></returns>
+            public Android.Text.Style.TtsSpan.VerbatimBuilder SetVerbatim(Java.Lang.String arg0)
+            {
+                return IExecuteWithSignature<Android.Text.Style.TtsSpan.VerbatimBuilder>("setVerbatim", "(Ljava/lang/String;)Landroid/text/style/TtsSpan$VerbatimBuilder;", arg0);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+    
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/TypefaceSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/TypefaceSpan.cs
index dc54fbebe..47ed74f13 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/TypefaceSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/TypefaceSpan.cs
@@ -74,33 +74,36 @@ public TypefaceSpan(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#getFamily()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#getTypeface()"/>
         /// </summary>
-        public Java.Lang.String Family
+        /// <returns><see cref="Android.Graphics.Typeface"/></returns>
+        public Android.Graphics.Typeface GetTypeface()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFamily", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#getTypeface()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#getSpanTypeId()"/>
         /// </summary>
-        public Android.Graphics.Typeface Typeface
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;"); }
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#getFamily()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFamily()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getFamily", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/TypefaceSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/URLSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/URLSpan.cs
index f5d1f0010..76e713b38 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/URLSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/URLSpan.cs
@@ -66,26 +66,28 @@ public URLSpan(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/URLSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/URLSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/URLSpan.html#getURL()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/URLSpan.html#getSpanTypeId()"/>
         /// </summary>
-        public Java.Lang.String URL
+        /// <returns><see cref="int"/></returns>
+        public int GetSpanTypeId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getURL", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/URLSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/URLSpan.html#getURL()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetURL()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getURL", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/URLSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/Style/UnderlineSpan.cs b/src/net/Netdroid/Generated/Android/Text/Style/UnderlineSpan.cs
index 27304cd7e..09805a247 100644
--- a/src/net/Netdroid/Generated/Android/Text/Style/UnderlineSpan.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Style/UnderlineSpan.cs
@@ -62,19 +62,20 @@ public UnderlineSpan(Android.Os.Parcel arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/UnderlineSpan.html#getSpanTypeId()"/> 
+        /// <see href="https://developer.android.com/reference/android/text/style/UnderlineSpan.html#describeContents()"/>
         /// </summary>
-        public int SpanTypeId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSpanTypeId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/style/UnderlineSpan.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/text/style/UnderlineSpan.html#getSpanTypeId()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSpanTypeId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSpanTypeId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/style/UnderlineSpan.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Text/TextUtils.cs b/src/net/Netdroid/Generated/Android/Text/TextUtils.cs
index eeff364d4..9d9be3204 100644
--- a/src/net/Netdroid/Generated/Android/Text/TextUtils.cs
+++ b/src/net/Netdroid/Generated/Android/Text/TextUtils.cs
@@ -116,7 +116,7 @@ public static bool IsEmpty(Java.Lang.CharSequence arg0)
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsGraphic(char arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isGraphic", "(C)Z", arg0);
@@ -300,7 +300,7 @@ public static int LastIndexOf(Java.Lang.CharSequence arg0, char arg1)
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.CharSequence CommaEllipsize(Java.Lang.CharSequence arg0, Android.Text.TextPaint arg1, float arg2, Java.Lang.String arg3, Java.Lang.String arg4)
         {
             return SExecute<Java.Lang.CharSequence>(LocalBridgeClazz, "commaEllipsize", arg0, arg1, arg2, arg3, arg4);
@@ -357,7 +357,7 @@ public static Java.Lang.CharSequence ExpandTemplate(Java.Lang.CharSequence arg0,
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.CharSequence GetReverse(Java.Lang.CharSequence arg0, int arg1, int arg2)
         {
             return SExecute<Java.Lang.CharSequence>(LocalBridgeClazz, "getReverse", arg0, arg1, arg2);
diff --git a/src/net/Netdroid/Generated/Android/Text/Util/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Text/Util/AllPackageClasses.cs
index b575d6087..f011a85c2 100644
--- a/src/net/Netdroid/Generated/Android/Text/Util/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Util/AllPackageClasses.cs
@@ -76,12 +76,12 @@ public partial class MatchFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Match
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("MatchFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("MatchFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public MatchFilter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("MatchFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("MatchFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public MatchFilter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -122,12 +122,12 @@ public partial class TransformFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<T
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TransformFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TransformFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TransformFilter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TransformFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TransformFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TransformFilter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Text/Util/Linkify.cs b/src/net/Netdroid/Generated/Android/Text/Util/Linkify.cs
index d83786333..95d92287b 100644
--- a/src/net/Netdroid/Generated/Android/Text/Util/Linkify.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Util/Linkify.cs
@@ -58,7 +58,7 @@ public partial class Linkify
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/util/Linkify.html#ALL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ALL { get { if (!_ALLReady) { _ALLContent = SGetField<int>(LocalBridgeClazz, "ALL"); _ALLReady = true; } return _ALLContent; } }
         private static int _ALLContent = default;
         private static bool _ALLReady = false; // this is used because in case of generics 
@@ -71,7 +71,7 @@ public partial class Linkify
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/text/util/Linkify.html#MAP_ADDRESSES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MAP_ADDRESSES { get { if (!_MAP_ADDRESSESReady) { _MAP_ADDRESSESContent = SGetField<int>(LocalBridgeClazz, "MAP_ADDRESSES"); _MAP_ADDRESSESReady = true; } return _MAP_ADDRESSESContent; } }
         private static int _MAP_ADDRESSESContent = default;
         private static bool _MAP_ADDRESSESReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Text/Util/Rfc822Token.cs b/src/net/Netdroid/Generated/Android/Text/Util/Rfc822Token.cs
index 5cbed26f9..d874ccc59 100644
--- a/src/net/Netdroid/Generated/Android/Text/Util/Rfc822Token.cs
+++ b/src/net/Netdroid/Generated/Android/Text/Util/Rfc822Token.cs
@@ -83,25 +83,52 @@ public static Java.Lang.String QuoteNameIfNecessary(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#getAddress()"/> <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#setAddress(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#getAddress()"/>
         /// </summary>
-        public Java.Lang.String Address
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAddress()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#getComment()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetComment()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getComment", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAddress", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setAddress", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#getComment()"/> <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#setComment(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#setAddress(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String Comment
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetAddress(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getComment", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setComment", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setAddress", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#getName()"/> <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#setName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#setComment(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetComment(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setComment", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/text/util/Rfc822Token.html#setName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetName(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setName", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setName", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Transition/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Transition/AllPackageClasses.cs
index 515c8811d..c5484bd80 100644
--- a/src/net/Netdroid/Generated/Android/Transition/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/AllPackageClasses.cs
@@ -476,12 +476,12 @@ public partial class PathMotion : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PathMo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PathMotion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PathMotion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PathMotion() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PathMotion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PathMotion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PathMotion(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -698,12 +698,12 @@ public partial class Transition : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Transition class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Transition class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Transition() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Transition class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Transition class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Transition(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -740,12 +740,12 @@ public partial class EpicenterCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("EpicenterCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EpicenterCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EpicenterCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("EpicenterCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EpicenterCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EpicenterCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -787,10 +787,13 @@ public partial class TransitionListener : MASES.JCOBridge.C2JBridge.JVMBridgeLis
             /// </summary>
             public TransitionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.transition.Transition_TransitionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.transition.TransitionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -812,10 +815,13 @@ public partial class TransitionListenerDirect : TransitionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.transition.Transition$TransitionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.transition.Transition$TransitionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -894,10 +900,13 @@ public partial class TransitionListenerAdapter : MASES.JCOBridge.C2JBridge.JVMBr
         /// </summary>
         public TransitionListenerAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.transition.TransitionListenerAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.transition.TransitionListenerAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -919,10 +928,13 @@ public partial class TransitionListenerAdapterDirect : TransitionListenerAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.transition.TransitionListenerAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.transition.TransitionListenerAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -996,12 +1008,12 @@ public partial class TransitionPropagation : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TransitionPropagation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransitionPropagation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransitionPropagation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TransitionPropagation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransitionPropagation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransitionPropagation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1130,12 +1142,12 @@ public partial class Visibility : Android.Transition.Transition
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Visibility class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Visibility class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Visibility() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Visibility class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Visibility class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Visibility(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1176,12 +1188,12 @@ public partial class VisibilityPropagation : Android.Transition.TransitionPropag
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VisibilityPropagation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VisibilityPropagation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VisibilityPropagation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VisibilityPropagation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VisibilityPropagation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VisibilityPropagation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Transition/ArcMotion.cs b/src/net/Netdroid/Generated/Android/Transition/ArcMotion.cs
index 9cf8cfd07..c19980e25 100644
--- a/src/net/Netdroid/Generated/Android/Transition/ArcMotion.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/ArcMotion.cs
@@ -55,25 +55,52 @@ public ArcMotion(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#getMaximumAngle()"/> <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#setMaximumAngle(float)"/>
+        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#getMaximumAngle()"/>
         /// </summary>
-        public float MaximumAngle
+        /// <returns><see cref="float"/></returns>
+        public float GetMaximumAngle()
         {
-            get { return IExecuteWithSignature<float>("getMaximumAngle", "()F"); } set { IExecuteWithSignature("setMaximumAngle", "(F)V", value); }
+            return IExecuteWithSignature<float>("getMaximumAngle", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#getMinimumHorizontalAngle()"/> <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#setMinimumHorizontalAngle(float)"/>
+        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#getMinimumHorizontalAngle()"/>
         /// </summary>
-        public float MinimumHorizontalAngle
+        /// <returns><see cref="float"/></returns>
+        public float GetMinimumHorizontalAngle()
         {
-            get { return IExecuteWithSignature<float>("getMinimumHorizontalAngle", "()F"); } set { IExecuteWithSignature("setMinimumHorizontalAngle", "(F)V", value); }
+            return IExecuteWithSignature<float>("getMinimumHorizontalAngle", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#getMinimumVerticalAngle()"/> <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#setMinimumVerticalAngle(float)"/>
+        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#getMinimumVerticalAngle()"/>
         /// </summary>
-        public float MinimumVerticalAngle
+        /// <returns><see cref="float"/></returns>
+        public float GetMinimumVerticalAngle()
         {
-            get { return IExecuteWithSignature<float>("getMinimumVerticalAngle", "()F"); } set { IExecuteWithSignature("setMinimumVerticalAngle", "(F)V", value); }
+            return IExecuteWithSignature<float>("getMinimumVerticalAngle", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#setMaximumAngle(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetMaximumAngle(float arg0)
+        {
+            IExecuteWithSignature("setMaximumAngle", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#setMinimumHorizontalAngle(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetMinimumHorizontalAngle(float arg0)
+        {
+            IExecuteWithSignature("setMinimumHorizontalAngle", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/ArcMotion.html#setMinimumVerticalAngle(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetMinimumVerticalAngle(float arg0)
+        {
+            IExecuteWithSignature("setMinimumVerticalAngle", "(F)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Transition/ChangeBounds.cs b/src/net/Netdroid/Generated/Android/Transition/ChangeBounds.cs
index fcca09d3d..98ee3a791 100644
--- a/src/net/Netdroid/Generated/Android/Transition/ChangeBounds.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/ChangeBounds.cs
@@ -55,21 +55,30 @@ public ChangeBounds(Android.Content.Context arg0, Android.Util.AttributeSet arg1
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/ChangeBounds.html#getResizeClip()"/> <see href="https://developer.android.com/reference/android/transition/ChangeBounds.html#setResizeClip(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/transition/ChangeBounds.html#getResizeClip()"/>
         /// </summary>
-        public bool ResizeClip
+        /// <returns><see cref="bool"/></returns>
+        public bool GetResizeClip()
         {
-            get { return IExecuteWithSignature<bool>("getResizeClip", "()Z"); } set { IExecuteWithSignature("setResizeClip", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getResizeClip", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/ChangeBounds.html#setReparent(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetReparent(bool arg0)
         {
             IExecuteWithSignature("setReparent", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/ChangeBounds.html#setResizeClip(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetResizeClip(bool arg0)
+        {
+            IExecuteWithSignature("setResizeClip", "(Z)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Transition/ChangeTransform.cs b/src/net/Netdroid/Generated/Android/Transition/ChangeTransform.cs
index b17b074f5..8e1b52b07 100644
--- a/src/net/Netdroid/Generated/Android/Transition/ChangeTransform.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/ChangeTransform.cs
@@ -55,18 +55,36 @@ public ChangeTransform(Android.Content.Context arg0, Android.Util.AttributeSet a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/ChangeTransform.html#getReparent()"/> <see href="https://developer.android.com/reference/android/transition/ChangeTransform.html#setReparent(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/transition/ChangeTransform.html#getReparent()"/>
         /// </summary>
-        public bool Reparent
+        /// <returns><see cref="bool"/></returns>
+        public bool GetReparent()
         {
-            get { return IExecuteWithSignature<bool>("getReparent", "()Z"); } set { IExecuteWithSignature("setReparent", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getReparent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/ChangeTransform.html#getReparentWithOverlay()"/> <see href="https://developer.android.com/reference/android/transition/ChangeTransform.html#setReparentWithOverlay(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/transition/ChangeTransform.html#getReparentWithOverlay()"/>
         /// </summary>
-        public bool ReparentWithOverlay
+        /// <returns><see cref="bool"/></returns>
+        public bool GetReparentWithOverlay()
         {
-            get { return IExecuteWithSignature<bool>("getReparentWithOverlay", "()Z"); } set { IExecuteWithSignature("setReparentWithOverlay", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getReparentWithOverlay", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/ChangeTransform.html#setReparent(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetReparent(bool arg0)
+        {
+            IExecuteWithSignature("setReparent", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/ChangeTransform.html#setReparentWithOverlay(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetReparentWithOverlay(bool arg0)
+        {
+            IExecuteWithSignature("setReparentWithOverlay", "(Z)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Transition/PatternPathMotion.cs b/src/net/Netdroid/Generated/Android/Transition/PatternPathMotion.cs
index 0a6438182..499adc3a8 100644
--- a/src/net/Netdroid/Generated/Android/Transition/PatternPathMotion.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/PatternPathMotion.cs
@@ -63,11 +63,20 @@ public PatternPathMotion(Android.Graphics.Path arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/PatternPathMotion.html#getPatternPath()"/> <see href="https://developer.android.com/reference/android/transition/PatternPathMotion.html#setPatternPath(android.graphics.Path)"/>
+        /// <see href="https://developer.android.com/reference/android/transition/PatternPathMotion.html#getPatternPath()"/>
         /// </summary>
-        public Android.Graphics.Path PatternPath
+        /// <returns><see cref="Android.Graphics.Path"/></returns>
+        public Android.Graphics.Path GetPatternPath()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Path>("getPatternPath", "()Landroid/graphics/Path;"); } set { IExecuteWithSignature("setPatternPath", "(Landroid/graphics/Path;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Path>("getPatternPath", "()Landroid/graphics/Path;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/PatternPathMotion.html#setPatternPath(android.graphics.Path)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Path"/></param>
+        public void SetPatternPath(Android.Graphics.Path arg0)
+        {
+            IExecuteWithSignature("setPatternPath", "(Landroid/graphics/Path;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Transition/Scene.cs b/src/net/Netdroid/Generated/Android/Transition/Scene.cs
index 2328fcf09..2d51e6081 100644
--- a/src/net/Netdroid/Generated/Android/Transition/Scene.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/Scene.cs
@@ -43,7 +43,7 @@ public Scene(Android.View.ViewGroup arg0, Android.View.View arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.ViewGroup"/></param>
         /// <param name="arg1"><see cref="Android.View.ViewGroup"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Scene(Android.View.ViewGroup arg0, Android.View.ViewGroup arg1)
             : base(arg0, arg1)
         {
@@ -93,11 +93,12 @@ public static Android.Transition.Scene GetSceneForLayout(Android.View.ViewGroup
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Scene.html#getSceneRoot()"/> 
+        /// <see href="https://developer.android.com/reference/android/transition/Scene.html#getSceneRoot()"/>
         /// </summary>
-        public Android.View.ViewGroup SceneRoot
+        /// <returns><see cref="Android.View.ViewGroup"/></returns>
+        public Android.View.ViewGroup GetSceneRoot()
         {
-            get { return IExecuteWithSignature<Android.View.ViewGroup>("getSceneRoot", "()Landroid/view/ViewGroup;"); }
+            return IExecuteWithSignature<Android.View.ViewGroup>("getSceneRoot", "()Landroid/view/ViewGroup;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/Scene.html#enter()"/>
diff --git a/src/net/Netdroid/Generated/Android/Transition/Slide.cs b/src/net/Netdroid/Generated/Android/Transition/Slide.cs
index cd4c8c120..7aa735564 100644
--- a/src/net/Netdroid/Generated/Android/Transition/Slide.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/Slide.cs
@@ -63,11 +63,20 @@ public Slide(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Slide.html#getSlideEdge()"/> <see href="https://developer.android.com/reference/android/transition/Slide.html#setSlideEdge(int)"/>
+        /// <see href="https://developer.android.com/reference/android/transition/Slide.html#getSlideEdge()"/>
         /// </summary>
-        public int SlideEdge
+        /// <returns><see cref="int"/></returns>
+        public int GetSlideEdge()
         {
-            get { return IExecuteWithSignature<int>("getSlideEdge", "()I"); } set { IExecuteWithSignature("setSlideEdge", "(I)V", value); }
+            return IExecuteWithSignature<int>("getSlideEdge", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Slide.html#setSlideEdge(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSlideEdge(int arg0)
+        {
+            IExecuteWithSignature("setSlideEdge", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Transition/Transition.cs b/src/net/Netdroid/Generated/Android/Transition/Transition.cs
index d87434973..390599de3 100644
--- a/src/net/Netdroid/Generated/Android/Transition/Transition.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/Transition.cs
@@ -79,97 +79,6 @@ public Transition(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getDuration()"/> 
-        /// </summary>
-        public long Duration
-        {
-            get { return IExecuteWithSignature<long>("getDuration", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getEpicenter()"/> 
-        /// </summary>
-        public Android.Graphics.Rect Epicenter
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getEpicenter", "()Landroid/graphics/Rect;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getEpicenterCallback()"/> 
-        /// </summary>
-        public Android.Transition.Transition.EpicenterCallback GetEpicenterCallback
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition.EpicenterCallback>("getEpicenterCallback", "()Landroid/transition/Transition$EpicenterCallback;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getInterpolator()"/> 
-        /// </summary>
-        public Android.Animation.TimeInterpolator Interpolator
-        {
-            get { return IExecuteWithSignature<Android.Animation.TimeInterpolator>("getInterpolator", "()Landroid/animation/TimeInterpolator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getPathMotion()"/> <see href="https://developer.android.com/reference/android/transition/Transition.html#setPathMotion(android.transition.PathMotion)"/>
-        /// </summary>
-        public Android.Transition.PathMotion PathMotion
-        {
-            get { return IExecuteWithSignature<Android.Transition.PathMotion>("getPathMotion", "()Landroid/transition/PathMotion;"); } set { IExecuteWithSignature("setPathMotion", "(Landroid/transition/PathMotion;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getPropagation()"/> <see href="https://developer.android.com/reference/android/transition/Transition.html#setPropagation(android.transition.TransitionPropagation)"/>
-        /// </summary>
-        public Android.Transition.TransitionPropagation Propagation
-        {
-            get { return IExecuteWithSignature<Android.Transition.TransitionPropagation>("getPropagation", "()Landroid/transition/TransitionPropagation;"); } set { IExecuteWithSignature("setPropagation", "(Landroid/transition/TransitionPropagation;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getStartDelay()"/> 
-        /// </summary>
-        public long StartDelay
-        {
-            get { return IExecuteWithSignature<long>("getStartDelay", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTargetIds()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.Integer> TargetIds
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getTargetIds", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTargetNames()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> TargetNames
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getTargetNames", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTargets()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.View> Targets
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.View>>("getTargets", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTargetTypes()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.Class> TargetTypes
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.Class>>("getTargetTypes", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTransitionProperties()"/> 
-        /// </summary>
-        public Java.Lang.String[] TransitionProperties
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getTransitionProperties", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/Transition.html#captureEndValues(android.transition.TransitionValues)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Transition.TransitionValues"/></param>
@@ -197,6 +106,30 @@ public Android.Animation.Animator CreateAnimator(Android.View.ViewGroup arg0, An
             return IExecute<Android.Animation.Animator>("createAnimator", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getInterpolator()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Animation.TimeInterpolator"/></returns>
+        public Android.Animation.TimeInterpolator GetInterpolator()
+        {
+            return IExecuteWithSignature<Android.Animation.TimeInterpolator>("getInterpolator", "()Landroid/animation/TimeInterpolator;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getEpicenter()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetEpicenter()
+        {
+            return IExecuteWithSignature<Android.Graphics.Rect>("getEpicenter", "()Landroid/graphics/Rect;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getPathMotion()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.PathMotion"/></returns>
+        public Android.Transition.PathMotion GetPathMotion()
+        {
+            return IExecuteWithSignature<Android.Transition.PathMotion>("getPathMotion", "()Landroid/transition/PathMotion;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/Transition.html#addListener(android.transition.Transition.TransitionListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Transition.Transition.TransitionListener"/></param>
@@ -392,6 +325,22 @@ public Android.Transition.Transition SetStartDelay(long arg0)
             return IExecuteWithSignature<Android.Transition.Transition>("setStartDelay", "(J)Landroid/transition/Transition;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getEpicenterCallback()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition.EpicenterCallback"/></returns>
+        public Android.Transition.Transition.EpicenterCallback GetEpicenterCallback()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition.EpicenterCallback>("getEpicenterCallback", "()Landroid/transition/Transition$EpicenterCallback;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getPropagation()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.TransitionPropagation"/></returns>
+        public Android.Transition.TransitionPropagation GetPropagation()
+        {
+            return IExecuteWithSignature<Android.Transition.TransitionPropagation>("getPropagation", "()Landroid/transition/TransitionPropagation;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTransitionValues(android.view.View,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -420,6 +369,70 @@ public bool IsTransitionRequired(Android.Transition.TransitionValues arg0, Andro
             return IExecute<bool>("isTransitionRequired", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTransitionProperties()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetTransitionProperties()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getTransitionProperties", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTargets()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.View> GetTargets()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.View>>("getTargets", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTargetTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Class> GetTargetTypes()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Class>>("getTargetTypes", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTargetIds()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Integer> GetTargetIds()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Integer>>("getTargetIds", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getTargetNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetTargetNames()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getTargetNames", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getDuration()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDuration()
+        {
+            return IExecuteWithSignature<long>("getDuration", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#getStartDelay()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetStartDelay()
+        {
+            return IExecuteWithSignature<long>("getStartDelay", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/Transition.html#setEpicenterCallback(android.transition.Transition.EpicenterCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Transition.Transition.EpicenterCallback"/></param>
@@ -435,6 +448,22 @@ public void SetMatchOrder(params int[] arg0)
         {
             if (arg0.Length == 0) IExecuteWithSignature("setMatchOrder", "([I)V"); else IExecuteWithSignature("setMatchOrder", "([I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#setPathMotion(android.transition.PathMotion)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.PathMotion"/></param>
+        public void SetPathMotion(Android.Transition.PathMotion arg0)
+        {
+            IExecuteWithSignature("setPathMotion", "(Landroid/transition/PathMotion;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Transition.html#setPropagation(android.transition.TransitionPropagation)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.TransitionPropagation"/></param>
+        public void SetPropagation(Android.Transition.TransitionPropagation arg0)
+        {
+            IExecuteWithSignature("setPropagation", "(Landroid/transition/TransitionPropagation;)V", arg0);
+        }
 
         #endregion
 
@@ -504,11 +533,11 @@ public partial class TransitionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTransitionCancel", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionCancelEventHandler));
-                AddEventHandler("onTransitionEnd", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionEndEventHandler));
-                AddEventHandler("onTransitionPause", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionPauseEventHandler));
-                AddEventHandler("onTransitionResume", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionResumeEventHandler));
-                AddEventHandler("onTransitionStart", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionStartEventHandler));
+                AddEventHandler("onTransitionCancel", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionCancelEventHandler));
+                AddEventHandler("onTransitionEnd", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionEndEventHandler));
+                AddEventHandler("onTransitionPause", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionPauseEventHandler));
+                AddEventHandler("onTransitionResume", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionResumeEventHandler));
+                AddEventHandler("onTransitionStart", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionStartEventHandler));
 
             }
 
@@ -516,7 +545,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/transition/Transition.TransitionListener.html#onTransitionCancel(android.transition.Transition)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTransitionCancel"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Transition.Transition> OnOnTransitionCancel { get; set; } = null;
+            public global::System.Action<Android.Transition.Transition> OnOnTransitionCancel { get; set; } = null;
 
             void OnTransitionCancelEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
             {
@@ -537,7 +566,7 @@ public virtual void OnTransitionCancel(Android.Transition.Transition arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/transition/Transition.TransitionListener.html#onTransitionEnd(android.transition.Transition)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTransitionEnd"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Transition.Transition> OnOnTransitionEnd { get; set; } = null;
+            public global::System.Action<Android.Transition.Transition> OnOnTransitionEnd { get; set; } = null;
 
             void OnTransitionEndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
             {
@@ -558,7 +587,7 @@ public virtual void OnTransitionEnd(Android.Transition.Transition arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/transition/Transition.TransitionListener.html#onTransitionPause(android.transition.Transition)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTransitionPause"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Transition.Transition> OnOnTransitionPause { get; set; } = null;
+            public global::System.Action<Android.Transition.Transition> OnOnTransitionPause { get; set; } = null;
 
             void OnTransitionPauseEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
             {
@@ -579,7 +608,7 @@ public virtual void OnTransitionPause(Android.Transition.Transition arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/transition/Transition.TransitionListener.html#onTransitionResume(android.transition.Transition)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTransitionResume"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Transition.Transition> OnOnTransitionResume { get; set; } = null;
+            public global::System.Action<Android.Transition.Transition> OnOnTransitionResume { get; set; } = null;
 
             void OnTransitionResumeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
             {
@@ -600,7 +629,7 @@ public virtual void OnTransitionResume(Android.Transition.Transition arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/transition/Transition.TransitionListener.html#onTransitionStart(android.transition.Transition)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTransitionStart"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Transition.Transition> OnOnTransitionStart { get; set; } = null;
+            public global::System.Action<Android.Transition.Transition> OnOnTransitionStart { get; set; } = null;
 
             void OnTransitionStartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Transition/TransitionListenerAdapter.cs b/src/net/Netdroid/Generated/Android/Transition/TransitionListenerAdapter.cs
index cd853319d..cb07b4943 100644
--- a/src/net/Netdroid/Generated/Android/Transition/TransitionListenerAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/TransitionListenerAdapter.cs
@@ -50,11 +50,11 @@ public partial class TransitionListenerAdapter
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onTransitionCancel", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionCancelEventHandler));
-            AddEventHandler("onTransitionEnd", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionEndEventHandler));
-            AddEventHandler("onTransitionPause", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionPauseEventHandler));
-            AddEventHandler("onTransitionResume", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionResumeEventHandler));
-            AddEventHandler("onTransitionStart", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionStartEventHandler));
+            AddEventHandler("onTransitionCancel", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionCancelEventHandler));
+            AddEventHandler("onTransitionEnd", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionEndEventHandler));
+            AddEventHandler("onTransitionPause", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionPauseEventHandler));
+            AddEventHandler("onTransitionResume", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionResumeEventHandler));
+            AddEventHandler("onTransitionStart", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Transition.Transition>>>(OnTransitionStartEventHandler));
 
         }
 
@@ -62,7 +62,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/transition/TransitionListenerAdapter.html#onTransitionCancel(android.transition.Transition)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnTransitionCancel"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Transition.Transition> OnOnTransitionCancel { get; set; } = null;
+        public global::System.Action<Android.Transition.Transition> OnOnTransitionCancel { get; set; } = null;
 
         void OnTransitionCancelEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
         {
@@ -83,7 +83,7 @@ public virtual void OnTransitionCancel(Android.Transition.Transition arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/transition/TransitionListenerAdapter.html#onTransitionEnd(android.transition.Transition)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnTransitionEnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Transition.Transition> OnOnTransitionEnd { get; set; } = null;
+        public global::System.Action<Android.Transition.Transition> OnOnTransitionEnd { get; set; } = null;
 
         void OnTransitionEndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
         {
@@ -104,7 +104,7 @@ public virtual void OnTransitionEnd(Android.Transition.Transition arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/transition/TransitionListenerAdapter.html#onTransitionPause(android.transition.Transition)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnTransitionPause"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Transition.Transition> OnOnTransitionPause { get; set; } = null;
+        public global::System.Action<Android.Transition.Transition> OnOnTransitionPause { get; set; } = null;
 
         void OnTransitionPauseEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
         {
@@ -125,7 +125,7 @@ public virtual void OnTransitionPause(Android.Transition.Transition arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/transition/TransitionListenerAdapter.html#onTransitionResume(android.transition.Transition)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnTransitionResume"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Transition.Transition> OnOnTransitionResume { get; set; } = null;
+        public global::System.Action<Android.Transition.Transition> OnOnTransitionResume { get; set; } = null;
 
         void OnTransitionResumeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
         {
@@ -146,7 +146,7 @@ public virtual void OnTransitionResume(Android.Transition.Transition arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/transition/TransitionListenerAdapter.html#onTransitionStart(android.transition.Transition)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnTransitionStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Transition.Transition> OnOnTransitionStart { get; set; } = null;
+        public global::System.Action<Android.Transition.Transition> OnOnTransitionStart { get; set; } = null;
 
         void OnTransitionStartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Transition.Transition>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Transition/TransitionPropagation.cs b/src/net/Netdroid/Generated/Android/Transition/TransitionPropagation.cs
index 7830284ca..b65085ec2 100644
--- a/src/net/Netdroid/Generated/Android/Transition/TransitionPropagation.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/TransitionPropagation.cs
@@ -46,11 +46,12 @@ public partial class TransitionPropagation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/TransitionPropagation.html#getPropagationProperties()"/> 
+        /// <see href="https://developer.android.com/reference/android/transition/TransitionPropagation.html#getPropagationProperties()"/>
         /// </summary>
-        public Java.Lang.String[] PropagationProperties
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetPropagationProperties()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getPropagationProperties", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getPropagationProperties", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/TransitionPropagation.html#getStartDelay(android.view.ViewGroup,android.transition.Transition,android.transition.TransitionValues,android.transition.TransitionValues)"/>
diff --git a/src/net/Netdroid/Generated/Android/Transition/TransitionSet.cs b/src/net/Netdroid/Generated/Android/Transition/TransitionSet.cs
index f1b804371..7e120e60c 100644
--- a/src/net/Netdroid/Generated/Android/Transition/TransitionSet.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/TransitionSet.cs
@@ -67,20 +67,6 @@ public TransitionSet(Android.Content.Context arg0, Android.Util.AttributeSet arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/TransitionSet.html#getOrdering()"/> 
-        /// </summary>
-        public int Ordering
-        {
-            get { return IExecuteWithSignature<int>("getOrdering", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/TransitionSet.html#getTransitionCount()"/> 
-        /// </summary>
-        public int TransitionCount
-        {
-            get { return IExecuteWithSignature<int>("getTransitionCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/TransitionSet.html#getTransitionAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -116,6 +102,22 @@ public Android.Transition.TransitionSet SetOrdering(int arg0)
         {
             return IExecuteWithSignature<Android.Transition.TransitionSet>("setOrdering", "(I)Landroid/transition/TransitionSet;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/TransitionSet.html#getOrdering()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetOrdering()
+        {
+            return IExecuteWithSignature<int>("getOrdering", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/TransitionSet.html#getTransitionCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTransitionCount()
+        {
+            return IExecuteWithSignature<int>("getTransitionCount", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Transition/Visibility.cs b/src/net/Netdroid/Generated/Android/Transition/Visibility.cs
index 4b27b8bab..a96f54997 100644
--- a/src/net/Netdroid/Generated/Android/Transition/Visibility.cs
+++ b/src/net/Netdroid/Generated/Android/Transition/Visibility.cs
@@ -67,13 +67,6 @@ public Visibility(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/transition/Visibility.html#getMode()"/> <see href="https://developer.android.com/reference/android/transition/Visibility.html#setMode(int)"/>
-        /// </summary>
-        public int Mode
-        {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); } set { IExecuteWithSignature("setMode", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/transition/Visibility.html#onAppear(android.view.ViewGroup,android.transition.TransitionValues,int,android.transition.TransitionValues,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.ViewGroup"/></param>
@@ -132,6 +125,22 @@ public bool IsVisible(Android.Transition.TransitionValues arg0)
         {
             return IExecuteWithSignature<bool>("isVisible", "(Landroid/transition/TransitionValues;)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Visibility.html#getMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMode()
+        {
+            return IExecuteWithSignature<int>("getMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/transition/Visibility.html#setMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMode(int arg0)
+        {
+            IExecuteWithSignature("setMode", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Util/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Util/AllPackageClasses.cs
index 7ae389199..60665ca27 100644
--- a/src/net/Netdroid/Generated/Android/Util/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Util/AllPackageClasses.cs
@@ -293,12 +293,12 @@ public partial class AttributeSet : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Attr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AttributeSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttributeSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttributeSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AttributeSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttributeSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttributeSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -526,7 +526,7 @@ public CloseGuard(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/Config.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Config : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Config>
     {
         const string _bridgeClassName = "android.util.Config";
@@ -665,12 +665,12 @@ public partial class Dumpable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Dumpable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Dumpable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Dumpable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Dumpable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Dumpable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Dumpable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Dumpable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -711,12 +711,12 @@ public partial class DumpableContainer : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DumpableContainer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DumpableContainer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DumpableContainer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DumpableContainer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DumpableContainer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DumpableContainer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -839,7 +839,7 @@ public Event(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/EventLogTags.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class EventLogTags : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EventLogTags>
     {
         const string _bridgeClassName = "android.util.EventLogTags";
@@ -880,7 +880,7 @@ public EventLogTags(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/EventLogTags.Description.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class Description : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Description>
         {
             const string _bridgeClassName = "android.util.EventLogTags$Description";
@@ -929,7 +929,7 @@ public Description(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/FloatMath.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class FloatMath : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FloatMath>
     {
         const string _bridgeClassName = "android.util.FloatMath";
@@ -980,12 +980,12 @@ public partial class FloatProperty : Android.Util.Property
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FloatProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FloatProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FloatProperty() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FloatProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FloatProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FloatProperty(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1027,12 +1027,12 @@ public partial class FloatProperty<T> : Android.Util.Property<T, Java.Lang.Float
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FloatProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FloatProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FloatProperty() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FloatProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FloatProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FloatProperty(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1117,12 +1117,12 @@ public partial class IntProperty : Android.Util.Property
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IntProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntProperty() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IntProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntProperty(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1164,12 +1164,12 @@ public partial class IntProperty<T> : Android.Util.Property<T, Java.Lang.Integer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IntProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntProperty() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IntProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntProperty(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1708,7 +1708,7 @@ public MonthDisplayHelper(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/MutableBoolean.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MutableBoolean : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MutableBoolean>
     {
         const string _bridgeClassName = "android.util.MutableBoolean";
@@ -1753,7 +1753,7 @@ public MutableBoolean(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/MutableByte.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MutableByte : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MutableByte>
     {
         const string _bridgeClassName = "android.util.MutableByte";
@@ -1798,7 +1798,7 @@ public MutableByte(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/MutableChar.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MutableChar : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MutableChar>
     {
         const string _bridgeClassName = "android.util.MutableChar";
@@ -1843,7 +1843,7 @@ public MutableChar(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/MutableDouble.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MutableDouble : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MutableDouble>
     {
         const string _bridgeClassName = "android.util.MutableDouble";
@@ -1888,7 +1888,7 @@ public MutableDouble(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/MutableFloat.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MutableFloat : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MutableFloat>
     {
         const string _bridgeClassName = "android.util.MutableFloat";
@@ -1933,7 +1933,7 @@ public MutableFloat(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/MutableInt.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MutableInt : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MutableInt>
     {
         const string _bridgeClassName = "android.util.MutableInt";
@@ -1978,7 +1978,7 @@ public MutableInt(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/MutableLong.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MutableLong : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MutableLong>
     {
         const string _bridgeClassName = "android.util.MutableLong";
@@ -2023,7 +2023,7 @@ public MutableLong(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/MutableShort.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class MutableShort : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MutableShort>
     {
         const string _bridgeClassName = "android.util.MutableShort";
@@ -2225,12 +2225,12 @@ public partial class Printer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Printer>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Printer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Printer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Printer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Printer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Printer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Printer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2359,12 +2359,12 @@ public partial class Property : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Property
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Property class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Property class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Property() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Property class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Property class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Property(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2407,12 +2407,12 @@ public partial class Property<T, V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Property class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Property class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Property() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Property class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Property class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Property(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2993,7 +2993,7 @@ public TimeUtils(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/TimingLogger.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class TimingLogger : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TimingLogger>
     {
         const string _bridgeClassName = "android.util.TimingLogger";
@@ -3034,6 +3034,50 @@ public TimingLogger(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region TypedValue
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/util/TypedValue.html"/>
+    /// </summary>
+    public partial class TypedValue : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TypedValue>
+    {
+        const string _bridgeClassName = "android.util.TypedValue";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        public TypedValue() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public TypedValue(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
     #region Xml
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/util/Xml.html"/>
diff --git a/src/net/Netdroid/Generated/Android/Util/ArrayMap.cs b/src/net/Netdroid/Generated/Android/Util/ArrayMap.cs
index 3f1b1fbc6..5116e23cb 100644
--- a/src/net/Netdroid/Generated/Android/Util/ArrayMap.cs
+++ b/src/net/Netdroid/Generated/Android/Util/ArrayMap.cs
@@ -516,7 +516,7 @@ public void EnsureCapacity(int arg0)
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
-        public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiConsumer<Arg0objectSuperK, Arg0objectSuperV> arg0) where Arg0objectSuperK: K where Arg0objectSuperV: V
+        public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiConsumer<Arg0objectSuperK, Arg0objectSuperV> arg0) where Arg0objectSuperK : K where Arg0objectSuperV : V
         {
             IExecuteWithSignature("forEach", "(Ljava/util/function/BiConsumer;)V", arg0);
         }
@@ -526,7 +526,7 @@ public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiCon
         /// <param name="arg0"><see cref="Android.Util.ArrayMap"/></param>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Android.Util.ArrayMap<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
+        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Android.Util.ArrayMap<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK : K where Arg0ExtendsV : V
         {
             IExecuteWithSignature("putAll", "(Landroid/util/ArrayMap;)V", arg0);
         }
@@ -536,7 +536,7 @@ public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Android.Util.ArrayMap<Arg0Extends
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
+        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK : K where Arg0ExtendsV : V
         {
             IExecuteWithSignature("putAll", "(Ljava/util/Map;)V", arg0);
         }
@@ -547,7 +547,7 @@ public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0E
         /// <typeparam name="Arg0objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void ReplaceAll<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV>(Java.Util.Function.BiFunction<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV> arg0) where Arg0objectSuperK: K where Arg0objectSuperV: V where Arg0ExtendsV: V
+        public void ReplaceAll<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV>(Java.Util.Function.BiFunction<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV> arg0) where Arg0objectSuperK : K where Arg0objectSuperV : V where Arg0ExtendsV : V
         {
             IExecuteWithSignature("replaceAll", "(Ljava/util/function/BiFunction;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Util/ArraySet.cs b/src/net/Netdroid/Generated/Android/Util/ArraySet.cs
index de86249f6..3312a640c 100644
--- a/src/net/Netdroid/Generated/Android/Util/ArraySet.cs
+++ b/src/net/Netdroid/Generated/Android/Util/ArraySet.cs
@@ -357,7 +357,7 @@ public bool Add(E arg0)
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
@@ -402,7 +402,7 @@ public bool Remove(object arg0)
         /// <param name="arg0"><see cref="Android.Util.ArraySet"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool RemoveAll<Arg0ExtendsE>(Android.Util.ArraySet<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public bool RemoveAll<Arg0ExtendsE>(Android.Util.ArraySet<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<bool>("removeAll", "(Landroid/util/ArraySet;)Z", arg0);
         }
@@ -421,7 +421,7 @@ public bool RemoveAll(Java.Util.Collection<object> arg0)
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool RemoveIf<Arg0objectSuperE>(Java.Util.Function.Predicate<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public bool RemoveIf<Arg0objectSuperE>(Java.Util.Function.Predicate<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<bool>("removeIf", "(Ljava/util/function/Predicate;)Z", arg0);
         }
@@ -490,7 +490,7 @@ public Java.Util.Iterator<E> Iterator()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.ArraySet"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
-        public void AddAll<Arg0ExtendsE>(Android.Util.ArraySet<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public void AddAll<Arg0ExtendsE>(Android.Util.ArraySet<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             IExecuteWithSignature("addAll", "(Landroid/util/ArraySet;)V", arg0);
         }
@@ -514,7 +514,7 @@ public void EnsureCapacity(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
-        public void ForEach<Arg0objectSuperE>(Java.Util.Function.Consumer<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public void ForEach<Arg0objectSuperE>(Java.Util.Function.Consumer<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             IExecuteWithSignature("forEach", "(Ljava/util/function/Consumer;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Util/AtomicFile.cs b/src/net/Netdroid/Generated/Android/Util/AtomicFile.cs
index df7d64035..3cc993e8a 100644
--- a/src/net/Netdroid/Generated/Android/Util/AtomicFile.cs
+++ b/src/net/Netdroid/Generated/Android/Util/AtomicFile.cs
@@ -54,20 +54,6 @@ public AtomicFile(Java.Io.File arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/AtomicFile.html#getBaseFile()"/> 
-        /// </summary>
-        public Java.Io.File BaseFile
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getBaseFile", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/AtomicFile.html#getLastModifiedTime()"/> 
-        /// </summary>
-        public long LastModifiedTime
-        {
-            get { return IExecuteWithSignature<long>("getLastModifiedTime", "()J"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/AtomicFile.html#readFully()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
@@ -77,6 +63,14 @@ public byte[] ReadFully()
             return IExecuteWithSignatureArray<byte>("readFully", "()[B");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/AtomicFile.html#getBaseFile()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetBaseFile()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getBaseFile", "()Ljava/io/File;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/AtomicFile.html#openRead()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.FileInputStream"/></returns>
@@ -95,6 +89,14 @@ public Java.Io.FileOutputStream StartWrite()
             return IExecuteWithSignature<Java.Io.FileOutputStream>("startWrite", "()Ljava/io/FileOutputStream;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/AtomicFile.html#getLastModifiedTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetLastModifiedTime()
+        {
+            return IExecuteWithSignature<long>("getLastModifiedTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/AtomicFile.html#delete()"/>
         /// </summary>
         public void Delete()
diff --git a/src/net/Netdroid/Generated/Android/Util/AttributeSet.cs b/src/net/Netdroid/Generated/Android/Util/AttributeSet.cs
index 4f9334363..3c9a6137b 100644
--- a/src/net/Netdroid/Generated/Android/Util/AttributeSet.cs
+++ b/src/net/Netdroid/Generated/Android/Util/AttributeSet.cs
@@ -64,41 +64,6 @@ public partial class AttributeSet : Android.Util.IAttributeSet
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getAttributeCount()"/> 
-        /// </summary>
-        public int AttributeCount
-        {
-            get { return IExecuteWithSignature<int>("getAttributeCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getClassAttribute()"/> 
-        /// </summary>
-        public Java.Lang.String ClassAttribute
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClassAttribute", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getIdAttribute()"/> 
-        /// </summary>
-        public Java.Lang.String IdAttribute
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIdAttribute", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getPositionDescription()"/> 
-        /// </summary>
-        public Java.Lang.String PositionDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPositionDescription", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getStyleAttribute()"/> 
-        /// </summary>
-        public int StyleAttribute
-        {
-            get { return IExecuteWithSignature<int>("getStyleAttribute", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getAttributeBooleanValue(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -141,6 +106,14 @@ public float GetAttributeFloatValue(Java.Lang.String arg0, Java.Lang.String arg1
             return IExecute<float>("getAttributeFloatValue", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getAttributeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAttributeCount()
+        {
+            return IExecuteWithSignature<int>("getAttributeCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getAttributeIntValue(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -245,6 +218,14 @@ public int GetIdAttributeResourceValue(int arg0)
             return IExecuteWithSignature<int>("getIdAttributeResourceValue", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getStyleAttribute()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStyleAttribute()
+        {
+            return IExecuteWithSignature<int>("getStyleAttribute", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getAttributeName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -273,6 +254,30 @@ public Java.Lang.String GetAttributeValue(Java.Lang.String arg0, Java.Lang.Strin
             return IExecute<Java.Lang.String>("getAttributeValue", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getClassAttribute()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClassAttribute()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getClassAttribute", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getIdAttribute()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetIdAttribute()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getIdAttribute", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getPositionDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPositionDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPositionDescription", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/AttributeSet.html#getAttributeNamespace(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Util/Config.cs b/src/net/Netdroid/Generated/Android/Util/Config.cs
index aef3053f4..28be5bc3b 100644
--- a/src/net/Netdroid/Generated/Android/Util/Config.cs
+++ b/src/net/Netdroid/Generated/Android/Util/Config.cs
@@ -40,35 +40,35 @@ public partial class Config
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Config.html#DEBUG"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool DEBUG { get { if (!_DEBUGReady) { _DEBUGContent = SGetField<bool>(LocalBridgeClazz, "DEBUG"); _DEBUGReady = true; } return _DEBUGContent; } }
         private static bool _DEBUGContent = default;
         private static bool _DEBUGReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Config.html#LOGD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool LOGD { get { if (!_LOGDReady) { _LOGDContent = SGetField<bool>(LocalBridgeClazz, "LOGD"); _LOGDReady = true; } return _LOGDContent; } }
         private static bool _LOGDContent = default;
         private static bool _LOGDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Config.html#LOGV"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool LOGV { get { if (!_LOGVReady) { _LOGVContent = SGetField<bool>(LocalBridgeClazz, "LOGV"); _LOGVReady = true; } return _LOGVContent; } }
         private static bool _LOGVContent = default;
         private static bool _LOGVReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Config.html#PROFILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool PROFILE { get { if (!_PROFILEReady) { _PROFILEContent = SGetField<bool>(LocalBridgeClazz, "PROFILE"); _PROFILEReady = true; } return _PROFILEContent; } }
         private static bool _PROFILEContent = default;
         private static bool _PROFILEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Config.html#RELEASE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool RELEASE { get { if (!_RELEASEReady) { _RELEASEContent = SGetField<bool>(LocalBridgeClazz, "RELEASE"); _RELEASEReady = true; } return _RELEASEContent; } }
         private static bool _RELEASEContent = default;
         private static bool _RELEASEReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Util/DisplayMetrics.cs b/src/net/Netdroid/Generated/Android/Util/DisplayMetrics.cs
index 4b8b196d4..56b856da6 100644
--- a/src/net/Netdroid/Generated/Android/Util/DisplayMetrics.cs
+++ b/src/net/Netdroid/Generated/Android/Util/DisplayMetrics.cs
@@ -44,7 +44,7 @@ public partial class DisplayMetrics
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/DisplayMetrics.html#scaledDensity"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float scaledDensity { get { return IGetField<float>("scaledDensity"); } set { ISetField("scaledDensity", value); } }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/DisplayMetrics.html#xdpi"/>
diff --git a/src/net/Netdroid/Generated/Android/Util/Dumpable.cs b/src/net/Netdroid/Generated/Android/Util/Dumpable.cs
index b152c7f43..3e1821b71 100644
--- a/src/net/Netdroid/Generated/Android/Util/Dumpable.cs
+++ b/src/net/Netdroid/Generated/Android/Util/Dumpable.cs
@@ -64,13 +64,6 @@ public partial class Dumpable : Android.Util.IDumpable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Dumpable.html#getDumpableName()"/> 
-        /// </summary>
-        public Java.Lang.String DumpableName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDumpableName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Dumpable.html#dump(java.io.PrintWriter,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PrintWriter"/></param>
@@ -79,6 +72,14 @@ public void Dump(Java.Io.PrintWriter arg0, Java.Lang.String[] arg1)
         {
             IExecute("dump", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/Dumpable.html#getDumpableName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDumpableName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDumpableName", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Util/EventLog.cs b/src/net/Netdroid/Generated/Android/Util/EventLog.cs
index 9360769b2..b8f55cb77 100644
--- a/src/net/Netdroid/Generated/Android/Util/EventLog.cs
+++ b/src/net/Netdroid/Generated/Android/Util/EventLog.cs
@@ -148,39 +148,44 @@ public partial class Event
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getData()"/> 
+            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getProcessId()"/>
             /// </summary>
-            public object Data
+            /// <returns><see cref="int"/></returns>
+            public int GetProcessId()
             {
-                get { return IExecuteWithSignature("getData", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<int>("getProcessId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getProcessId()"/> 
+            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getTag()"/>
             /// </summary>
-            public int ProcessId
+            /// <returns><see cref="int"/></returns>
+            public int GetTag()
             {
-                get { return IExecuteWithSignature<int>("getProcessId", "()I"); }
+                return IExecuteWithSignature<int>("getTag", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getTag()"/> 
+            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getThreadId()"/>
             /// </summary>
-            public int Tag
+            /// <returns><see cref="int"/></returns>
+            public int GetThreadId()
             {
-                get { return IExecuteWithSignature<int>("getTag", "()I"); }
+                return IExecuteWithSignature<int>("getThreadId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getThreadId()"/> 
+            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getTimeNanos()"/>
             /// </summary>
-            public int ThreadId
+            /// <returns><see cref="long"/></returns>
+            public long GetTimeNanos()
             {
-                get { return IExecuteWithSignature<int>("getThreadId", "()I"); }
+                return IExecuteWithSignature<long>("getTimeNanos", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getTimeNanos()"/> 
+            /// <see href="https://developer.android.com/reference/android/util/EventLog.Event.html#getData()"/>
             /// </summary>
-            public long TimeNanos
+            /// <returns><see cref="object"/></returns>
+            public object GetData()
             {
-                get { return IExecuteWithSignature<long>("getTimeNanos", "()J"); }
+                return IExecuteWithSignature("getData", "()Ljava/lang/Object;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/EventLogTags.cs b/src/net/Netdroid/Generated/Android/Util/EventLogTags.cs
index 39225c0d6..8cc02c4ab 100644
--- a/src/net/Netdroid/Generated/Android/Util/EventLogTags.cs
+++ b/src/net/Netdroid/Generated/Android/Util/EventLogTags.cs
@@ -34,7 +34,7 @@ public partial class EventLogTags
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.BufferedReader"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public EventLogTags(Java.Io.BufferedReader arg0)
             : base(arg0)
         {
@@ -60,7 +60,7 @@ public EventLogTags(Java.Io.BufferedReader arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.Util.EventLogTags.Description"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Util.EventLogTags.Description Get(int arg0)
         {
             return IExecuteWithSignature<Android.Util.EventLogTags.Description>("get", "(I)Landroid/util/EventLogTags$Description;", arg0);
@@ -70,7 +70,7 @@ public Android.Util.EventLogTags.Description Get(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Util.EventLogTags.Description"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Util.EventLogTags.Description Get(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Android.Util.EventLogTags.Description>("get", "(Ljava/lang/String;)Landroid/util/EventLogTags$Description;", arg0);
@@ -94,14 +94,14 @@ public partial class Description
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/util/EventLogTags.Description.html#mTag"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int mTag { get { if (!_mTagReady) { _mTagContent = IGetField<int>("mTag"); _mTagReady = true; } return _mTagContent; } }
             private int _mTagContent = default;
             private bool _mTagReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/util/EventLogTags.Description.html#mName"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.String mName { get { if (!_mNameReady) { _mNameContent = IGetField<Java.Lang.String>("mName"); _mNameReady = true; } return _mNameContent; } }
             private Java.Lang.String _mNameContent = default;
             private bool _mNameReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Util/MonthDisplayHelper.cs b/src/net/Netdroid/Generated/Android/Util/MonthDisplayHelper.cs
index 58fdd83c5..bb3192dbb 100644
--- a/src/net/Netdroid/Generated/Android/Util/MonthDisplayHelper.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MonthDisplayHelper.cs
@@ -65,84 +65,90 @@ public MonthDisplayHelper(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getFirstDayOfMonth()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#isWithinCurrentMonth(int,int)"/>
         /// </summary>
-        public int FirstDayOfMonth
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsWithinCurrentMonth(int arg0, int arg1)
         {
-            get { return IExecuteWithSignature<int>("getFirstDayOfMonth", "()I"); }
+            return IExecute<bool>("isWithinCurrentMonth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getMonth()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getColumnOf(int)"/>
         /// </summary>
-        public int Month
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnOf(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getMonth", "()I"); }
+            return IExecuteWithSignature<int>("getColumnOf", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getNumberOfDaysInMonth()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getDayAt(int,int)"/>
         /// </summary>
-        public int NumberOfDaysInMonth
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetDayAt(int arg0, int arg1)
         {
-            get { return IExecuteWithSignature<int>("getNumberOfDaysInMonth", "()I"); }
+            return IExecute<int>("getDayAt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getFirstDayOfMonth()"/>
         /// </summary>
-        public int Offset
+        /// <returns><see cref="int"/></returns>
+        public int GetFirstDayOfMonth()
         {
-            get { return IExecuteWithSignature<int>("getOffset", "()I"); }
+            return IExecuteWithSignature<int>("getFirstDayOfMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getWeekStartDay()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getMonth()"/>
         /// </summary>
-        public int WeekStartDay
+        /// <returns><see cref="int"/></returns>
+        public int GetMonth()
         {
-            get { return IExecuteWithSignature<int>("getWeekStartDay", "()I"); }
+            return IExecuteWithSignature<int>("getMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getYear()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getNumberOfDaysInMonth()"/>
         /// </summary>
-        public int Year
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfDaysInMonth()
         {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); }
+            return IExecuteWithSignature<int>("getNumberOfDaysInMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#isWithinCurrentMonth(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getOffset()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsWithinCurrentMonth(int arg0, int arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetOffset()
         {
-            return IExecute<bool>("isWithinCurrentMonth", arg0, arg1);
+            return IExecuteWithSignature<int>("getOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getColumnOf(int)"/>
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getRowOf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public int GetColumnOf(int arg0)
+        public int GetRowOf(int arg0)
         {
-            return IExecuteWithSignature<int>("getColumnOf", "(I)I", arg0);
+            return IExecuteWithSignature<int>("getRowOf", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getDayAt(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getWeekStartDay()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public int GetDayAt(int arg0, int arg1)
+        public int GetWeekStartDay()
         {
-            return IExecute<int>("getDayAt", arg0, arg1);
+            return IExecuteWithSignature<int>("getWeekStartDay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getRowOf(int)"/>
+        /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getYear()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public int GetRowOf(int arg0)
+        public int GetYear()
         {
-            return IExecuteWithSignature<int>("getRowOf", "(I)I", arg0);
+            return IExecuteWithSignature<int>("getYear", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MonthDisplayHelper.html#getDigitsForRow(int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Util/MutableBoolean.cs b/src/net/Netdroid/Generated/Android/Util/MutableBoolean.cs
index c40bc8c6f..27c390473 100644
--- a/src/net/Netdroid/Generated/Android/Util/MutableBoolean.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MutableBoolean.cs
@@ -33,7 +33,7 @@ public partial class MutableBoolean
         /// <see href="https://developer.android.com/reference/android/util/MutableBoolean.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MutableBoolean(bool arg0)
             : base(arg0)
         {
@@ -49,7 +49,7 @@ public MutableBoolean(bool arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MutableBoolean.html#value"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool value { get { return IGetField<bool>("value"); } set { ISetField("value", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/MutableByte.cs b/src/net/Netdroid/Generated/Android/Util/MutableByte.cs
index fb3d806aa..ddd1ca96b 100644
--- a/src/net/Netdroid/Generated/Android/Util/MutableByte.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MutableByte.cs
@@ -33,7 +33,7 @@ public partial class MutableByte
         /// <see href="https://developer.android.com/reference/android/util/MutableByte.html#%3Cinit%3E(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MutableByte(byte arg0)
             : base(arg0)
         {
@@ -49,7 +49,7 @@ public MutableByte(byte arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MutableByte.html#value"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public byte value { get { return IGetField<byte>("value"); } set { ISetField("value", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/MutableChar.cs b/src/net/Netdroid/Generated/Android/Util/MutableChar.cs
index 1e385daaf..1169294c9 100644
--- a/src/net/Netdroid/Generated/Android/Util/MutableChar.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MutableChar.cs
@@ -33,7 +33,7 @@ public partial class MutableChar
         /// <see href="https://developer.android.com/reference/android/util/MutableChar.html#%3Cinit%3E(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MutableChar(char arg0)
             : base(arg0)
         {
@@ -49,7 +49,7 @@ public MutableChar(char arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MutableChar.html#value"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public char value { get { return IGetField<char>("value"); } set { ISetField("value", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/MutableDouble.cs b/src/net/Netdroid/Generated/Android/Util/MutableDouble.cs
index 332a2074d..6d5588774 100644
--- a/src/net/Netdroid/Generated/Android/Util/MutableDouble.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MutableDouble.cs
@@ -33,7 +33,7 @@ public partial class MutableDouble
         /// <see href="https://developer.android.com/reference/android/util/MutableDouble.html#%3Cinit%3E(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MutableDouble(double arg0)
             : base(arg0)
         {
@@ -49,7 +49,7 @@ public MutableDouble(double arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MutableDouble.html#value"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double value { get { return IGetField<double>("value"); } set { ISetField("value", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/MutableFloat.cs b/src/net/Netdroid/Generated/Android/Util/MutableFloat.cs
index fb60c7195..91fd1688b 100644
--- a/src/net/Netdroid/Generated/Android/Util/MutableFloat.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MutableFloat.cs
@@ -33,7 +33,7 @@ public partial class MutableFloat
         /// <see href="https://developer.android.com/reference/android/util/MutableFloat.html#%3Cinit%3E(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MutableFloat(float arg0)
             : base(arg0)
         {
@@ -49,7 +49,7 @@ public MutableFloat(float arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MutableFloat.html#value"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public float value { get { return IGetField<float>("value"); } set { ISetField("value", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/MutableInt.cs b/src/net/Netdroid/Generated/Android/Util/MutableInt.cs
index 2a6a597bd..47ce84b64 100644
--- a/src/net/Netdroid/Generated/Android/Util/MutableInt.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MutableInt.cs
@@ -33,7 +33,7 @@ public partial class MutableInt
         /// <see href="https://developer.android.com/reference/android/util/MutableInt.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MutableInt(int arg0)
             : base(arg0)
         {
@@ -49,7 +49,7 @@ public MutableInt(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MutableInt.html#value"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int value { get { return IGetField<int>("value"); } set { ISetField("value", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/MutableLong.cs b/src/net/Netdroid/Generated/Android/Util/MutableLong.cs
index d42241998..13a54b22a 100644
--- a/src/net/Netdroid/Generated/Android/Util/MutableLong.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MutableLong.cs
@@ -33,7 +33,7 @@ public partial class MutableLong
         /// <see href="https://developer.android.com/reference/android/util/MutableLong.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MutableLong(long arg0)
             : base(arg0)
         {
@@ -49,7 +49,7 @@ public MutableLong(long arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MutableLong.html#value"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long value { get { return IGetField<long>("value"); } set { ISetField("value", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/MutableShort.cs b/src/net/Netdroid/Generated/Android/Util/MutableShort.cs
index b7d985dd5..c17b1facf 100644
--- a/src/net/Netdroid/Generated/Android/Util/MutableShort.cs
+++ b/src/net/Netdroid/Generated/Android/Util/MutableShort.cs
@@ -33,7 +33,7 @@ public partial class MutableShort
         /// <see href="https://developer.android.com/reference/android/util/MutableShort.html#%3Cinit%3E(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public MutableShort(short arg0)
             : base(arg0)
         {
@@ -49,7 +49,7 @@ public MutableShort(short arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/MutableShort.html#value"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public short value { get { return IGetField<short>("value"); } set { ISetField("value", value); } }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/Patterns.cs b/src/net/Netdroid/Generated/Android/Util/Patterns.cs
index f78a5ffe8..aab7f3590 100644
--- a/src/net/Netdroid/Generated/Android/Util/Patterns.cs
+++ b/src/net/Netdroid/Generated/Android/Util/Patterns.cs
@@ -40,21 +40,21 @@ public partial class Patterns
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Patterns.html#GOOD_IRI_CHAR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GOOD_IRI_CHAR { get { if (!_GOOD_IRI_CHARReady) { _GOOD_IRI_CHARContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GOOD_IRI_CHAR"); _GOOD_IRI_CHARReady = true; } return _GOOD_IRI_CHARContent; } }
         private static Java.Lang.String _GOOD_IRI_CHARContent = default;
         private static bool _GOOD_IRI_CHARReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Patterns.html#TOP_LEVEL_DOMAIN_STR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TOP_LEVEL_DOMAIN_STR { get { if (!_TOP_LEVEL_DOMAIN_STRReady) { _TOP_LEVEL_DOMAIN_STRContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TOP_LEVEL_DOMAIN_STR"); _TOP_LEVEL_DOMAIN_STRReady = true; } return _TOP_LEVEL_DOMAIN_STRContent; } }
         private static Java.Lang.String _TOP_LEVEL_DOMAIN_STRContent = default;
         private static bool _TOP_LEVEL_DOMAIN_STRReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Patterns.html#TOP_LEVEL_DOMAIN_STR_FOR_WEB_URL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TOP_LEVEL_DOMAIN_STR_FOR_WEB_URL { get { if (!_TOP_LEVEL_DOMAIN_STR_FOR_WEB_URLReady) { _TOP_LEVEL_DOMAIN_STR_FOR_WEB_URLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TOP_LEVEL_DOMAIN_STR_FOR_WEB_URL"); _TOP_LEVEL_DOMAIN_STR_FOR_WEB_URLReady = true; } return _TOP_LEVEL_DOMAIN_STR_FOR_WEB_URLContent; } }
         private static Java.Lang.String _TOP_LEVEL_DOMAIN_STR_FOR_WEB_URLContent = default;
         private static bool _TOP_LEVEL_DOMAIN_STR_FOR_WEB_URLReady = false; // this is used because in case of generics 
@@ -73,7 +73,7 @@ public partial class Patterns
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Patterns.html#IP_ADDRESS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Util.Regex.Pattern IP_ADDRESS { get { if (!_IP_ADDRESSReady) { _IP_ADDRESSContent = SGetField<Java.Util.Regex.Pattern>(LocalBridgeClazz, "IP_ADDRESS"); _IP_ADDRESSReady = true; } return _IP_ADDRESSContent; } }
         private static Java.Util.Regex.Pattern _IP_ADDRESSContent = default;
         private static bool _IP_ADDRESSReady = false; // this is used because in case of generics 
@@ -86,7 +86,7 @@ public partial class Patterns
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Patterns.html#TOP_LEVEL_DOMAIN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Util.Regex.Pattern TOP_LEVEL_DOMAIN { get { if (!_TOP_LEVEL_DOMAINReady) { _TOP_LEVEL_DOMAINContent = SGetField<Java.Util.Regex.Pattern>(LocalBridgeClazz, "TOP_LEVEL_DOMAIN"); _TOP_LEVEL_DOMAINReady = true; } return _TOP_LEVEL_DOMAINContent; } }
         private static Java.Util.Regex.Pattern _TOP_LEVEL_DOMAINContent = default;
         private static bool _TOP_LEVEL_DOMAINReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Util/Property.cs b/src/net/Netdroid/Generated/Android/Util/Property.cs
index 6ab735a17..9b3909005 100644
--- a/src/net/Netdroid/Generated/Android/Util/Property.cs
+++ b/src/net/Netdroid/Generated/Android/Util/Property.cs
@@ -66,20 +66,6 @@ public static Android.Util.Property Of(Java.Lang.Class arg0, Java.Lang.Class arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Property.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Property.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.Class Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Property.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
@@ -97,6 +83,22 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/Property.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/Property.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Property.html#set(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
@@ -161,20 +163,6 @@ public static Android.Util.Property<T, V> Of(Java.Lang.Class arg0, Java.Lang.Cla
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Property.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Property.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.Class Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Property.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
@@ -192,6 +180,22 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/Property.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/Property.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Property.html#set(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Util/Proto/ProtoOutputStream.cs b/src/net/Netdroid/Generated/Android/Util/Proto/ProtoOutputStream.cs
index a2f235e8b..2f2ec6bd4 100644
--- a/src/net/Netdroid/Generated/Android/Util/Proto/ProtoOutputStream.cs
+++ b/src/net/Netdroid/Generated/Android/Util/Proto/ProtoOutputStream.cs
@@ -338,18 +338,20 @@ public static long MakeToken(int arg0, bool arg1, int arg2, int arg3, int arg4)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream.html#getBytes()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream.html#getBytes()"/>
         /// </summary>
-        public byte[] Bytes
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetBytes()
         {
-            get { return IExecuteWithSignatureArray<byte>("getBytes", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getBytes", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream.html#getRawSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream.html#getRawSize()"/>
         /// </summary>
-        public int RawSize
+        /// <returns><see cref="int"/></returns>
+        public int GetRawSize()
         {
-            get { return IExecuteWithSignature<int>("getRawSize", "()I"); }
+            return IExecuteWithSignature<int>("getRawSize", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/proto/ProtoOutputStream.html#start(long)"/>
diff --git a/src/net/Netdroid/Generated/Android/Util/Rational.cs b/src/net/Netdroid/Generated/Android/Util/Rational.cs
index 3da497086..6962bbd6c 100644
--- a/src/net/Netdroid/Generated/Android/Util/Rational.cs
+++ b/src/net/Netdroid/Generated/Android/Util/Rational.cs
@@ -93,20 +93,6 @@ public static Android.Util.Rational ParseRational(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Rational.html#getDenominator()"/> 
-        /// </summary>
-        public int Denominator
-        {
-            get { return IExecuteWithSignature<int>("getDenominator", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Rational.html#getNumerator()"/> 
-        /// </summary>
-        public int Numerator
-        {
-            get { return IExecuteWithSignature<int>("getNumerator", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/Rational.html#isFinite()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -156,6 +142,22 @@ public int CompareTo(object arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/Rational.html#getDenominator()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDenominator()
+        {
+            return IExecuteWithSignature<int>("getDenominator", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/Rational.html#getNumerator()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumerator()
+        {
+            return IExecuteWithSignature<int>("getNumerator", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Util/Size.cs b/src/net/Netdroid/Generated/Android/Util/Size.cs
index 3045c19bb..4251a89df 100644
--- a/src/net/Netdroid/Generated/Android/Util/Size.cs
+++ b/src/net/Netdroid/Generated/Android/Util/Size.cs
@@ -65,18 +65,20 @@ public static Android.Util.Size ParseSize(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Size.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/Size.html#getHeight()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/Size.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/Size.html#getWidth()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Util/SizeF.cs b/src/net/Netdroid/Generated/Android/Util/SizeF.cs
index 30f13d664..6cd32ebd5 100644
--- a/src/net/Netdroid/Generated/Android/Util/SizeF.cs
+++ b/src/net/Netdroid/Generated/Android/Util/SizeF.cs
@@ -71,18 +71,20 @@ public static Android.Util.SizeF ParseSizeF(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/SizeF.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/SizeF.html#getHeight()"/>
         /// </summary>
-        public float Height
+        /// <returns><see cref="float"/></returns>
+        public float GetHeight()
         {
-            get { return IExecuteWithSignature<float>("getHeight", "()F"); }
+            return IExecuteWithSignature<float>("getHeight", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/SizeF.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/util/SizeF.html#getWidth()"/>
         /// </summary>
-        public float Width
+        /// <returns><see cref="float"/></returns>
+        public float GetWidth()
         {
-            get { return IExecuteWithSignature<float>("getWidth", "()F"); }
+            return IExecuteWithSignature<float>("getWidth", "()F");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/SizeF.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Util/TimeUtils.cs b/src/net/Netdroid/Generated/Android/Util/TimeUtils.cs
index 6f1d8b4b3..41477ddee 100644
--- a/src/net/Netdroid/Generated/Android/Util/TimeUtils.cs
+++ b/src/net/Netdroid/Generated/Android/Util/TimeUtils.cs
@@ -42,13 +42,6 @@ public partial class TimeUtils
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/util/TimeUtils.html#getTimeZoneDatabaseVersion()"/> 
-        /// </summary>
-        public static Java.Lang.String TimeZoneDatabaseVersion
-        {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getTimeZoneDatabaseVersion", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/TimeUtils.html#isTimeBetween(java.time.LocalTime,java.time.LocalTime,java.time.LocalTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
@@ -60,6 +53,14 @@ public static bool IsTimeBetween(Java.Time.LocalTime arg0, Java.Time.LocalTime a
             return SExecute<bool>(LocalBridgeClazz, "isTimeBetween", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TimeUtils.html#getTimeZoneDatabaseVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetTimeZoneDatabaseVersion()
+        {
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getTimeZoneDatabaseVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/TimeUtils.html#getTimeZoneIdsForCountryCode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Util/TimingLogger.cs b/src/net/Netdroid/Generated/Android/Util/TimingLogger.cs
index 0d9923991..2e6a98c37 100644
--- a/src/net/Netdroid/Generated/Android/Util/TimingLogger.cs
+++ b/src/net/Netdroid/Generated/Android/Util/TimingLogger.cs
@@ -34,7 +34,7 @@ public partial class TimingLogger
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TimingLogger(Java.Lang.String arg0, Java.Lang.String arg1)
             : base(arg0, arg1)
         {
@@ -59,7 +59,7 @@ public TimingLogger(Java.Lang.String arg0, Java.Lang.String arg1)
         /// <see href="https://developer.android.com/reference/android/util/TimingLogger.html#addSplit(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddSplit(Java.Lang.String arg0)
         {
             IExecuteWithSignature("addSplit", "(Ljava/lang/String;)V", arg0);
@@ -67,7 +67,7 @@ public void AddSplit(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/TimingLogger.html#dumpToLog()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DumpToLog()
         {
             IExecuteWithSignature("dumpToLog", "()V");
@@ -75,7 +75,7 @@ public void DumpToLog()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/util/TimingLogger.html#reset()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
@@ -85,7 +85,7 @@ public void Reset()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Reset(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             IExecute("reset", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Util/TypedValue.cs b/src/net/Netdroid/Generated/Android/Util/TypedValue.cs
new file mode 100644
index 000000000..bd3c0afc8
--- /dev/null
+++ b/src/net/Netdroid/Generated/Android/Util/TypedValue.cs
@@ -0,0 +1,493 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android.Util
+{
+    #region TypedValue
+    public partial class TypedValue
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#assetCookie"/>
+        /// </summary>
+        public int assetCookie { get { return IGetField<int>("assetCookie"); } set { ISetField("assetCookie", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#changingConfigurations"/>
+        /// </summary>
+        public int changingConfigurations { get { return IGetField<int>("changingConfigurations"); } set { ISetField("changingConfigurations", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#data"/>
+        /// </summary>
+        public int data { get { return IGetField<int>("data"); } set { ISetField("data", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#density"/>
+        /// </summary>
+        public int density { get { return IGetField<int>("density"); } set { ISetField("density", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#resourceId"/>
+        /// </summary>
+        public int resourceId { get { return IGetField<int>("resourceId"); } set { ISetField("resourceId", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#sourceResourceId"/>
+        /// </summary>
+        public int sourceResourceId { get { return IGetField<int>("sourceResourceId"); } set { ISetField("sourceResourceId", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#type"/>
+        /// </summary>
+        public int type { get { return IGetField<int>("type"); } set { ISetField("type", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#string"/>
+        /// </summary>
+        public Java.Lang.CharSequence stringField { get { return IGetField<Java.Lang.CharSequence>("string"); } set { ISetField("string", value); } }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_MANTISSA_MASK"/>
+        /// </summary>
+        public static int COMPLEX_MANTISSA_MASK { get { if (!_COMPLEX_MANTISSA_MASKReady) { _COMPLEX_MANTISSA_MASKContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_MANTISSA_MASK"); _COMPLEX_MANTISSA_MASKReady = true; } return _COMPLEX_MANTISSA_MASKContent; } }
+        private static int _COMPLEX_MANTISSA_MASKContent = default;
+        private static bool _COMPLEX_MANTISSA_MASKReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_MANTISSA_SHIFT"/>
+        /// </summary>
+        public static int COMPLEX_MANTISSA_SHIFT { get { if (!_COMPLEX_MANTISSA_SHIFTReady) { _COMPLEX_MANTISSA_SHIFTContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_MANTISSA_SHIFT"); _COMPLEX_MANTISSA_SHIFTReady = true; } return _COMPLEX_MANTISSA_SHIFTContent; } }
+        private static int _COMPLEX_MANTISSA_SHIFTContent = default;
+        private static bool _COMPLEX_MANTISSA_SHIFTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_RADIX_0p23"/>
+        /// </summary>
+        public static int COMPLEX_RADIX_0p23 { get { if (!_COMPLEX_RADIX_0p23Ready) { _COMPLEX_RADIX_0p23Content = SGetField<int>(LocalBridgeClazz, "COMPLEX_RADIX_0p23"); _COMPLEX_RADIX_0p23Ready = true; } return _COMPLEX_RADIX_0p23Content; } }
+        private static int _COMPLEX_RADIX_0p23Content = default;
+        private static bool _COMPLEX_RADIX_0p23Ready = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_RADIX_16p7"/>
+        /// </summary>
+        public static int COMPLEX_RADIX_16p7 { get { if (!_COMPLEX_RADIX_16p7Ready) { _COMPLEX_RADIX_16p7Content = SGetField<int>(LocalBridgeClazz, "COMPLEX_RADIX_16p7"); _COMPLEX_RADIX_16p7Ready = true; } return _COMPLEX_RADIX_16p7Content; } }
+        private static int _COMPLEX_RADIX_16p7Content = default;
+        private static bool _COMPLEX_RADIX_16p7Ready = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_RADIX_23p0"/>
+        /// </summary>
+        public static int COMPLEX_RADIX_23p0 { get { if (!_COMPLEX_RADIX_23p0Ready) { _COMPLEX_RADIX_23p0Content = SGetField<int>(LocalBridgeClazz, "COMPLEX_RADIX_23p0"); _COMPLEX_RADIX_23p0Ready = true; } return _COMPLEX_RADIX_23p0Content; } }
+        private static int _COMPLEX_RADIX_23p0Content = default;
+        private static bool _COMPLEX_RADIX_23p0Ready = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_RADIX_8p15"/>
+        /// </summary>
+        public static int COMPLEX_RADIX_8p15 { get { if (!_COMPLEX_RADIX_8p15Ready) { _COMPLEX_RADIX_8p15Content = SGetField<int>(LocalBridgeClazz, "COMPLEX_RADIX_8p15"); _COMPLEX_RADIX_8p15Ready = true; } return _COMPLEX_RADIX_8p15Content; } }
+        private static int _COMPLEX_RADIX_8p15Content = default;
+        private static bool _COMPLEX_RADIX_8p15Ready = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_RADIX_MASK"/>
+        /// </summary>
+        public static int COMPLEX_RADIX_MASK { get { if (!_COMPLEX_RADIX_MASKReady) { _COMPLEX_RADIX_MASKContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_RADIX_MASK"); _COMPLEX_RADIX_MASKReady = true; } return _COMPLEX_RADIX_MASKContent; } }
+        private static int _COMPLEX_RADIX_MASKContent = default;
+        private static bool _COMPLEX_RADIX_MASKReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_RADIX_SHIFT"/>
+        /// </summary>
+        public static int COMPLEX_RADIX_SHIFT { get { if (!_COMPLEX_RADIX_SHIFTReady) { _COMPLEX_RADIX_SHIFTContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_RADIX_SHIFT"); _COMPLEX_RADIX_SHIFTReady = true; } return _COMPLEX_RADIX_SHIFTContent; } }
+        private static int _COMPLEX_RADIX_SHIFTContent = default;
+        private static bool _COMPLEX_RADIX_SHIFTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_DIP"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_DIP { get { if (!_COMPLEX_UNIT_DIPReady) { _COMPLEX_UNIT_DIPContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_DIP"); _COMPLEX_UNIT_DIPReady = true; } return _COMPLEX_UNIT_DIPContent; } }
+        private static int _COMPLEX_UNIT_DIPContent = default;
+        private static bool _COMPLEX_UNIT_DIPReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_FRACTION"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_FRACTION { get { if (!_COMPLEX_UNIT_FRACTIONReady) { _COMPLEX_UNIT_FRACTIONContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_FRACTION"); _COMPLEX_UNIT_FRACTIONReady = true; } return _COMPLEX_UNIT_FRACTIONContent; } }
+        private static int _COMPLEX_UNIT_FRACTIONContent = default;
+        private static bool _COMPLEX_UNIT_FRACTIONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_FRACTION_PARENT"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_FRACTION_PARENT { get { if (!_COMPLEX_UNIT_FRACTION_PARENTReady) { _COMPLEX_UNIT_FRACTION_PARENTContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_FRACTION_PARENT"); _COMPLEX_UNIT_FRACTION_PARENTReady = true; } return _COMPLEX_UNIT_FRACTION_PARENTContent; } }
+        private static int _COMPLEX_UNIT_FRACTION_PARENTContent = default;
+        private static bool _COMPLEX_UNIT_FRACTION_PARENTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_IN"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_IN { get { if (!_COMPLEX_UNIT_INReady) { _COMPLEX_UNIT_INContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_IN"); _COMPLEX_UNIT_INReady = true; } return _COMPLEX_UNIT_INContent; } }
+        private static int _COMPLEX_UNIT_INContent = default;
+        private static bool _COMPLEX_UNIT_INReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_MASK"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_MASK { get { if (!_COMPLEX_UNIT_MASKReady) { _COMPLEX_UNIT_MASKContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_MASK"); _COMPLEX_UNIT_MASKReady = true; } return _COMPLEX_UNIT_MASKContent; } }
+        private static int _COMPLEX_UNIT_MASKContent = default;
+        private static bool _COMPLEX_UNIT_MASKReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_MM"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_MM { get { if (!_COMPLEX_UNIT_MMReady) { _COMPLEX_UNIT_MMContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_MM"); _COMPLEX_UNIT_MMReady = true; } return _COMPLEX_UNIT_MMContent; } }
+        private static int _COMPLEX_UNIT_MMContent = default;
+        private static bool _COMPLEX_UNIT_MMReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_PT"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_PT { get { if (!_COMPLEX_UNIT_PTReady) { _COMPLEX_UNIT_PTContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_PT"); _COMPLEX_UNIT_PTReady = true; } return _COMPLEX_UNIT_PTContent; } }
+        private static int _COMPLEX_UNIT_PTContent = default;
+        private static bool _COMPLEX_UNIT_PTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_PX"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_PX { get { if (!_COMPLEX_UNIT_PXReady) { _COMPLEX_UNIT_PXContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_PX"); _COMPLEX_UNIT_PXReady = true; } return _COMPLEX_UNIT_PXContent; } }
+        private static int _COMPLEX_UNIT_PXContent = default;
+        private static bool _COMPLEX_UNIT_PXReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_SHIFT"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_SHIFT { get { if (!_COMPLEX_UNIT_SHIFTReady) { _COMPLEX_UNIT_SHIFTContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_SHIFT"); _COMPLEX_UNIT_SHIFTReady = true; } return _COMPLEX_UNIT_SHIFTContent; } }
+        private static int _COMPLEX_UNIT_SHIFTContent = default;
+        private static bool _COMPLEX_UNIT_SHIFTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#COMPLEX_UNIT_SP"/>
+        /// </summary>
+        public static int COMPLEX_UNIT_SP { get { if (!_COMPLEX_UNIT_SPReady) { _COMPLEX_UNIT_SPContent = SGetField<int>(LocalBridgeClazz, "COMPLEX_UNIT_SP"); _COMPLEX_UNIT_SPReady = true; } return _COMPLEX_UNIT_SPContent; } }
+        private static int _COMPLEX_UNIT_SPContent = default;
+        private static bool _COMPLEX_UNIT_SPReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#DATA_NULL_EMPTY"/>
+        /// </summary>
+        public static int DATA_NULL_EMPTY { get { if (!_DATA_NULL_EMPTYReady) { _DATA_NULL_EMPTYContent = SGetField<int>(LocalBridgeClazz, "DATA_NULL_EMPTY"); _DATA_NULL_EMPTYReady = true; } return _DATA_NULL_EMPTYContent; } }
+        private static int _DATA_NULL_EMPTYContent = default;
+        private static bool _DATA_NULL_EMPTYReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#DATA_NULL_UNDEFINED"/>
+        /// </summary>
+        public static int DATA_NULL_UNDEFINED { get { if (!_DATA_NULL_UNDEFINEDReady) { _DATA_NULL_UNDEFINEDContent = SGetField<int>(LocalBridgeClazz, "DATA_NULL_UNDEFINED"); _DATA_NULL_UNDEFINEDReady = true; } return _DATA_NULL_UNDEFINEDContent; } }
+        private static int _DATA_NULL_UNDEFINEDContent = default;
+        private static bool _DATA_NULL_UNDEFINEDReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#DENSITY_DEFAULT"/>
+        /// </summary>
+        public static int DENSITY_DEFAULT { get { if (!_DENSITY_DEFAULTReady) { _DENSITY_DEFAULTContent = SGetField<int>(LocalBridgeClazz, "DENSITY_DEFAULT"); _DENSITY_DEFAULTReady = true; } return _DENSITY_DEFAULTContent; } }
+        private static int _DENSITY_DEFAULTContent = default;
+        private static bool _DENSITY_DEFAULTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#DENSITY_NONE"/>
+        /// </summary>
+        public static int DENSITY_NONE { get { if (!_DENSITY_NONEReady) { _DENSITY_NONEContent = SGetField<int>(LocalBridgeClazz, "DENSITY_NONE"); _DENSITY_NONEReady = true; } return _DENSITY_NONEContent; } }
+        private static int _DENSITY_NONEContent = default;
+        private static bool _DENSITY_NONEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_ATTRIBUTE"/>
+        /// </summary>
+        public static int TYPE_ATTRIBUTE { get { if (!_TYPE_ATTRIBUTEReady) { _TYPE_ATTRIBUTEContent = SGetField<int>(LocalBridgeClazz, "TYPE_ATTRIBUTE"); _TYPE_ATTRIBUTEReady = true; } return _TYPE_ATTRIBUTEContent; } }
+        private static int _TYPE_ATTRIBUTEContent = default;
+        private static bool _TYPE_ATTRIBUTEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_DIMENSION"/>
+        /// </summary>
+        public static int TYPE_DIMENSION { get { if (!_TYPE_DIMENSIONReady) { _TYPE_DIMENSIONContent = SGetField<int>(LocalBridgeClazz, "TYPE_DIMENSION"); _TYPE_DIMENSIONReady = true; } return _TYPE_DIMENSIONContent; } }
+        private static int _TYPE_DIMENSIONContent = default;
+        private static bool _TYPE_DIMENSIONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_FIRST_COLOR_INT"/>
+        /// </summary>
+        public static int TYPE_FIRST_COLOR_INT { get { if (!_TYPE_FIRST_COLOR_INTReady) { _TYPE_FIRST_COLOR_INTContent = SGetField<int>(LocalBridgeClazz, "TYPE_FIRST_COLOR_INT"); _TYPE_FIRST_COLOR_INTReady = true; } return _TYPE_FIRST_COLOR_INTContent; } }
+        private static int _TYPE_FIRST_COLOR_INTContent = default;
+        private static bool _TYPE_FIRST_COLOR_INTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_FIRST_INT"/>
+        /// </summary>
+        public static int TYPE_FIRST_INT { get { if (!_TYPE_FIRST_INTReady) { _TYPE_FIRST_INTContent = SGetField<int>(LocalBridgeClazz, "TYPE_FIRST_INT"); _TYPE_FIRST_INTReady = true; } return _TYPE_FIRST_INTContent; } }
+        private static int _TYPE_FIRST_INTContent = default;
+        private static bool _TYPE_FIRST_INTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_FLOAT"/>
+        /// </summary>
+        public static int TYPE_FLOAT { get { if (!_TYPE_FLOATReady) { _TYPE_FLOATContent = SGetField<int>(LocalBridgeClazz, "TYPE_FLOAT"); _TYPE_FLOATReady = true; } return _TYPE_FLOATContent; } }
+        private static int _TYPE_FLOATContent = default;
+        private static bool _TYPE_FLOATReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_FRACTION"/>
+        /// </summary>
+        public static int TYPE_FRACTION { get { if (!_TYPE_FRACTIONReady) { _TYPE_FRACTIONContent = SGetField<int>(LocalBridgeClazz, "TYPE_FRACTION"); _TYPE_FRACTIONReady = true; } return _TYPE_FRACTIONContent; } }
+        private static int _TYPE_FRACTIONContent = default;
+        private static bool _TYPE_FRACTIONReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_INT_BOOLEAN"/>
+        /// </summary>
+        public static int TYPE_INT_BOOLEAN { get { if (!_TYPE_INT_BOOLEANReady) { _TYPE_INT_BOOLEANContent = SGetField<int>(LocalBridgeClazz, "TYPE_INT_BOOLEAN"); _TYPE_INT_BOOLEANReady = true; } return _TYPE_INT_BOOLEANContent; } }
+        private static int _TYPE_INT_BOOLEANContent = default;
+        private static bool _TYPE_INT_BOOLEANReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_INT_COLOR_ARGB4"/>
+        /// </summary>
+        public static int TYPE_INT_COLOR_ARGB4 { get { if (!_TYPE_INT_COLOR_ARGB4Ready) { _TYPE_INT_COLOR_ARGB4Content = SGetField<int>(LocalBridgeClazz, "TYPE_INT_COLOR_ARGB4"); _TYPE_INT_COLOR_ARGB4Ready = true; } return _TYPE_INT_COLOR_ARGB4Content; } }
+        private static int _TYPE_INT_COLOR_ARGB4Content = default;
+        private static bool _TYPE_INT_COLOR_ARGB4Ready = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_INT_COLOR_ARGB8"/>
+        /// </summary>
+        public static int TYPE_INT_COLOR_ARGB8 { get { if (!_TYPE_INT_COLOR_ARGB8Ready) { _TYPE_INT_COLOR_ARGB8Content = SGetField<int>(LocalBridgeClazz, "TYPE_INT_COLOR_ARGB8"); _TYPE_INT_COLOR_ARGB8Ready = true; } return _TYPE_INT_COLOR_ARGB8Content; } }
+        private static int _TYPE_INT_COLOR_ARGB8Content = default;
+        private static bool _TYPE_INT_COLOR_ARGB8Ready = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_INT_COLOR_RGB4"/>
+        /// </summary>
+        public static int TYPE_INT_COLOR_RGB4 { get { if (!_TYPE_INT_COLOR_RGB4Ready) { _TYPE_INT_COLOR_RGB4Content = SGetField<int>(LocalBridgeClazz, "TYPE_INT_COLOR_RGB4"); _TYPE_INT_COLOR_RGB4Ready = true; } return _TYPE_INT_COLOR_RGB4Content; } }
+        private static int _TYPE_INT_COLOR_RGB4Content = default;
+        private static bool _TYPE_INT_COLOR_RGB4Ready = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_INT_COLOR_RGB8"/>
+        /// </summary>
+        public static int TYPE_INT_COLOR_RGB8 { get { if (!_TYPE_INT_COLOR_RGB8Ready) { _TYPE_INT_COLOR_RGB8Content = SGetField<int>(LocalBridgeClazz, "TYPE_INT_COLOR_RGB8"); _TYPE_INT_COLOR_RGB8Ready = true; } return _TYPE_INT_COLOR_RGB8Content; } }
+        private static int _TYPE_INT_COLOR_RGB8Content = default;
+        private static bool _TYPE_INT_COLOR_RGB8Ready = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_INT_DEC"/>
+        /// </summary>
+        public static int TYPE_INT_DEC { get { if (!_TYPE_INT_DECReady) { _TYPE_INT_DECContent = SGetField<int>(LocalBridgeClazz, "TYPE_INT_DEC"); _TYPE_INT_DECReady = true; } return _TYPE_INT_DECContent; } }
+        private static int _TYPE_INT_DECContent = default;
+        private static bool _TYPE_INT_DECReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_INT_HEX"/>
+        /// </summary>
+        public static int TYPE_INT_HEX { get { if (!_TYPE_INT_HEXReady) { _TYPE_INT_HEXContent = SGetField<int>(LocalBridgeClazz, "TYPE_INT_HEX"); _TYPE_INT_HEXReady = true; } return _TYPE_INT_HEXContent; } }
+        private static int _TYPE_INT_HEXContent = default;
+        private static bool _TYPE_INT_HEXReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_LAST_COLOR_INT"/>
+        /// </summary>
+        public static int TYPE_LAST_COLOR_INT { get { if (!_TYPE_LAST_COLOR_INTReady) { _TYPE_LAST_COLOR_INTContent = SGetField<int>(LocalBridgeClazz, "TYPE_LAST_COLOR_INT"); _TYPE_LAST_COLOR_INTReady = true; } return _TYPE_LAST_COLOR_INTContent; } }
+        private static int _TYPE_LAST_COLOR_INTContent = default;
+        private static bool _TYPE_LAST_COLOR_INTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_LAST_INT"/>
+        /// </summary>
+        public static int TYPE_LAST_INT { get { if (!_TYPE_LAST_INTReady) { _TYPE_LAST_INTContent = SGetField<int>(LocalBridgeClazz, "TYPE_LAST_INT"); _TYPE_LAST_INTReady = true; } return _TYPE_LAST_INTContent; } }
+        private static int _TYPE_LAST_INTContent = default;
+        private static bool _TYPE_LAST_INTReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_NULL"/>
+        /// </summary>
+        public static int TYPE_NULL { get { if (!_TYPE_NULLReady) { _TYPE_NULLContent = SGetField<int>(LocalBridgeClazz, "TYPE_NULL"); _TYPE_NULLReady = true; } return _TYPE_NULLContent; } }
+        private static int _TYPE_NULLContent = default;
+        private static bool _TYPE_NULLReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_REFERENCE"/>
+        /// </summary>
+        public static int TYPE_REFERENCE { get { if (!_TYPE_REFERENCEReady) { _TYPE_REFERENCEContent = SGetField<int>(LocalBridgeClazz, "TYPE_REFERENCE"); _TYPE_REFERENCEReady = true; } return _TYPE_REFERENCEContent; } }
+        private static int _TYPE_REFERENCEContent = default;
+        private static bool _TYPE_REFERENCEReady = false; // this is used because in case of generics 
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#TYPE_STRING"/>
+        /// </summary>
+        public static int TYPE_STRING { get { if (!_TYPE_STRINGReady) { _TYPE_STRINGContent = SGetField<int>(LocalBridgeClazz, "TYPE_STRING"); _TYPE_STRINGReady = true; } return _TYPE_STRINGContent; } }
+        private static int _TYPE_STRINGContent = default;
+        private static bool _TYPE_STRINGReady = false; // this is used because in case of generics 
+
+        #endregion
+
+        #region Static methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#coerceToString(int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String CoerceToString(int arg0, int arg1)
+        {
+            return SExecute<Java.Lang.String>(LocalBridgeClazz, "coerceToString", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#applyDimension(int,float,android.util.DisplayMetrics)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <param name="arg2"><see cref="Android.Util.DisplayMetrics"/></param>
+        /// <returns><see cref="float"/></returns>
+        public static float ApplyDimension(int arg0, float arg1, Android.Util.DisplayMetrics arg2)
+        {
+            return SExecute<float>(LocalBridgeClazz, "applyDimension", arg0, arg1, arg2);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#complexToDimension(int,android.util.DisplayMetrics)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Util.DisplayMetrics"/></param>
+        /// <returns><see cref="float"/></returns>
+        public static float ComplexToDimension(int arg0, Android.Util.DisplayMetrics arg1)
+        {
+            return SExecute<float>(LocalBridgeClazz, "complexToDimension", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#complexToFloat(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="float"/></returns>
+        public static float ComplexToFloat(int arg0)
+        {
+            return SExecuteWithSignature<float>(LocalBridgeClazz, "complexToFloat", "(I)F", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#complexToFraction(int,float,float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <param name="arg2"><see cref="float"/></param>
+        /// <returns><see cref="float"/></returns>
+        public static float ComplexToFraction(int arg0, float arg1, float arg2)
+        {
+            return SExecute<float>(LocalBridgeClazz, "complexToFraction", arg0, arg1, arg2);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#convertDimensionToPixels(int,float,android.util.DisplayMetrics)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <param name="arg2"><see cref="Android.Util.DisplayMetrics"/></param>
+        /// <returns><see cref="float"/></returns>
+        public static float ConvertDimensionToPixels(int arg0, float arg1, Android.Util.DisplayMetrics arg2)
+        {
+            return SExecute<float>(LocalBridgeClazz, "convertDimensionToPixels", arg0, arg1, arg2);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#convertPixelsToDimension(int,float,android.util.DisplayMetrics)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <param name="arg2"><see cref="Android.Util.DisplayMetrics"/></param>
+        /// <returns><see cref="float"/></returns>
+        public static float ConvertPixelsToDimension(int arg0, float arg1, Android.Util.DisplayMetrics arg2)
+        {
+            return SExecute<float>(LocalBridgeClazz, "convertPixelsToDimension", arg0, arg1, arg2);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#deriveDimension(int,float,android.util.DisplayMetrics)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <param name="arg2"><see cref="Android.Util.DisplayMetrics"/></param>
+        /// <returns><see cref="float"/></returns>
+        public static float DeriveDimension(int arg0, float arg1, Android.Util.DisplayMetrics arg2)
+        {
+            return SExecute<float>(LocalBridgeClazz, "deriveDimension", arg0, arg1, arg2);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#complexToDimensionPixelOffset(int,android.util.DisplayMetrics)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Util.DisplayMetrics"/></param>
+        /// <returns><see cref="int"/></returns>
+        public static int ComplexToDimensionPixelOffset(int arg0, Android.Util.DisplayMetrics arg1)
+        {
+            return SExecute<int>(LocalBridgeClazz, "complexToDimensionPixelOffset", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#complexToDimensionPixelSize(int,android.util.DisplayMetrics)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Util.DisplayMetrics"/></param>
+        /// <returns><see cref="int"/></returns>
+        public static int ComplexToDimensionPixelSize(int arg0, Android.Util.DisplayMetrics arg1)
+        {
+            return SExecute<int>(LocalBridgeClazz, "complexToDimensionPixelSize", arg0, arg1);
+        }
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#isColorType()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsColorType()
+        {
+            return IExecuteWithSignature<bool>("isColorType", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#getFloat()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetFloat()
+        {
+            return IExecuteWithSignature<float>("getFloat", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#coerceToString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence CoerceToString()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("coerceToString", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#getDimension(android.util.DisplayMetrics)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Util.DisplayMetrics"/></param>
+        /// <returns><see cref="float"/></returns>
+        public float GetDimension(Android.Util.DisplayMetrics arg0)
+        {
+            return IExecuteWithSignature<float>("getDimension", "(Landroid/util/DisplayMetrics;)F", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#getFraction(float,float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <returns><see cref="float"/></returns>
+        public float GetFraction(float arg0, float arg1)
+        {
+            return IExecute<float>("getFraction", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#getComplexUnit()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetComplexUnit()
+        {
+            return IExecuteWithSignature<int>("getComplexUnit", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/util/TypedValue.html#setTo(android.util.TypedValue)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Util.TypedValue"/></param>
+        public void SetTo(Android.Util.TypedValue arg0)
+        {
+            IExecuteWithSignature("setTo", "(Landroid/util/TypedValue;)V", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Android/View/AbsSavedState.cs b/src/net/Netdroid/Generated/Android/View/AbsSavedState.cs
index f2a8a83fe..e0ff39c21 100644
--- a/src/net/Netdroid/Generated/Android/View/AbsSavedState.cs
+++ b/src/net/Netdroid/Generated/Android/View/AbsSavedState.cs
@@ -58,11 +58,12 @@ public partial class AbsSavedState
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/AbsSavedState.html#getSuperState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/AbsSavedState.html#getSuperState()"/>
         /// </summary>
-        public Android.Os.Parcelable SuperState
+        /// <returns><see cref="Android.Os.Parcelable"/></returns>
+        public Android.Os.Parcelable GetSuperState()
         {
-            get { return IExecuteWithSignature<Android.Os.Parcelable>("getSuperState", "()Landroid/os/Parcelable;"); }
+            return IExecuteWithSignature<Android.Os.Parcelable>("getSuperState", "()Landroid/os/Parcelable;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/AbsSavedState.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityEvent.cs b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityEvent.cs
index d9efa6a67..ef2a5b77e 100644
--- a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityEvent.cs
@@ -156,7 +156,7 @@ public AccessibilityEvent(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#MAX_TEXT_LENGTH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MAX_TEXT_LENGTH { get { if (!_MAX_TEXT_LENGTHReady) { _MAX_TEXT_LENGTHContent = SGetField<int>(LocalBridgeClazz, "MAX_TEXT_LENGTH"); _MAX_TEXT_LENGTHReady = true; } return _MAX_TEXT_LENGTHContent; } }
         private static int _MAX_TEXT_LENGTHContent = default;
         private static bool _MAX_TEXT_LENGTHReady = false; // this is used because in case of generics 
@@ -427,7 +427,7 @@ public AccessibilityEvent(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityEvent"/></param>
         /// <returns><see cref="Android.View.Accessibility.AccessibilityEvent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.Accessibility.AccessibilityEvent Obtain(Android.View.Accessibility.AccessibilityEvent arg0)
         {
             return SExecuteWithSignature<Android.View.Accessibility.AccessibilityEvent>(LocalBridgeClazz, "obtain", "(Landroid/view/accessibility/AccessibilityEvent;)Landroid/view/accessibility/AccessibilityEvent;", arg0);
@@ -437,7 +437,7 @@ public static Android.View.Accessibility.AccessibilityEvent Obtain(Android.View.
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.View.Accessibility.AccessibilityEvent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.Accessibility.AccessibilityEvent Obtain(int arg0)
         {
             return SExecuteWithSignature<Android.View.Accessibility.AccessibilityEvent>(LocalBridgeClazz, "obtain", "(I)Landroid/view/accessibility/AccessibilityEvent;", arg0);
@@ -456,92 +456,101 @@ public static Java.Lang.String EventTypeToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getAction()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setAction(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getRecord(int)"/>
         /// </summary>
-        public int Action
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityRecord"/></returns>
+        public Android.View.Accessibility.AccessibilityRecord GetRecord(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getAction", "()I"); } set { IExecuteWithSignature("setAction", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityRecord>("getRecord", "(I)Landroid/view/accessibility/AccessibilityRecord;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getContentChangeTypes()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setContentChangeTypes(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#isAccessibilityDataSensitive()"/>
         /// </summary>
-        public int ContentChangeTypes
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAccessibilityDataSensitive()
         {
-            get { return IExecuteWithSignature<int>("getContentChangeTypes", "()I"); } set { IExecuteWithSignature("setContentChangeTypes", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isAccessibilityDataSensitive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getEventTime()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setEventTime(long)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#describeContents()"/>
         /// </summary>
-        public long EventTime
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getEventTime", "()J"); } set { IExecuteWithSignature("setEventTime", "(J)V", value); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getEventType()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setEventType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getAction()"/>
         /// </summary>
-        public int EventType
+        /// <returns><see cref="int"/></returns>
+        public int GetAction()
         {
-            get { return IExecuteWithSignature<int>("getEventType", "()I"); } set { IExecuteWithSignature("setEventType", "(I)V", value); }
+            return IExecuteWithSignature<int>("getAction", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getMovementGranularity()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setMovementGranularity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getContentChangeTypes()"/>
         /// </summary>
-        public int MovementGranularity
+        /// <returns><see cref="int"/></returns>
+        public int GetContentChangeTypes()
         {
-            get { return IExecuteWithSignature<int>("getMovementGranularity", "()I"); } set { IExecuteWithSignature("setMovementGranularity", "(I)V", value); }
+            return IExecuteWithSignature<int>("getContentChangeTypes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getPackageName()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setPackageName(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getEventType()"/>
         /// </summary>
-        public Java.Lang.CharSequence PackageName
+        /// <returns><see cref="int"/></returns>
+        public int GetEventType()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getPackageName", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setPackageName", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<int>("getEventType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getRecordCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getMovementGranularity()"/>
         /// </summary>
-        public int RecordCount
+        /// <returns><see cref="int"/></returns>
+        public int GetMovementGranularity()
         {
-            get { return IExecuteWithSignature<int>("getRecordCount", "()I"); }
+            return IExecuteWithSignature<int>("getMovementGranularity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getSpeechStateChangeTypes()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setSpeechStateChangeTypes(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getRecordCount()"/>
         /// </summary>
-        public int SpeechStateChangeTypes
+        /// <returns><see cref="int"/></returns>
+        public int GetRecordCount()
         {
-            get { return IExecuteWithSignature<int>("getSpeechStateChangeTypes", "()I"); } set { IExecuteWithSignature("setSpeechStateChangeTypes", "(I)V", value); }
+            return IExecuteWithSignature<int>("getRecordCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getWindowChanges()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getSpeechStateChangeTypes()"/>
         /// </summary>
-        public int WindowChanges
+        /// <returns><see cref="int"/></returns>
+        public int GetSpeechStateChangeTypes()
         {
-            get { return IExecuteWithSignature<int>("getWindowChanges", "()I"); }
+            return IExecuteWithSignature<int>("getSpeechStateChangeTypes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getRecord(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getWindowChanges()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityRecord"/></returns>
-        public Android.View.Accessibility.AccessibilityRecord GetRecord(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetWindowChanges()
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityRecord>("getRecord", "(I)Landroid/view/accessibility/AccessibilityRecord;", arg0);
+            return IExecuteWithSignature<int>("getWindowChanges", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#isAccessibilityDataSensitive()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getPackageName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAccessibilityDataSensitive()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetPackageName()
         {
-            return IExecuteWithSignature<bool>("isAccessibilityDataSensitive", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getPackageName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#getEventTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetEventTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getEventTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#appendRecord(android.view.accessibility.AccessibilityRecord)"/>
@@ -568,6 +577,62 @@ public void SetAccessibilityDataSensitive(bool arg0)
             IExecuteWithSignature("setAccessibilityDataSensitive", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setAction(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAction(int arg0)
+        {
+            IExecuteWithSignature("setAction", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setContentChangeTypes(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetContentChangeTypes(int arg0)
+        {
+            IExecuteWithSignature("setContentChangeTypes", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setEventTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetEventTime(long arg0)
+        {
+            IExecuteWithSignature("setEventTime", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setEventType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetEventType(int arg0)
+        {
+            IExecuteWithSignature("setEventType", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setMovementGranularity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMovementGranularity(int arg0)
+        {
+            IExecuteWithSignature("setMovementGranularity", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setPackageName(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetPackageName(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setPackageName", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#setSpeechStateChangeTypes(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSpeechStateChangeTypes(int arg0)
+        {
+            IExecuteWithSignature("setSpeechStateChangeTypes", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityManager.cs b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityManager.cs
index a0ddd593f..6586ec8cf 100644
--- a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityManager.cs
@@ -72,35 +72,6 @@ public static bool IsAccessibilityButtonSupported()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getAccessibilityFocusColor()"/> 
-        /// </summary>
-        public int AccessibilityFocusColor
-        {
-            get { return IExecuteWithSignature<int>("getAccessibilityFocusColor", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getAccessibilityFocusStrokeWidth()"/> 
-        /// </summary>
-        public int AccessibilityFocusStrokeWidth
-        {
-            get { return IExecuteWithSignature<int>("getAccessibilityFocusStrokeWidth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getAccessibilityServiceList()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Util.List<Android.Content.Pm.ServiceInfo> AccessibilityServiceList
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.ServiceInfo>>("getAccessibilityServiceList", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getInstalledAccessibilityServiceList()"/> 
-        /// </summary>
-        public Java.Util.List<Android.Accessibilityservice.AccessibilityServiceInfo> InstalledAccessibilityServiceList
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Accessibilityservice.AccessibilityServiceInfo>>("getInstalledAccessibilityServiceList", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#addAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityManager.AccessibilityStateChangeListener"/></param>
@@ -187,6 +158,22 @@ public bool RemoveTouchExplorationStateChangeListener(Android.View.Accessibility
             return IExecuteWithSignature<bool>("removeTouchExplorationStateChangeListener", "(Landroid/view/accessibility/AccessibilityManager$TouchExplorationStateChangeListener;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getAccessibilityFocusColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAccessibilityFocusColor()
+        {
+            return IExecuteWithSignature<int>("getAccessibilityFocusColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getAccessibilityFocusStrokeWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAccessibilityFocusStrokeWidth()
+        {
+            return IExecuteWithSignature<int>("getAccessibilityFocusStrokeWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getRecommendedTimeoutMillis(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -206,6 +193,23 @@ public int GetRecommendedTimeoutMillis(int arg0, int arg1)
             return IExecuteWithSignature<Java.Util.List<Android.Accessibilityservice.AccessibilityServiceInfo>>("getEnabledAccessibilityServiceList", "(I)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getInstalledAccessibilityServiceList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Accessibilityservice.AccessibilityServiceInfo> GetInstalledAccessibilityServiceList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Accessibilityservice.AccessibilityServiceInfo>>("getInstalledAccessibilityServiceList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#getAccessibilityServiceList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        [global::System.Obsolete()]
+        public Java.Util.List<Android.Content.Pm.ServiceInfo> GetAccessibilityServiceList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Content.Pm.ServiceInfo>>("getAccessibilityServiceList", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.html#addAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityRequestPreparer"/></param>
@@ -309,7 +313,7 @@ public partial class AccessibilityServicesStateChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAccessibilityServicesStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Accessibility.AccessibilityManager>>>(OnAccessibilityServicesStateChangedEventHandler));
+                AddEventHandler("onAccessibilityServicesStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Accessibility.AccessibilityManager>>>(OnAccessibilityServicesStateChangedEventHandler));
 
             }
 
@@ -317,7 +321,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.AccessibilityServicesStateChangeListener.html#onAccessibilityServicesStateChanged(android.view.accessibility.AccessibilityManager)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAccessibilityServicesStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Accessibility.AccessibilityManager> OnOnAccessibilityServicesStateChanged { get; set; } = null;
+            public global::System.Action<Android.View.Accessibility.AccessibilityManager> OnOnAccessibilityServicesStateChanged { get; set; } = null;
 
             void OnAccessibilityServicesStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Accessibility.AccessibilityManager>> data)
             {
@@ -408,7 +412,7 @@ public partial class AccessibilityStateChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAccessibilityStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnAccessibilityStateChangedEventHandler));
+                AddEventHandler("onAccessibilityStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnAccessibilityStateChangedEventHandler));
 
             }
 
@@ -416,7 +420,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.AccessibilityStateChangeListener.html#onAccessibilityStateChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAccessibilityStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnAccessibilityStateChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnAccessibilityStateChanged { get; set; } = null;
 
             void OnAccessibilityStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -507,7 +511,7 @@ public partial class AudioDescriptionRequestedChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAudioDescriptionRequestedChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnAudioDescriptionRequestedChangedEventHandler));
+                AddEventHandler("onAudioDescriptionRequestedChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnAudioDescriptionRequestedChangedEventHandler));
 
             }
 
@@ -515,7 +519,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.AudioDescriptionRequestedChangeListener.html#onAudioDescriptionRequestedChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAudioDescriptionRequestedChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnAudioDescriptionRequestedChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnAudioDescriptionRequestedChanged { get; set; } = null;
 
             void OnAudioDescriptionRequestedChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -606,7 +610,7 @@ public partial class TouchExplorationStateChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTouchExplorationStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnTouchExplorationStateChangedEventHandler));
+                AddEventHandler("onTouchExplorationStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnTouchExplorationStateChangedEventHandler));
 
             }
 
@@ -614,7 +618,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityManager.TouchExplorationStateChangeListener.html#onTouchExplorationStateChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTouchExplorationStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnTouchExplorationStateChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnTouchExplorationStateChanged { get; set; } = null;
 
             void OnTouchExplorationStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityNodeInfo.cs b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityNodeInfo.cs
index b883479ee..445d602b3 100644
--- a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityNodeInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityNodeInfo.cs
@@ -400,7 +400,7 @@ public AccessibilityNodeInfo(Android.View.View arg0)
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#obtain()"/>
         /// </summary>
         /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.Accessibility.AccessibilityNodeInfo Obtain()
         {
             return SExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>(LocalBridgeClazz, "obtain", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
@@ -410,7 +410,7 @@ public static Android.View.Accessibility.AccessibilityNodeInfo Obtain()
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></param>
         /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.Accessibility.AccessibilityNodeInfo Obtain(Android.View.Accessibility.AccessibilityNodeInfo arg0)
         {
             return SExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>(LocalBridgeClazz, "obtain", "(Landroid/view/accessibility/AccessibilityNodeInfo;)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
@@ -421,7 +421,7 @@ public static Android.View.Accessibility.AccessibilityNodeInfo Obtain(Android.Vi
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.Accessibility.AccessibilityNodeInfo Obtain(Android.View.View arg0, int arg1)
         {
             return SExecute<Android.View.Accessibility.AccessibilityNodeInfo>(LocalBridgeClazz, "obtain", arg0, arg1);
@@ -431,7 +431,7 @@ public static Android.View.Accessibility.AccessibilityNodeInfo Obtain(Android.Vi
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.Accessibility.AccessibilityNodeInfo Obtain(Android.View.View arg0)
         {
             return SExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>(LocalBridgeClazz, "obtain", "(Landroid/view/View;)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
@@ -441,310 +441,146 @@ public static Android.View.Accessibility.AccessibilityNodeInfo Obtain(Android.Vi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getActionList()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getExtras()"/>
         /// </summary>
-        public Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction> ActionList
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction>>("getActionList", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getActions()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int Actions
-        {
-            get { return IExecuteWithSignature<int>("getActions", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getAvailableExtraData()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setAvailableExtraData(java.util.List)"/>
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> AvailableExtraData
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAvailableExtraData", "()Ljava/util/List;"); } set { IExecuteWithSignature("setAvailableExtraData", "(Ljava/util/List;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getChildCount()"/> 
-        /// </summary>
-        public int ChildCount
-        {
-            get { return IExecuteWithSignature<int>("getChildCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getClassName()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setClassName(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence ClassName
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getClassName", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setClassName", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getContainerTitle()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setContainerTitle(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence ContainerTitle
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContainerTitle", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setContainerTitle", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getContentDescription()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setContentDescription(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence ContentDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getDrawingOrder()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setDrawingOrder(int)"/>
-        /// </summary>
-        public int DrawingOrder
-        {
-            get { return IExecuteWithSignature<int>("getDrawingOrder", "()I"); } set { IExecuteWithSignature("setDrawingOrder", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getError()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setError(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence Error
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getError", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setError", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getExtras()"/> 
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getCollectionInfo()"/> 
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo GetCollectionInfo
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo>("getCollectionInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$CollectionInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getCollectionItemInfo()"/> 
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo GetCollectionItemInfo
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo>("getCollectionItemInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$CollectionItemInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getExtraRenderingInfo()"/> 
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo.ExtraRenderingInfo GetExtraRenderingInfo
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.ExtraRenderingInfo>("getExtraRenderingInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$ExtraRenderingInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getRangeInfo()"/> 
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo GetRangeInfo
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo>("getRangeInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$RangeInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTouchDelegateInfo()"/> 
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo GetTouchDelegateInfo
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo>("getTouchDelegateInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getHintText()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setHintText(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence HintText
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getHintText", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setHintText", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getInputType()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setInputType(int)"/>
-        /// </summary>
-        public int InputType
-        {
-            get { return IExecuteWithSignature<int>("getInputType", "()I"); } set { IExecuteWithSignature("setInputType", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getLabeledBy()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLabeledBy(android.view.View)"/>
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo LabeledBy
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getLabeledBy", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); } set { IExecuteWithSignature("setLabeledBy", "(Landroid/view/View;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getLabelFor()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLabelFor(android.view.View)"/>
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo LabelFor
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getLabelFor", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); } set { IExecuteWithSignature("setLabelFor", "(Landroid/view/View;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getLiveRegion()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLiveRegion(int)"/>
-        /// </summary>
-        public int LiveRegion
-        {
-            get { return IExecuteWithSignature<int>("getLiveRegion", "()I"); } set { IExecuteWithSignature("setLiveRegion", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getMaxTextLength()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setMaxTextLength(int)"/>
-        /// </summary>
-        public int MaxTextLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxTextLength", "()I"); } set { IExecuteWithSignature("setMaxTextLength", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getMinDurationBetweenContentChanges()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setMinDurationBetweenContentChanges(java.time.Duration)"/>
-        /// </summary>
-        public Java.Time.Duration MinDurationBetweenContentChanges
-        {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getMinDurationBetweenContentChanges", "()Ljava/time/Duration;"); } set { IExecuteWithSignature("setMinDurationBetweenContentChanges", "(Ljava/time/Duration;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getMovementGranularities()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setMovementGranularities(int)"/>
-        /// </summary>
-        public int MovementGranularities
-        {
-            get { return IExecuteWithSignature<int>("getMovementGranularities", "()I"); } set { IExecuteWithSignature("setMovementGranularities", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getPackageName()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setPackageName(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getPackageName", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setPackageName", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getPaneTitle()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setPaneTitle(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence PaneTitle
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getPaneTitle", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setPaneTitle", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getParent()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setParent(android.view.View)"/>
-        /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo Parent
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getParent", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); } set { IExecuteWithSignature("setParent", "(Landroid/view/View;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getStateDescription()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setStateDescription(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#findFocus(int)"/>
         /// </summary>
-        public Java.Lang.CharSequence StateDescription
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo FindFocus(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getStateDescription", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setStateDescription", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("findFocus", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getText()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setText(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#focusSearch(int)"/>
         /// </summary>
-        public Java.Lang.CharSequence Text
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo FocusSearch(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("focusSearch", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTextSelectionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getChild(int,int)"/>
         /// </summary>
-        public int TextSelectionEnd
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetChild(int arg0, int arg1)
         {
-            get { return IExecuteWithSignature<int>("getTextSelectionEnd", "()I"); }
+            return IExecute<Android.View.Accessibility.AccessibilityNodeInfo>("getChild", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTextSelectionStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getChild(int)"/>
         /// </summary>
-        public int TextSelectionStart
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetChild(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getTextSelectionStart", "()I"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getChild", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTooltipText()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTooltipText(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getLabeledBy()"/>
         /// </summary>
-        public Java.Lang.CharSequence TooltipText
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetLabeledBy()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTooltipText", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setTooltipText", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getLabeledBy", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTraversalAfter()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTraversalAfter(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getLabelFor()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo TraversalAfter
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetLabelFor()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getTraversalAfter", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); } set { IExecuteWithSignature("setTraversalAfter", "(Landroid/view/View;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getLabelFor", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTraversalBefore()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTraversalBefore(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getParent()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo TraversalBefore
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetParent()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getTraversalBefore", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); } set { IExecuteWithSignature("setTraversalBefore", "(Landroid/view/View;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getParent", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getUniqueId()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setUniqueId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getParent(int)"/>
         /// </summary>
-        public Java.Lang.String UniqueId
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetParent(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUniqueId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setUniqueId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getParent", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getViewIdResourceName()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setViewIdResourceName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTraversalAfter()"/>
         /// </summary>
-        public Java.Lang.String ViewIdResourceName
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetTraversalAfter()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getViewIdResourceName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setViewIdResourceName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getTraversalAfter", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTraversalBefore()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityWindowInfo Window
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetTraversalBefore()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityWindowInfo>("getWindow", "()Landroid/view/accessibility/AccessibilityWindowInfo;"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getTraversalBefore", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getWindowId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getCollectionInfo()"/>
         /// </summary>
-        public int WindowId
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo GetCollectionInfo()
         {
-            get { return IExecuteWithSignature<int>("getWindowId", "()I"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo>("getCollectionInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$CollectionInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#findFocus(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getCollectionItemInfo()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityNodeInfo FindFocus(int arg0)
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo GetCollectionItemInfo()
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("findFocus", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo>("getCollectionItemInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$CollectionItemInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#focusSearch(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getExtraRenderingInfo()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityNodeInfo FocusSearch(int arg0)
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.ExtraRenderingInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo.ExtraRenderingInfo GetExtraRenderingInfo()
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("focusSearch", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.ExtraRenderingInfo>("getExtraRenderingInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$ExtraRenderingInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getChild(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getRangeInfo()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityNodeInfo GetChild(int arg0, int arg1)
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo GetRangeInfo()
         {
-            return IExecute<Android.View.Accessibility.AccessibilityNodeInfo>("getChild", arg0, arg1);
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo>("getRangeInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$RangeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getChild(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTouchDelegateInfo()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityNodeInfo GetChild(int arg0)
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo GetTouchDelegateInfo()
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getChild", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo>("getTouchDelegateInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getParent(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getWindow()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityNodeInfo GetParent(int arg0)
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityWindowInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityWindowInfo GetWindow()
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getParent", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityWindowInfo>("getWindow", "()Landroid/view/accessibility/AccessibilityWindowInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#canOpenPopup()"/>
@@ -1028,6 +864,191 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getActions()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetActions()
+        {
+            return IExecuteWithSignature<int>("getActions", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getChildCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChildCount()
+        {
+            return IExecuteWithSignature<int>("getChildCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getDrawingOrder()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDrawingOrder()
+        {
+            return IExecuteWithSignature<int>("getDrawingOrder", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getInputType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInputType()
+        {
+            return IExecuteWithSignature<int>("getInputType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getLiveRegion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLiveRegion()
+        {
+            return IExecuteWithSignature<int>("getLiveRegion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getMaxTextLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxTextLength()
+        {
+            return IExecuteWithSignature<int>("getMaxTextLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getMovementGranularities()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMovementGranularities()
+        {
+            return IExecuteWithSignature<int>("getMovementGranularities", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTextSelectionEnd()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTextSelectionEnd()
+        {
+            return IExecuteWithSignature<int>("getTextSelectionEnd", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTextSelectionStart()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTextSelectionStart()
+        {
+            return IExecuteWithSignature<int>("getTextSelectionStart", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getWindowId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWindowId()
+        {
+            return IExecuteWithSignature<int>("getWindowId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getClassName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetClassName()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getClassName", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getContainerTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContainerTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContainerTitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getContentDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getError()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetError()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getError", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getHintText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetHintText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getHintText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getPackageName", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getPaneTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetPaneTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getPaneTitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getStateDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetStateDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getStateDescription", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getTooltipText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTooltipText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTooltipText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getUniqueId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUniqueId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUniqueId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getViewIdResourceName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetViewIdResourceName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getViewIdResourceName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getMinDurationBetweenContentChanges()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetMinDurationBetweenContentChanges()
+        {
+            return IExecuteWithSignature<Java.Time.Duration>("getMinDurationBetweenContentChanges", "()Ljava/time/Duration;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#findAccessibilityNodeInfosByText(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1046,6 +1067,22 @@ public int DescribeContents()
             return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo>>("findAccessibilityNodeInfosByViewId", "(Ljava/lang/String;)Ljava/util/List;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getActionList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction> GetActionList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction>>("getActionList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getAvailableExtraData()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetAvailableExtraData()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAvailableExtraData", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#addAction(android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityNodeInfo.AccessibilityAction"/></param>
@@ -1057,7 +1094,7 @@ public void AddAction(Android.View.Accessibility.AccessibilityNodeInfo.Accessibi
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#addAction(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddAction(int arg0)
         {
             IExecuteWithSignature("addAction", "(I)V", arg0);
@@ -1083,7 +1120,7 @@ public void AddChild(Android.View.View arg0)
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#getBoundsInParent(android.graphics.Rect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetBoundsInParent(Android.Graphics.Rect arg0)
         {
             IExecuteWithSignature("getBoundsInParent", "(Landroid/graphics/Rect;)V", arg0);
@@ -1107,7 +1144,7 @@ public void GetBoundsInWindow(Android.Graphics.Rect arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#recycle()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Recycle()
         {
             IExecuteWithSignature("recycle", "()V");
@@ -1116,7 +1153,7 @@ public void Recycle()
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#removeAction(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveAction(int arg0)
         {
             IExecuteWithSignature("removeAction", "(I)V", arg0);
@@ -1138,10 +1175,18 @@ public void SetAccessibilityFocused(bool arg0)
             IExecuteWithSignature("setAccessibilityFocused", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setAvailableExtraData(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetAvailableExtraData(Java.Util.List<Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setAvailableExtraData", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setBoundsInParent(android.graphics.Rect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetBoundsInParent(Android.Graphics.Rect arg0)
         {
             IExecuteWithSignature("setBoundsInParent", "(Landroid/graphics/Rect;)V", arg0);
@@ -1187,6 +1232,14 @@ public void SetChecked(bool arg0)
             IExecuteWithSignature("setChecked", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setClassName(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetClassName(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setClassName", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setClickable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1211,6 +1264,22 @@ public void SetCollectionItemInfo(Android.View.Accessibility.AccessibilityNodeIn
             IExecuteWithSignature("setCollectionItemInfo", "(Landroid/view/accessibility/AccessibilityNodeInfo$CollectionItemInfo;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setContainerTitle(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetContainerTitle(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setContainerTitle", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setContentDescription(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetContentDescription(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setContentInvalid(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1235,6 +1304,14 @@ public void SetDismissable(bool arg0)
             IExecuteWithSignature("setDismissable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setDrawingOrder(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDrawingOrder(int arg0)
+        {
+            IExecuteWithSignature("setDrawingOrder", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setEditable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1251,6 +1328,14 @@ public void SetEnabled(bool arg0)
             IExecuteWithSignature("setEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setError(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetError(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setError", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setFocusable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1275,6 +1360,14 @@ public void SetHeading(bool arg0)
             IExecuteWithSignature("setHeading", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setHintText(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetHintText(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setHintText", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setImportantForAccessibility(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1283,6 +1376,14 @@ public void SetImportantForAccessibility(bool arg0)
             IExecuteWithSignature("setImportantForAccessibility", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setInputType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInputType(int arg0)
+        {
+            IExecuteWithSignature("setInputType", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLabeledBy(android.view.View,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -1292,6 +1393,14 @@ public void SetLabeledBy(Android.View.View arg0, int arg1)
             IExecute("setLabeledBy", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLabeledBy(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetLabeledBy(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setLabeledBy", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLabelFor(android.view.View,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -1301,6 +1410,22 @@ public void SetLabelFor(Android.View.View arg0, int arg1)
             IExecute("setLabelFor", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLabelFor(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetLabelFor(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setLabelFor", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLiveRegion(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLiveRegion(int arg0)
+        {
+            IExecuteWithSignature("setLiveRegion", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setLongClickable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1309,6 +1434,30 @@ public void SetLongClickable(bool arg0)
             IExecuteWithSignature("setLongClickable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setMaxTextLength(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxTextLength(int arg0)
+        {
+            IExecuteWithSignature("setMaxTextLength", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setMinDurationBetweenContentChanges(java.time.Duration)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Duration"/></param>
+        public void SetMinDurationBetweenContentChanges(Java.Time.Duration arg0)
+        {
+            IExecuteWithSignature("setMinDurationBetweenContentChanges", "(Ljava/time/Duration;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setMovementGranularities(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMovementGranularities(int arg0)
+        {
+            IExecuteWithSignature("setMovementGranularities", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setMultiLine(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1317,6 +1466,22 @@ public void SetMultiLine(bool arg0)
             IExecuteWithSignature("setMultiLine", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setPackageName(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetPackageName(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setPackageName", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setPaneTitle(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetPaneTitle(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setPaneTitle", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setParent(android.view.View,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -1326,6 +1491,14 @@ public void SetParent(Android.View.View arg0, int arg1)
             IExecute("setParent", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setParent(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetParent(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setParent", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setPassword(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1408,6 +1581,22 @@ public void SetSource(Android.View.View arg0)
             IExecuteWithSignature("setSource", "(Landroid/view/View;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setStateDescription(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetStateDescription(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setStateDescription", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setText(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetText(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTextEntryKey(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1433,6 +1622,14 @@ public void SetTextSelection(int arg0, int arg1)
             IExecute("setTextSelection", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTooltipText(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetTooltipText(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setTooltipText", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTouchDelegateInfo(android.view.accessibility.AccessibilityNodeInfo.TouchDelegateInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo"/></param>
@@ -1450,6 +1647,14 @@ public void SetTraversalAfter(Android.View.View arg0, int arg1)
             IExecute("setTraversalAfter", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTraversalAfter(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetTraversalAfter(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setTraversalAfter", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTraversalBefore(android.view.View,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -1459,6 +1664,30 @@ public void SetTraversalBefore(Android.View.View arg0, int arg1)
             IExecute("setTraversalBefore", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setTraversalBefore(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetTraversalBefore(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setTraversalBefore", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setUniqueId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetUniqueId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setUniqueId", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setViewIdResourceName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetViewIdResourceName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setViewIdResourceName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html#setVisibleToUser(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1779,26 +2008,28 @@ public AccessibilityAction(int arg0, Java.Lang.CharSequence arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.AccessibilityAction.html#getId()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.AccessibilityAction.html#describeContents()"/>
             /// </summary>
-            public int Id
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getId", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.AccessibilityAction.html#getLabel()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.AccessibilityAction.html#getId()"/>
             /// </summary>
-            public Java.Lang.CharSequence Label
+            /// <returns><see cref="int"/></returns>
+            public int GetId()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<int>("getId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.AccessibilityAction.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.AccessibilityAction.html#getLabel()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetLabel()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.AccessibilityAction.html#writeToParcel(android.os.Parcel,int)"/>
@@ -1883,7 +2114,7 @@ public CollectionInfo(int arg0, int arg1, bool arg2)
             /// <param name="arg2"><see cref="bool"/></param>
             /// <param name="arg3"><see cref="int"/></param>
             /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo Obtain(int arg0, int arg1, bool arg2, int arg3)
             {
                 return SExecute<Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo>(LocalBridgeClazz, "obtain", arg0, arg1, arg2, arg3);
@@ -1895,7 +2126,7 @@ public static Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo Ob
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="bool"/></param>
             /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo Obtain(int arg0, int arg1, bool arg2)
             {
                 return SExecute<Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo>(LocalBridgeClazz, "obtain", arg0, arg1, arg2);
@@ -1905,33 +2136,36 @@ public static Android.View.Accessibility.AccessibilityNodeInfo.CollectionInfo Ob
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo.html#getColumnCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo.html#isHierarchical()"/>
             /// </summary>
-            public int ColumnCount
+            /// <returns><see cref="bool"/></returns>
+            public bool IsHierarchical()
             {
-                get { return IExecuteWithSignature<int>("getColumnCount", "()I"); }
+                return IExecuteWithSignature<bool>("isHierarchical", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo.html#getRowCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo.html#getColumnCount()"/>
             /// </summary>
-            public int RowCount
+            /// <returns><see cref="int"/></returns>
+            public int GetColumnCount()
             {
-                get { return IExecuteWithSignature<int>("getRowCount", "()I"); }
+                return IExecuteWithSignature<int>("getColumnCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo.html#getSelectionMode()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo.html#getRowCount()"/>
             /// </summary>
-            public int SelectionMode
+            /// <returns><see cref="int"/></returns>
+            public int GetRowCount()
             {
-                get { return IExecuteWithSignature<int>("getSelectionMode", "()I"); }
+                return IExecuteWithSignature<int>("getRowCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo.html#isHierarchical()"/>
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionInfo.html#getSelectionMode()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsHierarchical()
+            /// <returns><see cref="int"/></returns>
+            public int GetSelectionMode()
             {
-                return IExecuteWithSignature<bool>("isHierarchical", "()Z");
+                return IExecuteWithSignature<int>("getSelectionMode", "()I");
             }
 
             #endregion
@@ -1995,7 +2229,7 @@ public CollectionItemInfo(int arg0, int arg1, int arg2, int arg3, bool arg4)
             /// <param name="arg4"><see cref="bool"/></param>
             /// <param name="arg5"><see cref="bool"/></param>
             /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo Obtain(int arg0, int arg1, int arg2, int arg3, bool arg4, bool arg5)
             {
                 return SExecute<Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo>(LocalBridgeClazz, "obtain", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2009,7 +2243,7 @@ public static Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInf
             /// <param name="arg3"><see cref="int"/></param>
             /// <param name="arg4"><see cref="bool"/></param>
             /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo Obtain(int arg0, int arg1, int arg2, int arg3, bool arg4)
             {
                 return SExecute<Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInfo>(LocalBridgeClazz, "obtain", arg0, arg1, arg2, arg3, arg4);
@@ -2019,63 +2253,69 @@ public static Android.View.Accessibility.AccessibilityNodeInfo.CollectionItemInf
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getColumnIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#isHeading()"/>
             /// </summary>
-            public int ColumnIndex
+            /// <returns><see cref="bool"/></returns>
+            [global::System.Obsolete()]
+            public bool IsHeading()
             {
-                get { return IExecuteWithSignature<int>("getColumnIndex", "()I"); }
+                return IExecuteWithSignature<bool>("isHeading", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getColumnSpan()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#isSelected()"/>
             /// </summary>
-            public int ColumnSpan
+            /// <returns><see cref="bool"/></returns>
+            public bool IsSelected()
             {
-                get { return IExecuteWithSignature<int>("getColumnSpan", "()I"); }
+                return IExecuteWithSignature<bool>("isSelected", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getColumnTitle()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getColumnIndex()"/>
             /// </summary>
-            public Java.Lang.String ColumnTitle
+            /// <returns><see cref="int"/></returns>
+            public int GetColumnIndex()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getColumnTitle", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getColumnIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getRowIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getColumnSpan()"/>
             /// </summary>
-            public int RowIndex
+            /// <returns><see cref="int"/></returns>
+            public int GetColumnSpan()
             {
-                get { return IExecuteWithSignature<int>("getRowIndex", "()I"); }
+                return IExecuteWithSignature<int>("getColumnSpan", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getRowSpan()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getRowIndex()"/>
             /// </summary>
-            public int RowSpan
+            /// <returns><see cref="int"/></returns>
+            public int GetRowIndex()
             {
-                get { return IExecuteWithSignature<int>("getRowSpan", "()I"); }
+                return IExecuteWithSignature<int>("getRowIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getRowTitle()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getRowSpan()"/>
             /// </summary>
-            public Java.Lang.String RowTitle
+            /// <returns><see cref="int"/></returns>
+            public int GetRowSpan()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getRowTitle", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getRowSpan", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#isHeading()"/>
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getColumnTitle()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
-            public bool IsHeading()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetColumnTitle()
             {
-                return IExecuteWithSignature<bool>("isHeading", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getColumnTitle", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#isSelected()"/>
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.CollectionItemInfo.html#getRowTitle()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsSelected()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetRowTitle()
             {
-                return IExecuteWithSignature<bool>("isSelected", "()Z");
+                return IExecuteWithSignature<Java.Lang.String>("getRowTitle", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -2220,25 +2460,28 @@ public partial class ExtraRenderingInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.ExtraRenderingInfo.html#getLayoutSize()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.ExtraRenderingInfo.html#getLayoutSize()"/>
             /// </summary>
-            public Android.Util.Size LayoutSize
+            /// <returns><see cref="Android.Util.Size"/></returns>
+            public Android.Util.Size GetLayoutSize()
             {
-                get { return IExecuteWithSignature<Android.Util.Size>("getLayoutSize", "()Landroid/util/Size;"); }
+                return IExecuteWithSignature<Android.Util.Size>("getLayoutSize", "()Landroid/util/Size;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.ExtraRenderingInfo.html#getTextSizeInPx()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.ExtraRenderingInfo.html#getTextSizeInPx()"/>
             /// </summary>
-            public float TextSizeInPx
+            /// <returns><see cref="float"/></returns>
+            public float GetTextSizeInPx()
             {
-                get { return IExecuteWithSignature<float>("getTextSizeInPx", "()F"); }
+                return IExecuteWithSignature<float>("getTextSizeInPx", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.ExtraRenderingInfo.html#getTextSizeUnit()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.ExtraRenderingInfo.html#getTextSizeUnit()"/>
             /// </summary>
-            public int TextSizeUnit
+            /// <returns><see cref="int"/></returns>
+            public int GetTextSizeUnit()
             {
-                get { return IExecuteWithSignature<int>("getTextSizeUnit", "()I"); }
+                return IExecuteWithSignature<int>("getTextSizeUnit", "()I");
             }
 
             #endregion
@@ -2304,7 +2547,7 @@ public RangeInfo(int arg0, float arg1, float arg2, float arg3)
             /// <param name="arg2"><see cref="float"/></param>
             /// <param name="arg3"><see cref="float"/></param>
             /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo Obtain(int arg0, float arg1, float arg2, float arg3)
             {
                 return SExecute<Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo>(LocalBridgeClazz, "obtain", arg0, arg1, arg2, arg3);
@@ -2314,32 +2557,36 @@ public static Android.View.Accessibility.AccessibilityNodeInfo.RangeInfo Obtain(
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.RangeInfo.html#getCurrent()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.RangeInfo.html#getCurrent()"/>
             /// </summary>
-            public float Current
+            /// <returns><see cref="float"/></returns>
+            public float GetCurrent()
             {
-                get { return IExecuteWithSignature<float>("getCurrent", "()F"); }
+                return IExecuteWithSignature<float>("getCurrent", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.RangeInfo.html#getMax()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.RangeInfo.html#getMax()"/>
             /// </summary>
-            public float Max
+            /// <returns><see cref="float"/></returns>
+            public float GetMax()
             {
-                get { return IExecuteWithSignature<float>("getMax", "()F"); }
+                return IExecuteWithSignature<float>("getMax", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.RangeInfo.html#getMin()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.RangeInfo.html#getMin()"/>
             /// </summary>
-            public float Min
+            /// <returns><see cref="float"/></returns>
+            public float GetMin()
             {
-                get { return IExecuteWithSignature<float>("getMin", "()F"); }
+                return IExecuteWithSignature<float>("getMin", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.RangeInfo.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.RangeInfo.html#getType()"/>
             /// </summary>
-            public int Type
+            /// <returns><see cref="int"/></returns>
+            public int GetType()
             {
-                get { return IExecuteWithSignature<int>("getType", "()I"); }
+                return IExecuteWithSignature<int>("getType", "()I");
             }
 
             #endregion
@@ -2387,13 +2634,6 @@ public TouchDelegateInfo(Java.Util.Map<Android.Graphics.Region, Android.View.Vie
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.TouchDelegateInfo.html#getRegionCount()"/> 
-            /// </summary>
-            public int RegionCount
-            {
-                get { return IExecuteWithSignature<int>("getRegionCount", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.TouchDelegateInfo.html#getRegionAt(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -2420,6 +2660,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.TouchDelegateInfo.html#getRegionCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetRegionCount()
+            {
+                return IExecuteWithSignature<int>("getRegionCount", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.TouchDelegateInfo.html#writeToParcel(android.os.Parcel,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityRecord.cs b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityRecord.cs
index 946ff1bf9..8394ce1ab 100644
--- a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityRecord.cs
+++ b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityRecord.cs
@@ -53,7 +53,7 @@ public AccessibilityRecord(Android.View.Accessibility.AccessibilityRecord arg0)
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#obtain()"/>
         /// </summary>
         /// <returns><see cref="Android.View.Accessibility.AccessibilityRecord"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.Accessibility.AccessibilityRecord Obtain()
         {
             return SExecuteWithSignature<Android.View.Accessibility.AccessibilityRecord>(LocalBridgeClazz, "obtain", "()Landroid/view/accessibility/AccessibilityRecord;");
@@ -63,7 +63,7 @@ public static Android.View.Accessibility.AccessibilityRecord Obtain()
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityRecord"/></param>
         /// <returns><see cref="Android.View.Accessibility.AccessibilityRecord"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.Accessibility.AccessibilityRecord Obtain(Android.View.Accessibility.AccessibilityRecord arg0)
         {
             return SExecuteWithSignature<Android.View.Accessibility.AccessibilityRecord>(LocalBridgeClazz, "obtain", "(Landroid/view/accessibility/AccessibilityRecord;)Landroid/view/accessibility/AccessibilityRecord;", arg0);
@@ -73,203 +73,239 @@ public static Android.View.Accessibility.AccessibilityRecord Obtain(Android.View
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getAddedCount()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setAddedCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getParcelableData()"/>
         /// </summary>
-        public int AddedCount
+        /// <returns><see cref="Android.Os.Parcelable"/></returns>
+        public Android.Os.Parcelable GetParcelableData()
         {
-            get { return IExecuteWithSignature<int>("getAddedCount", "()I"); } set { IExecuteWithSignature("setAddedCount", "(I)V", value); }
+            return IExecuteWithSignature<Android.Os.Parcelable>("getParcelableData", "()Landroid/os/Parcelable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getBeforeText()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setBeforeText(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getSource()"/>
         /// </summary>
-        public Java.Lang.CharSequence BeforeText
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetSource()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getBeforeText", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setBeforeText", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getSource", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getClassName()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setClassName(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getSource(int)"/>
         /// </summary>
-        public Java.Lang.CharSequence ClassName
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetSource(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getClassName", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setClassName", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getSource", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getContentDescription()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setContentDescription(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isChecked()"/>
         /// </summary>
-        public Java.Lang.CharSequence ContentDescription
+        /// <returns><see cref="bool"/></returns>
+        public bool IsChecked()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<bool>("isChecked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getCurrentItemIndex()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setCurrentItemIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isEnabled()"/>
         /// </summary>
-        public int CurrentItemIndex
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEnabled()
         {
-            get { return IExecuteWithSignature<int>("getCurrentItemIndex", "()I"); } set { IExecuteWithSignature("setCurrentItemIndex", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getDisplayId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isFullScreen()"/>
         /// </summary>
-        public int DisplayId
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFullScreen()
         {
-            get { return IExecuteWithSignature<int>("getDisplayId", "()I"); }
+            return IExecuteWithSignature<bool>("isFullScreen", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getFromIndex()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setFromIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isPassword()"/>
         /// </summary>
-        public int FromIndex
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPassword()
         {
-            get { return IExecuteWithSignature<int>("getFromIndex", "()I"); } set { IExecuteWithSignature("setFromIndex", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isPassword", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getItemCount()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setItemCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isScrollable()"/>
         /// </summary>
-        public int ItemCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsScrollable()
         {
-            get { return IExecuteWithSignature<int>("getItemCount", "()I"); } set { IExecuteWithSignature("setItemCount", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isScrollable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getMaxScrollX()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setMaxScrollX(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getAddedCount()"/>
         /// </summary>
-        public int MaxScrollX
+        /// <returns><see cref="int"/></returns>
+        public int GetAddedCount()
         {
-            get { return IExecuteWithSignature<int>("getMaxScrollX", "()I"); } set { IExecuteWithSignature("setMaxScrollX", "(I)V", value); }
+            return IExecuteWithSignature<int>("getAddedCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getMaxScrollY()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setMaxScrollY(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getCurrentItemIndex()"/>
         /// </summary>
-        public int MaxScrollY
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentItemIndex()
         {
-            get { return IExecuteWithSignature<int>("getMaxScrollY", "()I"); } set { IExecuteWithSignature("setMaxScrollY", "(I)V", value); }
+            return IExecuteWithSignature<int>("getCurrentItemIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getParcelableData()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setParcelableData(android.os.Parcelable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getDisplayId()"/>
         /// </summary>
-        public Android.Os.Parcelable ParcelableData
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayId()
         {
-            get { return IExecuteWithSignature<Android.Os.Parcelable>("getParcelableData", "()Landroid/os/Parcelable;"); } set { IExecuteWithSignature("setParcelableData", "(Landroid/os/Parcelable;)V", value); }
+            return IExecuteWithSignature<int>("getDisplayId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getRemovedCount()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setRemovedCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getFromIndex()"/>
         /// </summary>
-        public int RemovedCount
+        /// <returns><see cref="int"/></returns>
+        public int GetFromIndex()
         {
-            get { return IExecuteWithSignature<int>("getRemovedCount", "()I"); } set { IExecuteWithSignature("setRemovedCount", "(I)V", value); }
+            return IExecuteWithSignature<int>("getFromIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getScrollDeltaX()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollDeltaX(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getItemCount()"/>
         /// </summary>
-        public int ScrollDeltaX
+        /// <returns><see cref="int"/></returns>
+        public int GetItemCount()
         {
-            get { return IExecuteWithSignature<int>("getScrollDeltaX", "()I"); } set { IExecuteWithSignature("setScrollDeltaX", "(I)V", value); }
+            return IExecuteWithSignature<int>("getItemCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getScrollDeltaY()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollDeltaY(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getMaxScrollX()"/>
         /// </summary>
-        public int ScrollDeltaY
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxScrollX()
         {
-            get { return IExecuteWithSignature<int>("getScrollDeltaY", "()I"); } set { IExecuteWithSignature("setScrollDeltaY", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxScrollX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getScrollX()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollX(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getMaxScrollY()"/>
         /// </summary>
-        public int ScrollX
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxScrollY()
         {
-            get { return IExecuteWithSignature<int>("getScrollX", "()I"); } set { IExecuteWithSignature("setScrollX", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxScrollY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getScrollY()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollY(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getRemovedCount()"/>
         /// </summary>
-        public int ScrollY
+        /// <returns><see cref="int"/></returns>
+        public int GetRemovedCount()
         {
-            get { return IExecuteWithSignature<int>("getScrollY", "()I"); } set { IExecuteWithSignature("setScrollY", "(I)V", value); }
+            return IExecuteWithSignature<int>("getRemovedCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getSource()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setSource(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getScrollDeltaX()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo Source
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollDeltaX()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getSource", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); } set { IExecuteWithSignature("setSource", "(Landroid/view/View;)V", value); }
+            return IExecuteWithSignature<int>("getScrollDeltaX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getScrollDeltaY()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.CharSequence> Text
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollDeltaY()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.CharSequence>>("getText", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getScrollDeltaY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getToIndex()"/> <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setToIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getScrollX()"/>
         /// </summary>
-        public int ToIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollX()
         {
-            get { return IExecuteWithSignature<int>("getToIndex", "()I"); } set { IExecuteWithSignature("setToIndex", "(I)V", value); }
+            return IExecuteWithSignature<int>("getScrollX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getWindowId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getScrollY()"/>
         /// </summary>
-        public int WindowId
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollY()
         {
-            get { return IExecuteWithSignature<int>("getWindowId", "()I"); }
+            return IExecuteWithSignature<int>("getScrollY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getSource(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getToIndex()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityNodeInfo GetSource(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetToIndex()
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getSource", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
+            return IExecuteWithSignature<int>("getToIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isChecked()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getWindowId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsChecked()
+        /// <returns><see cref="int"/></returns>
+        public int GetWindowId()
         {
-            return IExecuteWithSignature<bool>("isChecked", "()Z");
+            return IExecuteWithSignature<int>("getWindowId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getBeforeText()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEnabled()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetBeforeText()
         {
-            return IExecuteWithSignature<bool>("isEnabled", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getBeforeText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isFullScreen()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getClassName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFullScreen()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetClassName()
         {
-            return IExecuteWithSignature<bool>("isFullScreen", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getClassName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isPassword()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getContentDescription()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPassword()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
         {
-            return IExecuteWithSignature<bool>("isPassword", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#isScrollable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#getText()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsScrollable()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.CharSequence> GetText()
         {
-            return IExecuteWithSignature<bool>("isScrollable", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.CharSequence>>("getText", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#recycle()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Recycle()
         {
             IExecuteWithSignature("recycle", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setAddedCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAddedCount(int arg0)
+        {
+            IExecuteWithSignature("setAddedCount", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setBeforeText(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetBeforeText(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setBeforeText", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setChecked(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -278,6 +314,30 @@ public void SetChecked(bool arg0)
             IExecuteWithSignature("setChecked", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setClassName(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetClassName(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setClassName", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setContentDescription(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetContentDescription(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setCurrentItemIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCurrentItemIndex(int arg0)
+        {
+            IExecuteWithSignature("setCurrentItemIndex", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -286,6 +346,14 @@ public void SetEnabled(bool arg0)
             IExecuteWithSignature("setEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setFromIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFromIndex(int arg0)
+        {
+            IExecuteWithSignature("setFromIndex", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setFullScreen(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -294,6 +362,38 @@ public void SetFullScreen(bool arg0)
             IExecuteWithSignature("setFullScreen", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setItemCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetItemCount(int arg0)
+        {
+            IExecuteWithSignature("setItemCount", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setMaxScrollX(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxScrollX(int arg0)
+        {
+            IExecuteWithSignature("setMaxScrollX", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setMaxScrollY(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxScrollY(int arg0)
+        {
+            IExecuteWithSignature("setMaxScrollY", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setParcelableData(android.os.Parcelable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.Parcelable"/></param>
+        public void SetParcelableData(Android.Os.Parcelable arg0)
+        {
+            IExecuteWithSignature("setParcelableData", "(Landroid/os/Parcelable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setPassword(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -302,6 +402,14 @@ public void SetPassword(bool arg0)
             IExecuteWithSignature("setPassword", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setRemovedCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRemovedCount(int arg0)
+        {
+            IExecuteWithSignature("setRemovedCount", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -310,6 +418,38 @@ public void SetScrollable(bool arg0)
             IExecuteWithSignature("setScrollable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollDeltaX(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollDeltaX(int arg0)
+        {
+            IExecuteWithSignature("setScrollDeltaX", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollDeltaY(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollDeltaY(int arg0)
+        {
+            IExecuteWithSignature("setScrollDeltaY", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollX(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollX(int arg0)
+        {
+            IExecuteWithSignature("setScrollX", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setScrollY(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollY(int arg0)
+        {
+            IExecuteWithSignature("setScrollY", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setSource(android.view.View,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -318,6 +458,22 @@ public void SetSource(Android.View.View arg0, int arg1)
         {
             IExecute("setSource", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setSource(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetSource(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setSource", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRecord.html#setToIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetToIndex(int arg0)
+        {
+            IExecuteWithSignature("setToIndex", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityRequestPreparer.cs b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityRequestPreparer.cs
index a84b57cc1..c1930e6dc 100644
--- a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityRequestPreparer.cs
+++ b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityRequestPreparer.cs
@@ -61,13 +61,6 @@ public AccessibilityRequestPreparer(Android.View.View arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRequestPreparer.html#getView()"/> 
-        /// </summary>
-        public Android.View.View View
-        {
-            get { return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRequestPreparer.html#onPrepareExtraData(int,java.lang.String,android.os.Bundle,android.os.Message)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -78,6 +71,14 @@ public void OnPrepareExtraData(int arg0, Java.Lang.String arg1, Android.Os.Bundl
         {
             IExecute("onPrepareExtraData", arg0, arg1, arg2, arg3);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityRequestPreparer.html#getView()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetView()
+        {
+            return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityWindowInfo.cs b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityWindowInfo.cs
index 8ad13a539..cff9dc246 100644
--- a/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityWindowInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Accessibility/AccessibilityWindowInfo.cs
@@ -113,139 +113,150 @@ public static Android.View.Accessibility.AccessibilityWindowInfo Obtain(Android.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getAnchor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getLocales()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo Anchor
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetLocales()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getAnchor", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getChildCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getAnchor()"/>
         /// </summary>
-        public int ChildCount
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetAnchor()
         {
-            get { return IExecuteWithSignature<int>("getChildCount", "()I"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getAnchor", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getDisplayId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getRoot()"/>
         /// </summary>
-        public int DisplayId
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetRoot()
         {
-            get { return IExecuteWithSignature<int>("getDisplayId", "()I"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getRoot", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getRoot(int)"/>
         /// </summary>
-        public int Id
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo GetRoot(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getRoot", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getLayer()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getChild(int)"/>
         /// </summary>
-        public int Layer
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityWindowInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityWindowInfo GetChild(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getLayer", "()I"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityWindowInfo>("getChild", "(I)Landroid/view/accessibility/AccessibilityWindowInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getParent()"/>
         /// </summary>
-        public Android.Os.LocaleList Locales
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityWindowInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityWindowInfo GetParent()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getLocales", "()Landroid/os/LocaleList;"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityWindowInfo>("getParent", "()Landroid/view/accessibility/AccessibilityWindowInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#isAccessibilityFocused()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityWindowInfo Parent
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAccessibilityFocused()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityWindowInfo>("getParent", "()Landroid/view/accessibility/AccessibilityWindowInfo;"); }
+            return IExecuteWithSignature<bool>("isAccessibilityFocused", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getRoot()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#isActive()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo Root
+        /// <returns><see cref="bool"/></returns>
+        public bool IsActive()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getRoot", "()Landroid/view/accessibility/AccessibilityNodeInfo;"); }
+            return IExecuteWithSignature<bool>("isActive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#isFocused()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFocused()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isFocused", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getTransitionTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#isInPictureInPictureMode()"/>
         /// </summary>
-        public long TransitionTimeMillis
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInPictureInPictureMode()
         {
-            get { return IExecuteWithSignature<long>("getTransitionTimeMillis", "()J"); }
+            return IExecuteWithSignature<bool>("isInPictureInPictureMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#describeContents()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getRoot(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getChildCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityNodeInfo GetRoot(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetChildCount()
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("getRoot", "(I)Landroid/view/accessibility/AccessibilityNodeInfo;", arg0);
+            return IExecuteWithSignature<int>("getChildCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getChild(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getDisplayId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityWindowInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityWindowInfo GetChild(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayId()
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityWindowInfo>("getChild", "(I)Landroid/view/accessibility/AccessibilityWindowInfo;", arg0);
+            return IExecuteWithSignature<int>("getDisplayId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#isAccessibilityFocused()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAccessibilityFocused()
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            return IExecuteWithSignature<bool>("isAccessibilityFocused", "()Z");
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#isActive()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getLayer()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsActive()
+        /// <returns><see cref="int"/></returns>
+        public int GetLayer()
         {
-            return IExecuteWithSignature<bool>("isActive", "()Z");
+            return IExecuteWithSignature<int>("getLayer", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#isFocused()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFocused()
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            return IExecuteWithSignature<bool>("isFocused", "()Z");
+            return IExecuteWithSignature<int>("getType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#isInPictureInPictureMode()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getTitle()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInPictureInPictureMode()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            return IExecuteWithSignature<bool>("isInPictureInPictureMode", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getTransitionTimeMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTransitionTimeMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTransitionTimeMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/AccessibilityWindowInfo.html#getBoundsInScreen(android.graphics.Rect)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Accessibility/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Accessibility/AllPackageClasses.cs
index 37dfb464b..a88dcc23f 100644
--- a/src/net/Netdroid/Generated/Android/View/Accessibility/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Accessibility/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class AccessibilityEventSource : MASES.JCOBridge.C2JBridge.JVMBri
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AccessibilityEventSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccessibilityEventSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccessibilityEventSource() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AccessibilityEventSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccessibilityEventSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccessibilityEventSource(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -167,10 +167,13 @@ public partial class AccessibilityServicesStateChangeListener : MASES.JCOBridge.
             /// </summary>
             public AccessibilityServicesStateChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.accessibility.AccessibilityManager_AccessibilityServicesStateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.accessibility.AccessibilityServicesStateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -192,10 +195,13 @@ public partial class AccessibilityServicesStateChangeListenerDirect : Accessibil
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.accessibility.AccessibilityManager$AccessibilityServicesStateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.accessibility.AccessibilityManager$AccessibilityServicesStateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -226,10 +232,13 @@ public partial class AccessibilityStateChangeListener : MASES.JCOBridge.C2JBridg
             /// </summary>
             public AccessibilityStateChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.accessibility.AccessibilityManager_AccessibilityStateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.accessibility.AccessibilityStateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -251,10 +260,13 @@ public partial class AccessibilityStateChangeListenerDirect : AccessibilityState
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.accessibility.AccessibilityManager$AccessibilityStateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.accessibility.AccessibilityManager$AccessibilityStateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -285,10 +297,13 @@ public partial class AudioDescriptionRequestedChangeListener : MASES.JCOBridge.C
             /// </summary>
             public AudioDescriptionRequestedChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.accessibility.AccessibilityManager_AudioDescriptionRequestedChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.accessibility.AudioDescriptionRequestedChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -310,10 +325,13 @@ public partial class AudioDescriptionRequestedChangeListenerDirect : AudioDescri
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.accessibility.AccessibilityManager$AudioDescriptionRequestedChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.accessibility.AccessibilityManager$AudioDescriptionRequestedChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -344,10 +362,13 @@ public partial class TouchExplorationStateChangeListener : MASES.JCOBridge.C2JBr
             /// </summary>
             public TouchExplorationStateChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.accessibility.AccessibilityManager_TouchExplorationStateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.accessibility.TouchExplorationStateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -369,10 +390,13 @@ public partial class TouchExplorationStateChangeListenerDirect : TouchExploratio
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.accessibility.AccessibilityManager$TouchExplorationStateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.accessibility.AccessibilityManager$TouchExplorationStateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -758,12 +782,12 @@ public partial class AccessibilityNodeProvider : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AccessibilityNodeProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccessibilityNodeProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccessibilityNodeProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AccessibilityNodeProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccessibilityNodeProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccessibilityNodeProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -848,12 +872,12 @@ public partial class AccessibilityRequestPreparer : MASES.JCOBridge.C2JBridge.JV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AccessibilityRequestPreparer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccessibilityRequestPreparer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccessibilityRequestPreparer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AccessibilityRequestPreparer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AccessibilityRequestPreparer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AccessibilityRequestPreparer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -972,38 +996,26 @@ public CaptioningManager(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html"/>
         /// </summary>
-        public partial class CaptioningChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+        public partial class CaptioningChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CaptioningChangeListener>
         {
+            const string _bridgeClassName = "android.view.accessibility.CaptioningManager$CaptioningChangeListener";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            public CaptioningChangeListener() { InitializeHandlers(); }
-
-        #warning Remember to build the Java class for event listener
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-        #region CaptioningChangeListenerDirect
-        /// <summary>
-        /// Direct override of <see cref="CaptioningChangeListener"/> or its generic type if there is one
-        /// </summary>
-        public partial class CaptioningChangeListenerDirect : CaptioningChangeListener
-        {
+            [global::System.Obsolete("CaptioningChangeListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            public CaptioningChangeListener() { }
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            public override bool AutoInit => false;
+            [global::System.Obsolete("CaptioningChangeListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            public CaptioningChangeListener(params object[] args) : base(args) { }
 
-            /// <inheritdoc />
-            protected override void InitializeHandlers() { }
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
             /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.accessibility.CaptioningManager$CaptioningChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1020,6 +1032,9 @@ protected override void InitializeHandlers() { }
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
             /// </summary>
             public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
         }
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/Accessibility/CaptioningManager.cs b/src/net/Netdroid/Generated/Android/View/Accessibility/CaptioningManager.cs
index 07027b5ce..69fe475d1 100644
--- a/src/net/Netdroid/Generated/Android/View/Accessibility/CaptioningManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Accessibility/CaptioningManager.cs
@@ -46,25 +46,12 @@ public partial class CaptioningManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.html#getFontScale()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.html#getUserStyle()"/>
         /// </summary>
-        public float FontScale
+        /// <returns><see cref="Android.View.Accessibility.CaptioningManager.CaptionStyle"/></returns>
+        public Android.View.Accessibility.CaptioningManager.CaptionStyle GetUserStyle()
         {
-            get { return IExecuteWithSignature<float>("getFontScale", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.html#getLocale()"/> 
-        /// </summary>
-        public Java.Util.Locale Locale
-        {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.html#getUserStyle()"/> 
-        /// </summary>
-        public Android.View.Accessibility.CaptioningManager.CaptionStyle UserStyle
-        {
-            get { return IExecuteWithSignature<Android.View.Accessibility.CaptioningManager.CaptionStyle>("getUserStyle", "()Landroid/view/accessibility/CaptioningManager$CaptionStyle;"); }
+            return IExecuteWithSignature<Android.View.Accessibility.CaptioningManager.CaptionStyle>("getUserStyle", "()Landroid/view/accessibility/CaptioningManager$CaptionStyle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.html#isCallCaptioningEnabled()"/>
@@ -99,6 +86,22 @@ public bool IsSystemAudioCaptioningUiEnabled()
             return IExecuteWithSignature<bool>("isSystemAudioCaptioningUiEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.html#getFontScale()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetFontScale()
+        {
+            return IExecuteWithSignature<float>("getFontScale", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.html#getLocale()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
+        {
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.html#addCaptioningChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Accessibility.CaptioningManager.CaptioningChangeListener"/></param>
@@ -137,182 +140,12 @@ public partial class CaptioningChangeListener
 
             #endregion
 
-            #region Instance methods
-            /// <summary>
-            /// Handlers initializer for <see cref="CaptioningChangeListener"/>
-            /// </summary>
-            protected virtual void InitializeHandlers()
-            {
-                AddEventHandler("onEnabledChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnEnabledChangedEventHandler));
-                AddEventHandler("onFontScaleChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<float>>>(OnFontScaleChangedEventHandler));
-                AddEventHandler("onLocaleChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Locale>>>(OnLocaleChangedEventHandler));
-                AddEventHandler("onSystemAudioCaptioningChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnSystemAudioCaptioningChangedEventHandler));
-                AddEventHandler("onSystemAudioCaptioningUiChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnSystemAudioCaptioningUiChangedEventHandler));
-                AddEventHandler("onUserStyleChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Accessibility.CaptioningManager.CaptionStyle>>>(OnUserStyleChangedEventHandler));
-
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onEnabledChanged(boolean)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnEnabledChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnEnabledChanged { get; set; } = null;
-
-            void OnEnabledChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-            {
-                var methodToExecute = (OnOnEnabledChanged != null) ? OnOnEnabledChanged : OnEnabledChanged;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onEnabledChanged(boolean)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="bool"/></param>
-            public virtual void OnEnabledChanged(bool arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onFontScaleChanged(float)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnFontScaleChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<float> OnOnFontScaleChanged { get; set; } = null;
-
-            void OnFontScaleChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<float>> data)
-            {
-                var methodToExecute = (OnOnFontScaleChanged != null) ? OnOnFontScaleChanged : OnFontScaleChanged;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onFontScaleChanged(float)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="float"/></param>
-            public virtual void OnFontScaleChanged(float arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onLocaleChanged(java.util.Locale)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnLocaleChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Util.Locale> OnOnLocaleChanged { get; set; } = null;
-
-            void OnLocaleChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Locale>> data)
-            {
-                var methodToExecute = (OnOnLocaleChanged != null) ? OnOnLocaleChanged : OnLocaleChanged;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onLocaleChanged(java.util.Locale)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
-            public virtual void OnLocaleChanged(Java.Util.Locale arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onSystemAudioCaptioningChanged(boolean)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnSystemAudioCaptioningChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnSystemAudioCaptioningChanged { get; set; } = null;
-
-            void OnSystemAudioCaptioningChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-            {
-                var methodToExecute = (OnOnSystemAudioCaptioningChanged != null) ? OnOnSystemAudioCaptioningChanged : OnSystemAudioCaptioningChanged;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onSystemAudioCaptioningChanged(boolean)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="bool"/></param>
-            public virtual void OnSystemAudioCaptioningChanged(bool arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onSystemAudioCaptioningUiChanged(boolean)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnSystemAudioCaptioningUiChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnSystemAudioCaptioningUiChanged { get; set; } = null;
-
-            void OnSystemAudioCaptioningUiChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-            {
-                var methodToExecute = (OnOnSystemAudioCaptioningUiChanged != null) ? OnOnSystemAudioCaptioningUiChanged : OnSystemAudioCaptioningUiChanged;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onSystemAudioCaptioningUiChanged(boolean)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="bool"/></param>
-            public virtual void OnSystemAudioCaptioningUiChanged(bool arg0)
-            {
-                
-            }
-
-            /// <summary>
-            /// Handler for <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onUserStyleChanged(android.view.accessibility.CaptioningManager.CaptionStyle)"/>
-            /// </summary>
-            /// <remarks>If <see cref="OnOnUserStyleChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Accessibility.CaptioningManager.CaptionStyle> OnOnUserStyleChanged { get; set; } = null;
-
-            void OnUserStyleChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Accessibility.CaptioningManager.CaptionStyle>> data)
-            {
-                var methodToExecute = (OnOnUserStyleChanged != null) ? OnOnUserStyleChanged : OnUserStyleChanged;
-                methodToExecute.Invoke(data.EventData.TypedEventData);
-            }
-
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onUserStyleChanged(android.view.accessibility.CaptioningManager.CaptionStyle)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Android.View.Accessibility.CaptioningManager.CaptionStyle"/></param>
-            public virtual void OnUserStyleChanged(Android.View.Accessibility.CaptioningManager.CaptionStyle arg0)
-            {
-                
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-        #region CaptioningChangeListenerDirect
-        public partial class CaptioningChangeListenerDirect
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
             #region Instance methods
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onEnabledChanged(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            public override void OnEnabledChanged(bool arg0)
+            public void OnEnabledChanged(bool arg0)
             {
                 IExecuteWithSignature("onEnabledChanged", "(Z)V", arg0);
             }
@@ -320,7 +153,7 @@ public override void OnEnabledChanged(bool arg0)
             /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onFontScaleChanged(float)"/>
             /// </summary>
             /// <param name="arg0"><see cref="float"/></param>
-            public override void OnFontScaleChanged(float arg0)
+            public void OnFontScaleChanged(float arg0)
             {
                 IExecuteWithSignature("onFontScaleChanged", "(F)V", arg0);
             }
@@ -328,7 +161,7 @@ public override void OnFontScaleChanged(float arg0)
             /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onLocaleChanged(java.util.Locale)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
-            public override void OnLocaleChanged(Java.Util.Locale arg0)
+            public void OnLocaleChanged(Java.Util.Locale arg0)
             {
                 IExecuteWithSignature("onLocaleChanged", "(Ljava/util/Locale;)V", arg0);
             }
@@ -336,7 +169,7 @@ public override void OnLocaleChanged(Java.Util.Locale arg0)
             /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onSystemAudioCaptioningChanged(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            public override void OnSystemAudioCaptioningChanged(bool arg0)
+            public void OnSystemAudioCaptioningChanged(bool arg0)
             {
                 IExecuteWithSignature("onSystemAudioCaptioningChanged", "(Z)V", arg0);
             }
@@ -344,7 +177,7 @@ public override void OnSystemAudioCaptioningChanged(bool arg0)
             /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onSystemAudioCaptioningUiChanged(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            public override void OnSystemAudioCaptioningUiChanged(bool arg0)
+            public void OnSystemAudioCaptioningUiChanged(bool arg0)
             {
                 IExecuteWithSignature("onSystemAudioCaptioningUiChanged", "(Z)V", arg0);
             }
@@ -352,7 +185,7 @@ public override void OnSystemAudioCaptioningUiChanged(bool arg0)
             /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptioningChangeListener.html#onUserStyleChanged(android.view.accessibility.CaptioningManager.CaptionStyle)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.Accessibility.CaptioningManager.CaptionStyle"/></param>
-            public override void OnUserStyleChanged(Android.View.Accessibility.CaptioningManager.CaptionStyle arg0)
+            public void OnUserStyleChanged(Android.View.Accessibility.CaptioningManager.CaptionStyle arg0)
             {
                 IExecuteWithSignature("onUserStyleChanged", "(Landroid/view/accessibility/CaptioningManager$CaptionStyle;)V", arg0);
             }
@@ -454,11 +287,12 @@ public partial class CaptionStyle
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptionStyle.html#getTypeface()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptionStyle.html#getTypeface()"/>
             /// </summary>
-            public Android.Graphics.Typeface Typeface
+            /// <returns><see cref="Android.Graphics.Typeface"/></returns>
+            public Android.Graphics.Typeface GetTypeface()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;"); }
+                return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptionStyle.html#hasBackgroundColor()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/ActionMode.cs b/src/net/Netdroid/Generated/Android/View/ActionMode.cs
index 8fa2b3d77..ff75bd333 100644
--- a/src/net/Netdroid/Generated/Android/View/ActionMode.cs
+++ b/src/net/Netdroid/Generated/Android/View/ActionMode.cs
@@ -64,60 +64,44 @@ public partial class ActionMode
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getCustomView()"/> <see href="https://developer.android.com/reference/android/view/ActionMode.html#setCustomView(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getMenu()"/>
         /// </summary>
-        public Android.View.View CustomView
+        /// <returns><see cref="Android.View.Menu"/></returns>
+        public Android.View.Menu GetMenu()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getCustomView", "()Landroid/view/View;"); } set { IExecuteWithSignature("setCustomView", "(Landroid/view/View;)V", value); }
+            return IExecuteWithSignature<Android.View.Menu>("getMenu", "()Landroid/view/Menu;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getMenu()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getMenuInflater()"/>
         /// </summary>
-        public Android.View.Menu Menu
+        /// <returns><see cref="Android.View.MenuInflater"/></returns>
+        public Android.View.MenuInflater GetMenuInflater()
         {
-            get { return IExecuteWithSignature<Android.View.Menu>("getMenu", "()Landroid/view/Menu;"); }
+            return IExecuteWithSignature<Android.View.MenuInflater>("getMenuInflater", "()Landroid/view/MenuInflater;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getMenuInflater()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getCustomView()"/>
         /// </summary>
-        public Android.View.MenuInflater MenuInflater
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetCustomView()
         {
-            get { return IExecuteWithSignature<Android.View.MenuInflater>("getMenuInflater", "()Landroid/view/MenuInflater;"); }
+            return IExecuteWithSignature<Android.View.View>("getCustomView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getSubtitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getSubtitle()"/>
         /// </summary>
-        public Java.Lang.CharSequence Subtitle
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSubtitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getTag()"/> <see href="https://developer.android.com/reference/android/view/ActionMode.html#setTag(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getTitle()"/>
         /// </summary>
-        public object Tag
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            get { return IExecuteWithSignature("getTag", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setTag", "(Ljava/lang/Object;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getTitle()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Title
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getTitleOptionalHint()"/> <see href="https://developer.android.com/reference/android/view/ActionMode.html#setTitleOptionalHint(boolean)"/>
-        /// </summary>
-        public bool TitleOptionalHint
-        {
-            get { return IExecuteWithSignature<bool>("getTitleOptionalHint", "()Z"); } set { IExecuteWithSignature("setTitleOptionalHint", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getType()"/> <see href="https://developer.android.com/reference/android/view/ActionMode.html#setType(int)"/>
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); } set { IExecuteWithSignature("setType", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#finish()"/>
@@ -134,6 +118,14 @@ public void Invalidate()
             IExecuteWithSignature("invalidate", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#setCustomView(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetCustomView(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setCustomView", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#setSubtitle(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -166,6 +158,14 @@ public void SetTitle(Java.Lang.CharSequence arg0)
             IExecuteWithSignature("setTitle", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getTitleOptionalHint()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetTitleOptionalHint()
+        {
+            return IExecuteWithSignature<bool>("getTitleOptionalHint", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#isTitleOptional()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -174,6 +174,22 @@ public bool IsTitleOptional()
             return IExecuteWithSignature<bool>("isTitleOptional", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#getTag()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetTag()
+        {
+            return IExecuteWithSignature("getTag", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#hide(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -196,6 +212,30 @@ public void OnWindowFocusChanged(bool arg0)
         {
             IExecuteWithSignature("onWindowFocusChanged", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#setTag(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetTag(object arg0)
+        {
+            IExecuteWithSignature("setTag", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#setTitleOptionalHint(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetTitleOptionalHint(bool arg0)
+        {
+            IExecuteWithSignature("setTitleOptionalHint", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ActionMode.html#setType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetType(int arg0)
+        {
+            IExecuteWithSignature("setType", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/ActionProvider.cs b/src/net/Netdroid/Generated/Android/View/ActionProvider.cs
index 1628ba097..22a53701c 100644
--- a/src/net/Netdroid/Generated/Android/View/ActionProvider.cs
+++ b/src/net/Netdroid/Generated/Android/View/ActionProvider.cs
@@ -57,7 +57,7 @@ public ActionProvider(Android.Content.Context arg0)
         /// <see href="https://developer.android.com/reference/android/view/ActionProvider.html#onCreateActionView()"/>
         /// </summary>
         /// <returns><see cref="Android.View.View"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.View OnCreateActionView()
         {
             return IExecuteWithSignature<Android.View.View>("onCreateActionView", "()Landroid/view/View;");
@@ -155,7 +155,7 @@ public partial class VisibilityListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onActionProviderVisibilityChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnActionProviderVisibilityChangedEventHandler));
+                AddEventHandler("onActionProviderVisibilityChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnActionProviderVisibilityChangedEventHandler));
 
             }
 
@@ -163,7 +163,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ActionProvider.VisibilityListener.html#onActionProviderVisibilityChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnActionProviderVisibilityChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnActionProviderVisibilityChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnActionProviderVisibilityChanged { get; set; } = null;
 
             void OnActionProviderVisibilityChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/AllPackageClasses.cs
index 09cbb09eb..e3ee6d101 100644
--- a/src/net/Netdroid/Generated/Android/View/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class AbsSavedState : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbsSavedState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbsSavedState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbsSavedState() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbsSavedState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbsSavedState class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbsSavedState(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -82,12 +82,12 @@ public partial class ActionMode : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Action
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ActionMode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ActionMode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ActionMode() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ActionMode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ActionMode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ActionMode(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -124,12 +124,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -170,12 +170,12 @@ public partial class Callback2 : Android.View.ActionMode.Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback2() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback2(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -220,12 +220,12 @@ public partial class ActionProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ac
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ActionProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ActionProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ActionProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ActionProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ActionProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ActionProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -263,10 +263,13 @@ public partial class VisibilityListener : MASES.JCOBridge.C2JBridge.JVMBridgeLis
             /// </summary>
             public VisibilityListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ActionProvider_VisibilityListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.VisibilityListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -288,10 +291,13 @@ public partial class VisibilityListenerDirect : VisibilityListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ActionProvider$VisibilityListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ActionProvider$VisibilityListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -325,12 +331,12 @@ public partial class AttachedSurfaceControl : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AttachedSurfaceControl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttachedSurfaceControl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttachedSurfaceControl() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AttachedSurfaceControl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttachedSurfaceControl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttachedSurfaceControl(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -368,10 +374,13 @@ public partial class OnBufferTransformHintChangedListener : MASES.JCOBridge.C2JB
             /// </summary>
             public OnBufferTransformHintChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.AttachedSurfaceControl_OnBufferTransformHintChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnBufferTransformHintChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -393,10 +402,13 @@ public partial class OnBufferTransformHintChangedListenerDirect : OnBufferTransf
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.AttachedSurfaceControl$OnBufferTransformHintChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.AttachedSurfaceControl$OnBufferTransformHintChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -470,12 +482,12 @@ public partial class FrameCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Fra
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FrameCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FrameCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FrameCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FrameCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FrameCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FrameCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -604,12 +616,12 @@ public partial class VsyncCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Vsy
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("VsyncCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VsyncCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VsyncCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("VsyncCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VsyncCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VsyncCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -654,12 +666,12 @@ public partial class CollapsibleActionView : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CollapsibleActionView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CollapsibleActionView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CollapsibleActionView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CollapsibleActionView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CollapsibleActionView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CollapsibleActionView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -788,12 +800,12 @@ public partial class ContextMenu : Android.View.Menu
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ContextMenu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContextMenu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContextMenu() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ContextMenu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContextMenu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContextMenu(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -830,12 +842,12 @@ public partial class ContextMenuInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ContextMenuInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ContextMenuInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ContextMenuInfo() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ContextMenuInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ContextMenuInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ContextMenuInfo(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1364,12 +1376,12 @@ public partial class FrameStats : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FrameS
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FrameStats class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FrameStats class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FrameStats() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FrameStats class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FrameStats class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FrameStats(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1451,10 +1463,13 @@ public partial class OnContextClickListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnContextClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.GestureDetector_OnContextClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnContextClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1476,10 +1491,13 @@ public partial class OnContextClickListenerDirect : OnContextClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.GestureDetector$OnContextClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.GestureDetector$OnContextClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1510,10 +1528,13 @@ public partial class OnDoubleTapListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnDoubleTapListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.GestureDetector_OnDoubleTapListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnDoubleTapListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1535,10 +1556,13 @@ public partial class OnDoubleTapListenerDirect : OnDoubleTapListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.GestureDetector$OnDoubleTapListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.GestureDetector$OnDoubleTapListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1569,10 +1593,13 @@ public partial class OnGestureListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnGestureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.GestureDetector_OnGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1594,10 +1621,13 @@ public partial class OnGestureListenerDirect : OnGestureListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.GestureDetector$OnGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.GestureDetector$OnGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1628,10 +1658,13 @@ public partial class SimpleOnGestureListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public SimpleOnGestureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.GestureDetector_SimpleOnGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.SimpleOnGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1653,10 +1686,13 @@ public partial class SimpleOnGestureListenerDirect : SimpleOnGestureListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.GestureDetector$SimpleOnGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.GestureDetector$SimpleOnGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1883,12 +1919,12 @@ public partial class InputEvent : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InputEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputEvent() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InputEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputEvent(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1969,12 +2005,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2141,7 +2177,7 @@ public KeyCharacterMap(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.KeyData.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class KeyData : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyData>
         {
             const string _bridgeClassName = "android.view.KeyCharacterMap$KeyData";
@@ -2253,12 +2289,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2347,12 +2383,12 @@ public partial class LayoutInflater : MASES.JCOBridge.C2JBridge.JVMBridgeBase<La
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LayoutInflater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LayoutInflater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LayoutInflater() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LayoutInflater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LayoutInflater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LayoutInflater(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2389,12 +2425,12 @@ public partial class Factory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Factory>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Factory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Factory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Factory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Factory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Factory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Factory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2435,12 +2471,12 @@ public partial class Factory2 : Android.View.LayoutInflater.Factory
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Factory2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Factory2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Factory2() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Factory2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Factory2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Factory2(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2481,12 +2517,12 @@ public partial class Filter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Filter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Filter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2531,12 +2567,12 @@ public partial class Menu : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Menu>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Menu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Menu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Menu() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Menu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Menu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Menu(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2621,12 +2657,12 @@ public partial class MenuItem : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MenuItem
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MenuItem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MenuItem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MenuItem() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MenuItem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MenuItem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MenuItem(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2664,10 +2700,13 @@ public partial class OnActionExpandListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnActionExpandListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.MenuItem_OnActionExpandListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnActionExpandListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2689,10 +2728,13 @@ public partial class OnActionExpandListenerDirect : OnActionExpandListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.MenuItem$OnActionExpandListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.MenuItem$OnActionExpandListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2723,10 +2765,13 @@ public partial class OnMenuItemClickListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnMenuItemClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.MenuItem_OnMenuItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnMenuItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2748,10 +2793,13 @@ public partial class OnMenuItemClickListenerDirect : OnMenuItemClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.MenuItem$OnMenuItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.MenuItem$OnMenuItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2962,10 +3010,13 @@ public partial class OnReceiveContentListener : MASES.JCOBridge.C2JBridge.JVMBri
         /// </summary>
         public OnReceiveContentListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.view.OnReceiveContentListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnReceiveContentListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2987,10 +3038,13 @@ public partial class OnReceiveContentListenerDirect : OnReceiveContentListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.view.OnReceiveContentListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.view.OnReceiveContentListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3014,38 +3068,26 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html"/>
     /// </summary>
-    public partial class OrientationEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class OrientationEventListener : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OrientationEventListener>
     {
+        const string _bridgeClassName = "android.view.OrientationEventListener";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public OrientationEventListener() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region OrientationEventListenerDirect
-    /// <summary>
-    /// Direct override of <see cref="OrientationEventListener"/> or its generic type if there is one
-    /// </summary>
-    public partial class OrientationEventListenerDirect : OrientationEventListener
-    {
+        [global::System.Obsolete("OrientationEventListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public OrientationEventListener() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("OrientationEventListener class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public OrientationEventListener(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.view.OrientationEventListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3062,6 +3104,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -3069,7 +3114,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/view/OrientationListener.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class OrientationListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
         /// <summary>
@@ -3077,10 +3122,13 @@ public partial class OrientationListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public OrientationListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.view.OrientationListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OrientationListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3102,10 +3150,13 @@ public partial class OrientationListenerDirect : OrientationListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.view.OrientationListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.view.OrientationListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3176,10 +3227,13 @@ public partial class OnPixelCopyFinishedListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public OnPixelCopyFinishedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.PixelCopy_OnPixelCopyFinishedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnPixelCopyFinishedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3201,10 +3255,13 @@ public partial class OnPixelCopyFinishedListenerDirect : OnPixelCopyFinishedList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.PixelCopy$OnPixelCopyFinishedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.PixelCopy$OnPixelCopyFinishedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3499,10 +3556,13 @@ public partial class OnScaleGestureListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnScaleGestureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ScaleGestureDetector_OnScaleGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnScaleGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3524,10 +3584,13 @@ public partial class OnScaleGestureListenerDirect : OnScaleGestureListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ScaleGestureDetector$OnScaleGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ScaleGestureDetector$OnScaleGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3558,10 +3621,13 @@ public partial class SimpleOnScaleGestureListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public SimpleOnScaleGestureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ScaleGestureDetector_SimpleOnScaleGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.SimpleOnScaleGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -3583,10 +3649,13 @@ public partial class SimpleOnScaleGestureListenerDirect : SimpleOnScaleGestureLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ScaleGestureDetector$SimpleOnScaleGestureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ScaleGestureDetector$SimpleOnScaleGestureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -3620,12 +3689,12 @@ public partial class ScrollCaptureCallback : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ScrollCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScrollCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScrollCaptureCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ScrollCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScrollCaptureCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScrollCaptureCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3842,12 +3911,12 @@ public partial class SubMenu : Android.View.Menu
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SubMenu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SubMenu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SubMenu() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SubMenu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SubMenu class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SubMenu(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4078,10 +4147,13 @@ public partial class TransactionCommittedListener : MASES.JCOBridge.C2JBridge.JV
             /// </summary>
             public TransactionCommittedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.SurfaceControl_TransactionCommittedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.TransactionCommittedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4103,10 +4175,13 @@ public partial class TransactionCommittedListenerDirect : TransactionCommittedLi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.SurfaceControl$TransactionCommittedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.SurfaceControl$TransactionCommittedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4272,12 +4347,12 @@ public partial class SurfaceHolder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sur
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SurfaceHolder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SurfaceHolder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SurfaceHolder() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SurfaceHolder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SurfaceHolder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SurfaceHolder(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4331,12 +4406,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4377,12 +4452,12 @@ public partial class Callback2 : Android.View.SurfaceHolder.Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback2() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback2(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4512,10 +4587,13 @@ public partial class SurfaceTextureListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public SurfaceTextureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.TextureView_SurfaceTextureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.SurfaceTextureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4537,10 +4615,13 @@ public partial class SurfaceTextureListenerDirect : SurfaceTextureListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.TextureView$SurfaceTextureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.TextureView$SurfaceTextureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4662,12 +4743,12 @@ public partial class VerifiedInputEvent : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VerifiedInputEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VerifiedInputEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VerifiedInputEvent() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VerifiedInputEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VerifiedInputEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VerifiedInputEvent(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5013,10 +5094,13 @@ public partial class OnApplyWindowInsetsListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public OnApplyWindowInsetsListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnApplyWindowInsetsListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnApplyWindowInsetsListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5038,10 +5122,13 @@ public partial class OnApplyWindowInsetsListenerDirect : OnApplyWindowInsetsList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnApplyWindowInsetsListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnApplyWindowInsetsListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5072,10 +5159,13 @@ public partial class OnAttachStateChangeListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public OnAttachStateChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnAttachStateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnAttachStateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5097,10 +5187,13 @@ public partial class OnAttachStateChangeListenerDirect : OnAttachStateChangeList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnAttachStateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnAttachStateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5131,10 +5224,13 @@ public partial class OnCapturedPointerListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnCapturedPointerListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnCapturedPointerListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnCapturedPointerListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5156,10 +5252,13 @@ public partial class OnCapturedPointerListenerDirect : OnCapturedPointerListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnCapturedPointerListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnCapturedPointerListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5190,10 +5289,13 @@ public partial class OnClickListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5215,10 +5317,13 @@ public partial class OnClickListenerDirect : OnClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5249,10 +5354,13 @@ public partial class OnContextClickListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnContextClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnContextClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnContextClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5274,10 +5382,13 @@ public partial class OnContextClickListenerDirect : OnContextClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnContextClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnContextClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5308,10 +5419,13 @@ public partial class OnCreateContextMenuListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public OnCreateContextMenuListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnCreateContextMenuListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnCreateContextMenuListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5333,10 +5447,13 @@ public partial class OnCreateContextMenuListenerDirect : OnCreateContextMenuList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnCreateContextMenuListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnCreateContextMenuListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5367,10 +5484,13 @@ public partial class OnDragListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public OnDragListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnDragListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnDragListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5392,10 +5512,13 @@ public partial class OnDragListenerDirect : OnDragListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnDragListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnDragListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5426,10 +5549,13 @@ public partial class OnFocusChangeListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnFocusChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnFocusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnFocusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5451,10 +5577,13 @@ public partial class OnFocusChangeListenerDirect : OnFocusChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnFocusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnFocusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5485,10 +5614,13 @@ public partial class OnGenericMotionListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnGenericMotionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnGenericMotionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnGenericMotionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5510,10 +5642,13 @@ public partial class OnGenericMotionListenerDirect : OnGenericMotionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnGenericMotionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnGenericMotionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5544,10 +5679,13 @@ public partial class OnHoverListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnHoverListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnHoverListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnHoverListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5569,10 +5707,13 @@ public partial class OnHoverListenerDirect : OnHoverListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnHoverListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnHoverListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5603,10 +5744,13 @@ public partial class OnKeyListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public OnKeyListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnKeyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnKeyListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5628,10 +5772,13 @@ public partial class OnKeyListenerDirect : OnKeyListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnKeyListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnKeyListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5662,10 +5809,13 @@ public partial class OnLayoutChangeListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnLayoutChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnLayoutChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnLayoutChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5687,10 +5837,13 @@ public partial class OnLayoutChangeListenerDirect : OnLayoutChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnLayoutChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnLayoutChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5721,10 +5874,13 @@ public partial class OnLongClickListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnLongClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnLongClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnLongClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5746,10 +5902,13 @@ public partial class OnLongClickListenerDirect : OnLongClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnLongClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnLongClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5780,10 +5939,13 @@ public partial class OnScrollChangeListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnScrollChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnScrollChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnScrollChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5805,10 +5967,13 @@ public partial class OnScrollChangeListenerDirect : OnScrollChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnScrollChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnScrollChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5832,7 +5997,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.OnSystemUiVisibilityChangeListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnSystemUiVisibilityChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -5840,10 +6005,13 @@ public partial class OnSystemUiVisibilityChangeListener : MASES.JCOBridge.C2JBri
             /// </summary>
             public OnSystemUiVisibilityChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnSystemUiVisibilityChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnSystemUiVisibilityChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5865,10 +6033,13 @@ public partial class OnSystemUiVisibilityChangeListenerDirect : OnSystemUiVisibi
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnSystemUiVisibilityChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnSystemUiVisibilityChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5899,10 +6070,13 @@ public partial class OnTouchListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnTouchListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnTouchListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnTouchListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5924,10 +6098,13 @@ public partial class OnTouchListenerDirect : OnTouchListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnTouchListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnTouchListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5958,10 +6135,13 @@ public partial class OnUnhandledKeyEventListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public OnUnhandledKeyEventListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.View_OnUnhandledKeyEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnUnhandledKeyEventListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5983,10 +6163,13 @@ public partial class OnUnhandledKeyEventListenerDirect : OnUnhandledKeyEventList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.View$OnUnhandledKeyEventListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.View$OnUnhandledKeyEventListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6148,12 +6331,12 @@ public partial class CapturedViewProperty : Java.Lang.Annotation.Annotation
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CapturedViewProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CapturedViewProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CapturedViewProperty() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CapturedViewProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CapturedViewProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CapturedViewProperty(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6194,12 +6377,12 @@ public partial class ExportedProperty : Java.Lang.Annotation.Annotation
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ExportedProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ExportedProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ExportedProperty() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ExportedProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ExportedProperty class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ExportedProperty(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6240,12 +6423,12 @@ public partial class FlagToString : Java.Lang.Annotation.Annotation
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FlagToString class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FlagToString class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FlagToString() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FlagToString class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FlagToString class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FlagToString(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6280,7 +6463,7 @@ public FlagToString(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class HierarchyTraceType : Java.Lang.Enum<Android.View.ViewDebug.HierarchyTraceType>
         {
             const string _bridgeClassName = "android.view.ViewDebug$HierarchyTraceType";
@@ -6331,12 +6514,12 @@ public partial class IntToString : Java.Lang.Annotation.Annotation
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("IntToString class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IntToString class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IntToString() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("IntToString class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IntToString class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IntToString(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6371,7 +6554,7 @@ public IntToString(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewDebug.RecyclerTraceType.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class RecyclerTraceType : Java.Lang.Enum<Android.View.ViewDebug.RecyclerTraceType>
         {
             const string _bridgeClassName = "android.view.ViewDebug$RecyclerTraceType";
@@ -6426,12 +6609,12 @@ public partial class ViewGroup : Android.View.View
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ViewGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewGroup() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ViewGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewGroup(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6557,10 +6740,13 @@ public partial class OnHierarchyChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnHierarchyChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewGroup_OnHierarchyChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnHierarchyChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6582,10 +6768,13 @@ public partial class OnHierarchyChangeListenerDirect : OnHierarchyChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewGroup$OnHierarchyChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewGroup$OnHierarchyChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6663,12 +6852,12 @@ public partial class ViewManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ViewM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ViewManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ViewManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6709,12 +6898,12 @@ public partial class ViewOutlineProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ViewOutlineProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewOutlineProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewOutlineProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ViewOutlineProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewOutlineProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewOutlineProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6799,12 +6988,12 @@ public partial class ViewParent : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ViewPa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ViewParent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewParent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewParent() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ViewParent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewParent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewParent(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6889,12 +7078,12 @@ public partial class ViewStructure : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Vie
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ViewStructure class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewStructure class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewStructure() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ViewStructure class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewStructure class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewStructure(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6931,12 +7120,12 @@ public partial class HtmlInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HtmlInfo
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("HtmlInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("HtmlInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public HtmlInfo() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("HtmlInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("HtmlInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public HtmlInfo(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6973,12 +7162,12 @@ public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Builder() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Builder(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7068,10 +7257,13 @@ public partial class OnInflateListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnInflateListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewStub_OnInflateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnInflateListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7093,10 +7285,13 @@ public partial class OnInflateListenerDirect : OnInflateListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewStub$OnInflateListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewStub$OnInflateListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7171,10 +7366,13 @@ public partial class OnDrawListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public OnDrawListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnDrawListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnDrawListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7196,10 +7394,13 @@ public partial class OnDrawListenerDirect : OnDrawListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnDrawListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnDrawListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7230,10 +7431,13 @@ public partial class OnGlobalFocusChangeListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public OnGlobalFocusChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnGlobalFocusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnGlobalFocusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7255,10 +7459,13 @@ public partial class OnGlobalFocusChangeListenerDirect : OnGlobalFocusChangeList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnGlobalFocusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnGlobalFocusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7289,10 +7496,13 @@ public partial class OnGlobalLayoutListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnGlobalLayoutListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnGlobalLayoutListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnGlobalLayoutListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7314,10 +7524,13 @@ public partial class OnGlobalLayoutListenerDirect : OnGlobalLayoutListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnGlobalLayoutListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnGlobalLayoutListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7348,10 +7561,13 @@ public partial class OnPreDrawListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnPreDrawListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnPreDrawListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnPreDrawListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7373,10 +7589,13 @@ public partial class OnPreDrawListenerDirect : OnPreDrawListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnPreDrawListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnPreDrawListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7407,10 +7626,13 @@ public partial class OnScrollChangedListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnScrollChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnScrollChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnScrollChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7432,10 +7654,13 @@ public partial class OnScrollChangedListenerDirect : OnScrollChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnScrollChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnScrollChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7466,10 +7691,13 @@ public partial class OnTouchModeChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnTouchModeChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnTouchModeChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnTouchModeChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7491,10 +7719,13 @@ public partial class OnTouchModeChangeListenerDirect : OnTouchModeChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnTouchModeChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnTouchModeChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7525,10 +7756,13 @@ public partial class OnWindowAttachListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnWindowAttachListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnWindowAttachListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnWindowAttachListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7550,10 +7784,13 @@ public partial class OnWindowAttachListenerDirect : OnWindowAttachListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnWindowAttachListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnWindowAttachListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7584,10 +7821,13 @@ public partial class OnWindowFocusChangeListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public OnWindowFocusChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnWindowFocusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnWindowFocusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7609,10 +7849,13 @@ public partial class OnWindowFocusChangeListenerDirect : OnWindowFocusChangeList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnWindowFocusChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnWindowFocusChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7643,10 +7886,13 @@ public partial class OnWindowVisibilityChangeListener : MASES.JCOBridge.C2JBridg
             /// </summary>
             public OnWindowVisibilityChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.ViewTreeObserver_OnWindowVisibilityChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnWindowVisibilityChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7668,10 +7914,13 @@ public partial class OnWindowVisibilityChangeListenerDirect : OnWindowVisibility
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.ViewTreeObserver$OnWindowVisibilityChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.ViewTreeObserver$OnWindowVisibilityChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7705,12 +7954,12 @@ public partial class Window : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Window>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Window class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Window class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Window() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Window class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Window class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Window(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7747,12 +7996,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7794,10 +8043,13 @@ public partial class OnFrameMetricsAvailableListener : MASES.JCOBridge.C2JBridge
             /// </summary>
             public OnFrameMetricsAvailableListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.Window_OnFrameMetricsAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnFrameMetricsAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7819,10 +8071,13 @@ public partial class OnFrameMetricsAvailableListenerDirect : OnFrameMetricsAvail
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.Window$OnFrameMetricsAvailableListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.Window$OnFrameMetricsAvailableListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7853,10 +8108,13 @@ public partial class OnRestrictedCaptionAreaChangedListener : MASES.JCOBridge.C2
             /// </summary>
             public OnRestrictedCaptionAreaChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.Window_OnRestrictedCaptionAreaChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnRestrictedCaptionAreaChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7878,10 +8136,13 @@ public partial class OnRestrictedCaptionAreaChangedListenerDirect : OnRestricted
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.Window$OnRestrictedCaptionAreaChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.Window$OnRestrictedCaptionAreaChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7909,7 +8170,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/view/WindowAnimationFrameStats.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class WindowAnimationFrameStats : Android.View.FrameStats
     {
         const string _bridgeClassName = "android.view.WindowAnimationFrameStats";
@@ -8044,12 +8305,12 @@ public partial class FocusObserver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Foc
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FocusObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FocusObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FocusObserver() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FocusObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FocusObserver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FocusObserver(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8354,12 +8615,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8404,12 +8665,12 @@ public partial class WindowInsetsAnimationController : MASES.JCOBridge.C2JBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WindowInsetsAnimationController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WindowInsetsAnimationController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WindowInsetsAnimationController() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WindowInsetsAnimationController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WindowInsetsAnimationController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WindowInsetsAnimationController(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8451,10 +8712,13 @@ public partial class WindowInsetsAnimationControlListener : MASES.JCOBridge.C2JB
         /// </summary>
         public WindowInsetsAnimationControlListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.view.WindowInsetsAnimationControlListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.view.WindowInsetsAnimationControlListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -8476,10 +8740,13 @@ public partial class WindowInsetsAnimationControlListenerDirect : WindowInsetsAn
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.view.WindowInsetsAnimationControlListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.view.WindowInsetsAnimationControlListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -8509,12 +8776,12 @@ public partial class WindowInsetsController : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WindowInsetsController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WindowInsetsController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WindowInsetsController() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WindowInsetsController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WindowInsetsController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WindowInsetsController(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8552,10 +8819,13 @@ public partial class OnControllableInsetsChangedListener : MASES.JCOBridge.C2JBr
             /// </summary>
             public OnControllableInsetsChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.WindowInsetsController_OnControllableInsetsChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.OnControllableInsetsChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -8577,10 +8847,13 @@ public partial class OnControllableInsetsChangedListenerDirect : OnControllableI
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.WindowInsetsController$OnControllableInsetsChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.WindowInsetsController$OnControllableInsetsChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -8614,12 +8887,12 @@ public partial class WindowManager : Android.View.ViewManager
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WindowManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WindowManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WindowManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WindowManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WindowManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WindowManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/View/Animation/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Animation/AllPackageClasses.cs
index a2bf96af1..cb4cca2aa 100644
--- a/src/net/Netdroid/Generated/Android/View/Animation/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Animation/AllPackageClasses.cs
@@ -168,12 +168,12 @@ public partial class Animation : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Animation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Animation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Animation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Animation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Animation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Animation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -211,10 +211,13 @@ public partial class AnimationListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public AnimationListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.animation.Animation_AnimationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.animation.AnimationListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -236,10 +239,13 @@ public partial class AnimationListenerDirect : AnimationListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.animation.Animation$AnimationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.animation.Animation$AnimationListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -449,12 +455,12 @@ public partial class BaseInterpolator : Android.View.Animation.Interpolator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BaseInterpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BaseInterpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BaseInterpolator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BaseInterpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BaseInterpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BaseInterpolator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -715,12 +721,12 @@ public partial class Interpolator : Android.Animation.TimeInterpolator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Interpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Interpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Interpolator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Interpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Interpolator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Interpolator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/View/Animation/Animation.cs b/src/net/Netdroid/Generated/Android/View/Animation/Animation.cs
index 59bd634a4..fb50ac4d3 100644
--- a/src/net/Netdroid/Generated/Android/View/Animation/Animation.cs
+++ b/src/net/Netdroid/Generated/Android/View/Animation/Animation.cs
@@ -115,97 +115,45 @@ public Animation(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getBackdropColor()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setBackdropColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getInterpolator()"/>
         /// </summary>
-        public int BackdropColor
+        /// <returns><see cref="Android.View.Animation.Interpolator"/></returns>
+        public Android.View.Animation.Interpolator GetInterpolator()
         {
-            get { return IExecuteWithSignature<int>("getBackdropColor", "()I"); } set { IExecuteWithSignature("setBackdropColor", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.Animation.Interpolator>("getInterpolator", "()Landroid/view/animation/Interpolator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getBackgroundColor()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setBackgroundColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getDetachWallpaper()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int BackgroundColor
-        {
-            get { return IExecuteWithSignature<int>("getBackgroundColor", "()I"); } set { IExecuteWithSignature("setBackgroundColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getDetachWallpaper()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setDetachWallpaper(boolean)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public bool DetachWallpaper
-        {
-            get { return IExecuteWithSignature<bool>("getDetachWallpaper", "()Z"); } set { IExecuteWithSignature("setDetachWallpaper", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getDuration()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setDuration(long)"/>
-        /// </summary>
-        public long Duration
-        {
-            get { return IExecuteWithSignature<long>("getDuration", "()J"); } set { IExecuteWithSignature("setDuration", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getFillAfter()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setFillAfter(boolean)"/>
-        /// </summary>
-        public bool FillAfter
-        {
-            get { return IExecuteWithSignature<bool>("getFillAfter", "()Z"); } set { IExecuteWithSignature("setFillAfter", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getFillBefore()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setFillBefore(boolean)"/>
-        /// </summary>
-        public bool FillBefore
-        {
-            get { return IExecuteWithSignature<bool>("getFillBefore", "()Z"); } set { IExecuteWithSignature("setFillBefore", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getInterpolator()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setInterpolator(android.view.animation.Interpolator)"/>
-        /// </summary>
-        public Android.View.Animation.Interpolator Interpolator
-        {
-            get { return IExecuteWithSignature<Android.View.Animation.Interpolator>("getInterpolator", "()Landroid/view/animation/Interpolator;"); } set { IExecuteWithSignature("setInterpolator", "(Landroid/view/animation/Interpolator;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getRepeatCount()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setRepeatCount(int)"/>
-        /// </summary>
-        public int RepeatCount
-        {
-            get { return IExecuteWithSignature<int>("getRepeatCount", "()I"); } set { IExecuteWithSignature("setRepeatCount", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getRepeatMode()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setRepeatMode(int)"/>
-        /// </summary>
-        public int RepeatMode
-        {
-            get { return IExecuteWithSignature<int>("getRepeatMode", "()I"); } set { IExecuteWithSignature("setRepeatMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getShowBackdrop()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setShowBackdrop(boolean)"/>
-        /// </summary>
-        public bool ShowBackdrop
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetDetachWallpaper()
         {
-            get { return IExecuteWithSignature<bool>("getShowBackdrop", "()Z"); } set { IExecuteWithSignature("setShowBackdrop", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getDetachWallpaper", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getStartOffset()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setStartOffset(long)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getFillAfter()"/>
         /// </summary>
-        public long StartOffset
+        /// <returns><see cref="bool"/></returns>
+        public bool GetFillAfter()
         {
-            get { return IExecuteWithSignature<long>("getStartOffset", "()J"); } set { IExecuteWithSignature("setStartOffset", "(J)V", value); }
+            return IExecuteWithSignature<bool>("getFillAfter", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getStartTime()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setStartTime(long)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getFillBefore()"/>
         /// </summary>
-        public long StartTime
+        /// <returns><see cref="bool"/></returns>
+        public bool GetFillBefore()
         {
-            get { return IExecuteWithSignature<long>("getStartTime", "()J"); } set { IExecuteWithSignature("setStartTime", "(J)V", value); }
+            return IExecuteWithSignature<bool>("getFillBefore", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getZAdjustment()"/> <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setZAdjustment(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getShowBackdrop()"/>
         /// </summary>
-        public int ZAdjustment
+        /// <returns><see cref="bool"/></returns>
+        public bool GetShowBackdrop()
         {
-            get { return IExecuteWithSignature<int>("getZAdjustment", "()I"); } set { IExecuteWithSignature("setZAdjustment", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getShowBackdrop", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getTransformation(long,android.view.animation.Transformation,float)"/>
@@ -277,6 +225,47 @@ public bool WillChangeTransformationMatrix()
             return IExecuteWithSignature<bool>("willChangeTransformationMatrix", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getBackdropColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBackdropColor()
+        {
+            return IExecuteWithSignature<int>("getBackdropColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getBackgroundColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetBackgroundColor()
+        {
+            return IExecuteWithSignature<int>("getBackgroundColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getRepeatCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatCount()
+        {
+            return IExecuteWithSignature<int>("getRepeatCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getRepeatMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatMode()
+        {
+            return IExecuteWithSignature<int>("getRepeatMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getZAdjustment()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetZAdjustment()
+        {
+            return IExecuteWithSignature<int>("getZAdjustment", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#computeDurationHint()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
@@ -285,6 +274,30 @@ public long ComputeDurationHint()
             return IExecuteWithSignature<long>("computeDurationHint", "()J");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getDuration()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDuration()
+        {
+            return IExecuteWithSignature<long>("getDuration", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getStartOffset()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetStartOffset()
+        {
+            return IExecuteWithSignature<long>("getStartOffset", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#getStartTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetStartTime()
+        {
+            return IExecuteWithSignature<long>("getStartTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#cancel()"/>
         /// </summary>
         public void Cancel()
@@ -334,6 +347,56 @@ public void SetAnimationListener(Android.View.Animation.Animation.AnimationListe
             IExecuteWithSignature("setAnimationListener", "(Landroid/view/animation/Animation$AnimationListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setBackdropColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBackdropColor(int arg0)
+        {
+            IExecuteWithSignature("setBackdropColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setBackgroundColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetBackgroundColor(int arg0)
+        {
+            IExecuteWithSignature("setBackgroundColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setDetachWallpaper(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetDetachWallpaper(bool arg0)
+        {
+            IExecuteWithSignature("setDetachWallpaper", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setDuration(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetDuration(long arg0)
+        {
+            IExecuteWithSignature("setDuration", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setFillAfter(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetFillAfter(bool arg0)
+        {
+            IExecuteWithSignature("setFillAfter", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setFillBefore(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetFillBefore(bool arg0)
+        {
+            IExecuteWithSignature("setFillBefore", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setFillEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -351,6 +414,62 @@ public void SetInterpolator(Android.Content.Context arg0, int arg1)
             IExecute("setInterpolator", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setInterpolator(android.view.animation.Interpolator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.Interpolator"/></param>
+        public void SetInterpolator(Android.View.Animation.Interpolator arg0)
+        {
+            IExecuteWithSignature("setInterpolator", "(Landroid/view/animation/Interpolator;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setRepeatCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRepeatCount(int arg0)
+        {
+            IExecuteWithSignature("setRepeatCount", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setRepeatMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRepeatMode(int arg0)
+        {
+            IExecuteWithSignature("setRepeatMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setShowBackdrop(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetShowBackdrop(bool arg0)
+        {
+            IExecuteWithSignature("setShowBackdrop", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setStartOffset(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetStartOffset(long arg0)
+        {
+            IExecuteWithSignature("setStartOffset", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setStartTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetStartTime(long arg0)
+        {
+            IExecuteWithSignature("setStartTime", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#setZAdjustment(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetZAdjustment(int arg0)
+        {
+            IExecuteWithSignature("setZAdjustment", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/Animation.html#start()"/>
         /// </summary>
         public void Start()
@@ -393,9 +512,9 @@ public partial class AnimationListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onAnimationEnd", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>>>(OnAnimationEndEventHandler));
-                AddEventHandler("onAnimationRepeat", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>>>(OnAnimationRepeatEventHandler));
-                AddEventHandler("onAnimationStart", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>>>(OnAnimationStartEventHandler));
+                AddEventHandler("onAnimationEnd", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>>>(OnAnimationEndEventHandler));
+                AddEventHandler("onAnimationRepeat", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>>>(OnAnimationRepeatEventHandler));
+                AddEventHandler("onAnimationStart", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>>>(OnAnimationStartEventHandler));
 
             }
 
@@ -403,7 +522,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/animation/Animation.AnimationListener.html#onAnimationEnd(android.view.animation.Animation)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationEnd"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Animation.Animation> OnOnAnimationEnd { get; set; } = null;
+            public global::System.Action<Android.View.Animation.Animation> OnOnAnimationEnd { get; set; } = null;
 
             void OnAnimationEndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>> data)
             {
@@ -424,7 +543,7 @@ public virtual void OnAnimationEnd(Android.View.Animation.Animation arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/animation/Animation.AnimationListener.html#onAnimationRepeat(android.view.animation.Animation)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationRepeat"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Animation.Animation> OnOnAnimationRepeat { get; set; } = null;
+            public global::System.Action<Android.View.Animation.Animation> OnOnAnimationRepeat { get; set; } = null;
 
             void OnAnimationRepeatEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>> data)
             {
@@ -445,7 +564,7 @@ public virtual void OnAnimationRepeat(Android.View.Animation.Animation arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/animation/Animation.AnimationListener.html#onAnimationStart(android.view.animation.Animation)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnAnimationStart"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Animation.Animation> OnOnAnimationStart { get; set; } = null;
+            public global::System.Action<Android.View.Animation.Animation> OnOnAnimationStart { get; set; } = null;
 
             void OnAnimationStartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Animation.Animation>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/Animation/AnimationSet.cs b/src/net/Netdroid/Generated/Android/View/Animation/AnimationSet.cs
index 9da7f920f..c1e5b887a 100644
--- a/src/net/Netdroid/Generated/Android/View/Animation/AnimationSet.cs
+++ b/src/net/Netdroid/Generated/Android/View/Animation/AnimationSet.cs
@@ -63,11 +63,12 @@ public AnimationSet(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/AnimationSet.html#getAnimations()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/animation/AnimationSet.html#getAnimations()"/>
         /// </summary>
-        public Java.Util.List<Android.View.Animation.Animation> Animations
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Animation.Animation> GetAnimations()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Animation.Animation>>("getAnimations", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.View.Animation.Animation>>("getAnimations", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/AnimationSet.html#addAnimation(android.view.animation.Animation)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Animation/GridLayoutAnimationController.cs b/src/net/Netdroid/Generated/Android/View/Animation/GridLayoutAnimationController.cs
index f1781fa85..d64410e8a 100644
--- a/src/net/Netdroid/Generated/Android/View/Animation/GridLayoutAnimationController.cs
+++ b/src/net/Netdroid/Generated/Android/View/Animation/GridLayoutAnimationController.cs
@@ -127,32 +127,68 @@ public GridLayoutAnimationController(Android.View.Animation.Animation arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#getColumnDelay()"/> <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#setColumnDelay(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#getColumnDelay()"/>
         /// </summary>
-        public float ColumnDelay
+        /// <returns><see cref="float"/></returns>
+        public float GetColumnDelay()
         {
-            get { return IExecuteWithSignature<float>("getColumnDelay", "()F"); } set { IExecuteWithSignature("setColumnDelay", "(F)V", value); }
+            return IExecuteWithSignature<float>("getColumnDelay", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#getDirection()"/> <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#setDirection(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#getRowDelay()"/>
         /// </summary>
-        public int Direction
+        /// <returns><see cref="float"/></returns>
+        public float GetRowDelay()
         {
-            get { return IExecuteWithSignature<int>("getDirection", "()I"); } set { IExecuteWithSignature("setDirection", "(I)V", value); }
+            return IExecuteWithSignature<float>("getRowDelay", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#getDirectionPriority()"/> <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#setDirectionPriority(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#getDirection()"/>
         /// </summary>
-        public int DirectionPriority
+        /// <returns><see cref="int"/></returns>
+        public int GetDirection()
         {
-            get { return IExecuteWithSignature<int>("getDirectionPriority", "()I"); } set { IExecuteWithSignature("setDirectionPriority", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDirection", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#getRowDelay()"/> <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#setRowDelay(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#getDirectionPriority()"/>
         /// </summary>
-        public float RowDelay
+        /// <returns><see cref="int"/></returns>
+        public int GetDirectionPriority()
         {
-            get { return IExecuteWithSignature<float>("getRowDelay", "()F"); } set { IExecuteWithSignature("setRowDelay", "(F)V", value); }
+            return IExecuteWithSignature<int>("getDirectionPriority", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#setColumnDelay(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetColumnDelay(float arg0)
+        {
+            IExecuteWithSignature("setColumnDelay", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#setDirection(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDirection(int arg0)
+        {
+            IExecuteWithSignature("setDirection", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#setDirectionPriority(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDirectionPriority(int arg0)
+        {
+            IExecuteWithSignature("setDirectionPriority", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/GridLayoutAnimationController.html#setRowDelay(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetRowDelay(float arg0)
+        {
+            IExecuteWithSignature("setRowDelay", "(F)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Animation/LayoutAnimationController.cs b/src/net/Netdroid/Generated/Android/View/Animation/LayoutAnimationController.cs
index 6e4e6ba44..df042fa05 100644
--- a/src/net/Netdroid/Generated/Android/View/Animation/LayoutAnimationController.cs
+++ b/src/net/Netdroid/Generated/Android/View/Animation/LayoutAnimationController.cs
@@ -90,32 +90,20 @@ public LayoutAnimationController(Android.View.Animation.Animation arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#getAnimation()"/> <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setAnimation(android.view.animation.Animation)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#getAnimation()"/>
         /// </summary>
-        public Android.View.Animation.Animation Animation
-        {
-            get { return IExecuteWithSignature<Android.View.Animation.Animation>("getAnimation", "()Landroid/view/animation/Animation;"); } set { IExecuteWithSignature("setAnimation", "(Landroid/view/animation/Animation;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#getDelay()"/> <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setDelay(float)"/>
-        /// </summary>
-        public float Delay
-        {
-            get { return IExecuteWithSignature<float>("getDelay", "()F"); } set { IExecuteWithSignature("setDelay", "(F)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#getInterpolator()"/> <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setInterpolator(android.view.animation.Interpolator)"/>
-        /// </summary>
-        public Android.View.Animation.Interpolator Interpolator
+        /// <returns><see cref="Android.View.Animation.Animation"/></returns>
+        public Android.View.Animation.Animation GetAnimation()
         {
-            get { return IExecuteWithSignature<Android.View.Animation.Interpolator>("getInterpolator", "()Landroid/view/animation/Interpolator;"); } set { IExecuteWithSignature("setInterpolator", "(Landroid/view/animation/Interpolator;)V", value); }
+            return IExecuteWithSignature<Android.View.Animation.Animation>("getAnimation", "()Landroid/view/animation/Animation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#getOrder()"/> <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setOrder(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#getInterpolator()"/>
         /// </summary>
-        public int Order
+        /// <returns><see cref="Android.View.Animation.Interpolator"/></returns>
+        public Android.View.Animation.Interpolator GetInterpolator()
         {
-            get { return IExecuteWithSignature<int>("getOrder", "()I"); } set { IExecuteWithSignature("setOrder", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.Animation.Interpolator>("getInterpolator", "()Landroid/view/animation/Interpolator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#isDone()"/>
@@ -143,6 +131,22 @@ public Android.View.Animation.Animation GetAnimationForView(Android.View.View ar
             return IExecuteWithSignature<Android.View.Animation.Animation>("getAnimationForView", "(Landroid/view/View;)Landroid/view/animation/Animation;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#getDelay()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetDelay()
+        {
+            return IExecuteWithSignature<float>("getDelay", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#getOrder()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetOrder()
+        {
+            return IExecuteWithSignature<int>("getOrder", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setAnimation(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -152,6 +156,22 @@ public void SetAnimation(Android.Content.Context arg0, int arg1)
             IExecute("setAnimation", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setAnimation(android.view.animation.Animation)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.Animation"/></param>
+        public void SetAnimation(Android.View.Animation.Animation arg0)
+        {
+            IExecuteWithSignature("setAnimation", "(Landroid/view/animation/Animation;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setDelay(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetDelay(float arg0)
+        {
+            IExecuteWithSignature("setDelay", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setInterpolator(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -161,6 +181,22 @@ public void SetInterpolator(Android.Content.Context arg0, int arg1)
             IExecute("setInterpolator", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setInterpolator(android.view.animation.Interpolator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.Interpolator"/></param>
+        public void SetInterpolator(Android.View.Animation.Interpolator arg0)
+        {
+            IExecuteWithSignature("setInterpolator", "(Landroid/view/animation/Interpolator;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#setOrder(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOrder(int arg0)
+        {
+            IExecuteWithSignature("setOrder", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/LayoutAnimationController.html#start()"/>
         /// </summary>
         public void Start()
diff --git a/src/net/Netdroid/Generated/Android/View/Animation/Transformation.cs b/src/net/Netdroid/Generated/Android/View/Animation/Transformation.cs
index 3d9e0b36c..641e9b77a 100644
--- a/src/net/Netdroid/Generated/Android/View/Animation/Transformation.cs
+++ b/src/net/Netdroid/Generated/Android/View/Animation/Transformation.cs
@@ -70,25 +70,28 @@ public partial class Transformation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#getAlpha()"/> <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#setAlpha(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#getMatrix()"/>
         /// </summary>
-        public float Alpha
+        /// <returns><see cref="Android.Graphics.Matrix"/></returns>
+        public Android.Graphics.Matrix GetMatrix()
         {
-            get { return IExecuteWithSignature<float>("getAlpha", "()F"); } set { IExecuteWithSignature("setAlpha", "(F)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Matrix>("getMatrix", "()Landroid/graphics/Matrix;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#getMatrix()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#getAlpha()"/>
         /// </summary>
-        public Android.Graphics.Matrix Matrix
+        /// <returns><see cref="float"/></returns>
+        public float GetAlpha()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Matrix>("getMatrix", "()Landroid/graphics/Matrix;"); }
+            return IExecuteWithSignature<float>("getAlpha", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#getTransformationType()"/> <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#setTransformationType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#getTransformationType()"/>
         /// </summary>
-        public int TransformationType
+        /// <returns><see cref="int"/></returns>
+        public int GetTransformationType()
         {
-            get { return IExecuteWithSignature<int>("getTransformationType", "()I"); } set { IExecuteWithSignature("setTransformationType", "(I)V", value); }
+            return IExecuteWithSignature<int>("getTransformationType", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#toShortString()"/>
@@ -121,6 +124,22 @@ public void Set(Android.View.Animation.Transformation arg0)
         {
             IExecuteWithSignature("set", "(Landroid/view/animation/Transformation;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#setAlpha(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetAlpha(float arg0)
+        {
+            IExecuteWithSignature("setAlpha", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/animation/Transformation.html#setTransformationType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTransformationType(int arg0)
+        {
+            IExecuteWithSignature("setTransformationType", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/AttachedSurfaceControl.cs b/src/net/Netdroid/Generated/Android/View/AttachedSurfaceControl.cs
index f7f46f730..e657d538d 100644
--- a/src/net/Netdroid/Generated/Android/View/AttachedSurfaceControl.cs
+++ b/src/net/Netdroid/Generated/Android/View/AttachedSurfaceControl.cs
@@ -64,13 +64,6 @@ public partial class AttachedSurfaceControl : Android.View.IAttachedSurfaceContr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/AttachedSurfaceControl.html#getBufferTransformHint()"/> 
-        /// </summary>
-        public int BufferTransformHint
-        {
-            get { return IExecuteWithSignature<int>("getBufferTransformHint", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/AttachedSurfaceControl.html#buildReparentTransaction(android.view.SurfaceControl)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.SurfaceControl"/></param>
@@ -89,6 +82,14 @@ public bool ApplyTransactionOnDraw(Android.View.SurfaceControl.Transaction arg0)
             return IExecuteWithSignature<bool>("applyTransactionOnDraw", "(Landroid/view/SurfaceControl$Transaction;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/AttachedSurfaceControl.html#getBufferTransformHint()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBufferTransformHint()
+        {
+            return IExecuteWithSignature<int>("getBufferTransformHint", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/AttachedSurfaceControl.html#addOnBufferTransformHintChangedListener(android.view.AttachedSurfaceControl.OnBufferTransformHintChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.AttachedSurfaceControl.OnBufferTransformHintChangedListener"/></param>
@@ -149,7 +150,7 @@ public partial class OnBufferTransformHintChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onBufferTransformHintChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnBufferTransformHintChangedEventHandler));
+                AddEventHandler("onBufferTransformHintChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnBufferTransformHintChangedEventHandler));
 
             }
 
@@ -157,7 +158,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/AttachedSurfaceControl.OnBufferTransformHintChangedListener.html#onBufferTransformHintChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnBufferTransformHintChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnBufferTransformHintChanged { get; set; } = null;
+            public global::System.Action<int> OnOnBufferTransformHintChanged { get; set; } = null;
 
             void OnBufferTransformHintChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/Autofill/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Autofill/AllPackageClasses.cs
index 5038a7194..0cf02f87f 100644
--- a/src/net/Netdroid/Generated/Android/View/Autofill/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Autofill/AllPackageClasses.cs
@@ -120,12 +120,12 @@ public partial class AutofillCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AutofillCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AutofillCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AutofillCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AutofillCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AutofillCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AutofillCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/View/Autofill/AutofillManager.cs b/src/net/Netdroid/Generated/Android/View/Autofill/AutofillManager.cs
index f6825fee1..f59fee100 100644
--- a/src/net/Netdroid/Generated/Android/View/Autofill/AutofillManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Autofill/AutofillManager.cs
@@ -76,46 +76,28 @@ public partial class AutofillManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getAutofillServiceComponentName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getAutofillServiceComponentName()"/>
         /// </summary>
-        public Android.Content.ComponentName AutofillServiceComponentName
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetAutofillServiceComponentName()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getAutofillServiceComponentName", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getAutofillServiceComponentName", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getAvailableFieldClassificationAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getUserData()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> AvailableFieldClassificationAlgorithms
+        /// <returns><see cref="Android.Service.Autofill.UserData"/></returns>
+        public Android.Service.Autofill.UserData GetUserData()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAvailableFieldClassificationAlgorithms", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Service.Autofill.UserData>("getUserData", "()Landroid/service/autofill/UserData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getDefaultFieldClassificationAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getNextAutofillId()"/>
         /// </summary>
-        public Java.Lang.String DefaultFieldClassificationAlgorithm
+        /// <returns><see cref="Android.View.Autofill.AutofillId"/></returns>
+        public Android.View.Autofill.AutofillId GetNextAutofillId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDefaultFieldClassificationAlgorithm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getNextAutofillId()"/> 
-        /// </summary>
-        public Android.View.Autofill.AutofillId NextAutofillId
-        {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getNextAutofillId", "()Landroid/view/autofill/AutofillId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getUserData()"/> <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#setUserData(android.service.autofill.UserData)"/>
-        /// </summary>
-        public Android.Service.Autofill.UserData UserData
-        {
-            get { return IExecuteWithSignature<Android.Service.Autofill.UserData>("getUserData", "()Landroid/service/autofill/UserData;"); } set { IExecuteWithSignature("setUserData", "(Landroid/service/autofill/UserData;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getUserDataId()"/> 
-        /// </summary>
-        public Java.Lang.String UserDataId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserDataId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getNextAutofillId", "()Landroid/view/autofill/AutofillId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#hasEnabledAutofillServices()"/>
@@ -169,6 +151,30 @@ public bool ShowAutofillDialog(Android.View.View arg0)
             return IExecuteWithSignature<bool>("showAutofillDialog", "(Landroid/view/View;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getDefaultFieldClassificationAlgorithm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDefaultFieldClassificationAlgorithm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDefaultFieldClassificationAlgorithm", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getUserDataId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUserDataId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUserDataId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#getAvailableFieldClassificationAlgorithms()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetAvailableFieldClassificationAlgorithms()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getAvailableFieldClassificationAlgorithms", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#cancel()"/>
         /// </summary>
         public void Cancel()
@@ -314,6 +320,14 @@ public void RequestAutofill(Android.View.View arg0)
             IExecuteWithSignature("requestAutofill", "(Landroid/view/View;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#setUserData(android.service.autofill.UserData)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Service.Autofill.UserData"/></param>
+        public void SetUserData(Android.Service.Autofill.UserData arg0)
+        {
+            IExecuteWithSignature("setUserData", "(Landroid/service/autofill/UserData;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillManager.html#unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Autofill.AutofillManager.AutofillCallback"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Autofill/AutofillValue.cs b/src/net/Netdroid/Generated/Android/View/Autofill/AutofillValue.cs
index 8ce33f74d..c791bae13 100644
--- a/src/net/Netdroid/Generated/Android/View/Autofill/AutofillValue.cs
+++ b/src/net/Netdroid/Generated/Android/View/Autofill/AutofillValue.cs
@@ -88,32 +88,12 @@ public static Android.View.Autofill.AutofillValue ForToggle(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#getDateValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#getToggleValue()"/>
         /// </summary>
-        public long DateValue
-        {
-            get { return IExecuteWithSignature<long>("getDateValue", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#getListValue()"/> 
-        /// </summary>
-        public int ListValue
-        {
-            get { return IExecuteWithSignature<int>("getListValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#getTextValue()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence TextValue
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTextValue", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#getToggleValue()"/> 
-        /// </summary>
-        public bool ToggleValue
+        /// <returns><see cref="bool"/></returns>
+        public bool GetToggleValue()
         {
-            get { return IExecuteWithSignature<bool>("getToggleValue", "()Z"); }
+            return IExecuteWithSignature<bool>("getToggleValue", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#isDate()"/>
@@ -156,6 +136,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#getListValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetListValue()
+        {
+            return IExecuteWithSignature<int>("getListValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#getTextValue()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTextValue()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTextValue", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#getDateValue()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDateValue()
+        {
+            return IExecuteWithSignature<long>("getDateValue", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/autofill/AutofillValue.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Autofill/VirtualViewFillInfo.cs b/src/net/Netdroid/Generated/Android/View/Autofill/VirtualViewFillInfo.cs
index 4ebd31011..250c2b4c9 100644
--- a/src/net/Netdroid/Generated/Android/View/Autofill/VirtualViewFillInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Autofill/VirtualViewFillInfo.cs
@@ -46,11 +46,12 @@ public partial class VirtualViewFillInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/autofill/VirtualViewFillInfo.html#getAutofillHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/autofill/VirtualViewFillInfo.html#getAutofillHints()"/>
         /// </summary>
-        public Java.Lang.String[] AutofillHints
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetAutofillHints()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getAutofillHints", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getAutofillHints", "()[Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Choreographer.cs b/src/net/Netdroid/Generated/Android/View/Choreographer.cs
index 9da2fa562..6fb83c23e 100644
--- a/src/net/Netdroid/Generated/Android/View/Choreographer.cs
+++ b/src/net/Netdroid/Generated/Android/View/Choreographer.cs
@@ -42,11 +42,12 @@ public partial class Choreographer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Choreographer.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Choreographer.html#getInstance()"/>
         /// </summary>
-        public static Android.View.Choreographer Instance
+        /// <returns><see cref="Android.View.Choreographer"/></returns>
+        public static Android.View.Choreographer GetInstance()
         {
-            get { return SExecuteWithSignature<Android.View.Choreographer>(LocalBridgeClazz, "getInstance", "()Landroid/view/Choreographer;"); }
+            return SExecuteWithSignature<Android.View.Choreographer>(LocalBridgeClazz, "getInstance", "()Landroid/view/Choreographer;");
         }
 
         #endregion
@@ -157,25 +158,28 @@ public partial class FrameData
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameData.html#getFrameTimelines()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameData.html#getPreferredFrameTimeline()"/>
             /// </summary>
-            public Android.View.Choreographer.FrameTimeline[] FrameTimelines
+            /// <returns><see cref="Android.View.Choreographer.FrameTimeline"/></returns>
+            public Android.View.Choreographer.FrameTimeline GetPreferredFrameTimeline()
             {
-                get { return IExecuteWithSignatureArray<Android.View.Choreographer.FrameTimeline>("getFrameTimelines", "()[Landroid/view/Choreographer$FrameTimeline;"); }
+                return IExecuteWithSignature<Android.View.Choreographer.FrameTimeline>("getPreferredFrameTimeline", "()Landroid/view/Choreographer$FrameTimeline;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameData.html#getFrameTimeNanos()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameData.html#getFrameTimelines()"/>
             /// </summary>
-            public long FrameTimeNanos
+            /// <returns><see cref="Android.View.Choreographer.FrameTimeline"/></returns>
+            public Android.View.Choreographer.FrameTimeline[] GetFrameTimelines()
             {
-                get { return IExecuteWithSignature<long>("getFrameTimeNanos", "()J"); }
+                return IExecuteWithSignatureArray<Android.View.Choreographer.FrameTimeline>("getFrameTimelines", "()[Landroid/view/Choreographer$FrameTimeline;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameData.html#getPreferredFrameTimeline()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameData.html#getFrameTimeNanos()"/>
             /// </summary>
-            public Android.View.Choreographer.FrameTimeline PreferredFrameTimeline
+            /// <returns><see cref="long"/></returns>
+            public long GetFrameTimeNanos()
             {
-                get { return IExecuteWithSignature<Android.View.Choreographer.FrameTimeline>("getPreferredFrameTimeline", "()Landroid/view/Choreographer$FrameTimeline;"); }
+                return IExecuteWithSignature<long>("getFrameTimeNanos", "()J");
             }
 
             #endregion
@@ -209,25 +213,28 @@ public partial class FrameTimeline
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameTimeline.html#getDeadlineNanos()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameTimeline.html#getDeadlineNanos()"/>
             /// </summary>
-            public long DeadlineNanos
+            /// <returns><see cref="long"/></returns>
+            public long GetDeadlineNanos()
             {
-                get { return IExecuteWithSignature<long>("getDeadlineNanos", "()J"); }
+                return IExecuteWithSignature<long>("getDeadlineNanos", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameTimeline.html#getExpectedPresentationTimeNanos()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameTimeline.html#getExpectedPresentationTimeNanos()"/>
             /// </summary>
-            public long ExpectedPresentationTimeNanos
+            /// <returns><see cref="long"/></returns>
+            public long GetExpectedPresentationTimeNanos()
             {
-                get { return IExecuteWithSignature<long>("getExpectedPresentationTimeNanos", "()J"); }
+                return IExecuteWithSignature<long>("getExpectedPresentationTimeNanos", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameTimeline.html#getVsyncId()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Choreographer.FrameTimeline.html#getVsyncId()"/>
             /// </summary>
-            public long VsyncId
+            /// <returns><see cref="long"/></returns>
+            public long GetVsyncId()
             {
-                get { return IExecuteWithSignature<long>("getVsyncId", "()J"); }
+                return IExecuteWithSignature<long>("getVsyncId", "()J");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/ContentInfo.cs b/src/net/Netdroid/Generated/Android/View/ContentInfo.cs
index 10d466d32..55255a1ba 100644
--- a/src/net/Netdroid/Generated/Android/View/ContentInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/ContentInfo.cs
@@ -94,47 +94,52 @@ public partial class ContentInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getClip()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getClip()"/>
         /// </summary>
-        public Android.Content.ClipData Clip
+        /// <returns><see cref="Android.Content.ClipData"/></returns>
+        public Android.Content.ClipData GetClip()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipData>("getClip", "()Landroid/content/ClipData;"); }
+            return IExecuteWithSignature<Android.Content.ClipData>("getClip", "()Landroid/content/ClipData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getLinkUri()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetLinkUri()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getLinkUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getExtras()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getLinkUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#describeContents()"/>
         /// </summary>
-        public Android.Net.Uri LinkUri
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getLinkUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getFlags()"/>
         /// </summary>
-        public int Source
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<int>("getSource", "()I"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#getSource()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSource()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSource", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ContentInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Contentcapture/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Contentcapture/AllPackageClasses.cs
index 6d691050f..db05e8ee7 100644
--- a/src/net/Netdroid/Generated/Android/View/Contentcapture/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Contentcapture/AllPackageClasses.cs
@@ -212,12 +212,12 @@ public partial class ContentCaptureSession : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ContentCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentCaptureSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ContentCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentCaptureSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentCaptureSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -479,10 +479,13 @@ public partial class DataShareWriteAdapter : MASES.JCOBridge.C2JBridge.JVMBridge
         /// </summary>
         public DataShareWriteAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.view.contentcapture.DataShareWriteAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.view.contentcapture.DataShareWriteAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -504,10 +507,13 @@ public partial class DataShareWriteAdapterDirect : DataShareWriteAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.view.contentcapture.DataShareWriteAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.view.contentcapture.DataShareWriteAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureCondition.cs b/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureCondition.cs
index f6b058bf2..09b19279e 100644
--- a/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureCondition.cs
+++ b/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureCondition.cs
@@ -67,26 +67,28 @@ public ContentCaptureCondition(Android.Content.LocusId arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureCondition.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureCondition.html#getLocusId()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="Android.Content.LocusId"/></returns>
+        public Android.Content.LocusId GetLocusId()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureCondition.html#getLocusId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureCondition.html#describeContents()"/>
         /// </summary>
-        public Android.Content.LocusId LocusId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureCondition.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureCondition.html#getFlags()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetFlags()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureCondition.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureContext.cs b/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureContext.cs
index b6b8d8532..92fccc527 100644
--- a/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureContext.cs
+++ b/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureContext.cs
@@ -61,18 +61,20 @@ public static Android.View.Contentcapture.ContentCaptureContext ForLocusId(Java.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureContext.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureContext.html#getLocusId()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Content.LocusId"/></returns>
+        public Android.Content.LocusId GetLocusId()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureContext.html#getLocusId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureContext.html#getExtras()"/>
         /// </summary>
-        public Android.Content.LocusId LocusId
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureContext.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureManager.cs b/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureManager.cs
index fa75fded5..32173d80c 100644
--- a/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureManager.cs
@@ -64,18 +64,12 @@ public partial class ContentCaptureManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureManager.html#getContentCaptureConditions()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureManager.html#getServiceComponentName()"/>
         /// </summary>
-        public Java.Util.Set<Android.View.Contentcapture.ContentCaptureCondition> ContentCaptureConditions
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetServiceComponentName()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Android.View.Contentcapture.ContentCaptureCondition>>("getContentCaptureConditions", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureManager.html#getServiceComponentName()"/> 
-        /// </summary>
-        public Android.Content.ComponentName ServiceComponentName
-        {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getServiceComponentName", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getServiceComponentName", "()Landroid/content/ComponentName;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureManager.html#isContentCaptureEnabled()"/>
@@ -86,6 +80,14 @@ public bool IsContentCaptureEnabled()
             return IExecuteWithSignature<bool>("isContentCaptureEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureManager.html#getContentCaptureConditions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Android.View.Contentcapture.ContentCaptureCondition> GetContentCaptureConditions()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Android.View.Contentcapture.ContentCaptureCondition>>("getContentCaptureConditions", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureManager.html#removeData(android.view.contentcapture.DataRemovalRequest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Contentcapture.DataRemovalRequest"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureSession.cs b/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureSession.cs
index 82e891851..5b369d88c 100644
--- a/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureSession.cs
+++ b/src/net/Netdroid/Generated/Android/View/Contentcapture/ContentCaptureSession.cs
@@ -46,20 +46,6 @@ public partial class ContentCaptureSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#getContentCaptureContext()"/> <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#setContentCaptureContext(android.view.contentcapture.ContentCaptureContext)"/>
-        /// </summary>
-        public Android.View.Contentcapture.ContentCaptureContext ContentCaptureContext
-        {
-            get { return IExecuteWithSignature<Android.View.Contentcapture.ContentCaptureContext>("getContentCaptureContext", "()Landroid/view/contentcapture/ContentCaptureContext;"); } set { IExecuteWithSignature("setContentCaptureContext", "(Landroid/view/contentcapture/ContentCaptureContext;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#getContentCaptureSessionId()"/> 
-        /// </summary>
-        public Android.View.Contentcapture.ContentCaptureSessionId ContentCaptureSessionId
-        {
-            get { return IExecuteWithSignature<Android.View.Contentcapture.ContentCaptureSessionId>("getContentCaptureSessionId", "()Landroid/view/contentcapture/ContentCaptureSessionId;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#newAutofillId(android.view.autofill.AutofillId,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Autofill.AutofillId"/></param>
@@ -70,6 +56,14 @@ public Android.View.Autofill.AutofillId NewAutofillId(Android.View.Autofill.Auto
             return IExecute<Android.View.Autofill.AutofillId>("newAutofillId", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#getContentCaptureContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Contentcapture.ContentCaptureContext"/></returns>
+        public Android.View.Contentcapture.ContentCaptureContext GetContentCaptureContext()
+        {
+            return IExecuteWithSignature<Android.View.Contentcapture.ContentCaptureContext>("getContentCaptureContext", "()Landroid/view/contentcapture/ContentCaptureContext;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#createContentCaptureSession(android.view.contentcapture.ContentCaptureContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Contentcapture.ContentCaptureContext"/></param>
@@ -79,6 +73,14 @@ public Android.View.Contentcapture.ContentCaptureSession CreateContentCaptureSes
             return IExecuteWithSignature<Android.View.Contentcapture.ContentCaptureSession>("createContentCaptureSession", "(Landroid/view/contentcapture/ContentCaptureContext;)Landroid/view/contentcapture/ContentCaptureSession;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#getContentCaptureSessionId()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Contentcapture.ContentCaptureSessionId"/></returns>
+        public Android.View.Contentcapture.ContentCaptureSessionId GetContentCaptureSessionId()
+        {
+            return IExecuteWithSignature<Android.View.Contentcapture.ContentCaptureSessionId>("getContentCaptureSessionId", "()Landroid/view/contentcapture/ContentCaptureSessionId;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#newViewStructure(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -169,6 +171,14 @@ public void NotifyViewTextChanged(Android.View.Autofill.AutofillId arg0, Java.La
             IExecute("notifyViewTextChanged", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#setContentCaptureContext(android.view.contentcapture.ContentCaptureContext)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Contentcapture.ContentCaptureContext"/></param>
+        public void SetContentCaptureContext(Android.View.Contentcapture.ContentCaptureContext arg0)
+        {
+            IExecuteWithSignature("setContentCaptureContext", "(Landroid/view/contentcapture/ContentCaptureContext;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/ContentCaptureSession.html#close()"/>
         /// </summary>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Android/View/Contentcapture/DataRemovalRequest.cs b/src/net/Netdroid/Generated/Android/View/Contentcapture/DataRemovalRequest.cs
index d1db41ebf..dcfba5280 100644
--- a/src/net/Netdroid/Generated/Android/View/Contentcapture/DataRemovalRequest.cs
+++ b/src/net/Netdroid/Generated/Android/View/Contentcapture/DataRemovalRequest.cs
@@ -58,20 +58,6 @@ public partial class DataRemovalRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.html#getLocusIdRequests()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.Contentcapture.DataRemovalRequest.LocusIdRequest> LocusIdRequests
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Contentcapture.DataRemovalRequest.LocusIdRequest>>("getLocusIdRequests", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.html#isForEverything()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -88,6 +74,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.html#getLocusIdRequests()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Contentcapture.DataRemovalRequest.LocusIdRequest> GetLocusIdRequests()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Contentcapture.DataRemovalRequest.LocusIdRequest>>("getLocusIdRequests", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -178,18 +180,20 @@ public partial class LocusIdRequest
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.LocusIdRequest.html#getFlags()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.LocusIdRequest.html#getLocusId()"/>
             /// </summary>
-            public int Flags
+            /// <returns><see cref="Android.Content.LocusId"/></returns>
+            public Android.Content.LocusId GetLocusId()
             {
-                get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+                return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.LocusIdRequest.html#getLocusId()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataRemovalRequest.LocusIdRequest.html#getFlags()"/>
             /// </summary>
-            public Android.Content.LocusId LocusId
+            /// <returns><see cref="int"/></returns>
+            public int GetFlags()
             {
-                get { return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;"); }
+                return IExecuteWithSignature<int>("getFlags", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Contentcapture/DataShareRequest.cs b/src/net/Netdroid/Generated/Android/View/Contentcapture/DataShareRequest.cs
index 8e94e5308..45b7e6024 100644
--- a/src/net/Netdroid/Generated/Android/View/Contentcapture/DataShareRequest.cs
+++ b/src/net/Netdroid/Generated/Android/View/Contentcapture/DataShareRequest.cs
@@ -61,33 +61,36 @@ public DataShareRequest(Android.Content.LocusId arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#getLocusId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#getLocusId()"/>
         /// </summary>
-        public Android.Content.LocusId LocusId
+        /// <returns><see cref="Android.Content.LocusId"/></returns>
+        public Android.Content.LocusId GetLocusId()
         {
-            get { return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;"); }
+            return IExecuteWithSignature<Android.Content.LocusId>("getLocusId", "()Landroid/content/LocusId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#getMimeType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String MimeType
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#getMimeType()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMimeType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#getPackageName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Contentcapture/DataShareWriteAdapter.cs b/src/net/Netdroid/Generated/Android/View/Contentcapture/DataShareWriteAdapter.cs
index 8ab87c007..c28491a3e 100644
--- a/src/net/Netdroid/Generated/Android/View/Contentcapture/DataShareWriteAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/View/Contentcapture/DataShareWriteAdapter.cs
@@ -68,9 +68,9 @@ public partial class DataShareWriteAdapter : Android.View.Contentcapture.IDataSh
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onRejected", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnRejectedEventHandler));
-            AddEventHandler("onWrite", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.ParcelFileDescriptor>>>(OnWriteEventHandler));
-            AddEventHandler("onError", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnErrorEventHandler));
+            AddEventHandler("onRejected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnRejectedEventHandler));
+            AddEventHandler("onWrite", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Os.ParcelFileDescriptor>>>(OnWriteEventHandler));
+            AddEventHandler("onError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnErrorEventHandler));
 
         }
 
@@ -78,7 +78,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareWriteAdapter.html#onRejected()"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnRejected"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnOnRejected { get; set; } = null;
+        public global::System.Action OnOnRejected { get; set; } = null;
 
         void OnRejectedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -98,7 +98,7 @@ public virtual void OnRejected()
         /// Handler for <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareWriteAdapter.html#onWrite(android.os.ParcelFileDescriptor)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnWrite"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Os.ParcelFileDescriptor> OnOnWrite { get; set; } = null;
+        public global::System.Action<Android.Os.ParcelFileDescriptor> OnOnWrite { get; set; } = null;
 
         void OnWriteEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Os.ParcelFileDescriptor>> data)
         {
@@ -128,7 +128,7 @@ public void OnErrorDefault(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/view/contentcapture/DataShareWriteAdapter.html#onError(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnError"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnError { get; set; } = null;
+        public global::System.Action<int> OnOnError { get; set; } = null;
 
         void OnErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/View/Display.cs b/src/net/Netdroid/Generated/Android/View/Display.cs
index 0830e2705..1dc4b1de4 100644
--- a/src/net/Netdroid/Generated/Android/View/Display.cs
+++ b/src/net/Netdroid/Generated/Android/View/Display.cs
@@ -130,205 +130,226 @@ public partial class Display
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getAppVsyncOffsetNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getPreferredWideGamutColorSpace()"/>
         /// </summary>
-        public long AppVsyncOffsetNanos
+        /// <returns><see cref="Android.Graphics.ColorSpace"/></returns>
+        public Android.Graphics.ColorSpace GetPreferredWideGamutColorSpace()
         {
-            get { return IExecuteWithSignature<long>("getAppVsyncOffsetNanos", "()J"); }
+            return IExecuteWithSignature<Android.Graphics.ColorSpace>("getPreferredWideGamutColorSpace", "()Landroid/graphics/ColorSpace;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getCutout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getDeviceProductInfo()"/>
         /// </summary>
-        public Android.View.DisplayCutout Cutout
+        /// <returns><see cref="Android.Hardware.Display.DeviceProductInfo"/></returns>
+        public Android.Hardware.Display.DeviceProductInfo GetDeviceProductInfo()
         {
-            get { return IExecuteWithSignature<Android.View.DisplayCutout>("getCutout", "()Landroid/view/DisplayCutout;"); }
+            return IExecuteWithSignature<Android.Hardware.Display.DeviceProductInfo>("getDeviceProductInfo", "()Landroid/hardware/display/DeviceProductInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getDeviceProductInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getHdrCapabilities()"/>
         /// </summary>
-        public Android.Hardware.Display.DeviceProductInfo DeviceProductInfo
+        /// <returns><see cref="Android.View.Display.HdrCapabilities"/></returns>
+        public Android.View.Display.HdrCapabilities GetHdrCapabilities()
         {
-            get { return IExecuteWithSignature<Android.Hardware.Display.DeviceProductInfo>("getDeviceProductInfo", "()Landroid/hardware/display/DeviceProductInfo;"); }
+            return IExecuteWithSignature<Android.View.Display.HdrCapabilities>("getHdrCapabilities", "()Landroid/view/Display$HdrCapabilities;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getDisplayId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getMode()"/>
         /// </summary>
-        public int DisplayId
+        /// <returns><see cref="Android.View.Display.Mode"/></returns>
+        public Android.View.Display.Mode GetMode()
         {
-            get { return IExecuteWithSignature<int>("getDisplayId", "()I"); }
+            return IExecuteWithSignature<Android.View.Display.Mode>("getMode", "()Landroid/view/Display$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getSupportedModes()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="Android.View.Display.Mode"/></returns>
+        public Android.View.Display.Mode[] GetSupportedModes()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignatureArray<Android.View.Display.Mode>("getSupportedModes", "()[Landroid/view/Display$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getHdrCapabilities()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getCutout()"/>
         /// </summary>
-        public Android.View.Display.HdrCapabilities GetHdrCapabilities
+        /// <returns><see cref="Android.View.DisplayCutout"/></returns>
+        public Android.View.DisplayCutout GetCutout()
         {
-            get { return IExecuteWithSignature<Android.View.Display.HdrCapabilities>("getHdrCapabilities", "()Landroid/view/Display$HdrCapabilities;"); }
+            return IExecuteWithSignature<Android.View.DisplayCutout>("getCutout", "()Landroid/view/DisplayCutout;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getShape()"/>
         /// </summary>
-        public Android.View.Display.Mode GetMode
+        /// <returns><see cref="Android.View.DisplayShape"/></returns>
+        public Android.View.DisplayShape GetShape()
         {
-            get { return IExecuteWithSignature<Android.View.Display.Mode>("getMode", "()Landroid/view/Display$Mode;"); }
+            return IExecuteWithSignature<Android.View.DisplayShape>("getShape", "()Landroid/view/DisplayShape;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getHdrSdrRatio()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getRoundedCorner(int)"/>
         /// </summary>
-        public float HdrSdrRatio
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.RoundedCorner"/></returns>
+        public Android.View.RoundedCorner GetRoundedCorner(int arg0)
         {
-            get { return IExecuteWithSignature<float>("getHdrSdrRatio", "()F"); }
+            return IExecuteWithSignature<Android.View.RoundedCorner>("getRoundedCorner", "(I)Landroid/view/RoundedCorner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#isHdr()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Height
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHdr()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<bool>("isHdr", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#isHdrSdrRatioAvailable()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHdrSdrRatioAvailable()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isHdrSdrRatioAvailable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getOrientation()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#isMinimalPostProcessingSupported()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Orientation
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMinimalPostProcessingSupported()
         {
-            get { return IExecuteWithSignature<int>("getOrientation", "()I"); }
+            return IExecuteWithSignature<bool>("isMinimalPostProcessingSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getPixelFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#isValid()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int PixelFormat
+        /// <returns><see cref="bool"/></returns>
+        public bool IsValid()
         {
-            get { return IExecuteWithSignature<int>("getPixelFormat", "()I"); }
+            return IExecuteWithSignature<bool>("isValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getPreferredWideGamutColorSpace()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#isWideColorGamut()"/>
         /// </summary>
-        public Android.Graphics.ColorSpace PreferredWideGamutColorSpace
+        /// <returns><see cref="bool"/></returns>
+        public bool IsWideColorGamut()
         {
-            get { return IExecuteWithSignature<Android.Graphics.ColorSpace>("getPreferredWideGamutColorSpace", "()Landroid/graphics/ColorSpace;"); }
+            return IExecuteWithSignature<bool>("isWideColorGamut", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getPresentationDeadlineNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getHdrSdrRatio()"/>
         /// </summary>
-        public long PresentationDeadlineNanos
+        /// <returns><see cref="float"/></returns>
+        public float GetHdrSdrRatio()
         {
-            get { return IExecuteWithSignature<long>("getPresentationDeadlineNanos", "()J"); }
+            return IExecuteWithSignature<float>("getHdrSdrRatio", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getRefreshRate()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getRefreshRate()"/>
         /// </summary>
-        public float RefreshRate
+        /// <returns><see cref="float"/></returns>
+        public float GetRefreshRate()
         {
-            get { return IExecuteWithSignature<float>("getRefreshRate", "()F"); }
+            return IExecuteWithSignature<float>("getRefreshRate", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getRotation()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getSupportedRefreshRates()"/>
         /// </summary>
-        public int Rotation
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float[] GetSupportedRefreshRates()
         {
-            get { return IExecuteWithSignature<int>("getRotation", "()I"); }
+            return IExecuteWithSignatureArray<float>("getSupportedRefreshRates", "()[F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getShape()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getDisplayId()"/>
         /// </summary>
-        public Android.View.DisplayShape Shape
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayId()
         {
-            get { return IExecuteWithSignature<Android.View.DisplayShape>("getShape", "()Landroid/view/DisplayShape;"); }
+            return IExecuteWithSignature<int>("getDisplayId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getFlags()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getSupportedModes()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getHeight()"/>
         /// </summary>
-        public Android.View.Display.Mode[] SupportedModes
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetHeight()
         {
-            get { return IExecuteWithSignatureArray<Android.View.Display.Mode>("getSupportedModes", "()[Landroid/view/Display$Mode;"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getSupportedRefreshRates()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getOrientation()"/>
         /// </summary>
-        [System.Obsolete()]
-        public float[] SupportedRefreshRates
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetOrientation()
         {
-            get { return IExecuteWithSignatureArray<float>("getSupportedRefreshRates", "()[F"); }
+            return IExecuteWithSignature<int>("getOrientation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getPixelFormat()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPixelFormat()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getPixelFormat", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#getRoundedCorner(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getRotation()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.RoundedCorner"/></returns>
-        public Android.View.RoundedCorner GetRoundedCorner(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetRotation()
         {
-            return IExecuteWithSignature<Android.View.RoundedCorner>("getRoundedCorner", "(I)Landroid/view/RoundedCorner;", arg0);
+            return IExecuteWithSignature<int>("getRotation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#isHdr()"/>
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getState()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHdr()
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            return IExecuteWithSignature<bool>("isHdr", "()Z");
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#isHdrSdrRatioAvailable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHdrSdrRatioAvailable()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetWidth()
         {
-            return IExecuteWithSignature<bool>("isHdrSdrRatioAvailable", "()Z");
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#isMinimalPostProcessingSupported()"/>
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMinimalPostProcessingSupported()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isMinimalPostProcessingSupported", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#isValid()"/>
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getAppVsyncOffsetNanos()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsValid()
+        /// <returns><see cref="long"/></returns>
+        public long GetAppVsyncOffsetNanos()
         {
-            return IExecuteWithSignature<bool>("isValid", "()Z");
+            return IExecuteWithSignature<long>("getAppVsyncOffsetNanos", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Display.html#isWideColorGamut()"/>
+        /// <see href="https://developer.android.com/reference/android/view/Display.html#getPresentationDeadlineNanos()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsWideColorGamut()
+        /// <returns><see cref="long"/></returns>
+        public long GetPresentationDeadlineNanos()
         {
-            return IExecuteWithSignature<bool>("isWideColorGamut", "()Z");
+            return IExecuteWithSignature<long>("getPresentationDeadlineNanos", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Display.html#getCurrentSizeRange(android.graphics.Point,android.graphics.Point)"/>
@@ -343,7 +364,7 @@ public void GetCurrentSizeRange(Android.Graphics.Point arg0, Android.Graphics.Po
         /// <see href="https://developer.android.com/reference/android/view/Display.html#getMetrics(android.util.DisplayMetrics)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.DisplayMetrics"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetMetrics(Android.Util.DisplayMetrics arg0)
         {
             IExecuteWithSignature("getMetrics", "(Landroid/util/DisplayMetrics;)V", arg0);
@@ -352,7 +373,7 @@ public void GetMetrics(Android.Util.DisplayMetrics arg0)
         /// <see href="https://developer.android.com/reference/android/view/Display.html#getRealMetrics(android.util.DisplayMetrics)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.DisplayMetrics"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetRealMetrics(Android.Util.DisplayMetrics arg0)
         {
             IExecuteWithSignature("getRealMetrics", "(Landroid/util/DisplayMetrics;)V", arg0);
@@ -361,7 +382,7 @@ public void GetRealMetrics(Android.Util.DisplayMetrics arg0)
         /// <see href="https://developer.android.com/reference/android/view/Display.html#getRealSize(android.graphics.Point)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Point"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetRealSize(Android.Graphics.Point arg0)
         {
             IExecuteWithSignature("getRealSize", "(Landroid/graphics/Point;)V", arg0);
@@ -370,7 +391,7 @@ public void GetRealSize(Android.Graphics.Point arg0)
         /// <see href="https://developer.android.com/reference/android/view/Display.html#getRectSize(android.graphics.Rect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetRectSize(Android.Graphics.Rect arg0)
         {
             IExecuteWithSignature("getRectSize", "(Landroid/graphics/Rect;)V", arg0);
@@ -379,7 +400,7 @@ public void GetRectSize(Android.Graphics.Rect arg0)
         /// <see href="https://developer.android.com/reference/android/view/Display.html#getSize(android.graphics.Point)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Point"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetSize(Android.Graphics.Point arg0)
         {
             IExecuteWithSignature("getSize", "(Landroid/graphics/Point;)V", arg0);
@@ -468,41 +489,45 @@ public partial class HdrCapabilities
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#getDesiredMaxAverageLuminance()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#getDesiredMaxAverageLuminance()"/>
             /// </summary>
-            public float DesiredMaxAverageLuminance
+            /// <returns><see cref="float"/></returns>
+            public float GetDesiredMaxAverageLuminance()
             {
-                get { return IExecuteWithSignature<float>("getDesiredMaxAverageLuminance", "()F"); }
+                return IExecuteWithSignature<float>("getDesiredMaxAverageLuminance", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#getDesiredMaxLuminance()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#getDesiredMaxLuminance()"/>
             /// </summary>
-            public float DesiredMaxLuminance
+            /// <returns><see cref="float"/></returns>
+            public float GetDesiredMaxLuminance()
             {
-                get { return IExecuteWithSignature<float>("getDesiredMaxLuminance", "()F"); }
+                return IExecuteWithSignature<float>("getDesiredMaxLuminance", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#getDesiredMinLuminance()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#getDesiredMinLuminance()"/>
             /// </summary>
-            public float DesiredMinLuminance
+            /// <returns><see cref="float"/></returns>
+            public float GetDesiredMinLuminance()
             {
-                get { return IExecuteWithSignature<float>("getDesiredMinLuminance", "()F"); }
+                return IExecuteWithSignature<float>("getDesiredMinLuminance", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#getSupportedHdrTypes()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#describeContents()"/>
             /// </summary>
-            [System.Obsolete()]
-            public int[] SupportedHdrTypes
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignatureArray<int>("getSupportedHdrTypes", "()[I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#getSupportedHdrTypes()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            [global::System.Obsolete()]
+            public int[] GetSupportedHdrTypes()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignatureArray<int>("getSupportedHdrTypes", "()[I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/Display.HdrCapabilities.html#writeToParcel(android.os.Parcel,int)"/>
@@ -551,54 +576,60 @@ public partial class Mode
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getAlternativeRefreshRates()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getRefreshRate()"/>
             /// </summary>
-            public float[] AlternativeRefreshRates
+            /// <returns><see cref="float"/></returns>
+            public float GetRefreshRate()
             {
-                get { return IExecuteWithSignatureArray<float>("getAlternativeRefreshRates", "()[F"); }
+                return IExecuteWithSignature<float>("getRefreshRate", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getModeId()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getAlternativeRefreshRates()"/>
             /// </summary>
-            public int ModeId
+            /// <returns><see cref="float"/></returns>
+            public float[] GetAlternativeRefreshRates()
             {
-                get { return IExecuteWithSignature<int>("getModeId", "()I"); }
+                return IExecuteWithSignatureArray<float>("getAlternativeRefreshRates", "()[F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getPhysicalHeight()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#describeContents()"/>
             /// </summary>
-            public int PhysicalHeight
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getPhysicalHeight", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getPhysicalWidth()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getModeId()"/>
             /// </summary>
-            public int PhysicalWidth
+            /// <returns><see cref="int"/></returns>
+            public int GetModeId()
             {
-                get { return IExecuteWithSignature<int>("getPhysicalWidth", "()I"); }
+                return IExecuteWithSignature<int>("getModeId", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getRefreshRate()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getPhysicalHeight()"/>
             /// </summary>
-            public float RefreshRate
+            /// <returns><see cref="int"/></returns>
+            public int GetPhysicalHeight()
             {
-                get { return IExecuteWithSignature<float>("getRefreshRate", "()F"); }
+                return IExecuteWithSignature<int>("getPhysicalHeight", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getSupportedHdrTypes()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getPhysicalWidth()"/>
             /// </summary>
-            public int[] SupportedHdrTypes
+            /// <returns><see cref="int"/></returns>
+            public int GetPhysicalWidth()
             {
-                get { return IExecuteWithSignatureArray<int>("getSupportedHdrTypes", "()[I"); }
+                return IExecuteWithSignature<int>("getPhysicalWidth", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#getSupportedHdrTypes()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int[] GetSupportedHdrTypes()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignatureArray<int>("getSupportedHdrTypes", "()[I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/Display.Mode.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/DisplayCutout.cs b/src/net/Netdroid/Generated/Android/View/DisplayCutout.cs
index a4add3786..aa519f146 100644
--- a/src/net/Netdroid/Generated/Android/View/DisplayCutout.cs
+++ b/src/net/Netdroid/Generated/Android/View/DisplayCutout.cs
@@ -59,7 +59,7 @@ public DisplayCutout(Android.Graphics.Insets arg0, Android.Graphics.Rect arg1, A
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DisplayCutout(Android.Graphics.Rect arg0, Java.Util.List<Android.Graphics.Rect> arg1)
             : base(arg0, arg1)
         {
@@ -81,81 +81,92 @@ public DisplayCutout(Android.Graphics.Rect arg0, Java.Util.List<Android.Graphics
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRectBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getWaterfallInsets()"/>
         /// </summary>
-        public Android.Graphics.Rect BoundingRectBottom
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        public Android.Graphics.Insets GetWaterfallInsets()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBoundingRectBottom", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getWaterfallInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRectLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getCutoutPath()"/>
         /// </summary>
-        public Android.Graphics.Rect BoundingRectLeft
+        /// <returns><see cref="Android.Graphics.Path"/></returns>
+        public Android.Graphics.Path GetCutoutPath()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBoundingRectLeft", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Path>("getCutoutPath", "()Landroid/graphics/Path;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRectRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRectBottom()"/>
         /// </summary>
-        public Android.Graphics.Rect BoundingRectRight
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBoundingRectBottom()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBoundingRectRight", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBoundingRectBottom", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRects()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRectLeft()"/>
         /// </summary>
-        public Java.Util.List<Android.Graphics.Rect> BoundingRects
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBoundingRectLeft()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Graphics.Rect>>("getBoundingRects", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBoundingRectLeft", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRectTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRectRight()"/>
         /// </summary>
-        public Android.Graphics.Rect BoundingRectTop
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBoundingRectRight()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBoundingRectTop", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBoundingRectRight", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getCutoutPath()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRectTop()"/>
         /// </summary>
-        public Android.Graphics.Path CutoutPath
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBoundingRectTop()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Path>("getCutoutPath", "()Landroid/graphics/Path;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBoundingRectTop", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getSafeInsetBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getSafeInsetBottom()"/>
         /// </summary>
-        public int SafeInsetBottom
+        /// <returns><see cref="int"/></returns>
+        public int GetSafeInsetBottom()
         {
-            get { return IExecuteWithSignature<int>("getSafeInsetBottom", "()I"); }
+            return IExecuteWithSignature<int>("getSafeInsetBottom", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getSafeInsetLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getSafeInsetLeft()"/>
         /// </summary>
-        public int SafeInsetLeft
+        /// <returns><see cref="int"/></returns>
+        public int GetSafeInsetLeft()
         {
-            get { return IExecuteWithSignature<int>("getSafeInsetLeft", "()I"); }
+            return IExecuteWithSignature<int>("getSafeInsetLeft", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getSafeInsetRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getSafeInsetRight()"/>
         /// </summary>
-        public int SafeInsetRight
+        /// <returns><see cref="int"/></returns>
+        public int GetSafeInsetRight()
         {
-            get { return IExecuteWithSignature<int>("getSafeInsetRight", "()I"); }
+            return IExecuteWithSignature<int>("getSafeInsetRight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getSafeInsetTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getSafeInsetTop()"/>
         /// </summary>
-        public int SafeInsetTop
+        /// <returns><see cref="int"/></returns>
+        public int GetSafeInsetTop()
         {
-            get { return IExecuteWithSignature<int>("getSafeInsetTop", "()I"); }
+            return IExecuteWithSignature<int>("getSafeInsetTop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getWaterfallInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayCutout.html#getBoundingRects()"/>
         /// </summary>
-        public Android.Graphics.Insets WaterfallInsets
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Graphics.Rect> GetBoundingRects()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getWaterfallInsets", "()Landroid/graphics/Insets;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.Graphics.Rect>>("getBoundingRects", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/DisplayShape.cs b/src/net/Netdroid/Generated/Android/View/DisplayShape.cs
index 692a5ff39..eaf920565 100644
--- a/src/net/Netdroid/Generated/Android/View/DisplayShape.cs
+++ b/src/net/Netdroid/Generated/Android/View/DisplayShape.cs
@@ -52,11 +52,12 @@ public partial class DisplayShape
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DisplayShape.html#getPath()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DisplayShape.html#getPath()"/>
         /// </summary>
-        public Android.Graphics.Path Path
+        /// <returns><see cref="Android.Graphics.Path"/></returns>
+        public Android.Graphics.Path GetPath()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Path>("getPath", "()Landroid/graphics/Path;"); }
+            return IExecuteWithSignature<Android.Graphics.Path>("getPath", "()Landroid/graphics/Path;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/DisplayShape.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Displayhash/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Displayhash/AllPackageClasses.cs
index ff288891a..f5d229cd1 100644
--- a/src/net/Netdroid/Generated/Android/View/Displayhash/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Displayhash/AllPackageClasses.cs
@@ -124,12 +124,12 @@ public partial class DisplayHashResultCallback : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DisplayHashResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DisplayHashResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DisplayHashResultCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DisplayHashResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DisplayHashResultCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DisplayHashResultCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/View/Displayhash/DisplayHashManager.cs b/src/net/Netdroid/Generated/Android/View/Displayhash/DisplayHashManager.cs
index bcf8c7369..25a7ef040 100644
--- a/src/net/Netdroid/Generated/Android/View/Displayhash/DisplayHashManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Displayhash/DisplayHashManager.cs
@@ -46,13 +46,6 @@ public partial class DisplayHashManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/displayhash/DisplayHashManager.html#getSupportedHashAlgorithms()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> SupportedHashAlgorithms
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSupportedHashAlgorithms", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/displayhash/DisplayHashManager.html#verifyDisplayHash(android.view.displayhash.DisplayHash)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Displayhash.DisplayHash"/></param>
@@ -61,6 +54,14 @@ public Android.View.Displayhash.VerifiedDisplayHash VerifyDisplayHash(Android.Vi
         {
             return IExecuteWithSignature<Android.View.Displayhash.VerifiedDisplayHash>("verifyDisplayHash", "(Landroid/view/displayhash/DisplayHash;)Landroid/view/displayhash/VerifiedDisplayHash;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/displayhash/DisplayHashManager.html#getSupportedHashAlgorithms()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetSupportedHashAlgorithms()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSupportedHashAlgorithms", "()Ljava/util/Set;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/Displayhash/VerifiedDisplayHash.cs b/src/net/Netdroid/Generated/Android/View/Displayhash/VerifiedDisplayHash.cs
index 6d32308b2..fed69678b 100644
--- a/src/net/Netdroid/Generated/Android/View/Displayhash/VerifiedDisplayHash.cs
+++ b/src/net/Netdroid/Generated/Android/View/Displayhash/VerifiedDisplayHash.cs
@@ -63,40 +63,44 @@ public VerifiedDisplayHash(long arg0, Android.Graphics.Rect arg1, Java.Lang.Stri
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#getBoundsInWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#getBoundsInWindow()"/>
         /// </summary>
-        public Android.Graphics.Rect BoundsInWindow
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBoundsInWindow()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBoundsInWindow", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBoundsInWindow", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#getHashAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#getImageHash()"/>
         /// </summary>
-        public Java.Lang.String HashAlgorithm
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetImageHash()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHashAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getImageHash", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#getImageHash()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#describeContents()"/>
         /// </summary>
-        public byte[] ImageHash
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignatureArray<byte>("getImageHash", "()[B"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#getTimeMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#getHashAlgorithm()"/>
         /// </summary>
-        public long TimeMillis
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHashAlgorithm()
         {
-            get { return IExecuteWithSignature<long>("getTimeMillis", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHashAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#getTimeMillis()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetTimeMillis()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getTimeMillis", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/displayhash/VerifiedDisplayHash.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/DragEvent.cs b/src/net/Netdroid/Generated/Android/View/DragEvent.cs
index 392ff9905..559369ee9 100644
--- a/src/net/Netdroid/Generated/Android/View/DragEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/DragEvent.cs
@@ -88,61 +88,68 @@ public partial class DragEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getClipData()"/>
         /// </summary>
-        public int Action
+        /// <returns><see cref="Android.Content.ClipData"/></returns>
+        public Android.Content.ClipData GetClipData()
         {
-            get { return IExecuteWithSignature<int>("getAction", "()I"); }
+            return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getClipData()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getClipDescription()"/>
         /// </summary>
-        public Android.Content.ClipData ClipData
+        /// <returns><see cref="Android.Content.ClipDescription"/></returns>
+        public Android.Content.ClipDescription GetClipDescription()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipData>("getClipData", "()Landroid/content/ClipData;"); }
+            return IExecuteWithSignature<Android.Content.ClipDescription>("getClipDescription", "()Landroid/content/ClipDescription;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getClipDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getResult()"/>
         /// </summary>
-        public Android.Content.ClipDescription ClipDescription
+        /// <returns><see cref="bool"/></returns>
+        public bool GetResult()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipDescription>("getClipDescription", "()Landroid/content/ClipDescription;"); }
+            return IExecuteWithSignature<bool>("getResult", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getLocalState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getX()"/>
         /// </summary>
-        public object LocalState
+        /// <returns><see cref="float"/></returns>
+        public float GetX()
         {
-            get { return IExecuteWithSignature("getLocalState", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<float>("getX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getResult()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getY()"/>
         /// </summary>
-        public bool Result
+        /// <returns><see cref="float"/></returns>
+        public float GetY()
         {
-            get { return IExecuteWithSignature<bool>("getResult", "()Z"); }
+            return IExecuteWithSignature<float>("getY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getX()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#describeContents()"/>
         /// </summary>
-        public float X
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<float>("getX", "()F"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getY()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getAction()"/>
         /// </summary>
-        public float Y
+        /// <returns><see cref="int"/></returns>
+        public int GetAction()
         {
-            get { return IExecuteWithSignature<float>("getY", "()F"); }
+            return IExecuteWithSignature<int>("getAction", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#getLocalState()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="object"/></returns>
+        public object GetLocalState()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature("getLocalState", "()Ljava/lang/Object;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/DragEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/FocusFinder.cs b/src/net/Netdroid/Generated/Android/View/FocusFinder.cs
index 32f667a99..0aaed8f70 100644
--- a/src/net/Netdroid/Generated/Android/View/FocusFinder.cs
+++ b/src/net/Netdroid/Generated/Android/View/FocusFinder.cs
@@ -42,11 +42,12 @@ public partial class FocusFinder
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/FocusFinder.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/FocusFinder.html#getInstance()"/>
         /// </summary>
-        public static Android.View.FocusFinder Instance
+        /// <returns><see cref="Android.View.FocusFinder"/></returns>
+        public static Android.View.FocusFinder GetInstance()
         {
-            get { return SExecuteWithSignature<Android.View.FocusFinder>(LocalBridgeClazz, "getInstance", "()Landroid/view/FocusFinder;"); }
+            return SExecuteWithSignature<Android.View.FocusFinder>(LocalBridgeClazz, "getInstance", "()Landroid/view/FocusFinder;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/FrameStats.cs b/src/net/Netdroid/Generated/Android/View/FrameStats.cs
index 69dcab1ce..cfaf77907 100644
--- a/src/net/Netdroid/Generated/Android/View/FrameStats.cs
+++ b/src/net/Netdroid/Generated/Android/View/FrameStats.cs
@@ -52,41 +52,45 @@ public partial class FrameStats
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getEndTimeNano()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getFrameCount()"/>
         /// </summary>
-        public long EndTimeNano
+        /// <returns><see cref="int"/></returns>
+        public int GetFrameCount()
         {
-            get { return IExecuteWithSignature<long>("getEndTimeNano", "()J"); }
+            return IExecuteWithSignature<int>("getFrameCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getFrameCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getEndTimeNano()"/>
         /// </summary>
-        public int FrameCount
+        /// <returns><see cref="long"/></returns>
+        public long GetEndTimeNano()
         {
-            get { return IExecuteWithSignature<int>("getFrameCount", "()I"); }
+            return IExecuteWithSignature<long>("getEndTimeNano", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getRefreshPeriodNano()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getFramePresentedTimeNano(int)"/>
         /// </summary>
-        public long RefreshPeriodNano
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="long"/></returns>
+        public long GetFramePresentedTimeNano(int arg0)
         {
-            get { return IExecuteWithSignature<long>("getRefreshPeriodNano", "()J"); }
+            return IExecuteWithSignature<long>("getFramePresentedTimeNano", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getStartTimeNano()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getRefreshPeriodNano()"/>
         /// </summary>
-        public long StartTimeNano
+        /// <returns><see cref="long"/></returns>
+        public long GetRefreshPeriodNano()
         {
-            get { return IExecuteWithSignature<long>("getStartTimeNano", "()J"); }
+            return IExecuteWithSignature<long>("getRefreshPeriodNano", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getFramePresentedTimeNano(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/FrameStats.html#getStartTimeNano()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        public long GetFramePresentedTimeNano(int arg0)
+        public long GetStartTimeNano()
         {
-            return IExecuteWithSignature<long>("getFramePresentedTimeNano", "(I)J", arg0);
+            return IExecuteWithSignature<long>("getStartTimeNano", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/GestureDetector.cs b/src/net/Netdroid/Generated/Android/View/GestureDetector.cs
index 1873cbd4c..a56647101 100644
--- a/src/net/Netdroid/Generated/Android/View/GestureDetector.cs
+++ b/src/net/Netdroid/Generated/Android/View/GestureDetector.cs
@@ -64,7 +64,7 @@ public GestureDetector(Android.Content.Context arg0, Android.View.GestureDetecto
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.GestureDetector.OnGestureListener"/></param>
         /// <param name="arg1"><see cref="Android.Os.Handler"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public GestureDetector(Android.View.GestureDetector.OnGestureListener arg0, Android.Os.Handler arg1)
             : base(arg0, arg1)
         {
@@ -73,7 +73,7 @@ public GestureDetector(Android.View.GestureDetector.OnGestureListener arg0, Andr
         /// <see href="https://developer.android.com/reference/android/view/GestureDetector.html#%3Cinit%3E(android.view.GestureDetector.OnGestureListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.GestureDetector.OnGestureListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public GestureDetector(Android.View.GestureDetector.OnGestureListener arg0)
             : base(arg0)
         {
@@ -173,7 +173,7 @@ public partial class OnContextClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onContextClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnContextClickEventHandler));
+                AddEventHandler("onContextClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnContextClickEventHandler));
 
             }
 
@@ -181,7 +181,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnContextClickListener.html#onContextClick(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnContextClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnContextClick { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnContextClick { get; set; } = null;
 
             void OnContextClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -275,9 +275,9 @@ public partial class OnDoubleTapListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDoubleTap", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDoubleTapEventHandler));
-                AddEventHandler("onDoubleTapEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDoubleTapEventEventHandler));
-                AddEventHandler("onSingleTapConfirmed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnSingleTapConfirmedEventHandler));
+                AddEventHandler("onDoubleTap", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDoubleTapEventHandler));
+                AddEventHandler("onDoubleTapEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDoubleTapEventEventHandler));
+                AddEventHandler("onSingleTapConfirmed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnSingleTapConfirmedEventHandler));
 
             }
 
@@ -285,7 +285,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnDoubleTapListener.html#onDoubleTap(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDoubleTap"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnDoubleTap { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnDoubleTap { get; set; } = null;
 
             void OnDoubleTapEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -308,7 +308,7 @@ public virtual bool OnDoubleTap(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnDoubleTapListener.html#onDoubleTapEvent(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDoubleTapEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnDoubleTapEvent { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnDoubleTapEvent { get; set; } = null;
 
             void OnDoubleTapEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -331,7 +331,7 @@ public virtual bool OnDoubleTapEvent(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnDoubleTapListener.html#onSingleTapConfirmed(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSingleTapConfirmed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnSingleTapConfirmed { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnSingleTapConfirmed { get; set; } = null;
 
             void OnSingleTapConfirmedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -443,12 +443,12 @@ public partial class OnGestureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDown", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDownEventHandler));
-                AddEventHandler("onFling", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnFlingEventHandler));
-                AddEventHandler("onScroll", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnScrollEventHandler));
-                AddEventHandler("onSingleTapUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnSingleTapUpEventHandler));
-                AddEventHandler("onLongPress", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnLongPressEventHandler));
-                AddEventHandler("onShowPress", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnShowPressEventHandler));
+                AddEventHandler("onDown", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDownEventHandler));
+                AddEventHandler("onFling", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnFlingEventHandler));
+                AddEventHandler("onScroll", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnScrollEventHandler));
+                AddEventHandler("onSingleTapUp", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnSingleTapUpEventHandler));
+                AddEventHandler("onLongPress", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnLongPressEventHandler));
+                AddEventHandler("onShowPress", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnShowPressEventHandler));
 
             }
 
@@ -456,7 +456,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnGestureListener.html#onDown(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDown"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnDown { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnDown { get; set; } = null;
 
             void OnDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -479,7 +479,7 @@ public virtual bool OnDown(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnGestureListener.html#onFling(android.view.MotionEvent,android.view.MotionEvent,float,float)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFling"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, Android.View.MotionEvent, float, float, bool> OnOnFling { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, Android.View.MotionEvent, float, float, bool> OnOnFling { get; set; } = null;
 
             void OnFlingEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -505,7 +505,7 @@ public virtual bool OnFling(Android.View.MotionEvent arg0, Android.View.MotionEv
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnGestureListener.html#onScroll(android.view.MotionEvent,android.view.MotionEvent,float,float)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScroll"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, Android.View.MotionEvent, float, float, bool> OnOnScroll { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, Android.View.MotionEvent, float, float, bool> OnOnScroll { get; set; } = null;
 
             void OnScrollEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -531,7 +531,7 @@ public virtual bool OnScroll(Android.View.MotionEvent arg0, Android.View.MotionE
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnGestureListener.html#onSingleTapUp(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSingleTapUp"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnSingleTapUp { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnSingleTapUp { get; set; } = null;
 
             void OnSingleTapUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -554,7 +554,7 @@ public virtual bool OnSingleTapUp(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnGestureListener.html#onLongPress(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLongPress"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.MotionEvent> OnOnLongPress { get; set; } = null;
+            public global::System.Action<Android.View.MotionEvent> OnOnLongPress { get; set; } = null;
 
             void OnLongPressEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -575,7 +575,7 @@ public virtual void OnLongPress(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.OnGestureListener.html#onShowPress(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnShowPress"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.MotionEvent> OnOnShowPress { get; set; } = null;
+            public global::System.Action<Android.View.MotionEvent> OnOnShowPress { get; set; } = null;
 
             void OnShowPressEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -716,16 +716,16 @@ public partial class SimpleOnGestureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onContextClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnContextClickEventHandler));
-                AddEventHandler("onDoubleTap", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDoubleTapEventHandler));
-                AddEventHandler("onDoubleTapEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDoubleTapEventEventHandler));
-                AddEventHandler("onDown", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDownEventHandler));
-                AddEventHandler("onFling", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnFlingEventHandler));
-                AddEventHandler("onScroll", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnScrollEventHandler));
-                AddEventHandler("onSingleTapConfirmed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnSingleTapConfirmedEventHandler));
-                AddEventHandler("onSingleTapUp", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnSingleTapUpEventHandler));
-                AddEventHandler("onLongPress", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnLongPressEventHandler));
-                AddEventHandler("onShowPress", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnShowPressEventHandler));
+                AddEventHandler("onContextClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnContextClickEventHandler));
+                AddEventHandler("onDoubleTap", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDoubleTapEventHandler));
+                AddEventHandler("onDoubleTapEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDoubleTapEventEventHandler));
+                AddEventHandler("onDown", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnDownEventHandler));
+                AddEventHandler("onFling", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnFlingEventHandler));
+                AddEventHandler("onScroll", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnScrollEventHandler));
+                AddEventHandler("onSingleTapConfirmed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnSingleTapConfirmedEventHandler));
+                AddEventHandler("onSingleTapUp", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnSingleTapUpEventHandler));
+                AddEventHandler("onLongPress", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnLongPressEventHandler));
+                AddEventHandler("onShowPress", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>>>(OnShowPressEventHandler));
 
             }
 
@@ -733,7 +733,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onContextClick(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnContextClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnContextClick { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnContextClick { get; set; } = null;
 
             void OnContextClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -756,7 +756,7 @@ public virtual bool OnContextClick(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onDoubleTap(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDoubleTap"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnDoubleTap { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnDoubleTap { get; set; } = null;
 
             void OnDoubleTapEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -779,7 +779,7 @@ public virtual bool OnDoubleTap(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onDoubleTapEvent(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDoubleTapEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnDoubleTapEvent { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnDoubleTapEvent { get; set; } = null;
 
             void OnDoubleTapEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -802,7 +802,7 @@ public virtual bool OnDoubleTapEvent(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onDown(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDown"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnDown { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnDown { get; set; } = null;
 
             void OnDownEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -825,7 +825,7 @@ public virtual bool OnDown(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onFling(android.view.MotionEvent,android.view.MotionEvent,float,float)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFling"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, Android.View.MotionEvent, float, float, bool> OnOnFling { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, Android.View.MotionEvent, float, float, bool> OnOnFling { get; set; } = null;
 
             void OnFlingEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -851,7 +851,7 @@ public virtual bool OnFling(Android.View.MotionEvent arg0, Android.View.MotionEv
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onScroll(android.view.MotionEvent,android.view.MotionEvent,float,float)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScroll"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, Android.View.MotionEvent, float, float, bool> OnOnScroll { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, Android.View.MotionEvent, float, float, bool> OnOnScroll { get; set; } = null;
 
             void OnScrollEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -877,7 +877,7 @@ public virtual bool OnScroll(Android.View.MotionEvent arg0, Android.View.MotionE
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onSingleTapConfirmed(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSingleTapConfirmed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnSingleTapConfirmed { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnSingleTapConfirmed { get; set; } = null;
 
             void OnSingleTapConfirmedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -900,7 +900,7 @@ public virtual bool OnSingleTapConfirmed(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onSingleTapUp(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSingleTapUp"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MotionEvent, bool> OnOnSingleTapUp { get; set; } = null;
+            public global::System.Func<Android.View.MotionEvent, bool> OnOnSingleTapUp { get; set; } = null;
 
             void OnSingleTapUpEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -923,7 +923,7 @@ public virtual bool OnSingleTapUp(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onLongPress(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLongPress"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.MotionEvent> OnOnLongPress { get; set; } = null;
+            public global::System.Action<Android.View.MotionEvent> OnOnLongPress { get; set; } = null;
 
             void OnLongPressEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
@@ -944,7 +944,7 @@ public virtual void OnLongPress(Android.View.MotionEvent arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/GestureDetector.SimpleOnGestureListener.html#onShowPress(android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnShowPress"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.MotionEvent> OnOnShowPress { get; set; } = null;
+            public global::System.Action<Android.View.MotionEvent> OnOnShowPress { get; set; } = null;
 
             void OnShowPressEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MotionEvent>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/HapticFeedbackConstants.cs b/src/net/Netdroid/Generated/Android/View/HapticFeedbackConstants.cs
index eca7f1353..61673f3a0 100644
--- a/src/net/Netdroid/Generated/Android/View/HapticFeedbackConstants.cs
+++ b/src/net/Netdroid/Generated/Android/View/HapticFeedbackConstants.cs
@@ -64,7 +64,7 @@ public partial class HapticFeedbackConstants
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/HapticFeedbackConstants.html#FLAG_IGNORE_GLOBAL_SETTING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_IGNORE_GLOBAL_SETTING { get { if (!_FLAG_IGNORE_GLOBAL_SETTINGReady) { _FLAG_IGNORE_GLOBAL_SETTINGContent = SGetField<int>(LocalBridgeClazz, "FLAG_IGNORE_GLOBAL_SETTING"); _FLAG_IGNORE_GLOBAL_SETTINGReady = true; } return _FLAG_IGNORE_GLOBAL_SETTINGContent; } }
         private static int _FLAG_IGNORE_GLOBAL_SETTINGContent = default;
         private static bool _FLAG_IGNORE_GLOBAL_SETTINGReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/View/InputDevice.cs b/src/net/Netdroid/Generated/Android/View/InputDevice.cs
index 4abd170ee..796e78eff 100644
--- a/src/net/Netdroid/Generated/Android/View/InputDevice.cs
+++ b/src/net/Netdroid/Generated/Android/View/InputDevice.cs
@@ -64,63 +64,63 @@ public partial class InputDevice
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_ORIENTATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_ORIENTATION { get { if (!_MOTION_RANGE_ORIENTATIONReady) { _MOTION_RANGE_ORIENTATIONContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_ORIENTATION"); _MOTION_RANGE_ORIENTATIONReady = true; } return _MOTION_RANGE_ORIENTATIONContent; } }
         private static int _MOTION_RANGE_ORIENTATIONContent = default;
         private static bool _MOTION_RANGE_ORIENTATIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_PRESSURE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_PRESSURE { get { if (!_MOTION_RANGE_PRESSUREReady) { _MOTION_RANGE_PRESSUREContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_PRESSURE"); _MOTION_RANGE_PRESSUREReady = true; } return _MOTION_RANGE_PRESSUREContent; } }
         private static int _MOTION_RANGE_PRESSUREContent = default;
         private static bool _MOTION_RANGE_PRESSUREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_SIZE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_SIZE { get { if (!_MOTION_RANGE_SIZEReady) { _MOTION_RANGE_SIZEContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_SIZE"); _MOTION_RANGE_SIZEReady = true; } return _MOTION_RANGE_SIZEContent; } }
         private static int _MOTION_RANGE_SIZEContent = default;
         private static bool _MOTION_RANGE_SIZEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_TOOL_MAJOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_TOOL_MAJOR { get { if (!_MOTION_RANGE_TOOL_MAJORReady) { _MOTION_RANGE_TOOL_MAJORContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_TOOL_MAJOR"); _MOTION_RANGE_TOOL_MAJORReady = true; } return _MOTION_RANGE_TOOL_MAJORContent; } }
         private static int _MOTION_RANGE_TOOL_MAJORContent = default;
         private static bool _MOTION_RANGE_TOOL_MAJORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_TOOL_MINOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_TOOL_MINOR { get { if (!_MOTION_RANGE_TOOL_MINORReady) { _MOTION_RANGE_TOOL_MINORContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_TOOL_MINOR"); _MOTION_RANGE_TOOL_MINORReady = true; } return _MOTION_RANGE_TOOL_MINORContent; } }
         private static int _MOTION_RANGE_TOOL_MINORContent = default;
         private static bool _MOTION_RANGE_TOOL_MINORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_TOUCH_MAJOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_TOUCH_MAJOR { get { if (!_MOTION_RANGE_TOUCH_MAJORReady) { _MOTION_RANGE_TOUCH_MAJORContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_TOUCH_MAJOR"); _MOTION_RANGE_TOUCH_MAJORReady = true; } return _MOTION_RANGE_TOUCH_MAJORContent; } }
         private static int _MOTION_RANGE_TOUCH_MAJORContent = default;
         private static bool _MOTION_RANGE_TOUCH_MAJORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_TOUCH_MINOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_TOUCH_MINOR { get { if (!_MOTION_RANGE_TOUCH_MINORReady) { _MOTION_RANGE_TOUCH_MINORContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_TOUCH_MINOR"); _MOTION_RANGE_TOUCH_MINORReady = true; } return _MOTION_RANGE_TOUCH_MINORContent; } }
         private static int _MOTION_RANGE_TOUCH_MINORContent = default;
         private static bool _MOTION_RANGE_TOUCH_MINORReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_X"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_X { get { if (!_MOTION_RANGE_XReady) { _MOTION_RANGE_XContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_X"); _MOTION_RANGE_XReady = true; } return _MOTION_RANGE_XContent; } }
         private static int _MOTION_RANGE_XContent = default;
         private static bool _MOTION_RANGE_XReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#MOTION_RANGE_Y"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MOTION_RANGE_Y { get { if (!_MOTION_RANGE_YReady) { _MOTION_RANGE_YContent = SGetField<int>(LocalBridgeClazz, "MOTION_RANGE_Y"); _MOTION_RANGE_YReady = true; } return _MOTION_RANGE_YContent; } }
         private static int _MOTION_RANGE_YContent = default;
         private static bool _MOTION_RANGE_YReady = false; // this is used because in case of generics 
@@ -273,13 +273,6 @@ public partial class InputDevice
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getDeviceIds()"/> 
-        /// </summary>
-        public static int[] DeviceIds
-        {
-            get { return SExecuteWithSignatureArray<int>(LocalBridgeClazz, "getDeviceIds", "()[I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getDevice(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -288,115 +281,58 @@ public static Android.View.InputDevice GetDevice(int arg0)
         {
             return SExecuteWithSignature<Android.View.InputDevice>(LocalBridgeClazz, "getDevice", "(I)Landroid/view/InputDevice;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getBatteryState()"/> 
-        /// </summary>
-        public Android.Hardware.BatteryState BatteryState
-        {
-            get { return IExecuteWithSignature<Android.Hardware.BatteryState>("getBatteryState", "()Landroid/hardware/BatteryState;"); }
-        }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getControllerNumber()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getDeviceIds()"/>
         /// </summary>
-        public int ControllerNumber
-        {
-            get { return IExecuteWithSignature<int>("getControllerNumber", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getDescriptor()"/> 
-        /// </summary>
-        public Java.Lang.String Descriptor
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDescriptor", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getId()"/> 
-        /// </summary>
-        public int Id
-        {
-            get { return IExecuteWithSignature<int>("getId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getKeyboardType()"/> 
-        /// </summary>
-        public int KeyboardType
-        {
-            get { return IExecuteWithSignature<int>("getKeyboardType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getKeyCharacterMap()"/> 
-        /// </summary>
-        public Android.View.KeyCharacterMap KeyCharacterMap
-        {
-            get { return IExecuteWithSignature<Android.View.KeyCharacterMap>("getKeyCharacterMap", "()Landroid/view/KeyCharacterMap;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getLightsManager()"/> 
-        /// </summary>
-        public Android.Hardware.Lights.LightsManager LightsManager
-        {
-            get { return IExecuteWithSignature<Android.Hardware.Lights.LightsManager>("getLightsManager", "()Landroid/hardware/lights/LightsManager;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getMotionRanges()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.InputDevice.MotionRange> MotionRanges
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.InputDevice.MotionRange>>("getMotionRanges", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getProductId()"/> 
-        /// </summary>
-        public int ProductId
+        /// <returns><see cref="int"/></returns>
+        public static int[] GetDeviceIds()
         {
-            get { return IExecuteWithSignature<int>("getProductId", "()I"); }
+            return SExecuteWithSignatureArray<int>(LocalBridgeClazz, "getDeviceIds", "()[I");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getSensorManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getBatteryState()"/>
         /// </summary>
-        public Android.Hardware.SensorManager SensorManager
+        /// <returns><see cref="Android.Hardware.BatteryState"/></returns>
+        public Android.Hardware.BatteryState GetBatteryState()
         {
-            get { return IExecuteWithSignature<Android.Hardware.SensorManager>("getSensorManager", "()Landroid/hardware/SensorManager;"); }
+            return IExecuteWithSignature<Android.Hardware.BatteryState>("getBatteryState", "()Landroid/hardware/BatteryState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getSources()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getLightsManager()"/>
         /// </summary>
-        public int Sources
+        /// <returns><see cref="Android.Hardware.Lights.LightsManager"/></returns>
+        public Android.Hardware.Lights.LightsManager GetLightsManager()
         {
-            get { return IExecuteWithSignature<int>("getSources", "()I"); }
+            return IExecuteWithSignature<Android.Hardware.Lights.LightsManager>("getLightsManager", "()Landroid/hardware/lights/LightsManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getVendorId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getSensorManager()"/>
         /// </summary>
-        public int VendorId
+        /// <returns><see cref="Android.Hardware.SensorManager"/></returns>
+        public Android.Hardware.SensorManager GetSensorManager()
         {
-            get { return IExecuteWithSignature<int>("getVendorId", "()I"); }
+            return IExecuteWithSignature<Android.Hardware.SensorManager>("getSensorManager", "()Landroid/hardware/SensorManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getVibrator()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getVibrator()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Os.Vibrator Vibrator
+        /// <returns><see cref="Android.Os.Vibrator"/></returns>
+        [global::System.Obsolete()]
+        public Android.Os.Vibrator GetVibrator()
         {
-            get { return IExecuteWithSignature<Android.Os.Vibrator>("getVibrator", "()Landroid/os/Vibrator;"); }
+            return IExecuteWithSignature<Android.Os.Vibrator>("getVibrator", "()Landroid/os/Vibrator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getVibratorManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getVibratorManager()"/>
         /// </summary>
-        public Android.Os.VibratorManager VibratorManager
+        /// <returns><see cref="Android.Os.VibratorManager"/></returns>
+        public Android.Os.VibratorManager GetVibratorManager()
         {
-            get { return IExecuteWithSignature<Android.Os.VibratorManager>("getVibratorManager", "()Landroid/os/VibratorManager;"); }
+            return IExecuteWithSignature<Android.Os.VibratorManager>("getVibratorManager", "()Landroid/os/VibratorManager;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getMotionRange(int,int)"/>
@@ -418,6 +354,14 @@ public Android.View.InputDevice.MotionRange GetMotionRange(int arg0)
             return IExecuteWithSignature<Android.View.InputDevice.MotionRange>("getMotionRange", "(I)Landroid/view/InputDevice$MotionRange;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getKeyCharacterMap()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.KeyCharacterMap"/></returns>
+        public Android.View.KeyCharacterMap GetKeyCharacterMap()
+        {
+            return IExecuteWithSignature<Android.View.KeyCharacterMap>("getKeyCharacterMap", "()Landroid/view/KeyCharacterMap;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#hasMicrophone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -476,6 +420,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getControllerNumber()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetControllerNumber()
+        {
+            return IExecuteWithSignature<int>("getControllerNumber", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
+        {
+            return IExecuteWithSignature<int>("getId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getKeyboardType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetKeyboardType()
+        {
+            return IExecuteWithSignature<int>("getKeyboardType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getKeyCodeForKeyLocation(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -485,6 +453,54 @@ public int GetKeyCodeForKeyLocation(int arg0)
             return IExecuteWithSignature<int>("getKeyCodeForKeyLocation", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getProductId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetProductId()
+        {
+            return IExecuteWithSignature<int>("getProductId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getSources()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSources()
+        {
+            return IExecuteWithSignature<int>("getSources", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getVendorId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVendorId()
+        {
+            return IExecuteWithSignature<int>("getVendorId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getDescriptor()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDescriptor()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDescriptor", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#getMotionRanges()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.InputDevice.MotionRange> GetMotionRanges()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.InputDevice.MotionRange>>("getMotionRanges", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputDevice.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -518,69 +534,77 @@ public partial class MotionRange
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getAxis()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#isFromSource(int)"/>
             /// </summary>
-            public int Axis
+            /// <param name="arg0"><see cref="int"/></param>
+            /// <returns><see cref="bool"/></returns>
+            public bool IsFromSource(int arg0)
             {
-                get { return IExecuteWithSignature<int>("getAxis", "()I"); }
+                return IExecuteWithSignature<bool>("isFromSource", "(I)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getFlat()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getFlat()"/>
             /// </summary>
-            public float Flat
+            /// <returns><see cref="float"/></returns>
+            public float GetFlat()
             {
-                get { return IExecuteWithSignature<float>("getFlat", "()F"); }
+                return IExecuteWithSignature<float>("getFlat", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getFuzz()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getFuzz()"/>
             /// </summary>
-            public float Fuzz
+            /// <returns><see cref="float"/></returns>
+            public float GetFuzz()
             {
-                get { return IExecuteWithSignature<float>("getFuzz", "()F"); }
+                return IExecuteWithSignature<float>("getFuzz", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getMax()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getMax()"/>
             /// </summary>
-            public float Max
+            /// <returns><see cref="float"/></returns>
+            public float GetMax()
             {
-                get { return IExecuteWithSignature<float>("getMax", "()F"); }
+                return IExecuteWithSignature<float>("getMax", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getMin()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getMin()"/>
             /// </summary>
-            public float Min
+            /// <returns><see cref="float"/></returns>
+            public float GetMin()
             {
-                get { return IExecuteWithSignature<float>("getMin", "()F"); }
+                return IExecuteWithSignature<float>("getMin", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getRange()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getRange()"/>
             /// </summary>
-            public float Range
+            /// <returns><see cref="float"/></returns>
+            public float GetRange()
             {
-                get { return IExecuteWithSignature<float>("getRange", "()F"); }
+                return IExecuteWithSignature<float>("getRange", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getResolution()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getResolution()"/>
             /// </summary>
-            public float Resolution
+            /// <returns><see cref="float"/></returns>
+            public float GetResolution()
             {
-                get { return IExecuteWithSignature<float>("getResolution", "()F"); }
+                return IExecuteWithSignature<float>("getResolution", "()F");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getSource()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getAxis()"/>
             /// </summary>
-            public int Source
+            /// <returns><see cref="int"/></returns>
+            public int GetAxis()
             {
-                get { return IExecuteWithSignature<int>("getSource", "()I"); }
+                return IExecuteWithSignature<int>("getAxis", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#isFromSource(int)"/>
+            /// <see href="https://developer.android.com/reference/android/view/InputDevice.MotionRange.html#getSource()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsFromSource(int arg0)
+            /// <returns><see cref="int"/></returns>
+            public int GetSource()
             {
-                return IExecuteWithSignature<bool>("isFromSource", "(I)Z", arg0);
+                return IExecuteWithSignature<int>("getSource", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/InputEvent.cs b/src/net/Netdroid/Generated/Android/View/InputEvent.cs
index 4f296c624..35c9dfabd 100644
--- a/src/net/Netdroid/Generated/Android/View/InputEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/InputEvent.cs
@@ -52,32 +52,28 @@ public partial class InputEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#getDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#getDeviceId()"/>
         /// </summary>
-        public Android.View.InputDevice Device
-        {
-            get { return IExecuteWithSignature<Android.View.InputDevice>("getDevice", "()Landroid/view/InputDevice;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#getDeviceId()"/> 
-        /// </summary>
-        public int DeviceId
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceId()
         {
-            get { return IExecuteWithSignature<int>("getDeviceId", "()I"); }
+            return IExecuteWithSignature<int>("getDeviceId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#getEventTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#getSource()"/>
         /// </summary>
-        public long EventTime
+        /// <returns><see cref="int"/></returns>
+        public int GetSource()
         {
-            get { return IExecuteWithSignature<long>("getEventTime", "()J"); }
+            return IExecuteWithSignature<int>("getSource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#getSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#getEventTime()"/>
         /// </summary>
-        public int Source
+        /// <returns><see cref="long"/></returns>
+        public long GetEventTime()
         {
-            get { return IExecuteWithSignature<int>("getSource", "()I"); }
+            return IExecuteWithSignature<long>("getEventTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#isFromSource(int)"/>
@@ -89,6 +85,14 @@ public bool IsFromSource(int arg0)
             return IExecuteWithSignature<bool>("isFromSource", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#getDevice()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.InputDevice"/></returns>
+        public Android.View.InputDevice GetDevice()
+        {
+            return IExecuteWithSignature<Android.View.InputDevice>("getDevice", "()Landroid/view/InputDevice;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/InputEvent.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/AllPackageClasses.cs
index a6c60b99e..d7720eb85 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/AllPackageClasses.cs
@@ -652,12 +652,12 @@ public partial class HandwritingGesture : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HandwritingGesture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HandwritingGesture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HandwritingGesture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HandwritingGesture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HandwritingGesture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HandwritingGesture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -962,12 +962,12 @@ public partial class InputConnection : MASES.JCOBridge.C2JBridge.JVMBridgeBase<I
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InputConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputConnection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InputConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputConnection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1096,12 +1096,12 @@ public partial class InputMethod : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Input
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InputMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputMethod() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InputMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputMethod(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1138,12 +1138,12 @@ public partial class SessionCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<S
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SessionCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SessionCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SessionCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1276,12 +1276,12 @@ public partial class InputMethodSession : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InputMethodSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputMethodSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputMethodSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InputMethodSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputMethodSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputMethodSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1318,12 +1318,12 @@ public partial class EventCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Eve
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("EventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EventCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("EventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("EventCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public EventCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1720,12 +1720,12 @@ public partial class PreviewableHandwritingGesture : Android.View.Inputmethod.Ha
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PreviewableHandwritingGesture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreviewableHandwritingGesture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreviewableHandwritingGesture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PreviewableHandwritingGesture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreviewableHandwritingGesture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreviewableHandwritingGesture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/BaseInputConnection.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/BaseInputConnection.cs
index 87f422cc7..2fa497bd6 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/BaseInputConnection.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/BaseInputConnection.cs
@@ -89,18 +89,20 @@ public static void SetComposingSpans(Android.Text.Spannable arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/BaseInputConnection.html#getEditable()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/BaseInputConnection.html#getHandler()"/>
         /// </summary>
-        public Android.Text.Editable Editable
+        /// <returns><see cref="Android.Os.Handler"/></returns>
+        public Android.Os.Handler GetHandler()
         {
-            get { return IExecuteWithSignature<Android.Text.Editable>("getEditable", "()Landroid/text/Editable;"); }
+            return IExecuteWithSignature<Android.Os.Handler>("getHandler", "()Landroid/os/Handler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/BaseInputConnection.html#getHandler()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/BaseInputConnection.html#getEditable()"/>
         /// </summary>
-        public Android.Os.Handler Handler
+        /// <returns><see cref="Android.Text.Editable"/></returns>
+        public Android.Text.Editable GetEditable()
         {
-            get { return IExecuteWithSignature<Android.Os.Handler>("getHandler", "()Landroid/os/Handler;"); }
+            return IExecuteWithSignature<Android.Text.Editable>("getEditable", "()Landroid/text/Editable;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/BaseInputConnection.html#getExtractedText(android.view.inputmethod.ExtractedTextRequest,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/CompletionInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/CompletionInfo.cs
index e1d7c6903..8a4694feb 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/CompletionInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/CompletionInfo.cs
@@ -73,40 +73,44 @@ public CompletionInfo(long arg0, int arg1, Java.Lang.CharSequence arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#describeContents()"/>
         /// </summary>
-        public long Id
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getId", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#getPosition()"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <returns><see cref="int"/></returns>
+        public int GetPosition()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#getPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#getLabel()"/>
         /// </summary>
-        public int Position
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            get { return IExecuteWithSignature<int>("getPosition", "()I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#getText()"/>
         /// </summary>
-        public Java.Lang.CharSequence Text
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getId", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/CompletionInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/CorrectionInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/CorrectionInfo.cs
index 8997775af..cd55f49f4 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/CorrectionInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/CorrectionInfo.cs
@@ -62,33 +62,36 @@ public CorrectionInfo(int arg0, Java.Lang.CharSequence arg1, Java.Lang.CharSeque
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#getNewText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.CharSequence NewText
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getNewText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#getOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#getOffset()"/>
         /// </summary>
-        public int Offset
+        /// <returns><see cref="int"/></returns>
+        public int GetOffset()
         {
-            get { return IExecuteWithSignature<int>("getOffset", "()I"); }
+            return IExecuteWithSignature<int>("getOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#getOldText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#getNewText()"/>
         /// </summary>
-        public Java.Lang.CharSequence OldText
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetNewText()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getOldText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNewText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#getOldText()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetOldText()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getOldText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/CorrectionInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/CursorAnchorInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/CursorAnchorInfo.cs
index b925d0629..279587e16 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/CursorAnchorInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/CursorAnchorInfo.cs
@@ -78,121 +78,134 @@ public CursorAnchorInfo(Android.Os.Parcel arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getComposingText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getMatrix()"/>
         /// </summary>
-        public Java.Lang.CharSequence ComposingText
+        /// <returns><see cref="Android.Graphics.Matrix"/></returns>
+        public Android.Graphics.Matrix GetMatrix()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getComposingText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Graphics.Matrix>("getMatrix", "()Landroid/graphics/Matrix;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getComposingTextStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getCharacterBounds(int)"/>
         /// </summary>
-        public int ComposingTextStart
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetCharacterBounds(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getComposingTextStart", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getCharacterBounds", "(I)Landroid/graphics/RectF;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getEditorBoundsInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getEditorBoundsInfo()"/>
         /// </summary>
-        public Android.View.Inputmethod.EditorBoundsInfo EditorBoundsInfo
+        /// <returns><see cref="Android.View.Inputmethod.EditorBoundsInfo"/></returns>
+        public Android.View.Inputmethod.EditorBoundsInfo GetEditorBoundsInfo()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.EditorBoundsInfo>("getEditorBoundsInfo", "()Landroid/view/inputmethod/EditorBoundsInfo;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.EditorBoundsInfo>("getEditorBoundsInfo", "()Landroid/view/inputmethod/EditorBoundsInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerBaseline()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getTextAppearanceInfo()"/>
         /// </summary>
-        public float InsertionMarkerBaseline
+        /// <returns><see cref="Android.View.Inputmethod.TextAppearanceInfo"/></returns>
+        public Android.View.Inputmethod.TextAppearanceInfo GetTextAppearanceInfo()
         {
-            get { return IExecuteWithSignature<float>("getInsertionMarkerBaseline", "()F"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.TextAppearanceInfo>("getTextAppearanceInfo", "()Landroid/view/inputmethod/TextAppearanceInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerBaseline()"/>
         /// </summary>
-        public float InsertionMarkerBottom
+        /// <returns><see cref="float"/></returns>
+        public float GetInsertionMarkerBaseline()
         {
-            get { return IExecuteWithSignature<float>("getInsertionMarkerBottom", "()F"); }
+            return IExecuteWithSignature<float>("getInsertionMarkerBaseline", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerBottom()"/>
         /// </summary>
-        public int InsertionMarkerFlags
+        /// <returns><see cref="float"/></returns>
+        public float GetInsertionMarkerBottom()
         {
-            get { return IExecuteWithSignature<int>("getInsertionMarkerFlags", "()I"); }
+            return IExecuteWithSignature<float>("getInsertionMarkerBottom", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerHorizontal()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerHorizontal()"/>
         /// </summary>
-        public float InsertionMarkerHorizontal
+        /// <returns><see cref="float"/></returns>
+        public float GetInsertionMarkerHorizontal()
         {
-            get { return IExecuteWithSignature<float>("getInsertionMarkerHorizontal", "()F"); }
+            return IExecuteWithSignature<float>("getInsertionMarkerHorizontal", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerTop()"/>
         /// </summary>
-        public float InsertionMarkerTop
+        /// <returns><see cref="float"/></returns>
+        public float GetInsertionMarkerTop()
         {
-            get { return IExecuteWithSignature<float>("getInsertionMarkerTop", "()F"); }
+            return IExecuteWithSignature<float>("getInsertionMarkerTop", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getMatrix()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#describeContents()"/>
         /// </summary>
-        public Android.Graphics.Matrix Matrix
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Matrix>("getMatrix", "()Landroid/graphics/Matrix;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getSelectionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getCharacterBoundsFlags(int)"/>
         /// </summary>
-        public int SelectionEnd
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetCharacterBoundsFlags(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getSelectionEnd", "()I"); }
+            return IExecuteWithSignature<int>("getCharacterBoundsFlags", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getSelectionStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getComposingTextStart()"/>
         /// </summary>
-        public int SelectionStart
+        /// <returns><see cref="int"/></returns>
+        public int GetComposingTextStart()
         {
-            get { return IExecuteWithSignature<int>("getSelectionStart", "()I"); }
+            return IExecuteWithSignature<int>("getComposingTextStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getTextAppearanceInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getInsertionMarkerFlags()"/>
         /// </summary>
-        public Android.View.Inputmethod.TextAppearanceInfo TextAppearanceInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetInsertionMarkerFlags()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.TextAppearanceInfo>("getTextAppearanceInfo", "()Landroid/view/inputmethod/TextAppearanceInfo;"); }
+            return IExecuteWithSignature<int>("getInsertionMarkerFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getVisibleLineBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getSelectionEnd()"/>
         /// </summary>
-        public Java.Util.List<Android.Graphics.RectF> VisibleLineBounds
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionEnd()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Graphics.RectF>>("getVisibleLineBounds", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getSelectionEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getCharacterBounds(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getSelectionStart()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Graphics.RectF"/></returns>
-        public Android.Graphics.RectF GetCharacterBounds(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionStart()
         {
-            return IExecuteWithSignature<Android.Graphics.RectF>("getCharacterBounds", "(I)Landroid/graphics/RectF;", arg0);
+            return IExecuteWithSignature<int>("getSelectionStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getComposingText()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetComposingText()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getComposingText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getCharacterBoundsFlags(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#getVisibleLineBounds()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int GetCharacterBoundsFlags(int arg0)
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Graphics.RectF> GetVisibleLineBounds()
         {
-            return IExecuteWithSignature<int>("getCharacterBoundsFlags", "(I)I", arg0);
+            return IExecuteWithSignature<Java.Util.List<Android.Graphics.RectF>>("getVisibleLineBounds", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/CursorAnchorInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/DeleteGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/DeleteGesture.cs
index b3825dd2c..a11298486 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/DeleteGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/DeleteGesture.cs
@@ -56,26 +56,28 @@ public partial class DeleteGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteGesture.html#getDeletionArea()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteGesture.html#getDeletionArea()"/>
         /// </summary>
-        public Android.Graphics.RectF DeletionArea
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetDeletionArea()
         {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getDeletionArea", "()Landroid/graphics/RectF;"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getDeletionArea", "()Landroid/graphics/RectF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteGesture.html#getGranularity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteGesture.html#describeContents()"/>
         /// </summary>
-        public int Granularity
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getGranularity", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteGesture.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteGesture.html#getGranularity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetGranularity()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getGranularity", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteGesture.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/DeleteRangeGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/DeleteRangeGesture.cs
index 35780279d..7edc084e4 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/DeleteRangeGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/DeleteRangeGesture.cs
@@ -56,33 +56,36 @@ public partial class DeleteRangeGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#getDeletionEndArea()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#getDeletionEndArea()"/>
         /// </summary>
-        public Android.Graphics.RectF DeletionEndArea
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetDeletionEndArea()
         {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getDeletionEndArea", "()Landroid/graphics/RectF;"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getDeletionEndArea", "()Landroid/graphics/RectF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#getDeletionStartArea()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#getDeletionStartArea()"/>
         /// </summary>
-        public Android.Graphics.RectF DeletionStartArea
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetDeletionStartArea()
         {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getDeletionStartArea", "()Landroid/graphics/RectF;"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getDeletionStartArea", "()Landroid/graphics/RectF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#getGranularity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#describeContents()"/>
         /// </summary>
-        public int Granularity
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getGranularity", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#getGranularity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetGranularity()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getGranularity", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/DeleteRangeGesture.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/EditorBoundsInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/EditorBoundsInfo.cs
index ec68d612a..980afced5 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/EditorBoundsInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/EditorBoundsInfo.cs
@@ -52,18 +52,20 @@ public partial class EditorBoundsInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorBoundsInfo.html#getEditorBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorBoundsInfo.html#getEditorBounds()"/>
         /// </summary>
-        public Android.Graphics.RectF EditorBounds
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetEditorBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getEditorBounds", "()Landroid/graphics/RectF;"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getEditorBounds", "()Landroid/graphics/RectF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorBoundsInfo.html#getHandwritingBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorBoundsInfo.html#getHandwritingBounds()"/>
         /// </summary>
-        public Android.Graphics.RectF HandwritingBounds
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetHandwritingBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getHandwritingBounds", "()Landroid/graphics/RectF;"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getHandwritingBounds", "()Landroid/graphics/RectF;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorBoundsInfo.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/EditorInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/EditorInfo.cs
index 80d9df0a2..89f589124 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/EditorInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/EditorInfo.cs
@@ -232,27 +232,6 @@ public partial class EditorInfo : Android.Text.IInputType, Android.Os.IParcelabl
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#getInitialToolType()"/> <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#setInitialToolType(int)"/>
-        /// </summary>
-        public int InitialToolType
-        {
-            get { return IExecuteWithSignature<int>("getInitialToolType", "()I"); } set { IExecuteWithSignature("setInitialToolType", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#getSupportedHandwritingGesturePreviews()"/> <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#setSupportedHandwritingGesturePreviews(java.util.Set)"/>
-        /// </summary>
-        public Java.Util.Set SupportedHandwritingGesturePreviews
-        {
-            get { return IExecuteWithSignature<Java.Util.Set>("getSupportedHandwritingGesturePreviews", "()Ljava/util/Set;"); } set { IExecuteWithSignature("setSupportedHandwritingGesturePreviews", "(Ljava/util/Set;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#getSupportedHandwritingGestures()"/> <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#setSupportedHandwritingGestures(java.util.List)"/>
-        /// </summary>
-        public Java.Util.List SupportedHandwritingGestures
-        {
-            get { return IExecuteWithSignature<Java.Util.List>("getSupportedHandwritingGestures", "()Ljava/util/List;"); } set { IExecuteWithSignature("setSupportedHandwritingGestures", "(Ljava/util/List;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#getInitialSurroundingText(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -280,6 +259,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#getInitialToolType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInitialToolType()
+        {
+            return IExecuteWithSignature<int>("getInitialToolType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#getInitialSelectedText(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -309,6 +296,24 @@ public Java.Lang.CharSequence GetInitialTextBeforeCursor(int arg0, int arg1)
             return IExecute<Java.Lang.CharSequence>("getInitialTextBeforeCursor", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#getSupportedHandwritingGestures()"/>
+        /// </summary>
+        /// <typeparam name="ReturnExtendsAndroid_View_Inputmethod_HandwritingGesture"><see cref="Android.View.Inputmethod.HandwritingGesture"/></typeparam>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Class> GetSupportedHandwritingGestures<ReturnExtendsAndroid_View_Inputmethod_HandwritingGesture>() where ReturnExtendsAndroid_View_Inputmethod_HandwritingGesture : Android.View.Inputmethod.HandwritingGesture
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.Class>>("getSupportedHandwritingGestures", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#getSupportedHandwritingGesturePreviews()"/>
+        /// </summary>
+        /// <typeparam name="ReturnExtendsAndroid_View_Inputmethod_PreviewableHandwritingGesture"><see cref="Android.View.Inputmethod.PreviewableHandwritingGesture"/></typeparam>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Class> GetSupportedHandwritingGesturePreviews<ReturnExtendsAndroid_View_Inputmethod_PreviewableHandwritingGesture>() where ReturnExtendsAndroid_View_Inputmethod_PreviewableHandwritingGesture : Android.View.Inputmethod.PreviewableHandwritingGesture
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Class>>("getSupportedHandwritingGesturePreviews", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#dump(android.util.Printer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.Printer"/></param>
@@ -335,6 +340,32 @@ public void SetInitialSurroundingText(Java.Lang.CharSequence arg0)
             IExecuteWithSignature("setInitialSurroundingText", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#setInitialToolType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInitialToolType(int arg0)
+        {
+            IExecuteWithSignature("setInitialToolType", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#setSupportedHandwritingGesturePreviews(java.util.Set)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Set"/></param>
+        /// <typeparam name="Arg0ExtendsAndroid_View_Inputmethod_PreviewableHandwritingGesture"><see cref="Android.View.Inputmethod.PreviewableHandwritingGesture"/></typeparam>
+        public void SetSupportedHandwritingGesturePreviews<Arg0ExtendsAndroid_View_Inputmethod_PreviewableHandwritingGesture>(Java.Util.Set<Java.Lang.Class> arg0) where Arg0ExtendsAndroid_View_Inputmethod_PreviewableHandwritingGesture : Android.View.Inputmethod.PreviewableHandwritingGesture
+        {
+            IExecuteWithSignature("setSupportedHandwritingGesturePreviews", "(Ljava/util/Set;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#setSupportedHandwritingGestures(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <typeparam name="Arg0ExtendsAndroid_View_Inputmethod_HandwritingGesture"><see cref="Android.View.Inputmethod.HandwritingGesture"/></typeparam>
+        public void SetSupportedHandwritingGestures<Arg0ExtendsAndroid_View_Inputmethod_HandwritingGesture>(Java.Util.List<Java.Lang.Class> arg0) where Arg0ExtendsAndroid_View_Inputmethod_HandwritingGesture : Android.View.Inputmethod.HandwritingGesture
+        {
+            IExecuteWithSignature("setSupportedHandwritingGestures", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/EditorInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/HandwritingGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/HandwritingGesture.cs
index 8b1b20f57..8a21254da 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/HandwritingGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/HandwritingGesture.cs
@@ -58,11 +58,12 @@ public partial class HandwritingGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/HandwritingGesture.html#getFallbackText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/HandwritingGesture.html#getFallbackText()"/>
         /// </summary>
-        public Java.Lang.String FallbackText
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFallbackText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFallbackText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFallbackText", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestion.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestion.cs
index b4c9bd093..e9438e445 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestion.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestion.cs
@@ -52,11 +52,12 @@ public partial class InlineSuggestion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestion.html#getInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestion.html#getInfo()"/>
         /// </summary>
-        public Android.View.Inputmethod.InlineSuggestionInfo Info
+        /// <returns><see cref="Android.View.Inputmethod.InlineSuggestionInfo"/></returns>
+        public Android.View.Inputmethod.InlineSuggestionInfo GetInfo()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.InlineSuggestionInfo>("getInfo", "()Landroid/view/inputmethod/InlineSuggestionInfo;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InlineSuggestionInfo>("getInfo", "()Landroid/view/inputmethod/InlineSuggestionInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestion.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionInfo.cs
index b04a2ceb4..8bdd086cb 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionInfo.cs
@@ -76,48 +76,52 @@ public partial class InlineSuggestionInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#getAutofillHints()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#getInlinePresentationSpec()"/>
         /// </summary>
-        public Java.Lang.String[] AutofillHints
+        /// <returns><see cref="Android.Widget.Inline.InlinePresentationSpec"/></returns>
+        public Android.Widget.Inline.InlinePresentationSpec GetInlinePresentationSpec()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getAutofillHints", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Widget.Inline.InlinePresentationSpec>("getInlinePresentationSpec", "()Landroid/widget/inline/InlinePresentationSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#getInlinePresentationSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#isPinned()"/>
         /// </summary>
-        public Android.Widget.Inline.InlinePresentationSpec InlinePresentationSpec
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPinned()
         {
-            get { return IExecuteWithSignature<Android.Widget.Inline.InlinePresentationSpec>("getInlinePresentationSpec", "()Landroid/widget/inline/InlinePresentationSpec;"); }
+            return IExecuteWithSignature<bool>("isPinned", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#getSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String Source
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSource", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#getSource()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSource()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSource", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#isPinned()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPinned()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            return IExecuteWithSignature<bool>("isPinned", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#getAutofillHints()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetAutofillHints()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getAutofillHints", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionsRequest.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionsRequest.cs
index 9ff1b8015..b02d4e0e8 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionsRequest.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionsRequest.cs
@@ -58,54 +58,60 @@ public partial class InlineSuggestionsRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getExtras()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getHostPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getSupportedLocales()"/>
         /// </summary>
-        public Java.Lang.String HostPackageName
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetSupportedLocales()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHostPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getSupportedLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getInlinePresentationSpecs()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getInlineTooltipPresentationSpec()"/>
         /// </summary>
-        public Java.Util.List<Android.Widget.Inline.InlinePresentationSpec> InlinePresentationSpecs
+        /// <returns><see cref="Android.Widget.Inline.InlinePresentationSpec"/></returns>
+        public Android.Widget.Inline.InlinePresentationSpec GetInlineTooltipPresentationSpec()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Widget.Inline.InlinePresentationSpec>>("getInlinePresentationSpecs", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Widget.Inline.InlinePresentationSpec>("getInlineTooltipPresentationSpec", "()Landroid/widget/inline/InlinePresentationSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getInlineTooltipPresentationSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#describeContents()"/>
         /// </summary>
-        public Android.Widget.Inline.InlinePresentationSpec InlineTooltipPresentationSpec
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Widget.Inline.InlinePresentationSpec>("getInlineTooltipPresentationSpec", "()Landroid/widget/inline/InlinePresentationSpec;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getMaxSuggestionCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getMaxSuggestionCount()"/>
         /// </summary>
-        public int MaxSuggestionCount
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxSuggestionCount()
         {
-            get { return IExecuteWithSignature<int>("getMaxSuggestionCount", "()I"); }
+            return IExecuteWithSignature<int>("getMaxSuggestionCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getSupportedLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getHostPackageName()"/>
         /// </summary>
-        public Android.Os.LocaleList SupportedLocales
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHostPackageName()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getSupportedLocales", "()Landroid/os/LocaleList;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHostPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#getInlinePresentationSpecs()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Widget.Inline.InlinePresentationSpec> GetInlinePresentationSpecs()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.Widget.Inline.InlinePresentationSpec>>("getInlinePresentationSpecs", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionsResponse.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionsResponse.cs
index dab4172b9..137ab5928 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionsResponse.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InlineSuggestionsResponse.cs
@@ -52,13 +52,6 @@ public partial class InlineSuggestionsResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsResponse.html#getInlineSuggestions()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.Inputmethod.InlineSuggestion> InlineSuggestions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Inputmethod.InlineSuggestion>>("getInlineSuggestions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsResponse.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -67,6 +60,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsResponse.html#getInlineSuggestions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Inputmethod.InlineSuggestion> GetInlineSuggestions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Inputmethod.InlineSuggestion>>("getInlineSuggestions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InlineSuggestionsResponse.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputBinding.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputBinding.cs
index cffd5ea5a..79e39ba20 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputBinding.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputBinding.cs
@@ -72,40 +72,44 @@ public InputBinding(Android.View.Inputmethod.InputConnection arg0, Android.View.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#getConnection()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#getConnectionToken()"/>
         /// </summary>
-        public Android.View.Inputmethod.InputConnection Connection
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetConnectionToken()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.InputConnection>("getConnection", "()Landroid/view/inputmethod/InputConnection;"); }
+            return IExecuteWithSignature<Android.Os.IBinder>("getConnectionToken", "()Landroid/os/IBinder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#getConnectionToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#getConnection()"/>
         /// </summary>
-        public Android.Os.IBinder ConnectionToken
+        /// <returns><see cref="Android.View.Inputmethod.InputConnection"/></returns>
+        public Android.View.Inputmethod.InputConnection GetConnection()
         {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getConnectionToken", "()Landroid/os/IBinder;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InputConnection>("getConnection", "()Landroid/view/inputmethod/InputConnection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#getPid()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#describeContents()"/>
         /// </summary>
-        public int Pid
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPid", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#getUid()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#getPid()"/>
         /// </summary>
-        public int Uid
+        /// <returns><see cref="int"/></returns>
+        public int GetPid()
         {
-            get { return IExecuteWithSignature<int>("getUid", "()I"); }
+            return IExecuteWithSignature<int>("getPid", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#getUid()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetUid()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getUid", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputBinding.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputConnection.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputConnection.cs
index 4af2fac60..cc5682612 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputConnection.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputConnection.cs
@@ -160,11 +160,12 @@ public partial class InputConnection : Android.View.Inputmethod.IInputConnection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputConnection.html#getHandler()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputConnection.html#getHandler()"/>
         /// </summary>
-        public Android.Os.Handler Handler
+        /// <returns><see cref="Android.Os.Handler"/></returns>
+        public Android.Os.Handler GetHandler()
         {
-            get { return IExecuteWithSignature<Android.Os.Handler>("getHandler", "()Landroid/os/Handler;"); }
+            return IExecuteWithSignature<Android.Os.Handler>("getHandler", "()Landroid/os/Handler;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputConnection.html#getExtractedText(android.view.inputmethod.ExtractedTextRequest,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputConnectionWrapper.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputConnectionWrapper.cs
index 62b7c6590..d7a433d1d 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputConnectionWrapper.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputConnectionWrapper.cs
@@ -55,11 +55,12 @@ public InputConnectionWrapper(Android.View.Inputmethod.InputConnection arg0, boo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputConnectionWrapper.html#getHandler()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputConnectionWrapper.html#getHandler()"/>
         /// </summary>
-        public Android.Os.Handler Handler
+        /// <returns><see cref="Android.Os.Handler"/></returns>
+        public Android.Os.Handler GetHandler()
         {
-            get { return IExecuteWithSignature<Android.Os.Handler>("getHandler", "()Landroid/os/Handler;"); }
+            return IExecuteWithSignature<Android.Os.Handler>("getHandler", "()Landroid/os/Handler;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputConnectionWrapper.html#getExtractedText(android.view.inputmethod.ExtractedTextRequest,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputContentInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputContentInfo.cs
index c1fc9216d..5ab25ede8 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputContentInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputContentInfo.cs
@@ -71,25 +71,28 @@ public InputContentInfo(Android.Net.Uri arg0, Android.Content.ClipDescription ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo.html#getContentUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo.html#getDescription()"/>
         /// </summary>
-        public Android.Net.Uri ContentUri
+        /// <returns><see cref="Android.Content.ClipDescription"/></returns>
+        public Android.Content.ClipDescription GetDescription()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getContentUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Content.ClipDescription>("getDescription", "()Landroid/content/ClipDescription;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo.html#getContentUri()"/>
         /// </summary>
-        public Android.Content.ClipDescription Description
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetContentUri()
         {
-            get { return IExecuteWithSignature<Android.Content.ClipDescription>("getDescription", "()Landroid/content/ClipDescription;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getContentUri", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo.html#getLinkUri()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo.html#getLinkUri()"/>
         /// </summary>
-        public Android.Net.Uri LinkUri
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetLinkUri()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getLinkUri", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getLinkUri", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputContentInfo.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodInfo.cs
index 6e077f313..7cb3bbe0d 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodInfo.cs
@@ -80,67 +80,12 @@ public InputMethodInfo(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.C
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getComponent()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getComponent()"/>
         /// </summary>
-        public Android.Content.ComponentName Component
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponent()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getConfigChanges()"/> 
-        /// </summary>
-        public int ConfigChanges
-        {
-            get { return IExecuteWithSignature<int>("getConfigChanges", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getIsDefaultResourceId()"/> 
-        /// </summary>
-        public int IsDefaultResourceId
-        {
-            get { return IExecuteWithSignature<int>("getIsDefaultResourceId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getServiceInfo()"/> 
-        /// </summary>
-        public Android.Content.Pm.ServiceInfo ServiceInfo
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getServiceName()"/> 
-        /// </summary>
-        public Java.Lang.String ServiceName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServiceName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getSettingsActivity()"/> 
-        /// </summary>
-        public Java.Lang.String SettingsActivity
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSettingsActivity", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getSubtypeCount()"/> 
-        /// </summary>
-        public int SubtypeCount
-        {
-            get { return IExecuteWithSignature<int>("getSubtypeCount", "()I"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#createStylusHandwritingSettingsActivityIntent()"/>
@@ -151,6 +96,14 @@ public Android.Content.Intent CreateStylusHandwritingSettingsActivityIntent()
             return IExecuteWithSignature<Android.Content.Intent>("createStylusHandwritingSettingsActivityIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getServiceInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Pm.ServiceInfo"/></returns>
+        public Android.Content.Pm.ServiceInfo GetServiceInfo()
+        {
+            return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#loadIcon(android.content.pm.PackageManager)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
@@ -201,6 +154,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getConfigChanges()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetConfigChanges()
+        {
+            return IExecuteWithSignature<int>("getConfigChanges", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getIsDefaultResourceId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIsDefaultResourceId()
+        {
+            return IExecuteWithSignature<int>("getIsDefaultResourceId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getSubtypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSubtypeCount()
+        {
+            return IExecuteWithSignature<int>("getSubtypeCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#loadLabel(android.content.pm.PackageManager)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
@@ -210,6 +187,38 @@ public Java.Lang.CharSequence LoadLabel(Android.Content.Pm.PackageManager arg0)
             return IExecuteWithSignature<Java.Lang.CharSequence>("loadLabel", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getServiceName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServiceName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getServiceName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#getSettingsActivity()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSettingsActivity()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSettingsActivity", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodInfo.html#dump(android.util.Printer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.Printer"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodManager.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodManager.cs
index fa4e64919..3731c25fe 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodManager.cs
@@ -76,7 +76,7 @@ public partial class InputMethodManager
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#SHOW_FORCED"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SHOW_FORCED { get { if (!_SHOW_FORCEDReady) { _SHOW_FORCEDContent = SGetField<int>(LocalBridgeClazz, "SHOW_FORCED"); _SHOW_FORCEDReady = true; } return _SHOW_FORCEDContent; } }
         private static int _SHOW_FORCEDContent = default;
         private static bool _SHOW_FORCEDReady = false; // this is used because in case of generics 
@@ -95,46 +95,28 @@ public partial class InputMethodManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getCurrentInputMethodInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getCurrentInputMethodInfo()"/>
         /// </summary>
-        public Android.View.Inputmethod.InputMethodInfo CurrentInputMethodInfo
+        /// <returns><see cref="Android.View.Inputmethod.InputMethodInfo"/></returns>
+        public Android.View.Inputmethod.InputMethodInfo GetCurrentInputMethodInfo()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.InputMethodInfo>("getCurrentInputMethodInfo", "()Landroid/view/inputmethod/InputMethodInfo;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InputMethodInfo>("getCurrentInputMethodInfo", "()Landroid/view/inputmethod/InputMethodInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getCurrentInputMethodSubtype()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getCurrentInputMethodSubtype()"/>
         /// </summary>
-        public Android.View.Inputmethod.InputMethodSubtype CurrentInputMethodSubtype
+        /// <returns><see cref="Android.View.Inputmethod.InputMethodSubtype"/></returns>
+        public Android.View.Inputmethod.InputMethodSubtype GetCurrentInputMethodSubtype()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.InputMethodSubtype>("getCurrentInputMethodSubtype", "()Landroid/view/inputmethod/InputMethodSubtype;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InputMethodSubtype>("getCurrentInputMethodSubtype", "()Landroid/view/inputmethod/InputMethodSubtype;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getEnabledInputMethodList()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getLastInputMethodSubtype()"/>
         /// </summary>
-        public Java.Util.List<Android.View.Inputmethod.InputMethodInfo> EnabledInputMethodList
+        /// <returns><see cref="Android.View.Inputmethod.InputMethodSubtype"/></returns>
+        public Android.View.Inputmethod.InputMethodSubtype GetLastInputMethodSubtype()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Inputmethod.InputMethodInfo>>("getEnabledInputMethodList", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getInputMethodList()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.Inputmethod.InputMethodInfo> InputMethodList
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Inputmethod.InputMethodInfo>>("getInputMethodList", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getLastInputMethodSubtype()"/> 
-        /// </summary>
-        public Android.View.Inputmethod.InputMethodSubtype LastInputMethodSubtype
-        {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.InputMethodSubtype>("getLastInputMethodSubtype", "()Landroid/view/inputmethod/InputMethodSubtype;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getShortcutInputMethodsAndSubtypes()"/> 
-        /// </summary>
-        public Java.Util.Map<Android.View.Inputmethod.InputMethodInfo, Java.Util.List<Android.View.Inputmethod.InputMethodSubtype>> ShortcutInputMethodsAndSubtypes
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Android.View.Inputmethod.InputMethodInfo, Java.Util.List<Android.View.Inputmethod.InputMethodSubtype>>>("getShortcutInputMethodsAndSubtypes", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InputMethodSubtype>("getLastInputMethodSubtype", "()Landroid/view/inputmethod/InputMethodSubtype;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#acceptStylusHandwritingDelegation(android.view.View,java.lang.String)"/>
@@ -230,7 +212,7 @@ public bool IsStylusHandwritingAvailable()
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsWatchingCursor(Android.View.View arg0)
         {
             return IExecuteWithSignature<bool>("isWatchingCursor", "(Landroid/view/View;)Z", arg0);
@@ -240,7 +222,7 @@ public bool IsWatchingCursor(Android.View.View arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Inputmethod.InputMethodSubtype"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SetCurrentInputMethodSubtype(Android.View.Inputmethod.InputMethodSubtype arg0)
         {
             return IExecuteWithSignature<bool>("setCurrentInputMethodSubtype", "(Landroid/view/inputmethod/InputMethodSubtype;)Z", arg0);
@@ -250,7 +232,7 @@ public bool SetCurrentInputMethodSubtype(Android.View.Inputmethod.InputMethodSub
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ShouldOfferSwitchingToNextInputMethod(Android.Os.IBinder arg0)
         {
             return IExecuteWithSignature<bool>("shouldOfferSwitchingToNextInputMethod", "(Landroid/os/IBinder;)Z", arg0);
@@ -281,7 +263,7 @@ public bool ShowSoftInput(Android.View.View arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SwitchToLastInputMethod(Android.Os.IBinder arg0)
         {
             return IExecuteWithSignature<bool>("switchToLastInputMethod", "(Landroid/os/IBinder;)Z", arg0);
@@ -292,12 +274,28 @@ public bool SwitchToLastInputMethod(Android.Os.IBinder arg0)
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool SwitchToNextInputMethod(Android.Os.IBinder arg0, bool arg1)
         {
             return IExecute<bool>("switchToNextInputMethod", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getEnabledInputMethodList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Inputmethod.InputMethodInfo> GetEnabledInputMethodList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Inputmethod.InputMethodInfo>>("getEnabledInputMethodList", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getInputMethodList()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Inputmethod.InputMethodInfo> GetInputMethodList()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Inputmethod.InputMethodInfo>>("getInputMethodList", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getEnabledInputMethodSubtypeList(android.view.inputmethod.InputMethodInfo,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Inputmethod.InputMethodInfo"/></param>
@@ -308,6 +306,14 @@ public bool SwitchToNextInputMethod(Android.Os.IBinder arg0, bool arg1)
             return IExecute<Java.Util.List<Android.View.Inputmethod.InputMethodSubtype>>("getEnabledInputMethodSubtypeList", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#getShortcutInputMethodsAndSubtypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Android.View.Inputmethod.InputMethodInfo, Java.Util.List<Android.View.Inputmethod.InputMethodSubtype>> GetShortcutInputMethodsAndSubtypes()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Android.View.Inputmethod.InputMethodInfo, Java.Util.List<Android.View.Inputmethod.InputMethodSubtype>>>("getShortcutInputMethodsAndSubtypes", "()Ljava/util/Map;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#dispatchKeyEventFromInputMethod(android.view.View,android.view.KeyEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -330,7 +336,7 @@ public void DisplayCompletions(Android.View.View arg0, Android.View.Inputmethod.
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void HideSoftInputFromInputMethod(Android.Os.IBinder arg0, int arg1)
         {
             IExecute("hideSoftInputFromInputMethod", arg0, arg1);
@@ -339,7 +345,7 @@ public void HideSoftInputFromInputMethod(Android.Os.IBinder arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#hideStatusIcon(android.os.IBinder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void HideStatusIcon(Android.Os.IBinder arg0)
         {
             IExecuteWithSignature("hideStatusIcon", "(Landroid/os/IBinder;)V", arg0);
@@ -392,7 +398,7 @@ public void SendAppPrivateCommand(Android.View.View arg0, Java.Lang.String arg1,
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.View.Inputmethod.InputMethodSubtype"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAdditionalInputMethodSubtypes(Java.Lang.String arg0, Android.View.Inputmethod.InputMethodSubtype[] arg1)
         {
             IExecute("setAdditionalInputMethodSubtypes", arg0, arg1);
@@ -411,7 +417,7 @@ public void SetExplicitlyEnabledInputMethodSubtypes(Java.Lang.String arg0, int[]
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInputMethod(Android.Os.IBinder arg0, Java.Lang.String arg1)
         {
             IExecute("setInputMethod", arg0, arg1);
@@ -422,7 +428,7 @@ public void SetInputMethod(Android.Os.IBinder arg0, Java.Lang.String arg1)
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Android.View.Inputmethod.InputMethodSubtype"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetInputMethodAndSubtype(Android.Os.IBinder arg0, Java.Lang.String arg1, Android.View.Inputmethod.InputMethodSubtype arg2)
         {
             IExecute("setInputMethodAndSubtype", arg0, arg1, arg2);
@@ -447,7 +453,7 @@ public void ShowInputMethodPicker()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ShowSoftInputFromInputMethod(Android.Os.IBinder arg0, int arg1)
         {
             IExecute("showSoftInputFromInputMethod", arg0, arg1);
@@ -458,7 +464,7 @@ public void ShowSoftInputFromInputMethod(Android.Os.IBinder arg0, int arg1)
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ShowStatusIcon(Android.Os.IBinder arg0, Java.Lang.String arg1, int arg2)
         {
             IExecute("showStatusIcon", arg0, arg1, arg2);
@@ -476,7 +482,7 @@ public void StartStylusHandwriting(Android.View.View arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ToggleSoftInput(int arg0, int arg1)
         {
             IExecute("toggleSoftInput", arg0, arg1);
@@ -487,7 +493,7 @@ public void ToggleSoftInput(int arg0, int arg1)
         /// <param name="arg0"><see cref="Android.Os.IBinder"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ToggleSoftInputFromWindow(Android.Os.IBinder arg0, int arg1, int arg2)
         {
             IExecute("toggleSoftInputFromWindow", arg0, arg1, arg2);
@@ -500,7 +506,7 @@ public void ToggleSoftInputFromWindow(Android.Os.IBinder arg0, int arg1, int arg
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UpdateCursor(Android.View.View arg0, int arg1, int arg2, int arg3, int arg4)
         {
             IExecute("updateCursor", arg0, arg1, arg2, arg3, arg4);
@@ -540,7 +546,7 @@ public void UpdateSelection(Android.View.View arg0, int arg1, int arg2, int arg3
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodManager.html#viewClicked(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ViewClicked(Android.View.View arg0)
         {
             IExecuteWithSignature("viewClicked", "(Landroid/view/View;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodSession.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodSession.cs
index 05925eb8b..e97296390 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodSession.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodSession.cs
@@ -122,7 +122,7 @@ public void FinishInput()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ToggleSoftInput(int arg0, int arg1)
         {
             IExecute("toggleSoftInput", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodSubtype.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodSubtype.cs
index 367bf99d0..99198358a 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodSubtype.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InputMethodSubtype.cs
@@ -40,7 +40,7 @@ public partial class InputMethodSubtype
         /// <param name="arg5"><see cref="bool"/></param>
         /// <param name="arg6"><see cref="bool"/></param>
         /// <param name="arg7"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public InputMethodSubtype(int arg0, int arg1, Java.Lang.String arg2, Java.Lang.String arg3, Java.Lang.String arg4, bool arg5, bool arg6, int arg7)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
         {
@@ -55,7 +55,7 @@ public InputMethodSubtype(int arg0, int arg1, Java.Lang.String arg2, Java.Lang.S
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
         /// <param name="arg5"><see cref="bool"/></param>
         /// <param name="arg6"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public InputMethodSubtype(int arg0, int arg1, Java.Lang.String arg2, Java.Lang.String arg3, Java.Lang.String arg4, bool arg5, bool arg6)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
         {
@@ -83,68 +83,12 @@ public InputMethodSubtype(int arg0, int arg1, Java.Lang.String arg2, Java.Lang.S
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getExtraValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getPhysicalKeyboardHintLanguageTag()"/>
         /// </summary>
-        public Java.Lang.String ExtraValue
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetPhysicalKeyboardHintLanguageTag()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getExtraValue", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getIconResId()"/> 
-        /// </summary>
-        public int IconResId
-        {
-            get { return IExecuteWithSignature<int>("getIconResId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getLanguageTag()"/> 
-        /// </summary>
-        public Java.Lang.String LanguageTag
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLanguageTag", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getLocale()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Locale
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocale", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getMode()"/> 
-        /// </summary>
-        public Java.Lang.String Mode
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMode", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getNameOverride()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence NameOverride
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getNameOverride", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getNameResId()"/> 
-        /// </summary>
-        public int NameResId
-        {
-            get { return IExecuteWithSignature<int>("getNameResId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getPhysicalKeyboardHintLanguageTag()"/> 
-        /// </summary>
-        public Android.Icu.Util.ULocale PhysicalKeyboardHintLanguageTag
-        {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getPhysicalKeyboardHintLanguageTag", "()Landroid/icu/util/ULocale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getPhysicalKeyboardHintLayoutType()"/> 
-        /// </summary>
-        public Java.Lang.String PhysicalKeyboardHintLayoutType
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPhysicalKeyboardHintLayoutType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getPhysicalKeyboardHintLanguageTag", "()Landroid/icu/util/ULocale;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#containsExtraValueKey(java.lang.String)"/>
@@ -188,6 +132,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getIconResId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIconResId()
+        {
+            return IExecuteWithSignature<int>("getIconResId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getNameResId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNameResId()
+        {
+            return IExecuteWithSignature<int>("getNameResId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getDisplayName(android.content.Context,java.lang.String,android.content.pm.ApplicationInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -199,6 +159,22 @@ public Java.Lang.CharSequence GetDisplayName(Android.Content.Context arg0, Java.
             return IExecute<Java.Lang.CharSequence>("getDisplayName", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getNameOverride()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetNameOverride()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNameOverride", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getExtraValue()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetExtraValue()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getExtraValue", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getExtraValueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -208,6 +184,39 @@ public Java.Lang.String GetExtraValueOf(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getExtraValueOf", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getLanguageTag()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLanguageTag()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLanguageTag", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getLocale()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetLocale()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLocale", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getMode()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMode()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMode", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#getPhysicalKeyboardHintLayoutType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPhysicalKeyboardHintLayoutType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPhysicalKeyboardHintLayoutType", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InputMethodSubtype.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InsertGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InsertGesture.cs
index 85199abfb..a792e677b 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InsertGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InsertGesture.cs
@@ -56,18 +56,12 @@ public partial class InsertGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertGesture.html#getInsertionPoint()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertGesture.html#getInsertionPoint()"/>
         /// </summary>
-        public Android.Graphics.PointF InsertionPoint
+        /// <returns><see cref="Android.Graphics.PointF"/></returns>
+        public Android.Graphics.PointF GetInsertionPoint()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PointF>("getInsertionPoint", "()Landroid/graphics/PointF;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertGesture.html#getTextToInsert()"/> 
-        /// </summary>
-        public Java.Lang.String TextToInsert
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTextToInsert", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Graphics.PointF>("getInsertionPoint", "()Landroid/graphics/PointF;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertGesture.html#describeContents()"/>
@@ -78,6 +72,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertGesture.html#getTextToInsert()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTextToInsert()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTextToInsert", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertGesture.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/InsertModeGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/InsertModeGesture.cs
index efdcb2b47..adc65997d 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/InsertModeGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/InsertModeGesture.cs
@@ -56,18 +56,20 @@ public partial class InsertModeGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertModeGesture.html#getCancellationSignal()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertModeGesture.html#getInsertionPoint()"/>
         /// </summary>
-        public Android.Os.CancellationSignal CancellationSignal
+        /// <returns><see cref="Android.Graphics.PointF"/></returns>
+        public Android.Graphics.PointF GetInsertionPoint()
         {
-            get { return IExecuteWithSignature<Android.Os.CancellationSignal>("getCancellationSignal", "()Landroid/os/CancellationSignal;"); }
+            return IExecuteWithSignature<Android.Graphics.PointF>("getInsertionPoint", "()Landroid/graphics/PointF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertModeGesture.html#getInsertionPoint()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertModeGesture.html#getCancellationSignal()"/>
         /// </summary>
-        public Android.Graphics.PointF InsertionPoint
+        /// <returns><see cref="Android.Os.CancellationSignal"/></returns>
+        public Android.Os.CancellationSignal GetCancellationSignal()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PointF>("getInsertionPoint", "()Landroid/graphics/PointF;"); }
+            return IExecuteWithSignature<Android.Os.CancellationSignal>("getCancellationSignal", "()Landroid/os/CancellationSignal;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/InsertModeGesture.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/JoinOrSplitGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/JoinOrSplitGesture.cs
index cbb4a4f04..9f56e58d4 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/JoinOrSplitGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/JoinOrSplitGesture.cs
@@ -56,11 +56,12 @@ public partial class JoinOrSplitGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/JoinOrSplitGesture.html#getJoinOrSplitPoint()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/JoinOrSplitGesture.html#getJoinOrSplitPoint()"/>
         /// </summary>
-        public Android.Graphics.PointF JoinOrSplitPoint
+        /// <returns><see cref="Android.Graphics.PointF"/></returns>
+        public Android.Graphics.PointF GetJoinOrSplitPoint()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PointF>("getJoinOrSplitPoint", "()Landroid/graphics/PointF;"); }
+            return IExecuteWithSignature<Android.Graphics.PointF>("getJoinOrSplitPoint", "()Landroid/graphics/PointF;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/JoinOrSplitGesture.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/RemoveSpaceGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/RemoveSpaceGesture.cs
index bc9f72142..9ca892129 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/RemoveSpaceGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/RemoveSpaceGesture.cs
@@ -56,18 +56,20 @@ public partial class RemoveSpaceGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/RemoveSpaceGesture.html#getEndPoint()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/RemoveSpaceGesture.html#getEndPoint()"/>
         /// </summary>
-        public Android.Graphics.PointF EndPoint
+        /// <returns><see cref="Android.Graphics.PointF"/></returns>
+        public Android.Graphics.PointF GetEndPoint()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PointF>("getEndPoint", "()Landroid/graphics/PointF;"); }
+            return IExecuteWithSignature<Android.Graphics.PointF>("getEndPoint", "()Landroid/graphics/PointF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/RemoveSpaceGesture.html#getStartPoint()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/RemoveSpaceGesture.html#getStartPoint()"/>
         /// </summary>
-        public Android.Graphics.PointF StartPoint
+        /// <returns><see cref="Android.Graphics.PointF"/></returns>
+        public Android.Graphics.PointF GetStartPoint()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PointF>("getStartPoint", "()Landroid/graphics/PointF;"); }
+            return IExecuteWithSignature<Android.Graphics.PointF>("getStartPoint", "()Landroid/graphics/PointF;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/RemoveSpaceGesture.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/SelectGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/SelectGesture.cs
index 0d5e6c63e..f4fec6d7e 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/SelectGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/SelectGesture.cs
@@ -56,26 +56,28 @@ public partial class SelectGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectGesture.html#getGranularity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectGesture.html#getSelectionArea()"/>
         /// </summary>
-        public int Granularity
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetSelectionArea()
         {
-            get { return IExecuteWithSignature<int>("getGranularity", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getSelectionArea", "()Landroid/graphics/RectF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectGesture.html#getSelectionArea()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectGesture.html#describeContents()"/>
         /// </summary>
-        public Android.Graphics.RectF SelectionArea
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getSelectionArea", "()Landroid/graphics/RectF;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectGesture.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectGesture.html#getGranularity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetGranularity()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getGranularity", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectGesture.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/SelectRangeGesture.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/SelectRangeGesture.cs
index c827ac68c..6f3e352ae 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/SelectRangeGesture.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/SelectRangeGesture.cs
@@ -56,33 +56,36 @@ public partial class SelectRangeGesture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#getGranularity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#getSelectionEndArea()"/>
         /// </summary>
-        public int Granularity
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetSelectionEndArea()
         {
-            get { return IExecuteWithSignature<int>("getGranularity", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getSelectionEndArea", "()Landroid/graphics/RectF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#getSelectionEndArea()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#getSelectionStartArea()"/>
         /// </summary>
-        public Android.Graphics.RectF SelectionEndArea
+        /// <returns><see cref="Android.Graphics.RectF"/></returns>
+        public Android.Graphics.RectF GetSelectionStartArea()
         {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getSelectionEndArea", "()Landroid/graphics/RectF;"); }
+            return IExecuteWithSignature<Android.Graphics.RectF>("getSelectionStartArea", "()Landroid/graphics/RectF;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#getSelectionStartArea()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#describeContents()"/>
         /// </summary>
-        public Android.Graphics.RectF SelectionStartArea
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Graphics.RectF>("getSelectionStartArea", "()Landroid/graphics/RectF;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#getGranularity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetGranularity()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getGranularity", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/SelectRangeGesture.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/SurroundingText.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/SurroundingText.cs
index b32cc1cb3..201c016c4 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/SurroundingText.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/SurroundingText.cs
@@ -63,40 +63,44 @@ public SurroundingText(Java.Lang.CharSequence arg0, int arg1, int arg2, int arg3
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#getOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#describeContents()"/>
         /// </summary>
-        public int Offset
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getOffset", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#getSelectionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#getOffset()"/>
         /// </summary>
-        public int SelectionEnd
+        /// <returns><see cref="int"/></returns>
+        public int GetOffset()
         {
-            get { return IExecuteWithSignature<int>("getSelectionEnd", "()I"); }
+            return IExecuteWithSignature<int>("getOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#getSelectionStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#getSelectionEnd()"/>
         /// </summary>
-        public int SelectionStart
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionEnd()
         {
-            get { return IExecuteWithSignature<int>("getSelectionStart", "()I"); }
+            return IExecuteWithSignature<int>("getSelectionEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#getSelectionStart()"/>
         /// </summary>
-        public Java.Lang.CharSequence Text
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionStart()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getSelectionStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#getText()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/SurroundingText.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextAppearanceInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextAppearanceInfo.cs
index 42e897b5f..870743a5e 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextAppearanceInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextAppearanceInfo.cs
@@ -52,169 +52,188 @@ public partial class TextAppearanceInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getFontFeatureSettings()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextLocales()"/>
         /// </summary>
-        public Java.Lang.String FontFeatureSettings
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetTextLocales()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFontFeatureSettings", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getTextLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getFontVariationSettings()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#isAllCaps()"/>
         /// </summary>
-        public Java.Lang.String FontVariationSettings
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAllCaps()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFontVariationSettings", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isAllCaps", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getHighlightTextColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#isElegantTextHeight()"/>
         /// </summary>
-        public int HighlightTextColor
+        /// <returns><see cref="bool"/></returns>
+        public bool IsElegantTextHeight()
         {
-            get { return IExecuteWithSignature<int>("getHighlightTextColor", "()I"); }
+            return IExecuteWithSignature<bool>("isElegantTextHeight", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getHintTextColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#isFallbackLineSpacing()"/>
         /// </summary>
-        public int HintTextColor
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFallbackLineSpacing()
         {
-            get { return IExecuteWithSignature<int>("getHintTextColor", "()I"); }
+            return IExecuteWithSignature<bool>("isFallbackLineSpacing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getLetterSpacing()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getLetterSpacing()"/>
         /// </summary>
-        public float LetterSpacing
+        /// <returns><see cref="float"/></returns>
+        public float GetLetterSpacing()
         {
-            get { return IExecuteWithSignature<float>("getLetterSpacing", "()F"); }
+            return IExecuteWithSignature<float>("getLetterSpacing", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getLineBreakStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getShadowDx()"/>
         /// </summary>
-        public int LineBreakStyle
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowDx()
         {
-            get { return IExecuteWithSignature<int>("getLineBreakStyle", "()I"); }
+            return IExecuteWithSignature<float>("getShadowDx", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getLineBreakWordStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getShadowDy()"/>
         /// </summary>
-        public int LineBreakWordStyle
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowDy()
         {
-            get { return IExecuteWithSignature<int>("getLineBreakWordStyle", "()I"); }
+            return IExecuteWithSignature<float>("getShadowDy", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getLinkTextColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getShadowRadius()"/>
         /// </summary>
-        public int LinkTextColor
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowRadius()
         {
-            get { return IExecuteWithSignature<int>("getLinkTextColor", "()I"); }
+            return IExecuteWithSignature<float>("getShadowRadius", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getShadowColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextScaleX()"/>
         /// </summary>
-        public int ShadowColor
+        /// <returns><see cref="float"/></returns>
+        public float GetTextScaleX()
         {
-            get { return IExecuteWithSignature<int>("getShadowColor", "()I"); }
+            return IExecuteWithSignature<float>("getTextScaleX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getShadowDx()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextSize()"/>
         /// </summary>
-        public float ShadowDx
+        /// <returns><see cref="float"/></returns>
+        public float GetTextSize()
         {
-            get { return IExecuteWithSignature<float>("getShadowDx", "()F"); }
+            return IExecuteWithSignature<float>("getTextSize", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getShadowDy()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#describeContents()"/>
         /// </summary>
-        public float ShadowDy
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<float>("getShadowDy", "()F"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getShadowRadius()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getHighlightTextColor()"/>
         /// </summary>
-        public float ShadowRadius
+        /// <returns><see cref="int"/></returns>
+        public int GetHighlightTextColor()
         {
-            get { return IExecuteWithSignature<float>("getShadowRadius", "()F"); }
+            return IExecuteWithSignature<int>("getHighlightTextColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getSystemFontFamilyName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getHintTextColor()"/>
         /// </summary>
-        public Java.Lang.String SystemFontFamilyName
+        /// <returns><see cref="int"/></returns>
+        public int GetHintTextColor()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemFontFamilyName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getHintTextColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getLineBreakStyle()"/>
         /// </summary>
-        public int TextColor
+        /// <returns><see cref="int"/></returns>
+        public int GetLineBreakStyle()
         {
-            get { return IExecuteWithSignature<int>("getTextColor", "()I"); }
+            return IExecuteWithSignature<int>("getLineBreakStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextFontWeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getLineBreakWordStyle()"/>
         /// </summary>
-        public int TextFontWeight
+        /// <returns><see cref="int"/></returns>
+        public int GetLineBreakWordStyle()
         {
-            get { return IExecuteWithSignature<int>("getTextFontWeight", "()I"); }
+            return IExecuteWithSignature<int>("getLineBreakWordStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextLocales()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getLinkTextColor()"/>
         /// </summary>
-        public Android.Os.LocaleList TextLocales
+        /// <returns><see cref="int"/></returns>
+        public int GetLinkTextColor()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getTextLocales", "()Landroid/os/LocaleList;"); }
+            return IExecuteWithSignature<int>("getLinkTextColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextScaleX()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getShadowColor()"/>
         /// </summary>
-        public float TextScaleX
+        /// <returns><see cref="int"/></returns>
+        public int GetShadowColor()
         {
-            get { return IExecuteWithSignature<float>("getTextScaleX", "()F"); }
+            return IExecuteWithSignature<int>("getShadowColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextColor()"/>
         /// </summary>
-        public float TextSize
+        /// <returns><see cref="int"/></returns>
+        public int GetTextColor()
         {
-            get { return IExecuteWithSignature<float>("getTextSize", "()F"); }
+            return IExecuteWithSignature<int>("getTextColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextFontWeight()"/>
         /// </summary>
-        public int TextStyle
+        /// <returns><see cref="int"/></returns>
+        public int GetTextFontWeight()
         {
-            get { return IExecuteWithSignature<int>("getTextStyle", "()I"); }
+            return IExecuteWithSignature<int>("getTextFontWeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#isAllCaps()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getTextStyle()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAllCaps()
+        /// <returns><see cref="int"/></returns>
+        public int GetTextStyle()
         {
-            return IExecuteWithSignature<bool>("isAllCaps", "()Z");
+            return IExecuteWithSignature<int>("getTextStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#isElegantTextHeight()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getFontFeatureSettings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsElegantTextHeight()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFontFeatureSettings()
         {
-            return IExecuteWithSignature<bool>("isElegantTextHeight", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getFontFeatureSettings", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#isFallbackLineSpacing()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getFontVariationSettings()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFallbackLineSpacing()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFontVariationSettings()
         {
-            return IExecuteWithSignature<bool>("isFallbackLineSpacing", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getFontVariationSettings", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#getSystemFontFamilyName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemFontFamilyName()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getSystemFontFamilyName", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAppearanceInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextAttribute.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextAttribute.cs
index dc73d880a..66c7bd76a 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextAttribute.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextAttribute.cs
@@ -52,18 +52,12 @@ public partial class TextAttribute
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAttribute.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAttribute.html#getExtras()"/>
         /// </summary>
-        public Android.Os.PersistableBundle Extras
+        /// <returns><see cref="Android.Os.PersistableBundle"/></returns>
+        public Android.Os.PersistableBundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAttribute.html#getTextConversionSuggestions()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> TextConversionSuggestions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getTextConversionSuggestions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Os.PersistableBundle>("getExtras", "()Landroid/os/PersistableBundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAttribute.html#describeContents()"/>
@@ -74,6 +68,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAttribute.html#getTextConversionSuggestions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetTextConversionSuggestions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getTextConversionSuggestions", "()Ljava/util/List;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextAttribute.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextBoundsInfo.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextBoundsInfo.cs
index 9e4a2f39b..405fc0e24 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextBoundsInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextBoundsInfo.cs
@@ -76,39 +76,28 @@ public partial class TextBoundsInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getEndIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getGraphemeSegmentFinder()"/>
         /// </summary>
-        public int EndIndex
+        /// <returns><see cref="Android.Text.SegmentFinder"/></returns>
+        public Android.Text.SegmentFinder GetGraphemeSegmentFinder()
         {
-            get { return IExecuteWithSignature<int>("getEndIndex", "()I"); }
+            return IExecuteWithSignature<Android.Text.SegmentFinder>("getGraphemeSegmentFinder", "()Landroid/text/SegmentFinder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getGraphemeSegmentFinder()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getLineSegmentFinder()"/>
         /// </summary>
-        public Android.Text.SegmentFinder GraphemeSegmentFinder
+        /// <returns><see cref="Android.Text.SegmentFinder"/></returns>
+        public Android.Text.SegmentFinder GetLineSegmentFinder()
         {
-            get { return IExecuteWithSignature<Android.Text.SegmentFinder>("getGraphemeSegmentFinder", "()Landroid/text/SegmentFinder;"); }
+            return IExecuteWithSignature<Android.Text.SegmentFinder>("getLineSegmentFinder", "()Landroid/text/SegmentFinder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getLineSegmentFinder()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getWordSegmentFinder()"/>
         /// </summary>
-        public Android.Text.SegmentFinder LineSegmentFinder
+        /// <returns><see cref="Android.Text.SegmentFinder"/></returns>
+        public Android.Text.SegmentFinder GetWordSegmentFinder()
         {
-            get { return IExecuteWithSignature<Android.Text.SegmentFinder>("getLineSegmentFinder", "()Landroid/text/SegmentFinder;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getStartIndex()"/> 
-        /// </summary>
-        public int StartIndex
-        {
-            get { return IExecuteWithSignature<int>("getStartIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getWordSegmentFinder()"/> 
-        /// </summary>
-        public Android.Text.SegmentFinder WordSegmentFinder
-        {
-            get { return IExecuteWithSignature<Android.Text.SegmentFinder>("getWordSegmentFinder", "()Landroid/text/SegmentFinder;"); }
+            return IExecuteWithSignature<Android.Text.SegmentFinder>("getWordSegmentFinder", "()Landroid/text/SegmentFinder;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#describeContents()"/>
@@ -137,6 +126,14 @@ public int GetCharacterFlags(int arg0)
             return IExecuteWithSignature<int>("getCharacterFlags", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getEndIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetEndIndex()
+        {
+            return IExecuteWithSignature<int>("getEndIndex", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getOffsetForPosition(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -147,6 +144,14 @@ public int GetOffsetForPosition(float arg0, float arg1)
             return IExecute<int>("getOffsetForPosition", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getStartIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStartIndex()
+        {
+            return IExecuteWithSignature<int>("getStartIndex", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfo.html#getRangeForRect(android.graphics.RectF,android.text.SegmentFinder,android.text.Layout.TextInclusionStrategy)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.RectF"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextBoundsInfoResult.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextBoundsInfoResult.cs
index eb0bdf5e4..cc695a17b 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextBoundsInfoResult.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextBoundsInfoResult.cs
@@ -87,18 +87,20 @@ public TextBoundsInfoResult(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfoResult.html#getResultCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfoResult.html#getTextBoundsInfo()"/>
         /// </summary>
-        public int ResultCode
+        /// <returns><see cref="Android.View.Inputmethod.TextBoundsInfo"/></returns>
+        public Android.View.Inputmethod.TextBoundsInfo GetTextBoundsInfo()
         {
-            get { return IExecuteWithSignature<int>("getResultCode", "()I"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.TextBoundsInfo>("getTextBoundsInfo", "()Landroid/view/inputmethod/TextBoundsInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfoResult.html#getTextBoundsInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextBoundsInfoResult.html#getResultCode()"/>
         /// </summary>
-        public Android.View.Inputmethod.TextBoundsInfo TextBoundsInfo
+        /// <returns><see cref="int"/></returns>
+        public int GetResultCode()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.TextBoundsInfo>("getTextBoundsInfo", "()Landroid/view/inputmethod/TextBoundsInfo;"); }
+            return IExecuteWithSignature<int>("getResultCode", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextSnapshot.cs b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextSnapshot.cs
index 42ee0f310..5eeefc853 100644
--- a/src/net/Netdroid/Generated/Android/View/Inputmethod/TextSnapshot.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inputmethod/TextSnapshot.cs
@@ -57,46 +57,52 @@ public TextSnapshot(Android.View.Inputmethod.SurroundingText arg0, int arg1, int
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getCompositionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getSurroundingText()"/>
         /// </summary>
-        public int CompositionEnd
+        /// <returns><see cref="Android.View.Inputmethod.SurroundingText"/></returns>
+        public Android.View.Inputmethod.SurroundingText GetSurroundingText()
         {
-            get { return IExecuteWithSignature<int>("getCompositionEnd", "()I"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.SurroundingText>("getSurroundingText", "()Landroid/view/inputmethod/SurroundingText;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getCompositionStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getCompositionEnd()"/>
         /// </summary>
-        public int CompositionStart
+        /// <returns><see cref="int"/></returns>
+        public int GetCompositionEnd()
         {
-            get { return IExecuteWithSignature<int>("getCompositionStart", "()I"); }
+            return IExecuteWithSignature<int>("getCompositionEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getCursorCapsMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getCompositionStart()"/>
         /// </summary>
-        public int CursorCapsMode
+        /// <returns><see cref="int"/></returns>
+        public int GetCompositionStart()
         {
-            get { return IExecuteWithSignature<int>("getCursorCapsMode", "()I"); }
+            return IExecuteWithSignature<int>("getCompositionStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getSelectionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getCursorCapsMode()"/>
         /// </summary>
-        public int SelectionEnd
+        /// <returns><see cref="int"/></returns>
+        public int GetCursorCapsMode()
         {
-            get { return IExecuteWithSignature<int>("getSelectionEnd", "()I"); }
+            return IExecuteWithSignature<int>("getCursorCapsMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getSelectionStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getSelectionEnd()"/>
         /// </summary>
-        public int SelectionStart
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionEnd()
         {
-            get { return IExecuteWithSignature<int>("getSelectionStart", "()I"); }
+            return IExecuteWithSignature<int>("getSelectionEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getSurroundingText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inputmethod/TextSnapshot.html#getSelectionStart()"/>
         /// </summary>
-        public Android.View.Inputmethod.SurroundingText SurroundingText
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionStart()
         {
-            get { return IExecuteWithSignature<Android.View.Inputmethod.SurroundingText>("getSurroundingText", "()Landroid/view/inputmethod/SurroundingText;"); }
+            return IExecuteWithSignature<int>("getSelectionStart", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Inspector/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Inspector/AllPackageClasses.cs
index 775b047ad..fc7c4f764 100644
--- a/src/net/Netdroid/Generated/Android/View/Inspector/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inspector/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class InspectionCompanion : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InspectionCompanion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InspectionCompanion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InspectionCompanion() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InspectionCompanion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InspectionCompanion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InspectionCompanion(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -100,12 +100,12 @@ public partial class InspectionCompanion<T> : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InspectionCompanion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InspectionCompanion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InspectionCompanion() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InspectionCompanion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InspectionCompanion class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InspectionCompanion(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -146,12 +146,12 @@ public partial class InspectionCompanionProvider : MASES.JCOBridge.C2JBridge.JVM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InspectionCompanionProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InspectionCompanionProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InspectionCompanionProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InspectionCompanionProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InspectionCompanionProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InspectionCompanionProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -236,12 +236,12 @@ public partial class PropertyMapper : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PropertyMapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PropertyMapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PropertyMapper() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PropertyMapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PropertyMapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PropertyMapper(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -299,12 +299,12 @@ public partial class PropertyReader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PropertyReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PropertyReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PropertyReader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PropertyReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PropertyReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PropertyReader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/View/Inspector/WindowInspector.cs b/src/net/Netdroid/Generated/Android/View/Inspector/WindowInspector.cs
index 66de359cc..90231df7c 100644
--- a/src/net/Netdroid/Generated/Android/View/Inspector/WindowInspector.cs
+++ b/src/net/Netdroid/Generated/Android/View/Inspector/WindowInspector.cs
@@ -42,11 +42,12 @@ public partial class WindowInspector
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/inspector/WindowInspector.html#getGlobalWindowViews()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/inspector/WindowInspector.html#getGlobalWindowViews()"/>
         /// </summary>
-        public static Java.Util.List<Android.View.View> GlobalWindowViews
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public static Java.Util.List<Android.View.View> GetGlobalWindowViews()
         {
-            get { return SExecuteWithSignature<Java.Util.List<Android.View.View>>(LocalBridgeClazz, "getGlobalWindowViews", "()Ljava/util/List;"); }
+            return SExecuteWithSignature<Java.Util.List<Android.View.View>>(LocalBridgeClazz, "getGlobalWindowViews", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/KeyCharacterMap.cs b/src/net/Netdroid/Generated/Android/View/KeyCharacterMap.cs
index cd2ffdeb3..e01e9739c 100644
--- a/src/net/Netdroid/Generated/Android/View/KeyCharacterMap.cs
+++ b/src/net/Netdroid/Generated/Android/View/KeyCharacterMap.cs
@@ -64,7 +64,7 @@ public partial class KeyCharacterMap
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.html#BUILT_IN_KEYBOARD"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BUILT_IN_KEYBOARD { get { if (!_BUILT_IN_KEYBOARDReady) { _BUILT_IN_KEYBOARDContent = SGetField<int>(LocalBridgeClazz, "BUILT_IN_KEYBOARD"); _BUILT_IN_KEYBOARDReady = true; } return _BUILT_IN_KEYBOARDContent; } }
         private static int _BUILT_IN_KEYBOARDContent = default;
         private static bool _BUILT_IN_KEYBOARDReady = false; // this is used because in case of generics 
@@ -168,20 +168,6 @@ public static int GetDeadChar(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.html#getKeyboardType()"/> 
-        /// </summary>
-        public int KeyboardType
-        {
-            get { return IExecuteWithSignature<int>("getKeyboardType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.html#getModifierBehavior()"/> 
-        /// </summary>
-        public int ModifierBehavior
-        {
-            get { return IExecuteWithSignature<int>("getModifierBehavior", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.html#getEvents(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -196,7 +182,7 @@ public Android.View.KeyEvent[] GetEvents(char[] arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.View.KeyCharacterMap.KeyData"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool GetKeyData(int arg0, Android.View.KeyCharacterMap.KeyData arg1)
         {
             return IExecute<bool>("getKeyData", arg0, arg1);
@@ -268,6 +254,22 @@ public int Get(int arg0, int arg1)
             return IExecute<int>("get", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.html#getKeyboardType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetKeyboardType()
+        {
+            return IExecuteWithSignature<int>("getKeyboardType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.html#getModifierBehavior()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetModifierBehavior()
+        {
+            return IExecuteWithSignature<int>("getModifierBehavior", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -295,22 +297,22 @@ public partial class KeyData
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.KeyData.html#displayLabel"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public char displayLabel { get { return IGetField<char>("displayLabel"); } set { ISetField("displayLabel", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.KeyData.html#number"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public char number { get { return IGetField<char>("number"); } set { ISetField("number", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.KeyData.html#meta"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public char[] meta { get { return IGetFieldArray<char>("meta"); } set { ISetField("meta", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/KeyCharacterMap.KeyData.html#META_LENGTH"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int META_LENGTH { get { if (!_META_LENGTHReady) { _META_LENGTHContent = SGetField<int>(LocalBridgeClazz, "META_LENGTH"); _META_LENGTHReady = true; } return _META_LENGTHContent; } }
             private static int _META_LENGTHContent = default;
             private static bool _META_LENGTHReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/View/KeyEvent.cs b/src/net/Netdroid/Generated/Android/View/KeyEvent.cs
index 52dc4ce89..053243de3 100644
--- a/src/net/Netdroid/Generated/Android/View/KeyEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/KeyEvent.cs
@@ -35,7 +35,7 @@ public partial class KeyEvent
         /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public KeyEvent(Android.View.KeyEvent arg0, long arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -164,7 +164,7 @@ public KeyEvent(long arg0, long arg1, int arg2, int arg3, int arg4)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#ACTION_MULTIPLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_MULTIPLE { get { if (!_ACTION_MULTIPLEReady) { _ACTION_MULTIPLEContent = SGetField<int>(LocalBridgeClazz, "ACTION_MULTIPLE"); _ACTION_MULTIPLEReady = true; } return _ACTION_MULTIPLEContent; } }
         private static int _ACTION_MULTIPLEContent = default;
         private static bool _ACTION_MULTIPLEReady = false; // this is used because in case of generics 
@@ -237,7 +237,7 @@ public KeyEvent(long arg0, long arg1, int arg2, int arg3, int arg4)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#FLAG_WOKE_HERE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FLAG_WOKE_HERE { get { if (!_FLAG_WOKE_HEREReady) { _FLAG_WOKE_HEREContent = SGetField<int>(LocalBridgeClazz, "FLAG_WOKE_HERE"); _FLAG_WOKE_HEREReady = true; } return _FLAG_WOKE_HEREContent; } }
         private static int _FLAG_WOKE_HEREContent = default;
         private static bool _FLAG_WOKE_HEREReady = false; // this is used because in case of generics 
@@ -2146,7 +2146,7 @@ public KeyEvent(long arg0, long arg1, int arg2, int arg3, int arg4)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#MAX_KEYCODE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int MAX_KEYCODE { get { if (!_MAX_KEYCODEReady) { _MAX_KEYCODEContent = SGetField<int>(LocalBridgeClazz, "MAX_KEYCODE"); _MAX_KEYCODEReady = true; } return _MAX_KEYCODEContent; } }
         private static int _MAX_KEYCODEContent = default;
         private static bool _MAX_KEYCODEReady = false; // this is used because in case of generics 
@@ -2281,20 +2281,6 @@ public KeyEvent(long arg0, long arg1, int arg2, int arg3, int arg4)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getMaxKeyCode()"/> 
-        /// </summary>
-        public static int MaxKeyCode
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxKeyCode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getModifierMetaStateMask()"/> 
-        /// </summary>
-        public static int ModifierMetaStateMask
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getModifierMetaStateMask", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#changeAction(android.view.KeyEvent,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
@@ -2394,6 +2380,22 @@ public static int GetDeadChar(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "getDeadChar", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getMaxKeyCode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int GetMaxKeyCode()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxKeyCode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getModifierMetaStateMask()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int GetModifierMetaStateMask()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getModifierMetaStateMask", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#keyCodeFromString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -2425,103 +2427,11 @@ public static Java.Lang.String KeyCodeToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getAction()"/> 
-        /// </summary>
-        public int Action
-        {
-            get { return IExecuteWithSignature<int>("getAction", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getCharacters()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Characters
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCharacters", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getDisplayLabel()"/> 
-        /// </summary>
-        public char DisplayLabel
-        {
-            get { return IExecuteWithSignature<char>("getDisplayLabel", "()C"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getDownTime()"/> 
-        /// </summary>
-        public long DownTime
-        {
-            get { return IExecuteWithSignature<long>("getDownTime", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getFlags()"/> 
-        /// </summary>
-        public int Flags
-        {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getKeyCharacterMap()"/> 
-        /// </summary>
-        public Android.View.KeyCharacterMap KeyCharacterMap
-        {
-            get { return IExecuteWithSignature<Android.View.KeyCharacterMap>("getKeyCharacterMap", "()Landroid/view/KeyCharacterMap;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getKeyCode()"/> 
-        /// </summary>
-        public int KeyCode
-        {
-            get { return IExecuteWithSignature<int>("getKeyCode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getMetaState()"/> 
-        /// </summary>
-        public int MetaState
-        {
-            get { return IExecuteWithSignature<int>("getMetaState", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getModifiers()"/> 
-        /// </summary>
-        public int Modifiers
-        {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getNumber()"/> 
-        /// </summary>
-        public char Number
-        {
-            get { return IExecuteWithSignature<char>("getNumber", "()C"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getRepeatCount()"/> 
-        /// </summary>
-        public int RepeatCount
-        {
-            get { return IExecuteWithSignature<int>("getRepeatCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getScanCode()"/> 
-        /// </summary>
-        public int ScanCode
-        {
-            get { return IExecuteWithSignature<int>("getScanCode", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getUnicodeChar()"/> 
-        /// </summary>
-        public int UnicodeChar
-        {
-            get { return IExecuteWithSignature<int>("getUnicodeChar", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getKeyData(android.view.KeyCharacterMap.KeyData)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.KeyCharacterMap.KeyData"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool GetKeyData(Android.View.KeyCharacterMap.KeyData arg0)
         {
             return IExecuteWithSignature<bool>("getKeyData", "(Landroid/view/KeyCharacterMap$KeyData;)Z", arg0);
@@ -2535,6 +2445,14 @@ public bool IsPrintingKey()
             return IExecuteWithSignature<bool>("isPrintingKey", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getDisplayLabel()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetDisplayLabel()
+        {
+            return IExecuteWithSignature<char>("getDisplayLabel", "()C");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getMatch(char[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -2554,6 +2472,22 @@ public char GetMatch(char[] arg0)
             return IExecuteWithSignature<char>("getMatch", "([C)C", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getNumber()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetNumber()
+        {
+            return IExecuteWithSignature<char>("getNumber", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getKeyCharacterMap()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.KeyCharacterMap"/></returns>
+        public Android.View.KeyCharacterMap GetKeyCharacterMap()
+        {
+            return IExecuteWithSignature<Android.View.KeyCharacterMap>("getKeyCharacterMap", "()Landroid/view/KeyCharacterMap;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#dispatch(android.view.KeyEvent.Callback,android.view.KeyEvent.DispatcherState,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.KeyEvent.Callback"/></param>
@@ -2569,7 +2503,7 @@ public bool Dispatch(Android.View.KeyEvent.Callback arg0, Android.View.KeyEvent.
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.KeyEvent.Callback"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Dispatch(Android.View.KeyEvent.Callback arg0)
         {
             return IExecuteWithSignature<bool>("dispatch", "(Landroid/view/KeyEvent$Callback;)Z", arg0);
@@ -2696,6 +2630,79 @@ public bool IsTracking()
             return IExecuteWithSignature<bool>("isTracking", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getAction()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAction()
+        {
+            return IExecuteWithSignature<int>("getAction", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getFlags()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
+        {
+            return IExecuteWithSignature<int>("getFlags", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getKeyCode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetKeyCode()
+        {
+            return IExecuteWithSignature<int>("getKeyCode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getMetaState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMetaState()
+        {
+            return IExecuteWithSignature<int>("getMetaState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getModifiers()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
+        {
+            return IExecuteWithSignature<int>("getModifiers", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getRepeatCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatCount()
+        {
+            return IExecuteWithSignature<int>("getRepeatCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getScanCode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetScanCode()
+        {
+            return IExecuteWithSignature<int>("getScanCode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getCharacters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetCharacters()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCharacters", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getDownTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDownTime()
+        {
+            return IExecuteWithSignature<long>("getDownTime", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#setSource(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -2711,6 +2718,14 @@ public void StartTracking()
             IExecuteWithSignature("startTracking", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getUnicodeChar()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetUnicodeChar()
+        {
+            return IExecuteWithSignature<int>("getUnicodeChar", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyEvent.html#getUnicodeChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/KeyboardShortcutGroup.cs b/src/net/Netdroid/Generated/Android/View/KeyboardShortcutGroup.cs
index b125846c0..3b4bd2c91 100644
--- a/src/net/Netdroid/Generated/Android/View/KeyboardShortcutGroup.cs
+++ b/src/net/Netdroid/Generated/Android/View/KeyboardShortcutGroup.cs
@@ -69,26 +69,28 @@ public KeyboardShortcutGroup(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup.html#getItems()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.View.KeyboardShortcutInfo> Items
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.KeyboardShortcutInfo>>("getItems", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup.html#getLabel()"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup.html#getItems()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.KeyboardShortcutInfo> GetItems()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.View.KeyboardShortcutInfo>>("getItems", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutGroup.html#addItem(android.view.KeyboardShortcutInfo)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/KeyboardShortcutInfo.cs b/src/net/Netdroid/Generated/Android/View/KeyboardShortcutInfo.cs
index 2b2910c21..050722a27 100644
--- a/src/net/Netdroid/Generated/Android/View/KeyboardShortcutInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/KeyboardShortcutInfo.cs
@@ -72,40 +72,44 @@ public KeyboardShortcutInfo(Java.Lang.CharSequence arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#getBaseCharacter()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#getBaseCharacter()"/>
         /// </summary>
-        public char BaseCharacter
+        /// <returns><see cref="char"/></returns>
+        public char GetBaseCharacter()
         {
-            get { return IExecuteWithSignature<char>("getBaseCharacter", "()C"); }
+            return IExecuteWithSignature<char>("getBaseCharacter", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#getKeycode()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#describeContents()"/>
         /// </summary>
-        public int Keycode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getKeycode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#getKeycode()"/>
         /// </summary>
-        public Java.Lang.CharSequence Label
+        /// <returns><see cref="int"/></returns>
+        public int GetKeycode()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getKeycode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#getModifiers()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#getModifiers()"/>
         /// </summary>
-        public int Modifiers
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
         {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
+            return IExecuteWithSignature<int>("getModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#getLabel()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLabel()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/KeyboardShortcutInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/LayoutInflater.cs b/src/net/Netdroid/Generated/Android/View/LayoutInflater.cs
index 8d6f59b08..79dbd66c1 100644
--- a/src/net/Netdroid/Generated/Android/View/LayoutInflater.cs
+++ b/src/net/Netdroid/Generated/Android/View/LayoutInflater.cs
@@ -55,41 +55,29 @@ public static Android.View.LayoutInflater From(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#getContext()"/> 
-        /// </summary>
-        public Android.Content.Context Context
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#getFactory()"/> 
-        /// </summary>
-        public Android.View.LayoutInflater.Factory GetFactory
-        {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater.Factory>("getFactory", "()Landroid/view/LayoutInflater$Factory;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#getFactory2()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#cloneInContext(android.content.Context)"/>
         /// </summary>
-        public Android.View.LayoutInflater.Factory2 GetFactory2
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
+        public Android.View.LayoutInflater CloneInContext(Android.Content.Context arg0)
         {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater.Factory2>("getFactory2", "()Landroid/view/LayoutInflater$Factory2;"); }
+            return IExecuteWithSignature<Android.View.LayoutInflater>("cloneInContext", "(Landroid/content/Context;)Landroid/view/LayoutInflater;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#getFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#getContext()"/>
         /// </summary>
-        public Android.View.LayoutInflater.Filter GetFilter
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
         {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater.Filter>("getFilter", "()Landroid/view/LayoutInflater$Filter;"); }
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#cloneInContext(android.content.Context)"/>
+        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#getFilter()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
-        public Android.View.LayoutInflater CloneInContext(Android.Content.Context arg0)
+        /// <returns><see cref="Android.View.LayoutInflater.Filter"/></returns>
+        public Android.View.LayoutInflater.Filter GetFilter()
         {
-            return IExecuteWithSignature<Android.View.LayoutInflater>("cloneInContext", "(Landroid/content/Context;)Landroid/view/LayoutInflater;", arg0);
+            return IExecuteWithSignature<Android.View.LayoutInflater.Filter>("getFilter", "()Landroid/view/LayoutInflater$Filter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#inflate(int,android.view.ViewGroup,boolean)"/>
@@ -147,6 +135,22 @@ public Android.View.View OnCreateView(Android.Content.Context arg0, Android.View
             return IExecute<Android.View.View>("onCreateView", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#getFactory()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.LayoutInflater.Factory"/></returns>
+        public Android.View.LayoutInflater.Factory GetFactory()
+        {
+            return IExecuteWithSignature<Android.View.LayoutInflater.Factory>("getFactory", "()Landroid/view/LayoutInflater$Factory;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#getFactory2()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.LayoutInflater.Factory2"/></returns>
+        public Android.View.LayoutInflater.Factory2 GetFactory2()
+        {
+            return IExecuteWithSignature<Android.View.LayoutInflater.Factory2>("getFactory2", "()Landroid/view/LayoutInflater$Factory2;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/LayoutInflater.html#createView(android.content.Context,java.lang.String,java.lang.String,android.util.AttributeSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/MenuItem.cs b/src/net/Netdroid/Generated/Android/View/MenuItem.cs
index e8dfb5d82..acc929c2c 100644
--- a/src/net/Netdroid/Generated/Android/View/MenuItem.cs
+++ b/src/net/Netdroid/Generated/Android/View/MenuItem.cs
@@ -94,144 +94,36 @@ public partial class MenuItem : Android.View.IMenuItem
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getActionProvider()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIntent()"/>
         /// </summary>
-        public Android.View.ActionProvider ActionProvider
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        public Android.Content.Intent GetIntent()
         {
-            get { return IExecuteWithSignature<Android.View.ActionProvider>("getActionProvider", "()Landroid/view/ActionProvider;"); }
+            return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getActionView()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIcon()"/>
         /// </summary>
-        public Android.View.View ActionView
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetIcon()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getActionView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getAlphabeticModifiers()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getActionProvider()"/>
         /// </summary>
-        public int AlphabeticModifiers
+        /// <returns><see cref="Android.View.ActionProvider"/></returns>
+        public Android.View.ActionProvider GetActionProvider()
         {
-            get { return IExecuteWithSignature<int>("getAlphabeticModifiers", "()I"); }
+            return IExecuteWithSignature<Android.View.ActionProvider>("getActionProvider", "()Landroid/view/ActionProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getAlphabeticShortcut()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getMenuInfo()"/>
         /// </summary>
-        public char AlphabeticShortcut
+        /// <returns><see cref="Android.View.ContextMenu.ContextMenuInfo"/></returns>
+        public Android.View.ContextMenu.ContextMenuInfo GetMenuInfo()
         {
-            get { return IExecuteWithSignature<char>("getAlphabeticShortcut", "()C"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getContentDescription()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence ContentDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getGroupId()"/> 
-        /// </summary>
-        public int GroupId
-        {
-            get { return IExecuteWithSignature<int>("getGroupId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIcon()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Drawable Icon
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIconTintBlendMode()"/> 
-        /// </summary>
-        public Android.Graphics.BlendMode IconTintBlendMode
-        {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getIconTintBlendMode", "()Landroid/graphics/BlendMode;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIconTintList()"/> 
-        /// </summary>
-        public Android.Content.Res.ColorStateList IconTintList
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getIconTintList", "()Landroid/content/res/ColorStateList;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIconTintMode()"/> 
-        /// </summary>
-        public Android.Graphics.PorterDuff.Mode IconTintMode
-        {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getIconTintMode", "()Landroid/graphics/PorterDuff$Mode;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIntent()"/> 
-        /// </summary>
-        public Android.Content.Intent Intent
-        {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getItemId()"/> 
-        /// </summary>
-        public int ItemId
-        {
-            get { return IExecuteWithSignature<int>("getItemId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getMenuInfo()"/> 
-        /// </summary>
-        public Android.View.ContextMenu.ContextMenuInfo MenuInfo
-        {
-            get { return IExecuteWithSignature<Android.View.ContextMenu.ContextMenuInfo>("getMenuInfo", "()Landroid/view/ContextMenu$ContextMenuInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getNumericModifiers()"/> 
-        /// </summary>
-        public int NumericModifiers
-        {
-            get { return IExecuteWithSignature<int>("getNumericModifiers", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getNumericShortcut()"/> 
-        /// </summary>
-        public char NumericShortcut
-        {
-            get { return IExecuteWithSignature<char>("getNumericShortcut", "()C"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getOrder()"/> 
-        /// </summary>
-        public int Order
-        {
-            get { return IExecuteWithSignature<int>("getOrder", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getSubMenu()"/> 
-        /// </summary>
-        public Android.View.SubMenu SubMenu
-        {
-            get { return IExecuteWithSignature<Android.View.SubMenu>("getSubMenu", "()Landroid/view/SubMenu;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getTitle()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Title
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getTitleCondensed()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence TitleCondensed
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitleCondensed", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getTooltipText()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence TooltipText
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTooltipText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.View.ContextMenu.ContextMenuInfo>("getMenuInfo", "()Landroid/view/ContextMenu$ContextMenuInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#setActionProvider(android.view.ActionProvider)"/>
@@ -406,6 +298,22 @@ public Android.View.MenuItem SetVisible(bool arg0)
             return IExecuteWithSignature<Android.View.MenuItem>("setVisible", "(Z)Landroid/view/MenuItem;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getSubMenu()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.SubMenu"/></returns>
+        public Android.View.SubMenu GetSubMenu()
+        {
+            return IExecuteWithSignature<Android.View.SubMenu>("getSubMenu", "()Landroid/view/SubMenu;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getActionView()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetActionView()
+        {
+            return IExecuteWithSignature<Android.View.View>("getActionView", "()Landroid/view/View;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#collapseActionView()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -470,6 +378,62 @@ public bool IsVisible()
             return IExecuteWithSignature<bool>("isVisible", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getAlphabeticShortcut()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetAlphabeticShortcut()
+        {
+            return IExecuteWithSignature<char>("getAlphabeticShortcut", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getNumericShortcut()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetNumericShortcut()
+        {
+            return IExecuteWithSignature<char>("getNumericShortcut", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getGroupId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGroupId()
+        {
+            return IExecuteWithSignature<int>("getGroupId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getItemId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetItemId()
+        {
+            return IExecuteWithSignature<int>("getItemId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getOrder()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetOrder()
+        {
+            return IExecuteWithSignature<int>("getOrder", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getTitleCondensed()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitleCondensed()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitleCondensed", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#setShowAsAction(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -478,6 +442,30 @@ public void SetShowAsAction(int arg0)
             IExecuteWithSignature("setShowAsAction", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIconTintList()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetIconTintList()
+        {
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getIconTintList", "()Landroid/content/res/ColorStateList;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIconTintBlendMode()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetIconTintBlendMode()
+        {
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getIconTintBlendMode", "()Landroid/graphics/BlendMode;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getIconTintMode()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetIconTintMode()
+        {
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getIconTintMode", "()Landroid/graphics/PorterDuff$Mode;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#setAlphabeticShortcut(char,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
@@ -554,6 +542,38 @@ public Android.View.MenuItem SetTooltipText(Java.Lang.CharSequence arg0)
         {
             return IExecuteWithSignature<Android.View.MenuItem>("setTooltipText", "(Ljava/lang/CharSequence;)Landroid/view/MenuItem;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getAlphabeticModifiers()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAlphabeticModifiers()
+        {
+            return IExecuteWithSignature<int>("getAlphabeticModifiers", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getNumericModifiers()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumericModifiers()
+        {
+            return IExecuteWithSignature<int>("getNumericModifiers", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getContentDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MenuItem.html#getTooltipText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTooltipText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTooltipText", "()Ljava/lang/CharSequence;");
+        }
 
         #endregion
 
@@ -583,8 +603,8 @@ public partial class OnActionExpandListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMenuItemActionCollapse", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemActionCollapseEventHandler));
-                AddEventHandler("onMenuItemActionExpand", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemActionExpandEventHandler));
+                AddEventHandler("onMenuItemActionCollapse", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemActionCollapseEventHandler));
+                AddEventHandler("onMenuItemActionExpand", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemActionExpandEventHandler));
 
             }
 
@@ -592,7 +612,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/MenuItem.OnActionExpandListener.html#onMenuItemActionCollapse(android.view.MenuItem)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMenuItemActionCollapse"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MenuItem, bool> OnOnMenuItemActionCollapse { get; set; } = null;
+            public global::System.Func<Android.View.MenuItem, bool> OnOnMenuItemActionCollapse { get; set; } = null;
 
             void OnMenuItemActionCollapseEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MenuItem>> data)
             {
@@ -615,7 +635,7 @@ public virtual bool OnMenuItemActionCollapse(Android.View.MenuItem arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/MenuItem.OnActionExpandListener.html#onMenuItemActionExpand(android.view.MenuItem)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMenuItemActionExpand"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MenuItem, bool> OnOnMenuItemActionExpand { get; set; } = null;
+            public global::System.Func<Android.View.MenuItem, bool> OnOnMenuItemActionExpand { get; set; } = null;
 
             void OnMenuItemActionExpandEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MenuItem>> data)
             {
@@ -718,7 +738,7 @@ public partial class OnMenuItemClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMenuItemClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemClickEventHandler));
+                AddEventHandler("onMenuItemClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemClickEventHandler));
 
             }
 
@@ -726,7 +746,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/MenuItem.OnMenuItemClickListener.html#onMenuItemClick(android.view.MenuItem)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMenuItemClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MenuItem, bool> OnOnMenuItemClick { get; set; } = null;
+            public global::System.Func<Android.View.MenuItem, bool> OnOnMenuItemClick { get; set; } = null;
 
             void OnMenuItemClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MenuItem>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/MotionEvent.cs b/src/net/Netdroid/Generated/Android/View/MotionEvent.cs
index 75272681d..55c8cbb9b 100644
--- a/src/net/Netdroid/Generated/Android/View/MotionEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/MotionEvent.cs
@@ -106,42 +106,42 @@ public partial class MotionEvent
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#ACTION_POINTER_1_DOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_POINTER_1_DOWN { get { if (!_ACTION_POINTER_1_DOWNReady) { _ACTION_POINTER_1_DOWNContent = SGetField<int>(LocalBridgeClazz, "ACTION_POINTER_1_DOWN"); _ACTION_POINTER_1_DOWNReady = true; } return _ACTION_POINTER_1_DOWNContent; } }
         private static int _ACTION_POINTER_1_DOWNContent = default;
         private static bool _ACTION_POINTER_1_DOWNReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#ACTION_POINTER_1_UP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_POINTER_1_UP { get { if (!_ACTION_POINTER_1_UPReady) { _ACTION_POINTER_1_UPContent = SGetField<int>(LocalBridgeClazz, "ACTION_POINTER_1_UP"); _ACTION_POINTER_1_UPReady = true; } return _ACTION_POINTER_1_UPContent; } }
         private static int _ACTION_POINTER_1_UPContent = default;
         private static bool _ACTION_POINTER_1_UPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#ACTION_POINTER_2_DOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_POINTER_2_DOWN { get { if (!_ACTION_POINTER_2_DOWNReady) { _ACTION_POINTER_2_DOWNContent = SGetField<int>(LocalBridgeClazz, "ACTION_POINTER_2_DOWN"); _ACTION_POINTER_2_DOWNReady = true; } return _ACTION_POINTER_2_DOWNContent; } }
         private static int _ACTION_POINTER_2_DOWNContent = default;
         private static bool _ACTION_POINTER_2_DOWNReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#ACTION_POINTER_2_UP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_POINTER_2_UP { get { if (!_ACTION_POINTER_2_UPReady) { _ACTION_POINTER_2_UPContent = SGetField<int>(LocalBridgeClazz, "ACTION_POINTER_2_UP"); _ACTION_POINTER_2_UPReady = true; } return _ACTION_POINTER_2_UPContent; } }
         private static int _ACTION_POINTER_2_UPContent = default;
         private static bool _ACTION_POINTER_2_UPReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#ACTION_POINTER_3_DOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_POINTER_3_DOWN { get { if (!_ACTION_POINTER_3_DOWNReady) { _ACTION_POINTER_3_DOWNContent = SGetField<int>(LocalBridgeClazz, "ACTION_POINTER_3_DOWN"); _ACTION_POINTER_3_DOWNReady = true; } return _ACTION_POINTER_3_DOWNContent; } }
         private static int _ACTION_POINTER_3_DOWNContent = default;
         private static bool _ACTION_POINTER_3_DOWNReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#ACTION_POINTER_3_UP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_POINTER_3_UP { get { if (!_ACTION_POINTER_3_UPReady) { _ACTION_POINTER_3_UPContent = SGetField<int>(LocalBridgeClazz, "ACTION_POINTER_3_UP"); _ACTION_POINTER_3_UPReady = true; } return _ACTION_POINTER_3_UPContent; } }
         private static int _ACTION_POINTER_3_UPContent = default;
         private static bool _ACTION_POINTER_3_UPReady = false; // this is used because in case of generics 
@@ -154,14 +154,14 @@ public partial class MotionEvent
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#ACTION_POINTER_ID_MASK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_POINTER_ID_MASK { get { if (!_ACTION_POINTER_ID_MASKReady) { _ACTION_POINTER_ID_MASKContent = SGetField<int>(LocalBridgeClazz, "ACTION_POINTER_ID_MASK"); _ACTION_POINTER_ID_MASKReady = true; } return _ACTION_POINTER_ID_MASKContent; } }
         private static int _ACTION_POINTER_ID_MASKContent = default;
         private static bool _ACTION_POINTER_ID_MASKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#ACTION_POINTER_ID_SHIFT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ACTION_POINTER_ID_SHIFT { get { if (!_ACTION_POINTER_ID_SHIFTReady) { _ACTION_POINTER_ID_SHIFTContent = SGetField<int>(LocalBridgeClazz, "ACTION_POINTER_ID_SHIFT"); _ACTION_POINTER_ID_SHIFTReady = true; } return _ACTION_POINTER_ID_SHIFTContent; } }
         private static int _ACTION_POINTER_ID_SHIFTContent = default;
         private static bool _ACTION_POINTER_ID_SHIFTReady = false; // this is used because in case of generics 
@@ -755,7 +755,7 @@ public static Android.View.MotionEvent Obtain(long arg0, long arg1, int arg2, in
         /// <param name="arg11"><see cref="int"/></param>
         /// <param name="arg12"><see cref="int"/></param>
         /// <returns><see cref="Android.View.MotionEvent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.MotionEvent Obtain(long arg0, long arg1, int arg2, int arg3, float arg4, float arg5, float arg6, float arg7, int arg8, float arg9, float arg10, int arg11, int arg12)
         {
             return SExecute<Android.View.MotionEvent>(LocalBridgeClazz, "obtain", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
@@ -777,7 +777,7 @@ public static Android.View.MotionEvent Obtain(long arg0, long arg1, int arg2, in
         /// <param name="arg11"><see cref="int"/></param>
         /// <param name="arg12"><see cref="int"/></param>
         /// <returns><see cref="Android.View.MotionEvent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.View.MotionEvent Obtain(long arg0, long arg1, int arg2, int arg3, int[] arg4, Android.View.MotionEvent.PointerCoords[] arg5, int arg6, float arg7, float arg8, int arg9, int arg10, int arg11, int arg12)
         {
             return SExecute<Android.View.MotionEvent>(LocalBridgeClazz, "obtain", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
@@ -823,188 +823,6 @@ public static Java.Lang.String AxisToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getAction()"/> <see href="https://developer.android.com/reference/android/view/MotionEvent.html#setAction(int)"/>
-        /// </summary>
-        public int Action
-        {
-            get { return IExecuteWithSignature<int>("getAction", "()I"); } set { IExecuteWithSignature("setAction", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getActionButton()"/> 
-        /// </summary>
-        public int ActionButton
-        {
-            get { return IExecuteWithSignature<int>("getActionButton", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getActionIndex()"/> 
-        /// </summary>
-        public int ActionIndex
-        {
-            get { return IExecuteWithSignature<int>("getActionIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getActionMasked()"/> 
-        /// </summary>
-        public int ActionMasked
-        {
-            get { return IExecuteWithSignature<int>("getActionMasked", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getButtonState()"/> 
-        /// </summary>
-        public int ButtonState
-        {
-            get { return IExecuteWithSignature<int>("getButtonState", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getClassification()"/> 
-        /// </summary>
-        public int Classification
-        {
-            get { return IExecuteWithSignature<int>("getClassification", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getDownTime()"/> 
-        /// </summary>
-        public long DownTime
-        {
-            get { return IExecuteWithSignature<long>("getDownTime", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getEdgeFlags()"/> <see href="https://developer.android.com/reference/android/view/MotionEvent.html#setEdgeFlags(int)"/>
-        /// </summary>
-        public int EdgeFlags
-        {
-            get { return IExecuteWithSignature<int>("getEdgeFlags", "()I"); } set { IExecuteWithSignature("setEdgeFlags", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getEventTimeNanos()"/> 
-        /// </summary>
-        public long EventTimeNanos
-        {
-            get { return IExecuteWithSignature<long>("getEventTimeNanos", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getFlags()"/> 
-        /// </summary>
-        public int Flags
-        {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getHistorySize()"/> 
-        /// </summary>
-        public int HistorySize
-        {
-            get { return IExecuteWithSignature<int>("getHistorySize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getMetaState()"/> 
-        /// </summary>
-        public int MetaState
-        {
-            get { return IExecuteWithSignature<int>("getMetaState", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getOrientation()"/> 
-        /// </summary>
-        public float Orientation
-        {
-            get { return IExecuteWithSignature<float>("getOrientation", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getPointerCount()"/> 
-        /// </summary>
-        public int PointerCount
-        {
-            get { return IExecuteWithSignature<int>("getPointerCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getPressure()"/> 
-        /// </summary>
-        public float Pressure
-        {
-            get { return IExecuteWithSignature<float>("getPressure", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getRawX()"/> 
-        /// </summary>
-        public float RawX
-        {
-            get { return IExecuteWithSignature<float>("getRawX", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getRawY()"/> 
-        /// </summary>
-        public float RawY
-        {
-            get { return IExecuteWithSignature<float>("getRawY", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getSize()"/> 
-        /// </summary>
-        public float Size
-        {
-            get { return IExecuteWithSignature<float>("getSize", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getToolMajor()"/> 
-        /// </summary>
-        public float ToolMajor
-        {
-            get { return IExecuteWithSignature<float>("getToolMajor", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getToolMinor()"/> 
-        /// </summary>
-        public float ToolMinor
-        {
-            get { return IExecuteWithSignature<float>("getToolMinor", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getTouchMajor()"/> 
-        /// </summary>
-        public float TouchMajor
-        {
-            get { return IExecuteWithSignature<float>("getTouchMajor", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getTouchMinor()"/> 
-        /// </summary>
-        public float TouchMinor
-        {
-            get { return IExecuteWithSignature<float>("getTouchMinor", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getX()"/> 
-        /// </summary>
-        public float X
-        {
-            get { return IExecuteWithSignature<float>("getX", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getXPrecision()"/> 
-        /// </summary>
-        public float XPrecision
-        {
-            get { return IExecuteWithSignature<float>("getXPrecision", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getY()"/> 
-        /// </summary>
-        public float Y
-        {
-            get { return IExecuteWithSignature<float>("getY", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getYPrecision()"/> 
-        /// </summary>
-        public float YPrecision
-        {
-            get { return IExecuteWithSignature<float>("getYPrecision", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#isButtonPressed(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1225,6 +1043,14 @@ public float GetHistoricalY(int arg0)
             return IExecuteWithSignature<float>("getHistoricalY", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getOrientation()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetOrientation()
+        {
+            return IExecuteWithSignature<float>("getOrientation", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getOrientation(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1234,6 +1060,14 @@ public float GetOrientation(int arg0)
             return IExecuteWithSignature<float>("getOrientation", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getPressure()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetPressure()
+        {
+            return IExecuteWithSignature<float>("getPressure", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getPressure(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1243,6 +1077,14 @@ public float GetPressure(int arg0)
             return IExecuteWithSignature<float>("getPressure", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getRawX()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetRawX()
+        {
+            return IExecuteWithSignature<float>("getRawX", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getRawX(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1252,6 +1094,14 @@ public float GetRawX(int arg0)
             return IExecuteWithSignature<float>("getRawX", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getRawY()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetRawY()
+        {
+            return IExecuteWithSignature<float>("getRawY", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getRawY(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1261,6 +1111,14 @@ public float GetRawY(int arg0)
             return IExecuteWithSignature<float>("getRawY", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getSize()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetSize()
+        {
+            return IExecuteWithSignature<float>("getSize", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getSize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1270,6 +1128,14 @@ public float GetSize(int arg0)
             return IExecuteWithSignature<float>("getSize", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getToolMajor()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetToolMajor()
+        {
+            return IExecuteWithSignature<float>("getToolMajor", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getToolMajor(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1279,6 +1145,14 @@ public float GetToolMajor(int arg0)
             return IExecuteWithSignature<float>("getToolMajor", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getToolMinor()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetToolMinor()
+        {
+            return IExecuteWithSignature<float>("getToolMinor", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getToolMinor(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1288,6 +1162,14 @@ public float GetToolMinor(int arg0)
             return IExecuteWithSignature<float>("getToolMinor", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getTouchMajor()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTouchMajor()
+        {
+            return IExecuteWithSignature<float>("getTouchMajor", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getTouchMajor(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1297,6 +1179,14 @@ public float GetTouchMajor(int arg0)
             return IExecuteWithSignature<float>("getTouchMajor", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getTouchMinor()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetTouchMinor()
+        {
+            return IExecuteWithSignature<float>("getTouchMinor", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getTouchMinor(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1306,6 +1196,14 @@ public float GetTouchMinor(int arg0)
             return IExecuteWithSignature<float>("getTouchMinor", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getX()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetX()
+        {
+            return IExecuteWithSignature<float>("getX", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getX(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1315,6 +1213,22 @@ public float GetX(int arg0)
             return IExecuteWithSignature<float>("getX", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getXPrecision()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetXPrecision()
+        {
+            return IExecuteWithSignature<float>("getXPrecision", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getY()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetY()
+        {
+            return IExecuteWithSignature<float>("getY", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getY(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1324,6 +1238,14 @@ public float GetY(int arg0)
             return IExecuteWithSignature<float>("getY", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getYPrecision()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetYPrecision()
+        {
+            return IExecuteWithSignature<float>("getYPrecision", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#findPointerIndex(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1333,6 +1255,94 @@ public int FindPointerIndex(int arg0)
             return IExecuteWithSignature<int>("findPointerIndex", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getAction()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAction()
+        {
+            return IExecuteWithSignature<int>("getAction", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getActionButton()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetActionButton()
+        {
+            return IExecuteWithSignature<int>("getActionButton", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getActionIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetActionIndex()
+        {
+            return IExecuteWithSignature<int>("getActionIndex", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getActionMasked()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetActionMasked()
+        {
+            return IExecuteWithSignature<int>("getActionMasked", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getButtonState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetButtonState()
+        {
+            return IExecuteWithSignature<int>("getButtonState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getClassification()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetClassification()
+        {
+            return IExecuteWithSignature<int>("getClassification", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getEdgeFlags()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetEdgeFlags()
+        {
+            return IExecuteWithSignature<int>("getEdgeFlags", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getFlags()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
+        {
+            return IExecuteWithSignature<int>("getFlags", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getHistorySize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHistorySize()
+        {
+            return IExecuteWithSignature<int>("getHistorySize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getMetaState()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMetaState()
+        {
+            return IExecuteWithSignature<int>("getMetaState", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getPointerCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPointerCount()
+        {
+            return IExecuteWithSignature<int>("getPointerCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getPointerId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1351,6 +1361,22 @@ public int GetToolType(int arg0)
             return IExecuteWithSignature<int>("getToolType", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getDownTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDownTime()
+        {
+            return IExecuteWithSignature<long>("getDownTime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getEventTimeNanos()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetEventTimeNanos()
+        {
+            return IExecuteWithSignature<long>("getEventTimeNanos", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#getHistoricalEventTime(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1436,6 +1462,22 @@ public void Recycle()
             IExecuteWithSignature("recycle", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#setAction(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAction(int arg0)
+        {
+            IExecuteWithSignature("setAction", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#setEdgeFlags(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetEdgeFlags(int arg0)
+        {
+            IExecuteWithSignature("setEdgeFlags", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/MotionEvent.html#setLocation(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/OnReceiveContentListener.cs b/src/net/Netdroid/Generated/Android/View/OnReceiveContentListener.cs
index ff9dc3552..a834d38af 100644
--- a/src/net/Netdroid/Generated/Android/View/OnReceiveContentListener.cs
+++ b/src/net/Netdroid/Generated/Android/View/OnReceiveContentListener.cs
@@ -68,7 +68,7 @@ public partial class OnReceiveContentListener : Android.View.IOnReceiveContentLi
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onReceiveContent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnReceiveContentEventHandler));
+            AddEventHandler("onReceiveContent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnReceiveContentEventHandler));
 
         }
 
@@ -76,7 +76,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/view/OnReceiveContentListener.html#onReceiveContent(android.view.View,android.view.ContentInfo)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnReceiveContent"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, Android.View.ContentInfo, Android.View.ContentInfo> OnOnReceiveContent { get; set; } = null;
+        public global::System.Func<Android.View.View, Android.View.ContentInfo, Android.View.ContentInfo> OnOnReceiveContent { get; set; } = null;
 
         void OnReceiveContentEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/View/OrientationEventListener.cs b/src/net/Netdroid/Generated/Android/View/OrientationEventListener.cs
index 896ec23ef..3ef86a711 100644
--- a/src/net/Netdroid/Generated/Android/View/OrientationEventListener.cs
+++ b/src/net/Netdroid/Generated/Android/View/OrientationEventListener.cs
@@ -29,132 +29,24 @@ namespace Android.View
     public partial class OrientationEventListener
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="OrientationEventListener"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("onOrientationChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnOrientationChangedEventHandler));
-            AddEventHandler("canDetectOrientation", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(CanDetectOrientationEventHandler));
-            AddEventHandler("disable", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(DisableEventHandler));
-            AddEventHandler("enable", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(EnableEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#onOrientationChanged(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnOrientationChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnOrientationChanged { get; set; } = null;
-
-        void OnOrientationChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnOrientationChanged != null) ? OnOnOrientationChanged : OnOrientationChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#onOrientationChanged(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void OnOrientationChanged(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#canDetectOrientation()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCanDetectOrientation"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnCanDetectOrientation { get; set; } = null;
-
-        void CanDetectOrientationEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnCanDetectOrientation != null) ? OnCanDetectOrientation : CanDetectOrientation;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#canDetectOrientation()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool CanDetectOrientation()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#disable()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnDisable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnDisable { get; set; } = null;
-
-        void DisableEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnDisable != null) ? OnDisable : Disable;
-            methodToExecute.Invoke();
-        }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#disable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#%3Cinit%3E(android.content.Context,int)"/>
         /// </summary>
-        public virtual void Disable()
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public OrientationEventListener(Android.Content.Context arg0, int arg1)
+            : base(arg0, arg1)
         {
-            
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#enable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
-        /// <remarks>If <see cref="OnEnable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnEnable { get; set; } = null;
-
-        void EnableEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        public OrientationEventListener(Android.Content.Context arg0)
+            : base(arg0)
         {
-            var methodToExecute = (OnEnable != null) ? OnEnable : Enable;
-            methodToExecute.Invoke();
         }
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#enable()"/>
-        /// </summary>
-        public virtual void Enable()
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region OrientationEventListenerDirect
-    public partial class OrientationEventListenerDirect
-    {
-        #region Constructors
-
         #endregion
 
         #region Class/Interface conversion operators
@@ -162,6 +54,12 @@ public partial class OrientationEventListenerDirect
         #endregion
 
         #region Fields
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#ORIENTATION_UNKNOWN"/>
+        /// </summary>
+        public static int ORIENTATION_UNKNOWN { get { if (!_ORIENTATION_UNKNOWNReady) { _ORIENTATION_UNKNOWNContent = SGetField<int>(LocalBridgeClazz, "ORIENTATION_UNKNOWN"); _ORIENTATION_UNKNOWNReady = true; } return _ORIENTATION_UNKNOWNContent; } }
+        private static int _ORIENTATION_UNKNOWNContent = default;
+        private static bool _ORIENTATION_UNKNOWNReady = false; // this is used because in case of generics 
 
         #endregion
 
@@ -174,7 +72,7 @@ public partial class OrientationEventListenerDirect
         /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#onOrientationChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        public override void OnOrientationChanged(int arg0)
+        public void OnOrientationChanged(int arg0)
         {
             IExecuteWithSignature("onOrientationChanged", "(I)V", arg0);
         }
@@ -182,21 +80,21 @@ public override void OnOrientationChanged(int arg0)
         /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#canDetectOrientation()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public override bool CanDetectOrientation()
+        public bool CanDetectOrientation()
         {
             return IExecuteWithSignature<bool>("canDetectOrientation", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#disable()"/>
         /// </summary>
-        public override void Disable()
+        public void Disable()
         {
             IExecuteWithSignature("disable", "()V");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/OrientationEventListener.html#enable()"/>
         /// </summary>
-        public override void Enable()
+        public void Enable()
         {
             IExecuteWithSignature("enable", "()V");
         }
diff --git a/src/net/Netdroid/Generated/Android/View/OrientationListener.cs b/src/net/Netdroid/Generated/Android/View/OrientationListener.cs
index a22f9373f..95c7f5f38 100644
--- a/src/net/Netdroid/Generated/Android/View/OrientationListener.cs
+++ b/src/net/Netdroid/Generated/Android/View/OrientationListener.cs
@@ -50,11 +50,11 @@ public partial class OrientationListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onOrientationChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnOrientationChangedEventHandler));
-            AddEventHandler("disable", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(DisableEventHandler));
-            AddEventHandler("enable", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(EnableEventHandler));
-            AddEventHandler("onAccuracyChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnAccuracyChangedEventHandler));
-            AddEventHandler("onSensorChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSensorChangedEventHandler));
+            AddEventHandler("onOrientationChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnOrientationChangedEventHandler));
+            AddEventHandler("disable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(DisableEventHandler));
+            AddEventHandler("enable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(EnableEventHandler));
+            AddEventHandler("onAccuracyChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnAccuracyChangedEventHandler));
+            AddEventHandler("onSensorChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSensorChangedEventHandler));
 
         }
 
@@ -62,7 +62,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationListener.html#onOrientationChanged(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnOrientationChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnOrientationChanged { get; set; } = null;
+        public global::System.Action<int> OnOnOrientationChanged { get; set; } = null;
 
         void OnOrientationChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -74,7 +74,7 @@ void OnOrientationChangedEventHandler(object sender, CLRListenerEventArgs<CLREve
         /// <see href="https://developer.android.com/reference/android/view/OrientationListener.html#onOrientationChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void OnOrientationChanged(int arg0)
         {
             
@@ -84,7 +84,7 @@ public virtual void OnOrientationChanged(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationListener.html#disable()"/>
         /// </summary>
         /// <remarks>If <see cref="OnDisable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnDisable { get; set; } = null;
+        public global::System.Action OnDisable { get; set; } = null;
 
         void DisableEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -95,7 +95,7 @@ void DisableEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/OrientationListener.html#disable()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void Disable()
         {
             
@@ -105,7 +105,7 @@ public virtual void Disable()
         /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationListener.html#enable()"/>
         /// </summary>
         /// <remarks>If <see cref="OnEnable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnEnable { get; set; } = null;
+        public global::System.Action OnEnable { get; set; } = null;
 
         void EnableEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -116,7 +116,7 @@ void EnableEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/OrientationListener.html#enable()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void Enable()
         {
             
@@ -126,7 +126,7 @@ public virtual void Enable()
         /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationListener.html#onAccuracyChanged(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnAccuracyChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, int> OnOnAccuracyChanged { get; set; } = null;
+        public global::System.Action<int, int> OnOnAccuracyChanged { get; set; } = null;
 
         void OnAccuracyChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -139,7 +139,7 @@ void OnAccuracyChangedEventHandler(object sender, CLRListenerEventArgs<CLREventD
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void OnAccuracyChanged(int arg0, int arg1)
         {
             
@@ -149,7 +149,7 @@ public virtual void OnAccuracyChanged(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/view/OrientationListener.html#onSensorChanged(int,float[])"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnSensorChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, float[]> OnOnSensorChanged { get; set; } = null;
+        public global::System.Action<int, float[]> OnOnSensorChanged { get; set; } = null;
 
         void OnSensorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -162,7 +162,7 @@ void OnSensorChangedEventHandler(object sender, CLRListenerEventArgs<CLREventDat
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public virtual void OnSensorChanged(int arg0, float[] arg1)
         {
             
@@ -202,7 +202,7 @@ public partial class OrientationListenerDirect
         /// <see href="https://developer.android.com/reference/android/view/OrientationListener.html#onOrientationChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnOrientationChanged(int arg0)
         {
             IExecuteWithSignature("onOrientationChanged", "(I)V", arg0);
@@ -210,7 +210,7 @@ public override void OnOrientationChanged(int arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/OrientationListener.html#disable()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void Disable()
         {
             IExecuteWithSignature("disable", "()V");
@@ -218,7 +218,7 @@ public override void Disable()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/OrientationListener.html#enable()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void Enable()
         {
             IExecuteWithSignature("enable", "()V");
@@ -228,7 +228,7 @@ public override void Enable()
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnAccuracyChanged(int arg0, int arg1)
         {
             IExecute("onAccuracyChanged", arg0, arg1);
@@ -238,7 +238,7 @@ public override void OnAccuracyChanged(int arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public override void OnSensorChanged(int arg0, float[] arg1)
         {
             IExecute("onSensorChanged", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/View/PixelCopy.cs b/src/net/Netdroid/Generated/Android/View/PixelCopy.cs
index 81f084480..65c40c9f2 100644
--- a/src/net/Netdroid/Generated/Android/View/PixelCopy.cs
+++ b/src/net/Netdroid/Generated/Android/View/PixelCopy.cs
@@ -189,7 +189,7 @@ public partial class OnPixelCopyFinishedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPixelCopyFinished", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnPixelCopyFinishedEventHandler));
+                AddEventHandler("onPixelCopyFinished", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnPixelCopyFinishedEventHandler));
 
             }
 
@@ -197,7 +197,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/PixelCopy.OnPixelCopyFinishedListener.html#onPixelCopyFinished(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPixelCopyFinished"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnPixelCopyFinished { get; set; } = null;
+            public global::System.Action<int> OnOnPixelCopyFinished { get; set; } = null;
 
             void OnPixelCopyFinishedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -284,18 +284,20 @@ public partial class Request
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/PixelCopy.Request.html#getDestinationBitmap()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/PixelCopy.Request.html#getDestinationBitmap()"/>
             /// </summary>
-            public Android.Graphics.Bitmap DestinationBitmap
+            /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+            public Android.Graphics.Bitmap GetDestinationBitmap()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getDestinationBitmap", "()Landroid/graphics/Bitmap;"); }
+                return IExecuteWithSignature<Android.Graphics.Bitmap>("getDestinationBitmap", "()Landroid/graphics/Bitmap;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/PixelCopy.Request.html#getSourceRect()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/PixelCopy.Request.html#getSourceRect()"/>
             /// </summary>
-            public Android.Graphics.Rect SourceRect
+            /// <returns><see cref="Android.Graphics.Rect"/></returns>
+            public Android.Graphics.Rect GetSourceRect()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Rect>("getSourceRect", "()Landroid/graphics/Rect;"); }
+                return IExecuteWithSignature<Android.Graphics.Rect>("getSourceRect", "()Landroid/graphics/Rect;");
             }
 
             #endregion
@@ -422,18 +424,20 @@ public partial class Result
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/PixelCopy.Result.html#getBitmap()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/PixelCopy.Result.html#getBitmap()"/>
             /// </summary>
-            public Android.Graphics.Bitmap Bitmap
+            /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+            public Android.Graphics.Bitmap GetBitmap()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;"); }
+                return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/PixelCopy.Result.html#getStatus()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/PixelCopy.Result.html#getStatus()"/>
             /// </summary>
-            public int Status
+            /// <returns><see cref="int"/></returns>
+            public int GetStatus()
             {
-                get { return IExecuteWithSignature<int>("getStatus", "()I"); }
+                return IExecuteWithSignature<int>("getStatus", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/RoundedCorner.cs b/src/net/Netdroid/Generated/Android/View/RoundedCorner.cs
index c560686ec..f01dd92ad 100644
--- a/src/net/Netdroid/Generated/Android/View/RoundedCorner.cs
+++ b/src/net/Netdroid/Generated/Android/View/RoundedCorner.cs
@@ -87,33 +87,36 @@ public RoundedCorner(int arg0, int arg1, int arg2, int arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#getCenter()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#getCenter()"/>
         /// </summary>
-        public Android.Graphics.Point Center
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetCenter()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getCenter", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getCenter", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#getPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#describeContents()"/>
         /// </summary>
-        public int Position
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getPosition", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#getRadius()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#getPosition()"/>
         /// </summary>
-        public int Radius
+        /// <returns><see cref="int"/></returns>
+        public int GetPosition()
         {
-            get { return IExecuteWithSignature<int>("getRadius", "()I"); }
+            return IExecuteWithSignature<int>("getPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#getRadius()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetRadius()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getRadius", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/RoundedCorner.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/ScaleGestureDetector.cs b/src/net/Netdroid/Generated/Android/View/ScaleGestureDetector.cs
index b50814d56..f5fe67879 100644
--- a/src/net/Netdroid/Generated/Android/View/ScaleGestureDetector.cs
+++ b/src/net/Netdroid/Generated/Android/View/ScaleGestureDetector.cs
@@ -65,114 +65,125 @@ public ScaleGestureDetector(Android.Content.Context arg0, Android.View.ScaleGest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getCurrentSpan()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#isInProgress()"/>
         /// </summary>
-        public float CurrentSpan
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInProgress()
         {
-            get { return IExecuteWithSignature<float>("getCurrentSpan", "()F"); }
+            return IExecuteWithSignature<bool>("isInProgress", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getCurrentSpanX()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#isQuickScaleEnabled()"/>
         /// </summary>
-        public float CurrentSpanX
+        /// <returns><see cref="bool"/></returns>
+        public bool IsQuickScaleEnabled()
         {
-            get { return IExecuteWithSignature<float>("getCurrentSpanX", "()F"); }
+            return IExecuteWithSignature<bool>("isQuickScaleEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getCurrentSpanY()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#isStylusScaleEnabled()"/>
         /// </summary>
-        public float CurrentSpanY
+        /// <returns><see cref="bool"/></returns>
+        public bool IsStylusScaleEnabled()
         {
-            get { return IExecuteWithSignature<float>("getCurrentSpanY", "()F"); }
+            return IExecuteWithSignature<bool>("isStylusScaleEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getEventTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#onTouchEvent(android.view.MotionEvent)"/>
         /// </summary>
-        public long EventTime
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnTouchEvent(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<long>("getEventTime", "()J"); }
+            return IExecuteWithSignature<bool>("onTouchEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getFocusX()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getCurrentSpan()"/>
         /// </summary>
-        public float FocusX
+        /// <returns><see cref="float"/></returns>
+        public float GetCurrentSpan()
         {
-            get { return IExecuteWithSignature<float>("getFocusX", "()F"); }
+            return IExecuteWithSignature<float>("getCurrentSpan", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getFocusY()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getCurrentSpanX()"/>
         /// </summary>
-        public float FocusY
+        /// <returns><see cref="float"/></returns>
+        public float GetCurrentSpanX()
         {
-            get { return IExecuteWithSignature<float>("getFocusY", "()F"); }
+            return IExecuteWithSignature<float>("getCurrentSpanX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getPreviousSpan()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getCurrentSpanY()"/>
         /// </summary>
-        public float PreviousSpan
+        /// <returns><see cref="float"/></returns>
+        public float GetCurrentSpanY()
         {
-            get { return IExecuteWithSignature<float>("getPreviousSpan", "()F"); }
+            return IExecuteWithSignature<float>("getCurrentSpanY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getPreviousSpanX()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getFocusX()"/>
         /// </summary>
-        public float PreviousSpanX
+        /// <returns><see cref="float"/></returns>
+        public float GetFocusX()
         {
-            get { return IExecuteWithSignature<float>("getPreviousSpanX", "()F"); }
+            return IExecuteWithSignature<float>("getFocusX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getPreviousSpanY()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getFocusY()"/>
         /// </summary>
-        public float PreviousSpanY
+        /// <returns><see cref="float"/></returns>
+        public float GetFocusY()
         {
-            get { return IExecuteWithSignature<float>("getPreviousSpanY", "()F"); }
+            return IExecuteWithSignature<float>("getFocusY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getScaleFactor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getPreviousSpan()"/>
         /// </summary>
-        public float ScaleFactor
+        /// <returns><see cref="float"/></returns>
+        public float GetPreviousSpan()
         {
-            get { return IExecuteWithSignature<float>("getScaleFactor", "()F"); }
+            return IExecuteWithSignature<float>("getPreviousSpan", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getTimeDelta()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getPreviousSpanX()"/>
         /// </summary>
-        public long TimeDelta
+        /// <returns><see cref="float"/></returns>
+        public float GetPreviousSpanX()
         {
-            get { return IExecuteWithSignature<long>("getTimeDelta", "()J"); }
+            return IExecuteWithSignature<float>("getPreviousSpanX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#isInProgress()"/>
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getPreviousSpanY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInProgress()
+        /// <returns><see cref="float"/></returns>
+        public float GetPreviousSpanY()
         {
-            return IExecuteWithSignature<bool>("isInProgress", "()Z");
+            return IExecuteWithSignature<float>("getPreviousSpanY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#isQuickScaleEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getScaleFactor()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsQuickScaleEnabled()
+        /// <returns><see cref="float"/></returns>
+        public float GetScaleFactor()
         {
-            return IExecuteWithSignature<bool>("isQuickScaleEnabled", "()Z");
+            return IExecuteWithSignature<float>("getScaleFactor", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#isStylusScaleEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getEventTime()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsStylusScaleEnabled()
+        /// <returns><see cref="long"/></returns>
+        public long GetEventTime()
         {
-            return IExecuteWithSignature<bool>("isStylusScaleEnabled", "()Z");
+            return IExecuteWithSignature<long>("getEventTime", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#onTouchEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#getTimeDelta()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnTouchEvent(Android.View.MotionEvent arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetTimeDelta()
         {
-            return IExecuteWithSignature<bool>("onTouchEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<long>("getTimeDelta", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.html#setQuickScaleEnabled(boolean)"/>
@@ -219,9 +230,9 @@ public partial class OnScaleGestureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onScale", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleEventHandler));
-                AddEventHandler("onScaleBegin", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleBeginEventHandler));
-                AddEventHandler("onScaleEnd", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleEndEventHandler));
+                AddEventHandler("onScale", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleEventHandler));
+                AddEventHandler("onScaleBegin", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleBeginEventHandler));
+                AddEventHandler("onScaleEnd", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleEndEventHandler));
 
             }
 
@@ -229,7 +240,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.OnScaleGestureListener.html#onScale(android.view.ScaleGestureDetector)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScale"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.ScaleGestureDetector, bool> OnOnScale { get; set; } = null;
+            public global::System.Func<Android.View.ScaleGestureDetector, bool> OnOnScale { get; set; } = null;
 
             void OnScaleEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>> data)
             {
@@ -252,7 +263,7 @@ public virtual bool OnScale(Android.View.ScaleGestureDetector arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.OnScaleGestureListener.html#onScaleBegin(android.view.ScaleGestureDetector)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScaleBegin"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.ScaleGestureDetector, bool> OnOnScaleBegin { get; set; } = null;
+            public global::System.Func<Android.View.ScaleGestureDetector, bool> OnOnScaleBegin { get; set; } = null;
 
             void OnScaleBeginEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>> data)
             {
@@ -275,7 +286,7 @@ public virtual bool OnScaleBegin(Android.View.ScaleGestureDetector arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.OnScaleGestureListener.html#onScaleEnd(android.view.ScaleGestureDetector)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScaleEnd"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.ScaleGestureDetector> OnOnScaleEnd { get; set; } = null;
+            public global::System.Action<Android.View.ScaleGestureDetector> OnOnScaleEnd { get; set; } = null;
 
             void OnScaleEndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>> data)
             {
@@ -384,9 +395,9 @@ public partial class SimpleOnScaleGestureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onScale", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleEventHandler));
-                AddEventHandler("onScaleBegin", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleBeginEventHandler));
-                AddEventHandler("onScaleEnd", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleEndEventHandler));
+                AddEventHandler("onScale", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleEventHandler));
+                AddEventHandler("onScaleBegin", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleBeginEventHandler));
+                AddEventHandler("onScaleEnd", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>>>(OnScaleEndEventHandler));
 
             }
 
@@ -394,7 +405,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.SimpleOnScaleGestureListener.html#onScale(android.view.ScaleGestureDetector)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScale"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.ScaleGestureDetector, bool> OnOnScale { get; set; } = null;
+            public global::System.Func<Android.View.ScaleGestureDetector, bool> OnOnScale { get; set; } = null;
 
             void OnScaleEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>> data)
             {
@@ -417,7 +428,7 @@ public virtual bool OnScale(Android.View.ScaleGestureDetector arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.SimpleOnScaleGestureListener.html#onScaleBegin(android.view.ScaleGestureDetector)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScaleBegin"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.ScaleGestureDetector, bool> OnOnScaleBegin { get; set; } = null;
+            public global::System.Func<Android.View.ScaleGestureDetector, bool> OnOnScaleBegin { get; set; } = null;
 
             void OnScaleBeginEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>> data)
             {
@@ -440,7 +451,7 @@ public virtual bool OnScaleBegin(Android.View.ScaleGestureDetector arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/ScaleGestureDetector.SimpleOnScaleGestureListener.html#onScaleEnd(android.view.ScaleGestureDetector)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScaleEnd"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.ScaleGestureDetector> OnOnScaleEnd { get; set; } = null;
+            public global::System.Action<Android.View.ScaleGestureDetector> OnOnScaleEnd { get; set; } = null;
 
             void OnScaleEndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ScaleGestureDetector>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/ScrollCaptureSession.cs b/src/net/Netdroid/Generated/Android/View/ScrollCaptureSession.cs
index 83e02e135..16bbe75f1 100644
--- a/src/net/Netdroid/Generated/Android/View/ScrollCaptureSession.cs
+++ b/src/net/Netdroid/Generated/Android/View/ScrollCaptureSession.cs
@@ -56,25 +56,28 @@ public ScrollCaptureSession(Android.View.Surface arg0, Android.Graphics.Rect arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureSession.html#getPositionInWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureSession.html#getPositionInWindow()"/>
         /// </summary>
-        public Android.Graphics.Point PositionInWindow
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetPositionInWindow()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getPositionInWindow", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getPositionInWindow", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureSession.html#getScrollBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureSession.html#getScrollBounds()"/>
         /// </summary>
-        public Android.Graphics.Rect ScrollBounds
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetScrollBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getScrollBounds", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getScrollBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureSession.html#getSurface()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureSession.html#getSurface()"/>
         /// </summary>
-        public Android.View.Surface Surface
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetSurface()
         {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); }
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/ScrollCaptureTarget.cs b/src/net/Netdroid/Generated/Android/View/ScrollCaptureTarget.cs
index c63927063..32fa3a10b 100644
--- a/src/net/Netdroid/Generated/Android/View/ScrollCaptureTarget.cs
+++ b/src/net/Netdroid/Generated/Android/View/ScrollCaptureTarget.cs
@@ -57,46 +57,60 @@ public ScrollCaptureTarget(Android.View.View arg0, Android.Graphics.Rect arg1, A
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getCallback()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getPositionInWindow()"/>
         /// </summary>
-        public Android.View.ScrollCaptureCallback Callback
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetPositionInWindow()
         {
-            get { return IExecuteWithSignature<Android.View.ScrollCaptureCallback>("getCallback", "()Landroid/view/ScrollCaptureCallback;"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getPositionInWindow", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getContainingView()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getLocalVisibleRect()"/>
         /// </summary>
-        public Android.View.View ContainingView
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetLocalVisibleRect()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getContainingView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getLocalVisibleRect", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getHint()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getScrollBounds()"/>
         /// </summary>
-        public int Hint
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetScrollBounds()
         {
-            get { return IExecuteWithSignature<int>("getHint", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getScrollBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getLocalVisibleRect()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getCallback()"/>
         /// </summary>
-        public Android.Graphics.Rect LocalVisibleRect
+        /// <returns><see cref="Android.View.ScrollCaptureCallback"/></returns>
+        public Android.View.ScrollCaptureCallback GetCallback()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getLocalVisibleRect", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.View.ScrollCaptureCallback>("getCallback", "()Landroid/view/ScrollCaptureCallback;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getPositionInWindow()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getContainingView()"/>
         /// </summary>
-        public Android.Graphics.Point PositionInWindow
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetContainingView()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getPositionInWindow", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<Android.View.View>("getContainingView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getScrollBounds()"/> <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#setScrollBounds(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#getHint()"/>
         /// </summary>
-        public Android.Graphics.Rect ScrollBounds
+        /// <returns><see cref="int"/></returns>
+        public int GetHint()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getScrollBounds", "()Landroid/graphics/Rect;"); } set { IExecuteWithSignature("setScrollBounds", "(Landroid/graphics/Rect;)V", value); }
+            return IExecuteWithSignature<int>("getHint", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#setScrollBounds(android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        public void SetScrollBounds(Android.Graphics.Rect arg0)
+        {
+            IExecuteWithSignature("setScrollBounds", "(Landroid/graphics/Rect;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ScrollCaptureTarget.html#updatePositionInWindow()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/SearchEvent.cs b/src/net/Netdroid/Generated/Android/View/SearchEvent.cs
index 4072e872a..6b2e1bcbb 100644
--- a/src/net/Netdroid/Generated/Android/View/SearchEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/SearchEvent.cs
@@ -54,11 +54,12 @@ public SearchEvent(Android.View.InputDevice arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SearchEvent.html#getInputDevice()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/SearchEvent.html#getInputDevice()"/>
         /// </summary>
-        public Android.View.InputDevice InputDevice
+        /// <returns><see cref="Android.View.InputDevice"/></returns>
+        public Android.View.InputDevice GetInputDevice()
         {
-            get { return IExecuteWithSignature<Android.View.InputDevice>("getInputDevice", "()Landroid/view/InputDevice;"); }
+            return IExecuteWithSignature<Android.View.InputDevice>("getInputDevice", "()Landroid/view/InputDevice;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/SubMenu.cs b/src/net/Netdroid/Generated/Android/View/SubMenu.cs
index 91f23cf68..2cd61518c 100644
--- a/src/net/Netdroid/Generated/Android/View/SubMenu.cs
+++ b/src/net/Netdroid/Generated/Android/View/SubMenu.cs
@@ -64,11 +64,12 @@ public partial class SubMenu : Android.View.ISubMenu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SubMenu.html#getItem()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/SubMenu.html#getItem()"/>
         /// </summary>
-        public Android.View.MenuItem Item
+        /// <returns><see cref="Android.View.MenuItem"/></returns>
+        public Android.View.MenuItem GetItem()
         {
-            get { return IExecuteWithSignature<Android.View.MenuItem>("getItem", "()Landroid/view/MenuItem;"); }
+            return IExecuteWithSignature<Android.View.MenuItem>("getItem", "()Landroid/view/MenuItem;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SubMenu.html#setHeaderIcon(android.graphics.drawable.Drawable)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Surface.cs b/src/net/Netdroid/Generated/Android/View/Surface.cs
index 448e10f25..255d7bd55 100644
--- a/src/net/Netdroid/Generated/Android/View/Surface.cs
+++ b/src/net/Netdroid/Generated/Android/View/Surface.cs
@@ -195,7 +195,7 @@ public void SetFrameRate(float arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/view/Surface.html#unlockCanvas(android.graphics.Canvas)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void UnlockCanvas(Android.Graphics.Canvas arg0)
         {
             IExecuteWithSignature("unlockCanvas", "(Landroid/graphics/Canvas;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/View/SurfaceControl.cs b/src/net/Netdroid/Generated/Android/View/SurfaceControl.cs
index d8ca21640..39be874b2 100644
--- a/src/net/Netdroid/Generated/Android/View/SurfaceControl.cs
+++ b/src/net/Netdroid/Generated/Android/View/SurfaceControl.cs
@@ -442,7 +442,7 @@ public Android.View.SurfaceControl.Transaction SetFrameRate(Android.View.Surface
             /// <param name="arg2"><see cref="Android.Graphics.Rect"/></param>
             /// <param name="arg3"><see cref="int"/></param>
             /// <returns><see cref="Android.View.SurfaceControl.Transaction"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.SurfaceControl.Transaction SetGeometry(Android.View.SurfaceControl arg0, Android.Graphics.Rect arg1, Android.Graphics.Rect arg2, int arg3)
             {
                 return IExecute<Android.View.SurfaceControl.Transaction>("setGeometry", arg0, arg1, arg2, arg3);
@@ -578,7 +578,7 @@ public partial class TransactionCommittedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTransactionCommitted", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnTransactionCommittedEventHandler));
+                AddEventHandler("onTransactionCommitted", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnTransactionCommittedEventHandler));
 
             }
 
@@ -586,7 +586,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/SurfaceControl.TransactionCommittedListener.html#onTransactionCommitted()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTransactionCommitted"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnTransactionCommitted { get; set; } = null;
+            public global::System.Action OnOnTransactionCommitted { get; set; } = null;
 
             void OnTransactionCommittedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/SurfaceControlViewHost.cs b/src/net/Netdroid/Generated/Android/View/SurfaceControlViewHost.cs
index fcc26abc4..02e18f901 100644
--- a/src/net/Netdroid/Generated/Android/View/SurfaceControlViewHost.cs
+++ b/src/net/Netdroid/Generated/Android/View/SurfaceControlViewHost.cs
@@ -56,18 +56,20 @@ public SurfaceControlViewHost(Android.Content.Context arg0, Android.View.Display
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SurfaceControlViewHost.html#getSurfacePackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/SurfaceControlViewHost.html#getSurfacePackage()"/>
         /// </summary>
-        public Android.View.SurfaceControlViewHost.SurfacePackage GetSurfacePackage
+        /// <returns><see cref="Android.View.SurfaceControlViewHost.SurfacePackage"/></returns>
+        public Android.View.SurfaceControlViewHost.SurfacePackage GetSurfacePackage()
         {
-            get { return IExecuteWithSignature<Android.View.SurfaceControlViewHost.SurfacePackage>("getSurfacePackage", "()Landroid/view/SurfaceControlViewHost$SurfacePackage;"); }
+            return IExecuteWithSignature<Android.View.SurfaceControlViewHost.SurfacePackage>("getSurfacePackage", "()Landroid/view/SurfaceControlViewHost$SurfacePackage;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SurfaceControlViewHost.html#getView()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/SurfaceControlViewHost.html#getView()"/>
         /// </summary>
-        public Android.View.View View
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetView()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SurfaceControlViewHost.html#transferTouchGestureToHost()"/>
@@ -142,11 +144,12 @@ public SurfacePackage(Android.View.SurfaceControlViewHost.SurfacePackage arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/SurfaceControlViewHost.SurfacePackage.html#getSurfaceControl()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/SurfaceControlViewHost.SurfacePackage.html#getSurfaceControl()"/>
             /// </summary>
-            public Android.View.SurfaceControl SurfaceControl
+            /// <returns><see cref="Android.View.SurfaceControl"/></returns>
+            public Android.View.SurfaceControl GetSurfaceControl()
             {
-                get { return IExecuteWithSignature<Android.View.SurfaceControl>("getSurfaceControl", "()Landroid/view/SurfaceControl;"); }
+                return IExecuteWithSignature<Android.View.SurfaceControl>("getSurfaceControl", "()Landroid/view/SurfaceControl;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/SurfaceControlViewHost.SurfacePackage.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/View/SurfaceHolder.cs b/src/net/Netdroid/Generated/Android/View/SurfaceHolder.cs
index e2e6ed67d..165e05c62 100644
--- a/src/net/Netdroid/Generated/Android/View/SurfaceHolder.cs
+++ b/src/net/Netdroid/Generated/Android/View/SurfaceHolder.cs
@@ -58,28 +58,28 @@ public partial class SurfaceHolder : Android.View.ISurfaceHolder
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#SURFACE_TYPE_GPU"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SURFACE_TYPE_GPU { get { if (!_SURFACE_TYPE_GPUReady) { _SURFACE_TYPE_GPUContent = SGetField<int>(LocalBridgeClazz, "SURFACE_TYPE_GPU"); _SURFACE_TYPE_GPUReady = true; } return _SURFACE_TYPE_GPUContent; } }
         private static int _SURFACE_TYPE_GPUContent = default;
         private static bool _SURFACE_TYPE_GPUReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#SURFACE_TYPE_HARDWARE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SURFACE_TYPE_HARDWARE { get { if (!_SURFACE_TYPE_HARDWAREReady) { _SURFACE_TYPE_HARDWAREContent = SGetField<int>(LocalBridgeClazz, "SURFACE_TYPE_HARDWARE"); _SURFACE_TYPE_HARDWAREReady = true; } return _SURFACE_TYPE_HARDWAREContent; } }
         private static int _SURFACE_TYPE_HARDWAREContent = default;
         private static bool _SURFACE_TYPE_HARDWAREReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#SURFACE_TYPE_NORMAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SURFACE_TYPE_NORMAL { get { if (!_SURFACE_TYPE_NORMALReady) { _SURFACE_TYPE_NORMALContent = SGetField<int>(LocalBridgeClazz, "SURFACE_TYPE_NORMAL"); _SURFACE_TYPE_NORMALReady = true; } return _SURFACE_TYPE_NORMALContent; } }
         private static int _SURFACE_TYPE_NORMALContent = default;
         private static bool _SURFACE_TYPE_NORMALReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#SURFACE_TYPE_PUSH_BUFFERS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SURFACE_TYPE_PUSH_BUFFERS { get { if (!_SURFACE_TYPE_PUSH_BUFFERSReady) { _SURFACE_TYPE_PUSH_BUFFERSContent = SGetField<int>(LocalBridgeClazz, "SURFACE_TYPE_PUSH_BUFFERS"); _SURFACE_TYPE_PUSH_BUFFERSReady = true; } return _SURFACE_TYPE_PUSH_BUFFERSContent; } }
         private static int _SURFACE_TYPE_PUSH_BUFFERSContent = default;
         private static bool _SURFACE_TYPE_PUSH_BUFFERSReady = false; // this is used because in case of generics 
@@ -92,20 +92,6 @@ public partial class SurfaceHolder : Android.View.ISurfaceHolder
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#getSurface()"/> 
-        /// </summary>
-        public Android.View.Surface Surface
-        {
-            get { return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#getSurfaceFrame()"/> 
-        /// </summary>
-        public Android.Graphics.Rect SurfaceFrame
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getSurfaceFrame", "()Landroid/graphics/Rect;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#lockCanvas()"/>
         /// </summary>
         /// <returns><see cref="Android.Graphics.Canvas"/></returns>
@@ -123,6 +109,22 @@ public Android.Graphics.Canvas LockCanvas(Android.Graphics.Rect arg0)
             return IExecuteWithSignature<Android.Graphics.Canvas>("lockCanvas", "(Landroid/graphics/Rect;)Landroid/graphics/Canvas;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#getSurfaceFrame()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetSurfaceFrame()
+        {
+            return IExecuteWithSignature<Android.Graphics.Rect>("getSurfaceFrame", "()Landroid/graphics/Rect;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#getSurface()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Surface"/></returns>
+        public Android.View.Surface GetSurface()
+        {
+            return IExecuteWithSignature<Android.View.Surface>("getSurface", "()Landroid/view/Surface;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#isCreating()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -182,7 +184,7 @@ public void SetSizeFromLayout()
         /// <see href="https://developer.android.com/reference/android/view/SurfaceHolder.html#setType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetType(int arg0)
         {
             IExecuteWithSignature("setType", "(I)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/View/SurfaceView.cs b/src/net/Netdroid/Generated/Android/View/SurfaceView.cs
index b1d2d0380..9f6d5c587 100644
--- a/src/net/Netdroid/Generated/Android/View/SurfaceView.cs
+++ b/src/net/Netdroid/Generated/Android/View/SurfaceView.cs
@@ -102,25 +102,28 @@ public SurfaceView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SurfaceView.html#getHolder()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/SurfaceView.html#getHostToken()"/>
         /// </summary>
-        public Android.View.SurfaceHolder Holder
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetHostToken()
         {
-            get { return IExecuteWithSignature<Android.View.SurfaceHolder>("getHolder", "()Landroid/view/SurfaceHolder;"); }
+            return IExecuteWithSignature<Android.Os.IBinder>("getHostToken", "()Landroid/os/IBinder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SurfaceView.html#getHostToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/SurfaceView.html#getSurfaceControl()"/>
         /// </summary>
-        public Android.Os.IBinder HostToken
+        /// <returns><see cref="Android.View.SurfaceControl"/></returns>
+        public Android.View.SurfaceControl GetSurfaceControl()
         {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getHostToken", "()Landroid/os/IBinder;"); }
+            return IExecuteWithSignature<Android.View.SurfaceControl>("getSurfaceControl", "()Landroid/view/SurfaceControl;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/SurfaceView.html#getSurfaceControl()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/SurfaceView.html#getHolder()"/>
         /// </summary>
-        public Android.View.SurfaceControl SurfaceControl
+        /// <returns><see cref="Android.View.SurfaceHolder"/></returns>
+        public Android.View.SurfaceHolder GetHolder()
         {
-            get { return IExecuteWithSignature<Android.View.SurfaceControl>("getSurfaceControl", "()Landroid/view/SurfaceControl;"); }
+            return IExecuteWithSignature<Android.View.SurfaceHolder>("getHolder", "()Landroid/view/SurfaceHolder;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/SurfaceView.html#applyTransactionToFrame(android.view.SurfaceControl.Transaction)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/AllPackageClasses.cs
index d8d07320a..6c65a830b 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/AllPackageClasses.cs
@@ -696,12 +696,12 @@ public partial class TextClassificationSessionFactory : MASES.JCOBridge.C2JBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TextClassificationSessionFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextClassificationSessionFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextClassificationSessionFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TextClassificationSessionFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextClassificationSessionFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextClassificationSessionFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -786,12 +786,12 @@ public partial class TextClassifier : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Te
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TextClassifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextClassifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextClassifier() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TextClassifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextClassifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextClassifier(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -920,12 +920,12 @@ public partial class TextClassifierEvent : Android.Os.Parcelable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TextClassifierEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextClassifierEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextClassifierEvent() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TextClassifierEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TextClassifierEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TextClassifierEvent(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -962,12 +962,12 @@ public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1003,18 +1003,18 @@ public Builder(params object[] args) : base(args) { }
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.Builder.html"/>
         /// </summary>
         /// <typeparam name="T"><see cref="Android.View.Textclassifier.TextClassifierEvent.Builder{T}"/></typeparam>
-        public partial class Builder<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<T>> where T: Android.View.Textclassifier.TextClassifierEvent.Builder<T>
+        public partial class Builder<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder<T>> where T : Android.View.Textclassifier.TextClassifierEvent.Builder<T>
         {
             const string _bridgeClassName = "android.view.textclassifier.TextClassifierEvent$Builder";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/ConversationAction.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/ConversationAction.cs
index bbb98e57b..62a187aa4 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/ConversationAction.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/ConversationAction.cs
@@ -112,47 +112,52 @@ public partial class ConversationAction
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getAction()"/>
         /// </summary>
-        public Android.App.RemoteAction Action
+        /// <returns><see cref="Android.App.RemoteAction"/></returns>
+        public Android.App.RemoteAction GetAction()
         {
-            get { return IExecuteWithSignature<Android.App.RemoteAction>("getAction", "()Landroid/app/RemoteAction;"); }
+            return IExecuteWithSignature<Android.App.RemoteAction>("getAction", "()Landroid/app/RemoteAction;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getConfidenceScore()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getExtras()"/>
         /// </summary>
-        public float ConfidenceScore
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<float>("getConfidenceScore", "()F"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getConfidenceScore()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="float"/></returns>
+        public float GetConfidenceScore()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<float>("getConfidenceScore", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getTextReply()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.CharSequence TextReply
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTextReply", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getTextReply()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTextReply()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTextReply", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationAction.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/ConversationActions.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/ConversationActions.cs
index 0a85ffdb6..5404c4f31 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/ConversationActions.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/ConversationActions.cs
@@ -61,26 +61,28 @@ public ConversationActions(Java.Util.List<Android.View.Textclassifier.Conversati
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.html#getConversationActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.html#describeContents()"/>
         /// </summary>
-        public Java.Util.List<Android.View.Textclassifier.ConversationAction> GetConversationActions
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecute<Java.Util.List<Android.View.Textclassifier.ConversationAction>>("getConversationActions"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.html#getId()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.html#getConversationActions()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Textclassifier.ConversationAction> GetConversationActions()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecute<Java.Util.List<Android.View.Textclassifier.ConversationAction>>("getConversationActions");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.html#writeToParcel(android.os.Parcel,int)"/>
@@ -134,40 +136,44 @@ public partial class Message
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#getAuthor()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#getAuthor()"/>
             /// </summary>
-            public Android.App.Person Author
+            /// <returns><see cref="Android.App.Person"/></returns>
+            public Android.App.Person GetAuthor()
             {
-                get { return IExecuteWithSignature<Android.App.Person>("getAuthor", "()Landroid/app/Person;"); }
+                return IExecuteWithSignature<Android.App.Person>("getAuthor", "()Landroid/app/Person;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#getExtras()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#getReferenceTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#describeContents()"/>
             /// </summary>
-            public Java.Time.ZonedDateTime ReferenceTime
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Java.Time.ZonedDateTime>("getReferenceTime", "()Ljava/time/ZonedDateTime;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#getText()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#getText()"/>
             /// </summary>
-            public Java.Lang.CharSequence Text
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetText()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#getReferenceTime()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
+            public Java.Time.ZonedDateTime GetReferenceTime()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Time.ZonedDateTime>("getReferenceTime", "()Ljava/time/ZonedDateTime;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Message.html#writeToParcel(android.os.Parcel,int)"/>
@@ -302,54 +308,60 @@ public partial class Request
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getCallingPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getExtras()"/>
             /// </summary>
-            public Java.Lang.String CallingPackageName
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getConversation()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getTypeConfig()"/>
             /// </summary>
-            public Java.Util.List<Android.View.Textclassifier.ConversationActions.Message> Conversation
+            /// <returns><see cref="Android.View.Textclassifier.TextClassifier.EntityConfig"/></returns>
+            public Android.View.Textclassifier.TextClassifier.EntityConfig GetTypeConfig()
             {
-                get { return IExecute<Java.Util.List<Android.View.Textclassifier.ConversationActions.Message>>("getConversation"); }
+                return IExecute<Android.View.Textclassifier.TextClassifier.EntityConfig>("getTypeConfig");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#describeContents()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getHints()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getMaxSuggestions()"/>
             /// </summary>
-            public Java.Util.List<Java.Lang.String> Hints
+            /// <returns><see cref="int"/></returns>
+            public int GetMaxSuggestions()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getHints", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<int>("getMaxSuggestions", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getMaxSuggestions()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getCallingPackageName()"/>
             /// </summary>
-            public int MaxSuggestions
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCallingPackageName()
             {
-                get { return IExecuteWithSignature<int>("getMaxSuggestions", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getTypeConfig()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getConversation()"/>
             /// </summary>
-            public Android.View.Textclassifier.TextClassifier.EntityConfig TypeConfig
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.View.Textclassifier.ConversationActions.Message> GetConversation()
             {
-                get { return IExecute<Android.View.Textclassifier.TextClassifier.EntityConfig>("getTypeConfig"); }
+                return IExecute<Java.Util.List<Android.View.Textclassifier.ConversationActions.Message>>("getConversation");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#getHints()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Java.Lang.String> GetHints()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getHints", "()Ljava/util/List;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/ConversationActions.Request.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/SelectionEvent.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/SelectionEvent.cs
index 8cd70b7e9..ef798f1f6 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/SelectionEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/SelectionEvent.cs
@@ -240,124 +240,140 @@ public static bool IsTerminal(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getDurationSincePreviousEvent()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getSessionId()"/>
         /// </summary>
-        public long DurationSincePreviousEvent
+        /// <returns><see cref="Android.View.Textclassifier.TextClassificationSessionId"/></returns>
+        public Android.View.Textclassifier.TextClassificationSessionId GetSessionId()
         {
-            get { return IExecuteWithSignature<long>("getDurationSincePreviousEvent", "()J"); }
+            return IExecute<Android.View.Textclassifier.TextClassificationSessionId>("getSessionId");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getDurationSinceSessionStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#describeContents()"/>
         /// </summary>
-        public long DurationSinceSessionStart
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<long>("getDurationSinceSessionStart", "()J"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEnd()"/>
         /// </summary>
-        public int End
+        /// <returns><see cref="int"/></returns>
+        public int GetEnd()
         {
-            get { return IExecuteWithSignature<int>("getEnd", "()I"); }
+            return IExecuteWithSignature<int>("getEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEntityType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEventIndex()"/>
         /// </summary>
-        public Java.Lang.String EntityType
+        /// <returns><see cref="int"/></returns>
+        public int GetEventIndex()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEntityType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getEventIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEventIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEventType()"/>
         /// </summary>
-        public int EventIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetEventType()
         {
-            get { return IExecuteWithSignature<int>("getEventIndex", "()I"); }
+            return IExecuteWithSignature<int>("getEventType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEventTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getInvocationMethod()"/>
         /// </summary>
-        public long EventTime
+        /// <returns><see cref="int"/></returns>
+        public int GetInvocationMethod()
         {
-            get { return IExecuteWithSignature<long>("getEventTime", "()J"); }
+            return IExecuteWithSignature<int>("getInvocationMethod", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEventType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getSmartEnd()"/>
         /// </summary>
-        public int EventType
+        /// <returns><see cref="int"/></returns>
+        public int GetSmartEnd()
         {
-            get { return IExecuteWithSignature<int>("getEventType", "()I"); }
+            return IExecuteWithSignature<int>("getSmartEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getInvocationMethod()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getSmartStart()"/>
         /// </summary>
-        public int InvocationMethod
+        /// <returns><see cref="int"/></returns>
+        public int GetSmartStart()
         {
-            get { return IExecuteWithSignature<int>("getInvocationMethod", "()I"); }
+            return IExecuteWithSignature<int>("getSmartStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getStart()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="int"/></returns>
+        public int GetStart()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getResultId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEntityType()"/>
         /// </summary>
-        public Java.Lang.String ResultId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEntityType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResultId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEntityType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getSessionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getPackageName()"/>
         /// </summary>
-        public Android.View.Textclassifier.TextClassificationSessionId SessionId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecute<Android.View.Textclassifier.TextClassificationSessionId>("getSessionId"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getSmartEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getResultId()"/>
         /// </summary>
-        public int SmartEnd
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResultId()
         {
-            get { return IExecuteWithSignature<int>("getSmartEnd", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getResultId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getSmartStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getWidgetType()"/>
         /// </summary>
-        public int SmartStart
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetWidgetType()
         {
-            get { return IExecuteWithSignature<int>("getSmartStart", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getWidgetType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getWidgetVersion()"/>
         /// </summary>
-        public int Start
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetWidgetVersion()
         {
-            get { return IExecuteWithSignature<int>("getStart", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getWidgetVersion", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getWidgetType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getDurationSincePreviousEvent()"/>
         /// </summary>
-        public Java.Lang.String WidgetType
+        /// <returns><see cref="long"/></returns>
+        public long GetDurationSincePreviousEvent()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getWidgetType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<long>("getDurationSincePreviousEvent", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getWidgetVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getDurationSinceSessionStart()"/>
         /// </summary>
-        public Java.Lang.String WidgetVersion
+        /// <returns><see cref="long"/></returns>
+        public long GetDurationSinceSessionStart()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getWidgetVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<long>("getDurationSinceSessionStart", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#getEventTime()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetEventTime()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getEventTime", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/SelectionEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassification.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassification.cs
index f6894472d..74aca4c65 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassification.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassification.cs
@@ -52,97 +52,115 @@ public partial class TextClassification
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getActions()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getIntent()"/>
         /// </summary>
-        public Java.Util.List<Android.App.RemoteAction> Actions
+        /// <returns><see cref="Android.Content.Intent"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Intent GetIntent()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.App.RemoteAction>>("getActions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getEntityCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getIcon()"/>
         /// </summary>
-        public int EntityCount
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Drawable.Drawable GetIcon()
         {
-            get { return IExecuteWithSignature<int>("getEntityCount", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getExtras()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getOnClickListener()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Drawable.Drawable Icon
+        /// <returns><see cref="Android.View.View.OnClickListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View.OnClickListener GetOnClickListener()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIcon", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.View.View.OnClickListener>("getOnClickListener", "()Landroid/view/View$OnClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getOnClickListener()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Android.View.View.OnClickListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View.OnClickListener GetOnClickListenerDirect()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.View.View.OnClickListenerDirect, Android.View.View.OnClickListener>("getOnClickListener", "()Landroid/view/View$OnClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getIntent()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getConfidenceScore(java.lang.String)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Intent Intent
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="float"/></returns>
+        public float GetConfidenceScore(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Android.Content.Intent>("getIntent", "()Landroid/content/Intent;"); }
+            return IExecuteWithSignature<float>("getConfidenceScore", "(Ljava/lang/String;)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#describeContents()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence Label
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getOnClickListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getEntityCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.View.OnClickListener OnClickListener
+        /// <returns><see cref="int"/></returns>
+        public int GetEntityCount()
         {
-            get { return IExecuteWithSignature<Android.View.View.OnClickListener>("getOnClickListener", "()Landroid/view/View$OnClickListener;"); }
+            return IExecuteWithSignature<int>("getEntityCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getLabel()"/>
         /// </summary>
-        public Java.Lang.String Text
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetLabel()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLabel", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getConfidenceScore(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getEntity(int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="float"/></returns>
-        public float GetConfidenceScore(Java.Lang.String arg0)
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEntity(int arg0)
         {
-            return IExecuteWithSignature<float>("getConfidenceScore", "(Ljava/lang/String;)F", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getEntity", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getEntity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getText()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetEntity(int arg0)
+        public Java.Lang.String GetText()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getEntity", "(I)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#getActions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.App.RemoteAction> GetActions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.App.RemoteAction>>("getActions", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.html#writeToParcel(android.os.Parcel,int)"/>
@@ -218,7 +236,7 @@ public Android.View.Textclassifier.TextClassification.Builder SetExtras(Android.
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
             /// <returns><see cref="Android.View.Textclassifier.TextClassification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.Textclassifier.TextClassification.Builder SetIcon(Android.Graphics.Drawable.Drawable arg0)
             {
                 return IExecute<Android.View.Textclassifier.TextClassification.Builder>("setIcon", arg0);
@@ -237,7 +255,7 @@ public Android.View.Textclassifier.TextClassification.Builder SetId(Java.Lang.St
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
             /// <returns><see cref="Android.View.Textclassifier.TextClassification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.Textclassifier.TextClassification.Builder SetIntent(Android.Content.Intent arg0)
             {
                 return IExecute<Android.View.Textclassifier.TextClassification.Builder>("setIntent", arg0);
@@ -247,7 +265,7 @@ public Android.View.Textclassifier.TextClassification.Builder SetIntent(Android.
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.View.Textclassifier.TextClassification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.Textclassifier.TextClassification.Builder SetLabel(Java.Lang.String arg0)
             {
                 return IExecute<Android.View.Textclassifier.TextClassification.Builder>("setLabel", arg0);
@@ -257,7 +275,7 @@ public Android.View.Textclassifier.TextClassification.Builder SetLabel(Java.Lang
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.View.OnClickListener"/></param>
             /// <returns><see cref="Android.View.Textclassifier.TextClassification.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.Textclassifier.TextClassification.Builder SetOnClickListener(Android.View.View.OnClickListener arg0)
             {
                 return IExecute<Android.View.Textclassifier.TextClassification.Builder>("setOnClickListener", arg0);
@@ -309,61 +327,68 @@ public partial class Request
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getCallingPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getExtras()"/>
             /// </summary>
-            public Java.Lang.String CallingPackageName
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getDefaultLocales()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getDefaultLocales()"/>
             /// </summary>
-            public Android.Os.LocaleList DefaultLocales
+            /// <returns><see cref="Android.Os.LocaleList"/></returns>
+            public Android.Os.LocaleList GetDefaultLocales()
             {
-                get { return IExecuteWithSignature<Android.Os.LocaleList>("getDefaultLocales", "()Landroid/os/LocaleList;"); }
+                return IExecuteWithSignature<Android.Os.LocaleList>("getDefaultLocales", "()Landroid/os/LocaleList;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getEndIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#describeContents()"/>
             /// </summary>
-            public int EndIndex
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<int>("getEndIndex", "()I"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getEndIndex()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int GetEndIndex()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("getEndIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getReferenceTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getStartIndex()"/>
             /// </summary>
-            public Java.Time.ZonedDateTime ReferenceTime
+            /// <returns><see cref="int"/></returns>
+            public int GetStartIndex()
             {
-                get { return IExecuteWithSignature<Java.Time.ZonedDateTime>("getReferenceTime", "()Ljava/time/ZonedDateTime;"); }
+                return IExecuteWithSignature<int>("getStartIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getStartIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getText()"/>
             /// </summary>
-            public int StartIndex
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetText()
             {
-                get { return IExecuteWithSignature<int>("getStartIndex", "()I"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getText()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getCallingPackageName()"/>
             /// </summary>
-            public Java.Lang.CharSequence Text
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCallingPackageName()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#getReferenceTime()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
+            public Java.Time.ZonedDateTime GetReferenceTime()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Time.ZonedDateTime>("getReferenceTime", "()Ljava/time/ZonedDateTime;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassification.Request.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationContext.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationContext.cs
index 517b25f43..526565c5b 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationContext.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationContext.cs
@@ -52,33 +52,36 @@ public partial class TextClassificationContext
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#getWidgetType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#getPackageName()"/>
         /// </summary>
-        public Java.Lang.String WidgetType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getWidgetType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#getWidgetVersion()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#getWidgetType()"/>
         /// </summary>
-        public Java.Lang.String WidgetVersion
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetWidgetType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getWidgetVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getWidgetType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#getWidgetVersion()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetWidgetVersion()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getWidgetVersion", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationContext.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationManager.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationManager.cs
index 655d9e0b8..152824c02 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationManager.cs
@@ -46,13 +46,6 @@ public partial class TextClassificationManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationManager.html#getTextClassifier()"/> <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationManager.html#setTextClassifier(android.view.textclassifier.TextClassifier)"/>
-        /// </summary>
-        public Android.View.Textclassifier.TextClassifier TextClassifier
-        {
-            get { return IExecute<Android.View.Textclassifier.TextClassifier>("getTextClassifier"); } set { IExecute("setTextClassifier", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationManager.html#createTextClassificationSession(android.view.textclassifier.TextClassificationContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Textclassifier.TextClassificationContext"/></param>
@@ -62,6 +55,14 @@ public Android.View.Textclassifier.TextClassifier CreateTextClassificationSessio
             return IExecute<Android.View.Textclassifier.TextClassifier>("createTextClassificationSession", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationManager.html#getTextClassifier()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Textclassifier.TextClassifier"/></returns>
+        public Android.View.Textclassifier.TextClassifier GetTextClassifier()
+        {
+            return IExecute<Android.View.Textclassifier.TextClassifier>("getTextClassifier");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationManager.html#setTextClassificationSessionFactory(android.view.textclassifier.TextClassificationSessionFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Textclassifier.TextClassificationSessionFactory"/></param>
@@ -69,6 +70,14 @@ public void SetTextClassificationSessionFactory(Android.View.Textclassifier.Text
         {
             IExecute("setTextClassificationSessionFactory", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationManager.html#setTextClassifier(android.view.textclassifier.TextClassifier)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Textclassifier.TextClassifier"/></param>
+        public void SetTextClassifier(Android.View.Textclassifier.TextClassifier arg0)
+        {
+            IExecute("setTextClassifier", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationSessionId.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationSessionId.cs
index e6b51c5ba..f9496bcc1 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationSessionId.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassificationSessionId.cs
@@ -52,13 +52,6 @@ public partial class TextClassificationSessionId
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationSessionId.html#getValue()"/> 
-        /// </summary>
-        public Java.Lang.String Value
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationSessionId.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -67,6 +60,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationSessionId.html#getValue()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetValue()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassificationSessionId.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassifier.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassifier.cs
index 89f281858..efc6e1c95 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassifier.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassifier.cs
@@ -208,13 +208,6 @@ public partial class TextClassifier : Android.View.Textclassifier.ITextClassifie
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier.html#getMaxGenerateLinksTextLength()"/> 
-        /// </summary>
-        public int MaxGenerateLinksTextLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxGenerateLinksTextLength", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier.html#suggestConversationActions(android.view.textclassifier.ConversationActions.Request)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Textclassifier.ConversationActions.Request"/></param>
@@ -292,6 +285,14 @@ public bool IsDestroyed()
             return IExecuteWithSignature<bool>("isDestroyed", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier.html#getMaxGenerateLinksTextLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxGenerateLinksTextLength()
+        {
+            return IExecuteWithSignature<int>("getMaxGenerateLinksTextLength", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier.html#destroy()"/>
         /// </summary>
         public void Destroy()
@@ -347,7 +348,7 @@ public partial class EntityConfig
             /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
             /// <param name="arg2"><see cref="Java.Util.Collection"/></param>
             /// <returns><see cref="Android.View.Textclassifier.TextClassifier.EntityConfig"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.Textclassifier.TextClassifier.EntityConfig Create(Java.Util.Collection<Java.Lang.String> arg0, Java.Util.Collection<Java.Lang.String> arg1, Java.Util.Collection<Java.Lang.String> arg2)
             {
                 return SExecute<Android.View.Textclassifier.TextClassifier.EntityConfig>(LocalBridgeClazz, "create", arg0, arg1, arg2);
@@ -357,7 +358,7 @@ public static Android.View.Textclassifier.TextClassifier.EntityConfig Create(Jav
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
             /// <returns><see cref="Android.View.Textclassifier.TextClassifier.EntityConfig"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.Textclassifier.TextClassifier.EntityConfig CreateWithExplicitEntityList(Java.Util.Collection<Java.Lang.String> arg0)
             {
                 return SExecute<Android.View.Textclassifier.TextClassifier.EntityConfig>(LocalBridgeClazz, "createWithExplicitEntityList", arg0);
@@ -367,7 +368,7 @@ public static Android.View.Textclassifier.TextClassifier.EntityConfig CreateWith
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
             /// <returns><see cref="Android.View.Textclassifier.TextClassifier.EntityConfig"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.Textclassifier.TextClassifier.EntityConfig CreateWithHints(Java.Util.Collection<Java.Lang.String> arg0)
             {
                 return SExecute<Android.View.Textclassifier.TextClassifier.EntityConfig>(LocalBridgeClazz, "createWithHints", arg0);
@@ -377,13 +378,6 @@ public static Android.View.Textclassifier.TextClassifier.EntityConfig CreateWith
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier.EntityConfig.html#getHints()"/> 
-            /// </summary>
-            public Java.Util.Collection<Java.Lang.String> Hints
-            {
-                get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getHints", "()Ljava/util/Collection;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier.EntityConfig.html#shouldIncludeTypesFromTextClassifier()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -400,6 +394,14 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier.EntityConfig.html#getHints()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.Collection"/></returns>
+            public Java.Util.Collection<Java.Lang.String> GetHints()
+            {
+                return IExecuteWithSignature<Java.Util.Collection<Java.Lang.String>>("getHints", "()Ljava/util/Collection;");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifier.EntityConfig.html#resolveEntityListModifications(java.util.Collection)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassifierEvent.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassifierEvent.cs
index 940491f3c..b5c0be733 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassifierEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextClassifierEvent.cs
@@ -202,89 +202,100 @@ public partial class TextClassifierEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getActionIndices()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getLocale()"/>
         /// </summary>
-        public int[] ActionIndices
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetLocale()
         {
-            get { return IExecuteWithSignatureArray<int>("getActionIndices", "()[I"); }
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEntityTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getExtras()"/>
         /// </summary>
-        public Java.Lang.String[] EntityTypes
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEntityTypes", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEventCategory()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEventContext()"/>
         /// </summary>
-        public int EventCategory
+        /// <returns><see cref="Android.View.Textclassifier.TextClassificationContext"/></returns>
+        public Android.View.Textclassifier.TextClassificationContext GetEventContext()
         {
-            get { return IExecuteWithSignature<int>("getEventCategory", "()I"); }
+            return IExecute<Android.View.Textclassifier.TextClassificationContext>("getEventContext");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEventContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getScores()"/>
         /// </summary>
-        public Android.View.Textclassifier.TextClassificationContext EventContext
+        /// <returns><see cref="float"/></returns>
+        public float[] GetScores()
         {
-            get { return IExecute<Android.View.Textclassifier.TextClassificationContext>("getEventContext"); }
+            return IExecuteWithSignatureArray<float>("getScores", "()[F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEventIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#describeContents()"/>
         /// </summary>
-        public int EventIndex
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getEventIndex", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEventType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEventCategory()"/>
         /// </summary>
-        public int EventType
+        /// <returns><see cref="int"/></returns>
+        public int GetEventCategory()
         {
-            get { return IExecuteWithSignature<int>("getEventType", "()I"); }
+            return IExecuteWithSignature<int>("getEventCategory", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEventIndex()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="int"/></returns>
+        public int GetEventIndex()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<int>("getEventIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEventType()"/>
         /// </summary>
-        public Android.Icu.Util.ULocale Locale
+        /// <returns><see cref="int"/></returns>
+        public int GetEventType()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;"); }
+            return IExecuteWithSignature<int>("getEventType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getModelName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getActionIndices()"/>
         /// </summary>
-        public Java.Lang.String ModelName
+        /// <returns><see cref="int"/></returns>
+        public int[] GetActionIndices()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getModelName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<int>("getActionIndices", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getResultId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getModelName()"/>
         /// </summary>
-        public Java.Lang.String ResultId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetModelName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResultId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getModelName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getScores()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getResultId()"/>
         /// </summary>
-        public float[] Scores
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResultId()
         {
-            get { return IExecuteWithSignatureArray<float>("getScores", "()[F"); }
+            return IExecuteWithSignature<Java.Lang.String>("getResultId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#getEntityTypes()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEntityTypes()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEntityTypes", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.html#writeToParcel(android.os.Parcel,int)"/>
@@ -806,32 +817,36 @@ public partial class TextSelectionEvent
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.TextSelectionEvent.html#getRelativeSuggestedWordEndIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.TextSelectionEvent.html#getRelativeSuggestedWordEndIndex()"/>
             /// </summary>
-            public int RelativeSuggestedWordEndIndex
+            /// <returns><see cref="int"/></returns>
+            public int GetRelativeSuggestedWordEndIndex()
             {
-                get { return IExecuteWithSignature<int>("getRelativeSuggestedWordEndIndex", "()I"); }
+                return IExecuteWithSignature<int>("getRelativeSuggestedWordEndIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.TextSelectionEvent.html#getRelativeSuggestedWordStartIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.TextSelectionEvent.html#getRelativeSuggestedWordStartIndex()"/>
             /// </summary>
-            public int RelativeSuggestedWordStartIndex
+            /// <returns><see cref="int"/></returns>
+            public int GetRelativeSuggestedWordStartIndex()
             {
-                get { return IExecuteWithSignature<int>("getRelativeSuggestedWordStartIndex", "()I"); }
+                return IExecuteWithSignature<int>("getRelativeSuggestedWordStartIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.TextSelectionEvent.html#getRelativeWordEndIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.TextSelectionEvent.html#getRelativeWordEndIndex()"/>
             /// </summary>
-            public int RelativeWordEndIndex
+            /// <returns><see cref="int"/></returns>
+            public int GetRelativeWordEndIndex()
             {
-                get { return IExecuteWithSignature<int>("getRelativeWordEndIndex", "()I"); }
+                return IExecuteWithSignature<int>("getRelativeWordEndIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.TextSelectionEvent.html#getRelativeWordStartIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextClassifierEvent.TextSelectionEvent.html#getRelativeWordStartIndex()"/>
             /// </summary>
-            public int RelativeWordStartIndex
+            /// <returns><see cref="int"/></returns>
+            public int GetRelativeWordStartIndex()
             {
-                get { return IExecuteWithSignature<int>("getRelativeWordStartIndex", "()I"); }
+                return IExecuteWithSignature<int>("getRelativeWordStartIndex", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextLanguage.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextLanguage.cs
index 16fb66b11..757ab2334 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextLanguage.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextLanguage.cs
@@ -52,27 +52,6 @@ public partial class TextLanguage
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#getExtras()"/> 
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#getLocaleHypothesisCount()"/> 
-        /// </summary>
-        public int LocaleHypothesisCount
-        {
-            get { return IExecuteWithSignature<int>("getLocaleHypothesisCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#getLocale(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -82,6 +61,14 @@ public Android.Icu.Util.ULocale GetLocale(int arg0)
             return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "(I)Landroid/icu/util/ULocale;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#getExtras()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
+        {
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#getConfidenceScore(android.icu.util.ULocale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Icu.Util.ULocale"/></param>
@@ -99,6 +86,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#getLocaleHypothesisCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLocaleHypothesisCount()
+        {
+            return IExecuteWithSignature<int>("getLocaleHypothesisCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -205,33 +208,36 @@ public partial class Request
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#getCallingPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#getExtras()"/>
             /// </summary>
-            public Java.Lang.String CallingPackageName
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#describeContents()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#getText()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#getText()"/>
             /// </summary>
-            public Java.Lang.CharSequence Text
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetText()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#getCallingPackageName()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCallingPackageName()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLanguage.Request.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextLinks.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextLinks.cs
index dc5706a34..f40230b76 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextLinks.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextLinks.cs
@@ -94,25 +94,12 @@ public partial class TextLinks
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.html#getExtras()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.html#getLinks()"/> 
-        /// </summary>
-        public Java.Util.Collection<Android.View.Textclassifier.TextLinks.TextLink> Links
-        {
-            get { return IExecute<Java.Util.Collection<Android.View.Textclassifier.TextLinks.TextLink>>("getLinks"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.html#getText()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Text
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.html#apply(android.text.Spannable,int,java.util.function.Function)"/>
@@ -134,6 +121,22 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.html#getLinks()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Android.View.Textclassifier.TextLinks.TextLink> GetLinks()
+        {
+            return IExecute<Java.Util.Collection<Android.View.Textclassifier.TextLinks.TextLink>>("getLinks");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -260,54 +263,60 @@ public partial class Request
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getCallingPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getExtras()"/>
             /// </summary>
-            public Java.Lang.String CallingPackageName
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getDefaultLocales()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getDefaultLocales()"/>
             /// </summary>
-            public Android.Os.LocaleList DefaultLocales
+            /// <returns><see cref="Android.Os.LocaleList"/></returns>
+            public Android.Os.LocaleList GetDefaultLocales()
             {
-                get { return IExecuteWithSignature<Android.Os.LocaleList>("getDefaultLocales", "()Landroid/os/LocaleList;"); }
+                return IExecuteWithSignature<Android.Os.LocaleList>("getDefaultLocales", "()Landroid/os/LocaleList;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getEntityConfig()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getEntityConfig()"/>
             /// </summary>
-            public Android.View.Textclassifier.TextClassifier.EntityConfig EntityConfig
+            /// <returns><see cref="Android.View.Textclassifier.TextClassifier.EntityConfig"/></returns>
+            public Android.View.Textclassifier.TextClassifier.EntityConfig GetEntityConfig()
             {
-                get { return IExecute<Android.View.Textclassifier.TextClassifier.EntityConfig>("getEntityConfig"); }
+                return IExecute<Android.View.Textclassifier.TextClassifier.EntityConfig>("getEntityConfig");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#describeContents()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getReferenceTime()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getText()"/>
             /// </summary>
-            public Java.Time.ZonedDateTime ReferenceTime
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetText()
             {
-                get { return IExecuteWithSignature<Java.Time.ZonedDateTime>("getReferenceTime", "()Ljava/time/ZonedDateTime;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getText()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getCallingPackageName()"/>
             /// </summary>
-            public Java.Lang.CharSequence Text
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCallingPackageName()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#getReferenceTime()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
+            public Java.Time.ZonedDateTime GetReferenceTime()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Time.ZonedDateTime>("getReferenceTime", "()Ljava/time/ZonedDateTime;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.Request.html#writeToParcel(android.os.Parcel,int)"/>
@@ -439,49 +448,53 @@ public partial class TextLink
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getEnd()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getExtras()"/>
             /// </summary>
-            public int End
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<int>("getEnd", "()I"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getEntityCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getConfidenceScore(java.lang.String)"/>
             /// </summary>
-            public int EntityCount
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="float"/></returns>
+            public float GetConfidenceScore(Java.Lang.String arg0)
             {
-                get { return IExecuteWithSignature<int>("getEntityCount", "()I"); }
+                return IExecuteWithSignature<float>("getConfidenceScore", "(Ljava/lang/String;)F", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#describeContents()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getStart()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getEnd()"/>
             /// </summary>
-            public int Start
+            /// <returns><see cref="int"/></returns>
+            public int GetEnd()
             {
-                get { return IExecuteWithSignature<int>("getStart", "()I"); }
+                return IExecuteWithSignature<int>("getEnd", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getConfidenceScore(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getEntityCount()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            /// <returns><see cref="float"/></returns>
-            public float GetConfidenceScore(Java.Lang.String arg0)
+            /// <returns><see cref="int"/></returns>
+            public int GetEntityCount()
             {
-                return IExecuteWithSignature<float>("getConfidenceScore", "(Ljava/lang/String;)F", arg0);
+                return IExecuteWithSignature<int>("getEntityCount", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getStart()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            public int GetStart()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<int>("getStart", "()I");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLink.html#getEntity(int)"/>
@@ -541,11 +554,12 @@ public TextLinkSpan(Android.View.Textclassifier.TextLinks.TextLink arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLinkSpan.html#getTextLink()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextLinks.TextLinkSpan.html#getTextLink()"/>
             /// </summary>
-            public Android.View.Textclassifier.TextLinks.TextLink GetTextLink
+            /// <returns><see cref="Android.View.Textclassifier.TextLinks.TextLink"/></returns>
+            public Android.View.Textclassifier.TextLinks.TextLink GetTextLink()
             {
-                get { return IExecute<Android.View.Textclassifier.TextLinks.TextLink>("getTextLink"); }
+                return IExecute<Android.View.Textclassifier.TextLinks.TextLink>("getTextLink");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextSelection.cs b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextSelection.cs
index e5bc0a2c5..d02882ce2 100644
--- a/src/net/Netdroid/Generated/Android/View/Textclassifier/TextSelection.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textclassifier/TextSelection.cs
@@ -52,63 +52,61 @@ public partial class TextSelection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getEntityCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getExtras()"/>
         /// </summary>
-        public int EntityCount
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<int>("getEntityCount", "()I"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getTextClassification()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.View.Textclassifier.TextClassification"/></returns>
+        public Android.View.Textclassifier.TextClassification GetTextClassification()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecute<Android.View.Textclassifier.TextClassification>("getTextClassification");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getId()"/> 
-        /// </summary>
-        public Java.Lang.String Id
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getSelectionEndIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getConfidenceScore(java.lang.String)"/>
         /// </summary>
-        public int SelectionEndIndex
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="float"/></returns>
+        public float GetConfidenceScore(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<int>("getSelectionEndIndex", "()I"); }
+            return IExecuteWithSignature<float>("getConfidenceScore", "(Ljava/lang/String;)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getSelectionStartIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#describeContents()"/>
         /// </summary>
-        public int SelectionStartIndex
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getSelectionStartIndex", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getTextClassification()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getEntityCount()"/>
         /// </summary>
-        public Android.View.Textclassifier.TextClassification TextClassification
+        /// <returns><see cref="int"/></returns>
+        public int GetEntityCount()
         {
-            get { return IExecute<Android.View.Textclassifier.TextClassification>("getTextClassification"); }
+            return IExecuteWithSignature<int>("getEntityCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getConfidenceScore(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getSelectionEndIndex()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="float"/></returns>
-        public float GetConfidenceScore(Java.Lang.String arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionEndIndex()
         {
-            return IExecuteWithSignature<float>("getConfidenceScore", "(Ljava/lang/String;)F", arg0);
+            return IExecuteWithSignature<int>("getSelectionEndIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getSelectionStartIndex()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSelectionStartIndex()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSelectionStartIndex", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getEntity(int)"/>
@@ -120,6 +118,14 @@ public Java.Lang.String GetEntity(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getEntity", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
@@ -244,62 +250,68 @@ public partial class Request
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getCallingPackageName()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getExtras()"/>
             /// </summary>
-            public Java.Lang.String CallingPackageName
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getDefaultLocales()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getDefaultLocales()"/>
             /// </summary>
-            public Android.Os.LocaleList DefaultLocales
+            /// <returns><see cref="Android.Os.LocaleList"/></returns>
+            public Android.Os.LocaleList GetDefaultLocales()
             {
-                get { return IExecuteWithSignature<Android.Os.LocaleList>("getDefaultLocales", "()Landroid/os/LocaleList;"); }
+                return IExecuteWithSignature<Android.Os.LocaleList>("getDefaultLocales", "()Landroid/os/LocaleList;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getEndIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#shouldIncludeTextClassification()"/>
             /// </summary>
-            public int EndIndex
+            /// <returns><see cref="bool"/></returns>
+            public bool ShouldIncludeTextClassification()
             {
-                get { return IExecuteWithSignature<int>("getEndIndex", "()I"); }
+                return IExecuteWithSignature<bool>("shouldIncludeTextClassification", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#describeContents()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="int"/></returns>
+            public int DescribeContents()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getStartIndex()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getEndIndex()"/>
             /// </summary>
-            public int StartIndex
+            /// <returns><see cref="int"/></returns>
+            public int GetEndIndex()
             {
-                get { return IExecuteWithSignature<int>("getStartIndex", "()I"); }
+                return IExecuteWithSignature<int>("getEndIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getText()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getStartIndex()"/>
             /// </summary>
-            public Java.Lang.CharSequence Text
+            /// <returns><see cref="int"/></returns>
+            public int GetStartIndex()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<int>("getStartIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#shouldIncludeTextClassification()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getText()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool ShouldIncludeTextClassification()
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetText()
             {
-                return IExecuteWithSignature<bool>("shouldIncludeTextClassification", "()Z");
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#describeContents()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#getCallingPackageName()"/>
             /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int DescribeContents()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetCallingPackageName()
             {
-                return IExecuteWithSignature<int>("describeContents", "()I");
+                return IExecuteWithSignature<Java.Lang.String>("getCallingPackageName", "()Ljava/lang/String;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/textclassifier/TextSelection.Request.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textservice/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Textservice/AllPackageClasses.cs
index 02a1e0de0..a5091b03d 100644
--- a/src/net/Netdroid/Generated/Android/View/Textservice/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textservice/AllPackageClasses.cs
@@ -165,10 +165,13 @@ public partial class SpellCheckerSessionListener : MASES.JCOBridge.C2JBridge.JVM
             /// </summary>
             public SpellCheckerSessionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.view.textservice.SpellCheckerSession_SpellCheckerSessionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.view.textservice.SpellCheckerSessionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -190,10 +193,13 @@ public partial class SpellCheckerSessionListenerDirect : SpellCheckerSessionList
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.view.textservice.SpellCheckerSession$SpellCheckerSessionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.view.textservice.SpellCheckerSession$SpellCheckerSessionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/View/Textservice/SentenceSuggestionsInfo.cs b/src/net/Netdroid/Generated/Android/View/Textservice/SentenceSuggestionsInfo.cs
index 376c21298..f75074db6 100644
--- a/src/net/Netdroid/Generated/Android/View/Textservice/SentenceSuggestionsInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textservice/SentenceSuggestionsInfo.cs
@@ -70,13 +70,6 @@ public SentenceSuggestionsInfo(Android.View.Textservice.SuggestionsInfo[] arg0,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SentenceSuggestionsInfo.html#getSuggestionsCount()"/> 
-        /// </summary>
-        public int SuggestionsCount
-        {
-            get { return IExecuteWithSignature<int>("getSuggestionsCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SentenceSuggestionsInfo.html#getSuggestionsInfoAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -112,6 +105,14 @@ public int GetOffsetAt(int arg0)
             return IExecuteWithSignature<int>("getOffsetAt", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SentenceSuggestionsInfo.html#getSuggestionsCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSuggestionsCount()
+        {
+            return IExecuteWithSignature<int>("getSuggestionsCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SentenceSuggestionsInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerInfo.cs b/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerInfo.cs
index c2396f66d..ab374254f 100644
--- a/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerInfo.cs
@@ -52,46 +52,20 @@ public partial class SpellCheckerInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getComponent()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getComponent()"/>
         /// </summary>
-        public Android.Content.ComponentName Component
+        /// <returns><see cref="Android.Content.ComponentName"/></returns>
+        public Android.Content.ComponentName GetComponent()
         {
-            get { return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;"); }
+            return IExecuteWithSignature<Android.Content.ComponentName>("getComponent", "()Landroid/content/ComponentName;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getServiceInfo()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Android.Content.Pm.ServiceInfo"/></returns>
+        public Android.Content.Pm.ServiceInfo GetServiceInfo()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getServiceInfo()"/> 
-        /// </summary>
-        public Android.Content.Pm.ServiceInfo ServiceInfo
-        {
-            get { return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getSettingsActivity()"/> 
-        /// </summary>
-        public Java.Lang.String SettingsActivity
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSettingsActivity", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getSubtypeCount()"/> 
-        /// </summary>
-        public int SubtypeCount
-        {
-            get { return IExecuteWithSignature<int>("getSubtypeCount", "()I"); }
+            return IExecuteWithSignature<Android.Content.Pm.ServiceInfo>("getServiceInfo", "()Landroid/content/pm/ServiceInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#loadIcon(android.content.pm.PackageManager)"/>
@@ -120,6 +94,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getSubtypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSubtypeCount()
+        {
+            return IExecuteWithSignature<int>("getSubtypeCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#loadLabel(android.content.pm.PackageManager)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Pm.PackageManager"/></param>
@@ -129,6 +111,30 @@ public Java.Lang.CharSequence LoadLabel(Android.Content.Pm.PackageManager arg0)
             return IExecuteWithSignature<Java.Lang.CharSequence>("loadLabel", "(Landroid/content/pm/PackageManager;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#getSettingsActivity()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSettingsActivity()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSettingsActivity", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerInfo.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerSession.cs b/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerSession.cs
index eb090c7ec..12c5ef8ac 100644
--- a/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerSession.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerSession.cs
@@ -52,11 +52,12 @@ public partial class SpellCheckerSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.html#getSpellChecker()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.html#getSpellChecker()"/>
         /// </summary>
-        public Android.View.Textservice.SpellCheckerInfo SpellChecker
+        /// <returns><see cref="Android.View.Textservice.SpellCheckerInfo"/></returns>
+        public Android.View.Textservice.SpellCheckerInfo GetSpellChecker()
         {
-            get { return IExecuteWithSignature<Android.View.Textservice.SpellCheckerInfo>("getSpellChecker", "()Landroid/view/textservice/SpellCheckerInfo;"); }
+            return IExecuteWithSignature<Android.View.Textservice.SpellCheckerInfo>("getSpellChecker", "()Landroid/view/textservice/SpellCheckerInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.html#isSessionDisconnected()"/>
@@ -94,7 +95,7 @@ public void GetSentenceSuggestions(Android.View.Textservice.TextInfo[] arg0, int
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Textservice.TextInfo"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetSuggestions(Android.View.Textservice.TextInfo arg0, int arg1)
         {
             IExecute("getSuggestions", arg0, arg1);
@@ -105,7 +106,7 @@ public void GetSuggestions(Android.View.Textservice.TextInfo arg0, int arg1)
         /// <param name="arg0"><see cref="Android.View.Textservice.TextInfo"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetSuggestions(Android.View.Textservice.TextInfo[] arg0, int arg1, bool arg2)
         {
             IExecute("getSuggestions", arg0, arg1, arg2);
@@ -139,8 +140,8 @@ public partial class SpellCheckerSessionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGetSentenceSuggestions", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Textservice.SentenceSuggestionsInfo[]>>>(OnGetSentenceSuggestionsEventHandler));
-                AddEventHandler("onGetSuggestions", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Textservice.SuggestionsInfo[]>>>(OnGetSuggestionsEventHandler));
+                AddEventHandler("onGetSentenceSuggestions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Textservice.SentenceSuggestionsInfo[]>>>(OnGetSentenceSuggestionsEventHandler));
+                AddEventHandler("onGetSuggestions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Textservice.SuggestionsInfo[]>>>(OnGetSuggestionsEventHandler));
 
             }
 
@@ -148,7 +149,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionListener.html#onGetSentenceSuggestions(android.view.textservice.SentenceSuggestionsInfo[])"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGetSentenceSuggestions"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Textservice.SentenceSuggestionsInfo[]> OnOnGetSentenceSuggestions { get; set; } = null;
+            public global::System.Action<Android.View.Textservice.SentenceSuggestionsInfo[]> OnOnGetSentenceSuggestions { get; set; } = null;
 
             void OnGetSentenceSuggestionsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Textservice.SentenceSuggestionsInfo[]>> data)
             {
@@ -169,7 +170,7 @@ public virtual void OnGetSentenceSuggestions(Android.View.Textservice.SentenceSu
             /// Handler for <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionListener.html#onGetSuggestions(android.view.textservice.SuggestionsInfo[])"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGetSuggestions"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Textservice.SuggestionsInfo[]> OnOnGetSuggestions { get; set; } = null;
+            public global::System.Action<Android.View.Textservice.SuggestionsInfo[]> OnOnGetSuggestions { get; set; } = null;
 
             void OnGetSuggestionsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Textservice.SuggestionsInfo[]>> data)
             {
@@ -264,33 +265,36 @@ public partial class SpellCheckerSessionParams
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionParams.html#getExtras()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionParams.html#getExtras()"/>
             /// </summary>
-            public Android.Os.Bundle Extras
+            /// <returns><see cref="Android.Os.Bundle"/></returns>
+            public Android.Os.Bundle GetExtras()
             {
-                get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+                return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionParams.html#getLocale()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionParams.html#shouldReferToSpellCheckerLanguageSettings()"/>
             /// </summary>
-            public Java.Util.Locale Locale
+            /// <returns><see cref="bool"/></returns>
+            public bool ShouldReferToSpellCheckerLanguageSettings()
             {
-                get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
+                return IExecuteWithSignature<bool>("shouldReferToSpellCheckerLanguageSettings", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionParams.html#getSupportedAttributes()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionParams.html#getSupportedAttributes()"/>
             /// </summary>
-            public int SupportedAttributes
+            /// <returns><see cref="int"/></returns>
+            public int GetSupportedAttributes()
             {
-                get { return IExecuteWithSignature<int>("getSupportedAttributes", "()I"); }
+                return IExecuteWithSignature<int>("getSupportedAttributes", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionParams.html#shouldReferToSpellCheckerLanguageSettings()"/>
+            /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSession.SpellCheckerSessionParams.html#getLocale()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool ShouldReferToSpellCheckerLanguageSettings()
+            /// <returns><see cref="Java.Util.Locale"/></returns>
+            public Java.Util.Locale GetLocale()
             {
-                return IExecuteWithSignature<bool>("shouldReferToSpellCheckerLanguageSettings", "()Z");
+                return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerSubtype.cs b/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerSubtype.cs
index edcd52a5b..95a93f379 100644
--- a/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerSubtype.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textservice/SpellCheckerSubtype.cs
@@ -35,7 +35,7 @@ public partial class SpellCheckerSubtype
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SpellCheckerSubtype(int arg0, Java.Lang.String arg1, Java.Lang.String arg2)
             : base(arg0, arg1, arg2)
         {
@@ -63,35 +63,6 @@ public SpellCheckerSubtype(int arg0, Java.Lang.String arg1, Java.Lang.String arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getExtraValue()"/> 
-        /// </summary>
-        public Java.Lang.String ExtraValue
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getExtraValue", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getLanguageTag()"/> 
-        /// </summary>
-        public Java.Lang.String LanguageTag
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLanguageTag", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getLocale()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Locale
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocale", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getNameResId()"/> 
-        /// </summary>
-        public int NameResId
-        {
-            get { return IExecuteWithSignature<int>("getNameResId", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#containsExtraValueKey(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -109,6 +80,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getNameResId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNameResId()
+        {
+            return IExecuteWithSignature<int>("getNameResId", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getDisplayName(android.content.Context,java.lang.String,android.content.pm.ApplicationInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -120,6 +99,14 @@ public Java.Lang.CharSequence GetDisplayName(Android.Content.Context arg0, Java.
             return IExecute<Java.Lang.CharSequence>("getDisplayName", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getExtraValue()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetExtraValue()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getExtraValue", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getExtraValueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -129,6 +116,23 @@ public Java.Lang.String GetExtraValueOf(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getExtraValueOf", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getLanguageTag()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLanguageTag()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLanguageTag", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#getLocale()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetLocale()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLocale", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SpellCheckerSubtype.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Textservice/SuggestionsInfo.cs b/src/net/Netdroid/Generated/Android/View/Textservice/SuggestionsInfo.cs
index eb18a14a2..e6409b391 100644
--- a/src/net/Netdroid/Generated/Android/View/Textservice/SuggestionsInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textservice/SuggestionsInfo.cs
@@ -110,40 +110,44 @@ public SuggestionsInfo(int arg0, Java.Lang.String[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getCookie()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#describeContents()"/>
         /// </summary>
-        public int Cookie
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getCookie", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getSequence()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getCookie()"/>
         /// </summary>
-        public int Sequence
+        /// <returns><see cref="int"/></returns>
+        public int GetCookie()
         {
-            get { return IExecuteWithSignature<int>("getSequence", "()I"); }
+            return IExecuteWithSignature<int>("getCookie", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getSuggestionsAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getSequence()"/>
         /// </summary>
-        public int SuggestionsAttributes
+        /// <returns><see cref="int"/></returns>
+        public int GetSequence()
         {
-            get { return IExecuteWithSignature<int>("getSuggestionsAttributes", "()I"); }
+            return IExecuteWithSignature<int>("getSequence", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getSuggestionsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getSuggestionsAttributes()"/>
         /// </summary>
-        public int SuggestionsCount
+        /// <returns><see cref="int"/></returns>
+        public int GetSuggestionsAttributes()
         {
-            get { return IExecuteWithSignature<int>("getSuggestionsCount", "()I"); }
+            return IExecuteWithSignature<int>("getSuggestionsAttributes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getSuggestionsCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSuggestionsCount()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSuggestionsCount", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/SuggestionsInfo.html#getSuggestionAt(int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textservice/TextInfo.cs b/src/net/Netdroid/Generated/Android/View/Textservice/TextInfo.cs
index ee765bd6b..1483a26fc 100644
--- a/src/net/Netdroid/Generated/Android/View/Textservice/TextInfo.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textservice/TextInfo.cs
@@ -90,40 +90,44 @@ public TextInfo(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#getCharSequence()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#describeContents()"/>
         /// </summary>
-        public Java.Lang.CharSequence CharSequence
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCharSequence", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#getCookie()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#getCookie()"/>
         /// </summary>
-        public int Cookie
+        /// <returns><see cref="int"/></returns>
+        public int GetCookie()
         {
-            get { return IExecuteWithSignature<int>("getCookie", "()I"); }
+            return IExecuteWithSignature<int>("getCookie", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#getSequence()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#getSequence()"/>
         /// </summary>
-        public int Sequence
+        /// <returns><see cref="int"/></returns>
+        public int GetSequence()
         {
-            get { return IExecuteWithSignature<int>("getSequence", "()I"); }
+            return IExecuteWithSignature<int>("getSequence", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#getCharSequence()"/>
         /// </summary>
-        public Java.Lang.String Text
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetCharSequence()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getCharSequence", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#getText()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetText()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/TextInfo.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Textservice/TextServicesManager.cs b/src/net/Netdroid/Generated/Android/View/Textservice/TextServicesManager.cs
index ab7afaf9e..819aa851c 100644
--- a/src/net/Netdroid/Generated/Android/View/Textservice/TextServicesManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Textservice/TextServicesManager.cs
@@ -46,18 +46,12 @@ public partial class TextServicesManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/TextServicesManager.html#getCurrentSpellCheckerInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/textservice/TextServicesManager.html#getCurrentSpellCheckerInfo()"/>
         /// </summary>
-        public Android.View.Textservice.SpellCheckerInfo CurrentSpellCheckerInfo
+        /// <returns><see cref="Android.View.Textservice.SpellCheckerInfo"/></returns>
+        public Android.View.Textservice.SpellCheckerInfo GetCurrentSpellCheckerInfo()
         {
-            get { return IExecuteWithSignature<Android.View.Textservice.SpellCheckerInfo>("getCurrentSpellCheckerInfo", "()Landroid/view/textservice/SpellCheckerInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/textservice/TextServicesManager.html#getEnabledSpellCheckerInfos()"/> 
-        /// </summary>
-        public Java.Util.List<Android.View.Textservice.SpellCheckerInfo> EnabledSpellCheckerInfos
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Textservice.SpellCheckerInfo>>("getEnabledSpellCheckerInfos", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Android.View.Textservice.SpellCheckerInfo>("getCurrentSpellCheckerInfo", "()Landroid/view/textservice/SpellCheckerInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/textservice/TextServicesManager.html#newSpellCheckerSession(android.os.Bundle,java.util.Locale,android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener,boolean)"/>
@@ -90,6 +84,14 @@ public bool IsSpellCheckerEnabled()
         {
             return IExecuteWithSignature<bool>("isSpellCheckerEnabled", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/textservice/TextServicesManager.html#getEnabledSpellCheckerInfos()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Textservice.SpellCheckerInfo> GetEnabledSpellCheckerInfos()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.View.Textservice.SpellCheckerInfo>>("getEnabledSpellCheckerInfos", "()Ljava/util/List;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/TextureView.cs b/src/net/Netdroid/Generated/Android/View/TextureView.cs
index 950386d88..0bbdd36a5 100644
--- a/src/net/Netdroid/Generated/Android/View/TextureView.cs
+++ b/src/net/Netdroid/Generated/Android/View/TextureView.cs
@@ -84,25 +84,12 @@ public TextureView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/TextureView.html#getBitmap()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/TextureView.html#getBitmap()"/>
         /// </summary>
-        public Android.Graphics.Bitmap Bitmap
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/TextureView.html#getSurfaceTextureListener()"/> 
-        /// </summary>
-        public Android.View.TextureView.SurfaceTextureListener GetSurfaceTextureListener
-        {
-            get { return IExecuteWithSignature<Android.View.TextureView.SurfaceTextureListener>("getSurfaceTextureListener", "()Landroid/view/TextureView$SurfaceTextureListener;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/TextureView.html#getSurfaceTexture()"/> <see href="https://developer.android.com/reference/android/view/TextureView.html#setSurfaceTexture(android.graphics.SurfaceTexture)"/>
-        /// </summary>
-        public Android.Graphics.SurfaceTexture SurfaceTexture
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetBitmap()
         {
-            get { return IExecuteWithSignature<Android.Graphics.SurfaceTexture>("getSurfaceTexture", "()Landroid/graphics/SurfaceTexture;"); } set { IExecuteWithSignature("setSurfaceTexture", "(Landroid/graphics/SurfaceTexture;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getBitmap", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/TextureView.html#getBitmap(android.graphics.Bitmap)"/>
@@ -150,6 +137,30 @@ public Android.Graphics.Matrix GetTransform(Android.Graphics.Matrix arg0)
             return IExecuteWithSignature<Android.Graphics.Matrix>("getTransform", "(Landroid/graphics/Matrix;)Landroid/graphics/Matrix;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/TextureView.html#getSurfaceTexture()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Graphics.SurfaceTexture"/></returns>
+        public Android.Graphics.SurfaceTexture GetSurfaceTexture()
+        {
+            return IExecuteWithSignature<Android.Graphics.SurfaceTexture>("getSurfaceTexture", "()Landroid/graphics/SurfaceTexture;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/TextureView.html#getSurfaceTextureListener()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.TextureView.SurfaceTextureListener"/></returns>
+        public Android.View.TextureView.SurfaceTextureListener GetSurfaceTextureListener()
+        {
+            return IExecuteWithSignature<Android.View.TextureView.SurfaceTextureListener>("getSurfaceTextureListener", "()Landroid/view/TextureView$SurfaceTextureListener;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/TextureView.html#getSurfaceTextureListener()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.TextureView.SurfaceTextureListener"/></returns>
+        public Android.View.TextureView.SurfaceTextureListener GetSurfaceTextureListenerDirect()
+        {
+            return IExecuteWithSignature<Android.View.TextureView.SurfaceTextureListenerDirect, Android.View.TextureView.SurfaceTextureListener>("getSurfaceTextureListener", "()Landroid/view/TextureView$SurfaceTextureListener;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/TextureView.html#isAvailable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -166,6 +177,14 @@ public void SetOpaque(bool arg0)
             IExecuteWithSignature("setOpaque", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/TextureView.html#setSurfaceTexture(android.graphics.SurfaceTexture)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.SurfaceTexture"/></param>
+        public void SetSurfaceTexture(Android.Graphics.SurfaceTexture arg0)
+        {
+            IExecuteWithSignature("setSurfaceTexture", "(Landroid/graphics/SurfaceTexture;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/TextureView.html#setSurfaceTextureListener(android.view.TextureView.SurfaceTextureListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.TextureView.SurfaceTextureListener"/></param>
@@ -218,10 +237,10 @@ public partial class SurfaceTextureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSurfaceTextureDestroyed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnSurfaceTextureDestroyedEventHandler));
-                AddEventHandler("onSurfaceTextureAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnSurfaceTextureAvailableEventHandler));
-                AddEventHandler("onSurfaceTextureSizeChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnSurfaceTextureSizeChangedEventHandler));
-                AddEventHandler("onSurfaceTextureUpdated", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnSurfaceTextureUpdatedEventHandler));
+                AddEventHandler("onSurfaceTextureDestroyed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnSurfaceTextureDestroyedEventHandler));
+                AddEventHandler("onSurfaceTextureAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnSurfaceTextureAvailableEventHandler));
+                AddEventHandler("onSurfaceTextureSizeChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnSurfaceTextureSizeChangedEventHandler));
+                AddEventHandler("onSurfaceTextureUpdated", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>>>(OnSurfaceTextureUpdatedEventHandler));
 
             }
 
@@ -229,7 +248,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/TextureView.SurfaceTextureListener.html#onSurfaceTextureDestroyed(android.graphics.SurfaceTexture)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSurfaceTextureDestroyed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Graphics.SurfaceTexture, bool> OnOnSurfaceTextureDestroyed { get; set; } = null;
+            public global::System.Func<Android.Graphics.SurfaceTexture, bool> OnOnSurfaceTextureDestroyed { get; set; } = null;
 
             void OnSurfaceTextureDestroyedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>> data)
             {
@@ -252,7 +271,7 @@ public virtual bool OnSurfaceTextureDestroyed(Android.Graphics.SurfaceTexture ar
             /// Handler for <see href="https://developer.android.com/reference/android/view/TextureView.SurfaceTextureListener.html#onSurfaceTextureAvailable(android.graphics.SurfaceTexture,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSurfaceTextureAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Graphics.SurfaceTexture, int, int> OnOnSurfaceTextureAvailable { get; set; } = null;
+            public global::System.Action<Android.Graphics.SurfaceTexture, int, int> OnOnSurfaceTextureAvailable { get; set; } = null;
 
             void OnSurfaceTextureAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>> data)
             {
@@ -275,7 +294,7 @@ public virtual void OnSurfaceTextureAvailable(Android.Graphics.SurfaceTexture ar
             /// Handler for <see href="https://developer.android.com/reference/android/view/TextureView.SurfaceTextureListener.html#onSurfaceTextureSizeChanged(android.graphics.SurfaceTexture,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSurfaceTextureSizeChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Graphics.SurfaceTexture, int, int> OnOnSurfaceTextureSizeChanged { get; set; } = null;
+            public global::System.Action<Android.Graphics.SurfaceTexture, int, int> OnOnSurfaceTextureSizeChanged { get; set; } = null;
 
             void OnSurfaceTextureSizeChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>> data)
             {
@@ -298,7 +317,7 @@ public virtual void OnSurfaceTextureSizeChanged(Android.Graphics.SurfaceTexture
             /// Handler for <see href="https://developer.android.com/reference/android/view/TextureView.SurfaceTextureListener.html#onSurfaceTextureUpdated(android.graphics.SurfaceTexture)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSurfaceTextureUpdated"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Graphics.SurfaceTexture> OnOnSurfaceTextureUpdated { get; set; } = null;
+            public global::System.Action<Android.Graphics.SurfaceTexture> OnOnSurfaceTextureUpdated { get; set; } = null;
 
             void OnSurfaceTextureUpdatedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.SurfaceTexture>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/TouchDelegate.cs b/src/net/Netdroid/Generated/Android/View/TouchDelegate.cs
index 992d340b1..51f10a1e2 100644
--- a/src/net/Netdroid/Generated/Android/View/TouchDelegate.cs
+++ b/src/net/Netdroid/Generated/Android/View/TouchDelegate.cs
@@ -79,11 +79,12 @@ public TouchDelegate(Android.Graphics.Rect arg0, Android.View.View arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/TouchDelegate.html#getTouchDelegateInfo()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/TouchDelegate.html#getTouchDelegateInfo()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo TouchDelegateInfo
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo GetTouchDelegateInfo()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo>("getTouchDelegateInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;"); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo.TouchDelegateInfo>("getTouchDelegateInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo$TouchDelegateInfo;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/TouchDelegate.html#onTouchEvent(android.view.MotionEvent)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/View/Translation/AllPackageClasses.cs
index fac09820b..3fda1c483 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/AllPackageClasses.cs
@@ -652,12 +652,12 @@ public partial class UiTranslationStateCallback : MASES.JCOBridge.C2JBridge.JVMB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UiTranslationStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UiTranslationStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UiTranslationStateCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UiTranslationStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UiTranslationStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UiTranslationStateCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -698,12 +698,12 @@ public partial class ViewTranslationCallback : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ViewTranslationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewTranslationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewTranslationCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ViewTranslationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ViewTranslationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ViewTranslationCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/TranslationCapability.cs b/src/net/Netdroid/Generated/Android/View/Translation/TranslationCapability.cs
index 022b0868a..b64149721 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/TranslationCapability.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/TranslationCapability.cs
@@ -76,48 +76,52 @@ public partial class TranslationCapability
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#getSourceSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#getSourceSpec()"/>
         /// </summary>
-        public Android.View.Translation.TranslationSpec SourceSpec
+        /// <returns><see cref="Android.View.Translation.TranslationSpec"/></returns>
+        public Android.View.Translation.TranslationSpec GetSourceSpec()
         {
-            get { return IExecuteWithSignature<Android.View.Translation.TranslationSpec>("getSourceSpec", "()Landroid/view/translation/TranslationSpec;"); }
+            return IExecuteWithSignature<Android.View.Translation.TranslationSpec>("getSourceSpec", "()Landroid/view/translation/TranslationSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#getState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#getTargetSpec()"/>
         /// </summary>
-        public int State
+        /// <returns><see cref="Android.View.Translation.TranslationSpec"/></returns>
+        public Android.View.Translation.TranslationSpec GetTargetSpec()
         {
-            get { return IExecuteWithSignature<int>("getState", "()I"); }
+            return IExecuteWithSignature<Android.View.Translation.TranslationSpec>("getTargetSpec", "()Landroid/view/translation/TranslationSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#getSupportedTranslationFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#isUiTranslationEnabled()"/>
         /// </summary>
-        public int SupportedTranslationFlags
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUiTranslationEnabled()
         {
-            get { return IExecuteWithSignature<int>("getSupportedTranslationFlags", "()I"); }
+            return IExecuteWithSignature<bool>("isUiTranslationEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#getTargetSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#describeContents()"/>
         /// </summary>
-        public Android.View.Translation.TranslationSpec TargetSpec
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.View.Translation.TranslationSpec>("getTargetSpec", "()Landroid/view/translation/TranslationSpec;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#isUiTranslationEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#getState()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUiTranslationEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetState()
         {
-            return IExecuteWithSignature<bool>("isUiTranslationEnabled", "()Z");
+            return IExecuteWithSignature<int>("getState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#getSupportedTranslationFlags()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetSupportedTranslationFlags()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getSupportedTranslationFlags", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationCapability.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/TranslationContext.cs b/src/net/Netdroid/Generated/Android/View/Translation/TranslationContext.cs
index 58c3d6d23..03c0701bf 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/TranslationContext.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/TranslationContext.cs
@@ -70,33 +70,36 @@ public partial class TranslationContext
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#getSourceSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#getSourceSpec()"/>
         /// </summary>
-        public Android.View.Translation.TranslationSpec SourceSpec
+        /// <returns><see cref="Android.View.Translation.TranslationSpec"/></returns>
+        public Android.View.Translation.TranslationSpec GetSourceSpec()
         {
-            get { return IExecuteWithSignature<Android.View.Translation.TranslationSpec>("getSourceSpec", "()Landroid/view/translation/TranslationSpec;"); }
+            return IExecuteWithSignature<Android.View.Translation.TranslationSpec>("getSourceSpec", "()Landroid/view/translation/TranslationSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#getTargetSpec()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#getTargetSpec()"/>
         /// </summary>
-        public Android.View.Translation.TranslationSpec TargetSpec
+        /// <returns><see cref="Android.View.Translation.TranslationSpec"/></returns>
+        public Android.View.Translation.TranslationSpec GetTargetSpec()
         {
-            get { return IExecuteWithSignature<Android.View.Translation.TranslationSpec>("getTargetSpec", "()Landroid/view/translation/TranslationSpec;"); }
+            return IExecuteWithSignature<Android.View.Translation.TranslationSpec>("getTargetSpec", "()Landroid/view/translation/TranslationSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#getTranslationFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#describeContents()"/>
         /// </summary>
-        public int TranslationFlags
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getTranslationFlags", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#getTranslationFlags()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetTranslationFlags()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getTranslationFlags", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationContext.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/TranslationManager.cs b/src/net/Netdroid/Generated/Android/View/Translation/TranslationManager.cs
index 63b29cfea..dc365e40b 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/TranslationManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/TranslationManager.cs
@@ -46,11 +46,12 @@ public partial class TranslationManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationManager.html#getOnDeviceTranslationSettingsActivityIntent()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationManager.html#getOnDeviceTranslationSettingsActivityIntent()"/>
         /// </summary>
-        public Android.App.PendingIntent OnDeviceTranslationSettingsActivityIntent
+        /// <returns><see cref="Android.App.PendingIntent"/></returns>
+        public Android.App.PendingIntent GetOnDeviceTranslationSettingsActivityIntent()
         {
-            get { return IExecuteWithSignature<Android.App.PendingIntent>("getOnDeviceTranslationSettingsActivityIntent", "()Landroid/app/PendingIntent;"); }
+            return IExecuteWithSignature<Android.App.PendingIntent>("getOnDeviceTranslationSettingsActivityIntent", "()Landroid/app/PendingIntent;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationManager.html#getOnDeviceTranslationCapabilities(int,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/TranslationRequest.cs b/src/net/Netdroid/Generated/Android/View/Translation/TranslationRequest.cs
index 3f01a216d..f52041aa5 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/TranslationRequest.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/TranslationRequest.cs
@@ -76,33 +76,36 @@ public partial class TranslationRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#getFlags()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#describeContents()"/>
         /// </summary>
-        public int Flags
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getFlags", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#getTranslationRequestValues()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#getFlags()"/>
         /// </summary>
-        public Java.Util.List<Android.View.Translation.TranslationRequestValue> TranslationRequestValues
+        /// <returns><see cref="int"/></returns>
+        public int GetFlags()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Translation.TranslationRequestValue>>("getTranslationRequestValues", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#getViewTranslationRequests()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#getTranslationRequestValues()"/>
         /// </summary>
-        public Java.Util.List<Android.View.Translation.ViewTranslationRequest> ViewTranslationRequests
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Translation.TranslationRequestValue> GetTranslationRequestValues()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.View.Translation.ViewTranslationRequest>>("getViewTranslationRequests", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Android.View.Translation.TranslationRequestValue>>("getTranslationRequestValues", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#getViewTranslationRequests()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.View.Translation.ViewTranslationRequest> GetViewTranslationRequests()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Util.List<Android.View.Translation.ViewTranslationRequest>>("getViewTranslationRequests", "()Ljava/util/List;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequest.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/TranslationRequestValue.cs b/src/net/Netdroid/Generated/Android/View/Translation/TranslationRequestValue.cs
index 133133626..69f0e3f5e 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/TranslationRequestValue.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/TranslationRequestValue.cs
@@ -61,13 +61,6 @@ public static Android.View.Translation.TranslationRequestValue ForText(Java.Lang
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequestValue.html#getText()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Text
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequestValue.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -76,6 +69,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequestValue.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationRequestValue.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/TranslationResponse.cs b/src/net/Netdroid/Generated/Android/View/Translation/TranslationResponse.cs
index 5a1a946b6..9737cdf37 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/TranslationResponse.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/TranslationResponse.cs
@@ -70,25 +70,20 @@ public partial class TranslationResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponse.html#getTranslationResponseValues()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponse.html#getTranslationResponseValues()"/>
         /// </summary>
-        public Android.Util.SparseArray<Android.View.Translation.TranslationResponseValue> TranslationResponseValues
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<Android.View.Translation.TranslationResponseValue> GetTranslationResponseValues()
         {
-            get { return IExecuteWithSignature<Android.Util.SparseArray<Android.View.Translation.TranslationResponseValue>>("getTranslationResponseValues", "()Landroid/util/SparseArray;"); }
+            return IExecuteWithSignature<Android.Util.SparseArray<Android.View.Translation.TranslationResponseValue>>("getTranslationResponseValues", "()Landroid/util/SparseArray;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponse.html#getTranslationStatus()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponse.html#getViewTranslationResponses()"/>
         /// </summary>
-        public int TranslationStatus
+        /// <returns><see cref="Android.Util.SparseArray"/></returns>
+        public Android.Util.SparseArray<Android.View.Translation.ViewTranslationResponse> GetViewTranslationResponses()
         {
-            get { return IExecuteWithSignature<int>("getTranslationStatus", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponse.html#getViewTranslationResponses()"/> 
-        /// </summary>
-        public Android.Util.SparseArray<Android.View.Translation.ViewTranslationResponse> ViewTranslationResponses
-        {
-            get { return IExecuteWithSignature<Android.Util.SparseArray<Android.View.Translation.ViewTranslationResponse>>("getViewTranslationResponses", "()Landroid/util/SparseArray;"); }
+            return IExecuteWithSignature<Android.Util.SparseArray<Android.View.Translation.ViewTranslationResponse>>("getViewTranslationResponses", "()Landroid/util/SparseArray;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponse.html#isFinalResponse()"/>
@@ -107,6 +102,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponse.html#getTranslationStatus()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTranslationStatus()
+        {
+            return IExecuteWithSignature<int>("getTranslationStatus", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponse.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/TranslationResponseValue.cs b/src/net/Netdroid/Generated/Android/View/Translation/TranslationResponseValue.cs
index 58f5f7a95..dfd07e41d 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/TranslationResponseValue.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/TranslationResponseValue.cs
@@ -78,40 +78,44 @@ public static Android.View.Translation.TranslationResponseValue ForError()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#getExtras()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#getExtras()"/>
         /// </summary>
-        public Android.Os.Bundle Extras
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#getStatusCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#describeContents()"/>
         /// </summary>
-        public int StatusCode
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getStatusCode", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#getStatusCode()"/>
         /// </summary>
-        public Java.Lang.CharSequence Text
+        /// <returns><see cref="int"/></returns>
+        public int GetStatusCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getStatusCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#getTransliteration()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#getText()"/>
         /// </summary>
-        public Java.Lang.CharSequence Transliteration
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTransliteration", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#getTransliteration()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTransliteration()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTransliteration", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationResponseValue.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/TranslationSpec.cs b/src/net/Netdroid/Generated/Android/View/Translation/TranslationSpec.cs
index b52bd753a..78edac287 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/TranslationSpec.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/TranslationSpec.cs
@@ -67,26 +67,28 @@ public TranslationSpec(Android.Icu.Util.ULocale arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationSpec.html#getDataFormat()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationSpec.html#getLocale()"/>
         /// </summary>
-        public int DataFormat
+        /// <returns><see cref="Android.Icu.Util.ULocale"/></returns>
+        public Android.Icu.Util.ULocale GetLocale()
         {
-            get { return IExecuteWithSignature<int>("getDataFormat", "()I"); }
+            return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationSpec.html#getLocale()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationSpec.html#describeContents()"/>
         /// </summary>
-        public Android.Icu.Util.ULocale Locale
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<Android.Icu.Util.ULocale>("getLocale", "()Landroid/icu/util/ULocale;"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationSpec.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/translation/TranslationSpec.html#getDataFormat()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        public int GetDataFormat()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<int>("getDataFormat", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/TranslationSpec.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/ViewTranslationRequest.cs b/src/net/Netdroid/Generated/Android/View/Translation/ViewTranslationRequest.cs
index c46544e81..98285da6d 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/ViewTranslationRequest.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/ViewTranslationRequest.cs
@@ -58,18 +58,12 @@ public partial class ViewTranslationRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationRequest.html#getAutofillId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationRequest.html#getAutofillId()"/>
         /// </summary>
-        public Android.View.Autofill.AutofillId AutofillId
+        /// <returns><see cref="Android.View.Autofill.AutofillId"/></returns>
+        public Android.View.Autofill.AutofillId GetAutofillId()
         {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationRequest.html#getKeys()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> Keys
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKeys", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationRequest.html#getValue(java.lang.String)"/>
@@ -89,6 +83,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationRequest.html#getKeys()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetKeys()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKeys", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationRequest.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/Translation/ViewTranslationResponse.cs b/src/net/Netdroid/Generated/Android/View/Translation/ViewTranslationResponse.cs
index c1addd0df..691d50bb3 100644
--- a/src/net/Netdroid/Generated/Android/View/Translation/ViewTranslationResponse.cs
+++ b/src/net/Netdroid/Generated/Android/View/Translation/ViewTranslationResponse.cs
@@ -52,18 +52,12 @@ public partial class ViewTranslationResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationResponse.html#getAutofillId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationResponse.html#getAutofillId()"/>
         /// </summary>
-        public Android.View.Autofill.AutofillId AutofillId
+        /// <returns><see cref="Android.View.Autofill.AutofillId"/></returns>
+        public Android.View.Autofill.AutofillId GetAutofillId()
         {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationResponse.html#getKeys()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Lang.String> Keys
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKeys", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationResponse.html#getValue(java.lang.String)"/>
@@ -83,6 +77,14 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationResponse.html#getKeys()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetKeys()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getKeys", "()Ljava/util/Set;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/translation/ViewTranslationResponse.html#writeToParcel(android.os.Parcel,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/VelocityTracker.cs b/src/net/Netdroid/Generated/Android/View/VelocityTracker.cs
index fa0fae0f3..61bea9ec6 100644
--- a/src/net/Netdroid/Generated/Android/View/VelocityTracker.cs
+++ b/src/net/Netdroid/Generated/Android/View/VelocityTracker.cs
@@ -54,20 +54,6 @@ public static Android.View.VelocityTracker Obtain()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VelocityTracker.html#getXVelocity()"/> 
-        /// </summary>
-        public float XVelocity
-        {
-            get { return IExecuteWithSignature<float>("getXVelocity", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VelocityTracker.html#getYVelocity()"/> 
-        /// </summary>
-        public float YVelocity
-        {
-            get { return IExecuteWithSignature<float>("getYVelocity", "()F"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/VelocityTracker.html#isAxisSupported(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -96,6 +82,14 @@ public float GetAxisVelocity(int arg0)
             return IExecuteWithSignature<float>("getAxisVelocity", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/VelocityTracker.html#getXVelocity()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetXVelocity()
+        {
+            return IExecuteWithSignature<float>("getXVelocity", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/VelocityTracker.html#getXVelocity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -105,6 +99,14 @@ public float GetXVelocity(int arg0)
             return IExecuteWithSignature<float>("getXVelocity", "(I)F", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/VelocityTracker.html#getYVelocity()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetYVelocity()
+        {
+            return IExecuteWithSignature<float>("getYVelocity", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/VelocityTracker.html#getYVelocity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/VerifiedInputEvent.cs b/src/net/Netdroid/Generated/Android/View/VerifiedInputEvent.cs
index b2842ab2e..7f1ea810c 100644
--- a/src/net/Netdroid/Generated/Android/View/VerifiedInputEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/VerifiedInputEvent.cs
@@ -52,40 +52,44 @@ public partial class VerifiedInputEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#getDeviceId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#describeContents()"/>
         /// </summary>
-        public int DeviceId
+        /// <returns><see cref="int"/></returns>
+        public int DescribeContents()
         {
-            get { return IExecuteWithSignature<int>("getDeviceId", "()I"); }
+            return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#getDisplayId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#getDeviceId()"/>
         /// </summary>
-        public int DisplayId
+        /// <returns><see cref="int"/></returns>
+        public int GetDeviceId()
         {
-            get { return IExecuteWithSignature<int>("getDisplayId", "()I"); }
+            return IExecuteWithSignature<int>("getDeviceId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#getEventTimeNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#getDisplayId()"/>
         /// </summary>
-        public long EventTimeNanos
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayId()
         {
-            get { return IExecuteWithSignature<long>("getEventTimeNanos", "()J"); }
+            return IExecuteWithSignature<int>("getDisplayId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#getSource()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#getSource()"/>
         /// </summary>
-        public int Source
+        /// <returns><see cref="int"/></returns>
+        public int GetSource()
         {
-            get { return IExecuteWithSignature<int>("getSource", "()I"); }
+            return IExecuteWithSignature<int>("getSource", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#describeContents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#getEventTimeNanos()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int DescribeContents()
+        /// <returns><see cref="long"/></returns>
+        public long GetEventTimeNanos()
         {
-            return IExecuteWithSignature<int>("describeContents", "()I");
+            return IExecuteWithSignature<long>("getEventTimeNanos", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/VerifiedInputEvent.html#writeToParcel(android.os.Parcel,int)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/VerifiedKeyEvent.cs b/src/net/Netdroid/Generated/Android/View/VerifiedKeyEvent.cs
index feb45e9ca..36b7ff6ff 100644
--- a/src/net/Netdroid/Generated/Android/View/VerifiedKeyEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/VerifiedKeyEvent.cs
@@ -52,46 +52,44 @@ public partial class VerifiedKeyEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getAction()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getAction()"/>
         /// </summary>
-        public int Action
+        /// <returns><see cref="int"/></returns>
+        public int GetAction()
         {
-            get { return IExecuteWithSignature<int>("getAction", "()I"); }
+            return IExecuteWithSignature<int>("getAction", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getDownTimeNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getKeyCode()"/>
         /// </summary>
-        public long DownTimeNanos
+        /// <returns><see cref="int"/></returns>
+        public int GetKeyCode()
         {
-            get { return IExecuteWithSignature<long>("getDownTimeNanos", "()J"); }
+            return IExecuteWithSignature<int>("getKeyCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getKeyCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getMetaState()"/>
         /// </summary>
-        public int KeyCode
+        /// <returns><see cref="int"/></returns>
+        public int GetMetaState()
         {
-            get { return IExecuteWithSignature<int>("getKeyCode", "()I"); }
+            return IExecuteWithSignature<int>("getMetaState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getMetaState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getRepeatCount()"/>
         /// </summary>
-        public int MetaState
+        /// <returns><see cref="int"/></returns>
+        public int GetRepeatCount()
         {
-            get { return IExecuteWithSignature<int>("getMetaState", "()I"); }
+            return IExecuteWithSignature<int>("getRepeatCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getRepeatCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getScanCode()"/>
         /// </summary>
-        public int RepeatCount
+        /// <returns><see cref="int"/></returns>
+        public int GetScanCode()
         {
-            get { return IExecuteWithSignature<int>("getRepeatCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getScanCode()"/> 
-        /// </summary>
-        public int ScanCode
-        {
-            get { return IExecuteWithSignature<int>("getScanCode", "()I"); }
+            return IExecuteWithSignature<int>("getScanCode", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getFlag(int)"/>
@@ -102,6 +100,14 @@ public Java.Lang.Boolean GetFlag(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.Boolean>("getFlag", "(I)Ljava/lang/Boolean;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedKeyEvent.html#getDownTimeNanos()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDownTimeNanos()
+        {
+            return IExecuteWithSignature<long>("getDownTimeNanos", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/VerifiedMotionEvent.cs b/src/net/Netdroid/Generated/Android/View/VerifiedMotionEvent.cs
index 76640b6ce..76f7d919a 100644
--- a/src/net/Netdroid/Generated/Android/View/VerifiedMotionEvent.cs
+++ b/src/net/Netdroid/Generated/Android/View/VerifiedMotionEvent.cs
@@ -52,46 +52,44 @@ public partial class VerifiedMotionEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getActionMasked()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getRawX()"/>
         /// </summary>
-        public int ActionMasked
+        /// <returns><see cref="float"/></returns>
+        public float GetRawX()
         {
-            get { return IExecuteWithSignature<int>("getActionMasked", "()I"); }
+            return IExecuteWithSignature<float>("getRawX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getButtonState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getRawY()"/>
         /// </summary>
-        public int ButtonState
+        /// <returns><see cref="float"/></returns>
+        public float GetRawY()
         {
-            get { return IExecuteWithSignature<int>("getButtonState", "()I"); }
+            return IExecuteWithSignature<float>("getRawY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getDownTimeNanos()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getActionMasked()"/>
         /// </summary>
-        public long DownTimeNanos
+        /// <returns><see cref="int"/></returns>
+        public int GetActionMasked()
         {
-            get { return IExecuteWithSignature<long>("getDownTimeNanos", "()J"); }
+            return IExecuteWithSignature<int>("getActionMasked", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getMetaState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getButtonState()"/>
         /// </summary>
-        public int MetaState
+        /// <returns><see cref="int"/></returns>
+        public int GetButtonState()
         {
-            get { return IExecuteWithSignature<int>("getMetaState", "()I"); }
+            return IExecuteWithSignature<int>("getButtonState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getRawX()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getMetaState()"/>
         /// </summary>
-        public float RawX
+        /// <returns><see cref="int"/></returns>
+        public int GetMetaState()
         {
-            get { return IExecuteWithSignature<float>("getRawX", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getRawY()"/> 
-        /// </summary>
-        public float RawY
-        {
-            get { return IExecuteWithSignature<float>("getRawY", "()F"); }
+            return IExecuteWithSignature<int>("getMetaState", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getFlag(int)"/>
@@ -102,6 +100,14 @@ public Java.Lang.Boolean GetFlag(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.Boolean>("getFlag", "(I)Ljava/lang/Boolean;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/VerifiedMotionEvent.html#getDownTimeNanos()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDownTimeNanos()
+        {
+            return IExecuteWithSignature<long>("getDownTimeNanos", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/View/View.cs b/src/net/Netdroid/Generated/Android/View/View.cs
index f9fccdf47..4fb88f1e5 100644
--- a/src/net/Netdroid/Generated/Android/View/View.cs
+++ b/src/net/Netdroid/Generated/Android/View/View.cs
@@ -268,21 +268,21 @@ public View(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#DRAWING_CACHE_QUALITY_AUTO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DRAWING_CACHE_QUALITY_AUTO { get { if (!_DRAWING_CACHE_QUALITY_AUTOReady) { _DRAWING_CACHE_QUALITY_AUTOContent = SGetField<int>(LocalBridgeClazz, "DRAWING_CACHE_QUALITY_AUTO"); _DRAWING_CACHE_QUALITY_AUTOReady = true; } return _DRAWING_CACHE_QUALITY_AUTOContent; } }
         private static int _DRAWING_CACHE_QUALITY_AUTOContent = default;
         private static bool _DRAWING_CACHE_QUALITY_AUTOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#DRAWING_CACHE_QUALITY_HIGH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DRAWING_CACHE_QUALITY_HIGH { get { if (!_DRAWING_CACHE_QUALITY_HIGHReady) { _DRAWING_CACHE_QUALITY_HIGHContent = SGetField<int>(LocalBridgeClazz, "DRAWING_CACHE_QUALITY_HIGH"); _DRAWING_CACHE_QUALITY_HIGHReady = true; } return _DRAWING_CACHE_QUALITY_HIGHContent; } }
         private static int _DRAWING_CACHE_QUALITY_HIGHContent = default;
         private static bool _DRAWING_CACHE_QUALITY_HIGHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#DRAWING_CACHE_QUALITY_LOW"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DRAWING_CACHE_QUALITY_LOW { get { if (!_DRAWING_CACHE_QUALITY_LOWReady) { _DRAWING_CACHE_QUALITY_LOWContent = SGetField<int>(LocalBridgeClazz, "DRAWING_CACHE_QUALITY_LOW"); _DRAWING_CACHE_QUALITY_LOWReady = true; } return _DRAWING_CACHE_QUALITY_LOWContent; } }
         private static int _DRAWING_CACHE_QUALITY_LOWContent = default;
         private static bool _DRAWING_CACHE_QUALITY_LOWReady = false; // this is used because in case of generics 
@@ -703,98 +703,98 @@ public View(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#STATUS_BAR_HIDDEN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_BAR_HIDDEN { get { if (!_STATUS_BAR_HIDDENReady) { _STATUS_BAR_HIDDENContent = SGetField<int>(LocalBridgeClazz, "STATUS_BAR_HIDDEN"); _STATUS_BAR_HIDDENReady = true; } return _STATUS_BAR_HIDDENContent; } }
         private static int _STATUS_BAR_HIDDENContent = default;
         private static bool _STATUS_BAR_HIDDENReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#STATUS_BAR_VISIBLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int STATUS_BAR_VISIBLE { get { if (!_STATUS_BAR_VISIBLEReady) { _STATUS_BAR_VISIBLEContent = SGetField<int>(LocalBridgeClazz, "STATUS_BAR_VISIBLE"); _STATUS_BAR_VISIBLEReady = true; } return _STATUS_BAR_VISIBLEContent; } }
         private static int _STATUS_BAR_VISIBLEContent = default;
         private static bool _STATUS_BAR_VISIBLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_FULLSCREEN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_FULLSCREEN { get { if (!_SYSTEM_UI_FLAG_FULLSCREENReady) { _SYSTEM_UI_FLAG_FULLSCREENContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_FULLSCREEN"); _SYSTEM_UI_FLAG_FULLSCREENReady = true; } return _SYSTEM_UI_FLAG_FULLSCREENContent; } }
         private static int _SYSTEM_UI_FLAG_FULLSCREENContent = default;
         private static bool _SYSTEM_UI_FLAG_FULLSCREENReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_HIDE_NAVIGATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_HIDE_NAVIGATION { get { if (!_SYSTEM_UI_FLAG_HIDE_NAVIGATIONReady) { _SYSTEM_UI_FLAG_HIDE_NAVIGATIONContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_HIDE_NAVIGATION"); _SYSTEM_UI_FLAG_HIDE_NAVIGATIONReady = true; } return _SYSTEM_UI_FLAG_HIDE_NAVIGATIONContent; } }
         private static int _SYSTEM_UI_FLAG_HIDE_NAVIGATIONContent = default;
         private static bool _SYSTEM_UI_FLAG_HIDE_NAVIGATIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_IMMERSIVE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_IMMERSIVE { get { if (!_SYSTEM_UI_FLAG_IMMERSIVEReady) { _SYSTEM_UI_FLAG_IMMERSIVEContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_IMMERSIVE"); _SYSTEM_UI_FLAG_IMMERSIVEReady = true; } return _SYSTEM_UI_FLAG_IMMERSIVEContent; } }
         private static int _SYSTEM_UI_FLAG_IMMERSIVEContent = default;
         private static bool _SYSTEM_UI_FLAG_IMMERSIVEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_IMMERSIVE_STICKY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_IMMERSIVE_STICKY { get { if (!_SYSTEM_UI_FLAG_IMMERSIVE_STICKYReady) { _SYSTEM_UI_FLAG_IMMERSIVE_STICKYContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_IMMERSIVE_STICKY"); _SYSTEM_UI_FLAG_IMMERSIVE_STICKYReady = true; } return _SYSTEM_UI_FLAG_IMMERSIVE_STICKYContent; } }
         private static int _SYSTEM_UI_FLAG_IMMERSIVE_STICKYContent = default;
         private static bool _SYSTEM_UI_FLAG_IMMERSIVE_STICKYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN { get { if (!_SYSTEM_UI_FLAG_LAYOUT_FULLSCREENReady) { _SYSTEM_UI_FLAG_LAYOUT_FULLSCREENContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN"); _SYSTEM_UI_FLAG_LAYOUT_FULLSCREENReady = true; } return _SYSTEM_UI_FLAG_LAYOUT_FULLSCREENContent; } }
         private static int _SYSTEM_UI_FLAG_LAYOUT_FULLSCREENContent = default;
         private static bool _SYSTEM_UI_FLAG_LAYOUT_FULLSCREENReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION { get { if (!_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATIONReady) { _SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATIONContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION"); _SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATIONReady = true; } return _SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATIONContent; } }
         private static int _SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATIONContent = default;
         private static bool _SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATIONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_LAYOUT_STABLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_LAYOUT_STABLE { get { if (!_SYSTEM_UI_FLAG_LAYOUT_STABLEReady) { _SYSTEM_UI_FLAG_LAYOUT_STABLEContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_LAYOUT_STABLE"); _SYSTEM_UI_FLAG_LAYOUT_STABLEReady = true; } return _SYSTEM_UI_FLAG_LAYOUT_STABLEContent; } }
         private static int _SYSTEM_UI_FLAG_LAYOUT_STABLEContent = default;
         private static bool _SYSTEM_UI_FLAG_LAYOUT_STABLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR { get { if (!_SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BARReady) { _SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BARContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR"); _SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BARReady = true; } return _SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BARContent; } }
         private static int _SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BARContent = default;
         private static bool _SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BARReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_LIGHT_STATUS_BAR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_LIGHT_STATUS_BAR { get { if (!_SYSTEM_UI_FLAG_LIGHT_STATUS_BARReady) { _SYSTEM_UI_FLAG_LIGHT_STATUS_BARContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_LIGHT_STATUS_BAR"); _SYSTEM_UI_FLAG_LIGHT_STATUS_BARReady = true; } return _SYSTEM_UI_FLAG_LIGHT_STATUS_BARContent; } }
         private static int _SYSTEM_UI_FLAG_LIGHT_STATUS_BARContent = default;
         private static bool _SYSTEM_UI_FLAG_LIGHT_STATUS_BARReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_LOW_PROFILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_LOW_PROFILE { get { if (!_SYSTEM_UI_FLAG_LOW_PROFILEReady) { _SYSTEM_UI_FLAG_LOW_PROFILEContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_LOW_PROFILE"); _SYSTEM_UI_FLAG_LOW_PROFILEReady = true; } return _SYSTEM_UI_FLAG_LOW_PROFILEContent; } }
         private static int _SYSTEM_UI_FLAG_LOW_PROFILEContent = default;
         private static bool _SYSTEM_UI_FLAG_LOW_PROFILEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_FLAG_VISIBLE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_FLAG_VISIBLE { get { if (!_SYSTEM_UI_FLAG_VISIBLEReady) { _SYSTEM_UI_FLAG_VISIBLEContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_FLAG_VISIBLE"); _SYSTEM_UI_FLAG_VISIBLEReady = true; } return _SYSTEM_UI_FLAG_VISIBLEContent; } }
         private static int _SYSTEM_UI_FLAG_VISIBLEContent = default;
         private static bool _SYSTEM_UI_FLAG_VISIBLEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#SYSTEM_UI_LAYOUT_FLAGS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int SYSTEM_UI_LAYOUT_FLAGS { get { if (!_SYSTEM_UI_LAYOUT_FLAGSReady) { _SYSTEM_UI_LAYOUT_FLAGSContent = SGetField<int>(LocalBridgeClazz, "SYSTEM_UI_LAYOUT_FLAGS"); _SYSTEM_UI_LAYOUT_FLAGSReady = true; } return _SYSTEM_UI_LAYOUT_FLAGSContent; } }
         private static int _SYSTEM_UI_LAYOUT_FLAGSContent = default;
         private static bool _SYSTEM_UI_LAYOUT_FLAGSReady = false; // this is used because in case of generics 
@@ -1041,2555 +1041,2735 @@ public static int ResolveSizeAndState(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityClassName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getStateListAnimator()"/>
         /// </summary>
-        public Java.Lang.CharSequence AccessibilityClassName
+        /// <returns><see cref="Android.Animation.StateListAnimator"/></returns>
+        public Android.Animation.StateListAnimator GetStateListAnimator()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getAccessibilityClassName", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Animation.StateListAnimator>("getStateListAnimator", "()Landroid/animation/StateListAnimator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityLiveRegion()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAccessibilityLiveRegion(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getBackgroundTintList()"/>
         /// </summary>
-        public int AccessibilityLiveRegion
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetBackgroundTintList()
         {
-            get { return IExecuteWithSignature<int>("getAccessibilityLiveRegion", "()I"); } set { IExecuteWithSignature("setAccessibilityLiveRegion", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getBackgroundTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityNodeProvider()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getForegroundTintList()"/>
         /// </summary>
-        public Android.View.Accessibility.AccessibilityNodeProvider AccessibilityNodeProvider
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetForegroundTintList()
         {
-            get { return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeProvider>("getAccessibilityNodeProvider", "()Landroid/view/accessibility/AccessibilityNodeProvider;"); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getForegroundTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityPaneTitle()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAccessibilityPaneTitle(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getResources()"/>
         /// </summary>
-        public Java.Lang.CharSequence AccessibilityPaneTitle
+        /// <returns><see cref="Android.Content.Res.Resources"/></returns>
+        public Android.Content.Res.Resources GetResources()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getAccessibilityPaneTitle", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setAccessibilityPaneTitle", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityTraversalAfter()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAccessibilityTraversalAfter(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingCache()"/>
         /// </summary>
-        public int AccessibilityTraversalAfter
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Bitmap GetDrawingCache()
         {
-            get { return IExecuteWithSignature<int>("getAccessibilityTraversalAfter", "()I"); } set { IExecuteWithSignature("setAccessibilityTraversalAfter", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getDrawingCache", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityTraversalBefore()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAccessibilityTraversalBefore(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingCache(boolean)"/>
         /// </summary>
-        public int AccessibilityTraversalBefore
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Bitmap GetDrawingCache(bool arg0)
         {
-            get { return IExecuteWithSignature<int>("getAccessibilityTraversalBefore", "()I"); } set { IExecuteWithSignature("setAccessibilityTraversalBefore", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getDrawingCache", "(Z)Landroid/graphics/Bitmap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAllowedHandwritingDelegatePackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getBackgroundTintBlendMode()"/>
         /// </summary>
-        public Java.Lang.String AllowedHandwritingDelegatePackageName
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetBackgroundTintBlendMode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAllowedHandwritingDelegatePackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getBackgroundTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAllowedHandwritingDelegatorPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getForegroundTintBlendMode()"/>
         /// </summary>
-        public Java.Lang.String AllowedHandwritingDelegatorPackageName
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetForegroundTintBlendMode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAllowedHandwritingDelegatorPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getForegroundTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAlpha()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAlpha(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getBackground()"/>
         /// </summary>
-        public float Alpha
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetBackground()
         {
-            get { return IExecuteWithSignature<float>("getAlpha", "()F"); } set { IExecuteWithSignature("setAlpha", "(F)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBackground", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAnimation()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAnimation(android.view.animation.Animation)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getForeground()"/>
         /// </summary>
-        public Android.View.Animation.Animation Animation
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetForeground()
         {
-            get { return IExecuteWithSignature<Android.View.Animation.Animation>("getAnimation", "()Landroid/view/animation/Animation;"); } set { IExecuteWithSignature("setAnimation", "(Landroid/view/animation/Animation;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getForeground", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAnimationMatrix()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAnimationMatrix(android.graphics.Matrix)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHorizontalScrollbarThumbDrawable()"/>
         /// </summary>
-        public Android.Graphics.Matrix AnimationMatrix
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetHorizontalScrollbarThumbDrawable()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Matrix>("getAnimationMatrix", "()Landroid/graphics/Matrix;"); } set { IExecuteWithSignature("setAnimationMatrix", "(Landroid/graphics/Matrix;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getHorizontalScrollbarThumbDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getApplicationWindowToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHorizontalScrollbarTrackDrawable()"/>
         /// </summary>
-        public Android.Os.IBinder ApplicationWindowToken
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetHorizontalScrollbarTrackDrawable()
         {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getApplicationWindowToken", "()Landroid/os/IBinder;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getHorizontalScrollbarTrackDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAttributeSourceResourceMap()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalScrollbarThumbDrawable()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.Integer, Java.Lang.Integer> AttributeSourceResourceMap
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetVerticalScrollbarThumbDrawable()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.Integer, Java.Lang.Integer>>("getAttributeSourceResourceMap", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getVerticalScrollbarThumbDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAutofillHints()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAutofillHints(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalScrollbarTrackDrawable()"/>
         /// </summary>
-        public Java.Lang.String[] AutofillHints
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetVerticalScrollbarTrackDrawable()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getAutofillHints", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setAutofillHints", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getVerticalScrollbarTrackDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAutofillId()"/> <see href="https://developer.android.com/reference/android/view/View.html#setAutofillId(android.view.autofill.AutofillId)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAnimationMatrix()"/>
         /// </summary>
-        public Android.View.Autofill.AutofillId AutofillId
+        /// <returns><see cref="Android.Graphics.Matrix"/></returns>
+        public Android.Graphics.Matrix GetAnimationMatrix()
         {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;"); } set { IExecuteWithSignature("setAutofillId", "(Landroid/view/autofill/AutofillId;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Matrix>("getAnimationMatrix", "()Landroid/graphics/Matrix;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAutofillType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getMatrix()"/>
         /// </summary>
-        public int AutofillType
+        /// <returns><see cref="Android.Graphics.Matrix"/></returns>
+        public Android.Graphics.Matrix GetMatrix()
         {
-            get { return IExecuteWithSignature<int>("getAutofillType", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Matrix>("getMatrix", "()Landroid/graphics/Matrix;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAutofillValue()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getBackgroundTintMode()"/>
         /// </summary>
-        public Android.View.Autofill.AutofillValue AutofillValue
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetBackgroundTintMode()
         {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillValue>("getAutofillValue", "()Landroid/view/autofill/AutofillValue;"); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getBackgroundTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getBackground()"/> <see href="https://developer.android.com/reference/android/view/View.html#setBackground(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getForegroundTintMode()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Background
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetForegroundTintMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBackground", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setBackground", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getForegroundTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getBackgroundTintBlendMode()"/> <see href="https://developer.android.com/reference/android/view/View.html#setBackgroundTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getClipBounds()"/>
         /// </summary>
-        public Android.Graphics.BlendMode BackgroundTintBlendMode
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetClipBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getBackgroundTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setBackgroundTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getClipBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getBackgroundTintList()"/> <see href="https://developer.android.com/reference/android/view/View.html#setBackgroundTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandler()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList BackgroundTintList
+        /// <returns><see cref="Android.Os.Handler"/></returns>
+        public Android.Os.Handler GetHandler()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getBackgroundTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setBackgroundTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Os.Handler>("getHandler", "()Landroid/os/Handler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getBackgroundTintMode()"/> <see href="https://developer.android.com/reference/android/view/View.html#setBackgroundTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getApplicationWindowToken()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode BackgroundTintMode
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetApplicationWindowToken()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getBackgroundTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setBackgroundTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Android.Os.IBinder>("getApplicationWindowToken", "()Landroid/os/IBinder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getBaseline()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowToken()"/>
         /// </summary>
-        public int Baseline
+        /// <returns><see cref="Android.Os.IBinder"/></returns>
+        public Android.Os.IBinder GetWindowToken()
         {
-            get { return IExecuteWithSignature<int>("getBaseline", "()I"); }
+            return IExecuteWithSignature<Android.Os.IBinder>("getWindowToken", "()Landroid/os/IBinder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getBottom()"/> <see href="https://developer.android.com/reference/android/view/View.html#setBottom(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#createAccessibilityNodeInfo()"/>
         /// </summary>
-        public int Bottom
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeInfo CreateAccessibilityNodeInfo()
         {
-            get { return IExecuteWithSignature<int>("getBottom", "()I"); } set { IExecuteWithSignature("setBottom", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("createAccessibilityNodeInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getCameraDistance()"/> <see href="https://developer.android.com/reference/android/view/View.html#setCameraDistance(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityNodeProvider()"/>
         /// </summary>
-        public float CameraDistance
+        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeProvider"/></returns>
+        public Android.View.Accessibility.AccessibilityNodeProvider GetAccessibilityNodeProvider()
         {
-            get { return IExecuteWithSignature<float>("getCameraDistance", "()F"); } set { IExecuteWithSignature("setCameraDistance", "(F)V", value); }
+            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeProvider>("getAccessibilityNodeProvider", "()Landroid/view/accessibility/AccessibilityNodeProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getClipBounds()"/> <see href="https://developer.android.com/reference/android/view/View.html#setClipBounds(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#startActionMode(android.view.ActionMode.Callback,int)"/>
         /// </summary>
-        public Android.Graphics.Rect ClipBounds
+        /// <param name="arg0"><see cref="Android.View.ActionMode.Callback"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.ActionMode"/></returns>
+        public Android.View.ActionMode StartActionMode(Android.View.ActionMode.Callback arg0, int arg1)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getClipBounds", "()Landroid/graphics/Rect;"); } set { IExecuteWithSignature("setClipBounds", "(Landroid/graphics/Rect;)V", value); }
+            return IExecute<Android.View.ActionMode>("startActionMode", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getClipToOutline()"/> <see href="https://developer.android.com/reference/android/view/View.html#setClipToOutline(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#startActionMode(android.view.ActionMode.Callback)"/>
         /// </summary>
-        public bool ClipToOutline
+        /// <param name="arg0"><see cref="Android.View.ActionMode.Callback"/></param>
+        /// <returns><see cref="Android.View.ActionMode"/></returns>
+        public Android.View.ActionMode StartActionMode(Android.View.ActionMode.Callback arg0)
         {
-            get { return IExecuteWithSignature<bool>("getClipToOutline", "()Z"); } set { IExecuteWithSignature("setClipToOutline", "(Z)V", value); }
+            return IExecuteWithSignature<Android.View.ActionMode>("startActionMode", "(Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getContentCaptureSession()"/> <see href="https://developer.android.com/reference/android/view/View.html#setContentCaptureSession(android.view.contentcapture.ContentCaptureSession)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAnimation()"/>
         /// </summary>
-        public Android.View.Contentcapture.ContentCaptureSession ContentCaptureSession
+        /// <returns><see cref="Android.View.Animation.Animation"/></returns>
+        public Android.View.Animation.Animation GetAnimation()
         {
-            get { return IExecuteWithSignature<Android.View.Contentcapture.ContentCaptureSession>("getContentCaptureSession", "()Landroid/view/contentcapture/ContentCaptureSession;"); } set { IExecuteWithSignature("setContentCaptureSession", "(Landroid/view/contentcapture/ContentCaptureSession;)V", value); }
+            return IExecuteWithSignature<Android.View.Animation.Animation>("getAnimation", "()Landroid/view/animation/Animation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getContentDescription()"/> <see href="https://developer.android.com/reference/android/view/View.html#setContentDescription(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getRootSurfaceControl()"/>
         /// </summary>
-        public Java.Lang.CharSequence ContentDescription
+        /// <returns><see cref="Android.View.AttachedSurfaceControl"/></returns>
+        public Android.View.AttachedSurfaceControl GetRootSurfaceControl()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.View.AttachedSurfaceControl>("getRootSurfaceControl", "()Landroid/view/AttachedSurfaceControl;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAutofillValue()"/>
         /// </summary>
-        public Android.Content.Context Context
+        /// <returns><see cref="Android.View.Autofill.AutofillValue"/></returns>
+        public Android.View.Autofill.AutofillValue GetAutofillValue()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<Android.View.Autofill.AutofillValue>("getAutofillValue", "()Landroid/view/autofill/AutofillValue;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getDefaultFocusHighlightEnabled()"/> <see href="https://developer.android.com/reference/android/view/View.html#setDefaultFocusHighlightEnabled(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onReceiveContent(android.view.ContentInfo)"/>
         /// </summary>
-        public bool DefaultFocusHighlightEnabled
+        /// <param name="arg0"><see cref="Android.View.ContentInfo"/></param>
+        /// <returns><see cref="Android.View.ContentInfo"/></returns>
+        public Android.View.ContentInfo OnReceiveContent(Android.View.ContentInfo arg0)
         {
-            get { return IExecuteWithSignature<bool>("getDefaultFocusHighlightEnabled", "()Z"); } set { IExecuteWithSignature("setDefaultFocusHighlightEnabled", "(Z)V", value); }
+            return IExecuteWithSignature<Android.View.ContentInfo>("onReceiveContent", "(Landroid/view/ContentInfo;)Landroid/view/ContentInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getDisplay()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performReceiveContent(android.view.ContentInfo)"/>
         /// </summary>
-        public Android.View.Display Display
+        /// <param name="arg0"><see cref="Android.View.ContentInfo"/></param>
+        /// <returns><see cref="Android.View.ContentInfo"/></returns>
+        public Android.View.ContentInfo PerformReceiveContent(Android.View.ContentInfo arg0)
         {
-            get { return IExecuteWithSignature<Android.View.Display>("getDisplay", "()Landroid/view/Display;"); }
+            return IExecuteWithSignature<Android.View.ContentInfo>("performReceiveContent", "(Landroid/view/ContentInfo;)Landroid/view/ContentInfo;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawableState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getDisplay()"/>
         /// </summary>
-        public int[] DrawableState
+        /// <returns><see cref="Android.View.Display"/></returns>
+        public Android.View.Display GetDisplay()
         {
-            get { return IExecuteWithSignatureArray<int>("getDrawableState", "()[I"); }
+            return IExecuteWithSignature<Android.View.Display>("getDisplay", "()Landroid/view/Display;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingCache()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onCreateInputConnection(android.view.inputmethod.EditorInfo)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Bitmap DrawingCache
+        /// <param name="arg0"><see cref="Android.View.Inputmethod.EditorInfo"/></param>
+        /// <returns><see cref="Android.View.Inputmethod.InputConnection"/></returns>
+        public Android.View.Inputmethod.InputConnection OnCreateInputConnection(Android.View.Inputmethod.EditorInfo arg0)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getDrawingCache", "()Landroid/graphics/Bitmap;"); }
+            return IExecuteWithSignature<Android.View.Inputmethod.InputConnection>("onCreateInputConnection", "(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingCacheBackgroundColor()"/> <see href="https://developer.android.com/reference/android/view/View.html#setDrawingCacheBackgroundColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getKeyDispatcherState()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int DrawingCacheBackgroundColor
+        /// <returns><see cref="Android.View.KeyEvent.DispatcherState"/></returns>
+        public Android.View.KeyEvent.DispatcherState GetKeyDispatcherState()
         {
-            get { return IExecuteWithSignature<int>("getDrawingCacheBackgroundColor", "()I"); } set { IExecuteWithSignature("setDrawingCacheBackgroundColor", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.KeyEvent.DispatcherState>("getKeyDispatcherState", "()Landroid/view/KeyEvent$DispatcherState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingCacheQuality()"/> <see href="https://developer.android.com/reference/android/view/View.html#setDrawingCacheQuality(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPointerIcon()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int DrawingCacheQuality
+        /// <returns><see cref="Android.View.PointerIcon"/></returns>
+        public Android.View.PointerIcon GetPointerIcon()
         {
-            get { return IExecuteWithSignature<int>("getDrawingCacheQuality", "()I"); } set { IExecuteWithSignature("setDrawingCacheQuality", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.PointerIcon>("getPointerIcon", "()Landroid/view/PointerIcon;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingTime()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onResolvePointerIcon(android.view.MotionEvent,int)"/>
         /// </summary>
-        public long DrawingTime
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.PointerIcon"/></returns>
+        public Android.View.PointerIcon OnResolvePointerIcon(Android.View.MotionEvent arg0, int arg1)
         {
-            get { return IExecuteWithSignature<long>("getDrawingTime", "()J"); }
+            return IExecute<Android.View.PointerIcon>("onResolvePointerIcon", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getElevation()"/> <see href="https://developer.android.com/reference/android/view/View.html#setElevation(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTouchDelegate()"/>
         /// </summary>
-        public float Elevation
+        /// <returns><see cref="Android.View.TouchDelegate"/></returns>
+        public Android.View.TouchDelegate GetTouchDelegate()
         {
-            get { return IExecuteWithSignature<float>("getElevation", "()F"); } set { IExecuteWithSignature("setElevation", "(F)V", value); }
+            return IExecuteWithSignature<Android.View.TouchDelegate>("getTouchDelegate", "()Landroid/view/TouchDelegate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getExplicitStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getViewTranslationResponse()"/>
         /// </summary>
-        public int ExplicitStyle
+        /// <returns><see cref="Android.View.Translation.ViewTranslationResponse"/></returns>
+        public Android.View.Translation.ViewTranslationResponse GetViewTranslationResponse()
         {
-            get { return IExecuteWithSignature<int>("getExplicitStyle", "()I"); }
+            return IExecuteWithSignature<Android.View.Translation.ViewTranslationResponse>("getViewTranslationResponse", "()Landroid/view/translation/ViewTranslationResponse;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getFilterTouchesWhenObscured()"/> <see href="https://developer.android.com/reference/android/view/View.html#setFilterTouchesWhenObscured(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#findFocus()"/>
         /// </summary>
-        public bool FilterTouchesWhenObscured
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View FindFocus()
         {
-            get { return IExecuteWithSignature<bool>("getFilterTouchesWhenObscured", "()Z"); } set { IExecuteWithSignature("setFilterTouchesWhenObscured", "(Z)V", value); }
+            return IExecuteWithSignature<Android.View.View>("findFocus", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getFitsSystemWindows()"/> <see href="https://developer.android.com/reference/android/view/View.html#setFitsSystemWindows(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#focusSearch(int)"/>
         /// </summary>
-        public bool FitsSystemWindows
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View FocusSearch(int arg0)
         {
-            get { return IExecuteWithSignature<bool>("getFitsSystemWindows", "()Z"); } set { IExecuteWithSignature("setFitsSystemWindows", "(Z)V", value); }
+            return IExecuteWithSignature<Android.View.View>("focusSearch", "(I)Landroid/view/View;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getFocusable()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getRootView()"/>
         /// </summary>
-        public int Focusable
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetRootView()
         {
-            get { return IExecuteWithSignature<int>("getFocusable", "()I"); }
+            return IExecuteWithSignature<Android.View.View>("getRootView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getForeground()"/> <see href="https://developer.android.com/reference/android/view/View.html#setForeground(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#keyboardNavigationClusterSearch(android.view.View,int)"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Foreground
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View KeyboardNavigationClusterSearch(Android.View.View arg0, int arg1)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getForeground", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setForeground", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecute<Android.View.View>("keyboardNavigationClusterSearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getForegroundGravity()"/> <see href="https://developer.android.com/reference/android/view/View.html#setForegroundGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityDelegate()"/>
         /// </summary>
-        public int ForegroundGravity
+        /// <returns><see cref="Android.View.View.AccessibilityDelegate"/></returns>
+        public Android.View.View.AccessibilityDelegate GetAccessibilityDelegate()
         {
-            get { return IExecuteWithSignature<int>("getForegroundGravity", "()I"); } set { IExecuteWithSignature("setForegroundGravity", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.View.AccessibilityDelegate>("getAccessibilityDelegate", "()Landroid/view/View$AccessibilityDelegate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getForegroundTintBlendMode()"/> <see href="https://developer.android.com/reference/android/view/View.html#setForegroundTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getOnFocusChangeListener()"/>
         /// </summary>
-        public Android.Graphics.BlendMode ForegroundTintBlendMode
+        /// <returns><see cref="Android.View.View.OnFocusChangeListener"/></returns>
+        public Android.View.View.OnFocusChangeListener GetOnFocusChangeListener()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getForegroundTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setForegroundTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.View.View.OnFocusChangeListener>("getOnFocusChangeListener", "()Landroid/view/View$OnFocusChangeListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getForegroundTintList()"/> <see href="https://developer.android.com/reference/android/view/View.html#setForegroundTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getOnFocusChangeListener()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList ForegroundTintList
+        /// <returns><see cref="Android.View.View.OnFocusChangeListener"/></returns>
+        public Android.View.View.OnFocusChangeListener GetOnFocusChangeListenerDirect()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getForegroundTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setForegroundTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.View.View.OnFocusChangeListenerDirect, Android.View.View.OnFocusChangeListener>("getOnFocusChangeListener", "()Landroid/view/View$OnFocusChangeListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getForegroundTintMode()"/> <see href="https://developer.android.com/reference/android/view/View.html#setForegroundTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getLayoutParams()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode ForegroundTintMode
+        /// <returns><see cref="Android.View.ViewGroup.LayoutParams"/></returns>
+        public Android.View.ViewGroup.LayoutParams GetLayoutParams()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getForegroundTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setForegroundTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Android.View.ViewGroup.LayoutParams>("getLayoutParams", "()Landroid/view/ViewGroup$LayoutParams;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityDelegate()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getOutlineProvider()"/>
         /// </summary>
-        public Android.View.View.AccessibilityDelegate GetAccessibilityDelegate
+        /// <returns><see cref="Android.View.ViewOutlineProvider"/></returns>
+        public Android.View.ViewOutlineProvider GetOutlineProvider()
         {
-            get { return IExecuteWithSignature<Android.View.View.AccessibilityDelegate>("getAccessibilityDelegate", "()Landroid/view/View$AccessibilityDelegate;"); }
+            return IExecuteWithSignature<Android.View.ViewOutlineProvider>("getOutlineProvider", "()Landroid/view/ViewOutlineProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getOnFocusChangeListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getOverlay()"/>
         /// </summary>
-        public Android.View.View.OnFocusChangeListener GetOnFocusChangeListener
+        /// <returns><see cref="Android.View.ViewOverlay"/></returns>
+        public Android.View.ViewOverlay GetOverlay()
         {
-            get { return IExecuteWithSignature<Android.View.View.OnFocusChangeListener>("getOnFocusChangeListener", "()Landroid/view/View$OnFocusChangeListener;"); }
+            return IExecuteWithSignature<Android.View.ViewOverlay>("getOverlay", "()Landroid/view/ViewOverlay;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandler()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getParentForAccessibility()"/>
         /// </summary>
-        public Android.Os.Handler Handler
+        /// <returns><see cref="Android.View.ViewParent"/></returns>
+        public Android.View.ViewParent GetParentForAccessibility()
         {
-            get { return IExecuteWithSignature<Android.Os.Handler>("getHandler", "()Landroid/os/Handler;"); }
+            return IExecuteWithSignature<Android.View.ViewParent>("getParentForAccessibility", "()Landroid/view/ViewParent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingBoundsOffsetBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#animate()"/>
         /// </summary>
-        public float HandwritingBoundsOffsetBottom
+        /// <returns><see cref="Android.View.ViewPropertyAnimator"/></returns>
+        public Android.View.ViewPropertyAnimator Animate()
         {
-            get { return IExecuteWithSignature<float>("getHandwritingBoundsOffsetBottom", "()F"); }
+            return IExecuteWithSignature<Android.View.ViewPropertyAnimator>("animate", "()Landroid/view/ViewPropertyAnimator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingBoundsOffsetLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getViewTreeObserver()"/>
         /// </summary>
-        public float HandwritingBoundsOffsetLeft
+        /// <returns><see cref="Android.View.ViewTreeObserver"/></returns>
+        public Android.View.ViewTreeObserver GetViewTreeObserver()
         {
-            get { return IExecuteWithSignature<float>("getHandwritingBoundsOffsetLeft", "()F"); }
+            return IExecuteWithSignature<Android.View.ViewTreeObserver>("getViewTreeObserver", "()Landroid/view/ViewTreeObserver;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingBoundsOffsetRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowId()"/>
         /// </summary>
-        public float HandwritingBoundsOffsetRight
+        /// <returns><see cref="Android.View.WindowId"/></returns>
+        public Android.View.WindowId GetWindowId()
         {
-            get { return IExecuteWithSignature<float>("getHandwritingBoundsOffsetRight", "()F"); }
+            return IExecuteWithSignature<Android.View.WindowId>("getWindowId", "()Landroid/view/WindowId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingBoundsOffsetTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#computeSystemWindowInsets(android.view.WindowInsets,android.graphics.Rect)"/>
         /// </summary>
-        public float HandwritingBoundsOffsetTop
+        /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
+        /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
+        /// <returns><see cref="Android.View.WindowInsets"/></returns>
+        public Android.View.WindowInsets ComputeSystemWindowInsets(Android.View.WindowInsets arg0, Android.Graphics.Rect arg1)
         {
-            get { return IExecuteWithSignature<float>("getHandwritingBoundsOffsetTop", "()F"); }
+            return IExecute<Android.View.WindowInsets>("computeSystemWindowInsets", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingDelegatorCallback()"/> <see href="https://developer.android.com/reference/android/view/View.html#setHandwritingDelegatorCallback(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchApplyWindowInsets(android.view.WindowInsets)"/>
         /// </summary>
-        public Java.Lang.Runnable HandwritingDelegatorCallback
+        /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
+        /// <returns><see cref="Android.View.WindowInsets"/></returns>
+        public Android.View.WindowInsets DispatchApplyWindowInsets(Android.View.WindowInsets arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.Runnable>("getHandwritingDelegatorCallback", "()Ljava/lang/Runnable;"); } set { IExecuteWithSignature("setHandwritingDelegatorCallback", "(Ljava/lang/Runnable;)V", value); }
+            return IExecuteWithSignature<Android.View.WindowInsets>("dispatchApplyWindowInsets", "(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchWindowInsetsAnimationProgress(android.view.WindowInsets,java.util.List)"/>
         /// </summary>
-        public int Height
+        /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
+        /// <param name="arg1"><see cref="Java.Util.List"/></param>
+        /// <returns><see cref="Android.View.WindowInsets"/></returns>
+        public Android.View.WindowInsets DispatchWindowInsetsAnimationProgress(Android.View.WindowInsets arg0, Java.Util.List<Android.View.WindowInsetsAnimation> arg1)
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecute<Android.View.WindowInsets>("dispatchWindowInsetsAnimationProgress", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHorizontalFadingEdgeLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getRootWindowInsets()"/>
         /// </summary>
-        public int HorizontalFadingEdgeLength
+        /// <returns><see cref="Android.View.WindowInsets"/></returns>
+        public Android.View.WindowInsets GetRootWindowInsets()
         {
-            get { return IExecuteWithSignature<int>("getHorizontalFadingEdgeLength", "()I"); }
+            return IExecuteWithSignature<Android.View.WindowInsets>("getRootWindowInsets", "()Landroid/view/WindowInsets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHorizontalScrollbarThumbDrawable()"/> <see href="https://developer.android.com/reference/android/view/View.html#setHorizontalScrollbarThumbDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onApplyWindowInsets(android.view.WindowInsets)"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable HorizontalScrollbarThumbDrawable
+        /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
+        /// <returns><see cref="Android.View.WindowInsets"/></returns>
+        public Android.View.WindowInsets OnApplyWindowInsets(Android.View.WindowInsets arg0)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getHorizontalScrollbarThumbDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setHorizontalScrollbarThumbDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.View.WindowInsets>("onApplyWindowInsets", "(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHorizontalScrollbarTrackDrawable()"/> <see href="https://developer.android.com/reference/android/view/View.html#setHorizontalScrollbarTrackDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchWindowInsetsAnimationStart(android.view.WindowInsetsAnimation,android.view.WindowInsetsAnimation.Bounds)"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable HorizontalScrollbarTrackDrawable
+        /// <param name="arg0"><see cref="Android.View.WindowInsetsAnimation"/></param>
+        /// <param name="arg1"><see cref="Android.View.WindowInsetsAnimation.Bounds"/></param>
+        /// <returns><see cref="Android.View.WindowInsetsAnimation.Bounds"/></returns>
+        public Android.View.WindowInsetsAnimation.Bounds DispatchWindowInsetsAnimationStart(Android.View.WindowInsetsAnimation arg0, Android.View.WindowInsetsAnimation.Bounds arg1)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getHorizontalScrollbarTrackDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setHorizontalScrollbarTrackDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecute<Android.View.WindowInsetsAnimation.Bounds>("dispatchWindowInsetsAnimationStart", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getId()"/> <see href="https://developer.android.com/reference/android/view/View.html#setId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowInsetsController()"/>
         /// </summary>
-        public int Id
+        /// <returns><see cref="Android.View.WindowInsetsController"/></returns>
+        public Android.View.WindowInsetsController GetWindowInsetsController()
         {
-            get { return IExecuteWithSignature<int>("getId", "()I"); } set { IExecuteWithSignature("setId", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.WindowInsetsController>("getWindowInsetsController", "()Landroid/view/WindowInsetsController;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getImportantForAccessibility()"/> <see href="https://developer.android.com/reference/android/view/View.html#setImportantForAccessibility(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#callOnClick()"/>
         /// </summary>
-        public int ImportantForAccessibility
+        /// <returns><see cref="bool"/></returns>
+        public bool CallOnClick()
         {
-            get { return IExecuteWithSignature<int>("getImportantForAccessibility", "()I"); } set { IExecuteWithSignature("setImportantForAccessibility", "(I)V", value); }
+            return IExecuteWithSignature<bool>("callOnClick", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getImportantForAutofill()"/> <see href="https://developer.android.com/reference/android/view/View.html#setImportantForAutofill(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#canResolveLayoutDirection()"/>
         /// </summary>
-        public int ImportantForAutofill
+        /// <returns><see cref="bool"/></returns>
+        public bool CanResolveLayoutDirection()
         {
-            get { return IExecuteWithSignature<int>("getImportantForAutofill", "()I"); } set { IExecuteWithSignature("setImportantForAutofill", "(I)V", value); }
+            return IExecuteWithSignature<bool>("canResolveLayoutDirection", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getImportantForContentCapture()"/> <see href="https://developer.android.com/reference/android/view/View.html#setImportantForContentCapture(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#canResolveTextAlignment()"/>
         /// </summary>
-        public int ImportantForContentCapture
+        /// <returns><see cref="bool"/></returns>
+        public bool CanResolveTextAlignment()
         {
-            get { return IExecuteWithSignature<int>("getImportantForContentCapture", "()I"); } set { IExecuteWithSignature("setImportantForContentCapture", "(I)V", value); }
+            return IExecuteWithSignature<bool>("canResolveTextAlignment", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getKeepScreenOn()"/> <see href="https://developer.android.com/reference/android/view/View.html#setKeepScreenOn(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#canResolveTextDirection()"/>
         /// </summary>
-        public bool KeepScreenOn
+        /// <returns><see cref="bool"/></returns>
+        public bool CanResolveTextDirection()
         {
-            get { return IExecuteWithSignature<bool>("getKeepScreenOn", "()Z"); } set { IExecuteWithSignature("setKeepScreenOn", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("canResolveTextDirection", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getKeyDispatcherState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#canScrollHorizontally(int)"/>
         /// </summary>
-        public Android.View.KeyEvent.DispatcherState KeyDispatcherState
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool CanScrollHorizontally(int arg0)
         {
-            get { return IExecuteWithSignature<Android.View.KeyEvent.DispatcherState>("getKeyDispatcherState", "()Landroid/view/KeyEvent$DispatcherState;"); }
+            return IExecuteWithSignature<bool>("canScrollHorizontally", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getLabelFor()"/> <see href="https://developer.android.com/reference/android/view/View.html#setLabelFor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#canScrollVertically(int)"/>
         /// </summary>
-        public int LabelFor
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool CanScrollVertically(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getLabelFor", "()I"); } set { IExecuteWithSignature("setLabelFor", "(I)V", value); }
+            return IExecuteWithSignature<bool>("canScrollVertically", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getLayerType()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#checkInputConnectionProxy(android.view.View)"/>
         /// </summary>
-        public int LayerType
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool CheckInputConnectionProxy(Android.View.View arg0)
         {
-            get { return IExecuteWithSignature<int>("getLayerType", "()I"); }
+            return IExecuteWithSignature<bool>("checkInputConnectionProxy", "(Landroid/view/View;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getLayoutDirection()"/> <see href="https://developer.android.com/reference/android/view/View.html#setLayoutDirection(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchCapturedPointerEvent(android.view.MotionEvent)"/>
         /// </summary>
-        public int LayoutDirection
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchCapturedPointerEvent(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getLayoutDirection", "()I"); } set { IExecuteWithSignature("setLayoutDirection", "(I)V", value); }
+            return IExecuteWithSignature<bool>("dispatchCapturedPointerEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getLayoutParams()"/> <see href="https://developer.android.com/reference/android/view/View.html#setLayoutParams(android.view.ViewGroup.LayoutParams)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchDragEvent(android.view.DragEvent)"/>
         /// </summary>
-        public Android.View.ViewGroup.LayoutParams LayoutParams
+        /// <param name="arg0"><see cref="Android.View.DragEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchDragEvent(Android.View.DragEvent arg0)
         {
-            get { return IExecuteWithSignature<Android.View.ViewGroup.LayoutParams>("getLayoutParams", "()Landroid/view/ViewGroup$LayoutParams;"); } set { IExecuteWithSignature("setLayoutParams", "(Landroid/view/ViewGroup$LayoutParams;)V", value); }
+            return IExecuteWithSignature<bool>("dispatchDragEvent", "(Landroid/view/DragEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getLeft()"/> <see href="https://developer.android.com/reference/android/view/View.html#setLeft(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchGenericMotionEvent(android.view.MotionEvent)"/>
         /// </summary>
-        public int Left
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchGenericMotionEvent(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getLeft", "()I"); } set { IExecuteWithSignature("setLeft", "(I)V", value); }
+            return IExecuteWithSignature<bool>("dispatchGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getMatrix()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchKeyEvent(android.view.KeyEvent)"/>
         /// </summary>
-        public Android.Graphics.Matrix Matrix
+        /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchKeyEvent(Android.View.KeyEvent arg0)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Matrix>("getMatrix", "()Landroid/graphics/Matrix;"); }
+            return IExecuteWithSignature<bool>("dispatchKeyEvent", "(Landroid/view/KeyEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchKeyEventPreIme(android.view.KeyEvent)"/>
         /// </summary>
-        public int MeasuredHeight
+        /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchKeyEventPreIme(Android.View.KeyEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getMeasuredHeight", "()I"); }
+            return IExecuteWithSignature<bool>("dispatchKeyEventPreIme", "(Landroid/view/KeyEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredHeightAndState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchKeyShortcutEvent(android.view.KeyEvent)"/>
         /// </summary>
-        public int MeasuredHeightAndState
+        /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchKeyShortcutEvent(Android.View.KeyEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getMeasuredHeightAndState", "()I"); }
+            return IExecuteWithSignature<bool>("dispatchKeyShortcutEvent", "(Landroid/view/KeyEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedFling(float,float,boolean)"/>
         /// </summary>
-        public int MeasuredState
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <param name="arg2"><see cref="bool"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchNestedFling(float arg0, float arg1, bool arg2)
         {
-            get { return IExecuteWithSignature<int>("getMeasuredState", "()I"); }
+            return IExecute<bool>("dispatchNestedFling", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedPreFling(float,float)"/>
         /// </summary>
-        public int MeasuredWidth
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchNestedPreFling(float arg0, float arg1)
         {
-            get { return IExecuteWithSignature<int>("getMeasuredWidth", "()I"); }
+            return IExecute<bool>("dispatchNestedPreFling", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredWidthAndState()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedPrePerformAccessibilityAction(int,android.os.Bundle)"/>
         /// </summary>
-        public int MeasuredWidthAndState
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchNestedPrePerformAccessibilityAction(int arg0, Android.Os.Bundle arg1)
         {
-            get { return IExecuteWithSignature<int>("getMeasuredWidthAndState", "()I"); }
+            return IExecute<bool>("dispatchNestedPrePerformAccessibilityAction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getMinimumHeight()"/> <see href="https://developer.android.com/reference/android/view/View.html#setMinimumHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedPreScroll(int,int,int[],int[])"/>
         /// </summary>
-        public int MinimumHeight
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchNestedPreScroll(int arg0, int arg1, int[] arg2, int[] arg3)
         {
-            get { return IExecuteWithSignature<int>("getMinimumHeight", "()I"); } set { IExecuteWithSignature("setMinimumHeight", "(I)V", value); }
+            return IExecute<bool>("dispatchNestedPreScroll", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getMinimumWidth()"/> <see href="https://developer.android.com/reference/android/view/View.html#setMinimumWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedScroll(int,int,int,int,int[])"/>
         /// </summary>
-        public int MinimumWidth
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchNestedScroll(int arg0, int arg1, int arg2, int arg3, int[] arg4)
         {
-            get { return IExecuteWithSignature<int>("getMinimumWidth", "()I"); } set { IExecuteWithSignature("setMinimumWidth", "(I)V", value); }
+            return IExecute<bool>("dispatchNestedScroll", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextClusterForwardId()"/> <see href="https://developer.android.com/reference/android/view/View.html#setNextClusterForwardId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent)"/>
         /// </summary>
-        public int NextClusterForwardId
+        /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchPopulateAccessibilityEvent(Android.View.Accessibility.AccessibilityEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getNextClusterForwardId", "()I"); } set { IExecuteWithSignature("setNextClusterForwardId", "(I)V", value); }
+            return IExecuteWithSignature<bool>("dispatchPopulateAccessibilityEvent", "(Landroid/view/accessibility/AccessibilityEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusDownId()"/> <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusDownId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchTouchEvent(android.view.MotionEvent)"/>
         /// </summary>
-        public int NextFocusDownId
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchTouchEvent(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getNextFocusDownId", "()I"); } set { IExecuteWithSignature("setNextFocusDownId", "(I)V", value); }
+            return IExecuteWithSignature<bool>("dispatchTouchEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusForwardId()"/> <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusForwardId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchTrackballEvent(android.view.MotionEvent)"/>
         /// </summary>
-        public int NextFocusForwardId
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchTrackballEvent(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getNextFocusForwardId", "()I"); } set { IExecuteWithSignature("setNextFocusForwardId", "(I)V", value); }
+            return IExecuteWithSignature<bool>("dispatchTrackballEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusLeftId()"/> <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusLeftId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchUnhandledMove(android.view.View,int)"/>
         /// </summary>
-        public int NextFocusLeftId
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool DispatchUnhandledMove(Android.View.View arg0, int arg1)
         {
-            get { return IExecuteWithSignature<int>("getNextFocusLeftId", "()I"); } set { IExecuteWithSignature("setNextFocusLeftId", "(I)V", value); }
+            return IExecute<bool>("dispatchUnhandledMove", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusRightId()"/> <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusRightId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#gatherTransparentRegion(android.graphics.Region)"/>
         /// </summary>
-        public int NextFocusRightId
+        /// <param name="arg0"><see cref="Android.Graphics.Region"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool GatherTransparentRegion(Android.Graphics.Region arg0)
         {
-            get { return IExecuteWithSignature<int>("getNextFocusRightId", "()I"); } set { IExecuteWithSignature("setNextFocusRightId", "(I)V", value); }
+            return IExecuteWithSignature<bool>("gatherTransparentRegion", "(Landroid/graphics/Region;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusUpId()"/> <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusUpId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getClipBounds(android.graphics.Rect)"/>
         /// </summary>
-        public int NextFocusUpId
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetClipBounds(Android.Graphics.Rect arg0)
         {
-            get { return IExecuteWithSignature<int>("getNextFocusUpId", "()I"); } set { IExecuteWithSignature("setNextFocusUpId", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getClipBounds", "(Landroid/graphics/Rect;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getOutlineAmbientShadowColor()"/> <see href="https://developer.android.com/reference/android/view/View.html#setOutlineAmbientShadowColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getFilterTouchesWhenObscured()"/>
         /// </summary>
-        public int OutlineAmbientShadowColor
+        /// <returns><see cref="bool"/></returns>
+        public bool GetFilterTouchesWhenObscured()
         {
-            get { return IExecuteWithSignature<int>("getOutlineAmbientShadowColor", "()I"); } set { IExecuteWithSignature("setOutlineAmbientShadowColor", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getFilterTouchesWhenObscured", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getOutlineProvider()"/> <see href="https://developer.android.com/reference/android/view/View.html#setOutlineProvider(android.view.ViewOutlineProvider)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getFitsSystemWindows()"/>
         /// </summary>
-        public Android.View.ViewOutlineProvider OutlineProvider
+        /// <returns><see cref="bool"/></returns>
+        public bool GetFitsSystemWindows()
         {
-            get { return IExecuteWithSignature<Android.View.ViewOutlineProvider>("getOutlineProvider", "()Landroid/view/ViewOutlineProvider;"); } set { IExecuteWithSignature("setOutlineProvider", "(Landroid/view/ViewOutlineProvider;)V", value); }
+            return IExecuteWithSignature<bool>("getFitsSystemWindows", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getOutlineSpotShadowColor()"/> <see href="https://developer.android.com/reference/android/view/View.html#setOutlineSpotShadowColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getGlobalVisibleRect(android.graphics.Rect,android.graphics.Point)"/>
         /// </summary>
-        public int OutlineSpotShadowColor
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        /// <param name="arg1"><see cref="Android.Graphics.Point"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetGlobalVisibleRect(Android.Graphics.Rect arg0, Android.Graphics.Point arg1)
         {
-            get { return IExecuteWithSignature<int>("getOutlineSpotShadowColor", "()I"); } set { IExecuteWithSignature("setOutlineSpotShadowColor", "(I)V", value); }
+            return IExecute<bool>("getGlobalVisibleRect", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getOverlay()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getKeepScreenOn()"/>
         /// </summary>
-        public Android.View.ViewOverlay Overlay
+        /// <returns><see cref="bool"/></returns>
+        public bool GetKeepScreenOn()
         {
-            get { return IExecuteWithSignature<Android.View.ViewOverlay>("getOverlay", "()Landroid/view/ViewOverlay;"); }
+            return IExecuteWithSignature<bool>("getKeepScreenOn", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getOverScrollMode()"/> <see href="https://developer.android.com/reference/android/view/View.html#setOverScrollMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasExplicitFocusable()"/>
         /// </summary>
-        public int OverScrollMode
+        /// <returns><see cref="bool"/></returns>
+        public bool HasExplicitFocusable()
         {
-            get { return IExecuteWithSignature<int>("getOverScrollMode", "()I"); } set { IExecuteWithSignature("setOverScrollMode", "(I)V", value); }
+            return IExecuteWithSignature<bool>("hasExplicitFocusable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasFocus()"/>
         /// </summary>
-        public int PaddingBottom
+        /// <returns><see cref="bool"/></returns>
+        public bool HasFocus()
         {
-            get { return IExecuteWithSignature<int>("getPaddingBottom", "()I"); }
+            return IExecuteWithSignature<bool>("hasFocus", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasFocusable()"/>
         /// </summary>
-        public int PaddingEnd
+        /// <returns><see cref="bool"/></returns>
+        public bool HasFocusable()
         {
-            get { return IExecuteWithSignature<int>("getPaddingEnd", "()I"); }
+            return IExecuteWithSignature<bool>("hasFocusable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasNestedScrollingParent()"/>
         /// </summary>
-        public int PaddingLeft
+        /// <returns><see cref="bool"/></returns>
+        public bool HasNestedScrollingParent()
         {
-            get { return IExecuteWithSignature<int>("getPaddingLeft", "()I"); }
+            return IExecuteWithSignature<bool>("hasNestedScrollingParent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasOnClickListeners()"/>
         /// </summary>
-        public int PaddingRight
+        /// <returns><see cref="bool"/></returns>
+        public bool HasOnClickListeners()
         {
-            get { return IExecuteWithSignature<int>("getPaddingRight", "()I"); }
+            return IExecuteWithSignature<bool>("hasOnClickListeners", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasOnLongClickListeners()"/>
         /// </summary>
-        public int PaddingStart
+        /// <returns><see cref="bool"/></returns>
+        public bool HasOnLongClickListeners()
         {
-            get { return IExecuteWithSignature<int>("getPaddingStart", "()I"); }
+            return IExecuteWithSignature<bool>("hasOnLongClickListeners", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasOverlappingRendering()"/>
         /// </summary>
-        public int PaddingTop
+        /// <returns><see cref="bool"/></returns>
+        public bool HasOverlappingRendering()
         {
-            get { return IExecuteWithSignature<int>("getPaddingTop", "()I"); }
+            return IExecuteWithSignature<bool>("hasOverlappingRendering", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasPointerCapture()"/>
         /// </summary>
-        public Android.View.ViewParent Parent
+        /// <returns><see cref="bool"/></returns>
+        public bool HasPointerCapture()
         {
-            get { return IExecuteWithSignature<Android.View.ViewParent>("getParent", "()Landroid/view/ViewParent;"); }
+            return IExecuteWithSignature<bool>("hasPointerCapture", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getParentForAccessibility()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasTransientState()"/>
         /// </summary>
-        public Android.View.ViewParent ParentForAccessibility
+        /// <returns><see cref="bool"/></returns>
+        public bool HasTransientState()
         {
-            get { return IExecuteWithSignature<Android.View.ViewParent>("getParentForAccessibility", "()Landroid/view/ViewParent;"); }
+            return IExecuteWithSignature<bool>("hasTransientState", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPivotX()"/> <see href="https://developer.android.com/reference/android/view/View.html#setPivotX(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#hasWindowFocus()"/>
         /// </summary>
-        public float PivotX
+        /// <returns><see cref="bool"/></returns>
+        public bool HasWindowFocus()
         {
-            get { return IExecuteWithSignature<float>("getPivotX", "()F"); } set { IExecuteWithSignature("setPivotX", "(F)V", value); }
+            return IExecuteWithSignature<bool>("hasWindowFocus", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPivotY()"/> <see href="https://developer.android.com/reference/android/view/View.html#setPivotY(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isAccessibilityDataSensitive()"/>
         /// </summary>
-        public float PivotY
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAccessibilityDataSensitive()
         {
-            get { return IExecuteWithSignature<float>("getPivotY", "()F"); } set { IExecuteWithSignature("setPivotY", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isAccessibilityDataSensitive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPointerIcon()"/> <see href="https://developer.android.com/reference/android/view/View.html#setPointerIcon(android.view.PointerIcon)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isAccessibilityFocused()"/>
         /// </summary>
-        public Android.View.PointerIcon PointerIcon
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAccessibilityFocused()
         {
-            get { return IExecuteWithSignature<Android.View.PointerIcon>("getPointerIcon", "()Landroid/view/PointerIcon;"); } set { IExecuteWithSignature("setPointerIcon", "(Landroid/view/PointerIcon;)V", value); }
+            return IExecuteWithSignature<bool>("isAccessibilityFocused", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getPreferKeepClearRects()"/> <see href="https://developer.android.com/reference/android/view/View.html#setPreferKeepClearRects(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isAccessibilityHeading()"/>
         /// </summary>
-        public Java.Util.List<Android.Graphics.Rect> PreferKeepClearRects
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAccessibilityHeading()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Graphics.Rect>>("getPreferKeepClearRects", "()Ljava/util/List;"); } set { IExecuteWithSignature("setPreferKeepClearRects", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<bool>("isAccessibilityHeading", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getReceiveContentMimeTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isActivated()"/>
         /// </summary>
-        public Java.Lang.String[] ReceiveContentMimeTypes
+        /// <returns><see cref="bool"/></returns>
+        public bool IsActivated()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getReceiveContentMimeTypes", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isActivated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getResources()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isAttachedToWindow()"/>
         /// </summary>
-        public Android.Content.Res.Resources Resources
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAttachedToWindow()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources>("getResources", "()Landroid/content/res/Resources;"); }
+            return IExecuteWithSignature<bool>("isAttachedToWindow", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getRevealOnFocusHint()"/> <see href="https://developer.android.com/reference/android/view/View.html#setRevealOnFocusHint(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isAutoHandwritingEnabled()"/>
         /// </summary>
-        public bool RevealOnFocusHint
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAutoHandwritingEnabled()
         {
-            get { return IExecuteWithSignature<bool>("getRevealOnFocusHint", "()Z"); } set { IExecuteWithSignature("setRevealOnFocusHint", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("isAutoHandwritingEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getRight()"/> <see href="https://developer.android.com/reference/android/view/View.html#setRight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isClickable()"/>
         /// </summary>
-        public int Right
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClickable()
         {
-            get { return IExecuteWithSignature<int>("getRight", "()I"); } set { IExecuteWithSignature("setRight", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isClickable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getRootSurfaceControl()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isContextClickable()"/>
         /// </summary>
-        public Android.View.AttachedSurfaceControl RootSurfaceControl
+        /// <returns><see cref="bool"/></returns>
+        public bool IsContextClickable()
         {
-            get { return IExecuteWithSignature<Android.View.AttachedSurfaceControl>("getRootSurfaceControl", "()Landroid/view/AttachedSurfaceControl;"); }
+            return IExecuteWithSignature<bool>("isContextClickable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getRootView()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isCredential()"/>
         /// </summary>
-        public Android.View.View RootView
+        /// <returns><see cref="bool"/></returns>
+        public bool IsCredential()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getRootView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<bool>("isCredential", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getRootWindowInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isDirty()"/>
         /// </summary>
-        public Android.View.WindowInsets RootWindowInsets
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDirty()
         {
-            get { return IExecuteWithSignature<Android.View.WindowInsets>("getRootWindowInsets", "()Landroid/view/WindowInsets;"); }
+            return IExecuteWithSignature<bool>("isDirty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getRotation()"/> <see href="https://developer.android.com/reference/android/view/View.html#setRotation(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isDrawingCacheEnabled()"/>
         /// </summary>
-        public float Rotation
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsDrawingCacheEnabled()
         {
-            get { return IExecuteWithSignature<float>("getRotation", "()F"); } set { IExecuteWithSignature("setRotation", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isDrawingCacheEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getRotationX()"/> <see href="https://developer.android.com/reference/android/view/View.html#setRotationX(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isDuplicateParentStateEnabled()"/>
         /// </summary>
-        public float RotationX
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDuplicateParentStateEnabled()
         {
-            get { return IExecuteWithSignature<float>("getRotationX", "()F"); } set { IExecuteWithSignature("setRotationX", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isDuplicateParentStateEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getRotationY()"/> <see href="https://developer.android.com/reference/android/view/View.html#setRotationY(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isEnabled()"/>
         /// </summary>
-        public float RotationY
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEnabled()
         {
-            get { return IExecuteWithSignature<float>("getRotationY", "()F"); } set { IExecuteWithSignature("setRotationY", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScaleX()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScaleX(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isFocused()"/>
         /// </summary>
-        public float ScaleX
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFocused()
         {
-            get { return IExecuteWithSignature<float>("getScaleX", "()F"); } set { IExecuteWithSignature("setScaleX", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isFocused", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScaleY()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScaleY(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isForceDarkAllowed()"/>
         /// </summary>
-        public float ScaleY
+        /// <returns><see cref="bool"/></returns>
+        public bool IsForceDarkAllowed()
         {
-            get { return IExecuteWithSignature<float>("getScaleY", "()F"); } set { IExecuteWithSignature("setScaleY", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isForceDarkAllowed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollBarDefaultDelayBeforeFade()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScrollBarDefaultDelayBeforeFade(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isHandwritingDelegate()"/>
         /// </summary>
-        public int ScrollBarDefaultDelayBeforeFade
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHandwritingDelegate()
         {
-            get { return IExecuteWithSignature<int>("getScrollBarDefaultDelayBeforeFade", "()I"); } set { IExecuteWithSignature("setScrollBarDefaultDelayBeforeFade", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isHandwritingDelegate", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollBarFadeDuration()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScrollBarFadeDuration(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isHapticFeedbackEnabled()"/>
         /// </summary>
-        public int ScrollBarFadeDuration
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHapticFeedbackEnabled()
         {
-            get { return IExecuteWithSignature<int>("getScrollBarFadeDuration", "()I"); } set { IExecuteWithSignature("setScrollBarFadeDuration", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isHapticFeedbackEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollBarSize()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScrollBarSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isHardwareAccelerated()"/>
         /// </summary>
-        public int ScrollBarSize
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHardwareAccelerated()
         {
-            get { return IExecuteWithSignature<int>("getScrollBarSize", "()I"); } set { IExecuteWithSignature("setScrollBarSize", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isHardwareAccelerated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollBarStyle()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScrollBarStyle(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isHorizontalFadingEdgeEnabled()"/>
         /// </summary>
-        public int ScrollBarStyle
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHorizontalFadingEdgeEnabled()
         {
-            get { return IExecuteWithSignature<int>("getScrollBarStyle", "()I"); } set { IExecuteWithSignature("setScrollBarStyle", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isHorizontalFadingEdgeEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollCaptureHint()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScrollCaptureHint(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isHorizontalScrollBarEnabled()"/>
         /// </summary>
-        public int ScrollCaptureHint
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHorizontalScrollBarEnabled()
         {
-            get { return IExecuteWithSignature<int>("getScrollCaptureHint", "()I"); } set { IExecuteWithSignature("setScrollCaptureHint", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isHorizontalScrollBarEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollIndicators()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScrollIndicators(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isHovered()"/>
         /// </summary>
-        public int ScrollIndicators
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHovered()
         {
-            get { return IExecuteWithSignature<int>("getScrollIndicators", "()I"); } set { IExecuteWithSignature("setScrollIndicators", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isHovered", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollX()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScrollX(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isImportantForAccessibility()"/>
         /// </summary>
-        public int ScrollX
+        /// <returns><see cref="bool"/></returns>
+        public bool IsImportantForAccessibility()
         {
-            get { return IExecuteWithSignature<int>("getScrollX", "()I"); } set { IExecuteWithSignature("setScrollX", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isImportantForAccessibility", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollY()"/> <see href="https://developer.android.com/reference/android/view/View.html#setScrollY(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isInEditMode()"/>
         /// </summary>
-        public int ScrollY
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInEditMode()
         {
-            get { return IExecuteWithSignature<int>("getScrollY", "()I"); } set { IExecuteWithSignature("setScrollY", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isInEditMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getSolidColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isInLayout()"/>
         /// </summary>
-        public int SolidColor
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInLayout()
         {
-            get { return IExecuteWithSignature<int>("getSolidColor", "()I"); }
+            return IExecuteWithSignature<bool>("isInLayout", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getSourceLayoutResId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isInTouchMode()"/>
         /// </summary>
-        public int SourceLayoutResId
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInTouchMode()
         {
-            get { return IExecuteWithSignature<int>("getSourceLayoutResId", "()I"); }
+            return IExecuteWithSignature<bool>("isInTouchMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getStateDescription()"/> <see href="https://developer.android.com/reference/android/view/View.html#setStateDescription(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isLaidOut()"/>
         /// </summary>
-        public Java.Lang.CharSequence StateDescription
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLaidOut()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getStateDescription", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setStateDescription", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<bool>("isLaidOut", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getStateListAnimator()"/> <see href="https://developer.android.com/reference/android/view/View.html#setStateListAnimator(android.animation.StateListAnimator)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isLayoutDirectionResolved()"/>
         /// </summary>
-        public Android.Animation.StateListAnimator StateListAnimator
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLayoutDirectionResolved()
         {
-            get { return IExecuteWithSignature<Android.Animation.StateListAnimator>("getStateListAnimator", "()Landroid/animation/StateListAnimator;"); } set { IExecuteWithSignature("setStateListAnimator", "(Landroid/animation/StateListAnimator;)V", value); }
+            return IExecuteWithSignature<bool>("isLayoutDirectionResolved", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getSystemGestureExclusionRects()"/> <see href="https://developer.android.com/reference/android/view/View.html#setSystemGestureExclusionRects(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isLayoutRequested()"/>
         /// </summary>
-        public Java.Util.List<Android.Graphics.Rect> SystemGestureExclusionRects
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLayoutRequested()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Graphics.Rect>>("getSystemGestureExclusionRects", "()Ljava/util/List;"); } set { IExecuteWithSignature("setSystemGestureExclusionRects", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<bool>("isLayoutRequested", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getSystemUiVisibility()"/> <see href="https://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isLongClickable()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SystemUiVisibility
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLongClickable()
         {
-            get { return IExecuteWithSignature<int>("getSystemUiVisibility", "()I"); } set { IExecuteWithSignature("setSystemUiVisibility", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isLongClickable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTag()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTag(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isNestedScrollingEnabled()"/>
         /// </summary>
-        public object Tag
+        /// <returns><see cref="bool"/></returns>
+        public bool IsNestedScrollingEnabled()
         {
-            get { return IExecuteWithSignature("getTag", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setTag", "(Ljava/lang/Object;)V", value); }
+            return IExecuteWithSignature<bool>("isNestedScrollingEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTextAlignment()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTextAlignment(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isOpaque()"/>
         /// </summary>
-        public int TextAlignment
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOpaque()
         {
-            get { return IExecuteWithSignature<int>("getTextAlignment", "()I"); } set { IExecuteWithSignature("setTextAlignment", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isOpaque", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTextDirection()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTextDirection(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isPaddingRelative()"/>
         /// </summary>
-        public int TextDirection
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPaddingRelative()
         {
-            get { return IExecuteWithSignature<int>("getTextDirection", "()I"); } set { IExecuteWithSignature("setTextDirection", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isPaddingRelative", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTooltipText()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTooltipText(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isPivotSet()"/>
         /// </summary>
-        public Java.Lang.CharSequence TooltipText
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPivotSet()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTooltipText", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setTooltipText", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<bool>("isPivotSet", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTop()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTop(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isPressed()"/>
         /// </summary>
-        public int Top
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPressed()
         {
-            get { return IExecuteWithSignature<int>("getTop", "()I"); } set { IExecuteWithSignature("setTop", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isPressed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTouchables()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isSaveEnabled()"/>
         /// </summary>
-        public Java.Util.ArrayList<Android.View.View> Touchables
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSaveEnabled()
         {
-            get { return IExecuteWithSignature<Java.Util.ArrayList<Android.View.View>>("getTouchables", "()Ljava/util/ArrayList;"); }
+            return IExecuteWithSignature<bool>("isSaveEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTouchDelegate()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTouchDelegate(android.view.TouchDelegate)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isSaveFromParentEnabled()"/>
         /// </summary>
-        public Android.View.TouchDelegate TouchDelegate
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSaveFromParentEnabled()
         {
-            get { return IExecuteWithSignature<Android.View.TouchDelegate>("getTouchDelegate", "()Landroid/view/TouchDelegate;"); } set { IExecuteWithSignature("setTouchDelegate", "(Landroid/view/TouchDelegate;)V", value); }
+            return IExecuteWithSignature<bool>("isSaveFromParentEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTransitionAlpha()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTransitionAlpha(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isScreenReaderFocusable()"/>
         /// </summary>
-        public float TransitionAlpha
+        /// <returns><see cref="bool"/></returns>
+        public bool IsScreenReaderFocusable()
         {
-            get { return IExecuteWithSignature<float>("getTransitionAlpha", "()F"); } set { IExecuteWithSignature("setTransitionAlpha", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isScreenReaderFocusable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTransitionName()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTransitionName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isScrollbarFadingEnabled()"/>
         /// </summary>
-        public Java.Lang.String TransitionName
+        /// <returns><see cref="bool"/></returns>
+        public bool IsScrollbarFadingEnabled()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTransitionName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setTransitionName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isScrollbarFadingEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTranslationX()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTranslationX(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isScrollContainer()"/>
         /// </summary>
-        public float TranslationX
+        /// <returns><see cref="bool"/></returns>
+        public bool IsScrollContainer()
         {
-            get { return IExecuteWithSignature<float>("getTranslationX", "()F"); } set { IExecuteWithSignature("setTranslationX", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isScrollContainer", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTranslationY()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTranslationY(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isSelected()"/>
         /// </summary>
-        public float TranslationY
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSelected()
         {
-            get { return IExecuteWithSignature<float>("getTranslationY", "()F"); } set { IExecuteWithSignature("setTranslationY", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isSelected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTranslationZ()"/> <see href="https://developer.android.com/reference/android/view/View.html#setTranslationZ(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isShown()"/>
         /// </summary>
-        public float TranslationZ
+        /// <returns><see cref="bool"/></returns>
+        public bool IsShown()
         {
-            get { return IExecuteWithSignature<float>("getTranslationZ", "()F"); } set { IExecuteWithSignature("setTranslationZ", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isShown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getUniqueDrawingId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isSoundEffectsEnabled()"/>
         /// </summary>
-        public long UniqueDrawingId
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSoundEffectsEnabled()
         {
-            get { return IExecuteWithSignature<long>("getUniqueDrawingId", "()J"); }
+            return IExecuteWithSignature<bool>("isSoundEffectsEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalFadingEdgeLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isTextAlignmentResolved()"/>
         /// </summary>
-        public int VerticalFadingEdgeLength
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTextAlignmentResolved()
         {
-            get { return IExecuteWithSignature<int>("getVerticalFadingEdgeLength", "()I"); }
+            return IExecuteWithSignature<bool>("isTextAlignmentResolved", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalScrollbarPosition()"/> <see href="https://developer.android.com/reference/android/view/View.html#setVerticalScrollbarPosition(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isTextDirectionResolved()"/>
         /// </summary>
-        public int VerticalScrollbarPosition
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTextDirectionResolved()
         {
-            get { return IExecuteWithSignature<int>("getVerticalScrollbarPosition", "()I"); } set { IExecuteWithSignature("setVerticalScrollbarPosition", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isTextDirectionResolved", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalScrollbarThumbDrawable()"/> <see href="https://developer.android.com/reference/android/view/View.html#setVerticalScrollbarThumbDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isVerticalFadingEdgeEnabled()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable VerticalScrollbarThumbDrawable
+        /// <returns><see cref="bool"/></returns>
+        public bool IsVerticalFadingEdgeEnabled()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getVerticalScrollbarThumbDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setVerticalScrollbarThumbDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<bool>("isVerticalFadingEdgeEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalScrollbarTrackDrawable()"/> <see href="https://developer.android.com/reference/android/view/View.html#setVerticalScrollbarTrackDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isVerticalScrollBarEnabled()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable VerticalScrollbarTrackDrawable
+        /// <returns><see cref="bool"/></returns>
+        public bool IsVerticalScrollBarEnabled()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getVerticalScrollbarTrackDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setVerticalScrollbarTrackDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<bool>("isVerticalScrollBarEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalScrollbarWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isVisibleToUserForAutofill(int)"/>
         /// </summary>
-        public int VerticalScrollbarWidth
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsVisibleToUserForAutofill(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getVerticalScrollbarWidth", "()I"); }
+            return IExecuteWithSignature<bool>("isVisibleToUserForAutofill", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getViewTranslationResponse()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onCapturedPointerEvent(android.view.MotionEvent)"/>
         /// </summary>
-        public Android.View.Translation.ViewTranslationResponse ViewTranslationResponse
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnCapturedPointerEvent(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<Android.View.Translation.ViewTranslationResponse>("getViewTranslationResponse", "()Landroid/view/translation/ViewTranslationResponse;"); }
+            return IExecuteWithSignature<bool>("onCapturedPointerEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getViewTreeObserver()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onCheckIsTextEditor()"/>
         /// </summary>
-        public Android.View.ViewTreeObserver ViewTreeObserver
+        /// <returns><see cref="bool"/></returns>
+        public bool OnCheckIsTextEditor()
         {
-            get { return IExecuteWithSignature<Android.View.ViewTreeObserver>("getViewTreeObserver", "()Landroid/view/ViewTreeObserver;"); }
+            return IExecuteWithSignature<bool>("onCheckIsTextEditor", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getVisibility()"/> <see href="https://developer.android.com/reference/android/view/View.html#setVisibility(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onDragEvent(android.view.DragEvent)"/>
         /// </summary>
-        public int Visibility
+        /// <param name="arg0"><see cref="Android.View.DragEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnDragEvent(Android.View.DragEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getVisibility", "()I"); } set { IExecuteWithSignature("setVisibility", "(I)V", value); }
+            return IExecuteWithSignature<bool>("onDragEvent", "(Landroid/view/DragEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onFilterTouchEventForSecurity(android.view.MotionEvent)"/>
         /// </summary>
-        public int Width
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnFilterTouchEventForSecurity(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<bool>("onFilterTouchEventForSecurity", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowId()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onGenericMotionEvent(android.view.MotionEvent)"/>
         /// </summary>
-        public Android.View.WindowId WindowId
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnGenericMotionEvent(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<Android.View.WindowId>("getWindowId", "()Landroid/view/WindowId;"); }
+            return IExecuteWithSignature<bool>("onGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowInsetsController()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onHoverEvent(android.view.MotionEvent)"/>
         /// </summary>
-        public Android.View.WindowInsetsController WindowInsetsController
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnHoverEvent(Android.View.MotionEvent arg0)
         {
-            get { return IExecuteWithSignature<Android.View.WindowInsetsController>("getWindowInsetsController", "()Landroid/view/WindowInsetsController;"); }
+            return IExecuteWithSignature<bool>("onHoverEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowSystemUiVisibility()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyDown(int,android.view.KeyEvent)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int WindowSystemUiVisibility
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyDown(int arg0, Android.View.KeyEvent arg1)
         {
-            get { return IExecuteWithSignature<int>("getWindowSystemUiVisibility", "()I"); }
+            return IExecute<bool>("onKeyDown", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowToken()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyLongPress(int,android.view.KeyEvent)"/>
         /// </summary>
-        public Android.Os.IBinder WindowToken
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyLongPress(int arg0, Android.View.KeyEvent arg1)
         {
-            get { return IExecuteWithSignature<Android.Os.IBinder>("getWindowToken", "()Landroid/os/IBinder;"); }
+            return IExecute<bool>("onKeyLongPress", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowVisibility()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyMultiple(int,int,android.view.KeyEvent)"/>
         /// </summary>
-        public int WindowVisibility
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyMultiple(int arg0, int arg1, Android.View.KeyEvent arg2)
         {
-            get { return IExecuteWithSignature<int>("getWindowVisibility", "()I"); }
+            return IExecute<bool>("onKeyMultiple", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getX()"/> <see href="https://developer.android.com/reference/android/view/View.html#setX(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyPreIme(int,android.view.KeyEvent)"/>
         /// </summary>
-        public float X
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyPreIme(int arg0, Android.View.KeyEvent arg1)
         {
-            get { return IExecuteWithSignature<float>("getX", "()F"); } set { IExecuteWithSignature("setX", "(F)V", value); }
+            return IExecute<bool>("onKeyPreIme", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getY()"/> <see href="https://developer.android.com/reference/android/view/View.html#setY(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyShortcut(int,android.view.KeyEvent)"/>
         /// </summary>
-        public float Y
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyShortcut(int arg0, Android.View.KeyEvent arg1)
         {
-            get { return IExecuteWithSignature<float>("getY", "()F"); } set { IExecuteWithSignature("setY", "(F)V", value); }
+            return IExecute<bool>("onKeyShortcut", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getZ()"/> <see href="https://developer.android.com/reference/android/view/View.html#setZ(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyUp(int,android.view.KeyEvent)"/>
         /// </summary>
-        public float Z
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyUp(int arg0, Android.View.KeyEvent arg1)
         {
-            get { return IExecuteWithSignature<float>("getZ", "()F"); } set { IExecuteWithSignature("setZ", "(F)V", value); }
+            return IExecute<bool>("onKeyUp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingCache(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onTouchEvent(android.view.MotionEvent)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
-        [System.Obsolete()]
-        public Android.Graphics.Bitmap GetDrawingCache(bool arg0)
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnTouchEvent(Android.View.MotionEvent arg0)
         {
-            return IExecuteWithSignature<Android.Graphics.Bitmap>("getDrawingCache", "(Z)Landroid/graphics/Bitmap;", arg0);
+            return IExecuteWithSignature<bool>("onTouchEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#createAccessibilityNodeInfo()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#onTrackballEvent(android.view.MotionEvent)"/>
         /// </summary>
-        /// <returns><see cref="Android.View.Accessibility.AccessibilityNodeInfo"/></returns>
-        public Android.View.Accessibility.AccessibilityNodeInfo CreateAccessibilityNodeInfo()
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnTrackballEvent(Android.View.MotionEvent arg0)
         {
-            return IExecuteWithSignature<Android.View.Accessibility.AccessibilityNodeInfo>("createAccessibilityNodeInfo", "()Landroid/view/accessibility/AccessibilityNodeInfo;");
+            return IExecuteWithSignature<bool>("onTrackballEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#startActionMode(android.view.ActionMode.Callback,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performAccessibilityAction(int,android.os.Bundle)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.ActionMode.Callback"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.ActionMode"/></returns>
-        public Android.View.ActionMode StartActionMode(Android.View.ActionMode.Callback arg0, int arg1)
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformAccessibilityAction(int arg0, Android.Os.Bundle arg1)
         {
-            return IExecute<Android.View.ActionMode>("startActionMode", arg0, arg1);
+            return IExecute<bool>("performAccessibilityAction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#startActionMode(android.view.ActionMode.Callback)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performClick()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.ActionMode.Callback"/></param>
-        /// <returns><see cref="Android.View.ActionMode"/></returns>
-        public Android.View.ActionMode StartActionMode(Android.View.ActionMode.Callback arg0)
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformClick()
         {
-            return IExecuteWithSignature<Android.View.ActionMode>("startActionMode", "(Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode;", arg0);
+            return IExecuteWithSignature<bool>("performClick", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onReceiveContent(android.view.ContentInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performContextClick()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.ContentInfo"/></param>
-        /// <returns><see cref="Android.View.ContentInfo"/></returns>
-        public Android.View.ContentInfo OnReceiveContent(Android.View.ContentInfo arg0)
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformContextClick()
         {
-            return IExecuteWithSignature<Android.View.ContentInfo>("onReceiveContent", "(Landroid/view/ContentInfo;)Landroid/view/ContentInfo;", arg0);
+            return IExecuteWithSignature<bool>("performContextClick", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performReceiveContent(android.view.ContentInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performContextClick(float,float)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.ContentInfo"/></param>
-        /// <returns><see cref="Android.View.ContentInfo"/></returns>
-        public Android.View.ContentInfo PerformReceiveContent(Android.View.ContentInfo arg0)
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformContextClick(float arg0, float arg1)
         {
-            return IExecuteWithSignature<Android.View.ContentInfo>("performReceiveContent", "(Landroid/view/ContentInfo;)Landroid/view/ContentInfo;", arg0);
+            return IExecute<bool>("performContextClick", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onCreateInputConnection(android.view.inputmethod.EditorInfo)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performHapticFeedback(int,int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.Inputmethod.EditorInfo"/></param>
-        /// <returns><see cref="Android.View.Inputmethod.InputConnection"/></returns>
-        public Android.View.Inputmethod.InputConnection OnCreateInputConnection(Android.View.Inputmethod.EditorInfo arg0)
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformHapticFeedback(int arg0, int arg1)
         {
-            return IExecuteWithSignature<Android.View.Inputmethod.InputConnection>("onCreateInputConnection", "(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;", arg0);
+            return IExecute<bool>("performHapticFeedback", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onResolvePointerIcon(android.view.MotionEvent,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performHapticFeedback(int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.PointerIcon"/></returns>
-        public Android.View.PointerIcon OnResolvePointerIcon(Android.View.MotionEvent arg0, int arg1)
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformHapticFeedback(int arg0)
         {
-            return IExecute<Android.View.PointerIcon>("onResolvePointerIcon", arg0, arg1);
+            return IExecuteWithSignature<bool>("performHapticFeedback", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#findFocus()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performLongClick()"/>
         /// </summary>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public Android.View.View FindFocus()
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformLongClick()
         {
-            return IExecuteWithSignature<Android.View.View>("findFocus", "()Landroid/view/View;");
+            return IExecuteWithSignature<bool>("performLongClick", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#focusSearch(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#performLongClick(float,float)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public Android.View.View FocusSearch(int arg0)
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformLongClick(float arg0, float arg1)
         {
-            return IExecuteWithSignature<Android.View.View>("focusSearch", "(I)Landroid/view/View;", arg0);
+            return IExecute<bool>("performLongClick", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#keyboardNavigationClusterSearch(android.view.View,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#post(java.lang.Runnable)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public Android.View.View KeyboardNavigationClusterSearch(Android.View.View arg0, int arg1)
+        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Post(Java.Lang.Runnable arg0)
         {
-            return IExecute<Android.View.View>("keyboardNavigationClusterSearch", arg0, arg1);
+            return IExecuteWithSignature<bool>("post", "(Ljava/lang/Runnable;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#animate()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#postDelayed(java.lang.Runnable,long)"/>
         /// </summary>
-        /// <returns><see cref="Android.View.ViewPropertyAnimator"/></returns>
-        public Android.View.ViewPropertyAnimator Animate()
+        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
+        /// <param name="arg1"><see cref="long"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PostDelayed(Java.Lang.Runnable arg0, long arg1)
         {
-            return IExecuteWithSignature<Android.View.ViewPropertyAnimator>("animate", "()Landroid/view/ViewPropertyAnimator;");
+            return IExecute<bool>("postDelayed", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#computeSystemWindowInsets(android.view.WindowInsets,android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#removeCallbacks(java.lang.Runnable)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
+        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool RemoveCallbacks(Java.Lang.Runnable arg0)
+        {
+            return IExecuteWithSignature<bool>("removeCallbacks", "(Ljava/lang/Runnable;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requestFocus(int,android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
-        /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        public Android.View.WindowInsets ComputeSystemWindowInsets(Android.View.WindowInsets arg0, Android.Graphics.Rect arg1)
+        /// <returns><see cref="bool"/></returns>
+        public bool RequestFocus(int arg0, Android.Graphics.Rect arg1)
         {
-            return IExecute<Android.View.WindowInsets>("computeSystemWindowInsets", arg0, arg1);
+            return IExecute<bool>("requestFocus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchApplyWindowInsets(android.view.WindowInsets)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requestRectangleOnScreen(android.graphics.Rect,boolean)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
-        /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        public Android.View.WindowInsets DispatchApplyWindowInsets(Android.View.WindowInsets arg0)
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool RequestRectangleOnScreen(Android.Graphics.Rect arg0, bool arg1)
         {
-            return IExecuteWithSignature<Android.View.WindowInsets>("dispatchApplyWindowInsets", "(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;", arg0);
+            return IExecute<bool>("requestRectangleOnScreen", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchWindowInsetsAnimationProgress(android.view.WindowInsets,java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requestRectangleOnScreen(android.graphics.Rect)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
-        /// <param name="arg1"><see cref="Java.Util.List"/></param>
-        /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        public Android.View.WindowInsets DispatchWindowInsetsAnimationProgress(Android.View.WindowInsets arg0, Java.Util.List<Android.View.WindowInsetsAnimation> arg1)
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool RequestRectangleOnScreen(Android.Graphics.Rect arg0)
         {
-            return IExecute<Android.View.WindowInsets>("dispatchWindowInsetsAnimationProgress", arg0, arg1);
+            return IExecuteWithSignature<bool>("requestRectangleOnScreen", "(Landroid/graphics/Rect;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onApplyWindowInsets(android.view.WindowInsets)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#restoreDefaultFocus()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
-        /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        public Android.View.WindowInsets OnApplyWindowInsets(Android.View.WindowInsets arg0)
+        /// <returns><see cref="bool"/></returns>
+        public bool RestoreDefaultFocus()
         {
-            return IExecuteWithSignature<Android.View.WindowInsets>("onApplyWindowInsets", "(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;", arg0);
+            return IExecuteWithSignature<bool>("restoreDefaultFocus", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchWindowInsetsAnimationStart(android.view.WindowInsetsAnimation,android.view.WindowInsetsAnimation.Bounds)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#showContextMenu()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.WindowInsetsAnimation"/></param>
-        /// <param name="arg1"><see cref="Android.View.WindowInsetsAnimation.Bounds"/></param>
-        /// <returns><see cref="Android.View.WindowInsetsAnimation.Bounds"/></returns>
-        public Android.View.WindowInsetsAnimation.Bounds DispatchWindowInsetsAnimationStart(Android.View.WindowInsetsAnimation arg0, Android.View.WindowInsetsAnimation.Bounds arg1)
+        /// <returns><see cref="bool"/></returns>
+        public bool ShowContextMenu()
         {
-            return IExecute<Android.View.WindowInsetsAnimation.Bounds>("dispatchWindowInsetsAnimationStart", arg0, arg1);
+            return IExecuteWithSignature<bool>("showContextMenu", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#callOnClick()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#showContextMenu(float,float)"/>
         /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool CallOnClick()
+        public bool ShowContextMenu(float arg0, float arg1)
         {
-            return IExecuteWithSignature<bool>("callOnClick", "()Z");
+            return IExecute<bool>("showContextMenu", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#canResolveLayoutDirection()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#startNestedScroll(int)"/>
         /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool CanResolveLayoutDirection()
+        public bool StartNestedScroll(int arg0)
         {
-            return IExecuteWithSignature<bool>("canResolveLayoutDirection", "()Z");
+            return IExecuteWithSignature<bool>("startNestedScroll", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#canResolveTextAlignment()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#willNotCacheDrawing()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public bool CanResolveTextAlignment()
+        [global::System.Obsolete()]
+        public bool WillNotCacheDrawing()
         {
-            return IExecuteWithSignature<bool>("canResolveTextAlignment", "()Z");
+            return IExecuteWithSignature<bool>("willNotCacheDrawing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#canResolveTextDirection()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#willNotDraw()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public bool CanResolveTextDirection()
+        public bool WillNotDraw()
         {
-            return IExecuteWithSignature<bool>("canResolveTextDirection", "()Z");
+            return IExecuteWithSignature<bool>("willNotDraw", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#canScrollHorizontally(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#findViewById(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool CanScrollHorizontally(int arg0)
+        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T FindViewById<T>(int arg0) where T : Android.View.View
         {
-            return IExecuteWithSignature<bool>("canScrollHorizontally", "(I)Z", arg0);
+            return IExecute<T>("findViewById", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#canScrollVertically(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#findViewWithTag(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T FindViewWithTag<T>(object arg0) where T : Android.View.View
+        {
+            return IExecute<T>("findViewWithTag", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requireViewById(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool CanScrollVertically(int arg0)
+        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T RequireViewById<T>(int arg0) where T : Android.View.View
         {
-            return IExecuteWithSignature<bool>("canScrollVertically", "(I)Z", arg0);
+            return IExecute<T>("requireViewById", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#checkInputConnectionProxy(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getContext()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool CheckInputConnectionProxy(Android.View.View arg0)
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
         {
-            return IExecuteWithSignature<bool>("checkInputConnectionProxy", "(Landroid/view/View;)Z", arg0);
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchCapturedPointerEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAutofillId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool DispatchCapturedPointerEvent(Android.View.MotionEvent arg0)
+        /// <returns><see cref="Android.View.Autofill.AutofillId"/></returns>
+        public Android.View.Autofill.AutofillId GetAutofillId()
         {
-            return IExecuteWithSignature<bool>("dispatchCapturedPointerEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchDragEvent(android.view.DragEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getContentCaptureSession()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.DragEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool DispatchDragEvent(Android.View.DragEvent arg0)
+        /// <returns><see cref="Android.View.Contentcapture.ContentCaptureSession"/></returns>
+        public Android.View.Contentcapture.ContentCaptureSession GetContentCaptureSession()
         {
-            return IExecuteWithSignature<bool>("dispatchDragEvent", "(Landroid/view/DragEvent;)Z", arg0);
+            return IExecuteWithSignature<Android.View.Contentcapture.ContentCaptureSession>("getContentCaptureSession", "()Landroid/view/contentcapture/ContentCaptureSession;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getParent()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.ViewParent"/></returns>
+        public Android.View.ViewParent GetParent()
+        {
+            return IExecuteWithSignature<Android.View.ViewParent>("getParent", "()Landroid/view/ViewParent;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchGenericMotionEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#findOnBackInvokedDispatcher()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool DispatchGenericMotionEvent(Android.View.MotionEvent arg0)
+        /// <returns><see cref="Android.Window.OnBackInvokedDispatcher"/></returns>
+        public Android.Window.OnBackInvokedDispatcher FindOnBackInvokedDispatcher()
         {
-            return IExecuteWithSignature<bool>("dispatchGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<Android.Window.OnBackInvokedDispatcher>("findOnBackInvokedDispatcher", "()Landroid/window/OnBackInvokedDispatcher;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchKeyEvent(android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getClipToOutline()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchKeyEvent(Android.View.KeyEvent arg0)
+        public bool GetClipToOutline()
         {
-            return IExecuteWithSignature<bool>("dispatchKeyEvent", "(Landroid/view/KeyEvent;)Z", arg0);
+            return IExecuteWithSignature<bool>("getClipToOutline", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchKeyEventPreIme(android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getDefaultFocusHighlightEnabled()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchKeyEventPreIme(Android.View.KeyEvent arg0)
+        public bool GetDefaultFocusHighlightEnabled()
         {
-            return IExecuteWithSignature<bool>("dispatchKeyEventPreIme", "(Landroid/view/KeyEvent;)Z", arg0);
+            return IExecuteWithSignature<bool>("getDefaultFocusHighlightEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchKeyShortcutEvent(android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getGlobalVisibleRect(android.graphics.Rect)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.KeyEvent"/></param>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchKeyShortcutEvent(Android.View.KeyEvent arg0)
+        public bool GetGlobalVisibleRect(Android.Graphics.Rect arg0)
         {
-            return IExecuteWithSignature<bool>("dispatchKeyShortcutEvent", "(Landroid/view/KeyEvent;)Z", arg0);
+            return IExecuteWithSignature<bool>("getGlobalVisibleRect", "(Landroid/graphics/Rect;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedFling(float,float,boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHasOverlappingRendering()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <param name="arg2"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchNestedFling(float arg0, float arg1, bool arg2)
+        public bool GetHasOverlappingRendering()
         {
-            return IExecute<bool>("dispatchNestedFling", arg0, arg1, arg2);
+            return IExecuteWithSignature<bool>("getHasOverlappingRendering", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedPreFling(float,float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getLocalVisibleRect(android.graphics.Rect)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchNestedPreFling(float arg0, float arg1)
+        public bool GetLocalVisibleRect(Android.Graphics.Rect arg0)
         {
-            return IExecute<bool>("dispatchNestedPreFling", arg0, arg1);
+            return IExecuteWithSignature<bool>("getLocalVisibleRect", "(Landroid/graphics/Rect;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedPrePerformAccessibilityAction(int,android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getRevealOnFocusHint()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchNestedPrePerformAccessibilityAction(int arg0, Android.Os.Bundle arg1)
+        public bool GetRevealOnFocusHint()
         {
-            return IExecute<bool>("dispatchNestedPrePerformAccessibilityAction", arg0, arg1);
+            return IExecuteWithSignature<bool>("getRevealOnFocusHint", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedPreScroll(int,int,int[],int[])"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isFocusable()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchNestedPreScroll(int arg0, int arg1, int[] arg2, int[] arg3)
+        public bool IsFocusable()
         {
-            return IExecute<bool>("dispatchNestedPreScroll", arg0, arg1, arg2, arg3);
+            return IExecuteWithSignature<bool>("isFocusable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchNestedScroll(int,int,int,int,int[])"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isFocusableInTouchMode()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchNestedScroll(int arg0, int arg1, int arg2, int arg3, int[] arg4)
+        public bool IsFocusableInTouchMode()
         {
-            return IExecute<bool>("dispatchNestedScroll", arg0, arg1, arg2, arg3, arg4);
+            return IExecuteWithSignature<bool>("isFocusableInTouchMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isFocusedByDefault()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.Accessibility.AccessibilityEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchPopulateAccessibilityEvent(Android.View.Accessibility.AccessibilityEvent arg0)
+        public bool IsFocusedByDefault()
         {
-            return IExecuteWithSignature<bool>("dispatchPopulateAccessibilityEvent", "(Landroid/view/accessibility/AccessibilityEvent;)Z", arg0);
+            return IExecuteWithSignature<bool>("isFocusedByDefault", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchTouchEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isImportantForAutofill()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchTouchEvent(Android.View.MotionEvent arg0)
+        public bool IsImportantForAutofill()
         {
-            return IExecuteWithSignature<bool>("dispatchTouchEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<bool>("isImportantForAutofill", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchTrackballEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isImportantForContentCapture()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchTrackballEvent(Android.View.MotionEvent arg0)
+        public bool IsImportantForContentCapture()
         {
-            return IExecuteWithSignature<bool>("dispatchTrackballEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<bool>("isImportantForContentCapture", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchUnhandledMove(android.view.View,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isKeyboardNavigationCluster()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool DispatchUnhandledMove(Android.View.View arg0, int arg1)
+        public bool IsKeyboardNavigationCluster()
         {
-            return IExecute<bool>("dispatchUnhandledMove", arg0, arg1);
+            return IExecuteWithSignature<bool>("isKeyboardNavigationCluster", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#gatherTransparentRegion(android.graphics.Region)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isPreferKeepClear()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Region"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool GatherTransparentRegion(Android.Graphics.Region arg0)
+        public bool IsPreferKeepClear()
         {
-            return IExecuteWithSignature<bool>("gatherTransparentRegion", "(Landroid/graphics/Region;)Z", arg0);
+            return IExecuteWithSignature<bool>("isPreferKeepClear", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getClipBounds(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isShowingLayoutBounds()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool GetClipBounds(Android.Graphics.Rect arg0)
+        public bool IsShowingLayoutBounds()
         {
-            return IExecuteWithSignature<bool>("getClipBounds", "(Landroid/graphics/Rect;)Z", arg0);
+            return IExecuteWithSignature<bool>("isShowingLayoutBounds", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getGlobalVisibleRect(android.graphics.Rect,android.graphics.Point)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#isTemporarilyDetached()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Point"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool GetGlobalVisibleRect(Android.Graphics.Rect arg0, Android.Graphics.Point arg1)
+        public bool IsTemporarilyDetached()
         {
-            return IExecute<bool>("getGlobalVisibleRect", arg0, arg1);
+            return IExecuteWithSignature<bool>("isTemporarilyDetached", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasExplicitFocusable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requestFocus()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public bool HasExplicitFocusable()
+        public bool RequestFocus()
         {
-            return IExecuteWithSignature<bool>("hasExplicitFocusable", "()Z");
+            return IExecuteWithSignature<bool>("requestFocus", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasFocus()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requestFocus(int)"/>
         /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool HasFocus()
+        public bool RequestFocus(int arg0)
         {
-            return IExecuteWithSignature<bool>("hasFocus", "()Z");
+            return IExecuteWithSignature<bool>("requestFocus", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasFocusable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requestFocusFromTouch()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public bool HasFocusable()
+        public bool RequestFocusFromTouch()
         {
-            return IExecuteWithSignature<bool>("hasFocusable", "()Z");
+            return IExecuteWithSignature<bool>("requestFocusFromTouch", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasNestedScrollingParent()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#startDrag(android.content.ClipData,android.view.View.DragShadowBuilder,java.lang.Object,int)"/>
         /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.ClipData"/></param>
+        /// <param name="arg1"><see cref="Android.View.View.DragShadowBuilder"/></param>
+        /// <param name="arg2"><see cref="object"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool HasNestedScrollingParent()
+        [global::System.Obsolete()]
+        public bool StartDrag(Android.Content.ClipData arg0, Android.View.View.DragShadowBuilder arg1, object arg2, int arg3)
         {
-            return IExecuteWithSignature<bool>("hasNestedScrollingParent", "()Z");
+            return IExecute<bool>("startDrag", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasOnClickListeners()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#startDragAndDrop(android.content.ClipData,android.view.View.DragShadowBuilder,java.lang.Object,int)"/>
         /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.ClipData"/></param>
+        /// <param name="arg1"><see cref="Android.View.View.DragShadowBuilder"/></param>
+        /// <param name="arg2"><see cref="object"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public bool HasOnClickListeners()
+        public bool StartDragAndDrop(Android.Content.ClipData arg0, Android.View.View.DragShadowBuilder arg1, object arg2, int arg3)
         {
-            return IExecuteWithSignature<bool>("hasOnClickListeners", "()Z");
+            return IExecute<bool>("startDragAndDrop", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasOnLongClickListeners()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getBottom()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasOnLongClickListeners()
+        /// <returns><see cref="int"/></returns>
+        public int GetBottom()
         {
-            return IExecuteWithSignature<bool>("hasOnLongClickListeners", "()Z");
+            return IExecuteWithSignature<int>("getBottom", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasOverlappingRendering()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHeight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasOverlappingRendering()
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            return IExecuteWithSignature<bool>("hasOverlappingRendering", "()Z");
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasPointerCapture()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getLeft()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasPointerCapture()
+        /// <returns><see cref="int"/></returns>
+        public int GetLeft()
         {
-            return IExecuteWithSignature<bool>("hasPointerCapture", "()Z");
+            return IExecuteWithSignature<int>("getLeft", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasTransientState()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredHeight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasTransientState()
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasuredHeight()
         {
-            return IExecuteWithSignature<bool>("hasTransientState", "()Z");
+            return IExecuteWithSignature<int>("getMeasuredHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#hasWindowFocus()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredHeightAndState()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasWindowFocus()
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasuredHeightAndState()
         {
-            return IExecuteWithSignature<bool>("hasWindowFocus", "()Z");
+            return IExecuteWithSignature<int>("getMeasuredHeightAndState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isAccessibilityDataSensitive()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredState()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAccessibilityDataSensitive()
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasuredState()
         {
-            return IExecuteWithSignature<bool>("isAccessibilityDataSensitive", "()Z");
+            return IExecuteWithSignature<int>("getMeasuredState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isAccessibilityFocused()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAccessibilityFocused()
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasuredWidth()
         {
-            return IExecuteWithSignature<bool>("isAccessibilityFocused", "()Z");
+            return IExecuteWithSignature<int>("getMeasuredWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isAccessibilityHeading()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getMeasuredWidthAndState()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAccessibilityHeading()
+        /// <returns><see cref="int"/></returns>
+        public int GetMeasuredWidthAndState()
         {
-            return IExecuteWithSignature<bool>("isAccessibilityHeading", "()Z");
+            return IExecuteWithSignature<int>("getMeasuredWidthAndState", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isActivated()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getRight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsActivated()
+        /// <returns><see cref="int"/></returns>
+        public int GetRight()
         {
-            return IExecuteWithSignature<bool>("isActivated", "()Z");
+            return IExecuteWithSignature<int>("getRight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isAttachedToWindow()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollX()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAttachedToWindow()
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollX()
         {
-            return IExecuteWithSignature<bool>("isAttachedToWindow", "()Z");
+            return IExecuteWithSignature<int>("getScrollX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isAutoHandwritingEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAutoHandwritingEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollY()
         {
-            return IExecuteWithSignature<bool>("isAutoHandwritingEnabled", "()Z");
+            return IExecuteWithSignature<int>("getScrollY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isClickable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTop()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClickable()
+        /// <returns><see cref="int"/></returns>
+        public int GetTop()
         {
-            return IExecuteWithSignature<bool>("isClickable", "()Z");
+            return IExecuteWithSignature<int>("getTop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isContextClickable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsContextClickable()
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            return IExecuteWithSignature<bool>("isContextClickable", "()Z");
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isCredential()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawableState()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsCredential()
+        /// <returns><see cref="int"/></returns>
+        public int[] GetDrawableState()
         {
-            return IExecuteWithSignature<bool>("isCredential", "()Z");
+            return IExecuteWithSignatureArray<int>("getDrawableState", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isDirty()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getStateDescription()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDirty()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetStateDescription()
         {
-            return IExecuteWithSignature<bool>("isDirty", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getStateDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isDrawingCacheEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPreferKeepClearRects()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsDrawingCacheEnabled()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Graphics.Rect> GetPreferKeepClearRects()
         {
-            return IExecuteWithSignature<bool>("isDrawingCacheEnabled", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Android.Graphics.Rect>>("getPreferKeepClearRects", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isDuplicateParentStateEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#cancelDragAndDrop()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDuplicateParentStateEnabled()
+        public void CancelDragAndDrop()
         {
-            return IExecuteWithSignature<bool>("isDuplicateParentStateEnabled", "()Z");
+            IExecuteWithSignature("cancelDragAndDrop", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#cancelPendingInputEvents()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEnabled()
+        public void CancelPendingInputEvents()
         {
-            return IExecuteWithSignature<bool>("isEnabled", "()Z");
+            IExecuteWithSignature("cancelPendingInputEvents", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isFocused()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFocused()
+        /// <see href="https://developer.android.com/reference/android/view/View.html#measure(int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public void Measure(int arg0, int arg1)
         {
-            return IExecuteWithSignature<bool>("isFocused", "()Z");
+            IExecute("measure", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isForceDarkAllowed()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requestUnbufferedDispatch(android.view.MotionEvent)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsForceDarkAllowed()
+        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
+        public void RequestUnbufferedDispatch(Android.View.MotionEvent arg0)
         {
-            return IExecuteWithSignature<bool>("isForceDarkAllowed", "()Z");
+            IExecuteWithSignature("requestUnbufferedDispatch", "(Landroid/view/MotionEvent;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isHandwritingDelegate()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#requestUnbufferedDispatch(int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHandwritingDelegate()
+        /// <param name="arg0"><see cref="int"/></param>
+        public void RequestUnbufferedDispatch(int arg0)
         {
-            return IExecuteWithSignature<bool>("isHandwritingDelegate", "()Z");
+            IExecuteWithSignature("requestUnbufferedDispatch", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isHapticFeedbackEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#saveAttributeDataForStyleable(android.content.Context,int[],android.util.AttributeSet,android.content.res.TypedArray,int,int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHapticFeedbackEnabled()
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Android.Util.AttributeSet"/></param>
+        /// <param name="arg3"><see cref="Android.Content.Res.TypedArray"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        public void SaveAttributeDataForStyleable(Android.Content.Context arg0, int[] arg1, Android.Util.AttributeSet arg2, Android.Content.Res.TypedArray arg3, int arg4, int arg5)
         {
-            return IExecuteWithSignature<bool>("isHapticFeedbackEnabled", "()Z");
+            IExecute("saveAttributeDataForStyleable", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isHardwareAccelerated()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setBottom(int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHardwareAccelerated()
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBottom(int arg0)
         {
-            return IExecuteWithSignature<bool>("isHardwareAccelerated", "()Z");
+            IExecuteWithSignature("setBottom", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isHorizontalFadingEdgeEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setLeft(int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHorizontalFadingEdgeEnabled()
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLeft(int arg0)
         {
-            return IExecuteWithSignature<bool>("isHorizontalFadingEdgeEnabled", "()Z");
+            IExecuteWithSignature("setLeft", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isHorizontalScrollBarEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setLeftTopRightBottom(int,int,int,int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHorizontalScrollBarEnabled()
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        public void SetLeftTopRightBottom(int arg0, int arg1, int arg2, int arg3)
         {
-            return IExecuteWithSignature<bool>("isHorizontalScrollBarEnabled", "()Z");
+            IExecute("setLeftTopRightBottom", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isHovered()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setPreferKeepClear(boolean)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHovered()
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetPreferKeepClear(bool arg0)
         {
-            return IExecuteWithSignature<bool>("isHovered", "()Z");
+            IExecuteWithSignature("setPreferKeepClear", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isImportantForAccessibility()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setPreferKeepClearRects(java.util.List)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsImportantForAccessibility()
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetPreferKeepClearRects(Java.Util.List<Android.Graphics.Rect> arg0)
         {
-            return IExecuteWithSignature<bool>("isImportantForAccessibility", "()Z");
+            IExecuteWithSignature("setPreferKeepClearRects", "(Ljava/util/List;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isInEditMode()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setRevealOnFocusHint(boolean)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInEditMode()
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetRevealOnFocusHint(bool arg0)
         {
-            return IExecuteWithSignature<bool>("isInEditMode", "()Z");
+            IExecuteWithSignature("setRevealOnFocusHint", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isInLayout()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setRight(int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInLayout()
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRight(int arg0)
         {
-            return IExecuteWithSignature<bool>("isInLayout", "()Z");
+            IExecuteWithSignature("setRight", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isInTouchMode()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollCaptureCallback(android.view.ScrollCaptureCallback)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInTouchMode()
+        /// <param name="arg0"><see cref="Android.View.ScrollCaptureCallback"/></param>
+        public void SetScrollCaptureCallback(Android.View.ScrollCaptureCallback arg0)
         {
-            return IExecuteWithSignature<bool>("isInTouchMode", "()Z");
+            IExecuteWithSignature("setScrollCaptureCallback", "(Landroid/view/ScrollCaptureCallback;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isLaidOut()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTop(int)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLaidOut()
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTop(int arg0)
         {
-            return IExecuteWithSignature<bool>("isLaidOut", "()Z");
+            IExecuteWithSignature("setTop", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isLayoutDirectionResolved()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTransitionName(java.lang.String)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLayoutDirectionResolved()
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetTransitionName(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<bool>("isLayoutDirectionResolved", "()Z");
+            IExecuteWithSignature("setTransitionName", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isLayoutRequested()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#updateDragShadow(android.view.View.DragShadowBuilder)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLayoutRequested()
+        /// <param name="arg0"><see cref="Android.View.View.DragShadowBuilder"/></param>
+        public void UpdateDragShadow(Android.View.View.DragShadowBuilder arg0)
         {
-            return IExecuteWithSignature<bool>("isLayoutRequested", "()Z");
+            IExecuteWithSignature("updateDragShadow", "(Landroid/view/View$DragShadowBuilder;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isLongClickable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAlpha()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLongClickable()
+        /// <returns><see cref="float"/></returns>
+        public float GetAlpha()
         {
-            return IExecuteWithSignature<bool>("isLongClickable", "()Z");
+            return IExecuteWithSignature<float>("getAlpha", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isNestedScrollingEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getCameraDistance()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsNestedScrollingEnabled()
+        /// <returns><see cref="float"/></returns>
+        public float GetCameraDistance()
         {
-            return IExecuteWithSignature<bool>("isNestedScrollingEnabled", "()Z");
+            return IExecuteWithSignature<float>("getCameraDistance", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isOpaque()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getElevation()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOpaque()
+        /// <returns><see cref="float"/></returns>
+        public float GetElevation()
         {
-            return IExecuteWithSignature<bool>("isOpaque", "()Z");
+            return IExecuteWithSignature<float>("getElevation", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isPaddingRelative()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingBoundsOffsetBottom()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPaddingRelative()
+        /// <returns><see cref="float"/></returns>
+        public float GetHandwritingBoundsOffsetBottom()
         {
-            return IExecuteWithSignature<bool>("isPaddingRelative", "()Z");
+            return IExecuteWithSignature<float>("getHandwritingBoundsOffsetBottom", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isPivotSet()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingBoundsOffsetLeft()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPivotSet()
+        /// <returns><see cref="float"/></returns>
+        public float GetHandwritingBoundsOffsetLeft()
         {
-            return IExecuteWithSignature<bool>("isPivotSet", "()Z");
+            return IExecuteWithSignature<float>("getHandwritingBoundsOffsetLeft", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isPressed()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingBoundsOffsetRight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPressed()
+        /// <returns><see cref="float"/></returns>
+        public float GetHandwritingBoundsOffsetRight()
         {
-            return IExecuteWithSignature<bool>("isPressed", "()Z");
+            return IExecuteWithSignature<float>("getHandwritingBoundsOffsetRight", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isSaveEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingBoundsOffsetTop()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSaveEnabled()
+        /// <returns><see cref="float"/></returns>
+        public float GetHandwritingBoundsOffsetTop()
         {
-            return IExecuteWithSignature<bool>("isSaveEnabled", "()Z");
+            return IExecuteWithSignature<float>("getHandwritingBoundsOffsetTop", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isSaveFromParentEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPivotX()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSaveFromParentEnabled()
+        /// <returns><see cref="float"/></returns>
+        public float GetPivotX()
         {
-            return IExecuteWithSignature<bool>("isSaveFromParentEnabled", "()Z");
+            return IExecuteWithSignature<float>("getPivotX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isScreenReaderFocusable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPivotY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsScreenReaderFocusable()
+        /// <returns><see cref="float"/></returns>
+        public float GetPivotY()
         {
-            return IExecuteWithSignature<bool>("isScreenReaderFocusable", "()Z");
+            return IExecuteWithSignature<float>("getPivotY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isScrollbarFadingEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getRotation()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsScrollbarFadingEnabled()
+        /// <returns><see cref="float"/></returns>
+        public float GetRotation()
         {
-            return IExecuteWithSignature<bool>("isScrollbarFadingEnabled", "()Z");
+            return IExecuteWithSignature<float>("getRotation", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isScrollContainer()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getRotationX()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsScrollContainer()
+        /// <returns><see cref="float"/></returns>
+        public float GetRotationX()
         {
-            return IExecuteWithSignature<bool>("isScrollContainer", "()Z");
+            return IExecuteWithSignature<float>("getRotationX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isSelected()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getRotationY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSelected()
+        /// <returns><see cref="float"/></returns>
+        public float GetRotationY()
         {
-            return IExecuteWithSignature<bool>("isSelected", "()Z");
+            return IExecuteWithSignature<float>("getRotationY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isShown()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScaleX()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsShown()
+        /// <returns><see cref="float"/></returns>
+        public float GetScaleX()
         {
-            return IExecuteWithSignature<bool>("isShown", "()Z");
+            return IExecuteWithSignature<float>("getScaleX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isSoundEffectsEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScaleY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSoundEffectsEnabled()
+        /// <returns><see cref="float"/></returns>
+        public float GetScaleY()
         {
-            return IExecuteWithSignature<bool>("isSoundEffectsEnabled", "()Z");
+            return IExecuteWithSignature<float>("getScaleY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isTextAlignmentResolved()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTransitionAlpha()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTextAlignmentResolved()
+        /// <returns><see cref="float"/></returns>
+        public float GetTransitionAlpha()
         {
-            return IExecuteWithSignature<bool>("isTextAlignmentResolved", "()Z");
+            return IExecuteWithSignature<float>("getTransitionAlpha", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isTextDirectionResolved()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTranslationX()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTextDirectionResolved()
+        /// <returns><see cref="float"/></returns>
+        public float GetTranslationX()
         {
-            return IExecuteWithSignature<bool>("isTextDirectionResolved", "()Z");
+            return IExecuteWithSignature<float>("getTranslationX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isVerticalFadingEdgeEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTranslationY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsVerticalFadingEdgeEnabled()
+        /// <returns><see cref="float"/></returns>
+        public float GetTranslationY()
         {
-            return IExecuteWithSignature<bool>("isVerticalFadingEdgeEnabled", "()Z");
+            return IExecuteWithSignature<float>("getTranslationY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isVerticalScrollBarEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTranslationZ()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsVerticalScrollBarEnabled()
+        /// <returns><see cref="float"/></returns>
+        public float GetTranslationZ()
         {
-            return IExecuteWithSignature<bool>("isVerticalScrollBarEnabled", "()Z");
+            return IExecuteWithSignature<float>("getTranslationZ", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isVisibleToUserForAutofill(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getX()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsVisibleToUserForAutofill(int arg0)
+        /// <returns><see cref="float"/></returns>
+        public float GetX()
         {
-            return IExecuteWithSignature<bool>("isVisibleToUserForAutofill", "(I)Z", arg0);
+            return IExecuteWithSignature<float>("getX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onCapturedPointerEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getY()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnCapturedPointerEvent(Android.View.MotionEvent arg0)
+        /// <returns><see cref="float"/></returns>
+        public float GetY()
         {
-            return IExecuteWithSignature<bool>("onCapturedPointerEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<float>("getY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onCheckIsTextEditor()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getZ()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnCheckIsTextEditor()
+        /// <returns><see cref="float"/></returns>
+        public float GetZ()
         {
-            return IExecuteWithSignature<bool>("onCheckIsTextEditor", "()Z");
+            return IExecuteWithSignature<float>("getZ", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onDragEvent(android.view.DragEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityLiveRegion()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.DragEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnDragEvent(Android.View.DragEvent arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetAccessibilityLiveRegion()
         {
-            return IExecuteWithSignature<bool>("onDragEvent", "(Landroid/view/DragEvent;)Z", arg0);
+            return IExecuteWithSignature<int>("getAccessibilityLiveRegion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onFilterTouchEventForSecurity(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityTraversalAfter()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnFilterTouchEventForSecurity(Android.View.MotionEvent arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetAccessibilityTraversalAfter()
         {
-            return IExecuteWithSignature<bool>("onFilterTouchEventForSecurity", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<int>("getAccessibilityTraversalAfter", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onGenericMotionEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityTraversalBefore()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnGenericMotionEvent(Android.View.MotionEvent arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetAccessibilityTraversalBefore()
         {
-            return IExecuteWithSignature<bool>("onGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<int>("getAccessibilityTraversalBefore", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onHoverEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAutofillType()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnHoverEvent(Android.View.MotionEvent arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetAutofillType()
         {
-            return IExecuteWithSignature<bool>("onHoverEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<int>("getAutofillType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyDown(int,android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getBaseline()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyDown(int arg0, Android.View.KeyEvent arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetBaseline()
         {
-            return IExecute<bool>("onKeyDown", arg0, arg1);
+            return IExecuteWithSignature<int>("getBaseline", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyLongPress(int,android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingCacheBackgroundColor()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyLongPress(int arg0, Android.View.KeyEvent arg1)
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetDrawingCacheBackgroundColor()
         {
-            return IExecute<bool>("onKeyLongPress", arg0, arg1);
+            return IExecuteWithSignature<int>("getDrawingCacheBackgroundColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyMultiple(int,int,android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingCacheQuality()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyMultiple(int arg0, int arg1, Android.View.KeyEvent arg2)
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetDrawingCacheQuality()
         {
-            return IExecute<bool>("onKeyMultiple", arg0, arg1, arg2);
+            return IExecuteWithSignature<int>("getDrawingCacheQuality", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyPreIme(int,android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getExplicitStyle()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyPreIme(int arg0, Android.View.KeyEvent arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetExplicitStyle()
         {
-            return IExecute<bool>("onKeyPreIme", arg0, arg1);
+            return IExecuteWithSignature<int>("getExplicitStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyShortcut(int,android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getFocusable()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyShortcut(int arg0, Android.View.KeyEvent arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetFocusable()
         {
-            return IExecute<bool>("onKeyShortcut", arg0, arg1);
+            return IExecuteWithSignature<int>("getFocusable", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onKeyUp(int,android.view.KeyEvent)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyUp(int arg0, Android.View.KeyEvent arg1)
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getForegroundGravity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetForegroundGravity()
         {
-            return IExecute<bool>("onKeyUp", arg0, arg1);
+            return IExecuteWithSignature<int>("getForegroundGravity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onTouchEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHorizontalFadingEdgeLength()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnTouchEvent(Android.View.MotionEvent arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetHorizontalFadingEdgeLength()
         {
-            return IExecuteWithSignature<bool>("onTouchEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<int>("getHorizontalFadingEdgeLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#onTrackballEvent(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnTrackballEvent(Android.View.MotionEvent arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetId()
         {
-            return IExecuteWithSignature<bool>("onTrackballEvent", "(Landroid/view/MotionEvent;)Z", arg0);
+            return IExecuteWithSignature<int>("getId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performAccessibilityAction(int,android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getImportantForAccessibility()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformAccessibilityAction(int arg0, Android.Os.Bundle arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetImportantForAccessibility()
         {
-            return IExecute<bool>("performAccessibilityAction", arg0, arg1);
+            return IExecuteWithSignature<int>("getImportantForAccessibility", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performClick()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getImportantForAutofill()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformClick()
+        /// <returns><see cref="int"/></returns>
+        public int GetImportantForAutofill()
         {
-            return IExecuteWithSignature<bool>("performClick", "()Z");
+            return IExecuteWithSignature<int>("getImportantForAutofill", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performContextClick()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getImportantForContentCapture()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformContextClick()
+        /// <returns><see cref="int"/></returns>
+        public int GetImportantForContentCapture()
         {
-            return IExecuteWithSignature<bool>("performContextClick", "()Z");
+            return IExecuteWithSignature<int>("getImportantForContentCapture", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performContextClick(float,float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getLabelFor()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformContextClick(float arg0, float arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetLabelFor()
         {
-            return IExecute<bool>("performContextClick", arg0, arg1);
+            return IExecuteWithSignature<int>("getLabelFor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performHapticFeedback(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getLayerType()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformHapticFeedback(int arg0, int arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetLayerType()
         {
-            return IExecute<bool>("performHapticFeedback", arg0, arg1);
+            return IExecuteWithSignature<int>("getLayerType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performHapticFeedback(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getLayoutDirection()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformHapticFeedback(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetLayoutDirection()
         {
-            return IExecuteWithSignature<bool>("performHapticFeedback", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getLayoutDirection", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performLongClick()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getMinimumHeight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformLongClick()
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumHeight()
         {
-            return IExecuteWithSignature<bool>("performLongClick", "()Z");
+            return IExecuteWithSignature<int>("getMinimumHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#performLongClick(float,float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getMinimumWidth()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformLongClick(float arg0, float arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumWidth()
         {
-            return IExecute<bool>("performLongClick", arg0, arg1);
+            return IExecuteWithSignature<int>("getMinimumWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#post(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextClusterForwardId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Post(Java.Lang.Runnable arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetNextClusterForwardId()
         {
-            return IExecuteWithSignature<bool>("post", "(Ljava/lang/Runnable;)Z", arg0);
+            return IExecuteWithSignature<int>("getNextClusterForwardId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#postDelayed(java.lang.Runnable,long)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusDownId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PostDelayed(Java.Lang.Runnable arg0, long arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetNextFocusDownId()
         {
-            return IExecute<bool>("postDelayed", arg0, arg1);
+            return IExecuteWithSignature<int>("getNextFocusDownId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#removeCallbacks(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusForwardId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RemoveCallbacks(Java.Lang.Runnable arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetNextFocusForwardId()
         {
-            return IExecuteWithSignature<bool>("removeCallbacks", "(Ljava/lang/Runnable;)Z", arg0);
+            return IExecuteWithSignature<int>("getNextFocusForwardId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requestFocus(int,android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusLeftId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RequestFocus(int arg0, Android.Graphics.Rect arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetNextFocusLeftId()
         {
-            return IExecute<bool>("requestFocus", arg0, arg1);
+            return IExecuteWithSignature<int>("getNextFocusLeftId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requestRectangleOnScreen(android.graphics.Rect,boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusRightId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RequestRectangleOnScreen(Android.Graphics.Rect arg0, bool arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetNextFocusRightId()
         {
-            return IExecute<bool>("requestRectangleOnScreen", arg0, arg1);
+            return IExecuteWithSignature<int>("getNextFocusRightId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requestRectangleOnScreen(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getNextFocusUpId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RequestRectangleOnScreen(Android.Graphics.Rect arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetNextFocusUpId()
         {
-            return IExecuteWithSignature<bool>("requestRectangleOnScreen", "(Landroid/graphics/Rect;)Z", arg0);
+            return IExecuteWithSignature<int>("getNextFocusUpId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#restoreDefaultFocus()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getOutlineAmbientShadowColor()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool RestoreDefaultFocus()
+        /// <returns><see cref="int"/></returns>
+        public int GetOutlineAmbientShadowColor()
         {
-            return IExecuteWithSignature<bool>("restoreDefaultFocus", "()Z");
+            return IExecuteWithSignature<int>("getOutlineAmbientShadowColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#showContextMenu()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getOutlineSpotShadowColor()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ShowContextMenu()
+        /// <returns><see cref="int"/></returns>
+        public int GetOutlineSpotShadowColor()
         {
-            return IExecuteWithSignature<bool>("showContextMenu", "()Z");
+            return IExecuteWithSignature<int>("getOutlineSpotShadowColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#showContextMenu(float,float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getOverScrollMode()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool ShowContextMenu(float arg0, float arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetOverScrollMode()
         {
-            return IExecute<bool>("showContextMenu", arg0, arg1);
+            return IExecuteWithSignature<int>("getOverScrollMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#startNestedScroll(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingBottom()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool StartNestedScroll(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPaddingBottom()
         {
-            return IExecuteWithSignature<bool>("startNestedScroll", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getPaddingBottom", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#willNotCacheDrawing()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingEnd()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool WillNotCacheDrawing()
+        /// <returns><see cref="int"/></returns>
+        public int GetPaddingEnd()
         {
-            return IExecuteWithSignature<bool>("willNotCacheDrawing", "()Z");
+            return IExecuteWithSignature<int>("getPaddingEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#willNotDraw()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingLeft()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool WillNotDraw()
+        /// <returns><see cref="int"/></returns>
+        public int GetPaddingLeft()
         {
-            return IExecuteWithSignature<bool>("willNotDraw", "()Z");
+            return IExecuteWithSignature<int>("getPaddingLeft", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#findViewById(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingRight()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T FindViewById<T>(int arg0) where T: Android.View.View
+        /// <returns><see cref="int"/></returns>
+        public int GetPaddingRight()
         {
-            return IExecuteWithSignature<T>("findViewById", "(I)Landroid/view/View;", arg0);
+            return IExecuteWithSignature<int>("getPaddingRight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#findViewWithTag(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingStart()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T FindViewWithTag<T>(object arg0) where T: Android.View.View
+        /// <returns><see cref="int"/></returns>
+        public int GetPaddingStart()
         {
-            return IExecuteWithSignature<T>("findViewWithTag", "(Ljava/lang/Object;)Landroid/view/View;", arg0);
+            return IExecuteWithSignature<int>("getPaddingStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requireViewById(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getPaddingTop()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T RequireViewById<T>(int arg0) where T: Android.View.View
+        /// <returns><see cref="int"/></returns>
+        public int GetPaddingTop()
         {
-            return IExecuteWithSignature<T>("requireViewById", "(I)Landroid/view/View;", arg0);
+            return IExecuteWithSignature<int>("getPaddingTop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#findOnBackInvokedDispatcher()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollBarDefaultDelayBeforeFade()"/>
         /// </summary>
-        /// <returns><see cref="Android.Window.OnBackInvokedDispatcher"/></returns>
-        public Android.Window.OnBackInvokedDispatcher FindOnBackInvokedDispatcher()
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollBarDefaultDelayBeforeFade()
         {
-            return IExecuteWithSignature<Android.Window.OnBackInvokedDispatcher>("findOnBackInvokedDispatcher", "()Landroid/window/OnBackInvokedDispatcher;");
+            return IExecuteWithSignature<int>("getScrollBarDefaultDelayBeforeFade", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getGlobalVisibleRect(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollBarFadeDuration()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool GetGlobalVisibleRect(Android.Graphics.Rect arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollBarFadeDuration()
         {
-            return IExecuteWithSignature<bool>("getGlobalVisibleRect", "(Landroid/graphics/Rect;)Z", arg0);
+            return IExecuteWithSignature<int>("getScrollBarFadeDuration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getHasOverlappingRendering()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollBarSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool GetHasOverlappingRendering()
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollBarSize()
         {
-            return IExecuteWithSignature<bool>("getHasOverlappingRendering", "()Z");
+            return IExecuteWithSignature<int>("getScrollBarSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getLocalVisibleRect(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollBarStyle()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool GetLocalVisibleRect(Android.Graphics.Rect arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollBarStyle()
         {
-            return IExecuteWithSignature<bool>("getLocalVisibleRect", "(Landroid/graphics/Rect;)Z", arg0);
+            return IExecuteWithSignature<int>("getScrollBarStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isFocusable()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollCaptureHint()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFocusable()
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollCaptureHint()
         {
-            return IExecuteWithSignature<bool>("isFocusable", "()Z");
+            return IExecuteWithSignature<int>("getScrollCaptureHint", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isFocusableInTouchMode()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getScrollIndicators()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFocusableInTouchMode()
+        /// <returns><see cref="int"/></returns>
+        public int GetScrollIndicators()
         {
-            return IExecuteWithSignature<bool>("isFocusableInTouchMode", "()Z");
+            return IExecuteWithSignature<int>("getScrollIndicators", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isFocusedByDefault()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getSolidColor()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFocusedByDefault()
+        /// <returns><see cref="int"/></returns>
+        public int GetSolidColor()
         {
-            return IExecuteWithSignature<bool>("isFocusedByDefault", "()Z");
+            return IExecuteWithSignature<int>("getSolidColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isImportantForAutofill()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getSourceLayoutResId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsImportantForAutofill()
+        /// <returns><see cref="int"/></returns>
+        public int GetSourceLayoutResId()
         {
-            return IExecuteWithSignature<bool>("isImportantForAutofill", "()Z");
+            return IExecuteWithSignature<int>("getSourceLayoutResId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isImportantForContentCapture()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getSystemUiVisibility()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsImportantForContentCapture()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSystemUiVisibility()
         {
-            return IExecuteWithSignature<bool>("isImportantForContentCapture", "()Z");
+            return IExecuteWithSignature<int>("getSystemUiVisibility", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isKeyboardNavigationCluster()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTextAlignment()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsKeyboardNavigationCluster()
+        /// <returns><see cref="int"/></returns>
+        public int GetTextAlignment()
         {
-            return IExecuteWithSignature<bool>("isKeyboardNavigationCluster", "()Z");
+            return IExecuteWithSignature<int>("getTextAlignment", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isPreferKeepClear()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTextDirection()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPreferKeepClear()
+        /// <returns><see cref="int"/></returns>
+        public int GetTextDirection()
         {
-            return IExecuteWithSignature<bool>("isPreferKeepClear", "()Z");
+            return IExecuteWithSignature<int>("getTextDirection", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isShowingLayoutBounds()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalFadingEdgeLength()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsShowingLayoutBounds()
+        /// <returns><see cref="int"/></returns>
+        public int GetVerticalFadingEdgeLength()
         {
-            return IExecuteWithSignature<bool>("isShowingLayoutBounds", "()Z");
+            return IExecuteWithSignature<int>("getVerticalFadingEdgeLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#isTemporarilyDetached()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalScrollbarPosition()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTemporarilyDetached()
+        /// <returns><see cref="int"/></returns>
+        public int GetVerticalScrollbarPosition()
         {
-            return IExecuteWithSignature<bool>("isTemporarilyDetached", "()Z");
+            return IExecuteWithSignature<int>("getVerticalScrollbarPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requestFocus()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getVerticalScrollbarWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool RequestFocus()
+        /// <returns><see cref="int"/></returns>
+        public int GetVerticalScrollbarWidth()
         {
-            return IExecuteWithSignature<bool>("requestFocus", "()Z");
+            return IExecuteWithSignature<int>("getVerticalScrollbarWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requestFocus(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getVisibility()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RequestFocus(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetVisibility()
         {
-            return IExecuteWithSignature<bool>("requestFocus", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getVisibility", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requestFocusFromTouch()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowSystemUiVisibility()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool RequestFocusFromTouch()
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetWindowSystemUiVisibility()
         {
-            return IExecuteWithSignature<bool>("requestFocusFromTouch", "()Z");
+            return IExecuteWithSignature<int>("getWindowSystemUiVisibility", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#startDrag(android.content.ClipData,android.view.View.DragShadowBuilder,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getWindowVisibility()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.ClipData"/></param>
-        /// <param name="arg1"><see cref="Android.View.View.DragShadowBuilder"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool StartDrag(Android.Content.ClipData arg0, Android.View.View.DragShadowBuilder arg1, object arg2, int arg3)
+        /// <returns><see cref="int"/></returns>
+        public int GetWindowVisibility()
         {
-            return IExecute<bool>("startDrag", arg0, arg1, arg2, arg3);
+            return IExecuteWithSignature<int>("getWindowVisibility", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#startDragAndDrop(android.content.ClipData,android.view.View.DragShadowBuilder,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAttributeResolutionStack(int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.ClipData"/></param>
-        /// <param name="arg1"><see cref="Android.View.View.DragShadowBuilder"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool StartDragAndDrop(Android.Content.ClipData arg0, Android.View.View.DragShadowBuilder arg1, object arg2, int arg3)
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int[] GetAttributeResolutionStack(int arg0)
         {
-            return IExecute<bool>("startDragAndDrop", arg0, arg1, arg2, arg3);
+            return IExecuteWithSignatureArray<int>("getAttributeResolutionStack", "(I)[I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#cancelDragAndDrop()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityClassName()"/>
         /// </summary>
-        public void CancelDragAndDrop()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetAccessibilityClassName()
         {
-            IExecuteWithSignature("cancelDragAndDrop", "()V");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getAccessibilityClassName", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#cancelPendingInputEvents()"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAccessibilityPaneTitle()"/>
         /// </summary>
-        public void CancelPendingInputEvents()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetAccessibilityPaneTitle()
         {
-            IExecuteWithSignature("cancelPendingInputEvents", "()V");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getAccessibilityPaneTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#measure(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getContentDescription()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public void Measure(int arg0, int arg1)
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetContentDescription()
         {
-            IExecute("measure", arg0, arg1);
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getContentDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requestUnbufferedDispatch(android.view.MotionEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTooltipText()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        public void RequestUnbufferedDispatch(Android.View.MotionEvent arg0)
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTooltipText()
         {
-            IExecuteWithSignature("requestUnbufferedDispatch", "(Landroid/view/MotionEvent;)V", arg0);
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTooltipText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#requestUnbufferedDispatch(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTag()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void RequestUnbufferedDispatch(int arg0)
+        /// <returns><see cref="object"/></returns>
+        public object GetTag()
         {
-            IExecuteWithSignature("requestUnbufferedDispatch", "(I)V", arg0);
+            return IExecuteWithSignature("getTag", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#saveAttributeDataForStyleable(android.content.Context,int[],android.util.AttributeSet,android.content.res.TypedArray,int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTag(int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="Android.Util.AttributeSet"/></param>
-        /// <param name="arg3"><see cref="Android.Content.Res.TypedArray"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        public void SaveAttributeDataForStyleable(Android.Content.Context arg0, int[] arg1, Android.Util.AttributeSet arg2, Android.Content.Res.TypedArray arg3, int arg4, int arg5)
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="object"/></returns>
+        public object GetTag(int arg0)
         {
-            IExecute("saveAttributeDataForStyleable", arg0, arg1, arg2, arg3, arg4, arg5);
+            return IExecuteWithSignature("getTag", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#setLeftTopRightBottom(int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getHandwritingDelegatorCallback()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        public void SetLeftTopRightBottom(int arg0, int arg1, int arg2, int arg3)
+        /// <returns><see cref="Java.Lang.Runnable"/></returns>
+        public Java.Lang.Runnable GetHandwritingDelegatorCallback()
         {
-            IExecute("setLeftTopRightBottom", arg0, arg1, arg2, arg3);
+            return IExecuteWithSignature<Java.Lang.Runnable>("getHandwritingDelegatorCallback", "()Ljava/lang/Runnable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#setPreferKeepClear(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAllowedHandwritingDelegatePackageName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        public void SetPreferKeepClear(bool arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAllowedHandwritingDelegatePackageName()
         {
-            IExecuteWithSignature("setPreferKeepClear", "(Z)V", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getAllowedHandwritingDelegatePackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollCaptureCallback(android.view.ScrollCaptureCallback)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAllowedHandwritingDelegatorPackageName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.ScrollCaptureCallback"/></param>
-        public void SetScrollCaptureCallback(Android.View.ScrollCaptureCallback arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAllowedHandwritingDelegatorPackageName()
         {
-            IExecuteWithSignature("setScrollCaptureCallback", "(Landroid/view/ScrollCaptureCallback;)V", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getAllowedHandwritingDelegatorPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#updateDragShadow(android.view.View.DragShadowBuilder)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTransitionName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View.DragShadowBuilder"/></param>
-        public void UpdateDragShadow(Android.View.View.DragShadowBuilder arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTransitionName()
         {
-            IExecuteWithSignature("updateDragShadow", "(Landroid/view/View$DragShadowBuilder;)V", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getTransitionName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getAttributeResolutionStack(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAutofillHints()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int[] GetAttributeResolutionStack(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetAutofillHints()
         {
-            return IExecuteWithSignatureArray<int>("getAttributeResolutionStack", "(I)[I", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.String>("getAutofillHints", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/View.html#getTag(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getReceiveContentMimeTypes()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="object"/></returns>
-        public object GetTag(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetReceiveContentMimeTypes()
         {
-            return IExecuteWithSignature("getTag", "(I)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.String>("getReceiveContentMimeTypes", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#getFocusables(int)"/>
@@ -3601,6 +3781,46 @@ public object GetTag(int arg0)
             return IExecuteWithSignature<Java.Util.ArrayList<Android.View.View>>("getFocusables", "(I)Ljava/util/ArrayList;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getTouchables()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.ArrayList"/></returns>
+        public Java.Util.ArrayList<Android.View.View> GetTouchables()
+        {
+            return IExecuteWithSignature<Java.Util.ArrayList<Android.View.View>>("getTouchables", "()Ljava/util/ArrayList;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getSystemGestureExclusionRects()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Graphics.Rect> GetSystemGestureExclusionRects()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Graphics.Rect>>("getSystemGestureExclusionRects", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getAttributeSourceResourceMap()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.Integer, Java.Lang.Integer> GetAttributeSourceResourceMap()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.Integer, Java.Lang.Integer>>("getAttributeSourceResourceMap", "()Ljava/util/Map;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getDrawingTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDrawingTime()
+        {
+            return IExecuteWithSignature<long>("getDrawingTime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#getUniqueDrawingId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetUniqueDrawingId()
+        {
+            return IExecuteWithSignature<long>("getUniqueDrawingId", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#addChildrenForAccessibility(java.util.ArrayList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.ArrayList"/></param>
@@ -3712,7 +3932,7 @@ public void BringToFront()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#buildDrawingCache()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void BuildDrawingCache()
         {
             IExecuteWithSignature("buildDrawingCache", "()V");
@@ -3721,7 +3941,7 @@ public void BuildDrawingCache()
         /// <see href="https://developer.android.com/reference/android/view/View.html#buildDrawingCache(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void BuildDrawingCache(bool arg0)
         {
             IExecuteWithSignature("buildDrawingCache", "(Z)V", arg0);
@@ -3779,7 +3999,7 @@ public void CreateContextMenu(Android.View.ContextMenu arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#destroyDrawingCache()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DestroyDrawingCache()
         {
             IExecuteWithSignature("destroyDrawingCache", "()V");
@@ -3873,7 +4093,7 @@ public void DispatchStartTemporaryDetach()
         /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchSystemUiVisibilityChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchSystemUiVisibilityChanged(int arg0)
         {
             IExecuteWithSignature("dispatchSystemUiVisibilityChanged", "(I)V", arg0);
@@ -3906,7 +4126,7 @@ public void DispatchWindowInsetsAnimationPrepare(Android.View.WindowInsetsAnimat
         /// <see href="https://developer.android.com/reference/android/view/View.html#dispatchWindowSystemUiVisiblityChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchWindowSystemUiVisiblityChanged(int arg0)
         {
             IExecuteWithSignature("dispatchWindowSystemUiVisiblityChanged", "(I)V", arg0);
@@ -4039,7 +4259,7 @@ public void Invalidate()
         /// <see href="https://developer.android.com/reference/android/view/View.html#invalidate(android.graphics.Rect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Invalidate(Android.Graphics.Rect arg0)
         {
             IExecuteWithSignature("invalidate", "(Landroid/graphics/Rect;)V", arg0);
@@ -4051,7 +4271,7 @@ public void Invalidate(Android.Graphics.Rect arg0)
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Invalidate(int arg0, int arg1, int arg2, int arg3)
         {
             IExecute("invalidate", arg0, arg1, arg2, arg3);
@@ -4298,7 +4518,7 @@ public void OnWindowFocusChanged(bool arg0)
         /// <see href="https://developer.android.com/reference/android/view/View.html#onWindowSystemUiVisibilityChanged(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnWindowSystemUiVisibilityChanged(int arg0)
         {
             IExecuteWithSignature("onWindowSystemUiVisibilityChanged", "(I)V", arg0);
@@ -4432,7 +4652,7 @@ public void RequestApplyInsets()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#requestFitSystemWindows()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestFitSystemWindows()
         {
             IExecuteWithSignature("requestFitSystemWindows", "()V");
@@ -4543,6 +4763,38 @@ public void SetAccessibilityHeading(bool arg0)
             IExecuteWithSignature("setAccessibilityHeading", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAccessibilityLiveRegion(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAccessibilityLiveRegion(int arg0)
+        {
+            IExecuteWithSignature("setAccessibilityLiveRegion", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAccessibilityPaneTitle(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetAccessibilityPaneTitle(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setAccessibilityPaneTitle", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAccessibilityTraversalAfter(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAccessibilityTraversalAfter(int arg0)
+        {
+            IExecuteWithSignature("setAccessibilityTraversalAfter", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAccessibilityTraversalBefore(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAccessibilityTraversalBefore(int arg0)
+        {
+            IExecuteWithSignature("setAccessibilityTraversalBefore", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setActivated(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4575,6 +4827,46 @@ public void SetAllowedHandwritingDelegatorPackage(Java.Lang.String arg0)
             IExecuteWithSignature("setAllowedHandwritingDelegatorPackage", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAlpha(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetAlpha(float arg0)
+        {
+            IExecuteWithSignature("setAlpha", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAnimation(android.view.animation.Animation)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.Animation"/></param>
+        public void SetAnimation(Android.View.Animation.Animation arg0)
+        {
+            IExecuteWithSignature("setAnimation", "(Landroid/view/animation/Animation;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAnimationMatrix(android.graphics.Matrix)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Matrix"/></param>
+        public void SetAnimationMatrix(Android.Graphics.Matrix arg0)
+        {
+            IExecuteWithSignature("setAnimationMatrix", "(Landroid/graphics/Matrix;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAutofillHints(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetAutofillHints(params Java.Lang.String[] arg0)
+        {
+            if (arg0.Length == 0) IExecuteWithSignature("setAutofillHints", "([Ljava/lang/String;)V"); else IExecuteWithSignature("setAutofillHints", "([Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setAutofillId(android.view.autofill.AutofillId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Autofill.AutofillId"/></param>
+        public void SetAutofillId(Android.View.Autofill.AutofillId arg0)
+        {
+            IExecuteWithSignature("setAutofillId", "(Landroid/view/autofill/AutofillId;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setAutoHandwritingEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4583,6 +4875,14 @@ public void SetAutoHandwritingEnabled(bool arg0)
             IExecuteWithSignature("setAutoHandwritingEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setBackground(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetBackground(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setBackground", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setBackgroundColor(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -4594,7 +4894,7 @@ public void SetBackgroundColor(int arg0)
         /// <see href="https://developer.android.com/reference/android/view/View.html#setBackgroundDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetBackgroundDrawable(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setBackgroundDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
@@ -4608,6 +4908,38 @@ public void SetBackgroundResource(int arg0)
             IExecuteWithSignature("setBackgroundResource", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setBackgroundTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetBackgroundTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setBackgroundTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setBackgroundTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetBackgroundTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setBackgroundTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setBackgroundTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetBackgroundTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setBackgroundTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setCameraDistance(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetCameraDistance(float arg0)
+        {
+            IExecuteWithSignature("setCameraDistance", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setClickable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4616,6 +4948,38 @@ public void SetClickable(bool arg0)
             IExecuteWithSignature("setClickable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setClipBounds(android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        public void SetClipBounds(Android.Graphics.Rect arg0)
+        {
+            IExecuteWithSignature("setClipBounds", "(Landroid/graphics/Rect;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setClipToOutline(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetClipToOutline(bool arg0)
+        {
+            IExecuteWithSignature("setClipToOutline", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setContentCaptureSession(android.view.contentcapture.ContentCaptureSession)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Contentcapture.ContentCaptureSession"/></param>
+        public void SetContentCaptureSession(Android.View.Contentcapture.ContentCaptureSession arg0)
+        {
+            IExecuteWithSignature("setContentCaptureSession", "(Landroid/view/contentcapture/ContentCaptureSession;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setContentDescription(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetContentDescription(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setContentDescription", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setContextClickable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4624,15 +4988,41 @@ public void SetContextClickable(bool arg0)
             IExecuteWithSignature("setContextClickable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setDefaultFocusHighlightEnabled(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDefaultFocusHighlightEnabled(bool arg0)
+        {
+            IExecuteWithSignature("setDefaultFocusHighlightEnabled", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setDrawingCacheBackgroundColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetDrawingCacheBackgroundColor(int arg0)
+        {
+            IExecuteWithSignature("setDrawingCacheBackgroundColor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setDrawingCacheEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDrawingCacheEnabled(bool arg0)
         {
             IExecuteWithSignature("setDrawingCacheEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setDrawingCacheQuality(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetDrawingCacheQuality(int arg0)
+        {
+            IExecuteWithSignature("setDrawingCacheQuality", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setDuplicateParentStateEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4641,6 +5031,14 @@ public void SetDuplicateParentStateEnabled(bool arg0)
             IExecuteWithSignature("setDuplicateParentStateEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setElevation(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetElevation(float arg0)
+        {
+            IExecuteWithSignature("setElevation", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4657,6 +5055,22 @@ public void SetFadingEdgeLength(int arg0)
             IExecuteWithSignature("setFadingEdgeLength", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setFilterTouchesWhenObscured(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetFilterTouchesWhenObscured(bool arg0)
+        {
+            IExecuteWithSignature("setFilterTouchesWhenObscured", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setFitsSystemWindows(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetFitsSystemWindows(bool arg0)
+        {
+            IExecuteWithSignature("setFitsSystemWindows", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setFocusable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4697,6 +5111,46 @@ public void SetForceDarkAllowed(bool arg0)
             IExecuteWithSignature("setForceDarkAllowed", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setForeground(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetForeground(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setForeground", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setForegroundGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetForegroundGravity(int arg0)
+        {
+            IExecuteWithSignature("setForegroundGravity", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setForegroundTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetForegroundTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setForegroundTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setForegroundTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetForegroundTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setForegroundTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setForegroundTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetForegroundTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setForegroundTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setHandwritingBoundsOffsets(float,float,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -4708,6 +5162,14 @@ public void SetHandwritingBoundsOffsets(float arg0, float arg1, float arg2, floa
             IExecute("setHandwritingBoundsOffsets", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setHandwritingDelegatorCallback(java.lang.Runnable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
+        public void SetHandwritingDelegatorCallback(Java.Lang.Runnable arg0)
+        {
+            IExecuteWithSignature("setHandwritingDelegatorCallback", "(Ljava/lang/Runnable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setHapticFeedbackEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4740,12 +5202,60 @@ public void SetHorizontalScrollBarEnabled(bool arg0)
             IExecuteWithSignature("setHorizontalScrollBarEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setHorizontalScrollbarThumbDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetHorizontalScrollbarThumbDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setHorizontalScrollbarThumbDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setHorizontalScrollbarTrackDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetHorizontalScrollbarTrackDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setHorizontalScrollbarTrackDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setHovered(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetHovered(bool arg0)
         {
-            IExecuteWithSignature("setHovered", "(Z)V", arg0);
+            IExecuteWithSignature("setHovered", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetId(int arg0)
+        {
+            IExecuteWithSignature("setId", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setImportantForAccessibility(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetImportantForAccessibility(int arg0)
+        {
+            IExecuteWithSignature("setImportantForAccessibility", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setImportantForAutofill(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetImportantForAutofill(int arg0)
+        {
+            IExecuteWithSignature("setImportantForAutofill", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setImportantForContentCapture(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetImportantForContentCapture(int arg0)
+        {
+            IExecuteWithSignature("setImportantForContentCapture", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setIsCredential(boolean)"/>
@@ -4764,6 +5274,14 @@ public void SetIsHandwritingDelegate(bool arg0)
             IExecuteWithSignature("setIsHandwritingDelegate", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setKeepScreenOn(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetKeepScreenOn(bool arg0)
+        {
+            IExecuteWithSignature("setKeepScreenOn", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setKeyboardNavigationCluster(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4772,6 +5290,14 @@ public void SetKeyboardNavigationCluster(bool arg0)
             IExecuteWithSignature("setKeyboardNavigationCluster", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setLabelFor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLabelFor(int arg0)
+        {
+            IExecuteWithSignature("setLabelFor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setLayerPaint(android.graphics.Paint)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Paint"/></param>
@@ -4789,6 +5315,22 @@ public void SetLayerType(int arg0, Android.Graphics.Paint arg1)
             IExecute("setLayerType", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setLayoutDirection(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLayoutDirection(int arg0)
+        {
+            IExecuteWithSignature("setLayoutDirection", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setLayoutParams(android.view.ViewGroup.LayoutParams)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.ViewGroup.LayoutParams"/></param>
+        public void SetLayoutParams(Android.View.ViewGroup.LayoutParams arg0)
+        {
+            IExecuteWithSignature("setLayoutParams", "(Landroid/view/ViewGroup$LayoutParams;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setLongClickable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4797,6 +5339,22 @@ public void SetLongClickable(bool arg0)
             IExecuteWithSignature("setLongClickable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setMinimumHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumHeight(int arg0)
+        {
+            IExecuteWithSignature("setMinimumHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setMinimumWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumWidth(int arg0)
+        {
+            IExecuteWithSignature("setMinimumWidth", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setNestedScrollingEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4805,6 +5363,54 @@ public void SetNestedScrollingEnabled(bool arg0)
             IExecuteWithSignature("setNestedScrollingEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setNextClusterForwardId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNextClusterForwardId(int arg0)
+        {
+            IExecuteWithSignature("setNextClusterForwardId", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusDownId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNextFocusDownId(int arg0)
+        {
+            IExecuteWithSignature("setNextFocusDownId", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusForwardId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNextFocusForwardId(int arg0)
+        {
+            IExecuteWithSignature("setNextFocusForwardId", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusLeftId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNextFocusLeftId(int arg0)
+        {
+            IExecuteWithSignature("setNextFocusLeftId", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusRightId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNextFocusRightId(int arg0)
+        {
+            IExecuteWithSignature("setNextFocusRightId", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setNextFocusUpId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNextFocusUpId(int arg0)
+        {
+            IExecuteWithSignature("setNextFocusUpId", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View.OnApplyWindowInsetsListener"/></param>
@@ -4913,7 +5519,7 @@ public void SetOnScrollChangeListener(Android.View.View.OnScrollChangeListener a
         /// <see href="https://developer.android.com/reference/android/view/View.html#setOnSystemUiVisibilityChangeListener(android.view.View.OnSystemUiVisibilityChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View.OnSystemUiVisibilityChangeListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnSystemUiVisibilityChangeListener(Android.View.View.OnSystemUiVisibilityChangeListener arg0)
         {
             IExecuteWithSignature("setOnSystemUiVisibilityChangeListener", "(Landroid/view/View$OnSystemUiVisibilityChangeListener;)V", arg0);
@@ -4927,6 +5533,38 @@ public void SetOnTouchListener(Android.View.View.OnTouchListener arg0)
             IExecuteWithSignature("setOnTouchListener", "(Landroid/view/View$OnTouchListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setOutlineAmbientShadowColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOutlineAmbientShadowColor(int arg0)
+        {
+            IExecuteWithSignature("setOutlineAmbientShadowColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setOutlineProvider(android.view.ViewOutlineProvider)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.ViewOutlineProvider"/></param>
+        public void SetOutlineProvider(Android.View.ViewOutlineProvider arg0)
+        {
+            IExecuteWithSignature("setOutlineProvider", "(Landroid/view/ViewOutlineProvider;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setOutlineSpotShadowColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOutlineSpotShadowColor(int arg0)
+        {
+            IExecuteWithSignature("setOutlineSpotShadowColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setOverScrollMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOverScrollMode(int arg0)
+        {
+            IExecuteWithSignature("setOverScrollMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setPadding(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -4949,6 +5587,30 @@ public void SetPaddingRelative(int arg0, int arg1, int arg2, int arg3)
             IExecute("setPaddingRelative", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setPivotX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetPivotX(float arg0)
+        {
+            IExecuteWithSignature("setPivotX", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setPivotY(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetPivotY(float arg0)
+        {
+            IExecuteWithSignature("setPivotY", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setPointerIcon(android.view.PointerIcon)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.PointerIcon"/></param>
+        public void SetPointerIcon(Android.View.PointerIcon arg0)
+        {
+            IExecuteWithSignature("setPointerIcon", "(Landroid/view/PointerIcon;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setPressed(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4965,6 +5627,30 @@ public void SetRenderEffect(Android.Graphics.RenderEffect arg0)
             IExecuteWithSignature("setRenderEffect", "(Landroid/graphics/RenderEffect;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setRotation(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetRotation(float arg0)
+        {
+            IExecuteWithSignature("setRotation", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setRotationX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetRotationX(float arg0)
+        {
+            IExecuteWithSignature("setRotationX", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setRotationY(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetRotationY(float arg0)
+        {
+            IExecuteWithSignature("setRotationY", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setSaveEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4981,6 +5667,22 @@ public void SetSaveFromParentEnabled(bool arg0)
             IExecuteWithSignature("setSaveFromParentEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScaleX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetScaleX(float arg0)
+        {
+            IExecuteWithSignature("setScaleX", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScaleY(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetScaleY(float arg0)
+        {
+            IExecuteWithSignature("setScaleY", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setScreenReaderFocusable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4989,6 +5691,22 @@ public void SetScreenReaderFocusable(bool arg0)
             IExecuteWithSignature("setScreenReaderFocusable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollBarDefaultDelayBeforeFade(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollBarDefaultDelayBeforeFade(int arg0)
+        {
+            IExecuteWithSignature("setScrollBarDefaultDelayBeforeFade", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollBarFadeDuration(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollBarFadeDuration(int arg0)
+        {
+            IExecuteWithSignature("setScrollBarFadeDuration", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollbarFadingEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -4997,6 +5715,30 @@ public void SetScrollbarFadingEnabled(bool arg0)
             IExecuteWithSignature("setScrollbarFadingEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollBarSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollBarSize(int arg0)
+        {
+            IExecuteWithSignature("setScrollBarSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollBarStyle(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollBarStyle(int arg0)
+        {
+            IExecuteWithSignature("setScrollBarStyle", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollCaptureHint(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollCaptureHint(int arg0)
+        {
+            IExecuteWithSignature("setScrollCaptureHint", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollContainer(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -5014,6 +5756,30 @@ public void SetScrollIndicators(int arg0, int arg1)
             IExecute("setScrollIndicators", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollIndicators(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollIndicators(int arg0)
+        {
+            IExecuteWithSignature("setScrollIndicators", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollX(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollX(int arg0)
+        {
+            IExecuteWithSignature("setScrollX", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setScrollY(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetScrollY(int arg0)
+        {
+            IExecuteWithSignature("setScrollY", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setSelected(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -5030,6 +5796,39 @@ public void SetSoundEffectsEnabled(bool arg0)
             IExecuteWithSignature("setSoundEffectsEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setStateDescription(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetStateDescription(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setStateDescription", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setStateListAnimator(android.animation.StateListAnimator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Animation.StateListAnimator"/></param>
+        public void SetStateListAnimator(Android.Animation.StateListAnimator arg0)
+        {
+            IExecuteWithSignature("setStateListAnimator", "(Landroid/animation/StateListAnimator;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setSystemGestureExclusionRects(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetSystemGestureExclusionRects(Java.Util.List<Android.Graphics.Rect> arg0)
+        {
+            IExecuteWithSignature("setSystemGestureExclusionRects", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetSystemUiVisibility(int arg0)
+        {
+            IExecuteWithSignature("setSystemUiVisibility", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setTag(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -5039,6 +5838,54 @@ public void SetTag(int arg0, object arg1)
             IExecute("setTag", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTag(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetTag(object arg0)
+        {
+            IExecuteWithSignature("setTag", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTextAlignment(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTextAlignment(int arg0)
+        {
+            IExecuteWithSignature("setTextAlignment", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTextDirection(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTextDirection(int arg0)
+        {
+            IExecuteWithSignature("setTextDirection", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTooltipText(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetTooltipText(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setTooltipText", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTouchDelegate(android.view.TouchDelegate)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.TouchDelegate"/></param>
+        public void SetTouchDelegate(Android.View.TouchDelegate arg0)
+        {
+            IExecuteWithSignature("setTouchDelegate", "(Landroid/view/TouchDelegate;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTransitionAlpha(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTransitionAlpha(float arg0)
+        {
+            IExecuteWithSignature("setTransitionAlpha", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setTransitionVisibility(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -5047,6 +5894,30 @@ public void SetTransitionVisibility(int arg0)
             IExecuteWithSignature("setTransitionVisibility", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTranslationX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTranslationX(float arg0)
+        {
+            IExecuteWithSignature("setTranslationX", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTranslationY(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTranslationY(float arg0)
+        {
+            IExecuteWithSignature("setTranslationY", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setTranslationZ(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTranslationZ(float arg0)
+        {
+            IExecuteWithSignature("setTranslationZ", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setVerticalFadingEdgeEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -5063,6 +5934,30 @@ public void SetVerticalScrollBarEnabled(bool arg0)
             IExecuteWithSignature("setVerticalScrollBarEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setVerticalScrollbarPosition(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVerticalScrollbarPosition(int arg0)
+        {
+            IExecuteWithSignature("setVerticalScrollbarPosition", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setVerticalScrollbarThumbDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetVerticalScrollbarThumbDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setVerticalScrollbarThumbDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setVerticalScrollbarTrackDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetVerticalScrollbarTrackDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setVerticalScrollbarTrackDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setViewTranslationCallback(android.view.translation.ViewTranslationCallback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Translation.ViewTranslationCallback"/></param>
@@ -5071,10 +5966,18 @@ public void SetViewTranslationCallback(Android.View.Translation.ViewTranslationC
             IExecuteWithSignature("setViewTranslationCallback", "(Landroid/view/translation/ViewTranslationCallback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setVisibility(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVisibility(int arg0)
+        {
+            IExecuteWithSignature("setVisibility", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#setWillNotCacheDrawing(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetWillNotCacheDrawing(bool arg0)
         {
             IExecuteWithSignature("setWillNotCacheDrawing", "(Z)V", arg0);
@@ -5096,6 +5999,30 @@ public void SetWindowInsetsAnimationCallback(Android.View.WindowInsetsAnimation.
             IExecuteWithSignature("setWindowInsetsAnimationCallback", "(Landroid/view/WindowInsetsAnimation$Callback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetX(float arg0)
+        {
+            IExecuteWithSignature("setX", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setY(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetY(float arg0)
+        {
+            IExecuteWithSignature("setY", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/View.html#setZ(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetZ(float arg0)
+        {
+            IExecuteWithSignature("setZ", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/View.html#startAnimation(android.view.animation.Animation)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Animation.Animation"/></param>
@@ -5366,11 +6293,12 @@ public DragShadowBuilder(Android.View.View arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/View.DragShadowBuilder.html#getView()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/View.DragShadowBuilder.html#getView()"/>
             /// </summary>
-            public Android.View.View GetView
+            /// <returns><see cref="Android.View.View"/></returns>
+            public Android.View.View GetView()
             {
-                get { return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;"); }
+                return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/View.DragShadowBuilder.html#onDrawShadow(android.graphics.Canvas)"/>
@@ -5511,7 +6439,7 @@ public partial class OnApplyWindowInsetsListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onApplyWindowInsets", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnApplyWindowInsetsEventHandler));
+                AddEventHandler("onApplyWindowInsets", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnApplyWindowInsetsEventHandler));
 
             }
 
@@ -5519,7 +6447,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnApplyWindowInsetsListener.html#onApplyWindowInsets(android.view.View,android.view.WindowInsets)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnApplyWindowInsets"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, Android.View.WindowInsets, Android.View.WindowInsets> OnOnApplyWindowInsets { get; set; } = null;
+            public global::System.Func<Android.View.View, Android.View.WindowInsets, Android.View.WindowInsets> OnOnApplyWindowInsets { get; set; } = null;
 
             void OnApplyWindowInsetsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -5615,8 +6543,8 @@ public partial class OnAttachStateChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onViewAttachedToWindow", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnViewAttachedToWindowEventHandler));
-                AddEventHandler("onViewDetachedFromWindow", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnViewDetachedFromWindowEventHandler));
+                AddEventHandler("onViewAttachedToWindow", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnViewAttachedToWindowEventHandler));
+                AddEventHandler("onViewDetachedFromWindow", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnViewDetachedFromWindowEventHandler));
 
             }
 
@@ -5624,7 +6552,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnAttachStateChangeListener.html#onViewAttachedToWindow(android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnViewAttachedToWindow"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View> OnOnViewAttachedToWindow { get; set; } = null;
+            public global::System.Action<Android.View.View> OnOnViewAttachedToWindow { get; set; } = null;
 
             void OnViewAttachedToWindowEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -5645,7 +6573,7 @@ public virtual void OnViewAttachedToWindow(Android.View.View arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnAttachStateChangeListener.html#onViewDetachedFromWindow(android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnViewDetachedFromWindow"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View> OnOnViewDetachedFromWindow { get; set; } = null;
+            public global::System.Action<Android.View.View> OnOnViewDetachedFromWindow { get; set; } = null;
 
             void OnViewDetachedFromWindowEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -5744,7 +6672,7 @@ public partial class OnCapturedPointerListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCapturedPointer", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnCapturedPointerEventHandler));
+                AddEventHandler("onCapturedPointer", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnCapturedPointerEventHandler));
 
             }
 
@@ -5752,7 +6680,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnCapturedPointerListener.html#onCapturedPointer(android.view.View,android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCapturedPointer"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, Android.View.MotionEvent, bool> OnOnCapturedPointer { get; set; } = null;
+            public global::System.Func<Android.View.View, Android.View.MotionEvent, bool> OnOnCapturedPointer { get; set; } = null;
 
             void OnCapturedPointerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -5848,7 +6776,7 @@ public partial class OnClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnClickEventHandler));
+                AddEventHandler("onClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnClickEventHandler));
 
             }
 
@@ -5856,7 +6784,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnClickListener.html#onClick(android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View> OnOnClick { get; set; } = null;
+            public global::System.Action<Android.View.View> OnOnClick { get; set; } = null;
 
             void OnClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -5947,7 +6875,7 @@ public partial class OnContextClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onContextClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnContextClickEventHandler));
+                AddEventHandler("onContextClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnContextClickEventHandler));
 
             }
 
@@ -5955,7 +6883,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnContextClickListener.html#onContextClick(android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnContextClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, bool> OnOnContextClick { get; set; } = null;
+            public global::System.Func<Android.View.View, bool> OnOnContextClick { get; set; } = null;
 
             void OnContextClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6049,7 +6977,7 @@ public partial class OnCreateContextMenuListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCreateContextMenu", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ContextMenu>>>(OnCreateContextMenuEventHandler));
+                AddEventHandler("onCreateContextMenu", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ContextMenu>>>(OnCreateContextMenuEventHandler));
 
             }
 
@@ -6057,7 +6985,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnCreateContextMenuListener.html#onCreateContextMenu(android.view.ContextMenu,android.view.View,android.view.ContextMenu.ContextMenuInfo)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCreateContextMenu"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.ContextMenu, Android.View.View, Android.View.ContextMenu.ContextMenuInfo> OnOnCreateContextMenu { get; set; } = null;
+            public global::System.Action<Android.View.ContextMenu, Android.View.View, Android.View.ContextMenu.ContextMenuInfo> OnOnCreateContextMenu { get; set; } = null;
 
             void OnCreateContextMenuEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ContextMenu>> data)
             {
@@ -6152,7 +7080,7 @@ public partial class OnDragListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDrag", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnDragEventHandler));
+                AddEventHandler("onDrag", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnDragEventHandler));
 
             }
 
@@ -6160,7 +7088,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnDragListener.html#onDrag(android.view.View,android.view.DragEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDrag"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, Android.View.DragEvent, bool> OnOnDrag { get; set; } = null;
+            public global::System.Func<Android.View.View, Android.View.DragEvent, bool> OnOnDrag { get; set; } = null;
 
             void OnDragEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6256,7 +7184,7 @@ public partial class OnFocusChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFocusChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnFocusChangeEventHandler));
+                AddEventHandler("onFocusChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnFocusChangeEventHandler));
 
             }
 
@@ -6264,7 +7192,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnFocusChangeListener.html#onFocusChange(android.view.View,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFocusChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View, bool> OnOnFocusChange { get; set; } = null;
+            public global::System.Action<Android.View.View, bool> OnOnFocusChange { get; set; } = null;
 
             void OnFocusChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6357,7 +7285,7 @@ public partial class OnGenericMotionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGenericMotion", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnGenericMotionEventHandler));
+                AddEventHandler("onGenericMotion", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnGenericMotionEventHandler));
 
             }
 
@@ -6365,7 +7293,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnGenericMotionListener.html#onGenericMotion(android.view.View,android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGenericMotion"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, Android.View.MotionEvent, bool> OnOnGenericMotion { get; set; } = null;
+            public global::System.Func<Android.View.View, Android.View.MotionEvent, bool> OnOnGenericMotion { get; set; } = null;
 
             void OnGenericMotionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6461,7 +7389,7 @@ public partial class OnHoverListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onHover", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnHoverEventHandler));
+                AddEventHandler("onHover", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnHoverEventHandler));
 
             }
 
@@ -6469,7 +7397,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnHoverListener.html#onHover(android.view.View,android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnHover"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, Android.View.MotionEvent, bool> OnOnHover { get; set; } = null;
+            public global::System.Func<Android.View.View, Android.View.MotionEvent, bool> OnOnHover { get; set; } = null;
 
             void OnHoverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6565,7 +7493,7 @@ public partial class OnKeyListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onKey", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyEventHandler));
+                AddEventHandler("onKey", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnKeyEventHandler));
 
             }
 
@@ -6573,7 +7501,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnKeyListener.html#onKey(android.view.View,int,android.view.KeyEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnKey"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, int, Android.View.KeyEvent, bool> OnOnKey { get; set; } = null;
+            public global::System.Func<Android.View.View, int, Android.View.KeyEvent, bool> OnOnKey { get; set; } = null;
 
             void OnKeyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6671,7 +7599,7 @@ public partial class OnLayoutChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onLayoutChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnLayoutChangeEventHandler));
+                AddEventHandler("onLayoutChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnLayoutChangeEventHandler));
 
             }
 
@@ -6679,7 +7607,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnLayoutChangeListener.html#onLayoutChange(android.view.View,int,int,int,int,int,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLayoutChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View, int, int, int, int, int, int, int, int> OnOnLayoutChange { get; set; } = null;
+            public global::System.Action<Android.View.View, int, int, int, int, int, int, int, int> OnOnLayoutChange { get; set; } = null;
 
             void OnLayoutChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6786,8 +7714,8 @@ public partial class OnLongClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onLongClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnLongClickEventHandler));
-                AddEventHandler("onLongClickUseDefaultHapticFeedback", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnLongClickUseDefaultHapticFeedbackEventHandler));
+                AddEventHandler("onLongClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnLongClickEventHandler));
+                AddEventHandler("onLongClickUseDefaultHapticFeedback", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnLongClickUseDefaultHapticFeedbackEventHandler));
 
             }
 
@@ -6795,7 +7723,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnLongClickListener.html#onLongClick(android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLongClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, bool> OnOnLongClick { get; set; } = null;
+            public global::System.Func<Android.View.View, bool> OnOnLongClick { get; set; } = null;
 
             void OnLongClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6828,7 +7756,7 @@ public bool OnLongClickUseDefaultHapticFeedbackDefault(Android.View.View arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnLongClickListener.html#onLongClickUseDefaultHapticFeedback(android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnLongClickUseDefaultHapticFeedback"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, bool> OnOnLongClickUseDefaultHapticFeedback { get; set; } = null;
+            public global::System.Func<Android.View.View, bool> OnOnLongClickUseDefaultHapticFeedback { get; set; } = null;
 
             void OnLongClickUseDefaultHapticFeedbackEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -6932,7 +7860,7 @@ public partial class OnScrollChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onScrollChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnScrollChangeEventHandler));
+                AddEventHandler("onScrollChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnScrollChangeEventHandler));
 
             }
 
@@ -6940,7 +7868,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnScrollChangeListener.html#onScrollChange(android.view.View,int,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScrollChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View, int, int, int, int> OnOnScrollChange { get; set; } = null;
+            public global::System.Action<Android.View.View, int, int, int, int> OnOnScrollChange { get; set; } = null;
 
             void OnScrollChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -7039,7 +7967,7 @@ public partial class OnSystemUiVisibilityChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSystemUiVisibilityChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSystemUiVisibilityChangeEventHandler));
+                AddEventHandler("onSystemUiVisibilityChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSystemUiVisibilityChangeEventHandler));
 
             }
 
@@ -7047,7 +7975,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnSystemUiVisibilityChangeListener.html#onSystemUiVisibilityChange(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSystemUiVisibilityChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnSystemUiVisibilityChange { get; set; } = null;
+            public global::System.Action<int> OnOnSystemUiVisibilityChange { get; set; } = null;
 
             void OnSystemUiVisibilityChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -7059,7 +7987,7 @@ void OnSystemUiVisibilityChangeEventHandler(object sender, CLRListenerEventArgs<
             /// <see href="https://developer.android.com/reference/android/view/View.OnSystemUiVisibilityChangeListener.html#onSystemUiVisibilityChange(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnSystemUiVisibilityChange(int arg0)
             {
                 
@@ -7099,7 +8027,7 @@ public partial class OnSystemUiVisibilityChangeListenerDirect
             /// <see href="https://developer.android.com/reference/android/view/View.OnSystemUiVisibilityChangeListener.html#onSystemUiVisibilityChange(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnSystemUiVisibilityChange(int arg0)
             {
                 IExecuteWithSignature("onSystemUiVisibilityChange", "(I)V", arg0);
@@ -7140,7 +8068,7 @@ public partial class OnTouchListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTouch", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnTouchEventHandler));
+                AddEventHandler("onTouch", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnTouchEventHandler));
 
             }
 
@@ -7148,7 +8076,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnTouchListener.html#onTouch(android.view.View,android.view.MotionEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTouch"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, Android.View.MotionEvent, bool> OnOnTouch { get; set; } = null;
+            public global::System.Func<Android.View.View, Android.View.MotionEvent, bool> OnOnTouch { get; set; } = null;
 
             void OnTouchEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -7244,7 +8172,7 @@ public partial class OnUnhandledKeyEventListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onUnhandledKeyEvent", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnUnhandledKeyEventEventHandler));
+                AddEventHandler("onUnhandledKeyEvent", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnUnhandledKeyEventEventHandler));
 
             }
 
@@ -7252,7 +8180,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/View.OnUnhandledKeyEventListener.html#onUnhandledKeyEvent(android.view.View,android.view.KeyEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnUnhandledKeyEvent"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.View, Android.View.KeyEvent, bool> OnOnUnhandledKeyEvent { get; set; } = null;
+            public global::System.Func<Android.View.View, Android.View.KeyEvent, bool> OnOnUnhandledKeyEvent { get; set; } = null;
 
             void OnUnhandledKeyEventEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/ViewConfiguration.cs b/src/net/Netdroid/Generated/Android/View/ViewConfiguration.cs
index ba22d6204..465315a78 100644
--- a/src/net/Netdroid/Generated/Android/View/ViewConfiguration.cs
+++ b/src/net/Netdroid/Generated/Android/View/ViewConfiguration.cs
@@ -42,359 +42,401 @@ public partial class ViewConfiguration
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getAmbiguousGestureMultiplier()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#get(android.content.Context)"/>
         /// </summary>
-        [System.Obsolete()]
-        public static float AmbiguousGestureMultiplier
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <returns><see cref="Android.View.ViewConfiguration"/></returns>
+        public static Android.View.ViewConfiguration Get(Android.Content.Context arg0)
         {
-            get { return SExecuteWithSignature<float>(LocalBridgeClazz, "getAmbiguousGestureMultiplier", "()F"); }
+            return SExecuteWithSignature<Android.View.ViewConfiguration>(LocalBridgeClazz, "get", "(Landroid/content/Context;)Landroid/view/ViewConfiguration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getDefaultActionModeHideDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getAmbiguousGestureMultiplier()"/>
         /// </summary>
-        public static long DefaultActionModeHideDuration
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public static float GetAmbiguousGestureMultiplier()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getDefaultActionModeHideDuration", "()J"); }
+            return SExecuteWithSignature<float>(LocalBridgeClazz, "getAmbiguousGestureMultiplier", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getDoubleTapTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScrollFriction()"/>
         /// </summary>
-        public static int DoubleTapTimeout
+        /// <returns><see cref="float"/></returns>
+        public static float GetScrollFriction()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getDoubleTapTimeout", "()I"); }
+            return SExecuteWithSignature<float>(LocalBridgeClazz, "getScrollFriction", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getEdgeSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getDoubleTapTimeout()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int EdgeSlop
+        /// <returns><see cref="int"/></returns>
+        public static int GetDoubleTapTimeout()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getEdgeSlop", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getDoubleTapTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getFadingEdgeLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getEdgeSlop()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int FadingEdgeLength
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetEdgeSlop()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getFadingEdgeLength", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getEdgeSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getGlobalActionKeyTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getFadingEdgeLength()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static long GlobalActionKeyTimeout
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetFadingEdgeLength()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getGlobalActionKeyTimeout", "()J"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getFadingEdgeLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getJumpTapTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getJumpTapTimeout()"/>
         /// </summary>
-        public static int JumpTapTimeout
+        /// <returns><see cref="int"/></returns>
+        public static int GetJumpTapTimeout()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getJumpTapTimeout", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getJumpTapTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getKeyRepeatDelay()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getKeyRepeatDelay()"/>
         /// </summary>
-        public static int KeyRepeatDelay
+        /// <returns><see cref="int"/></returns>
+        public static int GetKeyRepeatDelay()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getKeyRepeatDelay", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getKeyRepeatDelay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getKeyRepeatTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getKeyRepeatTimeout()"/>
         /// </summary>
-        public static int KeyRepeatTimeout
+        /// <returns><see cref="int"/></returns>
+        public static int GetKeyRepeatTimeout()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getKeyRepeatTimeout", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getKeyRepeatTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getLongPressTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getLongPressTimeout()"/>
         /// </summary>
-        public static int LongPressTimeout
+        /// <returns><see cref="int"/></returns>
+        public static int GetLongPressTimeout()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getLongPressTimeout", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getLongPressTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getMaximumDrawingCacheSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getMaximumDrawingCacheSize()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int MaximumDrawingCacheSize
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetMaximumDrawingCacheSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumDrawingCacheSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumDrawingCacheSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getMaximumFlingVelocity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getMaximumFlingVelocity()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int MaximumFlingVelocity
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetMaximumFlingVelocity()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumFlingVelocity", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaximumFlingVelocity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getMinimumFlingVelocity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getMinimumFlingVelocity()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int MinimumFlingVelocity
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetMinimumFlingVelocity()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMinimumFlingVelocity", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMinimumFlingVelocity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getMultiPressTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getMultiPressTimeout()"/>
         /// </summary>
-        public static int MultiPressTimeout
+        /// <returns><see cref="int"/></returns>
+        public static int GetMultiPressTimeout()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getMultiPressTimeout", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getMultiPressTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getPressedStateDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getPressedStateDuration()"/>
         /// </summary>
-        public static int PressedStateDuration
+        /// <returns><see cref="int"/></returns>
+        public static int GetPressedStateDuration()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getPressedStateDuration", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getPressedStateDuration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScrollBarFadeDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScrollBarFadeDuration()"/>
         /// </summary>
-        public static int ScrollBarFadeDuration
+        /// <returns><see cref="int"/></returns>
+        public static int GetScrollBarFadeDuration()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getScrollBarFadeDuration", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getScrollBarFadeDuration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScrollBarSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScrollBarSize()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int ScrollBarSize
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetScrollBarSize()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getScrollBarSize", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getScrollBarSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScrollDefaultDelay()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScrollDefaultDelay()"/>
         /// </summary>
-        public static int ScrollDefaultDelay
+        /// <returns><see cref="int"/></returns>
+        public static int GetScrollDefaultDelay()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getScrollDefaultDelay", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getScrollDefaultDelay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScrollFriction()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getTapTimeout()"/>
         /// </summary>
-        public static float ScrollFriction
+        /// <returns><see cref="int"/></returns>
+        public static int GetTapTimeout()
         {
-            get { return SExecuteWithSignature<float>(LocalBridgeClazz, "getScrollFriction", "()F"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getTapTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getTapTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getTouchSlop()"/>
         /// </summary>
-        public static int TapTimeout
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetTouchSlop()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getTapTimeout", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getTouchSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getTouchSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getWindowTouchSlop()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int TouchSlop
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public static int GetWindowTouchSlop()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getTouchSlop", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getWindowTouchSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getWindowTouchSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getDefaultActionModeHideDuration()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static int WindowTouchSlop
+        /// <returns><see cref="long"/></returns>
+        public static long GetDefaultActionModeHideDuration()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getWindowTouchSlop", "()I"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getDefaultActionModeHideDuration", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getZoomControlsTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getGlobalActionKeyTimeout()"/>
         /// </summary>
-        public static long ZoomControlsTimeout
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public static long GetGlobalActionKeyTimeout()
         {
-            get { return SExecuteWithSignature<long>(LocalBridgeClazz, "getZoomControlsTimeout", "()J"); }
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getGlobalActionKeyTimeout", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#get(android.content.Context)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getZoomControlsTimeout()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        /// <returns><see cref="Android.View.ViewConfiguration"/></returns>
-        public static Android.View.ViewConfiguration Get(Android.Content.Context arg0)
+        /// <returns><see cref="long"/></returns>
+        public static long GetZoomControlsTimeout()
         {
-            return SExecuteWithSignature<Android.View.ViewConfiguration>(LocalBridgeClazz, "get", "(Landroid/content/Context;)Landroid/view/ViewConfiguration;", arg0);
+            return SExecuteWithSignature<long>(LocalBridgeClazz, "getZoomControlsTimeout", "()J");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledAmbiguousGestureMultiplier()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#hasPermanentMenuKey()"/>
         /// </summary>
-        public float ScaledAmbiguousGestureMultiplier
+        /// <returns><see cref="bool"/></returns>
+        public bool HasPermanentMenuKey()
         {
-            get { return IExecuteWithSignature<float>("getScaledAmbiguousGestureMultiplier", "()F"); }
+            return IExecuteWithSignature<bool>("hasPermanentMenuKey", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledDoubleTapSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#shouldShowMenuShortcutsWhenKeyboardPresent()"/>
         /// </summary>
-        public int ScaledDoubleTapSlop
+        /// <returns><see cref="bool"/></returns>
+        public bool ShouldShowMenuShortcutsWhenKeyboardPresent()
         {
-            get { return IExecuteWithSignature<int>("getScaledDoubleTapSlop", "()I"); }
+            return IExecuteWithSignature<bool>("shouldShowMenuShortcutsWhenKeyboardPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledEdgeSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledAmbiguousGestureMultiplier()"/>
         /// </summary>
-        public int ScaledEdgeSlop
+        /// <returns><see cref="float"/></returns>
+        public float GetScaledAmbiguousGestureMultiplier()
         {
-            get { return IExecuteWithSignature<int>("getScaledEdgeSlop", "()I"); }
+            return IExecuteWithSignature<float>("getScaledAmbiguousGestureMultiplier", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledFadingEdgeLength()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledHorizontalScrollFactor()"/>
         /// </summary>
-        public int ScaledFadingEdgeLength
+        /// <returns><see cref="float"/></returns>
+        public float GetScaledHorizontalScrollFactor()
         {
-            get { return IExecuteWithSignature<int>("getScaledFadingEdgeLength", "()I"); }
+            return IExecuteWithSignature<float>("getScaledHorizontalScrollFactor", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledHandwritingGestureLineMargin()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledVerticalScrollFactor()"/>
         /// </summary>
-        public int ScaledHandwritingGestureLineMargin
+        /// <returns><see cref="float"/></returns>
+        public float GetScaledVerticalScrollFactor()
         {
-            get { return IExecuteWithSignature<int>("getScaledHandwritingGestureLineMargin", "()I"); }
+            return IExecuteWithSignature<float>("getScaledVerticalScrollFactor", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledHandwritingSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledDoubleTapSlop()"/>
         /// </summary>
-        public int ScaledHandwritingSlop
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledDoubleTapSlop()
         {
-            get { return IExecuteWithSignature<int>("getScaledHandwritingSlop", "()I"); }
+            return IExecuteWithSignature<int>("getScaledDoubleTapSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledHorizontalScrollFactor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledEdgeSlop()"/>
         /// </summary>
-        public float ScaledHorizontalScrollFactor
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledEdgeSlop()
         {
-            get { return IExecuteWithSignature<float>("getScaledHorizontalScrollFactor", "()F"); }
+            return IExecuteWithSignature<int>("getScaledEdgeSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledHoverSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledFadingEdgeLength()"/>
         /// </summary>
-        public int ScaledHoverSlop
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledFadingEdgeLength()
         {
-            get { return IExecuteWithSignature<int>("getScaledHoverSlop", "()I"); }
+            return IExecuteWithSignature<int>("getScaledFadingEdgeLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMaximumDrawingCacheSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledHandwritingGestureLineMargin()"/>
         /// </summary>
-        public int ScaledMaximumDrawingCacheSize
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledHandwritingGestureLineMargin()
         {
-            get { return IExecuteWithSignature<int>("getScaledMaximumDrawingCacheSize", "()I"); }
+            return IExecuteWithSignature<int>("getScaledHandwritingGestureLineMargin", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMaximumFlingVelocity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledHandwritingSlop()"/>
         /// </summary>
-        public int ScaledMaximumFlingVelocity
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledHandwritingSlop()
         {
-            get { return IExecuteWithSignature<int>("getScaledMaximumFlingVelocity", "()I"); }
+            return IExecuteWithSignature<int>("getScaledHandwritingSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMinimumFlingVelocity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledHoverSlop()"/>
         /// </summary>
-        public int ScaledMinimumFlingVelocity
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledHoverSlop()
         {
-            get { return IExecuteWithSignature<int>("getScaledMinimumFlingVelocity", "()I"); }
+            return IExecuteWithSignature<int>("getScaledHoverSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMinimumScalingSpan()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMaximumDrawingCacheSize()"/>
         /// </summary>
-        public int ScaledMinimumScalingSpan
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledMaximumDrawingCacheSize()
         {
-            get { return IExecuteWithSignature<int>("getScaledMinimumScalingSpan", "()I"); }
+            return IExecuteWithSignature<int>("getScaledMaximumDrawingCacheSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledOverflingDistance()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMaximumFlingVelocity()"/>
         /// </summary>
-        public int ScaledOverflingDistance
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledMaximumFlingVelocity()
         {
-            get { return IExecuteWithSignature<int>("getScaledOverflingDistance", "()I"); }
+            return IExecuteWithSignature<int>("getScaledMaximumFlingVelocity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledOverscrollDistance()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMaximumFlingVelocity(int,int,int)"/>
         /// </summary>
-        public int ScaledOverscrollDistance
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledMaximumFlingVelocity(int arg0, int arg1, int arg2)
         {
-            get { return IExecuteWithSignature<int>("getScaledOverscrollDistance", "()I"); }
+            return IExecute<int>("getScaledMaximumFlingVelocity", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledPagingTouchSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMinimumFlingVelocity()"/>
         /// </summary>
-        public int ScaledPagingTouchSlop
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledMinimumFlingVelocity()
         {
-            get { return IExecuteWithSignature<int>("getScaledPagingTouchSlop", "()I"); }
+            return IExecuteWithSignature<int>("getScaledMinimumFlingVelocity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledScrollBarSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMinimumFlingVelocity(int,int,int)"/>
         /// </summary>
-        public int ScaledScrollBarSize
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledMinimumFlingVelocity(int arg0, int arg1, int arg2)
         {
-            get { return IExecuteWithSignature<int>("getScaledScrollBarSize", "()I"); }
+            return IExecute<int>("getScaledMinimumFlingVelocity", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledTouchSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMinimumScalingSpan()"/>
         /// </summary>
-        public int ScaledTouchSlop
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledMinimumScalingSpan()
         {
-            get { return IExecuteWithSignature<int>("getScaledTouchSlop", "()I"); }
+            return IExecuteWithSignature<int>("getScaledMinimumScalingSpan", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledVerticalScrollFactor()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledOverflingDistance()"/>
         /// </summary>
-        public float ScaledVerticalScrollFactor
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledOverflingDistance()
         {
-            get { return IExecuteWithSignature<float>("getScaledVerticalScrollFactor", "()F"); }
+            return IExecuteWithSignature<int>("getScaledOverflingDistance", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledWindowTouchSlop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledOverscrollDistance()"/>
         /// </summary>
-        public int ScaledWindowTouchSlop
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledOverscrollDistance()
         {
-            get { return IExecuteWithSignature<int>("getScaledWindowTouchSlop", "()I"); }
+            return IExecuteWithSignature<int>("getScaledOverscrollDistance", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#hasPermanentMenuKey()"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledPagingTouchSlop()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasPermanentMenuKey()
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledPagingTouchSlop()
         {
-            return IExecuteWithSignature<bool>("hasPermanentMenuKey", "()Z");
+            return IExecuteWithSignature<int>("getScaledPagingTouchSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#shouldShowMenuShortcutsWhenKeyboardPresent()"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledScrollBarSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ShouldShowMenuShortcutsWhenKeyboardPresent()
+        /// <returns><see cref="int"/></returns>
+        public int GetScaledScrollBarSize()
         {
-            return IExecuteWithSignature<bool>("shouldShowMenuShortcutsWhenKeyboardPresent", "()Z");
+            return IExecuteWithSignature<int>("getScaledScrollBarSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMaximumFlingVelocity(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledTouchSlop()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public int GetScaledMaximumFlingVelocity(int arg0, int arg1, int arg2)
+        public int GetScaledTouchSlop()
         {
-            return IExecute<int>("getScaledMaximumFlingVelocity", arg0, arg1, arg2);
+            return IExecuteWithSignature<int>("getScaledTouchSlop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledMinimumFlingVelocity(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewConfiguration.html#getScaledWindowTouchSlop()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public int GetScaledMinimumFlingVelocity(int arg0, int arg1, int arg2)
+        public int GetScaledWindowTouchSlop()
         {
-            return IExecute<int>("getScaledMinimumFlingVelocity", arg0, arg1, arg2);
+            return IExecuteWithSignature<int>("getScaledWindowTouchSlop", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/ViewDebug.cs b/src/net/Netdroid/Generated/Android/View/ViewDebug.cs
index bc03af70e..3983fc725 100644
--- a/src/net/Netdroid/Generated/Android/View/ViewDebug.cs
+++ b/src/net/Netdroid/Generated/Android/View/ViewDebug.cs
@@ -40,14 +40,14 @@ public partial class ViewDebug
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewDebug.html#TRACE_HIERARCHY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool TRACE_HIERARCHY { get { if (!_TRACE_HIERARCHYReady) { _TRACE_HIERARCHYContent = SGetField<bool>(LocalBridgeClazz, "TRACE_HIERARCHY"); _TRACE_HIERARCHYReady = true; } return _TRACE_HIERARCHYContent; } }
         private static bool _TRACE_HIERARCHYContent = default;
         private static bool _TRACE_HIERARCHYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewDebug.html#TRACE_RECYCLER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool TRACE_RECYCLER { get { if (!_TRACE_RECYCLERReady) { _TRACE_RECYCLERContent = SGetField<bool>(LocalBridgeClazz, "TRACE_RECYCLER"); _TRACE_RECYCLERReady = true; } return _TRACE_RECYCLERContent; } }
         private static bool _TRACE_RECYCLERContent = default;
         private static bool _TRACE_RECYCLERReady = false; // this is used because in case of generics 
@@ -69,7 +69,7 @@ public static void DumpCapturedView(Java.Lang.String arg0, object arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void StartHierarchyTracing(Java.Lang.String arg0, Android.View.View arg1)
         {
             SExecute(LocalBridgeClazz, "startHierarchyTracing", arg0, arg1);
@@ -79,7 +79,7 @@ public static void StartHierarchyTracing(Java.Lang.String arg0, Android.View.Vie
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void StartRecyclerTracing(Java.Lang.String arg0, Android.View.View arg1)
         {
             SExecute(LocalBridgeClazz, "startRecyclerTracing", arg0, arg1);
@@ -87,7 +87,7 @@ public static void StartRecyclerTracing(Java.Lang.String arg0, Android.View.View
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewDebug.html#stopHierarchyTracing()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void StopHierarchyTracing()
         {
             SExecuteWithSignature(LocalBridgeClazz, "stopHierarchyTracing", "()V");
@@ -95,7 +95,7 @@ public static void StopHierarchyTracing()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewDebug.html#stopRecyclerTracing()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void StopRecyclerTracing()
         {
             SExecuteWithSignature(LocalBridgeClazz, "stopRecyclerTracing", "()V");
@@ -105,7 +105,7 @@ public static void StopRecyclerTracing()
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.View.ViewDebug.HierarchyTraceType"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void Trace(Android.View.View arg0, Android.View.ViewDebug.HierarchyTraceType arg1)
         {
             SExecute(LocalBridgeClazz, "trace", arg0, arg1);
@@ -116,7 +116,7 @@ public static void Trace(Android.View.View arg0, Android.View.ViewDebug.Hierarch
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.View.ViewDebug.RecyclerTraceType"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void Trace(Android.View.View arg0, Android.View.ViewDebug.RecyclerTraceType arg1, params int[] arg2)
         {
             if (arg2.Length == 0) SExecute(LocalBridgeClazz, "trace", arg0, arg1); else SExecute(LocalBridgeClazz, "trace", arg0, arg1, arg2);
@@ -349,56 +349,56 @@ public partial class HierarchyTraceType
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html#BUILD_CACHE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.HierarchyTraceType BUILD_CACHE { get { if (!_BUILD_CACHEReady) { _BUILD_CACHEContent = SGetField<Android.View.ViewDebug.HierarchyTraceType>(LocalBridgeClazz, "BUILD_CACHE"); _BUILD_CACHEReady = true; } return _BUILD_CACHEContent; } }
             private static Android.View.ViewDebug.HierarchyTraceType _BUILD_CACHEContent = default;
             private static bool _BUILD_CACHEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html#DRAW"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.HierarchyTraceType DRAW { get { if (!_DRAWReady) { _DRAWContent = SGetField<Android.View.ViewDebug.HierarchyTraceType>(LocalBridgeClazz, "DRAW"); _DRAWReady = true; } return _DRAWContent; } }
             private static Android.View.ViewDebug.HierarchyTraceType _DRAWContent = default;
             private static bool _DRAWReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html#INVALIDATE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.HierarchyTraceType INVALIDATE { get { if (!_INVALIDATEReady) { _INVALIDATEContent = SGetField<Android.View.ViewDebug.HierarchyTraceType>(LocalBridgeClazz, "INVALIDATE"); _INVALIDATEReady = true; } return _INVALIDATEContent; } }
             private static Android.View.ViewDebug.HierarchyTraceType _INVALIDATEContent = default;
             private static bool _INVALIDATEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html#INVALIDATE_CHILD"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.HierarchyTraceType INVALIDATE_CHILD { get { if (!_INVALIDATE_CHILDReady) { _INVALIDATE_CHILDContent = SGetField<Android.View.ViewDebug.HierarchyTraceType>(LocalBridgeClazz, "INVALIDATE_CHILD"); _INVALIDATE_CHILDReady = true; } return _INVALIDATE_CHILDContent; } }
             private static Android.View.ViewDebug.HierarchyTraceType _INVALIDATE_CHILDContent = default;
             private static bool _INVALIDATE_CHILDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html#INVALIDATE_CHILD_IN_PARENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.HierarchyTraceType INVALIDATE_CHILD_IN_PARENT { get { if (!_INVALIDATE_CHILD_IN_PARENTReady) { _INVALIDATE_CHILD_IN_PARENTContent = SGetField<Android.View.ViewDebug.HierarchyTraceType>(LocalBridgeClazz, "INVALIDATE_CHILD_IN_PARENT"); _INVALIDATE_CHILD_IN_PARENTReady = true; } return _INVALIDATE_CHILD_IN_PARENTContent; } }
             private static Android.View.ViewDebug.HierarchyTraceType _INVALIDATE_CHILD_IN_PARENTContent = default;
             private static bool _INVALIDATE_CHILD_IN_PARENTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html#ON_LAYOUT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.HierarchyTraceType ON_LAYOUT { get { if (!_ON_LAYOUTReady) { _ON_LAYOUTContent = SGetField<Android.View.ViewDebug.HierarchyTraceType>(LocalBridgeClazz, "ON_LAYOUT"); _ON_LAYOUTReady = true; } return _ON_LAYOUTContent; } }
             private static Android.View.ViewDebug.HierarchyTraceType _ON_LAYOUTContent = default;
             private static bool _ON_LAYOUTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html#ON_MEASURE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.HierarchyTraceType ON_MEASURE { get { if (!_ON_MEASUREReady) { _ON_MEASUREContent = SGetField<Android.View.ViewDebug.HierarchyTraceType>(LocalBridgeClazz, "ON_MEASURE"); _ON_MEASUREReady = true; } return _ON_MEASUREContent; } }
             private static Android.View.ViewDebug.HierarchyTraceType _ON_MEASUREContent = default;
             private static bool _ON_MEASUREReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.HierarchyTraceType.html#REQUEST_LAYOUT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.HierarchyTraceType REQUEST_LAYOUT { get { if (!_REQUEST_LAYOUTReady) { _REQUEST_LAYOUTContent = SGetField<Android.View.ViewDebug.HierarchyTraceType>(LocalBridgeClazz, "REQUEST_LAYOUT"); _REQUEST_LAYOUTReady = true; } return _REQUEST_LAYOUTContent; } }
             private static Android.View.ViewDebug.HierarchyTraceType _REQUEST_LAYOUTContent = default;
             private static bool _REQUEST_LAYOUTReady = false; // this is used because in case of generics 
@@ -500,42 +500,42 @@ public partial class RecyclerTraceType
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.RecyclerTraceType.html#BIND_VIEW"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.RecyclerTraceType BIND_VIEW { get { if (!_BIND_VIEWReady) { _BIND_VIEWContent = SGetField<Android.View.ViewDebug.RecyclerTraceType>(LocalBridgeClazz, "BIND_VIEW"); _BIND_VIEWReady = true; } return _BIND_VIEWContent; } }
             private static Android.View.ViewDebug.RecyclerTraceType _BIND_VIEWContent = default;
             private static bool _BIND_VIEWReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.RecyclerTraceType.html#MOVE_FROM_ACTIVE_TO_SCRAP_HEAP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.RecyclerTraceType MOVE_FROM_ACTIVE_TO_SCRAP_HEAP { get { if (!_MOVE_FROM_ACTIVE_TO_SCRAP_HEAPReady) { _MOVE_FROM_ACTIVE_TO_SCRAP_HEAPContent = SGetField<Android.View.ViewDebug.RecyclerTraceType>(LocalBridgeClazz, "MOVE_FROM_ACTIVE_TO_SCRAP_HEAP"); _MOVE_FROM_ACTIVE_TO_SCRAP_HEAPReady = true; } return _MOVE_FROM_ACTIVE_TO_SCRAP_HEAPContent; } }
             private static Android.View.ViewDebug.RecyclerTraceType _MOVE_FROM_ACTIVE_TO_SCRAP_HEAPContent = default;
             private static bool _MOVE_FROM_ACTIVE_TO_SCRAP_HEAPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.RecyclerTraceType.html#MOVE_TO_SCRAP_HEAP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.RecyclerTraceType MOVE_TO_SCRAP_HEAP { get { if (!_MOVE_TO_SCRAP_HEAPReady) { _MOVE_TO_SCRAP_HEAPContent = SGetField<Android.View.ViewDebug.RecyclerTraceType>(LocalBridgeClazz, "MOVE_TO_SCRAP_HEAP"); _MOVE_TO_SCRAP_HEAPReady = true; } return _MOVE_TO_SCRAP_HEAPContent; } }
             private static Android.View.ViewDebug.RecyclerTraceType _MOVE_TO_SCRAP_HEAPContent = default;
             private static bool _MOVE_TO_SCRAP_HEAPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.RecyclerTraceType.html#NEW_VIEW"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.RecyclerTraceType NEW_VIEW { get { if (!_NEW_VIEWReady) { _NEW_VIEWContent = SGetField<Android.View.ViewDebug.RecyclerTraceType>(LocalBridgeClazz, "NEW_VIEW"); _NEW_VIEWReady = true; } return _NEW_VIEWContent; } }
             private static Android.View.ViewDebug.RecyclerTraceType _NEW_VIEWContent = default;
             private static bool _NEW_VIEWReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.RecyclerTraceType.html#RECYCLE_FROM_ACTIVE_HEAP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.RecyclerTraceType RECYCLE_FROM_ACTIVE_HEAP { get { if (!_RECYCLE_FROM_ACTIVE_HEAPReady) { _RECYCLE_FROM_ACTIVE_HEAPContent = SGetField<Android.View.ViewDebug.RecyclerTraceType>(LocalBridgeClazz, "RECYCLE_FROM_ACTIVE_HEAP"); _RECYCLE_FROM_ACTIVE_HEAPReady = true; } return _RECYCLE_FROM_ACTIVE_HEAPContent; } }
             private static Android.View.ViewDebug.RecyclerTraceType _RECYCLE_FROM_ACTIVE_HEAPContent = default;
             private static bool _RECYCLE_FROM_ACTIVE_HEAPReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewDebug.RecyclerTraceType.html#RECYCLE_FROM_SCRAP_HEAP"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.View.ViewDebug.RecyclerTraceType RECYCLE_FROM_SCRAP_HEAP { get { if (!_RECYCLE_FROM_SCRAP_HEAPReady) { _RECYCLE_FROM_SCRAP_HEAPContent = SGetField<Android.View.ViewDebug.RecyclerTraceType>(LocalBridgeClazz, "RECYCLE_FROM_SCRAP_HEAP"); _RECYCLE_FROM_SCRAP_HEAPReady = true; } return _RECYCLE_FROM_SCRAP_HEAPContent; } }
             private static Android.View.ViewDebug.RecyclerTraceType _RECYCLE_FROM_SCRAP_HEAPContent = default;
             private static bool _RECYCLE_FROM_SCRAP_HEAPReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/View/ViewGroup.cs b/src/net/Netdroid/Generated/Android/View/ViewGroup.cs
index 2b920aa9d..a2780ac77 100644
--- a/src/net/Netdroid/Generated/Android/View/ViewGroup.cs
+++ b/src/net/Netdroid/Generated/Android/View/ViewGroup.cs
@@ -116,28 +116,28 @@ public ViewGroup(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#PERSISTENT_ALL_CACHES"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PERSISTENT_ALL_CACHES { get { if (!_PERSISTENT_ALL_CACHESReady) { _PERSISTENT_ALL_CACHESContent = SGetField<int>(LocalBridgeClazz, "PERSISTENT_ALL_CACHES"); _PERSISTENT_ALL_CACHESReady = true; } return _PERSISTENT_ALL_CACHESContent; } }
         private static int _PERSISTENT_ALL_CACHESContent = default;
         private static bool _PERSISTENT_ALL_CACHESReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#PERSISTENT_ANIMATION_CACHE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PERSISTENT_ANIMATION_CACHE { get { if (!_PERSISTENT_ANIMATION_CACHEReady) { _PERSISTENT_ANIMATION_CACHEContent = SGetField<int>(LocalBridgeClazz, "PERSISTENT_ANIMATION_CACHE"); _PERSISTENT_ANIMATION_CACHEReady = true; } return _PERSISTENT_ANIMATION_CACHEContent; } }
         private static int _PERSISTENT_ANIMATION_CACHEContent = default;
         private static bool _PERSISTENT_ANIMATION_CACHEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#PERSISTENT_NO_CACHE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PERSISTENT_NO_CACHE { get { if (!_PERSISTENT_NO_CACHEReady) { _PERSISTENT_NO_CACHEContent = SGetField<int>(LocalBridgeClazz, "PERSISTENT_NO_CACHE"); _PERSISTENT_NO_CACHEReady = true; } return _PERSISTENT_NO_CACHEContent; } }
         private static int _PERSISTENT_NO_CACHEContent = default;
         private static bool _PERSISTENT_NO_CACHEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#PERSISTENT_SCROLLING_CACHE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PERSISTENT_SCROLLING_CACHE { get { if (!_PERSISTENT_SCROLLING_CACHEReady) { _PERSISTENT_SCROLLING_CACHEContent = SGetField<int>(LocalBridgeClazz, "PERSISTENT_SCROLLING_CACHE"); _PERSISTENT_SCROLLING_CACHEReady = true; } return _PERSISTENT_SCROLLING_CACHEContent; } }
         private static int _PERSISTENT_SCROLLING_CACHEContent = default;
         private static bool _PERSISTENT_SCROLLING_CACHEReady = false; // this is used because in case of generics 
@@ -161,89 +161,12 @@ public static int GetChildMeasureSpec(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getChildCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutTransition()"/>
         /// </summary>
-        public int ChildCount
+        /// <returns><see cref="Android.Animation.LayoutTransition"/></returns>
+        public Android.Animation.LayoutTransition GetLayoutTransition()
         {
-            get { return IExecuteWithSignature<int>("getChildCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getClipChildren()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setClipChildren(boolean)"/>
-        /// </summary>
-        public bool ClipChildren
-        {
-            get { return IExecuteWithSignature<bool>("getClipChildren", "()Z"); } set { IExecuteWithSignature("setClipChildren", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getClipToPadding()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setClipToPadding(boolean)"/>
-        /// </summary>
-        public bool ClipToPadding
-        {
-            get { return IExecuteWithSignature<bool>("getClipToPadding", "()Z"); } set { IExecuteWithSignature("setClipToPadding", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getDescendantFocusability()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setDescendantFocusability(int)"/>
-        /// </summary>
-        public int DescendantFocusability
-        {
-            get { return IExecuteWithSignature<int>("getDescendantFocusability", "()I"); } set { IExecuteWithSignature("setDescendantFocusability", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getFocusedChild()"/> 
-        /// </summary>
-        public Android.View.View FocusedChild
-        {
-            get { return IExecuteWithSignature<Android.View.View>("getFocusedChild", "()Landroid/view/View;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutAnimation()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setLayoutAnimation(android.view.animation.LayoutAnimationController)"/>
-        /// </summary>
-        public Android.View.Animation.LayoutAnimationController LayoutAnimation
-        {
-            get { return IExecuteWithSignature<Android.View.Animation.LayoutAnimationController>("getLayoutAnimation", "()Landroid/view/animation/LayoutAnimationController;"); } set { IExecuteWithSignature("setLayoutAnimation", "(Landroid/view/animation/LayoutAnimationController;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutAnimationListener()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setLayoutAnimationListener(android.view.animation.Animation.AnimationListener)"/>
-        /// </summary>
-        public Android.View.Animation.Animation.AnimationListener LayoutAnimationListener
-        {
-            get { return IExecuteWithSignature<Android.View.Animation.Animation.AnimationListener>("getLayoutAnimationListener", "()Landroid/view/animation/Animation$AnimationListener;"); } set { IExecuteWithSignature("setLayoutAnimationListener", "(Landroid/view/animation/Animation$AnimationListener;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutMode()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setLayoutMode(int)"/>
-        /// </summary>
-        public int LayoutMode
-        {
-            get { return IExecuteWithSignature<int>("getLayoutMode", "()I"); } set { IExecuteWithSignature("setLayoutMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutTransition()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setLayoutTransition(android.animation.LayoutTransition)"/>
-        /// </summary>
-        public Android.Animation.LayoutTransition LayoutTransition
-        {
-            get { return IExecuteWithSignature<Android.Animation.LayoutTransition>("getLayoutTransition", "()Landroid/animation/LayoutTransition;"); } set { IExecuteWithSignature("setLayoutTransition", "(Landroid/animation/LayoutTransition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getNestedScrollAxes()"/> 
-        /// </summary>
-        public int NestedScrollAxes
-        {
-            get { return IExecuteWithSignature<int>("getNestedScrollAxes", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getPersistentDrawingCache()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setPersistentDrawingCache(int)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public int PersistentDrawingCache
-        {
-            get { return IExecuteWithSignature<int>("getPersistentDrawingCache", "()I"); } set { IExecuteWithSignature("setPersistentDrawingCache", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getTouchscreenBlocksFocus()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setTouchscreenBlocksFocus(boolean)"/>
-        /// </summary>
-        public bool TouchscreenBlocksFocus
-        {
-            get { return IExecuteWithSignature<bool>("getTouchscreenBlocksFocus", "()Z"); } set { IExecuteWithSignature("setTouchscreenBlocksFocus", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Animation.LayoutTransition>("getLayoutTransition", "()Landroid/animation/LayoutTransition;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#startActionModeForChild(android.view.View,android.view.ActionMode.Callback,int)"/>
@@ -267,6 +190,30 @@ public Android.View.ActionMode StartActionModeForChild(Android.View.View arg0, A
             return IExecute<Android.View.ActionMode>("startActionModeForChild", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutAnimationListener()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Animation.Animation.AnimationListener"/></returns>
+        public Android.View.Animation.Animation.AnimationListener GetLayoutAnimationListener()
+        {
+            return IExecuteWithSignature<Android.View.Animation.Animation.AnimationListener>("getLayoutAnimationListener", "()Landroid/view/animation/Animation$AnimationListener;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutAnimationListener()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Animation.Animation.AnimationListener"/></returns>
+        public Android.View.Animation.Animation.AnimationListener GetLayoutAnimationListenerDirect()
+        {
+            return IExecuteWithSignature<Android.View.Animation.Animation.AnimationListenerDirect, Android.View.Animation.Animation.AnimationListener>("getLayoutAnimationListener", "()Landroid/view/animation/Animation$AnimationListener;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutAnimation()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Animation.LayoutAnimationController"/></returns>
+        public Android.View.Animation.LayoutAnimationController GetLayoutAnimation()
+        {
+            return IExecuteWithSignature<Android.View.Animation.LayoutAnimationController>("getLayoutAnimation", "()Landroid/view/animation/LayoutAnimationController;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#focusSearch(android.view.View,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -286,6 +233,14 @@ public Android.View.View GetChildAt(int arg0)
             return IExecuteWithSignature<Android.View.View>("getChildAt", "(I)Landroid/view/View;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getFocusedChild()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetFocusedChild()
+        {
+            return IExecuteWithSignature<Android.View.View>("getFocusedChild", "()Landroid/view/View;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#generateLayoutParams(android.util.AttributeSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Util.AttributeSet"/></param>
@@ -300,7 +255,7 @@ public Android.View.ViewGroup.LayoutParams GenerateLayoutParams(Android.Util.Att
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
         /// <returns><see cref="Android.View.ViewParent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.ViewParent InvalidateChildInParent(int[] arg0, Android.Graphics.Rect arg1)
         {
             return IExecute<Android.View.ViewParent>("invalidateChildInParent", arg0, arg1);
@@ -335,10 +290,34 @@ public bool GetChildVisibleRect(Android.View.View arg0, Android.Graphics.Rect ar
             return IExecute<bool>("getChildVisibleRect", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getClipChildren()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetClipChildren()
+        {
+            return IExecuteWithSignature<bool>("getClipChildren", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getClipToPadding()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetClipToPadding()
+        {
+            return IExecuteWithSignature<bool>("getClipToPadding", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getTouchscreenBlocksFocus()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetTouchscreenBlocksFocus()
+        {
+            return IExecuteWithSignature<bool>("getTouchscreenBlocksFocus", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#isAlwaysDrawnWithCacheEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAlwaysDrawnWithCacheEnabled()
         {
             return IExecuteWithSignature<bool>("isAlwaysDrawnWithCacheEnabled", "()Z");
@@ -347,7 +326,7 @@ public bool IsAlwaysDrawnWithCacheEnabled()
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#isAnimationCacheEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAnimationCacheEnabled()
         {
             return IExecuteWithSignature<bool>("isAnimationCacheEnabled", "()Z");
@@ -512,7 +491,7 @@ public int GetChildDrawingOrder(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void InvalidateChild(Android.View.View arg0, Android.Graphics.Rect arg1)
         {
             IExecute("invalidateChild", arg0, arg1);
@@ -536,6 +515,47 @@ public void OffsetRectIntoDescendantCoords(Android.View.View arg0, Android.Graph
             IExecute("offsetRectIntoDescendantCoords", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getChildCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChildCount()
+        {
+            return IExecuteWithSignature<int>("getChildCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getDescendantFocusability()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDescendantFocusability()
+        {
+            return IExecuteWithSignature<int>("getDescendantFocusability", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getLayoutMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLayoutMode()
+        {
+            return IExecuteWithSignature<int>("getLayoutMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getNestedScrollAxes()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNestedScrollAxes()
+        {
+            return IExecuteWithSignature<int>("getNestedScrollAxes", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#getPersistentDrawingCache()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetPersistentDrawingCache()
+        {
+            return IExecuteWithSignature<int>("getPersistentDrawingCache", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#indexOfChild(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -846,7 +866,7 @@ public void SetAddStatesFromChildren(bool arg0)
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setAlwaysDrawnWithCacheEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAlwaysDrawnWithCacheEnabled(bool arg0)
         {
             IExecuteWithSignature("setAlwaysDrawnWithCacheEnabled", "(Z)V", arg0);
@@ -855,12 +875,68 @@ public void SetAlwaysDrawnWithCacheEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setAnimationCacheEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAnimationCacheEnabled(bool arg0)
         {
             IExecuteWithSignature("setAnimationCacheEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setClipChildren(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetClipChildren(bool arg0)
+        {
+            IExecuteWithSignature("setClipChildren", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setClipToPadding(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetClipToPadding(bool arg0)
+        {
+            IExecuteWithSignature("setClipToPadding", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setDescendantFocusability(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDescendantFocusability(int arg0)
+        {
+            IExecuteWithSignature("setDescendantFocusability", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setLayoutAnimation(android.view.animation.LayoutAnimationController)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.LayoutAnimationController"/></param>
+        public void SetLayoutAnimation(Android.View.Animation.LayoutAnimationController arg0)
+        {
+            IExecuteWithSignature("setLayoutAnimation", "(Landroid/view/animation/LayoutAnimationController;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setLayoutAnimationListener(android.view.animation.Animation.AnimationListener)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.Animation.AnimationListener"/></param>
+        public void SetLayoutAnimationListener(Android.View.Animation.Animation.AnimationListener arg0)
+        {
+            IExecuteWithSignature("setLayoutAnimationListener", "(Landroid/view/animation/Animation$AnimationListener;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setLayoutMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLayoutMode(int arg0)
+        {
+            IExecuteWithSignature("setLayoutMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setLayoutTransition(android.animation.LayoutTransition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Animation.LayoutTransition"/></param>
+        public void SetLayoutTransition(Android.Animation.LayoutTransition arg0)
+        {
+            IExecuteWithSignature("setLayoutTransition", "(Landroid/animation/LayoutTransition;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setMotionEventSplittingEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -877,6 +953,23 @@ public void SetOnHierarchyChangeListener(Android.View.ViewGroup.OnHierarchyChang
             IExecuteWithSignature("setOnHierarchyChangeListener", "(Landroid/view/ViewGroup$OnHierarchyChangeListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setPersistentDrawingCache(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetPersistentDrawingCache(int arg0)
+        {
+            IExecuteWithSignature("setPersistentDrawingCache", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setTouchscreenBlocksFocus(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetTouchscreenBlocksFocus(bool arg0)
+        {
+            IExecuteWithSignature("setTouchscreenBlocksFocus", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewGroup.html#setTransitionGroup(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -973,7 +1066,7 @@ public LayoutParams(int arg0, int arg1)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewGroup.LayoutParams.html#FILL_PARENT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FILL_PARENT { get { if (!_FILL_PARENTReady) { _FILL_PARENTContent = SGetField<int>(LocalBridgeClazz, "FILL_PARENT"); _FILL_PARENTReady = true; } return _FILL_PARENTContent; } }
             private static int _FILL_PARENTContent = default;
             private static bool _FILL_PARENTReady = false; // this is used because in case of generics 
@@ -1087,33 +1180,52 @@ public MarginLayoutParams(int arg0, int arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#getLayoutDirection()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#setLayoutDirection(int)"/>
+            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#isMarginRelative()"/>
             /// </summary>
-            public int LayoutDirection
+            /// <returns><see cref="bool"/></returns>
+            public bool IsMarginRelative()
             {
-                get { return IExecuteWithSignature<int>("getLayoutDirection", "()I"); } set { IExecuteWithSignature("setLayoutDirection", "(I)V", value); }
+                return IExecuteWithSignature<bool>("isMarginRelative", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#getMarginEnd()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#setMarginEnd(int)"/>
+            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#getLayoutDirection()"/>
             /// </summary>
-            public int MarginEnd
+            /// <returns><see cref="int"/></returns>
+            public int GetLayoutDirection()
             {
-                get { return IExecuteWithSignature<int>("getMarginEnd", "()I"); } set { IExecuteWithSignature("setMarginEnd", "(I)V", value); }
+                return IExecuteWithSignature<int>("getLayoutDirection", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#getMarginStart()"/> <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#setMarginStart(int)"/>
+            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#getMarginEnd()"/>
             /// </summary>
-            public int MarginStart
+            /// <returns><see cref="int"/></returns>
+            public int GetMarginEnd()
             {
-                get { return IExecuteWithSignature<int>("getMarginStart", "()I"); } set { IExecuteWithSignature("setMarginStart", "(I)V", value); }
+                return IExecuteWithSignature<int>("getMarginEnd", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#isMarginRelative()"/>
+            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#getMarginStart()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsMarginRelative()
+            /// <returns><see cref="int"/></returns>
+            public int GetMarginStart()
             {
-                return IExecuteWithSignature<bool>("isMarginRelative", "()Z");
+                return IExecuteWithSignature<int>("getMarginStart", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#setLayoutDirection(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetLayoutDirection(int arg0)
+            {
+                IExecuteWithSignature("setLayoutDirection", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#setMarginEnd(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetMarginEnd(int arg0)
+            {
+                IExecuteWithSignature("setMarginEnd", "(I)V", arg0);
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#setMargins(int,int,int,int)"/>
@@ -1126,6 +1238,14 @@ public void SetMargins(int arg0, int arg1, int arg2, int arg3)
             {
                 IExecute("setMargins", arg0, arg1, arg2, arg3);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/ViewGroup.MarginLayoutParams.html#setMarginStart(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetMarginStart(int arg0)
+            {
+                IExecuteWithSignature("setMarginStart", "(I)V", arg0);
+            }
 
             #endregion
 
@@ -1162,8 +1282,8 @@ public partial class OnHierarchyChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onChildViewAdded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnChildViewAddedEventHandler));
-                AddEventHandler("onChildViewRemoved", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnChildViewRemovedEventHandler));
+                AddEventHandler("onChildViewAdded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnChildViewAddedEventHandler));
+                AddEventHandler("onChildViewRemoved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnChildViewRemovedEventHandler));
 
             }
 
@@ -1171,7 +1291,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewGroup.OnHierarchyChangeListener.html#onChildViewAdded(android.view.View,android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnChildViewAdded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View, Android.View.View> OnOnChildViewAdded { get; set; } = null;
+            public global::System.Action<Android.View.View, Android.View.View> OnOnChildViewAdded { get; set; } = null;
 
             void OnChildViewAddedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -1193,7 +1313,7 @@ public virtual void OnChildViewAdded(Android.View.View arg0, Android.View.View a
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewGroup.OnHierarchyChangeListener.html#onChildViewRemoved(android.view.View,android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnChildViewRemoved"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View, Android.View.View> OnOnChildViewRemoved { get; set; } = null;
+            public global::System.Action<Android.View.View, Android.View.View> OnOnChildViewRemoved { get; set; } = null;
 
             void OnChildViewRemovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/ViewParent.cs b/src/net/Netdroid/Generated/Android/View/ViewParent.cs
index a6d70bcfe..ea3f75b04 100644
--- a/src/net/Netdroid/Generated/Android/View/ViewParent.cs
+++ b/src/net/Netdroid/Generated/Android/View/ViewParent.cs
@@ -64,41 +64,6 @@ public partial class ViewParent : Android.View.IViewParent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getLayoutDirection()"/> 
-        /// </summary>
-        public int LayoutDirection
-        {
-            get { return IExecuteWithSignature<int>("getLayoutDirection", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getParent()"/> 
-        /// </summary>
-        public Android.View.ViewParent Parent
-        {
-            get { return IExecuteWithSignature<Android.View.ViewParent>("getParent", "()Landroid/view/ViewParent;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getParentForAccessibility()"/> 
-        /// </summary>
-        public Android.View.ViewParent ParentForAccessibility
-        {
-            get { return IExecuteWithSignature<Android.View.ViewParent>("getParentForAccessibility", "()Landroid/view/ViewParent;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getTextAlignment()"/> 
-        /// </summary>
-        public int TextAlignment
-        {
-            get { return IExecuteWithSignature<int>("getTextAlignment", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getTextDirection()"/> 
-        /// </summary>
-        public int TextDirection
-        {
-            get { return IExecuteWithSignature<int>("getTextDirection", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#startActionModeForChild(android.view.View,android.view.ActionMode.Callback,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -140,12 +105,28 @@ public Android.View.View KeyboardNavigationClusterSearch(Android.View.View arg0,
             return IExecute<Android.View.View>("keyboardNavigationClusterSearch", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getParent()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.ViewParent"/></returns>
+        public Android.View.ViewParent GetParent()
+        {
+            return IExecuteWithSignature<Android.View.ViewParent>("getParent", "()Landroid/view/ViewParent;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getParentForAccessibility()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.ViewParent"/></returns>
+        public Android.View.ViewParent GetParentForAccessibility()
+        {
+            return IExecuteWithSignature<Android.View.ViewParent>("getParentForAccessibility", "()Landroid/view/ViewParent;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#invalidateChildInParent(int[],android.graphics.Rect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
         /// <returns><see cref="Android.View.ViewParent"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.ViewParent InvalidateChildInParent(int[] arg0, Android.Graphics.Rect arg1)
         {
             return IExecute<Android.View.ViewParent>("invalidateChildInParent", arg0, arg1);
@@ -304,6 +285,30 @@ public bool ShowContextMenuForChild(Android.View.View arg0)
             return IExecuteWithSignature<bool>("showContextMenuForChild", "(Landroid/view/View;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getLayoutDirection()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLayoutDirection()
+        {
+            return IExecuteWithSignature<int>("getLayoutDirection", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getTextAlignment()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTextAlignment()
+        {
+            return IExecuteWithSignature<int>("getTextAlignment", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#getTextDirection()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTextDirection()
+        {
+            return IExecuteWithSignature<int>("getTextDirection", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewParent.html#bringChildToFront(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -357,7 +362,7 @@ public void FocusableViewAvailable(Android.View.View arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void InvalidateChild(Android.View.View arg0, Android.Graphics.Rect arg1)
         {
             IExecute("invalidateChild", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/View/ViewPropertyAnimator.cs b/src/net/Netdroid/Generated/Android/View/ViewPropertyAnimator.cs
index 785b1da58..e1f5afca9 100644
--- a/src/net/Netdroid/Generated/Android/View/ViewPropertyAnimator.cs
+++ b/src/net/Netdroid/Generated/Android/View/ViewPropertyAnimator.cs
@@ -46,25 +46,12 @@ public partial class ViewPropertyAnimator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewPropertyAnimator.html#getDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/ViewPropertyAnimator.html#getInterpolator()"/>
         /// </summary>
-        public long Duration
+        /// <returns><see cref="Android.Animation.TimeInterpolator"/></returns>
+        public Android.Animation.TimeInterpolator GetInterpolator()
         {
-            get { return IExecuteWithSignature<long>("getDuration", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewPropertyAnimator.html#getInterpolator()"/> 
-        /// </summary>
-        public Android.Animation.TimeInterpolator Interpolator
-        {
-            get { return IExecuteWithSignature<Android.Animation.TimeInterpolator>("getInterpolator", "()Landroid/animation/TimeInterpolator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewPropertyAnimator.html#getStartDelay()"/> 
-        /// </summary>
-        public long StartDelay
-        {
-            get { return IExecuteWithSignature<long>("getStartDelay", "()J"); }
+            return IExecuteWithSignature<Android.Animation.TimeInterpolator>("getInterpolator", "()Landroid/animation/TimeInterpolator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewPropertyAnimator.html#alpha(float)"/>
@@ -354,6 +341,22 @@ public Android.View.ViewPropertyAnimator ZBy(float arg0)
             return IExecuteWithSignature<Android.View.ViewPropertyAnimator>("zBy", "(F)Landroid/view/ViewPropertyAnimator;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewPropertyAnimator.html#getDuration()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetDuration()
+        {
+            return IExecuteWithSignature<long>("getDuration", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewPropertyAnimator.html#getStartDelay()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetStartDelay()
+        {
+            return IExecuteWithSignature<long>("getStartDelay", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewPropertyAnimator.html#cancel()"/>
         /// </summary>
         public void Cancel()
diff --git a/src/net/Netdroid/Generated/Android/View/ViewStructure.cs b/src/net/Netdroid/Generated/Android/View/ViewStructure.cs
index b4aff9d72..c144f532e 100644
--- a/src/net/Netdroid/Generated/Android/View/ViewStructure.cs
+++ b/src/net/Netdroid/Generated/Android/View/ViewStructure.cs
@@ -46,53 +46,20 @@ public partial class ViewStructure
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getAutofillId()"/> <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setAutofillId(android.view.autofill.AutofillId)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getExtras()"/>
         /// </summary>
-        public Android.View.Autofill.AutofillId AutofillId
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetExtras()
         {
-            get { return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;"); } set { IExecuteWithSignature("setAutofillId", "(Landroid/view/autofill/AutofillId;)V", value); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getChildCount()"/> <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setChildCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getAutofillId()"/>
         /// </summary>
-        public int ChildCount
+        /// <returns><see cref="Android.View.Autofill.AutofillId"/></returns>
+        public Android.View.Autofill.AutofillId GetAutofillId()
         {
-            get { return IExecuteWithSignature<int>("getChildCount", "()I"); } set { IExecuteWithSignature("setChildCount", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getExtras()"/> 
-        /// </summary>
-        public Android.Os.Bundle Extras
-        {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getExtras", "()Landroid/os/Bundle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getHint()"/> <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setHint(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence Hint
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getHint", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setHint", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getText()"/> <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setText(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence Text
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getTextSelectionEnd()"/> 
-        /// </summary>
-        public int TextSelectionEnd
-        {
-            get { return IExecuteWithSignature<int>("getTextSelectionEnd", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getTextSelectionStart()"/> 
-        /// </summary>
-        public int TextSelectionStart
-        {
-            get { return IExecuteWithSignature<int>("getTextSelectionStart", "()I"); }
+            return IExecuteWithSignature<Android.View.Autofill.AutofillId>("getAutofillId", "()Landroid/view/autofill/AutofillId;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#asyncNewChild(int)"/>
@@ -139,6 +106,46 @@ public int AddChildCount(int arg0)
             return IExecuteWithSignature<int>("addChildCount", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getChildCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChildCount()
+        {
+            return IExecuteWithSignature<int>("getChildCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getTextSelectionEnd()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTextSelectionEnd()
+        {
+            return IExecuteWithSignature<int>("getTextSelectionEnd", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getTextSelectionStart()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTextSelectionStart()
+        {
+            return IExecuteWithSignature<int>("getTextSelectionStart", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getHint()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetHint()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getHint", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#asyncCommit()"/>
         /// </summary>
         public void AsyncCommit()
@@ -187,6 +194,14 @@ public void SetAutofillId(Android.View.Autofill.AutofillId arg0, int arg1)
             IExecute("setAutofillId", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setAutofillId(android.view.autofill.AutofillId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Autofill.AutofillId"/></param>
+        public void SetAutofillId(Android.View.Autofill.AutofillId arg0)
+        {
+            IExecuteWithSignature("setAutofillId", "(Landroid/view/autofill/AutofillId;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setAutofillOptions(java.lang.CharSequence[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -227,6 +242,14 @@ public void SetChecked(bool arg0)
             IExecuteWithSignature("setChecked", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setChildCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetChildCount(int arg0)
+        {
+            IExecuteWithSignature("setChildCount", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setClassName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -312,6 +335,14 @@ public void SetFocused(bool arg0)
             IExecuteWithSignature("setFocused", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setHint(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetHint(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setHint", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setHtmlInfo(android.view.ViewStructure.HtmlInfo)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.ViewStructure.HtmlInfo"/></param>
@@ -381,6 +412,14 @@ public void SetText(Java.Lang.CharSequence arg0, int arg1, int arg2)
             IExecute("setText", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setText(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetText(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewStructure.html#setTextLines(int[],int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -505,18 +544,20 @@ public partial class HtmlInfo
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/ViewStructure.HtmlInfo.html#getAttributes()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/ViewStructure.HtmlInfo.html#getTag()"/>
             /// </summary>
-            public Java.Util.List<Android.Util.Pair<Java.Lang.String, Java.Lang.String>> Attributes
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetTag()
             {
-                get { return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.String, Java.Lang.String>>>("getAttributes", "()Ljava/util/List;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/ViewStructure.HtmlInfo.html#getTag()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/ViewStructure.HtmlInfo.html#getAttributes()"/>
             /// </summary>
-            public Java.Lang.String Tag
+            /// <returns><see cref="Java.Util.List"/></returns>
+            public Java.Util.List<Android.Util.Pair<Java.Lang.String, Java.Lang.String>> GetAttributes()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Util.List<Android.Util.Pair<Java.Lang.String, Java.Lang.String>>>("getAttributes", "()Ljava/util/List;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/View/ViewStub.cs b/src/net/Netdroid/Generated/Android/View/ViewStub.cs
index 38f62e5ee..04b613dcf 100644
--- a/src/net/Netdroid/Generated/Android/View/ViewStub.cs
+++ b/src/net/Netdroid/Generated/Android/View/ViewStub.cs
@@ -93,33 +93,60 @@ public ViewStub(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#getInflatedId()"/> <see href="https://developer.android.com/reference/android/view/ViewStub.html#setInflatedId(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#getLayoutInflater()"/>
         /// </summary>
-        public int InflatedId
+        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
+        public Android.View.LayoutInflater GetLayoutInflater()
         {
-            get { return IExecuteWithSignature<int>("getInflatedId", "()I"); } set { IExecuteWithSignature("setInflatedId", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#getLayoutInflater()"/> <see href="https://developer.android.com/reference/android/view/ViewStub.html#setLayoutInflater(android.view.LayoutInflater)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#inflate()"/>
         /// </summary>
-        public Android.View.LayoutInflater LayoutInflater
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View Inflate()
         {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;"); } set { IExecuteWithSignature("setLayoutInflater", "(Landroid/view/LayoutInflater;)V", value); }
+            return IExecuteWithSignature<Android.View.View>("inflate", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#getLayoutResource()"/> <see href="https://developer.android.com/reference/android/view/ViewStub.html#setLayoutResource(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#getInflatedId()"/>
         /// </summary>
-        public int LayoutResource
+        /// <returns><see cref="int"/></returns>
+        public int GetInflatedId()
         {
-            get { return IExecuteWithSignature<int>("getLayoutResource", "()I"); } set { IExecuteWithSignature("setLayoutResource", "(I)V", value); }
+            return IExecuteWithSignature<int>("getInflatedId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#inflate()"/>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#getLayoutResource()"/>
         /// </summary>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public Android.View.View Inflate()
+        /// <returns><see cref="int"/></returns>
+        public int GetLayoutResource()
         {
-            return IExecuteWithSignature<Android.View.View>("inflate", "()Landroid/view/View;");
+            return IExecuteWithSignature<int>("getLayoutResource", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#setInflatedId(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInflatedId(int arg0)
+        {
+            IExecuteWithSignature("setInflatedId", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#setLayoutInflater(android.view.LayoutInflater)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.LayoutInflater"/></param>
+        public void SetLayoutInflater(Android.View.LayoutInflater arg0)
+        {
+            IExecuteWithSignature("setLayoutInflater", "(Landroid/view/LayoutInflater;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#setLayoutResource(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLayoutResource(int arg0)
+        {
+            IExecuteWithSignature("setLayoutResource", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/ViewStub.html#setOnInflateListener(android.view.ViewStub.OnInflateListener)"/>
@@ -158,7 +185,7 @@ public partial class OnInflateListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onInflate", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ViewStub>>>(OnInflateEventHandler));
+                AddEventHandler("onInflate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ViewStub>>>(OnInflateEventHandler));
 
             }
 
@@ -166,7 +193,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewStub.OnInflateListener.html#onInflate(android.view.ViewStub,android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnInflate"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.ViewStub, Android.View.View> OnOnInflate { get; set; } = null;
+            public global::System.Action<Android.View.ViewStub, Android.View.View> OnOnInflate { get; set; } = null;
 
             void OnInflateEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ViewStub>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/ViewTreeObserver.cs b/src/net/Netdroid/Generated/Android/View/ViewTreeObserver.cs
index febb3969b..2446a587c 100644
--- a/src/net/Netdroid/Generated/Android/View/ViewTreeObserver.cs
+++ b/src/net/Netdroid/Generated/Android/View/ViewTreeObserver.cs
@@ -176,7 +176,7 @@ public void RegisterFrameCommitCallback(Java.Lang.Runnable arg0)
         /// <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.html#removeGlobalOnLayoutListener(android.view.ViewTreeObserver.OnGlobalLayoutListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.ViewTreeObserver.OnGlobalLayoutListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveGlobalOnLayoutListener(Android.View.ViewTreeObserver.OnGlobalLayoutListener arg0)
         {
             IExecuteWithSignature("removeGlobalOnLayoutListener", "(Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V", arg0);
@@ -290,7 +290,7 @@ public partial class OnDrawListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDraw", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDrawEventHandler));
+                AddEventHandler("onDraw", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDrawEventHandler));
 
             }
 
@@ -298,7 +298,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnDrawListener.html#onDraw()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDraw"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnDraw { get; set; } = null;
+            public global::System.Action OnOnDraw { get; set; } = null;
 
             void OnDrawEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -387,7 +387,7 @@ public partial class OnGlobalFocusChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGlobalFocusChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnGlobalFocusChangedEventHandler));
+                AddEventHandler("onGlobalFocusChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnGlobalFocusChangedEventHandler));
 
             }
 
@@ -395,7 +395,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnGlobalFocusChangeListener.html#onGlobalFocusChanged(android.view.View,android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGlobalFocusChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View, Android.View.View> OnOnGlobalFocusChanged { get; set; } = null;
+            public global::System.Action<Android.View.View, Android.View.View> OnOnGlobalFocusChanged { get; set; } = null;
 
             void OnGlobalFocusChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
@@ -488,7 +488,7 @@ public partial class OnGlobalLayoutListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGlobalLayout", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnGlobalLayoutEventHandler));
+                AddEventHandler("onGlobalLayout", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnGlobalLayoutEventHandler));
 
             }
 
@@ -496,7 +496,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnGlobalLayoutListener.html#onGlobalLayout()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGlobalLayout"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnGlobalLayout { get; set; } = null;
+            public global::System.Action OnOnGlobalLayout { get; set; } = null;
 
             void OnGlobalLayoutEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -585,7 +585,7 @@ public partial class OnPreDrawListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onPreDraw", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnPreDrawEventHandler));
+                AddEventHandler("onPreDraw", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnPreDrawEventHandler));
 
             }
 
@@ -593,7 +593,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnPreDrawListener.html#onPreDraw()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPreDraw"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<bool> OnOnPreDraw { get; set; } = null;
+            public global::System.Func<bool> OnOnPreDraw { get; set; } = null;
 
             void OnPreDrawEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -685,7 +685,7 @@ public partial class OnScrollChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onScrollChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnScrollChangedEventHandler));
+                AddEventHandler("onScrollChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnScrollChangedEventHandler));
 
             }
 
@@ -693,7 +693,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnScrollChangedListener.html#onScrollChanged()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScrollChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnScrollChanged { get; set; } = null;
+            public global::System.Action OnOnScrollChanged { get; set; } = null;
 
             void OnScrollChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -782,7 +782,7 @@ public partial class OnTouchModeChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTouchModeChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnTouchModeChangedEventHandler));
+                AddEventHandler("onTouchModeChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnTouchModeChangedEventHandler));
 
             }
 
@@ -790,7 +790,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnTouchModeChangeListener.html#onTouchModeChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTouchModeChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnTouchModeChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnTouchModeChanged { get; set; } = null;
 
             void OnTouchModeChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -881,8 +881,8 @@ public partial class OnWindowAttachListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onWindowAttached", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnWindowAttachedEventHandler));
-                AddEventHandler("onWindowDetached", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnWindowDetachedEventHandler));
+                AddEventHandler("onWindowAttached", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnWindowAttachedEventHandler));
+                AddEventHandler("onWindowDetached", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnWindowDetachedEventHandler));
 
             }
 
@@ -890,7 +890,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnWindowAttachListener.html#onWindowAttached()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnWindowAttached"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnWindowAttached { get; set; } = null;
+            public global::System.Action OnOnWindowAttached { get; set; } = null;
 
             void OnWindowAttachedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -910,7 +910,7 @@ public virtual void OnWindowAttached()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnWindowAttachListener.html#onWindowDetached()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnWindowDetached"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnWindowDetached { get; set; } = null;
+            public global::System.Action OnOnWindowDetached { get; set; } = null;
 
             void OnWindowDetachedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -1006,7 +1006,7 @@ public partial class OnWindowFocusChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onWindowFocusChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnWindowFocusChangedEventHandler));
+                AddEventHandler("onWindowFocusChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnWindowFocusChangedEventHandler));
 
             }
 
@@ -1014,7 +1014,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnWindowFocusChangeListener.html#onWindowFocusChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnWindowFocusChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnWindowFocusChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnWindowFocusChanged { get; set; } = null;
 
             void OnWindowFocusChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -1105,7 +1105,7 @@ public partial class OnWindowVisibilityChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onWindowVisibilityChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnWindowVisibilityChangedEventHandler));
+                AddEventHandler("onWindowVisibilityChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnWindowVisibilityChangedEventHandler));
 
             }
 
@@ -1113,7 +1113,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ViewTreeObserver.OnWindowVisibilityChangeListener.html#onWindowVisibilityChanged(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnWindowVisibilityChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnWindowVisibilityChanged { get; set; } = null;
+            public global::System.Action<int> OnOnWindowVisibilityChanged { get; set; } = null;
 
             void OnWindowVisibilityChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/Window.cs b/src/net/Netdroid/Generated/Android/View/Window.cs
index ba932ab77..dca7165d6 100644
--- a/src/net/Netdroid/Generated/Android/View/Window.cs
+++ b/src/net/Netdroid/Generated/Android/View/Window.cs
@@ -108,7 +108,7 @@ public Window(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#FEATURE_INDETERMINATE_PROGRESS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FEATURE_INDETERMINATE_PROGRESS { get { if (!_FEATURE_INDETERMINATE_PROGRESSReady) { _FEATURE_INDETERMINATE_PROGRESSContent = SGetField<int>(LocalBridgeClazz, "FEATURE_INDETERMINATE_PROGRESS"); _FEATURE_INDETERMINATE_PROGRESSReady = true; } return _FEATURE_INDETERMINATE_PROGRESSContent; } }
         private static int _FEATURE_INDETERMINATE_PROGRESSContent = default;
         private static bool _FEATURE_INDETERMINATE_PROGRESSReady = false; // this is used because in case of generics 
@@ -133,7 +133,7 @@ public Window(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#FEATURE_PROGRESS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FEATURE_PROGRESS { get { if (!_FEATURE_PROGRESSReady) { _FEATURE_PROGRESSContent = SGetField<int>(LocalBridgeClazz, "FEATURE_PROGRESS"); _FEATURE_PROGRESSReady = true; } return _FEATURE_PROGRESSContent; } }
         private static int _FEATURE_PROGRESSContent = default;
         private static bool _FEATURE_PROGRESSReady = false; // this is used because in case of generics 
@@ -146,7 +146,7 @@ public Window(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#FEATURE_SWIPE_TO_DISMISS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FEATURE_SWIPE_TO_DISMISS { get { if (!_FEATURE_SWIPE_TO_DISMISSReady) { _FEATURE_SWIPE_TO_DISMISSContent = SGetField<int>(LocalBridgeClazz, "FEATURE_SWIPE_TO_DISMISS"); _FEATURE_SWIPE_TO_DISMISSReady = true; } return _FEATURE_SWIPE_TO_DISMISSContent; } }
         private static int _FEATURE_SWIPE_TO_DISMISSContent = default;
         private static bool _FEATURE_SWIPE_TO_DISMISSReady = false; // this is used because in case of generics 
@@ -159,56 +159,56 @@ public Window(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#PROGRESS_END"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROGRESS_END { get { if (!_PROGRESS_ENDReady) { _PROGRESS_ENDContent = SGetField<int>(LocalBridgeClazz, "PROGRESS_END"); _PROGRESS_ENDReady = true; } return _PROGRESS_ENDContent; } }
         private static int _PROGRESS_ENDContent = default;
         private static bool _PROGRESS_ENDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#PROGRESS_INDETERMINATE_OFF"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROGRESS_INDETERMINATE_OFF { get { if (!_PROGRESS_INDETERMINATE_OFFReady) { _PROGRESS_INDETERMINATE_OFFContent = SGetField<int>(LocalBridgeClazz, "PROGRESS_INDETERMINATE_OFF"); _PROGRESS_INDETERMINATE_OFFReady = true; } return _PROGRESS_INDETERMINATE_OFFContent; } }
         private static int _PROGRESS_INDETERMINATE_OFFContent = default;
         private static bool _PROGRESS_INDETERMINATE_OFFReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#PROGRESS_INDETERMINATE_ON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROGRESS_INDETERMINATE_ON { get { if (!_PROGRESS_INDETERMINATE_ONReady) { _PROGRESS_INDETERMINATE_ONContent = SGetField<int>(LocalBridgeClazz, "PROGRESS_INDETERMINATE_ON"); _PROGRESS_INDETERMINATE_ONReady = true; } return _PROGRESS_INDETERMINATE_ONContent; } }
         private static int _PROGRESS_INDETERMINATE_ONContent = default;
         private static bool _PROGRESS_INDETERMINATE_ONReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#PROGRESS_SECONDARY_END"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROGRESS_SECONDARY_END { get { if (!_PROGRESS_SECONDARY_ENDReady) { _PROGRESS_SECONDARY_ENDContent = SGetField<int>(LocalBridgeClazz, "PROGRESS_SECONDARY_END"); _PROGRESS_SECONDARY_ENDReady = true; } return _PROGRESS_SECONDARY_ENDContent; } }
         private static int _PROGRESS_SECONDARY_ENDContent = default;
         private static bool _PROGRESS_SECONDARY_ENDReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#PROGRESS_SECONDARY_START"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROGRESS_SECONDARY_START { get { if (!_PROGRESS_SECONDARY_STARTReady) { _PROGRESS_SECONDARY_STARTContent = SGetField<int>(LocalBridgeClazz, "PROGRESS_SECONDARY_START"); _PROGRESS_SECONDARY_STARTReady = true; } return _PROGRESS_SECONDARY_STARTContent; } }
         private static int _PROGRESS_SECONDARY_STARTContent = default;
         private static bool _PROGRESS_SECONDARY_STARTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#PROGRESS_START"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROGRESS_START { get { if (!_PROGRESS_STARTReady) { _PROGRESS_STARTContent = SGetField<int>(LocalBridgeClazz, "PROGRESS_START"); _PROGRESS_STARTReady = true; } return _PROGRESS_STARTContent; } }
         private static int _PROGRESS_STARTContent = default;
         private static bool _PROGRESS_STARTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#PROGRESS_VISIBILITY_OFF"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROGRESS_VISIBILITY_OFF { get { if (!_PROGRESS_VISIBILITY_OFFReady) { _PROGRESS_VISIBILITY_OFFContent = SGetField<int>(LocalBridgeClazz, "PROGRESS_VISIBILITY_OFF"); _PROGRESS_VISIBILITY_OFFReady = true; } return _PROGRESS_VISIBILITY_OFFContent; } }
         private static int _PROGRESS_VISIBILITY_OFFContent = default;
         private static bool _PROGRESS_VISIBILITY_OFFReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#PROGRESS_VISIBILITY_ON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int PROGRESS_VISIBILITY_ON { get { if (!_PROGRESS_VISIBILITY_ONReady) { _PROGRESS_VISIBILITY_ONContent = SGetField<int>(LocalBridgeClazz, "PROGRESS_VISIBILITY_ON"); _PROGRESS_VISIBILITY_ONReady = true; } return _PROGRESS_VISIBILITY_ONContent; } }
         private static int _PROGRESS_VISIBILITY_ONContent = default;
         private static bool _PROGRESS_VISIBILITY_ONReady = false; // this is used because in case of generics 
@@ -242,253 +242,46 @@ public static int GetDefaultFeatures(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getAllowEnterTransitionOverlap()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setAllowEnterTransitionOverlap(boolean)"/>
-        /// </summary>
-        public bool AllowEnterTransitionOverlap
-        {
-            get { return IExecuteWithSignature<bool>("getAllowEnterTransitionOverlap", "()Z"); } set { IExecuteWithSignature("setAllowEnterTransitionOverlap", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getAllowReturnTransitionOverlap()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setAllowReturnTransitionOverlap(boolean)"/>
-        /// </summary>
-        public bool AllowReturnTransitionOverlap
-        {
-            get { return IExecuteWithSignature<bool>("getAllowReturnTransitionOverlap", "()Z"); } set { IExecuteWithSignature("setAllowReturnTransitionOverlap", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getAttributes()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setAttributes(android.view.WindowManager.LayoutParams)"/>
-        /// </summary>
-        public Android.View.WindowManager.LayoutParams Attributes
-        {
-            get { return IExecuteWithSignature<Android.View.WindowManager.LayoutParams>("getAttributes", "()Landroid/view/WindowManager$LayoutParams;"); } set { IExecuteWithSignature("setAttributes", "(Landroid/view/WindowManager$LayoutParams;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getColorMode()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setColorMode(int)"/>
-        /// </summary>
-        public int ColorMode
-        {
-            get { return IExecuteWithSignature<int>("getColorMode", "()I"); } set { IExecuteWithSignature("setColorMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getContainer()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setContainer(android.view.Window)"/>
-        /// </summary>
-        public Android.View.Window Container
-        {
-            get { return IExecuteWithSignature<Android.View.Window>("getContainer", "()Landroid/view/Window;"); } set { IExecuteWithSignature("setContainer", "(Landroid/view/Window;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getContentScene()"/> 
-        /// </summary>
-        public Android.Transition.Scene ContentScene
-        {
-            get { return IExecuteWithSignature<Android.Transition.Scene>("getContentScene", "()Landroid/transition/Scene;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getContext()"/> 
-        /// </summary>
-        public Android.Content.Context Context
-        {
-            get { return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getCurrentFocus()"/> 
-        /// </summary>
-        public Android.View.View CurrentFocus
-        {
-            get { return IExecuteWithSignature<Android.View.View>("getCurrentFocus", "()Landroid/view/View;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getDecorView()"/> 
-        /// </summary>
-        public Android.View.View DecorView
-        {
-            get { return IExecuteWithSignature<Android.View.View>("getDecorView", "()Landroid/view/View;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getEnterTransition()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setEnterTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition EnterTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getEnterTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setEnterTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getExitTransition()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setExitTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition ExitTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getExitTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setExitTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getCallback()"/> 
-        /// </summary>
-        public Android.View.Window.Callback GetCallback
-        {
-            get { return IExecuteWithSignature<Android.View.Window.Callback>("getCallback", "()Landroid/view/Window$Callback;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getInsetsController()"/> 
-        /// </summary>
-        public Android.View.WindowInsetsController InsetsController
-        {
-            get { return IExecuteWithSignature<Android.View.WindowInsetsController>("getInsetsController", "()Landroid/view/WindowInsetsController;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getLayoutInflater()"/> 
-        /// </summary>
-        public Android.View.LayoutInflater LayoutInflater
-        {
-            get { return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getMediaController()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setMediaController(android.media.session.MediaController)"/>
-        /// </summary>
-        public Android.Media.Session.MediaController MediaController
-        {
-            get { return IExecuteWithSignature<Android.Media.Session.MediaController>("getMediaController", "()Landroid/media/session/MediaController;"); } set { IExecuteWithSignature("setMediaController", "(Landroid/media/session/MediaController;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getNavigationBarColor()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setNavigationBarColor(int)"/>
-        /// </summary>
-        public int NavigationBarColor
-        {
-            get { return IExecuteWithSignature<int>("getNavigationBarColor", "()I"); } set { IExecuteWithSignature("setNavigationBarColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getNavigationBarDividerColor()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setNavigationBarDividerColor(int)"/>
-        /// </summary>
-        public int NavigationBarDividerColor
-        {
-            get { return IExecuteWithSignature<int>("getNavigationBarDividerColor", "()I"); } set { IExecuteWithSignature("setNavigationBarDividerColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getOnBackInvokedDispatcher()"/> 
-        /// </summary>
-        public Android.Window.OnBackInvokedDispatcher OnBackInvokedDispatcher
-        {
-            get { return IExecuteWithSignature<Android.Window.OnBackInvokedDispatcher>("getOnBackInvokedDispatcher", "()Landroid/window/OnBackInvokedDispatcher;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getReenterTransition()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setReenterTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition ReenterTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getReenterTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setReenterTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getReturnTransition()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setReturnTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition ReturnTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getReturnTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setReturnTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getRootSurfaceControl()"/> 
-        /// </summary>
-        public Android.View.AttachedSurfaceControl RootSurfaceControl
-        {
-            get { return IExecuteWithSignature<Android.View.AttachedSurfaceControl>("getRootSurfaceControl", "()Landroid/view/AttachedSurfaceControl;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementEnterTransition()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementEnterTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition SharedElementEnterTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementEnterTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setSharedElementEnterTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementExitTransition()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementExitTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition SharedElementExitTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementExitTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setSharedElementExitTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementReenterTransition()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementReenterTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition SharedElementReenterTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementReenterTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setSharedElementReenterTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementReturnTransition()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementReturnTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition SharedElementReturnTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementReturnTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setSharedElementReturnTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementsUseOverlay()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementsUseOverlay(boolean)"/>
-        /// </summary>
-        public bool SharedElementsUseOverlay
-        {
-            get { return IExecuteWithSignature<bool>("getSharedElementsUseOverlay", "()Z"); } set { IExecuteWithSignature("setSharedElementsUseOverlay", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getStatusBarColor()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setStatusBarColor(int)"/>
-        /// </summary>
-        public int StatusBarColor
-        {
-            get { return IExecuteWithSignature<int>("getStatusBarColor", "()I"); } set { IExecuteWithSignature("setStatusBarColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSystemGestureExclusionRects()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setSystemGestureExclusionRects(java.util.List)"/>
-        /// </summary>
-        public Java.Util.List<Android.Graphics.Rect> SystemGestureExclusionRects
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Android.Graphics.Rect>>("getSystemGestureExclusionRects", "()Ljava/util/List;"); } set { IExecuteWithSignature("setSystemGestureExclusionRects", "(Ljava/util/List;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getTransitionBackgroundFadeDuration()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setTransitionBackgroundFadeDuration(long)"/>
-        /// </summary>
-        public long TransitionBackgroundFadeDuration
-        {
-            get { return IExecuteWithSignature<long>("getTransitionBackgroundFadeDuration", "()J"); } set { IExecuteWithSignature("setTransitionBackgroundFadeDuration", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getTransitionManager()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setTransitionManager(android.transition.TransitionManager)"/>
-        /// </summary>
-        public Android.Transition.TransitionManager TransitionManager
-        {
-            get { return IExecuteWithSignature<Android.Transition.TransitionManager>("getTransitionManager", "()Landroid/transition/TransitionManager;"); } set { IExecuteWithSignature("setTransitionManager", "(Landroid/transition/TransitionManager;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getVolumeControlStream()"/> <see href="https://developer.android.com/reference/android/view/Window.html#setVolumeControlStream(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#findViewById(int)"/>
         /// </summary>
-        public int VolumeControlStream
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T FindViewById<T>(int arg0) where T : Android.View.View
         {
-            get { return IExecuteWithSignature<int>("getVolumeControlStream", "()I"); } set { IExecuteWithSignature("setVolumeControlStream", "(I)V", value); }
+            return IExecute<T>("findViewById", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getWindowManager()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#saveHierarchyState()"/>
         /// </summary>
-        public Android.View.WindowManager WindowManager
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle SaveHierarchyState()
         {
-            get { return IExecuteWithSignature<Android.View.WindowManager>("getWindowManager", "()Landroid/view/WindowManager;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("saveHierarchyState", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#getWindowStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getLayoutInflater()"/>
         /// </summary>
-        public Android.Content.Res.TypedArray WindowStyle
+        /// <returns><see cref="Android.View.LayoutInflater"/></returns>
+        public Android.View.LayoutInflater GetLayoutInflater()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.TypedArray>("getWindowStyle", "()Landroid/content/res/TypedArray;"); }
+            return IExecuteWithSignature<Android.View.LayoutInflater>("getLayoutInflater", "()Landroid/view/LayoutInflater;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#findViewById(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getCurrentFocus()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T FindViewById<T>(int arg0) where T: Android.View.View
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetCurrentFocus()
         {
-            return IExecuteWithSignature<T>("findViewById", "(I)Landroid/view/View;", arg0);
+            return IExecuteWithSignature<Android.View.View>("getCurrentFocus", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/Window.html#saveHierarchyState()"/>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getDecorView()"/>
         /// </summary>
-        /// <returns><see cref="Android.Os.Bundle"/></returns>
-        public Android.Os.Bundle SaveHierarchyState()
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetDecorView()
         {
-            return IExecuteWithSignature<Android.Os.Bundle>("saveHierarchyState", "()Landroid/os/Bundle;");
+            return IExecuteWithSignature<Android.View.View>("getDecorView", "()Landroid/view/View;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#peekDecorView()"/>
@@ -595,6 +388,30 @@ public bool SuperDispatchTrackballEvent(Android.View.MotionEvent arg0)
             return IExecuteWithSignature<bool>("superDispatchTrackballEvent", "(Landroid/view/MotionEvent;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getNavigationBarColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNavigationBarColor()
+        {
+            return IExecuteWithSignature<int>("getNavigationBarColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getStatusBarColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStatusBarColor()
+        {
+            return IExecuteWithSignature<int>("getStatusBarColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getVolumeControlStream()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVolumeControlStream()
+        {
+            return IExecuteWithSignature<int>("getVolumeControlStream", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#addContentView(android.view.View,android.view.ViewGroup.LayoutParams)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -756,6 +573,14 @@ public void SetFeatureInt(int arg0, int arg1)
             IExecute("setFeatureInt", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setNavigationBarColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNavigationBarColor(int arg0)
+        {
+            IExecuteWithSignature("setNavigationBarColor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setResizingCaptionDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -764,6 +589,14 @@ public void SetResizingCaptionDrawable(Android.Graphics.Drawable.Drawable arg0)
             IExecuteWithSignature("setResizingCaptionDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setStatusBarColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetStatusBarColor(int arg0)
+        {
+            IExecuteWithSignature("setStatusBarColor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setTitle(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -775,12 +608,20 @@ public void SetTitle(Java.Lang.CharSequence arg0)
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setTitleColor(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTitleColor(int arg0)
         {
             IExecuteWithSignature("setTitleColor", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setVolumeControlStream(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVolumeControlStream(int arg0)
+        {
+            IExecuteWithSignature("setVolumeControlStream", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#takeInputQueue(android.view.InputQueue.Callback)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.InputQueue.Callback"/></param>
@@ -814,6 +655,150 @@ public void TogglePanel(int arg0, Android.View.KeyEvent arg1)
             IExecute("togglePanel", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getMediaController()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Media.Session.MediaController"/></returns>
+        public Android.Media.Session.MediaController GetMediaController()
+        {
+            return IExecuteWithSignature<Android.Media.Session.MediaController>("getMediaController", "()Landroid/media/session/MediaController;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getContentScene()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Scene"/></returns>
+        public Android.Transition.Scene GetContentScene()
+        {
+            return IExecuteWithSignature<Android.Transition.Scene>("getContentScene", "()Landroid/transition/Scene;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getEnterTransition()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetEnterTransition()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition>("getEnterTransition", "()Landroid/transition/Transition;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getExitTransition()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetExitTransition()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition>("getExitTransition", "()Landroid/transition/Transition;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getReenterTransition()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetReenterTransition()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition>("getReenterTransition", "()Landroid/transition/Transition;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getReturnTransition()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetReturnTransition()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition>("getReturnTransition", "()Landroid/transition/Transition;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementEnterTransition()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetSharedElementEnterTransition()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementEnterTransition", "()Landroid/transition/Transition;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementExitTransition()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetSharedElementExitTransition()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementExitTransition", "()Landroid/transition/Transition;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementReenterTransition()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetSharedElementReenterTransition()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementReenterTransition", "()Landroid/transition/Transition;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementReturnTransition()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetSharedElementReturnTransition()
+        {
+            return IExecuteWithSignature<Android.Transition.Transition>("getSharedElementReturnTransition", "()Landroid/transition/Transition;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getTransitionManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Transition.TransitionManager"/></returns>
+        public Android.Transition.TransitionManager GetTransitionManager()
+        {
+            return IExecuteWithSignature<Android.Transition.TransitionManager>("getTransitionManager", "()Landroid/transition/TransitionManager;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getRootSurfaceControl()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.AttachedSurfaceControl"/></returns>
+        public Android.View.AttachedSurfaceControl GetRootSurfaceControl()
+        {
+            return IExecuteWithSignature<Android.View.AttachedSurfaceControl>("getRootSurfaceControl", "()Landroid/view/AttachedSurfaceControl;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getInsetsController()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.WindowInsetsController"/></returns>
+        public Android.View.WindowInsetsController GetInsetsController()
+        {
+            return IExecuteWithSignature<Android.View.WindowInsetsController>("getInsetsController", "()Landroid/view/WindowInsetsController;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getWindowManager()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.WindowManager"/></returns>
+        public Android.View.WindowManager GetWindowManager()
+        {
+            return IExecuteWithSignature<Android.View.WindowManager>("getWindowManager", "()Landroid/view/WindowManager;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getOnBackInvokedDispatcher()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Window.OnBackInvokedDispatcher"/></returns>
+        public Android.Window.OnBackInvokedDispatcher GetOnBackInvokedDispatcher()
+        {
+            return IExecuteWithSignature<Android.Window.OnBackInvokedDispatcher>("getOnBackInvokedDispatcher", "()Landroid/window/OnBackInvokedDispatcher;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getAllowEnterTransitionOverlap()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowEnterTransitionOverlap()
+        {
+            return IExecuteWithSignature<bool>("getAllowEnterTransitionOverlap", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getAllowReturnTransitionOverlap()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowReturnTransitionOverlap()
+        {
+            return IExecuteWithSignature<bool>("getAllowReturnTransitionOverlap", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSharedElementsUseOverlay()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetSharedElementsUseOverlay()
+        {
+            return IExecuteWithSignature<bool>("getSharedElementsUseOverlay", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#hasFeature(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -861,9 +846,49 @@ public bool RequestFeature(int arg0)
         /// <param name="arg0"><see cref="int"/></param>
         /// <typeparam name="T"><see cref="Android.View.View"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T RequireViewById<T>(int arg0) where T: Android.View.View
+        public T RequireViewById<T>(int arg0) where T : Android.View.View
         {
-            return IExecuteWithSignature<T>("requireViewById", "(I)Landroid/view/View;", arg0);
+            return IExecute<T>("requireViewById", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getWindowStyle()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.TypedArray"/></returns>
+        public Android.Content.Res.TypedArray GetWindowStyle()
+        {
+            return IExecuteWithSignature<Android.Content.Res.TypedArray>("getWindowStyle", "()Landroid/content/res/TypedArray;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getContainer()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Window"/></returns>
+        public Android.View.Window GetContainer()
+        {
+            return IExecuteWithSignature<Android.View.Window>("getContainer", "()Landroid/view/Window;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getCallback()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.Window.Callback"/></returns>
+        public Android.View.Window.Callback GetCallback()
+        {
+            return IExecuteWithSignature<Android.View.Window.Callback>("getCallback", "()Landroid/view/Window$Callback;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getAttributes()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.WindowManager.LayoutParams"/></returns>
+        public Android.View.WindowManager.LayoutParams GetAttributes()
+        {
+            return IExecuteWithSignature<Android.View.WindowManager.LayoutParams>("getAttributes", "()Landroid/view/WindowManager$LayoutParams;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#hasChildren()"/>
@@ -922,6 +947,38 @@ public void SetRestrictedCaptionAreaListener(Android.View.Window.OnRestrictedCap
             IExecuteWithSignature("setRestrictedCaptionAreaListener", "(Landroid/view/Window$OnRestrictedCaptionAreaChangedListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getColorMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColorMode()
+        {
+            return IExecuteWithSignature<int>("getColorMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getNavigationBarDividerColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNavigationBarDividerColor()
+        {
+            return IExecuteWithSignature<int>("getNavigationBarDividerColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getSystemGestureExclusionRects()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Android.Graphics.Rect> GetSystemGestureExclusionRects()
+        {
+            return IExecuteWithSignature<Java.Util.List<Android.Graphics.Rect>>("getSystemGestureExclusionRects", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#getTransitionBackgroundFadeDuration()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTransitionBackgroundFadeDuration()
+        {
+            return IExecuteWithSignature<long>("getTransitionBackgroundFadeDuration", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#addFlags(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -954,6 +1011,30 @@ public void RegisterScrollCaptureCallback(Android.View.ScrollCaptureCallback arg
             IExecuteWithSignature("registerScrollCaptureCallback", "(Landroid/view/ScrollCaptureCallback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setAllowEnterTransitionOverlap(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAllowEnterTransitionOverlap(bool arg0)
+        {
+            IExecuteWithSignature("setAllowEnterTransitionOverlap", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setAllowReturnTransitionOverlap(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAllowReturnTransitionOverlap(bool arg0)
+        {
+            IExecuteWithSignature("setAllowReturnTransitionOverlap", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setAttributes(android.view.WindowManager.LayoutParams)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.WindowManager.LayoutParams"/></param>
+        public void SetAttributes(Android.View.WindowManager.LayoutParams arg0)
+        {
+            IExecuteWithSignature("setAttributes", "(Landroid/view/WindowManager$LayoutParams;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setBackgroundBlurRadius(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -986,6 +1067,22 @@ public void SetClipToOutline(bool arg0)
             IExecuteWithSignature("setClipToOutline", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setColorMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetColorMode(int arg0)
+        {
+            IExecuteWithSignature("setColorMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setContainer(android.view.Window)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Window"/></param>
+        public void SetContainer(Android.View.Window arg0)
+        {
+            IExecuteWithSignature("setContainer", "(Landroid/view/Window;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setDecorFitsSystemWindows(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1010,6 +1107,22 @@ public void SetElevation(float arg0)
             IExecuteWithSignature("setElevation", "(F)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setEnterTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetEnterTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setEnterTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setExitTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetExitTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setExitTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setFlags(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1069,6 +1182,14 @@ public void SetLogo(int arg0)
             IExecuteWithSignature("setLogo", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setMediaController(android.media.session.MediaController)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Media.Session.MediaController"/></param>
+        public void SetMediaController(Android.Media.Session.MediaController arg0)
+        {
+            IExecuteWithSignature("setMediaController", "(Landroid/media/session/MediaController;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setNavigationBarContrastEnforced(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1077,6 +1198,14 @@ public void SetNavigationBarContrastEnforced(bool arg0)
             IExecuteWithSignature("setNavigationBarContrastEnforced", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setNavigationBarDividerColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNavigationBarDividerColor(int arg0)
+        {
+            IExecuteWithSignature("setNavigationBarDividerColor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setPreferMinimalPostProcessing(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1085,6 +1214,62 @@ public void SetPreferMinimalPostProcessing(bool arg0)
             IExecuteWithSignature("setPreferMinimalPostProcessing", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setReenterTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetReenterTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setReenterTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setReturnTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetReturnTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setReturnTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementEnterTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetSharedElementEnterTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setSharedElementEnterTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementExitTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetSharedElementExitTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setSharedElementExitTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementReenterTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetSharedElementReenterTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setSharedElementReenterTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementReturnTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetSharedElementReturnTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setSharedElementReturnTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setSharedElementsUseOverlay(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetSharedElementsUseOverlay(bool arg0)
+        {
+            IExecuteWithSignature("setSharedElementsUseOverlay", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setSoftInputMode(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1109,6 +1294,30 @@ public void SetSustainedPerformanceMode(bool arg0)
             IExecuteWithSignature("setSustainedPerformanceMode", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setSystemGestureExclusionRects(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetSystemGestureExclusionRects(Java.Util.List<Android.Graphics.Rect> arg0)
+        {
+            IExecuteWithSignature("setSystemGestureExclusionRects", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setTransitionBackgroundFadeDuration(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetTransitionBackgroundFadeDuration(long arg0)
+        {
+            IExecuteWithSignature("setTransitionBackgroundFadeDuration", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/Window.html#setTransitionManager(android.transition.TransitionManager)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.TransitionManager"/></param>
+        public void SetTransitionManager(Android.Transition.TransitionManager arg0)
+        {
+            IExecuteWithSignature("setTransitionManager", "(Landroid/transition/TransitionManager;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/Window.html#setType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1450,7 +1659,7 @@ public partial class OnFrameMetricsAvailableListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFrameMetricsAvailable", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Window>>>(OnFrameMetricsAvailableEventHandler));
+                AddEventHandler("onFrameMetricsAvailable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.Window>>>(OnFrameMetricsAvailableEventHandler));
 
             }
 
@@ -1458,7 +1667,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/Window.OnFrameMetricsAvailableListener.html#onFrameMetricsAvailable(android.view.Window,android.view.FrameMetrics,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFrameMetricsAvailable"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.Window, Android.View.FrameMetrics, int> OnOnFrameMetricsAvailable { get; set; } = null;
+            public global::System.Action<Android.View.Window, Android.View.FrameMetrics, int> OnOnFrameMetricsAvailable { get; set; } = null;
 
             void OnFrameMetricsAvailableEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.Window>> data)
             {
@@ -1553,7 +1762,7 @@ public partial class OnRestrictedCaptionAreaChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onRestrictedCaptionAreaChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.Rect>>>(OnRestrictedCaptionAreaChangedEventHandler));
+                AddEventHandler("onRestrictedCaptionAreaChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Graphics.Rect>>>(OnRestrictedCaptionAreaChangedEventHandler));
 
             }
 
@@ -1561,7 +1770,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/Window.OnRestrictedCaptionAreaChangedListener.html#onRestrictedCaptionAreaChanged(android.graphics.Rect)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRestrictedCaptionAreaChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Graphics.Rect> OnOnRestrictedCaptionAreaChanged { get; set; } = null;
+            public global::System.Action<Android.Graphics.Rect> OnOnRestrictedCaptionAreaChanged { get; set; } = null;
 
             void OnRestrictedCaptionAreaChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Graphics.Rect>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/WindowAnimationFrameStats.cs b/src/net/Netdroid/Generated/Android/View/WindowAnimationFrameStats.cs
index 90f460e2c..5300dba15 100644
--- a/src/net/Netdroid/Generated/Android/View/WindowAnimationFrameStats.cs
+++ b/src/net/Netdroid/Generated/Android/View/WindowAnimationFrameStats.cs
@@ -44,7 +44,7 @@ public partial class WindowAnimationFrameStats
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/WindowAnimationFrameStats.html#CREATOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Os.Parcelable.Creator CREATOR { get { if (!_CREATORReady) { _CREATORContent = SGetField<Android.Os.Parcelable.Creator>(LocalBridgeClazz, "CREATOR"); _CREATORReady = true; } return _CREATORContent; } }
         private static Android.Os.Parcelable.Creator _CREATORContent = default;
         private static bool _CREATORReady = false; // this is used because in case of generics 
@@ -60,7 +60,7 @@ public partial class WindowAnimationFrameStats
         /// <see href="https://developer.android.com/reference/android/view/WindowAnimationFrameStats.html#describeContents()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int DescribeContents()
         {
             return IExecuteWithSignature<int>("describeContents", "()I");
@@ -70,7 +70,7 @@ public int DescribeContents()
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcel"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void WriteToParcel(Android.Os.Parcel arg0, int arg1)
         {
             IExecute("writeToParcel", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/View/WindowInsets.cs b/src/net/Netdroid/Generated/Android/View/WindowInsets.cs
index a3e2ef563..b38ea19b9 100644
--- a/src/net/Netdroid/Generated/Android/View/WindowInsets.cs
+++ b/src/net/Netdroid/Generated/Android/View/WindowInsets.cs
@@ -60,147 +60,91 @@ public WindowInsets(Android.View.WindowInsets arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getDisplayCutout()"/> 
-        /// </summary>
-        public Android.View.DisplayCutout DisplayCutout
-        {
-            get { return IExecuteWithSignature<Android.View.DisplayCutout>("getDisplayCutout", "()Landroid/view/DisplayCutout;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getDisplayShape()"/> 
-        /// </summary>
-        public Android.View.DisplayShape DisplayShape
-        {
-            get { return IExecuteWithSignature<Android.View.DisplayShape>("getDisplayShape", "()Landroid/view/DisplayShape;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getMandatorySystemGestureInsets()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Insets MandatorySystemGestureInsets
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getMandatorySystemGestureInsets", "()Landroid/graphics/Insets;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getPrivacyIndicatorBounds()"/> 
-        /// </summary>
-        public Android.Graphics.Rect PrivacyIndicatorBounds
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getPrivacyIndicatorBounds", "()Landroid/graphics/Rect;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsetBottom()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int StableInsetBottom
-        {
-            get { return IExecuteWithSignature<int>("getStableInsetBottom", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsetLeft()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int StableInsetLeft
-        {
-            get { return IExecuteWithSignature<int>("getStableInsetLeft", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsetRight()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int StableInsetRight
-        {
-            get { return IExecuteWithSignature<int>("getStableInsetRight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsets()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Insets StableInsets
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getStableInsets", "()Landroid/graphics/Insets;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsetTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getInsets(int)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int StableInsetTop
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        public Android.Graphics.Insets GetInsets(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getStableInsetTop", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getInsets", "(I)Landroid/graphics/Insets;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemGestureInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getInsetsIgnoringVisibility(int)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Insets SystemGestureInsets
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        public Android.Graphics.Insets GetInsetsIgnoringVisibility(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getSystemGestureInsets", "()Landroid/graphics/Insets;"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getInsetsIgnoringVisibility", "(I)Landroid/graphics/Insets;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsetBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getMandatorySystemGestureInsets()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SystemWindowInsetBottom
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Insets GetMandatorySystemGestureInsets()
         {
-            get { return IExecuteWithSignature<int>("getSystemWindowInsetBottom", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getMandatorySystemGestureInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsetLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsets()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SystemWindowInsetLeft
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Insets GetStableInsets()
         {
-            get { return IExecuteWithSignature<int>("getSystemWindowInsetLeft", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getStableInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsetRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemGestureInsets()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SystemWindowInsetRight
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Insets GetSystemGestureInsets()
         {
-            get { return IExecuteWithSignature<int>("getSystemWindowInsetRight", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getSystemGestureInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsets()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Insets SystemWindowInsets
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Insets GetSystemWindowInsets()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getSystemWindowInsets", "()Landroid/graphics/Insets;"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getSystemWindowInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsetTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getTappableElementInsets()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SystemWindowInsetTop
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Insets GetTappableElementInsets()
         {
-            get { return IExecuteWithSignature<int>("getSystemWindowInsetTop", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getTappableElementInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getTappableElementInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getPrivacyIndicatorBounds()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Insets TappableElementInsets
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetPrivacyIndicatorBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getTappableElementInsets", "()Landroid/graphics/Insets;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getPrivacyIndicatorBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getInsets(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getDisplayCutout()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Graphics.Insets"/></returns>
-        public Android.Graphics.Insets GetInsets(int arg0)
+        /// <returns><see cref="Android.View.DisplayCutout"/></returns>
+        public Android.View.DisplayCutout GetDisplayCutout()
         {
-            return IExecuteWithSignature<Android.Graphics.Insets>("getInsets", "(I)Landroid/graphics/Insets;", arg0);
+            return IExecuteWithSignature<Android.View.DisplayCutout>("getDisplayCutout", "()Landroid/view/DisplayCutout;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getInsetsIgnoringVisibility(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getDisplayShape()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Graphics.Insets"/></returns>
-        public Android.Graphics.Insets GetInsetsIgnoringVisibility(int arg0)
+        /// <returns><see cref="Android.View.DisplayShape"/></returns>
+        public Android.View.DisplayShape GetDisplayShape()
         {
-            return IExecuteWithSignature<Android.Graphics.Insets>("getInsetsIgnoringVisibility", "(I)Landroid/graphics/Insets;", arg0);
+            return IExecuteWithSignature<Android.View.DisplayShape>("getDisplayShape", "()Landroid/view/DisplayShape;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getRoundedCorner(int)"/>
@@ -215,7 +159,7 @@ public Android.View.RoundedCorner GetRoundedCorner(int arg0)
         /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#consumeDisplayCutout()"/>
         /// </summary>
         /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.WindowInsets ConsumeDisplayCutout()
         {
             return IExecuteWithSignature<Android.View.WindowInsets>("consumeDisplayCutout", "()Landroid/view/WindowInsets;");
@@ -224,7 +168,7 @@ public Android.View.WindowInsets ConsumeDisplayCutout()
         /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#consumeStableInsets()"/>
         /// </summary>
         /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.WindowInsets ConsumeStableInsets()
         {
             return IExecuteWithSignature<Android.View.WindowInsets>("consumeStableInsets", "()Landroid/view/WindowInsets;");
@@ -233,7 +177,7 @@ public Android.View.WindowInsets ConsumeStableInsets()
         /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#consumeSystemWindowInsets()"/>
         /// </summary>
         /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.WindowInsets ConsumeSystemWindowInsets()
         {
             return IExecuteWithSignature<Android.View.WindowInsets>("consumeSystemWindowInsets", "()Landroid/view/WindowInsets;");
@@ -264,7 +208,7 @@ public Android.View.WindowInsets Inset(int arg0, int arg1, int arg2, int arg3)
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
         /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.WindowInsets ReplaceSystemWindowInsets(Android.Graphics.Rect arg0)
         {
             return IExecuteWithSignature<Android.View.WindowInsets>("replaceSystemWindowInsets", "(Landroid/graphics/Rect;)Landroid/view/WindowInsets;", arg0);
@@ -277,7 +221,7 @@ public Android.View.WindowInsets ReplaceSystemWindowInsets(Android.Graphics.Rect
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Android.View.WindowInsets"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.WindowInsets ReplaceSystemWindowInsets(int arg0, int arg1, int arg2, int arg3)
         {
             return IExecute<Android.View.WindowInsets>("replaceSystemWindowInsets", arg0, arg1, arg2, arg3);
@@ -294,7 +238,7 @@ public bool HasInsets()
         /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#hasStableInsets()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasStableInsets()
         {
             return IExecuteWithSignature<bool>("hasStableInsets", "()Z");
@@ -303,7 +247,7 @@ public bool HasStableInsets()
         /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#hasSystemWindowInsets()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasSystemWindowInsets()
         {
             return IExecuteWithSignature<bool>("hasSystemWindowInsets", "()Z");
@@ -333,6 +277,78 @@ public bool IsVisible(int arg0)
         {
             return IExecuteWithSignature<bool>("isVisible", "(I)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsetBottom()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetStableInsetBottom()
+        {
+            return IExecuteWithSignature<int>("getStableInsetBottom", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsetLeft()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetStableInsetLeft()
+        {
+            return IExecuteWithSignature<int>("getStableInsetLeft", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsetRight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetStableInsetRight()
+        {
+            return IExecuteWithSignature<int>("getStableInsetRight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getStableInsetTop()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetStableInsetTop()
+        {
+            return IExecuteWithSignature<int>("getStableInsetTop", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsetBottom()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSystemWindowInsetBottom()
+        {
+            return IExecuteWithSignature<int>("getSystemWindowInsetBottom", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsetLeft()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSystemWindowInsetLeft()
+        {
+            return IExecuteWithSignature<int>("getSystemWindowInsetLeft", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsetRight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSystemWindowInsetRight()
+        {
+            return IExecuteWithSignature<int>("getSystemWindowInsetRight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsets.html#getSystemWindowInsetTop()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSystemWindowInsetTop()
+        {
+            return IExecuteWithSignature<int>("getSystemWindowInsetTop", "()I");
+        }
 
         #endregion
 
@@ -417,7 +433,7 @@ public Android.View.WindowInsets.Builder SetInsetsIgnoringVisibility(int arg0, A
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Insets"/></param>
             /// <returns><see cref="Android.View.WindowInsets.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.WindowInsets.Builder SetMandatorySystemGestureInsets(Android.Graphics.Insets arg0)
             {
                 return IExecuteWithSignature<Android.View.WindowInsets.Builder>("setMandatorySystemGestureInsets", "(Landroid/graphics/Insets;)Landroid/view/WindowInsets$Builder;", arg0);
@@ -446,7 +462,7 @@ public Android.View.WindowInsets.Builder SetRoundedCorner(int arg0, Android.View
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Insets"/></param>
             /// <returns><see cref="Android.View.WindowInsets.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.WindowInsets.Builder SetStableInsets(Android.Graphics.Insets arg0)
             {
                 return IExecuteWithSignature<Android.View.WindowInsets.Builder>("setStableInsets", "(Landroid/graphics/Insets;)Landroid/view/WindowInsets$Builder;", arg0);
@@ -456,7 +472,7 @@ public Android.View.WindowInsets.Builder SetStableInsets(Android.Graphics.Insets
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Insets"/></param>
             /// <returns><see cref="Android.View.WindowInsets.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.WindowInsets.Builder SetSystemGestureInsets(Android.Graphics.Insets arg0)
             {
                 return IExecuteWithSignature<Android.View.WindowInsets.Builder>("setSystemGestureInsets", "(Landroid/graphics/Insets;)Landroid/view/WindowInsets$Builder;", arg0);
@@ -466,7 +482,7 @@ public Android.View.WindowInsets.Builder SetSystemGestureInsets(Android.Graphics
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Insets"/></param>
             /// <returns><see cref="Android.View.WindowInsets.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.WindowInsets.Builder SetSystemWindowInsets(Android.Graphics.Insets arg0)
             {
                 return IExecuteWithSignature<Android.View.WindowInsets.Builder>("setSystemWindowInsets", "(Landroid/graphics/Insets;)Landroid/view/WindowInsets$Builder;", arg0);
@@ -476,7 +492,7 @@ public Android.View.WindowInsets.Builder SetSystemWindowInsets(Android.Graphics.
             /// </summary>
             /// <param name="arg0"><see cref="Android.Graphics.Insets"/></param>
             /// <returns><see cref="Android.View.WindowInsets.Builder"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.WindowInsets.Builder SetTappableElementInsets(Android.Graphics.Insets arg0)
             {
                 return IExecuteWithSignature<Android.View.WindowInsets.Builder>("setTappableElementInsets", "(Landroid/graphics/Insets;)Landroid/view/WindowInsets$Builder;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimation.cs b/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimation.cs
index 1a9e8af20..f98ab94d4 100644
--- a/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimation.cs
+++ b/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimation.cs
@@ -56,46 +56,68 @@ public WindowInsetsAnimation(int arg0, Android.View.Animation.Interpolator arg1,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getAlpha()"/> <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#setAlpha(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getInterpolator()"/>
         /// </summary>
-        public float Alpha
+        /// <returns><see cref="Android.View.Animation.Interpolator"/></returns>
+        public Android.View.Animation.Interpolator GetInterpolator()
         {
-            get { return IExecuteWithSignature<float>("getAlpha", "()F"); } set { IExecuteWithSignature("setAlpha", "(F)V", value); }
+            return IExecuteWithSignature<Android.View.Animation.Interpolator>("getInterpolator", "()Landroid/view/animation/Interpolator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getDurationMillis()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getAlpha()"/>
         /// </summary>
-        public long DurationMillis
+        /// <returns><see cref="float"/></returns>
+        public float GetAlpha()
         {
-            get { return IExecuteWithSignature<long>("getDurationMillis", "()J"); }
+            return IExecuteWithSignature<float>("getAlpha", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getFraction()"/> <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#setFraction(float)"/>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getFraction()"/>
         /// </summary>
-        public float Fraction
+        /// <returns><see cref="float"/></returns>
+        public float GetFraction()
         {
-            get { return IExecuteWithSignature<float>("getFraction", "()F"); } set { IExecuteWithSignature("setFraction", "(F)V", value); }
+            return IExecuteWithSignature<float>("getFraction", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getInterpolatedFraction()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getInterpolatedFraction()"/>
         /// </summary>
-        public float InterpolatedFraction
+        /// <returns><see cref="float"/></returns>
+        public float GetInterpolatedFraction()
         {
-            get { return IExecuteWithSignature<float>("getInterpolatedFraction", "()F"); }
+            return IExecuteWithSignature<float>("getInterpolatedFraction", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getInterpolator()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getTypeMask()"/>
         /// </summary>
-        public Android.View.Animation.Interpolator Interpolator
+        /// <returns><see cref="int"/></returns>
+        public int GetTypeMask()
         {
-            get { return IExecuteWithSignature<Android.View.Animation.Interpolator>("getInterpolator", "()Landroid/view/animation/Interpolator;"); }
+            return IExecuteWithSignature<int>("getTypeMask", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getTypeMask()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#getDurationMillis()"/>
         /// </summary>
-        public int TypeMask
+        /// <returns><see cref="long"/></returns>
+        public long GetDurationMillis()
         {
-            get { return IExecuteWithSignature<int>("getTypeMask", "()I"); }
+            return IExecuteWithSignature<long>("getDurationMillis", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#setAlpha(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetAlpha(float arg0)
+        {
+            IExecuteWithSignature("setAlpha", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.html#setFraction(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetFraction(float arg0)
+        {
+            IExecuteWithSignature("setFraction", "(F)V", arg0);
         }
 
         #endregion
@@ -131,18 +153,20 @@ public Bounds(Android.Graphics.Insets arg0, Android.Graphics.Insets arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Bounds.html#getLowerBound()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Bounds.html#getLowerBound()"/>
             /// </summary>
-            public Android.Graphics.Insets LowerBound
+            /// <returns><see cref="Android.Graphics.Insets"/></returns>
+            public Android.Graphics.Insets GetLowerBound()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Insets>("getLowerBound", "()Landroid/graphics/Insets;"); }
+                return IExecuteWithSignature<Android.Graphics.Insets>("getLowerBound", "()Landroid/graphics/Insets;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Bounds.html#getUpperBound()"/> 
+            /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Bounds.html#getUpperBound()"/>
             /// </summary>
-            public Android.Graphics.Insets UpperBound
+            /// <returns><see cref="Android.Graphics.Insets"/></returns>
+            public Android.Graphics.Insets GetUpperBound()
             {
-                get { return IExecuteWithSignature<Android.Graphics.Insets>("getUpperBound", "()Landroid/graphics/Insets;"); }
+                return IExecuteWithSignature<Android.Graphics.Insets>("getUpperBound", "()Landroid/graphics/Insets;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Bounds.html#inset(android.graphics.Insets)"/>
@@ -205,13 +229,6 @@ public Callback(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Callback.html#getDispatchMode()"/> 
-            /// </summary>
-            public int DispatchMode
-            {
-                get { return IExecuteWithSignature<int>("getDispatchMode", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Callback.html#onProgress(android.view.WindowInsets,java.util.List)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.WindowInsets"/></param>
@@ -232,6 +249,14 @@ public Android.View.WindowInsetsAnimation.Bounds OnStart(Android.View.WindowInse
                 return IExecute<Android.View.WindowInsetsAnimation.Bounds>("onStart", arg0, arg1);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Callback.html#getDispatchMode()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetDispatchMode()
+            {
+                return IExecuteWithSignature<int>("getDispatchMode", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimation.Callback.html#onEnd(android.view.WindowInsetsAnimation)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.WindowInsetsAnimation"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimationControlListener.cs b/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimationControlListener.cs
index 691b8b3ac..a6db9113b 100644
--- a/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimationControlListener.cs
+++ b/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimationControlListener.cs
@@ -68,9 +68,9 @@ public partial class WindowInsetsAnimationControlListener : Android.View.IWindow
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onCancelled", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>>>(OnCancelledEventHandler));
-            AddEventHandler("onFinished", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>>>(OnFinishedEventHandler));
-            AddEventHandler("onReady", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>>>(OnReadyEventHandler));
+            AddEventHandler("onCancelled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>>>(OnCancelledEventHandler));
+            AddEventHandler("onFinished", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>>>(OnFinishedEventHandler));
+            AddEventHandler("onReady", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>>>(OnReadyEventHandler));
 
         }
 
@@ -78,7 +78,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationControlListener.html#onCancelled(android.view.WindowInsetsAnimationController)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnCancelled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.WindowInsetsAnimationController> OnOnCancelled { get; set; } = null;
+        public global::System.Action<Android.View.WindowInsetsAnimationController> OnOnCancelled { get; set; } = null;
 
         void OnCancelledEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>> data)
         {
@@ -99,7 +99,7 @@ public virtual void OnCancelled(Android.View.WindowInsetsAnimationController arg
         /// Handler for <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationControlListener.html#onFinished(android.view.WindowInsetsAnimationController)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnFinished"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.WindowInsetsAnimationController> OnOnFinished { get; set; } = null;
+        public global::System.Action<Android.View.WindowInsetsAnimationController> OnOnFinished { get; set; } = null;
 
         void OnFinishedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>> data)
         {
@@ -120,7 +120,7 @@ public virtual void OnFinished(Android.View.WindowInsetsAnimationController arg0
         /// Handler for <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationControlListener.html#onReady(android.view.WindowInsetsAnimationController,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnReady"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.WindowInsetsAnimationController, int> OnOnReady { get; set; } = null;
+        public global::System.Action<Android.View.WindowInsetsAnimationController, int> OnOnReady { get; set; } = null;
 
         void OnReadyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsAnimationController>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimationController.cs b/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimationController.cs
index 70ca2e046..fcf4526ed 100644
--- a/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimationController.cs
+++ b/src/net/Netdroid/Generated/Android/View/WindowInsetsAnimationController.cs
@@ -64,62 +64,68 @@ public partial class WindowInsetsAnimationController : Android.View.IWindowInset
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getCurrentAlpha()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getCurrentInsets()"/>
         /// </summary>
-        public float CurrentAlpha
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        public Android.Graphics.Insets GetCurrentInsets()
         {
-            get { return IExecuteWithSignature<float>("getCurrentAlpha", "()F"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getCurrentInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getCurrentFraction()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getHiddenStateInsets()"/>
         /// </summary>
-        public float CurrentFraction
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        public Android.Graphics.Insets GetHiddenStateInsets()
         {
-            get { return IExecuteWithSignature<float>("getCurrentFraction", "()F"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getHiddenStateInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getCurrentInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getShownStateInsets()"/>
         /// </summary>
-        public Android.Graphics.Insets CurrentInsets
+        /// <returns><see cref="Android.Graphics.Insets"/></returns>
+        public Android.Graphics.Insets GetShownStateInsets()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getCurrentInsets", "()Landroid/graphics/Insets;"); }
+            return IExecuteWithSignature<Android.Graphics.Insets>("getShownStateInsets", "()Landroid/graphics/Insets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getHiddenStateInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#isCancelled()"/>
         /// </summary>
-        public Android.Graphics.Insets HiddenStateInsets
+        /// <returns><see cref="bool"/></returns>
+        public bool IsCancelled()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getHiddenStateInsets", "()Landroid/graphics/Insets;"); }
+            return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getShownStateInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#isFinished()"/>
         /// </summary>
-        public Android.Graphics.Insets ShownStateInsets
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFinished()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Insets>("getShownStateInsets", "()Landroid/graphics/Insets;"); }
+            return IExecuteWithSignature<bool>("isFinished", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getCurrentAlpha()"/>
         /// </summary>
-        public int Types
+        /// <returns><see cref="float"/></returns>
+        public float GetCurrentAlpha()
         {
-            get { return IExecuteWithSignature<int>("getTypes", "()I"); }
+            return IExecuteWithSignature<float>("getCurrentAlpha", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getCurrentFraction()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsCancelled()
+        /// <returns><see cref="float"/></returns>
+        public float GetCurrentFraction()
         {
-            return IExecuteWithSignature<bool>("isCancelled", "()Z");
+            return IExecuteWithSignature<float>("getCurrentFraction", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#isFinished()"/>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#getTypes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFinished()
+        /// <returns><see cref="int"/></returns>
+        public int GetTypes()
         {
-            return IExecuteWithSignature<bool>("isFinished", "()Z");
+            return IExecuteWithSignature<int>("getTypes", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/WindowInsetsAnimationController.html#finish(boolean)"/>
diff --git a/src/net/Netdroid/Generated/Android/View/WindowInsetsController.cs b/src/net/Netdroid/Generated/Android/View/WindowInsetsController.cs
index 78ca96e0d..d68bdbfdd 100644
--- a/src/net/Netdroid/Generated/Android/View/WindowInsetsController.cs
+++ b/src/net/Netdroid/Generated/Android/View/WindowInsetsController.cs
@@ -76,14 +76,14 @@ public partial class WindowInsetsController : Android.View.IWindowInsetsControll
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#BEHAVIOR_SHOW_BARS_BY_SWIPE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BEHAVIOR_SHOW_BARS_BY_SWIPE { get { if (!_BEHAVIOR_SHOW_BARS_BY_SWIPEReady) { _BEHAVIOR_SHOW_BARS_BY_SWIPEContent = SGetField<int>(LocalBridgeClazz, "BEHAVIOR_SHOW_BARS_BY_SWIPE"); _BEHAVIOR_SHOW_BARS_BY_SWIPEReady = true; } return _BEHAVIOR_SHOW_BARS_BY_SWIPEContent; } }
         private static int _BEHAVIOR_SHOW_BARS_BY_SWIPEContent = default;
         private static bool _BEHAVIOR_SHOW_BARS_BY_SWIPEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#BEHAVIOR_SHOW_BARS_BY_TOUCH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int BEHAVIOR_SHOW_BARS_BY_TOUCH { get { if (!_BEHAVIOR_SHOW_BARS_BY_TOUCHReady) { _BEHAVIOR_SHOW_BARS_BY_TOUCHContent = SGetField<int>(LocalBridgeClazz, "BEHAVIOR_SHOW_BARS_BY_TOUCH"); _BEHAVIOR_SHOW_BARS_BY_TOUCHReady = true; } return _BEHAVIOR_SHOW_BARS_BY_TOUCHContent; } }
         private static int _BEHAVIOR_SHOW_BARS_BY_TOUCHContent = default;
         private static bool _BEHAVIOR_SHOW_BARS_BY_TOUCHReady = false; // this is used because in case of generics 
@@ -102,18 +102,20 @@ public partial class WindowInsetsController : Android.View.IWindowInsetsControll
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#getSystemBarsAppearance()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#getSystemBarsAppearance()"/>
         /// </summary>
-        public int SystemBarsAppearance
+        /// <returns><see cref="int"/></returns>
+        public int GetSystemBarsAppearance()
         {
-            get { return IExecuteWithSignature<int>("getSystemBarsAppearance", "()I"); }
+            return IExecuteWithSignature<int>("getSystemBarsAppearance", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#getSystemBarsBehavior()"/> <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#setSystemBarsBehavior(int)"/>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#getSystemBarsBehavior()"/>
         /// </summary>
-        public int SystemBarsBehavior
+        /// <returns><see cref="int"/></returns>
+        public int GetSystemBarsBehavior()
         {
-            get { return IExecuteWithSignature<int>("getSystemBarsBehavior", "()I"); } set { IExecuteWithSignature("setSystemBarsBehavior", "(I)V", value); }
+            return IExecuteWithSignature<int>("getSystemBarsBehavior", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#addOnControllableInsetsChangedListener(android.view.WindowInsetsController.OnControllableInsetsChangedListener)"/>
@@ -161,6 +163,14 @@ public void SetSystemBarsAppearance(int arg0, int arg1)
             IExecute("setSystemBarsAppearance", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#setSystemBarsBehavior(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSystemBarsBehavior(int arg0)
+        {
+            IExecuteWithSignature("setSystemBarsBehavior", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/WindowInsetsController.html#show(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -197,7 +207,7 @@ public partial class OnControllableInsetsChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onControllableInsetsChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsController>>>(OnControllableInsetsChangedEventHandler));
+                AddEventHandler("onControllableInsetsChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsController>>>(OnControllableInsetsChangedEventHandler));
 
             }
 
@@ -205,7 +215,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/WindowInsetsController.OnControllableInsetsChangedListener.html#onControllableInsetsChanged(android.view.WindowInsetsController,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnControllableInsetsChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.WindowInsetsController, int> OnOnControllableInsetsChanged { get; set; } = null;
+            public global::System.Action<Android.View.WindowInsetsController, int> OnOnControllableInsetsChanged { get; set; } = null;
 
             void OnControllableInsetsChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.WindowInsetsController>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/View/WindowManager.cs b/src/net/Netdroid/Generated/Android/View/WindowManager.cs
index 54e32428f..5698b40d8 100644
--- a/src/net/Netdroid/Generated/Android/View/WindowManager.cs
+++ b/src/net/Netdroid/Generated/Android/View/WindowManager.cs
@@ -124,34 +124,37 @@ public partial class WindowManager : Android.View.IWindowManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#getCurrentWindowMetrics()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#getDefaultDisplay()"/>
         /// </summary>
-        public Android.View.WindowMetrics CurrentWindowMetrics
+        /// <returns><see cref="Android.View.Display"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.Display GetDefaultDisplay()
         {
-            get { return IExecuteWithSignature<Android.View.WindowMetrics>("getCurrentWindowMetrics", "()Landroid/view/WindowMetrics;"); }
+            return IExecuteWithSignature<Android.View.Display>("getDefaultDisplay", "()Landroid/view/Display;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#getDefaultDisplay()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#removeViewImmediate(android.view.View)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.Display DefaultDisplay
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void RemoveViewImmediate(Android.View.View arg0)
         {
-            get { return IExecuteWithSignature<Android.View.Display>("getDefaultDisplay", "()Landroid/view/Display;"); }
+            IExecuteWithSignature("removeViewImmediate", "(Landroid/view/View;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#getMaximumWindowMetrics()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#getCurrentWindowMetrics()"/>
         /// </summary>
-        public Android.View.WindowMetrics MaximumWindowMetrics
+        /// <returns><see cref="Android.View.WindowMetrics"/></returns>
+        public Android.View.WindowMetrics GetCurrentWindowMetrics()
         {
-            get { return IExecuteWithSignature<Android.View.WindowMetrics>("getMaximumWindowMetrics", "()Landroid/view/WindowMetrics;"); }
+            return IExecuteWithSignature<Android.View.WindowMetrics>("getCurrentWindowMetrics", "()Landroid/view/WindowMetrics;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#removeViewImmediate(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#getMaximumWindowMetrics()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        public void RemoveViewImmediate(Android.View.View arg0)
+        /// <returns><see cref="Android.View.WindowMetrics"/></returns>
+        public Android.View.WindowMetrics GetMaximumWindowMetrics()
         {
-            IExecuteWithSignature("removeViewImmediate", "(Landroid/view/View;)V", arg0);
+            return IExecuteWithSignature<Android.View.WindowMetrics>("getMaximumWindowMetrics", "()Landroid/view/WindowMetrics;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/view/WindowManager.html#isCrossWindowBlurEnabled()"/>
@@ -409,7 +412,7 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#memoryType"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int memoryType { get { return IGetField<int>("memoryType"); } set { ISetField("memoryType", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#preferredDisplayModeId"/>
@@ -430,7 +433,7 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#systemUiVisibility"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int systemUiVisibility { get { return IGetField<int>("systemUiVisibility"); } set { ISetField("systemUiVisibility", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#type"/>
@@ -545,14 +548,14 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_DISMISS_KEYGUARD"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_DISMISS_KEYGUARD { get { if (!_FLAG_DISMISS_KEYGUARDReady) { _FLAG_DISMISS_KEYGUARDContent = SGetField<int>(LocalBridgeClazz, "FLAG_DISMISS_KEYGUARD"); _FLAG_DISMISS_KEYGUARDReady = true; } return _FLAG_DISMISS_KEYGUARDContent; } }
             private static int _FLAG_DISMISS_KEYGUARDContent = default;
             private static bool _FLAG_DISMISS_KEYGUARDReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_DITHER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_DITHER { get { if (!_FLAG_DITHERReady) { _FLAG_DITHERContent = SGetField<int>(LocalBridgeClazz, "FLAG_DITHER"); _FLAG_DITHERReady = true; } return _FLAG_DITHERContent; } }
             private static int _FLAG_DITHERContent = default;
             private static bool _FLAG_DITHERReady = false; // this is used because in case of generics 
@@ -565,14 +568,14 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_FORCE_NOT_FULLSCREEN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_FORCE_NOT_FULLSCREEN { get { if (!_FLAG_FORCE_NOT_FULLSCREENReady) { _FLAG_FORCE_NOT_FULLSCREENContent = SGetField<int>(LocalBridgeClazz, "FLAG_FORCE_NOT_FULLSCREEN"); _FLAG_FORCE_NOT_FULLSCREENReady = true; } return _FLAG_FORCE_NOT_FULLSCREENContent; } }
             private static int _FLAG_FORCE_NOT_FULLSCREENContent = default;
             private static bool _FLAG_FORCE_NOT_FULLSCREENReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_FULLSCREEN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_FULLSCREEN { get { if (!_FLAG_FULLSCREENReady) { _FLAG_FULLSCREENContent = SGetField<int>(LocalBridgeClazz, "FLAG_FULLSCREEN"); _FLAG_FULLSCREENReady = true; } return _FLAG_FULLSCREENContent; } }
             private static int _FLAG_FULLSCREENContent = default;
             private static bool _FLAG_FULLSCREENReady = false; // this is used because in case of generics 
@@ -597,14 +600,14 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_LAYOUT_ATTACHED_IN_DECOR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_LAYOUT_ATTACHED_IN_DECOR { get { if (!_FLAG_LAYOUT_ATTACHED_IN_DECORReady) { _FLAG_LAYOUT_ATTACHED_IN_DECORContent = SGetField<int>(LocalBridgeClazz, "FLAG_LAYOUT_ATTACHED_IN_DECOR"); _FLAG_LAYOUT_ATTACHED_IN_DECORReady = true; } return _FLAG_LAYOUT_ATTACHED_IN_DECORContent; } }
             private static int _FLAG_LAYOUT_ATTACHED_IN_DECORContent = default;
             private static bool _FLAG_LAYOUT_ATTACHED_IN_DECORReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_LAYOUT_IN_OVERSCAN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_LAYOUT_IN_OVERSCAN { get { if (!_FLAG_LAYOUT_IN_OVERSCANReady) { _FLAG_LAYOUT_IN_OVERSCANContent = SGetField<int>(LocalBridgeClazz, "FLAG_LAYOUT_IN_OVERSCAN"); _FLAG_LAYOUT_IN_OVERSCANReady = true; } return _FLAG_LAYOUT_IN_OVERSCANContent; } }
             private static int _FLAG_LAYOUT_IN_OVERSCANContent = default;
             private static bool _FLAG_LAYOUT_IN_OVERSCANReady = false; // this is used because in case of generics 
@@ -617,7 +620,7 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_LAYOUT_INSET_DECOR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_LAYOUT_INSET_DECOR { get { if (!_FLAG_LAYOUT_INSET_DECORReady) { _FLAG_LAYOUT_INSET_DECORContent = SGetField<int>(LocalBridgeClazz, "FLAG_LAYOUT_INSET_DECOR"); _FLAG_LAYOUT_INSET_DECORReady = true; } return _FLAG_LAYOUT_INSET_DECORContent; } }
             private static int _FLAG_LAYOUT_INSET_DECORContent = default;
             private static bool _FLAG_LAYOUT_INSET_DECORReady = false; // this is used because in case of generics 
@@ -672,7 +675,7 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_SHOW_WHEN_LOCKED"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_SHOW_WHEN_LOCKED { get { if (!_FLAG_SHOW_WHEN_LOCKEDReady) { _FLAG_SHOW_WHEN_LOCKEDContent = SGetField<int>(LocalBridgeClazz, "FLAG_SHOW_WHEN_LOCKED"); _FLAG_SHOW_WHEN_LOCKEDReady = true; } return _FLAG_SHOW_WHEN_LOCKEDContent; } }
             private static int _FLAG_SHOW_WHEN_LOCKEDContent = default;
             private static bool _FLAG_SHOW_WHEN_LOCKEDReady = false; // this is used because in case of generics 
@@ -685,28 +688,28 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_TOUCHABLE_WHEN_WAKING"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_TOUCHABLE_WHEN_WAKING { get { if (!_FLAG_TOUCHABLE_WHEN_WAKINGReady) { _FLAG_TOUCHABLE_WHEN_WAKINGContent = SGetField<int>(LocalBridgeClazz, "FLAG_TOUCHABLE_WHEN_WAKING"); _FLAG_TOUCHABLE_WHEN_WAKINGReady = true; } return _FLAG_TOUCHABLE_WHEN_WAKINGContent; } }
             private static int _FLAG_TOUCHABLE_WHEN_WAKINGContent = default;
             private static bool _FLAG_TOUCHABLE_WHEN_WAKINGReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_TRANSLUCENT_NAVIGATION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_TRANSLUCENT_NAVIGATION { get { if (!_FLAG_TRANSLUCENT_NAVIGATIONReady) { _FLAG_TRANSLUCENT_NAVIGATIONContent = SGetField<int>(LocalBridgeClazz, "FLAG_TRANSLUCENT_NAVIGATION"); _FLAG_TRANSLUCENT_NAVIGATIONReady = true; } return _FLAG_TRANSLUCENT_NAVIGATIONContent; } }
             private static int _FLAG_TRANSLUCENT_NAVIGATIONContent = default;
             private static bool _FLAG_TRANSLUCENT_NAVIGATIONReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_TRANSLUCENT_STATUS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_TRANSLUCENT_STATUS { get { if (!_FLAG_TRANSLUCENT_STATUSReady) { _FLAG_TRANSLUCENT_STATUSContent = SGetField<int>(LocalBridgeClazz, "FLAG_TRANSLUCENT_STATUS"); _FLAG_TRANSLUCENT_STATUSReady = true; } return _FLAG_TRANSLUCENT_STATUSContent; } }
             private static int _FLAG_TRANSLUCENT_STATUSContent = default;
             private static bool _FLAG_TRANSLUCENT_STATUSReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_TURN_SCREEN_ON"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int FLAG_TURN_SCREEN_ON { get { if (!_FLAG_TURN_SCREEN_ONReady) { _FLAG_TURN_SCREEN_ONContent = SGetField<int>(LocalBridgeClazz, "FLAG_TURN_SCREEN_ON"); _FLAG_TURN_SCREEN_ONReady = true; } return _FLAG_TURN_SCREEN_ONContent; } }
             private static int _FLAG_TURN_SCREEN_ONContent = default;
             private static bool _FLAG_TURN_SCREEN_ONReady = false; // this is used because in case of generics 
@@ -785,28 +788,28 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#MEMORY_TYPE_GPU"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int MEMORY_TYPE_GPU { get { if (!_MEMORY_TYPE_GPUReady) { _MEMORY_TYPE_GPUContent = SGetField<int>(LocalBridgeClazz, "MEMORY_TYPE_GPU"); _MEMORY_TYPE_GPUReady = true; } return _MEMORY_TYPE_GPUContent; } }
             private static int _MEMORY_TYPE_GPUContent = default;
             private static bool _MEMORY_TYPE_GPUReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#MEMORY_TYPE_HARDWARE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int MEMORY_TYPE_HARDWARE { get { if (!_MEMORY_TYPE_HARDWAREReady) { _MEMORY_TYPE_HARDWAREContent = SGetField<int>(LocalBridgeClazz, "MEMORY_TYPE_HARDWARE"); _MEMORY_TYPE_HARDWAREReady = true; } return _MEMORY_TYPE_HARDWAREContent; } }
             private static int _MEMORY_TYPE_HARDWAREContent = default;
             private static bool _MEMORY_TYPE_HARDWAREReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#MEMORY_TYPE_NORMAL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int MEMORY_TYPE_NORMAL { get { if (!_MEMORY_TYPE_NORMALReady) { _MEMORY_TYPE_NORMALContent = SGetField<int>(LocalBridgeClazz, "MEMORY_TYPE_NORMAL"); _MEMORY_TYPE_NORMALReady = true; } return _MEMORY_TYPE_NORMALContent; } }
             private static int _MEMORY_TYPE_NORMALContent = default;
             private static bool _MEMORY_TYPE_NORMALReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#MEMORY_TYPE_PUSH_BUFFERS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int MEMORY_TYPE_PUSH_BUFFERS { get { if (!_MEMORY_TYPE_PUSH_BUFFERSReady) { _MEMORY_TYPE_PUSH_BUFFERSContent = SGetField<int>(LocalBridgeClazz, "MEMORY_TYPE_PUSH_BUFFERS"); _MEMORY_TYPE_PUSH_BUFFERSReady = true; } return _MEMORY_TYPE_PUSH_BUFFERSContent; } }
             private static int _MEMORY_TYPE_PUSH_BUFFERSContent = default;
             private static bool _MEMORY_TYPE_PUSH_BUFFERSReady = false; // this is used because in case of generics 
@@ -867,7 +870,7 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#SOFT_INPUT_ADJUST_RESIZE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int SOFT_INPUT_ADJUST_RESIZE { get { if (!_SOFT_INPUT_ADJUST_RESIZEReady) { _SOFT_INPUT_ADJUST_RESIZEContent = SGetField<int>(LocalBridgeClazz, "SOFT_INPUT_ADJUST_RESIZE"); _SOFT_INPUT_ADJUST_RESIZEReady = true; } return _SOFT_INPUT_ADJUST_RESIZEContent; } }
             private static int _SOFT_INPUT_ADJUST_RESIZEContent = default;
             private static bool _SOFT_INPUT_ADJUST_RESIZEReady = false; // this is used because in case of generics 
@@ -1030,14 +1033,14 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#TYPE_PHONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_PHONE { get { if (!_TYPE_PHONEReady) { _TYPE_PHONEContent = SGetField<int>(LocalBridgeClazz, "TYPE_PHONE"); _TYPE_PHONEReady = true; } return _TYPE_PHONEContent; } }
             private static int _TYPE_PHONEContent = default;
             private static bool _TYPE_PHONEReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#TYPE_PRIORITY_PHONE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_PRIORITY_PHONE { get { if (!_TYPE_PRIORITY_PHONEReady) { _TYPE_PRIORITY_PHONEContent = SGetField<int>(LocalBridgeClazz, "TYPE_PRIORITY_PHONE"); _TYPE_PRIORITY_PHONEReady = true; } return _TYPE_PRIORITY_PHONEContent; } }
             private static int _TYPE_PRIORITY_PHONEContent = default;
             private static bool _TYPE_PRIORITY_PHONEReady = false; // this is used because in case of generics 
@@ -1062,7 +1065,7 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#TYPE_SYSTEM_ALERT"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_SYSTEM_ALERT { get { if (!_TYPE_SYSTEM_ALERTReady) { _TYPE_SYSTEM_ALERTContent = SGetField<int>(LocalBridgeClazz, "TYPE_SYSTEM_ALERT"); _TYPE_SYSTEM_ALERTReady = true; } return _TYPE_SYSTEM_ALERTContent; } }
             private static int _TYPE_SYSTEM_ALERTContent = default;
             private static bool _TYPE_SYSTEM_ALERTReady = false; // this is used because in case of generics 
@@ -1075,21 +1078,21 @@ public LayoutParams(int arg0)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#TYPE_SYSTEM_ERROR"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_SYSTEM_ERROR { get { if (!_TYPE_SYSTEM_ERRORReady) { _TYPE_SYSTEM_ERRORContent = SGetField<int>(LocalBridgeClazz, "TYPE_SYSTEM_ERROR"); _TYPE_SYSTEM_ERRORReady = true; } return _TYPE_SYSTEM_ERRORContent; } }
             private static int _TYPE_SYSTEM_ERRORContent = default;
             private static bool _TYPE_SYSTEM_ERRORReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#TYPE_SYSTEM_OVERLAY"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_SYSTEM_OVERLAY { get { if (!_TYPE_SYSTEM_OVERLAYReady) { _TYPE_SYSTEM_OVERLAYContent = SGetField<int>(LocalBridgeClazz, "TYPE_SYSTEM_OVERLAY"); _TYPE_SYSTEM_OVERLAYReady = true; } return _TYPE_SYSTEM_OVERLAYContent; } }
             private static int _TYPE_SYSTEM_OVERLAYContent = default;
             private static bool _TYPE_SYSTEM_OVERLAYReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#TYPE_TOAST"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int TYPE_TOAST { get { if (!_TYPE_TOASTReady) { _TYPE_TOASTContent = SGetField<int>(LocalBridgeClazz, "TYPE_TOAST"); _TYPE_TOASTReady = true; } return _TYPE_TOASTContent; } }
             private static int _TYPE_TOASTContent = default;
             private static bool _TYPE_TOASTReady = false; // this is used because in case of generics 
@@ -1117,41 +1120,6 @@ public static bool MayUseInputMethod(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getBlurBehindRadius()"/> <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setBlurBehindRadius(int)"/>
-            /// </summary>
-            public int BlurBehindRadius
-            {
-                get { return IExecuteWithSignature<int>("getBlurBehindRadius", "()I"); } set { IExecuteWithSignature("setBlurBehindRadius", "(I)V", value); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getColorMode()"/> <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setColorMode(int)"/>
-            /// </summary>
-            public int ColorMode
-            {
-                get { return IExecuteWithSignature<int>("getColorMode", "()I"); } set { IExecuteWithSignature("setColorMode", "(I)V", value); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getFitInsetsSides()"/> <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setFitInsetsSides(int)"/>
-            /// </summary>
-            public int FitInsetsSides
-            {
-                get { return IExecuteWithSignature<int>("getFitInsetsSides", "()I"); } set { IExecuteWithSignature("setFitInsetsSides", "(I)V", value); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getFitInsetsTypes()"/> <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setFitInsetsTypes(int)"/>
-            /// </summary>
-            public int FitInsetsTypes
-            {
-                get { return IExecuteWithSignature<int>("getFitInsetsTypes", "()I"); } set { IExecuteWithSignature("setFitInsetsTypes", "(I)V", value); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getTitle()"/> <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setTitle(java.lang.CharSequence)"/>
-            /// </summary>
-            public Java.Lang.CharSequence Title
-            {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setTitle", "(Ljava/lang/CharSequence;)V", value); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#areWallpaperTouchEventsEnabled()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -1193,6 +1161,22 @@ public int CopyFrom(Android.View.WindowManager.LayoutParams arg0)
                 return IExecuteWithSignature<int>("copyFrom", "(Landroid/view/WindowManager$LayoutParams;)I", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getTitle()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetTitle()
+            {
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setTitle(java.lang.CharSequence)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+            public void SetTitle(Java.Lang.CharSequence arg0)
+            {
+                IExecuteWithSignature("setTitle", "(Ljava/lang/CharSequence;)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#describeContents()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
@@ -1201,6 +1185,38 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getBlurBehindRadius()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetBlurBehindRadius()
+            {
+                return IExecuteWithSignature<int>("getBlurBehindRadius", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getColorMode()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetColorMode()
+            {
+                return IExecuteWithSignature<int>("getColorMode", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getFitInsetsSides()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetFitInsetsSides()
+            {
+                return IExecuteWithSignature<int>("getFitInsetsSides", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#getFitInsetsTypes()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetFitInsetsTypes()
+            {
+                return IExecuteWithSignature<int>("getFitInsetsTypes", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#debug(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -1210,6 +1226,14 @@ public Java.Lang.String Debug(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Lang.String>("debug", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setBlurBehindRadius(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetBlurBehindRadius(int arg0)
+            {
+                IExecuteWithSignature("setBlurBehindRadius", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setCanPlayMoveAnimation(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
@@ -1218,6 +1242,14 @@ public void SetCanPlayMoveAnimation(bool arg0)
                 IExecuteWithSignature("setCanPlayMoveAnimation", "(Z)V", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setColorMode(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetColorMode(int arg0)
+            {
+                IExecuteWithSignature("setColorMode", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setFitInsetsIgnoringVisibility(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
@@ -1226,6 +1258,22 @@ public void SetFitInsetsIgnoringVisibility(bool arg0)
                 IExecuteWithSignature("setFitInsetsIgnoringVisibility", "(Z)V", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setFitInsetsSides(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetFitInsetsSides(int arg0)
+            {
+                IExecuteWithSignature("setFitInsetsSides", "(I)V", arg0);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setFitInsetsTypes(int)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="int"/></param>
+            public void SetFitInsetsTypes(int arg0)
+            {
+                IExecuteWithSignature("setFitInsetsTypes", "(I)V", arg0);
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#setHdrConversionEnabled(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Android/View/WindowMetrics.cs b/src/net/Netdroid/Generated/Android/View/WindowMetrics.cs
index 3313a10a2..5ecc9ddd9 100644
--- a/src/net/Netdroid/Generated/Android/View/WindowMetrics.cs
+++ b/src/net/Netdroid/Generated/Android/View/WindowMetrics.cs
@@ -44,7 +44,7 @@ public WindowMetrics(Android.Graphics.Rect arg0, Android.View.WindowInsets arg1,
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
         /// <param name="arg1"><see cref="Android.View.WindowInsets"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public WindowMetrics(Android.Graphics.Rect arg0, Android.View.WindowInsets arg1)
             : base(arg0, arg1)
         {
@@ -66,25 +66,28 @@ public WindowMetrics(Android.Graphics.Rect arg0, Android.View.WindowInsets arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowMetrics.html#getBounds()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowMetrics.html#getBounds()"/>
         /// </summary>
-        public Android.Graphics.Rect Bounds
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowMetrics.html#getDensity()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowMetrics.html#getWindowInsets()"/>
         /// </summary>
-        public float Density
+        /// <returns><see cref="Android.View.WindowInsets"/></returns>
+        public Android.View.WindowInsets GetWindowInsets()
         {
-            get { return IExecuteWithSignature<float>("getDensity", "()F"); }
+            return IExecuteWithSignature<Android.View.WindowInsets>("getWindowInsets", "()Landroid/view/WindowInsets;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/view/WindowMetrics.html#getWindowInsets()"/> 
+        /// <see href="https://developer.android.com/reference/android/view/WindowMetrics.html#getDensity()"/>
         /// </summary>
-        public Android.View.WindowInsets WindowInsets
+        /// <returns><see cref="float"/></returns>
+        public float GetDensity()
         {
-            get { return IExecuteWithSignature<Android.View.WindowInsets>("getWindowInsets", "()Landroid/view/WindowInsets;"); }
+            return IExecuteWithSignature<float>("getDensity", "()F");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Webkit/AllPackageClasses.cs
index 73717840f..d27ef9855 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class ClientCertRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ClientCertRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClientCertRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClientCertRequest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ClientCertRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClientCertRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClientCertRequest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -170,12 +170,12 @@ public partial class CookieManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Coo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CookieManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CookieManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CookieManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CookieManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CookieManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CookieManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -210,7 +210,7 @@ public CookieManager(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CookieSyncManager : Java.Lang.Runnable
     {
         const string _bridgeClassName = "android.webkit.CookieSyncManager";
@@ -306,10 +306,13 @@ public partial class DownloadListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
         /// </summary>
         public DownloadListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.webkit.DownloadListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.webkit.DownloadListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -331,10 +334,13 @@ public partial class DownloadListenerDirect : DownloadListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.webkit.DownloadListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.webkit.DownloadListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -404,12 +410,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -498,12 +504,12 @@ public partial class JavascriptInterface : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("JavascriptInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JavascriptInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JavascriptInterface() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("JavascriptInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JavascriptInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JavascriptInterface(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -676,12 +682,12 @@ public partial class PermissionRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PermissionRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PermissionRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PermissionRequest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PermissionRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PermissionRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PermissionRequest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -722,12 +728,12 @@ public partial class PluginStub : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Plugin
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PluginStub class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PluginStub class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PluginStub() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PluginStub class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PluginStub class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PluginStub(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -768,12 +774,12 @@ public partial class RenderProcessGoneDetail : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RenderProcessGoneDetail class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RenderProcessGoneDetail class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RenderProcessGoneDetail() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RenderProcessGoneDetail class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RenderProcessGoneDetail class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RenderProcessGoneDetail(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -814,12 +820,12 @@ public partial class SafeBrowsingResponse : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SafeBrowsingResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SafeBrowsingResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SafeBrowsingResponse() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SafeBrowsingResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SafeBrowsingResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SafeBrowsingResponse(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -904,12 +910,12 @@ public partial class ServiceWorkerController : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ServiceWorkerController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServiceWorkerController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServiceWorkerController() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ServiceWorkerController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServiceWorkerController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServiceWorkerController(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -950,12 +956,12 @@ public partial class ServiceWorkerWebSettings : MASES.JCOBridge.C2JBridge.JVMBri
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ServiceWorkerWebSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServiceWorkerWebSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServiceWorkerWebSettings() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ServiceWorkerWebSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServiceWorkerWebSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServiceWorkerWebSettings(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1128,12 +1134,12 @@ public partial class TracingController : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TracingController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TracingController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TracingController() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TracingController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TracingController class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TracingController(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1218,12 +1224,12 @@ public partial class ValueCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Val
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ValueCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ValueCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ValueCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ValueCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ValueCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ValueCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1265,12 +1271,12 @@ public partial class ValueCallback<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ValueCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ValueCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ValueCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ValueCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ValueCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ValueCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1311,12 +1317,12 @@ public partial class WebBackForwardList : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebBackForwardList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebBackForwardList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebBackForwardList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebBackForwardList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebBackForwardList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebBackForwardList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1397,12 +1403,12 @@ public partial class CustomViewCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CustomViewCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CustomViewCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CustomViewCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CustomViewCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CustomViewCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CustomViewCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1443,12 +1449,12 @@ public partial class FileChooserParams : MASES.JCOBridge.C2JBridge.JVMBridgeBase
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("FileChooserParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FileChooserParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FileChooserParams() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("FileChooserParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("FileChooserParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public FileChooserParams(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1493,12 +1499,12 @@ public partial class WebHistoryItem : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebHistoryItem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebHistoryItem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebHistoryItem() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebHistoryItem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebHistoryItem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebHistoryItem(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1533,19 +1539,19 @@ public WebHistoryItem(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class WebIconDatabase : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WebIconDatabase>
     {
         const string _bridgeClassName = "android.webkit.WebIconDatabase";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebIconDatabase class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebIconDatabase class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebIconDatabase() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebIconDatabase class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebIconDatabase class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebIconDatabase(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1576,7 +1582,7 @@ public WebIconDatabase(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.IconListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class IconListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -1584,10 +1590,13 @@ public partial class IconListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public IconListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.webkit.WebIconDatabase_IconListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.webkit.IconListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1609,10 +1618,13 @@ public partial class IconListenerDirect : IconListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.webkit.WebIconDatabase$IconListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.webkit.WebIconDatabase$IconListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1690,12 +1702,12 @@ public partial class WebMessagePort : MASES.JCOBridge.C2JBridge.JVMBridgeBase<We
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebMessagePort class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebMessagePort class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebMessagePort() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebMessagePort class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebMessagePort class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebMessagePort(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1732,12 +1744,12 @@ public partial class WebMessageCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("WebMessageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WebMessageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WebMessageCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("WebMessageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("WebMessageCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public WebMessageCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1782,12 +1794,12 @@ public partial class WebResourceError : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebResourceError class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebResourceError class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebResourceError() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebResourceError class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebResourceError class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebResourceError(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1828,12 +1840,12 @@ public partial class WebResourceRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebResourceRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebResourceRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebResourceRequest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebResourceRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebResourceRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebResourceRequest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1918,12 +1930,12 @@ public partial class WebSettings : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WebSe
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebSettings() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebSettings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebSettings(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2086,7 +2098,7 @@ public RenderPriority(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.TextSize.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class TextSize : Java.Lang.Enum<Android.Webkit.WebSettings.TextSize>
         {
             const string _bridgeClassName = "android.webkit.WebSettings$TextSize";
@@ -2263,19 +2275,19 @@ public Origin(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.QuotaUpdater.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class QuotaUpdater : MASES.JCOBridge.C2JBridge.JVMBridgeBase<QuotaUpdater>
         {
             const string _bridgeClassName = "android.webkit.WebStorage$QuotaUpdater";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("QuotaUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("QuotaUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public QuotaUpdater() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("QuotaUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("QuotaUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public QuotaUpdater(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2361,10 +2373,13 @@ public partial class FindListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
             /// </summary>
             public FindListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.webkit.WebView_FindListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.webkit.FindListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2386,10 +2401,13 @@ public partial class FindListenerDirect : FindListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.webkit.WebView$FindListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.webkit.WebView$FindListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2457,7 +2475,7 @@ public HitTestResult(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.PictureListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class PictureListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -2465,10 +2483,13 @@ public partial class PictureListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public PictureListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.webkit.WebView_PictureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.webkit.PictureListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2490,10 +2511,13 @@ public partial class PictureListenerDirect : PictureListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.webkit.WebView$PictureListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.webkit.WebView$PictureListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2523,12 +2547,12 @@ public partial class VisualStateCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("VisualStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VisualStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VisualStateCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("VisualStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("VisualStateCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public VisualStateCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2661,12 +2685,12 @@ public partial class WebViewDatabase : MASES.JCOBridge.C2JBridge.JVMBridgeBase<W
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebViewDatabase class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebViewDatabase class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebViewDatabase() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebViewDatabase class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebViewDatabase class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebViewDatabase(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2701,7 +2725,7 @@ public WebViewDatabase(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/webkit/WebViewFragment.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class WebViewFragment : Android.App.Fragment
     {
         const string _bridgeClassName = "android.webkit.WebViewFragment";
@@ -2752,12 +2776,12 @@ public partial class WebViewRenderProcess : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebViewRenderProcess class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebViewRenderProcess class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebViewRenderProcess() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebViewRenderProcess class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebViewRenderProcess class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebViewRenderProcess(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2798,12 +2822,12 @@ public partial class WebViewRenderProcessClient : MASES.JCOBridge.C2JBridge.JVMB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WebViewRenderProcessClient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebViewRenderProcessClient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebViewRenderProcessClient() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WebViewRenderProcessClient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WebViewRenderProcessClient class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WebViewRenderProcessClient(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Webkit/ClientCertRequest.cs b/src/net/Netdroid/Generated/Android/Webkit/ClientCertRequest.cs
index 1a222c0c1..9265f3226 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/ClientCertRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/ClientCertRequest.cs
@@ -46,32 +46,36 @@ public partial class ClientCertRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#getHost()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#getPort()"/>
         /// </summary>
-        public Java.Lang.String Host
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#getKeyTypes()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#getHost()"/>
         /// </summary>
-        public Java.Lang.String[] KeyTypes
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHost()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getKeyTypes", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#getKeyTypes()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetKeyTypes()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getKeyTypes", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#getPrincipals()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#getPrincipals()"/>
         /// </summary>
-        public Java.Security.Principal[] Principals
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal[] GetPrincipals()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Principal>("getPrincipals", "()[Ljava/security/Principal;"); }
+            return IExecuteWithSignatureArray<Java.Security.Principal>("getPrincipals", "()[Ljava/security/Principal;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/ClientCertRequest.html#cancel()"/>
diff --git a/src/net/Netdroid/Generated/Android/Webkit/CookieManager.cs b/src/net/Netdroid/Generated/Android/Webkit/CookieManager.cs
index c8df44cba..753b96b15 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/CookieManager.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/CookieManager.cs
@@ -42,11 +42,12 @@ public partial class CookieManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/CookieManager.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/CookieManager.html#getInstance()"/>
         /// </summary>
-        public static Android.Webkit.CookieManager Instance
+        /// <returns><see cref="Android.Webkit.CookieManager"/></returns>
+        public static Android.Webkit.CookieManager GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Webkit.CookieManager>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/CookieManager;"); }
+            return SExecuteWithSignature<Android.Webkit.CookieManager>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/CookieManager;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieManager.html#allowFileSchemeCookies()"/>
@@ -60,7 +61,7 @@ public static bool AllowFileSchemeCookies()
         /// <see href="https://developer.android.com/reference/android/webkit/CookieManager.html#setAcceptFileSchemeCookies(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetAcceptFileSchemeCookies(bool arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "setAcceptFileSchemeCookies", "(Z)V", arg0);
@@ -113,7 +114,7 @@ public void Flush()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieManager.html#removeAllCookie()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveAllCookie()
         {
             IExecuteWithSignature("removeAllCookie", "()V");
@@ -129,7 +130,7 @@ public void RemoveAllCookies(Android.Webkit.ValueCallback<Java.Lang.Boolean> arg
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieManager.html#removeExpiredCookie()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveExpiredCookie()
         {
             IExecuteWithSignature("removeExpiredCookie", "()V");
@@ -137,7 +138,7 @@ public void RemoveExpiredCookie()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieManager.html#removeSessionCookie()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveSessionCookie()
         {
             IExecuteWithSignature("removeSessionCookie", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Webkit/CookieSyncManager.cs b/src/net/Netdroid/Generated/Android/Webkit/CookieSyncManager.cs
index a9538b4bc..6f4f59268 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/CookieSyncManager.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/CookieSyncManager.cs
@@ -42,23 +42,24 @@ public partial class CookieSyncManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html#getInstance()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public static Android.Webkit.CookieSyncManager Instance
-        {
-            get { return SExecuteWithSignature<Android.Webkit.CookieSyncManager>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/CookieSyncManager;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html#createInstance(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <returns><see cref="Android.Webkit.CookieSyncManager"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Android.Webkit.CookieSyncManager CreateInstance(Android.Content.Context arg0)
         {
             return SExecuteWithSignature<Android.Webkit.CookieSyncManager>(LocalBridgeClazz, "createInstance", "(Landroid/content/Context;)Landroid/webkit/CookieSyncManager;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html#getInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Webkit.CookieSyncManager"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Webkit.CookieSyncManager GetInstance()
+        {
+            return SExecuteWithSignature<Android.Webkit.CookieSyncManager>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/CookieSyncManager;");
+        }
 
         #endregion
 
@@ -66,7 +67,7 @@ public static Android.Webkit.CookieSyncManager CreateInstance(Android.Content.Co
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html#resetSync()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ResetSync()
         {
             IExecuteWithSignature("resetSync", "()V");
@@ -74,7 +75,7 @@ public void ResetSync()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html#run()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Run()
         {
             IExecuteWithSignature("run", "()V");
@@ -82,7 +83,7 @@ public void Run()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html#startSync()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StartSync()
         {
             IExecuteWithSignature("startSync", "()V");
@@ -90,7 +91,7 @@ public void StartSync()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html#stopSync()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void StopSync()
         {
             IExecuteWithSignature("stopSync", "()V");
@@ -98,7 +99,7 @@ public void StopSync()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/CookieSyncManager.html#sync()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Sync()
         {
             IExecuteWithSignature("sync", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Webkit/DownloadListener.cs b/src/net/Netdroid/Generated/Android/Webkit/DownloadListener.cs
index c7ad80cec..178cd1a61 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/DownloadListener.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/DownloadListener.cs
@@ -68,7 +68,7 @@ public partial class DownloadListener : Android.Webkit.IDownloadListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("onDownloadStart", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDownloadStartEventHandler));
+            AddEventHandler("onDownloadStart", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnDownloadStartEventHandler));
 
         }
 
@@ -76,7 +76,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/webkit/DownloadListener.html#onDownloadStart(java.lang.String,java.lang.String,java.lang.String,java.lang.String,long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnDownloadStart"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, Java.Lang.String, Java.Lang.String, Java.Lang.String, long> OnOnDownloadStart { get; set; } = null;
+        public global::System.Action<Java.Lang.String, Java.Lang.String, Java.Lang.String, Java.Lang.String, long> OnOnDownloadStart { get; set; } = null;
 
         void OnDownloadStartEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
diff --git a/src/net/Netdroid/Generated/Android/Webkit/GeolocationPermissions.cs b/src/net/Netdroid/Generated/Android/Webkit/GeolocationPermissions.cs
index 8eb6b2840..9b37a565f 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/GeolocationPermissions.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/GeolocationPermissions.cs
@@ -42,11 +42,12 @@ public partial class GeolocationPermissions
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/GeolocationPermissions.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/GeolocationPermissions.html#getInstance()"/>
         /// </summary>
-        public static Android.Webkit.GeolocationPermissions Instance
+        /// <returns><see cref="Android.Webkit.GeolocationPermissions"/></returns>
+        public static Android.Webkit.GeolocationPermissions GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Webkit.GeolocationPermissions>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/GeolocationPermissions;"); }
+            return SExecuteWithSignature<Android.Webkit.GeolocationPermissions>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/GeolocationPermissions;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/MimeTypeMap.cs b/src/net/Netdroid/Generated/Android/Webkit/MimeTypeMap.cs
index bf27cd874..e57642125 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/MimeTypeMap.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/MimeTypeMap.cs
@@ -42,11 +42,12 @@ public partial class MimeTypeMap
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/MimeTypeMap.html#getSingleton()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/MimeTypeMap.html#getSingleton()"/>
         /// </summary>
-        public static Android.Webkit.MimeTypeMap Singleton
+        /// <returns><see cref="Android.Webkit.MimeTypeMap"/></returns>
+        public static Android.Webkit.MimeTypeMap GetSingleton()
         {
-            get { return SExecuteWithSignature<Android.Webkit.MimeTypeMap>(LocalBridgeClazz, "getSingleton", "()Landroid/webkit/MimeTypeMap;"); }
+            return SExecuteWithSignature<Android.Webkit.MimeTypeMap>(LocalBridgeClazz, "getSingleton", "()Landroid/webkit/MimeTypeMap;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/MimeTypeMap.html#getFileExtensionFromUrl(java.lang.String)"/>
diff --git a/src/net/Netdroid/Generated/Android/Webkit/PermissionRequest.cs b/src/net/Netdroid/Generated/Android/Webkit/PermissionRequest.cs
index 39f9e7b91..ae50158fe 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/PermissionRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/PermissionRequest.cs
@@ -70,18 +70,20 @@ public partial class PermissionRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/PermissionRequest.html#getOrigin()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/PermissionRequest.html#getOrigin()"/>
         /// </summary>
-        public Android.Net.Uri Origin
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetOrigin()
         {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getOrigin", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getOrigin", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/PermissionRequest.html#getResources()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/PermissionRequest.html#getResources()"/>
         /// </summary>
-        public Java.Lang.String[] Resources
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetResources()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getResources", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getResources", "()[Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/PermissionRequest.html#deny()"/>
diff --git a/src/net/Netdroid/Generated/Android/Webkit/ServiceWorkerController.cs b/src/net/Netdroid/Generated/Android/Webkit/ServiceWorkerController.cs
index 03589f14d..c1f68d200 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/ServiceWorkerController.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/ServiceWorkerController.cs
@@ -42,22 +42,24 @@ public partial class ServiceWorkerController
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerController.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerController.html#getInstance()"/>
         /// </summary>
-        public static Android.Webkit.ServiceWorkerController Instance
+        /// <returns><see cref="Android.Webkit.ServiceWorkerController"/></returns>
+        public static Android.Webkit.ServiceWorkerController GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Webkit.ServiceWorkerController>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/ServiceWorkerController;"); }
+            return SExecuteWithSignature<Android.Webkit.ServiceWorkerController>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/ServiceWorkerController;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerController.html#getServiceWorkerWebSettings()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerController.html#getServiceWorkerWebSettings()"/>
         /// </summary>
-        public Android.Webkit.ServiceWorkerWebSettings ServiceWorkerWebSettings
+        /// <returns><see cref="Android.Webkit.ServiceWorkerWebSettings"/></returns>
+        public Android.Webkit.ServiceWorkerWebSettings GetServiceWorkerWebSettings()
         {
-            get { return IExecuteWithSignature<Android.Webkit.ServiceWorkerWebSettings>("getServiceWorkerWebSettings", "()Landroid/webkit/ServiceWorkerWebSettings;"); }
+            return IExecuteWithSignature<Android.Webkit.ServiceWorkerWebSettings>("getServiceWorkerWebSettings", "()Landroid/webkit/ServiceWorkerWebSettings;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerController.html#setServiceWorkerClient(android.webkit.ServiceWorkerClient)"/>
diff --git a/src/net/Netdroid/Generated/Android/Webkit/ServiceWorkerWebSettings.cs b/src/net/Netdroid/Generated/Android/Webkit/ServiceWorkerWebSettings.cs
index 9e110ee3a..57930c4bb 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/ServiceWorkerWebSettings.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/ServiceWorkerWebSettings.cs
@@ -46,32 +46,68 @@ public partial class ServiceWorkerWebSettings
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#getAllowContentAccess()"/> <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#setAllowContentAccess(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#getAllowContentAccess()"/>
         /// </summary>
-        public bool AllowContentAccess
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowContentAccess()
         {
-            get { return IExecuteWithSignature<bool>("getAllowContentAccess", "()Z"); } set { IExecuteWithSignature("setAllowContentAccess", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getAllowContentAccess", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#getAllowFileAccess()"/> <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#setAllowFileAccess(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#getAllowFileAccess()"/>
         /// </summary>
-        public bool AllowFileAccess
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowFileAccess()
         {
-            get { return IExecuteWithSignature<bool>("getAllowFileAccess", "()Z"); } set { IExecuteWithSignature("setAllowFileAccess", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getAllowFileAccess", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#getBlockNetworkLoads()"/> <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#setBlockNetworkLoads(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#getBlockNetworkLoads()"/>
         /// </summary>
-        public bool BlockNetworkLoads
+        /// <returns><see cref="bool"/></returns>
+        public bool GetBlockNetworkLoads()
         {
-            get { return IExecuteWithSignature<bool>("getBlockNetworkLoads", "()Z"); } set { IExecuteWithSignature("setBlockNetworkLoads", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getBlockNetworkLoads", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#getCacheMode()"/> <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#setCacheMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#getCacheMode()"/>
         /// </summary>
-        public int CacheMode
+        /// <returns><see cref="int"/></returns>
+        public int GetCacheMode()
         {
-            get { return IExecuteWithSignature<int>("getCacheMode", "()I"); } set { IExecuteWithSignature("setCacheMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("getCacheMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#setAllowContentAccess(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAllowContentAccess(bool arg0)
+        {
+            IExecuteWithSignature("setAllowContentAccess", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#setAllowFileAccess(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAllowFileAccess(bool arg0)
+        {
+            IExecuteWithSignature("setAllowFileAccess", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#setBlockNetworkLoads(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetBlockNetworkLoads(bool arg0)
+        {
+            IExecuteWithSignature("setBlockNetworkLoads", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/ServiceWorkerWebSettings.html#setCacheMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCacheMode(int arg0)
+        {
+            IExecuteWithSignature("setCacheMode", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/TracingConfig.cs b/src/net/Netdroid/Generated/Android/Webkit/TracingConfig.cs
index 41671e937..cf23caa1e 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/TracingConfig.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/TracingConfig.cs
@@ -106,25 +106,28 @@ public partial class TracingConfig
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/TracingConfig.html#getCustomIncludedCategories()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/TracingConfig.html#getPredefinedCategories()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> CustomIncludedCategories
+        /// <returns><see cref="int"/></returns>
+        public int GetPredefinedCategories()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getCustomIncludedCategories", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getPredefinedCategories", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/TracingConfig.html#getPredefinedCategories()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/TracingConfig.html#getTracingMode()"/>
         /// </summary>
-        public int PredefinedCategories
+        /// <returns><see cref="int"/></returns>
+        public int GetTracingMode()
         {
-            get { return IExecuteWithSignature<int>("getPredefinedCategories", "()I"); }
+            return IExecuteWithSignature<int>("getTracingMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/TracingConfig.html#getTracingMode()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/TracingConfig.html#getCustomIncludedCategories()"/>
         /// </summary>
-        public int TracingMode
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetCustomIncludedCategories()
         {
-            get { return IExecuteWithSignature<int>("getTracingMode", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getCustomIncludedCategories", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/TracingController.cs b/src/net/Netdroid/Generated/Android/Webkit/TracingController.cs
index 7cc9c312a..42fb44fcf 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/TracingController.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/TracingController.cs
@@ -42,11 +42,12 @@ public partial class TracingController
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/TracingController.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/TracingController.html#getInstance()"/>
         /// </summary>
-        public static Android.Webkit.TracingController Instance
+        /// <returns><see cref="Android.Webkit.TracingController"/></returns>
+        public static Android.Webkit.TracingController GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Webkit.TracingController>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/TracingController;"); }
+            return SExecuteWithSignature<Android.Webkit.TracingController>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/TracingController;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/URLUtil.cs b/src/net/Netdroid/Generated/Android/Webkit/URLUtil.cs
index f0a3d0ea1..5f9660e6e 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/URLUtil.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/URLUtil.cs
@@ -73,7 +73,7 @@ public static bool IsContentUrl(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsCookielessProxyUrl(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isCookielessProxyUrl", "(Ljava/lang/String;)Z", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebBackForwardList.cs b/src/net/Netdroid/Generated/Android/Webkit/WebBackForwardList.cs
index 5cb974d95..1dba8ee2f 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebBackForwardList.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebBackForwardList.cs
@@ -54,34 +54,37 @@ public partial class WebBackForwardList : Java.Lang.ICloneable, Java.Io.ISeriali
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebBackForwardList.html#getCurrentIndex()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebBackForwardList.html#getCurrentItem()"/>
         /// </summary>
-        public int CurrentIndex
+        /// <returns><see cref="Android.Webkit.WebHistoryItem"/></returns>
+        public Android.Webkit.WebHistoryItem GetCurrentItem()
         {
-            get { return IExecuteWithSignature<int>("getCurrentIndex", "()I"); }
+            return IExecuteWithSignature<Android.Webkit.WebHistoryItem>("getCurrentItem", "()Landroid/webkit/WebHistoryItem;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebBackForwardList.html#getCurrentItem()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebBackForwardList.html#getItemAtIndex(int)"/>
         /// </summary>
-        public Android.Webkit.WebHistoryItem CurrentItem
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Android.Webkit.WebHistoryItem"/></returns>
+        public Android.Webkit.WebHistoryItem GetItemAtIndex(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Webkit.WebHistoryItem>("getCurrentItem", "()Landroid/webkit/WebHistoryItem;"); }
+            return IExecuteWithSignature<Android.Webkit.WebHistoryItem>("getItemAtIndex", "(I)Landroid/webkit/WebHistoryItem;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebBackForwardList.html#getSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebBackForwardList.html#getCurrentIndex()"/>
         /// </summary>
-        public int Size
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentIndex()
         {
-            get { return IExecuteWithSignature<int>("getSize", "()I"); }
+            return IExecuteWithSignature<int>("getCurrentIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebBackForwardList.html#getItemAtIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebBackForwardList.html#getSize()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Android.Webkit.WebHistoryItem"/></returns>
-        public Android.Webkit.WebHistoryItem GetItemAtIndex(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSize()
         {
-            return IExecuteWithSignature<Android.Webkit.WebHistoryItem>("getItemAtIndex", "(I)Landroid/webkit/WebHistoryItem;", arg0);
+            return IExecuteWithSignature<int>("getSize", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebChromeClient.cs b/src/net/Netdroid/Generated/Android/Webkit/WebChromeClient.cs
index 8231aa169..268e176ba 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebChromeClient.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebChromeClient.cs
@@ -46,18 +46,20 @@ public partial class WebChromeClient
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.html#getDefaultVideoPoster()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.html#getDefaultVideoPoster()"/>
         /// </summary>
-        public Android.Graphics.Bitmap DefaultVideoPoster
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetDefaultVideoPoster()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getDefaultVideoPoster", "()Landroid/graphics/Bitmap;"); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getDefaultVideoPoster", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.html#getVideoLoadingProgressView()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.html#getVideoLoadingProgressView()"/>
         /// </summary>
-        public Android.View.View VideoLoadingProgressView
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetVideoLoadingProgressView()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getVideoLoadingProgressView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.View.View>("getVideoLoadingProgressView", "()Landroid/view/View;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.html#onConsoleMessage(android.webkit.ConsoleMessage)"/>
@@ -133,7 +135,7 @@ public bool OnJsPrompt(Android.Webkit.WebView arg0, Java.Lang.String arg1, Java.
         /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.html#onJsTimeout()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnJsTimeout()
         {
             return IExecuteWithSignature<bool>("onJsTimeout", "()Z");
@@ -171,7 +173,7 @@ public void OnCloseWindow(Android.Webkit.WebView arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnConsoleMessage(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
         {
             IExecute("onConsoleMessage", arg0, arg1, arg2);
@@ -185,7 +187,7 @@ public void OnConsoleMessage(Java.Lang.String arg0, int arg1, Java.Lang.String a
         /// <param name="arg3"><see cref="long"/></param>
         /// <param name="arg4"><see cref="long"/></param>
         /// <param name="arg5"><see cref="Android.Webkit.WebStorage.QuotaUpdater"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnExceededDatabaseQuota(Java.Lang.String arg0, Java.Lang.String arg1, long arg2, long arg3, long arg4, Android.Webkit.WebStorage.QuotaUpdater arg5)
         {
             IExecute("onExceededDatabaseQuota", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -289,7 +291,7 @@ public void OnShowCustomView(Android.View.View arg0, Android.Webkit.WebChromeCli
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Webkit.WebChromeClient.CustomViewCallback"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnShowCustomView(Android.View.View arg0, int arg1, Android.Webkit.WebChromeClient.CustomViewCallback arg2)
         {
             IExecute("onShowCustomView", arg0, arg1, arg2);
@@ -385,48 +387,52 @@ public static Android.Net.Uri[] ParseResult(int arg0, Android.Content.Intent arg
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#getAcceptTypes()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#createIntent()"/>
             /// </summary>
-            public Java.Lang.String[] AcceptTypes
+            /// <returns><see cref="Android.Content.Intent"/></returns>
+            public Android.Content.Intent CreateIntent()
             {
-                get { return IExecuteWithSignatureArray<Java.Lang.String>("getAcceptTypes", "()[Ljava/lang/String;"); }
+                return IExecuteWithSignature<Android.Content.Intent>("createIntent", "()Landroid/content/Intent;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#getFilenameHint()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#isCaptureEnabled()"/>
             /// </summary>
-            public Java.Lang.String FilenameHint
+            /// <returns><see cref="bool"/></returns>
+            public bool IsCaptureEnabled()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getFilenameHint", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("isCaptureEnabled", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#getMode()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#getMode()"/>
             /// </summary>
-            public int Mode
+            /// <returns><see cref="int"/></returns>
+            public int GetMode()
             {
-                get { return IExecuteWithSignature<int>("getMode", "()I"); }
+                return IExecuteWithSignature<int>("getMode", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#getTitle()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#getTitle()"/>
             /// </summary>
-            public Java.Lang.CharSequence Title
+            /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+            public Java.Lang.CharSequence GetTitle()
             {
-                get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+                return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#createIntent()"/>
+            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#getFilenameHint()"/>
             /// </summary>
-            /// <returns><see cref="Android.Content.Intent"/></returns>
-            public Android.Content.Intent CreateIntent()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetFilenameHint()
             {
-                return IExecuteWithSignature<Android.Content.Intent>("createIntent", "()Landroid/content/Intent;");
+                return IExecuteWithSignature<Java.Lang.String>("getFilenameHint", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#isCaptureEnabled()"/>
+            /// <see href="https://developer.android.com/reference/android/webkit/WebChromeClient.FileChooserParams.html#getAcceptTypes()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsCaptureEnabled()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String[] GetAcceptTypes()
             {
-                return IExecuteWithSignature<bool>("isCaptureEnabled", "()Z");
+                return IExecuteWithSignatureArray<Java.Lang.String>("getAcceptTypes", "()[Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebHistoryItem.cs b/src/net/Netdroid/Generated/Android/Webkit/WebHistoryItem.cs
index 59f7b04c6..5cc1f4997 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebHistoryItem.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebHistoryItem.cs
@@ -46,32 +46,36 @@ public partial class WebHistoryItem
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebHistoryItem.html#getFavicon()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebHistoryItem.html#getFavicon()"/>
         /// </summary>
-        public Android.Graphics.Bitmap Favicon
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetFavicon()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getFavicon", "()Landroid/graphics/Bitmap;"); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getFavicon", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebHistoryItem.html#getOriginalUrl()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebHistoryItem.html#getOriginalUrl()"/>
         /// </summary>
-        public Java.Lang.String OriginalUrl
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOriginalUrl()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOriginalUrl", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getOriginalUrl", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebHistoryItem.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebHistoryItem.html#getTitle()"/>
         /// </summary>
-        public Java.Lang.String Title
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTitle()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTitle", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTitle", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebHistoryItem.html#getUrl()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebHistoryItem.html#getUrl()"/>
         /// </summary>
-        public Java.Lang.String Url
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUrl()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebIconDatabase.cs b/src/net/Netdroid/Generated/Android/Webkit/WebIconDatabase.cs
index 25cdb507a..05d190023 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebIconDatabase.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebIconDatabase.cs
@@ -42,12 +42,13 @@ public partial class WebIconDatabase
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.html#getInstance()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Android.Webkit.WebIconDatabase Instance
+        /// <returns><see cref="Android.Webkit.WebIconDatabase"/></returns>
+        [global::System.Obsolete()]
+        public static Android.Webkit.WebIconDatabase GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Webkit.WebIconDatabase>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/WebIconDatabase;"); }
+            return SExecuteWithSignature<Android.Webkit.WebIconDatabase>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/WebIconDatabase;");
         }
 
         #endregion
@@ -56,7 +57,7 @@ public static Android.Webkit.WebIconDatabase Instance
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.html#close()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
@@ -65,7 +66,7 @@ public void Close()
         /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.html#open(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Open(Java.Lang.String arg0)
         {
             IExecuteWithSignature("open", "(Ljava/lang/String;)V", arg0);
@@ -74,7 +75,7 @@ public void Open(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.html#releaseIconForPageUrl(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ReleaseIconForPageUrl(Java.Lang.String arg0)
         {
             IExecuteWithSignature("releaseIconForPageUrl", "(Ljava/lang/String;)V", arg0);
@@ -82,7 +83,7 @@ public void ReleaseIconForPageUrl(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.html#removeAllIcons()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveAllIcons()
         {
             IExecuteWithSignature("removeAllIcons", "()V");
@@ -92,7 +93,7 @@ public void RemoveAllIcons()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Android.Webkit.WebIconDatabase.IconListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RequestIconForPageUrl(Java.Lang.String arg0, Android.Webkit.WebIconDatabase.IconListener arg1)
         {
             IExecute("requestIconForPageUrl", arg0, arg1);
@@ -101,7 +102,7 @@ public void RequestIconForPageUrl(Java.Lang.String arg0, Android.Webkit.WebIconD
         /// <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.html#retainIconForPageUrl(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RetainIconForPageUrl(Java.Lang.String arg0)
         {
             IExecuteWithSignature("retainIconForPageUrl", "(Ljava/lang/String;)V", arg0);
@@ -135,7 +136,7 @@ public partial class IconListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onReceivedIcon", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnReceivedIconEventHandler));
+                AddEventHandler("onReceivedIcon", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnReceivedIconEventHandler));
 
             }
 
@@ -143,7 +144,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/webkit/WebIconDatabase.IconListener.html#onReceivedIcon(java.lang.String,android.graphics.Bitmap)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnReceivedIcon"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String, Android.Graphics.Bitmap> OnOnReceivedIcon { get; set; } = null;
+            public global::System.Action<Java.Lang.String, Android.Graphics.Bitmap> OnOnReceivedIcon { get; set; } = null;
 
             void OnReceivedIconEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -156,7 +157,7 @@ void OnReceivedIconEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnReceivedIcon(Java.Lang.String arg0, Android.Graphics.Bitmap arg1)
             {
                 
@@ -197,7 +198,7 @@ public partial class IconListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Android.Graphics.Bitmap"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnReceivedIcon(Java.Lang.String arg0, Android.Graphics.Bitmap arg1)
             {
                 IExecute("onReceivedIcon", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebMessage.cs b/src/net/Netdroid/Generated/Android/Webkit/WebMessage.cs
index 5956a0ce4..f0826d7b8 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebMessage.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebMessage.cs
@@ -63,18 +63,20 @@ public WebMessage(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebMessage.html#getData()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebMessage.html#getPorts()"/>
         /// </summary>
-        public Java.Lang.String Data
+        /// <returns><see cref="Android.Webkit.WebMessagePort"/></returns>
+        public Android.Webkit.WebMessagePort[] GetPorts()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getData", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Android.Webkit.WebMessagePort>("getPorts", "()[Landroid/webkit/WebMessagePort;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebMessage.html#getPorts()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebMessage.html#getData()"/>
         /// </summary>
-        public Android.Webkit.WebMessagePort[] Ports
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetData()
         {
-            get { return IExecuteWithSignatureArray<Android.Webkit.WebMessagePort>("getPorts", "()[Landroid/webkit/WebMessagePort;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getData", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebResourceError.cs b/src/net/Netdroid/Generated/Android/Webkit/WebResourceError.cs
index 114ab5f6f..3b1c6b056 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebResourceError.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebResourceError.cs
@@ -46,18 +46,20 @@ public partial class WebResourceError
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceError.html#getDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceError.html#getErrorCode()"/>
         /// </summary>
-        public Java.Lang.CharSequence Description
+        /// <returns><see cref="int"/></returns>
+        public int GetErrorCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getErrorCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceError.html#getErrorCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceError.html#getDescription()"/>
         /// </summary>
-        public int ErrorCode
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetDescription()
         {
-            get { return IExecuteWithSignature<int>("getErrorCode", "()I"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDescription", "()Ljava/lang/CharSequence;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebResourceRequest.cs b/src/net/Netdroid/Generated/Android/Webkit/WebResourceRequest.cs
index 9f4aefb97..8ff7d9ea4 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebResourceRequest.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebResourceRequest.cs
@@ -64,25 +64,12 @@ public partial class WebResourceRequest : Android.Webkit.IWebResourceRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceRequest.html#getMethod()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceRequest.html#getUrl()"/>
         /// </summary>
-        public Java.Lang.String Method
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public Android.Net.Uri GetUrl()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMethod", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceRequest.html#getRequestHeaders()"/> 
-        /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Lang.String> RequestHeaders
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getRequestHeaders", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceRequest.html#getUrl()"/> 
-        /// </summary>
-        public Android.Net.Uri Url
-        {
-            get { return IExecuteWithSignature<Android.Net.Uri>("getUrl", "()Landroid/net/Uri;"); }
+            return IExecuteWithSignature<Android.Net.Uri>("getUrl", "()Landroid/net/Uri;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebResourceRequest.html#hasGesture()"/>
@@ -108,6 +95,22 @@ public bool IsRedirect()
         {
             return IExecuteWithSignature<bool>("isRedirect", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceRequest.html#getMethod()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMethod()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getMethod", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceRequest.html#getRequestHeaders()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Lang.String> GetRequestHeaders()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getRequestHeaders", "()Ljava/util/Map;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebResourceResponse.cs b/src/net/Netdroid/Generated/Android/Webkit/WebResourceResponse.cs
index 37ea9ec5b..e1b8c75e2 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebResourceResponse.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebResourceResponse.cs
@@ -69,46 +69,84 @@ public WebResourceResponse(Java.Lang.String arg0, Java.Lang.String arg1, Java.Io
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getData()"/> <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setData(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getStatusCode()"/>
         /// </summary>
-        public Java.Io.InputStream Data
+        /// <returns><see cref="int"/></returns>
+        public int GetStatusCode()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getData", "()Ljava/io/InputStream;"); } set { IExecuteWithSignature("setData", "(Ljava/io/InputStream;)V", value); }
+            return IExecuteWithSignature<int>("getStatusCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getEncoding()"/> <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setEncoding(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getData()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetData()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getData", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getMimeType()"/> <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setMimeType(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getEncoding()"/>
         /// </summary>
-        public Java.Lang.String MimeType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setMimeType", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getReasonPhrase()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getMimeType()"/>
         /// </summary>
-        public Java.Lang.String ReasonPhrase
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMimeType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getReasonPhrase", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMimeType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getResponseHeaders()"/> <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setResponseHeaders(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getReasonPhrase()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Lang.String> ResponseHeaders
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetReasonPhrase()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getResponseHeaders", "()Ljava/util/Map;"); } set { IExecuteWithSignature("setResponseHeaders", "(Ljava/util/Map;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getReasonPhrase", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getStatusCode()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#getResponseHeaders()"/>
         /// </summary>
-        public int StatusCode
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Lang.String> GetResponseHeaders()
         {
-            get { return IExecuteWithSignature<int>("getStatusCode", "()I"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>("getResponseHeaders", "()Ljava/util/Map;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setData(java.io.InputStream)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
+        public void SetData(Java.Io.InputStream arg0)
+        {
+            IExecuteWithSignature("setData", "(Ljava/io/InputStream;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setEncoding(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEncoding(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setMimeType(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetMimeType(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setMimeType", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setResponseHeaders(java.util.Map)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Map"/></param>
+        public void SetResponseHeaders(Java.Util.Map<Java.Lang.String, Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setResponseHeaders", "(Ljava/util/Map;)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebResourceResponse.html#setStatusCodeAndReasonPhrase(int,java.lang.String)"/>
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebSettings.cs b/src/net/Netdroid/Generated/Android/Webkit/WebSettings.cs
index 79bfdee96..04b61335e 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebSettings.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebSettings.cs
@@ -40,21 +40,21 @@ public partial class WebSettings
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#FORCE_DARK_AUTO"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORCE_DARK_AUTO { get { if (!_FORCE_DARK_AUTOReady) { _FORCE_DARK_AUTOContent = SGetField<int>(LocalBridgeClazz, "FORCE_DARK_AUTO"); _FORCE_DARK_AUTOReady = true; } return _FORCE_DARK_AUTOContent; } }
         private static int _FORCE_DARK_AUTOContent = default;
         private static bool _FORCE_DARK_AUTOReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#FORCE_DARK_OFF"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORCE_DARK_OFF { get { if (!_FORCE_DARK_OFFReady) { _FORCE_DARK_OFFContent = SGetField<int>(LocalBridgeClazz, "FORCE_DARK_OFF"); _FORCE_DARK_OFFReady = true; } return _FORCE_DARK_OFFContent; } }
         private static int _FORCE_DARK_OFFContent = default;
         private static bool _FORCE_DARK_OFFReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#FORCE_DARK_ON"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int FORCE_DARK_ON { get { if (!_FORCE_DARK_ONReady) { _FORCE_DARK_ONContent = SGetField<int>(LocalBridgeClazz, "FORCE_DARK_ON"); _FORCE_DARK_ONReady = true; } return _FORCE_DARK_ONContent; } }
         private static int _FORCE_DARK_ONContent = default;
         private static bool _FORCE_DARK_ONReady = false; // this is used because in case of generics 
@@ -85,7 +85,7 @@ public partial class WebSettings
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#LOAD_NORMAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LOAD_NORMAL { get { if (!_LOAD_NORMALReady) { _LOAD_NORMALContent = SGetField<int>(LocalBridgeClazz, "LOAD_NORMAL"); _LOAD_NORMALReady = true; } return _LOAD_NORMALContent; } }
         private static int _LOAD_NORMALContent = default;
         private static bool _LOAD_NORMALReady = false; // this is used because in case of generics 
@@ -149,355 +149,542 @@ public static Java.Lang.String GetDefaultUserAgent(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getAllowContentAccess()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setAllowContentAccess(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getLayoutAlgorithm()"/>
         /// </summary>
-        public bool AllowContentAccess
+        /// <returns><see cref="Android.Webkit.WebSettings.LayoutAlgorithm"/></returns>
+        public Android.Webkit.WebSettings.LayoutAlgorithm GetLayoutAlgorithm()
         {
-            get { return IExecuteWithSignature<bool>("getAllowContentAccess", "()Z"); } set { IExecuteWithSignature("setAllowContentAccess", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Webkit.WebSettings.LayoutAlgorithm>("getLayoutAlgorithm", "()Landroid/webkit/WebSettings$LayoutAlgorithm;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getAllowFileAccess()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setAllowFileAccess(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getPluginState()"/>
         /// </summary>
-        public bool AllowFileAccess
+        /// <returns><see cref="Android.Webkit.WebSettings.PluginState"/></returns>
+        [global::System.Obsolete()]
+        public Android.Webkit.WebSettings.PluginState GetPluginState()
         {
-            get { return IExecuteWithSignature<bool>("getAllowFileAccess", "()Z"); } set { IExecuteWithSignature("setAllowFileAccess", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Webkit.WebSettings.PluginState>("getPluginState", "()Landroid/webkit/WebSettings$PluginState;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getAllowFileAccessFromFileURLs()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setAllowFileAccessFromFileURLs(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDefaultZoom()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool AllowFileAccessFromFileURLs
+        /// <returns><see cref="Android.Webkit.WebSettings.ZoomDensity"/></returns>
+        [global::System.Obsolete()]
+        public Android.Webkit.WebSettings.ZoomDensity GetDefaultZoom()
         {
-            get { return IExecuteWithSignature<bool>("getAllowFileAccessFromFileURLs", "()Z"); } set { IExecuteWithSignature("setAllowFileAccessFromFileURLs", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Webkit.WebSettings.ZoomDensity>("getDefaultZoom", "()Landroid/webkit/WebSettings$ZoomDensity;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getAllowUniversalAccessFromFileURLs()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setAllowUniversalAccessFromFileURLs(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#enableSmoothTransition()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool AllowUniversalAccessFromFileURLs
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool EnableSmoothTransition()
         {
-            get { return IExecuteWithSignature<bool>("getAllowUniversalAccessFromFileURLs", "()Z"); } set { IExecuteWithSignature("setAllowUniversalAccessFromFileURLs", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("enableSmoothTransition", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getBlockNetworkImage()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setBlockNetworkImage(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getAllowContentAccess()"/>
         /// </summary>
-        public bool BlockNetworkImage
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowContentAccess()
         {
-            get { return IExecuteWithSignature<bool>("getBlockNetworkImage", "()Z"); } set { IExecuteWithSignature("setBlockNetworkImage", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getAllowContentAccess", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getBlockNetworkLoads()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setBlockNetworkLoads(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getAllowFileAccess()"/>
         /// </summary>
-        public bool BlockNetworkLoads
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowFileAccess()
         {
-            get { return IExecuteWithSignature<bool>("getBlockNetworkLoads", "()Z"); } set { IExecuteWithSignature("setBlockNetworkLoads", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getAllowFileAccess", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getBuiltInZoomControls()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setBuiltInZoomControls(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getAllowFileAccessFromFileURLs()"/>
         /// </summary>
-        public bool BuiltInZoomControls
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowFileAccessFromFileURLs()
         {
-            get { return IExecuteWithSignature<bool>("getBuiltInZoomControls", "()Z"); } set { IExecuteWithSignature("setBuiltInZoomControls", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getAllowFileAccessFromFileURLs", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getCacheMode()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setCacheMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getAllowUniversalAccessFromFileURLs()"/>
         /// </summary>
-        public int CacheMode
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowUniversalAccessFromFileURLs()
         {
-            get { return IExecuteWithSignature<int>("getCacheMode", "()I"); } set { IExecuteWithSignature("setCacheMode", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getAllowUniversalAccessFromFileURLs", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getCursiveFontFamily()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setCursiveFontFamily(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getBlockNetworkImage()"/>
         /// </summary>
-        public Java.Lang.String CursiveFontFamily
+        /// <returns><see cref="bool"/></returns>
+        public bool GetBlockNetworkImage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCursiveFontFamily", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCursiveFontFamily", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getBlockNetworkImage", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDatabaseEnabled()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDatabaseEnabled(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getBlockNetworkLoads()"/>
         /// </summary>
-        public bool DatabaseEnabled
+        /// <returns><see cref="bool"/></returns>
+        public bool GetBlockNetworkLoads()
         {
-            get { return IExecuteWithSignature<bool>("getDatabaseEnabled", "()Z"); } set { IExecuteWithSignature("setDatabaseEnabled", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getBlockNetworkLoads", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDatabasePath()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDatabasePath(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getBuiltInZoomControls()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String DatabasePath
+        /// <returns><see cref="bool"/></returns>
+        public bool GetBuiltInZoomControls()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDatabasePath", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDatabasePath", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getBuiltInZoomControls", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDefaultFixedFontSize()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDefaultFixedFontSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDatabaseEnabled()"/>
         /// </summary>
-        public int DefaultFixedFontSize
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDatabaseEnabled()
         {
-            get { return IExecuteWithSignature<int>("getDefaultFixedFontSize", "()I"); } set { IExecuteWithSignature("setDefaultFixedFontSize", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getDatabaseEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDefaultFontSize()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDefaultFontSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDisplayZoomControls()"/>
         /// </summary>
-        public int DefaultFontSize
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDisplayZoomControls()
         {
-            get { return IExecuteWithSignature<int>("getDefaultFontSize", "()I"); } set { IExecuteWithSignature("setDefaultFontSize", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getDisplayZoomControls", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDefaultTextEncodingName()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDefaultTextEncodingName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDomStorageEnabled()"/>
         /// </summary>
-        public Java.Lang.String DefaultTextEncodingName
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDomStorageEnabled()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDefaultTextEncodingName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDefaultTextEncodingName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getDomStorageEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDefaultZoom()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDefaultZoom(android.webkit.WebSettings.ZoomDensity)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getJavaScriptCanOpenWindowsAutomatically()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Webkit.WebSettings.ZoomDensity DefaultZoom
+        /// <returns><see cref="bool"/></returns>
+        public bool GetJavaScriptCanOpenWindowsAutomatically()
         {
-            get { return IExecuteWithSignature<Android.Webkit.WebSettings.ZoomDensity>("getDefaultZoom", "()Landroid/webkit/WebSettings$ZoomDensity;"); } set { IExecuteWithSignature("setDefaultZoom", "(Landroid/webkit/WebSettings$ZoomDensity;)V", value); }
+            return IExecuteWithSignature<bool>("getJavaScriptCanOpenWindowsAutomatically", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDisabledActionModeMenuItems()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDisabledActionModeMenuItems(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getJavaScriptEnabled()"/>
         /// </summary>
-        public int DisabledActionModeMenuItems
+        /// <returns><see cref="bool"/></returns>
+        public bool GetJavaScriptEnabled()
         {
-            get { return IExecuteWithSignature<int>("getDisabledActionModeMenuItems", "()I"); } set { IExecuteWithSignature("setDisabledActionModeMenuItems", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getJavaScriptEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDisplayZoomControls()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDisplayZoomControls(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getLightTouchEnabled()"/>
         /// </summary>
-        public bool DisplayZoomControls
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetLightTouchEnabled()
         {
-            get { return IExecuteWithSignature<bool>("getDisplayZoomControls", "()Z"); } set { IExecuteWithSignature("setDisplayZoomControls", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getLightTouchEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDomStorageEnabled()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDomStorageEnabled(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getLoadsImagesAutomatically()"/>
         /// </summary>
-        public bool DomStorageEnabled
+        /// <returns><see cref="bool"/></returns>
+        public bool GetLoadsImagesAutomatically()
         {
-            get { return IExecuteWithSignature<bool>("getDomStorageEnabled", "()Z"); } set { IExecuteWithSignature("setDomStorageEnabled", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getLoadsImagesAutomatically", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getFantasyFontFamily()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setFantasyFontFamily(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getLoadWithOverviewMode()"/>
         /// </summary>
-        public Java.Lang.String FantasyFontFamily
+        /// <returns><see cref="bool"/></returns>
+        public bool GetLoadWithOverviewMode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFantasyFontFamily", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFantasyFontFamily", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getLoadWithOverviewMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getFixedFontFamily()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setFixedFontFamily(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getMediaPlaybackRequiresUserGesture()"/>
         /// </summary>
-        public Java.Lang.String FixedFontFamily
+        /// <returns><see cref="bool"/></returns>
+        public bool GetMediaPlaybackRequiresUserGesture()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFixedFontFamily", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFixedFontFamily", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getMediaPlaybackRequiresUserGesture", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getForceDark()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setForceDark(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getOffscreenPreRaster()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int ForceDark
+        /// <returns><see cref="bool"/></returns>
+        public bool GetOffscreenPreRaster()
         {
-            get { return IExecuteWithSignature<int>("getForceDark", "()I"); } set { IExecuteWithSignature("setForceDark", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getOffscreenPreRaster", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getLayoutAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSafeBrowsingEnabled()"/>
         /// </summary>
-        public Android.Webkit.WebSettings.LayoutAlgorithm GetLayoutAlgorithm
+        /// <returns><see cref="bool"/></returns>
+        public bool GetSafeBrowsingEnabled()
         {
-            get { return IExecuteWithSignature<Android.Webkit.WebSettings.LayoutAlgorithm>("getLayoutAlgorithm", "()Landroid/webkit/WebSettings$LayoutAlgorithm;"); }
+            return IExecuteWithSignature<bool>("getSafeBrowsingEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getPluginState()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSaveFormData()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Webkit.WebSettings.PluginState GetPluginState
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetSaveFormData()
         {
-            get { return IExecuteWithSignature<Android.Webkit.WebSettings.PluginState>("getPluginState", "()Landroid/webkit/WebSettings$PluginState;"); }
+            return IExecuteWithSignature<bool>("getSaveFormData", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getTextSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSavePassword()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Webkit.WebSettings.TextSize GetTextSize
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetSavePassword()
         {
-            get { return IExecuteWithSignature<Android.Webkit.WebSettings.TextSize>("getTextSize", "()Landroid/webkit/WebSettings$TextSize;"); }
+            return IExecuteWithSignature<bool>("getSavePassword", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getJavaScriptCanOpenWindowsAutomatically()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setJavaScriptCanOpenWindowsAutomatically(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getUseWideViewPort()"/>
         /// </summary>
-        public bool JavaScriptCanOpenWindowsAutomatically
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseWideViewPort()
         {
-            get { return IExecuteWithSignature<bool>("getJavaScriptCanOpenWindowsAutomatically", "()Z"); } set { IExecuteWithSignature("setJavaScriptCanOpenWindowsAutomatically", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getUseWideViewPort", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getJavaScriptEnabled()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setJavaScriptEnabled(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#supportMultipleWindows()"/>
         /// </summary>
-        public bool JavaScriptEnabled
+        /// <returns><see cref="bool"/></returns>
+        public bool SupportMultipleWindows()
         {
-            get { return IExecuteWithSignature<bool>("getJavaScriptEnabled", "()Z"); } set { IExecuteWithSignature("setJavaScriptEnabled", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("supportMultipleWindows", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getLightTouchEnabled()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setLightTouchEnabled(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#supportZoom()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool LightTouchEnabled
+        /// <returns><see cref="bool"/></returns>
+        public bool SupportZoom()
         {
-            get { return IExecuteWithSignature<bool>("getLightTouchEnabled", "()Z"); } set { IExecuteWithSignature("setLightTouchEnabled", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("supportZoom", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getLoadsImagesAutomatically()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setLoadsImagesAutomatically(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getCacheMode()"/>
         /// </summary>
-        public bool LoadsImagesAutomatically
+        /// <returns><see cref="int"/></returns>
+        public int GetCacheMode()
         {
-            get { return IExecuteWithSignature<bool>("getLoadsImagesAutomatically", "()Z"); } set { IExecuteWithSignature("setLoadsImagesAutomatically", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getCacheMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getLoadWithOverviewMode()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setLoadWithOverviewMode(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDefaultFixedFontSize()"/>
         /// </summary>
-        public bool LoadWithOverviewMode
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultFixedFontSize()
         {
-            get { return IExecuteWithSignature<bool>("getLoadWithOverviewMode", "()Z"); } set { IExecuteWithSignature("setLoadWithOverviewMode", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getDefaultFixedFontSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getMediaPlaybackRequiresUserGesture()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setMediaPlaybackRequiresUserGesture(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDefaultFontSize()"/>
         /// </summary>
-        public bool MediaPlaybackRequiresUserGesture
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultFontSize()
         {
-            get { return IExecuteWithSignature<bool>("getMediaPlaybackRequiresUserGesture", "()Z"); } set { IExecuteWithSignature("setMediaPlaybackRequiresUserGesture", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getDefaultFontSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getMinimumFontSize()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setMinimumFontSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDisabledActionModeMenuItems()"/>
         /// </summary>
-        public int MinimumFontSize
+        /// <returns><see cref="int"/></returns>
+        public int GetDisabledActionModeMenuItems()
         {
-            get { return IExecuteWithSignature<int>("getMinimumFontSize", "()I"); } set { IExecuteWithSignature("setMinimumFontSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDisabledActionModeMenuItems", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getMinimumLogicalFontSize()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setMinimumLogicalFontSize(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getMinimumFontSize()"/>
         /// </summary>
-        public int MinimumLogicalFontSize
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumFontSize()
         {
-            get { return IExecuteWithSignature<int>("getMinimumLogicalFontSize", "()I"); } set { IExecuteWithSignature("setMinimumLogicalFontSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMinimumFontSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getMixedContentMode()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setMixedContentMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getMinimumLogicalFontSize()"/>
         /// </summary>
-        public int MixedContentMode
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumLogicalFontSize()
         {
-            get { return IExecuteWithSignature<int>("getMixedContentMode", "()I"); } set { IExecuteWithSignature("setMixedContentMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMinimumLogicalFontSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getOffscreenPreRaster()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setOffscreenPreRaster(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getMixedContentMode()"/>
         /// </summary>
-        public bool OffscreenPreRaster
+        /// <returns><see cref="int"/></returns>
+        public int GetMixedContentMode()
         {
-            get { return IExecuteWithSignature<bool>("getOffscreenPreRaster", "()Z"); } set { IExecuteWithSignature("setOffscreenPreRaster", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getMixedContentMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSafeBrowsingEnabled()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSafeBrowsingEnabled(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getTextZoom()"/>
         /// </summary>
-        public bool SafeBrowsingEnabled
+        /// <returns><see cref="int"/></returns>
+        public int GetTextZoom()
         {
-            get { return IExecuteWithSignature<bool>("getSafeBrowsingEnabled", "()Z"); } set { IExecuteWithSignature("setSafeBrowsingEnabled", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getTextZoom", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSansSerifFontFamily()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSansSerifFontFamily(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getCursiveFontFamily()"/>
         /// </summary>
-        public Java.Lang.String SansSerifFontFamily
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCursiveFontFamily()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSansSerifFontFamily", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSansSerifFontFamily", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getCursiveFontFamily", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSaveFormData()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSaveFormData(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDatabasePath()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool SaveFormData
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetDatabasePath()
         {
-            get { return IExecuteWithSignature<bool>("getSaveFormData", "()Z"); } set { IExecuteWithSignature("setSaveFormData", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDatabasePath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSavePassword()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSavePassword(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getDefaultTextEncodingName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool SavePassword
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDefaultTextEncodingName()
         {
-            get { return IExecuteWithSignature<bool>("getSavePassword", "()Z"); } set { IExecuteWithSignature("setSavePassword", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDefaultTextEncodingName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSerifFontFamily()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSerifFontFamily(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getFantasyFontFamily()"/>
         /// </summary>
-        public Java.Lang.String SerifFontFamily
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFantasyFontFamily()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSerifFontFamily", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSerifFontFamily", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getFantasyFontFamily", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getStandardFontFamily()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setStandardFontFamily(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getFixedFontFamily()"/>
         /// </summary>
-        public Java.Lang.String StandardFontFamily
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFixedFontFamily()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getStandardFontFamily", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setStandardFontFamily", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getFixedFontFamily", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getTextZoom()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setTextZoom(int)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSansSerifFontFamily()"/>
         /// </summary>
-        public int TextZoom
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSansSerifFontFamily()
         {
-            get { return IExecuteWithSignature<int>("getTextZoom", "()I"); } set { IExecuteWithSignature("setTextZoom", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSansSerifFontFamily", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getUserAgentString()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setUserAgentString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getSerifFontFamily()"/>
         /// </summary>
-        public Java.Lang.String UserAgentString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSerifFontFamily()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserAgentString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setUserAgentString", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSerifFontFamily", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getUseWideViewPort()"/> <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setUseWideViewPort(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getStandardFontFamily()"/>
         /// </summary>
-        public bool UseWideViewPort
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetStandardFontFamily()
         {
-            get { return IExecuteWithSignature<bool>("getUseWideViewPort", "()Z"); } set { IExecuteWithSignature("setUseWideViewPort", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getStandardFontFamily", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#enableSmoothTransition()"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getUserAgentString()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool EnableSmoothTransition()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUserAgentString()
         {
-            return IExecuteWithSignature<bool>("enableSmoothTransition", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getUserAgentString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#supportMultipleWindows()"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setAllowContentAccess(boolean)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool SupportMultipleWindows()
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAllowContentAccess(bool arg0)
         {
-            return IExecuteWithSignature<bool>("supportMultipleWindows", "()Z");
+            IExecuteWithSignature("setAllowContentAccess", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#supportZoom()"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setAllowFileAccess(boolean)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool SupportZoom()
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAllowFileAccess(bool arg0)
         {
-            return IExecuteWithSignature<bool>("supportZoom", "()Z");
+            IExecuteWithSignature("setAllowFileAccess", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setAllowFileAccessFromFileURLs(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetAllowFileAccessFromFileURLs(bool arg0)
+        {
+            IExecuteWithSignature("setAllowFileAccessFromFileURLs", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setAllowUniversalAccessFromFileURLs(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetAllowUniversalAccessFromFileURLs(bool arg0)
+        {
+            IExecuteWithSignature("setAllowUniversalAccessFromFileURLs", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setBlockNetworkImage(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetBlockNetworkImage(bool arg0)
+        {
+            IExecuteWithSignature("setBlockNetworkImage", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setBlockNetworkLoads(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetBlockNetworkLoads(bool arg0)
+        {
+            IExecuteWithSignature("setBlockNetworkLoads", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setBuiltInZoomControls(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetBuiltInZoomControls(bool arg0)
+        {
+            IExecuteWithSignature("setBuiltInZoomControls", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setCacheMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCacheMode(int arg0)
+        {
+            IExecuteWithSignature("setCacheMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setCursiveFontFamily(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetCursiveFontFamily(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setCursiveFontFamily", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDatabaseEnabled(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDatabaseEnabled(bool arg0)
+        {
+            IExecuteWithSignature("setDatabaseEnabled", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDatabasePath(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetDatabasePath(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDatabasePath", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDefaultFixedFontSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDefaultFixedFontSize(int arg0)
+        {
+            IExecuteWithSignature("setDefaultFixedFontSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDefaultFontSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDefaultFontSize(int arg0)
+        {
+            IExecuteWithSignature("setDefaultFontSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDefaultTextEncodingName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDefaultTextEncodingName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDefaultTextEncodingName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDefaultZoom(android.webkit.WebSettings.ZoomDensity)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Webkit.WebSettings.ZoomDensity"/></param>
+        [global::System.Obsolete()]
+        public void SetDefaultZoom(Android.Webkit.WebSettings.ZoomDensity arg0)
+        {
+            IExecuteWithSignature("setDefaultZoom", "(Landroid/webkit/WebSettings$ZoomDensity;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDisabledActionModeMenuItems(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDisabledActionModeMenuItems(int arg0)
+        {
+            IExecuteWithSignature("setDisabledActionModeMenuItems", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDisplayZoomControls(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDisplayZoomControls(bool arg0)
+        {
+            IExecuteWithSignature("setDisplayZoomControls", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setDomStorageEnabled(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDomStorageEnabled(bool arg0)
+        {
+            IExecuteWithSignature("setDomStorageEnabled", "(Z)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setEnableSmoothTransition(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetEnableSmoothTransition(bool arg0)
         {
             IExecuteWithSignature("setEnableSmoothTransition", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setFantasyFontFamily(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFantasyFontFamily(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFantasyFontFamily", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setFixedFontFamily(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFixedFontFamily(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFixedFontFamily", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setGeolocationDatabasePath(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetGeolocationDatabasePath(Java.Lang.String arg0)
         {
             IExecuteWithSignature("setGeolocationDatabasePath", "(Ljava/lang/String;)V", arg0);
@@ -511,6 +698,22 @@ public void SetGeolocationEnabled(bool arg0)
             IExecuteWithSignature("setGeolocationEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setJavaScriptCanOpenWindowsAutomatically(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetJavaScriptCanOpenWindowsAutomatically(bool arg0)
+        {
+            IExecuteWithSignature("setJavaScriptCanOpenWindowsAutomatically", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setJavaScriptEnabled(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetJavaScriptEnabled(bool arg0)
+        {
+            IExecuteWithSignature("setJavaScriptEnabled", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Webkit.WebSettings.LayoutAlgorithm"/></param>
@@ -519,6 +722,63 @@ public void SetLayoutAlgorithm(Android.Webkit.WebSettings.LayoutAlgorithm arg0)
             IExecuteWithSignature("setLayoutAlgorithm", "(Landroid/webkit/WebSettings$LayoutAlgorithm;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setLightTouchEnabled(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetLightTouchEnabled(bool arg0)
+        {
+            IExecuteWithSignature("setLightTouchEnabled", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setLoadsImagesAutomatically(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetLoadsImagesAutomatically(bool arg0)
+        {
+            IExecuteWithSignature("setLoadsImagesAutomatically", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setLoadWithOverviewMode(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetLoadWithOverviewMode(bool arg0)
+        {
+            IExecuteWithSignature("setLoadWithOverviewMode", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setMediaPlaybackRequiresUserGesture(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetMediaPlaybackRequiresUserGesture(bool arg0)
+        {
+            IExecuteWithSignature("setMediaPlaybackRequiresUserGesture", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setMinimumFontSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumFontSize(int arg0)
+        {
+            IExecuteWithSignature("setMinimumFontSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setMinimumLogicalFontSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumLogicalFontSize(int arg0)
+        {
+            IExecuteWithSignature("setMinimumLogicalFontSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setMixedContentMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMixedContentMode(int arg0)
+        {
+            IExecuteWithSignature("setMixedContentMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setNeedInitialFocus(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -527,10 +787,18 @@ public void SetNeedInitialFocus(bool arg0)
             IExecuteWithSignature("setNeedInitialFocus", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setOffscreenPreRaster(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetOffscreenPreRaster(bool arg0)
+        {
+            IExecuteWithSignature("setOffscreenPreRaster", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setPluginState(android.webkit.WebSettings.PluginState)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Webkit.WebSettings.PluginState"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPluginState(Android.Webkit.WebSettings.PluginState arg0)
         {
             IExecuteWithSignature("setPluginState", "(Landroid/webkit/WebSettings$PluginState;)V", arg0);
@@ -539,12 +807,62 @@ public void SetPluginState(Android.Webkit.WebSettings.PluginState arg0)
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setRenderPriority(android.webkit.WebSettings.RenderPriority)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Webkit.WebSettings.RenderPriority"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRenderPriority(Android.Webkit.WebSettings.RenderPriority arg0)
         {
             IExecuteWithSignature("setRenderPriority", "(Landroid/webkit/WebSettings$RenderPriority;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSafeBrowsingEnabled(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetSafeBrowsingEnabled(bool arg0)
+        {
+            IExecuteWithSignature("setSafeBrowsingEnabled", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSansSerifFontFamily(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSansSerifFontFamily(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSansSerifFontFamily", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSaveFormData(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetSaveFormData(bool arg0)
+        {
+            IExecuteWithSignature("setSaveFormData", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSavePassword(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetSavePassword(bool arg0)
+        {
+            IExecuteWithSignature("setSavePassword", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSerifFontFamily(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSerifFontFamily(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSerifFontFamily", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setStandardFontFamily(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetStandardFontFamily(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setStandardFontFamily", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setSupportMultipleWindows(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -561,6 +879,30 @@ public void SetSupportZoom(bool arg0)
             IExecuteWithSignature("setSupportZoom", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setTextZoom(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTextZoom(int arg0)
+        {
+            IExecuteWithSignature("setTextZoom", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setUserAgentString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetUserAgentString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setUserAgentString", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setUseWideViewPort(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseWideViewPort(bool arg0)
+        {
+            IExecuteWithSignature("setUseWideViewPort", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#isAlgorithmicDarkeningAllowed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -569,10 +911,28 @@ public bool IsAlgorithmicDarkeningAllowed()
             return IExecuteWithSignature<bool>("isAlgorithmicDarkeningAllowed", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getForceDark()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetForceDark()
+        {
+            return IExecuteWithSignature<int>("getForceDark", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#getTextSize()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Webkit.WebSettings.TextSize"/></returns>
+        [global::System.Obsolete()]
+        public Android.Webkit.WebSettings.TextSize GetTextSize()
+        {
+            return IExecuteWithSignature<Android.Webkit.WebSettings.TextSize>("getTextSize", "()Landroid/webkit/WebSettings$TextSize;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setTextSize(android.webkit.WebSettings.TextSize)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Webkit.WebSettings.TextSize"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTextSize(Android.Webkit.WebSettings.TextSize arg0)
         {
             IExecuteWithSignature("setTextSize", "(Landroid/webkit/WebSettings$TextSize;)V", arg0);
@@ -585,6 +945,15 @@ public void SetAlgorithmicDarkeningAllowed(bool arg0)
         {
             IExecuteWithSignature("setAlgorithmicDarkeningAllowed", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.html#setForceDark(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetForceDark(int arg0)
+        {
+            IExecuteWithSignature("setForceDark", "(I)V", arg0);
+        }
 
         #endregion
 
@@ -604,7 +973,7 @@ public partial class LayoutAlgorithm
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.LayoutAlgorithm.html#NARROW_COLUMNS"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Webkit.WebSettings.LayoutAlgorithm NARROW_COLUMNS { get { if (!_NARROW_COLUMNSReady) { _NARROW_COLUMNSContent = SGetField<Android.Webkit.WebSettings.LayoutAlgorithm>(LocalBridgeClazz, "NARROW_COLUMNS"); _NARROW_COLUMNSReady = true; } return _NARROW_COLUMNSContent; } }
             private static Android.Webkit.WebSettings.LayoutAlgorithm _NARROW_COLUMNSContent = default;
             private static bool _NARROW_COLUMNSReady = false; // this is used because in case of generics 
@@ -617,7 +986,7 @@ public partial class LayoutAlgorithm
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.LayoutAlgorithm.html#SINGLE_COLUMN"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Webkit.WebSettings.LayoutAlgorithm SINGLE_COLUMN { get { if (!_SINGLE_COLUMNReady) { _SINGLE_COLUMNContent = SGetField<Android.Webkit.WebSettings.LayoutAlgorithm>(LocalBridgeClazz, "SINGLE_COLUMN"); _SINGLE_COLUMNReady = true; } return _SINGLE_COLUMNContent; } }
             private static Android.Webkit.WebSettings.LayoutAlgorithm _SINGLE_COLUMNContent = default;
             private static bool _SINGLE_COLUMNReady = false; // this is used because in case of generics 
@@ -810,35 +1179,35 @@ public partial class TextSize
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.TextSize.html#LARGER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Webkit.WebSettings.TextSize LARGER { get { if (!_LARGERReady) { _LARGERContent = SGetField<Android.Webkit.WebSettings.TextSize>(LocalBridgeClazz, "LARGER"); _LARGERReady = true; } return _LARGERContent; } }
             private static Android.Webkit.WebSettings.TextSize _LARGERContent = default;
             private static bool _LARGERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.TextSize.html#LARGEST"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Webkit.WebSettings.TextSize LARGEST { get { if (!_LARGESTReady) { _LARGESTContent = SGetField<Android.Webkit.WebSettings.TextSize>(LocalBridgeClazz, "LARGEST"); _LARGESTReady = true; } return _LARGESTContent; } }
             private static Android.Webkit.WebSettings.TextSize _LARGESTContent = default;
             private static bool _LARGESTReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.TextSize.html#NORMAL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Webkit.WebSettings.TextSize NORMAL { get { if (!_NORMALReady) { _NORMALContent = SGetField<Android.Webkit.WebSettings.TextSize>(LocalBridgeClazz, "NORMAL"); _NORMALReady = true; } return _NORMALContent; } }
             private static Android.Webkit.WebSettings.TextSize _NORMALContent = default;
             private static bool _NORMALReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.TextSize.html#SMALLER"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Webkit.WebSettings.TextSize SMALLER { get { if (!_SMALLERReady) { _SMALLERContent = SGetField<Android.Webkit.WebSettings.TextSize>(LocalBridgeClazz, "SMALLER"); _SMALLERReady = true; } return _SMALLERContent; } }
             private static Android.Webkit.WebSettings.TextSize _SMALLERContent = default;
             private static bool _SMALLERReady = false; // this is used because in case of generics 
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebSettings.TextSize.html#SMALLEST"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Android.Webkit.WebSettings.TextSize SMALLEST { get { if (!_SMALLESTReady) { _SMALLESTContent = SGetField<Android.Webkit.WebSettings.TextSize>(LocalBridgeClazz, "SMALLEST"); _SMALLESTReady = true; } return _SMALLESTContent; } }
             private static Android.Webkit.WebSettings.TextSize _SMALLESTContent = default;
             private static bool _SMALLESTReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebStorage.cs b/src/net/Netdroid/Generated/Android/Webkit/WebStorage.cs
index 90d3d8b99..73d8810b1 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebStorage.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebStorage.cs
@@ -42,11 +42,12 @@ public partial class WebStorage
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.html#getInstance()"/>
         /// </summary>
-        public static Android.Webkit.WebStorage Instance
+        /// <returns><see cref="Android.Webkit.WebStorage"/></returns>
+        public static Android.Webkit.WebStorage GetInstance()
         {
-            get { return SExecuteWithSignature<Android.Webkit.WebStorage>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/WebStorage;"); }
+            return SExecuteWithSignature<Android.Webkit.WebStorage>(LocalBridgeClazz, "getInstance", "()Landroid/webkit/WebStorage;");
         }
 
         #endregion
@@ -98,7 +99,7 @@ public void GetUsageForOrigin(Java.Lang.String arg0, Android.Webkit.ValueCallbac
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetQuotaForOrigin(Java.Lang.String arg0, long arg1)
         {
             IExecute("setQuotaForOrigin", arg0, arg1);
@@ -128,25 +129,28 @@ public partial class Origin
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.Origin.html#getOrigin()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.Origin.html#getOrigin()"/>
             /// </summary>
-            public Java.Lang.String GetOrigin
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetOrigin()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getOrigin", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getOrigin", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.Origin.html#getQuota()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.Origin.html#getQuota()"/>
             /// </summary>
-            public long Quota
+            /// <returns><see cref="long"/></returns>
+            public long GetQuota()
             {
-                get { return IExecuteWithSignature<long>("getQuota", "()J"); }
+                return IExecuteWithSignature<long>("getQuota", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.Origin.html#getUsage()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.Origin.html#getUsage()"/>
             /// </summary>
-            public long Usage
+            /// <returns><see cref="long"/></returns>
+            public long GetUsage()
             {
-                get { return IExecuteWithSignature<long>("getUsage", "()J"); }
+                return IExecuteWithSignature<long>("getUsage", "()J");
             }
 
             #endregion
@@ -183,7 +187,7 @@ public partial class QuotaUpdater
             /// <see href="https://developer.android.com/reference/android/webkit/WebStorage.QuotaUpdater.html#updateQuota(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void UpdateQuota(long arg0)
             {
                 IExecuteWithSignature("updateQuota", "(J)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebView.cs b/src/net/Netdroid/Generated/Android/Webkit/WebView.cs
index ba6ba6ea1..f5f2f3287 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebView.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebView.cs
@@ -36,7 +36,7 @@ public partial class WebView
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public WebView(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, bool arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -128,32 +128,35 @@ public WebView(Android.Content.Context arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getCurrentWebViewPackage()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getCurrentWebViewPackage()"/>
         /// </summary>
-        public static Android.Content.Pm.PackageInfo CurrentWebViewPackage
+        /// <returns><see cref="Android.Content.Pm.PackageInfo"/></returns>
+        public static Android.Content.Pm.PackageInfo GetCurrentWebViewPackage()
         {
-            get { return SExecuteWithSignature<Android.Content.Pm.PackageInfo>(LocalBridgeClazz, "getCurrentWebViewPackage", "()Landroid/content/pm/PackageInfo;"); }
+            return SExecuteWithSignature<Android.Content.Pm.PackageInfo>(LocalBridgeClazz, "getCurrentWebViewPackage", "()Landroid/content/pm/PackageInfo;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getSafeBrowsingPrivacyPolicyUrl()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getSafeBrowsingPrivacyPolicyUrl()"/>
         /// </summary>
-        public static Android.Net.Uri SafeBrowsingPrivacyPolicyUrl
+        /// <returns><see cref="Android.Net.Uri"/></returns>
+        public static Android.Net.Uri GetSafeBrowsingPrivacyPolicyUrl()
         {
-            get { return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "getSafeBrowsingPrivacyPolicyUrl", "()Landroid/net/Uri;"); }
+            return SExecuteWithSignature<Android.Net.Uri>(LocalBridgeClazz, "getSafeBrowsingPrivacyPolicyUrl", "()Landroid/net/Uri;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewClassLoader()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewClassLoader()"/>
         /// </summary>
-        public static Java.Lang.ClassLoader WebViewClassLoader
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public static Java.Lang.ClassLoader GetWebViewClassLoader()
         {
-            get { return SExecuteWithSignature<Java.Lang.ClassLoader>(LocalBridgeClazz, "getWebViewClassLoader", "()Ljava/lang/ClassLoader;"); }
+            return SExecuteWithSignature<Java.Lang.ClassLoader>(LocalBridgeClazz, "getWebViewClassLoader", "()Ljava/lang/ClassLoader;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#findAddress(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String FindAddress(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "findAddress", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
@@ -219,161 +222,48 @@ public static void StartSafeBrowsing(Android.Content.Context arg0, Android.Webki
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getCertificate()"/> <see href="https://developer.android.com/reference/android/webkit/WebView.html#setCertificate(android.net.http.SslCertificate)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getFavicon()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Net.Http.SslCertificate Certificate
+        /// <returns><see cref="Android.Graphics.Bitmap"/></returns>
+        public Android.Graphics.Bitmap GetFavicon()
         {
-            get { return IExecuteWithSignature<Android.Net.Http.SslCertificate>("getCertificate", "()Landroid/net/http/SslCertificate;"); } set { IExecuteWithSignature("setCertificate", "(Landroid/net/http/SslCertificate;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Bitmap>("getFavicon", "()Landroid/graphics/Bitmap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getContentHeight()"/> 
-        /// </summary>
-        public int ContentHeight
-        {
-            get { return IExecuteWithSignature<int>("getContentHeight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getFavicon()"/> 
-        /// </summary>
-        public Android.Graphics.Bitmap Favicon
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Bitmap>("getFavicon", "()Landroid/graphics/Bitmap;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getHitTestResult()"/> 
-        /// </summary>
-        public Android.Webkit.WebView.HitTestResult GetHitTestResult
-        {
-            get { return IExecuteWithSignature<Android.Webkit.WebView.HitTestResult>("getHitTestResult", "()Landroid/webkit/WebView$HitTestResult;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getOriginalUrl()"/> 
-        /// </summary>
-        public Java.Lang.String OriginalUrl
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getOriginalUrl", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getProgress()"/> 
-        /// </summary>
-        public int Progress
-        {
-            get { return IExecuteWithSignature<int>("getProgress", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getRendererPriorityWaivedWhenNotVisible()"/> 
-        /// </summary>
-        public bool RendererPriorityWaivedWhenNotVisible
-        {
-            get { return IExecuteWithSignature<bool>("getRendererPriorityWaivedWhenNotVisible", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getRendererRequestedPriority()"/> 
-        /// </summary>
-        public int RendererRequestedPriority
-        {
-            get { return IExecuteWithSignature<int>("getRendererRequestedPriority", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getScale()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public float Scale
-        {
-            get { return IExecuteWithSignature<float>("getScale", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getSettings()"/> 
-        /// </summary>
-        public Android.Webkit.WebSettings Settings
-        {
-            get { return IExecuteWithSignature<Android.Webkit.WebSettings>("getSettings", "()Landroid/webkit/WebSettings;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getTextClassifier()"/> <see href="https://developer.android.com/reference/android/webkit/WebView.html#setTextClassifier(android.view.textclassifier.TextClassifier)"/>
-        /// </summary>
-        public Android.View.Textclassifier.TextClassifier TextClassifier
-        {
-            get { return IExecute<Android.View.Textclassifier.TextClassifier>("getTextClassifier"); } set { IExecute("setTextClassifier", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getTitle()"/> 
-        /// </summary>
-        public Java.Lang.String Title
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTitle", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getUrl()"/> 
-        /// </summary>
-        public Java.Lang.String Url
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebChromeClient()"/> <see href="https://developer.android.com/reference/android/webkit/WebView.html#setWebChromeClient(android.webkit.WebChromeClient)"/>
-        /// </summary>
-        public Android.Webkit.WebChromeClient WebChromeClient
-        {
-            get { return IExecuteWithSignature<Android.Webkit.WebChromeClient>("getWebChromeClient", "()Landroid/webkit/WebChromeClient;"); } set { IExecuteWithSignature("setWebChromeClient", "(Landroid/webkit/WebChromeClient;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewClient()"/> <see href="https://developer.android.com/reference/android/webkit/WebView.html#setWebViewClient(android.webkit.WebViewClient)"/>
-        /// </summary>
-        public Android.Webkit.WebViewClient WebViewClient
-        {
-            get { return IExecuteWithSignature<Android.Webkit.WebViewClient>("getWebViewClient", "()Landroid/webkit/WebViewClient;"); } set { IExecuteWithSignature("setWebViewClient", "(Landroid/webkit/WebViewClient;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewLooper()"/> 
-        /// </summary>
-        public Android.Os.Looper WebViewLooper
-        {
-            get { return IExecuteWithSignature<Android.Os.Looper>("getWebViewLooper", "()Landroid/os/Looper;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewRenderProcess()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#capturePicture()"/>
         /// </summary>
-        public Android.Webkit.WebViewRenderProcess WebViewRenderProcess
+        /// <returns><see cref="Android.Graphics.Picture"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Picture CapturePicture()
         {
-            get { return IExecuteWithSignature<Android.Webkit.WebViewRenderProcess>("getWebViewRenderProcess", "()Landroid/webkit/WebViewRenderProcess;"); }
+            return IExecuteWithSignature<Android.Graphics.Picture>("capturePicture", "()Landroid/graphics/Picture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewRenderProcessClient()"/> <see href="https://developer.android.com/reference/android/webkit/WebView.html#setWebViewRenderProcessClient(android.webkit.WebViewRenderProcessClient)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getCertificate()"/>
         /// </summary>
-        public Android.Webkit.WebViewRenderProcessClient WebViewRenderProcessClient
+        /// <returns><see cref="Android.Net.Http.SslCertificate"/></returns>
+        public Android.Net.Http.SslCertificate GetCertificate()
         {
-            get { return IExecuteWithSignature<Android.Webkit.WebViewRenderProcessClient>("getWebViewRenderProcessClient", "()Landroid/webkit/WebViewRenderProcessClient;"); } set { IExecuteWithSignature("setWebViewRenderProcessClient", "(Landroid/webkit/WebViewRenderProcessClient;)V", value); }
+            return IExecuteWithSignature<Android.Net.Http.SslCertificate>("getCertificate", "()Landroid/net/http/SslCertificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#capturePicture()"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewLooper()"/>
         /// </summary>
-        /// <returns><see cref="Android.Graphics.Picture"/></returns>
-        [System.Obsolete()]
-        public Android.Graphics.Picture CapturePicture()
+        /// <returns><see cref="Android.Os.Looper"/></returns>
+        public Android.Os.Looper GetWebViewLooper()
         {
-            return IExecuteWithSignature<Android.Graphics.Picture>("capturePicture", "()Landroid/graphics/Picture;");
+            return IExecuteWithSignature<Android.Os.Looper>("getWebViewLooper", "()Landroid/os/Looper;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#createPrintDocumentAdapter()"/>
         /// </summary>
         /// <returns><see cref="Android.Print.PrintDocumentAdapter"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Print.PrintDocumentAdapter CreatePrintDocumentAdapter()
         {
             return IExecuteWithSignature<Android.Print.PrintDocumentAdapter>("createPrintDocumentAdapter", "()Landroid/print/PrintDocumentAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#createPrintDocumentAdapter()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Print.PrintDocumentAdapter"/></returns>
-        [System.Obsolete()]
-        public Android.Print.PrintDocumentAdapter CreatePrintDocumentAdapterDirect()
-        {
-            return IExecuteWithSignature<Android.Print.PrintDocumentAdapterDirect, Android.Print.PrintDocumentAdapter>("createPrintDocumentAdapter", "()Landroid/print/PrintDocumentAdapter;");
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#createPrintDocumentAdapter(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -383,13 +273,12 @@ public Android.Print.PrintDocumentAdapter CreatePrintDocumentAdapter(Java.Lang.S
             return IExecuteWithSignature<Android.Print.PrintDocumentAdapter>("createPrintDocumentAdapter", "(Ljava/lang/String;)Landroid/print/PrintDocumentAdapter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#createPrintDocumentAdapter(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getTextClassifier()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Print.PrintDocumentAdapter"/></returns>
-        public Android.Print.PrintDocumentAdapter CreatePrintDocumentAdapterDirect(Java.Lang.String arg0)
+        /// <returns><see cref="Android.View.Textclassifier.TextClassifier"/></returns>
+        public Android.View.Textclassifier.TextClassifier GetTextClassifier()
         {
-            return IExecuteWithSignature<Android.Print.PrintDocumentAdapterDirect, Android.Print.PrintDocumentAdapter>("createPrintDocumentAdapter", "(Ljava/lang/String;)Landroid/print/PrintDocumentAdapter;", arg0);
+            return IExecute<Android.View.Textclassifier.TextClassifier>("getTextClassifier");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#copyBackForwardList()"/>
@@ -418,6 +307,14 @@ public Android.Webkit.WebBackForwardList SaveState(Android.Os.Bundle arg0)
             return IExecuteWithSignature<Android.Webkit.WebBackForwardList>("saveState", "(Landroid/os/Bundle;)Landroid/webkit/WebBackForwardList;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebChromeClient()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Webkit.WebChromeClient"/></returns>
+        public Android.Webkit.WebChromeClient GetWebChromeClient()
+        {
+            return IExecuteWithSignature<Android.Webkit.WebChromeClient>("getWebChromeClient", "()Landroid/webkit/WebChromeClient;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#createWebMessageChannel()"/>
         /// </summary>
         /// <returns><see cref="Android.Webkit.WebMessagePort"/></returns>
@@ -426,6 +323,46 @@ public Android.Webkit.WebMessagePort[] CreateWebMessageChannel()
             return IExecuteWithSignatureArray<Android.Webkit.WebMessagePort>("createWebMessageChannel", "()[Landroid/webkit/WebMessagePort;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getSettings()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Webkit.WebSettings"/></returns>
+        public Android.Webkit.WebSettings GetSettings()
+        {
+            return IExecuteWithSignature<Android.Webkit.WebSettings>("getSettings", "()Landroid/webkit/WebSettings;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getHitTestResult()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Webkit.WebView.HitTestResult"/></returns>
+        public Android.Webkit.WebView.HitTestResult GetHitTestResult()
+        {
+            return IExecuteWithSignature<Android.Webkit.WebView.HitTestResult>("getHitTestResult", "()Landroid/webkit/WebView$HitTestResult;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewClient()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Webkit.WebViewClient"/></returns>
+        public Android.Webkit.WebViewClient GetWebViewClient()
+        {
+            return IExecuteWithSignature<Android.Webkit.WebViewClient>("getWebViewClient", "()Landroid/webkit/WebViewClient;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewRenderProcess()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Webkit.WebViewRenderProcess"/></returns>
+        public Android.Webkit.WebViewRenderProcess GetWebViewRenderProcess()
+        {
+            return IExecuteWithSignature<Android.Webkit.WebViewRenderProcess>("getWebViewRenderProcess", "()Landroid/webkit/WebViewRenderProcess;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getWebViewRenderProcessClient()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Webkit.WebViewRenderProcessClient"/></returns>
+        public Android.Webkit.WebViewRenderProcessClient GetWebViewRenderProcessClient()
+        {
+            return IExecuteWithSignature<Android.Webkit.WebViewRenderProcessClient>("getWebViewRenderProcessClient", "()Landroid/webkit/WebViewRenderProcessClient;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#canGoBack()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -454,7 +391,7 @@ public bool CanGoForward()
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#canZoomIn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool CanZoomIn()
         {
             return IExecuteWithSignature<bool>("canZoomIn", "()Z");
@@ -463,12 +400,20 @@ public bool CanZoomIn()
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#canZoomOut()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool CanZoomOut()
         {
             return IExecuteWithSignature<bool>("canZoomOut", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getRendererPriorityWaivedWhenNotVisible()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetRendererPriorityWaivedWhenNotVisible()
+        {
+            return IExecuteWithSignature<bool>("getRendererPriorityWaivedWhenNotVisible", "()Z");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#isPrivateBrowsingEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -480,7 +425,7 @@ public bool IsPrivateBrowsingEnabled()
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#overlayHorizontalScrollbar()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OverlayHorizontalScrollbar()
         {
             return IExecuteWithSignature<bool>("overlayHorizontalScrollbar", "()Z");
@@ -489,7 +434,7 @@ public bool OverlayHorizontalScrollbar()
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#overlayVerticalScrollbar()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OverlayVerticalScrollbar()
         {
             return IExecuteWithSignature<bool>("overlayVerticalScrollbar", "()Z");
@@ -518,7 +463,7 @@ public bool PageUp(bool arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ShowFindDialog(Java.Lang.String arg0, bool arg1)
         {
             return IExecute<bool>("showFindDialog", arg0, arg1);
@@ -540,22 +485,79 @@ public bool ZoomOut()
             return IExecuteWithSignature<bool>("zoomOut", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getScale()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        [global::System.Obsolete()]
+        public float GetScale()
+        {
+            return IExecuteWithSignature<float>("getScale", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#findAll(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int FindAll(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<int>("findAll", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getContentHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetContentHeight()
+        {
+            return IExecuteWithSignature<int>("getContentHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getProgress()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetProgress()
+        {
+            return IExecuteWithSignature<int>("getProgress", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getRendererRequestedPriority()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRendererRequestedPriority()
+        {
+            return IExecuteWithSignature<int>("getRendererRequestedPriority", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getOriginalUrl()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetOriginalUrl()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getOriginalUrl", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getTitle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTitle()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTitle", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getUrl()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUrl()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#getHttpAuthUsernamePassword(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String[] GetHttpAuthUsernamePassword(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return IExecuteArray<Java.Lang.String>("getHttpAuthUsernamePassword", arg0, arg1);
@@ -608,7 +610,7 @@ public void ClearSslPreferences()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#clearView()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearView()
         {
             IExecuteWithSignature("clearView", "()V");
@@ -665,7 +667,7 @@ public void FlingScroll(int arg0, int arg1)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#freeMemory()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void FreeMemory()
         {
             IExecuteWithSignature("freeMemory", "()V");
@@ -743,7 +745,7 @@ public void LoadUrl(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnChildViewAdded(Android.View.View arg0, Android.View.View arg1)
         {
             IExecute("onChildViewAdded", arg0, arg1);
@@ -753,7 +755,7 @@ public void OnChildViewAdded(Android.View.View arg0, Android.View.View arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnChildViewRemoved(Android.View.View arg0, Android.View.View arg1)
         {
             IExecute("onChildViewRemoved", arg0, arg1);
@@ -763,7 +765,7 @@ public void OnChildViewRemoved(Android.View.View arg0, Android.View.View arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnGlobalFocusChanged(Android.View.View arg0, Android.View.View arg1)
         {
             IExecute("onGlobalFocusChanged", arg0, arg1);
@@ -860,7 +862,7 @@ public void ResumeTimers()
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SavePassword(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
             IExecute("savePassword", arg0, arg1, arg2);
@@ -884,6 +886,15 @@ public void SaveWebArchive(Java.Lang.String arg0)
             IExecuteWithSignature("saveWebArchive", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setCertificate(android.net.http.SslCertificate)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Net.Http.SslCertificate"/></param>
+        [global::System.Obsolete()]
+        public void SetCertificate(Android.Net.Http.SslCertificate arg0)
+        {
+            IExecuteWithSignature("setCertificate", "(Landroid/net/http/SslCertificate;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setDownloadListener(android.webkit.DownloadListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Webkit.DownloadListener"/></param>
@@ -903,7 +914,7 @@ public void SetFindListener(Android.Webkit.WebView.FindListener arg0)
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setHorizontalScrollbarOverlay(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetHorizontalScrollbarOverlay(bool arg0)
         {
             IExecuteWithSignature("setHorizontalScrollbarOverlay", "(Z)V", arg0);
@@ -915,7 +926,7 @@ public void SetHorizontalScrollbarOverlay(bool arg0)
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetHttpAuthUsernamePassword(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3)
         {
             IExecute("setHttpAuthUsernamePassword", arg0, arg1, arg2, arg3);
@@ -932,7 +943,7 @@ public void SetInitialScale(int arg0)
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setMapTrackballToArrowKeys(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetMapTrackballToArrowKeys(bool arg0)
         {
             IExecuteWithSignature("setMapTrackballToArrowKeys", "(Z)V", arg0);
@@ -949,7 +960,7 @@ public void SetNetworkAvailable(bool arg0)
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setPictureListener(android.webkit.WebView.PictureListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Webkit.WebView.PictureListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetPictureListener(Android.Webkit.WebView.PictureListener arg0)
         {
             IExecuteWithSignature("setPictureListener", "(Landroid/webkit/WebView$PictureListener;)V", arg0);
@@ -964,15 +975,47 @@ public void SetRendererPriorityPolicy(int arg0, bool arg1)
             IExecute("setRendererPriorityPolicy", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setTextClassifier(android.view.textclassifier.TextClassifier)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Textclassifier.TextClassifier"/></param>
+        public void SetTextClassifier(Android.View.Textclassifier.TextClassifier arg0)
+        {
+            IExecute("setTextClassifier", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setVerticalScrollbarOverlay(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVerticalScrollbarOverlay(bool arg0)
         {
             IExecuteWithSignature("setVerticalScrollbarOverlay", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setWebChromeClient(android.webkit.WebChromeClient)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Webkit.WebChromeClient"/></param>
+        public void SetWebChromeClient(Android.Webkit.WebChromeClient arg0)
+        {
+            IExecuteWithSignature("setWebChromeClient", "(Landroid/webkit/WebChromeClient;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setWebViewClient(android.webkit.WebViewClient)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Webkit.WebViewClient"/></param>
+        public void SetWebViewClient(Android.Webkit.WebViewClient arg0)
+        {
+            IExecuteWithSignature("setWebViewClient", "(Landroid/webkit/WebViewClient;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setWebViewRenderProcessClient(android.webkit.WebViewRenderProcessClient)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Webkit.WebViewRenderProcessClient"/></param>
+        public void SetWebViewRenderProcessClient(Android.Webkit.WebViewRenderProcessClient arg0)
+        {
+            IExecuteWithSignature("setWebViewRenderProcessClient", "(Landroid/webkit/WebViewRenderProcessClient;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebView.html#setWebViewRenderProcessClient(java.util.concurrent.Executor,android.webkit.WebViewRenderProcessClient)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1025,7 +1068,7 @@ public partial class FindListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFindResultReceived", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnFindResultReceivedEventHandler));
+                AddEventHandler("onFindResultReceived", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnFindResultReceivedEventHandler));
 
             }
 
@@ -1033,7 +1076,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/webkit/WebView.FindListener.html#onFindResultReceived(int,int,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFindResultReceived"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int, int, bool> OnOnFindResultReceived { get; set; } = null;
+            public global::System.Action<int, int, bool> OnOnFindResultReceived { get; set; } = null;
 
             void OnFindResultReceivedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -1118,7 +1161,7 @@ public partial class HitTestResult
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebView.HitTestResult.html#ANCHOR_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int ANCHOR_TYPE { get { if (!_ANCHOR_TYPEReady) { _ANCHOR_TYPEContent = SGetField<int>(LocalBridgeClazz, "ANCHOR_TYPE"); _ANCHOR_TYPEReady = true; } return _ANCHOR_TYPEContent; } }
             private static int _ANCHOR_TYPEContent = default;
             private static bool _ANCHOR_TYPEReady = false; // this is used because in case of generics 
@@ -1143,7 +1186,7 @@ public partial class HitTestResult
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebView.HitTestResult.html#IMAGE_ANCHOR_TYPE"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static int IMAGE_ANCHOR_TYPE { get { if (!_IMAGE_ANCHOR_TYPEReady) { _IMAGE_ANCHOR_TYPEContent = SGetField<int>(LocalBridgeClazz, "IMAGE_ANCHOR_TYPE"); _IMAGE_ANCHOR_TYPEReady = true; } return _IMAGE_ANCHOR_TYPEContent; } }
             private static int _IMAGE_ANCHOR_TYPEContent = default;
             private static bool _IMAGE_ANCHOR_TYPEReady = false; // this is used because in case of generics 
@@ -1186,18 +1229,20 @@ public partial class HitTestResult
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebView.HitTestResult.html#getExtra()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebView.HitTestResult.html#getType()"/>
             /// </summary>
-            public Java.Lang.String Extra
+            /// <returns><see cref="int"/></returns>
+            public int GetType()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getExtra", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getType", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebView.HitTestResult.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebView.HitTestResult.html#getExtra()"/>
             /// </summary>
-            public int Type
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetExtra()
             {
-                get { return IExecuteWithSignature<int>("getType", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getExtra", "()Ljava/lang/String;");
             }
 
             #endregion
@@ -1235,7 +1280,7 @@ public partial class PictureListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onNewPicture", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Webkit.WebView>>>(OnNewPictureEventHandler));
+                AddEventHandler("onNewPicture", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Webkit.WebView>>>(OnNewPictureEventHandler));
 
             }
 
@@ -1243,7 +1288,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/webkit/WebView.PictureListener.html#onNewPicture(android.webkit.WebView,android.graphics.Picture)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnNewPicture"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Webkit.WebView, Android.Graphics.Picture> OnOnNewPicture { get; set; } = null;
+            public global::System.Action<Android.Webkit.WebView, Android.Graphics.Picture> OnOnNewPicture { get; set; } = null;
 
             void OnNewPictureEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Webkit.WebView>> data)
             {
@@ -1256,7 +1301,7 @@ void OnNewPictureEventHandler(object sender, CLRListenerEventArgs<CLREventData<A
             /// </summary>
             /// <param name="arg0"><see cref="Android.Webkit.WebView"/></param>
             /// <param name="arg1"><see cref="Android.Graphics.Picture"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnNewPicture(Android.Webkit.WebView arg0, Android.Graphics.Picture arg1)
             {
                 
@@ -1297,7 +1342,7 @@ public partial class PictureListenerDirect
             /// </summary>
             /// <param name="arg0"><see cref="Android.Webkit.WebView"/></param>
             /// <param name="arg1"><see cref="Android.Graphics.Picture"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnNewPicture(Android.Webkit.WebView arg0, Android.Graphics.Picture arg1)
             {
                 IExecute("onNewPicture", arg0, arg1);
@@ -1381,11 +1426,12 @@ public WebViewTransport(Android.Webkit.WebView arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/webkit/WebView.WebViewTransport.html#getWebView()"/> 
+            /// <see href="https://developer.android.com/reference/android/webkit/WebView.WebViewTransport.html#getWebView()"/>
             /// </summary>
-            public Android.Webkit.WebView GetWebView
+            /// <returns><see cref="Android.Webkit.WebView"/></returns>
+            public Android.Webkit.WebView GetWebView()
             {
-                get { return IExecuteWithSignature<Android.Webkit.WebView>("getWebView", "()Landroid/webkit/WebView;"); }
+                return IExecuteWithSignature<Android.Webkit.WebView>("getWebView", "()Landroid/webkit/WebView;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/webkit/WebView.WebViewTransport.html#setWebView(android.webkit.WebView)"/>
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebViewClient.cs b/src/net/Netdroid/Generated/Android/Webkit/WebViewClient.cs
index 060e8b606..d39f7b947 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebViewClient.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebViewClient.cs
@@ -187,7 +187,7 @@ public Android.Webkit.WebResourceResponse ShouldInterceptRequest(Android.Webkit.
         /// <param name="arg0"><see cref="Android.Webkit.WebView"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Android.Webkit.WebResourceResponse"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Webkit.WebResourceResponse ShouldInterceptRequest(Android.Webkit.WebView arg0, Java.Lang.String arg1)
         {
             return IExecute<Android.Webkit.WebResourceResponse>("shouldInterceptRequest", arg0, arg1);
@@ -228,7 +228,7 @@ public bool ShouldOverrideUrlLoading(Android.Webkit.WebView arg0, Android.Webkit
         /// <param name="arg0"><see cref="Android.Webkit.WebView"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool ShouldOverrideUrlLoading(Android.Webkit.WebView arg0, Java.Lang.String arg1)
         {
             return IExecute<bool>("shouldOverrideUrlLoading", arg0, arg1);
@@ -316,7 +316,7 @@ public void OnReceivedError(Android.Webkit.WebView arg0, Android.Webkit.WebResou
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnReceivedError(Android.Webkit.WebView arg0, int arg1, Java.Lang.String arg2, Java.Lang.String arg3)
         {
             IExecute("onReceivedError", arg0, arg1, arg2, arg3);
@@ -390,7 +390,7 @@ public void OnScaleChanged(Android.Webkit.WebView arg0, float arg1, float arg2)
         /// <param name="arg0"><see cref="Android.Webkit.WebView"/></param>
         /// <param name="arg1"><see cref="Android.Os.Message"/></param>
         /// <param name="arg2"><see cref="Android.Os.Message"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnTooManyRedirects(Android.Webkit.WebView arg0, Android.Os.Message arg1, Android.Os.Message arg2)
         {
             IExecute("onTooManyRedirects", arg0, arg1, arg2);
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebViewDatabase.cs b/src/net/Netdroid/Generated/Android/Webkit/WebViewDatabase.cs
index bf8976121..411a523bd 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebViewDatabase.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebViewDatabase.cs
@@ -58,7 +58,7 @@ public static Android.Webkit.WebViewDatabase GetInstance(Android.Content.Context
         /// <see href="https://developer.android.com/reference/android/webkit/WebViewDatabase.html#hasFormData()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasFormData()
         {
             return IExecuteWithSignature<bool>("hasFormData", "()Z");
@@ -75,7 +75,7 @@ public bool HasHttpAuthUsernamePassword()
         /// <see href="https://developer.android.com/reference/android/webkit/WebViewDatabase.html#hasUsernamePassword()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool HasUsernamePassword()
         {
             return IExecuteWithSignature<bool>("hasUsernamePassword", "()Z");
@@ -93,7 +93,7 @@ public Java.Lang.String[] GetHttpAuthUsernamePassword(Java.Lang.String arg0, Jav
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebViewDatabase.html#clearFormData()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearFormData()
         {
             IExecuteWithSignature("clearFormData", "()V");
@@ -108,7 +108,7 @@ public void ClearHttpAuthUsernamePassword()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/webkit/WebViewDatabase.html#clearUsernamePassword()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearUsernamePassword()
         {
             IExecuteWithSignature("clearUsernamePassword", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Webkit/WebViewFragment.cs b/src/net/Netdroid/Generated/Android/Webkit/WebViewFragment.cs
index dba8f07a4..822fb0874 100644
--- a/src/net/Netdroid/Generated/Android/Webkit/WebViewFragment.cs
+++ b/src/net/Netdroid/Generated/Android/Webkit/WebViewFragment.cs
@@ -46,12 +46,13 @@ public partial class WebViewFragment
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/webkit/WebViewFragment.html#getWebView()"/> 
+        /// <see href="https://developer.android.com/reference/android/webkit/WebViewFragment.html#getWebView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Webkit.WebView WebView
+        /// <returns><see cref="Android.Webkit.WebView"/></returns>
+        [global::System.Obsolete()]
+        public Android.Webkit.WebView GetWebView()
         {
-            get { return IExecuteWithSignature<Android.Webkit.WebView>("getWebView", "()Landroid/webkit/WebView;"); }
+            return IExecuteWithSignature<Android.Webkit.WebView>("getWebView", "()Landroid/webkit/WebView;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Widget/AbsListView.cs b/src/net/Netdroid/Generated/Android/Widget/AbsListView.cs
index 979710104..2f4f4c43d 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AbsListView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AbsListView.cs
@@ -130,109 +130,12 @@ public AbsListView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getBottomEdgeEffectColor()"/> <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setBottomEdgeEffectColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getSelector()"/>
         /// </summary>
-        public int BottomEdgeEffectColor
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetSelector()
         {
-            get { return IExecuteWithSignature<int>("getBottomEdgeEffectColor", "()I"); } set { IExecuteWithSignature("setBottomEdgeEffectColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCacheColorHint()"/> <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setCacheColorHint(int)"/>
-        /// </summary>
-        public int CacheColorHint
-        {
-            get { return IExecuteWithSignature<int>("getCacheColorHint", "()I"); } set { IExecuteWithSignature("setCacheColorHint", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCheckedItemCount()"/> 
-        /// </summary>
-        public int CheckedItemCount
-        {
-            get { return IExecuteWithSignature<int>("getCheckedItemCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCheckedItemIds()"/> 
-        /// </summary>
-        public long[] CheckedItemIds
-        {
-            get { return IExecuteWithSignatureArray<long>("getCheckedItemIds", "()[J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCheckedItemPosition()"/> 
-        /// </summary>
-        public int CheckedItemPosition
-        {
-            get { return IExecuteWithSignature<int>("getCheckedItemPosition", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCheckedItemPositions()"/> 
-        /// </summary>
-        public Android.Util.SparseBooleanArray CheckedItemPositions
-        {
-            get { return IExecuteWithSignature<Android.Util.SparseBooleanArray>("getCheckedItemPositions", "()Landroid/util/SparseBooleanArray;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getChoiceMode()"/> <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setChoiceMode(int)"/>
-        /// </summary>
-        public int ChoiceMode
-        {
-            get { return IExecuteWithSignature<int>("getChoiceMode", "()I"); } set { IExecuteWithSignature("setChoiceMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getListPaddingBottom()"/> 
-        /// </summary>
-        public int ListPaddingBottom
-        {
-            get { return IExecuteWithSignature<int>("getListPaddingBottom", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getListPaddingLeft()"/> 
-        /// </summary>
-        public int ListPaddingLeft
-        {
-            get { return IExecuteWithSignature<int>("getListPaddingLeft", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getListPaddingRight()"/> 
-        /// </summary>
-        public int ListPaddingRight
-        {
-            get { return IExecuteWithSignature<int>("getListPaddingRight", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getListPaddingTop()"/> 
-        /// </summary>
-        public int ListPaddingTop
-        {
-            get { return IExecuteWithSignature<int>("getListPaddingTop", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getSelector()"/> 
-        /// </summary>
-        public Android.Graphics.Drawable.Drawable Selector
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getSelector", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getTextFilter()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence TextFilter
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTextFilter", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getTopEdgeEffectColor()"/> <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setTopEdgeEffectColor(int)"/>
-        /// </summary>
-        public int TopEdgeEffectColor
-        {
-            get { return IExecuteWithSignature<int>("getTopEdgeEffectColor", "()I"); } set { IExecuteWithSignature("setTopEdgeEffectColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getTranscriptMode()"/> <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setTranscriptMode(int)"/>
-        /// </summary>
-        public int TranscriptMode
-        {
-            get { return IExecuteWithSignature<int>("getTranscriptMode", "()I"); } set { IExecuteWithSignature("setTranscriptMode", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getSelector", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#onSaveInstanceState()"/>
@@ -243,6 +146,14 @@ public Android.Os.Parcelable OnSaveInstanceState()
             return IExecuteWithSignature<Android.Os.Parcelable>("onSaveInstanceState", "()Landroid/os/Parcelable;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCheckedItemPositions()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Util.SparseBooleanArray"/></returns>
+        public Android.Util.SparseBooleanArray GetCheckedItemPositions()
+        {
+            return IExecuteWithSignature<Android.Util.SparseBooleanArray>("getCheckedItemPositions", "()Landroid/util/SparseBooleanArray;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#canScrollList(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -350,6 +261,94 @@ public bool VerifyDrawable(Android.Graphics.Drawable.Drawable arg0)
             return IExecuteWithSignature<bool>("verifyDrawable", "(Landroid/graphics/drawable/Drawable;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getBottomEdgeEffectColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBottomEdgeEffectColor()
+        {
+            return IExecuteWithSignature<int>("getBottomEdgeEffectColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCacheColorHint()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCacheColorHint()
+        {
+            return IExecuteWithSignature<int>("getCacheColorHint", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCheckedItemCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCheckedItemCount()
+        {
+            return IExecuteWithSignature<int>("getCheckedItemCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCheckedItemPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCheckedItemPosition()
+        {
+            return IExecuteWithSignature<int>("getCheckedItemPosition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getChoiceMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChoiceMode()
+        {
+            return IExecuteWithSignature<int>("getChoiceMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getListPaddingBottom()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetListPaddingBottom()
+        {
+            return IExecuteWithSignature<int>("getListPaddingBottom", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getListPaddingLeft()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetListPaddingLeft()
+        {
+            return IExecuteWithSignature<int>("getListPaddingLeft", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getListPaddingRight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetListPaddingRight()
+        {
+            return IExecuteWithSignature<int>("getListPaddingRight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getListPaddingTop()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetListPaddingTop()
+        {
+            return IExecuteWithSignature<int>("getListPaddingTop", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getTopEdgeEffectColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTopEdgeEffectColor()
+        {
+            return IExecuteWithSignature<int>("getTopEdgeEffectColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getTranscriptMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTranscriptMode()
+        {
+            return IExecuteWithSignature<int>("getTranscriptMode", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#pointToPosition(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -360,6 +359,14 @@ public int PointToPosition(int arg0, int arg1)
             return IExecute<int>("pointToPosition", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getTextFilter()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTextFilter()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTextFilter", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#pointToRowId(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -370,6 +377,14 @@ public long PointToRowId(int arg0, int arg1)
             return IExecute<long>("pointToRowId", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#getCheckedItemIds()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long[] GetCheckedItemIds()
+        {
+            return IExecuteWithSignatureArray<long>("getCheckedItemIds", "()[J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#afterTextChanged(android.text.Editable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.Editable"/></param>
@@ -508,6 +523,30 @@ public void SetAdapter(Android.Widget.ListAdapter arg0)
             IExecuteWithSignature("setAdapter", "(Landroid/widget/ListAdapter;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setBottomEdgeEffectColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBottomEdgeEffectColor(int arg0)
+        {
+            IExecuteWithSignature("setBottomEdgeEffectColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setCacheColorHint(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCacheColorHint(int arg0)
+        {
+            IExecuteWithSignature("setCacheColorHint", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setChoiceMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetChoiceMode(int arg0)
+        {
+            IExecuteWithSignature("setChoiceMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setDrawSelectorOnTop(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -679,6 +718,22 @@ public void SetTextFilterEnabled(bool arg0)
             IExecuteWithSignature("setTextFilterEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setTopEdgeEffectColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTopEdgeEffectColor(int arg0)
+        {
+            IExecuteWithSignature("setTopEdgeEffectColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setTranscriptMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTranscriptMode(int arg0)
+        {
+            IExecuteWithSignature("setTranscriptMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AbsListView.html#setVelocityScale(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -827,11 +882,11 @@ public partial class MultiChoiceModeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onActionItemClicked", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnActionItemClickedEventHandler));
-                AddEventHandler("onCreateActionMode", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnCreateActionModeEventHandler));
-                AddEventHandler("onPrepareActionMode", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnPrepareActionModeEventHandler));
-                AddEventHandler("onDestroyActionMode", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnDestroyActionModeEventHandler));
-                AddEventHandler("onItemCheckedStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnItemCheckedStateChangedEventHandler));
+                AddEventHandler("onActionItemClicked", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnActionItemClickedEventHandler));
+                AddEventHandler("onCreateActionMode", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnCreateActionModeEventHandler));
+                AddEventHandler("onPrepareActionMode", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnPrepareActionModeEventHandler));
+                AddEventHandler("onDestroyActionMode", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnDestroyActionModeEventHandler));
+                AddEventHandler("onItemCheckedStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.ActionMode>>>(OnItemCheckedStateChangedEventHandler));
 
             }
 
@@ -839,7 +894,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/view/ActionMode.Callback.html#onActionItemClicked(android.view.ActionMode,android.view.MenuItem)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnActionItemClicked"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.ActionMode, Android.View.MenuItem, bool> OnOnActionItemClicked { get; set; } = null;
+            public global::System.Func<Android.View.ActionMode, Android.View.MenuItem, bool> OnOnActionItemClicked { get; set; } = null;
 
             void OnActionItemClickedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ActionMode>> data)
             {
@@ -863,7 +918,7 @@ public virtual bool OnActionItemClicked(Android.View.ActionMode arg0, Android.Vi
             /// Handler for <see href="https://developer.android.com/reference/android/view/ActionMode.Callback.html#onCreateActionMode(android.view.ActionMode,android.view.Menu)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCreateActionMode"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.ActionMode, Android.View.Menu, bool> OnOnCreateActionMode { get; set; } = null;
+            public global::System.Func<Android.View.ActionMode, Android.View.Menu, bool> OnOnCreateActionMode { get; set; } = null;
 
             void OnCreateActionModeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ActionMode>> data)
             {
@@ -887,7 +942,7 @@ public virtual bool OnCreateActionMode(Android.View.ActionMode arg0, Android.Vie
             /// Handler for <see href="https://developer.android.com/reference/android/view/ActionMode.Callback.html#onPrepareActionMode(android.view.ActionMode,android.view.Menu)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnPrepareActionMode"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.ActionMode, Android.View.Menu, bool> OnOnPrepareActionMode { get; set; } = null;
+            public global::System.Func<Android.View.ActionMode, Android.View.Menu, bool> OnOnPrepareActionMode { get; set; } = null;
 
             void OnPrepareActionModeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ActionMode>> data)
             {
@@ -911,7 +966,7 @@ public virtual bool OnPrepareActionMode(Android.View.ActionMode arg0, Android.Vi
             /// Handler for <see href="https://developer.android.com/reference/android/view/ActionMode.Callback.html#onDestroyActionMode(android.view.ActionMode)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDestroyActionMode"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.ActionMode> OnOnDestroyActionMode { get; set; } = null;
+            public global::System.Action<Android.View.ActionMode> OnOnDestroyActionMode { get; set; } = null;
 
             void OnDestroyActionModeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ActionMode>> data)
             {
@@ -932,7 +987,7 @@ public virtual void OnDestroyActionMode(Android.View.ActionMode arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AbsListView.MultiChoiceModeListener.html#onItemCheckedStateChanged(android.view.ActionMode,int,long,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnItemCheckedStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.ActionMode, int, long, bool> OnOnItemCheckedStateChanged { get; set; } = null;
+            public global::System.Action<Android.View.ActionMode, int, long, bool> OnOnItemCheckedStateChanged { get; set; } = null;
 
             void OnItemCheckedStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.ActionMode>> data)
             {
@@ -1067,8 +1122,8 @@ public partial class OnScrollListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onScroll", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AbsListView>>>(OnScrollEventHandler));
-                AddEventHandler("onScrollStateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AbsListView>>>(OnScrollStateChangedEventHandler));
+                AddEventHandler("onScroll", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AbsListView>>>(OnScrollEventHandler));
+                AddEventHandler("onScrollStateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AbsListView>>>(OnScrollStateChangedEventHandler));
 
             }
 
@@ -1076,7 +1131,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AbsListView.OnScrollListener.html#onScroll(android.widget.AbsListView,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScroll"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.AbsListView, int, int, int> OnOnScroll { get; set; } = null;
+            public global::System.Action<Android.Widget.AbsListView, int, int, int> OnOnScroll { get; set; } = null;
 
             void OnScrollEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.AbsListView>> data)
             {
@@ -1100,7 +1155,7 @@ public virtual void OnScroll(Android.Widget.AbsListView arg0, int arg1, int arg2
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AbsListView.OnScrollListener.html#onScrollStateChanged(android.widget.AbsListView,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScrollStateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.AbsListView, int> OnOnScrollStateChanged { get; set; } = null;
+            public global::System.Action<Android.Widget.AbsListView, int> OnOnScrollStateChanged { get; set; } = null;
 
             void OnScrollStateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.AbsListView>> data)
             {
@@ -1204,7 +1259,7 @@ public partial class RecyclerListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMovedToScrapHeap", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnMovedToScrapHeapEventHandler));
+                AddEventHandler("onMovedToScrapHeap", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(OnMovedToScrapHeapEventHandler));
 
             }
 
@@ -1212,7 +1267,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AbsListView.RecyclerListener.html#onMovedToScrapHeap(android.view.View)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMovedToScrapHeap"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.View.View> OnOnMovedToScrapHeap { get; set; } = null;
+            public global::System.Action<Android.View.View> OnOnMovedToScrapHeap { get; set; } = null;
 
             void OnMovedToScrapHeapEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/AbsSeekBar.cs b/src/net/Netdroid/Generated/Android/Widget/AbsSeekBar.cs
index 55a80637c..ece020d40 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AbsSeekBar.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AbsSeekBar.cs
@@ -84,81 +84,180 @@ public AbsSeekBar(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getKeyProgressIncrement()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setKeyProgressIncrement(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumbTintList()"/>
         /// </summary>
-        public int KeyProgressIncrement
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetThumbTintList()
         {
-            get { return IExecuteWithSignature<int>("getKeyProgressIncrement", "()I"); } set { IExecuteWithSignature("setKeyProgressIncrement", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getThumbTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getSplitTrack()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setSplitTrack(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getTickMarkTintList()"/>
         /// </summary>
-        public bool SplitTrack
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetTickMarkTintList()
         {
-            get { return IExecuteWithSignature<bool>("getSplitTrack", "()Z"); } set { IExecuteWithSignature("setSplitTrack", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getTickMarkTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumb()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumb(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumbTintBlendMode()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Thumb
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetThumbTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getThumb", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setThumb", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getThumbTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumbOffset()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumbOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getTickMarkTintBlendMode()"/>
         /// </summary>
-        public int ThumbOffset
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetTickMarkTintBlendMode()
         {
-            get { return IExecuteWithSignature<int>("getThumbOffset", "()I"); } set { IExecuteWithSignature("setThumbOffset", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getTickMarkTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumbTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumbTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumb()"/>
         /// </summary>
-        public Android.Graphics.BlendMode ThumbTintBlendMode
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetThumb()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getThumbTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setThumbTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getThumb", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumbTintList()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumbTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getTickMark()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList ThumbTintList
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetTickMark()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getThumbTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setThumbTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTickMark", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumbTintMode()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumbTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumbTintMode()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode ThumbTintMode
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetThumbTintMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getThumbTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setThumbTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getThumbTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getTickMark()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setTickMark(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getTickMarkTintMode()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable TickMark
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetTickMarkTintMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTickMark", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setTickMark", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getTickMarkTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getTickMarkTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setTickMarkTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getSplitTrack()"/>
         /// </summary>
-        public Android.Graphics.BlendMode TickMarkTintBlendMode
+        /// <returns><see cref="bool"/></returns>
+        public bool GetSplitTrack()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getTickMarkTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setTickMarkTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<bool>("getSplitTrack", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getTickMarkTintList()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setTickMarkTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getKeyProgressIncrement()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList TickMarkTintList
+        /// <returns><see cref="int"/></returns>
+        public int GetKeyProgressIncrement()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getTickMarkTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setTickMarkTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<int>("getKeyProgressIncrement", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getTickMarkTintMode()"/> <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setTickMarkTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#getThumbOffset()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode TickMarkTintMode
+        /// <returns><see cref="int"/></returns>
+        public int GetThumbOffset()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getTickMarkTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setTickMarkTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<int>("getThumbOffset", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setKeyProgressIncrement(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetKeyProgressIncrement(int arg0)
+        {
+            IExecuteWithSignature("setKeyProgressIncrement", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setSplitTrack(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetSplitTrack(bool arg0)
+        {
+            IExecuteWithSignature("setSplitTrack", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumb(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetThumb(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setThumb", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumbOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetThumbOffset(int arg0)
+        {
+            IExecuteWithSignature("setThumbOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumbTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetThumbTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setThumbTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumbTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetThumbTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setThumbTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setThumbTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetThumbTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setThumbTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setTickMark(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetTickMark(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setTickMark", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setTickMarkTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetTickMarkTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setTickMarkTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setTickMarkTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetTickMarkTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setTickMarkTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AbsSeekBar.html#setTickMarkTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetTickMarkTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setTickMarkTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Widget/AbsoluteLayout.cs b/src/net/Netdroid/Generated/Android/Widget/AbsoluteLayout.cs
index 7dd944bf8..1424840a9 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AbsoluteLayout.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AbsoluteLayout.cs
@@ -36,7 +36,7 @@ public partial class AbsoluteLayout
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AbsoluteLayout(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public AbsoluteLayout(Android.Content.Context arg0, Android.Util.AttributeSet ar
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AbsoluteLayout(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public AbsoluteLayout(Android.Content.Context arg0, Android.Util.AttributeSet ar
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AbsoluteLayout(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public AbsoluteLayout(Android.Content.Context arg0, Android.Util.AttributeSet ar
         /// <see href="https://developer.android.com/reference/android/widget/AbsoluteLayout.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AbsoluteLayout(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -100,7 +100,7 @@ public partial class LayoutParams
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Context"/></param>
             /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public LayoutParams(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
                 : base(arg0, arg1)
             {
@@ -109,7 +109,7 @@ public LayoutParams(Android.Content.Context arg0, Android.Util.AttributeSet arg1
             /// <see href="https://developer.android.com/reference/android/widget/AbsoluteLayout.LayoutParams.html#%3Cinit%3E(android.view.ViewGroup.LayoutParams)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.ViewGroup.LayoutParams"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public LayoutParams(Android.View.ViewGroup.LayoutParams arg0)
                 : base(arg0)
             {
@@ -121,7 +121,7 @@ public LayoutParams(Android.View.ViewGroup.LayoutParams arg0)
             /// <param name="arg1"><see cref="int"/></param>
             /// <param name="arg2"><see cref="int"/></param>
             /// <param name="arg3"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public LayoutParams(int arg0, int arg1, int arg2, int arg3)
                 : base(arg0, arg1, arg2, arg3)
             {
@@ -137,12 +137,12 @@ public LayoutParams(int arg0, int arg1, int arg2, int arg3)
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/AbsoluteLayout.LayoutParams.html#x"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int x { get { return IGetField<int>("x"); } set { ISetField("x", value); } }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/AbsoluteLayout.LayoutParams.html#y"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public int y { get { return IGetField<int>("y"); } set { ISetField("y", value); } }
 
             #endregion
@@ -157,7 +157,7 @@ public LayoutParams(int arg0, int arg1, int arg2, int arg3)
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.String"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Java.Lang.String Debug(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Java.Lang.String>("debug", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Widget/ActionMenuView.cs b/src/net/Netdroid/Generated/Android/Widget/ActionMenuView.cs
index bdd03e363..5f933e07e 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ActionMenuView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ActionMenuView.cs
@@ -63,25 +63,20 @@ public ActionMenuView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#getMenu()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#getOverflowIcon()"/>
         /// </summary>
-        public Android.View.Menu Menu
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetOverflowIcon()
         {
-            get { return IExecuteWithSignature<Android.View.Menu>("getMenu", "()Landroid/view/Menu;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverflowIcon", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#getOverflowIcon()"/> <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#setOverflowIcon(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#getMenu()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable OverflowIcon
+        /// <returns><see cref="Android.View.Menu"/></returns>
+        public Android.View.Menu GetMenu()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverflowIcon", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setOverflowIcon", "(Landroid/graphics/drawable/Drawable;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#getPopupTheme()"/> <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#setPopupTheme(int)"/>
-        /// </summary>
-        public int PopupTheme
-        {
-            get { return IExecuteWithSignature<int>("getPopupTheme", "()I"); } set { IExecuteWithSignature("setPopupTheme", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.Menu>("getMenu", "()Landroid/view/Menu;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#hideOverflowMenu()"/>
@@ -108,6 +103,14 @@ public bool ShowOverflowMenu()
             return IExecuteWithSignature<bool>("showOverflowMenu", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#getPopupTheme()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPopupTheme()
+        {
+            return IExecuteWithSignature<int>("getPopupTheme", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#dismissPopupMenus()"/>
         /// </summary>
         public void DismissPopupMenus()
@@ -137,6 +140,22 @@ public void SetOnMenuItemClickListener(Android.Widget.ActionMenuView.OnMenuItemC
         {
             IExecuteWithSignature("setOnMenuItemClickListener", "(Landroid/widget/ActionMenuView$OnMenuItemClickListener;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#setOverflowIcon(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetOverflowIcon(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setOverflowIcon", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ActionMenuView.html#setPopupTheme(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPopupTheme(int arg0)
+        {
+            IExecuteWithSignature("setPopupTheme", "(I)V", arg0);
+        }
 
         #endregion
 
@@ -231,7 +250,7 @@ public partial class OnMenuItemClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMenuItemClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemClickEventHandler));
+                AddEventHandler("onMenuItemClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemClickEventHandler));
 
             }
 
@@ -239,7 +258,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/ActionMenuView.OnMenuItemClickListener.html#onMenuItemClick(android.view.MenuItem)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMenuItemClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MenuItem, bool> OnOnMenuItemClick { get; set; } = null;
+            public global::System.Func<Android.View.MenuItem, bool> OnOnMenuItemClick { get; set; } = null;
 
             void OnMenuItemClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MenuItem>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/Adapter.cs b/src/net/Netdroid/Generated/Android/Widget/Adapter.cs
index e5a6e1688..158b8b85c 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Adapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Adapter.cs
@@ -68,17 +68,17 @@ public partial class Adapter : Android.Widget.IAdapter
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getItem", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
-            AddEventHandler("getItemId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
+            AddEventHandler("getView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("getCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
+            AddEventHandler("getItemViewType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
+            AddEventHandler("getViewTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
+            AddEventHandler("getItem", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
+            AddEventHandler("getItemId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("getAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
 
         }
 
@@ -86,7 +86,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
 
         void GetViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -111,7 +111,7 @@ public virtual Android.View.View GetView(int arg0, Android.View.View arg1, Andro
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -133,7 +133,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -155,7 +155,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetCount { get; set; } = null;
+        public global::System.Func<int> OnGetCount { get; set; } = null;
 
         void GetCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -177,7 +177,7 @@ public virtual int GetCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
+        public global::System.Func<int, int> OnGetItemViewType { get; set; } = null;
 
         void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -200,7 +200,7 @@ public virtual int GetItemViewType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetViewTypeCount { get; set; } = null;
 
         void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -222,7 +222,7 @@ public virtual int GetViewTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItem"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetItem { get; set; } = null;
+        public global::System.Func<int, object> OnGetItem { get; set; } = null;
 
         void GetItemEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -245,7 +245,7 @@ public virtual object GetItem(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemId(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetItemId { get; set; } = null;
+        public global::System.Func<int, long> OnGetItemId { get; set; } = null;
 
         void GetItemIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -268,7 +268,7 @@ public virtual long GetItemId(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -289,7 +289,7 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -319,7 +319,7 @@ public Java.Lang.CharSequence[] GetAutofillOptionsDefault()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
 
         void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -369,27 +369,6 @@ public partial class AdapterDirect : Android.Widget.IAdapter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getAutofillOptions", "()[Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecuteWithSignature<int>("getViewTypeCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -417,6 +396,14 @@ public override bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetCount()
+        {
+            return IExecuteWithSignature<int>("getCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -426,6 +413,14 @@ public override int GetItemViewType(int arg0)
             return IExecuteWithSignature<int>("getItemViewType", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetViewTypeCount()
+        {
+            return IExecuteWithSignature<int>("getViewTypeCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -459,6 +454,14 @@ public override void UnregisterDataSetObserver(Android.Database.DataSetObserver
         {
             IExecuteWithSignature("unregisterDataSetObserver", "(Landroid/database/DataSetObserver;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public override Java.Lang.CharSequence[] GetAutofillOptions()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getAutofillOptions", "()[Ljava/lang/CharSequence;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/AdapterView.cs b/src/net/Netdroid/Generated/Android/Widget/AdapterView.cs
index 6326aa30b..236e6c47e 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AdapterView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AdapterView.cs
@@ -108,107 +108,135 @@ public AdapterView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getAdapter()"/> <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setAdapter(android.widget.Adapter)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedView()"/>
         /// </summary>
-        public Android.Widget.Adapter Adapter
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetSelectedView()
         {
-            get { return IExecuteWithSignature<Android.Widget.Adapter>("getAdapter", "()Landroid/widget/Adapter;"); } set { IExecuteWithSignature("setAdapter", "(Landroid/widget/Adapter;)V", value); }
+            return IExecuteWithSignature<Android.View.View>("getSelectedView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getAdapter()"/>
         /// </summary>
-        public int Count
+        /// <returns><see cref="Android.Widget.Adapter"/></returns>
+        public Android.Widget.Adapter GetAdapter()
         {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
+            return IExecuteWithSignature<Android.Widget.Adapter>("getAdapter", "()Landroid/widget/Adapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getEmptyView()"/> <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setEmptyView(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getAdapter()"/>
         /// </summary>
-        public Android.View.View EmptyView
+        /// <returns><see cref="Android.Widget.Adapter"/></returns>
+        public Android.Widget.Adapter GetAdapterDirect()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getEmptyView", "()Landroid/view/View;"); } set { IExecuteWithSignature("setEmptyView", "(Landroid/view/View;)V", value); }
+            return IExecuteWithSignature<Android.Widget.AdapterDirect, Android.Widget.Adapter>("getAdapter", "()Landroid/widget/Adapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getFirstVisiblePosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setAdapter(android.widget.Adapter)"/>
         /// </summary>
-        public int FirstVisiblePosition
+        /// <param name="arg0"><see cref="Android.Widget.Adapter"/></param>
+        public void SetAdapter(Android.Widget.Adapter arg0)
         {
-            get { return IExecuteWithSignature<int>("getFirstVisiblePosition", "()I"); }
+            IExecuteWithSignature("setAdapter", "(Landroid/widget/Adapter;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemClickListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setSelection(int)"/>
         /// </summary>
-        public Android.Widget.AdapterView.OnItemClickListener GetOnItemClickListener
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSelection(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;"); }
+            IExecuteWithSignature("setSelection", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemLongClickListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getEmptyView()"/>
         /// </summary>
-        public Android.Widget.AdapterView.OnItemLongClickListener GetOnItemLongClickListener
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetEmptyView()
         {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemLongClickListener>("getOnItemLongClickListener", "()Landroid/widget/AdapterView$OnItemLongClickListener;"); }
+            return IExecuteWithSignature<Android.View.View>("getEmptyView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemSelectedListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#performItemClick(android.view.View,int,long)"/>
         /// </summary>
-        public Android.Widget.AdapterView.OnItemSelectedListener GetOnItemSelectedListener
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="long"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformItemClick(Android.View.View arg0, int arg1, long arg2)
         {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;"); }
+            return IExecute<bool>("performItemClick", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getLastVisiblePosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemClickListener()"/>
         /// </summary>
-        public int LastVisiblePosition
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemClickListener GetOnItemClickListener()
         {
-            get { return IExecuteWithSignature<int>("getLastVisiblePosition", "()I"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItem()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemClickListener()"/>
         /// </summary>
-        public object SelectedItem
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemClickListener GetOnItemClickListenerDirect()
         {
-            get { return IExecuteWithSignature("getSelectedItem", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListenerDirect, Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemLongClickListener()"/>
         /// </summary>
-        public long SelectedItemId
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemLongClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemLongClickListener GetOnItemLongClickListener()
         {
-            get { return IExecuteWithSignature<long>("getSelectedItemId", "()J"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemLongClickListener>("getOnItemLongClickListener", "()Landroid/widget/AdapterView$OnItemLongClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItemPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemLongClickListener()"/>
         /// </summary>
-        public int SelectedItemPosition
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemLongClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemLongClickListener GetOnItemLongClickListenerDirect()
         {
-            get { return IExecuteWithSignature<int>("getSelectedItemPosition", "()I"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemLongClickListenerDirect, Android.Widget.AdapterView.OnItemLongClickListener>("getOnItemLongClickListener", "()Landroid/widget/AdapterView$OnItemLongClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemSelectedListener()"/>
         /// </summary>
-        public Android.View.View SelectedView
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></returns>
+        public Android.Widget.AdapterView.OnItemSelectedListener GetOnItemSelectedListener()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getSelectedView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setSelection(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemSelectedListener()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void SetSelection(int arg0)
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></returns>
+        public Android.Widget.AdapterView.OnItemSelectedListener GetOnItemSelectedListenerDirect()
         {
-            IExecuteWithSignature("setSelection", "(I)V", arg0);
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListenerDirect, Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#performItemClick(android.view.View,int,long)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="long"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformItemClick(Android.View.View arg0, int arg1, long arg2)
+        /// <returns><see cref="int"/></returns>
+        public int GetCount()
         {
-            return IExecute<bool>("performItemClick", arg0, arg1, arg2);
+            return IExecuteWithSignature<int>("getCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getFirstVisiblePosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFirstVisiblePosition()
+        {
+            return IExecuteWithSignature<int>("getFirstVisiblePosition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getLastVisiblePosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLastVisiblePosition()
+        {
+            return IExecuteWithSignature<int>("getLastVisiblePosition", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getPositionForView(android.view.View)"/>
@@ -220,6 +248,14 @@ public int GetPositionForView(Android.View.View arg0)
             return IExecuteWithSignature<int>("getPositionForView", "(Landroid/view/View;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItemPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectedItemPosition()
+        {
+            return IExecuteWithSignature<int>("getSelectedItemPosition", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getItemAtPosition(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -229,6 +265,14 @@ public object GetItemAtPosition(int arg0)
             return IExecuteWithSignature("getItemAtPosition", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItem()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetSelectedItem()
+        {
+            return IExecuteWithSignature("getSelectedItem", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getItemIdAtPosition(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -238,6 +282,22 @@ public long GetItemIdAtPosition(int arg0)
             return IExecuteWithSignature<long>("getItemIdAtPosition", "(I)J", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItemId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetSelectedItemId()
+        {
+            return IExecuteWithSignature<long>("getSelectedItemId", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setEmptyView(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetEmptyView(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setEmptyView", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setOnItemClickListener(android.widget.AdapterView.OnItemClickListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.AdapterView.OnItemClickListener"/></param>
@@ -343,7 +403,7 @@ public partial class OnItemClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onItemClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>>>(OnItemClickEventHandler));
+                AddEventHandler("onItemClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>>>(OnItemClickEventHandler));
 
             }
 
@@ -351,7 +411,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AdapterView.OnItemClickListener.html#onItemClick(android.widget.AdapterView,android.view.View,int,long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnItemClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.AdapterView, Android.View.View, int, long> OnOnItemClick { get; set; } = null;
+            public global::System.Action<Android.Widget.AdapterView, Android.View.View, int, long> OnOnItemClick { get; set; } = null;
 
             void OnItemClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>> data)
             {
@@ -448,7 +508,7 @@ public partial class OnItemLongClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onItemLongClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>>>(OnItemLongClickEventHandler));
+                AddEventHandler("onItemLongClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>>>(OnItemLongClickEventHandler));
 
             }
 
@@ -456,7 +516,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AdapterView.OnItemLongClickListener.html#onItemLongClick(android.widget.AdapterView,android.view.View,int,long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnItemLongClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Widget.AdapterView, Android.View.View, int, long, bool> OnOnItemLongClick { get; set; } = null;
+            public global::System.Func<Android.Widget.AdapterView, Android.View.View, int, long, bool> OnOnItemLongClick { get; set; } = null;
 
             void OnItemLongClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>> data)
             {
@@ -556,8 +616,8 @@ public partial class OnItemSelectedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onItemSelected", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>>>(OnItemSelectedEventHandler));
-                AddEventHandler("onNothingSelected", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>>>(OnNothingSelectedEventHandler));
+                AddEventHandler("onItemSelected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>>>(OnItemSelectedEventHandler));
+                AddEventHandler("onNothingSelected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>>>(OnNothingSelectedEventHandler));
 
             }
 
@@ -565,7 +625,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AdapterView.OnItemSelectedListener.html#onItemSelected(android.widget.AdapterView,android.view.View,int,long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnItemSelected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.AdapterView, Android.View.View, int, long> OnOnItemSelected { get; set; } = null;
+            public global::System.Action<Android.Widget.AdapterView, Android.View.View, int, long> OnOnItemSelected { get; set; } = null;
 
             void OnItemSelectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>> data)
             {
@@ -589,7 +649,7 @@ public virtual void OnItemSelected(Android.Widget.AdapterView arg0, Android.View
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AdapterView.OnItemSelectedListener.html#onNothingSelected(android.widget.AdapterView)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnNothingSelected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.AdapterView> OnOnNothingSelected { get; set; } = null;
+            public global::System.Action<Android.Widget.AdapterView> OnOnNothingSelected { get; set; } = null;
 
             void OnNothingSelectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.AdapterView>> data)
             {
@@ -760,107 +820,127 @@ public AdapterView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getAdapter()"/> <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setAdapter(android.widget.Adapter)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedView()"/>
         /// </summary>
-        public T Adapter
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetSelectedView()
         {
-            get { return IExecuteWithSignature<T>("getAdapter", "()Landroid/widget/Adapter;"); } set { IExecuteWithSignature("setAdapter", "(Landroid/widget/Adapter;)V", value); }
+            return IExecuteWithSignature<Android.View.View>("getSelectedView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getAdapter()"/>
         /// </summary>
-        public int Count
+        /// <returns><typeparamref name="T"/></returns>
+        public T GetAdapter()
         {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
+            return IExecuteWithSignature<T>("getAdapter", "()Landroid/widget/Adapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getEmptyView()"/> <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setEmptyView(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setAdapter(android.widget.Adapter)"/>
         /// </summary>
-        public Android.View.View EmptyView
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        public void SetAdapter(T arg0)
         {
-            get { return IExecuteWithSignature<Android.View.View>("getEmptyView", "()Landroid/view/View;"); } set { IExecuteWithSignature("setEmptyView", "(Landroid/view/View;)V", value); }
+            IExecuteWithSignature("setAdapter", "(Landroid/widget/Adapter;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getFirstVisiblePosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setSelection(int)"/>
         /// </summary>
-        public int FirstVisiblePosition
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSelection(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getFirstVisiblePosition", "()I"); }
+            IExecuteWithSignature("setSelection", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemClickListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getEmptyView()"/>
         /// </summary>
-        public Android.Widget.AdapterView.OnItemClickListener GetOnItemClickListener
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetEmptyView()
         {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;"); }
+            return IExecuteWithSignature<Android.View.View>("getEmptyView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemLongClickListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#performItemClick(android.view.View,int,long)"/>
         /// </summary>
-        public Android.Widget.AdapterView.OnItemLongClickListener GetOnItemLongClickListener
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="long"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformItemClick(Android.View.View arg0, int arg1, long arg2)
         {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemLongClickListener>("getOnItemLongClickListener", "()Landroid/widget/AdapterView$OnItemLongClickListener;"); }
+            return IExecute<bool>("performItemClick", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemSelectedListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemClickListener()"/>
         /// </summary>
-        public Android.Widget.AdapterView.OnItemSelectedListener GetOnItemSelectedListener
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemClickListener GetOnItemClickListener()
         {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getLastVisiblePosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemClickListener()"/>
         /// </summary>
-        public int LastVisiblePosition
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemClickListener GetOnItemClickListenerDirect()
         {
-            get { return IExecuteWithSignature<int>("getLastVisiblePosition", "()I"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListenerDirect, Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItem()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemLongClickListener()"/>
         /// </summary>
-        public object SelectedItem
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemLongClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemLongClickListener GetOnItemLongClickListener()
         {
-            get { return IExecuteWithSignature("getSelectedItem", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemLongClickListener>("getOnItemLongClickListener", "()Landroid/widget/AdapterView$OnItemLongClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemLongClickListener()"/>
         /// </summary>
-        public long SelectedItemId
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemLongClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemLongClickListener GetOnItemLongClickListenerDirect()
         {
-            get { return IExecuteWithSignature<long>("getSelectedItemId", "()J"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemLongClickListenerDirect, Android.Widget.AdapterView.OnItemLongClickListener>("getOnItemLongClickListener", "()Landroid/widget/AdapterView$OnItemLongClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItemPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemSelectedListener()"/>
         /// </summary>
-        public int SelectedItemPosition
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></returns>
+        public Android.Widget.AdapterView.OnItemSelectedListener GetOnItemSelectedListener()
         {
-            get { return IExecuteWithSignature<int>("getSelectedItemPosition", "()I"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getOnItemSelectedListener()"/>
         /// </summary>
-        public Android.View.View SelectedView
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></returns>
+        public Android.Widget.AdapterView.OnItemSelectedListener GetOnItemSelectedListenerDirect()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getSelectedView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListenerDirect, Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setSelection(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void SetSelection(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetCount()
         {
-            IExecuteWithSignature("setSelection", "(I)V", arg0);
+            return IExecuteWithSignature<int>("getCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#performItemClick(android.view.View,int,long)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getFirstVisiblePosition()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="long"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformItemClick(Android.View.View arg0, int arg1, long arg2)
+        /// <returns><see cref="int"/></returns>
+        public int GetFirstVisiblePosition()
         {
-            return IExecute<bool>("performItemClick", arg0, arg1, arg2);
+            return IExecuteWithSignature<int>("getFirstVisiblePosition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getLastVisiblePosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLastVisiblePosition()
+        {
+            return IExecuteWithSignature<int>("getLastVisiblePosition", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getPositionForView(android.view.View)"/>
@@ -872,6 +952,14 @@ public int GetPositionForView(Android.View.View arg0)
             return IExecuteWithSignature<int>("getPositionForView", "(Landroid/view/View;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItemPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectedItemPosition()
+        {
+            return IExecuteWithSignature<int>("getSelectedItemPosition", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getItemAtPosition(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -881,6 +969,14 @@ public object GetItemAtPosition(int arg0)
             return IExecuteWithSignature("getItemAtPosition", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItem()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetSelectedItem()
+        {
+            return IExecuteWithSignature("getSelectedItem", "()Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getItemIdAtPosition(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -890,6 +986,22 @@ public long GetItemIdAtPosition(int arg0)
             return IExecuteWithSignature<long>("getItemIdAtPosition", "(I)J", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#getSelectedItemId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetSelectedItemId()
+        {
+            return IExecuteWithSignature<long>("getSelectedItemId", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setEmptyView(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetEmptyView(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setEmptyView", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html#setOnItemClickListener(android.widget.AdapterView.OnItemClickListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.AdapterView.OnItemClickListener"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/AdapterViewAnimator.cs b/src/net/Netdroid/Generated/Android/Widget/AdapterViewAnimator.cs
index 0a69bb7ec..121b4c34f 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AdapterViewAnimator.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AdapterViewAnimator.cs
@@ -88,32 +88,20 @@ public AdapterViewAnimator(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#getCurrentView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#getInAnimation()"/>
         /// </summary>
-        public Android.View.View CurrentView
+        /// <returns><see cref="Android.Animation.ObjectAnimator"/></returns>
+        public Android.Animation.ObjectAnimator GetInAnimation()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getCurrentView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.Animation.ObjectAnimator>("getInAnimation", "()Landroid/animation/ObjectAnimator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#getDisplayedChild()"/> <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#setDisplayedChild(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#getOutAnimation()"/>
         /// </summary>
-        public int DisplayedChild
+        /// <returns><see cref="Android.Animation.ObjectAnimator"/></returns>
+        public Android.Animation.ObjectAnimator GetOutAnimation()
         {
-            get { return IExecuteWithSignature<int>("getDisplayedChild", "()I"); } set { IExecuteWithSignature("setDisplayedChild", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#getInAnimation()"/> <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#setInAnimation(android.animation.ObjectAnimator)"/>
-        /// </summary>
-        public Android.Animation.ObjectAnimator InAnimation
-        {
-            get { return IExecuteWithSignature<Android.Animation.ObjectAnimator>("getInAnimation", "()Landroid/animation/ObjectAnimator;"); } set { IExecuteWithSignature("setInAnimation", "(Landroid/animation/ObjectAnimator;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#getOutAnimation()"/> <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#setOutAnimation(android.animation.ObjectAnimator)"/>
-        /// </summary>
-        public Android.Animation.ObjectAnimator OutAnimation
-        {
-            get { return IExecuteWithSignature<Android.Animation.ObjectAnimator>("getOutAnimation", "()Landroid/animation/ObjectAnimator;"); } set { IExecuteWithSignature("setOutAnimation", "(Landroid/animation/ObjectAnimator;)V", value); }
+            return IExecuteWithSignature<Android.Animation.ObjectAnimator>("getOutAnimation", "()Landroid/animation/ObjectAnimator;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#onSaveInstanceState()"/>
@@ -124,6 +112,14 @@ public Android.Os.Parcelable OnSaveInstanceState()
             return IExecuteWithSignature<Android.Os.Parcelable>("onSaveInstanceState", "()Landroid/os/Parcelable;");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#getCurrentView()"/>
+        /// </summary>
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetCurrentView()
+        {
+            return IExecuteWithSignature<Android.View.View>("getCurrentView", "()Landroid/view/View;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#onRemoteAdapterConnected()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -132,6 +128,14 @@ public bool OnRemoteAdapterConnected()
             return IExecuteWithSignature<bool>("onRemoteAdapterConnected", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#getDisplayedChild()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayedChild()
+        {
+            return IExecuteWithSignature<int>("getDisplayedChild", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#advance()"/>
         /// </summary>
         public void Advance()
@@ -176,6 +180,22 @@ public void SetAnimateFirstView(bool arg0)
             IExecuteWithSignature("setAnimateFirstView", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#setDisplayedChild(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDisplayedChild(int arg0)
+        {
+            IExecuteWithSignature("setDisplayedChild", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#setInAnimation(android.animation.ObjectAnimator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Animation.ObjectAnimator"/></param>
+        public void SetInAnimation(Android.Animation.ObjectAnimator arg0)
+        {
+            IExecuteWithSignature("setInAnimation", "(Landroid/animation/ObjectAnimator;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#setInAnimation(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -185,6 +205,14 @@ public void SetInAnimation(Android.Content.Context arg0, int arg1)
             IExecute("setInAnimation", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#setOutAnimation(android.animation.ObjectAnimator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Animation.ObjectAnimator"/></param>
+        public void SetOutAnimation(Android.Animation.ObjectAnimator arg0)
+        {
+            IExecuteWithSignature("setOutAnimation", "(Landroid/animation/ObjectAnimator;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterViewAnimator.html#setOutAnimation(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/AdapterViewFlipper.cs b/src/net/Netdroid/Generated/Android/Widget/AdapterViewFlipper.cs
index e5980df67..ff93a247b 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AdapterViewFlipper.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AdapterViewFlipper.cs
@@ -84,13 +84,6 @@ public AdapterViewFlipper(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewFlipper.html#getFlipInterval()"/> <see href="https://developer.android.com/reference/android/widget/AdapterViewFlipper.html#setFlipInterval(int)"/>
-        /// </summary>
-        public int FlipInterval
-        {
-            get { return IExecuteWithSignature<int>("getFlipInterval", "()I"); } set { IExecuteWithSignature("setFlipInterval", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterViewFlipper.html#isAutoStart()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -107,6 +100,14 @@ public bool IsFlipping()
             return IExecuteWithSignature<bool>("isFlipping", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewFlipper.html#getFlipInterval()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFlipInterval()
+        {
+            return IExecuteWithSignature<int>("getFlipInterval", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterViewFlipper.html#setAutoStart(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -115,6 +116,14 @@ public void SetAutoStart(bool arg0)
             IExecuteWithSignature("setAutoStart", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AdapterViewFlipper.html#setFlipInterval(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFlipInterval(int arg0)
+        {
+            IExecuteWithSignature("setFlipInterval", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AdapterViewFlipper.html#startFlipping()"/>
         /// </summary>
         public void StartFlipping()
diff --git a/src/net/Netdroid/Generated/Android/Widget/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Widget/AllPackageClasses.cs
index 1e4f71cdb..24e5ae39e 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class AbsListView : Android.Widget.AdapterView<Android.Widget.Lis
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbsListView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbsListView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbsListView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbsListView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbsListView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbsListView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -123,10 +123,13 @@ public partial class MultiChoiceModeListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public MultiChoiceModeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.AbsListView_MultiChoiceModeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.MultiChoiceModeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -148,10 +151,13 @@ public partial class MultiChoiceModeListenerDirect : MultiChoiceModeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.AbsListView$MultiChoiceModeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.AbsListView$MultiChoiceModeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -182,10 +188,13 @@ public partial class OnScrollListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public OnScrollListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.AbsListView_OnScrollListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnScrollListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -207,10 +216,13 @@ public partial class OnScrollListenerDirect : OnScrollListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.AbsListView$OnScrollListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.AbsListView$OnScrollListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -241,10 +253,13 @@ public partial class RecyclerListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public RecyclerListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.AbsListView_RecyclerListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.RecyclerListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -266,10 +281,13 @@ public partial class RecyclerListenerDirect : RecyclerListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.AbsListView$RecyclerListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.AbsListView$RecyclerListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -299,12 +317,12 @@ public partial class SelectionBoundsAdjuster : MASES.JCOBridge.C2JBridge.JVMBrid
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SelectionBoundsAdjuster class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SelectionBoundsAdjuster class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SelectionBoundsAdjuster() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SelectionBoundsAdjuster class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SelectionBoundsAdjuster class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SelectionBoundsAdjuster(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -343,7 +361,7 @@ public SelectionBoundsAdjuster(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/AbsoluteLayout.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AbsoluteLayout : Android.View.ViewGroup
     {
         const string _bridgeClassName = "android.widget.AbsoluteLayout";
@@ -384,7 +402,7 @@ public AbsoluteLayout(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AbsoluteLayout.LayoutParams.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class LayoutParams : Android.View.ViewGroup.LayoutParams
         {
             const string _bridgeClassName = "android.widget.AbsoluteLayout$LayoutParams";
@@ -439,12 +457,12 @@ public partial class AbsSeekBar : Android.Widget.ProgressBar
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbsSeekBar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbsSeekBar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbsSeekBar() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbsSeekBar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbsSeekBar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbsSeekBar(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -485,12 +503,12 @@ public partial class AbsSpinner : Android.Widget.AdapterView<Android.Widget.Spin
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbsSpinner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbsSpinner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbsSpinner() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbsSpinner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbsSpinner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbsSpinner(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -616,10 +634,13 @@ public partial class OnMenuItemClickListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnMenuItemClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ActionMenuView_OnMenuItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnMenuItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -641,10 +662,13 @@ public partial class OnMenuItemClickListenerDirect : OnMenuItemClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.ActionMenuView$OnMenuItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.ActionMenuView$OnMenuItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -679,10 +703,13 @@ public partial class Adapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public Adapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.Adapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.Adapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -704,10 +731,13 @@ public partial class AdapterDirect : Adapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.Adapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.Adapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -737,12 +767,12 @@ public partial class AdapterView : Android.View.ViewGroup
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AdapterView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdapterView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdapterView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AdapterView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdapterView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdapterView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -824,10 +854,13 @@ public partial class OnItemClickListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnItemClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.AdapterView_OnItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -849,10 +882,13 @@ public partial class OnItemClickListenerDirect : OnItemClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.AdapterView$OnItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.AdapterView$OnItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -883,10 +919,13 @@ public partial class OnItemLongClickListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnItemLongClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.AdapterView_OnItemLongClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnItemLongClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -908,10 +947,13 @@ public partial class OnItemLongClickListenerDirect : OnItemLongClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.AdapterView$OnItemLongClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.AdapterView$OnItemLongClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -942,10 +984,13 @@ public partial class OnItemSelectedListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnItemSelectedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.AdapterView_OnItemSelectedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnItemSelectedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -967,10 +1012,13 @@ public partial class OnItemSelectedListenerDirect : OnItemSelectedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.AdapterView$OnItemSelectedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.AdapterView$OnItemSelectedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -999,18 +1047,18 @@ protected override void InitializeHandlers() { }
     /// <see href="https://developer.android.com/reference/android/widget/AdapterView.html"/>
     /// </summary>
     /// <typeparam name="T"><see cref="Android.Widget.IAdapter"/></typeparam>
-    public partial class AdapterView<T> : Android.View.ViewGroup where T: Android.Widget.IAdapter, new()
+    public partial class AdapterView<T> : Android.View.ViewGroup where T : Android.Widget.IAdapter, new()
     {
         const string _bridgeClassName = "android.widget.AdapterView";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AdapterView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdapterView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdapterView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AdapterView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdapterView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdapterView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1051,12 +1099,12 @@ public partial class AdapterViewAnimator : Android.Widget.AdapterView<Android.Wi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AdapterViewAnimator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdapterViewAnimator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdapterViewAnimator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AdapterViewAnimator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AdapterViewAnimator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AdapterViewAnimator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1141,12 +1189,12 @@ public partial class Advanceable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Advan
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Advanceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Advanceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Advanceable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Advanceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Advanceable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Advanceable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1225,7 +1273,7 @@ public AlphabetIndexer(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AnalogClock : Android.View.View
     {
         const string _bridgeClassName = "android.widget.AnalogClock";
@@ -1266,6 +1314,95 @@ public AnalogClock(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region ArrayAdapter
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html"/>
+    /// </summary>
+    public partial class ArrayAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ArrayAdapter>
+    {
+        const string _bridgeClassName = "android.widget.ArrayAdapter";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        public ArrayAdapter() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public ArrayAdapter(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region ArrayAdapter<T>
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html"/>
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public partial class ArrayAdapter<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ArrayAdapter<T>>
+    {
+        const string _bridgeClassName = "android.widget.ArrayAdapter";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        public ArrayAdapter() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public ArrayAdapter(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+    
+    }
+    #endregion
+
     #region AutoCompleteTextView
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html"/>
@@ -1317,10 +1454,13 @@ public partial class OnDismissListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnDismissListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.AutoCompleteTextView_OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1342,10 +1482,13 @@ public partial class OnDismissListenerDirect : OnDismissListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.AutoCompleteTextView$OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.AutoCompleteTextView$OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1375,12 +1518,12 @@ public partial class Validator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Validat
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Validator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Validator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1426,10 +1569,13 @@ public partial class BaseAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public BaseAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.BaseAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.BaseAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1451,10 +1597,13 @@ public partial class BaseAdapterDirect : BaseAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.BaseAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.BaseAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1485,10 +1634,13 @@ public partial class BaseExpandableListAdapter : MASES.JCOBridge.C2JBridge.JVMBr
         /// </summary>
         public BaseExpandableListAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.BaseExpandableListAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.BaseExpandableListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1510,10 +1662,13 @@ public partial class BaseExpandableListAdapterDirect : BaseExpandableListAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.BaseExpandableListAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.BaseExpandableListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1628,10 +1783,13 @@ public partial class OnDateChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnDateChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.CalendarView_OnDateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnDateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1653,10 +1811,13 @@ public partial class OnDateChangeListenerDirect : OnDateChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.CalendarView$OnDateChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.CalendarView$OnDateChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1690,12 +1851,12 @@ public partial class Checkable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Checkab
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Checkable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Checkable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Checkable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Checkable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Checkable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Checkable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1865,10 +2026,13 @@ public partial class OnChronometerTickListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnChronometerTickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.Chronometer_OnChronometerTickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnChronometerTickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1890,10 +2054,13 @@ public partial class OnChronometerTickListenerDirect : OnChronometerTickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.Chronometer$OnChronometerTickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.Chronometer$OnChronometerTickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -1927,12 +2094,12 @@ public partial class CompoundButton : Android.Widget.Button
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CompoundButton class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompoundButton class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompoundButton() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CompoundButton class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompoundButton class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompoundButton(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1970,10 +2137,13 @@ public partial class OnCheckedChangeListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnCheckedChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.CompoundButton_OnCheckedChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnCheckedChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -1995,10 +2165,13 @@ public partial class OnCheckedChangeListenerDirect : OnCheckedChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.CompoundButton$OnCheckedChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.CompoundButton$OnCheckedChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2033,10 +2206,13 @@ public partial class CursorAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public CursorAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.CursorAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.CursorAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2058,10 +2234,13 @@ public partial class CursorAdapterDirect : CursorAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.CursorAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.CursorAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2085,38 +2264,26 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html"/>
     /// </summary>
-    public partial class CursorTreeAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class CursorTreeAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CursorTreeAdapter>
     {
+        const string _bridgeClassName = "android.widget.CursorTreeAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public CursorTreeAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region CursorTreeAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="CursorTreeAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class CursorTreeAdapterDirect : CursorTreeAdapter
-    {
+        [global::System.Obsolete("CursorTreeAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public CursorTreeAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("CursorTreeAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public CursorTreeAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.CursorTreeAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2133,6 +2300,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -2187,10 +2357,13 @@ public partial class OnDateChangedListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnDateChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.DatePicker_OnDateChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnDateChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2212,10 +2385,13 @@ public partial class OnDateChangedListenerDirect : OnDateChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.DatePicker$OnDateChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.DatePicker$OnDateChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2243,7 +2419,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DialerFilter : Android.Widget.RelativeLayout
     {
         const string _bridgeClassName = "android.widget.DialerFilter";
@@ -2288,7 +2464,7 @@ public DialerFilter(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/DigitalClock.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DigitalClock : Android.Widget.TextView
     {
         const string _bridgeClassName = "android.widget.DigitalClock";
@@ -2428,10 +2604,13 @@ public partial class ExpandableListAdapter : MASES.JCOBridge.C2JBridge.JVMBridge
         /// </summary>
         public ExpandableListAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ExpandableListAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.ExpandableListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2453,10 +2632,13 @@ public partial class ExpandableListAdapterDirect : ExpandableListAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.ExpandableListAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.ExpandableListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2571,10 +2753,13 @@ public partial class OnChildClickListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnChildClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ExpandableListView_OnChildClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnChildClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2596,10 +2781,13 @@ public partial class OnChildClickListenerDirect : OnChildClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.ExpandableListView$OnChildClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.ExpandableListView$OnChildClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2630,10 +2818,13 @@ public partial class OnGroupClickListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnGroupClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ExpandableListView_OnGroupClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnGroupClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2655,10 +2846,13 @@ public partial class OnGroupClickListenerDirect : OnGroupClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.ExpandableListView$OnGroupClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.ExpandableListView$OnGroupClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2689,10 +2883,13 @@ public partial class OnGroupCollapseListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnGroupCollapseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ExpandableListView_OnGroupCollapseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnGroupCollapseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2714,10 +2911,13 @@ public partial class OnGroupCollapseListenerDirect : OnGroupCollapseListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.ExpandableListView$OnGroupCollapseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.ExpandableListView$OnGroupCollapseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2748,10 +2948,13 @@ public partial class OnGroupExpandListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnGroupExpandListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ExpandableListView_OnGroupExpandListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnGroupExpandListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2773,10 +2976,13 @@ public partial class OnGroupExpandListenerDirect : OnGroupExpandListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.ExpandableListView$OnGroupExpandListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.ExpandableListView$OnGroupExpandListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2810,12 +3016,12 @@ public partial class Filter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Filter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Filter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2853,10 +3059,13 @@ public partial class FilterListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public FilterListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.Filter_FilterListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.FilterListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -2878,10 +3087,13 @@ public partial class FilterListenerDirect : FilterListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.Filter$FilterListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.Filter$FilterListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -2915,12 +3127,12 @@ public partial class Filterable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Filterable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Filterable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Filterable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Filterable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Filterable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Filterable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2961,12 +3173,12 @@ public partial class FilterQueryProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FilterQueryProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FilterQueryProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FilterQueryProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FilterQueryProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FilterQueryProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FilterQueryProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3089,7 +3301,7 @@ public LayoutParams(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/Gallery.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Gallery : Android.Widget.AbsSpinner
     {
         const string _bridgeClassName = "android.widget.Gallery";
@@ -3130,7 +3342,7 @@ public Gallery(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.LayoutParams.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class LayoutParams : Android.View.ViewGroup.LayoutParams
         {
             const string _bridgeClassName = "android.widget.Gallery$LayoutParams";
@@ -3225,12 +3437,12 @@ public partial class Alignment : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Alignme
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Alignment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Alignment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Alignment() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Alignment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Alignment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Alignment(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3401,38 +3613,24 @@ public GridView(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html"/>
     /// </summary>
-    public partial class HeaderViewListAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class HeaderViewListAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HeaderViewListAdapter>
     {
+        const string _bridgeClassName = "android.widget.HeaderViewListAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public HeaderViewListAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region HeaderViewListAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="HeaderViewListAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class HeaderViewListAdapterDirect : HeaderViewListAdapter
-    {
+        public HeaderViewListAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public HeaderViewListAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.HeaderViewListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3449,6 +3647,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -3462,12 +3663,12 @@ public partial class HeterogeneousExpandableList : MASES.JCOBridge.C2JBridge.JVM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HeterogeneousExpandableList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HeterogeneousExpandableList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HeterogeneousExpandableList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HeterogeneousExpandableList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HeterogeneousExpandableList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HeterogeneousExpandableList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3817,10 +4018,13 @@ public partial class ListAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public ListAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ListAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.ListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3842,10 +4046,13 @@ public partial class ListAdapterDirect : ListAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.ListAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.ListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -4135,12 +4342,12 @@ public partial class MediaPlayerControl : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("MediaPlayerControl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("MediaPlayerControl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public MediaPlayerControl() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("MediaPlayerControl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("MediaPlayerControl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public MediaPlayerControl(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4269,12 +4476,12 @@ public partial class Tokenizer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Tokeniz
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Tokenizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Tokenizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Tokenizer() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Tokenizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Tokenizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Tokenizer(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4359,12 +4566,12 @@ public partial class Formatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Formatt
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Formatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Formatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Formatter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Formatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Formatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Formatter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4406,10 +4613,13 @@ public partial class OnScrollListener : MASES.JCOBridge.C2JBridge.JVMBridgeListe
             /// </summary>
             public OnScrollListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.NumberPicker_OnScrollListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnScrollListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4431,10 +4641,13 @@ public partial class OnScrollListenerDirect : OnScrollListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.NumberPicker$OnScrollListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.NumberPicker$OnScrollListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4465,10 +4678,13 @@ public partial class OnValueChangeListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnValueChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.NumberPicker_OnValueChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnValueChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4490,10 +4706,13 @@ public partial class OnValueChangeListenerDirect : OnValueChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.NumberPicker$OnValueChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.NumberPicker$OnValueChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4612,10 +4831,13 @@ public partial class OnDismissListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnDismissListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.PopupMenu_OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4637,10 +4859,13 @@ public partial class OnDismissListenerDirect : OnDismissListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.PopupMenu$OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.PopupMenu$OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4671,10 +4896,13 @@ public partial class OnMenuItemClickListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnMenuItemClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.PopupMenu_OnMenuItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnMenuItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4696,10 +4924,13 @@ public partial class OnMenuItemClickListenerDirect : OnMenuItemClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.PopupMenu$OnMenuItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.PopupMenu$OnMenuItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -4774,10 +5005,13 @@ public partial class OnDismissListener : MASES.JCOBridge.C2JBridge.JVMBridgeList
             /// </summary>
             public OnDismissListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.PopupWindow_OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -4799,10 +5033,13 @@ public partial class OnDismissListenerDirect : OnDismissListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.PopupWindow$OnDismissListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.PopupWindow$OnDismissListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5053,10 +5290,13 @@ public partial class OnCheckedChangeListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnCheckedChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.RadioGroup_OnCheckedChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnCheckedChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5078,10 +5318,13 @@ public partial class OnCheckedChangeListenerDirect : OnCheckedChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.RadioGroup$OnCheckedChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.RadioGroup$OnCheckedChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5156,10 +5399,13 @@ public partial class OnRatingBarChangeListener : MASES.JCOBridge.C2JBridge.JVMBr
             /// </summary>
             public OnRatingBarChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.RatingBar_OnRatingBarChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnRatingBarChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5181,10 +5427,13 @@ public partial class OnRatingBarChangeListenerDirect : OnRatingBarChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.RatingBar$OnRatingBarChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.RatingBar$OnRatingBarChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5495,12 +5744,12 @@ public partial class RemoteView : Java.Lang.Annotation.Annotation
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("RemoteView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RemoteView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RemoteView() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("RemoteView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RemoteView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RemoteView(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5589,12 +5838,12 @@ public partial class RemoteViewsService : Android.App.Service
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RemoteViewsService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RemoteViewsService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RemoteViewsService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RemoteViewsService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RemoteViewsService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RemoteViewsService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5631,12 +5880,12 @@ public partial class RemoteViewsFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("RemoteViewsFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RemoteViewsFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RemoteViewsFactory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("RemoteViewsFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("RemoteViewsFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public RemoteViewsFactory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5675,38 +5924,26 @@ public RemoteViewsFactory(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html"/>
     /// </summary>
-    public partial class ResourceCursorAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class ResourceCursorAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ResourceCursorAdapter>
     {
+        const string _bridgeClassName = "android.widget.ResourceCursorAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public ResourceCursorAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region ResourceCursorAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="ResourceCursorAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class ResourceCursorAdapterDirect : ResourceCursorAdapter
-    {
+        [global::System.Obsolete("ResourceCursorAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public ResourceCursorAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("ResourceCursorAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public ResourceCursorAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.ResourceCursorAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -5723,6 +5960,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -5730,38 +5970,26 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html"/>
     /// </summary>
-    public partial class ResourceCursorTreeAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class ResourceCursorTreeAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ResourceCursorTreeAdapter>
     {
+        const string _bridgeClassName = "android.widget.ResourceCursorTreeAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public ResourceCursorTreeAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region ResourceCursorTreeAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="ResourceCursorTreeAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class ResourceCursorTreeAdapterDirect : ResourceCursorTreeAdapter
-    {
+        [global::System.Obsolete("ResourceCursorTreeAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public ResourceCursorTreeAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("ResourceCursorTreeAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public ResourceCursorTreeAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.ResourceCursorTreeAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -5778,6 +6006,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -5920,10 +6151,13 @@ public partial class OnCloseListener : MASES.JCOBridge.C2JBridge.JVMBridgeListen
             /// </summary>
             public OnCloseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SearchView_OnCloseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnCloseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -5945,10 +6179,13 @@ public partial class OnCloseListenerDirect : OnCloseListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.SearchView$OnCloseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.SearchView$OnCloseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -5979,10 +6216,13 @@ public partial class OnQueryTextListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnQueryTextListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SearchView_OnQueryTextListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnQueryTextListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6004,10 +6244,13 @@ public partial class OnQueryTextListenerDirect : OnQueryTextListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.SearchView$OnQueryTextListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.SearchView$OnQueryTextListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6038,10 +6281,13 @@ public partial class OnSuggestionListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnSuggestionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SearchView_OnSuggestionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnSuggestionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6063,10 +6309,13 @@ public partial class OnSuggestionListenerDirect : OnSuggestionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.SearchView$OnSuggestionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.SearchView$OnSuggestionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6100,12 +6349,12 @@ public partial class SectionIndexer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Se
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SectionIndexer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SectionIndexer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SectionIndexer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SectionIndexer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SectionIndexer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SectionIndexer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6187,10 +6436,13 @@ public partial class OnSeekBarChangeListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnSeekBarChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SeekBar_OnSeekBarChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnSeekBarChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6212,10 +6464,13 @@ public partial class OnSeekBarChangeListenerDirect : OnSeekBarChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.SeekBar$OnSeekBarChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.SeekBar$OnSeekBarChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6290,10 +6545,13 @@ public partial class OnShareTargetSelectedListener : MASES.JCOBridge.C2JBridge.J
             /// </summary>
             public OnShareTargetSelectedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ShareActionProvider_OnShareTargetSelectedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnShareTargetSelectedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6315,10 +6573,13 @@ public partial class OnShareTargetSelectedListenerDirect : OnShareTargetSelected
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.ShareActionProvider$OnShareTargetSelectedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.ShareActionProvider$OnShareTargetSelectedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6353,10 +6614,13 @@ public partial class SimpleAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public SimpleAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SimpleAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.SimpleAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -6370,12 +6634,12 @@ public partial class ViewBinder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ViewBi
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ViewBinder() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ViewBinder(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6424,10 +6688,13 @@ public partial class SimpleAdapterDirect : SimpleAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.SimpleAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.SimpleAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -6451,14 +6718,40 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html"/>
     /// </summary>
-    public partial class SimpleCursorAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class SimpleCursorAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SimpleCursorAdapter>
     {
+        const string _bridgeClassName = "android.widget.SimpleCursorAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public SimpleCursorAdapter() { InitializeHandlers(); }
+        public SimpleCursorAdapter() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        public SimpleCursorAdapter(params object[] args) : base(args) { }
 
-    #warning Remember to build the Java class for event listener
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
 
         // TODO: complete the class
         #region CursorToStringConverter
@@ -6471,12 +6764,12 @@ public partial class CursorToStringConverter : MASES.JCOBridge.C2JBridge.JVMBrid
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("CursorToStringConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CursorToStringConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CursorToStringConverter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("CursorToStringConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("CursorToStringConverter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public CursorToStringConverter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6517,12 +6810,12 @@ public partial class ViewBinder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ViewBi
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ViewBinder() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ViewBinder(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6557,28 +6850,34 @@ public ViewBinder(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region SimpleCursorAdapterDirect
+    #region SimpleCursorTreeAdapter
     /// <summary>
-    /// Direct override of <see cref="SimpleCursorAdapter"/> or its generic type if there is one
+    /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html"/>
     /// </summary>
-    public partial class SimpleCursorAdapterDirect : SimpleCursorAdapter
+    public partial class SimpleCursorTreeAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SimpleCursorTreeAdapter>
     {
+        const string _bridgeClassName = "android.widget.SimpleCursorTreeAdapter";
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public override bool AutoInit => false;
+        [global::System.Obsolete("SimpleCursorTreeAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public SimpleCursorTreeAdapter() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("SimpleCursorTreeAdapter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public SimpleCursorTreeAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.SimpleCursorAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
-        public override bool IsBridgeAbstract => false;
+        public override bool IsBridgeAbstract => true;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
         /// </summary>
@@ -6591,21 +6890,6 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
-    }
-    #endregion
-
-    #region SimpleCursorTreeAdapter
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html"/>
-    /// </summary>
-    public partial class SimpleCursorTreeAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
-    {
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        public SimpleCursorTreeAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
 
         // TODO: complete the class
         #region ViewBinder
@@ -6618,12 +6902,12 @@ public partial class ViewBinder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ViewBi
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ViewBinder() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ViewBinder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ViewBinder(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6658,79 +6942,28 @@ public ViewBinder(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region SimpleCursorTreeAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="SimpleCursorTreeAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class SimpleCursorTreeAdapterDirect : SimpleCursorTreeAdapter
-    {
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
-        /// </summary>
-        public override bool AutoInit => false;
-
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => "android.widget.SimpleCursorTreeAdapter";
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-    }
-    #endregion
-
     #region SimpleExpandableListAdapter
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html"/>
     /// </summary>
-    public partial class SimpleExpandableListAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class SimpleExpandableListAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SimpleExpandableListAdapter>
     {
+        const string _bridgeClassName = "android.widget.SimpleExpandableListAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public SimpleExpandableListAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region SimpleExpandableListAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="SimpleExpandableListAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class SimpleExpandableListAdapterDirect : SimpleExpandableListAdapter
-    {
+        public SimpleExpandableListAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public SimpleExpandableListAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.SimpleExpandableListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -6747,6 +6980,9 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
@@ -6754,7 +6990,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SlidingDrawer : Android.View.ViewGroup
     {
         const string _bridgeClassName = "android.widget.SlidingDrawer";
@@ -6795,7 +7031,7 @@ public SlidingDrawer(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerCloseListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnDrawerCloseListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -6803,10 +7039,13 @@ public partial class OnDrawerCloseListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnDrawerCloseListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SlidingDrawer_OnDrawerCloseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnDrawerCloseListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6828,10 +7067,13 @@ public partial class OnDrawerCloseListenerDirect : OnDrawerCloseListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.SlidingDrawer$OnDrawerCloseListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.SlidingDrawer$OnDrawerCloseListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6855,7 +7097,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerOpenListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnDrawerOpenListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -6863,10 +7105,13 @@ public partial class OnDrawerOpenListener : MASES.JCOBridge.C2JBridge.JVMBridgeL
             /// </summary>
             public OnDrawerOpenListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SlidingDrawer_OnDrawerOpenListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnDrawerOpenListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6888,10 +7133,13 @@ public partial class OnDrawerOpenListenerDirect : OnDrawerOpenListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.SlidingDrawer$OnDrawerOpenListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.SlidingDrawer$OnDrawerOpenListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -6915,7 +7163,7 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerScrollListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnDrawerScrollListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -6923,10 +7171,13 @@ public partial class OnDrawerScrollListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnDrawerScrollListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SlidingDrawer_OnDrawerScrollListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnDrawerScrollListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -6948,10 +7199,13 @@ public partial class OnDrawerScrollListenerDirect : OnDrawerScrollListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.SlidingDrawer$OnDrawerScrollListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.SlidingDrawer$OnDrawerScrollListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7074,10 +7328,13 @@ public partial class SpinnerAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public SpinnerAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.SpinnerAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.SpinnerAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -7099,10 +7356,13 @@ public partial class SpinnerAdapterDirect : SpinnerAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.SpinnerAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.SpinnerAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -7214,7 +7474,7 @@ public Switch(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/TabHost.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class TabHost : Android.Widget.FrameLayout
     {
         const string _bridgeClassName = "android.widget.TabHost";
@@ -7255,7 +7515,7 @@ public TabHost(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.OnTabChangeListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnTabChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -7263,10 +7523,13 @@ public partial class OnTabChangeListener : MASES.JCOBridge.C2JBridge.JVMBridgeLi
             /// </summary>
             public OnTabChangeListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.TabHost_OnTabChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnTabChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7288,10 +7551,13 @@ public partial class OnTabChangeListenerDirect : OnTabChangeListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.TabHost$OnTabChangeListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.TabHost$OnTabChangeListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7315,19 +7581,19 @@ protected override void InitializeHandlers() { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.TabContentFactory.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class TabContentFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TabContentFactory>
         {
             const string _bridgeClassName = "android.widget.TabHost$TabContentFactory";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("TabContentFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TabContentFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TabContentFactory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("TabContentFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("TabContentFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public TabContentFactory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -7362,7 +7628,7 @@ public TabContentFactory(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.TabSpec.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class TabSpec : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TabSpec>
         {
             const string _bridgeClassName = "android.widget.TabHost$TabSpec";
@@ -7587,7 +7853,7 @@ public LayoutParams(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class TabWidget : Android.Widget.LinearLayout
     {
         const string _bridgeClassName = "android.widget.TabWidget";
@@ -7811,10 +8077,13 @@ public partial class OnEditorActionListener : MASES.JCOBridge.C2JBridge.JVMBridg
             /// </summary>
             public OnEditorActionListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.TextView_OnEditorActionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnEditorActionListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -7836,10 +8105,13 @@ public partial class OnEditorActionListenerDirect : OnEditorActionListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.TextView$OnEditorActionListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.TextView$OnEditorActionListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -7918,10 +8190,13 @@ public partial class ThemedSpinnerAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeL
         /// </summary>
         public ThemedSpinnerAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ThemedSpinnerAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.ThemedSpinnerAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -7943,10 +8218,13 @@ public partial class ThemedSpinnerAdapterDirect : ThemedSpinnerAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.ThemedSpinnerAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.ThemedSpinnerAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -8017,10 +8295,13 @@ public partial class OnTimeChangedListener : MASES.JCOBridge.C2JBridge.JVMBridge
             /// </summary>
             public OnTimeChangedListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.TimePicker_OnTimeChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnTimeChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -8042,10 +8323,13 @@ public partial class OnTimeChangedListenerDirect : OnTimeChangedListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.TimePicker$OnTimeChangedListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.TimePicker$OnTimeChangedListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -8119,12 +8403,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8298,10 +8582,13 @@ public partial class OnMenuItemClickListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnMenuItemClickListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.Toolbar_OnMenuItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnMenuItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -8323,10 +8610,13 @@ public partial class OnMenuItemClickListenerDirect : OnMenuItemClickListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.Toolbar$OnMenuItemClickListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.Toolbar$OnMenuItemClickListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -8354,7 +8644,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/TwoLineListItem.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class TwoLineListItem : Android.Widget.RelativeLayout
     {
         const string _bridgeClassName = "android.widget.TwoLineListItem";
@@ -8577,12 +8867,12 @@ public partial class ViewFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ViewF
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ViewFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ViewFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ViewFactory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ViewFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ViewFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ViewFactory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -8628,10 +8918,13 @@ public partial class WrapperListAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeLis
         /// </summary>
         public WrapperListAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.WrapperListAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.WrapperListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -8653,10 +8946,13 @@ public partial class WrapperListAdapterDirect : WrapperListAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "android.widget.WrapperListAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "android.widget.WrapperListAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -8680,7 +8976,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/ZoomButton.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ZoomButton : Android.Widget.ImageButton
     {
         const string _bridgeClassName = "android.widget.ZoomButton";
@@ -8725,7 +9021,7 @@ public ZoomButton(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ZoomButtonsController : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ZoomButtonsController>
     {
         const string _bridgeClassName = "android.widget.ZoomButtonsController";
@@ -8766,7 +9062,7 @@ public ZoomButtonsController(params object[] args) : base(args) { }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.OnZoomListener.html"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public partial class OnZoomListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         {
             /// <summary>
@@ -8774,10 +9070,13 @@ public partial class OnZoomListener : MASES.JCOBridge.C2JBridge.JVMBridgeListene
             /// </summary>
             public OnZoomListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.widget.ZoomButtonsController_OnZoomListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.widget.OnZoomListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -8799,10 +9098,13 @@ public partial class OnZoomListenerDirect : OnZoomListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.widget.ZoomButtonsController$OnZoomListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.widget.ZoomButtonsController$OnZoomListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
@@ -8830,7 +9132,7 @@ protected override void InitializeHandlers() { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ZoomControls : Android.Widget.LinearLayout
     {
         const string _bridgeClassName = "android.widget.ZoomControls";
diff --git a/src/net/Netdroid/Generated/Android/Widget/AlphabetIndexer.cs b/src/net/Netdroid/Generated/Android/Widget/AlphabetIndexer.cs
index f3722f6e8..444f9a7e4 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AlphabetIndexer.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AlphabetIndexer.cs
@@ -60,13 +60,6 @@ public AlphabetIndexer(Android.Database.Cursor arg0, int arg1, Java.Lang.CharSeq
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AlphabetIndexer.html#getSections()"/> 
-        /// </summary>
-        public object[] Sections
-        {
-            get { return IExecuteWithSignatureArray<object>("getSections", "()[Ljava/lang/Object;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AlphabetIndexer.html#getPositionForSection(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -85,6 +78,14 @@ public int GetSectionForPosition(int arg0)
             return IExecuteWithSignature<int>("getSectionForPosition", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AlphabetIndexer.html#getSections()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object[] GetSections()
+        {
+            return IExecuteWithSignatureArray<object>("getSections", "()[Ljava/lang/Object;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AlphabetIndexer.html#setCursor(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/AnalogClock.cs b/src/net/Netdroid/Generated/Android/Widget/AnalogClock.cs
index edf6bd8d8..cac9c3137 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AnalogClock.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AnalogClock.cs
@@ -36,7 +36,7 @@ public partial class AnalogClock
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AnalogClock(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public AnalogClock(Android.Content.Context arg0, Android.Util.AttributeSet arg1,
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AnalogClock(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public AnalogClock(Android.Content.Context arg0, Android.Util.AttributeSet arg1,
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AnalogClock(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public AnalogClock(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
         /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public AnalogClock(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,113 +88,203 @@ public AnalogClock(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getDialTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setDialTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getDialTintList()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.BlendMode DialTintBlendMode
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Res.ColorStateList GetDialTintList()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getDialTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setDialTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getDialTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getDialTintList()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setDialTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getHourHandTintList()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Res.ColorStateList DialTintList
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Res.ColorStateList GetHourHandTintList()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getDialTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setDialTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getHourHandTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getHourHandTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setHourHandTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getMinuteHandTintList()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.BlendMode HourHandTintBlendMode
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Res.ColorStateList GetMinuteHandTintList()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getHourHandTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setHourHandTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getMinuteHandTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getHourHandTintList()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setHourHandTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getSecondHandTintList()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Res.ColorStateList HourHandTintList
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        [global::System.Obsolete()]
+        public Android.Content.Res.ColorStateList GetSecondHandTintList()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getHourHandTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setHourHandTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getSecondHandTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getMinuteHandTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setMinuteHandTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getDialTintBlendMode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.BlendMode MinuteHandTintBlendMode
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.BlendMode GetDialTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getMinuteHandTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setMinuteHandTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getDialTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getMinuteHandTintList()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setMinuteHandTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getHourHandTintBlendMode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Res.ColorStateList MinuteHandTintList
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.BlendMode GetHourHandTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getMinuteHandTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setMinuteHandTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getHourHandTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getSecondHandTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setSecondHandTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getMinuteHandTintBlendMode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.BlendMode SecondHandTintBlendMode
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.BlendMode GetMinuteHandTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getSecondHandTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setSecondHandTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getMinuteHandTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getSecondHandTintList()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setSecondHandTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getSecondHandTintBlendMode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Content.Res.ColorStateList SecondHandTintList
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.BlendMode GetSecondHandTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getSecondHandTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setSecondHandTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getSecondHandTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getTimeZone()"/> <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setTimeZone(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#getTimeZone()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String TimeZone
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetTimeZone()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTimeZone", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setTimeZone", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getTimeZone", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setDial(android.graphics.drawable.Icon)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Icon"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDial(Android.Graphics.Drawable.Icon arg0)
         {
             IExecuteWithSignature("setDial", "(Landroid/graphics/drawable/Icon;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setDialTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        [global::System.Obsolete()]
+        public void SetDialTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setDialTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setDialTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        [global::System.Obsolete()]
+        public void SetDialTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setDialTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setHourHand(android.graphics.drawable.Icon)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Icon"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetHourHand(Android.Graphics.Drawable.Icon arg0)
         {
             IExecuteWithSignature("setHourHand", "(Landroid/graphics/drawable/Icon;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setHourHandTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        [global::System.Obsolete()]
+        public void SetHourHandTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setHourHandTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setHourHandTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        [global::System.Obsolete()]
+        public void SetHourHandTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setHourHandTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setMinuteHand(android.graphics.drawable.Icon)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Icon"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetMinuteHand(Android.Graphics.Drawable.Icon arg0)
         {
             IExecuteWithSignature("setMinuteHand", "(Landroid/graphics/drawable/Icon;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setMinuteHandTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        [global::System.Obsolete()]
+        public void SetMinuteHandTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setMinuteHandTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setMinuteHandTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        [global::System.Obsolete()]
+        public void SetMinuteHandTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setMinuteHandTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setSecondHand(android.graphics.drawable.Icon)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Icon"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSecondHand(Android.Graphics.Drawable.Icon arg0)
         {
             IExecuteWithSignature("setSecondHand", "(Landroid/graphics/drawable/Icon;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setSecondHandTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        [global::System.Obsolete()]
+        public void SetSecondHandTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setSecondHandTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setSecondHandTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        [global::System.Obsolete()]
+        public void SetSecondHandTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setSecondHandTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AnalogClock.html#setTimeZone(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        [global::System.Obsolete()]
+        public void SetTimeZone(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setTimeZone", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/ArrayAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/ArrayAdapter.cs
new file mode 100644
index 000000000..f37ab20c8
--- /dev/null
+++ b/src/net/Netdroid/Generated/Android/Widget/ArrayAdapter.cs
@@ -0,0 +1,443 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Android.Widget
+{
+    #region ArrayAdapter
+    public partial class ArrayAdapter
+    {
+        #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int,int,java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="Java.Util.List"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1, int arg2, Java.Util.List arg3)
+            : base(arg0, arg1, arg2, arg3)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1, int arg2)
+            : base(arg0, arg1, arg2)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int,java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Java.Util.List"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1, Java.Util.List arg2)
+            : base(arg0, arg1, arg2)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1)
+            : base(arg0, arg1)
+        {
+        }
+
+        #endregion
+
+        #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Android.Widget.ArrayAdapter"/> to <see cref="Android.Widget.Filterable"/>
+        /// </summary>
+        public static implicit operator Android.Widget.Filterable(Android.Widget.ArrayAdapter t) => t.Cast<Android.Widget.Filterable>();
+        /// <summary>
+        /// Converter from <see cref="Android.Widget.ArrayAdapter"/> to <see cref="Android.Widget.ThemedSpinnerAdapter"/>
+        /// </summary>
+        public static implicit operator Android.Widget.ThemedSpinnerAdapter(Android.Widget.ArrayAdapter t) => t.Cast<Android.Widget.ThemedSpinnerAdapter>();
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#createFromResource(android.content.Context,int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <returns><see cref="Android.Widget.ArrayAdapter"/></returns>
+        public static Android.Widget.ArrayAdapter CreateFromResource(Android.Content.Context arg0, int arg1, int arg2)
+        {
+            return SExecute<Android.Widget.ArrayAdapter>(LocalBridgeClazz, "createFromResource", arg0, arg1, arg2);
+        }
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#getContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#getDropDownViewTheme()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
+        public Android.Content.Res.Resources.Theme GetDropDownViewTheme()
+        {
+            return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getDropDownViewTheme", "()Landroid/content/res/Resources$Theme;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#getFilter()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Widget.Filter"/></returns>
+        public Android.Widget.Filter GetFilter()
+        {
+            return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#getPosition(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetPosition(object arg0)
+        {
+            return IExecuteWithSignature<int>("getPosition", "(Ljava/lang/Object;)I", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#add(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void Add(object arg0)
+        {
+            IExecuteWithSignature("add", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#addAll(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        public void AddAll(Java.Util.Collection arg0)
+        {
+            IExecuteWithSignature("addAll", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#addAll(java.lang.Object[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void AddAll(params object[] arg0)
+        {
+            if (arg0.Length == 0) IExecuteWithSignature("addAll", "([Ljava/lang/Object;)V"); else IExecuteWithSignature("addAll", "([Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#clear()"/>
+        /// </summary>
+        public void Clear()
+        {
+            IExecuteWithSignature("clear", "()V");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#insert(java.lang.Object,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public void Insert(object arg0, int arg1)
+        {
+            IExecute("insert", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#remove(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void Remove(object arg0)
+        {
+            IExecuteWithSignature("remove", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#setDropDownViewResource(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownViewResource(int arg0)
+        {
+            IExecuteWithSignature("setDropDownViewResource", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.Resources.Theme"/></param>
+        public void SetDropDownViewTheme(Android.Content.Res.Resources.Theme arg0)
+        {
+            IExecuteWithSignature("setDropDownViewTheme", "(Landroid/content/res/Resources$Theme;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#setNotifyOnChange(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetNotifyOnChange(bool arg0)
+        {
+            IExecuteWithSignature("setNotifyOnChange", "(Z)V", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region ArrayAdapter<T>
+    public partial class ArrayAdapter<T> : Android.Widget.IFilterable, Android.Widget.IThemedSpinnerAdapter
+    {
+        #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int,int,java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="Java.Util.List"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1, int arg2, Java.Util.List<T> arg3)
+            : base(arg0, arg1, arg2, arg3)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int,int,java.lang.Object[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><typeparamref name="T"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1, int arg2, T[] arg3)
+            : base(arg0, arg1, arg2, arg3)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1, int arg2)
+            : base(arg0, arg1, arg2)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int,java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Java.Util.List"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1, Java.Util.List<T> arg2)
+            : base(arg0, arg1, arg2)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int,java.lang.Object[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><typeparamref name="T"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1, T[] arg2)
+            : base(arg0, arg1, arg2)
+        {
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#%3Cinit%3E(android.content.Context,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public ArrayAdapter(Android.Content.Context arg0, int arg1)
+            : base(arg0, arg1)
+        {
+        }
+
+        #endregion
+
+        #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Android.Widget.ArrayAdapter{T}"/> to <see cref="Android.Widget.Filterable"/>
+        /// </summary>
+        public static implicit operator Android.Widget.Filterable(Android.Widget.ArrayAdapter<T> t) => t.Cast<Android.Widget.Filterable>();
+        /// <summary>
+        /// Converter from <see cref="Android.Widget.ArrayAdapter{T}"/> to <see cref="Android.Widget.ThemedSpinnerAdapter"/>
+        /// </summary>
+        public static implicit operator Android.Widget.ThemedSpinnerAdapter(Android.Widget.ArrayAdapter<T> t) => t.Cast<Android.Widget.ThemedSpinnerAdapter>();
+        /// <summary>
+        /// Converter from <see cref="Android.Widget.ArrayAdapter{T}"/> to <see cref="Android.Widget.ArrayAdapter"/>
+        /// </summary>
+        public static implicit operator Android.Widget.ArrayAdapter(Android.Widget.ArrayAdapter<T> t) => t.Cast<Android.Widget.ArrayAdapter>();
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#createFromResource(android.content.Context,int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <returns><see cref="Android.Widget.ArrayAdapter"/></returns>
+        public static Android.Widget.ArrayAdapter<Java.Lang.CharSequence> CreateFromResource(Android.Content.Context arg0, int arg1, int arg2)
+        {
+            return SExecute<Android.Widget.ArrayAdapter<Java.Lang.CharSequence>>(LocalBridgeClazz, "createFromResource", arg0, arg1, arg2);
+        }
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#getContext()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetContext()
+        {
+            return IExecuteWithSignature<Android.Content.Context>("getContext", "()Landroid/content/Context;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#getDropDownViewTheme()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
+        public Android.Content.Res.Resources.Theme GetDropDownViewTheme()
+        {
+            return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getDropDownViewTheme", "()Landroid/content/res/Resources$Theme;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#getFilter()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Widget.Filter"/></returns>
+        public Android.Widget.Filter GetFilter()
+        {
+            return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#getPosition(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetPosition(T arg0)
+        {
+            return IExecuteWithSignature<int>("getPosition", "(Ljava/lang/Object;)I", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#add(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        public void Add(T arg0)
+        {
+            IExecuteWithSignature("add", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#addAll(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
+        public void AddAll<Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
+        {
+            IExecuteWithSignature("addAll", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#addAll(java.lang.Object[])"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        public void AddAll(params T[] arg0)
+        {
+            if (arg0.Length == 0) IExecuteWithSignature("addAll", "([Ljava/lang/Object;)V"); else IExecuteWithSignature("addAll", "([Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#clear()"/>
+        /// </summary>
+        public void Clear()
+        {
+            IExecuteWithSignature("clear", "()V");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#insert(java.lang.Object,int)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public void Insert(T arg0, int arg1)
+        {
+            IExecute("insert", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#remove(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        public void Remove(T arg0)
+        {
+            IExecuteWithSignature("remove", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#setDropDownViewResource(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownViewResource(int arg0)
+        {
+            IExecuteWithSignature("setDropDownViewResource", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.Resources.Theme"/></param>
+        public void SetDropDownViewTheme(Android.Content.Res.Resources.Theme arg0)
+        {
+            IExecuteWithSignature("setDropDownViewTheme", "(Landroid/content/res/Resources$Theme;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ArrayAdapter.html#setNotifyOnChange(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetNotifyOnChange(bool arg0)
+        {
+            IExecuteWithSignature("setNotifyOnChange", "(Z)V", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Android/Widget/AutoCompleteTextView.cs b/src/net/Netdroid/Generated/Android/Widget/AutoCompleteTextView.cs
index 0ecb20421..e0afc4eaf 100644
--- a/src/net/Netdroid/Generated/Android/Widget/AutoCompleteTextView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/AutoCompleteTextView.cs
@@ -96,118 +96,113 @@ public AutoCompleteTextView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getAdapter()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setAdapter(android.widget.ListAdapter)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setAdapter(android.widget.ListAdapter)"/>
         /// </summary>
-        public Android.Widget.ListAdapter Adapter
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <typeparam name="T"><see cref="Android.Widget.IListAdapter"/></typeparam>
+        public void SetAdapter<T>(T arg0) where T : Android.Widget.IListAdapter, Android.Widget.IFilterable, new()
         {
-            get { return IExecuteWithSignature<Android.Widget.ListAdapter>("getAdapter", "()Landroid/widget/ListAdapter;"); } set { IExecuteWithSignature("setAdapter", "(Landroid/widget/ListAdapter;)V", value); }
+            IExecute("setAdapter", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getCompletionHint()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setCompletionHint(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownBackground()"/>
         /// </summary>
-        public Java.Lang.CharSequence CompletionHint
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDropDownBackground()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCompletionHint", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setCompletionHint", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDropDownBackground", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownAnchor()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownAnchor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getItemClickListener()"/>
         /// </summary>
-        public int DropDownAnchor
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemClickListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.AdapterView.OnItemClickListener GetItemClickListener()
         {
-            get { return IExecuteWithSignature<int>("getDropDownAnchor", "()I"); } set { IExecuteWithSignature("setDropDownAnchor", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListener>("getItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownBackground()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getItemClickListener()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable DropDownBackground
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemClickListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.AdapterView.OnItemClickListener GetItemClickListenerDirect()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDropDownBackground", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListenerDirect, Android.Widget.AdapterView.OnItemClickListener>("getItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownHeight()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getOnItemClickListener()"/>
         /// </summary>
-        public int DropDownHeight
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemClickListener GetOnItemClickListener()
         {
-            get { return IExecuteWithSignature<int>("getDropDownHeight", "()I"); } set { IExecuteWithSignature("setDropDownHeight", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownHorizontalOffset()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownHorizontalOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getOnItemClickListener()"/>
         /// </summary>
-        public int DropDownHorizontalOffset
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemClickListener"/></returns>
+        public Android.Widget.AdapterView.OnItemClickListener GetOnItemClickListenerDirect()
         {
-            get { return IExecuteWithSignature<int>("getDropDownHorizontalOffset", "()I"); } set { IExecuteWithSignature("setDropDownHorizontalOffset", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListenerDirect, Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownVerticalOffset()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownVerticalOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getItemSelectedListener()"/>
         /// </summary>
-        public int DropDownVerticalOffset
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.AdapterView.OnItemSelectedListener GetItemSelectedListener()
         {
-            get { return IExecuteWithSignature<int>("getDropDownVerticalOffset", "()I"); } set { IExecuteWithSignature("setDropDownVerticalOffset", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListener>("getItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownWidth()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getItemSelectedListener()"/>
         /// </summary>
-        public int DropDownWidth
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.AdapterView.OnItemSelectedListener GetItemSelectedListenerDirect()
         {
-            get { return IExecuteWithSignature<int>("getDropDownWidth", "()I"); } set { IExecuteWithSignature("setDropDownWidth", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListenerDirect, Android.Widget.AdapterView.OnItemSelectedListener>("getItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getValidator()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getOnItemSelectedListener()"/>
         /// </summary>
-        public Android.Widget.AutoCompleteTextView.Validator GetValidator
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></returns>
+        public Android.Widget.AdapterView.OnItemSelectedListener GetOnItemSelectedListener()
         {
-            get { return IExecuteWithSignature<Android.Widget.AutoCompleteTextView.Validator>("getValidator", "()Landroid/widget/AutoCompleteTextView$Validator;"); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getInputMethodMode()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setInputMethodMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getOnItemSelectedListener()"/>
         /// </summary>
-        public int InputMethodMode
+        /// <returns><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></returns>
+        public Android.Widget.AdapterView.OnItemSelectedListener GetOnItemSelectedListenerDirect()
         {
-            get { return IExecuteWithSignature<int>("getInputMethodMode", "()I"); } set { IExecuteWithSignature("setInputMethodMode", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListenerDirect, Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getItemClickListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getValidator()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.AdapterView.OnItemClickListener ItemClickListener
+        /// <returns><see cref="Android.Widget.AutoCompleteTextView.Validator"/></returns>
+        public Android.Widget.AutoCompleteTextView.Validator GetValidator()
         {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListener>("getItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;"); }
+            return IExecuteWithSignature<Android.Widget.AutoCompleteTextView.Validator>("getValidator", "()Landroid/widget/AutoCompleteTextView$Validator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getItemSelectedListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getAdapter()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.AdapterView.OnItemSelectedListener ItemSelectedListener
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        public Android.Widget.ListAdapter GetAdapter()
         {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListener>("getItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;"); }
+            return IExecuteWithSignature<Android.Widget.ListAdapter>("getAdapter", "()Landroid/widget/ListAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getListSelection()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setListSelection(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getAdapter()"/>
         /// </summary>
-        public int ListSelection
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        public Android.Widget.ListAdapter GetAdapterDirect()
         {
-            get { return IExecuteWithSignature<int>("getListSelection", "()I"); } set { IExecuteWithSignature("setListSelection", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getOnItemClickListener()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setOnItemClickListener(android.widget.AdapterView.OnItemClickListener)"/>
-        /// </summary>
-        public Android.Widget.AdapterView.OnItemClickListener OnItemClickListener
-        {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemClickListener>("getOnItemClickListener", "()Landroid/widget/AdapterView$OnItemClickListener;"); } set { IExecuteWithSignature("setOnItemClickListener", "(Landroid/widget/AdapterView$OnItemClickListener;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getOnItemSelectedListener()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setOnItemSelectedListener(android.widget.AdapterView.OnItemSelectedListener)"/>
-        /// </summary>
-        public Android.Widget.AdapterView.OnItemSelectedListener OnItemSelectedListener
-        {
-            get { return IExecuteWithSignature<Android.Widget.AdapterView.OnItemSelectedListener>("getOnItemSelectedListener", "()Landroid/widget/AdapterView$OnItemSelectedListener;"); } set { IExecuteWithSignature("setOnItemSelectedListener", "(Landroid/widget/AdapterView$OnItemSelectedListener;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getThreshold()"/> <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setThreshold(int)"/>
-        /// </summary>
-        public int Threshold
-        {
-            get { return IExecuteWithSignature<int>("getThreshold", "()I"); } set { IExecuteWithSignature("setThreshold", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.ListAdapterDirect, Android.Widget.ListAdapter>("getAdapter", "()Landroid/widget/ListAdapter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#enoughToFilter()"/>
@@ -241,6 +236,78 @@ public void RefreshAutoCompleteResults()
             IExecuteWithSignature("refreshAutoCompleteResults", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownAnchor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDropDownAnchor()
+        {
+            return IExecuteWithSignature<int>("getDropDownAnchor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDropDownHeight()
+        {
+            return IExecuteWithSignature<int>("getDropDownHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownHorizontalOffset()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDropDownHorizontalOffset()
+        {
+            return IExecuteWithSignature<int>("getDropDownHorizontalOffset", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownVerticalOffset()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDropDownVerticalOffset()
+        {
+            return IExecuteWithSignature<int>("getDropDownVerticalOffset", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getDropDownWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDropDownWidth()
+        {
+            return IExecuteWithSignature<int>("getDropDownWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getInputMethodMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInputMethodMode()
+        {
+            return IExecuteWithSignature<int>("getInputMethodMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getListSelection()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetListSelection()
+        {
+            return IExecuteWithSignature<int>("getListSelection", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getThreshold()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetThreshold()
+        {
+            return IExecuteWithSignature<int>("getThreshold", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#getCompletionHint()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetCompletionHint()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getCompletionHint", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#clearListSelection()"/>
         /// </summary>
         public void ClearListSelection()
@@ -277,6 +344,22 @@ public void PerformValidation()
             IExecuteWithSignature("performValidation", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setCompletionHint(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetCompletionHint(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setCompletionHint", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownAnchor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownAnchor(int arg0)
+        {
+            IExecuteWithSignature("setDropDownAnchor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownBackgroundDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -293,6 +376,54 @@ public void SetDropDownBackgroundResource(int arg0)
             IExecuteWithSignature("setDropDownBackgroundResource", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownHeight(int arg0)
+        {
+            IExecuteWithSignature("setDropDownHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownHorizontalOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownHorizontalOffset(int arg0)
+        {
+            IExecuteWithSignature("setDropDownHorizontalOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownVerticalOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownVerticalOffset(int arg0)
+        {
+            IExecuteWithSignature("setDropDownVerticalOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setDropDownWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownWidth(int arg0)
+        {
+            IExecuteWithSignature("setDropDownWidth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setInputMethodMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInputMethodMode(int arg0)
+        {
+            IExecuteWithSignature("setInputMethodMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setListSelection(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetListSelection(int arg0)
+        {
+            IExecuteWithSignature("setListSelection", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setOnDismissListener(android.widget.AutoCompleteTextView.OnDismissListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.AutoCompleteTextView.OnDismissListener"/></param>
@@ -301,6 +432,22 @@ public void SetOnDismissListener(Android.Widget.AutoCompleteTextView.OnDismissLi
             IExecuteWithSignature("setOnDismissListener", "(Landroid/widget/AutoCompleteTextView$OnDismissListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setOnItemClickListener(android.widget.AdapterView.OnItemClickListener)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Widget.AdapterView.OnItemClickListener"/></param>
+        public void SetOnItemClickListener(Android.Widget.AdapterView.OnItemClickListener arg0)
+        {
+            IExecuteWithSignature("setOnItemClickListener", "(Landroid/widget/AdapterView$OnItemClickListener;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setOnItemSelectedListener(android.widget.AdapterView.OnItemSelectedListener)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Widget.AdapterView.OnItemSelectedListener"/></param>
+        public void SetOnItemSelectedListener(Android.Widget.AdapterView.OnItemSelectedListener arg0)
+        {
+            IExecuteWithSignature("setOnItemSelectedListener", "(Landroid/widget/AdapterView$OnItemSelectedListener;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setText(java.lang.CharSequence,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -310,6 +457,14 @@ public void SetText(Java.Lang.CharSequence arg0, bool arg1)
             IExecute("setText", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setThreshold(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetThreshold(int arg0)
+        {
+            IExecuteWithSignature("setThreshold", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.html#setValidator(android.widget.AutoCompleteTextView.Validator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.AutoCompleteTextView.Validator"/></param>
@@ -353,7 +508,7 @@ public partial class OnDismissListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDismiss", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDismissEventHandler));
+                AddEventHandler("onDismiss", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDismissEventHandler));
 
             }
 
@@ -361,7 +516,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/AutoCompleteTextView.OnDismissListener.html#onDismiss()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDismiss"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnDismiss { get; set; } = null;
+            public global::System.Action OnOnDismiss { get; set; } = null;
 
             void OnDismissEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/BaseAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/BaseAdapter.cs
index 93f037fab..07498ac6b 100644
--- a/src/net/Netdroid/Generated/Android/Widget/BaseAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/BaseAdapter.cs
@@ -50,23 +50,23 @@ public partial class BaseAdapter : Android.Widget.IListAdapter, Android.Widget.I
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
-            AddEventHandler("getCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
-            AddEventHandler("getItem", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
-            AddEventHandler("getItemId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
-            AddEventHandler("getDropDownView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetDropDownViewEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("notifyDataSetInvalidated", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("setAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>>>(SetAutofillOptionsEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("getView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
+            AddEventHandler("getCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
+            AddEventHandler("getItem", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
+            AddEventHandler("getItemId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
+            AddEventHandler("getDropDownView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetDropDownViewEventHandler));
+            AddEventHandler("areAllItemsEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("isEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
+            AddEventHandler("getItemViewType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
+            AddEventHandler("getViewTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
+            AddEventHandler("getAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
+            AddEventHandler("notifyDataSetChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
+            AddEventHandler("notifyDataSetInvalidated", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("setAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>>>(SetAutofillOptionsEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
 
         }
 
@@ -74,7 +74,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
 
         void GetViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -99,7 +99,7 @@ public virtual Android.View.View GetView(int arg0, Android.View.View arg1, Andro
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetCount { get; set; } = null;
+        public global::System.Func<int> OnGetCount { get; set; } = null;
 
         void GetCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -121,7 +121,7 @@ public virtual int GetCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItem"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetItem { get; set; } = null;
+        public global::System.Func<int, object> OnGetItem { get; set; } = null;
 
         void GetItemEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -144,7 +144,7 @@ public virtual object GetItem(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemId(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetItemId { get; set; } = null;
+        public global::System.Func<int, long> OnGetItemId { get; set; } = null;
 
         void GetItemIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -167,7 +167,7 @@ public virtual long GetItemId(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getDropDownView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetDropDownView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetDropDownView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetDropDownView { get; set; } = null;
 
         void GetDropDownViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -192,7 +192,7 @@ public virtual Android.View.View GetDropDownView(int arg0, Android.View.View arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
+        public global::System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
 
         void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -214,7 +214,7 @@ public virtual bool AreAllItemsEnabled()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -236,7 +236,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -258,7 +258,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnIsEnabled { get; set; } = null;
+        public global::System.Func<int, bool> OnIsEnabled { get; set; } = null;
 
         void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -281,7 +281,7 @@ public virtual bool IsEnabled(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
+        public global::System.Func<int, int> OnGetItemViewType { get; set; } = null;
 
         void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -304,7 +304,7 @@ public virtual int GetItemViewType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetViewTypeCount { get; set; } = null;
 
         void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -326,7 +326,7 @@ public virtual int GetViewTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
 
         void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -348,7 +348,7 @@ public virtual Java.Lang.CharSequence[] GetAutofillOptions()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetChanged { get; set; } = null;
+        public global::System.Action OnNotifyDataSetChanged { get; set; } = null;
 
         void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -368,7 +368,7 @@ public virtual void NotifyDataSetChanged()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNotifyDataSetInvalidated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetInvalidated { get; set; } = null;
+        public global::System.Action OnNotifyDataSetInvalidated { get; set; } = null;
 
         void NotifyDataSetInvalidatedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -388,7 +388,7 @@ public virtual void NotifyDataSetInvalidated()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -409,12 +409,12 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<> OnSetAutofillOptions { get; set; } = null;
+        public global::System.Action<Java.Lang.CharSequence[]> OnSetAutofillOptions { get; set; } = null;
 
         void SetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>> data)
         {
             var methodToExecute = (OnSetAutofillOptions != null) ? OnSetAutofillOptions : SetAutofillOptions;
-            methodToExecute.Invoke();
+            methodToExecute.Invoke(data.EventData.TypedEventData);
         }
 
         /// <summary>
@@ -430,7 +430,7 @@ public virtual void SetAutofillOptions(params Java.Lang.CharSequence[] arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -478,27 +478,6 @@ public partial class BaseAdapterDirect : Android.Widget.IListAdapter, Android.Wi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/> <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getAutofillOptions", "()[Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setAutofillOptions", "([Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecute<int>("getCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecuteWithSignature<int>("getViewTypeCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -510,6 +489,14 @@ public override Android.View.View GetView(int arg0, Android.View.View arg1, Andr
             return IExecute<Android.View.View>("getView", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetCount()
+        {
+            return IExecute<int>("getCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -581,6 +568,22 @@ public override int GetItemViewType(int arg0)
             return IExecuteWithSignature<int>("getItemViewType", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetViewTypeCount()
+        {
+            return IExecuteWithSignature<int>("getViewTypeCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public override Java.Lang.CharSequence[] GetAutofillOptions()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.CharSequence>("getAutofillOptions", "()[Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
         /// </summary>
         public override void NotifyDataSetChanged()
@@ -603,6 +606,14 @@ public override void RegisterDataSetObserver(Android.Database.DataSetObserver ar
             IExecuteWithSignature("registerDataSetObserver", "(Landroid/database/DataSetObserver;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public override void SetAutofillOptions(params Java.Lang.CharSequence[] arg0)
+        {
+            if (arg0.Length == 0) IExecuteWithSignature("setAutofillOptions", "([Ljava/lang/CharSequence;)V"); else IExecuteWithSignature("setAutofillOptions", "([Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/BaseExpandableListAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/BaseExpandableListAdapter.cs
index 8c65da8f8..54365e264 100644
--- a/src/net/Netdroid/Generated/Android/Widget/BaseExpandableListAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/BaseExpandableListAdapter.cs
@@ -50,30 +50,30 @@ public partial class BaseExpandableListAdapter : Android.Widget.IExpandableListA
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getChildView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildViewEventHandler));
-            AddEventHandler("getGroupView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupViewEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isChildSelectable", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsChildSelectableEventHandler));
-            AddEventHandler("getChildrenCount", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildrenCountEventHandler));
-            AddEventHandler("getGroupCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupCountEventHandler));
-            AddEventHandler("getChild", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildEventHandler));
-            AddEventHandler("getGroup", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupEventHandler));
-            AddEventHandler("getChildId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildIdEventHandler));
-            AddEventHandler("getGroupId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupIdEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getChildType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildTypeEventHandler));
-            AddEventHandler("getChildTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetChildTypeCountEventHandler));
-            AddEventHandler("getGroupType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupTypeEventHandler));
-            AddEventHandler("getGroupTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupTypeCountEventHandler));
-            AddEventHandler("getCombinedChildId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedChildIdEventHandler));
-            AddEventHandler("getCombinedGroupId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedGroupIdEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("notifyDataSetInvalidated", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
-            AddEventHandler("onGroupCollapsed", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupCollapsedEventHandler));
-            AddEventHandler("onGroupExpanded", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("getChildView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildViewEventHandler));
+            AddEventHandler("getGroupView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupViewEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isChildSelectable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsChildSelectableEventHandler));
+            AddEventHandler("getChildrenCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildrenCountEventHandler));
+            AddEventHandler("getGroupCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupCountEventHandler));
+            AddEventHandler("getChild", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildEventHandler));
+            AddEventHandler("getGroup", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupEventHandler));
+            AddEventHandler("getChildId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildIdEventHandler));
+            AddEventHandler("getGroupId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupIdEventHandler));
+            AddEventHandler("areAllItemsEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("getChildType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildTypeEventHandler));
+            AddEventHandler("getChildTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetChildTypeCountEventHandler));
+            AddEventHandler("getGroupType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupTypeEventHandler));
+            AddEventHandler("getGroupTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupTypeCountEventHandler));
+            AddEventHandler("getCombinedChildId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedChildIdEventHandler));
+            AddEventHandler("getCombinedGroupId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedGroupIdEventHandler));
+            AddEventHandler("notifyDataSetChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
+            AddEventHandler("notifyDataSetInvalidated", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
+            AddEventHandler("onGroupCollapsed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupCollapsedEventHandler));
+            AddEventHandler("onGroupExpanded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandedEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
 
         }
 
@@ -81,7 +81,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChildView(int,int,boolean,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChildView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, bool, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetChildView { get; set; } = null;
+        public global::System.Func<int, int, bool, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetChildView { get; set; } = null;
 
         void GetChildViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -108,7 +108,7 @@ public virtual Android.View.View GetChildView(int arg0, int arg1, bool arg2, And
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupView(int,boolean,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroupView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetGroupView { get; set; } = null;
+        public global::System.Func<int, bool, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetGroupView { get; set; } = null;
 
         void GetGroupViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -134,7 +134,7 @@ public virtual Android.View.View GetGroupView(int arg0, bool arg1, Android.View.
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -156,7 +156,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#isChildSelectable(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsChildSelectable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, bool> OnIsChildSelectable { get; set; } = null;
+        public global::System.Func<int, int, bool> OnIsChildSelectable { get; set; } = null;
 
         void IsChildSelectableEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -180,7 +180,7 @@ public virtual bool IsChildSelectable(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChildrenCount(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChildrenCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetChildrenCount { get; set; } = null;
+        public global::System.Func<int, int> OnGetChildrenCount { get; set; } = null;
 
         void GetChildrenCountEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -203,7 +203,7 @@ public virtual int GetChildrenCount(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroupCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetGroupCount { get; set; } = null;
+        public global::System.Func<int> OnGetGroupCount { get; set; } = null;
 
         void GetGroupCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -225,7 +225,7 @@ public virtual int GetGroupCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChild(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChild"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, object> OnGetChild { get; set; } = null;
+        public global::System.Func<int, int, object> OnGetChild { get; set; } = null;
 
         void GetChildEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -249,7 +249,7 @@ public virtual object GetChild(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroup(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroup"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetGroup { get; set; } = null;
+        public global::System.Func<int, object> OnGetGroup { get; set; } = null;
 
         void GetGroupEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -272,7 +272,7 @@ public virtual object GetGroup(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChildId(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChildId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, long> OnGetChildId { get; set; } = null;
+        public global::System.Func<int, int, long> OnGetChildId { get; set; } = null;
 
         void GetChildIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -296,7 +296,7 @@ public virtual long GetChildId(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupId(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroupId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetGroupId { get; set; } = null;
+        public global::System.Func<int, long> OnGetGroupId { get; set; } = null;
 
         void GetGroupIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -319,7 +319,7 @@ public virtual long GetGroupId(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
+        public global::System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
 
         void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -341,7 +341,7 @@ public virtual bool AreAllItemsEnabled()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -363,7 +363,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChildType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, int> OnGetChildType { get; set; } = null;
+        public global::System.Func<int, int, int> OnGetChildType { get; set; } = null;
 
         void GetChildTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -387,7 +387,7 @@ public virtual int GetChildType(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChildTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetChildTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetChildTypeCount { get; set; } = null;
 
         void GetChildTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -409,7 +409,7 @@ public virtual int GetChildTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroupType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetGroupType { get; set; } = null;
+        public global::System.Func<int, int> OnGetGroupType { get; set; } = null;
 
         void GetGroupTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -432,7 +432,7 @@ public virtual int GetGroupType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroupTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetGroupTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetGroupTypeCount { get; set; } = null;
 
         void GetGroupTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -454,7 +454,7 @@ public virtual int GetGroupTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCombinedChildId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long, long> OnGetCombinedChildId { get; set; } = null;
+        public global::System.Func<long, long, long> OnGetCombinedChildId { get; set; } = null;
 
         void GetCombinedChildIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -478,7 +478,7 @@ public virtual long GetCombinedChildId(long arg0, long arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCombinedGroupId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnGetCombinedGroupId { get; set; } = null;
+        public global::System.Func<long, long> OnGetCombinedGroupId { get; set; } = null;
 
         void GetCombinedGroupIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -501,7 +501,7 @@ public virtual long GetCombinedGroupId(long arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#notifyDataSetChanged()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetChanged { get; set; } = null;
+        public global::System.Action OnNotifyDataSetChanged { get; set; } = null;
 
         void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -521,7 +521,7 @@ public virtual void NotifyDataSetChanged()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#notifyDataSetInvalidated()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNotifyDataSetInvalidated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetInvalidated { get; set; } = null;
+        public global::System.Action OnNotifyDataSetInvalidated { get; set; } = null;
 
         void NotifyDataSetInvalidatedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -541,7 +541,7 @@ public virtual void NotifyDataSetInvalidated()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupCollapsed(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnGroupCollapsed"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupCollapsed { get; set; } = null;
+        public global::System.Action<int> OnOnGroupCollapsed { get; set; } = null;
 
         void OnGroupCollapsedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -562,7 +562,7 @@ public virtual void OnGroupCollapsed(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnGroupExpanded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupExpanded { get; set; } = null;
+        public global::System.Action<int> OnOnGroupExpanded { get; set; } = null;
 
         void OnGroupExpandedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -583,7 +583,7 @@ public virtual void OnGroupExpanded(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -604,7 +604,7 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -652,27 +652,6 @@ public partial class BaseExpandableListAdapterDirect : Android.Widget.IExpandabl
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/> 
-        /// </summary>
-        public int ChildTypeCount
-        {
-            get { return IExecuteWithSignature<int>("getChildTypeCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupCount()"/> 
-        /// </summary>
-        public int GroupCount
-        {
-            get { return IExecute<int>("getGroupCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/> 
-        /// </summary>
-        public int GroupTypeCount
-        {
-            get { return IExecuteWithSignature<int>("getGroupTypeCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChildView(int,int,boolean,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -725,6 +704,14 @@ public override int GetChildrenCount(int arg0)
             return IExecute<int>("getChildrenCount", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetGroupCount()
+        {
+            return IExecute<int>("getGroupCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChild(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -789,6 +776,14 @@ public override int GetChildType(int arg0, int arg1)
             return IExecute<int>("getChildType", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetChildTypeCount()
+        {
+            return IExecuteWithSignature<int>("getChildTypeCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -798,6 +793,14 @@ public override int GetGroupType(int arg0)
             return IExecuteWithSignature<int>("getGroupType", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetGroupTypeCount()
+        {
+            return IExecuteWithSignature<int>("getGroupTypeCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/CalendarView.cs b/src/net/Netdroid/Generated/Android/Widget/CalendarView.cs
index 8337f97d3..7b24d3a8d 100644
--- a/src/net/Netdroid/Generated/Android/Widget/CalendarView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/CalendarView.cs
@@ -84,110 +84,124 @@ public CalendarView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getDate()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setDate(long)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getSelectedDateVerticalBar()"/>
         /// </summary>
-        public long Date
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Drawable.Drawable GetSelectedDateVerticalBar()
         {
-            get { return IExecuteWithSignature<long>("getDate", "()J"); } set { IExecuteWithSignature("setDate", "(J)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getSelectedDateVerticalBar", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getDateTextAppearance()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setDateTextAppearance(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getShowWeekNumber()"/>
         /// </summary>
-        public int DateTextAppearance
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetShowWeekNumber()
         {
-            get { return IExecuteWithSignature<int>("getDateTextAppearance", "()I"); } set { IExecuteWithSignature("setDateTextAppearance", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getShowWeekNumber", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getFirstDayOfWeek()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setFirstDayOfWeek(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getDateTextAppearance()"/>
         /// </summary>
-        public int FirstDayOfWeek
+        /// <returns><see cref="int"/></returns>
+        public int GetDateTextAppearance()
         {
-            get { return IExecuteWithSignature<int>("getFirstDayOfWeek", "()I"); } set { IExecuteWithSignature("setFirstDayOfWeek", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDateTextAppearance", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getFocusedMonthDateColor()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setFocusedMonthDateColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getFirstDayOfWeek()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int FocusedMonthDateColor
+        /// <returns><see cref="int"/></returns>
+        public int GetFirstDayOfWeek()
         {
-            get { return IExecuteWithSignature<int>("getFocusedMonthDateColor", "()I"); } set { IExecuteWithSignature("setFocusedMonthDateColor", "(I)V", value); }
+            return IExecuteWithSignature<int>("getFirstDayOfWeek", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getMaxDate()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setMaxDate(long)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getFocusedMonthDateColor()"/>
         /// </summary>
-        public long MaxDate
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetFocusedMonthDateColor()
         {
-            get { return IExecuteWithSignature<long>("getMaxDate", "()J"); } set { IExecuteWithSignature("setMaxDate", "(J)V", value); }
+            return IExecuteWithSignature<int>("getFocusedMonthDateColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getMinDate()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setMinDate(long)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getSelectedWeekBackgroundColor()"/>
         /// </summary>
-        public long MinDate
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSelectedWeekBackgroundColor()
         {
-            get { return IExecuteWithSignature<long>("getMinDate", "()J"); } set { IExecuteWithSignature("setMinDate", "(J)V", value); }
+            return IExecuteWithSignature<int>("getSelectedWeekBackgroundColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getSelectedDateVerticalBar()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getShownWeekCount()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Drawable.Drawable SelectedDateVerticalBar
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetShownWeekCount()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getSelectedDateVerticalBar", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<int>("getShownWeekCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getSelectedWeekBackgroundColor()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setSelectedWeekBackgroundColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getUnfocusedMonthDateColor()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int SelectedWeekBackgroundColor
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetUnfocusedMonthDateColor()
         {
-            get { return IExecuteWithSignature<int>("getSelectedWeekBackgroundColor", "()I"); } set { IExecuteWithSignature("setSelectedWeekBackgroundColor", "(I)V", value); }
+            return IExecuteWithSignature<int>("getUnfocusedMonthDateColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getShownWeekCount()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setShownWeekCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getWeekDayTextAppearance()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int ShownWeekCount
+        /// <returns><see cref="int"/></returns>
+        public int GetWeekDayTextAppearance()
         {
-            get { return IExecuteWithSignature<int>("getShownWeekCount", "()I"); } set { IExecuteWithSignature("setShownWeekCount", "(I)V", value); }
+            return IExecuteWithSignature<int>("getWeekDayTextAppearance", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getShowWeekNumber()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setShowWeekNumber(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getWeekNumberColor()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool ShowWeekNumber
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetWeekNumberColor()
         {
-            get { return IExecuteWithSignature<bool>("getShowWeekNumber", "()Z"); } set { IExecuteWithSignature("setShowWeekNumber", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getWeekNumberColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getUnfocusedMonthDateColor()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setUnfocusedMonthDateColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getWeekSeparatorLineColor()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int UnfocusedMonthDateColor
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetWeekSeparatorLineColor()
         {
-            get { return IExecuteWithSignature<int>("getUnfocusedMonthDateColor", "()I"); } set { IExecuteWithSignature("setUnfocusedMonthDateColor", "(I)V", value); }
+            return IExecuteWithSignature<int>("getWeekSeparatorLineColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getWeekDayTextAppearance()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setWeekDayTextAppearance(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getDate()"/>
         /// </summary>
-        public int WeekDayTextAppearance
+        /// <returns><see cref="long"/></returns>
+        public long GetDate()
         {
-            get { return IExecuteWithSignature<int>("getWeekDayTextAppearance", "()I"); } set { IExecuteWithSignature("setWeekDayTextAppearance", "(I)V", value); }
+            return IExecuteWithSignature<long>("getDate", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getWeekNumberColor()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setWeekNumberColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getMaxDate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int WeekNumberColor
+        /// <returns><see cref="long"/></returns>
+        public long GetMaxDate()
         {
-            get { return IExecuteWithSignature<int>("getWeekNumberColor", "()I"); } set { IExecuteWithSignature("setWeekNumberColor", "(I)V", value); }
+            return IExecuteWithSignature<long>("getMaxDate", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getWeekSeparatorLineColor()"/> <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setWeekSeparatorLineColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#getMinDate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int WeekSeparatorLineColor
+        /// <returns><see cref="long"/></returns>
+        public long GetMinDate()
         {
-            get { return IExecuteWithSignature<int>("getWeekSeparatorLineColor", "()I"); } set { IExecuteWithSignature("setWeekSeparatorLineColor", "(I)V", value); }
+            return IExecuteWithSignature<long>("getMinDate", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setDate(long,boolean,boolean)"/>
@@ -200,6 +214,55 @@ public void SetDate(long arg0, bool arg1, bool arg2)
             IExecute("setDate", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setDate(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetDate(long arg0)
+        {
+            IExecuteWithSignature("setDate", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setDateTextAppearance(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDateTextAppearance(int arg0)
+        {
+            IExecuteWithSignature("setDateTextAppearance", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setFirstDayOfWeek(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFirstDayOfWeek(int arg0)
+        {
+            IExecuteWithSignature("setFirstDayOfWeek", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setFocusedMonthDateColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetFocusedMonthDateColor(int arg0)
+        {
+            IExecuteWithSignature("setFocusedMonthDateColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setMaxDate(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetMaxDate(long arg0)
+        {
+            IExecuteWithSignature("setMaxDate", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setMinDate(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetMinDate(long arg0)
+        {
+            IExecuteWithSignature("setMinDate", "(J)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setOnDateChangeListener(android.widget.CalendarView.OnDateChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.CalendarView.OnDateChangeListener"/></param>
@@ -211,7 +274,7 @@ public void SetOnDateChangeListener(Android.Widget.CalendarView.OnDateChangeList
         /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setSelectedDateVerticalBar(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSelectedDateVerticalBar(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setSelectedDateVerticalBar", "(Landroid/graphics/drawable/Drawable;)V", arg0);
@@ -220,11 +283,73 @@ public void SetSelectedDateVerticalBar(Android.Graphics.Drawable.Drawable arg0)
         /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setSelectedDateVerticalBar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSelectedDateVerticalBar(int arg0)
         {
             IExecuteWithSignature("setSelectedDateVerticalBar", "(I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setSelectedWeekBackgroundColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetSelectedWeekBackgroundColor(int arg0)
+        {
+            IExecuteWithSignature("setSelectedWeekBackgroundColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setShownWeekCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetShownWeekCount(int arg0)
+        {
+            IExecuteWithSignature("setShownWeekCount", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setShowWeekNumber(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetShowWeekNumber(bool arg0)
+        {
+            IExecuteWithSignature("setShowWeekNumber", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setUnfocusedMonthDateColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetUnfocusedMonthDateColor(int arg0)
+        {
+            IExecuteWithSignature("setUnfocusedMonthDateColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setWeekDayTextAppearance(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetWeekDayTextAppearance(int arg0)
+        {
+            IExecuteWithSignature("setWeekDayTextAppearance", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setWeekNumberColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetWeekNumberColor(int arg0)
+        {
+            IExecuteWithSignature("setWeekNumberColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CalendarView.html#setWeekSeparatorLineColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetWeekSeparatorLineColor(int arg0)
+        {
+            IExecuteWithSignature("setWeekSeparatorLineColor", "(I)V", arg0);
+        }
 
         #endregion
 
@@ -254,7 +379,7 @@ public partial class OnDateChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSelectedDayChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.CalendarView>>>(OnSelectedDayChangeEventHandler));
+                AddEventHandler("onSelectedDayChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.CalendarView>>>(OnSelectedDayChangeEventHandler));
 
             }
 
@@ -262,7 +387,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/CalendarView.OnDateChangeListener.html#onSelectedDayChange(android.widget.CalendarView,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSelectedDayChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.CalendarView, int, int, int> OnOnSelectedDayChange { get; set; } = null;
+            public global::System.Action<Android.Widget.CalendarView, int, int, int> OnOnSelectedDayChange { get; set; } = null;
 
             void OnSelectedDayChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.CalendarView>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/CheckedTextView.cs b/src/net/Netdroid/Generated/Android/Widget/CheckedTextView.cs
index 6a81b059e..ea28ae1ff 100644
--- a/src/net/Netdroid/Generated/Android/Widget/CheckedTextView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/CheckedTextView.cs
@@ -88,32 +88,36 @@ public CheckedTextView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#getCheckMarkDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#getCheckMarkTintList()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable CheckMarkDrawable
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetCheckMarkTintList()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getCheckMarkDrawable", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getCheckMarkTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#getCheckMarkTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#setCheckMarkTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#getCheckMarkTintBlendMode()"/>
         /// </summary>
-        public Android.Graphics.BlendMode CheckMarkTintBlendMode
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetCheckMarkTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getCheckMarkTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setCheckMarkTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getCheckMarkTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#getCheckMarkTintList()"/> <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#setCheckMarkTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#getCheckMarkDrawable()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList CheckMarkTintList
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetCheckMarkDrawable()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getCheckMarkTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setCheckMarkTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getCheckMarkDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#getCheckMarkTintMode()"/> <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#setCheckMarkTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#getCheckMarkTintMode()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode CheckMarkTintMode
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetCheckMarkTintMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getCheckMarkTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setCheckMarkTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getCheckMarkTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#isChecked()"/>
@@ -148,6 +152,30 @@ public void SetCheckMarkDrawable(int arg0)
             IExecuteWithSignature("setCheckMarkDrawable", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#setCheckMarkTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetCheckMarkTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setCheckMarkTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#setCheckMarkTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetCheckMarkTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setCheckMarkTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#setCheckMarkTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetCheckMarkTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setCheckMarkTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CheckedTextView.html#toggle()"/>
         /// </summary>
         public void Toggle()
diff --git a/src/net/Netdroid/Generated/Android/Widget/Chronometer.cs b/src/net/Netdroid/Generated/Android/Widget/Chronometer.cs
index 8635860b6..8b315c29a 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Chronometer.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Chronometer.cs
@@ -84,25 +84,20 @@ public Chronometer(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#getBase()"/> <see href="https://developer.android.com/reference/android/widget/Chronometer.html#setBase(long)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#getOnChronometerTickListener()"/>
         /// </summary>
-        public long Base
+        /// <returns><see cref="Android.Widget.Chronometer.OnChronometerTickListener"/></returns>
+        public Android.Widget.Chronometer.OnChronometerTickListener GetOnChronometerTickListener()
         {
-            get { return IExecuteWithSignature<long>("getBase", "()J"); } set { IExecuteWithSignature("setBase", "(J)V", value); }
+            return IExecuteWithSignature<Android.Widget.Chronometer.OnChronometerTickListener>("getOnChronometerTickListener", "()Landroid/widget/Chronometer$OnChronometerTickListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#getFormat()"/> <see href="https://developer.android.com/reference/android/widget/Chronometer.html#setFormat(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#getOnChronometerTickListener()"/>
         /// </summary>
-        public Java.Lang.String Format
+        /// <returns><see cref="Android.Widget.Chronometer.OnChronometerTickListener"/></returns>
+        public Android.Widget.Chronometer.OnChronometerTickListener GetOnChronometerTickListenerDirect()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFormat", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#getOnChronometerTickListener()"/> 
-        /// </summary>
-        public Android.Widget.Chronometer.OnChronometerTickListener GetOnChronometerTickListener
-        {
-            get { return IExecuteWithSignature<Android.Widget.Chronometer.OnChronometerTickListener>("getOnChronometerTickListener", "()Landroid/widget/Chronometer$OnChronometerTickListener;"); }
+            return IExecuteWithSignature<Android.Widget.Chronometer.OnChronometerTickListenerDirect, Android.Widget.Chronometer.OnChronometerTickListener>("getOnChronometerTickListener", "()Landroid/widget/Chronometer$OnChronometerTickListener;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#isCountDown()"/>
@@ -121,6 +116,30 @@ public bool IsTheFinalCountDown()
             return IExecuteWithSignature<bool>("isTheFinalCountDown", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#getFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFormat()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#getBase()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetBase()
+        {
+            return IExecuteWithSignature<long>("getBase", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#setBase(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetBase(long arg0)
+        {
+            IExecuteWithSignature("setBase", "(J)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#setCountDown(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -129,6 +148,14 @@ public void SetCountDown(bool arg0)
             IExecuteWithSignature("setCountDown", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#setFormat(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFormat(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFormat", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Chronometer.html#setOnChronometerTickListener(android.widget.Chronometer.OnChronometerTickListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.Chronometer.OnChronometerTickListener"/></param>
@@ -179,7 +206,7 @@ public partial class OnChronometerTickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onChronometerTick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.Chronometer>>>(OnChronometerTickEventHandler));
+                AddEventHandler("onChronometerTick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.Chronometer>>>(OnChronometerTickEventHandler));
 
             }
 
@@ -187,7 +214,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/Chronometer.OnChronometerTickListener.html#onChronometerTick(android.widget.Chronometer)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnChronometerTick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.Chronometer> OnOnChronometerTick { get; set; } = null;
+            public global::System.Action<Android.Widget.Chronometer> OnOnChronometerTick { get; set; } = null;
 
             void OnChronometerTickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.Chronometer>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/CompoundButton.cs b/src/net/Netdroid/Generated/Android/Widget/CompoundButton.cs
index f8b5cd986..bcd62f5e4 100644
--- a/src/net/Netdroid/Generated/Android/Widget/CompoundButton.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/CompoundButton.cs
@@ -88,32 +88,36 @@ public CompoundButton(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#getButtonDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#getButtonTintList()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable ButtonDrawable
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetButtonTintList()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getButtonDrawable", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getButtonTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#getButtonTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#setButtonTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#getButtonTintBlendMode()"/>
         /// </summary>
-        public Android.Graphics.BlendMode ButtonTintBlendMode
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetButtonTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getButtonTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setButtonTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getButtonTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#getButtonTintList()"/> <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#setButtonTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#getButtonDrawable()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList ButtonTintList
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetButtonDrawable()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getButtonTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setButtonTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getButtonDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#getButtonTintMode()"/> <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#setButtonTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#getButtonTintMode()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode ButtonTintMode
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetButtonTintMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getButtonTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setButtonTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getButtonTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#isChecked()"/>
@@ -148,6 +152,30 @@ public void SetButtonIcon(Android.Graphics.Drawable.Icon arg0)
             IExecuteWithSignature("setButtonIcon", "(Landroid/graphics/drawable/Icon;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#setButtonTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetButtonTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setButtonTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#setButtonTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetButtonTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setButtonTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#setButtonTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetButtonTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setButtonTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CompoundButton.html#setChecked(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -199,7 +227,7 @@ public partial class OnCheckedChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCheckedChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.CompoundButton>>>(OnCheckedChangedEventHandler));
+                AddEventHandler("onCheckedChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.CompoundButton>>>(OnCheckedChangedEventHandler));
 
             }
 
@@ -207,7 +235,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/CompoundButton.OnCheckedChangeListener.html#onCheckedChanged(android.widget.CompoundButton,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCheckedChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.CompoundButton, bool> OnOnCheckedChanged { get; set; } = null;
+            public global::System.Action<Android.Widget.CompoundButton, bool> OnOnCheckedChanged { get; set; } = null;
 
             void OnCheckedChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.CompoundButton>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/CursorAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/CursorAdapter.cs
index 192e2a215..d3030d91c 100644
--- a/src/net/Netdroid/Generated/Android/Widget/CursorAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/CursorAdapter.cs
@@ -50,30 +50,30 @@ public partial class CursorAdapter : Android.Widget.IFilterable, Android.Widget.
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("newView", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(NewViewEventHandler));
-            AddEventHandler("bindView", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BindViewEventHandler));
-            AddEventHandler("getDropDownViewTheme", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDropDownViewThemeEventHandler));
-            AddEventHandler("getCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCursorEventHandler));
-            AddEventHandler("runQueryOnBackgroundThread", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(RunQueryOnBackgroundThreadEventHandler));
-            AddEventHandler("swapCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(SwapCursorEventHandler));
-            AddEventHandler("newDropDownView", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(NewDropDownViewEventHandler));
-            AddEventHandler("getFilter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
-            AddEventHandler("getFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterQueryProviderEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("convertToString", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ConvertToStringEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("notifyDataSetInvalidated", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("setAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>>>(SetAutofillOptionsEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("changeCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ChangeCursorEventHandler));
-            AddEventHandler("setDropDownViewTheme", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>>>(SetDropDownViewThemeEventHandler));
-            AddEventHandler("setFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>>>(SetFilterQueryProviderEventHandler));
+            AddEventHandler("newView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(NewViewEventHandler));
+            AddEventHandler("bindView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BindViewEventHandler));
+            AddEventHandler("getDropDownViewTheme", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDropDownViewThemeEventHandler));
+            AddEventHandler("getCursor", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCursorEventHandler));
+            AddEventHandler("runQueryOnBackgroundThread", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(RunQueryOnBackgroundThreadEventHandler));
+            AddEventHandler("swapCursor", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(SwapCursorEventHandler));
+            AddEventHandler("newDropDownView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(NewDropDownViewEventHandler));
+            AddEventHandler("getFilter", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
+            AddEventHandler("getFilterQueryProvider", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterQueryProviderEventHandler));
+            AddEventHandler("areAllItemsEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("isEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
+            AddEventHandler("getItemViewType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
+            AddEventHandler("getViewTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
+            AddEventHandler("convertToString", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ConvertToStringEventHandler));
+            AddEventHandler("getAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
+            AddEventHandler("notifyDataSetChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
+            AddEventHandler("notifyDataSetInvalidated", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("setAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>>>(SetAutofillOptionsEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("changeCursor", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ChangeCursorEventHandler));
+            AddEventHandler("setDropDownViewTheme", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>>>(SetDropDownViewThemeEventHandler));
+            AddEventHandler("setFilterQueryProvider", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>>>(SetFilterQueryProviderEventHandler));
 
         }
 
@@ -81,7 +81,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#newView(android.content.Context,android.database.Cursor,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnNewView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context, Android.Database.Cursor, Android.View.ViewGroup, Android.View.View> OnNewView { get; set; } = null;
+        public global::System.Func<Android.Content.Context, Android.Database.Cursor, Android.View.ViewGroup, Android.View.View> OnNewView { get; set; } = null;
 
         void NewViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Context>> data)
         {
@@ -106,7 +106,7 @@ public virtual Android.View.View NewView(Android.Content.Context arg0, Android.D
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#bindView(android.view.View,android.content.Context,android.database.Cursor)"/>
         /// </summary>
         /// <remarks>If <see cref="OnBindView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Content.Context, Android.Database.Cursor> OnBindView { get; set; } = null;
+        public global::System.Action<Android.View.View, Android.Content.Context, Android.Database.Cursor> OnBindView { get; set; } = null;
 
         void BindViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
         {
@@ -129,7 +129,7 @@ public virtual void BindView(Android.View.View arg0, Android.Content.Context arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetDropDownViewTheme"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Res.Resources.Theme> OnGetDropDownViewTheme { get; set; } = null;
+        public global::System.Func<Android.Content.Res.Resources.Theme> OnGetDropDownViewTheme { get; set; } = null;
 
         void GetDropDownViewThemeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -151,7 +151,7 @@ public virtual Android.Content.Res.Resources.Theme GetDropDownViewTheme()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor> OnGetCursor { get; set; } = null;
+        public global::System.Func<Android.Database.Cursor> OnGetCursor { get; set; } = null;
 
         void GetCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -173,7 +173,7 @@ public virtual Android.Database.Cursor GetCursor()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRunQueryOnBackgroundThread"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.Database.Cursor> OnRunQueryOnBackgroundThread { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence, Android.Database.Cursor> OnRunQueryOnBackgroundThread { get; set; } = null;
 
         void RunQueryOnBackgroundThreadEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
         {
@@ -196,7 +196,7 @@ public virtual Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.Char
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#swapCursor(android.database.Cursor)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSwapCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor, Android.Database.Cursor> OnSwapCursor { get; set; } = null;
+        public global::System.Func<Android.Database.Cursor, Android.Database.Cursor> OnSwapCursor { get; set; } = null;
 
         void SwapCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
         {
@@ -219,7 +219,7 @@ public virtual Android.Database.Cursor SwapCursor(Android.Database.Cursor arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#newDropDownView(android.content.Context,android.database.Cursor,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnNewDropDownView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context, Android.Database.Cursor, Android.View.ViewGroup, Android.View.View> OnNewDropDownView { get; set; } = null;
+        public global::System.Func<Android.Content.Context, Android.Database.Cursor, Android.View.ViewGroup, Android.View.View> OnNewDropDownView { get; set; } = null;
 
         void NewDropDownViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Context>> data)
         {
@@ -244,7 +244,7 @@ public virtual Android.View.View NewDropDownView(Android.Content.Context arg0, A
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
+        public global::System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
 
         void GetFilterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -266,7 +266,7 @@ public virtual Android.Widget.Filter GetFilter()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.FilterQueryProvider> OnGetFilterQueryProvider { get; set; } = null;
+        public global::System.Func<Android.Widget.FilterQueryProvider> OnGetFilterQueryProvider { get; set; } = null;
 
         void GetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -288,7 +288,7 @@ public virtual Android.Widget.FilterQueryProvider GetFilterQueryProvider()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
+        public global::System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
 
         void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -310,7 +310,7 @@ public virtual bool AreAllItemsEnabled()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -332,7 +332,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnIsEnabled { get; set; } = null;
+        public global::System.Func<int, bool> OnIsEnabled { get; set; } = null;
 
         void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -355,7 +355,7 @@ public virtual bool IsEnabled(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
+        public global::System.Func<int, int> OnGetItemViewType { get; set; } = null;
 
         void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -378,7 +378,7 @@ public virtual int GetItemViewType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetViewTypeCount { get; set; } = null;
 
         void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -400,7 +400,7 @@ public virtual int GetViewTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#convertToString(android.database.Cursor)"/>
         /// </summary>
         /// <remarks>If <see cref="OnConvertToString"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor, Java.Lang.CharSequence> OnConvertToString { get; set; } = null;
+        public global::System.Func<Android.Database.Cursor, Java.Lang.CharSequence> OnConvertToString { get; set; } = null;
 
         void ConvertToStringEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
         {
@@ -423,7 +423,7 @@ public virtual Java.Lang.CharSequence ConvertToString(Android.Database.Cursor ar
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
 
         void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -445,7 +445,7 @@ public virtual Java.Lang.CharSequence[] GetAutofillOptions()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetChanged { get; set; } = null;
+        public global::System.Action OnNotifyDataSetChanged { get; set; } = null;
 
         void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -465,7 +465,7 @@ public virtual void NotifyDataSetChanged()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNotifyDataSetInvalidated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetInvalidated { get; set; } = null;
+        public global::System.Action OnNotifyDataSetInvalidated { get; set; } = null;
 
         void NotifyDataSetInvalidatedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -485,7 +485,7 @@ public virtual void NotifyDataSetInvalidated()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -506,12 +506,12 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<> OnSetAutofillOptions { get; set; } = null;
+        public global::System.Action<Java.Lang.CharSequence[]> OnSetAutofillOptions { get; set; } = null;
 
         void SetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>> data)
         {
             var methodToExecute = (OnSetAutofillOptions != null) ? OnSetAutofillOptions : SetAutofillOptions;
-            methodToExecute.Invoke();
+            methodToExecute.Invoke(data.EventData.TypedEventData);
         }
 
         /// <summary>
@@ -527,7 +527,7 @@ public virtual void SetAutofillOptions(params Java.Lang.CharSequence[] arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -548,7 +548,7 @@ public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver a
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#changeCursor(android.database.Cursor)"/>
         /// </summary>
         /// <remarks>If <see cref="OnChangeCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnChangeCursor { get; set; } = null;
+        public global::System.Action<Android.Database.Cursor> OnChangeCursor { get; set; } = null;
 
         void ChangeCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
         {
@@ -569,7 +569,7 @@ public virtual void ChangeCursor(Android.Database.Cursor arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetDropDownViewTheme"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Content.Res.Resources.Theme> OnSetDropDownViewTheme { get; set; } = null;
+        public global::System.Action<Android.Content.Res.Resources.Theme> OnSetDropDownViewTheme { get; set; } = null;
 
         void SetDropDownViewThemeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>> data)
         {
@@ -590,7 +590,7 @@ public virtual void SetDropDownViewTheme(Android.Content.Res.Resources.Theme arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.FilterQueryProvider> OnSetFilterQueryProvider { get; set; } = null;
+        public global::System.Action<Android.Widget.FilterQueryProvider> OnSetFilterQueryProvider { get; set; } = null;
 
         void SetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>> data)
         {
@@ -638,48 +638,6 @@ public partial class CursorAdapterDirect : Android.Widget.IFilterable, Android.W
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/> <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); } set { IExecute("setAutofillOptions", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/> 
-        /// </summary>
-        public Android.Database.Cursor Cursor
-        {
-            get { return IExecuteWithSignature<Android.Database.Cursor>("getCursor", "()Landroid/database/Cursor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/> <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
-        /// </summary>
-        public Android.Content.Res.Resources.Theme DropDownViewTheme
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getDropDownViewTheme", "()Landroid/content/res/Resources$Theme;"); } set { IExecuteWithSignature("setDropDownViewTheme", "(Landroid/content/res/Resources$Theme;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/> 
-        /// </summary>
-        public Android.Widget.Filter Filter
-        {
-            get { return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/> <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        public Android.Widget.FilterQueryProvider FilterQueryProvider
-        {
-            get { return IExecuteWithSignature<Android.Widget.FilterQueryProvider>("getFilterQueryProvider", "()Landroid/widget/FilterQueryProvider;"); } set { IExecuteWithSignature("setFilterQueryProvider", "(Landroid/widget/FilterQueryProvider;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecute<int>("getViewTypeCount"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#newView(android.content.Context,android.database.Cursor,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -701,6 +659,22 @@ public override void BindView(Android.View.View arg0, Android.Content.Context ar
             IExecute("bindView", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
+        public override Android.Content.Res.Resources.Theme GetDropDownViewTheme()
+        {
+            return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getDropDownViewTheme", "()Landroid/content/res/Resources$Theme;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Database.Cursor"/></returns>
+        public override Android.Database.Cursor GetCursor()
+        {
+            return IExecuteWithSignature<Android.Database.Cursor>("getCursor", "()Landroid/database/Cursor;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -730,6 +704,22 @@ public override Android.View.View NewDropDownView(Android.Content.Context arg0,
             return IExecute<Android.View.View>("newDropDownView", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Widget.Filter"/></returns>
+        public override Android.Widget.Filter GetFilter()
+        {
+            return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Widget.FilterQueryProvider"/></returns>
+        public override Android.Widget.FilterQueryProvider GetFilterQueryProvider()
+        {
+            return IExecuteWithSignature<Android.Widget.FilterQueryProvider>("getFilterQueryProvider", "()Landroid/widget/FilterQueryProvider;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -764,6 +754,14 @@ public override int GetItemViewType(int arg0)
             return IExecute<int>("getItemViewType", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetViewTypeCount()
+        {
+            return IExecute<int>("getViewTypeCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#convertToString(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
@@ -773,6 +771,14 @@ public override Java.Lang.CharSequence ConvertToString(Android.Database.Cursor a
             return IExecuteWithSignature<Java.Lang.CharSequence>("convertToString", "(Landroid/database/Cursor;)Ljava/lang/CharSequence;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public override Java.Lang.CharSequence[] GetAutofillOptions()
+        {
+            return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
         /// </summary>
         public override void NotifyDataSetChanged()
@@ -795,6 +801,14 @@ public override void RegisterDataSetObserver(Android.Database.DataSetObserver ar
             IExecute("registerDataSetObserver", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public override void SetAutofillOptions(params Java.Lang.CharSequence[] arg0)
+        {
+            if (arg0.Length == 0) IExecute("setAutofillOptions"); else IExecute("setAutofillOptions", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
@@ -810,6 +824,22 @@ public override void ChangeCursor(Android.Database.Cursor arg0)
         {
             IExecuteWithSignature("changeCursor", "(Landroid/database/Cursor;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.Resources.Theme"/></param>
+        public override void SetDropDownViewTheme(Android.Content.Res.Resources.Theme arg0)
+        {
+            IExecuteWithSignature("setDropDownViewTheme", "(Landroid/content/res/Resources$Theme;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Widget.FilterQueryProvider"/></param>
+        public override void SetFilterQueryProvider(Android.Widget.FilterQueryProvider arg0)
+        {
+            IExecuteWithSignature("setFilterQueryProvider", "(Landroid/widget/FilterQueryProvider;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/CursorTreeAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/CursorTreeAdapter.cs
index 0eba09334..06b418233 100644
--- a/src/net/Netdroid/Generated/Android/Widget/CursorTreeAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/CursorTreeAdapter.cs
@@ -29,532 +29,33 @@ namespace Android.Widget
     public partial class CursorTreeAdapter
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="CursorTreeAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("getCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCursorEventHandler));
-            AddEventHandler("runQueryOnBackgroundThread", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(RunQueryOnBackgroundThreadEventHandler));
-            AddEventHandler("getFilter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
-            AddEventHandler("getFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterQueryProviderEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getChildType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildTypeEventHandler));
-            AddEventHandler("getChildTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetChildTypeCountEventHandler));
-            AddEventHandler("getGroupType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupTypeEventHandler));
-            AddEventHandler("getGroupTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupTypeCountEventHandler));
-            AddEventHandler("convertToString", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ConvertToStringEventHandler));
-            AddEventHandler("getCombinedChildId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedChildIdEventHandler));
-            AddEventHandler("getCombinedGroupId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedGroupIdEventHandler));
-            AddEventHandler("onGroupExpanded", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("changeCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ChangeCursorEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("setChildrenCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetChildrenCursorEventHandler));
-            AddEventHandler("setFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>>>(SetFilterQueryProviderEventHandler));
-            AddEventHandler("setGroupCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(SetGroupCursorEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor> OnGetCursor { get; set; } = null;
-
-        void GetCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetCursor != null) ? OnGetCursor : GetCursor;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor GetCursor()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRunQueryOnBackgroundThread"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.Database.Cursor> OnRunQueryOnBackgroundThread { get; set; } = null;
-
-        void RunQueryOnBackgroundThreadEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnRunQueryOnBackgroundThread != null) ? OnRunQueryOnBackgroundThread : RunQueryOnBackgroundThread;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
-
-        void GetFilterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilter != null) ? OnGetFilter : GetFilter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.Filter"/></returns>
-        public virtual Android.Widget.Filter GetFilter()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.FilterQueryProvider> OnGetFilterQueryProvider { get; set; } = null;
-
-        void GetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilterQueryProvider != null) ? OnGetFilterQueryProvider : GetFilterQueryProvider;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.FilterQueryProvider"/></returns>
-        public virtual Android.Widget.FilterQueryProvider GetFilterQueryProvider()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
-
-        void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnAreAllItemsEnabled != null) ? OnAreAllItemsEnabled : AreAllItemsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool AreAllItemsEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
-
-        void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEmpty != null) ? OnIsEmpty : IsEmpty;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEmpty()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetChildType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, int> OnGetChildType { get; set; } = null;
-
-        void GetChildTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetChildType != null) ? OnGetChildType : GetChildType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetChildType(int arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetChildTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetChildTypeCount { get; set; } = null;
-
-        void GetChildTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetChildTypeCount != null) ? OnGetChildTypeCount : GetChildTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetChildTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetGroupType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetGroupType { get; set; } = null;
-
-        void GetGroupTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetGroupType != null) ? OnGetGroupType : GetGroupType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetGroupType(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetGroupTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetGroupTypeCount { get; set; } = null;
-
-        void GetGroupTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetGroupTypeCount != null) ? OnGetGroupTypeCount : GetGroupTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetGroupTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnConvertToString"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor, Java.Lang.String> OnConvertToString { get; set; } = null;
-
-        void ConvertToStringEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnConvertToString != null) ? OnConvertToString : ConvertToString;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public virtual Java.Lang.String ConvertToString(Android.Database.Cursor arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCombinedChildId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long, long> OnGetCombinedChildId { get; set; } = null;
-
-        void GetCombinedChildIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetCombinedChildId != null) ? OnGetCombinedChildId : GetCombinedChildId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<long>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetCombinedChildId(long arg0, long arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCombinedGroupId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnGetCombinedGroupId { get; set; } = null;
-
-        void GetCombinedGroupIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetCombinedGroupId != null) ? OnGetCombinedGroupId : GetCombinedGroupId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetCombinedGroupId(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnGroupExpanded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupExpanded { get; set; } = null;
-
-        void OnGroupExpandedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnGroupExpanded != null) ? OnOnGroupExpanded : OnGroupExpanded;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void OnGroupExpanded(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
-
-        void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnRegisterDataSetObserver != null) ? OnRegisterDataSetObserver : RegisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
-
-        void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnUnregisterDataSetObserver != null) ? OnUnregisterDataSetObserver : UnregisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnChangeCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnChangeCursor { get; set; } = null;
-
-        void ChangeCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnChangeCursor != null) ? OnChangeCursor : ChangeCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#%3Cinit%3E(android.database.Cursor,android.content.Context,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public virtual void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<bool> OnNotifyDataSetChanged { get; set; } = null;
-
-        void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
+        /// <param name="arg1"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg2"><see cref="bool"/></param>
+        public CursorTreeAdapter(Android.Database.Cursor arg0, Android.Content.Context arg1, bool arg2)
+            : base(arg0, arg1, arg2)
         {
-            var methodToExecute = (OnNotifyDataSetChanged != null) ? OnNotifyDataSetChanged : NotifyDataSetChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
         }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        public virtual void NotifyDataSetChanged(bool arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setChildrenCursor(int,android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetChildrenCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, Android.Database.Cursor> OnSetChildrenCursor { get; set; } = null;
-
-        void SetChildrenCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetChildrenCursor != null) ? OnSetChildrenCursor : SetChildrenCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Database.Cursor>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setChildrenCursor(int,android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        public virtual void SetChildrenCursor(int arg0, Android.Database.Cursor arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.FilterQueryProvider> OnSetFilterQueryProvider { get; set; } = null;
-
-        void SetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>> data)
-        {
-            var methodToExecute = (OnSetFilterQueryProvider != null) ? OnSetFilterQueryProvider : SetFilterQueryProvider;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.FilterQueryProvider"/></param>
-        public virtual void SetFilterQueryProvider(Android.Widget.FilterQueryProvider arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetGroupCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnSetGroupCursor { get; set; } = null;
-
-        void SetGroupCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnSetGroupCursor != null) ? OnSetGroupCursor : SetGroupCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#%3Cinit%3E(android.database.Cursor,android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public virtual void SetGroupCursor(Android.Database.Cursor arg0)
+        /// <param name="arg1"><see cref="Android.Content.Context"/></param>
+        public CursorTreeAdapter(Android.Database.Cursor arg0, Android.Content.Context arg1)
+            : base(arg0, arg1)
         {
-            
         }
 
         #endregion
 
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region CursorTreeAdapterDirect
-    public partial class CursorTreeAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
         #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Android.Widget.CursorTreeAdapter"/> to <see cref="Android.Widget.Filterable"/>
+        /// </summary>
+        public static implicit operator Android.Widget.Filterable(Android.Widget.CursorTreeAdapter t) => t.Cast<Android.Widget.Filterable>();
 
         #endregion
 
@@ -568,141 +69,52 @@ public partial class CursorTreeAdapterDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/> 
-        /// </summary>
-        public int ChildTypeCount
-        {
-            get { return IExecute<int>("getChildTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/> 
-        /// </summary>
-        public Android.Database.Cursor Cursor
-        {
-            get { return IExecuteWithSignature<Android.Database.Cursor>("getCursor", "()Landroid/database/Cursor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/> 
-        /// </summary>
-        public Android.Widget.Filter Filter
-        {
-            get { return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/> <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        public Android.Widget.FilterQueryProvider FilterQueryProvider
-        {
-            get { return IExecuteWithSignature<Android.Widget.FilterQueryProvider>("getFilterQueryProvider", "()Landroid/widget/FilterQueryProvider;"); } set { IExecuteWithSignature("setFilterQueryProvider", "(Landroid/widget/FilterQueryProvider;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/>
         /// </summary>
-        public int GroupTypeCount
+        /// <returns><see cref="Android.Database.Cursor"/></returns>
+        public Android.Database.Cursor GetCursor()
         {
-            get { return IExecute<int>("getGroupTypeCount"); }
+            return IExecuteWithSignature<Android.Database.Cursor>("getCursor", "()Landroid/database/Cursor;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public override Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
+        public Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
         {
             return IExecuteWithSignature<Android.Database.Cursor>("runQueryOnBackgroundThread", "(Ljava/lang/CharSequence;)Landroid/database/Cursor;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool AreAllItemsEnabled()
-        {
-            return IExecute<bool>("areAllItemsEnabled");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEmpty()
-        {
-            return IExecute<bool>("isEmpty");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetChildType(int arg0, int arg1)
+        /// <returns><see cref="Android.Widget.Filter"/></returns>
+        public Android.Widget.Filter GetFilter()
         {
-            return IExecute<int>("getChildType", arg0, arg1);
+            return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetGroupType(int arg0)
+        /// <returns><see cref="Android.Widget.FilterQueryProvider"/></returns>
+        public Android.Widget.FilterQueryProvider GetFilterQueryProvider()
         {
-            return IExecute<int>("getGroupType", arg0);
+            return IExecuteWithSignature<Android.Widget.FilterQueryProvider>("getFilterQueryProvider", "()Landroid/widget/FilterQueryProvider;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public override Java.Lang.String ConvertToString(Android.Database.Cursor arg0)
+        public Java.Lang.String ConvertToString(Android.Database.Cursor arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("convertToString", "(Landroid/database/Cursor;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long GetCombinedChildId(long arg0, long arg1)
-        {
-            return IExecute<long>("getCombinedChildId", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long GetCombinedGroupId(long arg0)
-        {
-            return IExecute<long>("getCombinedGroupId", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public override void OnGroupExpanded(int arg0)
-        {
-            IExecute("onGroupExpanded", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("registerDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("unregisterDataSetObserver", arg0);
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public override void ChangeCursor(Android.Database.Cursor arg0)
+        public void ChangeCursor(Android.Database.Cursor arg0)
         {
             IExecuteWithSignature("changeCursor", "(Landroid/database/Cursor;)V", arg0);
         }
@@ -710,7 +122,7 @@ public override void ChangeCursor(Android.Database.Cursor arg0)
         /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        public override void NotifyDataSetChanged(bool arg0)
+        public void NotifyDataSetChanged(bool arg0)
         {
             IExecuteWithSignature("notifyDataSetChanged", "(Z)V", arg0);
         }
@@ -719,15 +131,23 @@ public override void NotifyDataSetChanged(bool arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        public override void SetChildrenCursor(int arg0, Android.Database.Cursor arg1)
+        public void SetChildrenCursor(int arg0, Android.Database.Cursor arg1)
         {
             IExecute("setChildrenCursor", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Widget.FilterQueryProvider"/></param>
+        public void SetFilterQueryProvider(Android.Widget.FilterQueryProvider arg0)
+        {
+            IExecuteWithSignature("setFilterQueryProvider", "(Landroid/widget/FilterQueryProvider;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public override void SetGroupCursor(Android.Database.Cursor arg0)
+        public void SetGroupCursor(Android.Database.Cursor arg0)
         {
             IExecuteWithSignature("setGroupCursor", "(Landroid/database/Cursor;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Widget/DatePicker.cs b/src/net/Netdroid/Generated/Android/Widget/DatePicker.cs
index 9d72f530d..efa3d389f 100644
--- a/src/net/Netdroid/Generated/Android/Widget/DatePicker.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/DatePicker.cs
@@ -84,70 +84,79 @@ public DatePicker(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getCalendarView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getCalendarView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.CalendarView CalendarView
+        /// <returns><see cref="Android.Widget.CalendarView"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.CalendarView GetCalendarView()
         {
-            get { return IExecuteWithSignature<Android.Widget.CalendarView>("getCalendarView", "()Landroid/widget/CalendarView;"); }
+            return IExecuteWithSignature<Android.Widget.CalendarView>("getCalendarView", "()Landroid/widget/CalendarView;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getCalendarViewShown()"/> <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setCalendarViewShown(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getCalendarViewShown()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool CalendarViewShown
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetCalendarViewShown()
         {
-            get { return IExecuteWithSignature<bool>("getCalendarViewShown", "()Z"); } set { IExecuteWithSignature("setCalendarViewShown", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getCalendarViewShown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getDayOfMonth()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getSpinnersShown()"/>
         /// </summary>
-        public int DayOfMonth
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetSpinnersShown()
         {
-            get { return IExecuteWithSignature<int>("getDayOfMonth", "()I"); }
+            return IExecuteWithSignature<bool>("getSpinnersShown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getFirstDayOfWeek()"/> <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setFirstDayOfWeek(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getDayOfMonth()"/>
         /// </summary>
-        public int FirstDayOfWeek
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfMonth()
         {
-            get { return IExecuteWithSignature<int>("getFirstDayOfWeek", "()I"); } set { IExecuteWithSignature("setFirstDayOfWeek", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDayOfMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getMaxDate()"/> <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setMaxDate(long)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getFirstDayOfWeek()"/>
         /// </summary>
-        public long MaxDate
+        /// <returns><see cref="int"/></returns>
+        public int GetFirstDayOfWeek()
         {
-            get { return IExecuteWithSignature<long>("getMaxDate", "()J"); } set { IExecuteWithSignature("setMaxDate", "(J)V", value); }
+            return IExecuteWithSignature<int>("getFirstDayOfWeek", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getMinDate()"/> <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setMinDate(long)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getMonth()"/>
         /// </summary>
-        public long MinDate
+        /// <returns><see cref="int"/></returns>
+        public int GetMonth()
         {
-            get { return IExecuteWithSignature<long>("getMinDate", "()J"); } set { IExecuteWithSignature("setMinDate", "(J)V", value); }
+            return IExecuteWithSignature<int>("getMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getMonth()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getYear()"/>
         /// </summary>
-        public int Month
+        /// <returns><see cref="int"/></returns>
+        public int GetYear()
         {
-            get { return IExecuteWithSignature<int>("getMonth", "()I"); }
+            return IExecuteWithSignature<int>("getYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getSpinnersShown()"/> <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setSpinnersShown(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getMaxDate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool SpinnersShown
+        /// <returns><see cref="long"/></returns>
+        public long GetMaxDate()
         {
-            get { return IExecuteWithSignature<bool>("getSpinnersShown", "()Z"); } set { IExecuteWithSignature("setSpinnersShown", "(Z)V", value); }
+            return IExecuteWithSignature<long>("getMaxDate", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getYear()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#getMinDate()"/>
         /// </summary>
-        public int Year
+        /// <returns><see cref="long"/></returns>
+        public long GetMinDate()
         {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); }
+            return IExecuteWithSignature<long>("getMinDate", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#init(int,int,int,android.widget.DatePicker.OnDateChangedListener)"/>
@@ -161,6 +170,39 @@ public void Init(int arg0, int arg1, int arg2, Android.Widget.DatePicker.OnDateC
             IExecute("init", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setCalendarViewShown(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetCalendarViewShown(bool arg0)
+        {
+            IExecuteWithSignature("setCalendarViewShown", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setFirstDayOfWeek(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFirstDayOfWeek(int arg0)
+        {
+            IExecuteWithSignature("setFirstDayOfWeek", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setMaxDate(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetMaxDate(long arg0)
+        {
+            IExecuteWithSignature("setMaxDate", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setMinDate(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetMinDate(long arg0)
+        {
+            IExecuteWithSignature("setMinDate", "(J)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setOnDateChangedListener(android.widget.DatePicker.OnDateChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.DatePicker.OnDateChangedListener"/></param>
@@ -169,6 +211,15 @@ public void SetOnDateChangedListener(Android.Widget.DatePicker.OnDateChangedList
             IExecuteWithSignature("setOnDateChangedListener", "(Landroid/widget/DatePicker$OnDateChangedListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#setSpinnersShown(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void SetSpinnersShown(bool arg0)
+        {
+            IExecuteWithSignature("setSpinnersShown", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DatePicker.html#updateDate(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -207,7 +258,7 @@ public partial class OnDateChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDateChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.DatePicker>>>(OnDateChangedEventHandler));
+                AddEventHandler("onDateChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.DatePicker>>>(OnDateChangedEventHandler));
 
             }
 
@@ -215,7 +266,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/DatePicker.OnDateChangedListener.html#onDateChanged(android.widget.DatePicker,int,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDateChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.DatePicker, int, int, int> OnOnDateChanged { get; set; } = null;
+            public global::System.Action<Android.Widget.DatePicker, int, int, int> OnOnDateChanged { get; set; } = null;
 
             void OnDateChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.DatePicker>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/DialerFilter.cs b/src/net/Netdroid/Generated/Android/Widget/DialerFilter.cs
index da05acabc..c5a0d0caa 100644
--- a/src/net/Netdroid/Generated/Android/Widget/DialerFilter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/DialerFilter.cs
@@ -34,7 +34,7 @@ public partial class DialerFilter
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DialerFilter(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -43,7 +43,7 @@ public DialerFilter(Android.Content.Context arg0, Android.Util.AttributeSet arg1
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DialerFilter(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -59,35 +59,35 @@ public DialerFilter(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#DIGITS_AND_LETTERS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DIGITS_AND_LETTERS { get { if (!_DIGITS_AND_LETTERSReady) { _DIGITS_AND_LETTERSContent = SGetField<int>(LocalBridgeClazz, "DIGITS_AND_LETTERS"); _DIGITS_AND_LETTERSReady = true; } return _DIGITS_AND_LETTERSContent; } }
         private static int _DIGITS_AND_LETTERSContent = default;
         private static bool _DIGITS_AND_LETTERSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#DIGITS_AND_LETTERS_NO_DIGITS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DIGITS_AND_LETTERS_NO_DIGITS { get { if (!_DIGITS_AND_LETTERS_NO_DIGITSReady) { _DIGITS_AND_LETTERS_NO_DIGITSContent = SGetField<int>(LocalBridgeClazz, "DIGITS_AND_LETTERS_NO_DIGITS"); _DIGITS_AND_LETTERS_NO_DIGITSReady = true; } return _DIGITS_AND_LETTERS_NO_DIGITSContent; } }
         private static int _DIGITS_AND_LETTERS_NO_DIGITSContent = default;
         private static bool _DIGITS_AND_LETTERS_NO_DIGITSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#DIGITS_AND_LETTERS_NO_LETTERS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DIGITS_AND_LETTERS_NO_LETTERS { get { if (!_DIGITS_AND_LETTERS_NO_LETTERSReady) { _DIGITS_AND_LETTERS_NO_LETTERSContent = SGetField<int>(LocalBridgeClazz, "DIGITS_AND_LETTERS_NO_LETTERS"); _DIGITS_AND_LETTERS_NO_LETTERSReady = true; } return _DIGITS_AND_LETTERS_NO_LETTERSContent; } }
         private static int _DIGITS_AND_LETTERS_NO_LETTERSContent = default;
         private static bool _DIGITS_AND_LETTERS_NO_LETTERSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#DIGITS_ONLY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int DIGITS_ONLY { get { if (!_DIGITS_ONLYReady) { _DIGITS_ONLYContent = SGetField<int>(LocalBridgeClazz, "DIGITS_ONLY"); _DIGITS_ONLYReady = true; } return _DIGITS_ONLYContent; } }
         private static int _DIGITS_ONLYContent = default;
         private static bool _DIGITS_ONLYReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#LETTERS_ONLY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int LETTERS_ONLY { get { if (!_LETTERS_ONLYReady) { _LETTERS_ONLYContent = SGetField<int>(LocalBridgeClazz, "LETTERS_ONLY"); _LETTERS_ONLYReady = true; } return _LETTERS_ONLYContent; } }
         private static int _LETTERS_ONLYContent = default;
         private static bool _LETTERS_ONLYReady = false; // this is used because in case of generics 
@@ -100,51 +100,55 @@ public DialerFilter(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#getDigits()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#isQwertyKeyboard()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence Digits
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool IsQwertyKeyboard()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getDigits", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isQwertyKeyboard", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#getFilterText()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#getMode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence FilterText
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMode()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getFilterText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#getLetters()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#getDigits()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.CharSequence Letters
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetDigits()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLetters", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getDigits", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#getMode()"/> <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#setMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#getFilterText()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Mode
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetFilterText()
         {
-            get { return IExecuteWithSignature<int>("getMode", "()I"); } set { IExecuteWithSignature("setMode", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getFilterText", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#isQwertyKeyboard()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#getLetters()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsQwertyKeyboard()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.CharSequence GetLetters()
         {
-            return IExecuteWithSignature<bool>("isQwertyKeyboard", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLetters", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#append(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Append(Java.Lang.String arg0)
         {
             IExecuteWithSignature("append", "(Ljava/lang/String;)V", arg0);
@@ -152,7 +156,7 @@ public void Append(Java.Lang.String arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#clearText()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearText()
         {
             IExecuteWithSignature("clearText", "()V");
@@ -161,7 +165,7 @@ public void ClearText()
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#removeFilterWatcher(android.text.TextWatcher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.TextWatcher"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void RemoveFilterWatcher(Android.Text.TextWatcher arg0)
         {
             IExecuteWithSignature("removeFilterWatcher", "(Landroid/text/TextWatcher;)V", arg0);
@@ -170,7 +174,7 @@ public void RemoveFilterWatcher(Android.Text.TextWatcher arg0)
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#setDigitsWatcher(android.text.TextWatcher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.TextWatcher"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDigitsWatcher(Android.Text.TextWatcher arg0)
         {
             IExecuteWithSignature("setDigitsWatcher", "(Landroid/text/TextWatcher;)V", arg0);
@@ -179,7 +183,7 @@ public void SetDigitsWatcher(Android.Text.TextWatcher arg0)
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#setFilterWatcher(android.text.TextWatcher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.TextWatcher"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetFilterWatcher(Android.Text.TextWatcher arg0)
         {
             IExecuteWithSignature("setFilterWatcher", "(Landroid/text/TextWatcher;)V", arg0);
@@ -188,11 +192,20 @@ public void SetFilterWatcher(Android.Text.TextWatcher arg0)
         /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#setLettersWatcher(android.text.TextWatcher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Text.TextWatcher"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetLettersWatcher(Android.Text.TextWatcher arg0)
         {
             IExecuteWithSignature("setLettersWatcher", "(Landroid/text/TextWatcher;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/DialerFilter.html#setMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetMode(int arg0)
+        {
+            IExecuteWithSignature("setMode", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/DigitalClock.cs b/src/net/Netdroid/Generated/Android/Widget/DigitalClock.cs
index 25a8a878f..f24051f6f 100644
--- a/src/net/Netdroid/Generated/Android/Widget/DigitalClock.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/DigitalClock.cs
@@ -34,7 +34,7 @@ public partial class DigitalClock
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DigitalClock(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -43,7 +43,7 @@ public DigitalClock(Android.Content.Context arg0, Android.Util.AttributeSet arg1
         /// <see href="https://developer.android.com/reference/android/widget/DigitalClock.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DigitalClock(Android.Content.Context arg0)
             : base(arg0)
         {
diff --git a/src/net/Netdroid/Generated/Android/Widget/EdgeEffect.cs b/src/net/Netdroid/Generated/Android/Widget/EdgeEffect.cs
index f985256bf..49a6d9f45 100644
--- a/src/net/Netdroid/Generated/Android/Widget/EdgeEffect.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/EdgeEffect.cs
@@ -69,32 +69,12 @@ public EdgeEffect(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#getBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#setBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#getBlendMode()"/>
         /// </summary>
-        public Android.Graphics.BlendMode BlendMode
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#getColor()"/> <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#setColor(int)"/>
-        /// </summary>
-        public int Color
-        {
-            get { return IExecuteWithSignature<int>("getColor", "()I"); } set { IExecuteWithSignature("setColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#getDistance()"/> 
-        /// </summary>
-        public float Distance
-        {
-            get { return IExecuteWithSignature<float>("getDistance", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#getMaxHeight()"/> 
-        /// </summary>
-        public int MaxHeight
-        {
-            get { return IExecuteWithSignature<int>("getMaxHeight", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#draw(android.graphics.Canvas)"/>
@@ -114,6 +94,14 @@ public bool IsFinished()
             return IExecuteWithSignature<bool>("isFinished", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#getDistance()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetDistance()
+        {
+            return IExecuteWithSignature<float>("getDistance", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#onPullDistance(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
@@ -124,6 +112,22 @@ public float OnPullDistance(float arg0, float arg1)
             return IExecute<float>("onPullDistance", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#getColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColor()
+        {
+            return IExecuteWithSignature<int>("getColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#getMaxHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxHeight()
+        {
+            return IExecuteWithSignature<int>("getMaxHeight", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#finish()"/>
         /// </summary>
         public void Finish()
@@ -163,6 +167,22 @@ public void OnRelease()
             IExecuteWithSignature("onRelease", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#setBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#setColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetColor(int arg0)
+        {
+            IExecuteWithSignature("setColor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/EdgeEffect.html#setSize(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/ExpandableListAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/ExpandableListAdapter.cs
index cdc86c959..73225ef32 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ExpandableListAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ExpandableListAdapter.cs
@@ -68,24 +68,24 @@ public partial class ExpandableListAdapter : Android.Widget.IExpandableListAdapt
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getChildView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildViewEventHandler));
-            AddEventHandler("getGroupView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupViewEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isChildSelectable", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsChildSelectableEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getChildrenCount", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildrenCountEventHandler));
-            AddEventHandler("getGroupCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupCountEventHandler));
-            AddEventHandler("getChild", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildEventHandler));
-            AddEventHandler("getGroup", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupEventHandler));
-            AddEventHandler("getChildId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildIdEventHandler));
-            AddEventHandler("getCombinedChildId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedChildIdEventHandler));
-            AddEventHandler("getCombinedGroupId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedGroupIdEventHandler));
-            AddEventHandler("getGroupId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupIdEventHandler));
-            AddEventHandler("onGroupCollapsed", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupCollapsedEventHandler));
-            AddEventHandler("onGroupExpanded", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("getChildView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildViewEventHandler));
+            AddEventHandler("getGroupView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupViewEventHandler));
+            AddEventHandler("areAllItemsEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isChildSelectable", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsChildSelectableEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("getChildrenCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildrenCountEventHandler));
+            AddEventHandler("getGroupCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupCountEventHandler));
+            AddEventHandler("getChild", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildEventHandler));
+            AddEventHandler("getGroup", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupEventHandler));
+            AddEventHandler("getChildId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildIdEventHandler));
+            AddEventHandler("getCombinedChildId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedChildIdEventHandler));
+            AddEventHandler("getCombinedGroupId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedGroupIdEventHandler));
+            AddEventHandler("getGroupId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupIdEventHandler));
+            AddEventHandler("onGroupCollapsed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupCollapsedEventHandler));
+            AddEventHandler("onGroupExpanded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandedEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
 
         }
 
@@ -93,7 +93,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChildView(int,int,boolean,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChildView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, bool, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetChildView { get; set; } = null;
+        public global::System.Func<int, int, bool, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetChildView { get; set; } = null;
 
         void GetChildViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -120,7 +120,7 @@ public virtual Android.View.View GetChildView(int arg0, int arg1, bool arg2, And
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupView(int,boolean,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroupView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetGroupView { get; set; } = null;
+        public global::System.Func<int, bool, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetGroupView { get; set; } = null;
 
         void GetGroupViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -146,7 +146,7 @@ public virtual Android.View.View GetGroupView(int arg0, bool arg1, Android.View.
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
+        public global::System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
 
         void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -168,7 +168,7 @@ public virtual bool AreAllItemsEnabled()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -190,7 +190,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#isChildSelectable(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsChildSelectable"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, bool> OnIsChildSelectable { get; set; } = null;
+        public global::System.Func<int, int, bool> OnIsChildSelectable { get; set; } = null;
 
         void IsChildSelectableEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -214,7 +214,7 @@ public virtual bool IsChildSelectable(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -236,7 +236,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChildrenCount(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChildrenCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetChildrenCount { get; set; } = null;
+        public global::System.Func<int, int> OnGetChildrenCount { get; set; } = null;
 
         void GetChildrenCountEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -259,7 +259,7 @@ public virtual int GetChildrenCount(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroupCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetGroupCount { get; set; } = null;
+        public global::System.Func<int> OnGetGroupCount { get; set; } = null;
 
         void GetGroupCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -281,7 +281,7 @@ public virtual int GetGroupCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChild(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChild"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, object> OnGetChild { get; set; } = null;
+        public global::System.Func<int, int, object> OnGetChild { get; set; } = null;
 
         void GetChildEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -305,7 +305,7 @@ public virtual object GetChild(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroup(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroup"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetGroup { get; set; } = null;
+        public global::System.Func<int, object> OnGetGroup { get; set; } = null;
 
         void GetGroupEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -328,7 +328,7 @@ public virtual object GetGroup(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChildId(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetChildId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, long> OnGetChildId { get; set; } = null;
+        public global::System.Func<int, int, long> OnGetChildId { get; set; } = null;
 
         void GetChildIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -352,7 +352,7 @@ public virtual long GetChildId(int arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getCombinedChildId(long,long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCombinedChildId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long, long> OnGetCombinedChildId { get; set; } = null;
+        public global::System.Func<long, long, long> OnGetCombinedChildId { get; set; } = null;
 
         void GetCombinedChildIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -376,7 +376,7 @@ public virtual long GetCombinedChildId(long arg0, long arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getCombinedGroupId(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCombinedGroupId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnGetCombinedGroupId { get; set; } = null;
+        public global::System.Func<long, long> OnGetCombinedGroupId { get; set; } = null;
 
         void GetCombinedGroupIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -399,7 +399,7 @@ public virtual long GetCombinedGroupId(long arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupId(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetGroupId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetGroupId { get; set; } = null;
+        public global::System.Func<int, long> OnGetGroupId { get; set; } = null;
 
         void GetGroupIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -422,7 +422,7 @@ public virtual long GetGroupId(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#onGroupCollapsed(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnGroupCollapsed"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupCollapsed { get; set; } = null;
+        public global::System.Action<int> OnOnGroupCollapsed { get; set; } = null;
 
         void OnGroupCollapsedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -443,7 +443,7 @@ public virtual void OnGroupCollapsed(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#onGroupExpanded(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOnGroupExpanded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupExpanded { get; set; } = null;
+        public global::System.Action<int> OnOnGroupExpanded { get; set; } = null;
 
         void OnGroupExpandedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -464,7 +464,7 @@ public virtual void OnGroupExpanded(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -485,7 +485,7 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -533,13 +533,6 @@ public partial class ExpandableListAdapterDirect : Android.Widget.IExpandableLis
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupCount()"/> 
-        /// </summary>
-        public int GroupCount
-        {
-            get { return IExecuteWithSignature<int>("getGroupCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChildView(int,int,boolean,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -608,6 +601,14 @@ public override int GetChildrenCount(int arg0)
             return IExecuteWithSignature<int>("getChildrenCount", "(I)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getGroupCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetGroupCount()
+        {
+            return IExecuteWithSignature<int>("getGroupCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ExpandableListAdapter.html#getChild(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/ExpandableListView.cs b/src/net/Netdroid/Generated/Android/Widget/ExpandableListView.cs
index 5ad8442db..4ccc868c7 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ExpandableListView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ExpandableListView.cs
@@ -160,25 +160,20 @@ public static long GetPackedPositionForGroup(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#getExpandableListAdapter()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#getExpandableListAdapter()"/>
         /// </summary>
-        public Android.Widget.ExpandableListAdapter ExpandableListAdapter
+        /// <returns><see cref="Android.Widget.ExpandableListAdapter"/></returns>
+        public Android.Widget.ExpandableListAdapter GetExpandableListAdapter()
         {
-            get { return IExecuteWithSignature<Android.Widget.ExpandableListAdapter>("getExpandableListAdapter", "()Landroid/widget/ExpandableListAdapter;"); }
+            return IExecuteWithSignature<Android.Widget.ExpandableListAdapter>("getExpandableListAdapter", "()Landroid/widget/ExpandableListAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#getSelectedId()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#getExpandableListAdapter()"/>
         /// </summary>
-        public long SelectedId
+        /// <returns><see cref="Android.Widget.ExpandableListAdapter"/></returns>
+        public Android.Widget.ExpandableListAdapter GetExpandableListAdapterDirect()
         {
-            get { return IExecuteWithSignature<long>("getSelectedId", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#getSelectedPosition()"/> 
-        /// </summary>
-        public long SelectedPosition
-        {
-            get { return IExecuteWithSignature<long>("getSelectedPosition", "()J"); }
+            return IExecuteWithSignature<Android.Widget.ExpandableListAdapterDirect, Android.Widget.ExpandableListAdapter>("getExpandableListAdapter", "()Landroid/widget/ExpandableListAdapter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#collapseGroup(int)"/>
@@ -247,6 +242,22 @@ public long GetExpandableListPosition(int arg0)
             return IExecuteWithSignature<long>("getExpandableListPosition", "(I)J", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#getSelectedId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetSelectedId()
+        {
+            return IExecuteWithSignature<long>("getSelectedId", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#getSelectedPosition()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetSelectedPosition()
+        {
+            return IExecuteWithSignature<long>("getSelectedPosition", "()J");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ExpandableListView.html#setAdapter(android.widget.ExpandableListAdapter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.ExpandableListAdapter"/></param>
@@ -436,7 +447,7 @@ public partial class OnChildClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onChildClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ExpandableListView>>>(OnChildClickEventHandler));
+                AddEventHandler("onChildClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ExpandableListView>>>(OnChildClickEventHandler));
 
             }
 
@@ -444,7 +455,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListView.OnChildClickListener.html#onChildClick(android.widget.ExpandableListView,android.view.View,int,int,long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnChildClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Widget.ExpandableListView, Android.View.View, int, int, long, bool> OnOnChildClick { get; set; } = null;
+            public global::System.Func<Android.Widget.ExpandableListView, Android.View.View, int, int, long, bool> OnOnChildClick { get; set; } = null;
 
             void OnChildClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.ExpandableListView>> data)
             {
@@ -546,7 +557,7 @@ public partial class OnGroupClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGroupClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ExpandableListView>>>(OnGroupClickEventHandler));
+                AddEventHandler("onGroupClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ExpandableListView>>>(OnGroupClickEventHandler));
 
             }
 
@@ -554,7 +565,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListView.OnGroupClickListener.html#onGroupClick(android.widget.ExpandableListView,android.view.View,int,long)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGroupClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Widget.ExpandableListView, Android.View.View, int, long, bool> OnOnGroupClick { get; set; } = null;
+            public global::System.Func<Android.Widget.ExpandableListView, Android.View.View, int, long, bool> OnOnGroupClick { get; set; } = null;
 
             void OnGroupClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.ExpandableListView>> data)
             {
@@ -654,7 +665,7 @@ public partial class OnGroupCollapseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGroupCollapse", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupCollapseEventHandler));
+                AddEventHandler("onGroupCollapse", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupCollapseEventHandler));
 
             }
 
@@ -662,7 +673,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListView.OnGroupCollapseListener.html#onGroupCollapse(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGroupCollapse"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnGroupCollapse { get; set; } = null;
+            public global::System.Action<int> OnOnGroupCollapse { get; set; } = null;
 
             void OnGroupCollapseEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -753,7 +764,7 @@ public partial class OnGroupExpandListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onGroupExpand", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandEventHandler));
+                AddEventHandler("onGroupExpand", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandEventHandler));
 
             }
 
@@ -761,7 +772,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/ExpandableListView.OnGroupExpandListener.html#onGroupExpand(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnGroupExpand"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnGroupExpand { get; set; } = null;
+            public global::System.Action<int> OnOnGroupExpand { get; set; } = null;
 
             void OnGroupExpandEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/Filter.cs b/src/net/Netdroid/Generated/Android/Widget/Filter.cs
index fd491ad60..0447852e4 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Filter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Filter.cs
@@ -100,7 +100,7 @@ public partial class FilterListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onFilterComplete", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnFilterCompleteEventHandler));
+                AddEventHandler("onFilterComplete", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnFilterCompleteEventHandler));
 
             }
 
@@ -108,7 +108,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/Filter.FilterListener.html#onFilterComplete(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnFilterComplete"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<int> OnOnFilterComplete { get; set; } = null;
+            public global::System.Action<int> OnOnFilterComplete { get; set; } = null;
 
             void OnFilterCompleteEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/Filterable.cs b/src/net/Netdroid/Generated/Android/Widget/Filterable.cs
index aa7f28dd5..91119b8ca 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Filterable.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Filterable.cs
@@ -64,11 +64,12 @@ public partial class Filterable : Android.Widget.IFilterable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Filterable.html#getFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Filterable.html#getFilter()"/>
         /// </summary>
-        public Android.Widget.Filter Filter
+        /// <returns><see cref="Android.Widget.Filter"/></returns>
+        public Android.Widget.Filter GetFilter()
         {
-            get { return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;"); }
+            return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Widget/FrameLayout.cs b/src/net/Netdroid/Generated/Android/Widget/FrameLayout.cs
index 06d737640..e7b37bc64 100644
--- a/src/net/Netdroid/Generated/Android/Widget/FrameLayout.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/FrameLayout.cs
@@ -84,19 +84,29 @@ public FrameLayout(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/FrameLayout.html#getConsiderGoneChildrenWhenMeasuring()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/FrameLayout.html#getConsiderGoneChildrenWhenMeasuring()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool ConsiderGoneChildrenWhenMeasuring
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool GetConsiderGoneChildrenWhenMeasuring()
         {
-            get { return IExecuteWithSignature<bool>("getConsiderGoneChildrenWhenMeasuring", "()Z"); }
+            return IExecuteWithSignature<bool>("getConsiderGoneChildrenWhenMeasuring", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/FrameLayout.html#getMeasureAllChildren()"/> <see href="https://developer.android.com/reference/android/widget/FrameLayout.html#setMeasureAllChildren(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/FrameLayout.html#getMeasureAllChildren()"/>
         /// </summary>
-        public bool MeasureAllChildren
+        /// <returns><see cref="bool"/></returns>
+        public bool GetMeasureAllChildren()
         {
-            get { return IExecuteWithSignature<bool>("getMeasureAllChildren", "()Z"); } set { IExecuteWithSignature("setMeasureAllChildren", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getMeasureAllChildren", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/FrameLayout.html#setMeasureAllChildren(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetMeasureAllChildren(bool arg0)
+        {
+            IExecuteWithSignature("setMeasureAllChildren", "(Z)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Widget/Gallery.cs b/src/net/Netdroid/Generated/Android/Widget/Gallery.cs
index 30b4e5d12..fe93950da 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Gallery.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Gallery.cs
@@ -36,7 +36,7 @@ public partial class Gallery
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Gallery(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public Gallery(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Gallery(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public Gallery(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Gallery(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public Gallery(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Gallery(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -92,7 +92,7 @@ public Gallery(Android.Content.Context arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnDown(Android.View.MotionEvent arg0)
         {
             return IExecuteWithSignature<bool>("onDown", "(Landroid/view/MotionEvent;)Z", arg0);
@@ -105,7 +105,7 @@ public bool OnDown(Android.View.MotionEvent arg0)
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnFling(Android.View.MotionEvent arg0, Android.View.MotionEvent arg1, float arg2, float arg3)
         {
             return IExecute<bool>("onFling", arg0, arg1, arg2, arg3);
@@ -118,7 +118,7 @@ public bool OnFling(Android.View.MotionEvent arg0, Android.View.MotionEvent arg1
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnScroll(Android.View.MotionEvent arg0, Android.View.MotionEvent arg1, float arg2, float arg3)
         {
             return IExecute<bool>("onScroll", arg0, arg1, arg2, arg3);
@@ -128,7 +128,7 @@ public bool OnScroll(Android.View.MotionEvent arg0, Android.View.MotionEvent arg
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnSingleTapUp(Android.View.MotionEvent arg0)
         {
             return IExecuteWithSignature<bool>("onSingleTapUp", "(Landroid/view/MotionEvent;)Z", arg0);
@@ -137,7 +137,7 @@ public bool OnSingleTapUp(Android.View.MotionEvent arg0)
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.html#onLongPress(android.view.MotionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnLongPress(Android.View.MotionEvent arg0)
         {
             IExecuteWithSignature("onLongPress", "(Landroid/view/MotionEvent;)V", arg0);
@@ -146,7 +146,7 @@ public void OnLongPress(Android.View.MotionEvent arg0)
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.html#onShowPress(android.view.MotionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.MotionEvent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnShowPress(Android.View.MotionEvent arg0)
         {
             IExecuteWithSignature("onShowPress", "(Landroid/view/MotionEvent;)V", arg0);
@@ -155,7 +155,7 @@ public void OnShowPress(Android.View.MotionEvent arg0)
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.html#setAnimationDuration(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAnimationDuration(int arg0)
         {
             IExecuteWithSignature("setAnimationDuration", "(I)V", arg0);
@@ -164,7 +164,7 @@ public void SetAnimationDuration(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.html#setCallbackDuringFling(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCallbackDuringFling(bool arg0)
         {
             IExecuteWithSignature("setCallbackDuringFling", "(Z)V", arg0);
@@ -173,7 +173,7 @@ public void SetCallbackDuringFling(bool arg0)
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.html#setGravity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetGravity(int arg0)
         {
             IExecuteWithSignature("setGravity", "(I)V", arg0);
@@ -182,7 +182,7 @@ public void SetGravity(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.html#setSpacing(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetSpacing(int arg0)
         {
             IExecuteWithSignature("setSpacing", "(I)V", arg0);
@@ -191,7 +191,7 @@ public void SetSpacing(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/Gallery.html#setUnselectedAlpha(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetUnselectedAlpha(float arg0)
         {
             IExecuteWithSignature("setUnselectedAlpha", "(F)V", arg0);
@@ -209,7 +209,7 @@ public partial class LayoutParams
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Context"/></param>
             /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public LayoutParams(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
                 : base(arg0, arg1)
             {
@@ -218,7 +218,7 @@ public LayoutParams(Android.Content.Context arg0, Android.Util.AttributeSet arg1
             /// <see href="https://developer.android.com/reference/android/widget/Gallery.LayoutParams.html#%3Cinit%3E(android.view.ViewGroup.LayoutParams)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.ViewGroup.LayoutParams"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public LayoutParams(Android.View.ViewGroup.LayoutParams arg0)
                 : base(arg0)
             {
@@ -228,7 +228,7 @@ public LayoutParams(Android.View.ViewGroup.LayoutParams arg0)
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public LayoutParams(int arg0, int arg1)
                 : base(arg0, arg1)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/GridLayout.cs b/src/net/Netdroid/Generated/Android/Widget/GridLayout.cs
index 4651d5035..bbff940a6 100644
--- a/src/net/Netdroid/Generated/Android/Widget/GridLayout.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/GridLayout.cs
@@ -252,55 +252,76 @@ public static Android.Widget.GridLayout.Spec SpecMethod(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getAlignmentMode()"/> <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setAlignmentMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getUseDefaultMargins()"/>
         /// </summary>
-        public int AlignmentMode
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseDefaultMargins()
         {
-            get { return IExecuteWithSignature<int>("getAlignmentMode", "()I"); } set { IExecuteWithSignature("setAlignmentMode", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getUseDefaultMargins", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getColumnCount()"/> <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setColumnCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#isColumnOrderPreserved()"/>
         /// </summary>
-        public int ColumnCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsColumnOrderPreserved()
         {
-            get { return IExecuteWithSignature<int>("getColumnCount", "()I"); } set { IExecuteWithSignature("setColumnCount", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isColumnOrderPreserved", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getOrientation()"/> <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setOrientation(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#isRowOrderPreserved()"/>
         /// </summary>
-        public int Orientation
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRowOrderPreserved()
         {
-            get { return IExecuteWithSignature<int>("getOrientation", "()I"); } set { IExecuteWithSignature("setOrientation", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isRowOrderPreserved", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getRowCount()"/> <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setRowCount(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getAlignmentMode()"/>
         /// </summary>
-        public int RowCount
+        /// <returns><see cref="int"/></returns>
+        public int GetAlignmentMode()
         {
-            get { return IExecuteWithSignature<int>("getRowCount", "()I"); } set { IExecuteWithSignature("setRowCount", "(I)V", value); }
+            return IExecuteWithSignature<int>("getAlignmentMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getUseDefaultMargins()"/> <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setUseDefaultMargins(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getColumnCount()"/>
         /// </summary>
-        public bool UseDefaultMargins
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnCount()
         {
-            get { return IExecuteWithSignature<bool>("getUseDefaultMargins", "()Z"); } set { IExecuteWithSignature("setUseDefaultMargins", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getColumnCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#isColumnOrderPreserved()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getOrientation()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsColumnOrderPreserved()
+        /// <returns><see cref="int"/></returns>
+        public int GetOrientation()
         {
-            return IExecuteWithSignature<bool>("isColumnOrderPreserved", "()Z");
+            return IExecuteWithSignature<int>("getOrientation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#isRowOrderPreserved()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#getRowCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRowOrderPreserved()
+        /// <returns><see cref="int"/></returns>
+        public int GetRowCount()
         {
-            return IExecuteWithSignature<bool>("isRowOrderPreserved", "()Z");
+            return IExecuteWithSignature<int>("getRowCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setAlignmentMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAlignmentMode(int arg0)
+        {
+            IExecuteWithSignature("setAlignmentMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setColumnCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetColumnCount(int arg0)
+        {
+            IExecuteWithSignature("setColumnCount", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setColumnOrderPreserved(boolean)"/>
@@ -311,6 +332,22 @@ public void SetColumnOrderPreserved(bool arg0)
             IExecuteWithSignature("setColumnOrderPreserved", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setOrientation(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOrientation(int arg0)
+        {
+            IExecuteWithSignature("setOrientation", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setRowCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRowCount(int arg0)
+        {
+            IExecuteWithSignature("setRowCount", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setRowOrderPreserved(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -318,6 +355,14 @@ public void SetRowOrderPreserved(bool arg0)
         {
             IExecuteWithSignature("setRowOrderPreserved", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridLayout.html#setUseDefaultMargins(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseDefaultMargins(bool arg0)
+        {
+            IExecuteWithSignature("setUseDefaultMargins", "(Z)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/GridView.cs b/src/net/Netdroid/Generated/Android/Widget/GridView.cs
index 5baf44f13..dee028c3b 100644
--- a/src/net/Netdroid/Generated/Android/Widget/GridView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/GridView.cs
@@ -114,60 +114,116 @@ public GridView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getColumnWidth()"/> <see href="https://developer.android.com/reference/android/widget/GridView.html#setColumnWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getColumnWidth()"/>
         /// </summary>
-        public int ColumnWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnWidth()
         {
-            get { return IExecuteWithSignature<int>("getColumnWidth", "()I"); } set { IExecuteWithSignature("setColumnWidth", "(I)V", value); }
+            return IExecuteWithSignature<int>("getColumnWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getGravity()"/> <see href="https://developer.android.com/reference/android/widget/GridView.html#setGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getGravity()"/>
         /// </summary>
-        public int Gravity
+        /// <returns><see cref="int"/></returns>
+        public int GetGravity()
         {
-            get { return IExecuteWithSignature<int>("getGravity", "()I"); } set { IExecuteWithSignature("setGravity", "(I)V", value); }
+            return IExecuteWithSignature<int>("getGravity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getHorizontalSpacing()"/> <see href="https://developer.android.com/reference/android/widget/GridView.html#setHorizontalSpacing(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getHorizontalSpacing()"/>
         /// </summary>
-        public int HorizontalSpacing
+        /// <returns><see cref="int"/></returns>
+        public int GetHorizontalSpacing()
         {
-            get { return IExecuteWithSignature<int>("getHorizontalSpacing", "()I"); } set { IExecuteWithSignature("setHorizontalSpacing", "(I)V", value); }
+            return IExecuteWithSignature<int>("getHorizontalSpacing", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getNumColumns()"/> <see href="https://developer.android.com/reference/android/widget/GridView.html#setNumColumns(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getNumColumns()"/>
         /// </summary>
-        public int NumColumns
+        /// <returns><see cref="int"/></returns>
+        public int GetNumColumns()
         {
-            get { return IExecuteWithSignature<int>("getNumColumns", "()I"); } set { IExecuteWithSignature("setNumColumns", "(I)V", value); }
+            return IExecuteWithSignature<int>("getNumColumns", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getRequestedColumnWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getRequestedColumnWidth()"/>
         /// </summary>
-        public int RequestedColumnWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetRequestedColumnWidth()
         {
-            get { return IExecuteWithSignature<int>("getRequestedColumnWidth", "()I"); }
+            return IExecuteWithSignature<int>("getRequestedColumnWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getRequestedHorizontalSpacing()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getRequestedHorizontalSpacing()"/>
         /// </summary>
-        public int RequestedHorizontalSpacing
+        /// <returns><see cref="int"/></returns>
+        public int GetRequestedHorizontalSpacing()
         {
-            get { return IExecuteWithSignature<int>("getRequestedHorizontalSpacing", "()I"); }
+            return IExecuteWithSignature<int>("getRequestedHorizontalSpacing", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getStretchMode()"/> <see href="https://developer.android.com/reference/android/widget/GridView.html#setStretchMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getStretchMode()"/>
         /// </summary>
-        public int StretchMode
+        /// <returns><see cref="int"/></returns>
+        public int GetStretchMode()
         {
-            get { return IExecuteWithSignature<int>("getStretchMode", "()I"); } set { IExecuteWithSignature("setStretchMode", "(I)V", value); }
+            return IExecuteWithSignature<int>("getStretchMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getVerticalSpacing()"/> <see href="https://developer.android.com/reference/android/widget/GridView.html#setVerticalSpacing(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#getVerticalSpacing()"/>
         /// </summary>
-        public int VerticalSpacing
+        /// <returns><see cref="int"/></returns>
+        public int GetVerticalSpacing()
         {
-            get { return IExecuteWithSignature<int>("getVerticalSpacing", "()I"); } set { IExecuteWithSignature("setVerticalSpacing", "(I)V", value); }
+            return IExecuteWithSignature<int>("getVerticalSpacing", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#setColumnWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetColumnWidth(int arg0)
+        {
+            IExecuteWithSignature("setColumnWidth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#setGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGravity(int arg0)
+        {
+            IExecuteWithSignature("setGravity", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#setHorizontalSpacing(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHorizontalSpacing(int arg0)
+        {
+            IExecuteWithSignature("setHorizontalSpacing", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#setNumColumns(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNumColumns(int arg0)
+        {
+            IExecuteWithSignature("setNumColumns", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#setStretchMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetStretchMode(int arg0)
+        {
+            IExecuteWithSignature("setStretchMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/GridView.html#setVerticalSpacing(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVerticalSpacing(int arg0)
+        {
+            IExecuteWithSignature("setVerticalSpacing", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/GridView.html#smoothScrollByOffset(int)"/>
diff --git a/src/net/Netdroid/Generated/Android/Widget/HeaderViewListAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/HeaderViewListAdapter.cs
index a246732fe..54303f47b 100644
--- a/src/net/Netdroid/Generated/Android/Widget/HeaderViewListAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/HeaderViewListAdapter.cs
@@ -29,10 +29,28 @@ namespace Android.Widget
     public partial class HeaderViewListAdapter : Android.Widget.IWrapperListAdapter, Android.Widget.IFilterable
     {
         #region Constructors
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#%3Cinit%3E(java.util.ArrayList,java.util.ArrayList,android.widget.ListAdapter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.ArrayList"/></param>
+        /// <param name="arg1"><see cref="Java.Util.ArrayList"/></param>
+        /// <param name="arg2"><see cref="Android.Widget.ListAdapter"/></param>
+        public HeaderViewListAdapter(Java.Util.ArrayList<Android.Widget.ListView.FixedViewInfo> arg0, Java.Util.ArrayList<Android.Widget.ListView.FixedViewInfo> arg1, Android.Widget.ListAdapter arg2)
+            : base(arg0, arg1, arg2)
+        {
+        }
 
         #endregion
 
         #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Android.Widget.HeaderViewListAdapter"/> to <see cref="Android.Widget.WrapperListAdapter"/>
+        /// </summary>
+        public static implicit operator Android.Widget.WrapperListAdapter(Android.Widget.HeaderViewListAdapter t) => t.Cast<Android.Widget.WrapperListAdapter>();
+        /// <summary>
+        /// Converter from <see cref="Android.Widget.HeaderViewListAdapter"/> to <see cref="Android.Widget.Filterable"/>
+        /// </summary>
+        public static implicit operator Android.Widget.Filterable(Android.Widget.HeaderViewListAdapter t) => t.Cast<Android.Widget.Filterable>();
 
         #endregion
 
@@ -45,46 +63,6 @@ public partial class HeaderViewListAdapter : Android.Widget.IWrapperListAdapter,
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="HeaderViewListAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("getView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
-            AddEventHandler("getFilter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
-            AddEventHandler("getWrappedAdapter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetWrappedAdapterEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
-            AddEventHandler("removeFooter", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(RemoveFooterEventHandler));
-            AddEventHandler("removeHeader", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(RemoveHeaderEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
-            AddEventHandler("getCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
-            AddEventHandler("getFootersCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFootersCountEventHandler));
-            AddEventHandler("getHeadersCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetHeadersCountEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getItem", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
-            AddEventHandler("getItemId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
-
-        void GetViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetView != null) ? OnGetView : GetView;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.View>(0), data.EventData.GetAt<Android.View.ViewGroup>(1));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
@@ -92,577 +70,132 @@ void GetViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>>
         /// <param name="arg1"><see cref="Android.View.View"/></param>
         /// <param name="arg2"><see cref="Android.View.ViewGroup"/></param>
         /// <returns><see cref="Android.View.View"/></returns>
-        public virtual Android.View.View GetView(int arg0, Android.View.View arg1, Android.View.ViewGroup arg2)
+        public Android.View.View GetView(int arg0, Android.View.View arg1, Android.View.ViewGroup arg2)
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
-
-        void GetFilterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilter != null) ? OnGetFilter : GetFilter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecute<Android.View.View>("getView", arg0, arg1, arg2);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getFilter()"/>
         /// </summary>
         /// <returns><see cref="Android.Widget.Filter"/></returns>
-        public virtual Android.Widget.Filter GetFilter()
+        public Android.Widget.Filter GetFilter()
         {
-            return default;
+            return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;");
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getWrappedAdapter()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getWrappedAdapter()"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetWrappedAdapter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.ListAdapter> OnGetWrappedAdapter { get; set; } = null;
-
-        void GetWrappedAdapterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        public Android.Widget.ListAdapter GetWrappedAdapter()
         {
-            var methodToExecute = (OnGetWrappedAdapter != null) ? OnGetWrappedAdapter : GetWrappedAdapter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<Android.Widget.ListAdapter>("getWrappedAdapter", "()Landroid/widget/ListAdapter;");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getWrappedAdapter()"/>
         /// </summary>
         /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
-        public virtual Android.Widget.ListAdapter GetWrappedAdapter()
+        public Android.Widget.ListAdapter GetWrappedAdapterDirect()
         {
-            return default;
+            return IExecuteWithSignature<Android.Widget.ListAdapterDirect, Android.Widget.ListAdapter>("getWrappedAdapter", "()Landroid/widget/ListAdapter;");
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
-
-        void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnAreAllItemsEnabled != null) ? OnAreAllItemsEnabled : AreAllItemsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool AreAllItemsEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#hasStableIds()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
-
-        void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        public bool AreAllItemsEnabled()
         {
-            var methodToExecute = (OnHasStableIds != null) ? OnHasStableIds : HasStableIds;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<bool>("areAllItemsEnabled", "()Z");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#hasStableIds()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool HasStableIds()
+        public bool HasStableIds()
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
-
-        void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEmpty != null) ? OnIsEmpty : IsEmpty;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<bool>("hasStableIds", "()Z");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEmpty()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#isEnabled(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnIsEnabled { get; set; } = null;
-
-        void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
+        public bool IsEmpty()
         {
-            var methodToExecute = (OnIsEnabled != null) ? OnIsEnabled : IsEnabled;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#isEnabled(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEnabled(int arg0)
+        public bool IsEnabled(int arg0)
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#removeFooter(android.view.View)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRemoveFooter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, bool> OnRemoveFooter { get; set; } = null;
-
-        void RemoveFooterEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnRemoveFooter != null) ? OnRemoveFooter : RemoveFooter;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<bool>("isEnabled", "(I)Z", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#removeFooter(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool RemoveFooter(Android.View.View arg0)
+        public bool RemoveFooter(Android.View.View arg0)
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#removeHeader(android.view.View)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRemoveHeader"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.View.View, bool> OnRemoveHeader { get; set; } = null;
-
-        void RemoveHeaderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnRemoveHeader != null) ? OnRemoveHeader : RemoveHeader;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<bool>("removeFooter", "(Landroid/view/View;)Z", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#removeHeader(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <returns><see cref="bool"/></returns>
-        public virtual bool RemoveHeader(Android.View.View arg0)
-        {
-            return default;
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Lang.CharSequence[] GetAutofillOptionsDefault()
-        {
-            return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptionsDefault");
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
-
-        void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetAutofillOptions != null) ? OnGetAutofillOptions : GetAutofillOptions;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="GetAutofillOptionsDefault"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Lang.CharSequence[] GetAutofillOptions()
-        {
-            return GetAutofillOptionsDefault();
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetCount { get; set; } = null;
-
-        void GetCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        public bool RemoveHeader(Android.View.View arg0)
         {
-            var methodToExecute = (OnGetCount != null) ? OnGetCount : GetCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<bool>("removeHeader", "(Landroid/view/View;)Z", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetCount()
+        public int GetCount()
         {
-            return default;
+            return IExecuteWithSignature<int>("getCount", "()I");
         }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getFootersCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFootersCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetFootersCount { get; set; } = null;
-
-        void GetFootersCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFootersCount != null) ? OnGetFootersCount : GetFootersCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getFootersCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetFootersCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getHeadersCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetHeadersCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetHeadersCount { get; set; } = null;
-
-        void GetHeadersCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        public int GetFootersCount()
         {
-            var methodToExecute = (OnGetHeadersCount != null) ? OnGetHeadersCount : GetHeadersCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<int>("getFootersCount", "()I");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getHeadersCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetHeadersCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getItemViewType(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
-
-        void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
+        public int GetHeadersCount()
         {
-            var methodToExecute = (OnGetItemViewType != null) ? OnGetItemViewType : GetItemViewType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<int>("getHeadersCount", "()I");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetItemViewType(int arg0)
+        public int GetItemViewType(int arg0)
         {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getViewTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
-
-        void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetViewTypeCount != null) ? OnGetViewTypeCount : GetViewTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<int>("getItemViewType", "(I)I", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetViewTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getItem(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetItem"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetItem { get; set; } = null;
-
-        void GetItemEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetItem != null) ? OnGetItem : GetItem;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getItem(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="object"/></returns>
-        public virtual object GetItem(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getItemId(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetItemId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetItemId { get; set; } = null;
-
-        void GetItemIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetItemId != null) ? OnGetItemId : GetItemId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getItemId(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetItemId(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
-
-        void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnRegisterDataSetObserver != null) ? OnRegisterDataSetObserver : RegisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
-
-        void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnUnregisterDataSetObserver != null) ? OnUnregisterDataSetObserver : UnregisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region HeaderViewListAdapterDirect
-    public partial class HeaderViewListAdapterDirect : Android.Widget.IWrapperListAdapter, Android.Widget.IFilterable
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecuteWithSignature<int>("getCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getFilter()"/> 
-        /// </summary>
-        public Android.Widget.Filter Filter
-        {
-            get { return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getFootersCount()"/> 
-        /// </summary>
-        public int FootersCount
-        {
-            get { return IExecuteWithSignature<int>("getFootersCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getHeadersCount()"/> 
-        /// </summary>
-        public int HeadersCount
-        {
-            get { return IExecuteWithSignature<int>("getHeadersCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecuteWithSignature<int>("getViewTypeCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getWrappedAdapter()"/> 
-        /// </summary>
-        public Android.Widget.ListAdapter WrappedAdapter
-        {
-            get { return IExecuteWithSignature<Android.Widget.ListAdapter>("getWrappedAdapter", "()Landroid/widget/ListAdapter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.View"/></param>
-        /// <param name="arg2"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public override Android.View.View GetView(int arg0, Android.View.View arg1, Android.View.ViewGroup arg2)
-        {
-            return IExecute<Android.View.View>("getView", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool AreAllItemsEnabled()
-        {
-            return IExecuteWithSignature<bool>("areAllItemsEnabled", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#hasStableIds()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool HasStableIds()
-        {
-            return IExecuteWithSignature<bool>("hasStableIds", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEmpty()
-        {
-            return IExecuteWithSignature<bool>("isEmpty", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#isEnabled(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEnabled(int arg0)
-        {
-            return IExecuteWithSignature<bool>("isEnabled", "(I)Z", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#removeFooter(android.view.View)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool RemoveFooter(Android.View.View arg0)
-        {
-            return IExecuteWithSignature<bool>("removeFooter", "(Landroid/view/View;)Z", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#removeHeader(android.view.View)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool RemoveHeader(Android.View.View arg0)
-        {
-            return IExecuteWithSignature<bool>("removeHeader", "(Landroid/view/View;)Z", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getItemViewType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetItemViewType(int arg0)
+        public int GetViewTypeCount()
         {
-            return IExecuteWithSignature<int>("getItemViewType", "(I)I", arg0);
+            return IExecuteWithSignature<int>("getViewTypeCount", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#getItem(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
-        public override object GetItem(int arg0)
+        public object GetItem(int arg0)
         {
             return IExecuteWithSignature("getItem", "(I)Ljava/lang/Object;", arg0);
         }
@@ -671,7 +204,7 @@ public override object GetItem(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        public override long GetItemId(int arg0)
+        public long GetItemId(int arg0)
         {
             return IExecuteWithSignature<long>("getItemId", "(I)J", arg0);
         }
@@ -679,7 +212,7 @@ public override long GetItemId(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
+        public void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
         {
             IExecuteWithSignature("registerDataSetObserver", "(Landroid/database/DataSetObserver;)V", arg0);
         }
@@ -687,7 +220,7 @@ public override void RegisterDataSetObserver(Android.Database.DataSetObserver ar
         /// <see href="https://developer.android.com/reference/android/widget/HeaderViewListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
+        public void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
         {
             IExecuteWithSignature("unregisterDataSetObserver", "(Landroid/database/DataSetObserver;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Widget/HeterogeneousExpandableList.cs b/src/net/Netdroid/Generated/Android/Widget/HeterogeneousExpandableList.cs
index 25600b7e4..1172b0694 100644
--- a/src/net/Netdroid/Generated/Android/Widget/HeterogeneousExpandableList.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/HeterogeneousExpandableList.cs
@@ -64,20 +64,6 @@ public partial class HeterogeneousExpandableList : Android.Widget.IHeterogeneous
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeterogeneousExpandableList.html#getChildTypeCount()"/> 
-        /// </summary>
-        public int ChildTypeCount
-        {
-            get { return IExecuteWithSignature<int>("getChildTypeCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HeterogeneousExpandableList.html#getGroupTypeCount()"/> 
-        /// </summary>
-        public int GroupTypeCount
-        {
-            get { return IExecuteWithSignature<int>("getGroupTypeCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeterogeneousExpandableList.html#getChildType(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -88,6 +74,14 @@ public int GetChildType(int arg0, int arg1)
             return IExecute<int>("getChildType", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/HeterogeneousExpandableList.html#getChildTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetChildTypeCount()
+        {
+            return IExecuteWithSignature<int>("getChildTypeCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HeterogeneousExpandableList.html#getGroupType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -96,6 +90,14 @@ public int GetGroupType(int arg0)
         {
             return IExecuteWithSignature<int>("getGroupType", "(I)I", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/HeterogeneousExpandableList.html#getGroupTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGroupTypeCount()
+        {
+            return IExecuteWithSignature<int>("getGroupTypeCount", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/HorizontalScrollView.cs b/src/net/Netdroid/Generated/Android/Widget/HorizontalScrollView.cs
index c999bd0cc..d32c0c36b 100644
--- a/src/net/Netdroid/Generated/Android/Widget/HorizontalScrollView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/HorizontalScrollView.cs
@@ -84,27 +84,6 @@ public HorizontalScrollView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#getLeftEdgeEffectColor()"/> <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#setLeftEdgeEffectColor(int)"/>
-        /// </summary>
-        public int LeftEdgeEffectColor
-        {
-            get { return IExecuteWithSignature<int>("getLeftEdgeEffectColor", "()I"); } set { IExecuteWithSignature("setLeftEdgeEffectColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#getMaxScrollAmount()"/> 
-        /// </summary>
-        public int MaxScrollAmount
-        {
-            get { return IExecuteWithSignature<int>("getMaxScrollAmount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#getRightEdgeEffectColor()"/> <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#setRightEdgeEffectColor(int)"/>
-        /// </summary>
-        public int RightEdgeEffectColor
-        {
-            get { return IExecuteWithSignature<int>("getRightEdgeEffectColor", "()I"); } set { IExecuteWithSignature("setRightEdgeEffectColor", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#arrowScroll(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -175,6 +154,30 @@ public void SmoothScrollTo(int arg0, int arg1)
             IExecute("smoothScrollTo", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#getLeftEdgeEffectColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLeftEdgeEffectColor()
+        {
+            return IExecuteWithSignature<int>("getLeftEdgeEffectColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#getMaxScrollAmount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxScrollAmount()
+        {
+            return IExecuteWithSignature<int>("getMaxScrollAmount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#getRightEdgeEffectColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRightEdgeEffectColor()
+        {
+            return IExecuteWithSignature<int>("getRightEdgeEffectColor", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#fling(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -199,6 +202,22 @@ public void SetFillViewport(bool arg0)
             IExecuteWithSignature("setFillViewport", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#setLeftEdgeEffectColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLeftEdgeEffectColor(int arg0)
+        {
+            IExecuteWithSignature("setLeftEdgeEffectColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#setRightEdgeEffectColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRightEdgeEffectColor(int arg0)
+        {
+            IExecuteWithSignature("setRightEdgeEffectColor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/HorizontalScrollView.html#setSmoothScrollingEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/ImageView.cs b/src/net/Netdroid/Generated/Android/Widget/ImageView.cs
index ef0b335c2..d921202e5 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ImageView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ImageView.cs
@@ -84,95 +84,84 @@ public ImageView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getAdjustViewBounds()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setAdjustViewBounds(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageTintList()"/>
         /// </summary>
-        public bool AdjustViewBounds
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetImageTintList()
         {
-            get { return IExecuteWithSignature<bool>("getAdjustViewBounds", "()Z"); } set { IExecuteWithSignature("setAdjustViewBounds", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getImageTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getBaselineAlignBottom()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setBaselineAlignBottom(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageTintBlendMode()"/>
         /// </summary>
-        public bool BaselineAlignBottom
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetImageTintBlendMode()
         {
-            get { return IExecuteWithSignature<bool>("getBaselineAlignBottom", "()Z"); } set { IExecuteWithSignature("setBaselineAlignBottom", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getImageTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getColorFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getColorFilter()"/>
         /// </summary>
-        public Android.Graphics.ColorFilter ColorFilter
+        /// <returns><see cref="Android.Graphics.ColorFilter"/></returns>
+        public Android.Graphics.ColorFilter GetColorFilter()
         {
-            get { return IExecuteWithSignature<Android.Graphics.ColorFilter>("getColorFilter", "()Landroid/graphics/ColorFilter;"); }
+            return IExecuteWithSignature<Android.Graphics.ColorFilter>("getColorFilter", "()Landroid/graphics/ColorFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getCropToPadding()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setCropToPadding(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getDrawable()"/>
         /// </summary>
-        public bool CropToPadding
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDrawable()
         {
-            get { return IExecuteWithSignature<bool>("getCropToPadding", "()Z"); } set { IExecuteWithSignature("setCropToPadding", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageMatrix()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Drawable
+        /// <returns><see cref="Android.Graphics.Matrix"/></returns>
+        public Android.Graphics.Matrix GetImageMatrix()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDrawable", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Matrix>("getImageMatrix", "()Landroid/graphics/Matrix;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getScaleType()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageTintMode()"/>
         /// </summary>
-        public Android.Widget.ImageView.ScaleType GetScaleType
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetImageTintMode()
         {
-            get { return IExecuteWithSignature<Android.Widget.ImageView.ScaleType>("getScaleType", "()Landroid/widget/ImageView$ScaleType;"); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getImageTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageAlpha()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageAlpha(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getScaleType()"/>
         /// </summary>
-        public int ImageAlpha
+        /// <returns><see cref="Android.Widget.ImageView.ScaleType"/></returns>
+        public Android.Widget.ImageView.ScaleType GetScaleType()
         {
-            get { return IExecuteWithSignature<int>("getImageAlpha", "()I"); } set { IExecuteWithSignature("setImageAlpha", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.ImageView.ScaleType>("getScaleType", "()Landroid/widget/ImageView$ScaleType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageMatrix()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageMatrix(android.graphics.Matrix)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getAdjustViewBounds()"/>
         /// </summary>
-        public Android.Graphics.Matrix ImageMatrix
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAdjustViewBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Matrix>("getImageMatrix", "()Landroid/graphics/Matrix;"); } set { IExecuteWithSignature("setImageMatrix", "(Landroid/graphics/Matrix;)V", value); }
+            return IExecuteWithSignature<bool>("getAdjustViewBounds", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getBaselineAlignBottom()"/>
         /// </summary>
-        public Android.Graphics.BlendMode ImageTintBlendMode
+        /// <returns><see cref="bool"/></returns>
+        public bool GetBaselineAlignBottom()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getImageTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setImageTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<bool>("getBaselineAlignBottom", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageTintList()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getCropToPadding()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList ImageTintList
+        /// <returns><see cref="bool"/></returns>
+        public bool GetCropToPadding()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getImageTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setImageTintList", "(Landroid/content/res/ColorStateList;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageTintMode()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageTintMode(android.graphics.PorterDuff.Mode)"/>
-        /// </summary>
-        public Android.Graphics.PorterDuff.Mode ImageTintMode
-        {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getImageTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setImageTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getMaxHeight()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setMaxHeight(int)"/>
-        /// </summary>
-        public int MaxHeight
-        {
-            get { return IExecuteWithSignature<int>("getMaxHeight", "()I"); } set { IExecuteWithSignature("setMaxHeight", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getMaxWidth()"/> <see href="https://developer.android.com/reference/android/widget/ImageView.html#setMaxWidth(int)"/>
-        /// </summary>
-        public int MaxWidth
-        {
-            get { return IExecuteWithSignature<int>("getMaxWidth", "()I"); } set { IExecuteWithSignature("setMaxWidth", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getCropToPadding", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#clearColorFilter()"/>
@@ -199,6 +188,30 @@ public void SetColorFilter(int arg0)
             IExecuteWithSignature("setColorFilter", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getImageAlpha()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetImageAlpha()
+        {
+            return IExecuteWithSignature<int>("getImageAlpha", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getMaxHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxHeight()
+        {
+            return IExecuteWithSignature<int>("getMaxHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#getMaxWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxWidth()
+        {
+            return IExecuteWithSignature<int>("getMaxWidth", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#onCreateDrawableState(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -216,10 +229,18 @@ public void AnimateTransform(Android.Graphics.Matrix arg0)
             IExecuteWithSignature("animateTransform", "(Landroid/graphics/Matrix;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setAdjustViewBounds(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAdjustViewBounds(bool arg0)
+        {
+            IExecuteWithSignature("setAdjustViewBounds", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setAlpha(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAlpha(int arg0)
         {
             IExecuteWithSignature("setAlpha", "(I)V", arg0);
@@ -233,6 +254,14 @@ public void SetBaseline(int arg0)
             IExecuteWithSignature("setBaseline", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setBaselineAlignBottom(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetBaselineAlignBottom(bool arg0)
+        {
+            IExecuteWithSignature("setBaselineAlignBottom", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setColorFilter(android.graphics.ColorFilter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.ColorFilter"/></param>
@@ -241,6 +270,22 @@ public void SetColorFilter(Android.Graphics.ColorFilter arg0)
             IExecuteWithSignature("setColorFilter", "(Landroid/graphics/ColorFilter;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setCropToPadding(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetCropToPadding(bool arg0)
+        {
+            IExecuteWithSignature("setCropToPadding", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageAlpha(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetImageAlpha(int arg0)
+        {
+            IExecuteWithSignature("setImageAlpha", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageBitmap(android.graphics.Bitmap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Bitmap"/></param>
@@ -273,6 +318,14 @@ public void SetImageLevel(int arg0)
             IExecuteWithSignature("setImageLevel", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageMatrix(android.graphics.Matrix)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Matrix"/></param>
+        public void SetImageMatrix(Android.Graphics.Matrix arg0)
+        {
+            IExecuteWithSignature("setImageMatrix", "(Landroid/graphics/Matrix;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageResource(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -290,6 +343,30 @@ public void SetImageState(int[] arg0, bool arg1)
             IExecute("setImageState", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetImageTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setImageTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetImageTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setImageTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetImageTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setImageTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setImageURI(android.net.Uri)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Net.Uri"/></param>
@@ -298,6 +375,22 @@ public void SetImageURI(Android.Net.Uri arg0)
             IExecuteWithSignature("setImageURI", "(Landroid/net/Uri;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setMaxHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxHeight(int arg0)
+        {
+            IExecuteWithSignature("setMaxHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setMaxWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxWidth(int arg0)
+        {
+            IExecuteWithSignature("setMaxWidth", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ImageView.html#setScaleType(android.widget.ImageView.ScaleType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.ImageView.ScaleType"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/Inline/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Widget/Inline/AllPackageClasses.cs
index 7c1bb9ae1..beab61ccb 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Inline/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Inline/AllPackageClasses.cs
@@ -76,12 +76,12 @@ public partial class SurfaceControlCallback : MASES.JCOBridge.C2JBridge.JVMBridg
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SurfaceControlCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SurfaceControlCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SurfaceControlCallback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SurfaceControlCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SurfaceControlCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SurfaceControlCallback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Android/Widget/Inline/InlineContentView.cs b/src/net/Netdroid/Generated/Android/Widget/Inline/InlineContentView.cs
index 574036db4..cd5bd2db1 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Inline/InlineContentView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Inline/InlineContentView.cs
@@ -46,11 +46,12 @@ public partial class InlineContentView
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/inline/InlineContentView.html#getSurfaceControl()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/inline/InlineContentView.html#getSurfaceControl()"/>
         /// </summary>
-        public Android.View.SurfaceControl SurfaceControl
+        /// <returns><see cref="Android.View.SurfaceControl"/></returns>
+        public Android.View.SurfaceControl GetSurfaceControl()
         {
-            get { return IExecuteWithSignature<Android.View.SurfaceControl>("getSurfaceControl", "()Landroid/view/SurfaceControl;"); }
+            return IExecuteWithSignature<Android.View.SurfaceControl>("getSurfaceControl", "()Landroid/view/SurfaceControl;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/inline/InlineContentView.html#isZOrderedOnTop()"/>
diff --git a/src/net/Netdroid/Generated/Android/Widget/Inline/InlinePresentationSpec.cs b/src/net/Netdroid/Generated/Android/Widget/Inline/InlinePresentationSpec.cs
index 605aef4d7..9ce991d4c 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Inline/InlinePresentationSpec.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Inline/InlinePresentationSpec.cs
@@ -52,25 +52,28 @@ public partial class InlinePresentationSpec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/inline/InlinePresentationSpec.html#getMaxSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/inline/InlinePresentationSpec.html#getStyle()"/>
         /// </summary>
-        public Android.Util.Size MaxSize
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetStyle()
         {
-            get { return IExecuteWithSignature<Android.Util.Size>("getMaxSize", "()Landroid/util/Size;"); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getStyle", "()Landroid/os/Bundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/inline/InlinePresentationSpec.html#getMinSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/inline/InlinePresentationSpec.html#getMaxSize()"/>
         /// </summary>
-        public Android.Util.Size MinSize
+        /// <returns><see cref="Android.Util.Size"/></returns>
+        public Android.Util.Size GetMaxSize()
         {
-            get { return IExecuteWithSignature<Android.Util.Size>("getMinSize", "()Landroid/util/Size;"); }
+            return IExecuteWithSignature<Android.Util.Size>("getMaxSize", "()Landroid/util/Size;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/inline/InlinePresentationSpec.html#getStyle()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/inline/InlinePresentationSpec.html#getMinSize()"/>
         /// </summary>
-        public Android.Os.Bundle Style
+        /// <returns><see cref="Android.Util.Size"/></returns>
+        public Android.Util.Size GetMinSize()
         {
-            get { return IExecuteWithSignature<Android.Os.Bundle>("getStyle", "()Landroid/os/Bundle;"); }
+            return IExecuteWithSignature<Android.Util.Size>("getMinSize", "()Landroid/util/Size;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/inline/InlinePresentationSpec.html#describeContents()"/>
diff --git a/src/net/Netdroid/Generated/Android/Widget/LinearLayout.cs b/src/net/Netdroid/Generated/Android/Widget/LinearLayout.cs
index 4a661fd30..d8bddaf40 100644
--- a/src/net/Netdroid/Generated/Android/Widget/LinearLayout.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/LinearLayout.cs
@@ -120,69 +120,76 @@ public LinearLayout(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getBaselineAlignedChildIndex()"/> <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setBaselineAlignedChildIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getDividerDrawable()"/>
         /// </summary>
-        public int BaselineAlignedChildIndex
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDividerDrawable()
         {
-            get { return IExecuteWithSignature<int>("getBaselineAlignedChildIndex", "()I"); } set { IExecuteWithSignature("setBaselineAlignedChildIndex", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDividerDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getDividerDrawable()"/> <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setDividerDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#isBaselineAligned()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable DividerDrawable
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBaselineAligned()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDividerDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setDividerDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<bool>("isBaselineAligned", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getDividerPadding()"/> <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setDividerPadding(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#isMeasureWithLargestChildEnabled()"/>
         /// </summary>
-        public int DividerPadding
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMeasureWithLargestChildEnabled()
         {
-            get { return IExecuteWithSignature<int>("getDividerPadding", "()I"); } set { IExecuteWithSignature("setDividerPadding", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isMeasureWithLargestChildEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getGravity()"/> <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getWeightSum()"/>
         /// </summary>
-        public int Gravity
+        /// <returns><see cref="float"/></returns>
+        public float GetWeightSum()
         {
-            get { return IExecuteWithSignature<int>("getGravity", "()I"); } set { IExecuteWithSignature("setGravity", "(I)V", value); }
+            return IExecuteWithSignature<float>("getWeightSum", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getOrientation()"/> <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setOrientation(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getBaselineAlignedChildIndex()"/>
         /// </summary>
-        public int Orientation
+        /// <returns><see cref="int"/></returns>
+        public int GetBaselineAlignedChildIndex()
         {
-            get { return IExecuteWithSignature<int>("getOrientation", "()I"); } set { IExecuteWithSignature("setOrientation", "(I)V", value); }
+            return IExecuteWithSignature<int>("getBaselineAlignedChildIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getShowDividers()"/> <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setShowDividers(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getDividerPadding()"/>
         /// </summary>
-        public int ShowDividers
+        /// <returns><see cref="int"/></returns>
+        public int GetDividerPadding()
         {
-            get { return IExecuteWithSignature<int>("getShowDividers", "()I"); } set { IExecuteWithSignature("setShowDividers", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDividerPadding", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getWeightSum()"/> <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setWeightSum(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getGravity()"/>
         /// </summary>
-        public float WeightSum
+        /// <returns><see cref="int"/></returns>
+        public int GetGravity()
         {
-            get { return IExecuteWithSignature<float>("getWeightSum", "()F"); } set { IExecuteWithSignature("setWeightSum", "(F)V", value); }
+            return IExecuteWithSignature<int>("getGravity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#isBaselineAligned()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getOrientation()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBaselineAligned()
+        /// <returns><see cref="int"/></returns>
+        public int GetOrientation()
         {
-            return IExecuteWithSignature<bool>("isBaselineAligned", "()Z");
+            return IExecuteWithSignature<int>("getOrientation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#isMeasureWithLargestChildEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#getShowDividers()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMeasureWithLargestChildEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetShowDividers()
         {
-            return IExecuteWithSignature<bool>("isMeasureWithLargestChildEnabled", "()Z");
+            return IExecuteWithSignature<int>("getShowDividers", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setBaselineAligned(boolean)"/>
@@ -193,6 +200,38 @@ public void SetBaselineAligned(bool arg0)
             IExecuteWithSignature("setBaselineAligned", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setBaselineAlignedChildIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBaselineAlignedChildIndex(int arg0)
+        {
+            IExecuteWithSignature("setBaselineAlignedChildIndex", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setDividerDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetDividerDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setDividerDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setDividerPadding(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDividerPadding(int arg0)
+        {
+            IExecuteWithSignature("setDividerPadding", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGravity(int arg0)
+        {
+            IExecuteWithSignature("setGravity", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setHorizontalGravity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -209,6 +248,22 @@ public void SetMeasureWithLargestChildEnabled(bool arg0)
             IExecuteWithSignature("setMeasureWithLargestChildEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setOrientation(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOrientation(int arg0)
+        {
+            IExecuteWithSignature("setOrientation", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setShowDividers(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetShowDividers(int arg0)
+        {
+            IExecuteWithSignature("setShowDividers", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setVerticalGravity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -216,6 +271,14 @@ public void SetVerticalGravity(int arg0)
         {
             IExecuteWithSignature("setVerticalGravity", "(I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/LinearLayout.html#setWeightSum(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetWeightSum(float arg0)
+        {
+            IExecuteWithSignature("setWeightSum", "(F)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/ListAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/ListAdapter.cs
index 3537eca61..29d660ae1 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ListAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ListAdapter.cs
@@ -68,19 +68,19 @@ public partial class ListAdapter : Android.Widget.IListAdapter
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
-            AddEventHandler("getCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getItem", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
-            AddEventHandler("getItemId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
+            AddEventHandler("getView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("areAllItemsEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
+            AddEventHandler("isEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
+            AddEventHandler("getCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
+            AddEventHandler("getItemViewType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
+            AddEventHandler("getViewTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
+            AddEventHandler("getItem", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
+            AddEventHandler("getItemId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("getAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
 
         }
 
@@ -88,7 +88,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
 
         void GetViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -113,7 +113,7 @@ public virtual Android.View.View GetView(int arg0, Android.View.View arg1, Andro
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -135,7 +135,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -157,7 +157,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ListAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
+        public global::System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
 
         void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -179,7 +179,7 @@ public virtual bool AreAllItemsEnabled()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ListAdapter.html#isEnabled(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnIsEnabled { get; set; } = null;
+        public global::System.Func<int, bool> OnIsEnabled { get; set; } = null;
 
         void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -202,7 +202,7 @@ public virtual bool IsEnabled(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetCount { get; set; } = null;
+        public global::System.Func<int> OnGetCount { get; set; } = null;
 
         void GetCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -224,7 +224,7 @@ public virtual int GetCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
+        public global::System.Func<int, int> OnGetItemViewType { get; set; } = null;
 
         void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -247,7 +247,7 @@ public virtual int GetItemViewType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetViewTypeCount { get; set; } = null;
 
         void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -269,7 +269,7 @@ public virtual int GetViewTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItem"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetItem { get; set; } = null;
+        public global::System.Func<int, object> OnGetItem { get; set; } = null;
 
         void GetItemEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -292,7 +292,7 @@ public virtual object GetItem(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemId(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetItemId { get; set; } = null;
+        public global::System.Func<int, long> OnGetItemId { get; set; } = null;
 
         void GetItemIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -315,7 +315,7 @@ public virtual long GetItemId(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -336,7 +336,7 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -366,7 +366,7 @@ public Java.Lang.CharSequence[] GetAutofillOptionsDefault()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
 
         void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -416,27 +416,6 @@ public partial class ListAdapterDirect : Android.Widget.IListAdapter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecute<int>("getCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecute<int>("getViewTypeCount"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -481,6 +460,14 @@ public override bool IsEnabled(int arg0)
             return IExecuteWithSignature<bool>("isEnabled", "(I)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetCount()
+        {
+            return IExecute<int>("getCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -490,6 +477,14 @@ public override int GetItemViewType(int arg0)
             return IExecute<int>("getItemViewType", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetViewTypeCount()
+        {
+            return IExecute<int>("getViewTypeCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -523,6 +518,14 @@ public override void UnregisterDataSetObserver(Android.Database.DataSetObserver
         {
             IExecute("unregisterDataSetObserver", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public override Java.Lang.CharSequence[] GetAutofillOptions()
+        {
+            return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/ListPopupWindow.cs b/src/net/Netdroid/Generated/Android/Widget/ListPopupWindow.cs
index bac9c0b40..66687d7ab 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ListPopupWindow.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ListPopupWindow.cs
@@ -126,197 +126,213 @@ public ListPopupWindow(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getAnchorView()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setAnchorView(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getBackground()"/>
         /// </summary>
-        public Android.View.View AnchorView
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetBackground()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getAnchorView", "()Landroid/view/View;"); } set { IExecuteWithSignature("setAnchorView", "(Landroid/view/View;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBackground", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getAnimationStyle()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setAnimationStyle(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getEpicenterBounds()"/>
         /// </summary>
-        public int AnimationStyle
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetEpicenterBounds()
         {
-            get { return IExecuteWithSignature<int>("getAnimationStyle", "()I"); } set { IExecuteWithSignature("setAnimationStyle", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getEpicenterBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getBackground()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getAnchorView()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Background
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetAnchorView()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBackground", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.View.View>("getAnchorView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getEpicenterBounds()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setEpicenterBounds(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSelectedView()"/>
         /// </summary>
-        public Android.Graphics.Rect EpicenterBounds
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetSelectedView()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getEpicenterBounds", "()Landroid/graphics/Rect;"); } set { IExecuteWithSignature("setEpicenterBounds", "(Landroid/graphics/Rect;)V", value); }
+            return IExecuteWithSignature<Android.View.View>("getSelectedView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getHeight()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#createDragToOpenListener(android.view.View)"/>
         /// </summary>
-        public int Height
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <returns><see cref="Android.View.View.OnTouchListener"/></returns>
+        public Android.View.View.OnTouchListener CreateDragToOpenListener(Android.View.View arg0)
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); } set { IExecuteWithSignature("setHeight", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.View.OnTouchListener>("createDragToOpenListener", "(Landroid/view/View;)Landroid/view/View$OnTouchListener;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getHorizontalOffset()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setHorizontalOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#createDragToOpenListener(android.view.View)"/>
         /// </summary>
-        public int HorizontalOffset
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <returns><see cref="Android.View.View.OnTouchListener"/></returns>
+        public Android.View.View.OnTouchListener CreateDragToOpenListenerDirect(Android.View.View arg0)
         {
-            get { return IExecuteWithSignature<int>("getHorizontalOffset", "()I"); } set { IExecuteWithSignature("setHorizontalOffset", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.View.OnTouchListenerDirect, Android.View.View.OnTouchListener>("createDragToOpenListener", "(Landroid/view/View;)Landroid/view/View$OnTouchListener;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getInputMethodMode()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setInputMethodMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getListView()"/>
         /// </summary>
-        public int InputMethodMode
+        /// <returns><see cref="Android.Widget.ListView"/></returns>
+        public Android.Widget.ListView GetListView()
         {
-            get { return IExecuteWithSignature<int>("getInputMethodMode", "()I"); } set { IExecuteWithSignature("setInputMethodMode", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.ListView>("getListView", "()Landroid/widget/ListView;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getListView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#isInputMethodNotNeeded()"/>
         /// </summary>
-        public Android.Widget.ListView ListView
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInputMethodNotNeeded()
         {
-            get { return IExecuteWithSignature<Android.Widget.ListView>("getListView", "()Landroid/widget/ListView;"); }
+            return IExecuteWithSignature<bool>("isInputMethodNotNeeded", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getPromptPosition()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setPromptPosition(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#isModal()"/>
         /// </summary>
-        public int PromptPosition
+        /// <returns><see cref="bool"/></returns>
+        public bool IsModal()
         {
-            get { return IExecuteWithSignature<int>("getPromptPosition", "()I"); } set { IExecuteWithSignature("setPromptPosition", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isModal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSelectedItem()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#isShowing()"/>
         /// </summary>
-        public object SelectedItem
+        /// <returns><see cref="bool"/></returns>
+        public bool IsShowing()
         {
-            get { return IExecuteWithSignature("getSelectedItem", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<bool>("isShowing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSelectedItemId()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#onKeyDown(int,android.view.KeyEvent)"/>
         /// </summary>
-        public long SelectedItemId
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyDown(int arg0, Android.View.KeyEvent arg1)
         {
-            get { return IExecuteWithSignature<long>("getSelectedItemId", "()J"); }
+            return IExecute<bool>("onKeyDown", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSelectedItemPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#onKeyPreIme(int,android.view.KeyEvent)"/>
         /// </summary>
-        public int SelectedItemPosition
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyPreIme(int arg0, Android.View.KeyEvent arg1)
         {
-            get { return IExecuteWithSignature<int>("getSelectedItemPosition", "()I"); }
+            return IExecute<bool>("onKeyPreIme", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSelectedView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#onKeyUp(int,android.view.KeyEvent)"/>
         /// </summary>
-        public Android.View.View SelectedView
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnKeyUp(int arg0, Android.View.KeyEvent arg1)
         {
-            get { return IExecuteWithSignature<Android.View.View>("getSelectedView", "()Landroid/view/View;"); }
+            return IExecute<bool>("onKeyUp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSoftInputMode()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setSoftInputMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#performItemClick(int)"/>
         /// </summary>
-        public int SoftInputMode
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool PerformItemClick(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getSoftInputMode", "()I"); } set { IExecuteWithSignature("setSoftInputMode", "(I)V", value); }
+            return IExecuteWithSignature<bool>("performItemClick", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getVerticalOffset()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setVerticalOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getAnimationStyle()"/>
         /// </summary>
-        public int VerticalOffset
+        /// <returns><see cref="int"/></returns>
+        public int GetAnimationStyle()
         {
-            get { return IExecuteWithSignature<int>("getVerticalOffset", "()I"); } set { IExecuteWithSignature("setVerticalOffset", "(I)V", value); }
+            return IExecuteWithSignature<int>("getAnimationStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getWidth()"/> <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getHeight()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); } set { IExecuteWithSignature("setWidth", "(I)V", value); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#createDragToOpenListener(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getHorizontalOffset()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <returns><see cref="Android.View.View.OnTouchListener"/></returns>
-        public Android.View.View.OnTouchListener CreateDragToOpenListener(Android.View.View arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetHorizontalOffset()
         {
-            return IExecuteWithSignature<Android.View.View.OnTouchListener>("createDragToOpenListener", "(Landroid/view/View;)Landroid/view/View$OnTouchListener;", arg0);
+            return IExecuteWithSignature<int>("getHorizontalOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#createDragToOpenListener(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getInputMethodMode()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <returns><see cref="Android.View.View.OnTouchListener"/></returns>
-        public Android.View.View.OnTouchListener CreateDragToOpenListenerDirect(Android.View.View arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetInputMethodMode()
         {
-            return IExecuteWithSignature<Android.View.View.OnTouchListenerDirect, Android.View.View.OnTouchListener>("createDragToOpenListener", "(Landroid/view/View;)Landroid/view/View$OnTouchListener;", arg0);
+            return IExecuteWithSignature<int>("getInputMethodMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#isInputMethodNotNeeded()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getPromptPosition()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInputMethodNotNeeded()
+        /// <returns><see cref="int"/></returns>
+        public int GetPromptPosition()
         {
-            return IExecuteWithSignature<bool>("isInputMethodNotNeeded", "()Z");
+            return IExecuteWithSignature<int>("getPromptPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#isModal()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSelectedItemPosition()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsModal()
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectedItemPosition()
         {
-            return IExecuteWithSignature<bool>("isModal", "()Z");
+            return IExecuteWithSignature<int>("getSelectedItemPosition", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#isShowing()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSoftInputMode()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsShowing()
+        /// <returns><see cref="int"/></returns>
+        public int GetSoftInputMode()
         {
-            return IExecuteWithSignature<bool>("isShowing", "()Z");
+            return IExecuteWithSignature<int>("getSoftInputMode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#onKeyDown(int,android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getVerticalOffset()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyDown(int arg0, Android.View.KeyEvent arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetVerticalOffset()
         {
-            return IExecute<bool>("onKeyDown", arg0, arg1);
+            return IExecuteWithSignature<int>("getVerticalOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#onKeyPreIme(int,android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getWidth()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyPreIme(int arg0, Android.View.KeyEvent arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            return IExecute<bool>("onKeyPreIme", arg0, arg1);
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#onKeyUp(int,android.view.KeyEvent)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSelectedItem()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.View.KeyEvent"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnKeyUp(int arg0, Android.View.KeyEvent arg1)
+        /// <returns><see cref="object"/></returns>
+        public object GetSelectedItem()
         {
-            return IExecute<bool>("onKeyUp", arg0, arg1);
+            return IExecuteWithSignature("getSelectedItem", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#performItemClick(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#getSelectedItemId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool PerformItemClick(int arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetSelectedItemId()
         {
-            return IExecuteWithSignature<bool>("performItemClick", "(I)Z", arg0);
+            return IExecuteWithSignature<long>("getSelectedItemId", "()J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#clearListSelection()"/>
@@ -348,6 +364,22 @@ public void SetAdapter(Android.Widget.ListAdapter arg0)
             IExecuteWithSignature("setAdapter", "(Landroid/widget/ListAdapter;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setAnchorView(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetAnchorView(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setAnchorView", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setAnimationStyle(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAnimationStyle(int arg0)
+        {
+            IExecuteWithSignature("setAnimationStyle", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setBackgroundDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -372,6 +404,38 @@ public void SetDropDownGravity(int arg0)
             IExecuteWithSignature("setDropDownGravity", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setEpicenterBounds(android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        public void SetEpicenterBounds(Android.Graphics.Rect arg0)
+        {
+            IExecuteWithSignature("setEpicenterBounds", "(Landroid/graphics/Rect;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHeight(int arg0)
+        {
+            IExecuteWithSignature("setHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setHorizontalOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHorizontalOffset(int arg0)
+        {
+            IExecuteWithSignature("setHorizontalOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setInputMethodMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInputMethodMode(int arg0)
+        {
+            IExecuteWithSignature("setInputMethodMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setListSelector(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -412,6 +476,14 @@ public void SetOnItemSelectedListener(Android.Widget.AdapterView.OnItemSelectedL
             IExecuteWithSignature("setOnItemSelectedListener", "(Landroid/widget/AdapterView$OnItemSelectedListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setPromptPosition(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPromptPosition(int arg0)
+        {
+            IExecuteWithSignature("setPromptPosition", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setPromptView(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -428,6 +500,30 @@ public void SetSelection(int arg0)
             IExecuteWithSignature("setSelection", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setSoftInputMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSoftInputMode(int arg0)
+        {
+            IExecuteWithSignature("setSoftInputMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setVerticalOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVerticalOffset(int arg0)
+        {
+            IExecuteWithSignature("setVerticalOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetWidth(int arg0)
+        {
+            IExecuteWithSignature("setWidth", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ListPopupWindow.html#setWindowLayoutType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/ListView.cs b/src/net/Netdroid/Generated/Android/Widget/ListView.cs
index 6f63776f7..36ee3fb81 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ListView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ListView.cs
@@ -84,102 +84,111 @@ public ListView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getCheckItemIds()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getDivider()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long[] CheckItemIds
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetDivider()
         {
-            get { return IExecuteWithSignatureArray<long>("getCheckItemIds", "()[J"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDivider", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getDivider()"/> <see href="https://developer.android.com/reference/android/widget/ListView.html#setDivider(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getOverscrollFooter()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Divider
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetOverscrollFooter()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getDivider", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setDivider", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverscrollFooter", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getDividerHeight()"/> <see href="https://developer.android.com/reference/android/widget/ListView.html#setDividerHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getOverscrollHeader()"/>
         /// </summary>
-        public int DividerHeight
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetOverscrollHeader()
         {
-            get { return IExecuteWithSignature<int>("getDividerHeight", "()I"); } set { IExecuteWithSignature("setDividerHeight", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverscrollHeader", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getFooterViewsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#areFooterDividersEnabled()"/>
         /// </summary>
-        public int FooterViewsCount
+        /// <returns><see cref="bool"/></returns>
+        public bool AreFooterDividersEnabled()
         {
-            get { return IExecuteWithSignature<int>("getFooterViewsCount", "()I"); }
+            return IExecuteWithSignature<bool>("areFooterDividersEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getHeaderViewsCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#areHeaderDividersEnabled()"/>
         /// </summary>
-        public int HeaderViewsCount
+        /// <returns><see cref="bool"/></returns>
+        public bool AreHeaderDividersEnabled()
         {
-            get { return IExecuteWithSignature<int>("getHeaderViewsCount", "()I"); }
+            return IExecuteWithSignature<bool>("areHeaderDividersEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getItemsCanFocus()"/> <see href="https://developer.android.com/reference/android/widget/ListView.html#setItemsCanFocus(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getItemsCanFocus()"/>
         /// </summary>
-        public bool ItemsCanFocus
+        /// <returns><see cref="bool"/></returns>
+        public bool GetItemsCanFocus()
         {
-            get { return IExecuteWithSignature<bool>("getItemsCanFocus", "()Z"); } set { IExecuteWithSignature("setItemsCanFocus", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getItemsCanFocus", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getMaxScrollAmount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#removeFooterView(android.view.View)"/>
         /// </summary>
-        public int MaxScrollAmount
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool RemoveFooterView(Android.View.View arg0)
         {
-            get { return IExecuteWithSignature<int>("getMaxScrollAmount", "()I"); }
+            return IExecuteWithSignature<bool>("removeFooterView", "(Landroid/view/View;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getOverscrollFooter()"/> <see href="https://developer.android.com/reference/android/widget/ListView.html#setOverscrollFooter(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#removeHeaderView(android.view.View)"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable OverscrollFooter
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool RemoveHeaderView(Android.View.View arg0)
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverscrollFooter", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setOverscrollFooter", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<bool>("removeHeaderView", "(Landroid/view/View;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getOverscrollHeader()"/> <see href="https://developer.android.com/reference/android/widget/ListView.html#setOverscrollHeader(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getDividerHeight()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable OverscrollHeader
+        /// <returns><see cref="int"/></returns>
+        public int GetDividerHeight()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverscrollHeader", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setOverscrollHeader", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<int>("getDividerHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#areFooterDividersEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getFooterViewsCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool AreFooterDividersEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetFooterViewsCount()
         {
-            return IExecuteWithSignature<bool>("areFooterDividersEnabled", "()Z");
+            return IExecuteWithSignature<int>("getFooterViewsCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#areHeaderDividersEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getHeaderViewsCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool AreHeaderDividersEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetHeaderViewsCount()
         {
-            return IExecuteWithSignature<bool>("areHeaderDividersEnabled", "()Z");
+            return IExecuteWithSignature<int>("getHeaderViewsCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#removeFooterView(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getMaxScrollAmount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RemoveFooterView(Android.View.View arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxScrollAmount()
         {
-            return IExecuteWithSignature<bool>("removeFooterView", "(Landroid/view/View;)Z", arg0);
+            return IExecuteWithSignature<int>("getMaxScrollAmount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#removeHeaderView(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#getCheckItemIds()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RemoveHeaderView(Android.View.View arg0)
+        /// <returns><see cref="long"/></returns>
+        [global::System.Obsolete()]
+        public long[] GetCheckItemIds()
         {
-            return IExecuteWithSignature<bool>("removeHeaderView", "(Landroid/view/View;)Z", arg0);
+            return IExecuteWithSignatureArray<long>("getCheckItemIds", "()[J");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ListView.html#addFooterView(android.view.View,java.lang.Object,boolean)"/>
@@ -218,6 +227,22 @@ public void AddHeaderView(Android.View.View arg0)
             IExecuteWithSignature("addHeaderView", "(Landroid/view/View;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#setDivider(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetDivider(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setDivider", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#setDividerHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDividerHeight(int arg0)
+        {
+            IExecuteWithSignature("setDividerHeight", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ListView.html#setFooterDividersEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -234,6 +259,30 @@ public void SetHeaderDividersEnabled(bool arg0)
             IExecuteWithSignature("setHeaderDividersEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#setItemsCanFocus(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetItemsCanFocus(bool arg0)
+        {
+            IExecuteWithSignature("setItemsCanFocus", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#setOverscrollFooter(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetOverscrollFooter(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setOverscrollFooter", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ListView.html#setOverscrollHeader(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetOverscrollHeader(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setOverscrollHeader", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ListView.html#setSelectionAfterHeaderView()"/>
         /// </summary>
         public void SetSelectionAfterHeaderView()
diff --git a/src/net/Netdroid/Generated/Android/Widget/Magnifier.cs b/src/net/Netdroid/Generated/Android/Widget/Magnifier.cs
index 661dbf0df..7af3cfd2d 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Magnifier.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Magnifier.cs
@@ -33,7 +33,7 @@ public partial class Magnifier
         /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#%3Cinit%3E(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Magnifier(Android.View.View arg0)
             : base(arg0)
         {
@@ -67,96 +67,108 @@ public Magnifier(Android.View.View arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getCornerRadius()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getOverlay()"/>
         /// </summary>
-        public float CornerRadius
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetOverlay()
         {
-            get { return IExecuteWithSignature<float>("getCornerRadius", "()F"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverlay", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getDefaultHorizontalSourceToMagnifierOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getPosition()"/>
         /// </summary>
-        public int DefaultHorizontalSourceToMagnifierOffset
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetPosition()
         {
-            get { return IExecuteWithSignature<int>("getDefaultHorizontalSourceToMagnifierOffset", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getPosition", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getDefaultVerticalSourceToMagnifierOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getSourcePosition()"/>
         /// </summary>
-        public int DefaultVerticalSourceToMagnifierOffset
+        /// <returns><see cref="Android.Graphics.Point"/></returns>
+        public Android.Graphics.Point GetSourcePosition()
         {
-            get { return IExecuteWithSignature<int>("getDefaultVerticalSourceToMagnifierOffset", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Point>("getSourcePosition", "()Landroid/graphics/Point;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getElevation()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#isClippingEnabled()"/>
         /// </summary>
-        public float Elevation
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClippingEnabled()
         {
-            get { return IExecuteWithSignature<float>("getElevation", "()F"); }
+            return IExecuteWithSignature<bool>("isClippingEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getCornerRadius()"/>
         /// </summary>
-        public int Height
+        /// <returns><see cref="float"/></returns>
+        public float GetCornerRadius()
         {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); }
+            return IExecuteWithSignature<float>("getCornerRadius", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getOverlay()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getElevation()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Overlay
+        /// <returns><see cref="float"/></returns>
+        public float GetElevation()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverlay", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<float>("getElevation", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getPosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getZoom()"/>
         /// </summary>
-        public Android.Graphics.Point Position
+        /// <returns><see cref="float"/></returns>
+        public float GetZoom()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getPosition", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<float>("getZoom", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getSourceHeight()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getDefaultHorizontalSourceToMagnifierOffset()"/>
         /// </summary>
-        public int SourceHeight
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultHorizontalSourceToMagnifierOffset()
         {
-            get { return IExecuteWithSignature<int>("getSourceHeight", "()I"); }
+            return IExecuteWithSignature<int>("getDefaultHorizontalSourceToMagnifierOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getSourcePosition()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getDefaultVerticalSourceToMagnifierOffset()"/>
         /// </summary>
-        public Android.Graphics.Point SourcePosition
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultVerticalSourceToMagnifierOffset()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Point>("getSourcePosition", "()Landroid/graphics/Point;"); }
+            return IExecuteWithSignature<int>("getDefaultVerticalSourceToMagnifierOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getSourceWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getHeight()"/>
         /// </summary>
-        public int SourceWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
         {
-            get { return IExecuteWithSignature<int>("getSourceWidth", "()I"); }
+            return IExecuteWithSignature<int>("getHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getWidth()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getSourceHeight()"/>
         /// </summary>
-        public int Width
+        /// <returns><see cref="int"/></returns>
+        public int GetSourceHeight()
         {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); }
+            return IExecuteWithSignature<int>("getSourceHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getZoom()"/> <see href="https://developer.android.com/reference/android/widget/Magnifier.html#setZoom(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getSourceWidth()"/>
         /// </summary>
-        public float Zoom
+        /// <returns><see cref="int"/></returns>
+        public int GetSourceWidth()
         {
-            get { return IExecuteWithSignature<float>("getZoom", "()F"); } set { IExecuteWithSignature("setZoom", "(F)V", value); }
+            return IExecuteWithSignature<int>("getSourceWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#isClippingEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#getWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClippingEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
         {
-            return IExecuteWithSignature<bool>("isClippingEnabled", "()Z");
+            return IExecuteWithSignature<int>("getWidth", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#dismiss()"/>
@@ -166,6 +178,14 @@ public void Dismiss()
             IExecuteWithSignature("dismiss", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#setZoom(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetZoom(float arg0)
+        {
+            IExecuteWithSignature("setZoom", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Magnifier.html#show(float,float,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/MediaController.cs b/src/net/Netdroid/Generated/Android/Widget/MediaController.cs
index 6c4a5266d..9cbe321ac 100644
--- a/src/net/Netdroid/Generated/Android/Widget/MediaController.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/MediaController.cs
@@ -158,34 +158,6 @@ public partial class MediaPlayerControl
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#getAudioSessionId()"/> 
-            /// </summary>
-            public int AudioSessionId
-            {
-                get { return IExecuteWithSignature<int>("getAudioSessionId", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#getBufferPercentage()"/> 
-            /// </summary>
-            public int BufferPercentage
-            {
-                get { return IExecuteWithSignature<int>("getBufferPercentage", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#getCurrentPosition()"/> 
-            /// </summary>
-            public int CurrentPosition
-            {
-                get { return IExecuteWithSignature<int>("getCurrentPosition", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#getDuration()"/> 
-            /// </summary>
-            public int Duration
-            {
-                get { return IExecuteWithSignature<int>("getDuration", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#canPause()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
@@ -218,6 +190,38 @@ public bool IsPlaying()
                 return IExecuteWithSignature<bool>("isPlaying", "()Z");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#getAudioSessionId()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetAudioSessionId()
+            {
+                return IExecuteWithSignature<int>("getAudioSessionId", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#getBufferPercentage()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetBufferPercentage()
+            {
+                return IExecuteWithSignature<int>("getBufferPercentage", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#getCurrentPosition()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetCurrentPosition()
+            {
+                return IExecuteWithSignature<int>("getCurrentPosition", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#getDuration()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetDuration()
+            {
+                return IExecuteWithSignature<int>("getDuration", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/MediaController.MediaPlayerControl.html#pause()"/>
             /// </summary>
             public void Pause()
diff --git a/src/net/Netdroid/Generated/Android/Widget/NumberPicker.cs b/src/net/Netdroid/Generated/Android/Widget/NumberPicker.cs
index 0aabfdc33..a68a93270 100644
--- a/src/net/Netdroid/Generated/Android/Widget/NumberPicker.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/NumberPicker.cs
@@ -84,60 +84,76 @@ public NumberPicker(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getDisplayedValues()"/> <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setDisplayedValues(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getWrapSelectorWheel()"/>
         /// </summary>
-        public Java.Lang.String[] DisplayedValues
+        /// <returns><see cref="bool"/></returns>
+        public bool GetWrapSelectorWheel()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getDisplayedValues", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setDisplayedValues", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getWrapSelectorWheel", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getMaxValue()"/> <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setMaxValue(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getTextSize()"/>
         /// </summary>
-        public int MaxValue
+        /// <returns><see cref="float"/></returns>
+        public float GetTextSize()
         {
-            get { return IExecuteWithSignature<int>("getMaxValue", "()I"); } set { IExecuteWithSignature("setMaxValue", "(I)V", value); }
+            return IExecuteWithSignature<float>("getTextSize", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getMinValue()"/> <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setMinValue(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getMaxValue()"/>
         /// </summary>
-        public int MinValue
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxValue()
         {
-            get { return IExecuteWithSignature<int>("getMinValue", "()I"); } set { IExecuteWithSignature("setMinValue", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getSelectionDividerHeight()"/> <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setSelectionDividerHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getMinValue()"/>
         /// </summary>
-        public int SelectionDividerHeight
+        /// <returns><see cref="int"/></returns>
+        public int GetMinValue()
         {
-            get { return IExecuteWithSignature<int>("getSelectionDividerHeight", "()I"); } set { IExecuteWithSignature("setSelectionDividerHeight", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMinValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getTextColor()"/> <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setTextColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getSelectionDividerHeight()"/>
         /// </summary>
-        public int TextColor
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionDividerHeight()
         {
-            get { return IExecuteWithSignature<int>("getTextColor", "()I"); } set { IExecuteWithSignature("setTextColor", "(I)V", value); }
+            return IExecuteWithSignature<int>("getSelectionDividerHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getTextSize()"/> <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setTextSize(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getTextColor()"/>
         /// </summary>
-        public float TextSize
+        /// <returns><see cref="int"/></returns>
+        public int GetTextColor()
         {
-            get { return IExecuteWithSignature<float>("getTextSize", "()F"); } set { IExecuteWithSignature("setTextSize", "(F)V", value); }
+            return IExecuteWithSignature<int>("getTextColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getValue()"/> <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setValue(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getValue()"/>
         /// </summary>
-        public int Value
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
         {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); } set { IExecuteWithSignature("setValue", "(I)V", value); }
+            return IExecuteWithSignature<int>("getValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getWrapSelectorWheel()"/> <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setWrapSelectorWheel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#getDisplayedValues()"/>
         /// </summary>
-        public bool WrapSelectorWheel
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetDisplayedValues()
         {
-            get { return IExecuteWithSignature<bool>("getWrapSelectorWheel", "()Z"); } set { IExecuteWithSignature("setWrapSelectorWheel", "(Z)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getDisplayedValues", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setDisplayedValues(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDisplayedValues(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setDisplayedValues", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setFormatter(android.widget.NumberPicker.Formatter)"/>
@@ -148,6 +164,22 @@ public void SetFormatter(Android.Widget.NumberPicker.Formatter arg0)
             IExecuteWithSignature("setFormatter", "(Landroid/widget/NumberPicker$Formatter;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setMaxValue(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxValue(int arg0)
+        {
+            IExecuteWithSignature("setMaxValue", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setMinValue(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinValue(int arg0)
+        {
+            IExecuteWithSignature("setMinValue", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setOnLongPressUpdateInterval(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
@@ -171,6 +203,46 @@ public void SetOnValueChangedListener(Android.Widget.NumberPicker.OnValueChangeL
         {
             IExecuteWithSignature("setOnValueChangedListener", "(Landroid/widget/NumberPicker$OnValueChangeListener;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setSelectionDividerHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSelectionDividerHeight(int arg0)
+        {
+            IExecuteWithSignature("setSelectionDividerHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setTextColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTextColor(int arg0)
+        {
+            IExecuteWithSignature("setTextColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setTextSize(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTextSize(float arg0)
+        {
+            IExecuteWithSignature("setTextSize", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setValue(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetValue(int arg0)
+        {
+            IExecuteWithSignature("setValue", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/NumberPicker.html#setWrapSelectorWheel(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetWrapSelectorWheel(bool arg0)
+        {
+            IExecuteWithSignature("setWrapSelectorWheel", "(Z)V", arg0);
+        }
 
         #endregion
 
@@ -240,7 +312,7 @@ public partial class OnScrollListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onScrollStateChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.NumberPicker>>>(OnScrollStateChangeEventHandler));
+                AddEventHandler("onScrollStateChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.NumberPicker>>>(OnScrollStateChangeEventHandler));
 
             }
 
@@ -248,7 +320,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/NumberPicker.OnScrollListener.html#onScrollStateChange(android.widget.NumberPicker,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScrollStateChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.NumberPicker, int> OnOnScrollStateChange { get; set; } = null;
+            public global::System.Action<Android.Widget.NumberPicker, int> OnOnScrollStateChange { get; set; } = null;
 
             void OnScrollStateChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.NumberPicker>> data)
             {
@@ -341,7 +413,7 @@ public partial class OnValueChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onValueChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.NumberPicker>>>(OnValueChangeEventHandler));
+                AddEventHandler("onValueChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.NumberPicker>>>(OnValueChangeEventHandler));
 
             }
 
@@ -349,7 +421,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/NumberPicker.OnValueChangeListener.html#onValueChange(android.widget.NumberPicker,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnValueChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.NumberPicker, int, int> OnOnValueChange { get; set; } = null;
+            public global::System.Action<Android.Widget.NumberPicker, int, int> OnOnValueChange { get; set; } = null;
 
             void OnValueChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.NumberPicker>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/OverScroller.cs b/src/net/Netdroid/Generated/Android/Widget/OverScroller.cs
index 8872dbb04..4858c8ae1 100644
--- a/src/net/Netdroid/Generated/Android/Widget/OverScroller.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/OverScroller.cs
@@ -37,7 +37,7 @@ public partial class OverScroller
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
         /// <param name="arg4"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public OverScroller(Android.Content.Context arg0, Android.View.Animation.Interpolator arg1, float arg2, float arg3, bool arg4)
             : base(arg0, arg1, arg2, arg3, arg4)
         {
@@ -49,7 +49,7 @@ public OverScroller(Android.Content.Context arg0, Android.View.Animation.Interpo
         /// <param name="arg1"><see cref="Android.View.Animation.Interpolator"/></param>
         /// <param name="arg2"><see cref="float"/></param>
         /// <param name="arg3"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public OverScroller(Android.Content.Context arg0, Android.View.Animation.Interpolator arg1, float arg2, float arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -88,91 +88,90 @@ public OverScroller(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getCurrVelocity()"/> 
-        /// </summary>
-        public float CurrVelocity
-        {
-            get { return IExecuteWithSignature<float>("getCurrVelocity", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getCurrX()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#computeScrollOffset()"/>
         /// </summary>
-        public int CurrX
+        /// <returns><see cref="bool"/></returns>
+        public bool ComputeScrollOffset()
         {
-            get { return IExecuteWithSignature<int>("getCurrX", "()I"); }
+            return IExecuteWithSignature<bool>("computeScrollOffset", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getCurrY()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#isOverScrolled()"/>
         /// </summary>
-        public int CurrY
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOverScrolled()
         {
-            get { return IExecuteWithSignature<int>("getCurrY", "()I"); }
+            return IExecuteWithSignature<bool>("isOverScrolled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getFinalX()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#springBack(int,int,int,int,int,int)"/>
         /// </summary>
-        public int FinalX
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SpringBack(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
         {
-            get { return IExecuteWithSignature<int>("getFinalX", "()I"); }
+            return IExecute<bool>("springBack", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getFinalY()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#isFinished()"/>
         /// </summary>
-        public int FinalY
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFinished()
         {
-            get { return IExecuteWithSignature<int>("getFinalY", "()I"); }
+            return IExecuteWithSignature<bool>("isFinished", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getStartX()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getCurrX()"/>
         /// </summary>
-        public int StartX
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrX()
         {
-            get { return IExecuteWithSignature<int>("getStartX", "()I"); }
+            return IExecuteWithSignature<int>("getCurrX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getStartY()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getCurrY()"/>
         /// </summary>
-        public int StartY
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrY()
         {
-            get { return IExecuteWithSignature<int>("getStartY", "()I"); }
+            return IExecuteWithSignature<int>("getCurrY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#computeScrollOffset()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getFinalX()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ComputeScrollOffset()
+        /// <returns><see cref="int"/></returns>
+        public int GetFinalX()
         {
-            return IExecuteWithSignature<bool>("computeScrollOffset", "()Z");
+            return IExecuteWithSignature<int>("getFinalX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#isOverScrolled()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getFinalY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOverScrolled()
+        /// <returns><see cref="int"/></returns>
+        public int GetFinalY()
         {
-            return IExecuteWithSignature<bool>("isOverScrolled", "()Z");
+            return IExecuteWithSignature<int>("getFinalY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#springBack(int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getStartX()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SpringBack(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
+        /// <returns><see cref="int"/></returns>
+        public int GetStartX()
         {
-            return IExecute<bool>("springBack", arg0, arg1, arg2, arg3, arg4, arg5);
+            return IExecuteWithSignature<int>("getStartX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#isFinished()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getStartY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFinished()
+        /// <returns><see cref="int"/></returns>
+        public int GetStartY()
         {
-            return IExecuteWithSignature<bool>("isFinished", "()Z");
+            return IExecuteWithSignature<int>("getStartY", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#forceFinished(boolean)"/>
@@ -191,6 +190,14 @@ public void SetFriction(float arg0)
             IExecuteWithSignature("setFriction", "(F)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#getCurrVelocity()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetCurrVelocity()
+        {
+            return IExecuteWithSignature<float>("getCurrVelocity", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/OverScroller.html#abortAnimation()"/>
         /// </summary>
         public void AbortAnimation()
diff --git a/src/net/Netdroid/Generated/Android/Widget/PopupMenu.cs b/src/net/Netdroid/Generated/Android/Widget/PopupMenu.cs
index 5993c1b01..132552c1a 100644
--- a/src/net/Netdroid/Generated/Android/Widget/PopupMenu.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/PopupMenu.cs
@@ -77,32 +77,44 @@ public PopupMenu(Android.Content.Context arg0, Android.View.View arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getDragToOpenListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getMenu()"/>
         /// </summary>
-        public Android.View.View.OnTouchListener DragToOpenListener
+        /// <returns><see cref="Android.View.Menu"/></returns>
+        public Android.View.Menu GetMenu()
         {
-            get { return IExecuteWithSignature<Android.View.View.OnTouchListener>("getDragToOpenListener", "()Landroid/view/View$OnTouchListener;"); }
+            return IExecuteWithSignature<Android.View.Menu>("getMenu", "()Landroid/view/Menu;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getGravity()"/> <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#setGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getMenuInflater()"/>
         /// </summary>
-        public int Gravity
+        /// <returns><see cref="Android.View.MenuInflater"/></returns>
+        public Android.View.MenuInflater GetMenuInflater()
         {
-            get { return IExecuteWithSignature<int>("getGravity", "()I"); } set { IExecuteWithSignature("setGravity", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.MenuInflater>("getMenuInflater", "()Landroid/view/MenuInflater;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getMenu()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getDragToOpenListener()"/>
         /// </summary>
-        public Android.View.Menu Menu
+        /// <returns><see cref="Android.View.View.OnTouchListener"/></returns>
+        public Android.View.View.OnTouchListener GetDragToOpenListener()
         {
-            get { return IExecuteWithSignature<Android.View.Menu>("getMenu", "()Landroid/view/Menu;"); }
+            return IExecuteWithSignature<Android.View.View.OnTouchListener>("getDragToOpenListener", "()Landroid/view/View$OnTouchListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getMenuInflater()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getDragToOpenListener()"/>
         /// </summary>
-        public Android.View.MenuInflater MenuInflater
+        /// <returns><see cref="Android.View.View.OnTouchListener"/></returns>
+        public Android.View.View.OnTouchListener GetDragToOpenListenerDirect()
         {
-            get { return IExecuteWithSignature<Android.View.MenuInflater>("getMenuInflater", "()Landroid/view/MenuInflater;"); }
+            return IExecuteWithSignature<Android.View.View.OnTouchListenerDirect, Android.View.View.OnTouchListener>("getDragToOpenListener", "()Landroid/view/View$OnTouchListener;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#getGravity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetGravity()
+        {
+            return IExecuteWithSignature<int>("getGravity", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#dismiss()"/>
@@ -128,6 +140,14 @@ public void SetForceShowIcon(bool arg0)
             IExecuteWithSignature("setForceShowIcon", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#setGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGravity(int arg0)
+        {
+            IExecuteWithSignature("setGravity", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupMenu.html#setOnDismissListener(android.widget.PopupMenu.OnDismissListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.PopupMenu.OnDismissListener"/></param>
@@ -179,7 +199,7 @@ public partial class OnDismissListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDismiss", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.PopupMenu>>>(OnDismissEventHandler));
+                AddEventHandler("onDismiss", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.PopupMenu>>>(OnDismissEventHandler));
 
             }
 
@@ -187,7 +207,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/PopupMenu.OnDismissListener.html#onDismiss(android.widget.PopupMenu)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDismiss"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.PopupMenu> OnOnDismiss { get; set; } = null;
+            public global::System.Action<Android.Widget.PopupMenu> OnOnDismiss { get; set; } = null;
 
             void OnDismissEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.PopupMenu>> data)
             {
@@ -278,7 +298,7 @@ public partial class OnMenuItemClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMenuItemClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemClickEventHandler));
+                AddEventHandler("onMenuItemClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemClickEventHandler));
 
             }
 
@@ -286,7 +306,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/PopupMenu.OnMenuItemClickListener.html#onMenuItemClick(android.view.MenuItem)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMenuItemClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MenuItem, bool> OnOnMenuItemClick { get; set; } = null;
+            public global::System.Func<Android.View.MenuItem, bool> OnOnMenuItemClick { get; set; } = null;
 
             void OnMenuItemClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MenuItem>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/PopupWindow.cs b/src/net/Netdroid/Generated/Android/Widget/PopupWindow.cs
index a55405db2..372cb8057 100644
--- a/src/net/Netdroid/Generated/Android/Widget/PopupWindow.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/PopupWindow.cs
@@ -140,95 +140,52 @@ public PopupWindow(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getAnimationStyle()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setAnimationStyle(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getBackground()"/>
         /// </summary>
-        public int AnimationStyle
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetBackground()
         {
-            get { return IExecuteWithSignature<int>("getAnimationStyle", "()I"); } set { IExecuteWithSignature("setAnimationStyle", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBackground", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getBackground()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getEpicenterBounds()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Background
+        /// <returns><see cref="Android.Graphics.Rect"/></returns>
+        public Android.Graphics.Rect GetEpicenterBounds()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getBackground", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Rect>("getEpicenterBounds", "()Landroid/graphics/Rect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getContentView()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setContentView(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getEnterTransition()"/>
         /// </summary>
-        public Android.View.View ContentView
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetEnterTransition()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getContentView", "()Landroid/view/View;"); } set { IExecuteWithSignature("setContentView", "(Landroid/view/View;)V", value); }
+            return IExecuteWithSignature<Android.Transition.Transition>("getEnterTransition", "()Landroid/transition/Transition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getElevation()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setElevation(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getExitTransition()"/>
         /// </summary>
-        public float Elevation
+        /// <returns><see cref="Android.Transition.Transition"/></returns>
+        public Android.Transition.Transition GetExitTransition()
         {
-            get { return IExecuteWithSignature<float>("getElevation", "()F"); } set { IExecuteWithSignature("setElevation", "(F)V", value); }
+            return IExecuteWithSignature<Android.Transition.Transition>("getExitTransition", "()Landroid/transition/Transition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getEnterTransition()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setEnterTransition(android.transition.Transition)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getContentView()"/>
         /// </summary>
-        public Android.Transition.Transition EnterTransition
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetContentView()
         {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getEnterTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setEnterTransition", "(Landroid/transition/Transition;)V", value); }
+            return IExecuteWithSignature<Android.View.View>("getContentView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getEpicenterBounds()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setEpicenterBounds(android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getOverlapAnchor()"/>
         /// </summary>
-        public Android.Graphics.Rect EpicenterBounds
-        {
-            get { return IExecuteWithSignature<Android.Graphics.Rect>("getEpicenterBounds", "()Landroid/graphics/Rect;"); } set { IExecuteWithSignature("setEpicenterBounds", "(Landroid/graphics/Rect;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getExitTransition()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setExitTransition(android.transition.Transition)"/>
-        /// </summary>
-        public Android.Transition.Transition ExitTransition
-        {
-            get { return IExecuteWithSignature<Android.Transition.Transition>("getExitTransition", "()Landroid/transition/Transition;"); } set { IExecuteWithSignature("setExitTransition", "(Landroid/transition/Transition;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getHeight()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setHeight(int)"/>
-        /// </summary>
-        public int Height
-        {
-            get { return IExecuteWithSignature<int>("getHeight", "()I"); } set { IExecuteWithSignature("setHeight", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getInputMethodMode()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setInputMethodMode(int)"/>
-        /// </summary>
-        public int InputMethodMode
-        {
-            get { return IExecuteWithSignature<int>("getInputMethodMode", "()I"); } set { IExecuteWithSignature("setInputMethodMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getOverlapAnchor()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setOverlapAnchor(boolean)"/>
-        /// </summary>
-        public bool OverlapAnchor
-        {
-            get { return IExecuteWithSignature<bool>("getOverlapAnchor", "()Z"); } set { IExecuteWithSignature("setOverlapAnchor", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getSoftInputMode()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setSoftInputMode(int)"/>
-        /// </summary>
-        public int SoftInputMode
-        {
-            get { return IExecuteWithSignature<int>("getSoftInputMode", "()I"); } set { IExecuteWithSignature("setSoftInputMode", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getWidth()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setWidth(int)"/>
-        /// </summary>
-        public int Width
-        {
-            get { return IExecuteWithSignature<int>("getWidth", "()I"); } set { IExecuteWithSignature("setWidth", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getWindowLayoutType()"/> <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setWindowLayoutType(int)"/>
-        /// </summary>
-        public int WindowLayoutType
+        /// <returns><see cref="bool"/></returns>
+        public bool GetOverlapAnchor()
         {
-            get { return IExecuteWithSignature<int>("getWindowLayoutType", "()I"); } set { IExecuteWithSignature("setWindowLayoutType", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getOverlapAnchor", "()Z");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#isAboveAnchor()"/>
@@ -319,6 +276,38 @@ public bool IsTouchModal()
             return IExecuteWithSignature<bool>("isTouchModal", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getElevation()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetElevation()
+        {
+            return IExecuteWithSignature<float>("getElevation", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getAnimationStyle()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAnimationStyle()
+        {
+            return IExecuteWithSignature<int>("getAnimationStyle", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeight()
+        {
+            return IExecuteWithSignature<int>("getHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getInputMethodMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInputMethodMode()
+        {
+            return IExecuteWithSignature<int>("getInputMethodMode", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getMaxAvailableHeight(android.view.View,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -349,6 +338,30 @@ public int GetMaxAvailableHeight(Android.View.View arg0)
             return IExecuteWithSignature<int>("getMaxAvailableHeight", "(Landroid/view/View;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getSoftInputMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSoftInputMode()
+        {
+            return IExecuteWithSignature<int>("getSoftInputMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWidth()
+        {
+            return IExecuteWithSignature<int>("getWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#getWindowLayoutType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWindowLayoutType()
+        {
+            return IExecuteWithSignature<int>("getWindowLayoutType", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#dismiss()"/>
         /// </summary>
         public void Dismiss()
@@ -356,6 +369,14 @@ public void Dismiss()
             IExecuteWithSignature("dismiss", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setAnimationStyle(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAnimationStyle(int arg0)
+        {
+            IExecuteWithSignature("setAnimationStyle", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setAttachedInDecor(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -380,6 +401,46 @@ public void SetClippingEnabled(bool arg0)
             IExecuteWithSignature("setClippingEnabled", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setContentView(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        public void SetContentView(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setContentView", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setElevation(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetElevation(float arg0)
+        {
+            IExecuteWithSignature("setElevation", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setEnterTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetEnterTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setEnterTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setEpicenterBounds(android.graphics.Rect)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Rect"/></param>
+        public void SetEpicenterBounds(Android.Graphics.Rect arg0)
+        {
+            IExecuteWithSignature("setEpicenterBounds", "(Landroid/graphics/Rect;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setExitTransition(android.transition.Transition)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Transition.Transition"/></param>
+        public void SetExitTransition(Android.Transition.Transition arg0)
+        {
+            IExecuteWithSignature("setExitTransition", "(Landroid/transition/Transition;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setFocusable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -388,6 +449,14 @@ public void SetFocusable(bool arg0)
             IExecuteWithSignature("setFocusable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHeight(int arg0)
+        {
+            IExecuteWithSignature("setHeight", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setIgnoreCheekPress()"/>
         /// </summary>
         public void SetIgnoreCheekPress()
@@ -395,6 +464,14 @@ public void SetIgnoreCheekPress()
             IExecuteWithSignature("setIgnoreCheekPress", "()V");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setInputMethodMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInputMethodMode(int arg0)
+        {
+            IExecuteWithSignature("setInputMethodMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setIsClippedToScreen(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -427,6 +504,22 @@ public void SetOutsideTouchable(bool arg0)
             IExecuteWithSignature("setOutsideTouchable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setOverlapAnchor(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetOverlapAnchor(bool arg0)
+        {
+            IExecuteWithSignature("setOverlapAnchor", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setSoftInputMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSoftInputMode(int arg0)
+        {
+            IExecuteWithSignature("setSoftInputMode", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setSplitTouchEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -459,16 +552,32 @@ public void SetTouchModal(bool arg0)
             IExecuteWithSignature("setTouchModal", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetWidth(int arg0)
+        {
+            IExecuteWithSignature("setWidth", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setWindowLayoutMode(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetWindowLayoutMode(int arg0, int arg1)
         {
             IExecute("setWindowLayoutMode", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#setWindowLayoutType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetWindowLayoutType(int arg0)
+        {
+            IExecuteWithSignature("setWindowLayoutType", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/PopupWindow.html#showAsDropDown(android.view.View,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
@@ -598,7 +707,7 @@ public partial class OnDismissListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDismiss", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDismissEventHandler));
+                AddEventHandler("onDismiss", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDismissEventHandler));
 
             }
 
@@ -606,7 +715,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/PopupWindow.OnDismissListener.html#onDismiss()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDismiss"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnDismiss { get; set; } = null;
+            public global::System.Action OnOnDismiss { get; set; } = null;
 
             void OnDismissEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/ProgressBar.cs b/src/net/Netdroid/Generated/Android/Widget/ProgressBar.cs
index 342b5fd03..ccea8bb57 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ProgressBar.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ProgressBar.cs
@@ -84,212 +84,236 @@ public ProgressBar(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getCurrentDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getIndeterminateTintList()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable CurrentDrawable
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetIndeterminateTintList()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getCurrentDrawable", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getIndeterminateTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getIndeterminateDrawable()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressBackgroundTintList()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable IndeterminateDrawable
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetProgressBackgroundTintList()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIndeterminateDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setIndeterminateDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getProgressBackgroundTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getIndeterminateTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressTintList()"/>
         /// </summary>
-        public Android.Graphics.BlendMode IndeterminateTintBlendMode
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetProgressTintList()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getIndeterminateTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setIndeterminateTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getProgressTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getIndeterminateTintList()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getSecondaryProgressTintList()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList IndeterminateTintList
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetSecondaryProgressTintList()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getIndeterminateTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setIndeterminateTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getSecondaryProgressTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getIndeterminateTintMode()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getIndeterminateTintBlendMode()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode IndeterminateTintMode
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetIndeterminateTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getIndeterminateTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setIndeterminateTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getIndeterminateTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getInterpolator()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setInterpolator(android.view.animation.Interpolator)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressBackgroundTintBlendMode()"/>
         /// </summary>
-        public Android.View.Animation.Interpolator Interpolator
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetProgressBackgroundTintBlendMode()
         {
-            get { return IExecuteWithSignature<Android.View.Animation.Interpolator>("getInterpolator", "()Landroid/view/animation/Interpolator;"); } set { IExecuteWithSignature("setInterpolator", "(Landroid/view/animation/Interpolator;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getProgressBackgroundTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMax()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMax(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressTintBlendMode()"/>
         /// </summary>
-        public int Max
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetProgressTintBlendMode()
         {
-            get { return IExecuteWithSignature<int>("getMax", "()I"); } set { IExecuteWithSignature("setMax", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getProgressTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMaxHeight()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMaxHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getSecondaryProgressTintBlendMode()"/>
         /// </summary>
-        public int MaxHeight
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetSecondaryProgressTintBlendMode()
         {
-            get { return IExecuteWithSignature<int>("getMaxHeight", "()I"); } set { IExecuteWithSignature("setMaxHeight", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getSecondaryProgressTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMaxWidth()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMaxWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getCurrentDrawable()"/>
         /// </summary>
-        public int MaxWidth
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetCurrentDrawable()
         {
-            get { return IExecuteWithSignature<int>("getMaxWidth", "()I"); } set { IExecuteWithSignature("setMaxWidth", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getCurrentDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMin()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMin(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getIndeterminateDrawable()"/>
         /// </summary>
-        public int Min
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetIndeterminateDrawable()
         {
-            get { return IExecuteWithSignature<int>("getMin", "()I"); } set { IExecuteWithSignature("setMin", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getIndeterminateDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMinHeight()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMinHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressDrawable()"/>
         /// </summary>
-        public int MinHeight
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetProgressDrawable()
         {
-            get { return IExecuteWithSignature<int>("getMinHeight", "()I"); } set { IExecuteWithSignature("setMinHeight", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getProgressDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMinWidth()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMinWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getIndeterminateTintMode()"/>
         /// </summary>
-        public int MinWidth
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetIndeterminateTintMode()
         {
-            get { return IExecuteWithSignature<int>("getMinWidth", "()I"); } set { IExecuteWithSignature("setMinWidth", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getIndeterminateTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgress()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgress(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressBackgroundTintMode()"/>
         /// </summary>
-        public int Progress
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetProgressBackgroundTintMode()
         {
-            get { return IExecuteWithSignature<int>("getProgress", "()I"); } set { IExecuteWithSignature("setProgress", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getProgressBackgroundTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressBackgroundTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressBackgroundTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressTintMode()"/>
         /// </summary>
-        public Android.Graphics.BlendMode ProgressBackgroundTintBlendMode
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetProgressTintMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getProgressBackgroundTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setProgressBackgroundTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getProgressTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressBackgroundTintList()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressBackgroundTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getSecondaryProgressTintMode()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList ProgressBackgroundTintList
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetSecondaryProgressTintMode()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getProgressBackgroundTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setProgressBackgroundTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getSecondaryProgressTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressBackgroundTintMode()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressBackgroundTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#onSaveInstanceState()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode ProgressBackgroundTintMode
+        /// <returns><see cref="Android.Os.Parcelable"/></returns>
+        public Android.Os.Parcelable OnSaveInstanceState()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getProgressBackgroundTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setProgressBackgroundTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Android.Os.Parcelable>("onSaveInstanceState", "()Landroid/os/Parcelable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressDrawable()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getInterpolator()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable ProgressDrawable
+        /// <returns><see cref="Android.View.Animation.Interpolator"/></returns>
+        public Android.View.Animation.Interpolator GetInterpolator()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getProgressDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setProgressDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.View.Animation.Interpolator>("getInterpolator", "()Landroid/view/animation/Interpolator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#isAnimating()"/>
         /// </summary>
-        public Android.Graphics.BlendMode ProgressTintBlendMode
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAnimating()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getProgressTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setProgressTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<bool>("isAnimating", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressTintList()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#incrementProgressBy(int)"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList ProgressTintList
+        /// <param name="arg0"><see cref="int"/></param>
+        public void IncrementProgressBy(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getProgressTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setProgressTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            IExecuteWithSignature("incrementProgressBy", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgressTintMode()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#incrementSecondaryProgressBy(int)"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode ProgressTintMode
+        /// <param name="arg0"><see cref="int"/></param>
+        public void IncrementSecondaryProgressBy(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getProgressTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setProgressTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            IExecuteWithSignature("incrementSecondaryProgressBy", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getSecondaryProgress()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setSecondaryProgress(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMaxHeight()"/>
         /// </summary>
-        public int SecondaryProgress
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxHeight()
         {
-            get { return IExecuteWithSignature<int>("getSecondaryProgress", "()I"); } set { IExecuteWithSignature("setSecondaryProgress", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getSecondaryProgressTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setSecondaryProgressTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMaxWidth()"/>
         /// </summary>
-        public Android.Graphics.BlendMode SecondaryProgressTintBlendMode
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxWidth()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getSecondaryProgressTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setSecondaryProgressTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<int>("getMaxWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getSecondaryProgressTintList()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setSecondaryProgressTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMinHeight()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList SecondaryProgressTintList
+        /// <returns><see cref="int"/></returns>
+        public int GetMinHeight()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getSecondaryProgressTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setSecondaryProgressTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<int>("getMinHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getSecondaryProgressTintMode()"/> <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setSecondaryProgressTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMinWidth()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode SecondaryProgressTintMode
+        /// <returns><see cref="int"/></returns>
+        public int GetMinWidth()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getSecondaryProgressTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setSecondaryProgressTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<int>("getMinWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#onSaveInstanceState()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#isIndeterminate()"/>
         /// </summary>
-        /// <returns><see cref="Android.Os.Parcelable"/></returns>
-        public Android.Os.Parcelable OnSaveInstanceState()
+        /// <returns><see cref="bool"/></returns>
+        public bool IsIndeterminate()
         {
-            return IExecuteWithSignature<Android.Os.Parcelable>("onSaveInstanceState", "()Landroid/os/Parcelable;");
+            return IExecuteWithSignature<bool>("isIndeterminate", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#isAnimating()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMax()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAnimating()
+        /// <returns><see cref="int"/></returns>
+        public int GetMax()
         {
-            return IExecuteWithSignature<bool>("isAnimating", "()Z");
+            return IExecuteWithSignature<int>("getMax", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#incrementProgressBy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getMin()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void IncrementProgressBy(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetMin()
         {
-            IExecuteWithSignature("incrementProgressBy", "(I)V", arg0);
+            return IExecuteWithSignature<int>("getMin", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#incrementSecondaryProgressBy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getProgress()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void IncrementSecondaryProgressBy(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetProgress()
         {
-            IExecuteWithSignature("incrementSecondaryProgressBy", "(I)V", arg0);
+            return IExecuteWithSignature<int>("getProgress", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#isIndeterminate()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#getSecondaryProgress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsIndeterminate()
+        /// <returns><see cref="int"/></returns>
+        public int GetSecondaryProgress()
         {
-            return IExecuteWithSignature<bool>("isIndeterminate", "()Z");
+            return IExecuteWithSignature<int>("getSecondaryProgress", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminate(boolean)"/>
@@ -300,6 +324,38 @@ public void SetIndeterminate(bool arg0)
             IExecuteWithSignature("setIndeterminate", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMax(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMax(int arg0)
+        {
+            IExecuteWithSignature("setMax", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMin(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMin(int arg0)
+        {
+            IExecuteWithSignature("setMin", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgress(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetProgress(int arg0)
+        {
+            IExecuteWithSignature("setProgress", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setSecondaryProgress(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSecondaryProgress(int arg0)
+        {
+            IExecuteWithSignature("setSecondaryProgress", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#onRestoreInstanceState(android.os.Parcelable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Os.Parcelable"/></param>
@@ -308,6 +364,14 @@ public void OnRestoreInstanceState(Android.Os.Parcelable arg0)
             IExecuteWithSignature("onRestoreInstanceState", "(Landroid/os/Parcelable;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetIndeterminateDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setIndeterminateDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateDrawableTiled(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -316,6 +380,30 @@ public void SetIndeterminateDrawableTiled(Android.Graphics.Drawable.Drawable arg
             IExecuteWithSignature("setIndeterminateDrawableTiled", "(Landroid/graphics/drawable/Drawable;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetIndeterminateTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setIndeterminateTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetIndeterminateTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setIndeterminateTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setIndeterminateTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetIndeterminateTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setIndeterminateTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setInterpolator(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -325,6 +413,46 @@ public void SetInterpolator(Android.Content.Context arg0, int arg1)
             IExecute("setInterpolator", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setInterpolator(android.view.animation.Interpolator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.Interpolator"/></param>
+        public void SetInterpolator(Android.View.Animation.Interpolator arg0)
+        {
+            IExecuteWithSignature("setInterpolator", "(Landroid/view/animation/Interpolator;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMaxHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxHeight(int arg0)
+        {
+            IExecuteWithSignature("setMaxHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMaxWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxWidth(int arg0)
+        {
+            IExecuteWithSignature("setMaxWidth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMinHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinHeight(int arg0)
+        {
+            IExecuteWithSignature("setMinHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setMinWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinWidth(int arg0)
+        {
+            IExecuteWithSignature("setMinWidth", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgress(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -334,6 +462,38 @@ public void SetProgress(int arg0, bool arg1)
             IExecute("setProgress", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressBackgroundTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetProgressBackgroundTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setProgressBackgroundTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressBackgroundTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetProgressBackgroundTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setProgressBackgroundTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressBackgroundTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetProgressBackgroundTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setProgressBackgroundTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetProgressDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setProgressDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressDrawableTiled(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -341,6 +501,54 @@ public void SetProgressDrawableTiled(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setProgressDrawableTiled", "(Landroid/graphics/drawable/Drawable;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetProgressTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setProgressTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetProgressTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setProgressTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setProgressTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetProgressTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setProgressTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setSecondaryProgressTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetSecondaryProgressTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setSecondaryProgressTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setSecondaryProgressTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetSecondaryProgressTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setSecondaryProgressTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ProgressBar.html#setSecondaryProgressTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetSecondaryProgressTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setSecondaryProgressTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/RadioGroup.cs b/src/net/Netdroid/Generated/Android/Widget/RadioGroup.cs
index 7bbb1c10e..4e01517fc 100644
--- a/src/net/Netdroid/Generated/Android/Widget/RadioGroup.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/RadioGroup.cs
@@ -63,11 +63,12 @@ public RadioGroup(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RadioGroup.html#getCheckedRadioButtonId()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/RadioGroup.html#getCheckedRadioButtonId()"/>
         /// </summary>
-        public int CheckedRadioButtonId
+        /// <returns><see cref="int"/></returns>
+        public int GetCheckedRadioButtonId()
         {
-            get { return IExecuteWithSignature<int>("getCheckedRadioButtonId", "()I"); }
+            return IExecuteWithSignature<int>("getCheckedRadioButtonId", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/RadioGroup.html#check(int)"/>
@@ -196,7 +197,7 @@ public partial class OnCheckedChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onCheckedChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.RadioGroup>>>(OnCheckedChangedEventHandler));
+                AddEventHandler("onCheckedChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.RadioGroup>>>(OnCheckedChangedEventHandler));
 
             }
 
@@ -204,7 +205,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/RadioGroup.OnCheckedChangeListener.html#onCheckedChanged(android.widget.RadioGroup,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnCheckedChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.RadioGroup, int> OnOnCheckedChanged { get; set; } = null;
+            public global::System.Action<Android.Widget.RadioGroup, int> OnOnCheckedChanged { get; set; } = null;
 
             void OnCheckedChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.RadioGroup>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/RatingBar.cs b/src/net/Netdroid/Generated/Android/Widget/RatingBar.cs
index 2cff55e0f..8db1bd398 100644
--- a/src/net/Netdroid/Generated/Android/Widget/RatingBar.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/RatingBar.cs
@@ -84,40 +84,52 @@ public RatingBar(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getOnRatingBarChangeListener()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getOnRatingBarChangeListener()"/>
         /// </summary>
-        public Android.Widget.RatingBar.OnRatingBarChangeListener GetOnRatingBarChangeListener
+        /// <returns><see cref="Android.Widget.RatingBar.OnRatingBarChangeListener"/></returns>
+        public Android.Widget.RatingBar.OnRatingBarChangeListener GetOnRatingBarChangeListener()
         {
-            get { return IExecuteWithSignature<Android.Widget.RatingBar.OnRatingBarChangeListener>("getOnRatingBarChangeListener", "()Landroid/widget/RatingBar$OnRatingBarChangeListener;"); }
+            return IExecuteWithSignature<Android.Widget.RatingBar.OnRatingBarChangeListener>("getOnRatingBarChangeListener", "()Landroid/widget/RatingBar$OnRatingBarChangeListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getNumStars()"/> <see href="https://developer.android.com/reference/android/widget/RatingBar.html#setNumStars(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getOnRatingBarChangeListener()"/>
         /// </summary>
-        public int NumStars
+        /// <returns><see cref="Android.Widget.RatingBar.OnRatingBarChangeListener"/></returns>
+        public Android.Widget.RatingBar.OnRatingBarChangeListener GetOnRatingBarChangeListenerDirect()
         {
-            get { return IExecuteWithSignature<int>("getNumStars", "()I"); } set { IExecuteWithSignature("setNumStars", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.RatingBar.OnRatingBarChangeListenerDirect, Android.Widget.RatingBar.OnRatingBarChangeListener>("getOnRatingBarChangeListener", "()Landroid/widget/RatingBar$OnRatingBarChangeListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getRating()"/> <see href="https://developer.android.com/reference/android/widget/RatingBar.html#setRating(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#isIndicator()"/>
         /// </summary>
-        public float Rating
+        /// <returns><see cref="bool"/></returns>
+        public bool IsIndicator()
         {
-            get { return IExecuteWithSignature<float>("getRating", "()F"); } set { IExecuteWithSignature("setRating", "(F)V", value); }
+            return IExecuteWithSignature<bool>("isIndicator", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getStepSize()"/> <see href="https://developer.android.com/reference/android/widget/RatingBar.html#setStepSize(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getRating()"/>
         /// </summary>
-        public float StepSize
+        /// <returns><see cref="float"/></returns>
+        public float GetRating()
         {
-            get { return IExecuteWithSignature<float>("getStepSize", "()F"); } set { IExecuteWithSignature("setStepSize", "(F)V", value); }
+            return IExecuteWithSignature<float>("getRating", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#isIndicator()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getStepSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsIndicator()
+        /// <returns><see cref="float"/></returns>
+        public float GetStepSize()
         {
-            return IExecuteWithSignature<bool>("isIndicator", "()Z");
+            return IExecuteWithSignature<float>("getStepSize", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#getNumStars()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumStars()
+        {
+            return IExecuteWithSignature<int>("getNumStars", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#setIsIndicator(boolean)"/>
@@ -128,6 +140,14 @@ public void SetIsIndicator(bool arg0)
             IExecuteWithSignature("setIsIndicator", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#setNumStars(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNumStars(int arg0)
+        {
+            IExecuteWithSignature("setNumStars", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#setOnRatingBarChangeListener(android.widget.RatingBar.OnRatingBarChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.RatingBar.OnRatingBarChangeListener"/></param>
@@ -135,6 +155,22 @@ public void SetOnRatingBarChangeListener(Android.Widget.RatingBar.OnRatingBarCha
         {
             IExecuteWithSignature("setOnRatingBarChangeListener", "(Landroid/widget/RatingBar$OnRatingBarChangeListener;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#setRating(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetRating(float arg0)
+        {
+            IExecuteWithSignature("setRating", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RatingBar.html#setStepSize(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetStepSize(float arg0)
+        {
+            IExecuteWithSignature("setStepSize", "(F)V", arg0);
+        }
 
         #endregion
 
@@ -164,7 +200,7 @@ public partial class OnRatingBarChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onRatingChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.RatingBar>>>(OnRatingChangedEventHandler));
+                AddEventHandler("onRatingChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.RatingBar>>>(OnRatingChangedEventHandler));
 
             }
 
@@ -172,7 +208,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/RatingBar.OnRatingBarChangeListener.html#onRatingChanged(android.widget.RatingBar,float,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnRatingChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.RatingBar, float, bool> OnOnRatingChanged { get; set; } = null;
+            public global::System.Action<Android.Widget.RatingBar, float, bool> OnOnRatingChanged { get; set; } = null;
 
             void OnRatingChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.RatingBar>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/RelativeLayout.cs b/src/net/Netdroid/Generated/Android/Widget/RelativeLayout.cs
index 1cd75004c..077b059a5 100644
--- a/src/net/Netdroid/Generated/Android/Widget/RelativeLayout.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/RelativeLayout.cs
@@ -222,18 +222,28 @@ public RelativeLayout(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#getGravity()"/> <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#setGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#getGravity()"/>
         /// </summary>
-        public int Gravity
+        /// <returns><see cref="int"/></returns>
+        public int GetGravity()
         {
-            get { return IExecuteWithSignature<int>("getGravity", "()I"); } set { IExecuteWithSignature("setGravity", "(I)V", value); }
+            return IExecuteWithSignature<int>("getGravity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#getIgnoreGravity()"/> <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#setIgnoreGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#getIgnoreGravity()"/>
         /// </summary>
-        public int IgnoreGravity
+        /// <returns><see cref="int"/></returns>
+        public int GetIgnoreGravity()
         {
-            get { return IExecuteWithSignature<int>("getIgnoreGravity", "()I"); } set { IExecuteWithSignature("setIgnoreGravity", "(I)V", value); }
+            return IExecuteWithSignature<int>("getIgnoreGravity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#setGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGravity(int arg0)
+        {
+            IExecuteWithSignature("setGravity", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#setHorizontalGravity(int)"/>
@@ -244,6 +254,14 @@ public void SetHorizontalGravity(int arg0)
             IExecuteWithSignature("setHorizontalGravity", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#setIgnoreGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetIgnoreGravity(int arg0)
+        {
+            IExecuteWithSignature("setIgnoreGravity", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.html#setVerticalGravity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -322,13 +340,6 @@ public LayoutParams(int arg0, int arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.LayoutParams.html#getRules()"/> 
-            /// </summary>
-            public int[] Rules
-            {
-                get { return IExecuteWithSignatureArray<int>("getRules", "()[I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.LayoutParams.html#getRule(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -338,6 +349,14 @@ public int GetRule(int arg0)
                 return IExecuteWithSignature<int>("getRule", "(I)I", arg0);
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.LayoutParams.html#getRules()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int[] GetRules()
+            {
+                return IExecuteWithSignatureArray<int>("getRules", "()[I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/RelativeLayout.LayoutParams.html#debug(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/RemoteViews.cs b/src/net/Netdroid/Generated/Android/Widget/RemoteViews.cs
index 36f09cc5d..0f0c9678d 100644
--- a/src/net/Netdroid/Generated/Android/Widget/RemoteViews.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/RemoteViews.cs
@@ -156,27 +156,6 @@ public RemoteViews(Java.Util.Map<Android.Util.SizeF, Android.Widget.RemoteViews>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#getLayoutId()"/> 
-        /// </summary>
-        public int LayoutId
-        {
-            get { return IExecuteWithSignature<int>("getLayoutId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#getPackage()"/> 
-        /// </summary>
-        public Java.Lang.String Package
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackage", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#getViewId()"/> 
-        /// </summary>
-        public int ViewId
-        {
-            get { return IExecuteWithSignature<int>("getViewId", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#apply(android.content.Context,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -190,7 +169,7 @@ public Android.View.View Apply(Android.Content.Context arg0, Android.View.ViewGr
         /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Android.Widget.RemoteViews"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.Widget.RemoteViews Clone()
         {
             return IExecuteWithSignature<Android.Widget.RemoteViews>("clone", "()Landroid/widget/RemoteViews;");
@@ -200,7 +179,7 @@ public Android.Widget.RemoteViews Clone()
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnLoadClass(Java.Lang.Class arg0)
         {
             return IExecuteWithSignature<bool>("onLoadClass", "(Ljava/lang/Class;)Z", arg0);
@@ -214,6 +193,30 @@ public int DescribeContents()
             return IExecuteWithSignature<int>("describeContents", "()I");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#getLayoutId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLayoutId()
+        {
+            return IExecuteWithSignature<int>("getLayoutId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#getViewId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetViewId()
+        {
+            return IExecuteWithSignature<int>("getViewId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#getPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackage", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#addStableView(int,android.widget.RemoteViews,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -769,7 +772,7 @@ public void SetRemoteAdapter(int arg0, Android.Widget.RemoteViews.RemoteCollecti
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Content.Intent"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRemoteAdapter(int arg0, int arg1, Android.Content.Intent arg2)
         {
             IExecute("setRemoteAdapter", arg0, arg1, arg2);
@@ -1005,7 +1008,7 @@ public void SetViewVisibility(int arg0, int arg1)
         /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#showNext(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ShowNext(int arg0)
         {
             IExecuteWithSignature("showNext", "(I)V", arg0);
@@ -1014,7 +1017,7 @@ public void ShowNext(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.html#showPrevious(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ShowPrevious(int arg0)
         {
             IExecuteWithSignature("showPrevious", "(I)V", arg0);
@@ -1090,20 +1093,6 @@ public partial class RemoteCollectionItems
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.RemoteCollectionItems.html#getItemCount()"/> 
-            /// </summary>
-            public int ItemCount
-            {
-                get { return IExecuteWithSignature<int>("getItemCount", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.RemoteCollectionItems.html#getViewTypeCount()"/> 
-            /// </summary>
-            public int ViewTypeCount
-            {
-                get { return IExecuteWithSignature<int>("getViewTypeCount", "()I"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.RemoteCollectionItems.html#getItemView(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -1129,6 +1118,22 @@ public int DescribeContents()
                 return IExecuteWithSignature<int>("describeContents", "()I");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.RemoteCollectionItems.html#getItemCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetItemCount()
+            {
+                return IExecuteWithSignature<int>("getItemCount", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.RemoteCollectionItems.html#getViewTypeCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetViewTypeCount()
+            {
+                return IExecuteWithSignature<int>("getViewTypeCount", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.RemoteCollectionItems.html#getItemId(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
@@ -1343,11 +1348,12 @@ public RemoteViewOutlineProvider(float arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.RemoteViewOutlineProvider.html#getRadius()"/> 
+            /// <see href="https://developer.android.com/reference/android/widget/RemoteViews.RemoteViewOutlineProvider.html#getRadius()"/>
             /// </summary>
-            public float Radius
+            /// <returns><see cref="float"/></returns>
+            public float GetRadius()
             {
-                get { return IExecuteWithSignature<float>("getRadius", "()F"); }
+                return IExecuteWithSignature<float>("getRadius", "()F");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Android/Widget/RemoteViewsService.cs b/src/net/Netdroid/Generated/Android/Widget/RemoteViewsService.cs
index 78d3715cd..949f06008 100644
--- a/src/net/Netdroid/Generated/Android/Widget/RemoteViewsService.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/RemoteViewsService.cs
@@ -79,25 +79,12 @@ public partial class RemoteViewsFactory
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/RemoteViewsService.RemoteViewsFactory.html#getCount()"/> 
+            /// <see href="https://developer.android.com/reference/android/widget/RemoteViewsService.RemoteViewsFactory.html#getLoadingView()"/>
             /// </summary>
-            public int Count
-            {
-                get { return IExecuteWithSignature<int>("getCount", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/RemoteViewsService.RemoteViewsFactory.html#getLoadingView()"/> 
-            /// </summary>
-            public Android.Widget.RemoteViews LoadingView
-            {
-                get { return IExecuteWithSignature<Android.Widget.RemoteViews>("getLoadingView", "()Landroid/widget/RemoteViews;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/RemoteViewsService.RemoteViewsFactory.html#getViewTypeCount()"/> 
-            /// </summary>
-            public int ViewTypeCount
+            /// <returns><see cref="Android.Widget.RemoteViews"/></returns>
+            public Android.Widget.RemoteViews GetLoadingView()
             {
-                get { return IExecuteWithSignature<int>("getViewTypeCount", "()I"); }
+                return IExecuteWithSignature<Android.Widget.RemoteViews>("getLoadingView", "()Landroid/widget/RemoteViews;");
             }
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/RemoteViewsService.RemoteViewsFactory.html#getViewAt(int)"/>
@@ -117,6 +104,22 @@ public bool HasStableIds()
                 return IExecuteWithSignature<bool>("hasStableIds", "()Z");
             }
             /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/RemoteViewsService.RemoteViewsFactory.html#getCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetCount()
+            {
+                return IExecuteWithSignature<int>("getCount", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/RemoteViewsService.RemoteViewsFactory.html#getViewTypeCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetViewTypeCount()
+            {
+                return IExecuteWithSignature<int>("getViewTypeCount", "()I");
+            }
+            /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/RemoteViewsService.RemoteViewsFactory.html#getItemId(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/ResourceCursorAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/ResourceCursorAdapter.cs
index 3c58f2156..72f1f29a8 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ResourceCursorAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ResourceCursorAdapter.cs
@@ -29,571 +29,42 @@ namespace Android.Widget
     public partial class ResourceCursorAdapter
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="ResourceCursorAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("bindView", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.View>>>(BindViewEventHandler));
-            AddEventHandler("getDropDownViewTheme", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDropDownViewThemeEventHandler));
-            AddEventHandler("getCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCursorEventHandler));
-            AddEventHandler("runQueryOnBackgroundThread", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(RunQueryOnBackgroundThreadEventHandler));
-            AddEventHandler("swapCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(SwapCursorEventHandler));
-            AddEventHandler("getFilter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
-            AddEventHandler("getFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterQueryProviderEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("convertToString", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ConvertToStringEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("notifyDataSetInvalidated", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("setAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>>>(SetAutofillOptionsEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("changeCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ChangeCursorEventHandler));
-            AddEventHandler("setFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>>>(SetFilterQueryProviderEventHandler));
-            AddEventHandler("setDropDownViewResource", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetDropDownViewResourceEventHandler));
-            AddEventHandler("setViewResource", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetViewResourceEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#bindView(android.view.View,android.content.Context,android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnBindView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.View.View, Android.Content.Context, Android.Database.Cursor> OnBindView { get; set; } = null;
-
-        void BindViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.View>> data)
-        {
-            var methodToExecute = (OnBindView != null) ? OnBindView : BindView;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Content.Context>(0), data.EventData.GetAt<Android.Database.Cursor>(1));
-        }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#bindView(android.view.View,android.content.Context,android.database.Cursor)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#%3Cinit%3E(android.content.Context,int,android.database.Cursor,boolean)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="Android.Database.Cursor"/></param>
-        public virtual void BindView(Android.View.View arg0, Android.Content.Context arg1, Android.Database.Cursor arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetDropDownViewTheme"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Res.Resources.Theme> OnGetDropDownViewTheme { get; set; } = null;
-
-        void GetDropDownViewThemeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetDropDownViewTheme != null) ? OnGetDropDownViewTheme : GetDropDownViewTheme;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
-        public virtual Android.Content.Res.Resources.Theme GetDropDownViewTheme()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor> OnGetCursor { get; set; } = null;
-
-        void GetCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetCursor != null) ? OnGetCursor : GetCursor;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor GetCursor()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRunQueryOnBackgroundThread"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.Database.Cursor> OnRunQueryOnBackgroundThread { get; set; } = null;
-
-        void RunQueryOnBackgroundThreadEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnRunQueryOnBackgroundThread != null) ? OnRunQueryOnBackgroundThread : RunQueryOnBackgroundThread;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#swapCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSwapCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor, Android.Database.Cursor> OnSwapCursor { get; set; } = null;
-
-        void SwapCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnSwapCursor != null) ? OnSwapCursor : SwapCursor;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#swapCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor SwapCursor(Android.Database.Cursor arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
-
-        void GetFilterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilter != null) ? OnGetFilter : GetFilter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.Filter"/></returns>
-        public virtual Android.Widget.Filter GetFilter()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.FilterQueryProvider> OnGetFilterQueryProvider { get; set; } = null;
-
-        void GetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilterQueryProvider != null) ? OnGetFilterQueryProvider : GetFilterQueryProvider;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.FilterQueryProvider"/></returns>
-        public virtual Android.Widget.FilterQueryProvider GetFilterQueryProvider()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
-
-        void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnAreAllItemsEnabled != null) ? OnAreAllItemsEnabled : AreAllItemsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool AreAllItemsEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
-
-        void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEmpty != null) ? OnIsEmpty : IsEmpty;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEmpty()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnIsEnabled { get; set; } = null;
-
-        void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnIsEnabled != null) ? OnIsEnabled : IsEnabled;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEnabled(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
-
-        void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetItemViewType != null) ? OnGetItemViewType : GetItemViewType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetItemViewType(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
-
-        void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetViewTypeCount != null) ? OnGetViewTypeCount : GetViewTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetViewTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnConvertToString"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor, Java.Lang.CharSequence> OnConvertToString { get; set; } = null;
-
-        void ConvertToStringEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnConvertToString != null) ? OnConvertToString : ConvertToString;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public virtual Java.Lang.CharSequence ConvertToString(Android.Database.Cursor arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
-
-        void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetAutofillOptions != null) ? OnGetAutofillOptions : GetAutofillOptions;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public virtual Java.Lang.CharSequence[] GetAutofillOptions()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetChanged { get; set; } = null;
-
-        void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnNotifyDataSetChanged != null) ? OnNotifyDataSetChanged : NotifyDataSetChanged;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        public virtual void NotifyDataSetChanged()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetInvalidated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetInvalidated { get; set; } = null;
-
-        void NotifyDataSetInvalidatedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnNotifyDataSetInvalidated != null) ? OnNotifyDataSetInvalidated : NotifyDataSetInvalidated;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        public virtual void NotifyDataSetInvalidated()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
-
-        void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnRegisterDataSetObserver != null) ? OnRegisterDataSetObserver : RegisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<> OnSetAutofillOptions { get; set; } = null;
-
-        void SetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>> data)
+        /// <param name="arg3"><see cref="bool"/></param>
+        public ResourceCursorAdapter(Android.Content.Context arg0, int arg1, Android.Database.Cursor arg2, bool arg3)
+            : base(arg0, arg1, arg2, arg3)
         {
-            var methodToExecute = (OnSetAutofillOptions != null) ? OnSetAutofillOptions : SetAutofillOptions;
-            methodToExecute.Invoke();
         }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#%3Cinit%3E(android.content.Context,int,android.database.Cursor,int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        public virtual void SetAutofillOptions(params Java.Lang.CharSequence[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
-
-        void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnUnregisterDataSetObserver != null) ? OnUnregisterDataSetObserver : UnregisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnChangeCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnChangeCursor { get; set; } = null;
-
-        void ChangeCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnChangeCursor != null) ? OnChangeCursor : ChangeCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public virtual void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.FilterQueryProvider> OnSetFilterQueryProvider { get; set; } = null;
-
-        void SetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>> data)
-        {
-            var methodToExecute = (OnSetFilterQueryProvider != null) ? OnSetFilterQueryProvider : SetFilterQueryProvider;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.FilterQueryProvider"/></param>
-        public virtual void SetFilterQueryProvider(Android.Widget.FilterQueryProvider arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setDropDownViewResource(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetDropDownViewResource"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetDropDownViewResource { get; set; } = null;
-
-        void SetDropDownViewResourceEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetDropDownViewResource != null) ? OnSetDropDownViewResource : SetDropDownViewResource;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setDropDownViewResource(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void SetDropDownViewResource(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setViewResource(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetViewResource"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetViewResource { get; set; } = null;
-
-        void SetViewResourceEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Android.Database.Cursor"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        public ResourceCursorAdapter(Android.Content.Context arg0, int arg1, Android.Database.Cursor arg2, int arg3)
+            : base(arg0, arg1, arg2, arg3)
         {
-            var methodToExecute = (OnSetViewResource != null) ? OnSetViewResource : SetViewResource;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
         }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setViewResource(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#%3Cinit%3E(android.content.Context,int,android.database.Cursor)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void SetViewResource(int arg0)
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Android.Database.Cursor"/></param>
+        [global::System.Obsolete()]
+        public ResourceCursorAdapter(Android.Content.Context arg0, int arg1, Android.Database.Cursor arg2)
+            : base(arg0, arg1, arg2)
         {
-            
         }
 
         #endregion
 
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region ResourceCursorAdapterDirect
-    public partial class ResourceCursorAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
         #region Class/Interface conversion operators
 
         #endregion
@@ -608,161 +79,10 @@ public partial class ResourceCursorAdapterDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/> <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); } set { IExecute("setAutofillOptions", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/> 
-        /// </summary>
-        public Android.Database.Cursor Cursor
-        {
-            get { return IExecute<Android.Database.Cursor>("getCursor"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/> 
-        /// </summary>
-        public Android.Content.Res.Resources.Theme DropDownViewTheme
-        {
-            get { return IExecute<Android.Content.Res.Resources.Theme>("getDropDownViewTheme"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/> 
-        /// </summary>
-        public Android.Widget.Filter Filter
-        {
-            get { return IExecute<Android.Widget.Filter>("getFilter"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/> <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        public Android.Widget.FilterQueryProvider FilterQueryProvider
-        {
-            get { return IExecute<Android.Widget.FilterQueryProvider>("getFilterQueryProvider"); } set { IExecute("setFilterQueryProvider", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecute<int>("getViewTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#bindView(android.view.View,android.content.Context,android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.View.View"/></param>
-        /// <param name="arg1"><see cref="Android.Content.Context"/></param>
-        /// <param name="arg2"><see cref="Android.Database.Cursor"/></param>
-        public override void BindView(Android.View.View arg0, Android.Content.Context arg1, Android.Database.Cursor arg2)
-        {
-            IExecute("bindView", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public override Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return IExecute<Android.Database.Cursor>("runQueryOnBackgroundThread", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#swapCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public override Android.Database.Cursor SwapCursor(Android.Database.Cursor arg0)
-        {
-            return IExecute<Android.Database.Cursor>("swapCursor", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool AreAllItemsEnabled()
-        {
-            return IExecute<bool>("areAllItemsEnabled");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEmpty()
-        {
-            return IExecute<bool>("isEmpty");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEnabled(int arg0)
-        {
-            return IExecute<bool>("isEnabled", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetItemViewType(int arg0)
-        {
-            return IExecute<int>("getItemViewType", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public override Java.Lang.CharSequence ConvertToString(Android.Database.Cursor arg0)
-        {
-            return IExecute<Java.Lang.CharSequence>("convertToString", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        public override void NotifyDataSetChanged()
-        {
-            IExecute("notifyDataSetChanged");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        public override void NotifyDataSetInvalidated()
-        {
-            IExecute("notifyDataSetInvalidated");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("registerDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("unregisterDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public override void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            IExecute("changeCursor", arg0);
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setDropDownViewResource(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        public override void SetDropDownViewResource(int arg0)
+        public void SetDropDownViewResource(int arg0)
         {
             IExecuteWithSignature("setDropDownViewResource", "(I)V", arg0);
         }
@@ -770,7 +90,7 @@ public override void SetDropDownViewResource(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setViewResource(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        public override void SetViewResource(int arg0)
+        public void SetViewResource(int arg0)
         {
             IExecuteWithSignature("setViewResource", "(I)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Android/Widget/ResourceCursorTreeAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/ResourceCursorTreeAdapter.cs
index 5df2047d6..3c5d12f00 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ResourceCursorTreeAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ResourceCursorTreeAdapter.cs
@@ -29,583 +29,43 @@ namespace Android.Widget
     public partial class ResourceCursorTreeAdapter
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="ResourceCursorTreeAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("getCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCursorEventHandler));
-            AddEventHandler("runQueryOnBackgroundThread", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(RunQueryOnBackgroundThreadEventHandler));
-            AddEventHandler("newChildView", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(NewChildViewEventHandler));
-            AddEventHandler("newGroupView", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(NewGroupViewEventHandler));
-            AddEventHandler("getFilter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
-            AddEventHandler("getFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterQueryProviderEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getChildType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildTypeEventHandler));
-            AddEventHandler("getChildTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetChildTypeCountEventHandler));
-            AddEventHandler("getGroupType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupTypeEventHandler));
-            AddEventHandler("getGroupTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupTypeCountEventHandler));
-            AddEventHandler("convertToString", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ConvertToStringEventHandler));
-            AddEventHandler("getCombinedChildId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedChildIdEventHandler));
-            AddEventHandler("getCombinedGroupId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedGroupIdEventHandler));
-            AddEventHandler("onGroupExpanded", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("changeCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ChangeCursorEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("setChildrenCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetChildrenCursorEventHandler));
-            AddEventHandler("setFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>>>(SetFilterQueryProviderEventHandler));
-            AddEventHandler("setGroupCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(SetGroupCursorEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor> OnGetCursor { get; set; } = null;
-
-        void GetCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetCursor != null) ? OnGetCursor : GetCursor;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor GetCursor()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRunQueryOnBackgroundThread"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.Database.Cursor> OnRunQueryOnBackgroundThread { get; set; } = null;
-
-        void RunQueryOnBackgroundThreadEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnRunQueryOnBackgroundThread != null) ? OnRunQueryOnBackgroundThread : RunQueryOnBackgroundThread;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newChildView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNewChildView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context, Android.Database.Cursor, bool, Android.View.ViewGroup, Android.View.View> OnNewChildView { get; set; } = null;
-
-        void NewChildViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Context>> data)
-        {
-            var methodToExecute = (OnNewChildView != null) ? OnNewChildView : NewChildView;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Database.Cursor>(0), data.EventData.GetAt<bool>(1), data.EventData.GetAt<Android.View.ViewGroup>(2));
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newChildView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#%3Cinit%3E(android.content.Context,android.database.Cursor,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        /// <param name="arg2"><see cref="bool"/></param>
-        /// <param name="arg3"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public virtual Android.View.View NewChildView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        public ResourceCursorTreeAdapter(Android.Content.Context arg0, Android.Database.Cursor arg1, int arg2, int arg3, int arg4, int arg5)
+            : base(arg0, arg1, arg2, arg3, arg4, arg5)
         {
-            return default;
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newGroupView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNewGroupView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context, Android.Database.Cursor, bool, Android.View.ViewGroup, Android.View.View> OnNewGroupView { get; set; } = null;
-
-        void NewGroupViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Context>> data)
-        {
-            var methodToExecute = (OnNewGroupView != null) ? OnNewGroupView : NewGroupView;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Database.Cursor>(0), data.EventData.GetAt<bool>(1), data.EventData.GetAt<Android.View.ViewGroup>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newGroupView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#%3Cinit%3E(android.content.Context,android.database.Cursor,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        /// <param name="arg2"><see cref="bool"/></param>
-        /// <param name="arg3"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public virtual Android.View.View NewGroupView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
-
-        void GetFilterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilter != null) ? OnGetFilter : GetFilter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.Filter"/></returns>
-        public virtual Android.Widget.Filter GetFilter()
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        public ResourceCursorTreeAdapter(Android.Content.Context arg0, Android.Database.Cursor arg1, int arg2, int arg3, int arg4)
+            : base(arg0, arg1, arg2, arg3, arg4)
         {
-            return default;
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#%3Cinit%3E(android.content.Context,android.database.Cursor,int,int)"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.FilterQueryProvider> OnGetFilterQueryProvider { get; set; } = null;
-
-        void GetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilterQueryProvider != null) ? OnGetFilterQueryProvider : GetFilterQueryProvider;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.FilterQueryProvider"/></returns>
-        public virtual Android.Widget.FilterQueryProvider GetFilterQueryProvider()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
-
-        void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnAreAllItemsEnabled != null) ? OnAreAllItemsEnabled : AreAllItemsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool AreAllItemsEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
-
-        void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEmpty != null) ? OnIsEmpty : IsEmpty;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEmpty()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetChildType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, int> OnGetChildType { get; set; } = null;
-
-        void GetChildTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetChildType != null) ? OnGetChildType : GetChildType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetChildType(int arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetChildTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetChildTypeCount { get; set; } = null;
-
-        void GetChildTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetChildTypeCount != null) ? OnGetChildTypeCount : GetChildTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetChildTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetGroupType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetGroupType { get; set; } = null;
-
-        void GetGroupTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetGroupType != null) ? OnGetGroupType : GetGroupType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetGroupType(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetGroupTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetGroupTypeCount { get; set; } = null;
-
-        void GetGroupTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetGroupTypeCount != null) ? OnGetGroupTypeCount : GetGroupTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetGroupTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnConvertToString"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor, Java.Lang.String> OnConvertToString { get; set; } = null;
-
-        void ConvertToStringEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnConvertToString != null) ? OnConvertToString : ConvertToString;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public virtual Java.Lang.String ConvertToString(Android.Database.Cursor arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCombinedChildId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long, long> OnGetCombinedChildId { get; set; } = null;
-
-        void GetCombinedChildIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetCombinedChildId != null) ? OnGetCombinedChildId : GetCombinedChildId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<long>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetCombinedChildId(long arg0, long arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCombinedGroupId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnGetCombinedGroupId { get; set; } = null;
-
-        void GetCombinedGroupIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetCombinedGroupId != null) ? OnGetCombinedGroupId : GetCombinedGroupId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetCombinedGroupId(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnGroupExpanded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupExpanded { get; set; } = null;
-
-        void OnGroupExpandedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnGroupExpanded != null) ? OnOnGroupExpanded : OnGroupExpanded;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void OnGroupExpanded(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
-
-        void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnRegisterDataSetObserver != null) ? OnRegisterDataSetObserver : RegisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
-
-        void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnUnregisterDataSetObserver != null) ? OnUnregisterDataSetObserver : UnregisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnChangeCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnChangeCursor { get; set; } = null;
-
-        void ChangeCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnChangeCursor != null) ? OnChangeCursor : ChangeCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public virtual void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<bool> OnNotifyDataSetChanged { get; set; } = null;
-
-        void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnNotifyDataSetChanged != null) ? OnNotifyDataSetChanged : NotifyDataSetChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        public virtual void NotifyDataSetChanged(bool arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setChildrenCursor(int,android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetChildrenCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, Android.Database.Cursor> OnSetChildrenCursor { get; set; } = null;
-
-        void SetChildrenCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetChildrenCursor != null) ? OnSetChildrenCursor : SetChildrenCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Database.Cursor>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setChildrenCursor(int,android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        public virtual void SetChildrenCursor(int arg0, Android.Database.Cursor arg1)
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        public ResourceCursorTreeAdapter(Android.Content.Context arg0, Android.Database.Cursor arg1, int arg2, int arg3)
+            : base(arg0, arg1, arg2, arg3)
         {
-            
         }
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.FilterQueryProvider> OnSetFilterQueryProvider { get; set; } = null;
-
-        void SetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>> data)
-        {
-            var methodToExecute = (OnSetFilterQueryProvider != null) ? OnSetFilterQueryProvider : SetFilterQueryProvider;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.FilterQueryProvider"/></param>
-        public virtual void SetFilterQueryProvider(Android.Widget.FilterQueryProvider arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetGroupCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnSetGroupCursor { get; set; } = null;
-
-        void SetGroupCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnSetGroupCursor != null) ? OnSetGroupCursor : SetGroupCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public virtual void SetGroupCursor(Android.Database.Cursor arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region ResourceCursorTreeAdapterDirect
-    public partial class ResourceCursorTreeAdapterDirect
-    {
-        #region Constructors
-
         #endregion
 
         #region Class/Interface conversion operators
@@ -622,50 +82,6 @@ public partial class ResourceCursorTreeAdapterDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/> 
-        /// </summary>
-        public int ChildTypeCount
-        {
-            get { return IExecute<int>("getChildTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/> 
-        /// </summary>
-        public Android.Database.Cursor Cursor
-        {
-            get { return IExecute<Android.Database.Cursor>("getCursor"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/> 
-        /// </summary>
-        public Android.Widget.Filter Filter
-        {
-            get { return IExecute<Android.Widget.Filter>("getFilter"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/> <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        public Android.Widget.FilterQueryProvider FilterQueryProvider
-        {
-            get { return IExecute<Android.Widget.FilterQueryProvider>("getFilterQueryProvider"); } set { IExecute("setFilterQueryProvider", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/> 
-        /// </summary>
-        public int GroupTypeCount
-        {
-            get { return IExecute<int>("getGroupTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public override Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return IExecute<Android.Database.Cursor>("runQueryOnBackgroundThread", arg0);
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newChildView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -673,7 +89,7 @@ public override Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.Cha
         /// <param name="arg2"><see cref="bool"/></param>
         /// <param name="arg3"><see cref="Android.View.ViewGroup"/></param>
         /// <returns><see cref="Android.View.View"/></returns>
-        public override Android.View.View NewChildView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
+        public Android.View.View NewChildView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
         {
             return IExecute<Android.View.View>("newChildView", arg0, arg1, arg2, arg3);
         }
@@ -685,130 +101,10 @@ public override Android.View.View NewChildView(Android.Content.Context arg0, And
         /// <param name="arg2"><see cref="bool"/></param>
         /// <param name="arg3"><see cref="Android.View.ViewGroup"/></param>
         /// <returns><see cref="Android.View.View"/></returns>
-        public override Android.View.View NewGroupView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
+        public Android.View.View NewGroupView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
         {
             return IExecute<Android.View.View>("newGroupView", arg0, arg1, arg2, arg3);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool AreAllItemsEnabled()
-        {
-            return IExecute<bool>("areAllItemsEnabled");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEmpty()
-        {
-            return IExecute<bool>("isEmpty");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetChildType(int arg0, int arg1)
-        {
-            return IExecute<int>("getChildType", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetGroupType(int arg0)
-        {
-            return IExecute<int>("getGroupType", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public override Java.Lang.String ConvertToString(Android.Database.Cursor arg0)
-        {
-            return IExecute<Java.Lang.String>("convertToString", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long GetCombinedChildId(long arg0, long arg1)
-        {
-            return IExecute<long>("getCombinedChildId", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long GetCombinedGroupId(long arg0)
-        {
-            return IExecute<long>("getCombinedGroupId", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public override void OnGroupExpanded(int arg0)
-        {
-            IExecute("onGroupExpanded", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("registerDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("unregisterDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public override void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            IExecute("changeCursor", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        public override void NotifyDataSetChanged(bool arg0)
-        {
-            IExecute("notifyDataSetChanged", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setChildrenCursor(int,android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        public override void SetChildrenCursor(int arg0, Android.Database.Cursor arg1)
-        {
-            IExecute("setChildrenCursor", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public override void SetGroupCursor(Android.Database.Cursor arg0)
-        {
-            IExecute("setGroupCursor", arg0);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/ScrollView.cs b/src/net/Netdroid/Generated/Android/Widget/ScrollView.cs
index 999db86f4..723299731 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ScrollView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ScrollView.cs
@@ -84,27 +84,6 @@ public ScrollView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#getBottomEdgeEffectColor()"/> <see href="https://developer.android.com/reference/android/widget/ScrollView.html#setBottomEdgeEffectColor(int)"/>
-        /// </summary>
-        public int BottomEdgeEffectColor
-        {
-            get { return IExecuteWithSignature<int>("getBottomEdgeEffectColor", "()I"); } set { IExecuteWithSignature("setBottomEdgeEffectColor", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#getMaxScrollAmount()"/> 
-        /// </summary>
-        public int MaxScrollAmount
-        {
-            get { return IExecuteWithSignature<int>("getMaxScrollAmount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#getTopEdgeEffectColor()"/> <see href="https://developer.android.com/reference/android/widget/ScrollView.html#setTopEdgeEffectColor(int)"/>
-        /// </summary>
-        public int TopEdgeEffectColor
-        {
-            get { return IExecuteWithSignature<int>("getTopEdgeEffectColor", "()I"); } set { IExecuteWithSignature("setTopEdgeEffectColor", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#arrowScroll(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -175,6 +154,30 @@ public void SmoothScrollTo(int arg0, int arg1)
             IExecute("smoothScrollTo", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#getBottomEdgeEffectColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBottomEdgeEffectColor()
+        {
+            return IExecuteWithSignature<int>("getBottomEdgeEffectColor", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#getMaxScrollAmount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxScrollAmount()
+        {
+            return IExecuteWithSignature<int>("getMaxScrollAmount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#getTopEdgeEffectColor()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTopEdgeEffectColor()
+        {
+            return IExecuteWithSignature<int>("getTopEdgeEffectColor", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#fling(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -191,6 +194,14 @@ public void ScrollToDescendant(Android.View.View arg0)
             IExecuteWithSignature("scrollToDescendant", "(Landroid/view/View;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#setBottomEdgeEffectColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBottomEdgeEffectColor(int arg0)
+        {
+            IExecuteWithSignature("setBottomEdgeEffectColor", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#setEdgeEffectColor(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -214,6 +225,14 @@ public void SetSmoothScrollingEnabled(bool arg0)
         {
             IExecuteWithSignature("setSmoothScrollingEnabled", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ScrollView.html#setTopEdgeEffectColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTopEdgeEffectColor(int arg0)
+        {
+            IExecuteWithSignature("setTopEdgeEffectColor", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/Scroller.cs b/src/net/Netdroid/Generated/Android/Widget/Scroller.cs
index 4ecac0686..c09a6b761 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Scroller.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Scroller.cs
@@ -73,76 +73,76 @@ public Scroller(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getCurrVelocity()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#computeScrollOffset()"/>
         /// </summary>
-        public float CurrVelocity
+        /// <returns><see cref="bool"/></returns>
+        public bool ComputeScrollOffset()
         {
-            get { return IExecuteWithSignature<float>("getCurrVelocity", "()F"); }
+            return IExecuteWithSignature<bool>("computeScrollOffset", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getCurrX()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#isFinished()"/>
         /// </summary>
-        public int CurrX
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFinished()
         {
-            get { return IExecuteWithSignature<int>("getCurrX", "()I"); }
+            return IExecuteWithSignature<bool>("isFinished", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getCurrY()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getCurrX()"/>
         /// </summary>
-        public int CurrY
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrX()
         {
-            get { return IExecuteWithSignature<int>("getCurrY", "()I"); }
+            return IExecuteWithSignature<int>("getCurrX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getCurrY()"/>
         /// </summary>
-        public int Duration
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrY()
         {
-            get { return IExecuteWithSignature<int>("getDuration", "()I"); }
+            return IExecuteWithSignature<int>("getCurrY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getFinalX()"/> <see href="https://developer.android.com/reference/android/widget/Scroller.html#setFinalX(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getDuration()"/>
         /// </summary>
-        public int FinalX
+        /// <returns><see cref="int"/></returns>
+        public int GetDuration()
         {
-            get { return IExecuteWithSignature<int>("getFinalX", "()I"); } set { IExecuteWithSignature("setFinalX", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDuration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getFinalY()"/> <see href="https://developer.android.com/reference/android/widget/Scroller.html#setFinalY(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getFinalX()"/>
         /// </summary>
-        public int FinalY
+        /// <returns><see cref="int"/></returns>
+        public int GetFinalX()
         {
-            get { return IExecuteWithSignature<int>("getFinalY", "()I"); } set { IExecuteWithSignature("setFinalY", "(I)V", value); }
+            return IExecuteWithSignature<int>("getFinalX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getStartX()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getFinalY()"/>
         /// </summary>
-        public int StartX
+        /// <returns><see cref="int"/></returns>
+        public int GetFinalY()
         {
-            get { return IExecuteWithSignature<int>("getStartX", "()I"); }
+            return IExecuteWithSignature<int>("getFinalY", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getStartY()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getStartX()"/>
         /// </summary>
-        public int StartY
+        /// <returns><see cref="int"/></returns>
+        public int GetStartX()
         {
-            get { return IExecuteWithSignature<int>("getStartY", "()I"); }
+            return IExecuteWithSignature<int>("getStartX", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#computeScrollOffset()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getStartY()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ComputeScrollOffset()
-        {
-            return IExecuteWithSignature<bool>("computeScrollOffset", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#isFinished()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFinished()
+        /// <returns><see cref="int"/></returns>
+        public int GetStartY()
         {
-            return IExecuteWithSignature<bool>("isFinished", "()Z");
+            return IExecuteWithSignature<int>("getStartY", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#forceFinished(boolean)"/>
@@ -161,6 +161,14 @@ public void SetFriction(float arg0)
             IExecuteWithSignature("setFriction", "(F)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#getCurrVelocity()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetCurrVelocity()
+        {
+            return IExecuteWithSignature<float>("getCurrVelocity", "()F");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#timePassed()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
@@ -199,6 +207,22 @@ public void Fling(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, in
             IExecute("fling", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#setFinalX(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFinalX(int arg0)
+        {
+            IExecuteWithSignature("setFinalX", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#setFinalY(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFinalY(int arg0)
+        {
+            IExecuteWithSignature("setFinalY", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Scroller.html#startScroll(int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/SearchView.cs b/src/net/Netdroid/Generated/Android/Widget/SearchView.cs
index 2b07e8ce7..33432c0dd 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SearchView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SearchView.cs
@@ -88,52 +88,26 @@ public SearchView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getImeOptions()"/> <see href="https://developer.android.com/reference/android/widget/SearchView.html#setImeOptions(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getSuggestionsAdapter()"/>
         /// </summary>
-        public int ImeOptions
+        /// <returns><see cref="Android.Widget.CursorAdapter"/></returns>
+        public Android.Widget.CursorAdapter GetSuggestionsAdapter()
         {
-            get { return IExecuteWithSignature<int>("getImeOptions", "()I"); } set { IExecuteWithSignature("setImeOptions", "(I)V", value); }
+            return IExecuteWithSignature<Android.Widget.CursorAdapter>("getSuggestionsAdapter", "()Landroid/widget/CursorAdapter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getInputType()"/> <see href="https://developer.android.com/reference/android/widget/SearchView.html#setInputType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getSuggestionsAdapter()"/>
         /// </summary>
-        public int InputType
+        /// <returns><see cref="Android.Widget.CursorAdapter"/></returns>
+        public Android.Widget.CursorAdapter GetSuggestionsAdapterDirect()
         {
-            get { return IExecuteWithSignature<int>("getInputType", "()I"); } set { IExecuteWithSignature("setInputType", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getMaxWidth()"/> <see href="https://developer.android.com/reference/android/widget/SearchView.html#setMaxWidth(int)"/>
-        /// </summary>
-        public int MaxWidth
-        {
-            get { return IExecuteWithSignature<int>("getMaxWidth", "()I"); } set { IExecuteWithSignature("setMaxWidth", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getQuery()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence Query
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getQuery", "()Ljava/lang/CharSequence;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getQueryHint()"/> <see href="https://developer.android.com/reference/android/widget/SearchView.html#setQueryHint(java.lang.CharSequence)"/>
-        /// </summary>
-        public Java.Lang.CharSequence QueryHint
-        {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getQueryHint", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setQueryHint", "(Ljava/lang/CharSequence;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getSuggestionsAdapter()"/> <see href="https://developer.android.com/reference/android/widget/SearchView.html#setSuggestionsAdapter(android.widget.CursorAdapter)"/>
-        /// </summary>
-        public Android.Widget.CursorAdapter SuggestionsAdapter
-        {
-            get { return IExecuteWithSignature<Android.Widget.CursorAdapter>("getSuggestionsAdapter", "()Landroid/widget/CursorAdapter;"); } set { IExecuteWithSignature("setSuggestionsAdapter", "(Landroid/widget/CursorAdapter;)V", value); }
+            return IExecuteWithSignature<Android.Widget.CursorAdapterDirect, Android.Widget.CursorAdapter>("getSuggestionsAdapter", "()Landroid/widget/CursorAdapter;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#isIconfiedByDefault()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsIconfiedByDefault()
         {
             return IExecuteWithSignature<bool>("isIconfiedByDefault", "()Z");
@@ -171,6 +145,46 @@ public bool IsSubmitButtonEnabled()
             return IExecuteWithSignature<bool>("isSubmitButtonEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getImeOptions()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetImeOptions()
+        {
+            return IExecuteWithSignature<int>("getImeOptions", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getInputType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInputType()
+        {
+            return IExecuteWithSignature<int>("getInputType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getMaxWidth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxWidth()
+        {
+            return IExecuteWithSignature<int>("getMaxWidth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getQuery()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetQuery()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getQuery", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#getQueryHint()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetQueryHint()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getQueryHint", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#onActionViewCollapsed()"/>
         /// </summary>
         public void OnActionViewCollapsed()
@@ -201,6 +215,30 @@ public void SetIconifiedByDefault(bool arg0)
             IExecuteWithSignature("setIconifiedByDefault", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#setImeOptions(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetImeOptions(int arg0)
+        {
+            IExecuteWithSignature("setImeOptions", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#setInputType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInputType(int arg0)
+        {
+            IExecuteWithSignature("setInputType", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#setMaxWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxWidth(int arg0)
+        {
+            IExecuteWithSignature("setMaxWidth", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#setOnCloseListener(android.widget.SearchView.OnCloseListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SearchView.OnCloseListener"/></param>
@@ -250,6 +288,14 @@ public void SetQuery(Java.Lang.CharSequence arg0, bool arg1)
             IExecute("setQuery", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#setQueryHint(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetQueryHint(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setQueryHint", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#setQueryRefinementEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -273,6 +319,14 @@ public void SetSubmitButtonEnabled(bool arg0)
         {
             IExecuteWithSignature("setSubmitButtonEnabled", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SearchView.html#setSuggestionsAdapter(android.widget.CursorAdapter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Widget.CursorAdapter"/></param>
+        public void SetSuggestionsAdapter(Android.Widget.CursorAdapter arg0)
+        {
+            IExecuteWithSignature("setSuggestionsAdapter", "(Landroid/widget/CursorAdapter;)V", arg0);
+        }
 
         #endregion
 
@@ -302,7 +356,7 @@ public partial class OnCloseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onClose", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCloseEventHandler));
+                AddEventHandler("onClose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnCloseEventHandler));
 
             }
 
@@ -310,7 +364,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SearchView.OnCloseListener.html#onClose()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnClose"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<bool> OnOnClose { get; set; } = null;
+            public global::System.Func<bool> OnOnClose { get; set; } = null;
 
             void OnCloseEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -402,8 +456,8 @@ public partial class OnQueryTextListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onQueryTextChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnQueryTextChangeEventHandler));
-                AddEventHandler("onQueryTextSubmit", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnQueryTextSubmitEventHandler));
+                AddEventHandler("onQueryTextChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnQueryTextChangeEventHandler));
+                AddEventHandler("onQueryTextSubmit", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnQueryTextSubmitEventHandler));
 
             }
 
@@ -411,7 +465,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SearchView.OnQueryTextListener.html#onQueryTextChange(java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnQueryTextChange"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Java.Lang.String, bool> OnOnQueryTextChange { get; set; } = null;
+            public global::System.Func<Java.Lang.String, bool> OnOnQueryTextChange { get; set; } = null;
 
             void OnQueryTextChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -434,7 +488,7 @@ public virtual bool OnQueryTextChange(Java.Lang.String arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SearchView.OnQueryTextListener.html#onQueryTextSubmit(java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnQueryTextSubmit"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Java.Lang.String, bool> OnOnQueryTextSubmit { get; set; } = null;
+            public global::System.Func<Java.Lang.String, bool> OnOnQueryTextSubmit { get; set; } = null;
 
             void OnQueryTextSubmitEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -537,8 +591,8 @@ public partial class OnSuggestionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSuggestionClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSuggestionClickEventHandler));
-                AddEventHandler("onSuggestionSelect", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSuggestionSelectEventHandler));
+                AddEventHandler("onSuggestionClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSuggestionClickEventHandler));
+                AddEventHandler("onSuggestionSelect", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnSuggestionSelectEventHandler));
 
             }
 
@@ -546,7 +600,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SearchView.OnSuggestionListener.html#onSuggestionClick(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSuggestionClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<int, bool> OnOnSuggestionClick { get; set; } = null;
+            public global::System.Func<int, bool> OnOnSuggestionClick { get; set; } = null;
 
             void OnSuggestionClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
@@ -569,7 +623,7 @@ public virtual bool OnSuggestionClick(int arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SearchView.OnSuggestionListener.html#onSuggestionSelect(int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSuggestionSelect"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<int, bool> OnOnSuggestionSelect { get; set; } = null;
+            public global::System.Func<int, bool> OnOnSuggestionSelect { get; set; } = null;
 
             void OnSuggestionSelectEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/SectionIndexer.cs b/src/net/Netdroid/Generated/Android/Widget/SectionIndexer.cs
index 55ad65936..7017e62d0 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SectionIndexer.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SectionIndexer.cs
@@ -64,13 +64,6 @@ public partial class SectionIndexer : Android.Widget.ISectionIndexer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SectionIndexer.html#getSections()"/> 
-        /// </summary>
-        public object[] Sections
-        {
-            get { return IExecuteWithSignatureArray<object>("getSections", "()[Ljava/lang/Object;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SectionIndexer.html#getPositionForSection(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -88,6 +81,14 @@ public int GetSectionForPosition(int arg0)
         {
             return IExecuteWithSignature<int>("getSectionForPosition", "(I)I", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SectionIndexer.html#getSections()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object[] GetSections()
+        {
+            return IExecuteWithSignatureArray<object>("getSections", "()[Ljava/lang/Object;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/SeekBar.cs b/src/net/Netdroid/Generated/Android/Widget/SeekBar.cs
index 3091bcebe..d5c403a9f 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SeekBar.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SeekBar.cs
@@ -120,9 +120,9 @@ public partial class OnSeekBarChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onProgressChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>>>(OnProgressChangedEventHandler));
-                AddEventHandler("onStartTrackingTouch", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>>>(OnStartTrackingTouchEventHandler));
-                AddEventHandler("onStopTrackingTouch", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>>>(OnStopTrackingTouchEventHandler));
+                AddEventHandler("onProgressChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>>>(OnProgressChangedEventHandler));
+                AddEventHandler("onStartTrackingTouch", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>>>(OnStartTrackingTouchEventHandler));
+                AddEventHandler("onStopTrackingTouch", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>>>(OnStopTrackingTouchEventHandler));
 
             }
 
@@ -130,7 +130,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SeekBar.OnSeekBarChangeListener.html#onProgressChanged(android.widget.SeekBar,int,boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnProgressChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.SeekBar, int, bool> OnOnProgressChanged { get; set; } = null;
+            public global::System.Action<Android.Widget.SeekBar, int, bool> OnOnProgressChanged { get; set; } = null;
 
             void OnProgressChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>> data)
             {
@@ -153,7 +153,7 @@ public virtual void OnProgressChanged(Android.Widget.SeekBar arg0, int arg1, boo
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SeekBar.OnSeekBarChangeListener.html#onStartTrackingTouch(android.widget.SeekBar)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnStartTrackingTouch"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.SeekBar> OnOnStartTrackingTouch { get; set; } = null;
+            public global::System.Action<Android.Widget.SeekBar> OnOnStartTrackingTouch { get; set; } = null;
 
             void OnStartTrackingTouchEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>> data)
             {
@@ -174,7 +174,7 @@ public virtual void OnStartTrackingTouch(Android.Widget.SeekBar arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SeekBar.OnSeekBarChangeListener.html#onStopTrackingTouch(android.widget.SeekBar)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnStopTrackingTouch"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.SeekBar> OnOnStopTrackingTouch { get; set; } = null;
+            public global::System.Action<Android.Widget.SeekBar> OnOnStopTrackingTouch { get; set; } = null;
 
             void OnStopTrackingTouchEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.SeekBar>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/ShareActionProvider.cs b/src/net/Netdroid/Generated/Android/Widget/ShareActionProvider.cs
index e9c51f357..bb8b02444 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ShareActionProvider.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ShareActionProvider.cs
@@ -112,7 +112,7 @@ public partial class OnShareTargetSelectedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onShareTargetSelected", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ShareActionProvider>>>(OnShareTargetSelectedEventHandler));
+                AddEventHandler("onShareTargetSelected", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ShareActionProvider>>>(OnShareTargetSelectedEventHandler));
 
             }
 
@@ -120,7 +120,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/ShareActionProvider.OnShareTargetSelectedListener.html#onShareTargetSelected(android.widget.ShareActionProvider,android.content.Intent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnShareTargetSelected"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Widget.ShareActionProvider, Android.Content.Intent, bool> OnOnShareTargetSelected { get; set; } = null;
+            public global::System.Func<Android.Widget.ShareActionProvider, Android.Content.Intent, bool> OnOnShareTargetSelected { get; set; } = null;
 
             void OnShareTargetSelectedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.ShareActionProvider>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/SimpleAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/SimpleAdapter.cs
index 9435f4f05..9c9d7c855 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SimpleAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SimpleAdapter.cs
@@ -50,27 +50,27 @@ public partial class SimpleAdapter : Android.Widget.IFilterable, Android.Widget.
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getDropDownViewTheme", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDropDownViewThemeEventHandler));
-            AddEventHandler("getFilter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
-            AddEventHandler("getViewBinder", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewBinderEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("notifyDataSetInvalidated", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("setAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>>>(SetAutofillOptionsEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("setDropDownViewResource", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetDropDownViewResourceEventHandler));
-            AddEventHandler("setDropDownViewTheme", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>>>(SetDropDownViewThemeEventHandler));
-            AddEventHandler("setViewBinder", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SimpleAdapter.ViewBinder>>>(SetViewBinderEventHandler));
-            AddEventHandler("setViewImage", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ImageView>>>(SetViewImageEventHandler));
-            AddEventHandler("setViewImage2", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ImageView>>>(SetViewImage2EventHandler));
-            AddEventHandler("setViewText", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TextView>>>(SetViewTextEventHandler));
+            AddEventHandler("getDropDownViewTheme", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDropDownViewThemeEventHandler));
+            AddEventHandler("getFilter", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
+            AddEventHandler("getViewBinder", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewBinderEventHandler));
+            AddEventHandler("areAllItemsEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("isEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
+            AddEventHandler("getItemViewType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
+            AddEventHandler("getViewTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
+            AddEventHandler("getAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
+            AddEventHandler("notifyDataSetChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
+            AddEventHandler("notifyDataSetInvalidated", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("setAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>>>(SetAutofillOptionsEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("setDropDownViewResource", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetDropDownViewResourceEventHandler));
+            AddEventHandler("setDropDownViewTheme", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>>>(SetDropDownViewThemeEventHandler));
+            AddEventHandler("setViewBinder", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SimpleAdapter.ViewBinder>>>(SetViewBinderEventHandler));
+            AddEventHandler("setViewImage", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ImageView>>>(SetViewImageEventHandler));
+            AddEventHandler("setViewImage2", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ImageView>>>(SetViewImage2EventHandler));
+            AddEventHandler("setViewText", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TextView>>>(SetViewTextEventHandler));
 
         }
 
@@ -78,7 +78,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getDropDownViewTheme()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetDropDownViewTheme"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Res.Resources.Theme> OnGetDropDownViewTheme { get; set; } = null;
+        public global::System.Func<Android.Content.Res.Resources.Theme> OnGetDropDownViewTheme { get; set; } = null;
 
         void GetDropDownViewThemeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -100,7 +100,7 @@ public virtual Android.Content.Res.Resources.Theme GetDropDownViewTheme()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getFilter()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
+        public global::System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
 
         void GetFilterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -122,7 +122,7 @@ public virtual Android.Widget.Filter GetFilter()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getViewBinder()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewBinder"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.SimpleAdapter.ViewBinder> OnGetViewBinder { get; set; } = null;
+        public global::System.Func<Android.Widget.SimpleAdapter.ViewBinder> OnGetViewBinder { get; set; } = null;
 
         void GetViewBinderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -144,7 +144,7 @@ public virtual Android.Widget.SimpleAdapter.ViewBinder GetViewBinder()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
+        public global::System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
 
         void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -166,7 +166,7 @@ public virtual bool AreAllItemsEnabled()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -188,7 +188,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -210,7 +210,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnIsEnabled { get; set; } = null;
+        public global::System.Func<int, bool> OnIsEnabled { get; set; } = null;
 
         void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -233,7 +233,7 @@ public virtual bool IsEnabled(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
+        public global::System.Func<int, int> OnGetItemViewType { get; set; } = null;
 
         void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -256,7 +256,7 @@ public virtual int GetItemViewType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetViewTypeCount { get; set; } = null;
 
         void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -278,7 +278,7 @@ public virtual int GetViewTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
 
         void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -300,7 +300,7 @@ public virtual Java.Lang.CharSequence[] GetAutofillOptions()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetChanged { get; set; } = null;
+        public global::System.Action OnNotifyDataSetChanged { get; set; } = null;
 
         void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -320,7 +320,7 @@ public virtual void NotifyDataSetChanged()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNotifyDataSetInvalidated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetInvalidated { get; set; } = null;
+        public global::System.Action OnNotifyDataSetInvalidated { get; set; } = null;
 
         void NotifyDataSetInvalidatedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -340,7 +340,7 @@ public virtual void NotifyDataSetInvalidated()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -361,12 +361,12 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<> OnSetAutofillOptions { get; set; } = null;
+        public global::System.Action<Java.Lang.CharSequence[]> OnSetAutofillOptions { get; set; } = null;
 
         void SetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>> data)
         {
             var methodToExecute = (OnSetAutofillOptions != null) ? OnSetAutofillOptions : SetAutofillOptions;
-            methodToExecute.Invoke();
+            methodToExecute.Invoke(data.EventData.TypedEventData);
         }
 
         /// <summary>
@@ -382,7 +382,7 @@ public virtual void SetAutofillOptions(params Java.Lang.CharSequence[] arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -403,7 +403,7 @@ public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver a
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setDropDownViewResource(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetDropDownViewResource"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetDropDownViewResource { get; set; } = null;
+        public global::System.Action<int> OnSetDropDownViewResource { get; set; } = null;
 
         void SetDropDownViewResourceEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -424,7 +424,7 @@ public virtual void SetDropDownViewResource(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetDropDownViewTheme"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Content.Res.Resources.Theme> OnSetDropDownViewTheme { get; set; } = null;
+        public global::System.Action<Android.Content.Res.Resources.Theme> OnSetDropDownViewTheme { get; set; } = null;
 
         void SetDropDownViewThemeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>> data)
         {
@@ -445,7 +445,7 @@ public virtual void SetDropDownViewTheme(Android.Content.Res.Resources.Theme arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setViewBinder(android.widget.SimpleAdapter.ViewBinder)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetViewBinder"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.SimpleAdapter.ViewBinder> OnSetViewBinder { get; set; } = null;
+        public global::System.Action<Android.Widget.SimpleAdapter.ViewBinder> OnSetViewBinder { get; set; } = null;
 
         void SetViewBinderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.SimpleAdapter.ViewBinder>> data)
         {
@@ -466,7 +466,7 @@ public virtual void SetViewBinder(Android.Widget.SimpleAdapter.ViewBinder arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setViewImage(android.widget.ImageView,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetViewImage"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.ImageView, int> OnSetViewImage { get; set; } = null;
+        public global::System.Action<Android.Widget.ImageView, int> OnSetViewImage { get; set; } = null;
 
         void SetViewImageEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.ImageView>> data)
         {
@@ -488,7 +488,7 @@ public virtual void SetViewImage(Android.Widget.ImageView arg0, int arg1)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setViewImage(android.widget.ImageView,java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetViewImage2"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.ImageView, Java.Lang.String> OnSetViewImage2 { get; set; } = null;
+        public global::System.Action<Android.Widget.ImageView, Java.Lang.String> OnSetViewImage2 { get; set; } = null;
 
         void SetViewImage2EventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.ImageView>> data)
         {
@@ -510,7 +510,7 @@ public virtual void SetViewImage(Android.Widget.ImageView arg0, Java.Lang.String
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setViewText(android.widget.TextView,java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetViewText"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.TextView, Java.Lang.String> OnSetViewText { get; set; } = null;
+        public global::System.Action<Android.Widget.TextView, Java.Lang.String> OnSetViewText { get; set; } = null;
 
         void SetViewTextEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.TextView>> data)
         {
@@ -601,39 +601,28 @@ public partial class SimpleAdapterDirect : Android.Widget.IFilterable, Android.W
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/> <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); } set { IExecute("setAutofillOptions", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getDropDownViewTheme()"/> <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
-        /// </summary>
-        public Android.Content.Res.Resources.Theme DropDownViewTheme
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getDropDownViewTheme", "()Landroid/content/res/Resources$Theme;"); } set { IExecuteWithSignature("setDropDownViewTheme", "(Landroid/content/res/Resources$Theme;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getFilter()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getDropDownViewTheme()"/>
         /// </summary>
-        public Android.Widget.Filter Filter
+        /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
+        public override Android.Content.Res.Resources.Theme GetDropDownViewTheme()
         {
-            get { return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;"); }
+            return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getDropDownViewTheme", "()Landroid/content/res/Resources$Theme;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getViewBinder()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getFilter()"/>
         /// </summary>
-        public Android.Widget.SimpleAdapter.ViewBinder GetViewBinder
+        /// <returns><see cref="Android.Widget.Filter"/></returns>
+        public override Android.Widget.Filter GetFilter()
         {
-            get { return IExecuteWithSignature<Android.Widget.SimpleAdapter.ViewBinder>("getViewBinder", "()Landroid/widget/SimpleAdapter$ViewBinder;"); }
+            return IExecuteWithSignature<Android.Widget.Filter>("getFilter", "()Landroid/widget/Filter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#getViewBinder()"/>
         /// </summary>
-        public int ViewTypeCount
+        /// <returns><see cref="Android.Widget.SimpleAdapter.ViewBinder"/></returns>
+        public override Android.Widget.SimpleAdapter.ViewBinder GetViewBinder()
         {
-            get { return IExecute<int>("getViewTypeCount"); }
+            return IExecuteWithSignature<Android.Widget.SimpleAdapter.ViewBinder>("getViewBinder", "()Landroid/widget/SimpleAdapter$ViewBinder;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
@@ -678,6 +667,22 @@ public override int GetItemViewType(int arg0)
             return IExecute<int>("getItemViewType", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetViewTypeCount()
+        {
+            return IExecute<int>("getViewTypeCount");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public override Java.Lang.CharSequence[] GetAutofillOptions()
+        {
+            return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
         /// </summary>
         public override void NotifyDataSetChanged()
@@ -700,6 +705,14 @@ public override void RegisterDataSetObserver(Android.Database.DataSetObserver ar
             IExecute("registerDataSetObserver", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public override void SetAutofillOptions(params Java.Lang.CharSequence[] arg0)
+        {
+            if (arg0.Length == 0) IExecute("setAutofillOptions"); else IExecute("setAutofillOptions", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
@@ -716,6 +729,14 @@ public override void SetDropDownViewResource(int arg0)
             IExecuteWithSignature("setDropDownViewResource", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.Resources.Theme"/></param>
+        public override void SetDropDownViewTheme(Android.Content.Res.Resources.Theme arg0)
+        {
+            IExecuteWithSignature("setDropDownViewTheme", "(Landroid/content/res/Resources$Theme;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleAdapter.html#setViewBinder(android.widget.SimpleAdapter.ViewBinder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SimpleAdapter.ViewBinder"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/SimpleCursorAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/SimpleCursorAdapter.cs
index 7e8103b8f..e861609a0 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SimpleCursorAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SimpleCursorAdapter.cs
@@ -29,685 +29,123 @@ namespace Android.Widget
     public partial class SimpleCursorAdapter
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// Handlers initializer for <see cref="SimpleCursorAdapter"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#%3Cinit%3E(android.content.Context,int,android.database.Cursor,java.lang.String[],int[],int)"/>
         /// </summary>
-        protected virtual void InitializeHandlers()
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Android.Database.Cursor"/></param>
+        /// <param name="arg3"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        public SimpleCursorAdapter(Android.Content.Context arg0, int arg1, Android.Database.Cursor arg2, Java.Lang.String[] arg3, int[] arg4, int arg5)
+            : base(arg0, arg1, arg2, arg3, arg4, arg5)
         {
-            AddEventHandler("getDropDownViewTheme", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDropDownViewThemeEventHandler));
-            AddEventHandler("getCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCursorEventHandler));
-            AddEventHandler("runQueryOnBackgroundThread", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(RunQueryOnBackgroundThreadEventHandler));
-            AddEventHandler("getFilter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
-            AddEventHandler("getFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterQueryProviderEventHandler));
-            AddEventHandler("getCursorToStringConverter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCursorToStringConverterEventHandler));
-            AddEventHandler("getViewBinder", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewBinderEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getStringConversionColumn", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetStringConversionColumnEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("notifyDataSetInvalidated", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("setAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>>>(SetAutofillOptionsEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("changeCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ChangeCursorEventHandler));
-            AddEventHandler("setFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>>>(SetFilterQueryProviderEventHandler));
-            AddEventHandler("setDropDownViewResource", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetDropDownViewResourceEventHandler));
-            AddEventHandler("setViewResource", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetViewResourceEventHandler));
-            AddEventHandler("changeCursorAndColumns", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ChangeCursorAndColumnsEventHandler));
-            AddEventHandler("setCursorToStringConverter", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SimpleCursorAdapter.CursorToStringConverter>>>(SetCursorToStringConverterEventHandler));
-            AddEventHandler("setStringConversionColumn", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetStringConversionColumnEventHandler));
-            AddEventHandler("setViewBinder", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SimpleCursorAdapter.ViewBinder>>>(SetViewBinderEventHandler));
-            AddEventHandler("setViewImage", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.ImageView>>>(SetViewImageEventHandler));
-            AddEventHandler("setViewText", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TextView>>>(SetViewTextEventHandler));
-
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#%3Cinit%3E(android.content.Context,int,android.database.Cursor,java.lang.String[],int[])"/>
         /// </summary>
-        /// <remarks>If <see cref="OnGetDropDownViewTheme"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Res.Resources.Theme> OnGetDropDownViewTheme { get; set; } = null;
-
-        void GetDropDownViewThemeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetDropDownViewTheme != null) ? OnGetDropDownViewTheme : GetDropDownViewTheme;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
-        public virtual Android.Content.Res.Resources.Theme GetDropDownViewTheme()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor> OnGetCursor { get; set; } = null;
-
-        void GetCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="Android.Database.Cursor"/></param>
+        /// <param name="arg3"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public SimpleCursorAdapter(Android.Content.Context arg0, int arg1, Android.Database.Cursor arg2, Java.Lang.String[] arg3, int[] arg4)
+            : base(arg0, arg1, arg2, arg3, arg4)
         {
-            var methodToExecute = (OnGetCursor != null) ? OnGetCursor : GetCursor;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
         }
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor GetCursor()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRunQueryOnBackgroundThread"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.Database.Cursor> OnRunQueryOnBackgroundThread { get; set; } = null;
-
-        void RunQueryOnBackgroundThreadEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnRunQueryOnBackgroundThread != null) ? OnRunQueryOnBackgroundThread : RunQueryOnBackgroundThread;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
-
-        void GetFilterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilter != null) ? OnGetFilter : GetFilter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.Filter"/></returns>
-        public virtual Android.Widget.Filter GetFilter()
-        {
-            return default;
-        }
+        #region Class/Interface conversion operators
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.FilterQueryProvider> OnGetFilterQueryProvider { get; set; } = null;
+        #endregion
 
-        void GetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilterQueryProvider != null) ? OnGetFilterQueryProvider : GetFilterQueryProvider;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #region Fields
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.FilterQueryProvider"/></returns>
-        public virtual Android.Widget.FilterQueryProvider GetFilterQueryProvider()
-        {
-            return default;
-        }
+        #endregion
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getCursorToStringConverter()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCursorToStringConverter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.SimpleCursorAdapter.CursorToStringConverter> OnGetCursorToStringConverter { get; set; } = null;
+        #region Static methods
 
-        void GetCursorToStringConverterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetCursorToStringConverter != null) ? OnGetCursorToStringConverter : GetCursorToStringConverter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getCursorToStringConverter()"/>
         /// </summary>
         /// <returns><see cref="Android.Widget.SimpleCursorAdapter.CursorToStringConverter"/></returns>
-        public virtual Android.Widget.SimpleCursorAdapter.CursorToStringConverter GetCursorToStringConverter()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getViewBinder()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetViewBinder"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.SimpleCursorAdapter.ViewBinder> OnGetViewBinder { get; set; } = null;
-
-        void GetViewBinderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        public Android.Widget.SimpleCursorAdapter.CursorToStringConverter GetCursorToStringConverter()
         {
-            var methodToExecute = (OnGetViewBinder != null) ? OnGetViewBinder : GetViewBinder;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<Android.Widget.SimpleCursorAdapter.CursorToStringConverter>("getCursorToStringConverter", "()Landroid/widget/SimpleCursorAdapter$CursorToStringConverter;");
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getViewBinder()"/>
         /// </summary>
         /// <returns><see cref="Android.Widget.SimpleCursorAdapter.ViewBinder"/></returns>
-        public virtual Android.Widget.SimpleCursorAdapter.ViewBinder GetViewBinder()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
-
-        void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        public Android.Widget.SimpleCursorAdapter.ViewBinder GetViewBinder()
         {
-            var methodToExecute = (OnAreAllItemsEnabled != null) ? OnAreAllItemsEnabled : AreAllItemsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<Android.Widget.SimpleCursorAdapter.ViewBinder>("getViewBinder", "()Landroid/widget/SimpleCursorAdapter$ViewBinder;");
         }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool AreAllItemsEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
-
-        void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEmpty != null) ? OnIsEmpty : IsEmpty;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEmpty()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnIsEnabled { get; set; } = null;
-
-        void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnIsEnabled != null) ? OnIsEnabled : IsEnabled;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEnabled(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
-
-        void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetItemViewType != null) ? OnGetItemViewType : GetItemViewType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetItemViewType(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
-
-        void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetViewTypeCount != null) ? OnGetViewTypeCount : GetViewTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetViewTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getStringConversionColumn()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetStringConversionColumn"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetStringConversionColumn { get; set; } = null;
-
-        void GetStringConversionColumnEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetStringConversionColumn != null) ? OnGetStringConversionColumn : GetStringConversionColumn;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getStringConversionColumn()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        public virtual int GetStringConversionColumn()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
-
-        void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetAutofillOptions != null) ? OnGetAutofillOptions : GetAutofillOptions;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
-        public virtual Java.Lang.CharSequence[] GetAutofillOptions()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetChanged { get; set; } = null;
-
-        void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnNotifyDataSetChanged != null) ? OnNotifyDataSetChanged : NotifyDataSetChanged;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        public virtual void NotifyDataSetChanged()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetInvalidated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetInvalidated { get; set; } = null;
-
-        void NotifyDataSetInvalidatedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnNotifyDataSetInvalidated != null) ? OnNotifyDataSetInvalidated : NotifyDataSetInvalidated;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        public virtual void NotifyDataSetInvalidated()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
-
-        void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnRegisterDataSetObserver != null) ? OnRegisterDataSetObserver : RegisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<> OnSetAutofillOptions { get; set; } = null;
-
-        void SetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence[]>> data)
-        {
-            var methodToExecute = (OnSetAutofillOptions != null) ? OnSetAutofillOptions : SetAutofillOptions;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        public virtual void SetAutofillOptions(params Java.Lang.CharSequence[] arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
-
-        void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnUnregisterDataSetObserver != null) ? OnUnregisterDataSetObserver : UnregisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnChangeCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnChangeCursor { get; set; } = null;
-
-        void ChangeCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnChangeCursor != null) ? OnChangeCursor : ChangeCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public virtual void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.FilterQueryProvider> OnSetFilterQueryProvider { get; set; } = null;
-
-        void SetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>> data)
-        {
-            var methodToExecute = (OnSetFilterQueryProvider != null) ? OnSetFilterQueryProvider : SetFilterQueryProvider;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.FilterQueryProvider"/></param>
-        public virtual void SetFilterQueryProvider(Android.Widget.FilterQueryProvider arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setDropDownViewResource(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetDropDownViewResource"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetDropDownViewResource { get; set; } = null;
-
-        void SetDropDownViewResourceEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetDropDownViewResource != null) ? OnSetDropDownViewResource : SetDropDownViewResource;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setDropDownViewResource(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void SetDropDownViewResource(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setViewResource(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetViewResource"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetViewResource { get; set; } = null;
-
-        void SetViewResourceEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
+        public int GetStringConversionColumn()
         {
-            var methodToExecute = (OnSetViewResource != null) ? OnSetViewResource : SetViewResource;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
+            return IExecuteWithSignature<int>("getStringConversionColumn", "()I");
         }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setViewResource(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void SetViewResource(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#changeCursorAndColumns(android.database.Cursor,java.lang.String[],int[])"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnChangeCursorAndColumns"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor, Java.Lang.String[], int[]> OnChangeCursorAndColumns { get; set; } = null;
-
-        void ChangeCursorAndColumnsEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnChangeCursorAndColumns != null) ? OnChangeCursorAndColumns : ChangeCursorAndColumns;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String[]>(0), data.EventData.GetAt<int[]>(1));
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#changeCursorAndColumns(android.database.Cursor,java.lang.String[],int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        public virtual void ChangeCursorAndColumns(Android.Database.Cursor arg0, Java.Lang.String[] arg1, int[] arg2)
+        public void ChangeCursorAndColumns(Android.Database.Cursor arg0, Java.Lang.String[] arg1, int[] arg2)
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetCursorToStringConverter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.SimpleCursorAdapter.CursorToStringConverter> OnSetCursorToStringConverter { get; set; } = null;
-
-        void SetCursorToStringConverterEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.SimpleCursorAdapter.CursorToStringConverter>> data)
-        {
-            var methodToExecute = (OnSetCursorToStringConverter != null) ? OnSetCursorToStringConverter : SetCursorToStringConverter;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
+            IExecute("changeCursorAndColumns", arg0, arg1, arg2);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SimpleCursorAdapter.CursorToStringConverter"/></param>
-        public virtual void SetCursorToStringConverter(Android.Widget.SimpleCursorAdapter.CursorToStringConverter arg0)
+        public void SetCursorToStringConverter(Android.Widget.SimpleCursorAdapter.CursorToStringConverter arg0)
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setStringConversionColumn(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetStringConversionColumn"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnSetStringConversionColumn { get; set; } = null;
-
-        void SetStringConversionColumnEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetStringConversionColumn != null) ? OnSetStringConversionColumn : SetStringConversionColumn;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
+            IExecuteWithSignature("setCursorToStringConverter", "(Landroid/widget/SimpleCursorAdapter$CursorToStringConverter;)V", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setStringConversionColumn(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        public virtual void SetStringConversionColumn(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetViewBinder"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.SimpleCursorAdapter.ViewBinder> OnSetViewBinder { get; set; } = null;
-
-        void SetViewBinderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.SimpleCursorAdapter.ViewBinder>> data)
+        public void SetStringConversionColumn(int arg0)
         {
-            var methodToExecute = (OnSetViewBinder != null) ? OnSetViewBinder : SetViewBinder;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
+            IExecuteWithSignature("setStringConversionColumn", "(I)V", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SimpleCursorAdapter.ViewBinder"/></param>
-        public virtual void SetViewBinder(Android.Widget.SimpleCursorAdapter.ViewBinder arg0)
+        public void SetViewBinder(Android.Widget.SimpleCursorAdapter.ViewBinder arg0)
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewImage(android.widget.ImageView,java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetViewImage"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.ImageView, Java.Lang.String> OnSetViewImage { get; set; } = null;
-
-        void SetViewImageEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.ImageView>> data)
-        {
-            var methodToExecute = (OnSetViewImage != null) ? OnSetViewImage : SetViewImage;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0));
+            IExecuteWithSignature("setViewBinder", "(Landroid/widget/SimpleCursorAdapter$ViewBinder;)V", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewImage(android.widget.ImageView,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.ImageView"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        public virtual void SetViewImage(Android.Widget.ImageView arg0, Java.Lang.String arg1)
+        public void SetViewImage(Android.Widget.ImageView arg0, Java.Lang.String arg1)
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewText(android.widget.TextView,java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetViewText"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.TextView, Java.Lang.String> OnSetViewText { get; set; } = null;
-
-        void SetViewTextEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.TextView>> data)
-        {
-            var methodToExecute = (OnSetViewText != null) ? OnSetViewText : SetViewText;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0));
+            IExecute("setViewImage", arg0, arg1);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewText(android.widget.TextView,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.TextView"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        public virtual void SetViewText(Android.Widget.TextView arg0, Java.Lang.String arg1)
+        public void SetViewText(Android.Widget.TextView arg0, Java.Lang.String arg1)
         {
-            
+            IExecute("setViewText", arg0, arg1);
         }
 
         #endregion
@@ -796,241 +234,6 @@ public bool SetViewValue(Android.View.View arg0, Android.Database.Cursor arg1, i
         #endregion
 
     
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region SimpleCursorAdapterDirect
-    public partial class SimpleCursorAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getAutofillOptions()"/> <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#setAutofillOptions(java.lang.CharSequence[])"/>
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); } set { IExecute("setAutofillOptions", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getCursor()"/> 
-        /// </summary>
-        public Android.Database.Cursor Cursor
-        {
-            get { return IExecute<Android.Database.Cursor>("getCursor"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getDropDownViewTheme()"/> 
-        /// </summary>
-        public Android.Content.Res.Resources.Theme DropDownViewTheme
-        {
-            get { return IExecute<Android.Content.Res.Resources.Theme>("getDropDownViewTheme"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilter()"/> 
-        /// </summary>
-        public Android.Widget.Filter Filter
-        {
-            get { return IExecute<Android.Widget.Filter>("getFilter"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#getFilterQueryProvider()"/> <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        public Android.Widget.FilterQueryProvider FilterQueryProvider
-        {
-            get { return IExecute<Android.Widget.FilterQueryProvider>("getFilterQueryProvider"); } set { IExecute("setFilterQueryProvider", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getCursorToStringConverter()"/> 
-        /// </summary>
-        public Android.Widget.SimpleCursorAdapter.CursorToStringConverter GetCursorToStringConverter
-        {
-            get { return IExecuteWithSignature<Android.Widget.SimpleCursorAdapter.CursorToStringConverter>("getCursorToStringConverter", "()Landroid/widget/SimpleCursorAdapter$CursorToStringConverter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getViewBinder()"/> 
-        /// </summary>
-        public Android.Widget.SimpleCursorAdapter.ViewBinder GetViewBinder
-        {
-            get { return IExecuteWithSignature<Android.Widget.SimpleCursorAdapter.ViewBinder>("getViewBinder", "()Landroid/widget/SimpleCursorAdapter$ViewBinder;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#getStringConversionColumn()"/> <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setStringConversionColumn(int)"/>
-        /// </summary>
-        public int StringConversionColumn
-        {
-            get { return IExecuteWithSignature<int>("getStringConversionColumn", "()I"); } set { IExecuteWithSignature("setStringConversionColumn", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecute<int>("getViewTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public override Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return IExecute<Android.Database.Cursor>("runQueryOnBackgroundThread", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool AreAllItemsEnabled()
-        {
-            return IExecute<bool>("areAllItemsEnabled");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEmpty()
-        {
-            return IExecute<bool>("isEmpty");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#isEnabled(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEnabled(int arg0)
-        {
-            return IExecute<bool>("isEnabled", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#getItemViewType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetItemViewType(int arg0)
-        {
-            return IExecute<int>("getItemViewType", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        public override void NotifyDataSetChanged()
-        {
-            IExecute("notifyDataSetChanged");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        public override void NotifyDataSetInvalidated()
-        {
-            IExecute("notifyDataSetInvalidated");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("registerDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("unregisterDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public override void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            IExecute("changeCursor", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setDropDownViewResource(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public override void SetDropDownViewResource(int arg0)
-        {
-            IExecute("setDropDownViewResource", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorAdapter.html#setViewResource(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public override void SetViewResource(int arg0)
-        {
-            IExecute("setViewResource", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#changeCursorAndColumns(android.database.Cursor,java.lang.String[],int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public override void ChangeCursorAndColumns(Android.Database.Cursor arg0, Java.Lang.String[] arg1, int[] arg2)
-        {
-            IExecute("changeCursorAndColumns", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.SimpleCursorAdapter.CursorToStringConverter"/></param>
-        public override void SetCursorToStringConverter(Android.Widget.SimpleCursorAdapter.CursorToStringConverter arg0)
-        {
-            IExecuteWithSignature("setCursorToStringConverter", "(Landroid/widget/SimpleCursorAdapter$CursorToStringConverter;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.SimpleCursorAdapter.ViewBinder"/></param>
-        public override void SetViewBinder(Android.Widget.SimpleCursorAdapter.ViewBinder arg0)
-        {
-            IExecuteWithSignature("setViewBinder", "(Landroid/widget/SimpleCursorAdapter$ViewBinder;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewImage(android.widget.ImageView,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.ImageView"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        public override void SetViewImage(Android.Widget.ImageView arg0, Java.Lang.String arg1)
-        {
-            IExecute("setViewImage", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorAdapter.html#setViewText(android.widget.TextView,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.TextView"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        public override void SetViewText(Android.Widget.TextView arg0, Java.Lang.String arg1)
-        {
-            IExecute("setViewText", arg0, arg1);
-        }
-
-        #endregion
-
-        #region Nested classes
-
         #endregion
 
         // TODO: complete the class
diff --git a/src/net/Netdroid/Generated/Android/Widget/SimpleCursorTreeAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/SimpleCursorTreeAdapter.cs
index d23fbe96f..6c9f13edb 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SimpleCursorTreeAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SimpleCursorTreeAdapter.cs
@@ -29,634 +29,94 @@ namespace Android.Widget
     public partial class SimpleCursorTreeAdapter
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="SimpleCursorTreeAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("getCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCursorEventHandler));
-            AddEventHandler("runQueryOnBackgroundThread", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>>>(RunQueryOnBackgroundThreadEventHandler));
-            AddEventHandler("newChildView", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(NewChildViewEventHandler));
-            AddEventHandler("newGroupView", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Context>>>(NewGroupViewEventHandler));
-            AddEventHandler("getFilter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterEventHandler));
-            AddEventHandler("getFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetFilterQueryProviderEventHandler));
-            AddEventHandler("getViewBinder", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewBinderEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getChildType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildTypeEventHandler));
-            AddEventHandler("getChildTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetChildTypeCountEventHandler));
-            AddEventHandler("getGroupType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupTypeEventHandler));
-            AddEventHandler("getGroupTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupTypeCountEventHandler));
-            AddEventHandler("convertToString", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ConvertToStringEventHandler));
-            AddEventHandler("getCombinedChildId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedChildIdEventHandler));
-            AddEventHandler("getCombinedGroupId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedGroupIdEventHandler));
-            AddEventHandler("onGroupExpanded", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("changeCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(ChangeCursorEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("setChildrenCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(SetChildrenCursorEventHandler));
-            AddEventHandler("setFilterQueryProvider", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>>>(SetFilterQueryProviderEventHandler));
-            AddEventHandler("setGroupCursor", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.Cursor>>>(SetGroupCursorEventHandler));
-            AddEventHandler("setViewBinder", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.SimpleCursorTreeAdapter.ViewBinder>>>(SetViewBinderEventHandler));
-            AddEventHandler("setViewText", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TextView>>>(SetViewTextEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor> OnGetCursor { get; set; } = null;
-
-        void GetCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetCursor != null) ? OnGetCursor : GetCursor;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor GetCursor()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRunQueryOnBackgroundThread"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence, Android.Database.Cursor> OnRunQueryOnBackgroundThread { get; set; } = null;
-
-        void RunQueryOnBackgroundThreadEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.CharSequence>> data)
-        {
-            var methodToExecute = (OnRunQueryOnBackgroundThread != null) ? OnRunQueryOnBackgroundThread : RunQueryOnBackgroundThread;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public virtual Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newChildView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNewChildView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context, Android.Database.Cursor, bool, Android.View.ViewGroup, Android.View.View> OnNewChildView { get; set; } = null;
-
-        void NewChildViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Context>> data)
-        {
-            var methodToExecute = (OnNewChildView != null) ? OnNewChildView : NewChildView;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Database.Cursor>(0), data.EventData.GetAt<bool>(1), data.EventData.GetAt<Android.View.ViewGroup>(2));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newChildView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#%3Cinit%3E(android.content.Context,android.database.Cursor,int,int,java.lang.String[],int[],int,int,java.lang.String[],int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        /// <param name="arg2"><see cref="bool"/></param>
-        /// <param name="arg3"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public virtual Android.View.View NewChildView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        /// <param name="arg6"><see cref="int"/></param>
+        /// <param name="arg7"><see cref="int"/></param>
+        /// <param name="arg8"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg9"><see cref="int"/></param>
+        public SimpleCursorTreeAdapter(Android.Content.Context arg0, Android.Database.Cursor arg1, int arg2, int arg3, Java.Lang.String[] arg4, int[] arg5, int arg6, int arg7, Java.Lang.String[] arg8, int[] arg9)
+            : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
         {
-            return default;
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newGroupView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#%3Cinit%3E(android.content.Context,android.database.Cursor,int,int,java.lang.String[],int[],int,java.lang.String[],int[])"/>
         /// </summary>
-        /// <remarks>If <see cref="OnNewGroupView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Context, Android.Database.Cursor, bool, Android.View.ViewGroup, Android.View.View> OnNewGroupView { get; set; } = null;
-
-        void NewGroupViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Context>> data)
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        /// <param name="arg6"><see cref="int"/></param>
+        /// <param name="arg7"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg8"><see cref="int"/></param>
+        public SimpleCursorTreeAdapter(Android.Content.Context arg0, Android.Database.Cursor arg1, int arg2, int arg3, Java.Lang.String[] arg4, int[] arg5, int arg6, Java.Lang.String[] arg7, int[] arg8)
+            : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8)
         {
-            var methodToExecute = (OnNewGroupView != null) ? OnNewGroupView : NewGroupView;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Database.Cursor>(0), data.EventData.GetAt<bool>(1), data.EventData.GetAt<Android.View.ViewGroup>(2));
-            data.SetReturnValue(executionResult);
         }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newGroupView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#%3Cinit%3E(android.content.Context,android.database.Cursor,int,java.lang.String[],int[],int,java.lang.String[],int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        /// <param name="arg2"><see cref="bool"/></param>
-        /// <param name="arg3"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public virtual Android.View.View NewGroupView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        /// <param name="arg6"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg7"><see cref="int"/></param>
+        public SimpleCursorTreeAdapter(Android.Content.Context arg0, Android.Database.Cursor arg1, int arg2, Java.Lang.String[] arg3, int[] arg4, int arg5, Java.Lang.String[] arg6, int[] arg7)
+            : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
         {
-            return default;
         }
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.Filter> OnGetFilter { get; set; } = null;
-
-        void GetFilterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilter != null) ? OnGetFilter : GetFilter;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.Filter"/></returns>
-        public virtual Android.Widget.Filter GetFilter()
-        {
-            return default;
-        }
+        #region Class/Interface conversion operators
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.FilterQueryProvider> OnGetFilterQueryProvider { get; set; } = null;
+        #endregion
 
-        void GetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetFilterQueryProvider != null) ? OnGetFilterQueryProvider : GetFilterQueryProvider;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #region Fields
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/>
-        /// </summary>
-        /// <returns><see cref="Android.Widget.FilterQueryProvider"/></returns>
-        public virtual Android.Widget.FilterQueryProvider GetFilterQueryProvider()
-        {
-            return default;
-        }
+        #endregion
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#getViewBinder()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetViewBinder"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.SimpleCursorTreeAdapter.ViewBinder> OnGetViewBinder { get; set; } = null;
+        #region Static methods
 
-        void GetViewBinderEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetViewBinder != null) ? OnGetViewBinder : GetViewBinder;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
+        #endregion
 
+        #region Instance methods
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#getViewBinder()"/>
         /// </summary>
         /// <returns><see cref="Android.Widget.SimpleCursorTreeAdapter.ViewBinder"/></returns>
-        public virtual Android.Widget.SimpleCursorTreeAdapter.ViewBinder GetViewBinder()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
-
-        void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
+        public Android.Widget.SimpleCursorTreeAdapter.ViewBinder GetViewBinder()
         {
-            var methodToExecute = (OnAreAllItemsEnabled != null) ? OnAreAllItemsEnabled : AreAllItemsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
+            return IExecuteWithSignature<Android.Widget.SimpleCursorTreeAdapter.ViewBinder>("getViewBinder", "()Landroid/widget/SimpleCursorTreeAdapter$ViewBinder;");
         }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool AreAllItemsEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
-
-        void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEmpty != null) ? OnIsEmpty : IsEmpty;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEmpty()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetChildType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, int> OnGetChildType { get; set; } = null;
-
-        void GetChildTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetChildType != null) ? OnGetChildType : GetChildType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetChildType(int arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetChildTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetChildTypeCount { get; set; } = null;
-
-        void GetChildTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetChildTypeCount != null) ? OnGetChildTypeCount : GetChildTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetChildTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetGroupType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetGroupType { get; set; } = null;
-
-        void GetGroupTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetGroupType != null) ? OnGetGroupType : GetGroupType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetGroupType(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetGroupTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetGroupTypeCount { get; set; } = null;
-
-        void GetGroupTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetGroupTypeCount != null) ? OnGetGroupTypeCount : GetGroupTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetGroupTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnConvertToString"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Database.Cursor, Java.Lang.String> OnConvertToString { get; set; } = null;
-
-        void ConvertToStringEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnConvertToString != null) ? OnConvertToString : ConvertToString;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public virtual Java.Lang.String ConvertToString(Android.Database.Cursor arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCombinedChildId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long, long> OnGetCombinedChildId { get; set; } = null;
-
-        void GetCombinedChildIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetCombinedChildId != null) ? OnGetCombinedChildId : GetCombinedChildId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<long>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetCombinedChildId(long arg0, long arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCombinedGroupId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnGetCombinedGroupId { get; set; } = null;
-
-        void GetCombinedGroupIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetCombinedGroupId != null) ? OnGetCombinedGroupId : GetCombinedGroupId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetCombinedGroupId(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnGroupExpanded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupExpanded { get; set; } = null;
-
-        void OnGroupExpandedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnGroupExpanded != null) ? OnOnGroupExpanded : OnGroupExpanded;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void OnGroupExpanded(int arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
-
-        void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnRegisterDataSetObserver != null) ? OnRegisterDataSetObserver : RegisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
-
-        void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnUnregisterDataSetObserver != null) ? OnUnregisterDataSetObserver : UnregisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnChangeCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnChangeCursor { get; set; } = null;
-
-        void ChangeCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnChangeCursor != null) ? OnChangeCursor : ChangeCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public virtual void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<bool> OnNotifyDataSetChanged { get; set; } = null;
-
-        void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnNotifyDataSetChanged != null) ? OnNotifyDataSetChanged : NotifyDataSetChanged;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        public virtual void NotifyDataSetChanged(bool arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setChildrenCursor(int,android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetChildrenCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int, Android.Database.Cursor> OnSetChildrenCursor { get; set; } = null;
-
-        void SetChildrenCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnSetChildrenCursor != null) ? OnSetChildrenCursor : SetChildrenCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.Database.Cursor>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setChildrenCursor(int,android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        public virtual void SetChildrenCursor(int arg0, Android.Database.Cursor arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetFilterQueryProvider"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.FilterQueryProvider> OnSetFilterQueryProvider { get; set; } = null;
-
-        void SetFilterQueryProviderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.FilterQueryProvider>> data)
-        {
-            var methodToExecute = (OnSetFilterQueryProvider != null) ? OnSetFilterQueryProvider : SetFilterQueryProvider;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.FilterQueryProvider"/></param>
-        public virtual void SetFilterQueryProvider(Android.Widget.FilterQueryProvider arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetGroupCursor"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.Cursor> OnSetGroupCursor { get; set; } = null;
-
-        void SetGroupCursorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.Cursor>> data)
-        {
-            var methodToExecute = (OnSetGroupCursor != null) ? OnSetGroupCursor : SetGroupCursor;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public virtual void SetGroupCursor(Android.Database.Cursor arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#setViewBinder(android.widget.SimpleCursorTreeAdapter.ViewBinder)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetViewBinder"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.SimpleCursorTreeAdapter.ViewBinder> OnSetViewBinder { get; set; } = null;
-
-        void SetViewBinderEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.SimpleCursorTreeAdapter.ViewBinder>> data)
-        {
-            var methodToExecute = (OnSetViewBinder != null) ? OnSetViewBinder : SetViewBinder;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#setViewBinder(android.widget.SimpleCursorTreeAdapter.ViewBinder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SimpleCursorTreeAdapter.ViewBinder"/></param>
-        public virtual void SetViewBinder(Android.Widget.SimpleCursorTreeAdapter.ViewBinder arg0)
+        public void SetViewBinder(Android.Widget.SimpleCursorTreeAdapter.ViewBinder arg0)
         {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#setViewText(android.widget.TextView,java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetViewText"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Widget.TextView, Java.Lang.String> OnSetViewText { get; set; } = null;
-
-        void SetViewTextEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.TextView>> data)
-        {
-            var methodToExecute = (OnSetViewText != null) ? OnSetViewText : SetViewText;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0));
+            IExecuteWithSignature("setViewBinder", "(Landroid/widget/SimpleCursorTreeAdapter$ViewBinder;)V", arg0);
         }
-
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#setViewText(android.widget.TextView,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.TextView"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        public virtual void SetViewText(Android.Widget.TextView arg0, Java.Lang.String arg1)
+        public void SetViewText(Android.Widget.TextView arg0, Java.Lang.String arg1)
         {
-            
+            IExecute("setViewText", arg0, arg1);
         }
 
         #endregion
@@ -705,249 +165,6 @@ public bool SetViewValue(Android.View.View arg0, Android.Database.Cursor arg1, i
         #endregion
 
     
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region SimpleCursorTreeAdapterDirect
-    public partial class SimpleCursorTreeAdapterDirect
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/> 
-        /// </summary>
-        public int ChildTypeCount
-        {
-            get { return IExecute<int>("getChildTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getCursor()"/> 
-        /// </summary>
-        public Android.Database.Cursor Cursor
-        {
-            get { return IExecute<Android.Database.Cursor>("getCursor"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilter()"/> 
-        /// </summary>
-        public Android.Widget.Filter Filter
-        {
-            get { return IExecute<Android.Widget.Filter>("getFilter"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#getFilterQueryProvider()"/> <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setFilterQueryProvider(android.widget.FilterQueryProvider)"/>
-        /// </summary>
-        public Android.Widget.FilterQueryProvider FilterQueryProvider
-        {
-            get { return IExecute<Android.Widget.FilterQueryProvider>("getFilterQueryProvider"); } set { IExecute("setFilterQueryProvider", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#getViewBinder()"/> 
-        /// </summary>
-        public Android.Widget.SimpleCursorTreeAdapter.ViewBinder GetViewBinder
-        {
-            get { return IExecuteWithSignature<Android.Widget.SimpleCursorTreeAdapter.ViewBinder>("getViewBinder", "()Landroid/widget/SimpleCursorTreeAdapter$ViewBinder;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/> 
-        /// </summary>
-        public int GroupTypeCount
-        {
-            get { return IExecute<int>("getGroupTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#runQueryOnBackgroundThread(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="Android.Database.Cursor"/></returns>
-        public override Android.Database.Cursor RunQueryOnBackgroundThread(Java.Lang.CharSequence arg0)
-        {
-            return IExecute<Android.Database.Cursor>("runQueryOnBackgroundThread", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newChildView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        /// <param name="arg2"><see cref="bool"/></param>
-        /// <param name="arg3"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public override Android.View.View NewChildView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
-        {
-            return IExecute<Android.View.View>("newChildView", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ResourceCursorTreeAdapter.html#newGroupView(android.content.Context,android.database.Cursor,boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        /// <param name="arg2"><see cref="bool"/></param>
-        /// <param name="arg3"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public override Android.View.View NewGroupView(Android.Content.Context arg0, Android.Database.Cursor arg1, bool arg2, Android.View.ViewGroup arg3)
-        {
-            return IExecute<Android.View.View>("newGroupView", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool AreAllItemsEnabled()
-        {
-            return IExecute<bool>("areAllItemsEnabled");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEmpty()
-        {
-            return IExecute<bool>("isEmpty");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetChildType(int arg0, int arg1)
-        {
-            return IExecute<int>("getChildType", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetGroupType(int arg0)
-        {
-            return IExecute<int>("getGroupType", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#convertToString(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public override Java.Lang.String ConvertToString(Android.Database.Cursor arg0)
-        {
-            return IExecute<Java.Lang.String>("convertToString", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long GetCombinedChildId(long arg0, long arg1)
-        {
-            return IExecute<long>("getCombinedChildId", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long GetCombinedGroupId(long arg0)
-        {
-            return IExecute<long>("getCombinedGroupId", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public override void OnGroupExpanded(int arg0)
-        {
-            IExecute("onGroupExpanded", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("registerDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("unregisterDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#changeCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public override void ChangeCursor(Android.Database.Cursor arg0)
-        {
-            IExecute("changeCursor", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#notifyDataSetChanged(boolean)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        public override void NotifyDataSetChanged(bool arg0)
-        {
-            IExecute("notifyDataSetChanged", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setChildrenCursor(int,android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Database.Cursor"/></param>
-        public override void SetChildrenCursor(int arg0, Android.Database.Cursor arg1)
-        {
-            IExecute("setChildrenCursor", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/CursorTreeAdapter.html#setGroupCursor(android.database.Cursor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.Cursor"/></param>
-        public override void SetGroupCursor(Android.Database.Cursor arg0)
-        {
-            IExecute("setGroupCursor", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#setViewBinder(android.widget.SimpleCursorTreeAdapter.ViewBinder)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.SimpleCursorTreeAdapter.ViewBinder"/></param>
-        public override void SetViewBinder(Android.Widget.SimpleCursorTreeAdapter.ViewBinder arg0)
-        {
-            IExecuteWithSignature("setViewBinder", "(Landroid/widget/SimpleCursorTreeAdapter$ViewBinder;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleCursorTreeAdapter.html#setViewText(android.widget.TextView,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Widget.TextView"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        public override void SetViewText(Android.Widget.TextView arg0, Java.Lang.String arg1)
-        {
-            IExecute("setViewText", arg0, arg1);
-        }
-
-        #endregion
-
-        #region Nested classes
-
         #endregion
 
         // TODO: complete the class
diff --git a/src/net/Netdroid/Generated/Android/Widget/SimpleExpandableListAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/SimpleExpandableListAdapter.cs
index ee959ce67..0567f411e 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SimpleExpandableListAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SimpleExpandableListAdapter.cs
@@ -29,415 +29,58 @@ namespace Android.Widget
     public partial class SimpleExpandableListAdapter
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="SimpleExpandableListAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("newChildView", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(NewChildViewEventHandler));
-            AddEventHandler("newGroupView", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(NewGroupViewEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getChildType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetChildTypeEventHandler));
-            AddEventHandler("getChildTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetChildTypeCountEventHandler));
-            AddEventHandler("getGroupType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetGroupTypeEventHandler));
-            AddEventHandler("getGroupTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetGroupTypeCountEventHandler));
-            AddEventHandler("getCombinedChildId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedChildIdEventHandler));
-            AddEventHandler("getCombinedGroupId", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(GetCombinedGroupIdEventHandler));
-            AddEventHandler("notifyDataSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetChangedEventHandler));
-            AddEventHandler("notifyDataSetInvalidated", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NotifyDataSetInvalidatedEventHandler));
-            AddEventHandler("onGroupCollapsed", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupCollapsedEventHandler));
-            AddEventHandler("onGroupExpanded", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(OnGroupExpandedEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html#newChildView(boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNewChildView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool, Android.View.ViewGroup, Android.View.View> OnNewChildView { get; set; } = null;
-
-        void NewChildViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnNewChildView != null) ? OnNewChildView : NewChildView;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.ViewGroup>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html#newChildView(boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <param name="arg1"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public virtual Android.View.View NewChildView(bool arg0, Android.View.ViewGroup arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html#newGroupView(boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNewGroupView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool, Android.View.ViewGroup, Android.View.View> OnNewGroupView { get; set; } = null;
-
-        void NewGroupViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
-        {
-            var methodToExecute = (OnNewGroupView != null) ? OnNewGroupView : NewGroupView;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Android.View.ViewGroup>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html#newGroupView(boolean,android.view.ViewGroup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <param name="arg1"><see cref="Android.View.ViewGroup"/></param>
-        /// <returns><see cref="Android.View.View"/></returns>
-        public virtual Android.View.View NewGroupView(bool arg0, Android.View.ViewGroup arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
-
-        void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnAreAllItemsEnabled != null) ? OnAreAllItemsEnabled : AreAllItemsEnabled;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool AreAllItemsEnabled()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
-
-        void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIsEmpty != null) ? OnIsEmpty : IsEmpty;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public virtual bool IsEmpty()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetChildType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, int> OnGetChildType { get; set; } = null;
-
-        void GetChildTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetChildType != null) ? OnGetChildType : GetChildType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetChildType(int arg0, int arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetChildTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetChildTypeCount { get; set; } = null;
-
-        void GetChildTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetChildTypeCount != null) ? OnGetChildTypeCount : GetChildTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetChildTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetGroupType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetGroupType { get; set; } = null;
-
-        void GetGroupTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnGetGroupType != null) ? OnGetGroupType : GetGroupType;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetGroupType(int arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetGroupTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetGroupTypeCount { get; set; } = null;
-
-        void GetGroupTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnGetGroupTypeCount != null) ? OnGetGroupTypeCount : GetGroupTypeCount;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/>
-        /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public virtual int GetGroupTypeCount()
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCombinedChildId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long, long> OnGetCombinedChildId { get; set; } = null;
-
-        void GetCombinedChildIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetCombinedChildId != null) ? OnGetCombinedChildId : GetCombinedChildId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<long>(0));
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetCombinedChildId(long arg0, long arg1)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnGetCombinedGroupId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnGetCombinedGroupId { get; set; } = null;
-
-        void GetCombinedGroupIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
-        {
-            var methodToExecute = (OnGetCombinedGroupId != null) ? OnGetCombinedGroupId : GetCombinedGroupId;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public virtual long GetCombinedGroupId(long arg0)
-        {
-            return default;
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetChanged { get; set; } = null;
-
-        void NotifyDataSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnNotifyDataSetChanged != null) ? OnNotifyDataSetChanged : NotifyDataSetChanged;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        public virtual void NotifyDataSetChanged()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNotifyDataSetInvalidated"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnNotifyDataSetInvalidated { get; set; } = null;
-
-        void NotifyDataSetInvalidatedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnNotifyDataSetInvalidated != null) ? OnNotifyDataSetInvalidated : NotifyDataSetInvalidated;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        public virtual void NotifyDataSetInvalidated()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupCollapsed(int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnOnGroupCollapsed"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupCollapsed { get; set; } = null;
-
-        void OnGroupCollapsedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
-        {
-            var methodToExecute = (OnOnGroupCollapsed != null) ? OnOnGroupCollapsed : OnGroupCollapsed;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupCollapsed(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html#%3Cinit%3E(android.content.Context,java.util.List,int,int,java.lang.String[],int[],java.util.List,int,int,java.lang.String[],int[])"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void OnGroupCollapsed(int arg0)
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="Java.Util.List"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        /// <param name="arg6"><see cref="Java.Util.List"/></param>
+        /// <param name="arg7"><see cref="int"/></param>
+        /// <param name="arg8"><see cref="int"/></param>
+        /// <param name="arg9"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg10"><see cref="int"/></param>
+        public SimpleExpandableListAdapter(Android.Content.Context arg0, Java.Util.List arg1, int arg2, int arg3, Java.Lang.String[] arg4, int[] arg5, Java.Util.List arg6, int arg7, int arg8, Java.Lang.String[] arg9, int[] arg10)
+            : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10)
         {
-            
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html#%3Cinit%3E(android.content.Context,java.util.List,int,int,java.lang.String[],int[],java.util.List,int,java.lang.String[],int[])"/>
         /// </summary>
-        /// <remarks>If <see cref="OnOnGroupExpanded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnOnGroupExpanded { get; set; } = null;
-
-        void OnGroupExpandedEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="Java.Util.List"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <param name="arg4"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        /// <param name="arg6"><see cref="Java.Util.List"/></param>
+        /// <param name="arg7"><see cref="int"/></param>
+        /// <param name="arg8"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg9"><see cref="int"/></param>
+        public SimpleExpandableListAdapter(Android.Content.Context arg0, Java.Util.List arg1, int arg2, int arg3, Java.Lang.String[] arg4, int[] arg5, Java.Util.List arg6, int arg7, Java.Lang.String[] arg8, int[] arg9)
+            : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
         {
-            var methodToExecute = (OnOnGroupExpanded != null) ? OnOnGroupExpanded : OnGroupExpanded;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
         }
-
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html#%3Cinit%3E(android.content.Context,java.util.List,int,java.lang.String[],int[],java.util.List,int,java.lang.String[],int[])"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public virtual void OnGroupExpanded(int arg0)
+        /// <param name="arg0"><see cref="Android.Content.Context"/></param>
+        /// <param name="arg1"><see cref="Java.Util.List"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        /// <param name="arg5"><see cref="Java.Util.List"/></param>
+        /// <param name="arg6"><see cref="int"/></param>
+        /// <param name="arg7"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg8"><see cref="int"/></param>
+        public SimpleExpandableListAdapter(Android.Content.Context arg0, Java.Util.List arg1, int arg2, Java.Lang.String[] arg3, int[] arg4, Java.Util.List arg5, int arg6, Java.Lang.String[] arg7, int[] arg8)
+            : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8)
         {
-            
         }
 
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
-
-        void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnRegisterDataSetObserver != null) ? OnRegisterDataSetObserver : RegisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
-
-        void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
-        {
-            var methodToExecute = (OnUnregisterDataSetObserver != null) ? OnUnregisterDataSetObserver : UnregisterDataSetObserver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region SimpleExpandableListAdapterDirect
-    public partial class SimpleExpandableListAdapterDirect
-    {
-        #region Constructors
-
         #endregion
 
         #region Class/Interface conversion operators
@@ -454,26 +97,12 @@ public partial class SimpleExpandableListAdapterDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildTypeCount()"/> 
-        /// </summary>
-        public int ChildTypeCount
-        {
-            get { return IExecute<int>("getChildTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupTypeCount()"/> 
-        /// </summary>
-        public int GroupTypeCount
-        {
-            get { return IExecute<int>("getGroupTypeCount"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SimpleExpandableListAdapter.html#newChildView(boolean,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.View.ViewGroup"/></param>
         /// <returns><see cref="Android.View.View"/></returns>
-        public override Android.View.View NewChildView(bool arg0, Android.View.ViewGroup arg1)
+        public Android.View.View NewChildView(bool arg0, Android.View.ViewGroup arg1)
         {
             return IExecute<Android.View.View>("newChildView", arg0, arg1);
         }
@@ -483,110 +112,10 @@ public override Android.View.View NewChildView(bool arg0, Android.View.ViewGroup
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Android.View.ViewGroup"/></param>
         /// <returns><see cref="Android.View.View"/></returns>
-        public override Android.View.View NewGroupView(bool arg0, Android.View.ViewGroup arg1)
+        public Android.View.View NewGroupView(bool arg0, Android.View.ViewGroup arg1)
         {
             return IExecute<Android.View.View>("newGroupView", arg0, arg1);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#areAllItemsEnabled()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool AreAllItemsEnabled()
-        {
-            return IExecute<bool>("areAllItemsEnabled");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public override bool IsEmpty()
-        {
-            return IExecute<bool>("isEmpty");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getChildType(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetChildType(int arg0, int arg1)
-        {
-            return IExecute<int>("getChildType", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getGroupType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public override int GetGroupType(int arg0)
-        {
-            return IExecute<int>("getGroupType", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedChildId(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long GetCombinedChildId(long arg0, long arg1)
-        {
-            return IExecute<long>("getCombinedChildId", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#getCombinedGroupId(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public override long GetCombinedGroupId(long arg0)
-        {
-            return IExecute<long>("getCombinedGroupId", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#notifyDataSetChanged()"/>
-        /// </summary>
-        public override void NotifyDataSetChanged()
-        {
-            IExecute("notifyDataSetChanged");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#notifyDataSetInvalidated()"/>
-        /// </summary>
-        public override void NotifyDataSetInvalidated()
-        {
-            IExecute("notifyDataSetInvalidated");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupCollapsed(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public override void OnGroupCollapsed(int arg0)
-        {
-            IExecute("onGroupCollapsed", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#onGroupExpanded(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public override void OnGroupExpanded(int arg0)
-        {
-            IExecute("onGroupExpanded", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void RegisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("registerDataSetObserver", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/BaseExpandableListAdapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Android.Database.DataSetObserver"/></param>
-        public override void UnregisterDataSetObserver(Android.Database.DataSetObserver arg0)
-        {
-            IExecute("unregisterDataSetObserver", arg0);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/SlidingDrawer.cs b/src/net/Netdroid/Generated/Android/Widget/SlidingDrawer.cs
index 0d6c7251b..d651f9d79 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SlidingDrawer.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SlidingDrawer.cs
@@ -36,7 +36,7 @@ public partial class SlidingDrawer
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SlidingDrawer(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public SlidingDrawer(Android.Content.Context arg0, Android.Util.AttributeSet arg
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SlidingDrawer(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public SlidingDrawer(Android.Content.Context arg0, Android.Util.AttributeSet arg
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SlidingDrawer(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -73,14 +73,14 @@ public SlidingDrawer(Android.Content.Context arg0, Android.Util.AttributeSet arg
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#ORIENTATION_HORIZONTAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ORIENTATION_HORIZONTAL { get { if (!_ORIENTATION_HORIZONTALReady) { _ORIENTATION_HORIZONTALContent = SGetField<int>(LocalBridgeClazz, "ORIENTATION_HORIZONTAL"); _ORIENTATION_HORIZONTALReady = true; } return _ORIENTATION_HORIZONTALContent; } }
         private static int _ORIENTATION_HORIZONTALContent = default;
         private static bool _ORIENTATION_HORIZONTALReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#ORIENTATION_VERTICAL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ORIENTATION_VERTICAL { get { if (!_ORIENTATION_VERTICALReady) { _ORIENTATION_VERTICALContent = SGetField<int>(LocalBridgeClazz, "ORIENTATION_VERTICAL"); _ORIENTATION_VERTICALReady = true; } return _ORIENTATION_VERTICALContent; } }
         private static int _ORIENTATION_VERTICALContent = default;
         private static bool _ORIENTATION_VERTICALReady = false; // this is used because in case of generics 
@@ -93,26 +93,28 @@ public SlidingDrawer(Android.Content.Context arg0, Android.Util.AttributeSet arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#getContent()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#getContent()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.View Content
+        /// <returns><see cref="Android.View.View"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View GetContent()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getContent", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.View.View>("getContent", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#getHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#getHandle()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.View Handle
+        /// <returns><see cref="Android.View.View"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View GetHandle()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getHandle", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.View.View>("getHandle", "()Landroid/view/View;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#isMoving()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsMoving()
         {
             return IExecuteWithSignature<bool>("isMoving", "()Z");
@@ -121,7 +123,7 @@ public bool IsMoving()
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#isOpened()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsOpened()
         {
             return IExecuteWithSignature<bool>("isOpened", "()Z");
@@ -129,7 +131,7 @@ public bool IsOpened()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#animateClose()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AnimateClose()
         {
             IExecuteWithSignature("animateClose", "()V");
@@ -137,7 +139,7 @@ public void AnimateClose()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#animateOpen()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AnimateOpen()
         {
             IExecuteWithSignature("animateOpen", "()V");
@@ -145,7 +147,7 @@ public void AnimateOpen()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#animateToggle()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AnimateToggle()
         {
             IExecuteWithSignature("animateToggle", "()V");
@@ -153,7 +155,7 @@ public void AnimateToggle()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#close()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
@@ -161,7 +163,7 @@ public void Close()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#lock()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Lock()
         {
             IExecuteWithSignature("lock", "()V");
@@ -169,7 +171,7 @@ public void Lock()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#open()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Open()
         {
             IExecuteWithSignature("open", "()V");
@@ -178,7 +180,7 @@ public void Open()
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#setOnDrawerCloseListener(android.widget.SlidingDrawer.OnDrawerCloseListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SlidingDrawer.OnDrawerCloseListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnDrawerCloseListener(Android.Widget.SlidingDrawer.OnDrawerCloseListener arg0)
         {
             IExecuteWithSignature("setOnDrawerCloseListener", "(Landroid/widget/SlidingDrawer$OnDrawerCloseListener;)V", arg0);
@@ -187,7 +189,7 @@ public void SetOnDrawerCloseListener(Android.Widget.SlidingDrawer.OnDrawerCloseL
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#setOnDrawerOpenListener(android.widget.SlidingDrawer.OnDrawerOpenListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SlidingDrawer.OnDrawerOpenListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnDrawerOpenListener(Android.Widget.SlidingDrawer.OnDrawerOpenListener arg0)
         {
             IExecuteWithSignature("setOnDrawerOpenListener", "(Landroid/widget/SlidingDrawer$OnDrawerOpenListener;)V", arg0);
@@ -196,7 +198,7 @@ public void SetOnDrawerOpenListener(Android.Widget.SlidingDrawer.OnDrawerOpenLis
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#setOnDrawerScrollListener(android.widget.SlidingDrawer.OnDrawerScrollListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.SlidingDrawer.OnDrawerScrollListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnDrawerScrollListener(Android.Widget.SlidingDrawer.OnDrawerScrollListener arg0)
         {
             IExecuteWithSignature("setOnDrawerScrollListener", "(Landroid/widget/SlidingDrawer$OnDrawerScrollListener;)V", arg0);
@@ -204,7 +206,7 @@ public void SetOnDrawerScrollListener(Android.Widget.SlidingDrawer.OnDrawerScrol
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#toggle()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Toggle()
         {
             IExecuteWithSignature("toggle", "()V");
@@ -212,7 +214,7 @@ public void Toggle()
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.html#unlock()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Unlock()
         {
             IExecuteWithSignature("unlock", "()V");
@@ -246,7 +248,7 @@ public partial class OnDrawerCloseListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDrawerClosed", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDrawerClosedEventHandler));
+                AddEventHandler("onDrawerClosed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDrawerClosedEventHandler));
 
             }
 
@@ -254,7 +256,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerCloseListener.html#onDrawerClosed()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDrawerClosed"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnDrawerClosed { get; set; } = null;
+            public global::System.Action OnOnDrawerClosed { get; set; } = null;
 
             void OnDrawerClosedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -265,7 +267,7 @@ void OnDrawerClosedEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerCloseListener.html#onDrawerClosed()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnDrawerClosed()
             {
                 
@@ -304,7 +306,7 @@ public partial class OnDrawerCloseListenerDirect
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerCloseListener.html#onDrawerClosed()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnDrawerClosed()
             {
                 IExecuteWithSignature("onDrawerClosed", "()V");
@@ -345,7 +347,7 @@ public partial class OnDrawerOpenListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onDrawerOpened", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDrawerOpenedEventHandler));
+                AddEventHandler("onDrawerOpened", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnDrawerOpenedEventHandler));
 
             }
 
@@ -353,7 +355,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerOpenListener.html#onDrawerOpened()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnDrawerOpened"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnDrawerOpened { get; set; } = null;
+            public global::System.Action OnOnDrawerOpened { get; set; } = null;
 
             void OnDrawerOpenedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -364,7 +366,7 @@ void OnDrawerOpenedEventHandler(object sender, CLRListenerEventArgs<CLREventData
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerOpenListener.html#onDrawerOpened()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnDrawerOpened()
             {
                 
@@ -403,7 +405,7 @@ public partial class OnDrawerOpenListenerDirect
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerOpenListener.html#onDrawerOpened()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnDrawerOpened()
             {
                 IExecuteWithSignature("onDrawerOpened", "()V");
@@ -444,8 +446,8 @@ public partial class OnDrawerScrollListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onScrollEnded", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnScrollEndedEventHandler));
-                AddEventHandler("onScrollStarted", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnScrollStartedEventHandler));
+                AddEventHandler("onScrollEnded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnScrollEndedEventHandler));
+                AddEventHandler("onScrollStarted", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(OnScrollStartedEventHandler));
 
             }
 
@@ -453,7 +455,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerScrollListener.html#onScrollEnded()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScrollEnded"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnScrollEnded { get; set; } = null;
+            public global::System.Action OnOnScrollEnded { get; set; } = null;
 
             void OnScrollEndedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -464,7 +466,7 @@ void OnScrollEndedEventHandler(object sender, CLRListenerEventArgs<CLREventData>
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerScrollListener.html#onScrollEnded()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnScrollEnded()
             {
                 
@@ -474,7 +476,7 @@ public virtual void OnScrollEnded()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerScrollListener.html#onScrollStarted()"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnScrollStarted"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action OnOnScrollStarted { get; set; } = null;
+            public global::System.Action OnOnScrollStarted { get; set; } = null;
 
             void OnScrollStartedEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
             {
@@ -485,7 +487,7 @@ void OnScrollStartedEventHandler(object sender, CLRListenerEventArgs<CLREventDat
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerScrollListener.html#onScrollStarted()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnScrollStarted()
             {
                 
@@ -524,7 +526,7 @@ public partial class OnDrawerScrollListenerDirect
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerScrollListener.html#onScrollEnded()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnScrollEnded()
             {
                 IExecuteWithSignature("onScrollEnded", "()V");
@@ -532,7 +534,7 @@ public override void OnScrollEnded()
             /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/SlidingDrawer.OnDrawerScrollListener.html#onScrollStarted()"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnScrollStarted()
             {
                 IExecuteWithSignature("onScrollStarted", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Widget/Spinner.cs b/src/net/Netdroid/Generated/Android/Widget/Spinner.cs
index 714d3441a..cae325701 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Spinner.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Spinner.cs
@@ -130,53 +130,60 @@ public Spinner(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getDropDownHorizontalOffset()"/> <see href="https://developer.android.com/reference/android/widget/Spinner.html#setDropDownHorizontalOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getPopupContext()"/>
         /// </summary>
-        public int DropDownHorizontalOffset
+        /// <returns><see cref="Android.Content.Context"/></returns>
+        public Android.Content.Context GetPopupContext()
         {
-            get { return IExecuteWithSignature<int>("getDropDownHorizontalOffset", "()I"); } set { IExecuteWithSignature("setDropDownHorizontalOffset", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.Context>("getPopupContext", "()Landroid/content/Context;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getDropDownVerticalOffset()"/> <see href="https://developer.android.com/reference/android/widget/Spinner.html#setDropDownVerticalOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getPopupBackground()"/>
         /// </summary>
-        public int DropDownVerticalOffset
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetPopupBackground()
         {
-            get { return IExecuteWithSignature<int>("getDropDownVerticalOffset", "()I"); } set { IExecuteWithSignature("setDropDownVerticalOffset", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getPopupBackground", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getDropDownWidth()"/> <see href="https://developer.android.com/reference/android/widget/Spinner.html#setDropDownWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getDropDownHorizontalOffset()"/>
         /// </summary>
-        public int DropDownWidth
+        /// <returns><see cref="int"/></returns>
+        public int GetDropDownHorizontalOffset()
         {
-            get { return IExecuteWithSignature<int>("getDropDownWidth", "()I"); } set { IExecuteWithSignature("setDropDownWidth", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDropDownHorizontalOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getGravity()"/> <see href="https://developer.android.com/reference/android/widget/Spinner.html#setGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getDropDownVerticalOffset()"/>
         /// </summary>
-        public int Gravity
+        /// <returns><see cref="int"/></returns>
+        public int GetDropDownVerticalOffset()
         {
-            get { return IExecuteWithSignature<int>("getGravity", "()I"); } set { IExecuteWithSignature("setGravity", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDropDownVerticalOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getPopupBackground()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getDropDownWidth()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable PopupBackground
+        /// <returns><see cref="int"/></returns>
+        public int GetDropDownWidth()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getPopupBackground", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<int>("getDropDownWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getPopupContext()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getGravity()"/>
         /// </summary>
-        public Android.Content.Context PopupContext
+        /// <returns><see cref="int"/></returns>
+        public int GetGravity()
         {
-            get { return IExecuteWithSignature<Android.Content.Context>("getPopupContext", "()Landroid/content/Context;"); }
+            return IExecuteWithSignature<int>("getGravity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getPrompt()"/> <see href="https://developer.android.com/reference/android/widget/Spinner.html#setPrompt(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#getPrompt()"/>
         /// </summary>
-        public Java.Lang.CharSequence Prompt
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetPrompt()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getPrompt", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setPrompt", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getPrompt", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#onClick(android.content.DialogInterface,int)"/>
@@ -188,6 +195,38 @@ public void OnClick(Android.Content.DialogInterface arg0, int arg1)
             IExecute("onClick", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#setDropDownHorizontalOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownHorizontalOffset(int arg0)
+        {
+            IExecuteWithSignature("setDropDownHorizontalOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#setDropDownVerticalOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownVerticalOffset(int arg0)
+        {
+            IExecuteWithSignature("setDropDownVerticalOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#setDropDownWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDropDownWidth(int arg0)
+        {
+            IExecuteWithSignature("setDropDownWidth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#setGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGravity(int arg0)
+        {
+            IExecuteWithSignature("setGravity", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#setPopupBackgroundDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -204,6 +243,14 @@ public void SetPopupBackgroundResource(int arg0)
             IExecuteWithSignature("setPopupBackgroundResource", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#setPrompt(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetPrompt(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setPrompt", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Spinner.html#setPromptId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/SpinnerAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/SpinnerAdapter.cs
index da3a444f2..bf355cc0f 100644
--- a/src/net/Netdroid/Generated/Android/Widget/SpinnerAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/SpinnerAdapter.cs
@@ -68,18 +68,18 @@ public partial class SpinnerAdapter : Android.Widget.ISpinnerAdapter
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
-            AddEventHandler("getDropDownView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetDropDownViewEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getItem", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
-            AddEventHandler("getItemId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
+            AddEventHandler("getView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
+            AddEventHandler("getDropDownView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetDropDownViewEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("getCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
+            AddEventHandler("getItemViewType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
+            AddEventHandler("getViewTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
+            AddEventHandler("getItem", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
+            AddEventHandler("getItemId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("getAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
 
         }
 
@@ -87,7 +87,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
 
         void GetViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -112,7 +112,7 @@ public virtual Android.View.View GetView(int arg0, Android.View.View arg1, Andro
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SpinnerAdapter.html#getDropDownView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetDropDownView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetDropDownView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetDropDownView { get; set; } = null;
 
         void GetDropDownViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -137,7 +137,7 @@ public virtual Android.View.View GetDropDownView(int arg0, Android.View.View arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -159,7 +159,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -181,7 +181,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetCount { get; set; } = null;
+        public global::System.Func<int> OnGetCount { get; set; } = null;
 
         void GetCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -203,7 +203,7 @@ public virtual int GetCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
+        public global::System.Func<int, int> OnGetItemViewType { get; set; } = null;
 
         void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -226,7 +226,7 @@ public virtual int GetItemViewType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetViewTypeCount { get; set; } = null;
 
         void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -248,7 +248,7 @@ public virtual int GetViewTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItem"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetItem { get; set; } = null;
+        public global::System.Func<int, object> OnGetItem { get; set; } = null;
 
         void GetItemEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -271,7 +271,7 @@ public virtual object GetItem(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemId(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetItemId { get; set; } = null;
+        public global::System.Func<int, long> OnGetItemId { get; set; } = null;
 
         void GetItemIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -294,7 +294,7 @@ public virtual long GetItemId(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -315,7 +315,7 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -345,7 +345,7 @@ public Java.Lang.CharSequence[] GetAutofillOptionsDefault()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
 
         void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -395,27 +395,6 @@ public partial class SpinnerAdapterDirect : Android.Widget.ISpinnerAdapter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecute<int>("getCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecute<int>("getViewTypeCount"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -454,6 +433,14 @@ public override bool IsEmpty()
             return IExecute<bool>("isEmpty");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetCount()
+        {
+            return IExecute<int>("getCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -463,6 +450,14 @@ public override int GetItemViewType(int arg0)
             return IExecute<int>("getItemViewType", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetViewTypeCount()
+        {
+            return IExecute<int>("getViewTypeCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -496,6 +491,14 @@ public override void UnregisterDataSetObserver(Android.Database.DataSetObserver
         {
             IExecute("unregisterDataSetObserver", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public override Java.Lang.CharSequence[] GetAutofillOptions()
+        {
+            return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/Switch.cs b/src/net/Netdroid/Generated/Android/Widget/Switch.cs
index c5e07150b..b9b429e09 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Switch.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Switch.cs
@@ -84,109 +84,124 @@ public Switch(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getShowText()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setShowText(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbTintList()"/>
         /// </summary>
-        public bool ShowText
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetThumbTintList()
         {
-            get { return IExecuteWithSignature<bool>("getShowText", "()Z"); } set { IExecuteWithSignature("setShowText", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getThumbTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getSplitTrack()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setSplitTrack(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTrackTintList()"/>
         /// </summary>
-        public bool SplitTrack
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetTrackTintList()
         {
-            get { return IExecuteWithSignature<bool>("getSplitTrack", "()Z"); } set { IExecuteWithSignature("setSplitTrack", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getTrackTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getSwitchMinWidth()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setSwitchMinWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbTintBlendMode()"/>
         /// </summary>
-        public int SwitchMinWidth
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetThumbTintBlendMode()
         {
-            get { return IExecuteWithSignature<int>("getSwitchMinWidth", "()I"); } set { IExecuteWithSignature("setSwitchMinWidth", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getThumbTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getSwitchPadding()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setSwitchPadding(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTrackTintBlendMode()"/>
         /// </summary>
-        public int SwitchPadding
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetTrackTintBlendMode()
         {
-            get { return IExecuteWithSignature<int>("getSwitchPadding", "()I"); } set { IExecuteWithSignature("setSwitchPadding", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getTrackTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTextOff()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setTextOff(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbDrawable()"/>
         /// </summary>
-        public Java.Lang.CharSequence TextOff
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetThumbDrawable()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTextOff", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setTextOff", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getThumbDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTextOn()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setTextOn(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTrackDrawable()"/>
         /// </summary>
-        public Java.Lang.CharSequence TextOn
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetTrackDrawable()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTextOn", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setTextOn", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTrackDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbDrawable()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbTintMode()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable ThumbDrawable
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetThumbTintMode()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getThumbDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setThumbDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getThumbTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbTextPadding()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbTextPadding(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTrackTintMode()"/>
         /// </summary>
-        public int ThumbTextPadding
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetTrackTintMode()
         {
-            get { return IExecuteWithSignature<int>("getThumbTextPadding", "()I"); } set { IExecuteWithSignature("setThumbTextPadding", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getTrackTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getShowText()"/>
         /// </summary>
-        public Android.Graphics.BlendMode ThumbTintBlendMode
+        /// <returns><see cref="bool"/></returns>
+        public bool GetShowText()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getThumbTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setThumbTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<bool>("getShowText", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbTintList()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getSplitTrack()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList ThumbTintList
+        /// <returns><see cref="bool"/></returns>
+        public bool GetSplitTrack()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getThumbTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setThumbTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<bool>("getSplitTrack", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbTintMode()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getSwitchMinWidth()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode ThumbTintMode
+        /// <returns><see cref="int"/></returns>
+        public int GetSwitchMinWidth()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getThumbTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setThumbTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<int>("getSwitchMinWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTrackDrawable()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackDrawable(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getSwitchPadding()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable TrackDrawable
+        /// <returns><see cref="int"/></returns>
+        public int GetSwitchPadding()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTrackDrawable", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setTrackDrawable", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<int>("getSwitchPadding", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTrackTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getThumbTextPadding()"/>
         /// </summary>
-        public Android.Graphics.BlendMode TrackTintBlendMode
+        /// <returns><see cref="int"/></returns>
+        public int GetThumbTextPadding()
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getTrackTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setTrackTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<int>("getThumbTextPadding", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTrackTintList()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTextOff()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList TrackTintList
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTextOff()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getTrackTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setTrackTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTextOff", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTrackTintMode()"/> <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#getTextOn()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode TrackTintMode
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTextOn()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getTrackTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setTrackTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTextOn", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Switch.html#onMeasure(int,int)"/>
@@ -198,6 +213,38 @@ public void OnMeasure(int arg0, int arg1)
             IExecute("onMeasure", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setShowText(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetShowText(bool arg0)
+        {
+            IExecuteWithSignature("setShowText", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setSplitTrack(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetSplitTrack(bool arg0)
+        {
+            IExecuteWithSignature("setSplitTrack", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setSwitchMinWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSwitchMinWidth(int arg0)
+        {
+            IExecuteWithSignature("setSwitchMinWidth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setSwitchPadding(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSwitchPadding(int arg0)
+        {
+            IExecuteWithSignature("setSwitchPadding", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setSwitchTextAppearance(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -224,6 +271,30 @@ public void SetSwitchTypeface(Android.Graphics.Typeface arg0)
             IExecuteWithSignature("setSwitchTypeface", "(Landroid/graphics/Typeface;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setTextOff(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetTextOff(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setTextOff", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setTextOn(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetTextOn(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setTextOn", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetThumbDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setThumbDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbIcon(android.graphics.drawable.Icon)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Icon"/></param>
@@ -240,6 +311,46 @@ public void SetThumbResource(int arg0)
             IExecuteWithSignature("setThumbResource", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbTextPadding(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetThumbTextPadding(int arg0)
+        {
+            IExecuteWithSignature("setThumbTextPadding", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetThumbTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setThumbTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetThumbTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setThumbTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setThumbTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetThumbTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setThumbTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackDrawable(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetTrackDrawable(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setTrackDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackIcon(android.graphics.drawable.Icon)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Icon"/></param>
@@ -255,6 +366,30 @@ public void SetTrackResource(int arg0)
         {
             IExecuteWithSignature("setTrackResource", "(I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetTrackTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setTrackTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetTrackTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setTrackTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Switch.html#setTrackTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetTrackTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setTrackTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/TabHost.cs b/src/net/Netdroid/Generated/Android/Widget/TabHost.cs
index c922fa81f..a2fdf7001 100644
--- a/src/net/Netdroid/Generated/Android/Widget/TabHost.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/TabHost.cs
@@ -36,7 +36,7 @@ public partial class TabHost
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TabHost(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public TabHost(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TabHost(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public TabHost(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TabHost(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public TabHost(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TabHost(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,68 +88,74 @@ public TabHost(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getCurrentTab()"/> <see href="https://developer.android.com/reference/android/widget/TabHost.html#setCurrentTab(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getCurrentTabView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int CurrentTab
+        /// <returns><see cref="Android.View.View"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View GetCurrentTabView()
         {
-            get { return IExecuteWithSignature<int>("getCurrentTab", "()I"); } set { IExecuteWithSignature("setCurrentTab", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.View>("getCurrentTabView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getCurrentTabTag()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getCurrentView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String CurrentTabTag
+        /// <returns><see cref="Android.View.View"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View GetCurrentView()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCurrentTabTag", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Android.View.View>("getCurrentView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getCurrentTabView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getTabContentView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.View CurrentTabView
+        /// <returns><see cref="Android.Widget.FrameLayout"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.FrameLayout GetTabContentView()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getCurrentTabView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.Widget.FrameLayout>("getTabContentView", "()Landroid/widget/FrameLayout;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getCurrentView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#newTabSpec(java.lang.String)"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.View CurrentView
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Android.Widget.TabHost.TabSpec"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.TabHost.TabSpec NewTabSpec(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Android.View.View>("getCurrentView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.Widget.TabHost.TabSpec>("newTabSpec", "(Ljava/lang/String;)Landroid/widget/TabHost$TabSpec;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getTabContentView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getTabWidget()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.FrameLayout TabContentView
+        /// <returns><see cref="Android.Widget.TabWidget"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.TabWidget GetTabWidget()
         {
-            get { return IExecuteWithSignature<Android.Widget.FrameLayout>("getTabContentView", "()Landroid/widget/FrameLayout;"); }
+            return IExecuteWithSignature<Android.Widget.TabWidget>("getTabWidget", "()Landroid/widget/TabWidget;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getTabWidget()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getCurrentTab()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.TabWidget TabWidget
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetCurrentTab()
         {
-            get { return IExecuteWithSignature<Android.Widget.TabWidget>("getTabWidget", "()Landroid/widget/TabWidget;"); }
+            return IExecuteWithSignature<int>("getCurrentTab", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#newTabSpec(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#getCurrentTabTag()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Android.Widget.TabHost.TabSpec"/></returns>
-        [System.Obsolete()]
-        public Android.Widget.TabHost.TabSpec NewTabSpec(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetCurrentTabTag()
         {
-            return IExecuteWithSignature<Android.Widget.TabHost.TabSpec>("newTabSpec", "(Ljava/lang/String;)Landroid/widget/TabHost$TabSpec;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getCurrentTabTag", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#addTab(android.widget.TabHost.TabSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.TabHost.TabSpec"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void AddTab(Android.Widget.TabHost.TabSpec arg0)
         {
             IExecuteWithSignature("addTab", "(Landroid/widget/TabHost$TabSpec;)V", arg0);
@@ -157,7 +163,7 @@ public void AddTab(Android.Widget.TabHost.TabSpec arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#clearAllTabs()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void ClearAllTabs()
         {
             IExecuteWithSignature("clearAllTabs", "()V");
@@ -166,16 +172,25 @@ public void ClearAllTabs()
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#onTouchModeChanged(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnTouchModeChanged(bool arg0)
         {
             IExecuteWithSignature("onTouchModeChanged", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#setCurrentTab(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetCurrentTab(int arg0)
+        {
+            IExecuteWithSignature("setCurrentTab", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#setCurrentTabByTag(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCurrentTabByTag(Java.Lang.String arg0)
         {
             IExecuteWithSignature("setCurrentTabByTag", "(Ljava/lang/String;)V", arg0);
@@ -184,7 +199,7 @@ public void SetCurrentTabByTag(Java.Lang.String arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#setOnTabChangedListener(android.widget.TabHost.OnTabChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.TabHost.OnTabChangeListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnTabChangedListener(Android.Widget.TabHost.OnTabChangeListener arg0)
         {
             IExecuteWithSignature("setOnTabChangedListener", "(Landroid/widget/TabHost$OnTabChangeListener;)V", arg0);
@@ -192,7 +207,7 @@ public void SetOnTabChangedListener(Android.Widget.TabHost.OnTabChangeListener a
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#setup()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Setup()
         {
             IExecuteWithSignature("setup", "()V");
@@ -201,7 +216,7 @@ public void Setup()
         /// <see href="https://developer.android.com/reference/android/widget/TabHost.html#setup(android.app.LocalActivityManager)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.App.LocalActivityManager"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Setup(Android.App.LocalActivityManager arg0)
         {
             IExecuteWithSignature("setup", "(Landroid/app/LocalActivityManager;)V", arg0);
@@ -235,7 +250,7 @@ public partial class OnTabChangeListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTabChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnTabChangedEventHandler));
+                AddEventHandler("onTabChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(OnTabChangedEventHandler));
 
             }
 
@@ -243,7 +258,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/TabHost.OnTabChangeListener.html#onTabChanged(java.lang.String)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTabChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Java.Lang.String> OnOnTabChanged { get; set; } = null;
+            public global::System.Action<Java.Lang.String> OnOnTabChanged { get; set; } = null;
 
             void OnTabChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
             {
@@ -255,7 +270,7 @@ void OnTabChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<J
             /// <see href="https://developer.android.com/reference/android/widget/TabHost.OnTabChangeListener.html#onTabChanged(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnTabChanged(Java.Lang.String arg0)
             {
                 
@@ -295,7 +310,7 @@ public partial class OnTabChangeListenerDirect
             /// <see href="https://developer.android.com/reference/android/widget/TabHost.OnTabChangeListener.html#onTabChanged(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnTabChanged(Java.Lang.String arg0)
             {
                 IExecuteWithSignature("onTabChanged", "(Ljava/lang/String;)V", arg0);
@@ -336,7 +351,7 @@ public partial class TabContentFactory
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Android.View.View"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.View.View CreateTabContent(Java.Lang.String arg0)
             {
                 return IExecuteWithSignature<Android.View.View>("createTabContent", "(Ljava/lang/String;)Landroid/view/View;", arg0);
@@ -373,19 +388,11 @@ public partial class TabSpec
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/android/widget/TabHost.TabSpec.html#getTag()"/> 
-            /// </summary>
-            [System.Obsolete()]
-            public Java.Lang.String Tag
-            {
-                get { return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;"); }
-            }
-            /// <summary>
             /// <see href="https://developer.android.com/reference/android/widget/TabHost.TabSpec.html#setContent(android.content.Intent)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Android.Content.Intent"/></param>
             /// <returns><see cref="Android.Widget.TabHost.TabSpec"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Widget.TabHost.TabSpec SetContent(Android.Content.Intent arg0)
             {
                 return IExecuteWithSignature<Android.Widget.TabHost.TabSpec>("setContent", "(Landroid/content/Intent;)Landroid/widget/TabHost$TabSpec;", arg0);
@@ -395,7 +402,7 @@ public Android.Widget.TabHost.TabSpec SetContent(Android.Content.Intent arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.Widget.TabHost.TabContentFactory"/></param>
             /// <returns><see cref="Android.Widget.TabHost.TabSpec"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Widget.TabHost.TabSpec SetContent(Android.Widget.TabHost.TabContentFactory arg0)
             {
                 return IExecuteWithSignature<Android.Widget.TabHost.TabSpec>("setContent", "(Landroid/widget/TabHost$TabContentFactory;)Landroid/widget/TabHost$TabSpec;", arg0);
@@ -405,7 +412,7 @@ public Android.Widget.TabHost.TabSpec SetContent(Android.Widget.TabHost.TabConte
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Android.Widget.TabHost.TabSpec"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Widget.TabHost.TabSpec SetContent(int arg0)
             {
                 return IExecuteWithSignature<Android.Widget.TabHost.TabSpec>("setContent", "(I)Landroid/widget/TabHost$TabSpec;", arg0);
@@ -415,7 +422,7 @@ public Android.Widget.TabHost.TabSpec SetContent(int arg0)
             /// </summary>
             /// <param name="arg0"><see cref="Android.View.View"/></param>
             /// <returns><see cref="Android.Widget.TabHost.TabSpec"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Widget.TabHost.TabSpec SetIndicator(Android.View.View arg0)
             {
                 return IExecuteWithSignature<Android.Widget.TabHost.TabSpec>("setIndicator", "(Landroid/view/View;)Landroid/widget/TabHost$TabSpec;", arg0);
@@ -426,7 +433,7 @@ public Android.Widget.TabHost.TabSpec SetIndicator(Android.View.View arg0)
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
             /// <param name="arg1"><see cref="Android.Graphics.Drawable.Drawable"/></param>
             /// <returns><see cref="Android.Widget.TabHost.TabSpec"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Widget.TabHost.TabSpec SetIndicator(Java.Lang.CharSequence arg0, Android.Graphics.Drawable.Drawable arg1)
             {
                 return IExecute<Android.Widget.TabHost.TabSpec>("setIndicator", arg0, arg1);
@@ -436,11 +443,20 @@ public Android.Widget.TabHost.TabSpec SetIndicator(Java.Lang.CharSequence arg0,
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
             /// <returns><see cref="Android.Widget.TabHost.TabSpec"/></returns>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public Android.Widget.TabHost.TabSpec SetIndicator(Java.Lang.CharSequence arg0)
             {
                 return IExecuteWithSignature<Android.Widget.TabHost.TabSpec>("setIndicator", "(Ljava/lang/CharSequence;)Landroid/widget/TabHost$TabSpec;", arg0);
             }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/android/widget/TabHost.TabSpec.html#getTag()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            [global::System.Obsolete()]
+            public Java.Lang.String GetTag()
+            {
+                return IExecuteWithSignature<Java.Lang.String>("getTag", "()Ljava/lang/String;");
+            }
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/TabWidget.cs b/src/net/Netdroid/Generated/Android/Widget/TabWidget.cs
index 10eed8281..a93006a2c 100644
--- a/src/net/Netdroid/Generated/Android/Widget/TabWidget.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/TabWidget.cs
@@ -36,7 +36,7 @@ public partial class TabWidget
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TabWidget(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public TabWidget(Android.Content.Context arg0, Android.Util.AttributeSet arg1, i
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TabWidget(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public TabWidget(Android.Content.Context arg0, Android.Util.AttributeSet arg1, i
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TabWidget(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public TabWidget(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TabWidget(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,35 +88,29 @@ public TabWidget(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#getLeftStripDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#getLeftStripDrawable()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Drawable.Drawable LeftStripDrawable
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Drawable.Drawable GetLeftStripDrawable()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getLeftStripDrawable", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getLeftStripDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#getRightStripDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#getRightStripDrawable()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Graphics.Drawable.Drawable RightStripDrawable
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        [global::System.Obsolete()]
+        public Android.Graphics.Drawable.Drawable GetRightStripDrawable()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getRightStripDrawable", "()Landroid/graphics/drawable/Drawable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#getTabCount()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int TabCount
-        {
-            get { return IExecuteWithSignature<int>("getTabCount", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getRightStripDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#getChildTabViewAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Android.View.View"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Android.View.View GetChildTabViewAt(int arg0)
         {
             return IExecuteWithSignature<Android.View.View>("getChildTabViewAt", "(I)Landroid/view/View;", arg0);
@@ -125,16 +119,25 @@ public Android.View.View GetChildTabViewAt(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#isStripEnabled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsStripEnabled()
         {
             return IExecuteWithSignature<bool>("isStripEnabled", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#getTabCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetTabCount()
+        {
+            return IExecuteWithSignature<int>("getTabCount", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#dispatchDraw(android.graphics.Canvas)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Canvas"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void DispatchDraw(Android.Graphics.Canvas arg0)
         {
             IExecuteWithSignature("dispatchDraw", "(Landroid/graphics/Canvas;)V", arg0);
@@ -143,7 +146,7 @@ public void DispatchDraw(Android.Graphics.Canvas arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#focusCurrentTab(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void FocusCurrentTab(int arg0)
         {
             IExecuteWithSignature("focusCurrentTab", "(I)V", arg0);
@@ -153,7 +156,7 @@ public void FocusCurrentTab(int arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void OnFocusChange(Android.View.View arg0, bool arg1)
         {
             IExecute("onFocusChange", arg0, arg1);
@@ -162,7 +165,7 @@ public void OnFocusChange(Android.View.View arg0, bool arg1)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#setCurrentTab(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetCurrentTab(int arg0)
         {
             IExecuteWithSignature("setCurrentTab", "(I)V", arg0);
@@ -171,7 +174,7 @@ public void SetCurrentTab(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#setDividerDrawable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDividerDrawable(int arg0)
         {
             IExecuteWithSignature("setDividerDrawable", "(I)V", arg0);
@@ -180,7 +183,7 @@ public void SetDividerDrawable(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#setLeftStripDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetLeftStripDrawable(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setLeftStripDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
@@ -189,7 +192,7 @@ public void SetLeftStripDrawable(Android.Graphics.Drawable.Drawable arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#setLeftStripDrawable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetLeftStripDrawable(int arg0)
         {
             IExecuteWithSignature("setLeftStripDrawable", "(I)V", arg0);
@@ -198,7 +201,7 @@ public void SetLeftStripDrawable(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#setRightStripDrawable(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRightStripDrawable(Android.Graphics.Drawable.Drawable arg0)
         {
             IExecuteWithSignature("setRightStripDrawable", "(Landroid/graphics/drawable/Drawable;)V", arg0);
@@ -207,7 +210,7 @@ public void SetRightStripDrawable(Android.Graphics.Drawable.Drawable arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#setRightStripDrawable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetRightStripDrawable(int arg0)
         {
             IExecuteWithSignature("setRightStripDrawable", "(I)V", arg0);
@@ -216,7 +219,7 @@ public void SetRightStripDrawable(int arg0)
         /// <see href="https://developer.android.com/reference/android/widget/TabWidget.html#setStripEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetStripEnabled(bool arg0)
         {
             IExecuteWithSignature("setStripEnabled", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Widget/TableRow.cs b/src/net/Netdroid/Generated/Android/Widget/TableRow.cs
index 4a9430913..7eb544c0c 100644
--- a/src/net/Netdroid/Generated/Android/Widget/TableRow.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/TableRow.cs
@@ -63,13 +63,6 @@ public TableRow(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TableRow.html#getVirtualChildCount()"/> 
-        /// </summary>
-        public int VirtualChildCount
-        {
-            get { return IExecuteWithSignature<int>("getVirtualChildCount", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TableRow.html#getVirtualChildAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -78,6 +71,14 @@ public Android.View.View GetVirtualChildAt(int arg0)
         {
             return IExecuteWithSignature<Android.View.View>("getVirtualChildAt", "(I)Landroid/view/View;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TableRow.html#getVirtualChildCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetVirtualChildCount()
+        {
+            return IExecuteWithSignature<int>("getVirtualChildCount", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/TextClock.cs b/src/net/Netdroid/Generated/Android/Widget/TextClock.cs
index 043706b32..594cee4e7 100644
--- a/src/net/Netdroid/Generated/Android/Widget/TextClock.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/TextClock.cs
@@ -78,14 +78,14 @@ public TextClock(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#DEFAULT_FORMAT_12_HOUR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.CharSequence DEFAULT_FORMAT_12_HOUR { get { if (!_DEFAULT_FORMAT_12_HOURReady) { _DEFAULT_FORMAT_12_HOURContent = SGetField<Java.Lang.CharSequence>(LocalBridgeClazz, "DEFAULT_FORMAT_12_HOUR"); _DEFAULT_FORMAT_12_HOURReady = true; } return _DEFAULT_FORMAT_12_HOURContent; } }
         private static Java.Lang.CharSequence _DEFAULT_FORMAT_12_HOURContent = default;
         private static bool _DEFAULT_FORMAT_12_HOURReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#DEFAULT_FORMAT_24_HOUR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.CharSequence DEFAULT_FORMAT_24_HOUR { get { if (!_DEFAULT_FORMAT_24_HOURReady) { _DEFAULT_FORMAT_24_HOURContent = SGetField<Java.Lang.CharSequence>(LocalBridgeClazz, "DEFAULT_FORMAT_24_HOUR"); _DEFAULT_FORMAT_24_HOURReady = true; } return _DEFAULT_FORMAT_24_HOURContent; } }
         private static Java.Lang.CharSequence _DEFAULT_FORMAT_24_HOURContent = default;
         private static bool _DEFAULT_FORMAT_24_HOURReady = false; // this is used because in case of generics 
@@ -98,33 +98,36 @@ public TextClock(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#getFormat12Hour()"/> <see href="https://developer.android.com/reference/android/widget/TextClock.html#setFormat12Hour(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#is24HourModeEnabled()"/>
         /// </summary>
-        public Java.Lang.CharSequence Format12Hour
+        /// <returns><see cref="bool"/></returns>
+        public bool Is24HourModeEnabled()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getFormat12Hour", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setFormat12Hour", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<bool>("is24HourModeEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#getFormat24Hour()"/> <see href="https://developer.android.com/reference/android/widget/TextClock.html#setFormat24Hour(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#getFormat12Hour()"/>
         /// </summary>
-        public Java.Lang.CharSequence Format24Hour
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetFormat12Hour()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getFormat24Hour", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setFormat24Hour", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getFormat12Hour", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#getTimeZone()"/> <see href="https://developer.android.com/reference/android/widget/TextClock.html#setTimeZone(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#getFormat24Hour()"/>
         /// </summary>
-        public Java.Lang.String TimeZone
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetFormat24Hour()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTimeZone", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setTimeZone", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getFormat24Hour", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#is24HourModeEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#getTimeZone()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool Is24HourModeEnabled()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTimeZone()
         {
-            return IExecuteWithSignature<bool>("is24HourModeEnabled", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getTimeZone", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#refreshTime()"/>
@@ -133,6 +136,30 @@ public void RefreshTime()
         {
             IExecuteWithSignature("refreshTime", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#setFormat12Hour(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetFormat12Hour(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setFormat12Hour", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#setFormat24Hour(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetFormat24Hour(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setFormat24Hour", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextClock.html#setTimeZone(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetTimeZone(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setTimeZone", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/TextView.cs b/src/net/Netdroid/Generated/Android/Widget/TextView.cs
index 6c061e398..bcc6e219a 100644
--- a/src/net/Netdroid/Generated/Android/Widget/TextView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/TextView.cs
@@ -102,1069 +102,1222 @@ public TextView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoLinkMask()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setAutoLinkMask(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawableTintList()"/>
         /// </summary>
-        public int AutoLinkMask
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetCompoundDrawableTintList()
         {
-            get { return IExecuteWithSignature<int>("getAutoLinkMask", "()I"); } set { IExecuteWithSignature("setAutoLinkMask", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getCompoundDrawableTintList", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeMaxTextSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawableTintBlendMode()"/>
         /// </summary>
-        public int AutoSizeMaxTextSize
+        /// <returns><see cref="Android.Graphics.BlendMode"/></returns>
+        public Android.Graphics.BlendMode GetCompoundDrawableTintBlendMode()
         {
-            get { return IExecuteWithSignature<int>("getAutoSizeMaxTextSize", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.BlendMode>("getCompoundDrawableTintBlendMode", "()Landroid/graphics/BlendMode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeMinTextSize()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextCursorDrawable()"/>
         /// </summary>
-        public int AutoSizeMinTextSize
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetTextCursorDrawable()
         {
-            get { return IExecuteWithSignature<int>("getAutoSizeMinTextSize", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTextCursorDrawable", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeStepGranularity()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSelectHandle()"/>
         /// </summary>
-        public int AutoSizeStepGranularity
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetTextSelectHandle()
         {
-            get { return IExecuteWithSignature<int>("getAutoSizeStepGranularity", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTextSelectHandle", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeTextAvailableSizes()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSelectHandleLeft()"/>
         /// </summary>
-        public int[] AutoSizeTextAvailableSizes
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetTextSelectHandleLeft()
         {
-            get { return IExecuteWithSignatureArray<int>("getAutoSizeTextAvailableSizes", "()[I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTextSelectHandleLeft", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeTextType()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSelectHandleRight()"/>
         /// </summary>
-        public int AutoSizeTextType
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetTextSelectHandleRight()
         {
-            get { return IExecuteWithSignature<int>("getAutoSizeTextType", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTextSelectHandleRight", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getBreakStrategy()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setBreakStrategy(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawables()"/>
         /// </summary>
-        public int BreakStrategy
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable[] GetCompoundDrawables()
         {
-            get { return IExecuteWithSignature<int>("getBreakStrategy", "()I"); } set { IExecuteWithSignature("setBreakStrategy", "(I)V", value); }
+            return IExecuteWithSignatureArray<Android.Graphics.Drawable.Drawable>("getCompoundDrawables", "()[Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawablePadding()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawablePadding(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawablesRelative()"/>
         /// </summary>
-        public int CompoundDrawablePadding
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable[] GetCompoundDrawablesRelative()
         {
-            get { return IExecuteWithSignature<int>("getCompoundDrawablePadding", "()I"); } set { IExecuteWithSignature("setCompoundDrawablePadding", "(I)V", value); }
+            return IExecuteWithSignatureArray<Android.Graphics.Drawable.Drawable>("getCompoundDrawablesRelative", "()[Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawables()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawableTintMode()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable[] CompoundDrawables
+        /// <returns><see cref="Android.Graphics.PorterDuff.Mode"/></returns>
+        public Android.Graphics.PorterDuff.Mode GetCompoundDrawableTintMode()
         {
-            get { return IExecuteWithSignatureArray<Android.Graphics.Drawable.Drawable>("getCompoundDrawables", "()[Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getCompoundDrawableTintMode", "()Landroid/graphics/PorterDuff$Mode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawablesRelative()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTypeface()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable[] CompoundDrawablesRelative
+        /// <returns><see cref="Android.Graphics.Typeface"/></returns>
+        public Android.Graphics.Typeface GetTypeface()
         {
-            get { return IExecuteWithSignatureArray<Android.Graphics.Drawable.Drawable>("getCompoundDrawablesRelative", "()[Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawableTintBlendMode()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawableTintBlendMode(android.graphics.BlendMode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getInputExtras(boolean)"/>
         /// </summary>
-        public Android.Graphics.BlendMode CompoundDrawableTintBlendMode
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <returns><see cref="Android.Os.Bundle"/></returns>
+        public Android.Os.Bundle GetInputExtras(bool arg0)
         {
-            get { return IExecuteWithSignature<Android.Graphics.BlendMode>("getCompoundDrawableTintBlendMode", "()Landroid/graphics/BlendMode;"); } set { IExecuteWithSignature("setCompoundDrawableTintBlendMode", "(Landroid/graphics/BlendMode;)V", value); }
+            return IExecuteWithSignature<Android.Os.Bundle>("getInputExtras", "(Z)Landroid/os/Bundle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawableTintList()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawableTintList(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getImeHintLocales()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList CompoundDrawableTintList
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetImeHintLocales()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getCompoundDrawableTintList", "()Landroid/content/res/ColorStateList;"); } set { IExecuteWithSignature("setCompoundDrawableTintList", "(Landroid/content/res/ColorStateList;)V", value); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getImeHintLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawableTintMode()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawableTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextLocales()"/>
         /// </summary>
-        public Android.Graphics.PorterDuff.Mode CompoundDrawableTintMode
+        /// <returns><see cref="Android.Os.LocaleList"/></returns>
+        public Android.Os.LocaleList GetTextLocales()
         {
-            get { return IExecuteWithSignature<Android.Graphics.PorterDuff.Mode>("getCompoundDrawableTintMode", "()Landroid/graphics/PorterDuff$Mode;"); } set { IExecuteWithSignature("setCompoundDrawableTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", value); }
+            return IExecuteWithSignature<Android.Os.LocaleList>("getTextLocales", "()Landroid/os/LocaleList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#onSaveInstanceState()"/>
         /// </summary>
-        public int CompoundPaddingBottom
+        /// <returns><see cref="Android.Os.Parcelable"/></returns>
+        public Android.Os.Parcelable OnSaveInstanceState()
         {
-            get { return IExecuteWithSignature<int>("getCompoundPaddingBottom", "()I"); }
+            return IExecuteWithSignature<Android.Os.Parcelable>("onSaveInstanceState", "()Landroid/os/Parcelable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getEditableText()"/>
         /// </summary>
-        public int CompoundPaddingEnd
+        /// <returns><see cref="Android.Text.Editable"/></returns>
+        public Android.Text.Editable GetEditableText()
         {
-            get { return IExecuteWithSignature<int>("getCompoundPaddingEnd", "()I"); }
+            return IExecuteWithSignature<Android.Text.Editable>("getEditableText", "()Landroid/text/Editable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHighlights()"/>
         /// </summary>
-        public int CompoundPaddingLeft
+        /// <returns><see cref="Android.Text.Highlights"/></returns>
+        public Android.Text.Highlights GetHighlights()
         {
-            get { return IExecuteWithSignature<int>("getCompoundPaddingLeft", "()I"); }
+            return IExecuteWithSignature<Android.Text.Highlights>("getHighlights", "()Landroid/text/Highlights;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFilters()"/>
         /// </summary>
-        public int CompoundPaddingRight
+        /// <returns><see cref="Android.Text.InputFilter"/></returns>
+        public Android.Text.InputFilter[] GetFilters()
         {
-            get { return IExecuteWithSignature<int>("getCompoundPaddingRight", "()I"); }
+            return IExecuteWithSignatureArray<Android.Text.InputFilter>("getFilters", "()[Landroid/text/InputFilter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextMetricsParams()"/>
         /// </summary>
-        public int CompoundPaddingStart
+        /// <returns><see cref="Android.Text.PrecomputedText.Params"/></returns>
+        public Android.Text.PrecomputedText.Params GetTextMetricsParams()
         {
-            get { return IExecuteWithSignature<int>("getCompoundPaddingStart", "()I"); }
+            return IExecuteWithSignature<Android.Text.PrecomputedText.Params>("getTextMetricsParams", "()Landroid/text/PrecomputedText$Params;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getUrls()"/>
         /// </summary>
-        public int CompoundPaddingTop
+        /// <returns><see cref="Android.Text.Style.URLSpan"/></returns>
+        public Android.Text.Style.URLSpan[] GetUrls()
         {
-            get { return IExecuteWithSignature<int>("getCompoundPaddingTop", "()I"); }
+            return IExecuteWithSignatureArray<Android.Text.Style.URLSpan>("getUrls", "()[Landroid/text/style/URLSpan;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCurrentHintTextColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextDirectionHeuristic()"/>
         /// </summary>
-        public int CurrentHintTextColor
+        /// <returns><see cref="Android.Text.TextDirectionHeuristic"/></returns>
+        public Android.Text.TextDirectionHeuristic GetTextDirectionHeuristic()
         {
-            get { return IExecuteWithSignature<int>("getCurrentHintTextColor", "()I"); }
+            return IExecuteWithSignature<Android.Text.TextDirectionHeuristic>("getTextDirectionHeuristic", "()Landroid/text/TextDirectionHeuristic;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCurrentTextColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getPaint()"/>
         /// </summary>
-        public int CurrentTextColor
+        /// <returns><see cref="Android.Text.TextPaint"/></returns>
+        public Android.Text.TextPaint GetPaint()
         {
-            get { return IExecuteWithSignature<int>("getCurrentTextColor", "()I"); }
+            return IExecuteWithSignature<Android.Text.TextPaint>("getPaint", "()Landroid/text/TextPaint;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCustomInsertionActionModeCallback()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setCustomInsertionActionModeCallback(android.view.ActionMode.Callback)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getEllipsize()"/>
         /// </summary>
-        public Android.View.ActionMode.Callback CustomInsertionActionModeCallback
+        /// <returns><see cref="Android.Text.TextUtils.TruncateAt"/></returns>
+        public Android.Text.TextUtils.TruncateAt GetEllipsize()
         {
-            get { return IExecuteWithSignature<Android.View.ActionMode.Callback>("getCustomInsertionActionModeCallback", "()Landroid/view/ActionMode$Callback;"); } set { IExecuteWithSignature("setCustomInsertionActionModeCallback", "(Landroid/view/ActionMode$Callback;)V", value); }
+            return IExecuteWithSignature<Android.Text.TextUtils.TruncateAt>("getEllipsize", "()Landroid/text/TextUtils$TruncateAt;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCustomSelectionActionModeCallback()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setCustomSelectionActionModeCallback(android.view.ActionMode.Callback)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCustomInsertionActionModeCallback()"/>
         /// </summary>
-        public Android.View.ActionMode.Callback CustomSelectionActionModeCallback
+        /// <returns><see cref="Android.View.ActionMode.Callback"/></returns>
+        public Android.View.ActionMode.Callback GetCustomInsertionActionModeCallback()
         {
-            get { return IExecuteWithSignature<Android.View.ActionMode.Callback>("getCustomSelectionActionModeCallback", "()Landroid/view/ActionMode$Callback;"); } set { IExecuteWithSignature("setCustomSelectionActionModeCallback", "(Landroid/view/ActionMode$Callback;)V", value); }
+            return IExecuteWithSignature<Android.View.ActionMode.Callback>("getCustomInsertionActionModeCallback", "()Landroid/view/ActionMode$Callback;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getEditableText()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCustomSelectionActionModeCallback()"/>
         /// </summary>
-        public Android.Text.Editable EditableText
+        /// <returns><see cref="Android.View.ActionMode.Callback"/></returns>
+        public Android.View.ActionMode.Callback GetCustomSelectionActionModeCallback()
         {
-            get { return IExecuteWithSignature<Android.Text.Editable>("getEditableText", "()Landroid/text/Editable;"); }
+            return IExecuteWithSignature<Android.View.ActionMode.Callback>("getCustomSelectionActionModeCallback", "()Landroid/view/ActionMode$Callback;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getEllipsize()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setEllipsize(android.text.TextUtils.TruncateAt)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextClassifier()"/>
         /// </summary>
-        public Android.Text.TextUtils.TruncateAt Ellipsize
+        /// <returns><see cref="Android.View.Textclassifier.TextClassifier"/></returns>
+        public Android.View.Textclassifier.TextClassifier GetTextClassifier()
         {
-            get { return IExecuteWithSignature<Android.Text.TextUtils.TruncateAt>("getEllipsize", "()Landroid/text/TextUtils$TruncateAt;"); } set { IExecuteWithSignature("setEllipsize", "(Landroid/text/TextUtils$TruncateAt;)V", value); }
+            return IExecute<Android.View.Textclassifier.TextClassifier>("getTextClassifier");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getError()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setError(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#bringPointIntoView(int,boolean)"/>
         /// </summary>
-        public Java.Lang.CharSequence Error
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool BringPointIntoView(int arg0, bool arg1)
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getError", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setError", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecute<bool>("bringPointIntoView", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getExtendedPaddingBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#bringPointIntoView(int)"/>
         /// </summary>
-        public int ExtendedPaddingBottom
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool BringPointIntoView(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getExtendedPaddingBottom", "()I"); }
+            return IExecuteWithSignature<bool>("bringPointIntoView", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getExtendedPaddingTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#didTouchFocusSelect()"/>
         /// </summary>
-        public int ExtendedPaddingTop
+        /// <returns><see cref="bool"/></returns>
+        public bool DidTouchFocusSelect()
         {
-            get { return IExecuteWithSignature<int>("getExtendedPaddingTop", "()I"); }
+            return IExecuteWithSignature<bool>("didTouchFocusSelect", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFilters()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setFilters(android.text.InputFilter[])"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#extractText(android.view.inputmethod.ExtractedTextRequest,android.view.inputmethod.ExtractedText)"/>
         /// </summary>
-        public Android.Text.InputFilter[] Filters
+        /// <param name="arg0"><see cref="Android.View.Inputmethod.ExtractedTextRequest"/></param>
+        /// <param name="arg1"><see cref="Android.View.Inputmethod.ExtractedText"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool ExtractText(Android.View.Inputmethod.ExtractedTextRequest arg0, Android.View.Inputmethod.ExtractedText arg1)
         {
-            get { return IExecuteWithSignatureArray<Android.Text.InputFilter>("getFilters", "()[Landroid/text/InputFilter;"); } set { IExecuteWithSignature("setFilters", "([Landroid/text/InputFilter;)V", value); }
+            return IExecute<bool>("extractText", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFirstBaselineToTopHeight()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setFirstBaselineToTopHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFreezesText()"/>
         /// </summary>
-        public int FirstBaselineToTopHeight
+        /// <returns><see cref="bool"/></returns>
+        public bool GetFreezesText()
         {
-            get { return IExecuteWithSignature<int>("getFirstBaselineToTopHeight", "()I"); } set { IExecuteWithSignature("setFirstBaselineToTopHeight", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getFreezesText", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFocusedSearchResultHighlightColor()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setFocusedSearchResultHighlightColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getIncludeFontPadding()"/>
         /// </summary>
-        public int FocusedSearchResultHighlightColor
+        /// <returns><see cref="bool"/></returns>
+        public bool GetIncludeFontPadding()
         {
-            get { return IExecuteWithSignature<int>("getFocusedSearchResultHighlightColor", "()I"); } set { IExecuteWithSignature("setFocusedSearchResultHighlightColor", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getIncludeFontPadding", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFocusedSearchResultIndex()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setFocusedSearchResultIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#hasSelection()"/>
         /// </summary>
-        public int FocusedSearchResultIndex
+        /// <returns><see cref="bool"/></returns>
+        public bool HasSelection()
         {
-            get { return IExecuteWithSignature<int>("getFocusedSearchResultIndex", "()I"); } set { IExecuteWithSignature("setFocusedSearchResultIndex", "(I)V", value); }
+            return IExecuteWithSignature<bool>("hasSelection", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFontFeatureSettings()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setFontFeatureSettings(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isAllCaps()"/>
         /// </summary>
-        public Java.Lang.String FontFeatureSettings
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAllCaps()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFontFeatureSettings", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setFontFeatureSettings", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isAllCaps", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFontVariationSettings()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isCursorVisible()"/>
         /// </summary>
-        public Java.Lang.String FontVariationSettings
+        /// <returns><see cref="bool"/></returns>
+        public bool IsCursorVisible()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFontVariationSettings", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isCursorVisible", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFreezesText()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setFreezesText(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isElegantTextHeight()"/>
         /// </summary>
-        public bool FreezesText
+        /// <returns><see cref="bool"/></returns>
+        public bool IsElegantTextHeight()
         {
-            get { return IExecuteWithSignature<bool>("getFreezesText", "()Z"); } set { IExecuteWithSignature("setFreezesText", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("isElegantTextHeight", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getGravity()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setGravity(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isFallbackLineSpacing()"/>
         /// </summary>
-        public int Gravity
+        /// <returns><see cref="bool"/></returns>
+        public bool IsFallbackLineSpacing()
         {
-            get { return IExecuteWithSignature<int>("getGravity", "()I"); } set { IExecuteWithSignature("setGravity", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isFallbackLineSpacing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHighlightColor()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setHighlightColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isInputMethodTarget()"/>
         /// </summary>
-        public int HighlightColor
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInputMethodTarget()
         {
-            get { return IExecuteWithSignature<int>("getHighlightColor", "()I"); } set { IExecuteWithSignature("setHighlightColor", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isInputMethodTarget", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHighlights()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setHighlights(android.text.Highlights)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isSingleLine()"/>
         /// </summary>
-        public Android.Text.Highlights Highlights
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSingleLine()
         {
-            get { return IExecuteWithSignature<Android.Text.Highlights>("getHighlights", "()Landroid/text/Highlights;"); } set { IExecuteWithSignature("setHighlights", "(Landroid/text/Highlights;)V", value); }
+            return IExecuteWithSignature<bool>("isSingleLine", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHint()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isSuggestionsEnabled()"/>
         /// </summary>
-        public Java.Lang.CharSequence Hint
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSuggestionsEnabled()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getHint", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<bool>("isSuggestionsEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHintTextColors()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isTextSelectable()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList HintTextColors
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTextSelectable()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getHintTextColors", "()Landroid/content/res/ColorStateList;"); }
+            return IExecuteWithSignature<bool>("isTextSelectable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHyphenationFrequency()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setHyphenationFrequency(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#moveCursorToVisibleOffset()"/>
         /// </summary>
-        public int HyphenationFrequency
+        /// <returns><see cref="bool"/></returns>
+        public bool MoveCursorToVisibleOffset()
         {
-            get { return IExecuteWithSignature<int>("getHyphenationFrequency", "()I"); } set { IExecuteWithSignature("setHyphenationFrequency", "(I)V", value); }
+            return IExecuteWithSignature<bool>("moveCursorToVisibleOffset", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getImeActionId()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#onPreDraw()"/>
         /// </summary>
-        public int ImeActionId
+        /// <returns><see cref="bool"/></returns>
+        public bool OnPreDraw()
         {
-            get { return IExecuteWithSignature<int>("getImeActionId", "()I"); }
+            return IExecuteWithSignature<bool>("onPreDraw", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getImeActionLabel()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#onPrivateIMECommand(java.lang.String,android.os.Bundle)"/>
         /// </summary>
-        public Java.Lang.CharSequence ImeActionLabel
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnPrivateIMECommand(Java.Lang.String arg0, Android.Os.Bundle arg1)
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getImeActionLabel", "()Ljava/lang/CharSequence;"); }
+            return IExecute<bool>("onPrivateIMECommand", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getImeHintLocales()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setImeHintLocales(android.os.LocaleList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#onTextContextMenuItem(int)"/>
         /// </summary>
-        public Android.Os.LocaleList ImeHintLocales
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool OnTextContextMenuItem(int arg0)
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getImeHintLocales", "()Landroid/os/LocaleList;"); } set { IExecuteWithSignature("setImeHintLocales", "(Landroid/os/LocaleList;)V", value); }
+            return IExecuteWithSignature<bool>("onTextContextMenuItem", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getImeOptions()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setImeOptions(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setFontVariationSettings(java.lang.String)"/>
         /// </summary>
-        public int ImeOptions
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SetFontVariationSettings(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<int>("getImeOptions", "()I"); } set { IExecuteWithSignature("setImeOptions", "(I)V", value); }
+            return IExecuteWithSignature<bool>("setFontVariationSettings", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getIncludeFontPadding()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setIncludeFontPadding(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHintTextColors()"/>
         /// </summary>
-        public bool IncludeFontPadding
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetHintTextColors()
         {
-            get { return IExecuteWithSignature<bool>("getIncludeFontPadding", "()Z"); } set { IExecuteWithSignature("setIncludeFontPadding", "(Z)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getHintTextColors", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getInputType()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setInputType(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLinkTextColors()"/>
         /// </summary>
-        public int InputType
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetLinkTextColors()
         {
-            get { return IExecuteWithSignature<int>("getInputType", "()I"); } set { IExecuteWithSignature("setInputType", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getLinkTextColors", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getJustificationMode()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setJustificationMode(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextColors()"/>
         /// </summary>
-        public int JustificationMode
+        /// <returns><see cref="Android.Content.Res.ColorStateList"/></returns>
+        public Android.Content.Res.ColorStateList GetTextColors()
         {
-            get { return IExecuteWithSignature<int>("getJustificationMode", "()I"); } set { IExecuteWithSignature("setJustificationMode", "(I)V", value); }
+            return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getTextColors", "()Landroid/content/res/ColorStateList;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getKeyListener()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setKeyListener(android.text.method.KeyListener)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLayout()"/>
         /// </summary>
-        public Android.Text.Method.KeyListener KeyListener
+        /// <returns><see cref="Android.Text.Layout"/></returns>
+        public Android.Text.Layout GetLayout()
         {
-            get { return IExecuteWithSignature<Android.Text.Method.KeyListener>("getKeyListener", "()Landroid/text/method/KeyListener;"); } set { IExecuteWithSignature("setKeyListener", "(Landroid/text/method/KeyListener;)V", value); }
+            return IExecuteWithSignature<Android.Text.Layout>("getLayout", "()Landroid/text/Layout;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLastBaselineToBottomHeight()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setLastBaselineToBottomHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getKeyListener()"/>
         /// </summary>
-        public int LastBaselineToBottomHeight
+        /// <returns><see cref="Android.Text.Method.KeyListener"/></returns>
+        public Android.Text.Method.KeyListener GetKeyListener()
         {
-            get { return IExecuteWithSignature<int>("getLastBaselineToBottomHeight", "()I"); } set { IExecuteWithSignature("setLastBaselineToBottomHeight", "(I)V", value); }
+            return IExecuteWithSignature<Android.Text.Method.KeyListener>("getKeyListener", "()Landroid/text/method/KeyListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLayout()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getKeyListener()"/>
         /// </summary>
-        public Android.Text.Layout Layout
+        /// <returns><see cref="Android.Text.Method.KeyListener"/></returns>
+        public Android.Text.Method.KeyListener GetKeyListenerDirect()
         {
-            get { return IExecuteWithSignature<Android.Text.Layout>("getLayout", "()Landroid/text/Layout;"); }
+            return IExecuteWithSignature<Android.Text.Method.KeyListenerDirect, Android.Text.Method.KeyListener>("getKeyListener", "()Landroid/text/method/KeyListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLetterSpacing()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setLetterSpacing(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMovementMethod()"/>
         /// </summary>
-        public float LetterSpacing
+        /// <returns><see cref="Android.Text.Method.MovementMethod"/></returns>
+        public Android.Text.Method.MovementMethod GetMovementMethod()
         {
-            get { return IExecuteWithSignature<float>("getLetterSpacing", "()F"); } set { IExecuteWithSignature("setLetterSpacing", "(F)V", value); }
+            return IExecuteWithSignature<Android.Text.Method.MovementMethod>("getMovementMethod", "()Landroid/text/method/MovementMethod;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineBreakStyle()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setLineBreakStyle(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTransformationMethod()"/>
         /// </summary>
-        public int LineBreakStyle
+        /// <returns><see cref="Android.Text.Method.TransformationMethod"/></returns>
+        public Android.Text.Method.TransformationMethod GetTransformationMethod()
         {
-            get { return IExecuteWithSignature<int>("getLineBreakStyle", "()I"); } set { IExecuteWithSignature("setLineBreakStyle", "(I)V", value); }
+            return IExecuteWithSignature<Android.Text.Method.TransformationMethod>("getTransformationMethod", "()Landroid/text/method/TransformationMethod;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineBreakWordStyle()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setLineBreakWordStyle(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLinksClickable()"/>
         /// </summary>
-        public int LineBreakWordStyle
+        /// <returns><see cref="bool"/></returns>
+        public bool GetLinksClickable()
         {
-            get { return IExecuteWithSignature<int>("getLineBreakWordStyle", "()I"); } set { IExecuteWithSignature("setLineBreakWordStyle", "(I)V", value); }
+            return IExecuteWithSignature<bool>("getLinksClickable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShowSoftInputOnFocus()"/>
         /// </summary>
-        public int LineCount
+        /// <returns><see cref="bool"/></returns>
+        public bool GetShowSoftInputOnFocus()
         {
-            get { return IExecuteWithSignature<int>("getLineCount", "()I"); }
+            return IExecuteWithSignature<bool>("getShowSoftInputOnFocus", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineHeight()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setLineHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isHorizontallyScrollable()"/>
         /// </summary>
-        public int LineHeight
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHorizontallyScrollable()
         {
-            get { return IExecuteWithSignature<int>("getLineHeight", "()I"); } set { IExecuteWithSignature("setLineHeight", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isHorizontallyScrollable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineSpacingExtra()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoLinkMask()"/>
         /// </summary>
-        public float LineSpacingExtra
+        /// <returns><see cref="int"/></returns>
+        public int GetAutoLinkMask()
         {
-            get { return IExecuteWithSignature<float>("getLineSpacingExtra", "()F"); }
+            return IExecuteWithSignature<int>("getAutoLinkMask", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineSpacingMultiplier()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCurrentHintTextColor()"/>
         /// </summary>
-        public float LineSpacingMultiplier
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentHintTextColor()
         {
-            get { return IExecuteWithSignature<float>("getLineSpacingMultiplier", "()F"); }
+            return IExecuteWithSignature<int>("getCurrentHintTextColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLinksClickable()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setLinksClickable(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCurrentTextColor()"/>
         /// </summary>
-        public bool LinksClickable
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentTextColor()
         {
-            get { return IExecuteWithSignature<bool>("getLinksClickable", "()Z"); } set { IExecuteWithSignature("setLinksClickable", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getCurrentTextColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLinkTextColors()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#append(java.lang.CharSequence)"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList LinkTextColors
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void Append(Java.Lang.CharSequence arg0)
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getLinkTextColors", "()Landroid/content/res/ColorStateList;"); }
+            IExecuteWithSignature("append", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMarqueeRepeatLimit()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMarqueeRepeatLimit(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setAutoLinkMask(int)"/>
         /// </summary>
-        public int MarqueeRepeatLimit
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetAutoLinkMask(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getMarqueeRepeatLimit", "()I"); } set { IExecuteWithSignature("setMarqueeRepeatLimit", "(I)V", value); }
+            IExecuteWithSignature("setAutoLinkMask", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMaxEms()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMaxEms(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setEditableFactory(android.text.Editable.Factory)"/>
         /// </summary>
-        public int MaxEms
+        /// <param name="arg0"><see cref="Android.Text.Editable.Factory"/></param>
+        public void SetEditableFactory(Android.Text.Editable.Factory arg0)
         {
-            get { return IExecuteWithSignature<int>("getMaxEms", "()I"); } set { IExecuteWithSignature("setMaxEms", "(I)V", value); }
+            IExecuteWithSignature("setEditableFactory", "(Landroid/text/Editable$Factory;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMaxHeight()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMaxHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHint(int)"/>
         /// </summary>
-        public int MaxHeight
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHint(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getMaxHeight", "()I"); } set { IExecuteWithSignature("setMaxHeight", "(I)V", value); }
+            IExecuteWithSignature("setHint", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMaxLines()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMaxLines(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHint(java.lang.CharSequence)"/>
         /// </summary>
-        public int MaxLines
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetHint(Java.Lang.CharSequence arg0)
         {
-            get { return IExecuteWithSignature<int>("getMaxLines", "()I"); } set { IExecuteWithSignature("setMaxLines", "(I)V", value); }
+            IExecuteWithSignature("setHint", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMaxWidth()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMaxWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHintTextColor(android.content.res.ColorStateList)"/>
         /// </summary>
-        public int MaxWidth
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetHintTextColor(Android.Content.Res.ColorStateList arg0)
         {
-            get { return IExecuteWithSignature<int>("getMaxWidth", "()I"); } set { IExecuteWithSignature("setMaxWidth", "(I)V", value); }
+            IExecuteWithSignature("setHintTextColor", "(Landroid/content/res/ColorStateList;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMinEms()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMinEms(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHintTextColor(int)"/>
         /// </summary>
-        public int MinEms
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHintTextColor(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getMinEms", "()I"); } set { IExecuteWithSignature("setMinEms", "(I)V", value); }
+            IExecuteWithSignature("setHintTextColor", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMinHeight()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMinHeight(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLinksClickable(boolean)"/>
         /// </summary>
-        public int MinHeight
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetLinksClickable(bool arg0)
         {
-            get { return IExecuteWithSignature<int>("getMinHeight", "()I"); } set { IExecuteWithSignature("setMinHeight", "(I)V", value); }
+            IExecuteWithSignature("setLinksClickable", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMinLines()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMinLines(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLinkTextColor(android.content.res.ColorStateList)"/>
         /// </summary>
-        public int MinLines
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetLinkTextColor(Android.Content.Res.ColorStateList arg0)
         {
-            get { return IExecuteWithSignature<int>("getMinLines", "()I"); } set { IExecuteWithSignature("setMinLines", "(I)V", value); }
+            IExecuteWithSignature("setLinkTextColor", "(Landroid/content/res/ColorStateList;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMinWidth()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMinWidth(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLinkTextColor(int)"/>
         /// </summary>
-        public int MinWidth
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLinkTextColor(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getMinWidth", "()I"); } set { IExecuteWithSignature("setMinWidth", "(I)V", value); }
+            IExecuteWithSignature("setLinkTextColor", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMovementMethod()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setMovementMethod(android.text.method.MovementMethod)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMovementMethod(android.text.method.MovementMethod)"/>
         /// </summary>
-        public Android.Text.Method.MovementMethod MovementMethod
+        /// <param name="arg0"><see cref="Android.Text.Method.MovementMethod"/></param>
+        public void SetMovementMethod(Android.Text.Method.MovementMethod arg0)
         {
-            get { return IExecuteWithSignature<Android.Text.Method.MovementMethod>("getMovementMethod", "()Landroid/text/method/MovementMethod;"); } set { IExecuteWithSignature("setMovementMethod", "(Landroid/text/method/MovementMethod;)V", value); }
+            IExecuteWithSignature("setMovementMethod", "(Landroid/text/method/MovementMethod;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getPaint()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setShowSoftInputOnFocus(boolean)"/>
         /// </summary>
-        public Android.Text.TextPaint Paint
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetShowSoftInputOnFocus(bool arg0)
         {
-            get { return IExecuteWithSignature<Android.Text.TextPaint>("getPaint", "()Landroid/text/TextPaint;"); }
+            IExecuteWithSignature("setShowSoftInputOnFocus", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getPaintFlags()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setPaintFlags(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setSpannableFactory(android.text.Spannable.Factory)"/>
         /// </summary>
-        public int PaintFlags
+        /// <param name="arg0"><see cref="Android.Text.Spannable.Factory"/></param>
+        public void SetSpannableFactory(Android.Text.Spannable.Factory arg0)
         {
-            get { return IExecuteWithSignature<int>("getPaintFlags", "()I"); } set { IExecuteWithSignature("setPaintFlags", "(I)V", value); }
+            IExecuteWithSignature("setSpannableFactory", "(Landroid/text/Spannable$Factory;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getPrivateImeOptions()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setPrivateImeOptions(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setText(char[],int,int)"/>
         /// </summary>
-        public Java.Lang.String PrivateImeOptions
+        /// <param name="arg0"><see cref="char"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        public void SetText(char[] arg0, int arg1, int arg2)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPrivateImeOptions", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPrivateImeOptions", "(Ljava/lang/String;)V", value); }
+            IExecute("setText", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getSearchResultHighlightColor()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setSearchResultHighlightColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setText(int,android.widget.TextView.BufferType)"/>
         /// </summary>
-        public int SearchResultHighlightColor
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Android.Widget.TextView.BufferType"/></param>
+        public void SetText(int arg0, Android.Widget.TextView.BufferType arg1)
         {
-            get { return IExecuteWithSignature<int>("getSearchResultHighlightColor", "()I"); } set { IExecuteWithSignature("setSearchResultHighlightColor", "(I)V", value); }
+            IExecute("setText", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getSearchResultHighlights()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setSearchResultHighlights(int[])"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setText(int)"/>
         /// </summary>
-        public int[] SearchResultHighlights
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetText(int arg0)
         {
-            get { return IExecuteWithSignatureArray<int>("getSearchResultHighlights", "()[I"); } set { IExecuteWithSignature("setSearchResultHighlights", "([I)V", value); }
+            IExecuteWithSignature("setText", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getSelectionEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setText(java.lang.CharSequence)"/>
         /// </summary>
-        public int SelectionEnd
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetText(Java.Lang.CharSequence arg0)
         {
-            get { return IExecuteWithSignature<int>("getSelectionEnd", "()I"); }
+            IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getSelectionStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextKeepState(java.lang.CharSequence,android.widget.TextView.BufferType)"/>
         /// </summary>
-        public int SelectionStart
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        /// <param name="arg1"><see cref="Android.Widget.TextView.BufferType"/></param>
+        public void SetTextKeepState(Java.Lang.CharSequence arg0, Android.Widget.TextView.BufferType arg1)
         {
-            get { return IExecuteWithSignature<int>("getSelectionStart", "()I"); }
+            IExecute("setTextKeepState", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShadowColor()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextKeepState(java.lang.CharSequence)"/>
         /// </summary>
-        public int ShadowColor
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetTextKeepState(Java.Lang.CharSequence arg0)
         {
-            get { return IExecuteWithSignature<int>("getShadowColor", "()I"); }
+            IExecuteWithSignature("setTextKeepState", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShadowDx()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTransformationMethod(android.text.method.TransformationMethod)"/>
         /// </summary>
-        public float ShadowDx
+        /// <param name="arg0"><see cref="Android.Text.Method.TransformationMethod"/></param>
+        public void SetTransformationMethod(Android.Text.Method.TransformationMethod arg0)
         {
-            get { return IExecuteWithSignature<float>("getShadowDx", "()F"); }
+            IExecuteWithSignature("setTransformationMethod", "(Landroid/text/method/TransformationMethod;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShadowDy()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLetterSpacing()"/>
         /// </summary>
-        public float ShadowDy
+        /// <returns><see cref="float"/></returns>
+        public float GetLetterSpacing()
         {
-            get { return IExecuteWithSignature<float>("getShadowDy", "()F"); }
+            return IExecuteWithSignature<float>("getLetterSpacing", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShadowRadius()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineSpacingExtra()"/>
         /// </summary>
-        public float ShadowRadius
+        /// <returns><see cref="float"/></returns>
+        public float GetLineSpacingExtra()
         {
-            get { return IExecuteWithSignature<float>("getShadowRadius", "()F"); }
+            return IExecuteWithSignature<float>("getLineSpacingExtra", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShowSoftInputOnFocus()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setShowSoftInputOnFocus(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineSpacingMultiplier()"/>
         /// </summary>
-        public bool ShowSoftInputOnFocus
+        /// <returns><see cref="float"/></returns>
+        public float GetLineSpacingMultiplier()
         {
-            get { return IExecuteWithSignature<bool>("getShowSoftInputOnFocus", "()Z"); } set { IExecuteWithSignature("setShowSoftInputOnFocus", "(Z)V", value); }
+            return IExecuteWithSignature<float>("getLineSpacingMultiplier", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getText()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShadowDx()"/>
         /// </summary>
-        public Java.Lang.CharSequence Text
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowDx()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<float>("getShadowDx", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextClassifier()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextClassifier(android.view.textclassifier.TextClassifier)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShadowDy()"/>
         /// </summary>
-        public Android.View.Textclassifier.TextClassifier TextClassifier
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowDy()
         {
-            get { return IExecute<Android.View.Textclassifier.TextClassifier>("getTextClassifier"); } set { IExecute("setTextClassifier", value); }
+            return IExecuteWithSignature<float>("getShadowDy", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextColors()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShadowRadius()"/>
         /// </summary>
-        public Android.Content.Res.ColorStateList TextColors
+        /// <returns><see cref="float"/></returns>
+        public float GetShadowRadius()
         {
-            get { return IExecuteWithSignature<Android.Content.Res.ColorStateList>("getTextColors", "()Landroid/content/res/ColorStateList;"); }
+            return IExecuteWithSignature<float>("getShadowRadius", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextCursorDrawable()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextScaleX()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable TextCursorDrawable
+        /// <returns><see cref="float"/></returns>
+        public float GetTextScaleX()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTextCursorDrawable", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<float>("getTextScaleX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextDirectionHeuristic()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSize()"/>
         /// </summary>
-        public Android.Text.TextDirectionHeuristic TextDirectionHeuristic
+        /// <returns><see cref="float"/></returns>
+        public float GetTextSize()
         {
-            get { return IExecuteWithSignature<Android.Text.TextDirectionHeuristic>("getTextDirectionHeuristic", "()Landroid/text/TextDirectionHeuristic;"); }
+            return IExecuteWithSignature<float>("getTextSize", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextLocale()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextLocale(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeMaxTextSize()"/>
         /// </summary>
-        public Java.Util.Locale TextLocale
+        /// <returns><see cref="int"/></returns>
+        public int GetAutoSizeMaxTextSize()
         {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getTextLocale", "()Ljava/util/Locale;"); } set { IExecuteWithSignature("setTextLocale", "(Ljava/util/Locale;)V", value); }
+            return IExecuteWithSignature<int>("getAutoSizeMaxTextSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextLocales()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextLocales(android.os.LocaleList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeMinTextSize()"/>
         /// </summary>
-        public Android.Os.LocaleList TextLocales
+        /// <returns><see cref="int"/></returns>
+        public int GetAutoSizeMinTextSize()
         {
-            get { return IExecuteWithSignature<Android.Os.LocaleList>("getTextLocales", "()Landroid/os/LocaleList;"); } set { IExecuteWithSignature("setTextLocales", "(Landroid/os/LocaleList;)V", value); }
+            return IExecuteWithSignature<int>("getAutoSizeMinTextSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextMetricsParams()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextMetricsParams(android.text.PrecomputedText.Params)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeStepGranularity()"/>
         /// </summary>
-        public Android.Text.PrecomputedText.Params TextMetricsParams
+        /// <returns><see cref="int"/></returns>
+        public int GetAutoSizeStepGranularity()
         {
-            get { return IExecuteWithSignature<Android.Text.PrecomputedText.Params>("getTextMetricsParams", "()Landroid/text/PrecomputedText$Params;"); } set { IExecuteWithSignature("setTextMetricsParams", "(Landroid/text/PrecomputedText$Params;)V", value); }
+            return IExecuteWithSignature<int>("getAutoSizeStepGranularity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextScaleX()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextScaleX(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeTextType()"/>
         /// </summary>
-        public float TextScaleX
+        /// <returns><see cref="int"/></returns>
+        public int GetAutoSizeTextType()
         {
-            get { return IExecuteWithSignature<float>("getTextScaleX", "()F"); } set { IExecuteWithSignature("setTextScaleX", "(F)V", value); }
+            return IExecuteWithSignature<int>("getAutoSizeTextType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSelectHandle()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getBreakStrategy()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable TextSelectHandle
+        /// <returns><see cref="int"/></returns>
+        public int GetBreakStrategy()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTextSelectHandle", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<int>("getBreakStrategy", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSelectHandleLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundDrawablePadding()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable TextSelectHandleLeft
+        /// <returns><see cref="int"/></returns>
+        public int GetCompoundDrawablePadding()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTextSelectHandleLeft", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<int>("getCompoundDrawablePadding", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSelectHandleRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingBottom()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable TextSelectHandleRight
+        /// <returns><see cref="int"/></returns>
+        public int GetCompoundPaddingBottom()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getTextSelectHandleRight", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<int>("getCompoundPaddingBottom", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSize()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextSize(float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingEnd()"/>
         /// </summary>
-        public float TextSize
+        /// <returns><see cref="int"/></returns>
+        public int GetCompoundPaddingEnd()
         {
-            get { return IExecuteWithSignature<float>("getTextSize", "()F"); } set { IExecuteWithSignature("setTextSize", "(F)V", value); }
+            return IExecuteWithSignature<int>("getCompoundPaddingEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSizeUnit()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingLeft()"/>
         /// </summary>
-        public int TextSizeUnit
+        /// <returns><see cref="int"/></returns>
+        public int GetCompoundPaddingLeft()
         {
-            get { return IExecuteWithSignature<int>("getTextSizeUnit", "()I"); }
+            return IExecuteWithSignature<int>("getCompoundPaddingLeft", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingBottom()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingRight()"/>
         /// </summary>
-        public int TotalPaddingBottom
+        /// <returns><see cref="int"/></returns>
+        public int GetCompoundPaddingRight()
         {
-            get { return IExecuteWithSignature<int>("getTotalPaddingBottom", "()I"); }
+            return IExecuteWithSignature<int>("getCompoundPaddingRight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingStart()"/>
         /// </summary>
-        public int TotalPaddingEnd
+        /// <returns><see cref="int"/></returns>
+        public int GetCompoundPaddingStart()
         {
-            get { return IExecuteWithSignature<int>("getTotalPaddingEnd", "()I"); }
+            return IExecuteWithSignature<int>("getCompoundPaddingStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getCompoundPaddingTop()"/>
         /// </summary>
-        public int TotalPaddingLeft
+        /// <returns><see cref="int"/></returns>
+        public int GetCompoundPaddingTop()
         {
-            get { return IExecuteWithSignature<int>("getTotalPaddingLeft", "()I"); }
+            return IExecuteWithSignature<int>("getCompoundPaddingTop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getExtendedPaddingBottom()"/>
         /// </summary>
-        public int TotalPaddingRight
+        /// <returns><see cref="int"/></returns>
+        public int GetExtendedPaddingBottom()
         {
-            get { return IExecuteWithSignature<int>("getTotalPaddingRight", "()I"); }
+            return IExecuteWithSignature<int>("getExtendedPaddingBottom", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getExtendedPaddingTop()"/>
         /// </summary>
-        public int TotalPaddingStart
+        /// <returns><see cref="int"/></returns>
+        public int GetExtendedPaddingTop()
         {
-            get { return IExecuteWithSignature<int>("getTotalPaddingStart", "()I"); }
+            return IExecuteWithSignature<int>("getExtendedPaddingTop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingTop()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFirstBaselineToTopHeight()"/>
         /// </summary>
-        public int TotalPaddingTop
+        /// <returns><see cref="int"/></returns>
+        public int GetFirstBaselineToTopHeight()
         {
-            get { return IExecuteWithSignature<int>("getTotalPaddingTop", "()I"); }
+            return IExecuteWithSignature<int>("getFirstBaselineToTopHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTransformationMethod()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setTransformationMethod(android.text.method.TransformationMethod)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFocusedSearchResultHighlightColor()"/>
         /// </summary>
-        public Android.Text.Method.TransformationMethod TransformationMethod
+        /// <returns><see cref="int"/></returns>
+        public int GetFocusedSearchResultHighlightColor()
         {
-            get { return IExecuteWithSignature<Android.Text.Method.TransformationMethod>("getTransformationMethod", "()Landroid/text/method/TransformationMethod;"); } set { IExecuteWithSignature("setTransformationMethod", "(Landroid/text/method/TransformationMethod;)V", value); }
+            return IExecuteWithSignature<int>("getFocusedSearchResultHighlightColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTypeface()"/> <see href="https://developer.android.com/reference/android/widget/TextView.html#setTypeface(android.graphics.Typeface)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFocusedSearchResultIndex()"/>
         /// </summary>
-        public Android.Graphics.Typeface Typeface
+        /// <returns><see cref="int"/></returns>
+        public int GetFocusedSearchResultIndex()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Typeface>("getTypeface", "()Landroid/graphics/Typeface;"); } set { IExecuteWithSignature("setTypeface", "(Landroid/graphics/Typeface;)V", value); }
+            return IExecuteWithSignature<int>("getFocusedSearchResultIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getUrls()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getGravity()"/>
         /// </summary>
-        public Android.Text.Style.URLSpan[] Urls
+        /// <returns><see cref="int"/></returns>
+        public int GetGravity()
         {
-            get { return IExecuteWithSignatureArray<Android.Text.Style.URLSpan>("getUrls", "()[Landroid/text/style/URLSpan;"); }
+            return IExecuteWithSignature<int>("getGravity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getInputExtras(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHighlightColor()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <returns><see cref="Android.Os.Bundle"/></returns>
-        public Android.Os.Bundle GetInputExtras(bool arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetHighlightColor()
         {
-            return IExecuteWithSignature<Android.Os.Bundle>("getInputExtras", "(Z)Landroid/os/Bundle;", arg0);
+            return IExecuteWithSignature<int>("getHighlightColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#onSaveInstanceState()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHyphenationFrequency()"/>
         /// </summary>
-        /// <returns><see cref="Android.Os.Parcelable"/></returns>
-        public Android.Os.Parcelable OnSaveInstanceState()
+        /// <returns><see cref="int"/></returns>
+        public int GetHyphenationFrequency()
         {
-            return IExecuteWithSignature<Android.Os.Parcelable>("onSaveInstanceState", "()Landroid/os/Parcelable;");
+            return IExecuteWithSignature<int>("getHyphenationFrequency", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#bringPointIntoView(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getImeActionId()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool BringPointIntoView(int arg0, bool arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetImeActionId()
         {
-            return IExecute<bool>("bringPointIntoView", arg0, arg1);
+            return IExecuteWithSignature<int>("getImeActionId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#bringPointIntoView(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getImeOptions()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetImeOptions()
+        {
+            return IExecuteWithSignature<int>("getImeOptions", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getInputType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInputType()
+        {
+            return IExecuteWithSignature<int>("getInputType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getJustificationMode()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetJustificationMode()
+        {
+            return IExecuteWithSignature<int>("getJustificationMode", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLastBaselineToBottomHeight()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLastBaselineToBottomHeight()
+        {
+            return IExecuteWithSignature<int>("getLastBaselineToBottomHeight", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineBounds(int,android.graphics.Rect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool BringPointIntoView(int arg0)
+        /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetLineBounds(int arg0, Android.Graphics.Rect arg1)
         {
-            return IExecuteWithSignature<bool>("bringPointIntoView", "(I)Z", arg0);
+            return IExecute<int>("getLineBounds", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#didTouchFocusSelect()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineBreakStyle()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool DidTouchFocusSelect()
+        /// <returns><see cref="int"/></returns>
+        public int GetLineBreakStyle()
         {
-            return IExecuteWithSignature<bool>("didTouchFocusSelect", "()Z");
+            return IExecuteWithSignature<int>("getLineBreakStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#extractText(android.view.inputmethod.ExtractedTextRequest,android.view.inputmethod.ExtractedText)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineBreakWordStyle()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.View.Inputmethod.ExtractedTextRequest"/></param>
-        /// <param name="arg1"><see cref="Android.View.Inputmethod.ExtractedText"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool ExtractText(Android.View.Inputmethod.ExtractedTextRequest arg0, Android.View.Inputmethod.ExtractedText arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetLineBreakWordStyle()
         {
-            return IExecute<bool>("extractText", arg0, arg1);
+            return IExecuteWithSignature<int>("getLineBreakWordStyle", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#hasSelection()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasSelection()
+        /// <returns><see cref="int"/></returns>
+        public int GetLineCount()
         {
-            return IExecuteWithSignature<bool>("hasSelection", "()Z");
+            return IExecuteWithSignature<int>("getLineCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isAllCaps()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineHeight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAllCaps()
+        /// <returns><see cref="int"/></returns>
+        public int GetLineHeight()
         {
-            return IExecuteWithSignature<bool>("isAllCaps", "()Z");
+            return IExecuteWithSignature<int>("getLineHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isCursorVisible()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMarqueeRepeatLimit()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsCursorVisible()
+        /// <returns><see cref="int"/></returns>
+        public int GetMarqueeRepeatLimit()
         {
-            return IExecuteWithSignature<bool>("isCursorVisible", "()Z");
+            return IExecuteWithSignature<int>("getMarqueeRepeatLimit", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isElegantTextHeight()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMaxEms()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsElegantTextHeight()
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxEms()
         {
-            return IExecuteWithSignature<bool>("isElegantTextHeight", "()Z");
+            return IExecuteWithSignature<int>("getMaxEms", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isFallbackLineSpacing()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMaxHeight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsFallbackLineSpacing()
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxHeight()
         {
-            return IExecuteWithSignature<bool>("isFallbackLineSpacing", "()Z");
+            return IExecuteWithSignature<int>("getMaxHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isInputMethodTarget()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMaxLines()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInputMethodTarget()
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxLines()
         {
-            return IExecuteWithSignature<bool>("isInputMethodTarget", "()Z");
+            return IExecuteWithSignature<int>("getMaxLines", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isSingleLine()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMaxWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSingleLine()
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxWidth()
         {
-            return IExecuteWithSignature<bool>("isSingleLine", "()Z");
+            return IExecuteWithSignature<int>("getMaxWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isSuggestionsEnabled()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMinEms()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSuggestionsEnabled()
+        /// <returns><see cref="int"/></returns>
+        public int GetMinEms()
         {
-            return IExecuteWithSignature<bool>("isSuggestionsEnabled", "()Z");
+            return IExecuteWithSignature<int>("getMinEms", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isTextSelectable()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMinHeight()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTextSelectable()
+        /// <returns><see cref="int"/></returns>
+        public int GetMinHeight()
         {
-            return IExecuteWithSignature<bool>("isTextSelectable", "()Z");
+            return IExecuteWithSignature<int>("getMinHeight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#moveCursorToVisibleOffset()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMinLines()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool MoveCursorToVisibleOffset()
+        /// <returns><see cref="int"/></returns>
+        public int GetMinLines()
         {
-            return IExecuteWithSignature<bool>("moveCursorToVisibleOffset", "()Z");
+            return IExecuteWithSignature<int>("getMinLines", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#onPreDraw()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getMinWidth()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnPreDraw()
+        /// <returns><see cref="int"/></returns>
+        public int GetMinWidth()
         {
-            return IExecuteWithSignature<bool>("onPreDraw", "()Z");
+            return IExecuteWithSignature<int>("getMinWidth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#onPrivateIMECommand(java.lang.String,android.os.Bundle)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getOffsetForPosition(float,float)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Android.Os.Bundle"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnPrivateIMECommand(Java.Lang.String arg0, Android.Os.Bundle arg1)
+        /// <param name="arg0"><see cref="float"/></param>
+        /// <param name="arg1"><see cref="float"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetOffsetForPosition(float arg0, float arg1)
         {
-            return IExecute<bool>("onPrivateIMECommand", arg0, arg1);
+            return IExecute<int>("getOffsetForPosition", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#onTextContextMenuItem(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getPaintFlags()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool OnTextContextMenuItem(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPaintFlags()
         {
-            return IExecuteWithSignature<bool>("onTextContextMenuItem", "(I)Z", arg0);
+            return IExecuteWithSignature<int>("getPaintFlags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setFontVariationSettings(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getSearchResultHighlightColor()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SetFontVariationSettings(Java.Lang.String arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSearchResultHighlightColor()
         {
-            return IExecuteWithSignature<bool>("setFontVariationSettings", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<int>("getSearchResultHighlightColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#isHorizontallyScrollable()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getSelectionEnd()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHorizontallyScrollable()
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionEnd()
         {
-            return IExecuteWithSignature<bool>("isHorizontallyScrollable", "()Z");
+            return IExecuteWithSignature<int>("getSelectionEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#append(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getSelectionStart()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        public void Append(Java.Lang.CharSequence arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSelectionStart()
         {
-            IExecuteWithSignature("append", "(Ljava/lang/CharSequence;)V", arg0);
+            return IExecuteWithSignature<int>("getSelectionStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setEditableFactory(android.text.Editable.Factory)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getShadowColor()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Editable.Factory"/></param>
-        public void SetEditableFactory(Android.Text.Editable.Factory arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetShadowColor()
         {
-            IExecuteWithSignature("setEditableFactory", "(Landroid/text/Editable$Factory;)V", arg0);
+            return IExecuteWithSignature<int>("getShadowColor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHint(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextSizeUnit()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void SetHint(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTextSizeUnit()
         {
-            IExecuteWithSignature("setHint", "(I)V", arg0);
+            return IExecuteWithSignature<int>("getTextSizeUnit", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHint(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingBottom()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        public void SetHint(Java.Lang.CharSequence arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalPaddingBottom()
         {
-            IExecuteWithSignature("setHint", "(Ljava/lang/CharSequence;)V", arg0);
+            return IExecuteWithSignature<int>("getTotalPaddingBottom", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHintTextColor(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingEnd()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
-        public void SetHintTextColor(Android.Content.Res.ColorStateList arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalPaddingEnd()
         {
-            IExecuteWithSignature("setHintTextColor", "(Landroid/content/res/ColorStateList;)V", arg0);
+            return IExecuteWithSignature<int>("getTotalPaddingEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHintTextColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingLeft()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void SetHintTextColor(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalPaddingLeft()
         {
-            IExecuteWithSignature("setHintTextColor", "(I)V", arg0);
+            return IExecuteWithSignature<int>("getTotalPaddingLeft", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLinkTextColor(android.content.res.ColorStateList)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingRight()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
-        public void SetLinkTextColor(Android.Content.Res.ColorStateList arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalPaddingRight()
         {
-            IExecuteWithSignature("setLinkTextColor", "(Landroid/content/res/ColorStateList;)V", arg0);
+            return IExecuteWithSignature<int>("getTotalPaddingRight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLinkTextColor(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingStart()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void SetLinkTextColor(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalPaddingStart()
         {
-            IExecuteWithSignature("setLinkTextColor", "(I)V", arg0);
+            return IExecuteWithSignature<int>("getTotalPaddingStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setSpannableFactory(android.text.Spannable.Factory)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTotalPaddingTop()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Android.Text.Spannable.Factory"/></param>
-        public void SetSpannableFactory(Android.Text.Spannable.Factory arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalPaddingTop()
         {
-            IExecuteWithSignature("setSpannableFactory", "(Landroid/text/Spannable$Factory;)V", arg0);
+            return IExecuteWithSignature<int>("getTotalPaddingTop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setText(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#length()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="char"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        public void SetText(char[] arg0, int arg1, int arg2)
+        /// <returns><see cref="int"/></returns>
+        public int Length()
         {
-            IExecute("setText", arg0, arg1, arg2);
+            return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setText(int,android.widget.TextView.BufferType)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getAutoSizeTextAvailableSizes()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Widget.TextView.BufferType"/></param>
-        public void SetText(int arg0, Android.Widget.TextView.BufferType arg1)
+        /// <returns><see cref="int"/></returns>
+        public int[] GetAutoSizeTextAvailableSizes()
         {
-            IExecute("setText", arg0, arg1);
+            return IExecuteWithSignatureArray<int>("getAutoSizeTextAvailableSizes", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setText(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getSearchResultHighlights()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        public void SetText(int arg0)
+        /// <returns><see cref="int"/></returns>
+        public int[] GetSearchResultHighlights()
         {
-            IExecuteWithSignature("setText", "(I)V", arg0);
+            return IExecuteWithSignatureArray<int>("getSearchResultHighlights", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setText(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getError()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        public void SetText(Java.Lang.CharSequence arg0)
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetError()
         {
-            IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", arg0);
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getError", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextKeepState(java.lang.CharSequence,android.widget.TextView.BufferType)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getHint()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="Android.Widget.TextView.BufferType"/></param>
-        public void SetTextKeepState(Java.Lang.CharSequence arg0, Android.Widget.TextView.BufferType arg1)
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetHint()
         {
-            IExecute("setTextKeepState", arg0, arg1);
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getHint", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextKeepState(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getImeActionLabel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetImeActionLabel()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getImeActionLabel", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getText", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFontFeatureSettings()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        public void SetTextKeepState(Java.Lang.CharSequence arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFontFeatureSettings()
         {
-            IExecuteWithSignature("setTextKeepState", "(Ljava/lang/CharSequence;)V", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getFontFeatureSettings", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getLineBounds(int,android.graphics.Rect)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getFontVariationSettings()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Android.Graphics.Rect"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int GetLineBounds(int arg0, Android.Graphics.Rect arg1)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFontVariationSettings()
         {
-            return IExecute<int>("getLineBounds", arg0, arg1);
+            return IExecuteWithSignature<Java.Lang.String>("getFontVariationSettings", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getOffsetForPosition(float,float)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getPrivateImeOptions()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="float"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int GetOffsetForPosition(float arg0, float arg1)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPrivateImeOptions()
         {
-            return IExecute<int>("getOffsetForPosition", arg0, arg1);
+            return IExecuteWithSignature<Java.Lang.String>("getPrivateImeOptions", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#length()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#getTextLocale()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int Length()
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetTextLocale()
         {
-            return IExecuteWithSignature<int>("length", "()I");
+            return IExecuteWithSignature<Java.Util.Locale>("getTextLocale", "()Ljava/util/Locale;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#addTextChangedListener(android.text.TextWatcher)"/>
@@ -1304,6 +1457,22 @@ public void SetAutoSizeTextTypeWithDefaults(int arg0)
             IExecuteWithSignature("setAutoSizeTextTypeWithDefaults", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setBreakStrategy(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBreakStrategy(int arg0)
+        {
+            IExecuteWithSignature("setBreakStrategy", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawablePadding(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCompoundDrawablePadding(int arg0)
+        {
+            IExecuteWithSignature("setCompoundDrawablePadding", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawables(android.graphics.drawable.Drawable,android.graphics.drawable.Drawable,android.graphics.drawable.Drawable,android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -1370,6 +1539,30 @@ public void SetCompoundDrawablesWithIntrinsicBounds(int arg0, int arg1, int arg2
             IExecute("setCompoundDrawablesWithIntrinsicBounds", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawableTintBlendMode(android.graphics.BlendMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.BlendMode"/></param>
+        public void SetCompoundDrawableTintBlendMode(Android.Graphics.BlendMode arg0)
+        {
+            IExecuteWithSignature("setCompoundDrawableTintBlendMode", "(Landroid/graphics/BlendMode;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawableTintList(android.content.res.ColorStateList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
+        public void SetCompoundDrawableTintList(Android.Content.Res.ColorStateList arg0)
+        {
+            IExecuteWithSignature("setCompoundDrawableTintList", "(Landroid/content/res/ColorStateList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setCompoundDrawableTintMode(android.graphics.PorterDuff.Mode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.PorterDuff.Mode"/></param>
+        public void SetCompoundDrawableTintMode(Android.Graphics.PorterDuff.Mode arg0)
+        {
+            IExecuteWithSignature("setCompoundDrawableTintMode", "(Landroid/graphics/PorterDuff$Mode;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setCursorVisible(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1378,6 +1571,22 @@ public void SetCursorVisible(bool arg0)
             IExecuteWithSignature("setCursorVisible", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setCustomInsertionActionModeCallback(android.view.ActionMode.Callback)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.ActionMode.Callback"/></param>
+        public void SetCustomInsertionActionModeCallback(Android.View.ActionMode.Callback arg0)
+        {
+            IExecuteWithSignature("setCustomInsertionActionModeCallback", "(Landroid/view/ActionMode$Callback;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setCustomSelectionActionModeCallback(android.view.ActionMode.Callback)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.ActionMode.Callback"/></param>
+        public void SetCustomSelectionActionModeCallback(Android.View.ActionMode.Callback arg0)
+        {
+            IExecuteWithSignature("setCustomSelectionActionModeCallback", "(Landroid/view/ActionMode$Callback;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setElegantTextHeight(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1386,6 +1595,14 @@ public void SetElegantTextHeight(bool arg0)
             IExecuteWithSignature("setElegantTextHeight", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setEllipsize(android.text.TextUtils.TruncateAt)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Text.TextUtils.TruncateAt"/></param>
+        public void SetEllipsize(Android.Text.TextUtils.TruncateAt arg0)
+        {
+            IExecuteWithSignature("setEllipsize", "(Landroid/text/TextUtils$TruncateAt;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setEms(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1403,6 +1620,14 @@ public void SetError(Java.Lang.CharSequence arg0, Android.Graphics.Drawable.Draw
             IExecute("setError", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setError(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetError(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setError", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setExtractedText(android.view.inputmethod.ExtractedText)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.Inputmethod.ExtractedText"/></param>
@@ -1419,6 +1644,62 @@ public void SetFallbackLineSpacing(bool arg0)
             IExecuteWithSignature("setFallbackLineSpacing", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setFilters(android.text.InputFilter[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Text.InputFilter"/></param>
+        public void SetFilters(Android.Text.InputFilter[] arg0)
+        {
+            IExecuteWithSignature("setFilters", "([Landroid/text/InputFilter;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setFirstBaselineToTopHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFirstBaselineToTopHeight(int arg0)
+        {
+            IExecuteWithSignature("setFirstBaselineToTopHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setFocusedSearchResultHighlightColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFocusedSearchResultHighlightColor(int arg0)
+        {
+            IExecuteWithSignature("setFocusedSearchResultHighlightColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setFocusedSearchResultIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFocusedSearchResultIndex(int arg0)
+        {
+            IExecuteWithSignature("setFocusedSearchResultIndex", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setFontFeatureSettings(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetFontFeatureSettings(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setFontFeatureSettings", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setFreezesText(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetFreezesText(bool arg0)
+        {
+            IExecuteWithSignature("setFreezesText", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setGravity(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGravity(int arg0)
+        {
+            IExecuteWithSignature("setGravity", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHeight(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1427,6 +1708,22 @@ public void SetHeight(int arg0)
             IExecuteWithSignature("setHeight", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHighlightColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHighlightColor(int arg0)
+        {
+            IExecuteWithSignature("setHighlightColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHighlights(android.text.Highlights)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Text.Highlights"/></param>
+        public void SetHighlights(Android.Text.Highlights arg0)
+        {
+            IExecuteWithSignature("setHighlights", "(Landroid/text/Highlights;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHorizontallyScrolling(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1435,6 +1732,14 @@ public void SetHorizontallyScrolling(bool arg0)
             IExecuteWithSignature("setHorizontallyScrolling", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setHyphenationFrequency(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHyphenationFrequency(int arg0)
+        {
+            IExecuteWithSignature("setHyphenationFrequency", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setImeActionLabel(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
@@ -1444,6 +1749,30 @@ public void SetImeActionLabel(Java.Lang.CharSequence arg0, int arg1)
             IExecute("setImeActionLabel", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setImeHintLocales(android.os.LocaleList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.LocaleList"/></param>
+        public void SetImeHintLocales(Android.Os.LocaleList arg0)
+        {
+            IExecuteWithSignature("setImeHintLocales", "(Landroid/os/LocaleList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setImeOptions(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetImeOptions(int arg0)
+        {
+            IExecuteWithSignature("setImeOptions", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setIncludeFontPadding(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetIncludeFontPadding(bool arg0)
+        {
+            IExecuteWithSignature("setIncludeFontPadding", "(Z)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setInputExtras(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1454,6 +1783,62 @@ public void SetInputExtras(int arg0)
             IExecuteWithSignature("setInputExtras", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setInputType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetInputType(int arg0)
+        {
+            IExecuteWithSignature("setInputType", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setJustificationMode(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetJustificationMode(int arg0)
+        {
+            IExecuteWithSignature("setJustificationMode", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setKeyListener(android.text.method.KeyListener)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Text.Method.KeyListener"/></param>
+        public void SetKeyListener(Android.Text.Method.KeyListener arg0)
+        {
+            IExecuteWithSignature("setKeyListener", "(Landroid/text/method/KeyListener;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLastBaselineToBottomHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLastBaselineToBottomHeight(int arg0)
+        {
+            IExecuteWithSignature("setLastBaselineToBottomHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLetterSpacing(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetLetterSpacing(float arg0)
+        {
+            IExecuteWithSignature("setLetterSpacing", "(F)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLineBreakStyle(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLineBreakStyle(int arg0)
+        {
+            IExecuteWithSignature("setLineBreakStyle", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLineBreakWordStyle(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLineBreakWordStyle(int arg0)
+        {
+            IExecuteWithSignature("setLineBreakWordStyle", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLineHeight(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1463,6 +1848,14 @@ public void SetLineHeight(int arg0, float arg1)
             IExecute("setLineHeight", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLineHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLineHeight(int arg0)
+        {
+            IExecuteWithSignature("setLineHeight", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setLines(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1480,6 +1873,78 @@ public void SetLineSpacing(float arg0, float arg1)
             IExecute("setLineSpacing", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMarqueeRepeatLimit(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMarqueeRepeatLimit(int arg0)
+        {
+            IExecuteWithSignature("setMarqueeRepeatLimit", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMaxEms(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxEms(int arg0)
+        {
+            IExecuteWithSignature("setMaxEms", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMaxHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxHeight(int arg0)
+        {
+            IExecuteWithSignature("setMaxHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMaxLines(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxLines(int arg0)
+        {
+            IExecuteWithSignature("setMaxLines", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMaxWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxWidth(int arg0)
+        {
+            IExecuteWithSignature("setMaxWidth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMinEms(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinEms(int arg0)
+        {
+            IExecuteWithSignature("setMinEms", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMinHeight(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinHeight(int arg0)
+        {
+            IExecuteWithSignature("setMinHeight", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMinLines(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinLines(int arg0)
+        {
+            IExecuteWithSignature("setMinLines", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setMinWidth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinWidth(int arg0)
+        {
+            IExecuteWithSignature("setMinWidth", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setOnEditorActionListener(android.widget.TextView.OnEditorActionListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.TextView.OnEditorActionListener"/></param>
@@ -1488,6 +1953,22 @@ public void SetOnEditorActionListener(Android.Widget.TextView.OnEditorActionList
             IExecuteWithSignature("setOnEditorActionListener", "(Landroid/widget/TextView$OnEditorActionListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setPaintFlags(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPaintFlags(int arg0)
+        {
+            IExecuteWithSignature("setPaintFlags", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setPrivateImeOptions(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPrivateImeOptions(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPrivateImeOptions", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setRawInputType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1504,6 +1985,22 @@ public void SetScroller(Android.Widget.Scroller arg0)
             IExecuteWithSignature("setScroller", "(Landroid/widget/Scroller;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setSearchResultHighlightColor(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSearchResultHighlightColor(int arg0)
+        {
+            IExecuteWithSignature("setSearchResultHighlightColor", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setSearchResultHighlights(int[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSearchResultHighlights(params int[] arg0)
+        {
+            if (arg0.Length == 0) IExecuteWithSignature("setSearchResultHighlights", "([I)V"); else IExecuteWithSignature("setSearchResultHighlights", "([I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setSelectAllOnFocus(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -1551,7 +2048,7 @@ public void SetText(Java.Lang.CharSequence arg0, Android.Widget.TextView.BufferT
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetTextAppearance(Android.Content.Context arg0, int arg1)
         {
             IExecute("setTextAppearance", arg0, arg1);
@@ -1565,6 +2062,14 @@ public void SetTextAppearance(int arg0)
             IExecuteWithSignature("setTextAppearance", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextClassifier(android.view.textclassifier.TextClassifier)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Textclassifier.TextClassifier"/></param>
+        public void SetTextClassifier(Android.View.Textclassifier.TextClassifier arg0)
+        {
+            IExecute("setTextClassifier", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextColor(android.content.res.ColorStateList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Res.ColorStateList"/></param>
@@ -1605,6 +2110,38 @@ public void SetTextIsSelectable(bool arg0)
             IExecuteWithSignature("setTextIsSelectable", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextLocale(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public void SetTextLocale(Java.Util.Locale arg0)
+        {
+            IExecuteWithSignature("setTextLocale", "(Ljava/util/Locale;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextLocales(android.os.LocaleList)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Os.LocaleList"/></param>
+        public void SetTextLocales(Android.Os.LocaleList arg0)
+        {
+            IExecuteWithSignature("setTextLocales", "(Landroid/os/LocaleList;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextMetricsParams(android.text.PrecomputedText.Params)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Text.PrecomputedText.Params"/></param>
+        public void SetTextMetricsParams(Android.Text.PrecomputedText.Params arg0)
+        {
+            IExecuteWithSignature("setTextMetricsParams", "(Landroid/text/PrecomputedText$Params;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextScaleX(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTextScaleX(float arg0)
+        {
+            IExecuteWithSignature("setTextScaleX", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextSelectHandle(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -1653,6 +2190,14 @@ public void SetTextSelectHandleRight(int arg0)
             IExecuteWithSignature("setTextSelectHandleRight", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextSize(float)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="float"/></param>
+        public void SetTextSize(float arg0)
+        {
+            IExecuteWithSignature("setTextSize", "(F)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTextSize(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1671,6 +2216,14 @@ public void SetTypeface(Android.Graphics.Typeface arg0, int arg1)
             IExecute("setTypeface", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setTypeface(android.graphics.Typeface)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Typeface"/></param>
+        public void SetTypeface(Android.Graphics.Typeface arg0)
+        {
+            IExecuteWithSignature("setTypeface", "(Landroid/graphics/Typeface;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TextView.html#setWidth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -1773,7 +2326,7 @@ public partial class OnEditorActionListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onEditorAction", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TextView>>>(OnEditorActionEventHandler));
+                AddEventHandler("onEditorAction", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TextView>>>(OnEditorActionEventHandler));
 
             }
 
@@ -1781,7 +2334,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/TextView.OnEditorActionListener.html#onEditorAction(android.widget.TextView,int,android.view.KeyEvent)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnEditorAction"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.Widget.TextView, int, Android.View.KeyEvent, bool> OnOnEditorAction { get; set; } = null;
+            public global::System.Func<Android.Widget.TextView, int, Android.View.KeyEvent, bool> OnOnEditorAction { get; set; } = null;
 
             void OnEditorActionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.TextView>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/ThemedSpinnerAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/ThemedSpinnerAdapter.cs
index 1f53ebd61..243f35278 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ThemedSpinnerAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ThemedSpinnerAdapter.cs
@@ -68,20 +68,20 @@ public partial class ThemedSpinnerAdapter : Android.Widget.IThemedSpinnerAdapter
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getDropDownViewTheme", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDropDownViewThemeEventHandler));
-            AddEventHandler("getView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
-            AddEventHandler("getDropDownView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetDropDownViewEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("getCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getItem", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
-            AddEventHandler("getItemId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("setDropDownViewTheme", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>>>(SetDropDownViewThemeEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
+            AddEventHandler("getDropDownViewTheme", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDropDownViewThemeEventHandler));
+            AddEventHandler("getView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
+            AddEventHandler("getDropDownView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetDropDownViewEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("getCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
+            AddEventHandler("getItemViewType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
+            AddEventHandler("getViewTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
+            AddEventHandler("getItem", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
+            AddEventHandler("getItemId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("setDropDownViewTheme", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>>>(SetDropDownViewThemeEventHandler));
+            AddEventHandler("getAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
 
         }
 
@@ -89,7 +89,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ThemedSpinnerAdapter.html#getDropDownViewTheme()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetDropDownViewTheme"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Content.Res.Resources.Theme> OnGetDropDownViewTheme { get; set; } = null;
+        public global::System.Func<Android.Content.Res.Resources.Theme> OnGetDropDownViewTheme { get; set; } = null;
 
         void GetDropDownViewThemeEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -111,7 +111,7 @@ public virtual Android.Content.Res.Resources.Theme GetDropDownViewTheme()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
 
         void GetViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -136,7 +136,7 @@ public virtual Android.View.View GetView(int arg0, Android.View.View arg1, Andro
         /// Handler for <see href="https://developer.android.com/reference/android/widget/SpinnerAdapter.html#getDropDownView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetDropDownView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetDropDownView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetDropDownView { get; set; } = null;
 
         void GetDropDownViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -161,7 +161,7 @@ public virtual Android.View.View GetDropDownView(int arg0, Android.View.View arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -183,7 +183,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -205,7 +205,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetCount { get; set; } = null;
+        public global::System.Func<int> OnGetCount { get; set; } = null;
 
         void GetCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -227,7 +227,7 @@ public virtual int GetCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
+        public global::System.Func<int, int> OnGetItemViewType { get; set; } = null;
 
         void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -250,7 +250,7 @@ public virtual int GetItemViewType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetViewTypeCount { get; set; } = null;
 
         void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -272,7 +272,7 @@ public virtual int GetViewTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItem"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetItem { get; set; } = null;
+        public global::System.Func<int, object> OnGetItem { get; set; } = null;
 
         void GetItemEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -295,7 +295,7 @@ public virtual object GetItem(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemId(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetItemId { get; set; } = null;
+        public global::System.Func<int, long> OnGetItemId { get; set; } = null;
 
         void GetItemIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -318,7 +318,7 @@ public virtual long GetItemId(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -339,7 +339,7 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -360,7 +360,7 @@ public virtual void UnregisterDataSetObserver(Android.Database.DataSetObserver a
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ThemedSpinnerAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetDropDownViewTheme"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Content.Res.Resources.Theme> OnSetDropDownViewTheme { get; set; } = null;
+        public global::System.Action<Android.Content.Res.Resources.Theme> OnSetDropDownViewTheme { get; set; } = null;
 
         void SetDropDownViewThemeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Content.Res.Resources.Theme>> data)
         {
@@ -390,7 +390,7 @@ public Java.Lang.CharSequence[] GetAutofillOptionsDefault()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
 
         void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -440,32 +440,12 @@ public partial class ThemedSpinnerAdapterDirect : Android.Widget.IThemedSpinnerA
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecute<int>("getCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ThemedSpinnerAdapter.html#getDropDownViewTheme()"/> <see href="https://developer.android.com/reference/android/widget/ThemedSpinnerAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
-        /// </summary>
-        public Android.Content.Res.Resources.Theme DropDownViewTheme
-        {
-            get { return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getDropDownViewTheme", "()Landroid/content/res/Resources$Theme;"); } set { IExecuteWithSignature("setDropDownViewTheme", "(Landroid/content/res/Resources$Theme;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ThemedSpinnerAdapter.html#getDropDownViewTheme()"/>
         /// </summary>
-        public int ViewTypeCount
+        /// <returns><see cref="Android.Content.Res.Resources.Theme"/></returns>
+        public override Android.Content.Res.Resources.Theme GetDropDownViewTheme()
         {
-            get { return IExecute<int>("getViewTypeCount"); }
+            return IExecuteWithSignature<Android.Content.Res.Resources.Theme>("getDropDownViewTheme", "()Landroid/content/res/Resources$Theme;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
@@ -506,6 +486,14 @@ public override bool IsEmpty()
             return IExecute<bool>("isEmpty");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetCount()
+        {
+            return IExecute<int>("getCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -515,6 +503,14 @@ public override int GetItemViewType(int arg0)
             return IExecute<int>("getItemViewType", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetViewTypeCount()
+        {
+            return IExecute<int>("getViewTypeCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -548,6 +544,22 @@ public override void UnregisterDataSetObserver(Android.Database.DataSetObserver
         {
             IExecute("unregisterDataSetObserver", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ThemedSpinnerAdapter.html#setDropDownViewTheme(android.content.res.Resources.Theme)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Content.Res.Resources.Theme"/></param>
+        public override void SetDropDownViewTheme(Android.Content.Res.Resources.Theme arg0)
+        {
+            IExecuteWithSignature("setDropDownViewTheme", "(Landroid/content/res/Resources$Theme;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public override Java.Lang.CharSequence[] GetAutofillOptions()
+        {
+            return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/TimePicker.cs b/src/net/Netdroid/Generated/Android/Widget/TimePicker.cs
index 69542971e..baf00b7f7 100644
--- a/src/net/Netdroid/Generated/Android/Widget/TimePicker.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/TimePicker.cs
@@ -84,50 +84,80 @@ public TimePicker(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#getCurrentHour()"/> <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setCurrentHour(java.lang.Integer)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#is24HourView()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.Integer CurrentHour
+        /// <returns><see cref="bool"/></returns>
+        public bool Is24HourView()
         {
-            get { return IExecuteWithSignature<Java.Lang.Integer>("getCurrentHour", "()Ljava/lang/Integer;"); } set { IExecuteWithSignature("setCurrentHour", "(Ljava/lang/Integer;)V", value); }
+            return IExecuteWithSignature<bool>("is24HourView", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#getCurrentMinute()"/> <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setCurrentMinute(java.lang.Integer)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#validateInput()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.Integer CurrentMinute
+        /// <returns><see cref="bool"/></returns>
+        public bool ValidateInput()
         {
-            get { return IExecuteWithSignature<Java.Lang.Integer>("getCurrentMinute", "()Ljava/lang/Integer;"); } set { IExecuteWithSignature("setCurrentMinute", "(Ljava/lang/Integer;)V", value); }
+            return IExecuteWithSignature<bool>("validateInput", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#getHour()"/> <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setHour(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#getHour()"/>
         /// </summary>
-        public int Hour
+        /// <returns><see cref="int"/></returns>
+        public int GetHour()
         {
-            get { return IExecuteWithSignature<int>("getHour", "()I"); } set { IExecuteWithSignature("setHour", "(I)V", value); }
+            return IExecuteWithSignature<int>("getHour", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#getMinute()"/> <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setMinute(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#getMinute()"/>
         /// </summary>
-        public int Minute
+        /// <returns><see cref="int"/></returns>
+        public int GetMinute()
         {
-            get { return IExecuteWithSignature<int>("getMinute", "()I"); } set { IExecuteWithSignature("setMinute", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMinute", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#is24HourView()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#getCurrentHour()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool Is24HourView()
+        /// <returns><see cref="Java.Lang.Integer"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.Integer GetCurrentHour()
         {
-            return IExecuteWithSignature<bool>("is24HourView", "()Z");
+            return IExecuteWithSignature<Java.Lang.Integer>("getCurrentHour", "()Ljava/lang/Integer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#validateInput()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#getCurrentMinute()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ValidateInput()
+        /// <returns><see cref="Java.Lang.Integer"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.Integer GetCurrentMinute()
         {
-            return IExecuteWithSignature<bool>("validateInput", "()Z");
+            return IExecuteWithSignature<Java.Lang.Integer>("getCurrentMinute", "()Ljava/lang/Integer;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setCurrentHour(java.lang.Integer)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.Integer"/></param>
+        [global::System.Obsolete()]
+        public void SetCurrentHour(Java.Lang.Integer arg0)
+        {
+            IExecuteWithSignature("setCurrentHour", "(Ljava/lang/Integer;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setCurrentMinute(java.lang.Integer)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.Integer"/></param>
+        [global::System.Obsolete()]
+        public void SetCurrentMinute(Java.Lang.Integer arg0)
+        {
+            IExecuteWithSignature("setCurrentMinute", "(Ljava/lang/Integer;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setHour(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHour(int arg0)
+        {
+            IExecuteWithSignature("setHour", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setIs24HourView(java.lang.Boolean)"/>
@@ -138,6 +168,14 @@ public void SetIs24HourView(Java.Lang.Boolean arg0)
             IExecuteWithSignature("setIs24HourView", "(Ljava/lang/Boolean;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setMinute(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinute(int arg0)
+        {
+            IExecuteWithSignature("setMinute", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/TimePicker.html#setOnTimeChangedListener(android.widget.TimePicker.OnTimeChangedListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.TimePicker.OnTimeChangedListener"/></param>
@@ -174,7 +212,7 @@ public partial class OnTimeChangedListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onTimeChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TimePicker>>>(OnTimeChangedEventHandler));
+                AddEventHandler("onTimeChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Widget.TimePicker>>>(OnTimeChangedEventHandler));
 
             }
 
@@ -182,7 +220,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/TimePicker.OnTimeChangedListener.html#onTimeChanged(android.widget.TimePicker,int,int)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnTimeChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Widget.TimePicker, int, int> OnOnTimeChanged { get; set; } = null;
+            public global::System.Action<Android.Widget.TimePicker, int, int> OnOnTimeChanged { get; set; } = null;
 
             void OnTimeChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Widget.TimePicker>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/Toast.cs b/src/net/Netdroid/Generated/Android/Widget/Toast.cs
index 9fb1476ef..25b14ef1e 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Toast.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Toast.cs
@@ -89,54 +89,61 @@ public static Android.Widget.Toast MakeText(Android.Content.Context arg0, Java.L
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getDuration()"/> <see href="https://developer.android.com/reference/android/widget/Toast.html#setDuration(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getView()"/>
         /// </summary>
-        public int Duration
+        /// <returns><see cref="Android.View.View"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View GetView()
         {
-            get { return IExecuteWithSignature<int>("getDuration", "()I"); } set { IExecuteWithSignature("setDuration", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getGravity()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getHorizontalMargin()"/>
         /// </summary>
-        public int Gravity
+        /// <returns><see cref="float"/></returns>
+        public float GetHorizontalMargin()
         {
-            get { return IExecuteWithSignature<int>("getGravity", "()I"); }
+            return IExecuteWithSignature<float>("getHorizontalMargin", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getHorizontalMargin()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getVerticalMargin()"/>
         /// </summary>
-        public float HorizontalMargin
+        /// <returns><see cref="float"/></returns>
+        public float GetVerticalMargin()
         {
-            get { return IExecuteWithSignature<float>("getHorizontalMargin", "()F"); }
+            return IExecuteWithSignature<float>("getVerticalMargin", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getVerticalMargin()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getDuration()"/>
         /// </summary>
-        public float VerticalMargin
+        /// <returns><see cref="int"/></returns>
+        public int GetDuration()
         {
-            get { return IExecuteWithSignature<float>("getVerticalMargin", "()F"); }
+            return IExecuteWithSignature<int>("getDuration", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getView()"/> <see href="https://developer.android.com/reference/android/widget/Toast.html#setView(android.view.View)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getGravity()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.View View
+        /// <returns><see cref="int"/></returns>
+        public int GetGravity()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getView", "()Landroid/view/View;"); } set { IExecuteWithSignature("setView", "(Landroid/view/View;)V", value); }
+            return IExecuteWithSignature<int>("getGravity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getXOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getXOffset()"/>
         /// </summary>
-        public int XOffset
+        /// <returns><see cref="int"/></returns>
+        public int GetXOffset()
         {
-            get { return IExecuteWithSignature<int>("getXOffset", "()I"); }
+            return IExecuteWithSignature<int>("getXOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getYOffset()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#getYOffset()"/>
         /// </summary>
-        public int YOffset
+        /// <returns><see cref="int"/></returns>
+        public int GetYOffset()
         {
-            get { return IExecuteWithSignature<int>("getYOffset", "()I"); }
+            return IExecuteWithSignature<int>("getYOffset", "()I");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Toast.html#addCallback(android.widget.Toast.Callback)"/>
@@ -162,6 +169,14 @@ public void RemoveCallback(Android.Widget.Toast.Callback arg0)
             IExecuteWithSignature("removeCallback", "(Landroid/widget/Toast$Callback;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#setDuration(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDuration(int arg0)
+        {
+            IExecuteWithSignature("setDuration", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Toast.html#setGravity(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -197,6 +212,15 @@ public void SetText(Java.Lang.CharSequence arg0)
             IExecuteWithSignature("setText", "(Ljava/lang/CharSequence;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toast.html#setView(android.view.View)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.View"/></param>
+        [global::System.Obsolete()]
+        public void SetView(Android.View.View arg0)
+        {
+            IExecuteWithSignature("setView", "(Landroid/view/View;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Toast.html#show()"/>
         /// </summary>
         public void Show()
diff --git a/src/net/Netdroid/Generated/Android/Widget/ToggleButton.cs b/src/net/Netdroid/Generated/Android/Widget/ToggleButton.cs
index 6b016a7ee..a3c2ea3e1 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ToggleButton.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ToggleButton.cs
@@ -84,25 +84,44 @@ public ToggleButton(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#getDisabledAlpha()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#getDisabledAlpha()"/>
         /// </summary>
-        public float DisabledAlpha
+        /// <returns><see cref="float"/></returns>
+        public float GetDisabledAlpha()
         {
-            get { return IExecuteWithSignature<float>("getDisabledAlpha", "()F"); }
+            return IExecuteWithSignature<float>("getDisabledAlpha", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#getTextOff()"/> <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#setTextOff(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#getTextOff()"/>
         /// </summary>
-        public Java.Lang.CharSequence TextOff
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTextOff()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTextOff", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setTextOff", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTextOff", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#getTextOn()"/> <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#setTextOn(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#getTextOn()"/>
         /// </summary>
-        public Java.Lang.CharSequence TextOn
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTextOn()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTextOn", "()Ljava/lang/CharSequence;"); } set { IExecuteWithSignature("setTextOn", "(Ljava/lang/CharSequence;)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTextOn", "()Ljava/lang/CharSequence;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#setTextOff(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetTextOff(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setTextOff", "(Ljava/lang/CharSequence;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ToggleButton.html#setTextOn(java.lang.CharSequence)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
+        public void SetTextOn(Java.Lang.CharSequence arg0)
+        {
+            IExecuteWithSignature("setTextOn", "(Ljava/lang/CharSequence;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Widget/Toolbar.cs b/src/net/Netdroid/Generated/Android/Widget/Toolbar.cs
index 4eccc2ba7..73ea88a35 100644
--- a/src/net/Netdroid/Generated/Android/Widget/Toolbar.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/Toolbar.cs
@@ -84,211 +84,236 @@ public Toolbar(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCollapseContentDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCollapseIcon()"/>
         /// </summary>
-        public Java.Lang.CharSequence CollapseContentDescription
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetCollapseIcon()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getCollapseContentDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getCollapseIcon", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCollapseIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getLogo()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable CollapseIcon
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetLogo()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getCollapseIcon", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getLogo", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getNavigationIcon()"/>
         /// </summary>
-        public int ContentInsetEnd
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetNavigationIcon()
         {
-            get { return IExecuteWithSignature<int>("getContentInsetEnd", "()I"); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getNavigationIcon", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetEndWithActions()"/> <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setContentInsetEndWithActions(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getOverflowIcon()"/>
         /// </summary>
-        public int ContentInsetEndWithActions
+        /// <returns><see cref="Android.Graphics.Drawable.Drawable"/></returns>
+        public Android.Graphics.Drawable.Drawable GetOverflowIcon()
         {
-            get { return IExecuteWithSignature<int>("getContentInsetEndWithActions", "()I"); } set { IExecuteWithSignature("setContentInsetEndWithActions", "(I)V", value); }
+            return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverflowIcon", "()Landroid/graphics/drawable/Drawable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getMenu()"/>
         /// </summary>
-        public int ContentInsetLeft
+        /// <returns><see cref="Android.View.Menu"/></returns>
+        public Android.View.Menu GetMenu()
         {
-            get { return IExecuteWithSignature<int>("getContentInsetLeft", "()I"); }
+            return IExecuteWithSignature<Android.View.Menu>("getMenu", "()Landroid/view/Menu;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#hasExpandedActionView()"/>
         /// </summary>
-        public int ContentInsetRight
+        /// <returns><see cref="bool"/></returns>
+        public bool HasExpandedActionView()
         {
-            get { return IExecuteWithSignature<int>("getContentInsetRight", "()I"); }
+            return IExecuteWithSignature<bool>("hasExpandedActionView", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#hideOverflowMenu()"/>
         /// </summary>
-        public int ContentInsetStart
+        /// <returns><see cref="bool"/></returns>
+        public bool HideOverflowMenu()
         {
-            get { return IExecuteWithSignature<int>("getContentInsetStart", "()I"); }
+            return IExecuteWithSignature<bool>("hideOverflowMenu", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetStartWithNavigation()"/> <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setContentInsetStartWithNavigation(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#isOverflowMenuShowing()"/>
         /// </summary>
-        public int ContentInsetStartWithNavigation
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOverflowMenuShowing()
         {
-            get { return IExecuteWithSignature<int>("getContentInsetStartWithNavigation", "()I"); } set { IExecuteWithSignature("setContentInsetStartWithNavigation", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isOverflowMenuShowing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCurrentContentInsetEnd()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#showOverflowMenu()"/>
         /// </summary>
-        public int CurrentContentInsetEnd
+        /// <returns><see cref="bool"/></returns>
+        public bool ShowOverflowMenu()
         {
-            get { return IExecuteWithSignature<int>("getCurrentContentInsetEnd", "()I"); }
+            return IExecuteWithSignature<bool>("showOverflowMenu", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCurrentContentInsetLeft()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetEnd()"/>
         /// </summary>
-        public int CurrentContentInsetLeft
+        /// <returns><see cref="int"/></returns>
+        public int GetContentInsetEnd()
         {
-            get { return IExecuteWithSignature<int>("getCurrentContentInsetLeft", "()I"); }
+            return IExecuteWithSignature<int>("getContentInsetEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCurrentContentInsetRight()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetEndWithActions()"/>
         /// </summary>
-        public int CurrentContentInsetRight
+        /// <returns><see cref="int"/></returns>
+        public int GetContentInsetEndWithActions()
         {
-            get { return IExecuteWithSignature<int>("getCurrentContentInsetRight", "()I"); }
+            return IExecuteWithSignature<int>("getContentInsetEndWithActions", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCurrentContentInsetStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetLeft()"/>
         /// </summary>
-        public int CurrentContentInsetStart
+        /// <returns><see cref="int"/></returns>
+        public int GetContentInsetLeft()
         {
-            get { return IExecuteWithSignature<int>("getCurrentContentInsetStart", "()I"); }
+            return IExecuteWithSignature<int>("getContentInsetLeft", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getLogo()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetRight()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable Logo
+        /// <returns><see cref="int"/></returns>
+        public int GetContentInsetRight()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getLogo", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<int>("getContentInsetRight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getLogoDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetStart()"/>
         /// </summary>
-        public Java.Lang.CharSequence LogoDescription
+        /// <returns><see cref="int"/></returns>
+        public int GetContentInsetStart()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getLogoDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getContentInsetStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getMenu()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getContentInsetStartWithNavigation()"/>
         /// </summary>
-        public Android.View.Menu Menu
+        /// <returns><see cref="int"/></returns>
+        public int GetContentInsetStartWithNavigation()
         {
-            get { return IExecuteWithSignature<Android.View.Menu>("getMenu", "()Landroid/view/Menu;"); }
+            return IExecuteWithSignature<int>("getContentInsetStartWithNavigation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getNavigationContentDescription()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCurrentContentInsetEnd()"/>
         /// </summary>
-        public Java.Lang.CharSequence NavigationContentDescription
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentContentInsetEnd()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getNavigationContentDescription", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getCurrentContentInsetEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getNavigationIcon()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCurrentContentInsetLeft()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable NavigationIcon
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentContentInsetLeft()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getNavigationIcon", "()Landroid/graphics/drawable/Drawable;"); }
+            return IExecuteWithSignature<int>("getCurrentContentInsetLeft", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getOverflowIcon()"/> <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setOverflowIcon(android.graphics.drawable.Drawable)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCurrentContentInsetRight()"/>
         /// </summary>
-        public Android.Graphics.Drawable.Drawable OverflowIcon
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentContentInsetRight()
         {
-            get { return IExecuteWithSignature<Android.Graphics.Drawable.Drawable>("getOverflowIcon", "()Landroid/graphics/drawable/Drawable;"); } set { IExecuteWithSignature("setOverflowIcon", "(Landroid/graphics/drawable/Drawable;)V", value); }
+            return IExecuteWithSignature<int>("getCurrentContentInsetRight", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getPopupTheme()"/> <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setPopupTheme(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCurrentContentInsetStart()"/>
         /// </summary>
-        public int PopupTheme
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentContentInsetStart()
         {
-            get { return IExecuteWithSignature<int>("getPopupTheme", "()I"); } set { IExecuteWithSignature("setPopupTheme", "(I)V", value); }
+            return IExecuteWithSignature<int>("getCurrentContentInsetStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getSubtitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getPopupTheme()"/>
         /// </summary>
-        public Java.Lang.CharSequence Subtitle
+        /// <returns><see cref="int"/></returns>
+        public int GetPopupTheme()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getPopupTheme", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitle()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitleMarginBottom()"/>
         /// </summary>
-        public Java.Lang.CharSequence Title
+        /// <returns><see cref="int"/></returns>
+        public int GetTitleMarginBottom()
         {
-            get { return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;"); }
+            return IExecuteWithSignature<int>("getTitleMarginBottom", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitleMarginBottom()"/> <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleMarginBottom(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitleMarginEnd()"/>
         /// </summary>
-        public int TitleMarginBottom
+        /// <returns><see cref="int"/></returns>
+        public int GetTitleMarginEnd()
         {
-            get { return IExecuteWithSignature<int>("getTitleMarginBottom", "()I"); } set { IExecuteWithSignature("setTitleMarginBottom", "(I)V", value); }
+            return IExecuteWithSignature<int>("getTitleMarginEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitleMarginEnd()"/> <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleMarginEnd(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitleMarginStart()"/>
         /// </summary>
-        public int TitleMarginEnd
+        /// <returns><see cref="int"/></returns>
+        public int GetTitleMarginStart()
         {
-            get { return IExecuteWithSignature<int>("getTitleMarginEnd", "()I"); } set { IExecuteWithSignature("setTitleMarginEnd", "(I)V", value); }
+            return IExecuteWithSignature<int>("getTitleMarginStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitleMarginStart()"/> <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleMarginStart(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitleMarginTop()"/>
         /// </summary>
-        public int TitleMarginStart
+        /// <returns><see cref="int"/></returns>
+        public int GetTitleMarginTop()
         {
-            get { return IExecuteWithSignature<int>("getTitleMarginStart", "()I"); } set { IExecuteWithSignature("setTitleMarginStart", "(I)V", value); }
+            return IExecuteWithSignature<int>("getTitleMarginTop", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitleMarginTop()"/> <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleMarginTop(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getCollapseContentDescription()"/>
         /// </summary>
-        public int TitleMarginTop
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetCollapseContentDescription()
         {
-            get { return IExecuteWithSignature<int>("getTitleMarginTop", "()I"); } set { IExecuteWithSignature("setTitleMarginTop", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getCollapseContentDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#hasExpandedActionView()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getLogoDescription()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasExpandedActionView()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetLogoDescription()
         {
-            return IExecuteWithSignature<bool>("hasExpandedActionView", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getLogoDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#hideOverflowMenu()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getNavigationContentDescription()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HideOverflowMenu()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetNavigationContentDescription()
         {
-            return IExecuteWithSignature<bool>("hideOverflowMenu", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getNavigationContentDescription", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#isOverflowMenuShowing()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getSubtitle()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOverflowMenuShowing()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetSubtitle()
         {
-            return IExecuteWithSignature<bool>("isOverflowMenuShowing", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getSubtitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#showOverflowMenu()"/>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#getTitle()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool ShowOverflowMenu()
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public Java.Lang.CharSequence GetTitle()
         {
-            return IExecuteWithSignature<bool>("showOverflowMenu", "()Z");
+            return IExecuteWithSignature<Java.Lang.CharSequence>("getTitle", "()Ljava/lang/CharSequence;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#collapseActionView()"/>
@@ -345,6 +370,14 @@ public void SetCollapseIcon(int arg0)
             IExecuteWithSignature("setCollapseIcon", "(I)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setContentInsetEndWithActions(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetContentInsetEndWithActions(int arg0)
+        {
+            IExecuteWithSignature("setContentInsetEndWithActions", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setContentInsetsAbsolute(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -363,6 +396,14 @@ public void SetContentInsetsRelative(int arg0, int arg1)
             IExecute("setContentInsetsRelative", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setContentInsetStartWithNavigation(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetContentInsetStartWithNavigation(int arg0)
+        {
+            IExecuteWithSignature("setContentInsetStartWithNavigation", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setLogo(android.graphics.drawable.Drawable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
@@ -443,6 +484,22 @@ public void SetOnMenuItemClickListener(Android.Widget.Toolbar.OnMenuItemClickLis
             IExecuteWithSignature("setOnMenuItemClickListener", "(Landroid/widget/Toolbar$OnMenuItemClickListener;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setOverflowIcon(android.graphics.drawable.Drawable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.Graphics.Drawable.Drawable"/></param>
+        public void SetOverflowIcon(Android.Graphics.Drawable.Drawable arg0)
+        {
+            IExecuteWithSignature("setOverflowIcon", "(Landroid/graphics/drawable/Drawable;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setPopupTheme(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPopupTheme(int arg0)
+        {
+            IExecuteWithSignature("setPopupTheme", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setSubtitle(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -503,6 +560,38 @@ public void SetTitleMargin(int arg0, int arg1, int arg2, int arg3)
             IExecute("setTitleMargin", arg0, arg1, arg2, arg3);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleMarginBottom(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTitleMarginBottom(int arg0)
+        {
+            IExecuteWithSignature("setTitleMarginBottom", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleMarginEnd(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTitleMarginEnd(int arg0)
+        {
+            IExecuteWithSignature("setTitleMarginEnd", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleMarginStart(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTitleMarginStart(int arg0)
+        {
+            IExecuteWithSignature("setTitleMarginStart", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleMarginTop(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTitleMarginTop(int arg0)
+        {
+            IExecuteWithSignature("setTitleMarginTop", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Toolbar.html#setTitleTextAppearance(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -647,7 +736,7 @@ public partial class OnMenuItemClickListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onMenuItemClick", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemClickEventHandler));
+                AddEventHandler("onMenuItemClick", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.View.MenuItem>>>(OnMenuItemClickEventHandler));
 
             }
 
@@ -655,7 +744,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/Toolbar.OnMenuItemClickListener.html#onMenuItemClick(android.view.MenuItem)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnMenuItemClick"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Func<Android.View.MenuItem, bool> OnOnMenuItemClick { get; set; } = null;
+            public global::System.Func<Android.View.MenuItem, bool> OnOnMenuItemClick { get; set; } = null;
 
             void OnMenuItemClickEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.View.MenuItem>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Widget/TwoLineListItem.cs b/src/net/Netdroid/Generated/Android/Widget/TwoLineListItem.cs
index 4a306e682..6f0fbc48a 100644
--- a/src/net/Netdroid/Generated/Android/Widget/TwoLineListItem.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/TwoLineListItem.cs
@@ -36,7 +36,7 @@ public partial class TwoLineListItem
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TwoLineListItem(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public TwoLineListItem(Android.Content.Context arg0, Android.Util.AttributeSet a
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TwoLineListItem(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public TwoLineListItem(Android.Content.Context arg0, Android.Util.AttributeSet a
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TwoLineListItem(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public TwoLineListItem(Android.Content.Context arg0, Android.Util.AttributeSet a
         /// <see href="https://developer.android.com/reference/android/widget/TwoLineListItem.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public TwoLineListItem(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -88,20 +88,22 @@ public TwoLineListItem(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TwoLineListItem.html#getText1()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TwoLineListItem.html#getText1()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.TextView Text1
+        /// <returns><see cref="Android.Widget.TextView"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.TextView GetText1()
         {
-            get { return IExecuteWithSignature<Android.Widget.TextView>("getText1", "()Landroid/widget/TextView;"); }
+            return IExecuteWithSignature<Android.Widget.TextView>("getText1", "()Landroid/widget/TextView;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/TwoLineListItem.html#getText2()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/TwoLineListItem.html#getText2()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.Widget.TextView Text2
+        /// <returns><see cref="Android.Widget.TextView"/></returns>
+        [global::System.Obsolete()]
+        public Android.Widget.TextView GetText2()
         {
-            get { return IExecuteWithSignature<Android.Widget.TextView>("getText2", "()Landroid/widget/TextView;"); }
+            return IExecuteWithSignature<Android.Widget.TextView>("getText2", "()Landroid/widget/TextView;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Widget/VideoView.cs b/src/net/Netdroid/Generated/Android/Widget/VideoView.cs
index 5a1275b56..13da95e85 100644
--- a/src/net/Netdroid/Generated/Android/Widget/VideoView.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/VideoView.cs
@@ -84,34 +84,6 @@ public VideoView(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#getAudioSessionId()"/> 
-        /// </summary>
-        public int AudioSessionId
-        {
-            get { return IExecuteWithSignature<int>("getAudioSessionId", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#getBufferPercentage()"/> 
-        /// </summary>
-        public int BufferPercentage
-        {
-            get { return IExecuteWithSignature<int>("getBufferPercentage", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#getCurrentPosition()"/> 
-        /// </summary>
-        public int CurrentPosition
-        {
-            get { return IExecuteWithSignature<int>("getCurrentPosition", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#getDuration()"/> 
-        /// </summary>
-        public int Duration
-        {
-            get { return IExecuteWithSignature<int>("getDuration", "()I"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#canPause()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -144,6 +116,38 @@ public bool IsPlaying()
             return IExecuteWithSignature<bool>("isPlaying", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#getAudioSessionId()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAudioSessionId()
+        {
+            return IExecuteWithSignature<int>("getAudioSessionId", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#getBufferPercentage()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBufferPercentage()
+        {
+            return IExecuteWithSignature<int>("getBufferPercentage", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#getCurrentPosition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetCurrentPosition()
+        {
+            return IExecuteWithSignature<int>("getCurrentPosition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#getDuration()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDuration()
+        {
+            return IExecuteWithSignature<int>("getDuration", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/VideoView.html#resolveAdjustedSize(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Android/Widget/ViewAnimator.cs b/src/net/Netdroid/Generated/Android/Widget/ViewAnimator.cs
index 9d1ce61aa..9e066ec95 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ViewAnimator.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ViewAnimator.cs
@@ -63,39 +63,60 @@ public ViewAnimator(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getAnimateFirstView()"/> <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setAnimateFirstView(boolean)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getInAnimation()"/>
         /// </summary>
-        public bool AnimateFirstView
+        /// <returns><see cref="Android.View.Animation.Animation"/></returns>
+        public Android.View.Animation.Animation GetInAnimation()
         {
-            get { return IExecuteWithSignature<bool>("getAnimateFirstView", "()Z"); } set { IExecuteWithSignature("setAnimateFirstView", "(Z)V", value); }
+            return IExecuteWithSignature<Android.View.Animation.Animation>("getInAnimation", "()Landroid/view/animation/Animation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getCurrentView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getOutAnimation()"/>
         /// </summary>
-        public Android.View.View CurrentView
+        /// <returns><see cref="Android.View.Animation.Animation"/></returns>
+        public Android.View.Animation.Animation GetOutAnimation()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getCurrentView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.View.Animation.Animation>("getOutAnimation", "()Landroid/view/animation/Animation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getDisplayedChild()"/> <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setDisplayedChild(int)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getCurrentView()"/>
         /// </summary>
-        public int DisplayedChild
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetCurrentView()
         {
-            get { return IExecuteWithSignature<int>("getDisplayedChild", "()I"); } set { IExecuteWithSignature("setDisplayedChild", "(I)V", value); }
+            return IExecuteWithSignature<Android.View.View>("getCurrentView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getInAnimation()"/> <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setInAnimation(android.view.animation.Animation)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getAnimateFirstView()"/>
         /// </summary>
-        public Android.View.Animation.Animation InAnimation
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAnimateFirstView()
         {
-            get { return IExecuteWithSignature<Android.View.Animation.Animation>("getInAnimation", "()Landroid/view/animation/Animation;"); } set { IExecuteWithSignature("setInAnimation", "(Landroid/view/animation/Animation;)V", value); }
+            return IExecuteWithSignature<bool>("getAnimateFirstView", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getOutAnimation()"/> <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setOutAnimation(android.view.animation.Animation)"/>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#getDisplayedChild()"/>
         /// </summary>
-        public Android.View.Animation.Animation OutAnimation
+        /// <returns><see cref="int"/></returns>
+        public int GetDisplayedChild()
         {
-            get { return IExecuteWithSignature<Android.View.Animation.Animation>("getOutAnimation", "()Landroid/view/animation/Animation;"); } set { IExecuteWithSignature("setOutAnimation", "(Landroid/view/animation/Animation;)V", value); }
+            return IExecuteWithSignature<int>("getDisplayedChild", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setAnimateFirstView(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAnimateFirstView(bool arg0)
+        {
+            IExecuteWithSignature("setAnimateFirstView", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setDisplayedChild(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDisplayedChild(int arg0)
+        {
+            IExecuteWithSignature("setDisplayedChild", "(I)V", arg0);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setInAnimation(android.content.Context,int)"/>
@@ -107,6 +128,14 @@ public void SetInAnimation(Android.Content.Context arg0, int arg1)
             IExecute("setInAnimation", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setInAnimation(android.view.animation.Animation)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.Animation"/></param>
+        public void SetInAnimation(Android.View.Animation.Animation arg0)
+        {
+            IExecuteWithSignature("setInAnimation", "(Landroid/view/animation/Animation;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setOutAnimation(android.content.Context,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
@@ -116,6 +145,14 @@ public void SetOutAnimation(Android.Content.Context arg0, int arg1)
             IExecute("setOutAnimation", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#setOutAnimation(android.view.animation.Animation)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Android.View.Animation.Animation"/></param>
+        public void SetOutAnimation(Android.View.Animation.Animation arg0)
+        {
+            IExecuteWithSignature("setOutAnimation", "(Landroid/view/animation/Animation;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ViewAnimator.html#showNext()"/>
         /// </summary>
         public void ShowNext()
diff --git a/src/net/Netdroid/Generated/Android/Widget/ViewFlipper.cs b/src/net/Netdroid/Generated/Android/Widget/ViewFlipper.cs
index ad7587586..4dc1e0e8a 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ViewFlipper.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ViewFlipper.cs
@@ -63,13 +63,6 @@ public ViewFlipper(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ViewFlipper.html#getFlipInterval()"/> <see href="https://developer.android.com/reference/android/widget/ViewFlipper.html#setFlipInterval(int)"/>
-        /// </summary>
-        public int FlipInterval
-        {
-            get { return IExecuteWithSignature<int>("getFlipInterval", "()I"); } set { IExecuteWithSignature("setFlipInterval", "(I)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ViewFlipper.html#isAutoStart()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -86,6 +79,14 @@ public bool IsFlipping()
             return IExecuteWithSignature<bool>("isFlipping", "()Z");
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewFlipper.html#getFlipInterval()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFlipInterval()
+        {
+            return IExecuteWithSignature<int>("getFlipInterval", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ViewFlipper.html#setAutoStart(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
@@ -94,6 +95,14 @@ public void SetAutoStart(bool arg0)
             IExecuteWithSignature("setAutoStart", "(Z)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/ViewFlipper.html#setFlipInterval(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFlipInterval(int arg0)
+        {
+            IExecuteWithSignature("setFlipInterval", "(I)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ViewFlipper.html#startFlipping()"/>
         /// </summary>
         public void StartFlipping()
diff --git a/src/net/Netdroid/Generated/Android/Widget/ViewSwitcher.cs b/src/net/Netdroid/Generated/Android/Widget/ViewSwitcher.cs
index 3f638d30b..1050c006a 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ViewSwitcher.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ViewSwitcher.cs
@@ -63,11 +63,12 @@ public ViewSwitcher(Android.Content.Context arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ViewSwitcher.html#getNextView()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ViewSwitcher.html#getNextView()"/>
         /// </summary>
-        public Android.View.View NextView
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetNextView()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getNextView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.View.View>("getNextView", "()Landroid/view/View;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ViewSwitcher.html#reset()"/>
diff --git a/src/net/Netdroid/Generated/Android/Widget/WrapperListAdapter.cs b/src/net/Netdroid/Generated/Android/Widget/WrapperListAdapter.cs
index d587a19cc..5d5f71c3b 100644
--- a/src/net/Netdroid/Generated/Android/Widget/WrapperListAdapter.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/WrapperListAdapter.cs
@@ -68,20 +68,20 @@ public partial class WrapperListAdapter : Android.Widget.IWrapperListAdapter
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getView", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
-            AddEventHandler("getWrappedAdapter", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetWrappedAdapterEventHandler));
-            AddEventHandler("hasStableIds", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
-            AddEventHandler("isEmpty", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
-            AddEventHandler("areAllItemsEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
-            AddEventHandler("isEnabled", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
-            AddEventHandler("getCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
-            AddEventHandler("getItemViewType", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
-            AddEventHandler("getViewTypeCount", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
-            AddEventHandler("getItem", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
-            AddEventHandler("getItemId", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
-            AddEventHandler("registerDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
-            AddEventHandler("unregisterDataSetObserver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
-            AddEventHandler("getAutofillOptions", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
+            AddEventHandler("getView", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetViewEventHandler));
+            AddEventHandler("getWrappedAdapter", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetWrappedAdapterEventHandler));
+            AddEventHandler("hasStableIds", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(HasStableIdsEventHandler));
+            AddEventHandler("isEmpty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(IsEmptyEventHandler));
+            AddEventHandler("areAllItemsEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(AreAllItemsEnabledEventHandler));
+            AddEventHandler("isEnabled", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(IsEnabledEventHandler));
+            AddEventHandler("getCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetCountEventHandler));
+            AddEventHandler("getItemViewType", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemViewTypeEventHandler));
+            AddEventHandler("getViewTypeCount", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetViewTypeCountEventHandler));
+            AddEventHandler("getItem", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemEventHandler));
+            AddEventHandler("getItemId", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(GetItemIdEventHandler));
+            AddEventHandler("registerDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(RegisterDataSetObserverEventHandler));
+            AddEventHandler("unregisterDataSetObserver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>>>(UnregisterDataSetObserverEventHandler));
+            AddEventHandler("getAutofillOptions", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAutofillOptionsEventHandler));
 
         }
 
@@ -89,7 +89,7 @@ protected virtual void InitializeHandlers()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetView"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
+        public global::System.Func<int, Android.View.View, Android.View.ViewGroup, Android.View.View> OnGetView { get; set; } = null;
 
         void GetViewEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -114,7 +114,7 @@ public virtual Android.View.View GetView(int arg0, Android.View.View arg1, Andro
         /// Handler for <see href="https://developer.android.com/reference/android/widget/WrapperListAdapter.html#getWrappedAdapter()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetWrappedAdapter"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Android.Widget.ListAdapter> OnGetWrappedAdapter { get; set; } = null;
+        public global::System.Func<Android.Widget.ListAdapter> OnGetWrappedAdapter { get; set; } = null;
 
         void GetWrappedAdapterEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -136,7 +136,7 @@ public virtual Android.Widget.ListAdapter GetWrappedAdapter()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#hasStableIds()"/>
         /// </summary>
         /// <remarks>If <see cref="OnHasStableIds"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnHasStableIds { get; set; } = null;
+        public global::System.Func<bool> OnHasStableIds { get; set; } = null;
 
         void HasStableIdsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -158,7 +158,7 @@ public virtual bool HasStableIds()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#isEmpty()"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEmpty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnIsEmpty { get; set; } = null;
+        public global::System.Func<bool> OnIsEmpty { get; set; } = null;
 
         void IsEmptyEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -180,7 +180,7 @@ public virtual bool IsEmpty()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ListAdapter.html#areAllItemsEnabled()"/>
         /// </summary>
         /// <remarks>If <see cref="OnAreAllItemsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
+        public global::System.Func<bool> OnAreAllItemsEnabled { get; set; } = null;
 
         void AreAllItemsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -202,7 +202,7 @@ public virtual bool AreAllItemsEnabled()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/ListAdapter.html#isEnabled(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnIsEnabled"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnIsEnabled { get; set; } = null;
+        public global::System.Func<int, bool> OnIsEnabled { get; set; } = null;
 
         void IsEnabledEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -225,7 +225,7 @@ public virtual bool IsEnabled(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetCount { get; set; } = null;
+        public global::System.Func<int> OnGetCount { get; set; } = null;
 
         void GetCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -247,7 +247,7 @@ public virtual int GetCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemViewType"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnGetItemViewType { get; set; } = null;
+        public global::System.Func<int, int> OnGetItemViewType { get; set; } = null;
 
         void GetItemViewTypeEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -270,7 +270,7 @@ public virtual int GetItemViewType(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetViewTypeCount"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetViewTypeCount { get; set; } = null;
+        public global::System.Func<int> OnGetViewTypeCount { get; set; } = null;
 
         void GetViewTypeCountEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -292,7 +292,7 @@ public virtual int GetViewTypeCount()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItem"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnGetItem { get; set; } = null;
+        public global::System.Func<int, object> OnGetItem { get; set; } = null;
 
         void GetItemEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -315,7 +315,7 @@ public virtual object GetItem(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemId(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetItemId"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnGetItemId { get; set; } = null;
+        public global::System.Func<int, long> OnGetItemId { get; set; } = null;
 
         void GetItemIdEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -338,7 +338,7 @@ public virtual long GetItemId(int arg0)
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#registerDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRegisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnRegisterDataSetObserver { get; set; } = null;
 
         void RegisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -359,7 +359,7 @@ public virtual void RegisterDataSetObserver(Android.Database.DataSetObserver arg
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#unregisterDataSetObserver(android.database.DataSetObserver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnUnregisterDataSetObserver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
+        public global::System.Action<Android.Database.DataSetObserver> OnUnregisterDataSetObserver { get; set; } = null;
 
         void UnregisterDataSetObserverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Database.DataSetObserver>> data)
         {
@@ -389,7 +389,7 @@ public Java.Lang.CharSequence[] GetAutofillOptionsDefault()
         /// Handler for <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAutofillOptions"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
+        public global::System.Func<Java.Lang.CharSequence[]> OnGetAutofillOptions { get; set; } = null;
 
         void GetAutofillOptionsEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -439,34 +439,6 @@ public partial class WrapperListAdapterDirect : Android.Widget.IWrapperListAdapt
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/> 
-        /// </summary>
-        public Java.Lang.CharSequence[] AutofillOptions
-        {
-            get { return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/> 
-        /// </summary>
-        public int Count
-        {
-            get { return IExecute<int>("getCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/> 
-        /// </summary>
-        public int ViewTypeCount
-        {
-            get { return IExecute<int>("getViewTypeCount"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/WrapperListAdapter.html#getWrappedAdapter()"/> 
-        /// </summary>
-        public Android.Widget.ListAdapter WrappedAdapter
-        {
-            get { return IExecuteWithSignature<Android.Widget.ListAdapter>("getWrappedAdapter", "()Landroid/widget/ListAdapter;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getView(int,android.view.View,android.view.ViewGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -478,6 +450,14 @@ public override Android.View.View GetView(int arg0, Android.View.View arg1, Andr
             return IExecute<Android.View.View>("getView", arg0, arg1, arg2);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/WrapperListAdapter.html#getWrappedAdapter()"/>
+        /// </summary>
+        /// <returns><see cref="Android.Widget.ListAdapter"/></returns>
+        public override Android.Widget.ListAdapter GetWrappedAdapter()
+        {
+            return IExecuteWithSignature<Android.Widget.ListAdapterDirect, Android.Widget.ListAdapter>("getWrappedAdapter", "()Landroid/widget/ListAdapter;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#hasStableIds()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
@@ -511,6 +491,14 @@ public override bool IsEnabled(int arg0)
             return IExecute<bool>("isEnabled", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetCount()
+        {
+            return IExecute<int>("getCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItemViewType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -520,6 +508,14 @@ public override int GetItemViewType(int arg0)
             return IExecute<int>("getItemViewType", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getViewTypeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public override int GetViewTypeCount()
+        {
+            return IExecute<int>("getViewTypeCount");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getItem(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -553,6 +549,14 @@ public override void UnregisterDataSetObserver(Android.Database.DataSetObserver
         {
             IExecute("unregisterDataSetObserver", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/android/widget/Adapter.html#getAutofillOptions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.CharSequence"/></returns>
+        public override Java.Lang.CharSequence[] GetAutofillOptions()
+        {
+            return IExecuteArray<Java.Lang.CharSequence>("getAutofillOptions");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Android/Widget/ZoomButton.cs b/src/net/Netdroid/Generated/Android/Widget/ZoomButton.cs
index 2c455b51f..f32ed8d8a 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ZoomButton.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ZoomButton.cs
@@ -36,7 +36,7 @@ public partial class ZoomButton
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ZoomButton(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
@@ -47,7 +47,7 @@ public ZoomButton(Android.Content.Context arg0, Android.Util.AttributeSet arg1,
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ZoomButton(Android.Content.Context arg0, Android.Util.AttributeSet arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
@@ -57,7 +57,7 @@ public ZoomButton(Android.Content.Context arg0, Android.Util.AttributeSet arg1,
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ZoomButton(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -66,7 +66,7 @@ public ZoomButton(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButton.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ZoomButton(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -92,7 +92,7 @@ public ZoomButton(Android.Content.Context arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool OnLongClick(Android.View.View arg0)
         {
             return IExecuteWithSignature<bool>("onLongClick", "(Landroid/view/View;)Z", arg0);
@@ -101,7 +101,7 @@ public bool OnLongClick(Android.View.View arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButton.html#setZoomSpeed(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetZoomSpeed(long arg0)
         {
             IExecuteWithSignature("setZoomSpeed", "(J)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Widget/ZoomButtonsController.cs b/src/net/Netdroid/Generated/Android/Widget/ZoomButtonsController.cs
index 12e5991b0..b9e3c62ad 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ZoomButtonsController.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ZoomButtonsController.cs
@@ -33,7 +33,7 @@ public partial class ZoomButtonsController
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#%3Cinit%3E(android.view.View)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ZoomButtonsController(Android.View.View arg0)
             : base(arg0)
         {
@@ -55,26 +55,28 @@ public ZoomButtonsController(Android.View.View arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#getContainer()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#getZoomControls()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.ViewGroup Container
+        /// <returns><see cref="Android.View.View"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.View GetZoomControls()
         {
-            get { return IExecuteWithSignature<Android.View.ViewGroup>("getContainer", "()Landroid/view/ViewGroup;"); }
+            return IExecuteWithSignature<Android.View.View>("getZoomControls", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#getZoomControls()"/> 
+        /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#getContainer()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Android.View.View ZoomControls
+        /// <returns><see cref="Android.View.ViewGroup"/></returns>
+        [global::System.Obsolete()]
+        public Android.View.ViewGroup GetContainer()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getZoomControls", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Android.View.ViewGroup>("getContainer", "()Landroid/view/ViewGroup;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#isAutoDismissed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAutoDismissed()
         {
             return IExecuteWithSignature<bool>("isAutoDismissed", "()Z");
@@ -83,7 +85,7 @@ public bool IsAutoDismissed()
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#isVisible()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsVisible()
         {
             return IExecuteWithSignature<bool>("isVisible", "()Z");
@@ -102,7 +104,7 @@ public bool OnTouch(Android.View.View arg0, Android.View.MotionEvent arg1)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#setAutoDismissed(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetAutoDismissed(bool arg0)
         {
             IExecuteWithSignature("setAutoDismissed", "(Z)V", arg0);
@@ -111,7 +113,7 @@ public void SetAutoDismissed(bool arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#setFocusable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetFocusable(bool arg0)
         {
             IExecuteWithSignature("setFocusable", "(Z)V", arg0);
@@ -120,7 +122,7 @@ public void SetFocusable(bool arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#setOnZoomListener(android.widget.ZoomButtonsController.OnZoomListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Widget.ZoomButtonsController.OnZoomListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnZoomListener(Android.Widget.ZoomButtonsController.OnZoomListener arg0)
         {
             IExecuteWithSignature("setOnZoomListener", "(Landroid/widget/ZoomButtonsController$OnZoomListener;)V", arg0);
@@ -129,7 +131,7 @@ public void SetOnZoomListener(Android.Widget.ZoomButtonsController.OnZoomListene
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#setVisible(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetVisible(bool arg0)
         {
             IExecuteWithSignature("setVisible", "(Z)V", arg0);
@@ -138,7 +140,7 @@ public void SetVisible(bool arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#setZoomInEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetZoomInEnabled(bool arg0)
         {
             IExecuteWithSignature("setZoomInEnabled", "(Z)V", arg0);
@@ -147,7 +149,7 @@ public void SetZoomInEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#setZoomOutEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetZoomOutEnabled(bool arg0)
         {
             IExecuteWithSignature("setZoomOutEnabled", "(Z)V", arg0);
@@ -156,7 +158,7 @@ public void SetZoomOutEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.html#setZoomSpeed(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetZoomSpeed(long arg0)
         {
             IExecuteWithSignature("setZoomSpeed", "(J)V", arg0);
@@ -190,8 +192,8 @@ public partial class OnZoomListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onVisibilityChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnVisibilityChangedEventHandler));
-                AddEventHandler("onZoom", new System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnZoomEventHandler));
+                AddEventHandler("onVisibilityChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnVisibilityChangedEventHandler));
+                AddEventHandler("onZoom", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<bool>>>(OnZoomEventHandler));
 
             }
 
@@ -199,7 +201,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.OnZoomListener.html#onVisibilityChanged(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnVisibilityChanged"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnVisibilityChanged { get; set; } = null;
+            public global::System.Action<bool> OnOnVisibilityChanged { get; set; } = null;
 
             void OnVisibilityChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -211,7 +213,7 @@ void OnVisibilityChangedEventHandler(object sender, CLRListenerEventArgs<CLREven
             /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.OnZoomListener.html#onVisibilityChanged(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnVisibilityChanged(bool arg0)
             {
                 
@@ -221,7 +223,7 @@ public virtual void OnVisibilityChanged(bool arg0)
             /// Handler for <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.OnZoomListener.html#onZoom(boolean)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnZoom"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<bool> OnOnZoom { get; set; } = null;
+            public global::System.Action<bool> OnOnZoom { get; set; } = null;
 
             void OnZoomEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>> data)
             {
@@ -233,7 +235,7 @@ void OnZoomEventHandler(object sender, CLRListenerEventArgs<CLREventData<bool>>
             /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.OnZoomListener.html#onZoom(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public virtual void OnZoom(bool arg0)
             {
                 
@@ -273,7 +275,7 @@ public partial class OnZoomListenerDirect
             /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.OnZoomListener.html#onVisibilityChanged(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnVisibilityChanged(bool arg0)
             {
                 IExecuteWithSignature("onVisibilityChanged", "(Z)V", arg0);
@@ -282,7 +284,7 @@ public override void OnVisibilityChanged(bool arg0)
             /// <see href="https://developer.android.com/reference/android/widget/ZoomButtonsController.OnZoomListener.html#onZoom(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public override void OnZoom(bool arg0)
             {
                 IExecuteWithSignature("onZoom", "(Z)V", arg0);
diff --git a/src/net/Netdroid/Generated/Android/Widget/ZoomControls.cs b/src/net/Netdroid/Generated/Android/Widget/ZoomControls.cs
index 3801e4312..6f612ad49 100644
--- a/src/net/Netdroid/Generated/Android/Widget/ZoomControls.cs
+++ b/src/net/Netdroid/Generated/Android/Widget/ZoomControls.cs
@@ -34,7 +34,7 @@ public partial class ZoomControls
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
         /// <param name="arg1"><see cref="Android.Util.AttributeSet"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ZoomControls(Android.Content.Context arg0, Android.Util.AttributeSet arg1)
             : base(arg0, arg1)
         {
@@ -43,7 +43,7 @@ public ZoomControls(Android.Content.Context arg0, Android.Util.AttributeSet arg1
         /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html#%3Cinit%3E(android.content.Context)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.Content.Context"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public ZoomControls(Android.Content.Context arg0)
             : base(arg0)
         {
@@ -67,7 +67,7 @@ public ZoomControls(Android.Content.Context arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html#hide()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Hide()
         {
             IExecuteWithSignature("hide", "()V");
@@ -76,7 +76,7 @@ public void Hide()
         /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html#setIsZoomInEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIsZoomInEnabled(bool arg0)
         {
             IExecuteWithSignature("setIsZoomInEnabled", "(Z)V", arg0);
@@ -85,7 +85,7 @@ public void SetIsZoomInEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html#setIsZoomOutEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetIsZoomOutEnabled(bool arg0)
         {
             IExecuteWithSignature("setIsZoomOutEnabled", "(Z)V", arg0);
@@ -94,7 +94,7 @@ public void SetIsZoomOutEnabled(bool arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html#setOnZoomInClickListener(android.view.View.OnClickListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View.OnClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnZoomInClickListener(Android.View.View.OnClickListener arg0)
         {
             IExecuteWithSignature("setOnZoomInClickListener", "(Landroid/view/View$OnClickListener;)V", arg0);
@@ -103,7 +103,7 @@ public void SetOnZoomInClickListener(Android.View.View.OnClickListener arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html#setOnZoomOutClickListener(android.view.View.OnClickListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Android.View.View.OnClickListener"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetOnZoomOutClickListener(Android.View.View.OnClickListener arg0)
         {
             IExecuteWithSignature("setOnZoomOutClickListener", "(Landroid/view/View$OnClickListener;)V", arg0);
@@ -112,7 +112,7 @@ public void SetOnZoomOutClickListener(Android.View.View.OnClickListener arg0)
         /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html#setZoomSpeed(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetZoomSpeed(long arg0)
         {
             IExecuteWithSignature("setZoomSpeed", "(J)V", arg0);
@@ -120,7 +120,7 @@ public void SetZoomSpeed(long arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/widget/ZoomControls.html#show()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Show()
         {
             IExecuteWithSignature("show", "()V");
diff --git a/src/net/Netdroid/Generated/Android/Window/AllPackageClasses.cs b/src/net/Netdroid/Generated/Android/Window/AllPackageClasses.cs
index dea75a56d..e7b42246c 100644
--- a/src/net/Netdroid/Generated/Android/Window/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Android/Window/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class OnBackAnimationCallback : Android.Window.OnBackInvokedCallb
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OnBackAnimationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OnBackAnimationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OnBackAnimationCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OnBackAnimationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OnBackAnimationCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OnBackAnimationCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -126,12 +126,12 @@ public partial class OnBackInvokedCallback : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OnBackInvokedCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OnBackInvokedCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OnBackInvokedCallback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OnBackInvokedCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OnBackInvokedCallback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OnBackInvokedCallback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -172,12 +172,12 @@ public partial class OnBackInvokedDispatcher : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OnBackInvokedDispatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OnBackInvokedDispatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OnBackInvokedDispatcher() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OnBackInvokedDispatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OnBackInvokedDispatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OnBackInvokedDispatcher(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -218,12 +218,12 @@ public partial class SplashScreen : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Spla
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SplashScreen class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SplashScreen class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SplashScreen() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SplashScreen class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SplashScreen class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SplashScreen(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -261,10 +261,13 @@ public partial class OnExitAnimationListener : MASES.JCOBridge.C2JBridge.JVMBrid
             /// </summary>
             public OnExitAnimationListener() { InitializeHandlers(); }
 
+            const string _bridgeClassName = "org.mases.netdroid.generated.android.window.SplashScreen_OnExitAnimationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+            
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "org.mases.netdroid.generated.android.window.OnExitAnimationListener";
+            public override string BridgeClassName => _bridgeClassName;
 
         
             // TODO: complete the class
@@ -286,10 +289,13 @@ public partial class OnExitAnimationListenerDirect : OnExitAnimationListener
             /// <inheritdoc />
             protected override void InitializeHandlers() { }
 
+            const string _bridgeClassName = "android.window.SplashScreen$OnExitAnimationListener";
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
             /// </summary>
-            public override string BridgeClassName => "android.window.SplashScreen$OnExitAnimationListener";
+            public override string BridgeClassName => _bridgeClassName;
             /// <summary>
             /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
             /// </summary>
diff --git a/src/net/Netdroid/Generated/Android/Window/BackEvent.cs b/src/net/Netdroid/Generated/Android/Window/BackEvent.cs
index 93c3a9d66..9421ea2e6 100644
--- a/src/net/Netdroid/Generated/Android/Window/BackEvent.cs
+++ b/src/net/Netdroid/Generated/Android/Window/BackEvent.cs
@@ -69,32 +69,36 @@ public BackEvent(float arg0, float arg1, float arg2, int arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/window/BackEvent.html#getProgress()"/> 
+        /// <see href="https://developer.android.com/reference/android/window/BackEvent.html#getProgress()"/>
         /// </summary>
-        public float Progress
+        /// <returns><see cref="float"/></returns>
+        public float GetProgress()
         {
-            get { return IExecuteWithSignature<float>("getProgress", "()F"); }
+            return IExecuteWithSignature<float>("getProgress", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/window/BackEvent.html#getSwipeEdge()"/> 
+        /// <see href="https://developer.android.com/reference/android/window/BackEvent.html#getTouchX()"/>
         /// </summary>
-        public int SwipeEdge
+        /// <returns><see cref="float"/></returns>
+        public float GetTouchX()
         {
-            get { return IExecuteWithSignature<int>("getSwipeEdge", "()I"); }
+            return IExecuteWithSignature<float>("getTouchX", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/window/BackEvent.html#getTouchX()"/> 
+        /// <see href="https://developer.android.com/reference/android/window/BackEvent.html#getTouchY()"/>
         /// </summary>
-        public float TouchX
+        /// <returns><see cref="float"/></returns>
+        public float GetTouchY()
         {
-            get { return IExecuteWithSignature<float>("getTouchX", "()F"); }
+            return IExecuteWithSignature<float>("getTouchY", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/window/BackEvent.html#getTouchY()"/> 
+        /// <see href="https://developer.android.com/reference/android/window/BackEvent.html#getSwipeEdge()"/>
         /// </summary>
-        public float TouchY
+        /// <returns><see cref="int"/></returns>
+        public int GetSwipeEdge()
         {
-            get { return IExecuteWithSignature<float>("getTouchY", "()F"); }
+            return IExecuteWithSignature<int>("getSwipeEdge", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Android/Window/SplashScreen.cs b/src/net/Netdroid/Generated/Android/Window/SplashScreen.cs
index c7605f937..6836fd171 100644
--- a/src/net/Netdroid/Generated/Android/Window/SplashScreen.cs
+++ b/src/net/Netdroid/Generated/Android/Window/SplashScreen.cs
@@ -127,7 +127,7 @@ public partial class OnExitAnimationListener
             /// </summary>
             protected virtual void InitializeHandlers()
             {
-                AddEventHandler("onSplashScreenExit", new System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Window.SplashScreenView>>>(OnSplashScreenExitEventHandler));
+                AddEventHandler("onSplashScreenExit", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Android.Window.SplashScreenView>>>(OnSplashScreenExitEventHandler));
 
             }
 
@@ -135,7 +135,7 @@ protected virtual void InitializeHandlers()
             /// Handler for <see href="https://developer.android.com/reference/android/window/SplashScreen.OnExitAnimationListener.html#onSplashScreenExit(android.window.SplashScreenView)"/>
             /// </summary>
             /// <remarks>If <see cref="OnOnSplashScreenExit"/> has a value it takes precedence over corresponding class method</remarks>
-            public System.Action<Android.Window.SplashScreenView> OnOnSplashScreenExit { get; set; } = null;
+            public global::System.Action<Android.Window.SplashScreenView> OnOnSplashScreenExit { get; set; } = null;
 
             void OnSplashScreenExitEventHandler(object sender, CLRListenerEventArgs<CLREventData<Android.Window.SplashScreenView>> data)
             {
diff --git a/src/net/Netdroid/Generated/Android/Window/SplashScreenView.cs b/src/net/Netdroid/Generated/Android/Window/SplashScreenView.cs
index 15a153bd9..9d8263c8f 100644
--- a/src/net/Netdroid/Generated/Android/Window/SplashScreenView.cs
+++ b/src/net/Netdroid/Generated/Android/Window/SplashScreenView.cs
@@ -46,25 +46,28 @@ public partial class SplashScreenView
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/window/SplashScreenView.html#getIconAnimationDuration()"/> 
+        /// <see href="https://developer.android.com/reference/android/window/SplashScreenView.html#getIconView()"/>
         /// </summary>
-        public Java.Time.Duration IconAnimationDuration
+        /// <returns><see cref="Android.View.View"/></returns>
+        public Android.View.View GetIconView()
         {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getIconAnimationDuration", "()Ljava/time/Duration;"); }
+            return IExecuteWithSignature<Android.View.View>("getIconView", "()Landroid/view/View;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/window/SplashScreenView.html#getIconAnimationStart()"/> 
+        /// <see href="https://developer.android.com/reference/android/window/SplashScreenView.html#getIconAnimationDuration()"/>
         /// </summary>
-        public Java.Time.Instant IconAnimationStart
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetIconAnimationDuration()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getIconAnimationStart", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<Java.Time.Duration>("getIconAnimationDuration", "()Ljava/time/Duration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/android/window/SplashScreenView.html#getIconView()"/> 
+        /// <see href="https://developer.android.com/reference/android/window/SplashScreenView.html#getIconAnimationStart()"/>
         /// </summary>
-        public Android.View.View IconView
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetIconAnimationStart()
         {
-            get { return IExecuteWithSignature<Android.View.View>("getIconView", "()Landroid/view/View;"); }
+            return IExecuteWithSignature<Java.Time.Instant>("getIconAnimationStart", "()Ljava/time/Instant;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/android/window/SplashScreenView.html#remove()"/>
diff --git a/src/net/Netdroid/Generated/Dalvik/Annotation/AllPackageClasses.cs b/src/net/Netdroid/Generated/Dalvik/Annotation/AllPackageClasses.cs
index 85af14f9a..8c844adf1 100644
--- a/src/net/Netdroid/Generated/Dalvik/Annotation/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Dalvik/Annotation/AllPackageClasses.cs
@@ -30,19 +30,19 @@ namespace Dalvik.Annotation
     /// <summary>
     /// <see href="https://developer.android.com/reference/dalvik/annotation/TestTarget.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class TestTarget : Java.Lang.Annotation.Annotation
     {
         const string _bridgeClassName = "dalvik.annotation.TestTarget";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TestTarget class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TestTarget class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TestTarget() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TestTarget class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TestTarget class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TestTarget(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -77,19 +77,19 @@ public TestTarget(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/dalvik/annotation/TestTargetClass.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class TestTargetClass : Java.Lang.Annotation.Annotation
     {
         const string _bridgeClassName = "dalvik.annotation.TestTargetClass";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TestTargetClass class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TestTargetClass class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TestTargetClass() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TestTargetClass class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TestTargetClass class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TestTargetClass(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Dalvik/Annotation/Optimization/AllPackageClasses.cs b/src/net/Netdroid/Generated/Dalvik/Annotation/Optimization/AllPackageClasses.cs
index 56d342348..7aa3770ee 100644
--- a/src/net/Netdroid/Generated/Dalvik/Annotation/Optimization/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Dalvik/Annotation/Optimization/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class CriticalNative : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CriticalNative class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CriticalNative class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CriticalNative() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CriticalNative class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CriticalNative class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CriticalNative(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -82,12 +82,12 @@ public partial class FastNative : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FastNative class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FastNative class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FastNative() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FastNative class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FastNative class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FastNative(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Dalvik/Annotation/TestTarget.cs b/src/net/Netdroid/Generated/Dalvik/Annotation/TestTarget.cs
index e2e1419a2..057e9232e 100644
--- a/src/net/Netdroid/Generated/Dalvik/Annotation/TestTarget.cs
+++ b/src/net/Netdroid/Generated/Dalvik/Annotation/TestTarget.cs
@@ -67,7 +67,7 @@ public partial class TestTarget : Dalvik.Annotation.ITestTarget
         /// <see href="https://developer.android.com/reference/dalvik/annotation/TestTarget.html#methodArgs()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Class"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.Class[] MethodArgs()
         {
             return IExecuteWithSignatureArray<Java.Lang.Class>("methodArgs", "()[Ljava/lang/Class;");
@@ -76,7 +76,7 @@ public Java.Lang.Class[] MethodArgs()
         /// <see href="https://developer.android.com/reference/dalvik/annotation/TestTarget.html#conceptName()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String ConceptName()
         {
             return IExecuteWithSignature<Java.Lang.String>("conceptName", "()Ljava/lang/String;");
@@ -85,7 +85,7 @@ public Java.Lang.String ConceptName()
         /// <see href="https://developer.android.com/reference/dalvik/annotation/TestTarget.html#methodName()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String MethodName()
         {
             return IExecuteWithSignature<Java.Lang.String>("methodName", "()Ljava/lang/String;");
diff --git a/src/net/Netdroid/Generated/Dalvik/Annotation/TestTargetClass.cs b/src/net/Netdroid/Generated/Dalvik/Annotation/TestTargetClass.cs
index 4bcafc3f5..dc5d56d0d 100644
--- a/src/net/Netdroid/Generated/Dalvik/Annotation/TestTargetClass.cs
+++ b/src/net/Netdroid/Generated/Dalvik/Annotation/TestTargetClass.cs
@@ -67,7 +67,7 @@ public partial class TestTargetClass : Dalvik.Annotation.ITestTargetClass
         /// <see href="https://developer.android.com/reference/dalvik/annotation/TestTargetClass.html#value()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Class"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.Class Value()
         {
             return IExecuteWithSignature<Java.Lang.Class>("value", "()Ljava/lang/Class;");
diff --git a/src/net/Netdroid/Generated/Dalvik/Bytecode/AllPackageClasses.cs b/src/net/Netdroid/Generated/Dalvik/Bytecode/AllPackageClasses.cs
index a9cb164aa..103dea261 100644
--- a/src/net/Netdroid/Generated/Dalvik/Bytecode/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Dalvik/Bytecode/AllPackageClasses.cs
@@ -80,12 +80,12 @@ public partial class Opcodes : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Opcodes>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Opcodes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Opcodes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Opcodes() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Opcodes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Opcodes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Opcodes(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Dalvik/Bytecode/Opcodes.cs b/src/net/Netdroid/Generated/Dalvik/Bytecode/Opcodes.cs
index 1921c5924..1c13d779f 100644
--- a/src/net/Netdroid/Generated/Dalvik/Bytecode/Opcodes.cs
+++ b/src/net/Netdroid/Generated/Dalvik/Bytecode/Opcodes.cs
@@ -244,7 +244,7 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_BREAKPOINT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_BREAKPOINT { get { if (!_OP_BREAKPOINTReady) { _OP_BREAKPOINTContent = SGetField<int>(LocalBridgeClazz, "OP_BREAKPOINT"); _OP_BREAKPOINTReady = true; } return _OP_BREAKPOINTContent; } }
         private static int _OP_BREAKPOINTContent = default;
         private static bool _OP_BREAKPOINTReady = false; // this is used because in case of generics 
@@ -455,14 +455,14 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_EXECUTE_INLINE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_EXECUTE_INLINE { get { if (!_OP_EXECUTE_INLINEReady) { _OP_EXECUTE_INLINEContent = SGetField<int>(LocalBridgeClazz, "OP_EXECUTE_INLINE"); _OP_EXECUTE_INLINEReady = true; } return _OP_EXECUTE_INLINEContent; } }
         private static int _OP_EXECUTE_INLINEContent = default;
         private static bool _OP_EXECUTE_INLINEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_EXECUTE_INLINE_RANGE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_EXECUTE_INLINE_RANGE { get { if (!_OP_EXECUTE_INLINE_RANGEReady) { _OP_EXECUTE_INLINE_RANGEContent = SGetField<int>(LocalBridgeClazz, "OP_EXECUTE_INLINE_RANGE"); _OP_EXECUTE_INLINE_RANGEReady = true; } return _OP_EXECUTE_INLINE_RANGEContent; } }
         private static int _OP_EXECUTE_INLINE_RANGEContent = default;
         private static bool _OP_EXECUTE_INLINE_RANGEReady = false; // this is used because in case of generics 
@@ -661,14 +661,14 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_IGET_OBJECT_QUICK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_IGET_OBJECT_QUICK { get { if (!_OP_IGET_OBJECT_QUICKReady) { _OP_IGET_OBJECT_QUICKContent = SGetField<int>(LocalBridgeClazz, "OP_IGET_OBJECT_QUICK"); _OP_IGET_OBJECT_QUICKReady = true; } return _OP_IGET_OBJECT_QUICKContent; } }
         private static int _OP_IGET_OBJECT_QUICKContent = default;
         private static bool _OP_IGET_OBJECT_QUICKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_IGET_QUICK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_IGET_QUICK { get { if (!_OP_IGET_QUICKReady) { _OP_IGET_QUICKContent = SGetField<int>(LocalBridgeClazz, "OP_IGET_QUICK"); _OP_IGET_QUICKReady = true; } return _OP_IGET_QUICKContent; } }
         private static int _OP_IGET_QUICKContent = default;
         private static bool _OP_IGET_QUICKReady = false; // this is used because in case of generics 
@@ -699,14 +699,14 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_IGET_WIDE_QUICK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_IGET_WIDE_QUICK { get { if (!_OP_IGET_WIDE_QUICKReady) { _OP_IGET_WIDE_QUICKContent = SGetField<int>(LocalBridgeClazz, "OP_IGET_WIDE_QUICK"); _OP_IGET_WIDE_QUICKReady = true; } return _OP_IGET_WIDE_QUICKContent; } }
         private static int _OP_IGET_WIDE_QUICKContent = default;
         private static bool _OP_IGET_WIDE_QUICKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_IGET_WIDE_VOLATILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_IGET_WIDE_VOLATILE { get { if (!_OP_IGET_WIDE_VOLATILEReady) { _OP_IGET_WIDE_VOLATILEContent = SGetField<int>(LocalBridgeClazz, "OP_IGET_WIDE_VOLATILE"); _OP_IGET_WIDE_VOLATILEReady = true; } return _OP_IGET_WIDE_VOLATILEContent; } }
         private static int _OP_IGET_WIDE_VOLATILEContent = default;
         private static bool _OP_IGET_WIDE_VOLATILEReady = false; // this is used because in case of generics 
@@ -779,7 +779,7 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_INVOKE_DIRECT_EMPTY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_INVOKE_DIRECT_EMPTY { get { if (!_OP_INVOKE_DIRECT_EMPTYReady) { _OP_INVOKE_DIRECT_EMPTYContent = SGetField<int>(LocalBridgeClazz, "OP_INVOKE_DIRECT_EMPTY"); _OP_INVOKE_DIRECT_EMPTYReady = true; } return _OP_INVOKE_DIRECT_EMPTYContent; } }
         private static int _OP_INVOKE_DIRECT_EMPTYContent = default;
         private static bool _OP_INVOKE_DIRECT_EMPTYReady = false; // this is used because in case of generics 
@@ -858,14 +858,14 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_INVOKE_SUPER_QUICK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_INVOKE_SUPER_QUICK { get { if (!_OP_INVOKE_SUPER_QUICKReady) { _OP_INVOKE_SUPER_QUICKContent = SGetField<int>(LocalBridgeClazz, "OP_INVOKE_SUPER_QUICK"); _OP_INVOKE_SUPER_QUICKReady = true; } return _OP_INVOKE_SUPER_QUICKContent; } }
         private static int _OP_INVOKE_SUPER_QUICKContent = default;
         private static bool _OP_INVOKE_SUPER_QUICKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_INVOKE_SUPER_QUICK_RANGE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_INVOKE_SUPER_QUICK_RANGE { get { if (!_OP_INVOKE_SUPER_QUICK_RANGEReady) { _OP_INVOKE_SUPER_QUICK_RANGEContent = SGetField<int>(LocalBridgeClazz, "OP_INVOKE_SUPER_QUICK_RANGE"); _OP_INVOKE_SUPER_QUICK_RANGEReady = true; } return _OP_INVOKE_SUPER_QUICK_RANGEContent; } }
         private static int _OP_INVOKE_SUPER_QUICK_RANGEContent = default;
         private static bool _OP_INVOKE_SUPER_QUICK_RANGEReady = false; // this is used because in case of generics 
@@ -890,14 +890,14 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_INVOKE_VIRTUAL_QUICK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_INVOKE_VIRTUAL_QUICK { get { if (!_OP_INVOKE_VIRTUAL_QUICKReady) { _OP_INVOKE_VIRTUAL_QUICKContent = SGetField<int>(LocalBridgeClazz, "OP_INVOKE_VIRTUAL_QUICK"); _OP_INVOKE_VIRTUAL_QUICKReady = true; } return _OP_INVOKE_VIRTUAL_QUICKContent; } }
         private static int _OP_INVOKE_VIRTUAL_QUICKContent = default;
         private static bool _OP_INVOKE_VIRTUAL_QUICKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_INVOKE_VIRTUAL_QUICK_RANGE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_INVOKE_VIRTUAL_QUICK_RANGE { get { if (!_OP_INVOKE_VIRTUAL_QUICK_RANGEReady) { _OP_INVOKE_VIRTUAL_QUICK_RANGEContent = SGetField<int>(LocalBridgeClazz, "OP_INVOKE_VIRTUAL_QUICK_RANGE"); _OP_INVOKE_VIRTUAL_QUICK_RANGEReady = true; } return _OP_INVOKE_VIRTUAL_QUICK_RANGEContent; } }
         private static int _OP_INVOKE_VIRTUAL_QUICK_RANGEContent = default;
         private static bool _OP_INVOKE_VIRTUAL_QUICK_RANGEReady = false; // this is used because in case of generics 
@@ -970,14 +970,14 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_IPUT_OBJECT_QUICK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_IPUT_OBJECT_QUICK { get { if (!_OP_IPUT_OBJECT_QUICKReady) { _OP_IPUT_OBJECT_QUICKContent = SGetField<int>(LocalBridgeClazz, "OP_IPUT_OBJECT_QUICK"); _OP_IPUT_OBJECT_QUICKReady = true; } return _OP_IPUT_OBJECT_QUICKContent; } }
         private static int _OP_IPUT_OBJECT_QUICKContent = default;
         private static bool _OP_IPUT_OBJECT_QUICKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_IPUT_QUICK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_IPUT_QUICK { get { if (!_OP_IPUT_QUICKReady) { _OP_IPUT_QUICKContent = SGetField<int>(LocalBridgeClazz, "OP_IPUT_QUICK"); _OP_IPUT_QUICKReady = true; } return _OP_IPUT_QUICKContent; } }
         private static int _OP_IPUT_QUICKContent = default;
         private static bool _OP_IPUT_QUICKReady = false; // this is used because in case of generics 
@@ -1008,14 +1008,14 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_IPUT_WIDE_QUICK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_IPUT_WIDE_QUICK { get { if (!_OP_IPUT_WIDE_QUICKReady) { _OP_IPUT_WIDE_QUICKContent = SGetField<int>(LocalBridgeClazz, "OP_IPUT_WIDE_QUICK"); _OP_IPUT_WIDE_QUICKReady = true; } return _OP_IPUT_WIDE_QUICKContent; } }
         private static int _OP_IPUT_WIDE_QUICKContent = default;
         private static bool _OP_IPUT_WIDE_QUICKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_IPUT_WIDE_VOLATILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_IPUT_WIDE_VOLATILE { get { if (!_OP_IPUT_WIDE_VOLATILEReady) { _OP_IPUT_WIDE_VOLATILEContent = SGetField<int>(LocalBridgeClazz, "OP_IPUT_WIDE_VOLATILE"); _OP_IPUT_WIDE_VOLATILEReady = true; } return _OP_IPUT_WIDE_VOLATILEContent; } }
         private static int _OP_IPUT_WIDE_VOLATILEContent = default;
         private static bool _OP_IPUT_WIDE_VOLATILEReady = false; // this is used because in case of generics 
@@ -1478,7 +1478,7 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_SGET_WIDE_VOLATILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_SGET_WIDE_VOLATILE { get { if (!_OP_SGET_WIDE_VOLATILEReady) { _OP_SGET_WIDE_VOLATILEContent = SGetField<int>(LocalBridgeClazz, "OP_SGET_WIDE_VOLATILE"); _OP_SGET_WIDE_VOLATILEReady = true; } return _OP_SGET_WIDE_VOLATILEContent; } }
         private static int _OP_SGET_WIDE_VOLATILEContent = default;
         private static bool _OP_SGET_WIDE_VOLATILEReady = false; // this is used because in case of generics 
@@ -1635,7 +1635,7 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_SPUT_WIDE_VOLATILE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_SPUT_WIDE_VOLATILE { get { if (!_OP_SPUT_WIDE_VOLATILEReady) { _OP_SPUT_WIDE_VOLATILEContent = SGetField<int>(LocalBridgeClazz, "OP_SPUT_WIDE_VOLATILE"); _OP_SPUT_WIDE_VOLATILEReady = true; } return _OP_SPUT_WIDE_VOLATILEContent; } }
         private static int _OP_SPUT_WIDE_VOLATILEContent = default;
         private static bool _OP_SPUT_WIDE_VOLATILEReady = false; // this is used because in case of generics 
@@ -1696,7 +1696,7 @@ public partial class Opcodes : Dalvik.Bytecode.IOpcodes
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/bytecode/Opcodes.html#OP_THROW_VERIFICATION_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int OP_THROW_VERIFICATION_ERROR { get { if (!_OP_THROW_VERIFICATION_ERRORReady) { _OP_THROW_VERIFICATION_ERRORContent = SGetField<int>(LocalBridgeClazz, "OP_THROW_VERIFICATION_ERROR"); _OP_THROW_VERIFICATION_ERRORReady = true; } return _OP_THROW_VERIFICATION_ERRORContent; } }
         private static int _OP_THROW_VERIFICATION_ERRORContent = default;
         private static bool _OP_THROW_VERIFICATION_ERRORReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/AllPackageClasses.cs b/src/net/Netdroid/Generated/Dalvik/System/AllPackageClasses.cs
similarity index 96%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/AllPackageClasses.cs
rename to src/net/Netdroid/Generated/Dalvik/System/AllPackageClasses.cs
index eb0fd69a0..d5a71b37e 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/AllPackageClasses.cs
@@ -24,7 +24,7 @@
 using MASES.JCOBridge.C2JBridge.JVMInterop;
 using System;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region ApplicationRuntime
     /// <summary>
@@ -118,7 +118,7 @@ public BaseDexClassLoader(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/dalvik/system/DelegateLastClassLoader.html"/>
     /// </summary>
-    public partial class DelegateLastClassLoader : Dalvik.SystemNs.PathClassLoader
+    public partial class DelegateLastClassLoader : Dalvik.System.PathClassLoader
     {
         const string _bridgeClassName = "dalvik.system.DelegateLastClassLoader";
         /// <summary>
@@ -162,7 +162,7 @@ public DelegateLastClassLoader(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/dalvik/system/DexClassLoader.html"/>
     /// </summary>
-    public partial class DexClassLoader : Dalvik.SystemNs.BaseDexClassLoader
+    public partial class DexClassLoader : Dalvik.System.BaseDexClassLoader
     {
         const string _bridgeClassName = "dalvik.system.DexClassLoader";
         /// <summary>
@@ -294,7 +294,7 @@ public OptimizationInfo(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/dalvik/system/InMemoryDexClassLoader.html"/>
     /// </summary>
-    public partial class InMemoryDexClassLoader : Dalvik.SystemNs.BaseDexClassLoader
+    public partial class InMemoryDexClassLoader : Dalvik.System.BaseDexClassLoader
     {
         const string _bridgeClassName = "dalvik.system.InMemoryDexClassLoader";
         /// <summary>
@@ -338,7 +338,7 @@ public InMemoryDexClassLoader(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/dalvik/system/PathClassLoader.html"/>
     /// </summary>
-    public partial class PathClassLoader : Dalvik.SystemNs.BaseDexClassLoader
+    public partial class PathClassLoader : Dalvik.System.BaseDexClassLoader
     {
         const string _bridgeClassName = "dalvik.system.PathClassLoader";
         /// <summary>
@@ -428,12 +428,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Callback(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/ApplicationRuntime.cs b/src/net/Netdroid/Generated/Dalvik/System/ApplicationRuntime.cs
similarity index 79%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/ApplicationRuntime.cs
rename to src/net/Netdroid/Generated/Dalvik/System/ApplicationRuntime.cs
index 67106c4a4..57a80d18c 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/ApplicationRuntime.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/ApplicationRuntime.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region ApplicationRuntime
     public partial class ApplicationRuntime
@@ -42,11 +42,12 @@ public partial class ApplicationRuntime
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/dalvik/system/ApplicationRuntime.html#getBaseApkOptimizationInfo()"/> 
+        /// <see href="https://developer.android.com/reference/dalvik/system/ApplicationRuntime.html#getBaseApkOptimizationInfo()"/>
         /// </summary>
-        public static Dalvik.SystemNs.DexFile.OptimizationInfo BaseApkOptimizationInfo
+        /// <returns><see cref="Dalvik.System.DexFile.OptimizationInfo"/></returns>
+        public static Dalvik.System.DexFile.OptimizationInfo GetBaseApkOptimizationInfo()
         {
-            get { return SExecuteWithSignature<Dalvik.SystemNs.DexFile.OptimizationInfo>(LocalBridgeClazz, "getBaseApkOptimizationInfo", "()Ldalvik/system/DexFile$OptimizationInfo;"); }
+            return SExecuteWithSignature<Dalvik.System.DexFile.OptimizationInfo>(LocalBridgeClazz, "getBaseApkOptimizationInfo", "()Ldalvik/system/DexFile$OptimizationInfo;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/BaseDexClassLoader.cs b/src/net/Netdroid/Generated/Dalvik/System/BaseDexClassLoader.cs
similarity index 98%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/BaseDexClassLoader.cs
rename to src/net/Netdroid/Generated/Dalvik/System/BaseDexClassLoader.cs
index 79c73b855..66a51e24a 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/BaseDexClassLoader.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/BaseDexClassLoader.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region BaseDexClassLoader
     public partial class BaseDexClassLoader
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/DelegateLastClassLoader.cs b/src/net/Netdroid/Generated/Dalvik/System/DelegateLastClassLoader.cs
similarity index 99%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/DelegateLastClassLoader.cs
rename to src/net/Netdroid/Generated/Dalvik/System/DelegateLastClassLoader.cs
index c29ab5ddc..7cfc97aef 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/DelegateLastClassLoader.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/DelegateLastClassLoader.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region DelegateLastClassLoader
     public partial class DelegateLastClassLoader
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/DexClassLoader.cs b/src/net/Netdroid/Generated/Dalvik/System/DexClassLoader.cs
similarity index 98%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/DexClassLoader.cs
rename to src/net/Netdroid/Generated/Dalvik/System/DexClassLoader.cs
index 16d1ad23b..3f2e9e77a 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/DexClassLoader.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/DexClassLoader.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region DexClassLoader
     public partial class DexClassLoader
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/DexFile.cs b/src/net/Netdroid/Generated/Dalvik/System/DexFile.cs
similarity index 88%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/DexFile.cs
rename to src/net/Netdroid/Generated/Dalvik/System/DexFile.cs
index ab9f80305..cca7d83f1 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/DexFile.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/DexFile.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region DexFile
     public partial class DexFile
@@ -34,7 +34,7 @@ public partial class DexFile
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DexFile(Java.Io.File arg0)
             : base(arg0)
         {
@@ -44,7 +44,7 @@ public DexFile(Java.Io.File arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public DexFile(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -67,12 +67,12 @@ public DexFile(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Dalvik.SystemNs.DexFile"/></returns>
+        /// <returns><see cref="Dalvik.System.DexFile"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
-        public static Dalvik.SystemNs.DexFile LoadDex(Java.Lang.String arg0, Java.Lang.String arg1, int arg2)
+        [global::System.Obsolete()]
+        public static Dalvik.System.DexFile LoadDex(Java.Lang.String arg0, Java.Lang.String arg1, int arg2)
         {
-            return SExecute<Dalvik.SystemNs.DexFile>(LocalBridgeClazz, "loadDex", arg0, arg1, arg2);
+            return SExecute<Dalvik.System.DexFile>(LocalBridgeClazz, "loadDex", arg0, arg1, arg2);
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/system/DexFile.html#isDexOptNeeded(java.lang.String)"/>
@@ -81,7 +81,7 @@ public static Dalvik.SystemNs.DexFile LoadDex(Java.Lang.String arg0, Java.Lang.S
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.FileNotFoundException"/>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsDexOptNeeded(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isDexOptNeeded", "(Ljava/lang/String;)Z", arg0);
@@ -91,29 +91,30 @@ public static bool IsDexOptNeeded(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/dalvik/system/DexFile.html#getName()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/system/DexFile.html#loadClass(java.lang.String,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
         /// <returns><see cref="Java.Lang.Class"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.Class LoadClass(Java.Lang.String arg0, Java.Lang.ClassLoader arg1)
         {
             return IExecute<Java.Lang.Class>("loadClass", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/dalvik/system/DexFile.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        [global::System.Obsolete()]
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/system/DexFile.html#entries()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Util.Enumeration<Java.Lang.String> Entries()
         {
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("entries", "()Ljava/util/Enumeration;");
@@ -122,7 +123,7 @@ public Java.Lang.Class LoadClass(Java.Lang.String arg0, Java.Lang.ClassLoader ar
         /// <see href="https://developer.android.com/reference/dalvik/system/DexFile.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/InMemoryDexClassLoader.cs b/src/net/Netdroid/Generated/Dalvik/System/InMemoryDexClassLoader.cs
similarity index 99%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/InMemoryDexClassLoader.cs
rename to src/net/Netdroid/Generated/Dalvik/System/InMemoryDexClassLoader.cs
index c57be7e21..aeca043d0 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/InMemoryDexClassLoader.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/InMemoryDexClassLoader.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region InMemoryDexClassLoader
     public partial class InMemoryDexClassLoader
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/PathClassLoader.cs b/src/net/Netdroid/Generated/Dalvik/System/PathClassLoader.cs
similarity index 98%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/PathClassLoader.cs
rename to src/net/Netdroid/Generated/Dalvik/System/PathClassLoader.cs
index 34f258363..e097648f8 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/PathClassLoader.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/PathClassLoader.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region PathClassLoader
     public partial class PathClassLoader
diff --git a/src/net/Netdroid/Generated/Dalvik/SystemNs/ZipPathValidator.cs b/src/net/Netdroid/Generated/Dalvik/System/ZipPathValidator.cs
similarity index 93%
rename from src/net/Netdroid/Generated/Dalvik/SystemNs/ZipPathValidator.cs
rename to src/net/Netdroid/Generated/Dalvik/System/ZipPathValidator.cs
index 92c8b9888..de0806aae 100644
--- a/src/net/Netdroid/Generated/Dalvik/SystemNs/ZipPathValidator.cs
+++ b/src/net/Netdroid/Generated/Dalvik/System/ZipPathValidator.cs
@@ -23,7 +23,7 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Dalvik.SystemNs
+namespace Dalvik.System
 {
     #region ZipPathValidator
     public partial class ZipPathValidator
@@ -51,8 +51,8 @@ public static void ClearCallback()
         /// <summary>
         /// <see href="https://developer.android.com/reference/dalvik/system/ZipPathValidator.html#setCallback(dalvik.system.ZipPathValidator.Callback)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Dalvik.SystemNs.ZipPathValidator.Callback"/></param>
-        public static void SetCallback(Dalvik.SystemNs.ZipPathValidator.Callback arg0)
+        /// <param name="arg0"><see cref="Dalvik.System.ZipPathValidator.Callback"/></param>
+        public static void SetCallback(Dalvik.System.ZipPathValidator.Callback arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "setCallback", "(Ldalvik/system/ZipPathValidator$Callback;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Awt/FontNs/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Awt/FontNs/AllPackageClasses.cs
index 4fa4e21f3..20305e64e 100644
--- a/src/net/Netdroid/Generated/Java/Awt/FontNs/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Awt/FontNs/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Awt.FontNs
 {
     #region NumericShaper
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html"/>
+    /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html"/>
     /// </summary>
     public partial class NumericShaper : Java.Io.Serializable
     {
@@ -68,7 +68,7 @@ public NumericShaper(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Range
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html"/>
         /// </summary>
         public partial class Range : Java.Lang.Enum<Java.Awt.FontNs.NumericShaper.Range>
         {
@@ -116,7 +116,7 @@ public Range(params object[] args) : base(args) { }
 
     #region TextAttribute
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html"/>
+    /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html"/>
     /// </summary>
     public partial class TextAttribute : Java.Text.AttributedCharacterIterator.Attribute
     {
diff --git a/src/net/Netdroid/Generated/Java/Awt/FontNs/NumericShaper.cs b/src/net/Netdroid/Generated/Java/Awt/FontNs/NumericShaper.cs
index dd5c4e395..8c643d271 100644
--- a/src/net/Netdroid/Generated/Java/Awt/FontNs/NumericShaper.cs
+++ b/src/net/Netdroid/Generated/Java/Awt/FontNs/NumericShaper.cs
@@ -38,121 +38,121 @@ public partial class NumericShaper
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#ALL_RANGES"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#ALL_RANGES"/>
         /// </summary>
         public static int ALL_RANGES { get { if (!_ALL_RANGESReady) { _ALL_RANGESContent = SGetField<int>(LocalBridgeClazz, "ALL_RANGES"); _ALL_RANGESReady = true; } return _ALL_RANGESContent; } }
         private static int _ALL_RANGESContent = default;
         private static bool _ALL_RANGESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#ARABIC"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#ARABIC"/>
         /// </summary>
         public static int ARABIC { get { if (!_ARABICReady) { _ARABICContent = SGetField<int>(LocalBridgeClazz, "ARABIC"); _ARABICReady = true; } return _ARABICContent; } }
         private static int _ARABICContent = default;
         private static bool _ARABICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#BENGALI"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#BENGALI"/>
         /// </summary>
         public static int BENGALI { get { if (!_BENGALIReady) { _BENGALIContent = SGetField<int>(LocalBridgeClazz, "BENGALI"); _BENGALIReady = true; } return _BENGALIContent; } }
         private static int _BENGALIContent = default;
         private static bool _BENGALIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#DEVANAGARI"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#DEVANAGARI"/>
         /// </summary>
         public static int DEVANAGARI { get { if (!_DEVANAGARIReady) { _DEVANAGARIContent = SGetField<int>(LocalBridgeClazz, "DEVANAGARI"); _DEVANAGARIReady = true; } return _DEVANAGARIContent; } }
         private static int _DEVANAGARIContent = default;
         private static bool _DEVANAGARIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#EASTERN_ARABIC"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#EASTERN_ARABIC"/>
         /// </summary>
         public static int EASTERN_ARABIC { get { if (!_EASTERN_ARABICReady) { _EASTERN_ARABICContent = SGetField<int>(LocalBridgeClazz, "EASTERN_ARABIC"); _EASTERN_ARABICReady = true; } return _EASTERN_ARABICContent; } }
         private static int _EASTERN_ARABICContent = default;
         private static bool _EASTERN_ARABICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#ETHIOPIC"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#ETHIOPIC"/>
         /// </summary>
         public static int ETHIOPIC { get { if (!_ETHIOPICReady) { _ETHIOPICContent = SGetField<int>(LocalBridgeClazz, "ETHIOPIC"); _ETHIOPICReady = true; } return _ETHIOPICContent; } }
         private static int _ETHIOPICContent = default;
         private static bool _ETHIOPICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#EUROPEAN"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#EUROPEAN"/>
         /// </summary>
         public static int EUROPEAN { get { if (!_EUROPEANReady) { _EUROPEANContent = SGetField<int>(LocalBridgeClazz, "EUROPEAN"); _EUROPEANReady = true; } return _EUROPEANContent; } }
         private static int _EUROPEANContent = default;
         private static bool _EUROPEANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#GUJARATI"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#GUJARATI"/>
         /// </summary>
         public static int GUJARATI { get { if (!_GUJARATIReady) { _GUJARATIContent = SGetField<int>(LocalBridgeClazz, "GUJARATI"); _GUJARATIReady = true; } return _GUJARATIContent; } }
         private static int _GUJARATIContent = default;
         private static bool _GUJARATIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#GURMUKHI"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#GURMUKHI"/>
         /// </summary>
         public static int GURMUKHI { get { if (!_GURMUKHIReady) { _GURMUKHIContent = SGetField<int>(LocalBridgeClazz, "GURMUKHI"); _GURMUKHIReady = true; } return _GURMUKHIContent; } }
         private static int _GURMUKHIContent = default;
         private static bool _GURMUKHIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#KANNADA"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#KANNADA"/>
         /// </summary>
         public static int KANNADA { get { if (!_KANNADAReady) { _KANNADAContent = SGetField<int>(LocalBridgeClazz, "KANNADA"); _KANNADAReady = true; } return _KANNADAContent; } }
         private static int _KANNADAContent = default;
         private static bool _KANNADAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#KHMER"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#KHMER"/>
         /// </summary>
         public static int KHMER { get { if (!_KHMERReady) { _KHMERContent = SGetField<int>(LocalBridgeClazz, "KHMER"); _KHMERReady = true; } return _KHMERContent; } }
         private static int _KHMERContent = default;
         private static bool _KHMERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#LAO"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#LAO"/>
         /// </summary>
         public static int LAO { get { if (!_LAOReady) { _LAOContent = SGetField<int>(LocalBridgeClazz, "LAO"); _LAOReady = true; } return _LAOContent; } }
         private static int _LAOContent = default;
         private static bool _LAOReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#MALAYALAM"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#MALAYALAM"/>
         /// </summary>
         public static int MALAYALAM { get { if (!_MALAYALAMReady) { _MALAYALAMContent = SGetField<int>(LocalBridgeClazz, "MALAYALAM"); _MALAYALAMReady = true; } return _MALAYALAMContent; } }
         private static int _MALAYALAMContent = default;
         private static bool _MALAYALAMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#MONGOLIAN"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#MONGOLIAN"/>
         /// </summary>
         public static int MONGOLIAN { get { if (!_MONGOLIANReady) { _MONGOLIANContent = SGetField<int>(LocalBridgeClazz, "MONGOLIAN"); _MONGOLIANReady = true; } return _MONGOLIANContent; } }
         private static int _MONGOLIANContent = default;
         private static bool _MONGOLIANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#MYANMAR"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#MYANMAR"/>
         /// </summary>
         public static int MYANMAR { get { if (!_MYANMARReady) { _MYANMARContent = SGetField<int>(LocalBridgeClazz, "MYANMAR"); _MYANMARReady = true; } return _MYANMARContent; } }
         private static int _MYANMARContent = default;
         private static bool _MYANMARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#ORIYA"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#ORIYA"/>
         /// </summary>
         public static int ORIYA { get { if (!_ORIYAReady) { _ORIYAContent = SGetField<int>(LocalBridgeClazz, "ORIYA"); _ORIYAReady = true; } return _ORIYAContent; } }
         private static int _ORIYAContent = default;
         private static bool _ORIYAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#TAMIL"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#TAMIL"/>
         /// </summary>
         public static int TAMIL { get { if (!_TAMILReady) { _TAMILContent = SGetField<int>(LocalBridgeClazz, "TAMIL"); _TAMILReady = true; } return _TAMILContent; } }
         private static int _TAMILContent = default;
         private static bool _TAMILReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#TELUGU"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#TELUGU"/>
         /// </summary>
         public static int TELUGU { get { if (!_TELUGUReady) { _TELUGUContent = SGetField<int>(LocalBridgeClazz, "TELUGU"); _TELUGUReady = true; } return _TELUGUContent; } }
         private static int _TELUGUContent = default;
         private static bool _TELUGUReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#THAI"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#THAI"/>
         /// </summary>
         public static int THAI { get { if (!_THAIReady) { _THAIContent = SGetField<int>(LocalBridgeClazz, "THAI"); _THAIReady = true; } return _THAIContent; } }
         private static int _THAIContent = default;
         private static bool _THAIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#TIBETAN"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#TIBETAN"/>
         /// </summary>
         public static int TIBETAN { get { if (!_TIBETANReady) { _TIBETANContent = SGetField<int>(LocalBridgeClazz, "TIBETAN"); _TIBETANReady = true; } return _TIBETANContent; } }
         private static int _TIBETANContent = default;
@@ -162,7 +162,7 @@ public partial class NumericShaper
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#getContextualShaper(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#getContextualShaper(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -172,7 +172,7 @@ public static Java.Awt.FontNs.NumericShaper GetContextualShaper(int arg0, int ar
             return SExecute<Java.Awt.FontNs.NumericShaper>(LocalBridgeClazz, "getContextualShaper", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#getContextualShaper(int)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#getContextualShaper(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Awt.FontNs.NumericShaper"/></returns>
@@ -181,7 +181,7 @@ public static Java.Awt.FontNs.NumericShaper GetContextualShaper(int arg0)
             return SExecuteWithSignature<Java.Awt.FontNs.NumericShaper>(LocalBridgeClazz, "getContextualShaper", "(I)Ljava/awt/font/NumericShaper;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#getContextualShaper(java.util.Set,java.awt.font.NumericShaper.Range)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#getContextualShaper(java.util.Set,java.awt.font.NumericShaper.Range)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <param name="arg1"><see cref="Java.Awt.FontNs.NumericShaper.Range"/></param>
@@ -191,7 +191,7 @@ public static Java.Awt.FontNs.NumericShaper GetContextualShaper(Java.Util.Set<Ja
             return SExecute<Java.Awt.FontNs.NumericShaper>(LocalBridgeClazz, "getContextualShaper", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#getContextualShaper(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#getContextualShaper(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <returns><see cref="Java.Awt.FontNs.NumericShaper"/></returns>
@@ -200,7 +200,7 @@ public static Java.Awt.FontNs.NumericShaper GetContextualShaper(Java.Util.Set<Ja
             return SExecuteWithSignature<Java.Awt.FontNs.NumericShaper>(LocalBridgeClazz, "getContextualShaper", "(Ljava/util/Set;)Ljava/awt/font/NumericShaper;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#getShaper(int)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#getShaper(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Awt.FontNs.NumericShaper"/></returns>
@@ -209,7 +209,7 @@ public static Java.Awt.FontNs.NumericShaper GetShaper(int arg0)
             return SExecuteWithSignature<Java.Awt.FontNs.NumericShaper>(LocalBridgeClazz, "getShaper", "(I)Ljava/awt/font/NumericShaper;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#getShaper(java.awt.font.NumericShaper.Range)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#getShaper(java.awt.font.NumericShaper.Range)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Awt.FontNs.NumericShaper.Range"/></param>
         /// <returns><see cref="Java.Awt.FontNs.NumericShaper"/></returns>
@@ -222,29 +222,31 @@ public static Java.Awt.FontNs.NumericShaper GetShaper(Java.Awt.FontNs.NumericSha
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#getRanges()"/> 
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#isContextual()"/>
         /// </summary>
-        public int Ranges
+        /// <returns><see cref="bool"/></returns>
+        public bool IsContextual()
         {
-            get { return IExecuteWithSignature<int>("getRanges", "()I"); }
+            return IExecuteWithSignature<bool>("isContextual", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#getRangeSet()"/> 
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#getRanges()"/>
         /// </summary>
-        public Java.Util.Set<Java.Awt.FontNs.NumericShaper.Range> RangeSet
+        /// <returns><see cref="int"/></returns>
+        public int GetRanges()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Awt.FontNs.NumericShaper.Range>>("getRangeSet", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<int>("getRanges", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#isContextual()"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#getRangeSet()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsContextual()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Awt.FontNs.NumericShaper.Range> GetRangeSet()
         {
-            return IExecuteWithSignature<bool>("isContextual", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Awt.FontNs.NumericShaper.Range>>("getRangeSet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#shape(char[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#shape(char[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -255,7 +257,7 @@ public void Shape(char[] arg0, int arg1, int arg2, int arg3)
             IExecute("shape", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#shape(char[],int,int,java.awt.font.NumericShaper.Range)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#shape(char[],int,int,java.awt.font.NumericShaper.Range)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -266,7 +268,7 @@ public void Shape(char[] arg0, int arg1, int arg2, Java.Awt.FontNs.NumericShaper
             IExecute("shape", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.html#shape(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.html#shape(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -292,223 +294,223 @@ public partial class Range
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#ARABIC"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#ARABIC"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range ARABIC { get { if (!_ARABICReady) { _ARABICContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "ARABIC"); _ARABICReady = true; } return _ARABICContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _ARABICContent = default;
             private static bool _ARABICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#BALINESE"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#BALINESE"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range BALINESE { get { if (!_BALINESEReady) { _BALINESEContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "BALINESE"); _BALINESEReady = true; } return _BALINESEContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _BALINESEContent = default;
             private static bool _BALINESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#BENGALI"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#BENGALI"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range BENGALI { get { if (!_BENGALIReady) { _BENGALIContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "BENGALI"); _BENGALIReady = true; } return _BENGALIContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _BENGALIContent = default;
             private static bool _BENGALIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#CHAM"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#CHAM"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range CHAM { get { if (!_CHAMReady) { _CHAMContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "CHAM"); _CHAMReady = true; } return _CHAMContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _CHAMContent = default;
             private static bool _CHAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#DEVANAGARI"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#DEVANAGARI"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range DEVANAGARI { get { if (!_DEVANAGARIReady) { _DEVANAGARIContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "DEVANAGARI"); _DEVANAGARIReady = true; } return _DEVANAGARIContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _DEVANAGARIContent = default;
             private static bool _DEVANAGARIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#EASTERN_ARABIC"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#EASTERN_ARABIC"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range EASTERN_ARABIC { get { if (!_EASTERN_ARABICReady) { _EASTERN_ARABICContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "EASTERN_ARABIC"); _EASTERN_ARABICReady = true; } return _EASTERN_ARABICContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _EASTERN_ARABICContent = default;
             private static bool _EASTERN_ARABICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#ETHIOPIC"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#ETHIOPIC"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range ETHIOPIC { get { if (!_ETHIOPICReady) { _ETHIOPICContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "ETHIOPIC"); _ETHIOPICReady = true; } return _ETHIOPICContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _ETHIOPICContent = default;
             private static bool _ETHIOPICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#EUROPEAN"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#EUROPEAN"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range EUROPEAN { get { if (!_EUROPEANReady) { _EUROPEANContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "EUROPEAN"); _EUROPEANReady = true; } return _EUROPEANContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _EUROPEANContent = default;
             private static bool _EUROPEANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#GUJARATI"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#GUJARATI"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range GUJARATI { get { if (!_GUJARATIReady) { _GUJARATIContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "GUJARATI"); _GUJARATIReady = true; } return _GUJARATIContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _GUJARATIContent = default;
             private static bool _GUJARATIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#GURMUKHI"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#GURMUKHI"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range GURMUKHI { get { if (!_GURMUKHIReady) { _GURMUKHIContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "GURMUKHI"); _GURMUKHIReady = true; } return _GURMUKHIContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _GURMUKHIContent = default;
             private static bool _GURMUKHIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#JAVANESE"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#JAVANESE"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range JAVANESE { get { if (!_JAVANESEReady) { _JAVANESEContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "JAVANESE"); _JAVANESEReady = true; } return _JAVANESEContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _JAVANESEContent = default;
             private static bool _JAVANESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#KANNADA"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#KANNADA"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range KANNADA { get { if (!_KANNADAReady) { _KANNADAContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "KANNADA"); _KANNADAReady = true; } return _KANNADAContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _KANNADAContent = default;
             private static bool _KANNADAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#KAYAH_LI"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#KAYAH_LI"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range KAYAH_LI { get { if (!_KAYAH_LIReady) { _KAYAH_LIContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "KAYAH_LI"); _KAYAH_LIReady = true; } return _KAYAH_LIContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _KAYAH_LIContent = default;
             private static bool _KAYAH_LIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#KHMER"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#KHMER"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range KHMER { get { if (!_KHMERReady) { _KHMERContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "KHMER"); _KHMERReady = true; } return _KHMERContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _KHMERContent = default;
             private static bool _KHMERReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#LAO"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#LAO"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range LAO { get { if (!_LAOReady) { _LAOContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "LAO"); _LAOReady = true; } return _LAOContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _LAOContent = default;
             private static bool _LAOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#LEPCHA"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#LEPCHA"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range LEPCHA { get { if (!_LEPCHAReady) { _LEPCHAContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "LEPCHA"); _LEPCHAReady = true; } return _LEPCHAContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _LEPCHAContent = default;
             private static bool _LEPCHAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#LIMBU"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#LIMBU"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range LIMBU { get { if (!_LIMBUReady) { _LIMBUContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "LIMBU"); _LIMBUReady = true; } return _LIMBUContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _LIMBUContent = default;
             private static bool _LIMBUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#MALAYALAM"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#MALAYALAM"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range MALAYALAM { get { if (!_MALAYALAMReady) { _MALAYALAMContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "MALAYALAM"); _MALAYALAMReady = true; } return _MALAYALAMContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _MALAYALAMContent = default;
             private static bool _MALAYALAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#MEETEI_MAYEK"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#MEETEI_MAYEK"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range MEETEI_MAYEK { get { if (!_MEETEI_MAYEKReady) { _MEETEI_MAYEKContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "MEETEI_MAYEK"); _MEETEI_MAYEKReady = true; } return _MEETEI_MAYEKContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _MEETEI_MAYEKContent = default;
             private static bool _MEETEI_MAYEKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#MONGOLIAN"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#MONGOLIAN"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range MONGOLIAN { get { if (!_MONGOLIANReady) { _MONGOLIANContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "MONGOLIAN"); _MONGOLIANReady = true; } return _MONGOLIANContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _MONGOLIANContent = default;
             private static bool _MONGOLIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#MYANMAR"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#MYANMAR"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range MYANMAR { get { if (!_MYANMARReady) { _MYANMARContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "MYANMAR"); _MYANMARReady = true; } return _MYANMARContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _MYANMARContent = default;
             private static bool _MYANMARReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#MYANMAR_SHAN"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#MYANMAR_SHAN"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range MYANMAR_SHAN { get { if (!_MYANMAR_SHANReady) { _MYANMAR_SHANContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "MYANMAR_SHAN"); _MYANMAR_SHANReady = true; } return _MYANMAR_SHANContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _MYANMAR_SHANContent = default;
             private static bool _MYANMAR_SHANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#MYANMAR_TAI_LAING"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#MYANMAR_TAI_LAING"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range MYANMAR_TAI_LAING { get { if (!_MYANMAR_TAI_LAINGReady) { _MYANMAR_TAI_LAINGContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "MYANMAR_TAI_LAING"); _MYANMAR_TAI_LAINGReady = true; } return _MYANMAR_TAI_LAINGContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _MYANMAR_TAI_LAINGContent = default;
             private static bool _MYANMAR_TAI_LAINGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#NEW_TAI_LUE"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#NEW_TAI_LUE"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range NEW_TAI_LUE { get { if (!_NEW_TAI_LUEReady) { _NEW_TAI_LUEContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "NEW_TAI_LUE"); _NEW_TAI_LUEReady = true; } return _NEW_TAI_LUEContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _NEW_TAI_LUEContent = default;
             private static bool _NEW_TAI_LUEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#NKO"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#NKO"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range NKO { get { if (!_NKOReady) { _NKOContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "NKO"); _NKOReady = true; } return _NKOContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _NKOContent = default;
             private static bool _NKOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#OL_CHIKI"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#OL_CHIKI"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range OL_CHIKI { get { if (!_OL_CHIKIReady) { _OL_CHIKIContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "OL_CHIKI"); _OL_CHIKIReady = true; } return _OL_CHIKIContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _OL_CHIKIContent = default;
             private static bool _OL_CHIKIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#ORIYA"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#ORIYA"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range ORIYA { get { if (!_ORIYAReady) { _ORIYAContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "ORIYA"); _ORIYAReady = true; } return _ORIYAContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _ORIYAContent = default;
             private static bool _ORIYAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#SAURASHTRA"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#SAURASHTRA"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range SAURASHTRA { get { if (!_SAURASHTRAReady) { _SAURASHTRAContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "SAURASHTRA"); _SAURASHTRAReady = true; } return _SAURASHTRAContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _SAURASHTRAContent = default;
             private static bool _SAURASHTRAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#SINHALA"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#SINHALA"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range SINHALA { get { if (!_SINHALAReady) { _SINHALAContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "SINHALA"); _SINHALAReady = true; } return _SINHALAContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _SINHALAContent = default;
             private static bool _SINHALAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#SUNDANESE"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#SUNDANESE"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range SUNDANESE { get { if (!_SUNDANESEReady) { _SUNDANESEContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "SUNDANESE"); _SUNDANESEReady = true; } return _SUNDANESEContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _SUNDANESEContent = default;
             private static bool _SUNDANESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#TAI_THAM_HORA"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#TAI_THAM_HORA"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range TAI_THAM_HORA { get { if (!_TAI_THAM_HORAReady) { _TAI_THAM_HORAContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "TAI_THAM_HORA"); _TAI_THAM_HORAReady = true; } return _TAI_THAM_HORAContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _TAI_THAM_HORAContent = default;
             private static bool _TAI_THAM_HORAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#TAI_THAM_THAM"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#TAI_THAM_THAM"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range TAI_THAM_THAM { get { if (!_TAI_THAM_THAMReady) { _TAI_THAM_THAMContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "TAI_THAM_THAM"); _TAI_THAM_THAMReady = true; } return _TAI_THAM_THAMContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _TAI_THAM_THAMContent = default;
             private static bool _TAI_THAM_THAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#TAMIL"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#TAMIL"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range TAMIL { get { if (!_TAMILReady) { _TAMILContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "TAMIL"); _TAMILReady = true; } return _TAMILContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _TAMILContent = default;
             private static bool _TAMILReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#TELUGU"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#TELUGU"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range TELUGU { get { if (!_TELUGUReady) { _TELUGUContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "TELUGU"); _TELUGUReady = true; } return _TELUGUContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _TELUGUContent = default;
             private static bool _TELUGUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#THAI"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#THAI"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range THAI { get { if (!_THAIReady) { _THAIContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "THAI"); _THAIReady = true; } return _THAIContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _THAIContent = default;
             private static bool _THAIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#TIBETAN"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#TIBETAN"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range TIBETAN { get { if (!_TIBETANReady) { _TIBETANContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "TIBETAN"); _TIBETANReady = true; } return _TIBETANContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _TIBETANContent = default;
             private static bool _TIBETANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#VAI"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#VAI"/>
             /// </summary>
             public static Java.Awt.FontNs.NumericShaper.Range VAI { get { if (!_VAIReady) { _VAIContent = SGetField<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "VAI"); _VAIReady = true; } return _VAIContent; } }
             private static Java.Awt.FontNs.NumericShaper.Range _VAIContent = default;
@@ -518,7 +520,7 @@ public partial class Range
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Awt.FontNs.NumericShaper.Range"/></returns>
@@ -527,7 +529,7 @@ public static Java.Awt.FontNs.NumericShaper.Range ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Awt.FontNs.NumericShaper.Range>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/awt/font/NumericShaper$Range;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/NumericShaper.Range.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/awt/font/NumericShaper.Range.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Awt.FontNs.NumericShaper.Range"/></returns>
             public static Java.Awt.FontNs.NumericShaper.Range[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Awt/FontNs/TextAttribute.cs b/src/net/Netdroid/Generated/Java/Awt/FontNs/TextAttribute.cs
index 955cb59f1..87e174a80 100644
--- a/src/net/Netdroid/Generated/Java/Awt/FontNs/TextAttribute.cs
+++ b/src/net/Netdroid/Generated/Java/Awt/FontNs/TextAttribute.cs
@@ -38,355 +38,355 @@ public partial class TextAttribute
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#BACKGROUND"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#BACKGROUND"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute BACKGROUND { get { if (!_BACKGROUNDReady) { _BACKGROUNDContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "BACKGROUND"); _BACKGROUNDReady = true; } return _BACKGROUNDContent; } }
         private static Java.Awt.FontNs.TextAttribute _BACKGROUNDContent = default;
         private static bool _BACKGROUNDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#BIDI_EMBEDDING"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#BIDI_EMBEDDING"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute BIDI_EMBEDDING { get { if (!_BIDI_EMBEDDINGReady) { _BIDI_EMBEDDINGContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "BIDI_EMBEDDING"); _BIDI_EMBEDDINGReady = true; } return _BIDI_EMBEDDINGContent; } }
         private static Java.Awt.FontNs.TextAttribute _BIDI_EMBEDDINGContent = default;
         private static bool _BIDI_EMBEDDINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#CHAR_REPLACEMENT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#CHAR_REPLACEMENT"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute CHAR_REPLACEMENT { get { if (!_CHAR_REPLACEMENTReady) { _CHAR_REPLACEMENTContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "CHAR_REPLACEMENT"); _CHAR_REPLACEMENTReady = true; } return _CHAR_REPLACEMENTContent; } }
         private static Java.Awt.FontNs.TextAttribute _CHAR_REPLACEMENTContent = default;
         private static bool _CHAR_REPLACEMENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#FAMILY"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#FAMILY"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute FAMILY { get { if (!_FAMILYReady) { _FAMILYContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "FAMILY"); _FAMILYReady = true; } return _FAMILYContent; } }
         private static Java.Awt.FontNs.TextAttribute _FAMILYContent = default;
         private static bool _FAMILYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#FONT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#FONT"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute FONT { get { if (!_FONTReady) { _FONTContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "FONT"); _FONTReady = true; } return _FONTContent; } }
         private static Java.Awt.FontNs.TextAttribute _FONTContent = default;
         private static bool _FONTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#FOREGROUND"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#FOREGROUND"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute FOREGROUND { get { if (!_FOREGROUNDReady) { _FOREGROUNDContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "FOREGROUND"); _FOREGROUNDReady = true; } return _FOREGROUNDContent; } }
         private static Java.Awt.FontNs.TextAttribute _FOREGROUNDContent = default;
         private static bool _FOREGROUNDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#INPUT_METHOD_HIGHLIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#INPUT_METHOD_HIGHLIGHT"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute INPUT_METHOD_HIGHLIGHT { get { if (!_INPUT_METHOD_HIGHLIGHTReady) { _INPUT_METHOD_HIGHLIGHTContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "INPUT_METHOD_HIGHLIGHT"); _INPUT_METHOD_HIGHLIGHTReady = true; } return _INPUT_METHOD_HIGHLIGHTContent; } }
         private static Java.Awt.FontNs.TextAttribute _INPUT_METHOD_HIGHLIGHTContent = default;
         private static bool _INPUT_METHOD_HIGHLIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#INPUT_METHOD_UNDERLINE"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#INPUT_METHOD_UNDERLINE"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute INPUT_METHOD_UNDERLINE { get { if (!_INPUT_METHOD_UNDERLINEReady) { _INPUT_METHOD_UNDERLINEContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "INPUT_METHOD_UNDERLINE"); _INPUT_METHOD_UNDERLINEReady = true; } return _INPUT_METHOD_UNDERLINEContent; } }
         private static Java.Awt.FontNs.TextAttribute _INPUT_METHOD_UNDERLINEContent = default;
         private static bool _INPUT_METHOD_UNDERLINEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#JUSTIFICATION"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#JUSTIFICATION"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute JUSTIFICATION { get { if (!_JUSTIFICATIONReady) { _JUSTIFICATIONContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "JUSTIFICATION"); _JUSTIFICATIONReady = true; } return _JUSTIFICATIONContent; } }
         private static Java.Awt.FontNs.TextAttribute _JUSTIFICATIONContent = default;
         private static bool _JUSTIFICATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#KERNING"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#KERNING"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute KERNING { get { if (!_KERNINGReady) { _KERNINGContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "KERNING"); _KERNINGReady = true; } return _KERNINGContent; } }
         private static Java.Awt.FontNs.TextAttribute _KERNINGContent = default;
         private static bool _KERNINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#LIGATURES"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#LIGATURES"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute LIGATURES { get { if (!_LIGATURESReady) { _LIGATURESContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "LIGATURES"); _LIGATURESReady = true; } return _LIGATURESContent; } }
         private static Java.Awt.FontNs.TextAttribute _LIGATURESContent = default;
         private static bool _LIGATURESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#NUMERIC_SHAPING"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#NUMERIC_SHAPING"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute NUMERIC_SHAPING { get { if (!_NUMERIC_SHAPINGReady) { _NUMERIC_SHAPINGContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "NUMERIC_SHAPING"); _NUMERIC_SHAPINGReady = true; } return _NUMERIC_SHAPINGContent; } }
         private static Java.Awt.FontNs.TextAttribute _NUMERIC_SHAPINGContent = default;
         private static bool _NUMERIC_SHAPINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#POSTURE"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#POSTURE"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute POSTURE { get { if (!_POSTUREReady) { _POSTUREContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "POSTURE"); _POSTUREReady = true; } return _POSTUREContent; } }
         private static Java.Awt.FontNs.TextAttribute _POSTUREContent = default;
         private static bool _POSTUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#RUN_DIRECTION"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#RUN_DIRECTION"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute RUN_DIRECTION { get { if (!_RUN_DIRECTIONReady) { _RUN_DIRECTIONContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "RUN_DIRECTION"); _RUN_DIRECTIONReady = true; } return _RUN_DIRECTIONContent; } }
         private static Java.Awt.FontNs.TextAttribute _RUN_DIRECTIONContent = default;
         private static bool _RUN_DIRECTIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#SIZE"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#SIZE"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute SIZE { get { if (!_SIZEReady) { _SIZEContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "SIZE"); _SIZEReady = true; } return _SIZEContent; } }
         private static Java.Awt.FontNs.TextAttribute _SIZEContent = default;
         private static bool _SIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#STRIKETHROUGH"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#STRIKETHROUGH"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute STRIKETHROUGH { get { if (!_STRIKETHROUGHReady) { _STRIKETHROUGHContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "STRIKETHROUGH"); _STRIKETHROUGHReady = true; } return _STRIKETHROUGHContent; } }
         private static Java.Awt.FontNs.TextAttribute _STRIKETHROUGHContent = default;
         private static bool _STRIKETHROUGHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#SUPERSCRIPT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#SUPERSCRIPT"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute SUPERSCRIPT { get { if (!_SUPERSCRIPTReady) { _SUPERSCRIPTContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "SUPERSCRIPT"); _SUPERSCRIPTReady = true; } return _SUPERSCRIPTContent; } }
         private static Java.Awt.FontNs.TextAttribute _SUPERSCRIPTContent = default;
         private static bool _SUPERSCRIPTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#SWAP_COLORS"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#SWAP_COLORS"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute SWAP_COLORS { get { if (!_SWAP_COLORSReady) { _SWAP_COLORSContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "SWAP_COLORS"); _SWAP_COLORSReady = true; } return _SWAP_COLORSContent; } }
         private static Java.Awt.FontNs.TextAttribute _SWAP_COLORSContent = default;
         private static bool _SWAP_COLORSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#TRACKING"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#TRACKING"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute TRACKING { get { if (!_TRACKINGReady) { _TRACKINGContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "TRACKING"); _TRACKINGReady = true; } return _TRACKINGContent; } }
         private static Java.Awt.FontNs.TextAttribute _TRACKINGContent = default;
         private static bool _TRACKINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#TRANSFORM"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#TRANSFORM"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute TRANSFORM { get { if (!_TRANSFORMReady) { _TRANSFORMContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "TRANSFORM"); _TRANSFORMReady = true; } return _TRANSFORMContent; } }
         private static Java.Awt.FontNs.TextAttribute _TRANSFORMContent = default;
         private static bool _TRANSFORMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#UNDERLINE"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#UNDERLINE"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute UNDERLINE { get { if (!_UNDERLINEReady) { _UNDERLINEContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "UNDERLINE"); _UNDERLINEReady = true; } return _UNDERLINEContent; } }
         private static Java.Awt.FontNs.TextAttribute _UNDERLINEContent = default;
         private static bool _UNDERLINEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute WEIGHT { get { if (!_WEIGHTReady) { _WEIGHTContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "WEIGHT"); _WEIGHTReady = true; } return _WEIGHTContent; } }
         private static Java.Awt.FontNs.TextAttribute _WEIGHTContent = default;
         private static bool _WEIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WIDTH"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WIDTH"/>
         /// </summary>
         public static Java.Awt.FontNs.TextAttribute WIDTH { get { if (!_WIDTHReady) { _WIDTHContent = SGetField<Java.Awt.FontNs.TextAttribute>(LocalBridgeClazz, "WIDTH"); _WIDTHReady = true; } return _WIDTHContent; } }
         private static Java.Awt.FontNs.TextAttribute _WIDTHContent = default;
         private static bool _WIDTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#RUN_DIRECTION_LTR"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#RUN_DIRECTION_LTR"/>
         /// </summary>
         public static Java.Lang.Boolean RUN_DIRECTION_LTR { get { if (!_RUN_DIRECTION_LTRReady) { _RUN_DIRECTION_LTRContent = SGetField<Java.Lang.Boolean>(LocalBridgeClazz, "RUN_DIRECTION_LTR"); _RUN_DIRECTION_LTRReady = true; } return _RUN_DIRECTION_LTRContent; } }
         private static Java.Lang.Boolean _RUN_DIRECTION_LTRContent = default;
         private static bool _RUN_DIRECTION_LTRReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#RUN_DIRECTION_RTL"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#RUN_DIRECTION_RTL"/>
         /// </summary>
         public static Java.Lang.Boolean RUN_DIRECTION_RTL { get { if (!_RUN_DIRECTION_RTLReady) { _RUN_DIRECTION_RTLContent = SGetField<Java.Lang.Boolean>(LocalBridgeClazz, "RUN_DIRECTION_RTL"); _RUN_DIRECTION_RTLReady = true; } return _RUN_DIRECTION_RTLContent; } }
         private static Java.Lang.Boolean _RUN_DIRECTION_RTLContent = default;
         private static bool _RUN_DIRECTION_RTLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#STRIKETHROUGH_ON"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#STRIKETHROUGH_ON"/>
         /// </summary>
         public static Java.Lang.Boolean STRIKETHROUGH_ON { get { if (!_STRIKETHROUGH_ONReady) { _STRIKETHROUGH_ONContent = SGetField<Java.Lang.Boolean>(LocalBridgeClazz, "STRIKETHROUGH_ON"); _STRIKETHROUGH_ONReady = true; } return _STRIKETHROUGH_ONContent; } }
         private static Java.Lang.Boolean _STRIKETHROUGH_ONContent = default;
         private static bool _STRIKETHROUGH_ONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#SWAP_COLORS_ON"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#SWAP_COLORS_ON"/>
         /// </summary>
         public static Java.Lang.Boolean SWAP_COLORS_ON { get { if (!_SWAP_COLORS_ONReady) { _SWAP_COLORS_ONContent = SGetField<Java.Lang.Boolean>(LocalBridgeClazz, "SWAP_COLORS_ON"); _SWAP_COLORS_ONReady = true; } return _SWAP_COLORS_ONContent; } }
         private static Java.Lang.Boolean _SWAP_COLORS_ONContent = default;
         private static bool _SWAP_COLORS_ONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#JUSTIFICATION_FULL"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#JUSTIFICATION_FULL"/>
         /// </summary>
         public static Java.Lang.Float JUSTIFICATION_FULL { get { if (!_JUSTIFICATION_FULLReady) { _JUSTIFICATION_FULLContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "JUSTIFICATION_FULL"); _JUSTIFICATION_FULLReady = true; } return _JUSTIFICATION_FULLContent; } }
         private static Java.Lang.Float _JUSTIFICATION_FULLContent = default;
         private static bool _JUSTIFICATION_FULLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#JUSTIFICATION_NONE"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#JUSTIFICATION_NONE"/>
         /// </summary>
         public static Java.Lang.Float JUSTIFICATION_NONE { get { if (!_JUSTIFICATION_NONEReady) { _JUSTIFICATION_NONEContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "JUSTIFICATION_NONE"); _JUSTIFICATION_NONEReady = true; } return _JUSTIFICATION_NONEContent; } }
         private static Java.Lang.Float _JUSTIFICATION_NONEContent = default;
         private static bool _JUSTIFICATION_NONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#POSTURE_OBLIQUE"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#POSTURE_OBLIQUE"/>
         /// </summary>
         public static Java.Lang.Float POSTURE_OBLIQUE { get { if (!_POSTURE_OBLIQUEReady) { _POSTURE_OBLIQUEContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "POSTURE_OBLIQUE"); _POSTURE_OBLIQUEReady = true; } return _POSTURE_OBLIQUEContent; } }
         private static Java.Lang.Float _POSTURE_OBLIQUEContent = default;
         private static bool _POSTURE_OBLIQUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#POSTURE_REGULAR"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#POSTURE_REGULAR"/>
         /// </summary>
         public static Java.Lang.Float POSTURE_REGULAR { get { if (!_POSTURE_REGULARReady) { _POSTURE_REGULARContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "POSTURE_REGULAR"); _POSTURE_REGULARReady = true; } return _POSTURE_REGULARContent; } }
         private static Java.Lang.Float _POSTURE_REGULARContent = default;
         private static bool _POSTURE_REGULARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#TRACKING_LOOSE"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#TRACKING_LOOSE"/>
         /// </summary>
         public static Java.Lang.Float TRACKING_LOOSE { get { if (!_TRACKING_LOOSEReady) { _TRACKING_LOOSEContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "TRACKING_LOOSE"); _TRACKING_LOOSEReady = true; } return _TRACKING_LOOSEContent; } }
         private static Java.Lang.Float _TRACKING_LOOSEContent = default;
         private static bool _TRACKING_LOOSEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#TRACKING_TIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#TRACKING_TIGHT"/>
         /// </summary>
         public static Java.Lang.Float TRACKING_TIGHT { get { if (!_TRACKING_TIGHTReady) { _TRACKING_TIGHTContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "TRACKING_TIGHT"); _TRACKING_TIGHTReady = true; } return _TRACKING_TIGHTContent; } }
         private static Java.Lang.Float _TRACKING_TIGHTContent = default;
         private static bool _TRACKING_TIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_BOLD"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_BOLD"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_BOLD { get { if (!_WEIGHT_BOLDReady) { _WEIGHT_BOLDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_BOLD"); _WEIGHT_BOLDReady = true; } return _WEIGHT_BOLDContent; } }
         private static Java.Lang.Float _WEIGHT_BOLDContent = default;
         private static bool _WEIGHT_BOLDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_DEMIBOLD"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_DEMIBOLD"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_DEMIBOLD { get { if (!_WEIGHT_DEMIBOLDReady) { _WEIGHT_DEMIBOLDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_DEMIBOLD"); _WEIGHT_DEMIBOLDReady = true; } return _WEIGHT_DEMIBOLDContent; } }
         private static Java.Lang.Float _WEIGHT_DEMIBOLDContent = default;
         private static bool _WEIGHT_DEMIBOLDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_DEMILIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_DEMILIGHT"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_DEMILIGHT { get { if (!_WEIGHT_DEMILIGHTReady) { _WEIGHT_DEMILIGHTContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_DEMILIGHT"); _WEIGHT_DEMILIGHTReady = true; } return _WEIGHT_DEMILIGHTContent; } }
         private static Java.Lang.Float _WEIGHT_DEMILIGHTContent = default;
         private static bool _WEIGHT_DEMILIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_EXTRA_LIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_EXTRA_LIGHT"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_EXTRA_LIGHT { get { if (!_WEIGHT_EXTRA_LIGHTReady) { _WEIGHT_EXTRA_LIGHTContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_EXTRA_LIGHT"); _WEIGHT_EXTRA_LIGHTReady = true; } return _WEIGHT_EXTRA_LIGHTContent; } }
         private static Java.Lang.Float _WEIGHT_EXTRA_LIGHTContent = default;
         private static bool _WEIGHT_EXTRA_LIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_EXTRABOLD"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_EXTRABOLD"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_EXTRABOLD { get { if (!_WEIGHT_EXTRABOLDReady) { _WEIGHT_EXTRABOLDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_EXTRABOLD"); _WEIGHT_EXTRABOLDReady = true; } return _WEIGHT_EXTRABOLDContent; } }
         private static Java.Lang.Float _WEIGHT_EXTRABOLDContent = default;
         private static bool _WEIGHT_EXTRABOLDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_HEAVY"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_HEAVY"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_HEAVY { get { if (!_WEIGHT_HEAVYReady) { _WEIGHT_HEAVYContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_HEAVY"); _WEIGHT_HEAVYReady = true; } return _WEIGHT_HEAVYContent; } }
         private static Java.Lang.Float _WEIGHT_HEAVYContent = default;
         private static bool _WEIGHT_HEAVYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_LIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_LIGHT"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_LIGHT { get { if (!_WEIGHT_LIGHTReady) { _WEIGHT_LIGHTContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_LIGHT"); _WEIGHT_LIGHTReady = true; } return _WEIGHT_LIGHTContent; } }
         private static Java.Lang.Float _WEIGHT_LIGHTContent = default;
         private static bool _WEIGHT_LIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_MEDIUM"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_MEDIUM"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_MEDIUM { get { if (!_WEIGHT_MEDIUMReady) { _WEIGHT_MEDIUMContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_MEDIUM"); _WEIGHT_MEDIUMReady = true; } return _WEIGHT_MEDIUMContent; } }
         private static Java.Lang.Float _WEIGHT_MEDIUMContent = default;
         private static bool _WEIGHT_MEDIUMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_REGULAR"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_REGULAR"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_REGULAR { get { if (!_WEIGHT_REGULARReady) { _WEIGHT_REGULARContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_REGULAR"); _WEIGHT_REGULARReady = true; } return _WEIGHT_REGULARContent; } }
         private static Java.Lang.Float _WEIGHT_REGULARContent = default;
         private static bool _WEIGHT_REGULARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_SEMIBOLD"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_SEMIBOLD"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_SEMIBOLD { get { if (!_WEIGHT_SEMIBOLDReady) { _WEIGHT_SEMIBOLDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_SEMIBOLD"); _WEIGHT_SEMIBOLDReady = true; } return _WEIGHT_SEMIBOLDContent; } }
         private static Java.Lang.Float _WEIGHT_SEMIBOLDContent = default;
         private static bool _WEIGHT_SEMIBOLDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WEIGHT_ULTRABOLD"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WEIGHT_ULTRABOLD"/>
         /// </summary>
         public static Java.Lang.Float WEIGHT_ULTRABOLD { get { if (!_WEIGHT_ULTRABOLDReady) { _WEIGHT_ULTRABOLDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WEIGHT_ULTRABOLD"); _WEIGHT_ULTRABOLDReady = true; } return _WEIGHT_ULTRABOLDContent; } }
         private static Java.Lang.Float _WEIGHT_ULTRABOLDContent = default;
         private static bool _WEIGHT_ULTRABOLDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WIDTH_CONDENSED"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WIDTH_CONDENSED"/>
         /// </summary>
         public static Java.Lang.Float WIDTH_CONDENSED { get { if (!_WIDTH_CONDENSEDReady) { _WIDTH_CONDENSEDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WIDTH_CONDENSED"); _WIDTH_CONDENSEDReady = true; } return _WIDTH_CONDENSEDContent; } }
         private static Java.Lang.Float _WIDTH_CONDENSEDContent = default;
         private static bool _WIDTH_CONDENSEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WIDTH_EXTENDED"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WIDTH_EXTENDED"/>
         /// </summary>
         public static Java.Lang.Float WIDTH_EXTENDED { get { if (!_WIDTH_EXTENDEDReady) { _WIDTH_EXTENDEDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WIDTH_EXTENDED"); _WIDTH_EXTENDEDReady = true; } return _WIDTH_EXTENDEDContent; } }
         private static Java.Lang.Float _WIDTH_EXTENDEDContent = default;
         private static bool _WIDTH_EXTENDEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WIDTH_REGULAR"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WIDTH_REGULAR"/>
         /// </summary>
         public static Java.Lang.Float WIDTH_REGULAR { get { if (!_WIDTH_REGULARReady) { _WIDTH_REGULARContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WIDTH_REGULAR"); _WIDTH_REGULARReady = true; } return _WIDTH_REGULARContent; } }
         private static Java.Lang.Float _WIDTH_REGULARContent = default;
         private static bool _WIDTH_REGULARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WIDTH_SEMI_CONDENSED"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WIDTH_SEMI_CONDENSED"/>
         /// </summary>
         public static Java.Lang.Float WIDTH_SEMI_CONDENSED { get { if (!_WIDTH_SEMI_CONDENSEDReady) { _WIDTH_SEMI_CONDENSEDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WIDTH_SEMI_CONDENSED"); _WIDTH_SEMI_CONDENSEDReady = true; } return _WIDTH_SEMI_CONDENSEDContent; } }
         private static Java.Lang.Float _WIDTH_SEMI_CONDENSEDContent = default;
         private static bool _WIDTH_SEMI_CONDENSEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#WIDTH_SEMI_EXTENDED"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#WIDTH_SEMI_EXTENDED"/>
         /// </summary>
         public static Java.Lang.Float WIDTH_SEMI_EXTENDED { get { if (!_WIDTH_SEMI_EXTENDEDReady) { _WIDTH_SEMI_EXTENDEDContent = SGetField<Java.Lang.Float>(LocalBridgeClazz, "WIDTH_SEMI_EXTENDED"); _WIDTH_SEMI_EXTENDEDReady = true; } return _WIDTH_SEMI_EXTENDEDContent; } }
         private static Java.Lang.Float _WIDTH_SEMI_EXTENDEDContent = default;
         private static bool _WIDTH_SEMI_EXTENDEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#KERNING_ON"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#KERNING_ON"/>
         /// </summary>
         public static Java.Lang.Integer KERNING_ON { get { if (!_KERNING_ONReady) { _KERNING_ONContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "KERNING_ON"); _KERNING_ONReady = true; } return _KERNING_ONContent; } }
         private static Java.Lang.Integer _KERNING_ONContent = default;
         private static bool _KERNING_ONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#LIGATURES_ON"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#LIGATURES_ON"/>
         /// </summary>
         public static Java.Lang.Integer LIGATURES_ON { get { if (!_LIGATURES_ONReady) { _LIGATURES_ONContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "LIGATURES_ON"); _LIGATURES_ONReady = true; } return _LIGATURES_ONContent; } }
         private static Java.Lang.Integer _LIGATURES_ONContent = default;
         private static bool _LIGATURES_ONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#SUPERSCRIPT_SUB"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#SUPERSCRIPT_SUB"/>
         /// </summary>
         public static Java.Lang.Integer SUPERSCRIPT_SUB { get { if (!_SUPERSCRIPT_SUBReady) { _SUPERSCRIPT_SUBContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "SUPERSCRIPT_SUB"); _SUPERSCRIPT_SUBReady = true; } return _SUPERSCRIPT_SUBContent; } }
         private static Java.Lang.Integer _SUPERSCRIPT_SUBContent = default;
         private static bool _SUPERSCRIPT_SUBReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#SUPERSCRIPT_SUPER"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#SUPERSCRIPT_SUPER"/>
         /// </summary>
         public static Java.Lang.Integer SUPERSCRIPT_SUPER { get { if (!_SUPERSCRIPT_SUPERReady) { _SUPERSCRIPT_SUPERContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "SUPERSCRIPT_SUPER"); _SUPERSCRIPT_SUPERReady = true; } return _SUPERSCRIPT_SUPERContent; } }
         private static Java.Lang.Integer _SUPERSCRIPT_SUPERContent = default;
         private static bool _SUPERSCRIPT_SUPERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#UNDERLINE_LOW_DASHED"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#UNDERLINE_LOW_DASHED"/>
         /// </summary>
         public static Java.Lang.Integer UNDERLINE_LOW_DASHED { get { if (!_UNDERLINE_LOW_DASHEDReady) { _UNDERLINE_LOW_DASHEDContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "UNDERLINE_LOW_DASHED"); _UNDERLINE_LOW_DASHEDReady = true; } return _UNDERLINE_LOW_DASHEDContent; } }
         private static Java.Lang.Integer _UNDERLINE_LOW_DASHEDContent = default;
         private static bool _UNDERLINE_LOW_DASHEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#UNDERLINE_LOW_DOTTED"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#UNDERLINE_LOW_DOTTED"/>
         /// </summary>
         public static Java.Lang.Integer UNDERLINE_LOW_DOTTED { get { if (!_UNDERLINE_LOW_DOTTEDReady) { _UNDERLINE_LOW_DOTTEDContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "UNDERLINE_LOW_DOTTED"); _UNDERLINE_LOW_DOTTEDReady = true; } return _UNDERLINE_LOW_DOTTEDContent; } }
         private static Java.Lang.Integer _UNDERLINE_LOW_DOTTEDContent = default;
         private static bool _UNDERLINE_LOW_DOTTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#UNDERLINE_LOW_GRAY"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#UNDERLINE_LOW_GRAY"/>
         /// </summary>
         public static Java.Lang.Integer UNDERLINE_LOW_GRAY { get { if (!_UNDERLINE_LOW_GRAYReady) { _UNDERLINE_LOW_GRAYContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "UNDERLINE_LOW_GRAY"); _UNDERLINE_LOW_GRAYReady = true; } return _UNDERLINE_LOW_GRAYContent; } }
         private static Java.Lang.Integer _UNDERLINE_LOW_GRAYContent = default;
         private static bool _UNDERLINE_LOW_GRAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#UNDERLINE_LOW_ONE_PIXEL"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#UNDERLINE_LOW_ONE_PIXEL"/>
         /// </summary>
         public static Java.Lang.Integer UNDERLINE_LOW_ONE_PIXEL { get { if (!_UNDERLINE_LOW_ONE_PIXELReady) { _UNDERLINE_LOW_ONE_PIXELContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "UNDERLINE_LOW_ONE_PIXEL"); _UNDERLINE_LOW_ONE_PIXELReady = true; } return _UNDERLINE_LOW_ONE_PIXELContent; } }
         private static Java.Lang.Integer _UNDERLINE_LOW_ONE_PIXELContent = default;
         private static bool _UNDERLINE_LOW_ONE_PIXELReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#UNDERLINE_LOW_TWO_PIXEL"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#UNDERLINE_LOW_TWO_PIXEL"/>
         /// </summary>
         public static Java.Lang.Integer UNDERLINE_LOW_TWO_PIXEL { get { if (!_UNDERLINE_LOW_TWO_PIXELReady) { _UNDERLINE_LOW_TWO_PIXELContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "UNDERLINE_LOW_TWO_PIXEL"); _UNDERLINE_LOW_TWO_PIXELReady = true; } return _UNDERLINE_LOW_TWO_PIXELContent; } }
         private static Java.Lang.Integer _UNDERLINE_LOW_TWO_PIXELContent = default;
         private static bool _UNDERLINE_LOW_TWO_PIXELReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/awt/font/TextAttribute.html#UNDERLINE_ON"/>
+        /// <see href="https://developer.android.com/reference/java/awt/font/TextAttribute.html#UNDERLINE_ON"/>
         /// </summary>
         public static Java.Lang.Integer UNDERLINE_ON { get { if (!_UNDERLINE_ONReady) { _UNDERLINE_ONContent = SGetField<Java.Lang.Integer>(LocalBridgeClazz, "UNDERLINE_ON"); _UNDERLINE_ONReady = true; } return _UNDERLINE_ONContent; } }
         private static Java.Lang.Integer _UNDERLINE_ONContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Beans/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Beans/AllPackageClasses.cs
index 27f57705d..0bfab8012 100644
--- a/src/net/Netdroid/Generated/Java/Beans/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Beans/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Beans
 {
     #region IndexedPropertyChangeEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.desktop/java/beans/IndexedPropertyChangeEvent.html"/>
+    /// <see href="https://developer.android.com/reference/java/beans/IndexedPropertyChangeEvent.html"/>
     /// </summary>
     public partial class IndexedPropertyChangeEvent : Java.Beans.PropertyChangeEvent
     {
@@ -72,7 +72,7 @@ public IndexedPropertyChangeEvent(params object[] args) : base(args) { }
 
     #region PropertyChangeEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeEvent.html"/>
+    /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeEvent.html"/>
     /// </summary>
     public partial class PropertyChangeEvent : Java.Util.EventObject
     {
@@ -116,7 +116,7 @@ public PropertyChangeEvent(params object[] args) : base(args) { }
 
     #region PropertyChangeListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListener.html"/>
+    /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeListener.html"/>
     /// </summary>
     public partial class PropertyChangeListener : Java.Util.EventListener
     {
@@ -125,10 +125,13 @@ public partial class PropertyChangeListener : Java.Util.EventListener
         /// </summary>
         public PropertyChangeListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.beans.PropertyChangeListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.beans.PropertyChangeListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -150,10 +153,13 @@ public partial class PropertyChangeListenerDirect : PropertyChangeListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.beans.PropertyChangeListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.beans.PropertyChangeListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -175,7 +181,7 @@ protected override void InitializeHandlers() { }
 
     #region PropertyChangeListenerProxy
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListenerProxy.html"/>
+    /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeListenerProxy.html"/>
     /// </summary>
     public partial class PropertyChangeListenerProxy : Java.Util.EventListenerProxy<Java.Beans.PropertyChangeListener>
     {
@@ -219,7 +225,7 @@ public PropertyChangeListenerProxy(params object[] args) : base(args) { }
 
     #region PropertyChangeSupport
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html"/>
+    /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html"/>
     /// </summary>
     public partial class PropertyChangeSupport : Java.Io.Serializable
     {
diff --git a/src/net/Netdroid/Generated/Java/Beans/IndexedPropertyChangeEvent.cs b/src/net/Netdroid/Generated/Java/Beans/IndexedPropertyChangeEvent.cs
index 8a235a952..521572e81 100644
--- a/src/net/Netdroid/Generated/Java/Beans/IndexedPropertyChangeEvent.cs
+++ b/src/net/Netdroid/Generated/Java/Beans/IndexedPropertyChangeEvent.cs
@@ -30,7 +30,7 @@ public partial class IndexedPropertyChangeEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/IndexedPropertyChangeEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/IndexedPropertyChangeEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -58,11 +58,12 @@ public IndexedPropertyChangeEvent(object arg0, Java.Lang.String arg1, object arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/IndexedPropertyChangeEvent.html#getIndex()"/> 
+        /// <see href="https://developer.android.com/reference/java/beans/IndexedPropertyChangeEvent.html#getIndex()"/>
         /// </summary>
-        public int Index
+        /// <returns><see cref="int"/></returns>
+        public int GetIndex()
         {
-            get { return IExecuteWithSignature<int>("getIndex", "()I"); }
+            return IExecuteWithSignature<int>("getIndex", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Beans/PropertyChangeEvent.cs b/src/net/Netdroid/Generated/Java/Beans/PropertyChangeEvent.cs
index 5e31c7207..e02acd3e8 100644
--- a/src/net/Netdroid/Generated/Java/Beans/PropertyChangeEvent.cs
+++ b/src/net/Netdroid/Generated/Java/Beans/PropertyChangeEvent.cs
@@ -30,7 +30,7 @@ public partial class PropertyChangeEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeEvent.html#%3Cinit%3E(java.lang.Object,java.lang.String,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -57,32 +57,44 @@ public PropertyChangeEvent(object arg0, Java.Lang.String arg1, object arg2, obje
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeEvent.html#getNewValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeEvent.html#getNewValue()"/>
         /// </summary>
-        public object NewValue
+        /// <returns><see cref="object"/></returns>
+        public object GetNewValue()
         {
-            get { return IExecuteWithSignature("getNewValue", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature("getNewValue", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeEvent.html#getOldValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeEvent.html#getOldValue()"/>
         /// </summary>
-        public object OldValue
+        /// <returns><see cref="object"/></returns>
+        public object GetOldValue()
         {
-            get { return IExecuteWithSignature("getOldValue", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature("getOldValue", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeEvent.html#getPropagationId()"/> <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeEvent.html#setPropagationId(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeEvent.html#getPropagationId()"/>
         /// </summary>
-        public object PropagationId
+        /// <returns><see cref="object"/></returns>
+        public object GetPropagationId()
         {
-            get { return IExecuteWithSignature("getPropagationId", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setPropagationId", "(Ljava/lang/Object;)V", value); }
+            return IExecuteWithSignature("getPropagationId", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeEvent.html#getPropertyName()"/> 
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeEvent.html#getPropertyName()"/>
         /// </summary>
-        public Java.Lang.String PropertyName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPropertyName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeEvent.html#setPropagationId(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetPropagationId(object arg0)
+        {
+            IExecuteWithSignature("setPropagationId", "(Ljava/lang/Object;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Beans/PropertyChangeListener.cs b/src/net/Netdroid/Generated/Java/Beans/PropertyChangeListener.cs
index 82636a0f6..6fab694ea 100644
--- a/src/net/Netdroid/Generated/Java/Beans/PropertyChangeListener.cs
+++ b/src/net/Netdroid/Generated/Java/Beans/PropertyChangeListener.cs
@@ -27,7 +27,7 @@ namespace Java.Beans
 {
     #region IPropertyChangeListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.beans.PropertyChangeListener implementing <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.beans.PropertyChangeListener implementing <see href="https://developer.android.com/reference/java/beans/PropertyChangeListener.html"/>
     /// </summary>
     public partial interface IPropertyChangeListener
     {
@@ -68,15 +68,15 @@ public partial class PropertyChangeListener : Java.Beans.IPropertyChangeListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("propertyChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Beans.PropertyChangeEvent>>>(PropertyChangeEventHandler));
+            AddEventHandler("propertyChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Beans.PropertyChangeEvent>>>(PropertyChangeEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListener.html#propertyChange(java.beans.PropertyChangeEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/beans/PropertyChangeListener.html#propertyChange(java.beans.PropertyChangeEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnPropertyChange"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Beans.PropertyChangeEvent> OnPropertyChange { get; set; } = null;
+        public global::System.Action<Java.Beans.PropertyChangeEvent> OnPropertyChange { get; set; } = null;
 
         void PropertyChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Beans.PropertyChangeEvent>> data)
         {
@@ -85,7 +85,7 @@ void PropertyChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListener.html#propertyChange(java.beans.PropertyChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeListener.html#propertyChange(java.beans.PropertyChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Beans.PropertyChangeEvent"/></param>
         public virtual void PropertyChange(Java.Beans.PropertyChangeEvent arg0)
@@ -124,7 +124,7 @@ public partial class PropertyChangeListenerDirect : Java.Beans.IPropertyChangeLi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListener.html#propertyChange(java.beans.PropertyChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeListener.html#propertyChange(java.beans.PropertyChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Beans.PropertyChangeEvent"/></param>
         public override void PropertyChange(Java.Beans.PropertyChangeEvent arg0)
diff --git a/src/net/Netdroid/Generated/Java/Beans/PropertyChangeListenerProxy.cs b/src/net/Netdroid/Generated/Java/Beans/PropertyChangeListenerProxy.cs
index 0e7c68ab5..914efd18d 100644
--- a/src/net/Netdroid/Generated/Java/Beans/PropertyChangeListenerProxy.cs
+++ b/src/net/Netdroid/Generated/Java/Beans/PropertyChangeListenerProxy.cs
@@ -30,7 +30,7 @@ public partial class PropertyChangeListenerProxy
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListenerProxy.html#%3Cinit%3E(java.lang.String,java.beans.PropertyChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeListenerProxy.html#%3Cinit%3E(java.lang.String,java.beans.PropertyChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Beans.PropertyChangeListener"/></param>
@@ -59,14 +59,15 @@ public PropertyChangeListenerProxy(Java.Lang.String arg0, Java.Beans.PropertyCha
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListenerProxy.html#getPropertyName()"/> 
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeListenerProxy.html#getPropertyName()"/>
         /// </summary>
-        public Java.Lang.String PropertyName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPropertyName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPropertyName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeListenerProxy.html#propertyChange(java.beans.PropertyChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeListenerProxy.html#propertyChange(java.beans.PropertyChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Beans.PropertyChangeEvent"/></param>
         public void PropertyChange(Java.Beans.PropertyChangeEvent arg0)
diff --git a/src/net/Netdroid/Generated/Java/Beans/PropertyChangeSupport.cs b/src/net/Netdroid/Generated/Java/Beans/PropertyChangeSupport.cs
index 7a3f41471..5f322576a 100644
--- a/src/net/Netdroid/Generated/Java/Beans/PropertyChangeSupport.cs
+++ b/src/net/Netdroid/Generated/Java/Beans/PropertyChangeSupport.cs
@@ -30,7 +30,7 @@ public partial class PropertyChangeSupport
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public PropertyChangeSupport(object arg0)
@@ -54,14 +54,7 @@ public PropertyChangeSupport(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#getPropertyChangeListeners()"/> 
-        /// </summary>
-        public Java.Beans.PropertyChangeListener[] PropertyChangeListeners
-        {
-            get { return IExecuteWithSignatureArray<Java.Beans.PropertyChangeListener>("getPropertyChangeListeners", "()[Ljava/beans/PropertyChangeListener;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#hasListeners(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#hasListeners(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -70,7 +63,15 @@ public bool HasListeners(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("hasListeners", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#getPropertyChangeListeners(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#getPropertyChangeListeners()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Beans.PropertyChangeListener"/></returns>
+        public Java.Beans.PropertyChangeListener[] GetPropertyChangeListeners()
+        {
+            return IExecuteWithSignatureArray<Java.Beans.PropertyChangeListener>("getPropertyChangeListeners", "()[Ljava/beans/PropertyChangeListener;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#getPropertyChangeListeners(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Beans.PropertyChangeListener"/></returns>
@@ -79,7 +80,7 @@ public Java.Beans.PropertyChangeListener[] GetPropertyChangeListeners(Java.Lang.
             return IExecuteWithSignatureArray<Java.Beans.PropertyChangeListener>("getPropertyChangeListeners", "(Ljava/lang/String;)[Ljava/beans/PropertyChangeListener;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#addPropertyChangeListener(java.beans.PropertyChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#addPropertyChangeListener(java.beans.PropertyChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Beans.PropertyChangeListener"/></param>
         public void AddPropertyChangeListener(Java.Beans.PropertyChangeListener arg0)
@@ -87,7 +88,7 @@ public void AddPropertyChangeListener(Java.Beans.PropertyChangeListener arg0)
             IExecuteWithSignature("addPropertyChangeListener", "(Ljava/beans/PropertyChangeListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#addPropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#addPropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Beans.PropertyChangeListener"/></param>
@@ -96,7 +97,7 @@ public void AddPropertyChangeListener(Java.Lang.String arg0, Java.Beans.Property
             IExecute("addPropertyChangeListener", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#fireIndexedPropertyChange(java.lang.String,int,boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#fireIndexedPropertyChange(java.lang.String,int,boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -107,7 +108,7 @@ public void FireIndexedPropertyChange(Java.Lang.String arg0, int arg1, bool arg2
             IExecute("fireIndexedPropertyChange", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#fireIndexedPropertyChange(java.lang.String,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#fireIndexedPropertyChange(java.lang.String,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -118,7 +119,7 @@ public void FireIndexedPropertyChange(Java.Lang.String arg0, int arg1, int arg2,
             IExecute("fireIndexedPropertyChange", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#fireIndexedPropertyChange(java.lang.String,int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#fireIndexedPropertyChange(java.lang.String,int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -129,7 +130,7 @@ public void FireIndexedPropertyChange(Java.Lang.String arg0, int arg1, object ar
             IExecute("fireIndexedPropertyChange", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#firePropertyChange(java.beans.PropertyChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#firePropertyChange(java.beans.PropertyChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Beans.PropertyChangeEvent"/></param>
         public void FirePropertyChange(Java.Beans.PropertyChangeEvent arg0)
@@ -137,7 +138,7 @@ public void FirePropertyChange(Java.Beans.PropertyChangeEvent arg0)
             IExecuteWithSignature("firePropertyChange", "(Ljava/beans/PropertyChangeEvent;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#firePropertyChange(java.lang.String,boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#firePropertyChange(java.lang.String,boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -147,7 +148,7 @@ public void FirePropertyChange(Java.Lang.String arg0, bool arg1, bool arg2)
             IExecute("firePropertyChange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#firePropertyChange(java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#firePropertyChange(java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -157,7 +158,7 @@ public void FirePropertyChange(Java.Lang.String arg0, int arg1, int arg2)
             IExecute("firePropertyChange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -167,7 +168,7 @@ public void FirePropertyChange(Java.Lang.String arg0, object arg1, object arg2)
             IExecute("firePropertyChange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#removePropertyChangeListener(java.beans.PropertyChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#removePropertyChangeListener(java.beans.PropertyChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Beans.PropertyChangeListener"/></param>
         public void RemovePropertyChangeListener(Java.Beans.PropertyChangeListener arg0)
@@ -175,7 +176,7 @@ public void RemovePropertyChangeListener(Java.Beans.PropertyChangeListener arg0)
             IExecuteWithSignature("removePropertyChangeListener", "(Ljava/beans/PropertyChangeListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.desktop/java/beans/PropertyChangeSupport.html#removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/beans/PropertyChangeSupport.html#removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Beans.PropertyChangeListener"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Io/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Io/AllPackageClasses.cs
index 833fe4862..cbdf1da06 100644
--- a/src/net/Netdroid/Generated/Java/Io/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Io/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Io
 {
     #region BufferedInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/BufferedInputStream.html"/>
     /// </summary>
     public partial class BufferedInputStream : Java.Io.FilterInputStream
     {
@@ -72,7 +72,7 @@ public BufferedInputStream(params object[] args) : base(args) { }
 
     #region BufferedOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/BufferedOutputStream.html"/>
     /// </summary>
     public partial class BufferedOutputStream : Java.Io.FilterOutputStream
     {
@@ -116,7 +116,7 @@ public BufferedOutputStream(params object[] args) : base(args) { }
 
     #region BufferedReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/BufferedReader.html"/>
     /// </summary>
     public partial class BufferedReader : Java.Io.Reader
     {
@@ -160,7 +160,7 @@ public BufferedReader(params object[] args) : base(args) { }
 
     #region BufferedWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedWriter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/BufferedWriter.html"/>
     /// </summary>
     public partial class BufferedWriter : Java.Io.Writer
     {
@@ -204,7 +204,7 @@ public BufferedWriter(params object[] args) : base(args) { }
 
     #region ByteArrayInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ByteArrayInputStream.html"/>
     /// </summary>
     public partial class ByteArrayInputStream : Java.Io.InputStream
     {
@@ -248,7 +248,7 @@ public ByteArrayInputStream(params object[] args) : base(args) { }
 
     #region ByteArrayOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html"/>
     /// </summary>
     public partial class ByteArrayOutputStream : Java.Io.OutputStream
     {
@@ -292,7 +292,7 @@ public ByteArrayOutputStream(params object[] args) : base(args) { }
 
     #region CharArrayReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/CharArrayReader.html"/>
     /// </summary>
     public partial class CharArrayReader : Java.Io.Reader
     {
@@ -336,7 +336,7 @@ public CharArrayReader(params object[] args) : base(args) { }
 
     #region CharArrayWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayWriter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/CharArrayWriter.html"/>
     /// </summary>
     public partial class CharArrayWriter : Java.Io.Writer
     {
@@ -380,7 +380,7 @@ public CharArrayWriter(params object[] args) : base(args) { }
 
     #region CharConversionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/CharConversionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/CharConversionException.html"/>
     /// </summary>
     public partial class CharConversionException : Java.Io.IOException
     {
@@ -397,7 +397,7 @@ public partial class CharConversionException : Java.Io.IOException
 
     #region Closeable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/Closeable.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/Closeable.html"/>
     /// </summary>
     public partial class Closeable : Java.Lang.AutoCloseable
     {
@@ -405,12 +405,12 @@ public partial class Closeable : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Closeable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Closeable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Closeable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Closeable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Closeable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Closeable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -443,7 +443,7 @@ public Closeable(params object[] args) : base(args) { }
 
     #region Console
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/Console.html"/>
     /// </summary>
     public partial class Console : Java.Io.Flushable
     {
@@ -487,7 +487,7 @@ public Console(params object[] args) : base(args) { }
 
     #region DataInput
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/DataInput.html"/>
     /// </summary>
     public partial class DataInput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DataInput>
     {
@@ -495,12 +495,12 @@ public partial class DataInput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DataInp
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DataInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DataInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DataInput() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DataInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DataInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DataInput(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -533,7 +533,7 @@ public DataInput(params object[] args) : base(args) { }
 
     #region DataInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html"/>
     /// </summary>
     public partial class DataInputStream : Java.Io.FilterInputStream
     {
@@ -577,7 +577,7 @@ public DataInputStream(params object[] args) : base(args) { }
 
     #region DataOutput
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/DataOutput.html"/>
     /// </summary>
     public partial class DataOutput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DataOutput>
     {
@@ -585,12 +585,12 @@ public partial class DataOutput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DataOu
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DataOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DataOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DataOutput() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DataOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DataOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DataOutput(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -623,7 +623,7 @@ public DataOutput(params object[] args) : base(args) { }
 
     #region DataOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html"/>
     /// </summary>
     public partial class DataOutputStream : Java.Io.FilterOutputStream
     {
@@ -667,7 +667,7 @@ public DataOutputStream(params object[] args) : base(args) { }
 
     #region EOFException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/EOFException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/EOFException.html"/>
     /// </summary>
     public partial class EOFException : Java.Io.IOException
     {
@@ -684,7 +684,7 @@ public partial class EOFException : Java.Io.IOException
 
     #region Externalizable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/Externalizable.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/Externalizable.html"/>
     /// </summary>
     public partial class Externalizable : Java.Io.Serializable
     {
@@ -692,12 +692,12 @@ public partial class Externalizable : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Externalizable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Externalizable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Externalizable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Externalizable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Externalizable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Externalizable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -730,7 +730,7 @@ public Externalizable(params object[] args) : base(args) { }
 
     #region File
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/File.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/File.html"/>
     /// </summary>
     public partial class File : MASES.JCOBridge.C2JBridge.JVMBridgeBase<File>
     {
@@ -774,7 +774,7 @@ public File(params object[] args) : base(args) { }
 
     #region FileDescriptor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FileDescriptor.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FileDescriptor.html"/>
     /// </summary>
     public partial class FileDescriptor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileDescriptor>
     {
@@ -818,7 +818,7 @@ public FileDescriptor(params object[] args) : base(args) { }
 
     #region FileFilter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FileFilter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FileFilter.html"/>
     /// </summary>
     public partial class FileFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileFilter>
     {
@@ -826,12 +826,12 @@ public partial class FileFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileFi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -864,7 +864,7 @@ public FileFilter(params object[] args) : base(args) { }
 
     #region FileInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FileInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FileInputStream.html"/>
     /// </summary>
     public partial class FileInputStream : Java.Io.InputStream
     {
@@ -908,7 +908,7 @@ public FileInputStream(params object[] args) : base(args) { }
 
     #region FilenameFilter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FilenameFilter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FilenameFilter.html"/>
     /// </summary>
     public partial class FilenameFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FilenameFilter>
     {
@@ -916,12 +916,12 @@ public partial class FilenameFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Fi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FilenameFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FilenameFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FilenameFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FilenameFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FilenameFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FilenameFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -954,7 +954,7 @@ public FilenameFilter(params object[] args) : base(args) { }
 
     #region FileNotFoundException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FileNotFoundException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FileNotFoundException.html"/>
     /// </summary>
     public partial class FileNotFoundException : Java.Io.IOException
     {
@@ -971,7 +971,7 @@ public partial class FileNotFoundException : Java.Io.IOException
 
     #region FileOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FileOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FileOutputStream.html"/>
     /// </summary>
     public partial class FileOutputStream : Java.Io.OutputStream
     {
@@ -1015,7 +1015,7 @@ public FileOutputStream(params object[] args) : base(args) { }
 
     #region FilePermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FilePermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FilePermission.html"/>
     /// </summary>
     public partial class FilePermission : Java.Security.Permission
     {
@@ -1059,7 +1059,7 @@ public FilePermission(params object[] args) : base(args) { }
 
     #region FileReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FileReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FileReader.html"/>
     /// </summary>
     public partial class FileReader : Java.Io.InputStreamReader
     {
@@ -1103,7 +1103,7 @@ public FileReader(params object[] args) : base(args) { }
 
     #region FileWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FileWriter.html"/>
     /// </summary>
     public partial class FileWriter : Java.Io.OutputStreamWriter
     {
@@ -1147,7 +1147,7 @@ public FileWriter(params object[] args) : base(args) { }
 
     #region FilterInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FilterInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FilterInputStream.html"/>
     /// </summary>
     public partial class FilterInputStream : Java.Io.InputStream
     {
@@ -1191,7 +1191,7 @@ public FilterInputStream(params object[] args) : base(args) { }
 
     #region FilterOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FilterOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FilterOutputStream.html"/>
     /// </summary>
     public partial class FilterOutputStream : Java.Io.OutputStream
     {
@@ -1235,7 +1235,7 @@ public FilterOutputStream(params object[] args) : base(args) { }
 
     #region FilterReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FilterReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FilterReader.html"/>
     /// </summary>
     public partial class FilterReader : Java.Io.Reader
     {
@@ -1243,12 +1243,12 @@ public partial class FilterReader : Java.Io.Reader
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FilterReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FilterReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FilterReader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FilterReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FilterReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FilterReader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1281,7 +1281,7 @@ public FilterReader(params object[] args) : base(args) { }
 
     #region FilterWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/FilterWriter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/FilterWriter.html"/>
     /// </summary>
     public partial class FilterWriter : Java.Io.Writer
     {
@@ -1289,12 +1289,12 @@ public partial class FilterWriter : Java.Io.Writer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FilterWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FilterWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FilterWriter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FilterWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FilterWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FilterWriter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1327,7 +1327,7 @@ public FilterWriter(params object[] args) : base(args) { }
 
     #region Flushable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/Flushable.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/Flushable.html"/>
     /// </summary>
     public partial class Flushable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Flushable>
     {
@@ -1335,12 +1335,12 @@ public partial class Flushable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Flushab
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Flushable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Flushable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Flushable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Flushable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Flushable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Flushable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1373,7 +1373,7 @@ public Flushable(params object[] args) : base(args) { }
 
     #region InputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/InputStream.html"/>
     /// </summary>
     public partial class InputStream : Java.Io.Closeable
     {
@@ -1381,12 +1381,12 @@ public partial class InputStream : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InputStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InputStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InputStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InputStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1419,7 +1419,7 @@ public InputStream(params object[] args) : base(args) { }
 
     #region InputStreamReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/InputStreamReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/InputStreamReader.html"/>
     /// </summary>
     public partial class InputStreamReader : Java.Io.Reader
     {
@@ -1463,7 +1463,7 @@ public InputStreamReader(params object[] args) : base(args) { }
 
     #region InterruptedIOException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/InterruptedIOException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/InterruptedIOException.html"/>
     /// </summary>
     public partial class InterruptedIOException : Java.Io.IOException
     {
@@ -1480,7 +1480,7 @@ public partial class InterruptedIOException : Java.Io.IOException
 
     #region InvalidClassException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/InvalidClassException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/InvalidClassException.html"/>
     /// </summary>
     public partial class InvalidClassException : Java.Io.ObjectStreamException
     {
@@ -1497,7 +1497,7 @@ public partial class InvalidClassException : Java.Io.ObjectStreamException
 
     #region InvalidObjectException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/InvalidObjectException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/InvalidObjectException.html"/>
     /// </summary>
     public partial class InvalidObjectException : Java.Io.ObjectStreamException
     {
@@ -1514,7 +1514,7 @@ public partial class InvalidObjectException : Java.Io.ObjectStreamException
 
     #region IOError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/IOError.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/IOError.html"/>
     /// </summary>
     public partial class IOError : Java.Lang.Error
     {
@@ -1531,7 +1531,7 @@ public partial class IOError : Java.Lang.Error
 
     #region IOException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/IOException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/IOException.html"/>
     /// </summary>
     public partial class IOException : Java.Lang.Exception
     {
@@ -1548,9 +1548,9 @@ public partial class IOException : Java.Lang.Exception
 
     #region LineNumberInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/LineNumberInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/LineNumberInputStream.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LineNumberInputStream : Java.Io.FilterInputStream
     {
         const string _bridgeClassName = "java.io.LineNumberInputStream";
@@ -1593,7 +1593,7 @@ public LineNumberInputStream(params object[] args) : base(args) { }
 
     #region LineNumberReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/LineNumberReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/LineNumberReader.html"/>
     /// </summary>
     public partial class LineNumberReader : Java.Io.BufferedReader
     {
@@ -1637,7 +1637,7 @@ public LineNumberReader(params object[] args) : base(args) { }
 
     #region NotActiveException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/NotActiveException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/NotActiveException.html"/>
     /// </summary>
     public partial class NotActiveException : Java.Io.ObjectStreamException
     {
@@ -1654,7 +1654,7 @@ public partial class NotActiveException : Java.Io.ObjectStreamException
 
     #region NotSerializableException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/NotSerializableException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/NotSerializableException.html"/>
     /// </summary>
     public partial class NotSerializableException : Java.Io.ObjectStreamException
     {
@@ -1671,7 +1671,7 @@ public partial class NotSerializableException : Java.Io.ObjectStreamException
 
     #region ObjectInput
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInput.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectInput.html"/>
     /// </summary>
     public partial class ObjectInput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ObjectInput>
     {
@@ -1679,12 +1679,12 @@ public partial class ObjectInput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Objec
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ObjectInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObjectInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObjectInput() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ObjectInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObjectInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObjectInput(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1717,7 +1717,7 @@ public ObjectInput(params object[] args) : base(args) { }
 
     #region ObjectInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html"/>
     /// </summary>
     public partial class ObjectInputStream : Java.Io.InputStream
     {
@@ -1757,7 +1757,7 @@ public ObjectInputStream(params object[] args) : base(args) { }
         // TODO: complete the class
         #region GetField
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html"/>
         /// </summary>
         public partial class GetField : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GetField>
         {
@@ -1765,12 +1765,12 @@ public partial class GetField : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GetField
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("GetField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GetField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GetField() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("GetField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("GetField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public GetField(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1807,7 +1807,7 @@ public GetField(params object[] args) : base(args) { }
 
     #region ObjectInputValidation
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputValidation.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectInputValidation.html"/>
     /// </summary>
     public partial class ObjectInputValidation : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ObjectInputValidation>
     {
@@ -1815,12 +1815,12 @@ public partial class ObjectInputValidation : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ObjectInputValidation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObjectInputValidation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObjectInputValidation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ObjectInputValidation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObjectInputValidation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObjectInputValidation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1853,7 +1853,7 @@ public ObjectInputValidation(params object[] args) : base(args) { }
 
     #region ObjectOutput
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutput.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectOutput.html"/>
     /// </summary>
     public partial class ObjectOutput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ObjectOutput>
     {
@@ -1861,12 +1861,12 @@ public partial class ObjectOutput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Obje
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ObjectOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObjectOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObjectOutput() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ObjectOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObjectOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObjectOutput(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1899,7 +1899,7 @@ public ObjectOutput(params object[] args) : base(args) { }
 
     #region ObjectOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html"/>
     /// </summary>
     public partial class ObjectOutputStream : Java.Io.OutputStream
     {
@@ -1939,7 +1939,7 @@ public ObjectOutputStream(params object[] args) : base(args) { }
         // TODO: complete the class
         #region PutField
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html"/>
         /// </summary>
         public partial class PutField : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PutField>
         {
@@ -1947,12 +1947,12 @@ public partial class PutField : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PutField
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("PutField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PutField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PutField() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("PutField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("PutField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public PutField(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1989,7 +1989,7 @@ public PutField(params object[] args) : base(args) { }
 
     #region ObjectStreamClass
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html"/>
     /// </summary>
     public partial class ObjectStreamClass : Java.Io.Serializable
     {
@@ -2033,7 +2033,7 @@ public ObjectStreamClass(params object[] args) : base(args) { }
 
     #region ObjectStreamConstants
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html"/>
     /// </summary>
     public partial class ObjectStreamConstants : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ObjectStreamConstants>
     {
@@ -2041,12 +2041,12 @@ public partial class ObjectStreamConstants : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ObjectStreamConstants class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObjectStreamConstants class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObjectStreamConstants() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ObjectStreamConstants class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ObjectStreamConstants class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ObjectStreamConstants(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2079,7 +2079,7 @@ public ObjectStreamConstants(params object[] args) : base(args) { }
 
     #region ObjectStreamException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectStreamException.html"/>
     /// </summary>
     public partial class ObjectStreamException : Java.Io.IOException
     {
@@ -2096,7 +2096,7 @@ public partial class ObjectStreamException : Java.Io.IOException
 
     #region ObjectStreamField
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html"/>
     /// </summary>
     public partial class ObjectStreamField : Java.Lang.Comparable<object>
     {
@@ -2140,7 +2140,7 @@ public ObjectStreamField(params object[] args) : base(args) { }
 
     #region OptionalDataException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/OptionalDataException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/OptionalDataException.html"/>
     /// </summary>
     public partial class OptionalDataException : Java.Io.ObjectStreamException
     {
@@ -2157,7 +2157,7 @@ public partial class OptionalDataException : Java.Io.ObjectStreamException
 
     #region OutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/OutputStream.html"/>
     /// </summary>
     public partial class OutputStream : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OutputStream>
     {
@@ -2165,12 +2165,12 @@ public partial class OutputStream : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Outp
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OutputStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OutputStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OutputStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OutputStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OutputStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OutputStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2203,7 +2203,7 @@ public OutputStream(params object[] args) : base(args) { }
 
     #region OutputStreamWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStreamWriter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/OutputStreamWriter.html"/>
     /// </summary>
     public partial class OutputStreamWriter : Java.Io.Writer
     {
@@ -2247,7 +2247,7 @@ public OutputStreamWriter(params object[] args) : base(args) { }
 
     #region PipedInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/PipedInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/PipedInputStream.html"/>
     /// </summary>
     public partial class PipedInputStream : Java.Io.InputStream
     {
@@ -2291,7 +2291,7 @@ public PipedInputStream(params object[] args) : base(args) { }
 
     #region PipedOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/PipedOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/PipedOutputStream.html"/>
     /// </summary>
     public partial class PipedOutputStream : Java.Io.OutputStream
     {
@@ -2335,7 +2335,7 @@ public PipedOutputStream(params object[] args) : base(args) { }
 
     #region PipedReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/PipedReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/PipedReader.html"/>
     /// </summary>
     public partial class PipedReader : Java.Io.Reader
     {
@@ -2379,7 +2379,7 @@ public PipedReader(params object[] args) : base(args) { }
 
     #region PipedWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/PipedWriter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/PipedWriter.html"/>
     /// </summary>
     public partial class PipedWriter : Java.Io.Writer
     {
@@ -2423,7 +2423,7 @@ public PipedWriter(params object[] args) : base(args) { }
 
     #region PrintStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/PrintStream.html"/>
     /// </summary>
     public partial class PrintStream : Java.Io.FilterOutputStream
     {
@@ -2467,7 +2467,7 @@ public PrintStream(params object[] args) : base(args) { }
 
     #region PrintWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html"/>
     /// </summary>
     public partial class PrintWriter : Java.Io.Writer
     {
@@ -2511,7 +2511,7 @@ public PrintWriter(params object[] args) : base(args) { }
 
     #region PushbackInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/PushbackInputStream.html"/>
     /// </summary>
     public partial class PushbackInputStream : Java.Io.FilterInputStream
     {
@@ -2555,7 +2555,7 @@ public PushbackInputStream(params object[] args) : base(args) { }
 
     #region PushbackReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/PushbackReader.html"/>
     /// </summary>
     public partial class PushbackReader : Java.Io.FilterReader
     {
@@ -2599,7 +2599,7 @@ public PushbackReader(params object[] args) : base(args) { }
 
     #region RandomAccessFile
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html"/>
     /// </summary>
     public partial class RandomAccessFile : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RandomAccessFile>
     {
@@ -2643,7 +2643,7 @@ public RandomAccessFile(params object[] args) : base(args) { }
 
     #region Reader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/Reader.html"/>
     /// </summary>
     public partial class Reader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Reader>
     {
@@ -2651,12 +2651,12 @@ public partial class Reader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Reader>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Reader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Reader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Reader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Reader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Reader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Reader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2689,7 +2689,7 @@ public Reader(params object[] args) : base(args) { }
 
     #region SequenceInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/SequenceInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/SequenceInputStream.html"/>
     /// </summary>
     public partial class SequenceInputStream : Java.Io.InputStream
     {
@@ -2731,55 +2731,9 @@ public SequenceInputStream(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region Serial
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/Serial.html"/>
-    /// </summary>
-    public partial class Serial : Java.Lang.Annotation.Annotation
-    {
-        const string _bridgeClassName = "java.io.Serial";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        [Obsolete("Serial class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public Serial() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        [Obsolete("Serial class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public Serial(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
     #region Serializable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/Serializable.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/Serializable.html"/>
     /// </summary>
     public partial class Serializable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Serializable>
     {
@@ -2787,12 +2741,12 @@ public partial class Serializable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Seri
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Serializable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Serializable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Serializable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Serializable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Serializable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Serializable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2825,7 +2779,7 @@ public Serializable(params object[] args) : base(args) { }
 
     #region SerializablePermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/SerializablePermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/SerializablePermission.html"/>
     /// </summary>
     public partial class SerializablePermission : Java.Security.BasicPermission
     {
@@ -2869,7 +2823,7 @@ public SerializablePermission(params object[] args) : base(args) { }
 
     #region StreamCorruptedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/StreamCorruptedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/StreamCorruptedException.html"/>
     /// </summary>
     public partial class StreamCorruptedException : Java.Io.ObjectStreamException
     {
@@ -2886,7 +2840,7 @@ public partial class StreamCorruptedException : Java.Io.ObjectStreamException
 
     #region StreamTokenizer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html"/>
     /// </summary>
     public partial class StreamTokenizer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StreamTokenizer>
     {
@@ -2930,9 +2884,9 @@ public StreamTokenizer(params object[] args) : base(args) { }
 
     #region StringBufferInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/StringBufferInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/StringBufferInputStream.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class StringBufferInputStream : Java.Io.InputStream
     {
         const string _bridgeClassName = "java.io.StringBufferInputStream";
@@ -2975,7 +2929,7 @@ public StringBufferInputStream(params object[] args) : base(args) { }
 
     #region StringReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/StringReader.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/StringReader.html"/>
     /// </summary>
     public partial class StringReader : Java.Io.Reader
     {
@@ -3019,7 +2973,7 @@ public StringReader(params object[] args) : base(args) { }
 
     #region StringWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/StringWriter.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/StringWriter.html"/>
     /// </summary>
     public partial class StringWriter : Java.Io.Writer
     {
@@ -3063,7 +3017,7 @@ public StringWriter(params object[] args) : base(args) { }
 
     #region SyncFailedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/SyncFailedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/SyncFailedException.html"/>
     /// </summary>
     public partial class SyncFailedException : Java.Io.IOException
     {
@@ -3080,7 +3034,7 @@ public partial class SyncFailedException : Java.Io.IOException
 
     #region UncheckedIOException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/UncheckedIOException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/UncheckedIOException.html"/>
     /// </summary>
     public partial class UncheckedIOException : Java.Lang.RuntimeException
     {
@@ -3097,7 +3051,7 @@ public partial class UncheckedIOException : Java.Lang.RuntimeException
 
     #region UnsupportedEncodingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/UnsupportedEncodingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/UnsupportedEncodingException.html"/>
     /// </summary>
     public partial class UnsupportedEncodingException : Java.Io.IOException
     {
@@ -3114,7 +3068,7 @@ public partial class UnsupportedEncodingException : Java.Io.IOException
 
     #region UTFDataFormatException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/UTFDataFormatException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/UTFDataFormatException.html"/>
     /// </summary>
     public partial class UTFDataFormatException : Java.Io.IOException
     {
@@ -3131,7 +3085,7 @@ public partial class UTFDataFormatException : Java.Io.IOException
 
     #region WriteAbortedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/WriteAbortedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/WriteAbortedException.html"/>
     /// </summary>
     public partial class WriteAbortedException : Java.Io.ObjectStreamException
     {
@@ -3148,7 +3102,7 @@ public partial class WriteAbortedException : Java.Io.ObjectStreamException
 
     #region Writer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html"/>
+    /// <see href="https://developer.android.com/reference/java/io/Writer.html"/>
     /// </summary>
     public partial class Writer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Writer>
     {
@@ -3156,12 +3110,12 @@ public partial class Writer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Writer>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Writer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Writer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Writer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Writer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Writer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Writer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Io/BufferedInputStream.cs b/src/net/Netdroid/Generated/Java/Io/BufferedInputStream.cs
index e4cc74a95..abecbe14c 100644
--- a/src/net/Netdroid/Generated/Java/Io/BufferedInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/BufferedInputStream.cs
@@ -30,7 +30,7 @@ public partial class BufferedInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedInputStream.html#%3Cinit%3E(java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedInputStream.html#%3Cinit%3E(java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public BufferedInputStream(Java.Io.InputStream arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public BufferedInputStream(Java.Io.InputStream arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/BufferedOutputStream.cs b/src/net/Netdroid/Generated/Java/Io/BufferedOutputStream.cs
index 56a5671d0..e466dbc9f 100644
--- a/src/net/Netdroid/Generated/Java/Io/BufferedOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/BufferedOutputStream.cs
@@ -30,7 +30,7 @@ public partial class BufferedOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedOutputStream.html#%3Cinit%3E(java.io.OutputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedOutputStream.html#%3Cinit%3E(java.io.OutputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public BufferedOutputStream(Java.Io.OutputStream arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public BufferedOutputStream(Java.Io.OutputStream arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/BufferedReader.cs b/src/net/Netdroid/Generated/Java/Io/BufferedReader.cs
index 53bc0a57b..ad4a5d369 100644
--- a/src/net/Netdroid/Generated/Java/Io/BufferedReader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/BufferedReader.cs
@@ -30,7 +30,7 @@ public partial class BufferedReader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedReader.html#%3Cinit%3E(java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedReader.html#%3Cinit%3E(java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public BufferedReader(Java.Io.Reader arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedReader.html#%3Cinit%3E(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedReader.html#%3Cinit%3E(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         public BufferedReader(Java.Io.Reader arg0)
@@ -63,7 +63,7 @@ public BufferedReader(Java.Io.Reader arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedReader.html#readLine()"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedReader.html#readLine()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -72,7 +72,7 @@ public Java.Lang.String ReadLine()
             return IExecuteWithSignature<Java.Lang.String>("readLine", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedReader.html#lines()"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedReader.html#lines()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Lang.String> Lines()
diff --git a/src/net/Netdroid/Generated/Java/Io/BufferedWriter.cs b/src/net/Netdroid/Generated/Java/Io/BufferedWriter.cs
index dc4c8b9cb..207d4dee4 100644
--- a/src/net/Netdroid/Generated/Java/Io/BufferedWriter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/BufferedWriter.cs
@@ -30,7 +30,7 @@ public partial class BufferedWriter
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedWriter.html#%3Cinit%3E(java.io.Writer,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedWriter.html#%3Cinit%3E(java.io.Writer,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public BufferedWriter(Java.Io.Writer arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedWriter.html#%3Cinit%3E(java.io.Writer)"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedWriter.html#%3Cinit%3E(java.io.Writer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
         public BufferedWriter(Java.Io.Writer arg0)
@@ -63,7 +63,7 @@ public BufferedWriter(Java.Io.Writer arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/BufferedWriter.html#newLine()"/>
+        /// <see href="https://developer.android.com/reference/java/io/BufferedWriter.html#newLine()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void NewLine()
diff --git a/src/net/Netdroid/Generated/Java/Io/ByteArrayInputStream.cs b/src/net/Netdroid/Generated/Java/Io/ByteArrayInputStream.cs
index 8df658e7f..e5ea2728e 100644
--- a/src/net/Netdroid/Generated/Java/Io/ByteArrayInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ByteArrayInputStream.cs
@@ -30,7 +30,7 @@ public partial class ByteArrayInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayInputStream.html#%3Cinit%3E(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayInputStream.html#%3Cinit%3E(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public ByteArrayInputStream(byte[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayInputStream.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayInputStream.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public ByteArrayInputStream(byte[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/ByteArrayOutputStream.cs b/src/net/Netdroid/Generated/Java/Io/ByteArrayOutputStream.cs
index 3a85da2f5..eb5dbedc5 100644
--- a/src/net/Netdroid/Generated/Java/Io/ByteArrayOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ByteArrayOutputStream.cs
@@ -30,7 +30,7 @@ public partial class ByteArrayOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ByteArrayOutputStream(int arg0)
@@ -54,7 +54,7 @@ public ByteArrayOutputStream(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#toByteArray()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#toByteArray()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte[] ToByteArray()
@@ -62,7 +62,7 @@ public byte[] ToByteArray()
             return IExecuteWithSignatureArray<byte>("toByteArray", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -70,17 +70,17 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#toString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#toString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String ToString(int arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("toString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#toString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#toString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -90,7 +90,7 @@ public Java.Lang.String ToString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("toString", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#toString(java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#toString(java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Charset.Charset"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -99,14 +99,14 @@ public Java.Lang.String ToString(Java.Nio.Charset.Charset arg0)
             return IExecuteWithSignature<Java.Lang.String>("toString", "(Ljava/nio/charset/Charset;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#writeTo(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#writeTo(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -115,7 +115,7 @@ public void WriteTo(Java.Io.OutputStream arg0)
             IExecuteWithSignature("writeTo", "(Ljava/io/OutputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ByteArrayOutputStream.html#writeBytes(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/ByteArrayOutputStream.html#writeBytes(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void WriteBytes(byte[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/CharArrayReader.cs b/src/net/Netdroid/Generated/Java/Io/CharArrayReader.cs
index cf31ef873..1a822f230 100644
--- a/src/net/Netdroid/Generated/Java/Io/CharArrayReader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/CharArrayReader.cs
@@ -30,7 +30,7 @@ public partial class CharArrayReader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayReader.html#%3Cinit%3E(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/CharArrayReader.html#%3Cinit%3E(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public CharArrayReader(char[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayReader.html#%3Cinit%3E(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/CharArrayReader.html#%3Cinit%3E(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public CharArrayReader(char[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/CharArrayWriter.cs b/src/net/Netdroid/Generated/Java/Io/CharArrayWriter.cs
index 12f6eca91..8e2f8ae16 100644
--- a/src/net/Netdroid/Generated/Java/Io/CharArrayWriter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/CharArrayWriter.cs
@@ -30,7 +30,7 @@ public partial class CharArrayWriter
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayWriter.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/CharArrayWriter.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public CharArrayWriter(int arg0)
@@ -54,7 +54,7 @@ public CharArrayWriter(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayWriter.html#toCharArray()"/>
+        /// <see href="https://developer.android.com/reference/java/io/CharArrayWriter.html#toCharArray()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char[] ToCharArray()
@@ -62,7 +62,7 @@ public char[] ToCharArray()
             return IExecuteWithSignatureArray<char>("toCharArray", "()[C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayWriter.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/io/CharArrayWriter.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -70,14 +70,14 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayWriter.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/io/CharArrayWriter.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/CharArrayWriter.html#writeTo(java.io.Writer)"/>
+        /// <see href="https://developer.android.com/reference/java/io/CharArrayWriter.html#writeTo(java.io.Writer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/Closeable.cs b/src/net/Netdroid/Generated/Java/Io/Closeable.cs
index 31753282e..6cfe0e0be 100644
--- a/src/net/Netdroid/Generated/Java/Io/Closeable.cs
+++ b/src/net/Netdroid/Generated/Java/Io/Closeable.cs
@@ -64,7 +64,7 @@ public partial class Closeable : Java.Io.ICloseable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Closeable.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Closeable.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Io/Console.cs b/src/net/Netdroid/Generated/Java/Io/Console.cs
index 8679bfa76..6a40cdb90 100644
--- a/src/net/Netdroid/Generated/Java/Io/Console.cs
+++ b/src/net/Netdroid/Generated/Java/Io/Console.cs
@@ -46,7 +46,7 @@ public partial class Console
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#readPassword()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#readPassword()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char[] ReadPassword()
@@ -54,7 +54,7 @@ public char[] ReadPassword()
             return IExecuteWithSignatureArray<char>("readPassword", "()[C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#readPassword(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#readPassword(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -64,7 +64,7 @@ public char[] ReadPassword(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecuteArray<char>("readPassword", arg0); else return IExecuteArray<char>("readPassword", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#format(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#format(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -74,7 +74,7 @@ public Java.Io.Console Format(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecute<Java.Io.Console>("format", arg0); else return IExecute<Java.Io.Console>("format", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#printf(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#printf(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -84,7 +84,7 @@ public Java.Io.Console Printf(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecute<Java.Io.Console>("printf", arg0); else return IExecute<Java.Io.Console>("printf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#writer()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#writer()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.PrintWriter"/></returns>
         public Java.Io.PrintWriter Writer()
@@ -92,7 +92,7 @@ public Java.Io.PrintWriter Writer()
             return IExecuteWithSignature<Java.Io.PrintWriter>("writer", "()Ljava/io/PrintWriter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#reader()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#reader()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.Reader"/></returns>
         public Java.Io.Reader Reader()
@@ -100,7 +100,7 @@ public Java.Io.Reader Reader()
             return IExecuteWithSignature<Java.Io.Reader>("reader", "()Ljava/io/Reader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#readLine()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#readLine()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ReadLine()
@@ -108,7 +108,7 @@ public Java.Lang.String ReadLine()
             return IExecuteWithSignature<Java.Lang.String>("readLine", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#readLine(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#readLine(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -118,15 +118,7 @@ public Java.Lang.String ReadLine(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecute<Java.Lang.String>("readLine", arg0); else return IExecute<Java.Lang.String>("readLine", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#charset()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Nio.Charset.Charset"/></returns>
-        public Java.Nio.Charset.Charset Charset()
-        {
-            return IExecuteWithSignature<Java.Nio.Charset.Charset>("charset", "()Ljava/nio/charset/Charset;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Console.html#flush()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Console.html#flush()"/>
         /// </summary>
         public void Flush()
         {
diff --git a/src/net/Netdroid/Generated/Java/Io/DataInput.cs b/src/net/Netdroid/Generated/Java/Io/DataInput.cs
index 81b9590de..dc7ff3a2c 100644
--- a/src/net/Netdroid/Generated/Java/Io/DataInput.cs
+++ b/src/net/Netdroid/Generated/Java/Io/DataInput.cs
@@ -64,7 +64,7 @@ public partial class DataInput : Java.Io.IDataInput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -73,7 +73,7 @@ public bool ReadBoolean()
             return IExecuteWithSignature<bool>("readBoolean", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readByte()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readByte()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -82,7 +82,7 @@ public byte ReadByte()
             return IExecuteWithSignature<byte>("readByte", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readChar()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readChar()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -91,7 +91,7 @@ public char ReadChar()
             return IExecuteWithSignature<char>("readChar", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readDouble()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -100,7 +100,7 @@ public double ReadDouble()
             return IExecuteWithSignature<double>("readDouble", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readFloat()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readFloat()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -109,7 +109,7 @@ public float ReadFloat()
             return IExecuteWithSignature<float>("readFloat", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readInt()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -118,7 +118,7 @@ public int ReadInt()
             return IExecuteWithSignature<int>("readInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readUnsignedByte()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readUnsignedByte()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -127,7 +127,7 @@ public int ReadUnsignedByte()
             return IExecuteWithSignature<int>("readUnsignedByte", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readUnsignedShort()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readUnsignedShort()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -136,7 +136,7 @@ public int ReadUnsignedShort()
             return IExecuteWithSignature<int>("readUnsignedShort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#skipBytes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#skipBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -146,7 +146,7 @@ public int SkipBytes(int arg0)
             return IExecuteWithSignature<int>("skipBytes", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readLine()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readLine()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -155,7 +155,7 @@ public Java.Lang.String ReadLine()
             return IExecuteWithSignature<Java.Lang.String>("readLine", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readUTF()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readUTF()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -164,7 +164,7 @@ public Java.Lang.String ReadUTF()
             return IExecuteWithSignature<Java.Lang.String>("readUTF", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readLong()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readLong()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -173,7 +173,7 @@ public long ReadLong()
             return IExecuteWithSignature<long>("readLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readShort()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readShort()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -182,7 +182,7 @@ public short ReadShort()
             return IExecuteWithSignature<short>("readShort", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readFully(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readFully(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -193,7 +193,7 @@ public void ReadFully(byte[] arg0, int arg1, int arg2)
             IExecute("readFully", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInput.html#readFully(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInput.html#readFully(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/DataInputStream.cs b/src/net/Netdroid/Generated/Java/Io/DataInputStream.cs
index 60bdecc01..0cbdba30b 100644
--- a/src/net/Netdroid/Generated/Java/Io/DataInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/DataInputStream.cs
@@ -30,7 +30,7 @@ public partial class DataInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public DataInputStream(Java.Io.InputStream arg0)
@@ -54,7 +54,7 @@ public DataInputStream(Java.Io.InputStream arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readUTF(java.io.DataInput)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readUTF(java.io.DataInput)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.DataInput"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -68,7 +68,7 @@ public static Java.Lang.String ReadUTF(Java.Io.DataInput arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -77,7 +77,7 @@ public bool ReadBoolean()
             return IExecuteWithSignature<bool>("readBoolean", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readByte()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readByte()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -86,7 +86,7 @@ public byte ReadByte()
             return IExecuteWithSignature<byte>("readByte", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readChar()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readChar()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -95,7 +95,7 @@ public char ReadChar()
             return IExecuteWithSignature<char>("readChar", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readDouble()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -104,7 +104,7 @@ public double ReadDouble()
             return IExecuteWithSignature<double>("readDouble", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readFloat()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readFloat()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -113,7 +113,7 @@ public float ReadFloat()
             return IExecuteWithSignature<float>("readFloat", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readInt()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -122,7 +122,7 @@ public int ReadInt()
             return IExecuteWithSignature<int>("readInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readUnsignedByte()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readUnsignedByte()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -131,7 +131,7 @@ public int ReadUnsignedByte()
             return IExecuteWithSignature<int>("readUnsignedByte", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readUnsignedShort()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readUnsignedShort()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -140,7 +140,7 @@ public int ReadUnsignedShort()
             return IExecuteWithSignature<int>("readUnsignedShort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#skipBytes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#skipBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -150,17 +150,17 @@ public int SkipBytes(int arg0)
             return IExecuteWithSignature<int>("skipBytes", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readLine()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readLine()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String ReadLine()
         {
             return IExecuteWithSignature<Java.Lang.String>("readLine", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readUTF()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readUTF()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -169,7 +169,7 @@ public Java.Lang.String ReadUTF()
             return IExecuteWithSignature<Java.Lang.String>("readUTF", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readLong()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readLong()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -178,7 +178,7 @@ public long ReadLong()
             return IExecuteWithSignature<long>("readLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readShort()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readShort()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -187,7 +187,7 @@ public short ReadShort()
             return IExecuteWithSignature<short>("readShort", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readFully(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readFully(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -198,7 +198,7 @@ public void ReadFully(byte[] arg0, int arg1, int arg2)
             IExecute("readFully", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataInputStream.html#readFully(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataInputStream.html#readFully(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/DataOutput.cs b/src/net/Netdroid/Generated/Java/Io/DataOutput.cs
index 60efbf431..bd29c809a 100644
--- a/src/net/Netdroid/Generated/Java/Io/DataOutput.cs
+++ b/src/net/Netdroid/Generated/Java/Io/DataOutput.cs
@@ -64,7 +64,7 @@ public partial class DataOutput : Java.Io.IDataOutput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#write(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#write(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -75,7 +75,7 @@ public void Write(byte[] arg0, int arg1, int arg2)
             IExecute("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#write(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#write(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -84,7 +84,7 @@ public void Write(byte[] arg0)
             IExecuteWithSignature("write", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#write(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#write(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -93,7 +93,7 @@ public void Write(int arg0)
             IExecuteWithSignature("write", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeBoolean(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeBoolean(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -102,7 +102,7 @@ public void WriteBoolean(bool arg0)
             IExecuteWithSignature("writeBoolean", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeByte(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeByte(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -111,7 +111,7 @@ public void WriteByte(int arg0)
             IExecuteWithSignature("writeByte", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeBytes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeBytes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -120,7 +120,7 @@ public void WriteBytes(Java.Lang.String arg0)
             IExecuteWithSignature("writeBytes", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -129,7 +129,7 @@ public void WriteChar(int arg0)
             IExecuteWithSignature("writeChar", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeChars(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeChars(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -138,7 +138,7 @@ public void WriteChars(Java.Lang.String arg0)
             IExecuteWithSignature("writeChars", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -147,7 +147,7 @@ public void WriteDouble(double arg0)
             IExecuteWithSignature("writeDouble", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeFloat(float)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeFloat(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -156,7 +156,7 @@ public void WriteFloat(float arg0)
             IExecuteWithSignature("writeFloat", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -165,7 +165,7 @@ public void WriteInt(int arg0)
             IExecuteWithSignature("writeInt", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeLong(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -174,7 +174,7 @@ public void WriteLong(long arg0)
             IExecuteWithSignature("writeLong", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -183,7 +183,7 @@ public void WriteShort(int arg0)
             IExecuteWithSignature("writeShort", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutput.html#writeUTF(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutput.html#writeUTF(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/DataOutputStream.cs b/src/net/Netdroid/Generated/Java/Io/DataOutputStream.cs
index 5226f4ac5..95fdc25ff 100644
--- a/src/net/Netdroid/Generated/Java/Io/DataOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/DataOutputStream.cs
@@ -30,7 +30,7 @@ public partial class DataOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public DataOutputStream(Java.Io.OutputStream arg0)
@@ -58,7 +58,7 @@ public DataOutputStream(Java.Io.OutputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -66,7 +66,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeBoolean(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeBoolean(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -75,7 +75,7 @@ public void WriteBoolean(bool arg0)
             IExecuteWithSignature("writeBoolean", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeByte(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeByte(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -84,7 +84,7 @@ public void WriteByte(int arg0)
             IExecuteWithSignature("writeByte", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeBytes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeBytes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -93,7 +93,7 @@ public void WriteBytes(Java.Lang.String arg0)
             IExecuteWithSignature("writeBytes", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -102,7 +102,7 @@ public void WriteChar(int arg0)
             IExecuteWithSignature("writeChar", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeChars(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeChars(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -111,7 +111,7 @@ public void WriteChars(Java.Lang.String arg0)
             IExecuteWithSignature("writeChars", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -120,7 +120,7 @@ public void WriteDouble(double arg0)
             IExecuteWithSignature("writeDouble", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeFloat(float)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeFloat(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -129,7 +129,7 @@ public void WriteFloat(float arg0)
             IExecuteWithSignature("writeFloat", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -138,7 +138,7 @@ public void WriteInt(int arg0)
             IExecuteWithSignature("writeInt", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeLong(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -147,7 +147,7 @@ public void WriteLong(long arg0)
             IExecuteWithSignature("writeLong", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -156,7 +156,7 @@ public void WriteShort(int arg0)
             IExecuteWithSignature("writeShort", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/DataOutputStream.html#writeUTF(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/DataOutputStream.html#writeUTF(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/Externalizable.cs b/src/net/Netdroid/Generated/Java/Io/Externalizable.cs
index 722f3b945..32b59444f 100644
--- a/src/net/Netdroid/Generated/Java/Io/Externalizable.cs
+++ b/src/net/Netdroid/Generated/Java/Io/Externalizable.cs
@@ -64,7 +64,7 @@ public partial class Externalizable : Java.Io.IExternalizable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Externalizable.html#readExternal(java.io.ObjectInput)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Externalizable.html#readExternal(java.io.ObjectInput)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.ObjectInput"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -74,7 +74,7 @@ public void ReadExternal(Java.Io.ObjectInput arg0)
             IExecuteWithSignature("readExternal", "(Ljava/io/ObjectInput;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Externalizable.html#writeExternal(java.io.ObjectOutput)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Externalizable.html#writeExternal(java.io.ObjectOutput)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.ObjectOutput"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/File.cs b/src/net/Netdroid/Generated/Java/Io/File.cs
index c9716b9fe..cb0d01ce7 100644
--- a/src/net/Netdroid/Generated/Java/Io/File.cs
+++ b/src/net/Netdroid/Generated/Java/Io/File.cs
@@ -30,7 +30,7 @@ public partial class File : Java.Io.ISerializable, Java.Lang.IComparable<Java.Io
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public File(Java.Io.File arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -48,7 +48,7 @@ public File(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public File(Java.Lang.String arg0)
@@ -56,7 +56,7 @@ public File(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#%3Cinit%3E(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#%3Cinit%3E(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         public File(Java.Net.URI arg0)
@@ -80,25 +80,25 @@ public File(Java.Net.URI arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#pathSeparatorChar"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#pathSeparatorChar"/>
         /// </summary>
         public static char pathSeparatorChar { get { if (!_pathSeparatorCharReady) { _pathSeparatorCharContent = SGetField<char>(LocalBridgeClazz, "pathSeparatorChar"); _pathSeparatorCharReady = true; } return _pathSeparatorCharContent; } }
         private static char _pathSeparatorCharContent = default;
         private static bool _pathSeparatorCharReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#separatorChar"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#separatorChar"/>
         /// </summary>
         public static char separatorChar { get { if (!_separatorCharReady) { _separatorCharContent = SGetField<char>(LocalBridgeClazz, "separatorChar"); _separatorCharReady = true; } return _separatorCharContent; } }
         private static char _separatorCharContent = default;
         private static bool _separatorCharReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#pathSeparator"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#pathSeparator"/>
         /// </summary>
         public static Java.Lang.String pathSeparator { get { if (!_pathSeparatorReady) { _pathSeparatorContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "pathSeparator"); _pathSeparatorReady = true; } return _pathSeparatorContent; } }
         private static Java.Lang.String _pathSeparatorContent = default;
         private static bool _pathSeparatorReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#separator"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#separator"/>
         /// </summary>
         public static Java.Lang.String separator { get { if (!_separatorReady) { _separatorContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "separator"); _separatorReady = true; } return _separatorContent; } }
         private static Java.Lang.String _separatorContent = default;
@@ -108,7 +108,7 @@ public File(Java.Net.URI arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#createTempFile(java.lang.String,java.lang.String,java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#createTempFile(java.lang.String,java.lang.String,java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -120,7 +120,7 @@ public static Java.Io.File CreateTempFile(Java.Lang.String arg0, Java.Lang.Strin
             return SExecute<Java.Io.File>(LocalBridgeClazz, "createTempFile", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#createTempFile(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#createTempFile(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -131,7 +131,7 @@ public static Java.Io.File CreateTempFile(Java.Lang.String arg0, Java.Lang.Strin
             return SExecute<Java.Io.File>(LocalBridgeClazz, "createTempFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#listRoots()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#listRoots()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.File"/></returns>
         public static Java.Io.File[] ListRoots()
@@ -143,84 +143,7 @@ public static Java.Io.File[] ListRoots()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getAbsoluteFile()"/> 
-        /// </summary>
-        public Java.Io.File AbsoluteFile
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getAbsoluteFile", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getAbsolutePath()"/> 
-        /// </summary>
-        public Java.Lang.String AbsolutePath
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAbsolutePath", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getCanonicalFile()"/> 
-        /// </summary>
-        public Java.Io.File CanonicalFile
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getCanonicalFile", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getCanonicalPath()"/> 
-        /// </summary>
-        public Java.Lang.String CanonicalPath
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCanonicalPath", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getFreeSpace()"/> 
-        /// </summary>
-        public long FreeSpace
-        {
-            get { return IExecuteWithSignature<long>("getFreeSpace", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getParent()"/> 
-        /// </summary>
-        public Java.Lang.String Parent
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getParent", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getParentFile()"/> 
-        /// </summary>
-        public Java.Io.File ParentFile
-        {
-            get { return IExecuteWithSignature<Java.Io.File>("getParentFile", "()Ljava/io/File;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getPath()"/> 
-        /// </summary>
-        public Java.Lang.String Path
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getTotalSpace()"/> 
-        /// </summary>
-        public long TotalSpace
-        {
-            get { return IExecuteWithSignature<long>("getTotalSpace", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#getUsableSpace()"/> 
-        /// </summary>
-        public long UsableSpace
-        {
-            get { return IExecuteWithSignature<long>("getUsableSpace", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#canExecute()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#canExecute()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool CanExecute()
@@ -228,7 +151,7 @@ public bool CanExecute()
             return IExecuteWithSignature<bool>("canExecute", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#canRead()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#canRead()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool CanRead()
@@ -236,7 +159,7 @@ public bool CanRead()
             return IExecuteWithSignature<bool>("canRead", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#canWrite()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#canWrite()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool CanWrite()
@@ -244,7 +167,7 @@ public bool CanWrite()
             return IExecuteWithSignature<bool>("canWrite", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#createNewFile()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#createNewFile()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -253,7 +176,7 @@ public bool CreateNewFile()
             return IExecuteWithSignature<bool>("createNewFile", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#delete()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#delete()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Delete()
@@ -261,7 +184,7 @@ public bool Delete()
             return IExecuteWithSignature<bool>("delete", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#exists()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#exists()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Exists()
@@ -269,7 +192,7 @@ public bool Exists()
             return IExecuteWithSignature<bool>("exists", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#isAbsolute()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#isAbsolute()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAbsolute()
@@ -277,7 +200,7 @@ public bool IsAbsolute()
             return IExecuteWithSignature<bool>("isAbsolute", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#isDirectory()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#isDirectory()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDirectory()
@@ -285,7 +208,7 @@ public bool IsDirectory()
             return IExecuteWithSignature<bool>("isDirectory", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#isFile()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#isFile()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsFile()
@@ -293,7 +216,7 @@ public bool IsFile()
             return IExecuteWithSignature<bool>("isFile", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#isHidden()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#isHidden()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsHidden()
@@ -301,7 +224,7 @@ public bool IsHidden()
             return IExecuteWithSignature<bool>("isHidden", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#mkdir()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#mkdir()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Mkdir()
@@ -309,7 +232,7 @@ public bool Mkdir()
             return IExecuteWithSignature<bool>("mkdir", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#mkdirs()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#mkdirs()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Mkdirs()
@@ -317,7 +240,7 @@ public bool Mkdirs()
             return IExecuteWithSignature<bool>("mkdirs", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#renameTo(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#renameTo(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -326,7 +249,7 @@ public bool RenameTo(Java.Io.File arg0)
             return IExecuteWithSignature<bool>("renameTo", "(Ljava/io/File;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#setExecutable(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#setExecutable(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -336,7 +259,7 @@ public bool SetExecutable(bool arg0, bool arg1)
             return IExecute<bool>("setExecutable", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#setExecutable(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#setExecutable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -345,7 +268,7 @@ public bool SetExecutable(bool arg0)
             return IExecuteWithSignature<bool>("setExecutable", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#setLastModified(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#setLastModified(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -354,7 +277,7 @@ public bool SetLastModified(long arg0)
             return IExecuteWithSignature<bool>("setLastModified", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#setReadable(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#setReadable(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -364,7 +287,7 @@ public bool SetReadable(bool arg0, bool arg1)
             return IExecute<bool>("setReadable", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#setReadable(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#setReadable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -373,7 +296,7 @@ public bool SetReadable(bool arg0)
             return IExecuteWithSignature<bool>("setReadable", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#setReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#setReadOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool SetReadOnly()
@@ -381,7 +304,7 @@ public bool SetReadOnly()
             return IExecuteWithSignature<bool>("setReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#setWritable(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#setWritable(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -391,7 +314,7 @@ public bool SetWritable(bool arg0, bool arg1)
             return IExecute<bool>("setWritable", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#setWritable(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#setWritable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -400,7 +323,7 @@ public bool SetWritable(bool arg0)
             return IExecuteWithSignature<bool>("setWritable", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#compareTo(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#compareTo(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="int"/></returns>
@@ -409,7 +332,7 @@ public int CompareTo(Java.Io.File arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/io/File;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -418,7 +341,32 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#listFiles()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getAbsoluteFile()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetAbsoluteFile()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getAbsoluteFile", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getCanonicalFile()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.File GetCanonicalFile()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getCanonicalFile", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getParentFile()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.File"/></returns>
+        public Java.Io.File GetParentFile()
+        {
+            return IExecuteWithSignature<Java.Io.File>("getParentFile", "()Ljava/io/File;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#listFiles()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.File"/></returns>
         public Java.Io.File[] ListFiles()
@@ -426,7 +374,7 @@ public Java.Io.File[] ListFiles()
             return IExecuteWithSignatureArray<Java.Io.File>("listFiles", "()[Ljava/io/File;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#listFiles(java.io.FileFilter)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#listFiles(java.io.FileFilter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileFilter"/></param>
         /// <returns><see cref="Java.Io.File"/></returns>
@@ -435,7 +383,7 @@ public Java.Io.File[] ListFiles(Java.Io.FileFilter arg0)
             return IExecuteWithSignatureArray<Java.Io.File>("listFiles", "(Ljava/io/FileFilter;)[Ljava/io/File;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#listFiles(java.io.FilenameFilter)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#listFiles(java.io.FilenameFilter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FilenameFilter"/></param>
         /// <returns><see cref="Java.Io.File"/></returns>
@@ -444,7 +392,48 @@ public Java.Io.File[] ListFiles(Java.Io.FilenameFilter arg0)
             return IExecuteWithSignatureArray<Java.Io.File>("listFiles", "(Ljava/io/FilenameFilter;)[Ljava/io/File;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#list()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getAbsolutePath()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAbsolutePath()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAbsolutePath", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getCanonicalPath()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Lang.String GetCanonicalPath()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCanonicalPath", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getParent()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetParent()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getParent", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getPath()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPath()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#list()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String[] List()
@@ -452,7 +441,7 @@ public Java.Lang.String[] List()
             return IExecuteWithSignatureArray<Java.Lang.String>("list", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#list(java.io.FilenameFilter)"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#list(java.io.FilenameFilter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FilenameFilter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -461,7 +450,7 @@ public Java.Lang.String[] List(Java.Io.FilenameFilter arg0)
             return IExecuteWithSignatureArray<Java.Lang.String>("list", "(Ljava/io/FilenameFilter;)[Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#toURI()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#toURI()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URI"/></returns>
         public Java.Net.URI ToURI()
@@ -469,17 +458,17 @@ public Java.Net.URI ToURI()
             return IExecuteWithSignature<Java.Net.URI>("toURI", "()Ljava/net/URI;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#toURL()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#toURL()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URL"/></returns>
         /// <exception cref="Java.Net.MalformedURLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Net.URL ToURL()
         {
             return IExecuteWithSignature<Java.Net.URL>("toURL", "()Ljava/net/URL;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#toPath()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#toPath()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
         public Java.Nio.File.Path ToPath()
@@ -487,7 +476,31 @@ public Java.Nio.File.Path ToPath()
             return IExecuteWithSignature<Java.Nio.File.Path>("toPath", "()Ljava/nio/file/Path;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#lastModified()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getFreeSpace()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetFreeSpace()
+        {
+            return IExecuteWithSignature<long>("getFreeSpace", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getTotalSpace()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTotalSpace()
+        {
+            return IExecuteWithSignature<long>("getTotalSpace", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#getUsableSpace()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetUsableSpace()
+        {
+            return IExecuteWithSignature<long>("getUsableSpace", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#lastModified()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long LastModified()
@@ -495,7 +508,7 @@ public long LastModified()
             return IExecuteWithSignature<long>("lastModified", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#length()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Length()
@@ -503,7 +516,7 @@ public long Length()
             return IExecuteWithSignature<long>("length", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/File.html#deleteOnExit()"/>
+        /// <see href="https://developer.android.com/reference/java/io/File.html#deleteOnExit()"/>
         /// </summary>
         public void DeleteOnExit()
         {
diff --git a/src/net/Netdroid/Generated/Java/Io/FileDescriptor.cs b/src/net/Netdroid/Generated/Java/Io/FileDescriptor.cs
index dd4bd012c..ff326f146 100644
--- a/src/net/Netdroid/Generated/Java/Io/FileDescriptor.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FileDescriptor.cs
@@ -38,19 +38,19 @@ public partial class FileDescriptor
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileDescriptor.html#err"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileDescriptor.html#err"/>
         /// </summary>
         public static Java.Io.FileDescriptor err { get { if (!_errReady) { _errContent = SGetField<Java.Io.FileDescriptor>(LocalBridgeClazz, "err"); _errReady = true; } return _errContent; } }
         private static Java.Io.FileDescriptor _errContent = default;
         private static bool _errReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileDescriptor.html#in"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileDescriptor.html#in"/>
         /// </summary>
         public static Java.Io.FileDescriptor inField { get { if (!_inFieldReady) { _inFieldContent = SGetField<Java.Io.FileDescriptor>(LocalBridgeClazz, "in"); _inFieldReady = true; } return _inFieldContent; } }
         private static Java.Io.FileDescriptor _inFieldContent = default;
         private static bool _inFieldReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileDescriptor.html#out"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileDescriptor.html#out"/>
         /// </summary>
         public static Java.Io.FileDescriptor outField { get { if (!_outFieldReady) { _outFieldContent = SGetField<Java.Io.FileDescriptor>(LocalBridgeClazz, "out"); _outFieldReady = true; } return _outFieldContent; } }
         private static Java.Io.FileDescriptor _outFieldContent = default;
@@ -64,7 +64,7 @@ public partial class FileDescriptor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileDescriptor.html#valid()"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileDescriptor.html#valid()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Valid()
@@ -72,12 +72,12 @@ public bool Valid()
             return IExecuteWithSignature<bool>("valid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileDescriptor.html#sync()"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileDescriptor.html#sync()"/>
         /// </summary>
         /// <exception cref="Java.Io.SyncFailedException"/>
         public void Sync()
         {
-            IExecuteWithSignature("sync", "()V");
+            IExecute("sync");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/FileFilter.cs b/src/net/Netdroid/Generated/Java/Io/FileFilter.cs
index 109fec9c4..66ac22dd8 100644
--- a/src/net/Netdroid/Generated/Java/Io/FileFilter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FileFilter.cs
@@ -64,7 +64,7 @@ public partial class FileFilter : Java.Io.IFileFilter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileFilter.html#accept(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileFilter.html#accept(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Io/FileInputStream.cs b/src/net/Netdroid/Generated/Java/Io/FileInputStream.cs
index 4631c3cd6..b7b007d59 100644
--- a/src/net/Netdroid/Generated/Java/Io/FileInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FileInputStream.cs
@@ -30,7 +30,7 @@ public partial class FileInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileInputStream.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileInputStream.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -39,7 +39,7 @@ public FileInputStream(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileInputStream.html#%3Cinit%3E(java.io.FileDescriptor)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileInputStream.html#%3Cinit%3E(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         public FileInputStream(Java.Io.FileDescriptor arg0)
@@ -47,7 +47,7 @@ public FileInputStream(Java.Io.FileDescriptor arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileInputStream.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileInputStream.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -72,18 +72,21 @@ public FileInputStream(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileInputStream.html#getChannel()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/FileInputStream.html#getFD()"/>
         /// </summary>
-        public Java.Nio.Channels.FileChannel Channel
+        /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.FileDescriptor GetFD()
         {
-            get { return IExecuteWithSignature<Java.Nio.Channels.FileChannel>("getChannel", "()Ljava/nio/channels/FileChannel;"); }
+            return IExecuteWithSignature<Java.Io.FileDescriptor>("getFD", "()Ljava/io/FileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileInputStream.html#getFD()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/FileInputStream.html#getChannel()"/>
         /// </summary>
-        public Java.Io.FileDescriptor FD
+        /// <returns><see cref="Java.Nio.Channels.FileChannel"/></returns>
+        public Java.Nio.Channels.FileChannel GetChannel()
         {
-            get { return IExecuteWithSignature<Java.Io.FileDescriptor>("getFD", "()Ljava/io/FileDescriptor;"); }
+            return IExecuteWithSignature<Java.Nio.Channels.FileChannel>("getChannel", "()Ljava/nio/channels/FileChannel;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/FileOutputStream.cs b/src/net/Netdroid/Generated/Java/Io/FileOutputStream.cs
index ef56ac247..8db631fa0 100644
--- a/src/net/Netdroid/Generated/Java/Io/FileOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FileOutputStream.cs
@@ -30,7 +30,7 @@ public partial class FileOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileOutputStream.html#%3Cinit%3E(java.io.File,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileOutputStream.html#%3Cinit%3E(java.io.File,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -40,7 +40,7 @@ public FileOutputStream(Java.Io.File arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileOutputStream.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileOutputStream.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -49,7 +49,7 @@ public FileOutputStream(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileOutputStream.html#%3Cinit%3E(java.io.FileDescriptor)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileOutputStream.html#%3Cinit%3E(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         public FileOutputStream(Java.Io.FileDescriptor arg0)
@@ -57,7 +57,7 @@ public FileOutputStream(Java.Io.FileDescriptor arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileOutputStream.html#%3Cinit%3E(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileOutputStream.html#%3Cinit%3E(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -67,7 +67,7 @@ public FileOutputStream(Java.Lang.String arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileOutputStream.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileOutputStream.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -92,18 +92,21 @@ public FileOutputStream(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileOutputStream.html#getChannel()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/FileOutputStream.html#getFD()"/>
         /// </summary>
-        public Java.Nio.Channels.FileChannel Channel
+        /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.FileDescriptor GetFD()
         {
-            get { return IExecuteWithSignature<Java.Nio.Channels.FileChannel>("getChannel", "()Ljava/nio/channels/FileChannel;"); }
+            return IExecuteWithSignature<Java.Io.FileDescriptor>("getFD", "()Ljava/io/FileDescriptor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileOutputStream.html#getFD()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/FileOutputStream.html#getChannel()"/>
         /// </summary>
-        public Java.Io.FileDescriptor FD
+        /// <returns><see cref="Java.Nio.Channels.FileChannel"/></returns>
+        public Java.Nio.Channels.FileChannel GetChannel()
         {
-            get { return IExecuteWithSignature<Java.Io.FileDescriptor>("getFD", "()Ljava/io/FileDescriptor;"); }
+            return IExecuteWithSignature<Java.Nio.Channels.FileChannel>("getChannel", "()Ljava/nio/channels/FileChannel;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/FilePermission.cs b/src/net/Netdroid/Generated/Java/Io/FilePermission.cs
index 21f8432eb..4cef9f616 100644
--- a/src/net/Netdroid/Generated/Java/Io/FilePermission.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FilePermission.cs
@@ -30,7 +30,7 @@ public partial class FilePermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FilePermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FilePermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Io/FileReader.cs b/src/net/Netdroid/Generated/Java/Io/FileReader.cs
index ca847f3f2..847d5b0c5 100644
--- a/src/net/Netdroid/Generated/Java/Io/FileReader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FileReader.cs
@@ -30,7 +30,7 @@ public partial class FileReader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileReader.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileReader.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -40,7 +40,7 @@ public FileReader(Java.Io.File arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileReader.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileReader.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -49,7 +49,7 @@ public FileReader(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileReader.html#%3Cinit%3E(java.io.FileDescriptor)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileReader.html#%3Cinit%3E(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         public FileReader(Java.Io.FileDescriptor arg0)
@@ -57,7 +57,7 @@ public FileReader(Java.Io.FileDescriptor arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileReader.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileReader.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -67,7 +67,7 @@ public FileReader(Java.Lang.String arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileReader.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileReader.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/FileWriter.cs b/src/net/Netdroid/Generated/Java/Io/FileWriter.cs
index c1de8392f..9e2bbb1a1 100644
--- a/src/net/Netdroid/Generated/Java/Io/FileWriter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FileWriter.cs
@@ -30,7 +30,7 @@ public partial class FileWriter
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.io.File,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.io.File,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -40,7 +40,7 @@ public FileWriter(Java.Io.File arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -51,7 +51,7 @@ public FileWriter(Java.Io.File arg0, Java.Nio.Charset.Charset arg1, bool arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -61,7 +61,7 @@ public FileWriter(Java.Io.File arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -70,7 +70,7 @@ public FileWriter(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.io.FileDescriptor)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         public FileWriter(Java.Io.FileDescriptor arg0)
@@ -78,7 +78,7 @@ public FileWriter(Java.Io.FileDescriptor arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -88,7 +88,7 @@ public FileWriter(Java.Lang.String arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -99,7 +99,7 @@ public FileWriter(Java.Lang.String arg0, Java.Nio.Charset.Charset arg1, bool arg
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -109,7 +109,7 @@ public FileWriter(Java.Lang.String arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FileWriter.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FileWriter.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/FilenameFilter.cs b/src/net/Netdroid/Generated/Java/Io/FilenameFilter.cs
index c1a68f143..0297be7a9 100644
--- a/src/net/Netdroid/Generated/Java/Io/FilenameFilter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FilenameFilter.cs
@@ -64,7 +64,7 @@ public partial class FilenameFilter : Java.Io.IFilenameFilter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FilenameFilter.html#accept(java.io.File,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FilenameFilter.html#accept(java.io.File,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Io/FilterOutputStream.cs b/src/net/Netdroid/Generated/Java/Io/FilterOutputStream.cs
index 898f9cccf..15582a1ea 100644
--- a/src/net/Netdroid/Generated/Java/Io/FilterOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/FilterOutputStream.cs
@@ -30,7 +30,7 @@ public partial class FilterOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/FilterOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/FilterOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public FilterOutputStream(Java.Io.OutputStream arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/Flushable.cs b/src/net/Netdroid/Generated/Java/Io/Flushable.cs
index c26f83b8b..3ab213c5c 100644
--- a/src/net/Netdroid/Generated/Java/Io/Flushable.cs
+++ b/src/net/Netdroid/Generated/Java/Io/Flushable.cs
@@ -64,7 +64,7 @@ public partial class Flushable : Java.Io.IFlushable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Flushable.html#flush()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Flushable.html#flush()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Flush()
diff --git a/src/net/Netdroid/Generated/Java/Io/InputStream.cs b/src/net/Netdroid/Generated/Java/Io/InputStream.cs
index 761784ba0..d9cc9ce74 100644
--- a/src/net/Netdroid/Generated/Java/Io/InputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/InputStream.cs
@@ -42,7 +42,7 @@ public partial class InputStream
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#nullInputStream()"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#nullInputStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
         public static Java.Io.InputStream NullInputStream()
@@ -54,7 +54,7 @@ public static Java.Io.InputStream NullInputStream()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#read()"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#read()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -63,7 +63,7 @@ public int Read()
             return IExecuteWithSignature<int>("read", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#markSupported()"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#markSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool MarkSupported()
@@ -71,7 +71,7 @@ public bool MarkSupported()
             return IExecuteWithSignature<bool>("markSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#readAllBytes()"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#readAllBytes()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -80,7 +80,7 @@ public byte[] ReadAllBytes()
             return IExecuteWithSignatureArray<byte>("readAllBytes", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#readNBytes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#readNBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -90,7 +90,7 @@ public byte[] ReadNBytes(int arg0)
             return IExecuteWithSignatureArray<byte>("readNBytes", "(I)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#available()"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#available()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -99,7 +99,7 @@ public int Available()
             return IExecuteWithSignature<int>("available", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#read(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#read(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -111,7 +111,7 @@ public int Read(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#read(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#read(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -121,7 +121,7 @@ public int Read(byte[] arg0)
             return IExecuteWithSignature<int>("read", "([B)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#readNBytes(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#readNBytes(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -133,7 +133,7 @@ public int ReadNBytes(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("readNBytes", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#skip(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#skip(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -143,7 +143,7 @@ public long Skip(long arg0)
             return IExecuteWithSignature<long>("skip", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#transferTo(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#transferTo(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <returns><see cref="long"/></returns>
@@ -153,38 +153,29 @@ public long TransferTo(Java.Io.OutputStream arg0)
             return IExecuteWithSignature<long>("transferTo", "(Ljava/io/OutputStream;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#mark(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#mark(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Mark(int arg0)
         {
-            IExecuteWithSignature("mark", "(I)V", arg0);
+            IExecute("mark", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#reset()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Reset()
         {
-            IExecuteWithSignature("reset", "()V");
+            IExecute("reset");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStream.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStream.html#skipNBytes(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <exception cref="Java.Io.IOException"/>
-        public void SkipNBytes(long arg0)
-        {
-            IExecuteWithSignature("skipNBytes", "(J)V", arg0);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Io/InputStreamReader.cs b/src/net/Netdroid/Generated/Java/Io/InputStreamReader.cs
index 9178d6322..0a9b38586 100644
--- a/src/net/Netdroid/Generated/Java/Io/InputStreamReader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/InputStreamReader.cs
@@ -30,7 +30,7 @@ public partial class InputStreamReader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStreamReader.html#%3Cinit%3E(java.io.InputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStreamReader.html#%3Cinit%3E(java.io.InputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -40,7 +40,7 @@ public InputStreamReader(Java.Io.InputStream arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStreamReader.html#%3Cinit%3E(java.io.InputStream,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStreamReader.html#%3Cinit%3E(java.io.InputStream,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -49,7 +49,7 @@ public InputStreamReader(Java.Io.InputStream arg0, Java.Nio.Charset.Charset arg1
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStreamReader.html#%3Cinit%3E(java.io.InputStream,java.nio.charset.CharsetDecoder)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStreamReader.html#%3Cinit%3E(java.io.InputStream,java.nio.charset.CharsetDecoder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.CharsetDecoder"/></param>
@@ -58,7 +58,7 @@ public InputStreamReader(Java.Io.InputStream arg0, Java.Nio.Charset.CharsetDecod
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStreamReader.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/InputStreamReader.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public InputStreamReader(Java.Io.InputStream arg0)
@@ -82,11 +82,12 @@ public InputStreamReader(Java.Io.InputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/InputStreamReader.html#getEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/InputStreamReader.html#getEncoding()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/LineNumberInputStream.cs b/src/net/Netdroid/Generated/Java/Io/LineNumberInputStream.cs
index db22de4b6..fcc6ef36a 100644
--- a/src/net/Netdroid/Generated/Java/Io/LineNumberInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/LineNumberInputStream.cs
@@ -30,7 +30,7 @@ public partial class LineNumberInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/LineNumberInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/LineNumberInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public LineNumberInputStream(Java.Io.InputStream arg0)
@@ -54,11 +54,20 @@ public LineNumberInputStream(Java.Io.InputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/LineNumberInputStream.html#getLineNumber()"/> <see href="https://developer.android.com/reference/java.base/java/io/LineNumberInputStream.html#setLineNumber(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/LineNumberInputStream.html#getLineNumber()"/>
         /// </summary>
-        public int LineNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
         {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); } set { IExecuteWithSignature("setLineNumber", "(I)V", value); }
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/LineNumberInputStream.html#setLineNumber(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLineNumber(int arg0)
+        {
+            IExecuteWithSignature("setLineNumber", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/LineNumberReader.cs b/src/net/Netdroid/Generated/Java/Io/LineNumberReader.cs
index 97ba09640..13a54b4a1 100644
--- a/src/net/Netdroid/Generated/Java/Io/LineNumberReader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/LineNumberReader.cs
@@ -30,7 +30,7 @@ public partial class LineNumberReader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/LineNumberReader.html#%3Cinit%3E(java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/LineNumberReader.html#%3Cinit%3E(java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public LineNumberReader(Java.Io.Reader arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/LineNumberReader.html#%3Cinit%3E(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/io/LineNumberReader.html#%3Cinit%3E(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         public LineNumberReader(Java.Io.Reader arg0)
@@ -63,11 +63,20 @@ public LineNumberReader(Java.Io.Reader arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/LineNumberReader.html#getLineNumber()"/> <see href="https://developer.android.com/reference/java.base/java/io/LineNumberReader.html#setLineNumber(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/LineNumberReader.html#getLineNumber()"/>
         /// </summary>
-        public int LineNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
         {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); } set { IExecuteWithSignature("setLineNumber", "(I)V", value); }
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/LineNumberReader.html#setLineNumber(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLineNumber(int arg0)
+        {
+            IExecuteWithSignature("setLineNumber", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/ObjectInput.cs b/src/net/Netdroid/Generated/Java/Io/ObjectInput.cs
index fab5d30ee..088a2aad6 100644
--- a/src/net/Netdroid/Generated/Java/Io/ObjectInput.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ObjectInput.cs
@@ -72,7 +72,7 @@ public partial class ObjectInput : Java.Io.IObjectInput, Java.Io.IDataInput, Jav
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInput.html#available()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInput.html#available()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -81,7 +81,7 @@ public int Available()
             return IExecuteWithSignature<int>("available", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInput.html#read()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInput.html#read()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -90,7 +90,7 @@ public int Read()
             return IExecuteWithSignature<int>("read", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInput.html#read(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInput.html#read(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -102,7 +102,7 @@ public int Read(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInput.html#read(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInput.html#read(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -112,7 +112,7 @@ public int Read(byte[] arg0)
             return IExecuteWithSignature<int>("read", "([B)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInput.html#readObject()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInput.html#readObject()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.ClassNotFoundException"/>
@@ -122,7 +122,7 @@ public object ReadObject()
             return IExecuteWithSignature("readObject", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInput.html#skip(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInput.html#skip(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -132,7 +132,7 @@ public long Skip(long arg0)
             return IExecuteWithSignature<long>("skip", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInput.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInput.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Io/ObjectInputStream.cs b/src/net/Netdroid/Generated/Java/Io/ObjectInputStream.cs
index 5e8637617..ff660fd4a 100644
--- a/src/net/Netdroid/Generated/Java/Io/ObjectInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ObjectInputStream.cs
@@ -30,7 +30,7 @@ public partial class ObjectInputStream : Java.Io.IObjectInput, Java.Io.IObjectSt
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -63,7 +63,7 @@ public ObjectInputStream(Java.Io.InputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -72,7 +72,7 @@ public bool ReadBoolean()
             return IExecuteWithSignature<bool>("readBoolean", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readByte()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readByte()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -81,7 +81,7 @@ public byte ReadByte()
             return IExecuteWithSignature<byte>("readByte", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readChar()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readChar()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -90,7 +90,7 @@ public char ReadChar()
             return IExecuteWithSignature<char>("readChar", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readDouble()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -99,7 +99,7 @@ public double ReadDouble()
             return IExecuteWithSignature<double>("readDouble", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readObject()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readObject()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -109,7 +109,7 @@ public object ReadObject()
             return IExecuteWithSignature("readObject", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readFloat()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readFloat()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -118,7 +118,7 @@ public float ReadFloat()
             return IExecuteWithSignature<float>("readFloat", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readInt()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -127,7 +127,7 @@ public int ReadInt()
             return IExecuteWithSignature<int>("readInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readUnsignedByte()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readUnsignedByte()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -136,7 +136,7 @@ public int ReadUnsignedByte()
             return IExecuteWithSignature<int>("readUnsignedByte", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readUnsignedShort()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readUnsignedShort()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -145,7 +145,7 @@ public int ReadUnsignedShort()
             return IExecuteWithSignature<int>("readUnsignedShort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#skipBytes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#skipBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -155,7 +155,7 @@ public int SkipBytes(int arg0)
             return IExecuteWithSignature<int>("skipBytes", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readFields()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readFields()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.ObjectInputStream.GetField"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -165,7 +165,7 @@ public Java.Io.ObjectInputStream.GetField ReadFields()
             return IExecuteWithSignature<Java.Io.ObjectInputStream.GetField>("readFields", "()Ljava/io/ObjectInputStream$GetField;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readUnshared()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readUnshared()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -175,17 +175,17 @@ public object ReadUnshared()
             return IExecuteWithSignature("readUnshared", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readLine()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readLine()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String ReadLine()
         {
             return IExecuteWithSignature<Java.Lang.String>("readLine", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readUTF()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readUTF()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -194,7 +194,7 @@ public Java.Lang.String ReadUTF()
             return IExecuteWithSignature<Java.Lang.String>("readUTF", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readLong()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readLong()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -203,7 +203,7 @@ public long ReadLong()
             return IExecuteWithSignature<long>("readLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readShort()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readShort()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -212,7 +212,7 @@ public short ReadShort()
             return IExecuteWithSignature<short>("readShort", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#defaultReadObject()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#defaultReadObject()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         /// <exception cref="Java.Lang.ClassNotFoundException"/>
@@ -221,7 +221,7 @@ public void DefaultReadObject()
             IExecuteWithSignature("defaultReadObject", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readFully(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readFully(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -232,7 +232,7 @@ public void ReadFully(byte[] arg0, int arg1, int arg2)
             IExecute("readFully", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#readFully(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#readFully(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -241,7 +241,7 @@ public void ReadFully(byte[] arg0)
             IExecuteWithSignature("readFully", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.html#registerValidation(java.io.ObjectInputValidation,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.html#registerValidation(java.io.ObjectInputValidation,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.ObjectInputValidation"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -276,14 +276,7 @@ public partial class GetField
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#getObjectStreamClass()"/> 
-            /// </summary>
-            public Java.Io.ObjectStreamClass ObjectStreamClass
-            {
-                get { return IExecuteWithSignature<Java.Io.ObjectStreamClass>("getObjectStreamClass", "()Ljava/io/ObjectStreamClass;"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#defaulted(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#defaulted(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -293,7 +286,7 @@ public bool Defaulted(Java.Lang.String arg0)
                 return IExecuteWithSignature<bool>("defaulted", "(Ljava/lang/String;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,boolean)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="bool"/></param>
@@ -304,7 +297,7 @@ public bool Get(Java.Lang.String arg0, bool arg1)
                 return IExecute<bool>("get", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,byte)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,byte)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="byte"/></param>
@@ -315,7 +308,7 @@ public byte Get(Java.Lang.String arg0, byte arg1)
                 return IExecute<byte>("get", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,char)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,char)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="char"/></param>
@@ -326,7 +319,7 @@ public char Get(Java.Lang.String arg0, char arg1)
                 return IExecute<char>("get", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,double)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,double)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="double"/></param>
@@ -337,7 +330,7 @@ public double Get(Java.Lang.String arg0, double arg1)
                 return IExecute<double>("get", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,float)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,float)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="float"/></param>
@@ -348,7 +341,7 @@ public float Get(Java.Lang.String arg0, float arg1)
                 return IExecute<float>("get", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,int)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="int"/></param>
@@ -359,7 +352,15 @@ public int Get(Java.Lang.String arg0, int arg1)
                 return IExecute<int>("get", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#getObjectStreamClass()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Io.ObjectStreamClass"/></returns>
+            public Java.Io.ObjectStreamClass GetObjectStreamClass()
+            {
+                return IExecuteWithSignature<Java.Io.ObjectStreamClass>("getObjectStreamClass", "()Ljava/io/ObjectStreamClass;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="object"/></param>
@@ -370,7 +371,7 @@ public object Get(Java.Lang.String arg0, object arg1)
                 return IExecute("get", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,long)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="long"/></param>
@@ -381,7 +382,7 @@ public long Get(Java.Lang.String arg0, long arg1)
                 return IExecute<long>("get", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputStream.GetField.html#get(java.lang.String,short)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectInputStream.GetField.html#get(java.lang.String,short)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="short"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Io/ObjectInputValidation.cs b/src/net/Netdroid/Generated/Java/Io/ObjectInputValidation.cs
index bb699030e..a0e9f11eb 100644
--- a/src/net/Netdroid/Generated/Java/Io/ObjectInputValidation.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ObjectInputValidation.cs
@@ -64,7 +64,7 @@ public partial class ObjectInputValidation : Java.Io.IObjectInputValidation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectInputValidation.html#validateObject()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectInputValidation.html#validateObject()"/>
         /// </summary>
         /// <exception cref="Java.Io.InvalidObjectException"/>
         public void ValidateObject()
diff --git a/src/net/Netdroid/Generated/Java/Io/ObjectOutput.cs b/src/net/Netdroid/Generated/Java/Io/ObjectOutput.cs
index 584d007d9..7b997acb3 100644
--- a/src/net/Netdroid/Generated/Java/Io/ObjectOutput.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ObjectOutput.cs
@@ -72,7 +72,7 @@ public partial class ObjectOutput : Java.Io.IObjectOutput, Java.Io.IDataOutput,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutput.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutput.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
@@ -80,7 +80,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutput.html#flush()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutput.html#flush()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Flush()
@@ -88,7 +88,7 @@ public void Flush()
             IExecuteWithSignature("flush", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutput.html#write(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutput.html#write(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -99,7 +99,7 @@ public void Write(byte[] arg0, int arg1, int arg2)
             IExecute("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutput.html#write(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutput.html#write(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -108,7 +108,7 @@ public void Write(byte[] arg0)
             IExecuteWithSignature("write", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutput.html#write(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutput.html#write(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -117,7 +117,7 @@ public void Write(int arg0)
             IExecuteWithSignature("write", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutput.html#writeObject(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutput.html#writeObject(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/ObjectOutputStream.cs b/src/net/Netdroid/Generated/Java/Io/ObjectOutputStream.cs
index 36c9cb39b..0422aad71 100644
--- a/src/net/Netdroid/Generated/Java/Io/ObjectOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ObjectOutputStream.cs
@@ -30,7 +30,7 @@ public partial class ObjectOutputStream : Java.Io.IObjectOutput, Java.Io.IObject
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -63,7 +63,7 @@ public ObjectOutputStream(Java.Io.OutputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeObject(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeObject(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -72,7 +72,7 @@ public void WriteObject(object arg0)
             IExecuteWithSignature("writeObject", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#putFields()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#putFields()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.ObjectOutputStream.PutField"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -81,7 +81,7 @@ public Java.Io.ObjectOutputStream.PutField PutFields()
             return IExecuteWithSignature<Java.Io.ObjectOutputStream.PutField>("putFields", "()Ljava/io/ObjectOutputStream$PutField;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#defaultWriteObject()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#defaultWriteObject()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void DefaultWriteObject()
@@ -89,7 +89,7 @@ public void DefaultWriteObject()
             IExecuteWithSignature("defaultWriteObject", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#reset()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Reset()
@@ -97,7 +97,7 @@ public void Reset()
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#useProtocolVersion(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#useProtocolVersion(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -106,7 +106,7 @@ public void UseProtocolVersion(int arg0)
             IExecuteWithSignature("useProtocolVersion", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeBoolean(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeBoolean(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -115,7 +115,7 @@ public void WriteBoolean(bool arg0)
             IExecuteWithSignature("writeBoolean", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeByte(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeByte(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -124,7 +124,7 @@ public void WriteByte(int arg0)
             IExecuteWithSignature("writeByte", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeBytes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeBytes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -133,7 +133,7 @@ public void WriteBytes(Java.Lang.String arg0)
             IExecuteWithSignature("writeBytes", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -142,7 +142,7 @@ public void WriteChar(int arg0)
             IExecuteWithSignature("writeChar", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeChars(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeChars(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -151,7 +151,7 @@ public void WriteChars(Java.Lang.String arg0)
             IExecuteWithSignature("writeChars", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -160,7 +160,7 @@ public void WriteDouble(double arg0)
             IExecuteWithSignature("writeDouble", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeFields()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeFields()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void WriteFields()
@@ -168,7 +168,7 @@ public void WriteFields()
             IExecuteWithSignature("writeFields", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeFloat(float)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeFloat(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -177,7 +177,7 @@ public void WriteFloat(float arg0)
             IExecuteWithSignature("writeFloat", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -186,7 +186,7 @@ public void WriteInt(int arg0)
             IExecuteWithSignature("writeInt", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeLong(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -195,7 +195,7 @@ public void WriteLong(long arg0)
             IExecuteWithSignature("writeLong", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -204,7 +204,7 @@ public void WriteShort(int arg0)
             IExecuteWithSignature("writeShort", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeUnshared(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeUnshared(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -213,7 +213,7 @@ public void WriteUnshared(object arg0)
             IExecuteWithSignature("writeUnshared", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.html#writeUTF(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.html#writeUTF(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -246,7 +246,7 @@ public partial class PutField
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,boolean)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="bool"/></param>
@@ -255,7 +255,7 @@ public void Put(Java.Lang.String arg0, bool arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,byte)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,byte)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="byte"/></param>
@@ -264,7 +264,7 @@ public void Put(Java.Lang.String arg0, byte arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,char)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,char)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="char"/></param>
@@ -273,7 +273,7 @@ public void Put(Java.Lang.String arg0, char arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,double)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,double)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="double"/></param>
@@ -282,7 +282,7 @@ public void Put(Java.Lang.String arg0, double arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,float)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,float)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="float"/></param>
@@ -291,7 +291,7 @@ public void Put(Java.Lang.String arg0, float arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,int)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="int"/></param>
@@ -300,7 +300,7 @@ public void Put(Java.Lang.String arg0, int arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="object"/></param>
@@ -309,7 +309,7 @@ public void Put(Java.Lang.String arg0, object arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,long)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="long"/></param>
@@ -318,7 +318,7 @@ public void Put(Java.Lang.String arg0, long arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,short)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#put(java.lang.String,short)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="short"/></param>
@@ -327,11 +327,11 @@ public void Put(Java.Lang.String arg0, short arg1)
                 IExecute("put", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectOutputStream.PutField.html#write(java.io.ObjectOutput)"/>
+            /// <see href="https://developer.android.com/reference/java/io/ObjectOutputStream.PutField.html#write(java.io.ObjectOutput)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Io.ObjectOutput"/></param>
             /// <exception cref="Java.Io.IOException"/>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public void Write(Java.Io.ObjectOutput arg0)
             {
                 IExecuteWithSignature("write", "(Ljava/io/ObjectOutput;)V", arg0);
diff --git a/src/net/Netdroid/Generated/Java/Io/ObjectStreamClass.cs b/src/net/Netdroid/Generated/Java/Io/ObjectStreamClass.cs
index 7536384cd..4c6adfd56 100644
--- a/src/net/Netdroid/Generated/Java/Io/ObjectStreamClass.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ObjectStreamClass.cs
@@ -38,7 +38,7 @@ public partial class ObjectStreamClass
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html#NO_FIELDS"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html#NO_FIELDS"/>
         /// </summary>
         public static Java.Io.ObjectStreamField[] NO_FIELDS { get { if (!_NO_FIELDSReady) { _NO_FIELDSContent = SGetFieldArray<Java.Io.ObjectStreamField>(LocalBridgeClazz, "NO_FIELDS"); _NO_FIELDSReady = true; } return _NO_FIELDSContent; } }
         private static Java.Io.ObjectStreamField[] _NO_FIELDSContent = default;
@@ -48,7 +48,7 @@ public partial class ObjectStreamClass
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html#lookup(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html#lookup(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Io.ObjectStreamClass"/></returns>
@@ -57,7 +57,7 @@ public static Java.Io.ObjectStreamClass Lookup(Java.Lang.Class arg0)
             return SExecuteWithSignature<Java.Io.ObjectStreamClass>(LocalBridgeClazz, "lookup", "(Ljava/lang/Class;)Ljava/io/ObjectStreamClass;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html#lookupAny(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html#lookupAny(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Io.ObjectStreamClass"/></returns>
@@ -70,42 +70,45 @@ public static Java.Io.ObjectStreamClass LookupAny(Java.Lang.Class arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html#getFields()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html#getField(java.lang.String)"/>
         /// </summary>
-        public Java.Io.ObjectStreamField[] Fields
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Io.ObjectStreamField"/></returns>
+        public Java.Io.ObjectStreamField GetField(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Io.ObjectStreamField>("getFields", "()[Ljava/io/ObjectStreamField;"); }
+            return IExecuteWithSignature<Java.Io.ObjectStreamField>("getField", "(Ljava/lang/String;)Ljava/io/ObjectStreamField;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html#getFields()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Io.ObjectStreamField"/></returns>
+        public Java.Io.ObjectStreamField[] GetFields()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Io.ObjectStreamField>("getFields", "()[Ljava/io/ObjectStreamField;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html#getSerialVersionUID()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html#forClass()"/>
         /// </summary>
-        public long SerialVersionUID
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class ForClass()
         {
-            get { return IExecuteWithSignature<long>("getSerialVersionUID", "()J"); }
+            return IExecuteWithSignature<Java.Lang.Class>("forClass", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html#getField(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html#getName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Io.ObjectStreamField"/></returns>
-        public Java.Io.ObjectStreamField GetField(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<Java.Io.ObjectStreamField>("getField", "(Ljava/lang/String;)Ljava/io/ObjectStreamField;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamClass.html#forClass()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamClass.html#getSerialVersionUID()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.Class"/></returns>
-        public Java.Lang.Class ForClass()
+        /// <returns><see cref="long"/></returns>
+        public long GetSerialVersionUID()
         {
-            return IExecuteWithSignature<Java.Lang.Class>("forClass", "()Ljava/lang/Class;");
+            return IExecuteWithSignature<long>("getSerialVersionUID", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/ObjectStreamConstants.cs b/src/net/Netdroid/Generated/Java/Io/ObjectStreamConstants.cs
index 75a86e214..22080751b 100644
--- a/src/net/Netdroid/Generated/Java/Io/ObjectStreamConstants.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ObjectStreamConstants.cs
@@ -56,181 +56,181 @@ public partial class ObjectStreamConstants : Java.Io.IObjectStreamConstants
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#SC_BLOCK_DATA"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#SC_BLOCK_DATA"/>
         /// </summary>
         public static byte SC_BLOCK_DATA { get { if (!_SC_BLOCK_DATAReady) { _SC_BLOCK_DATAContent = SGetField<byte>(LocalBridgeClazz, "SC_BLOCK_DATA"); _SC_BLOCK_DATAReady = true; } return _SC_BLOCK_DATAContent; } }
         private static byte _SC_BLOCK_DATAContent = default;
         private static bool _SC_BLOCK_DATAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#SC_ENUM"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#SC_ENUM"/>
         /// </summary>
         public static byte SC_ENUM { get { if (!_SC_ENUMReady) { _SC_ENUMContent = SGetField<byte>(LocalBridgeClazz, "SC_ENUM"); _SC_ENUMReady = true; } return _SC_ENUMContent; } }
         private static byte _SC_ENUMContent = default;
         private static bool _SC_ENUMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#SC_EXTERNALIZABLE"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#SC_EXTERNALIZABLE"/>
         /// </summary>
         public static byte SC_EXTERNALIZABLE { get { if (!_SC_EXTERNALIZABLEReady) { _SC_EXTERNALIZABLEContent = SGetField<byte>(LocalBridgeClazz, "SC_EXTERNALIZABLE"); _SC_EXTERNALIZABLEReady = true; } return _SC_EXTERNALIZABLEContent; } }
         private static byte _SC_EXTERNALIZABLEContent = default;
         private static bool _SC_EXTERNALIZABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#SC_SERIALIZABLE"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#SC_SERIALIZABLE"/>
         /// </summary>
         public static byte SC_SERIALIZABLE { get { if (!_SC_SERIALIZABLEReady) { _SC_SERIALIZABLEContent = SGetField<byte>(LocalBridgeClazz, "SC_SERIALIZABLE"); _SC_SERIALIZABLEReady = true; } return _SC_SERIALIZABLEContent; } }
         private static byte _SC_SERIALIZABLEContent = default;
         private static bool _SC_SERIALIZABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#SC_WRITE_METHOD"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#SC_WRITE_METHOD"/>
         /// </summary>
         public static byte SC_WRITE_METHOD { get { if (!_SC_WRITE_METHODReady) { _SC_WRITE_METHODContent = SGetField<byte>(LocalBridgeClazz, "SC_WRITE_METHOD"); _SC_WRITE_METHODReady = true; } return _SC_WRITE_METHODContent; } }
         private static byte _SC_WRITE_METHODContent = default;
         private static bool _SC_WRITE_METHODReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_ARRAY"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_ARRAY"/>
         /// </summary>
         public static byte TC_ARRAY { get { if (!_TC_ARRAYReady) { _TC_ARRAYContent = SGetField<byte>(LocalBridgeClazz, "TC_ARRAY"); _TC_ARRAYReady = true; } return _TC_ARRAYContent; } }
         private static byte _TC_ARRAYContent = default;
         private static bool _TC_ARRAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_BASE"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_BASE"/>
         /// </summary>
         public static byte TC_BASE { get { if (!_TC_BASEReady) { _TC_BASEContent = SGetField<byte>(LocalBridgeClazz, "TC_BASE"); _TC_BASEReady = true; } return _TC_BASEContent; } }
         private static byte _TC_BASEContent = default;
         private static bool _TC_BASEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_BLOCKDATA"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_BLOCKDATA"/>
         /// </summary>
         public static byte TC_BLOCKDATA { get { if (!_TC_BLOCKDATAReady) { _TC_BLOCKDATAContent = SGetField<byte>(LocalBridgeClazz, "TC_BLOCKDATA"); _TC_BLOCKDATAReady = true; } return _TC_BLOCKDATAContent; } }
         private static byte _TC_BLOCKDATAContent = default;
         private static bool _TC_BLOCKDATAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_BLOCKDATALONG"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_BLOCKDATALONG"/>
         /// </summary>
         public static byte TC_BLOCKDATALONG { get { if (!_TC_BLOCKDATALONGReady) { _TC_BLOCKDATALONGContent = SGetField<byte>(LocalBridgeClazz, "TC_BLOCKDATALONG"); _TC_BLOCKDATALONGReady = true; } return _TC_BLOCKDATALONGContent; } }
         private static byte _TC_BLOCKDATALONGContent = default;
         private static bool _TC_BLOCKDATALONGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_CLASS"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_CLASS"/>
         /// </summary>
         public static byte TC_CLASS { get { if (!_TC_CLASSReady) { _TC_CLASSContent = SGetField<byte>(LocalBridgeClazz, "TC_CLASS"); _TC_CLASSReady = true; } return _TC_CLASSContent; } }
         private static byte _TC_CLASSContent = default;
         private static bool _TC_CLASSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_CLASSDESC"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_CLASSDESC"/>
         /// </summary>
         public static byte TC_CLASSDESC { get { if (!_TC_CLASSDESCReady) { _TC_CLASSDESCContent = SGetField<byte>(LocalBridgeClazz, "TC_CLASSDESC"); _TC_CLASSDESCReady = true; } return _TC_CLASSDESCContent; } }
         private static byte _TC_CLASSDESCContent = default;
         private static bool _TC_CLASSDESCReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_ENDBLOCKDATA"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_ENDBLOCKDATA"/>
         /// </summary>
         public static byte TC_ENDBLOCKDATA { get { if (!_TC_ENDBLOCKDATAReady) { _TC_ENDBLOCKDATAContent = SGetField<byte>(LocalBridgeClazz, "TC_ENDBLOCKDATA"); _TC_ENDBLOCKDATAReady = true; } return _TC_ENDBLOCKDATAContent; } }
         private static byte _TC_ENDBLOCKDATAContent = default;
         private static bool _TC_ENDBLOCKDATAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_ENUM"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_ENUM"/>
         /// </summary>
         public static byte TC_ENUM { get { if (!_TC_ENUMReady) { _TC_ENUMContent = SGetField<byte>(LocalBridgeClazz, "TC_ENUM"); _TC_ENUMReady = true; } return _TC_ENUMContent; } }
         private static byte _TC_ENUMContent = default;
         private static bool _TC_ENUMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_EXCEPTION"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_EXCEPTION"/>
         /// </summary>
         public static byte TC_EXCEPTION { get { if (!_TC_EXCEPTIONReady) { _TC_EXCEPTIONContent = SGetField<byte>(LocalBridgeClazz, "TC_EXCEPTION"); _TC_EXCEPTIONReady = true; } return _TC_EXCEPTIONContent; } }
         private static byte _TC_EXCEPTIONContent = default;
         private static bool _TC_EXCEPTIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_LONGSTRING"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_LONGSTRING"/>
         /// </summary>
         public static byte TC_LONGSTRING { get { if (!_TC_LONGSTRINGReady) { _TC_LONGSTRINGContent = SGetField<byte>(LocalBridgeClazz, "TC_LONGSTRING"); _TC_LONGSTRINGReady = true; } return _TC_LONGSTRINGContent; } }
         private static byte _TC_LONGSTRINGContent = default;
         private static bool _TC_LONGSTRINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_MAX"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_MAX"/>
         /// </summary>
         public static byte TC_MAX { get { if (!_TC_MAXReady) { _TC_MAXContent = SGetField<byte>(LocalBridgeClazz, "TC_MAX"); _TC_MAXReady = true; } return _TC_MAXContent; } }
         private static byte _TC_MAXContent = default;
         private static bool _TC_MAXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_NULL"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_NULL"/>
         /// </summary>
         public static byte TC_NULL { get { if (!_TC_NULLReady) { _TC_NULLContent = SGetField<byte>(LocalBridgeClazz, "TC_NULL"); _TC_NULLReady = true; } return _TC_NULLContent; } }
         private static byte _TC_NULLContent = default;
         private static bool _TC_NULLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_OBJECT"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_OBJECT"/>
         /// </summary>
         public static byte TC_OBJECT { get { if (!_TC_OBJECTReady) { _TC_OBJECTContent = SGetField<byte>(LocalBridgeClazz, "TC_OBJECT"); _TC_OBJECTReady = true; } return _TC_OBJECTContent; } }
         private static byte _TC_OBJECTContent = default;
         private static bool _TC_OBJECTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_PROXYCLASSDESC"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_PROXYCLASSDESC"/>
         /// </summary>
         public static byte TC_PROXYCLASSDESC { get { if (!_TC_PROXYCLASSDESCReady) { _TC_PROXYCLASSDESCContent = SGetField<byte>(LocalBridgeClazz, "TC_PROXYCLASSDESC"); _TC_PROXYCLASSDESCReady = true; } return _TC_PROXYCLASSDESCContent; } }
         private static byte _TC_PROXYCLASSDESCContent = default;
         private static bool _TC_PROXYCLASSDESCReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_REFERENCE"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_REFERENCE"/>
         /// </summary>
         public static byte TC_REFERENCE { get { if (!_TC_REFERENCEReady) { _TC_REFERENCEContent = SGetField<byte>(LocalBridgeClazz, "TC_REFERENCE"); _TC_REFERENCEReady = true; } return _TC_REFERENCEContent; } }
         private static byte _TC_REFERENCEContent = default;
         private static bool _TC_REFERENCEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_RESET"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_RESET"/>
         /// </summary>
         public static byte TC_RESET { get { if (!_TC_RESETReady) { _TC_RESETContent = SGetField<byte>(LocalBridgeClazz, "TC_RESET"); _TC_RESETReady = true; } return _TC_RESETContent; } }
         private static byte _TC_RESETContent = default;
         private static bool _TC_RESETReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#TC_STRING"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#TC_STRING"/>
         /// </summary>
         public static byte TC_STRING { get { if (!_TC_STRINGReady) { _TC_STRINGContent = SGetField<byte>(LocalBridgeClazz, "TC_STRING"); _TC_STRINGReady = true; } return _TC_STRINGContent; } }
         private static byte _TC_STRINGContent = default;
         private static bool _TC_STRINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#baseWireHandle"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#baseWireHandle"/>
         /// </summary>
         public static int baseWireHandle { get { if (!_baseWireHandleReady) { _baseWireHandleContent = SGetField<int>(LocalBridgeClazz, "baseWireHandle"); _baseWireHandleReady = true; } return _baseWireHandleContent; } }
         private static int _baseWireHandleContent = default;
         private static bool _baseWireHandleReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#PROTOCOL_VERSION_1"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#PROTOCOL_VERSION_1"/>
         /// </summary>
         public static int PROTOCOL_VERSION_1 { get { if (!_PROTOCOL_VERSION_1Ready) { _PROTOCOL_VERSION_1Content = SGetField<int>(LocalBridgeClazz, "PROTOCOL_VERSION_1"); _PROTOCOL_VERSION_1Ready = true; } return _PROTOCOL_VERSION_1Content; } }
         private static int _PROTOCOL_VERSION_1Content = default;
         private static bool _PROTOCOL_VERSION_1Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#PROTOCOL_VERSION_2"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#PROTOCOL_VERSION_2"/>
         /// </summary>
         public static int PROTOCOL_VERSION_2 { get { if (!_PROTOCOL_VERSION_2Ready) { _PROTOCOL_VERSION_2Content = SGetField<int>(LocalBridgeClazz, "PROTOCOL_VERSION_2"); _PROTOCOL_VERSION_2Ready = true; } return _PROTOCOL_VERSION_2Content; } }
         private static int _PROTOCOL_VERSION_2Content = default;
         private static bool _PROTOCOL_VERSION_2Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#SERIAL_FILTER_PERMISSION"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#SERIAL_FILTER_PERMISSION"/>
         /// </summary>
         public static Java.Io.SerializablePermission SERIAL_FILTER_PERMISSION { get { if (!_SERIAL_FILTER_PERMISSIONReady) { _SERIAL_FILTER_PERMISSIONContent = SGetField<Java.Io.SerializablePermission>(LocalBridgeClazz, "SERIAL_FILTER_PERMISSION"); _SERIAL_FILTER_PERMISSIONReady = true; } return _SERIAL_FILTER_PERMISSIONContent; } }
         private static Java.Io.SerializablePermission _SERIAL_FILTER_PERMISSIONContent = default;
         private static bool _SERIAL_FILTER_PERMISSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#SUBCLASS_IMPLEMENTATION_PERMISSION"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#SUBCLASS_IMPLEMENTATION_PERMISSION"/>
         /// </summary>
         public static Java.Io.SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION { get { if (!_SUBCLASS_IMPLEMENTATION_PERMISSIONReady) { _SUBCLASS_IMPLEMENTATION_PERMISSIONContent = SGetField<Java.Io.SerializablePermission>(LocalBridgeClazz, "SUBCLASS_IMPLEMENTATION_PERMISSION"); _SUBCLASS_IMPLEMENTATION_PERMISSIONReady = true; } return _SUBCLASS_IMPLEMENTATION_PERMISSIONContent; } }
         private static Java.Io.SerializablePermission _SUBCLASS_IMPLEMENTATION_PERMISSIONContent = default;
         private static bool _SUBCLASS_IMPLEMENTATION_PERMISSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#SUBSTITUTION_PERMISSION"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#SUBSTITUTION_PERMISSION"/>
         /// </summary>
         public static Java.Io.SerializablePermission SUBSTITUTION_PERMISSION { get { if (!_SUBSTITUTION_PERMISSIONReady) { _SUBSTITUTION_PERMISSIONContent = SGetField<Java.Io.SerializablePermission>(LocalBridgeClazz, "SUBSTITUTION_PERMISSION"); _SUBSTITUTION_PERMISSIONReady = true; } return _SUBSTITUTION_PERMISSIONContent; } }
         private static Java.Io.SerializablePermission _SUBSTITUTION_PERMISSIONContent = default;
         private static bool _SUBSTITUTION_PERMISSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#STREAM_MAGIC"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#STREAM_MAGIC"/>
         /// </summary>
         public static short STREAM_MAGIC { get { if (!_STREAM_MAGICReady) { _STREAM_MAGICContent = SGetField<short>(LocalBridgeClazz, "STREAM_MAGIC"); _STREAM_MAGICReady = true; } return _STREAM_MAGICContent; } }
         private static short _STREAM_MAGICContent = default;
         private static bool _STREAM_MAGICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamConstants.html#STREAM_VERSION"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamConstants.html#STREAM_VERSION"/>
         /// </summary>
         public static short STREAM_VERSION { get { if (!_STREAM_VERSIONReady) { _STREAM_VERSIONContent = SGetField<short>(LocalBridgeClazz, "STREAM_VERSION"); _STREAM_VERSIONReady = true; } return _STREAM_VERSIONContent; } }
         private static short _STREAM_VERSIONContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Io/ObjectStreamField.cs b/src/net/Netdroid/Generated/Java/Io/ObjectStreamField.cs
index 2b8602bb0..3d4cdeb17 100644
--- a/src/net/Netdroid/Generated/Java/Io/ObjectStreamField.cs
+++ b/src/net/Netdroid/Generated/Java/Io/ObjectStreamField.cs
@@ -30,7 +30,7 @@ public partial class ObjectStreamField
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#%3Cinit%3E(java.lang.String,java.lang.Class,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#%3Cinit%3E(java.lang.String,java.lang.Class,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -40,7 +40,7 @@ public ObjectStreamField(Java.Lang.String arg0, Java.Lang.Class arg1, bool arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#%3Cinit%3E(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#%3Cinit%3E(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -65,64 +65,69 @@ public ObjectStreamField(Java.Lang.String arg0, Java.Lang.Class arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#isPrimitive()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPrimitive()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isPrimitive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#getOffset()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#isUnshared()"/>
         /// </summary>
-        public int Offset
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUnshared()
         {
-            get { return IExecuteWithSignature<int>("getOffset", "()I"); }
+            return IExecuteWithSignature<bool>("isUnshared", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#getTypeCode()"/>
         /// </summary>
-        public Java.Lang.Class Type
+        /// <returns><see cref="char"/></returns>
+        public char GetTypeCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<char>("getTypeCode", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#getTypeCode()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#compareTo(java.lang.Object)"/>
         /// </summary>
-        public char TypeCode
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
         {
-            get { return IExecuteWithSignature<char>("getTypeCode", "()C"); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#getTypeString()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#getOffset()"/>
         /// </summary>
-        public Java.Lang.String TypeString
+        /// <returns><see cref="int"/></returns>
+        public int GetOffset()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#isPrimitive()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPrimitive()
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetType()
         {
-            return IExecuteWithSignature<bool>("isPrimitive", "()Z");
+            return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#isUnshared()"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUnshared()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isUnshared", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/ObjectStreamField.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/ObjectStreamField.html#getTypeString()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(object arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTypeString()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getTypeString", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/OutputStream.cs b/src/net/Netdroid/Generated/Java/Io/OutputStream.cs
index b4f826062..6aaf00c17 100644
--- a/src/net/Netdroid/Generated/Java/Io/OutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/OutputStream.cs
@@ -50,7 +50,7 @@ public partial class OutputStream : Java.Io.ICloseable, Java.Io.IFlushable
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStream.html#nullOutputStream()"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStream.html#nullOutputStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.OutputStream"/></returns>
         public static Java.Io.OutputStream NullOutputStream()
@@ -62,7 +62,7 @@ public static Java.Io.OutputStream NullOutputStream()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStream.html#write(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStream.html#write(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -71,7 +71,7 @@ public void Write(int arg0)
             IExecuteWithSignature("write", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStream.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStream.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
@@ -79,7 +79,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStream.html#flush()"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStream.html#flush()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Flush()
@@ -87,7 +87,7 @@ public void Flush()
             IExecuteWithSignature("flush", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStream.html#write(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStream.html#write(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -98,7 +98,7 @@ public void Write(byte[] arg0, int arg1, int arg2)
             IExecute("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStream.html#write(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStream.html#write(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/OutputStreamWriter.cs b/src/net/Netdroid/Generated/Java/Io/OutputStreamWriter.cs
index a2ee7a18d..e167683eb 100644
--- a/src/net/Netdroid/Generated/Java/Io/OutputStreamWriter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/OutputStreamWriter.cs
@@ -30,7 +30,7 @@ public partial class OutputStreamWriter
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStreamWriter.html#%3Cinit%3E(java.io.OutputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStreamWriter.html#%3Cinit%3E(java.io.OutputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -40,7 +40,7 @@ public OutputStreamWriter(Java.Io.OutputStream arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStreamWriter.html#%3Cinit%3E(java.io.OutputStream,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStreamWriter.html#%3Cinit%3E(java.io.OutputStream,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -49,7 +49,7 @@ public OutputStreamWriter(Java.Io.OutputStream arg0, Java.Nio.Charset.Charset ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStreamWriter.html#%3Cinit%3E(java.io.OutputStream,java.nio.charset.CharsetEncoder)"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStreamWriter.html#%3Cinit%3E(java.io.OutputStream,java.nio.charset.CharsetEncoder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.CharsetEncoder"/></param>
@@ -58,7 +58,7 @@ public OutputStreamWriter(Java.Io.OutputStream arg0, Java.Nio.Charset.CharsetEnc
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStreamWriter.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/OutputStreamWriter.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public OutputStreamWriter(Java.Io.OutputStream arg0)
@@ -82,11 +82,12 @@ public OutputStreamWriter(Java.Io.OutputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/OutputStreamWriter.html#getEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/OutputStreamWriter.html#getEncoding()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/PipedInputStream.cs b/src/net/Netdroid/Generated/Java/Io/PipedInputStream.cs
index 8462fa398..3228ff59f 100644
--- a/src/net/Netdroid/Generated/Java/Io/PipedInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/PipedInputStream.cs
@@ -30,7 +30,7 @@ public partial class PipedInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedInputStream.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedInputStream.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public PipedInputStream(int arg0)
@@ -38,7 +38,7 @@ public PipedInputStream(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedInputStream.html#%3Cinit%3E(java.io.PipedOutputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedInputStream.html#%3Cinit%3E(java.io.PipedOutputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedOutputStream"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -48,7 +48,7 @@ public PipedInputStream(Java.Io.PipedOutputStream arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedInputStream.html#%3Cinit%3E(java.io.PipedOutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedInputStream.html#%3Cinit%3E(java.io.PipedOutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedOutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -73,7 +73,7 @@ public PipedInputStream(Java.Io.PipedOutputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedInputStream.html#connect(java.io.PipedOutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedInputStream.html#connect(java.io.PipedOutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedOutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/PipedOutputStream.cs b/src/net/Netdroid/Generated/Java/Io/PipedOutputStream.cs
index 25ed97798..78347e31b 100644
--- a/src/net/Netdroid/Generated/Java/Io/PipedOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/PipedOutputStream.cs
@@ -30,7 +30,7 @@ public partial class PipedOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedOutputStream.html#%3Cinit%3E(java.io.PipedInputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedOutputStream.html#%3Cinit%3E(java.io.PipedInputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedInputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -55,7 +55,7 @@ public PipedOutputStream(Java.Io.PipedInputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedOutputStream.html#connect(java.io.PipedInputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedOutputStream.html#connect(java.io.PipedInputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedInputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/PipedReader.cs b/src/net/Netdroid/Generated/Java/Io/PipedReader.cs
index b74f81efb..8a41fd8d4 100644
--- a/src/net/Netdroid/Generated/Java/Io/PipedReader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/PipedReader.cs
@@ -30,7 +30,7 @@ public partial class PipedReader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedReader.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedReader.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public PipedReader(int arg0)
@@ -38,7 +38,7 @@ public PipedReader(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedReader.html#%3Cinit%3E(java.io.PipedWriter,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedReader.html#%3Cinit%3E(java.io.PipedWriter,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedWriter"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -48,7 +48,7 @@ public PipedReader(Java.Io.PipedWriter arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedReader.html#%3Cinit%3E(java.io.PipedWriter)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedReader.html#%3Cinit%3E(java.io.PipedWriter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedWriter"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -73,7 +73,7 @@ public PipedReader(Java.Io.PipedWriter arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedReader.html#connect(java.io.PipedWriter)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedReader.html#connect(java.io.PipedWriter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedWriter"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/PipedWriter.cs b/src/net/Netdroid/Generated/Java/Io/PipedWriter.cs
index 8424f83ca..b299d2991 100644
--- a/src/net/Netdroid/Generated/Java/Io/PipedWriter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/PipedWriter.cs
@@ -30,7 +30,7 @@ public partial class PipedWriter
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedWriter.html#%3Cinit%3E(java.io.PipedReader)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedWriter.html#%3Cinit%3E(java.io.PipedReader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedReader"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -55,7 +55,7 @@ public PipedWriter(Java.Io.PipedReader arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PipedWriter.html#connect(java.io.PipedReader)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PipedWriter.html#connect(java.io.PipedReader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PipedReader"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/PrintStream.cs b/src/net/Netdroid/Generated/Java/Io/PrintStream.cs
index c31b7d128..7000f653b 100644
--- a/src/net/Netdroid/Generated/Java/Io/PrintStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/PrintStream.cs
@@ -30,7 +30,7 @@ public partial class PrintStream : Java.Lang.IAppendable, Java.Io.ICloseable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -41,7 +41,7 @@ public PrintStream(Java.Io.File arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -51,7 +51,7 @@ public PrintStream(Java.Io.File arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -60,7 +60,7 @@ public PrintStream(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.io.OutputStream,boolean,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.io.OutputStream,boolean,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -71,7 +71,7 @@ public PrintStream(Java.Io.OutputStream arg0, bool arg1, Java.Lang.String arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.io.OutputStream,boolean,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.io.OutputStream,boolean,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -81,7 +81,7 @@ public PrintStream(Java.Io.OutputStream arg0, bool arg1, Java.Nio.Charset.Charse
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.io.OutputStream,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.io.OutputStream,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -90,7 +90,7 @@ public PrintStream(Java.Io.OutputStream arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public PrintStream(Java.Io.OutputStream arg0)
@@ -98,7 +98,7 @@ public PrintStream(Java.Io.OutputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -109,7 +109,7 @@ public PrintStream(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -119,7 +119,7 @@ public PrintStream(Java.Lang.String arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -152,7 +152,7 @@ public PrintStream(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#checkError()"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#checkError()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool CheckError()
@@ -160,7 +160,7 @@ public bool CheckError()
             return IExecuteWithSignature<bool>("checkError", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#format(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#format(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -170,7 +170,7 @@ public Java.Io.PrintStream Format(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecute<Java.Io.PrintStream>("format", arg0); else return IExecute<Java.Io.PrintStream>("format", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#format(java.util.Locale,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#format(java.util.Locale,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -181,7 +181,7 @@ public Java.Io.PrintStream Format(Java.Util.Locale arg0, Java.Lang.String arg1,
             if (arg2.Length == 0) return IExecute<Java.Io.PrintStream>("format", arg0, arg1); else return IExecute<Java.Io.PrintStream>("format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#printf(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#printf(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -191,7 +191,7 @@ public Java.Io.PrintStream Printf(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecute<Java.Io.PrintStream>("printf", arg0); else return IExecute<Java.Io.PrintStream>("printf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#printf(java.util.Locale,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#printf(java.util.Locale,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -202,7 +202,7 @@ public Java.Io.PrintStream Printf(Java.Util.Locale arg0, Java.Lang.String arg1,
             if (arg2.Length == 0) return IExecute<Java.Io.PrintStream>("printf", arg0, arg1); else return IExecute<Java.Io.PrintStream>("printf", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#append(char)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#append(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
@@ -212,7 +212,7 @@ public Java.Lang.Appendable Append(char arg0)
             return IExecuteWithSignature<Java.Lang.Appendable>("append", "(C)Ljava/lang/Appendable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#append(java.lang.CharSequence,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#append(java.lang.CharSequence,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -224,7 +224,7 @@ public Java.Lang.Appendable Append(Java.Lang.CharSequence arg0, int arg1, int ar
             return IExecute<Java.Lang.Appendable>("append", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#append(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#append(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
@@ -234,7 +234,7 @@ public Java.Lang.Appendable Append(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Lang.Appendable>("append", "(Ljava/lang/CharSequence;)Ljava/lang/Appendable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void Print(bool arg0)
@@ -242,7 +242,7 @@ public void Print(bool arg0)
             IExecuteWithSignature("print", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(char)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public void Print(char arg0)
@@ -250,7 +250,7 @@ public void Print(char arg0)
             IExecuteWithSignature("print", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public void Print(char[] arg0)
@@ -258,7 +258,7 @@ public void Print(char[] arg0)
             IExecuteWithSignature("print", "([C)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(double)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public void Print(double arg0)
@@ -266,7 +266,7 @@ public void Print(double arg0)
             IExecuteWithSignature("print", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(float)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         public void Print(float arg0)
@@ -274,7 +274,7 @@ public void Print(float arg0)
             IExecuteWithSignature("print", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Print(int arg0)
@@ -282,7 +282,7 @@ public void Print(int arg0)
             IExecuteWithSignature("print", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Print(object arg0)
@@ -290,7 +290,7 @@ public void Print(object arg0)
             IExecuteWithSignature("print", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Print(Java.Lang.String arg0)
@@ -298,7 +298,7 @@ public void Print(Java.Lang.String arg0)
             IExecuteWithSignature("print", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#print(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#print(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Print(long arg0)
@@ -306,14 +306,14 @@ public void Print(long arg0)
             IExecuteWithSignature("print", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println()"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println()"/>
         /// </summary>
         public void Println()
         {
             IExecuteWithSignature("println", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void Println(bool arg0)
@@ -321,7 +321,7 @@ public void Println(bool arg0)
             IExecuteWithSignature("println", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(char)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public void Println(char arg0)
@@ -329,7 +329,7 @@ public void Println(char arg0)
             IExecuteWithSignature("println", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public void Println(char[] arg0)
@@ -337,7 +337,7 @@ public void Println(char[] arg0)
             IExecuteWithSignature("println", "([C)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(double)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public void Println(double arg0)
@@ -345,7 +345,7 @@ public void Println(double arg0)
             IExecuteWithSignature("println", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(float)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         public void Println(float arg0)
@@ -353,7 +353,7 @@ public void Println(float arg0)
             IExecuteWithSignature("println", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Println(int arg0)
@@ -361,7 +361,7 @@ public void Println(int arg0)
             IExecuteWithSignature("println", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Println(object arg0)
@@ -369,7 +369,7 @@ public void Println(object arg0)
             IExecuteWithSignature("println", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Println(Java.Lang.String arg0)
@@ -377,21 +377,13 @@ public void Println(Java.Lang.String arg0)
             IExecuteWithSignature("println", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#println(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintStream.html#println(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Println(long arg0)
         {
             IExecuteWithSignature("println", "(J)V", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintStream.html#writeBytes(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        public void WriteBytes(byte[] arg0)
-        {
-            IExecuteWithSignature("writeBytes", "([B)V", new object[] { arg0 });
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Io/PrintWriter.cs b/src/net/Netdroid/Generated/Java/Io/PrintWriter.cs
index 49ecb710a..1b30eb4d3 100644
--- a/src/net/Netdroid/Generated/Java/Io/PrintWriter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/PrintWriter.cs
@@ -30,7 +30,7 @@ public partial class PrintWriter
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -41,7 +41,7 @@ public PrintWriter(Java.Io.File arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -51,7 +51,7 @@ public PrintWriter(Java.Io.File arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -60,7 +60,7 @@ public PrintWriter(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.io.OutputStream,boolean,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.io.OutputStream,boolean,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -70,7 +70,7 @@ public PrintWriter(Java.Io.OutputStream arg0, bool arg1, Java.Nio.Charset.Charse
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.io.OutputStream,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.io.OutputStream,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -79,7 +79,7 @@ public PrintWriter(Java.Io.OutputStream arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public PrintWriter(Java.Io.OutputStream arg0)
@@ -87,7 +87,7 @@ public PrintWriter(Java.Io.OutputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.io.Writer,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.io.Writer,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -96,7 +96,7 @@ public PrintWriter(Java.Io.Writer arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.io.Writer)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.io.Writer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
         public PrintWriter(Java.Io.Writer arg0)
@@ -104,7 +104,7 @@ public PrintWriter(Java.Io.Writer arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -115,7 +115,7 @@ public PrintWriter(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -125,7 +125,7 @@ public PrintWriter(Java.Lang.String arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -150,7 +150,7 @@ public PrintWriter(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#checkError()"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#checkError()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool CheckError()
@@ -158,7 +158,7 @@ public bool CheckError()
             return IExecuteWithSignature<bool>("checkError", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#format(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#format(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -168,7 +168,7 @@ public Java.Io.PrintWriter Format(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecute<Java.Io.PrintWriter>("format", arg0); else return IExecute<Java.Io.PrintWriter>("format", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#format(java.util.Locale,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#format(java.util.Locale,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -179,7 +179,7 @@ public Java.Io.PrintWriter Format(Java.Util.Locale arg0, Java.Lang.String arg1,
             if (arg2.Length == 0) return IExecute<Java.Io.PrintWriter>("format", arg0, arg1); else return IExecute<Java.Io.PrintWriter>("format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#printf(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#printf(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -189,7 +189,7 @@ public Java.Io.PrintWriter Printf(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecute<Java.Io.PrintWriter>("printf", arg0); else return IExecute<Java.Io.PrintWriter>("printf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#printf(java.util.Locale,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#printf(java.util.Locale,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -200,7 +200,7 @@ public Java.Io.PrintWriter Printf(Java.Util.Locale arg0, Java.Lang.String arg1,
             if (arg2.Length == 0) return IExecute<Java.Io.PrintWriter>("printf", arg0, arg1); else return IExecute<Java.Io.PrintWriter>("printf", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void Print(bool arg0)
@@ -208,7 +208,7 @@ public void Print(bool arg0)
             IExecuteWithSignature("print", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(char)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public void Print(char arg0)
@@ -216,7 +216,7 @@ public void Print(char arg0)
             IExecuteWithSignature("print", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public void Print(char[] arg0)
@@ -224,7 +224,7 @@ public void Print(char[] arg0)
             IExecuteWithSignature("print", "([C)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(double)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public void Print(double arg0)
@@ -232,7 +232,7 @@ public void Print(double arg0)
             IExecuteWithSignature("print", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(float)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         public void Print(float arg0)
@@ -240,7 +240,7 @@ public void Print(float arg0)
             IExecuteWithSignature("print", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Print(int arg0)
@@ -248,7 +248,7 @@ public void Print(int arg0)
             IExecuteWithSignature("print", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Print(object arg0)
@@ -256,7 +256,7 @@ public void Print(object arg0)
             IExecuteWithSignature("print", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Print(Java.Lang.String arg0)
@@ -264,7 +264,7 @@ public void Print(Java.Lang.String arg0)
             IExecuteWithSignature("print", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#print(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#print(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Print(long arg0)
@@ -272,14 +272,14 @@ public void Print(long arg0)
             IExecuteWithSignature("print", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println()"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println()"/>
         /// </summary>
         public void Println()
         {
             IExecuteWithSignature("println", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void Println(bool arg0)
@@ -287,7 +287,7 @@ public void Println(bool arg0)
             IExecuteWithSignature("println", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(char)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public void Println(char arg0)
@@ -295,7 +295,7 @@ public void Println(char arg0)
             IExecuteWithSignature("println", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public void Println(char[] arg0)
@@ -303,7 +303,7 @@ public void Println(char[] arg0)
             IExecuteWithSignature("println", "([C)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(double)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public void Println(double arg0)
@@ -311,7 +311,7 @@ public void Println(double arg0)
             IExecuteWithSignature("println", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(float)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         public void Println(float arg0)
@@ -319,7 +319,7 @@ public void Println(float arg0)
             IExecuteWithSignature("println", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Println(int arg0)
@@ -327,7 +327,7 @@ public void Println(int arg0)
             IExecuteWithSignature("println", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Println(object arg0)
@@ -335,7 +335,7 @@ public void Println(object arg0)
             IExecuteWithSignature("println", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Println(Java.Lang.String arg0)
@@ -343,7 +343,7 @@ public void Println(Java.Lang.String arg0)
             IExecuteWithSignature("println", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PrintWriter.html#println(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PrintWriter.html#println(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Println(long arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/PushbackInputStream.cs b/src/net/Netdroid/Generated/Java/Io/PushbackInputStream.cs
index 9bc246cba..d0c92222a 100644
--- a/src/net/Netdroid/Generated/Java/Io/PushbackInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/PushbackInputStream.cs
@@ -30,7 +30,7 @@ public partial class PushbackInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackInputStream.html#%3Cinit%3E(java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackInputStream.html#%3Cinit%3E(java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public PushbackInputStream(Java.Io.InputStream arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public PushbackInputStream(Java.Io.InputStream arg0)
@@ -63,7 +63,7 @@ public PushbackInputStream(Java.Io.InputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackInputStream.html#unread(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackInputStream.html#unread(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -74,7 +74,7 @@ public void Unread(byte[] arg0, int arg1, int arg2)
             IExecute("unread", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackInputStream.html#unread(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackInputStream.html#unread(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -83,7 +83,7 @@ public void Unread(byte[] arg0)
             IExecuteWithSignature("unread", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackInputStream.html#unread(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackInputStream.html#unread(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/PushbackReader.cs b/src/net/Netdroid/Generated/Java/Io/PushbackReader.cs
index 50dac1c47..ba45b165c 100644
--- a/src/net/Netdroid/Generated/Java/Io/PushbackReader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/PushbackReader.cs
@@ -30,7 +30,7 @@ public partial class PushbackReader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackReader.html#%3Cinit%3E(java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackReader.html#%3Cinit%3E(java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public PushbackReader(Java.Io.Reader arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackReader.html#%3Cinit%3E(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackReader.html#%3Cinit%3E(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         public PushbackReader(Java.Io.Reader arg0)
@@ -63,7 +63,7 @@ public PushbackReader(Java.Io.Reader arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackReader.html#unread(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackReader.html#unread(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -74,7 +74,7 @@ public void Unread(char[] arg0, int arg1, int arg2)
             IExecute("unread", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackReader.html#unread(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackReader.html#unread(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -83,7 +83,7 @@ public void Unread(char[] arg0)
             IExecuteWithSignature("unread", "([C)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/PushbackReader.html#unread(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/PushbackReader.html#unread(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/RandomAccessFile.cs b/src/net/Netdroid/Generated/Java/Io/RandomAccessFile.cs
index 4a31608f2..b6fc9040e 100644
--- a/src/net/Netdroid/Generated/Java/Io/RandomAccessFile.cs
+++ b/src/net/Netdroid/Generated/Java/Io/RandomAccessFile.cs
@@ -30,7 +30,7 @@ public partial class RandomAccessFile : Java.Io.IDataOutput, Java.Io.IDataInput,
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -40,7 +40,7 @@ public RandomAccessFile(Java.Io.File arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -78,28 +78,7 @@ public RandomAccessFile(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#getChannel()"/> 
-        /// </summary>
-        public Java.Nio.Channels.FileChannel Channel
-        {
-            get { return IExecuteWithSignature<Java.Nio.Channels.FileChannel>("getChannel", "()Ljava/nio/channels/FileChannel;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#getFD()"/> 
-        /// </summary>
-        public Java.Io.FileDescriptor FD
-        {
-            get { return IExecuteWithSignature<Java.Io.FileDescriptor>("getFD", "()Ljava/io/FileDescriptor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#getFilePointer()"/> 
-        /// </summary>
-        public long FilePointer
-        {
-            get { return IExecuteWithSignature<long>("getFilePointer", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -108,7 +87,7 @@ public bool ReadBoolean()
             return IExecuteWithSignature<bool>("readBoolean", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readByte()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readByte()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -117,7 +96,7 @@ public byte ReadByte()
             return IExecuteWithSignature<byte>("readByte", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readChar()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readChar()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -126,7 +105,7 @@ public char ReadChar()
             return IExecuteWithSignature<char>("readChar", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readDouble()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -135,7 +114,7 @@ public double ReadDouble()
             return IExecuteWithSignature<double>("readDouble", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readFloat()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readFloat()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -144,7 +123,7 @@ public float ReadFloat()
             return IExecuteWithSignature<float>("readFloat", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readInt()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -153,7 +132,7 @@ public int ReadInt()
             return IExecuteWithSignature<int>("readInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readUnsignedByte()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readUnsignedByte()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -162,7 +141,7 @@ public int ReadUnsignedByte()
             return IExecuteWithSignature<int>("readUnsignedByte", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readUnsignedShort()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readUnsignedShort()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -171,7 +150,16 @@ public int ReadUnsignedShort()
             return IExecuteWithSignature<int>("readUnsignedShort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readLine()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#getFD()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.FileDescriptor"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.FileDescriptor GetFD()
+        {
+            return IExecuteWithSignature<Java.Io.FileDescriptor>("getFD", "()Ljava/io/FileDescriptor;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readLine()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -180,7 +168,7 @@ public Java.Lang.String ReadLine()
             return IExecuteWithSignature<Java.Lang.String>("readLine", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readUTF()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readUTF()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -189,7 +177,15 @@ public Java.Lang.String ReadUTF()
             return IExecuteWithSignature<Java.Lang.String>("readUTF", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readLong()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#getChannel()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Nio.Channels.FileChannel"/></returns>
+        public Java.Nio.Channels.FileChannel GetChannel()
+        {
+            return IExecuteWithSignature<Java.Nio.Channels.FileChannel>("getChannel", "()Ljava/nio/channels/FileChannel;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readLong()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -198,7 +194,7 @@ public long ReadLong()
             return IExecuteWithSignature<long>("readLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readShort()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readShort()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -207,7 +203,7 @@ public short ReadShort()
             return IExecuteWithSignature<short>("readShort", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readFully(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readFully(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -218,7 +214,7 @@ public void ReadFully(byte[] arg0, int arg1, int arg2)
             IExecute("readFully", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#readFully(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#readFully(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -227,7 +223,7 @@ public void ReadFully(byte[] arg0)
             IExecuteWithSignature("readFully", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeBoolean(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeBoolean(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -236,7 +232,7 @@ public void WriteBoolean(bool arg0)
             IExecuteWithSignature("writeBoolean", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeByte(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeByte(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -245,7 +241,7 @@ public void WriteByte(int arg0)
             IExecuteWithSignature("writeByte", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeBytes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeBytes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -254,7 +250,7 @@ public void WriteBytes(Java.Lang.String arg0)
             IExecuteWithSignature("writeBytes", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -263,7 +259,7 @@ public void WriteChar(int arg0)
             IExecuteWithSignature("writeChar", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeChars(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeChars(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -272,7 +268,7 @@ public void WriteChars(Java.Lang.String arg0)
             IExecuteWithSignature("writeChars", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -281,7 +277,7 @@ public void WriteDouble(double arg0)
             IExecuteWithSignature("writeDouble", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeFloat(float)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeFloat(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -290,7 +286,7 @@ public void WriteFloat(float arg0)
             IExecuteWithSignature("writeFloat", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -299,7 +295,7 @@ public void WriteInt(int arg0)
             IExecuteWithSignature("writeInt", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeLong(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -308,7 +304,7 @@ public void WriteLong(long arg0)
             IExecuteWithSignature("writeLong", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -317,7 +313,7 @@ public void WriteShort(int arg0)
             IExecuteWithSignature("writeShort", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#writeUTF(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#writeUTF(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -326,7 +322,7 @@ public void WriteUTF(Java.Lang.String arg0)
             IExecuteWithSignature("writeUTF", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#read()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#read()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -335,7 +331,7 @@ public int Read()
             return IExecuteWithSignature<int>("read", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#read(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#read(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -347,7 +343,7 @@ public int Read(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#read(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#read(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -357,7 +353,7 @@ public int Read(byte[] arg0)
             return IExecuteWithSignature<int>("read", "([B)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#skipBytes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#skipBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -367,25 +363,34 @@ public int SkipBytes(int arg0)
             return IExecuteWithSignature<int>("skipBytes", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#getFilePointer()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public long GetFilePointer()
+        {
+            return IExecuteWithSignature<long>("getFilePointer", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#length()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
         public long Length()
         {
-            return IExecuteWithSignature<long>("length", "()J");
+            return IExecute<long>("length");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#setLength(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#setLength(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Io.IOException"/>
         public void SetLength(long arg0)
         {
-            IExecuteWithSignature("setLength", "(J)V", arg0);
+            IExecute("setLength", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
@@ -393,7 +398,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#seek(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#seek(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -402,7 +407,7 @@ public void Seek(long arg0)
             IExecuteWithSignature("seek", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#write(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#write(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -413,7 +418,7 @@ public void Write(byte[] arg0, int arg1, int arg2)
             IExecute("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#write(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#write(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -422,7 +427,7 @@ public void Write(byte[] arg0)
             IExecuteWithSignature("write", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/RandomAccessFile.html#write(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/RandomAccessFile.html#write(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Io/Reader.cs b/src/net/Netdroid/Generated/Java/Io/Reader.cs
index 3d1b6a0ff..a056a9c79 100644
--- a/src/net/Netdroid/Generated/Java/Io/Reader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/Reader.cs
@@ -50,7 +50,7 @@ public partial class Reader : Java.Lang.IReadable, Java.Io.ICloseable
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#nullReader()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#nullReader()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.Reader"/></returns>
         public static Java.Io.Reader NullReader()
@@ -62,7 +62,7 @@ public static Java.Io.Reader NullReader()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#read(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#read(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -74,7 +74,7 @@ public int Read(char[] arg0, int arg1, int arg2)
             return IExecute<int>("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
@@ -82,7 +82,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#markSupported()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#markSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool MarkSupported()
@@ -90,7 +90,7 @@ public bool MarkSupported()
             return IExecuteWithSignature<bool>("markSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#ready()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#ready()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -99,7 +99,7 @@ public bool Ready()
             return IExecuteWithSignature<bool>("ready", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#read()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#read()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -108,7 +108,7 @@ public int Read()
             return IExecuteWithSignature<int>("read", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#read(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#read(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="int"/></returns>
@@ -118,7 +118,7 @@ public int Read(char[] arg0)
             return IExecuteWithSignature<int>("read", "([C)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#read(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#read(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -128,7 +128,7 @@ public int Read(Java.Nio.CharBuffer arg0)
             return IExecuteWithSignature<int>("read", "(Ljava/nio/CharBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#skip(long)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#skip(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -138,7 +138,7 @@ public long Skip(long arg0)
             return IExecuteWithSignature<long>("skip", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#transferTo(java.io.Writer)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#transferTo(java.io.Writer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
         /// <returns><see cref="long"/></returns>
@@ -148,7 +148,7 @@ public long TransferTo(Java.Io.Writer arg0)
             return IExecuteWithSignature<long>("transferTo", "(Ljava/io/Writer;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#mark(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#mark(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -157,7 +157,7 @@ public void Mark(int arg0)
             IExecuteWithSignature("mark", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Reader.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Reader.html#reset()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Reset()
diff --git a/src/net/Netdroid/Generated/Java/Io/SequenceInputStream.cs b/src/net/Netdroid/Generated/Java/Io/SequenceInputStream.cs
index a87dedec6..c87c08fc8 100644
--- a/src/net/Netdroid/Generated/Java/Io/SequenceInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/SequenceInputStream.cs
@@ -30,7 +30,7 @@ public partial class SequenceInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/SequenceInputStream.html#%3Cinit%3E(java.io.InputStream,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/SequenceInputStream.html#%3Cinit%3E(java.io.InputStream,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -39,7 +39,7 @@ public SequenceInputStream(Java.Io.InputStream arg0, Java.Io.InputStream arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/SequenceInputStream.html#%3Cinit%3E(java.util.Enumeration)"/>
+        /// <see href="https://developer.android.com/reference/java/io/SequenceInputStream.html#%3Cinit%3E(java.util.Enumeration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Enumeration"/></param>
         public SequenceInputStream(Java.Util.Enumeration arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/SerializablePermission.cs b/src/net/Netdroid/Generated/Java/Io/SerializablePermission.cs
index 3909947d2..5181763cb 100644
--- a/src/net/Netdroid/Generated/Java/Io/SerializablePermission.cs
+++ b/src/net/Netdroid/Generated/Java/Io/SerializablePermission.cs
@@ -30,7 +30,7 @@ public partial class SerializablePermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/SerializablePermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/SerializablePermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public SerializablePermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/SerializablePermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/SerializablePermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public SerializablePermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/StreamTokenizer.cs b/src/net/Netdroid/Generated/Java/Io/StreamTokenizer.cs
index 90af77793..cbd8bba41 100644
--- a/src/net/Netdroid/Generated/Java/Io/StreamTokenizer.cs
+++ b/src/net/Netdroid/Generated/Java/Io/StreamTokenizer.cs
@@ -30,16 +30,16 @@ public partial class StreamTokenizer
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public StreamTokenizer(Java.Io.InputStream arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#%3Cinit%3E(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#%3Cinit%3E(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         public StreamTokenizer(Java.Io.Reader arg0)
@@ -55,37 +55,37 @@ public StreamTokenizer(Java.Io.Reader arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#nval"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#nval"/>
         /// </summary>
         public double nval { get { return IGetField<double>("nval"); } set { ISetField("nval", value); } }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#ttype"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#ttype"/>
         /// </summary>
         public int ttype { get { return IGetField<int>("ttype"); } set { ISetField("ttype", value); } }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#sval"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#sval"/>
         /// </summary>
         public Java.Lang.String sval { get { return IGetField<Java.Lang.String>("sval"); } set { ISetField("sval", value); } }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#TT_EOF"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#TT_EOF"/>
         /// </summary>
         public static int TT_EOF { get { if (!_TT_EOFReady) { _TT_EOFContent = SGetField<int>(LocalBridgeClazz, "TT_EOF"); _TT_EOFReady = true; } return _TT_EOFContent; } }
         private static int _TT_EOFContent = default;
         private static bool _TT_EOFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#TT_EOL"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#TT_EOL"/>
         /// </summary>
         public static int TT_EOL { get { if (!_TT_EOLReady) { _TT_EOLContent = SGetField<int>(LocalBridgeClazz, "TT_EOL"); _TT_EOLReady = true; } return _TT_EOLContent; } }
         private static int _TT_EOLContent = default;
         private static bool _TT_EOLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#TT_NUMBER"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#TT_NUMBER"/>
         /// </summary>
         public static int TT_NUMBER { get { if (!_TT_NUMBERReady) { _TT_NUMBERContent = SGetField<int>(LocalBridgeClazz, "TT_NUMBER"); _TT_NUMBERReady = true; } return _TT_NUMBERContent; } }
         private static int _TT_NUMBERContent = default;
         private static bool _TT_NUMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#TT_WORD"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#TT_WORD"/>
         /// </summary>
         public static int TT_WORD { get { if (!_TT_WORDReady) { _TT_WORDContent = SGetField<int>(LocalBridgeClazz, "TT_WORD"); _TT_WORDReady = true; } return _TT_WORDContent; } }
         private static int _TT_WORDContent = default;
@@ -99,7 +99,7 @@ public StreamTokenizer(Java.Io.Reader arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#lineno()"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#lineno()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Lineno()
@@ -107,7 +107,7 @@ public int Lineno()
             return IExecuteWithSignature<int>("lineno", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#nextToken()"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#nextToken()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -116,7 +116,7 @@ public int NextToken()
             return IExecuteWithSignature<int>("nextToken", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#commentChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#commentChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void CommentChar(int arg0)
@@ -124,7 +124,7 @@ public void CommentChar(int arg0)
             IExecuteWithSignature("commentChar", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#eolIsSignificant(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#eolIsSignificant(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void EolIsSignificant(bool arg0)
@@ -132,7 +132,7 @@ public void EolIsSignificant(bool arg0)
             IExecuteWithSignature("eolIsSignificant", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#lowerCaseMode(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#lowerCaseMode(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void LowerCaseMode(bool arg0)
@@ -140,7 +140,7 @@ public void LowerCaseMode(bool arg0)
             IExecuteWithSignature("lowerCaseMode", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#ordinaryChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#ordinaryChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void OrdinaryChar(int arg0)
@@ -148,7 +148,7 @@ public void OrdinaryChar(int arg0)
             IExecuteWithSignature("ordinaryChar", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#ordinaryChars(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#ordinaryChars(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -157,21 +157,21 @@ public void OrdinaryChars(int arg0, int arg1)
             IExecute("ordinaryChars", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#parseNumbers()"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#parseNumbers()"/>
         /// </summary>
         public void ParseNumbers()
         {
             IExecuteWithSignature("parseNumbers", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#pushBack()"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#pushBack()"/>
         /// </summary>
         public void PushBack()
         {
             IExecuteWithSignature("pushBack", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#quoteChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#quoteChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void QuoteChar(int arg0)
@@ -179,14 +179,14 @@ public void QuoteChar(int arg0)
             IExecuteWithSignature("quoteChar", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#resetSyntax()"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#resetSyntax()"/>
         /// </summary>
         public void ResetSyntax()
         {
             IExecuteWithSignature("resetSyntax", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#slashSlashComments(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#slashSlashComments(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SlashSlashComments(bool arg0)
@@ -194,7 +194,7 @@ public void SlashSlashComments(bool arg0)
             IExecuteWithSignature("slashSlashComments", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#slashStarComments(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#slashStarComments(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SlashStarComments(bool arg0)
@@ -202,7 +202,7 @@ public void SlashStarComments(bool arg0)
             IExecuteWithSignature("slashStarComments", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#whitespaceChars(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#whitespaceChars(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -211,7 +211,7 @@ public void WhitespaceChars(int arg0, int arg1)
             IExecute("whitespaceChars", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StreamTokenizer.html#wordChars(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StreamTokenizer.html#wordChars(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Io/StringBufferInputStream.cs b/src/net/Netdroid/Generated/Java/Io/StringBufferInputStream.cs
index 783a4868f..18207c495 100644
--- a/src/net/Netdroid/Generated/Java/Io/StringBufferInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Io/StringBufferInputStream.cs
@@ -30,7 +30,7 @@ public partial class StringBufferInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StringBufferInputStream.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StringBufferInputStream.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public StringBufferInputStream(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/StringReader.cs b/src/net/Netdroid/Generated/Java/Io/StringReader.cs
index e3193a2ab..b00d662c3 100644
--- a/src/net/Netdroid/Generated/Java/Io/StringReader.cs
+++ b/src/net/Netdroid/Generated/Java/Io/StringReader.cs
@@ -30,7 +30,7 @@ public partial class StringReader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StringReader.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StringReader.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public StringReader(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Io/StringWriter.cs b/src/net/Netdroid/Generated/Java/Io/StringWriter.cs
index f5e1531d2..c638713c5 100644
--- a/src/net/Netdroid/Generated/Java/Io/StringWriter.cs
+++ b/src/net/Netdroid/Generated/Java/Io/StringWriter.cs
@@ -30,7 +30,7 @@ public partial class StringWriter
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StringWriter.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/StringWriter.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public StringWriter(int arg0)
@@ -54,11 +54,12 @@ public StringWriter(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/StringWriter.html#getBuffer()"/> 
+        /// <see href="https://developer.android.com/reference/java/io/StringWriter.html#getBuffer()"/>
         /// </summary>
-        public Java.Lang.StringBuffer Buffer
+        /// <returns><see cref="Java.Lang.StringBuffer"/></returns>
+        public Java.Lang.StringBuffer GetBuffer()
         {
-            get { return IExecuteWithSignature<Java.Lang.StringBuffer>("getBuffer", "()Ljava/lang/StringBuffer;"); }
+            return IExecuteWithSignature<Java.Lang.StringBuffer>("getBuffer", "()Ljava/lang/StringBuffer;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Io/Writer.cs b/src/net/Netdroid/Generated/Java/Io/Writer.cs
index ef91df599..65b4d89e6 100644
--- a/src/net/Netdroid/Generated/Java/Io/Writer.cs
+++ b/src/net/Netdroid/Generated/Java/Io/Writer.cs
@@ -54,7 +54,7 @@ public partial class Writer : Java.Lang.IAppendable, Java.Io.ICloseable, Java.Io
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#nullWriter()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#nullWriter()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.Writer"/></returns>
         public static Java.Io.Writer NullWriter()
@@ -66,7 +66,7 @@ public static Java.Io.Writer NullWriter()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
@@ -74,7 +74,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#flush()"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#flush()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Flush()
@@ -82,7 +82,7 @@ public void Flush()
             IExecuteWithSignature("flush", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#write(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#write(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -93,7 +93,7 @@ public void Write(char[] arg0, int arg1, int arg2)
             IExecute("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#append(char)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#append(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
@@ -103,7 +103,7 @@ public Java.Lang.Appendable Append(char arg0)
             return IExecuteWithSignature<Java.Lang.Appendable>("append", "(C)Ljava/lang/Appendable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#append(java.lang.CharSequence,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#append(java.lang.CharSequence,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -115,7 +115,7 @@ public Java.Lang.Appendable Append(Java.Lang.CharSequence arg0, int arg1, int ar
             return IExecute<Java.Lang.Appendable>("append", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#append(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#append(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
@@ -125,7 +125,7 @@ public Java.Lang.Appendable Append(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Lang.Appendable>("append", "(Ljava/lang/CharSequence;)Ljava/lang/Appendable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#write(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#write(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -134,7 +134,7 @@ public void Write(char[] arg0)
             IExecuteWithSignature("write", "([C)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#write(int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#write(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -143,7 +143,7 @@ public void Write(int arg0)
             IExecuteWithSignature("write", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#write(java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#write(java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -154,7 +154,7 @@ public void Write(Java.Lang.String arg0, int arg1, int arg2)
             IExecute("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/io/Writer.html#write(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/io/Writer.html#write(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Lang/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Lang/AllPackageClasses.cs
index 0371b272f..b7c9484c0 100644
--- a/src/net/Netdroid/Generated/Java/Lang/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Lang
 {
     #region Appendable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Appendable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Appendable.html"/>
     /// </summary>
     public partial class Appendable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Appendable>
     {
@@ -36,12 +36,12 @@ public partial class Appendable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Append
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Appendable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Appendable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Appendable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Appendable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Appendable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Appendable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Appendable(params object[] args) : base(args) { }
 
     #region AutoCloseable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/AutoCloseable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/AutoCloseable.html"/>
     /// </summary>
     public partial class AutoCloseable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AutoCloseable>
     {
@@ -82,12 +82,12 @@ public partial class AutoCloseable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Aut
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AutoCloseable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AutoCloseable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AutoCloseable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AutoCloseable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AutoCloseable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AutoCloseable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public AutoCloseable(params object[] args) : base(args) { }
 
     #region Boolean
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Boolean.html"/>
     /// </summary>
     public partial class Boolean : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Boolean>
     {
@@ -164,7 +164,7 @@ public Boolean(params object[] args) : base(args) { }
 
     #region Byte
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Byte.html"/>
     /// </summary>
     public partial class Byte : Java.Lang.Number
     {
@@ -208,7 +208,7 @@ public Byte(params object[] args) : base(args) { }
 
     #region Character
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Character.html"/>
     /// </summary>
     public partial class Character : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Character>
     {
@@ -248,7 +248,7 @@ public Character(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Subset
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.Subset.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.Subset.html"/>
         /// </summary>
         public partial class Subset : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Subset>
         {
@@ -292,7 +292,7 @@ public Subset(params object[] args) : base(args) { }
 
         #region UnicodeBlock
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html"/>
         /// </summary>
         public partial class UnicodeBlock : Java.Lang.Character.Subset
         {
@@ -336,7 +336,7 @@ public UnicodeBlock(params object[] args) : base(args) { }
 
         #region UnicodeScript
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html"/>
         /// </summary>
         public partial class UnicodeScript : Java.Lang.Enum<Java.Lang.Character.UnicodeScript>
         {
@@ -384,7 +384,7 @@ public UnicodeScript(params object[] args) : base(args) { }
 
     #region CharSequence
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/CharSequence.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/CharSequence.html"/>
     /// </summary>
     public partial class CharSequence : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CharSequence>
     {
@@ -392,12 +392,12 @@ public partial class CharSequence : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Char
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CharSequence class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharSequence class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharSequence() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CharSequence class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharSequence class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharSequence(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -430,7 +430,7 @@ public CharSequence(params object[] args) : base(args) { }
 
     #region Class
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Class.html"/>
     /// </summary>
     public partial class Class : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Class>
     {
@@ -474,7 +474,7 @@ public Class(params object[] args) : base(args) { }
 
     #region Class<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Class.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Class<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Class<T>>
@@ -519,7 +519,7 @@ public Class(params object[] args) : base(args) { }
 
     #region ClassLoader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html"/>
     /// </summary>
     public partial class ClassLoader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ClassLoader>
     {
@@ -527,12 +527,12 @@ public partial class ClassLoader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Class
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ClassLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClassLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClassLoader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ClassLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClassLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClassLoader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -565,7 +565,7 @@ public ClassLoader(params object[] args) : base(args) { }
 
     #region ClassValue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassValue.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ClassValue.html"/>
     /// </summary>
     public partial class ClassValue : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ClassValue>
     {
@@ -573,12 +573,12 @@ public partial class ClassValue : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ClassV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ClassValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClassValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClassValue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ClassValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClassValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClassValue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -611,7 +611,7 @@ public ClassValue(params object[] args) : base(args) { }
 
     #region ClassValue<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassValue.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ClassValue.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ClassValue<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ClassValue<T>>
@@ -620,12 +620,12 @@ public partial class ClassValue<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cla
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ClassValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClassValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClassValue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ClassValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ClassValue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ClassValue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -658,7 +658,7 @@ public ClassValue(params object[] args) : base(args) { }
 
     #region Cloneable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Cloneable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Cloneable.html"/>
     /// </summary>
     public partial class Cloneable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cloneable>
     {
@@ -666,12 +666,12 @@ public partial class Cloneable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cloneab
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Cloneable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Cloneable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Cloneable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Cloneable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Cloneable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Cloneable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -704,7 +704,7 @@ public Cloneable(params object[] args) : base(args) { }
 
     #region Comparable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Comparable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Comparable.html"/>
     /// </summary>
     public partial class Comparable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Comparable>
     {
@@ -712,12 +712,12 @@ public partial class Comparable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Compar
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Comparable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Comparable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Comparable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Comparable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Comparable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Comparable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -750,7 +750,7 @@ public Comparable(params object[] args) : base(args) { }
 
     #region Comparable<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Comparable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Comparable.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Comparable<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Comparable<T>>
@@ -759,12 +759,12 @@ public partial class Comparable<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Com
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Comparable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Comparable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Comparable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Comparable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Comparable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Comparable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -797,9 +797,9 @@ public Comparable(params object[] args) : base(args) { }
 
     #region Compiler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Compiler.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Compiler.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Compiler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Compiler>
     {
         const string _bridgeClassName = "java.lang.Compiler";
@@ -842,7 +842,7 @@ public Compiler(params object[] args) : base(args) { }
 
     #region Deprecated
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Deprecated.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Deprecated.html"/>
     /// </summary>
     public partial class Deprecated : Java.Lang.Annotation.Annotation
     {
@@ -850,12 +850,12 @@ public partial class Deprecated : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Deprecated class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Deprecated class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Deprecated() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Deprecated class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Deprecated class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Deprecated(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -888,7 +888,7 @@ public Deprecated(params object[] args) : base(args) { }
 
     #region Double
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Double.html"/>
     /// </summary>
     public partial class Double : Java.Lang.Number
     {
@@ -932,7 +932,7 @@ public Double(params object[] args) : base(args) { }
 
     #region Enum
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Enum.html"/>
     /// </summary>
     public partial class Enum : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Enum>
     {
@@ -940,12 +940,12 @@ public partial class Enum : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Enum>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Enum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Enum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Enum() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Enum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Enum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Enum(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -978,21 +978,21 @@ public Enum(params object[] args) : base(args) { }
 
     #region Enum<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Enum.html"/>
     /// </summary>
     /// <typeparam name="E"><see cref="Java.Lang.Enum{E}"/></typeparam>
-    public partial class Enum<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Enum<E>> where E: Java.Lang.Enum<E>
+    public partial class Enum<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Enum<E>> where E : Java.Lang.Enum<E>
     {
         const string _bridgeClassName = "java.lang.Enum";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Enum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Enum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Enum() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Enum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Enum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Enum(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1025,7 +1025,7 @@ public Enum(params object[] args) : base(args) { }
 
     #region Float
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Float.html"/>
     /// </summary>
     public partial class Float : Java.Lang.Number
     {
@@ -1069,7 +1069,7 @@ public Float(params object[] args) : base(args) { }
 
     #region FunctionalInterface
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/FunctionalInterface.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/FunctionalInterface.html"/>
     /// </summary>
     public partial class FunctionalInterface : Java.Lang.Annotation.Annotation
     {
@@ -1077,12 +1077,12 @@ public partial class FunctionalInterface : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FunctionalInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FunctionalInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FunctionalInterface() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FunctionalInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FunctionalInterface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FunctionalInterface(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1115,7 +1115,7 @@ public FunctionalInterface(params object[] args) : base(args) { }
 
     #region InheritableThreadLocal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/InheritableThreadLocal.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/InheritableThreadLocal.html"/>
     /// </summary>
     public partial class InheritableThreadLocal : Java.Lang.ThreadLocal
     {
@@ -1159,7 +1159,7 @@ public InheritableThreadLocal(params object[] args) : base(args) { }
 
     #region InheritableThreadLocal<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/InheritableThreadLocal.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/InheritableThreadLocal.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class InheritableThreadLocal<T> : Java.Lang.ThreadLocal<T>
@@ -1204,7 +1204,7 @@ public InheritableThreadLocal(params object[] args) : base(args) { }
 
     #region Integer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Integer.html"/>
     /// </summary>
     public partial class Integer : Java.Lang.Number
     {
@@ -1252,7 +1252,7 @@ public Integer(params object[] args) : base(args) { }
 
     #region Long
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Long.html"/>
     /// </summary>
     public partial class Long : Java.Lang.Number
     {
@@ -1296,7 +1296,7 @@ public Long(params object[] args) : base(args) { }
 
     #region Math
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Math.html"/>
     /// </summary>
     public partial class Math : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Math>
     {
@@ -1340,7 +1340,7 @@ public Math(params object[] args) : base(args) { }
 
     #region Number
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Number.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Number.html"/>
     /// </summary>
     public partial class Number : Java.Io.Serializable
     {
@@ -1348,12 +1348,12 @@ public partial class Number : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Number class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Number class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Number() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Number class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Number class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Number(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1386,7 +1386,7 @@ public Number(params object[] args) : base(args) { }
 
     #region Object
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Object.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Object.html"/>
     /// </summary>
     public partial class Object : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Object>
     {
@@ -1430,7 +1430,7 @@ public Object(params object[] args) : base(args) { }
 
     #region Override
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Override.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Override.html"/>
     /// </summary>
     public partial class Override : Java.Lang.Annotation.Annotation
     {
@@ -1438,12 +1438,12 @@ public partial class Override : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Override class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Override class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Override() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Override class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Override class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Override(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1476,7 +1476,7 @@ public Override(params object[] args) : base(args) { }
 
     #region Package
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Package.html"/>
     /// </summary>
     public partial class Package : Java.Lang.Reflect.AnnotatedElement
     {
@@ -1520,7 +1520,7 @@ public Package(params object[] args) : base(args) { }
 
     #region Process
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Process.html"/>
     /// </summary>
     public partial class Process : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Process>
     {
@@ -1528,12 +1528,12 @@ public partial class Process : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Process>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Process class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Process class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Process() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Process class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Process class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Process(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1566,7 +1566,7 @@ public Process(params object[] args) : base(args) { }
 
     #region ProcessBuilder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html"/>
     /// </summary>
     public partial class ProcessBuilder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ProcessBuilder>
     {
@@ -1606,7 +1606,7 @@ public ProcessBuilder(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Redirect
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.html"/>
         /// </summary>
         public partial class Redirect : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Redirect>
         {
@@ -1614,12 +1614,12 @@ public partial class Redirect : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Redirect
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Redirect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Redirect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Redirect() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Redirect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Redirect class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Redirect(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1648,7 +1648,7 @@ public Redirect(params object[] args) : base(args) { }
             // TODO: complete the class
             #region Type
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.Type.html"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.Type.html"/>
             /// </summary>
             public partial class Type : Java.Lang.Enum<Java.Lang.ProcessBuilder.Redirect.Type>
             {
@@ -1700,7 +1700,7 @@ public Type(params object[] args) : base(args) { }
 
     #region Readable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Readable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Readable.html"/>
     /// </summary>
     public partial class Readable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Readable>
     {
@@ -1708,12 +1708,12 @@ public partial class Readable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Readable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Readable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Readable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Readable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Readable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Readable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Readable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1744,55 +1744,9 @@ public Readable(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region Record
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Record.html"/>
-    /// </summary>
-    public partial class Record : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Record>
-    {
-        const string _bridgeClassName = "java.lang.Record";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        [Obsolete("Record class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public Record() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        [Obsolete("Record class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public Record(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
     #region Runnable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Runnable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Runnable.html"/>
     /// </summary>
     public partial class Runnable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Runnable>
     {
@@ -1800,12 +1754,12 @@ public partial class Runnable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Runnable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Runnable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Runnable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Runnable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Runnable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Runnable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Runnable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1838,7 +1792,7 @@ public Runnable(params object[] args) : base(args) { }
 
     #region Runtime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Runtime.html"/>
     /// </summary>
     public partial class Runtime : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Runtime>
     {
@@ -1882,7 +1836,7 @@ public Runtime(params object[] args) : base(args) { }
 
     #region RuntimePermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/RuntimePermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/RuntimePermission.html"/>
     /// </summary>
     public partial class RuntimePermission : Java.Security.BasicPermission
     {
@@ -1926,7 +1880,7 @@ public RuntimePermission(params object[] args) : base(args) { }
 
     #region SafeVarargs
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/SafeVarargs.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/SafeVarargs.html"/>
     /// </summary>
     public partial class SafeVarargs : Java.Lang.Annotation.Annotation
     {
@@ -1934,12 +1888,12 @@ public partial class SafeVarargs : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SafeVarargs class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SafeVarargs class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SafeVarargs() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SafeVarargs class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SafeVarargs class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SafeVarargs(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1972,9 +1926,8 @@ public SafeVarargs(params object[] args) : base(args) { }
 
     #region SecurityManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html"/>
     /// </summary>
-    [System.Obsolete()]
     public partial class SecurityManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SecurityManager>
     {
         const string _bridgeClassName = "java.lang.SecurityManager";
@@ -2017,7 +1970,7 @@ public SecurityManager(params object[] args) : base(args) { }
 
     #region Short
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Short.html"/>
     /// </summary>
     public partial class Short : Java.Lang.Number
     {
@@ -2061,7 +2014,7 @@ public Short(params object[] args) : base(args) { }
 
     #region StackTraceElement
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html"/>
     /// </summary>
     public partial class StackTraceElement : Java.Io.Serializable
     {
@@ -2105,7 +2058,7 @@ public StackTraceElement(params object[] args) : base(args) { }
 
     #region StackWalker
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/StackWalker.html"/>
     /// </summary>
     public partial class StackWalker : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StackWalker>
     {
@@ -2145,7 +2098,7 @@ public StackWalker(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Option
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.Option.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.Option.html"/>
         /// </summary>
         public partial class Option : Java.Lang.Enum<Java.Lang.StackWalker.Option>
         {
@@ -2189,7 +2142,7 @@ public Option(params object[] args) : base(args) { }
 
         #region StackFrame
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html"/>
         /// </summary>
         public partial class StackFrame : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StackFrame>
         {
@@ -2197,12 +2150,12 @@ public partial class StackFrame : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StackF
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("StackFrame class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StackFrame class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StackFrame() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("StackFrame class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("StackFrame class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public StackFrame(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2239,7 +2192,7 @@ public StackFrame(params object[] args) : base(args) { }
 
     #region StrictMath
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html"/>
     /// </summary>
     public partial class StrictMath : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StrictMath>
     {
@@ -2283,7 +2236,7 @@ public StrictMath(params object[] args) : base(args) { }
 
     #region String
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/String.html"/>
     /// </summary>
     public partial class String : MASES.JCOBridge.C2JBridge.JVMBridgeBase<String>
     {
@@ -2327,7 +2280,7 @@ public String(params object[] args) : base(args) { }
 
     #region StringBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/StringBuffer.html"/>
     /// </summary>
     public partial class StringBuffer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StringBuffer>
     {
@@ -2371,7 +2324,7 @@ public StringBuffer(params object[] args) : base(args) { }
 
     #region StringBuilder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuilder.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/StringBuilder.html"/>
     /// </summary>
     public partial class StringBuilder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StringBuilder>
     {
@@ -2415,7 +2368,7 @@ public StringBuilder(params object[] args) : base(args) { }
 
     #region SuppressWarnings
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/SuppressWarnings.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/SuppressWarnings.html"/>
     /// </summary>
     public partial class SuppressWarnings : Java.Lang.Annotation.Annotation
     {
@@ -2423,12 +2376,12 @@ public partial class SuppressWarnings : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SuppressWarnings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SuppressWarnings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SuppressWarnings() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SuppressWarnings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SuppressWarnings class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SuppressWarnings(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2461,7 +2414,7 @@ public SuppressWarnings(params object[] args) : base(args) { }
 
     #region System
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/System.html"/>
     /// </summary>
     public partial class System : MASES.JCOBridge.C2JBridge.JVMBridgeBase<System>
     {
@@ -2505,7 +2458,7 @@ public System(params object[] args) : base(args) { }
 
     #region Thread
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Thread.html"/>
     /// </summary>
     public partial class Thread : Java.Lang.Runnable
     {
@@ -2545,7 +2498,7 @@ public Thread(params object[] args) : base(args) { }
         // TODO: complete the class
         #region State
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html"/>
         /// </summary>
         public partial class State : Java.Lang.Enum<Java.Lang.Thread.State>
         {
@@ -2593,7 +2546,7 @@ public State(params object[] args) : base(args) { }
 
     #region ThreadDeath
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadDeath.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ThreadDeath.html"/>
     /// </summary>
     public partial class ThreadDeath : Java.Lang.Error
     {
@@ -2610,7 +2563,7 @@ public partial class ThreadDeath : Java.Lang.Error
 
     #region ThreadGroup
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html"/>
     /// </summary>
     public partial class ThreadGroup : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ThreadGroup>
     {
@@ -2654,7 +2607,7 @@ public ThreadGroup(params object[] args) : base(args) { }
 
     #region ThreadLocal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html"/>
     /// </summary>
     public partial class ThreadLocal : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ThreadLocal>
     {
@@ -2698,7 +2651,7 @@ public ThreadLocal(params object[] args) : base(args) { }
 
     #region ThreadLocal<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ThreadLocal<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ThreadLocal<T>>
@@ -2743,7 +2696,7 @@ public ThreadLocal(params object[] args) : base(args) { }
 
     #region Void
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/Void.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/Void.html"/>
     /// </summary>
     public partial class Void : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Void>
     {
diff --git a/src/net/Netdroid/Generated/Java/Lang/Annotation/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Lang/Annotation/AllPackageClasses.cs
index 4839b9d8c..482dead45 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Annotation/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Annotation/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Lang.Annotation
 {
     #region Annotation
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Annotation.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/Annotation.html"/>
     /// </summary>
     public partial class Annotation : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Annotation>
     {
@@ -36,12 +36,12 @@ public partial class Annotation : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Annota
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Annotation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Annotation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Annotation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Annotation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Annotation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Annotation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Annotation(params object[] args) : base(args) { }
 
     #region AnnotationFormatError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/AnnotationFormatError.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/AnnotationFormatError.html"/>
     /// </summary>
     public partial class AnnotationFormatError : Java.Lang.Error
     {
@@ -91,7 +91,7 @@ public partial class AnnotationFormatError : Java.Lang.Error
 
     #region AnnotationTypeMismatchException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/AnnotationTypeMismatchException.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/AnnotationTypeMismatchException.html"/>
     /// </summary>
     public partial class AnnotationTypeMismatchException : Java.Lang.RuntimeException
     {
@@ -108,7 +108,7 @@ public partial class AnnotationTypeMismatchException : Java.Lang.RuntimeExceptio
 
     #region Documented
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Documented.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/Documented.html"/>
     /// </summary>
     public partial class Documented : Java.Lang.Annotation.Annotation
     {
@@ -116,12 +116,12 @@ public partial class Documented : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Documented class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Documented class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Documented() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Documented class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Documented class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Documented(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -154,7 +154,7 @@ public Documented(params object[] args) : base(args) { }
 
     #region ElementType
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html"/>
     /// </summary>
     public partial class ElementType : Java.Lang.Enum<Java.Lang.Annotation.ElementType>
     {
@@ -198,7 +198,7 @@ public ElementType(params object[] args) : base(args) { }
 
     #region IncompleteAnnotationException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/IncompleteAnnotationException.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/IncompleteAnnotationException.html"/>
     /// </summary>
     public partial class IncompleteAnnotationException : Java.Lang.RuntimeException
     {
@@ -215,7 +215,7 @@ public partial class IncompleteAnnotationException : Java.Lang.RuntimeException
 
     #region Inherited
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Inherited.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/Inherited.html"/>
     /// </summary>
     public partial class Inherited : Java.Lang.Annotation.Annotation
     {
@@ -223,12 +223,12 @@ public partial class Inherited : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Inherited class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Inherited class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Inherited() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Inherited class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Inherited class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Inherited(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -261,7 +261,7 @@ public Inherited(params object[] args) : base(args) { }
 
     #region Native
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Native.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/Native.html"/>
     /// </summary>
     public partial class Native : Java.Lang.Annotation.Annotation
     {
@@ -269,12 +269,12 @@ public partial class Native : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Native class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Native class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Native() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Native class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Native class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Native(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -307,7 +307,7 @@ public Native(params object[] args) : base(args) { }
 
     #region Repeatable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Repeatable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/Repeatable.html"/>
     /// </summary>
     public partial class Repeatable : Java.Lang.Annotation.Annotation
     {
@@ -315,12 +315,12 @@ public partial class Repeatable : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Repeatable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Repeatable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Repeatable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Repeatable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Repeatable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Repeatable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -353,7 +353,7 @@ public Repeatable(params object[] args) : base(args) { }
 
     #region Retention
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Retention.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/Retention.html"/>
     /// </summary>
     public partial class Retention : Java.Lang.Annotation.Annotation
     {
@@ -361,12 +361,12 @@ public partial class Retention : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Retention class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Retention class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Retention() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Retention class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Retention class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Retention(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -399,7 +399,7 @@ public Retention(params object[] args) : base(args) { }
 
     #region RetentionPolicy
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/RetentionPolicy.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/RetentionPolicy.html"/>
     /// </summary>
     public partial class RetentionPolicy : Java.Lang.Enum<Java.Lang.Annotation.RetentionPolicy>
     {
@@ -443,7 +443,7 @@ public RetentionPolicy(params object[] args) : base(args) { }
 
     #region Target
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Target.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/annotation/Target.html"/>
     /// </summary>
     public partial class Target : Java.Lang.Annotation.Annotation
     {
@@ -451,12 +451,12 @@ public partial class Target : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Target class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Target class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Target() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Target class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Target class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Target(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Lang/Annotation/Annotation.cs b/src/net/Netdroid/Generated/Java/Lang/Annotation/Annotation.cs
index d0d748008..40ba3fdaa 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Annotation/Annotation.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Annotation/Annotation.cs
@@ -64,11 +64,11 @@ public partial class Annotation : Java.Lang.Annotation.IAnnotation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Annotation.html#annotationType()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/Annotation.html#annotationType()"/>
         /// </summary>
         /// <typeparam name="ReturnExtendsJava_Lang_Annotation_Annotation"><see cref="Java.Lang.Annotation.Annotation"/></typeparam>
         /// <returns><see cref="Java.Lang.Class"/></returns>
-        public Java.Lang.Class AnnotationType<ReturnExtendsJava_Lang_Annotation_Annotation>() where ReturnExtendsJava_Lang_Annotation_Annotation: Java.Lang.Annotation.Annotation
+        public Java.Lang.Class AnnotationType<ReturnExtendsJava_Lang_Annotation_Annotation>() where ReturnExtendsJava_Lang_Annotation_Annotation : Java.Lang.Annotation.Annotation
         {
             return IExecuteWithSignature<Java.Lang.Class>("annotationType", "()Ljava/lang/Class;");
         }
diff --git a/src/net/Netdroid/Generated/Java/Lang/Annotation/ElementType.cs b/src/net/Netdroid/Generated/Java/Lang/Annotation/ElementType.cs
index 9af5c575e..7d86253c6 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Annotation/ElementType.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Annotation/ElementType.cs
@@ -38,73 +38,67 @@ public partial class ElementType
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#ANNOTATION_TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#ANNOTATION_TYPE"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType ANNOTATION_TYPE { get { if (!_ANNOTATION_TYPEReady) { _ANNOTATION_TYPEContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "ANNOTATION_TYPE"); _ANNOTATION_TYPEReady = true; } return _ANNOTATION_TYPEContent; } }
         private static Java.Lang.Annotation.ElementType _ANNOTATION_TYPEContent = default;
         private static bool _ANNOTATION_TYPEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#CONSTRUCTOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#CONSTRUCTOR"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType CONSTRUCTOR { get { if (!_CONSTRUCTORReady) { _CONSTRUCTORContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "CONSTRUCTOR"); _CONSTRUCTORReady = true; } return _CONSTRUCTORContent; } }
         private static Java.Lang.Annotation.ElementType _CONSTRUCTORContent = default;
         private static bool _CONSTRUCTORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#FIELD"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType FIELD { get { if (!_FIELDReady) { _FIELDContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "FIELD"); _FIELDReady = true; } return _FIELDContent; } }
         private static Java.Lang.Annotation.ElementType _FIELDContent = default;
         private static bool _FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#LOCAL_VARIABLE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#LOCAL_VARIABLE"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType LOCAL_VARIABLE { get { if (!_LOCAL_VARIABLEReady) { _LOCAL_VARIABLEContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "LOCAL_VARIABLE"); _LOCAL_VARIABLEReady = true; } return _LOCAL_VARIABLEContent; } }
         private static Java.Lang.Annotation.ElementType _LOCAL_VARIABLEContent = default;
         private static bool _LOCAL_VARIABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#METHOD"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#METHOD"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType METHOD { get { if (!_METHODReady) { _METHODContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "METHOD"); _METHODReady = true; } return _METHODContent; } }
         private static Java.Lang.Annotation.ElementType _METHODContent = default;
         private static bool _METHODReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#MODULE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#MODULE"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType MODULE { get { if (!_MODULEReady) { _MODULEContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "MODULE"); _MODULEReady = true; } return _MODULEContent; } }
         private static Java.Lang.Annotation.ElementType _MODULEContent = default;
         private static bool _MODULEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#PACKAGE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#PACKAGE"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType PACKAGE { get { if (!_PACKAGEReady) { _PACKAGEContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "PACKAGE"); _PACKAGEReady = true; } return _PACKAGEContent; } }
         private static Java.Lang.Annotation.ElementType _PACKAGEContent = default;
         private static bool _PACKAGEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#PARAMETER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#PARAMETER"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType PARAMETER { get { if (!_PARAMETERReady) { _PARAMETERContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "PARAMETER"); _PARAMETERReady = true; } return _PARAMETERContent; } }
         private static Java.Lang.Annotation.ElementType _PARAMETERContent = default;
         private static bool _PARAMETERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#RECORD_COMPONENT"/>
-        /// </summary>
-        public static Java.Lang.Annotation.ElementType RECORD_COMPONENT { get { if (!_RECORD_COMPONENTReady) { _RECORD_COMPONENTContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "RECORD_COMPONENT"); _RECORD_COMPONENTReady = true; } return _RECORD_COMPONENTContent; } }
-        private static Java.Lang.Annotation.ElementType _RECORD_COMPONENTContent = default;
-        private static bool _RECORD_COMPONENTReady = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Annotation.ElementType _TYPEContent = default;
         private static bool _TYPEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#TYPE_PARAMETER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#TYPE_PARAMETER"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType TYPE_PARAMETER { get { if (!_TYPE_PARAMETERReady) { _TYPE_PARAMETERContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "TYPE_PARAMETER"); _TYPE_PARAMETERReady = true; } return _TYPE_PARAMETERContent; } }
         private static Java.Lang.Annotation.ElementType _TYPE_PARAMETERContent = default;
         private static bool _TYPE_PARAMETERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#TYPE_USE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#TYPE_USE"/>
         /// </summary>
         public static Java.Lang.Annotation.ElementType TYPE_USE { get { if (!_TYPE_USEReady) { _TYPE_USEContent = SGetField<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "TYPE_USE"); _TYPE_USEReady = true; } return _TYPE_USEContent; } }
         private static Java.Lang.Annotation.ElementType _TYPE_USEContent = default;
@@ -114,7 +108,7 @@ public partial class ElementType
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Annotation.ElementType"/></returns>
@@ -123,7 +117,7 @@ public static Java.Lang.Annotation.ElementType ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Annotation.ElementType>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/annotation/ElementType;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/ElementType.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/ElementType.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Annotation.ElementType"/></returns>
         public static Java.Lang.Annotation.ElementType[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Annotation/Repeatable.cs b/src/net/Netdroid/Generated/Java/Lang/Annotation/Repeatable.cs
index c6b039df4..3c0879202 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Annotation/Repeatable.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Annotation/Repeatable.cs
@@ -64,11 +64,11 @@ public partial class Repeatable : Java.Lang.Annotation.IRepeatable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Repeatable.html#value()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/Repeatable.html#value()"/>
         /// </summary>
         /// <typeparam name="ReturnExtendsJava_Lang_Annotation_Annotation"><see cref="Java.Lang.Annotation.Annotation"/></typeparam>
         /// <returns><see cref="Java.Lang.Class"/></returns>
-        public Java.Lang.Class Value<ReturnExtendsJava_Lang_Annotation_Annotation>() where ReturnExtendsJava_Lang_Annotation_Annotation: Java.Lang.Annotation.Annotation
+        public Java.Lang.Class Value<ReturnExtendsJava_Lang_Annotation_Annotation>() where ReturnExtendsJava_Lang_Annotation_Annotation : Java.Lang.Annotation.Annotation
         {
             return IExecuteWithSignature<Java.Lang.Class>("value", "()Ljava/lang/Class;");
         }
diff --git a/src/net/Netdroid/Generated/Java/Lang/Annotation/Retention.cs b/src/net/Netdroid/Generated/Java/Lang/Annotation/Retention.cs
index 794296826..7d25afab6 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Annotation/Retention.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Annotation/Retention.cs
@@ -64,7 +64,7 @@ public partial class Retention : Java.Lang.Annotation.IRetention
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Retention.html#value()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/Retention.html#value()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Annotation.RetentionPolicy"/></returns>
         public Java.Lang.Annotation.RetentionPolicy Value()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Annotation/RetentionPolicy.cs b/src/net/Netdroid/Generated/Java/Lang/Annotation/RetentionPolicy.cs
index 1a1ffe211..d6c536a11 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Annotation/RetentionPolicy.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Annotation/RetentionPolicy.cs
@@ -38,19 +38,19 @@ public partial class RetentionPolicy
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/RetentionPolicy.html#CLASS"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/RetentionPolicy.html#CLASS"/>
         /// </summary>
         public static Java.Lang.Annotation.RetentionPolicy CLASS { get { if (!_CLASSReady) { _CLASSContent = SGetField<Java.Lang.Annotation.RetentionPolicy>(LocalBridgeClazz, "CLASS"); _CLASSReady = true; } return _CLASSContent; } }
         private static Java.Lang.Annotation.RetentionPolicy _CLASSContent = default;
         private static bool _CLASSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/RetentionPolicy.html#RUNTIME"/>
         /// </summary>
         public static Java.Lang.Annotation.RetentionPolicy RUNTIME { get { if (!_RUNTIMEReady) { _RUNTIMEContent = SGetField<Java.Lang.Annotation.RetentionPolicy>(LocalBridgeClazz, "RUNTIME"); _RUNTIMEReady = true; } return _RUNTIMEContent; } }
         private static Java.Lang.Annotation.RetentionPolicy _RUNTIMEContent = default;
         private static bool _RUNTIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/RetentionPolicy.html#SOURCE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/RetentionPolicy.html#SOURCE"/>
         /// </summary>
         public static Java.Lang.Annotation.RetentionPolicy SOURCE { get { if (!_SOURCEReady) { _SOURCEContent = SGetField<Java.Lang.Annotation.RetentionPolicy>(LocalBridgeClazz, "SOURCE"); _SOURCEReady = true; } return _SOURCEContent; } }
         private static Java.Lang.Annotation.RetentionPolicy _SOURCEContent = default;
@@ -60,7 +60,7 @@ public partial class RetentionPolicy
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/RetentionPolicy.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/RetentionPolicy.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Annotation.RetentionPolicy"/></returns>
@@ -69,7 +69,7 @@ public static Java.Lang.Annotation.RetentionPolicy ValueOf(Java.Lang.String arg0
             return SExecuteWithSignature<Java.Lang.Annotation.RetentionPolicy>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/annotation/RetentionPolicy;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/RetentionPolicy.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/RetentionPolicy.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Annotation.RetentionPolicy"/></returns>
         public static Java.Lang.Annotation.RetentionPolicy[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Annotation/Target.cs b/src/net/Netdroid/Generated/Java/Lang/Annotation/Target.cs
index 944d8361d..c8661dd34 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Annotation/Target.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Annotation/Target.cs
@@ -64,7 +64,7 @@ public partial class Target : Java.Lang.Annotation.ITarget
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/annotation/Target.html#value()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/annotation/Target.html#value()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Annotation.ElementType"/></returns>
         public Java.Lang.Annotation.ElementType[] Value()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Appendable.cs b/src/net/Netdroid/Generated/Java/Lang/Appendable.cs
index 6e7472686..7771f531b 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Appendable.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Appendable.cs
@@ -64,7 +64,7 @@ public partial class Appendable : Java.Lang.IAppendable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Appendable.html#append(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Appendable.html#append(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
@@ -74,7 +74,7 @@ public Java.Lang.Appendable Append(char arg0)
             return IExecuteWithSignature<Java.Lang.Appendable>("append", "(C)Ljava/lang/Appendable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Appendable.html#append(java.lang.CharSequence,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Appendable.html#append(java.lang.CharSequence,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -86,7 +86,7 @@ public Java.Lang.Appendable Append(Java.Lang.CharSequence arg0, int arg1, int ar
             return IExecute<Java.Lang.Appendable>("append", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Appendable.html#append(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Appendable.html#append(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/AutoCloseable.cs b/src/net/Netdroid/Generated/Java/Lang/AutoCloseable.cs
index 72f321632..f699c00de 100644
--- a/src/net/Netdroid/Generated/Java/Lang/AutoCloseable.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/AutoCloseable.cs
@@ -64,7 +64,7 @@ public partial class AutoCloseable : Java.Lang.IAutoCloseable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/AutoCloseable.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/AutoCloseable.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Lang.Exception"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Boolean.cs b/src/net/Netdroid/Generated/Java/Lang/Boolean.cs
index cfd4d4eaf..8f99c2ff2 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Boolean.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Boolean.cs
@@ -30,19 +30,19 @@ public partial class Boolean : Java.Io.ISerializable, Java.Lang.IComparable<Java
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#%3Cinit%3E(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Boolean(bool arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Boolean(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -64,19 +64,19 @@ public Boolean(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#FALSE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#FALSE"/>
         /// </summary>
         public static Java.Lang.Boolean FALSE { get { if (!_FALSEReady) { _FALSEContent = SGetField<Java.Lang.Boolean>(LocalBridgeClazz, "FALSE"); _FALSEReady = true; } return _FALSEContent; } }
         private static Java.Lang.Boolean _FALSEContent = default;
         private static bool _FALSEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#TRUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#TRUE"/>
         /// </summary>
         public static Java.Lang.Boolean TRUE { get { if (!_TRUEReady) { _TRUEContent = SGetField<Java.Lang.Boolean>(LocalBridgeClazz, "TRUE"); _TRUEReady = true; } return _TRUEContent; } }
         private static Java.Lang.Boolean _TRUEContent = default;
         private static bool _TRUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
@@ -86,7 +86,7 @@ public Boolean(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#getBoolean(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#getBoolean(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -95,7 +95,7 @@ public static bool GetBoolean(Java.Lang.String arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "getBoolean", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#logicalAnd(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#logicalAnd(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -105,7 +105,7 @@ public static bool LogicalAnd(bool arg0, bool arg1)
             return SExecute<bool>(LocalBridgeClazz, "logicalAnd", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#logicalOr(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#logicalOr(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -115,7 +115,7 @@ public static bool LogicalOr(bool arg0, bool arg1)
             return SExecute<bool>(LocalBridgeClazz, "logicalOr", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#logicalXor(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#logicalXor(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -125,7 +125,7 @@ public static bool LogicalXor(bool arg0, bool arg1)
             return SExecute<bool>(LocalBridgeClazz, "logicalXor", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#parseBoolean(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#parseBoolean(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -134,7 +134,7 @@ public static bool ParseBoolean(Java.Lang.String arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "parseBoolean", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#compare(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#compare(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -144,7 +144,7 @@ public static int Compare(bool arg0, bool arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#hashCode(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#hashCode(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="int"/></returns>
@@ -153,7 +153,7 @@ public static int HashCode(bool arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(Z)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#valueOf(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#valueOf(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.Boolean"/></returns>
@@ -162,7 +162,7 @@ public static Java.Lang.Boolean ValueOf(bool arg0)
             return SExecuteWithSignature<Java.Lang.Boolean>(LocalBridgeClazz, "valueOf", "(Z)Ljava/lang/Boolean;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Boolean"/></returns>
@@ -171,7 +171,7 @@ public static Java.Lang.Boolean ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Boolean>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Boolean;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#toString(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#toString(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -184,7 +184,7 @@ public static Java.Lang.String ToString(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#booleanValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#booleanValue()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool BooleanValue()
@@ -192,7 +192,7 @@ public bool BooleanValue()
             return IExecuteWithSignature<bool>("booleanValue", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#compareTo(java.lang.Boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#compareTo(java.lang.Boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Boolean"/></param>
         /// <returns><see cref="int"/></returns>
@@ -201,7 +201,7 @@ public int CompareTo(Java.Lang.Boolean arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Boolean;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Boolean.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Boolean.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Byte.cs b/src/net/Netdroid/Generated/Java/Lang/Byte.cs
index e0caa8153..839ad1a86 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Byte.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Byte.cs
@@ -26,24 +26,24 @@
 namespace Java.Lang
 {
     #region Byte
-    public partial class Byte : Java.Lang.IComparable<Java.Lang.Byte>
+    public partial class Byte
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#%3Cinit%3E(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#%3Cinit%3E(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Byte(byte arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Lang.NumberFormatException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Byte(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -61,31 +61,31 @@ public Byte(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#MAX_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#MAX_VALUE"/>
         /// </summary>
         public static byte MAX_VALUE { get { if (!_MAX_VALUEReady) { _MAX_VALUEContent = SGetField<byte>(LocalBridgeClazz, "MAX_VALUE"); _MAX_VALUEReady = true; } return _MAX_VALUEContent; } }
         private static byte _MAX_VALUEContent = default;
         private static bool _MAX_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#MIN_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#MIN_VALUE"/>
         /// </summary>
         public static byte MIN_VALUE { get { if (!_MIN_VALUEReady) { _MIN_VALUEContent = SGetField<byte>(LocalBridgeClazz, "MIN_VALUE"); _MIN_VALUEReady = true; } return _MIN_VALUEContent; } }
         private static byte _MIN_VALUEContent = default;
         private static bool _MIN_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#BYTES"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#BYTES"/>
         /// </summary>
         public static int BYTES { get { if (!_BYTESReady) { _BYTESContent = SGetField<int>(LocalBridgeClazz, "BYTES"); _BYTESReady = true; } return _BYTESContent; } }
         private static int _BYTESContent = default;
         private static bool _BYTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#SIZE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#SIZE"/>
         /// </summary>
         public static int SIZE { get { if (!_SIZEReady) { _SIZEContent = SGetField<int>(LocalBridgeClazz, "SIZE"); _SIZEReady = true; } return _SIZEContent; } }
         private static int _SIZEContent = default;
         private static bool _SIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
@@ -95,7 +95,7 @@ public Byte(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#parseByte(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#parseByte(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -106,7 +106,7 @@ public static byte ParseByte(Java.Lang.String arg0, int arg1)
             return SExecute<byte>(LocalBridgeClazz, "parseByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#parseByte(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#parseByte(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -116,7 +116,7 @@ public static byte ParseByte(Java.Lang.String arg0)
             return SExecuteWithSignature<byte>(LocalBridgeClazz, "parseByte", "(Ljava/lang/String;)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#compare(byte,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#compare(byte,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -126,7 +126,7 @@ public static int Compare(byte arg0, byte arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#compareUnsigned(byte,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#compareUnsigned(byte,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -136,7 +136,7 @@ public static int CompareUnsigned(byte arg0, byte arg1)
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#hashCode(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#hashCode(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -145,7 +145,7 @@ public static int HashCode(byte arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(B)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#toUnsignedInt(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#toUnsignedInt(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -154,7 +154,7 @@ public static int ToUnsignedInt(byte arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "toUnsignedInt", "(B)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#decode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#decode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Byte"/></returns>
@@ -164,7 +164,7 @@ public static Java.Lang.Byte Decode(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Byte>(LocalBridgeClazz, "decode", "(Ljava/lang/String;)Ljava/lang/Byte;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#valueOf(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#valueOf(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Lang.Byte"/></returns>
@@ -173,7 +173,7 @@ public static Java.Lang.Byte ValueOf(byte arg0)
             return SExecuteWithSignature<Java.Lang.Byte>(LocalBridgeClazz, "valueOf", "(B)Ljava/lang/Byte;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#valueOf(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#valueOf(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -184,7 +184,7 @@ public static Java.Lang.Byte ValueOf(Java.Lang.String arg0, int arg1)
             return SExecute<Java.Lang.Byte>(LocalBridgeClazz, "valueOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Byte"/></returns>
@@ -194,7 +194,7 @@ public static Java.Lang.Byte ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Byte>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Byte;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#toString(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#toString(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -203,7 +203,7 @@ public static Java.Lang.String ToString(byte arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(B)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#toUnsignedLong(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#toUnsignedLong(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="long"/></returns>
@@ -216,7 +216,7 @@ public static long ToUnsignedLong(byte arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#compareTo(java.lang.Byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#compareTo(java.lang.Byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -225,7 +225,7 @@ public int CompareTo(Java.Lang.Byte arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Byte;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Byte.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Byte.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/CharSequence.cs b/src/net/Netdroid/Generated/Java/Lang/CharSequence.cs
index 67f0ad471..4495f3458 100644
--- a/src/net/Netdroid/Generated/Java/Lang/CharSequence.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/CharSequence.cs
@@ -60,7 +60,7 @@ public partial class CharSequence : Java.Lang.ICharSequence
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/CharSequence.html#compare(java.lang.CharSequence,java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/CharSequence.html#compare(java.lang.CharSequence,java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
@@ -74,7 +74,7 @@ public static int Compare(Java.Lang.CharSequence arg0, Java.Lang.CharSequence ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/CharSequence.html#charAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/CharSequence.html#charAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -83,7 +83,7 @@ public char CharAt(int arg0)
             return IExecuteWithSignature<char>("charAt", "(I)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/CharSequence.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/CharSequence.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -91,7 +91,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/CharSequence.html#subSequence(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/CharSequence.html#subSequence(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -101,15 +101,7 @@ public Java.Lang.CharSequence SubSequence(int arg0, int arg1)
             return IExecute<Java.Lang.CharSequence>("subSequence", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/CharSequence.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEmpty()
-        {
-            return IExecuteWithSignature<bool>("isEmpty", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/CharSequence.html#chars()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/CharSequence.html#chars()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Chars()
@@ -117,7 +109,7 @@ public Java.Util.Stream.IntStream Chars()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("chars", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/CharSequence.html#codePoints()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/CharSequence.html#codePoints()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream CodePoints()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Character.cs b/src/net/Netdroid/Generated/Java/Lang/Character.cs
index 20d98103c..794579638 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Character.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Character.cs
@@ -30,10 +30,10 @@ public partial class Character : Java.Io.ISerializable, Java.Lang.IComparable<Ja
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#%3Cinit%3E(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#%3Cinit%3E(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Character(char arg0)
             : base(arg0)
         {
@@ -55,421 +55,421 @@ public Character(char arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#COMBINING_SPACING_MARK"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#COMBINING_SPACING_MARK"/>
         /// </summary>
         public static byte COMBINING_SPACING_MARK { get { if (!_COMBINING_SPACING_MARKReady) { _COMBINING_SPACING_MARKContent = SGetField<byte>(LocalBridgeClazz, "COMBINING_SPACING_MARK"); _COMBINING_SPACING_MARKReady = true; } return _COMBINING_SPACING_MARKContent; } }
         private static byte _COMBINING_SPACING_MARKContent = default;
         private static bool _COMBINING_SPACING_MARKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#CONNECTOR_PUNCTUATION"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#CONNECTOR_PUNCTUATION"/>
         /// </summary>
         public static byte CONNECTOR_PUNCTUATION { get { if (!_CONNECTOR_PUNCTUATIONReady) { _CONNECTOR_PUNCTUATIONContent = SGetField<byte>(LocalBridgeClazz, "CONNECTOR_PUNCTUATION"); _CONNECTOR_PUNCTUATIONReady = true; } return _CONNECTOR_PUNCTUATIONContent; } }
         private static byte _CONNECTOR_PUNCTUATIONContent = default;
         private static bool _CONNECTOR_PUNCTUATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#CONTROL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#CONTROL"/>
         /// </summary>
         public static byte CONTROL { get { if (!_CONTROLReady) { _CONTROLContent = SGetField<byte>(LocalBridgeClazz, "CONTROL"); _CONTROLReady = true; } return _CONTROLContent; } }
         private static byte _CONTROLContent = default;
         private static bool _CONTROLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#CURRENCY_SYMBOL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#CURRENCY_SYMBOL"/>
         /// </summary>
         public static byte CURRENCY_SYMBOL { get { if (!_CURRENCY_SYMBOLReady) { _CURRENCY_SYMBOLContent = SGetField<byte>(LocalBridgeClazz, "CURRENCY_SYMBOL"); _CURRENCY_SYMBOLReady = true; } return _CURRENCY_SYMBOLContent; } }
         private static byte _CURRENCY_SYMBOLContent = default;
         private static bool _CURRENCY_SYMBOLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DASH_PUNCTUATION"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DASH_PUNCTUATION"/>
         /// </summary>
         public static byte DASH_PUNCTUATION { get { if (!_DASH_PUNCTUATIONReady) { _DASH_PUNCTUATIONContent = SGetField<byte>(LocalBridgeClazz, "DASH_PUNCTUATION"); _DASH_PUNCTUATIONReady = true; } return _DASH_PUNCTUATIONContent; } }
         private static byte _DASH_PUNCTUATIONContent = default;
         private static bool _DASH_PUNCTUATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DECIMAL_DIGIT_NUMBER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DECIMAL_DIGIT_NUMBER"/>
         /// </summary>
         public static byte DECIMAL_DIGIT_NUMBER { get { if (!_DECIMAL_DIGIT_NUMBERReady) { _DECIMAL_DIGIT_NUMBERContent = SGetField<byte>(LocalBridgeClazz, "DECIMAL_DIGIT_NUMBER"); _DECIMAL_DIGIT_NUMBERReady = true; } return _DECIMAL_DIGIT_NUMBERContent; } }
         private static byte _DECIMAL_DIGIT_NUMBERContent = default;
         private static bool _DECIMAL_DIGIT_NUMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_ARABIC_NUMBER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_ARABIC_NUMBER"/>
         /// </summary>
         public static byte DIRECTIONALITY_ARABIC_NUMBER { get { if (!_DIRECTIONALITY_ARABIC_NUMBERReady) { _DIRECTIONALITY_ARABIC_NUMBERContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_ARABIC_NUMBER"); _DIRECTIONALITY_ARABIC_NUMBERReady = true; } return _DIRECTIONALITY_ARABIC_NUMBERContent; } }
         private static byte _DIRECTIONALITY_ARABIC_NUMBERContent = default;
         private static bool _DIRECTIONALITY_ARABIC_NUMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_BOUNDARY_NEUTRAL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_BOUNDARY_NEUTRAL"/>
         /// </summary>
         public static byte DIRECTIONALITY_BOUNDARY_NEUTRAL { get { if (!_DIRECTIONALITY_BOUNDARY_NEUTRALReady) { _DIRECTIONALITY_BOUNDARY_NEUTRALContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_BOUNDARY_NEUTRAL"); _DIRECTIONALITY_BOUNDARY_NEUTRALReady = true; } return _DIRECTIONALITY_BOUNDARY_NEUTRALContent; } }
         private static byte _DIRECTIONALITY_BOUNDARY_NEUTRALContent = default;
         private static bool _DIRECTIONALITY_BOUNDARY_NEUTRALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_COMMON_NUMBER_SEPARATOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_COMMON_NUMBER_SEPARATOR"/>
         /// </summary>
         public static byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR { get { if (!_DIRECTIONALITY_COMMON_NUMBER_SEPARATORReady) { _DIRECTIONALITY_COMMON_NUMBER_SEPARATORContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_COMMON_NUMBER_SEPARATOR"); _DIRECTIONALITY_COMMON_NUMBER_SEPARATORReady = true; } return _DIRECTIONALITY_COMMON_NUMBER_SEPARATORContent; } }
         private static byte _DIRECTIONALITY_COMMON_NUMBER_SEPARATORContent = default;
         private static bool _DIRECTIONALITY_COMMON_NUMBER_SEPARATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_EUROPEAN_NUMBER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_EUROPEAN_NUMBER"/>
         /// </summary>
         public static byte DIRECTIONALITY_EUROPEAN_NUMBER { get { if (!_DIRECTIONALITY_EUROPEAN_NUMBERReady) { _DIRECTIONALITY_EUROPEAN_NUMBERContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_EUROPEAN_NUMBER"); _DIRECTIONALITY_EUROPEAN_NUMBERReady = true; } return _DIRECTIONALITY_EUROPEAN_NUMBERContent; } }
         private static byte _DIRECTIONALITY_EUROPEAN_NUMBERContent = default;
         private static bool _DIRECTIONALITY_EUROPEAN_NUMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR"/>
         /// </summary>
         public static byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR { get { if (!_DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATORReady) { _DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATORContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR"); _DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATORReady = true; } return _DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATORContent; } }
         private static byte _DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATORContent = default;
         private static bool _DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR"/>
         /// </summary>
         public static byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR { get { if (!_DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATORReady) { _DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATORContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR"); _DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATORReady = true; } return _DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATORContent; } }
         private static byte _DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATORContent = default;
         private static bool _DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_FIRST_STRONG_ISOLATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_FIRST_STRONG_ISOLATE"/>
         /// </summary>
         public static byte DIRECTIONALITY_FIRST_STRONG_ISOLATE { get { if (!_DIRECTIONALITY_FIRST_STRONG_ISOLATEReady) { _DIRECTIONALITY_FIRST_STRONG_ISOLATEContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_FIRST_STRONG_ISOLATE"); _DIRECTIONALITY_FIRST_STRONG_ISOLATEReady = true; } return _DIRECTIONALITY_FIRST_STRONG_ISOLATEContent; } }
         private static byte _DIRECTIONALITY_FIRST_STRONG_ISOLATEContent = default;
         private static bool _DIRECTIONALITY_FIRST_STRONG_ISOLATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_LEFT_TO_RIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_LEFT_TO_RIGHT"/>
         /// </summary>
         public static byte DIRECTIONALITY_LEFT_TO_RIGHT { get { if (!_DIRECTIONALITY_LEFT_TO_RIGHTReady) { _DIRECTIONALITY_LEFT_TO_RIGHTContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_LEFT_TO_RIGHT"); _DIRECTIONALITY_LEFT_TO_RIGHTReady = true; } return _DIRECTIONALITY_LEFT_TO_RIGHTContent; } }
         private static byte _DIRECTIONALITY_LEFT_TO_RIGHTContent = default;
         private static bool _DIRECTIONALITY_LEFT_TO_RIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING"/>
         /// </summary>
         public static byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING { get { if (!_DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDINGReady) { _DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDINGContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING"); _DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDINGReady = true; } return _DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDINGContent; } }
         private static byte _DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDINGContent = default;
         private static bool _DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE"/>
         /// </summary>
         public static byte DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE { get { if (!_DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATEReady) { _DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATEContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE"); _DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATEReady = true; } return _DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATEContent; } }
         private static byte _DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATEContent = default;
         private static bool _DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE"/>
         /// </summary>
         public static byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE { get { if (!_DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDEReady) { _DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDEContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE"); _DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDEReady = true; } return _DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDEContent; } }
         private static byte _DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDEContent = default;
         private static bool _DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_NONSPACING_MARK"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_NONSPACING_MARK"/>
         /// </summary>
         public static byte DIRECTIONALITY_NONSPACING_MARK { get { if (!_DIRECTIONALITY_NONSPACING_MARKReady) { _DIRECTIONALITY_NONSPACING_MARKContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_NONSPACING_MARK"); _DIRECTIONALITY_NONSPACING_MARKReady = true; } return _DIRECTIONALITY_NONSPACING_MARKContent; } }
         private static byte _DIRECTIONALITY_NONSPACING_MARKContent = default;
         private static bool _DIRECTIONALITY_NONSPACING_MARKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_OTHER_NEUTRALS"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_OTHER_NEUTRALS"/>
         /// </summary>
         public static byte DIRECTIONALITY_OTHER_NEUTRALS { get { if (!_DIRECTIONALITY_OTHER_NEUTRALSReady) { _DIRECTIONALITY_OTHER_NEUTRALSContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_OTHER_NEUTRALS"); _DIRECTIONALITY_OTHER_NEUTRALSReady = true; } return _DIRECTIONALITY_OTHER_NEUTRALSContent; } }
         private static byte _DIRECTIONALITY_OTHER_NEUTRALSContent = default;
         private static bool _DIRECTIONALITY_OTHER_NEUTRALSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_PARAGRAPH_SEPARATOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_PARAGRAPH_SEPARATOR"/>
         /// </summary>
         public static byte DIRECTIONALITY_PARAGRAPH_SEPARATOR { get { if (!_DIRECTIONALITY_PARAGRAPH_SEPARATORReady) { _DIRECTIONALITY_PARAGRAPH_SEPARATORContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_PARAGRAPH_SEPARATOR"); _DIRECTIONALITY_PARAGRAPH_SEPARATORReady = true; } return _DIRECTIONALITY_PARAGRAPH_SEPARATORContent; } }
         private static byte _DIRECTIONALITY_PARAGRAPH_SEPARATORContent = default;
         private static bool _DIRECTIONALITY_PARAGRAPH_SEPARATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_POP_DIRECTIONAL_FORMAT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_POP_DIRECTIONAL_FORMAT"/>
         /// </summary>
         public static byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT { get { if (!_DIRECTIONALITY_POP_DIRECTIONAL_FORMATReady) { _DIRECTIONALITY_POP_DIRECTIONAL_FORMATContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_POP_DIRECTIONAL_FORMAT"); _DIRECTIONALITY_POP_DIRECTIONAL_FORMATReady = true; } return _DIRECTIONALITY_POP_DIRECTIONAL_FORMATContent; } }
         private static byte _DIRECTIONALITY_POP_DIRECTIONAL_FORMATContent = default;
         private static bool _DIRECTIONALITY_POP_DIRECTIONAL_FORMATReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE"/>
         /// </summary>
         public static byte DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE { get { if (!_DIRECTIONALITY_POP_DIRECTIONAL_ISOLATEReady) { _DIRECTIONALITY_POP_DIRECTIONAL_ISOLATEContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE"); _DIRECTIONALITY_POP_DIRECTIONAL_ISOLATEReady = true; } return _DIRECTIONALITY_POP_DIRECTIONAL_ISOLATEContent; } }
         private static byte _DIRECTIONALITY_POP_DIRECTIONAL_ISOLATEContent = default;
         private static bool _DIRECTIONALITY_POP_DIRECTIONAL_ISOLATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT"/>
         /// </summary>
         public static byte DIRECTIONALITY_RIGHT_TO_LEFT { get { if (!_DIRECTIONALITY_RIGHT_TO_LEFTReady) { _DIRECTIONALITY_RIGHT_TO_LEFTContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_RIGHT_TO_LEFT"); _DIRECTIONALITY_RIGHT_TO_LEFTReady = true; } return _DIRECTIONALITY_RIGHT_TO_LEFTContent; } }
         private static byte _DIRECTIONALITY_RIGHT_TO_LEFTContent = default;
         private static bool _DIRECTIONALITY_RIGHT_TO_LEFTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC"/>
         /// </summary>
         public static byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC { get { if (!_DIRECTIONALITY_RIGHT_TO_LEFT_ARABICReady) { _DIRECTIONALITY_RIGHT_TO_LEFT_ARABICContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC"); _DIRECTIONALITY_RIGHT_TO_LEFT_ARABICReady = true; } return _DIRECTIONALITY_RIGHT_TO_LEFT_ARABICContent; } }
         private static byte _DIRECTIONALITY_RIGHT_TO_LEFT_ARABICContent = default;
         private static bool _DIRECTIONALITY_RIGHT_TO_LEFT_ARABICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING"/>
         /// </summary>
         public static byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING { get { if (!_DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDINGReady) { _DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDINGContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING"); _DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDINGReady = true; } return _DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDINGContent; } }
         private static byte _DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDINGContent = default;
         private static bool _DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE"/>
         /// </summary>
         public static byte DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE { get { if (!_DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATEReady) { _DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATEContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE"); _DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATEReady = true; } return _DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATEContent; } }
         private static byte _DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATEContent = default;
         private static bool _DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE"/>
         /// </summary>
         public static byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE { get { if (!_DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDEReady) { _DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDEContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE"); _DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDEReady = true; } return _DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDEContent; } }
         private static byte _DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDEContent = default;
         private static bool _DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_SEGMENT_SEPARATOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_SEGMENT_SEPARATOR"/>
         /// </summary>
         public static byte DIRECTIONALITY_SEGMENT_SEPARATOR { get { if (!_DIRECTIONALITY_SEGMENT_SEPARATORReady) { _DIRECTIONALITY_SEGMENT_SEPARATORContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_SEGMENT_SEPARATOR"); _DIRECTIONALITY_SEGMENT_SEPARATORReady = true; } return _DIRECTIONALITY_SEGMENT_SEPARATORContent; } }
         private static byte _DIRECTIONALITY_SEGMENT_SEPARATORContent = default;
         private static bool _DIRECTIONALITY_SEGMENT_SEPARATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_UNDEFINED"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_UNDEFINED"/>
         /// </summary>
         public static byte DIRECTIONALITY_UNDEFINED { get { if (!_DIRECTIONALITY_UNDEFINEDReady) { _DIRECTIONALITY_UNDEFINEDContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_UNDEFINED"); _DIRECTIONALITY_UNDEFINEDReady = true; } return _DIRECTIONALITY_UNDEFINEDContent; } }
         private static byte _DIRECTIONALITY_UNDEFINEDContent = default;
         private static bool _DIRECTIONALITY_UNDEFINEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#DIRECTIONALITY_WHITESPACE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#DIRECTIONALITY_WHITESPACE"/>
         /// </summary>
         public static byte DIRECTIONALITY_WHITESPACE { get { if (!_DIRECTIONALITY_WHITESPACEReady) { _DIRECTIONALITY_WHITESPACEContent = SGetField<byte>(LocalBridgeClazz, "DIRECTIONALITY_WHITESPACE"); _DIRECTIONALITY_WHITESPACEReady = true; } return _DIRECTIONALITY_WHITESPACEContent; } }
         private static byte _DIRECTIONALITY_WHITESPACEContent = default;
         private static bool _DIRECTIONALITY_WHITESPACEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#ENCLOSING_MARK"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#ENCLOSING_MARK"/>
         /// </summary>
         public static byte ENCLOSING_MARK { get { if (!_ENCLOSING_MARKReady) { _ENCLOSING_MARKContent = SGetField<byte>(LocalBridgeClazz, "ENCLOSING_MARK"); _ENCLOSING_MARKReady = true; } return _ENCLOSING_MARKContent; } }
         private static byte _ENCLOSING_MARKContent = default;
         private static bool _ENCLOSING_MARKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#END_PUNCTUATION"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#END_PUNCTUATION"/>
         /// </summary>
         public static byte END_PUNCTUATION { get { if (!_END_PUNCTUATIONReady) { _END_PUNCTUATIONContent = SGetField<byte>(LocalBridgeClazz, "END_PUNCTUATION"); _END_PUNCTUATIONReady = true; } return _END_PUNCTUATIONContent; } }
         private static byte _END_PUNCTUATIONContent = default;
         private static bool _END_PUNCTUATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#FINAL_QUOTE_PUNCTUATION"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#FINAL_QUOTE_PUNCTUATION"/>
         /// </summary>
         public static byte FINAL_QUOTE_PUNCTUATION { get { if (!_FINAL_QUOTE_PUNCTUATIONReady) { _FINAL_QUOTE_PUNCTUATIONContent = SGetField<byte>(LocalBridgeClazz, "FINAL_QUOTE_PUNCTUATION"); _FINAL_QUOTE_PUNCTUATIONReady = true; } return _FINAL_QUOTE_PUNCTUATIONContent; } }
         private static byte _FINAL_QUOTE_PUNCTUATIONContent = default;
         private static bool _FINAL_QUOTE_PUNCTUATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#FORMAT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#FORMAT"/>
         /// </summary>
         public static byte FORMAT { get { if (!_FORMATReady) { _FORMATContent = SGetField<byte>(LocalBridgeClazz, "FORMAT"); _FORMATReady = true; } return _FORMATContent; } }
         private static byte _FORMATContent = default;
         private static bool _FORMATReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#INITIAL_QUOTE_PUNCTUATION"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#INITIAL_QUOTE_PUNCTUATION"/>
         /// </summary>
         public static byte INITIAL_QUOTE_PUNCTUATION { get { if (!_INITIAL_QUOTE_PUNCTUATIONReady) { _INITIAL_QUOTE_PUNCTUATIONContent = SGetField<byte>(LocalBridgeClazz, "INITIAL_QUOTE_PUNCTUATION"); _INITIAL_QUOTE_PUNCTUATIONReady = true; } return _INITIAL_QUOTE_PUNCTUATIONContent; } }
         private static byte _INITIAL_QUOTE_PUNCTUATIONContent = default;
         private static bool _INITIAL_QUOTE_PUNCTUATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#LETTER_NUMBER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#LETTER_NUMBER"/>
         /// </summary>
         public static byte LETTER_NUMBER { get { if (!_LETTER_NUMBERReady) { _LETTER_NUMBERContent = SGetField<byte>(LocalBridgeClazz, "LETTER_NUMBER"); _LETTER_NUMBERReady = true; } return _LETTER_NUMBERContent; } }
         private static byte _LETTER_NUMBERContent = default;
         private static bool _LETTER_NUMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#LINE_SEPARATOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#LINE_SEPARATOR"/>
         /// </summary>
         public static byte LINE_SEPARATOR { get { if (!_LINE_SEPARATORReady) { _LINE_SEPARATORContent = SGetField<byte>(LocalBridgeClazz, "LINE_SEPARATOR"); _LINE_SEPARATORReady = true; } return _LINE_SEPARATORContent; } }
         private static byte _LINE_SEPARATORContent = default;
         private static bool _LINE_SEPARATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#LOWERCASE_LETTER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#LOWERCASE_LETTER"/>
         /// </summary>
         public static byte LOWERCASE_LETTER { get { if (!_LOWERCASE_LETTERReady) { _LOWERCASE_LETTERContent = SGetField<byte>(LocalBridgeClazz, "LOWERCASE_LETTER"); _LOWERCASE_LETTERReady = true; } return _LOWERCASE_LETTERContent; } }
         private static byte _LOWERCASE_LETTERContent = default;
         private static bool _LOWERCASE_LETTERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MATH_SYMBOL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MATH_SYMBOL"/>
         /// </summary>
         public static byte MATH_SYMBOL { get { if (!_MATH_SYMBOLReady) { _MATH_SYMBOLContent = SGetField<byte>(LocalBridgeClazz, "MATH_SYMBOL"); _MATH_SYMBOLReady = true; } return _MATH_SYMBOLContent; } }
         private static byte _MATH_SYMBOLContent = default;
         private static bool _MATH_SYMBOLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MODIFIER_LETTER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MODIFIER_LETTER"/>
         /// </summary>
         public static byte MODIFIER_LETTER { get { if (!_MODIFIER_LETTERReady) { _MODIFIER_LETTERContent = SGetField<byte>(LocalBridgeClazz, "MODIFIER_LETTER"); _MODIFIER_LETTERReady = true; } return _MODIFIER_LETTERContent; } }
         private static byte _MODIFIER_LETTERContent = default;
         private static bool _MODIFIER_LETTERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MODIFIER_SYMBOL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MODIFIER_SYMBOL"/>
         /// </summary>
         public static byte MODIFIER_SYMBOL { get { if (!_MODIFIER_SYMBOLReady) { _MODIFIER_SYMBOLContent = SGetField<byte>(LocalBridgeClazz, "MODIFIER_SYMBOL"); _MODIFIER_SYMBOLReady = true; } return _MODIFIER_SYMBOLContent; } }
         private static byte _MODIFIER_SYMBOLContent = default;
         private static bool _MODIFIER_SYMBOLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#NON_SPACING_MARK"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#NON_SPACING_MARK"/>
         /// </summary>
         public static byte NON_SPACING_MARK { get { if (!_NON_SPACING_MARKReady) { _NON_SPACING_MARKContent = SGetField<byte>(LocalBridgeClazz, "NON_SPACING_MARK"); _NON_SPACING_MARKReady = true; } return _NON_SPACING_MARKContent; } }
         private static byte _NON_SPACING_MARKContent = default;
         private static bool _NON_SPACING_MARKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#OTHER_LETTER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#OTHER_LETTER"/>
         /// </summary>
         public static byte OTHER_LETTER { get { if (!_OTHER_LETTERReady) { _OTHER_LETTERContent = SGetField<byte>(LocalBridgeClazz, "OTHER_LETTER"); _OTHER_LETTERReady = true; } return _OTHER_LETTERContent; } }
         private static byte _OTHER_LETTERContent = default;
         private static bool _OTHER_LETTERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#OTHER_NUMBER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#OTHER_NUMBER"/>
         /// </summary>
         public static byte OTHER_NUMBER { get { if (!_OTHER_NUMBERReady) { _OTHER_NUMBERContent = SGetField<byte>(LocalBridgeClazz, "OTHER_NUMBER"); _OTHER_NUMBERReady = true; } return _OTHER_NUMBERContent; } }
         private static byte _OTHER_NUMBERContent = default;
         private static bool _OTHER_NUMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#OTHER_PUNCTUATION"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#OTHER_PUNCTUATION"/>
         /// </summary>
         public static byte OTHER_PUNCTUATION { get { if (!_OTHER_PUNCTUATIONReady) { _OTHER_PUNCTUATIONContent = SGetField<byte>(LocalBridgeClazz, "OTHER_PUNCTUATION"); _OTHER_PUNCTUATIONReady = true; } return _OTHER_PUNCTUATIONContent; } }
         private static byte _OTHER_PUNCTUATIONContent = default;
         private static bool _OTHER_PUNCTUATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#OTHER_SYMBOL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#OTHER_SYMBOL"/>
         /// </summary>
         public static byte OTHER_SYMBOL { get { if (!_OTHER_SYMBOLReady) { _OTHER_SYMBOLContent = SGetField<byte>(LocalBridgeClazz, "OTHER_SYMBOL"); _OTHER_SYMBOLReady = true; } return _OTHER_SYMBOLContent; } }
         private static byte _OTHER_SYMBOLContent = default;
         private static bool _OTHER_SYMBOLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#PARAGRAPH_SEPARATOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#PARAGRAPH_SEPARATOR"/>
         /// </summary>
         public static byte PARAGRAPH_SEPARATOR { get { if (!_PARAGRAPH_SEPARATORReady) { _PARAGRAPH_SEPARATORContent = SGetField<byte>(LocalBridgeClazz, "PARAGRAPH_SEPARATOR"); _PARAGRAPH_SEPARATORReady = true; } return _PARAGRAPH_SEPARATORContent; } }
         private static byte _PARAGRAPH_SEPARATORContent = default;
         private static bool _PARAGRAPH_SEPARATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#PRIVATE_USE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#PRIVATE_USE"/>
         /// </summary>
         public static byte PRIVATE_USE { get { if (!_PRIVATE_USEReady) { _PRIVATE_USEContent = SGetField<byte>(LocalBridgeClazz, "PRIVATE_USE"); _PRIVATE_USEReady = true; } return _PRIVATE_USEContent; } }
         private static byte _PRIVATE_USEContent = default;
         private static bool _PRIVATE_USEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#SPACE_SEPARATOR"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#SPACE_SEPARATOR"/>
         /// </summary>
         public static byte SPACE_SEPARATOR { get { if (!_SPACE_SEPARATORReady) { _SPACE_SEPARATORContent = SGetField<byte>(LocalBridgeClazz, "SPACE_SEPARATOR"); _SPACE_SEPARATORReady = true; } return _SPACE_SEPARATORContent; } }
         private static byte _SPACE_SEPARATORContent = default;
         private static bool _SPACE_SEPARATORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#START_PUNCTUATION"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#START_PUNCTUATION"/>
         /// </summary>
         public static byte START_PUNCTUATION { get { if (!_START_PUNCTUATIONReady) { _START_PUNCTUATIONContent = SGetField<byte>(LocalBridgeClazz, "START_PUNCTUATION"); _START_PUNCTUATIONReady = true; } return _START_PUNCTUATIONContent; } }
         private static byte _START_PUNCTUATIONContent = default;
         private static bool _START_PUNCTUATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#SURROGATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#SURROGATE"/>
         /// </summary>
         public static byte SURROGATE { get { if (!_SURROGATEReady) { _SURROGATEContent = SGetField<byte>(LocalBridgeClazz, "SURROGATE"); _SURROGATEReady = true; } return _SURROGATEContent; } }
         private static byte _SURROGATEContent = default;
         private static bool _SURROGATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#TITLECASE_LETTER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#TITLECASE_LETTER"/>
         /// </summary>
         public static byte TITLECASE_LETTER { get { if (!_TITLECASE_LETTERReady) { _TITLECASE_LETTERContent = SGetField<byte>(LocalBridgeClazz, "TITLECASE_LETTER"); _TITLECASE_LETTERReady = true; } return _TITLECASE_LETTERContent; } }
         private static byte _TITLECASE_LETTERContent = default;
         private static bool _TITLECASE_LETTERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#UNASSIGNED"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#UNASSIGNED"/>
         /// </summary>
         public static byte UNASSIGNED { get { if (!_UNASSIGNEDReady) { _UNASSIGNEDContent = SGetField<byte>(LocalBridgeClazz, "UNASSIGNED"); _UNASSIGNEDReady = true; } return _UNASSIGNEDContent; } }
         private static byte _UNASSIGNEDContent = default;
         private static bool _UNASSIGNEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#UPPERCASE_LETTER"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#UPPERCASE_LETTER"/>
         /// </summary>
         public static byte UPPERCASE_LETTER { get { if (!_UPPERCASE_LETTERReady) { _UPPERCASE_LETTERContent = SGetField<byte>(LocalBridgeClazz, "UPPERCASE_LETTER"); _UPPERCASE_LETTERReady = true; } return _UPPERCASE_LETTERContent; } }
         private static byte _UPPERCASE_LETTERContent = default;
         private static bool _UPPERCASE_LETTERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MAX_HIGH_SURROGATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MAX_HIGH_SURROGATE"/>
         /// </summary>
         public static char MAX_HIGH_SURROGATE { get { if (!_MAX_HIGH_SURROGATEReady) { _MAX_HIGH_SURROGATEContent = SGetField<char>(LocalBridgeClazz, "MAX_HIGH_SURROGATE"); _MAX_HIGH_SURROGATEReady = true; } return _MAX_HIGH_SURROGATEContent; } }
         private static char _MAX_HIGH_SURROGATEContent = default;
         private static bool _MAX_HIGH_SURROGATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MAX_LOW_SURROGATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MAX_LOW_SURROGATE"/>
         /// </summary>
         public static char MAX_LOW_SURROGATE { get { if (!_MAX_LOW_SURROGATEReady) { _MAX_LOW_SURROGATEContent = SGetField<char>(LocalBridgeClazz, "MAX_LOW_SURROGATE"); _MAX_LOW_SURROGATEReady = true; } return _MAX_LOW_SURROGATEContent; } }
         private static char _MAX_LOW_SURROGATEContent = default;
         private static bool _MAX_LOW_SURROGATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MAX_SURROGATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MAX_SURROGATE"/>
         /// </summary>
         public static char MAX_SURROGATE { get { if (!_MAX_SURROGATEReady) { _MAX_SURROGATEContent = SGetField<char>(LocalBridgeClazz, "MAX_SURROGATE"); _MAX_SURROGATEReady = true; } return _MAX_SURROGATEContent; } }
         private static char _MAX_SURROGATEContent = default;
         private static bool _MAX_SURROGATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MAX_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MAX_VALUE"/>
         /// </summary>
         public static char MAX_VALUE { get { if (!_MAX_VALUEReady) { _MAX_VALUEContent = SGetField<char>(LocalBridgeClazz, "MAX_VALUE"); _MAX_VALUEReady = true; } return _MAX_VALUEContent; } }
         private static char _MAX_VALUEContent = default;
         private static bool _MAX_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MIN_HIGH_SURROGATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MIN_HIGH_SURROGATE"/>
         /// </summary>
         public static char MIN_HIGH_SURROGATE { get { if (!_MIN_HIGH_SURROGATEReady) { _MIN_HIGH_SURROGATEContent = SGetField<char>(LocalBridgeClazz, "MIN_HIGH_SURROGATE"); _MIN_HIGH_SURROGATEReady = true; } return _MIN_HIGH_SURROGATEContent; } }
         private static char _MIN_HIGH_SURROGATEContent = default;
         private static bool _MIN_HIGH_SURROGATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MIN_LOW_SURROGATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MIN_LOW_SURROGATE"/>
         /// </summary>
         public static char MIN_LOW_SURROGATE { get { if (!_MIN_LOW_SURROGATEReady) { _MIN_LOW_SURROGATEContent = SGetField<char>(LocalBridgeClazz, "MIN_LOW_SURROGATE"); _MIN_LOW_SURROGATEReady = true; } return _MIN_LOW_SURROGATEContent; } }
         private static char _MIN_LOW_SURROGATEContent = default;
         private static bool _MIN_LOW_SURROGATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MIN_SURROGATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MIN_SURROGATE"/>
         /// </summary>
         public static char MIN_SURROGATE { get { if (!_MIN_SURROGATEReady) { _MIN_SURROGATEContent = SGetField<char>(LocalBridgeClazz, "MIN_SURROGATE"); _MIN_SURROGATEReady = true; } return _MIN_SURROGATEContent; } }
         private static char _MIN_SURROGATEContent = default;
         private static bool _MIN_SURROGATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MIN_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MIN_VALUE"/>
         /// </summary>
         public static char MIN_VALUE { get { if (!_MIN_VALUEReady) { _MIN_VALUEContent = SGetField<char>(LocalBridgeClazz, "MIN_VALUE"); _MIN_VALUEReady = true; } return _MIN_VALUEContent; } }
         private static char _MIN_VALUEContent = default;
         private static bool _MIN_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#BYTES"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#BYTES"/>
         /// </summary>
         public static int BYTES { get { if (!_BYTESReady) { _BYTESContent = SGetField<int>(LocalBridgeClazz, "BYTES"); _BYTESReady = true; } return _BYTESContent; } }
         private static int _BYTESContent = default;
         private static bool _BYTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MAX_CODE_POINT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MAX_CODE_POINT"/>
         /// </summary>
         public static int MAX_CODE_POINT { get { if (!_MAX_CODE_POINTReady) { _MAX_CODE_POINTContent = SGetField<int>(LocalBridgeClazz, "MAX_CODE_POINT"); _MAX_CODE_POINTReady = true; } return _MAX_CODE_POINTContent; } }
         private static int _MAX_CODE_POINTContent = default;
         private static bool _MAX_CODE_POINTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MAX_RADIX"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MAX_RADIX"/>
         /// </summary>
         public static int MAX_RADIX { get { if (!_MAX_RADIXReady) { _MAX_RADIXContent = SGetField<int>(LocalBridgeClazz, "MAX_RADIX"); _MAX_RADIXReady = true; } return _MAX_RADIXContent; } }
         private static int _MAX_RADIXContent = default;
         private static bool _MAX_RADIXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MIN_CODE_POINT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MIN_CODE_POINT"/>
         /// </summary>
         public static int MIN_CODE_POINT { get { if (!_MIN_CODE_POINTReady) { _MIN_CODE_POINTContent = SGetField<int>(LocalBridgeClazz, "MIN_CODE_POINT"); _MIN_CODE_POINTReady = true; } return _MIN_CODE_POINTContent; } }
         private static int _MIN_CODE_POINTContent = default;
         private static bool _MIN_CODE_POINTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MIN_RADIX"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MIN_RADIX"/>
         /// </summary>
         public static int MIN_RADIX { get { if (!_MIN_RADIXReady) { _MIN_RADIXContent = SGetField<int>(LocalBridgeClazz, "MIN_RADIX"); _MIN_RADIXReady = true; } return _MIN_RADIXContent; } }
         private static int _MIN_RADIXContent = default;
         private static bool _MIN_RADIXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#MIN_SUPPLEMENTARY_CODE_POINT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#MIN_SUPPLEMENTARY_CODE_POINT"/>
         /// </summary>
         public static int MIN_SUPPLEMENTARY_CODE_POINT { get { if (!_MIN_SUPPLEMENTARY_CODE_POINTReady) { _MIN_SUPPLEMENTARY_CODE_POINTContent = SGetField<int>(LocalBridgeClazz, "MIN_SUPPLEMENTARY_CODE_POINT"); _MIN_SUPPLEMENTARY_CODE_POINTReady = true; } return _MIN_SUPPLEMENTARY_CODE_POINTContent; } }
         private static int _MIN_SUPPLEMENTARY_CODE_POINTContent = default;
         private static bool _MIN_SUPPLEMENTARY_CODE_POINTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#SIZE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#SIZE"/>
         /// </summary>
         public static int SIZE { get { if (!_SIZEReady) { _SIZEContent = SGetField<int>(LocalBridgeClazz, "SIZE"); _SIZEReady = true; } return _SIZEContent; } }
         private static int _SIZEContent = default;
         private static bool _SIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
@@ -479,7 +479,7 @@ public Character(char arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isAlphabetic(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isAlphabetic(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -488,7 +488,7 @@ public static bool IsAlphabetic(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isAlphabetic", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isBmpCodePoint(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isBmpCodePoint(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -497,7 +497,7 @@ public static bool IsBmpCodePoint(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isBmpCodePoint", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isDefined(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isDefined(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -506,7 +506,7 @@ public static bool IsDefined(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isDefined", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isDefined(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isDefined(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -515,7 +515,7 @@ public static bool IsDefined(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isDefined", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isDigit(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -524,7 +524,7 @@ public static bool IsDigit(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isDigit", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isDigit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isDigit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -533,7 +533,7 @@ public static bool IsDigit(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isDigit", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isHighSurrogate(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isHighSurrogate(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -542,7 +542,7 @@ public static bool IsHighSurrogate(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isHighSurrogate", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isIdentifierIgnorable(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isIdentifierIgnorable(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -551,7 +551,7 @@ public static bool IsIdentifierIgnorable(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isIdentifierIgnorable", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isIdentifierIgnorable(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isIdentifierIgnorable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -560,7 +560,7 @@ public static bool IsIdentifierIgnorable(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isIdentifierIgnorable", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isIdeographic(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isIdeographic(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -569,7 +569,7 @@ public static bool IsIdeographic(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isIdeographic", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isISOControl(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isISOControl(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -578,7 +578,7 @@ public static bool IsISOControl(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isISOControl", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isISOControl(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isISOControl(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -587,7 +587,7 @@ public static bool IsISOControl(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isISOControl", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isJavaIdentifierPart(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isJavaIdentifierPart(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -596,7 +596,7 @@ public static bool IsJavaIdentifierPart(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isJavaIdentifierPart", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isJavaIdentifierPart(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isJavaIdentifierPart(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -605,7 +605,7 @@ public static bool IsJavaIdentifierPart(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isJavaIdentifierPart", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isJavaIdentifierStart(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isJavaIdentifierStart(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -614,7 +614,7 @@ public static bool IsJavaIdentifierStart(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isJavaIdentifierStart", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isJavaIdentifierStart(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isJavaIdentifierStart(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -623,27 +623,27 @@ public static bool IsJavaIdentifierStart(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isJavaIdentifierStart", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isJavaLetter(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isJavaLetter(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsJavaLetter(char arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isJavaLetter", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isJavaLetterOrDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isJavaLetterOrDigit(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsJavaLetterOrDigit(char arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isJavaLetterOrDigit", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isLetter(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isLetter(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -652,7 +652,7 @@ public static bool IsLetter(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLetter", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isLetter(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isLetter(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -661,7 +661,7 @@ public static bool IsLetter(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLetter", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isLetterOrDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isLetterOrDigit(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -670,7 +670,7 @@ public static bool IsLetterOrDigit(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLetterOrDigit", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isLetterOrDigit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isLetterOrDigit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -679,7 +679,7 @@ public static bool IsLetterOrDigit(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLetterOrDigit", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isLowerCase(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isLowerCase(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -688,7 +688,7 @@ public static bool IsLowerCase(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLowerCase", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isLowerCase(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isLowerCase(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -697,7 +697,7 @@ public static bool IsLowerCase(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLowerCase", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isLowSurrogate(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isLowSurrogate(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -706,7 +706,7 @@ public static bool IsLowSurrogate(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLowSurrogate", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isMirrored(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isMirrored(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -715,7 +715,7 @@ public static bool IsMirrored(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isMirrored", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isMirrored(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isMirrored(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -724,17 +724,17 @@ public static bool IsMirrored(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isMirrored", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isSpace(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isSpace(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsSpace(char arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSpace", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isSpaceChar(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isSpaceChar(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -743,7 +743,7 @@ public static bool IsSpaceChar(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSpaceChar", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isSpaceChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isSpaceChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -752,7 +752,7 @@ public static bool IsSpaceChar(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSpaceChar", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isSupplementaryCodePoint(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isSupplementaryCodePoint(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -761,7 +761,7 @@ public static bool IsSupplementaryCodePoint(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSupplementaryCodePoint", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isSurrogate(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isSurrogate(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -770,7 +770,7 @@ public static bool IsSurrogate(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSurrogate", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isSurrogatePair(char,char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isSurrogatePair(char,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -780,7 +780,7 @@ public static bool IsSurrogatePair(char arg0, char arg1)
             return SExecute<bool>(LocalBridgeClazz, "isSurrogatePair", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isTitleCase(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isTitleCase(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -789,7 +789,7 @@ public static bool IsTitleCase(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isTitleCase", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isTitleCase(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isTitleCase(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -798,7 +798,7 @@ public static bool IsTitleCase(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isTitleCase", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isUnicodeIdentifierPart(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isUnicodeIdentifierPart(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -807,7 +807,7 @@ public static bool IsUnicodeIdentifierPart(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isUnicodeIdentifierPart", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isUnicodeIdentifierPart(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isUnicodeIdentifierPart(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -816,7 +816,7 @@ public static bool IsUnicodeIdentifierPart(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isUnicodeIdentifierPart", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isUnicodeIdentifierStart(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isUnicodeIdentifierStart(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -825,7 +825,7 @@ public static bool IsUnicodeIdentifierStart(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isUnicodeIdentifierStart", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isUnicodeIdentifierStart(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isUnicodeIdentifierStart(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -834,7 +834,7 @@ public static bool IsUnicodeIdentifierStart(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isUnicodeIdentifierStart", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isUpperCase(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isUpperCase(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -843,7 +843,7 @@ public static bool IsUpperCase(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isUpperCase", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isUpperCase(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isUpperCase(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -852,7 +852,7 @@ public static bool IsUpperCase(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isUpperCase", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isValidCodePoint(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isValidCodePoint(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -861,7 +861,7 @@ public static bool IsValidCodePoint(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isValidCodePoint", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isWhitespace(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isWhitespace(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -870,7 +870,7 @@ public static bool IsWhitespace(char arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isWhitespace", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#isWhitespace(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#isWhitespace(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -879,7 +879,7 @@ public static bool IsWhitespace(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isWhitespace", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#getDirectionality(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#getDirectionality(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -888,7 +888,7 @@ public static byte GetDirectionality(char arg0)
             return SExecuteWithSignature<byte>(LocalBridgeClazz, "getDirectionality", "(C)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#getDirectionality(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#getDirectionality(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -897,7 +897,7 @@ public static byte GetDirectionality(int arg0)
             return SExecuteWithSignature<byte>(LocalBridgeClazz, "getDirectionality", "(I)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#forDigit(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#forDigit(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -907,7 +907,7 @@ public static char ForDigit(int arg0, int arg1)
             return SExecute<char>(LocalBridgeClazz, "forDigit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#highSurrogate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#highSurrogate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -916,7 +916,7 @@ public static char HighSurrogate(int arg0)
             return SExecuteWithSignature<char>(LocalBridgeClazz, "highSurrogate", "(I)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#lowSurrogate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#lowSurrogate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -925,7 +925,7 @@ public static char LowSurrogate(int arg0)
             return SExecuteWithSignature<char>(LocalBridgeClazz, "lowSurrogate", "(I)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#reverseBytes(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#reverseBytes(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="char"/></returns>
@@ -934,7 +934,7 @@ public static char ReverseBytes(char arg0)
             return SExecuteWithSignature<char>(LocalBridgeClazz, "reverseBytes", "(C)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toLowerCase(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toLowerCase(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="char"/></returns>
@@ -943,7 +943,7 @@ public static char ToLowerCase(char arg0)
             return SExecuteWithSignature<char>(LocalBridgeClazz, "toLowerCase", "(C)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toTitleCase(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toTitleCase(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="char"/></returns>
@@ -952,7 +952,7 @@ public static char ToTitleCase(char arg0)
             return SExecuteWithSignature<char>(LocalBridgeClazz, "toTitleCase", "(C)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toUpperCase(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toUpperCase(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="char"/></returns>
@@ -961,7 +961,7 @@ public static char ToUpperCase(char arg0)
             return SExecuteWithSignature<char>(LocalBridgeClazz, "toUpperCase", "(C)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toChars(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toChars(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -970,7 +970,7 @@ public static char[] ToChars(int arg0)
             return SExecuteWithSignatureArray<char>(LocalBridgeClazz, "toChars", "(I)[C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#charCount(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#charCount(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -979,7 +979,7 @@ public static int CharCount(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "charCount", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointAt(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointAt(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -990,7 +990,7 @@ public static int CodePointAt(char[] arg0, int arg1, int arg2)
             return SExecute<int>(LocalBridgeClazz, "codePointAt", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointAt(char[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointAt(char[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1000,7 +1000,7 @@ public static int CodePointAt(char[] arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "codePointAt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointAt(java.lang.CharSequence,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointAt(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1010,7 +1010,7 @@ public static int CodePointAt(Java.Lang.CharSequence arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "codePointAt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointBefore(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointBefore(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1021,7 +1021,7 @@ public static int CodePointBefore(char[] arg0, int arg1, int arg2)
             return SExecute<int>(LocalBridgeClazz, "codePointBefore", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointBefore(char[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointBefore(char[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1031,7 +1031,7 @@ public static int CodePointBefore(char[] arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "codePointBefore", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointBefore(java.lang.CharSequence,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointBefore(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1041,7 +1041,7 @@ public static int CodePointBefore(Java.Lang.CharSequence arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "codePointBefore", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointCount(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointCount(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1052,7 +1052,7 @@ public static int CodePointCount(char[] arg0, int arg1, int arg2)
             return SExecute<int>(LocalBridgeClazz, "codePointCount", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointCount(java.lang.CharSequence,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointCount(java.lang.CharSequence,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1063,7 +1063,7 @@ public static int CodePointCount(Java.Lang.CharSequence arg0, int arg1, int arg2
             return SExecute<int>(LocalBridgeClazz, "codePointCount", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#codePointOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#codePointOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1072,7 +1072,7 @@ public static int CodePointOf(Java.Lang.String arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "codePointOf", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#compare(char,char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#compare(char,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -1082,7 +1082,7 @@ public static int Compare(char arg0, char arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#digit(char,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#digit(char,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1092,7 +1092,7 @@ public static int Digit(char arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "digit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#digit(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#digit(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1102,7 +1102,7 @@ public static int Digit(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "digit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#getNumericValue(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#getNumericValue(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1111,7 +1111,7 @@ public static int GetNumericValue(char arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getNumericValue", "(C)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#getNumericValue(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#getNumericValue(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1120,7 +1120,7 @@ public static int GetNumericValue(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getNumericValue", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#getType(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#getType(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1129,7 +1129,7 @@ public static int GetType(char arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getType", "(C)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#getType(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#getType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1138,7 +1138,7 @@ public static int GetType(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getType", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#hashCode(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#hashCode(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1147,7 +1147,7 @@ public static int HashCode(char arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(C)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#offsetByCodePoints(char[],int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#offsetByCodePoints(char[],int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1160,7 +1160,7 @@ public static int OffsetByCodePoints(char[] arg0, int arg1, int arg2, int arg3,
             return SExecute<int>(LocalBridgeClazz, "offsetByCodePoints", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#offsetByCodePoints(java.lang.CharSequence,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#offsetByCodePoints(java.lang.CharSequence,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1171,7 +1171,7 @@ public static int OffsetByCodePoints(Java.Lang.CharSequence arg0, int arg1, int
             return SExecute<int>(LocalBridgeClazz, "offsetByCodePoints", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toChars(int,char[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toChars(int,char[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -1182,7 +1182,7 @@ public static int ToChars(int arg0, char[] arg1, int arg2)
             return SExecute<int>(LocalBridgeClazz, "toChars", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toCodePoint(char,char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toCodePoint(char,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -1192,7 +1192,7 @@ public static int ToCodePoint(char arg0, char arg1)
             return SExecute<int>(LocalBridgeClazz, "toCodePoint", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toLowerCase(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toLowerCase(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1201,7 +1201,7 @@ public static int ToLowerCase(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "toLowerCase", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toTitleCase(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toTitleCase(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1210,7 +1210,7 @@ public static int ToTitleCase(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "toTitleCase", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toUpperCase(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toUpperCase(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1219,7 +1219,7 @@ public static int ToUpperCase(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "toUpperCase", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#valueOf(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#valueOf(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.Character"/></returns>
@@ -1228,7 +1228,7 @@ public static Java.Lang.Character ValueOf(char arg0)
             return SExecuteWithSignature<Java.Lang.Character>(LocalBridgeClazz, "valueOf", "(C)Ljava/lang/Character;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#getName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#getName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1237,7 +1237,7 @@ public static Java.Lang.String GetName(int arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toString(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toString(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1246,7 +1246,7 @@ public static Java.Lang.String ToString(char arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(C)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#toString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#toString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1259,7 +1259,7 @@ public static Java.Lang.String ToString(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#charValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#charValue()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char CharValue()
@@ -1267,7 +1267,7 @@ public char CharValue()
             return IExecuteWithSignature<char>("charValue", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#compareTo(java.lang.Character)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#compareTo(java.lang.Character)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Character"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1276,7 +1276,7 @@ public int CompareTo(Java.Lang.Character arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Character;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Character.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1332,1856 +1332,1688 @@ public partial class UnicodeBlock
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ADLAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ADLAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ADLAM { get { if (!_ADLAMReady) { _ADLAMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ADLAM"); _ADLAMReady = true; } return _ADLAMContent; } }
             private static Java.Lang.Character.UnicodeBlock _ADLAMContent = default;
             private static bool _ADLAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#AEGEAN_NUMBERS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#AEGEAN_NUMBERS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock AEGEAN_NUMBERS { get { if (!_AEGEAN_NUMBERSReady) { _AEGEAN_NUMBERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "AEGEAN_NUMBERS"); _AEGEAN_NUMBERSReady = true; } return _AEGEAN_NUMBERSContent; } }
             private static Java.Lang.Character.UnicodeBlock _AEGEAN_NUMBERSContent = default;
             private static bool _AEGEAN_NUMBERSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#AHOM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#AHOM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock AHOM { get { if (!_AHOMReady) { _AHOMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "AHOM"); _AHOMReady = true; } return _AHOMContent; } }
             private static Java.Lang.Character.UnicodeBlock _AHOMContent = default;
             private static bool _AHOMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ALCHEMICAL_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ALCHEMICAL_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ALCHEMICAL_SYMBOLS { get { if (!_ALCHEMICAL_SYMBOLSReady) { _ALCHEMICAL_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ALCHEMICAL_SYMBOLS"); _ALCHEMICAL_SYMBOLSReady = true; } return _ALCHEMICAL_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ALCHEMICAL_SYMBOLSContent = default;
             private static bool _ALCHEMICAL_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ALPHABETIC_PRESENTATION_FORMS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ALPHABETIC_PRESENTATION_FORMS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ALPHABETIC_PRESENTATION_FORMS { get { if (!_ALPHABETIC_PRESENTATION_FORMSReady) { _ALPHABETIC_PRESENTATION_FORMSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ALPHABETIC_PRESENTATION_FORMS"); _ALPHABETIC_PRESENTATION_FORMSReady = true; } return _ALPHABETIC_PRESENTATION_FORMSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ALPHABETIC_PRESENTATION_FORMSContent = default;
             private static bool _ALPHABETIC_PRESENTATION_FORMSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ANATOLIAN_HIEROGLYPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ANATOLIAN_HIEROGLYPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ANATOLIAN_HIEROGLYPHS { get { if (!_ANATOLIAN_HIEROGLYPHSReady) { _ANATOLIAN_HIEROGLYPHSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ANATOLIAN_HIEROGLYPHS"); _ANATOLIAN_HIEROGLYPHSReady = true; } return _ANATOLIAN_HIEROGLYPHSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ANATOLIAN_HIEROGLYPHSContent = default;
             private static bool _ANATOLIAN_HIEROGLYPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ANCIENT_GREEK_MUSICAL_NOTATION"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ANCIENT_GREEK_MUSICAL_NOTATION"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ANCIENT_GREEK_MUSICAL_NOTATION { get { if (!_ANCIENT_GREEK_MUSICAL_NOTATIONReady) { _ANCIENT_GREEK_MUSICAL_NOTATIONContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ANCIENT_GREEK_MUSICAL_NOTATION"); _ANCIENT_GREEK_MUSICAL_NOTATIONReady = true; } return _ANCIENT_GREEK_MUSICAL_NOTATIONContent; } }
             private static Java.Lang.Character.UnicodeBlock _ANCIENT_GREEK_MUSICAL_NOTATIONContent = default;
             private static bool _ANCIENT_GREEK_MUSICAL_NOTATIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ANCIENT_GREEK_NUMBERS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ANCIENT_GREEK_NUMBERS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ANCIENT_GREEK_NUMBERS { get { if (!_ANCIENT_GREEK_NUMBERSReady) { _ANCIENT_GREEK_NUMBERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ANCIENT_GREEK_NUMBERS"); _ANCIENT_GREEK_NUMBERSReady = true; } return _ANCIENT_GREEK_NUMBERSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ANCIENT_GREEK_NUMBERSContent = default;
             private static bool _ANCIENT_GREEK_NUMBERSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ANCIENT_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ANCIENT_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ANCIENT_SYMBOLS { get { if (!_ANCIENT_SYMBOLSReady) { _ANCIENT_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ANCIENT_SYMBOLS"); _ANCIENT_SYMBOLSReady = true; } return _ANCIENT_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ANCIENT_SYMBOLSContent = default;
             private static bool _ANCIENT_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ARABIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ARABIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ARABIC { get { if (!_ARABICReady) { _ARABICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ARABIC"); _ARABICReady = true; } return _ARABICContent; } }
             private static Java.Lang.Character.UnicodeBlock _ARABICContent = default;
             private static bool _ARABICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ARABIC_EXTENDED_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ARABIC_EXTENDED_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ARABIC_EXTENDED_A { get { if (!_ARABIC_EXTENDED_AReady) { _ARABIC_EXTENDED_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ARABIC_EXTENDED_A"); _ARABIC_EXTENDED_AReady = true; } return _ARABIC_EXTENDED_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _ARABIC_EXTENDED_AContent = default;
             private static bool _ARABIC_EXTENDED_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS { get { if (!_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLSReady) { _ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS"); _ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLSReady = true; } return _ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLSContent = default;
             private static bool _ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ARABIC_PRESENTATION_FORMS_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ARABIC_PRESENTATION_FORMS_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ARABIC_PRESENTATION_FORMS_A { get { if (!_ARABIC_PRESENTATION_FORMS_AReady) { _ARABIC_PRESENTATION_FORMS_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ARABIC_PRESENTATION_FORMS_A"); _ARABIC_PRESENTATION_FORMS_AReady = true; } return _ARABIC_PRESENTATION_FORMS_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _ARABIC_PRESENTATION_FORMS_AContent = default;
             private static bool _ARABIC_PRESENTATION_FORMS_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ARABIC_PRESENTATION_FORMS_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ARABIC_PRESENTATION_FORMS_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ARABIC_PRESENTATION_FORMS_B { get { if (!_ARABIC_PRESENTATION_FORMS_BReady) { _ARABIC_PRESENTATION_FORMS_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ARABIC_PRESENTATION_FORMS_B"); _ARABIC_PRESENTATION_FORMS_BReady = true; } return _ARABIC_PRESENTATION_FORMS_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _ARABIC_PRESENTATION_FORMS_BContent = default;
             private static bool _ARABIC_PRESENTATION_FORMS_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ARABIC_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ARABIC_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ARABIC_SUPPLEMENT { get { if (!_ARABIC_SUPPLEMENTReady) { _ARABIC_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ARABIC_SUPPLEMENT"); _ARABIC_SUPPLEMENTReady = true; } return _ARABIC_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _ARABIC_SUPPLEMENTContent = default;
             private static bool _ARABIC_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ARMENIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ARMENIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ARMENIAN { get { if (!_ARMENIANReady) { _ARMENIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ARMENIAN"); _ARMENIANReady = true; } return _ARMENIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _ARMENIANContent = default;
             private static bool _ARMENIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ARROWS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ARROWS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ARROWS { get { if (!_ARROWSReady) { _ARROWSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ARROWS"); _ARROWSReady = true; } return _ARROWSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ARROWSContent = default;
             private static bool _ARROWSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#AVESTAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#AVESTAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock AVESTAN { get { if (!_AVESTANReady) { _AVESTANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "AVESTAN"); _AVESTANReady = true; } return _AVESTANContent; } }
             private static Java.Lang.Character.UnicodeBlock _AVESTANContent = default;
             private static bool _AVESTANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BALINESE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BALINESE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BALINESE { get { if (!_BALINESEReady) { _BALINESEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BALINESE"); _BALINESEReady = true; } return _BALINESEContent; } }
             private static Java.Lang.Character.UnicodeBlock _BALINESEContent = default;
             private static bool _BALINESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BAMUM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BAMUM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BAMUM { get { if (!_BAMUMReady) { _BAMUMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BAMUM"); _BAMUMReady = true; } return _BAMUMContent; } }
             private static Java.Lang.Character.UnicodeBlock _BAMUMContent = default;
             private static bool _BAMUMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BAMUM_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BAMUM_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BAMUM_SUPPLEMENT { get { if (!_BAMUM_SUPPLEMENTReady) { _BAMUM_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BAMUM_SUPPLEMENT"); _BAMUM_SUPPLEMENTReady = true; } return _BAMUM_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _BAMUM_SUPPLEMENTContent = default;
             private static bool _BAMUM_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BASIC_LATIN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BASIC_LATIN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BASIC_LATIN { get { if (!_BASIC_LATINReady) { _BASIC_LATINContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BASIC_LATIN"); _BASIC_LATINReady = true; } return _BASIC_LATINContent; } }
             private static Java.Lang.Character.UnicodeBlock _BASIC_LATINContent = default;
             private static bool _BASIC_LATINReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BASSA_VAH"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BASSA_VAH"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BASSA_VAH { get { if (!_BASSA_VAHReady) { _BASSA_VAHContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BASSA_VAH"); _BASSA_VAHReady = true; } return _BASSA_VAHContent; } }
             private static Java.Lang.Character.UnicodeBlock _BASSA_VAHContent = default;
             private static bool _BASSA_VAHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BATAK"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BATAK"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BATAK { get { if (!_BATAKReady) { _BATAKContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BATAK"); _BATAKReady = true; } return _BATAKContent; } }
             private static Java.Lang.Character.UnicodeBlock _BATAKContent = default;
             private static bool _BATAKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BENGALI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BENGALI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BENGALI { get { if (!_BENGALIReady) { _BENGALIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BENGALI"); _BENGALIReady = true; } return _BENGALIContent; } }
             private static Java.Lang.Character.UnicodeBlock _BENGALIContent = default;
             private static bool _BENGALIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BHAIKSUKI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BHAIKSUKI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BHAIKSUKI { get { if (!_BHAIKSUKIReady) { _BHAIKSUKIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BHAIKSUKI"); _BHAIKSUKIReady = true; } return _BHAIKSUKIContent; } }
             private static Java.Lang.Character.UnicodeBlock _BHAIKSUKIContent = default;
             private static bool _BHAIKSUKIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BLOCK_ELEMENTS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BLOCK_ELEMENTS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BLOCK_ELEMENTS { get { if (!_BLOCK_ELEMENTSReady) { _BLOCK_ELEMENTSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BLOCK_ELEMENTS"); _BLOCK_ELEMENTSReady = true; } return _BLOCK_ELEMENTSContent; } }
             private static Java.Lang.Character.UnicodeBlock _BLOCK_ELEMENTSContent = default;
             private static bool _BLOCK_ELEMENTSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BOPOMOFO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BOPOMOFO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BOPOMOFO { get { if (!_BOPOMOFOReady) { _BOPOMOFOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BOPOMOFO"); _BOPOMOFOReady = true; } return _BOPOMOFOContent; } }
             private static Java.Lang.Character.UnicodeBlock _BOPOMOFOContent = default;
             private static bool _BOPOMOFOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BOPOMOFO_EXTENDED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BOPOMOFO_EXTENDED"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BOPOMOFO_EXTENDED { get { if (!_BOPOMOFO_EXTENDEDReady) { _BOPOMOFO_EXTENDEDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BOPOMOFO_EXTENDED"); _BOPOMOFO_EXTENDEDReady = true; } return _BOPOMOFO_EXTENDEDContent; } }
             private static Java.Lang.Character.UnicodeBlock _BOPOMOFO_EXTENDEDContent = default;
             private static bool _BOPOMOFO_EXTENDEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BOX_DRAWING"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BOX_DRAWING"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BOX_DRAWING { get { if (!_BOX_DRAWINGReady) { _BOX_DRAWINGContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BOX_DRAWING"); _BOX_DRAWINGReady = true; } return _BOX_DRAWINGContent; } }
             private static Java.Lang.Character.UnicodeBlock _BOX_DRAWINGContent = default;
             private static bool _BOX_DRAWINGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BRAHMI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BRAHMI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BRAHMI { get { if (!_BRAHMIReady) { _BRAHMIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BRAHMI"); _BRAHMIReady = true; } return _BRAHMIContent; } }
             private static Java.Lang.Character.UnicodeBlock _BRAHMIContent = default;
             private static bool _BRAHMIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BRAILLE_PATTERNS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BRAILLE_PATTERNS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BRAILLE_PATTERNS { get { if (!_BRAILLE_PATTERNSReady) { _BRAILLE_PATTERNSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BRAILLE_PATTERNS"); _BRAILLE_PATTERNSReady = true; } return _BRAILLE_PATTERNSContent; } }
             private static Java.Lang.Character.UnicodeBlock _BRAILLE_PATTERNSContent = default;
             private static bool _BRAILLE_PATTERNSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BUGINESE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BUGINESE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BUGINESE { get { if (!_BUGINESEReady) { _BUGINESEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BUGINESE"); _BUGINESEReady = true; } return _BUGINESEContent; } }
             private static Java.Lang.Character.UnicodeBlock _BUGINESEContent = default;
             private static bool _BUGINESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BUHID"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BUHID"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BUHID { get { if (!_BUHIDReady) { _BUHIDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BUHID"); _BUHIDReady = true; } return _BUHIDContent; } }
             private static Java.Lang.Character.UnicodeBlock _BUHIDContent = default;
             private static bool _BUHIDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#BYZANTINE_MUSICAL_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#BYZANTINE_MUSICAL_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS { get { if (!_BYZANTINE_MUSICAL_SYMBOLSReady) { _BYZANTINE_MUSICAL_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "BYZANTINE_MUSICAL_SYMBOLS"); _BYZANTINE_MUSICAL_SYMBOLSReady = true; } return _BYZANTINE_MUSICAL_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _BYZANTINE_MUSICAL_SYMBOLSContent = default;
             private static bool _BYZANTINE_MUSICAL_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CARIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CARIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CARIAN { get { if (!_CARIANReady) { _CARIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CARIAN"); _CARIANReady = true; } return _CARIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _CARIANContent = default;
             private static bool _CARIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CAUCASIAN_ALBANIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CAUCASIAN_ALBANIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CAUCASIAN_ALBANIAN { get { if (!_CAUCASIAN_ALBANIANReady) { _CAUCASIAN_ALBANIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CAUCASIAN_ALBANIAN"); _CAUCASIAN_ALBANIANReady = true; } return _CAUCASIAN_ALBANIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _CAUCASIAN_ALBANIANContent = default;
             private static bool _CAUCASIAN_ALBANIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CHAKMA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CHAKMA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CHAKMA { get { if (!_CHAKMAReady) { _CHAKMAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CHAKMA"); _CHAKMAReady = true; } return _CHAKMAContent; } }
             private static Java.Lang.Character.UnicodeBlock _CHAKMAContent = default;
             private static bool _CHAKMAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CHAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CHAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CHAM { get { if (!_CHAMReady) { _CHAMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CHAM"); _CHAMReady = true; } return _CHAMContent; } }
             private static Java.Lang.Character.UnicodeBlock _CHAMContent = default;
             private static bool _CHAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CHEROKEE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CHEROKEE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CHEROKEE { get { if (!_CHEROKEEReady) { _CHEROKEEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CHEROKEE"); _CHEROKEEReady = true; } return _CHEROKEEContent; } }
             private static Java.Lang.Character.UnicodeBlock _CHEROKEEContent = default;
             private static bool _CHEROKEEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CHEROKEE_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CHEROKEE_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CHEROKEE_SUPPLEMENT { get { if (!_CHEROKEE_SUPPLEMENTReady) { _CHEROKEE_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CHEROKEE_SUPPLEMENT"); _CHEROKEE_SUPPLEMENTReady = true; } return _CHEROKEE_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _CHEROKEE_SUPPLEMENTContent = default;
             private static bool _CHEROKEE_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CHESS_SYMBOLS"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock CHESS_SYMBOLS { get { if (!_CHESS_SYMBOLSReady) { _CHESS_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CHESS_SYMBOLS"); _CHESS_SYMBOLSReady = true; } return _CHESS_SYMBOLSContent; } }
-            private static Java.Lang.Character.UnicodeBlock _CHESS_SYMBOLSContent = default;
-            private static bool _CHESS_SYMBOLSReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CHORASMIAN"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock CHORASMIAN { get { if (!_CHORASMIANReady) { _CHORASMIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CHORASMIAN"); _CHORASMIANReady = true; } return _CHORASMIANContent; } }
-            private static Java.Lang.Character.UnicodeBlock _CHORASMIANContent = default;
-            private static bool _CHORASMIANReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_COMPATIBILITY"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_COMPATIBILITY"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_COMPATIBILITY { get { if (!_CJK_COMPATIBILITYReady) { _CJK_COMPATIBILITYContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_COMPATIBILITY"); _CJK_COMPATIBILITYReady = true; } return _CJK_COMPATIBILITYContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_COMPATIBILITYContent = default;
             private static bool _CJK_COMPATIBILITYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_COMPATIBILITY_FORMS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_COMPATIBILITY_FORMS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_COMPATIBILITY_FORMS { get { if (!_CJK_COMPATIBILITY_FORMSReady) { _CJK_COMPATIBILITY_FORMSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_COMPATIBILITY_FORMS"); _CJK_COMPATIBILITY_FORMSReady = true; } return _CJK_COMPATIBILITY_FORMSContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_COMPATIBILITY_FORMSContent = default;
             private static bool _CJK_COMPATIBILITY_FORMSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_COMPATIBILITY_IDEOGRAPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_COMPATIBILITY_IDEOGRAPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS { get { if (!_CJK_COMPATIBILITY_IDEOGRAPHSReady) { _CJK_COMPATIBILITY_IDEOGRAPHSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_COMPATIBILITY_IDEOGRAPHS"); _CJK_COMPATIBILITY_IDEOGRAPHSReady = true; } return _CJK_COMPATIBILITY_IDEOGRAPHSContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_COMPATIBILITY_IDEOGRAPHSContent = default;
             private static bool _CJK_COMPATIBILITY_IDEOGRAPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT { get { if (!_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENTReady) { _CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT"); _CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENTReady = true; } return _CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENTContent = default;
             private static bool _CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_RADICALS_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_RADICALS_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_RADICALS_SUPPLEMENT { get { if (!_CJK_RADICALS_SUPPLEMENTReady) { _CJK_RADICALS_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_RADICALS_SUPPLEMENT"); _CJK_RADICALS_SUPPLEMENTReady = true; } return _CJK_RADICALS_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_RADICALS_SUPPLEMENTContent = default;
             private static bool _CJK_RADICALS_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_STROKES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_STROKES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_STROKES { get { if (!_CJK_STROKESReady) { _CJK_STROKESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_STROKES"); _CJK_STROKESReady = true; } return _CJK_STROKESContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_STROKESContent = default;
             private static bool _CJK_STROKESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_SYMBOLS_AND_PUNCTUATION"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_SYMBOLS_AND_PUNCTUATION"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION { get { if (!_CJK_SYMBOLS_AND_PUNCTUATIONReady) { _CJK_SYMBOLS_AND_PUNCTUATIONContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_SYMBOLS_AND_PUNCTUATION"); _CJK_SYMBOLS_AND_PUNCTUATIONReady = true; } return _CJK_SYMBOLS_AND_PUNCTUATIONContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_SYMBOLS_AND_PUNCTUATIONContent = default;
             private static bool _CJK_SYMBOLS_AND_PUNCTUATIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS { get { if (!_CJK_UNIFIED_IDEOGRAPHSReady) { _CJK_UNIFIED_IDEOGRAPHSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_UNIFIED_IDEOGRAPHS"); _CJK_UNIFIED_IDEOGRAPHSReady = true; } return _CJK_UNIFIED_IDEOGRAPHSContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_UNIFIED_IDEOGRAPHSContent = default;
             private static bool _CJK_UNIFIED_IDEOGRAPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A { get { if (!_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_AReady) { _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A"); _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_AReady = true; } return _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_AContent = default;
             private static bool _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B { get { if (!_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_BReady) { _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B"); _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_BReady = true; } return _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_BContent = default;
             private static bool _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C { get { if (!_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_CReady) { _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_CContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C"); _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_CReady = true; } return _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_CContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_CContent = default;
             private static bool _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_CReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D { get { if (!_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_DReady) { _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_DContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D"); _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_DReady = true; } return _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_DContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_DContent = default;
             private static bool _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_DReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E { get { if (!_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_EReady) { _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_EContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E"); _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_EReady = true; } return _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_EContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_EContent = default;
             private static bool _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_EReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F { get { if (!_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_FReady) { _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_FContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F"); _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_FReady = true; } return _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_FContent; } }
             private static Java.Lang.Character.UnicodeBlock _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_FContent = default;
             private static bool _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_FReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G { get { if (!_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_GReady) { _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_GContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G"); _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_GReady = true; } return _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_GContent; } }
-            private static Java.Lang.Character.UnicodeBlock _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_GContent = default;
-            private static bool _CJK_UNIFIED_IDEOGRAPHS_EXTENSION_GReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COMBINING_DIACRITICAL_MARKS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COMBINING_DIACRITICAL_MARKS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COMBINING_DIACRITICAL_MARKS { get { if (!_COMBINING_DIACRITICAL_MARKSReady) { _COMBINING_DIACRITICAL_MARKSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COMBINING_DIACRITICAL_MARKS"); _COMBINING_DIACRITICAL_MARKSReady = true; } return _COMBINING_DIACRITICAL_MARKSContent; } }
             private static Java.Lang.Character.UnicodeBlock _COMBINING_DIACRITICAL_MARKSContent = default;
             private static bool _COMBINING_DIACRITICAL_MARKSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COMBINING_DIACRITICAL_MARKS_EXTENDED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COMBINING_DIACRITICAL_MARKS_EXTENDED"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COMBINING_DIACRITICAL_MARKS_EXTENDED { get { if (!_COMBINING_DIACRITICAL_MARKS_EXTENDEDReady) { _COMBINING_DIACRITICAL_MARKS_EXTENDEDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COMBINING_DIACRITICAL_MARKS_EXTENDED"); _COMBINING_DIACRITICAL_MARKS_EXTENDEDReady = true; } return _COMBINING_DIACRITICAL_MARKS_EXTENDEDContent; } }
             private static Java.Lang.Character.UnicodeBlock _COMBINING_DIACRITICAL_MARKS_EXTENDEDContent = default;
             private static bool _COMBINING_DIACRITICAL_MARKS_EXTENDEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COMBINING_DIACRITICAL_MARKS_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COMBINING_DIACRITICAL_MARKS_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COMBINING_DIACRITICAL_MARKS_SUPPLEMENT { get { if (!_COMBINING_DIACRITICAL_MARKS_SUPPLEMENTReady) { _COMBINING_DIACRITICAL_MARKS_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COMBINING_DIACRITICAL_MARKS_SUPPLEMENT"); _COMBINING_DIACRITICAL_MARKS_SUPPLEMENTReady = true; } return _COMBINING_DIACRITICAL_MARKS_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _COMBINING_DIACRITICAL_MARKS_SUPPLEMENTContent = default;
             private static bool _COMBINING_DIACRITICAL_MARKS_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COMBINING_HALF_MARKS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COMBINING_HALF_MARKS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COMBINING_HALF_MARKS { get { if (!_COMBINING_HALF_MARKSReady) { _COMBINING_HALF_MARKSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COMBINING_HALF_MARKS"); _COMBINING_HALF_MARKSReady = true; } return _COMBINING_HALF_MARKSContent; } }
             private static Java.Lang.Character.UnicodeBlock _COMBINING_HALF_MARKSContent = default;
             private static bool _COMBINING_HALF_MARKSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COMBINING_MARKS_FOR_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COMBINING_MARKS_FOR_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS { get { if (!_COMBINING_MARKS_FOR_SYMBOLSReady) { _COMBINING_MARKS_FOR_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COMBINING_MARKS_FOR_SYMBOLS"); _COMBINING_MARKS_FOR_SYMBOLSReady = true; } return _COMBINING_MARKS_FOR_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _COMBINING_MARKS_FOR_SYMBOLSContent = default;
             private static bool _COMBINING_MARKS_FOR_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COMMON_INDIC_NUMBER_FORMS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COMMON_INDIC_NUMBER_FORMS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COMMON_INDIC_NUMBER_FORMS { get { if (!_COMMON_INDIC_NUMBER_FORMSReady) { _COMMON_INDIC_NUMBER_FORMSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COMMON_INDIC_NUMBER_FORMS"); _COMMON_INDIC_NUMBER_FORMSReady = true; } return _COMMON_INDIC_NUMBER_FORMSContent; } }
             private static Java.Lang.Character.UnicodeBlock _COMMON_INDIC_NUMBER_FORMSContent = default;
             private static bool _COMMON_INDIC_NUMBER_FORMSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CONTROL_PICTURES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CONTROL_PICTURES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CONTROL_PICTURES { get { if (!_CONTROL_PICTURESReady) { _CONTROL_PICTURESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CONTROL_PICTURES"); _CONTROL_PICTURESReady = true; } return _CONTROL_PICTURESContent; } }
             private static Java.Lang.Character.UnicodeBlock _CONTROL_PICTURESContent = default;
             private static bool _CONTROL_PICTURESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COPTIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COPTIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COPTIC { get { if (!_COPTICReady) { _COPTICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COPTIC"); _COPTICReady = true; } return _COPTICContent; } }
             private static Java.Lang.Character.UnicodeBlock _COPTICContent = default;
             private static bool _COPTICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COPTIC_EPACT_NUMBERS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COPTIC_EPACT_NUMBERS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COPTIC_EPACT_NUMBERS { get { if (!_COPTIC_EPACT_NUMBERSReady) { _COPTIC_EPACT_NUMBERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COPTIC_EPACT_NUMBERS"); _COPTIC_EPACT_NUMBERSReady = true; } return _COPTIC_EPACT_NUMBERSContent; } }
             private static Java.Lang.Character.UnicodeBlock _COPTIC_EPACT_NUMBERSContent = default;
             private static bool _COPTIC_EPACT_NUMBERSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#COUNTING_ROD_NUMERALS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#COUNTING_ROD_NUMERALS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock COUNTING_ROD_NUMERALS { get { if (!_COUNTING_ROD_NUMERALSReady) { _COUNTING_ROD_NUMERALSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "COUNTING_ROD_NUMERALS"); _COUNTING_ROD_NUMERALSReady = true; } return _COUNTING_ROD_NUMERALSContent; } }
             private static Java.Lang.Character.UnicodeBlock _COUNTING_ROD_NUMERALSContent = default;
             private static bool _COUNTING_ROD_NUMERALSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CUNEIFORM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CUNEIFORM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CUNEIFORM { get { if (!_CUNEIFORMReady) { _CUNEIFORMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CUNEIFORM"); _CUNEIFORMReady = true; } return _CUNEIFORMContent; } }
             private static Java.Lang.Character.UnicodeBlock _CUNEIFORMContent = default;
             private static bool _CUNEIFORMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CUNEIFORM_NUMBERS_AND_PUNCTUATION"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CUNEIFORM_NUMBERS_AND_PUNCTUATION"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CUNEIFORM_NUMBERS_AND_PUNCTUATION { get { if (!_CUNEIFORM_NUMBERS_AND_PUNCTUATIONReady) { _CUNEIFORM_NUMBERS_AND_PUNCTUATIONContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CUNEIFORM_NUMBERS_AND_PUNCTUATION"); _CUNEIFORM_NUMBERS_AND_PUNCTUATIONReady = true; } return _CUNEIFORM_NUMBERS_AND_PUNCTUATIONContent; } }
             private static Java.Lang.Character.UnicodeBlock _CUNEIFORM_NUMBERS_AND_PUNCTUATIONContent = default;
             private static bool _CUNEIFORM_NUMBERS_AND_PUNCTUATIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CURRENCY_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CURRENCY_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CURRENCY_SYMBOLS { get { if (!_CURRENCY_SYMBOLSReady) { _CURRENCY_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CURRENCY_SYMBOLS"); _CURRENCY_SYMBOLSReady = true; } return _CURRENCY_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _CURRENCY_SYMBOLSContent = default;
             private static bool _CURRENCY_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CYPRIOT_SYLLABARY"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CYPRIOT_SYLLABARY"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CYPRIOT_SYLLABARY { get { if (!_CYPRIOT_SYLLABARYReady) { _CYPRIOT_SYLLABARYContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CYPRIOT_SYLLABARY"); _CYPRIOT_SYLLABARYReady = true; } return _CYPRIOT_SYLLABARYContent; } }
             private static Java.Lang.Character.UnicodeBlock _CYPRIOT_SYLLABARYContent = default;
             private static bool _CYPRIOT_SYLLABARYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CYRILLIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CYRILLIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CYRILLIC { get { if (!_CYRILLICReady) { _CYRILLICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CYRILLIC"); _CYRILLICReady = true; } return _CYRILLICContent; } }
             private static Java.Lang.Character.UnicodeBlock _CYRILLICContent = default;
             private static bool _CYRILLICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CYRILLIC_EXTENDED_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CYRILLIC_EXTENDED_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CYRILLIC_EXTENDED_A { get { if (!_CYRILLIC_EXTENDED_AReady) { _CYRILLIC_EXTENDED_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CYRILLIC_EXTENDED_A"); _CYRILLIC_EXTENDED_AReady = true; } return _CYRILLIC_EXTENDED_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _CYRILLIC_EXTENDED_AContent = default;
             private static bool _CYRILLIC_EXTENDED_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CYRILLIC_EXTENDED_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CYRILLIC_EXTENDED_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CYRILLIC_EXTENDED_B { get { if (!_CYRILLIC_EXTENDED_BReady) { _CYRILLIC_EXTENDED_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CYRILLIC_EXTENDED_B"); _CYRILLIC_EXTENDED_BReady = true; } return _CYRILLIC_EXTENDED_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _CYRILLIC_EXTENDED_BContent = default;
             private static bool _CYRILLIC_EXTENDED_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CYRILLIC_EXTENDED_C"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CYRILLIC_EXTENDED_C"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CYRILLIC_EXTENDED_C { get { if (!_CYRILLIC_EXTENDED_CReady) { _CYRILLIC_EXTENDED_CContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CYRILLIC_EXTENDED_C"); _CYRILLIC_EXTENDED_CReady = true; } return _CYRILLIC_EXTENDED_CContent; } }
             private static Java.Lang.Character.UnicodeBlock _CYRILLIC_EXTENDED_CContent = default;
             private static bool _CYRILLIC_EXTENDED_CReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#CYRILLIC_SUPPLEMENTARY"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#CYRILLIC_SUPPLEMENTARY"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock CYRILLIC_SUPPLEMENTARY { get { if (!_CYRILLIC_SUPPLEMENTARYReady) { _CYRILLIC_SUPPLEMENTARYContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "CYRILLIC_SUPPLEMENTARY"); _CYRILLIC_SUPPLEMENTARYReady = true; } return _CYRILLIC_SUPPLEMENTARYContent; } }
             private static Java.Lang.Character.UnicodeBlock _CYRILLIC_SUPPLEMENTARYContent = default;
             private static bool _CYRILLIC_SUPPLEMENTARYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#DESERET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#DESERET"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock DESERET { get { if (!_DESERETReady) { _DESERETContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "DESERET"); _DESERETReady = true; } return _DESERETContent; } }
             private static Java.Lang.Character.UnicodeBlock _DESERETContent = default;
             private static bool _DESERETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#DEVANAGARI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#DEVANAGARI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock DEVANAGARI { get { if (!_DEVANAGARIReady) { _DEVANAGARIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "DEVANAGARI"); _DEVANAGARIReady = true; } return _DEVANAGARIContent; } }
             private static Java.Lang.Character.UnicodeBlock _DEVANAGARIContent = default;
             private static bool _DEVANAGARIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#DEVANAGARI_EXTENDED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#DEVANAGARI_EXTENDED"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock DEVANAGARI_EXTENDED { get { if (!_DEVANAGARI_EXTENDEDReady) { _DEVANAGARI_EXTENDEDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "DEVANAGARI_EXTENDED"); _DEVANAGARI_EXTENDEDReady = true; } return _DEVANAGARI_EXTENDEDContent; } }
             private static Java.Lang.Character.UnicodeBlock _DEVANAGARI_EXTENDEDContent = default;
             private static bool _DEVANAGARI_EXTENDEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#DINGBATS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#DINGBATS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock DINGBATS { get { if (!_DINGBATSReady) { _DINGBATSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "DINGBATS"); _DINGBATSReady = true; } return _DINGBATSContent; } }
             private static Java.Lang.Character.UnicodeBlock _DINGBATSContent = default;
             private static bool _DINGBATSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#DIVES_AKURU"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock DIVES_AKURU { get { if (!_DIVES_AKURUReady) { _DIVES_AKURUContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "DIVES_AKURU"); _DIVES_AKURUReady = true; } return _DIVES_AKURUContent; } }
-            private static Java.Lang.Character.UnicodeBlock _DIVES_AKURUContent = default;
-            private static bool _DIVES_AKURUReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#DOGRA"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock DOGRA { get { if (!_DOGRAReady) { _DOGRAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "DOGRA"); _DOGRAReady = true; } return _DOGRAContent; } }
-            private static Java.Lang.Character.UnicodeBlock _DOGRAContent = default;
-            private static bool _DOGRAReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#DOMINO_TILES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#DOMINO_TILES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock DOMINO_TILES { get { if (!_DOMINO_TILESReady) { _DOMINO_TILESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "DOMINO_TILES"); _DOMINO_TILESReady = true; } return _DOMINO_TILESContent; } }
             private static Java.Lang.Character.UnicodeBlock _DOMINO_TILESContent = default;
             private static bool _DOMINO_TILESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#DUPLOYAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#DUPLOYAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock DUPLOYAN { get { if (!_DUPLOYANReady) { _DUPLOYANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "DUPLOYAN"); _DUPLOYANReady = true; } return _DUPLOYANContent; } }
             private static Java.Lang.Character.UnicodeBlock _DUPLOYANContent = default;
             private static bool _DUPLOYANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#EARLY_DYNASTIC_CUNEIFORM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#EARLY_DYNASTIC_CUNEIFORM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock EARLY_DYNASTIC_CUNEIFORM { get { if (!_EARLY_DYNASTIC_CUNEIFORMReady) { _EARLY_DYNASTIC_CUNEIFORMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "EARLY_DYNASTIC_CUNEIFORM"); _EARLY_DYNASTIC_CUNEIFORMReady = true; } return _EARLY_DYNASTIC_CUNEIFORMContent; } }
             private static Java.Lang.Character.UnicodeBlock _EARLY_DYNASTIC_CUNEIFORMContent = default;
             private static bool _EARLY_DYNASTIC_CUNEIFORMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLS"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLS { get { if (!_EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLSReady) { _EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLS"); _EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLSReady = true; } return _EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLSContent; } }
-            private static Java.Lang.Character.UnicodeBlock _EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLSContent = default;
-            private static bool _EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLSReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#EGYPTIAN_HIEROGLYPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#EGYPTIAN_HIEROGLYPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock EGYPTIAN_HIEROGLYPHS { get { if (!_EGYPTIAN_HIEROGLYPHSReady) { _EGYPTIAN_HIEROGLYPHSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "EGYPTIAN_HIEROGLYPHS"); _EGYPTIAN_HIEROGLYPHSReady = true; } return _EGYPTIAN_HIEROGLYPHSContent; } }
             private static Java.Lang.Character.UnicodeBlock _EGYPTIAN_HIEROGLYPHSContent = default;
             private static bool _EGYPTIAN_HIEROGLYPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ELBASAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ELBASAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ELBASAN { get { if (!_ELBASANReady) { _ELBASANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ELBASAN"); _ELBASANReady = true; } return _ELBASANContent; } }
             private static Java.Lang.Character.UnicodeBlock _ELBASANContent = default;
             private static bool _ELBASANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ELYMAIC"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock ELYMAIC { get { if (!_ELYMAICReady) { _ELYMAICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ELYMAIC"); _ELYMAICReady = true; } return _ELYMAICContent; } }
-            private static Java.Lang.Character.UnicodeBlock _ELYMAICContent = default;
-            private static bool _ELYMAICReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#EMOTICONS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#EMOTICONS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock EMOTICONS { get { if (!_EMOTICONSReady) { _EMOTICONSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "EMOTICONS"); _EMOTICONSReady = true; } return _EMOTICONSContent; } }
             private static Java.Lang.Character.UnicodeBlock _EMOTICONSContent = default;
             private static bool _EMOTICONSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ENCLOSED_ALPHANUMERIC_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ENCLOSED_ALPHANUMERIC_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ENCLOSED_ALPHANUMERIC_SUPPLEMENT { get { if (!_ENCLOSED_ALPHANUMERIC_SUPPLEMENTReady) { _ENCLOSED_ALPHANUMERIC_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ENCLOSED_ALPHANUMERIC_SUPPLEMENT"); _ENCLOSED_ALPHANUMERIC_SUPPLEMENTReady = true; } return _ENCLOSED_ALPHANUMERIC_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _ENCLOSED_ALPHANUMERIC_SUPPLEMENTContent = default;
             private static bool _ENCLOSED_ALPHANUMERIC_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ENCLOSED_ALPHANUMERICS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ENCLOSED_ALPHANUMERICS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ENCLOSED_ALPHANUMERICS { get { if (!_ENCLOSED_ALPHANUMERICSReady) { _ENCLOSED_ALPHANUMERICSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ENCLOSED_ALPHANUMERICS"); _ENCLOSED_ALPHANUMERICSReady = true; } return _ENCLOSED_ALPHANUMERICSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ENCLOSED_ALPHANUMERICSContent = default;
             private static bool _ENCLOSED_ALPHANUMERICSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ENCLOSED_CJK_LETTERS_AND_MONTHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ENCLOSED_CJK_LETTERS_AND_MONTHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS { get { if (!_ENCLOSED_CJK_LETTERS_AND_MONTHSReady) { _ENCLOSED_CJK_LETTERS_AND_MONTHSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ENCLOSED_CJK_LETTERS_AND_MONTHS"); _ENCLOSED_CJK_LETTERS_AND_MONTHSReady = true; } return _ENCLOSED_CJK_LETTERS_AND_MONTHSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ENCLOSED_CJK_LETTERS_AND_MONTHSContent = default;
             private static bool _ENCLOSED_CJK_LETTERS_AND_MONTHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ENCLOSED_IDEOGRAPHIC_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ENCLOSED_IDEOGRAPHIC_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ENCLOSED_IDEOGRAPHIC_SUPPLEMENT { get { if (!_ENCLOSED_IDEOGRAPHIC_SUPPLEMENTReady) { _ENCLOSED_IDEOGRAPHIC_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ENCLOSED_IDEOGRAPHIC_SUPPLEMENT"); _ENCLOSED_IDEOGRAPHIC_SUPPLEMENTReady = true; } return _ENCLOSED_IDEOGRAPHIC_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _ENCLOSED_IDEOGRAPHIC_SUPPLEMENTContent = default;
             private static bool _ENCLOSED_IDEOGRAPHIC_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ETHIOPIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ETHIOPIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ETHIOPIC { get { if (!_ETHIOPICReady) { _ETHIOPICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ETHIOPIC"); _ETHIOPICReady = true; } return _ETHIOPICContent; } }
             private static Java.Lang.Character.UnicodeBlock _ETHIOPICContent = default;
             private static bool _ETHIOPICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ETHIOPIC_EXTENDED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ETHIOPIC_EXTENDED"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ETHIOPIC_EXTENDED { get { if (!_ETHIOPIC_EXTENDEDReady) { _ETHIOPIC_EXTENDEDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ETHIOPIC_EXTENDED"); _ETHIOPIC_EXTENDEDReady = true; } return _ETHIOPIC_EXTENDEDContent; } }
             private static Java.Lang.Character.UnicodeBlock _ETHIOPIC_EXTENDEDContent = default;
             private static bool _ETHIOPIC_EXTENDEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ETHIOPIC_EXTENDED_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ETHIOPIC_EXTENDED_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ETHIOPIC_EXTENDED_A { get { if (!_ETHIOPIC_EXTENDED_AReady) { _ETHIOPIC_EXTENDED_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ETHIOPIC_EXTENDED_A"); _ETHIOPIC_EXTENDED_AReady = true; } return _ETHIOPIC_EXTENDED_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _ETHIOPIC_EXTENDED_AContent = default;
             private static bool _ETHIOPIC_EXTENDED_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ETHIOPIC_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ETHIOPIC_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ETHIOPIC_SUPPLEMENT { get { if (!_ETHIOPIC_SUPPLEMENTReady) { _ETHIOPIC_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ETHIOPIC_SUPPLEMENT"); _ETHIOPIC_SUPPLEMENTReady = true; } return _ETHIOPIC_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _ETHIOPIC_SUPPLEMENTContent = default;
             private static bool _ETHIOPIC_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GENERAL_PUNCTUATION"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GENERAL_PUNCTUATION"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GENERAL_PUNCTUATION { get { if (!_GENERAL_PUNCTUATIONReady) { _GENERAL_PUNCTUATIONContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GENERAL_PUNCTUATION"); _GENERAL_PUNCTUATIONReady = true; } return _GENERAL_PUNCTUATIONContent; } }
             private static Java.Lang.Character.UnicodeBlock _GENERAL_PUNCTUATIONContent = default;
             private static bool _GENERAL_PUNCTUATIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GEOMETRIC_SHAPES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GEOMETRIC_SHAPES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GEOMETRIC_SHAPES { get { if (!_GEOMETRIC_SHAPESReady) { _GEOMETRIC_SHAPESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GEOMETRIC_SHAPES"); _GEOMETRIC_SHAPESReady = true; } return _GEOMETRIC_SHAPESContent; } }
             private static Java.Lang.Character.UnicodeBlock _GEOMETRIC_SHAPESContent = default;
             private static bool _GEOMETRIC_SHAPESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GEOMETRIC_SHAPES_EXTENDED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GEOMETRIC_SHAPES_EXTENDED"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GEOMETRIC_SHAPES_EXTENDED { get { if (!_GEOMETRIC_SHAPES_EXTENDEDReady) { _GEOMETRIC_SHAPES_EXTENDEDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GEOMETRIC_SHAPES_EXTENDED"); _GEOMETRIC_SHAPES_EXTENDEDReady = true; } return _GEOMETRIC_SHAPES_EXTENDEDContent; } }
             private static Java.Lang.Character.UnicodeBlock _GEOMETRIC_SHAPES_EXTENDEDContent = default;
             private static bool _GEOMETRIC_SHAPES_EXTENDEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GEORGIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GEORGIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GEORGIAN { get { if (!_GEORGIANReady) { _GEORGIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GEORGIAN"); _GEORGIANReady = true; } return _GEORGIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _GEORGIANContent = default;
             private static bool _GEORGIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GEORGIAN_EXTENDED"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock GEORGIAN_EXTENDED { get { if (!_GEORGIAN_EXTENDEDReady) { _GEORGIAN_EXTENDEDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GEORGIAN_EXTENDED"); _GEORGIAN_EXTENDEDReady = true; } return _GEORGIAN_EXTENDEDContent; } }
-            private static Java.Lang.Character.UnicodeBlock _GEORGIAN_EXTENDEDContent = default;
-            private static bool _GEORGIAN_EXTENDEDReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GEORGIAN_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GEORGIAN_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GEORGIAN_SUPPLEMENT { get { if (!_GEORGIAN_SUPPLEMENTReady) { _GEORGIAN_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GEORGIAN_SUPPLEMENT"); _GEORGIAN_SUPPLEMENTReady = true; } return _GEORGIAN_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _GEORGIAN_SUPPLEMENTContent = default;
             private static bool _GEORGIAN_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GLAGOLITIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GLAGOLITIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GLAGOLITIC { get { if (!_GLAGOLITICReady) { _GLAGOLITICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GLAGOLITIC"); _GLAGOLITICReady = true; } return _GLAGOLITICContent; } }
             private static Java.Lang.Character.UnicodeBlock _GLAGOLITICContent = default;
             private static bool _GLAGOLITICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GLAGOLITIC_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GLAGOLITIC_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GLAGOLITIC_SUPPLEMENT { get { if (!_GLAGOLITIC_SUPPLEMENTReady) { _GLAGOLITIC_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GLAGOLITIC_SUPPLEMENT"); _GLAGOLITIC_SUPPLEMENTReady = true; } return _GLAGOLITIC_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _GLAGOLITIC_SUPPLEMENTContent = default;
             private static bool _GLAGOLITIC_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GOTHIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GOTHIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GOTHIC { get { if (!_GOTHICReady) { _GOTHICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GOTHIC"); _GOTHICReady = true; } return _GOTHICContent; } }
             private static Java.Lang.Character.UnicodeBlock _GOTHICContent = default;
             private static bool _GOTHICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GRANTHA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GRANTHA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GRANTHA { get { if (!_GRANTHAReady) { _GRANTHAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GRANTHA"); _GRANTHAReady = true; } return _GRANTHAContent; } }
             private static Java.Lang.Character.UnicodeBlock _GRANTHAContent = default;
             private static bool _GRANTHAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GREEK"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GREEK"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GREEK { get { if (!_GREEKReady) { _GREEKContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GREEK"); _GREEKReady = true; } return _GREEKContent; } }
             private static Java.Lang.Character.UnicodeBlock _GREEKContent = default;
             private static bool _GREEKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GREEK_EXTENDED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GREEK_EXTENDED"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GREEK_EXTENDED { get { if (!_GREEK_EXTENDEDReady) { _GREEK_EXTENDEDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GREEK_EXTENDED"); _GREEK_EXTENDEDReady = true; } return _GREEK_EXTENDEDContent; } }
             private static Java.Lang.Character.UnicodeBlock _GREEK_EXTENDEDContent = default;
             private static bool _GREEK_EXTENDEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GUJARATI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GUJARATI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GUJARATI { get { if (!_GUJARATIReady) { _GUJARATIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GUJARATI"); _GUJARATIReady = true; } return _GUJARATIContent; } }
             private static Java.Lang.Character.UnicodeBlock _GUJARATIContent = default;
             private static bool _GUJARATIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GUNJALA_GONDI"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock GUNJALA_GONDI { get { if (!_GUNJALA_GONDIReady) { _GUNJALA_GONDIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GUNJALA_GONDI"); _GUNJALA_GONDIReady = true; } return _GUNJALA_GONDIContent; } }
-            private static Java.Lang.Character.UnicodeBlock _GUNJALA_GONDIContent = default;
-            private static bool _GUNJALA_GONDIReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#GURMUKHI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#GURMUKHI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock GURMUKHI { get { if (!_GURMUKHIReady) { _GURMUKHIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "GURMUKHI"); _GURMUKHIReady = true; } return _GURMUKHIContent; } }
             private static Java.Lang.Character.UnicodeBlock _GURMUKHIContent = default;
             private static bool _GURMUKHIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HALFWIDTH_AND_FULLWIDTH_FORMS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HALFWIDTH_AND_FULLWIDTH_FORMS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS { get { if (!_HALFWIDTH_AND_FULLWIDTH_FORMSReady) { _HALFWIDTH_AND_FULLWIDTH_FORMSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HALFWIDTH_AND_FULLWIDTH_FORMS"); _HALFWIDTH_AND_FULLWIDTH_FORMSReady = true; } return _HALFWIDTH_AND_FULLWIDTH_FORMSContent; } }
             private static Java.Lang.Character.UnicodeBlock _HALFWIDTH_AND_FULLWIDTH_FORMSContent = default;
             private static bool _HALFWIDTH_AND_FULLWIDTH_FORMSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HANGUL_COMPATIBILITY_JAMO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HANGUL_COMPATIBILITY_JAMO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HANGUL_COMPATIBILITY_JAMO { get { if (!_HANGUL_COMPATIBILITY_JAMOReady) { _HANGUL_COMPATIBILITY_JAMOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HANGUL_COMPATIBILITY_JAMO"); _HANGUL_COMPATIBILITY_JAMOReady = true; } return _HANGUL_COMPATIBILITY_JAMOContent; } }
             private static Java.Lang.Character.UnicodeBlock _HANGUL_COMPATIBILITY_JAMOContent = default;
             private static bool _HANGUL_COMPATIBILITY_JAMOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HANGUL_JAMO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HANGUL_JAMO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HANGUL_JAMO { get { if (!_HANGUL_JAMOReady) { _HANGUL_JAMOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HANGUL_JAMO"); _HANGUL_JAMOReady = true; } return _HANGUL_JAMOContent; } }
             private static Java.Lang.Character.UnicodeBlock _HANGUL_JAMOContent = default;
             private static bool _HANGUL_JAMOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HANGUL_JAMO_EXTENDED_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HANGUL_JAMO_EXTENDED_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HANGUL_JAMO_EXTENDED_A { get { if (!_HANGUL_JAMO_EXTENDED_AReady) { _HANGUL_JAMO_EXTENDED_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HANGUL_JAMO_EXTENDED_A"); _HANGUL_JAMO_EXTENDED_AReady = true; } return _HANGUL_JAMO_EXTENDED_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _HANGUL_JAMO_EXTENDED_AContent = default;
             private static bool _HANGUL_JAMO_EXTENDED_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HANGUL_JAMO_EXTENDED_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HANGUL_JAMO_EXTENDED_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HANGUL_JAMO_EXTENDED_B { get { if (!_HANGUL_JAMO_EXTENDED_BReady) { _HANGUL_JAMO_EXTENDED_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HANGUL_JAMO_EXTENDED_B"); _HANGUL_JAMO_EXTENDED_BReady = true; } return _HANGUL_JAMO_EXTENDED_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _HANGUL_JAMO_EXTENDED_BContent = default;
             private static bool _HANGUL_JAMO_EXTENDED_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HANGUL_SYLLABLES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HANGUL_SYLLABLES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HANGUL_SYLLABLES { get { if (!_HANGUL_SYLLABLESReady) { _HANGUL_SYLLABLESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HANGUL_SYLLABLES"); _HANGUL_SYLLABLESReady = true; } return _HANGUL_SYLLABLESContent; } }
             private static Java.Lang.Character.UnicodeBlock _HANGUL_SYLLABLESContent = default;
             private static bool _HANGUL_SYLLABLESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HANIFI_ROHINGYA"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock HANIFI_ROHINGYA { get { if (!_HANIFI_ROHINGYAReady) { _HANIFI_ROHINGYAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HANIFI_ROHINGYA"); _HANIFI_ROHINGYAReady = true; } return _HANIFI_ROHINGYAContent; } }
-            private static Java.Lang.Character.UnicodeBlock _HANIFI_ROHINGYAContent = default;
-            private static bool _HANIFI_ROHINGYAReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HANUNOO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HANUNOO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HANUNOO { get { if (!_HANUNOOReady) { _HANUNOOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HANUNOO"); _HANUNOOReady = true; } return _HANUNOOContent; } }
             private static Java.Lang.Character.UnicodeBlock _HANUNOOContent = default;
             private static bool _HANUNOOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HATRAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HATRAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HATRAN { get { if (!_HATRANReady) { _HATRANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HATRAN"); _HATRANReady = true; } return _HATRANContent; } }
             private static Java.Lang.Character.UnicodeBlock _HATRANContent = default;
             private static bool _HATRANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HEBREW"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HEBREW"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HEBREW { get { if (!_HEBREWReady) { _HEBREWContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HEBREW"); _HEBREWReady = true; } return _HEBREWContent; } }
             private static Java.Lang.Character.UnicodeBlock _HEBREWContent = default;
             private static bool _HEBREWReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HIGH_PRIVATE_USE_SURROGATES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HIGH_PRIVATE_USE_SURROGATES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HIGH_PRIVATE_USE_SURROGATES { get { if (!_HIGH_PRIVATE_USE_SURROGATESReady) { _HIGH_PRIVATE_USE_SURROGATESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HIGH_PRIVATE_USE_SURROGATES"); _HIGH_PRIVATE_USE_SURROGATESReady = true; } return _HIGH_PRIVATE_USE_SURROGATESContent; } }
             private static Java.Lang.Character.UnicodeBlock _HIGH_PRIVATE_USE_SURROGATESContent = default;
             private static bool _HIGH_PRIVATE_USE_SURROGATESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HIGH_SURROGATES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HIGH_SURROGATES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HIGH_SURROGATES { get { if (!_HIGH_SURROGATESReady) { _HIGH_SURROGATESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HIGH_SURROGATES"); _HIGH_SURROGATESReady = true; } return _HIGH_SURROGATESContent; } }
             private static Java.Lang.Character.UnicodeBlock _HIGH_SURROGATESContent = default;
             private static bool _HIGH_SURROGATESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#HIRAGANA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#HIRAGANA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock HIRAGANA { get { if (!_HIRAGANAReady) { _HIRAGANAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "HIRAGANA"); _HIRAGANAReady = true; } return _HIRAGANAContent; } }
             private static Java.Lang.Character.UnicodeBlock _HIRAGANAContent = default;
             private static bool _HIRAGANAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#IDEOGRAPHIC_DESCRIPTION_CHARACTERS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#IDEOGRAPHIC_DESCRIPTION_CHARACTERS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS { get { if (!_IDEOGRAPHIC_DESCRIPTION_CHARACTERSReady) { _IDEOGRAPHIC_DESCRIPTION_CHARACTERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "IDEOGRAPHIC_DESCRIPTION_CHARACTERS"); _IDEOGRAPHIC_DESCRIPTION_CHARACTERSReady = true; } return _IDEOGRAPHIC_DESCRIPTION_CHARACTERSContent; } }
             private static Java.Lang.Character.UnicodeBlock _IDEOGRAPHIC_DESCRIPTION_CHARACTERSContent = default;
             private static bool _IDEOGRAPHIC_DESCRIPTION_CHARACTERSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION { get { if (!_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATIONReady) { _IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATIONContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION"); _IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATIONReady = true; } return _IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATIONContent; } }
             private static Java.Lang.Character.UnicodeBlock _IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATIONContent = default;
             private static bool _IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#IMPERIAL_ARAMAIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#IMPERIAL_ARAMAIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock IMPERIAL_ARAMAIC { get { if (!_IMPERIAL_ARAMAICReady) { _IMPERIAL_ARAMAICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "IMPERIAL_ARAMAIC"); _IMPERIAL_ARAMAICReady = true; } return _IMPERIAL_ARAMAICContent; } }
             private static Java.Lang.Character.UnicodeBlock _IMPERIAL_ARAMAICContent = default;
             private static bool _IMPERIAL_ARAMAICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#INDIC_SIYAQ_NUMBERS"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock INDIC_SIYAQ_NUMBERS { get { if (!_INDIC_SIYAQ_NUMBERSReady) { _INDIC_SIYAQ_NUMBERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "INDIC_SIYAQ_NUMBERS"); _INDIC_SIYAQ_NUMBERSReady = true; } return _INDIC_SIYAQ_NUMBERSContent; } }
-            private static Java.Lang.Character.UnicodeBlock _INDIC_SIYAQ_NUMBERSContent = default;
-            private static bool _INDIC_SIYAQ_NUMBERSReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#INSCRIPTIONAL_PAHLAVI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#INSCRIPTIONAL_PAHLAVI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock INSCRIPTIONAL_PAHLAVI { get { if (!_INSCRIPTIONAL_PAHLAVIReady) { _INSCRIPTIONAL_PAHLAVIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "INSCRIPTIONAL_PAHLAVI"); _INSCRIPTIONAL_PAHLAVIReady = true; } return _INSCRIPTIONAL_PAHLAVIContent; } }
             private static Java.Lang.Character.UnicodeBlock _INSCRIPTIONAL_PAHLAVIContent = default;
             private static bool _INSCRIPTIONAL_PAHLAVIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#INSCRIPTIONAL_PARTHIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#INSCRIPTIONAL_PARTHIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock INSCRIPTIONAL_PARTHIAN { get { if (!_INSCRIPTIONAL_PARTHIANReady) { _INSCRIPTIONAL_PARTHIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "INSCRIPTIONAL_PARTHIAN"); _INSCRIPTIONAL_PARTHIANReady = true; } return _INSCRIPTIONAL_PARTHIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _INSCRIPTIONAL_PARTHIANContent = default;
             private static bool _INSCRIPTIONAL_PARTHIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#IPA_EXTENSIONS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#IPA_EXTENSIONS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock IPA_EXTENSIONS { get { if (!_IPA_EXTENSIONSReady) { _IPA_EXTENSIONSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "IPA_EXTENSIONS"); _IPA_EXTENSIONSReady = true; } return _IPA_EXTENSIONSContent; } }
             private static Java.Lang.Character.UnicodeBlock _IPA_EXTENSIONSContent = default;
             private static bool _IPA_EXTENSIONSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#JAVANESE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#JAVANESE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock JAVANESE { get { if (!_JAVANESEReady) { _JAVANESEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "JAVANESE"); _JAVANESEReady = true; } return _JAVANESEContent; } }
             private static Java.Lang.Character.UnicodeBlock _JAVANESEContent = default;
             private static bool _JAVANESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KAITHI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KAITHI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KAITHI { get { if (!_KAITHIReady) { _KAITHIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KAITHI"); _KAITHIReady = true; } return _KAITHIContent; } }
             private static Java.Lang.Character.UnicodeBlock _KAITHIContent = default;
             private static bool _KAITHIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KANA_EXTENDED_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KANA_EXTENDED_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KANA_EXTENDED_A { get { if (!_KANA_EXTENDED_AReady) { _KANA_EXTENDED_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KANA_EXTENDED_A"); _KANA_EXTENDED_AReady = true; } return _KANA_EXTENDED_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _KANA_EXTENDED_AContent = default;
             private static bool _KANA_EXTENDED_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KANA_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KANA_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KANA_SUPPLEMENT { get { if (!_KANA_SUPPLEMENTReady) { _KANA_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KANA_SUPPLEMENT"); _KANA_SUPPLEMENTReady = true; } return _KANA_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _KANA_SUPPLEMENTContent = default;
             private static bool _KANA_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KANBUN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KANBUN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KANBUN { get { if (!_KANBUNReady) { _KANBUNContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KANBUN"); _KANBUNReady = true; } return _KANBUNContent; } }
             private static Java.Lang.Character.UnicodeBlock _KANBUNContent = default;
             private static bool _KANBUNReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KANGXI_RADICALS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KANGXI_RADICALS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KANGXI_RADICALS { get { if (!_KANGXI_RADICALSReady) { _KANGXI_RADICALSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KANGXI_RADICALS"); _KANGXI_RADICALSReady = true; } return _KANGXI_RADICALSContent; } }
             private static Java.Lang.Character.UnicodeBlock _KANGXI_RADICALSContent = default;
             private static bool _KANGXI_RADICALSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KANNADA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KANNADA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KANNADA { get { if (!_KANNADAReady) { _KANNADAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KANNADA"); _KANNADAReady = true; } return _KANNADAContent; } }
             private static Java.Lang.Character.UnicodeBlock _KANNADAContent = default;
             private static bool _KANNADAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KATAKANA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KATAKANA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KATAKANA { get { if (!_KATAKANAReady) { _KATAKANAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KATAKANA"); _KATAKANAReady = true; } return _KATAKANAContent; } }
             private static Java.Lang.Character.UnicodeBlock _KATAKANAContent = default;
             private static bool _KATAKANAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KATAKANA_PHONETIC_EXTENSIONS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KATAKANA_PHONETIC_EXTENSIONS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS { get { if (!_KATAKANA_PHONETIC_EXTENSIONSReady) { _KATAKANA_PHONETIC_EXTENSIONSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KATAKANA_PHONETIC_EXTENSIONS"); _KATAKANA_PHONETIC_EXTENSIONSReady = true; } return _KATAKANA_PHONETIC_EXTENSIONSContent; } }
             private static Java.Lang.Character.UnicodeBlock _KATAKANA_PHONETIC_EXTENSIONSContent = default;
             private static bool _KATAKANA_PHONETIC_EXTENSIONSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KAYAH_LI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KAYAH_LI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KAYAH_LI { get { if (!_KAYAH_LIReady) { _KAYAH_LIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KAYAH_LI"); _KAYAH_LIReady = true; } return _KAYAH_LIContent; } }
             private static Java.Lang.Character.UnicodeBlock _KAYAH_LIContent = default;
             private static bool _KAYAH_LIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KHAROSHTHI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KHAROSHTHI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KHAROSHTHI { get { if (!_KHAROSHTHIReady) { _KHAROSHTHIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KHAROSHTHI"); _KHAROSHTHIReady = true; } return _KHAROSHTHIContent; } }
             private static Java.Lang.Character.UnicodeBlock _KHAROSHTHIContent = default;
             private static bool _KHAROSHTHIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KHITAN_SMALL_SCRIPT"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock KHITAN_SMALL_SCRIPT { get { if (!_KHITAN_SMALL_SCRIPTReady) { _KHITAN_SMALL_SCRIPTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KHITAN_SMALL_SCRIPT"); _KHITAN_SMALL_SCRIPTReady = true; } return _KHITAN_SMALL_SCRIPTContent; } }
-            private static Java.Lang.Character.UnicodeBlock _KHITAN_SMALL_SCRIPTContent = default;
-            private static bool _KHITAN_SMALL_SCRIPTReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KHMER"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KHMER"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KHMER { get { if (!_KHMERReady) { _KHMERContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KHMER"); _KHMERReady = true; } return _KHMERContent; } }
             private static Java.Lang.Character.UnicodeBlock _KHMERContent = default;
             private static bool _KHMERReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KHMER_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KHMER_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KHMER_SYMBOLS { get { if (!_KHMER_SYMBOLSReady) { _KHMER_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KHMER_SYMBOLS"); _KHMER_SYMBOLSReady = true; } return _KHMER_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _KHMER_SYMBOLSContent = default;
             private static bool _KHMER_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KHOJKI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KHOJKI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KHOJKI { get { if (!_KHOJKIReady) { _KHOJKIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KHOJKI"); _KHOJKIReady = true; } return _KHOJKIContent; } }
             private static Java.Lang.Character.UnicodeBlock _KHOJKIContent = default;
             private static bool _KHOJKIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#KHUDAWADI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#KHUDAWADI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock KHUDAWADI { get { if (!_KHUDAWADIReady) { _KHUDAWADIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "KHUDAWADI"); _KHUDAWADIReady = true; } return _KHUDAWADIContent; } }
             private static Java.Lang.Character.UnicodeBlock _KHUDAWADIContent = default;
             private static bool _KHUDAWADIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LAO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LAO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LAO { get { if (!_LAOReady) { _LAOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LAO"); _LAOReady = true; } return _LAOContent; } }
             private static Java.Lang.Character.UnicodeBlock _LAOContent = default;
             private static bool _LAOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LATIN_1_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LATIN_1_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LATIN_1_SUPPLEMENT { get { if (!_LATIN_1_SUPPLEMENTReady) { _LATIN_1_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LATIN_1_SUPPLEMENT"); _LATIN_1_SUPPLEMENTReady = true; } return _LATIN_1_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _LATIN_1_SUPPLEMENTContent = default;
             private static bool _LATIN_1_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LATIN_EXTENDED_A { get { if (!_LATIN_EXTENDED_AReady) { _LATIN_EXTENDED_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LATIN_EXTENDED_A"); _LATIN_EXTENDED_AReady = true; } return _LATIN_EXTENDED_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _LATIN_EXTENDED_AContent = default;
             private static bool _LATIN_EXTENDED_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_ADDITIONAL"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_ADDITIONAL"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LATIN_EXTENDED_ADDITIONAL { get { if (!_LATIN_EXTENDED_ADDITIONALReady) { _LATIN_EXTENDED_ADDITIONALContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LATIN_EXTENDED_ADDITIONAL"); _LATIN_EXTENDED_ADDITIONALReady = true; } return _LATIN_EXTENDED_ADDITIONALContent; } }
             private static Java.Lang.Character.UnicodeBlock _LATIN_EXTENDED_ADDITIONALContent = default;
             private static bool _LATIN_EXTENDED_ADDITIONALReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LATIN_EXTENDED_B { get { if (!_LATIN_EXTENDED_BReady) { _LATIN_EXTENDED_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LATIN_EXTENDED_B"); _LATIN_EXTENDED_BReady = true; } return _LATIN_EXTENDED_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _LATIN_EXTENDED_BContent = default;
             private static bool _LATIN_EXTENDED_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_C"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_C"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LATIN_EXTENDED_C { get { if (!_LATIN_EXTENDED_CReady) { _LATIN_EXTENDED_CContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LATIN_EXTENDED_C"); _LATIN_EXTENDED_CReady = true; } return _LATIN_EXTENDED_CContent; } }
             private static Java.Lang.Character.UnicodeBlock _LATIN_EXTENDED_CContent = default;
             private static bool _LATIN_EXTENDED_CReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_D"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_D"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LATIN_EXTENDED_D { get { if (!_LATIN_EXTENDED_DReady) { _LATIN_EXTENDED_DContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LATIN_EXTENDED_D"); _LATIN_EXTENDED_DReady = true; } return _LATIN_EXTENDED_DContent; } }
             private static Java.Lang.Character.UnicodeBlock _LATIN_EXTENDED_DContent = default;
             private static bool _LATIN_EXTENDED_DReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_E"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LATIN_EXTENDED_E"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LATIN_EXTENDED_E { get { if (!_LATIN_EXTENDED_EReady) { _LATIN_EXTENDED_EContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LATIN_EXTENDED_E"); _LATIN_EXTENDED_EReady = true; } return _LATIN_EXTENDED_EContent; } }
             private static Java.Lang.Character.UnicodeBlock _LATIN_EXTENDED_EContent = default;
             private static bool _LATIN_EXTENDED_EReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LEPCHA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LEPCHA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LEPCHA { get { if (!_LEPCHAReady) { _LEPCHAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LEPCHA"); _LEPCHAReady = true; } return _LEPCHAContent; } }
             private static Java.Lang.Character.UnicodeBlock _LEPCHAContent = default;
             private static bool _LEPCHAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LETTERLIKE_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LETTERLIKE_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LETTERLIKE_SYMBOLS { get { if (!_LETTERLIKE_SYMBOLSReady) { _LETTERLIKE_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LETTERLIKE_SYMBOLS"); _LETTERLIKE_SYMBOLSReady = true; } return _LETTERLIKE_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _LETTERLIKE_SYMBOLSContent = default;
             private static bool _LETTERLIKE_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LIMBU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LIMBU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LIMBU { get { if (!_LIMBUReady) { _LIMBUContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LIMBU"); _LIMBUReady = true; } return _LIMBUContent; } }
             private static Java.Lang.Character.UnicodeBlock _LIMBUContent = default;
             private static bool _LIMBUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LINEAR_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LINEAR_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LINEAR_A { get { if (!_LINEAR_AReady) { _LINEAR_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LINEAR_A"); _LINEAR_AReady = true; } return _LINEAR_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _LINEAR_AContent = default;
             private static bool _LINEAR_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LINEAR_B_IDEOGRAMS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LINEAR_B_IDEOGRAMS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LINEAR_B_IDEOGRAMS { get { if (!_LINEAR_B_IDEOGRAMSReady) { _LINEAR_B_IDEOGRAMSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LINEAR_B_IDEOGRAMS"); _LINEAR_B_IDEOGRAMSReady = true; } return _LINEAR_B_IDEOGRAMSContent; } }
             private static Java.Lang.Character.UnicodeBlock _LINEAR_B_IDEOGRAMSContent = default;
             private static bool _LINEAR_B_IDEOGRAMSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LINEAR_B_SYLLABARY"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LINEAR_B_SYLLABARY"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LINEAR_B_SYLLABARY { get { if (!_LINEAR_B_SYLLABARYReady) { _LINEAR_B_SYLLABARYContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LINEAR_B_SYLLABARY"); _LINEAR_B_SYLLABARYReady = true; } return _LINEAR_B_SYLLABARYContent; } }
             private static Java.Lang.Character.UnicodeBlock _LINEAR_B_SYLLABARYContent = default;
             private static bool _LINEAR_B_SYLLABARYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LISU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LISU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LISU { get { if (!_LISUReady) { _LISUContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LISU"); _LISUReady = true; } return _LISUContent; } }
             private static Java.Lang.Character.UnicodeBlock _LISUContent = default;
             private static bool _LISUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LISU_SUPPLEMENT"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock LISU_SUPPLEMENT { get { if (!_LISU_SUPPLEMENTReady) { _LISU_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LISU_SUPPLEMENT"); _LISU_SUPPLEMENTReady = true; } return _LISU_SUPPLEMENTContent; } }
-            private static Java.Lang.Character.UnicodeBlock _LISU_SUPPLEMENTContent = default;
-            private static bool _LISU_SUPPLEMENTReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LOW_SURROGATES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LOW_SURROGATES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LOW_SURROGATES { get { if (!_LOW_SURROGATESReady) { _LOW_SURROGATESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LOW_SURROGATES"); _LOW_SURROGATESReady = true; } return _LOW_SURROGATESContent; } }
             private static Java.Lang.Character.UnicodeBlock _LOW_SURROGATESContent = default;
             private static bool _LOW_SURROGATESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LYCIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LYCIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LYCIAN { get { if (!_LYCIANReady) { _LYCIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LYCIAN"); _LYCIANReady = true; } return _LYCIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _LYCIANContent = default;
             private static bool _LYCIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#LYDIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#LYDIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock LYDIAN { get { if (!_LYDIANReady) { _LYDIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "LYDIAN"); _LYDIANReady = true; } return _LYDIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _LYDIANContent = default;
             private static bool _LYDIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MAHAJANI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MAHAJANI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MAHAJANI { get { if (!_MAHAJANIReady) { _MAHAJANIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MAHAJANI"); _MAHAJANIReady = true; } return _MAHAJANIContent; } }
             private static Java.Lang.Character.UnicodeBlock _MAHAJANIContent = default;
             private static bool _MAHAJANIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MAHJONG_TILES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MAHJONG_TILES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MAHJONG_TILES { get { if (!_MAHJONG_TILESReady) { _MAHJONG_TILESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MAHJONG_TILES"); _MAHJONG_TILESReady = true; } return _MAHJONG_TILESContent; } }
             private static Java.Lang.Character.UnicodeBlock _MAHJONG_TILESContent = default;
             private static bool _MAHJONG_TILESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MAKASAR"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock MAKASAR { get { if (!_MAKASARReady) { _MAKASARContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MAKASAR"); _MAKASARReady = true; } return _MAKASARContent; } }
-            private static Java.Lang.Character.UnicodeBlock _MAKASARContent = default;
-            private static bool _MAKASARReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MALAYALAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MALAYALAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MALAYALAM { get { if (!_MALAYALAMReady) { _MALAYALAMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MALAYALAM"); _MALAYALAMReady = true; } return _MALAYALAMContent; } }
             private static Java.Lang.Character.UnicodeBlock _MALAYALAMContent = default;
             private static bool _MALAYALAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MANDAIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MANDAIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MANDAIC { get { if (!_MANDAICReady) { _MANDAICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MANDAIC"); _MANDAICReady = true; } return _MANDAICContent; } }
             private static Java.Lang.Character.UnicodeBlock _MANDAICContent = default;
             private static bool _MANDAICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MANICHAEAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MANICHAEAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MANICHAEAN { get { if (!_MANICHAEANReady) { _MANICHAEANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MANICHAEAN"); _MANICHAEANReady = true; } return _MANICHAEANContent; } }
             private static Java.Lang.Character.UnicodeBlock _MANICHAEANContent = default;
             private static bool _MANICHAEANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MARCHEN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MARCHEN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MARCHEN { get { if (!_MARCHENReady) { _MARCHENContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MARCHEN"); _MARCHENReady = true; } return _MARCHENContent; } }
             private static Java.Lang.Character.UnicodeBlock _MARCHENContent = default;
             private static bool _MARCHENReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MASARAM_GONDI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MASARAM_GONDI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MASARAM_GONDI { get { if (!_MASARAM_GONDIReady) { _MASARAM_GONDIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MASARAM_GONDI"); _MASARAM_GONDIReady = true; } return _MASARAM_GONDIContent; } }
             private static Java.Lang.Character.UnicodeBlock _MASARAM_GONDIContent = default;
             private static bool _MASARAM_GONDIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MATHEMATICAL_ALPHANUMERIC_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MATHEMATICAL_ALPHANUMERIC_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS { get { if (!_MATHEMATICAL_ALPHANUMERIC_SYMBOLSReady) { _MATHEMATICAL_ALPHANUMERIC_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MATHEMATICAL_ALPHANUMERIC_SYMBOLS"); _MATHEMATICAL_ALPHANUMERIC_SYMBOLSReady = true; } return _MATHEMATICAL_ALPHANUMERIC_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MATHEMATICAL_ALPHANUMERIC_SYMBOLSContent = default;
             private static bool _MATHEMATICAL_ALPHANUMERIC_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MATHEMATICAL_OPERATORS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MATHEMATICAL_OPERATORS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MATHEMATICAL_OPERATORS { get { if (!_MATHEMATICAL_OPERATORSReady) { _MATHEMATICAL_OPERATORSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MATHEMATICAL_OPERATORS"); _MATHEMATICAL_OPERATORSReady = true; } return _MATHEMATICAL_OPERATORSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MATHEMATICAL_OPERATORSContent = default;
             private static bool _MATHEMATICAL_OPERATORSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MAYAN_NUMERALS"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock MAYAN_NUMERALS { get { if (!_MAYAN_NUMERALSReady) { _MAYAN_NUMERALSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MAYAN_NUMERALS"); _MAYAN_NUMERALSReady = true; } return _MAYAN_NUMERALSContent; } }
-            private static Java.Lang.Character.UnicodeBlock _MAYAN_NUMERALSContent = default;
-            private static bool _MAYAN_NUMERALSReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MEDEFAIDRIN"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock MEDEFAIDRIN { get { if (!_MEDEFAIDRINReady) { _MEDEFAIDRINContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MEDEFAIDRIN"); _MEDEFAIDRINReady = true; } return _MEDEFAIDRINContent; } }
-            private static Java.Lang.Character.UnicodeBlock _MEDEFAIDRINContent = default;
-            private static bool _MEDEFAIDRINReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MEETEI_MAYEK"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MEETEI_MAYEK"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MEETEI_MAYEK { get { if (!_MEETEI_MAYEKReady) { _MEETEI_MAYEKContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MEETEI_MAYEK"); _MEETEI_MAYEKReady = true; } return _MEETEI_MAYEKContent; } }
             private static Java.Lang.Character.UnicodeBlock _MEETEI_MAYEKContent = default;
             private static bool _MEETEI_MAYEKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MEETEI_MAYEK_EXTENSIONS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MEETEI_MAYEK_EXTENSIONS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MEETEI_MAYEK_EXTENSIONS { get { if (!_MEETEI_MAYEK_EXTENSIONSReady) { _MEETEI_MAYEK_EXTENSIONSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MEETEI_MAYEK_EXTENSIONS"); _MEETEI_MAYEK_EXTENSIONSReady = true; } return _MEETEI_MAYEK_EXTENSIONSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MEETEI_MAYEK_EXTENSIONSContent = default;
             private static bool _MEETEI_MAYEK_EXTENSIONSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MENDE_KIKAKUI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MENDE_KIKAKUI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MENDE_KIKAKUI { get { if (!_MENDE_KIKAKUIReady) { _MENDE_KIKAKUIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MENDE_KIKAKUI"); _MENDE_KIKAKUIReady = true; } return _MENDE_KIKAKUIContent; } }
             private static Java.Lang.Character.UnicodeBlock _MENDE_KIKAKUIContent = default;
             private static bool _MENDE_KIKAKUIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MEROITIC_CURSIVE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MEROITIC_CURSIVE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MEROITIC_CURSIVE { get { if (!_MEROITIC_CURSIVEReady) { _MEROITIC_CURSIVEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MEROITIC_CURSIVE"); _MEROITIC_CURSIVEReady = true; } return _MEROITIC_CURSIVEContent; } }
             private static Java.Lang.Character.UnicodeBlock _MEROITIC_CURSIVEContent = default;
             private static bool _MEROITIC_CURSIVEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MEROITIC_HIEROGLYPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MEROITIC_HIEROGLYPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MEROITIC_HIEROGLYPHS { get { if (!_MEROITIC_HIEROGLYPHSReady) { _MEROITIC_HIEROGLYPHSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MEROITIC_HIEROGLYPHS"); _MEROITIC_HIEROGLYPHSReady = true; } return _MEROITIC_HIEROGLYPHSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MEROITIC_HIEROGLYPHSContent = default;
             private static bool _MEROITIC_HIEROGLYPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MIAO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MIAO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MIAO { get { if (!_MIAOReady) { _MIAOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MIAO"); _MIAOReady = true; } return _MIAOContent; } }
             private static Java.Lang.Character.UnicodeBlock _MIAOContent = default;
             private static bool _MIAOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A { get { if (!_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_AReady) { _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A"); _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_AReady = true; } return _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_AContent = default;
             private static bool _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B { get { if (!_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_BReady) { _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B"); _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_BReady = true; } return _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_BContent = default;
             private static bool _MISCELLANEOUS_MATHEMATICAL_SYMBOLS_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS { get { if (!_MISCELLANEOUS_SYMBOLSReady) { _MISCELLANEOUS_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MISCELLANEOUS_SYMBOLS"); _MISCELLANEOUS_SYMBOLSReady = true; } return _MISCELLANEOUS_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MISCELLANEOUS_SYMBOLSContent = default;
             private static bool _MISCELLANEOUS_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_SYMBOLS_AND_ARROWS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_SYMBOLS_AND_ARROWS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS { get { if (!_MISCELLANEOUS_SYMBOLS_AND_ARROWSReady) { _MISCELLANEOUS_SYMBOLS_AND_ARROWSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MISCELLANEOUS_SYMBOLS_AND_ARROWS"); _MISCELLANEOUS_SYMBOLS_AND_ARROWSReady = true; } return _MISCELLANEOUS_SYMBOLS_AND_ARROWSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MISCELLANEOUS_SYMBOLS_AND_ARROWSContent = default;
             private static bool _MISCELLANEOUS_SYMBOLS_AND_ARROWSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS { get { if (!_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHSReady) { _MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS"); _MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHSReady = true; } return _MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHSContent = default;
             private static bool _MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_TECHNICAL"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MISCELLANEOUS_TECHNICAL"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MISCELLANEOUS_TECHNICAL { get { if (!_MISCELLANEOUS_TECHNICALReady) { _MISCELLANEOUS_TECHNICALContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MISCELLANEOUS_TECHNICAL"); _MISCELLANEOUS_TECHNICALReady = true; } return _MISCELLANEOUS_TECHNICALContent; } }
             private static Java.Lang.Character.UnicodeBlock _MISCELLANEOUS_TECHNICALContent = default;
             private static bool _MISCELLANEOUS_TECHNICALReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MODI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MODI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MODI { get { if (!_MODIReady) { _MODIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MODI"); _MODIReady = true; } return _MODIContent; } }
             private static Java.Lang.Character.UnicodeBlock _MODIContent = default;
             private static bool _MODIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MODIFIER_TONE_LETTERS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MODIFIER_TONE_LETTERS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MODIFIER_TONE_LETTERS { get { if (!_MODIFIER_TONE_LETTERSReady) { _MODIFIER_TONE_LETTERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MODIFIER_TONE_LETTERS"); _MODIFIER_TONE_LETTERSReady = true; } return _MODIFIER_TONE_LETTERSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MODIFIER_TONE_LETTERSContent = default;
             private static bool _MODIFIER_TONE_LETTERSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MONGOLIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MONGOLIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MONGOLIAN { get { if (!_MONGOLIANReady) { _MONGOLIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MONGOLIAN"); _MONGOLIANReady = true; } return _MONGOLIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _MONGOLIANContent = default;
             private static bool _MONGOLIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MONGOLIAN_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MONGOLIAN_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MONGOLIAN_SUPPLEMENT { get { if (!_MONGOLIAN_SUPPLEMENTReady) { _MONGOLIAN_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MONGOLIAN_SUPPLEMENT"); _MONGOLIAN_SUPPLEMENTReady = true; } return _MONGOLIAN_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _MONGOLIAN_SUPPLEMENTContent = default;
             private static bool _MONGOLIAN_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MRO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MRO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MRO { get { if (!_MROReady) { _MROContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MRO"); _MROReady = true; } return _MROContent; } }
             private static Java.Lang.Character.UnicodeBlock _MROContent = default;
             private static bool _MROReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MULTANI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MULTANI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MULTANI { get { if (!_MULTANIReady) { _MULTANIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MULTANI"); _MULTANIReady = true; } return _MULTANIContent; } }
             private static Java.Lang.Character.UnicodeBlock _MULTANIContent = default;
             private static bool _MULTANIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MUSICAL_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MUSICAL_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MUSICAL_SYMBOLS { get { if (!_MUSICAL_SYMBOLSReady) { _MUSICAL_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MUSICAL_SYMBOLS"); _MUSICAL_SYMBOLSReady = true; } return _MUSICAL_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _MUSICAL_SYMBOLSContent = default;
             private static bool _MUSICAL_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MYANMAR"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MYANMAR"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MYANMAR { get { if (!_MYANMARReady) { _MYANMARContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MYANMAR"); _MYANMARReady = true; } return _MYANMARContent; } }
             private static Java.Lang.Character.UnicodeBlock _MYANMARContent = default;
             private static bool _MYANMARReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MYANMAR_EXTENDED_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MYANMAR_EXTENDED_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MYANMAR_EXTENDED_A { get { if (!_MYANMAR_EXTENDED_AReady) { _MYANMAR_EXTENDED_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MYANMAR_EXTENDED_A"); _MYANMAR_EXTENDED_AReady = true; } return _MYANMAR_EXTENDED_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _MYANMAR_EXTENDED_AContent = default;
             private static bool _MYANMAR_EXTENDED_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#MYANMAR_EXTENDED_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#MYANMAR_EXTENDED_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock MYANMAR_EXTENDED_B { get { if (!_MYANMAR_EXTENDED_BReady) { _MYANMAR_EXTENDED_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "MYANMAR_EXTENDED_B"); _MYANMAR_EXTENDED_BReady = true; } return _MYANMAR_EXTENDED_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _MYANMAR_EXTENDED_BContent = default;
             private static bool _MYANMAR_EXTENDED_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#NABATAEAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#NABATAEAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock NABATAEAN { get { if (!_NABATAEANReady) { _NABATAEANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "NABATAEAN"); _NABATAEANReady = true; } return _NABATAEANContent; } }
             private static Java.Lang.Character.UnicodeBlock _NABATAEANContent = default;
             private static bool _NABATAEANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#NANDINAGARI"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock NANDINAGARI { get { if (!_NANDINAGARIReady) { _NANDINAGARIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "NANDINAGARI"); _NANDINAGARIReady = true; } return _NANDINAGARIContent; } }
-            private static Java.Lang.Character.UnicodeBlock _NANDINAGARIContent = default;
-            private static bool _NANDINAGARIReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#NEW_TAI_LUE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#NEW_TAI_LUE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock NEW_TAI_LUE { get { if (!_NEW_TAI_LUEReady) { _NEW_TAI_LUEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "NEW_TAI_LUE"); _NEW_TAI_LUEReady = true; } return _NEW_TAI_LUEContent; } }
             private static Java.Lang.Character.UnicodeBlock _NEW_TAI_LUEContent = default;
             private static bool _NEW_TAI_LUEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#NEWA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#NEWA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock NEWA { get { if (!_NEWAReady) { _NEWAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "NEWA"); _NEWAReady = true; } return _NEWAContent; } }
             private static Java.Lang.Character.UnicodeBlock _NEWAContent = default;
             private static bool _NEWAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#NKO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#NKO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock NKO { get { if (!_NKOReady) { _NKOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "NKO"); _NKOReady = true; } return _NKOContent; } }
             private static Java.Lang.Character.UnicodeBlock _NKOContent = default;
             private static bool _NKOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#NUMBER_FORMS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#NUMBER_FORMS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock NUMBER_FORMS { get { if (!_NUMBER_FORMSReady) { _NUMBER_FORMSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "NUMBER_FORMS"); _NUMBER_FORMSReady = true; } return _NUMBER_FORMSContent; } }
             private static Java.Lang.Character.UnicodeBlock _NUMBER_FORMSContent = default;
             private static bool _NUMBER_FORMSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#NUSHU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#NUSHU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock NUSHU { get { if (!_NUSHUReady) { _NUSHUContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "NUSHU"); _NUSHUReady = true; } return _NUSHUContent; } }
             private static Java.Lang.Character.UnicodeBlock _NUSHUContent = default;
             private static bool _NUSHUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#NYIAKENG_PUACHUE_HMONG"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock NYIAKENG_PUACHUE_HMONG { get { if (!_NYIAKENG_PUACHUE_HMONGReady) { _NYIAKENG_PUACHUE_HMONGContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "NYIAKENG_PUACHUE_HMONG"); _NYIAKENG_PUACHUE_HMONGReady = true; } return _NYIAKENG_PUACHUE_HMONGContent; } }
-            private static Java.Lang.Character.UnicodeBlock _NYIAKENG_PUACHUE_HMONGContent = default;
-            private static bool _NYIAKENG_PUACHUE_HMONGReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OGHAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OGHAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OGHAM { get { if (!_OGHAMReady) { _OGHAMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OGHAM"); _OGHAMReady = true; } return _OGHAMContent; } }
             private static Java.Lang.Character.UnicodeBlock _OGHAMContent = default;
             private static bool _OGHAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OL_CHIKI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OL_CHIKI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OL_CHIKI { get { if (!_OL_CHIKIReady) { _OL_CHIKIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OL_CHIKI"); _OL_CHIKIReady = true; } return _OL_CHIKIContent; } }
             private static Java.Lang.Character.UnicodeBlock _OL_CHIKIContent = default;
             private static bool _OL_CHIKIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OLD_HUNGARIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OLD_HUNGARIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OLD_HUNGARIAN { get { if (!_OLD_HUNGARIANReady) { _OLD_HUNGARIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OLD_HUNGARIAN"); _OLD_HUNGARIANReady = true; } return _OLD_HUNGARIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _OLD_HUNGARIANContent = default;
             private static bool _OLD_HUNGARIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OLD_ITALIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OLD_ITALIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OLD_ITALIC { get { if (!_OLD_ITALICReady) { _OLD_ITALICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OLD_ITALIC"); _OLD_ITALICReady = true; } return _OLD_ITALICContent; } }
             private static Java.Lang.Character.UnicodeBlock _OLD_ITALICContent = default;
             private static bool _OLD_ITALICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OLD_NORTH_ARABIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OLD_NORTH_ARABIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OLD_NORTH_ARABIAN { get { if (!_OLD_NORTH_ARABIANReady) { _OLD_NORTH_ARABIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OLD_NORTH_ARABIAN"); _OLD_NORTH_ARABIANReady = true; } return _OLD_NORTH_ARABIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _OLD_NORTH_ARABIANContent = default;
             private static bool _OLD_NORTH_ARABIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OLD_PERMIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OLD_PERMIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OLD_PERMIC { get { if (!_OLD_PERMICReady) { _OLD_PERMICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OLD_PERMIC"); _OLD_PERMICReady = true; } return _OLD_PERMICContent; } }
             private static Java.Lang.Character.UnicodeBlock _OLD_PERMICContent = default;
             private static bool _OLD_PERMICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OLD_PERSIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OLD_PERSIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OLD_PERSIAN { get { if (!_OLD_PERSIANReady) { _OLD_PERSIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OLD_PERSIAN"); _OLD_PERSIANReady = true; } return _OLD_PERSIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _OLD_PERSIANContent = default;
             private static bool _OLD_PERSIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OLD_SOGDIAN"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock OLD_SOGDIAN { get { if (!_OLD_SOGDIANReady) { _OLD_SOGDIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OLD_SOGDIAN"); _OLD_SOGDIANReady = true; } return _OLD_SOGDIANContent; } }
-            private static Java.Lang.Character.UnicodeBlock _OLD_SOGDIANContent = default;
-            private static bool _OLD_SOGDIANReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OLD_SOUTH_ARABIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OLD_SOUTH_ARABIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OLD_SOUTH_ARABIAN { get { if (!_OLD_SOUTH_ARABIANReady) { _OLD_SOUTH_ARABIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OLD_SOUTH_ARABIAN"); _OLD_SOUTH_ARABIANReady = true; } return _OLD_SOUTH_ARABIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _OLD_SOUTH_ARABIANContent = default;
             private static bool _OLD_SOUTH_ARABIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OLD_TURKIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OLD_TURKIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OLD_TURKIC { get { if (!_OLD_TURKICReady) { _OLD_TURKICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OLD_TURKIC"); _OLD_TURKICReady = true; } return _OLD_TURKICContent; } }
             private static Java.Lang.Character.UnicodeBlock _OLD_TURKICContent = default;
             private static bool _OLD_TURKICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OPTICAL_CHARACTER_RECOGNITION"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OPTICAL_CHARACTER_RECOGNITION"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OPTICAL_CHARACTER_RECOGNITION { get { if (!_OPTICAL_CHARACTER_RECOGNITIONReady) { _OPTICAL_CHARACTER_RECOGNITIONContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OPTICAL_CHARACTER_RECOGNITION"); _OPTICAL_CHARACTER_RECOGNITIONReady = true; } return _OPTICAL_CHARACTER_RECOGNITIONContent; } }
             private static Java.Lang.Character.UnicodeBlock _OPTICAL_CHARACTER_RECOGNITIONContent = default;
             private static bool _OPTICAL_CHARACTER_RECOGNITIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ORIYA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ORIYA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ORIYA { get { if (!_ORIYAReady) { _ORIYAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ORIYA"); _ORIYAReady = true; } return _ORIYAContent; } }
             private static Java.Lang.Character.UnicodeBlock _ORIYAContent = default;
             private static bool _ORIYAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ORNAMENTAL_DINGBATS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ORNAMENTAL_DINGBATS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ORNAMENTAL_DINGBATS { get { if (!_ORNAMENTAL_DINGBATSReady) { _ORNAMENTAL_DINGBATSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ORNAMENTAL_DINGBATS"); _ORNAMENTAL_DINGBATSReady = true; } return _ORNAMENTAL_DINGBATSContent; } }
             private static Java.Lang.Character.UnicodeBlock _ORNAMENTAL_DINGBATSContent = default;
             private static bool _ORNAMENTAL_DINGBATSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OSAGE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OSAGE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OSAGE { get { if (!_OSAGEReady) { _OSAGEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OSAGE"); _OSAGEReady = true; } return _OSAGEContent; } }
             private static Java.Lang.Character.UnicodeBlock _OSAGEContent = default;
             private static bool _OSAGEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OSMANYA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#OSMANYA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock OSMANYA { get { if (!_OSMANYAReady) { _OSMANYAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OSMANYA"); _OSMANYAReady = true; } return _OSMANYAContent; } }
             private static Java.Lang.Character.UnicodeBlock _OSMANYAContent = default;
             private static bool _OSMANYAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#OTTOMAN_SIYAQ_NUMBERS"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock OTTOMAN_SIYAQ_NUMBERS { get { if (!_OTTOMAN_SIYAQ_NUMBERSReady) { _OTTOMAN_SIYAQ_NUMBERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "OTTOMAN_SIYAQ_NUMBERS"); _OTTOMAN_SIYAQ_NUMBERSReady = true; } return _OTTOMAN_SIYAQ_NUMBERSContent; } }
-            private static Java.Lang.Character.UnicodeBlock _OTTOMAN_SIYAQ_NUMBERSContent = default;
-            private static bool _OTTOMAN_SIYAQ_NUMBERSReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PAHAWH_HMONG"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PAHAWH_HMONG"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PAHAWH_HMONG { get { if (!_PAHAWH_HMONGReady) { _PAHAWH_HMONGContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PAHAWH_HMONG"); _PAHAWH_HMONGReady = true; } return _PAHAWH_HMONGContent; } }
             private static Java.Lang.Character.UnicodeBlock _PAHAWH_HMONGContent = default;
             private static bool _PAHAWH_HMONGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PALMYRENE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PALMYRENE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PALMYRENE { get { if (!_PALMYRENEReady) { _PALMYRENEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PALMYRENE"); _PALMYRENEReady = true; } return _PALMYRENEContent; } }
             private static Java.Lang.Character.UnicodeBlock _PALMYRENEContent = default;
             private static bool _PALMYRENEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PAU_CIN_HAU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PAU_CIN_HAU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PAU_CIN_HAU { get { if (!_PAU_CIN_HAUReady) { _PAU_CIN_HAUContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PAU_CIN_HAU"); _PAU_CIN_HAUReady = true; } return _PAU_CIN_HAUContent; } }
             private static Java.Lang.Character.UnicodeBlock _PAU_CIN_HAUContent = default;
             private static bool _PAU_CIN_HAUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PHAGS_PA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PHAGS_PA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PHAGS_PA { get { if (!_PHAGS_PAReady) { _PHAGS_PAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PHAGS_PA"); _PHAGS_PAReady = true; } return _PHAGS_PAContent; } }
             private static Java.Lang.Character.UnicodeBlock _PHAGS_PAContent = default;
             private static bool _PHAGS_PAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PHAISTOS_DISC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PHAISTOS_DISC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PHAISTOS_DISC { get { if (!_PHAISTOS_DISCReady) { _PHAISTOS_DISCContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PHAISTOS_DISC"); _PHAISTOS_DISCReady = true; } return _PHAISTOS_DISCContent; } }
             private static Java.Lang.Character.UnicodeBlock _PHAISTOS_DISCContent = default;
             private static bool _PHAISTOS_DISCReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PHOENICIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PHOENICIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PHOENICIAN { get { if (!_PHOENICIANReady) { _PHOENICIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PHOENICIAN"); _PHOENICIANReady = true; } return _PHOENICIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _PHOENICIANContent = default;
             private static bool _PHOENICIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PHONETIC_EXTENSIONS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PHONETIC_EXTENSIONS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PHONETIC_EXTENSIONS { get { if (!_PHONETIC_EXTENSIONSReady) { _PHONETIC_EXTENSIONSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PHONETIC_EXTENSIONS"); _PHONETIC_EXTENSIONSReady = true; } return _PHONETIC_EXTENSIONSContent; } }
             private static Java.Lang.Character.UnicodeBlock _PHONETIC_EXTENSIONSContent = default;
             private static bool _PHONETIC_EXTENSIONSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PHONETIC_EXTENSIONS_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PHONETIC_EXTENSIONS_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PHONETIC_EXTENSIONS_SUPPLEMENT { get { if (!_PHONETIC_EXTENSIONS_SUPPLEMENTReady) { _PHONETIC_EXTENSIONS_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PHONETIC_EXTENSIONS_SUPPLEMENT"); _PHONETIC_EXTENSIONS_SUPPLEMENTReady = true; } return _PHONETIC_EXTENSIONS_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _PHONETIC_EXTENSIONS_SUPPLEMENTContent = default;
             private static bool _PHONETIC_EXTENSIONS_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PLAYING_CARDS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PLAYING_CARDS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PLAYING_CARDS { get { if (!_PLAYING_CARDSReady) { _PLAYING_CARDSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PLAYING_CARDS"); _PLAYING_CARDSReady = true; } return _PLAYING_CARDSContent; } }
             private static Java.Lang.Character.UnicodeBlock _PLAYING_CARDSContent = default;
             private static bool _PLAYING_CARDSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PRIVATE_USE_AREA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PRIVATE_USE_AREA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PRIVATE_USE_AREA { get { if (!_PRIVATE_USE_AREAReady) { _PRIVATE_USE_AREAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PRIVATE_USE_AREA"); _PRIVATE_USE_AREAReady = true; } return _PRIVATE_USE_AREAContent; } }
             private static Java.Lang.Character.UnicodeBlock _PRIVATE_USE_AREAContent = default;
             private static bool _PRIVATE_USE_AREAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#PSALTER_PAHLAVI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#PSALTER_PAHLAVI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock PSALTER_PAHLAVI { get { if (!_PSALTER_PAHLAVIReady) { _PSALTER_PAHLAVIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "PSALTER_PAHLAVI"); _PSALTER_PAHLAVIReady = true; } return _PSALTER_PAHLAVIContent; } }
             private static Java.Lang.Character.UnicodeBlock _PSALTER_PAHLAVIContent = default;
             private static bool _PSALTER_PAHLAVIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#REJANG"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#REJANG"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock REJANG { get { if (!_REJANGReady) { _REJANGContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "REJANG"); _REJANGReady = true; } return _REJANGContent; } }
             private static Java.Lang.Character.UnicodeBlock _REJANGContent = default;
             private static bool _REJANGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#RUMI_NUMERAL_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#RUMI_NUMERAL_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock RUMI_NUMERAL_SYMBOLS { get { if (!_RUMI_NUMERAL_SYMBOLSReady) { _RUMI_NUMERAL_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "RUMI_NUMERAL_SYMBOLS"); _RUMI_NUMERAL_SYMBOLSReady = true; } return _RUMI_NUMERAL_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _RUMI_NUMERAL_SYMBOLSContent = default;
             private static bool _RUMI_NUMERAL_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#RUNIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#RUNIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock RUNIC { get { if (!_RUNICReady) { _RUNICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "RUNIC"); _RUNICReady = true; } return _RUNICContent; } }
             private static Java.Lang.Character.UnicodeBlock _RUNICContent = default;
             private static bool _RUNICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SAMARITAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SAMARITAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SAMARITAN { get { if (!_SAMARITANReady) { _SAMARITANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SAMARITAN"); _SAMARITANReady = true; } return _SAMARITANContent; } }
             private static Java.Lang.Character.UnicodeBlock _SAMARITANContent = default;
             private static bool _SAMARITANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SAURASHTRA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SAURASHTRA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SAURASHTRA { get { if (!_SAURASHTRAReady) { _SAURASHTRAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SAURASHTRA"); _SAURASHTRAReady = true; } return _SAURASHTRAContent; } }
             private static Java.Lang.Character.UnicodeBlock _SAURASHTRAContent = default;
             private static bool _SAURASHTRAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SHARADA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SHARADA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SHARADA { get { if (!_SHARADAReady) { _SHARADAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SHARADA"); _SHARADAReady = true; } return _SHARADAContent; } }
             private static Java.Lang.Character.UnicodeBlock _SHARADAContent = default;
             private static bool _SHARADAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SHAVIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SHAVIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SHAVIAN { get { if (!_SHAVIANReady) { _SHAVIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SHAVIAN"); _SHAVIANReady = true; } return _SHAVIANContent; } }
             private static Java.Lang.Character.UnicodeBlock _SHAVIANContent = default;
             private static bool _SHAVIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SHORTHAND_FORMAT_CONTROLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SHORTHAND_FORMAT_CONTROLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SHORTHAND_FORMAT_CONTROLS { get { if (!_SHORTHAND_FORMAT_CONTROLSReady) { _SHORTHAND_FORMAT_CONTROLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SHORTHAND_FORMAT_CONTROLS"); _SHORTHAND_FORMAT_CONTROLSReady = true; } return _SHORTHAND_FORMAT_CONTROLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _SHORTHAND_FORMAT_CONTROLSContent = default;
             private static bool _SHORTHAND_FORMAT_CONTROLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SIDDHAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SIDDHAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SIDDHAM { get { if (!_SIDDHAMReady) { _SIDDHAMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SIDDHAM"); _SIDDHAMReady = true; } return _SIDDHAMContent; } }
             private static Java.Lang.Character.UnicodeBlock _SIDDHAMContent = default;
             private static bool _SIDDHAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SINHALA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SINHALA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SINHALA { get { if (!_SINHALAReady) { _SINHALAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SINHALA"); _SINHALAReady = true; } return _SINHALAContent; } }
             private static Java.Lang.Character.UnicodeBlock _SINHALAContent = default;
             private static bool _SINHALAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SINHALA_ARCHAIC_NUMBERS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SINHALA_ARCHAIC_NUMBERS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SINHALA_ARCHAIC_NUMBERS { get { if (!_SINHALA_ARCHAIC_NUMBERSReady) { _SINHALA_ARCHAIC_NUMBERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SINHALA_ARCHAIC_NUMBERS"); _SINHALA_ARCHAIC_NUMBERSReady = true; } return _SINHALA_ARCHAIC_NUMBERSContent; } }
             private static Java.Lang.Character.UnicodeBlock _SINHALA_ARCHAIC_NUMBERSContent = default;
             private static bool _SINHALA_ARCHAIC_NUMBERSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SMALL_FORM_VARIANTS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SMALL_FORM_VARIANTS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SMALL_FORM_VARIANTS { get { if (!_SMALL_FORM_VARIANTSReady) { _SMALL_FORM_VARIANTSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SMALL_FORM_VARIANTS"); _SMALL_FORM_VARIANTSReady = true; } return _SMALL_FORM_VARIANTSContent; } }
             private static Java.Lang.Character.UnicodeBlock _SMALL_FORM_VARIANTSContent = default;
             private static bool _SMALL_FORM_VARIANTSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SMALL_KANA_EXTENSION"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock SMALL_KANA_EXTENSION { get { if (!_SMALL_KANA_EXTENSIONReady) { _SMALL_KANA_EXTENSIONContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SMALL_KANA_EXTENSION"); _SMALL_KANA_EXTENSIONReady = true; } return _SMALL_KANA_EXTENSIONContent; } }
-            private static Java.Lang.Character.UnicodeBlock _SMALL_KANA_EXTENSIONContent = default;
-            private static bool _SMALL_KANA_EXTENSIONReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SOGDIAN"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock SOGDIAN { get { if (!_SOGDIANReady) { _SOGDIANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SOGDIAN"); _SOGDIANReady = true; } return _SOGDIANContent; } }
-            private static Java.Lang.Character.UnicodeBlock _SOGDIANContent = default;
-            private static bool _SOGDIANReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SORA_SOMPENG"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SORA_SOMPENG"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SORA_SOMPENG { get { if (!_SORA_SOMPENGReady) { _SORA_SOMPENGContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SORA_SOMPENG"); _SORA_SOMPENGReady = true; } return _SORA_SOMPENGContent; } }
             private static Java.Lang.Character.UnicodeBlock _SORA_SOMPENGContent = default;
             private static bool _SORA_SOMPENGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SOYOMBO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SOYOMBO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SOYOMBO { get { if (!_SOYOMBOReady) { _SOYOMBOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SOYOMBO"); _SOYOMBOReady = true; } return _SOYOMBOContent; } }
             private static Java.Lang.Character.UnicodeBlock _SOYOMBOContent = default;
             private static bool _SOYOMBOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SPACING_MODIFIER_LETTERS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SPACING_MODIFIER_LETTERS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SPACING_MODIFIER_LETTERS { get { if (!_SPACING_MODIFIER_LETTERSReady) { _SPACING_MODIFIER_LETTERSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SPACING_MODIFIER_LETTERS"); _SPACING_MODIFIER_LETTERSReady = true; } return _SPACING_MODIFIER_LETTERSContent; } }
             private static Java.Lang.Character.UnicodeBlock _SPACING_MODIFIER_LETTERSContent = default;
             private static bool _SPACING_MODIFIER_LETTERSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SPECIALS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SPECIALS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SPECIALS { get { if (!_SPECIALSReady) { _SPECIALSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SPECIALS"); _SPECIALSReady = true; } return _SPECIALSContent; } }
             private static Java.Lang.Character.UnicodeBlock _SPECIALSContent = default;
             private static bool _SPECIALSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUNDANESE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUNDANESE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUNDANESE { get { if (!_SUNDANESEReady) { _SUNDANESEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUNDANESE"); _SUNDANESEReady = true; } return _SUNDANESEContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUNDANESEContent = default;
             private static bool _SUNDANESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUNDANESE_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUNDANESE_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUNDANESE_SUPPLEMENT { get { if (!_SUNDANESE_SUPPLEMENTReady) { _SUNDANESE_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUNDANESE_SUPPLEMENT"); _SUNDANESE_SUPPLEMENTReady = true; } return _SUNDANESE_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUNDANESE_SUPPLEMENTContent = default;
             private static bool _SUNDANESE_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPERSCRIPTS_AND_SUBSCRIPTS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPERSCRIPTS_AND_SUBSCRIPTS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS { get { if (!_SUPERSCRIPTS_AND_SUBSCRIPTSReady) { _SUPERSCRIPTS_AND_SUBSCRIPTSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPERSCRIPTS_AND_SUBSCRIPTS"); _SUPERSCRIPTS_AND_SUBSCRIPTSReady = true; } return _SUPERSCRIPTS_AND_SUBSCRIPTSContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPERSCRIPTS_AND_SUBSCRIPTSContent = default;
             private static bool _SUPERSCRIPTS_AND_SUBSCRIPTSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_ARROWS_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_ARROWS_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPPLEMENTAL_ARROWS_A { get { if (!_SUPPLEMENTAL_ARROWS_AReady) { _SUPPLEMENTAL_ARROWS_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPPLEMENTAL_ARROWS_A"); _SUPPLEMENTAL_ARROWS_AReady = true; } return _SUPPLEMENTAL_ARROWS_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPPLEMENTAL_ARROWS_AContent = default;
             private static bool _SUPPLEMENTAL_ARROWS_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_ARROWS_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_ARROWS_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPPLEMENTAL_ARROWS_B { get { if (!_SUPPLEMENTAL_ARROWS_BReady) { _SUPPLEMENTAL_ARROWS_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPPLEMENTAL_ARROWS_B"); _SUPPLEMENTAL_ARROWS_BReady = true; } return _SUPPLEMENTAL_ARROWS_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPPLEMENTAL_ARROWS_BContent = default;
             private static bool _SUPPLEMENTAL_ARROWS_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_ARROWS_C"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_ARROWS_C"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPPLEMENTAL_ARROWS_C { get { if (!_SUPPLEMENTAL_ARROWS_CReady) { _SUPPLEMENTAL_ARROWS_CContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPPLEMENTAL_ARROWS_C"); _SUPPLEMENTAL_ARROWS_CReady = true; } return _SUPPLEMENTAL_ARROWS_CContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPPLEMENTAL_ARROWS_CContent = default;
             private static bool _SUPPLEMENTAL_ARROWS_CReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_MATHEMATICAL_OPERATORS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_MATHEMATICAL_OPERATORS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS { get { if (!_SUPPLEMENTAL_MATHEMATICAL_OPERATORSReady) { _SUPPLEMENTAL_MATHEMATICAL_OPERATORSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPPLEMENTAL_MATHEMATICAL_OPERATORS"); _SUPPLEMENTAL_MATHEMATICAL_OPERATORSReady = true; } return _SUPPLEMENTAL_MATHEMATICAL_OPERATORSContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPPLEMENTAL_MATHEMATICAL_OPERATORSContent = default;
             private static bool _SUPPLEMENTAL_MATHEMATICAL_OPERATORSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_PUNCTUATION"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_PUNCTUATION"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPPLEMENTAL_PUNCTUATION { get { if (!_SUPPLEMENTAL_PUNCTUATIONReady) { _SUPPLEMENTAL_PUNCTUATIONContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPPLEMENTAL_PUNCTUATION"); _SUPPLEMENTAL_PUNCTUATIONReady = true; } return _SUPPLEMENTAL_PUNCTUATIONContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPPLEMENTAL_PUNCTUATIONContent = default;
             private static bool _SUPPLEMENTAL_PUNCTUATIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS { get { if (!_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHSReady) { _SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS"); _SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHSReady = true; } return _SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHSContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHSContent = default;
             private static bool _SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPPLEMENTARY_PRIVATE_USE_AREA_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPPLEMENTARY_PRIVATE_USE_AREA_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A { get { if (!_SUPPLEMENTARY_PRIVATE_USE_AREA_AReady) { _SUPPLEMENTARY_PRIVATE_USE_AREA_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPPLEMENTARY_PRIVATE_USE_AREA_A"); _SUPPLEMENTARY_PRIVATE_USE_AREA_AReady = true; } return _SUPPLEMENTARY_PRIVATE_USE_AREA_AContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPPLEMENTARY_PRIVATE_USE_AREA_AContent = default;
             private static bool _SUPPLEMENTARY_PRIVATE_USE_AREA_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUPPLEMENTARY_PRIVATE_USE_AREA_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUPPLEMENTARY_PRIVATE_USE_AREA_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B { get { if (!_SUPPLEMENTARY_PRIVATE_USE_AREA_BReady) { _SUPPLEMENTARY_PRIVATE_USE_AREA_BContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUPPLEMENTARY_PRIVATE_USE_AREA_B"); _SUPPLEMENTARY_PRIVATE_USE_AREA_BReady = true; } return _SUPPLEMENTARY_PRIVATE_USE_AREA_BContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUPPLEMENTARY_PRIVATE_USE_AREA_BContent = default;
             private static bool _SUPPLEMENTARY_PRIVATE_USE_AREA_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SURROGATES_AREA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SURROGATES_AREA"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Lang.Character.UnicodeBlock SURROGATES_AREA { get { if (!_SURROGATES_AREAReady) { _SURROGATES_AREAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SURROGATES_AREA"); _SURROGATES_AREAReady = true; } return _SURROGATES_AREAContent; } }
             private static Java.Lang.Character.UnicodeBlock _SURROGATES_AREAContent = default;
             private static bool _SURROGATES_AREAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SUTTON_SIGNWRITING"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SUTTON_SIGNWRITING"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SUTTON_SIGNWRITING { get { if (!_SUTTON_SIGNWRITINGReady) { _SUTTON_SIGNWRITINGContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SUTTON_SIGNWRITING"); _SUTTON_SIGNWRITINGReady = true; } return _SUTTON_SIGNWRITINGContent; } }
             private static Java.Lang.Character.UnicodeBlock _SUTTON_SIGNWRITINGContent = default;
             private static bool _SUTTON_SIGNWRITINGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SYLOTI_NAGRI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SYLOTI_NAGRI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SYLOTI_NAGRI { get { if (!_SYLOTI_NAGRIReady) { _SYLOTI_NAGRIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SYLOTI_NAGRI"); _SYLOTI_NAGRIReady = true; } return _SYLOTI_NAGRIContent; } }
             private static Java.Lang.Character.UnicodeBlock _SYLOTI_NAGRIContent = default;
             private static bool _SYLOTI_NAGRIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SYMBOLS_AND_PICTOGRAPHS_EXTENDED_A"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock SYMBOLS_AND_PICTOGRAPHS_EXTENDED_A { get { if (!_SYMBOLS_AND_PICTOGRAPHS_EXTENDED_AReady) { _SYMBOLS_AND_PICTOGRAPHS_EXTENDED_AContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SYMBOLS_AND_PICTOGRAPHS_EXTENDED_A"); _SYMBOLS_AND_PICTOGRAPHS_EXTENDED_AReady = true; } return _SYMBOLS_AND_PICTOGRAPHS_EXTENDED_AContent; } }
-            private static Java.Lang.Character.UnicodeBlock _SYMBOLS_AND_PICTOGRAPHS_EXTENDED_AContent = default;
-            private static bool _SYMBOLS_AND_PICTOGRAPHS_EXTENDED_AReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SYMBOLS_FOR_LEGACY_COMPUTING"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock SYMBOLS_FOR_LEGACY_COMPUTING { get { if (!_SYMBOLS_FOR_LEGACY_COMPUTINGReady) { _SYMBOLS_FOR_LEGACY_COMPUTINGContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SYMBOLS_FOR_LEGACY_COMPUTING"); _SYMBOLS_FOR_LEGACY_COMPUTINGReady = true; } return _SYMBOLS_FOR_LEGACY_COMPUTINGContent; } }
-            private static Java.Lang.Character.UnicodeBlock _SYMBOLS_FOR_LEGACY_COMPUTINGContent = default;
-            private static bool _SYMBOLS_FOR_LEGACY_COMPUTINGReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SYRIAC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SYRIAC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SYRIAC { get { if (!_SYRIACReady) { _SYRIACContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SYRIAC"); _SYRIACReady = true; } return _SYRIACContent; } }
             private static Java.Lang.Character.UnicodeBlock _SYRIACContent = default;
             private static bool _SYRIACReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#SYRIAC_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#SYRIAC_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock SYRIAC_SUPPLEMENT { get { if (!_SYRIAC_SUPPLEMENTReady) { _SYRIAC_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "SYRIAC_SUPPLEMENT"); _SYRIAC_SUPPLEMENTReady = true; } return _SYRIAC_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _SYRIAC_SUPPLEMENTContent = default;
             private static bool _SYRIAC_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAGALOG"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAGALOG"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAGALOG { get { if (!_TAGALOGReady) { _TAGALOGContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAGALOG"); _TAGALOGReady = true; } return _TAGALOGContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAGALOGContent = default;
             private static bool _TAGALOGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAGBANWA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAGBANWA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAGBANWA { get { if (!_TAGBANWAReady) { _TAGBANWAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAGBANWA"); _TAGBANWAReady = true; } return _TAGBANWAContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAGBANWAContent = default;
             private static bool _TAGBANWAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAGS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAGS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAGS { get { if (!_TAGSReady) { _TAGSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAGS"); _TAGSReady = true; } return _TAGSContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAGSContent = default;
             private static bool _TAGSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAI_LE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAI_LE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAI_LE { get { if (!_TAI_LEReady) { _TAI_LEContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAI_LE"); _TAI_LEReady = true; } return _TAI_LEContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAI_LEContent = default;
             private static bool _TAI_LEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAI_THAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAI_THAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAI_THAM { get { if (!_TAI_THAMReady) { _TAI_THAMContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAI_THAM"); _TAI_THAMReady = true; } return _TAI_THAMContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAI_THAMContent = default;
             private static bool _TAI_THAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAI_VIET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAI_VIET"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAI_VIET { get { if (!_TAI_VIETReady) { _TAI_VIETContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAI_VIET"); _TAI_VIETReady = true; } return _TAI_VIETContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAI_VIETContent = default;
             private static bool _TAI_VIETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAI_XUAN_JING_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAI_XUAN_JING_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAI_XUAN_JING_SYMBOLS { get { if (!_TAI_XUAN_JING_SYMBOLSReady) { _TAI_XUAN_JING_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAI_XUAN_JING_SYMBOLS"); _TAI_XUAN_JING_SYMBOLSReady = true; } return _TAI_XUAN_JING_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAI_XUAN_JING_SYMBOLSContent = default;
             private static bool _TAI_XUAN_JING_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAKRI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAKRI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAKRI { get { if (!_TAKRIReady) { _TAKRIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAKRI"); _TAKRIReady = true; } return _TAKRIContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAKRIContent = default;
             private static bool _TAKRIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAMIL"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TAMIL"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TAMIL { get { if (!_TAMILReady) { _TAMILContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAMIL"); _TAMILReady = true; } return _TAMILContent; } }
             private static Java.Lang.Character.UnicodeBlock _TAMILContent = default;
             private static bool _TAMILReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TAMIL_SUPPLEMENT"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock TAMIL_SUPPLEMENT { get { if (!_TAMIL_SUPPLEMENTReady) { _TAMIL_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TAMIL_SUPPLEMENT"); _TAMIL_SUPPLEMENTReady = true; } return _TAMIL_SUPPLEMENTContent; } }
-            private static Java.Lang.Character.UnicodeBlock _TAMIL_SUPPLEMENTContent = default;
-            private static bool _TAMIL_SUPPLEMENTReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TANGUT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TANGUT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TANGUT { get { if (!_TANGUTReady) { _TANGUTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TANGUT"); _TANGUTReady = true; } return _TANGUTContent; } }
             private static Java.Lang.Character.UnicodeBlock _TANGUTContent = default;
             private static bool _TANGUTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TANGUT_COMPONENTS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TANGUT_COMPONENTS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TANGUT_COMPONENTS { get { if (!_TANGUT_COMPONENTSReady) { _TANGUT_COMPONENTSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TANGUT_COMPONENTS"); _TANGUT_COMPONENTSReady = true; } return _TANGUT_COMPONENTSContent; } }
             private static Java.Lang.Character.UnicodeBlock _TANGUT_COMPONENTSContent = default;
             private static bool _TANGUT_COMPONENTSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TANGUT_SUPPLEMENT"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock TANGUT_SUPPLEMENT { get { if (!_TANGUT_SUPPLEMENTReady) { _TANGUT_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TANGUT_SUPPLEMENT"); _TANGUT_SUPPLEMENTReady = true; } return _TANGUT_SUPPLEMENTContent; } }
-            private static Java.Lang.Character.UnicodeBlock _TANGUT_SUPPLEMENTContent = default;
-            private static bool _TANGUT_SUPPLEMENTReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TELUGU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TELUGU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TELUGU { get { if (!_TELUGUReady) { _TELUGUContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TELUGU"); _TELUGUReady = true; } return _TELUGUContent; } }
             private static Java.Lang.Character.UnicodeBlock _TELUGUContent = default;
             private static bool _TELUGUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#THAANA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#THAANA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock THAANA { get { if (!_THAANAReady) { _THAANAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "THAANA"); _THAANAReady = true; } return _THAANAContent; } }
             private static Java.Lang.Character.UnicodeBlock _THAANAContent = default;
             private static bool _THAANAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#THAI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#THAI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock THAI { get { if (!_THAIReady) { _THAIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "THAI"); _THAIReady = true; } return _THAIContent; } }
             private static Java.Lang.Character.UnicodeBlock _THAIContent = default;
             private static bool _THAIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TIBETAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TIBETAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TIBETAN { get { if (!_TIBETANReady) { _TIBETANContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TIBETAN"); _TIBETANReady = true; } return _TIBETANContent; } }
             private static Java.Lang.Character.UnicodeBlock _TIBETANContent = default;
             private static bool _TIBETANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TIFINAGH"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TIFINAGH"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TIFINAGH { get { if (!_TIFINAGHReady) { _TIFINAGHContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TIFINAGH"); _TIFINAGHReady = true; } return _TIFINAGHContent; } }
             private static Java.Lang.Character.UnicodeBlock _TIFINAGHContent = default;
             private static bool _TIFINAGHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TIRHUTA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TIRHUTA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TIRHUTA { get { if (!_TIRHUTAReady) { _TIRHUTAContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TIRHUTA"); _TIRHUTAReady = true; } return _TIRHUTAContent; } }
             private static Java.Lang.Character.UnicodeBlock _TIRHUTAContent = default;
             private static bool _TIRHUTAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#TRANSPORT_AND_MAP_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#TRANSPORT_AND_MAP_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock TRANSPORT_AND_MAP_SYMBOLS { get { if (!_TRANSPORT_AND_MAP_SYMBOLSReady) { _TRANSPORT_AND_MAP_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "TRANSPORT_AND_MAP_SYMBOLS"); _TRANSPORT_AND_MAP_SYMBOLSReady = true; } return _TRANSPORT_AND_MAP_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _TRANSPORT_AND_MAP_SYMBOLSContent = default;
             private static bool _TRANSPORT_AND_MAP_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#UGARITIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#UGARITIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock UGARITIC { get { if (!_UGARITICReady) { _UGARITICContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "UGARITIC"); _UGARITICReady = true; } return _UGARITICContent; } }
             private static Java.Lang.Character.UnicodeBlock _UGARITICContent = default;
             private static bool _UGARITICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS { get { if (!_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICSReady) { _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS"); _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICSReady = true; } return _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICSContent; } }
             private static Java.Lang.Character.UnicodeBlock _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICSContent = default;
             private static bool _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED { get { if (!_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDEDReady) { _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDEDContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED"); _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDEDReady = true; } return _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDEDContent; } }
             private static Java.Lang.Character.UnicodeBlock _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDEDContent = default;
             private static bool _UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#VAI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#VAI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock VAI { get { if (!_VAIReady) { _VAIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "VAI"); _VAIReady = true; } return _VAIContent; } }
             private static Java.Lang.Character.UnicodeBlock _VAIContent = default;
             private static bool _VAIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#VARIATION_SELECTORS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#VARIATION_SELECTORS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock VARIATION_SELECTORS { get { if (!_VARIATION_SELECTORSReady) { _VARIATION_SELECTORSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "VARIATION_SELECTORS"); _VARIATION_SELECTORSReady = true; } return _VARIATION_SELECTORSContent; } }
             private static Java.Lang.Character.UnicodeBlock _VARIATION_SELECTORSContent = default;
             private static bool _VARIATION_SELECTORSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#VARIATION_SELECTORS_SUPPLEMENT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#VARIATION_SELECTORS_SUPPLEMENT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT { get { if (!_VARIATION_SELECTORS_SUPPLEMENTReady) { _VARIATION_SELECTORS_SUPPLEMENTContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "VARIATION_SELECTORS_SUPPLEMENT"); _VARIATION_SELECTORS_SUPPLEMENTReady = true; } return _VARIATION_SELECTORS_SUPPLEMENTContent; } }
             private static Java.Lang.Character.UnicodeBlock _VARIATION_SELECTORS_SUPPLEMENTContent = default;
             private static bool _VARIATION_SELECTORS_SUPPLEMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#VEDIC_EXTENSIONS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#VEDIC_EXTENSIONS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock VEDIC_EXTENSIONS { get { if (!_VEDIC_EXTENSIONSReady) { _VEDIC_EXTENSIONSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "VEDIC_EXTENSIONS"); _VEDIC_EXTENSIONSReady = true; } return _VEDIC_EXTENSIONSContent; } }
             private static Java.Lang.Character.UnicodeBlock _VEDIC_EXTENSIONSContent = default;
             private static bool _VEDIC_EXTENSIONSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#VERTICAL_FORMS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#VERTICAL_FORMS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock VERTICAL_FORMS { get { if (!_VERTICAL_FORMSReady) { _VERTICAL_FORMSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "VERTICAL_FORMS"); _VERTICAL_FORMSReady = true; } return _VERTICAL_FORMSContent; } }
             private static Java.Lang.Character.UnicodeBlock _VERTICAL_FORMSContent = default;
             private static bool _VERTICAL_FORMSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#WANCHO"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock WANCHO { get { if (!_WANCHOReady) { _WANCHOContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "WANCHO"); _WANCHOReady = true; } return _WANCHOContent; } }
-            private static Java.Lang.Character.UnicodeBlock _WANCHOContent = default;
-            private static bool _WANCHOReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#WARANG_CITI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#WARANG_CITI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock WARANG_CITI { get { if (!_WARANG_CITIReady) { _WARANG_CITIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "WARANG_CITI"); _WARANG_CITIReady = true; } return _WARANG_CITIContent; } }
             private static Java.Lang.Character.UnicodeBlock _WARANG_CITIContent = default;
             private static bool _WARANG_CITIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#YEZIDI"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeBlock YEZIDI { get { if (!_YEZIDIReady) { _YEZIDIContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "YEZIDI"); _YEZIDIReady = true; } return _YEZIDIContent; } }
-            private static Java.Lang.Character.UnicodeBlock _YEZIDIContent = default;
-            private static bool _YEZIDIReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#YI_RADICALS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#YI_RADICALS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock YI_RADICALS { get { if (!_YI_RADICALSReady) { _YI_RADICALSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "YI_RADICALS"); _YI_RADICALSReady = true; } return _YI_RADICALSContent; } }
             private static Java.Lang.Character.UnicodeBlock _YI_RADICALSContent = default;
             private static bool _YI_RADICALSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#YI_SYLLABLES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#YI_SYLLABLES"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock YI_SYLLABLES { get { if (!_YI_SYLLABLESReady) { _YI_SYLLABLESContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "YI_SYLLABLES"); _YI_SYLLABLESReady = true; } return _YI_SYLLABLESContent; } }
             private static Java.Lang.Character.UnicodeBlock _YI_SYLLABLESContent = default;
             private static bool _YI_SYLLABLESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#YIJING_HEXAGRAM_SYMBOLS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#YIJING_HEXAGRAM_SYMBOLS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock YIJING_HEXAGRAM_SYMBOLS { get { if (!_YIJING_HEXAGRAM_SYMBOLSReady) { _YIJING_HEXAGRAM_SYMBOLSContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "YIJING_HEXAGRAM_SYMBOLS"); _YIJING_HEXAGRAM_SYMBOLSReady = true; } return _YIJING_HEXAGRAM_SYMBOLSContent; } }
             private static Java.Lang.Character.UnicodeBlock _YIJING_HEXAGRAM_SYMBOLSContent = default;
             private static bool _YIJING_HEXAGRAM_SYMBOLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#ZANABAZAR_SQUARE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#ZANABAZAR_SQUARE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeBlock ZANABAZAR_SQUARE { get { if (!_ZANABAZAR_SQUAREReady) { _ZANABAZAR_SQUAREContent = SGetField<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "ZANABAZAR_SQUARE"); _ZANABAZAR_SQUAREReady = true; } return _ZANABAZAR_SQUAREContent; } }
             private static Java.Lang.Character.UnicodeBlock _ZANABAZAR_SQUAREContent = default;
@@ -3191,7 +3023,7 @@ public partial class UnicodeBlock
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#forName(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#forName(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.Character.UnicodeBlock"/></returns>
@@ -3200,7 +3032,7 @@ public static Java.Lang.Character.UnicodeBlock ForName(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "forName", "(Ljava/lang/String;)Ljava/lang/Character$UnicodeBlock;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#of(char)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#of(char)"/>
             /// </summary>
             /// <param name="arg0"><see cref="char"/></param>
             /// <returns><see cref="Java.Lang.Character.UnicodeBlock"/></returns>
@@ -3209,7 +3041,7 @@ public static Java.Lang.Character.UnicodeBlock Of(char arg0)
                 return SExecuteWithSignature<Java.Lang.Character.UnicodeBlock>(LocalBridgeClazz, "of", "(C)Ljava/lang/Character$UnicodeBlock;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeBlock.html#of(int)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeBlock.html#of(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Java.Lang.Character.UnicodeBlock"/></returns>
@@ -3245,943 +3077,853 @@ public partial class UnicodeScript
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ADLAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#ADLAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript ADLAM { get { if (!_ADLAMReady) { _ADLAMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ADLAM"); _ADLAMReady = true; } return _ADLAMContent; } }
             private static Java.Lang.Character.UnicodeScript _ADLAMContent = default;
             private static bool _ADLAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#AHOM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#AHOM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript AHOM { get { if (!_AHOMReady) { _AHOMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "AHOM"); _AHOMReady = true; } return _AHOMContent; } }
             private static Java.Lang.Character.UnicodeScript _AHOMContent = default;
             private static bool _AHOMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ANATOLIAN_HIEROGLYPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#ANATOLIAN_HIEROGLYPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript ANATOLIAN_HIEROGLYPHS { get { if (!_ANATOLIAN_HIEROGLYPHSReady) { _ANATOLIAN_HIEROGLYPHSContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ANATOLIAN_HIEROGLYPHS"); _ANATOLIAN_HIEROGLYPHSReady = true; } return _ANATOLIAN_HIEROGLYPHSContent; } }
             private static Java.Lang.Character.UnicodeScript _ANATOLIAN_HIEROGLYPHSContent = default;
             private static bool _ANATOLIAN_HIEROGLYPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ARABIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#ARABIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript ARABIC { get { if (!_ARABICReady) { _ARABICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ARABIC"); _ARABICReady = true; } return _ARABICContent; } }
             private static Java.Lang.Character.UnicodeScript _ARABICContent = default;
             private static bool _ARABICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ARMENIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#ARMENIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript ARMENIAN { get { if (!_ARMENIANReady) { _ARMENIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ARMENIAN"); _ARMENIANReady = true; } return _ARMENIANContent; } }
             private static Java.Lang.Character.UnicodeScript _ARMENIANContent = default;
             private static bool _ARMENIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#AVESTAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#AVESTAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript AVESTAN { get { if (!_AVESTANReady) { _AVESTANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "AVESTAN"); _AVESTANReady = true; } return _AVESTANContent; } }
             private static Java.Lang.Character.UnicodeScript _AVESTANContent = default;
             private static bool _AVESTANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BALINESE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BALINESE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BALINESE { get { if (!_BALINESEReady) { _BALINESEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BALINESE"); _BALINESEReady = true; } return _BALINESEContent; } }
             private static Java.Lang.Character.UnicodeScript _BALINESEContent = default;
             private static bool _BALINESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BAMUM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BAMUM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BAMUM { get { if (!_BAMUMReady) { _BAMUMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BAMUM"); _BAMUMReady = true; } return _BAMUMContent; } }
             private static Java.Lang.Character.UnicodeScript _BAMUMContent = default;
             private static bool _BAMUMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BASSA_VAH"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BASSA_VAH"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BASSA_VAH { get { if (!_BASSA_VAHReady) { _BASSA_VAHContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BASSA_VAH"); _BASSA_VAHReady = true; } return _BASSA_VAHContent; } }
             private static Java.Lang.Character.UnicodeScript _BASSA_VAHContent = default;
             private static bool _BASSA_VAHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BATAK"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BATAK"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BATAK { get { if (!_BATAKReady) { _BATAKContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BATAK"); _BATAKReady = true; } return _BATAKContent; } }
             private static Java.Lang.Character.UnicodeScript _BATAKContent = default;
             private static bool _BATAKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BENGALI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BENGALI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BENGALI { get { if (!_BENGALIReady) { _BENGALIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BENGALI"); _BENGALIReady = true; } return _BENGALIContent; } }
             private static Java.Lang.Character.UnicodeScript _BENGALIContent = default;
             private static bool _BENGALIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BHAIKSUKI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BHAIKSUKI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BHAIKSUKI { get { if (!_BHAIKSUKIReady) { _BHAIKSUKIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BHAIKSUKI"); _BHAIKSUKIReady = true; } return _BHAIKSUKIContent; } }
             private static Java.Lang.Character.UnicodeScript _BHAIKSUKIContent = default;
             private static bool _BHAIKSUKIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BOPOMOFO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BOPOMOFO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BOPOMOFO { get { if (!_BOPOMOFOReady) { _BOPOMOFOContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BOPOMOFO"); _BOPOMOFOReady = true; } return _BOPOMOFOContent; } }
             private static Java.Lang.Character.UnicodeScript _BOPOMOFOContent = default;
             private static bool _BOPOMOFOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BRAHMI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BRAHMI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BRAHMI { get { if (!_BRAHMIReady) { _BRAHMIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BRAHMI"); _BRAHMIReady = true; } return _BRAHMIContent; } }
             private static Java.Lang.Character.UnicodeScript _BRAHMIContent = default;
             private static bool _BRAHMIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BRAILLE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BRAILLE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BRAILLE { get { if (!_BRAILLEReady) { _BRAILLEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BRAILLE"); _BRAILLEReady = true; } return _BRAILLEContent; } }
             private static Java.Lang.Character.UnicodeScript _BRAILLEContent = default;
             private static bool _BRAILLEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BUGINESE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BUGINESE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BUGINESE { get { if (!_BUGINESEReady) { _BUGINESEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BUGINESE"); _BUGINESEReady = true; } return _BUGINESEContent; } }
             private static Java.Lang.Character.UnicodeScript _BUGINESEContent = default;
             private static bool _BUGINESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#BUHID"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#BUHID"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript BUHID { get { if (!_BUHIDReady) { _BUHIDContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "BUHID"); _BUHIDReady = true; } return _BUHIDContent; } }
             private static Java.Lang.Character.UnicodeScript _BUHIDContent = default;
             private static bool _BUHIDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CANADIAN_ABORIGINAL"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CANADIAN_ABORIGINAL"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CANADIAN_ABORIGINAL { get { if (!_CANADIAN_ABORIGINALReady) { _CANADIAN_ABORIGINALContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CANADIAN_ABORIGINAL"); _CANADIAN_ABORIGINALReady = true; } return _CANADIAN_ABORIGINALContent; } }
             private static Java.Lang.Character.UnicodeScript _CANADIAN_ABORIGINALContent = default;
             private static bool _CANADIAN_ABORIGINALReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CARIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CARIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CARIAN { get { if (!_CARIANReady) { _CARIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CARIAN"); _CARIANReady = true; } return _CARIANContent; } }
             private static Java.Lang.Character.UnicodeScript _CARIANContent = default;
             private static bool _CARIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CAUCASIAN_ALBANIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CAUCASIAN_ALBANIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CAUCASIAN_ALBANIAN { get { if (!_CAUCASIAN_ALBANIANReady) { _CAUCASIAN_ALBANIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CAUCASIAN_ALBANIAN"); _CAUCASIAN_ALBANIANReady = true; } return _CAUCASIAN_ALBANIANContent; } }
             private static Java.Lang.Character.UnicodeScript _CAUCASIAN_ALBANIANContent = default;
             private static bool _CAUCASIAN_ALBANIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CHAKMA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CHAKMA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CHAKMA { get { if (!_CHAKMAReady) { _CHAKMAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CHAKMA"); _CHAKMAReady = true; } return _CHAKMAContent; } }
             private static Java.Lang.Character.UnicodeScript _CHAKMAContent = default;
             private static bool _CHAKMAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CHAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CHAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CHAM { get { if (!_CHAMReady) { _CHAMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CHAM"); _CHAMReady = true; } return _CHAMContent; } }
             private static Java.Lang.Character.UnicodeScript _CHAMContent = default;
             private static bool _CHAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CHEROKEE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CHEROKEE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CHEROKEE { get { if (!_CHEROKEEReady) { _CHEROKEEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CHEROKEE"); _CHEROKEEReady = true; } return _CHEROKEEContent; } }
             private static Java.Lang.Character.UnicodeScript _CHEROKEEContent = default;
             private static bool _CHEROKEEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CHORASMIAN"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript CHORASMIAN { get { if (!_CHORASMIANReady) { _CHORASMIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CHORASMIAN"); _CHORASMIANReady = true; } return _CHORASMIANContent; } }
-            private static Java.Lang.Character.UnicodeScript _CHORASMIANContent = default;
-            private static bool _CHORASMIANReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#COMMON"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#COMMON"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript COMMON { get { if (!_COMMONReady) { _COMMONContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "COMMON"); _COMMONReady = true; } return _COMMONContent; } }
             private static Java.Lang.Character.UnicodeScript _COMMONContent = default;
             private static bool _COMMONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#COPTIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#COPTIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript COPTIC { get { if (!_COPTICReady) { _COPTICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "COPTIC"); _COPTICReady = true; } return _COPTICContent; } }
             private static Java.Lang.Character.UnicodeScript _COPTICContent = default;
             private static bool _COPTICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CUNEIFORM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CUNEIFORM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CUNEIFORM { get { if (!_CUNEIFORMReady) { _CUNEIFORMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CUNEIFORM"); _CUNEIFORMReady = true; } return _CUNEIFORMContent; } }
             private static Java.Lang.Character.UnicodeScript _CUNEIFORMContent = default;
             private static bool _CUNEIFORMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CYPRIOT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CYPRIOT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CYPRIOT { get { if (!_CYPRIOTReady) { _CYPRIOTContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CYPRIOT"); _CYPRIOTReady = true; } return _CYPRIOTContent; } }
             private static Java.Lang.Character.UnicodeScript _CYPRIOTContent = default;
             private static bool _CYPRIOTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#CYRILLIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#CYRILLIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript CYRILLIC { get { if (!_CYRILLICReady) { _CYRILLICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "CYRILLIC"); _CYRILLICReady = true; } return _CYRILLICContent; } }
             private static Java.Lang.Character.UnicodeScript _CYRILLICContent = default;
             private static bool _CYRILLICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#DESERET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#DESERET"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript DESERET { get { if (!_DESERETReady) { _DESERETContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "DESERET"); _DESERETReady = true; } return _DESERETContent; } }
             private static Java.Lang.Character.UnicodeScript _DESERETContent = default;
             private static bool _DESERETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#DEVANAGARI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#DEVANAGARI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript DEVANAGARI { get { if (!_DEVANAGARIReady) { _DEVANAGARIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "DEVANAGARI"); _DEVANAGARIReady = true; } return _DEVANAGARIContent; } }
             private static Java.Lang.Character.UnicodeScript _DEVANAGARIContent = default;
             private static bool _DEVANAGARIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#DIVES_AKURU"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript DIVES_AKURU { get { if (!_DIVES_AKURUReady) { _DIVES_AKURUContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "DIVES_AKURU"); _DIVES_AKURUReady = true; } return _DIVES_AKURUContent; } }
-            private static Java.Lang.Character.UnicodeScript _DIVES_AKURUContent = default;
-            private static bool _DIVES_AKURUReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#DOGRA"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript DOGRA { get { if (!_DOGRAReady) { _DOGRAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "DOGRA"); _DOGRAReady = true; } return _DOGRAContent; } }
-            private static Java.Lang.Character.UnicodeScript _DOGRAContent = default;
-            private static bool _DOGRAReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#DUPLOYAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#DUPLOYAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript DUPLOYAN { get { if (!_DUPLOYANReady) { _DUPLOYANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "DUPLOYAN"); _DUPLOYANReady = true; } return _DUPLOYANContent; } }
             private static Java.Lang.Character.UnicodeScript _DUPLOYANContent = default;
             private static bool _DUPLOYANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#EGYPTIAN_HIEROGLYPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#EGYPTIAN_HIEROGLYPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript EGYPTIAN_HIEROGLYPHS { get { if (!_EGYPTIAN_HIEROGLYPHSReady) { _EGYPTIAN_HIEROGLYPHSContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "EGYPTIAN_HIEROGLYPHS"); _EGYPTIAN_HIEROGLYPHSReady = true; } return _EGYPTIAN_HIEROGLYPHSContent; } }
             private static Java.Lang.Character.UnicodeScript _EGYPTIAN_HIEROGLYPHSContent = default;
             private static bool _EGYPTIAN_HIEROGLYPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ELBASAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#ELBASAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript ELBASAN { get { if (!_ELBASANReady) { _ELBASANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ELBASAN"); _ELBASANReady = true; } return _ELBASANContent; } }
             private static Java.Lang.Character.UnicodeScript _ELBASANContent = default;
             private static bool _ELBASANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ELYMAIC"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript ELYMAIC { get { if (!_ELYMAICReady) { _ELYMAICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ELYMAIC"); _ELYMAICReady = true; } return _ELYMAICContent; } }
-            private static Java.Lang.Character.UnicodeScript _ELYMAICContent = default;
-            private static bool _ELYMAICReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ETHIOPIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#ETHIOPIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript ETHIOPIC { get { if (!_ETHIOPICReady) { _ETHIOPICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ETHIOPIC"); _ETHIOPICReady = true; } return _ETHIOPICContent; } }
             private static Java.Lang.Character.UnicodeScript _ETHIOPICContent = default;
             private static bool _ETHIOPICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#GEORGIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#GEORGIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript GEORGIAN { get { if (!_GEORGIANReady) { _GEORGIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "GEORGIAN"); _GEORGIANReady = true; } return _GEORGIANContent; } }
             private static Java.Lang.Character.UnicodeScript _GEORGIANContent = default;
             private static bool _GEORGIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#GLAGOLITIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#GLAGOLITIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript GLAGOLITIC { get { if (!_GLAGOLITICReady) { _GLAGOLITICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "GLAGOLITIC"); _GLAGOLITICReady = true; } return _GLAGOLITICContent; } }
             private static Java.Lang.Character.UnicodeScript _GLAGOLITICContent = default;
             private static bool _GLAGOLITICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#GOTHIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#GOTHIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript GOTHIC { get { if (!_GOTHICReady) { _GOTHICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "GOTHIC"); _GOTHICReady = true; } return _GOTHICContent; } }
             private static Java.Lang.Character.UnicodeScript _GOTHICContent = default;
             private static bool _GOTHICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#GRANTHA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#GRANTHA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript GRANTHA { get { if (!_GRANTHAReady) { _GRANTHAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "GRANTHA"); _GRANTHAReady = true; } return _GRANTHAContent; } }
             private static Java.Lang.Character.UnicodeScript _GRANTHAContent = default;
             private static bool _GRANTHAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#GREEK"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#GREEK"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript GREEK { get { if (!_GREEKReady) { _GREEKContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "GREEK"); _GREEKReady = true; } return _GREEKContent; } }
             private static Java.Lang.Character.UnicodeScript _GREEKContent = default;
             private static bool _GREEKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#GUJARATI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#GUJARATI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript GUJARATI { get { if (!_GUJARATIReady) { _GUJARATIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "GUJARATI"); _GUJARATIReady = true; } return _GUJARATIContent; } }
             private static Java.Lang.Character.UnicodeScript _GUJARATIContent = default;
             private static bool _GUJARATIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#GUNJALA_GONDI"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript GUNJALA_GONDI { get { if (!_GUNJALA_GONDIReady) { _GUNJALA_GONDIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "GUNJALA_GONDI"); _GUNJALA_GONDIReady = true; } return _GUNJALA_GONDIContent; } }
-            private static Java.Lang.Character.UnicodeScript _GUNJALA_GONDIContent = default;
-            private static bool _GUNJALA_GONDIReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#GURMUKHI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#GURMUKHI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript GURMUKHI { get { if (!_GURMUKHIReady) { _GURMUKHIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "GURMUKHI"); _GURMUKHIReady = true; } return _GURMUKHIContent; } }
             private static Java.Lang.Character.UnicodeScript _GURMUKHIContent = default;
             private static bool _GURMUKHIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#HAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#HAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript HAN { get { if (!_HANReady) { _HANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "HAN"); _HANReady = true; } return _HANContent; } }
             private static Java.Lang.Character.UnicodeScript _HANContent = default;
             private static bool _HANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#HANGUL"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#HANGUL"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript HANGUL { get { if (!_HANGULReady) { _HANGULContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "HANGUL"); _HANGULReady = true; } return _HANGULContent; } }
             private static Java.Lang.Character.UnicodeScript _HANGULContent = default;
             private static bool _HANGULReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#HANIFI_ROHINGYA"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript HANIFI_ROHINGYA { get { if (!_HANIFI_ROHINGYAReady) { _HANIFI_ROHINGYAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "HANIFI_ROHINGYA"); _HANIFI_ROHINGYAReady = true; } return _HANIFI_ROHINGYAContent; } }
-            private static Java.Lang.Character.UnicodeScript _HANIFI_ROHINGYAContent = default;
-            private static bool _HANIFI_ROHINGYAReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#HANUNOO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#HANUNOO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript HANUNOO { get { if (!_HANUNOOReady) { _HANUNOOContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "HANUNOO"); _HANUNOOReady = true; } return _HANUNOOContent; } }
             private static Java.Lang.Character.UnicodeScript _HANUNOOContent = default;
             private static bool _HANUNOOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#HATRAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#HATRAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript HATRAN { get { if (!_HATRANReady) { _HATRANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "HATRAN"); _HATRANReady = true; } return _HATRANContent; } }
             private static Java.Lang.Character.UnicodeScript _HATRANContent = default;
             private static bool _HATRANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#HEBREW"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#HEBREW"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript HEBREW { get { if (!_HEBREWReady) { _HEBREWContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "HEBREW"); _HEBREWReady = true; } return _HEBREWContent; } }
             private static Java.Lang.Character.UnicodeScript _HEBREWContent = default;
             private static bool _HEBREWReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#HIRAGANA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#HIRAGANA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript HIRAGANA { get { if (!_HIRAGANAReady) { _HIRAGANAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "HIRAGANA"); _HIRAGANAReady = true; } return _HIRAGANAContent; } }
             private static Java.Lang.Character.UnicodeScript _HIRAGANAContent = default;
             private static bool _HIRAGANAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#IMPERIAL_ARAMAIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#IMPERIAL_ARAMAIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript IMPERIAL_ARAMAIC { get { if (!_IMPERIAL_ARAMAICReady) { _IMPERIAL_ARAMAICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "IMPERIAL_ARAMAIC"); _IMPERIAL_ARAMAICReady = true; } return _IMPERIAL_ARAMAICContent; } }
             private static Java.Lang.Character.UnicodeScript _IMPERIAL_ARAMAICContent = default;
             private static bool _IMPERIAL_ARAMAICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#INHERITED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#INHERITED"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript INHERITED { get { if (!_INHERITEDReady) { _INHERITEDContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "INHERITED"); _INHERITEDReady = true; } return _INHERITEDContent; } }
             private static Java.Lang.Character.UnicodeScript _INHERITEDContent = default;
             private static bool _INHERITEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#INSCRIPTIONAL_PAHLAVI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#INSCRIPTIONAL_PAHLAVI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript INSCRIPTIONAL_PAHLAVI { get { if (!_INSCRIPTIONAL_PAHLAVIReady) { _INSCRIPTIONAL_PAHLAVIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "INSCRIPTIONAL_PAHLAVI"); _INSCRIPTIONAL_PAHLAVIReady = true; } return _INSCRIPTIONAL_PAHLAVIContent; } }
             private static Java.Lang.Character.UnicodeScript _INSCRIPTIONAL_PAHLAVIContent = default;
             private static bool _INSCRIPTIONAL_PAHLAVIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#INSCRIPTIONAL_PARTHIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#INSCRIPTIONAL_PARTHIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript INSCRIPTIONAL_PARTHIAN { get { if (!_INSCRIPTIONAL_PARTHIANReady) { _INSCRIPTIONAL_PARTHIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "INSCRIPTIONAL_PARTHIAN"); _INSCRIPTIONAL_PARTHIANReady = true; } return _INSCRIPTIONAL_PARTHIANContent; } }
             private static Java.Lang.Character.UnicodeScript _INSCRIPTIONAL_PARTHIANContent = default;
             private static bool _INSCRIPTIONAL_PARTHIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#JAVANESE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#JAVANESE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript JAVANESE { get { if (!_JAVANESEReady) { _JAVANESEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "JAVANESE"); _JAVANESEReady = true; } return _JAVANESEContent; } }
             private static Java.Lang.Character.UnicodeScript _JAVANESEContent = default;
             private static bool _JAVANESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KAITHI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#KAITHI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript KAITHI { get { if (!_KAITHIReady) { _KAITHIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KAITHI"); _KAITHIReady = true; } return _KAITHIContent; } }
             private static Java.Lang.Character.UnicodeScript _KAITHIContent = default;
             private static bool _KAITHIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KANNADA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#KANNADA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript KANNADA { get { if (!_KANNADAReady) { _KANNADAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KANNADA"); _KANNADAReady = true; } return _KANNADAContent; } }
             private static Java.Lang.Character.UnicodeScript _KANNADAContent = default;
             private static bool _KANNADAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KATAKANA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#KATAKANA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript KATAKANA { get { if (!_KATAKANAReady) { _KATAKANAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KATAKANA"); _KATAKANAReady = true; } return _KATAKANAContent; } }
             private static Java.Lang.Character.UnicodeScript _KATAKANAContent = default;
             private static bool _KATAKANAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KAYAH_LI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#KAYAH_LI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript KAYAH_LI { get { if (!_KAYAH_LIReady) { _KAYAH_LIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KAYAH_LI"); _KAYAH_LIReady = true; } return _KAYAH_LIContent; } }
             private static Java.Lang.Character.UnicodeScript _KAYAH_LIContent = default;
             private static bool _KAYAH_LIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KHAROSHTHI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#KHAROSHTHI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript KHAROSHTHI { get { if (!_KHAROSHTHIReady) { _KHAROSHTHIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KHAROSHTHI"); _KHAROSHTHIReady = true; } return _KHAROSHTHIContent; } }
             private static Java.Lang.Character.UnicodeScript _KHAROSHTHIContent = default;
             private static bool _KHAROSHTHIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KHITAN_SMALL_SCRIPT"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript KHITAN_SMALL_SCRIPT { get { if (!_KHITAN_SMALL_SCRIPTReady) { _KHITAN_SMALL_SCRIPTContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KHITAN_SMALL_SCRIPT"); _KHITAN_SMALL_SCRIPTReady = true; } return _KHITAN_SMALL_SCRIPTContent; } }
-            private static Java.Lang.Character.UnicodeScript _KHITAN_SMALL_SCRIPTContent = default;
-            private static bool _KHITAN_SMALL_SCRIPTReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KHMER"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#KHMER"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript KHMER { get { if (!_KHMERReady) { _KHMERContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KHMER"); _KHMERReady = true; } return _KHMERContent; } }
             private static Java.Lang.Character.UnicodeScript _KHMERContent = default;
             private static bool _KHMERReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KHOJKI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#KHOJKI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript KHOJKI { get { if (!_KHOJKIReady) { _KHOJKIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KHOJKI"); _KHOJKIReady = true; } return _KHOJKIContent; } }
             private static Java.Lang.Character.UnicodeScript _KHOJKIContent = default;
             private static bool _KHOJKIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#KHUDAWADI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#KHUDAWADI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript KHUDAWADI { get { if (!_KHUDAWADIReady) { _KHUDAWADIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "KHUDAWADI"); _KHUDAWADIReady = true; } return _KHUDAWADIContent; } }
             private static Java.Lang.Character.UnicodeScript _KHUDAWADIContent = default;
             private static bool _KHUDAWADIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LAO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LAO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LAO { get { if (!_LAOReady) { _LAOContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LAO"); _LAOReady = true; } return _LAOContent; } }
             private static Java.Lang.Character.UnicodeScript _LAOContent = default;
             private static bool _LAOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LATIN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LATIN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LATIN { get { if (!_LATINReady) { _LATINContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LATIN"); _LATINReady = true; } return _LATINContent; } }
             private static Java.Lang.Character.UnicodeScript _LATINContent = default;
             private static bool _LATINReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LEPCHA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LEPCHA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LEPCHA { get { if (!_LEPCHAReady) { _LEPCHAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LEPCHA"); _LEPCHAReady = true; } return _LEPCHAContent; } }
             private static Java.Lang.Character.UnicodeScript _LEPCHAContent = default;
             private static bool _LEPCHAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LIMBU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LIMBU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LIMBU { get { if (!_LIMBUReady) { _LIMBUContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LIMBU"); _LIMBUReady = true; } return _LIMBUContent; } }
             private static Java.Lang.Character.UnicodeScript _LIMBUContent = default;
             private static bool _LIMBUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LINEAR_A"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LINEAR_A"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LINEAR_A { get { if (!_LINEAR_AReady) { _LINEAR_AContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LINEAR_A"); _LINEAR_AReady = true; } return _LINEAR_AContent; } }
             private static Java.Lang.Character.UnicodeScript _LINEAR_AContent = default;
             private static bool _LINEAR_AReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LINEAR_B"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LINEAR_B"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LINEAR_B { get { if (!_LINEAR_BReady) { _LINEAR_BContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LINEAR_B"); _LINEAR_BReady = true; } return _LINEAR_BContent; } }
             private static Java.Lang.Character.UnicodeScript _LINEAR_BContent = default;
             private static bool _LINEAR_BReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LISU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LISU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LISU { get { if (!_LISUReady) { _LISUContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LISU"); _LISUReady = true; } return _LISUContent; } }
             private static Java.Lang.Character.UnicodeScript _LISUContent = default;
             private static bool _LISUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LYCIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LYCIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LYCIAN { get { if (!_LYCIANReady) { _LYCIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LYCIAN"); _LYCIANReady = true; } return _LYCIANContent; } }
             private static Java.Lang.Character.UnicodeScript _LYCIANContent = default;
             private static bool _LYCIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#LYDIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#LYDIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript LYDIAN { get { if (!_LYDIANReady) { _LYDIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "LYDIAN"); _LYDIANReady = true; } return _LYDIANContent; } }
             private static Java.Lang.Character.UnicodeScript _LYDIANContent = default;
             private static bool _LYDIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MAHAJANI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MAHAJANI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MAHAJANI { get { if (!_MAHAJANIReady) { _MAHAJANIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MAHAJANI"); _MAHAJANIReady = true; } return _MAHAJANIContent; } }
             private static Java.Lang.Character.UnicodeScript _MAHAJANIContent = default;
             private static bool _MAHAJANIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MAKASAR"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript MAKASAR { get { if (!_MAKASARReady) { _MAKASARContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MAKASAR"); _MAKASARReady = true; } return _MAKASARContent; } }
-            private static Java.Lang.Character.UnicodeScript _MAKASARContent = default;
-            private static bool _MAKASARReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MALAYALAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MALAYALAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MALAYALAM { get { if (!_MALAYALAMReady) { _MALAYALAMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MALAYALAM"); _MALAYALAMReady = true; } return _MALAYALAMContent; } }
             private static Java.Lang.Character.UnicodeScript _MALAYALAMContent = default;
             private static bool _MALAYALAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MANDAIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MANDAIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MANDAIC { get { if (!_MANDAICReady) { _MANDAICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MANDAIC"); _MANDAICReady = true; } return _MANDAICContent; } }
             private static Java.Lang.Character.UnicodeScript _MANDAICContent = default;
             private static bool _MANDAICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MANICHAEAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MANICHAEAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MANICHAEAN { get { if (!_MANICHAEANReady) { _MANICHAEANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MANICHAEAN"); _MANICHAEANReady = true; } return _MANICHAEANContent; } }
             private static Java.Lang.Character.UnicodeScript _MANICHAEANContent = default;
             private static bool _MANICHAEANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MARCHEN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MARCHEN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MARCHEN { get { if (!_MARCHENReady) { _MARCHENContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MARCHEN"); _MARCHENReady = true; } return _MARCHENContent; } }
             private static Java.Lang.Character.UnicodeScript _MARCHENContent = default;
             private static bool _MARCHENReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MASARAM_GONDI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MASARAM_GONDI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MASARAM_GONDI { get { if (!_MASARAM_GONDIReady) { _MASARAM_GONDIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MASARAM_GONDI"); _MASARAM_GONDIReady = true; } return _MASARAM_GONDIContent; } }
             private static Java.Lang.Character.UnicodeScript _MASARAM_GONDIContent = default;
             private static bool _MASARAM_GONDIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MEDEFAIDRIN"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript MEDEFAIDRIN { get { if (!_MEDEFAIDRINReady) { _MEDEFAIDRINContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MEDEFAIDRIN"); _MEDEFAIDRINReady = true; } return _MEDEFAIDRINContent; } }
-            private static Java.Lang.Character.UnicodeScript _MEDEFAIDRINContent = default;
-            private static bool _MEDEFAIDRINReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MEETEI_MAYEK"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MEETEI_MAYEK"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MEETEI_MAYEK { get { if (!_MEETEI_MAYEKReady) { _MEETEI_MAYEKContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MEETEI_MAYEK"); _MEETEI_MAYEKReady = true; } return _MEETEI_MAYEKContent; } }
             private static Java.Lang.Character.UnicodeScript _MEETEI_MAYEKContent = default;
             private static bool _MEETEI_MAYEKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MENDE_KIKAKUI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MENDE_KIKAKUI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MENDE_KIKAKUI { get { if (!_MENDE_KIKAKUIReady) { _MENDE_KIKAKUIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MENDE_KIKAKUI"); _MENDE_KIKAKUIReady = true; } return _MENDE_KIKAKUIContent; } }
             private static Java.Lang.Character.UnicodeScript _MENDE_KIKAKUIContent = default;
             private static bool _MENDE_KIKAKUIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MEROITIC_CURSIVE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MEROITIC_CURSIVE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MEROITIC_CURSIVE { get { if (!_MEROITIC_CURSIVEReady) { _MEROITIC_CURSIVEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MEROITIC_CURSIVE"); _MEROITIC_CURSIVEReady = true; } return _MEROITIC_CURSIVEContent; } }
             private static Java.Lang.Character.UnicodeScript _MEROITIC_CURSIVEContent = default;
             private static bool _MEROITIC_CURSIVEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MEROITIC_HIEROGLYPHS"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MEROITIC_HIEROGLYPHS"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MEROITIC_HIEROGLYPHS { get { if (!_MEROITIC_HIEROGLYPHSReady) { _MEROITIC_HIEROGLYPHSContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MEROITIC_HIEROGLYPHS"); _MEROITIC_HIEROGLYPHSReady = true; } return _MEROITIC_HIEROGLYPHSContent; } }
             private static Java.Lang.Character.UnicodeScript _MEROITIC_HIEROGLYPHSContent = default;
             private static bool _MEROITIC_HIEROGLYPHSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MIAO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MIAO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MIAO { get { if (!_MIAOReady) { _MIAOContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MIAO"); _MIAOReady = true; } return _MIAOContent; } }
             private static Java.Lang.Character.UnicodeScript _MIAOContent = default;
             private static bool _MIAOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MODI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MODI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MODI { get { if (!_MODIReady) { _MODIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MODI"); _MODIReady = true; } return _MODIContent; } }
             private static Java.Lang.Character.UnicodeScript _MODIContent = default;
             private static bool _MODIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MONGOLIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MONGOLIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MONGOLIAN { get { if (!_MONGOLIANReady) { _MONGOLIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MONGOLIAN"); _MONGOLIANReady = true; } return _MONGOLIANContent; } }
             private static Java.Lang.Character.UnicodeScript _MONGOLIANContent = default;
             private static bool _MONGOLIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MRO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MRO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MRO { get { if (!_MROReady) { _MROContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MRO"); _MROReady = true; } return _MROContent; } }
             private static Java.Lang.Character.UnicodeScript _MROContent = default;
             private static bool _MROReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MULTANI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MULTANI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MULTANI { get { if (!_MULTANIReady) { _MULTANIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MULTANI"); _MULTANIReady = true; } return _MULTANIContent; } }
             private static Java.Lang.Character.UnicodeScript _MULTANIContent = default;
             private static bool _MULTANIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#MYANMAR"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#MYANMAR"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript MYANMAR { get { if (!_MYANMARReady) { _MYANMARContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "MYANMAR"); _MYANMARReady = true; } return _MYANMARContent; } }
             private static Java.Lang.Character.UnicodeScript _MYANMARContent = default;
             private static bool _MYANMARReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#NABATAEAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#NABATAEAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript NABATAEAN { get { if (!_NABATAEANReady) { _NABATAEANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "NABATAEAN"); _NABATAEANReady = true; } return _NABATAEANContent; } }
             private static Java.Lang.Character.UnicodeScript _NABATAEANContent = default;
             private static bool _NABATAEANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#NANDINAGARI"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript NANDINAGARI { get { if (!_NANDINAGARIReady) { _NANDINAGARIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "NANDINAGARI"); _NANDINAGARIReady = true; } return _NANDINAGARIContent; } }
-            private static Java.Lang.Character.UnicodeScript _NANDINAGARIContent = default;
-            private static bool _NANDINAGARIReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#NEW_TAI_LUE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#NEW_TAI_LUE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript NEW_TAI_LUE { get { if (!_NEW_TAI_LUEReady) { _NEW_TAI_LUEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "NEW_TAI_LUE"); _NEW_TAI_LUEReady = true; } return _NEW_TAI_LUEContent; } }
             private static Java.Lang.Character.UnicodeScript _NEW_TAI_LUEContent = default;
             private static bool _NEW_TAI_LUEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#NEWA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#NEWA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript NEWA { get { if (!_NEWAReady) { _NEWAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "NEWA"); _NEWAReady = true; } return _NEWAContent; } }
             private static Java.Lang.Character.UnicodeScript _NEWAContent = default;
             private static bool _NEWAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#NKO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#NKO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript NKO { get { if (!_NKOReady) { _NKOContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "NKO"); _NKOReady = true; } return _NKOContent; } }
             private static Java.Lang.Character.UnicodeScript _NKOContent = default;
             private static bool _NKOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#NUSHU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#NUSHU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript NUSHU { get { if (!_NUSHUReady) { _NUSHUContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "NUSHU"); _NUSHUReady = true; } return _NUSHUContent; } }
             private static Java.Lang.Character.UnicodeScript _NUSHUContent = default;
             private static bool _NUSHUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#NYIAKENG_PUACHUE_HMONG"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript NYIAKENG_PUACHUE_HMONG { get { if (!_NYIAKENG_PUACHUE_HMONGReady) { _NYIAKENG_PUACHUE_HMONGContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "NYIAKENG_PUACHUE_HMONG"); _NYIAKENG_PUACHUE_HMONGReady = true; } return _NYIAKENG_PUACHUE_HMONGContent; } }
-            private static Java.Lang.Character.UnicodeScript _NYIAKENG_PUACHUE_HMONGContent = default;
-            private static bool _NYIAKENG_PUACHUE_HMONGReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OGHAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OGHAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OGHAM { get { if (!_OGHAMReady) { _OGHAMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OGHAM"); _OGHAMReady = true; } return _OGHAMContent; } }
             private static Java.Lang.Character.UnicodeScript _OGHAMContent = default;
             private static bool _OGHAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OL_CHIKI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OL_CHIKI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OL_CHIKI { get { if (!_OL_CHIKIReady) { _OL_CHIKIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OL_CHIKI"); _OL_CHIKIReady = true; } return _OL_CHIKIContent; } }
             private static Java.Lang.Character.UnicodeScript _OL_CHIKIContent = default;
             private static bool _OL_CHIKIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OLD_HUNGARIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OLD_HUNGARIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OLD_HUNGARIAN { get { if (!_OLD_HUNGARIANReady) { _OLD_HUNGARIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OLD_HUNGARIAN"); _OLD_HUNGARIANReady = true; } return _OLD_HUNGARIANContent; } }
             private static Java.Lang.Character.UnicodeScript _OLD_HUNGARIANContent = default;
             private static bool _OLD_HUNGARIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OLD_ITALIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OLD_ITALIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OLD_ITALIC { get { if (!_OLD_ITALICReady) { _OLD_ITALICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OLD_ITALIC"); _OLD_ITALICReady = true; } return _OLD_ITALICContent; } }
             private static Java.Lang.Character.UnicodeScript _OLD_ITALICContent = default;
             private static bool _OLD_ITALICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OLD_NORTH_ARABIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OLD_NORTH_ARABIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OLD_NORTH_ARABIAN { get { if (!_OLD_NORTH_ARABIANReady) { _OLD_NORTH_ARABIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OLD_NORTH_ARABIAN"); _OLD_NORTH_ARABIANReady = true; } return _OLD_NORTH_ARABIANContent; } }
             private static Java.Lang.Character.UnicodeScript _OLD_NORTH_ARABIANContent = default;
             private static bool _OLD_NORTH_ARABIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OLD_PERMIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OLD_PERMIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OLD_PERMIC { get { if (!_OLD_PERMICReady) { _OLD_PERMICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OLD_PERMIC"); _OLD_PERMICReady = true; } return _OLD_PERMICContent; } }
             private static Java.Lang.Character.UnicodeScript _OLD_PERMICContent = default;
             private static bool _OLD_PERMICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OLD_PERSIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OLD_PERSIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OLD_PERSIAN { get { if (!_OLD_PERSIANReady) { _OLD_PERSIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OLD_PERSIAN"); _OLD_PERSIANReady = true; } return _OLD_PERSIANContent; } }
             private static Java.Lang.Character.UnicodeScript _OLD_PERSIANContent = default;
             private static bool _OLD_PERSIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OLD_SOGDIAN"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript OLD_SOGDIAN { get { if (!_OLD_SOGDIANReady) { _OLD_SOGDIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OLD_SOGDIAN"); _OLD_SOGDIANReady = true; } return _OLD_SOGDIANContent; } }
-            private static Java.Lang.Character.UnicodeScript _OLD_SOGDIANContent = default;
-            private static bool _OLD_SOGDIANReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OLD_SOUTH_ARABIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OLD_SOUTH_ARABIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OLD_SOUTH_ARABIAN { get { if (!_OLD_SOUTH_ARABIANReady) { _OLD_SOUTH_ARABIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OLD_SOUTH_ARABIAN"); _OLD_SOUTH_ARABIANReady = true; } return _OLD_SOUTH_ARABIANContent; } }
             private static Java.Lang.Character.UnicodeScript _OLD_SOUTH_ARABIANContent = default;
             private static bool _OLD_SOUTH_ARABIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OLD_TURKIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OLD_TURKIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OLD_TURKIC { get { if (!_OLD_TURKICReady) { _OLD_TURKICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OLD_TURKIC"); _OLD_TURKICReady = true; } return _OLD_TURKICContent; } }
             private static Java.Lang.Character.UnicodeScript _OLD_TURKICContent = default;
             private static bool _OLD_TURKICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ORIYA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#ORIYA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript ORIYA { get { if (!_ORIYAReady) { _ORIYAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ORIYA"); _ORIYAReady = true; } return _ORIYAContent; } }
             private static Java.Lang.Character.UnicodeScript _ORIYAContent = default;
             private static bool _ORIYAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OSAGE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OSAGE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OSAGE { get { if (!_OSAGEReady) { _OSAGEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OSAGE"); _OSAGEReady = true; } return _OSAGEContent; } }
             private static Java.Lang.Character.UnicodeScript _OSAGEContent = default;
             private static bool _OSAGEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#OSMANYA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#OSMANYA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript OSMANYA { get { if (!_OSMANYAReady) { _OSMANYAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "OSMANYA"); _OSMANYAReady = true; } return _OSMANYAContent; } }
             private static Java.Lang.Character.UnicodeScript _OSMANYAContent = default;
             private static bool _OSMANYAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#PAHAWH_HMONG"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#PAHAWH_HMONG"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript PAHAWH_HMONG { get { if (!_PAHAWH_HMONGReady) { _PAHAWH_HMONGContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "PAHAWH_HMONG"); _PAHAWH_HMONGReady = true; } return _PAHAWH_HMONGContent; } }
             private static Java.Lang.Character.UnicodeScript _PAHAWH_HMONGContent = default;
             private static bool _PAHAWH_HMONGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#PALMYRENE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#PALMYRENE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript PALMYRENE { get { if (!_PALMYRENEReady) { _PALMYRENEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "PALMYRENE"); _PALMYRENEReady = true; } return _PALMYRENEContent; } }
             private static Java.Lang.Character.UnicodeScript _PALMYRENEContent = default;
             private static bool _PALMYRENEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#PAU_CIN_HAU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#PAU_CIN_HAU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript PAU_CIN_HAU { get { if (!_PAU_CIN_HAUReady) { _PAU_CIN_HAUContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "PAU_CIN_HAU"); _PAU_CIN_HAUReady = true; } return _PAU_CIN_HAUContent; } }
             private static Java.Lang.Character.UnicodeScript _PAU_CIN_HAUContent = default;
             private static bool _PAU_CIN_HAUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#PHAGS_PA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#PHAGS_PA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript PHAGS_PA { get { if (!_PHAGS_PAReady) { _PHAGS_PAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "PHAGS_PA"); _PHAGS_PAReady = true; } return _PHAGS_PAContent; } }
             private static Java.Lang.Character.UnicodeScript _PHAGS_PAContent = default;
             private static bool _PHAGS_PAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#PHOENICIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#PHOENICIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript PHOENICIAN { get { if (!_PHOENICIANReady) { _PHOENICIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "PHOENICIAN"); _PHOENICIANReady = true; } return _PHOENICIANContent; } }
             private static Java.Lang.Character.UnicodeScript _PHOENICIANContent = default;
             private static bool _PHOENICIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#PSALTER_PAHLAVI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#PSALTER_PAHLAVI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript PSALTER_PAHLAVI { get { if (!_PSALTER_PAHLAVIReady) { _PSALTER_PAHLAVIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "PSALTER_PAHLAVI"); _PSALTER_PAHLAVIReady = true; } return _PSALTER_PAHLAVIContent; } }
             private static Java.Lang.Character.UnicodeScript _PSALTER_PAHLAVIContent = default;
             private static bool _PSALTER_PAHLAVIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#REJANG"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#REJANG"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript REJANG { get { if (!_REJANGReady) { _REJANGContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "REJANG"); _REJANGReady = true; } return _REJANGContent; } }
             private static Java.Lang.Character.UnicodeScript _REJANGContent = default;
             private static bool _REJANGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#RUNIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#RUNIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript RUNIC { get { if (!_RUNICReady) { _RUNICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "RUNIC"); _RUNICReady = true; } return _RUNICContent; } }
             private static Java.Lang.Character.UnicodeScript _RUNICContent = default;
             private static bool _RUNICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SAMARITAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SAMARITAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SAMARITAN { get { if (!_SAMARITANReady) { _SAMARITANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SAMARITAN"); _SAMARITANReady = true; } return _SAMARITANContent; } }
             private static Java.Lang.Character.UnicodeScript _SAMARITANContent = default;
             private static bool _SAMARITANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SAURASHTRA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SAURASHTRA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SAURASHTRA { get { if (!_SAURASHTRAReady) { _SAURASHTRAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SAURASHTRA"); _SAURASHTRAReady = true; } return _SAURASHTRAContent; } }
             private static Java.Lang.Character.UnicodeScript _SAURASHTRAContent = default;
             private static bool _SAURASHTRAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SHARADA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SHARADA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SHARADA { get { if (!_SHARADAReady) { _SHARADAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SHARADA"); _SHARADAReady = true; } return _SHARADAContent; } }
             private static Java.Lang.Character.UnicodeScript _SHARADAContent = default;
             private static bool _SHARADAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SHAVIAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SHAVIAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SHAVIAN { get { if (!_SHAVIANReady) { _SHAVIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SHAVIAN"); _SHAVIANReady = true; } return _SHAVIANContent; } }
             private static Java.Lang.Character.UnicodeScript _SHAVIANContent = default;
             private static bool _SHAVIANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SIDDHAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SIDDHAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SIDDHAM { get { if (!_SIDDHAMReady) { _SIDDHAMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SIDDHAM"); _SIDDHAMReady = true; } return _SIDDHAMContent; } }
             private static Java.Lang.Character.UnicodeScript _SIDDHAMContent = default;
             private static bool _SIDDHAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SIGNWRITING"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SIGNWRITING"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SIGNWRITING { get { if (!_SIGNWRITINGReady) { _SIGNWRITINGContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SIGNWRITING"); _SIGNWRITINGReady = true; } return _SIGNWRITINGContent; } }
             private static Java.Lang.Character.UnicodeScript _SIGNWRITINGContent = default;
             private static bool _SIGNWRITINGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SINHALA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SINHALA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SINHALA { get { if (!_SINHALAReady) { _SINHALAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SINHALA"); _SINHALAReady = true; } return _SINHALAContent; } }
             private static Java.Lang.Character.UnicodeScript _SINHALAContent = default;
             private static bool _SINHALAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SOGDIAN"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript SOGDIAN { get { if (!_SOGDIANReady) { _SOGDIANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SOGDIAN"); _SOGDIANReady = true; } return _SOGDIANContent; } }
-            private static Java.Lang.Character.UnicodeScript _SOGDIANContent = default;
-            private static bool _SOGDIANReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SORA_SOMPENG"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SORA_SOMPENG"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SORA_SOMPENG { get { if (!_SORA_SOMPENGReady) { _SORA_SOMPENGContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SORA_SOMPENG"); _SORA_SOMPENGReady = true; } return _SORA_SOMPENGContent; } }
             private static Java.Lang.Character.UnicodeScript _SORA_SOMPENGContent = default;
             private static bool _SORA_SOMPENGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SOYOMBO"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SOYOMBO"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SOYOMBO { get { if (!_SOYOMBOReady) { _SOYOMBOContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SOYOMBO"); _SOYOMBOReady = true; } return _SOYOMBOContent; } }
             private static Java.Lang.Character.UnicodeScript _SOYOMBOContent = default;
             private static bool _SOYOMBOReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SUNDANESE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SUNDANESE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SUNDANESE { get { if (!_SUNDANESEReady) { _SUNDANESEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SUNDANESE"); _SUNDANESEReady = true; } return _SUNDANESEContent; } }
             private static Java.Lang.Character.UnicodeScript _SUNDANESEContent = default;
             private static bool _SUNDANESEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SYLOTI_NAGRI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SYLOTI_NAGRI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SYLOTI_NAGRI { get { if (!_SYLOTI_NAGRIReady) { _SYLOTI_NAGRIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SYLOTI_NAGRI"); _SYLOTI_NAGRIReady = true; } return _SYLOTI_NAGRIContent; } }
             private static Java.Lang.Character.UnicodeScript _SYLOTI_NAGRIContent = default;
             private static bool _SYLOTI_NAGRIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#SYRIAC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#SYRIAC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript SYRIAC { get { if (!_SYRIACReady) { _SYRIACContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "SYRIAC"); _SYRIACReady = true; } return _SYRIACContent; } }
             private static Java.Lang.Character.UnicodeScript _SYRIACContent = default;
             private static bool _SYRIACReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TAGALOG"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TAGALOG"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TAGALOG { get { if (!_TAGALOGReady) { _TAGALOGContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TAGALOG"); _TAGALOGReady = true; } return _TAGALOGContent; } }
             private static Java.Lang.Character.UnicodeScript _TAGALOGContent = default;
             private static bool _TAGALOGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TAGBANWA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TAGBANWA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TAGBANWA { get { if (!_TAGBANWAReady) { _TAGBANWAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TAGBANWA"); _TAGBANWAReady = true; } return _TAGBANWAContent; } }
             private static Java.Lang.Character.UnicodeScript _TAGBANWAContent = default;
             private static bool _TAGBANWAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TAI_LE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TAI_LE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TAI_LE { get { if (!_TAI_LEReady) { _TAI_LEContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TAI_LE"); _TAI_LEReady = true; } return _TAI_LEContent; } }
             private static Java.Lang.Character.UnicodeScript _TAI_LEContent = default;
             private static bool _TAI_LEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TAI_THAM"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TAI_THAM"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TAI_THAM { get { if (!_TAI_THAMReady) { _TAI_THAMContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TAI_THAM"); _TAI_THAMReady = true; } return _TAI_THAMContent; } }
             private static Java.Lang.Character.UnicodeScript _TAI_THAMContent = default;
             private static bool _TAI_THAMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TAI_VIET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TAI_VIET"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TAI_VIET { get { if (!_TAI_VIETReady) { _TAI_VIETContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TAI_VIET"); _TAI_VIETReady = true; } return _TAI_VIETContent; } }
             private static Java.Lang.Character.UnicodeScript _TAI_VIETContent = default;
             private static bool _TAI_VIETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TAKRI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TAKRI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TAKRI { get { if (!_TAKRIReady) { _TAKRIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TAKRI"); _TAKRIReady = true; } return _TAKRIContent; } }
             private static Java.Lang.Character.UnicodeScript _TAKRIContent = default;
             private static bool _TAKRIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TAMIL"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TAMIL"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TAMIL { get { if (!_TAMILReady) { _TAMILContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TAMIL"); _TAMILReady = true; } return _TAMILContent; } }
             private static Java.Lang.Character.UnicodeScript _TAMILContent = default;
             private static bool _TAMILReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TANGUT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TANGUT"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TANGUT { get { if (!_TANGUTReady) { _TANGUTContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TANGUT"); _TANGUTReady = true; } return _TANGUTContent; } }
             private static Java.Lang.Character.UnicodeScript _TANGUTContent = default;
             private static bool _TANGUTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TELUGU"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TELUGU"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TELUGU { get { if (!_TELUGUReady) { _TELUGUContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TELUGU"); _TELUGUReady = true; } return _TELUGUContent; } }
             private static Java.Lang.Character.UnicodeScript _TELUGUContent = default;
             private static bool _TELUGUReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#THAANA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#THAANA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript THAANA { get { if (!_THAANAReady) { _THAANAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "THAANA"); _THAANAReady = true; } return _THAANAContent; } }
             private static Java.Lang.Character.UnicodeScript _THAANAContent = default;
             private static bool _THAANAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#THAI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#THAI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript THAI { get { if (!_THAIReady) { _THAIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "THAI"); _THAIReady = true; } return _THAIContent; } }
             private static Java.Lang.Character.UnicodeScript _THAIContent = default;
             private static bool _THAIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TIBETAN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TIBETAN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TIBETAN { get { if (!_TIBETANReady) { _TIBETANContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TIBETAN"); _TIBETANReady = true; } return _TIBETANContent; } }
             private static Java.Lang.Character.UnicodeScript _TIBETANContent = default;
             private static bool _TIBETANReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TIFINAGH"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TIFINAGH"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TIFINAGH { get { if (!_TIFINAGHReady) { _TIFINAGHContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TIFINAGH"); _TIFINAGHReady = true; } return _TIFINAGHContent; } }
             private static Java.Lang.Character.UnicodeScript _TIFINAGHContent = default;
             private static bool _TIFINAGHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#TIRHUTA"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#TIRHUTA"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript TIRHUTA { get { if (!_TIRHUTAReady) { _TIRHUTAContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "TIRHUTA"); _TIRHUTAReady = true; } return _TIRHUTAContent; } }
             private static Java.Lang.Character.UnicodeScript _TIRHUTAContent = default;
             private static bool _TIRHUTAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#UGARITIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#UGARITIC"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript UGARITIC { get { if (!_UGARITICReady) { _UGARITICContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "UGARITIC"); _UGARITICReady = true; } return _UGARITICContent; } }
             private static Java.Lang.Character.UnicodeScript _UGARITICContent = default;
             private static bool _UGARITICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#UNKNOWN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#UNKNOWN"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript UNKNOWN { get { if (!_UNKNOWNReady) { _UNKNOWNContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "UNKNOWN"); _UNKNOWNReady = true; } return _UNKNOWNContent; } }
             private static Java.Lang.Character.UnicodeScript _UNKNOWNContent = default;
             private static bool _UNKNOWNReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#VAI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#VAI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript VAI { get { if (!_VAIReady) { _VAIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "VAI"); _VAIReady = true; } return _VAIContent; } }
             private static Java.Lang.Character.UnicodeScript _VAIContent = default;
             private static bool _VAIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#WANCHO"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript WANCHO { get { if (!_WANCHOReady) { _WANCHOContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "WANCHO"); _WANCHOReady = true; } return _WANCHOContent; } }
-            private static Java.Lang.Character.UnicodeScript _WANCHOContent = default;
-            private static bool _WANCHOReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#WARANG_CITI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#WARANG_CITI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript WARANG_CITI { get { if (!_WARANG_CITIReady) { _WARANG_CITIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "WARANG_CITI"); _WARANG_CITIReady = true; } return _WARANG_CITIContent; } }
             private static Java.Lang.Character.UnicodeScript _WARANG_CITIContent = default;
             private static bool _WARANG_CITIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#YEZIDI"/>
-            /// </summary>
-            public static Java.Lang.Character.UnicodeScript YEZIDI { get { if (!_YEZIDIReady) { _YEZIDIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "YEZIDI"); _YEZIDIReady = true; } return _YEZIDIContent; } }
-            private static Java.Lang.Character.UnicodeScript _YEZIDIContent = default;
-            private static bool _YEZIDIReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#YI"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#YI"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript YI { get { if (!_YIReady) { _YIContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "YI"); _YIReady = true; } return _YIContent; } }
             private static Java.Lang.Character.UnicodeScript _YIContent = default;
             private static bool _YIReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#ZANABAZAR_SQUARE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#ZANABAZAR_SQUARE"/>
             /// </summary>
             public static Java.Lang.Character.UnicodeScript ZANABAZAR_SQUARE { get { if (!_ZANABAZAR_SQUAREReady) { _ZANABAZAR_SQUAREContent = SGetField<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "ZANABAZAR_SQUARE"); _ZANABAZAR_SQUAREReady = true; } return _ZANABAZAR_SQUAREContent; } }
             private static Java.Lang.Character.UnicodeScript _ZANABAZAR_SQUAREContent = default;
@@ -4191,7 +3933,7 @@ public partial class UnicodeScript
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#forName(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#forName(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.Character.UnicodeScript"/></returns>
@@ -4200,7 +3942,7 @@ public static Java.Lang.Character.UnicodeScript ForName(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "forName", "(Ljava/lang/String;)Ljava/lang/Character$UnicodeScript;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#of(int)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#of(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Java.Lang.Character.UnicodeScript"/></returns>
@@ -4209,7 +3951,7 @@ public static Java.Lang.Character.UnicodeScript Of(int arg0)
                 return SExecuteWithSignature<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "of", "(I)Ljava/lang/Character$UnicodeScript;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.Character.UnicodeScript"/></returns>
@@ -4218,7 +3960,7 @@ public static Java.Lang.Character.UnicodeScript ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Lang.Character.UnicodeScript>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Character$UnicodeScript;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Character.UnicodeScript.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Character.UnicodeScript.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.Character.UnicodeScript"/></returns>
             public static Java.Lang.Character.UnicodeScript[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Class.cs b/src/net/Netdroid/Generated/Java/Lang/Class.cs
index d30654d5e..e428e6918 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Class.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Class.cs
@@ -58,7 +58,7 @@ public partial class Class
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#forName(java.lang.String,boolean,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#forName(java.lang.String,boolean,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -70,7 +70,7 @@ public static Java.Lang.Class ForName(Java.Lang.String arg0, bool arg1, Java.Lan
             return SExecute<Java.Lang.Class>(LocalBridgeClazz, "forName", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#forName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#forName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Class"/></returns>
@@ -84,281 +84,43 @@ public static Java.Lang.Class ForName(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getAnnotations()"/> 
-        /// </summary>
-        public Java.Lang.Annotation.Annotation[] Annotations
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getCanonicalName()"/> 
-        /// </summary>
-        public Java.Lang.String CanonicalName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCanonicalName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getClasses()"/> 
-        /// </summary>
-        public Java.Lang.Class[] Classes
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getClasses", "()[Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getClassLoader()"/> 
-        /// </summary>
-        public Java.Lang.ClassLoader ClassLoader
-        {
-            get { return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getConstructors()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Constructor[] Constructors
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Constructor>("getConstructors", "()[Ljava/lang/reflect/Constructor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredAnnotations()"/> 
-        /// </summary>
-        public Java.Lang.Annotation.Annotation[] DeclaredAnnotations
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredClasses()"/> 
-        /// </summary>
-        public Java.Lang.Class[] DeclaredClasses
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getDeclaredClasses", "()[Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredConstructors()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Constructor[] DeclaredConstructors
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Constructor>("getDeclaredConstructors", "()[Ljava/lang/reflect/Constructor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredFields()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Field[] DeclaredFields
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Field>("getDeclaredFields", "()[Ljava/lang/reflect/Field;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredMethods()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Method[] DeclaredMethods
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Method>("getDeclaredMethods", "()[Ljava/lang/reflect/Method;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaringClass()"/> 
-        /// </summary>
-        public Java.Lang.Class DeclaringClass
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getEnclosingClass()"/> 
-        /// </summary>
-        public Java.Lang.Class EnclosingClass
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getEnclosingClass", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getEnclosingConstructor()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Constructor EnclosingConstructor
-        {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getEnclosingConstructor", "()Ljava/lang/reflect/Constructor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getEnclosingMethod()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Method EnclosingMethod
-        {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Method>("getEnclosingMethod", "()Ljava/lang/reflect/Method;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getEnumConstants()"/> 
-        /// </summary>
-        public object[] EnumConstants
-        {
-            get { return IExecuteWithSignatureArray<object>("getEnumConstants", "()[Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getFields()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Field[] Fields
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Field>("getFields", "()[Ljava/lang/reflect/Field;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getGenericInterfaces()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Type[] GenericInterfaces
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getGenericInterfaces", "()[Ljava/lang/reflect/Type;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getGenericSuperclass()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Type GenericSuperclass
-        {
-            get { return IExecute<Java.Lang.Reflect.Type>("getGenericSuperclass"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getInterfaces()"/> 
-        /// </summary>
-        public Java.Lang.Class[] Interfaces
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getInterfaces", "()[Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getMethods()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Method[] Methods
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Method>("getMethods", "()[Ljava/lang/reflect/Method;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getModifiers()"/> 
-        /// </summary>
-        public int Modifiers
-        {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getNestHost()"/> 
-        /// </summary>
-        public Java.Lang.Class NestHost
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getNestHost", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getNestMembers()"/> 
-        /// </summary>
-        public Java.Lang.Class[] NestMembers
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getNestMembers", "()[Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getPackage()"/> 
-        /// </summary>
-        public Java.Lang.Package Package
-        {
-            get { return IExecuteWithSignature<Java.Lang.Package>("getPackage", "()Ljava/lang/Package;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getPackageName()"/> 
-        /// </summary>
-        public Java.Lang.String PackageName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getPermittedSubclasses()"/> 
-        /// </summary>
-        public Java.Lang.Class[] PermittedSubclasses
-        {
-            get { return IExecuteArray<Java.Lang.Class>("getPermittedSubclasses"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getProtectionDomain()"/> 
-        /// </summary>
-        public Java.Security.ProtectionDomain ProtectionDomain
-        {
-            get { return IExecuteWithSignature<Java.Security.ProtectionDomain>("getProtectionDomain", "()Ljava/security/ProtectionDomain;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getRecordComponents()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.RecordComponent[] RecordComponents
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.RecordComponent>("getRecordComponents", "()[Ljava/lang/reflect/RecordComponent;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getSigners()"/> 
-        /// </summary>
-        public object[] Signers
-        {
-            get { return IExecuteWithSignatureArray<object>("getSigners", "()[Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getSimpleName()"/> 
-        /// </summary>
-        public Java.Lang.String SimpleName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSimpleName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getSuperclass()"/> 
-        /// </summary>
-        public Java.Lang.Class Superclass
-        {
-            get { return IExecute<Java.Lang.Class>("getSuperclass"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getTypeName()"/> 
-        /// </summary>
-        public Java.Lang.String TypeName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getTypeParameters()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.TypeVariable[] TypeParameters
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.TypeVariable>("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getAnnotation(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
         public Java.Lang.Annotation.Annotation GetAnnotation(Java.Lang.Class arg0)
         {
-            return IExecuteWithSignature<Java.Lang.Annotation.Annotation>("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecute<Java.Lang.Annotation.Annotation>("getAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredAnnotation(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
         public Java.Lang.Annotation.Annotation GetDeclaredAnnotation(Java.Lang.Class arg0)
         {
-            return IExecuteWithSignature<Java.Lang.Annotation.Annotation>("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecute<Java.Lang.Annotation.Annotation>("getDeclaredAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getAnnotationsByType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
         public Java.Lang.Annotation.Annotation[] GetAnnotationsByType(Java.Lang.Class arg0)
         {
-            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteArray<Java.Lang.Annotation.Annotation>("getAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
         public Java.Lang.Annotation.Annotation[] GetDeclaredAnnotationsByType(Java.Lang.Class arg0)
         {
-            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#asSubclass(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#asSubclass(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Class"/></returns>
@@ -367,7 +129,7 @@ public Java.Lang.Class AsSubclass(Java.Lang.Class arg0)
             return IExecute<Java.Lang.Class>("asSubclass", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#desiredAssertionStatus()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#desiredAssertionStatus()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool DesiredAssertionStatus()
@@ -375,7 +137,7 @@ public bool DesiredAssertionStatus()
             return IExecuteWithSignature<bool>("desiredAssertionStatus", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isAnnotation()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isAnnotation()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAnnotation()
@@ -383,7 +145,7 @@ public bool IsAnnotation()
             return IExecuteWithSignature<bool>("isAnnotation", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isAnnotationPresent(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isAnnotationPresent(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -392,7 +154,7 @@ public bool IsAnnotationPresent(Java.Lang.Class arg0)
             return IExecuteWithSignature<bool>("isAnnotationPresent", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isAnonymousClass()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isAnonymousClass()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAnonymousClass()
@@ -400,7 +162,7 @@ public bool IsAnonymousClass()
             return IExecuteWithSignature<bool>("isAnonymousClass", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isEnum()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isEnum()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEnum()
@@ -408,7 +170,7 @@ public bool IsEnum()
             return IExecuteWithSignature<bool>("isEnum", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isLocalClass()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isLocalClass()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLocalClass()
@@ -416,7 +178,7 @@ public bool IsLocalClass()
             return IExecuteWithSignature<bool>("isLocalClass", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isMemberClass()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isMemberClass()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMemberClass()
@@ -424,7 +186,7 @@ public bool IsMemberClass()
             return IExecuteWithSignature<bool>("isMemberClass", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isNestmateOf(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isNestmateOf(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -433,23 +195,7 @@ public bool IsNestmateOf(Java.Lang.Class arg0)
             return IExecuteWithSignature<bool>("isNestmateOf", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isRecord()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRecord()
-        {
-            return IExecuteWithSignature<bool>("isRecord", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isSealed()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSealed()
-        {
-            return IExecuteWithSignature<bool>("isSealed", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isSynthetic()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isSynthetic()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsSynthetic()
@@ -457,7 +203,7 @@ public bool IsSynthetic()
             return IExecuteWithSignature<bool>("isSynthetic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getResourceAsStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getResourceAsStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -466,556 +212,553 @@ public Java.Io.InputStream GetResourceAsStream(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.InputStream>("getResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getComponentType()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getAnnotations()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.Class"/></returns>
-        public Java.Lang.Class GetComponentType()
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetAnnotations()
         {
-            return IExecuteWithSignature<Java.Lang.Class>("getComponentType", "()Ljava/lang/Class;");
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#arrayType()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredAnnotations()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfField ArrayType()
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetDeclaredAnnotations()
         {
-            return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("arrayType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#componentType()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getComponentType()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfField ComponentType()
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetComponentType()
         {
-            return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("componentType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
+            return IExecuteWithSignature<Java.Lang.Class>("getComponentType", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getConstructor(java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaringClass()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
-        /// <exception cref="Java.Lang.NoSuchMethodException"/>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
         /// <exception cref="Java.Lang.SecurityException"/>
-        public Java.Lang.Reflect.Constructor GetConstructor(params Java.Lang.Class[] arg0)
+        public Java.Lang.Class GetDeclaringClass()
         {
-            if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;"); else return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;", arg0);
+            return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredConstructor(java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getEnclosingClass()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
-        /// <exception cref="Java.Lang.NoSuchMethodException"/>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
         /// <exception cref="Java.Lang.SecurityException"/>
-        public Java.Lang.Reflect.Constructor GetDeclaredConstructor(params Java.Lang.Class[] arg0)
+        public Java.Lang.Class GetEnclosingClass()
         {
-            if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getDeclaredConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;"); else return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getDeclaredConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;", arg0);
+            return IExecuteWithSignature<Java.Lang.Class>("getEnclosingClass", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredField(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getNestHost()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
-        /// <exception cref="Java.Lang.NoSuchFieldException"/>
-        /// <exception cref="Java.Lang.SecurityException"/>
-        public Java.Lang.Reflect.Field GetDeclaredField(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetNestHost()
         {
-            return IExecuteWithSignature<Java.Lang.Reflect.Field>("getDeclaredField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;", arg0);
+            return IExecuteWithSignature<Java.Lang.Class>("getNestHost", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getField(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getClasses()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
-        /// <exception cref="Java.Lang.NoSuchFieldException"/>
-        /// <exception cref="Java.Lang.SecurityException"/>
-        public Java.Lang.Reflect.Field GetField(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] GetClasses()
         {
-            return IExecuteWithSignature<Java.Lang.Reflect.Field>("getField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getClasses", "()[Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredMethod(java.lang.String,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredClasses()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
-        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
-        /// <exception cref="Java.Lang.NoSuchMethodException"/>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
         /// <exception cref="Java.Lang.SecurityException"/>
-        public Java.Lang.Reflect.Method GetDeclaredMethod(Java.Lang.String arg0, params Java.Lang.Class[] arg1)
+        public Java.Lang.Class[] GetDeclaredClasses()
         {
-            if (arg1.Length == 0) return IExecute<Java.Lang.Reflect.Method>("getDeclaredMethod", arg0); else return IExecute<Java.Lang.Reflect.Method>("getDeclaredMethod", arg0, arg1);
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getDeclaredClasses", "()[Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getMethod(java.lang.String,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getInterfaces()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
-        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
-        /// <exception cref="Java.Lang.NoSuchMethodException"/>
-        /// <exception cref="Java.Lang.SecurityException"/>
-        public Java.Lang.Reflect.Method GetMethod(Java.Lang.String arg0, params Java.Lang.Class[] arg1)
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] GetInterfaces()
         {
-            if (arg1.Length == 0) return IExecute<Java.Lang.Reflect.Method>("getMethod", arg0); else return IExecute<Java.Lang.Reflect.Method>("getMethod", arg0, arg1);
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getInterfaces", "()[Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#descriptorString()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getNestMembers()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String DescriptorString()
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] GetNestMembers()
         {
-            return IExecuteWithSignature<Java.Lang.String>("descriptorString", "()Ljava/lang/String;");
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getNestMembers", "()[Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#toGenericString()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getClassLoader()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToGenericString()
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public Java.Lang.ClassLoader GetClassLoader()
         {
-            return IExecuteWithSignature<Java.Lang.String>("toGenericString", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getResource(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getPackage()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Net.URL"/></returns>
-        public Java.Net.URL GetResource(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.Package"/></returns>
+        public Java.Lang.Package GetPackage()
         {
-            return IExecuteWithSignature<Java.Net.URL>("getResource", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
+            return IExecuteWithSignature<Java.Lang.Package>("getPackage", "()Ljava/lang/Package;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isArray()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getEnclosingConstructor()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsArray()
+        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Constructor GetEnclosingConstructor()
         {
-            return IExecuteWithSignature<bool>("isArray", "()Z");
+            return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getEnclosingConstructor", "()Ljava/lang/reflect/Constructor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isAssignableFrom(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getConstructors()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAssignableFrom(Java.Lang.Class arg0)
+        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Constructor[] GetConstructors()
         {
-            return IExecuteWithSignature<bool>("isAssignableFrom", "(Ljava/lang/Class;)Z", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Constructor>("getConstructors", "()[Ljava/lang/reflect/Constructor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isHidden()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredConstructors()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHidden()
+        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Constructor[] GetDeclaredConstructors()
         {
-            return IExecuteWithSignature<bool>("isHidden", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Constructor>("getDeclaredConstructors", "()[Ljava/lang/reflect/Constructor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isInstance(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getConstructor(java.lang.Class[])"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInstance(object arg0)
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
+        /// <exception cref="Java.Lang.NoSuchMethodException"/>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Constructor GetConstructor(params Java.Lang.Class[] arg0)
         {
-            return IExecuteWithSignature<bool>("isInstance", "(Ljava/lang/Object;)Z", arg0);
+            if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;"); else return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isInterface()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredConstructor(java.lang.Class[])"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInterface()
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
+        /// <exception cref="Java.Lang.NoSuchMethodException"/>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Constructor GetDeclaredConstructor(params Java.Lang.Class[] arg0)
         {
-            return IExecuteWithSignature<bool>("isInterface", "()Z");
+            if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getDeclaredConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;"); else return IExecuteWithSignature<Java.Lang.Reflect.Constructor>("getDeclaredConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isPrimitive()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredField(java.lang.String)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPrimitive()
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
+        /// <exception cref="Java.Lang.NoSuchFieldException"/>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Field GetDeclaredField(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<bool>("isPrimitive", "()Z");
+            return IExecuteWithSignature<Java.Lang.Reflect.Field>("getDeclaredField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#cast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getField(java.lang.String)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="object"/></returns>
-        public object Cast(object arg0)
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
+        /// <exception cref="Java.Lang.NoSuchFieldException"/>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Field GetField(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature("cast", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Java.Lang.Reflect.Field>("getField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#newInstance()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredFields()"/>
         /// </summary>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Lang.InstantiationException"/>
-        /// <exception cref="Java.Lang.IllegalAccessException"/>
-        [System.Obsolete()]
-        public object NewInstance()
+        /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Field[] GetDeclaredFields()
         {
-            return IExecuteWithSignature("newInstance", "()Ljava/lang/Object;");
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Field>("getDeclaredFields", "()[Ljava/lang/reflect/Field;");
         }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region Class<T>
-    public partial class Class<T> : Java.Io.ISerializable, Java.Lang.Reflect.IGenericDeclaration, Java.Lang.Reflect.IType, Java.Lang.Reflect.IAnnotatedElement
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
         /// <summary>
-        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Io.Serializable"/>
-        /// </summary>
-        public static implicit operator Java.Io.Serializable(Java.Lang.Class<T> t) => t.Cast<Java.Io.Serializable>();
-        /// <summary>
-        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Lang.Reflect.GenericDeclaration"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getFields()"/>
         /// </summary>
-        public static implicit operator Java.Lang.Reflect.GenericDeclaration(Java.Lang.Class<T> t) => t.Cast<Java.Lang.Reflect.GenericDeclaration>();
-        /// <summary>
-        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Lang.Reflect.Type"/>
-        /// </summary>
-        public static implicit operator Java.Lang.Reflect.Type(Java.Lang.Class<T> t) => t.Cast<Java.Lang.Reflect.Type>();
-        /// <summary>
-        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Lang.Reflect.AnnotatedElement"/>
-        /// </summary>
-        public static implicit operator Java.Lang.Reflect.AnnotatedElement(Java.Lang.Class<T> t) => t.Cast<Java.Lang.Reflect.AnnotatedElement>();
-        /// <summary>
-        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Lang.Class"/>
-        /// </summary>
-        public static implicit operator Java.Lang.Class(Java.Lang.Class<T> t) => t.Cast<Java.Lang.Class>();
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#forName(java.lang.String,boolean,java.lang.ClassLoader)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.ClassLoader"/></param>
-        /// <returns><see cref="Java.Lang.Class"/></returns>
-        /// <exception cref="Java.Lang.ClassNotFoundException"/>
-        public static Java.Lang.Class ForName(Java.Lang.String arg0, bool arg1, Java.Lang.ClassLoader arg2)
+        /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Field[] GetFields()
         {
-            return SExecute<Java.Lang.Class>(LocalBridgeClazz, "forName", arg0, arg1, arg2);
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Field>("getFields", "()[Ljava/lang/reflect/Field;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#forName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredMethod(java.lang.String,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.Class"/></returns>
-        /// <exception cref="Java.Lang.ClassNotFoundException"/>
-        public static Java.Lang.Class ForName(Java.Lang.String arg0)
-        {
-            return SExecuteWithSignature<Java.Lang.Class>(LocalBridgeClazz, "forName", "(Ljava/lang/String;)Ljava/lang/Class;", arg0);
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getAnnotations()"/> 
-        /// </summary>
-        public Java.Lang.Annotation.Annotation[] Annotations
+        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
+        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
+        /// <exception cref="Java.Lang.NoSuchMethodException"/>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Method GetDeclaredMethod(Java.Lang.String arg0, params Java.Lang.Class[] arg1)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
+            if (arg1.Length == 0) return IExecute<Java.Lang.Reflect.Method>("getDeclaredMethod", arg0); else return IExecute<Java.Lang.Reflect.Method>("getDeclaredMethod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getCanonicalName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getEnclosingMethod()"/>
         /// </summary>
-        public Java.Lang.String CanonicalName
+        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Method GetEnclosingMethod()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCanonicalName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.Reflect.Method>("getEnclosingMethod", "()Ljava/lang/reflect/Method;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getClasses()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getMethod(java.lang.String,java.lang.Class[])"/>
         /// </summary>
-        public Java.Lang.Class[] Classes
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
+        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
+        /// <exception cref="Java.Lang.NoSuchMethodException"/>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Method GetMethod(Java.Lang.String arg0, params Java.Lang.Class[] arg1)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getClasses", "()[Ljava/lang/Class;"); }
+            if (arg1.Length == 0) return IExecute<Java.Lang.Reflect.Method>("getMethod", arg0); else return IExecute<Java.Lang.Reflect.Method>("getMethod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getClassLoader()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredMethods()"/>
         /// </summary>
-        public Java.Lang.ClassLoader ClassLoader
+        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Method[] GetDeclaredMethods()
         {
-            get { return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Method>("getDeclaredMethods", "()[Ljava/lang/reflect/Method;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getConstructors()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getMethods()"/>
         /// </summary>
-        public Java.Lang.Reflect.Constructor<object>[] Constructors
+        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Method[] GetMethods()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Constructor<object>>("getConstructors", "()[Ljava/lang/reflect/Constructor;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Method>("getMethods", "()[Ljava/lang/reflect/Method;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredAnnotations()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getGenericSuperclass()"/>
         /// </summary>
-        public Java.Lang.Annotation.Annotation[] DeclaredAnnotations
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type GetGenericSuperclass()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
+            return IExecute<Java.Lang.Reflect.Type>("getGenericSuperclass");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredClasses()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getGenericInterfaces()"/>
         /// </summary>
-        public Java.Lang.Class[] DeclaredClasses
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetGenericInterfaces()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getDeclaredClasses", "()[Ljava/lang/Class;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getGenericInterfaces", "()[Ljava/lang/reflect/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredConstructors()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getTypeParameters()"/>
         /// </summary>
-        public Java.Lang.Reflect.Constructor<object>[] DeclaredConstructors
+        /// <returns><see cref="Java.Lang.Reflect.TypeVariable"/></returns>
+        public Java.Lang.Reflect.TypeVariable[] GetTypeParameters()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Constructor<object>>("getDeclaredConstructors", "()[Ljava/lang/reflect/Constructor;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.TypeVariable>("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredFields()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getCanonicalName()"/>
         /// </summary>
-        public Java.Lang.Reflect.Field[] DeclaredFields
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCanonicalName()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Field>("getDeclaredFields", "()[Ljava/lang/reflect/Field;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCanonicalName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredMethods()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getName()"/>
         /// </summary>
-        public Java.Lang.Reflect.Method[] DeclaredMethods
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Method>("getDeclaredMethods", "()[Ljava/lang/reflect/Method;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaringClass()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getPackageName()"/>
         /// </summary>
-        public Java.Lang.Class DeclaringClass
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getEnclosingClass()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getSimpleName()"/>
         /// </summary>
-        public Java.Lang.Class EnclosingClass
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSimpleName()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getEnclosingClass", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSimpleName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getEnclosingConstructor()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getTypeName()"/>
         /// </summary>
-        public Java.Lang.Reflect.Constructor<object> EnclosingConstructor
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTypeName()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Constructor<object>>("getEnclosingConstructor", "()Ljava/lang/reflect/Constructor;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getEnclosingMethod()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#toGenericString()"/>
         /// </summary>
-        public Java.Lang.Reflect.Method EnclosingMethod
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String ToGenericString()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Method>("getEnclosingMethod", "()Ljava/lang/reflect/Method;"); }
+            return IExecuteWithSignature<Java.Lang.String>("toGenericString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getEnumConstants()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getResource(java.lang.String)"/>
         /// </summary>
-        public T[] EnumConstants
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Net.URL"/></returns>
+        public Java.Net.URL GetResource(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignatureArray<T>("getEnumConstants", "()[Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Java.Net.URL>("getResource", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getFields()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getProtectionDomain()"/>
         /// </summary>
-        public Java.Lang.Reflect.Field[] Fields
+        /// <returns><see cref="Java.Security.ProtectionDomain"/></returns>
+        public Java.Security.ProtectionDomain GetProtectionDomain()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Field>("getFields", "()[Ljava/lang/reflect/Field;"); }
+            return IExecuteWithSignature<Java.Security.ProtectionDomain>("getProtectionDomain", "()Ljava/security/ProtectionDomain;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getGenericInterfaces()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isArray()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type[] GenericInterfaces
+        /// <returns><see cref="bool"/></returns>
+        public bool IsArray()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getGenericInterfaces", "()[Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<bool>("isArray", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getGenericSuperclass()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isAssignableFrom(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.Reflect.Type GenericSuperclass
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAssignableFrom(Java.Lang.Class arg0)
         {
-            get { return IExecute<Java.Lang.Reflect.Type>("getGenericSuperclass"); }
+            return IExecuteWithSignature<bool>("isAssignableFrom", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getInterfaces()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isInstance(java.lang.Object)"/>
         /// </summary>
-        public Java.Lang.Class[] Interfaces
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInstance(object arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getInterfaces", "()[Ljava/lang/Class;"); }
+            return IExecuteWithSignature<bool>("isInstance", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getMethods()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isInterface()"/>
         /// </summary>
-        public Java.Lang.Reflect.Method[] Methods
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInterface()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Method>("getMethods", "()[Ljava/lang/reflect/Method;"); }
+            return IExecuteWithSignature<bool>("isInterface", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getModifiers()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isPrimitive()"/>
         /// </summary>
-        public int Modifiers
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPrimitive()
         {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
+            return IExecuteWithSignature<bool>("isPrimitive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getModifiers()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getNestHost()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getSuperclass()"/>
         /// </summary>
-        public Java.Lang.Class NestHost
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetSuperclass()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getNestHost", "()Ljava/lang/Class;"); }
+            return IExecute<Java.Lang.Class>("getSuperclass");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getNestMembers()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getSigners()"/>
         /// </summary>
-        public Java.Lang.Class[] NestMembers
+        /// <returns><see cref="object"/></returns>
+        public object[] GetSigners()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getNestMembers", "()[Ljava/lang/Class;"); }
+            return IExecuteWithSignatureArray<object>("getSigners", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getPackage()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#cast(java.lang.Object)"/>
         /// </summary>
-        public Java.Lang.Package Package
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="object"/></returns>
+        public object Cast(object arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.Package>("getPackage", "()Ljava/lang/Package;"); }
+            return IExecuteWithSignature("cast", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getPackageName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#newInstance()"/>
         /// </summary>
-        public Java.Lang.String PackageName
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Lang.InstantiationException"/>
+        /// <exception cref="Java.Lang.IllegalAccessException"/>
+        [global::System.Obsolete()]
+        public object NewInstance()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature("newInstance", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getPermittedSubclasses()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getEnumConstants()"/>
         /// </summary>
-        public Java.Lang.Class[] PermittedSubclasses
+        /// <returns><see cref="object"/></returns>
+        public object[] GetEnumConstants()
         {
-            get { return IExecuteArray<Java.Lang.Class>("getPermittedSubclasses"); }
+            return IExecuteWithSignatureArray<object>("getEnumConstants", "()[Ljava/lang/Object;");
         }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region Class<T>
+    public partial class Class<T> : Java.Io.ISerializable, Java.Lang.Reflect.IGenericDeclaration, Java.Lang.Reflect.IType, Java.Lang.Reflect.IAnnotatedElement
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getProtectionDomain()"/> 
+        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Io.Serializable"/>
         /// </summary>
-        public Java.Security.ProtectionDomain ProtectionDomain
-        {
-            get { return IExecuteWithSignature<Java.Security.ProtectionDomain>("getProtectionDomain", "()Ljava/security/ProtectionDomain;"); }
-        }
+        public static implicit operator Java.Io.Serializable(Java.Lang.Class<T> t) => t.Cast<Java.Io.Serializable>();
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getRecordComponents()"/> 
+        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Lang.Reflect.GenericDeclaration"/>
         /// </summary>
-        public Java.Lang.Reflect.RecordComponent[] RecordComponents
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.RecordComponent>("getRecordComponents", "()[Ljava/lang/reflect/RecordComponent;"); }
-        }
+        public static implicit operator Java.Lang.Reflect.GenericDeclaration(Java.Lang.Class<T> t) => t.Cast<Java.Lang.Reflect.GenericDeclaration>();
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getSigners()"/> 
+        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Lang.Reflect.Type"/>
         /// </summary>
-        public object[] Signers
-        {
-            get { return IExecuteWithSignatureArray<object>("getSigners", "()[Ljava/lang/Object;"); }
-        }
+        public static implicit operator Java.Lang.Reflect.Type(Java.Lang.Class<T> t) => t.Cast<Java.Lang.Reflect.Type>();
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getSimpleName()"/> 
+        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Lang.Reflect.AnnotatedElement"/>
         /// </summary>
-        public Java.Lang.String SimpleName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSimpleName", "()Ljava/lang/String;"); }
-        }
+        public static implicit operator Java.Lang.Reflect.AnnotatedElement(Java.Lang.Class<T> t) => t.Cast<Java.Lang.Reflect.AnnotatedElement>();
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getSuperclass()"/> 
+        /// Converter from <see cref="Java.Lang.Class{T}"/> to <see cref="Java.Lang.Class"/>
         /// </summary>
-        public Java.Lang.Class Superclass
-        {
-            get { return IExecute<Java.Lang.Class>("getSuperclass"); }
-        }
+        public static implicit operator Java.Lang.Class(Java.Lang.Class<T> t) => t.Cast<Java.Lang.Class>();
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getTypeName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#forName(java.lang.String,boolean,java.lang.ClassLoader)"/>
         /// </summary>
-        public Java.Lang.String TypeName
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="bool"/></param>
+        /// <param name="arg2"><see cref="Java.Lang.ClassLoader"/></param>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        /// <exception cref="Java.Lang.ClassNotFoundException"/>
+        public static Java.Lang.Class ForName(Java.Lang.String arg0, bool arg1, Java.Lang.ClassLoader arg2)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;"); }
+            return SExecute<Java.Lang.Class>(LocalBridgeClazz, "forName", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getTypeParameters()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#forName(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.Reflect.TypeVariable<Java.Lang.Class>[] TypeParameters
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        /// <exception cref="Java.Lang.ClassNotFoundException"/>
+        public static Java.Lang.Class ForName(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.TypeVariable<Java.Lang.Class>>("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;"); }
+            return SExecuteWithSignature<Java.Lang.Class>(LocalBridgeClazz, "forName", "(Ljava/lang/String;)Ljava/lang/Class;", arg0);
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getAnnotation(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
-        public A GetAnnotation<A>(Java.Lang.Class arg0) where A: Java.Lang.Annotation.IAnnotation, new()
+        public A GetAnnotation<A>(Java.Lang.Class arg0) where A : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignature<A>("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecute<A>("getAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredAnnotation(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
-        public A GetDeclaredAnnotation<A>(Java.Lang.Class arg0) where A: Java.Lang.Annotation.IAnnotation, new()
+        public A GetDeclaredAnnotation<A>(Java.Lang.Class arg0) where A : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignature<A>("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecute<A>("getDeclaredAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getAnnotationsByType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
-        public A[] GetAnnotationsByType<A>(Java.Lang.Class arg0) where A: Java.Lang.Annotation.IAnnotation, new()
+        public A[] GetAnnotationsByType<A>(Java.Lang.Class arg0) where A : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignatureArray<A>("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteArray<A>("getAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
-        public A[] GetDeclaredAnnotationsByType<A>(Java.Lang.Class arg0) where A: Java.Lang.Annotation.IAnnotation, new()
+        public A[] GetDeclaredAnnotationsByType<A>(Java.Lang.Class arg0) where A : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignatureArray<A>("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteArray<A>("getDeclaredAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#asSubclass(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#asSubclass(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="ReturnExtendsU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="U"></typeparam>
         /// <returns><see cref="Java.Lang.Class"/></returns>
-        public Java.Lang.Class AsSubclass<ReturnExtendsU, U>(Java.Lang.Class arg0) where ReturnExtendsU: U
+        public Java.Lang.Class AsSubclass<ReturnExtendsU, U>(Java.Lang.Class arg0) where ReturnExtendsU : U
         {
             return IExecute<Java.Lang.Class>("asSubclass", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#desiredAssertionStatus()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#desiredAssertionStatus()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool DesiredAssertionStatus()
@@ -1023,7 +766,7 @@ public bool DesiredAssertionStatus()
             return IExecuteWithSignature<bool>("desiredAssertionStatus", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isAnnotation()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isAnnotation()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAnnotation()
@@ -1031,7 +774,7 @@ public bool IsAnnotation()
             return IExecuteWithSignature<bool>("isAnnotation", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isAnnotationPresent(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isAnnotationPresent(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1040,7 +783,7 @@ public bool IsAnnotationPresent(Java.Lang.Class arg0)
             return IExecuteWithSignature<bool>("isAnnotationPresent", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isAnonymousClass()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isAnonymousClass()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAnonymousClass()
@@ -1048,7 +791,7 @@ public bool IsAnonymousClass()
             return IExecuteWithSignature<bool>("isAnonymousClass", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isEnum()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isEnum()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEnum()
@@ -1056,7 +799,7 @@ public bool IsEnum()
             return IExecuteWithSignature<bool>("isEnum", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isLocalClass()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isLocalClass()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLocalClass()
@@ -1064,7 +807,7 @@ public bool IsLocalClass()
             return IExecuteWithSignature<bool>("isLocalClass", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isMemberClass()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isMemberClass()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMemberClass()
@@ -1072,7 +815,7 @@ public bool IsMemberClass()
             return IExecuteWithSignature<bool>("isMemberClass", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isNestmateOf(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isNestmateOf(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1081,40 +824,40 @@ public bool IsNestmateOf(Java.Lang.Class arg0)
             return IExecuteWithSignature<bool>("isNestmateOf", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isRecord()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isSynthetic()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        public bool IsRecord()
+        public bool IsSynthetic()
         {
-            return IExecuteWithSignature<bool>("isRecord", "()Z");
+            return IExecuteWithSignature<bool>("isSynthetic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isSealed()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getResourceAsStream(java.lang.String)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSealed()
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetResourceAsStream(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<bool>("isSealed", "()Z");
+            return IExecuteWithSignature<Java.Io.InputStream>("getResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isSynthetic()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getAnnotations()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSynthetic()
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetAnnotations()
         {
-            return IExecuteWithSignature<bool>("isSynthetic", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getResourceAsStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredAnnotations()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Io.InputStream"/></returns>
-        public Java.Io.InputStream GetResourceAsStream(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetDeclaredAnnotations()
         {
-            return IExecuteWithSignature<Java.Io.InputStream>("getResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getComponentType()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getComponentType()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Class"/></returns>
         public Java.Lang.Class GetComponentType()
@@ -1122,23 +865,109 @@ public Java.Lang.Class GetComponentType()
             return IExecuteWithSignature<Java.Lang.Class>("getComponentType", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#arrayType()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaringClass()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Class GetDeclaringClass()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getEnclosingClass()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Class GetEnclosingClass()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getEnclosingClass", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getNestHost()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetNestHost()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getNestHost", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getClasses()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] GetClasses()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getClasses", "()[Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredClasses()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Class[] GetDeclaredClasses()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getDeclaredClasses", "()[Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getInterfaces()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] GetInterfaces()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getInterfaces", "()[Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getNestMembers()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] GetNestMembers()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getNestMembers", "()[Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getClassLoader()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public Java.Lang.ClassLoader GetClassLoader()
+        {
+            return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getPackage()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Package"/></returns>
+        public Java.Lang.Package GetPackage()
+        {
+            return IExecuteWithSignature<Java.Lang.Package>("getPackage", "()Ljava/lang/Package;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getEnclosingConstructor()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Constructor<object> GetEnclosingConstructor()
+        {
+            return IExecuteWithSignature<Java.Lang.Reflect.Constructor<object>>("getEnclosingConstructor", "()Ljava/lang/reflect/Constructor;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getConstructors()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfField ArrayType()
+        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Constructor<object>[] GetConstructors()
         {
-            return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("arrayType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Constructor<object>>("getConstructors", "()[Ljava/lang/reflect/Constructor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#componentType()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredConstructors()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfField ComponentType()
+        /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Constructor<object>[] GetDeclaredConstructors()
         {
-            return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("componentType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Constructor<object>>("getDeclaredConstructors", "()[Ljava/lang/reflect/Constructor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getConstructor(java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getConstructor(java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
@@ -1149,7 +978,7 @@ public Java.Lang.Reflect.Constructor<T> GetConstructor(params Java.Lang.Class[]
             if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.Reflect.Constructor<T>>("getConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;"); else return IExecuteWithSignature<Java.Lang.Reflect.Constructor<T>>("getConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredConstructor(java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredConstructor(java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Reflect.Constructor"/></returns>
@@ -1160,7 +989,7 @@ public Java.Lang.Reflect.Constructor<T> GetDeclaredConstructor(params Java.Lang.
             if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.Reflect.Constructor<T>>("getDeclaredConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;"); else return IExecuteWithSignature<Java.Lang.Reflect.Constructor<T>>("getDeclaredConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredField(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredField(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
@@ -1171,7 +1000,7 @@ public Java.Lang.Reflect.Field GetDeclaredField(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.Reflect.Field>("getDeclaredField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getField(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getField(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
@@ -1182,7 +1011,25 @@ public Java.Lang.Reflect.Field GetField(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.Reflect.Field>("getField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getDeclaredMethod(java.lang.String,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredFields()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Field[] GetDeclaredFields()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Field>("getDeclaredFields", "()[Ljava/lang/reflect/Field;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getFields()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Field"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Field[] GetFields()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Field>("getFields", "()[Ljava/lang/reflect/Field;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredMethod(java.lang.String,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -1194,7 +1041,16 @@ public Java.Lang.Reflect.Method GetDeclaredMethod(Java.Lang.String arg0, params
             if (arg1.Length == 0) return IExecute<Java.Lang.Reflect.Method>("getDeclaredMethod", arg0); else return IExecute<Java.Lang.Reflect.Method>("getDeclaredMethod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getMethod(java.lang.String,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getEnclosingMethod()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Method GetEnclosingMethod()
+        {
+            return IExecuteWithSignature<Java.Lang.Reflect.Method>("getEnclosingMethod", "()Ljava/lang/reflect/Method;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getMethod(java.lang.String,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -1206,15 +1062,89 @@ public Java.Lang.Reflect.Method GetMethod(Java.Lang.String arg0, params Java.Lan
             if (arg1.Length == 0) return IExecute<Java.Lang.Reflect.Method>("getMethod", arg0); else return IExecute<Java.Lang.Reflect.Method>("getMethod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#descriptorString()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getDeclaredMethods()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Method[] GetDeclaredMethods()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Method>("getDeclaredMethods", "()[Ljava/lang/reflect/Method;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getMethods()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Method"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public Java.Lang.Reflect.Method[] GetMethods()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Method>("getMethods", "()[Ljava/lang/reflect/Method;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getGenericSuperclass()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type GetGenericSuperclass()
+        {
+            return IExecute<Java.Lang.Reflect.Type>("getGenericSuperclass");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getGenericInterfaces()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetGenericInterfaces()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getGenericInterfaces", "()[Ljava/lang/reflect/Type;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getTypeParameters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.TypeVariable"/></returns>
+        public Java.Lang.Reflect.TypeVariable<Java.Lang.Class>[] GetTypeParameters()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.TypeVariable<Java.Lang.Class>>("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getCanonicalName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCanonicalName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCanonicalName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getPackageName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPackageName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPackageName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getSimpleName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSimpleName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSimpleName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getTypeName()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String DescriptorString()
+        public Java.Lang.String GetTypeName()
         {
-            return IExecuteWithSignature<Java.Lang.String>("descriptorString", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#toGenericString()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#toGenericString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToGenericString()
@@ -1222,7 +1152,7 @@ public Java.Lang.String ToGenericString()
             return IExecuteWithSignature<Java.Lang.String>("toGenericString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#getResource(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getResource(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URL"/></returns>
@@ -1231,7 +1161,15 @@ public Java.Net.URL GetResource(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Net.URL>("getResource", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isArray()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getProtectionDomain()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.ProtectionDomain"/></returns>
+        public Java.Security.ProtectionDomain GetProtectionDomain()
+        {
+            return IExecuteWithSignature<Java.Security.ProtectionDomain>("getProtectionDomain", "()Ljava/security/ProtectionDomain;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isArray()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsArray()
@@ -1239,7 +1177,7 @@ public bool IsArray()
             return IExecuteWithSignature<bool>("isArray", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isAssignableFrom(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isAssignableFrom(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1248,15 +1186,7 @@ public bool IsAssignableFrom(Java.Lang.Class arg0)
             return IExecuteWithSignature<bool>("isAssignableFrom", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isHidden()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHidden()
-        {
-            return IExecuteWithSignature<bool>("isHidden", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isInstance(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isInstance(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1265,7 +1195,7 @@ public bool IsInstance(object arg0)
             return IExecuteWithSignature<bool>("isInstance", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isInterface()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isInterface()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsInterface()
@@ -1273,7 +1203,7 @@ public bool IsInterface()
             return IExecuteWithSignature<bool>("isInterface", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#isPrimitive()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#isPrimitive()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsPrimitive()
@@ -1281,7 +1211,32 @@ public bool IsPrimitive()
             return IExecuteWithSignature<bool>("isPrimitive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#cast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getModifiers()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
+        {
+            return IExecuteWithSignature<int>("getModifiers", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getSuperclass()"/>
+        /// </summary>
+        /// <typeparam name="ReturnobjectSuperT"><typeparamref name="T"/></typeparam>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetSuperclass<ReturnobjectSuperT>() where ReturnobjectSuperT : T
+        {
+            return IExecute<Java.Lang.Class>("getSuperclass");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getSigners()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object[] GetSigners()
+        {
+            return IExecuteWithSignatureArray<object>("getSigners", "()[Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#cast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><typeparamref name="T"/></returns>
@@ -1290,16 +1245,24 @@ public T Cast(object arg0)
             return IExecuteWithSignature<T>("cast", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Class.html#newInstance()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#newInstance()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Lang.InstantiationException"/>
         /// <exception cref="Java.Lang.IllegalAccessException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public T NewInstance()
         {
             return IExecuteWithSignature<T>("newInstance", "()Ljava/lang/Object;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Class.html#getEnumConstants()"/>
+        /// </summary>
+        /// <returns><typeparamref name="T"/></returns>
+        public T[] GetEnumConstants()
+        {
+            return IExecuteWithSignatureArray<T>("getEnumConstants", "()[Ljava/lang/Object;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Lang/ClassLoader.cs b/src/net/Netdroid/Generated/Java/Lang/ClassLoader.cs
index 4ec9c78ec..0f6550405 100644
--- a/src/net/Netdroid/Generated/Java/Lang/ClassLoader.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/ClassLoader.cs
@@ -42,30 +42,32 @@ public partial class ClassLoader
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getPlatformClassLoader()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getSystemResourceAsStream(java.lang.String)"/>
         /// </summary>
-        public static Java.Lang.ClassLoader PlatformClassLoader
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public static Java.Io.InputStream GetSystemResourceAsStream(Java.Lang.String arg0)
         {
-            get { return SExecuteWithSignature<Java.Lang.ClassLoader>(LocalBridgeClazz, "getPlatformClassLoader", "()Ljava/lang/ClassLoader;"); }
+            return SExecuteWithSignature<Java.Io.InputStream>(LocalBridgeClazz, "getSystemResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getSystemClassLoader()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getPlatformClassLoader()"/>
         /// </summary>
-        public static Java.Lang.ClassLoader SystemClassLoader
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public static Java.Lang.ClassLoader GetPlatformClassLoader()
         {
-            get { return SExecuteWithSignature<Java.Lang.ClassLoader>(LocalBridgeClazz, "getSystemClassLoader", "()Ljava/lang/ClassLoader;"); }
+            return SExecuteWithSignature<Java.Lang.ClassLoader>(LocalBridgeClazz, "getPlatformClassLoader", "()Ljava/lang/ClassLoader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getSystemResourceAsStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getSystemClassLoader()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Io.InputStream"/></returns>
-        public static Java.Io.InputStream GetSystemResourceAsStream(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public static Java.Lang.ClassLoader GetSystemClassLoader()
         {
-            return SExecuteWithSignature<Java.Io.InputStream>(LocalBridgeClazz, "getSystemResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
+            return SExecuteWithSignature<Java.Lang.ClassLoader>(LocalBridgeClazz, "getSystemClassLoader", "()Ljava/lang/ClassLoader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getSystemResource(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getSystemResource(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URL"/></returns>
@@ -74,7 +76,7 @@ public static Java.Net.URL GetSystemResource(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Net.URL>(LocalBridgeClazz, "getSystemResource", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getSystemResources(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getSystemResources(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
@@ -88,45 +90,40 @@ public static Java.Net.URL GetSystemResource(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getDefinedPackages()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#isRegisteredAsParallelCapable()"/>
         /// </summary>
-        public Java.Lang.Package[] DefinedPackages
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Package>("getDefinedPackages", "()[Ljava/lang/Package;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRegisteredAsParallelCapable()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isRegisteredAsParallelCapable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getParent()"/>
         /// </summary>
-        public Java.Lang.ClassLoader Parent
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public Java.Lang.ClassLoader GetParent()
         {
-            get { return IExecuteWithSignature<Java.Lang.ClassLoader>("getParent", "()Ljava/lang/ClassLoader;"); }
+            return IExecuteWithSignature<Java.Lang.ClassLoader>("getParent", "()Ljava/lang/ClassLoader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#isRegisteredAsParallelCapable()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getDefinedPackage(java.lang.String)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRegisteredAsParallelCapable()
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.Package"/></returns>
+        public Java.Lang.Package GetDefinedPackage(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<bool>("isRegisteredAsParallelCapable", "()Z");
+            return IExecuteWithSignature<Java.Lang.Package>("getDefinedPackage", "(Ljava/lang/String;)Ljava/lang/Package;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getDefinedPackage(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getDefinedPackages()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Package"/></returns>
-        public Java.Lang.Package GetDefinedPackage(Java.Lang.String arg0)
+        public Java.Lang.Package[] GetDefinedPackages()
         {
-            return IExecuteWithSignature<Java.Lang.Package>("getDefinedPackage", "(Ljava/lang/String;)Ljava/lang/Package;", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.Package>("getDefinedPackages", "()[Ljava/lang/Package;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getResourceAsStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getResourceAsStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -135,7 +132,7 @@ public Java.Io.InputStream GetResourceAsStream(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.InputStream>("getResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#loadClass(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#loadClass(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Class"/></returns>
@@ -145,7 +142,15 @@ public Java.Lang.Class LoadClass(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.Class>("loadClass", "(Ljava/lang/String;)Ljava/lang/Class;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getResource(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getResource(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URL"/></returns>
@@ -154,7 +159,7 @@ public Java.Net.URL GetResource(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Net.URL>("getResource", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#getResources(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#getResources(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
@@ -164,7 +169,7 @@ public Java.Net.URL GetResource(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Net.URL>>("getResources", "(Ljava/lang/String;)Ljava/util/Enumeration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#resources(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#resources(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -173,14 +178,14 @@ public Java.Net.URL GetResource(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Net.URL>>("resources", "(Ljava/lang/String;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#clearAssertionStatus()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#clearAssertionStatus()"/>
         /// </summary>
         public void ClearAssertionStatus()
         {
             IExecuteWithSignature("clearAssertionStatus", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#setClassAssertionStatus(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#setClassAssertionStatus(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -189,7 +194,7 @@ public void SetClassAssertionStatus(Java.Lang.String arg0, bool arg1)
             IExecute("setClassAssertionStatus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#setDefaultAssertionStatus(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#setDefaultAssertionStatus(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetDefaultAssertionStatus(bool arg0)
@@ -197,7 +202,7 @@ public void SetDefaultAssertionStatus(bool arg0)
             IExecuteWithSignature("setDefaultAssertionStatus", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassLoader.html#setPackageAssertionStatus(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassLoader.html#setPackageAssertionStatus(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Lang/ClassValue.cs b/src/net/Netdroid/Generated/Java/Lang/ClassValue.cs
index 365ca970b..7fb191194 100644
--- a/src/net/Netdroid/Generated/Java/Lang/ClassValue.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/ClassValue.cs
@@ -46,7 +46,7 @@ public partial class ClassValue
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassValue.html#get(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassValue.html#get(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="object"/></returns>
@@ -55,7 +55,7 @@ public object Get(Java.Lang.Class arg0)
             return IExecuteWithSignature("get", "(Ljava/lang/Class;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassValue.html#remove(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassValue.html#remove(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         public void Remove(Java.Lang.Class arg0)
@@ -98,7 +98,7 @@ public partial class ClassValue<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassValue.html#get(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassValue.html#get(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><typeparamref name="T"/></returns>
@@ -107,7 +107,7 @@ public T Get(Java.Lang.Class arg0)
             return IExecuteWithSignature<T>("get", "(Ljava/lang/Class;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ClassValue.html#remove(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ClassValue.html#remove(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         public void Remove(Java.Lang.Class arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Comparable.cs b/src/net/Netdroid/Generated/Java/Lang/Comparable.cs
index 30683f128..019f2e591 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Comparable.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Comparable.cs
@@ -46,7 +46,7 @@ public partial class Comparable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Comparable.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Comparable.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -108,7 +108,7 @@ public partial class Comparable<T> : Java.Lang.IComparable<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Comparable.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Comparable.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Compiler.cs b/src/net/Netdroid/Generated/Java/Lang/Compiler.cs
index f602f864d..ae0b3855e 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Compiler.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Compiler.cs
@@ -42,7 +42,7 @@ public partial class Compiler
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Compiler.html#compileClass(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Compiler.html#compileClass(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -51,7 +51,7 @@ public static bool CompileClass(Java.Lang.Class arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "compileClass", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Compiler.html#compileClasses(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Compiler.html#compileClasses(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -60,7 +60,7 @@ public static bool CompileClasses(Java.Lang.String arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "compileClasses", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Compiler.html#command(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Compiler.html#command(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -69,14 +69,14 @@ public static object Command(object arg0)
             return SExecuteWithSignature(LocalBridgeClazz, "command", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Compiler.html#disable()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Compiler.html#disable()"/>
         /// </summary>
         public static void Disable()
         {
             SExecuteWithSignature(LocalBridgeClazz, "disable", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Compiler.html#enable()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Compiler.html#enable()"/>
         /// </summary>
         public static void Enable()
         {
diff --git a/src/net/Netdroid/Generated/Java/Lang/Deprecated.cs b/src/net/Netdroid/Generated/Java/Lang/Deprecated.cs
index 4d51be9e4..b7c20e58b 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Deprecated.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Deprecated.cs
@@ -64,7 +64,7 @@ public partial class Deprecated : Java.Lang.IDeprecated
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Deprecated.html#forRemoval()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Deprecated.html#forRemoval()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool ForRemoval()
@@ -72,7 +72,7 @@ public bool ForRemoval()
             return IExecuteWithSignature<bool>("forRemoval", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Deprecated.html#since()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Deprecated.html#since()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Since()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Double.cs b/src/net/Netdroid/Generated/Java/Lang/Double.cs
index d59e99414..3a66dc980 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Double.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Double.cs
@@ -26,24 +26,24 @@
 namespace Java.Lang
 {
     #region Double
-    public partial class Double : Java.Lang.IComparable<Java.Lang.Double>
+    public partial class Double
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#%3Cinit%3E(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#%3Cinit%3E(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Double(double arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Lang.NumberFormatException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Double(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -61,67 +61,67 @@ public Double(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#MAX_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#MAX_VALUE"/>
         /// </summary>
         public static double MAX_VALUE { get { if (!_MAX_VALUEReady) { _MAX_VALUEContent = SGetField<double>(LocalBridgeClazz, "MAX_VALUE"); _MAX_VALUEReady = true; } return _MAX_VALUEContent; } }
         private static double _MAX_VALUEContent = default;
         private static bool _MAX_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#MIN_NORMAL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#MIN_NORMAL"/>
         /// </summary>
         public static double MIN_NORMAL { get { if (!_MIN_NORMALReady) { _MIN_NORMALContent = SGetField<double>(LocalBridgeClazz, "MIN_NORMAL"); _MIN_NORMALReady = true; } return _MIN_NORMALContent; } }
         private static double _MIN_NORMALContent = default;
         private static bool _MIN_NORMALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#MIN_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#MIN_VALUE"/>
         /// </summary>
         public static double MIN_VALUE { get { if (!_MIN_VALUEReady) { _MIN_VALUEContent = SGetField<double>(LocalBridgeClazz, "MIN_VALUE"); _MIN_VALUEReady = true; } return _MIN_VALUEContent; } }
         private static double _MIN_VALUEContent = default;
         private static bool _MIN_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#NaN"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#NaN"/>
         /// </summary>
         public static double NaN { get { if (!_NaNReady) { _NaNContent = SGetField<double>(LocalBridgeClazz, "NaN"); _NaNReady = true; } return _NaNContent; } }
         private static double _NaNContent = default;
         private static bool _NaNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#NEGATIVE_INFINITY"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#NEGATIVE_INFINITY"/>
         /// </summary>
         public static double NEGATIVE_INFINITY { get { if (!_NEGATIVE_INFINITYReady) { _NEGATIVE_INFINITYContent = SGetField<double>(LocalBridgeClazz, "NEGATIVE_INFINITY"); _NEGATIVE_INFINITYReady = true; } return _NEGATIVE_INFINITYContent; } }
         private static double _NEGATIVE_INFINITYContent = default;
         private static bool _NEGATIVE_INFINITYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#POSITIVE_INFINITY"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#POSITIVE_INFINITY"/>
         /// </summary>
         public static double POSITIVE_INFINITY { get { if (!_POSITIVE_INFINITYReady) { _POSITIVE_INFINITYContent = SGetField<double>(LocalBridgeClazz, "POSITIVE_INFINITY"); _POSITIVE_INFINITYReady = true; } return _POSITIVE_INFINITYContent; } }
         private static double _POSITIVE_INFINITYContent = default;
         private static bool _POSITIVE_INFINITYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#BYTES"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#BYTES"/>
         /// </summary>
         public static int BYTES { get { if (!_BYTESReady) { _BYTESContent = SGetField<int>(LocalBridgeClazz, "BYTES"); _BYTESReady = true; } return _BYTESContent; } }
         private static int _BYTESContent = default;
         private static bool _BYTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#MAX_EXPONENT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#MAX_EXPONENT"/>
         /// </summary>
         public static int MAX_EXPONENT { get { if (!_MAX_EXPONENTReady) { _MAX_EXPONENTContent = SGetField<int>(LocalBridgeClazz, "MAX_EXPONENT"); _MAX_EXPONENTReady = true; } return _MAX_EXPONENTContent; } }
         private static int _MAX_EXPONENTContent = default;
         private static bool _MAX_EXPONENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#MIN_EXPONENT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#MIN_EXPONENT"/>
         /// </summary>
         public static int MIN_EXPONENT { get { if (!_MIN_EXPONENTReady) { _MIN_EXPONENTContent = SGetField<int>(LocalBridgeClazz, "MIN_EXPONENT"); _MIN_EXPONENTReady = true; } return _MIN_EXPONENTContent; } }
         private static int _MIN_EXPONENTContent = default;
         private static bool _MIN_EXPONENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#SIZE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#SIZE"/>
         /// </summary>
         public static int SIZE { get { if (!_SIZEReady) { _SIZEContent = SGetField<int>(LocalBridgeClazz, "SIZE"); _SIZEReady = true; } return _SIZEContent; } }
         private static int _SIZEContent = default;
         private static bool _SIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
@@ -131,7 +131,7 @@ public Double(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#isFinite(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#isFinite(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -140,7 +140,7 @@ public static bool IsFinite(double arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isFinite", "(D)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#isInfinite(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#isInfinite(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -149,7 +149,7 @@ public static bool IsInfinite(double arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isInfinite", "(D)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#isNaN(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#isNaN(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -158,7 +158,7 @@ public static bool IsNaN(double arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isNaN", "(D)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#max(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#max(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -168,7 +168,7 @@ public static double Max(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#min(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#min(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -178,7 +178,7 @@ public static double Min(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#parseDouble(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#parseDouble(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="double"/></returns>
@@ -188,7 +188,7 @@ public static double ParseDouble(Java.Lang.String arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "parseDouble", "(Ljava/lang/String;)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#sum(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#sum(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -198,7 +198,7 @@ public static double Sum(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "sum", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#compare(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#compare(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -208,7 +208,7 @@ public static int Compare(double arg0, double arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#hashCode(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#hashCode(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="int"/></returns>
@@ -217,7 +217,7 @@ public static int HashCode(double arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(D)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#valueOf(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#valueOf(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Lang.Double"/></returns>
@@ -226,7 +226,7 @@ public static Java.Lang.Double ValueOf(double arg0)
             return SExecuteWithSignature<Java.Lang.Double>(LocalBridgeClazz, "valueOf", "(D)Ljava/lang/Double;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Double"/></returns>
@@ -236,7 +236,7 @@ public static Java.Lang.Double ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Double>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Double;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#toHexString(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#toHexString(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -245,7 +245,7 @@ public static Java.Lang.String ToHexString(double arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toHexString", "(D)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#toString(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#toString(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -254,7 +254,7 @@ public static Java.Lang.String ToString(double arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(D)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#doubleToLongBits(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#doubleToLongBits(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="long"/></returns>
@@ -263,7 +263,7 @@ public static long DoubleToLongBits(double arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "doubleToLongBits", "(D)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#longBitsToDouble(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#longBitsToDouble(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="double"/></returns>
@@ -272,7 +272,7 @@ public static double LongBitsToDouble(long arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "longBitsToDouble", "(J)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#doubleToRawLongBits(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#doubleToRawLongBits(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="long"/></returns>
@@ -285,7 +285,7 @@ public static long DoubleToRawLongBits(double arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#isInfinite()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#isInfinite()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsInfinite()
@@ -293,7 +293,7 @@ public bool IsInfinite()
             return IExecuteWithSignature<bool>("isInfinite", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#isNaN()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#isNaN()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNaN()
@@ -301,7 +301,7 @@ public bool IsNaN()
             return IExecuteWithSignature<bool>("isNaN", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#compareTo(java.lang.Double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#compareTo(java.lang.Double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Double"/></param>
         /// <returns><see cref="int"/></returns>
@@ -310,7 +310,7 @@ public int CompareTo(Java.Lang.Double arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Double;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Double.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -318,24 +318,6 @@ public int CompareTo(object arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#resolveConstantDesc(java.lang.invoke.MethodHandles.Lookup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Lang.ReflectiveOperationException"/>
-        public object ResolveConstantDesc(Java.Lang.Invoke.MethodHandles.Lookup arg0)
-        {
-            return IExecuteWithSignature("resolveConstantDesc", "(Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/Object;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Double.html#describeConstable()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<Java.Lang.Double> DescribeConstable()
-        {
-            return IExecuteWithSignature<Java.Util.Optional<Java.Lang.Double>>("describeConstable", "()Ljava/util/Optional;");
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Lang/Enum.cs b/src/net/Netdroid/Generated/Java/Lang/Enum.cs
index 4f8bd58e0..bc4a5779a 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Enum.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Enum.cs
@@ -50,7 +50,7 @@ public partial class Enum
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#valueOf(java.lang.Class,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#valueOf(java.lang.Class,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -64,14 +64,7 @@ public static Java.Lang.Enum ValueOf(Java.Lang.Class arg0, Java.Lang.String arg1
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#getDeclaringClass()"/> 
-        /// </summary>
-        public Java.Lang.Class DeclaringClass
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#compareTo(java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#compareTo(java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <returns><see cref="int"/></returns>
@@ -80,7 +73,7 @@ public int CompareTo(Java.Lang.Enum arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Enum;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#ordinal()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#ordinal()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Ordinal()
@@ -88,23 +81,23 @@ public int Ordinal()
             return IExecuteWithSignature<int>("ordinal", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#getDeclaringClass()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Name()
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetDeclaringClass()
         {
-            return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#describeConstable()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#name()"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional DescribeConstable()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String Name()
         {
-            return IExecuteWithSignature<Java.Util.Optional>("describeConstable", "()Ljava/util/Optional;");
+            return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -152,13 +145,13 @@ public partial class Enum<E> : Java.Lang.IComparable<E>, Java.Io.ISerializable
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#valueOf(java.lang.Class,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#valueOf(java.lang.Class,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Enum{T}"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public static T ValueOf<T>(Java.Lang.Class arg0, Java.Lang.String arg1) where T: Java.Lang.Enum<T>
+        public static T ValueOf<T>(Java.Lang.Class arg0, Java.Lang.String arg1) where T : Java.Lang.Enum<T>
         {
             return SExecute<T>(LocalBridgeClazz, "valueOf", arg0, arg1);
         }
@@ -167,14 +160,7 @@ public static T ValueOf<T>(Java.Lang.Class arg0, Java.Lang.String arg1) where T:
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#getDeclaringClass()"/> 
-        /// </summary>
-        public Java.Lang.Class DeclaringClass
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#compareTo(java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#compareTo(java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="int"/></returns>
@@ -183,7 +169,7 @@ public int CompareTo(E arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Enum;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#ordinal()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#ordinal()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Ordinal()
@@ -191,23 +177,23 @@ public int Ordinal()
             return IExecuteWithSignature<int>("ordinal", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#getDeclaringClass()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Name()
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetDeclaringClass()
         {
-            return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#describeConstable()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#name()"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<Java.Lang.Enum.EnumDesc<E>> DescribeConstable()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String Name()
         {
-            return IExecuteWithSignature<Java.Util.Optional<Java.Lang.Enum.EnumDesc<E>>>("describeConstable", "()Ljava/util/Optional;");
+            return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Enum.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Enum.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Float.cs b/src/net/Netdroid/Generated/Java/Lang/Float.cs
index bd083d103..978931b8d 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Float.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Float.cs
@@ -26,33 +26,33 @@
 namespace Java.Lang
 {
     #region Float
-    public partial class Float : Java.Lang.IComparable<Java.Lang.Float>
+    public partial class Float
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#%3Cinit%3E(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#%3Cinit%3E(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Float(double arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#%3Cinit%3E(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#%3Cinit%3E(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Float(float arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Lang.NumberFormatException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Float(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -70,67 +70,67 @@ public Float(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#MAX_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#MAX_VALUE"/>
         /// </summary>
         public static float MAX_VALUE { get { if (!_MAX_VALUEReady) { _MAX_VALUEContent = SGetField<float>(LocalBridgeClazz, "MAX_VALUE"); _MAX_VALUEReady = true; } return _MAX_VALUEContent; } }
         private static float _MAX_VALUEContent = default;
         private static bool _MAX_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#MIN_NORMAL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#MIN_NORMAL"/>
         /// </summary>
         public static float MIN_NORMAL { get { if (!_MIN_NORMALReady) { _MIN_NORMALContent = SGetField<float>(LocalBridgeClazz, "MIN_NORMAL"); _MIN_NORMALReady = true; } return _MIN_NORMALContent; } }
         private static float _MIN_NORMALContent = default;
         private static bool _MIN_NORMALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#MIN_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#MIN_VALUE"/>
         /// </summary>
         public static float MIN_VALUE { get { if (!_MIN_VALUEReady) { _MIN_VALUEContent = SGetField<float>(LocalBridgeClazz, "MIN_VALUE"); _MIN_VALUEReady = true; } return _MIN_VALUEContent; } }
         private static float _MIN_VALUEContent = default;
         private static bool _MIN_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#NaN"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#NaN"/>
         /// </summary>
         public static float NaN { get { if (!_NaNReady) { _NaNContent = SGetField<float>(LocalBridgeClazz, "NaN"); _NaNReady = true; } return _NaNContent; } }
         private static float _NaNContent = default;
         private static bool _NaNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#NEGATIVE_INFINITY"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#NEGATIVE_INFINITY"/>
         /// </summary>
         public static float NEGATIVE_INFINITY { get { if (!_NEGATIVE_INFINITYReady) { _NEGATIVE_INFINITYContent = SGetField<float>(LocalBridgeClazz, "NEGATIVE_INFINITY"); _NEGATIVE_INFINITYReady = true; } return _NEGATIVE_INFINITYContent; } }
         private static float _NEGATIVE_INFINITYContent = default;
         private static bool _NEGATIVE_INFINITYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#POSITIVE_INFINITY"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#POSITIVE_INFINITY"/>
         /// </summary>
         public static float POSITIVE_INFINITY { get { if (!_POSITIVE_INFINITYReady) { _POSITIVE_INFINITYContent = SGetField<float>(LocalBridgeClazz, "POSITIVE_INFINITY"); _POSITIVE_INFINITYReady = true; } return _POSITIVE_INFINITYContent; } }
         private static float _POSITIVE_INFINITYContent = default;
         private static bool _POSITIVE_INFINITYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#BYTES"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#BYTES"/>
         /// </summary>
         public static int BYTES { get { if (!_BYTESReady) { _BYTESContent = SGetField<int>(LocalBridgeClazz, "BYTES"); _BYTESReady = true; } return _BYTESContent; } }
         private static int _BYTESContent = default;
         private static bool _BYTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#MAX_EXPONENT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#MAX_EXPONENT"/>
         /// </summary>
         public static int MAX_EXPONENT { get { if (!_MAX_EXPONENTReady) { _MAX_EXPONENTContent = SGetField<int>(LocalBridgeClazz, "MAX_EXPONENT"); _MAX_EXPONENTReady = true; } return _MAX_EXPONENTContent; } }
         private static int _MAX_EXPONENTContent = default;
         private static bool _MAX_EXPONENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#MIN_EXPONENT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#MIN_EXPONENT"/>
         /// </summary>
         public static int MIN_EXPONENT { get { if (!_MIN_EXPONENTReady) { _MIN_EXPONENTContent = SGetField<int>(LocalBridgeClazz, "MIN_EXPONENT"); _MIN_EXPONENTReady = true; } return _MIN_EXPONENTContent; } }
         private static int _MIN_EXPONENTContent = default;
         private static bool _MIN_EXPONENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#SIZE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#SIZE"/>
         /// </summary>
         public static int SIZE { get { if (!_SIZEReady) { _SIZEContent = SGetField<int>(LocalBridgeClazz, "SIZE"); _SIZEReady = true; } return _SIZEContent; } }
         private static int _SIZEContent = default;
         private static bool _SIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
@@ -140,7 +140,7 @@ public Float(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#isFinite(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#isFinite(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -149,7 +149,7 @@ public static bool IsFinite(float arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isFinite", "(F)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#isInfinite(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#isInfinite(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -158,7 +158,7 @@ public static bool IsInfinite(float arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isInfinite", "(F)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#isNaN(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#isNaN(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -167,7 +167,7 @@ public static bool IsNaN(float arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isNaN", "(F)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#max(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#max(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -177,7 +177,7 @@ public static float Max(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#min(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#min(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -187,7 +187,7 @@ public static float Min(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#parseFloat(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#parseFloat(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="float"/></returns>
@@ -197,7 +197,7 @@ public static float ParseFloat(Java.Lang.String arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "parseFloat", "(Ljava/lang/String;)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#sum(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#sum(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -207,7 +207,7 @@ public static float Sum(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "sum", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#compare(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#compare(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -217,7 +217,7 @@ public static int Compare(float arg0, float arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#floatToIntBits(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#floatToIntBits(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -226,7 +226,7 @@ public static int FloatToIntBits(float arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "floatToIntBits", "(F)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#hashCode(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#hashCode(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -235,7 +235,7 @@ public static int HashCode(float arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(F)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#valueOf(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#valueOf(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Lang.Float"/></returns>
@@ -244,7 +244,7 @@ public static Java.Lang.Float ValueOf(float arg0)
             return SExecuteWithSignature<Java.Lang.Float>(LocalBridgeClazz, "valueOf", "(F)Ljava/lang/Float;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Float"/></returns>
@@ -254,7 +254,7 @@ public static Java.Lang.Float ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Float>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Float;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#toHexString(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#toHexString(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -263,7 +263,7 @@ public static Java.Lang.String ToHexString(float arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toHexString", "(F)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#toString(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#toString(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -272,7 +272,7 @@ public static Java.Lang.String ToString(float arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(F)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#intBitsToFloat(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#intBitsToFloat(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
@@ -281,7 +281,7 @@ public static float IntBitsToFloat(int arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "intBitsToFloat", "(I)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#floatToRawIntBits(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#floatToRawIntBits(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -294,7 +294,7 @@ public static int FloatToRawIntBits(float arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#isInfinite()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#isInfinite()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsInfinite()
@@ -302,7 +302,7 @@ public bool IsInfinite()
             return IExecuteWithSignature<bool>("isInfinite", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#isNaN()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#isNaN()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNaN()
@@ -310,7 +310,7 @@ public bool IsNaN()
             return IExecuteWithSignature<bool>("isNaN", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#compareTo(java.lang.Float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#compareTo(java.lang.Float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -319,7 +319,7 @@ public int CompareTo(Java.Lang.Float arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Float;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Float.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -327,24 +327,6 @@ public int CompareTo(object arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#resolveConstantDesc(java.lang.invoke.MethodHandles.Lookup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Lang.ReflectiveOperationException"/>
-        public object ResolveConstantDesc(Java.Lang.Invoke.MethodHandles.Lookup arg0)
-        {
-            return IExecuteWithSignature("resolveConstantDesc", "(Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/Object;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Float.html#describeConstable()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<Java.Lang.Float> DescribeConstable()
-        {
-            return IExecuteWithSignature<Java.Util.Optional<Java.Lang.Float>>("describeConstable", "()Ljava/util/Optional;");
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Lang/Integer.cs b/src/net/Netdroid/Generated/Java/Lang/Integer.cs
index 8ed06b6b3..518c4b9c6 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Integer.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Integer.cs
@@ -26,24 +26,24 @@
 namespace Java.Lang
 {
     #region Integer
-    public partial class Integer : Java.Lang.IComparable<Java.Lang.Integer>
+    public partial class Integer
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Integer(int arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Lang.NumberFormatException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Integer(Java.Lang.String arg0)
             : base(arg0)
         {
@@ -61,31 +61,31 @@ public Integer(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#BYTES"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#BYTES"/>
         /// </summary>
         public static int BYTES { get { if (!_BYTESReady) { _BYTESContent = SGetField<int>(LocalBridgeClazz, "BYTES"); _BYTESReady = true; } return _BYTESContent; } }
         private static int _BYTESContent = default;
         private static bool _BYTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#MAX_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#MAX_VALUE"/>
         /// </summary>
         public static int MAX_VALUE { get { if (!_MAX_VALUEReady) { _MAX_VALUEContent = SGetField<int>(LocalBridgeClazz, "MAX_VALUE"); _MAX_VALUEReady = true; } return _MAX_VALUEContent; } }
         private static int _MAX_VALUEContent = default;
         private static bool _MAX_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#MIN_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#MIN_VALUE"/>
         /// </summary>
         public static int MIN_VALUE { get { if (!_MIN_VALUEReady) { _MIN_VALUEContent = SGetField<int>(LocalBridgeClazz, "MIN_VALUE"); _MIN_VALUEReady = true; } return _MIN_VALUEContent; } }
         private static int _MIN_VALUEContent = default;
         private static bool _MIN_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#SIZE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#SIZE"/>
         /// </summary>
         public static int SIZE { get { if (!_SIZEReady) { _SIZEContent = SGetField<int>(LocalBridgeClazz, "SIZE"); _SIZEReady = true; } return _SIZEContent; } }
         private static int _SIZEContent = default;
         private static bool _SIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
@@ -95,7 +95,7 @@ public Integer(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#bitCount(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#bitCount(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -104,7 +104,7 @@ public static int BitCount(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "bitCount", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#compare(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#compare(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -114,7 +114,7 @@ public static int Compare(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#compareUnsigned(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#compareUnsigned(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -124,7 +124,7 @@ public static int CompareUnsigned(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#divideUnsigned(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#divideUnsigned(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -134,7 +134,7 @@ public static int DivideUnsigned(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "divideUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#hashCode(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#hashCode(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -143,7 +143,7 @@ public static int HashCode(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#highestOneBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#highestOneBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -152,7 +152,7 @@ public static int HighestOneBit(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "highestOneBit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#lowestOneBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#lowestOneBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -161,7 +161,7 @@ public static int LowestOneBit(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "lowestOneBit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#max(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#max(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -171,7 +171,7 @@ public static int Max(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#min(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#min(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -181,7 +181,7 @@ public static int Min(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#numberOfLeadingZeros(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#numberOfLeadingZeros(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -190,7 +190,7 @@ public static int NumberOfLeadingZeros(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "numberOfLeadingZeros", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#numberOfTrailingZeros(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#numberOfTrailingZeros(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -199,7 +199,7 @@ public static int NumberOfTrailingZeros(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "numberOfTrailingZeros", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#parseInt(java.lang.CharSequence,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#parseInt(java.lang.CharSequence,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -212,7 +212,7 @@ public static int ParseInt(Java.Lang.CharSequence arg0, int arg1, int arg2, int
             return SExecute<int>(LocalBridgeClazz, "parseInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#parseInt(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#parseInt(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -223,7 +223,7 @@ public static int ParseInt(Java.Lang.String arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "parseInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#parseInt(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#parseInt(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -233,7 +233,7 @@ public static int ParseInt(Java.Lang.String arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "parseInt", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#parseUnsignedInt(java.lang.CharSequence,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#parseUnsignedInt(java.lang.CharSequence,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -246,7 +246,7 @@ public static int ParseUnsignedInt(Java.Lang.CharSequence arg0, int arg1, int ar
             return SExecute<int>(LocalBridgeClazz, "parseUnsignedInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#parseUnsignedInt(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#parseUnsignedInt(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -257,7 +257,7 @@ public static int ParseUnsignedInt(Java.Lang.String arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "parseUnsignedInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#parseUnsignedInt(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#parseUnsignedInt(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -267,7 +267,7 @@ public static int ParseUnsignedInt(Java.Lang.String arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "parseUnsignedInt", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#remainderUnsigned(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#remainderUnsigned(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -277,7 +277,7 @@ public static int RemainderUnsigned(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "remainderUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#reverse(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#reverse(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -286,7 +286,7 @@ public static int Reverse(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "reverse", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#reverseBytes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#reverseBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -295,7 +295,7 @@ public static int ReverseBytes(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "reverseBytes", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#rotateLeft(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#rotateLeft(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -305,7 +305,7 @@ public static int RotateLeft(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "rotateLeft", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#rotateRight(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#rotateRight(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -315,7 +315,7 @@ public static int RotateRight(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "rotateRight", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#signum(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#signum(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -324,7 +324,7 @@ public static int Signum(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "signum", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#sum(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#sum(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -334,7 +334,7 @@ public static int Sum(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "sum", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#decode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#decode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Integer"/></returns>
@@ -344,7 +344,7 @@ public static Java.Lang.Integer Decode(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Integer>(LocalBridgeClazz, "decode", "(Ljava/lang/String;)Ljava/lang/Integer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#getInteger(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#getInteger(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -354,7 +354,7 @@ public static Java.Lang.Integer GetInteger(Java.Lang.String arg0, int arg1)
             return SExecute<Java.Lang.Integer>(LocalBridgeClazz, "getInteger", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#getInteger(java.lang.String,java.lang.Integer)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#getInteger(java.lang.String,java.lang.Integer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Integer"/></param>
@@ -364,7 +364,7 @@ public static Java.Lang.Integer GetInteger(Java.Lang.String arg0, Java.Lang.Inte
             return SExecute<Java.Lang.Integer>(LocalBridgeClazz, "getInteger", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#getInteger(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#getInteger(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Integer"/></returns>
@@ -373,7 +373,7 @@ public static Java.Lang.Integer GetInteger(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Integer>(LocalBridgeClazz, "getInteger", "(Ljava/lang/String;)Ljava/lang/Integer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#valueOf(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#valueOf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.Integer"/></returns>
@@ -382,7 +382,7 @@ public static Java.Lang.Integer ValueOf(int arg0)
             return SExecuteWithSignature<Java.Lang.Integer>(LocalBridgeClazz, "valueOf", "(I)Ljava/lang/Integer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#valueOf(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#valueOf(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -393,7 +393,7 @@ public static Java.Lang.Integer ValueOf(Java.Lang.String arg0, int arg1)
             return SExecute<Java.Lang.Integer>(LocalBridgeClazz, "valueOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Integer"/></returns>
@@ -403,7 +403,7 @@ public static Java.Lang.Integer ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Integer>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Integer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#toBinaryString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#toBinaryString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -412,7 +412,7 @@ public static Java.Lang.String ToBinaryString(int arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toBinaryString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#toHexString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#toHexString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -421,7 +421,7 @@ public static Java.Lang.String ToHexString(int arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toHexString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#toOctalString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#toOctalString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -430,7 +430,7 @@ public static Java.Lang.String ToOctalString(int arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toOctalString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#toString(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#toString(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -440,7 +440,7 @@ public static Java.Lang.String ToString(int arg0, int arg1)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "toString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#toString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#toString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -449,7 +449,7 @@ public static Java.Lang.String ToString(int arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#toUnsignedString(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#toUnsignedString(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -459,7 +459,7 @@ public static Java.Lang.String ToUnsignedString(int arg0, int arg1)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "toUnsignedString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#toUnsignedString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#toUnsignedString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -468,7 +468,7 @@ public static Java.Lang.String ToUnsignedString(int arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toUnsignedString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#toUnsignedLong(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#toUnsignedLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -481,7 +481,7 @@ public static long ToUnsignedLong(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#compareTo(java.lang.Integer)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#compareTo(java.lang.Integer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Integer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -490,7 +490,7 @@ public int CompareTo(Java.Lang.Integer arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Integer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Integer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -498,24 +498,6 @@ public int CompareTo(object arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#resolveConstantDesc(java.lang.invoke.MethodHandles.Lookup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Lang.ReflectiveOperationException"/>
-        public object ResolveConstantDesc(Java.Lang.Invoke.MethodHandles.Lookup arg0)
-        {
-            return IExecuteWithSignature("resolveConstantDesc", "(Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/Object;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Integer.html#describeConstable()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<Java.Lang.Integer> DescribeConstable()
-        {
-            return IExecuteWithSignature<Java.Util.Optional<Java.Lang.Integer>>("describeConstable", "()Ljava/util/Optional;");
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/AllPackageClasses.cs
index ea37cfece..dc4714a4a 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Lang.Invoke
 {
     #region CallSite
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/CallSite.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/CallSite.html"/>
     /// </summary>
     public partial class CallSite : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CallSite>
     {
@@ -36,12 +36,12 @@ public partial class CallSite : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CallSite
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CallSite class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallSite class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallSite() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CallSite class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallSite class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallSite(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public CallSite(params object[] args) : base(args) { }
 
     #region ConstantCallSite
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/ConstantCallSite.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/ConstantCallSite.html"/>
     /// </summary>
     public partial class ConstantCallSite : Java.Lang.Invoke.CallSite
     {
@@ -118,7 +118,7 @@ public ConstantCallSite(params object[] args) : base(args) { }
 
     #region LambdaConversionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/LambdaConversionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/LambdaConversionException.html"/>
     /// </summary>
     public partial class LambdaConversionException : Java.Lang.Exception
     {
@@ -135,7 +135,7 @@ public partial class LambdaConversionException : Java.Lang.Exception
 
     #region MethodHandle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html"/>
     /// </summary>
     public partial class MethodHandle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MethodHandle>
     {
@@ -143,12 +143,12 @@ public partial class MethodHandle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Meth
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MethodHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MethodHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MethodHandle() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MethodHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MethodHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MethodHandle(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -181,7 +181,7 @@ public MethodHandle(params object[] args) : base(args) { }
 
     #region MethodHandleInfo
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html"/>
     /// </summary>
     public partial class MethodHandleInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MethodHandleInfo>
     {
@@ -189,12 +189,12 @@ public partial class MethodHandleInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MethodHandleInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MethodHandleInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MethodHandleInfo() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MethodHandleInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MethodHandleInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MethodHandleInfo(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -227,7 +227,7 @@ public MethodHandleInfo(params object[] args) : base(args) { }
 
     #region MethodHandles
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html"/>
     /// </summary>
     public partial class MethodHandles : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MethodHandles>
     {
@@ -267,7 +267,7 @@ public MethodHandles(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Lookup
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html"/>
         /// </summary>
         public partial class Lookup : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Lookup>
         {
@@ -305,51 +305,7 @@ public Lookup(params object[] args) : base(args) { }
             public override bool IsBridgeStatic => true;
 
             // TODO: complete the class
-            #region ClassOption
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.ClassOption.html"/>
-            /// </summary>
-            public partial class ClassOption : Java.Lang.Enum<Java.Lang.Invoke.MethodHandles.Lookup.ClassOption>
-            {
-                const string _bridgeClassName = "java.lang.invoke.MethodHandles$Lookup$ClassOption";
-                /// <summary>
-                /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-                /// </summary>
-                public ClassOption() { }
-                /// <summary>
-                /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-                /// </summary>
-                public ClassOption(params object[] args) : base(args) { }
-
-                private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-                /// <summary>
-                /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-                /// </summary>
-                public override string BridgeClassName => _bridgeClassName;
-                /// <summary>
-                /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-                /// </summary>
-                public override bool IsBridgeAbstract => false;
-                /// <summary>
-                /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-                /// </summary>
-                public override bool IsBridgeCloseable => false;
-                /// <summary>
-                /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-                /// </summary>
-                public override bool IsBridgeInterface => false;
-                /// <summary>
-                /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-                /// </summary>
-                public override bool IsBridgeStatic => true;
-
-                // TODO: complete the class
-
-            }
-            #endregion
-
-        
+
         }
         #endregion
 
@@ -359,9 +315,9 @@ public ClassOption(params object[] args) : base(args) { }
 
     #region MethodType
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html"/>
     /// </summary>
-    public partial class MethodType : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MethodType>
+    public partial class MethodType : Java.Io.Serializable
     {
         const string _bridgeClassName = "java.lang.invoke.MethodType";
         /// <summary>
@@ -403,7 +359,7 @@ public MethodType(params object[] args) : base(args) { }
 
     #region MutableCallSite
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MutableCallSite.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/MutableCallSite.html"/>
     /// </summary>
     public partial class MutableCallSite : Java.Lang.Invoke.CallSite
     {
@@ -445,242 +401,9 @@ public MutableCallSite(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region TypeDescriptor
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.html"/>
-    /// </summary>
-    public partial class TypeDescriptor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TypeDescriptor>
-    {
-        const string _bridgeClassName = "java.lang.invoke.TypeDescriptor";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        [Obsolete("TypeDescriptor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public TypeDescriptor() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        [Obsolete("TypeDescriptor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public TypeDescriptor(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-        #region OfField
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html"/>
-        /// </summary>
-        public partial class OfField : Java.Lang.Invoke.TypeDescriptor
-        {
-            const string _bridgeClassName = "java.lang.invoke.TypeDescriptor$OfField";
-            /// <summary>
-            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-            /// </summary>
-            [Obsolete("OfField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-            public OfField() { }
-            /// <summary>
-            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-            /// </summary>
-            [Obsolete("OfField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-            public OfField(params object[] args) : base(args) { }
-
-            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-            /// </summary>
-            public override string BridgeClassName => _bridgeClassName;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-            /// </summary>
-            public override bool IsBridgeAbstract => true;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-            /// </summary>
-            public override bool IsBridgeCloseable => false;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-            /// </summary>
-            public override bool IsBridgeInterface => true;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-            /// </summary>
-            public override bool IsBridgeStatic => true;
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-        #region OfField<F>
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html"/>
-        /// </summary>
-        /// <typeparam name="F"><see cref="Java.Lang.Invoke.TypeDescriptor.OfField{F}"/></typeparam>
-        public partial class OfField<F> : Java.Lang.Invoke.TypeDescriptor where F: Java.Lang.Invoke.TypeDescriptor.OfField<F>
-        {
-            const string _bridgeClassName = "java.lang.invoke.TypeDescriptor$OfField";
-            /// <summary>
-            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-            /// </summary>
-            [Obsolete("OfField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-            public OfField() { }
-            /// <summary>
-            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-            /// </summary>
-            [Obsolete("OfField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-            public OfField(params object[] args) : base(args) { }
-
-            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-            /// </summary>
-            public override string BridgeClassName => _bridgeClassName;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-            /// </summary>
-            public override bool IsBridgeAbstract => true;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-            /// </summary>
-            public override bool IsBridgeCloseable => false;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-            /// </summary>
-            public override bool IsBridgeInterface => true;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-            /// </summary>
-            public override bool IsBridgeStatic => true;
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-        #region OfMethod
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html"/>
-        /// </summary>
-        public partial class OfMethod : Java.Lang.Invoke.TypeDescriptor
-        {
-            const string _bridgeClassName = "java.lang.invoke.TypeDescriptor$OfMethod";
-            /// <summary>
-            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-            /// </summary>
-            [Obsolete("OfMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-            public OfMethod() { }
-            /// <summary>
-            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-            /// </summary>
-            [Obsolete("OfMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-            public OfMethod(params object[] args) : base(args) { }
-
-            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-            /// </summary>
-            public override string BridgeClassName => _bridgeClassName;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-            /// </summary>
-            public override bool IsBridgeAbstract => true;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-            /// </summary>
-            public override bool IsBridgeCloseable => false;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-            /// </summary>
-            public override bool IsBridgeInterface => true;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-            /// </summary>
-            public override bool IsBridgeStatic => true;
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-        #region OfMethod<F, M>
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html"/>
-        /// </summary>
-        /// <typeparam name="F"><see cref="Java.Lang.Invoke.TypeDescriptor.OfField{F}"/></typeparam>
-        /// <typeparam name="M"><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod{F, M}"/></typeparam>
-        public partial class OfMethod<F, M> : Java.Lang.Invoke.TypeDescriptor where F: Java.Lang.Invoke.TypeDescriptor.OfField<F> where M: Java.Lang.Invoke.TypeDescriptor.OfMethod<F, M>
-        {
-            const string _bridgeClassName = "java.lang.invoke.TypeDescriptor$OfMethod";
-            /// <summary>
-            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-            /// </summary>
-            [Obsolete("OfMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-            public OfMethod() { }
-            /// <summary>
-            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-            /// </summary>
-            [Obsolete("OfMethod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-            public OfMethod(params object[] args) : base(args) { }
-
-            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-            /// </summary>
-            public override string BridgeClassName => _bridgeClassName;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-            /// </summary>
-            public override bool IsBridgeAbstract => true;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-            /// </summary>
-            public override bool IsBridgeCloseable => false;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-            /// </summary>
-            public override bool IsBridgeInterface => true;
-            /// <summary>
-            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-            /// </summary>
-            public override bool IsBridgeStatic => true;
-
-            // TODO: complete the class
-
-        }
-        #endregion
-
-    
-    }
-    #endregion
-
     #region VarHandle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html"/>
     /// </summary>
     public partial class VarHandle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<VarHandle>
     {
@@ -688,12 +411,12 @@ public partial class VarHandle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<VarHand
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("VarHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VarHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VarHandle() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("VarHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("VarHandle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public VarHandle(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -722,7 +445,7 @@ public VarHandle(params object[] args) : base(args) { }
         // TODO: complete the class
         #region AccessMode
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html"/>
         /// </summary>
         public partial class AccessMode : Java.Lang.Enum<Java.Lang.Invoke.VarHandle.AccessMode>
         {
@@ -770,7 +493,7 @@ public AccessMode(params object[] args) : base(args) { }
 
     #region VolatileCallSite
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VolatileCallSite.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/VolatileCallSite.html"/>
     /// </summary>
     public partial class VolatileCallSite : Java.Lang.Invoke.CallSite
     {
@@ -814,7 +537,7 @@ public VolatileCallSite(params object[] args) : base(args) { }
 
     #region WrongMethodTypeException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/WrongMethodTypeException.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/invoke/WrongMethodTypeException.html"/>
     /// </summary>
     public partial class WrongMethodTypeException : Java.Lang.RuntimeException
     {
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/CallSite.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/CallSite.cs
index 4ffe6ea41..d6a612c45 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/CallSite.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/CallSite.cs
@@ -46,22 +46,31 @@ public partial class CallSite
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/CallSite.html#getTarget()"/> <see href="https://developer.android.com/reference/java.base/java/lang/invoke/CallSite.html#setTarget(java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/CallSite.html#dynamicInvoker()"/>
         /// </summary>
-        public Java.Lang.Invoke.MethodHandle Target
+        /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
+        public Java.Lang.Invoke.MethodHandle DynamicInvoker()
         {
-            get { return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("getTarget", "()Ljava/lang/invoke/MethodHandle;"); } set { IExecuteWithSignature("setTarget", "(Ljava/lang/invoke/MethodHandle;)V", value); }
+            return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("dynamicInvoker", "()Ljava/lang/invoke/MethodHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/CallSite.html#dynamicInvoker()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/CallSite.html#getTarget()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
-        public Java.Lang.Invoke.MethodHandle DynamicInvoker()
+        public Java.Lang.Invoke.MethodHandle GetTarget()
         {
-            return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("dynamicInvoker", "()Ljava/lang/invoke/MethodHandle;");
+            return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("getTarget", "()Ljava/lang/invoke/MethodHandle;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/CallSite.html#setTarget(java.lang.invoke.MethodHandle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
+        public void SetTarget(Java.Lang.Invoke.MethodHandle arg0)
+        {
+            IExecuteWithSignature("setTarget", "(Ljava/lang/invoke/MethodHandle;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/CallSite.html#type()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/CallSite.html#type()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
         public Java.Lang.Invoke.MethodType Type()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/ConstantCallSite.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/ConstantCallSite.cs
index fd3d5d094..b54e37480 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/ConstantCallSite.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/ConstantCallSite.cs
@@ -30,7 +30,7 @@ public partial class ConstantCallSite
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/ConstantCallSite.html#%3Cinit%3E(java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/ConstantCallSite.html#%3Cinit%3E(java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         public ConstantCallSite(Java.Lang.Invoke.MethodHandle arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandle.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandle.cs
index 1534dcf86..9fde62607 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandle.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandle.cs
@@ -46,7 +46,7 @@ public partial class MethodHandle
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#isVarargsCollector()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#isVarargsCollector()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsVarargsCollector()
@@ -54,7 +54,7 @@ public bool IsVarargsCollector()
             return IExecuteWithSignature<bool>("isVarargsCollector", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#invoke(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#invoke(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -64,7 +64,7 @@ public object Invoke(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("invoke", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("invoke", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#invokeExact(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#invokeExact(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -74,7 +74,7 @@ public object InvokeExact(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("invokeExact", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("invokeExact", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#asCollector(int,java.lang.Class,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#asCollector(int,java.lang.Class,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -85,7 +85,7 @@ public Java.Lang.Invoke.MethodHandle AsCollector(int arg0, Java.Lang.Class arg1,
             return IExecute<Java.Lang.Invoke.MethodHandle>("asCollector", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#asCollector(java.lang.Class,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#asCollector(java.lang.Class,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -95,7 +95,7 @@ public Java.Lang.Invoke.MethodHandle AsCollector(Java.Lang.Class arg0, int arg1)
             return IExecute<Java.Lang.Invoke.MethodHandle>("asCollector", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#asFixedArity()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#asFixedArity()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
         public Java.Lang.Invoke.MethodHandle AsFixedArity()
@@ -103,7 +103,7 @@ public Java.Lang.Invoke.MethodHandle AsFixedArity()
             return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("asFixedArity", "()Ljava/lang/invoke/MethodHandle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#asSpreader(int,java.lang.Class,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#asSpreader(int,java.lang.Class,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -114,7 +114,7 @@ public Java.Lang.Invoke.MethodHandle AsSpreader(int arg0, Java.Lang.Class arg1,
             return IExecute<Java.Lang.Invoke.MethodHandle>("asSpreader", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#asSpreader(java.lang.Class,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#asSpreader(java.lang.Class,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -124,16 +124,16 @@ public Java.Lang.Invoke.MethodHandle AsSpreader(Java.Lang.Class arg0, int arg1)
             return IExecute<Java.Lang.Invoke.MethodHandle>("asSpreader", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#asType(java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#asType(java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodType"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
         public Java.Lang.Invoke.MethodHandle AsType(Java.Lang.Invoke.MethodType arg0)
         {
-            return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("asType", "(Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;", arg0);
+            return IExecute<Java.Lang.Invoke.MethodHandle>("asType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#asVarargsCollector(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#asVarargsCollector(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -142,7 +142,7 @@ public Java.Lang.Invoke.MethodHandle AsVarargsCollector(Java.Lang.Class arg0)
             return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("asVarargsCollector", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#bindTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#bindTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -151,7 +151,7 @@ public Java.Lang.Invoke.MethodHandle BindTo(object arg0)
             return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("bindTo", "(Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#withVarargs(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#withVarargs(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -160,7 +160,7 @@ public Java.Lang.Invoke.MethodHandle WithVarargs(bool arg0)
             return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("withVarargs", "(Z)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#type()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#type()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
         public Java.Lang.Invoke.MethodType Type()
@@ -168,7 +168,7 @@ public Java.Lang.Invoke.MethodType Type()
             return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("type", "()Ljava/lang/invoke/MethodType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#invokeWithArguments(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#invokeWithArguments(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -178,7 +178,7 @@ public object InvokeWithArguments(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("invokeWithArguments", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("invokeWithArguments", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandle.html#invokeWithArguments(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandle.html#invokeWithArguments(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <returns><see cref="object"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandleInfo.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandleInfo.cs
index 74a456de7..0caecbf75 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandleInfo.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandleInfo.cs
@@ -56,55 +56,55 @@ public partial class MethodHandleInfo : Java.Lang.Invoke.IMethodHandleInfo
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_getField"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_getField"/>
         /// </summary>
         public static int REF_getField { get { if (!_REF_getFieldReady) { _REF_getFieldContent = SGetField<int>(LocalBridgeClazz, "REF_getField"); _REF_getFieldReady = true; } return _REF_getFieldContent; } }
         private static int _REF_getFieldContent = default;
         private static bool _REF_getFieldReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_getStatic"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_getStatic"/>
         /// </summary>
         public static int REF_getStatic { get { if (!_REF_getStaticReady) { _REF_getStaticContent = SGetField<int>(LocalBridgeClazz, "REF_getStatic"); _REF_getStaticReady = true; } return _REF_getStaticContent; } }
         private static int _REF_getStaticContent = default;
         private static bool _REF_getStaticReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_invokeInterface"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_invokeInterface"/>
         /// </summary>
         public static int REF_invokeInterface { get { if (!_REF_invokeInterfaceReady) { _REF_invokeInterfaceContent = SGetField<int>(LocalBridgeClazz, "REF_invokeInterface"); _REF_invokeInterfaceReady = true; } return _REF_invokeInterfaceContent; } }
         private static int _REF_invokeInterfaceContent = default;
         private static bool _REF_invokeInterfaceReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_invokeSpecial"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_invokeSpecial"/>
         /// </summary>
         public static int REF_invokeSpecial { get { if (!_REF_invokeSpecialReady) { _REF_invokeSpecialContent = SGetField<int>(LocalBridgeClazz, "REF_invokeSpecial"); _REF_invokeSpecialReady = true; } return _REF_invokeSpecialContent; } }
         private static int _REF_invokeSpecialContent = default;
         private static bool _REF_invokeSpecialReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_invokeStatic"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_invokeStatic"/>
         /// </summary>
         public static int REF_invokeStatic { get { if (!_REF_invokeStaticReady) { _REF_invokeStaticContent = SGetField<int>(LocalBridgeClazz, "REF_invokeStatic"); _REF_invokeStaticReady = true; } return _REF_invokeStaticContent; } }
         private static int _REF_invokeStaticContent = default;
         private static bool _REF_invokeStaticReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_invokeVirtual"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_invokeVirtual"/>
         /// </summary>
         public static int REF_invokeVirtual { get { if (!_REF_invokeVirtualReady) { _REF_invokeVirtualContent = SGetField<int>(LocalBridgeClazz, "REF_invokeVirtual"); _REF_invokeVirtualReady = true; } return _REF_invokeVirtualContent; } }
         private static int _REF_invokeVirtualContent = default;
         private static bool _REF_invokeVirtualReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_newInvokeSpecial"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_newInvokeSpecial"/>
         /// </summary>
         public static int REF_newInvokeSpecial { get { if (!_REF_newInvokeSpecialReady) { _REF_newInvokeSpecialContent = SGetField<int>(LocalBridgeClazz, "REF_newInvokeSpecial"); _REF_newInvokeSpecialReady = true; } return _REF_newInvokeSpecialContent; } }
         private static int _REF_newInvokeSpecialContent = default;
         private static bool _REF_newInvokeSpecialReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_putField"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_putField"/>
         /// </summary>
         public static int REF_putField { get { if (!_REF_putFieldReady) { _REF_putFieldContent = SGetField<int>(LocalBridgeClazz, "REF_putField"); _REF_putFieldReady = true; } return _REF_putFieldContent; } }
         private static int _REF_putFieldContent = default;
         private static bool _REF_putFieldReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#REF_putStatic"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#REF_putStatic"/>
         /// </summary>
         public static int REF_putStatic { get { if (!_REF_putStaticReady) { _REF_putStaticContent = SGetField<int>(LocalBridgeClazz, "REF_putStatic"); _REF_putStaticReady = true; } return _REF_putStaticContent; } }
         private static int _REF_putStaticContent = default;
@@ -114,7 +114,7 @@ public partial class MethodHandleInfo : Java.Lang.Invoke.IMethodHandleInfo
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#referenceKindToString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#referenceKindToString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -123,7 +123,7 @@ public static Java.Lang.String ReferenceKindToString(int arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "referenceKindToString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#toString(int,java.lang.Class,java.lang.String,java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#toString(int,java.lang.Class,java.lang.String,java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -139,53 +139,58 @@ public static Java.Lang.String ToString(int arg0, Java.Lang.Class arg1, Java.Lan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#getDeclaringClass()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#reflectAs(java.lang.Class,java.lang.invoke.MethodHandles.Lookup)"/>
         /// </summary>
-        public Java.Lang.Class DeclaringClass
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
+        /// <typeparam name="T"><see cref="Java.Lang.Reflect.IMember"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T ReflectAs<T>(Java.Lang.Class arg0, Java.Lang.Invoke.MethodHandles.Lookup arg1) where T : Java.Lang.Reflect.IMember, new()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
+            return IExecute<T>("reflectAs", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#getMethodType()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#getModifiers()"/>
         /// </summary>
-        public Java.Lang.Invoke.MethodType MethodType
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
         {
-            get { return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("getMethodType", "()Ljava/lang/invoke/MethodType;"); }
+            return IExecuteWithSignature<int>("getModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#getModifiers()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#getReferenceKind()"/>
         /// </summary>
-        public int Modifiers
+        /// <returns><see cref="int"/></returns>
+        public int GetReferenceKind()
         {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
+            return IExecuteWithSignature<int>("getReferenceKind", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#getDeclaringClass()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetDeclaringClass()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#getReferenceKind()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#getMethodType()"/>
         /// </summary>
-        public int ReferenceKind
+        /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
+        public Java.Lang.Invoke.MethodType GetMethodType()
         {
-            get { return IExecuteWithSignature<int>("getReferenceKind", "()I"); }
+            return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("getMethodType", "()Ljava/lang/invoke/MethodType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#reflectAs(java.lang.Class,java.lang.invoke.MethodHandles.Lookup)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#getName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <typeparam name="T"><see cref="Java.Lang.Reflect.IMember"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T ReflectAs<T>(Java.Lang.Class arg0, Java.Lang.Invoke.MethodHandles.Lookup arg1) where T: Java.Lang.Reflect.IMember, new()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecute<T>("reflectAs", arg0, arg1);
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandleInfo.html#isVarArgs()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandleInfo.html#isVarArgs()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsVarArgs()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandles.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandles.cs
index 664b6f031..9b5785a8b 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandles.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodHandles.cs
@@ -42,45 +42,18 @@ public partial class MethodHandles
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#reflectAs(java.lang.Class,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#reflectAs(java.lang.Class,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Reflect.IMember"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public static T ReflectAs<T>(Java.Lang.Class arg0, Java.Lang.Invoke.MethodHandle arg1) where T: Java.Lang.Reflect.IMember, new()
+        public static T ReflectAs<T>(Java.Lang.Class arg0, Java.Lang.Invoke.MethodHandle arg1) where T : Java.Lang.Reflect.IMember, new()
         {
             return SExecute<T>(LocalBridgeClazz, "reflectAs", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#classData(java.lang.invoke.MethodHandles.Lookup,java.lang.String,java.lang.Class)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        /// <exception cref="Java.Lang.IllegalAccessException"/>
-        public static T ClassData<T>(Java.Lang.Invoke.MethodHandles.Lookup arg0, Java.Lang.String arg1, Java.Lang.Class arg2)
-        {
-            return SExecute<T>(LocalBridgeClazz, "classData", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#classDataAt(java.lang.invoke.MethodHandles.Lookup,java.lang.String,java.lang.Class,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.Class"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        /// <exception cref="Java.Lang.IllegalAccessException"/>
-        public static T ClassDataAt<T>(Java.Lang.Invoke.MethodHandles.Lookup arg0, Java.Lang.String arg1, Java.Lang.Class arg2, int arg3)
-        {
-            return SExecute<T>(LocalBridgeClazz, "classDataAt", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#arrayConstructor(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#arrayConstructor(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -90,7 +63,7 @@ public static Java.Lang.Invoke.MethodHandle ArrayConstructor(Java.Lang.Class arg
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "arrayConstructor", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#arrayElementGetter(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#arrayElementGetter(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -100,7 +73,7 @@ public static Java.Lang.Invoke.MethodHandle ArrayElementGetter(Java.Lang.Class a
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "arrayElementGetter", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#arrayElementSetter(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#arrayElementSetter(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -110,7 +83,7 @@ public static Java.Lang.Invoke.MethodHandle ArrayElementSetter(Java.Lang.Class a
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "arrayElementSetter", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#arrayLength(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#arrayLength(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -120,7 +93,7 @@ public static Java.Lang.Invoke.MethodHandle ArrayLength(Java.Lang.Class arg0)
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "arrayLength", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#catchException(java.lang.invoke.MethodHandle,java.lang.Class,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#catchException(java.lang.invoke.MethodHandle,java.lang.Class,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -131,7 +104,7 @@ public static Java.Lang.Invoke.MethodHandle CatchException(Java.Lang.Invoke.Meth
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "catchException", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#collectArguments(java.lang.invoke.MethodHandle,int,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#collectArguments(java.lang.invoke.MethodHandle,int,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -142,7 +115,7 @@ public static Java.Lang.Invoke.MethodHandle CollectArguments(Java.Lang.Invoke.Me
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "collectArguments", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#constant(java.lang.Class,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#constant(java.lang.Class,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -152,7 +125,7 @@ public static Java.Lang.Invoke.MethodHandle Constant(Java.Lang.Class arg0, objec
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "constant", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#countedLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#countedLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -164,7 +137,7 @@ public static Java.Lang.Invoke.MethodHandle CountedLoop(Java.Lang.Invoke.MethodH
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "countedLoop", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#countedLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#countedLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -175,7 +148,7 @@ public static Java.Lang.Invoke.MethodHandle CountedLoop(Java.Lang.Invoke.MethodH
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "countedLoop", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#doWhileLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#doWhileLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -186,7 +159,7 @@ public static Java.Lang.Invoke.MethodHandle DoWhileLoop(Java.Lang.Invoke.MethodH
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "doWhileLoop", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#dropArguments(java.lang.invoke.MethodHandle,int,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#dropArguments(java.lang.invoke.MethodHandle,int,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -197,7 +170,7 @@ public static Java.Lang.Invoke.MethodHandle DropArguments(Java.Lang.Invoke.Metho
             if (arg2.Length == 0) return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "dropArguments", arg0, arg1); else return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "dropArguments", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#dropArguments(java.lang.invoke.MethodHandle,int,java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#dropArguments(java.lang.invoke.MethodHandle,int,java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -208,7 +181,7 @@ public static Java.Lang.Invoke.MethodHandle DropArguments(Java.Lang.Invoke.Metho
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "dropArguments", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#dropArgumentsToMatch(java.lang.invoke.MethodHandle,int,java.util.List,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#dropArgumentsToMatch(java.lang.invoke.MethodHandle,int,java.util.List,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -220,16 +193,7 @@ public static Java.Lang.Invoke.MethodHandle DropArgumentsToMatch(Java.Lang.Invok
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "dropArgumentsToMatch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#dropReturn(java.lang.invoke.MethodHandle)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
-        /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
-        public static Java.Lang.Invoke.MethodHandle DropReturn(Java.Lang.Invoke.MethodHandle arg0)
-        {
-            return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "dropReturn", "(Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#empty(java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#empty(java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodType"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -238,7 +202,7 @@ public static Java.Lang.Invoke.MethodHandle Empty(Java.Lang.Invoke.MethodType ar
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "empty", "(Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#exactInvoker(java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#exactInvoker(java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodType"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -247,7 +211,7 @@ public static Java.Lang.Invoke.MethodHandle ExactInvoker(Java.Lang.Invoke.Method
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "exactInvoker", "(Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#explicitCastArguments(java.lang.invoke.MethodHandle,java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#explicitCastArguments(java.lang.invoke.MethodHandle,java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodType"/></param>
@@ -257,7 +221,7 @@ public static Java.Lang.Invoke.MethodHandle ExplicitCastArguments(Java.Lang.Invo
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "explicitCastArguments", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#filterArguments(java.lang.invoke.MethodHandle,int,java.lang.invoke.MethodHandle[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#filterArguments(java.lang.invoke.MethodHandle,int,java.lang.invoke.MethodHandle[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -268,7 +232,7 @@ public static Java.Lang.Invoke.MethodHandle FilterArguments(Java.Lang.Invoke.Met
             if (arg2.Length == 0) return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "filterArguments", arg0, arg1); else return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "filterArguments", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#filterReturnValue(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#filterReturnValue(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -278,7 +242,7 @@ public static Java.Lang.Invoke.MethodHandle FilterReturnValue(Java.Lang.Invoke.M
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "filterReturnValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#foldArguments(java.lang.invoke.MethodHandle,int,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#foldArguments(java.lang.invoke.MethodHandle,int,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -289,7 +253,7 @@ public static Java.Lang.Invoke.MethodHandle FoldArguments(Java.Lang.Invoke.Metho
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "foldArguments", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#foldArguments(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#foldArguments(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -299,7 +263,7 @@ public static Java.Lang.Invoke.MethodHandle FoldArguments(Java.Lang.Invoke.Metho
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "foldArguments", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#guardWithTest(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#guardWithTest(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -310,7 +274,7 @@ public static Java.Lang.Invoke.MethodHandle GuardWithTest(Java.Lang.Invoke.Metho
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "guardWithTest", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#identity(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#identity(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -319,7 +283,7 @@ public static Java.Lang.Invoke.MethodHandle Identity(Java.Lang.Class arg0)
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "identity", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#insertArguments(java.lang.invoke.MethodHandle,int,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#insertArguments(java.lang.invoke.MethodHandle,int,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -330,7 +294,7 @@ public static Java.Lang.Invoke.MethodHandle InsertArguments(Java.Lang.Invoke.Met
             if (arg2.Length == 0) return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "insertArguments", arg0, arg1); else return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "insertArguments", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#invoker(java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#invoker(java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodType"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -339,7 +303,7 @@ public static Java.Lang.Invoke.MethodHandle Invoker(Java.Lang.Invoke.MethodType
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "invoker", "(Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#iteratedLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#iteratedLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -350,7 +314,7 @@ public static Java.Lang.Invoke.MethodHandle IteratedLoop(Java.Lang.Invoke.Method
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "iteratedLoop", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#loop(java.lang.invoke.MethodHandle[][])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#loop(java.lang.invoke.MethodHandle[][])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -359,7 +323,7 @@ public static Java.Lang.Invoke.MethodHandle Loop(params Java.Lang.Invoke.MethodH
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "loop", "([[Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;"); else return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "loop", "([[Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#permuteArguments(java.lang.invoke.MethodHandle,java.lang.invoke.MethodType,int[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#permuteArguments(java.lang.invoke.MethodHandle,java.lang.invoke.MethodType,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodType"/></param>
@@ -370,7 +334,7 @@ public static Java.Lang.Invoke.MethodHandle PermuteArguments(Java.Lang.Invoke.Me
             if (arg2.Length == 0) return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "permuteArguments", arg0, arg1); else return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "permuteArguments", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#spreadInvoker(java.lang.invoke.MethodType,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#spreadInvoker(java.lang.invoke.MethodType,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodType"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -380,17 +344,7 @@ public static Java.Lang.Invoke.MethodHandle SpreadInvoker(Java.Lang.Invoke.Metho
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "spreadInvoker", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#tableSwitch(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
-        /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
-        public static Java.Lang.Invoke.MethodHandle TableSwitch(Java.Lang.Invoke.MethodHandle arg0, params Java.Lang.Invoke.MethodHandle[] arg1)
-        {
-            if (arg1.Length == 0) return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "tableSwitch", arg0); else return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "tableSwitch", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#throwException(java.lang.Class,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#throwException(java.lang.Class,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -400,7 +354,7 @@ public static Java.Lang.Invoke.MethodHandle ThrowException(Java.Lang.Class arg0,
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "throwException", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#tryFinally(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#tryFinally(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -410,7 +364,7 @@ public static Java.Lang.Invoke.MethodHandle TryFinally(Java.Lang.Invoke.MethodHa
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "tryFinally", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#varHandleExactInvoker(java.lang.invoke.VarHandle.AccessMode,java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#varHandleExactInvoker(java.lang.invoke.VarHandle.AccessMode,java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodType"/></param>
@@ -420,7 +374,7 @@ public static Java.Lang.Invoke.MethodHandle VarHandleExactInvoker(Java.Lang.Invo
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "varHandleExactInvoker", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#varHandleInvoker(java.lang.invoke.VarHandle.AccessMode,java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#varHandleInvoker(java.lang.invoke.VarHandle.AccessMode,java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodType"/></param>
@@ -430,7 +384,7 @@ public static Java.Lang.Invoke.MethodHandle VarHandleInvoker(Java.Lang.Invoke.Va
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "varHandleInvoker", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#whileLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#whileLoop(java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle,java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
@@ -441,7 +395,7 @@ public static Java.Lang.Invoke.MethodHandle WhileLoop(Java.Lang.Invoke.MethodHan
             return SExecute<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "whileLoop", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#zero(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#zero(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -450,7 +404,7 @@ public static Java.Lang.Invoke.MethodHandle Zero(Java.Lang.Class arg0)
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandle>(LocalBridgeClazz, "zero", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#lookup()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#lookup()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></returns>
         public static Java.Lang.Invoke.MethodHandles.Lookup LookupMethod()
@@ -458,7 +412,7 @@ public static Java.Lang.Invoke.MethodHandles.Lookup LookupMethod()
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandles.Lookup>(LocalBridgeClazz, "lookup", "()Ljava/lang/invoke/MethodHandles$Lookup;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#privateLookupIn(java.lang.Class,java.lang.invoke.MethodHandles.Lookup)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#privateLookupIn(java.lang.Class,java.lang.invoke.MethodHandles.Lookup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
@@ -469,7 +423,7 @@ public static Java.Lang.Invoke.MethodHandles.Lookup PrivateLookupIn(Java.Lang.Cl
             return SExecute<Java.Lang.Invoke.MethodHandles.Lookup>(LocalBridgeClazz, "privateLookupIn", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#publicLookup()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#publicLookup()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></returns>
         public static Java.Lang.Invoke.MethodHandles.Lookup PublicLookup()
@@ -477,7 +431,7 @@ public static Java.Lang.Invoke.MethodHandles.Lookup PublicLookup()
             return SExecuteWithSignature<Java.Lang.Invoke.MethodHandles.Lookup>(LocalBridgeClazz, "publicLookup", "()Ljava/lang/invoke/MethodHandles$Lookup;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#arrayElementVarHandle(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#arrayElementVarHandle(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.VarHandle"/></returns>
@@ -487,7 +441,7 @@ public static Java.Lang.Invoke.VarHandle ArrayElementVarHandle(Java.Lang.Class a
             return SExecuteWithSignature<Java.Lang.Invoke.VarHandle>(LocalBridgeClazz, "arrayElementVarHandle", "(Ljava/lang/Class;)Ljava/lang/invoke/VarHandle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#byteArrayViewVarHandle(java.lang.Class,java.nio.ByteOrder)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#byteArrayViewVarHandle(java.lang.Class,java.nio.ByteOrder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteOrder"/></param>
@@ -498,7 +452,7 @@ public static Java.Lang.Invoke.VarHandle ByteArrayViewVarHandle(Java.Lang.Class
             return SExecute<Java.Lang.Invoke.VarHandle>(LocalBridgeClazz, "byteArrayViewVarHandle", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.html#byteBufferViewVarHandle(java.lang.Class,java.nio.ByteOrder)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.html#byteBufferViewVarHandle(java.lang.Class,java.nio.ByteOrder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteOrder"/></param>
@@ -529,43 +483,37 @@ public partial class Lookup
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#MODULE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#MODULE"/>
             /// </summary>
             public static int MODULE { get { if (!_MODULEReady) { _MODULEContent = SGetField<int>(LocalBridgeClazz, "MODULE"); _MODULEReady = true; } return _MODULEContent; } }
             private static int _MODULEContent = default;
             private static bool _MODULEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#ORIGINAL"/>
-            /// </summary>
-            public static int ORIGINAL { get { if (!_ORIGINALReady) { _ORIGINALContent = SGetField<int>(LocalBridgeClazz, "ORIGINAL"); _ORIGINALReady = true; } return _ORIGINALContent; } }
-            private static int _ORIGINALContent = default;
-            private static bool _ORIGINALReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#PACKAGE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#PACKAGE"/>
             /// </summary>
             public static int PACKAGE { get { if (!_PACKAGEReady) { _PACKAGEContent = SGetField<int>(LocalBridgeClazz, "PACKAGE"); _PACKAGEReady = true; } return _PACKAGEContent; } }
             private static int _PACKAGEContent = default;
             private static bool _PACKAGEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#PRIVATE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#PRIVATE"/>
             /// </summary>
             public static int PRIVATE { get { if (!_PRIVATEReady) { _PRIVATEContent = SGetField<int>(LocalBridgeClazz, "PRIVATE"); _PRIVATEReady = true; } return _PRIVATEContent; } }
             private static int _PRIVATEContent = default;
             private static bool _PRIVATEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#PROTECTED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#PROTECTED"/>
             /// </summary>
             public static int PROTECTED { get { if (!_PROTECTEDReady) { _PROTECTEDContent = SGetField<int>(LocalBridgeClazz, "PROTECTED"); _PROTECTEDReady = true; } return _PROTECTEDContent; } }
             private static int _PROTECTEDContent = default;
             private static bool _PROTECTEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#PUBLIC"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#PUBLIC"/>
             /// </summary>
             public static int PUBLIC { get { if (!_PUBLICReady) { _PUBLICContent = SGetField<int>(LocalBridgeClazz, "PUBLIC"); _PUBLICReady = true; } return _PUBLICContent; } }
             private static int _PUBLICContent = default;
             private static bool _PUBLICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#UNCONDITIONAL"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#UNCONDITIONAL"/>
             /// </summary>
             public static int UNCONDITIONAL { get { if (!_UNCONDITIONALReady) { _UNCONDITIONALContent = SGetField<int>(LocalBridgeClazz, "UNCONDITIONAL"); _UNCONDITIONALReady = true; } return _UNCONDITIONALContent; } }
             private static int _UNCONDITIONALContent = default;
@@ -579,24 +527,15 @@ public partial class Lookup
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#hasFullPrivilegeAccess()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#hasPrivateAccess()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
-            public bool HasFullPrivilegeAccess()
-            {
-                return IExecuteWithSignature<bool>("hasFullPrivilegeAccess", "()Z");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#hasPrivateAccess()"/>
-            /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            [System.Obsolete()]
             public bool HasPrivateAccess()
             {
                 return IExecuteWithSignature<bool>("hasPrivateAccess", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#lookupModes()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#lookupModes()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
             public int LookupModes()
@@ -604,17 +543,17 @@ public int LookupModes()
                 return IExecuteWithSignature<int>("lookupModes", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#accessClass(java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#accessClass(java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <returns><see cref="Java.Lang.Class"/></returns>
             /// <exception cref="Java.Lang.IllegalAccessException"/>
             public Java.Lang.Class AccessClass(Java.Lang.Class arg0)
             {
-                return IExecuteWithSignature<Java.Lang.Class>("accessClass", "(Ljava/lang/Class;)Ljava/lang/Class;", arg0);
+                return IExecute<Java.Lang.Class>("accessClass", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#defineClass(byte[])"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#defineClass(byte[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             /// <returns><see cref="Java.Lang.Class"/></returns>
@@ -624,17 +563,7 @@ public Java.Lang.Class DefineClass(byte[] arg0)
                 return IExecuteWithSignature<Java.Lang.Class>("defineClass", "([B)Ljava/lang/Class;", new object[] { arg0 });
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#ensureInitialized(java.lang.Class)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-            /// <returns><see cref="Java.Lang.Class"/></returns>
-            /// <exception cref="Java.Lang.IllegalAccessException"/>
-            public Java.Lang.Class EnsureInitialized(Java.Lang.Class arg0)
-            {
-                return IExecuteWithSignature<Java.Lang.Class>("ensureInitialized", "(Ljava/lang/Class;)Ljava/lang/Class;", arg0);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findClass(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findClass(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.Class"/></returns>
@@ -645,7 +574,7 @@ public Java.Lang.Class FindClass(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Lang.Class>("findClass", "(Ljava/lang/String;)Ljava/lang/Class;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#lookupClass()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#lookupClass()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.Class"/></returns>
             public Java.Lang.Class LookupClass()
@@ -653,15 +582,7 @@ public Java.Lang.Class LookupClass()
                 return IExecuteWithSignature<Java.Lang.Class>("lookupClass", "()Ljava/lang/Class;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#previousLookupClass()"/>
-            /// </summary>
-            /// <returns><see cref="Java.Lang.Class"/></returns>
-            public Java.Lang.Class PreviousLookupClass()
-            {
-                return IExecuteWithSignature<Java.Lang.Class>("previousLookupClass", "()Ljava/lang/Class;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#bind(java.lang.Object,java.lang.String,java.lang.invoke.MethodType)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#bind(java.lang.Object,java.lang.String,java.lang.invoke.MethodType)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -674,7 +595,7 @@ public Java.Lang.Invoke.MethodHandle Bind(object arg0, Java.Lang.String arg1, Ja
                 return IExecute<Java.Lang.Invoke.MethodHandle>("bind", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findConstructor(java.lang.Class,java.lang.invoke.MethodType)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findConstructor(java.lang.Class,java.lang.invoke.MethodType)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodType"/></param>
@@ -686,7 +607,7 @@ public Java.Lang.Invoke.MethodHandle FindConstructor(Java.Lang.Class arg0, Java.
                 return IExecute<Java.Lang.Invoke.MethodHandle>("findConstructor", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findGetter(java.lang.Class,java.lang.String,java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findGetter(java.lang.Class,java.lang.String,java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -699,7 +620,7 @@ public Java.Lang.Invoke.MethodHandle FindGetter(Java.Lang.Class arg0, Java.Lang.
                 return IExecute<Java.Lang.Invoke.MethodHandle>("findGetter", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findSetter(java.lang.Class,java.lang.String,java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findSetter(java.lang.Class,java.lang.String,java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -712,7 +633,7 @@ public Java.Lang.Invoke.MethodHandle FindSetter(Java.Lang.Class arg0, Java.Lang.
                 return IExecute<Java.Lang.Invoke.MethodHandle>("findSetter", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findSpecial(java.lang.Class,java.lang.String,java.lang.invoke.MethodType,java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findSpecial(java.lang.Class,java.lang.String,java.lang.invoke.MethodType,java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -726,7 +647,7 @@ public Java.Lang.Invoke.MethodHandle FindSpecial(Java.Lang.Class arg0, Java.Lang
                 return IExecute<Java.Lang.Invoke.MethodHandle>("findSpecial", arg0, arg1, arg2, arg3);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findStatic(java.lang.Class,java.lang.String,java.lang.invoke.MethodType)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findStatic(java.lang.Class,java.lang.String,java.lang.invoke.MethodType)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -739,7 +660,7 @@ public Java.Lang.Invoke.MethodHandle FindStatic(Java.Lang.Class arg0, Java.Lang.
                 return IExecute<Java.Lang.Invoke.MethodHandle>("findStatic", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findStaticGetter(java.lang.Class,java.lang.String,java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findStaticGetter(java.lang.Class,java.lang.String,java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -752,7 +673,7 @@ public Java.Lang.Invoke.MethodHandle FindStaticGetter(Java.Lang.Class arg0, Java
                 return IExecute<Java.Lang.Invoke.MethodHandle>("findStaticGetter", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findStaticSetter(java.lang.Class,java.lang.String,java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findStaticSetter(java.lang.Class,java.lang.String,java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -765,7 +686,7 @@ public Java.Lang.Invoke.MethodHandle FindStaticSetter(Java.Lang.Class arg0, Java
                 return IExecute<Java.Lang.Invoke.MethodHandle>("findStaticSetter", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findVirtual(java.lang.Class,java.lang.String,java.lang.invoke.MethodType)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findVirtual(java.lang.Class,java.lang.String,java.lang.invoke.MethodType)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -778,7 +699,7 @@ public Java.Lang.Invoke.MethodHandle FindVirtual(Java.Lang.Class arg0, Java.Lang
                 return IExecute<Java.Lang.Invoke.MethodHandle>("findVirtual", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#unreflect(java.lang.reflect.Method)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#unreflect(java.lang.reflect.Method)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Reflect.Method"/></param>
             /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -788,7 +709,7 @@ public Java.Lang.Invoke.MethodHandle Unreflect(Java.Lang.Reflect.Method arg0)
                 return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("unreflect", "(Ljava/lang/reflect/Method;)Ljava/lang/invoke/MethodHandle;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#unreflectConstructor(java.lang.reflect.Constructor)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#unreflectConstructor(java.lang.reflect.Constructor)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Reflect.Constructor"/></param>
             /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -798,7 +719,7 @@ public Java.Lang.Invoke.MethodHandle UnreflectConstructor(Java.Lang.Reflect.Cons
                 return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("unreflectConstructor", "(Ljava/lang/reflect/Constructor;)Ljava/lang/invoke/MethodHandle;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#unreflectGetter(java.lang.reflect.Field)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#unreflectGetter(java.lang.reflect.Field)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Reflect.Field"/></param>
             /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -808,7 +729,7 @@ public Java.Lang.Invoke.MethodHandle UnreflectGetter(Java.Lang.Reflect.Field arg
                 return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("unreflectGetter", "(Ljava/lang/reflect/Field;)Ljava/lang/invoke/MethodHandle;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#unreflectSetter(java.lang.reflect.Field)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#unreflectSetter(java.lang.reflect.Field)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Reflect.Field"/></param>
             /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
@@ -818,7 +739,7 @@ public Java.Lang.Invoke.MethodHandle UnreflectSetter(Java.Lang.Reflect.Field arg
                 return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("unreflectSetter", "(Ljava/lang/reflect/Field;)Ljava/lang/invoke/MethodHandle;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#unreflectSpecial(java.lang.reflect.Method,java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#unreflectSpecial(java.lang.reflect.Method,java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Reflect.Method"/></param>
             /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -829,7 +750,7 @@ public Java.Lang.Invoke.MethodHandle UnreflectSpecial(Java.Lang.Reflect.Method a
                 return IExecute<Java.Lang.Invoke.MethodHandle>("unreflectSpecial", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#revealDirect(java.lang.invoke.MethodHandle)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#revealDirect(java.lang.invoke.MethodHandle)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
             /// <returns><see cref="Java.Lang.Invoke.MethodHandleInfo"/></returns>
@@ -838,32 +759,7 @@ public Java.Lang.Invoke.MethodHandleInfo RevealDirect(Java.Lang.Invoke.MethodHan
                 return IExecuteWithSignature<Java.Lang.Invoke.MethodHandleInfo>("revealDirect", "(Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandleInfo;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#defineHiddenClass(byte[],boolean,java.lang.invoke.MethodHandles.Lookup.ClassOption[])"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="byte"/></param>
-            /// <param name="arg1"><see cref="bool"/></param>
-            /// <param name="arg2"><see cref="Java.Lang.Invoke.MethodHandles.Lookup.ClassOption"/></param>
-            /// <returns><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></returns>
-            /// <exception cref="Java.Lang.IllegalAccessException"/>
-            public Java.Lang.Invoke.MethodHandles.Lookup DefineHiddenClass(byte[] arg0, bool arg1, params Java.Lang.Invoke.MethodHandles.Lookup.ClassOption[] arg2)
-            {
-                if (arg2.Length == 0) return IExecute<Java.Lang.Invoke.MethodHandles.Lookup>("defineHiddenClass", arg0, arg1); else return IExecute<Java.Lang.Invoke.MethodHandles.Lookup>("defineHiddenClass", arg0, arg1, arg2);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#defineHiddenClassWithClassData(byte[],java.lang.Object,boolean,java.lang.invoke.MethodHandles.Lookup.ClassOption[])"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="byte"/></param>
-            /// <param name="arg1"><see cref="object"/></param>
-            /// <param name="arg2"><see cref="bool"/></param>
-            /// <param name="arg3"><see cref="Java.Lang.Invoke.MethodHandles.Lookup.ClassOption"/></param>
-            /// <returns><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></returns>
-            /// <exception cref="Java.Lang.IllegalAccessException"/>
-            public Java.Lang.Invoke.MethodHandles.Lookup DefineHiddenClassWithClassData(byte[] arg0, object arg1, bool arg2, params Java.Lang.Invoke.MethodHandles.Lookup.ClassOption[] arg3)
-            {
-                if (arg3.Length == 0) return IExecute<Java.Lang.Invoke.MethodHandles.Lookup>("defineHiddenClassWithClassData", arg0, arg1, arg2); else return IExecute<Java.Lang.Invoke.MethodHandles.Lookup>("defineHiddenClassWithClassData", arg0, arg1, arg2, arg3);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#dropLookupMode(int)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#dropLookupMode(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></returns>
@@ -872,7 +768,7 @@ public Java.Lang.Invoke.MethodHandles.Lookup DropLookupMode(int arg0)
                 return IExecuteWithSignature<Java.Lang.Invoke.MethodHandles.Lookup>("dropLookupMode", "(I)Ljava/lang/invoke/MethodHandles$Lookup;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#in(java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#in(java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <returns><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></returns>
@@ -881,7 +777,7 @@ public Java.Lang.Invoke.MethodHandles.Lookup In(Java.Lang.Class arg0)
                 return IExecuteWithSignature<Java.Lang.Invoke.MethodHandles.Lookup>("in", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandles$Lookup;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findStaticVarHandle(java.lang.Class,java.lang.String,java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findStaticVarHandle(java.lang.Class,java.lang.String,java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -894,7 +790,7 @@ public Java.Lang.Invoke.VarHandle FindStaticVarHandle(Java.Lang.Class arg0, Java
                 return IExecute<Java.Lang.Invoke.VarHandle>("findStaticVarHandle", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#findVarHandle(java.lang.Class,java.lang.String,java.lang.Class)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#findVarHandle(java.lang.Class,java.lang.String,java.lang.Class)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -907,7 +803,7 @@ public Java.Lang.Invoke.VarHandle FindVarHandle(Java.Lang.Class arg0, Java.Lang.
                 return IExecute<Java.Lang.Invoke.VarHandle>("findVarHandle", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.html#unreflectVarHandle(java.lang.reflect.Field)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodHandles.Lookup.html#unreflectVarHandle(java.lang.reflect.Field)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Reflect.Field"/></param>
             /// <returns><see cref="Java.Lang.Invoke.VarHandle"/></returns>
@@ -920,67 +816,7 @@ public Java.Lang.Invoke.VarHandle UnreflectVarHandle(Java.Lang.Reflect.Field arg
             #endregion
 
             #region Nested classes
-            #region ClassOption
-            public partial class ClassOption
-            {
-                #region Constructors
-
-                #endregion
-
-                #region Class/Interface conversion operators
-
-                #endregion
-
-                #region Fields
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.ClassOption.html#NESTMATE"/>
-                /// </summary>
-                public static Java.Lang.Invoke.MethodHandles.Lookup.ClassOption NESTMATE { get { if (!_NESTMATEReady) { _NESTMATEContent = SGetField<Java.Lang.Invoke.MethodHandles.Lookup.ClassOption>(LocalBridgeClazz, "NESTMATE"); _NESTMATEReady = true; } return _NESTMATEContent; } }
-                private static Java.Lang.Invoke.MethodHandles.Lookup.ClassOption _NESTMATEContent = default;
-                private static bool _NESTMATEReady = false; // this is used because in case of generics 
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.ClassOption.html#STRONG"/>
-                /// </summary>
-                public static Java.Lang.Invoke.MethodHandles.Lookup.ClassOption STRONG { get { if (!_STRONGReady) { _STRONGContent = SGetField<Java.Lang.Invoke.MethodHandles.Lookup.ClassOption>(LocalBridgeClazz, "STRONG"); _STRONGReady = true; } return _STRONGContent; } }
-                private static Java.Lang.Invoke.MethodHandles.Lookup.ClassOption _STRONGContent = default;
-                private static bool _STRONGReady = false; // this is used because in case of generics 
-
-                #endregion
-
-                #region Static methods
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.ClassOption.html#valueOf(java.lang.String)"/>
-                /// </summary>
-                /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-                /// <returns><see cref="Java.Lang.Invoke.MethodHandles.Lookup.ClassOption"/></returns>
-                public static Java.Lang.Invoke.MethodHandles.Lookup.ClassOption ValueOf(Java.Lang.String arg0)
-                {
-                    return SExecuteWithSignature<Java.Lang.Invoke.MethodHandles.Lookup.ClassOption>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/invoke/MethodHandles$Lookup$ClassOption;", arg0);
-                }
-                /// <summary>
-                /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodHandles.Lookup.ClassOption.html#values()"/>
-                /// </summary>
-                /// <returns><see cref="Java.Lang.Invoke.MethodHandles.Lookup.ClassOption"/></returns>
-                public static Java.Lang.Invoke.MethodHandles.Lookup.ClassOption[] Values()
-                {
-                    return SExecuteWithSignatureArray<Java.Lang.Invoke.MethodHandles.Lookup.ClassOption>(LocalBridgeClazz, "values", "()[Ljava/lang/invoke/MethodHandles$Lookup$ClassOption;");
-                }
-
-                #endregion
-
-                #region Instance methods
-
-                #endregion
-
-                #region Nested classes
-
-                #endregion
-
-                // TODO: complete the class
-            }
-            #endregion
 
-        
             #endregion
 
             // TODO: complete the class
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodType.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodType.cs
index b2aa5826a..165ddab59 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodType.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/MethodType.cs
@@ -26,17 +26,13 @@
 namespace Java.Lang.Invoke
 {
     #region MethodType
-    public partial class MethodType : Java.Io.ISerializable
+    public partial class MethodType
     {
         #region Constructors
 
         #endregion
 
         #region Class/Interface conversion operators
-        /// <summary>
-        /// Converter from <see cref="Java.Lang.Invoke.MethodType"/> to <see cref="Java.Io.Serializable"/>
-        /// </summary>
-        public static implicit operator Java.Io.Serializable(Java.Lang.Invoke.MethodType t) => t.Cast<Java.Io.Serializable>();
 
         #endregion
 
@@ -46,7 +42,7 @@ public partial class MethodType : Java.Io.ISerializable
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#fromMethodDescriptorString(java.lang.String,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#fromMethodDescriptorString(java.lang.String,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -58,7 +54,7 @@ public static Java.Lang.Invoke.MethodType FromMethodDescriptorString(Java.Lang.S
             return SExecute<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "fromMethodDescriptorString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#genericMethodType(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#genericMethodType(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -68,7 +64,7 @@ public static Java.Lang.Invoke.MethodType GenericMethodType(int arg0, bool arg1)
             return SExecute<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "genericMethodType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#genericMethodType(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#genericMethodType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
@@ -77,7 +73,7 @@ public static Java.Lang.Invoke.MethodType GenericMethodType(int arg0)
             return SExecuteWithSignature<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "genericMethodType", "(I)Ljava/lang/invoke/MethodType;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.lang.Class,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.lang.Class,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -88,7 +84,7 @@ public static Java.Lang.Invoke.MethodType MethodTypeMethod(Java.Lang.Class arg0,
             if (arg2.Length == 0) return SExecute<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "methodType", arg0, arg1); else return SExecute<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "methodType", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -98,7 +94,7 @@ public static Java.Lang.Invoke.MethodType MethodTypeMethod(Java.Lang.Class arg0,
             return SExecute<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "methodType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -108,7 +104,7 @@ public static Java.Lang.Invoke.MethodType MethodTypeMethod(Java.Lang.Class arg0,
             return SExecute<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "methodType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Invoke.MethodType"/></param>
@@ -118,7 +114,7 @@ public static Java.Lang.Invoke.MethodType MethodTypeMethod(Java.Lang.Class arg0,
             return SExecute<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "methodType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#methodType(java.lang.Class,java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
@@ -128,7 +124,7 @@ public static Java.Lang.Invoke.MethodType MethodTypeMethod(Java.Lang.Class arg0,
             return SExecute<Java.Lang.Invoke.MethodType>(LocalBridgeClazz, "methodType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#methodType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#methodType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
@@ -141,7 +137,7 @@ public static Java.Lang.Invoke.MethodType MethodTypeMethod(Java.Lang.Class arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#hasPrimitives()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#hasPrimitives()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasPrimitives()
@@ -149,7 +145,7 @@ public bool HasPrimitives()
             return IExecuteWithSignature<bool>("hasPrimitives", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#hasWrappers()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#hasWrappers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasWrappers()
@@ -157,7 +153,7 @@ public bool HasWrappers()
             return IExecuteWithSignature<bool>("hasWrappers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#parameterCount()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#parameterCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ParameterCount()
@@ -165,7 +161,7 @@ public int ParameterCount()
             return IExecuteWithSignature<int>("parameterCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#lastParameterType()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#lastParameterType()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Class"/></returns>
         public Java.Lang.Class LastParameterType()
@@ -173,7 +169,32 @@ public Java.Lang.Class LastParameterType()
             return IExecuteWithSignature<Java.Lang.Class>("lastParameterType", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#appendParameterTypes(java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#parameterType(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class ParameterType(int arg0)
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("parameterType", "(I)Ljava/lang/Class;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#returnType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class ReturnType()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("returnType", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#parameterArray()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] ParameterArray()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Class>("parameterArray", "()[Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#appendParameterTypes(java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
@@ -182,7 +203,7 @@ public Java.Lang.Invoke.MethodType AppendParameterTypes(params Java.Lang.Class[]
             if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("appendParameterTypes", "([Ljava/lang/Class;)Ljava/lang/invoke/MethodType;"); else return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("appendParameterTypes", "([Ljava/lang/Class;)Ljava/lang/invoke/MethodType;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#appendParameterTypes(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#appendParameterTypes(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
@@ -191,7 +212,7 @@ public Java.Lang.Invoke.MethodType AppendParameterTypes(Java.Util.List<Java.Lang
             return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("appendParameterTypes", "(Ljava/util/List;)Ljava/lang/invoke/MethodType;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#changeParameterType(int,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#changeParameterType(int,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -201,7 +222,7 @@ public Java.Lang.Invoke.MethodType ChangeParameterType(int arg0, Java.Lang.Class
             return IExecute<Java.Lang.Invoke.MethodType>("changeParameterType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#changeReturnType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#changeReturnType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
@@ -210,7 +231,17 @@ public Java.Lang.Invoke.MethodType ChangeReturnType(Java.Lang.Class arg0)
             return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("changeReturnType", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodType;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#erase()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#dropParameterTypes(int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
+        public Java.Lang.Invoke.MethodType DropParameterTypes(int arg0, int arg1)
+        {
+            return IExecute<Java.Lang.Invoke.MethodType>("dropParameterTypes", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#erase()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
         public Java.Lang.Invoke.MethodType Erase()
@@ -218,7 +249,7 @@ public Java.Lang.Invoke.MethodType Erase()
             return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("erase", "()Ljava/lang/invoke/MethodType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#generic()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#generic()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
         public Java.Lang.Invoke.MethodType Generic()
@@ -226,7 +257,7 @@ public Java.Lang.Invoke.MethodType Generic()
             return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("generic", "()Ljava/lang/invoke/MethodType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#insertParameterTypes(int,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#insertParameterTypes(int,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -236,7 +267,7 @@ public Java.Lang.Invoke.MethodType InsertParameterTypes(int arg0, params Java.La
             if (arg1.Length == 0) return IExecute<Java.Lang.Invoke.MethodType>("insertParameterTypes", arg0); else return IExecute<Java.Lang.Invoke.MethodType>("insertParameterTypes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#insertParameterTypes(int,java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#insertParameterTypes(int,java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
@@ -246,7 +277,7 @@ public Java.Lang.Invoke.MethodType InsertParameterTypes(int arg0, Java.Util.List
             return IExecute<Java.Lang.Invoke.MethodType>("insertParameterTypes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#unwrap()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#unwrap()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
         public Java.Lang.Invoke.MethodType Unwrap()
@@ -254,7 +285,7 @@ public Java.Lang.Invoke.MethodType Unwrap()
             return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("unwrap", "()Ljava/lang/invoke/MethodType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#wrap()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#wrap()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
         public Java.Lang.Invoke.MethodType Wrap()
@@ -262,79 +293,7 @@ public Java.Lang.Invoke.MethodType Wrap()
             return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("wrap", "()Ljava/lang/invoke/MethodType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#parameterType(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfField ParameterType(int arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("parameterType", "(I)Ljava/lang/invoke/TypeDescriptor$OfField;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#returnType()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfField ReturnType()
-        {
-            return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("returnType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#parameterArray()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfField[] ParameterArray()
-        {
-            return IExecuteWithSignatureArray<Java.Lang.Invoke.TypeDescriptor.OfField>("parameterArray", "()[Ljava/lang/invoke/TypeDescriptor$OfField;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#changeParameterType(int,java.lang.invoke.TypeDescriptor.OfField)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></param>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfMethod ChangeParameterType(int arg0, Java.Lang.Invoke.TypeDescriptor.OfField arg1)
-        {
-            return IExecute<Java.Lang.Invoke.TypeDescriptor.OfMethod>("changeParameterType", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#changeReturnType(java.lang.invoke.TypeDescriptor.OfField)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></param>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfMethod ChangeReturnType(Java.Lang.Invoke.TypeDescriptor.OfField arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfMethod>("changeReturnType", "(Ljava/lang/invoke/TypeDescriptor$OfField;)Ljava/lang/invoke/TypeDescriptor$OfMethod;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#dropParameterTypes(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfMethod DropParameterTypes(int arg0, int arg1)
-        {
-            return IExecute<Java.Lang.Invoke.TypeDescriptor.OfMethod>("dropParameterTypes", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#insertParameterTypes(int,java.lang.invoke.TypeDescriptor.OfField[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></param>
-        /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/></returns>
-        public Java.Lang.Invoke.TypeDescriptor.OfMethod InsertParameterTypes(int arg0, Java.Lang.Invoke.TypeDescriptor.OfField[] arg1)
-        {
-            return IExecute<Java.Lang.Invoke.TypeDescriptor.OfMethod>("insertParameterTypes", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#descriptorString()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String DescriptorString()
-        {
-            return IExecuteWithSignature<Java.Lang.String>("descriptorString", "()Ljava/lang/String;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#toMethodDescriptorString()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#toMethodDescriptorString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToMethodDescriptorString()
@@ -342,7 +301,7 @@ public Java.Lang.String ToMethodDescriptorString()
             return IExecuteWithSignature<Java.Lang.String>("toMethodDescriptorString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MethodType.html#parameterList()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MethodType.html#parameterList()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         public Java.Util.List<Java.Lang.Class> ParameterList()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/MutableCallSite.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/MutableCallSite.cs
index dd1571d79..2a811c2b4 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/MutableCallSite.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/MutableCallSite.cs
@@ -30,7 +30,7 @@ public partial class MutableCallSite
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MutableCallSite.html#%3Cinit%3E(java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MutableCallSite.html#%3Cinit%3E(java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         public MutableCallSite(Java.Lang.Invoke.MethodHandle arg0)
@@ -38,7 +38,7 @@ public MutableCallSite(Java.Lang.Invoke.MethodHandle arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MutableCallSite.html#%3Cinit%3E(java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MutableCallSite.html#%3Cinit%3E(java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodType"/></param>
         public MutableCallSite(Java.Lang.Invoke.MethodType arg0)
@@ -58,7 +58,7 @@ public MutableCallSite(Java.Lang.Invoke.MethodType arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/MutableCallSite.html#syncAll(java.lang.invoke.MutableCallSite[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/MutableCallSite.html#syncAll(java.lang.invoke.MutableCallSite[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MutableCallSite"/></param>
         public static void SyncAll(Java.Lang.Invoke.MutableCallSite[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/TypeDescriptor.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/TypeDescriptor.cs
deleted file mode 100644
index dc34d3e67..000000000
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/TypeDescriptor.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Lang.Invoke
-{
-    #region ITypeDescriptor
-    /// <summary>
-    /// .NET interface for TO BE DEFINED FROM USER
-    /// </summary>
-    public partial interface ITypeDescriptor
-    {
-        #region Instance methods
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region TypeDescriptor
-    public partial class TypeDescriptor : Java.Lang.Invoke.ITypeDescriptor
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.html#descriptorString()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String DescriptorString()
-        {
-            return IExecuteWithSignature<Java.Lang.String>("descriptorString", "()Ljava/lang/String;");
-        }
-
-        #endregion
-
-        #region Nested classes
-        #region OfField
-        public partial class OfField
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
-            #region Instance methods
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html#isArray()"/>
-            /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsArray()
-            {
-                return IExecuteWithSignature<bool>("isArray", "()Z");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html#isPrimitive()"/>
-            /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsPrimitive()
-            {
-                return IExecuteWithSignature<bool>("isPrimitive", "()Z");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html#arrayType()"/>
-            /// </summary>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfField ArrayType()
-            {
-                return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("arrayType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html#componentType()"/>
-            /// </summary>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfField ComponentType()
-            {
-                return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("componentType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-        #region OfField<F>
-        public partial class OfField<F>
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-            /// <summary>
-            /// Converter from <see cref="Java.Lang.Invoke.TypeDescriptor.OfField{F}"/> to <see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/>
-            /// </summary>
-            public static implicit operator Java.Lang.Invoke.TypeDescriptor.OfField(Java.Lang.Invoke.TypeDescriptor.OfField<F> t) => t.Cast<Java.Lang.Invoke.TypeDescriptor.OfField>();
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
-            #region Instance methods
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html#isArray()"/>
-            /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsArray()
-            {
-                return IExecuteWithSignature<bool>("isArray", "()Z");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html#isPrimitive()"/>
-            /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsPrimitive()
-            {
-                return IExecuteWithSignature<bool>("isPrimitive", "()Z");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html#arrayType()"/>
-            /// </summary>
-            /// <returns><typeparamref name="F"/></returns>
-            public F ArrayType()
-            {
-                return IExecuteWithSignature<F>("arrayType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfField.html#componentType()"/>
-            /// </summary>
-            /// <returns><typeparamref name="F"/></returns>
-            public F ComponentType()
-            {
-                return IExecuteWithSignature<F>("componentType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-        #region OfMethod
-        public partial class OfMethod
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
-            #region Instance methods
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#parameterType(int)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfField ParameterType(int arg0)
-            {
-                return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("parameterType", "(I)Ljava/lang/invoke/TypeDescriptor$OfField;", arg0);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#returnType()"/>
-            /// </summary>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfField ReturnType()
-            {
-                return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfField>("returnType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#parameterArray()"/>
-            /// </summary>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfField[] ParameterArray()
-            {
-                return IExecuteWithSignatureArray<Java.Lang.Invoke.TypeDescriptor.OfField>("parameterArray", "()[Ljava/lang/invoke/TypeDescriptor$OfField;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#parameterCount()"/>
-            /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int ParameterCount()
-            {
-                return IExecuteWithSignature<int>("parameterCount", "()I");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#parameterList()"/>
-            /// </summary>
-            /// <returns><see cref="Java.Util.List"/></returns>
-            public Java.Util.List ParameterList()
-            {
-                return IExecuteWithSignature<Java.Util.List>("parameterList", "()Ljava/util/List;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#changeParameterType(int,java.lang.invoke.TypeDescriptor.OfField)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></param>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfMethod ChangeParameterType(int arg0, Java.Lang.Invoke.TypeDescriptor.OfField arg1)
-            {
-                return IExecute<Java.Lang.Invoke.TypeDescriptor.OfMethod>("changeParameterType", arg0, arg1);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#changeReturnType(java.lang.invoke.TypeDescriptor.OfField)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></param>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfMethod ChangeReturnType(Java.Lang.Invoke.TypeDescriptor.OfField arg0)
-            {
-                return IExecuteWithSignature<Java.Lang.Invoke.TypeDescriptor.OfMethod>("changeReturnType", "(Ljava/lang/invoke/TypeDescriptor$OfField;)Ljava/lang/invoke/TypeDescriptor$OfMethod;", arg0);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#dropParameterTypes(int,int)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfMethod DropParameterTypes(int arg0, int arg1)
-            {
-                return IExecute<Java.Lang.Invoke.TypeDescriptor.OfMethod>("dropParameterTypes", arg0, arg1);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#insertParameterTypes(int,java.lang.invoke.TypeDescriptor.OfField[])"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><see cref="Java.Lang.Invoke.TypeDescriptor.OfField"/></param>
-            /// <returns><see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/></returns>
-            public Java.Lang.Invoke.TypeDescriptor.OfMethod InsertParameterTypes(int arg0, params Java.Lang.Invoke.TypeDescriptor.OfField[] arg1)
-            {
-                if (arg1.Length == 0) return IExecute<Java.Lang.Invoke.TypeDescriptor.OfMethod>("insertParameterTypes", arg0); else return IExecute<Java.Lang.Invoke.TypeDescriptor.OfMethod>("insertParameterTypes", arg0, arg1);
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-        #region OfMethod<F, M>
-        public partial class OfMethod<F, M>
-        {
-            #region Constructors
-
-            #endregion
-
-            #region Class/Interface conversion operators
-            /// <summary>
-            /// Converter from <see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod{F, M}"/> to <see cref="Java.Lang.Invoke.TypeDescriptor.OfMethod"/>
-            /// </summary>
-            public static implicit operator Java.Lang.Invoke.TypeDescriptor.OfMethod(Java.Lang.Invoke.TypeDescriptor.OfMethod<F, M> t) => t.Cast<Java.Lang.Invoke.TypeDescriptor.OfMethod>();
-
-            #endregion
-
-            #region Fields
-
-            #endregion
-
-            #region Static methods
-
-            #endregion
-
-            #region Instance methods
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#parameterType(int)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <returns><typeparamref name="F"/></returns>
-            public F ParameterType(int arg0)
-            {
-                return IExecuteWithSignature<F>("parameterType", "(I)Ljava/lang/invoke/TypeDescriptor$OfField;", arg0);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#returnType()"/>
-            /// </summary>
-            /// <returns><typeparamref name="F"/></returns>
-            public F ReturnType()
-            {
-                return IExecuteWithSignature<F>("returnType", "()Ljava/lang/invoke/TypeDescriptor$OfField;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#parameterArray()"/>
-            /// </summary>
-            /// <returns><typeparamref name="F"/></returns>
-            public F[] ParameterArray()
-            {
-                return IExecuteWithSignatureArray<F>("parameterArray", "()[Ljava/lang/invoke/TypeDescriptor$OfField;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#parameterCount()"/>
-            /// </summary>
-            /// <returns><see cref="int"/></returns>
-            public int ParameterCount()
-            {
-                return IExecuteWithSignature<int>("parameterCount", "()I");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#parameterList()"/>
-            /// </summary>
-            /// <returns><see cref="Java.Util.List"/></returns>
-            public Java.Util.List<F> ParameterList()
-            {
-                return IExecuteWithSignature<Java.Util.List<F>>("parameterList", "()Ljava/util/List;");
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#changeParameterType(int,java.lang.invoke.TypeDescriptor.OfField)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><typeparamref name="F"/></param>
-            /// <returns><typeparamref name="M"/></returns>
-            public M ChangeParameterType(int arg0, F arg1)
-            {
-                return IExecute<M>("changeParameterType", arg0, arg1);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#changeReturnType(java.lang.invoke.TypeDescriptor.OfField)"/>
-            /// </summary>
-            /// <param name="arg0"><typeparamref name="F"/></param>
-            /// <returns><typeparamref name="M"/></returns>
-            public M ChangeReturnType(F arg0)
-            {
-                return IExecuteWithSignature<M>("changeReturnType", "(Ljava/lang/invoke/TypeDescriptor$OfField;)Ljava/lang/invoke/TypeDescriptor$OfMethod;", arg0);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#dropParameterTypes(int,int)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><see cref="int"/></param>
-            /// <returns><typeparamref name="M"/></returns>
-            public M DropParameterTypes(int arg0, int arg1)
-            {
-                return IExecute<M>("dropParameterTypes", arg0, arg1);
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/TypeDescriptor.OfMethod.html#insertParameterTypes(int,java.lang.invoke.TypeDescriptor.OfField[])"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="int"/></param>
-            /// <param name="arg1"><typeparamref name="F"/></param>
-            /// <returns><typeparamref name="M"/></returns>
-            public M InsertParameterTypes(int arg0, params F[] arg1)
-            {
-                if (arg1.Length == 0) return IExecute<M>("insertParameterTypes", arg0); else return IExecute<M>("insertParameterTypes", arg0, arg1);
-            }
-
-            #endregion
-
-            #region Nested classes
-
-            #endregion
-
-            // TODO: complete the class
-        }
-        #endregion
-
-    
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/VarHandle.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/VarHandle.cs
index 60e237d67..7c6171d63 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/VarHandle.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/VarHandle.cs
@@ -42,35 +42,35 @@ public partial class VarHandle
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#acquireFence()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#acquireFence()"/>
         /// </summary>
         public static void AcquireFence()
         {
             SExecuteWithSignature(LocalBridgeClazz, "acquireFence", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#fullFence()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#fullFence()"/>
         /// </summary>
         public static void FullFence()
         {
             SExecuteWithSignature(LocalBridgeClazz, "fullFence", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#loadLoadFence()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#loadLoadFence()"/>
         /// </summary>
         public static void LoadLoadFence()
         {
             SExecuteWithSignature(LocalBridgeClazz, "loadLoadFence", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#releaseFence()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#releaseFence()"/>
         /// </summary>
         public static void ReleaseFence()
         {
             SExecuteWithSignature(LocalBridgeClazz, "releaseFence", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#storeStoreFence()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#storeStoreFence()"/>
         /// </summary>
         public static void StoreStoreFence()
         {
@@ -81,40 +81,33 @@ public static void StoreStoreFence()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#withInvokeBehavior()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#isAccessModeSupported(java.lang.invoke.VarHandle.AccessMode)"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.Invoke.VarHandle"/></returns>
-        public Java.Lang.Invoke.VarHandle WithInvokeBehavior()
-        {
-            return IExecuteWithSignature<Java.Lang.Invoke.VarHandle>("withInvokeBehavior", "()Ljava/lang/invoke/VarHandle;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#withInvokeExactBehavior()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.Invoke.VarHandle"/></returns>
-        public Java.Lang.Invoke.VarHandle WithInvokeExactBehavior()
+        /// <param name="arg0"><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAccessModeSupported(Java.Lang.Invoke.VarHandle.AccessMode arg0)
         {
-            return IExecuteWithSignature<Java.Lang.Invoke.VarHandle>("withInvokeExactBehavior", "()Ljava/lang/invoke/VarHandle;");
+            return IExecute<bool>("isAccessModeSupported", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#hasInvokeExactBehavior()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#varType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasInvokeExactBehavior()
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class VarType()
         {
-            return IExecuteWithSignature<bool>("hasInvokeExactBehavior", "()Z");
+            return IExecute<Java.Lang.Class>("varType");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#isAccessModeSupported(java.lang.invoke.VarHandle.AccessMode)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#toMethodHandle(java.lang.invoke.VarHandle.AccessMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAccessModeSupported(Java.Lang.Invoke.VarHandle.AccessMode arg0)
+        /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
+        public Java.Lang.Invoke.MethodHandle ToMethodHandle(Java.Lang.Invoke.VarHandle.AccessMode arg0)
         {
-            return IExecuteWithSignature<bool>("isAccessModeSupported", "(Ljava/lang/invoke/VarHandle$AccessMode;)Z", arg0);
+            return IExecute<Java.Lang.Invoke.MethodHandle>("toMethodHandle", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#accessModeType(java.lang.invoke.VarHandle.AccessMode)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#accessModeType(java.lang.invoke.VarHandle.AccessMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></param>
         /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
@@ -123,7 +116,15 @@ public Java.Lang.Invoke.MethodType AccessModeType(Java.Lang.Invoke.VarHandle.Acc
             return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("accessModeType", "(Ljava/lang/invoke/VarHandle$AccessMode;)Ljava/lang/invoke/MethodType;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#compareAndSet(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#coordinateTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.Class> CoordinateTypes()
+        {
+            return IExecute<Java.Util.List<Java.Lang.Class>>("coordinateTypes");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#compareAndSet(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -132,7 +133,7 @@ public bool CompareAndSet(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature<bool>("compareAndSet", "([Ljava/lang/Object;)Z"); else return IExecuteWithSignature<bool>("compareAndSet", "([Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#weakCompareAndSet(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#weakCompareAndSet(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -141,7 +142,7 @@ public bool WeakCompareAndSet(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature<bool>("weakCompareAndSet", "([Ljava/lang/Object;)Z"); else return IExecuteWithSignature<bool>("weakCompareAndSet", "([Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#weakCompareAndSetAcquire(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#weakCompareAndSetAcquire(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -150,7 +151,7 @@ public bool WeakCompareAndSetAcquire(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature<bool>("weakCompareAndSetAcquire", "([Ljava/lang/Object;)Z"); else return IExecuteWithSignature<bool>("weakCompareAndSetAcquire", "([Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#weakCompareAndSetPlain(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#weakCompareAndSetPlain(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -159,7 +160,7 @@ public bool WeakCompareAndSetPlain(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature<bool>("weakCompareAndSetPlain", "([Ljava/lang/Object;)Z"); else return IExecuteWithSignature<bool>("weakCompareAndSetPlain", "([Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#weakCompareAndSetRelease(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#weakCompareAndSetRelease(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -168,7 +169,7 @@ public bool WeakCompareAndSetRelease(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature<bool>("weakCompareAndSetRelease", "([Ljava/lang/Object;)Z"); else return IExecuteWithSignature<bool>("weakCompareAndSetRelease", "([Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#compareAndExchange(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#compareAndExchange(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -177,7 +178,7 @@ public object CompareAndExchange(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("compareAndExchange", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("compareAndExchange", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#compareAndExchangeAcquire(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#compareAndExchangeAcquire(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -186,7 +187,7 @@ public object CompareAndExchangeAcquire(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("compareAndExchangeAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("compareAndExchangeAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#compareAndExchangeRelease(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#compareAndExchangeRelease(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -195,7 +196,7 @@ public object CompareAndExchangeRelease(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("compareAndExchangeRelease", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("compareAndExchangeRelease", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#get(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#get(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -204,7 +205,7 @@ public object Get(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("get", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("get", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAcquire(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAcquire(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -213,7 +214,7 @@ public object GetAcquire(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndAdd(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndAdd(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -222,7 +223,7 @@ public object GetAndAdd(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndAdd", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndAdd", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndAddAcquire(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndAddAcquire(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -231,7 +232,7 @@ public object GetAndAddAcquire(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndAddAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndAddAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndAddRelease(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndAddRelease(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -240,7 +241,7 @@ public object GetAndAddRelease(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndAddRelease", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndAddRelease", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseAnd(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseAnd(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -249,7 +250,7 @@ public object GetAndBitwiseAnd(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseAnd", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseAnd", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseAndAcquire(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseAndAcquire(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -258,7 +259,7 @@ public object GetAndBitwiseAndAcquire(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseAndAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseAndAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseAndRelease(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseAndRelease(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -267,7 +268,7 @@ public object GetAndBitwiseAndRelease(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseAndRelease", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseAndRelease", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseOr(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseOr(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -276,7 +277,7 @@ public object GetAndBitwiseOr(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseOr", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseOr", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseOrAcquire(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseOrAcquire(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -285,7 +286,7 @@ public object GetAndBitwiseOrAcquire(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseOrAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseOrAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseOrRelease(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseOrRelease(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -294,7 +295,7 @@ public object GetAndBitwiseOrRelease(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseOrRelease", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseOrRelease", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseXor(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseXor(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -303,7 +304,7 @@ public object GetAndBitwiseXor(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseXor", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseXor", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseXorAcquire(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseXorAcquire(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -312,7 +313,7 @@ public object GetAndBitwiseXorAcquire(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseXorAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseXorAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndBitwiseXorRelease(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndBitwiseXorRelease(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -321,7 +322,7 @@ public object GetAndBitwiseXorRelease(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndBitwiseXorRelease", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndBitwiseXorRelease", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndSet(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndSet(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -330,7 +331,7 @@ public object GetAndSet(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndSet", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndSet", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndSetAcquire(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndSetAcquire(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -339,7 +340,7 @@ public object GetAndSetAcquire(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndSetAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndSetAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getAndSetRelease(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getAndSetRelease(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -348,7 +349,7 @@ public object GetAndSetRelease(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getAndSetRelease", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getAndSetRelease", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getOpaque(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getOpaque(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -357,7 +358,7 @@ public object GetOpaque(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getOpaque", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getOpaque", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#getVolatile(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#getVolatile(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -366,7 +367,7 @@ public object GetVolatile(params object[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature("getVolatile", "([Ljava/lang/Object;)Ljava/lang/Object;"); else return IExecuteWithSignature("getVolatile", "([Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#set(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#set(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Set(params object[] arg0)
@@ -374,7 +375,7 @@ public void Set(params object[] arg0)
             if (arg0.Length == 0) IExecuteWithSignature("set", "([Ljava/lang/Object;)V"); else IExecuteWithSignature("set", "([Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#setOpaque(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#setOpaque(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void SetOpaque(params object[] arg0)
@@ -382,7 +383,7 @@ public void SetOpaque(params object[] arg0)
             if (arg0.Length == 0) IExecuteWithSignature("setOpaque", "([Ljava/lang/Object;)V"); else IExecuteWithSignature("setOpaque", "([Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#setRelease(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#setRelease(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void SetRelease(params object[] arg0)
@@ -390,46 +391,13 @@ public void SetRelease(params object[] arg0)
             if (arg0.Length == 0) IExecuteWithSignature("setRelease", "([Ljava/lang/Object;)V"); else IExecuteWithSignature("setRelease", "([Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#setVolatile(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.html#setVolatile(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void SetVolatile(params object[] arg0)
         {
             if (arg0.Length == 0) IExecuteWithSignature("setVolatile", "([Ljava/lang/Object;)V"); else IExecuteWithSignature("setVolatile", "([Ljava/lang/Object;)V", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#varType()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.Class"/></returns>
-        public Java.Lang.Class VarType()
-        {
-            return IExecuteWithSignature<Java.Lang.Class>("varType", "()Ljava/lang/Class;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#toMethodHandle(java.lang.invoke.VarHandle.AccessMode)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></param>
-        /// <returns><see cref="Java.Lang.Invoke.MethodHandle"/></returns>
-        public Java.Lang.Invoke.MethodHandle ToMethodHandle(Java.Lang.Invoke.VarHandle.AccessMode arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.Invoke.MethodHandle>("toMethodHandle", "(Ljava/lang/invoke/VarHandle$AccessMode;)Ljava/lang/invoke/MethodHandle;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#coordinateTypes()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.List"/></returns>
-        public Java.Util.List<Java.Lang.Class> CoordinateTypes()
-        {
-            return IExecuteWithSignature<Java.Util.List<Java.Lang.Class>>("coordinateTypes", "()Ljava/util/List;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.html#describeConstable()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<Java.Lang.Invoke.VarHandle.VarHandleDesc> DescribeConstable()
-        {
-            return IExecuteWithSignature<Java.Util.Optional<Java.Lang.Invoke.VarHandle.VarHandleDesc>>("describeConstable", "()Ljava/util/Optional;");
-        }
 
         #endregion
 
@@ -447,187 +415,187 @@ public partial class AccessMode
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#COMPARE_AND_EXCHANGE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#COMPARE_AND_EXCHANGE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode COMPARE_AND_EXCHANGE { get { if (!_COMPARE_AND_EXCHANGEReady) { _COMPARE_AND_EXCHANGEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "COMPARE_AND_EXCHANGE"); _COMPARE_AND_EXCHANGEReady = true; } return _COMPARE_AND_EXCHANGEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _COMPARE_AND_EXCHANGEContent = default;
             private static bool _COMPARE_AND_EXCHANGEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#COMPARE_AND_EXCHANGE_ACQUIRE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#COMPARE_AND_EXCHANGE_ACQUIRE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode COMPARE_AND_EXCHANGE_ACQUIRE { get { if (!_COMPARE_AND_EXCHANGE_ACQUIREReady) { _COMPARE_AND_EXCHANGE_ACQUIREContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "COMPARE_AND_EXCHANGE_ACQUIRE"); _COMPARE_AND_EXCHANGE_ACQUIREReady = true; } return _COMPARE_AND_EXCHANGE_ACQUIREContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _COMPARE_AND_EXCHANGE_ACQUIREContent = default;
             private static bool _COMPARE_AND_EXCHANGE_ACQUIREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#COMPARE_AND_EXCHANGE_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#COMPARE_AND_EXCHANGE_RELEASE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode COMPARE_AND_EXCHANGE_RELEASE { get { if (!_COMPARE_AND_EXCHANGE_RELEASEReady) { _COMPARE_AND_EXCHANGE_RELEASEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "COMPARE_AND_EXCHANGE_RELEASE"); _COMPARE_AND_EXCHANGE_RELEASEReady = true; } return _COMPARE_AND_EXCHANGE_RELEASEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _COMPARE_AND_EXCHANGE_RELEASEContent = default;
             private static bool _COMPARE_AND_EXCHANGE_RELEASEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#COMPARE_AND_SET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#COMPARE_AND_SET"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode COMPARE_AND_SET { get { if (!_COMPARE_AND_SETReady) { _COMPARE_AND_SETContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "COMPARE_AND_SET"); _COMPARE_AND_SETReady = true; } return _COMPARE_AND_SETContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _COMPARE_AND_SETContent = default;
             private static bool _COMPARE_AND_SETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET { get { if (!_GETReady) { _GETContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET"); _GETReady = true; } return _GETContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GETContent = default;
             private static bool _GETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_ACQUIRE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_ACQUIRE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_ACQUIRE { get { if (!_GET_ACQUIREReady) { _GET_ACQUIREContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_ACQUIRE"); _GET_ACQUIREReady = true; } return _GET_ACQUIREContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_ACQUIREContent = default;
             private static bool _GET_ACQUIREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_ADD"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_ADD"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_ADD { get { if (!_GET_AND_ADDReady) { _GET_AND_ADDContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_ADD"); _GET_AND_ADDReady = true; } return _GET_AND_ADDContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_ADDContent = default;
             private static bool _GET_AND_ADDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_ADD_ACQUIRE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_ADD_ACQUIRE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_ADD_ACQUIRE { get { if (!_GET_AND_ADD_ACQUIREReady) { _GET_AND_ADD_ACQUIREContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_ADD_ACQUIRE"); _GET_AND_ADD_ACQUIREReady = true; } return _GET_AND_ADD_ACQUIREContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_ADD_ACQUIREContent = default;
             private static bool _GET_AND_ADD_ACQUIREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_ADD_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_ADD_RELEASE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_ADD_RELEASE { get { if (!_GET_AND_ADD_RELEASEReady) { _GET_AND_ADD_RELEASEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_ADD_RELEASE"); _GET_AND_ADD_RELEASEReady = true; } return _GET_AND_ADD_RELEASEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_ADD_RELEASEContent = default;
             private static bool _GET_AND_ADD_RELEASEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_AND"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_AND"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_AND { get { if (!_GET_AND_BITWISE_ANDReady) { _GET_AND_BITWISE_ANDContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_AND"); _GET_AND_BITWISE_ANDReady = true; } return _GET_AND_BITWISE_ANDContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_ANDContent = default;
             private static bool _GET_AND_BITWISE_ANDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_AND_ACQUIRE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_AND_ACQUIRE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_AND_ACQUIRE { get { if (!_GET_AND_BITWISE_AND_ACQUIREReady) { _GET_AND_BITWISE_AND_ACQUIREContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_AND_ACQUIRE"); _GET_AND_BITWISE_AND_ACQUIREReady = true; } return _GET_AND_BITWISE_AND_ACQUIREContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_AND_ACQUIREContent = default;
             private static bool _GET_AND_BITWISE_AND_ACQUIREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_AND_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_AND_RELEASE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_AND_RELEASE { get { if (!_GET_AND_BITWISE_AND_RELEASEReady) { _GET_AND_BITWISE_AND_RELEASEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_AND_RELEASE"); _GET_AND_BITWISE_AND_RELEASEReady = true; } return _GET_AND_BITWISE_AND_RELEASEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_AND_RELEASEContent = default;
             private static bool _GET_AND_BITWISE_AND_RELEASEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_OR"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_OR"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_OR { get { if (!_GET_AND_BITWISE_ORReady) { _GET_AND_BITWISE_ORContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_OR"); _GET_AND_BITWISE_ORReady = true; } return _GET_AND_BITWISE_ORContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_ORContent = default;
             private static bool _GET_AND_BITWISE_ORReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_OR_ACQUIRE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_OR_ACQUIRE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_OR_ACQUIRE { get { if (!_GET_AND_BITWISE_OR_ACQUIREReady) { _GET_AND_BITWISE_OR_ACQUIREContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_OR_ACQUIRE"); _GET_AND_BITWISE_OR_ACQUIREReady = true; } return _GET_AND_BITWISE_OR_ACQUIREContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_OR_ACQUIREContent = default;
             private static bool _GET_AND_BITWISE_OR_ACQUIREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_OR_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_OR_RELEASE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_OR_RELEASE { get { if (!_GET_AND_BITWISE_OR_RELEASEReady) { _GET_AND_BITWISE_OR_RELEASEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_OR_RELEASE"); _GET_AND_BITWISE_OR_RELEASEReady = true; } return _GET_AND_BITWISE_OR_RELEASEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_OR_RELEASEContent = default;
             private static bool _GET_AND_BITWISE_OR_RELEASEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_XOR"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_XOR"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_XOR { get { if (!_GET_AND_BITWISE_XORReady) { _GET_AND_BITWISE_XORContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_XOR"); _GET_AND_BITWISE_XORReady = true; } return _GET_AND_BITWISE_XORContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_XORContent = default;
             private static bool _GET_AND_BITWISE_XORReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_XOR_ACQUIRE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_XOR_ACQUIRE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_XOR_ACQUIRE { get { if (!_GET_AND_BITWISE_XOR_ACQUIREReady) { _GET_AND_BITWISE_XOR_ACQUIREContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_XOR_ACQUIRE"); _GET_AND_BITWISE_XOR_ACQUIREReady = true; } return _GET_AND_BITWISE_XOR_ACQUIREContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_XOR_ACQUIREContent = default;
             private static bool _GET_AND_BITWISE_XOR_ACQUIREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_XOR_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_BITWISE_XOR_RELEASE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_BITWISE_XOR_RELEASE { get { if (!_GET_AND_BITWISE_XOR_RELEASEReady) { _GET_AND_BITWISE_XOR_RELEASEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_BITWISE_XOR_RELEASE"); _GET_AND_BITWISE_XOR_RELEASEReady = true; } return _GET_AND_BITWISE_XOR_RELEASEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_BITWISE_XOR_RELEASEContent = default;
             private static bool _GET_AND_BITWISE_XOR_RELEASEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_SET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_SET"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_SET { get { if (!_GET_AND_SETReady) { _GET_AND_SETContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_SET"); _GET_AND_SETReady = true; } return _GET_AND_SETContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_SETContent = default;
             private static bool _GET_AND_SETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_SET_ACQUIRE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_SET_ACQUIRE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_SET_ACQUIRE { get { if (!_GET_AND_SET_ACQUIREReady) { _GET_AND_SET_ACQUIREContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_SET_ACQUIRE"); _GET_AND_SET_ACQUIREReady = true; } return _GET_AND_SET_ACQUIREContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_SET_ACQUIREContent = default;
             private static bool _GET_AND_SET_ACQUIREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_SET_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_AND_SET_RELEASE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_AND_SET_RELEASE { get { if (!_GET_AND_SET_RELEASEReady) { _GET_AND_SET_RELEASEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_AND_SET_RELEASE"); _GET_AND_SET_RELEASEReady = true; } return _GET_AND_SET_RELEASEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_AND_SET_RELEASEContent = default;
             private static bool _GET_AND_SET_RELEASEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_OPAQUE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_OPAQUE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_OPAQUE { get { if (!_GET_OPAQUEReady) { _GET_OPAQUEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_OPAQUE"); _GET_OPAQUEReady = true; } return _GET_OPAQUEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_OPAQUEContent = default;
             private static bool _GET_OPAQUEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#GET_VOLATILE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#GET_VOLATILE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode GET_VOLATILE { get { if (!_GET_VOLATILEReady) { _GET_VOLATILEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "GET_VOLATILE"); _GET_VOLATILEReady = true; } return _GET_VOLATILEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _GET_VOLATILEContent = default;
             private static bool _GET_VOLATILEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#SET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#SET"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode SET { get { if (!_SETReady) { _SETContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "SET"); _SETReady = true; } return _SETContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _SETContent = default;
             private static bool _SETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#SET_OPAQUE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#SET_OPAQUE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode SET_OPAQUE { get { if (!_SET_OPAQUEReady) { _SET_OPAQUEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "SET_OPAQUE"); _SET_OPAQUEReady = true; } return _SET_OPAQUEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _SET_OPAQUEContent = default;
             private static bool _SET_OPAQUEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#SET_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#SET_RELEASE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode SET_RELEASE { get { if (!_SET_RELEASEReady) { _SET_RELEASEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "SET_RELEASE"); _SET_RELEASEReady = true; } return _SET_RELEASEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _SET_RELEASEContent = default;
             private static bool _SET_RELEASEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#SET_VOLATILE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#SET_VOLATILE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode SET_VOLATILE { get { if (!_SET_VOLATILEReady) { _SET_VOLATILEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "SET_VOLATILE"); _SET_VOLATILEReady = true; } return _SET_VOLATILEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _SET_VOLATILEContent = default;
             private static bool _SET_VOLATILEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#WEAK_COMPARE_AND_SET"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#WEAK_COMPARE_AND_SET"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode WEAK_COMPARE_AND_SET { get { if (!_WEAK_COMPARE_AND_SETReady) { _WEAK_COMPARE_AND_SETContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "WEAK_COMPARE_AND_SET"); _WEAK_COMPARE_AND_SETReady = true; } return _WEAK_COMPARE_AND_SETContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _WEAK_COMPARE_AND_SETContent = default;
             private static bool _WEAK_COMPARE_AND_SETReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#WEAK_COMPARE_AND_SET_ACQUIRE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#WEAK_COMPARE_AND_SET_ACQUIRE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode WEAK_COMPARE_AND_SET_ACQUIRE { get { if (!_WEAK_COMPARE_AND_SET_ACQUIREReady) { _WEAK_COMPARE_AND_SET_ACQUIREContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "WEAK_COMPARE_AND_SET_ACQUIRE"); _WEAK_COMPARE_AND_SET_ACQUIREReady = true; } return _WEAK_COMPARE_AND_SET_ACQUIREContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _WEAK_COMPARE_AND_SET_ACQUIREContent = default;
             private static bool _WEAK_COMPARE_AND_SET_ACQUIREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#WEAK_COMPARE_AND_SET_PLAIN"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#WEAK_COMPARE_AND_SET_PLAIN"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode WEAK_COMPARE_AND_SET_PLAIN { get { if (!_WEAK_COMPARE_AND_SET_PLAINReady) { _WEAK_COMPARE_AND_SET_PLAINContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "WEAK_COMPARE_AND_SET_PLAIN"); _WEAK_COMPARE_AND_SET_PLAINReady = true; } return _WEAK_COMPARE_AND_SET_PLAINContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _WEAK_COMPARE_AND_SET_PLAINContent = default;
             private static bool _WEAK_COMPARE_AND_SET_PLAINReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#WEAK_COMPARE_AND_SET_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#WEAK_COMPARE_AND_SET_RELEASE"/>
             /// </summary>
             public static Java.Lang.Invoke.VarHandle.AccessMode WEAK_COMPARE_AND_SET_RELEASE { get { if (!_WEAK_COMPARE_AND_SET_RELEASEReady) { _WEAK_COMPARE_AND_SET_RELEASEContent = SGetField<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "WEAK_COMPARE_AND_SET_RELEASE"); _WEAK_COMPARE_AND_SET_RELEASEReady = true; } return _WEAK_COMPARE_AND_SET_RELEASEContent; } }
             private static Java.Lang.Invoke.VarHandle.AccessMode _WEAK_COMPARE_AND_SET_RELEASEContent = default;
@@ -637,7 +605,7 @@ public partial class AccessMode
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#valueFromMethodName(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#valueFromMethodName(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></returns>
@@ -646,7 +614,7 @@ public static Java.Lang.Invoke.VarHandle.AccessMode ValueFromMethodName(Java.Lan
                 return SExecuteWithSignature<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "valueFromMethodName", "(Ljava/lang/String;)Ljava/lang/invoke/VarHandle$AccessMode;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></returns>
@@ -655,7 +623,7 @@ public static Java.Lang.Invoke.VarHandle.AccessMode ValueOf(Java.Lang.String arg
                 return SExecuteWithSignature<Java.Lang.Invoke.VarHandle.AccessMode>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/invoke/VarHandle$AccessMode;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.Invoke.VarHandle.AccessMode"/></returns>
             public static Java.Lang.Invoke.VarHandle.AccessMode[] Values()
@@ -667,7 +635,7 @@ public static Java.Lang.Invoke.VarHandle.AccessMode[] Values()
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VarHandle.AccessMode.html#methodName()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/invoke/VarHandle.AccessMode.html#methodName()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.String"/></returns>
             public Java.Lang.String MethodName()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Invoke/VolatileCallSite.cs b/src/net/Netdroid/Generated/Java/Lang/Invoke/VolatileCallSite.cs
index 9ba9a005e..a4a74a411 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Invoke/VolatileCallSite.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Invoke/VolatileCallSite.cs
@@ -30,7 +30,7 @@ public partial class VolatileCallSite
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VolatileCallSite.html#%3Cinit%3E(java.lang.invoke.MethodHandle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VolatileCallSite.html#%3Cinit%3E(java.lang.invoke.MethodHandle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
         public VolatileCallSite(Java.Lang.Invoke.MethodHandle arg0)
@@ -38,7 +38,7 @@ public VolatileCallSite(Java.Lang.Invoke.MethodHandle arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/invoke/VolatileCallSite.html#%3Cinit%3E(java.lang.invoke.MethodType)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/invoke/VolatileCallSite.html#%3Cinit%3E(java.lang.invoke.MethodType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodType"/></param>
         public VolatileCallSite(Java.Lang.Invoke.MethodType arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Long.cs b/src/net/Netdroid/Generated/Java/Lang/Long.cs
index 7025a502f..cb71fad37 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Long.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Long.cs
@@ -26,24 +26,24 @@
 namespace Java.Lang
 {
     #region Long
-    public partial class Long : Java.Lang.IComparable<Java.Lang.Long>
+    public partial class Long
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Lang.NumberFormatException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Long(Java.Lang.String arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Long(long arg0)
             : base(arg0)
         {
@@ -61,31 +61,31 @@ public Long(long arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#BYTES"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#BYTES"/>
         /// </summary>
         public static int BYTES { get { if (!_BYTESReady) { _BYTESContent = SGetField<int>(LocalBridgeClazz, "BYTES"); _BYTESReady = true; } return _BYTESContent; } }
         private static int _BYTESContent = default;
         private static bool _BYTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#SIZE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#SIZE"/>
         /// </summary>
         public static int SIZE { get { if (!_SIZEReady) { _SIZEContent = SGetField<int>(LocalBridgeClazz, "SIZE"); _SIZEReady = true; } return _SIZEContent; } }
         private static int _SIZEContent = default;
         private static bool _SIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
         private static bool _TYPEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#MAX_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#MAX_VALUE"/>
         /// </summary>
         public static long MAX_VALUE { get { if (!_MAX_VALUEReady) { _MAX_VALUEContent = SGetField<long>(LocalBridgeClazz, "MAX_VALUE"); _MAX_VALUEReady = true; } return _MAX_VALUEContent; } }
         private static long _MAX_VALUEContent = default;
         private static bool _MAX_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#MIN_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#MIN_VALUE"/>
         /// </summary>
         public static long MIN_VALUE { get { if (!_MIN_VALUEReady) { _MIN_VALUEContent = SGetField<long>(LocalBridgeClazz, "MIN_VALUE"); _MIN_VALUEReady = true; } return _MIN_VALUEContent; } }
         private static long _MIN_VALUEContent = default;
@@ -95,7 +95,7 @@ public Long(long arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#bitCount(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#bitCount(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -104,7 +104,7 @@ public static int BitCount(long arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "bitCount", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#compare(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#compare(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -114,7 +114,7 @@ public static int Compare(long arg0, long arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#compareUnsigned(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#compareUnsigned(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -124,7 +124,7 @@ public static int CompareUnsigned(long arg0, long arg1)
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#hashCode(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#hashCode(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -133,7 +133,7 @@ public static int HashCode(long arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#numberOfLeadingZeros(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#numberOfLeadingZeros(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -142,7 +142,7 @@ public static int NumberOfLeadingZeros(long arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "numberOfLeadingZeros", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#numberOfTrailingZeros(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#numberOfTrailingZeros(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -151,7 +151,7 @@ public static int NumberOfTrailingZeros(long arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "numberOfTrailingZeros", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#signum(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#signum(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -160,7 +160,7 @@ public static int Signum(long arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "signum", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#decode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#decode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Long"/></returns>
@@ -170,7 +170,7 @@ public static Java.Lang.Long Decode(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Long>(LocalBridgeClazz, "decode", "(Ljava/lang/String;)Ljava/lang/Long;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#getLong(java.lang.String,java.lang.Long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#getLong(java.lang.String,java.lang.Long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Long"/></param>
@@ -180,7 +180,7 @@ public static Java.Lang.Long GetLong(Java.Lang.String arg0, Java.Lang.Long arg1)
             return SExecute<Java.Lang.Long>(LocalBridgeClazz, "getLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#getLong(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#getLong(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -190,7 +190,7 @@ public static Java.Lang.Long GetLong(Java.Lang.String arg0, long arg1)
             return SExecute<Java.Lang.Long>(LocalBridgeClazz, "getLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#getLong(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#getLong(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Long"/></returns>
@@ -199,7 +199,7 @@ public static Java.Lang.Long GetLong(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Long>(LocalBridgeClazz, "getLong", "(Ljava/lang/String;)Ljava/lang/Long;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#valueOf(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#valueOf(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -210,7 +210,7 @@ public static Java.Lang.Long ValueOf(Java.Lang.String arg0, int arg1)
             return SExecute<Java.Lang.Long>(LocalBridgeClazz, "valueOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Long"/></returns>
@@ -220,7 +220,7 @@ public static Java.Lang.Long ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Long>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Long;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#valueOf(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#valueOf(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.Long"/></returns>
@@ -229,7 +229,7 @@ public static Java.Lang.Long ValueOf(long arg0)
             return SExecuteWithSignature<Java.Lang.Long>(LocalBridgeClazz, "valueOf", "(J)Ljava/lang/Long;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#toBinaryString(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#toBinaryString(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -238,7 +238,7 @@ public static Java.Lang.String ToBinaryString(long arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toBinaryString", "(J)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#toHexString(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#toHexString(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -247,7 +247,7 @@ public static Java.Lang.String ToHexString(long arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toHexString", "(J)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#toOctalString(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#toOctalString(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -256,7 +256,7 @@ public static Java.Lang.String ToOctalString(long arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toOctalString", "(J)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#toString(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#toString(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -266,7 +266,7 @@ public static Java.Lang.String ToString(long arg0, int arg1)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "toString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#toString(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#toString(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -275,7 +275,7 @@ public static Java.Lang.String ToString(long arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(J)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#toUnsignedString(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#toUnsignedString(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -285,7 +285,7 @@ public static Java.Lang.String ToUnsignedString(long arg0, int arg1)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "toUnsignedString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#toUnsignedString(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#toUnsignedString(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -294,7 +294,7 @@ public static Java.Lang.String ToUnsignedString(long arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toUnsignedString", "(J)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#divideUnsigned(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#divideUnsigned(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -304,7 +304,7 @@ public static long DivideUnsigned(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "divideUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#highestOneBit(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#highestOneBit(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -313,7 +313,7 @@ public static long HighestOneBit(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "highestOneBit", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#lowestOneBit(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#lowestOneBit(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -322,7 +322,7 @@ public static long LowestOneBit(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "lowestOneBit", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#max(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#max(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -332,7 +332,7 @@ public static long Max(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#min(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#min(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -342,7 +342,7 @@ public static long Min(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#parseLong(java.lang.CharSequence,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#parseLong(java.lang.CharSequence,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -355,7 +355,7 @@ public static long ParseLong(Java.Lang.CharSequence arg0, int arg1, int arg2, in
             return SExecute<long>(LocalBridgeClazz, "parseLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#parseLong(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#parseLong(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -366,7 +366,7 @@ public static long ParseLong(Java.Lang.String arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "parseLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#parseLong(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#parseLong(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="long"/></returns>
@@ -376,7 +376,7 @@ public static long ParseLong(Java.Lang.String arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "parseLong", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#parseUnsignedLong(java.lang.CharSequence,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#parseUnsignedLong(java.lang.CharSequence,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -389,7 +389,7 @@ public static long ParseUnsignedLong(Java.Lang.CharSequence arg0, int arg1, int
             return SExecute<long>(LocalBridgeClazz, "parseUnsignedLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#parseUnsignedLong(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#parseUnsignedLong(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -400,7 +400,7 @@ public static long ParseUnsignedLong(Java.Lang.String arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "parseUnsignedLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#parseUnsignedLong(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#parseUnsignedLong(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="long"/></returns>
@@ -410,7 +410,7 @@ public static long ParseUnsignedLong(Java.Lang.String arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "parseUnsignedLong", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#remainderUnsigned(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#remainderUnsigned(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -420,7 +420,7 @@ public static long RemainderUnsigned(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "remainderUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#reverse(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#reverse(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -429,7 +429,7 @@ public static long Reverse(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "reverse", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#reverseBytes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#reverseBytes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -438,7 +438,7 @@ public static long ReverseBytes(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "reverseBytes", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#rotateLeft(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#rotateLeft(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -448,7 +448,7 @@ public static long RotateLeft(long arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "rotateLeft", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#rotateRight(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#rotateRight(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -458,7 +458,7 @@ public static long RotateRight(long arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "rotateRight", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#sum(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#sum(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -472,7 +472,7 @@ public static long Sum(long arg0, long arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#compareTo(java.lang.Long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#compareTo(java.lang.Long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -481,7 +481,7 @@ public int CompareTo(Java.Lang.Long arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Long;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Long.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -489,24 +489,6 @@ public int CompareTo(object arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#resolveConstantDesc(java.lang.invoke.MethodHandles.Lookup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Lang.ReflectiveOperationException"/>
-        public object ResolveConstantDesc(Java.Lang.Invoke.MethodHandles.Lookup arg0)
-        {
-            return IExecuteWithSignature("resolveConstantDesc", "(Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/Object;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Long.html#describeConstable()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<Java.Lang.Long> DescribeConstable()
-        {
-            return IExecuteWithSignature<Java.Util.Optional<Java.Lang.Long>>("describeConstable", "()Ljava/util/Optional;");
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Lang/Math.cs b/src/net/Netdroid/Generated/Java/Lang/Math.cs
index 144c1988c..75708cbca 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Math.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Math.cs
@@ -38,13 +38,13 @@ public partial class Math
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#E"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#E"/>
         /// </summary>
         public static double E { get { if (!_EReady) { _EContent = SGetField<double>(LocalBridgeClazz, "E"); _EReady = true; } return _EContent; } }
         private static double _EContent = default;
         private static bool _EReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#PI"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#PI"/>
         /// </summary>
         public static double PI { get { if (!_PIReady) { _PIContent = SGetField<double>(LocalBridgeClazz, "PI"); _PIReady = true; } return _PIContent; } }
         private static double _PIContent = default;
@@ -54,7 +54,7 @@ public partial class Math
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#abs(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#abs(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -63,7 +63,7 @@ public static double Abs(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "abs", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#acos(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#acos(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -72,7 +72,7 @@ public static double Acos(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "acos", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#asin(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#asin(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -81,7 +81,7 @@ public static double Asin(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "asin", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#atan(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#atan(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -90,7 +90,7 @@ public static double Atan(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "atan", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#atan2(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#atan2(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -100,7 +100,7 @@ public static double Atan2(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "atan2", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#cbrt(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#cbrt(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -109,7 +109,7 @@ public static double Cbrt(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "cbrt", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#ceil(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#ceil(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -118,7 +118,7 @@ public static double Ceil(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "ceil", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#copySign(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#copySign(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -128,7 +128,7 @@ public static double CopySign(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "copySign", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#cos(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#cos(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -137,7 +137,7 @@ public static double Cos(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "cos", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#cosh(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#cosh(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -146,7 +146,7 @@ public static double Cosh(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "cosh", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#exp(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#exp(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -155,7 +155,7 @@ public static double Exp(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "exp", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#expm1(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#expm1(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -164,7 +164,7 @@ public static double Expm1(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "expm1", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#floor(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#floor(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -173,7 +173,7 @@ public static double Floor(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "floor", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#fma(double,double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#fma(double,double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -184,7 +184,7 @@ public static double Fma(double arg0, double arg1, double arg2)
             return SExecute<double>(LocalBridgeClazz, "fma", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#hypot(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#hypot(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -194,7 +194,7 @@ public static double Hypot(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "hypot", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#IEEEremainder(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#IEEEremainder(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -204,7 +204,7 @@ public static double IEEEremainder(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "IEEEremainder", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#log(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#log(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -213,7 +213,7 @@ public static double Log(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "log", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#log10(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#log10(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -222,7 +222,7 @@ public static double Log10(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "log10", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#log1p(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#log1p(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -231,7 +231,7 @@ public static double Log1p(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "log1p", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#max(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#max(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -241,7 +241,7 @@ public static double Max(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#min(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#min(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -251,7 +251,7 @@ public static double Min(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#nextAfter(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#nextAfter(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -261,7 +261,7 @@ public static double NextAfter(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "nextAfter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#nextDown(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#nextDown(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -270,7 +270,7 @@ public static double NextDown(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "nextDown", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#nextUp(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#nextUp(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -279,7 +279,7 @@ public static double NextUp(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "nextUp", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#pow(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#pow(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -289,7 +289,7 @@ public static double Pow(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "pow", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#random()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#random()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public static double Random()
@@ -297,7 +297,7 @@ public static double Random()
             return SExecuteWithSignature<double>(LocalBridgeClazz, "random", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#rint(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#rint(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -306,7 +306,7 @@ public static double Rint(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "rint", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#scalb(double,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#scalb(double,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -316,7 +316,7 @@ public static double Scalb(double arg0, int arg1)
             return SExecute<double>(LocalBridgeClazz, "scalb", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#signum(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#signum(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -325,7 +325,7 @@ public static double Signum(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "signum", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#sin(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#sin(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -334,7 +334,7 @@ public static double Sin(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "sin", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#sinh(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#sinh(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -343,7 +343,7 @@ public static double Sinh(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "sinh", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#sqrt(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#sqrt(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -352,7 +352,7 @@ public static double Sqrt(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "sqrt", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#tan(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#tan(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -361,7 +361,7 @@ public static double Tan(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "tan", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#tanh(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#tanh(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -370,7 +370,7 @@ public static double Tanh(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "tanh", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#toDegrees(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#toDegrees(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -379,7 +379,7 @@ public static double ToDegrees(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "toDegrees", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#toRadians(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#toRadians(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -388,7 +388,7 @@ public static double ToRadians(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "toRadians", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#ulp(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#ulp(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -397,7 +397,7 @@ public static double Ulp(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "ulp", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#abs(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#abs(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -406,7 +406,7 @@ public static float Abs(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "abs", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#copySign(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#copySign(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -416,7 +416,7 @@ public static float CopySign(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "copySign", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#fma(float,float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#fma(float,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -427,7 +427,7 @@ public static float Fma(float arg0, float arg1, float arg2)
             return SExecute<float>(LocalBridgeClazz, "fma", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#max(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#max(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -437,7 +437,7 @@ public static float Max(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#min(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#min(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -447,7 +447,7 @@ public static float Min(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#nextAfter(float,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#nextAfter(float,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -457,7 +457,7 @@ public static float NextAfter(float arg0, double arg1)
             return SExecute<float>(LocalBridgeClazz, "nextAfter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#nextDown(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#nextDown(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -466,7 +466,7 @@ public static float NextDown(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "nextDown", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#nextUp(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#nextUp(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -475,7 +475,7 @@ public static float NextUp(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "nextUp", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#scalb(float,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#scalb(float,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -485,7 +485,7 @@ public static float Scalb(float arg0, int arg1)
             return SExecute<float>(LocalBridgeClazz, "scalb", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#signum(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#signum(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -494,7 +494,7 @@ public static float Signum(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "signum", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#ulp(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#ulp(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -503,7 +503,7 @@ public static float Ulp(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "ulp", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#abs(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#abs(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -512,16 +512,7 @@ public static int Abs(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "abs", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#absExact(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int AbsExact(int arg0)
-        {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "absExact", "(I)I", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#addExact(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#addExact(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -531,7 +522,7 @@ public static int AddExact(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "addExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#decrementExact(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#decrementExact(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -540,7 +531,7 @@ public static int DecrementExact(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "decrementExact", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#floorDiv(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#floorDiv(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -550,7 +541,7 @@ public static int FloorDiv(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "floorDiv", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#floorMod(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#floorMod(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -560,7 +551,7 @@ public static int FloorMod(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "floorMod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#floorMod(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#floorMod(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -570,7 +561,7 @@ public static int FloorMod(long arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "floorMod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#getExponent(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#getExponent(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="int"/></returns>
@@ -579,7 +570,7 @@ public static int GetExponent(double arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getExponent", "(D)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#getExponent(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#getExponent(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -588,7 +579,7 @@ public static int GetExponent(float arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getExponent", "(F)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#incrementExact(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#incrementExact(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -597,7 +588,7 @@ public static int IncrementExact(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "incrementExact", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#max(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#max(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -607,7 +598,7 @@ public static int Max(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#min(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#min(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -617,7 +608,7 @@ public static int Min(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#multiplyExact(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#multiplyExact(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -627,7 +618,7 @@ public static int MultiplyExact(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "multiplyExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#negateExact(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#negateExact(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -636,7 +627,7 @@ public static int NegateExact(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "negateExact", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#round(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#round(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -645,7 +636,7 @@ public static int Round(float arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "round", "(F)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#subtractExact(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#subtractExact(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -655,7 +646,7 @@ public static int SubtractExact(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "subtractExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#toIntExact(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#toIntExact(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -664,7 +655,7 @@ public static int ToIntExact(long arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "toIntExact", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#abs(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#abs(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -673,16 +664,7 @@ public static long Abs(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "abs", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#absExact(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long AbsExact(long arg0)
-        {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "absExact", "(J)J", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#addExact(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#addExact(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -692,7 +674,7 @@ public static long AddExact(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "addExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#decrementExact(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#decrementExact(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -701,7 +683,7 @@ public static long DecrementExact(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "decrementExact", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#floorDiv(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#floorDiv(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -711,7 +693,7 @@ public static long FloorDiv(long arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "floorDiv", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#floorDiv(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#floorDiv(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -721,7 +703,7 @@ public static long FloorDiv(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "floorDiv", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#floorMod(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#floorMod(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -731,7 +713,7 @@ public static long FloorMod(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "floorMod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#incrementExact(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#incrementExact(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -740,7 +722,7 @@ public static long IncrementExact(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "incrementExact", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#max(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#max(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -750,7 +732,7 @@ public static long Max(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#min(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#min(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -760,7 +742,7 @@ public static long Min(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#multiplyExact(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#multiplyExact(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -770,7 +752,7 @@ public static long MultiplyExact(long arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "multiplyExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#multiplyExact(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#multiplyExact(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -780,7 +762,7 @@ public static long MultiplyExact(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "multiplyExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#multiplyFull(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#multiplyFull(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -790,7 +772,7 @@ public static long MultiplyFull(int arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "multiplyFull", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#multiplyHigh(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#multiplyHigh(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -800,7 +782,7 @@ public static long MultiplyHigh(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "multiplyHigh", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#negateExact(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#negateExact(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -809,7 +791,7 @@ public static long NegateExact(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "negateExact", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#round(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#round(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="long"/></returns>
@@ -818,7 +800,7 @@ public static long Round(double arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "round", "(D)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Math.html#subtractExact(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Math.html#subtractExact(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Number.cs b/src/net/Netdroid/Generated/Java/Lang/Number.cs
index 91a582b25..c1c8c3e3e 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Number.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Number.cs
@@ -46,7 +46,7 @@ public partial class Number
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Number.html#doubleValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Number.html#doubleValue()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double DoubleValue()
@@ -54,7 +54,7 @@ public double DoubleValue()
             return IExecuteWithSignature<double>("doubleValue", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Number.html#floatValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Number.html#floatValue()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         public float FloatValue()
@@ -62,7 +62,7 @@ public float FloatValue()
             return IExecuteWithSignature<float>("floatValue", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Number.html#intValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Number.html#intValue()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int IntValue()
@@ -70,7 +70,7 @@ public int IntValue()
             return IExecuteWithSignature<int>("intValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Number.html#longValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Number.html#longValue()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long LongValue()
@@ -78,7 +78,7 @@ public long LongValue()
             return IExecuteWithSignature<long>("longValue", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Number.html#byteValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Number.html#byteValue()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte ByteValue()
@@ -86,7 +86,7 @@ public byte ByteValue()
             return IExecuteWithSignature<byte>("byteValue", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Number.html#shortValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Number.html#shortValue()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         public short ShortValue()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Package.cs b/src/net/Netdroid/Generated/Java/Lang/Package.cs
index 58113bc85..e0aa9abfa 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Package.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Package.cs
@@ -42,164 +42,174 @@ public partial class Package
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getPackages()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getPackage(java.lang.String)"/>
         /// </summary>
-        public static Java.Lang.Package[] Packages
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.Package"/></returns>
+        [global::System.Obsolete()]
+        public static Java.Lang.Package GetPackage(Java.Lang.String arg0)
         {
-            get { return SExecuteWithSignatureArray<Java.Lang.Package>(LocalBridgeClazz, "getPackages", "()[Ljava/lang/Package;"); }
+            return SExecuteWithSignature<Java.Lang.Package>(LocalBridgeClazz, "getPackage", "(Ljava/lang/String;)Ljava/lang/Package;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getPackage(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getPackages()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Package"/></returns>
-        [System.Obsolete()]
-        public static Java.Lang.Package GetPackage(Java.Lang.String arg0)
+        public static Java.Lang.Package[] GetPackages()
         {
-            return SExecuteWithSignature<Java.Lang.Package>(LocalBridgeClazz, "getPackage", "(Ljava/lang/String;)Ljava/lang/Package;", arg0);
+            return SExecuteWithSignatureArray<Java.Lang.Package>(LocalBridgeClazz, "getPackages", "()[Ljava/lang/Package;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getAnnotations()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getAnnotation(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.Annotation.Annotation[] Annotations
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="A"/></returns>
+        public A GetAnnotation<A>(Java.Lang.Class arg0) where A : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
+            return IExecute<A>("getAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getDeclaredAnnotations()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getDeclaredAnnotation(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.Annotation.Annotation[] DeclaredAnnotations
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="A"/></returns>
+        public A GetDeclaredAnnotation<A>(Java.Lang.Class arg0) where A : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
+            return IExecute<A>("getDeclaredAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getImplementationTitle()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getAnnotationsByType(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.String ImplementationTitle
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="A"/></returns>
+        public A[] GetAnnotationsByType<A>(Java.Lang.Class arg0) where A : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getImplementationTitle", "()Ljava/lang/String;"); }
+            return IExecuteArray<A>("getAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getImplementationVendor()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.String ImplementationVendor
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="A"/></returns>
+        public A[] GetDeclaredAnnotationsByType<A>(Java.Lang.Class arg0) where A : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getImplementationVendor", "()Ljava/lang/String;"); }
+            return IExecuteArray<A>("getDeclaredAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getImplementationVersion()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#isAnnotationPresent(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.String ImplementationVersion
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAnnotationPresent(Java.Lang.Class arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getImplementationVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isAnnotationPresent", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#isCompatibleWith(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Lang.NumberFormatException"/>
+        public bool IsCompatibleWith(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isCompatibleWith", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getSpecificationTitle()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#isSealed()"/>
         /// </summary>
-        public Java.Lang.String SpecificationTitle
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSealed()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSpecificationTitle", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isSealed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getSpecificationVendor()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#isSealed(java.net.URL)"/>
         /// </summary>
-        public Java.Lang.String SpecificationVendor
+        /// <param name="arg0"><see cref="Java.Net.URL"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSealed(Java.Net.URL arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSpecificationVendor", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isSealed", "(Ljava/net/URL;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getSpecificationVersion()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getAnnotations()"/>
         /// </summary>
-        public Java.Lang.String SpecificationVersion
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetAnnotations()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSpecificationVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getDeclaredAnnotations()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="A"/></returns>
-        public A GetAnnotation<A>(Java.Lang.Class arg0) where A: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetDeclaredAnnotations()
         {
-            return IExecuteWithSignature<A>("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getDeclaredAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getImplementationTitle()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="A"/></returns>
-        public A GetDeclaredAnnotation<A>(Java.Lang.Class arg0) where A: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetImplementationTitle()
         {
-            return IExecuteWithSignature<A>("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getImplementationTitle", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getImplementationVendor()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="A"/></returns>
-        public A[] GetAnnotationsByType<A>(Java.Lang.Class arg0) where A: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetImplementationVendor()
         {
-            return IExecuteWithSignatureArray<A>("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getImplementationVendor", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getImplementationVersion()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="A"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="A"/></returns>
-        public A[] GetDeclaredAnnotationsByType<A>(Java.Lang.Class arg0) where A: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetImplementationVersion()
         {
-            return IExecuteWithSignatureArray<A>("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getImplementationVersion", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#isAnnotationPresent(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAnnotationPresent(Java.Lang.Class arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isAnnotationPresent", "(Ljava/lang/Class;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#isCompatibleWith(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getSpecificationTitle()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Java.Lang.NumberFormatException"/>
-        public bool IsCompatibleWith(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSpecificationTitle()
         {
-            return IExecuteWithSignature<bool>("isCompatibleWith", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSpecificationTitle", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#isSealed()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getSpecificationVendor()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSealed()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSpecificationVendor()
         {
-            return IExecuteWithSignature<bool>("isSealed", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSpecificationVendor", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Package.html#isSealed(java.net.URL)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Package.html#getSpecificationVersion()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.URL"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSealed(Java.Net.URL arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSpecificationVersion()
         {
-            return IExecuteWithSignature<bool>("isSealed", "(Ljava/net/URL;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSpecificationVersion", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Process.cs b/src/net/Netdroid/Generated/Java/Lang/Process.cs
index 1277fc7f0..e081ff828 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Process.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Process.cs
@@ -46,52 +46,55 @@ public partial class Process
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#getErrorStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#exitValue()"/>
         /// </summary>
-        public Java.Io.InputStream ErrorStream
+        /// <returns><see cref="int"/></returns>
+        public int ExitValue()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getErrorStream", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature<int>("exitValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#getInputStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#waitFor()"/>
         /// </summary>
-        public Java.Io.InputStream InputStream
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Lang.InterruptedException"/>
+        public int WaitFor()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature<int>("waitFor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#getOutputStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#getErrorStream()"/>
         /// </summary>
-        public Java.Io.OutputStream OutputStream
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetErrorStream()
         {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;"); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getErrorStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#exitValue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#getInputStream()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int ExitValue()
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetInputStream()
         {
-            return IExecuteWithSignature<int>("exitValue", "()I");
+            return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#waitFor()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#getOutputStream()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        /// <exception cref="Java.Lang.InterruptedException"/>
-        public int WaitFor()
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        public Java.Io.OutputStream GetOutputStream()
         {
-            return IExecuteWithSignature<int>("waitFor", "()I");
+            return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#destroy()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#destroy()"/>
         /// </summary>
         public void Destroy()
         {
             IExecuteWithSignature("destroy", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#isAlive()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#isAlive()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAlive()
@@ -99,7 +102,7 @@ public bool IsAlive()
             return IExecuteWithSignature<bool>("isAlive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#supportsNormalTermination()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#supportsNormalTermination()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool SupportsNormalTermination()
@@ -107,7 +110,7 @@ public bool SupportsNormalTermination()
             return IExecuteWithSignature<bool>("supportsNormalTermination", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#waitFor(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#waitFor(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -118,58 +121,7 @@ public bool WaitFor(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<bool>("waitFor", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#errorReader()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Io.BufferedReader"/></returns>
-        public Java.Io.BufferedReader ErrorReader()
-        {
-            return IExecuteWithSignature<Java.Io.BufferedReader>("errorReader", "()Ljava/io/BufferedReader;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#errorReader(java.nio.charset.Charset)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.Charset.Charset"/></param>
-        /// <returns><see cref="Java.Io.BufferedReader"/></returns>
-        public Java.Io.BufferedReader ErrorReader(Java.Nio.Charset.Charset arg0)
-        {
-            return IExecuteWithSignature<Java.Io.BufferedReader>("errorReader", "(Ljava/nio/charset/Charset;)Ljava/io/BufferedReader;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#inputReader()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Io.BufferedReader"/></returns>
-        public Java.Io.BufferedReader InputReader()
-        {
-            return IExecuteWithSignature<Java.Io.BufferedReader>("inputReader", "()Ljava/io/BufferedReader;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#inputReader(java.nio.charset.Charset)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.Charset.Charset"/></param>
-        /// <returns><see cref="Java.Io.BufferedReader"/></returns>
-        public Java.Io.BufferedReader InputReader(Java.Nio.Charset.Charset arg0)
-        {
-            return IExecuteWithSignature<Java.Io.BufferedReader>("inputReader", "(Ljava/nio/charset/Charset;)Ljava/io/BufferedReader;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#outputWriter()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Io.BufferedWriter"/></returns>
-        public Java.Io.BufferedWriter OutputWriter()
-        {
-            return IExecuteWithSignature<Java.Io.BufferedWriter>("outputWriter", "()Ljava/io/BufferedWriter;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#outputWriter(java.nio.charset.Charset)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.Charset.Charset"/></param>
-        /// <returns><see cref="Java.Io.BufferedWriter"/></returns>
-        public Java.Io.BufferedWriter OutputWriter(Java.Nio.Charset.Charset arg0)
-        {
-            return IExecuteWithSignature<Java.Io.BufferedWriter>("outputWriter", "(Ljava/nio/charset/Charset;)Ljava/io/BufferedWriter;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#destroyForcibly()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#destroyForcibly()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Process"/></returns>
         public Java.Lang.Process DestroyForcibly()
@@ -177,15 +129,7 @@ public Java.Lang.Process DestroyForcibly()
             return IExecuteWithSignature<Java.Lang.Process>("destroyForcibly", "()Ljava/lang/Process;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#info()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.ProcessHandle.Info"/></returns>
-        public Java.Lang.ProcessHandle.Info Info()
-        {
-            return IExecuteWithSignature<Java.Lang.ProcessHandle.Info>("info", "()Ljava/lang/ProcessHandle$Info;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#onExit()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#onExit()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
         public Java.Util.Concurrent.CompletableFuture<Java.Lang.Process> OnExit()
@@ -193,7 +137,7 @@ public Java.Lang.ProcessHandle.Info Info()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<Java.Lang.Process>>("onExit", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Process.html#pid()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Process.html#pid()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Pid()
diff --git a/src/net/Netdroid/Generated/Java/Lang/ProcessBuilder.cs b/src/net/Netdroid/Generated/Java/Lang/ProcessBuilder.cs
index dc72a9532..0cc24a6b6 100644
--- a/src/net/Netdroid/Generated/Java/Lang/ProcessBuilder.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/ProcessBuilder.cs
@@ -30,7 +30,7 @@ public partial class ProcessBuilder
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#%3Cinit%3E(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#%3Cinit%3E(java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public ProcessBuilder(params Java.Lang.String[] arg0)
@@ -38,7 +38,7 @@ public ProcessBuilder(params Java.Lang.String[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#%3Cinit%3E(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#%3Cinit%3E(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         public ProcessBuilder(Java.Util.List<Java.Lang.String> arg0)
@@ -58,7 +58,7 @@ public ProcessBuilder(Java.Util.List<Java.Lang.String> arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#startPipeline(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#startPipeline(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -72,7 +72,7 @@ public ProcessBuilder(Java.Util.List<Java.Lang.String> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectErrorStream()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectErrorStream()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool RedirectErrorStream()
@@ -80,7 +80,7 @@ public bool RedirectErrorStream()
             return IExecuteWithSignature<bool>("redirectErrorStream", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#directory()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#directory()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.File"/></returns>
         public Java.Io.File Directory()
@@ -88,7 +88,7 @@ public Java.Io.File Directory()
             return IExecuteWithSignature<Java.Io.File>("directory", "()Ljava/io/File;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#start()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#start()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Process"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -97,7 +97,7 @@ public Java.Lang.Process Start()
             return IExecuteWithSignature<Java.Lang.Process>("start", "()Ljava/lang/Process;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#command(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#command(java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -106,7 +106,7 @@ public Java.Lang.ProcessBuilder Command(params Java.Lang.String[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.ProcessBuilder>("command", "([Ljava/lang/String;)Ljava/lang/ProcessBuilder;"); else return IExecuteWithSignature<Java.Lang.ProcessBuilder>("command", "([Ljava/lang/String;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#command(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#command(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -115,7 +115,7 @@ public Java.Lang.ProcessBuilder Command(Java.Util.List<Java.Lang.String> arg0)
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("command", "(Ljava/util/List;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#directory(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#directory(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -124,7 +124,7 @@ public Java.Lang.ProcessBuilder Directory(Java.Io.File arg0)
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("directory", "(Ljava/io/File;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#inheritIO()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#inheritIO()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
         public Java.Lang.ProcessBuilder InheritIO()
@@ -132,7 +132,7 @@ public Java.Lang.ProcessBuilder InheritIO()
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("inheritIO", "()Ljava/lang/ProcessBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectError(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectError(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -141,7 +141,7 @@ public Java.Lang.ProcessBuilder RedirectError(Java.Io.File arg0)
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("redirectError", "(Ljava/io/File;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectError(java.lang.ProcessBuilder.Redirect)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectError(java.lang.ProcessBuilder.Redirect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ProcessBuilder.Redirect"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -150,7 +150,7 @@ public Java.Lang.ProcessBuilder RedirectError(Java.Lang.ProcessBuilder.Redirect
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("redirectError", "(Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectErrorStream(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectErrorStream(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -159,7 +159,7 @@ public Java.Lang.ProcessBuilder RedirectErrorStream(bool arg0)
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("redirectErrorStream", "(Z)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectInput(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectInput(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -168,7 +168,7 @@ public Java.Lang.ProcessBuilder RedirectInput(Java.Io.File arg0)
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("redirectInput", "(Ljava/io/File;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectInput(java.lang.ProcessBuilder.Redirect)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectInput(java.lang.ProcessBuilder.Redirect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ProcessBuilder.Redirect"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -177,7 +177,7 @@ public Java.Lang.ProcessBuilder RedirectInput(Java.Lang.ProcessBuilder.Redirect
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("redirectInput", "(Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectOutput(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectOutput(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -186,7 +186,7 @@ public Java.Lang.ProcessBuilder RedirectOutput(Java.Io.File arg0)
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("redirectOutput", "(Ljava/io/File;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectOutput(java.lang.ProcessBuilder.Redirect)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectOutput(java.lang.ProcessBuilder.Redirect)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ProcessBuilder.Redirect"/></param>
         /// <returns><see cref="Java.Lang.ProcessBuilder"/></returns>
@@ -195,7 +195,7 @@ public Java.Lang.ProcessBuilder RedirectOutput(Java.Lang.ProcessBuilder.Redirect
             return IExecuteWithSignature<Java.Lang.ProcessBuilder>("redirectOutput", "(Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectError()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectError()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.ProcessBuilder.Redirect"/></returns>
         public Java.Lang.ProcessBuilder.Redirect RedirectError()
@@ -203,7 +203,7 @@ public Java.Lang.ProcessBuilder.Redirect RedirectError()
             return IExecuteWithSignature<Java.Lang.ProcessBuilder.Redirect>("redirectError", "()Ljava/lang/ProcessBuilder$Redirect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectInput()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectInput()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.ProcessBuilder.Redirect"/></returns>
         public Java.Lang.ProcessBuilder.Redirect RedirectInput()
@@ -211,7 +211,7 @@ public Java.Lang.ProcessBuilder.Redirect RedirectInput()
             return IExecuteWithSignature<Java.Lang.ProcessBuilder.Redirect>("redirectInput", "()Ljava/lang/ProcessBuilder$Redirect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#redirectOutput()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#redirectOutput()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.ProcessBuilder.Redirect"/></returns>
         public Java.Lang.ProcessBuilder.Redirect RedirectOutput()
@@ -219,7 +219,7 @@ public Java.Lang.ProcessBuilder.Redirect RedirectOutput()
             return IExecuteWithSignature<Java.Lang.ProcessBuilder.Redirect>("redirectOutput", "()Ljava/lang/ProcessBuilder$Redirect;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#command()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#command()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         public Java.Util.List<Java.Lang.String> Command()
@@ -227,7 +227,7 @@ public Java.Lang.ProcessBuilder.Redirect RedirectOutput()
             return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("command", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.html#environment()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.html#environment()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map"/></returns>
         public Java.Util.Map<Java.Lang.String, Java.Lang.String> Environment()
@@ -251,19 +251,19 @@ public partial class Redirect
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.html#DISCARD"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.html#DISCARD"/>
             /// </summary>
             public static Java.Lang.ProcessBuilder.Redirect DISCARD { get { if (!_DISCARDReady) { _DISCARDContent = SGetField<Java.Lang.ProcessBuilder.Redirect>(LocalBridgeClazz, "DISCARD"); _DISCARDReady = true; } return _DISCARDContent; } }
             private static Java.Lang.ProcessBuilder.Redirect _DISCARDContent = default;
             private static bool _DISCARDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.html#INHERIT"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.html#INHERIT"/>
             /// </summary>
             public static Java.Lang.ProcessBuilder.Redirect INHERIT { get { if (!_INHERITReady) { _INHERITContent = SGetField<Java.Lang.ProcessBuilder.Redirect>(LocalBridgeClazz, "INHERIT"); _INHERITReady = true; } return _INHERITContent; } }
             private static Java.Lang.ProcessBuilder.Redirect _INHERITContent = default;
             private static bool _INHERITReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.html#PIPE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.html#PIPE"/>
             /// </summary>
             public static Java.Lang.ProcessBuilder.Redirect PIPE { get { if (!_PIPEReady) { _PIPEContent = SGetField<Java.Lang.ProcessBuilder.Redirect>(LocalBridgeClazz, "PIPE"); _PIPEReady = true; } return _PIPEContent; } }
             private static Java.Lang.ProcessBuilder.Redirect _PIPEContent = default;
@@ -273,7 +273,7 @@ public partial class Redirect
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.html#appendTo(java.io.File)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.html#appendTo(java.io.File)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Io.File"/></param>
             /// <returns><see cref="Java.Lang.ProcessBuilder.Redirect"/></returns>
@@ -282,7 +282,7 @@ public static Java.Lang.ProcessBuilder.Redirect AppendTo(Java.Io.File arg0)
                 return SExecuteWithSignature<Java.Lang.ProcessBuilder.Redirect>(LocalBridgeClazz, "appendTo", "(Ljava/io/File;)Ljava/lang/ProcessBuilder$Redirect;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.html#from(java.io.File)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.html#from(java.io.File)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Io.File"/></param>
             /// <returns><see cref="Java.Lang.ProcessBuilder.Redirect"/></returns>
@@ -291,7 +291,7 @@ public static Java.Lang.ProcessBuilder.Redirect From(Java.Io.File arg0)
                 return SExecuteWithSignature<Java.Lang.ProcessBuilder.Redirect>(LocalBridgeClazz, "from", "(Ljava/io/File;)Ljava/lang/ProcessBuilder$Redirect;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.html#to(java.io.File)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.html#to(java.io.File)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Io.File"/></param>
             /// <returns><see cref="Java.Lang.ProcessBuilder.Redirect"/></returns>
@@ -304,7 +304,7 @@ public static Java.Lang.ProcessBuilder.Redirect To(Java.Io.File arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ProcessBuilder.Redirect.html#file()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ProcessBuilder.Redirect.html#file()"/>
             /// </summary>
             /// <returns><see cref="Java.Io.File"/></returns>
             public Java.Io.File File()
diff --git a/src/net/Netdroid/Generated/Java/Lang/Readable.cs b/src/net/Netdroid/Generated/Java/Lang/Readable.cs
index f513e28ea..edb92c73a 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Readable.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Readable.cs
@@ -64,7 +64,7 @@ public partial class Readable : Java.Lang.IReadable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Readable.html#read(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Readable.html#read(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Ref/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Lang/Ref/AllPackageClasses.cs
index 48956b399..63adafdd9 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Ref/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Ref/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Lang.Ref
 {
     #region Cleaner
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Cleaner.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/Cleaner.html"/>
     /// </summary>
     public partial class Cleaner : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cleaner>
     {
@@ -68,7 +68,7 @@ public Cleaner(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Cleanable
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Cleaner.Cleanable.html"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Cleaner.Cleanable.html"/>
         /// </summary>
         public partial class Cleanable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cleanable>
         {
@@ -76,12 +76,12 @@ public partial class Cleanable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cleanab
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Cleanable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Cleanable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Cleanable() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Cleanable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Cleanable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Cleanable(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -118,7 +118,7 @@ public Cleanable(params object[] args) : base(args) { }
 
     #region PhantomReference
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/PhantomReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/PhantomReference.html"/>
     /// </summary>
     public partial class PhantomReference : Java.Lang.Ref.Reference
     {
@@ -162,7 +162,7 @@ public PhantomReference(params object[] args) : base(args) { }
 
     #region PhantomReference<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/PhantomReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/PhantomReference.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class PhantomReference<T> : Java.Lang.Ref.Reference<T>
@@ -207,7 +207,7 @@ public PhantomReference(params object[] args) : base(args) { }
 
     #region Reference
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html"/>
     /// </summary>
     public partial class Reference : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Reference>
     {
@@ -215,12 +215,12 @@ public partial class Reference : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Referen
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Reference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Reference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Reference() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Reference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Reference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Reference(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -253,7 +253,7 @@ public Reference(params object[] args) : base(args) { }
 
     #region Reference<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Reference<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Reference<T>>
@@ -262,12 +262,12 @@ public partial class Reference<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Refe
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Reference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Reference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Reference() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Reference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Reference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Reference(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -300,7 +300,7 @@ public Reference(params object[] args) : base(args) { }
 
     #region ReferenceQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/ReferenceQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue.html"/>
     /// </summary>
     public partial class ReferenceQueue : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReferenceQueue>
     {
@@ -344,7 +344,7 @@ public ReferenceQueue(params object[] args) : base(args) { }
 
     #region ReferenceQueue<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/ReferenceQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ReferenceQueue<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReferenceQueue<T>>
@@ -389,7 +389,7 @@ public ReferenceQueue(params object[] args) : base(args) { }
 
     #region SoftReference
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/SoftReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/SoftReference.html"/>
     /// </summary>
     public partial class SoftReference : Java.Lang.Ref.Reference
     {
@@ -433,7 +433,7 @@ public SoftReference(params object[] args) : base(args) { }
 
     #region SoftReference<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/SoftReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/SoftReference.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class SoftReference<T> : Java.Lang.Ref.Reference<T>
@@ -478,7 +478,7 @@ public SoftReference(params object[] args) : base(args) { }
 
     #region WeakReference
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/WeakReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/WeakReference.html"/>
     /// </summary>
     public partial class WeakReference : Java.Lang.Ref.Reference
     {
@@ -522,7 +522,7 @@ public WeakReference(params object[] args) : base(args) { }
 
     #region WeakReference<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/WeakReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/ref/WeakReference.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class WeakReference<T> : Java.Lang.Ref.Reference<T>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Ref/Cleaner.cs b/src/net/Netdroid/Generated/Java/Lang/Ref/Cleaner.cs
index 24b47e25d..86a519820 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Ref/Cleaner.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Ref/Cleaner.cs
@@ -42,7 +42,7 @@ public partial class Cleaner
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Cleaner.html#create()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Cleaner.html#create()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Ref.Cleaner"/></returns>
         public static Java.Lang.Ref.Cleaner Create()
@@ -50,7 +50,7 @@ public static Java.Lang.Ref.Cleaner Create()
             return SExecuteWithSignature<Java.Lang.Ref.Cleaner>(LocalBridgeClazz, "create", "()Ljava/lang/ref/Cleaner;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Cleaner.html#create(java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Cleaner.html#create(java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
         /// <returns><see cref="Java.Lang.Ref.Cleaner"/></returns>
@@ -63,7 +63,7 @@ public static Java.Lang.Ref.Cleaner Create(Java.Util.Concurrent.ThreadFactory ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Cleaner.html#register(java.lang.Object,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Cleaner.html#register(java.lang.Object,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -97,7 +97,7 @@ public partial class Cleanable
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Cleaner.Cleanable.html#clean()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/ref/Cleaner.Cleanable.html#clean()"/>
             /// </summary>
             public void Clean()
             {
diff --git a/src/net/Netdroid/Generated/Java/Lang/Ref/PhantomReference.cs b/src/net/Netdroid/Generated/Java/Lang/Ref/PhantomReference.cs
index ac1062977..246d5eb35 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Ref/PhantomReference.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Ref/PhantomReference.cs
@@ -30,7 +30,7 @@ public partial class PhantomReference
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/PhantomReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/PhantomReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Ref.ReferenceQueue"/></param>
@@ -70,7 +70,7 @@ public partial class PhantomReference<T>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/PhantomReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/PhantomReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Ref.ReferenceQueue"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Ref/Reference.cs b/src/net/Netdroid/Generated/Java/Lang/Ref/Reference.cs
index 7dcbf5d6c..26c73588c 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Ref/Reference.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Ref/Reference.cs
@@ -42,7 +42,7 @@ public partial class Reference
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#reachabilityFence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#reachabilityFence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public static void ReachabilityFence(object arg0)
@@ -54,7 +54,7 @@ public static void ReachabilityFence(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#enqueue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#enqueue()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Enqueue()
@@ -62,25 +62,15 @@ public bool Enqueue()
             return IExecuteWithSignature<bool>("enqueue", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#isEnqueued()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#isEnqueued()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
         public bool IsEnqueued()
         {
             return IExecuteWithSignature<bool>("isEnqueued", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#refersTo(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RefersTo(object arg0)
-        {
-            return IExecuteWithSignature<bool>("refersTo", "(Ljava/lang/Object;)Z", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Get()
@@ -88,7 +78,7 @@ public object Get()
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#clear()"/>
         /// </summary>
         public void Clear()
         {
@@ -126,7 +116,7 @@ public partial class Reference<T>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#reachabilityFence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#reachabilityFence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public static void ReachabilityFence(object arg0)
@@ -138,7 +128,7 @@ public static void ReachabilityFence(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#enqueue()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#enqueue()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Enqueue()
@@ -146,25 +136,15 @@ public bool Enqueue()
             return IExecuteWithSignature<bool>("enqueue", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#isEnqueued()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#isEnqueued()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
         public bool IsEnqueued()
         {
             return IExecuteWithSignature<bool>("isEnqueued", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#refersTo(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool RefersTo(T arg0)
-        {
-            return IExecuteWithSignature<bool>("refersTo", "(Ljava/lang/Object;)Z", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public T Get()
@@ -172,7 +152,7 @@ public T Get()
             return IExecuteWithSignature<T>("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/Reference.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/Reference.html#clear()"/>
         /// </summary>
         public void Clear()
         {
diff --git a/src/net/Netdroid/Generated/Java/Lang/Ref/ReferenceQueue.cs b/src/net/Netdroid/Generated/Java/Lang/Ref/ReferenceQueue.cs
index cb96a10bd..304622597 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Ref/ReferenceQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Ref/ReferenceQueue.cs
@@ -46,7 +46,7 @@ public partial class ReferenceQueue
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/ReferenceQueue.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue.html#poll()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Ref.Reference"/></returns>
         public Java.Lang.Ref.Reference Poll()
@@ -54,7 +54,7 @@ public Java.Lang.Ref.Reference Poll()
             return IExecuteWithSignature<Java.Lang.Ref.Reference>("poll", "()Ljava/lang/ref/Reference;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/ReferenceQueue.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue.html#remove()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Ref.Reference"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -63,7 +63,7 @@ public Java.Lang.Ref.Reference Remove()
             return IExecuteWithSignature<Java.Lang.Ref.Reference>("remove", "()Ljava/lang/ref/Reference;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/ReferenceQueue.html#remove(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue.html#remove(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.Ref.Reference"/></returns>
@@ -109,33 +109,33 @@ public partial class ReferenceQueue<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/ReferenceQueue.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue.html#poll()"/>
         /// </summary>
         /// <typeparam name="ReturnExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Lang.Ref.Reference"/></returns>
-        public Java.Lang.Ref.Reference<ReturnExtendsT> Poll<ReturnExtendsT>() where ReturnExtendsT: T
+        public Java.Lang.Ref.Reference<ReturnExtendsT> Poll<ReturnExtendsT>() where ReturnExtendsT : T
         {
             return IExecuteWithSignature<Java.Lang.Ref.Reference<ReturnExtendsT>>("poll", "()Ljava/lang/ref/Reference;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/ReferenceQueue.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue.html#remove()"/>
         /// </summary>
         /// <typeparam name="ReturnExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Lang.Ref.Reference"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
-        public Java.Lang.Ref.Reference<ReturnExtendsT> Remove<ReturnExtendsT>() where ReturnExtendsT: T
+        public Java.Lang.Ref.Reference<ReturnExtendsT> Remove<ReturnExtendsT>() where ReturnExtendsT : T
         {
             return IExecuteWithSignature<Java.Lang.Ref.Reference<ReturnExtendsT>>("remove", "()Ljava/lang/ref/Reference;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/ReferenceQueue.html#remove(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/ReferenceQueue.html#remove(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <typeparam name="ReturnExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Lang.Ref.Reference"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
         /// <exception cref="Java.Lang.InterruptedException"/>
-        public Java.Lang.Ref.Reference<ReturnExtendsT> Remove<ReturnExtendsT>(long arg0) where ReturnExtendsT: T
+        public Java.Lang.Ref.Reference<ReturnExtendsT> Remove<ReturnExtendsT>(long arg0) where ReturnExtendsT : T
         {
             return IExecuteWithSignature<Java.Lang.Ref.Reference<ReturnExtendsT>>("remove", "(J)Ljava/lang/ref/Reference;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Lang/Ref/SoftReference.cs b/src/net/Netdroid/Generated/Java/Lang/Ref/SoftReference.cs
index 29a058d5f..6324a2762 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Ref/SoftReference.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Ref/SoftReference.cs
@@ -30,7 +30,7 @@ public partial class SoftReference
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/SoftReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/SoftReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Ref.ReferenceQueue"/></param>
@@ -39,7 +39,7 @@ public SoftReference(object arg0, Java.Lang.Ref.ReferenceQueue arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/SoftReference.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/SoftReference.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public SoftReference(object arg0)
@@ -78,7 +78,7 @@ public partial class SoftReference<T>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/SoftReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/SoftReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Ref.ReferenceQueue"/></param>
@@ -87,7 +87,7 @@ public SoftReference(T arg0, Java.Lang.Ref.ReferenceQueue<T> arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/SoftReference.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/SoftReference.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         public SoftReference(T arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Ref/WeakReference.cs b/src/net/Netdroid/Generated/Java/Lang/Ref/WeakReference.cs
index a8564bab7..9acd1730c 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Ref/WeakReference.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Ref/WeakReference.cs
@@ -30,7 +30,7 @@ public partial class WeakReference
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/WeakReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/WeakReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Ref.ReferenceQueue"/></param>
@@ -39,7 +39,7 @@ public WeakReference(object arg0, Java.Lang.Ref.ReferenceQueue arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/WeakReference.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/WeakReference.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public WeakReference(object arg0)
@@ -78,7 +78,7 @@ public partial class WeakReference<T>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/WeakReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/WeakReference.html#%3Cinit%3E(java.lang.Object,java.lang.ref.ReferenceQueue)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Ref.ReferenceQueue"/></param>
@@ -87,7 +87,7 @@ public WeakReference(T arg0, Java.Lang.Ref.ReferenceQueue<T> arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ref/WeakReference.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ref/WeakReference.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         public WeakReference(T arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/AccessibleObject.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/AccessibleObject.cs
index 1b23970f5..8ea93114b 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/AccessibleObject.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/AccessibleObject.cs
@@ -42,7 +42,7 @@ public partial class AccessibleObject
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#setAccessible(java.lang.reflect.AccessibleObject[],boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#setAccessible(java.lang.reflect.AccessibleObject[],boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Reflect.AccessibleObject"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -55,70 +55,56 @@ public static void SetAccessible(Java.Lang.Reflect.AccessibleObject[] arg0, bool
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#getAnnotations()"/> 
-        /// </summary>
-        public Java.Lang.Annotation.Annotation[] Annotations
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#getDeclaredAnnotations()"/> 
-        /// </summary>
-        public Java.Lang.Annotation.Annotation[] DeclaredAnnotations
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#getAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#getAnnotation(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T GetAnnotation<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        public T GetAnnotation<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignature<T>("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecute<T>("getAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#getDeclaredAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#getDeclaredAnnotation(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T GetDeclaredAnnotation<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        public T GetDeclaredAnnotation<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignature<T>("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecute<T>("getDeclaredAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#getAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#getAnnotationsByType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T[] GetAnnotationsByType<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        public T[] GetAnnotationsByType<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignatureArray<T>("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteArray<T>("getAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T[] GetDeclaredAnnotationsByType<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        public T[] GetDeclaredAnnotationsByType<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignatureArray<T>("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteArray<T>("getDeclaredAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#isAccessible()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#isAccessible()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsAccessible()
         {
             return IExecuteWithSignature<bool>("isAccessible", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#isAnnotationPresent(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#isAnnotationPresent(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -127,7 +113,7 @@ public bool IsAnnotationPresent(Java.Lang.Class arg0)
             return IExecuteWithSignature<bool>("isAnnotationPresent", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#canAccess(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#canAccess(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -136,7 +122,7 @@ public bool CanAccess(object arg0)
             return IExecuteWithSignature<bool>("canAccess", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#trySetAccessible()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#trySetAccessible()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool TrySetAccessible()
@@ -144,7 +130,23 @@ public bool TrySetAccessible()
             return IExecuteWithSignature<bool>("trySetAccessible", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html#setAccessible(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#getAnnotations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetAnnotations()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#getDeclaredAnnotations()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetDeclaredAnnotations()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html#setAccessible(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetAccessible(bool arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/AllPackageClasses.cs
index 1858c7767..6e026640b 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Lang.Reflect
 {
     #region AccessibleObject
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AccessibleObject.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/AccessibleObject.html"/>
     /// </summary>
     public partial class AccessibleObject : Java.Lang.Reflect.AnnotatedElement
     {
@@ -72,7 +72,7 @@ public AccessibleObject(params object[] args) : base(args) { }
 
     #region AnnotatedElement
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AnnotatedElement.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html"/>
     /// </summary>
     public partial class AnnotatedElement : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AnnotatedElement>
     {
@@ -80,12 +80,12 @@ public partial class AnnotatedElement : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AnnotatedElement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AnnotatedElement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AnnotatedElement() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AnnotatedElement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AnnotatedElement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AnnotatedElement(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -118,7 +118,7 @@ public AnnotatedElement(params object[] args) : base(args) { }
 
     #region Array
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html"/>
     /// </summary>
     public partial class Array : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Array>
     {
@@ -162,7 +162,7 @@ public Array(params object[] args) : base(args) { }
 
     #region Constructor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Constructor.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Constructor.html"/>
     /// </summary>
     public partial class Constructor : Java.Lang.Reflect.Executable
     {
@@ -206,7 +206,7 @@ public Constructor(params object[] args) : base(args) { }
 
     #region Constructor<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Constructor.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Constructor.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Constructor<T> : Java.Lang.Reflect.Executable
@@ -251,7 +251,7 @@ public Constructor(params object[] args) : base(args) { }
 
     #region Executable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html"/>
     /// </summary>
     public partial class Executable : Java.Lang.Reflect.AccessibleObject
     {
@@ -259,12 +259,12 @@ public partial class Executable : Java.Lang.Reflect.AccessibleObject
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Executable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Executable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Executable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Executable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Executable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Executable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -297,7 +297,7 @@ public Executable(params object[] args) : base(args) { }
 
     #region Field
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html"/>
     /// </summary>
     public partial class Field : Java.Lang.Reflect.AccessibleObject
     {
@@ -341,7 +341,7 @@ public Field(params object[] args) : base(args) { }
 
     #region GenericArrayType
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/GenericArrayType.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/GenericArrayType.html"/>
     /// </summary>
     public partial class GenericArrayType : Java.Lang.Reflect.Type
     {
@@ -349,12 +349,12 @@ public partial class GenericArrayType : Java.Lang.Reflect.Type
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GenericArrayType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GenericArrayType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GenericArrayType() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GenericArrayType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GenericArrayType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GenericArrayType(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -387,7 +387,7 @@ public GenericArrayType(params object[] args) : base(args) { }
 
     #region GenericDeclaration
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/GenericDeclaration.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/GenericDeclaration.html"/>
     /// </summary>
     public partial class GenericDeclaration : Java.Lang.Reflect.AnnotatedElement
     {
@@ -395,12 +395,12 @@ public partial class GenericDeclaration : Java.Lang.Reflect.AnnotatedElement
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GenericDeclaration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GenericDeclaration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GenericDeclaration() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GenericDeclaration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GenericDeclaration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GenericDeclaration(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -433,7 +433,7 @@ public GenericDeclaration(params object[] args) : base(args) { }
 
     #region GenericSignatureFormatError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/GenericSignatureFormatError.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/GenericSignatureFormatError.html"/>
     /// </summary>
     public partial class GenericSignatureFormatError : Java.Lang.ClassFormatError
     {
@@ -450,7 +450,7 @@ public partial class GenericSignatureFormatError : Java.Lang.ClassFormatError
 
     #region InvocationHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/InvocationHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/InvocationHandler.html"/>
     /// </summary>
     public partial class InvocationHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<InvocationHandler>
     {
@@ -458,12 +458,12 @@ public partial class InvocationHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InvocationHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InvocationHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InvocationHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InvocationHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InvocationHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InvocationHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -496,7 +496,7 @@ public InvocationHandler(params object[] args) : base(args) { }
 
     #region InvocationTargetException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/InvocationTargetException.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/InvocationTargetException.html"/>
     /// </summary>
     public partial class InvocationTargetException : Java.Lang.ReflectiveOperationException
     {
@@ -513,7 +513,7 @@ public partial class InvocationTargetException : Java.Lang.ReflectiveOperationEx
 
     #region MalformedParameterizedTypeException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/MalformedParameterizedTypeException.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/MalformedParameterizedTypeException.html"/>
     /// </summary>
     public partial class MalformedParameterizedTypeException : Java.Lang.RuntimeException
     {
@@ -530,7 +530,7 @@ public partial class MalformedParameterizedTypeException : Java.Lang.RuntimeExce
 
     #region MalformedParametersException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/MalformedParametersException.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/MalformedParametersException.html"/>
     /// </summary>
     public partial class MalformedParametersException : Java.Lang.RuntimeException
     {
@@ -547,7 +547,7 @@ public partial class MalformedParametersException : Java.Lang.RuntimeException
 
     #region Member
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Member.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Member.html"/>
     /// </summary>
     public partial class Member : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Member>
     {
@@ -555,12 +555,12 @@ public partial class Member : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Member>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Member class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Member class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Member() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Member class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Member class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Member(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -593,7 +593,7 @@ public Member(params object[] args) : base(args) { }
 
     #region Method
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Method.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Method.html"/>
     /// </summary>
     public partial class Method : Java.Lang.Reflect.Executable
     {
@@ -637,7 +637,7 @@ public Method(params object[] args) : base(args) { }
 
     #region Modifier
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html"/>
     /// </summary>
     public partial class Modifier : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Modifier>
     {
@@ -681,7 +681,7 @@ public Modifier(params object[] args) : base(args) { }
 
     #region Parameter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html"/>
     /// </summary>
     public partial class Parameter : Java.Lang.Reflect.AnnotatedElement
     {
@@ -725,7 +725,7 @@ public Parameter(params object[] args) : base(args) { }
 
     #region ParameterizedType
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/ParameterizedType.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/ParameterizedType.html"/>
     /// </summary>
     public partial class ParameterizedType : Java.Lang.Reflect.Type
     {
@@ -733,12 +733,12 @@ public partial class ParameterizedType : Java.Lang.Reflect.Type
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ParameterizedType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ParameterizedType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ParameterizedType() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ParameterizedType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ParameterizedType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ParameterizedType(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -771,7 +771,7 @@ public ParameterizedType(params object[] args) : base(args) { }
 
     #region Proxy
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Proxy.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Proxy.html"/>
     /// </summary>
     public partial class Proxy : Java.Io.Serializable
     {
@@ -813,53 +813,9 @@ public Proxy(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region RecordComponent
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html"/>
-    /// </summary>
-    public partial class RecordComponent : Java.Lang.Reflect.AnnotatedElement
-    {
-        const string _bridgeClassName = "java.lang.reflect.RecordComponent";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        public RecordComponent() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        public RecordComponent(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
     #region ReflectPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/ReflectPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/ReflectPermission.html"/>
     /// </summary>
     public partial class ReflectPermission : Java.Security.BasicPermission
     {
@@ -903,7 +859,7 @@ public ReflectPermission(params object[] args) : base(args) { }
 
     #region Type
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Type.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/Type.html"/>
     /// </summary>
     public partial class Type : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Type>
     {
@@ -911,12 +867,12 @@ public partial class Type : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Type>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Type class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Type class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Type() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Type class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Type class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Type(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -949,7 +905,7 @@ public Type(params object[] args) : base(args) { }
 
     #region TypeVariable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/TypeVariable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/TypeVariable.html"/>
     /// </summary>
     public partial class TypeVariable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TypeVariable>
     {
@@ -957,12 +913,12 @@ public partial class TypeVariable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Type
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TypeVariable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeVariable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeVariable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TypeVariable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeVariable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeVariable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -995,21 +951,21 @@ public TypeVariable(params object[] args) : base(args) { }
 
     #region TypeVariable<D>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/TypeVariable.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/TypeVariable.html"/>
     /// </summary>
     /// <typeparam name="D"><see cref="Java.Lang.Reflect.IGenericDeclaration"/></typeparam>
-    public partial class TypeVariable<D> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TypeVariable<D>> where D: Java.Lang.Reflect.IGenericDeclaration, new()
+    public partial class TypeVariable<D> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TypeVariable<D>> where D : Java.Lang.Reflect.IGenericDeclaration, new()
     {
         const string _bridgeClassName = "java.lang.reflect.TypeVariable";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TypeVariable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeVariable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeVariable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TypeVariable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeVariable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeVariable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1042,7 +998,7 @@ public TypeVariable(params object[] args) : base(args) { }
 
     #region UndeclaredThrowableException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/UndeclaredThrowableException.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/UndeclaredThrowableException.html"/>
     /// </summary>
     public partial class UndeclaredThrowableException : Java.Lang.RuntimeException
     {
@@ -1059,7 +1015,7 @@ public partial class UndeclaredThrowableException : Java.Lang.RuntimeException
 
     #region WildcardType
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/WildcardType.html"/>
+    /// <see href="https://developer.android.com/reference/java/lang/reflect/WildcardType.html"/>
     /// </summary>
     public partial class WildcardType : Java.Lang.Reflect.Type
     {
@@ -1067,12 +1023,12 @@ public partial class WildcardType : Java.Lang.Reflect.Type
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WildcardType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WildcardType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WildcardType() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WildcardType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WildcardType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WildcardType(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/AnnotatedElement.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/AnnotatedElement.cs
index 442498c70..7eb1b17e8 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/AnnotatedElement.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/AnnotatedElement.cs
@@ -64,61 +64,63 @@ public partial class AnnotatedElement : Java.Lang.Reflect.IAnnotatedElement
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AnnotatedElement.html#getAnnotations()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html#getAnnotation(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.Annotation.Annotation[] Annotations
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T GetAnnotation<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
+            return IExecute<T>("getAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AnnotatedElement.html#getDeclaredAnnotations()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html#getAnnotations()"/>
         /// </summary>
-        public Java.Lang.Annotation.Annotation[] DeclaredAnnotations
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetAnnotations()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AnnotatedElement.html#getAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html#getDeclaredAnnotations()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T GetAnnotation<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetDeclaredAnnotations()
         {
-            return IExecuteWithSignature<T>("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AnnotatedElement.html#getDeclaredAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html#getDeclaredAnnotation(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T GetDeclaredAnnotation<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        public T GetDeclaredAnnotation<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignature<T>("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecute<T>("getDeclaredAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AnnotatedElement.html#getAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html#getAnnotationsByType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T[] GetAnnotationsByType<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        public T[] GetAnnotationsByType<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignatureArray<T>("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteArray<T>("getAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AnnotatedElement.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T[] GetDeclaredAnnotationsByType<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        public T[] GetDeclaredAnnotationsByType<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            return IExecuteWithSignatureArray<T>("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteArray<T>("getDeclaredAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/AnnotatedElement.html#isAnnotationPresent(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/AnnotatedElement.html#isAnnotationPresent(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Array.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Array.cs
index a9efa2e9d..3d2efccf1 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Array.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Array.cs
@@ -42,7 +42,7 @@ public partial class Array
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#newInstance(java.lang.Class,int[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#newInstance(java.lang.Class,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -54,7 +54,7 @@ public static object NewInstance(Java.Lang.Class arg0, params int[] arg1)
             if (arg1.Length == 0) return SExecute(LocalBridgeClazz, "newInstance", arg0); else return SExecute(LocalBridgeClazz, "newInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#newInstance(java.lang.Class,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#newInstance(java.lang.Class,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -65,7 +65,7 @@ public static object NewInstance(Java.Lang.Class arg0, int arg1)
             return SExecute(LocalBridgeClazz, "newInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getBoolean(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getBoolean(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -77,7 +77,7 @@ public static bool GetBoolean(object arg0, int arg1)
             return SExecute<bool>(LocalBridgeClazz, "getBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getByte(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getByte(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -89,7 +89,7 @@ public static byte GetByte(object arg0, int arg1)
             return SExecute<byte>(LocalBridgeClazz, "getByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getChar(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getChar(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -101,7 +101,7 @@ public static char GetChar(object arg0, int arg1)
             return SExecute<char>(LocalBridgeClazz, "getChar", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getDouble(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getDouble(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -113,7 +113,7 @@ public static double GetDouble(object arg0, int arg1)
             return SExecute<double>(LocalBridgeClazz, "getDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getFloat(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getFloat(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -125,7 +125,7 @@ public static float GetFloat(object arg0, int arg1)
             return SExecute<float>(LocalBridgeClazz, "getFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getInt(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getInt(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -137,7 +137,7 @@ public static int GetInt(object arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "getInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getLength(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getLength(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -147,7 +147,7 @@ public static int GetLength(object arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getLength", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#get(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#get(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -159,7 +159,7 @@ public static object Get(object arg0, int arg1)
             return SExecute(LocalBridgeClazz, "get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getLong(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getLong(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -171,7 +171,7 @@ public static long GetLong(object arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "getLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#getShort(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#getShort(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -183,7 +183,7 @@ public static short GetShort(object arg0, int arg1)
             return SExecute<short>(LocalBridgeClazz, "getShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#set(java.lang.Object,int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#set(java.lang.Object,int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -195,7 +195,7 @@ public static void Set(object arg0, int arg1, object arg2)
             SExecute(LocalBridgeClazz, "set", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#setBoolean(java.lang.Object,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#setBoolean(java.lang.Object,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -207,7 +207,7 @@ public static void SetBoolean(object arg0, int arg1, bool arg2)
             SExecute(LocalBridgeClazz, "setBoolean", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#setByte(java.lang.Object,int,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#setByte(java.lang.Object,int,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -219,7 +219,7 @@ public static void SetByte(object arg0, int arg1, byte arg2)
             SExecute(LocalBridgeClazz, "setByte", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#setChar(java.lang.Object,int,char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#setChar(java.lang.Object,int,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -231,7 +231,7 @@ public static void SetChar(object arg0, int arg1, char arg2)
             SExecute(LocalBridgeClazz, "setChar", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#setDouble(java.lang.Object,int,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#setDouble(java.lang.Object,int,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -243,7 +243,7 @@ public static void SetDouble(object arg0, int arg1, double arg2)
             SExecute(LocalBridgeClazz, "setDouble", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#setFloat(java.lang.Object,int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#setFloat(java.lang.Object,int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -255,7 +255,7 @@ public static void SetFloat(object arg0, int arg1, float arg2)
             SExecute(LocalBridgeClazz, "setFloat", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#setInt(java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#setInt(java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -267,7 +267,7 @@ public static void SetInt(object arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "setInt", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#setLong(java.lang.Object,int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#setLong(java.lang.Object,int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -279,7 +279,7 @@ public static void SetLong(object arg0, int arg1, long arg2)
             SExecute(LocalBridgeClazz, "setLong", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Array.html#setShort(java.lang.Object,int,short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Array.html#setShort(java.lang.Object,int,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Constructor.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Constructor.cs
index 7ec270b23..41bebd8bf 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Constructor.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Constructor.cs
@@ -46,7 +46,7 @@ public partial class Constructor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Constructor.html#newInstance(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Constructor.html#newInstance(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -94,7 +94,7 @@ public partial class Constructor<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Constructor.html#newInstance(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Constructor.html#newInstance(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><typeparamref name="T"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Executable.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Executable.cs
index aefb38737..fc0bf355e 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Executable.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Executable.cs
@@ -54,105 +54,116 @@ public partial class Executable : Java.Lang.Reflect.IMember, Java.Lang.Reflect.I
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getDeclaringClass()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getModifiers()"/>
         /// </summary>
-        public Java.Lang.Class DeclaringClass
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<int>("getModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getExceptionTypes()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getParameterAnnotations()"/>
         /// </summary>
-        public Java.Lang.Class[] ExceptionTypes
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetParameterAnnotations()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getExceptionTypes", "()[Ljava/lang/Class;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getParameterAnnotations", "()[[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getGenericExceptionTypes()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getDeclaringClass()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type[] GenericExceptionTypes
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetDeclaringClass()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getGenericExceptionTypes", "()[Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getGenericParameterTypes()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getExceptionTypes()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type[] GenericParameterTypes
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] GetExceptionTypes()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getGenericParameterTypes", "()[Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getExceptionTypes", "()[Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getModifiers()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getParameterTypes()"/>
         /// </summary>
-        public int Modifiers
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class[] GetParameterTypes()
         {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
+            return IExecuteWithSignatureArray<Java.Lang.Class>("getParameterTypes", "()[Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getTypeParameters()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.Reflect.TypeVariable"/></returns>
+        public Java.Lang.Reflect.TypeVariable[] GetTypeParameters()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.TypeVariable>("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getParameterAnnotations()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getName()"/>
         /// </summary>
-        public Java.Lang.Annotation.Annotation[] ParameterAnnotations
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getParameterAnnotations", "()[[Ljava/lang/annotation/Annotation;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getParameterCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#toGenericString()"/>
         /// </summary>
-        public int ParameterCount
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String ToGenericString()
         {
-            get { return IExecuteWithSignature<int>("getParameterCount", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("toGenericString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getParameters()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#isSynthetic()"/>
         /// </summary>
-        public Java.Lang.Reflect.Parameter[] Parameters
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSynthetic()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Parameter>("getParameters", "()[Ljava/lang/reflect/Parameter;"); }
+            return IExecuteWithSignature<bool>("isSynthetic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getParameterTypes()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#isVarArgs()"/>
         /// </summary>
-        public Java.Lang.Class[] ParameterTypes
+        /// <returns><see cref="bool"/></returns>
+        public bool IsVarArgs()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Class>("getParameterTypes", "()[Ljava/lang/Class;"); }
+            return IExecuteWithSignature<bool>("isVarArgs", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#getTypeParameters()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getParameterCount()"/>
         /// </summary>
-        public Java.Lang.Reflect.TypeVariable[] TypeParameters
+        /// <returns><see cref="int"/></returns>
+        public int GetParameterCount()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.TypeVariable>("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;"); }
+            return IExecute<int>("getParameterCount");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#toGenericString()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getParameters()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToGenericString()
+        /// <returns><see cref="Java.Lang.Reflect.Parameter"/></returns>
+        public Java.Lang.Reflect.Parameter[] GetParameters()
         {
-            return IExecuteWithSignature<Java.Lang.String>("toGenericString", "()Ljava/lang/String;");
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Parameter>("getParameters", "()[Ljava/lang/reflect/Parameter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#isSynthetic()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getGenericExceptionTypes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSynthetic()
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetGenericExceptionTypes()
         {
-            return IExecuteWithSignature<bool>("isSynthetic", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getGenericExceptionTypes", "()[Ljava/lang/reflect/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Executable.html#isVarArgs()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Executable.html#getGenericParameterTypes()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsVarArgs()
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetGenericParameterTypes()
         {
-            return IExecuteWithSignature<bool>("isVarArgs", "()Z");
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getGenericParameterTypes", "()[Ljava/lang/reflect/Type;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Field.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Field.cs
index 34fbf9812..68fb22025 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Field.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Field.cs
@@ -50,42 +50,7 @@ public partial class Field
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getDeclaringClass()"/> 
-        /// </summary>
-        public Java.Lang.Class DeclaringClass
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getGenericType()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Type GenericType
-        {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Type>("getGenericType", "()Ljava/lang/reflect/Type;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getModifiers()"/> 
-        /// </summary>
-        public int Modifiers
-        {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.Class Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getBoolean(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getBoolean(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -96,7 +61,7 @@ public bool GetBoolean(object arg0)
             return IExecuteWithSignature<bool>("getBoolean", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#isEnumConstant()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#isEnumConstant()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEnumConstant()
@@ -104,7 +69,7 @@ public bool IsEnumConstant()
             return IExecuteWithSignature<bool>("isEnumConstant", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#isSynthetic()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#isSynthetic()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsSynthetic()
@@ -112,7 +77,7 @@ public bool IsSynthetic()
             return IExecuteWithSignature<bool>("isSynthetic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getByte(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getByte(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -123,7 +88,7 @@ public byte GetByte(object arg0)
             return IExecuteWithSignature<byte>("getByte", "(Ljava/lang/Object;)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getChar(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getChar(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="char"/></returns>
@@ -134,7 +99,7 @@ public char GetChar(object arg0)
             return IExecuteWithSignature<char>("getChar", "(Ljava/lang/Object;)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getDouble(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getDouble(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="double"/></returns>
@@ -145,7 +110,7 @@ public double GetDouble(object arg0)
             return IExecuteWithSignature<double>("getDouble", "(Ljava/lang/Object;)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getFloat(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getFloat(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="float"/></returns>
@@ -156,7 +121,7 @@ public float GetFloat(object arg0)
             return IExecuteWithSignature<float>("getFloat", "(Ljava/lang/Object;)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getInt(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getInt(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -167,7 +132,31 @@ public int GetInt(object arg0)
             return IExecuteWithSignature<int>("getInt", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getModifiers()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
+        {
+            return IExecuteWithSignature<int>("getModifiers", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getDeclaringClass()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetDeclaringClass()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -178,7 +167,23 @@ public object Get(object arg0)
             return IExecuteWithSignature("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#toGenericString()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getGenericType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type GetGenericType()
+        {
+            return IExecuteWithSignature<Java.Lang.Reflect.Type>("getGenericType", "()Ljava/lang/reflect/Type;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#toGenericString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToGenericString()
@@ -186,7 +191,7 @@ public Java.Lang.String ToGenericString()
             return IExecuteWithSignature<Java.Lang.String>("toGenericString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getLong(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getLong(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="long"/></returns>
@@ -197,7 +202,7 @@ public long GetLong(object arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#getShort(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#getShort(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="short"/></returns>
@@ -208,7 +213,7 @@ public short GetShort(object arg0)
             return IExecuteWithSignature<short>("getShort", "(Ljava/lang/Object;)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#set(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#set(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -219,7 +224,7 @@ public void Set(object arg0, object arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#setBoolean(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#setBoolean(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -230,7 +235,7 @@ public void SetBoolean(object arg0, bool arg1)
             IExecute("setBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#setByte(java.lang.Object,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#setByte(java.lang.Object,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -241,7 +246,7 @@ public void SetByte(object arg0, byte arg1)
             IExecute("setByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#setChar(java.lang.Object,char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#setChar(java.lang.Object,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -252,7 +257,7 @@ public void SetChar(object arg0, char arg1)
             IExecute("setChar", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#setDouble(java.lang.Object,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#setDouble(java.lang.Object,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -263,7 +268,7 @@ public void SetDouble(object arg0, double arg1)
             IExecute("setDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#setFloat(java.lang.Object,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#setFloat(java.lang.Object,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -274,7 +279,7 @@ public void SetFloat(object arg0, float arg1)
             IExecute("setFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#setInt(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#setInt(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -285,7 +290,7 @@ public void SetInt(object arg0, int arg1)
             IExecute("setInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#setLong(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#setLong(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -296,7 +301,7 @@ public void SetLong(object arg0, long arg1)
             IExecute("setLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Field.html#setShort(java.lang.Object,short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Field.html#setShort(java.lang.Object,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="short"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/GenericArrayType.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/GenericArrayType.cs
index 20fb1d08c..5c2cdf0e9 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/GenericArrayType.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/GenericArrayType.cs
@@ -64,11 +64,12 @@ public partial class GenericArrayType : Java.Lang.Reflect.IGenericArrayType
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/GenericArrayType.html#getGenericComponentType()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/GenericArrayType.html#getGenericComponentType()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type GenericComponentType
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type GetGenericComponentType()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Type>("getGenericComponentType", "()Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<Java.Lang.Reflect.Type>("getGenericComponentType", "()Ljava/lang/reflect/Type;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/GenericDeclaration.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/GenericDeclaration.cs
index cd63829a2..ae2a14aff 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/GenericDeclaration.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/GenericDeclaration.cs
@@ -64,11 +64,12 @@ public partial class GenericDeclaration : Java.Lang.Reflect.IGenericDeclaration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/GenericDeclaration.html#getTypeParameters()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/GenericDeclaration.html#getTypeParameters()"/>
         /// </summary>
-        public Java.Lang.Reflect.TypeVariable[] TypeParameters
+        /// <returns><see cref="Java.Lang.Reflect.TypeVariable"/></returns>
+        public Java.Lang.Reflect.TypeVariable[] GetTypeParameters()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.TypeVariable>("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.TypeVariable>("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/InvocationHandler.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/InvocationHandler.cs
index c3ebd858d..e73253f1c 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/InvocationHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/InvocationHandler.cs
@@ -59,24 +59,12 @@ public partial class InvocationHandler : Java.Lang.Reflect.IInvocationHandler
         #endregion
 
         #region Static methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/InvocationHandler.html#invokeDefault(java.lang.Object,java.lang.reflect.Method,java.lang.Object[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.Reflect.Method"/></param>
-        /// <param name="arg2"><see cref="object"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Lang.Throwable"/>
-        public static object InvokeDefault(object arg0, Java.Lang.Reflect.Method arg1, params object[] arg2)
-        {
-            if (arg2.Length == 0) return SExecute(LocalBridgeClazz, "invokeDefault", arg0, arg1); else return SExecute(LocalBridgeClazz, "invokeDefault", arg0, arg1, arg2);
-        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/InvocationHandler.html#invoke(java.lang.Object,java.lang.reflect.Method,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/InvocationHandler.html#invoke(java.lang.Object,java.lang.reflect.Method,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Reflect.Method"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Member.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Member.cs
index 3f0a90aac..0b4523df9 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Member.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Member.cs
@@ -56,13 +56,13 @@ public partial class Member : Java.Lang.Reflect.IMember
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Member.html#DECLARED"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Member.html#DECLARED"/>
         /// </summary>
         public static int DECLARED { get { if (!_DECLAREDReady) { _DECLAREDContent = SGetField<int>(LocalBridgeClazz, "DECLARED"); _DECLAREDReady = true; } return _DECLAREDContent; } }
         private static int _DECLAREDContent = default;
         private static bool _DECLAREDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Member.html#PUBLIC"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Member.html#PUBLIC"/>
         /// </summary>
         public static int PUBLIC { get { if (!_PUBLICReady) { _PUBLICContent = SGetField<int>(LocalBridgeClazz, "PUBLIC"); _PUBLICReady = true; } return _PUBLICContent; } }
         private static int _PUBLICContent = default;
@@ -76,33 +76,36 @@ public partial class Member : Java.Lang.Reflect.IMember
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Member.html#getDeclaringClass()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Member.html#isSynthetic()"/>
         /// </summary>
-        public Java.Lang.Class DeclaringClass
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSynthetic()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<bool>("isSynthetic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Member.html#getModifiers()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Member.html#getModifiers()"/>
         /// </summary>
-        public int Modifiers
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
         {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
+            return IExecuteWithSignature<int>("getModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Member.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Member.html#getDeclaringClass()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetDeclaringClass()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Member.html#isSynthetic()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Member.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSynthetic()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isSynthetic", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Method.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Method.cs
index 5606bb8c7..4db6a7b3b 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Method.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Method.cs
@@ -46,44 +46,39 @@ public partial class Method
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Method.html#getDefaultValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Method.html#isBridge()"/>
         /// </summary>
-        public object DefaultValue
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBridge()
         {
-            get { return IExecuteWithSignature("getDefaultValue", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<bool>("isBridge", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Method.html#getGenericReturnType()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Method.html#isDefault()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type GenericReturnType
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDefault()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Type>("getGenericReturnType", "()Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<bool>("isDefault", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Method.html#getReturnType()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Method.html#getReturnType()"/>
         /// </summary>
-        public Java.Lang.Class ReturnType
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetReturnType()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getReturnType", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<Java.Lang.Class>("getReturnType", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Method.html#isBridge()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Method.html#getDefaultValue()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBridge()
-        {
-            return IExecuteWithSignature<bool>("isBridge", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Method.html#isDefault()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDefault()
+        /// <returns><see cref="object"/></returns>
+        public object GetDefaultValue()
         {
-            return IExecuteWithSignature<bool>("isDefault", "()Z");
+            return IExecuteWithSignature("getDefaultValue", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Method.html#invoke(java.lang.Object,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Method.html#invoke(java.lang.Object,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -95,6 +90,14 @@ public object Invoke(object arg0, params object[] arg1)
         {
             if (arg1.Length == 0) return IExecute("invoke", arg0); else return IExecute("invoke", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Method.html#getGenericReturnType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type GetGenericReturnType()
+        {
+            return IExecuteWithSignature<Java.Lang.Reflect.Type>("getGenericReturnType", "()Ljava/lang/reflect/Type;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Modifier.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Modifier.cs
index 651440c37..69e8981de 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Modifier.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Modifier.cs
@@ -38,73 +38,73 @@ public partial class Modifier
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#ABSTRACT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#ABSTRACT"/>
         /// </summary>
         public static int ABSTRACT { get { if (!_ABSTRACTReady) { _ABSTRACTContent = SGetField<int>(LocalBridgeClazz, "ABSTRACT"); _ABSTRACTReady = true; } return _ABSTRACTContent; } }
         private static int _ABSTRACTContent = default;
         private static bool _ABSTRACTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#FINAL"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#FINAL"/>
         /// </summary>
         public static int FINAL { get { if (!_FINALReady) { _FINALContent = SGetField<int>(LocalBridgeClazz, "FINAL"); _FINALReady = true; } return _FINALContent; } }
         private static int _FINALContent = default;
         private static bool _FINALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#INTERFACE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#INTERFACE"/>
         /// </summary>
         public static int INTERFACE { get { if (!_INTERFACEReady) { _INTERFACEContent = SGetField<int>(LocalBridgeClazz, "INTERFACE"); _INTERFACEReady = true; } return _INTERFACEContent; } }
         private static int _INTERFACEContent = default;
         private static bool _INTERFACEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#NATIVE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#NATIVE"/>
         /// </summary>
         public static int NATIVE { get { if (!_NATIVEReady) { _NATIVEContent = SGetField<int>(LocalBridgeClazz, "NATIVE"); _NATIVEReady = true; } return _NATIVEContent; } }
         private static int _NATIVEContent = default;
         private static bool _NATIVEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#PRIVATE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#PRIVATE"/>
         /// </summary>
         public static int PRIVATE { get { if (!_PRIVATEReady) { _PRIVATEContent = SGetField<int>(LocalBridgeClazz, "PRIVATE"); _PRIVATEReady = true; } return _PRIVATEContent; } }
         private static int _PRIVATEContent = default;
         private static bool _PRIVATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#PROTECTED"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#PROTECTED"/>
         /// </summary>
         public static int PROTECTED { get { if (!_PROTECTEDReady) { _PROTECTEDContent = SGetField<int>(LocalBridgeClazz, "PROTECTED"); _PROTECTEDReady = true; } return _PROTECTEDContent; } }
         private static int _PROTECTEDContent = default;
         private static bool _PROTECTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#PUBLIC"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#PUBLIC"/>
         /// </summary>
         public static int PUBLIC { get { if (!_PUBLICReady) { _PUBLICContent = SGetField<int>(LocalBridgeClazz, "PUBLIC"); _PUBLICReady = true; } return _PUBLICContent; } }
         private static int _PUBLICContent = default;
         private static bool _PUBLICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#STATIC"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#STATIC"/>
         /// </summary>
         public static int STATIC { get { if (!_STATICReady) { _STATICContent = SGetField<int>(LocalBridgeClazz, "STATIC"); _STATICReady = true; } return _STATICContent; } }
         private static int _STATICContent = default;
         private static bool _STATICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#STRICT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#STRICT"/>
         /// </summary>
         public static int STRICT { get { if (!_STRICTReady) { _STRICTContent = SGetField<int>(LocalBridgeClazz, "STRICT"); _STRICTReady = true; } return _STRICTContent; } }
         private static int _STRICTContent = default;
         private static bool _STRICTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#SYNCHRONIZED"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#SYNCHRONIZED"/>
         /// </summary>
         public static int SYNCHRONIZED { get { if (!_SYNCHRONIZEDReady) { _SYNCHRONIZEDContent = SGetField<int>(LocalBridgeClazz, "SYNCHRONIZED"); _SYNCHRONIZEDReady = true; } return _SYNCHRONIZEDContent; } }
         private static int _SYNCHRONIZEDContent = default;
         private static bool _SYNCHRONIZEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#TRANSIENT"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#TRANSIENT"/>
         /// </summary>
         public static int TRANSIENT { get { if (!_TRANSIENTReady) { _TRANSIENTContent = SGetField<int>(LocalBridgeClazz, "TRANSIENT"); _TRANSIENTReady = true; } return _TRANSIENTContent; } }
         private static int _TRANSIENTContent = default;
         private static bool _TRANSIENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#VOLATILE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#VOLATILE"/>
         /// </summary>
         public static int VOLATILE { get { if (!_VOLATILEReady) { _VOLATILEContent = SGetField<int>(LocalBridgeClazz, "VOLATILE"); _VOLATILEReady = true; } return _VOLATILEContent; } }
         private static int _VOLATILEContent = default;
@@ -114,7 +114,7 @@ public partial class Modifier
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isAbstract(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isAbstract(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -123,7 +123,7 @@ public static bool IsAbstract(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isAbstract", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isFinal(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isFinal(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -132,7 +132,7 @@ public static bool IsFinal(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isFinal", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isInterface(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isInterface(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -141,7 +141,7 @@ public static bool IsInterface(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isInterface", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isNative(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isNative(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -150,7 +150,7 @@ public static bool IsNative(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isNative", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isPrivate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isPrivate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -159,7 +159,7 @@ public static bool IsPrivate(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isPrivate", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isProtected(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isProtected(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -168,7 +168,7 @@ public static bool IsProtected(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isProtected", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isPublic(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isPublic(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -177,7 +177,7 @@ public static bool IsPublic(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isPublic", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isStatic(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isStatic(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -186,7 +186,7 @@ public static bool IsStatic(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isStatic", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isStrict(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isStrict(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -195,7 +195,7 @@ public static bool IsStrict(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isStrict", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isSynchronized(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isSynchronized(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -204,7 +204,7 @@ public static bool IsSynchronized(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSynchronized", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isTransient(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isTransient(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -213,7 +213,7 @@ public static bool IsTransient(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isTransient", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#isVolatile(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#isVolatile(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -222,7 +222,7 @@ public static bool IsVolatile(int arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isVolatile", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#classModifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#classModifiers()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public static int ClassModifiers()
@@ -230,7 +230,7 @@ public static int ClassModifiers()
             return SExecute<int>(LocalBridgeClazz, "classModifiers");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#constructorModifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#constructorModifiers()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public static int ConstructorModifiers()
@@ -238,7 +238,7 @@ public static int ConstructorModifiers()
             return SExecuteWithSignature<int>(LocalBridgeClazz, "constructorModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#fieldModifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#fieldModifiers()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public static int FieldModifiers()
@@ -246,7 +246,7 @@ public static int FieldModifiers()
             return SExecuteWithSignature<int>(LocalBridgeClazz, "fieldModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#interfaceModifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#interfaceModifiers()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public static int InterfaceModifiers()
@@ -254,7 +254,7 @@ public static int InterfaceModifiers()
             return SExecute<int>(LocalBridgeClazz, "interfaceModifiers");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#methodModifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#methodModifiers()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public static int MethodModifiers()
@@ -262,7 +262,7 @@ public static int MethodModifiers()
             return SExecuteWithSignature<int>(LocalBridgeClazz, "methodModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#parameterModifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#parameterModifiers()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public static int ParameterModifiers()
@@ -270,7 +270,7 @@ public static int ParameterModifiers()
             return SExecuteWithSignature<int>(LocalBridgeClazz, "parameterModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Modifier.html#toString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Modifier.html#toString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Parameter.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Parameter.cs
index 5b49c21eb..521dfcb5c 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Parameter.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Parameter.cs
@@ -46,125 +46,132 @@ public partial class Parameter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getAnnotations()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getAnnotation(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.Annotation.Annotation[] Annotations
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T GetAnnotation<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
+            return IExecute<T>("getAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getDeclaredAnnotations()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getDeclaredAnnotation(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.Annotation.Annotation[] DeclaredAnnotations
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T GetDeclaredAnnotation<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
+            return IExecute<T>("getDeclaredAnnotation", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getDeclaringExecutable()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getAnnotationsByType(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.Reflect.Executable DeclaringExecutable
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T[] GetAnnotationsByType<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Executable>("getDeclaringExecutable", "()Ljava/lang/reflect/Executable;"); }
+            return IExecuteArray<T>("getAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getModifiers()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
         /// </summary>
-        public int Modifiers
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T[] GetDeclaredAnnotationsByType<T>(Java.Lang.Class arg0) where T : Java.Lang.Annotation.IAnnotation, new()
         {
-            get { return IExecuteWithSignature<int>("getModifiers", "()I"); }
+            return IExecuteArray<T>("getDeclaredAnnotationsByType", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#isImplicit()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool IsImplicit()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isImplicit", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getParameterizedType()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#isNamePresent()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type ParameterizedType
+        /// <returns><see cref="bool"/></returns>
+        public bool IsNamePresent()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Type>("getParameterizedType", "()Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<bool>("isNamePresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#isSynthetic()"/>
         /// </summary>
-        public Java.Lang.Class Type
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSynthetic()
         {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;"); }
+            return IExecuteWithSignature<bool>("isSynthetic", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#isVarArgs()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T GetAnnotation<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="bool"/></returns>
+        public bool IsVarArgs()
         {
-            return IExecuteWithSignature<T>("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignature<bool>("isVarArgs", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getDeclaredAnnotation(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getModifiers()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T GetDeclaredAnnotation<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="int"/></returns>
+        public int GetModifiers()
         {
-            return IExecuteWithSignature<T>("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignature<int>("getModifiers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getAnnotations()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T[] GetAnnotationsByType<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetAnnotations()
         {
-            return IExecuteWithSignatureArray<T>("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#getDeclaredAnnotationsByType(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getDeclaredAnnotations()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T[] GetDeclaredAnnotationsByType<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
+        /// <returns><see cref="Java.Lang.Annotation.Annotation"/></returns>
+        public Java.Lang.Annotation.Annotation[] GetDeclaredAnnotations()
         {
-            return IExecuteWithSignatureArray<T>("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", arg0);
+            return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#isImplicit()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsImplicit()
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetType()
         {
-            return IExecuteWithSignature<bool>("isImplicit", "()Z");
+            return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#isNamePresent()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getDeclaringExecutable()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsNamePresent()
+        /// <returns><see cref="Java.Lang.Reflect.Executable"/></returns>
+        public Java.Lang.Reflect.Executable GetDeclaringExecutable()
         {
-            return IExecuteWithSignature<bool>("isNamePresent", "()Z");
+            return IExecuteWithSignature<Java.Lang.Reflect.Executable>("getDeclaringExecutable", "()Ljava/lang/reflect/Executable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#isSynthetic()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getParameterizedType()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSynthetic()
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type GetParameterizedType()
         {
-            return IExecuteWithSignature<bool>("isSynthetic", "()Z");
+            return IExecuteWithSignature<Java.Lang.Reflect.Type>("getParameterizedType", "()Ljava/lang/reflect/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Parameter.html#isVarArgs()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Parameter.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsVarArgs()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isVarArgs", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/ParameterizedType.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/ParameterizedType.cs
index 7ff9fb379..75bfacc41 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/ParameterizedType.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/ParameterizedType.cs
@@ -64,25 +64,28 @@ public partial class ParameterizedType : Java.Lang.Reflect.IParameterizedType
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/ParameterizedType.html#getActualTypeArguments()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/ParameterizedType.html#getOwnerType()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type[] ActualTypeArguments
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type GetOwnerType()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getActualTypeArguments", "()[Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<Java.Lang.Reflect.Type>("getOwnerType", "()Ljava/lang/reflect/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/ParameterizedType.html#getOwnerType()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/ParameterizedType.html#getRawType()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type OwnerType
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type GetRawType()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Type>("getOwnerType", "()Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<Java.Lang.Reflect.Type>("getRawType", "()Ljava/lang/reflect/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/ParameterizedType.html#getRawType()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/ParameterizedType.html#getActualTypeArguments()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type RawType
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetActualTypeArguments()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Type>("getRawType", "()Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getActualTypeArguments", "()[Ljava/lang/reflect/Type;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Proxy.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Proxy.cs
index 144f8eea4..fcdb755c5 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Proxy.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Proxy.cs
@@ -42,7 +42,7 @@ public partial class Proxy
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Proxy.html#isProxyClass(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Proxy.html#isProxyClass(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -51,19 +51,19 @@ public static bool IsProxyClass(Java.Lang.Class arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isProxyClass", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Proxy.html#getProxyClass(java.lang.ClassLoader,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Proxy.html#getProxyClass(java.lang.ClassLoader,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Lang.Class"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.Class GetProxyClass(Java.Lang.ClassLoader arg0, params Java.Lang.Class[] arg1)
         {
             if (arg1.Length == 0) return SExecute<Java.Lang.Class>(LocalBridgeClazz, "getProxyClass", arg0); else return SExecute<Java.Lang.Class>(LocalBridgeClazz, "getProxyClass", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Proxy.html#newProxyInstance(java.lang.ClassLoader,java.lang.Class[],java.lang.reflect.InvocationHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Proxy.html#newProxyInstance(java.lang.ClassLoader,java.lang.Class[],java.lang.reflect.InvocationHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -74,7 +74,7 @@ public static object NewProxyInstance(Java.Lang.ClassLoader arg0, Java.Lang.Clas
             return SExecute(LocalBridgeClazz, "newProxyInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Proxy.html#getInvocationHandler(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Proxy.html#getInvocationHandler(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.Reflect.InvocationHandler"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/RecordComponent.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/RecordComponent.cs
deleted file mode 100644
index f119c2d46..000000000
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/RecordComponent.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Lang.Reflect
-{
-    #region RecordComponent
-    public partial class RecordComponent
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getAccessor()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Method Accessor
-        {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Method>("getAccessor", "()Ljava/lang/reflect/Method;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getAnnotations()"/> 
-        /// </summary>
-        public Java.Lang.Annotation.Annotation[] Annotations
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getDeclaredAnnotations()"/> 
-        /// </summary>
-        public Java.Lang.Annotation.Annotation[] DeclaredAnnotations
-        {
-            get { return IExecuteWithSignatureArray<Java.Lang.Annotation.Annotation>("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getDeclaringRecord()"/> 
-        /// </summary>
-        public Java.Lang.Class DeclaringRecord
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringRecord", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getGenericSignature()"/> 
-        /// </summary>
-        public Java.Lang.String GenericSignature
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getGenericSignature", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getGenericType()"/> 
-        /// </summary>
-        public Java.Lang.Reflect.Type GenericType
-        {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.Type>("getGenericType", "()Ljava/lang/reflect/Type;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.Class Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getType", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/RecordComponent.html#getAnnotation(java.lang.Class)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Java.Lang.Annotation.IAnnotation"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T GetAnnotation<T>(Java.Lang.Class arg0) where T: Java.Lang.Annotation.IAnnotation, new()
-        {
-            return IExecuteWithSignature<T>("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", arg0);
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/ReflectPermission.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/ReflectPermission.cs
index 967f721bc..c5d47e9c6 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/ReflectPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/ReflectPermission.cs
@@ -30,7 +30,7 @@ public partial class ReflectPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/ReflectPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/ReflectPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public ReflectPermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/ReflectPermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/ReflectPermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public ReflectPermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/Type.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/Type.cs
index ba0e2339b..93a0873d7 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/Type.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/Type.cs
@@ -64,11 +64,12 @@ public partial class Type : Java.Lang.Reflect.IType
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/Type.html#getTypeName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/Type.html#getTypeName()"/>
         /// </summary>
-        public Java.Lang.String TypeName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTypeName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/TypeVariable.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/TypeVariable.cs
index a240fa571..7fd48369c 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/TypeVariable.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/TypeVariable.cs
@@ -54,25 +54,28 @@ public partial class TypeVariable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/TypeVariable.html#getBounds()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/TypeVariable.html#getGenericDeclaration()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type[] Bounds
+        /// <returns><see cref="Java.Lang.Reflect.GenericDeclaration"/></returns>
+        public Java.Lang.Reflect.GenericDeclaration GetGenericDeclaration()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getBounds", "()[Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<Java.Lang.Reflect.GenericDeclaration>("getGenericDeclaration", "()Ljava/lang/reflect/GenericDeclaration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/TypeVariable.html#getGenericDeclaration()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/TypeVariable.html#getBounds()"/>
         /// </summary>
-        public Java.Lang.Reflect.GenericDeclaration GenericDeclaration
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetBounds()
         {
-            get { return IExecuteWithSignature<Java.Lang.Reflect.GenericDeclaration>("getGenericDeclaration", "()Ljava/lang/reflect/GenericDeclaration;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getBounds", "()[Ljava/lang/reflect/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/TypeVariable.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/TypeVariable.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
@@ -136,25 +139,28 @@ public partial class TypeVariable<D> : Java.Lang.Reflect.ITypeVariable<D>, Java.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/TypeVariable.html#getBounds()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/TypeVariable.html#getGenericDeclaration()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type[] Bounds
+        /// <returns><typeparamref name="D"/></returns>
+        public D GetGenericDeclaration()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getBounds", "()[Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignature<D>("getGenericDeclaration", "()Ljava/lang/reflect/GenericDeclaration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/TypeVariable.html#getGenericDeclaration()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/TypeVariable.html#getBounds()"/>
         /// </summary>
-        public D GenericDeclaration
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetBounds()
         {
-            get { return IExecuteWithSignature<D>("getGenericDeclaration", "()Ljava/lang/reflect/GenericDeclaration;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getBounds", "()[Ljava/lang/reflect/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/TypeVariable.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/TypeVariable.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Reflect/WildcardType.cs b/src/net/Netdroid/Generated/Java/Lang/Reflect/WildcardType.cs
index 6d93318fb..e31b40b6f 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Reflect/WildcardType.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Reflect/WildcardType.cs
@@ -64,18 +64,20 @@ public partial class WildcardType : Java.Lang.Reflect.IWildcardType
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/WildcardType.html#getLowerBounds()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/WildcardType.html#getLowerBounds()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type[] LowerBounds
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetLowerBounds()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getLowerBounds", "()[Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getLowerBounds", "()[Ljava/lang/reflect/Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/reflect/WildcardType.html#getUpperBounds()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/reflect/WildcardType.html#getUpperBounds()"/>
         /// </summary>
-        public Java.Lang.Reflect.Type[] UpperBounds
+        /// <returns><see cref="Java.Lang.Reflect.Type"/></returns>
+        public Java.Lang.Reflect.Type[] GetUpperBounds()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getUpperBounds", "()[Ljava/lang/reflect/Type;"); }
+            return IExecuteWithSignatureArray<Java.Lang.Reflect.Type>("getUpperBounds", "()[Ljava/lang/reflect/Type;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/Runnable.cs b/src/net/Netdroid/Generated/Java/Lang/Runnable.cs
index b9752f466..30c41faee 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Runnable.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Runnable.cs
@@ -64,7 +64,7 @@ public partial class Runnable : Java.Lang.IRunnable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runnable.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runnable.html#run()"/>
         /// </summary>
         public void Run()
         {
diff --git a/src/net/Netdroid/Generated/Java/Lang/Runtime.cs b/src/net/Netdroid/Generated/Java/Lang/Runtime.cs
index da76c573f..02ec1e3d0 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Runtime.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Runtime.cs
@@ -42,26 +42,19 @@ public partial class Runtime
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#getRuntime()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#getRuntime()"/>
         /// </summary>
-        public static Java.Lang.Runtime GetRuntime
+        /// <returns><see cref="Java.Lang.Runtime"/></returns>
+        public static Java.Lang.Runtime GetRuntime()
         {
-            get { return SExecuteWithSignature<Java.Lang.Runtime>(LocalBridgeClazz, "getRuntime", "()Ljava/lang/Runtime;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#version()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.Runtime.Version"/></returns>
-        public static Java.Lang.Runtime.Version Version()
-        {
-            return SExecuteWithSignature<Java.Lang.Runtime.Version>(LocalBridgeClazz, "version", "()Ljava/lang/Runtime$Version;");
+            return SExecuteWithSignature<Java.Lang.Runtime>(LocalBridgeClazz, "getRuntime", "()Ljava/lang/Runtime;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#removeShutdownHook(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#removeShutdownHook(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -70,7 +63,7 @@ public bool RemoveShutdownHook(Java.Lang.Thread arg0)
             return IExecuteWithSignature<bool>("removeShutdownHook", "(Ljava/lang/Thread;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#exec(java.lang.String,java.lang.String[],java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#exec(java.lang.String,java.lang.String[],java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -82,7 +75,7 @@ public Java.Lang.Process Exec(Java.Lang.String arg0, Java.Lang.String[] arg1, Ja
             return IExecute<Java.Lang.Process>("exec", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#exec(java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#exec(java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -93,7 +86,7 @@ public Java.Lang.Process Exec(Java.Lang.String arg0, Java.Lang.String[] arg1)
             return IExecute<Java.Lang.Process>("exec", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#exec(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#exec(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Process"/></returns>
@@ -103,7 +96,7 @@ public Java.Lang.Process Exec(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.Process>("exec", "(Ljava/lang/String;)Ljava/lang/Process;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#exec(java.lang.String[],java.lang.String[],java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#exec(java.lang.String[],java.lang.String[],java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -115,7 +108,7 @@ public Java.Lang.Process Exec(Java.Lang.String[] arg0, Java.Lang.String[] arg1,
             return IExecute<Java.Lang.Process>("exec", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#exec(java.lang.String[],java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#exec(java.lang.String[],java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -126,7 +119,7 @@ public Java.Lang.Process Exec(Java.Lang.String[] arg0, Java.Lang.String[] arg1)
             return IExecute<Java.Lang.Process>("exec", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#exec(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#exec(java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Process"/></returns>
@@ -136,7 +129,7 @@ public Java.Lang.Process Exec(Java.Lang.String[] arg0)
             return IExecuteWithSignature<Java.Lang.Process>("exec", "([Ljava/lang/String;)Ljava/lang/Process;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#availableProcessors()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#availableProcessors()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int AvailableProcessors()
@@ -144,7 +137,7 @@ public int AvailableProcessors()
             return IExecuteWithSignature<int>("availableProcessors", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#freeMemory()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#freeMemory()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long FreeMemory()
@@ -152,7 +145,7 @@ public long FreeMemory()
             return IExecuteWithSignature<long>("freeMemory", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#maxMemory()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#maxMemory()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long MaxMemory()
@@ -160,7 +153,7 @@ public long MaxMemory()
             return IExecuteWithSignature<long>("maxMemory", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#totalMemory()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#totalMemory()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long TotalMemory()
@@ -168,14 +161,14 @@ public long TotalMemory()
             return IExecuteWithSignature<long>("totalMemory", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#gc()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#gc()"/>
         /// </summary>
         public void Gc()
         {
             IExecuteWithSignature("gc", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#addShutdownHook(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#addShutdownHook(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         public void AddShutdownHook(Java.Lang.Thread arg0)
@@ -183,7 +176,7 @@ public void AddShutdownHook(Java.Lang.Thread arg0)
             IExecuteWithSignature("addShutdownHook", "(Ljava/lang/Thread;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#exit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#exit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Exit(int arg0)
@@ -191,7 +184,7 @@ public void Exit(int arg0)
             IExecuteWithSignature("exit", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#halt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#halt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Halt(int arg0)
@@ -199,7 +192,7 @@ public void Halt(int arg0)
             IExecuteWithSignature("halt", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#load(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#load(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Load(Java.Lang.String arg0)
@@ -207,7 +200,7 @@ public void Load(Java.Lang.String arg0)
             IExecuteWithSignature("load", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#loadLibrary(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#loadLibrary(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void LoadLibrary(Java.Lang.String arg0)
@@ -215,12 +208,30 @@ public void LoadLibrary(Java.Lang.String arg0)
             IExecuteWithSignature("loadLibrary", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Runtime.html#runFinalization()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#runFinalization()"/>
         /// </summary>
         public void RunFinalization()
         {
             IExecuteWithSignature("runFinalization", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#traceInstructions(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void TraceInstructions(bool arg0)
+        {
+            IExecute("traceInstructions", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Runtime.html#traceMethodCalls(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        [global::System.Obsolete()]
+        public void TraceMethodCalls(bool arg0)
+        {
+            IExecute("traceMethodCalls", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Lang/Runtime/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Lang/Runtime/AllPackageClasses.cs
deleted file mode 100644
index e7298327b..000000000
--- a/src/net/Netdroid/Generated/Java/Lang/Runtime/AllPackageClasses.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge.JVMInterop;
-using System;
-
-namespace Java.Lang.Runtime
-{
-    #region ObjectMethods
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/lang/runtime/ObjectMethods.html"/>
-    /// </summary>
-    public partial class ObjectMethods : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ObjectMethods>
-    {
-        const string _bridgeClassName = "java.lang.runtime.ObjectMethods";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        public ObjectMethods() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        public ObjectMethods(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-
-
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Lang/Runtime/ObjectMethods.cs b/src/net/Netdroid/Generated/Java/Lang/Runtime/ObjectMethods.cs
deleted file mode 100644
index 154c3e556..000000000
--- a/src/net/Netdroid/Generated/Java/Lang/Runtime/ObjectMethods.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Lang.Runtime
-{
-    #region ObjectMethods
-    public partial class ObjectMethods
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/runtime/ObjectMethods.html#bootstrap(java.lang.invoke.MethodHandles.Lookup,java.lang.String,java.lang.invoke.TypeDescriptor,java.lang.Class,java.lang.String,java.lang.invoke.MethodHandle[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.Invoke.TypeDescriptor"/></param>
-        /// <param name="arg3"><see cref="Java.Lang.Class"/></param>
-        /// <param name="arg4"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg5"><see cref="Java.Lang.Invoke.MethodHandle"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Lang.Throwable"/>
-        public static object Bootstrap(Java.Lang.Invoke.MethodHandles.Lookup arg0, Java.Lang.String arg1, Java.Lang.Invoke.TypeDescriptor arg2, Java.Lang.Class arg3, Java.Lang.String arg4, params Java.Lang.Invoke.MethodHandle[] arg5)
-        {
-            if (arg5.Length == 0) return SExecute(LocalBridgeClazz, "bootstrap", arg0, arg1, arg2, arg3, arg4); else return SExecute(LocalBridgeClazz, "bootstrap", arg0, arg1, arg2, arg3, arg4, arg5);
-        }
-
-        #endregion
-
-        #region Instance methods
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Lang/RuntimePermission.cs b/src/net/Netdroid/Generated/Java/Lang/RuntimePermission.cs
index ae59ffd38..6057da17f 100644
--- a/src/net/Netdroid/Generated/Java/Lang/RuntimePermission.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/RuntimePermission.cs
@@ -30,7 +30,7 @@ public partial class RuntimePermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/RuntimePermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/RuntimePermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public RuntimePermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/RuntimePermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/RuntimePermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public RuntimePermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/SecurityManager.cs b/src/net/Netdroid/Generated/Java/Lang/SecurityManager.cs
index a0b322bcb..134f335ee 100644
--- a/src/net/Netdroid/Generated/Java/Lang/SecurityManager.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/SecurityManager.cs
@@ -46,21 +46,23 @@ public partial class SecurityManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#getSecurityContext()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#getSecurityContext()"/>
         /// </summary>
-        public object SecurityContext
+        /// <returns><see cref="object"/></returns>
+        public object GetSecurityContext()
         {
-            get { return IExecuteWithSignature("getSecurityContext", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature("getSecurityContext", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#getThreadGroup()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#getThreadGroup()"/>
         /// </summary>
-        public Java.Lang.ThreadGroup ThreadGroup
+        /// <returns><see cref="Java.Lang.ThreadGroup"/></returns>
+        public Java.Lang.ThreadGroup GetThreadGroup()
         {
-            get { return IExecuteWithSignature<Java.Lang.ThreadGroup>("getThreadGroup", "()Ljava/lang/ThreadGroup;"); }
+            return IExecuteWithSignature<Java.Lang.ThreadGroup>("getThreadGroup", "()Ljava/lang/ThreadGroup;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkAccept(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkAccept(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -69,7 +71,7 @@ public void CheckAccept(Java.Lang.String arg0, int arg1)
             IExecute("checkAccept", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkAccess(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkAccess(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         public void CheckAccess(Java.Lang.Thread arg0)
@@ -77,7 +79,7 @@ public void CheckAccess(Java.Lang.Thread arg0)
             IExecuteWithSignature("checkAccess", "(Ljava/lang/Thread;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkAccess(java.lang.ThreadGroup)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkAccess(java.lang.ThreadGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         public void CheckAccess(Java.Lang.ThreadGroup arg0)
@@ -85,7 +87,7 @@ public void CheckAccess(Java.Lang.ThreadGroup arg0)
             IExecuteWithSignature("checkAccess", "(Ljava/lang/ThreadGroup;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkConnect(java.lang.String,int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkConnect(java.lang.String,int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -95,7 +97,7 @@ public void CheckConnect(Java.Lang.String arg0, int arg1, object arg2)
             IExecute("checkConnect", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkConnect(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkConnect(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -104,14 +106,14 @@ public void CheckConnect(Java.Lang.String arg0, int arg1)
             IExecute("checkConnect", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkCreateClassLoader()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkCreateClassLoader()"/>
         /// </summary>
         public void CheckCreateClassLoader()
         {
             IExecuteWithSignature("checkCreateClassLoader", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkDelete(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkDelete(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckDelete(Java.Lang.String arg0)
@@ -119,7 +121,7 @@ public void CheckDelete(Java.Lang.String arg0)
             IExecuteWithSignature("checkDelete", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkExec(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkExec(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckExec(Java.Lang.String arg0)
@@ -127,7 +129,7 @@ public void CheckExec(Java.Lang.String arg0)
             IExecuteWithSignature("checkExec", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkExit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkExit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void CheckExit(int arg0)
@@ -135,7 +137,7 @@ public void CheckExit(int arg0)
             IExecuteWithSignature("checkExit", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkLink(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkLink(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckLink(Java.Lang.String arg0)
@@ -143,7 +145,7 @@ public void CheckLink(Java.Lang.String arg0)
             IExecuteWithSignature("checkLink", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkListen(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkListen(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void CheckListen(int arg0)
@@ -151,17 +153,17 @@ public void CheckListen(int arg0)
             IExecuteWithSignature("checkListen", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkMulticast(java.net.InetAddress,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkMulticast(java.net.InetAddress,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void CheckMulticast(Java.Net.InetAddress arg0, byte arg1)
         {
             IExecute("checkMulticast", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkMulticast(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkMulticast(java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         public void CheckMulticast(Java.Net.InetAddress arg0)
@@ -169,7 +171,7 @@ public void CheckMulticast(Java.Net.InetAddress arg0)
             IExecuteWithSignature("checkMulticast", "(Ljava/net/InetAddress;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkPackageAccess(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkPackageAccess(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckPackageAccess(Java.Lang.String arg0)
@@ -177,7 +179,7 @@ public void CheckPackageAccess(Java.Lang.String arg0)
             IExecuteWithSignature("checkPackageAccess", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkPackageDefinition(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkPackageDefinition(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckPackageDefinition(Java.Lang.String arg0)
@@ -185,7 +187,7 @@ public void CheckPackageDefinition(Java.Lang.String arg0)
             IExecuteWithSignature("checkPackageDefinition", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkPermission(java.security.Permission,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkPermission(java.security.Permission,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -194,7 +196,7 @@ public void CheckPermission(Java.Security.Permission arg0, object arg1)
             IExecute("checkPermission", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkPermission(java.security.Permission)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkPermission(java.security.Permission)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
         public void CheckPermission(Java.Security.Permission arg0)
@@ -202,21 +204,21 @@ public void CheckPermission(Java.Security.Permission arg0)
             IExecuteWithSignature("checkPermission", "(Ljava/security/Permission;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkPrintJobAccess()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkPrintJobAccess()"/>
         /// </summary>
         public void CheckPrintJobAccess()
         {
             IExecuteWithSignature("checkPrintJobAccess", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkPropertiesAccess()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkPropertiesAccess()"/>
         /// </summary>
         public void CheckPropertiesAccess()
         {
             IExecuteWithSignature("checkPropertiesAccess", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkPropertyAccess(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkPropertyAccess(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckPropertyAccess(Java.Lang.String arg0)
@@ -224,7 +226,7 @@ public void CheckPropertyAccess(Java.Lang.String arg0)
             IExecuteWithSignature("checkPropertyAccess", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkRead(java.io.FileDescriptor)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkRead(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         public void CheckRead(Java.Io.FileDescriptor arg0)
@@ -232,7 +234,7 @@ public void CheckRead(Java.Io.FileDescriptor arg0)
             IExecuteWithSignature("checkRead", "(Ljava/io/FileDescriptor;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkRead(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkRead(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -241,7 +243,7 @@ public void CheckRead(Java.Lang.String arg0, object arg1)
             IExecute("checkRead", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkRead(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkRead(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckRead(Java.Lang.String arg0)
@@ -249,7 +251,7 @@ public void CheckRead(Java.Lang.String arg0)
             IExecuteWithSignature("checkRead", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkSecurityAccess(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkSecurityAccess(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckSecurityAccess(Java.Lang.String arg0)
@@ -257,14 +259,14 @@ public void CheckSecurityAccess(Java.Lang.String arg0)
             IExecuteWithSignature("checkSecurityAccess", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkSetFactory()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkSetFactory()"/>
         /// </summary>
         public void CheckSetFactory()
         {
             IExecuteWithSignature("checkSetFactory", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkWrite(java.io.FileDescriptor)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkWrite(java.io.FileDescriptor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.FileDescriptor"/></param>
         public void CheckWrite(Java.Io.FileDescriptor arg0)
@@ -272,7 +274,7 @@ public void CheckWrite(Java.Io.FileDescriptor arg0)
             IExecuteWithSignature("checkWrite", "(Ljava/io/FileDescriptor;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SecurityManager.html#checkWrite(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SecurityManager.html#checkWrite(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void CheckWrite(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Short.cs b/src/net/Netdroid/Generated/Java/Lang/Short.cs
index 7e9dd2fa9..dfcdb7b8b 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Short.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Short.cs
@@ -26,24 +26,24 @@
 namespace Java.Lang
 {
     #region Short
-    public partial class Short : Java.Lang.IComparable<Java.Lang.Short>
+    public partial class Short
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Lang.NumberFormatException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Short(Java.Lang.String arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#%3Cinit%3E(short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#%3Cinit%3E(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Short(short arg0)
             : base(arg0)
         {
@@ -61,31 +61,31 @@ public Short(short arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#BYTES"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#BYTES"/>
         /// </summary>
         public static int BYTES { get { if (!_BYTESReady) { _BYTESContent = SGetField<int>(LocalBridgeClazz, "BYTES"); _BYTESReady = true; } return _BYTESContent; } }
         private static int _BYTESContent = default;
         private static bool _BYTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#SIZE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#SIZE"/>
         /// </summary>
         public static int SIZE { get { if (!_SIZEReady) { _SIZEContent = SGetField<int>(LocalBridgeClazz, "SIZE"); _SIZEReady = true; } return _SIZEContent; } }
         private static int _SIZEContent = default;
         private static bool _SIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
         private static bool _TYPEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#MAX_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#MAX_VALUE"/>
         /// </summary>
         public static short MAX_VALUE { get { if (!_MAX_VALUEReady) { _MAX_VALUEContent = SGetField<short>(LocalBridgeClazz, "MAX_VALUE"); _MAX_VALUEReady = true; } return _MAX_VALUEContent; } }
         private static short _MAX_VALUEContent = default;
         private static bool _MAX_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#MIN_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#MIN_VALUE"/>
         /// </summary>
         public static short MIN_VALUE { get { if (!_MIN_VALUEReady) { _MIN_VALUEContent = SGetField<short>(LocalBridgeClazz, "MIN_VALUE"); _MIN_VALUEReady = true; } return _MIN_VALUEContent; } }
         private static short _MIN_VALUEContent = default;
@@ -95,7 +95,7 @@ public Short(short arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#compare(short,short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#compare(short,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -105,7 +105,7 @@ public static int Compare(short arg0, short arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#compareUnsigned(short,short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#compareUnsigned(short,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -115,7 +115,7 @@ public static int CompareUnsigned(short arg0, short arg1)
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#hashCode(short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#hashCode(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="int"/></returns>
@@ -124,7 +124,7 @@ public static int HashCode(short arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(S)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#toUnsignedInt(short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#toUnsignedInt(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="int"/></returns>
@@ -133,7 +133,7 @@ public static int ToUnsignedInt(short arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "toUnsignedInt", "(S)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#decode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#decode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Short"/></returns>
@@ -143,7 +143,7 @@ public static Java.Lang.Short Decode(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Short>(LocalBridgeClazz, "decode", "(Ljava/lang/String;)Ljava/lang/Short;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#valueOf(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#valueOf(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -154,7 +154,7 @@ public static Java.Lang.Short ValueOf(Java.Lang.String arg0, int arg1)
             return SExecute<Java.Lang.Short>(LocalBridgeClazz, "valueOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Short"/></returns>
@@ -164,7 +164,7 @@ public static Java.Lang.Short ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.Short>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Short;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#valueOf(short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#valueOf(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="Java.Lang.Short"/></returns>
@@ -173,7 +173,7 @@ public static Java.Lang.Short ValueOf(short arg0)
             return SExecuteWithSignature<Java.Lang.Short>(LocalBridgeClazz, "valueOf", "(S)Ljava/lang/Short;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#toString(short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#toString(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -182,7 +182,7 @@ public static Java.Lang.String ToString(short arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(S)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#toUnsignedLong(short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#toUnsignedLong(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="long"/></returns>
@@ -191,7 +191,7 @@ public static long ToUnsignedLong(short arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "toUnsignedLong", "(S)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#parseShort(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#parseShort(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -202,7 +202,7 @@ public static short ParseShort(Java.Lang.String arg0, int arg1)
             return SExecute<short>(LocalBridgeClazz, "parseShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#parseShort(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#parseShort(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="short"/></returns>
@@ -212,7 +212,7 @@ public static short ParseShort(Java.Lang.String arg0)
             return SExecuteWithSignature<short>(LocalBridgeClazz, "parseShort", "(Ljava/lang/String;)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#reverseBytes(short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#reverseBytes(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="short"/></returns>
@@ -225,7 +225,7 @@ public static short ReverseBytes(short arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -234,7 +234,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Short.html#compareTo(java.lang.Short)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Short.html#compareTo(java.lang.Short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Short"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/StackTraceElement.cs b/src/net/Netdroid/Generated/Java/Lang/StackTraceElement.cs
index e3cc5bd7b..cdb8c0a60 100644
--- a/src/net/Netdroid/Generated/Java/Lang/StackTraceElement.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/StackTraceElement.cs
@@ -30,7 +30,7 @@ public partial class StackTraceElement
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -41,7 +41,7 @@ public StackTraceElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -71,61 +71,68 @@ public StackTraceElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#getClassLoaderName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#isNativeMethod()"/>
         /// </summary>
-        public Java.Lang.String ClassLoaderName
+        /// <returns><see cref="bool"/></returns>
+        public bool IsNativeMethod()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClassLoaderName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isNativeMethod", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#getClassName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#getLineNumber()"/>
         /// </summary>
-        public Java.Lang.String ClassName
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#getFileName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#getClassLoaderName()"/>
         /// </summary>
-        public Java.Lang.String FileName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClassLoaderName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFileName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getClassLoaderName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#getLineNumber()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#getClassName()"/>
         /// </summary>
-        public int LineNumber
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetClassName()
         {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#getMethodName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#getFileName()"/>
         /// </summary>
-        public Java.Lang.String MethodName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFileName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMethodName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFileName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#getModuleName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#getMethodName()"/>
         /// </summary>
-        public Java.Lang.String ModuleName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMethodName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getModuleName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMethodName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#getModuleVersion()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#getModuleName()"/>
         /// </summary>
-        public Java.Lang.String ModuleVersion
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetModuleName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getModuleVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getModuleName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackTraceElement.html#isNativeMethod()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackTraceElement.html#getModuleVersion()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsNativeMethod()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetModuleVersion()
         {
-            return IExecuteWithSignature<bool>("isNativeMethod", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getModuleVersion", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/StackWalker.cs b/src/net/Netdroid/Generated/Java/Lang/StackWalker.cs
index 6587d0652..d4d3d9ccc 100644
--- a/src/net/Netdroid/Generated/Java/Lang/StackWalker.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/StackWalker.cs
@@ -42,14 +42,15 @@ public partial class StackWalker
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.html#getInstance()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.html#getInstance()"/>
         /// </summary>
-        public static Java.Lang.StackWalker Instance
+        /// <returns><see cref="Java.Lang.StackWalker"/></returns>
+        public static Java.Lang.StackWalker GetInstance()
         {
-            get { return SExecuteWithSignature<Java.Lang.StackWalker>(LocalBridgeClazz, "getInstance", "()Ljava/lang/StackWalker;"); }
+            return SExecuteWithSignature<Java.Lang.StackWalker>(LocalBridgeClazz, "getInstance", "()Ljava/lang/StackWalker;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.html#getInstance(java.lang.StackWalker.Option)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.html#getInstance(java.lang.StackWalker.Option)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StackWalker.Option"/></param>
         /// <returns><see cref="Java.Lang.StackWalker"/></returns>
@@ -58,7 +59,7 @@ public static Java.Lang.StackWalker GetInstance(Java.Lang.StackWalker.Option arg
             return SExecuteWithSignature<Java.Lang.StackWalker>(LocalBridgeClazz, "getInstance", "(Ljava/lang/StackWalker$Option;)Ljava/lang/StackWalker;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.html#getInstance(java.util.Set,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.html#getInstance(java.util.Set,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -68,7 +69,7 @@ public static Java.Lang.StackWalker GetInstance(Java.Util.Set<Java.Lang.StackWal
             return SExecute<Java.Lang.StackWalker>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.html#getInstance(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.html#getInstance(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <returns><see cref="Java.Lang.StackWalker"/></returns>
@@ -81,30 +82,31 @@ public static Java.Lang.StackWalker GetInstance(Java.Util.Set<Java.Lang.StackWal
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.html#getCallerClass()"/> 
-        /// </summary>
-        public Java.Lang.Class CallerClass
-        {
-            get { return IExecuteWithSignature<Java.Lang.Class>("getCallerClass", "()Ljava/lang/Class;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.html#walk(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.html#walk(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperJava_Util_Stream_Stream_Java_Lang_StackWalker_StackFrame_"><see cref="Java.Util.Stream.Stream{Java.Lang.StackWalker.StackFrame}"/></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T Walk<T, Arg0objectSuperJava_Util_Stream_Stream_Java_Lang_StackWalker_StackFrame_, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperJava_Util_Stream_Stream_Java_Lang_StackWalker_StackFrame_, Arg0ExtendsT> arg0) where Arg0objectSuperJava_Util_Stream_Stream_Java_Lang_StackWalker_StackFrame_: Java.Util.Stream.Stream<Java.Lang.StackWalker.StackFrame> where Arg0ExtendsT: T
+        public T Walk<T, Arg0objectSuperJava_Util_Stream_Stream_Java_Lang_StackWalker_StackFrame_, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperJava_Util_Stream_Stream_Java_Lang_StackWalker_StackFrame_, Arg0ExtendsT> arg0) where Arg0objectSuperJava_Util_Stream_Stream_Java_Lang_StackWalker_StackFrame_ : Java.Util.Stream.Stream<Java.Lang.StackWalker.StackFrame> where Arg0ExtendsT : T
         {
             return IExecuteWithSignature<T>("walk", "(Ljava/util/function/Function;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.html#forEach(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.html#getCallerClass()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Class"/></returns>
+        public Java.Lang.Class GetCallerClass()
+        {
+            return IExecuteWithSignature<Java.Lang.Class>("getCallerClass", "()Ljava/lang/Class;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/StackWalker.html#forEach(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperJava_Lang_StackWalker_StackFrame"><see cref="Java.Lang.StackWalker.StackFrame"/></typeparam>
-        public void ForEach<Arg0objectSuperJava_Lang_StackWalker_StackFrame>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_StackWalker_StackFrame> arg0) where Arg0objectSuperJava_Lang_StackWalker_StackFrame: Java.Lang.StackWalker.StackFrame
+        public void ForEach<Arg0objectSuperJava_Lang_StackWalker_StackFrame>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_StackWalker_StackFrame> arg0) where Arg0objectSuperJava_Lang_StackWalker_StackFrame : Java.Lang.StackWalker.StackFrame
         {
             IExecuteWithSignature("forEach", "(Ljava/util/function/Consumer;)V", arg0);
         }
@@ -125,19 +127,19 @@ public partial class Option
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.Option.html#RETAIN_CLASS_REFERENCE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.Option.html#RETAIN_CLASS_REFERENCE"/>
             /// </summary>
             public static Java.Lang.StackWalker.Option RETAIN_CLASS_REFERENCE { get { if (!_RETAIN_CLASS_REFERENCEReady) { _RETAIN_CLASS_REFERENCEContent = SGetField<Java.Lang.StackWalker.Option>(LocalBridgeClazz, "RETAIN_CLASS_REFERENCE"); _RETAIN_CLASS_REFERENCEReady = true; } return _RETAIN_CLASS_REFERENCEContent; } }
             private static Java.Lang.StackWalker.Option _RETAIN_CLASS_REFERENCEContent = default;
             private static bool _RETAIN_CLASS_REFERENCEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.Option.html#SHOW_HIDDEN_FRAMES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.Option.html#SHOW_HIDDEN_FRAMES"/>
             /// </summary>
             public static Java.Lang.StackWalker.Option SHOW_HIDDEN_FRAMES { get { if (!_SHOW_HIDDEN_FRAMESReady) { _SHOW_HIDDEN_FRAMESContent = SGetField<Java.Lang.StackWalker.Option>(LocalBridgeClazz, "SHOW_HIDDEN_FRAMES"); _SHOW_HIDDEN_FRAMESReady = true; } return _SHOW_HIDDEN_FRAMESContent; } }
             private static Java.Lang.StackWalker.Option _SHOW_HIDDEN_FRAMESContent = default;
             private static bool _SHOW_HIDDEN_FRAMESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.Option.html#SHOW_REFLECT_FRAMES"/>
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.Option.html#SHOW_REFLECT_FRAMES"/>
             /// </summary>
             public static Java.Lang.StackWalker.Option SHOW_REFLECT_FRAMES { get { if (!_SHOW_REFLECT_FRAMESReady) { _SHOW_REFLECT_FRAMESContent = SGetField<Java.Lang.StackWalker.Option>(LocalBridgeClazz, "SHOW_REFLECT_FRAMES"); _SHOW_REFLECT_FRAMESReady = true; } return _SHOW_REFLECT_FRAMESContent; } }
             private static Java.Lang.StackWalker.Option _SHOW_REFLECT_FRAMESContent = default;
@@ -147,7 +149,7 @@ public partial class Option
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.Option.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.Option.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.StackWalker.Option"/></returns>
@@ -156,7 +158,7 @@ public static Java.Lang.StackWalker.Option ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Lang.StackWalker.Option>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/StackWalker$Option;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.Option.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.Option.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.StackWalker.Option"/></returns>
             public static Java.Lang.StackWalker.Option[] Values()
@@ -199,76 +201,84 @@ public partial class StackFrame
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#getByteCodeIndex()"/> 
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#isNativeMethod()"/>
             /// </summary>
-            public int ByteCodeIndex
+            /// <returns><see cref="bool"/></returns>
+            public bool IsNativeMethod()
             {
-                get { return IExecuteWithSignature<int>("getByteCodeIndex", "()I"); }
+                return IExecuteWithSignature<bool>("isNativeMethod", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#getClassName()"/> 
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#getByteCodeIndex()"/>
             /// </summary>
-            public Java.Lang.String ClassName
+            /// <returns><see cref="int"/></returns>
+            public int GetByteCodeIndex()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<int>("getByteCodeIndex", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#getDeclaringClass()"/> 
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#getLineNumber()"/>
             /// </summary>
-            public Java.Lang.Class DeclaringClass
+            /// <returns><see cref="int"/></returns>
+            public int GetLineNumber()
             {
-                get { return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;"); }
+                return IExecuteWithSignature<int>("getLineNumber", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#getDescriptor()"/> 
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#getDeclaringClass()"/>
             /// </summary>
-            public Java.Lang.String Descriptor
+            /// <returns><see cref="Java.Lang.Class"/></returns>
+            public Java.Lang.Class GetDeclaringClass()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getDescriptor", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.Class>("getDeclaringClass", "()Ljava/lang/Class;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#getFileName()"/> 
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#toStackTraceElement()"/>
             /// </summary>
-            public Java.Lang.String FileName
+            /// <returns><see cref="Java.Lang.StackTraceElement"/></returns>
+            public Java.Lang.StackTraceElement ToStackTraceElement()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getFileName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.StackTraceElement>("toStackTraceElement", "()Ljava/lang/StackTraceElement;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#getLineNumber()"/> 
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#getClassName()"/>
             /// </summary>
-            public int LineNumber
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetClassName()
             {
-                get { return IExecuteWithSignature<int>("getLineNumber", "()I"); }
+                return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#getMethodName()"/> 
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#getFileName()"/>
             /// </summary>
-            public Java.Lang.String MethodName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetFileName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getMethodName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getFileName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#getMethodType()"/> 
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#getMethodName()"/>
             /// </summary>
-            public Java.Lang.Invoke.MethodType MethodType
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetMethodName()
             {
-                get { return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("getMethodType", "()Ljava/lang/invoke/MethodType;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getMethodName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#isNativeMethod()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#getMethodType()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsNativeMethod()
+            /// <returns><see cref="Java.Lang.Invoke.MethodType"/></returns>
+            public Java.Lang.Invoke.MethodType GetMethodType()
             {
-                return IExecuteWithSignature<bool>("isNativeMethod", "()Z");
+                return IExecuteWithSignature<Java.Lang.Invoke.MethodType>("getMethodType", "()Ljava/lang/invoke/MethodType;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/StackWalker.StackFrame.html#toStackTraceElement()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/StackWalker.StackFrame.html#getDescriptor()"/>
             /// </summary>
-            /// <returns><see cref="Java.Lang.StackTraceElement"/></returns>
-            public Java.Lang.StackTraceElement ToStackTraceElement()
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetDescriptor()
             {
-                return IExecuteWithSignature<Java.Lang.StackTraceElement>("toStackTraceElement", "()Ljava/lang/StackTraceElement;");
+                return IExecuteWithSignature<Java.Lang.String>("getDescriptor", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/StrictMath.cs b/src/net/Netdroid/Generated/Java/Lang/StrictMath.cs
index 143269f8c..539b34493 100644
--- a/src/net/Netdroid/Generated/Java/Lang/StrictMath.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/StrictMath.cs
@@ -38,13 +38,13 @@ public partial class StrictMath
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#E"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#E"/>
         /// </summary>
         public static double E { get { if (!_EReady) { _EContent = SGetField<double>(LocalBridgeClazz, "E"); _EReady = true; } return _EContent; } }
         private static double _EContent = default;
         private static bool _EReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#PI"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#PI"/>
         /// </summary>
         public static double PI { get { if (!_PIReady) { _PIContent = SGetField<double>(LocalBridgeClazz, "PI"); _PIReady = true; } return _PIContent; } }
         private static double _PIContent = default;
@@ -54,7 +54,7 @@ public partial class StrictMath
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#abs(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#abs(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -63,7 +63,7 @@ public static double Abs(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "abs", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#cbrt(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#cbrt(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -72,7 +72,7 @@ public static double Cbrt(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "cbrt", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#ceil(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#ceil(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -81,7 +81,7 @@ public static double Ceil(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "ceil", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#copySign(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#copySign(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -91,7 +91,7 @@ public static double CopySign(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "copySign", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#exp(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#exp(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -100,7 +100,7 @@ public static double Exp(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "exp", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#floor(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#floor(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -109,7 +109,7 @@ public static double Floor(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "floor", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#fma(double,double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#fma(double,double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -120,7 +120,7 @@ public static double Fma(double arg0, double arg1, double arg2)
             return SExecute<double>(LocalBridgeClazz, "fma", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#hypot(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#hypot(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -130,7 +130,7 @@ public static double Hypot(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "hypot", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#max(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#max(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -140,7 +140,7 @@ public static double Max(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#min(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#min(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -150,7 +150,7 @@ public static double Min(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#nextAfter(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#nextAfter(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -160,7 +160,7 @@ public static double NextAfter(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "nextAfter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#nextDown(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#nextDown(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -169,7 +169,7 @@ public static double NextDown(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "nextDown", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#nextUp(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#nextUp(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -178,7 +178,7 @@ public static double NextUp(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "nextUp", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#pow(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#pow(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -188,7 +188,7 @@ public static double Pow(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "pow", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#random()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#random()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public static double Random()
@@ -196,7 +196,7 @@ public static double Random()
             return SExecuteWithSignature<double>(LocalBridgeClazz, "random", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#rint(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#rint(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -205,7 +205,7 @@ public static double Rint(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "rint", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#scalb(double,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#scalb(double,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -215,7 +215,7 @@ public static double Scalb(double arg0, int arg1)
             return SExecute<double>(LocalBridgeClazz, "scalb", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#signum(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#signum(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -224,25 +224,7 @@ public static double Signum(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "signum", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#toDegrees(double)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="double"/></param>
-        /// <returns><see cref="double"/></returns>
-        public static double ToDegrees(double arg0)
-        {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "toDegrees", "(D)D", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#toRadians(double)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="double"/></param>
-        /// <returns><see cref="double"/></returns>
-        public static double ToRadians(double arg0)
-        {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "toRadians", "(D)D", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#ulp(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#ulp(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -251,7 +233,7 @@ public static double Ulp(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "ulp", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#abs(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#abs(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -260,7 +242,7 @@ public static float Abs(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "abs", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#copySign(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#copySign(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -270,7 +252,7 @@ public static float CopySign(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "copySign", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#fma(float,float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#fma(float,float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -281,7 +263,7 @@ public static float Fma(float arg0, float arg1, float arg2)
             return SExecute<float>(LocalBridgeClazz, "fma", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#max(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#max(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -291,7 +273,7 @@ public static float Max(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#min(float,float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#min(float,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -301,7 +283,7 @@ public static float Min(float arg0, float arg1)
             return SExecute<float>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#nextAfter(float,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#nextAfter(float,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -311,7 +293,7 @@ public static float NextAfter(float arg0, double arg1)
             return SExecute<float>(LocalBridgeClazz, "nextAfter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#nextDown(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#nextDown(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -320,7 +302,7 @@ public static float NextDown(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "nextDown", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#nextUp(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#nextUp(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -329,7 +311,7 @@ public static float NextUp(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "nextUp", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#scalb(float,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#scalb(float,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -339,7 +321,7 @@ public static float Scalb(float arg0, int arg1)
             return SExecute<float>(LocalBridgeClazz, "scalb", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#signum(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#signum(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -348,7 +330,7 @@ public static float Signum(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "signum", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#ulp(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#ulp(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="float"/></returns>
@@ -357,7 +339,7 @@ public static float Ulp(float arg0)
             return SExecuteWithSignature<float>(LocalBridgeClazz, "ulp", "(F)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#abs(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#abs(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -366,16 +348,7 @@ public static int Abs(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "abs", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#absExact(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int AbsExact(int arg0)
-        {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "absExact", "(I)I", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#addExact(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#addExact(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -385,16 +358,7 @@ public static int AddExact(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "addExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#decrementExact(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int DecrementExact(int arg0)
-        {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "decrementExact", "(I)I", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#floorDiv(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#floorDiv(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -404,7 +368,7 @@ public static int FloorDiv(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "floorDiv", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#floorMod(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#floorMod(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -414,7 +378,7 @@ public static int FloorMod(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "floorMod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#floorMod(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#floorMod(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -424,7 +388,7 @@ public static int FloorMod(long arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "floorMod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#getExponent(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#getExponent(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="int"/></returns>
@@ -433,7 +397,7 @@ public static int GetExponent(double arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getExponent", "(D)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#getExponent(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#getExponent(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -442,16 +406,7 @@ public static int GetExponent(float arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getExponent", "(F)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#incrementExact(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int IncrementExact(int arg0)
-        {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "incrementExact", "(I)I", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#max(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#max(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -461,7 +416,7 @@ public static int Max(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#min(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#min(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -471,7 +426,7 @@ public static int Min(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#multiplyExact(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#multiplyExact(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -481,16 +436,7 @@ public static int MultiplyExact(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "multiplyExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#negateExact(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int NegateExact(int arg0)
-        {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "negateExact", "(I)I", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#round(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#round(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -499,7 +445,7 @@ public static int Round(float arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "round", "(F)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#subtractExact(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#subtractExact(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -509,7 +455,7 @@ public static int SubtractExact(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "subtractExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#toIntExact(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#toIntExact(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -518,7 +464,7 @@ public static int ToIntExact(long arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "toIntExact", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#abs(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#abs(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -527,16 +473,7 @@ public static long Abs(long arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "abs", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#absExact(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long AbsExact(long arg0)
-        {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "absExact", "(J)J", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#addExact(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#addExact(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -546,16 +483,7 @@ public static long AddExact(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "addExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#decrementExact(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long DecrementExact(long arg0)
-        {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "decrementExact", "(J)J", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#floorDiv(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#floorDiv(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -565,7 +493,7 @@ public static long FloorDiv(long arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "floorDiv", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#floorDiv(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#floorDiv(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -575,7 +503,7 @@ public static long FloorDiv(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "floorDiv", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#floorMod(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#floorMod(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -585,16 +513,7 @@ public static long FloorMod(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "floorMod", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#incrementExact(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long IncrementExact(long arg0)
-        {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "incrementExact", "(J)J", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#max(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#max(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -604,7 +523,7 @@ public static long Max(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "max", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#min(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#min(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -614,7 +533,7 @@ public static long Min(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "min", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#multiplyExact(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#multiplyExact(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -624,7 +543,7 @@ public static long MultiplyExact(long arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "multiplyExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#multiplyExact(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#multiplyExact(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -634,7 +553,7 @@ public static long MultiplyExact(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "multiplyExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#multiplyFull(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#multiplyFull(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -644,7 +563,7 @@ public static long MultiplyFull(int arg0, int arg1)
             return SExecute<long>(LocalBridgeClazz, "multiplyFull", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#multiplyHigh(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#multiplyHigh(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -654,16 +573,7 @@ public static long MultiplyHigh(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "multiplyHigh", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#negateExact(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long NegateExact(long arg0)
-        {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "negateExact", "(J)J", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#round(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#round(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="long"/></returns>
@@ -672,7 +582,7 @@ public static long Round(double arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "round", "(D)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#subtractExact(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#subtractExact(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -682,34 +592,34 @@ public static long SubtractExact(long arg0, long arg1)
             return SExecute<long>(LocalBridgeClazz, "subtractExact", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#acos(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#acos(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Acos(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "acos", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "acos", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#asin(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#asin(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Asin(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "asin", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "asin", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#atan(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#atan(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Atan(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "atan", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "atan", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#atan2(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#atan2(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -719,34 +629,34 @@ public static double Atan2(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "atan2", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#cos(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#cos(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Cos(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "cos", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "cos", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#cosh(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#cosh(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Cosh(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "cosh", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "cosh", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#expm1(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#expm1(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Expm1(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "expm1", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "expm1", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#IEEEremainder(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#IEEEremainder(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -756,76 +666,94 @@ public static double IEEEremainder(double arg0, double arg1)
             return SExecute<double>(LocalBridgeClazz, "IEEEremainder", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#log(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#log(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Log(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "log", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "log", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#log10(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#log10(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Log10(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "log10", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "log10", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#log1p(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#log1p(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Log1p(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "log1p", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "log1p", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#sin(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#sin(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Sin(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "sin", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "sin", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#sinh(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#sinh(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Sinh(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "sinh", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "sinh", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#sqrt(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#sqrt(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Sqrt(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "sqrt", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "sqrt", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#tan(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#tan(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Tan(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "tan", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "tan", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StrictMath.html#tanh(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#tanh(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
         public static double Tanh(double arg0)
         {
-            return SExecuteWithSignature<double>(LocalBridgeClazz, "tanh", "(D)D", arg0);
+            return SExecute<double>(LocalBridgeClazz, "tanh", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#toDegrees(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        /// <returns><see cref="double"/></returns>
+        public static double ToDegrees(double arg0)
+        {
+            return SExecute<double>(LocalBridgeClazz, "toDegrees", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/StrictMath.html#toRadians(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        /// <returns><see cref="double"/></returns>
+        public static double ToRadians(double arg0)
+        {
+            return SExecute<double>(LocalBridgeClazz, "toRadians", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Lang/String.cs b/src/net/Netdroid/Generated/Java/Lang/String.cs
index e2d4609f6..be1445cc7 100644
--- a/src/net/Netdroid/Generated/Java/Lang/String.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/String.cs
@@ -30,19 +30,19 @@ public partial class String : Java.Io.ISerializable, Java.Lang.IComparable<Java.
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(byte[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(byte[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public String(byte[] arg0, int arg1, int arg2, int arg3)
             : base(arg0, arg1, arg2, arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(byte[],int,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(byte[],int,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -54,7 +54,7 @@ public String(byte[] arg0, int arg1, int arg2, Java.Lang.String arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(byte[],int,int,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(byte[],int,int,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -65,7 +65,7 @@ public String(byte[] arg0, int arg1, int arg2, Java.Nio.Charset.Charset arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -75,17 +75,17 @@ public String(byte[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public String(byte[] arg0, int arg1)
             : base(arg0, arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(byte[],java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(byte[],java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -95,7 +95,7 @@ public String(byte[] arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(byte[],java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(byte[],java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -104,7 +104,7 @@ public String(byte[] arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public String(byte[] arg0)
@@ -112,7 +112,7 @@ public String(byte[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -122,7 +122,7 @@ public String(char[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public String(char[] arg0)
@@ -130,7 +130,7 @@ public String(char[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -140,7 +140,7 @@ public String(int[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public String(Java.Lang.String arg0)
@@ -148,7 +148,7 @@ public String(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(java.lang.StringBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(java.lang.StringBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuffer"/></param>
         public String(Java.Lang.StringBuffer arg0)
@@ -156,7 +156,7 @@ public String(Java.Lang.StringBuffer arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#%3Cinit%3E(java.lang.StringBuilder)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#%3Cinit%3E(java.lang.StringBuilder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuilder"/></param>
         public String(Java.Lang.StringBuilder arg0)
@@ -188,7 +188,7 @@ public String(Java.Lang.StringBuilder arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#copyValueOf(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#copyValueOf(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -199,7 +199,7 @@ public static Java.Lang.String CopyValueOf(char[] arg0, int arg1, int arg2)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "copyValueOf", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#copyValueOf(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#copyValueOf(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -208,7 +208,7 @@ public static Java.Lang.String CopyValueOf(char[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "copyValueOf", "([C)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#format(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#format(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -218,7 +218,7 @@ public static Java.Lang.String Format(Java.Lang.String arg0, params object[] arg
             if (arg1.Length == 0) return SExecute<Java.Lang.String>(LocalBridgeClazz, "format", arg0); else return SExecute<Java.Lang.String>(LocalBridgeClazz, "format", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#format(java.util.Locale,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#format(java.util.Locale,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -229,7 +229,7 @@ public static Java.Lang.String Format(Java.Util.Locale arg0, Java.Lang.String ar
             if (arg2.Length == 0) return SExecute<Java.Lang.String>(LocalBridgeClazz, "format", arg0, arg1); else return SExecute<Java.Lang.String>(LocalBridgeClazz, "format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#join(java.lang.CharSequence,java.lang.CharSequence[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#join(java.lang.CharSequence,java.lang.CharSequence[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
@@ -239,18 +239,18 @@ public static Java.Lang.String Join(Java.Lang.CharSequence arg0, params Java.Lan
             if (arg1.Length == 0) return SExecute<Java.Lang.String>(LocalBridgeClazz, "join", arg0); else return SExecute<Java.Lang.String>(LocalBridgeClazz, "join", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#join(java.lang.CharSequence,java.lang.Iterable)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#join(java.lang.CharSequence,java.lang.Iterable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Iterable"/></param>
         /// <typeparam name="Arg1ExtendsJava_Lang_CharSequence"><see cref="Java.Lang.CharSequence"/></typeparam>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public static Java.Lang.String Join<Arg1ExtendsJava_Lang_CharSequence>(Java.Lang.CharSequence arg0, Java.Lang.Iterable<Arg1ExtendsJava_Lang_CharSequence> arg1) where Arg1ExtendsJava_Lang_CharSequence: Java.Lang.CharSequence
+        public static Java.Lang.String Join<Arg1ExtendsJava_Lang_CharSequence>(Java.Lang.CharSequence arg0, Java.Lang.Iterable<Arg1ExtendsJava_Lang_CharSequence> arg1) where Arg1ExtendsJava_Lang_CharSequence : Java.Lang.CharSequence
         {
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "join", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -259,7 +259,7 @@ public static Java.Lang.String ValueOf(bool arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "valueOf", "(Z)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -268,7 +268,7 @@ public static Java.Lang.String ValueOf(char arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "valueOf", "(C)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -279,7 +279,7 @@ public static Java.Lang.String ValueOf(char[] arg0, int arg1, int arg2)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "valueOf", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -288,7 +288,7 @@ public static Java.Lang.String ValueOf(char[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "valueOf", "([C)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(double)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -297,7 +297,7 @@ public static Java.Lang.String ValueOf(double arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "valueOf", "(D)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(float)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -306,7 +306,7 @@ public static Java.Lang.String ValueOf(float arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "valueOf", "(F)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -315,7 +315,7 @@ public static Java.Lang.String ValueOf(int arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "valueOf", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -324,7 +324,7 @@ public static Java.Lang.String ValueOf(object arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "valueOf", "(Ljava/lang/Object;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#valueOf(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#valueOf(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -337,26 +337,7 @@ public static Java.Lang.String ValueOf(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#getBytes()"/> 
-        /// </summary>
-        public byte[] Bytes
-        {
-            get { return IExecuteWithSignatureArray<byte>("getBytes", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#transform(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="R"></typeparam>
-        /// <typeparam name="Arg0objectSuperJava_Lang_String"><see cref="Java.Lang.String"/></typeparam>
-        /// <typeparam name="Arg0ExtendsR"><typeparamref name="R"/></typeparam>
-        /// <returns><typeparamref name="R"/></returns>
-        public R Transform<R, Arg0objectSuperJava_Lang_String, Arg0ExtendsR>(Java.Util.Function.Function<Arg0objectSuperJava_Lang_String, Arg0ExtendsR> arg0) where Arg0objectSuperJava_Lang_String: Java.Lang.String where Arg0ExtendsR: R
-        {
-            return IExecuteWithSignature<R>("transform", "(Ljava/util/function/Function;)Ljava/lang/Object;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#contains(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#contains(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -365,7 +346,7 @@ public bool Contains(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/CharSequence;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#contentEquals(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#contentEquals(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -374,7 +355,7 @@ public bool ContentEquals(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<bool>("contentEquals", "(Ljava/lang/CharSequence;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#contentEquals(java.lang.StringBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#contentEquals(java.lang.StringBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuffer"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -383,7 +364,7 @@ public bool ContentEquals(Java.Lang.StringBuffer arg0)
             return IExecuteWithSignature<bool>("contentEquals", "(Ljava/lang/StringBuffer;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#endsWith(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#endsWith(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -392,7 +373,7 @@ public bool EndsWith(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("endsWith", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#equalsIgnoreCase(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#equalsIgnoreCase(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -401,7 +382,7 @@ public bool EqualsIgnoreCase(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("equalsIgnoreCase", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#isBlank()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#isBlank()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsBlank()
@@ -409,7 +390,7 @@ public bool IsBlank()
             return IExecuteWithSignature<bool>("isBlank", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -417,7 +398,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#matches(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#matches(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -426,7 +407,7 @@ public bool Matches(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("matches", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#regionMatches(boolean,int,java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#regionMatches(boolean,int,java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -439,7 +420,7 @@ public bool RegionMatches(bool arg0, int arg1, Java.Lang.String arg2, int arg3,
             return IExecute<bool>("regionMatches", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#regionMatches(int,java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#regionMatches(int,java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -451,7 +432,7 @@ public bool RegionMatches(int arg0, Java.Lang.String arg1, int arg2, int arg3)
             return IExecute<bool>("regionMatches", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#startsWith(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#startsWith(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -461,7 +442,7 @@ public bool StartsWith(Java.Lang.String arg0, int arg1)
             return IExecute<bool>("startsWith", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#startsWith(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#startsWith(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -470,7 +451,15 @@ public bool StartsWith(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("startsWith", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#getBytes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#getBytes()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetBytes()
+        {
+            return IExecuteWithSignatureArray<byte>("getBytes", "()[B");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#getBytes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -480,7 +469,7 @@ public byte[] GetBytes(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<byte>("getBytes", "(Ljava/lang/String;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#getBytes(java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#getBytes(java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Charset.Charset"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -489,7 +478,7 @@ public byte[] GetBytes(Java.Nio.Charset.Charset arg0)
             return IExecuteWithSignatureArray<byte>("getBytes", "(Ljava/nio/charset/Charset;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#charAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#charAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -498,7 +487,7 @@ public char CharAt(int arg0)
             return IExecuteWithSignature<char>("charAt", "(I)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#toCharArray()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#toCharArray()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char[] ToCharArray()
@@ -506,7 +495,7 @@ public char[] ToCharArray()
             return IExecuteWithSignatureArray<char>("toCharArray", "()[C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#codePointAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#codePointAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -515,7 +504,7 @@ public int CodePointAt(int arg0)
             return IExecuteWithSignature<int>("codePointAt", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#codePointBefore(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#codePointBefore(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -524,7 +513,7 @@ public int CodePointBefore(int arg0)
             return IExecuteWithSignature<int>("codePointBefore", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#codePointCount(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#codePointCount(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -534,7 +523,7 @@ public int CodePointCount(int arg0, int arg1)
             return IExecute<int>("codePointCount", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -543,7 +532,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#compareTo(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#compareTo(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -552,7 +541,7 @@ public int CompareTo(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#compareToIgnoreCase(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#compareToIgnoreCase(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -561,7 +550,7 @@ public int CompareToIgnoreCase(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("compareToIgnoreCase", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#indexOf(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#indexOf(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -571,7 +560,7 @@ public int IndexOf(int arg0, int arg1)
             return IExecute<int>("indexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#indexOf(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#indexOf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -580,7 +569,7 @@ public int IndexOf(int arg0)
             return IExecuteWithSignature<int>("indexOf", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#indexOf(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#indexOf(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -590,7 +579,7 @@ public int IndexOf(Java.Lang.String arg0, int arg1)
             return IExecute<int>("indexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#indexOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#indexOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -599,7 +588,7 @@ public int IndexOf(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("indexOf", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#lastIndexOf(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#lastIndexOf(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -609,7 +598,7 @@ public int LastIndexOf(int arg0, int arg1)
             return IExecute<int>("lastIndexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#lastIndexOf(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#lastIndexOf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -618,7 +607,7 @@ public int LastIndexOf(int arg0)
             return IExecuteWithSignature<int>("lastIndexOf", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#lastIndexOf(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#lastIndexOf(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -628,7 +617,7 @@ public int LastIndexOf(Java.Lang.String arg0, int arg1)
             return IExecute<int>("lastIndexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#lastIndexOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#lastIndexOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -637,7 +626,7 @@ public int LastIndexOf(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("lastIndexOf", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -645,7 +634,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#offsetByCodePoints(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#offsetByCodePoints(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -655,7 +644,7 @@ public int OffsetByCodePoints(int arg0, int arg1)
             return IExecute<int>("offsetByCodePoints", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#subSequence(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#subSequence(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -665,17 +654,7 @@ public Java.Lang.CharSequence SubSequence(int arg0, int arg1)
             return IExecute<Java.Lang.CharSequence>("subSequence", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#resolveConstantDesc(java.lang.invoke.MethodHandles.Lookup)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Invoke.MethodHandles.Lookup"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Lang.ReflectiveOperationException"/>
-        public object ResolveConstantDesc(Java.Lang.Invoke.MethodHandles.Lookup arg0)
-        {
-            return IExecuteWithSignature("resolveConstantDesc", "(Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/Object;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#concat(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#concat(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -684,25 +663,7 @@ public Java.Lang.String Concat(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("concat", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#formatted(java.lang.Object[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Formatted(params object[] arg0)
-        {
-            if (arg0.Length == 0) return IExecuteWithSignature<Java.Lang.String>("formatted", "([Ljava/lang/Object;)Ljava/lang/String;"); else return IExecuteWithSignature<Java.Lang.String>("formatted", "([Ljava/lang/Object;)Ljava/lang/String;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#indent(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Indent(int arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.String>("indent", "(I)Ljava/lang/String;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#repeat(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#repeat(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -711,7 +672,7 @@ public Java.Lang.String Repeat(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("repeat", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#replace(char,char)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#replace(char,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -721,7 +682,7 @@ public Java.Lang.String Replace(char arg0, char arg1)
             return IExecute<Java.Lang.String>("replace", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#replace(java.lang.CharSequence,java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#replace(java.lang.CharSequence,java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
@@ -731,7 +692,7 @@ public Java.Lang.String Replace(Java.Lang.CharSequence arg0, Java.Lang.CharSeque
             return IExecute<Java.Lang.String>("replace", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#replaceAll(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#replaceAll(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -741,7 +702,7 @@ public Java.Lang.String ReplaceAll(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<Java.Lang.String>("replaceAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#replaceFirst(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#replaceFirst(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -751,7 +712,7 @@ public Java.Lang.String ReplaceFirst(Java.Lang.String arg0, Java.Lang.String arg
             return IExecute<Java.Lang.String>("replaceFirst", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#strip()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#strip()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Strip()
@@ -759,15 +720,7 @@ public Java.Lang.String Strip()
             return IExecuteWithSignature<Java.Lang.String>("strip", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#stripIndent()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String StripIndent()
-        {
-            return IExecuteWithSignature<Java.Lang.String>("stripIndent", "()Ljava/lang/String;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#stripLeading()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#stripLeading()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String StripLeading()
@@ -775,7 +728,7 @@ public Java.Lang.String StripLeading()
             return IExecuteWithSignature<Java.Lang.String>("stripLeading", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#stripTrailing()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#stripTrailing()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String StripTrailing()
@@ -783,7 +736,7 @@ public Java.Lang.String StripTrailing()
             return IExecuteWithSignature<Java.Lang.String>("stripTrailing", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#substring(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#substring(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -793,7 +746,7 @@ public Java.Lang.String Substring(int arg0, int arg1)
             return IExecute<Java.Lang.String>("substring", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#substring(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#substring(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -802,7 +755,7 @@ public Java.Lang.String Substring(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("substring", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#toLowerCase()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#toLowerCase()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToLowerCase()
@@ -810,7 +763,7 @@ public Java.Lang.String ToLowerCase()
             return IExecuteWithSignature<Java.Lang.String>("toLowerCase", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#toLowerCase(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#toLowerCase(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -819,7 +772,7 @@ public Java.Lang.String ToLowerCase(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Lang.String>("toLowerCase", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#toUpperCase()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#toUpperCase()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToUpperCase()
@@ -827,7 +780,7 @@ public Java.Lang.String ToUpperCase()
             return IExecuteWithSignature<Java.Lang.String>("toUpperCase", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#toUpperCase(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#toUpperCase(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -836,15 +789,7 @@ public Java.Lang.String ToUpperCase(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Lang.String>("toUpperCase", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#translateEscapes()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String TranslateEscapes()
-        {
-            return IExecuteWithSignature<Java.Lang.String>("translateEscapes", "()Ljava/lang/String;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#trim()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#trim()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Trim()
@@ -852,7 +797,7 @@ public Java.Lang.String Trim()
             return IExecuteWithSignature<Java.Lang.String>("trim", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#split(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#split(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -862,7 +807,7 @@ public Java.Lang.String[] Split(Java.Lang.String arg0, int arg1)
             return IExecuteArray<Java.Lang.String>("split", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#split(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#split(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -871,15 +816,7 @@ public Java.Lang.String[] Split(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<Java.Lang.String>("split", "(Ljava/lang/String;)[Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#describeConstable()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<Java.Lang.String> DescribeConstable()
-        {
-            return IExecuteWithSignature<Java.Util.Optional<Java.Lang.String>>("describeConstable", "()Ljava/util/Optional;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#chars()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#chars()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Chars()
@@ -887,7 +824,7 @@ public Java.Util.Stream.IntStream Chars()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("chars", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#codePoints()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#codePoints()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream CodePoints()
@@ -895,7 +832,7 @@ public Java.Util.Stream.IntStream CodePoints()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("codePoints", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#lines()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#lines()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Lang.String> Lines()
@@ -903,7 +840,7 @@ public Java.Util.Stream.IntStream CodePoints()
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Lang.String>>("lines", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#intern()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#intern()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Intern()
@@ -911,19 +848,19 @@ public Java.Lang.String Intern()
             return IExecuteWithSignature<Java.Lang.String>("intern", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#getBytes(int,int,byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#getBytes(int,int,byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="byte"/></param>
         /// <param name="arg3"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void GetBytes(int arg0, int arg1, byte[] arg2, int arg3)
         {
             IExecute("getBytes", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/String.html#getChars(int,int,char[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/String.html#getChars(int,int,char[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Lang/StringBuffer.cs b/src/net/Netdroid/Generated/Java/Lang/StringBuffer.cs
index e89f2fa70..a8a3bad53 100644
--- a/src/net/Netdroid/Generated/Java/Lang/StringBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/StringBuffer.cs
@@ -30,7 +30,7 @@ public partial class StringBuffer : Java.Io.ISerializable, Java.Lang.IComparable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuffer.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuffer.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public StringBuffer(int arg0)
@@ -38,7 +38,7 @@ public StringBuffer(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuffer.html#%3Cinit%3E(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuffer.html#%3Cinit%3E(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         public StringBuffer(Java.Lang.CharSequence arg0)
@@ -46,7 +46,7 @@ public StringBuffer(Java.Lang.CharSequence arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuffer.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuffer.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public StringBuffer(Java.Lang.String arg0)
@@ -82,7 +82,7 @@ public StringBuffer(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuffer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuffer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -91,7 +91,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuffer.html#compareTo(java.lang.StringBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuffer.html#compareTo(java.lang.StringBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuffer"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/StringBuilder.cs b/src/net/Netdroid/Generated/Java/Lang/StringBuilder.cs
index ab25dd220..e4f2e8611 100644
--- a/src/net/Netdroid/Generated/Java/Lang/StringBuilder.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/StringBuilder.cs
@@ -30,7 +30,7 @@ public partial class StringBuilder : Java.Io.ISerializable, Java.Lang.IComparabl
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuilder.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuilder.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public StringBuilder(int arg0)
@@ -38,7 +38,7 @@ public StringBuilder(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuilder.html#%3Cinit%3E(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuilder.html#%3Cinit%3E(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         public StringBuilder(Java.Lang.CharSequence arg0)
@@ -46,7 +46,7 @@ public StringBuilder(Java.Lang.CharSequence arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuilder.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuilder.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public StringBuilder(Java.Lang.String arg0)
@@ -82,7 +82,7 @@ public StringBuilder(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuilder.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuilder.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -91,7 +91,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/StringBuilder.html#compareTo(java.lang.StringBuilder)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/StringBuilder.html#compareTo(java.lang.StringBuilder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuilder"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Lang/SuppressWarnings.cs b/src/net/Netdroid/Generated/Java/Lang/SuppressWarnings.cs
index 26b29208f..42494bb63 100644
--- a/src/net/Netdroid/Generated/Java/Lang/SuppressWarnings.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/SuppressWarnings.cs
@@ -64,7 +64,7 @@ public partial class SuppressWarnings : Java.Lang.ISuppressWarnings
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/SuppressWarnings.html#value()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/SuppressWarnings.html#value()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String[] Value()
diff --git a/src/net/Netdroid/Generated/Java/Lang/System.cs b/src/net/Netdroid/Generated/Java/Lang/System.cs
index bb7495583..4acc929eb 100644
--- a/src/net/Netdroid/Generated/Java/Lang/System.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/System.cs
@@ -38,19 +38,19 @@ public partial class System
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#in"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#in"/>
         /// </summary>
         public static Java.Io.InputStream inField { get { if (!_inFieldReady) { _inFieldContent = SGetField<Java.Io.InputStream>(LocalBridgeClazz, "in"); _inFieldReady = true; } return _inFieldContent; } }
         private static Java.Io.InputStream _inFieldContent = default;
         private static bool _inFieldReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#err"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#err"/>
         /// </summary>
         public static Java.Io.PrintStream err { get { if (!_errReady) { _errContent = SGetField<Java.Io.PrintStream>(LocalBridgeClazz, "err"); _errReady = true; } return _errContent; } }
         private static Java.Io.PrintStream _errContent = default;
         private static bool _errReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#out"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#out"/>
         /// </summary>
         public static Java.Io.PrintStream outField { get { if (!_outFieldReady) { _outFieldContent = SGetField<Java.Io.PrintStream>(LocalBridgeClazz, "out"); _outFieldReady = true; } return _outFieldContent; } }
         private static Java.Io.PrintStream _outFieldContent = default;
@@ -60,37 +60,23 @@ public partial class System
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#getenv()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#console()"/>
         /// </summary>
-        public static Java.Util.Map<Java.Lang.String, Java.Lang.String> Env
-        {
-            get { return SExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>(LocalBridgeClazz, "getenv", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#getProperties()"/> <see href="https://developer.android.com/reference/java.base/java/lang/System.html#setProperties(java.util.Properties)"/>
-        /// </summary>
-        public static Java.Util.Properties Properties
-        {
-            get { return SExecuteWithSignature<Java.Util.Properties>(LocalBridgeClazz, "getProperties", "()Ljava/util/Properties;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setProperties", "(Ljava/util/Properties;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#getSecurityManager()"/> <see href="https://developer.android.com/reference/java.base/java/lang/System.html#setSecurityManager(java.lang.SecurityManager)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public static Java.Lang.SecurityManager SecurityManager
+        /// <returns><see cref="Java.Io.Console"/></returns>
+        public static Java.Io.Console Console()
         {
-            get { return SExecuteWithSignature<Java.Lang.SecurityManager>(LocalBridgeClazz, "getSecurityManager", "()Ljava/lang/SecurityManager;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setSecurityManager", "(Ljava/lang/SecurityManager;)V", value); }
+            return SExecuteWithSignature<Java.Io.Console>(LocalBridgeClazz, "console", "()Ljava/io/Console;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#console()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#getSecurityManager()"/>
         /// </summary>
-        /// <returns><see cref="Java.Io.Console"/></returns>
-        public static Java.Io.Console Console()
+        /// <returns><see cref="Java.Lang.SecurityManager"/></returns>
+        public static Java.Lang.SecurityManager GetSecurityManager()
         {
-            return SExecuteWithSignature<Java.Io.Console>(LocalBridgeClazz, "console", "()Ljava/io/Console;");
+            return SExecuteWithSignature<Java.Lang.SecurityManager>(LocalBridgeClazz, "getSecurityManager", "()Ljava/lang/SecurityManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#clearProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#clearProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -99,7 +85,7 @@ public static Java.Lang.String ClearProperty(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "clearProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#getenv(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#getenv(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -108,7 +94,7 @@ public static Java.Lang.String Getenv(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getenv", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#getProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#getProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -118,7 +104,7 @@ public static Java.Lang.String GetProperty(Java.Lang.String arg0, Java.Lang.Stri
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "getProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -127,7 +113,7 @@ public static Java.Lang.String GetProperty(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#lineSeparator()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#lineSeparator()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public static Java.Lang.String LineSeparator()
@@ -135,7 +121,7 @@ public static Java.Lang.String LineSeparator()
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "lineSeparator", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#setProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#setProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -145,35 +131,32 @@ public static Java.Lang.String SetProperty(Java.Lang.String arg0, Java.Lang.Stri
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "setProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#getLogger(java.lang.String,java.util.ResourceBundle)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#inheritedChannel()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Util.ResourceBundle"/></param>
-        /// <returns><see cref="Java.Lang.System.Logger"/></returns>
-        public static Java.Lang.System.Logger GetLogger(Java.Lang.String arg0, Java.Util.ResourceBundle arg1)
+        /// <returns><see cref="Java.Nio.Channels.Channel"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public static Java.Nio.Channels.Channel InheritedChannel()
         {
-            return SExecute<Java.Lang.System.Logger>(LocalBridgeClazz, "getLogger", arg0, arg1);
+            return SExecuteWithSignature<Java.Nio.Channels.Channel>(LocalBridgeClazz, "inheritedChannel", "()Ljava/nio/channels/Channel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#getLogger(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#getenv()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.System.Logger"/></returns>
-        public static Java.Lang.System.Logger GetLogger(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public static Java.Util.Map<Java.Lang.String, Java.Lang.String> Getenv()
         {
-            return SExecuteWithSignature<Java.Lang.System.Logger>(LocalBridgeClazz, "getLogger", "(Ljava/lang/String;)Ljava/lang/System$Logger;", arg0);
+            return SExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.String>>(LocalBridgeClazz, "getenv", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#inheritedChannel()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#getProperties()"/>
         /// </summary>
-        /// <returns><see cref="Java.Nio.Channels.Channel"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.Channels.Channel InheritedChannel()
+        /// <returns><see cref="Java.Util.Properties"/></returns>
+        public static Java.Util.Properties GetProperties()
         {
-            return SExecuteWithSignature<Java.Nio.Channels.Channel>(LocalBridgeClazz, "inheritedChannel", "()Ljava/nio/channels/Channel;");
+            return SExecuteWithSignature<Java.Util.Properties>(LocalBridgeClazz, "getProperties", "()Ljava/util/Properties;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#identityHashCode(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#identityHashCode(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -182,7 +165,7 @@ public static int IdentityHashCode(object arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "identityHashCode", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#mapLibraryName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#mapLibraryName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -191,7 +174,7 @@ public static Java.Lang.String MapLibraryName(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "mapLibraryName", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#currentTimeMillis()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#currentTimeMillis()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public static long CurrentTimeMillis()
@@ -199,7 +182,7 @@ public static long CurrentTimeMillis()
             return SExecuteWithSignature<long>(LocalBridgeClazz, "currentTimeMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#nanoTime()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#nanoTime()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public static long NanoTime()
@@ -207,7 +190,7 @@ public static long NanoTime()
             return SExecuteWithSignature<long>(LocalBridgeClazz, "nanoTime", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#arraycopy(java.lang.Object,int,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#arraycopy(java.lang.Object,int,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -219,7 +202,7 @@ public static void Arraycopy(object arg0, int arg1, object arg2, int arg3, int a
             SExecute(LocalBridgeClazz, "arraycopy", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#exit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#exit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public static void Exit(int arg0)
@@ -227,14 +210,14 @@ public static void Exit(int arg0)
             SExecuteWithSignature(LocalBridgeClazz, "exit", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#gc()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#gc()"/>
         /// </summary>
         public static void Gc()
         {
             SExecuteWithSignature(LocalBridgeClazz, "gc", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#load(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#load(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public static void Load(Java.Lang.String arg0)
@@ -242,7 +225,7 @@ public static void Load(Java.Lang.String arg0)
             SExecuteWithSignature(LocalBridgeClazz, "load", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#loadLibrary(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#loadLibrary(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public static void LoadLibrary(Java.Lang.String arg0)
@@ -250,14 +233,14 @@ public static void LoadLibrary(Java.Lang.String arg0)
             SExecuteWithSignature(LocalBridgeClazz, "loadLibrary", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#runFinalization()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#runFinalization()"/>
         /// </summary>
         public static void RunFinalization()
         {
             SExecuteWithSignature(LocalBridgeClazz, "runFinalization", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#setErr(java.io.PrintStream)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#setErr(java.io.PrintStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PrintStream"/></param>
         public static void SetErr(Java.Io.PrintStream arg0)
@@ -265,7 +248,7 @@ public static void SetErr(Java.Io.PrintStream arg0)
             SExecuteWithSignature(LocalBridgeClazz, "setErr", "(Ljava/io/PrintStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#setIn(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#setIn(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public static void SetIn(Java.Io.InputStream arg0)
@@ -273,13 +256,29 @@ public static void SetIn(Java.Io.InputStream arg0)
             SExecuteWithSignature(LocalBridgeClazz, "setIn", "(Ljava/io/InputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/System.html#setOut(java.io.PrintStream)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#setOut(java.io.PrintStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PrintStream"/></param>
         public static void SetOut(Java.Io.PrintStream arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "setOut", "(Ljava/io/PrintStream;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#setProperties(java.util.Properties)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Properties"/></param>
+        public static void SetProperties(Java.Util.Properties arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setProperties", "(Ljava/util/Properties;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/System.html#setSecurityManager(java.lang.SecurityManager)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.SecurityManager"/></param>
+        public static void SetSecurityManager(Java.Lang.SecurityManager arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setSecurityManager", "(Ljava/lang/SecurityManager;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Lang/Thread.cs b/src/net/Netdroid/Generated/Java/Lang/Thread.cs
index bca75a58c..588cc62ab 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Thread.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Thread.cs
@@ -30,7 +30,7 @@ public partial class Thread
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#%3Cinit%3E(java.lang.Runnable,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#%3Cinit%3E(java.lang.Runnable,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public Thread(Java.Lang.Runnable arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#%3Cinit%3E(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#%3Cinit%3E(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         public Thread(Java.Lang.Runnable arg0)
@@ -47,7 +47,7 @@ public Thread(Java.Lang.Runnable arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public Thread(Java.Lang.String arg0)
@@ -55,7 +55,7 @@ public Thread(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String,long,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String,long,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -67,7 +67,7 @@ public Thread(Java.Lang.ThreadGroup arg0, Java.Lang.Runnable arg1, Java.Lang.Str
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -78,7 +78,7 @@ public Thread(Java.Lang.ThreadGroup arg0, Java.Lang.Runnable arg1, Java.Lang.Str
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -88,7 +88,7 @@ public Thread(Java.Lang.ThreadGroup arg0, Java.Lang.Runnable arg1, Java.Lang.Str
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -97,7 +97,7 @@ public Thread(Java.Lang.ThreadGroup arg0, Java.Lang.Runnable arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -114,19 +114,19 @@ public Thread(Java.Lang.ThreadGroup arg0, Java.Lang.String arg1)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#MAX_PRIORITY"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#MAX_PRIORITY"/>
         /// </summary>
         public static int MAX_PRIORITY { get { if (!_MAX_PRIORITYReady) { _MAX_PRIORITYContent = SGetField<int>(LocalBridgeClazz, "MAX_PRIORITY"); _MAX_PRIORITYReady = true; } return _MAX_PRIORITYContent; } }
         private static int _MAX_PRIORITYContent = default;
         private static bool _MAX_PRIORITYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#MIN_PRIORITY"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#MIN_PRIORITY"/>
         /// </summary>
         public static int MIN_PRIORITY { get { if (!_MIN_PRIORITYReady) { _MIN_PRIORITYContent = SGetField<int>(LocalBridgeClazz, "MIN_PRIORITY"); _MIN_PRIORITYReady = true; } return _MIN_PRIORITYContent; } }
         private static int _MIN_PRIORITYContent = default;
         private static bool _MIN_PRIORITYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#NORM_PRIORITY"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#NORM_PRIORITY"/>
         /// </summary>
         public static int NORM_PRIORITY { get { if (!_NORM_PRIORITYReady) { _NORM_PRIORITYContent = SGetField<int>(LocalBridgeClazz, "NORM_PRIORITY"); _NORM_PRIORITYReady = true; } return _NORM_PRIORITYContent; } }
         private static int _NORM_PRIORITYContent = default;
@@ -136,14 +136,7 @@ public Thread(Java.Lang.ThreadGroup arg0, Java.Lang.String arg1)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#getAllStackTraces()"/> 
-        /// </summary>
-        public static Java.Util.Map<Java.Lang.Thread, Java.Lang.StackTraceElement[]> AllStackTraces
-        {
-            get { return SExecuteWithSignature<Java.Util.Map<Java.Lang.Thread, Java.Lang.StackTraceElement[]>>(LocalBridgeClazz, "getAllStackTraces", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#interrupted()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#interrupted()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public static bool Interrupted()
@@ -151,7 +144,7 @@ public static bool Interrupted()
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "interrupted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#activeCount()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#activeCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public static int ActiveCount()
@@ -159,7 +152,7 @@ public static int ActiveCount()
             return SExecuteWithSignature<int>(LocalBridgeClazz, "activeCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#enumerate(java.lang.Thread[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#enumerate(java.lang.Thread[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <returns><see cref="int"/></returns>
@@ -168,7 +161,15 @@ public static int Enumerate(Java.Lang.Thread[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "enumerate", "([Ljava/lang/Thread;)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#holdsLock(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#getAllStackTraces()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public static Java.Util.Map<Java.Lang.Thread, Java.Lang.StackTraceElement[]> GetAllStackTraces()
+        {
+            return SExecuteWithSignature<Java.Util.Map<Java.Lang.Thread, Java.Lang.StackTraceElement[]>>(LocalBridgeClazz, "getAllStackTraces", "()Ljava/util/Map;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#holdsLock(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -177,7 +178,7 @@ public static bool HoldsLock(object arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "holdsLock", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#currentThread()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#currentThread()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Thread"/></returns>
         public static Java.Lang.Thread CurrentThread()
@@ -185,37 +186,37 @@ public static Java.Lang.Thread CurrentThread()
             return SExecuteWithSignature<Java.Lang.Thread>(LocalBridgeClazz, "currentThread", "()Ljava/lang/Thread;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#sleep(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#sleep(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
         public static void Sleep(long arg0)
         {
-            SExecuteWithSignature(LocalBridgeClazz, "sleep", "(J)V", arg0);
+            SExecute(LocalBridgeClazz, "sleep", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#yield()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#yield()"/>
         /// </summary>
         public static void Yield()
         {
-            SExecuteWithSignature(LocalBridgeClazz, "yield", "()V");
+            SExecute(LocalBridgeClazz, "yield");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#dumpStack()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#dumpStack()"/>
         /// </summary>
         public static void DumpStack()
         {
             SExecuteWithSignature(LocalBridgeClazz, "dumpStack", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#onSpinWait()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#onSpinWait()"/>
         /// </summary>
         public static void OnSpinWait()
         {
             SExecuteWithSignature(LocalBridgeClazz, "onSpinWait", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#sleep(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#sleep(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -229,80 +230,55 @@ public static void Sleep(long arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#getContextClassLoader()"/> <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#setContextClassLoader(java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#isInterrupted()"/>
         /// </summary>
-        public Java.Lang.ClassLoader ContextClassLoader
-        {
-            get { return IExecuteWithSignature<Java.Lang.ClassLoader>("getContextClassLoader", "()Ljava/lang/ClassLoader;"); } set { IExecuteWithSignature("setContextClassLoader", "(Ljava/lang/ClassLoader;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#getState()"/> 
-        /// </summary>
-        public Java.Lang.Thread.State GetState
-        {
-            get { return IExecuteWithSignature<Java.Lang.Thread.State>("getState", "()Ljava/lang/Thread$State;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#getId()"/> 
-        /// </summary>
-        public long Id
-        {
-            get { return IExecuteWithSignature<long>("getId", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#getName()"/> <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#setName(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInterrupted()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isInterrupted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#getPriority()"/> <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#setPriority(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#isDaemon()"/>
         /// </summary>
-        public int Priority
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDaemon()
         {
-            get { return IExecuteWithSignature<int>("getPriority", "()I"); } set { IExecuteWithSignature("setPriority", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isDaemon", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#getStackTrace()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#getPriority()"/>
         /// </summary>
-        public Java.Lang.StackTraceElement[] StackTrace
+        /// <returns><see cref="int"/></returns>
+        public int GetPriority()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.StackTraceElement>("getStackTrace", "()[Ljava/lang/StackTraceElement;"); }
+            return IExecuteWithSignature<int>("getPriority", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#getThreadGroup()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#getName()"/>
         /// </summary>
-        public Java.Lang.ThreadGroup ThreadGroup
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.ThreadGroup>("getThreadGroup", "()Ljava/lang/ThreadGroup;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#isInterrupted()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#getThreadGroup()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInterrupted()
+        /// <returns><see cref="Java.Lang.ThreadGroup"/></returns>
+        public Java.Lang.ThreadGroup GetThreadGroup()
         {
-            return IExecuteWithSignature<bool>("isInterrupted", "()Z");
+            return IExecuteWithSignature<Java.Lang.ThreadGroup>("getThreadGroup", "()Ljava/lang/ThreadGroup;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#isAlive()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#isAlive()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAlive()
         {
-            return IExecuteWithSignature<bool>("isAlive", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#isDaemon()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDaemon()
-        {
-            return IExecuteWithSignature<bool>("isDaemon", "()Z");
+            return IExecute<bool>("isAlive");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#join(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#join(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -312,24 +288,31 @@ public void Join(long arg0, int arg1)
             IExecute("join", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#join(long)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#join(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
         public void Join(long arg0)
         {
-            IExecuteWithSignature("join", "(J)V", arg0);
+            IExecute("join", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#setName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setName", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#checkAccess()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#checkAccess()"/>
         /// </summary>
-        [System.Obsolete()]
         public void CheckAccess()
         {
             IExecuteWithSignature("checkAccess", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#join()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#join()"/>
         /// </summary>
         /// <exception cref="Java.Lang.InterruptedException"/>
         public void Join()
@@ -337,15 +320,15 @@ public void Join()
             IExecuteWithSignature("join", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#resume()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#resume()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Resume()
         {
             IExecuteWithSignature("resume", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#setDaemon(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#setDaemon(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetDaemon(bool arg0)
@@ -353,51 +336,99 @@ public void SetDaemon(bool arg0)
             IExecuteWithSignature("setDaemon", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#stop()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#setPriority(int)"/>
         /// </summary>
-        [System.Obsolete()]
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPriority(int arg0)
+        {
+            IExecuteWithSignature("setPriority", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#stop()"/>
+        /// </summary>
+        [global::System.Obsolete()]
         public void Stop()
         {
             IExecuteWithSignature("stop", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#suspend()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#suspend()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Suspend()
         {
             IExecuteWithSignature("suspend", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#countStackFrames()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#getContextClassLoader()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public Java.Lang.ClassLoader GetContextClassLoader()
+        {
+            return IExecuteWithSignature<Java.Lang.ClassLoader>("getContextClassLoader", "()Ljava/lang/ClassLoader;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#getStackTrace()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.StackTraceElement"/></returns>
+        public Java.Lang.StackTraceElement[] GetStackTrace()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.StackTraceElement>("getStackTrace", "()[Ljava/lang/StackTraceElement;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#getState()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Thread.State"/></returns>
+        public Java.Lang.Thread.State GetState()
+        {
+            return IExecuteWithSignature<Java.Lang.Thread.State>("getState", "()Ljava/lang/Thread$State;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetId()
+        {
+            return IExecuteWithSignature<long>("getId", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#countStackFrames()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int CountStackFrames()
         {
-            return IExecuteWithSignature<int>("countStackFrames", "()I");
+            return IExecute<int>("countStackFrames");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#start()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#start()"/>
         /// </summary>
         public void Start()
         {
-            IExecuteWithSignature("start", "()V");
+            IExecute("start");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#interrupt()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#interrupt()"/>
         /// </summary>
         public void Interrupt()
         {
             IExecuteWithSignature("interrupt", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#run()"/>
         /// </summary>
         public void Run()
         {
             IExecuteWithSignature("run", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/Thread.html#setContextClassLoader(java.lang.ClassLoader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
+        public void SetContextClassLoader(Java.Lang.ClassLoader arg0)
+        {
+            IExecuteWithSignature("setContextClassLoader", "(Ljava/lang/ClassLoader;)V", arg0);
+        }
 
         #endregion
 
@@ -415,37 +446,37 @@ public partial class State
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html#BLOCKED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html#BLOCKED"/>
             /// </summary>
             public static Java.Lang.Thread.State BLOCKED { get { if (!_BLOCKEDReady) { _BLOCKEDContent = SGetField<Java.Lang.Thread.State>(LocalBridgeClazz, "BLOCKED"); _BLOCKEDReady = true; } return _BLOCKEDContent; } }
             private static Java.Lang.Thread.State _BLOCKEDContent = default;
             private static bool _BLOCKEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html#NEW"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html#NEW"/>
             /// </summary>
             public static Java.Lang.Thread.State NEW { get { if (!_NEWReady) { _NEWContent = SGetField<Java.Lang.Thread.State>(LocalBridgeClazz, "NEW"); _NEWReady = true; } return _NEWContent; } }
             private static Java.Lang.Thread.State _NEWContent = default;
             private static bool _NEWReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html#RUNNABLE"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html#RUNNABLE"/>
             /// </summary>
             public static Java.Lang.Thread.State RUNNABLE { get { if (!_RUNNABLEReady) { _RUNNABLEContent = SGetField<Java.Lang.Thread.State>(LocalBridgeClazz, "RUNNABLE"); _RUNNABLEReady = true; } return _RUNNABLEContent; } }
             private static Java.Lang.Thread.State _RUNNABLEContent = default;
             private static bool _RUNNABLEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html#TERMINATED"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html#TERMINATED"/>
             /// </summary>
             public static Java.Lang.Thread.State TERMINATED { get { if (!_TERMINATEDReady) { _TERMINATEDContent = SGetField<Java.Lang.Thread.State>(LocalBridgeClazz, "TERMINATED"); _TERMINATEDReady = true; } return _TERMINATEDContent; } }
             private static Java.Lang.Thread.State _TERMINATEDContent = default;
             private static bool _TERMINATEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html#TIMED_WAITING"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html#TIMED_WAITING"/>
             /// </summary>
             public static Java.Lang.Thread.State TIMED_WAITING { get { if (!_TIMED_WAITINGReady) { _TIMED_WAITINGContent = SGetField<Java.Lang.Thread.State>(LocalBridgeClazz, "TIMED_WAITING"); _TIMED_WAITINGReady = true; } return _TIMED_WAITINGContent; } }
             private static Java.Lang.Thread.State _TIMED_WAITINGContent = default;
             private static bool _TIMED_WAITINGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html#WAITING"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html#WAITING"/>
             /// </summary>
             public static Java.Lang.Thread.State WAITING { get { if (!_WAITINGReady) { _WAITINGContent = SGetField<Java.Lang.Thread.State>(LocalBridgeClazz, "WAITING"); _WAITINGReady = true; } return _WAITINGContent; } }
             private static Java.Lang.Thread.State _WAITINGContent = default;
@@ -455,7 +486,7 @@ public partial class State
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Lang.Thread.State"/></returns>
@@ -464,7 +495,7 @@ public static Java.Lang.Thread.State ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Lang.Thread.State>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/lang/Thread$State;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/lang/Thread.State.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/lang/Thread.State.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.Thread.State"/></returns>
             public static Java.Lang.Thread.State[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Lang/ThreadGroup.cs b/src/net/Netdroid/Generated/Java/Lang/ThreadGroup.cs
index 921744e5c..22cb40eee 100644
--- a/src/net/Netdroid/Generated/Java/Lang/ThreadGroup.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/ThreadGroup.cs
@@ -30,7 +30,7 @@ public partial class ThreadGroup
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public ThreadGroup(Java.Lang.String arg0)
@@ -38,7 +38,7 @@ public ThreadGroup(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#%3Cinit%3E(java.lang.ThreadGroup,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -63,112 +63,119 @@ public ThreadGroup(Java.Lang.ThreadGroup arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#getMaxPriority()"/> <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#setMaxPriority(int)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#allowThreadSuspension(boolean)"/>
         /// </summary>
-        public int MaxPriority
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <returns><see cref="bool"/></returns>
+        [global::System.Obsolete()]
+        public bool AllowThreadSuspension(bool arg0)
         {
-            get { return IExecuteWithSignature<int>("getMaxPriority", "()I"); } set { IExecuteWithSignature("setMaxPriority", "(I)V", value); }
+            return IExecute<bool>("allowThreadSuspension", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#isDaemon()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDaemon()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isDaemon", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#parentOf(java.lang.ThreadGroup)"/>
         /// </summary>
-        public Java.Lang.ThreadGroup Parent
+        /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool ParentOf(Java.Lang.ThreadGroup arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.ThreadGroup>("getParent", "()Ljava/lang/ThreadGroup;"); }
+            return IExecuteWithSignature<bool>("parentOf", "(Ljava/lang/ThreadGroup;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#allowThreadSuspension(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#getMaxPriority()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool AllowThreadSuspension(bool arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxPriority()
         {
-            return IExecuteWithSignature<bool>("allowThreadSuspension", "(Z)Z", arg0);
+            return IExecuteWithSignature<int>("getMaxPriority", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#isDaemon()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
-        public bool IsDaemon()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isDaemon", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#parentOf(java.lang.ThreadGroup)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#getParent()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool ParentOf(Java.Lang.ThreadGroup arg0)
+        /// <returns><see cref="Java.Lang.ThreadGroup"/></returns>
+        public Java.Lang.ThreadGroup GetParent()
         {
-            return IExecuteWithSignature<bool>("parentOf", "(Ljava/lang/ThreadGroup;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.ThreadGroup>("getParent", "()Ljava/lang/ThreadGroup;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#checkAccess()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#checkAccess()"/>
         /// </summary>
-        [System.Obsolete()]
         public void CheckAccess()
         {
             IExecuteWithSignature("checkAccess", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#destroy()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#destroy()"/>
         /// </summary>
-        [System.Obsolete()]
         public void Destroy()
         {
             IExecuteWithSignature("destroy", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#interrupt()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#interrupt()"/>
         /// </summary>
         public void Interrupt()
         {
             IExecuteWithSignature("interrupt", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#resume()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#resume()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Resume()
         {
             IExecuteWithSignature("resume", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#setDaemon(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#setDaemon(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
-        [System.Obsolete()]
         public void SetDaemon(bool arg0)
         {
             IExecuteWithSignature("setDaemon", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#stop()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#setMaxPriority(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxPriority(int arg0)
+        {
+            IExecuteWithSignature("setMaxPriority", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#stop()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Stop()
         {
             IExecuteWithSignature("stop", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#suspend()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#suspend()"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Suspend()
         {
             IExecuteWithSignature("suspend", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#activeCount()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#activeCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ActiveCount()
@@ -176,7 +183,7 @@ public int ActiveCount()
             return IExecuteWithSignature<int>("activeCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#activeGroupCount()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#activeGroupCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ActiveGroupCount()
@@ -184,7 +191,7 @@ public int ActiveGroupCount()
             return IExecuteWithSignature<int>("activeGroupCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#enumerate(java.lang.Thread[],boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#enumerate(java.lang.Thread[],boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -194,7 +201,7 @@ public int Enumerate(Java.Lang.Thread[] arg0, bool arg1)
             return IExecute<int>("enumerate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#enumerate(java.lang.Thread[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#enumerate(java.lang.Thread[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <returns><see cref="int"/></returns>
@@ -203,7 +210,7 @@ public int Enumerate(Java.Lang.Thread[] arg0)
             return IExecuteWithSignature<int>("enumerate", "([Ljava/lang/Thread;)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#enumerate(java.lang.ThreadGroup[],boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#enumerate(java.lang.ThreadGroup[],boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -213,7 +220,7 @@ public int Enumerate(Java.Lang.ThreadGroup[] arg0, bool arg1)
             return IExecute<int>("enumerate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#enumerate(java.lang.ThreadGroup[])"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#enumerate(java.lang.ThreadGroup[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ThreadGroup"/></param>
         /// <returns><see cref="int"/></returns>
@@ -222,23 +229,22 @@ public int Enumerate(Java.Lang.ThreadGroup[] arg0)
             return IExecuteWithSignature<int>("enumerate", "([Ljava/lang/ThreadGroup;)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#isDestroyed()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#isDestroyed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
         public bool IsDestroyed()
         {
-            return IExecuteWithSignature<bool>("isDestroyed", "()Z");
+            return IExecute<bool>("isDestroyed");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#list()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#list()"/>
         /// </summary>
         public void List()
         {
             IExecuteWithSignature("list", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadGroup.html#uncaughtException(java.lang.Thread,java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadGroup.html#uncaughtException(java.lang.Thread,java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Throwable"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Lang/ThreadLocal.cs b/src/net/Netdroid/Generated/Java/Lang/ThreadLocal.cs
index 482a15bfa..be188cd38 100644
--- a/src/net/Netdroid/Generated/Java/Lang/ThreadLocal.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/ThreadLocal.cs
@@ -42,7 +42,7 @@ public partial class ThreadLocal
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html#withInitial(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html#withInitial(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <returns><see cref="Java.Lang.ThreadLocal"/></returns>
@@ -55,7 +55,7 @@ public static Java.Lang.ThreadLocal WithInitial(Java.Util.Function.Supplier arg0
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Get()
@@ -63,14 +63,14 @@ public object Get()
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html#remove()"/>
         /// </summary>
         public void Remove()
         {
             IExecuteWithSignature("remove", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html#set(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html#set(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Set(object arg0)
@@ -109,13 +109,13 @@ public partial class ThreadLocal<T>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html#withInitial(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html#withInitial(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="S"></typeparam>
         /// <typeparam name="Arg0ExtendsS"><typeparamref name="S"/></typeparam>
         /// <returns><see cref="Java.Lang.ThreadLocal"/></returns>
-        public static Java.Lang.ThreadLocal<S> WithInitial<S, Arg0ExtendsS>(Java.Util.Function.Supplier<Arg0ExtendsS> arg0) where Arg0ExtendsS: S
+        public static Java.Lang.ThreadLocal<S> WithInitial<S, Arg0ExtendsS>(Java.Util.Function.Supplier<Arg0ExtendsS> arg0) where Arg0ExtendsS : S
         {
             return SExecuteWithSignature<Java.Lang.ThreadLocal<S>>(LocalBridgeClazz, "withInitial", "(Ljava/util/function/Supplier;)Ljava/lang/ThreadLocal;", arg0);
         }
@@ -124,7 +124,7 @@ public static Java.Lang.ThreadLocal<S> WithInitial<S, Arg0ExtendsS>(Java.Util.Fu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public T Get()
@@ -132,14 +132,14 @@ public T Get()
             return IExecuteWithSignature<T>("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html#remove()"/>
         /// </summary>
         public void Remove()
         {
             IExecuteWithSignature("remove", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/ThreadLocal.html#set(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/lang/ThreadLocal.html#set(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         public void Set(T arg0)
diff --git a/src/net/Netdroid/Generated/Java/Lang/Void.cs b/src/net/Netdroid/Generated/Java/Lang/Void.cs
index f0dfceca9..0d0650616 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Void.cs
+++ b/src/net/Netdroid/Generated/Java/Lang/Void.cs
@@ -38,7 +38,7 @@ public partial class Void
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/lang/Void.html#TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/lang/Void.html#TYPE"/>
         /// </summary>
         public static Java.Lang.Class TYPE { get { if (!_TYPEReady) { _TYPEContent = SGetField<Java.Lang.Class>(LocalBridgeClazz, "TYPE"); _TYPEReady = true; } return _TYPEContent; } }
         private static Java.Lang.Class _TYPEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Math/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Math/AllPackageClasses.cs
index f6ee50ac1..f8b161944 100644
--- a/src/net/Netdroid/Generated/Java/Math/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Math/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Math
 {
     #region BigDecimal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html"/>
+    /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html"/>
     /// </summary>
     public partial class BigDecimal : Java.Lang.Number
     {
@@ -72,7 +72,7 @@ public BigDecimal(params object[] args) : base(args) { }
 
     #region BigInteger
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html"/>
+    /// <see href="https://developer.android.com/reference/java/math/BigInteger.html"/>
     /// </summary>
     public partial class BigInteger : Java.Lang.Number
     {
@@ -116,7 +116,7 @@ public BigInteger(params object[] args) : base(args) { }
 
     #region MathContext
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html"/>
+    /// <see href="https://developer.android.com/reference/java/math/MathContext.html"/>
     /// </summary>
     public partial class MathContext : Java.Io.Serializable
     {
@@ -160,7 +160,7 @@ public MathContext(params object[] args) : base(args) { }
 
     #region RoundingMode
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html"/>
+    /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html"/>
     /// </summary>
     public partial class RoundingMode : Java.Lang.Enum<Java.Math.RoundingMode>
     {
diff --git a/src/net/Netdroid/Generated/Java/Math/BigDecimal.cs b/src/net/Netdroid/Generated/Java/Math/BigDecimal.cs
index 60b0826b6..f975e26e0 100644
--- a/src/net/Netdroid/Generated/Java/Math/BigDecimal.cs
+++ b/src/net/Netdroid/Generated/Java/Math/BigDecimal.cs
@@ -30,7 +30,7 @@ public partial class BigDecimal
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(char[],int,int,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(char[],int,int,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -41,7 +41,7 @@ public BigDecimal(char[] arg0, int arg1, int arg2, Java.Math.MathContext arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -51,7 +51,7 @@ public BigDecimal(char[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(char[],java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(char[],java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -60,7 +60,7 @@ public BigDecimal(char[] arg0, Java.Math.MathContext arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public BigDecimal(char[] arg0)
@@ -68,7 +68,7 @@ public BigDecimal(char[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(double,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(double,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -77,7 +77,7 @@ public BigDecimal(double arg0, Java.Math.MathContext arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(double)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public BigDecimal(double arg0)
@@ -85,7 +85,7 @@ public BigDecimal(double arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(int,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(int,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -94,7 +94,7 @@ public BigDecimal(int arg0, Java.Math.MathContext arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public BigDecimal(int arg0)
@@ -102,7 +102,7 @@ public BigDecimal(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(java.lang.String,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(java.lang.String,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -111,7 +111,7 @@ public BigDecimal(Java.Lang.String arg0, Java.Math.MathContext arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public BigDecimal(Java.Lang.String arg0)
@@ -119,7 +119,7 @@ public BigDecimal(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(java.math.BigInteger,int,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(java.math.BigInteger,int,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -129,7 +129,7 @@ public BigDecimal(Java.Math.BigInteger arg0, int arg1, Java.Math.MathContext arg
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(java.math.BigInteger,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(java.math.BigInteger,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -138,7 +138,7 @@ public BigDecimal(Java.Math.BigInteger arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(java.math.BigInteger,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(java.math.BigInteger,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -147,7 +147,7 @@ public BigDecimal(Java.Math.BigInteger arg0, Java.Math.MathContext arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         public BigDecimal(Java.Math.BigInteger arg0)
@@ -155,7 +155,7 @@ public BigDecimal(Java.Math.BigInteger arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(long,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(long,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -164,7 +164,7 @@ public BigDecimal(long arg0, Java.Math.MathContext arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public BigDecimal(long arg0)
@@ -184,75 +184,75 @@ public BigDecimal(long arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ROUND_CEILING"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ROUND_CEILING"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUND_CEILING { get { if (!_ROUND_CEILINGReady) { _ROUND_CEILINGContent = SGetField<int>(LocalBridgeClazz, "ROUND_CEILING"); _ROUND_CEILINGReady = true; } return _ROUND_CEILINGContent; } }
         private static int _ROUND_CEILINGContent = default;
         private static bool _ROUND_CEILINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ROUND_DOWN"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ROUND_DOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUND_DOWN { get { if (!_ROUND_DOWNReady) { _ROUND_DOWNContent = SGetField<int>(LocalBridgeClazz, "ROUND_DOWN"); _ROUND_DOWNReady = true; } return _ROUND_DOWNContent; } }
         private static int _ROUND_DOWNContent = default;
         private static bool _ROUND_DOWNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ROUND_FLOOR"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ROUND_FLOOR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUND_FLOOR { get { if (!_ROUND_FLOORReady) { _ROUND_FLOORContent = SGetField<int>(LocalBridgeClazz, "ROUND_FLOOR"); _ROUND_FLOORReady = true; } return _ROUND_FLOORContent; } }
         private static int _ROUND_FLOORContent = default;
         private static bool _ROUND_FLOORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ROUND_HALF_DOWN"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ROUND_HALF_DOWN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUND_HALF_DOWN { get { if (!_ROUND_HALF_DOWNReady) { _ROUND_HALF_DOWNContent = SGetField<int>(LocalBridgeClazz, "ROUND_HALF_DOWN"); _ROUND_HALF_DOWNReady = true; } return _ROUND_HALF_DOWNContent; } }
         private static int _ROUND_HALF_DOWNContent = default;
         private static bool _ROUND_HALF_DOWNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ROUND_HALF_EVEN"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ROUND_HALF_EVEN"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUND_HALF_EVEN { get { if (!_ROUND_HALF_EVENReady) { _ROUND_HALF_EVENContent = SGetField<int>(LocalBridgeClazz, "ROUND_HALF_EVEN"); _ROUND_HALF_EVENReady = true; } return _ROUND_HALF_EVENContent; } }
         private static int _ROUND_HALF_EVENContent = default;
         private static bool _ROUND_HALF_EVENReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ROUND_HALF_UP"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ROUND_HALF_UP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUND_HALF_UP { get { if (!_ROUND_HALF_UPReady) { _ROUND_HALF_UPContent = SGetField<int>(LocalBridgeClazz, "ROUND_HALF_UP"); _ROUND_HALF_UPReady = true; } return _ROUND_HALF_UPContent; } }
         private static int _ROUND_HALF_UPContent = default;
         private static bool _ROUND_HALF_UPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ROUND_UNNECESSARY"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ROUND_UNNECESSARY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUND_UNNECESSARY { get { if (!_ROUND_UNNECESSARYReady) { _ROUND_UNNECESSARYContent = SGetField<int>(LocalBridgeClazz, "ROUND_UNNECESSARY"); _ROUND_UNNECESSARYReady = true; } return _ROUND_UNNECESSARYContent; } }
         private static int _ROUND_UNNECESSARYContent = default;
         private static bool _ROUND_UNNECESSARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ROUND_UP"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ROUND_UP"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int ROUND_UP { get { if (!_ROUND_UPReady) { _ROUND_UPContent = SGetField<int>(LocalBridgeClazz, "ROUND_UP"); _ROUND_UPReady = true; } return _ROUND_UPContent; } }
         private static int _ROUND_UPContent = default;
         private static bool _ROUND_UPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ONE"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ONE"/>
         /// </summary>
         public static Java.Math.BigDecimal ONE { get { if (!_ONEReady) { _ONEContent = SGetField<Java.Math.BigDecimal>(LocalBridgeClazz, "ONE"); _ONEReady = true; } return _ONEContent; } }
         private static Java.Math.BigDecimal _ONEContent = default;
         private static bool _ONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#TEN"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#TEN"/>
         /// </summary>
         public static Java.Math.BigDecimal TEN { get { if (!_TENReady) { _TENContent = SGetField<Java.Math.BigDecimal>(LocalBridgeClazz, "TEN"); _TENReady = true; } return _TENContent; } }
         private static Java.Math.BigDecimal _TENContent = default;
         private static bool _TENReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ZERO"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ZERO"/>
         /// </summary>
         public static Java.Math.BigDecimal ZERO { get { if (!_ZEROReady) { _ZEROContent = SGetField<Java.Math.BigDecimal>(LocalBridgeClazz, "ZERO"); _ZEROReady = true; } return _ZEROContent; } }
         private static Java.Math.BigDecimal _ZEROContent = default;
@@ -262,7 +262,7 @@ public BigDecimal(long arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#valueOf(double)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#valueOf(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -271,7 +271,7 @@ public static Java.Math.BigDecimal ValueOf(double arg0)
             return SExecuteWithSignature<Java.Math.BigDecimal>(LocalBridgeClazz, "valueOf", "(D)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#valueOf(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#valueOf(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -281,7 +281,7 @@ public static Java.Math.BigDecimal ValueOf(long arg0, int arg1)
             return SExecute<Java.Math.BigDecimal>(LocalBridgeClazz, "valueOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#valueOf(long)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#valueOf(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -294,7 +294,7 @@ public static Java.Math.BigDecimal ValueOf(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#byteValueExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#byteValueExact()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte ByteValueExact()
@@ -302,7 +302,7 @@ public byte ByteValueExact()
             return IExecuteWithSignature<byte>("byteValueExact", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -311,7 +311,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#compareTo(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#compareTo(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="int"/></returns>
@@ -320,7 +320,7 @@ public int CompareTo(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/math/BigDecimal;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#intValueExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#intValueExact()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int IntValueExact()
@@ -328,7 +328,7 @@ public int IntValueExact()
             return IExecuteWithSignature<int>("intValueExact", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#precision()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#precision()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Precision()
@@ -336,7 +336,7 @@ public int Precision()
             return IExecuteWithSignature<int>("precision", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#scale()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#scale()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Scale()
@@ -344,7 +344,7 @@ public int Scale()
             return IExecuteWithSignature<int>("scale", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#signum()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#signum()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Signum()
@@ -352,7 +352,7 @@ public int Signum()
             return IExecuteWithSignature<int>("signum", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#toEngineeringString()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#toEngineeringString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToEngineeringString()
@@ -360,7 +360,7 @@ public Java.Lang.String ToEngineeringString()
             return IExecuteWithSignature<Java.Lang.String>("toEngineeringString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#toPlainString()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#toPlainString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToPlainString()
@@ -368,7 +368,7 @@ public Java.Lang.String ToPlainString()
             return IExecuteWithSignature<Java.Lang.String>("toPlainString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#abs()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#abs()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         public Java.Math.BigDecimal Abs()
@@ -376,7 +376,7 @@ public Java.Math.BigDecimal Abs()
             return IExecuteWithSignature<Java.Math.BigDecimal>("abs", "()Ljava/math/BigDecimal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#abs(java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#abs(java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.MathContext"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -385,7 +385,7 @@ public Java.Math.BigDecimal Abs(Java.Math.MathContext arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("abs", "(Ljava/math/MathContext;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#add(java.math.BigDecimal,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#add(java.math.BigDecimal,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -395,7 +395,7 @@ public Java.Math.BigDecimal Add(Java.Math.BigDecimal arg0, Java.Math.MathContext
             return IExecute<Java.Math.BigDecimal>("add", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#add(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#add(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -404,19 +404,19 @@ public Java.Math.BigDecimal Add(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("add", "(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divide(java.math.BigDecimal,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divide(java.math.BigDecimal,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Math.BigDecimal Divide(Java.Math.BigDecimal arg0, int arg1, int arg2)
         {
             return IExecute<Java.Math.BigDecimal>("divide", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divide(java.math.BigDecimal,int,java.math.RoundingMode)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divide(java.math.BigDecimal,int,java.math.RoundingMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -427,18 +427,18 @@ public Java.Math.BigDecimal Divide(Java.Math.BigDecimal arg0, int arg1, Java.Mat
             return IExecute<Java.Math.BigDecimal>("divide", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divide(java.math.BigDecimal,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divide(java.math.BigDecimal,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Math.BigDecimal Divide(Java.Math.BigDecimal arg0, int arg1)
         {
             return IExecute<Java.Math.BigDecimal>("divide", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divide(java.math.BigDecimal,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divide(java.math.BigDecimal,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -448,7 +448,7 @@ public Java.Math.BigDecimal Divide(Java.Math.BigDecimal arg0, Java.Math.MathCont
             return IExecute<Java.Math.BigDecimal>("divide", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divide(java.math.BigDecimal,java.math.RoundingMode)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divide(java.math.BigDecimal,java.math.RoundingMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="Java.Math.RoundingMode"/></param>
@@ -458,7 +458,7 @@ public Java.Math.BigDecimal Divide(Java.Math.BigDecimal arg0, Java.Math.Rounding
             return IExecute<Java.Math.BigDecimal>("divide", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divide(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divide(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -467,7 +467,7 @@ public Java.Math.BigDecimal Divide(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("divide", "(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divideToIntegralValue(java.math.BigDecimal,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divideToIntegralValue(java.math.BigDecimal,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -477,7 +477,7 @@ public Java.Math.BigDecimal DivideToIntegralValue(Java.Math.BigDecimal arg0, Jav
             return IExecute<Java.Math.BigDecimal>("divideToIntegralValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divideToIntegralValue(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divideToIntegralValue(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -486,7 +486,7 @@ public Java.Math.BigDecimal DivideToIntegralValue(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("divideToIntegralValue", "(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#max(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#max(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -495,7 +495,7 @@ public Java.Math.BigDecimal Max(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("max", "(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#min(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#min(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -504,7 +504,7 @@ public Java.Math.BigDecimal Min(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("min", "(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#movePointLeft(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#movePointLeft(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -513,7 +513,7 @@ public Java.Math.BigDecimal MovePointLeft(int arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("movePointLeft", "(I)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#movePointRight(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#movePointRight(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -522,7 +522,7 @@ public Java.Math.BigDecimal MovePointRight(int arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("movePointRight", "(I)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#multiply(java.math.BigDecimal,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#multiply(java.math.BigDecimal,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -532,7 +532,7 @@ public Java.Math.BigDecimal Multiply(Java.Math.BigDecimal arg0, Java.Math.MathCo
             return IExecute<Java.Math.BigDecimal>("multiply", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#multiply(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#multiply(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -541,7 +541,7 @@ public Java.Math.BigDecimal Multiply(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("multiply", "(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         public Java.Math.BigDecimal Negate()
@@ -549,7 +549,7 @@ public Java.Math.BigDecimal Negate()
             return IExecuteWithSignature<Java.Math.BigDecimal>("negate", "()Ljava/math/BigDecimal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#negate(java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#negate(java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.MathContext"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -558,7 +558,7 @@ public Java.Math.BigDecimal Negate(Java.Math.MathContext arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("negate", "(Ljava/math/MathContext;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#plus()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#plus()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         public Java.Math.BigDecimal Plus()
@@ -566,7 +566,7 @@ public Java.Math.BigDecimal Plus()
             return IExecuteWithSignature<Java.Math.BigDecimal>("plus", "()Ljava/math/BigDecimal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#plus(java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#plus(java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.MathContext"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -575,7 +575,7 @@ public Java.Math.BigDecimal Plus(Java.Math.MathContext arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("plus", "(Ljava/math/MathContext;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#pow(int,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#pow(int,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -585,7 +585,7 @@ public Java.Math.BigDecimal Pow(int arg0, Java.Math.MathContext arg1)
             return IExecute<Java.Math.BigDecimal>("pow", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#pow(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#pow(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -594,7 +594,7 @@ public Java.Math.BigDecimal Pow(int arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("pow", "(I)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#remainder(java.math.BigDecimal,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#remainder(java.math.BigDecimal,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -604,7 +604,7 @@ public Java.Math.BigDecimal Remainder(Java.Math.BigDecimal arg0, Java.Math.MathC
             return IExecute<Java.Math.BigDecimal>("remainder", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#remainder(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#remainder(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -613,7 +613,7 @@ public Java.Math.BigDecimal Remainder(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("remainder", "(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#round(java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#round(java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.MathContext"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -622,7 +622,7 @@ public Java.Math.BigDecimal Round(Java.Math.MathContext arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("round", "(Ljava/math/MathContext;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#scaleByPowerOfTen(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#scaleByPowerOfTen(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -631,18 +631,18 @@ public Java.Math.BigDecimal ScaleByPowerOfTen(int arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("scaleByPowerOfTen", "(I)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#setScale(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#setScale(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Math.BigDecimal SetScale(int arg0, int arg1)
         {
             return IExecute<Java.Math.BigDecimal>("setScale", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#setScale(int,java.math.RoundingMode)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#setScale(int,java.math.RoundingMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.RoundingMode"/></param>
@@ -652,7 +652,7 @@ public Java.Math.BigDecimal SetScale(int arg0, Java.Math.RoundingMode arg1)
             return IExecute<Java.Math.BigDecimal>("setScale", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#setScale(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#setScale(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -661,7 +661,7 @@ public Java.Math.BigDecimal SetScale(int arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("setScale", "(I)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#sqrt(java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#sqrt(java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.MathContext"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -670,7 +670,7 @@ public Java.Math.BigDecimal Sqrt(Java.Math.MathContext arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("sqrt", "(Ljava/math/MathContext;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#stripTrailingZeros()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#stripTrailingZeros()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         public Java.Math.BigDecimal StripTrailingZeros()
@@ -678,7 +678,7 @@ public Java.Math.BigDecimal StripTrailingZeros()
             return IExecuteWithSignature<Java.Math.BigDecimal>("stripTrailingZeros", "()Ljava/math/BigDecimal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#subtract(java.math.BigDecimal,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#subtract(java.math.BigDecimal,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -688,7 +688,7 @@ public Java.Math.BigDecimal Subtract(Java.Math.BigDecimal arg0, Java.Math.MathCo
             return IExecute<Java.Math.BigDecimal>("subtract", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#subtract(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#subtract(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -697,7 +697,7 @@ public Java.Math.BigDecimal Subtract(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("subtract", "(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#ulp()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#ulp()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         public Java.Math.BigDecimal Ulp()
@@ -705,7 +705,7 @@ public Java.Math.BigDecimal Ulp()
             return IExecuteWithSignature<Java.Math.BigDecimal>("ulp", "()Ljava/math/BigDecimal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divideAndRemainder(java.math.BigDecimal,java.math.MathContext)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divideAndRemainder(java.math.BigDecimal,java.math.MathContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <param name="arg1"><see cref="Java.Math.MathContext"/></param>
@@ -715,7 +715,7 @@ public Java.Math.BigDecimal[] DivideAndRemainder(Java.Math.BigDecimal arg0, Java
             return IExecuteArray<Java.Math.BigDecimal>("divideAndRemainder", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#divideAndRemainder(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#divideAndRemainder(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -724,7 +724,7 @@ public Java.Math.BigDecimal[] DivideAndRemainder(Java.Math.BigDecimal arg0)
             return IExecuteWithSignatureArray<Java.Math.BigDecimal>("divideAndRemainder", "(Ljava/math/BigDecimal;)[Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#toBigInteger()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#toBigInteger()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger ToBigInteger()
@@ -732,7 +732,7 @@ public Java.Math.BigInteger ToBigInteger()
             return IExecuteWithSignature<Java.Math.BigInteger>("toBigInteger", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#toBigIntegerExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#toBigIntegerExact()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger ToBigIntegerExact()
@@ -740,7 +740,7 @@ public Java.Math.BigInteger ToBigIntegerExact()
             return IExecuteWithSignature<Java.Math.BigInteger>("toBigIntegerExact", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#unscaledValue()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#unscaledValue()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger UnscaledValue()
@@ -748,7 +748,7 @@ public Java.Math.BigInteger UnscaledValue()
             return IExecuteWithSignature<Java.Math.BigInteger>("unscaledValue", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#longValueExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#longValueExact()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long LongValueExact()
@@ -756,7 +756,7 @@ public long LongValueExact()
             return IExecuteWithSignature<long>("longValueExact", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigDecimal.html#shortValueExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigDecimal.html#shortValueExact()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         public short ShortValueExact()
diff --git a/src/net/Netdroid/Generated/Java/Math/BigInteger.cs b/src/net/Netdroid/Generated/Java/Math/BigInteger.cs
index 2945a7f90..933fb3752 100644
--- a/src/net/Netdroid/Generated/Java/Math/BigInteger.cs
+++ b/src/net/Netdroid/Generated/Java/Math/BigInteger.cs
@@ -30,7 +30,7 @@ public partial class BigInteger
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#%3Cinit%3E(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#%3Cinit%3E(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public BigInteger(byte[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public BigInteger(byte[] arg0)
@@ -48,7 +48,7 @@ public BigInteger(byte[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#%3Cinit%3E(int,byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#%3Cinit%3E(int,byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -59,7 +59,7 @@ public BigInteger(int arg0, byte[] arg1, int arg2, int arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#%3Cinit%3E(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#%3Cinit%3E(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -68,7 +68,7 @@ public BigInteger(int arg0, byte[] arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#%3Cinit%3E(int,int,java.util.Random)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#%3Cinit%3E(int,int,java.util.Random)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -78,7 +78,7 @@ public BigInteger(int arg0, int arg1, Java.Util.Random arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#%3Cinit%3E(int,java.util.Random)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#%3Cinit%3E(int,java.util.Random)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Random"/></param>
@@ -87,7 +87,7 @@ public BigInteger(int arg0, Java.Util.Random arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#%3Cinit%3E(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#%3Cinit%3E(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -96,7 +96,7 @@ public BigInteger(Java.Lang.String arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public BigInteger(Java.Lang.String arg0)
@@ -116,25 +116,25 @@ public BigInteger(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#ONE"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#ONE"/>
         /// </summary>
         public static Java.Math.BigInteger ONE { get { if (!_ONEReady) { _ONEContent = SGetField<Java.Math.BigInteger>(LocalBridgeClazz, "ONE"); _ONEReady = true; } return _ONEContent; } }
         private static Java.Math.BigInteger _ONEContent = default;
         private static bool _ONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#TEN"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#TEN"/>
         /// </summary>
         public static Java.Math.BigInteger TEN { get { if (!_TENReady) { _TENContent = SGetField<Java.Math.BigInteger>(LocalBridgeClazz, "TEN"); _TENReady = true; } return _TENContent; } }
         private static Java.Math.BigInteger _TENContent = default;
         private static bool _TENReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#TWO"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#TWO"/>
         /// </summary>
         public static Java.Math.BigInteger TWO { get { if (!_TWOReady) { _TWOContent = SGetField<Java.Math.BigInteger>(LocalBridgeClazz, "TWO"); _TWOReady = true; } return _TWOContent; } }
         private static Java.Math.BigInteger _TWOContent = default;
         private static bool _TWOReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#ZERO"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#ZERO"/>
         /// </summary>
         public static Java.Math.BigInteger ZERO { get { if (!_ZEROReady) { _ZEROContent = SGetField<Java.Math.BigInteger>(LocalBridgeClazz, "ZERO"); _ZEROReady = true; } return _ZEROContent; } }
         private static Java.Math.BigInteger _ZEROContent = default;
@@ -144,7 +144,7 @@ public BigInteger(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#probablePrime(int,java.util.Random)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#probablePrime(int,java.util.Random)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Random"/></param>
@@ -154,7 +154,7 @@ public static Java.Math.BigInteger ProbablePrime(int arg0, Java.Util.Random arg1
             return SExecute<Java.Math.BigInteger>(LocalBridgeClazz, "probablePrime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#valueOf(long)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#valueOf(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -167,14 +167,7 @@ public static Java.Math.BigInteger ValueOf(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#getLowestSetBit()"/> 
-        /// </summary>
-        public int LowestSetBit
-        {
-            get { return IExecuteWithSignature<int>("getLowestSetBit", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#isProbablePrime(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#isProbablePrime(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -183,7 +176,7 @@ public bool IsProbablePrime(int arg0)
             return IExecuteWithSignature<bool>("isProbablePrime", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#testBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#testBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -192,7 +185,7 @@ public bool TestBit(int arg0)
             return IExecuteWithSignature<bool>("testBit", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#byteValueExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#byteValueExact()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte ByteValueExact()
@@ -200,7 +193,7 @@ public byte ByteValueExact()
             return IExecuteWithSignature<byte>("byteValueExact", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#toByteArray()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#toByteArray()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte[] ToByteArray()
@@ -208,7 +201,7 @@ public byte[] ToByteArray()
             return IExecuteWithSignatureArray<byte>("toByteArray", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#bitCount()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#bitCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int BitCount()
@@ -216,7 +209,7 @@ public int BitCount()
             return IExecuteWithSignature<int>("bitCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#bitLength()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#bitLength()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int BitLength()
@@ -224,7 +217,7 @@ public int BitLength()
             return IExecuteWithSignature<int>("bitLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -233,7 +226,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#compareTo(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#compareTo(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="int"/></returns>
@@ -242,7 +235,15 @@ public int CompareTo(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/math/BigInteger;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#intValueExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#getLowestSetBit()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLowestSetBit()
+        {
+            return IExecuteWithSignature<int>("getLowestSetBit", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#intValueExact()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int IntValueExact()
@@ -250,7 +251,7 @@ public int IntValueExact()
             return IExecuteWithSignature<int>("intValueExact", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#signum()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#signum()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Signum()
@@ -258,7 +259,7 @@ public int Signum()
             return IExecuteWithSignature<int>("signum", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#toString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#toString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -267,7 +268,7 @@ public Java.Lang.String ToString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("toString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#abs()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#abs()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger Abs()
@@ -275,7 +276,7 @@ public Java.Math.BigInteger Abs()
             return IExecuteWithSignature<Java.Math.BigInteger>("abs", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#add(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#add(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -284,7 +285,7 @@ public Java.Math.BigInteger Add(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("add", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#and(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#and(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -293,7 +294,7 @@ public Java.Math.BigInteger And(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("and", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#andNot(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#andNot(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -302,7 +303,7 @@ public Java.Math.BigInteger AndNot(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("andNot", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#clearBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#clearBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -311,7 +312,7 @@ public Java.Math.BigInteger ClearBit(int arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("clearBit", "(I)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#divide(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#divide(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -320,7 +321,7 @@ public Java.Math.BigInteger Divide(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("divide", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#flipBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#flipBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -329,7 +330,7 @@ public Java.Math.BigInteger FlipBit(int arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("flipBit", "(I)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#gcd(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#gcd(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -338,7 +339,7 @@ public Java.Math.BigInteger Gcd(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("gcd", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#max(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#max(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -347,7 +348,7 @@ public Java.Math.BigInteger Max(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("max", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#min(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#min(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -356,7 +357,7 @@ public Java.Math.BigInteger Min(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("min", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#mod(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#mod(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -365,7 +366,7 @@ public Java.Math.BigInteger Mod(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("mod", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#modInverse(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#modInverse(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -374,7 +375,7 @@ public Java.Math.BigInteger ModInverse(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("modInverse", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#modPow(java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#modPow(java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -384,7 +385,7 @@ public Java.Math.BigInteger ModPow(Java.Math.BigInteger arg0, Java.Math.BigInteg
             return IExecute<Java.Math.BigInteger>("modPow", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#multiply(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#multiply(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -393,7 +394,7 @@ public Java.Math.BigInteger Multiply(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("multiply", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger Negate()
@@ -401,7 +402,7 @@ public Java.Math.BigInteger Negate()
             return IExecuteWithSignature<Java.Math.BigInteger>("negate", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#nextProbablePrime()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#nextProbablePrime()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger NextProbablePrime()
@@ -409,7 +410,7 @@ public Java.Math.BigInteger NextProbablePrime()
             return IExecuteWithSignature<Java.Math.BigInteger>("nextProbablePrime", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#not()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#not()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger Not()
@@ -417,7 +418,7 @@ public Java.Math.BigInteger Not()
             return IExecuteWithSignature<Java.Math.BigInteger>("not", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#or(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#or(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -426,7 +427,7 @@ public Java.Math.BigInteger Or(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("or", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#pow(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#pow(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -435,7 +436,7 @@ public Java.Math.BigInteger Pow(int arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("pow", "(I)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#remainder(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#remainder(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -444,7 +445,7 @@ public Java.Math.BigInteger Remainder(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("remainder", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#setBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#setBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -453,7 +454,7 @@ public Java.Math.BigInteger SetBit(int arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("setBit", "(I)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#shiftLeft(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#shiftLeft(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -462,7 +463,7 @@ public Java.Math.BigInteger ShiftLeft(int arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("shiftLeft", "(I)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#shiftRight(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#shiftRight(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -471,7 +472,7 @@ public Java.Math.BigInteger ShiftRight(int arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("shiftRight", "(I)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#sqrt()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#sqrt()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger Sqrt()
@@ -479,7 +480,7 @@ public Java.Math.BigInteger Sqrt()
             return IExecuteWithSignature<Java.Math.BigInteger>("sqrt", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#subtract(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#subtract(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -488,7 +489,7 @@ public Java.Math.BigInteger Subtract(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("subtract", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#xor(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#xor(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -497,7 +498,7 @@ public Java.Math.BigInteger Xor(Java.Math.BigInteger arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("xor", "(Ljava/math/BigInteger;)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#divideAndRemainder(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#divideAndRemainder(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -506,7 +507,7 @@ public Java.Math.BigInteger[] DivideAndRemainder(Java.Math.BigInteger arg0)
             return IExecuteWithSignatureArray<Java.Math.BigInteger>("divideAndRemainder", "(Ljava/math/BigInteger;)[Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#sqrtAndRemainder()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#sqrtAndRemainder()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger[] SqrtAndRemainder()
@@ -514,7 +515,7 @@ public Java.Math.BigInteger[] SqrtAndRemainder()
             return IExecuteWithSignatureArray<Java.Math.BigInteger>("sqrtAndRemainder", "()[Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#longValueExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#longValueExact()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long LongValueExact()
@@ -522,7 +523,7 @@ public long LongValueExact()
             return IExecuteWithSignature<long>("longValueExact", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/BigInteger.html#shortValueExact()"/>
+        /// <see href="https://developer.android.com/reference/java/math/BigInteger.html#shortValueExact()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         public short ShortValueExact()
diff --git a/src/net/Netdroid/Generated/Java/Math/MathContext.cs b/src/net/Netdroid/Generated/Java/Math/MathContext.cs
index 3dda6d1a1..10a36c535 100644
--- a/src/net/Netdroid/Generated/Java/Math/MathContext.cs
+++ b/src/net/Netdroid/Generated/Java/Math/MathContext.cs
@@ -30,7 +30,7 @@ public partial class MathContext
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#%3Cinit%3E(int,java.math.RoundingMode)"/>
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#%3Cinit%3E(int,java.math.RoundingMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.RoundingMode"/></param>
@@ -39,7 +39,7 @@ public MathContext(int arg0, Java.Math.RoundingMode arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public MathContext(int arg0)
@@ -47,7 +47,7 @@ public MathContext(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public MathContext(Java.Lang.String arg0)
@@ -63,25 +63,25 @@ public MathContext(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#DECIMAL128"/>
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#DECIMAL128"/>
         /// </summary>
         public static Java.Math.MathContext DECIMAL128 { get { if (!_DECIMAL128Ready) { _DECIMAL128Content = SGetField<Java.Math.MathContext>(LocalBridgeClazz, "DECIMAL128"); _DECIMAL128Ready = true; } return _DECIMAL128Content; } }
         private static Java.Math.MathContext _DECIMAL128Content = default;
         private static bool _DECIMAL128Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#DECIMAL32"/>
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#DECIMAL32"/>
         /// </summary>
         public static Java.Math.MathContext DECIMAL32 { get { if (!_DECIMAL32Ready) { _DECIMAL32Content = SGetField<Java.Math.MathContext>(LocalBridgeClazz, "DECIMAL32"); _DECIMAL32Ready = true; } return _DECIMAL32Content; } }
         private static Java.Math.MathContext _DECIMAL32Content = default;
         private static bool _DECIMAL32Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#DECIMAL64"/>
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#DECIMAL64"/>
         /// </summary>
         public static Java.Math.MathContext DECIMAL64 { get { if (!_DECIMAL64Ready) { _DECIMAL64Content = SGetField<Java.Math.MathContext>(LocalBridgeClazz, "DECIMAL64"); _DECIMAL64Ready = true; } return _DECIMAL64Content; } }
         private static Java.Math.MathContext _DECIMAL64Content = default;
         private static bool _DECIMAL64Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#UNLIMITED"/>
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#UNLIMITED"/>
         /// </summary>
         public static Java.Math.MathContext UNLIMITED { get { if (!_UNLIMITEDReady) { _UNLIMITEDContent = SGetField<Java.Math.MathContext>(LocalBridgeClazz, "UNLIMITED"); _UNLIMITEDReady = true; } return _UNLIMITEDContent; } }
         private static Java.Math.MathContext _UNLIMITEDContent = default;
@@ -95,18 +95,20 @@ public MathContext(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#getPrecision()"/> 
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#getPrecision()"/>
         /// </summary>
-        public int Precision
+        /// <returns><see cref="int"/></returns>
+        public int GetPrecision()
         {
-            get { return IExecuteWithSignature<int>("getPrecision", "()I"); }
+            return IExecuteWithSignature<int>("getPrecision", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/MathContext.html#getRoundingMode()"/> 
+        /// <see href="https://developer.android.com/reference/java/math/MathContext.html#getRoundingMode()"/>
         /// </summary>
-        public Java.Math.RoundingMode RoundingMode
+        /// <returns><see cref="Java.Math.RoundingMode"/></returns>
+        public Java.Math.RoundingMode GetRoundingMode()
         {
-            get { return IExecuteWithSignature<Java.Math.RoundingMode>("getRoundingMode", "()Ljava/math/RoundingMode;"); }
+            return IExecuteWithSignature<Java.Math.RoundingMode>("getRoundingMode", "()Ljava/math/RoundingMode;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Math/RoundingMode.cs b/src/net/Netdroid/Generated/Java/Math/RoundingMode.cs
index c5d442c10..efe37da45 100644
--- a/src/net/Netdroid/Generated/Java/Math/RoundingMode.cs
+++ b/src/net/Netdroid/Generated/Java/Math/RoundingMode.cs
@@ -38,49 +38,49 @@ public partial class RoundingMode
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#CEILING"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#CEILING"/>
         /// </summary>
         public static Java.Math.RoundingMode CEILING { get { if (!_CEILINGReady) { _CEILINGContent = SGetField<Java.Math.RoundingMode>(LocalBridgeClazz, "CEILING"); _CEILINGReady = true; } return _CEILINGContent; } }
         private static Java.Math.RoundingMode _CEILINGContent = default;
         private static bool _CEILINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#DOWN"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#DOWN"/>
         /// </summary>
         public static Java.Math.RoundingMode DOWN { get { if (!_DOWNReady) { _DOWNContent = SGetField<Java.Math.RoundingMode>(LocalBridgeClazz, "DOWN"); _DOWNReady = true; } return _DOWNContent; } }
         private static Java.Math.RoundingMode _DOWNContent = default;
         private static bool _DOWNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#FLOOR"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#FLOOR"/>
         /// </summary>
         public static Java.Math.RoundingMode FLOOR { get { if (!_FLOORReady) { _FLOORContent = SGetField<Java.Math.RoundingMode>(LocalBridgeClazz, "FLOOR"); _FLOORReady = true; } return _FLOORContent; } }
         private static Java.Math.RoundingMode _FLOORContent = default;
         private static bool _FLOORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#HALF_DOWN"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#HALF_DOWN"/>
         /// </summary>
         public static Java.Math.RoundingMode HALF_DOWN { get { if (!_HALF_DOWNReady) { _HALF_DOWNContent = SGetField<Java.Math.RoundingMode>(LocalBridgeClazz, "HALF_DOWN"); _HALF_DOWNReady = true; } return _HALF_DOWNContent; } }
         private static Java.Math.RoundingMode _HALF_DOWNContent = default;
         private static bool _HALF_DOWNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#HALF_EVEN"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#HALF_EVEN"/>
         /// </summary>
         public static Java.Math.RoundingMode HALF_EVEN { get { if (!_HALF_EVENReady) { _HALF_EVENContent = SGetField<Java.Math.RoundingMode>(LocalBridgeClazz, "HALF_EVEN"); _HALF_EVENReady = true; } return _HALF_EVENContent; } }
         private static Java.Math.RoundingMode _HALF_EVENContent = default;
         private static bool _HALF_EVENReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#HALF_UP"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#HALF_UP"/>
         /// </summary>
         public static Java.Math.RoundingMode HALF_UP { get { if (!_HALF_UPReady) { _HALF_UPContent = SGetField<Java.Math.RoundingMode>(LocalBridgeClazz, "HALF_UP"); _HALF_UPReady = true; } return _HALF_UPContent; } }
         private static Java.Math.RoundingMode _HALF_UPContent = default;
         private static bool _HALF_UPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#UNNECESSARY"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#UNNECESSARY"/>
         /// </summary>
         public static Java.Math.RoundingMode UNNECESSARY { get { if (!_UNNECESSARYReady) { _UNNECESSARYContent = SGetField<Java.Math.RoundingMode>(LocalBridgeClazz, "UNNECESSARY"); _UNNECESSARYReady = true; } return _UNNECESSARYContent; } }
         private static Java.Math.RoundingMode _UNNECESSARYContent = default;
         private static bool _UNNECESSARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#UP"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#UP"/>
         /// </summary>
         public static Java.Math.RoundingMode UP { get { if (!_UPReady) { _UPContent = SGetField<Java.Math.RoundingMode>(LocalBridgeClazz, "UP"); _UPReady = true; } return _UPContent; } }
         private static Java.Math.RoundingMode _UPContent = default;
@@ -90,7 +90,7 @@ public partial class RoundingMode
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#valueOf(int)"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#valueOf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.RoundingMode"/></returns>
@@ -99,7 +99,7 @@ public static Java.Math.RoundingMode ValueOf(int arg0)
             return SExecuteWithSignature<Java.Math.RoundingMode>(LocalBridgeClazz, "valueOf", "(I)Ljava/math/RoundingMode;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Math.RoundingMode"/></returns>
@@ -108,7 +108,7 @@ public static Java.Math.RoundingMode ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Math.RoundingMode>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/math/RoundingMode;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/math/RoundingMode.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/math/RoundingMode.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.RoundingMode"/></returns>
         public static Java.Math.RoundingMode[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Net/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Net/AllPackageClasses.cs
index 4212a6dcc..8ecdf8cd9 100644
--- a/src/net/Netdroid/Generated/Java/Net/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Net/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Net
 {
     #region Authenticator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/Authenticator.html"/>
     /// </summary>
     public partial class Authenticator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Authenticator>
     {
@@ -36,12 +36,12 @@ public partial class Authenticator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Aut
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Authenticator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Authenticator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Authenticator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Authenticator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Authenticator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Authenticator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -70,7 +70,7 @@ public Authenticator(params object[] args) : base(args) { }
         // TODO: complete the class
         #region RequestorType
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.RequestorType.html"/>
+        /// <see href="https://developer.android.com/reference/java/net/Authenticator.RequestorType.html"/>
         /// </summary>
         public partial class RequestorType : Java.Lang.Enum<Java.Net.Authenticator.RequestorType>
         {
@@ -118,7 +118,7 @@ public RequestorType(params object[] args) : base(args) { }
 
     #region BindException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/BindException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/BindException.html"/>
     /// </summary>
     public partial class BindException : Java.Net.SocketException
     {
@@ -135,7 +135,7 @@ public partial class BindException : Java.Net.SocketException
 
     #region CacheRequest
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/CacheRequest.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/CacheRequest.html"/>
     /// </summary>
     public partial class CacheRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CacheRequest>
     {
@@ -143,12 +143,12 @@ public partial class CacheRequest : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cach
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CacheRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CacheRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CacheRequest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CacheRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CacheRequest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CacheRequest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -181,7 +181,7 @@ public CacheRequest(params object[] args) : base(args) { }
 
     #region CacheResponse
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/CacheResponse.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/CacheResponse.html"/>
     /// </summary>
     public partial class CacheResponse : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CacheResponse>
     {
@@ -189,12 +189,12 @@ public partial class CacheResponse : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cac
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CacheResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CacheResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CacheResponse() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CacheResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CacheResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CacheResponse(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -227,7 +227,7 @@ public CacheResponse(params object[] args) : base(args) { }
 
     #region ConnectException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/ConnectException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/ConnectException.html"/>
     /// </summary>
     public partial class ConnectException : Java.Net.SocketException
     {
@@ -244,7 +244,7 @@ public partial class ConnectException : Java.Net.SocketException
 
     #region ContentHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/ContentHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/ContentHandler.html"/>
     /// </summary>
     public partial class ContentHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ContentHandler>
     {
@@ -252,12 +252,12 @@ public partial class ContentHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Co
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ContentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ContentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -290,7 +290,7 @@ public ContentHandler(params object[] args) : base(args) { }
 
     #region ContentHandlerFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/ContentHandlerFactory.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/ContentHandlerFactory.html"/>
     /// </summary>
     public partial class ContentHandlerFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ContentHandlerFactory>
     {
@@ -298,12 +298,12 @@ public partial class ContentHandlerFactory : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ContentHandlerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentHandlerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentHandlerFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ContentHandlerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentHandlerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentHandlerFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -336,7 +336,7 @@ public ContentHandlerFactory(params object[] args) : base(args) { }
 
     #region CookieHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/CookieHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/CookieHandler.html"/>
     /// </summary>
     public partial class CookieHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CookieHandler>
     {
@@ -344,12 +344,12 @@ public partial class CookieHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Coo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CookieHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CookieHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CookieHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CookieHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CookieHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CookieHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -382,7 +382,7 @@ public CookieHandler(params object[] args) : base(args) { }
 
     #region CookieManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/CookieManager.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/CookieManager.html"/>
     /// </summary>
     public partial class CookieManager : Java.Net.CookieHandler
     {
@@ -426,7 +426,7 @@ public CookieManager(params object[] args) : base(args) { }
 
     #region CookiePolicy
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/CookiePolicy.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/CookiePolicy.html"/>
     /// </summary>
     public partial class CookiePolicy : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CookiePolicy>
     {
@@ -434,12 +434,12 @@ public partial class CookiePolicy : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cook
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CookiePolicy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CookiePolicy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CookiePolicy() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CookiePolicy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CookiePolicy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CookiePolicy(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -472,7 +472,7 @@ public CookiePolicy(params object[] args) : base(args) { }
 
     #region CookieStore
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/CookieStore.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/CookieStore.html"/>
     /// </summary>
     public partial class CookieStore : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CookieStore>
     {
@@ -480,12 +480,12 @@ public partial class CookieStore : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cooki
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CookieStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CookieStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CookieStore() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CookieStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CookieStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CookieStore(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -518,7 +518,7 @@ public CookieStore(params object[] args) : base(args) { }
 
     #region DatagramPacket
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html"/>
     /// </summary>
     public partial class DatagramPacket : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DatagramPacket>
     {
@@ -562,7 +562,7 @@ public DatagramPacket(params object[] args) : base(args) { }
 
     #region DatagramSocket
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html"/>
     /// </summary>
     public partial class DatagramSocket : Java.Io.Closeable
     {
@@ -606,7 +606,7 @@ public DatagramSocket(params object[] args) : base(args) { }
 
     #region DatagramSocketImpl
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocketImpl.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/DatagramSocketImpl.html"/>
     /// </summary>
     public partial class DatagramSocketImpl : Java.Net.SocketOptions
     {
@@ -614,12 +614,12 @@ public partial class DatagramSocketImpl : Java.Net.SocketOptions
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DatagramSocketImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatagramSocketImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatagramSocketImpl() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DatagramSocketImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatagramSocketImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatagramSocketImpl(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -652,7 +652,7 @@ public DatagramSocketImpl(params object[] args) : base(args) { }
 
     #region DatagramSocketImplFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocketImplFactory.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/DatagramSocketImplFactory.html"/>
     /// </summary>
     public partial class DatagramSocketImplFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DatagramSocketImplFactory>
     {
@@ -660,12 +660,12 @@ public partial class DatagramSocketImplFactory : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DatagramSocketImplFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatagramSocketImplFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatagramSocketImplFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DatagramSocketImplFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatagramSocketImplFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatagramSocketImplFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -698,7 +698,7 @@ public DatagramSocketImplFactory(params object[] args) : base(args) { }
 
     #region FileNameMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/FileNameMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/FileNameMap.html"/>
     /// </summary>
     public partial class FileNameMap : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileNameMap>
     {
@@ -706,12 +706,12 @@ public partial class FileNameMap : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileN
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileNameMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileNameMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileNameMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileNameMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileNameMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileNameMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -744,7 +744,7 @@ public FileNameMap(params object[] args) : base(args) { }
 
     #region HttpCookie
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html"/>
     /// </summary>
     public partial class HttpCookie : Java.Lang.Cloneable
     {
@@ -788,7 +788,7 @@ public HttpCookie(params object[] args) : base(args) { }
 
     #region HttpRetryException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/HttpRetryException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/HttpRetryException.html"/>
     /// </summary>
     public partial class HttpRetryException : Java.Io.IOException
     {
@@ -805,7 +805,7 @@ public partial class HttpRetryException : Java.Io.IOException
 
     #region HttpURLConnection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html"/>
     /// </summary>
     public partial class HttpURLConnection : Java.Net.URLConnection
     {
@@ -813,12 +813,12 @@ public partial class HttpURLConnection : Java.Net.URLConnection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HttpURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HttpURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HttpURLConnection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HttpURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HttpURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HttpURLConnection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -851,7 +851,7 @@ public HttpURLConnection(params object[] args) : base(args) { }
 
     #region IDN
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/IDN.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/IDN.html"/>
     /// </summary>
     public partial class IDN : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IDN>
     {
@@ -895,7 +895,7 @@ public IDN(params object[] args) : base(args) { }
 
     #region Inet4Address
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/Inet4Address.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/Inet4Address.html"/>
     /// </summary>
     public partial class Inet4Address : Java.Net.InetAddress
     {
@@ -939,7 +939,7 @@ public Inet4Address(params object[] args) : base(args) { }
 
     #region Inet6Address
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/Inet6Address.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/Inet6Address.html"/>
     /// </summary>
     public partial class Inet6Address : Java.Net.InetAddress
     {
@@ -983,7 +983,7 @@ public Inet6Address(params object[] args) : base(args) { }
 
     #region InetAddress
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/InetAddress.html"/>
     /// </summary>
     public partial class InetAddress : Java.Io.Serializable
     {
@@ -1027,7 +1027,7 @@ public InetAddress(params object[] args) : base(args) { }
 
     #region InetSocketAddress
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html"/>
     /// </summary>
     public partial class InetSocketAddress : Java.Net.SocketAddress
     {
@@ -1071,7 +1071,7 @@ public InetSocketAddress(params object[] args) : base(args) { }
 
     #region InterfaceAddress
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/InterfaceAddress.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/InterfaceAddress.html"/>
     /// </summary>
     public partial class InterfaceAddress : MASES.JCOBridge.C2JBridge.JVMBridgeBase<InterfaceAddress>
     {
@@ -1115,7 +1115,7 @@ public InterfaceAddress(params object[] args) : base(args) { }
 
     #region JarURLConnection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html"/>
     /// </summary>
     public partial class JarURLConnection : Java.Net.URLConnection
     {
@@ -1123,12 +1123,12 @@ public partial class JarURLConnection : Java.Net.URLConnection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("JarURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JarURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JarURLConnection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("JarURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("JarURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public JarURLConnection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1161,7 +1161,7 @@ public JarURLConnection(params object[] args) : base(args) { }
 
     #region MalformedURLException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/MalformedURLException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/MalformedURLException.html"/>
     /// </summary>
     public partial class MalformedURLException : Java.Io.IOException
     {
@@ -1178,7 +1178,7 @@ public partial class MalformedURLException : Java.Io.IOException
 
     #region MulticastSocket
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html"/>
     /// </summary>
     public partial class MulticastSocket : Java.Net.DatagramSocket
     {
@@ -1222,7 +1222,7 @@ public MulticastSocket(params object[] args) : base(args) { }
 
     #region NetPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/NetPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/NetPermission.html"/>
     /// </summary>
     public partial class NetPermission : Java.Security.BasicPermission
     {
@@ -1266,7 +1266,7 @@ public NetPermission(params object[] args) : base(args) { }
 
     #region NetworkInterface
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html"/>
     /// </summary>
     public partial class NetworkInterface : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NetworkInterface>
     {
@@ -1310,7 +1310,7 @@ public NetworkInterface(params object[] args) : base(args) { }
 
     #region NoRouteToHostException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/NoRouteToHostException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/NoRouteToHostException.html"/>
     /// </summary>
     public partial class NoRouteToHostException : Java.Net.SocketException
     {
@@ -1327,7 +1327,7 @@ public partial class NoRouteToHostException : Java.Net.SocketException
 
     #region PasswordAuthentication
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/PasswordAuthentication.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/PasswordAuthentication.html"/>
     /// </summary>
     public partial class PasswordAuthentication : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PasswordAuthentication>
     {
@@ -1371,7 +1371,7 @@ public PasswordAuthentication(params object[] args) : base(args) { }
 
     #region PortUnreachableException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/PortUnreachableException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/PortUnreachableException.html"/>
     /// </summary>
     public partial class PortUnreachableException : Java.Net.SocketException
     {
@@ -1388,7 +1388,7 @@ public partial class PortUnreachableException : Java.Net.SocketException
 
     #region ProtocolException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/ProtocolException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/ProtocolException.html"/>
     /// </summary>
     public partial class ProtocolException : Java.Io.IOException
     {
@@ -1405,7 +1405,7 @@ public partial class ProtocolException : Java.Io.IOException
 
     #region ProtocolFamily
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/ProtocolFamily.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/ProtocolFamily.html"/>
     /// </summary>
     public partial class ProtocolFamily : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ProtocolFamily>
     {
@@ -1413,12 +1413,12 @@ public partial class ProtocolFamily : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ProtocolFamily class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ProtocolFamily class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ProtocolFamily() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ProtocolFamily class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ProtocolFamily class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ProtocolFamily(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1451,7 +1451,7 @@ public ProtocolFamily(params object[] args) : base(args) { }
 
     #region Proxy
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/Proxy.html"/>
     /// </summary>
     public partial class Proxy : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Proxy>
     {
@@ -1491,7 +1491,7 @@ public Proxy(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Type
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.Type.html"/>
+        /// <see href="https://developer.android.com/reference/java/net/Proxy.Type.html"/>
         /// </summary>
         public partial class Type : Java.Lang.Enum<Java.Net.Proxy.Type>
         {
@@ -1539,7 +1539,7 @@ public Type(params object[] args) : base(args) { }
 
     #region ProxySelector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/ProxySelector.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/ProxySelector.html"/>
     /// </summary>
     public partial class ProxySelector : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ProxySelector>
     {
@@ -1547,12 +1547,12 @@ public partial class ProxySelector : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pro
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ProxySelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ProxySelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ProxySelector() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ProxySelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ProxySelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ProxySelector(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1585,7 +1585,7 @@ public ProxySelector(params object[] args) : base(args) { }
 
     #region ResponseCache
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/ResponseCache.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/ResponseCache.html"/>
     /// </summary>
     public partial class ResponseCache : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ResponseCache>
     {
@@ -1593,12 +1593,12 @@ public partial class ResponseCache : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Res
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ResponseCache class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResponseCache class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResponseCache() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ResponseCache class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResponseCache class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResponseCache(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1631,7 +1631,7 @@ public ResponseCache(params object[] args) : base(args) { }
 
     #region SecureCacheResponse
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SecureCacheResponse.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SecureCacheResponse.html"/>
     /// </summary>
     public partial class SecureCacheResponse : Java.Net.CacheResponse
     {
@@ -1639,12 +1639,12 @@ public partial class SecureCacheResponse : Java.Net.CacheResponse
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SecureCacheResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecureCacheResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecureCacheResponse() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SecureCacheResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecureCacheResponse class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecureCacheResponse(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1677,7 +1677,7 @@ public SecureCacheResponse(params object[] args) : base(args) { }
 
     #region ServerSocket
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html"/>
     /// </summary>
     public partial class ServerSocket : Java.Io.Closeable
     {
@@ -1721,7 +1721,7 @@ public ServerSocket(params object[] args) : base(args) { }
 
     #region Socket
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/Socket.html"/>
     /// </summary>
     public partial class Socket : Java.Io.Closeable
     {
@@ -1765,7 +1765,7 @@ public Socket(params object[] args) : base(args) { }
 
     #region SocketAddress
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketAddress.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketAddress.html"/>
     /// </summary>
     public partial class SocketAddress : Java.Io.Serializable
     {
@@ -1773,12 +1773,12 @@ public partial class SocketAddress : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketAddress class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketAddress class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketAddress() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketAddress class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketAddress class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketAddress(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1811,7 +1811,7 @@ public SocketAddress(params object[] args) : base(args) { }
 
     #region SocketException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketException.html"/>
     /// </summary>
     public partial class SocketException : Java.Io.IOException
     {
@@ -1828,7 +1828,7 @@ public partial class SocketException : Java.Io.IOException
 
     #region SocketImpl
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketImpl.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketImpl.html"/>
     /// </summary>
     public partial class SocketImpl : Java.Net.SocketOptions
     {
@@ -1836,12 +1836,12 @@ public partial class SocketImpl : Java.Net.SocketOptions
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketImpl() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketImpl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketImpl(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1874,7 +1874,7 @@ public SocketImpl(params object[] args) : base(args) { }
 
     #region SocketImplFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketImplFactory.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketImplFactory.html"/>
     /// </summary>
     public partial class SocketImplFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SocketImplFactory>
     {
@@ -1882,12 +1882,12 @@ public partial class SocketImplFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketImplFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketImplFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketImplFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketImplFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketImplFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketImplFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1920,7 +1920,7 @@ public SocketImplFactory(params object[] args) : base(args) { }
 
     #region SocketOption
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOption.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketOption.html"/>
     /// </summary>
     public partial class SocketOption : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SocketOption>
     {
@@ -1928,12 +1928,12 @@ public partial class SocketOption : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sock
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketOption() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketOption(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1966,7 +1966,7 @@ public SocketOption(params object[] args) : base(args) { }
 
     #region SocketOption<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOption.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketOption.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class SocketOption<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SocketOption<T>>
@@ -1975,12 +1975,12 @@ public partial class SocketOption<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<S
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketOption() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketOption(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2013,7 +2013,7 @@ public SocketOption(params object[] args) : base(args) { }
 
     #region SocketOptions
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html"/>
     /// </summary>
     public partial class SocketOptions : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SocketOptions>
     {
@@ -2021,12 +2021,12 @@ public partial class SocketOptions : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Soc
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketOptions class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketOptions class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketOptions() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketOptions class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketOptions class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketOptions(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2059,7 +2059,7 @@ public SocketOptions(params object[] args) : base(args) { }
 
     #region SocketPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketPermission.html"/>
     /// </summary>
     public partial class SocketPermission : Java.Security.Permission
     {
@@ -2103,7 +2103,7 @@ public SocketPermission(params object[] args) : base(args) { }
 
     #region SocketTimeoutException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/SocketTimeoutException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/SocketTimeoutException.html"/>
     /// </summary>
     public partial class SocketTimeoutException : Java.Io.InterruptedIOException
     {
@@ -2120,7 +2120,7 @@ public partial class SocketTimeoutException : Java.Io.InterruptedIOException
 
     #region StandardProtocolFamily
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/StandardProtocolFamily.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/StandardProtocolFamily.html"/>
     /// </summary>
     public partial class StandardProtocolFamily : Java.Lang.Enum<Java.Net.StandardProtocolFamily>
     {
@@ -2164,7 +2164,7 @@ public StandardProtocolFamily(params object[] args) : base(args) { }
 
     #region StandardSocketOptions
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html"/>
     /// </summary>
     public partial class StandardSocketOptions : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StandardSocketOptions>
     {
@@ -2208,7 +2208,7 @@ public StandardSocketOptions(params object[] args) : base(args) { }
 
     #region UnknownHostException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/UnknownHostException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/UnknownHostException.html"/>
     /// </summary>
     public partial class UnknownHostException : Java.Io.IOException
     {
@@ -2225,7 +2225,7 @@ public partial class UnknownHostException : Java.Io.IOException
 
     #region UnknownServiceException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/UnknownServiceException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/UnknownServiceException.html"/>
     /// </summary>
     public partial class UnknownServiceException : Java.Io.IOException
     {
@@ -2242,7 +2242,7 @@ public partial class UnknownServiceException : Java.Io.IOException
 
     #region URI
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URI.html"/>
     /// </summary>
     public partial class URI : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URI>
     {
@@ -2286,7 +2286,7 @@ public URI(params object[] args) : base(args) { }
 
     #region URISyntaxException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URISyntaxException.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URISyntaxException.html"/>
     /// </summary>
     public partial class URISyntaxException : Java.Lang.Exception
     {
@@ -2303,7 +2303,7 @@ public partial class URISyntaxException : Java.Lang.Exception
 
     #region URL
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URL.html"/>
     /// </summary>
     public partial class URL : Java.Io.Serializable
     {
@@ -2347,7 +2347,7 @@ public URL(params object[] args) : base(args) { }
 
     #region URLClassLoader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html"/>
     /// </summary>
     public partial class URLClassLoader : Java.Security.SecureClassLoader
     {
@@ -2391,7 +2391,7 @@ public URLClassLoader(params object[] args) : base(args) { }
 
     #region URLConnection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URLConnection.html"/>
     /// </summary>
     public partial class URLConnection : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URLConnection>
     {
@@ -2399,12 +2399,12 @@ public partial class URLConnection : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URL
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("URLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("URLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public URLConnection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("URLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("URLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public URLConnection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2437,7 +2437,7 @@ public URLConnection(params object[] args) : base(args) { }
 
     #region URLDecoder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URLDecoder.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URLDecoder.html"/>
     /// </summary>
     public partial class URLDecoder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URLDecoder>
     {
@@ -2481,7 +2481,7 @@ public URLDecoder(params object[] args) : base(args) { }
 
     #region URLEncoder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URLEncoder.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URLEncoder.html"/>
     /// </summary>
     public partial class URLEncoder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URLEncoder>
     {
@@ -2525,7 +2525,7 @@ public URLEncoder(params object[] args) : base(args) { }
 
     #region URLStreamHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URLStreamHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URLStreamHandler.html"/>
     /// </summary>
     public partial class URLStreamHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URLStreamHandler>
     {
@@ -2533,12 +2533,12 @@ public partial class URLStreamHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("URLStreamHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("URLStreamHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public URLStreamHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("URLStreamHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("URLStreamHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public URLStreamHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2571,7 +2571,7 @@ public URLStreamHandler(params object[] args) : base(args) { }
 
     #region URLStreamHandlerFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/net/URLStreamHandlerFactory.html"/>
+    /// <see href="https://developer.android.com/reference/java/net/URLStreamHandlerFactory.html"/>
     /// </summary>
     public partial class URLStreamHandlerFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URLStreamHandlerFactory>
     {
@@ -2579,12 +2579,12 @@ public partial class URLStreamHandlerFactory : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("URLStreamHandlerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("URLStreamHandlerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public URLStreamHandlerFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("URLStreamHandlerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("URLStreamHandlerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public URLStreamHandlerFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Net/Authenticator.cs b/src/net/Netdroid/Generated/Java/Net/Authenticator.cs
index e68bb753e..f5b1725a1 100644
--- a/src/net/Netdroid/Generated/Java/Net/Authenticator.cs
+++ b/src/net/Netdroid/Generated/Java/Net/Authenticator.cs
@@ -42,14 +42,15 @@ public partial class Authenticator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.html#getDefault()"/> <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.html#setDefault(java.net.Authenticator)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Authenticator.html#getDefault()"/>
         /// </summary>
-        public static Java.Net.Authenticator Default
+        /// <returns><see cref="Java.Net.Authenticator"/></returns>
+        public static Java.Net.Authenticator GetDefault()
         {
-            get { return SExecuteWithSignature<Java.Net.Authenticator>(LocalBridgeClazz, "getDefault", "()Ljava/net/Authenticator;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/net/Authenticator;)V", value); }
+            return SExecuteWithSignature<Java.Net.Authenticator>(LocalBridgeClazz, "getDefault", "()Ljava/net/Authenticator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.html#requestPasswordAuthentication(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator.RequestorType)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Authenticator.html#requestPasswordAuthentication(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator.RequestorType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Net.InetAddress"/></param>
@@ -65,7 +66,7 @@ public static Java.Net.PasswordAuthentication RequestPasswordAuthentication(Java
             return SExecute<Java.Net.PasswordAuthentication>(LocalBridgeClazz, "requestPasswordAuthentication", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.html#requestPasswordAuthentication(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Authenticator.html#requestPasswordAuthentication(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Net.InetAddress"/></param>
@@ -79,7 +80,7 @@ public static Java.Net.PasswordAuthentication RequestPasswordAuthentication(Java
             return SExecute<Java.Net.PasswordAuthentication>(LocalBridgeClazz, "requestPasswordAuthentication", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.html#requestPasswordAuthentication(java.net.Authenticator,java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator.RequestorType)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Authenticator.html#requestPasswordAuthentication(java.net.Authenticator,java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator.RequestorType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Authenticator"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -96,7 +97,7 @@ public static Java.Net.PasswordAuthentication RequestPasswordAuthentication(Java
             return SExecute<Java.Net.PasswordAuthentication>(LocalBridgeClazz, "requestPasswordAuthentication", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.html#requestPasswordAuthentication(java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Authenticator.html#requestPasswordAuthentication(java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -108,12 +109,20 @@ public static Java.Net.PasswordAuthentication RequestPasswordAuthentication(Java
         {
             return SExecute<Java.Net.PasswordAuthentication>(LocalBridgeClazz, "requestPasswordAuthentication", arg0, arg1, arg2, arg3, arg4);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Authenticator.html#setDefault(java.net.Authenticator)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.Authenticator"/></param>
+        public static void SetDefault(Java.Net.Authenticator arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/net/Authenticator;)V", arg0);
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.html#requestPasswordAuthenticationInstance(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator.RequestorType)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Authenticator.html#requestPasswordAuthenticationInstance(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator.RequestorType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Net.InetAddress"/></param>
@@ -145,13 +154,13 @@ public partial class RequestorType
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.RequestorType.html#PROXY"/>
+            /// <see href="https://developer.android.com/reference/java/net/Authenticator.RequestorType.html#PROXY"/>
             /// </summary>
             public static Java.Net.Authenticator.RequestorType PROXY { get { if (!_PROXYReady) { _PROXYContent = SGetField<Java.Net.Authenticator.RequestorType>(LocalBridgeClazz, "PROXY"); _PROXYReady = true; } return _PROXYContent; } }
             private static Java.Net.Authenticator.RequestorType _PROXYContent = default;
             private static bool _PROXYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.RequestorType.html#SERVER"/>
+            /// <see href="https://developer.android.com/reference/java/net/Authenticator.RequestorType.html#SERVER"/>
             /// </summary>
             public static Java.Net.Authenticator.RequestorType SERVER { get { if (!_SERVERReady) { _SERVERContent = SGetField<Java.Net.Authenticator.RequestorType>(LocalBridgeClazz, "SERVER"); _SERVERReady = true; } return _SERVERContent; } }
             private static Java.Net.Authenticator.RequestorType _SERVERContent = default;
@@ -161,7 +170,7 @@ public partial class RequestorType
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.RequestorType.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/net/Authenticator.RequestorType.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Net.Authenticator.RequestorType"/></returns>
@@ -170,7 +179,7 @@ public static Java.Net.Authenticator.RequestorType ValueOf(Java.Lang.String arg0
                 return SExecuteWithSignature<Java.Net.Authenticator.RequestorType>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/net/Authenticator$RequestorType;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Authenticator.RequestorType.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/net/Authenticator.RequestorType.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Net.Authenticator.RequestorType"/></returns>
             public static Java.Net.Authenticator.RequestorType[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Net/CacheRequest.cs b/src/net/Netdroid/Generated/Java/Net/CacheRequest.cs
index a2f56463c..8f5ecef15 100644
--- a/src/net/Netdroid/Generated/Java/Net/CacheRequest.cs
+++ b/src/net/Netdroid/Generated/Java/Net/CacheRequest.cs
@@ -46,14 +46,16 @@ public partial class CacheRequest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CacheRequest.html#getBody()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/CacheRequest.html#getBody()"/>
         /// </summary>
-        public Java.Io.OutputStream Body
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.OutputStream GetBody()
         {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getBody", "()Ljava/io/OutputStream;"); }
+            return IExecuteWithSignature<Java.Io.OutputStream>("getBody", "()Ljava/io/OutputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CacheRequest.html#abort()"/>
+        /// <see href="https://developer.android.com/reference/java/net/CacheRequest.html#abort()"/>
         /// </summary>
         public void Abort()
         {
diff --git a/src/net/Netdroid/Generated/Java/Net/CacheResponse.cs b/src/net/Netdroid/Generated/Java/Net/CacheResponse.cs
index 4b36c6ea8..4bf0be023 100644
--- a/src/net/Netdroid/Generated/Java/Net/CacheResponse.cs
+++ b/src/net/Netdroid/Generated/Java/Net/CacheResponse.cs
@@ -46,18 +46,22 @@ public partial class CacheResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CacheResponse.html#getBody()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/CacheResponse.html#getBody()"/>
         /// </summary>
-        public Java.Io.InputStream Body
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.InputStream GetBody()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getBody", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getBody", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CacheResponse.html#getHeaders()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/CacheResponse.html#getHeaders()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> Headers
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> GetHeaders()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getHeaders", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getHeaders", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Net/ContentHandler.cs b/src/net/Netdroid/Generated/Java/Net/ContentHandler.cs
index 10fae4dc3..00a4b1fa8 100644
--- a/src/net/Netdroid/Generated/Java/Net/ContentHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Net/ContentHandler.cs
@@ -46,7 +46,7 @@ public partial class ContentHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ContentHandler.html#getContent(java.net.URLConnection)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ContentHandler.html#getContent(java.net.URLConnection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URLConnection"/></param>
         /// <returns><see cref="object"/></returns>
@@ -56,7 +56,7 @@ public object GetContent(Java.Net.URLConnection arg0)
             return IExecuteWithSignature("getContent", "(Ljava/net/URLConnection;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ContentHandler.html#getContent(java.net.URLConnection,java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/ContentHandler.html#getContent(java.net.URLConnection,java.lang.Class[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URLConnection"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Net/ContentHandlerFactory.cs b/src/net/Netdroid/Generated/Java/Net/ContentHandlerFactory.cs
index 49c1e3a83..0227a198b 100644
--- a/src/net/Netdroid/Generated/Java/Net/ContentHandlerFactory.cs
+++ b/src/net/Netdroid/Generated/Java/Net/ContentHandlerFactory.cs
@@ -64,7 +64,7 @@ public partial class ContentHandlerFactory : Java.Net.IContentHandlerFactory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ContentHandlerFactory.html#createContentHandler(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ContentHandlerFactory.html#createContentHandler(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.ContentHandler"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Net/CookieHandler.cs b/src/net/Netdroid/Generated/Java/Net/CookieHandler.cs
index b8ead2dc5..561ed3c20 100644
--- a/src/net/Netdroid/Generated/Java/Net/CookieHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Net/CookieHandler.cs
@@ -42,18 +42,27 @@ public partial class CookieHandler
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieHandler.html#getDefault()"/> <see href="https://developer.android.com/reference/java.base/java/net/CookieHandler.html#setDefault(java.net.CookieHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieHandler.html#getDefault()"/>
         /// </summary>
-        public static Java.Net.CookieHandler Default
+        /// <returns><see cref="Java.Net.CookieHandler"/></returns>
+        public static Java.Net.CookieHandler GetDefault()
         {
-            get { return SExecuteWithSignature<Java.Net.CookieHandler>(LocalBridgeClazz, "getDefault", "()Ljava/net/CookieHandler;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/net/CookieHandler;)V", value); }
+            return SExecuteWithSignature<Java.Net.CookieHandler>(LocalBridgeClazz, "getDefault", "()Ljava/net/CookieHandler;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/CookieHandler.html#setDefault(java.net.CookieHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.CookieHandler"/></param>
+        public static void SetDefault(Java.Net.CookieHandler arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/net/CookieHandler;)V", arg0);
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieHandler.html#get(java.net.URI,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieHandler.html#get(java.net.URI,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -64,7 +73,7 @@ public static Java.Net.CookieHandler Default
             return IExecute<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieHandler.html#put(java.net.URI,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieHandler.html#put(java.net.URI,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Net/CookieManager.cs b/src/net/Netdroid/Generated/Java/Net/CookieManager.cs
index 66cae3b41..a16153a7b 100644
--- a/src/net/Netdroid/Generated/Java/Net/CookieManager.cs
+++ b/src/net/Netdroid/Generated/Java/Net/CookieManager.cs
@@ -30,7 +30,7 @@ public partial class CookieManager
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieManager.html#%3Cinit%3E(java.net.CookieStore,java.net.CookiePolicy)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieManager.html#%3Cinit%3E(java.net.CookieStore,java.net.CookiePolicy)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.CookieStore"/></param>
         /// <param name="arg1"><see cref="Java.Net.CookiePolicy"/></param>
@@ -55,14 +55,15 @@ public CookieManager(Java.Net.CookieStore arg0, Java.Net.CookiePolicy arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieManager.html#getCookieStore()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/CookieManager.html#getCookieStore()"/>
         /// </summary>
-        public Java.Net.CookieStore CookieStore
+        /// <returns><see cref="Java.Net.CookieStore"/></returns>
+        public Java.Net.CookieStore GetCookieStore()
         {
-            get { return IExecuteWithSignature<Java.Net.CookieStore>("getCookieStore", "()Ljava/net/CookieStore;"); }
+            return IExecuteWithSignature<Java.Net.CookieStore>("getCookieStore", "()Ljava/net/CookieStore;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieManager.html#setCookiePolicy(java.net.CookiePolicy)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieManager.html#setCookiePolicy(java.net.CookiePolicy)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.CookiePolicy"/></param>
         public void SetCookiePolicy(Java.Net.CookiePolicy arg0)
diff --git a/src/net/Netdroid/Generated/Java/Net/CookiePolicy.cs b/src/net/Netdroid/Generated/Java/Net/CookiePolicy.cs
index 91a2bb0d1..4c5d95f83 100644
--- a/src/net/Netdroid/Generated/Java/Net/CookiePolicy.cs
+++ b/src/net/Netdroid/Generated/Java/Net/CookiePolicy.cs
@@ -56,19 +56,19 @@ public partial class CookiePolicy : Java.Net.ICookiePolicy
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookiePolicy.html#ACCEPT_ALL"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookiePolicy.html#ACCEPT_ALL"/>
         /// </summary>
         public static Java.Net.CookiePolicy ACCEPT_ALL { get { if (!_ACCEPT_ALLReady) { _ACCEPT_ALLContent = SGetField<Java.Net.CookiePolicy>(LocalBridgeClazz, "ACCEPT_ALL"); _ACCEPT_ALLReady = true; } return _ACCEPT_ALLContent; } }
         private static Java.Net.CookiePolicy _ACCEPT_ALLContent = default;
         private static bool _ACCEPT_ALLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookiePolicy.html#ACCEPT_NONE"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookiePolicy.html#ACCEPT_NONE"/>
         /// </summary>
         public static Java.Net.CookiePolicy ACCEPT_NONE { get { if (!_ACCEPT_NONEReady) { _ACCEPT_NONEContent = SGetField<Java.Net.CookiePolicy>(LocalBridgeClazz, "ACCEPT_NONE"); _ACCEPT_NONEReady = true; } return _ACCEPT_NONEContent; } }
         private static Java.Net.CookiePolicy _ACCEPT_NONEContent = default;
         private static bool _ACCEPT_NONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookiePolicy.html#ACCEPT_ORIGINAL_SERVER"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookiePolicy.html#ACCEPT_ORIGINAL_SERVER"/>
         /// </summary>
         public static Java.Net.CookiePolicy ACCEPT_ORIGINAL_SERVER { get { if (!_ACCEPT_ORIGINAL_SERVERReady) { _ACCEPT_ORIGINAL_SERVERContent = SGetField<Java.Net.CookiePolicy>(LocalBridgeClazz, "ACCEPT_ORIGINAL_SERVER"); _ACCEPT_ORIGINAL_SERVERReady = true; } return _ACCEPT_ORIGINAL_SERVERContent; } }
         private static Java.Net.CookiePolicy _ACCEPT_ORIGINAL_SERVERContent = default;
@@ -82,7 +82,7 @@ public partial class CookiePolicy : Java.Net.ICookiePolicy
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookiePolicy.html#shouldAccept(java.net.URI,java.net.HttpCookie)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookiePolicy.html#shouldAccept(java.net.URI,java.net.HttpCookie)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Net.HttpCookie"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Net/CookieStore.cs b/src/net/Netdroid/Generated/Java/Net/CookieStore.cs
index b2759655e..5b1768055 100644
--- a/src/net/Netdroid/Generated/Java/Net/CookieStore.cs
+++ b/src/net/Netdroid/Generated/Java/Net/CookieStore.cs
@@ -64,21 +64,7 @@ public partial class CookieStore : Java.Net.ICookieStore
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieStore.html#getCookies()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Net.HttpCookie> Cookies
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Net.HttpCookie>>("getCookies", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieStore.html#getURIs()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Net.URI> URIs
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Net.URI>>("getURIs", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieStore.html#remove(java.net.URI,java.net.HttpCookie)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieStore.html#remove(java.net.URI,java.net.HttpCookie)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Net.HttpCookie"/></param>
@@ -88,7 +74,7 @@ public bool Remove(Java.Net.URI arg0, Java.Net.HttpCookie arg1)
             return IExecute<bool>("remove", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieStore.html#removeAll()"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieStore.html#removeAll()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool RemoveAll()
@@ -96,7 +82,7 @@ public bool RemoveAll()
             return IExecuteWithSignature<bool>("removeAll", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieStore.html#get(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieStore.html#get(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -105,7 +91,23 @@ public bool RemoveAll()
             return IExecuteWithSignature<Java.Util.List<Java.Net.HttpCookie>>("get", "(Ljava/net/URI;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/CookieStore.html#add(java.net.URI,java.net.HttpCookie)"/>
+        /// <see href="https://developer.android.com/reference/java/net/CookieStore.html#getCookies()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Net.HttpCookie> GetCookies()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Net.HttpCookie>>("getCookies", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/CookieStore.html#getURIs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Net.URI> GetURIs()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Net.URI>>("getURIs", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/CookieStore.html#add(java.net.URI,java.net.HttpCookie)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Net.HttpCookie"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Net/DatagramPacket.cs b/src/net/Netdroid/Generated/Java/Net/DatagramPacket.cs
index 583aa7a82..3641ee22e 100644
--- a/src/net/Netdroid/Generated/Java/Net/DatagramPacket.cs
+++ b/src/net/Netdroid/Generated/Java/Net/DatagramPacket.cs
@@ -30,7 +30,7 @@ public partial class DatagramPacket
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,int,java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,int,java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -42,7 +42,7 @@ public DatagramPacket(byte[] arg0, int arg1, int arg2, Java.Net.InetAddress arg3
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,int,java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,int,java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -53,7 +53,7 @@ public DatagramPacket(byte[] arg0, int arg1, int arg2, Java.Net.SocketAddress ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -63,7 +63,7 @@ public DatagramPacket(byte[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -74,7 +74,7 @@ public DatagramPacket(byte[] arg0, int arg1, Java.Net.InetAddress arg2, int arg3
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int,java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -84,7 +84,7 @@ public DatagramPacket(byte[] arg0, int arg1, Java.Net.SocketAddress arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#%3Cinit%3E(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -109,49 +109,63 @@ public DatagramPacket(byte[] arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#getAddress()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#setAddress(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#getData()"/>
         /// </summary>
-        public Java.Net.InetAddress Address
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetData()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;"); } set { IExecuteWithSignature("setAddress", "(Ljava/net/InetAddress;)V", value); }
+            return IExecuteWithSignatureArray<byte>("getData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#getData()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#setData(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#getLength()"/>
         /// </summary>
-        public byte[] Data
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignatureArray<byte>("getData", "()[B"); } set { IExecuteWithSignature("setData", "([B)V", value); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#getLength()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#setLength(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#getOffset()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="int"/></returns>
+        public int GetOffset()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); } set { IExecuteWithSignature("setLength", "(I)V", value); }
+            return IExecuteWithSignature<int>("getOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#getOffset()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#getPort()"/>
         /// </summary>
-        public int Offset
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<int>("getOffset", "()I"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#getPort()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#setPort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#getAddress()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetAddress()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); } set { IExecuteWithSignature("setPort", "(I)V", value); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#getSocketAddress()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#setSocketAddress(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#getSocketAddress()"/>
         /// </summary>
-        public Java.Net.SocketAddress SocketAddress
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        public Java.Net.SocketAddress GetSocketAddress()
         {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getSocketAddress", "()Ljava/net/SocketAddress;"); } set { IExecuteWithSignature("setSocketAddress", "(Ljava/net/SocketAddress;)V", value); }
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getSocketAddress", "()Ljava/net/SocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramPacket.html#setData(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#setAddress(java.net.InetAddress)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
+        public void SetAddress(Java.Net.InetAddress arg0)
+        {
+            IExecuteWithSignature("setAddress", "(Ljava/net/InetAddress;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#setData(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -160,6 +174,38 @@ public void SetData(byte[] arg0, int arg1, int arg2)
         {
             IExecute("setData", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#setData(byte[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="byte"/></param>
+        public void SetData(byte[] arg0)
+        {
+            IExecuteWithSignature("setData", "([B)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#setLength(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLength(int arg0)
+        {
+            IExecuteWithSignature("setLength", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#setPort(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPort(int arg0)
+        {
+            IExecuteWithSignature("setPort", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramPacket.html#setSocketAddress(java.net.SocketAddress)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
+        public void SetSocketAddress(Java.Net.SocketAddress arg0)
+        {
+            IExecuteWithSignature("setSocketAddress", "(Ljava/net/SocketAddress;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Net/DatagramSocket.cs b/src/net/Netdroid/Generated/Java/Net/DatagramSocket.cs
index fba622ff1..b506a8582 100644
--- a/src/net/Netdroid/Generated/Java/Net/DatagramSocket.cs
+++ b/src/net/Netdroid/Generated/Java/Net/DatagramSocket.cs
@@ -30,7 +30,7 @@ public partial class DatagramSocket
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#%3Cinit%3E(int,java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#%3Cinit%3E(int,java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Net.InetAddress"/></param>
@@ -40,7 +40,7 @@ public DatagramSocket(int arg0, Java.Net.InetAddress arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Net.SocketException"/>
@@ -49,7 +49,7 @@ public DatagramSocket(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#%3Cinit%3E(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#%3Cinit%3E(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <exception cref="Java.Net.SocketException"/>
@@ -70,11 +70,10 @@ public DatagramSocket(Java.Net.SocketAddress arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#setDatagramSocketImplFactory(java.net.DatagramSocketImplFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#setDatagramSocketImplFactory(java.net.DatagramSocketImplFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.DatagramSocketImplFactory"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
         public static void SetDatagramSocketImplFactory(Java.Net.DatagramSocketImplFactory arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "setDatagramSocketImplFactory", "(Ljava/net/DatagramSocketImplFactory;)V", arg0);
@@ -84,223 +83,276 @@ public static void SetDatagramSocketImplFactory(Java.Net.DatagramSocketImplFacto
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getBroadcast()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#setBroadcast(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
-        public bool Broadcast
+        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
+        /// <param name="arg1"><typeparamref name="T"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><see cref="Java.Net.DatagramSocket"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.DatagramSocket SetOption<T>(Java.Net.SocketOption<T> arg0, T arg1)
         {
-            get { return IExecuteWithSignature<bool>("getBroadcast", "()Z"); } set { IExecuteWithSignature("setBroadcast", "(Z)V", value); }
+            return IExecute<Java.Net.DatagramSocket>("setOption", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getChannel()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getOption(java.net.SocketOption)"/>
         /// </summary>
-        public Java.Nio.Channels.DatagramChannel Channel
+        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public T GetOption<T>(Java.Net.SocketOption<T> arg0)
         {
-            get { return IExecuteWithSignature<Java.Nio.Channels.DatagramChannel>("getChannel", "()Ljava/nio/channels/DatagramChannel;"); }
+            return IExecuteWithSignature<T>("getOption", "(Ljava/net/SocketOption;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getInetAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#isBound()"/>
         /// </summary>
-        public Java.Net.InetAddress InetAddress
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBound()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getInetAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<bool>("isBound", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getLocalAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#isClosed()"/>
         /// </summary>
-        public Java.Net.InetAddress LocalAddress
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClosed()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getLocalAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getLocalPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#isConnected()"/>
         /// </summary>
-        public int LocalPort
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignature<int>("getLocalPort", "()I"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getLocalSocketAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getLocalPort()"/>
         /// </summary>
-        public Java.Net.SocketAddress LocalSocketAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetLocalPort()
         {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalSocketAddress", "()Ljava/net/SocketAddress;"); }
+            return IExecuteWithSignature<int>("getLocalPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getPort()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getReceiveBufferSize()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#setReceiveBufferSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getInetAddress()"/>
         /// </summary>
-        public int ReceiveBufferSize
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetInetAddress()
         {
-            get { return IExecuteWithSignature<int>("getReceiveBufferSize", "()I"); } set { IExecuteWithSignature("setReceiveBufferSize", "(I)V", value); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getInetAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getRemoteSocketAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getLocalAddress()"/>
         /// </summary>
-        public Java.Net.SocketAddress RemoteSocketAddress
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetLocalAddress()
         {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteSocketAddress", "()Ljava/net/SocketAddress;"); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getLocalAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getReuseAddress()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#setReuseAddress(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getLocalSocketAddress()"/>
         /// </summary>
-        public bool ReuseAddress
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        public Java.Net.SocketAddress GetLocalSocketAddress()
         {
-            get { return IExecuteWithSignature<bool>("getReuseAddress", "()Z"); } set { IExecuteWithSignature("setReuseAddress", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalSocketAddress", "()Ljava/net/SocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getSendBufferSize()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#setSendBufferSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getRemoteSocketAddress()"/>
         /// </summary>
-        public int SendBufferSize
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        public Java.Net.SocketAddress GetRemoteSocketAddress()
         {
-            get { return IExecuteWithSignature<int>("getSendBufferSize", "()I"); } set { IExecuteWithSignature("setSendBufferSize", "(I)V", value); }
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteSocketAddress", "()Ljava/net/SocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getSoTimeout()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#setSoTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getChannel()"/>
         /// </summary>
-        public int SoTimeout
+        /// <returns><see cref="Java.Nio.Channels.DatagramChannel"/></returns>
+        public Java.Nio.Channels.DatagramChannel GetChannel()
         {
-            get { return IExecuteWithSignature<int>("getSoTimeout", "()I"); } set { IExecuteWithSignature("setSoTimeout", "(I)V", value); }
+            return IExecuteWithSignature<Java.Nio.Channels.DatagramChannel>("getChannel", "()Ljava/nio/channels/DatagramChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getTrafficClass()"/> <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#setTrafficClass(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#supportedOptions()"/>
         /// </summary>
-        public int TrafficClass
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Net.SocketOption<object>> SupportedOptions()
         {
-            get { return IExecuteWithSignature<int>("getTrafficClass", "()I"); } set { IExecuteWithSignature("setTrafficClass", "(I)V", value); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Net.SocketOption<object>>>("supportedOptions", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getBroadcast()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
-        /// <param name="arg1"><typeparamref name="T"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="Java.Net.DatagramSocket"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Java.Net.DatagramSocket SetOption<T>(Java.Net.SocketOption<T> arg0, T arg1)
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool GetBroadcast()
         {
-            return IExecute<Java.Net.DatagramSocket>("setOption", arg0, arg1);
+            return IExecute<bool>("getBroadcast");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#getOption(java.net.SocketOption)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getReuseAddress()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public T GetOption<T>(Java.Net.SocketOption<T> arg0)
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool GetReuseAddress()
         {
-            return IExecuteWithSignature<T>("getOption", "(Ljava/net/SocketOption;)Ljava/lang/Object;", arg0);
+            return IExecute<bool>("getReuseAddress");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#isBound()"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getReceiveBufferSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBound()
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetReceiveBufferSize()
         {
-            return IExecuteWithSignature<bool>("isBound", "()Z");
+            return IExecute<int>("getReceiveBufferSize");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getSendBufferSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClosed()
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetSendBufferSize()
         {
-            return IExecuteWithSignature<bool>("isClosed", "()Z");
+            return IExecute<int>("getSendBufferSize");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getSoTimeout()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetSoTimeout()
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecute<int>("getSoTimeout");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#supportedOptions()"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#getTrafficClass()"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Set"/></returns>
-        public Java.Util.Set<Java.Net.SocketOption<object>> SupportedOptions()
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetTrafficClass()
         {
-            return IExecuteWithSignature<Java.Util.Set<Java.Net.SocketOption<object>>>("supportedOptions", "()Ljava/util/Set;");
+            return IExecute<int>("getTrafficClass");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <exception cref="Java.Net.SocketException"/>
         public void Bind(Java.Net.SocketAddress arg0)
         {
-            IExecuteWithSignature("bind", "(Ljava/net/SocketAddress;)V", arg0);
+            IExecute("bind", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#receive(java.net.DatagramPacket)"/>
         /// </summary>
-        public void Close()
+        /// <param name="arg0"><see cref="Java.Net.DatagramPacket"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void Receive(Java.Net.DatagramPacket arg0)
         {
-            IExecuteWithSignature("close", "()V");
+            IExecute("receive", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#connect(java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#setBroadcast(boolean)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        public void Connect(Java.Net.InetAddress arg0, int arg1)
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetBroadcast(bool arg0)
         {
-            IExecute("connect", arg0, arg1);
+            IExecute("setBroadcast", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#connect(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#setReceiveBufferSize(int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
+        /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Net.SocketException"/>
-        public void Connect(Java.Net.SocketAddress arg0)
+        public void SetReceiveBufferSize(int arg0)
         {
-            IExecuteWithSignature("connect", "(Ljava/net/SocketAddress;)V", arg0);
+            IExecute("setReceiveBufferSize", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#disconnect()"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#setReuseAddress(boolean)"/>
         /// </summary>
-        public void Disconnect()
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetReuseAddress(bool arg0)
         {
-            IExecuteWithSignature("disconnect", "()V");
+            IExecute("setReuseAddress", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#joinGroup(java.net.SocketAddress,java.net.NetworkInterface)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#setSendBufferSize(int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
-        /// <param name="arg1"><see cref="Java.Net.NetworkInterface"/></param>
-        /// <exception cref="Java.Io.IOException"/>
-        public void JoinGroup(Java.Net.SocketAddress arg0, Java.Net.NetworkInterface arg1)
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetSendBufferSize(int arg0)
         {
-            IExecute("joinGroup", arg0, arg1);
+            IExecute("setSendBufferSize", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#leaveGroup(java.net.SocketAddress,java.net.NetworkInterface)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#setSoTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetSoTimeout(int arg0)
+        {
+            IExecute("setSoTimeout", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#setTrafficClass(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetTrafficClass(int arg0)
+        {
+            IExecute("setTrafficClass", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#close()"/>
+        /// </summary>
+        public void Close()
+        {
+            IExecuteWithSignature("close", "()V");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#connect(java.net.InetAddress,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        public void Connect(Java.Net.InetAddress arg0, int arg1)
+        {
+            IExecute("connect", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#connect(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
-        /// <param name="arg1"><see cref="Java.Net.NetworkInterface"/></param>
-        /// <exception cref="Java.Io.IOException"/>
-        public void LeaveGroup(Java.Net.SocketAddress arg0, Java.Net.NetworkInterface arg1)
+        /// <exception cref="Java.Net.SocketException"/>
+        public void Connect(Java.Net.SocketAddress arg0)
         {
-            IExecute("leaveGroup", arg0, arg1);
+            IExecuteWithSignature("connect", "(Ljava/net/SocketAddress;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#receive(java.net.DatagramPacket)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#disconnect()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.DatagramPacket"/></param>
-        /// <exception cref="Java.Io.IOException"/>
-        public void Receive(Java.Net.DatagramPacket arg0)
+        public void Disconnect()
         {
-            IExecuteWithSignature("receive", "(Ljava/net/DatagramPacket;)V", arg0);
+            IExecuteWithSignature("disconnect", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocket.html#send(java.net.DatagramPacket)"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocket.html#send(java.net.DatagramPacket)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.DatagramPacket"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Net/DatagramSocketImplFactory.cs b/src/net/Netdroid/Generated/Java/Net/DatagramSocketImplFactory.cs
index b7a117e68..24543197e 100644
--- a/src/net/Netdroid/Generated/Java/Net/DatagramSocketImplFactory.cs
+++ b/src/net/Netdroid/Generated/Java/Net/DatagramSocketImplFactory.cs
@@ -64,7 +64,7 @@ public partial class DatagramSocketImplFactory : Java.Net.IDatagramSocketImplFac
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/DatagramSocketImplFactory.html#createDatagramSocketImpl()"/>
+        /// <see href="https://developer.android.com/reference/java/net/DatagramSocketImplFactory.html#createDatagramSocketImpl()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.DatagramSocketImpl"/></returns>
         public Java.Net.DatagramSocketImpl CreateDatagramSocketImpl()
diff --git a/src/net/Netdroid/Generated/Java/Net/FileNameMap.cs b/src/net/Netdroid/Generated/Java/Net/FileNameMap.cs
index 3a9d6b5b2..60de15406 100644
--- a/src/net/Netdroid/Generated/Java/Net/FileNameMap.cs
+++ b/src/net/Netdroid/Generated/Java/Net/FileNameMap.cs
@@ -64,7 +64,7 @@ public partial class FileNameMap : Java.Net.IFileNameMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/FileNameMap.html#getContentTypeFor(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/FileNameMap.html#getContentTypeFor(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Net/HttpCookie.cs b/src/net/Netdroid/Generated/Java/Net/HttpCookie.cs
index cb54803a9..6529d44dc 100644
--- a/src/net/Netdroid/Generated/Java/Net/HttpCookie.cs
+++ b/src/net/Netdroid/Generated/Java/Net/HttpCookie.cs
@@ -30,7 +30,7 @@ public partial class HttpCookie
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -51,7 +51,7 @@ public HttpCookie(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#domainMatches(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#domainMatches(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -61,7 +61,7 @@ public static bool DomainMatches(Java.Lang.String arg0, Java.Lang.String arg1)
             return SExecute<bool>(LocalBridgeClazz, "domainMatches", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -74,106 +74,197 @@ public static bool DomainMatches(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getComment()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setComment(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getDiscard()"/>
         /// </summary>
-        public Java.Lang.String Comment
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDiscard()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getComment", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setComment", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getDiscard", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getCommentURL()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setCommentURL(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getSecure()"/>
         /// </summary>
-        public Java.Lang.String CommentURL
+        /// <returns><see cref="bool"/></returns>
+        public bool GetSecure()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCommentURL", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCommentURL", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getSecure", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getDiscard()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setDiscard(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#hasExpired()"/>
         /// </summary>
-        public bool Discard
+        /// <returns><see cref="bool"/></returns>
+        public bool HasExpired()
         {
-            get { return IExecuteWithSignature<bool>("getDiscard", "()Z"); } set { IExecuteWithSignature("setDiscard", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("hasExpired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getDomain()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setDomain(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#isHttpOnly()"/>
         /// </summary>
-        public Java.Lang.String Domain
+        /// <returns><see cref="bool"/></returns>
+        public bool IsHttpOnly()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDomain", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDomain", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isHttpOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getMaxAge()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setMaxAge(long)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getVersion()"/>
         /// </summary>
-        public long MaxAge
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<long>("getMaxAge", "()J"); } set { IExecuteWithSignature("setMaxAge", "(J)V", value); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getComment()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetComment()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getComment", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getPath()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setPath(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getCommentURL()"/>
         /// </summary>
-        public Java.Lang.String Path
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCommentURL()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPath", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getCommentURL", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getPortlist()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setPortlist(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getDomain()"/>
         /// </summary>
-        public Java.Lang.String Portlist
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDomain()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPortlist", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPortlist", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDomain", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getSecure()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setSecure(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getName()"/>
         /// </summary>
-        public bool Secure
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<bool>("getSecure", "()Z"); } set { IExecuteWithSignature("setSecure", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getValue()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getPath()"/>
         /// </summary>
-        public Java.Lang.String Value
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPath()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setValue", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#getVersion()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setVersion(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getPortlist()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPortlist()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); } set { IExecuteWithSignature("setVersion", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPortlist", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#hasExpired()"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getValue()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasExpired()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetValue()
         {
-            return IExecuteWithSignature<bool>("hasExpired", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#isHttpOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#getMaxAge()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsHttpOnly()
+        /// <returns><see cref="long"/></returns>
+        public long GetMaxAge()
         {
-            return IExecuteWithSignature<bool>("isHttpOnly", "()Z");
+            return IExecuteWithSignature<long>("getMaxAge", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setComment(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetComment(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setComment", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setCommentURL(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetCommentURL(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setCommentURL", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setDiscard(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDiscard(bool arg0)
+        {
+            IExecuteWithSignature("setDiscard", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setDomain(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDomain(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDomain", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpCookie.html#setHttpOnly(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setHttpOnly(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetHttpOnly(bool arg0)
         {
             IExecuteWithSignature("setHttpOnly", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setMaxAge(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetMaxAge(long arg0)
+        {
+            IExecuteWithSignature("setMaxAge", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setPath(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPath(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPath", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setPortlist(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPortlist(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPortlist", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setSecure(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetSecure(bool arg0)
+        {
+            IExecuteWithSignature("setSecure", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setValue(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetValue(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setValue", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpCookie.html#setVersion(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetVersion(int arg0)
+        {
+            IExecuteWithSignature("setVersion", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Net/HttpURLConnection.cs b/src/net/Netdroid/Generated/Java/Net/HttpURLConnection.cs
index 44f403669..438765aac 100644
--- a/src/net/Netdroid/Generated/Java/Net/HttpURLConnection.cs
+++ b/src/net/Netdroid/Generated/Java/Net/HttpURLConnection.cs
@@ -38,218 +38,218 @@ public partial class HttpURLConnection
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_ACCEPTED"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_ACCEPTED"/>
         /// </summary>
         public static int HTTP_ACCEPTED { get { if (!_HTTP_ACCEPTEDReady) { _HTTP_ACCEPTEDContent = SGetField<int>(LocalBridgeClazz, "HTTP_ACCEPTED"); _HTTP_ACCEPTEDReady = true; } return _HTTP_ACCEPTEDContent; } }
         private static int _HTTP_ACCEPTEDContent = default;
         private static bool _HTTP_ACCEPTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_BAD_GATEWAY"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_BAD_GATEWAY"/>
         /// </summary>
         public static int HTTP_BAD_GATEWAY { get { if (!_HTTP_BAD_GATEWAYReady) { _HTTP_BAD_GATEWAYContent = SGetField<int>(LocalBridgeClazz, "HTTP_BAD_GATEWAY"); _HTTP_BAD_GATEWAYReady = true; } return _HTTP_BAD_GATEWAYContent; } }
         private static int _HTTP_BAD_GATEWAYContent = default;
         private static bool _HTTP_BAD_GATEWAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_BAD_METHOD"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_BAD_METHOD"/>
         /// </summary>
         public static int HTTP_BAD_METHOD { get { if (!_HTTP_BAD_METHODReady) { _HTTP_BAD_METHODContent = SGetField<int>(LocalBridgeClazz, "HTTP_BAD_METHOD"); _HTTP_BAD_METHODReady = true; } return _HTTP_BAD_METHODContent; } }
         private static int _HTTP_BAD_METHODContent = default;
         private static bool _HTTP_BAD_METHODReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_BAD_REQUEST"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_BAD_REQUEST"/>
         /// </summary>
         public static int HTTP_BAD_REQUEST { get { if (!_HTTP_BAD_REQUESTReady) { _HTTP_BAD_REQUESTContent = SGetField<int>(LocalBridgeClazz, "HTTP_BAD_REQUEST"); _HTTP_BAD_REQUESTReady = true; } return _HTTP_BAD_REQUESTContent; } }
         private static int _HTTP_BAD_REQUESTContent = default;
         private static bool _HTTP_BAD_REQUESTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_CLIENT_TIMEOUT"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_CLIENT_TIMEOUT"/>
         /// </summary>
         public static int HTTP_CLIENT_TIMEOUT { get { if (!_HTTP_CLIENT_TIMEOUTReady) { _HTTP_CLIENT_TIMEOUTContent = SGetField<int>(LocalBridgeClazz, "HTTP_CLIENT_TIMEOUT"); _HTTP_CLIENT_TIMEOUTReady = true; } return _HTTP_CLIENT_TIMEOUTContent; } }
         private static int _HTTP_CLIENT_TIMEOUTContent = default;
         private static bool _HTTP_CLIENT_TIMEOUTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_CONFLICT"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_CONFLICT"/>
         /// </summary>
         public static int HTTP_CONFLICT { get { if (!_HTTP_CONFLICTReady) { _HTTP_CONFLICTContent = SGetField<int>(LocalBridgeClazz, "HTTP_CONFLICT"); _HTTP_CONFLICTReady = true; } return _HTTP_CONFLICTContent; } }
         private static int _HTTP_CONFLICTContent = default;
         private static bool _HTTP_CONFLICTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_CREATED"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_CREATED"/>
         /// </summary>
         public static int HTTP_CREATED { get { if (!_HTTP_CREATEDReady) { _HTTP_CREATEDContent = SGetField<int>(LocalBridgeClazz, "HTTP_CREATED"); _HTTP_CREATEDReady = true; } return _HTTP_CREATEDContent; } }
         private static int _HTTP_CREATEDContent = default;
         private static bool _HTTP_CREATEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_ENTITY_TOO_LARGE"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_ENTITY_TOO_LARGE"/>
         /// </summary>
         public static int HTTP_ENTITY_TOO_LARGE { get { if (!_HTTP_ENTITY_TOO_LARGEReady) { _HTTP_ENTITY_TOO_LARGEContent = SGetField<int>(LocalBridgeClazz, "HTTP_ENTITY_TOO_LARGE"); _HTTP_ENTITY_TOO_LARGEReady = true; } return _HTTP_ENTITY_TOO_LARGEContent; } }
         private static int _HTTP_ENTITY_TOO_LARGEContent = default;
         private static bool _HTTP_ENTITY_TOO_LARGEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_FORBIDDEN"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_FORBIDDEN"/>
         /// </summary>
         public static int HTTP_FORBIDDEN { get { if (!_HTTP_FORBIDDENReady) { _HTTP_FORBIDDENContent = SGetField<int>(LocalBridgeClazz, "HTTP_FORBIDDEN"); _HTTP_FORBIDDENReady = true; } return _HTTP_FORBIDDENContent; } }
         private static int _HTTP_FORBIDDENContent = default;
         private static bool _HTTP_FORBIDDENReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_GATEWAY_TIMEOUT"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_GATEWAY_TIMEOUT"/>
         /// </summary>
         public static int HTTP_GATEWAY_TIMEOUT { get { if (!_HTTP_GATEWAY_TIMEOUTReady) { _HTTP_GATEWAY_TIMEOUTContent = SGetField<int>(LocalBridgeClazz, "HTTP_GATEWAY_TIMEOUT"); _HTTP_GATEWAY_TIMEOUTReady = true; } return _HTTP_GATEWAY_TIMEOUTContent; } }
         private static int _HTTP_GATEWAY_TIMEOUTContent = default;
         private static bool _HTTP_GATEWAY_TIMEOUTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_GONE"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_GONE"/>
         /// </summary>
         public static int HTTP_GONE { get { if (!_HTTP_GONEReady) { _HTTP_GONEContent = SGetField<int>(LocalBridgeClazz, "HTTP_GONE"); _HTTP_GONEReady = true; } return _HTTP_GONEContent; } }
         private static int _HTTP_GONEContent = default;
         private static bool _HTTP_GONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_INTERNAL_ERROR"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_INTERNAL_ERROR"/>
         /// </summary>
         public static int HTTP_INTERNAL_ERROR { get { if (!_HTTP_INTERNAL_ERRORReady) { _HTTP_INTERNAL_ERRORContent = SGetField<int>(LocalBridgeClazz, "HTTP_INTERNAL_ERROR"); _HTTP_INTERNAL_ERRORReady = true; } return _HTTP_INTERNAL_ERRORContent; } }
         private static int _HTTP_INTERNAL_ERRORContent = default;
         private static bool _HTTP_INTERNAL_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_LENGTH_REQUIRED"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_LENGTH_REQUIRED"/>
         /// </summary>
         public static int HTTP_LENGTH_REQUIRED { get { if (!_HTTP_LENGTH_REQUIREDReady) { _HTTP_LENGTH_REQUIREDContent = SGetField<int>(LocalBridgeClazz, "HTTP_LENGTH_REQUIRED"); _HTTP_LENGTH_REQUIREDReady = true; } return _HTTP_LENGTH_REQUIREDContent; } }
         private static int _HTTP_LENGTH_REQUIREDContent = default;
         private static bool _HTTP_LENGTH_REQUIREDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_MOVED_PERM"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_MOVED_PERM"/>
         /// </summary>
         public static int HTTP_MOVED_PERM { get { if (!_HTTP_MOVED_PERMReady) { _HTTP_MOVED_PERMContent = SGetField<int>(LocalBridgeClazz, "HTTP_MOVED_PERM"); _HTTP_MOVED_PERMReady = true; } return _HTTP_MOVED_PERMContent; } }
         private static int _HTTP_MOVED_PERMContent = default;
         private static bool _HTTP_MOVED_PERMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_MOVED_TEMP"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_MOVED_TEMP"/>
         /// </summary>
         public static int HTTP_MOVED_TEMP { get { if (!_HTTP_MOVED_TEMPReady) { _HTTP_MOVED_TEMPContent = SGetField<int>(LocalBridgeClazz, "HTTP_MOVED_TEMP"); _HTTP_MOVED_TEMPReady = true; } return _HTTP_MOVED_TEMPContent; } }
         private static int _HTTP_MOVED_TEMPContent = default;
         private static bool _HTTP_MOVED_TEMPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_MULT_CHOICE"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_MULT_CHOICE"/>
         /// </summary>
         public static int HTTP_MULT_CHOICE { get { if (!_HTTP_MULT_CHOICEReady) { _HTTP_MULT_CHOICEContent = SGetField<int>(LocalBridgeClazz, "HTTP_MULT_CHOICE"); _HTTP_MULT_CHOICEReady = true; } return _HTTP_MULT_CHOICEContent; } }
         private static int _HTTP_MULT_CHOICEContent = default;
         private static bool _HTTP_MULT_CHOICEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_NO_CONTENT"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_NO_CONTENT"/>
         /// </summary>
         public static int HTTP_NO_CONTENT { get { if (!_HTTP_NO_CONTENTReady) { _HTTP_NO_CONTENTContent = SGetField<int>(LocalBridgeClazz, "HTTP_NO_CONTENT"); _HTTP_NO_CONTENTReady = true; } return _HTTP_NO_CONTENTContent; } }
         private static int _HTTP_NO_CONTENTContent = default;
         private static bool _HTTP_NO_CONTENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_NOT_ACCEPTABLE"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_NOT_ACCEPTABLE"/>
         /// </summary>
         public static int HTTP_NOT_ACCEPTABLE { get { if (!_HTTP_NOT_ACCEPTABLEReady) { _HTTP_NOT_ACCEPTABLEContent = SGetField<int>(LocalBridgeClazz, "HTTP_NOT_ACCEPTABLE"); _HTTP_NOT_ACCEPTABLEReady = true; } return _HTTP_NOT_ACCEPTABLEContent; } }
         private static int _HTTP_NOT_ACCEPTABLEContent = default;
         private static bool _HTTP_NOT_ACCEPTABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_NOT_AUTHORITATIVE"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_NOT_AUTHORITATIVE"/>
         /// </summary>
         public static int HTTP_NOT_AUTHORITATIVE { get { if (!_HTTP_NOT_AUTHORITATIVEReady) { _HTTP_NOT_AUTHORITATIVEContent = SGetField<int>(LocalBridgeClazz, "HTTP_NOT_AUTHORITATIVE"); _HTTP_NOT_AUTHORITATIVEReady = true; } return _HTTP_NOT_AUTHORITATIVEContent; } }
         private static int _HTTP_NOT_AUTHORITATIVEContent = default;
         private static bool _HTTP_NOT_AUTHORITATIVEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_NOT_FOUND"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_NOT_FOUND"/>
         /// </summary>
         public static int HTTP_NOT_FOUND { get { if (!_HTTP_NOT_FOUNDReady) { _HTTP_NOT_FOUNDContent = SGetField<int>(LocalBridgeClazz, "HTTP_NOT_FOUND"); _HTTP_NOT_FOUNDReady = true; } return _HTTP_NOT_FOUNDContent; } }
         private static int _HTTP_NOT_FOUNDContent = default;
         private static bool _HTTP_NOT_FOUNDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_NOT_IMPLEMENTED"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_NOT_IMPLEMENTED"/>
         /// </summary>
         public static int HTTP_NOT_IMPLEMENTED { get { if (!_HTTP_NOT_IMPLEMENTEDReady) { _HTTP_NOT_IMPLEMENTEDContent = SGetField<int>(LocalBridgeClazz, "HTTP_NOT_IMPLEMENTED"); _HTTP_NOT_IMPLEMENTEDReady = true; } return _HTTP_NOT_IMPLEMENTEDContent; } }
         private static int _HTTP_NOT_IMPLEMENTEDContent = default;
         private static bool _HTTP_NOT_IMPLEMENTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_NOT_MODIFIED"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_NOT_MODIFIED"/>
         /// </summary>
         public static int HTTP_NOT_MODIFIED { get { if (!_HTTP_NOT_MODIFIEDReady) { _HTTP_NOT_MODIFIEDContent = SGetField<int>(LocalBridgeClazz, "HTTP_NOT_MODIFIED"); _HTTP_NOT_MODIFIEDReady = true; } return _HTTP_NOT_MODIFIEDContent; } }
         private static int _HTTP_NOT_MODIFIEDContent = default;
         private static bool _HTTP_NOT_MODIFIEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_OK"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_OK"/>
         /// </summary>
         public static int HTTP_OK { get { if (!_HTTP_OKReady) { _HTTP_OKContent = SGetField<int>(LocalBridgeClazz, "HTTP_OK"); _HTTP_OKReady = true; } return _HTTP_OKContent; } }
         private static int _HTTP_OKContent = default;
         private static bool _HTTP_OKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_PARTIAL"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_PARTIAL"/>
         /// </summary>
         public static int HTTP_PARTIAL { get { if (!_HTTP_PARTIALReady) { _HTTP_PARTIALContent = SGetField<int>(LocalBridgeClazz, "HTTP_PARTIAL"); _HTTP_PARTIALReady = true; } return _HTTP_PARTIALContent; } }
         private static int _HTTP_PARTIALContent = default;
         private static bool _HTTP_PARTIALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_PAYMENT_REQUIRED"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_PAYMENT_REQUIRED"/>
         /// </summary>
         public static int HTTP_PAYMENT_REQUIRED { get { if (!_HTTP_PAYMENT_REQUIREDReady) { _HTTP_PAYMENT_REQUIREDContent = SGetField<int>(LocalBridgeClazz, "HTTP_PAYMENT_REQUIRED"); _HTTP_PAYMENT_REQUIREDReady = true; } return _HTTP_PAYMENT_REQUIREDContent; } }
         private static int _HTTP_PAYMENT_REQUIREDContent = default;
         private static bool _HTTP_PAYMENT_REQUIREDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_PRECON_FAILED"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_PRECON_FAILED"/>
         /// </summary>
         public static int HTTP_PRECON_FAILED { get { if (!_HTTP_PRECON_FAILEDReady) { _HTTP_PRECON_FAILEDContent = SGetField<int>(LocalBridgeClazz, "HTTP_PRECON_FAILED"); _HTTP_PRECON_FAILEDReady = true; } return _HTTP_PRECON_FAILEDContent; } }
         private static int _HTTP_PRECON_FAILEDContent = default;
         private static bool _HTTP_PRECON_FAILEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_PROXY_AUTH"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_PROXY_AUTH"/>
         /// </summary>
         public static int HTTP_PROXY_AUTH { get { if (!_HTTP_PROXY_AUTHReady) { _HTTP_PROXY_AUTHContent = SGetField<int>(LocalBridgeClazz, "HTTP_PROXY_AUTH"); _HTTP_PROXY_AUTHReady = true; } return _HTTP_PROXY_AUTHContent; } }
         private static int _HTTP_PROXY_AUTHContent = default;
         private static bool _HTTP_PROXY_AUTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_REQ_TOO_LONG"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_REQ_TOO_LONG"/>
         /// </summary>
         public static int HTTP_REQ_TOO_LONG { get { if (!_HTTP_REQ_TOO_LONGReady) { _HTTP_REQ_TOO_LONGContent = SGetField<int>(LocalBridgeClazz, "HTTP_REQ_TOO_LONG"); _HTTP_REQ_TOO_LONGReady = true; } return _HTTP_REQ_TOO_LONGContent; } }
         private static int _HTTP_REQ_TOO_LONGContent = default;
         private static bool _HTTP_REQ_TOO_LONGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_RESET"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_RESET"/>
         /// </summary>
         public static int HTTP_RESET { get { if (!_HTTP_RESETReady) { _HTTP_RESETContent = SGetField<int>(LocalBridgeClazz, "HTTP_RESET"); _HTTP_RESETReady = true; } return _HTTP_RESETContent; } }
         private static int _HTTP_RESETContent = default;
         private static bool _HTTP_RESETReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_SEE_OTHER"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_SEE_OTHER"/>
         /// </summary>
         public static int HTTP_SEE_OTHER { get { if (!_HTTP_SEE_OTHERReady) { _HTTP_SEE_OTHERContent = SGetField<int>(LocalBridgeClazz, "HTTP_SEE_OTHER"); _HTTP_SEE_OTHERReady = true; } return _HTTP_SEE_OTHERContent; } }
         private static int _HTTP_SEE_OTHERContent = default;
         private static bool _HTTP_SEE_OTHERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_SERVER_ERROR"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_SERVER_ERROR"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int HTTP_SERVER_ERROR { get { if (!_HTTP_SERVER_ERRORReady) { _HTTP_SERVER_ERRORContent = SGetField<int>(LocalBridgeClazz, "HTTP_SERVER_ERROR"); _HTTP_SERVER_ERRORReady = true; } return _HTTP_SERVER_ERRORContent; } }
         private static int _HTTP_SERVER_ERRORContent = default;
         private static bool _HTTP_SERVER_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_UNAUTHORIZED"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_UNAUTHORIZED"/>
         /// </summary>
         public static int HTTP_UNAUTHORIZED { get { if (!_HTTP_UNAUTHORIZEDReady) { _HTTP_UNAUTHORIZEDContent = SGetField<int>(LocalBridgeClazz, "HTTP_UNAUTHORIZED"); _HTTP_UNAUTHORIZEDReady = true; } return _HTTP_UNAUTHORIZEDContent; } }
         private static int _HTTP_UNAUTHORIZEDContent = default;
         private static bool _HTTP_UNAUTHORIZEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_UNAVAILABLE"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_UNAVAILABLE"/>
         /// </summary>
         public static int HTTP_UNAVAILABLE { get { if (!_HTTP_UNAVAILABLEReady) { _HTTP_UNAVAILABLEContent = SGetField<int>(LocalBridgeClazz, "HTTP_UNAVAILABLE"); _HTTP_UNAVAILABLEReady = true; } return _HTTP_UNAVAILABLEContent; } }
         private static int _HTTP_UNAVAILABLEContent = default;
         private static bool _HTTP_UNAVAILABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_UNSUPPORTED_TYPE"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_UNSUPPORTED_TYPE"/>
         /// </summary>
         public static int HTTP_UNSUPPORTED_TYPE { get { if (!_HTTP_UNSUPPORTED_TYPEReady) { _HTTP_UNSUPPORTED_TYPEContent = SGetField<int>(LocalBridgeClazz, "HTTP_UNSUPPORTED_TYPE"); _HTTP_UNSUPPORTED_TYPEReady = true; } return _HTTP_UNSUPPORTED_TYPEContent; } }
         private static int _HTTP_UNSUPPORTED_TYPEContent = default;
         private static bool _HTTP_UNSUPPORTED_TYPEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_USE_PROXY"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_USE_PROXY"/>
         /// </summary>
         public static int HTTP_USE_PROXY { get { if (!_HTTP_USE_PROXYReady) { _HTTP_USE_PROXYContent = SGetField<int>(LocalBridgeClazz, "HTTP_USE_PROXY"); _HTTP_USE_PROXYReady = true; } return _HTTP_USE_PROXYContent; } }
         private static int _HTTP_USE_PROXYContent = default;
         private static bool _HTTP_USE_PROXYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#HTTP_VERSION"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#HTTP_VERSION"/>
         /// </summary>
         public static int HTTP_VERSION { get { if (!_HTTP_VERSIONReady) { _HTTP_VERSIONContent = SGetField<int>(LocalBridgeClazz, "HTTP_VERSION"); _HTTP_VERSIONReady = true; } return _HTTP_VERSIONContent; } }
         private static int _HTTP_VERSIONContent = default;
@@ -259,68 +259,84 @@ public partial class HttpURLConnection
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#getFollowRedirects()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#setFollowRedirects(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#getFollowRedirects()"/>
         /// </summary>
-        public static bool FollowRedirects
+        /// <returns><see cref="bool"/></returns>
+        public static bool GetFollowRedirects()
+        {
+            return SExecuteWithSignature<bool>(LocalBridgeClazz, "getFollowRedirects", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#setFollowRedirects(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public static void SetFollowRedirects(bool arg0)
         {
-            get { return SExecuteWithSignature<bool>(LocalBridgeClazz, "getFollowRedirects", "()Z"); } set { SExecuteWithSignature(LocalBridgeClazz, "setFollowRedirects", "(Z)V", value); }
+            SExecuteWithSignature(LocalBridgeClazz, "setFollowRedirects", "(Z)V", arg0);
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#getErrorStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#usingProxy()"/>
         /// </summary>
-        public Java.Io.InputStream ErrorStream
+        /// <returns><see cref="bool"/></returns>
+        public bool UsingProxy()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getErrorStream", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature<bool>("usingProxy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#getInstanceFollowRedirects()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#setInstanceFollowRedirects(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#disconnect()"/>
         /// </summary>
-        public bool InstanceFollowRedirects
+        public void Disconnect()
         {
-            get { return IExecuteWithSignature<bool>("getInstanceFollowRedirects", "()Z"); } set { IExecuteWithSignature("setInstanceFollowRedirects", "(Z)V", value); }
+            IExecuteWithSignature("disconnect", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#getRequestMethod()"/> <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#setRequestMethod(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#getInstanceFollowRedirects()"/>
         /// </summary>
-        public Java.Lang.String RequestMethod
+        /// <returns><see cref="bool"/></returns>
+        public bool GetInstanceFollowRedirects()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRequestMethod", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setRequestMethod", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getInstanceFollowRedirects", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#getResponseCode()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#getResponseCode()"/>
         /// </summary>
-        public int ResponseCode
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public int GetResponseCode()
         {
-            get { return IExecuteWithSignature<int>("getResponseCode", "()I"); }
+            return IExecuteWithSignature<int>("getResponseCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#getResponseMessage()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#getErrorStream()"/>
         /// </summary>
-        public Java.Lang.String ResponseMessage
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetErrorStream()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResponseMessage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getErrorStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#usingProxy()"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#getRequestMethod()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool UsingProxy()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRequestMethod()
         {
-            return IExecuteWithSignature<bool>("usingProxy", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getRequestMethod", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#disconnect()"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#getResponseMessage()"/>
         /// </summary>
-        public void Disconnect()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Lang.String GetResponseMessage()
         {
-            IExecuteWithSignature("disconnect", "()V");
+            return IExecuteWithSignature<Java.Lang.String>("getResponseMessage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#setAuthenticator(java.net.Authenticator)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#setAuthenticator(java.net.Authenticator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Authenticator"/></param>
         public void SetAuthenticator(Java.Net.Authenticator arg0)
@@ -328,7 +344,7 @@ public void SetAuthenticator(Java.Net.Authenticator arg0)
             IExecuteWithSignature("setAuthenticator", "(Ljava/net/Authenticator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#setChunkedStreamingMode(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#setChunkedStreamingMode(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetChunkedStreamingMode(int arg0)
@@ -336,7 +352,7 @@ public void SetChunkedStreamingMode(int arg0)
             IExecuteWithSignature("setChunkedStreamingMode", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#setFixedLengthStreamingMode(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#setFixedLengthStreamingMode(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetFixedLengthStreamingMode(int arg0)
@@ -344,13 +360,30 @@ public void SetFixedLengthStreamingMode(int arg0)
             IExecuteWithSignature("setFixedLengthStreamingMode", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/HttpURLConnection.html#setFixedLengthStreamingMode(long)"/>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#setFixedLengthStreamingMode(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void SetFixedLengthStreamingMode(long arg0)
         {
             IExecuteWithSignature("setFixedLengthStreamingMode", "(J)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#setInstanceFollowRedirects(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetInstanceFollowRedirects(bool arg0)
+        {
+            IExecuteWithSignature("setInstanceFollowRedirects", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/HttpURLConnection.html#setRequestMethod(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Net.ProtocolException"/>
+        public void SetRequestMethod(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setRequestMethod", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Net/IDN.cs b/src/net/Netdroid/Generated/Java/Net/IDN.cs
index 8b51f73b9..f8c92cf6f 100644
--- a/src/net/Netdroid/Generated/Java/Net/IDN.cs
+++ b/src/net/Netdroid/Generated/Java/Net/IDN.cs
@@ -38,13 +38,13 @@ public partial class IDN
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/IDN.html#ALLOW_UNASSIGNED"/>
+        /// <see href="https://developer.android.com/reference/java/net/IDN.html#ALLOW_UNASSIGNED"/>
         /// </summary>
         public static int ALLOW_UNASSIGNED { get { if (!_ALLOW_UNASSIGNEDReady) { _ALLOW_UNASSIGNEDContent = SGetField<int>(LocalBridgeClazz, "ALLOW_UNASSIGNED"); _ALLOW_UNASSIGNEDReady = true; } return _ALLOW_UNASSIGNEDContent; } }
         private static int _ALLOW_UNASSIGNEDContent = default;
         private static bool _ALLOW_UNASSIGNEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/IDN.html#USE_STD3_ASCII_RULES"/>
+        /// <see href="https://developer.android.com/reference/java/net/IDN.html#USE_STD3_ASCII_RULES"/>
         /// </summary>
         public static int USE_STD3_ASCII_RULES { get { if (!_USE_STD3_ASCII_RULESReady) { _USE_STD3_ASCII_RULESContent = SGetField<int>(LocalBridgeClazz, "USE_STD3_ASCII_RULES"); _USE_STD3_ASCII_RULESReady = true; } return _USE_STD3_ASCII_RULESContent; } }
         private static int _USE_STD3_ASCII_RULESContent = default;
@@ -54,7 +54,7 @@ public partial class IDN
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/IDN.html#toASCII(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/IDN.html#toASCII(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -64,7 +64,7 @@ public static Java.Lang.String ToASCII(Java.Lang.String arg0, int arg1)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "toASCII", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/IDN.html#toASCII(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/IDN.html#toASCII(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -73,7 +73,7 @@ public static Java.Lang.String ToASCII(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toASCII", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/IDN.html#toUnicode(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/IDN.html#toUnicode(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -83,7 +83,7 @@ public static Java.Lang.String ToUnicode(Java.Lang.String arg0, int arg1)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "toUnicode", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/IDN.html#toUnicode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/IDN.html#toUnicode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Net/Inet6Address.cs b/src/net/Netdroid/Generated/Java/Net/Inet6Address.cs
index 4db588cdd..60741a30f 100644
--- a/src/net/Netdroid/Generated/Java/Net/Inet6Address.cs
+++ b/src/net/Netdroid/Generated/Java/Net/Inet6Address.cs
@@ -42,7 +42,7 @@ public partial class Inet6Address
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Inet6Address.html#getByAddress(java.lang.String,byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Inet6Address.html#getByAddress(java.lang.String,byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -54,7 +54,7 @@ public static Java.Net.Inet6Address GetByAddress(Java.Lang.String arg0, byte[] a
             return SExecute<Java.Net.Inet6Address>(LocalBridgeClazz, "getByAddress", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Inet6Address.html#getByAddress(java.lang.String,byte[],java.net.NetworkInterface)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Inet6Address.html#getByAddress(java.lang.String,byte[],java.net.NetworkInterface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -70,26 +70,28 @@ public static Java.Net.Inet6Address GetByAddress(Java.Lang.String arg0, byte[] a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Inet6Address.html#getScopedInterface()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Inet6Address.html#isIPv4CompatibleAddress()"/>
         /// </summary>
-        public Java.Net.NetworkInterface ScopedInterface
+        /// <returns><see cref="bool"/></returns>
+        public bool IsIPv4CompatibleAddress()
         {
-            get { return IExecuteWithSignature<Java.Net.NetworkInterface>("getScopedInterface", "()Ljava/net/NetworkInterface;"); }
+            return IExecuteWithSignature<bool>("isIPv4CompatibleAddress", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Inet6Address.html#getScopeId()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Inet6Address.html#getScopeId()"/>
         /// </summary>
-        public int ScopeId
+        /// <returns><see cref="int"/></returns>
+        public int GetScopeId()
         {
-            get { return IExecuteWithSignature<int>("getScopeId", "()I"); }
+            return IExecuteWithSignature<int>("getScopeId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Inet6Address.html#isIPv4CompatibleAddress()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Inet6Address.html#getScopedInterface()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsIPv4CompatibleAddress()
+        /// <returns><see cref="Java.Net.NetworkInterface"/></returns>
+        public Java.Net.NetworkInterface GetScopedInterface()
         {
-            return IExecuteWithSignature<bool>("isIPv4CompatibleAddress", "()Z");
+            return IExecuteWithSignature<Java.Net.NetworkInterface>("getScopedInterface", "()Ljava/net/NetworkInterface;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Net/InetAddress.cs b/src/net/Netdroid/Generated/Java/Net/InetAddress.cs
index 6ee05c9d8..fa13a1259 100644
--- a/src/net/Netdroid/Generated/Java/Net/InetAddress.cs
+++ b/src/net/Netdroid/Generated/Java/Net/InetAddress.cs
@@ -42,21 +42,7 @@ public partial class InetAddress
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getLocalHost()"/> 
-        /// </summary>
-        public static Java.Net.InetAddress LocalHost
-        {
-            get { return SExecuteWithSignature<Java.Net.InetAddress>(LocalBridgeClazz, "getLocalHost", "()Ljava/net/InetAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getLoopbackAddress()"/> 
-        /// </summary>
-        public static Java.Net.InetAddress LoopbackAddress
-        {
-            get { return SExecuteWithSignature<Java.Net.InetAddress>(LocalBridgeClazz, "getLoopbackAddress", "()Ljava/net/InetAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getByAddress(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getByAddress(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Net.InetAddress"/></returns>
@@ -66,7 +52,7 @@ public static Java.Net.InetAddress GetByAddress(byte[] arg0)
             return SExecuteWithSignature<Java.Net.InetAddress>(LocalBridgeClazz, "getByAddress", "([B)Ljava/net/InetAddress;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getByAddress(java.lang.String,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getByAddress(java.lang.String,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -77,7 +63,7 @@ public static Java.Net.InetAddress GetByAddress(Java.Lang.String arg0, byte[] ar
             return SExecute<Java.Net.InetAddress>(LocalBridgeClazz, "getByAddress", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getByName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getByName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.InetAddress"/></returns>
@@ -87,49 +73,38 @@ public static Java.Net.InetAddress GetByName(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Net.InetAddress>(LocalBridgeClazz, "getByName", "(Ljava/lang/String;)Ljava/net/InetAddress;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getAllByName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getLocalHost()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.InetAddress"/></returns>
         /// <exception cref="Java.Net.UnknownHostException"/>
-        public static Java.Net.InetAddress[] GetAllByName(Java.Lang.String arg0)
+        public static Java.Net.InetAddress GetLocalHost()
         {
-            return SExecuteWithSignatureArray<Java.Net.InetAddress>(LocalBridgeClazz, "getAllByName", "(Ljava/lang/String;)[Ljava/net/InetAddress;", arg0);
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getAddress()"/> 
-        /// </summary>
-        public byte[] Address
-        {
-            get { return IExecuteWithSignatureArray<byte>("getAddress", "()[B"); }
+            return SExecuteWithSignature<Java.Net.InetAddress>(LocalBridgeClazz, "getLocalHost", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getCanonicalHostName()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getLoopbackAddress()"/>
         /// </summary>
-        public Java.Lang.String CanonicalHostName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCanonicalHostName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getHostAddress()"/> 
-        /// </summary>
-        public Java.Lang.String HostAddress
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public static Java.Net.InetAddress GetLoopbackAddress()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHostAddress", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Net.InetAddress>(LocalBridgeClazz, "getLoopbackAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#getHostName()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getAllByName(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String HostName
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        /// <exception cref="Java.Net.UnknownHostException"/>
+        public static Java.Net.InetAddress[] GetAllByName(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHostName", "()Ljava/lang/String;"); }
+            return SExecuteWithSignatureArray<Java.Net.InetAddress>(LocalBridgeClazz, "getAllByName", "(Ljava/lang/String;)[Ljava/net/InetAddress;", arg0);
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isAnyLocalAddress()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isAnyLocalAddress()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAnyLocalAddress()
@@ -137,7 +112,7 @@ public bool IsAnyLocalAddress()
             return IExecuteWithSignature<bool>("isAnyLocalAddress", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isLinkLocalAddress()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isLinkLocalAddress()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLinkLocalAddress()
@@ -145,7 +120,7 @@ public bool IsLinkLocalAddress()
             return IExecuteWithSignature<bool>("isLinkLocalAddress", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isLoopbackAddress()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isLoopbackAddress()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLoopbackAddress()
@@ -153,7 +128,7 @@ public bool IsLoopbackAddress()
             return IExecuteWithSignature<bool>("isLoopbackAddress", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isMCGlobal()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isMCGlobal()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMCGlobal()
@@ -161,7 +136,7 @@ public bool IsMCGlobal()
             return IExecuteWithSignature<bool>("isMCGlobal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isMCLinkLocal()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isMCLinkLocal()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMCLinkLocal()
@@ -169,7 +144,7 @@ public bool IsMCLinkLocal()
             return IExecuteWithSignature<bool>("isMCLinkLocal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isMCNodeLocal()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isMCNodeLocal()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMCNodeLocal()
@@ -177,7 +152,7 @@ public bool IsMCNodeLocal()
             return IExecuteWithSignature<bool>("isMCNodeLocal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isMCOrgLocal()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isMCOrgLocal()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMCOrgLocal()
@@ -185,7 +160,7 @@ public bool IsMCOrgLocal()
             return IExecuteWithSignature<bool>("isMCOrgLocal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isMCSiteLocal()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isMCSiteLocal()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMCSiteLocal()
@@ -193,7 +168,7 @@ public bool IsMCSiteLocal()
             return IExecuteWithSignature<bool>("isMCSiteLocal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isMulticastAddress()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isMulticastAddress()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMulticastAddress()
@@ -201,7 +176,7 @@ public bool IsMulticastAddress()
             return IExecuteWithSignature<bool>("isMulticastAddress", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isReachable(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isReachable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -211,7 +186,7 @@ public bool IsReachable(int arg0)
             return IExecuteWithSignature<bool>("isReachable", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isReachable(java.net.NetworkInterface,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isReachable(java.net.NetworkInterface,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.NetworkInterface"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -223,13 +198,45 @@ public bool IsReachable(Java.Net.NetworkInterface arg0, int arg1, int arg2)
             return IExecute<bool>("isReachable", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetAddress.html#isSiteLocalAddress()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#isSiteLocalAddress()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsSiteLocalAddress()
         {
             return IExecuteWithSignature<bool>("isSiteLocalAddress", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getAddress()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetAddress()
+        {
+            return IExecuteWithSignatureArray<byte>("getAddress", "()[B");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getCanonicalHostName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCanonicalHostName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCanonicalHostName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getHostAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHostAddress()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getHostAddress", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/InetAddress.html#getHostName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHostName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getHostName", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Net/InetSocketAddress.cs b/src/net/Netdroid/Generated/Java/Net/InetSocketAddress.cs
index 8ac9f7308..1414059a6 100644
--- a/src/net/Netdroid/Generated/Java/Net/InetSocketAddress.cs
+++ b/src/net/Netdroid/Generated/Java/Net/InetSocketAddress.cs
@@ -30,7 +30,7 @@ public partial class InetSocketAddress
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public InetSocketAddress(int arg0)
@@ -38,7 +38,7 @@ public InetSocketAddress(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#%3Cinit%3E(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#%3Cinit%3E(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -47,7 +47,7 @@ public InetSocketAddress(Java.Lang.String arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#%3Cinit%3E(java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#%3Cinit%3E(java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -68,7 +68,7 @@ public InetSocketAddress(Java.Net.InetAddress arg0, int arg1)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#createUnresolved(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#createUnresolved(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -82,40 +82,44 @@ public static Java.Net.InetSocketAddress CreateUnresolved(Java.Lang.String arg0,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#isUnresolved()"/>
         /// </summary>
-        public Java.Net.InetAddress Address
+        /// <returns><see cref="bool"/></returns>
+        public bool IsUnresolved()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<bool>("isUnresolved", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#getHostName()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#getPort()"/>
         /// </summary>
-        public Java.Lang.String HostName
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHostName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#getHostString()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#getHostName()"/>
         /// </summary>
-        public Java.Lang.String HostString
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHostName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHostString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHostName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#getHostString()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHostString()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHostString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InetSocketAddress.html#isUnresolved()"/>
+        /// <see href="https://developer.android.com/reference/java/net/InetSocketAddress.html#getAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUnresolved()
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetAddress()
         {
-            return IExecuteWithSignature<bool>("isUnresolved", "()Z");
+            return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Net/InterfaceAddress.cs b/src/net/Netdroid/Generated/Java/Net/InterfaceAddress.cs
index e2bf0a58b..10e7f0f69 100644
--- a/src/net/Netdroid/Generated/Java/Net/InterfaceAddress.cs
+++ b/src/net/Netdroid/Generated/Java/Net/InterfaceAddress.cs
@@ -46,25 +46,28 @@ public partial class InterfaceAddress
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InterfaceAddress.html#getAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InterfaceAddress.html#getAddress()"/>
         /// </summary>
-        public Java.Net.InetAddress Address
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetAddress()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InterfaceAddress.html#getBroadcast()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InterfaceAddress.html#getBroadcast()"/>
         /// </summary>
-        public Java.Net.InetAddress Broadcast
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetBroadcast()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getBroadcast", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getBroadcast", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/InterfaceAddress.html#getNetworkPrefixLength()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/InterfaceAddress.html#getNetworkPrefixLength()"/>
         /// </summary>
-        public short NetworkPrefixLength
+        /// <returns><see cref="short"/></returns>
+        public short GetNetworkPrefixLength()
         {
-            get { return IExecuteWithSignature<short>("getNetworkPrefixLength", "()S"); }
+            return IExecuteWithSignature<short>("getNetworkPrefixLength", "()S");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Net/JarURLConnection.cs b/src/net/Netdroid/Generated/Java/Net/JarURLConnection.cs
index 05c78ad37..34d90faf2 100644
--- a/src/net/Netdroid/Generated/Java/Net/JarURLConnection.cs
+++ b/src/net/Netdroid/Generated/Java/Net/JarURLConnection.cs
@@ -46,60 +46,74 @@ public partial class JarURLConnection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html#getAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html#getJarFile()"/>
         /// </summary>
-        public Java.Util.Jar.Attributes Attributes
+        /// <returns><see cref="Java.Util.Jar.JarFile"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Jar.JarFile GetJarFile()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.Attributes>("getAttributes", "()Ljava/util/jar/Attributes;"); }
+            return IExecuteWithSignature<Java.Util.Jar.JarFile>("getJarFile", "()Ljava/util/jar/JarFile;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html#getCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html#getEntryName()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] Certificates
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEntryName()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEntryName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html#getEntryName()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html#getJarFileURL()"/>
         /// </summary>
-        public Java.Lang.String EntryName
+        /// <returns><see cref="Java.Net.URL"/></returns>
+        public Java.Net.URL GetJarFileURL()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEntryName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Net.URL>("getJarFileURL", "()Ljava/net/URL;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html#getJarEntry()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html#getCertificates()"/>
         /// </summary>
-        public Java.Util.Jar.JarEntry JarEntry
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Security.Cert.Certificate[] GetCertificates()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.JarEntry>("getJarEntry", "()Ljava/util/jar/JarEntry;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html#getJarFile()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html#getAttributes()"/>
         /// </summary>
-        public Java.Util.Jar.JarFile JarFile
+        /// <returns><see cref="Java.Util.Jar.Attributes"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Jar.Attributes GetAttributes()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.JarFile>("getJarFile", "()Ljava/util/jar/JarFile;"); }
+            return IExecuteWithSignature<Java.Util.Jar.Attributes>("getAttributes", "()Ljava/util/jar/Attributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html#getJarFileURL()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html#getMainAttributes()"/>
         /// </summary>
-        public Java.Net.URL JarFileURL
+        /// <returns><see cref="Java.Util.Jar.Attributes"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Jar.Attributes GetMainAttributes()
         {
-            get { return IExecuteWithSignature<Java.Net.URL>("getJarFileURL", "()Ljava/net/URL;"); }
+            return IExecuteWithSignature<Java.Util.Jar.Attributes>("getMainAttributes", "()Ljava/util/jar/Attributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html#getMainAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html#getJarEntry()"/>
         /// </summary>
-        public Java.Util.Jar.Attributes MainAttributes
+        /// <returns><see cref="Java.Util.Jar.JarEntry"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Jar.JarEntry GetJarEntry()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.Attributes>("getMainAttributes", "()Ljava/util/jar/Attributes;"); }
+            return IExecuteWithSignature<Java.Util.Jar.JarEntry>("getJarEntry", "()Ljava/util/jar/JarEntry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/JarURLConnection.html#getManifest()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/JarURLConnection.html#getManifest()"/>
         /// </summary>
-        public Java.Util.Jar.Manifest Manifest
+        /// <returns><see cref="Java.Util.Jar.Manifest"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Jar.Manifest GetManifest()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.Manifest>("getManifest", "()Ljava/util/jar/Manifest;"); }
+            return IExecuteWithSignature<Java.Util.Jar.Manifest>("getManifest", "()Ljava/util/jar/Manifest;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Net/MulticastSocket.cs b/src/net/Netdroid/Generated/Java/Net/MulticastSocket.cs
index 9e4d6b93c..d6b2d591f 100644
--- a/src/net/Netdroid/Generated/Java/Net/MulticastSocket.cs
+++ b/src/net/Netdroid/Generated/Java/Net/MulticastSocket.cs
@@ -30,7 +30,7 @@ public partial class MulticastSocket
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -39,7 +39,7 @@ public MulticastSocket(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#%3Cinit%3E(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#%3Cinit%3E(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -64,74 +64,146 @@ public MulticastSocket(Java.Net.SocketAddress arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#getInterface()"/> <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#setInterface(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#getLoopbackMode()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Net.InetAddress Interface
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool GetLoopbackMode()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getInterface", "()Ljava/net/InetAddress;"); } set { IExecuteWithSignature("setInterface", "(Ljava/net/InetAddress;)V", value); }
+            return IExecuteWithSignature<bool>("getLoopbackMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#getLoopbackMode()"/> <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#setLoopbackMode(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#getTTL()"/>
         /// </summary>
-        [System.Obsolete()]
-        public bool LoopbackMode
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        [global::System.Obsolete()]
+        public byte GetTTL()
         {
-            get { return IExecuteWithSignature<bool>("getLoopbackMode", "()Z"); } set { IExecuteWithSignature("setLoopbackMode", "(Z)V", value); }
+            return IExecuteWithSignature<byte>("getTTL", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#getNetworkInterface()"/> <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#setNetworkInterface(java.net.NetworkInterface)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#getTimeToLive()"/>
         /// </summary>
-        public Java.Net.NetworkInterface NetworkInterface
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public int GetTimeToLive()
         {
-            get { return IExecuteWithSignature<Java.Net.NetworkInterface>("getNetworkInterface", "()Ljava/net/NetworkInterface;"); } set { IExecuteWithSignature("setNetworkInterface", "(Ljava/net/NetworkInterface;)V", value); }
+            return IExecuteWithSignature<int>("getTimeToLive", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#getTimeToLive()"/> <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#setTimeToLive(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#getInterface()"/>
         /// </summary>
-        public int TimeToLive
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public Java.Net.InetAddress GetInterface()
         {
-            get { return IExecuteWithSignature<int>("getTimeToLive", "()I"); } set { IExecuteWithSignature("setTimeToLive", "(I)V", value); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getInterface", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#getTTL()"/> <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#setTTL(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#getNetworkInterface()"/>
         /// </summary>
-        [System.Obsolete()]
-        public byte TTL
+        /// <returns><see cref="Java.Net.NetworkInterface"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public Java.Net.NetworkInterface GetNetworkInterface()
         {
-            get { return IExecuteWithSignature<byte>("getTTL", "()B"); } set { IExecuteWithSignature("setTTL", "(B)V", value); }
+            return IExecuteWithSignature<Java.Net.NetworkInterface>("getNetworkInterface", "()Ljava/net/NetworkInterface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#joinGroup(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#joinGroup(java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
         public void JoinGroup(Java.Net.InetAddress arg0)
         {
             IExecuteWithSignature("joinGroup", "(Ljava/net/InetAddress;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#leaveGroup(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#joinGroup(java.net.SocketAddress,java.net.NetworkInterface)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
+        /// <param name="arg1"><see cref="Java.Net.NetworkInterface"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void JoinGroup(Java.Net.SocketAddress arg0, Java.Net.NetworkInterface arg1)
+        {
+            IExecute("joinGroup", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#leaveGroup(java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
         public void LeaveGroup(Java.Net.InetAddress arg0)
         {
             IExecuteWithSignature("leaveGroup", "(Ljava/net/InetAddress;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/MulticastSocket.html#send(java.net.DatagramPacket,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#leaveGroup(java.net.SocketAddress,java.net.NetworkInterface)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
+        /// <param name="arg1"><see cref="Java.Net.NetworkInterface"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void LeaveGroup(Java.Net.SocketAddress arg0, Java.Net.NetworkInterface arg1)
+        {
+            IExecute("leaveGroup", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#send(java.net.DatagramPacket,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.DatagramPacket"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Send(Java.Net.DatagramPacket arg0, byte arg1)
         {
             IExecute("send", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#setInterface(java.net.InetAddress)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetInterface(Java.Net.InetAddress arg0)
+        {
+            IExecuteWithSignature("setInterface", "(Ljava/net/InetAddress;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#setLoopbackMode(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetLoopbackMode(bool arg0)
+        {
+            IExecuteWithSignature("setLoopbackMode", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#setNetworkInterface(java.net.NetworkInterface)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.NetworkInterface"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetNetworkInterface(Java.Net.NetworkInterface arg0)
+        {
+            IExecuteWithSignature("setNetworkInterface", "(Ljava/net/NetworkInterface;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#setTimeToLive(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetTimeToLive(int arg0)
+        {
+            IExecuteWithSignature("setTimeToLive", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/MulticastSocket.html#setTTL(byte)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        [global::System.Obsolete()]
+        public void SetTTL(byte arg0)
+        {
+            IExecuteWithSignature("setTTL", "(B)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Net/NetPermission.cs b/src/net/Netdroid/Generated/Java/Net/NetPermission.cs
index a2465d051..5ff7cdc4a 100644
--- a/src/net/Netdroid/Generated/Java/Net/NetPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Net/NetPermission.cs
@@ -30,7 +30,7 @@ public partial class NetPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public NetPermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetPermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetPermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public NetPermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Net/NetworkInterface.cs b/src/net/Netdroid/Generated/Java/Net/NetworkInterface.cs
index c001d9589..1421ebf89 100644
--- a/src/net/Netdroid/Generated/Java/Net/NetworkInterface.cs
+++ b/src/net/Netdroid/Generated/Java/Net/NetworkInterface.cs
@@ -42,7 +42,7 @@ public partial class NetworkInterface
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getByIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getByIndex(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Net.NetworkInterface"/></returns>
@@ -52,7 +52,7 @@ public static Java.Net.NetworkInterface GetByIndex(int arg0)
             return SExecuteWithSignature<Java.Net.NetworkInterface>(LocalBridgeClazz, "getByIndex", "(I)Ljava/net/NetworkInterface;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getByInetAddress(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getByInetAddress(java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <returns><see cref="Java.Net.NetworkInterface"/></returns>
@@ -62,7 +62,7 @@ public static Java.Net.NetworkInterface GetByInetAddress(Java.Net.InetAddress ar
             return SExecuteWithSignature<Java.Net.NetworkInterface>(LocalBridgeClazz, "getByInetAddress", "(Ljava/net/InetAddress;)Ljava/net/NetworkInterface;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getByName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getByName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.NetworkInterface"/></returns>
@@ -72,7 +72,7 @@ public static Java.Net.NetworkInterface GetByName(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Net.NetworkInterface>(LocalBridgeClazz, "getByName", "(Ljava/lang/String;)Ljava/net/NetworkInterface;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getNetworkInterfaces()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getNetworkInterfaces()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         /// <exception cref="Java.Net.SocketException"/>
@@ -81,7 +81,7 @@ public static Java.Net.NetworkInterface GetByName(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.Enumeration<Java.Net.NetworkInterface>>(LocalBridgeClazz, "getNetworkInterfaces", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#networkInterfaces()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#networkInterfaces()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         /// <exception cref="Java.Net.SocketException"/>
@@ -94,100 +94,101 @@ public static Java.Net.NetworkInterface GetByName(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#isLoopback()"/>
         /// </summary>
-        public Java.Lang.String DisplayName
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool IsLoopback()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isLoopback", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getHardwareAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#isPointToPoint()"/>
         /// </summary>
-        public byte[] HardwareAddress
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool IsPointToPoint()
         {
-            get { return IExecuteWithSignatureArray<byte>("getHardwareAddress", "()[B"); }
+            return IExecuteWithSignature<bool>("isPointToPoint", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getIndex()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#isUp()"/>
         /// </summary>
-        public int Index
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool IsUp()
         {
-            get { return IExecuteWithSignature<int>("getIndex", "()I"); }
+            return IExecuteWithSignature<bool>("isUp", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getInterfaceAddresses()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#isVirtual()"/>
         /// </summary>
-        public Java.Util.List<Java.Net.InterfaceAddress> InterfaceAddresses
+        /// <returns><see cref="bool"/></returns>
+        public bool IsVirtual()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Net.InterfaceAddress>>("getInterfaceAddresses", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<bool>("isVirtual", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getMTU()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#supportsMulticast()"/>
         /// </summary>
-        public int MTU
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool SupportsMulticast()
         {
-            get { return IExecuteWithSignature<int>("getMTU", "()I"); }
+            return IExecuteWithSignature<bool>("supportsMulticast", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getHardwareAddress()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public byte[] GetHardwareAddress()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getHardwareAddress", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getIndex()"/>
         /// </summary>
-        public Java.Net.NetworkInterface Parent
+        /// <returns><see cref="int"/></returns>
+        public int GetIndex()
         {
-            get { return IExecuteWithSignature<Java.Net.NetworkInterface>("getParent", "()Ljava/net/NetworkInterface;"); }
+            return IExecuteWithSignature<int>("getIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#isLoopback()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getMTU()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
+        /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Net.SocketException"/>
-        public bool IsLoopback()
+        public int GetMTU()
         {
-            return IExecuteWithSignature<bool>("isLoopback", "()Z");
+            return IExecuteWithSignature<int>("getMTU", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#isPointToPoint()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getDisplayName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Java.Net.SocketException"/>
-        public bool IsPointToPoint()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName()
         {
-            return IExecuteWithSignature<bool>("isPointToPoint", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#isUp()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getName()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Java.Net.SocketException"/>
-        public bool IsUp()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("isUp", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#isVirtual()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getParent()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsVirtual()
-        {
-            return IExecuteWithSignature<bool>("isVirtual", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#supportsMulticast()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Java.Net.SocketException"/>
-        public bool SupportsMulticast()
+        /// <returns><see cref="Java.Net.NetworkInterface"/></returns>
+        public Java.Net.NetworkInterface GetParent()
         {
-            return IExecuteWithSignature<bool>("supportsMulticast", "()Z");
+            return IExecuteWithSignature<Java.Net.NetworkInterface>("getParent", "()Ljava/net/NetworkInterface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getInetAddresses()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getInetAddresses()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<Java.Net.InetAddress> GetInetAddresses()
@@ -195,7 +196,7 @@ public bool SupportsMulticast()
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Net.InetAddress>>("getInetAddresses", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#getSubInterfaces()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getSubInterfaces()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<Java.Net.NetworkInterface> GetSubInterfaces()
@@ -203,7 +204,15 @@ public bool SupportsMulticast()
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Net.NetworkInterface>>("getSubInterfaces", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#inetAddresses()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#getInterfaceAddresses()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Net.InterfaceAddress> GetInterfaceAddresses()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Net.InterfaceAddress>>("getInterfaceAddresses", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#inetAddresses()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Net.InetAddress> InetAddresses()
@@ -211,7 +220,7 @@ public bool SupportsMulticast()
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Net.InetAddress>>("inetAddresses", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/NetworkInterface.html#subInterfaces()"/>
+        /// <see href="https://developer.android.com/reference/java/net/NetworkInterface.html#subInterfaces()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Net.NetworkInterface> SubInterfaces()
diff --git a/src/net/Netdroid/Generated/Java/Net/PasswordAuthentication.cs b/src/net/Netdroid/Generated/Java/Net/PasswordAuthentication.cs
index 360370a3b..f5911990f 100644
--- a/src/net/Netdroid/Generated/Java/Net/PasswordAuthentication.cs
+++ b/src/net/Netdroid/Generated/Java/Net/PasswordAuthentication.cs
@@ -30,7 +30,7 @@ public partial class PasswordAuthentication
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/PasswordAuthentication.html#%3Cinit%3E(java.lang.String,char[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/PasswordAuthentication.html#%3Cinit%3E(java.lang.String,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -55,18 +55,20 @@ public PasswordAuthentication(Java.Lang.String arg0, char[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/PasswordAuthentication.html#getPassword()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/PasswordAuthentication.html#getPassword()"/>
         /// </summary>
-        public char[] Password
+        /// <returns><see cref="char"/></returns>
+        public char[] GetPassword()
         {
-            get { return IExecuteWithSignatureArray<char>("getPassword", "()[C"); }
+            return IExecuteWithSignatureArray<char>("getPassword", "()[C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/PasswordAuthentication.html#getUserName()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/PasswordAuthentication.html#getUserName()"/>
         /// </summary>
-        public Java.Lang.String UserName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUserName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUserName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Net/ProtocolFamily.cs b/src/net/Netdroid/Generated/Java/Net/ProtocolFamily.cs
index 4bc6bff7d..d3df633f9 100644
--- a/src/net/Netdroid/Generated/Java/Net/ProtocolFamily.cs
+++ b/src/net/Netdroid/Generated/Java/Net/ProtocolFamily.cs
@@ -64,7 +64,7 @@ public partial class ProtocolFamily : Java.Net.IProtocolFamily
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ProtocolFamily.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/net/ProtocolFamily.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
diff --git a/src/net/Netdroid/Generated/Java/Net/Proxy.cs b/src/net/Netdroid/Generated/Java/Net/Proxy.cs
index 42964d9c1..2f40011e2 100644
--- a/src/net/Netdroid/Generated/Java/Net/Proxy.cs
+++ b/src/net/Netdroid/Generated/Java/Net/Proxy.cs
@@ -30,7 +30,7 @@ public partial class Proxy
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.html#%3Cinit%3E(java.net.Proxy.Type,java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Proxy.html#%3Cinit%3E(java.net.Proxy.Type,java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Proxy.Type"/></param>
         /// <param name="arg1"><see cref="Java.Net.SocketAddress"/></param>
@@ -47,7 +47,7 @@ public Proxy(Java.Net.Proxy.Type arg0, Java.Net.SocketAddress arg1)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.html#NO_PROXY"/>
+        /// <see href="https://developer.android.com/reference/java/net/Proxy.html#NO_PROXY"/>
         /// </summary>
         public static Java.Net.Proxy NO_PROXY { get { if (!_NO_PROXYReady) { _NO_PROXYContent = SGetField<Java.Net.Proxy>(LocalBridgeClazz, "NO_PROXY"); _NO_PROXYReady = true; } return _NO_PROXYContent; } }
         private static Java.Net.Proxy _NO_PROXYContent = default;
@@ -61,7 +61,7 @@ public Proxy(Java.Net.Proxy.Type arg0, Java.Net.SocketAddress arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.html#type()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Proxy.html#type()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.Proxy.Type"/></returns>
         public Java.Net.Proxy.Type TypeMethod()
@@ -69,7 +69,7 @@ public Java.Net.Proxy.Type TypeMethod()
             return IExecuteWithSignature<Java.Net.Proxy.Type>("type", "()Ljava/net/Proxy$Type;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.html#address()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Proxy.html#address()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.SocketAddress"/></returns>
         public Java.Net.SocketAddress Address()
@@ -93,19 +93,19 @@ public partial class Type
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.Type.html#DIRECT"/>
+            /// <see href="https://developer.android.com/reference/java/net/Proxy.Type.html#DIRECT"/>
             /// </summary>
             public static Java.Net.Proxy.Type DIRECT { get { if (!_DIRECTReady) { _DIRECTContent = SGetField<Java.Net.Proxy.Type>(LocalBridgeClazz, "DIRECT"); _DIRECTReady = true; } return _DIRECTContent; } }
             private static Java.Net.Proxy.Type _DIRECTContent = default;
             private static bool _DIRECTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.Type.html#HTTP"/>
+            /// <see href="https://developer.android.com/reference/java/net/Proxy.Type.html#HTTP"/>
             /// </summary>
             public static Java.Net.Proxy.Type HTTP { get { if (!_HTTPReady) { _HTTPContent = SGetField<Java.Net.Proxy.Type>(LocalBridgeClazz, "HTTP"); _HTTPReady = true; } return _HTTPContent; } }
             private static Java.Net.Proxy.Type _HTTPContent = default;
             private static bool _HTTPReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.Type.html#SOCKS"/>
+            /// <see href="https://developer.android.com/reference/java/net/Proxy.Type.html#SOCKS"/>
             /// </summary>
             public static Java.Net.Proxy.Type SOCKS { get { if (!_SOCKSReady) { _SOCKSContent = SGetField<Java.Net.Proxy.Type>(LocalBridgeClazz, "SOCKS"); _SOCKSReady = true; } return _SOCKSContent; } }
             private static Java.Net.Proxy.Type _SOCKSContent = default;
@@ -115,7 +115,7 @@ public partial class Type
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.Type.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/net/Proxy.Type.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Net.Proxy.Type"/></returns>
@@ -124,7 +124,7 @@ public static Java.Net.Proxy.Type ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Net.Proxy.Type>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/net/Proxy$Type;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/net/Proxy.Type.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/net/Proxy.Type.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Net.Proxy.Type"/></returns>
             public static Java.Net.Proxy.Type[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Net/ProxySelector.cs b/src/net/Netdroid/Generated/Java/Net/ProxySelector.cs
index 8fb062598..12230affb 100644
--- a/src/net/Netdroid/Generated/Java/Net/ProxySelector.cs
+++ b/src/net/Netdroid/Generated/Java/Net/ProxySelector.cs
@@ -42,14 +42,15 @@ public partial class ProxySelector
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ProxySelector.html#getDefault()"/> <see href="https://developer.android.com/reference/java.base/java/net/ProxySelector.html#setDefault(java.net.ProxySelector)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ProxySelector.html#getDefault()"/>
         /// </summary>
-        public static Java.Net.ProxySelector Default
+        /// <returns><see cref="Java.Net.ProxySelector"/></returns>
+        public static Java.Net.ProxySelector GetDefault()
         {
-            get { return SExecuteWithSignature<Java.Net.ProxySelector>(LocalBridgeClazz, "getDefault", "()Ljava/net/ProxySelector;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/net/ProxySelector;)V", value); }
+            return SExecuteWithSignature<Java.Net.ProxySelector>(LocalBridgeClazz, "getDefault", "()Ljava/net/ProxySelector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ProxySelector.html#of(java.net.InetSocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ProxySelector.html#of(java.net.InetSocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetSocketAddress"/></param>
         /// <returns><see cref="Java.Net.ProxySelector"/></returns>
@@ -57,12 +58,20 @@ public static Java.Net.ProxySelector Of(Java.Net.InetSocketAddress arg0)
         {
             return SExecuteWithSignature<Java.Net.ProxySelector>(LocalBridgeClazz, "of", "(Ljava/net/InetSocketAddress;)Ljava/net/ProxySelector;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/ProxySelector.html#setDefault(java.net.ProxySelector)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.ProxySelector"/></param>
+        public static void SetDefault(Java.Net.ProxySelector arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/net/ProxySelector;)V", arg0);
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ProxySelector.html#select(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ProxySelector.html#select(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -71,7 +80,7 @@ public static Java.Net.ProxySelector Of(Java.Net.InetSocketAddress arg0)
             return IExecuteWithSignature<Java.Util.List<Java.Net.Proxy>>("select", "(Ljava/net/URI;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ProxySelector.html#connectFailed(java.net.URI,java.net.SocketAddress,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ProxySelector.html#connectFailed(java.net.URI,java.net.SocketAddress,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Net.SocketAddress"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Net/ResponseCache.cs b/src/net/Netdroid/Generated/Java/Net/ResponseCache.cs
index 17537c93b..69f25a58c 100644
--- a/src/net/Netdroid/Generated/Java/Net/ResponseCache.cs
+++ b/src/net/Netdroid/Generated/Java/Net/ResponseCache.cs
@@ -42,18 +42,27 @@ public partial class ResponseCache
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ResponseCache.html#getDefault()"/> <see href="https://developer.android.com/reference/java.base/java/net/ResponseCache.html#setDefault(java.net.ResponseCache)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ResponseCache.html#getDefault()"/>
         /// </summary>
-        public static Java.Net.ResponseCache Default
+        /// <returns><see cref="Java.Net.ResponseCache"/></returns>
+        public static Java.Net.ResponseCache GetDefault()
         {
-            get { return SExecuteWithSignature<Java.Net.ResponseCache>(LocalBridgeClazz, "getDefault", "()Ljava/net/ResponseCache;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/net/ResponseCache;)V", value); }
+            return SExecuteWithSignature<Java.Net.ResponseCache>(LocalBridgeClazz, "getDefault", "()Ljava/net/ResponseCache;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/ResponseCache.html#setDefault(java.net.ResponseCache)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.ResponseCache"/></param>
+        public static void SetDefault(Java.Net.ResponseCache arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/net/ResponseCache;)V", arg0);
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ResponseCache.html#put(java.net.URI,java.net.URLConnection)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ResponseCache.html#put(java.net.URI,java.net.URLConnection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Net.URLConnection"/></param>
@@ -64,7 +73,7 @@ public Java.Net.CacheRequest Put(Java.Net.URI arg0, Java.Net.URLConnection arg1)
             return IExecute<Java.Net.CacheRequest>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ResponseCache.html#get(java.net.URI,java.lang.String,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ResponseCache.html#get(java.net.URI,java.lang.String,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Net/SecureCacheResponse.cs b/src/net/Netdroid/Generated/Java/Net/SecureCacheResponse.cs
index 7fbc6174d..4da9075d3 100644
--- a/src/net/Netdroid/Generated/Java/Net/SecureCacheResponse.cs
+++ b/src/net/Netdroid/Generated/Java/Net/SecureCacheResponse.cs
@@ -46,46 +46,46 @@ public partial class SecureCacheResponse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SecureCacheResponse.html#getCipherSuite()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/SecureCacheResponse.html#getCipherSuite()"/>
         /// </summary>
-        public Java.Lang.String CipherSuite
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCipherSuite()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCipherSuite", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCipherSuite", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SecureCacheResponse.html#getLocalCertificateChain()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/SecureCacheResponse.html#getLocalPrincipal()"/>
         /// </summary>
-        public Java.Util.List<Java.Security.Cert.Certificate> LocalCertificateChain
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetLocalPrincipal()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.Certificate>>("getLocalCertificateChain", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getLocalPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SecureCacheResponse.html#getLocalPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/SecureCacheResponse.html#getPeerPrincipal()"/>
         /// </summary>
-        public Java.Security.Principal LocalPrincipal
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        public Java.Security.Principal GetPeerPrincipal()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getLocalPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getPeerPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SecureCacheResponse.html#getPeerPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/SecureCacheResponse.html#getLocalCertificateChain()"/>
         /// </summary>
-        public Java.Security.Principal PeerPrincipal
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Security.Cert.Certificate> GetLocalCertificateChain()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getPeerPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.Certificate>>("getLocalCertificateChain", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SecureCacheResponse.html#getServerCertificateChain()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/SecureCacheResponse.html#getServerCertificateChain()"/>
         /// </summary>
-        public Java.Util.List<Java.Security.Cert.Certificate> ServerCertificateChain
+        /// <returns><see cref="Java.Util.List"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        public Java.Util.List<Java.Security.Cert.Certificate> GetServerCertificateChain()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.Certificate>>("getServerCertificateChain", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SecureCacheResponse.html#getSSLSession()"/> 
-        /// </summary>
-        public Java.Util.Optional<Javax.Net.Ssl.SSLSession> SSLSession
-        {
-            get { return IExecuteWithSignature<Java.Util.Optional<Javax.Net.Ssl.SSLSession>>("getSSLSession", "()Ljava/util/Optional;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.Certificate>>("getServerCertificateChain", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Net/ServerSocket.cs b/src/net/Netdroid/Generated/Java/Net/ServerSocket.cs
index 566df7192..7f833c05e 100644
--- a/src/net/Netdroid/Generated/Java/Net/ServerSocket.cs
+++ b/src/net/Netdroid/Generated/Java/Net/ServerSocket.cs
@@ -30,7 +30,7 @@ public partial class ServerSocket
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#%3Cinit%3E(int,int,java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#%3Cinit%3E(int,int,java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -41,7 +41,7 @@ public ServerSocket(int arg0, int arg1, Java.Net.InetAddress arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#%3Cinit%3E(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#%3Cinit%3E(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -51,7 +51,7 @@ public ServerSocket(int arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -72,11 +72,10 @@ public ServerSocket(int arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#setSocketFactory(java.net.SocketImplFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#setSocketFactory(java.net.SocketImplFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketImplFactory"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
         public static void SetSocketFactory(Java.Net.SocketImplFactory arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "setSocketFactory", "(Ljava/net/SocketImplFactory;)V", arg0);
@@ -86,112 +85,140 @@ public static void SetSocketFactory(Java.Net.SocketImplFactory arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#getChannel()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
-        public Java.Nio.Channels.ServerSocketChannel Channel
+        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
+        /// <param name="arg1"><typeparamref name="T"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><see cref="Java.Net.ServerSocket"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.ServerSocket SetOption<T>(Java.Net.SocketOption<T> arg0, T arg1)
         {
-            get { return IExecuteWithSignature<Java.Nio.Channels.ServerSocketChannel>("getChannel", "()Ljava/nio/channels/ServerSocketChannel;"); }
+            return IExecute<Java.Net.ServerSocket>("setOption", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#getInetAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#getOption(java.net.SocketOption)"/>
         /// </summary>
-        public Java.Net.InetAddress InetAddress
+        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public T GetOption<T>(Java.Net.SocketOption<T> arg0)
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getInetAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<T>("getOption", "(Ljava/net/SocketOption;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#getLocalPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#getReuseAddress()"/>
         /// </summary>
-        public int LocalPort
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool GetReuseAddress()
         {
-            get { return IExecuteWithSignature<int>("getLocalPort", "()I"); }
+            return IExecuteWithSignature<bool>("getReuseAddress", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#getLocalSocketAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#isBound()"/>
         /// </summary>
-        public Java.Net.SocketAddress LocalSocketAddress
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBound()
         {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalSocketAddress", "()Ljava/net/SocketAddress;"); }
+            return IExecuteWithSignature<bool>("isBound", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#getReceiveBufferSize()"/> <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#setReceiveBufferSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#isClosed()"/>
         /// </summary>
-        public int ReceiveBufferSize
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClosed()
         {
-            get { return IExecuteWithSignature<int>("getReceiveBufferSize", "()I"); } set { IExecuteWithSignature("setReceiveBufferSize", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#getReuseAddress()"/> <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#setReuseAddress(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#getLocalPort()"/>
         /// </summary>
-        public bool ReuseAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetLocalPort()
         {
-            get { return IExecuteWithSignature<bool>("getReuseAddress", "()Z"); } set { IExecuteWithSignature("setReuseAddress", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getLocalPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#getSoTimeout()"/> <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#setSoTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#getInetAddress()"/>
         /// </summary>
-        public int SoTimeout
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetInetAddress()
         {
-            get { return IExecuteWithSignature<int>("getSoTimeout", "()I"); } set { IExecuteWithSignature("setSoTimeout", "(I)V", value); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getInetAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#accept()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
-        /// <param name="arg1"><typeparamref name="T"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="Java.Net.ServerSocket"/></returns>
+        /// <returns><see cref="Java.Net.Socket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public Java.Net.ServerSocket SetOption<T>(Java.Net.SocketOption<T> arg0, T arg1)
+        public Java.Net.Socket Accept()
         {
-            return IExecute<Java.Net.ServerSocket>("setOption", arg0, arg1);
+            return IExecuteWithSignature<Java.Net.Socket>("accept", "()Ljava/net/Socket;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#getOption(java.net.SocketOption)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#getLocalSocketAddress()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public T GetOption<T>(Java.Net.SocketOption<T> arg0)
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        public Java.Net.SocketAddress GetLocalSocketAddress()
         {
-            return IExecuteWithSignature<T>("getOption", "(Ljava/net/SocketOption;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalSocketAddress", "()Ljava/net/SocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#isBound()"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#getChannel()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBound()
+        /// <returns><see cref="Java.Nio.Channels.ServerSocketChannel"/></returns>
+        public Java.Nio.Channels.ServerSocketChannel GetChannel()
         {
-            return IExecuteWithSignature<bool>("isBound", "()Z");
+            return IExecuteWithSignature<Java.Nio.Channels.ServerSocketChannel>("getChannel", "()Ljava/nio/channels/ServerSocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#supportedOptions()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClosed()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Net.SocketOption<object>> SupportedOptions()
         {
-            return IExecuteWithSignature<bool>("isClosed", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Net.SocketOption<object>>>("supportedOptions", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#accept()"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#getReceiveBufferSize()"/>
         /// </summary>
-        /// <returns><see cref="Java.Net.Socket"/></returns>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetReceiveBufferSize()
+        {
+            return IExecute<int>("getReceiveBufferSize");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#getSoTimeout()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public Java.Net.Socket Accept()
+        public int GetSoTimeout()
         {
-            return IExecuteWithSignature<Java.Net.Socket>("accept", "()Ljava/net/Socket;");
+            return IExecute<int>("getSoTimeout");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#supportedOptions()"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#setReceiveBufferSize(int)"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Set"/></returns>
-        public Java.Util.Set<Java.Net.SocketOption<object>> SupportedOptions()
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetReceiveBufferSize(int arg0)
         {
-            return IExecuteWithSignature<Java.Util.Set<Java.Net.SocketOption<object>>>("supportedOptions", "()Ljava/util/Set;");
+            IExecute("setReceiveBufferSize", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#setSoTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetSoTimeout(int arg0)
+        {
+            IExecute("setSoTimeout", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#bind(java.net.SocketAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#bind(java.net.SocketAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -201,7 +228,7 @@ public void Bind(Java.Net.SocketAddress arg0, int arg1)
             IExecute("bind", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -210,7 +237,7 @@ public void Bind(Java.Net.SocketAddress arg0)
             IExecuteWithSignature("bind", "(Ljava/net/SocketAddress;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
@@ -218,7 +245,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/ServerSocket.html#setPerformancePreferences(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#setPerformancePreferences(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -227,6 +254,15 @@ public void SetPerformancePreferences(int arg0, int arg1, int arg2)
         {
             IExecute("setPerformancePreferences", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/ServerSocket.html#setReuseAddress(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetReuseAddress(bool arg0)
+        {
+            IExecuteWithSignature("setReuseAddress", "(Z)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Net/Socket.cs b/src/net/Netdroid/Generated/Java/Net/Socket.cs
index 61320862f..18d2d0b40 100644
--- a/src/net/Netdroid/Generated/Java/Net/Socket.cs
+++ b/src/net/Netdroid/Generated/Java/Net/Socket.cs
@@ -30,19 +30,19 @@ public partial class Socket
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#%3Cinit%3E(java.lang.String,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#%3Cinit%3E(java.lang.String,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Socket(Java.Lang.String arg0, int arg1, bool arg2)
             : base(arg0, arg1, arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#%3Cinit%3E(java.lang.String,int,java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#%3Cinit%3E(java.lang.String,int,java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -54,7 +54,7 @@ public Socket(Java.Lang.String arg0, int arg1, Java.Net.InetAddress arg2, int ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#%3Cinit%3E(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#%3Cinit%3E(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -65,19 +65,19 @@ public Socket(Java.Lang.String arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#%3Cinit%3E(java.net.InetAddress,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#%3Cinit%3E(java.net.InetAddress,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Socket(Java.Net.InetAddress arg0, int arg1, bool arg2)
             : base(arg0, arg1, arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#%3Cinit%3E(java.net.InetAddress,int,java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#%3Cinit%3E(java.net.InetAddress,int,java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -89,7 +89,7 @@ public Socket(Java.Net.InetAddress arg0, int arg1, Java.Net.InetAddress arg2, in
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#%3Cinit%3E(java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#%3Cinit%3E(java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -99,7 +99,7 @@ public Socket(Java.Net.InetAddress arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#%3Cinit%3E(java.net.Proxy)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#%3Cinit%3E(java.net.Proxy)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Proxy"/></param>
         public Socket(Java.Net.Proxy arg0)
@@ -119,11 +119,10 @@ public Socket(Java.Net.Proxy arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setSocketImplFactory(java.net.SocketImplFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setSocketImplFactory(java.net.SocketImplFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketImplFactory"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
         public static void SetSocketImplFactory(Java.Net.SocketImplFactory arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "setSocketImplFactory", "(Ljava/net/SocketImplFactory;)V", arg0);
@@ -133,212 +132,268 @@ public static void SetSocketImplFactory(Java.Net.SocketImplFactory arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getChannel()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
-        public Java.Nio.Channels.SocketChannel Channel
+        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
+        /// <param name="arg1"><typeparamref name="T"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><see cref="Java.Net.Socket"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.Socket SetOption<T>(Java.Net.SocketOption<T> arg0, T arg1)
         {
-            get { return IExecuteWithSignature<Java.Nio.Channels.SocketChannel>("getChannel", "()Ljava/nio/channels/SocketChannel;"); }
+            return IExecute<Java.Net.Socket>("setOption", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getInetAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getOption(java.net.SocketOption)"/>
         /// </summary>
-        public Java.Net.InetAddress InetAddress
+        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public T GetOption<T>(Java.Net.SocketOption<T> arg0)
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getInetAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<T>("getOption", "(Ljava/net/SocketOption;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getInputStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getKeepAlive()"/>
         /// </summary>
-        public Java.Io.InputStream InputStream
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool GetKeepAlive()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature<bool>("getKeepAlive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getKeepAlive()"/> <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setKeepAlive(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getOOBInline()"/>
         /// </summary>
-        public bool KeepAlive
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool GetOOBInline()
         {
-            get { return IExecuteWithSignature<bool>("getKeepAlive", "()Z"); } set { IExecuteWithSignature("setKeepAlive", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getOOBInline", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getLocalAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getReuseAddress()"/>
         /// </summary>
-        public Java.Net.InetAddress LocalAddress
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool GetReuseAddress()
         {
-            get { return IExecuteWithSignature<Java.Net.InetAddress>("getLocalAddress", "()Ljava/net/InetAddress;"); }
+            return IExecuteWithSignature<bool>("getReuseAddress", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getLocalPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getTcpNoDelay()"/>
         /// </summary>
-        public int LocalPort
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public bool GetTcpNoDelay()
         {
-            get { return IExecuteWithSignature<int>("getLocalPort", "()I"); }
+            return IExecuteWithSignature<bool>("getTcpNoDelay", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getLocalSocketAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#isBound()"/>
         /// </summary>
-        public Java.Net.SocketAddress LocalSocketAddress
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBound()
         {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalSocketAddress", "()Ljava/net/SocketAddress;"); }
+            return IExecuteWithSignature<bool>("isBound", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getOOBInline()"/> <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setOOBInline(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#isClosed()"/>
         /// </summary>
-        public bool OOBInline
+        /// <returns><see cref="bool"/></returns>
+        public bool IsClosed()
         {
-            get { return IExecuteWithSignature<bool>("getOOBInline", "()Z"); } set { IExecuteWithSignature("setOOBInline", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getOutputStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#isConnected()"/>
         /// </summary>
-        public Java.Io.OutputStream OutputStream
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConnected()
         {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;"); }
+            return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#isInputShutdown()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInputShutdown()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<bool>("isInputShutdown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getReceiveBufferSize()"/> <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setReceiveBufferSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#isOutputShutdown()"/>
         /// </summary>
-        public int ReceiveBufferSize
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOutputShutdown()
         {
-            get { return IExecuteWithSignature<int>("getReceiveBufferSize", "()I"); } set { IExecuteWithSignature("setReceiveBufferSize", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isOutputShutdown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getRemoteSocketAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getLocalPort()"/>
         /// </summary>
-        public Java.Net.SocketAddress RemoteSocketAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetLocalPort()
         {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteSocketAddress", "()Ljava/net/SocketAddress;"); }
+            return IExecuteWithSignature<int>("getLocalPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getReuseAddress()"/> <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setReuseAddress(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getPort()"/>
         /// </summary>
-        public bool ReuseAddress
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<bool>("getReuseAddress", "()Z"); } set { IExecuteWithSignature("setReuseAddress", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getSendBufferSize()"/> <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setSendBufferSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getSoLinger()"/>
         /// </summary>
-        public int SendBufferSize
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetSoLinger()
         {
-            get { return IExecuteWithSignature<int>("getSendBufferSize", "()I"); } set { IExecuteWithSignature("setSendBufferSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getSoLinger", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getSoLinger()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getTrafficClass()"/>
         /// </summary>
-        public int SoLinger
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetTrafficClass()
         {
-            get { return IExecuteWithSignature<int>("getSoLinger", "()I"); }
+            return IExecuteWithSignature<int>("getTrafficClass", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getSoTimeout()"/> <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setSoTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getInputStream()"/>
         /// </summary>
-        public int SoTimeout
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.InputStream GetInputStream()
         {
-            get { return IExecuteWithSignature<int>("getSoTimeout", "()I"); } set { IExecuteWithSignature("setSoTimeout", "(I)V", value); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getTcpNoDelay()"/> <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setTcpNoDelay(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getOutputStream()"/>
         /// </summary>
-        public bool TcpNoDelay
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.OutputStream GetOutputStream()
         {
-            get { return IExecuteWithSignature<bool>("getTcpNoDelay", "()Z"); } set { IExecuteWithSignature("setTcpNoDelay", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getTrafficClass()"/> <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setTrafficClass(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getInetAddress()"/>
         /// </summary>
-        public int TrafficClass
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetInetAddress()
         {
-            get { return IExecuteWithSignature<int>("getTrafficClass", "()I"); } set { IExecuteWithSignature("setTrafficClass", "(I)V", value); }
+            return IExecuteWithSignature<Java.Net.InetAddress>("getInetAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getLocalAddress()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
-        /// <param name="arg1"><typeparamref name="T"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="Java.Net.Socket"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Java.Net.Socket SetOption<T>(Java.Net.SocketOption<T> arg0, T arg1)
+        /// <returns><see cref="Java.Net.InetAddress"/></returns>
+        public Java.Net.InetAddress GetLocalAddress()
         {
-            return IExecute<Java.Net.Socket>("setOption", arg0, arg1);
+            return IExecuteWithSignature<Java.Net.InetAddress>("getLocalAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#getOption(java.net.SocketOption)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getLocalSocketAddress()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public T GetOption<T>(Java.Net.SocketOption<T> arg0)
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        public Java.Net.SocketAddress GetLocalSocketAddress()
         {
-            return IExecuteWithSignature<T>("getOption", "(Ljava/net/SocketOption;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalSocketAddress", "()Ljava/net/SocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#isBound()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getRemoteSocketAddress()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsBound()
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        public Java.Net.SocketAddress GetRemoteSocketAddress()
         {
-            return IExecuteWithSignature<bool>("isBound", "()Z");
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteSocketAddress", "()Ljava/net/SocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getChannel()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsClosed()
+        /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
+        public Java.Nio.Channels.SocketChannel GetChannel()
         {
-            return IExecuteWithSignature<bool>("isClosed", "()Z");
+            return IExecuteWithSignature<Java.Nio.Channels.SocketChannel>("getChannel", "()Ljava/nio/channels/SocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#supportedOptions()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConnected()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Net.SocketOption<object>> SupportedOptions()
         {
-            return IExecuteWithSignature<bool>("isConnected", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Net.SocketOption<object>>>("supportedOptions", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#isInputShutdown()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getReceiveBufferSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInputShutdown()
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetReceiveBufferSize()
         {
-            return IExecuteWithSignature<bool>("isInputShutdown", "()Z");
+            return IExecute<int>("getReceiveBufferSize");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#isOutputShutdown()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getSendBufferSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOutputShutdown()
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetSendBufferSize()
         {
-            return IExecuteWithSignature<bool>("isOutputShutdown", "()Z");
+            return IExecute<int>("getSendBufferSize");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#supportedOptions()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#getSoTimeout()"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Set"/></returns>
-        public Java.Util.Set<Java.Net.SocketOption<object>> SupportedOptions()
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Net.SocketException"/>
+        public int GetSoTimeout()
         {
-            return IExecuteWithSignature<Java.Util.Set<Java.Net.SocketOption<object>>>("supportedOptions", "()Ljava/util/Set;");
+            return IExecute<int>("getSoTimeout");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
         {
-            IExecuteWithSignature("close", "()V");
+            IExecute("close");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setReceiveBufferSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetReceiveBufferSize(int arg0)
+        {
+            IExecute("setReceiveBufferSize", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setSendBufferSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetSendBufferSize(int arg0)
+        {
+            IExecute("setSendBufferSize", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setSoTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetSoTimeout(int arg0)
+        {
+            IExecute("setSoTimeout", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -347,7 +402,7 @@ public void Bind(Java.Net.SocketAddress arg0)
             IExecuteWithSignature("bind", "(Ljava/net/SocketAddress;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#connect(java.net.SocketAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#connect(java.net.SocketAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -357,7 +412,7 @@ public void Connect(Java.Net.SocketAddress arg0, int arg1)
             IExecute("connect", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#connect(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#connect(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -366,7 +421,7 @@ public void Connect(Java.Net.SocketAddress arg0)
             IExecuteWithSignature("connect", "(Ljava/net/SocketAddress;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#sendUrgentData(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#sendUrgentData(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -375,7 +430,25 @@ public void SendUrgentData(int arg0)
             IExecuteWithSignature("sendUrgentData", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setPerformancePreferences(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setKeepAlive(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetKeepAlive(bool arg0)
+        {
+            IExecuteWithSignature("setKeepAlive", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setOOBInline(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetOOBInline(bool arg0)
+        {
+            IExecuteWithSignature("setOOBInline", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setPerformancePreferences(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -385,7 +458,16 @@ public void SetPerformancePreferences(int arg0, int arg1, int arg2)
             IExecute("setPerformancePreferences", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#setSoLinger(boolean,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setReuseAddress(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetReuseAddress(bool arg0)
+        {
+            IExecuteWithSignature("setReuseAddress", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setSoLinger(boolean,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -395,7 +477,25 @@ public void SetSoLinger(bool arg0, int arg1)
             IExecute("setSoLinger", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#shutdownInput()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setTcpNoDelay(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetTcpNoDelay(bool arg0)
+        {
+            IExecuteWithSignature("setTcpNoDelay", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#setTrafficClass(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Net.SocketException"/>
+        public void SetTrafficClass(int arg0)
+        {
+            IExecuteWithSignature("setTrafficClass", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#shutdownInput()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void ShutdownInput()
@@ -403,7 +503,7 @@ public void ShutdownInput()
             IExecuteWithSignature("shutdownInput", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/Socket.html#shutdownOutput()"/>
+        /// <see href="https://developer.android.com/reference/java/net/Socket.html#shutdownOutput()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void ShutdownOutput()
diff --git a/src/net/Netdroid/Generated/Java/Net/SocketImplFactory.cs b/src/net/Netdroid/Generated/Java/Net/SocketImplFactory.cs
index 05aa5e701..4bb0ea9ac 100644
--- a/src/net/Netdroid/Generated/Java/Net/SocketImplFactory.cs
+++ b/src/net/Netdroid/Generated/Java/Net/SocketImplFactory.cs
@@ -64,7 +64,7 @@ public partial class SocketImplFactory : Java.Net.ISocketImplFactory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketImplFactory.html#createSocketImpl()"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketImplFactory.html#createSocketImpl()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.SocketImpl"/></returns>
         public Java.Net.SocketImpl CreateSocketImpl()
diff --git a/src/net/Netdroid/Generated/Java/Net/SocketOption.cs b/src/net/Netdroid/Generated/Java/Net/SocketOption.cs
index 55ebea856..83792b26b 100644
--- a/src/net/Netdroid/Generated/Java/Net/SocketOption.cs
+++ b/src/net/Netdroid/Generated/Java/Net/SocketOption.cs
@@ -46,7 +46,7 @@ public partial class SocketOption
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOption.html#type()"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOption.html#type()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Class"/></returns>
         public Java.Lang.Class Type()
@@ -54,7 +54,7 @@ public Java.Lang.Class Type()
             return IExecuteWithSignature<Java.Lang.Class>("type", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOption.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOption.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -115,7 +115,7 @@ public partial class SocketOption<T> : Java.Net.ISocketOption<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOption.html#type()"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOption.html#type()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Class"/></returns>
         public Java.Lang.Class Type()
@@ -123,7 +123,7 @@ public Java.Lang.Class Type()
             return IExecuteWithSignature<Java.Lang.Class>("type", "()Ljava/lang/Class;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOption.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOption.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
diff --git a/src/net/Netdroid/Generated/Java/Net/SocketOptions.cs b/src/net/Netdroid/Generated/Java/Net/SocketOptions.cs
index 4a9943cb7..71c6e744e 100644
--- a/src/net/Netdroid/Generated/Java/Net/SocketOptions.cs
+++ b/src/net/Netdroid/Generated/Java/Net/SocketOptions.cs
@@ -56,91 +56,91 @@ public partial class SocketOptions : Java.Net.ISocketOptions
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#IP_MULTICAST_IF"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#IP_MULTICAST_IF"/>
         /// </summary>
         public static int IP_MULTICAST_IF { get { if (!_IP_MULTICAST_IFReady) { _IP_MULTICAST_IFContent = SGetField<int>(LocalBridgeClazz, "IP_MULTICAST_IF"); _IP_MULTICAST_IFReady = true; } return _IP_MULTICAST_IFContent; } }
         private static int _IP_MULTICAST_IFContent = default;
         private static bool _IP_MULTICAST_IFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#IP_MULTICAST_IF2"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#IP_MULTICAST_IF2"/>
         /// </summary>
         public static int IP_MULTICAST_IF2 { get { if (!_IP_MULTICAST_IF2Ready) { _IP_MULTICAST_IF2Content = SGetField<int>(LocalBridgeClazz, "IP_MULTICAST_IF2"); _IP_MULTICAST_IF2Ready = true; } return _IP_MULTICAST_IF2Content; } }
         private static int _IP_MULTICAST_IF2Content = default;
         private static bool _IP_MULTICAST_IF2Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#IP_MULTICAST_LOOP"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#IP_MULTICAST_LOOP"/>
         /// </summary>
         public static int IP_MULTICAST_LOOP { get { if (!_IP_MULTICAST_LOOPReady) { _IP_MULTICAST_LOOPContent = SGetField<int>(LocalBridgeClazz, "IP_MULTICAST_LOOP"); _IP_MULTICAST_LOOPReady = true; } return _IP_MULTICAST_LOOPContent; } }
         private static int _IP_MULTICAST_LOOPContent = default;
         private static bool _IP_MULTICAST_LOOPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#IP_TOS"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#IP_TOS"/>
         /// </summary>
         public static int IP_TOS { get { if (!_IP_TOSReady) { _IP_TOSContent = SGetField<int>(LocalBridgeClazz, "IP_TOS"); _IP_TOSReady = true; } return _IP_TOSContent; } }
         private static int _IP_TOSContent = default;
         private static bool _IP_TOSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_BINDADDR"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_BINDADDR"/>
         /// </summary>
         public static int SO_BINDADDR { get { if (!_SO_BINDADDRReady) { _SO_BINDADDRContent = SGetField<int>(LocalBridgeClazz, "SO_BINDADDR"); _SO_BINDADDRReady = true; } return _SO_BINDADDRContent; } }
         private static int _SO_BINDADDRContent = default;
         private static bool _SO_BINDADDRReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_BROADCAST"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_BROADCAST"/>
         /// </summary>
         public static int SO_BROADCAST { get { if (!_SO_BROADCASTReady) { _SO_BROADCASTContent = SGetField<int>(LocalBridgeClazz, "SO_BROADCAST"); _SO_BROADCASTReady = true; } return _SO_BROADCASTContent; } }
         private static int _SO_BROADCASTContent = default;
         private static bool _SO_BROADCASTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_KEEPALIVE"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_KEEPALIVE"/>
         /// </summary>
         public static int SO_KEEPALIVE { get { if (!_SO_KEEPALIVEReady) { _SO_KEEPALIVEContent = SGetField<int>(LocalBridgeClazz, "SO_KEEPALIVE"); _SO_KEEPALIVEReady = true; } return _SO_KEEPALIVEContent; } }
         private static int _SO_KEEPALIVEContent = default;
         private static bool _SO_KEEPALIVEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_LINGER"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_LINGER"/>
         /// </summary>
         public static int SO_LINGER { get { if (!_SO_LINGERReady) { _SO_LINGERContent = SGetField<int>(LocalBridgeClazz, "SO_LINGER"); _SO_LINGERReady = true; } return _SO_LINGERContent; } }
         private static int _SO_LINGERContent = default;
         private static bool _SO_LINGERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_OOBINLINE"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_OOBINLINE"/>
         /// </summary>
         public static int SO_OOBINLINE { get { if (!_SO_OOBINLINEReady) { _SO_OOBINLINEContent = SGetField<int>(LocalBridgeClazz, "SO_OOBINLINE"); _SO_OOBINLINEReady = true; } return _SO_OOBINLINEContent; } }
         private static int _SO_OOBINLINEContent = default;
         private static bool _SO_OOBINLINEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_RCVBUF"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_RCVBUF"/>
         /// </summary>
         public static int SO_RCVBUF { get { if (!_SO_RCVBUFReady) { _SO_RCVBUFContent = SGetField<int>(LocalBridgeClazz, "SO_RCVBUF"); _SO_RCVBUFReady = true; } return _SO_RCVBUFContent; } }
         private static int _SO_RCVBUFContent = default;
         private static bool _SO_RCVBUFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_REUSEADDR"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_REUSEADDR"/>
         /// </summary>
         public static int SO_REUSEADDR { get { if (!_SO_REUSEADDRReady) { _SO_REUSEADDRContent = SGetField<int>(LocalBridgeClazz, "SO_REUSEADDR"); _SO_REUSEADDRReady = true; } return _SO_REUSEADDRContent; } }
         private static int _SO_REUSEADDRContent = default;
         private static bool _SO_REUSEADDRReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_REUSEPORT"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_REUSEPORT"/>
         /// </summary>
         public static int SO_REUSEPORT { get { if (!_SO_REUSEPORTReady) { _SO_REUSEPORTContent = SGetField<int>(LocalBridgeClazz, "SO_REUSEPORT"); _SO_REUSEPORTReady = true; } return _SO_REUSEPORTContent; } }
         private static int _SO_REUSEPORTContent = default;
         private static bool _SO_REUSEPORTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_SNDBUF"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_SNDBUF"/>
         /// </summary>
         public static int SO_SNDBUF { get { if (!_SO_SNDBUFReady) { _SO_SNDBUFContent = SGetField<int>(LocalBridgeClazz, "SO_SNDBUF"); _SO_SNDBUFReady = true; } return _SO_SNDBUFContent; } }
         private static int _SO_SNDBUFContent = default;
         private static bool _SO_SNDBUFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#SO_TIMEOUT"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#SO_TIMEOUT"/>
         /// </summary>
         public static int SO_TIMEOUT { get { if (!_SO_TIMEOUTReady) { _SO_TIMEOUTContent = SGetField<int>(LocalBridgeClazz, "SO_TIMEOUT"); _SO_TIMEOUTReady = true; } return _SO_TIMEOUTContent; } }
         private static int _SO_TIMEOUTContent = default;
         private static bool _SO_TIMEOUTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#TCP_NODELAY"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#TCP_NODELAY"/>
         /// </summary>
         public static int TCP_NODELAY { get { if (!_TCP_NODELAYReady) { _TCP_NODELAYContent = SGetField<int>(LocalBridgeClazz, "TCP_NODELAY"); _TCP_NODELAYReady = true; } return _TCP_NODELAYContent; } }
         private static int _TCP_NODELAYContent = default;
@@ -154,7 +154,7 @@ public partial class SocketOptions : Java.Net.ISocketOptions
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#getOption(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#getOption(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -164,7 +164,7 @@ public object GetOption(int arg0)
             return IExecuteWithSignature("getOption", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketOptions.html#setOption(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketOptions.html#setOption(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Net/SocketPermission.cs b/src/net/Netdroid/Generated/Java/Net/SocketPermission.cs
index 3feb9ce67..4f4cb3e9b 100644
--- a/src/net/Netdroid/Generated/Java/Net/SocketPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Net/SocketPermission.cs
@@ -30,7 +30,7 @@ public partial class SocketPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/SocketPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/SocketPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Net/StandardProtocolFamily.cs b/src/net/Netdroid/Generated/Java/Net/StandardProtocolFamily.cs
index 6b00cc8ff..8a1de2678 100644
--- a/src/net/Netdroid/Generated/Java/Net/StandardProtocolFamily.cs
+++ b/src/net/Netdroid/Generated/Java/Net/StandardProtocolFamily.cs
@@ -42,29 +42,23 @@ public partial class StandardProtocolFamily
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardProtocolFamily.html#INET"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardProtocolFamily.html#INET"/>
         /// </summary>
         public static Java.Net.StandardProtocolFamily INET { get { if (!_INETReady) { _INETContent = SGetField<Java.Net.StandardProtocolFamily>(LocalBridgeClazz, "INET"); _INETReady = true; } return _INETContent; } }
         private static Java.Net.StandardProtocolFamily _INETContent = default;
         private static bool _INETReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardProtocolFamily.html#INET6"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardProtocolFamily.html#INET6"/>
         /// </summary>
         public static Java.Net.StandardProtocolFamily INET6 { get { if (!_INET6Ready) { _INET6Content = SGetField<Java.Net.StandardProtocolFamily>(LocalBridgeClazz, "INET6"); _INET6Ready = true; } return _INET6Content; } }
         private static Java.Net.StandardProtocolFamily _INET6Content = default;
         private static bool _INET6Ready = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardProtocolFamily.html#UNIX"/>
-        /// </summary>
-        public static Java.Net.StandardProtocolFamily UNIX { get { if (!_UNIXReady) { _UNIXContent = SGetField<Java.Net.StandardProtocolFamily>(LocalBridgeClazz, "UNIX"); _UNIXReady = true; } return _UNIXContent; } }
-        private static Java.Net.StandardProtocolFamily _UNIXContent = default;
-        private static bool _UNIXReady = false; // this is used because in case of generics 
 
         #endregion
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardProtocolFamily.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardProtocolFamily.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.StandardProtocolFamily"/></returns>
@@ -73,7 +67,7 @@ public static Java.Net.StandardProtocolFamily ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Net.StandardProtocolFamily>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/net/StandardProtocolFamily;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardProtocolFamily.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardProtocolFamily.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.StandardProtocolFamily"/></returns>
         public static Java.Net.StandardProtocolFamily[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Net/StandardSocketOptions.cs b/src/net/Netdroid/Generated/Java/Net/StandardSocketOptions.cs
index 683368fcd..d6132b50c 100644
--- a/src/net/Netdroid/Generated/Java/Net/StandardSocketOptions.cs
+++ b/src/net/Netdroid/Generated/Java/Net/StandardSocketOptions.cs
@@ -38,73 +38,73 @@ public partial class StandardSocketOptions
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#IP_MULTICAST_LOOP"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#IP_MULTICAST_LOOP"/>
         /// </summary>
         public static Java.Net.SocketOption IP_MULTICAST_LOOP { get { if (!_IP_MULTICAST_LOOPReady) { _IP_MULTICAST_LOOPContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "IP_MULTICAST_LOOP"); _IP_MULTICAST_LOOPReady = true; } return _IP_MULTICAST_LOOPContent; } }
         private static Java.Net.SocketOption _IP_MULTICAST_LOOPContent = default;
         private static bool _IP_MULTICAST_LOOPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#SO_BROADCAST"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#SO_BROADCAST"/>
         /// </summary>
         public static Java.Net.SocketOption SO_BROADCAST { get { if (!_SO_BROADCASTReady) { _SO_BROADCASTContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "SO_BROADCAST"); _SO_BROADCASTReady = true; } return _SO_BROADCASTContent; } }
         private static Java.Net.SocketOption _SO_BROADCASTContent = default;
         private static bool _SO_BROADCASTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#SO_KEEPALIVE"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#SO_KEEPALIVE"/>
         /// </summary>
         public static Java.Net.SocketOption SO_KEEPALIVE { get { if (!_SO_KEEPALIVEReady) { _SO_KEEPALIVEContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "SO_KEEPALIVE"); _SO_KEEPALIVEReady = true; } return _SO_KEEPALIVEContent; } }
         private static Java.Net.SocketOption _SO_KEEPALIVEContent = default;
         private static bool _SO_KEEPALIVEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#SO_REUSEADDR"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#SO_REUSEADDR"/>
         /// </summary>
         public static Java.Net.SocketOption SO_REUSEADDR { get { if (!_SO_REUSEADDRReady) { _SO_REUSEADDRContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "SO_REUSEADDR"); _SO_REUSEADDRReady = true; } return _SO_REUSEADDRContent; } }
         private static Java.Net.SocketOption _SO_REUSEADDRContent = default;
         private static bool _SO_REUSEADDRReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#SO_REUSEPORT"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#SO_REUSEPORT"/>
         /// </summary>
         public static Java.Net.SocketOption SO_REUSEPORT { get { if (!_SO_REUSEPORTReady) { _SO_REUSEPORTContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "SO_REUSEPORT"); _SO_REUSEPORTReady = true; } return _SO_REUSEPORTContent; } }
         private static Java.Net.SocketOption _SO_REUSEPORTContent = default;
         private static bool _SO_REUSEPORTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#TCP_NODELAY"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#TCP_NODELAY"/>
         /// </summary>
         public static Java.Net.SocketOption TCP_NODELAY { get { if (!_TCP_NODELAYReady) { _TCP_NODELAYContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "TCP_NODELAY"); _TCP_NODELAYReady = true; } return _TCP_NODELAYContent; } }
         private static Java.Net.SocketOption _TCP_NODELAYContent = default;
         private static bool _TCP_NODELAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#IP_MULTICAST_TTL"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#IP_MULTICAST_TTL"/>
         /// </summary>
         public static Java.Net.SocketOption IP_MULTICAST_TTL { get { if (!_IP_MULTICAST_TTLReady) { _IP_MULTICAST_TTLContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "IP_MULTICAST_TTL"); _IP_MULTICAST_TTLReady = true; } return _IP_MULTICAST_TTLContent; } }
         private static Java.Net.SocketOption _IP_MULTICAST_TTLContent = default;
         private static bool _IP_MULTICAST_TTLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#IP_TOS"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#IP_TOS"/>
         /// </summary>
         public static Java.Net.SocketOption IP_TOS { get { if (!_IP_TOSReady) { _IP_TOSContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "IP_TOS"); _IP_TOSReady = true; } return _IP_TOSContent; } }
         private static Java.Net.SocketOption _IP_TOSContent = default;
         private static bool _IP_TOSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#SO_LINGER"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#SO_LINGER"/>
         /// </summary>
         public static Java.Net.SocketOption SO_LINGER { get { if (!_SO_LINGERReady) { _SO_LINGERContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "SO_LINGER"); _SO_LINGERReady = true; } return _SO_LINGERContent; } }
         private static Java.Net.SocketOption _SO_LINGERContent = default;
         private static bool _SO_LINGERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#SO_RCVBUF"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#SO_RCVBUF"/>
         /// </summary>
         public static Java.Net.SocketOption SO_RCVBUF { get { if (!_SO_RCVBUFReady) { _SO_RCVBUFContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "SO_RCVBUF"); _SO_RCVBUFReady = true; } return _SO_RCVBUFContent; } }
         private static Java.Net.SocketOption _SO_RCVBUFContent = default;
         private static bool _SO_RCVBUFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#SO_SNDBUF"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#SO_SNDBUF"/>
         /// </summary>
         public static Java.Net.SocketOption SO_SNDBUF { get { if (!_SO_SNDBUFReady) { _SO_SNDBUFContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "SO_SNDBUF"); _SO_SNDBUFReady = true; } return _SO_SNDBUFContent; } }
         private static Java.Net.SocketOption _SO_SNDBUFContent = default;
         private static bool _SO_SNDBUFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/StandardSocketOptions.html#IP_MULTICAST_IF"/>
+        /// <see href="https://developer.android.com/reference/java/net/StandardSocketOptions.html#IP_MULTICAST_IF"/>
         /// </summary>
         public static Java.Net.SocketOption IP_MULTICAST_IF { get { if (!_IP_MULTICAST_IFReady) { _IP_MULTICAST_IFContent = SGetField<Java.Net.SocketOption>(LocalBridgeClazz, "IP_MULTICAST_IF"); _IP_MULTICAST_IFReady = true; } return _IP_MULTICAST_IFContent; } }
         private static Java.Net.SocketOption _IP_MULTICAST_IFContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Net/URI.cs b/src/net/Netdroid/Generated/Java/Net/URI.cs
index 806c3affc..c09306fb1 100644
--- a/src/net/Netdroid/Generated/Java/Net/URI.cs
+++ b/src/net/Netdroid/Generated/Java/Net/URI.cs
@@ -30,7 +30,7 @@ public partial class URI : Java.Lang.IComparable<Java.Net.URI>, Java.Io.ISeriali
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,int,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,int,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -45,7 +45,7 @@ public URI(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2,
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -58,7 +58,7 @@ public URI(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2,
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -70,7 +70,7 @@ public URI(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2,
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -81,7 +81,7 @@ public URI(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Net.URISyntaxException"/>
@@ -110,7 +110,7 @@ public URI(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#create(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#create(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URI"/></returns>
@@ -123,146 +123,161 @@ public static Java.Net.URI Create(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getAuthority()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#isAbsolute()"/>
         /// </summary>
-        public Java.Lang.String Authority
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAbsolute()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAuthority", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isAbsolute", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getFragment()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#isOpaque()"/>
         /// </summary>
-        public Java.Lang.String Fragment
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOpaque()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFragment", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isOpaque", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getHost()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#compareTo(java.lang.Object)"/>
         /// </summary>
-        public Java.Lang.String Host
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getPath()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#compareTo(java.net.URI)"/>
         /// </summary>
-        public Java.Lang.String Path
+        /// <param name="arg0"><see cref="Java.Net.URI"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(Java.Net.URI arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/net/URI;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getPort()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getQuery()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getAuthority()"/>
         /// </summary>
-        public Java.Lang.String Query
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAuthority()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getQuery", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAuthority", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getRawAuthority()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getFragment()"/>
         /// </summary>
-        public Java.Lang.String RawAuthority
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFragment()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRawAuthority", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFragment", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getRawFragment()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getHost()"/>
         /// </summary>
-        public Java.Lang.String RawFragment
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHost()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRawFragment", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getRawPath()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getPath()"/>
         /// </summary>
-        public Java.Lang.String RawPath
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPath()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRawPath", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getRawQuery()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getQuery()"/>
         /// </summary>
-        public Java.Lang.String RawQuery
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetQuery()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRawQuery", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getQuery", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getRawSchemeSpecificPart()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getRawAuthority()"/>
         /// </summary>
-        public Java.Lang.String RawSchemeSpecificPart
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRawAuthority()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRawSchemeSpecificPart", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRawAuthority", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getRawUserInfo()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getRawFragment()"/>
         /// </summary>
-        public Java.Lang.String RawUserInfo
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRawFragment()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRawUserInfo", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRawFragment", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getScheme()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getRawPath()"/>
         /// </summary>
-        public Java.Lang.String Scheme
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRawPath()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getScheme", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRawPath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getSchemeSpecificPart()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getRawQuery()"/>
         /// </summary>
-        public Java.Lang.String SchemeSpecificPart
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRawQuery()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSchemeSpecificPart", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRawQuery", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#getUserInfo()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getRawSchemeSpecificPart()"/>
         /// </summary>
-        public Java.Lang.String UserInfo
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRawSchemeSpecificPart()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserInfo", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRawSchemeSpecificPart", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#isAbsolute()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getRawUserInfo()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAbsolute()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRawUserInfo()
         {
-            return IExecuteWithSignature<bool>("isAbsolute", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getRawUserInfo", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#isOpaque()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getScheme()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOpaque()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetScheme()
         {
-            return IExecuteWithSignature<bool>("isOpaque", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getScheme", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getSchemeSpecificPart()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(object arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSchemeSpecificPart()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSchemeSpecificPart", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#compareTo(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#getUserInfo()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.URI"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(Java.Net.URI arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUserInfo()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/net/URI;)I", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getUserInfo", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#toASCIIString()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#toASCIIString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToASCIIString()
@@ -270,7 +285,7 @@ public Java.Lang.String ToASCIIString()
             return IExecuteWithSignature<Java.Lang.String>("toASCIIString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#normalize()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#normalize()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URI"/></returns>
         public Java.Net.URI Normalize()
@@ -278,7 +293,7 @@ public Java.Net.URI Normalize()
             return IExecuteWithSignature<Java.Net.URI>("normalize", "()Ljava/net/URI;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#parseServerAuthority()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#parseServerAuthority()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URI"/></returns>
         /// <exception cref="Java.Net.URISyntaxException"/>
@@ -287,7 +302,7 @@ public Java.Net.URI ParseServerAuthority()
             return IExecuteWithSignature<Java.Net.URI>("parseServerAuthority", "()Ljava/net/URI;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#relativize(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#relativize(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Net.URI"/></returns>
@@ -296,7 +311,7 @@ public Java.Net.URI Relativize(Java.Net.URI arg0)
             return IExecuteWithSignature<Java.Net.URI>("relativize", "(Ljava/net/URI;)Ljava/net/URI;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#resolve(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#resolve(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URI"/></returns>
@@ -305,7 +320,7 @@ public Java.Net.URI Resolve(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Net.URI>("resolve", "(Ljava/lang/String;)Ljava/net/URI;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#resolve(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#resolve(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Net.URI"/></returns>
@@ -314,7 +329,7 @@ public Java.Net.URI Resolve(Java.Net.URI arg0)
             return IExecuteWithSignature<Java.Net.URI>("resolve", "(Ljava/net/URI;)Ljava/net/URI;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URI.html#toURL()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URI.html#toURL()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URL"/></returns>
         /// <exception cref="Java.Net.MalformedURLException"/>
diff --git a/src/net/Netdroid/Generated/Java/Net/URL.cs b/src/net/Netdroid/Generated/Java/Net/URL.cs
index e4a843748..d6d4103b2 100644
--- a/src/net/Netdroid/Generated/Java/Net/URL.cs
+++ b/src/net/Netdroid/Generated/Java/Net/URL.cs
@@ -30,7 +30,7 @@ public partial class URL
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#%3Cinit%3E(java.lang.String,java.lang.String,int,java.lang.String,java.net.URLStreamHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#%3Cinit%3E(java.lang.String,java.lang.String,int,java.lang.String,java.net.URLStreamHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -43,7 +43,7 @@ public URL(Java.Lang.String arg0, Java.Lang.String arg1, int arg2, Java.Lang.Str
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#%3Cinit%3E(java.lang.String,java.lang.String,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#%3Cinit%3E(java.lang.String,java.lang.String,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -55,7 +55,7 @@ public URL(Java.Lang.String arg0, Java.Lang.String arg1, int arg2, Java.Lang.Str
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -66,7 +66,7 @@ public URL(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Net.MalformedURLException"/>
@@ -75,7 +75,7 @@ public URL(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#%3Cinit%3E(java.net.URL,java.lang.String,java.net.URLStreamHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#%3Cinit%3E(java.net.URL,java.lang.String,java.net.URLStreamHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -86,7 +86,7 @@ public URL(Java.Net.URL arg0, Java.Lang.String arg1, Java.Net.URLStreamHandler a
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#%3Cinit%3E(java.net.URL,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#%3Cinit%3E(java.net.URL,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -108,7 +108,7 @@ public URL(Java.Net.URL arg0, Java.Lang.String arg1)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#setURLStreamHandlerFactory(java.net.URLStreamHandlerFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URLStreamHandlerFactory"/></param>
         public static void SetURLStreamHandlerFactory(Java.Net.URLStreamHandlerFactory arg0)
@@ -120,112 +120,124 @@ public static void SetURLStreamHandlerFactory(Java.Net.URLStreamHandlerFactory a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getAuthority()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#sameFile(java.net.URL)"/>
         /// </summary>
-        public Java.Lang.String Authority
+        /// <param name="arg0"><see cref="Java.Net.URL"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SameFile(Java.Net.URL arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAuthority", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("sameFile", "(Ljava/net/URL;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getContent()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#openStream()"/>
         /// </summary>
-        public object Content
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.InputStream OpenStream()
         {
-            get { return IExecuteWithSignature("getContent", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Java.Io.InputStream>("openStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getDefaultPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getContent()"/>
         /// </summary>
-        public int DefaultPort
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public object GetContent()
         {
-            get { return IExecuteWithSignature<int>("getDefaultPort", "()I"); }
+            return IExecuteWithSignature("getContent", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getFile()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getContent(java.lang.Class[])"/>
         /// </summary>
-        public Java.Lang.String File
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public object GetContent(Java.Lang.Class[] arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFile", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature("getContent", "([Ljava/lang/Class;)Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getHost()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getDefaultPort()"/>
         /// </summary>
-        public Java.Lang.String Host
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultPort()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getDefaultPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getPath()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getPort()"/>
         /// </summary>
-        public Java.Lang.String Path
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getAuthority()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAuthority()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAuthority", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getFile()"/>
         /// </summary>
-        public Java.Lang.String Protocol
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFile()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFile", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getQuery()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getHost()"/>
         /// </summary>
-        public Java.Lang.String Query
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHost()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getQuery", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHost", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getRef()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getPath()"/>
         /// </summary>
-        public Java.Lang.String Ref
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPath()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRef", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getUserInfo()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getProtocol()"/>
         /// </summary>
-        public Java.Lang.String UserInfo
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProtocol()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserInfo", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProtocol", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#sameFile(java.net.URL)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getQuery()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.URL"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool SameFile(Java.Net.URL arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetQuery()
         {
-            return IExecuteWithSignature<bool>("sameFile", "(Ljava/net/URL;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getQuery", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#openStream()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getRef()"/>
         /// </summary>
-        /// <returns><see cref="Java.Io.InputStream"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Java.Io.InputStream OpenStream()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRef()
         {
-            return IExecuteWithSignature<Java.Io.InputStream>("openStream", "()Ljava/io/InputStream;");
+            return IExecuteWithSignature<Java.Lang.String>("getRef", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#getContent(java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#getUserInfo()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public object GetContent(Java.Lang.Class[] arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUserInfo()
         {
-            return IExecuteWithSignature("getContent", "([Ljava/lang/Class;)Ljava/lang/Object;", new object[] { arg0 });
+            return IExecuteWithSignature<Java.Lang.String>("getUserInfo", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#toExternalForm()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#toExternalForm()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToExternalForm()
@@ -233,7 +245,7 @@ public Java.Lang.String ToExternalForm()
             return IExecuteWithSignature<Java.Lang.String>("toExternalForm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#toURI()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#toURI()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URI"/></returns>
         /// <exception cref="Java.Net.URISyntaxException"/>
@@ -242,7 +254,7 @@ public Java.Net.URI ToURI()
             return IExecuteWithSignature<Java.Net.URI>("toURI", "()Ljava/net/URI;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#openConnection()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#openConnection()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URLConnection"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -251,7 +263,7 @@ public Java.Net.URLConnection OpenConnection()
             return IExecuteWithSignature<Java.Net.URLConnection>("openConnection", "()Ljava/net/URLConnection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URL.html#openConnection(java.net.Proxy)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URL.html#openConnection(java.net.Proxy)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Proxy"/></param>
         /// <returns><see cref="Java.Net.URLConnection"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Net/URLClassLoader.cs b/src/net/Netdroid/Generated/Java/Net/URLClassLoader.cs
index 01f6c0a18..e43fa89c3 100644
--- a/src/net/Netdroid/Generated/Java/Net/URLClassLoader.cs
+++ b/src/net/Netdroid/Generated/Java/Net/URLClassLoader.cs
@@ -30,7 +30,7 @@ public partial class URLClassLoader
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#%3Cinit%3E(java.lang.String,java.net.URL[],java.lang.ClassLoader,java.net.URLStreamHandlerFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#%3Cinit%3E(java.lang.String,java.net.URL[],java.lang.ClassLoader,java.net.URLStreamHandlerFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Net.URL"/></param>
@@ -41,7 +41,7 @@ public URLClassLoader(Java.Lang.String arg0, Java.Net.URL[] arg1, Java.Lang.Clas
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#%3Cinit%3E(java.lang.String,java.net.URL[],java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#%3Cinit%3E(java.lang.String,java.net.URL[],java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Net.URL"/></param>
@@ -51,7 +51,7 @@ public URLClassLoader(Java.Lang.String arg0, Java.Net.URL[] arg1, Java.Lang.Clas
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#%3Cinit%3E(java.net.URL[],java.lang.ClassLoader,java.net.URLStreamHandlerFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#%3Cinit%3E(java.net.URL[],java.lang.ClassLoader,java.net.URLStreamHandlerFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -61,7 +61,7 @@ public URLClassLoader(Java.Net.URL[] arg0, Java.Lang.ClassLoader arg1, Java.Net.
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#%3Cinit%3E(java.net.URL[],java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#%3Cinit%3E(java.net.URL[],java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -70,7 +70,7 @@ public URLClassLoader(Java.Net.URL[] arg0, Java.Lang.ClassLoader arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#%3Cinit%3E(java.net.URL[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#%3Cinit%3E(java.net.URL[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         public URLClassLoader(Java.Net.URL[] arg0)
@@ -94,7 +94,7 @@ public URLClassLoader(Java.Net.URL[] arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#newInstance(java.net.URL[],java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#newInstance(java.net.URL[],java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -104,7 +104,7 @@ public static Java.Net.URLClassLoader NewInstance(Java.Net.URL[] arg0, Java.Lang
             return SExecute<Java.Net.URLClassLoader>(LocalBridgeClazz, "newInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#newInstance(java.net.URL[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#newInstance(java.net.URL[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <returns><see cref="Java.Net.URLClassLoader"/></returns>
@@ -117,23 +117,24 @@ public static Java.Net.URLClassLoader NewInstance(Java.Net.URL[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#getURLs()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#findResource(java.lang.String)"/>
         /// </summary>
-        public Java.Net.URL[] URLs
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Net.URL"/></returns>
+        public Java.Net.URL FindResource(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Net.URL>("getURLs", "()[Ljava/net/URL;"); }
+            return IExecuteWithSignature<Java.Net.URL>("findResource", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#findResource(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#getURLs()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URL"/></returns>
-        public Java.Net.URL FindResource(Java.Lang.String arg0)
+        public Java.Net.URL[] GetURLs()
         {
-            return IExecuteWithSignature<Java.Net.URL>("findResource", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
+            return IExecuteWithSignatureArray<Java.Net.URL>("getURLs", "()[Ljava/net/URL;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#findResources(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#findResources(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
@@ -143,7 +144,7 @@ public Java.Net.URL FindResource(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Net.URL>>("findResources", "(Ljava/lang/String;)Ljava/util/Enumeration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLClassLoader.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLClassLoader.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Net/URLConnection.cs b/src/net/Netdroid/Generated/Java/Net/URLConnection.cs
index 2760f8d77..587df4abb 100644
--- a/src/net/Netdroid/Generated/Java/Net/URLConnection.cs
+++ b/src/net/Netdroid/Generated/Java/Net/URLConnection.cs
@@ -42,21 +42,15 @@ public partial class URLConnection
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getDefaultAllowUserInteraction()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setDefaultAllowUserInteraction(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getDefaultAllowUserInteraction()"/>
         /// </summary>
-        public static bool DefaultAllowUserInteraction
-        {
-            get { return SExecuteWithSignature<bool>(LocalBridgeClazz, "getDefaultAllowUserInteraction", "()Z"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefaultAllowUserInteraction", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getFileNameMap()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setFileNameMap(java.net.FileNameMap)"/>
-        /// </summary>
-        public static Java.Net.FileNameMap FileNameMap
+        /// <returns><see cref="bool"/></returns>
+        public static bool GetDefaultAllowUserInteraction()
         {
-            get { return SExecuteWithSignature<Java.Net.FileNameMap>(LocalBridgeClazz, "getFileNameMap", "()Ljava/net/FileNameMap;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setFileNameMap", "(Ljava/net/FileNameMap;)V", value); }
+            return SExecuteWithSignature<bool>(LocalBridgeClazz, "getDefaultAllowUserInteraction", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getDefaultUseCaches(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getDefaultUseCaches(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -65,17 +59,17 @@ public static bool GetDefaultUseCaches(Java.Lang.String arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "getDefaultUseCaches", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getDefaultRequestProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getDefaultRequestProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetDefaultRequestProperty(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultRequestProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#guessContentTypeFromName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#guessContentTypeFromName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -84,7 +78,7 @@ public static Java.Lang.String GuessContentTypeFromName(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "guessContentTypeFromName", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#guessContentTypeFromStream(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#guessContentTypeFromStream(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -94,7 +88,15 @@ public static Java.Lang.String GuessContentTypeFromStream(Java.Io.InputStream ar
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "guessContentTypeFromStream", "(Ljava/io/InputStream;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setContentHandlerFactory(java.net.ContentHandlerFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getFileNameMap()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.FileNameMap"/></returns>
+        public static Java.Net.FileNameMap GetFileNameMap()
+        {
+            return SExecuteWithSignature<Java.Net.FileNameMap>(LocalBridgeClazz, "getFileNameMap", "()Ljava/net/FileNameMap;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setContentHandlerFactory(java.net.ContentHandlerFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.ContentHandlerFactory"/></param>
         public static void SetContentHandlerFactory(Java.Net.ContentHandlerFactory arg0)
@@ -102,17 +104,25 @@ public static void SetContentHandlerFactory(Java.Net.ContentHandlerFactory arg0)
             SExecuteWithSignature(LocalBridgeClazz, "setContentHandlerFactory", "(Ljava/net/ContentHandlerFactory;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setDefaultRequestProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setDefaultAllowUserInteraction(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public static void SetDefaultAllowUserInteraction(bool arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefaultAllowUserInteraction", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setDefaultRequestProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetDefaultRequestProperty(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             SExecute(LocalBridgeClazz, "setDefaultRequestProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setDefaultUseCaches(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setDefaultUseCaches(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -120,230 +130,248 @@ public static void SetDefaultUseCaches(Java.Lang.String arg0, bool arg1)
         {
             SExecute(LocalBridgeClazz, "setDefaultUseCaches", arg0, arg1);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getAllowUserInteraction()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setAllowUserInteraction(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setFileNameMap(java.net.FileNameMap)"/>
         /// </summary>
-        public bool AllowUserInteraction
+        /// <param name="arg0"><see cref="Java.Net.FileNameMap"/></param>
+        public static void SetFileNameMap(Java.Net.FileNameMap arg0)
         {
-            get { return IExecuteWithSignature<bool>("getAllowUserInteraction", "()Z"); } set { IExecuteWithSignature("setAllowUserInteraction", "(Z)V", value); }
+            SExecuteWithSignature(LocalBridgeClazz, "setFileNameMap", "(Ljava/net/FileNameMap;)V", arg0);
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getConnectTimeout()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setConnectTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#connect()"/>
         /// </summary>
-        public int ConnectTimeout
+        /// <exception cref="Java.Io.IOException"/>
+        public void Connect()
         {
-            get { return IExecuteWithSignature<int>("getConnectTimeout", "()I"); } set { IExecuteWithSignature("setConnectTimeout", "(I)V", value); }
+            IExecuteWithSignature("connect", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getContent()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getAllowUserInteraction()"/>
         /// </summary>
-        public object Content
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAllowUserInteraction()
         {
-            get { return IExecuteWithSignature("getContent", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<bool>("getAllowUserInteraction", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getContentEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getDefaultUseCaches()"/>
         /// </summary>
-        public Java.Lang.String ContentEncoding
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDefaultUseCaches()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getContentEncoding", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("getDefaultUseCaches", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getContentLength()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getDoInput()"/>
         /// </summary>
-        public int ContentLength
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDoInput()
         {
-            get { return IExecuteWithSignature<int>("getContentLength", "()I"); }
+            return IExecuteWithSignature<bool>("getDoInput", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getContentLengthLong()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getDoOutput()"/>
         /// </summary>
-        public long ContentLengthLong
+        /// <returns><see cref="bool"/></returns>
+        public bool GetDoOutput()
         {
-            get { return IExecuteWithSignature<long>("getContentLengthLong", "()J"); }
+            return IExecuteWithSignature<bool>("getDoOutput", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getContentType()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getUseCaches()"/>
         /// </summary>
-        public Java.Lang.String ContentType
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseCaches()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getContentType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("getUseCaches", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getDate()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getConnectTimeout()"/>
         /// </summary>
-        public long Date
+        /// <returns><see cref="int"/></returns>
+        public int GetConnectTimeout()
         {
-            get { return IExecuteWithSignature<long>("getDate", "()J"); }
+            return IExecuteWithSignature<int>("getConnectTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getDefaultUseCaches()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setDefaultUseCaches(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getContentLength()"/>
         /// </summary>
-        public bool DefaultUseCaches
+        /// <returns><see cref="int"/></returns>
+        public int GetContentLength()
         {
-            get { return IExecuteWithSignature<bool>("getDefaultUseCaches", "()Z"); } set { IExecuteWithSignature("setDefaultUseCaches", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getContentLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getDoInput()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setDoInput(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getHeaderFieldInt(java.lang.String,int)"/>
         /// </summary>
-        public bool DoInput
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetHeaderFieldInt(Java.Lang.String arg0, int arg1)
         {
-            get { return IExecuteWithSignature<bool>("getDoInput", "()Z"); } set { IExecuteWithSignature("setDoInput", "(Z)V", value); }
+            return IExecute<int>("getHeaderFieldInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getDoOutput()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setDoOutput(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getReadTimeout()"/>
         /// </summary>
-        public bool DoOutput
+        /// <returns><see cref="int"/></returns>
+        public int GetReadTimeout()
         {
-            get { return IExecuteWithSignature<bool>("getDoOutput", "()Z"); } set { IExecuteWithSignature("setDoOutput", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getReadTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getExpiration()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getInputStream()"/>
         /// </summary>
-        public long Expiration
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.InputStream GetInputStream()
         {
-            get { return IExecuteWithSignature<long>("getExpiration", "()J"); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getHeaderFields()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getOutputStream()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> HeaderFields
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Io.OutputStream GetOutputStream()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getHeaderFields", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getIfModifiedSince()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setIfModifiedSince(long)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getContent()"/>
         /// </summary>
-        public long IfModifiedSince
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public object GetContent()
         {
-            get { return IExecuteWithSignature<long>("getIfModifiedSince", "()J"); } set { IExecuteWithSignature("setIfModifiedSince", "(J)V", value); }
+            return IExecuteWithSignature("getContent", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getInputStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getContent(java.lang.Class[])"/>
         /// </summary>
-        public Java.Io.InputStream InputStream
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public object GetContent(Java.Lang.Class[] arg0)
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;"); }
+            return IExecuteWithSignature("getContent", "([Ljava/lang/Class;)Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getLastModified()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getContentEncoding()"/>
         /// </summary>
-        public long LastModified
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetContentEncoding()
         {
-            get { return IExecuteWithSignature<long>("getLastModified", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getContentEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getOutputStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getContentType()"/>
         /// </summary>
-        public Java.Io.OutputStream OutputStream
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetContentType()
         {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getContentType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getPermission()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getHeaderField(int)"/>
         /// </summary>
-        public Java.Security.Permission Permission
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHeaderField(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Security.Permission>("getPermission", "()Ljava/security/Permission;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHeaderField", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getReadTimeout()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setReadTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getHeaderField(java.lang.String)"/>
         /// </summary>
-        public int ReadTimeout
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHeaderField(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<int>("getReadTimeout", "()I"); } set { IExecuteWithSignature("setReadTimeout", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getHeaderField", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getRequestProperties()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getHeaderFieldKey(int)"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> RequestProperties
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHeaderFieldKey(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getRequestProperties", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getHeaderFieldKey", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getURL()"/> 
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getRequestProperty(java.lang.String)"/>
         /// </summary>
-        public Java.Net.URL URL
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRequestProperty(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Net.URL>("getURL", "()Ljava/net/URL;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRequestProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getUseCaches()"/> <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setUseCaches(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getURL()"/>
         /// </summary>
-        public bool UseCaches
+        /// <returns><see cref="Java.Net.URL"/></returns>
+        public Java.Net.URL GetURL()
         {
-            get { return IExecuteWithSignature<bool>("getUseCaches", "()Z"); } set { IExecuteWithSignature("setUseCaches", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Net.URL>("getURL", "()Ljava/net/URL;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#connect()"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getPermission()"/>
         /// </summary>
+        /// <returns><see cref="Java.Security.Permission"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public void Connect()
+        public Java.Security.Permission GetPermission()
         {
-            IExecuteWithSignature("connect", "()V");
+            return IExecuteWithSignature<Java.Security.Permission>("getPermission", "()Ljava/security/Permission;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getHeaderFieldInt(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getHeaderFields()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int GetHeaderFieldInt(Java.Lang.String arg0, int arg1)
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> GetHeaderFields()
         {
-            return IExecute<int>("getHeaderFieldInt", arg0, arg1);
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getHeaderFields", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getContent(java.lang.Class[])"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getRequestProperties()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public object GetContent(Java.Lang.Class[] arg0)
-        {
-            return IExecuteWithSignature("getContent", "([Ljava/lang/Class;)Ljava/lang/Object;", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getHeaderField(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetHeaderField(int arg0)
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>> GetRequestProperties()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getHeaderField", "(I)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.List<Java.Lang.String>>>("getRequestProperties", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getHeaderField(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getContentLengthLong()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetHeaderField(Java.Lang.String arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetContentLengthLong()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getHeaderField", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<long>("getContentLengthLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getHeaderFieldKey(int)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getDate()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetHeaderFieldKey(int arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetDate()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getHeaderFieldKey", "(I)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<long>("getDate", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getRequestProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getExpiration()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetRequestProperty(Java.Lang.String arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetExpiration()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getRequestProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<long>("getExpiration", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getHeaderFieldDate(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getHeaderFieldDate(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -353,7 +381,7 @@ public long GetHeaderFieldDate(Java.Lang.String arg0, long arg1)
             return IExecute<long>("getHeaderFieldDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#getHeaderFieldLong(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getHeaderFieldLong(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -363,7 +391,23 @@ public long GetHeaderFieldLong(Java.Lang.String arg0, long arg1)
             return IExecute<long>("getHeaderFieldLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#addRequestProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getIfModifiedSince()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetIfModifiedSince()
+        {
+            return IExecuteWithSignature<long>("getIfModifiedSince", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#getLastModified()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetLastModified()
+        {
+            return IExecuteWithSignature<long>("getLastModified", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#addRequestProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -372,7 +416,63 @@ public void AddRequestProperty(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("addRequestProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLConnection.html#setRequestProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setAllowUserInteraction(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetAllowUserInteraction(bool arg0)
+        {
+            IExecuteWithSignature("setAllowUserInteraction", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setConnectTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetConnectTimeout(int arg0)
+        {
+            IExecuteWithSignature("setConnectTimeout", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setDefaultUseCaches(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDefaultUseCaches(bool arg0)
+        {
+            IExecuteWithSignature("setDefaultUseCaches", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setDoInput(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDoInput(bool arg0)
+        {
+            IExecuteWithSignature("setDoInput", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setDoOutput(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetDoOutput(bool arg0)
+        {
+            IExecuteWithSignature("setDoOutput", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setIfModifiedSince(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetIfModifiedSince(long arg0)
+        {
+            IExecuteWithSignature("setIfModifiedSince", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setReadTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetReadTimeout(int arg0)
+        {
+            IExecuteWithSignature("setReadTimeout", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setRequestProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -380,6 +480,14 @@ public void SetRequestProperty(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             IExecute("setRequestProperty", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/net/URLConnection.html#setUseCaches(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseCaches(bool arg0)
+        {
+            IExecuteWithSignature("setUseCaches", "(Z)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Net/URLDecoder.cs b/src/net/Netdroid/Generated/Java/Net/URLDecoder.cs
index 13e81f7ba..025cd4808 100644
--- a/src/net/Netdroid/Generated/Java/Net/URLDecoder.cs
+++ b/src/net/Netdroid/Generated/Java/Net/URLDecoder.cs
@@ -42,7 +42,7 @@ public partial class URLDecoder
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLDecoder.html#decode(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLDecoder.html#decode(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -53,7 +53,7 @@ public static Java.Lang.String Decode(Java.Lang.String arg0, Java.Lang.String ar
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "decode", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLDecoder.html#decode(java.lang.String,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLDecoder.html#decode(java.lang.String,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -63,11 +63,11 @@ public static Java.Lang.String Decode(Java.Lang.String arg0, Java.Nio.Charset.Ch
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "decode", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLDecoder.html#decode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLDecoder.html#decode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String Decode(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "decode", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Java/Net/URLEncoder.cs b/src/net/Netdroid/Generated/Java/Net/URLEncoder.cs
index 6d403f5cb..ebd278b6a 100644
--- a/src/net/Netdroid/Generated/Java/Net/URLEncoder.cs
+++ b/src/net/Netdroid/Generated/Java/Net/URLEncoder.cs
@@ -42,7 +42,7 @@ public partial class URLEncoder
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLEncoder.html#encode(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLEncoder.html#encode(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -53,7 +53,7 @@ public static Java.Lang.String Encode(Java.Lang.String arg0, Java.Lang.String ar
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "encode", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLEncoder.html#encode(java.lang.String,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLEncoder.html#encode(java.lang.String,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -63,11 +63,11 @@ public static Java.Lang.String Encode(Java.Lang.String arg0, Java.Nio.Charset.Ch
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "encode", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLEncoder.html#encode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLEncoder.html#encode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String Encode(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "encode", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
diff --git a/src/net/Netdroid/Generated/Java/Net/URLStreamHandlerFactory.cs b/src/net/Netdroid/Generated/Java/Net/URLStreamHandlerFactory.cs
index a468ebfbd..c922a04a6 100644
--- a/src/net/Netdroid/Generated/Java/Net/URLStreamHandlerFactory.cs
+++ b/src/net/Netdroid/Generated/Java/Net/URLStreamHandlerFactory.cs
@@ -64,7 +64,7 @@ public partial class URLStreamHandlerFactory : Java.Net.IURLStreamHandlerFactory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/net/URLStreamHandlerFactory.html#createURLStreamHandler(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/net/URLStreamHandlerFactory.html#createURLStreamHandler(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URLStreamHandler"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Nio/AllPackageClasses.cs
index 1edf96765..bdddc388d 100644
--- a/src/net/Netdroid/Generated/Java/Nio/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Nio
 {
     #region Buffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/Buffer.html"/>
     /// </summary>
     public partial class Buffer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Buffer>
     {
@@ -36,12 +36,12 @@ public partial class Buffer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Buffer>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Buffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Buffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Buffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Buffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Buffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Buffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Buffer(params object[] args) : base(args) { }
 
     #region BufferOverflowException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/BufferOverflowException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/BufferOverflowException.html"/>
     /// </summary>
     public partial class BufferOverflowException : Java.Lang.RuntimeException
     {
@@ -91,7 +91,7 @@ public partial class BufferOverflowException : Java.Lang.RuntimeException
 
     #region BufferUnderflowException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/BufferUnderflowException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/BufferUnderflowException.html"/>
     /// </summary>
     public partial class BufferUnderflowException : Java.Lang.RuntimeException
     {
@@ -108,7 +108,7 @@ public partial class BufferUnderflowException : Java.Lang.RuntimeException
 
     #region ByteBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html"/>
     /// </summary>
     public partial class ByteBuffer : Java.Nio.Buffer
     {
@@ -116,12 +116,12 @@ public partial class ByteBuffer : Java.Nio.Buffer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ByteBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ByteBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ByteBuffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ByteBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ByteBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ByteBuffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -154,7 +154,7 @@ public ByteBuffer(params object[] args) : base(args) { }
 
     #region ByteOrder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteOrder.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/ByteOrder.html"/>
     /// </summary>
     public partial class ByteOrder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ByteOrder>
     {
@@ -198,7 +198,7 @@ public ByteOrder(params object[] args) : base(args) { }
 
     #region CharBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html"/>
     /// </summary>
     public partial class CharBuffer : Java.Nio.Buffer
     {
@@ -206,12 +206,12 @@ public partial class CharBuffer : Java.Nio.Buffer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CharBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharBuffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CharBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharBuffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -244,7 +244,7 @@ public CharBuffer(params object[] args) : base(args) { }
 
     #region DoubleBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html"/>
     /// </summary>
     public partial class DoubleBuffer : Java.Nio.Buffer
     {
@@ -252,12 +252,12 @@ public partial class DoubleBuffer : Java.Nio.Buffer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DoubleBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DoubleBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DoubleBuffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DoubleBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DoubleBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DoubleBuffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -290,7 +290,7 @@ public DoubleBuffer(params object[] args) : base(args) { }
 
     #region FloatBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html"/>
     /// </summary>
     public partial class FloatBuffer : Java.Nio.Buffer
     {
@@ -298,12 +298,12 @@ public partial class FloatBuffer : Java.Nio.Buffer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FloatBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FloatBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FloatBuffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FloatBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FloatBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FloatBuffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -336,7 +336,7 @@ public FloatBuffer(params object[] args) : base(args) { }
 
     #region IntBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html"/>
     /// </summary>
     public partial class IntBuffer : Java.Nio.Buffer
     {
@@ -344,12 +344,12 @@ public partial class IntBuffer : Java.Nio.Buffer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IntBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntBuffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IntBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntBuffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -382,7 +382,7 @@ public IntBuffer(params object[] args) : base(args) { }
 
     #region InvalidMarkException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/InvalidMarkException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/InvalidMarkException.html"/>
     /// </summary>
     public partial class InvalidMarkException : Java.Lang.IllegalStateException
     {
@@ -399,7 +399,7 @@ public partial class InvalidMarkException : Java.Lang.IllegalStateException
 
     #region LongBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html"/>
     /// </summary>
     public partial class LongBuffer : Java.Nio.Buffer
     {
@@ -407,12 +407,12 @@ public partial class LongBuffer : Java.Nio.Buffer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LongBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LongBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LongBuffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LongBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LongBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LongBuffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -445,7 +445,7 @@ public LongBuffer(params object[] args) : base(args) { }
 
     #region MappedByteBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/MappedByteBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/MappedByteBuffer.html"/>
     /// </summary>
     public partial class MappedByteBuffer : Java.Nio.ByteBuffer
     {
@@ -453,12 +453,12 @@ public partial class MappedByteBuffer : Java.Nio.ByteBuffer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MappedByteBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MappedByteBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MappedByteBuffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MappedByteBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MappedByteBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MappedByteBuffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -491,7 +491,7 @@ public MappedByteBuffer(params object[] args) : base(args) { }
 
     #region ReadOnlyBufferException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/ReadOnlyBufferException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/ReadOnlyBufferException.html"/>
     /// </summary>
     public partial class ReadOnlyBufferException : Java.Lang.UnsupportedOperationException
     {
@@ -508,7 +508,7 @@ public partial class ReadOnlyBufferException : Java.Lang.UnsupportedOperationExc
 
     #region ShortBuffer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html"/>
     /// </summary>
     public partial class ShortBuffer : Java.Nio.Buffer
     {
@@ -516,12 +516,12 @@ public partial class ShortBuffer : Java.Nio.Buffer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ShortBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ShortBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ShortBuffer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ShortBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ShortBuffer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ShortBuffer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Nio/Buffer.cs b/src/net/Netdroid/Generated/Java/Nio/Buffer.cs
index 4d23bf83c..3b596ee85 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Buffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Buffer.cs
@@ -46,7 +46,7 @@ public partial class Buffer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#hasArray()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#hasArray()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasArray()
@@ -54,7 +54,7 @@ public bool HasArray()
             return IExecuteWithSignature<bool>("hasArray", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#isDirect()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#isDirect()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDirect()
@@ -62,7 +62,7 @@ public bool IsDirect()
             return IExecuteWithSignature<bool>("isDirect", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#isReadOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsReadOnly()
@@ -70,7 +70,7 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#arrayOffset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#arrayOffset()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ArrayOffset()
@@ -78,7 +78,7 @@ public int ArrayOffset()
             return IExecuteWithSignature<int>("arrayOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#array()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#array()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Array()
@@ -86,7 +86,7 @@ public object Array()
             return IExecuteWithSignature("array", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#duplicate()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#duplicate()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
         public Java.Nio.Buffer Duplicate()
@@ -94,7 +94,7 @@ public Java.Nio.Buffer Duplicate()
             return IExecuteWithSignature<Java.Nio.Buffer>("duplicate", "()Ljava/nio/Buffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#slice()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#slice()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
         public Java.Nio.Buffer Slice()
@@ -102,17 +102,7 @@ public Java.Nio.Buffer Slice()
             return IExecuteWithSignature<Java.Nio.Buffer>("slice", "()Ljava/nio/Buffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#slice(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.Buffer"/></returns>
-        public Java.Nio.Buffer Slice(int arg0, int arg1)
-        {
-            return IExecute<Java.Nio.Buffer>("slice", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#hasRemaining()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#hasRemaining()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasRemaining()
@@ -120,7 +110,7 @@ public bool HasRemaining()
             return IExecuteWithSignature<bool>("hasRemaining", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#capacity()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#capacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Capacity()
@@ -128,7 +118,7 @@ public int Capacity()
             return IExecuteWithSignature<int>("capacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#limit()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#limit()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Limit()
@@ -136,7 +126,7 @@ public int Limit()
             return IExecuteWithSignature<int>("limit", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#position()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#position()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Position()
@@ -144,7 +134,7 @@ public int Position()
             return IExecuteWithSignature<int>("position", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#remaining()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#remaining()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Remaining()
@@ -152,7 +142,7 @@ public int Remaining()
             return IExecuteWithSignature<int>("remaining", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#clear()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
         public Java.Nio.Buffer Clear()
@@ -160,7 +150,7 @@ public Java.Nio.Buffer Clear()
             return IExecuteWithSignature<Java.Nio.Buffer>("clear", "()Ljava/nio/Buffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#flip()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#flip()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
         public Java.Nio.Buffer Flip()
@@ -168,7 +158,7 @@ public Java.Nio.Buffer Flip()
             return IExecuteWithSignature<Java.Nio.Buffer>("flip", "()Ljava/nio/Buffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#limit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#limit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
@@ -177,7 +167,7 @@ public Java.Nio.Buffer Limit(int arg0)
             return IExecuteWithSignature<Java.Nio.Buffer>("limit", "(I)Ljava/nio/Buffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#mark()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#mark()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
         public Java.Nio.Buffer Mark()
@@ -185,7 +175,7 @@ public Java.Nio.Buffer Mark()
             return IExecuteWithSignature<Java.Nio.Buffer>("mark", "()Ljava/nio/Buffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#position(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#position(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
@@ -194,7 +184,7 @@ public Java.Nio.Buffer Position(int arg0)
             return IExecuteWithSignature<Java.Nio.Buffer>("position", "(I)Ljava/nio/Buffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#reset()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
         public Java.Nio.Buffer Reset()
@@ -202,7 +192,7 @@ public Java.Nio.Buffer Reset()
             return IExecuteWithSignature<Java.Nio.Buffer>("reset", "()Ljava/nio/Buffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/Buffer.html#rewind()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/Buffer.html#rewind()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Buffer"/></returns>
         public Java.Nio.Buffer Rewind()
diff --git a/src/net/Netdroid/Generated/Java/Nio/ByteBuffer.cs b/src/net/Netdroid/Generated/Java/Nio/ByteBuffer.cs
index f60a5dcef..11aee3dbc 100644
--- a/src/net/Netdroid/Generated/Java/Nio/ByteBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/ByteBuffer.cs
@@ -46,7 +46,7 @@ public partial class ByteBuffer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#allocate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#allocate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -55,7 +55,7 @@ public static Java.Nio.ByteBuffer Allocate(int arg0)
             return SExecuteWithSignature<Java.Nio.ByteBuffer>(LocalBridgeClazz, "allocate", "(I)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#allocateDirect(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#allocateDirect(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -64,7 +64,7 @@ public static Java.Nio.ByteBuffer AllocateDirect(int arg0)
             return SExecuteWithSignature<Java.Nio.ByteBuffer>(LocalBridgeClazz, "allocateDirect", "(I)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#wrap(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#wrap(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -75,7 +75,7 @@ public static Java.Nio.ByteBuffer Wrap(byte[] arg0, int arg1, int arg2)
             return SExecute<Java.Nio.ByteBuffer>(LocalBridgeClazz, "wrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#wrap(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#wrap(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -88,49 +88,7 @@ public static Java.Nio.ByteBuffer Wrap(byte[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getChar()"/> 
-        /// </summary>
-        public char Char
-        {
-            get { return IExecuteWithSignature<char>("getChar", "()C"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getDouble()"/> 
-        /// </summary>
-        public double Double
-        {
-            get { return IExecuteWithSignature<double>("getDouble", "()D"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getFloat()"/> 
-        /// </summary>
-        public float Float
-        {
-            get { return IExecuteWithSignature<float>("getFloat", "()F"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getInt()"/> 
-        /// </summary>
-        public int Int
-        {
-            get { return IExecuteWithSignature<int>("getInt", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getLong()"/> 
-        /// </summary>
-        public long Long
-        {
-            get { return IExecuteWithSignature<long>("getLong", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getShort()"/> 
-        /// </summary>
-        public short Short
-        {
-            get { return IExecuteWithSignature<short>("getShort", "()S"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#get()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte Get()
@@ -138,7 +96,7 @@ public byte Get()
             return IExecuteWithSignature<byte>("get", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -147,7 +105,15 @@ public byte Get(int arg0)
             return IExecuteWithSignature<byte>("get", "(I)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getChar(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getChar()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetChar()
+        {
+            return IExecuteWithSignature<char>("getChar", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getChar(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -156,7 +122,15 @@ public char GetChar(int arg0)
             return IExecuteWithSignature<char>("getChar", "(I)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getDouble(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getDouble()"/>
+        /// </summary>
+        /// <returns><see cref="double"/></returns>
+        public double GetDouble()
+        {
+            return IExecuteWithSignature<double>("getDouble", "()D");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getDouble(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="double"/></returns>
@@ -165,7 +139,15 @@ public double GetDouble(int arg0)
             return IExecuteWithSignature<double>("getDouble", "(I)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getFloat(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getFloat()"/>
+        /// </summary>
+        /// <returns><see cref="float"/></returns>
+        public float GetFloat()
+        {
+            return IExecuteWithSignature<float>("getFloat", "()F");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getFloat(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
@@ -174,7 +156,15 @@ public float GetFloat(int arg0)
             return IExecuteWithSignature<float>("getFloat", "(I)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getInt()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetInt()
+        {
+            return IExecuteWithSignature<int>("getInt", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -183,7 +173,7 @@ public int GetInt(int arg0)
             return IExecuteWithSignature<int>("getInt", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#asReadOnlyBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#asReadOnlyBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
         public Java.Nio.ByteBuffer AsReadOnlyBuffer()
@@ -191,7 +181,7 @@ public Java.Nio.ByteBuffer AsReadOnlyBuffer()
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("asReadOnlyBuffer", "()Ljava/nio/ByteBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#compact()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#compact()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
         public Java.Nio.ByteBuffer Compact()
@@ -199,7 +189,7 @@ public Java.Nio.ByteBuffer Compact()
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("compact", "()Ljava/nio/ByteBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#put(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#put(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -208,7 +198,7 @@ public Java.Nio.ByteBuffer Put(byte arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("put", "(B)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#put(int,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#put(int,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -218,7 +208,7 @@ public Java.Nio.ByteBuffer Put(int arg0, byte arg1)
             return IExecute<Java.Nio.ByteBuffer>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putChar(char)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putChar(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -227,7 +217,7 @@ public Java.Nio.ByteBuffer PutChar(char arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("putChar", "(C)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putChar(int,char)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putChar(int,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -237,7 +227,7 @@ public Java.Nio.ByteBuffer PutChar(int arg0, char arg1)
             return IExecute<Java.Nio.ByteBuffer>("putChar", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -246,7 +236,7 @@ public Java.Nio.ByteBuffer PutDouble(double arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("putDouble", "(D)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putDouble(int,double)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putDouble(int,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -256,7 +246,7 @@ public Java.Nio.ByteBuffer PutDouble(int arg0, double arg1)
             return IExecute<Java.Nio.ByteBuffer>("putDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putFloat(float)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putFloat(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -265,7 +255,7 @@ public Java.Nio.ByteBuffer PutFloat(float arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("putFloat", "(F)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putFloat(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putFloat(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -275,7 +265,7 @@ public Java.Nio.ByteBuffer PutFloat(int arg0, float arg1)
             return IExecute<Java.Nio.ByteBuffer>("putFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putInt(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putInt(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -285,7 +275,7 @@ public Java.Nio.ByteBuffer PutInt(int arg0, int arg1)
             return IExecute<Java.Nio.ByteBuffer>("putInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -294,7 +284,7 @@ public Java.Nio.ByteBuffer PutInt(int arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("putInt", "(I)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putLong(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putLong(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -304,7 +294,7 @@ public Java.Nio.ByteBuffer PutLong(int arg0, long arg1)
             return IExecute<Java.Nio.ByteBuffer>("putLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putLong(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -313,7 +303,7 @@ public Java.Nio.ByteBuffer PutLong(long arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("putLong", "(J)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putShort(int,short)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putShort(int,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -323,7 +313,7 @@ public Java.Nio.ByteBuffer PutShort(int arg0, short arg1)
             return IExecute<Java.Nio.ByteBuffer>("putShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#putShort(short)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#putShort(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -332,7 +322,7 @@ public Java.Nio.ByteBuffer PutShort(short arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("putShort", "(S)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#asCharBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#asCharBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
         public Java.Nio.CharBuffer AsCharBuffer()
@@ -340,7 +330,7 @@ public Java.Nio.CharBuffer AsCharBuffer()
             return IExecuteWithSignature<Java.Nio.CharBuffer>("asCharBuffer", "()Ljava/nio/CharBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#asDoubleBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#asDoubleBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
         public Java.Nio.DoubleBuffer AsDoubleBuffer()
@@ -348,7 +338,7 @@ public Java.Nio.DoubleBuffer AsDoubleBuffer()
             return IExecuteWithSignature<Java.Nio.DoubleBuffer>("asDoubleBuffer", "()Ljava/nio/DoubleBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#asFloatBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#asFloatBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
         public Java.Nio.FloatBuffer AsFloatBuffer()
@@ -356,7 +346,7 @@ public Java.Nio.FloatBuffer AsFloatBuffer()
             return IExecuteWithSignature<Java.Nio.FloatBuffer>("asFloatBuffer", "()Ljava/nio/FloatBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#asIntBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#asIntBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
         public Java.Nio.IntBuffer AsIntBuffer()
@@ -364,7 +354,7 @@ public Java.Nio.IntBuffer AsIntBuffer()
             return IExecuteWithSignature<Java.Nio.IntBuffer>("asIntBuffer", "()Ljava/nio/IntBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#asLongBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#asLongBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
         public Java.Nio.LongBuffer AsLongBuffer()
@@ -372,7 +362,7 @@ public Java.Nio.LongBuffer AsLongBuffer()
             return IExecuteWithSignature<Java.Nio.LongBuffer>("asLongBuffer", "()Ljava/nio/LongBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#asShortBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#asShortBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
         public Java.Nio.ShortBuffer AsShortBuffer()
@@ -380,7 +370,15 @@ public Java.Nio.ShortBuffer AsShortBuffer()
             return IExecuteWithSignature<Java.Nio.ShortBuffer>("asShortBuffer", "()Ljava/nio/ShortBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getLong(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getLong()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetLong()
+        {
+            return IExecuteWithSignature<long>("getLong", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -389,7 +387,15 @@ public long GetLong(int arg0)
             return IExecuteWithSignature<long>("getLong", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#getShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getShort()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        public short GetShort()
+        {
+            return IExecuteWithSignature<short>("getShort", "()S");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#getShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="short"/></returns>
@@ -398,7 +404,7 @@ public short GetShort(int arg0)
             return IExecuteWithSignature<short>("getShort", "(I)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#alignmentOffset(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#alignmentOffset(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -408,7 +414,7 @@ public int AlignmentOffset(int arg0, int arg1)
             return IExecute<int>("alignmentOffset", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#alignedSlice(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#alignedSlice(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -417,7 +423,7 @@ public Java.Nio.ByteBuffer AlignedSlice(int arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("alignedSlice", "(I)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#order(java.nio.ByteOrder)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#order(java.nio.ByteOrder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteOrder"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -426,7 +432,7 @@ public Java.Nio.ByteBuffer Order(Java.Nio.ByteOrder arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("order", "(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#put(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#put(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -435,7 +441,7 @@ public Java.Nio.ByteBuffer Put(byte[] arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("put", "([B)Ljava/nio/ByteBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#order()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#order()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteOrder"/></returns>
         public Java.Nio.ByteOrder Order()
@@ -443,7 +449,7 @@ public Java.Nio.ByteOrder Order()
             return IExecuteWithSignature<Java.Nio.ByteOrder>("order", "()Ljava/nio/ByteOrder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -452,7 +458,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#compareTo(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#compareTo(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -461,7 +467,7 @@ public int CompareTo(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#mismatch(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#mismatch(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -470,7 +476,7 @@ public int Mismatch(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("mismatch", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#get(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#get(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -481,7 +487,7 @@ public Java.Nio.ByteBuffer Get(byte[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.ByteBuffer>("get", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#get(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#get(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -490,29 +496,7 @@ public Java.Nio.ByteBuffer Get(byte[] arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("get", "([B)Ljava/nio/ByteBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#get(int,byte[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        public Java.Nio.ByteBuffer Get(int arg0, byte[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.ByteBuffer>("get", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#get(int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        public Java.Nio.ByteBuffer Get(int arg0, byte[] arg1)
-        {
-            return IExecute<Java.Nio.ByteBuffer>("get", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#put(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#put(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -523,41 +507,7 @@ public Java.Nio.ByteBuffer Put(byte[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.ByteBuffer>("put", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#put(int,byte[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        public Java.Nio.ByteBuffer Put(int arg0, byte[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.ByteBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#put(int,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        public Java.Nio.ByteBuffer Put(int arg0, byte[] arg1)
-        {
-            return IExecute<Java.Nio.ByteBuffer>("put", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#put(int,java.nio.ByteBuffer,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
-        public Java.Nio.ByteBuffer Put(int arg0, Java.Nio.ByteBuffer arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.ByteBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteBuffer.html#put(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteBuffer.html#put(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/ByteOrder.cs b/src/net/Netdroid/Generated/Java/Nio/ByteOrder.cs
index bc8a79827..e32b6a276 100644
--- a/src/net/Netdroid/Generated/Java/Nio/ByteOrder.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/ByteOrder.cs
@@ -38,13 +38,13 @@ public partial class ByteOrder
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteOrder.html#BIG_ENDIAN"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteOrder.html#BIG_ENDIAN"/>
         /// </summary>
         public static Java.Nio.ByteOrder BIG_ENDIAN { get { if (!_BIG_ENDIANReady) { _BIG_ENDIANContent = SGetField<Java.Nio.ByteOrder>(LocalBridgeClazz, "BIG_ENDIAN"); _BIG_ENDIANReady = true; } return _BIG_ENDIANContent; } }
         private static Java.Nio.ByteOrder _BIG_ENDIANContent = default;
         private static bool _BIG_ENDIANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteOrder.html#LITTLE_ENDIAN"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteOrder.html#LITTLE_ENDIAN"/>
         /// </summary>
         public static Java.Nio.ByteOrder LITTLE_ENDIAN { get { if (!_LITTLE_ENDIANReady) { _LITTLE_ENDIANContent = SGetField<Java.Nio.ByteOrder>(LocalBridgeClazz, "LITTLE_ENDIAN"); _LITTLE_ENDIANReady = true; } return _LITTLE_ENDIANContent; } }
         private static Java.Nio.ByteOrder _LITTLE_ENDIANContent = default;
@@ -54,7 +54,7 @@ public partial class ByteOrder
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ByteOrder.html#nativeOrder()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ByteOrder.html#nativeOrder()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteOrder"/></returns>
         public static Java.Nio.ByteOrder NativeOrder()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/AllPackageClasses.cs
index 10f0337ff..907bbf49d 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Nio.Channels
 {
     #region AcceptPendingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AcceptPendingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AcceptPendingException.html"/>
     /// </summary>
     public partial class AcceptPendingException : Java.Lang.IllegalStateException
     {
@@ -45,7 +45,7 @@ public partial class AcceptPendingException : Java.Lang.IllegalStateException
 
     #region AlreadyBoundException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AlreadyBoundException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AlreadyBoundException.html"/>
     /// </summary>
     public partial class AlreadyBoundException : Java.Lang.IllegalStateException
     {
@@ -62,7 +62,7 @@ public partial class AlreadyBoundException : Java.Lang.IllegalStateException
 
     #region AlreadyConnectedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AlreadyConnectedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AlreadyConnectedException.html"/>
     /// </summary>
     public partial class AlreadyConnectedException : Java.Lang.IllegalStateException
     {
@@ -79,7 +79,7 @@ public partial class AlreadyConnectedException : Java.Lang.IllegalStateException
 
     #region AsynchronousByteChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousByteChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel.html"/>
     /// </summary>
     public partial class AsynchronousByteChannel : Java.Nio.Channels.AsynchronousChannel
     {
@@ -87,12 +87,12 @@ public partial class AsynchronousByteChannel : Java.Nio.Channels.AsynchronousCha
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsynchronousByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousByteChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsynchronousByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousByteChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -125,7 +125,7 @@ public AsynchronousByteChannel(params object[] args) : base(args) { }
 
     #region AsynchronousChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannel.html"/>
     /// </summary>
     public partial class AsynchronousChannel : Java.Nio.Channels.Channel
     {
@@ -133,12 +133,12 @@ public partial class AsynchronousChannel : Java.Nio.Channels.Channel
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsynchronousChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsynchronousChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -171,7 +171,7 @@ public AsynchronousChannel(params object[] args) : base(args) { }
 
     #region AsynchronousChannelGroup
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html"/>
     /// </summary>
     public partial class AsynchronousChannelGroup : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AsynchronousChannelGroup>
     {
@@ -179,12 +179,12 @@ public partial class AsynchronousChannelGroup : MASES.JCOBridge.C2JBridge.JVMBri
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsynchronousChannelGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousChannelGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousChannelGroup() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsynchronousChannelGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousChannelGroup class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousChannelGroup(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -217,7 +217,7 @@ public AsynchronousChannelGroup(params object[] args) : base(args) { }
 
     #region AsynchronousCloseException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousCloseException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousCloseException.html"/>
     /// </summary>
     public partial class AsynchronousCloseException : Java.Nio.Channels.ClosedChannelException
     {
@@ -234,7 +234,7 @@ public partial class AsynchronousCloseException : Java.Nio.Channels.ClosedChanne
 
     #region AsynchronousFileChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html"/>
     /// </summary>
     public partial class AsynchronousFileChannel : Java.Nio.Channels.AsynchronousChannel
     {
@@ -242,12 +242,12 @@ public partial class AsynchronousFileChannel : Java.Nio.Channels.AsynchronousCha
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsynchronousFileChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousFileChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousFileChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsynchronousFileChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousFileChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousFileChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -280,7 +280,7 @@ public AsynchronousFileChannel(params object[] args) : base(args) { }
 
     #region AsynchronousServerSocketChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html"/>
     /// </summary>
     public partial class AsynchronousServerSocketChannel : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AsynchronousServerSocketChannel>
     {
@@ -288,12 +288,12 @@ public partial class AsynchronousServerSocketChannel : MASES.JCOBridge.C2JBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsynchronousServerSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousServerSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousServerSocketChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsynchronousServerSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousServerSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousServerSocketChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -326,7 +326,7 @@ public AsynchronousServerSocketChannel(params object[] args) : base(args) { }
 
     #region AsynchronousSocketChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html"/>
     /// </summary>
     public partial class AsynchronousSocketChannel : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AsynchronousSocketChannel>
     {
@@ -334,12 +334,12 @@ public partial class AsynchronousSocketChannel : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsynchronousSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousSocketChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsynchronousSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousSocketChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -372,7 +372,7 @@ public AsynchronousSocketChannel(params object[] args) : base(args) { }
 
     #region ByteChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ByteChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ByteChannel.html"/>
     /// </summary>
     public partial class ByteChannel : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ByteChannel>
     {
@@ -380,12 +380,12 @@ public partial class ByteChannel : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ByteC
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ByteChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ByteChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -418,7 +418,7 @@ public ByteChannel(params object[] args) : base(args) { }
 
     #region CancelledKeyException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/CancelledKeyException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/CancelledKeyException.html"/>
     /// </summary>
     public partial class CancelledKeyException : Java.Lang.IllegalStateException
     {
@@ -435,7 +435,7 @@ public partial class CancelledKeyException : Java.Lang.IllegalStateException
 
     #region Channel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/Channel.html"/>
     /// </summary>
     public partial class Channel : Java.Io.Closeable
     {
@@ -443,12 +443,12 @@ public partial class Channel : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Channel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Channel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Channel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Channel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Channel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Channel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -481,7 +481,7 @@ public Channel(params object[] args) : base(args) { }
 
     #region Channels
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html"/>
     /// </summary>
     public partial class Channels : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Channels>
     {
@@ -525,7 +525,7 @@ public Channels(params object[] args) : base(args) { }
 
     #region ClosedByInterruptException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ClosedByInterruptException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ClosedByInterruptException.html"/>
     /// </summary>
     public partial class ClosedByInterruptException : Java.Nio.Channels.AsynchronousCloseException
     {
@@ -542,7 +542,7 @@ public partial class ClosedByInterruptException : Java.Nio.Channels.Asynchronous
 
     #region ClosedChannelException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ClosedChannelException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ClosedChannelException.html"/>
     /// </summary>
     public partial class ClosedChannelException : Java.Io.IOException
     {
@@ -559,7 +559,7 @@ public partial class ClosedChannelException : Java.Io.IOException
 
     #region ClosedSelectorException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ClosedSelectorException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ClosedSelectorException.html"/>
     /// </summary>
     public partial class ClosedSelectorException : Java.Lang.IllegalStateException
     {
@@ -576,7 +576,7 @@ public partial class ClosedSelectorException : Java.Lang.IllegalStateException
 
     #region CompletionHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/CompletionHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/CompletionHandler.html"/>
     /// </summary>
     public partial class CompletionHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CompletionHandler>
     {
@@ -584,12 +584,12 @@ public partial class CompletionHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CompletionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CompletionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -622,7 +622,7 @@ public CompletionHandler(params object[] args) : base(args) { }
 
     #region CompletionHandler<V, A>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/CompletionHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/CompletionHandler.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     /// <typeparam name="A"></typeparam>
@@ -632,12 +632,12 @@ public partial class CompletionHandler<V, A> : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CompletionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CompletionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -670,7 +670,7 @@ public CompletionHandler(params object[] args) : base(args) { }
 
     #region ConnectionPendingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ConnectionPendingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ConnectionPendingException.html"/>
     /// </summary>
     public partial class ConnectionPendingException : Java.Lang.IllegalStateException
     {
@@ -687,7 +687,7 @@ public partial class ConnectionPendingException : Java.Lang.IllegalStateExceptio
 
     #region DatagramChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html"/>
     /// </summary>
     public partial class DatagramChannel : Java.Nio.Channels.Spi.AbstractSelectableChannel
     {
@@ -695,12 +695,12 @@ public partial class DatagramChannel : Java.Nio.Channels.Spi.AbstractSelectableC
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DatagramChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatagramChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatagramChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DatagramChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatagramChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatagramChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -733,7 +733,7 @@ public DatagramChannel(params object[] args) : base(args) { }
 
     #region FileChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html"/>
     /// </summary>
     public partial class FileChannel : Java.Nio.Channels.Spi.AbstractInterruptibleChannel
     {
@@ -741,12 +741,12 @@ public partial class FileChannel : Java.Nio.Channels.Spi.AbstractInterruptibleCh
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -775,7 +775,7 @@ public FileChannel(params object[] args) : base(args) { }
         // TODO: complete the class
         #region MapMode
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.MapMode.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.MapMode.html"/>
         /// </summary>
         public partial class MapMode : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MapMode>
         {
@@ -823,7 +823,7 @@ public MapMode(params object[] args) : base(args) { }
 
     #region FileLock
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html"/>
     /// </summary>
     public partial class FileLock : Java.Lang.AutoCloseable
     {
@@ -831,12 +831,12 @@ public partial class FileLock : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileLock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileLock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileLock() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileLock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileLock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileLock(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -869,7 +869,7 @@ public FileLock(params object[] args) : base(args) { }
 
     #region FileLockInterruptionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLockInterruptionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/FileLockInterruptionException.html"/>
     /// </summary>
     public partial class FileLockInterruptionException : Java.Io.IOException
     {
@@ -886,7 +886,7 @@ public partial class FileLockInterruptionException : Java.Io.IOException
 
     #region GatheringByteChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/GatheringByteChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/GatheringByteChannel.html"/>
     /// </summary>
     public partial class GatheringByteChannel : Java.Nio.Channels.WritableByteChannel
     {
@@ -894,12 +894,12 @@ public partial class GatheringByteChannel : Java.Nio.Channels.WritableByteChanne
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GatheringByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GatheringByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GatheringByteChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GatheringByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GatheringByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GatheringByteChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -932,7 +932,7 @@ public GatheringByteChannel(params object[] args) : base(args) { }
 
     #region IllegalBlockingModeException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/IllegalBlockingModeException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/IllegalBlockingModeException.html"/>
     /// </summary>
     public partial class IllegalBlockingModeException : Java.Lang.IllegalStateException
     {
@@ -949,7 +949,7 @@ public partial class IllegalBlockingModeException : Java.Lang.IllegalStateExcept
 
     #region IllegalChannelGroupException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/IllegalChannelGroupException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/IllegalChannelGroupException.html"/>
     /// </summary>
     public partial class IllegalChannelGroupException : Java.Lang.IllegalArgumentException
     {
@@ -966,7 +966,7 @@ public partial class IllegalChannelGroupException : Java.Lang.IllegalArgumentExc
 
     #region IllegalSelectorException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/IllegalSelectorException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/IllegalSelectorException.html"/>
     /// </summary>
     public partial class IllegalSelectorException : Java.Lang.IllegalArgumentException
     {
@@ -983,7 +983,7 @@ public partial class IllegalSelectorException : Java.Lang.IllegalArgumentExcepti
 
     #region InterruptedByTimeoutException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/InterruptedByTimeoutException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/InterruptedByTimeoutException.html"/>
     /// </summary>
     public partial class InterruptedByTimeoutException : Java.Io.IOException
     {
@@ -1000,7 +1000,7 @@ public partial class InterruptedByTimeoutException : Java.Io.IOException
 
     #region InterruptibleChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/InterruptibleChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/InterruptibleChannel.html"/>
     /// </summary>
     public partial class InterruptibleChannel : Java.Nio.Channels.Channel
     {
@@ -1008,12 +1008,12 @@ public partial class InterruptibleChannel : Java.Nio.Channels.Channel
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("InterruptibleChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InterruptibleChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InterruptibleChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("InterruptibleChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("InterruptibleChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public InterruptibleChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1046,7 +1046,7 @@ public InterruptibleChannel(params object[] args) : base(args) { }
 
     #region MembershipKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html"/>
     /// </summary>
     public partial class MembershipKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MembershipKey>
     {
@@ -1054,12 +1054,12 @@ public partial class MembershipKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Mem
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MembershipKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MembershipKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MembershipKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MembershipKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MembershipKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MembershipKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1092,7 +1092,7 @@ public MembershipKey(params object[] args) : base(args) { }
 
     #region MulticastChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MulticastChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/MulticastChannel.html"/>
     /// </summary>
     public partial class MulticastChannel : Java.Nio.Channels.NetworkChannel
     {
@@ -1100,12 +1100,12 @@ public partial class MulticastChannel : Java.Nio.Channels.NetworkChannel
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MulticastChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MulticastChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MulticastChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MulticastChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MulticastChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MulticastChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1138,7 +1138,7 @@ public MulticastChannel(params object[] args) : base(args) { }
 
     #region NetworkChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NetworkChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/NetworkChannel.html"/>
     /// </summary>
     public partial class NetworkChannel : Java.Nio.Channels.Channel
     {
@@ -1146,12 +1146,12 @@ public partial class NetworkChannel : Java.Nio.Channels.Channel
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NetworkChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NetworkChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NetworkChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NetworkChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NetworkChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NetworkChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1184,7 +1184,7 @@ public NetworkChannel(params object[] args) : base(args) { }
 
     #region NoConnectionPendingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NoConnectionPendingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/NoConnectionPendingException.html"/>
     /// </summary>
     public partial class NoConnectionPendingException : Java.Lang.IllegalStateException
     {
@@ -1201,7 +1201,7 @@ public partial class NoConnectionPendingException : Java.Lang.IllegalStateExcept
 
     #region NonReadableChannelException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NonReadableChannelException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/NonReadableChannelException.html"/>
     /// </summary>
     public partial class NonReadableChannelException : Java.Lang.IllegalStateException
     {
@@ -1218,7 +1218,7 @@ public partial class NonReadableChannelException : Java.Lang.IllegalStateExcepti
 
     #region NonWritableChannelException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NonWritableChannelException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/NonWritableChannelException.html"/>
     /// </summary>
     public partial class NonWritableChannelException : Java.Lang.IllegalStateException
     {
@@ -1235,7 +1235,7 @@ public partial class NonWritableChannelException : Java.Lang.IllegalStateExcepti
 
     #region NotYetBoundException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NotYetBoundException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/NotYetBoundException.html"/>
     /// </summary>
     public partial class NotYetBoundException : Java.Lang.IllegalStateException
     {
@@ -1252,7 +1252,7 @@ public partial class NotYetBoundException : Java.Lang.IllegalStateException
 
     #region NotYetConnectedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NotYetConnectedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/NotYetConnectedException.html"/>
     /// </summary>
     public partial class NotYetConnectedException : Java.Lang.IllegalStateException
     {
@@ -1269,7 +1269,7 @@ public partial class NotYetConnectedException : Java.Lang.IllegalStateException
 
     #region OverlappingFileLockException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/OverlappingFileLockException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/OverlappingFileLockException.html"/>
     /// </summary>
     public partial class OverlappingFileLockException : Java.Lang.IllegalStateException
     {
@@ -1286,7 +1286,7 @@ public partial class OverlappingFileLockException : Java.Lang.IllegalStateExcept
 
     #region Pipe
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Pipe.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/Pipe.html"/>
     /// </summary>
     public partial class Pipe : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pipe>
     {
@@ -1294,12 +1294,12 @@ public partial class Pipe : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pipe>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Pipe class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Pipe class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Pipe() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Pipe class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Pipe class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Pipe(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1328,7 +1328,7 @@ public Pipe(params object[] args) : base(args) { }
         // TODO: complete the class
         #region SinkChannel
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Pipe.SinkChannel.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Pipe.SinkChannel.html"/>
         /// </summary>
         public partial class SinkChannel : Java.Nio.Channels.Spi.AbstractSelectableChannel
         {
@@ -1336,12 +1336,12 @@ public partial class SinkChannel : Java.Nio.Channels.Spi.AbstractSelectableChann
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SinkChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SinkChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SinkChannel() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SinkChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SinkChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SinkChannel(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1374,7 +1374,7 @@ public SinkChannel(params object[] args) : base(args) { }
 
         #region SourceChannel
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Pipe.SourceChannel.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Pipe.SourceChannel.html"/>
         /// </summary>
         public partial class SourceChannel : Java.Nio.Channels.Spi.AbstractSelectableChannel
         {
@@ -1382,12 +1382,12 @@ public partial class SourceChannel : Java.Nio.Channels.Spi.AbstractSelectableCha
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("SourceChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SourceChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SourceChannel() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("SourceChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("SourceChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public SourceChannel(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1424,7 +1424,7 @@ public SourceChannel(params object[] args) : base(args) { }
 
     #region ReadableByteChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ReadableByteChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ReadableByteChannel.html"/>
     /// </summary>
     public partial class ReadableByteChannel : Java.Nio.Channels.Channel
     {
@@ -1432,12 +1432,12 @@ public partial class ReadableByteChannel : Java.Nio.Channels.Channel
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ReadableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReadableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReadableByteChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ReadableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReadableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReadableByteChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1470,7 +1470,7 @@ public ReadableByteChannel(params object[] args) : base(args) { }
 
     #region ReadPendingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ReadPendingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ReadPendingException.html"/>
     /// </summary>
     public partial class ReadPendingException : Java.Lang.IllegalStateException
     {
@@ -1487,7 +1487,7 @@ public partial class ReadPendingException : Java.Lang.IllegalStateException
 
     #region ScatteringByteChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ScatteringByteChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ScatteringByteChannel.html"/>
     /// </summary>
     public partial class ScatteringByteChannel : Java.Nio.Channels.ReadableByteChannel
     {
@@ -1495,12 +1495,12 @@ public partial class ScatteringByteChannel : Java.Nio.Channels.ReadableByteChann
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ScatteringByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScatteringByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScatteringByteChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ScatteringByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScatteringByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScatteringByteChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1533,7 +1533,7 @@ public ScatteringByteChannel(params object[] args) : base(args) { }
 
     #region SeekableByteChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SeekableByteChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel.html"/>
     /// </summary>
     public partial class SeekableByteChannel : Java.Nio.Channels.ByteChannel
     {
@@ -1541,12 +1541,12 @@ public partial class SeekableByteChannel : Java.Nio.Channels.ByteChannel
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SeekableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SeekableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SeekableByteChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SeekableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SeekableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SeekableByteChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1579,7 +1579,7 @@ public SeekableByteChannel(params object[] args) : base(args) { }
 
     #region SelectableChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html"/>
     /// </summary>
     public partial class SelectableChannel : Java.Nio.Channels.Spi.AbstractInterruptibleChannel
     {
@@ -1587,12 +1587,12 @@ public partial class SelectableChannel : Java.Nio.Channels.Spi.AbstractInterrupt
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SelectableChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SelectableChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SelectableChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SelectableChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SelectableChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SelectableChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1625,7 +1625,7 @@ public SelectableChannel(params object[] args) : base(args) { }
 
     #region SelectionKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html"/>
     /// </summary>
     public partial class SelectionKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SelectionKey>
     {
@@ -1633,12 +1633,12 @@ public partial class SelectionKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sele
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SelectionKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SelectionKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SelectionKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SelectionKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SelectionKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SelectionKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1671,7 +1671,7 @@ public SelectionKey(params object[] args) : base(args) { }
 
     #region Selector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html"/>
     /// </summary>
     public partial class Selector : Java.Io.Closeable
     {
@@ -1679,12 +1679,12 @@ public partial class Selector : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Selector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Selector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Selector() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Selector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Selector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Selector(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1717,7 +1717,7 @@ public Selector(params object[] args) : base(args) { }
 
     #region ServerSocketChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html"/>
     /// </summary>
     public partial class ServerSocketChannel : Java.Nio.Channels.Spi.AbstractSelectableChannel
     {
@@ -1725,12 +1725,12 @@ public partial class ServerSocketChannel : Java.Nio.Channels.Spi.AbstractSelecta
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ServerSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServerSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServerSocketChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ServerSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServerSocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServerSocketChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1763,7 +1763,7 @@ public ServerSocketChannel(params object[] args) : base(args) { }
 
     #region ShutdownChannelGroupException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ShutdownChannelGroupException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/ShutdownChannelGroupException.html"/>
     /// </summary>
     public partial class ShutdownChannelGroupException : Java.Lang.IllegalStateException
     {
@@ -1780,7 +1780,7 @@ public partial class ShutdownChannelGroupException : Java.Lang.IllegalStateExcep
 
     #region SocketChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html"/>
     /// </summary>
     public partial class SocketChannel : Java.Nio.Channels.Spi.AbstractSelectableChannel
     {
@@ -1788,12 +1788,12 @@ public partial class SocketChannel : Java.Nio.Channels.Spi.AbstractSelectableCha
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1826,7 +1826,7 @@ public SocketChannel(params object[] args) : base(args) { }
 
     #region UnresolvedAddressException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/UnresolvedAddressException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/UnresolvedAddressException.html"/>
     /// </summary>
     public partial class UnresolvedAddressException : Java.Lang.IllegalArgumentException
     {
@@ -1843,7 +1843,7 @@ public partial class UnresolvedAddressException : Java.Lang.IllegalArgumentExcep
 
     #region UnsupportedAddressTypeException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/UnsupportedAddressTypeException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/UnsupportedAddressTypeException.html"/>
     /// </summary>
     public partial class UnsupportedAddressTypeException : Java.Lang.IllegalArgumentException
     {
@@ -1860,7 +1860,7 @@ public partial class UnsupportedAddressTypeException : Java.Lang.IllegalArgument
 
     #region WritableByteChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/WritableByteChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/WritableByteChannel.html"/>
     /// </summary>
     public partial class WritableByteChannel : Java.Nio.Channels.Channel
     {
@@ -1868,12 +1868,12 @@ public partial class WritableByteChannel : Java.Nio.Channels.Channel
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WritableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WritableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WritableByteChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WritableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WritableByteChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WritableByteChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1906,7 +1906,7 @@ public WritableByteChannel(params object[] args) : base(args) { }
 
     #region WritePendingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/WritePendingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/WritePendingException.html"/>
     /// </summary>
     public partial class WritePendingException : Java.Lang.IllegalStateException
     {
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousByteChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousByteChannel.cs
index 64d051caf..78cf0102d 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousByteChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousByteChannel.cs
@@ -64,31 +64,31 @@ public partial class AsynchronousByteChannel : Java.Nio.Channels.IAsynchronousBy
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousByteChannel.html#read(java.nio.ByteBuffer,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel.html#read(java.nio.ByteBuffer,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><typeparamref name="A"/></param>
         /// <param name="arg2"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg2objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Read<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg2objectSuperA> arg2) where Arg2objectSuperA: A
+        public void Read<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg2objectSuperA> arg2) where Arg2objectSuperA : A
         {
             IExecute("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousByteChannel.html#write(java.nio.ByteBuffer,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel.html#write(java.nio.ByteBuffer,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><typeparamref name="A"/></param>
         /// <param name="arg2"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg2objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Write<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg2objectSuperA> arg2) where Arg2objectSuperA: A
+        public void Write<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg2objectSuperA> arg2) where Arg2objectSuperA : A
         {
             IExecute("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousByteChannel.html#read(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel.html#read(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -97,7 +97,7 @@ public void Write<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Ni
             return IExecuteWithSignature<Java.Util.Concurrent.Future<Java.Lang.Integer>>("read", "(Ljava/nio/ByteBuffer;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousByteChannel.html#write(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousByteChannel.html#write(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousChannel.cs
index bbf2b45d8..728403ad0 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousChannel.cs
@@ -64,7 +64,7 @@ public partial class AsynchronousChannel : Java.Nio.Channels.IAsynchronousChanne
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannel.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannel.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousChannelGroup.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousChannelGroup.cs
index 7ddccb72c..c1c6d1f49 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousChannelGroup.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousChannelGroup.cs
@@ -42,7 +42,7 @@ public partial class AsynchronousChannelGroup
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#withCachedThreadPool(java.util.concurrent.ExecutorService,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#withCachedThreadPool(java.util.concurrent.ExecutorService,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ExecutorService"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -53,7 +53,7 @@ public static Java.Nio.Channels.AsynchronousChannelGroup WithCachedThreadPool(Ja
             return SExecute<Java.Nio.Channels.AsynchronousChannelGroup>(LocalBridgeClazz, "withCachedThreadPool", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#withFixedThreadPool(int,java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#withFixedThreadPool(int,java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
@@ -64,7 +64,7 @@ public static Java.Nio.Channels.AsynchronousChannelGroup WithFixedThreadPool(int
             return SExecute<Java.Nio.Channels.AsynchronousChannelGroup>(LocalBridgeClazz, "withFixedThreadPool", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#withThreadPool(java.util.concurrent.ExecutorService)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#withThreadPool(java.util.concurrent.ExecutorService)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ExecutorService"/></param>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousChannelGroup"/></returns>
@@ -78,7 +78,7 @@ public static Java.Nio.Channels.AsynchronousChannelGroup WithThreadPool(Java.Uti
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#awaitTermination(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#awaitTermination(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -89,7 +89,7 @@ public bool AwaitTermination(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<bool>("awaitTermination", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#isShutdown()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#isShutdown()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsShutdown()
@@ -97,7 +97,7 @@ public bool IsShutdown()
             return IExecuteWithSignature<bool>("isShutdown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#isTerminated()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#isTerminated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsTerminated()
@@ -105,14 +105,14 @@ public bool IsTerminated()
             return IExecuteWithSignature<bool>("isTerminated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#shutdown()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#shutdown()"/>
         /// </summary>
         public void Shutdown()
         {
             IExecuteWithSignature("shutdown", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#shutdownNow()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#shutdownNow()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void ShutdownNow()
@@ -120,7 +120,7 @@ public void ShutdownNow()
             IExecuteWithSignature("shutdownNow", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousChannelGroup.html#provider()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousChannelGroup.html#provider()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Spi.AsynchronousChannelProvider"/></returns>
         public Java.Nio.Channels.Spi.AsynchronousChannelProvider Provider()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousFileChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousFileChannel.cs
index df8a325e1..43566b027 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousFileChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousFileChannel.cs
@@ -42,7 +42,7 @@ public partial class AsynchronousFileChannel
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#open(java.nio.file.Path,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#open(java.nio.file.Path,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.OpenOption"/></param>
@@ -53,7 +53,7 @@ public static Java.Nio.Channels.AsynchronousFileChannel Open(Java.Nio.File.Path
             if (arg1.Length == 0) return SExecute<Java.Nio.Channels.AsynchronousFileChannel>(LocalBridgeClazz, "open", arg0); else return SExecute<Java.Nio.Channels.AsynchronousFileChannel>(LocalBridgeClazz, "open", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#open(java.nio.file.Path,java.util.Set,java.util.concurrent.ExecutorService,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#open(java.nio.file.Path,java.util.Set,java.util.concurrent.ExecutorService,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -62,7 +62,7 @@ public static Java.Nio.Channels.AsynchronousFileChannel Open(Java.Nio.File.Path
         /// <typeparam name="Arg1ExtendsJava_Nio_File_OpenOption"><see cref="Java.Nio.File.OpenOption"/></typeparam>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousFileChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.Channels.AsynchronousFileChannel Open<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, Java.Util.Concurrent.ExecutorService arg2, params Java.Nio.File.Attribute.FileAttribute<object>[] arg3) where Arg1ExtendsJava_Nio_File_OpenOption: Java.Nio.File.OpenOption
+        public static Java.Nio.Channels.AsynchronousFileChannel Open<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, Java.Util.Concurrent.ExecutorService arg2, params Java.Nio.File.Attribute.FileAttribute<object>[] arg3) where Arg1ExtendsJava_Nio_File_OpenOption : Java.Nio.File.OpenOption
         {
             if (arg3.Length == 0) return SExecute<Java.Nio.Channels.AsynchronousFileChannel>(LocalBridgeClazz, "open", arg0, arg1, arg2); else return SExecute<Java.Nio.Channels.AsynchronousFileChannel>(LocalBridgeClazz, "open", arg0, arg1, arg2, arg3);
         }
@@ -71,7 +71,7 @@ public static Java.Nio.Channels.AsynchronousFileChannel Open<Arg1ExtendsJava_Nio
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#lock(long,long,boolean,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#lock(long,long,boolean,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -80,12 +80,12 @@ public static Java.Nio.Channels.AsynchronousFileChannel Open<Arg1ExtendsJava_Nio
         /// <param name="arg4"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg4objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Lock<A, Arg4objectSuperA>(long arg0, long arg1, bool arg2, A arg3, Java.Nio.Channels.CompletionHandler<Java.Nio.Channels.FileLock, Arg4objectSuperA> arg4) where Arg4objectSuperA: A
+        public void Lock<A, Arg4objectSuperA>(long arg0, long arg1, bool arg2, A arg3, Java.Nio.Channels.CompletionHandler<Java.Nio.Channels.FileLock, Arg4objectSuperA> arg4) where Arg4objectSuperA : A
         {
             IExecute("lock", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#read(java.nio.ByteBuffer,long,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#read(java.nio.ByteBuffer,long,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -93,12 +93,12 @@ public void Lock<A, Arg4objectSuperA>(long arg0, long arg1, bool arg2, A arg3, J
         /// <param name="arg3"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg3objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Read<A, Arg3objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, A arg2, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg3objectSuperA> arg3) where Arg3objectSuperA: A
+        public void Read<A, Arg3objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, A arg2, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg3objectSuperA> arg3) where Arg3objectSuperA : A
         {
             IExecute("read", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#write(java.nio.ByteBuffer,long,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#write(java.nio.ByteBuffer,long,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -106,12 +106,12 @@ public void Read<A, Arg3objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, A arg
         /// <param name="arg3"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg3objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Write<A, Arg3objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, A arg2, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg3objectSuperA> arg3) where Arg3objectSuperA: A
+        public void Write<A, Arg3objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, A arg2, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg3objectSuperA> arg3) where Arg3objectSuperA : A
         {
             IExecute("write", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#truncate(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#truncate(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousFileChannel"/></returns>
@@ -121,7 +121,7 @@ public Java.Nio.Channels.AsynchronousFileChannel Truncate(long arg0)
             return IExecuteWithSignature<Java.Nio.Channels.AsynchronousFileChannel>("truncate", "(J)Ljava/nio/channels/AsynchronousFileChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#tryLock(long,long,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#tryLock(long,long,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -133,7 +133,7 @@ public Java.Nio.Channels.FileLock TryLock(long arg0, long arg1, bool arg2)
             return IExecute<Java.Nio.Channels.FileLock>("tryLock", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#read(java.nio.ByteBuffer,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#read(java.nio.ByteBuffer,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -143,7 +143,7 @@ public Java.Nio.Channels.FileLock TryLock(long arg0, long arg1, bool arg2)
             return IExecute<Java.Util.Concurrent.Future<Java.Lang.Integer>>("read", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#write(java.nio.ByteBuffer,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#write(java.nio.ByteBuffer,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -153,7 +153,7 @@ public Java.Nio.Channels.FileLock TryLock(long arg0, long arg1, bool arg2)
             return IExecute<Java.Util.Concurrent.Future<Java.Lang.Integer>>("write", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#lock(long,long,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#lock(long,long,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -164,7 +164,7 @@ public Java.Nio.Channels.FileLock TryLock(long arg0, long arg1, bool arg2)
             return IExecute<Java.Util.Concurrent.Future<Java.Nio.Channels.FileLock>>("lock", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#size()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -173,7 +173,7 @@ public long Size()
             return IExecuteWithSignature<long>("size", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#force(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#force(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -182,18 +182,18 @@ public void Force(bool arg0)
             IExecuteWithSignature("force", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#lock(java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#lock(java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="A"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg1objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Lock<A, Arg1objectSuperA>(A arg0, Java.Nio.Channels.CompletionHandler<Java.Nio.Channels.FileLock, Arg1objectSuperA> arg1) where Arg1objectSuperA: A
+        public void Lock<A, Arg1objectSuperA>(A arg0, Java.Nio.Channels.CompletionHandler<Java.Nio.Channels.FileLock, Arg1objectSuperA> arg1) where Arg1objectSuperA : A
         {
             IExecute("lock", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#tryLock()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#tryLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.FileLock"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -202,7 +202,7 @@ public Java.Nio.Channels.FileLock TryLock()
             return IExecuteWithSignature<Java.Nio.Channels.FileLock>("tryLock", "()Ljava/nio/channels/FileLock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousFileChannel.html#lock()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousFileChannel.html#lock()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         public Java.Util.Concurrent.Future<Java.Nio.Channels.FileLock> Lock()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousServerSocketChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousServerSocketChannel.cs
index b28d992ff..f126a7052 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousServerSocketChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousServerSocketChannel.cs
@@ -50,7 +50,7 @@ public partial class AsynchronousServerSocketChannel : Java.Nio.Channels.IAsynch
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#open()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#open()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousServerSocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -59,7 +59,7 @@ public static Java.Nio.Channels.AsynchronousServerSocketChannel Open()
             return SExecuteWithSignature<Java.Nio.Channels.AsynchronousServerSocketChannel>(LocalBridgeClazz, "open", "()Ljava/nio/channels/AsynchronousServerSocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#open(java.nio.channels.AsynchronousChannelGroup)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#open(java.nio.channels.AsynchronousChannelGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.AsynchronousChannelGroup"/></param>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousServerSocketChannel"/></returns>
@@ -73,25 +73,27 @@ public static Java.Nio.Channels.AsynchronousServerSocketChannel Open(Java.Nio.Ch
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#getLocalAddress()"/> 
-        /// </summary>
-        public Java.Net.SocketAddress LocalAddress
-        {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#accept(java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#accept(java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="A"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg1objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Accept<A, Arg1objectSuperA>(A arg0, Java.Nio.Channels.CompletionHandler<Java.Nio.Channels.AsynchronousSocketChannel, Arg1objectSuperA> arg1) where Arg1objectSuperA: A
+        public void Accept<A, Arg1objectSuperA>(A arg0, Java.Nio.Channels.CompletionHandler<Java.Nio.Channels.AsynchronousSocketChannel, Arg1objectSuperA> arg1) where Arg1objectSuperA : A
         {
             IExecute("accept", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#bind(java.net.SocketAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#getLocalAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetLocalAddress()
+        {
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#bind(java.net.SocketAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -102,7 +104,7 @@ public Java.Nio.Channels.AsynchronousServerSocketChannel Bind(Java.Net.SocketAdd
             return IExecute<Java.Nio.Channels.AsynchronousServerSocketChannel>("bind", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#accept()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#accept()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         public Java.Util.Concurrent.Future<Java.Nio.Channels.AsynchronousSocketChannel> Accept()
@@ -110,7 +112,7 @@ public Java.Nio.Channels.AsynchronousServerSocketChannel Bind(Java.Net.SocketAdd
             return IExecuteWithSignature<Java.Util.Concurrent.Future<Java.Nio.Channels.AsynchronousSocketChannel>>("accept", "()Ljava/util/concurrent/Future;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#provider()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#provider()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Spi.AsynchronousChannelProvider"/></returns>
         public Java.Nio.Channels.Spi.AsynchronousChannelProvider Provider()
@@ -118,7 +120,7 @@ public Java.Nio.Channels.Spi.AsynchronousChannelProvider Provider()
             return IExecuteWithSignature<Java.Nio.Channels.Spi.AsynchronousChannelProvider>("provider", "()Ljava/nio/channels/spi/AsynchronousChannelProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.NetworkChannel"/></returns>
@@ -128,7 +130,7 @@ public Java.Nio.Channels.NetworkChannel Bind(Java.Net.SocketAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.NetworkChannel>("bind", "(Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousServerSocketChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousServerSocketChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousSocketChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousSocketChannel.cs
index 32f135578..7a524bb28 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousSocketChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/AsynchronousSocketChannel.cs
@@ -50,7 +50,7 @@ public partial class AsynchronousSocketChannel : Java.Nio.Channels.IAsynchronous
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#open()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#open()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousSocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -59,7 +59,7 @@ public static Java.Nio.Channels.AsynchronousSocketChannel Open()
             return SExecuteWithSignature<Java.Nio.Channels.AsynchronousSocketChannel>(LocalBridgeClazz, "open", "()Ljava/nio/channels/AsynchronousSocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#open(java.nio.channels.AsynchronousChannelGroup)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#open(java.nio.channels.AsynchronousChannelGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.AsynchronousChannelGroup"/></param>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousSocketChannel"/></returns>
@@ -73,33 +73,19 @@ public static Java.Nio.Channels.AsynchronousSocketChannel Open(Java.Nio.Channels
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#getLocalAddress()"/> 
-        /// </summary>
-        public Java.Net.SocketAddress LocalAddress
-        {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#getRemoteAddress()"/> 
-        /// </summary>
-        public Java.Net.SocketAddress RemoteAddress
-        {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteAddress", "()Ljava/net/SocketAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#connect(java.net.SocketAddress,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#connect(java.net.SocketAddress,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <param name="arg1"><typeparamref name="A"/></param>
         /// <param name="arg2"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg2objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Connect<A, Arg2objectSuperA>(Java.Net.SocketAddress arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Void, Arg2objectSuperA> arg2) where Arg2objectSuperA: A
+        public void Connect<A, Arg2objectSuperA>(Java.Net.SocketAddress arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Void, Arg2objectSuperA> arg2) where Arg2objectSuperA : A
         {
             IExecute("connect", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#read(java.nio.ByteBuffer,long,java.util.concurrent.TimeUnit,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#read(java.nio.ByteBuffer,long,java.util.concurrent.TimeUnit,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -108,12 +94,12 @@ public void Connect<A, Arg2objectSuperA>(Java.Net.SocketAddress arg0, A arg1, Ja
         /// <param name="arg4"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg4objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Read<A, Arg4objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2, A arg3, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg4objectSuperA> arg4) where Arg4objectSuperA: A
+        public void Read<A, Arg4objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2, A arg3, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg4objectSuperA> arg4) where Arg4objectSuperA : A
         {
             IExecute("read", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#read(java.nio.ByteBuffer[],int,int,long,java.util.concurrent.TimeUnit,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#read(java.nio.ByteBuffer[],int,int,long,java.util.concurrent.TimeUnit,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -124,12 +110,12 @@ public void Read<A, Arg4objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, Java.
         /// <param name="arg6"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg6objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Read<A, Arg6objectSuperA>(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2, long arg3, Java.Util.Concurrent.TimeUnit arg4, A arg5, Java.Nio.Channels.CompletionHandler<Java.Lang.Long, Arg6objectSuperA> arg6) where Arg6objectSuperA: A
+        public void Read<A, Arg6objectSuperA>(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2, long arg3, Java.Util.Concurrent.TimeUnit arg4, A arg5, Java.Nio.Channels.CompletionHandler<Java.Lang.Long, Arg6objectSuperA> arg6) where Arg6objectSuperA : A
         {
             IExecute("read", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#write(java.nio.ByteBuffer,long,java.util.concurrent.TimeUnit,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#write(java.nio.ByteBuffer,long,java.util.concurrent.TimeUnit,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -138,12 +124,12 @@ public void Read<A, Arg6objectSuperA>(Java.Nio.ByteBuffer[] arg0, int arg1, int
         /// <param name="arg4"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg4objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Write<A, Arg4objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2, A arg3, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg4objectSuperA> arg4) where Arg4objectSuperA: A
+        public void Write<A, Arg4objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2, A arg3, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg4objectSuperA> arg4) where Arg4objectSuperA : A
         {
             IExecute("write", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#write(java.nio.ByteBuffer[],int,int,long,java.util.concurrent.TimeUnit,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#write(java.nio.ByteBuffer[],int,int,long,java.util.concurrent.TimeUnit,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -154,12 +140,30 @@ public void Write<A, Arg4objectSuperA>(Java.Nio.ByteBuffer arg0, long arg1, Java
         /// <param name="arg6"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg6objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Write<A, Arg6objectSuperA>(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2, long arg3, Java.Util.Concurrent.TimeUnit arg4, A arg5, Java.Nio.Channels.CompletionHandler<Java.Lang.Long, Arg6objectSuperA> arg6) where Arg6objectSuperA: A
+        public void Write<A, Arg6objectSuperA>(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2, long arg3, Java.Util.Concurrent.TimeUnit arg4, A arg5, Java.Nio.Channels.CompletionHandler<Java.Lang.Long, Arg6objectSuperA> arg6) where Arg6objectSuperA : A
         {
             IExecute("write", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#shutdownInput()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#getLocalAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetLocalAddress()
+        {
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#getRemoteAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetRemoteAddress()
+        {
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteAddress", "()Ljava/net/SocketAddress;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#shutdownInput()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousSocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -168,7 +172,7 @@ public Java.Nio.Channels.AsynchronousSocketChannel ShutdownInput()
             return IExecuteWithSignature<Java.Nio.Channels.AsynchronousSocketChannel>("shutdownInput", "()Ljava/nio/channels/AsynchronousSocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#shutdownOutput()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#shutdownOutput()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousSocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -177,7 +181,7 @@ public Java.Nio.Channels.AsynchronousSocketChannel ShutdownOutput()
             return IExecuteWithSignature<Java.Nio.Channels.AsynchronousSocketChannel>("shutdownOutput", "()Ljava/nio/channels/AsynchronousSocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#read(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#read(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -186,7 +190,7 @@ public Java.Nio.Channels.AsynchronousSocketChannel ShutdownOutput()
             return IExecuteWithSignature<Java.Util.Concurrent.Future<Java.Lang.Integer>>("read", "(Ljava/nio/ByteBuffer;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#write(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#write(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -195,7 +199,7 @@ public Java.Nio.Channels.AsynchronousSocketChannel ShutdownOutput()
             return IExecuteWithSignature<Java.Util.Concurrent.Future<Java.Lang.Integer>>("write", "(Ljava/nio/ByteBuffer;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#connect(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#connect(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -204,31 +208,31 @@ public Java.Nio.Channels.AsynchronousSocketChannel ShutdownOutput()
             return IExecuteWithSignature<Java.Util.Concurrent.Future<Java.Lang.Void>>("connect", "(Ljava/net/SocketAddress;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#read(java.nio.ByteBuffer,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#read(java.nio.ByteBuffer,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><typeparamref name="A"/></param>
         /// <param name="arg2"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg2objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Read<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg2objectSuperA> arg2) where Arg2objectSuperA: A
+        public void Read<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg2objectSuperA> arg2) where Arg2objectSuperA : A
         {
             IExecute("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#write(java.nio.ByteBuffer,java.lang.Object,java.nio.channels.CompletionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#write(java.nio.ByteBuffer,java.lang.Object,java.nio.channels.CompletionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><typeparamref name="A"/></param>
         /// <param name="arg2"><see cref="Java.Nio.Channels.CompletionHandler"/></param>
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="Arg2objectSuperA"><typeparamref name="A"/></typeparam>
-        public void Write<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg2objectSuperA> arg2) where Arg2objectSuperA: A
+        public void Write<A, Arg2objectSuperA>(Java.Nio.ByteBuffer arg0, A arg1, Java.Nio.Channels.CompletionHandler<Java.Lang.Integer, Arg2objectSuperA> arg2) where Arg2objectSuperA : A
         {
             IExecute("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#provider()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#provider()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Spi.AsynchronousChannelProvider"/></returns>
         public Java.Nio.Channels.Spi.AsynchronousChannelProvider Provider()
@@ -236,7 +240,7 @@ public Java.Nio.Channels.Spi.AsynchronousChannelProvider Provider()
             return IExecuteWithSignature<Java.Nio.Channels.Spi.AsynchronousChannelProvider>("provider", "()Ljava/nio/channels/spi/AsynchronousChannelProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.NetworkChannel"/></returns>
@@ -246,7 +250,7 @@ public Java.Nio.Channels.NetworkChannel Bind(Java.Net.SocketAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.NetworkChannel>("bind", "(Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/AsynchronousSocketChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/AsynchronousSocketChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/Channel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/Channel.cs
index 8c5fdee4c..da5cf6472 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/Channel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/Channel.cs
@@ -64,7 +64,7 @@ public partial class Channel : Java.Nio.Channels.IChannel
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channel.html#isOpen()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channel.html#isOpen()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsOpen()
@@ -72,7 +72,7 @@ public bool IsOpen()
             return IExecuteWithSignature<bool>("isOpen", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channel.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channel.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/Channels.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/Channels.cs
index 7027143a0..00e14cc26 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/Channels.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/Channels.cs
@@ -42,7 +42,7 @@ public partial class Channels
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newInputStream(java.nio.channels.AsynchronousByteChannel)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newInputStream(java.nio.channels.AsynchronousByteChannel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.AsynchronousByteChannel"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -51,7 +51,7 @@ public static Java.Io.InputStream NewInputStream(Java.Nio.Channels.AsynchronousB
             return SExecuteWithSignature<Java.Io.InputStream>(LocalBridgeClazz, "newInputStream", "(Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newInputStream(java.nio.channels.ReadableByteChannel)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newInputStream(java.nio.channels.ReadableByteChannel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.ReadableByteChannel"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -60,7 +60,7 @@ public static Java.Io.InputStream NewInputStream(Java.Nio.Channels.ReadableByteC
             return SExecuteWithSignature<Java.Io.InputStream>(LocalBridgeClazz, "newInputStream", "(Ljava/nio/channels/ReadableByteChannel;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newOutputStream(java.nio.channels.AsynchronousByteChannel)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newOutputStream(java.nio.channels.AsynchronousByteChannel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.AsynchronousByteChannel"/></param>
         /// <returns><see cref="Java.Io.OutputStream"/></returns>
@@ -69,7 +69,7 @@ public static Java.Io.OutputStream NewOutputStream(Java.Nio.Channels.Asynchronou
             return SExecuteWithSignature<Java.Io.OutputStream>(LocalBridgeClazz, "newOutputStream", "(Ljava/nio/channels/AsynchronousByteChannel;)Ljava/io/OutputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newOutputStream(java.nio.channels.WritableByteChannel)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newOutputStream(java.nio.channels.WritableByteChannel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.WritableByteChannel"/></param>
         /// <returns><see cref="Java.Io.OutputStream"/></returns>
@@ -78,7 +78,7 @@ public static Java.Io.OutputStream NewOutputStream(Java.Nio.Channels.WritableByt
             return SExecuteWithSignature<Java.Io.OutputStream>(LocalBridgeClazz, "newOutputStream", "(Ljava/nio/channels/WritableByteChannel;)Ljava/io/OutputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newReader(java.nio.channels.ReadableByteChannel,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newReader(java.nio.channels.ReadableByteChannel,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.ReadableByteChannel"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -88,7 +88,7 @@ public static Java.Io.Reader NewReader(Java.Nio.Channels.ReadableByteChannel arg
             return SExecute<Java.Io.Reader>(LocalBridgeClazz, "newReader", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newReader(java.nio.channels.ReadableByteChannel,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newReader(java.nio.channels.ReadableByteChannel,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.ReadableByteChannel"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -98,7 +98,7 @@ public static Java.Io.Reader NewReader(Java.Nio.Channels.ReadableByteChannel arg
             return SExecute<Java.Io.Reader>(LocalBridgeClazz, "newReader", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newReader(java.nio.channels.ReadableByteChannel,java.nio.charset.CharsetDecoder,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newReader(java.nio.channels.ReadableByteChannel,java.nio.charset.CharsetDecoder,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.ReadableByteChannel"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.CharsetDecoder"/></param>
@@ -109,7 +109,7 @@ public static Java.Io.Reader NewReader(Java.Nio.Channels.ReadableByteChannel arg
             return SExecute<Java.Io.Reader>(LocalBridgeClazz, "newReader", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newWriter(java.nio.channels.WritableByteChannel,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newWriter(java.nio.channels.WritableByteChannel,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.WritableByteChannel"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -119,7 +119,7 @@ public static Java.Io.Writer NewWriter(Java.Nio.Channels.WritableByteChannel arg
             return SExecute<Java.Io.Writer>(LocalBridgeClazz, "newWriter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newWriter(java.nio.channels.WritableByteChannel,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newWriter(java.nio.channels.WritableByteChannel,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.WritableByteChannel"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -129,7 +129,7 @@ public static Java.Io.Writer NewWriter(Java.Nio.Channels.WritableByteChannel arg
             return SExecute<Java.Io.Writer>(LocalBridgeClazz, "newWriter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newWriter(java.nio.channels.WritableByteChannel,java.nio.charset.CharsetEncoder,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newWriter(java.nio.channels.WritableByteChannel,java.nio.charset.CharsetEncoder,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.WritableByteChannel"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.CharsetEncoder"/></param>
@@ -140,7 +140,7 @@ public static Java.Io.Writer NewWriter(Java.Nio.Channels.WritableByteChannel arg
             return SExecute<Java.Io.Writer>(LocalBridgeClazz, "newWriter", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newChannel(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newChannel(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Java.Nio.Channels.ReadableByteChannel"/></returns>
@@ -149,7 +149,7 @@ public static Java.Nio.Channels.ReadableByteChannel NewChannel(Java.Io.InputStre
             return SExecuteWithSignature<Java.Nio.Channels.ReadableByteChannel>(LocalBridgeClazz, "newChannel", "(Ljava/io/InputStream;)Ljava/nio/channels/ReadableByteChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Channels.html#newChannel(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Channels.html#newChannel(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <returns><see cref="Java.Nio.Channels.WritableByteChannel"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/CompletionHandler.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/CompletionHandler.cs
index 448f58ece..836aac711 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/CompletionHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/CompletionHandler.cs
@@ -46,7 +46,7 @@ public partial class CompletionHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/CompletionHandler.html#completed(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/CompletionHandler.html#completed(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -55,7 +55,7 @@ public void Completed(object arg0, object arg1)
             IExecute("completed", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/CompletionHandler.html#failed(java.lang.Throwable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/CompletionHandler.html#failed(java.lang.Throwable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -117,7 +117,7 @@ public partial class CompletionHandler<V, A> : Java.Nio.Channels.ICompletionHand
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/CompletionHandler.html#completed(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/CompletionHandler.html#completed(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="A"/></param>
@@ -126,7 +126,7 @@ public void Completed(V arg0, A arg1)
             IExecute("completed", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/CompletionHandler.html#failed(java.lang.Throwable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/CompletionHandler.html#failed(java.lang.Throwable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <param name="arg1"><typeparamref name="A"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/DatagramChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/DatagramChannel.cs
index f9f285a2f..3a94aafac 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/DatagramChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/DatagramChannel.cs
@@ -58,7 +58,7 @@ public partial class DatagramChannel : Java.Nio.Channels.IByteChannel, Java.Nio.
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#open()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#open()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.DatagramChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -67,7 +67,7 @@ public static Java.Nio.Channels.DatagramChannel Open()
             return SExecuteWithSignature<Java.Nio.Channels.DatagramChannel>(LocalBridgeClazz, "open", "()Ljava/nio/channels/DatagramChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#open(java.net.ProtocolFamily)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#open(java.net.ProtocolFamily)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.ProtocolFamily"/></param>
         /// <returns><see cref="Java.Nio.Channels.DatagramChannel"/></returns>
@@ -81,21 +81,7 @@ public static Java.Nio.Channels.DatagramChannel Open(Java.Net.ProtocolFamily arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#getLocalAddress()"/> 
-        /// </summary>
-        public Java.Net.SocketAddress LocalAddress
-        {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#getRemoteAddress()"/> 
-        /// </summary>
-        public Java.Net.SocketAddress RemoteAddress
-        {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteAddress", "()Ljava/net/SocketAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#isConnected()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsConnected()
@@ -103,7 +89,7 @@ public bool IsConnected()
             return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#read(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#read(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -113,7 +99,7 @@ public int Read(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("read", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#send(java.nio.ByteBuffer,java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#send(java.nio.ByteBuffer,java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Net.SocketAddress"/></param>
@@ -124,7 +110,7 @@ public int Send(Java.Nio.ByteBuffer arg0, Java.Net.SocketAddress arg1)
             return IExecute<int>("send", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#write(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#write(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -134,7 +120,7 @@ public int Write(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("write", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#socket()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#socket()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.DatagramSocket"/></returns>
         public Java.Net.DatagramSocket Socket()
@@ -142,7 +128,25 @@ public Java.Net.DatagramSocket Socket()
             return IExecuteWithSignature<Java.Net.DatagramSocket>("socket", "()Ljava/net/DatagramSocket;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#receive(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#getLocalAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetLocalAddress()
+        {
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#getRemoteAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetRemoteAddress()
+        {
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteAddress", "()Ljava/net/SocketAddress;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#receive(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Net.SocketAddress"/></returns>
@@ -152,7 +156,7 @@ public Java.Net.SocketAddress Receive(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<Java.Net.SocketAddress>("receive", "(Ljava/nio/ByteBuffer;)Ljava/net/SocketAddress;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#connect(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#connect(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.DatagramChannel"/></returns>
@@ -162,7 +166,7 @@ public Java.Nio.Channels.DatagramChannel Connect(Java.Net.SocketAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.DatagramChannel>("connect", "(Ljava/net/SocketAddress;)Ljava/nio/channels/DatagramChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#disconnect()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#disconnect()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.DatagramChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -171,7 +175,7 @@ public Java.Nio.Channels.DatagramChannel Disconnect()
             return IExecuteWithSignature<Java.Nio.Channels.DatagramChannel>("disconnect", "()Ljava/nio/channels/DatagramChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#read(java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#read(java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -183,7 +187,7 @@ public long Read(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2)
             return IExecute<long>("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#write(java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#write(java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -195,7 +199,7 @@ public long Write(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2)
             return IExecute<long>("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#read(java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#read(java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="long"/></returns>
@@ -205,7 +209,7 @@ public long Read(Java.Nio.ByteBuffer[] arg0)
             return IExecuteWithSignature<long>("read", "([Ljava/nio/ByteBuffer;)J", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#write(java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#write(java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="long"/></returns>
@@ -215,7 +219,7 @@ public long Write(Java.Nio.ByteBuffer[] arg0)
             return IExecuteWithSignature<long>("write", "([Ljava/nio/ByteBuffer;)J", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.NetworkChannel"/></returns>
@@ -225,7 +229,7 @@ public Java.Nio.Channels.NetworkChannel Bind(Java.Net.SocketAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.NetworkChannel>("bind", "(Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/DatagramChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/DatagramChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/FileChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/FileChannel.cs
index 129000b5c..6c484ea08 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/FileChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/FileChannel.cs
@@ -54,7 +54,7 @@ public partial class FileChannel : Java.Nio.Channels.ISeekableByteChannel, Java.
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#open(java.nio.file.Path,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#open(java.nio.file.Path,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.OpenOption"/></param>
@@ -65,7 +65,7 @@ public static Java.Nio.Channels.FileChannel Open(Java.Nio.File.Path arg0, params
             if (arg1.Length == 0) return SExecute<Java.Nio.Channels.FileChannel>(LocalBridgeClazz, "open", arg0); else return SExecute<Java.Nio.Channels.FileChannel>(LocalBridgeClazz, "open", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#open(java.nio.file.Path,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#open(java.nio.file.Path,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -73,7 +73,7 @@ public static Java.Nio.Channels.FileChannel Open(Java.Nio.File.Path arg0, params
         /// <typeparam name="Arg1ExtendsJava_Nio_File_OpenOption"><see cref="Java.Nio.File.OpenOption"/></typeparam>
         /// <returns><see cref="Java.Nio.Channels.FileChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.Channels.FileChannel Open<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption: Java.Nio.File.OpenOption
+        public static Java.Nio.Channels.FileChannel Open<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption : Java.Nio.File.OpenOption
         {
             if (arg2.Length == 0) return SExecute<Java.Nio.Channels.FileChannel>(LocalBridgeClazz, "open", arg0, arg1); else return SExecute<Java.Nio.Channels.FileChannel>(LocalBridgeClazz, "open", arg0, arg1, arg2);
         }
@@ -82,7 +82,7 @@ public static Java.Nio.Channels.FileChannel Open<Arg1ExtendsJava_Nio_File_OpenOp
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#read(java.nio.ByteBuffer,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#read(java.nio.ByteBuffer,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -93,7 +93,7 @@ public int Read(Java.Nio.ByteBuffer arg0, long arg1)
             return IExecute<int>("read", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#read(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#read(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -103,7 +103,7 @@ public int Read(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("read", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#write(java.nio.ByteBuffer,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#write(java.nio.ByteBuffer,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -114,7 +114,7 @@ public int Write(Java.Nio.ByteBuffer arg0, long arg1)
             return IExecute<int>("write", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#write(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#write(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -124,7 +124,7 @@ public int Write(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("write", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#lock(long,long,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#lock(long,long,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -136,7 +136,7 @@ public Java.Nio.Channels.FileLock Lock(long arg0, long arg1, bool arg2)
             return IExecute<Java.Nio.Channels.FileLock>("lock", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#tryLock(long,long,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#tryLock(long,long,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -148,7 +148,7 @@ public Java.Nio.Channels.FileLock TryLock(long arg0, long arg1, bool arg2)
             return IExecute<Java.Nio.Channels.FileLock>("tryLock", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#map(java.nio.channels.FileChannel.MapMode,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#map(java.nio.channels.FileChannel.MapMode,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.FileChannel.MapMode"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -160,7 +160,7 @@ public Java.Nio.MappedByteBuffer Map(Java.Nio.Channels.FileChannel.MapMode arg0,
             return IExecute<Java.Nio.MappedByteBuffer>("map", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#position()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#position()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -169,7 +169,7 @@ public long Position()
             return IExecuteWithSignature<long>("position", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#read(java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#read(java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -181,7 +181,7 @@ public long Read(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2)
             return IExecute<long>("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#size()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -190,7 +190,7 @@ public long Size()
             return IExecuteWithSignature<long>("size", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#transferFrom(java.nio.channels.ReadableByteChannel,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#transferFrom(java.nio.channels.ReadableByteChannel,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.ReadableByteChannel"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -202,7 +202,7 @@ public long TransferFrom(Java.Nio.Channels.ReadableByteChannel arg0, long arg1,
             return IExecute<long>("transferFrom", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#transferTo(long,long,java.nio.channels.WritableByteChannel)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#transferTo(long,long,java.nio.channels.WritableByteChannel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -214,7 +214,7 @@ public long TransferTo(long arg0, long arg1, Java.Nio.Channels.WritableByteChann
             return IExecute<long>("transferTo", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#write(java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#write(java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -226,7 +226,7 @@ public long Write(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2)
             return IExecute<long>("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#force(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#force(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -235,7 +235,7 @@ public void Force(bool arg0)
             IExecuteWithSignature("force", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#lock()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#lock()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.FileLock"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -244,7 +244,7 @@ public Java.Nio.Channels.FileLock Lock()
             return IExecuteWithSignature<Java.Nio.Channels.FileLock>("lock", "()Ljava/nio/channels/FileLock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#tryLock()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#tryLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.FileLock"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -253,7 +253,7 @@ public Java.Nio.Channels.FileLock TryLock()
             return IExecuteWithSignature<Java.Nio.Channels.FileLock>("tryLock", "()Ljava/nio/channels/FileLock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#read(java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#read(java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="long"/></returns>
@@ -263,7 +263,7 @@ public long Read(Java.Nio.ByteBuffer[] arg0)
             return IExecuteWithSignature<long>("read", "([Ljava/nio/ByteBuffer;)J", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#write(java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#write(java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="long"/></returns>
@@ -273,7 +273,7 @@ public long Write(Java.Nio.ByteBuffer[] arg0)
             return IExecuteWithSignature<long>("write", "([Ljava/nio/ByteBuffer;)J", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#position(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#position(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.Channels.SeekableByteChannel"/></returns>
@@ -283,7 +283,7 @@ public Java.Nio.Channels.SeekableByteChannel Position(long arg0)
             return IExecuteWithSignature<Java.Nio.Channels.SeekableByteChannel>("position", "(J)Ljava/nio/channels/SeekableByteChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.html#truncate(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.html#truncate(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.Channels.SeekableByteChannel"/></returns>
@@ -309,19 +309,19 @@ public partial class MapMode
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.MapMode.html#PRIVATE"/>
+            /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.MapMode.html#PRIVATE"/>
             /// </summary>
             public static Java.Nio.Channels.FileChannel.MapMode PRIVATE { get { if (!_PRIVATEReady) { _PRIVATEContent = SGetField<Java.Nio.Channels.FileChannel.MapMode>(LocalBridgeClazz, "PRIVATE"); _PRIVATEReady = true; } return _PRIVATEContent; } }
             private static Java.Nio.Channels.FileChannel.MapMode _PRIVATEContent = default;
             private static bool _PRIVATEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.MapMode.html#READ_ONLY"/>
+            /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.MapMode.html#READ_ONLY"/>
             /// </summary>
             public static Java.Nio.Channels.FileChannel.MapMode READ_ONLY { get { if (!_READ_ONLYReady) { _READ_ONLYContent = SGetField<Java.Nio.Channels.FileChannel.MapMode>(LocalBridgeClazz, "READ_ONLY"); _READ_ONLYReady = true; } return _READ_ONLYContent; } }
             private static Java.Nio.Channels.FileChannel.MapMode _READ_ONLYContent = default;
             private static bool _READ_ONLYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileChannel.MapMode.html#READ_WRITE"/>
+            /// <see href="https://developer.android.com/reference/java/nio/channels/FileChannel.MapMode.html#READ_WRITE"/>
             /// </summary>
             public static Java.Nio.Channels.FileChannel.MapMode READ_WRITE { get { if (!_READ_WRITEReady) { _READ_WRITEContent = SGetField<Java.Nio.Channels.FileChannel.MapMode>(LocalBridgeClazz, "READ_WRITE"); _READ_WRITEReady = true; } return _READ_WRITEContent; } }
             private static Java.Nio.Channels.FileChannel.MapMode _READ_WRITEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/FileLock.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/FileLock.cs
index 3db79fbf9..60029ee8f 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/FileLock.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/FileLock.cs
@@ -46,7 +46,7 @@ public partial class FileLock
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#isValid()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#isValid()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsValid()
@@ -54,7 +54,7 @@ public bool IsValid()
             return IExecuteWithSignature<bool>("isValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#release()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#release()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Release()
@@ -62,7 +62,7 @@ public void Release()
             IExecuteWithSignature("release", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#isShared()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#isShared()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsShared()
@@ -70,7 +70,7 @@ public bool IsShared()
             return IExecuteWithSignature<bool>("isShared", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#overlaps(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#overlaps(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -80,7 +80,7 @@ public bool Overlaps(long arg0, long arg1)
             return IExecute<bool>("overlaps", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#channel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#channel()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.FileChannel"/></returns>
         public Java.Nio.Channels.FileChannel Channel()
@@ -88,7 +88,7 @@ public Java.Nio.Channels.FileChannel Channel()
             return IExecuteWithSignature<Java.Nio.Channels.FileChannel>("channel", "()Ljava/nio/channels/FileChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#position()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#position()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Position()
@@ -96,7 +96,7 @@ public long Position()
             return IExecuteWithSignature<long>("position", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#size()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Size()
@@ -104,7 +104,7 @@ public long Size()
             return IExecuteWithSignature<long>("size", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
@@ -112,7 +112,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/FileLock.html#acquiredBy()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/FileLock.html#acquiredBy()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Channel"/></returns>
         public Java.Nio.Channels.Channel AcquiredBy()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/GatheringByteChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/GatheringByteChannel.cs
index 22e73882e..5a03ac0f3 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/GatheringByteChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/GatheringByteChannel.cs
@@ -64,7 +64,7 @@ public partial class GatheringByteChannel : Java.Nio.Channels.IGatheringByteChan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/GatheringByteChannel.html#write(java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/GatheringByteChannel.html#write(java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -76,7 +76,7 @@ public long Write(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2)
             return IExecute<long>("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/GatheringByteChannel.html#write(java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/GatheringByteChannel.html#write(java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/InterruptibleChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/InterruptibleChannel.cs
index 970770d62..a6850f7f7 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/InterruptibleChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/InterruptibleChannel.cs
@@ -64,7 +64,7 @@ public partial class InterruptibleChannel : Java.Nio.Channels.IInterruptibleChan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/InterruptibleChannel.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/InterruptibleChannel.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/MembershipKey.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/MembershipKey.cs
index ac9d778dd..863544c6e 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/MembershipKey.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/MembershipKey.cs
@@ -46,7 +46,7 @@ public partial class MembershipKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html#isValid()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html#isValid()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsValid()
@@ -54,7 +54,7 @@ public bool IsValid()
             return IExecuteWithSignature<bool>("isValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html#group()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html#group()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.InetAddress"/></returns>
         public Java.Net.InetAddress Group()
@@ -62,7 +62,7 @@ public Java.Net.InetAddress Group()
             return IExecuteWithSignature<Java.Net.InetAddress>("group", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html#sourceAddress()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html#sourceAddress()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.InetAddress"/></returns>
         public Java.Net.InetAddress SourceAddress()
@@ -70,7 +70,7 @@ public Java.Net.InetAddress SourceAddress()
             return IExecuteWithSignature<Java.Net.InetAddress>("sourceAddress", "()Ljava/net/InetAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html#networkInterface()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html#networkInterface()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.NetworkInterface"/></returns>
         public Java.Net.NetworkInterface NetworkInterface()
@@ -78,7 +78,7 @@ public Java.Net.NetworkInterface NetworkInterface()
             return IExecuteWithSignature<Java.Net.NetworkInterface>("networkInterface", "()Ljava/net/NetworkInterface;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html#block(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html#block(java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.MembershipKey"/></returns>
@@ -88,7 +88,7 @@ public Java.Nio.Channels.MembershipKey Block(Java.Net.InetAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.MembershipKey>("block", "(Ljava/net/InetAddress;)Ljava/nio/channels/MembershipKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html#unblock(java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html#unblock(java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.MembershipKey"/></returns>
@@ -97,7 +97,7 @@ public Java.Nio.Channels.MembershipKey Unblock(Java.Net.InetAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.MembershipKey>("unblock", "(Ljava/net/InetAddress;)Ljava/nio/channels/MembershipKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html#channel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html#channel()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.MulticastChannel"/></returns>
         public Java.Nio.Channels.MulticastChannel Channel()
@@ -105,7 +105,7 @@ public Java.Nio.Channels.MulticastChannel Channel()
             return IExecuteWithSignature<Java.Nio.Channels.MulticastChannel>("channel", "()Ljava/nio/channels/MulticastChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MembershipKey.html#drop()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MembershipKey.html#drop()"/>
         /// </summary>
         public void Drop()
         {
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/MulticastChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/MulticastChannel.cs
index 9693cc485..f311a9389 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/MulticastChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/MulticastChannel.cs
@@ -64,7 +64,7 @@ public partial class MulticastChannel : Java.Nio.Channels.IMulticastChannel
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MulticastChannel.html#join(java.net.InetAddress,java.net.NetworkInterface,java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MulticastChannel.html#join(java.net.InetAddress,java.net.NetworkInterface,java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="Java.Net.NetworkInterface"/></param>
@@ -76,7 +76,7 @@ public Java.Nio.Channels.MembershipKey Join(Java.Net.InetAddress arg0, Java.Net.
             return IExecute<Java.Nio.Channels.MembershipKey>("join", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MulticastChannel.html#join(java.net.InetAddress,java.net.NetworkInterface)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MulticastChannel.html#join(java.net.InetAddress,java.net.NetworkInterface)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="Java.Net.NetworkInterface"/></param>
@@ -87,7 +87,7 @@ public Java.Nio.Channels.MembershipKey Join(Java.Net.InetAddress arg0, Java.Net.
             return IExecute<Java.Nio.Channels.MembershipKey>("join", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/MulticastChannel.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/MulticastChannel.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/NetworkChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/NetworkChannel.cs
index b7761ce4d..137e77afc 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/NetworkChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/NetworkChannel.cs
@@ -64,14 +64,7 @@ public partial class NetworkChannel : Java.Nio.Channels.INetworkChannel
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NetworkChannel.html#getLocalAddress()"/> 
-        /// </summary>
-        public Java.Net.SocketAddress LocalAddress
-        {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NetworkChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/NetworkChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -83,7 +76,7 @@ public Java.Nio.Channels.NetworkChannel SetOption<T>(Java.Net.SocketOption<T> ar
             return IExecute<Java.Nio.Channels.NetworkChannel>("setOption", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NetworkChannel.html#getOption(java.net.SocketOption)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/NetworkChannel.html#getOption(java.net.SocketOption)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
         /// <typeparam name="T"></typeparam>
@@ -94,7 +87,16 @@ public T GetOption<T>(Java.Net.SocketOption<T> arg0)
             return IExecuteWithSignature<T>("getOption", "(Ljava/net/SocketOption;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NetworkChannel.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/NetworkChannel.html#getLocalAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetLocalAddress()
+        {
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/NetworkChannel.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.NetworkChannel"/></returns>
@@ -104,7 +106,7 @@ public Java.Nio.Channels.NetworkChannel Bind(Java.Net.SocketAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.NetworkChannel>("bind", "(Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/NetworkChannel.html#supportedOptions()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/NetworkChannel.html#supportedOptions()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Net.SocketOption<object>> SupportedOptions()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/Pipe.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/Pipe.cs
index 2261f9fc3..b6619b7a0 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/Pipe.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/Pipe.cs
@@ -42,7 +42,7 @@ public partial class Pipe
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Pipe.html#open()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Pipe.html#open()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Pipe"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -55,7 +55,7 @@ public static Java.Nio.Channels.Pipe Open()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Pipe.html#sink()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Pipe.html#sink()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Pipe.SinkChannel"/></returns>
         public Java.Nio.Channels.Pipe.SinkChannel Sink()
@@ -63,7 +63,7 @@ public Java.Nio.Channels.Pipe.SinkChannel Sink()
             return IExecuteWithSignature<Java.Nio.Channels.Pipe.SinkChannel>("sink", "()Ljava/nio/channels/Pipe$SinkChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Pipe.html#source()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Pipe.html#source()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Pipe.SourceChannel"/></returns>
         public Java.Nio.Channels.Pipe.SourceChannel Source()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/ReadableByteChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/ReadableByteChannel.cs
index 5261c7da3..a764d232e 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/ReadableByteChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/ReadableByteChannel.cs
@@ -64,7 +64,7 @@ public partial class ReadableByteChannel : Java.Nio.Channels.IReadableByteChanne
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ReadableByteChannel.html#read(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ReadableByteChannel.html#read(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/ScatteringByteChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/ScatteringByteChannel.cs
index 1f42de530..37cc45d4f 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/ScatteringByteChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/ScatteringByteChannel.cs
@@ -64,7 +64,7 @@ public partial class ScatteringByteChannel : Java.Nio.Channels.IScatteringByteCh
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ScatteringByteChannel.html#read(java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ScatteringByteChannel.html#read(java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -76,7 +76,7 @@ public long Read(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2)
             return IExecute<long>("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ScatteringByteChannel.html#read(java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ScatteringByteChannel.html#read(java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/SeekableByteChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/SeekableByteChannel.cs
index 9a201a7e9..8129de242 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/SeekableByteChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/SeekableByteChannel.cs
@@ -64,7 +64,7 @@ public partial class SeekableByteChannel : Java.Nio.Channels.ISeekableByteChanne
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SeekableByteChannel.html#read(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel.html#read(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -74,7 +74,7 @@ public int Read(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("read", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SeekableByteChannel.html#write(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel.html#write(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -84,7 +84,7 @@ public int Write(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("write", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SeekableByteChannel.html#position(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel.html#position(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.Channels.SeekableByteChannel"/></returns>
@@ -94,7 +94,7 @@ public Java.Nio.Channels.SeekableByteChannel Position(long arg0)
             return IExecuteWithSignature<Java.Nio.Channels.SeekableByteChannel>("position", "(J)Ljava/nio/channels/SeekableByteChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SeekableByteChannel.html#truncate(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel.html#truncate(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.Channels.SeekableByteChannel"/></returns>
@@ -104,7 +104,7 @@ public Java.Nio.Channels.SeekableByteChannel Truncate(long arg0)
             return IExecuteWithSignature<Java.Nio.Channels.SeekableByteChannel>("truncate", "(J)Ljava/nio/channels/SeekableByteChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SeekableByteChannel.html#position()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel.html#position()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -113,7 +113,7 @@ public long Position()
             return IExecuteWithSignature<long>("position", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SeekableByteChannel.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SeekableByteChannel.html#size()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/SelectableChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/SelectableChannel.cs
index 4896c9cdf..3fa2f8c72 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/SelectableChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/SelectableChannel.cs
@@ -46,7 +46,7 @@ public partial class SelectableChannel
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#isBlocking()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#isBlocking()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsBlocking()
@@ -54,7 +54,7 @@ public bool IsBlocking()
             return IExecuteWithSignature<bool>("isBlocking", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#isRegistered()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#isRegistered()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsRegistered()
@@ -62,7 +62,7 @@ public bool IsRegistered()
             return IExecuteWithSignature<bool>("isRegistered", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#validOps()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#validOps()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ValidOps()
@@ -70,7 +70,7 @@ public int ValidOps()
             return IExecuteWithSignature<int>("validOps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#blockingLock()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#blockingLock()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object BlockingLock()
@@ -78,7 +78,7 @@ public object BlockingLock()
             return IExecuteWithSignature("blockingLock", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#configureBlocking(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#configureBlocking(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Nio.Channels.SelectableChannel"/></returns>
@@ -88,7 +88,7 @@ public Java.Nio.Channels.SelectableChannel ConfigureBlocking(bool arg0)
             return IExecuteWithSignature<Java.Nio.Channels.SelectableChannel>("configureBlocking", "(Z)Ljava/nio/channels/SelectableChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#keyFor(java.nio.channels.Selector)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#keyFor(java.nio.channels.Selector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.Selector"/></param>
         /// <returns><see cref="Java.Nio.Channels.SelectionKey"/></returns>
@@ -97,7 +97,7 @@ public Java.Nio.Channels.SelectionKey KeyFor(Java.Nio.Channels.Selector arg0)
             return IExecuteWithSignature<Java.Nio.Channels.SelectionKey>("keyFor", "(Ljava/nio/channels/Selector;)Ljava/nio/channels/SelectionKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#register(java.nio.channels.Selector,int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#register(java.nio.channels.Selector,int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.Selector"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -109,7 +109,7 @@ public Java.Nio.Channels.SelectionKey Register(Java.Nio.Channels.Selector arg0,
             return IExecute<Java.Nio.Channels.SelectionKey>("register", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#provider()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#provider()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Spi.SelectorProvider"/></returns>
         public Java.Nio.Channels.Spi.SelectorProvider Provider()
@@ -117,7 +117,7 @@ public Java.Nio.Channels.Spi.SelectorProvider Provider()
             return IExecuteWithSignature<Java.Nio.Channels.Spi.SelectorProvider>("provider", "()Ljava/nio/channels/spi/SelectorProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectableChannel.html#register(java.nio.channels.Selector,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectableChannel.html#register(java.nio.channels.Selector,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.Selector"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/SelectionKey.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/SelectionKey.cs
index c5cadd433..7dc2cb1b9 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/SelectionKey.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/SelectionKey.cs
@@ -38,25 +38,25 @@ public partial class SelectionKey
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#OP_ACCEPT"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#OP_ACCEPT"/>
         /// </summary>
         public static int OP_ACCEPT { get { if (!_OP_ACCEPTReady) { _OP_ACCEPTContent = SGetField<int>(LocalBridgeClazz, "OP_ACCEPT"); _OP_ACCEPTReady = true; } return _OP_ACCEPTContent; } }
         private static int _OP_ACCEPTContent = default;
         private static bool _OP_ACCEPTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#OP_CONNECT"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#OP_CONNECT"/>
         /// </summary>
         public static int OP_CONNECT { get { if (!_OP_CONNECTReady) { _OP_CONNECTContent = SGetField<int>(LocalBridgeClazz, "OP_CONNECT"); _OP_CONNECTReady = true; } return _OP_CONNECTContent; } }
         private static int _OP_CONNECTContent = default;
         private static bool _OP_CONNECTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#OP_READ"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#OP_READ"/>
         /// </summary>
         public static int OP_READ { get { if (!_OP_READReady) { _OP_READContent = SGetField<int>(LocalBridgeClazz, "OP_READ"); _OP_READReady = true; } return _OP_READContent; } }
         private static int _OP_READContent = default;
         private static bool _OP_READReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#OP_WRITE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#OP_WRITE"/>
         /// </summary>
         public static int OP_WRITE { get { if (!_OP_WRITEReady) { _OP_WRITEContent = SGetField<int>(LocalBridgeClazz, "OP_WRITE"); _OP_WRITEReady = true; } return _OP_WRITEContent; } }
         private static int _OP_WRITEContent = default;
@@ -70,7 +70,7 @@ public partial class SelectionKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#isValid()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#isValid()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsValid()
@@ -78,7 +78,7 @@ public bool IsValid()
             return IExecuteWithSignature<bool>("isValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#interestOps()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#interestOps()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int InterestOps()
@@ -86,7 +86,7 @@ public int InterestOps()
             return IExecuteWithSignature<int>("interestOps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#readyOps()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#readyOps()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ReadyOps()
@@ -94,7 +94,7 @@ public int ReadyOps()
             return IExecuteWithSignature<int>("readyOps", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#channel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#channel()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.SelectableChannel"/></returns>
         public Java.Nio.Channels.SelectableChannel Channel()
@@ -102,7 +102,7 @@ public Java.Nio.Channels.SelectableChannel Channel()
             return IExecuteWithSignature<Java.Nio.Channels.SelectableChannel>("channel", "()Ljava/nio/channels/SelectableChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#interestOps(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#interestOps(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.Channels.SelectionKey"/></returns>
@@ -111,7 +111,7 @@ public Java.Nio.Channels.SelectionKey InterestOps(int arg0)
             return IExecuteWithSignature<Java.Nio.Channels.SelectionKey>("interestOps", "(I)Ljava/nio/channels/SelectionKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#selector()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#selector()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Selector"/></returns>
         public Java.Nio.Channels.Selector Selector()
@@ -119,14 +119,14 @@ public Java.Nio.Channels.Selector Selector()
             return IExecuteWithSignature<Java.Nio.Channels.Selector>("selector", "()Ljava/nio/channels/Selector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#cancel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#cancel()"/>
         /// </summary>
         public void Cancel()
         {
             IExecuteWithSignature("cancel", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#isAcceptable()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#isAcceptable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAcceptable()
@@ -134,7 +134,7 @@ public bool IsAcceptable()
             return IExecuteWithSignature<bool>("isAcceptable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#isConnectable()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#isConnectable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsConnectable()
@@ -142,7 +142,7 @@ public bool IsConnectable()
             return IExecuteWithSignature<bool>("isConnectable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#isReadable()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#isReadable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsReadable()
@@ -150,7 +150,7 @@ public bool IsReadable()
             return IExecuteWithSignature<bool>("isReadable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#isWritable()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#isWritable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsWritable()
@@ -158,7 +158,7 @@ public bool IsWritable()
             return IExecuteWithSignature<bool>("isWritable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#attach(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#attach(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -167,7 +167,7 @@ public object Attach(object arg0)
             return IExecuteWithSignature("attach", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#attachment()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#attachment()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Attachment()
@@ -175,7 +175,7 @@ public object Attachment()
             return IExecuteWithSignature("attachment", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#interestOpsAnd(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#interestOpsAnd(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -184,7 +184,7 @@ public int InterestOpsAnd(int arg0)
             return IExecuteWithSignature<int>("interestOpsAnd", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SelectionKey.html#interestOpsOr(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SelectionKey.html#interestOpsOr(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/Selector.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/Selector.cs
index db33390ba..8a7310509 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/Selector.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/Selector.cs
@@ -42,7 +42,7 @@ public partial class Selector
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#open()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#open()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Selector"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -55,7 +55,7 @@ public static Java.Nio.Channels.Selector Open()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#isOpen()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#isOpen()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsOpen()
@@ -63,7 +63,7 @@ public bool IsOpen()
             return IExecuteWithSignature<bool>("isOpen", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#select()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#select()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -72,7 +72,7 @@ public int Select()
             return IExecuteWithSignature<int>("select", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#select(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#select(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -82,7 +82,7 @@ public int Select(long arg0)
             return IExecuteWithSignature<int>("select", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#selectNow()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#selectNow()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -91,7 +91,7 @@ public int SelectNow()
             return IExecuteWithSignature<int>("selectNow", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#wakeup()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#wakeup()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Selector"/></returns>
         public Java.Nio.Channels.Selector Wakeup()
@@ -99,7 +99,7 @@ public Java.Nio.Channels.Selector Wakeup()
             return IExecuteWithSignature<Java.Nio.Channels.Selector>("wakeup", "()Ljava/nio/channels/Selector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#provider()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#provider()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Spi.SelectorProvider"/></returns>
         public Java.Nio.Channels.Spi.SelectorProvider Provider()
@@ -107,7 +107,7 @@ public Java.Nio.Channels.Spi.SelectorProvider Provider()
             return IExecuteWithSignature<Java.Nio.Channels.Spi.SelectorProvider>("provider", "()Ljava/nio/channels/spi/SelectorProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#keys()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#keys()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Nio.Channels.SelectionKey> Keys()
@@ -115,7 +115,7 @@ public Java.Nio.Channels.Spi.SelectorProvider Provider()
             return IExecuteWithSignature<Java.Util.Set<Java.Nio.Channels.SelectionKey>>("keys", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#selectedKeys()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#selectedKeys()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Nio.Channels.SelectionKey> SelectedKeys()
@@ -123,7 +123,7 @@ public Java.Nio.Channels.Spi.SelectorProvider Provider()
             return IExecuteWithSignature<Java.Util.Set<Java.Nio.Channels.SelectionKey>>("selectedKeys", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
@@ -131,7 +131,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#select(java.util.function.Consumer,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#select(java.util.function.Consumer,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -142,7 +142,7 @@ public int Select(Java.Util.Function.Consumer<Java.Nio.Channels.SelectionKey> ar
             return IExecute<int>("select", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#select(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#select(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -152,7 +152,7 @@ public int Select(Java.Util.Function.Consumer<Java.Nio.Channels.SelectionKey> ar
             return IExecuteWithSignature<int>("select", "(Ljava/util/function/Consumer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/Selector.html#selectNow(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/Selector.html#selectNow(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/ServerSocketChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/ServerSocketChannel.cs
index 5a5be774c..c8d76b8ef 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/ServerSocketChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/ServerSocketChannel.cs
@@ -46,7 +46,7 @@ public partial class ServerSocketChannel
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html#open()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html#open()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.ServerSocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -54,37 +54,29 @@ public static Java.Nio.Channels.ServerSocketChannel Open()
         {
             return SExecuteWithSignature<Java.Nio.Channels.ServerSocketChannel>(LocalBridgeClazz, "open", "()Ljava/nio/channels/ServerSocketChannel;");
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html#open(java.net.ProtocolFamily)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.ProtocolFamily"/></param>
-        /// <returns><see cref="Java.Nio.Channels.ServerSocketChannel"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.Channels.ServerSocketChannel Open(Java.Net.ProtocolFamily arg0)
-        {
-            return SExecuteWithSignature<Java.Nio.Channels.ServerSocketChannel>(LocalBridgeClazz, "open", "(Ljava/net/ProtocolFamily;)Ljava/nio/channels/ServerSocketChannel;", arg0);
-        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html#getLocalAddress()"/> 
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html#socket()"/>
         /// </summary>
-        public Java.Net.SocketAddress LocalAddress
+        /// <returns><see cref="Java.Net.ServerSocket"/></returns>
+        public Java.Net.ServerSocket Socket()
         {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;"); }
+            return IExecuteWithSignature<Java.Net.ServerSocket>("socket", "()Ljava/net/ServerSocket;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html#socket()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html#getLocalAddress()"/>
         /// </summary>
-        /// <returns><see cref="Java.Net.ServerSocket"/></returns>
-        public Java.Net.ServerSocket Socket()
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetLocalAddress()
         {
-            return IExecuteWithSignature<Java.Net.ServerSocket>("socket", "()Ljava/net/ServerSocket;");
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html#bind(java.net.SocketAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html#bind(java.net.SocketAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -95,7 +87,7 @@ public Java.Nio.Channels.ServerSocketChannel Bind(Java.Net.SocketAddress arg0, i
             return IExecute<Java.Nio.Channels.ServerSocketChannel>("bind", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html#accept()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html#accept()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -104,7 +96,7 @@ public Java.Nio.Channels.SocketChannel Accept()
             return IExecuteWithSignature<Java.Nio.Channels.SocketChannel>("accept", "()Ljava/nio/channels/SocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.NetworkChannel"/></returns>
@@ -114,7 +106,7 @@ public Java.Nio.Channels.NetworkChannel Bind(Java.Net.SocketAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.NetworkChannel>("bind", "(Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/ServerSocketChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/ServerSocketChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/SocketChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/SocketChannel.cs
index 529830ad3..a8719399a 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/SocketChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/SocketChannel.cs
@@ -58,7 +58,7 @@ public partial class SocketChannel : Java.Nio.Channels.IByteChannel, Java.Nio.Ch
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#open()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#open()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -67,17 +67,7 @@ public static Java.Nio.Channels.SocketChannel Open()
             return SExecuteWithSignature<Java.Nio.Channels.SocketChannel>(LocalBridgeClazz, "open", "()Ljava/nio/channels/SocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#open(java.net.ProtocolFamily)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.ProtocolFamily"/></param>
-        /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.Channels.SocketChannel Open(Java.Net.ProtocolFamily arg0)
-        {
-            return SExecuteWithSignature<Java.Nio.Channels.SocketChannel>(LocalBridgeClazz, "open", "(Ljava/net/ProtocolFamily;)Ljava/nio/channels/SocketChannel;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#open(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#open(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
@@ -91,21 +81,7 @@ public static Java.Nio.Channels.SocketChannel Open(Java.Net.SocketAddress arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#getLocalAddress()"/> 
-        /// </summary>
-        public Java.Net.SocketAddress LocalAddress
-        {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#getRemoteAddress()"/> 
-        /// </summary>
-        public Java.Net.SocketAddress RemoteAddress
-        {
-            get { return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteAddress", "()Ljava/net/SocketAddress;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#connect(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#connect(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -115,7 +91,7 @@ public bool Connect(Java.Net.SocketAddress arg0)
             return IExecuteWithSignature<bool>("connect", "(Ljava/net/SocketAddress;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#finishConnect()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#finishConnect()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -124,7 +100,7 @@ public bool FinishConnect()
             return IExecuteWithSignature<bool>("finishConnect", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#isConnected()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#isConnected()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsConnected()
@@ -132,7 +108,7 @@ public bool IsConnected()
             return IExecuteWithSignature<bool>("isConnected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#isConnectionPending()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#isConnectionPending()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsConnectionPending()
@@ -140,7 +116,7 @@ public bool IsConnectionPending()
             return IExecuteWithSignature<bool>("isConnectionPending", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#read(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#read(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -150,7 +126,7 @@ public int Read(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("read", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#write(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#write(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -160,7 +136,7 @@ public int Write(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("write", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#socket()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#socket()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.Socket"/></returns>
         public Java.Net.Socket Socket()
@@ -168,7 +144,25 @@ public Java.Net.Socket Socket()
             return IExecuteWithSignature<Java.Net.Socket>("socket", "()Ljava/net/Socket;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#shutdownInput()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#getLocalAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetLocalAddress()
+        {
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getLocalAddress", "()Ljava/net/SocketAddress;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#getRemoteAddress()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Net.SocketAddress"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Net.SocketAddress GetRemoteAddress()
+        {
+            return IExecuteWithSignature<Java.Net.SocketAddress>("getRemoteAddress", "()Ljava/net/SocketAddress;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#shutdownInput()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -177,7 +171,7 @@ public Java.Nio.Channels.SocketChannel ShutdownInput()
             return IExecuteWithSignature<Java.Nio.Channels.SocketChannel>("shutdownInput", "()Ljava/nio/channels/SocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#shutdownOutput()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#shutdownOutput()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -186,7 +180,7 @@ public Java.Nio.Channels.SocketChannel ShutdownOutput()
             return IExecuteWithSignature<Java.Nio.Channels.SocketChannel>("shutdownOutput", "()Ljava/nio/channels/SocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#read(java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#read(java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -198,7 +192,7 @@ public long Read(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2)
             return IExecute<long>("read", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#write(java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#write(java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -210,7 +204,7 @@ public long Write(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2)
             return IExecute<long>("write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#read(java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#read(java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="long"/></returns>
@@ -220,7 +214,7 @@ public long Read(Java.Nio.ByteBuffer[] arg0)
             return IExecuteWithSignature<long>("read", "([Ljava/nio/ByteBuffer;)J", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#write(java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#write(java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="long"/></returns>
@@ -230,7 +224,7 @@ public long Write(Java.Nio.ByteBuffer[] arg0)
             return IExecuteWithSignature<long>("write", "([Ljava/nio/ByteBuffer;)J", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#bind(java.net.SocketAddress)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#bind(java.net.SocketAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketAddress"/></param>
         /// <returns><see cref="Java.Nio.Channels.NetworkChannel"/></returns>
@@ -240,7 +234,7 @@ public Java.Nio.Channels.NetworkChannel Bind(Java.Net.SocketAddress arg0)
             return IExecuteWithSignature<Java.Nio.Channels.NetworkChannel>("bind", "(Ljava/net/SocketAddress;)Ljava/nio/channels/NetworkChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/SocketChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/SocketChannel.html#setOption(java.net.SocketOption,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.SocketOption"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AbstractInterruptibleChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AbstractInterruptibleChannel.cs
index f147d10b8..c14a802b6 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AbstractInterruptibleChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AbstractInterruptibleChannel.cs
@@ -54,7 +54,7 @@ public partial class AbstractInterruptibleChannel : Java.Nio.Channels.IChannel,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AbstractInterruptibleChannel.html#isOpen()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AbstractInterruptibleChannel.html#isOpen()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsOpen()
@@ -62,7 +62,7 @@ public bool IsOpen()
             return IExecuteWithSignature<bool>("isOpen", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AbstractInterruptibleChannel.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AbstractInterruptibleChannel.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AllPackageClasses.cs
index 268698581..5d46b2890 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Nio.Channels.Spi
 {
     #region AbstractInterruptibleChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AbstractInterruptibleChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AbstractInterruptibleChannel.html"/>
     /// </summary>
     public partial class AbstractInterruptibleChannel : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AbstractInterruptibleChannel>
     {
@@ -36,12 +36,12 @@ public partial class AbstractInterruptibleChannel : MASES.JCOBridge.C2JBridge.JV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractInterruptibleChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractInterruptibleChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractInterruptibleChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractInterruptibleChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractInterruptibleChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractInterruptibleChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public AbstractInterruptibleChannel(params object[] args) : base(args) { }
 
     #region AbstractSelectableChannel
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AbstractSelectableChannel.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AbstractSelectableChannel.html"/>
     /// </summary>
     public partial class AbstractSelectableChannel : Java.Nio.Channels.SelectableChannel
     {
@@ -82,12 +82,12 @@ public partial class AbstractSelectableChannel : Java.Nio.Channels.SelectableCha
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractSelectableChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSelectableChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSelectableChannel() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractSelectableChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSelectableChannel class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSelectableChannel(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public AbstractSelectableChannel(params object[] args) : base(args) { }
 
     #region AbstractSelectionKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AbstractSelectionKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AbstractSelectionKey.html"/>
     /// </summary>
     public partial class AbstractSelectionKey : Java.Nio.Channels.SelectionKey
     {
@@ -128,12 +128,12 @@ public partial class AbstractSelectionKey : Java.Nio.Channels.SelectionKey
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractSelectionKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSelectionKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSelectionKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractSelectionKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSelectionKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSelectionKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -166,7 +166,7 @@ public AbstractSelectionKey(params object[] args) : base(args) { }
 
     #region AbstractSelector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AbstractSelector.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AbstractSelector.html"/>
     /// </summary>
     public partial class AbstractSelector : Java.Nio.Channels.Selector
     {
@@ -174,12 +174,12 @@ public partial class AbstractSelector : Java.Nio.Channels.Selector
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSelector() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSelector(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -212,7 +212,7 @@ public AbstractSelector(params object[] args) : base(args) { }
 
     #region AsynchronousChannelProvider
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AsynchronousChannelProvider.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AsynchronousChannelProvider.html"/>
     /// </summary>
     public partial class AsynchronousChannelProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AsynchronousChannelProvider>
     {
@@ -220,12 +220,12 @@ public partial class AsynchronousChannelProvider : MASES.JCOBridge.C2JBridge.JVM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AsynchronousChannelProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousChannelProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousChannelProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AsynchronousChannelProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AsynchronousChannelProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AsynchronousChannelProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,7 +258,7 @@ public AsynchronousChannelProvider(params object[] args) : base(args) { }
 
     #region SelectorProvider
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html"/>
     /// </summary>
     public partial class SelectorProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SelectorProvider>
     {
@@ -266,12 +266,12 @@ public partial class SelectorProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SelectorProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SelectorProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SelectorProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SelectorProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SelectorProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SelectorProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AsynchronousChannelProvider.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AsynchronousChannelProvider.cs
index d33dde338..9d57afb4d 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AsynchronousChannelProvider.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/AsynchronousChannelProvider.cs
@@ -42,7 +42,7 @@ public partial class AsynchronousChannelProvider
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AsynchronousChannelProvider.html#provider()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AsynchronousChannelProvider.html#provider()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Spi.AsynchronousChannelProvider"/></returns>
         public static Java.Nio.Channels.Spi.AsynchronousChannelProvider Provider()
@@ -54,7 +54,7 @@ public static Java.Nio.Channels.Spi.AsynchronousChannelProvider Provider()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AsynchronousChannelProvider.html#openAsynchronousChannelGroup(int,java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AsynchronousChannelProvider.html#openAsynchronousChannelGroup(int,java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
@@ -65,7 +65,7 @@ public Java.Nio.Channels.AsynchronousChannelGroup OpenAsynchronousChannelGroup(i
             return IExecute<Java.Nio.Channels.AsynchronousChannelGroup>("openAsynchronousChannelGroup", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AsynchronousChannelProvider.html#openAsynchronousChannelGroup(java.util.concurrent.ExecutorService,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AsynchronousChannelProvider.html#openAsynchronousChannelGroup(java.util.concurrent.ExecutorService,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ExecutorService"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -76,7 +76,7 @@ public Java.Nio.Channels.AsynchronousChannelGroup OpenAsynchronousChannelGroup(J
             return IExecute<Java.Nio.Channels.AsynchronousChannelGroup>("openAsynchronousChannelGroup", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AsynchronousChannelProvider.html#openAsynchronousServerSocketChannel(java.nio.channels.AsynchronousChannelGroup)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AsynchronousChannelProvider.html#openAsynchronousServerSocketChannel(java.nio.channels.AsynchronousChannelGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.AsynchronousChannelGroup"/></param>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousServerSocketChannel"/></returns>
@@ -86,7 +86,7 @@ public Java.Nio.Channels.AsynchronousServerSocketChannel OpenAsynchronousServerS
             return IExecuteWithSignature<Java.Nio.Channels.AsynchronousServerSocketChannel>("openAsynchronousServerSocketChannel", "(Ljava/nio/channels/AsynchronousChannelGroup;)Ljava/nio/channels/AsynchronousServerSocketChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/AsynchronousChannelProvider.html#openAsynchronousSocketChannel(java.nio.channels.AsynchronousChannelGroup)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/AsynchronousChannelProvider.html#openAsynchronousSocketChannel(java.nio.channels.AsynchronousChannelGroup)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.AsynchronousChannelGroup"/></param>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousSocketChannel"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/SelectorProvider.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/SelectorProvider.cs
index d07c11584..b65fda6df 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/SelectorProvider.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/Spi/SelectorProvider.cs
@@ -42,7 +42,7 @@ public partial class SelectorProvider
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#provider()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html#provider()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Spi.SelectorProvider"/></returns>
         public static Java.Nio.Channels.Spi.SelectorProvider Provider()
@@ -54,7 +54,7 @@ public static Java.Nio.Channels.Spi.SelectorProvider Provider()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#openDatagramChannel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html#openDatagramChannel()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.DatagramChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -63,7 +63,7 @@ public Java.Nio.Channels.DatagramChannel OpenDatagramChannel()
             return IExecuteWithSignature<Java.Nio.Channels.DatagramChannel>("openDatagramChannel", "()Ljava/nio/channels/DatagramChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#openDatagramChannel(java.net.ProtocolFamily)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html#openDatagramChannel(java.net.ProtocolFamily)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.ProtocolFamily"/></param>
         /// <returns><see cref="Java.Nio.Channels.DatagramChannel"/></returns>
@@ -73,7 +73,7 @@ public Java.Nio.Channels.DatagramChannel OpenDatagramChannel(Java.Net.ProtocolFa
             return IExecuteWithSignature<Java.Nio.Channels.DatagramChannel>("openDatagramChannel", "(Ljava/net/ProtocolFamily;)Ljava/nio/channels/DatagramChannel;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#openPipe()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html#openPipe()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Pipe"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -82,7 +82,7 @@ public Java.Nio.Channels.Pipe OpenPipe()
             return IExecuteWithSignature<Java.Nio.Channels.Pipe>("openPipe", "()Ljava/nio/channels/Pipe;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#openServerSocketChannel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html#openServerSocketChannel()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.ServerSocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -91,7 +91,7 @@ public Java.Nio.Channels.ServerSocketChannel OpenServerSocketChannel()
             return IExecuteWithSignature<Java.Nio.Channels.ServerSocketChannel>("openServerSocketChannel", "()Ljava/nio/channels/ServerSocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#openSocketChannel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html#openSocketChannel()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -100,7 +100,7 @@ public Java.Nio.Channels.SocketChannel OpenSocketChannel()
             return IExecuteWithSignature<Java.Nio.Channels.SocketChannel>("openSocketChannel", "()Ljava/nio/channels/SocketChannel;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#openSelector()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html#openSelector()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Spi.AbstractSelector"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -109,7 +109,7 @@ public Java.Nio.Channels.Spi.AbstractSelector OpenSelector()
             return IExecuteWithSignature<Java.Nio.Channels.Spi.AbstractSelector>("openSelector", "()Ljava/nio/channels/spi/AbstractSelector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#inheritedChannel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/spi/SelectorProvider.html#inheritedChannel()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Channels.Channel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -117,26 +117,6 @@ public Java.Nio.Channels.Channel InheritedChannel()
         {
             return IExecuteWithSignature<Java.Nio.Channels.Channel>("inheritedChannel", "()Ljava/nio/channels/Channel;");
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#openServerSocketChannel(java.net.ProtocolFamily)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.ProtocolFamily"/></param>
-        /// <returns><see cref="Java.Nio.Channels.ServerSocketChannel"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Java.Nio.Channels.ServerSocketChannel OpenServerSocketChannel(Java.Net.ProtocolFamily arg0)
-        {
-            return IExecuteWithSignature<Java.Nio.Channels.ServerSocketChannel>("openServerSocketChannel", "(Ljava/net/ProtocolFamily;)Ljava/nio/channels/ServerSocketChannel;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/spi/SelectorProvider.html#openSocketChannel(java.net.ProtocolFamily)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Net.ProtocolFamily"/></param>
-        /// <returns><see cref="Java.Nio.Channels.SocketChannel"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public Java.Nio.Channels.SocketChannel OpenSocketChannel(Java.Net.ProtocolFamily arg0)
-        {
-            return IExecuteWithSignature<Java.Nio.Channels.SocketChannel>("openSocketChannel", "(Ljava/net/ProtocolFamily;)Ljava/nio/channels/SocketChannel;", arg0);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Nio/Channels/WritableByteChannel.cs b/src/net/Netdroid/Generated/Java/Nio/Channels/WritableByteChannel.cs
index 966e74d5e..e2d955edc 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Channels/WritableByteChannel.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Channels/WritableByteChannel.cs
@@ -64,7 +64,7 @@ public partial class WritableByteChannel : Java.Nio.Channels.IWritableByteChanne
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/channels/WritableByteChannel.html#write(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/channels/WritableByteChannel.html#write(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/CharBuffer.cs b/src/net/Netdroid/Generated/Java/Nio/CharBuffer.cs
index 63a0ed6a0..33d89cb6f 100644
--- a/src/net/Netdroid/Generated/Java/Nio/CharBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/CharBuffer.cs
@@ -58,7 +58,7 @@ public partial class CharBuffer : Java.Lang.IComparable<Java.Nio.CharBuffer>, Ja
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#allocate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#allocate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -67,7 +67,7 @@ public static Java.Nio.CharBuffer Allocate(int arg0)
             return SExecuteWithSignature<Java.Nio.CharBuffer>(LocalBridgeClazz, "allocate", "(I)Ljava/nio/CharBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#wrap(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#wrap(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -78,7 +78,7 @@ public static Java.Nio.CharBuffer Wrap(char[] arg0, int arg1, int arg2)
             return SExecute<Java.Nio.CharBuffer>(LocalBridgeClazz, "wrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#wrap(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#wrap(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -87,7 +87,7 @@ public static Java.Nio.CharBuffer Wrap(char[] arg0)
             return SExecuteWithSignature<Java.Nio.CharBuffer>(LocalBridgeClazz, "wrap", "([C)Ljava/nio/CharBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#wrap(java.lang.CharSequence,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#wrap(java.lang.CharSequence,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -98,7 +98,7 @@ public static Java.Nio.CharBuffer Wrap(Java.Lang.CharSequence arg0, int arg1, in
             return SExecute<Java.Nio.CharBuffer>(LocalBridgeClazz, "wrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#wrap(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#wrap(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -111,7 +111,7 @@ public static Java.Nio.CharBuffer Wrap(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#get()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Get()
@@ -119,7 +119,7 @@ public char Get()
             return IExecuteWithSignature<char>("get", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -128,7 +128,7 @@ public char Get(int arg0)
             return IExecuteWithSignature<char>("get", "(I)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#order()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#order()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteOrder"/></returns>
         public Java.Nio.ByteOrder Order()
@@ -136,7 +136,7 @@ public Java.Nio.ByteOrder Order()
             return IExecuteWithSignature<Java.Nio.ByteOrder>("order", "()Ljava/nio/ByteOrder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#asReadOnlyBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#asReadOnlyBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
         public Java.Nio.CharBuffer AsReadOnlyBuffer()
@@ -144,7 +144,7 @@ public Java.Nio.CharBuffer AsReadOnlyBuffer()
             return IExecuteWithSignature<Java.Nio.CharBuffer>("asReadOnlyBuffer", "()Ljava/nio/CharBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#compact()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#compact()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
         public Java.Nio.CharBuffer Compact()
@@ -152,7 +152,7 @@ public Java.Nio.CharBuffer Compact()
             return IExecuteWithSignature<Java.Nio.CharBuffer>("compact", "()Ljava/nio/CharBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(char)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#put(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -161,7 +161,7 @@ public Java.Nio.CharBuffer Put(char arg0)
             return IExecuteWithSignature<Java.Nio.CharBuffer>("put", "(C)Ljava/nio/CharBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(int,char)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#put(int,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -171,15 +171,7 @@ public Java.Nio.CharBuffer Put(int arg0, char arg1)
             return IExecute<Java.Nio.CharBuffer>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#isEmpty()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEmpty()
-        {
-            return IExecuteWithSignature<bool>("isEmpty", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#charAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#charAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -188,7 +180,7 @@ public char CharAt(int arg0)
             return IExecuteWithSignature<char>("charAt", "(I)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -196,7 +188,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#put(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -205,7 +197,7 @@ public Java.Nio.CharBuffer Put(char[] arg0)
             return IExecuteWithSignature<Java.Nio.CharBuffer>("put", "([C)Ljava/nio/CharBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#put(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -214,7 +206,7 @@ public Java.Nio.CharBuffer Put(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Nio.CharBuffer>("put", "(Ljava/lang/String;)Ljava/nio/CharBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -223,7 +215,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#compareTo(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#compareTo(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -232,7 +224,7 @@ public int CompareTo(Java.Nio.CharBuffer arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/CharBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#mismatch(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#mismatch(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -241,7 +233,7 @@ public int Mismatch(Java.Nio.CharBuffer arg0)
             return IExecuteWithSignature<int>("mismatch", "(Ljava/nio/CharBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#read(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#read(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -251,7 +243,7 @@ public int Read(Java.Nio.CharBuffer arg0)
             return IExecuteWithSignature<int>("read", "(Ljava/nio/CharBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#append(char)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#append(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
@@ -261,7 +253,7 @@ public Java.Lang.Appendable Append(char arg0)
             return IExecuteWithSignature<Java.Lang.Appendable>("append", "(C)Ljava/lang/Appendable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#append(java.lang.CharSequence,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#append(java.lang.CharSequence,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -273,7 +265,7 @@ public Java.Lang.Appendable Append(Java.Lang.CharSequence arg0, int arg1, int ar
             return IExecute<Java.Lang.Appendable>("append", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#append(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#append(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
@@ -283,7 +275,7 @@ public Java.Lang.Appendable Append(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Lang.Appendable>("append", "(Ljava/lang/CharSequence;)Ljava/lang/Appendable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#subSequence(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#subSequence(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -293,7 +285,7 @@ public Java.Lang.CharSequence SubSequence(int arg0, int arg1)
             return IExecute<Java.Lang.CharSequence>("subSequence", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#get(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#get(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -304,7 +296,7 @@ public Java.Nio.CharBuffer Get(char[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.CharBuffer>("get", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#get(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#get(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -313,29 +305,7 @@ public Java.Nio.CharBuffer Get(char[] arg0)
             return IExecuteWithSignature<Java.Nio.CharBuffer>("get", "([C)Ljava/nio/CharBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#get(int,char[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="char"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
-        public Java.Nio.CharBuffer Get(int arg0, char[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.CharBuffer>("get", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#get(int,char[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="char"/></param>
-        /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
-        public Java.Nio.CharBuffer Get(int arg0, char[] arg1)
-        {
-            return IExecute<Java.Nio.CharBuffer>("get", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#put(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -346,41 +316,7 @@ public Java.Nio.CharBuffer Put(char[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.CharBuffer>("put", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(int,char[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="char"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
-        public Java.Nio.CharBuffer Put(int arg0, char[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.CharBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(int,char[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="char"/></param>
-        /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
-        public Java.Nio.CharBuffer Put(int arg0, char[] arg1)
-        {
-            return IExecute<Java.Nio.CharBuffer>("put", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(int,java.nio.CharBuffer,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.CharBuffer"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
-        public Java.Nio.CharBuffer Put(int arg0, Java.Nio.CharBuffer arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.CharBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#put(java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -391,7 +327,7 @@ public Java.Nio.CharBuffer Put(Java.Lang.String arg0, int arg1, int arg2)
             return IExecute<Java.Nio.CharBuffer>("put", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#put(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#put(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -400,7 +336,7 @@ public Java.Nio.CharBuffer Put(Java.Nio.CharBuffer arg0)
             return IExecuteWithSignature<Java.Nio.CharBuffer>("put", "(Ljava/nio/CharBuffer;)Ljava/nio/CharBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/CharBuffer.html#chars()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/CharBuffer.html#chars()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Chars()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/AllPackageClasses.cs
index 296a0e208..9edd70b49 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Nio.Charset
 {
     #region CharacterCodingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharacterCodingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/CharacterCodingException.html"/>
     /// </summary>
     public partial class CharacterCodingException : Java.Io.IOException
     {
@@ -45,7 +45,7 @@ public partial class CharacterCodingException : Java.Io.IOException
 
     #region Charset
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html"/>
     /// </summary>
     public partial class Charset : Java.Lang.Comparable<Java.Nio.Charset.Charset>
     {
@@ -53,12 +53,12 @@ public partial class Charset : Java.Lang.Comparable<Java.Nio.Charset.Charset>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Charset class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Charset class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Charset() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Charset class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Charset class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Charset(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -91,7 +91,7 @@ public Charset(params object[] args) : base(args) { }
 
     #region CharsetDecoder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html"/>
     /// </summary>
     public partial class CharsetDecoder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CharsetDecoder>
     {
@@ -99,12 +99,12 @@ public partial class CharsetDecoder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ch
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CharsetDecoder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharsetDecoder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharsetDecoder() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CharsetDecoder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharsetDecoder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharsetDecoder(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -137,7 +137,7 @@ public CharsetDecoder(params object[] args) : base(args) { }
 
     #region CharsetEncoder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html"/>
     /// </summary>
     public partial class CharsetEncoder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CharsetEncoder>
     {
@@ -145,12 +145,12 @@ public partial class CharsetEncoder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ch
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CharsetEncoder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharsetEncoder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharsetEncoder() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CharsetEncoder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharsetEncoder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharsetEncoder(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -183,7 +183,7 @@ public CharsetEncoder(params object[] args) : base(args) { }
 
     #region CoderMalfunctionError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderMalfunctionError.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/CoderMalfunctionError.html"/>
     /// </summary>
     public partial class CoderMalfunctionError : Java.Lang.Error
     {
@@ -200,7 +200,7 @@ public partial class CoderMalfunctionError : Java.Lang.Error
 
     #region CoderResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html"/>
     /// </summary>
     public partial class CoderResult : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CoderResult>
     {
@@ -244,7 +244,7 @@ public CoderResult(params object[] args) : base(args) { }
 
     #region CodingErrorAction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CodingErrorAction.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/CodingErrorAction.html"/>
     /// </summary>
     public partial class CodingErrorAction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CodingErrorAction>
     {
@@ -288,7 +288,7 @@ public CodingErrorAction(params object[] args) : base(args) { }
 
     #region IllegalCharsetNameException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/IllegalCharsetNameException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/IllegalCharsetNameException.html"/>
     /// </summary>
     public partial class IllegalCharsetNameException : Java.Lang.IllegalArgumentException
     {
@@ -305,7 +305,7 @@ public partial class IllegalCharsetNameException : Java.Lang.IllegalArgumentExce
 
     #region MalformedInputException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/MalformedInputException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/MalformedInputException.html"/>
     /// </summary>
     public partial class MalformedInputException : Java.Nio.Charset.CharacterCodingException
     {
@@ -322,7 +322,7 @@ public partial class MalformedInputException : Java.Nio.Charset.CharacterCodingE
 
     #region StandardCharsets
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/StandardCharsets.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/StandardCharsets.html"/>
     /// </summary>
     public partial class StandardCharsets : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StandardCharsets>
     {
@@ -366,7 +366,7 @@ public StandardCharsets(params object[] args) : base(args) { }
 
     #region UnmappableCharacterException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/UnmappableCharacterException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/UnmappableCharacterException.html"/>
     /// </summary>
     public partial class UnmappableCharacterException : Java.Nio.Charset.CharacterCodingException
     {
@@ -383,7 +383,7 @@ public partial class UnmappableCharacterException : Java.Nio.Charset.CharacterCo
 
     #region UnsupportedCharsetException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/UnsupportedCharsetException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/UnsupportedCharsetException.html"/>
     /// </summary>
     public partial class UnsupportedCharsetException : Java.Lang.IllegalArgumentException
     {
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/Charset.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/Charset.cs
index eb04724fc..a5413b0cf 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/Charset.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/Charset.cs
@@ -42,7 +42,7 @@ public partial class Charset
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#isSupported(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#isSupported(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -51,7 +51,7 @@ public static bool IsSupported(Java.Lang.String arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSupported", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#defaultCharset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#defaultCharset()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.Charset"/></returns>
         public static Java.Nio.Charset.Charset DefaultCharset()
@@ -59,7 +59,7 @@ public static Java.Nio.Charset.Charset DefaultCharset()
             return SExecuteWithSignature<Java.Nio.Charset.Charset>(LocalBridgeClazz, "defaultCharset", "()Ljava/nio/charset/Charset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#forName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#forName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.Charset.Charset"/></returns>
@@ -68,7 +68,7 @@ public static Java.Nio.Charset.Charset ForName(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Nio.Charset.Charset>(LocalBridgeClazz, "forName", "(Ljava/lang/String;)Ljava/nio/charset/Charset;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#availableCharsets()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#availableCharsets()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
         public static Java.Util.SortedMap<Java.Lang.String, Java.Nio.Charset.Charset> AvailableCharsets()
@@ -80,7 +80,7 @@ public static Java.Nio.Charset.Charset ForName(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#contains(java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#contains(java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Charset.Charset"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -89,7 +89,7 @@ public bool Contains(Java.Nio.Charset.Charset arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/nio/charset/Charset;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#newDecoder()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#newDecoder()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.CharsetDecoder"/></returns>
         public Java.Nio.Charset.CharsetDecoder NewDecoder()
@@ -97,7 +97,7 @@ public Java.Nio.Charset.CharsetDecoder NewDecoder()
             return IExecuteWithSignature<Java.Nio.Charset.CharsetDecoder>("newDecoder", "()Ljava/nio/charset/CharsetDecoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#newEncoder()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#newEncoder()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.CharsetEncoder"/></returns>
         public Java.Nio.Charset.CharsetEncoder NewEncoder()
@@ -105,7 +105,7 @@ public Java.Nio.Charset.CharsetEncoder NewEncoder()
             return IExecuteWithSignature<Java.Nio.Charset.CharsetEncoder>("newEncoder", "()Ljava/nio/charset/CharsetEncoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#canEncode()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#canEncode()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool CanEncode()
@@ -113,7 +113,7 @@ public bool CanEncode()
             return IExecuteWithSignature<bool>("canEncode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#isRegistered()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#isRegistered()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsRegistered()
@@ -121,7 +121,7 @@ public bool IsRegistered()
             return IExecuteWithSignature<bool>("isRegistered", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#compareTo(java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#compareTo(java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Charset.Charset"/></param>
         /// <returns><see cref="int"/></returns>
@@ -130,7 +130,7 @@ public int CompareTo(Java.Nio.Charset.Charset arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/charset/Charset;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -138,7 +138,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#encode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#encode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -147,7 +147,7 @@ public Java.Nio.ByteBuffer Encode(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("encode", "(Ljava/lang/String;)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#encode(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#encode(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -156,7 +156,7 @@ public Java.Nio.ByteBuffer Encode(Java.Nio.CharBuffer arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("encode", "(Ljava/nio/CharBuffer;)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#decode(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#decode(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -165,7 +165,7 @@ public Java.Nio.CharBuffer Decode(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<Java.Nio.CharBuffer>("decode", "(Ljava/nio/ByteBuffer;)Ljava/nio/CharBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#aliases()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#aliases()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Lang.String> Aliases()
@@ -173,7 +173,7 @@ public Java.Nio.CharBuffer Decode(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("aliases", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -182,7 +182,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#displayName()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#displayName()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String DisplayName()
@@ -190,7 +190,7 @@ public Java.Lang.String DisplayName()
             return IExecuteWithSignature<Java.Lang.String>("displayName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/Charset.html#displayName(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/Charset.html#displayName(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/CharsetDecoder.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/CharsetDecoder.cs
index 098647574..5dd432806 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/CharsetDecoder.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/CharsetDecoder.cs
@@ -46,7 +46,7 @@ public partial class CharsetDecoder
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#isAutoDetecting()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#isAutoDetecting()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAutoDetecting()
@@ -54,7 +54,7 @@ public bool IsAutoDetecting()
             return IExecuteWithSignature<bool>("isAutoDetecting", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#isCharsetDetected()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#isCharsetDetected()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCharsetDetected()
@@ -62,7 +62,7 @@ public bool IsCharsetDetected()
             return IExecuteWithSignature<bool>("isCharsetDetected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#averageCharsPerByte()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#averageCharsPerByte()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         public float AverageCharsPerByte()
@@ -70,7 +70,7 @@ public float AverageCharsPerByte()
             return IExecuteWithSignature<float>("averageCharsPerByte", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#maxCharsPerByte()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#maxCharsPerByte()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         public float MaxCharsPerByte()
@@ -78,7 +78,7 @@ public float MaxCharsPerByte()
             return IExecuteWithSignature<float>("maxCharsPerByte", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#replacement()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#replacement()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Replacement()
@@ -86,7 +86,7 @@ public Java.Lang.String Replacement()
             return IExecuteWithSignature<Java.Lang.String>("replacement", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#decode(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#decode(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Nio.CharBuffer"/></returns>
@@ -96,7 +96,7 @@ public Java.Nio.CharBuffer Decode(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<Java.Nio.CharBuffer>("decode", "(Ljava/nio/ByteBuffer;)Ljava/nio/CharBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#charset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#charset()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.Charset"/></returns>
         public Java.Nio.Charset.Charset Charset()
@@ -104,7 +104,7 @@ public Java.Nio.Charset.Charset Charset()
             return IExecuteWithSignature<Java.Nio.Charset.Charset>("charset", "()Ljava/nio/charset/Charset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#onMalformedInput(java.nio.charset.CodingErrorAction)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#onMalformedInput(java.nio.charset.CodingErrorAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Charset.CodingErrorAction"/></param>
         /// <returns><see cref="Java.Nio.Charset.CharsetDecoder"/></returns>
@@ -113,7 +113,7 @@ public Java.Nio.Charset.CharsetDecoder OnMalformedInput(Java.Nio.Charset.CodingE
             return IExecuteWithSignature<Java.Nio.Charset.CharsetDecoder>("onMalformedInput", "(Ljava/nio/charset/CodingErrorAction;)Ljava/nio/charset/CharsetDecoder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#onUnmappableCharacter(java.nio.charset.CodingErrorAction)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#onUnmappableCharacter(java.nio.charset.CodingErrorAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Charset.CodingErrorAction"/></param>
         /// <returns><see cref="Java.Nio.Charset.CharsetDecoder"/></returns>
@@ -122,7 +122,7 @@ public Java.Nio.Charset.CharsetDecoder OnUnmappableCharacter(Java.Nio.Charset.Co
             return IExecuteWithSignature<Java.Nio.Charset.CharsetDecoder>("onUnmappableCharacter", "(Ljava/nio/charset/CodingErrorAction;)Ljava/nio/charset/CharsetDecoder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#replaceWith(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#replaceWith(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.Charset.CharsetDecoder"/></returns>
@@ -131,7 +131,7 @@ public Java.Nio.Charset.CharsetDecoder ReplaceWith(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Nio.Charset.CharsetDecoder>("replaceWith", "(Ljava/lang/String;)Ljava/nio/charset/CharsetDecoder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#reset()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.CharsetDecoder"/></returns>
         public Java.Nio.Charset.CharsetDecoder Reset()
@@ -139,7 +139,7 @@ public Java.Nio.Charset.CharsetDecoder Reset()
             return IExecuteWithSignature<Java.Nio.Charset.CharsetDecoder>("reset", "()Ljava/nio/charset/CharsetDecoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#decode(java.nio.ByteBuffer,java.nio.CharBuffer,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#decode(java.nio.ByteBuffer,java.nio.CharBuffer,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Nio.CharBuffer"/></param>
@@ -150,7 +150,7 @@ public Java.Nio.Charset.CoderResult Decode(Java.Nio.ByteBuffer arg0, Java.Nio.Ch
             return IExecute<Java.Nio.Charset.CoderResult>("decode", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#flush(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#flush(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="Java.Nio.Charset.CoderResult"/></returns>
@@ -159,7 +159,7 @@ public Java.Nio.Charset.CoderResult Flush(Java.Nio.CharBuffer arg0)
             return IExecuteWithSignature<Java.Nio.Charset.CoderResult>("flush", "(Ljava/nio/CharBuffer;)Ljava/nio/charset/CoderResult;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#detectedCharset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#detectedCharset()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.Charset"/></returns>
         public Java.Nio.Charset.Charset DetectedCharset()
@@ -167,7 +167,7 @@ public Java.Nio.Charset.Charset DetectedCharset()
             return IExecuteWithSignature<Java.Nio.Charset.Charset>("detectedCharset", "()Ljava/nio/charset/Charset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#malformedInputAction()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#malformedInputAction()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.CodingErrorAction"/></returns>
         public Java.Nio.Charset.CodingErrorAction MalformedInputAction()
@@ -175,7 +175,7 @@ public Java.Nio.Charset.CodingErrorAction MalformedInputAction()
             return IExecuteWithSignature<Java.Nio.Charset.CodingErrorAction>("malformedInputAction", "()Ljava/nio/charset/CodingErrorAction;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetDecoder.html#unmappableCharacterAction()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetDecoder.html#unmappableCharacterAction()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.CodingErrorAction"/></returns>
         public Java.Nio.Charset.CodingErrorAction UnmappableCharacterAction()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/CharsetEncoder.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/CharsetEncoder.cs
index 0e2027a37..ba0ba63a9 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/CharsetEncoder.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/CharsetEncoder.cs
@@ -46,7 +46,7 @@ public partial class CharsetEncoder
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#canEncode(char)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#canEncode(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -55,7 +55,7 @@ public bool CanEncode(char arg0)
             return IExecuteWithSignature<bool>("canEncode", "(C)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#canEncode(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#canEncode(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -64,7 +64,7 @@ public bool CanEncode(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<bool>("canEncode", "(Ljava/lang/CharSequence;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#isLegalReplacement(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#isLegalReplacement(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -73,7 +73,7 @@ public bool IsLegalReplacement(byte[] arg0)
             return IExecuteWithSignature<bool>("isLegalReplacement", "([B)Z", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#replacement()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#replacement()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte[] Replacement()
@@ -81,7 +81,7 @@ public byte[] Replacement()
             return IExecuteWithSignatureArray<byte>("replacement", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#averageBytesPerChar()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#averageBytesPerChar()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         public float AverageBytesPerChar()
@@ -89,7 +89,7 @@ public float AverageBytesPerChar()
             return IExecuteWithSignature<float>("averageBytesPerChar", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#maxBytesPerChar()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#maxBytesPerChar()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         public float MaxBytesPerChar()
@@ -97,7 +97,7 @@ public float MaxBytesPerChar()
             return IExecuteWithSignature<float>("maxBytesPerChar", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#encode(java.nio.CharBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#encode(java.nio.CharBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -107,7 +107,7 @@ public Java.Nio.ByteBuffer Encode(Java.Nio.CharBuffer arg0)
             return IExecuteWithSignature<Java.Nio.ByteBuffer>("encode", "(Ljava/nio/CharBuffer;)Ljava/nio/ByteBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#charset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#charset()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.Charset"/></returns>
         public Java.Nio.Charset.Charset Charset()
@@ -115,7 +115,7 @@ public Java.Nio.Charset.Charset Charset()
             return IExecuteWithSignature<Java.Nio.Charset.Charset>("charset", "()Ljava/nio/charset/Charset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#onMalformedInput(java.nio.charset.CodingErrorAction)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#onMalformedInput(java.nio.charset.CodingErrorAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Charset.CodingErrorAction"/></param>
         /// <returns><see cref="Java.Nio.Charset.CharsetEncoder"/></returns>
@@ -124,7 +124,7 @@ public Java.Nio.Charset.CharsetEncoder OnMalformedInput(Java.Nio.Charset.CodingE
             return IExecuteWithSignature<Java.Nio.Charset.CharsetEncoder>("onMalformedInput", "(Ljava/nio/charset/CodingErrorAction;)Ljava/nio/charset/CharsetEncoder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#onUnmappableCharacter(java.nio.charset.CodingErrorAction)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#onUnmappableCharacter(java.nio.charset.CodingErrorAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Charset.CodingErrorAction"/></param>
         /// <returns><see cref="Java.Nio.Charset.CharsetEncoder"/></returns>
@@ -133,7 +133,7 @@ public Java.Nio.Charset.CharsetEncoder OnUnmappableCharacter(Java.Nio.Charset.Co
             return IExecuteWithSignature<Java.Nio.Charset.CharsetEncoder>("onUnmappableCharacter", "(Ljava/nio/charset/CodingErrorAction;)Ljava/nio/charset/CharsetEncoder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#replaceWith(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#replaceWith(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Nio.Charset.CharsetEncoder"/></returns>
@@ -142,7 +142,7 @@ public Java.Nio.Charset.CharsetEncoder ReplaceWith(byte[] arg0)
             return IExecuteWithSignature<Java.Nio.Charset.CharsetEncoder>("replaceWith", "([B)Ljava/nio/charset/CharsetEncoder;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#reset()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.CharsetEncoder"/></returns>
         public Java.Nio.Charset.CharsetEncoder Reset()
@@ -150,7 +150,7 @@ public Java.Nio.Charset.CharsetEncoder Reset()
             return IExecuteWithSignature<Java.Nio.Charset.CharsetEncoder>("reset", "()Ljava/nio/charset/CharsetEncoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#encode(java.nio.CharBuffer,java.nio.ByteBuffer,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#encode(java.nio.CharBuffer,java.nio.ByteBuffer,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.CharBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -161,7 +161,7 @@ public Java.Nio.Charset.CoderResult Encode(Java.Nio.CharBuffer arg0, Java.Nio.By
             return IExecute<Java.Nio.Charset.CoderResult>("encode", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#flush(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#flush(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Nio.Charset.CoderResult"/></returns>
@@ -170,7 +170,7 @@ public Java.Nio.Charset.CoderResult Flush(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<Java.Nio.Charset.CoderResult>("flush", "(Ljava/nio/ByteBuffer;)Ljava/nio/charset/CoderResult;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#malformedInputAction()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#malformedInputAction()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.CodingErrorAction"/></returns>
         public Java.Nio.Charset.CodingErrorAction MalformedInputAction()
@@ -178,7 +178,7 @@ public Java.Nio.Charset.CodingErrorAction MalformedInputAction()
             return IExecuteWithSignature<Java.Nio.Charset.CodingErrorAction>("malformedInputAction", "()Ljava/nio/charset/CodingErrorAction;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CharsetEncoder.html#unmappableCharacterAction()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CharsetEncoder.html#unmappableCharacterAction()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.Charset.CodingErrorAction"/></returns>
         public Java.Nio.Charset.CodingErrorAction UnmappableCharacterAction()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/CoderResult.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/CoderResult.cs
index 842786af3..f33d54f8c 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/CoderResult.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/CoderResult.cs
@@ -38,13 +38,13 @@ public partial class CoderResult
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#OVERFLOW"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#OVERFLOW"/>
         /// </summary>
         public static Java.Nio.Charset.CoderResult OVERFLOW { get { if (!_OVERFLOWReady) { _OVERFLOWContent = SGetField<Java.Nio.Charset.CoderResult>(LocalBridgeClazz, "OVERFLOW"); _OVERFLOWReady = true; } return _OVERFLOWContent; } }
         private static Java.Nio.Charset.CoderResult _OVERFLOWContent = default;
         private static bool _OVERFLOWReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#UNDERFLOW"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#UNDERFLOW"/>
         /// </summary>
         public static Java.Nio.Charset.CoderResult UNDERFLOW { get { if (!_UNDERFLOWReady) { _UNDERFLOWContent = SGetField<Java.Nio.Charset.CoderResult>(LocalBridgeClazz, "UNDERFLOW"); _UNDERFLOWReady = true; } return _UNDERFLOWContent; } }
         private static Java.Nio.Charset.CoderResult _UNDERFLOWContent = default;
@@ -54,7 +54,7 @@ public partial class CoderResult
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#malformedForLength(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#malformedForLength(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.Charset.CoderResult"/></returns>
@@ -63,7 +63,7 @@ public static Java.Nio.Charset.CoderResult MalformedForLength(int arg0)
             return SExecuteWithSignature<Java.Nio.Charset.CoderResult>(LocalBridgeClazz, "malformedForLength", "(I)Ljava/nio/charset/CoderResult;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#unmappableForLength(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#unmappableForLength(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.Charset.CoderResult"/></returns>
@@ -76,7 +76,7 @@ public static Java.Nio.Charset.CoderResult UnmappableForLength(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#isError()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#isError()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsError()
@@ -84,7 +84,7 @@ public bool IsError()
             return IExecuteWithSignature<bool>("isError", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#isMalformed()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#isMalformed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMalformed()
@@ -92,7 +92,7 @@ public bool IsMalformed()
             return IExecuteWithSignature<bool>("isMalformed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#isOverflow()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#isOverflow()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsOverflow()
@@ -100,7 +100,7 @@ public bool IsOverflow()
             return IExecuteWithSignature<bool>("isOverflow", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#isUnderflow()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#isUnderflow()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsUnderflow()
@@ -108,7 +108,7 @@ public bool IsUnderflow()
             return IExecuteWithSignature<bool>("isUnderflow", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#isUnmappable()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#isUnmappable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsUnmappable()
@@ -116,7 +116,7 @@ public bool IsUnmappable()
             return IExecuteWithSignature<bool>("isUnmappable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -124,7 +124,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CoderResult.html#throwException()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CoderResult.html#throwException()"/>
         /// </summary>
         /// <exception cref="Java.Nio.Charset.CharacterCodingException"/>
         public void ThrowException()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/CodingErrorAction.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/CodingErrorAction.cs
index 6f29d1f2b..acef29521 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/CodingErrorAction.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/CodingErrorAction.cs
@@ -38,19 +38,19 @@ public partial class CodingErrorAction
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CodingErrorAction.html#IGNORE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CodingErrorAction.html#IGNORE"/>
         /// </summary>
         public static Java.Nio.Charset.CodingErrorAction IGNORE { get { if (!_IGNOREReady) { _IGNOREContent = SGetField<Java.Nio.Charset.CodingErrorAction>(LocalBridgeClazz, "IGNORE"); _IGNOREReady = true; } return _IGNOREContent; } }
         private static Java.Nio.Charset.CodingErrorAction _IGNOREContent = default;
         private static bool _IGNOREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CodingErrorAction.html#REPLACE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CodingErrorAction.html#REPLACE"/>
         /// </summary>
         public static Java.Nio.Charset.CodingErrorAction REPLACE { get { if (!_REPLACEReady) { _REPLACEContent = SGetField<Java.Nio.Charset.CodingErrorAction>(LocalBridgeClazz, "REPLACE"); _REPLACEReady = true; } return _REPLACEContent; } }
         private static Java.Nio.Charset.CodingErrorAction _REPLACEContent = default;
         private static bool _REPLACEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/CodingErrorAction.html#REPORT"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/CodingErrorAction.html#REPORT"/>
         /// </summary>
         public static Java.Nio.Charset.CodingErrorAction REPORT { get { if (!_REPORTReady) { _REPORTContent = SGetField<Java.Nio.Charset.CodingErrorAction>(LocalBridgeClazz, "REPORT"); _REPORTReady = true; } return _REPORTContent; } }
         private static Java.Nio.Charset.CodingErrorAction _REPORTContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/Spi/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/Spi/AllPackageClasses.cs
index 245d02057..126aaa13c 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/Spi/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/Spi/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Nio.Charset.Spi
 {
     #region CharsetProvider
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/spi/CharsetProvider.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/charset/spi/CharsetProvider.html"/>
     /// </summary>
     public partial class CharsetProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CharsetProvider>
     {
@@ -36,12 +36,12 @@ public partial class CharsetProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CharsetProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharsetProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharsetProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CharsetProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharsetProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharsetProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/Spi/CharsetProvider.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/Spi/CharsetProvider.cs
index d4c05e428..58de584bf 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/Spi/CharsetProvider.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/Spi/CharsetProvider.cs
@@ -46,7 +46,7 @@ public partial class CharsetProvider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/spi/CharsetProvider.html#charsetForName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/spi/CharsetProvider.html#charsetForName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.Charset.Charset"/></returns>
@@ -55,7 +55,7 @@ public Java.Nio.Charset.Charset CharsetForName(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Nio.Charset.Charset>("charsetForName", "(Ljava/lang/String;)Ljava/nio/charset/Charset;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/spi/CharsetProvider.html#charsets()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/spi/CharsetProvider.html#charsets()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<Java.Nio.Charset.Charset> Charsets()
diff --git a/src/net/Netdroid/Generated/Java/Nio/Charset/StandardCharsets.cs b/src/net/Netdroid/Generated/Java/Nio/Charset/StandardCharsets.cs
index 10f4a1fa1..25794e184 100644
--- a/src/net/Netdroid/Generated/Java/Nio/Charset/StandardCharsets.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/Charset/StandardCharsets.cs
@@ -38,37 +38,37 @@ public partial class StandardCharsets
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/StandardCharsets.html#ISO_8859_1"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/StandardCharsets.html#ISO_8859_1"/>
         /// </summary>
         public static Java.Nio.Charset.Charset ISO_8859_1 { get { if (!_ISO_8859_1Ready) { _ISO_8859_1Content = SGetField<Java.Nio.Charset.Charset>(LocalBridgeClazz, "ISO_8859_1"); _ISO_8859_1Ready = true; } return _ISO_8859_1Content; } }
         private static Java.Nio.Charset.Charset _ISO_8859_1Content = default;
         private static bool _ISO_8859_1Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/StandardCharsets.html#US_ASCII"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/StandardCharsets.html#US_ASCII"/>
         /// </summary>
         public static Java.Nio.Charset.Charset US_ASCII { get { if (!_US_ASCIIReady) { _US_ASCIIContent = SGetField<Java.Nio.Charset.Charset>(LocalBridgeClazz, "US_ASCII"); _US_ASCIIReady = true; } return _US_ASCIIContent; } }
         private static Java.Nio.Charset.Charset _US_ASCIIContent = default;
         private static bool _US_ASCIIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/StandardCharsets.html#UTF_16"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/StandardCharsets.html#UTF_16"/>
         /// </summary>
         public static Java.Nio.Charset.Charset UTF_16 { get { if (!_UTF_16Ready) { _UTF_16Content = SGetField<Java.Nio.Charset.Charset>(LocalBridgeClazz, "UTF_16"); _UTF_16Ready = true; } return _UTF_16Content; } }
         private static Java.Nio.Charset.Charset _UTF_16Content = default;
         private static bool _UTF_16Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/StandardCharsets.html#UTF_16BE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/StandardCharsets.html#UTF_16BE"/>
         /// </summary>
         public static Java.Nio.Charset.Charset UTF_16BE { get { if (!_UTF_16BEReady) { _UTF_16BEContent = SGetField<Java.Nio.Charset.Charset>(LocalBridgeClazz, "UTF_16BE"); _UTF_16BEReady = true; } return _UTF_16BEContent; } }
         private static Java.Nio.Charset.Charset _UTF_16BEContent = default;
         private static bool _UTF_16BEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/StandardCharsets.html#UTF_16LE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/StandardCharsets.html#UTF_16LE"/>
         /// </summary>
         public static Java.Nio.Charset.Charset UTF_16LE { get { if (!_UTF_16LEReady) { _UTF_16LEContent = SGetField<Java.Nio.Charset.Charset>(LocalBridgeClazz, "UTF_16LE"); _UTF_16LEReady = true; } return _UTF_16LEContent; } }
         private static Java.Nio.Charset.Charset _UTF_16LEContent = default;
         private static bool _UTF_16LEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/charset/StandardCharsets.html#UTF_8"/>
+        /// <see href="https://developer.android.com/reference/java/nio/charset/StandardCharsets.html#UTF_8"/>
         /// </summary>
         public static Java.Nio.Charset.Charset UTF_8 { get { if (!_UTF_8Ready) { _UTF_8Content = SGetField<Java.Nio.Charset.Charset>(LocalBridgeClazz, "UTF_8"); _UTF_8Ready = true; } return _UTF_8Content; } }
         private static Java.Nio.Charset.Charset _UTF_8Content = default;
diff --git a/src/net/Netdroid/Generated/Java/Nio/DoubleBuffer.cs b/src/net/Netdroid/Generated/Java/Nio/DoubleBuffer.cs
index 1bb035538..84e2909c3 100644
--- a/src/net/Netdroid/Generated/Java/Nio/DoubleBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/DoubleBuffer.cs
@@ -46,7 +46,7 @@ public partial class DoubleBuffer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#allocate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#allocate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
@@ -55,7 +55,7 @@ public static Java.Nio.DoubleBuffer Allocate(int arg0)
             return SExecuteWithSignature<Java.Nio.DoubleBuffer>(LocalBridgeClazz, "allocate", "(I)Ljava/nio/DoubleBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#wrap(double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#wrap(double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -66,7 +66,7 @@ public static Java.Nio.DoubleBuffer Wrap(double[] arg0, int arg1, int arg2)
             return SExecute<Java.Nio.DoubleBuffer>(LocalBridgeClazz, "wrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#wrap(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#wrap(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
@@ -79,7 +79,7 @@ public static Java.Nio.DoubleBuffer Wrap(double[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#get()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double Get()
@@ -87,7 +87,7 @@ public double Get()
             return IExecuteWithSignature<double>("get", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="double"/></returns>
@@ -96,7 +96,7 @@ public double Get(int arg0)
             return IExecuteWithSignature<double>("get", "(I)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#order()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#order()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteOrder"/></returns>
         public Java.Nio.ByteOrder Order()
@@ -104,7 +104,7 @@ public Java.Nio.ByteOrder Order()
             return IExecuteWithSignature<Java.Nio.ByteOrder>("order", "()Ljava/nio/ByteOrder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#asReadOnlyBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#asReadOnlyBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
         public Java.Nio.DoubleBuffer AsReadOnlyBuffer()
@@ -112,7 +112,7 @@ public Java.Nio.DoubleBuffer AsReadOnlyBuffer()
             return IExecuteWithSignature<Java.Nio.DoubleBuffer>("asReadOnlyBuffer", "()Ljava/nio/DoubleBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#compact()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#compact()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
         public Java.Nio.DoubleBuffer Compact()
@@ -120,7 +120,7 @@ public Java.Nio.DoubleBuffer Compact()
             return IExecuteWithSignature<Java.Nio.DoubleBuffer>("compact", "()Ljava/nio/DoubleBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#put(double)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#put(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
@@ -129,7 +129,7 @@ public Java.Nio.DoubleBuffer Put(double arg0)
             return IExecuteWithSignature<Java.Nio.DoubleBuffer>("put", "(D)Ljava/nio/DoubleBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#put(int,double)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#put(int,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -139,7 +139,7 @@ public Java.Nio.DoubleBuffer Put(int arg0, double arg1)
             return IExecute<Java.Nio.DoubleBuffer>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#put(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#put(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
@@ -148,7 +148,7 @@ public Java.Nio.DoubleBuffer Put(double[] arg0)
             return IExecuteWithSignature<Java.Nio.DoubleBuffer>("put", "([D)Ljava/nio/DoubleBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -157,7 +157,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#compareTo(java.nio.DoubleBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#compareTo(java.nio.DoubleBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.DoubleBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -166,7 +166,7 @@ public int CompareTo(Java.Nio.DoubleBuffer arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/DoubleBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#mismatch(java.nio.DoubleBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#mismatch(java.nio.DoubleBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.DoubleBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -175,7 +175,7 @@ public int Mismatch(Java.Nio.DoubleBuffer arg0)
             return IExecuteWithSignature<int>("mismatch", "(Ljava/nio/DoubleBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#get(double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#get(double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -186,7 +186,7 @@ public Java.Nio.DoubleBuffer Get(double[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.DoubleBuffer>("get", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#get(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#get(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
@@ -195,29 +195,7 @@ public Java.Nio.DoubleBuffer Get(double[] arg0)
             return IExecuteWithSignature<Java.Nio.DoubleBuffer>("get", "([D)Ljava/nio/DoubleBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#get(int,double[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="double"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
-        public Java.Nio.DoubleBuffer Get(int arg0, double[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.DoubleBuffer>("get", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#get(int,double[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="double"/></param>
-        /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
-        public Java.Nio.DoubleBuffer Get(int arg0, double[] arg1)
-        {
-            return IExecute<Java.Nio.DoubleBuffer>("get", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#put(double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#put(double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -228,41 +206,7 @@ public Java.Nio.DoubleBuffer Put(double[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.DoubleBuffer>("put", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#put(int,double[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="double"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
-        public Java.Nio.DoubleBuffer Put(int arg0, double[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.DoubleBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#put(int,double[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="double"/></param>
-        /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
-        public Java.Nio.DoubleBuffer Put(int arg0, double[] arg1)
-        {
-            return IExecute<Java.Nio.DoubleBuffer>("put", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#put(int,java.nio.DoubleBuffer,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.DoubleBuffer"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
-        public Java.Nio.DoubleBuffer Put(int arg0, Java.Nio.DoubleBuffer arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.DoubleBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/DoubleBuffer.html#put(java.nio.DoubleBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/DoubleBuffer.html#put(java.nio.DoubleBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.DoubleBuffer"/></param>
         /// <returns><see cref="Java.Nio.DoubleBuffer"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/AccessMode.cs b/src/net/Netdroid/Generated/Java/Nio/File/AccessMode.cs
index fb081e10f..2b34eb3c7 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/AccessMode.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/AccessMode.cs
@@ -38,19 +38,19 @@ public partial class AccessMode
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/AccessMode.html#EXECUTE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/AccessMode.html#EXECUTE"/>
         /// </summary>
         public static Java.Nio.File.AccessMode EXECUTE { get { if (!_EXECUTEReady) { _EXECUTEContent = SGetField<Java.Nio.File.AccessMode>(LocalBridgeClazz, "EXECUTE"); _EXECUTEReady = true; } return _EXECUTEContent; } }
         private static Java.Nio.File.AccessMode _EXECUTEContent = default;
         private static bool _EXECUTEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/AccessMode.html#READ"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/AccessMode.html#READ"/>
         /// </summary>
         public static Java.Nio.File.AccessMode READ { get { if (!_READReady) { _READContent = SGetField<Java.Nio.File.AccessMode>(LocalBridgeClazz, "READ"); _READReady = true; } return _READContent; } }
         private static Java.Nio.File.AccessMode _READContent = default;
         private static bool _READReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/AccessMode.html#WRITE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/AccessMode.html#WRITE"/>
         /// </summary>
         public static Java.Nio.File.AccessMode WRITE { get { if (!_WRITEReady) { _WRITEContent = SGetField<Java.Nio.File.AccessMode>(LocalBridgeClazz, "WRITE"); _WRITEReady = true; } return _WRITEContent; } }
         private static Java.Nio.File.AccessMode _WRITEContent = default;
@@ -60,7 +60,7 @@ public partial class AccessMode
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/AccessMode.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/AccessMode.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.AccessMode"/></returns>
@@ -69,7 +69,7 @@ public static Java.Nio.File.AccessMode ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Nio.File.AccessMode>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/AccessMode;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/AccessMode.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/AccessMode.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.AccessMode"/></returns>
         public static Java.Nio.File.AccessMode[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Nio/File/AllPackageClasses.cs
index 5385ad957..f94f5935b 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Nio.File
 {
     #region AccessDeniedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/AccessDeniedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/AccessDeniedException.html"/>
     /// </summary>
     public partial class AccessDeniedException : Java.Nio.File.FileSystemException
     {
@@ -45,7 +45,7 @@ public partial class AccessDeniedException : Java.Nio.File.FileSystemException
 
     #region AccessMode
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/AccessMode.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/AccessMode.html"/>
     /// </summary>
     public partial class AccessMode : Java.Lang.Enum<Java.Nio.File.AccessMode>
     {
@@ -89,7 +89,7 @@ public AccessMode(params object[] args) : base(args) { }
 
     #region AtomicMoveNotSupportedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/AtomicMoveNotSupportedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/AtomicMoveNotSupportedException.html"/>
     /// </summary>
     public partial class AtomicMoveNotSupportedException : Java.Nio.File.FileSystemException
     {
@@ -106,7 +106,7 @@ public partial class AtomicMoveNotSupportedException : Java.Nio.File.FileSystemE
 
     #region ClosedDirectoryStreamException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/ClosedDirectoryStreamException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/ClosedDirectoryStreamException.html"/>
     /// </summary>
     public partial class ClosedDirectoryStreamException : Java.Lang.IllegalStateException
     {
@@ -123,7 +123,7 @@ public partial class ClosedDirectoryStreamException : Java.Lang.IllegalStateExce
 
     #region ClosedFileSystemException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/ClosedFileSystemException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/ClosedFileSystemException.html"/>
     /// </summary>
     public partial class ClosedFileSystemException : Java.Lang.IllegalStateException
     {
@@ -140,7 +140,7 @@ public partial class ClosedFileSystemException : Java.Lang.IllegalStateException
 
     #region ClosedWatchServiceException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/ClosedWatchServiceException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/ClosedWatchServiceException.html"/>
     /// </summary>
     public partial class ClosedWatchServiceException : Java.Lang.IllegalStateException
     {
@@ -157,7 +157,7 @@ public partial class ClosedWatchServiceException : Java.Lang.IllegalStateExcepti
 
     #region CopyOption
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/CopyOption.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/CopyOption.html"/>
     /// </summary>
     public partial class CopyOption : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CopyOption>
     {
@@ -165,12 +165,12 @@ public partial class CopyOption : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CopyOp
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CopyOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CopyOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CopyOption() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CopyOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CopyOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CopyOption(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -203,7 +203,7 @@ public CopyOption(params object[] args) : base(args) { }
 
     #region DirectoryIteratorException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryIteratorException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryIteratorException.html"/>
     /// </summary>
     public partial class DirectoryIteratorException : Java.Util.ConcurrentModificationException
     {
@@ -220,7 +220,7 @@ public partial class DirectoryIteratorException : Java.Util.ConcurrentModificati
 
     #region DirectoryNotEmptyException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryNotEmptyException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryNotEmptyException.html"/>
     /// </summary>
     public partial class DirectoryNotEmptyException : Java.Nio.File.FileSystemException
     {
@@ -237,7 +237,7 @@ public partial class DirectoryNotEmptyException : Java.Nio.File.FileSystemExcept
 
     #region DirectoryStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryStream.html"/>
     /// </summary>
     public partial class DirectoryStream : Java.Lang.Iterable
     {
@@ -245,12 +245,12 @@ public partial class DirectoryStream : Java.Lang.Iterable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DirectoryStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DirectoryStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -279,7 +279,7 @@ public DirectoryStream(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Filter
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryStream.Filter.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryStream.Filter.html"/>
         /// </summary>
         public partial class Filter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter>
         {
@@ -287,12 +287,12 @@ public partial class Filter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Filter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Filter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -325,7 +325,7 @@ public Filter(params object[] args) : base(args) { }
 
         #region Filter<T>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryStream.Filter.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryStream.Filter.html"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         public partial class Filter<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter<T>>
@@ -334,12 +334,12 @@ public partial class Filter<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter<
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Filter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Filter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -376,7 +376,7 @@ public Filter(params object[] args) : base(args) { }
 
     #region DirectoryStream<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryStream.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class DirectoryStream<T> : Java.Lang.Iterable<T>
@@ -385,12 +385,12 @@ public partial class DirectoryStream<T> : Java.Lang.Iterable<T>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DirectoryStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DirectoryStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -423,7 +423,7 @@ public DirectoryStream(params object[] args) : base(args) { }
 
     #region FileAlreadyExistsException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileAlreadyExistsException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileAlreadyExistsException.html"/>
     /// </summary>
     public partial class FileAlreadyExistsException : Java.Nio.File.FileSystemException
     {
@@ -440,7 +440,7 @@ public partial class FileAlreadyExistsException : Java.Nio.File.FileSystemExcept
 
     #region Files
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/Files.html"/>
     /// </summary>
     public partial class Files : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Files>
     {
@@ -484,7 +484,7 @@ public Files(params object[] args) : base(args) { }
 
     #region FileStore
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html"/>
     /// </summary>
     public partial class FileStore : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileStore>
     {
@@ -492,12 +492,12 @@ public partial class FileStore : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileSto
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileStore() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileStore class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileStore(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -530,7 +530,7 @@ public FileStore(params object[] args) : base(args) { }
 
     #region FileSystem
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html"/>
     /// </summary>
     public partial class FileSystem : Java.Io.Closeable
     {
@@ -538,12 +538,12 @@ public partial class FileSystem : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileSystem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileSystem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileSystem() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileSystem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileSystem class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileSystem(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -576,7 +576,7 @@ public FileSystem(params object[] args) : base(args) { }
 
     #region FileSystemAlreadyExistsException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystemAlreadyExistsException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileSystemAlreadyExistsException.html"/>
     /// </summary>
     public partial class FileSystemAlreadyExistsException : Java.Lang.RuntimeException
     {
@@ -593,7 +593,7 @@ public partial class FileSystemAlreadyExistsException : Java.Lang.RuntimeExcepti
 
     #region FileSystemException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystemException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileSystemException.html"/>
     /// </summary>
     public partial class FileSystemException : Java.Io.IOException
     {
@@ -610,7 +610,7 @@ public partial class FileSystemException : Java.Io.IOException
 
     #region FileSystemLoopException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystemLoopException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileSystemLoopException.html"/>
     /// </summary>
     public partial class FileSystemLoopException : Java.Nio.File.FileSystemException
     {
@@ -627,7 +627,7 @@ public partial class FileSystemLoopException : Java.Nio.File.FileSystemException
 
     #region FileSystemNotFoundException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystemNotFoundException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileSystemNotFoundException.html"/>
     /// </summary>
     public partial class FileSystemNotFoundException : Java.Lang.RuntimeException
     {
@@ -644,7 +644,7 @@ public partial class FileSystemNotFoundException : Java.Lang.RuntimeException
 
     #region FileSystems
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileSystems.html"/>
     /// </summary>
     public partial class FileSystems : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileSystems>
     {
@@ -688,7 +688,7 @@ public FileSystems(params object[] args) : base(args) { }
 
     #region FileVisitOption
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitOption.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitOption.html"/>
     /// </summary>
     public partial class FileVisitOption : Java.Lang.Enum<Java.Nio.File.FileVisitOption>
     {
@@ -732,7 +732,7 @@ public FileVisitOption(params object[] args) : base(args) { }
 
     #region FileVisitor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html"/>
     /// </summary>
     public partial class FileVisitor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileVisitor>
     {
@@ -740,12 +740,12 @@ public partial class FileVisitor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileVisitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileVisitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileVisitor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileVisitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileVisitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileVisitor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -778,7 +778,7 @@ public FileVisitor(params object[] args) : base(args) { }
 
     #region FileVisitor<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class FileVisitor<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileVisitor<T>>
@@ -787,12 +787,12 @@ public partial class FileVisitor<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Fi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileVisitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileVisitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileVisitor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileVisitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileVisitor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileVisitor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -825,7 +825,7 @@ public FileVisitor(params object[] args) : base(args) { }
 
     #region FileVisitResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitResult.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitResult.html"/>
     /// </summary>
     public partial class FileVisitResult : Java.Lang.Enum<Java.Nio.File.FileVisitResult>
     {
@@ -869,7 +869,7 @@ public FileVisitResult(params object[] args) : base(args) { }
 
     #region InvalidPathException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/InvalidPathException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/InvalidPathException.html"/>
     /// </summary>
     public partial class InvalidPathException : Java.Lang.IllegalArgumentException
     {
@@ -886,7 +886,7 @@ public partial class InvalidPathException : Java.Lang.IllegalArgumentException
 
     #region LinkOption
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/LinkOption.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/LinkOption.html"/>
     /// </summary>
     public partial class LinkOption : Java.Lang.Enum<Java.Nio.File.LinkOption>
     {
@@ -930,7 +930,7 @@ public LinkOption(params object[] args) : base(args) { }
 
     #region LinkPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/LinkPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/LinkPermission.html"/>
     /// </summary>
     public partial class LinkPermission : Java.Security.BasicPermission
     {
@@ -974,7 +974,7 @@ public LinkPermission(params object[] args) : base(args) { }
 
     #region NoSuchFileException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/NoSuchFileException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/NoSuchFileException.html"/>
     /// </summary>
     public partial class NoSuchFileException : Java.Nio.File.FileSystemException
     {
@@ -991,7 +991,7 @@ public partial class NoSuchFileException : Java.Nio.File.FileSystemException
 
     #region NotDirectoryException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/NotDirectoryException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/NotDirectoryException.html"/>
     /// </summary>
     public partial class NotDirectoryException : Java.Nio.File.FileSystemException
     {
@@ -1008,7 +1008,7 @@ public partial class NotDirectoryException : Java.Nio.File.FileSystemException
 
     #region NotLinkException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/NotLinkException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/NotLinkException.html"/>
     /// </summary>
     public partial class NotLinkException : Java.Nio.File.FileSystemException
     {
@@ -1025,7 +1025,7 @@ public partial class NotLinkException : Java.Nio.File.FileSystemException
 
     #region OpenOption
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/OpenOption.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/OpenOption.html"/>
     /// </summary>
     public partial class OpenOption : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OpenOption>
     {
@@ -1033,12 +1033,12 @@ public partial class OpenOption : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OpenOp
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("OpenOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OpenOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OpenOption() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("OpenOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("OpenOption class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public OpenOption(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1071,7 +1071,7 @@ public OpenOption(params object[] args) : base(args) { }
 
     #region Path
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/Path.html"/>
     /// </summary>
     public partial class Path : Java.Lang.Iterable<Java.Nio.File.Path>
     {
@@ -1079,12 +1079,12 @@ public partial class Path : Java.Lang.Iterable<Java.Nio.File.Path>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Path class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Path class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Path() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Path class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Path class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Path(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1117,7 +1117,7 @@ public Path(params object[] args) : base(args) { }
 
     #region PathMatcher
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/PathMatcher.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/PathMatcher.html"/>
     /// </summary>
     public partial class PathMatcher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PathMatcher>
     {
@@ -1125,12 +1125,12 @@ public partial class PathMatcher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PathM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PathMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PathMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PathMatcher() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PathMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PathMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PathMatcher(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1163,7 +1163,7 @@ public PathMatcher(params object[] args) : base(args) { }
 
     #region Paths
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Paths.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/Paths.html"/>
     /// </summary>
     public partial class Paths : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Paths>
     {
@@ -1207,7 +1207,7 @@ public Paths(params object[] args) : base(args) { }
 
     #region ProviderMismatchException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/ProviderMismatchException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/ProviderMismatchException.html"/>
     /// </summary>
     public partial class ProviderMismatchException : Java.Lang.IllegalArgumentException
     {
@@ -1224,7 +1224,7 @@ public partial class ProviderMismatchException : Java.Lang.IllegalArgumentExcept
 
     #region ProviderNotFoundException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/ProviderNotFoundException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/ProviderNotFoundException.html"/>
     /// </summary>
     public partial class ProviderNotFoundException : Java.Lang.RuntimeException
     {
@@ -1241,7 +1241,7 @@ public partial class ProviderNotFoundException : Java.Lang.RuntimeException
 
     #region ReadOnlyFileSystemException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/ReadOnlyFileSystemException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/ReadOnlyFileSystemException.html"/>
     /// </summary>
     public partial class ReadOnlyFileSystemException : Java.Lang.UnsupportedOperationException
     {
@@ -1258,7 +1258,7 @@ public partial class ReadOnlyFileSystemException : Java.Lang.UnsupportedOperatio
 
     #region SecureDirectoryStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html"/>
     /// </summary>
     public partial class SecureDirectoryStream : Java.Nio.File.DirectoryStream
     {
@@ -1266,12 +1266,12 @@ public partial class SecureDirectoryStream : Java.Nio.File.DirectoryStream
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SecureDirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecureDirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecureDirectoryStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SecureDirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecureDirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecureDirectoryStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1304,7 +1304,7 @@ public SecureDirectoryStream(params object[] args) : base(args) { }
 
     #region SecureDirectoryStream<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class SecureDirectoryStream<T> : Java.Nio.File.DirectoryStream<T>
@@ -1313,12 +1313,12 @@ public partial class SecureDirectoryStream<T> : Java.Nio.File.DirectoryStream<T>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SecureDirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecureDirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecureDirectoryStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SecureDirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecureDirectoryStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecureDirectoryStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1351,7 +1351,7 @@ public SecureDirectoryStream(params object[] args) : base(args) { }
 
     #region SimpleFileVisitor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html"/>
     /// </summary>
     public partial class SimpleFileVisitor : Java.Nio.File.FileVisitor
     {
@@ -1395,7 +1395,7 @@ public SimpleFileVisitor(params object[] args) : base(args) { }
 
     #region SimpleFileVisitor<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class SimpleFileVisitor<T> : Java.Nio.File.FileVisitor<T>
@@ -1440,7 +1440,7 @@ public SimpleFileVisitor(params object[] args) : base(args) { }
 
     #region StandardCopyOption
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardCopyOption.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/StandardCopyOption.html"/>
     /// </summary>
     public partial class StandardCopyOption : Java.Lang.Enum<Java.Nio.File.StandardCopyOption>
     {
@@ -1484,7 +1484,7 @@ public StandardCopyOption(params object[] args) : base(args) { }
 
     #region StandardOpenOption
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html"/>
     /// </summary>
     public partial class StandardOpenOption : Java.Lang.Enum<Java.Nio.File.StandardOpenOption>
     {
@@ -1528,7 +1528,7 @@ public StandardOpenOption(params object[] args) : base(args) { }
 
     #region StandardWatchEventKinds
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardWatchEventKinds.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/StandardWatchEventKinds.html"/>
     /// </summary>
     public partial class StandardWatchEventKinds : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StandardWatchEventKinds>
     {
@@ -1572,7 +1572,7 @@ public StandardWatchEventKinds(params object[] args) : base(args) { }
 
     #region Watchable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Watchable.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/Watchable.html"/>
     /// </summary>
     public partial class Watchable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Watchable>
     {
@@ -1580,12 +1580,12 @@ public partial class Watchable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Watchab
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Watchable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Watchable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Watchable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Watchable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Watchable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Watchable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1618,7 +1618,7 @@ public Watchable(params object[] args) : base(args) { }
 
     #region WatchEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.html"/>
     /// </summary>
     public partial class WatchEvent : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WatchEvent>
     {
@@ -1626,12 +1626,12 @@ public partial class WatchEvent : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WatchE
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WatchEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WatchEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WatchEvent() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WatchEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WatchEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WatchEvent(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1660,7 +1660,7 @@ public WatchEvent(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Kind
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.Kind.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.Kind.html"/>
         /// </summary>
         public partial class Kind : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Kind>
         {
@@ -1668,12 +1668,12 @@ public partial class Kind : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Kind>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Kind class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Kind class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Kind() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Kind class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Kind class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Kind(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1706,7 +1706,7 @@ public Kind(params object[] args) : base(args) { }
 
         #region Kind<T>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.Kind.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.Kind.html"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         public partial class Kind<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Kind<T>>
@@ -1715,12 +1715,12 @@ public partial class Kind<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Kind<T>>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Kind class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Kind class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Kind() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Kind class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Kind class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Kind(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1753,7 +1753,7 @@ public Kind(params object[] args) : base(args) { }
 
         #region Modifier
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.Modifier.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.Modifier.html"/>
         /// </summary>
         public partial class Modifier : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Modifier>
         {
@@ -1761,12 +1761,12 @@ public partial class Modifier : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Modifier
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Modifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Modifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Modifier() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Modifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Modifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Modifier(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1803,7 +1803,7 @@ public Modifier(params object[] args) : base(args) { }
 
     #region WatchEvent<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class WatchEvent<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WatchEvent<T>>
@@ -1812,12 +1812,12 @@ public partial class WatchEvent<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Wat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WatchEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WatchEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WatchEvent() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WatchEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WatchEvent class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WatchEvent(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1850,7 +1850,7 @@ public WatchEvent(params object[] args) : base(args) { }
 
     #region WatchKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/WatchKey.html"/>
     /// </summary>
     public partial class WatchKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WatchKey>
     {
@@ -1858,12 +1858,12 @@ public partial class WatchKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WatchKey
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WatchKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WatchKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WatchKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WatchKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WatchKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WatchKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1896,7 +1896,7 @@ public WatchKey(params object[] args) : base(args) { }
 
     #region WatchService
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchService.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/WatchService.html"/>
     /// </summary>
     public partial class WatchService : Java.Io.Closeable
     {
@@ -1904,12 +1904,12 @@ public partial class WatchService : Java.Io.Closeable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("WatchService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WatchService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WatchService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("WatchService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("WatchService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public WatchService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntry.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntry.cs
index 9012a9844..f6ab8c841 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntry.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntry.cs
@@ -42,7 +42,7 @@ public partial class AclEntry
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.html#newBuilder()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.html#newBuilder()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntry.Builder"/></returns>
         public static Java.Nio.File.Attribute.AclEntry.Builder NewBuilder()
@@ -50,7 +50,7 @@ public static Java.Nio.File.Attribute.AclEntry.Builder NewBuilder()
             return SExecuteWithSignature<Java.Nio.File.Attribute.AclEntry.Builder>(LocalBridgeClazz, "newBuilder", "()Ljava/nio/file/attribute/AclEntry$Builder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.html#newBuilder(java.nio.file.attribute.AclEntry)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.html#newBuilder(java.nio.file.attribute.AclEntry)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Attribute.AclEntry"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntry.Builder"/></returns>
@@ -63,7 +63,7 @@ public static Java.Nio.File.Attribute.AclEntry.Builder NewBuilder(Java.Nio.File.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.html#type()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.html#type()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntryType"/></returns>
         public Java.Nio.File.Attribute.AclEntryType Type()
@@ -71,7 +71,7 @@ public Java.Nio.File.Attribute.AclEntryType Type()
             return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntryType>("type", "()Ljava/nio/file/attribute/AclEntryType;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.html#principal()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.html#principal()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.UserPrincipal"/></returns>
         public Java.Nio.File.Attribute.UserPrincipal Principal()
@@ -79,7 +79,7 @@ public Java.Nio.File.Attribute.UserPrincipal Principal()
             return IExecuteWithSignature<Java.Nio.File.Attribute.UserPrincipal>("principal", "()Ljava/nio/file/attribute/UserPrincipal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.html#flags()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.html#flags()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Nio.File.Attribute.AclEntryFlag> Flags()
@@ -87,7 +87,7 @@ public Java.Nio.File.Attribute.UserPrincipal Principal()
             return IExecuteWithSignature<Java.Util.Set<Java.Nio.File.Attribute.AclEntryFlag>>("flags", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.html#permissions()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.html#permissions()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Nio.File.Attribute.AclEntryPermission> Permissions()
@@ -119,7 +119,7 @@ public partial class Builder
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.Builder.html#build()"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.Builder.html#build()"/>
             /// </summary>
             /// <returns><see cref="Java.Nio.File.Attribute.AclEntry"/></returns>
             public Java.Nio.File.Attribute.AclEntry Build()
@@ -127,7 +127,7 @@ public Java.Nio.File.Attribute.AclEntry Build()
                 return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntry>("build", "()Ljava/nio/file/attribute/AclEntry;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.Builder.html#setFlags(java.nio.file.attribute.AclEntryFlag[])"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.Builder.html#setFlags(java.nio.file.attribute.AclEntryFlag[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Nio.File.Attribute.AclEntryFlag"/></param>
             /// <returns><see cref="Java.Nio.File.Attribute.AclEntry.Builder"/></returns>
@@ -136,7 +136,7 @@ public Java.Nio.File.Attribute.AclEntry.Builder SetFlags(params Java.Nio.File.At
                 if (arg0.Length == 0) return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntry.Builder>("setFlags", "([Ljava/nio/file/attribute/AclEntryFlag;)Ljava/nio/file/attribute/AclEntry$Builder;"); else return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntry.Builder>("setFlags", "([Ljava/nio/file/attribute/AclEntryFlag;)Ljava/nio/file/attribute/AclEntry$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.Builder.html#setFlags(java.util.Set)"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.Builder.html#setFlags(java.util.Set)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Set"/></param>
             /// <returns><see cref="Java.Nio.File.Attribute.AclEntry.Builder"/></returns>
@@ -145,7 +145,7 @@ public Java.Nio.File.Attribute.AclEntry.Builder SetFlags(Java.Util.Set<Java.Nio.
                 return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntry.Builder>("setFlags", "(Ljava/util/Set;)Ljava/nio/file/attribute/AclEntry$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.Builder.html#setPermissions(java.nio.file.attribute.AclEntryPermission[])"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.Builder.html#setPermissions(java.nio.file.attribute.AclEntryPermission[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Nio.File.Attribute.AclEntryPermission"/></param>
             /// <returns><see cref="Java.Nio.File.Attribute.AclEntry.Builder"/></returns>
@@ -154,7 +154,7 @@ public Java.Nio.File.Attribute.AclEntry.Builder SetPermissions(params Java.Nio.F
                 if (arg0.Length == 0) return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntry.Builder>("setPermissions", "([Ljava/nio/file/attribute/AclEntryPermission;)Ljava/nio/file/attribute/AclEntry$Builder;"); else return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntry.Builder>("setPermissions", "([Ljava/nio/file/attribute/AclEntryPermission;)Ljava/nio/file/attribute/AclEntry$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.Builder.html#setPermissions(java.util.Set)"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.Builder.html#setPermissions(java.util.Set)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Set"/></param>
             /// <returns><see cref="Java.Nio.File.Attribute.AclEntry.Builder"/></returns>
@@ -163,7 +163,7 @@ public Java.Nio.File.Attribute.AclEntry.Builder SetPermissions(Java.Util.Set<Jav
                 return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntry.Builder>("setPermissions", "(Ljava/util/Set;)Ljava/nio/file/attribute/AclEntry$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.Builder.html#setPrincipal(java.nio.file.attribute.UserPrincipal)"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.Builder.html#setPrincipal(java.nio.file.attribute.UserPrincipal)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Nio.File.Attribute.UserPrincipal"/></param>
             /// <returns><see cref="Java.Nio.File.Attribute.AclEntry.Builder"/></returns>
@@ -172,7 +172,7 @@ public Java.Nio.File.Attribute.AclEntry.Builder SetPrincipal(Java.Nio.File.Attri
                 return IExecuteWithSignature<Java.Nio.File.Attribute.AclEntry.Builder>("setPrincipal", "(Ljava/nio/file/attribute/UserPrincipal;)Ljava/nio/file/attribute/AclEntry$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.Builder.html#setType(java.nio.file.attribute.AclEntryType)"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.Builder.html#setType(java.nio.file.attribute.AclEntryType)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Nio.File.Attribute.AclEntryType"/></param>
             /// <returns><see cref="Java.Nio.File.Attribute.AclEntry.Builder"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryFlag.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryFlag.cs
index 5cb5911ea..40de7cd58 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryFlag.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryFlag.cs
@@ -38,25 +38,25 @@ public partial class AclEntryFlag
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryFlag.html#DIRECTORY_INHERIT"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryFlag.html#DIRECTORY_INHERIT"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryFlag DIRECTORY_INHERIT { get { if (!_DIRECTORY_INHERITReady) { _DIRECTORY_INHERITContent = SGetField<Java.Nio.File.Attribute.AclEntryFlag>(LocalBridgeClazz, "DIRECTORY_INHERIT"); _DIRECTORY_INHERITReady = true; } return _DIRECTORY_INHERITContent; } }
         private static Java.Nio.File.Attribute.AclEntryFlag _DIRECTORY_INHERITContent = default;
         private static bool _DIRECTORY_INHERITReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryFlag.html#FILE_INHERIT"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryFlag.html#FILE_INHERIT"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryFlag FILE_INHERIT { get { if (!_FILE_INHERITReady) { _FILE_INHERITContent = SGetField<Java.Nio.File.Attribute.AclEntryFlag>(LocalBridgeClazz, "FILE_INHERIT"); _FILE_INHERITReady = true; } return _FILE_INHERITContent; } }
         private static Java.Nio.File.Attribute.AclEntryFlag _FILE_INHERITContent = default;
         private static bool _FILE_INHERITReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryFlag.html#INHERIT_ONLY"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryFlag.html#INHERIT_ONLY"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryFlag INHERIT_ONLY { get { if (!_INHERIT_ONLYReady) { _INHERIT_ONLYContent = SGetField<Java.Nio.File.Attribute.AclEntryFlag>(LocalBridgeClazz, "INHERIT_ONLY"); _INHERIT_ONLYReady = true; } return _INHERIT_ONLYContent; } }
         private static Java.Nio.File.Attribute.AclEntryFlag _INHERIT_ONLYContent = default;
         private static bool _INHERIT_ONLYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryFlag.html#NO_PROPAGATE_INHERIT"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryFlag.html#NO_PROPAGATE_INHERIT"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryFlag NO_PROPAGATE_INHERIT { get { if (!_NO_PROPAGATE_INHERITReady) { _NO_PROPAGATE_INHERITContent = SGetField<Java.Nio.File.Attribute.AclEntryFlag>(LocalBridgeClazz, "NO_PROPAGATE_INHERIT"); _NO_PROPAGATE_INHERITReady = true; } return _NO_PROPAGATE_INHERITContent; } }
         private static Java.Nio.File.Attribute.AclEntryFlag _NO_PROPAGATE_INHERITContent = default;
@@ -66,7 +66,7 @@ public partial class AclEntryFlag
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryFlag.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryFlag.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntryFlag"/></returns>
@@ -75,7 +75,7 @@ public static Java.Nio.File.Attribute.AclEntryFlag ValueOf(Java.Lang.String arg0
             return SExecuteWithSignature<Java.Nio.File.Attribute.AclEntryFlag>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/attribute/AclEntryFlag;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryFlag.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryFlag.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntryFlag"/></returns>
         public static Java.Nio.File.Attribute.AclEntryFlag[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryPermission.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryPermission.cs
index 04c10b353..66c443a1e 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryPermission.cs
@@ -38,103 +38,103 @@ public partial class AclEntryPermission
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#ADD_FILE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#ADD_FILE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission ADD_FILE { get { if (!_ADD_FILEReady) { _ADD_FILEContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "ADD_FILE"); _ADD_FILEReady = true; } return _ADD_FILEContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _ADD_FILEContent = default;
         private static bool _ADD_FILEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#ADD_SUBDIRECTORY"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#ADD_SUBDIRECTORY"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission ADD_SUBDIRECTORY { get { if (!_ADD_SUBDIRECTORYReady) { _ADD_SUBDIRECTORYContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "ADD_SUBDIRECTORY"); _ADD_SUBDIRECTORYReady = true; } return _ADD_SUBDIRECTORYContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _ADD_SUBDIRECTORYContent = default;
         private static bool _ADD_SUBDIRECTORYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#APPEND_DATA"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#APPEND_DATA"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission APPEND_DATA { get { if (!_APPEND_DATAReady) { _APPEND_DATAContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "APPEND_DATA"); _APPEND_DATAReady = true; } return _APPEND_DATAContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _APPEND_DATAContent = default;
         private static bool _APPEND_DATAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#DELETE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#DELETE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission DELETE { get { if (!_DELETEReady) { _DELETEContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "DELETE"); _DELETEReady = true; } return _DELETEContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _DELETEContent = default;
         private static bool _DELETEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#DELETE_CHILD"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#DELETE_CHILD"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission DELETE_CHILD { get { if (!_DELETE_CHILDReady) { _DELETE_CHILDContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "DELETE_CHILD"); _DELETE_CHILDReady = true; } return _DELETE_CHILDContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _DELETE_CHILDContent = default;
         private static bool _DELETE_CHILDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#EXECUTE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#EXECUTE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission EXECUTE { get { if (!_EXECUTEReady) { _EXECUTEContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "EXECUTE"); _EXECUTEReady = true; } return _EXECUTEContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _EXECUTEContent = default;
         private static bool _EXECUTEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#LIST_DIRECTORY"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#LIST_DIRECTORY"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission LIST_DIRECTORY { get { if (!_LIST_DIRECTORYReady) { _LIST_DIRECTORYContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "LIST_DIRECTORY"); _LIST_DIRECTORYReady = true; } return _LIST_DIRECTORYContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _LIST_DIRECTORYContent = default;
         private static bool _LIST_DIRECTORYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#READ_ACL"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#READ_ACL"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission READ_ACL { get { if (!_READ_ACLReady) { _READ_ACLContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "READ_ACL"); _READ_ACLReady = true; } return _READ_ACLContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _READ_ACLContent = default;
         private static bool _READ_ACLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#READ_ATTRIBUTES"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#READ_ATTRIBUTES"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission READ_ATTRIBUTES { get { if (!_READ_ATTRIBUTESReady) { _READ_ATTRIBUTESContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "READ_ATTRIBUTES"); _READ_ATTRIBUTESReady = true; } return _READ_ATTRIBUTESContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _READ_ATTRIBUTESContent = default;
         private static bool _READ_ATTRIBUTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#READ_DATA"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#READ_DATA"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission READ_DATA { get { if (!_READ_DATAReady) { _READ_DATAContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "READ_DATA"); _READ_DATAReady = true; } return _READ_DATAContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _READ_DATAContent = default;
         private static bool _READ_DATAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#READ_NAMED_ATTRS"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#READ_NAMED_ATTRS"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission READ_NAMED_ATTRS { get { if (!_READ_NAMED_ATTRSReady) { _READ_NAMED_ATTRSContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "READ_NAMED_ATTRS"); _READ_NAMED_ATTRSReady = true; } return _READ_NAMED_ATTRSContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _READ_NAMED_ATTRSContent = default;
         private static bool _READ_NAMED_ATTRSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#SYNCHRONIZE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#SYNCHRONIZE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission SYNCHRONIZE { get { if (!_SYNCHRONIZEReady) { _SYNCHRONIZEContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "SYNCHRONIZE"); _SYNCHRONIZEReady = true; } return _SYNCHRONIZEContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _SYNCHRONIZEContent = default;
         private static bool _SYNCHRONIZEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#WRITE_ACL"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#WRITE_ACL"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission WRITE_ACL { get { if (!_WRITE_ACLReady) { _WRITE_ACLContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "WRITE_ACL"); _WRITE_ACLReady = true; } return _WRITE_ACLContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _WRITE_ACLContent = default;
         private static bool _WRITE_ACLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#WRITE_ATTRIBUTES"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#WRITE_ATTRIBUTES"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission WRITE_ATTRIBUTES { get { if (!_WRITE_ATTRIBUTESReady) { _WRITE_ATTRIBUTESContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "WRITE_ATTRIBUTES"); _WRITE_ATTRIBUTESReady = true; } return _WRITE_ATTRIBUTESContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _WRITE_ATTRIBUTESContent = default;
         private static bool _WRITE_ATTRIBUTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#WRITE_DATA"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#WRITE_DATA"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission WRITE_DATA { get { if (!_WRITE_DATAReady) { _WRITE_DATAContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "WRITE_DATA"); _WRITE_DATAReady = true; } return _WRITE_DATAContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _WRITE_DATAContent = default;
         private static bool _WRITE_DATAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#WRITE_NAMED_ATTRS"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#WRITE_NAMED_ATTRS"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission WRITE_NAMED_ATTRS { get { if (!_WRITE_NAMED_ATTRSReady) { _WRITE_NAMED_ATTRSContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "WRITE_NAMED_ATTRS"); _WRITE_NAMED_ATTRSReady = true; } return _WRITE_NAMED_ATTRSContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _WRITE_NAMED_ATTRSContent = default;
         private static bool _WRITE_NAMED_ATTRSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#WRITE_OWNER"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#WRITE_OWNER"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryPermission WRITE_OWNER { get { if (!_WRITE_OWNERReady) { _WRITE_OWNERContent = SGetField<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "WRITE_OWNER"); _WRITE_OWNERReady = true; } return _WRITE_OWNERContent; } }
         private static Java.Nio.File.Attribute.AclEntryPermission _WRITE_OWNERContent = default;
@@ -144,7 +144,7 @@ public partial class AclEntryPermission
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntryPermission"/></returns>
@@ -153,7 +153,7 @@ public static Java.Nio.File.Attribute.AclEntryPermission ValueOf(Java.Lang.Strin
             return SExecuteWithSignature<Java.Nio.File.Attribute.AclEntryPermission>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/attribute/AclEntryPermission;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntryPermission"/></returns>
         public static Java.Nio.File.Attribute.AclEntryPermission[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryType.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryType.cs
index bead66ff9..3c3846583 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryType.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclEntryType.cs
@@ -38,25 +38,25 @@ public partial class AclEntryType
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryType.html#ALARM"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryType.html#ALARM"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryType ALARM { get { if (!_ALARMReady) { _ALARMContent = SGetField<Java.Nio.File.Attribute.AclEntryType>(LocalBridgeClazz, "ALARM"); _ALARMReady = true; } return _ALARMContent; } }
         private static Java.Nio.File.Attribute.AclEntryType _ALARMContent = default;
         private static bool _ALARMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryType.html#ALLOW"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryType.html#ALLOW"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryType ALLOW { get { if (!_ALLOWReady) { _ALLOWContent = SGetField<Java.Nio.File.Attribute.AclEntryType>(LocalBridgeClazz, "ALLOW"); _ALLOWReady = true; } return _ALLOWContent; } }
         private static Java.Nio.File.Attribute.AclEntryType _ALLOWContent = default;
         private static bool _ALLOWReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryType.html#AUDIT"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryType.html#AUDIT"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryType AUDIT { get { if (!_AUDITReady) { _AUDITContent = SGetField<Java.Nio.File.Attribute.AclEntryType>(LocalBridgeClazz, "AUDIT"); _AUDITReady = true; } return _AUDITContent; } }
         private static Java.Nio.File.Attribute.AclEntryType _AUDITContent = default;
         private static bool _AUDITReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryType.html#DENY"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryType.html#DENY"/>
         /// </summary>
         public static Java.Nio.File.Attribute.AclEntryType DENY { get { if (!_DENYReady) { _DENYContent = SGetField<Java.Nio.File.Attribute.AclEntryType>(LocalBridgeClazz, "DENY"); _DENYReady = true; } return _DENYContent; } }
         private static Java.Nio.File.Attribute.AclEntryType _DENYContent = default;
@@ -66,7 +66,7 @@ public partial class AclEntryType
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryType.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryType.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntryType"/></returns>
@@ -75,7 +75,7 @@ public static Java.Nio.File.Attribute.AclEntryType ValueOf(Java.Lang.String arg0
             return SExecuteWithSignature<Java.Nio.File.Attribute.AclEntryType>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/attribute/AclEntryType;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryType.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryType.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.AclEntryType"/></returns>
         public static Java.Nio.File.Attribute.AclEntryType[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclFileAttributeView.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclFileAttributeView.cs
index 784c00adf..b0959c542 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclFileAttributeView.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AclFileAttributeView.cs
@@ -64,19 +64,30 @@ public partial class AclFileAttributeView : Java.Nio.File.Attribute.IAclFileAttr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclFileAttributeView.html#getAcl()"/> <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclFileAttributeView.html#setAcl(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclFileAttributeView.html#name()"/>
         /// </summary>
-        public Java.Util.List<Java.Nio.File.Attribute.AclEntry> Acl
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String Name()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Nio.File.Attribute.AclEntry>>("getAcl", "()Ljava/util/List;"); } set { IExecuteWithSignature("setAcl", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclFileAttributeView.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclFileAttributeView.html#getAcl()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Name()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.List<Java.Nio.File.Attribute.AclEntry> GetAcl()
         {
-            return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Util.List<Java.Nio.File.Attribute.AclEntry>>("getAcl", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclFileAttributeView.html#setAcl(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetAcl(Java.Util.List<Java.Nio.File.Attribute.AclEntry> arg0)
+        {
+            IExecuteWithSignature("setAcl", "(Ljava/util/List;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AllPackageClasses.cs
index 844d8b443..dc02c8ec8 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Nio.File.Attribute
 {
     #region AclEntry
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.html"/>
     /// </summary>
     public partial class AclEntry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AclEntry>
     {
@@ -68,7 +68,7 @@ public AclEntry(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Builder
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntry.Builder.html"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntry.Builder.html"/>
         /// </summary>
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
@@ -116,7 +116,7 @@ public Builder(params object[] args) : base(args) { }
 
     #region AclEntryFlag
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryFlag.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryFlag.html"/>
     /// </summary>
     public partial class AclEntryFlag : Java.Lang.Enum<Java.Nio.File.Attribute.AclEntryFlag>
     {
@@ -160,7 +160,7 @@ public AclEntryFlag(params object[] args) : base(args) { }
 
     #region AclEntryPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryPermission.html"/>
     /// </summary>
     public partial class AclEntryPermission : Java.Lang.Enum<Java.Nio.File.Attribute.AclEntryPermission>
     {
@@ -204,7 +204,7 @@ public AclEntryPermission(params object[] args) : base(args) { }
 
     #region AclEntryType
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclEntryType.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclEntryType.html"/>
     /// </summary>
     public partial class AclEntryType : Java.Lang.Enum<Java.Nio.File.Attribute.AclEntryType>
     {
@@ -248,7 +248,7 @@ public AclEntryType(params object[] args) : base(args) { }
 
     #region AclFileAttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AclFileAttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AclFileAttributeView.html"/>
     /// </summary>
     public partial class AclFileAttributeView : Java.Nio.File.Attribute.FileOwnerAttributeView
     {
@@ -256,12 +256,12 @@ public partial class AclFileAttributeView : Java.Nio.File.Attribute.FileOwnerAtt
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AclFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AclFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AclFileAttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AclFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AclFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AclFileAttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -294,7 +294,7 @@ public AclFileAttributeView(params object[] args) : base(args) { }
 
     #region AttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AttributeView.html"/>
     /// </summary>
     public partial class AttributeView : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AttributeView>
     {
@@ -302,12 +302,12 @@ public partial class AttributeView : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Att
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -340,7 +340,7 @@ public AttributeView(params object[] args) : base(args) { }
 
     #region BasicFileAttributes
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html"/>
     /// </summary>
     public partial class BasicFileAttributes : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BasicFileAttributes>
     {
@@ -348,12 +348,12 @@ public partial class BasicFileAttributes : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BasicFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BasicFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BasicFileAttributes() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BasicFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BasicFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BasicFileAttributes(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -386,7 +386,7 @@ public BasicFileAttributes(params object[] args) : base(args) { }
 
     #region BasicFileAttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributeView.html"/>
     /// </summary>
     public partial class BasicFileAttributeView : Java.Nio.File.Attribute.FileAttributeView
     {
@@ -394,12 +394,12 @@ public partial class BasicFileAttributeView : Java.Nio.File.Attribute.FileAttrib
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BasicFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BasicFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BasicFileAttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BasicFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BasicFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BasicFileAttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -432,7 +432,7 @@ public BasicFileAttributeView(params object[] args) : base(args) { }
 
     #region DosFileAttributes
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributes.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributes.html"/>
     /// </summary>
     public partial class DosFileAttributes : Java.Nio.File.Attribute.BasicFileAttributes
     {
@@ -440,12 +440,12 @@ public partial class DosFileAttributes : Java.Nio.File.Attribute.BasicFileAttrib
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DosFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DosFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DosFileAttributes() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DosFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DosFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DosFileAttributes(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -478,7 +478,7 @@ public DosFileAttributes(params object[] args) : base(args) { }
 
     #region DosFileAttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributeView.html"/>
     /// </summary>
     public partial class DosFileAttributeView : Java.Nio.File.Attribute.BasicFileAttributeView
     {
@@ -486,12 +486,12 @@ public partial class DosFileAttributeView : Java.Nio.File.Attribute.BasicFileAtt
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DosFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DosFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DosFileAttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DosFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DosFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DosFileAttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -524,7 +524,7 @@ public DosFileAttributeView(params object[] args) : base(args) { }
 
     #region FileAttribute
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileAttribute.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileAttribute.html"/>
     /// </summary>
     public partial class FileAttribute : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileAttribute>
     {
@@ -532,12 +532,12 @@ public partial class FileAttribute : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Fil
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileAttribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileAttribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileAttribute() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileAttribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileAttribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileAttribute(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -570,7 +570,7 @@ public FileAttribute(params object[] args) : base(args) { }
 
     #region FileAttribute<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileAttribute.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileAttribute.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class FileAttribute<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileAttribute<T>>
@@ -579,12 +579,12 @@ public partial class FileAttribute<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileAttribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileAttribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileAttribute() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileAttribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileAttribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileAttribute(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -617,7 +617,7 @@ public FileAttribute(params object[] args) : base(args) { }
 
     #region FileAttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileAttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileAttributeView.html"/>
     /// </summary>
     public partial class FileAttributeView : Java.Nio.File.Attribute.AttributeView
     {
@@ -625,12 +625,12 @@ public partial class FileAttributeView : Java.Nio.File.Attribute.AttributeView
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileAttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileAttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -663,7 +663,7 @@ public FileAttributeView(params object[] args) : base(args) { }
 
     #region FileOwnerAttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileOwnerAttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileOwnerAttributeView.html"/>
     /// </summary>
     public partial class FileOwnerAttributeView : Java.Nio.File.Attribute.FileAttributeView
     {
@@ -671,12 +671,12 @@ public partial class FileOwnerAttributeView : Java.Nio.File.Attribute.FileAttrib
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileOwnerAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileOwnerAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileOwnerAttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileOwnerAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileOwnerAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileOwnerAttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -709,7 +709,7 @@ public FileOwnerAttributeView(params object[] args) : base(args) { }
 
     #region FileStoreAttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileStoreAttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileStoreAttributeView.html"/>
     /// </summary>
     public partial class FileStoreAttributeView : Java.Nio.File.Attribute.AttributeView
     {
@@ -717,12 +717,12 @@ public partial class FileStoreAttributeView : Java.Nio.File.Attribute.AttributeV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileStoreAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileStoreAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileStoreAttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileStoreAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileStoreAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileStoreAttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -755,7 +755,7 @@ public FileStoreAttributeView(params object[] args) : base(args) { }
 
     #region FileTime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html"/>
     /// </summary>
     public partial class FileTime : Java.Lang.Comparable<Java.Nio.File.Attribute.FileTime>
     {
@@ -799,7 +799,7 @@ public FileTime(params object[] args) : base(args) { }
 
     #region GroupPrincipal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/GroupPrincipal.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/GroupPrincipal.html"/>
     /// </summary>
     public partial class GroupPrincipal : Java.Nio.File.Attribute.UserPrincipal
     {
@@ -807,12 +807,12 @@ public partial class GroupPrincipal : Java.Nio.File.Attribute.UserPrincipal
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GroupPrincipal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GroupPrincipal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GroupPrincipal() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GroupPrincipal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GroupPrincipal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GroupPrincipal(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -845,7 +845,7 @@ public GroupPrincipal(params object[] args) : base(args) { }
 
     #region PosixFileAttributes
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributes.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributes.html"/>
     /// </summary>
     public partial class PosixFileAttributes : Java.Nio.File.Attribute.BasicFileAttributes
     {
@@ -853,12 +853,12 @@ public partial class PosixFileAttributes : Java.Nio.File.Attribute.BasicFileAttr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PosixFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PosixFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PosixFileAttributes() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PosixFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PosixFileAttributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PosixFileAttributes(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -891,7 +891,7 @@ public PosixFileAttributes(params object[] args) : base(args) { }
 
     #region PosixFileAttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributeView.html"/>
     /// </summary>
     public partial class PosixFileAttributeView : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PosixFileAttributeView>
     {
@@ -899,12 +899,12 @@ public partial class PosixFileAttributeView : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PosixFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PosixFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PosixFileAttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PosixFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PosixFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PosixFileAttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -937,7 +937,7 @@ public PosixFileAttributeView(params object[] args) : base(args) { }
 
     #region PosixFilePermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html"/>
     /// </summary>
     public partial class PosixFilePermission : Java.Lang.Enum<Java.Nio.File.Attribute.PosixFilePermission>
     {
@@ -981,7 +981,7 @@ public PosixFilePermission(params object[] args) : base(args) { }
 
     #region PosixFilePermissions
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermissions.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermissions.html"/>
     /// </summary>
     public partial class PosixFilePermissions : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PosixFilePermissions>
     {
@@ -1025,7 +1025,7 @@ public PosixFilePermissions(params object[] args) : base(args) { }
 
     #region UserDefinedFileAttributeView
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserDefinedFileAttributeView.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserDefinedFileAttributeView.html"/>
     /// </summary>
     public partial class UserDefinedFileAttributeView : Java.Nio.File.Attribute.FileAttributeView
     {
@@ -1033,12 +1033,12 @@ public partial class UserDefinedFileAttributeView : Java.Nio.File.Attribute.File
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UserDefinedFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UserDefinedFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UserDefinedFileAttributeView() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UserDefinedFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UserDefinedFileAttributeView class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UserDefinedFileAttributeView(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1071,7 +1071,7 @@ public UserDefinedFileAttributeView(params object[] args) : base(args) { }
 
     #region UserPrincipal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserPrincipal.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserPrincipal.html"/>
     /// </summary>
     public partial class UserPrincipal : Java.Security.Principal
     {
@@ -1079,12 +1079,12 @@ public partial class UserPrincipal : Java.Security.Principal
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UserPrincipal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UserPrincipal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UserPrincipal() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UserPrincipal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UserPrincipal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UserPrincipal(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1117,7 +1117,7 @@ public UserPrincipal(params object[] args) : base(args) { }
 
     #region UserPrincipalLookupService
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserPrincipalLookupService.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserPrincipalLookupService.html"/>
     /// </summary>
     public partial class UserPrincipalLookupService : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UserPrincipalLookupService>
     {
@@ -1125,12 +1125,12 @@ public partial class UserPrincipalLookupService : MASES.JCOBridge.C2JBridge.JVMB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UserPrincipalLookupService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UserPrincipalLookupService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UserPrincipalLookupService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UserPrincipalLookupService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UserPrincipalLookupService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UserPrincipalLookupService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1163,7 +1163,7 @@ public UserPrincipalLookupService(params object[] args) : base(args) { }
 
     #region UserPrincipalNotFoundException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserPrincipalNotFoundException.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserPrincipalNotFoundException.html"/>
     /// </summary>
     public partial class UserPrincipalNotFoundException : Java.Io.IOException
     {
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AttributeView.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AttributeView.cs
index 39b863b8f..41c80222f 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AttributeView.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/AttributeView.cs
@@ -64,7 +64,7 @@ public partial class AttributeView : Java.Nio.File.Attribute.IAttributeView
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/AttributeView.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/AttributeView.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/BasicFileAttributeView.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/BasicFileAttributeView.cs
index 20ea42221..0c6feede2 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/BasicFileAttributeView.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/BasicFileAttributeView.cs
@@ -64,7 +64,7 @@ public partial class BasicFileAttributeView : Java.Nio.File.Attribute.IBasicFile
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributeView.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributeView.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -72,7 +72,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributeView.html#readAttributes()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributeView.html#readAttributes()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -81,7 +81,7 @@ public Java.Nio.File.Attribute.BasicFileAttributes ReadAttributes()
             return IExecuteWithSignature<Java.Nio.File.Attribute.BasicFileAttributes>("readAttributes", "()Ljava/nio/file/attribute/BasicFileAttributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributeView.html#setTimes(java.nio.file.attribute.FileTime,java.nio.file.attribute.FileTime,java.nio.file.attribute.FileTime)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributeView.html#setTimes(java.nio.file.attribute.FileTime,java.nio.file.attribute.FileTime,java.nio.file.attribute.FileTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/BasicFileAttributes.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/BasicFileAttributes.cs
index bdbae82f1..e46936c2b 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/BasicFileAttributes.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/BasicFileAttributes.cs
@@ -64,7 +64,7 @@ public partial class BasicFileAttributes : Java.Nio.File.Attribute.IBasicFileAtt
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#isDirectory()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#isDirectory()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDirectory()
@@ -72,7 +72,7 @@ public bool IsDirectory()
             return IExecuteWithSignature<bool>("isDirectory", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#isOther()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#isOther()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsOther()
@@ -80,7 +80,7 @@ public bool IsOther()
             return IExecuteWithSignature<bool>("isOther", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#isRegularFile()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#isRegularFile()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsRegularFile()
@@ -88,7 +88,7 @@ public bool IsRegularFile()
             return IExecuteWithSignature<bool>("isRegularFile", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#isSymbolicLink()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#isSymbolicLink()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsSymbolicLink()
@@ -96,7 +96,7 @@ public bool IsSymbolicLink()
             return IExecuteWithSignature<bool>("isSymbolicLink", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#fileKey()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#fileKey()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object FileKey()
@@ -104,7 +104,7 @@ public object FileKey()
             return IExecuteWithSignature("fileKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#creationTime()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#creationTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.FileTime"/></returns>
         public Java.Nio.File.Attribute.FileTime CreationTime()
@@ -112,7 +112,7 @@ public Java.Nio.File.Attribute.FileTime CreationTime()
             return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("creationTime", "()Ljava/nio/file/attribute/FileTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#lastAccessTime()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#lastAccessTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.FileTime"/></returns>
         public Java.Nio.File.Attribute.FileTime LastAccessTime()
@@ -120,7 +120,7 @@ public Java.Nio.File.Attribute.FileTime LastAccessTime()
             return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("lastAccessTime", "()Ljava/nio/file/attribute/FileTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#lastModifiedTime()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#lastModifiedTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.FileTime"/></returns>
         public Java.Nio.File.Attribute.FileTime LastModifiedTime()
@@ -128,7 +128,7 @@ public Java.Nio.File.Attribute.FileTime LastModifiedTime()
             return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("lastModifiedTime", "()Ljava/nio/file/attribute/FileTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/BasicFileAttributes.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/BasicFileAttributes.html#size()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Size()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/DosFileAttributeView.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/DosFileAttributeView.cs
index a7e21c94c..15c771d83 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/DosFileAttributeView.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/DosFileAttributeView.cs
@@ -64,7 +64,7 @@ public partial class DosFileAttributeView : Java.Nio.File.Attribute.IDosFileAttr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributeView.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributeView.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -72,7 +72,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributeView.html#setArchive(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributeView.html#setArchive(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -81,7 +81,7 @@ public void SetArchive(bool arg0)
             IExecuteWithSignature("setArchive", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributeView.html#setHidden(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributeView.html#setHidden(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -90,7 +90,7 @@ public void SetHidden(bool arg0)
             IExecuteWithSignature("setHidden", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributeView.html#setReadOnly(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributeView.html#setReadOnly(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -99,7 +99,7 @@ public void SetReadOnly(bool arg0)
             IExecuteWithSignature("setReadOnly", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributeView.html#setSystem(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributeView.html#setSystem(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -108,7 +108,7 @@ public void SetSystem(bool arg0)
             IExecuteWithSignature("setSystem", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributeView.html#readAttributes()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributeView.html#readAttributes()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></returns>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/DosFileAttributes.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/DosFileAttributes.cs
index d3c507acc..9a3eb3c00 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/DosFileAttributes.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/DosFileAttributes.cs
@@ -64,7 +64,7 @@ public partial class DosFileAttributes : Java.Nio.File.Attribute.IDosFileAttribu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributes.html#isArchive()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributes.html#isArchive()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsArchive()
@@ -72,7 +72,7 @@ public bool IsArchive()
             return IExecuteWithSignature<bool>("isArchive", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributes.html#isHidden()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributes.html#isHidden()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsHidden()
@@ -80,7 +80,7 @@ public bool IsHidden()
             return IExecuteWithSignature<bool>("isHidden", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributes.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributes.html#isReadOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsReadOnly()
@@ -88,7 +88,7 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/DosFileAttributes.html#isSystem()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/DosFileAttributes.html#isSystem()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsSystem()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileAttribute.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileAttribute.cs
index 76b7c2b29..ce3bf1855 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileAttribute.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileAttribute.cs
@@ -46,7 +46,7 @@ public partial class FileAttribute
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileAttribute.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileAttribute.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -54,7 +54,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileAttribute.html#value()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileAttribute.html#value()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Value()
@@ -115,7 +115,7 @@ public partial class FileAttribute<T> : Java.Nio.File.Attribute.IFileAttribute<T
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileAttribute.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileAttribute.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -123,7 +123,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileAttribute.html#value()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileAttribute.html#value()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public T Value()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileOwnerAttributeView.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileOwnerAttributeView.cs
index 07ddeb2d7..3ed9f6971 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileOwnerAttributeView.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileOwnerAttributeView.cs
@@ -64,19 +64,30 @@ public partial class FileOwnerAttributeView : Java.Nio.File.Attribute.IFileOwner
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileOwnerAttributeView.html#getOwner()"/> <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileOwnerAttributeView.html#setOwner(java.nio.file.attribute.UserPrincipal)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileOwnerAttributeView.html#name()"/>
         /// </summary>
-        public Java.Nio.File.Attribute.UserPrincipal Owner
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String Name()
         {
-            get { return IExecuteWithSignature<Java.Nio.File.Attribute.UserPrincipal>("getOwner", "()Ljava/nio/file/attribute/UserPrincipal;"); } set { IExecuteWithSignature("setOwner", "(Ljava/nio/file/attribute/UserPrincipal;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileOwnerAttributeView.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileOwnerAttributeView.html#getOwner()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Name()
+        /// <returns><see cref="Java.Nio.File.Attribute.UserPrincipal"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Nio.File.Attribute.UserPrincipal GetOwner()
         {
-            return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Nio.File.Attribute.UserPrincipal>("getOwner", "()Ljava/nio/file/attribute/UserPrincipal;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileOwnerAttributeView.html#setOwner(java.nio.file.attribute.UserPrincipal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Nio.File.Attribute.UserPrincipal"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetOwner(Java.Nio.File.Attribute.UserPrincipal arg0)
+        {
+            IExecuteWithSignature("setOwner", "(Ljava/nio/file/attribute/UserPrincipal;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileTime.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileTime.cs
index 6540ca6ea..5f69e0aa2 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileTime.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/FileTime.cs
@@ -42,7 +42,7 @@ public partial class FileTime
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html#from(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html#from(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.FileTime"/></returns>
@@ -51,7 +51,7 @@ public static Java.Nio.File.Attribute.FileTime From(Java.Time.Instant arg0)
             return SExecuteWithSignature<Java.Nio.File.Attribute.FileTime>(LocalBridgeClazz, "from", "(Ljava/time/Instant;)Ljava/nio/file/attribute/FileTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html#from(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html#from(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -61,7 +61,7 @@ public static Java.Nio.File.Attribute.FileTime From(long arg0, Java.Util.Concurr
             return SExecute<Java.Nio.File.Attribute.FileTime>(LocalBridgeClazz, "from", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html#fromMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html#fromMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.FileTime"/></returns>
@@ -74,7 +74,7 @@ public static Java.Nio.File.Attribute.FileTime FromMillis(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -83,7 +83,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html#compareTo(java.nio.file.attribute.FileTime)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html#compareTo(java.nio.file.attribute.FileTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
         /// <returns><see cref="int"/></returns>
@@ -92,7 +92,7 @@ public int CompareTo(Java.Nio.File.Attribute.FileTime arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/file/attribute/FileTime;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html#toInstant()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html#toInstant()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Instant"/></returns>
         public Java.Time.Instant ToInstant()
@@ -100,7 +100,7 @@ public Java.Time.Instant ToInstant()
             return IExecuteWithSignature<Java.Time.Instant>("toInstant", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html#to(java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html#to(java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
         /// <returns><see cref="long"/></returns>
@@ -109,7 +109,7 @@ public long To(Java.Util.Concurrent.TimeUnit arg0)
             return IExecuteWithSignature<long>("to", "(Ljava/util/concurrent/TimeUnit;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/FileTime.html#toMillis()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/FileTime.html#toMillis()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToMillis()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFileAttributeView.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFileAttributeView.cs
index 4fab4b811..0bca719f9 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFileAttributeView.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFileAttributeView.cs
@@ -72,7 +72,7 @@ public partial class PosixFileAttributeView : Java.Nio.File.Attribute.IPosixFile
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributeView.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributeView.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -80,7 +80,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributeView.html#setGroup(java.nio.file.attribute.GroupPrincipal)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributeView.html#setGroup(java.nio.file.attribute.GroupPrincipal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Attribute.GroupPrincipal"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -89,7 +89,7 @@ public void SetGroup(Java.Nio.File.Attribute.GroupPrincipal arg0)
             IExecuteWithSignature("setGroup", "(Ljava/nio/file/attribute/GroupPrincipal;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributeView.html#setPermissions(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributeView.html#setPermissions(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -98,7 +98,7 @@ public void SetPermissions(Java.Util.Set<Java.Nio.File.Attribute.PosixFilePermis
             IExecuteWithSignature("setPermissions", "(Ljava/util/Set;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributeView.html#readAttributes()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributeView.html#readAttributes()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></returns>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFileAttributes.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFileAttributes.cs
index 7e7586d29..3e0ed7f5e 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFileAttributes.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFileAttributes.cs
@@ -64,7 +64,7 @@ public partial class PosixFileAttributes : Java.Nio.File.Attribute.IPosixFileAtt
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributes.html#group()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributes.html#group()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.GroupPrincipal"/></returns>
         public Java.Nio.File.Attribute.GroupPrincipal Group()
@@ -72,7 +72,7 @@ public Java.Nio.File.Attribute.GroupPrincipal Group()
             return IExecuteWithSignature<Java.Nio.File.Attribute.GroupPrincipal>("group", "()Ljava/nio/file/attribute/GroupPrincipal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributes.html#owner()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributes.html#owner()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.UserPrincipal"/></returns>
         public Java.Nio.File.Attribute.UserPrincipal Owner()
@@ -80,7 +80,7 @@ public Java.Nio.File.Attribute.UserPrincipal Owner()
             return IExecuteWithSignature<Java.Nio.File.Attribute.UserPrincipal>("owner", "()Ljava/nio/file/attribute/UserPrincipal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFileAttributes.html#permissions()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFileAttributes.html#permissions()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Nio.File.Attribute.PosixFilePermission> Permissions()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFilePermission.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFilePermission.cs
index b1670367a..bb982abd5 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFilePermission.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFilePermission.cs
@@ -38,55 +38,55 @@ public partial class PosixFilePermission
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#GROUP_EXECUTE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#GROUP_EXECUTE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission GROUP_EXECUTE { get { if (!_GROUP_EXECUTEReady) { _GROUP_EXECUTEContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "GROUP_EXECUTE"); _GROUP_EXECUTEReady = true; } return _GROUP_EXECUTEContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _GROUP_EXECUTEContent = default;
         private static bool _GROUP_EXECUTEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#GROUP_READ"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#GROUP_READ"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission GROUP_READ { get { if (!_GROUP_READReady) { _GROUP_READContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "GROUP_READ"); _GROUP_READReady = true; } return _GROUP_READContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _GROUP_READContent = default;
         private static bool _GROUP_READReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#GROUP_WRITE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#GROUP_WRITE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission GROUP_WRITE { get { if (!_GROUP_WRITEReady) { _GROUP_WRITEContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "GROUP_WRITE"); _GROUP_WRITEReady = true; } return _GROUP_WRITEContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _GROUP_WRITEContent = default;
         private static bool _GROUP_WRITEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#OTHERS_EXECUTE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#OTHERS_EXECUTE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission OTHERS_EXECUTE { get { if (!_OTHERS_EXECUTEReady) { _OTHERS_EXECUTEContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "OTHERS_EXECUTE"); _OTHERS_EXECUTEReady = true; } return _OTHERS_EXECUTEContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _OTHERS_EXECUTEContent = default;
         private static bool _OTHERS_EXECUTEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#OTHERS_READ"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#OTHERS_READ"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission OTHERS_READ { get { if (!_OTHERS_READReady) { _OTHERS_READContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "OTHERS_READ"); _OTHERS_READReady = true; } return _OTHERS_READContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _OTHERS_READContent = default;
         private static bool _OTHERS_READReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#OTHERS_WRITE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#OTHERS_WRITE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission OTHERS_WRITE { get { if (!_OTHERS_WRITEReady) { _OTHERS_WRITEContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "OTHERS_WRITE"); _OTHERS_WRITEReady = true; } return _OTHERS_WRITEContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _OTHERS_WRITEContent = default;
         private static bool _OTHERS_WRITEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#OWNER_EXECUTE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#OWNER_EXECUTE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission OWNER_EXECUTE { get { if (!_OWNER_EXECUTEReady) { _OWNER_EXECUTEContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "OWNER_EXECUTE"); _OWNER_EXECUTEReady = true; } return _OWNER_EXECUTEContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _OWNER_EXECUTEContent = default;
         private static bool _OWNER_EXECUTEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#OWNER_READ"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#OWNER_READ"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission OWNER_READ { get { if (!_OWNER_READReady) { _OWNER_READContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "OWNER_READ"); _OWNER_READReady = true; } return _OWNER_READContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _OWNER_READContent = default;
         private static bool _OWNER_READReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#OWNER_WRITE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#OWNER_WRITE"/>
         /// </summary>
         public static Java.Nio.File.Attribute.PosixFilePermission OWNER_WRITE { get { if (!_OWNER_WRITEReady) { _OWNER_WRITEContent = SGetField<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "OWNER_WRITE"); _OWNER_WRITEReady = true; } return _OWNER_WRITEContent; } }
         private static Java.Nio.File.Attribute.PosixFilePermission _OWNER_WRITEContent = default;
@@ -96,7 +96,7 @@ public partial class PosixFilePermission
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.PosixFilePermission"/></returns>
@@ -105,7 +105,7 @@ public static Java.Nio.File.Attribute.PosixFilePermission ValueOf(Java.Lang.Stri
             return SExecuteWithSignature<Java.Nio.File.Attribute.PosixFilePermission>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/attribute/PosixFilePermission;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermission.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermission.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Attribute.PosixFilePermission"/></returns>
         public static Java.Nio.File.Attribute.PosixFilePermission[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFilePermissions.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFilePermissions.cs
index 2401c467f..85c0f6474 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFilePermissions.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/PosixFilePermissions.cs
@@ -42,7 +42,7 @@ public partial class PosixFilePermissions
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermissions.html#toString(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermissions.html#toString(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -51,7 +51,7 @@ public static Java.Lang.String ToString(Java.Util.Set<Java.Nio.File.Attribute.Po
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(Ljava/util/Set;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermissions.html#asFileAttribute(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermissions.html#asFileAttribute(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.FileAttribute"/></returns>
@@ -60,7 +60,7 @@ public static Java.Lang.String ToString(Java.Util.Set<Java.Nio.File.Attribute.Po
             return SExecuteWithSignature<Java.Nio.File.Attribute.FileAttribute<Java.Util.Set<Java.Nio.File.Attribute.PosixFilePermission>>>(LocalBridgeClazz, "asFileAttribute", "(Ljava/util/Set;)Ljava/nio/file/attribute/FileAttribute;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/PosixFilePermissions.html#fromString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/PosixFilePermissions.html#fromString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/UserDefinedFileAttributeView.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/UserDefinedFileAttributeView.cs
index 1c3913e19..d569fa5e8 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/UserDefinedFileAttributeView.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/UserDefinedFileAttributeView.cs
@@ -64,7 +64,7 @@ public partial class UserDefinedFileAttributeView : Java.Nio.File.Attribute.IUse
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserDefinedFileAttributeView.html#read(java.lang.String,java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserDefinedFileAttributeView.html#read(java.lang.String,java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -75,7 +75,7 @@ public int Read(Java.Lang.String arg0, Java.Nio.ByteBuffer arg1)
             return IExecute<int>("read", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserDefinedFileAttributeView.html#size(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserDefinedFileAttributeView.html#size(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -85,7 +85,7 @@ public int Size(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("size", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserDefinedFileAttributeView.html#write(java.lang.String,java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserDefinedFileAttributeView.html#write(java.lang.String,java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -96,7 +96,7 @@ public int Write(Java.Lang.String arg0, Java.Nio.ByteBuffer arg1)
             return IExecute<int>("write", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserDefinedFileAttributeView.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserDefinedFileAttributeView.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -104,7 +104,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserDefinedFileAttributeView.html#list()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserDefinedFileAttributeView.html#list()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -113,7 +113,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("list", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserDefinedFileAttributeView.html#delete(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserDefinedFileAttributeView.html#delete(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/UserPrincipalLookupService.cs b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/UserPrincipalLookupService.cs
index dc510eb21..7f679c096 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Attribute/UserPrincipalLookupService.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Attribute/UserPrincipalLookupService.cs
@@ -46,7 +46,7 @@ public partial class UserPrincipalLookupService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserPrincipalLookupService.html#lookupPrincipalByGroupName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserPrincipalLookupService.html#lookupPrincipalByGroupName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.GroupPrincipal"/></returns>
@@ -56,7 +56,7 @@ public Java.Nio.File.Attribute.GroupPrincipal LookupPrincipalByGroupName(Java.La
             return IExecuteWithSignature<Java.Nio.File.Attribute.GroupPrincipal>("lookupPrincipalByGroupName", "(Ljava/lang/String;)Ljava/nio/file/attribute/GroupPrincipal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/attribute/UserPrincipalLookupService.html#lookupPrincipalByName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/attribute/UserPrincipalLookupService.html#lookupPrincipalByName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.UserPrincipal"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/DirectoryStream.cs b/src/net/Netdroid/Generated/Java/Nio/File/DirectoryStream.cs
index 0121b9298..9fda3ed69 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/DirectoryStream.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/DirectoryStream.cs
@@ -50,7 +50,7 @@ public partial class DirectoryStream
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryStream.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryStream.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -82,7 +82,7 @@ public partial class Filter
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryStream.Filter.html#accept(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryStream.Filter.html#accept(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -127,7 +127,7 @@ public partial class Filter<T>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryStream.Filter.html#accept(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryStream.Filter.html#accept(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="T"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -201,7 +201,7 @@ public partial class DirectoryStream<T> : Java.Nio.File.IDirectoryStream<T>, Jav
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/DirectoryStream.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/DirectoryStream.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<T> Iterator()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/FileStore.cs b/src/net/Netdroid/Generated/Java/Nio/File/FileStore.cs
index 34e269044..b3e03f46a 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/FileStore.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/FileStore.cs
@@ -46,45 +46,17 @@ public partial class FileStore
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#getBlockSize()"/> 
-        /// </summary>
-        public long BlockSize
-        {
-            get { return IExecuteWithSignature<long>("getBlockSize", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#getTotalSpace()"/> 
-        /// </summary>
-        public long TotalSpace
-        {
-            get { return IExecuteWithSignature<long>("getTotalSpace", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#getUnallocatedSpace()"/> 
-        /// </summary>
-        public long UnallocatedSpace
-        {
-            get { return IExecuteWithSignature<long>("getUnallocatedSpace", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#getUsableSpace()"/> 
-        /// </summary>
-        public long UsableSpace
-        {
-            get { return IExecuteWithSignature<long>("getUsableSpace", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#getFileStoreAttributeView(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#getFileStoreAttributeView(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="V"><see cref="Java.Nio.File.Attribute.IFileStoreAttributeView"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V GetFileStoreAttributeView<V>(Java.Lang.Class arg0) where V: Java.Nio.File.Attribute.IFileStoreAttributeView, new()
+        public V GetFileStoreAttributeView<V>(Java.Lang.Class arg0) where V : Java.Nio.File.Attribute.IFileStoreAttributeView, new()
         {
-            return IExecuteWithSignature<V>("getFileStoreAttributeView", "(Ljava/lang/Class;)Ljava/nio/file/attribute/FileStoreAttributeView;", arg0);
+            return IExecute<V>("getFileStoreAttributeView", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#isReadOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsReadOnly()
@@ -92,7 +64,7 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#supportsFileAttributeView(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#supportsFileAttributeView(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -101,7 +73,7 @@ public bool SupportsFileAttributeView(Java.Lang.Class arg0)
             return IExecuteWithSignature<bool>("supportsFileAttributeView", "(Ljava/lang/Class;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#supportsFileAttributeView(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#supportsFileAttributeView(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -110,7 +82,7 @@ public bool SupportsFileAttributeView(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("supportsFileAttributeView", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#getAttribute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#getAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -120,7 +92,7 @@ public object GetAttribute(Java.Lang.String arg0)
             return IExecuteWithSignature("getAttribute", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -128,13 +100,49 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileStore.html#type()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#type()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Type()
         {
             return IExecuteWithSignature<Java.Lang.String>("type", "()Ljava/lang/String;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#getTotalSpace()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public long GetTotalSpace()
+        {
+            return IExecuteWithSignature<long>("getTotalSpace", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#getUnallocatedSpace()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public long GetUnallocatedSpace()
+        {
+            return IExecuteWithSignature<long>("getUnallocatedSpace", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#getUsableSpace()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public long GetUsableSpace()
+        {
+            return IExecuteWithSignature<long>("getUsableSpace", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileStore.html#getBlockSize()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public long GetBlockSize()
+        {
+            return IExecuteWithSignature<long>("getBlockSize", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/FileSystem.cs b/src/net/Netdroid/Generated/Java/Nio/File/FileSystem.cs
index 54f93fa6c..dee922fed 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/FileSystem.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/FileSystem.cs
@@ -46,51 +46,55 @@ public partial class FileSystem
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#getFileStores()"/> 
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#isOpen()"/>
         /// </summary>
-        public Java.Lang.Iterable<Java.Nio.File.FileStore> FileStores
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOpen()
         {
-            get { return IExecuteWithSignature<Java.Lang.Iterable<Java.Nio.File.FileStore>>("getFileStores", "()Ljava/lang/Iterable;"); }
+            return IExecuteWithSignature<bool>("isOpen", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#getRootDirectories()"/> 
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#isReadOnly()"/>
         /// </summary>
-        public Java.Lang.Iterable<Java.Nio.File.Path> RootDirectories
+        /// <returns><see cref="bool"/></returns>
+        public bool IsReadOnly()
         {
-            get { return IExecuteWithSignature<Java.Lang.Iterable<Java.Nio.File.Path>>("getRootDirectories", "()Ljava/lang/Iterable;"); }
+            return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#getSeparator()"/> 
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#getFileStores()"/>
         /// </summary>
-        public Java.Lang.String Separator
+        /// <returns><see cref="Java.Lang.Iterable"/></returns>
+        public Java.Lang.Iterable<Java.Nio.File.FileStore> GetFileStores()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSeparator", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.Iterable<Java.Nio.File.FileStore>>("getFileStores", "()Ljava/lang/Iterable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#getUserPrincipalLookupService()"/> 
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#getRootDirectories()"/>
         /// </summary>
-        public Java.Nio.File.Attribute.UserPrincipalLookupService UserPrincipalLookupService
+        /// <returns><see cref="Java.Lang.Iterable"/></returns>
+        public Java.Lang.Iterable<Java.Nio.File.Path> GetRootDirectories()
         {
-            get { return IExecuteWithSignature<Java.Nio.File.Attribute.UserPrincipalLookupService>("getUserPrincipalLookupService", "()Ljava/nio/file/attribute/UserPrincipalLookupService;"); }
+            return IExecuteWithSignature<Java.Lang.Iterable<Java.Nio.File.Path>>("getRootDirectories", "()Ljava/lang/Iterable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#isOpen()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#getSeparator()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOpen()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSeparator()
         {
-            return IExecuteWithSignature<bool>("isOpen", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSeparator", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#getUserPrincipalLookupService()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsReadOnly()
+        /// <returns><see cref="Java.Nio.File.Attribute.UserPrincipalLookupService"/></returns>
+        public Java.Nio.File.Attribute.UserPrincipalLookupService GetUserPrincipalLookupService()
         {
-            return IExecuteWithSignature<bool>("isReadOnly", "()Z");
+            return IExecuteWithSignature<Java.Nio.File.Attribute.UserPrincipalLookupService>("getUserPrincipalLookupService", "()Ljava/nio/file/attribute/UserPrincipalLookupService;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#getPath(java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#getPath(java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -100,7 +104,7 @@ public Java.Nio.File.Path GetPath(Java.Lang.String arg0, params Java.Lang.String
             if (arg1.Length == 0) return IExecute<Java.Nio.File.Path>("getPath", arg0); else return IExecute<Java.Nio.File.Path>("getPath", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.PathMatcher"/></returns>
@@ -109,7 +113,7 @@ public Java.Nio.File.PathMatcher GetPathMatcher(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Nio.File.PathMatcher>("getPathMatcher", "(Ljava/lang/String;)Ljava/nio/file/PathMatcher;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#provider()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#provider()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Spi.FileSystemProvider"/></returns>
         public Java.Nio.File.Spi.FileSystemProvider Provider()
@@ -117,7 +121,7 @@ public Java.Nio.File.Spi.FileSystemProvider Provider()
             return IExecuteWithSignature<Java.Nio.File.Spi.FileSystemProvider>("provider", "()Ljava/nio/file/spi/FileSystemProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#newWatchService()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#newWatchService()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.WatchService"/></returns>
         /// <exception cref="Java.Io.IOException"/>
@@ -126,7 +130,7 @@ public Java.Nio.File.WatchService NewWatchService()
             return IExecuteWithSignature<Java.Nio.File.WatchService>("newWatchService", "()Ljava/nio/file/WatchService;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#supportedFileAttributeViews()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#supportedFileAttributeViews()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Lang.String> SupportedFileAttributeViews()
@@ -134,7 +138,7 @@ public Java.Nio.File.WatchService NewWatchService()
             return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("supportedFileAttributeViews", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystem.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystem.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/FileSystems.cs b/src/net/Netdroid/Generated/Java/Nio/File/FileSystems.cs
index 1729ffeee..646300ac9 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/FileSystems.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/FileSystems.cs
@@ -42,14 +42,15 @@ public partial class FileSystems
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html#getDefault()"/> 
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystems.html#getDefault()"/>
         /// </summary>
-        public static Java.Nio.File.FileSystem Default
+        /// <returns><see cref="Java.Nio.File.FileSystem"/></returns>
+        public static Java.Nio.File.FileSystem GetDefault()
         {
-            get { return SExecuteWithSignature<Java.Nio.File.FileSystem>(LocalBridgeClazz, "getDefault", "()Ljava/nio/file/FileSystem;"); }
+            return SExecuteWithSignature<Java.Nio.File.FileSystem>(LocalBridgeClazz, "getDefault", "()Ljava/nio/file/FileSystem;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html#getFileSystem(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystems.html#getFileSystem(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Nio.File.FileSystem"/></returns>
@@ -58,7 +59,7 @@ public static Java.Nio.File.FileSystem GetFileSystem(Java.Net.URI arg0)
             return SExecuteWithSignature<Java.Nio.File.FileSystem>(LocalBridgeClazz, "getFileSystem", "(Ljava/net/URI;)Ljava/nio/file/FileSystem;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html#newFileSystem(java.net.URI,java.util.Map,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystems.html#newFileSystem(java.net.URI,java.util.Map,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -70,7 +71,7 @@ public static Java.Nio.File.FileSystem NewFileSystem(Java.Net.URI arg0, Java.Uti
             return SExecute<Java.Nio.File.FileSystem>(LocalBridgeClazz, "newFileSystem", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html#newFileSystem(java.net.URI,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystems.html#newFileSystem(java.net.URI,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -81,7 +82,7 @@ public static Java.Nio.File.FileSystem NewFileSystem(Java.Net.URI arg0, Java.Uti
             return SExecute<Java.Nio.File.FileSystem>(LocalBridgeClazz, "newFileSystem", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html#newFileSystem(java.nio.file.Path,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileSystems.html#newFileSystem(java.nio.file.Path,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -91,39 +92,6 @@ public static Java.Nio.File.FileSystem NewFileSystem(Java.Nio.File.Path arg0, Ja
         {
             return SExecute<Java.Nio.File.FileSystem>(LocalBridgeClazz, "newFileSystem", arg0, arg1);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html#newFileSystem(java.nio.file.Path,java.util.Map,java.lang.ClassLoader)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Map"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.ClassLoader"/></param>
-        /// <returns><see cref="Java.Nio.File.FileSystem"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.File.FileSystem NewFileSystem(Java.Nio.File.Path arg0, Java.Util.Map<Java.Lang.String, object> arg1, Java.Lang.ClassLoader arg2)
-        {
-            return SExecute<Java.Nio.File.FileSystem>(LocalBridgeClazz, "newFileSystem", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html#newFileSystem(java.nio.file.Path,java.util.Map)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Map"/></param>
-        /// <returns><see cref="Java.Nio.File.FileSystem"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.File.FileSystem NewFileSystem(Java.Nio.File.Path arg0, Java.Util.Map<Java.Lang.String, object> arg1)
-        {
-            return SExecute<Java.Nio.File.FileSystem>(LocalBridgeClazz, "newFileSystem", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileSystems.html#newFileSystem(java.nio.file.Path)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
-        /// <returns><see cref="Java.Nio.File.FileSystem"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.File.FileSystem NewFileSystem(Java.Nio.File.Path arg0)
-        {
-            return SExecuteWithSignature<Java.Nio.File.FileSystem>(LocalBridgeClazz, "newFileSystem", "(Ljava/nio/file/Path;)Ljava/nio/file/FileSystem;", arg0);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/FileVisitOption.cs b/src/net/Netdroid/Generated/Java/Nio/File/FileVisitOption.cs
index 72e30dddf..5184b83dc 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/FileVisitOption.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/FileVisitOption.cs
@@ -38,7 +38,7 @@ public partial class FileVisitOption
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitOption.html#FOLLOW_LINKS"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitOption.html#FOLLOW_LINKS"/>
         /// </summary>
         public static Java.Nio.File.FileVisitOption FOLLOW_LINKS { get { if (!_FOLLOW_LINKSReady) { _FOLLOW_LINKSContent = SGetField<Java.Nio.File.FileVisitOption>(LocalBridgeClazz, "FOLLOW_LINKS"); _FOLLOW_LINKSReady = true; } return _FOLLOW_LINKSContent; } }
         private static Java.Nio.File.FileVisitOption _FOLLOW_LINKSContent = default;
@@ -48,7 +48,7 @@ public partial class FileVisitOption
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitOption.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitOption.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.FileVisitOption"/></returns>
@@ -57,7 +57,7 @@ public static Java.Nio.File.FileVisitOption ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Nio.File.FileVisitOption>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/FileVisitOption;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitOption.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitOption.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.FileVisitOption"/></returns>
         public static Java.Nio.File.FileVisitOption[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/FileVisitResult.cs b/src/net/Netdroid/Generated/Java/Nio/File/FileVisitResult.cs
index a55e0ae3f..b043d0919 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/FileVisitResult.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/FileVisitResult.cs
@@ -38,25 +38,25 @@ public partial class FileVisitResult
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitResult.html#CONTINUE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitResult.html#CONTINUE"/>
         /// </summary>
         public static Java.Nio.File.FileVisitResult CONTINUE { get { if (!_CONTINUEReady) { _CONTINUEContent = SGetField<Java.Nio.File.FileVisitResult>(LocalBridgeClazz, "CONTINUE"); _CONTINUEReady = true; } return _CONTINUEContent; } }
         private static Java.Nio.File.FileVisitResult _CONTINUEContent = default;
         private static bool _CONTINUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitResult.html#SKIP_SIBLINGS"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitResult.html#SKIP_SIBLINGS"/>
         /// </summary>
         public static Java.Nio.File.FileVisitResult SKIP_SIBLINGS { get { if (!_SKIP_SIBLINGSReady) { _SKIP_SIBLINGSContent = SGetField<Java.Nio.File.FileVisitResult>(LocalBridgeClazz, "SKIP_SIBLINGS"); _SKIP_SIBLINGSReady = true; } return _SKIP_SIBLINGSContent; } }
         private static Java.Nio.File.FileVisitResult _SKIP_SIBLINGSContent = default;
         private static bool _SKIP_SIBLINGSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitResult.html#SKIP_SUBTREE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitResult.html#SKIP_SUBTREE"/>
         /// </summary>
         public static Java.Nio.File.FileVisitResult SKIP_SUBTREE { get { if (!_SKIP_SUBTREEReady) { _SKIP_SUBTREEContent = SGetField<Java.Nio.File.FileVisitResult>(LocalBridgeClazz, "SKIP_SUBTREE"); _SKIP_SUBTREEReady = true; } return _SKIP_SUBTREEContent; } }
         private static Java.Nio.File.FileVisitResult _SKIP_SUBTREEContent = default;
         private static bool _SKIP_SUBTREEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitResult.html#TERMINATE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitResult.html#TERMINATE"/>
         /// </summary>
         public static Java.Nio.File.FileVisitResult TERMINATE { get { if (!_TERMINATEReady) { _TERMINATEContent = SGetField<Java.Nio.File.FileVisitResult>(LocalBridgeClazz, "TERMINATE"); _TERMINATEReady = true; } return _TERMINATEContent; } }
         private static Java.Nio.File.FileVisitResult _TERMINATEContent = default;
@@ -66,7 +66,7 @@ public partial class FileVisitResult
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitResult.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitResult.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.FileVisitResult"/></returns>
@@ -75,7 +75,7 @@ public static Java.Nio.File.FileVisitResult ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Nio.File.FileVisitResult>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/FileVisitResult;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitResult.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitResult.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.FileVisitResult"/></returns>
         public static Java.Nio.File.FileVisitResult[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/FileVisitor.cs b/src/net/Netdroid/Generated/Java/Nio/File/FileVisitor.cs
index d692fad48..67601bbe4 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/FileVisitor.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/FileVisitor.cs
@@ -46,7 +46,7 @@ public partial class FileVisitor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html#postVisitDirectory(java.lang.Object,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html#postVisitDirectory(java.lang.Object,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Io.IOException"/></param>
@@ -57,7 +57,7 @@ public Java.Nio.File.FileVisitResult PostVisitDirectory(object arg0, MASES.JCOBr
             return IExecute<Java.Nio.File.FileVisitResult>("postVisitDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html#preVisitDirectory(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html#preVisitDirectory(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></param>
@@ -68,7 +68,7 @@ public Java.Nio.File.FileVisitResult PreVisitDirectory(object arg0, Java.Nio.Fil
             return IExecute<Java.Nio.File.FileVisitResult>("preVisitDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html#visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html#visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></param>
@@ -79,7 +79,7 @@ public Java.Nio.File.FileVisitResult VisitFile(object arg0, Java.Nio.File.Attrib
             return IExecute<Java.Nio.File.FileVisitResult>("visitFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html#visitFileFailed(java.lang.Object,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html#visitFileFailed(java.lang.Object,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Io.IOException"/></param>
@@ -143,7 +143,7 @@ public partial class FileVisitor<T> : Java.Nio.File.IFileVisitor<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html#postVisitDirectory(java.lang.Object,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html#postVisitDirectory(java.lang.Object,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Io.IOException"/></param>
@@ -154,7 +154,7 @@ public Java.Nio.File.FileVisitResult PostVisitDirectory(T arg0, MASES.JCOBridge.
             return IExecute<Java.Nio.File.FileVisitResult>("postVisitDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html#preVisitDirectory(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html#preVisitDirectory(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></param>
@@ -165,7 +165,7 @@ public Java.Nio.File.FileVisitResult PreVisitDirectory(T arg0, Java.Nio.File.Att
             return IExecute<Java.Nio.File.FileVisitResult>("preVisitDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html#visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html#visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></param>
@@ -176,7 +176,7 @@ public Java.Nio.File.FileVisitResult VisitFile(T arg0, Java.Nio.File.Attribute.B
             return IExecute<Java.Nio.File.FileVisitResult>("visitFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/FileVisitor.html#visitFileFailed(java.lang.Object,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/FileVisitor.html#visitFileFailed(java.lang.Object,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Io.IOException"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Files.cs b/src/net/Netdroid/Generated/Java/Nio/File/Files.cs
index 56efd6891..6d7508a0e 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Files.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Files.cs
@@ -42,7 +42,7 @@ public partial class Files
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#readAttributes(java.nio.file.Path,java.lang.Class,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#readAttributes(java.nio.file.Path,java.lang.Class,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -50,24 +50,24 @@ public partial class Files
         /// <typeparam name="A"><see cref="Java.Nio.File.Attribute.IBasicFileAttributes"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static A ReadAttributes<A>(Java.Nio.File.Path arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where A: Java.Nio.File.Attribute.IBasicFileAttributes, new()
+        public static A ReadAttributes<A>(Java.Nio.File.Path arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where A : Java.Nio.File.Attribute.IBasicFileAttributes, new()
         {
             if (arg2.Length == 0) return SExecute<A>(LocalBridgeClazz, "readAttributes", arg0, arg1); else return SExecute<A>(LocalBridgeClazz, "readAttributes", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#getFileAttributeView(java.nio.file.Path,java.lang.Class,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#getFileAttributeView(java.nio.file.Path,java.lang.Class,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg2"><see cref="Java.Nio.File.LinkOption"/></param>
         /// <typeparam name="V"><see cref="Java.Nio.File.Attribute.IFileAttributeView"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public static V GetFileAttributeView<V>(Java.Nio.File.Path arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where V: Java.Nio.File.Attribute.IFileAttributeView, new()
+        public static V GetFileAttributeView<V>(Java.Nio.File.Path arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where V : Java.Nio.File.Attribute.IFileAttributeView, new()
         {
             if (arg2.Length == 0) return SExecute<V>(LocalBridgeClazz, "getFileAttributeView", arg0, arg1); else return SExecute<V>(LocalBridgeClazz, "getFileAttributeView", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#deleteIfExists(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#deleteIfExists(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -77,7 +77,7 @@ public static bool DeleteIfExists(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "deleteIfExists", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#exists(java.nio.file.Path,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#exists(java.nio.file.Path,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -87,7 +87,7 @@ public static bool Exists(Java.Nio.File.Path arg0, params Java.Nio.File.LinkOpti
             if (arg1.Length == 0) return SExecute<bool>(LocalBridgeClazz, "exists", arg0); else return SExecute<bool>(LocalBridgeClazz, "exists", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#isDirectory(java.nio.file.Path,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#isDirectory(java.nio.file.Path,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -97,7 +97,7 @@ public static bool IsDirectory(Java.Nio.File.Path arg0, params Java.Nio.File.Lin
             if (arg1.Length == 0) return SExecute<bool>(LocalBridgeClazz, "isDirectory", arg0); else return SExecute<bool>(LocalBridgeClazz, "isDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#isExecutable(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#isExecutable(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -106,7 +106,7 @@ public static bool IsExecutable(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isExecutable", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#isHidden(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#isHidden(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -116,7 +116,7 @@ public static bool IsHidden(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isHidden", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#isReadable(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#isReadable(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -125,7 +125,7 @@ public static bool IsReadable(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isReadable", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#isRegularFile(java.nio.file.Path,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#isRegularFile(java.nio.file.Path,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -135,7 +135,7 @@ public static bool IsRegularFile(Java.Nio.File.Path arg0, params Java.Nio.File.L
             if (arg1.Length == 0) return SExecute<bool>(LocalBridgeClazz, "isRegularFile", arg0); else return SExecute<bool>(LocalBridgeClazz, "isRegularFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#isSameFile(java.nio.file.Path,java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#isSameFile(java.nio.file.Path,java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -146,7 +146,7 @@ public static bool IsSameFile(Java.Nio.File.Path arg0, Java.Nio.File.Path arg1)
             return SExecute<bool>(LocalBridgeClazz, "isSameFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#isSymbolicLink(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#isSymbolicLink(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -155,7 +155,7 @@ public static bool IsSymbolicLink(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isSymbolicLink", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#isWritable(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#isWritable(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -164,7 +164,7 @@ public static bool IsWritable(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isWritable", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#notExists(java.nio.file.Path,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#notExists(java.nio.file.Path,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -174,7 +174,7 @@ public static bool NotExists(Java.Nio.File.Path arg0, params Java.Nio.File.LinkO
             if (arg1.Length == 0) return SExecute<bool>(LocalBridgeClazz, "notExists", arg0); else return SExecute<bool>(LocalBridgeClazz, "notExists", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#readAllBytes(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#readAllBytes(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -184,7 +184,7 @@ public static byte[] ReadAllBytes(Java.Nio.File.Path arg0)
             return SExecuteWithSignatureArray<byte>(LocalBridgeClazz, "readAllBytes", "(Ljava/nio/file/Path;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newBufferedReader(java.nio.file.Path,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newBufferedReader(java.nio.file.Path,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -195,7 +195,7 @@ public static Java.Io.BufferedReader NewBufferedReader(Java.Nio.File.Path arg0,
             return SExecute<Java.Io.BufferedReader>(LocalBridgeClazz, "newBufferedReader", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newBufferedReader(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newBufferedReader(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Io.BufferedReader"/></returns>
@@ -205,7 +205,7 @@ public static Java.Io.BufferedReader NewBufferedReader(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<Java.Io.BufferedReader>(LocalBridgeClazz, "newBufferedReader", "(Ljava/nio/file/Path;)Ljava/io/BufferedReader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newBufferedWriter(java.nio.file.Path,java.nio.charset.Charset,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newBufferedWriter(java.nio.file.Path,java.nio.charset.Charset,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -217,7 +217,7 @@ public static Java.Io.BufferedWriter NewBufferedWriter(Java.Nio.File.Path arg0,
             if (arg2.Length == 0) return SExecute<Java.Io.BufferedWriter>(LocalBridgeClazz, "newBufferedWriter", arg0, arg1); else return SExecute<Java.Io.BufferedWriter>(LocalBridgeClazz, "newBufferedWriter", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newBufferedWriter(java.nio.file.Path,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newBufferedWriter(java.nio.file.Path,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.OpenOption"/></param>
@@ -228,7 +228,7 @@ public static Java.Io.BufferedWriter NewBufferedWriter(Java.Nio.File.Path arg0,
             if (arg1.Length == 0) return SExecute<Java.Io.BufferedWriter>(LocalBridgeClazz, "newBufferedWriter", arg0); else return SExecute<Java.Io.BufferedWriter>(LocalBridgeClazz, "newBufferedWriter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newInputStream(java.nio.file.Path,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newInputStream(java.nio.file.Path,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.OpenOption"/></param>
@@ -239,7 +239,7 @@ public static Java.Io.InputStream NewInputStream(Java.Nio.File.Path arg0, params
             if (arg1.Length == 0) return SExecute<Java.Io.InputStream>(LocalBridgeClazz, "newInputStream", arg0); else return SExecute<Java.Io.InputStream>(LocalBridgeClazz, "newInputStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newOutputStream(java.nio.file.Path,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newOutputStream(java.nio.file.Path,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.OpenOption"/></param>
@@ -250,7 +250,7 @@ public static Java.Io.OutputStream NewOutputStream(Java.Nio.File.Path arg0, para
             if (arg1.Length == 0) return SExecute<Java.Io.OutputStream>(LocalBridgeClazz, "newOutputStream", arg0); else return SExecute<Java.Io.OutputStream>(LocalBridgeClazz, "newOutputStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#getAttribute(java.nio.file.Path,java.lang.String,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#getAttribute(java.nio.file.Path,java.lang.String,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -262,7 +262,7 @@ public static object GetAttribute(Java.Nio.File.Path arg0, Java.Lang.String arg1
             if (arg2.Length == 0) return SExecute(LocalBridgeClazz, "getAttribute", arg0, arg1); else return SExecute(LocalBridgeClazz, "getAttribute", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#probeContentType(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#probeContentType(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -272,7 +272,7 @@ public static Java.Lang.String ProbeContentType(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "probeContentType", "(Ljava/nio/file/Path;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#readString(java.nio.file.Path,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#readString(java.nio.file.Path,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -283,7 +283,7 @@ public static Java.Lang.String ReadString(Java.Nio.File.Path arg0, Java.Nio.Char
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "readString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#readString(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#readString(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -293,7 +293,7 @@ public static Java.Lang.String ReadString(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "readString", "(Ljava/nio/file/Path;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newByteChannel(java.nio.file.Path,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newByteChannel(java.nio.file.Path,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.OpenOption"/></param>
@@ -304,7 +304,7 @@ public static Java.Nio.Channels.SeekableByteChannel NewByteChannel(Java.Nio.File
             if (arg1.Length == 0) return SExecute<Java.Nio.Channels.SeekableByteChannel>(LocalBridgeClazz, "newByteChannel", arg0); else return SExecute<Java.Nio.Channels.SeekableByteChannel>(LocalBridgeClazz, "newByteChannel", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newByteChannel(java.nio.file.Path,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newByteChannel(java.nio.file.Path,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -312,12 +312,12 @@ public static Java.Nio.Channels.SeekableByteChannel NewByteChannel(Java.Nio.File
         /// <typeparam name="Arg1ExtendsJava_Nio_File_OpenOption"><see cref="Java.Nio.File.OpenOption"/></typeparam>
         /// <returns><see cref="Java.Nio.Channels.SeekableByteChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.Channels.SeekableByteChannel NewByteChannel<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption: Java.Nio.File.OpenOption
+        public static Java.Nio.Channels.SeekableByteChannel NewByteChannel<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption : Java.Nio.File.OpenOption
         {
             if (arg2.Length == 0) return SExecute<Java.Nio.Channels.SeekableByteChannel>(LocalBridgeClazz, "newByteChannel", arg0, arg1); else return SExecute<Java.Nio.Channels.SeekableByteChannel>(LocalBridgeClazz, "newByteChannel", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#getLastModifiedTime(java.nio.file.Path,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#getLastModifiedTime(java.nio.file.Path,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -328,7 +328,7 @@ public static Java.Nio.File.Attribute.FileTime GetLastModifiedTime(Java.Nio.File
             if (arg1.Length == 0) return SExecute<Java.Nio.File.Attribute.FileTime>(LocalBridgeClazz, "getLastModifiedTime", arg0); else return SExecute<Java.Nio.File.Attribute.FileTime>(LocalBridgeClazz, "getLastModifiedTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#getOwner(java.nio.file.Path,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#getOwner(java.nio.file.Path,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -339,7 +339,7 @@ public static Java.Nio.File.Attribute.UserPrincipal GetOwner(Java.Nio.File.Path
             if (arg1.Length == 0) return SExecute<Java.Nio.File.Attribute.UserPrincipal>(LocalBridgeClazz, "getOwner", arg0); else return SExecute<Java.Nio.File.Attribute.UserPrincipal>(LocalBridgeClazz, "getOwner", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newDirectoryStream(java.nio.file.Path,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newDirectoryStream(java.nio.file.Path,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -350,19 +350,19 @@ public static Java.Nio.File.Attribute.UserPrincipal GetOwner(Java.Nio.File.Path
             return SExecute<Java.Nio.File.DirectoryStream<Java.Nio.File.Path>>(LocalBridgeClazz, "newDirectoryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newDirectoryStream(java.nio.file.Path,java.nio.file.DirectoryStream.Filter)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newDirectoryStream(java.nio.file.Path,java.nio.file.DirectoryStream.Filter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.DirectoryStream.Filter"/></param>
         /// <typeparam name="Arg1objectSuperJava_Nio_File_Path"><see cref="Java.Nio.File.Path"/></typeparam>
         /// <returns><see cref="Java.Nio.File.DirectoryStream"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.File.DirectoryStream<Java.Nio.File.Path> NewDirectoryStream<Arg1objectSuperJava_Nio_File_Path>(Java.Nio.File.Path arg0, Java.Nio.File.DirectoryStream.Filter<Arg1objectSuperJava_Nio_File_Path> arg1) where Arg1objectSuperJava_Nio_File_Path: Java.Nio.File.Path
+        public static Java.Nio.File.DirectoryStream<Java.Nio.File.Path> NewDirectoryStream<Arg1objectSuperJava_Nio_File_Path>(Java.Nio.File.Path arg0, Java.Nio.File.DirectoryStream.Filter<Arg1objectSuperJava_Nio_File_Path> arg1) where Arg1objectSuperJava_Nio_File_Path : Java.Nio.File.Path
         {
             return SExecute<Java.Nio.File.DirectoryStream<Java.Nio.File.Path>>(LocalBridgeClazz, "newDirectoryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#newDirectoryStream(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#newDirectoryStream(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Nio.File.DirectoryStream"/></returns>
@@ -372,7 +372,7 @@ public static Java.Nio.File.Attribute.UserPrincipal GetOwner(Java.Nio.File.Path
             return SExecuteWithSignature<Java.Nio.File.DirectoryStream<Java.Nio.File.Path>>(LocalBridgeClazz, "newDirectoryStream", "(Ljava/nio/file/Path;)Ljava/nio/file/DirectoryStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#getFileStore(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#getFileStore(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Nio.File.FileStore"/></returns>
@@ -382,7 +382,7 @@ public static Java.Nio.File.FileStore GetFileStore(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<Java.Nio.File.FileStore>(LocalBridgeClazz, "getFileStore", "(Ljava/nio/file/Path;)Ljava/nio/file/FileStore;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#copy(java.nio.file.Path,java.nio.file.Path,java.nio.file.CopyOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#copy(java.nio.file.Path,java.nio.file.Path,java.nio.file.CopyOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -394,7 +394,7 @@ public static Java.Nio.File.Path Copy(Java.Nio.File.Path arg0, Java.Nio.File.Pat
             if (arg2.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "copy", arg0, arg1); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "copy", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createDirectories(java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createDirectories(java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.FileAttribute"/></param>
@@ -405,7 +405,7 @@ public static Java.Nio.File.Path CreateDirectories(Java.Nio.File.Path arg0, para
             if (arg1.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createDirectories", arg0); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createDirectories", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createDirectory(java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createDirectory(java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.FileAttribute"/></param>
@@ -416,7 +416,7 @@ public static Java.Nio.File.Path CreateDirectory(Java.Nio.File.Path arg0, params
             if (arg1.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createDirectory", arg0); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createFile(java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createFile(java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.FileAttribute"/></param>
@@ -427,7 +427,7 @@ public static Java.Nio.File.Path CreateFile(Java.Nio.File.Path arg0, params Java
             if (arg1.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createFile", arg0); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createLink(java.nio.file.Path,java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createLink(java.nio.file.Path,java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -438,7 +438,7 @@ public static Java.Nio.File.Path CreateLink(Java.Nio.File.Path arg0, Java.Nio.Fi
             return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createLink", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createSymbolicLink(java.nio.file.Path,java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createSymbolicLink(java.nio.file.Path,java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -450,7 +450,7 @@ public static Java.Nio.File.Path CreateSymbolicLink(Java.Nio.File.Path arg0, Jav
             if (arg2.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createSymbolicLink", arg0, arg1); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createSymbolicLink", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createTempDirectory(java.lang.String,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createTempDirectory(java.lang.String,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.FileAttribute"/></param>
@@ -461,7 +461,7 @@ public static Java.Nio.File.Path CreateTempDirectory(Java.Lang.String arg0, para
             if (arg1.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createTempDirectory", arg0); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createTempDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createTempDirectory(java.nio.file.Path,java.lang.String,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createTempDirectory(java.nio.file.Path,java.lang.String,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -473,7 +473,7 @@ public static Java.Nio.File.Path CreateTempDirectory(Java.Nio.File.Path arg0, Ja
             if (arg2.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createTempDirectory", arg0, arg1); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createTempDirectory", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createTempFile(java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createTempFile(java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -485,7 +485,7 @@ public static Java.Nio.File.Path CreateTempFile(Java.Lang.String arg0, Java.Lang
             if (arg2.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createTempFile", arg0, arg1); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createTempFile", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#createTempFile(java.nio.file.Path,java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#createTempFile(java.nio.file.Path,java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -498,7 +498,7 @@ public static Java.Nio.File.Path CreateTempFile(Java.Nio.File.Path arg0, Java.La
             if (arg3.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createTempFile", arg0, arg1, arg2); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "createTempFile", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#move(java.nio.file.Path,java.nio.file.Path,java.nio.file.CopyOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#move(java.nio.file.Path,java.nio.file.Path,java.nio.file.CopyOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -510,7 +510,7 @@ public static Java.Nio.File.Path Move(Java.Nio.File.Path arg0, Java.Nio.File.Pat
             if (arg2.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "move", arg0, arg1); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "move", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#readSymbolicLink(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#readSymbolicLink(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -520,7 +520,7 @@ public static Java.Nio.File.Path ReadSymbolicLink(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<Java.Nio.File.Path>(LocalBridgeClazz, "readSymbolicLink", "(Ljava/nio/file/Path;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#setAttribute(java.nio.file.Path,java.lang.String,java.lang.Object,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#setAttribute(java.nio.file.Path,java.lang.String,java.lang.Object,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -533,7 +533,7 @@ public static Java.Nio.File.Path SetAttribute(Java.Nio.File.Path arg0, Java.Lang
             if (arg3.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "setAttribute", arg0, arg1, arg2); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "setAttribute", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#setLastModifiedTime(java.nio.file.Path,java.nio.file.attribute.FileTime)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#setLastModifiedTime(java.nio.file.Path,java.nio.file.attribute.FileTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
@@ -544,7 +544,7 @@ public static Java.Nio.File.Path SetLastModifiedTime(Java.Nio.File.Path arg0, Ja
             return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "setLastModifiedTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#setOwner(java.nio.file.Path,java.nio.file.attribute.UserPrincipal)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#setOwner(java.nio.file.Path,java.nio.file.attribute.UserPrincipal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.UserPrincipal"/></param>
@@ -555,7 +555,7 @@ public static Java.Nio.File.Path SetOwner(Java.Nio.File.Path arg0, Java.Nio.File
             return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "setOwner", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#setPosixFilePermissions(java.nio.file.Path,java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#setPosixFilePermissions(java.nio.file.Path,java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -566,19 +566,19 @@ public static Java.Nio.File.Path SetPosixFilePermissions(Java.Nio.File.Path arg0
             return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "setPosixFilePermissions", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#walkFileTree(java.nio.file.Path,java.nio.file.FileVisitor)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#walkFileTree(java.nio.file.Path,java.nio.file.FileVisitor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.FileVisitor"/></param>
         /// <typeparam name="Arg1objectSuperJava_Nio_File_Path"><see cref="Java.Nio.File.Path"/></typeparam>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.File.Path WalkFileTree<Arg1objectSuperJava_Nio_File_Path>(Java.Nio.File.Path arg0, Java.Nio.File.FileVisitor<Arg1objectSuperJava_Nio_File_Path> arg1) where Arg1objectSuperJava_Nio_File_Path: Java.Nio.File.Path
+        public static Java.Nio.File.Path WalkFileTree<Arg1objectSuperJava_Nio_File_Path>(Java.Nio.File.Path arg0, Java.Nio.File.FileVisitor<Arg1objectSuperJava_Nio_File_Path> arg1) where Arg1objectSuperJava_Nio_File_Path : Java.Nio.File.Path
         {
             return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "walkFileTree", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#walkFileTree(java.nio.file.Path,java.util.Set,int,java.nio.file.FileVisitor)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#walkFileTree(java.nio.file.Path,java.util.Set,int,java.nio.file.FileVisitor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -587,12 +587,12 @@ public static Java.Nio.File.Path WalkFileTree<Arg1objectSuperJava_Nio_File_Path>
         /// <typeparam name="Arg3objectSuperJava_Nio_File_Path"><see cref="Java.Nio.File.Path"/></typeparam>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.File.Path WalkFileTree<Arg3objectSuperJava_Nio_File_Path>(Java.Nio.File.Path arg0, Java.Util.Set<Java.Nio.File.FileVisitOption> arg1, int arg2, Java.Nio.File.FileVisitor<Arg3objectSuperJava_Nio_File_Path> arg3) where Arg3objectSuperJava_Nio_File_Path: Java.Nio.File.Path
+        public static Java.Nio.File.Path WalkFileTree<Arg3objectSuperJava_Nio_File_Path>(Java.Nio.File.Path arg0, Java.Util.Set<Java.Nio.File.FileVisitOption> arg1, int arg2, Java.Nio.File.FileVisitor<Arg3objectSuperJava_Nio_File_Path> arg3) where Arg3objectSuperJava_Nio_File_Path : Java.Nio.File.Path
         {
             return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "walkFileTree", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#write(java.nio.file.Path,byte[],java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#write(java.nio.file.Path,byte[],java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -604,7 +604,7 @@ public static Java.Nio.File.Path Write(Java.Nio.File.Path arg0, byte[] arg1, par
             if (arg2.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "write", arg0, arg1); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#write(java.nio.file.Path,java.lang.Iterable,java.nio.charset.Charset,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#write(java.nio.file.Path,java.lang.Iterable,java.nio.charset.Charset,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Iterable"/></param>
@@ -613,12 +613,12 @@ public static Java.Nio.File.Path Write(Java.Nio.File.Path arg0, byte[] arg1, par
         /// <typeparam name="Arg1ExtendsJava_Lang_CharSequence"><see cref="Java.Lang.CharSequence"/></typeparam>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.File.Path Write<Arg1ExtendsJava_Lang_CharSequence>(Java.Nio.File.Path arg0, Java.Lang.Iterable<Arg1ExtendsJava_Lang_CharSequence> arg1, Java.Nio.Charset.Charset arg2, params Java.Nio.File.OpenOption[] arg3) where Arg1ExtendsJava_Lang_CharSequence: Java.Lang.CharSequence
+        public static Java.Nio.File.Path Write<Arg1ExtendsJava_Lang_CharSequence>(Java.Nio.File.Path arg0, Java.Lang.Iterable<Arg1ExtendsJava_Lang_CharSequence> arg1, Java.Nio.Charset.Charset arg2, params Java.Nio.File.OpenOption[] arg3) where Arg1ExtendsJava_Lang_CharSequence : Java.Lang.CharSequence
         {
             if (arg3.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "write", arg0, arg1, arg2); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "write", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#write(java.nio.file.Path,java.lang.Iterable,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#write(java.nio.file.Path,java.lang.Iterable,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Iterable"/></param>
@@ -626,12 +626,12 @@ public static Java.Nio.File.Path Write<Arg1ExtendsJava_Lang_CharSequence>(Java.N
         /// <typeparam name="Arg1ExtendsJava_Lang_CharSequence"><see cref="Java.Lang.CharSequence"/></typeparam>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public static Java.Nio.File.Path Write<Arg1ExtendsJava_Lang_CharSequence>(Java.Nio.File.Path arg0, Java.Lang.Iterable<Arg1ExtendsJava_Lang_CharSequence> arg1, params Java.Nio.File.OpenOption[] arg2) where Arg1ExtendsJava_Lang_CharSequence: Java.Lang.CharSequence
+        public static Java.Nio.File.Path Write<Arg1ExtendsJava_Lang_CharSequence>(Java.Nio.File.Path arg0, Java.Lang.Iterable<Arg1ExtendsJava_Lang_CharSequence> arg1, params Java.Nio.File.OpenOption[] arg2) where Arg1ExtendsJava_Lang_CharSequence : Java.Lang.CharSequence
         {
             if (arg2.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "write", arg0, arg1); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "write", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#writeString(java.nio.file.Path,java.lang.CharSequence,java.nio.charset.Charset,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#writeString(java.nio.file.Path,java.lang.CharSequence,java.nio.charset.Charset,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
@@ -644,7 +644,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             if (arg3.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "writeString", arg0, arg1, arg2); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "writeString", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#writeString(java.nio.file.Path,java.lang.CharSequence,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#writeString(java.nio.file.Path,java.lang.CharSequence,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
@@ -656,7 +656,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             if (arg2.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "writeString", arg0, arg1); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "writeString", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#readAllLines(java.nio.file.Path,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#readAllLines(java.nio.file.Path,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -667,7 +667,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             return SExecute<Java.Util.List<Java.Lang.String>>(LocalBridgeClazz, "readAllLines", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#readAllLines(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#readAllLines(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -677,7 +677,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             return SExecuteWithSignature<Java.Util.List<Java.Lang.String>>(LocalBridgeClazz, "readAllLines", "(Ljava/nio/file/Path;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#readAttributes(java.nio.file.Path,java.lang.String,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#readAttributes(java.nio.file.Path,java.lang.String,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -689,7 +689,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             if (arg2.Length == 0) return SExecute<Java.Util.Map<Java.Lang.String, object>>(LocalBridgeClazz, "readAttributes", arg0, arg1); else return SExecute<Java.Util.Map<Java.Lang.String, object>>(LocalBridgeClazz, "readAttributes", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#getPosixFilePermissions(java.nio.file.Path,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#getPosixFilePermissions(java.nio.file.Path,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -700,7 +700,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             if (arg1.Length == 0) return SExecute<Java.Util.Set<Java.Nio.File.Attribute.PosixFilePermission>>(LocalBridgeClazz, "getPosixFilePermissions", arg0); else return SExecute<Java.Util.Set<Java.Nio.File.Attribute.PosixFilePermission>>(LocalBridgeClazz, "getPosixFilePermissions", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#lines(java.nio.file.Path,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#lines(java.nio.file.Path,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -711,7 +711,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             return SExecute<Java.Util.Stream.Stream<Java.Lang.String>>(LocalBridgeClazz, "lines", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#lines(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#lines(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -721,7 +721,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             return SExecuteWithSignature<Java.Util.Stream.Stream<Java.Lang.String>>(LocalBridgeClazz, "lines", "(Ljava/nio/file/Path;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#find(java.nio.file.Path,int,java.util.function.BiPredicate,java.nio.file.FileVisitOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#find(java.nio.file.Path,int,java.util.function.BiPredicate,java.nio.file.FileVisitOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -734,7 +734,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             if (arg3.Length == 0) return SExecute<Java.Util.Stream.Stream<Java.Nio.File.Path>>(LocalBridgeClazz, "find", arg0, arg1, arg2); else return SExecute<Java.Util.Stream.Stream<Java.Nio.File.Path>>(LocalBridgeClazz, "find", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#list(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#list(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -744,7 +744,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             return SExecuteWithSignature<Java.Util.Stream.Stream<Java.Nio.File.Path>>(LocalBridgeClazz, "list", "(Ljava/nio/file/Path;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#walk(java.nio.file.Path,int,java.nio.file.FileVisitOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#walk(java.nio.file.Path,int,java.nio.file.FileVisitOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -756,7 +756,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             if (arg2.Length == 0) return SExecute<Java.Util.Stream.Stream<Java.Nio.File.Path>>(LocalBridgeClazz, "walk", arg0, arg1); else return SExecute<Java.Util.Stream.Stream<Java.Nio.File.Path>>(LocalBridgeClazz, "walk", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#walk(java.nio.file.Path,java.nio.file.FileVisitOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#walk(java.nio.file.Path,java.nio.file.FileVisitOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.FileVisitOption"/></param>
@@ -767,7 +767,7 @@ public static Java.Nio.File.Path WriteString(Java.Nio.File.Path arg0, Java.Lang.
             if (arg1.Length == 0) return SExecute<Java.Util.Stream.Stream<Java.Nio.File.Path>>(LocalBridgeClazz, "walk", arg0); else return SExecute<Java.Util.Stream.Stream<Java.Nio.File.Path>>(LocalBridgeClazz, "walk", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#copy(java.io.InputStream,java.nio.file.Path,java.nio.file.CopyOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#copy(java.io.InputStream,java.nio.file.Path,java.nio.file.CopyOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -779,7 +779,7 @@ public static long Copy(Java.Io.InputStream arg0, Java.Nio.File.Path arg1, param
             if (arg2.Length == 0) return SExecute<long>(LocalBridgeClazz, "copy", arg0, arg1); else return SExecute<long>(LocalBridgeClazz, "copy", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#copy(java.nio.file.Path,java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#copy(java.nio.file.Path,java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Io.OutputStream"/></param>
@@ -790,18 +790,7 @@ public static long Copy(Java.Nio.File.Path arg0, Java.Io.OutputStream arg1)
             return SExecute<long>(LocalBridgeClazz, "copy", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#mismatch(java.nio.file.Path,java.nio.file.Path)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
-        /// <returns><see cref="long"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public static long Mismatch(Java.Nio.File.Path arg0, Java.Nio.File.Path arg1)
-        {
-            return SExecute<long>(LocalBridgeClazz, "mismatch", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#size(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#size(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="long"/></returns>
@@ -811,7 +800,7 @@ public static long Size(Java.Nio.File.Path arg0)
             return SExecuteWithSignature<long>(LocalBridgeClazz, "size", "(Ljava/nio/file/Path;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Files.html#delete(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Files.html#delete(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/LinkOption.cs b/src/net/Netdroid/Generated/Java/Nio/File/LinkOption.cs
index b53d7d47d..ad935f48d 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/LinkOption.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/LinkOption.cs
@@ -46,7 +46,7 @@ public partial class LinkOption : Java.Nio.File.IOpenOption, Java.Nio.File.ICopy
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/LinkOption.html#NOFOLLOW_LINKS"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/LinkOption.html#NOFOLLOW_LINKS"/>
         /// </summary>
         public static Java.Nio.File.LinkOption NOFOLLOW_LINKS { get { if (!_NOFOLLOW_LINKSReady) { _NOFOLLOW_LINKSContent = SGetField<Java.Nio.File.LinkOption>(LocalBridgeClazz, "NOFOLLOW_LINKS"); _NOFOLLOW_LINKSReady = true; } return _NOFOLLOW_LINKSContent; } }
         private static Java.Nio.File.LinkOption _NOFOLLOW_LINKSContent = default;
@@ -56,7 +56,7 @@ public partial class LinkOption : Java.Nio.File.IOpenOption, Java.Nio.File.ICopy
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/LinkOption.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/LinkOption.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.LinkOption"/></returns>
@@ -65,7 +65,7 @@ public static Java.Nio.File.LinkOption ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Nio.File.LinkOption>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/LinkOption;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/LinkOption.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/LinkOption.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.LinkOption"/></returns>
         public static Java.Nio.File.LinkOption[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/LinkPermission.cs b/src/net/Netdroid/Generated/Java/Nio/File/LinkPermission.cs
index 8cfcd9db5..c0814030b 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/LinkPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/LinkPermission.cs
@@ -30,7 +30,7 @@ public partial class LinkPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/LinkPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/LinkPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public LinkPermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/LinkPermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/LinkPermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public LinkPermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Path.cs b/src/net/Netdroid/Generated/Java/Nio/File/Path.cs
index 3f2a5f3e6..62fb4b109 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Path.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Path.cs
@@ -68,7 +68,7 @@ public partial class Path : Java.Nio.File.IPath, Java.Lang.IComparable<Java.Nio.
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#of(java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#of(java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -78,7 +78,7 @@ public static Java.Nio.File.Path Of(Java.Lang.String arg0, params Java.Lang.Stri
             if (arg1.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "of", arg0); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#of(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#of(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -91,42 +91,7 @@ public static Java.Nio.File.Path Of(Java.Net.URI arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#getFileName()"/> 
-        /// </summary>
-        public Java.Nio.File.Path FileName
-        {
-            get { return IExecuteWithSignature<Java.Nio.File.Path>("getFileName", "()Ljava/nio/file/Path;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#getFileSystem()"/> 
-        /// </summary>
-        public Java.Nio.File.FileSystem FileSystem
-        {
-            get { return IExecuteWithSignature<Java.Nio.File.FileSystem>("getFileSystem", "()Ljava/nio/file/FileSystem;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#getNameCount()"/> 
-        /// </summary>
-        public int NameCount
-        {
-            get { return IExecuteWithSignature<int>("getNameCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#getParent()"/> 
-        /// </summary>
-        public Java.Nio.File.Path Parent
-        {
-            get { return IExecuteWithSignature<Java.Nio.File.Path>("getParent", "()Ljava/nio/file/Path;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#getRoot()"/> 
-        /// </summary>
-        public Java.Nio.File.Path Root
-        {
-            get { return IExecuteWithSignature<Java.Nio.File.Path>("getRoot", "()Ljava/nio/file/Path;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#endsWith(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#endsWith(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -135,7 +100,7 @@ public bool EndsWith(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<bool>("endsWith", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#isAbsolute()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#isAbsolute()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsAbsolute()
@@ -143,7 +108,7 @@ public bool IsAbsolute()
             return IExecuteWithSignature<bool>("isAbsolute", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#startsWith(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#startsWith(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -152,7 +117,7 @@ public bool StartsWith(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<bool>("startsWith", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#compareTo(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#compareTo(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="int"/></returns>
@@ -161,7 +126,15 @@ public int CompareTo(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/file/Path;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#toUri()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#getNameCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNameCount()
+        {
+            return IExecuteWithSignature<int>("getNameCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#toUri()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URI"/></returns>
         public Java.Net.URI ToUri()
@@ -169,7 +142,23 @@ public Java.Net.URI ToUri()
             return IExecuteWithSignature<Java.Net.URI>("toUri", "()Ljava/net/URI;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#getName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#getFileSystem()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Nio.File.FileSystem"/></returns>
+        public Java.Nio.File.FileSystem GetFileSystem()
+        {
+            return IExecuteWithSignature<Java.Nio.File.FileSystem>("getFileSystem", "()Ljava/nio/file/FileSystem;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#getFileName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Nio.File.Path"/></returns>
+        public Java.Nio.File.Path GetFileName()
+        {
+            return IExecuteWithSignature<Java.Nio.File.Path>("getFileName", "()Ljava/nio/file/Path;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#getName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -178,7 +167,23 @@ public Java.Nio.File.Path GetName(int arg0)
             return IExecuteWithSignature<Java.Nio.File.Path>("getName", "(I)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#normalize()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#getParent()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Nio.File.Path"/></returns>
+        public Java.Nio.File.Path GetParent()
+        {
+            return IExecuteWithSignature<Java.Nio.File.Path>("getParent", "()Ljava/nio/file/Path;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#getRoot()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Nio.File.Path"/></returns>
+        public Java.Nio.File.Path GetRoot()
+        {
+            return IExecuteWithSignature<Java.Nio.File.Path>("getRoot", "()Ljava/nio/file/Path;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#normalize()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
         public Java.Nio.File.Path Normalize()
@@ -186,7 +191,7 @@ public Java.Nio.File.Path Normalize()
             return IExecuteWithSignature<Java.Nio.File.Path>("normalize", "()Ljava/nio/file/Path;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#relativize(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#relativize(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -195,7 +200,7 @@ public Java.Nio.File.Path Relativize(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<Java.Nio.File.Path>("relativize", "(Ljava/nio/file/Path;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#resolve(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#resolve(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -204,7 +209,7 @@ public Java.Nio.File.Path Resolve(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<Java.Nio.File.Path>("resolve", "(Ljava/nio/file/Path;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#subpath(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#subpath(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -214,7 +219,7 @@ public Java.Nio.File.Path Subpath(int arg0, int arg1)
             return IExecute<Java.Nio.File.Path>("subpath", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#toAbsolutePath()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#toAbsolutePath()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
         public Java.Nio.File.Path ToAbsolutePath()
@@ -222,7 +227,7 @@ public Java.Nio.File.Path ToAbsolutePath()
             return IExecuteWithSignature<Java.Nio.File.Path>("toAbsolutePath", "()Ljava/nio/file/Path;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#toRealPath(java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#toRealPath(java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.LinkOption"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -232,7 +237,7 @@ public Java.Nio.File.Path ToRealPath(params Java.Nio.File.LinkOption[] arg0)
             if (arg0.Length == 0) return IExecuteWithSignature<Java.Nio.File.Path>("toRealPath", "([Ljava/nio/file/LinkOption;)Ljava/nio/file/Path;"); else return IExecuteWithSignature<Java.Nio.File.Path>("toRealPath", "([Ljava/nio/file/LinkOption;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#register(java.nio.file.WatchService,java.nio.file.WatchEvent.Kind[],java.nio.file.WatchEvent.Modifier[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#register(java.nio.file.WatchService,java.nio.file.WatchEvent.Kind[],java.nio.file.WatchEvent.Modifier[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.WatchService"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.WatchEvent.Kind"/></param>
@@ -244,7 +249,7 @@ public Java.Nio.File.WatchKey Register(Java.Nio.File.WatchService arg0, Java.Nio
             if (arg2.Length == 0) return IExecute<Java.Nio.File.WatchKey>("register", arg0, arg1); else return IExecute<Java.Nio.File.WatchKey>("register", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#endsWith(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#endsWith(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -253,7 +258,7 @@ public bool EndsWith(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("endsWith", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#startsWith(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#startsWith(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -262,7 +267,7 @@ public bool StartsWith(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("startsWith", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -271,7 +276,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#toFile()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#toFile()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.File"/></returns>
         public Java.Io.File ToFile()
@@ -279,7 +284,7 @@ public Java.Io.File ToFile()
             return IExecuteWithSignature<Java.Io.File>("toFile", "()Ljava/io/File;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#resolve(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#resolve(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -288,7 +293,7 @@ public Java.Nio.File.Path Resolve(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Nio.File.Path>("resolve", "(Ljava/lang/String;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#resolveSibling(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#resolveSibling(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -297,7 +302,7 @@ public Java.Nio.File.Path ResolveSibling(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Nio.File.Path>("resolveSibling", "(Ljava/lang/String;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#resolveSibling(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#resolveSibling(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -306,7 +311,7 @@ public Java.Nio.File.Path ResolveSibling(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<Java.Nio.File.Path>("resolveSibling", "(Ljava/nio/file/Path;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#register(java.nio.file.WatchService,java.nio.file.WatchEvent.Kind[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#register(java.nio.file.WatchService,java.nio.file.WatchEvent.Kind[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.WatchService"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.WatchEvent.Kind"/></param>
@@ -317,7 +322,7 @@ public Java.Nio.File.WatchKey Register(Java.Nio.File.WatchService arg0, params J
             if (arg1.Length == 0) return IExecute<Java.Nio.File.WatchKey>("register", arg0); else return IExecute<Java.Nio.File.WatchKey>("register", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Path.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Path.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<Java.Nio.File.Path> Iterator()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/PathMatcher.cs b/src/net/Netdroid/Generated/Java/Nio/File/PathMatcher.cs
index 25cdbac8c..2d287bcdb 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/PathMatcher.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/PathMatcher.cs
@@ -64,7 +64,7 @@ public partial class PathMatcher : Java.Nio.File.IPathMatcher
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/PathMatcher.html#matches(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/PathMatcher.html#matches(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Paths.cs b/src/net/Netdroid/Generated/Java/Nio/File/Paths.cs
index 3fa169673..3da6ed4e8 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Paths.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Paths.cs
@@ -42,7 +42,7 @@ public partial class Paths
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Paths.html#get(java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Paths.html#get(java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -52,7 +52,7 @@ public static Java.Nio.File.Path Get(Java.Lang.String arg0, params Java.Lang.Str
             if (arg1.Length == 0) return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "get", arg0); else return SExecute<Java.Nio.File.Path>(LocalBridgeClazz, "get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Paths.html#get(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Paths.html#get(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/SecureDirectoryStream.cs b/src/net/Netdroid/Generated/Java/Nio/File/SecureDirectoryStream.cs
index 82a305430..504a2c287 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/SecureDirectoryStream.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/SecureDirectoryStream.cs
@@ -46,16 +46,16 @@ public partial class SecureDirectoryStream
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#getFileAttributeView(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#getFileAttributeView(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Nio.File.Attribute.FileAttributeView"/></returns>
         public Java.Nio.File.Attribute.FileAttributeView GetFileAttributeView(Java.Lang.Class arg0)
         {
-            return IExecuteWithSignature<Java.Nio.File.Attribute.FileAttributeView>("getFileAttributeView", "(Ljava/lang/Class;)Ljava/nio/file/attribute/FileAttributeView;", arg0);
+            return IExecute<Java.Nio.File.Attribute.FileAttributeView>("getFileAttributeView", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#getFileAttributeView(java.lang.Object,java.lang.Class,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#getFileAttributeView(java.lang.Object,java.lang.Class,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -66,7 +66,7 @@ public Java.Nio.File.Attribute.FileAttributeView GetFileAttributeView(object arg
             if (arg2.Length == 0) return IExecute<Java.Nio.File.Attribute.FileAttributeView>("getFileAttributeView", arg0, arg1); else return IExecute<Java.Nio.File.Attribute.FileAttributeView>("getFileAttributeView", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#newByteChannel(java.lang.Object,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#newByteChannel(java.lang.Object,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -78,7 +78,7 @@ public Java.Nio.Channels.SeekableByteChannel NewByteChannel(object arg0, Java.Ut
             if (arg2.Length == 0) return IExecute<Java.Nio.Channels.SeekableByteChannel>("newByteChannel", arg0, arg1); else return IExecute<Java.Nio.Channels.SeekableByteChannel>("newByteChannel", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#newDirectoryStream(java.lang.Object,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#newDirectoryStream(java.lang.Object,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -89,7 +89,7 @@ public Java.Nio.File.SecureDirectoryStream NewDirectoryStream(object arg0, param
             if (arg1.Length == 0) return IExecute<Java.Nio.File.SecureDirectoryStream>("newDirectoryStream", arg0); else return IExecute<Java.Nio.File.SecureDirectoryStream>("newDirectoryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#deleteDirectory(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#deleteDirectory(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -98,7 +98,7 @@ public void DeleteDirectory(object arg0)
             IExecuteWithSignature("deleteDirectory", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#deleteFile(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#deleteFile(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -107,7 +107,7 @@ public void DeleteFile(object arg0)
             IExecuteWithSignature("deleteFile", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#move(java.lang.Object,java.nio.file.SecureDirectoryStream,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#move(java.lang.Object,java.nio.file.SecureDirectoryStream,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.SecureDirectoryStream"/></param>
@@ -171,29 +171,29 @@ public partial class SecureDirectoryStream<T> : Java.Nio.File.ISecureDirectorySt
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#getFileAttributeView(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#getFileAttributeView(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="V"><see cref="Java.Nio.File.Attribute.IFileAttributeView"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V GetFileAttributeView<V>(Java.Lang.Class arg0) where V: Java.Nio.File.Attribute.IFileAttributeView, new()
+        public V GetFileAttributeView<V>(Java.Lang.Class arg0) where V : Java.Nio.File.Attribute.IFileAttributeView, new()
         {
-            return IExecuteWithSignature<V>("getFileAttributeView", "(Ljava/lang/Class;)Ljava/nio/file/attribute/FileAttributeView;", arg0);
+            return IExecute<V>("getFileAttributeView", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#getFileAttributeView(java.lang.Object,java.lang.Class,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#getFileAttributeView(java.lang.Object,java.lang.Class,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg2"><see cref="Java.Nio.File.LinkOption"/></param>
         /// <typeparam name="V"><see cref="Java.Nio.File.Attribute.IFileAttributeView"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V GetFileAttributeView<V>(T arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where V: Java.Nio.File.Attribute.IFileAttributeView, new()
+        public V GetFileAttributeView<V>(T arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where V : Java.Nio.File.Attribute.IFileAttributeView, new()
         {
             if (arg2.Length == 0) return IExecute<V>("getFileAttributeView", arg0, arg1); else return IExecute<V>("getFileAttributeView", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#newByteChannel(java.lang.Object,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#newByteChannel(java.lang.Object,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -201,12 +201,12 @@ public partial class SecureDirectoryStream<T> : Java.Nio.File.ISecureDirectorySt
         /// <typeparam name="Arg1ExtendsJava_Nio_File_OpenOption"><see cref="Java.Nio.File.OpenOption"/></typeparam>
         /// <returns><see cref="Java.Nio.Channels.SeekableByteChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public Java.Nio.Channels.SeekableByteChannel NewByteChannel<Arg1ExtendsJava_Nio_File_OpenOption>(T arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption: Java.Nio.File.OpenOption
+        public Java.Nio.Channels.SeekableByteChannel NewByteChannel<Arg1ExtendsJava_Nio_File_OpenOption>(T arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption : Java.Nio.File.OpenOption
         {
             if (arg2.Length == 0) return IExecute<Java.Nio.Channels.SeekableByteChannel>("newByteChannel", arg0, arg1); else return IExecute<Java.Nio.Channels.SeekableByteChannel>("newByteChannel", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#newDirectoryStream(java.lang.Object,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#newDirectoryStream(java.lang.Object,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.LinkOption"/></param>
@@ -217,7 +217,7 @@ public Java.Nio.File.SecureDirectoryStream<T> NewDirectoryStream(T arg0, params
             if (arg1.Length == 0) return IExecute<Java.Nio.File.SecureDirectoryStream<T>>("newDirectoryStream", arg0); else return IExecute<Java.Nio.File.SecureDirectoryStream<T>>("newDirectoryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#deleteDirectory(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#deleteDirectory(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -226,7 +226,7 @@ public void DeleteDirectory(T arg0)
             IExecuteWithSignature("deleteDirectory", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#deleteFile(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#deleteFile(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -235,7 +235,7 @@ public void DeleteFile(T arg0)
             IExecuteWithSignature("deleteFile", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SecureDirectoryStream.html#move(java.lang.Object,java.nio.file.SecureDirectoryStream,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SecureDirectoryStream.html#move(java.lang.Object,java.nio.file.SecureDirectoryStream,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.SecureDirectoryStream"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/SimpleFileVisitor.cs b/src/net/Netdroid/Generated/Java/Nio/File/SimpleFileVisitor.cs
index 46f63590f..3524b700a 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/SimpleFileVisitor.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/SimpleFileVisitor.cs
@@ -46,7 +46,7 @@ public partial class SimpleFileVisitor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html#postVisitDirectory(java.lang.Object,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html#postVisitDirectory(java.lang.Object,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Io.IOException"/></param>
@@ -57,7 +57,7 @@ public Java.Nio.File.FileVisitResult PostVisitDirectory(object arg0, MASES.JCOBr
             return IExecute<Java.Nio.File.FileVisitResult>("postVisitDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html#preVisitDirectory(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html#preVisitDirectory(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></param>
@@ -68,7 +68,7 @@ public Java.Nio.File.FileVisitResult PreVisitDirectory(object arg0, Java.Nio.Fil
             return IExecute<Java.Nio.File.FileVisitResult>("preVisitDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html#visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html#visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></param>
@@ -79,7 +79,7 @@ public Java.Nio.File.FileVisitResult VisitFile(object arg0, Java.Nio.File.Attrib
             return IExecute<Java.Nio.File.FileVisitResult>("visitFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html#visitFileFailed(java.lang.Object,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html#visitFileFailed(java.lang.Object,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Io.IOException"/></param>
@@ -125,7 +125,7 @@ public partial class SimpleFileVisitor<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html#postVisitDirectory(java.lang.Object,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html#postVisitDirectory(java.lang.Object,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Io.IOException"/></param>
@@ -136,7 +136,7 @@ public Java.Nio.File.FileVisitResult PostVisitDirectory(T arg0, MASES.JCOBridge.
             return IExecute<Java.Nio.File.FileVisitResult>("postVisitDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html#preVisitDirectory(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html#preVisitDirectory(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></param>
@@ -147,7 +147,7 @@ public Java.Nio.File.FileVisitResult PreVisitDirectory(T arg0, Java.Nio.File.Att
             return IExecute<Java.Nio.File.FileVisitResult>("preVisitDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html#visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html#visitFile(java.lang.Object,java.nio.file.attribute.BasicFileAttributes)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.BasicFileAttributes"/></param>
@@ -158,7 +158,7 @@ public Java.Nio.File.FileVisitResult VisitFile(T arg0, Java.Nio.File.Attribute.B
             return IExecute<Java.Nio.File.FileVisitResult>("visitFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/SimpleFileVisitor.html#visitFileFailed(java.lang.Object,java.io.IOException)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/SimpleFileVisitor.html#visitFileFailed(java.lang.Object,java.io.IOException)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Io.IOException"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Spi/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Nio/File/Spi/AllPackageClasses.cs
index 472f71762..d39a355e0 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Spi/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Spi/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Nio.File.Spi
 {
     #region FileSystemProvider
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html"/>
     /// </summary>
     public partial class FileSystemProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileSystemProvider>
     {
@@ -36,12 +36,12 @@ public partial class FileSystemProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileSystemProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileSystemProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileSystemProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileSystemProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileSystemProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileSystemProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public FileSystemProvider(params object[] args) : base(args) { }
 
     #region FileTypeDetector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileTypeDetector.html"/>
+    /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileTypeDetector.html"/>
     /// </summary>
     public partial class FileTypeDetector : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FileTypeDetector>
     {
@@ -82,12 +82,12 @@ public partial class FileTypeDetector : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("FileTypeDetector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileTypeDetector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileTypeDetector() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("FileTypeDetector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("FileTypeDetector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public FileTypeDetector(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Spi/FileSystemProvider.cs b/src/net/Netdroid/Generated/Java/Nio/File/Spi/FileSystemProvider.cs
index 06509c03e..dc2239958 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Spi/FileSystemProvider.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Spi/FileSystemProvider.cs
@@ -42,7 +42,7 @@ public partial class FileSystemProvider
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#installedProviders()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#installedProviders()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         public static Java.Util.List<Java.Nio.File.Spi.FileSystemProvider> InstalledProviders()
@@ -54,14 +54,7 @@ public partial class FileSystemProvider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#getScheme()"/> 
-        /// </summary>
-        public Java.Lang.String Scheme
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getScheme", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#readAttributes(java.nio.file.Path,java.lang.Class,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#readAttributes(java.nio.file.Path,java.lang.Class,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -69,24 +62,24 @@ public Java.Lang.String Scheme
         /// <typeparam name="A"><see cref="Java.Nio.File.Attribute.IBasicFileAttributes"/></typeparam>
         /// <returns><typeparamref name="A"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public A ReadAttributes<A>(Java.Nio.File.Path arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where A: Java.Nio.File.Attribute.IBasicFileAttributes, new()
+        public A ReadAttributes<A>(Java.Nio.File.Path arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where A : Java.Nio.File.Attribute.IBasicFileAttributes, new()
         {
             if (arg2.Length == 0) return IExecute<A>("readAttributes", arg0, arg1); else return IExecute<A>("readAttributes", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#getFileAttributeView(java.nio.file.Path,java.lang.Class,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#getFileAttributeView(java.nio.file.Path,java.lang.Class,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg2"><see cref="Java.Nio.File.LinkOption"/></param>
         /// <typeparam name="V"><see cref="Java.Nio.File.Attribute.IFileAttributeView"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V GetFileAttributeView<V>(Java.Nio.File.Path arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where V: Java.Nio.File.Attribute.IFileAttributeView, new()
+        public V GetFileAttributeView<V>(Java.Nio.File.Path arg0, Java.Lang.Class arg1, params Java.Nio.File.LinkOption[] arg2) where V : Java.Nio.File.Attribute.IFileAttributeView, new()
         {
             if (arg2.Length == 0) return IExecute<V>("getFileAttributeView", arg0, arg1); else return IExecute<V>("getFileAttributeView", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#isHidden(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#isHidden(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -96,7 +89,7 @@ public bool IsHidden(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<bool>("isHidden", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#isSameFile(java.nio.file.Path,java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#isSameFile(java.nio.file.Path,java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -107,7 +100,15 @@ public bool IsSameFile(Java.Nio.File.Path arg0, Java.Nio.File.Path arg1)
             return IExecute<bool>("isSameFile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#newByteChannel(java.nio.file.Path,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#getScheme()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetScheme()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getScheme", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#newByteChannel(java.nio.file.Path,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -115,24 +116,24 @@ public bool IsSameFile(Java.Nio.File.Path arg0, Java.Nio.File.Path arg1)
         /// <typeparam name="Arg1ExtendsJava_Nio_File_OpenOption"><see cref="Java.Nio.File.OpenOption"/></typeparam>
         /// <returns><see cref="Java.Nio.Channels.SeekableByteChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public Java.Nio.Channels.SeekableByteChannel NewByteChannel<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption: Java.Nio.File.OpenOption
+        public Java.Nio.Channels.SeekableByteChannel NewByteChannel<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption : Java.Nio.File.OpenOption
         {
             if (arg2.Length == 0) return IExecute<Java.Nio.Channels.SeekableByteChannel>("newByteChannel", arg0, arg1); else return IExecute<Java.Nio.Channels.SeekableByteChannel>("newByteChannel", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#newDirectoryStream(java.nio.file.Path,java.nio.file.DirectoryStream.Filter)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#newDirectoryStream(java.nio.file.Path,java.nio.file.DirectoryStream.Filter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.DirectoryStream.Filter"/></param>
         /// <typeparam name="Arg1objectSuperJava_Nio_File_Path"><see cref="Java.Nio.File.Path"/></typeparam>
         /// <returns><see cref="Java.Nio.File.DirectoryStream"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public Java.Nio.File.DirectoryStream<Java.Nio.File.Path> NewDirectoryStream<Arg1objectSuperJava_Nio_File_Path>(Java.Nio.File.Path arg0, Java.Nio.File.DirectoryStream.Filter<Arg1objectSuperJava_Nio_File_Path> arg1) where Arg1objectSuperJava_Nio_File_Path: Java.Nio.File.Path
+        public Java.Nio.File.DirectoryStream<Java.Nio.File.Path> NewDirectoryStream<Arg1objectSuperJava_Nio_File_Path>(Java.Nio.File.Path arg0, Java.Nio.File.DirectoryStream.Filter<Arg1objectSuperJava_Nio_File_Path> arg1) where Arg1objectSuperJava_Nio_File_Path : Java.Nio.File.Path
         {
             return IExecute<Java.Nio.File.DirectoryStream<Java.Nio.File.Path>>("newDirectoryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#getFileStore(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#getFileStore(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Nio.File.FileStore"/></returns>
@@ -142,7 +143,7 @@ public Java.Nio.File.FileStore GetFileStore(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<Java.Nio.File.FileStore>("getFileStore", "(Ljava/nio/file/Path;)Ljava/nio/file/FileStore;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#getFileSystem(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#getFileSystem(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Nio.File.FileSystem"/></returns>
@@ -151,7 +152,7 @@ public Java.Nio.File.FileSystem GetFileSystem(Java.Net.URI arg0)
             return IExecuteWithSignature<Java.Nio.File.FileSystem>("getFileSystem", "(Ljava/net/URI;)Ljava/nio/file/FileSystem;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#newFileSystem(java.net.URI,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#newFileSystem(java.net.URI,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -162,7 +163,7 @@ public Java.Nio.File.FileSystem NewFileSystem(Java.Net.URI arg0, Java.Util.Map<J
             return IExecute<Java.Nio.File.FileSystem>("newFileSystem", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#getPath(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#getPath(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -171,7 +172,7 @@ public Java.Nio.File.Path GetPath(Java.Net.URI arg0)
             return IExecuteWithSignature<Java.Nio.File.Path>("getPath", "(Ljava/net/URI;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#readAttributes(java.nio.file.Path,java.lang.String,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#readAttributes(java.nio.file.Path,java.lang.String,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -183,7 +184,7 @@ public Java.Nio.File.Path GetPath(Java.Net.URI arg0)
             if (arg2.Length == 0) return IExecute<Java.Util.Map<Java.Lang.String, object>>("readAttributes", arg0, arg1); else return IExecute<Java.Util.Map<Java.Lang.String, object>>("readAttributes", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#checkAccess(java.nio.file.Path,java.nio.file.AccessMode[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#checkAccess(java.nio.file.Path,java.nio.file.AccessMode[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.AccessMode"/></param>
@@ -193,7 +194,7 @@ public void CheckAccess(Java.Nio.File.Path arg0, params Java.Nio.File.AccessMode
             if (arg1.Length == 0) IExecute("checkAccess", arg0); else IExecute("checkAccess", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#copy(java.nio.file.Path,java.nio.file.Path,java.nio.file.CopyOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#copy(java.nio.file.Path,java.nio.file.Path,java.nio.file.CopyOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -204,7 +205,7 @@ public void Copy(Java.Nio.File.Path arg0, Java.Nio.File.Path arg1, params Java.N
             if (arg2.Length == 0) IExecute("copy", arg0, arg1); else IExecute("copy", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#createDirectory(java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#createDirectory(java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Attribute.FileAttribute"/></param>
@@ -214,7 +215,7 @@ public void CreateDirectory(Java.Nio.File.Path arg0, params Java.Nio.File.Attrib
             if (arg1.Length == 0) IExecute("createDirectory", arg0); else IExecute("createDirectory", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#delete(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#delete(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -223,7 +224,7 @@ public void Delete(Java.Nio.File.Path arg0)
             IExecuteWithSignature("delete", "(Ljava/nio/file/Path;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#move(java.nio.file.Path,java.nio.file.Path,java.nio.file.CopyOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#move(java.nio.file.Path,java.nio.file.Path,java.nio.file.CopyOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -234,7 +235,7 @@ public void Move(Java.Nio.File.Path arg0, Java.Nio.File.Path arg1, params Java.N
             if (arg2.Length == 0) IExecute("move", arg0, arg1); else IExecute("move", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#setAttribute(java.nio.file.Path,java.lang.String,java.lang.Object,java.nio.file.LinkOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#setAttribute(java.nio.file.Path,java.lang.String,java.lang.Object,java.nio.file.LinkOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -246,7 +247,7 @@ public void SetAttribute(Java.Nio.File.Path arg0, Java.Lang.String arg1, object
             if (arg3.Length == 0) IExecute("setAttribute", arg0, arg1, arg2); else IExecute("setAttribute", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#deleteIfExists(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#deleteIfExists(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -256,7 +257,7 @@ public bool DeleteIfExists(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<bool>("deleteIfExists", "(Ljava/nio/file/Path;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#newInputStream(java.nio.file.Path,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#newInputStream(java.nio.file.Path,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.OpenOption"/></param>
@@ -267,7 +268,7 @@ public Java.Io.InputStream NewInputStream(Java.Nio.File.Path arg0, params Java.N
             if (arg1.Length == 0) return IExecute<Java.Io.InputStream>("newInputStream", arg0); else return IExecute<Java.Io.InputStream>("newInputStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#newOutputStream(java.nio.file.Path,java.nio.file.OpenOption[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#newOutputStream(java.nio.file.Path,java.nio.file.OpenOption[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.OpenOption"/></param>
@@ -278,7 +279,7 @@ public Java.Io.OutputStream NewOutputStream(Java.Nio.File.Path arg0, params Java
             if (arg1.Length == 0) return IExecute<Java.Io.OutputStream>("newOutputStream", arg0); else return IExecute<Java.Io.OutputStream>("newOutputStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#newAsynchronousFileChannel(java.nio.file.Path,java.util.Set,java.util.concurrent.ExecutorService,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#newAsynchronousFileChannel(java.nio.file.Path,java.util.Set,java.util.concurrent.ExecutorService,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -287,12 +288,12 @@ public Java.Io.OutputStream NewOutputStream(Java.Nio.File.Path arg0, params Java
         /// <typeparam name="Arg1ExtendsJava_Nio_File_OpenOption"><see cref="Java.Nio.File.OpenOption"/></typeparam>
         /// <returns><see cref="Java.Nio.Channels.AsynchronousFileChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public Java.Nio.Channels.AsynchronousFileChannel NewAsynchronousFileChannel<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, Java.Util.Concurrent.ExecutorService arg2, params Java.Nio.File.Attribute.FileAttribute<object>[] arg3) where Arg1ExtendsJava_Nio_File_OpenOption: Java.Nio.File.OpenOption
+        public Java.Nio.Channels.AsynchronousFileChannel NewAsynchronousFileChannel<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, Java.Util.Concurrent.ExecutorService arg2, params Java.Nio.File.Attribute.FileAttribute<object>[] arg3) where Arg1ExtendsJava_Nio_File_OpenOption : Java.Nio.File.OpenOption
         {
             if (arg3.Length == 0) return IExecute<Java.Nio.Channels.AsynchronousFileChannel>("newAsynchronousFileChannel", arg0, arg1, arg2); else return IExecute<Java.Nio.Channels.AsynchronousFileChannel>("newAsynchronousFileChannel", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#newFileChannel(java.nio.file.Path,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#newFileChannel(java.nio.file.Path,java.util.Set,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -300,12 +301,12 @@ public Java.Nio.Channels.AsynchronousFileChannel NewAsynchronousFileChannel<Arg1
         /// <typeparam name="Arg1ExtendsJava_Nio_File_OpenOption"><see cref="Java.Nio.File.OpenOption"/></typeparam>
         /// <returns><see cref="Java.Nio.Channels.FileChannel"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        public Java.Nio.Channels.FileChannel NewFileChannel<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption: Java.Nio.File.OpenOption
+        public Java.Nio.Channels.FileChannel NewFileChannel<Arg1ExtendsJava_Nio_File_OpenOption>(Java.Nio.File.Path arg0, Java.Util.Set<Arg1ExtendsJava_Nio_File_OpenOption> arg1, params Java.Nio.File.Attribute.FileAttribute<object>[] arg2) where Arg1ExtendsJava_Nio_File_OpenOption : Java.Nio.File.OpenOption
         {
             if (arg2.Length == 0) return IExecute<Java.Nio.Channels.FileChannel>("newFileChannel", arg0, arg1); else return IExecute<Java.Nio.Channels.FileChannel>("newFileChannel", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#newFileSystem(java.nio.file.Path,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#newFileSystem(java.nio.file.Path,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -316,7 +317,7 @@ public Java.Nio.File.FileSystem NewFileSystem(Java.Nio.File.Path arg0, Java.Util
             return IExecute<Java.Nio.File.FileSystem>("newFileSystem", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#readSymbolicLink(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#readSymbolicLink(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Nio.File.Path"/></returns>
@@ -326,7 +327,7 @@ public Java.Nio.File.Path ReadSymbolicLink(Java.Nio.File.Path arg0)
             return IExecuteWithSignature<Java.Nio.File.Path>("readSymbolicLink", "(Ljava/nio/file/Path;)Ljava/nio/file/Path;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#createLink(java.nio.file.Path,java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#createLink(java.nio.file.Path,java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
@@ -336,7 +337,7 @@ public void CreateLink(Java.Nio.File.Path arg0, Java.Nio.File.Path arg1)
             IExecute("createLink", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileSystemProvider.html#createSymbolicLink(java.nio.file.Path,java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileSystemProvider.html#createSymbolicLink(java.nio.file.Path,java.nio.file.Path,java.nio.file.attribute.FileAttribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.Path"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Spi/FileTypeDetector.cs b/src/net/Netdroid/Generated/Java/Nio/File/Spi/FileTypeDetector.cs
index 7028984c9..3d964fb4c 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Spi/FileTypeDetector.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Spi/FileTypeDetector.cs
@@ -46,7 +46,7 @@ public partial class FileTypeDetector
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/spi/FileTypeDetector.html#probeContentType(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/spi/FileTypeDetector.html#probeContentType(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/StandardCopyOption.cs b/src/net/Netdroid/Generated/Java/Nio/File/StandardCopyOption.cs
index 8791d19af..d8fd10045 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/StandardCopyOption.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/StandardCopyOption.cs
@@ -42,19 +42,19 @@ public partial class StandardCopyOption
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardCopyOption.html#ATOMIC_MOVE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardCopyOption.html#ATOMIC_MOVE"/>
         /// </summary>
         public static Java.Nio.File.StandardCopyOption ATOMIC_MOVE { get { if (!_ATOMIC_MOVEReady) { _ATOMIC_MOVEContent = SGetField<Java.Nio.File.StandardCopyOption>(LocalBridgeClazz, "ATOMIC_MOVE"); _ATOMIC_MOVEReady = true; } return _ATOMIC_MOVEContent; } }
         private static Java.Nio.File.StandardCopyOption _ATOMIC_MOVEContent = default;
         private static bool _ATOMIC_MOVEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardCopyOption.html#COPY_ATTRIBUTES"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardCopyOption.html#COPY_ATTRIBUTES"/>
         /// </summary>
         public static Java.Nio.File.StandardCopyOption COPY_ATTRIBUTES { get { if (!_COPY_ATTRIBUTESReady) { _COPY_ATTRIBUTESContent = SGetField<Java.Nio.File.StandardCopyOption>(LocalBridgeClazz, "COPY_ATTRIBUTES"); _COPY_ATTRIBUTESReady = true; } return _COPY_ATTRIBUTESContent; } }
         private static Java.Nio.File.StandardCopyOption _COPY_ATTRIBUTESContent = default;
         private static bool _COPY_ATTRIBUTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardCopyOption.html#REPLACE_EXISTING"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardCopyOption.html#REPLACE_EXISTING"/>
         /// </summary>
         public static Java.Nio.File.StandardCopyOption REPLACE_EXISTING { get { if (!_REPLACE_EXISTINGReady) { _REPLACE_EXISTINGContent = SGetField<Java.Nio.File.StandardCopyOption>(LocalBridgeClazz, "REPLACE_EXISTING"); _REPLACE_EXISTINGReady = true; } return _REPLACE_EXISTINGContent; } }
         private static Java.Nio.File.StandardCopyOption _REPLACE_EXISTINGContent = default;
@@ -64,7 +64,7 @@ public partial class StandardCopyOption
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardCopyOption.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardCopyOption.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.StandardCopyOption"/></returns>
@@ -73,7 +73,7 @@ public static Java.Nio.File.StandardCopyOption ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Nio.File.StandardCopyOption>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/StandardCopyOption;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardCopyOption.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardCopyOption.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.StandardCopyOption"/></returns>
         public static Java.Nio.File.StandardCopyOption[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/StandardOpenOption.cs b/src/net/Netdroid/Generated/Java/Nio/File/StandardOpenOption.cs
index 6d8abe60f..1a1948d65 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/StandardOpenOption.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/StandardOpenOption.cs
@@ -42,61 +42,61 @@ public partial class StandardOpenOption
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#APPEND"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#APPEND"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption APPEND { get { if (!_APPENDReady) { _APPENDContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "APPEND"); _APPENDReady = true; } return _APPENDContent; } }
         private static Java.Nio.File.StandardOpenOption _APPENDContent = default;
         private static bool _APPENDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#CREATE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#CREATE"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption CREATE { get { if (!_CREATEReady) { _CREATEContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "CREATE"); _CREATEReady = true; } return _CREATEContent; } }
         private static Java.Nio.File.StandardOpenOption _CREATEContent = default;
         private static bool _CREATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#CREATE_NEW"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#CREATE_NEW"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption CREATE_NEW { get { if (!_CREATE_NEWReady) { _CREATE_NEWContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "CREATE_NEW"); _CREATE_NEWReady = true; } return _CREATE_NEWContent; } }
         private static Java.Nio.File.StandardOpenOption _CREATE_NEWContent = default;
         private static bool _CREATE_NEWReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#DELETE_ON_CLOSE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#DELETE_ON_CLOSE"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption DELETE_ON_CLOSE { get { if (!_DELETE_ON_CLOSEReady) { _DELETE_ON_CLOSEContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "DELETE_ON_CLOSE"); _DELETE_ON_CLOSEReady = true; } return _DELETE_ON_CLOSEContent; } }
         private static Java.Nio.File.StandardOpenOption _DELETE_ON_CLOSEContent = default;
         private static bool _DELETE_ON_CLOSEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#DSYNC"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#DSYNC"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption DSYNC { get { if (!_DSYNCReady) { _DSYNCContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "DSYNC"); _DSYNCReady = true; } return _DSYNCContent; } }
         private static Java.Nio.File.StandardOpenOption _DSYNCContent = default;
         private static bool _DSYNCReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#READ"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#READ"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption READ { get { if (!_READReady) { _READContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "READ"); _READReady = true; } return _READContent; } }
         private static Java.Nio.File.StandardOpenOption _READContent = default;
         private static bool _READReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#SPARSE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#SPARSE"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption SPARSE { get { if (!_SPARSEReady) { _SPARSEContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "SPARSE"); _SPARSEReady = true; } return _SPARSEContent; } }
         private static Java.Nio.File.StandardOpenOption _SPARSEContent = default;
         private static bool _SPARSEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#SYNC"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#SYNC"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption SYNC { get { if (!_SYNCReady) { _SYNCContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "SYNC"); _SYNCReady = true; } return _SYNCContent; } }
         private static Java.Nio.File.StandardOpenOption _SYNCContent = default;
         private static bool _SYNCReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#TRUNCATE_EXISTING"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#TRUNCATE_EXISTING"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption TRUNCATE_EXISTING { get { if (!_TRUNCATE_EXISTINGReady) { _TRUNCATE_EXISTINGContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "TRUNCATE_EXISTING"); _TRUNCATE_EXISTINGReady = true; } return _TRUNCATE_EXISTINGContent; } }
         private static Java.Nio.File.StandardOpenOption _TRUNCATE_EXISTINGContent = default;
         private static bool _TRUNCATE_EXISTINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#WRITE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#WRITE"/>
         /// </summary>
         public static Java.Nio.File.StandardOpenOption WRITE { get { if (!_WRITEReady) { _WRITEContent = SGetField<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "WRITE"); _WRITEReady = true; } return _WRITEContent; } }
         private static Java.Nio.File.StandardOpenOption _WRITEContent = default;
@@ -106,7 +106,7 @@ public partial class StandardOpenOption
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Nio.File.StandardOpenOption"/></returns>
@@ -115,7 +115,7 @@ public static Java.Nio.File.StandardOpenOption ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Nio.File.StandardOpenOption>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/nio/file/StandardOpenOption;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardOpenOption.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardOpenOption.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.StandardOpenOption"/></returns>
         public static Java.Nio.File.StandardOpenOption[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/StandardWatchEventKinds.cs b/src/net/Netdroid/Generated/Java/Nio/File/StandardWatchEventKinds.cs
index 73796611e..a9b0b1f94 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/StandardWatchEventKinds.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/StandardWatchEventKinds.cs
@@ -38,25 +38,25 @@ public partial class StandardWatchEventKinds
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardWatchEventKinds.html#OVERFLOW"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardWatchEventKinds.html#OVERFLOW"/>
         /// </summary>
         public static Java.Nio.File.WatchEvent.Kind OVERFLOW { get { if (!_OVERFLOWReady) { _OVERFLOWContent = SGetField<Java.Nio.File.WatchEvent.Kind>(LocalBridgeClazz, "OVERFLOW"); _OVERFLOWReady = true; } return _OVERFLOWContent; } }
         private static Java.Nio.File.WatchEvent.Kind _OVERFLOWContent = default;
         private static bool _OVERFLOWReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardWatchEventKinds.html#ENTRY_CREATE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardWatchEventKinds.html#ENTRY_CREATE"/>
         /// </summary>
         public static Java.Nio.File.WatchEvent.Kind ENTRY_CREATE { get { if (!_ENTRY_CREATEReady) { _ENTRY_CREATEContent = SGetField<Java.Nio.File.WatchEvent.Kind>(LocalBridgeClazz, "ENTRY_CREATE"); _ENTRY_CREATEReady = true; } return _ENTRY_CREATEContent; } }
         private static Java.Nio.File.WatchEvent.Kind _ENTRY_CREATEContent = default;
         private static bool _ENTRY_CREATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardWatchEventKinds.html#ENTRY_DELETE"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardWatchEventKinds.html#ENTRY_DELETE"/>
         /// </summary>
         public static Java.Nio.File.WatchEvent.Kind ENTRY_DELETE { get { if (!_ENTRY_DELETEReady) { _ENTRY_DELETEContent = SGetField<Java.Nio.File.WatchEvent.Kind>(LocalBridgeClazz, "ENTRY_DELETE"); _ENTRY_DELETEReady = true; } return _ENTRY_DELETEContent; } }
         private static Java.Nio.File.WatchEvent.Kind _ENTRY_DELETEContent = default;
         private static bool _ENTRY_DELETEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/StandardWatchEventKinds.html#ENTRY_MODIFY"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/StandardWatchEventKinds.html#ENTRY_MODIFY"/>
         /// </summary>
         public static Java.Nio.File.WatchEvent.Kind ENTRY_MODIFY { get { if (!_ENTRY_MODIFYReady) { _ENTRY_MODIFYContent = SGetField<Java.Nio.File.WatchEvent.Kind>(LocalBridgeClazz, "ENTRY_MODIFY"); _ENTRY_MODIFYReady = true; } return _ENTRY_MODIFYContent; } }
         private static Java.Nio.File.WatchEvent.Kind _ENTRY_MODIFYContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/WatchEvent.cs b/src/net/Netdroid/Generated/Java/Nio/File/WatchEvent.cs
index b454beba7..29f9251f8 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/WatchEvent.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/WatchEvent.cs
@@ -46,7 +46,7 @@ public partial class WatchEvent
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.html#count()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.html#count()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Count()
@@ -54,7 +54,7 @@ public int Count()
             return IExecuteWithSignature<int>("count", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.html#kind()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.html#kind()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.WatchEvent.Kind"/></returns>
         public Java.Nio.File.WatchEvent.Kind KindMethod()
@@ -62,7 +62,7 @@ public Java.Nio.File.WatchEvent.Kind KindMethod()
             return IExecuteWithSignature<Java.Nio.File.WatchEvent.Kind>("kind", "()Ljava/nio/file/WatchEvent$Kind;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.html#context()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.html#context()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Context()
@@ -94,7 +94,7 @@ public partial class Kind
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.Kind.html#type()"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.Kind.html#type()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.Class"/></returns>
             public Java.Lang.Class Type()
@@ -102,7 +102,7 @@ public Java.Lang.Class Type()
                 return IExecuteWithSignature<Java.Lang.Class>("type", "()Ljava/lang/Class;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.Kind.html#name()"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.Kind.html#name()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.String"/></returns>
             public Java.Lang.String Name()
@@ -145,7 +145,7 @@ public partial class Kind<T>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.Kind.html#type()"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.Kind.html#type()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.Class"/></returns>
             public Java.Lang.Class Type()
@@ -153,7 +153,7 @@ public Java.Lang.Class Type()
                 return IExecuteWithSignature<Java.Lang.Class>("type", "()Ljava/lang/Class;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.Kind.html#name()"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.Kind.html#name()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.String"/></returns>
             public Java.Lang.String Name()
@@ -192,7 +192,7 @@ public partial class Modifier
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.Modifier.html#name()"/>
+            /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.Modifier.html#name()"/>
             /// </summary>
             /// <returns><see cref="Java.Lang.String"/></returns>
             public Java.Lang.String Name()
@@ -260,7 +260,7 @@ public partial class WatchEvent<T> : Java.Nio.File.IWatchEvent<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.html#count()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.html#count()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Count()
@@ -268,7 +268,7 @@ public int Count()
             return IExecuteWithSignature<int>("count", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.html#kind()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.html#kind()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.WatchEvent.Kind"/></returns>
         public Java.Nio.File.WatchEvent.Kind<T> KindMethod()
@@ -276,7 +276,7 @@ public Java.Nio.File.WatchEvent.Kind<T> KindMethod()
             return IExecuteWithSignature<Java.Nio.File.WatchEvent.Kind<T>>("kind", "()Ljava/nio/file/WatchEvent$Kind;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchEvent.html#context()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchEvent.html#context()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public T Context()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/WatchKey.cs b/src/net/Netdroid/Generated/Java/Nio/File/WatchKey.cs
index 98951c2e5..8535230c5 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/WatchKey.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/WatchKey.cs
@@ -64,7 +64,7 @@ public partial class WatchKey : Java.Nio.File.IWatchKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchKey.html#isValid()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchKey.html#isValid()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsValid()
@@ -72,7 +72,7 @@ public bool IsValid()
             return IExecuteWithSignature<bool>("isValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchKey.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchKey.html#reset()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Reset()
@@ -80,7 +80,7 @@ public bool Reset()
             return IExecuteWithSignature<bool>("reset", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchKey.html#watchable()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchKey.html#watchable()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.Watchable"/></returns>
         public Java.Nio.File.Watchable Watchable()
@@ -88,7 +88,7 @@ public Java.Nio.File.Watchable Watchable()
             return IExecuteWithSignature<Java.Nio.File.Watchable>("watchable", "()Ljava/nio/file/Watchable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchKey.html#pollEvents()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchKey.html#pollEvents()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         public Java.Util.List<Java.Nio.File.WatchEvent<object>> PollEvents()
@@ -96,7 +96,7 @@ public Java.Nio.File.Watchable Watchable()
             return IExecuteWithSignature<Java.Util.List<Java.Nio.File.WatchEvent<object>>>("pollEvents", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchKey.html#cancel()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchKey.html#cancel()"/>
         /// </summary>
         public void Cancel()
         {
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/WatchService.cs b/src/net/Netdroid/Generated/Java/Nio/File/WatchService.cs
index 10d4fc65c..3e8c6a3b9 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/WatchService.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/WatchService.cs
@@ -64,7 +64,7 @@ public partial class WatchService : Java.Nio.File.IWatchService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchService.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchService.html#poll()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.WatchKey"/></returns>
         public Java.Nio.File.WatchKey Poll()
@@ -72,7 +72,7 @@ public Java.Nio.File.WatchKey Poll()
             return IExecuteWithSignature<Java.Nio.File.WatchKey>("poll", "()Ljava/nio/file/WatchKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchService.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchService.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -83,7 +83,7 @@ public Java.Nio.File.WatchKey Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1
             return IExecute<Java.Nio.File.WatchKey>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchService.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchService.html#take()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.File.WatchKey"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -92,7 +92,7 @@ public Java.Nio.File.WatchKey Take()
             return IExecuteWithSignature<Java.Nio.File.WatchKey>("take", "()Ljava/nio/file/WatchKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/WatchService.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/WatchService.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Nio/File/Watchable.cs b/src/net/Netdroid/Generated/Java/Nio/File/Watchable.cs
index 51aa04f40..54c7ee983 100644
--- a/src/net/Netdroid/Generated/Java/Nio/File/Watchable.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/File/Watchable.cs
@@ -64,7 +64,7 @@ public partial class Watchable : Java.Nio.File.IWatchable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Watchable.html#register(java.nio.file.WatchService,java.nio.file.WatchEvent.Kind[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Watchable.html#register(java.nio.file.WatchService,java.nio.file.WatchEvent.Kind[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.WatchService"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.WatchEvent.Kind"/></param>
@@ -75,7 +75,7 @@ public Java.Nio.File.WatchKey Register(Java.Nio.File.WatchService arg0, params J
             if (arg1.Length == 0) return IExecute<Java.Nio.File.WatchKey>("register", arg0); else return IExecute<Java.Nio.File.WatchKey>("register", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/file/Watchable.html#register(java.nio.file.WatchService,java.nio.file.WatchEvent.Kind[],java.nio.file.WatchEvent.Modifier[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/file/Watchable.html#register(java.nio.file.WatchService,java.nio.file.WatchEvent.Kind[],java.nio.file.WatchEvent.Modifier[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.WatchService"/></param>
         /// <param name="arg1"><see cref="Java.Nio.File.WatchEvent.Kind"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/FloatBuffer.cs b/src/net/Netdroid/Generated/Java/Nio/FloatBuffer.cs
index a25976b71..38da008d7 100644
--- a/src/net/Netdroid/Generated/Java/Nio/FloatBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/FloatBuffer.cs
@@ -46,7 +46,7 @@ public partial class FloatBuffer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#allocate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#allocate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
@@ -55,7 +55,7 @@ public static Java.Nio.FloatBuffer Allocate(int arg0)
             return SExecuteWithSignature<Java.Nio.FloatBuffer>(LocalBridgeClazz, "allocate", "(I)Ljava/nio/FloatBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#wrap(float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#wrap(float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -66,7 +66,7 @@ public static Java.Nio.FloatBuffer Wrap(float[] arg0, int arg1, int arg2)
             return SExecute<Java.Nio.FloatBuffer>(LocalBridgeClazz, "wrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#wrap(float[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#wrap(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
@@ -79,7 +79,7 @@ public static Java.Nio.FloatBuffer Wrap(float[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#get()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         public float Get()
@@ -87,7 +87,7 @@ public float Get()
             return IExecuteWithSignature<float>("get", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
@@ -96,7 +96,7 @@ public float Get(int arg0)
             return IExecuteWithSignature<float>("get", "(I)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#order()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#order()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteOrder"/></returns>
         public Java.Nio.ByteOrder Order()
@@ -104,7 +104,7 @@ public Java.Nio.ByteOrder Order()
             return IExecuteWithSignature<Java.Nio.ByteOrder>("order", "()Ljava/nio/ByteOrder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#asReadOnlyBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#asReadOnlyBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
         public Java.Nio.FloatBuffer AsReadOnlyBuffer()
@@ -112,7 +112,7 @@ public Java.Nio.FloatBuffer AsReadOnlyBuffer()
             return IExecuteWithSignature<Java.Nio.FloatBuffer>("asReadOnlyBuffer", "()Ljava/nio/FloatBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#compact()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#compact()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
         public Java.Nio.FloatBuffer Compact()
@@ -120,7 +120,7 @@ public Java.Nio.FloatBuffer Compact()
             return IExecuteWithSignature<Java.Nio.FloatBuffer>("compact", "()Ljava/nio/FloatBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#put(float)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#put(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
@@ -129,7 +129,7 @@ public Java.Nio.FloatBuffer Put(float arg0)
             return IExecuteWithSignature<Java.Nio.FloatBuffer>("put", "(F)Ljava/nio/FloatBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#put(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#put(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -139,7 +139,7 @@ public Java.Nio.FloatBuffer Put(int arg0, float arg1)
             return IExecute<Java.Nio.FloatBuffer>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#put(float[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#put(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
@@ -148,7 +148,7 @@ public Java.Nio.FloatBuffer Put(float[] arg0)
             return IExecuteWithSignature<Java.Nio.FloatBuffer>("put", "([F)Ljava/nio/FloatBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -157,7 +157,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#compareTo(java.nio.FloatBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#compareTo(java.nio.FloatBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.FloatBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -166,7 +166,7 @@ public int CompareTo(Java.Nio.FloatBuffer arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/FloatBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#mismatch(java.nio.FloatBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#mismatch(java.nio.FloatBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.FloatBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -175,7 +175,7 @@ public int Mismatch(Java.Nio.FloatBuffer arg0)
             return IExecuteWithSignature<int>("mismatch", "(Ljava/nio/FloatBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#get(float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#get(float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -186,7 +186,7 @@ public Java.Nio.FloatBuffer Get(float[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.FloatBuffer>("get", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#get(float[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#get(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
@@ -195,29 +195,7 @@ public Java.Nio.FloatBuffer Get(float[] arg0)
             return IExecuteWithSignature<Java.Nio.FloatBuffer>("get", "([F)Ljava/nio/FloatBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#get(int,float[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
-        public Java.Nio.FloatBuffer Get(int arg0, float[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.FloatBuffer>("get", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#get(int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
-        public Java.Nio.FloatBuffer Get(int arg0, float[] arg1)
-        {
-            return IExecute<Java.Nio.FloatBuffer>("get", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#put(float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#put(float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -228,41 +206,7 @@ public Java.Nio.FloatBuffer Put(float[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.FloatBuffer>("put", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#put(int,float[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
-        public Java.Nio.FloatBuffer Put(int arg0, float[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.FloatBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#put(int,float[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="float"/></param>
-        /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
-        public Java.Nio.FloatBuffer Put(int arg0, float[] arg1)
-        {
-            return IExecute<Java.Nio.FloatBuffer>("put", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#put(int,java.nio.FloatBuffer,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.FloatBuffer"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
-        public Java.Nio.FloatBuffer Put(int arg0, Java.Nio.FloatBuffer arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.FloatBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/FloatBuffer.html#put(java.nio.FloatBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/FloatBuffer.html#put(java.nio.FloatBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.FloatBuffer"/></param>
         /// <returns><see cref="Java.Nio.FloatBuffer"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/IntBuffer.cs b/src/net/Netdroid/Generated/Java/Nio/IntBuffer.cs
index 851c8f231..11100d7f8 100644
--- a/src/net/Netdroid/Generated/Java/Nio/IntBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/IntBuffer.cs
@@ -46,7 +46,7 @@ public partial class IntBuffer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#allocate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#allocate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
@@ -55,7 +55,7 @@ public static Java.Nio.IntBuffer Allocate(int arg0)
             return SExecuteWithSignature<Java.Nio.IntBuffer>(LocalBridgeClazz, "allocate", "(I)Ljava/nio/IntBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#wrap(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#wrap(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -66,7 +66,7 @@ public static Java.Nio.IntBuffer Wrap(int[] arg0, int arg1, int arg2)
             return SExecute<Java.Nio.IntBuffer>(LocalBridgeClazz, "wrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#wrap(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#wrap(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
@@ -79,7 +79,7 @@ public static Java.Nio.IntBuffer Wrap(int[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#get()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Get()
@@ -87,7 +87,7 @@ public int Get()
             return IExecuteWithSignature<int>("get", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -96,7 +96,7 @@ public int Get(int arg0)
             return IExecuteWithSignature<int>("get", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#order()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#order()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteOrder"/></returns>
         public Java.Nio.ByteOrder Order()
@@ -104,7 +104,7 @@ public Java.Nio.ByteOrder Order()
             return IExecuteWithSignature<Java.Nio.ByteOrder>("order", "()Ljava/nio/ByteOrder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#asReadOnlyBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#asReadOnlyBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
         public Java.Nio.IntBuffer AsReadOnlyBuffer()
@@ -112,7 +112,7 @@ public Java.Nio.IntBuffer AsReadOnlyBuffer()
             return IExecuteWithSignature<Java.Nio.IntBuffer>("asReadOnlyBuffer", "()Ljava/nio/IntBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#compact()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#compact()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
         public Java.Nio.IntBuffer Compact()
@@ -120,7 +120,7 @@ public Java.Nio.IntBuffer Compact()
             return IExecuteWithSignature<Java.Nio.IntBuffer>("compact", "()Ljava/nio/IntBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#put(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#put(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -130,7 +130,7 @@ public Java.Nio.IntBuffer Put(int arg0, int arg1)
             return IExecute<Java.Nio.IntBuffer>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#put(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#put(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
@@ -139,7 +139,7 @@ public Java.Nio.IntBuffer Put(int arg0)
             return IExecuteWithSignature<Java.Nio.IntBuffer>("put", "(I)Ljava/nio/IntBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#put(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#put(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
@@ -148,7 +148,7 @@ public Java.Nio.IntBuffer Put(int[] arg0)
             return IExecuteWithSignature<Java.Nio.IntBuffer>("put", "([I)Ljava/nio/IntBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -157,7 +157,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#compareTo(java.nio.IntBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#compareTo(java.nio.IntBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.IntBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -166,7 +166,7 @@ public int CompareTo(Java.Nio.IntBuffer arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/IntBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#mismatch(java.nio.IntBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#mismatch(java.nio.IntBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.IntBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -175,29 +175,7 @@ public int Mismatch(Java.Nio.IntBuffer arg0)
             return IExecuteWithSignature<int>("mismatch", "(Ljava/nio/IntBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#get(int,int[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
-        public Java.Nio.IntBuffer Get(int arg0, int[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.IntBuffer>("get", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#get(int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
-        public Java.Nio.IntBuffer Get(int arg0, int[] arg1)
-        {
-            return IExecute<Java.Nio.IntBuffer>("get", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#get(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#get(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -208,7 +186,7 @@ public Java.Nio.IntBuffer Get(int[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.IntBuffer>("get", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#get(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#get(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
@@ -217,41 +195,7 @@ public Java.Nio.IntBuffer Get(int[] arg0)
             return IExecuteWithSignature<Java.Nio.IntBuffer>("get", "([I)Ljava/nio/IntBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#put(int,int[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
-        public Java.Nio.IntBuffer Put(int arg0, int[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.IntBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#put(int,int[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
-        public Java.Nio.IntBuffer Put(int arg0, int[] arg1)
-        {
-            return IExecute<Java.Nio.IntBuffer>("put", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#put(int,java.nio.IntBuffer,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.IntBuffer"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
-        public Java.Nio.IntBuffer Put(int arg0, Java.Nio.IntBuffer arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.IntBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#put(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#put(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -262,7 +206,7 @@ public Java.Nio.IntBuffer Put(int[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.IntBuffer>("put", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/IntBuffer.html#put(java.nio.IntBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/IntBuffer.html#put(java.nio.IntBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.IntBuffer"/></param>
         /// <returns><see cref="Java.Nio.IntBuffer"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Nio/LongBuffer.cs b/src/net/Netdroid/Generated/Java/Nio/LongBuffer.cs
index 2475ce891..a31c90b4f 100644
--- a/src/net/Netdroid/Generated/Java/Nio/LongBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/LongBuffer.cs
@@ -46,7 +46,7 @@ public partial class LongBuffer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#allocate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#allocate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
@@ -55,7 +55,7 @@ public static Java.Nio.LongBuffer Allocate(int arg0)
             return SExecuteWithSignature<Java.Nio.LongBuffer>(LocalBridgeClazz, "allocate", "(I)Ljava/nio/LongBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#wrap(long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#wrap(long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -66,7 +66,7 @@ public static Java.Nio.LongBuffer Wrap(long[] arg0, int arg1, int arg2)
             return SExecute<Java.Nio.LongBuffer>(LocalBridgeClazz, "wrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#wrap(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#wrap(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
@@ -79,7 +79,7 @@ public static Java.Nio.LongBuffer Wrap(long[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#order()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#order()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteOrder"/></returns>
         public Java.Nio.ByteOrder Order()
@@ -87,7 +87,7 @@ public Java.Nio.ByteOrder Order()
             return IExecuteWithSignature<Java.Nio.ByteOrder>("order", "()Ljava/nio/ByteOrder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#asReadOnlyBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#asReadOnlyBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
         public Java.Nio.LongBuffer AsReadOnlyBuffer()
@@ -95,7 +95,7 @@ public Java.Nio.LongBuffer AsReadOnlyBuffer()
             return IExecuteWithSignature<Java.Nio.LongBuffer>("asReadOnlyBuffer", "()Ljava/nio/LongBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#compact()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#compact()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
         public Java.Nio.LongBuffer Compact()
@@ -103,7 +103,7 @@ public Java.Nio.LongBuffer Compact()
             return IExecuteWithSignature<Java.Nio.LongBuffer>("compact", "()Ljava/nio/LongBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#put(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#put(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -113,7 +113,7 @@ public Java.Nio.LongBuffer Put(int arg0, long arg1)
             return IExecute<Java.Nio.LongBuffer>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#put(long)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#put(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
@@ -122,7 +122,7 @@ public Java.Nio.LongBuffer Put(long arg0)
             return IExecuteWithSignature<Java.Nio.LongBuffer>("put", "(J)Ljava/nio/LongBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#get()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Get()
@@ -130,7 +130,7 @@ public long Get()
             return IExecuteWithSignature<long>("get", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -139,7 +139,7 @@ public long Get(int arg0)
             return IExecuteWithSignature<long>("get", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#put(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#put(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
@@ -148,7 +148,7 @@ public Java.Nio.LongBuffer Put(long[] arg0)
             return IExecuteWithSignature<Java.Nio.LongBuffer>("put", "([J)Ljava/nio/LongBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -157,7 +157,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#compareTo(java.nio.LongBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#compareTo(java.nio.LongBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.LongBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -166,7 +166,7 @@ public int CompareTo(Java.Nio.LongBuffer arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/LongBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#mismatch(java.nio.LongBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#mismatch(java.nio.LongBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.LongBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -175,29 +175,7 @@ public int Mismatch(Java.Nio.LongBuffer arg0)
             return IExecuteWithSignature<int>("mismatch", "(Ljava/nio/LongBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#get(int,long[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
-        public Java.Nio.LongBuffer Get(int arg0, long[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.LongBuffer>("get", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#get(int,long[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
-        public Java.Nio.LongBuffer Get(int arg0, long[] arg1)
-        {
-            return IExecute<Java.Nio.LongBuffer>("get", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#get(long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#get(long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -208,7 +186,7 @@ public Java.Nio.LongBuffer Get(long[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.LongBuffer>("get", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#get(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#get(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
@@ -217,41 +195,7 @@ public Java.Nio.LongBuffer Get(long[] arg0)
             return IExecuteWithSignature<Java.Nio.LongBuffer>("get", "([J)Ljava/nio/LongBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#put(int,java.nio.LongBuffer,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.LongBuffer"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
-        public Java.Nio.LongBuffer Put(int arg0, Java.Nio.LongBuffer arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.LongBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#put(int,long[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
-        public Java.Nio.LongBuffer Put(int arg0, long[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.LongBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#put(int,long[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
-        public Java.Nio.LongBuffer Put(int arg0, long[] arg1)
-        {
-            return IExecute<Java.Nio.LongBuffer>("put", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#put(java.nio.LongBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#put(java.nio.LongBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.LongBuffer"/></param>
         /// <returns><see cref="Java.Nio.LongBuffer"/></returns>
@@ -260,7 +204,7 @@ public Java.Nio.LongBuffer Put(Java.Nio.LongBuffer arg0)
             return IExecuteWithSignature<Java.Nio.LongBuffer>("put", "(Ljava/nio/LongBuffer;)Ljava/nio/LongBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/LongBuffer.html#put(long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/LongBuffer.html#put(long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Nio/MappedByteBuffer.cs b/src/net/Netdroid/Generated/Java/Nio/MappedByteBuffer.cs
index 94e825758..22f0208dc 100644
--- a/src/net/Netdroid/Generated/Java/Nio/MappedByteBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/MappedByteBuffer.cs
@@ -46,7 +46,7 @@ public partial class MappedByteBuffer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/MappedByteBuffer.html#isLoaded()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/MappedByteBuffer.html#isLoaded()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLoaded()
@@ -54,7 +54,7 @@ public bool IsLoaded()
             return IExecuteWithSignature<bool>("isLoaded", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/MappedByteBuffer.html#force()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/MappedByteBuffer.html#force()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.MappedByteBuffer"/></returns>
         public Java.Nio.MappedByteBuffer Force()
@@ -62,17 +62,7 @@ public Java.Nio.MappedByteBuffer Force()
             return IExecuteWithSignature<Java.Nio.MappedByteBuffer>("force", "()Ljava/nio/MappedByteBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/MappedByteBuffer.html#force(int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.MappedByteBuffer"/></returns>
-        public Java.Nio.MappedByteBuffer Force(int arg0, int arg1)
-        {
-            return IExecute<Java.Nio.MappedByteBuffer>("force", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/MappedByteBuffer.html#load()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/MappedByteBuffer.html#load()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.MappedByteBuffer"/></returns>
         public Java.Nio.MappedByteBuffer Load()
diff --git a/src/net/Netdroid/Generated/Java/Nio/ShortBuffer.cs b/src/net/Netdroid/Generated/Java/Nio/ShortBuffer.cs
index 572993e9b..774ab44f5 100644
--- a/src/net/Netdroid/Generated/Java/Nio/ShortBuffer.cs
+++ b/src/net/Netdroid/Generated/Java/Nio/ShortBuffer.cs
@@ -46,7 +46,7 @@ public partial class ShortBuffer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#allocate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#allocate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
@@ -55,7 +55,7 @@ public static Java.Nio.ShortBuffer Allocate(int arg0)
             return SExecuteWithSignature<Java.Nio.ShortBuffer>(LocalBridgeClazz, "allocate", "(I)Ljava/nio/ShortBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#wrap(short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#wrap(short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -66,7 +66,7 @@ public static Java.Nio.ShortBuffer Wrap(short[] arg0, int arg1, int arg2)
             return SExecute<Java.Nio.ShortBuffer>(LocalBridgeClazz, "wrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#wrap(short[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#wrap(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
@@ -79,7 +79,7 @@ public static Java.Nio.ShortBuffer Wrap(short[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#order()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#order()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ByteOrder"/></returns>
         public Java.Nio.ByteOrder Order()
@@ -87,7 +87,7 @@ public Java.Nio.ByteOrder Order()
             return IExecuteWithSignature<Java.Nio.ByteOrder>("order", "()Ljava/nio/ByteOrder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#asReadOnlyBuffer()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#asReadOnlyBuffer()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
         public Java.Nio.ShortBuffer AsReadOnlyBuffer()
@@ -95,7 +95,7 @@ public Java.Nio.ShortBuffer AsReadOnlyBuffer()
             return IExecuteWithSignature<Java.Nio.ShortBuffer>("asReadOnlyBuffer", "()Ljava/nio/ShortBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#compact()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#compact()"/>
         /// </summary>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
         public Java.Nio.ShortBuffer Compact()
@@ -103,7 +103,7 @@ public Java.Nio.ShortBuffer Compact()
             return IExecuteWithSignature<Java.Nio.ShortBuffer>("compact", "()Ljava/nio/ShortBuffer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#put(int,short)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#put(int,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -113,7 +113,7 @@ public Java.Nio.ShortBuffer Put(int arg0, short arg1)
             return IExecute<Java.Nio.ShortBuffer>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#put(short)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#put(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
@@ -122,7 +122,7 @@ public Java.Nio.ShortBuffer Put(short arg0)
             return IExecuteWithSignature<Java.Nio.ShortBuffer>("put", "(S)Ljava/nio/ShortBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#get()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         public short Get()
@@ -130,7 +130,7 @@ public short Get()
             return IExecuteWithSignature<short>("get", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="short"/></returns>
@@ -139,7 +139,7 @@ public short Get(int arg0)
             return IExecuteWithSignature<short>("get", "(I)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#put(short[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#put(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
@@ -148,7 +148,7 @@ public Java.Nio.ShortBuffer Put(short[] arg0)
             return IExecuteWithSignature<Java.Nio.ShortBuffer>("put", "([S)Ljava/nio/ShortBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -157,7 +157,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#compareTo(java.nio.ShortBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#compareTo(java.nio.ShortBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ShortBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -166,7 +166,7 @@ public int CompareTo(Java.Nio.ShortBuffer arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/nio/ShortBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#mismatch(java.nio.ShortBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#mismatch(java.nio.ShortBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ShortBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -175,29 +175,7 @@ public int Mismatch(Java.Nio.ShortBuffer arg0)
             return IExecuteWithSignature<int>("mismatch", "(Ljava/nio/ShortBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#get(int,short[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="short"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
-        public Java.Nio.ShortBuffer Get(int arg0, short[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.ShortBuffer>("get", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#get(int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="short"/></param>
-        /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
-        public Java.Nio.ShortBuffer Get(int arg0, short[] arg1)
-        {
-            return IExecute<Java.Nio.ShortBuffer>("get", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#get(short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#get(short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -208,7 +186,7 @@ public Java.Nio.ShortBuffer Get(short[] arg0, int arg1, int arg2)
             return IExecute<Java.Nio.ShortBuffer>("get", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#get(short[])"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#get(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
@@ -217,41 +195,7 @@ public Java.Nio.ShortBuffer Get(short[] arg0)
             return IExecuteWithSignature<Java.Nio.ShortBuffer>("get", "([S)Ljava/nio/ShortBuffer;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#put(int,java.nio.ShortBuffer,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.ShortBuffer"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
-        public Java.Nio.ShortBuffer Put(int arg0, Java.Nio.ShortBuffer arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.ShortBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#put(int,short[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="short"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
-        public Java.Nio.ShortBuffer Put(int arg0, short[] arg1, int arg2, int arg3)
-        {
-            return IExecute<Java.Nio.ShortBuffer>("put", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#put(int,short[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="short"/></param>
-        /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
-        public Java.Nio.ShortBuffer Put(int arg0, short[] arg1)
-        {
-            return IExecute<Java.Nio.ShortBuffer>("put", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#put(java.nio.ShortBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#put(java.nio.ShortBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ShortBuffer"/></param>
         /// <returns><see cref="Java.Nio.ShortBuffer"/></returns>
@@ -260,7 +204,7 @@ public Java.Nio.ShortBuffer Put(Java.Nio.ShortBuffer arg0)
             return IExecuteWithSignature<Java.Nio.ShortBuffer>("put", "(Ljava/nio/ShortBuffer;)Ljava/nio/ShortBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/nio/ShortBuffer.html#put(short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/nio/ShortBuffer.html#put(short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/AccessControlContext.cs b/src/net/Netdroid/Generated/Java/Security/AccessControlContext.cs
index e94e00aa9..744787591 100644
--- a/src/net/Netdroid/Generated/Java/Security/AccessControlContext.cs
+++ b/src/net/Netdroid/Generated/Java/Security/AccessControlContext.cs
@@ -30,7 +30,7 @@ public partial class AccessControlContext
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessControlContext.html#%3Cinit%3E(java.security.AccessControlContext,java.security.DomainCombiner)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessControlContext.html#%3Cinit%3E(java.security.AccessControlContext,java.security.DomainCombiner)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.AccessControlContext"/></param>
         /// <param name="arg1"><see cref="Java.Security.DomainCombiner"/></param>
@@ -39,7 +39,7 @@ public AccessControlContext(Java.Security.AccessControlContext arg0, Java.Securi
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessControlContext.html#%3Cinit%3E(java.security.ProtectionDomain[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessControlContext.html#%3Cinit%3E(java.security.ProtectionDomain[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.ProtectionDomain"/></param>
         public AccessControlContext(Java.Security.ProtectionDomain[] arg0)
@@ -63,14 +63,15 @@ public AccessControlContext(Java.Security.ProtectionDomain[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessControlContext.html#getDomainCombiner()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/AccessControlContext.html#getDomainCombiner()"/>
         /// </summary>
-        public Java.Security.DomainCombiner DomainCombiner
+        /// <returns><see cref="Java.Security.DomainCombiner"/></returns>
+        public Java.Security.DomainCombiner GetDomainCombiner()
         {
-            get { return IExecuteWithSignature<Java.Security.DomainCombiner>("getDomainCombiner", "()Ljava/security/DomainCombiner;"); }
+            return IExecuteWithSignature<Java.Security.DomainCombiner>("getDomainCombiner", "()Ljava/security/DomainCombiner;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessControlContext.html#checkPermission(java.security.Permission)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessControlContext.html#checkPermission(java.security.Permission)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
         /// <exception cref="Java.Security.AccessControlException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/AccessController.cs b/src/net/Netdroid/Generated/Java/Security/AccessController.cs
index 7c9ae1a18..d8af83398 100644
--- a/src/net/Netdroid/Generated/Java/Security/AccessController.cs
+++ b/src/net/Netdroid/Generated/Java/Security/AccessController.cs
@@ -42,47 +42,54 @@ public partial class AccessController
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#getContext()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivileged(java.security.PrivilegedAction,java.security.AccessControlContext,java.security.Permission[])"/>
         /// </summary>
-        public static Java.Security.AccessControlContext Context
+        /// <param name="arg0"><see cref="Java.Security.PrivilegedAction"/></param>
+        /// <param name="arg1"><see cref="Java.Security.AccessControlContext"/></param>
+        /// <param name="arg2"><see cref="Java.Security.Permission"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public static T DoPrivileged<T>(Java.Security.PrivilegedAction<T> arg0, Java.Security.AccessControlContext arg1, params Java.Security.Permission[] arg2)
         {
-            get { return SExecuteWithSignature<Java.Security.AccessControlContext>(LocalBridgeClazz, "getContext", "()Ljava/security/AccessControlContext;"); }
+            if (arg2.Length == 0) return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1); else return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivileged(java.security.PrivilegedAction,java.security.AccessControlContext,java.security.Permission[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivileged(java.security.PrivilegedExceptionAction,java.security.AccessControlContext,java.security.Permission[])"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.PrivilegedAction"/></param>
+        /// <param name="arg0"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
         /// <param name="arg1"><see cref="Java.Security.AccessControlContext"/></param>
         /// <param name="arg2"><see cref="Java.Security.Permission"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public static T DoPrivileged<T>(Java.Security.PrivilegedAction<T> arg0, Java.Security.AccessControlContext arg1, params Java.Security.Permission[] arg2)
+        /// <exception cref="Java.Security.PrivilegedActionException"/>
+        public static T DoPrivileged<T>(Java.Security.PrivilegedExceptionAction<T> arg0, Java.Security.AccessControlContext arg1, params Java.Security.Permission[] arg2)
         {
             if (arg2.Length == 0) return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1); else return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivileged(java.security.PrivilegedAction,java.security.AccessControlContext)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivilegedWithCombiner(java.security.PrivilegedAction,java.security.AccessControlContext,java.security.Permission[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedAction"/></param>
         /// <param name="arg1"><see cref="Java.Security.AccessControlContext"/></param>
+        /// <param name="arg2"><see cref="Java.Security.Permission"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public static T DoPrivileged<T>(Java.Security.PrivilegedAction<T> arg0, Java.Security.AccessControlContext arg1)
+        public static T DoPrivilegedWithCombiner<T>(Java.Security.PrivilegedAction<T> arg0, Java.Security.AccessControlContext arg1, params Java.Security.Permission[] arg2)
         {
-            return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1);
+            if (arg2.Length == 0) return SExecute<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", arg0, arg1); else return SExecute<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivileged(java.security.PrivilegedAction)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivilegedWithCombiner(java.security.PrivilegedAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedAction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public static T DoPrivileged<T>(Java.Security.PrivilegedAction<T> arg0)
+        public static T DoPrivilegedWithCombiner<T>(Java.Security.PrivilegedAction<T> arg0)
         {
-            return SExecuteWithSignature<T>(LocalBridgeClazz, "doPrivileged", "(Ljava/security/PrivilegedAction;)Ljava/lang/Object;", arg0);
+            return SExecuteWithSignature<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", "(Ljava/security/PrivilegedAction;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivileged(java.security.PrivilegedExceptionAction,java.security.AccessControlContext,java.security.Permission[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivilegedWithCombiner(java.security.PrivilegedExceptionAction,java.security.AccessControlContext,java.security.Permission[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
         /// <param name="arg1"><see cref="Java.Security.AccessControlContext"/></param>
@@ -90,81 +97,75 @@ public static T DoPrivileged<T>(Java.Security.PrivilegedAction<T> arg0)
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Security.PrivilegedActionException"/>
-        public static T DoPrivileged<T>(Java.Security.PrivilegedExceptionAction<T> arg0, Java.Security.AccessControlContext arg1, params Java.Security.Permission[] arg2)
+        public static T DoPrivilegedWithCombiner<T>(Java.Security.PrivilegedExceptionAction<T> arg0, Java.Security.AccessControlContext arg1, params Java.Security.Permission[] arg2)
         {
-            if (arg2.Length == 0) return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1); else return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1, arg2);
+            if (arg2.Length == 0) return SExecute<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", arg0, arg1); else return SExecute<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivileged(java.security.PrivilegedExceptionAction,java.security.AccessControlContext)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivilegedWithCombiner(java.security.PrivilegedExceptionAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
-        /// <param name="arg1"><see cref="Java.Security.AccessControlContext"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Security.PrivilegedActionException"/>
-        public static T DoPrivileged<T>(Java.Security.PrivilegedExceptionAction<T> arg0, Java.Security.AccessControlContext arg1)
+        public static T DoPrivilegedWithCombiner<T>(Java.Security.PrivilegedExceptionAction<T> arg0)
         {
-            return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1);
+            return SExecuteWithSignature<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", "(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivileged(java.security.PrivilegedExceptionAction)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#getContext()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        /// <exception cref="Java.Security.PrivilegedActionException"/>
-        public static T DoPrivileged<T>(Java.Security.PrivilegedExceptionAction<T> arg0)
+        /// <returns><see cref="Java.Security.AccessControlContext"/></returns>
+        public static Java.Security.AccessControlContext GetContext()
         {
-            return SExecuteWithSignature<T>(LocalBridgeClazz, "doPrivileged", "(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;", arg0);
+            return SExecuteWithSignature<Java.Security.AccessControlContext>(LocalBridgeClazz, "getContext", "()Ljava/security/AccessControlContext;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivilegedWithCombiner(java.security.PrivilegedAction,java.security.AccessControlContext,java.security.Permission[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivileged(java.security.PrivilegedAction,java.security.AccessControlContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedAction"/></param>
         /// <param name="arg1"><see cref="Java.Security.AccessControlContext"/></param>
-        /// <param name="arg2"><see cref="Java.Security.Permission"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public static T DoPrivilegedWithCombiner<T>(Java.Security.PrivilegedAction<T> arg0, Java.Security.AccessControlContext arg1, params Java.Security.Permission[] arg2)
+        public static T DoPrivileged<T>(Java.Security.PrivilegedAction<T> arg0, Java.Security.AccessControlContext arg1)
         {
-            if (arg2.Length == 0) return SExecute<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", arg0, arg1); else return SExecute<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", arg0, arg1, arg2);
+            return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivilegedWithCombiner(java.security.PrivilegedAction)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivileged(java.security.PrivilegedAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedAction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public static T DoPrivilegedWithCombiner<T>(Java.Security.PrivilegedAction<T> arg0)
+        public static T DoPrivileged<T>(Java.Security.PrivilegedAction<T> arg0)
         {
-            return SExecuteWithSignature<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", "(Ljava/security/PrivilegedAction;)Ljava/lang/Object;", arg0);
+            return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivilegedWithCombiner(java.security.PrivilegedExceptionAction,java.security.AccessControlContext,java.security.Permission[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivileged(java.security.PrivilegedExceptionAction,java.security.AccessControlContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
         /// <param name="arg1"><see cref="Java.Security.AccessControlContext"/></param>
-        /// <param name="arg2"><see cref="Java.Security.Permission"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Security.PrivilegedActionException"/>
-        public static T DoPrivilegedWithCombiner<T>(Java.Security.PrivilegedExceptionAction<T> arg0, Java.Security.AccessControlContext arg1, params Java.Security.Permission[] arg2)
+        public static T DoPrivileged<T>(Java.Security.PrivilegedExceptionAction<T> arg0, Java.Security.AccessControlContext arg1)
         {
-            if (arg2.Length == 0) return SExecute<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", arg0, arg1); else return SExecute<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", arg0, arg1, arg2);
+            return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#doPrivilegedWithCombiner(java.security.PrivilegedExceptionAction)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#doPrivileged(java.security.PrivilegedExceptionAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Security.PrivilegedActionException"/>
-        public static T DoPrivilegedWithCombiner<T>(Java.Security.PrivilegedExceptionAction<T> arg0)
+        public static T DoPrivileged<T>(Java.Security.PrivilegedExceptionAction<T> arg0)
         {
-            return SExecuteWithSignature<T>(LocalBridgeClazz, "doPrivilegedWithCombiner", "(Ljava/security/PrivilegedExceptionAction;)Ljava/lang/Object;", arg0);
+            return SExecute<T>(LocalBridgeClazz, "doPrivileged", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html#checkPermission(java.security.Permission)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AccessController.html#checkPermission(java.security.Permission)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
         /// <exception cref="Java.Security.AccessControlException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/Acl/Acl.cs b/src/net/Netdroid/Generated/Java/Security/Acl/Acl.cs
new file mode 100644
index 000000000..7133099a5
--- /dev/null
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/Acl.cs
@@ -0,0 +1,143 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Java.Security.Acl
+{
+    #region IAcl
+    /// <summary>
+    /// .NET interface for TO BE DEFINED FROM USER
+    /// </summary>
+    public partial interface IAcl : Java.Security.Acl.IOwner
+    {
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region Acl
+    public partial class Acl : Java.Security.Acl.IAcl
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Acl.html#addEntry(java.security.Principal,java.security.acl.AclEntry)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <param name="arg1"><see cref="Java.Security.Acl.AclEntry"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Security.Acl.NotOwnerException"/>
+        public bool AddEntry(Java.Security.Principal arg0, Java.Security.Acl.AclEntry arg1)
+        {
+            return IExecute<bool>("addEntry", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Acl.html#checkPermission(java.security.Principal,java.security.acl.Permission)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <param name="arg1"><see cref="Java.Security.Acl.Permission"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool CheckPermission(Java.Security.Principal arg0, Java.Security.Acl.Permission arg1)
+        {
+            return IExecute<bool>("checkPermission", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Acl.html#removeEntry(java.security.Principal,java.security.acl.AclEntry)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <param name="arg1"><see cref="Java.Security.Acl.AclEntry"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Security.Acl.NotOwnerException"/>
+        public bool RemoveEntry(Java.Security.Principal arg0, Java.Security.Acl.AclEntry arg1)
+        {
+            return IExecute<bool>("removeEntry", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Acl.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Acl.html#entries()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<Java.Security.Acl.AclEntry> Entries()
+        {
+            return IExecuteWithSignature<Java.Util.Enumeration<Java.Security.Acl.AclEntry>>("entries", "()Ljava/util/Enumeration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Acl.html#getPermissions(java.security.Principal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<Java.Security.Acl.Permission> GetPermissions(Java.Security.Principal arg0)
+        {
+            return IExecuteWithSignature<Java.Util.Enumeration<Java.Security.Acl.Permission>>("getPermissions", "(Ljava/security/Principal;)Ljava/util/Enumeration;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Acl.html#setName(java.security.Principal,java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Security.Acl.NotOwnerException"/>
+        public void SetName(Java.Security.Principal arg0, Java.Lang.String arg1)
+        {
+            IExecute("setName", arg0, arg1);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Acl/AclEntry.cs b/src/net/Netdroid/Generated/Java/Security/Acl/AclEntry.cs
new file mode 100644
index 000000000..e9e903d78
--- /dev/null
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/AclEntry.cs
@@ -0,0 +1,143 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Java.Security.Acl
+{
+    #region IAclEntry
+    /// <summary>
+    /// .NET interface for TO BE DEFINED FROM USER
+    /// </summary>
+    public partial interface IAclEntry : Java.Lang.ICloneable
+    {
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region AclEntry
+    public partial class AclEntry : Java.Security.Acl.IAclEntry
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html#addPermission(java.security.acl.Permission)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Acl.Permission"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool AddPermission(Java.Security.Acl.Permission arg0)
+        {
+            return IExecuteWithSignature<bool>("addPermission", "(Ljava/security/acl/Permission;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html#checkPermission(java.security.acl.Permission)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Acl.Permission"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool CheckPermission(Java.Security.Acl.Permission arg0)
+        {
+            return IExecuteWithSignature<bool>("checkPermission", "(Ljava/security/acl/Permission;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html#isNegative()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsNegative()
+        {
+            return IExecuteWithSignature<bool>("isNegative", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html#removePermission(java.security.acl.Permission)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Acl.Permission"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool RemovePermission(Java.Security.Acl.Permission arg0)
+        {
+            return IExecuteWithSignature<bool>("removePermission", "(Ljava/security/acl/Permission;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html#setPrincipal(java.security.Principal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool SetPrincipal(Java.Security.Principal arg0)
+        {
+            return IExecuteWithSignature<bool>("setPrincipal", "(Ljava/security/Principal;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html#getPrincipal()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetPrincipal()
+        {
+            return IExecuteWithSignature<Java.Security.Principal>("getPrincipal", "()Ljava/security/Principal;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html#permissions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<Java.Security.Acl.Permission> Permissions()
+        {
+            return IExecuteWithSignature<Java.Util.Enumeration<Java.Security.Acl.Permission>>("permissions", "()Ljava/util/Enumeration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html#setNegativePermissions()"/>
+        /// </summary>
+        public void SetNegativePermissions()
+        {
+            IExecuteWithSignature("setNegativePermissions", "()V");
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/EdECKey.cs b/src/net/Netdroid/Generated/Java/Security/Acl/AclNotFoundException.cs
similarity index 58%
rename from src/net/Netdroid/Generated/Java/Security/Interfaces/EdECKey.cs
rename to src/net/Netdroid/Generated/Java/Security/Acl/AclNotFoundException.cs
index a870e4ec3..062c07d5d 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/EdECKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/AclNotFoundException.cs
@@ -23,28 +23,10 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Java.Security.Interfaces
+namespace Java.Security.Acl
 {
-    #region IEdECKey
-    /// <summary>
-    /// .NET interface for TO BE DEFINED FROM USER
-    /// </summary>
-    public partial interface IEdECKey
-    {
-        #region Instance methods
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region EdECKey
-    public partial class EdECKey : Java.Security.Interfaces.IEdECKey
+    #region AclNotFoundException
+    public partial class AclNotFoundException
     {
         #region Constructors
 
@@ -63,13 +45,6 @@ public partial class EdECKey : Java.Security.Interfaces.IEdECKey
         #endregion
 
         #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/EdECKey.html#getParams()"/> 
-        /// </summary>
-        public Java.Security.Spec.NamedParameterSpec Params
-        {
-            get { return IExecuteWithSignature<Java.Security.Spec.NamedParameterSpec>("getParams", "()Ljava/security/spec/NamedParameterSpec;"); }
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/Acl/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Security/Acl/AllPackageClasses.cs
new file mode 100644
index 000000000..ca738b909
--- /dev/null
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/AllPackageClasses.cs
@@ -0,0 +1,320 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge.JVMInterop;
+using System;
+
+namespace Java.Security.Acl
+{
+    #region Acl
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/security/acl/Acl.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class Acl : Java.Security.Acl.Owner
+    {
+        const string _bridgeClassName = "java.security.acl.Acl";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("Acl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Acl() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("Acl class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Acl(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region AclEntry
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/security/acl/AclEntry.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class AclEntry : Java.Lang.Cloneable
+    {
+        const string _bridgeClassName = "java.security.acl.AclEntry";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("AclEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public AclEntry() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("AclEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public AclEntry(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region AclNotFoundException
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/security/acl/AclNotFoundException.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class AclNotFoundException : Java.Lang.Exception
+    {
+        const string _bridgeClassName = "java.security.acl.AclNotFoundException";
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeException_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region Group
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/security/acl/Group.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class Group : Java.Security.Principal
+    {
+        const string _bridgeClassName = "java.security.acl.Group";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("Group class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Group() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("Group class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Group(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region LastOwnerException
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/security/acl/LastOwnerException.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class LastOwnerException : Java.Lang.Exception
+    {
+        const string _bridgeClassName = "java.security.acl.LastOwnerException";
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeException_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region NotOwnerException
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/security/acl/NotOwnerException.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class NotOwnerException : Java.Lang.Exception
+    {
+        const string _bridgeClassName = "java.security.acl.NotOwnerException";
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeException_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region Owner
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/security/acl/Owner.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class Owner : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Owner>
+    {
+        const string _bridgeClassName = "java.security.acl.Owner";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("Owner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Owner() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("Owner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Owner(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+    #region Permission
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/security/acl/Permission.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class Permission : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Permission>
+    {
+        const string _bridgeClassName = "java.security.acl.Permission";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("Permission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Permission() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("Permission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Permission(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
+    }
+    #endregion
+
+
+
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Acl/Group.cs b/src/net/Netdroid/Generated/Java/Security/Acl/Group.cs
new file mode 100644
index 000000000..aa71eb9f9
--- /dev/null
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/Group.cs
@@ -0,0 +1,112 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Java.Security.Acl
+{
+    #region IGroup
+    /// <summary>
+    /// .NET interface for TO BE DEFINED FROM USER
+    /// </summary>
+    public partial interface IGroup : Java.Security.IPrincipal
+    {
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region Group
+    public partial class Group : Java.Security.Acl.IGroup
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Group.html#addMember(java.security.Principal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool AddMember(Java.Security.Principal arg0)
+        {
+            return IExecuteWithSignature<bool>("addMember", "(Ljava/security/Principal;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Group.html#isMember(java.security.Principal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMember(Java.Security.Principal arg0)
+        {
+            return IExecuteWithSignature<bool>("isMember", "(Ljava/security/Principal;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Group.html#removeMember(java.security.Principal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool RemoveMember(Java.Security.Principal arg0)
+        {
+            return IExecuteWithSignature<bool>("removeMember", "(Ljava/security/Principal;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Group.html#members()"/>
+        /// </summary>
+        /// <typeparam name="ReturnExtendsJava_Security_Principal"><see cref="Java.Security.Principal"/></typeparam>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<ReturnExtendsJava_Security_Principal> Members<ReturnExtendsJava_Security_Principal>() where ReturnExtendsJava_Security_Principal : Java.Security.Principal
+        {
+            return IExecuteWithSignature<Java.Util.Enumeration<ReturnExtendsJava_Security_Principal>>("members", "()Ljava/util/Enumeration;");
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Acl/LastOwnerException.cs b/src/net/Netdroid/Generated/Java/Security/Acl/LastOwnerException.cs
new file mode 100644
index 000000000..09924741a
--- /dev/null
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/LastOwnerException.cs
@@ -0,0 +1,58 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Java.Security.Acl
+{
+    #region LastOwnerException
+    public partial class LastOwnerException
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Lang/Record.cs b/src/net/Netdroid/Generated/Java/Security/Acl/NotOwnerException.cs
similarity index 92%
rename from src/net/Netdroid/Generated/Java/Lang/Record.cs
rename to src/net/Netdroid/Generated/Java/Security/Acl/NotOwnerException.cs
index 9c7941cea..e2d51b8c2 100644
--- a/src/net/Netdroid/Generated/Java/Lang/Record.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/NotOwnerException.cs
@@ -23,10 +23,10 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Java.Lang
+namespace Java.Security.Acl
 {
-    #region Record
-    public partial class Record
+    #region NotOwnerException
+    public partial class NotOwnerException
     {
         #region Constructors
 
diff --git a/src/net/Netdroid/Generated/Java/Security/Acl/Owner.cs b/src/net/Netdroid/Generated/Java/Security/Acl/Owner.cs
new file mode 100644
index 000000000..99f2c87bc
--- /dev/null
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/Owner.cs
@@ -0,0 +1,108 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Java.Security.Acl
+{
+    #region IOwner
+    /// <summary>
+    /// .NET interface for TO BE DEFINED FROM USER
+    /// </summary>
+    public partial interface IOwner
+    {
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region Owner
+    public partial class Owner : Java.Security.Acl.IOwner
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Owner.html#addOwner(java.security.Principal,java.security.Principal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <param name="arg1"><see cref="Java.Security.Principal"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Security.Acl.NotOwnerException"/>
+        public bool AddOwner(Java.Security.Principal arg0, Java.Security.Principal arg1)
+        {
+            return IExecute<bool>("addOwner", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Owner.html#deleteOwner(java.security.Principal,java.security.Principal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <param name="arg1"><see cref="Java.Security.Principal"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Security.Acl.NotOwnerException"/>
+        /// <exception cref="Java.Security.Acl.LastOwnerException"/>
+        public bool DeleteOwner(Java.Security.Principal arg0, Java.Security.Principal arg1)
+        {
+            return IExecute<bool>("deleteOwner", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/acl/Owner.html#isOwner(java.security.Principal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOwner(Java.Security.Principal arg0)
+        {
+            return IExecuteWithSignature<bool>("isOwner", "(Ljava/security/Principal;)Z", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Io/Serial.cs b/src/net/Netdroid/Generated/Java/Security/Acl/Permission.cs
similarity index 88%
rename from src/net/Netdroid/Generated/Java/Io/Serial.cs
rename to src/net/Netdroid/Generated/Java/Security/Acl/Permission.cs
index f91c8958f..52dfaa36c 100644
--- a/src/net/Netdroid/Generated/Java/Io/Serial.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Acl/Permission.cs
@@ -23,13 +23,13 @@
 
 using MASES.JCOBridge.C2JBridge;
 
-namespace Java.Io
+namespace Java.Security.Acl
 {
-    #region ISerial
+    #region IPermission
     /// <summary>
     /// .NET interface for TO BE DEFINED FROM USER
     /// </summary>
-    public partial interface ISerial : Java.Lang.Annotation.IAnnotation
+    public partial interface IPermission
     {
         #region Instance methods
 
@@ -43,8 +43,8 @@ public partial interface ISerial : Java.Lang.Annotation.IAnnotation
     }
     #endregion
 
-    #region Serial
-    public partial class Serial : Java.Io.ISerial
+    #region Permission
+    public partial class Permission : Java.Security.Acl.IPermission
     {
         #region Constructors
 
diff --git a/src/net/Netdroid/Generated/Java/Security/AlgorithmConstraints.cs b/src/net/Netdroid/Generated/Java/Security/AlgorithmConstraints.cs
index 4664a6fac..5bc574edb 100644
--- a/src/net/Netdroid/Generated/Java/Security/AlgorithmConstraints.cs
+++ b/src/net/Netdroid/Generated/Java/Security/AlgorithmConstraints.cs
@@ -64,7 +64,7 @@ public partial class AlgorithmConstraints : Java.Security.IAlgorithmConstraints
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmConstraints.html#permits(java.util.Set,java.lang.String,java.security.AlgorithmParameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmConstraints.html#permits(java.util.Set,java.lang.String,java.security.AlgorithmParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -75,7 +75,7 @@ public bool Permits(Java.Util.Set<Java.Security.CryptoPrimitive> arg0, Java.Lang
             return IExecute<bool>("permits", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmConstraints.html#permits(java.util.Set,java.lang.String,java.security.Key,java.security.AlgorithmParameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmConstraints.html#permits(java.util.Set,java.lang.String,java.security.Key,java.security.AlgorithmParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -87,7 +87,7 @@ public bool Permits(Java.Util.Set<Java.Security.CryptoPrimitive> arg0, Java.Lang
             return IExecute<bool>("permits", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmConstraints.html#permits(java.util.Set,java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmConstraints.html#permits(java.util.Set,java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/AlgorithmParameterGenerator.cs b/src/net/Netdroid/Generated/Java/Security/AlgorithmParameterGenerator.cs
index 52fddfcd5..6634676d9 100644
--- a/src/net/Netdroid/Generated/Java/Security/AlgorithmParameterGenerator.cs
+++ b/src/net/Netdroid/Generated/Java/Security/AlgorithmParameterGenerator.cs
@@ -42,7 +42,7 @@ public partial class AlgorithmParameterGenerator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Java.Security.AlgorithmParameterGenerator GetInstance(Java.Lang.St
             return SExecute<Java.Security.AlgorithmParameterGenerator>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Java.Security.AlgorithmParameterGenerator GetInstance(Java.Lang.St
             return SExecute<Java.Security.AlgorithmParameterGenerator>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.AlgorithmParameterGenerator"/></returns>
@@ -79,29 +79,31 @@ public static Java.Security.AlgorithmParameterGenerator GetInstance(Java.Lang.St
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#generateParameters()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Java.Security.AlgorithmParameters"/></returns>
+        public Java.Security.AlgorithmParameters GenerateParameters()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.AlgorithmParameters>("generateParameters", "()Ljava/security/AlgorithmParameters;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#generateParameters()"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#getProvider()"/>
         /// </summary>
-        /// <returns><see cref="Java.Security.AlgorithmParameters"/></returns>
-        public Java.Security.AlgorithmParameters GenerateParameters()
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            return IExecuteWithSignature<Java.Security.AlgorithmParameters>("generateParameters", "()Ljava/security/AlgorithmParameters;");
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#init(int,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#init(int,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
@@ -110,7 +112,7 @@ public void Init(int arg0, Java.Security.SecureRandom arg1)
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#init(int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#init(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Init(int arg0)
@@ -118,7 +120,7 @@ public void Init(int arg0)
             IExecuteWithSignature("init", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#init(java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#init(java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
@@ -128,7 +130,7 @@ public void Init(Java.Security.Spec.AlgorithmParameterSpec arg0, Java.Security.S
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html#init(java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html#init(java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/AlgorithmParameters.cs b/src/net/Netdroid/Generated/Java/Security/AlgorithmParameters.cs
index a1a78ac61..0d2be2ec0 100644
--- a/src/net/Netdroid/Generated/Java/Security/AlgorithmParameters.cs
+++ b/src/net/Netdroid/Generated/Java/Security/AlgorithmParameters.cs
@@ -42,7 +42,7 @@ public partial class AlgorithmParameters
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Java.Security.AlgorithmParameters GetInstance(Java.Lang.String arg
             return SExecute<Java.Security.AlgorithmParameters>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Java.Security.AlgorithmParameters GetInstance(Java.Lang.String arg
             return SExecute<Java.Security.AlgorithmParameters>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.AlgorithmParameters"/></returns>
@@ -79,49 +79,53 @@ public static Java.Security.AlgorithmParameters GetInstance(Java.Lang.String arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#getParameterSpec(java.lang.Class)"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"><see cref="Java.Security.Spec.IAlgorithmParameterSpec"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        /// <exception cref="Java.Security.Spec.InvalidParameterSpecException"/>
+        public T GetParameterSpec<T>(Java.Lang.Class arg0) where T : Java.Security.Spec.IAlgorithmParameterSpec, new()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecute<T>("getParameterSpec", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#getEncoded(java.lang.String)"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public byte[] GetEncoded(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "(Ljava/lang/String;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#getParameterSpec(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#getAlgorithm()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Java.Security.Spec.IAlgorithmParameterSpec"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        /// <exception cref="Java.Security.Spec.InvalidParameterSpecException"/>
-        public T GetParameterSpec<T>(Java.Lang.Class arg0) where T: Java.Security.Spec.IAlgorithmParameterSpec, new()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            return IExecuteWithSignature<T>("getParameterSpec", "(Ljava/lang/Class;)Ljava/security/spec/AlgorithmParameterSpec;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#getEncoded(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#getProvider()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="byte"/></returns>
-        /// <exception cref="Java.Io.IOException"/>
-        public byte[] GetEncoded(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            return IExecuteWithSignatureArray<byte>("getEncoded", "(Ljava/lang/String;)[B", arg0);
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#init(byte[],java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#init(byte[],java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -131,7 +135,7 @@ public void Init(byte[] arg0, Java.Lang.String arg1)
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#init(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#init(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -140,7 +144,7 @@ public void Init(byte[] arg0)
             IExecuteWithSignature("init", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html#init(java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html#init(java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <exception cref="Java.Security.Spec.InvalidParameterSpecException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Security/AllPackageClasses.cs
index 56d5839e8..838556211 100644
--- a/src/net/Netdroid/Generated/Java/Security/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Security/AllPackageClasses.cs
@@ -28,9 +28,8 @@ namespace Java.Security
 {
     #region AccessControlContext
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AccessControlContext.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AccessControlContext.html"/>
     /// </summary>
-    [System.Obsolete()]
     public partial class AccessControlContext : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AccessControlContext>
     {
         const string _bridgeClassName = "java.security.AccessControlContext";
@@ -73,9 +72,8 @@ public AccessControlContext(params object[] args) : base(args) { }
 
     #region AccessControlException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AccessControlException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AccessControlException.html"/>
     /// </summary>
-    [System.Obsolete()]
     public partial class AccessControlException : Java.Lang.SecurityException
     {
         const string _bridgeClassName = "java.security.AccessControlException";
@@ -91,9 +89,8 @@ public partial class AccessControlException : Java.Lang.SecurityException
 
     #region AccessController
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AccessController.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AccessController.html"/>
     /// </summary>
-    [System.Obsolete()]
     public partial class AccessController : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AccessController>
     {
         const string _bridgeClassName = "java.security.AccessController";
@@ -136,7 +133,7 @@ public AccessController(params object[] args) : base(args) { }
 
     #region AlgorithmConstraints
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmConstraints.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AlgorithmConstraints.html"/>
     /// </summary>
     public partial class AlgorithmConstraints : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AlgorithmConstraints>
     {
@@ -144,12 +141,12 @@ public partial class AlgorithmConstraints : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AlgorithmConstraints class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlgorithmConstraints class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlgorithmConstraints() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AlgorithmConstraints class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlgorithmConstraints class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlgorithmConstraints(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -182,7 +179,7 @@ public AlgorithmConstraints(params object[] args) : base(args) { }
 
     #region AlgorithmParameterGenerator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGenerator.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGenerator.html"/>
     /// </summary>
     public partial class AlgorithmParameterGenerator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AlgorithmParameterGenerator>
     {
@@ -226,7 +223,7 @@ public AlgorithmParameterGenerator(params object[] args) : base(args) { }
 
     #region AlgorithmParameterGeneratorSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameterGeneratorSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameterGeneratorSpi.html"/>
     /// </summary>
     public partial class AlgorithmParameterGeneratorSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AlgorithmParameterGeneratorSpi>
     {
@@ -234,12 +231,12 @@ public partial class AlgorithmParameterGeneratorSpi : MASES.JCOBridge.C2JBridge.
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AlgorithmParameterGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlgorithmParameterGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlgorithmParameterGeneratorSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AlgorithmParameterGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlgorithmParameterGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlgorithmParameterGeneratorSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -272,7 +269,7 @@ public AlgorithmParameterGeneratorSpi(params object[] args) : base(args) { }
 
     #region AlgorithmParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParameters.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AlgorithmParameters.html"/>
     /// </summary>
     public partial class AlgorithmParameters : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AlgorithmParameters>
     {
@@ -316,7 +313,7 @@ public AlgorithmParameters(params object[] args) : base(args) { }
 
     #region AlgorithmParametersSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AlgorithmParametersSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AlgorithmParametersSpi.html"/>
     /// </summary>
     public partial class AlgorithmParametersSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AlgorithmParametersSpi>
     {
@@ -324,12 +321,12 @@ public partial class AlgorithmParametersSpi : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AlgorithmParametersSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlgorithmParametersSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlgorithmParametersSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AlgorithmParametersSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlgorithmParametersSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlgorithmParametersSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -362,7 +359,7 @@ public AlgorithmParametersSpi(params object[] args) : base(args) { }
 
     #region AllPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AllPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AllPermission.html"/>
     /// </summary>
     public partial class AllPermission : Java.Security.Permission
     {
@@ -406,7 +403,7 @@ public AllPermission(params object[] args) : base(args) { }
 
     #region AuthProvider
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/AuthProvider.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/AuthProvider.html"/>
     /// </summary>
     public partial class AuthProvider : Java.Security.Provider
     {
@@ -414,12 +411,12 @@ public partial class AuthProvider : Java.Security.Provider
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AuthProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AuthProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AuthProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AuthProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AuthProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AuthProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -452,7 +449,7 @@ public AuthProvider(params object[] args) : base(args) { }
 
     #region BasicPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/BasicPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/BasicPermission.html"/>
     /// </summary>
     public partial class BasicPermission : Java.Security.Permission
     {
@@ -460,12 +457,12 @@ public partial class BasicPermission : Java.Security.Permission
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BasicPermission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BasicPermission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BasicPermission() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BasicPermission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BasicPermission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BasicPermission(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -498,21 +495,21 @@ public BasicPermission(params object[] args) : base(args) { }
 
     #region Certificate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Certificate.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Certificate.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Certificate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Certificate>
     {
         const string _bridgeClassName = "java.security.Certificate";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Certificate() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Certificate(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -545,7 +542,7 @@ public Certificate(params object[] args) : base(args) { }
 
     #region CodeSigner
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSigner.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/CodeSigner.html"/>
     /// </summary>
     public partial class CodeSigner : Java.Io.Serializable
     {
@@ -589,7 +586,7 @@ public CodeSigner(params object[] args) : base(args) { }
 
     #region CodeSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSource.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/CodeSource.html"/>
     /// </summary>
     public partial class CodeSource : Java.Io.Serializable
     {
@@ -633,7 +630,7 @@ public CodeSource(params object[] args) : base(args) { }
 
     #region CryptoPrimitive
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html"/>
     /// </summary>
     public partial class CryptoPrimitive : Java.Lang.Enum<Java.Security.CryptoPrimitive>
     {
@@ -677,7 +674,7 @@ public CryptoPrimitive(params object[] args) : base(args) { }
 
     #region DigestException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/DigestException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/DigestException.html"/>
     /// </summary>
     public partial class DigestException : Java.Security.GeneralSecurityException
     {
@@ -694,7 +691,7 @@ public partial class DigestException : Java.Security.GeneralSecurityException
 
     #region DigestInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/DigestInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/DigestInputStream.html"/>
     /// </summary>
     public partial class DigestInputStream : Java.Io.FilterInputStream
     {
@@ -738,7 +735,7 @@ public DigestInputStream(params object[] args) : base(args) { }
 
     #region DigestOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/DigestOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/DigestOutputStream.html"/>
     /// </summary>
     public partial class DigestOutputStream : Java.Io.FilterOutputStream
     {
@@ -782,21 +779,20 @@ public DigestOutputStream(params object[] args) : base(args) { }
 
     #region DomainCombiner
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/DomainCombiner.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/DomainCombiner.html"/>
     /// </summary>
-    [System.Obsolete()]
     public partial class DomainCombiner : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DomainCombiner>
     {
         const string _bridgeClassName = "java.security.DomainCombiner";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DomainCombiner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DomainCombiner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DomainCombiner() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DomainCombiner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DomainCombiner class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DomainCombiner(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -829,7 +825,7 @@ public DomainCombiner(params object[] args) : base(args) { }
 
     #region DomainLoadStoreParameter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/DomainLoadStoreParameter.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/DomainLoadStoreParameter.html"/>
     /// </summary>
     public partial class DomainLoadStoreParameter : Java.Security.KeyStore.LoadStoreParameter
     {
@@ -873,7 +869,7 @@ public DomainLoadStoreParameter(params object[] args) : base(args) { }
 
     #region GeneralSecurityException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/GeneralSecurityException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/GeneralSecurityException.html"/>
     /// </summary>
     public partial class GeneralSecurityException : Java.Lang.Exception
     {
@@ -890,7 +886,7 @@ public partial class GeneralSecurityException : Java.Lang.Exception
 
     #region Guard
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Guard.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Guard.html"/>
     /// </summary>
     public partial class Guard : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Guard>
     {
@@ -898,12 +894,12 @@ public partial class Guard : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Guard>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Guard class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Guard class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Guard() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Guard class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Guard class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Guard(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -936,7 +932,7 @@ public Guard(params object[] args) : base(args) { }
 
     #region GuardedObject
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/GuardedObject.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/GuardedObject.html"/>
     /// </summary>
     public partial class GuardedObject : Java.Io.Serializable
     {
@@ -980,21 +976,21 @@ public GuardedObject(params object[] args) : base(args) { }
 
     #region Identity
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Identity.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Identity : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Identity>
     {
         const string _bridgeClassName = "java.security.Identity";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Identity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Identity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Identity() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Identity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Identity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Identity(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1027,21 +1023,21 @@ public Identity(params object[] args) : base(args) { }
 
     #region IdentityScope
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class IdentityScope : Java.Security.Identity
     {
         const string _bridgeClassName = "java.security.IdentityScope";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IdentityScope class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IdentityScope class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IdentityScope() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IdentityScope class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IdentityScope class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IdentityScope(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1074,7 +1070,7 @@ public IdentityScope(params object[] args) : base(args) { }
 
     #region InvalidAlgorithmParameterException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/InvalidAlgorithmParameterException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/InvalidAlgorithmParameterException.html"/>
     /// </summary>
     public partial class InvalidAlgorithmParameterException : Java.Security.GeneralSecurityException
     {
@@ -1091,7 +1087,7 @@ public partial class InvalidAlgorithmParameterException : Java.Security.GeneralS
 
     #region InvalidKeyException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/InvalidKeyException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/InvalidKeyException.html"/>
     /// </summary>
     public partial class InvalidKeyException : Java.Security.KeyException
     {
@@ -1108,7 +1104,7 @@ public partial class InvalidKeyException : Java.Security.KeyException
 
     #region InvalidParameterException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/InvalidParameterException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/InvalidParameterException.html"/>
     /// </summary>
     public partial class InvalidParameterException : Java.Lang.IllegalArgumentException
     {
@@ -1125,7 +1121,7 @@ public partial class InvalidParameterException : Java.Lang.IllegalArgumentExcept
 
     #region Key
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Key.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Key.html"/>
     /// </summary>
     public partial class Key : Java.Io.Serializable
     {
@@ -1133,12 +1129,12 @@ public partial class Key : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Key() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Key class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Key(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1171,7 +1167,7 @@ public Key(params object[] args) : base(args) { }
 
     #region KeyException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyException.html"/>
     /// </summary>
     public partial class KeyException : Java.Security.GeneralSecurityException
     {
@@ -1188,7 +1184,7 @@ public partial class KeyException : Java.Security.GeneralSecurityException
 
     #region KeyFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html"/>
     /// </summary>
     public partial class KeyFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyFactory>
     {
@@ -1232,7 +1228,7 @@ public KeyFactory(params object[] args) : base(args) { }
 
     #region KeyFactorySpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactorySpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyFactorySpi.html"/>
     /// </summary>
     public partial class KeyFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyFactorySpi>
     {
@@ -1240,12 +1236,12 @@ public partial class KeyFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Key
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyFactorySpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyFactorySpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1278,7 +1274,7 @@ public KeyFactorySpi(params object[] args) : base(args) { }
 
     #region KeyManagementException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyManagementException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyManagementException.html"/>
     /// </summary>
     public partial class KeyManagementException : Java.Security.KeyException
     {
@@ -1295,7 +1291,7 @@ public partial class KeyManagementException : Java.Security.KeyException
 
     #region KeyPair
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPair.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyPair.html"/>
     /// </summary>
     public partial class KeyPair : Java.Io.Serializable
     {
@@ -1339,7 +1335,7 @@ public KeyPair(params object[] args) : base(args) { }
 
     #region KeyPairGenerator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html"/>
     /// </summary>
     public partial class KeyPairGenerator : Java.Security.KeyPairGeneratorSpi
     {
@@ -1347,12 +1343,12 @@ public partial class KeyPairGenerator : Java.Security.KeyPairGeneratorSpi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyPairGenerator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyPairGenerator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyPairGenerator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyPairGenerator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyPairGenerator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyPairGenerator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1385,7 +1381,7 @@ public KeyPairGenerator(params object[] args) : base(args) { }
 
     #region KeyPairGeneratorSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGeneratorSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyPairGeneratorSpi.html"/>
     /// </summary>
     public partial class KeyPairGeneratorSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyPairGeneratorSpi>
     {
@@ -1393,12 +1389,12 @@ public partial class KeyPairGeneratorSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyPairGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyPairGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyPairGeneratorSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyPairGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyPairGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyPairGeneratorSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1431,7 +1427,7 @@ public KeyPairGeneratorSpi(params object[] args) : base(args) { }
 
     #region KeyRep
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyRep.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyRep.html"/>
     /// </summary>
     public partial class KeyRep : Java.Io.Serializable
     {
@@ -1471,7 +1467,7 @@ public KeyRep(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Type
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyRep.Type.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyRep.Type.html"/>
         /// </summary>
         public partial class Type : Java.Lang.Enum<Java.Security.KeyRep.Type>
         {
@@ -1519,7 +1515,7 @@ public Type(params object[] args) : base(args) { }
 
     #region KeyStore
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyStore.html"/>
     /// </summary>
     public partial class KeyStore : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyStore>
     {
@@ -1559,7 +1555,7 @@ public KeyStore(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Builder
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Builder.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.Builder.html"/>
         /// </summary>
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
@@ -1567,12 +1563,12 @@ public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Builder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Builder(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1605,7 +1601,7 @@ public Builder(params object[] args) : base(args) { }
 
         #region CallbackHandlerProtection
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.CallbackHandlerProtection.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.CallbackHandlerProtection.html"/>
         /// </summary>
         public partial class CallbackHandlerProtection : Java.Security.KeyStore.ProtectionParameter
         {
@@ -1649,7 +1645,7 @@ public CallbackHandlerProtection(params object[] args) : base(args) { }
 
         #region Entry
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Entry.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.Entry.html"/>
         /// </summary>
         public partial class Entry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Entry>
         {
@@ -1657,12 +1653,12 @@ public partial class Entry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Entry>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Entry() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Entry(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1691,7 +1687,7 @@ public Entry(params object[] args) : base(args) { }
             // TODO: complete the class
             #region Attribute
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Entry.Attribute.html"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.Entry.Attribute.html"/>
             /// </summary>
             public partial class Attribute : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Attribute>
             {
@@ -1699,12 +1695,12 @@ public partial class Attribute : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Attribu
                 /// <summary>
                 /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
                 /// </summary>
-                [Obsolete("Attribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Attribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Attribute() { }
                 /// <summary>
                 /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
                 /// </summary>
-                [Obsolete("Attribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+                [global::System.Obsolete("Attribute class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
                 public Attribute(params object[] args) : base(args) { }
 
                 private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1741,7 +1737,7 @@ public Attribute(params object[] args) : base(args) { }
 
         #region LoadStoreParameter
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.LoadStoreParameter.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.LoadStoreParameter.html"/>
         /// </summary>
         public partial class LoadStoreParameter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LoadStoreParameter>
         {
@@ -1749,12 +1745,12 @@ public partial class LoadStoreParameter : MASES.JCOBridge.C2JBridge.JVMBridgeBas
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("LoadStoreParameter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LoadStoreParameter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LoadStoreParameter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("LoadStoreParameter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("LoadStoreParameter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public LoadStoreParameter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1787,7 +1783,7 @@ public LoadStoreParameter(params object[] args) : base(args) { }
 
         #region PasswordProtection
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PasswordProtection.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html"/>
         /// </summary>
         public partial class PasswordProtection : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PasswordProtection>
         {
@@ -1831,7 +1827,7 @@ public PasswordProtection(params object[] args) : base(args) { }
 
         #region PrivateKeyEntry
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PrivateKeyEntry.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.PrivateKeyEntry.html"/>
         /// </summary>
         public partial class PrivateKeyEntry : Java.Security.KeyStore.Entry
         {
@@ -1875,7 +1871,7 @@ public PrivateKeyEntry(params object[] args) : base(args) { }
 
         #region ProtectionParameter
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.ProtectionParameter.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.ProtectionParameter.html"/>
         /// </summary>
         public partial class ProtectionParameter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ProtectionParameter>
         {
@@ -1883,12 +1879,12 @@ public partial class ProtectionParameter : MASES.JCOBridge.C2JBridge.JVMBridgeBa
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ProtectionParameter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ProtectionParameter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ProtectionParameter() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ProtectionParameter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ProtectionParameter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ProtectionParameter(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1921,7 +1917,7 @@ public ProtectionParameter(params object[] args) : base(args) { }
 
         #region SecretKeyEntry
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.SecretKeyEntry.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.SecretKeyEntry.html"/>
         /// </summary>
         public partial class SecretKeyEntry : Java.Security.KeyStore.Entry
         {
@@ -1965,7 +1961,7 @@ public SecretKeyEntry(params object[] args) : base(args) { }
 
         #region TrustedCertificateEntry
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.TrustedCertificateEntry.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.TrustedCertificateEntry.html"/>
         /// </summary>
         public partial class TrustedCertificateEntry : Java.Security.KeyStore.Entry
         {
@@ -2013,7 +2009,7 @@ public TrustedCertificateEntry(params object[] args) : base(args) { }
 
     #region KeyStoreException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyStoreException.html"/>
     /// </summary>
     public partial class KeyStoreException : Java.Security.GeneralSecurityException
     {
@@ -2030,7 +2026,7 @@ public partial class KeyStoreException : Java.Security.GeneralSecurityException
 
     #region KeyStoreSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html"/>
     /// </summary>
     public partial class KeyStoreSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyStoreSpi>
     {
@@ -2038,12 +2034,12 @@ public partial class KeyStoreSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeySt
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyStoreSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyStoreSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyStoreSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyStoreSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyStoreSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyStoreSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2076,7 +2072,7 @@ public KeyStoreSpi(params object[] args) : base(args) { }
 
     #region MessageDigest
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html"/>
     /// </summary>
     public partial class MessageDigest : Java.Security.MessageDigestSpi
     {
@@ -2084,12 +2080,12 @@ public partial class MessageDigest : Java.Security.MessageDigestSpi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MessageDigest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MessageDigest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MessageDigest() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MessageDigest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MessageDigest class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MessageDigest(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2122,7 +2118,7 @@ public MessageDigest(params object[] args) : base(args) { }
 
     #region MessageDigestSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigestSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/MessageDigestSpi.html"/>
     /// </summary>
     public partial class MessageDigestSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MessageDigestSpi>
     {
@@ -2130,12 +2126,12 @@ public partial class MessageDigestSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MessageDigestSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MessageDigestSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MessageDigestSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MessageDigestSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MessageDigestSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MessageDigestSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2168,7 +2164,7 @@ public MessageDigestSpi(params object[] args) : base(args) { }
 
     #region NoSuchAlgorithmException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/NoSuchAlgorithmException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/NoSuchAlgorithmException.html"/>
     /// </summary>
     public partial class NoSuchAlgorithmException : Java.Security.GeneralSecurityException
     {
@@ -2185,7 +2181,7 @@ public partial class NoSuchAlgorithmException : Java.Security.GeneralSecurityExc
 
     #region NoSuchProviderException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/NoSuchProviderException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/NoSuchProviderException.html"/>
     /// </summary>
     public partial class NoSuchProviderException : Java.Security.GeneralSecurityException
     {
@@ -2202,7 +2198,7 @@ public partial class NoSuchProviderException : Java.Security.GeneralSecurityExce
 
     #region Permission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Permission.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Permission.html"/>
     /// </summary>
     public partial class Permission : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Permission>
     {
@@ -2210,12 +2206,12 @@ public partial class Permission : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Permis
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Permission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Permission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Permission() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Permission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Permission class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Permission(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2248,7 +2244,7 @@ public Permission(params object[] args) : base(args) { }
 
     #region PermissionCollection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PermissionCollection.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PermissionCollection.html"/>
     /// </summary>
     public partial class PermissionCollection : Java.Io.Serializable
     {
@@ -2256,12 +2252,12 @@ public partial class PermissionCollection : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PermissionCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PermissionCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PermissionCollection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PermissionCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PermissionCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PermissionCollection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2294,7 +2290,7 @@ public PermissionCollection(params object[] args) : base(args) { }
 
     #region Permissions
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Permissions.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Permissions.html"/>
     /// </summary>
     public partial class Permissions : Java.Security.PermissionCollection
     {
@@ -2338,7 +2334,7 @@ public Permissions(params object[] args) : base(args) { }
 
     #region PKCS12Attribute
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PKCS12Attribute.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PKCS12Attribute.html"/>
     /// </summary>
     public partial class PKCS12Attribute : Java.Security.KeyStore.Entry.Attribute
     {
@@ -2382,21 +2378,20 @@ public PKCS12Attribute(params object[] args) : base(args) { }
 
     #region Policy
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Policy.html"/>
     /// </summary>
-    [System.Obsolete()]
     public partial class Policy : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Policy>
     {
         const string _bridgeClassName = "java.security.Policy";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Policy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Policy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Policy() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Policy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Policy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Policy(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2425,21 +2420,20 @@ public Policy(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Parameters
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.Parameters.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.Parameters.html"/>
         /// </summary>
-        [System.Obsolete()]
         public partial class Parameters : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Parameters>
         {
             const string _bridgeClassName = "java.security.Policy$Parameters";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Parameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Parameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Parameters() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Parameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Parameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Parameters(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2476,21 +2470,20 @@ public Parameters(params object[] args) : base(args) { }
 
     #region PolicySpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PolicySpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PolicySpi.html"/>
     /// </summary>
-    [System.Obsolete()]
     public partial class PolicySpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PolicySpi>
     {
         const string _bridgeClassName = "java.security.PolicySpi";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PolicySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PolicySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PolicySpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PolicySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PolicySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PolicySpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2523,7 +2516,7 @@ public PolicySpi(params object[] args) : base(args) { }
 
     #region Principal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Principal.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Principal.html"/>
     /// </summary>
     public partial class Principal : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Principal>
     {
@@ -2531,12 +2524,12 @@ public partial class Principal : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Princip
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Principal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Principal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Principal() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Principal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Principal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Principal(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2569,7 +2562,7 @@ public Principal(params object[] args) : base(args) { }
 
     #region PrivateKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PrivateKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PrivateKey.html"/>
     /// </summary>
     public partial class PrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PrivateKey>
     {
@@ -2577,12 +2570,12 @@ public partial class PrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Privat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivateKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivateKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2615,7 +2608,7 @@ public PrivateKey(params object[] args) : base(args) { }
 
     #region PrivilegedAction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedAction.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PrivilegedAction.html"/>
     /// </summary>
     public partial class PrivilegedAction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PrivilegedAction>
     {
@@ -2623,12 +2616,12 @@ public partial class PrivilegedAction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrivilegedAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivilegedAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivilegedAction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrivilegedAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivilegedAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivilegedAction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2661,7 +2654,7 @@ public PrivilegedAction(params object[] args) : base(args) { }
 
     #region PrivilegedAction<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedAction.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PrivilegedAction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class PrivilegedAction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PrivilegedAction<T>>
@@ -2670,12 +2663,12 @@ public partial class PrivilegedAction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrivilegedAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivilegedAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivilegedAction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrivilegedAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivilegedAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivilegedAction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2708,7 +2701,7 @@ public PrivilegedAction(params object[] args) : base(args) { }
 
     #region PrivilegedActionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedActionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PrivilegedActionException.html"/>
     /// </summary>
     public partial class PrivilegedActionException : Java.Lang.Exception
     {
@@ -2725,7 +2718,7 @@ public partial class PrivilegedActionException : Java.Lang.Exception
 
     #region PrivilegedExceptionAction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedExceptionAction.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PrivilegedExceptionAction.html"/>
     /// </summary>
     public partial class PrivilegedExceptionAction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PrivilegedExceptionAction>
     {
@@ -2733,12 +2726,12 @@ public partial class PrivilegedExceptionAction : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrivilegedExceptionAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivilegedExceptionAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivilegedExceptionAction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrivilegedExceptionAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivilegedExceptionAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivilegedExceptionAction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2771,7 +2764,7 @@ public PrivilegedExceptionAction(params object[] args) : base(args) { }
 
     #region PrivilegedExceptionAction<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedExceptionAction.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PrivilegedExceptionAction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class PrivilegedExceptionAction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PrivilegedExceptionAction<T>>
@@ -2780,12 +2773,12 @@ public partial class PrivilegedExceptionAction<T> : MASES.JCOBridge.C2JBridge.JV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrivilegedExceptionAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivilegedExceptionAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivilegedExceptionAction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrivilegedExceptionAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrivilegedExceptionAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrivilegedExceptionAction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2818,7 +2811,7 @@ public PrivilegedExceptionAction(params object[] args) : base(args) { }
 
     #region ProtectionDomain
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html"/>
     /// </summary>
     public partial class ProtectionDomain : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ProtectionDomain>
     {
@@ -2862,7 +2855,7 @@ public ProtectionDomain(params object[] args) : base(args) { }
 
     #region Provider
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Provider.html"/>
     /// </summary>
     public partial class Provider : Java.Util.Properties
     {
@@ -2870,12 +2863,12 @@ public partial class Provider : Java.Util.Properties
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Provider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Provider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Provider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Provider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Provider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Provider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2904,7 +2897,7 @@ public Provider(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Service
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html"/>
         /// </summary>
         public partial class Service : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Service>
         {
@@ -2952,7 +2945,7 @@ public Service(params object[] args) : base(args) { }
 
     #region ProviderException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/ProviderException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/ProviderException.html"/>
     /// </summary>
     public partial class ProviderException : Java.Lang.RuntimeException
     {
@@ -2969,7 +2962,7 @@ public partial class ProviderException : Java.Lang.RuntimeException
 
     #region PublicKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/PublicKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/PublicKey.html"/>
     /// </summary>
     public partial class PublicKey : Java.Security.Key
     {
@@ -2977,12 +2970,12 @@ public partial class PublicKey : Java.Security.Key
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PublicKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PublicKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3015,7 +3008,7 @@ public PublicKey(params object[] args) : base(args) { }
 
     #region SecureClassLoader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/SecureClassLoader.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/SecureClassLoader.html"/>
     /// </summary>
     public partial class SecureClassLoader : Java.Lang.ClassLoader
     {
@@ -3059,7 +3052,7 @@ public SecureClassLoader(params object[] args) : base(args) { }
 
     #region SecureRandom
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html"/>
     /// </summary>
     public partial class SecureRandom : Java.Util.Random
     {
@@ -3103,7 +3096,7 @@ public SecureRandom(params object[] args) : base(args) { }
 
     #region SecureRandomSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandomSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/SecureRandomSpi.html"/>
     /// </summary>
     public partial class SecureRandomSpi : Java.Io.Serializable
     {
@@ -3111,12 +3104,12 @@ public partial class SecureRandomSpi : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SecureRandomSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecureRandomSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecureRandomSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SecureRandomSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecureRandomSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecureRandomSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3149,7 +3142,7 @@ public SecureRandomSpi(params object[] args) : base(args) { }
 
     #region Security
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Security.html"/>
     /// </summary>
     public partial class Security : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Security>
     {
@@ -3193,7 +3186,7 @@ public Security(params object[] args) : base(args) { }
 
     #region SecurityPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/SecurityPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/SecurityPermission.html"/>
     /// </summary>
     public partial class SecurityPermission : Java.Security.BasicPermission
     {
@@ -3237,7 +3230,7 @@ public SecurityPermission(params object[] args) : base(args) { }
 
     #region Signature
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Signature.html"/>
     /// </summary>
     public partial class Signature : Java.Security.SignatureSpi
     {
@@ -3245,12 +3238,12 @@ public partial class Signature : Java.Security.SignatureSpi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Signature class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Signature class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Signature() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Signature class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Signature class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Signature(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3283,7 +3276,7 @@ public Signature(params object[] args) : base(args) { }
 
     #region SignatureException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/SignatureException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/SignatureException.html"/>
     /// </summary>
     public partial class SignatureException : Java.Security.GeneralSecurityException
     {
@@ -3300,7 +3293,7 @@ public partial class SignatureException : Java.Security.GeneralSecurityException
 
     #region SignatureSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/SignatureSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/SignatureSpi.html"/>
     /// </summary>
     public partial class SignatureSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SignatureSpi>
     {
@@ -3308,12 +3301,12 @@ public partial class SignatureSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sign
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SignatureSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SignatureSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SignatureSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SignatureSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SignatureSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SignatureSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3346,7 +3339,7 @@ public SignatureSpi(params object[] args) : base(args) { }
 
     #region SignedObject
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/SignedObject.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/SignedObject.html"/>
     /// </summary>
     public partial class SignedObject : Java.Io.Serializable
     {
@@ -3390,21 +3383,21 @@ public SignedObject(params object[] args) : base(args) { }
 
     #region Signer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Signer.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Signer.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Signer : Java.Security.Identity
     {
         const string _bridgeClassName = "java.security.Signer";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Signer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Signer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Signer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Signer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Signer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Signer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3437,7 +3430,7 @@ public Signer(params object[] args) : base(args) { }
 
     #region Timestamp
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/Timestamp.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/Timestamp.html"/>
     /// </summary>
     public partial class Timestamp : Java.Io.Serializable
     {
@@ -3481,7 +3474,7 @@ public Timestamp(params object[] args) : base(args) { }
 
     #region UnrecoverableEntryException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/UnrecoverableEntryException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/UnrecoverableEntryException.html"/>
     /// </summary>
     public partial class UnrecoverableEntryException : Java.Security.GeneralSecurityException
     {
@@ -3498,7 +3491,7 @@ public partial class UnrecoverableEntryException : Java.Security.GeneralSecurity
 
     #region UnrecoverableKeyException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/UnrecoverableKeyException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/UnrecoverableKeyException.html"/>
     /// </summary>
     public partial class UnrecoverableKeyException : Java.Security.UnrecoverableEntryException
     {
@@ -3515,7 +3508,7 @@ public partial class UnrecoverableKeyException : Java.Security.UnrecoverableEntr
 
     #region UnresolvedPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/UnresolvedPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/UnresolvedPermission.html"/>
     /// </summary>
     public partial class UnresolvedPermission : Java.Security.Permission
     {
diff --git a/src/net/Netdroid/Generated/Java/Security/AllPermission.cs b/src/net/Netdroid/Generated/Java/Security/AllPermission.cs
index f1f8856b6..67602bc95 100644
--- a/src/net/Netdroid/Generated/Java/Security/AllPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Security/AllPermission.cs
@@ -30,7 +30,7 @@ public partial class AllPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AllPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AllPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/AuthProvider.cs b/src/net/Netdroid/Generated/Java/Security/AuthProvider.cs
index 25b091e21..e0821d2db 100644
--- a/src/net/Netdroid/Generated/Java/Security/AuthProvider.cs
+++ b/src/net/Netdroid/Generated/Java/Security/AuthProvider.cs
@@ -46,7 +46,7 @@ public partial class AuthProvider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AuthProvider.html#login(javax.security.auth.Subject,javax.security.auth.callback.CallbackHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AuthProvider.html#login(javax.security.auth.Subject,javax.security.auth.callback.CallbackHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Subject"/></param>
         /// <param name="arg1"><see cref="Javax.Security.Auth.Callback.CallbackHandler"/></param>
@@ -56,7 +56,7 @@ public void Login(Javax.Security.Auth.Subject arg0, Javax.Security.Auth.Callback
             IExecute("login", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AuthProvider.html#logout()"/>
+        /// <see href="https://developer.android.com/reference/java/security/AuthProvider.html#logout()"/>
         /// </summary>
         /// <exception cref="Javax.Security.Auth.Login.LoginException"/>
         public void Logout()
@@ -64,7 +64,7 @@ public void Logout()
             IExecuteWithSignature("logout", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/AuthProvider.html#setCallbackHandler(javax.security.auth.callback.CallbackHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/security/AuthProvider.html#setCallbackHandler(javax.security.auth.callback.CallbackHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Callback.CallbackHandler"/></param>
         public void SetCallbackHandler(Javax.Security.Auth.Callback.CallbackHandler arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/BasicPermission.cs b/src/net/Netdroid/Generated/Java/Security/BasicPermission.cs
index 13a637b9b..a0288242a 100644
--- a/src/net/Netdroid/Generated/Java/Security/BasicPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Security/BasicPermission.cs
@@ -30,7 +30,7 @@ public partial class BasicPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/BasicPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/BasicPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public BasicPermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/BasicPermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/BasicPermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public BasicPermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Security/Cert/AllPackageClasses.cs
index a3a0c9f01..4a0684e24 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Security.Cert
 {
     #region Certificate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Certificate.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/Certificate.html"/>
     /// </summary>
     public partial class Certificate : Java.Io.Serializable
     {
@@ -36,12 +36,12 @@ public partial class Certificate : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Certificate() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Certificate(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Certificate(params object[] args) : base(args) { }
 
     #region CertificateEncodingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateEncodingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertificateEncodingException.html"/>
     /// </summary>
     public partial class CertificateEncodingException : Java.Security.Cert.CertificateException
     {
@@ -91,7 +91,7 @@ public partial class CertificateEncodingException : Java.Security.Cert.Certifica
 
     #region CertificateException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertificateException.html"/>
     /// </summary>
     public partial class CertificateException : Java.Security.GeneralSecurityException
     {
@@ -108,7 +108,7 @@ public partial class CertificateException : Java.Security.GeneralSecurityExcepti
 
     #region CertificateExpiredException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateExpiredException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertificateExpiredException.html"/>
     /// </summary>
     public partial class CertificateExpiredException : Java.Security.Cert.CertificateException
     {
@@ -125,7 +125,7 @@ public partial class CertificateExpiredException : Java.Security.Cert.Certificat
 
     #region CertificateFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html"/>
     /// </summary>
     public partial class CertificateFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertificateFactory>
     {
@@ -169,7 +169,7 @@ public CertificateFactory(params object[] args) : base(args) { }
 
     #region CertificateFactorySpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html"/>
     /// </summary>
     public partial class CertificateFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertificateFactorySpi>
     {
@@ -177,12 +177,12 @@ public partial class CertificateFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertificateFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertificateFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertificateFactorySpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertificateFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertificateFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertificateFactorySpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -215,7 +215,7 @@ public CertificateFactorySpi(params object[] args) : base(args) { }
 
     #region CertificateNotYetValidException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateNotYetValidException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertificateNotYetValidException.html"/>
     /// </summary>
     public partial class CertificateNotYetValidException : Java.Security.Cert.CertificateException
     {
@@ -232,7 +232,7 @@ public partial class CertificateNotYetValidException : Java.Security.Cert.Certif
 
     #region CertificateParsingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateParsingException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertificateParsingException.html"/>
     /// </summary>
     public partial class CertificateParsingException : Java.Security.Cert.CertificateException
     {
@@ -249,7 +249,7 @@ public partial class CertificateParsingException : Java.Security.Cert.Certificat
 
     #region CertificateRevokedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateRevokedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertificateRevokedException.html"/>
     /// </summary>
     public partial class CertificateRevokedException : Java.Security.Cert.CertificateException
     {
@@ -266,7 +266,7 @@ public partial class CertificateRevokedException : Java.Security.Cert.Certificat
 
     #region CertPath
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPath.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPath.html"/>
     /// </summary>
     public partial class CertPath : Java.Io.Serializable
     {
@@ -274,12 +274,12 @@ public partial class CertPath : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertPath class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPath class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPath() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertPath class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPath class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPath(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -312,7 +312,7 @@ public CertPath(params object[] args) : base(args) { }
 
     #region CertPathBuilder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html"/>
     /// </summary>
     public partial class CertPathBuilder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertPathBuilder>
     {
@@ -356,7 +356,7 @@ public CertPathBuilder(params object[] args) : base(args) { }
 
     #region CertPathBuilderException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilderException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilderException.html"/>
     /// </summary>
     public partial class CertPathBuilderException : Java.Security.GeneralSecurityException
     {
@@ -373,7 +373,7 @@ public partial class CertPathBuilderException : Java.Security.GeneralSecurityExc
 
     #region CertPathBuilderResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilderResult.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilderResult.html"/>
     /// </summary>
     public partial class CertPathBuilderResult : Java.Lang.Cloneable
     {
@@ -381,12 +381,12 @@ public partial class CertPathBuilderResult : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertPathBuilderResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathBuilderResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathBuilderResult() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertPathBuilderResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathBuilderResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathBuilderResult(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -419,7 +419,7 @@ public CertPathBuilderResult(params object[] args) : base(args) { }
 
     #region CertPathBuilderSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilderSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilderSpi.html"/>
     /// </summary>
     public partial class CertPathBuilderSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertPathBuilderSpi>
     {
@@ -427,12 +427,12 @@ public partial class CertPathBuilderSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertPathBuilderSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathBuilderSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathBuilderSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertPathBuilderSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathBuilderSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathBuilderSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -465,7 +465,7 @@ public CertPathBuilderSpi(params object[] args) : base(args) { }
 
     #region CertPathChecker
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathChecker.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathChecker.html"/>
     /// </summary>
     public partial class CertPathChecker : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertPathChecker>
     {
@@ -473,12 +473,12 @@ public partial class CertPathChecker : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertPathChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathChecker() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertPathChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathChecker(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -511,7 +511,7 @@ public CertPathChecker(params object[] args) : base(args) { }
 
     #region CertPathParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathParameters.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathParameters.html"/>
     /// </summary>
     public partial class CertPathParameters : Java.Lang.Cloneable
     {
@@ -519,12 +519,12 @@ public partial class CertPathParameters : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertPathParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathParameters() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertPathParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathParameters(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -557,7 +557,7 @@ public CertPathParameters(params object[] args) : base(args) { }
 
     #region CertPathValidator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html"/>
     /// </summary>
     public partial class CertPathValidator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertPathValidator>
     {
@@ -601,7 +601,7 @@ public CertPathValidator(params object[] args) : base(args) { }
 
     #region CertPathValidatorException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.html"/>
     /// </summary>
     public partial class CertPathValidatorException : Java.Security.GeneralSecurityException
     {
@@ -614,7 +614,7 @@ public partial class CertPathValidatorException : Java.Security.GeneralSecurityE
         // TODO: complete the class
         #region BasicReason
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html"/>
         /// </summary>
         public partial class BasicReason : Java.Lang.Enum<Java.Security.Cert.CertPathValidatorException.BasicReason>
         {
@@ -658,7 +658,7 @@ public BasicReason(params object[] args) : base(args) { }
 
         #region Reason
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.Reason.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.Reason.html"/>
         /// </summary>
         public partial class Reason : Java.Io.Serializable
         {
@@ -666,12 +666,12 @@ public partial class Reason : Java.Io.Serializable
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Reason class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Reason class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Reason() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Reason class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Reason class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Reason(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -708,7 +708,7 @@ public Reason(params object[] args) : base(args) { }
 
     #region CertPathValidatorResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorResult.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorResult.html"/>
     /// </summary>
     public partial class CertPathValidatorResult : Java.Lang.Cloneable
     {
@@ -716,12 +716,12 @@ public partial class CertPathValidatorResult : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertPathValidatorResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathValidatorResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathValidatorResult() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertPathValidatorResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathValidatorResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathValidatorResult(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -754,7 +754,7 @@ public CertPathValidatorResult(params object[] args) : base(args) { }
 
     #region CertPathValidatorSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorSpi.html"/>
     /// </summary>
     public partial class CertPathValidatorSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertPathValidatorSpi>
     {
@@ -762,12 +762,12 @@ public partial class CertPathValidatorSpi : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertPathValidatorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathValidatorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathValidatorSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertPathValidatorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertPathValidatorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertPathValidatorSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -800,7 +800,7 @@ public CertPathValidatorSpi(params object[] args) : base(args) { }
 
     #region CertSelector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertSelector.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertSelector.html"/>
     /// </summary>
     public partial class CertSelector : Java.Lang.Cloneable
     {
@@ -808,12 +808,12 @@ public partial class CertSelector : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertSelector() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertSelector(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -846,7 +846,7 @@ public CertSelector(params object[] args) : base(args) { }
 
     #region CertStore
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html"/>
     /// </summary>
     public partial class CertStore : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertStore>
     {
@@ -890,7 +890,7 @@ public CertStore(params object[] args) : base(args) { }
 
     #region CertStoreException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStoreException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertStoreException.html"/>
     /// </summary>
     public partial class CertStoreException : Java.Security.GeneralSecurityException
     {
@@ -907,7 +907,7 @@ public partial class CertStoreException : Java.Security.GeneralSecurityException
 
     #region CertStoreParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStoreParameters.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertStoreParameters.html"/>
     /// </summary>
     public partial class CertStoreParameters : Java.Lang.Cloneable
     {
@@ -915,12 +915,12 @@ public partial class CertStoreParameters : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertStoreParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertStoreParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertStoreParameters() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertStoreParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertStoreParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertStoreParameters(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -953,7 +953,7 @@ public CertStoreParameters(params object[] args) : base(args) { }
 
     #region CertStoreSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStoreSpi.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CertStoreSpi.html"/>
     /// </summary>
     public partial class CertStoreSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CertStoreSpi>
     {
@@ -961,12 +961,12 @@ public partial class CertStoreSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cert
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CertStoreSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertStoreSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertStoreSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CertStoreSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CertStoreSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CertStoreSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -999,7 +999,7 @@ public CertStoreSpi(params object[] args) : base(args) { }
 
     #region CollectionCertStoreParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CollectionCertStoreParameters.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CollectionCertStoreParameters.html"/>
     /// </summary>
     public partial class CollectionCertStoreParameters : Java.Security.Cert.CertStoreParameters
     {
@@ -1043,7 +1043,7 @@ public CollectionCertStoreParameters(params object[] args) : base(args) { }
 
     #region CRL
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRL.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CRL.html"/>
     /// </summary>
     public partial class CRL : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CRL>
     {
@@ -1051,12 +1051,12 @@ public partial class CRL : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CRL>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CRL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CRL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CRL() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CRL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CRL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CRL(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1089,7 +1089,7 @@ public CRL(params object[] args) : base(args) { }
 
     #region CRLException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CRLException.html"/>
     /// </summary>
     public partial class CRLException : Java.Security.GeneralSecurityException
     {
@@ -1106,7 +1106,7 @@ public partial class CRLException : Java.Security.GeneralSecurityException
 
     #region CRLReason
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html"/>
     /// </summary>
     public partial class CRLReason : Java.Lang.Enum<Java.Security.Cert.CRLReason>
     {
@@ -1150,7 +1150,7 @@ public CRLReason(params object[] args) : base(args) { }
 
     #region CRLSelector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLSelector.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/CRLSelector.html"/>
     /// </summary>
     public partial class CRLSelector : Java.Lang.Cloneable
     {
@@ -1158,12 +1158,12 @@ public partial class CRLSelector : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CRLSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CRLSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CRLSelector() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CRLSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CRLSelector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CRLSelector(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1196,7 +1196,7 @@ public CRLSelector(params object[] args) : base(args) { }
 
     #region Extension
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Extension.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/Extension.html"/>
     /// </summary>
     public partial class Extension : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Extension>
     {
@@ -1204,12 +1204,12 @@ public partial class Extension : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Extensi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Extension class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Extension class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Extension() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Extension class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Extension class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Extension(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1242,7 +1242,7 @@ public Extension(params object[] args) : base(args) { }
 
     #region LDAPCertStoreParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/LDAPCertStoreParameters.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters.html"/>
     /// </summary>
     public partial class LDAPCertStoreParameters : Java.Security.Cert.CertStoreParameters
     {
@@ -1286,7 +1286,7 @@ public LDAPCertStoreParameters(params object[] args) : base(args) { }
 
     #region PKIXBuilderParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXBuilderParameters.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PKIXBuilderParameters.html"/>
     /// </summary>
     public partial class PKIXBuilderParameters : Java.Security.Cert.PKIXParameters
     {
@@ -1330,7 +1330,7 @@ public PKIXBuilderParameters(params object[] args) : base(args) { }
 
     #region PKIXCertPathBuilderResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathBuilderResult.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathBuilderResult.html"/>
     /// </summary>
     public partial class PKIXCertPathBuilderResult : Java.Security.Cert.PKIXCertPathValidatorResult
     {
@@ -1374,7 +1374,7 @@ public PKIXCertPathBuilderResult(params object[] args) : base(args) { }
 
     #region PKIXCertPathChecker
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathChecker.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathChecker.html"/>
     /// </summary>
     public partial class PKIXCertPathChecker : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PKIXCertPathChecker>
     {
@@ -1382,12 +1382,12 @@ public partial class PKIXCertPathChecker : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PKIXCertPathChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PKIXCertPathChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PKIXCertPathChecker() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PKIXCertPathChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PKIXCertPathChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PKIXCertPathChecker(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1420,7 +1420,7 @@ public PKIXCertPathChecker(params object[] args) : base(args) { }
 
     #region PKIXCertPathValidatorResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathValidatorResult.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathValidatorResult.html"/>
     /// </summary>
     public partial class PKIXCertPathValidatorResult : Java.Security.Cert.CertPathValidatorResult
     {
@@ -1464,7 +1464,7 @@ public PKIXCertPathValidatorResult(params object[] args) : base(args) { }
 
     #region PKIXParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html"/>
     /// </summary>
     public partial class PKIXParameters : Java.Security.Cert.CertPathParameters
     {
@@ -1508,7 +1508,7 @@ public PKIXParameters(params object[] args) : base(args) { }
 
     #region PKIXReason
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html"/>
     /// </summary>
     public partial class PKIXReason : Java.Lang.Enum<Java.Security.Cert.PKIXReason>
     {
@@ -1552,7 +1552,7 @@ public PKIXReason(params object[] args) : base(args) { }
 
     #region PKIXRevocationChecker
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html"/>
     /// </summary>
     public partial class PKIXRevocationChecker : Java.Security.Cert.PKIXCertPathChecker
     {
@@ -1560,12 +1560,12 @@ public partial class PKIXRevocationChecker : Java.Security.Cert.PKIXCertPathChec
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PKIXRevocationChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PKIXRevocationChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PKIXRevocationChecker() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PKIXRevocationChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PKIXRevocationChecker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PKIXRevocationChecker(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1594,7 +1594,7 @@ public PKIXRevocationChecker(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Option
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.Option.html"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.Option.html"/>
         /// </summary>
         public partial class Option : Java.Lang.Enum<Java.Security.Cert.PKIXRevocationChecker.Option>
         {
@@ -1642,7 +1642,7 @@ public Option(params object[] args) : base(args) { }
 
     #region PolicyNode
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyNode.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PolicyNode.html"/>
     /// </summary>
     public partial class PolicyNode : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PolicyNode>
     {
@@ -1650,12 +1650,12 @@ public partial class PolicyNode : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Policy
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PolicyNode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PolicyNode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PolicyNode() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PolicyNode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PolicyNode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PolicyNode(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1688,7 +1688,7 @@ public PolicyNode(params object[] args) : base(args) { }
 
     #region PolicyQualifierInfo
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyQualifierInfo.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/PolicyQualifierInfo.html"/>
     /// </summary>
     public partial class PolicyQualifierInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PolicyQualifierInfo>
     {
@@ -1732,7 +1732,7 @@ public PolicyQualifierInfo(params object[] args) : base(args) { }
 
     #region TrustAnchor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html"/>
     /// </summary>
     public partial class TrustAnchor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TrustAnchor>
     {
@@ -1776,7 +1776,7 @@ public TrustAnchor(params object[] args) : base(args) { }
 
     #region URICertStoreParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/URICertStoreParameters.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/URICertStoreParameters.html"/>
     /// </summary>
     public partial class URICertStoreParameters : Java.Security.Cert.CertStoreParameters
     {
@@ -1820,7 +1820,7 @@ public URICertStoreParameters(params object[] args) : base(args) { }
 
     #region X509Certificate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html"/>
     /// </summary>
     public partial class X509Certificate : Java.Security.Cert.Certificate
     {
@@ -1828,12 +1828,12 @@ public partial class X509Certificate : Java.Security.Cert.Certificate
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509Certificate() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509Certificate(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1866,7 +1866,7 @@ public X509Certificate(params object[] args) : base(args) { }
 
     #region X509CertSelector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html"/>
     /// </summary>
     public partial class X509CertSelector : Java.Security.Cert.CertSelector
     {
@@ -1910,7 +1910,7 @@ public X509CertSelector(params object[] args) : base(args) { }
 
     #region X509CRL
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html"/>
     /// </summary>
     public partial class X509CRL : Java.Security.Cert.CRL
     {
@@ -1918,12 +1918,12 @@ public partial class X509CRL : Java.Security.Cert.CRL
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509CRL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509CRL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509CRL() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509CRL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509CRL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509CRL(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1956,7 +1956,7 @@ public X509CRL(params object[] args) : base(args) { }
 
     #region X509CRLEntry
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLEntry.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLEntry.html"/>
     /// </summary>
     public partial class X509CRLEntry : Java.Security.Cert.X509Extension
     {
@@ -1964,12 +1964,12 @@ public partial class X509CRLEntry : Java.Security.Cert.X509Extension
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509CRLEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509CRLEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509CRLEntry() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509CRLEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509CRLEntry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509CRLEntry(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2002,7 +2002,7 @@ public X509CRLEntry(params object[] args) : base(args) { }
 
     #region X509CRLSelector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html"/>
     /// </summary>
     public partial class X509CRLSelector : Java.Security.Cert.CRLSelector
     {
@@ -2046,7 +2046,7 @@ public X509CRLSelector(params object[] args) : base(args) { }
 
     #region X509Extension
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Extension.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/cert/X509Extension.html"/>
     /// </summary>
     public partial class X509Extension : MASES.JCOBridge.C2JBridge.JVMBridgeBase<X509Extension>
     {
@@ -2054,12 +2054,12 @@ public partial class X509Extension : MASES.JCOBridge.C2JBridge.JVMBridgeBase<X50
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509Extension class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509Extension class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509Extension() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509Extension class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509Extension class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509Extension(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CRL.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CRL.cs
index 6ca45f332..4ca6d94a2 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CRL.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CRL.cs
@@ -46,14 +46,7 @@ public partial class CRL
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRL.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRL.html#isRevoked(java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRL.html#isRevoked(java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -61,6 +54,14 @@ public bool IsRevoked(Java.Security.Cert.Certificate arg0)
         {
             return IExecuteWithSignature<bool>("isRevoked", "(Ljava/security/cert/Certificate;)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRL.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CRLReason.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CRLReason.cs
index c3b922eed..715480d34 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CRLReason.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CRLReason.cs
@@ -38,67 +38,67 @@ public partial class CRLReason
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#AA_COMPROMISE"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#AA_COMPROMISE"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason AA_COMPROMISE { get { if (!_AA_COMPROMISEReady) { _AA_COMPROMISEContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "AA_COMPROMISE"); _AA_COMPROMISEReady = true; } return _AA_COMPROMISEContent; } }
         private static Java.Security.Cert.CRLReason _AA_COMPROMISEContent = default;
         private static bool _AA_COMPROMISEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#AFFILIATION_CHANGED"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#AFFILIATION_CHANGED"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason AFFILIATION_CHANGED { get { if (!_AFFILIATION_CHANGEDReady) { _AFFILIATION_CHANGEDContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "AFFILIATION_CHANGED"); _AFFILIATION_CHANGEDReady = true; } return _AFFILIATION_CHANGEDContent; } }
         private static Java.Security.Cert.CRLReason _AFFILIATION_CHANGEDContent = default;
         private static bool _AFFILIATION_CHANGEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#CA_COMPROMISE"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#CA_COMPROMISE"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason CA_COMPROMISE { get { if (!_CA_COMPROMISEReady) { _CA_COMPROMISEContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "CA_COMPROMISE"); _CA_COMPROMISEReady = true; } return _CA_COMPROMISEContent; } }
         private static Java.Security.Cert.CRLReason _CA_COMPROMISEContent = default;
         private static bool _CA_COMPROMISEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#CERTIFICATE_HOLD"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#CERTIFICATE_HOLD"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason CERTIFICATE_HOLD { get { if (!_CERTIFICATE_HOLDReady) { _CERTIFICATE_HOLDContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "CERTIFICATE_HOLD"); _CERTIFICATE_HOLDReady = true; } return _CERTIFICATE_HOLDContent; } }
         private static Java.Security.Cert.CRLReason _CERTIFICATE_HOLDContent = default;
         private static bool _CERTIFICATE_HOLDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#CESSATION_OF_OPERATION"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#CESSATION_OF_OPERATION"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason CESSATION_OF_OPERATION { get { if (!_CESSATION_OF_OPERATIONReady) { _CESSATION_OF_OPERATIONContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "CESSATION_OF_OPERATION"); _CESSATION_OF_OPERATIONReady = true; } return _CESSATION_OF_OPERATIONContent; } }
         private static Java.Security.Cert.CRLReason _CESSATION_OF_OPERATIONContent = default;
         private static bool _CESSATION_OF_OPERATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#KEY_COMPROMISE"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#KEY_COMPROMISE"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason KEY_COMPROMISE { get { if (!_KEY_COMPROMISEReady) { _KEY_COMPROMISEContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "KEY_COMPROMISE"); _KEY_COMPROMISEReady = true; } return _KEY_COMPROMISEContent; } }
         private static Java.Security.Cert.CRLReason _KEY_COMPROMISEContent = default;
         private static bool _KEY_COMPROMISEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#PRIVILEGE_WITHDRAWN"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#PRIVILEGE_WITHDRAWN"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason PRIVILEGE_WITHDRAWN { get { if (!_PRIVILEGE_WITHDRAWNReady) { _PRIVILEGE_WITHDRAWNContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "PRIVILEGE_WITHDRAWN"); _PRIVILEGE_WITHDRAWNReady = true; } return _PRIVILEGE_WITHDRAWNContent; } }
         private static Java.Security.Cert.CRLReason _PRIVILEGE_WITHDRAWNContent = default;
         private static bool _PRIVILEGE_WITHDRAWNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#REMOVE_FROM_CRL"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#REMOVE_FROM_CRL"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason REMOVE_FROM_CRL { get { if (!_REMOVE_FROM_CRLReady) { _REMOVE_FROM_CRLContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "REMOVE_FROM_CRL"); _REMOVE_FROM_CRLReady = true; } return _REMOVE_FROM_CRLContent; } }
         private static Java.Security.Cert.CRLReason _REMOVE_FROM_CRLContent = default;
         private static bool _REMOVE_FROM_CRLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#SUPERSEDED"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#SUPERSEDED"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason SUPERSEDED { get { if (!_SUPERSEDEDReady) { _SUPERSEDEDContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "SUPERSEDED"); _SUPERSEDEDReady = true; } return _SUPERSEDEDContent; } }
         private static Java.Security.Cert.CRLReason _SUPERSEDEDContent = default;
         private static bool _SUPERSEDEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#UNSPECIFIED"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#UNSPECIFIED"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason UNSPECIFIED { get { if (!_UNSPECIFIEDReady) { _UNSPECIFIEDContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "UNSPECIFIED"); _UNSPECIFIEDReady = true; } return _UNSPECIFIEDContent; } }
         private static Java.Security.Cert.CRLReason _UNSPECIFIEDContent = default;
         private static bool _UNSPECIFIEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#UNUSED"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#UNUSED"/>
         /// </summary>
         public static Java.Security.Cert.CRLReason UNUSED { get { if (!_UNUSEDReady) { _UNUSEDContent = SGetField<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "UNUSED"); _UNUSEDReady = true; } return _UNUSEDContent; } }
         private static Java.Security.Cert.CRLReason _UNUSEDContent = default;
@@ -108,7 +108,7 @@ public partial class CRLReason
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.CRLReason"/></returns>
@@ -117,7 +117,7 @@ public static Java.Security.Cert.CRLReason ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Security.Cert.CRLReason>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/security/cert/CRLReason;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLReason.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLReason.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.Cert.CRLReason"/></returns>
         public static Java.Security.Cert.CRLReason[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CRLSelector.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CRLSelector.cs
index ab29d7c15..58e52e219 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CRLSelector.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CRLSelector.cs
@@ -64,7 +64,7 @@ public partial class CRLSelector : Java.Security.Cert.ICRLSelector
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CRLSelector.html#match(java.security.cert.CRL)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CRLSelector.html#match(java.security.cert.CRL)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CRL"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertPath.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertPath.cs
index bc95ed19a..1bb043373 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertPath.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertPath.cs
@@ -46,42 +46,48 @@ public partial class CertPath
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPath.html#getCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPath.html#getEncoded()"/>
         /// </summary>
-        public Java.Util.List Certificates
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Security.Cert.CertificateEncodingException"/>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignature<Java.Util.List>("getCertificates", "()Ljava/util/List;"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPath.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPath.html#getEncoded(java.lang.String)"/>
         /// </summary>
-        public byte[] Encoded
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Security.Cert.CertificateEncodingException"/>
+        public byte[] GetEncoded(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "(Ljava/lang/String;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPath.html#getEncodings()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPath.html#getEncodings()"/>
         /// </summary>
-        public Java.Util.Iterator<Java.Lang.String> Encodings
+        /// <returns><see cref="Java.Util.Iterator"/></returns>
+        public Java.Util.Iterator<Java.Lang.String> GetEncodings()
         {
-            get { return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getEncodings", "()Ljava/util/Iterator;"); }
+            return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getEncodings", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPath.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPath.html#getCertificates()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <typeparam name="ReturnExtendsJava_Security_Cert_Certificate"><see cref="Java.Security.Cert.Certificate"/></typeparam>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<ReturnExtendsJava_Security_Cert_Certificate> GetCertificates<ReturnExtendsJava_Security_Cert_Certificate>() where ReturnExtendsJava_Security_Cert_Certificate : Java.Security.Cert.Certificate
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.List<ReturnExtendsJava_Security_Cert_Certificate>>("getCertificates", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPath.html#getEncoded(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPath.html#getType()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="byte"/></returns>
-        /// <exception cref="Java.Security.Cert.CertificateEncodingException"/>
-        public byte[] GetEncoded(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            return IExecuteWithSignatureArray<byte>("getEncoded", "(Ljava/lang/String;)[B", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilder.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilder.cs
index c086b204a..0cb3b015d 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilder.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilder.cs
@@ -42,14 +42,15 @@ public partial class CertPathBuilder
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html#getDefaultType()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html#getDefaultType()"/>
         /// </summary>
-        public static Java.Lang.String DefaultType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetDefaultType()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultType", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -61,7 +62,7 @@ public static Java.Security.Cert.CertPathBuilder GetInstance(Java.Lang.String ar
             return SExecute<Java.Security.Cert.CertPathBuilder>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -72,7 +73,7 @@ public static Java.Security.Cert.CertPathBuilder GetInstance(Java.Lang.String ar
             return SExecute<Java.Security.Cert.CertPathBuilder>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.CertPathBuilder"/></returns>
@@ -86,36 +87,39 @@ public static Java.Security.Cert.CertPathBuilder GetInstance(Java.Lang.String ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html#build(java.security.cert.CertPathParameters)"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <param name="arg0"><see cref="Java.Security.Cert.CertPathParameters"/></param>
+        /// <returns><see cref="Java.Security.Cert.CertPathBuilderResult"/></returns>
+        /// <exception cref="Java.Security.Cert.CertPathBuilderException"/>
+        /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
+        public Java.Security.Cert.CertPathBuilderResult Build(Java.Security.Cert.CertPathParameters arg0)
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertPathBuilderResult>("build", "(Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathBuilderResult;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html#getRevocationChecker()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html#getRevocationChecker()"/>
         /// </summary>
-        public Java.Security.Cert.CertPathChecker RevocationChecker
+        /// <returns><see cref="Java.Security.Cert.CertPathChecker"/></returns>
+        public Java.Security.Cert.CertPathChecker GetRevocationChecker()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertPathChecker>("getRevocationChecker", "()Ljava/security/cert/CertPathChecker;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertPathChecker>("getRevocationChecker", "()Ljava/security/cert/CertPathChecker;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilder.html#build(java.security.cert.CertPathParameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilder.html#getProvider()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.Cert.CertPathParameters"/></param>
-        /// <returns><see cref="Java.Security.Cert.CertPathBuilderResult"/></returns>
-        /// <exception cref="Java.Security.Cert.CertPathBuilderException"/>
-        /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
-        public Java.Security.Cert.CertPathBuilderResult Build(Java.Security.Cert.CertPathParameters arg0)
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            return IExecuteWithSignature<Java.Security.Cert.CertPathBuilderResult>("build", "(Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathBuilderResult;", arg0);
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilderResult.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilderResult.cs
index 7cbd88acd..9d049573d 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilderResult.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilderResult.cs
@@ -64,11 +64,12 @@ public partial class CertPathBuilderResult : Java.Security.Cert.ICertPathBuilder
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilderResult.html#getCertPath()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilderResult.html#getCertPath()"/>
         /// </summary>
-        public Java.Security.Cert.CertPath CertPath
+        /// <returns><see cref="Java.Security.Cert.CertPath"/></returns>
+        public Java.Security.Cert.CertPath GetCertPath()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertPath>("getCertPath", "()Ljava/security/cert/CertPath;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertPath>("getCertPath", "()Ljava/security/cert/CertPath;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilderSpi.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilderSpi.cs
index 8102478c4..6212883ed 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilderSpi.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathBuilderSpi.cs
@@ -46,7 +46,7 @@ public partial class CertPathBuilderSpi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilderSpi.html#engineBuild(java.security.cert.CertPathParameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilderSpi.html#engineBuild(java.security.cert.CertPathParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertPathParameters"/></param>
         /// <returns><see cref="Java.Security.Cert.CertPathBuilderResult"/></returns>
@@ -57,7 +57,7 @@ public Java.Security.Cert.CertPathBuilderResult EngineBuild(Java.Security.Cert.C
             return IExecuteWithSignature<Java.Security.Cert.CertPathBuilderResult>("engineBuild", "(Ljava/security/cert/CertPathParameters;)Ljava/security/cert/CertPathBuilderResult;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathBuilderSpi.html#engineGetRevocationChecker()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathBuilderSpi.html#engineGetRevocationChecker()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.Cert.CertPathChecker"/></returns>
         public Java.Security.Cert.CertPathChecker EngineGetRevocationChecker()
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathChecker.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathChecker.cs
index 8e0ba093e..89ca8c2e6 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathChecker.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathChecker.cs
@@ -64,7 +64,7 @@ public partial class CertPathChecker : Java.Security.Cert.ICertPathChecker
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathChecker.html#isForwardCheckingSupported()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathChecker.html#isForwardCheckingSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsForwardCheckingSupported()
@@ -72,7 +72,7 @@ public bool IsForwardCheckingSupported()
             return IExecuteWithSignature<bool>("isForwardCheckingSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathChecker.html#check(java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathChecker.html#check(java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
         /// <exception cref="Java.Security.Cert.CertPathValidatorException"/>
@@ -81,7 +81,7 @@ public void Check(Java.Security.Cert.Certificate arg0)
             IExecuteWithSignature("check", "(Ljava/security/cert/Certificate;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathChecker.html#init(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathChecker.html#init(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Security.Cert.CertPathValidatorException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidator.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidator.cs
index 56dea3c98..9686938d0 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidator.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidator.cs
@@ -42,14 +42,15 @@ public partial class CertPathValidator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html#getDefaultType()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html#getDefaultType()"/>
         /// </summary>
-        public static Java.Lang.String DefaultType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetDefaultType()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultType", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -61,7 +62,7 @@ public static Java.Security.Cert.CertPathValidator GetInstance(Java.Lang.String
             return SExecute<Java.Security.Cert.CertPathValidator>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -72,7 +73,7 @@ public static Java.Security.Cert.CertPathValidator GetInstance(Java.Lang.String
             return SExecute<Java.Security.Cert.CertPathValidator>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.CertPathValidator"/></returns>
@@ -86,28 +87,23 @@ public static Java.Security.Cert.CertPathValidator GetInstance(Java.Lang.String
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html#getRevocationChecker()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Java.Security.Cert.CertPathChecker"/></returns>
+        public Java.Security.Cert.CertPathChecker GetRevocationChecker()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertPathChecker>("getRevocationChecker", "()Ljava/security/cert/CertPathChecker;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html#getRevocationChecker()"/> 
-        /// </summary>
-        public Java.Security.Cert.CertPathChecker RevocationChecker
-        {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertPathChecker>("getRevocationChecker", "()Ljava/security/cert/CertPathChecker;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidator.html#validate(java.security.cert.CertPath,java.security.cert.CertPathParameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html#validate(java.security.cert.CertPath,java.security.cert.CertPathParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertPath"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.CertPathParameters"/></param>
@@ -118,6 +114,14 @@ public Java.Security.Cert.CertPathValidatorResult Validate(Java.Security.Cert.Ce
         {
             return IExecute<Java.Security.Cert.CertPathValidatorResult>("validate", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidator.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidatorException.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidatorException.cs
index 8156c1978..716f7a781 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidatorException.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidatorException.cs
@@ -62,43 +62,43 @@ public partial class BasicReason
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#ALGORITHM_CONSTRAINED"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#ALGORITHM_CONSTRAINED"/>
             /// </summary>
             public static Java.Security.Cert.CertPathValidatorException.BasicReason ALGORITHM_CONSTRAINED { get { if (!_ALGORITHM_CONSTRAINEDReady) { _ALGORITHM_CONSTRAINEDContent = SGetField<Java.Security.Cert.CertPathValidatorException.BasicReason>(LocalBridgeClazz, "ALGORITHM_CONSTRAINED"); _ALGORITHM_CONSTRAINEDReady = true; } return _ALGORITHM_CONSTRAINEDContent; } }
             private static Java.Security.Cert.CertPathValidatorException.BasicReason _ALGORITHM_CONSTRAINEDContent = default;
             private static bool _ALGORITHM_CONSTRAINEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#EXPIRED"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#EXPIRED"/>
             /// </summary>
             public static Java.Security.Cert.CertPathValidatorException.BasicReason EXPIRED { get { if (!_EXPIREDReady) { _EXPIREDContent = SGetField<Java.Security.Cert.CertPathValidatorException.BasicReason>(LocalBridgeClazz, "EXPIRED"); _EXPIREDReady = true; } return _EXPIREDContent; } }
             private static Java.Security.Cert.CertPathValidatorException.BasicReason _EXPIREDContent = default;
             private static bool _EXPIREDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#INVALID_SIGNATURE"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#INVALID_SIGNATURE"/>
             /// </summary>
             public static Java.Security.Cert.CertPathValidatorException.BasicReason INVALID_SIGNATURE { get { if (!_INVALID_SIGNATUREReady) { _INVALID_SIGNATUREContent = SGetField<Java.Security.Cert.CertPathValidatorException.BasicReason>(LocalBridgeClazz, "INVALID_SIGNATURE"); _INVALID_SIGNATUREReady = true; } return _INVALID_SIGNATUREContent; } }
             private static Java.Security.Cert.CertPathValidatorException.BasicReason _INVALID_SIGNATUREContent = default;
             private static bool _INVALID_SIGNATUREReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#NOT_YET_VALID"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#NOT_YET_VALID"/>
             /// </summary>
             public static Java.Security.Cert.CertPathValidatorException.BasicReason NOT_YET_VALID { get { if (!_NOT_YET_VALIDReady) { _NOT_YET_VALIDContent = SGetField<Java.Security.Cert.CertPathValidatorException.BasicReason>(LocalBridgeClazz, "NOT_YET_VALID"); _NOT_YET_VALIDReady = true; } return _NOT_YET_VALIDContent; } }
             private static Java.Security.Cert.CertPathValidatorException.BasicReason _NOT_YET_VALIDContent = default;
             private static bool _NOT_YET_VALIDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#REVOKED"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#REVOKED"/>
             /// </summary>
             public static Java.Security.Cert.CertPathValidatorException.BasicReason REVOKED { get { if (!_REVOKEDReady) { _REVOKEDContent = SGetField<Java.Security.Cert.CertPathValidatorException.BasicReason>(LocalBridgeClazz, "REVOKED"); _REVOKEDReady = true; } return _REVOKEDContent; } }
             private static Java.Security.Cert.CertPathValidatorException.BasicReason _REVOKEDContent = default;
             private static bool _REVOKEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#UNDETERMINED_REVOCATION_STATUS"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#UNDETERMINED_REVOCATION_STATUS"/>
             /// </summary>
             public static Java.Security.Cert.CertPathValidatorException.BasicReason UNDETERMINED_REVOCATION_STATUS { get { if (!_UNDETERMINED_REVOCATION_STATUSReady) { _UNDETERMINED_REVOCATION_STATUSContent = SGetField<Java.Security.Cert.CertPathValidatorException.BasicReason>(LocalBridgeClazz, "UNDETERMINED_REVOCATION_STATUS"); _UNDETERMINED_REVOCATION_STATUSReady = true; } return _UNDETERMINED_REVOCATION_STATUSContent; } }
             private static Java.Security.Cert.CertPathValidatorException.BasicReason _UNDETERMINED_REVOCATION_STATUSContent = default;
             private static bool _UNDETERMINED_REVOCATION_STATUSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#UNSPECIFIED"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#UNSPECIFIED"/>
             /// </summary>
             public static Java.Security.Cert.CertPathValidatorException.BasicReason UNSPECIFIED { get { if (!_UNSPECIFIEDReady) { _UNSPECIFIEDContent = SGetField<Java.Security.Cert.CertPathValidatorException.BasicReason>(LocalBridgeClazz, "UNSPECIFIED"); _UNSPECIFIEDReady = true; } return _UNSPECIFIEDContent; } }
             private static Java.Security.Cert.CertPathValidatorException.BasicReason _UNSPECIFIEDContent = default;
@@ -108,7 +108,7 @@ public partial class BasicReason
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Security.Cert.CertPathValidatorException.BasicReason"/></returns>
@@ -117,7 +117,7 @@ public static Java.Security.Cert.CertPathValidatorException.BasicReason ValueOf(
                 return SExecuteWithSignature<Java.Security.Cert.CertPathValidatorException.BasicReason>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/security/cert/CertPathValidatorException$BasicReason;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorException.BasicReason.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorException.BasicReason.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Security.Cert.CertPathValidatorException.BasicReason"/></returns>
             public static Java.Security.Cert.CertPathValidatorException.BasicReason[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidatorSpi.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidatorSpi.cs
index 72c8e9052..721492ece 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidatorSpi.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertPathValidatorSpi.cs
@@ -46,7 +46,7 @@ public partial class CertPathValidatorSpi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorSpi.html#engineValidate(java.security.cert.CertPath,java.security.cert.CertPathParameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorSpi.html#engineValidate(java.security.cert.CertPath,java.security.cert.CertPathParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertPath"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.CertPathParameters"/></param>
@@ -58,7 +58,7 @@ public Java.Security.Cert.CertPathValidatorResult EngineValidate(Java.Security.C
             return IExecute<Java.Security.Cert.CertPathValidatorResult>("engineValidate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertPathValidatorSpi.html#engineGetRevocationChecker()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertPathValidatorSpi.html#engineGetRevocationChecker()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.Cert.CertPathChecker"/></returns>
         public Java.Security.Cert.CertPathChecker EngineGetRevocationChecker()
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertSelector.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertSelector.cs
index 1e1f733ef..e4d8b376c 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertSelector.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertSelector.cs
@@ -64,7 +64,7 @@ public partial class CertSelector : Java.Security.Cert.ICertSelector
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertSelector.html#match(java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertSelector.html#match(java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertStore.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertStore.cs
index f53ffdcc7..4ae37829d 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertStore.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertStore.cs
@@ -42,14 +42,15 @@ public partial class CertStore
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getDefaultType()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getDefaultType()"/>
         /// </summary>
-        public static Java.Lang.String DefaultType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetDefaultType()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultType", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getInstance(java.lang.String,java.security.cert.CertStoreParameters,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getInstance(java.lang.String,java.security.cert.CertStoreParameters,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.CertStoreParameters"/></param>
@@ -63,7 +64,7 @@ public static Java.Security.Cert.CertStore GetInstance(Java.Lang.String arg0, Ja
             return SExecute<Java.Security.Cert.CertStore>(LocalBridgeClazz, "getInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getInstance(java.lang.String,java.security.cert.CertStoreParameters,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getInstance(java.lang.String,java.security.cert.CertStoreParameters,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.CertStoreParameters"/></param>
@@ -76,7 +77,7 @@ public static Java.Security.Cert.CertStore GetInstance(Java.Lang.String arg0, Ja
             return SExecute<Java.Security.Cert.CertStore>(LocalBridgeClazz, "getInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getInstance(java.lang.String,java.security.cert.CertStoreParameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getInstance(java.lang.String,java.security.cert.CertStoreParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.CertStoreParameters"/></param>
@@ -92,45 +93,48 @@ public static Java.Security.Cert.CertStore GetInstance(Java.Lang.String arg0, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getCertStoreParameters()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getType()"/>
         /// </summary>
-        public Java.Security.Cert.CertStoreParameters CertStoreParameters
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertStoreParameters>("getCertStoreParameters", "()Ljava/security/cert/CertStoreParameters;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getCertStoreParameters()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Java.Security.Cert.CertStoreParameters"/></returns>
+        public Java.Security.Cert.CertStoreParameters GetCertStoreParameters()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertStoreParameters>("getCertStoreParameters", "()Ljava/security/cert/CertStoreParameters;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getProvider()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getCertificates(java.security.cert.CertSelector)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getCertificates(java.security.cert.CertSelector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertSelector"/></param>
         /// <typeparam name="ReturnExtendsJava_Security_Cert_Certificate"><see cref="Java.Security.Cert.Certificate"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         /// <exception cref="Java.Security.Cert.CertStoreException"/>
-        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate> GetCertificates<ReturnExtendsJava_Security_Cert_Certificate>(Java.Security.Cert.CertSelector arg0) where ReturnExtendsJava_Security_Cert_Certificate: Java.Security.Cert.Certificate
+        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate> GetCertificates<ReturnExtendsJava_Security_Cert_Certificate>(Java.Security.Cert.CertSelector arg0) where ReturnExtendsJava_Security_Cert_Certificate : Java.Security.Cert.Certificate
         {
             return IExecuteWithSignature<Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate>>("getCertificates", "(Ljava/security/cert/CertSelector;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStore.html#getCRLs(java.security.cert.CRLSelector)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStore.html#getCRLs(java.security.cert.CRLSelector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CRLSelector"/></param>
         /// <typeparam name="ReturnExtendsJava_Security_Cert_CRL"><see cref="Java.Security.Cert.CRL"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         /// <exception cref="Java.Security.Cert.CertStoreException"/>
-        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL> GetCRLs<ReturnExtendsJava_Security_Cert_CRL>(Java.Security.Cert.CRLSelector arg0) where ReturnExtendsJava_Security_Cert_CRL: Java.Security.Cert.CRL
+        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL> GetCRLs<ReturnExtendsJava_Security_Cert_CRL>(Java.Security.Cert.CRLSelector arg0) where ReturnExtendsJava_Security_Cert_CRL : Java.Security.Cert.CRL
         {
             return IExecuteWithSignature<Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL>>("getCRLs", "(Ljava/security/cert/CRLSelector;)Ljava/util/Collection;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertStoreSpi.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertStoreSpi.cs
index 7b2953566..7fb28712e 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertStoreSpi.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertStoreSpi.cs
@@ -30,7 +30,7 @@ public partial class CertStoreSpi
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStoreSpi.html#%3Cinit%3E(java.security.cert.CertStoreParameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStoreSpi.html#%3Cinit%3E(java.security.cert.CertStoreParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertStoreParameters"/></param>
         /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
@@ -55,24 +55,24 @@ public CertStoreSpi(Java.Security.Cert.CertStoreParameters arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStoreSpi.html#engineGetCertificates(java.security.cert.CertSelector)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStoreSpi.html#engineGetCertificates(java.security.cert.CertSelector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertSelector"/></param>
         /// <typeparam name="ReturnExtendsJava_Security_Cert_Certificate"><see cref="Java.Security.Cert.Certificate"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         /// <exception cref="Java.Security.Cert.CertStoreException"/>
-        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate> EngineGetCertificates<ReturnExtendsJava_Security_Cert_Certificate>(Java.Security.Cert.CertSelector arg0) where ReturnExtendsJava_Security_Cert_Certificate: Java.Security.Cert.Certificate
+        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate> EngineGetCertificates<ReturnExtendsJava_Security_Cert_Certificate>(Java.Security.Cert.CertSelector arg0) where ReturnExtendsJava_Security_Cert_Certificate : Java.Security.Cert.Certificate
         {
             return IExecuteWithSignature<Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate>>("engineGetCertificates", "(Ljava/security/cert/CertSelector;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertStoreSpi.html#engineGetCRLs(java.security.cert.CRLSelector)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertStoreSpi.html#engineGetCRLs(java.security.cert.CRLSelector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CRLSelector"/></param>
         /// <typeparam name="ReturnExtendsJava_Security_Cert_CRL"><see cref="Java.Security.Cert.CRL"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         /// <exception cref="Java.Security.Cert.CertStoreException"/>
-        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL> EngineGetCRLs<ReturnExtendsJava_Security_Cert_CRL>(Java.Security.Cert.CRLSelector arg0) where ReturnExtendsJava_Security_Cert_CRL: Java.Security.Cert.CRL
+        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL> EngineGetCRLs<ReturnExtendsJava_Security_Cert_CRL>(Java.Security.Cert.CRLSelector arg0) where ReturnExtendsJava_Security_Cert_CRL : Java.Security.Cert.CRL
         {
             return IExecuteWithSignature<Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL>>("engineGetCRLs", "(Ljava/security/cert/CRLSelector;)Ljava/util/Collection;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/Certificate.cs b/src/net/Netdroid/Generated/Java/Security/Cert/Certificate.cs
index e03e29b55..76e4f9e4f 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/Certificate.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/Certificate.cs
@@ -46,28 +46,24 @@ public partial class Certificate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Certificate.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/Certificate.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Security.Cert.CertificateEncodingException"/>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Certificate.html#getPublicKey()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/Certificate.html#getPublicKey()"/>
         /// </summary>
-        public Java.Security.PublicKey PublicKey
+        /// <returns><see cref="Java.Security.PublicKey"/></returns>
+        public Java.Security.PublicKey GetPublicKey()
         {
-            get { return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;"); }
+            return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Certificate.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Certificate.html#verify(java.security.PublicKey,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/Certificate.html#verify(java.security.PublicKey,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -81,7 +77,7 @@ public void Verify(Java.Security.PublicKey arg0, Java.Lang.String arg1)
             IExecute("verify", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Certificate.html#verify(java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/Certificate.html#verify(java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <exception cref="Java.Security.Cert.CertificateException"/>
@@ -94,7 +90,15 @@ public void Verify(Java.Security.PublicKey arg0)
             IExecuteWithSignature("verify", "(Ljava/security/PublicKey;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Certificate.html#verify(java.security.PublicKey,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/Certificate.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/Certificate.html#verify(java.security.PublicKey,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertificateFactory.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertificateFactory.cs
index ce39a1167..920d9d342 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertificateFactory.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertificateFactory.cs
@@ -42,7 +42,7 @@ public partial class CertificateFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Java.Security.Cert.CertificateFactory GetInstance(Java.Lang.String
             return SExecute<Java.Security.Cert.CertificateFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Java.Security.Cert.CertificateFactory GetInstance(Java.Lang.String
             return SExecute<Java.Security.Cert.CertificateFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.CertificateFactory"/></returns>
@@ -79,28 +79,15 @@ public static Java.Security.Cert.CertificateFactory GetInstance(Java.Lang.String
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#getCertPathEncodings()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#getType()"/>
         /// </summary>
-        public Java.Util.Iterator<Java.Lang.String> CertPathEncodings
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            get { return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getCertPathEncodings", "()Ljava/util/Iterator;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#getProvider()"/> 
-        /// </summary>
-        public Java.Security.Provider Provider
-        {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#generateCertificate(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#generateCertificate(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
@@ -110,7 +97,7 @@ public Java.Security.Cert.Certificate GenerateCertificate(Java.Io.InputStream ar
             return IExecuteWithSignature<Java.Security.Cert.Certificate>("generateCertificate", "(Ljava/io/InputStream;)Ljava/security/cert/Certificate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#generateCertPath(java.io.InputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#generateCertPath(java.io.InputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -121,7 +108,7 @@ public Java.Security.Cert.CertPath GenerateCertPath(Java.Io.InputStream arg0, Ja
             return IExecute<Java.Security.Cert.CertPath>("generateCertPath", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#generateCertPath(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#generateCertPath(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Java.Security.Cert.CertPath"/></returns>
@@ -131,18 +118,18 @@ public Java.Security.Cert.CertPath GenerateCertPath(Java.Io.InputStream arg0)
             return IExecuteWithSignature<Java.Security.Cert.CertPath>("generateCertPath", "(Ljava/io/InputStream;)Ljava/security/cert/CertPath;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#generateCertPath(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#generateCertPath(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <typeparam name="Arg0ExtendsJava_Security_Cert_Certificate"><see cref="Java.Security.Cert.Certificate"/></typeparam>
         /// <returns><see cref="Java.Security.Cert.CertPath"/></returns>
         /// <exception cref="Java.Security.Cert.CertificateException"/>
-        public Java.Security.Cert.CertPath GenerateCertPath<Arg0ExtendsJava_Security_Cert_Certificate>(Java.Util.List<Arg0ExtendsJava_Security_Cert_Certificate> arg0) where Arg0ExtendsJava_Security_Cert_Certificate: Java.Security.Cert.Certificate
+        public Java.Security.Cert.CertPath GenerateCertPath<Arg0ExtendsJava_Security_Cert_Certificate>(Java.Util.List<Arg0ExtendsJava_Security_Cert_Certificate> arg0) where Arg0ExtendsJava_Security_Cert_Certificate : Java.Security.Cert.Certificate
         {
             return IExecuteWithSignature<Java.Security.Cert.CertPath>("generateCertPath", "(Ljava/util/List;)Ljava/security/cert/CertPath;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#generateCRL(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#generateCRL(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Java.Security.Cert.CRL"/></returns>
@@ -152,27 +139,43 @@ public Java.Security.Cert.CRL GenerateCRL(Java.Io.InputStream arg0)
             return IExecuteWithSignature<Java.Security.Cert.CRL>("generateCRL", "(Ljava/io/InputStream;)Ljava/security/cert/CRL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#generateCertificates(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#generateCertificates(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <typeparam name="ReturnExtendsJava_Security_Cert_Certificate"><see cref="Java.Security.Cert.Certificate"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         /// <exception cref="Java.Security.Cert.CertificateException"/>
-        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate> GenerateCertificates<ReturnExtendsJava_Security_Cert_Certificate>(Java.Io.InputStream arg0) where ReturnExtendsJava_Security_Cert_Certificate: Java.Security.Cert.Certificate
+        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate> GenerateCertificates<ReturnExtendsJava_Security_Cert_Certificate>(Java.Io.InputStream arg0) where ReturnExtendsJava_Security_Cert_Certificate : Java.Security.Cert.Certificate
         {
             return IExecuteWithSignature<Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate>>("generateCertificates", "(Ljava/io/InputStream;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactory.html#generateCRLs(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#generateCRLs(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <typeparam name="ReturnExtendsJava_Security_Cert_CRL"><see cref="Java.Security.Cert.CRL"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         /// <exception cref="Java.Security.Cert.CRLException"/>
-        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL> GenerateCRLs<ReturnExtendsJava_Security_Cert_CRL>(Java.Io.InputStream arg0) where ReturnExtendsJava_Security_Cert_CRL: Java.Security.Cert.CRL
+        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL> GenerateCRLs<ReturnExtendsJava_Security_Cert_CRL>(Java.Io.InputStream arg0) where ReturnExtendsJava_Security_Cert_CRL : Java.Security.Cert.CRL
         {
             return IExecuteWithSignature<Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL>>("generateCRLs", "(Ljava/io/InputStream;)Ljava/util/Collection;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactory.html#getCertPathEncodings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Iterator"/></returns>
+        public Java.Util.Iterator<Java.Lang.String> GetCertPathEncodings()
+        {
+            return IExecuteWithSignature<Java.Util.Iterator<Java.Lang.String>>("getCertPathEncodings", "()Ljava/util/Iterator;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CertificateFactorySpi.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CertificateFactorySpi.cs
index c687c7dde..3e0679446 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CertificateFactorySpi.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CertificateFactorySpi.cs
@@ -46,7 +46,7 @@ public partial class CertificateFactorySpi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html#engineGenerateCertificate(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html#engineGenerateCertificate(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
@@ -56,7 +56,7 @@ public Java.Security.Cert.Certificate EngineGenerateCertificate(Java.Io.InputStr
             return IExecuteWithSignature<Java.Security.Cert.Certificate>("engineGenerateCertificate", "(Ljava/io/InputStream;)Ljava/security/cert/Certificate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html#engineGenerateCRL(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html#engineGenerateCRL(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Java.Security.Cert.CRL"/></returns>
@@ -66,29 +66,29 @@ public Java.Security.Cert.CRL EngineGenerateCRL(Java.Io.InputStream arg0)
             return IExecuteWithSignature<Java.Security.Cert.CRL>("engineGenerateCRL", "(Ljava/io/InputStream;)Ljava/security/cert/CRL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html#engineGenerateCertificates(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html#engineGenerateCertificates(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <typeparam name="ReturnExtendsJava_Security_Cert_Certificate"><see cref="Java.Security.Cert.Certificate"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         /// <exception cref="Java.Security.Cert.CertificateException"/>
-        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate> EngineGenerateCertificates<ReturnExtendsJava_Security_Cert_Certificate>(Java.Io.InputStream arg0) where ReturnExtendsJava_Security_Cert_Certificate: Java.Security.Cert.Certificate
+        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate> EngineGenerateCertificates<ReturnExtendsJava_Security_Cert_Certificate>(Java.Io.InputStream arg0) where ReturnExtendsJava_Security_Cert_Certificate : Java.Security.Cert.Certificate
         {
             return IExecuteWithSignature<Java.Util.Collection<ReturnExtendsJava_Security_Cert_Certificate>>("engineGenerateCertificates", "(Ljava/io/InputStream;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html#engineGenerateCRLs(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html#engineGenerateCRLs(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <typeparam name="ReturnExtendsJava_Security_Cert_CRL"><see cref="Java.Security.Cert.CRL"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         /// <exception cref="Java.Security.Cert.CRLException"/>
-        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL> EngineGenerateCRLs<ReturnExtendsJava_Security_Cert_CRL>(Java.Io.InputStream arg0) where ReturnExtendsJava_Security_Cert_CRL: Java.Security.Cert.CRL
+        public Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL> EngineGenerateCRLs<ReturnExtendsJava_Security_Cert_CRL>(Java.Io.InputStream arg0) where ReturnExtendsJava_Security_Cert_CRL : Java.Security.Cert.CRL
         {
             return IExecuteWithSignature<Java.Util.Collection<ReturnExtendsJava_Security_Cert_CRL>>("engineGenerateCRLs", "(Ljava/io/InputStream;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html#engineGenerateCertPath(java.io.InputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html#engineGenerateCertPath(java.io.InputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -99,7 +99,7 @@ public Java.Security.Cert.CertPath EngineGenerateCertPath(Java.Io.InputStream ar
             return IExecute<Java.Security.Cert.CertPath>("engineGenerateCertPath", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html#engineGenerateCertPath(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html#engineGenerateCertPath(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Java.Security.Cert.CertPath"/></returns>
@@ -109,18 +109,18 @@ public Java.Security.Cert.CertPath EngineGenerateCertPath(Java.Io.InputStream ar
             return IExecuteWithSignature<Java.Security.Cert.CertPath>("engineGenerateCertPath", "(Ljava/io/InputStream;)Ljava/security/cert/CertPath;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html#engineGenerateCertPath(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html#engineGenerateCertPath(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <typeparam name="Arg0ExtendsJava_Security_Cert_Certificate"><see cref="Java.Security.Cert.Certificate"/></typeparam>
         /// <returns><see cref="Java.Security.Cert.CertPath"/></returns>
         /// <exception cref="Java.Security.Cert.CertificateException"/>
-        public Java.Security.Cert.CertPath EngineGenerateCertPath<Arg0ExtendsJava_Security_Cert_Certificate>(Java.Util.List<Arg0ExtendsJava_Security_Cert_Certificate> arg0) where Arg0ExtendsJava_Security_Cert_Certificate: Java.Security.Cert.Certificate
+        public Java.Security.Cert.CertPath EngineGenerateCertPath<Arg0ExtendsJava_Security_Cert_Certificate>(Java.Util.List<Arg0ExtendsJava_Security_Cert_Certificate> arg0) where Arg0ExtendsJava_Security_Cert_Certificate : Java.Security.Cert.Certificate
         {
             return IExecuteWithSignature<Java.Security.Cert.CertPath>("engineGenerateCertPath", "(Ljava/util/List;)Ljava/security/cert/CertPath;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CertificateFactorySpi.html#engineGetCertPathEncodings()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CertificateFactorySpi.html#engineGetCertPathEncodings()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<Java.Lang.String> EngineGetCertPathEncodings()
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/CollectionCertStoreParameters.cs b/src/net/Netdroid/Generated/Java/Security/Cert/CollectionCertStoreParameters.cs
index 99231f207..4be4a8bfc 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/CollectionCertStoreParameters.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/CollectionCertStoreParameters.cs
@@ -30,7 +30,7 @@ public partial class CollectionCertStoreParameters
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CollectionCertStoreParameters.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/CollectionCertStoreParameters.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public CollectionCertStoreParameters(Java.Util.Collection<object> arg0)
@@ -54,11 +54,12 @@ public CollectionCertStoreParameters(Java.Util.Collection<object> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/CollectionCertStoreParameters.html#getCollection()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/CollectionCertStoreParameters.html#getCollection()"/>
         /// </summary>
-        public Java.Util.Collection<object> Collection
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<object> GetCollection()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<object>>("getCollection", "()Ljava/util/Collection;"); }
+            return IExecuteWithSignature<Java.Util.Collection<object>>("getCollection", "()Ljava/util/Collection;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/Extension.cs b/src/net/Netdroid/Generated/Java/Security/Cert/Extension.cs
index 4217a2136..fc4255d61 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/Extension.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/Extension.cs
@@ -64,29 +64,31 @@ public partial class Extension : Java.Security.Cert.IExtension
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Extension.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/Extension.html#isCritical()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="bool"/></returns>
+        public bool IsCritical()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isCritical", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Extension.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/Extension.html#getValue()"/>
         /// </summary>
-        public byte[] Value
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetValue()
         {
-            get { return IExecuteWithSignatureArray<byte>("getValue", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getValue", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Extension.html#isCritical()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/Extension.html#getId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsCritical()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            return IExecuteWithSignature<bool>("isCritical", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/Extension.html#encode(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/Extension.html#encode(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/LDAPCertStoreParameters.cs b/src/net/Netdroid/Generated/Java/Security/Cert/LDAPCertStoreParameters.cs
index f51832c57..027221a9d 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/LDAPCertStoreParameters.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/LDAPCertStoreParameters.cs
@@ -30,7 +30,7 @@ public partial class LDAPCertStoreParameters
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/LDAPCertStoreParameters.html#%3Cinit%3E(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters.html#%3Cinit%3E(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public LDAPCertStoreParameters(Java.Lang.String arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/LDAPCertStoreParameters.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public LDAPCertStoreParameters(Java.Lang.String arg0)
@@ -63,18 +63,20 @@ public LDAPCertStoreParameters(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/LDAPCertStoreParameters.html#getPort()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters.html#getPort()"/>
         /// </summary>
-        public int Port
+        /// <returns><see cref="int"/></returns>
+        public int GetPort()
         {
-            get { return IExecuteWithSignature<int>("getPort", "()I"); }
+            return IExecuteWithSignature<int>("getPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/LDAPCertStoreParameters.html#getServerName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/LDAPCertStoreParameters.html#getServerName()"/>
         /// </summary>
-        public Java.Lang.String ServerName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetServerName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getServerName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getServerName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXBuilderParameters.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXBuilderParameters.cs
index 9e47d24fa..092a8f298 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXBuilderParameters.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXBuilderParameters.cs
@@ -30,7 +30,7 @@ public partial class PKIXBuilderParameters
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXBuilderParameters.html#%3Cinit%3E(java.security.KeyStore,java.security.cert.CertSelector)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXBuilderParameters.html#%3Cinit%3E(java.security.KeyStore,java.security.cert.CertSelector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.CertSelector"/></param>
@@ -41,7 +41,7 @@ public PKIXBuilderParameters(Java.Security.KeyStore arg0, Java.Security.Cert.Cer
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXBuilderParameters.html#%3Cinit%3E(java.util.Set,java.security.cert.CertSelector)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXBuilderParameters.html#%3Cinit%3E(java.util.Set,java.security.cert.CertSelector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.CertSelector"/></param>
@@ -67,11 +67,20 @@ public PKIXBuilderParameters(Java.Util.Set<Java.Security.Cert.TrustAnchor> arg0,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXBuilderParameters.html#getMaxPathLength()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXBuilderParameters.html#setMaxPathLength(int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXBuilderParameters.html#getMaxPathLength()"/>
         /// </summary>
-        public int MaxPathLength
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxPathLength()
         {
-            get { return IExecuteWithSignature<int>("getMaxPathLength", "()I"); } set { IExecuteWithSignature("setMaxPathLength", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxPathLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXBuilderParameters.html#setMaxPathLength(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaxPathLength(int arg0)
+        {
+            IExecuteWithSignature("setMaxPathLength", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathBuilderResult.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathBuilderResult.cs
index 2a8a4d3c0..2ea6a71c0 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathBuilderResult.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathBuilderResult.cs
@@ -30,7 +30,7 @@ public partial class PKIXCertPathBuilderResult
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathBuilderResult.html#%3Cinit%3E(java.security.cert.CertPath,java.security.cert.TrustAnchor,java.security.cert.PolicyNode,java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathBuilderResult.html#%3Cinit%3E(java.security.cert.CertPath,java.security.cert.TrustAnchor,java.security.cert.PolicyNode,java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertPath"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.TrustAnchor"/></param>
@@ -61,11 +61,12 @@ public PKIXCertPathBuilderResult(Java.Security.Cert.CertPath arg0, Java.Security
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathBuilderResult.html#getCertPath()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathBuilderResult.html#getCertPath()"/>
         /// </summary>
-        public Java.Security.Cert.CertPath CertPath
+        /// <returns><see cref="Java.Security.Cert.CertPath"/></returns>
+        public Java.Security.Cert.CertPath GetCertPath()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertPath>("getCertPath", "()Ljava/security/cert/CertPath;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertPath>("getCertPath", "()Ljava/security/cert/CertPath;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathChecker.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathChecker.cs
index f5a77cef9..33ffd4e09 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathChecker.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathChecker.cs
@@ -54,22 +54,23 @@ public partial class PKIXCertPathChecker : Java.Security.Cert.ICertPathChecker,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathChecker.html#getSupportedExtensions()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathChecker.html#isForwardCheckingSupported()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> SupportedExtensions
+        /// <returns><see cref="bool"/></returns>
+        public bool IsForwardCheckingSupported()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSupportedExtensions", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<bool>("isForwardCheckingSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathChecker.html#isForwardCheckingSupported()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathChecker.html#getSupportedExtensions()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsForwardCheckingSupported()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetSupportedExtensions()
         {
-            return IExecuteWithSignature<bool>("isForwardCheckingSupported", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getSupportedExtensions", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathChecker.html#check(java.security.cert.Certificate,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathChecker.html#check(java.security.cert.Certificate,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -79,7 +80,7 @@ public void Check(Java.Security.Cert.Certificate arg0, Java.Util.Collection<Java
             IExecute("check", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathChecker.html#init(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathChecker.html#init(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Security.Cert.CertPathValidatorException"/>
@@ -88,7 +89,7 @@ public void Init(bool arg0)
             IExecuteWithSignature("init", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathChecker.html#check(java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathChecker.html#check(java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
         /// <exception cref="Java.Security.Cert.CertPathValidatorException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathValidatorResult.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathValidatorResult.cs
index 87bde6ea5..35786f28e 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathValidatorResult.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXCertPathValidatorResult.cs
@@ -30,7 +30,7 @@ public partial class PKIXCertPathValidatorResult
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathValidatorResult.html#%3Cinit%3E(java.security.cert.TrustAnchor,java.security.cert.PolicyNode,java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathValidatorResult.html#%3Cinit%3E(java.security.cert.TrustAnchor,java.security.cert.PolicyNode,java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.TrustAnchor"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.PolicyNode"/></param>
@@ -56,25 +56,28 @@ public PKIXCertPathValidatorResult(Java.Security.Cert.TrustAnchor arg0, Java.Sec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathValidatorResult.html#getPolicyTree()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathValidatorResult.html#getPolicyTree()"/>
         /// </summary>
-        public Java.Security.Cert.PolicyNode PolicyTree
+        /// <returns><see cref="Java.Security.Cert.PolicyNode"/></returns>
+        public Java.Security.Cert.PolicyNode GetPolicyTree()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.PolicyNode>("getPolicyTree", "()Ljava/security/cert/PolicyNode;"); }
+            return IExecuteWithSignature<Java.Security.Cert.PolicyNode>("getPolicyTree", "()Ljava/security/cert/PolicyNode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathValidatorResult.html#getPublicKey()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathValidatorResult.html#getTrustAnchor()"/>
         /// </summary>
-        public Java.Security.PublicKey PublicKey
+        /// <returns><see cref="Java.Security.Cert.TrustAnchor"/></returns>
+        public Java.Security.Cert.TrustAnchor GetTrustAnchor()
         {
-            get { return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;"); }
+            return IExecuteWithSignature<Java.Security.Cert.TrustAnchor>("getTrustAnchor", "()Ljava/security/cert/TrustAnchor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXCertPathValidatorResult.html#getTrustAnchor()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXCertPathValidatorResult.html#getPublicKey()"/>
         /// </summary>
-        public Java.Security.Cert.TrustAnchor TrustAnchor
+        /// <returns><see cref="Java.Security.PublicKey"/></returns>
+        public Java.Security.PublicKey GetPublicKey()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.TrustAnchor>("getTrustAnchor", "()Ljava/security/cert/TrustAnchor;"); }
+            return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXParameters.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXParameters.cs
index fac179220..d4e61a4bc 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXParameters.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXParameters.cs
@@ -30,7 +30,7 @@ public partial class PKIXParameters
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#%3Cinit%3E(java.security.KeyStore)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#%3Cinit%3E(java.security.KeyStore)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore"/></param>
         /// <exception cref="Java.Security.KeyStoreException"/>
@@ -40,7 +40,7 @@ public PKIXParameters(Java.Security.KeyStore arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#%3Cinit%3E(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#%3Cinit%3E(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
@@ -65,95 +65,103 @@ public PKIXParameters(Java.Util.Set<Java.Security.Cert.TrustAnchor> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#getCertPathCheckers()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setCertPathCheckers(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#getPolicyQualifiersRejected()"/>
         /// </summary>
-        public Java.Util.List<Java.Security.Cert.PKIXCertPathChecker> CertPathCheckers
+        /// <returns><see cref="bool"/></returns>
+        public bool GetPolicyQualifiersRejected()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.PKIXCertPathChecker>>("getCertPathCheckers", "()Ljava/util/List;"); } set { IExecuteWithSignature("setCertPathCheckers", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<bool>("getPolicyQualifiersRejected", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#getCertStores()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setCertStores(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#isAnyPolicyInhibited()"/>
         /// </summary>
-        public Java.Util.List<Java.Security.Cert.CertStore> CertStores
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAnyPolicyInhibited()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.CertStore>>("getCertStores", "()Ljava/util/List;"); } set { IExecuteWithSignature("setCertStores", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<bool>("isAnyPolicyInhibited", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#getDate()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setDate(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#isExplicitPolicyRequired()"/>
         /// </summary>
-        public Java.Util.Date Date
+        /// <returns><see cref="bool"/></returns>
+        public bool IsExplicitPolicyRequired()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getDate", "()Ljava/util/Date;"); } set { IExecuteWithSignature("setDate", "(Ljava/util/Date;)V", value); }
+            return IExecuteWithSignature<bool>("isExplicitPolicyRequired", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#getInitialPolicies()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setInitialPolicies(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#isPolicyMappingInhibited()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> InitialPolicies
+        /// <returns><see cref="bool"/></returns>
+        public bool IsPolicyMappingInhibited()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getInitialPolicies", "()Ljava/util/Set;"); } set { IExecuteWithSignature("setInitialPolicies", "(Ljava/util/Set;)V", value); }
+            return IExecuteWithSignature<bool>("isPolicyMappingInhibited", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#getPolicyQualifiersRejected()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setPolicyQualifiersRejected(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#isRevocationEnabled()"/>
         /// </summary>
-        public bool PolicyQualifiersRejected
+        /// <returns><see cref="bool"/></returns>
+        public bool IsRevocationEnabled()
         {
-            get { return IExecuteWithSignature<bool>("getPolicyQualifiersRejected", "()Z"); } set { IExecuteWithSignature("setPolicyQualifiersRejected", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("isRevocationEnabled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#getSigProvider()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setSigProvider(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#getSigProvider()"/>
         /// </summary>
-        public Java.Lang.String SigProvider
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSigProvider()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSigProvider", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSigProvider", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSigProvider", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#getTargetCertConstraints()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setTargetCertConstraints(java.security.cert.CertSelector)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#getTargetCertConstraints()"/>
         /// </summary>
-        public Java.Security.Cert.CertSelector TargetCertConstraints
+        /// <returns><see cref="Java.Security.Cert.CertSelector"/></returns>
+        public Java.Security.Cert.CertSelector GetTargetCertConstraints()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertSelector>("getTargetCertConstraints", "()Ljava/security/cert/CertSelector;"); } set { IExecuteWithSignature("setTargetCertConstraints", "(Ljava/security/cert/CertSelector;)V", value); }
+            return IExecuteWithSignature<Java.Security.Cert.CertSelector>("getTargetCertConstraints", "()Ljava/security/cert/CertSelector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#getTrustAnchors()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setTrustAnchors(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#getDate()"/>
         /// </summary>
-        public Java.Util.Set<Java.Security.Cert.TrustAnchor> TrustAnchors
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetDate()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Security.Cert.TrustAnchor>>("getTrustAnchors", "()Ljava/util/Set;"); } set { IExecuteWithSignature("setTrustAnchors", "(Ljava/util/Set;)V", value); }
+            return IExecuteWithSignature<Java.Util.Date>("getDate", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#isAnyPolicyInhibited()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#getCertStores()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsAnyPolicyInhibited()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Security.Cert.CertStore> GetCertStores()
         {
-            return IExecuteWithSignature<bool>("isAnyPolicyInhibited", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.CertStore>>("getCertStores", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#isExplicitPolicyRequired()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#getCertPathCheckers()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsExplicitPolicyRequired()
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Security.Cert.PKIXCertPathChecker> GetCertPathCheckers()
         {
-            return IExecuteWithSignature<bool>("isExplicitPolicyRequired", "()Z");
+            return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.PKIXCertPathChecker>>("getCertPathCheckers", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#isPolicyMappingInhibited()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#getInitialPolicies()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsPolicyMappingInhibited()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetInitialPolicies()
         {
-            return IExecuteWithSignature<bool>("isPolicyMappingInhibited", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getInitialPolicies", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#isRevocationEnabled()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#getTrustAnchors()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsRevocationEnabled()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Security.Cert.TrustAnchor> GetTrustAnchors()
         {
-            return IExecuteWithSignature<bool>("isRevocationEnabled", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Security.Cert.TrustAnchor>>("getTrustAnchors", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#addCertPathChecker(java.security.cert.PKIXCertPathChecker)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#addCertPathChecker(java.security.cert.PKIXCertPathChecker)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.PKIXCertPathChecker"/></param>
         public void AddCertPathChecker(Java.Security.Cert.PKIXCertPathChecker arg0)
@@ -161,7 +169,7 @@ public void AddCertPathChecker(Java.Security.Cert.PKIXCertPathChecker arg0)
             IExecuteWithSignature("addCertPathChecker", "(Ljava/security/cert/PKIXCertPathChecker;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#addCertStore(java.security.cert.CertStore)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#addCertStore(java.security.cert.CertStore)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertStore"/></param>
         public void AddCertStore(Java.Security.Cert.CertStore arg0)
@@ -169,7 +177,7 @@ public void AddCertStore(Java.Security.Cert.CertStore arg0)
             IExecuteWithSignature("addCertStore", "(Ljava/security/cert/CertStore;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setAnyPolicyInhibited(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setAnyPolicyInhibited(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetAnyPolicyInhibited(bool arg0)
@@ -177,7 +185,31 @@ public void SetAnyPolicyInhibited(bool arg0)
             IExecuteWithSignature("setAnyPolicyInhibited", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setExplicitPolicyRequired(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setCertPathCheckers(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetCertPathCheckers(Java.Util.List<Java.Security.Cert.PKIXCertPathChecker> arg0)
+        {
+            IExecuteWithSignature("setCertPathCheckers", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setCertStores(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetCertStores(Java.Util.List<Java.Security.Cert.CertStore> arg0)
+        {
+            IExecuteWithSignature("setCertStores", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setDate(java.util.Date)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        public void SetDate(Java.Util.Date arg0)
+        {
+            IExecuteWithSignature("setDate", "(Ljava/util/Date;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setExplicitPolicyRequired(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetExplicitPolicyRequired(bool arg0)
@@ -185,7 +217,15 @@ public void SetExplicitPolicyRequired(bool arg0)
             IExecuteWithSignature("setExplicitPolicyRequired", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setPolicyMappingInhibited(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setInitialPolicies(java.util.Set)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Set"/></param>
+        public void SetInitialPolicies(Java.Util.Set<Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setInitialPolicies", "(Ljava/util/Set;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setPolicyMappingInhibited(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetPolicyMappingInhibited(bool arg0)
@@ -193,13 +233,46 @@ public void SetPolicyMappingInhibited(bool arg0)
             IExecuteWithSignature("setPolicyMappingInhibited", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXParameters.html#setRevocationEnabled(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setPolicyQualifiersRejected(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetPolicyQualifiersRejected(bool arg0)
+        {
+            IExecuteWithSignature("setPolicyQualifiersRejected", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setRevocationEnabled(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetRevocationEnabled(bool arg0)
         {
             IExecuteWithSignature("setRevocationEnabled", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setSigProvider(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSigProvider(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSigProvider", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setTargetCertConstraints(java.security.cert.CertSelector)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Cert.CertSelector"/></param>
+        public void SetTargetCertConstraints(Java.Security.Cert.CertSelector arg0)
+        {
+            IExecuteWithSignature("setTargetCertConstraints", "(Ljava/security/cert/CertSelector;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXParameters.html#setTrustAnchors(java.util.Set)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Set"/></param>
+        /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
+        public void SetTrustAnchors(Java.Util.Set<Java.Security.Cert.TrustAnchor> arg0)
+        {
+            IExecuteWithSignature("setTrustAnchors", "(Ljava/util/Set;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXReason.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXReason.cs
index c70e7c6ff..413af6d53 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXReason.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXReason.cs
@@ -38,49 +38,49 @@ public partial class PKIXReason
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#INVALID_KEY_USAGE"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#INVALID_KEY_USAGE"/>
         /// </summary>
         public static Java.Security.Cert.PKIXReason INVALID_KEY_USAGE { get { if (!_INVALID_KEY_USAGEReady) { _INVALID_KEY_USAGEContent = SGetField<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "INVALID_KEY_USAGE"); _INVALID_KEY_USAGEReady = true; } return _INVALID_KEY_USAGEContent; } }
         private static Java.Security.Cert.PKIXReason _INVALID_KEY_USAGEContent = default;
         private static bool _INVALID_KEY_USAGEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#INVALID_NAME"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#INVALID_NAME"/>
         /// </summary>
         public static Java.Security.Cert.PKIXReason INVALID_NAME { get { if (!_INVALID_NAMEReady) { _INVALID_NAMEContent = SGetField<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "INVALID_NAME"); _INVALID_NAMEReady = true; } return _INVALID_NAMEContent; } }
         private static Java.Security.Cert.PKIXReason _INVALID_NAMEContent = default;
         private static bool _INVALID_NAMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#INVALID_POLICY"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#INVALID_POLICY"/>
         /// </summary>
         public static Java.Security.Cert.PKIXReason INVALID_POLICY { get { if (!_INVALID_POLICYReady) { _INVALID_POLICYContent = SGetField<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "INVALID_POLICY"); _INVALID_POLICYReady = true; } return _INVALID_POLICYContent; } }
         private static Java.Security.Cert.PKIXReason _INVALID_POLICYContent = default;
         private static bool _INVALID_POLICYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#NAME_CHAINING"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#NAME_CHAINING"/>
         /// </summary>
         public static Java.Security.Cert.PKIXReason NAME_CHAINING { get { if (!_NAME_CHAININGReady) { _NAME_CHAININGContent = SGetField<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "NAME_CHAINING"); _NAME_CHAININGReady = true; } return _NAME_CHAININGContent; } }
         private static Java.Security.Cert.PKIXReason _NAME_CHAININGContent = default;
         private static bool _NAME_CHAININGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#NO_TRUST_ANCHOR"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#NO_TRUST_ANCHOR"/>
         /// </summary>
         public static Java.Security.Cert.PKIXReason NO_TRUST_ANCHOR { get { if (!_NO_TRUST_ANCHORReady) { _NO_TRUST_ANCHORContent = SGetField<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "NO_TRUST_ANCHOR"); _NO_TRUST_ANCHORReady = true; } return _NO_TRUST_ANCHORContent; } }
         private static Java.Security.Cert.PKIXReason _NO_TRUST_ANCHORContent = default;
         private static bool _NO_TRUST_ANCHORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#NOT_CA_CERT"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#NOT_CA_CERT"/>
         /// </summary>
         public static Java.Security.Cert.PKIXReason NOT_CA_CERT { get { if (!_NOT_CA_CERTReady) { _NOT_CA_CERTContent = SGetField<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "NOT_CA_CERT"); _NOT_CA_CERTReady = true; } return _NOT_CA_CERTContent; } }
         private static Java.Security.Cert.PKIXReason _NOT_CA_CERTContent = default;
         private static bool _NOT_CA_CERTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#PATH_TOO_LONG"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#PATH_TOO_LONG"/>
         /// </summary>
         public static Java.Security.Cert.PKIXReason PATH_TOO_LONG { get { if (!_PATH_TOO_LONGReady) { _PATH_TOO_LONGContent = SGetField<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "PATH_TOO_LONG"); _PATH_TOO_LONGReady = true; } return _PATH_TOO_LONGContent; } }
         private static Java.Security.Cert.PKIXReason _PATH_TOO_LONGContent = default;
         private static bool _PATH_TOO_LONGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#UNRECOGNIZED_CRIT_EXT"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#UNRECOGNIZED_CRIT_EXT"/>
         /// </summary>
         public static Java.Security.Cert.PKIXReason UNRECOGNIZED_CRIT_EXT { get { if (!_UNRECOGNIZED_CRIT_EXTReady) { _UNRECOGNIZED_CRIT_EXTContent = SGetField<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "UNRECOGNIZED_CRIT_EXT"); _UNRECOGNIZED_CRIT_EXTReady = true; } return _UNRECOGNIZED_CRIT_EXTContent; } }
         private static Java.Security.Cert.PKIXReason _UNRECOGNIZED_CRIT_EXTContent = default;
@@ -90,7 +90,7 @@ public partial class PKIXReason
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.PKIXReason"/></returns>
@@ -99,7 +99,7 @@ public static Java.Security.Cert.PKIXReason ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Security.Cert.PKIXReason>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/security/cert/PKIXReason;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXReason.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXReason.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.Cert.PKIXReason"/></returns>
         public static Java.Security.Cert.PKIXReason[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXRevocationChecker.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXRevocationChecker.cs
index 68b6a9fe4..ac82542f0 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PKIXRevocationChecker.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PKIXRevocationChecker.cs
@@ -46,46 +46,92 @@ public partial class PKIXRevocationChecker
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#getOcspExtensions()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#setOcspExtensions(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#getSoftFailExceptions()"/>
         /// </summary>
-        public Java.Util.List<Java.Security.Cert.Extension> OcspExtensions
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Security.Cert.CertPathValidatorException> GetSoftFailExceptions()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.Extension>>("getOcspExtensions", "()Ljava/util/List;"); } set { IExecuteWithSignature("setOcspExtensions", "(Ljava/util/List;)V", value); }
+            return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.CertPathValidatorException>>("getSoftFailExceptions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#getOcspResponder()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#setOcspResponder(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#getOcspResponder()"/>
         /// </summary>
-        public Java.Net.URI OcspResponder
+        /// <returns><see cref="Java.Net.URI"/></returns>
+        public Java.Net.URI GetOcspResponder()
         {
-            get { return IExecuteWithSignature<Java.Net.URI>("getOcspResponder", "()Ljava/net/URI;"); } set { IExecuteWithSignature("setOcspResponder", "(Ljava/net/URI;)V", value); }
+            return IExecuteWithSignature<Java.Net.URI>("getOcspResponder", "()Ljava/net/URI;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#getOcspResponderCert()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#setOcspResponderCert(java.security.cert.X509Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#getOcspResponderCert()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate OcspResponderCert
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetOcspResponderCert()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getOcspResponderCert", "()Ljava/security/cert/X509Certificate;"); } set { IExecuteWithSignature("setOcspResponderCert", "(Ljava/security/cert/X509Certificate;)V", value); }
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getOcspResponderCert", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#getOcspResponses()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#setOcspResponses(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#getOcspExtensions()"/>
         /// </summary>
-        public Java.Util.Map<Java.Security.Cert.X509Certificate, byte[]> OcspResponses
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Security.Cert.Extension> GetOcspExtensions()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Security.Cert.X509Certificate, byte[]>>("getOcspResponses", "()Ljava/util/Map;"); } set { IExecuteWithSignature("setOcspResponses", "(Ljava/util/Map;)V", value); }
+            return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.Extension>>("getOcspExtensions", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#getOptions()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#setOptions(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#getOcspResponses()"/>
         /// </summary>
-        public Java.Util.Set<Java.Security.Cert.PKIXRevocationChecker.Option> Options
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Security.Cert.X509Certificate, byte[]> GetOcspResponses()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Security.Cert.PKIXRevocationChecker.Option>>("getOptions", "()Ljava/util/Set;"); } set { IExecuteWithSignature("setOptions", "(Ljava/util/Set;)V", value); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Security.Cert.X509Certificate, byte[]>>("getOcspResponses", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.html#getSoftFailExceptions()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#getOptions()"/>
         /// </summary>
-        public Java.Util.List<Java.Security.Cert.CertPathValidatorException> SoftFailExceptions
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Security.Cert.PKIXRevocationChecker.Option> GetOptions()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Security.Cert.CertPathValidatorException>>("getSoftFailExceptions", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Security.Cert.PKIXRevocationChecker.Option>>("getOptions", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#setOcspExtensions(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetOcspExtensions(Java.Util.List<Java.Security.Cert.Extension> arg0)
+        {
+            IExecuteWithSignature("setOcspExtensions", "(Ljava/util/List;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#setOcspResponder(java.net.URI)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Net.URI"/></param>
+        public void SetOcspResponder(Java.Net.URI arg0)
+        {
+            IExecuteWithSignature("setOcspResponder", "(Ljava/net/URI;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#setOcspResponderCert(java.security.cert.X509Certificate)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
+        public void SetOcspResponderCert(Java.Security.Cert.X509Certificate arg0)
+        {
+            IExecuteWithSignature("setOcspResponderCert", "(Ljava/security/cert/X509Certificate;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#setOcspResponses(java.util.Map)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Map"/></param>
+        public void SetOcspResponses(Java.Util.Map<Java.Security.Cert.X509Certificate, byte[]> arg0)
+        {
+            IExecuteWithSignature("setOcspResponses", "(Ljava/util/Map;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.html#setOptions(java.util.Set)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Set"/></param>
+        public void SetOptions(Java.Util.Set<Java.Security.Cert.PKIXRevocationChecker.Option> arg0)
+        {
+            IExecuteWithSignature("setOptions", "(Ljava/util/Set;)V", arg0);
         }
 
         #endregion
@@ -104,25 +150,25 @@ public partial class Option
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.Option.html#NO_FALLBACK"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.Option.html#NO_FALLBACK"/>
             /// </summary>
             public static Java.Security.Cert.PKIXRevocationChecker.Option NO_FALLBACK { get { if (!_NO_FALLBACKReady) { _NO_FALLBACKContent = SGetField<Java.Security.Cert.PKIXRevocationChecker.Option>(LocalBridgeClazz, "NO_FALLBACK"); _NO_FALLBACKReady = true; } return _NO_FALLBACKContent; } }
             private static Java.Security.Cert.PKIXRevocationChecker.Option _NO_FALLBACKContent = default;
             private static bool _NO_FALLBACKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.Option.html#ONLY_END_ENTITY"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.Option.html#ONLY_END_ENTITY"/>
             /// </summary>
             public static Java.Security.Cert.PKIXRevocationChecker.Option ONLY_END_ENTITY { get { if (!_ONLY_END_ENTITYReady) { _ONLY_END_ENTITYContent = SGetField<Java.Security.Cert.PKIXRevocationChecker.Option>(LocalBridgeClazz, "ONLY_END_ENTITY"); _ONLY_END_ENTITYReady = true; } return _ONLY_END_ENTITYContent; } }
             private static Java.Security.Cert.PKIXRevocationChecker.Option _ONLY_END_ENTITYContent = default;
             private static bool _ONLY_END_ENTITYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.Option.html#PREFER_CRLS"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.Option.html#PREFER_CRLS"/>
             /// </summary>
             public static Java.Security.Cert.PKIXRevocationChecker.Option PREFER_CRLS { get { if (!_PREFER_CRLSReady) { _PREFER_CRLSContent = SGetField<Java.Security.Cert.PKIXRevocationChecker.Option>(LocalBridgeClazz, "PREFER_CRLS"); _PREFER_CRLSReady = true; } return _PREFER_CRLSContent; } }
             private static Java.Security.Cert.PKIXRevocationChecker.Option _PREFER_CRLSContent = default;
             private static bool _PREFER_CRLSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.Option.html#SOFT_FAIL"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.Option.html#SOFT_FAIL"/>
             /// </summary>
             public static Java.Security.Cert.PKIXRevocationChecker.Option SOFT_FAIL { get { if (!_SOFT_FAILReady) { _SOFT_FAILContent = SGetField<Java.Security.Cert.PKIXRevocationChecker.Option>(LocalBridgeClazz, "SOFT_FAIL"); _SOFT_FAILReady = true; } return _SOFT_FAILContent; } }
             private static Java.Security.Cert.PKIXRevocationChecker.Option _SOFT_FAILContent = default;
@@ -132,7 +178,7 @@ public partial class Option
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.Option.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.Option.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Security.Cert.PKIXRevocationChecker.Option"/></returns>
@@ -141,7 +187,7 @@ public static Java.Security.Cert.PKIXRevocationChecker.Option ValueOf(Java.Lang.
                 return SExecuteWithSignature<Java.Security.Cert.PKIXRevocationChecker.Option>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/security/cert/PKIXRevocationChecker$Option;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PKIXRevocationChecker.Option.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/security/cert/PKIXRevocationChecker.Option.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Security.Cert.PKIXRevocationChecker.Option"/></returns>
             public static Java.Security.Cert.PKIXRevocationChecker.Option[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PolicyNode.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PolicyNode.cs
index c96a7dfc7..6464516a4 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PolicyNode.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PolicyNode.cs
@@ -64,54 +64,62 @@ public partial class PolicyNode : Java.Security.Cert.IPolicyNode
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyNode.html#getChildren()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyNode.html#isCritical()"/>
         /// </summary>
-        public Java.Util.Iterator Children
+        /// <returns><see cref="bool"/></returns>
+        public bool IsCritical()
         {
-            get { return IExecuteWithSignature<Java.Util.Iterator>("getChildren", "()Ljava/util/Iterator;"); }
+            return IExecuteWithSignature<bool>("isCritical", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyNode.html#getDepth()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyNode.html#getDepth()"/>
         /// </summary>
-        public int Depth
+        /// <returns><see cref="int"/></returns>
+        public int GetDepth()
         {
-            get { return IExecuteWithSignature<int>("getDepth", "()I"); }
+            return IExecuteWithSignature<int>("getDepth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyNode.html#getExpectedPolicies()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyNode.html#getValidPolicy()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> ExpectedPolicies
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetValidPolicy()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getExpectedPolicies", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getValidPolicy", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyNode.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyNode.html#getParent()"/>
         /// </summary>
-        public Java.Security.Cert.PolicyNode Parent
+        /// <returns><see cref="Java.Security.Cert.PolicyNode"/></returns>
+        public Java.Security.Cert.PolicyNode GetParent()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.PolicyNode>("getParent", "()Ljava/security/cert/PolicyNode;"); }
+            return IExecuteWithSignature<Java.Security.Cert.PolicyNode>("getParent", "()Ljava/security/cert/PolicyNode;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyNode.html#getPolicyQualifiers()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyNode.html#getChildren()"/>
         /// </summary>
-        public Java.Util.Set PolicyQualifiers
+        /// <typeparam name="ReturnExtendsJava_Security_Cert_PolicyNode"><see cref="Java.Security.Cert.PolicyNode"/></typeparam>
+        /// <returns><see cref="Java.Util.Iterator"/></returns>
+        public Java.Util.Iterator<ReturnExtendsJava_Security_Cert_PolicyNode> GetChildren<ReturnExtendsJava_Security_Cert_PolicyNode>() where ReturnExtendsJava_Security_Cert_PolicyNode : Java.Security.Cert.PolicyNode
         {
-            get { return IExecuteWithSignature<Java.Util.Set>("getPolicyQualifiers", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Util.Iterator<ReturnExtendsJava_Security_Cert_PolicyNode>>("getChildren", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyNode.html#getValidPolicy()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyNode.html#getPolicyQualifiers()"/>
         /// </summary>
-        public Java.Lang.String ValidPolicy
+        /// <typeparam name="ReturnExtendsJava_Security_Cert_PolicyQualifierInfo"><see cref="Java.Security.Cert.PolicyQualifierInfo"/></typeparam>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<ReturnExtendsJava_Security_Cert_PolicyQualifierInfo> GetPolicyQualifiers<ReturnExtendsJava_Security_Cert_PolicyQualifierInfo>() where ReturnExtendsJava_Security_Cert_PolicyQualifierInfo : Java.Security.Cert.PolicyQualifierInfo
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValidPolicy", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Set<ReturnExtendsJava_Security_Cert_PolicyQualifierInfo>>("getPolicyQualifiers", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyNode.html#isCritical()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyNode.html#getExpectedPolicies()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsCritical()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetExpectedPolicies()
         {
-            return IExecuteWithSignature<bool>("isCritical", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getExpectedPolicies", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/PolicyQualifierInfo.cs b/src/net/Netdroid/Generated/Java/Security/Cert/PolicyQualifierInfo.cs
index 646816b4c..4fc99471b 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/PolicyQualifierInfo.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/PolicyQualifierInfo.cs
@@ -30,7 +30,7 @@ public partial class PolicyQualifierInfo
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyQualifierInfo.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyQualifierInfo.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -55,25 +55,28 @@ public PolicyQualifierInfo(byte[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyQualifierInfo.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyQualifierInfo.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyQualifierInfo.html#getPolicyQualifier()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyQualifierInfo.html#getPolicyQualifier()"/>
         /// </summary>
-        public byte[] PolicyQualifier
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetPolicyQualifier()
         {
-            get { return IExecuteWithSignatureArray<byte>("getPolicyQualifier", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getPolicyQualifier", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/PolicyQualifierInfo.html#getPolicyQualifierId()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/PolicyQualifierInfo.html#getPolicyQualifierId()"/>
         /// </summary>
-        public Java.Lang.String PolicyQualifierId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPolicyQualifierId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPolicyQualifierId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPolicyQualifierId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/TrustAnchor.cs b/src/net/Netdroid/Generated/Java/Security/Cert/TrustAnchor.cs
index ab132e8d5..a5761d2b0 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/TrustAnchor.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/TrustAnchor.cs
@@ -30,7 +30,7 @@ public partial class TrustAnchor
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html#%3Cinit%3E(java.lang.String,java.security.PublicKey,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html#%3Cinit%3E(java.lang.String,java.security.PublicKey,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.PublicKey"/></param>
@@ -40,7 +40,7 @@ public TrustAnchor(Java.Lang.String arg0, Java.Security.PublicKey arg1, byte[] a
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html#%3Cinit%3E(java.security.cert.X509Certificate,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html#%3Cinit%3E(java.security.cert.X509Certificate,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -49,7 +49,7 @@ public TrustAnchor(Java.Security.Cert.X509Certificate arg0, byte[] arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html#%3Cinit%3E(javax.security.auth.x500.X500Principal,java.security.PublicKey,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html#%3Cinit%3E(javax.security.auth.x500.X500Principal,java.security.PublicKey,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.X500.X500Principal"/></param>
         /// <param name="arg1"><see cref="Java.Security.PublicKey"/></param>
@@ -75,39 +75,44 @@ public TrustAnchor(Javax.Security.Auth.X500.X500Principal arg0, Java.Security.Pu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html#getCA()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html#getNameConstraints()"/>
         /// </summary>
-        public Javax.Security.Auth.X500.X500Principal CA
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetNameConstraints()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getCA", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignatureArray<byte>("getNameConstraints", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html#getCAName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html#getCAName()"/>
         /// </summary>
-        public Java.Lang.String CAName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCAName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCAName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCAName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html#getCAPublicKey()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html#getTrustedCert()"/>
         /// </summary>
-        public Java.Security.PublicKey CAPublicKey
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetTrustedCert()
         {
-            get { return IExecuteWithSignature<Java.Security.PublicKey>("getCAPublicKey", "()Ljava/security/PublicKey;"); }
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getTrustedCert", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html#getNameConstraints()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html#getCAPublicKey()"/>
         /// </summary>
-        public byte[] NameConstraints
+        /// <returns><see cref="Java.Security.PublicKey"/></returns>
+        public Java.Security.PublicKey GetCAPublicKey()
         {
-            get { return IExecuteWithSignatureArray<byte>("getNameConstraints", "()[B"); }
+            return IExecuteWithSignature<Java.Security.PublicKey>("getCAPublicKey", "()Ljava/security/PublicKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/TrustAnchor.html#getTrustedCert()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/TrustAnchor.html#getCA()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate TrustedCert
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        public Javax.Security.Auth.X500.X500Principal GetCA()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getTrustedCert", "()Ljava/security/cert/X509Certificate;"); }
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getCA", "()Ljavax/security/auth/x500/X500Principal;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/URICertStoreParameters.cs b/src/net/Netdroid/Generated/Java/Security/Cert/URICertStoreParameters.cs
index 7968ad527..e5c504e5b 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/URICertStoreParameters.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/URICertStoreParameters.cs
@@ -30,7 +30,7 @@ public partial class URICertStoreParameters
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/URICertStoreParameters.html#%3Cinit%3E(java.net.URI)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/URICertStoreParameters.html#%3Cinit%3E(java.net.URI)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         public URICertStoreParameters(Java.Net.URI arg0)
@@ -54,11 +54,12 @@ public URICertStoreParameters(Java.Net.URI arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/URICertStoreParameters.html#getURI()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/URICertStoreParameters.html#getURI()"/>
         /// </summary>
-        public Java.Net.URI URI
+        /// <returns><see cref="Java.Net.URI"/></returns>
+        public Java.Net.URI GetURI()
         {
-            get { return IExecuteWithSignature<Java.Net.URI>("getURI", "()Ljava/net/URI;"); }
+            return IExecuteWithSignature<Java.Net.URI>("getURI", "()Ljava/net/URI;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/X509CRL.cs b/src/net/Netdroid/Generated/Java/Security/Cert/X509CRL.cs
index d4cc8803c..0894f09f2 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/X509CRL.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/X509CRL.cs
@@ -50,101 +50,107 @@ public partial class X509CRL
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
-        {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getIssuerDN()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public Java.Security.Principal IssuerDN
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Security.Cert.CRLException"/>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getIssuerDN", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getIssuerX500Principal()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getSigAlgParams()"/>
         /// </summary>
-        public Javax.Security.Auth.X500.X500Principal IssuerX500Principal
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSigAlgParams()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getIssuerX500Principal", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignatureArray<byte>("getSigAlgParams", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getNextUpdate()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getSignature()"/>
         /// </summary>
-        public Java.Util.Date NextUpdate
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSignature()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getNextUpdate", "()Ljava/util/Date;"); }
+            return IExecuteWithSignatureArray<byte>("getSignature", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getRevokedCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getTBSCertList()"/>
         /// </summary>
-        public Java.Util.Set RevokedCertificates
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Security.Cert.CRLException"/>
+        public byte[] GetTBSCertList()
         {
-            get { return IExecuteWithSignature<Java.Util.Set>("getRevokedCertificates", "()Ljava/util/Set;"); }
+            return IExecuteWithSignatureArray<byte>("getTBSCertList", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getSigAlgName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getVersion()"/>
         /// </summary>
-        public Java.Lang.String SigAlgName
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSigAlgName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getSigAlgOID()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getSigAlgName()"/>
         /// </summary>
-        public Java.Lang.String SigAlgOID
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSigAlgName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSigAlgOID", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSigAlgName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getSigAlgParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getSigAlgOID()"/>
         /// </summary>
-        public byte[] SigAlgParams
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSigAlgOID()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSigAlgParams", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSigAlgOID", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getSignature()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getRevokedCertificate(java.math.BigInteger)"/>
         /// </summary>
-        public byte[] Signature
+        /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
+        /// <returns><see cref="Java.Security.Cert.X509CRLEntry"/></returns>
+        public Java.Security.Cert.X509CRLEntry GetRevokedCertificate(Java.Math.BigInteger arg0)
         {
-            get { return IExecuteWithSignatureArray<byte>("getSignature", "()[B"); }
+            return IExecuteWithSignature<Java.Security.Cert.X509CRLEntry>("getRevokedCertificate", "(Ljava/math/BigInteger;)Ljava/security/cert/X509CRLEntry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getTBSCertList()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getIssuerDN()"/>
         /// </summary>
-        public byte[] TBSCertList
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetIssuerDN()
         {
-            get { return IExecuteWithSignatureArray<byte>("getTBSCertList", "()[B"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getIssuerDN", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getThisUpdate()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getNextUpdate()"/>
         /// </summary>
-        public Java.Util.Date ThisUpdate
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetNextUpdate()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getThisUpdate", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getNextUpdate", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getThisUpdate()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetThisUpdate()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<Java.Util.Date>("getThisUpdate", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getRevokedCertificate(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getRevokedCertificates()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
-        /// <returns><see cref="Java.Security.Cert.X509CRLEntry"/></returns>
-        public Java.Security.Cert.X509CRLEntry GetRevokedCertificate(Java.Math.BigInteger arg0)
+        /// <typeparam name="ReturnExtendsJava_Security_Cert_X509CRLEntry"><see cref="Java.Security.Cert.X509CRLEntry"/></typeparam>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<ReturnExtendsJava_Security_Cert_X509CRLEntry> GetRevokedCertificates<ReturnExtendsJava_Security_Cert_X509CRLEntry>() where ReturnExtendsJava_Security_Cert_X509CRLEntry : Java.Security.Cert.X509CRLEntry
         {
-            return IExecuteWithSignature<Java.Security.Cert.X509CRLEntry>("getRevokedCertificate", "(Ljava/math/BigInteger;)Ljava/security/cert/X509CRLEntry;", arg0);
+            return IExecuteWithSignature<Java.Util.Set<ReturnExtendsJava_Security_Cert_X509CRLEntry>>("getRevokedCertificates", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#verify(java.security.PublicKey,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#verify(java.security.PublicKey,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -158,7 +164,7 @@ public void Verify(Java.Security.PublicKey arg0, Java.Lang.String arg1)
             IExecute("verify", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#verify(java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#verify(java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <exception cref="Java.Security.Cert.CRLException"/>
@@ -171,7 +177,7 @@ public void Verify(Java.Security.PublicKey arg0)
             IExecuteWithSignature("verify", "(Ljava/security/PublicKey;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#getRevokedCertificate(java.security.cert.X509Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getRevokedCertificate(java.security.cert.X509Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <returns><see cref="Java.Security.Cert.X509CRLEntry"/></returns>
@@ -180,7 +186,15 @@ public Java.Security.Cert.X509CRLEntry GetRevokedCertificate(Java.Security.Cert.
             return IExecuteWithSignature<Java.Security.Cert.X509CRLEntry>("getRevokedCertificate", "(Ljava/security/cert/X509Certificate;)Ljava/security/cert/X509CRLEntry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRL.html#verify(java.security.PublicKey,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#getIssuerX500Principal()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        public Javax.Security.Auth.X500.X500Principal GetIssuerX500Principal()
+        {
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getIssuerX500Principal", "()Ljavax/security/auth/x500/X500Principal;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRL.html#verify(java.security.PublicKey,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/X509CRLEntry.cs b/src/net/Netdroid/Generated/Java/Security/Cert/X509CRLEntry.cs
index 28addfd9d..79a863aff 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/X509CRLEntry.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/X509CRLEntry.cs
@@ -46,47 +46,53 @@ public partial class X509CRLEntry
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLEntry.html#getCertificateIssuer()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLEntry.html#hasExtensions()"/>
         /// </summary>
-        public Javax.Security.Auth.X500.X500Principal CertificateIssuer
+        /// <returns><see cref="bool"/></returns>
+        public bool HasExtensions()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getCertificateIssuer", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignature<bool>("hasExtensions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLEntry.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLEntry.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Security.Cert.CRLException"/>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLEntry.html#getRevocationDate()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLEntry.html#getSerialNumber()"/>
         /// </summary>
-        public Java.Util.Date RevocationDate
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetSerialNumber()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getRevocationDate", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLEntry.html#getRevocationReason()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLEntry.html#getRevocationDate()"/>
         /// </summary>
-        public Java.Security.Cert.CRLReason RevocationReason
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetRevocationDate()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CRLReason>("getRevocationReason", "()Ljava/security/cert/CRLReason;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getRevocationDate", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLEntry.html#getSerialNumber()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLEntry.html#getRevocationReason()"/>
         /// </summary>
-        public Java.Math.BigInteger SerialNumber
+        /// <returns><see cref="Java.Security.Cert.CRLReason"/></returns>
+        public Java.Security.Cert.CRLReason GetRevocationReason()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CRLReason>("getRevocationReason", "()Ljava/security/cert/CRLReason;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLEntry.html#hasExtensions()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLEntry.html#getCertificateIssuer()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasExtensions()
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        public Javax.Security.Auth.X500.X500Principal GetCertificateIssuer()
         {
-            return IExecuteWithSignature<bool>("hasExtensions", "()Z");
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getCertificateIssuer", "()Ljavax/security/auth/x500/X500Principal;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/X509CRLSelector.cs b/src/net/Netdroid/Generated/Java/Security/Cert/X509CRLSelector.cs
index 4e1cb6b05..c538a49cd 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/X509CRLSelector.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/X509CRLSelector.cs
@@ -46,58 +46,64 @@ public partial class X509CRLSelector
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#getCertificateChecking()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#setCertificateChecking(java.security.cert.X509Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#match(java.security.cert.CRL)"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate CertificateChecking
+        /// <param name="arg0"><see cref="Java.Security.Cert.CRL"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Match(Java.Security.Cert.CRL arg0)
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getCertificateChecking", "()Ljava/security/cert/X509Certificate;"); } set { IExecuteWithSignature("setCertificateChecking", "(Ljava/security/cert/X509Certificate;)V", value); }
+            return IExecuteWithSignature<bool>("match", "(Ljava/security/cert/CRL;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#getDateAndTime()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#setDateAndTime(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#getMaxCRL()"/>
         /// </summary>
-        public Java.Util.Date DateAndTime
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetMaxCRL()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getDateAndTime", "()Ljava/util/Date;"); } set { IExecuteWithSignature("setDateAndTime", "(Ljava/util/Date;)V", value); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getMaxCRL", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#getIssuerNames()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#setIssuerNames(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#getMinCRL()"/>
         /// </summary>
-        public Java.Util.Collection<object> IssuerNames
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetMinCRL()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<object>>("getIssuerNames", "()Ljava/util/Collection;"); } set { IExecuteWithSignature("setIssuerNames", "(Ljava/util/Collection;)V", value); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getMinCRL", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#getIssuers()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#setIssuers(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#getCertificateChecking()"/>
         /// </summary>
-        public Java.Util.Collection<Javax.Security.Auth.X500.X500Principal> Issuers
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetCertificateChecking()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Javax.Security.Auth.X500.X500Principal>>("getIssuers", "()Ljava/util/Collection;"); } set { IExecuteWithSignature("setIssuers", "(Ljava/util/Collection;)V", value); }
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getCertificateChecking", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#getMaxCRL()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#getIssuerNames()"/>
         /// </summary>
-        public Java.Math.BigInteger MaxCRL
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<object> GetIssuerNames()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getMaxCRL", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Util.Collection<object>>("getIssuerNames", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#getMinCRL()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#getIssuers()"/>
         /// </summary>
-        public Java.Math.BigInteger MinCRL
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Javax.Security.Auth.X500.X500Principal> GetIssuers()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getMinCRL", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Util.Collection<Javax.Security.Auth.X500.X500Principal>>("getIssuers", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#match(java.security.cert.CRL)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#getDateAndTime()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.Cert.CRL"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Match(Java.Security.Cert.CRL arg0)
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetDateAndTime()
         {
-            return IExecuteWithSignature<bool>("match", "(Ljava/security/cert/CRL;)Z", arg0);
+            return IExecuteWithSignature<Java.Util.Date>("getDateAndTime", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#addIssuer(javax.security.auth.x500.X500Principal)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#addIssuer(javax.security.auth.x500.X500Principal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.X500.X500Principal"/></param>
         public void AddIssuer(Javax.Security.Auth.X500.X500Principal arg0)
@@ -105,7 +111,7 @@ public void AddIssuer(Javax.Security.Auth.X500.X500Principal arg0)
             IExecuteWithSignature("addIssuer", "(Ljavax/security/auth/x500/X500Principal;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#addIssuerName(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#addIssuerName(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -114,17 +120,49 @@ public void AddIssuerName(byte[] arg0)
             IExecuteWithSignature("addIssuerName", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#addIssuerName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#addIssuerName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
         public void AddIssuerName(Java.Lang.String arg0)
         {
             IExecuteWithSignature("addIssuerName", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#setMaxCRLNumber(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#setCertificateChecking(java.security.cert.X509Certificate)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
+        public void SetCertificateChecking(Java.Security.Cert.X509Certificate arg0)
+        {
+            IExecuteWithSignature("setCertificateChecking", "(Ljava/security/cert/X509Certificate;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#setDateAndTime(java.util.Date)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        public void SetDateAndTime(Java.Util.Date arg0)
+        {
+            IExecuteWithSignature("setDateAndTime", "(Ljava/util/Date;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#setIssuerNames(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetIssuerNames(Java.Util.Collection<object> arg0)
+        {
+            IExecuteWithSignature("setIssuerNames", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#setIssuers(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        public void SetIssuers(Java.Util.Collection<Javax.Security.Auth.X500.X500Principal> arg0)
+        {
+            IExecuteWithSignature("setIssuers", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#setMaxCRLNumber(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         public void SetMaxCRLNumber(Java.Math.BigInteger arg0)
@@ -132,7 +170,7 @@ public void SetMaxCRLNumber(Java.Math.BigInteger arg0)
             IExecuteWithSignature("setMaxCRLNumber", "(Ljava/math/BigInteger;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CRLSelector.html#setMinCRLNumber(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CRLSelector.html#setMinCRLNumber(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         public void SetMinCRLNumber(Java.Math.BigInteger arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/X509CertSelector.cs b/src/net/Netdroid/Generated/Java/Security/Cert/X509CertSelector.cs
index 904214946..95404acd7 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/X509CertSelector.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/X509CertSelector.cs
@@ -46,172 +46,194 @@ public partial class X509CertSelector
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getAuthorityKeyIdentifier()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setAuthorityKeyIdentifier(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getMatchAllSubjectAltNames()"/>
         /// </summary>
-        public byte[] AuthorityKeyIdentifier
+        /// <returns><see cref="bool"/></returns>
+        public bool GetMatchAllSubjectAltNames()
         {
-            get { return IExecuteWithSignatureArray<byte>("getAuthorityKeyIdentifier", "()[B"); } set { IExecuteWithSignature("setAuthorityKeyIdentifier", "([B)V", value); }
+            return IExecuteWithSignature<bool>("getMatchAllSubjectAltNames", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getBasicConstraints()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setBasicConstraints(int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#match(java.security.cert.Certificate)"/>
         /// </summary>
-        public int BasicConstraints
+        /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Match(Java.Security.Cert.Certificate arg0)
         {
-            get { return IExecuteWithSignature<int>("getBasicConstraints", "()I"); } set { IExecuteWithSignature("setBasicConstraints", "(I)V", value); }
+            return IExecuteWithSignature<bool>("match", "(Ljava/security/cert/Certificate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getCertificate()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setCertificate(java.security.cert.X509Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getKeyUsage()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate Certificate
+        /// <returns><see cref="bool"/></returns>
+        public bool[] GetKeyUsage()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getCertificate", "()Ljava/security/cert/X509Certificate;"); } set { IExecuteWithSignature("setCertificate", "(Ljava/security/cert/X509Certificate;)V", value); }
+            return IExecuteWithSignatureArray<bool>("getKeyUsage", "()[Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getCertificateValid()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setCertificateValid(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getAuthorityKeyIdentifier()"/>
         /// </summary>
-        public Java.Util.Date CertificateValid
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetAuthorityKeyIdentifier()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getCertificateValid", "()Ljava/util/Date;"); } set { IExecuteWithSignature("setCertificateValid", "(Ljava/util/Date;)V", value); }
+            return IExecuteWithSignatureArray<byte>("getAuthorityKeyIdentifier", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getExtendedKeyUsage()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setExtendedKeyUsage(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getIssuerAsBytes()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> ExtendedKeyUsage
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public byte[] GetIssuerAsBytes()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getExtendedKeyUsage", "()Ljava/util/Set;"); } set { IExecuteWithSignature("setExtendedKeyUsage", "(Ljava/util/Set;)V", value); }
+            return IExecuteWithSignatureArray<byte>("getIssuerAsBytes", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getIssuer()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getNameConstraints()"/>
         /// </summary>
-        public Javax.Security.Auth.X500.X500Principal Issuer
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetNameConstraints()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getIssuer", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignatureArray<byte>("getNameConstraints", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getIssuerAsBytes()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getSubjectAsBytes()"/>
         /// </summary>
-        public byte[] IssuerAsBytes
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public byte[] GetSubjectAsBytes()
         {
-            get { return IExecuteWithSignatureArray<byte>("getIssuerAsBytes", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getSubjectAsBytes", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getIssuerAsString()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getSubjectKeyIdentifier()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String IssuerAsString
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSubjectKeyIdentifier()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIssuerAsString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getSubjectKeyIdentifier", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getKeyUsage()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setKeyUsage(boolean[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getBasicConstraints()"/>
         /// </summary>
-        public bool[] KeyUsage
+        /// <returns><see cref="int"/></returns>
+        public int GetBasicConstraints()
         {
-            get { return IExecuteWithSignatureArray<bool>("getKeyUsage", "()[Z"); } set { IExecuteWithSignature("setKeyUsage", "([Z)V", value); }
+            return IExecuteWithSignature<int>("getBasicConstraints", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getMatchAllSubjectAltNames()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setMatchAllSubjectAltNames(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getIssuerAsString()"/>
         /// </summary>
-        public bool MatchAllSubjectAltNames
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetIssuerAsString()
         {
-            get { return IExecuteWithSignature<bool>("getMatchAllSubjectAltNames", "()Z"); } set { IExecuteWithSignature("setMatchAllSubjectAltNames", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getIssuerAsString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getNameConstraints()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setNameConstraints(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getSubjectAsString()"/>
         /// </summary>
-        public byte[] NameConstraints
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubjectAsString()
         {
-            get { return IExecuteWithSignatureArray<byte>("getNameConstraints", "()[B"); } set { IExecuteWithSignature("setNameConstraints", "([B)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSubjectAsString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getPathToNames()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setPathToNames(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getSubjectPublicKeyAlgID()"/>
         /// </summary>
-        public Java.Util.Collection<Java.Util.List<object>> PathToNames
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSubjectPublicKeyAlgID()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Util.List<object>>>("getPathToNames", "()Ljava/util/Collection;"); } set { IExecuteWithSignature("setPathToNames", "(Ljava/util/Collection;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSubjectPublicKeyAlgID", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getPolicy()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setPolicy(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getSerialNumber()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> Policy
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetSerialNumber()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPolicy", "()Ljava/util/Set;"); } set { IExecuteWithSignature("setPolicy", "(Ljava/util/Set;)V", value); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getPrivateKeyValid()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setPrivateKeyValid(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getCertificate()"/>
         /// </summary>
-        public Java.Util.Date PrivateKeyValid
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate GetCertificate()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getPrivateKeyValid", "()Ljava/util/Date;"); } set { IExecuteWithSignature("setPrivateKeyValid", "(Ljava/util/Date;)V", value); }
+            return IExecuteWithSignature<Java.Security.Cert.X509Certificate>("getCertificate", "()Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getSerialNumber()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSerialNumber(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getSubjectPublicKey()"/>
         /// </summary>
-        public Java.Math.BigInteger SerialNumber
+        /// <returns><see cref="Java.Security.PublicKey"/></returns>
+        public Java.Security.PublicKey GetSubjectPublicKey()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;"); } set { IExecuteWithSignature("setSerialNumber", "(Ljava/math/BigInteger;)V", value); }
+            return IExecuteWithSignature<Java.Security.PublicKey>("getSubjectPublicKey", "()Ljava/security/PublicKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getSubject()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getPathToNames()"/>
         /// </summary>
-        public Javax.Security.Auth.X500.X500Principal Subject
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Util.List<object>> GetPathToNames()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getSubject", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignature<Java.Util.Collection<Java.Util.List<object>>>("getPathToNames", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getSubjectAlternativeNames()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSubjectAlternativeNames(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getSubjectAlternativeNames()"/>
         /// </summary>
-        public Java.Util.Collection<Java.Util.List<object>> SubjectAlternativeNames
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Util.List<object>> GetSubjectAlternativeNames()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Util.List<object>>>("getSubjectAlternativeNames", "()Ljava/util/Collection;"); } set { IExecuteWithSignature("setSubjectAlternativeNames", "(Ljava/util/Collection;)V", value); }
+            return IExecuteWithSignature<Java.Util.Collection<Java.Util.List<object>>>("getSubjectAlternativeNames", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getSubjectAsBytes()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getCertificateValid()"/>
         /// </summary>
-        public byte[] SubjectAsBytes
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetCertificateValid()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSubjectAsBytes", "()[B"); }
+            return IExecuteWithSignature<Java.Util.Date>("getCertificateValid", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getSubjectAsString()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getPrivateKeyValid()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Lang.String SubjectAsString
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetPrivateKeyValid()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubjectAsString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getPrivateKeyValid", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getSubjectKeyIdentifier()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSubjectKeyIdentifier(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getExtendedKeyUsage()"/>
         /// </summary>
-        public byte[] SubjectKeyIdentifier
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetExtendedKeyUsage()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSubjectKeyIdentifier", "()[B"); } set { IExecuteWithSignature("setSubjectKeyIdentifier", "([B)V", value); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getExtendedKeyUsage", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getSubjectPublicKey()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getPolicy()"/>
         /// </summary>
-        public Java.Security.PublicKey SubjectPublicKey
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetPolicy()
         {
-            get { return IExecuteWithSignature<Java.Security.PublicKey>("getSubjectPublicKey", "()Ljava/security/PublicKey;"); }
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getPolicy", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#getSubjectPublicKeyAlgID()"/> <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSubjectPublicKeyAlgID(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getIssuer()"/>
         /// </summary>
-        public Java.Lang.String SubjectPublicKeyAlgID
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        public Javax.Security.Auth.X500.X500Principal GetIssuer()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSubjectPublicKeyAlgID", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSubjectPublicKeyAlgID", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getIssuer", "()Ljavax/security/auth/x500/X500Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#match(java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#getSubject()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Match(Java.Security.Cert.Certificate arg0)
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        public Javax.Security.Auth.X500.X500Principal GetSubject()
         {
-            return IExecuteWithSignature<bool>("match", "(Ljava/security/cert/Certificate;)Z", arg0);
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getSubject", "()Ljavax/security/auth/x500/X500Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#addPathToName(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#addPathToName(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -221,7 +243,7 @@ public void AddPathToName(int arg0, byte[] arg1)
             IExecute("addPathToName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#addPathToName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#addPathToName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -231,7 +253,7 @@ public void AddPathToName(int arg0, Java.Lang.String arg1)
             IExecute("addPathToName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#addSubjectAlternativeName(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#addSubjectAlternativeName(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -241,7 +263,7 @@ public void AddSubjectAlternativeName(int arg0, byte[] arg1)
             IExecute("addSubjectAlternativeName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#addSubjectAlternativeName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#addSubjectAlternativeName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -251,7 +273,48 @@ public void AddSubjectAlternativeName(int arg0, Java.Lang.String arg1)
             IExecute("addSubjectAlternativeName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setIssuer(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setAuthorityKeyIdentifier(byte[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="byte"/></param>
+        public void SetAuthorityKeyIdentifier(byte[] arg0)
+        {
+            IExecuteWithSignature("setAuthorityKeyIdentifier", "([B)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setBasicConstraints(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBasicConstraints(int arg0)
+        {
+            IExecuteWithSignature("setBasicConstraints", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setCertificate(java.security.cert.X509Certificate)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
+        public void SetCertificate(Java.Security.Cert.X509Certificate arg0)
+        {
+            IExecuteWithSignature("setCertificate", "(Ljava/security/cert/X509Certificate;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setCertificateValid(java.util.Date)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        public void SetCertificateValid(Java.Util.Date arg0)
+        {
+            IExecuteWithSignature("setCertificateValid", "(Ljava/util/Date;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setExtendedKeyUsage(java.util.Set)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Set"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetExtendedKeyUsage(Java.Util.Set<Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setExtendedKeyUsage", "(Ljava/util/Set;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setIssuer(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -260,17 +323,16 @@ public void SetIssuer(byte[] arg0)
             IExecuteWithSignature("setIssuer", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setIssuer(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setIssuer(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
         public void SetIssuer(Java.Lang.String arg0)
         {
             IExecuteWithSignature("setIssuer", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setIssuer(javax.security.auth.x500.X500Principal)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setIssuer(javax.security.auth.x500.X500Principal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.X500.X500Principal"/></param>
         public void SetIssuer(Javax.Security.Auth.X500.X500Principal arg0)
@@ -278,7 +340,66 @@ public void SetIssuer(Javax.Security.Auth.X500.X500Principal arg0)
             IExecuteWithSignature("setIssuer", "(Ljavax/security/auth/x500/X500Principal;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSubject(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setKeyUsage(boolean[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetKeyUsage(bool[] arg0)
+        {
+            IExecuteWithSignature("setKeyUsage", "([Z)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setMatchAllSubjectAltNames(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetMatchAllSubjectAltNames(bool arg0)
+        {
+            IExecuteWithSignature("setMatchAllSubjectAltNames", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setNameConstraints(byte[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetNameConstraints(byte[] arg0)
+        {
+            IExecuteWithSignature("setNameConstraints", "([B)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setPathToNames(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetPathToNames(Java.Util.Collection<Java.Util.List<object>> arg0)
+        {
+            IExecuteWithSignature("setPathToNames", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setPolicy(java.util.Set)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Set"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetPolicy(Java.Util.Set<Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setPolicy", "(Ljava/util/Set;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setPrivateKeyValid(java.util.Date)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        public void SetPrivateKeyValid(Java.Util.Date arg0)
+        {
+            IExecuteWithSignature("setPrivateKeyValid", "(Ljava/util/Date;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSerialNumber(java.math.BigInteger)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
+        public void SetSerialNumber(Java.Math.BigInteger arg0)
+        {
+            IExecuteWithSignature("setSerialNumber", "(Ljava/math/BigInteger;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSubject(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -287,17 +408,16 @@ public void SetSubject(byte[] arg0)
             IExecuteWithSignature("setSubject", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSubject(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSubject(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
         public void SetSubject(Java.Lang.String arg0)
         {
             IExecuteWithSignature("setSubject", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSubject(javax.security.auth.x500.X500Principal)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSubject(javax.security.auth.x500.X500Principal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.X500.X500Principal"/></param>
         public void SetSubject(Javax.Security.Auth.X500.X500Principal arg0)
@@ -305,7 +425,24 @@ public void SetSubject(Javax.Security.Auth.X500.X500Principal arg0)
             IExecuteWithSignature("setSubject", "(Ljavax/security/auth/x500/X500Principal;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSubjectPublicKey(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSubjectAlternativeNames(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetSubjectAlternativeNames(Java.Util.Collection<Java.Util.List<object>> arg0)
+        {
+            IExecuteWithSignature("setSubjectAlternativeNames", "(Ljava/util/Collection;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSubjectKeyIdentifier(byte[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="byte"/></param>
+        public void SetSubjectKeyIdentifier(byte[] arg0)
+        {
+            IExecuteWithSignature("setSubjectKeyIdentifier", "([B)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSubjectPublicKey(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -314,13 +451,22 @@ public void SetSubjectPublicKey(byte[] arg0)
             IExecuteWithSignature("setSubjectPublicKey", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509CertSelector.html#setSubjectPublicKey(java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSubjectPublicKey(java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         public void SetSubjectPublicKey(Java.Security.PublicKey arg0)
         {
             IExecuteWithSignature("setSubjectPublicKey", "(Ljava/security/PublicKey;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509CertSelector.html#setSubjectPublicKeyAlgID(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Io.IOException"/>
+        public void SetSubjectPublicKeyAlgID(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSubjectPublicKeyAlgID", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/X509Certificate.cs b/src/net/Netdroid/Generated/Java/Security/Cert/X509Certificate.cs
index b1bdfdbb3..fd24a2a62 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/X509Certificate.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/X509Certificate.cs
@@ -50,165 +50,187 @@ public partial class X509Certificate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getBasicConstraints()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getIssuerUniqueID()"/>
         /// </summary>
-        public int BasicConstraints
+        /// <returns><see cref="bool"/></returns>
+        public bool[] GetIssuerUniqueID()
         {
-            get { return IExecuteWithSignature<int>("getBasicConstraints", "()I"); }
+            return IExecuteWithSignatureArray<bool>("getIssuerUniqueID", "()[Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getExtendedKeyUsage()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getKeyUsage()"/>
         /// </summary>
-        public Java.Util.List<Java.Lang.String> ExtendedKeyUsage
+        /// <returns><see cref="bool"/></returns>
+        public bool[] GetKeyUsage()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getExtendedKeyUsage", "()Ljava/util/List;"); }
+            return IExecuteWithSignatureArray<bool>("getKeyUsage", "()[Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getIssuerAlternativeNames()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSubjectUniqueID()"/>
         /// </summary>
-        public Java.Util.Collection<Java.Util.List<object>> IssuerAlternativeNames
+        /// <returns><see cref="bool"/></returns>
+        public bool[] GetSubjectUniqueID()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Util.List<object>>>("getIssuerAlternativeNames", "()Ljava/util/Collection;"); }
+            return IExecuteWithSignatureArray<bool>("getSubjectUniqueID", "()[Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getIssuerDN()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSigAlgParams()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Security.Principal IssuerDN
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSigAlgParams()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getIssuerDN", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignatureArray<byte>("getSigAlgParams", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getIssuerUniqueID()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSignature()"/>
         /// </summary>
-        public bool[] IssuerUniqueID
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSignature()
         {
-            get { return IExecuteWithSignatureArray<bool>("getIssuerUniqueID", "()[Z"); }
+            return IExecuteWithSignatureArray<byte>("getSignature", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getIssuerX500Principal()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getTBSCertificate()"/>
         /// </summary>
-        public Javax.Security.Auth.X500.X500Principal IssuerX500Principal
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Security.Cert.CertificateEncodingException"/>
+        public byte[] GetTBSCertificate()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getIssuerX500Principal", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignatureArray<byte>("getTBSCertificate", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getKeyUsage()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getBasicConstraints()"/>
         /// </summary>
-        public bool[] KeyUsage
+        /// <returns><see cref="int"/></returns>
+        public int GetBasicConstraints()
         {
-            get { return IExecuteWithSignatureArray<bool>("getKeyUsage", "()[Z"); }
+            return IExecuteWithSignature<int>("getBasicConstraints", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getNotAfter()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getVersion()"/>
         /// </summary>
-        public Java.Util.Date NotAfter
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getNotAfter", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getNotBefore()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSigAlgName()"/>
         /// </summary>
-        public Java.Util.Date NotBefore
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSigAlgName()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getNotBefore", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSigAlgName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSerialNumber()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSigAlgOID()"/>
         /// </summary>
-        public Java.Math.BigInteger SerialNumber
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSigAlgOID()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSigAlgOID", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSigAlgName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSerialNumber()"/>
         /// </summary>
-        public Java.Lang.String SigAlgName
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetSerialNumber()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSigAlgName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSigAlgOID()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getIssuerDN()"/>
         /// </summary>
-        public Java.Lang.String SigAlgOID
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetIssuerDN()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSigAlgOID", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getIssuerDN", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSigAlgParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSubjectDN()"/>
         /// </summary>
-        public byte[] SigAlgParams
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetSubjectDN()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSigAlgParams", "()[B"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getSubjectDN", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSignature()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getNotAfter()"/>
         /// </summary>
-        public byte[] Signature
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetNotAfter()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSignature", "()[B"); }
+            return IExecuteWithSignature<Java.Util.Date>("getNotAfter", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSubjectAlternativeNames()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getNotBefore()"/>
         /// </summary>
-        public Java.Util.Collection<Java.Util.List<object>> SubjectAlternativeNames
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetNotBefore()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Util.List<object>>>("getSubjectAlternativeNames", "()Ljava/util/Collection;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getNotBefore", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSubjectDN()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#checkValidity()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Java.Security.Principal SubjectDN
+        /// <exception cref="Java.Security.Cert.CertificateExpiredException"/>
+        /// <exception cref="Java.Security.Cert.CertificateNotYetValidException"/>
+        public void CheckValidity()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getSubjectDN", "()Ljava/security/Principal;"); }
+            IExecuteWithSignature("checkValidity", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSubjectUniqueID()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#checkValidity(java.util.Date)"/>
         /// </summary>
-        public bool[] SubjectUniqueID
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        /// <exception cref="Java.Security.Cert.CertificateExpiredException"/>
+        /// <exception cref="Java.Security.Cert.CertificateNotYetValidException"/>
+        public void CheckValidity(Java.Util.Date arg0)
         {
-            get { return IExecuteWithSignatureArray<bool>("getSubjectUniqueID", "()[Z"); }
+            IExecuteWithSignature("checkValidity", "(Ljava/util/Date;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getSubjectX500Principal()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getIssuerAlternativeNames()"/>
         /// </summary>
-        public Javax.Security.Auth.X500.X500Principal SubjectX500Principal
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        /// <exception cref="Java.Security.Cert.CertificateParsingException"/>
+        public Java.Util.Collection<Java.Util.List<object>> GetIssuerAlternativeNames()
         {
-            get { return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getSubjectX500Principal", "()Ljavax/security/auth/x500/X500Principal;"); }
+            return IExecuteWithSignature<Java.Util.Collection<Java.Util.List<object>>>("getIssuerAlternativeNames", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getTBSCertificate()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSubjectAlternativeNames()"/>
         /// </summary>
-        public byte[] TBSCertificate
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        /// <exception cref="Java.Security.Cert.CertificateParsingException"/>
+        public Java.Util.Collection<Java.Util.List<object>> GetSubjectAlternativeNames()
         {
-            get { return IExecuteWithSignatureArray<byte>("getTBSCertificate", "()[B"); }
+            return IExecuteWithSignature<Java.Util.Collection<Java.Util.List<object>>>("getSubjectAlternativeNames", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getExtendedKeyUsage()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="Java.Util.List"/></returns>
+        /// <exception cref="Java.Security.Cert.CertificateParsingException"/>
+        public Java.Util.List<Java.Lang.String> GetExtendedKeyUsage()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getExtendedKeyUsage", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#checkValidity()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getIssuerX500Principal()"/>
         /// </summary>
-        /// <exception cref="Java.Security.Cert.CertificateExpiredException"/>
-        /// <exception cref="Java.Security.Cert.CertificateNotYetValidException"/>
-        public void CheckValidity()
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        public Javax.Security.Auth.X500.X500Principal GetIssuerX500Principal()
         {
-            IExecuteWithSignature("checkValidity", "()V");
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getIssuerX500Principal", "()Ljavax/security/auth/x500/X500Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Certificate.html#checkValidity(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Certificate.html#getSubjectX500Principal()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
-        /// <exception cref="Java.Security.Cert.CertificateExpiredException"/>
-        /// <exception cref="Java.Security.Cert.CertificateNotYetValidException"/>
-        public void CheckValidity(Java.Util.Date arg0)
+        /// <returns><see cref="Javax.Security.Auth.X500.X500Principal"/></returns>
+        public Javax.Security.Auth.X500.X500Principal GetSubjectX500Principal()
         {
-            IExecuteWithSignature("checkValidity", "(Ljava/util/Date;)V", arg0);
+            return IExecuteWithSignature<Javax.Security.Auth.X500.X500Principal>("getSubjectX500Principal", "()Ljavax/security/auth/x500/X500Principal;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Cert/X509Extension.cs b/src/net/Netdroid/Generated/Java/Security/Cert/X509Extension.cs
index 775ccfb70..a0ec6e3a2 100644
--- a/src/net/Netdroid/Generated/Java/Security/Cert/X509Extension.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Cert/X509Extension.cs
@@ -64,35 +64,37 @@ public partial class X509Extension : Java.Security.Cert.IX509Extension
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Extension.html#getCriticalExtensionOIDs()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Extension.html#hasUnsupportedCriticalExtension()"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> CriticalExtensionOIDs
+        /// <returns><see cref="bool"/></returns>
+        public bool HasUnsupportedCriticalExtension()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getCriticalExtensionOIDs", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<bool>("hasUnsupportedCriticalExtension", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Extension.html#getNonCriticalExtensionOIDs()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Extension.html#getExtensionValue(java.lang.String)"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> NonCriticalExtensionOIDs
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetExtensionValue(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getNonCriticalExtensionOIDs", "()Ljava/util/Set;"); }
+            return IExecuteWithSignatureArray<byte>("getExtensionValue", "(Ljava/lang/String;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Extension.html#hasUnsupportedCriticalExtension()"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Extension.html#getCriticalExtensionOIDs()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasUnsupportedCriticalExtension()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetCriticalExtensionOIDs()
         {
-            return IExecuteWithSignature<bool>("hasUnsupportedCriticalExtension", "()Z");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getCriticalExtensionOIDs", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/cert/X509Extension.html#getExtensionValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/cert/X509Extension.html#getNonCriticalExtensionOIDs()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] GetExtensionValue(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetNonCriticalExtensionOIDs()
         {
-            return IExecuteWithSignatureArray<byte>("getExtensionValue", "(Ljava/lang/String;)[B", arg0);
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getNonCriticalExtensionOIDs", "()Ljava/util/Set;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Certificate.cs b/src/net/Netdroid/Generated/Java/Security/Certificate.cs
index 519095f28..2ed01ae8f 100644
--- a/src/net/Netdroid/Generated/Java/Security/Certificate.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Certificate.cs
@@ -64,44 +64,48 @@ public partial class Certificate : Java.Security.ICertificate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Certificate.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Certificate.html#getFormat()"/>
         /// </summary>
-        public Java.Lang.String Format
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFormat()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Certificate.html#getGuarantor()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Certificate.html#toString(boolean)"/>
         /// </summary>
-        public Java.Security.Principal Guarantor
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String ToString(bool arg0)
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getGuarantor", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Lang.String>("toString", "(Z)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Certificate.html#getPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Certificate.html#getGuarantor()"/>
         /// </summary>
-        public Java.Security.Principal Principal
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetGuarantor()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getGuarantor", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Certificate.html#getPublicKey()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Certificate.html#getPrincipal()"/>
         /// </summary>
-        public Java.Security.PublicKey PublicKey
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetPrincipal()
         {
-            get { return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Certificate.html#toString(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Certificate.html#getPublicKey()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToString(bool arg0)
+        /// <returns><see cref="Java.Security.PublicKey"/></returns>
+        public Java.Security.PublicKey GetPublicKey()
         {
-            return IExecuteWithSignature<Java.Lang.String>("toString", "(Z)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Certificate.html#decode(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Certificate.html#decode(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Security.KeyException"/>
@@ -111,7 +115,7 @@ public void Decode(Java.Io.InputStream arg0)
             IExecuteWithSignature("decode", "(Ljava/io/InputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Certificate.html#encode(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Certificate.html#encode(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Security.KeyException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/CodeSigner.cs b/src/net/Netdroid/Generated/Java/Security/CodeSigner.cs
index 9744c307a..0a27390df 100644
--- a/src/net/Netdroid/Generated/Java/Security/CodeSigner.cs
+++ b/src/net/Netdroid/Generated/Java/Security/CodeSigner.cs
@@ -30,7 +30,7 @@ public partial class CodeSigner
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSigner.html#%3Cinit%3E(java.security.cert.CertPath,java.security.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/security/CodeSigner.html#%3Cinit%3E(java.security.cert.CertPath,java.security.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertPath"/></param>
         /// <param name="arg1"><see cref="Java.Security.Timestamp"/></param>
@@ -55,18 +55,20 @@ public CodeSigner(Java.Security.Cert.CertPath arg0, Java.Security.Timestamp arg1
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSigner.html#getSignerCertPath()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/CodeSigner.html#getSignerCertPath()"/>
         /// </summary>
-        public Java.Security.Cert.CertPath SignerCertPath
+        /// <returns><see cref="Java.Security.Cert.CertPath"/></returns>
+        public Java.Security.Cert.CertPath GetSignerCertPath()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertPath>("getSignerCertPath", "()Ljava/security/cert/CertPath;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertPath>("getSignerCertPath", "()Ljava/security/cert/CertPath;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSigner.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/CodeSigner.html#getTimestamp()"/>
         /// </summary>
-        public Java.Security.Timestamp Timestamp
+        /// <returns><see cref="Java.Security.Timestamp"/></returns>
+        public Java.Security.Timestamp GetTimestamp()
         {
-            get { return IExecuteWithSignature<Java.Security.Timestamp>("getTimestamp", "()Ljava/security/Timestamp;"); }
+            return IExecuteWithSignature<Java.Security.Timestamp>("getTimestamp", "()Ljava/security/Timestamp;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/CodeSource.cs b/src/net/Netdroid/Generated/Java/Security/CodeSource.cs
index 53e2a6bae..8e5501541 100644
--- a/src/net/Netdroid/Generated/Java/Security/CodeSource.cs
+++ b/src/net/Netdroid/Generated/Java/Security/CodeSource.cs
@@ -30,7 +30,7 @@ public partial class CodeSource
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSource.html#%3Cinit%3E(java.net.URL,java.security.cert.Certificate[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/CodeSource.html#%3Cinit%3E(java.net.URL,java.security.cert.Certificate[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.Certificate"/></param>
@@ -39,7 +39,7 @@ public CodeSource(Java.Net.URL arg0, Java.Security.Cert.Certificate[] arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSource.html#%3Cinit%3E(java.net.URL,java.security.CodeSigner[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/CodeSource.html#%3Cinit%3E(java.net.URL,java.security.CodeSigner[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <param name="arg1"><see cref="Java.Security.CodeSigner"/></param>
@@ -64,34 +64,37 @@ public CodeSource(Java.Net.URL arg0, Java.Security.CodeSigner[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSource.html#getCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/CodeSource.html#implies(java.security.CodeSource)"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] Certificates
+        /// <param name="arg0"><see cref="Java.Security.CodeSource"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Implies(Java.Security.CodeSource arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignature<bool>("implies", "(Ljava/security/CodeSource;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSource.html#getCodeSigners()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/CodeSource.html#getLocation()"/>
         /// </summary>
-        public Java.Security.CodeSigner[] CodeSigners
+        /// <returns><see cref="Java.Net.URL"/></returns>
+        public Java.Net.URL GetLocation()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.CodeSigner>("getCodeSigners", "()[Ljava/security/CodeSigner;"); }
+            return IExecuteWithSignature<Java.Net.URL>("getLocation", "()Ljava/net/URL;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSource.html#getLocation()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/CodeSource.html#getCertificates()"/>
         /// </summary>
-        public Java.Net.URL Location
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        public Java.Security.Cert.Certificate[] GetCertificates()
         {
-            get { return IExecuteWithSignature<Java.Net.URL>("getLocation", "()Ljava/net/URL;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CodeSource.html#implies(java.security.CodeSource)"/>
+        /// <see href="https://developer.android.com/reference/java/security/CodeSource.html#getCodeSigners()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.CodeSource"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Implies(Java.Security.CodeSource arg0)
+        /// <returns><see cref="Java.Security.CodeSigner"/></returns>
+        public Java.Security.CodeSigner[] GetCodeSigners()
         {
-            return IExecuteWithSignature<bool>("implies", "(Ljava/security/CodeSource;)Z", arg0);
+            return IExecuteWithSignatureArray<Java.Security.CodeSigner>("getCodeSigners", "()[Ljava/security/CodeSigner;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/CryptoPrimitive.cs b/src/net/Netdroid/Generated/Java/Security/CryptoPrimitive.cs
index c337cb6a5..93937472f 100644
--- a/src/net/Netdroid/Generated/Java/Security/CryptoPrimitive.cs
+++ b/src/net/Netdroid/Generated/Java/Security/CryptoPrimitive.cs
@@ -38,61 +38,61 @@ public partial class CryptoPrimitive
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#BLOCK_CIPHER"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#BLOCK_CIPHER"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive BLOCK_CIPHER { get { if (!_BLOCK_CIPHERReady) { _BLOCK_CIPHERContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "BLOCK_CIPHER"); _BLOCK_CIPHERReady = true; } return _BLOCK_CIPHERContent; } }
         private static Java.Security.CryptoPrimitive _BLOCK_CIPHERContent = default;
         private static bool _BLOCK_CIPHERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#KEY_AGREEMENT"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#KEY_AGREEMENT"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive KEY_AGREEMENT { get { if (!_KEY_AGREEMENTReady) { _KEY_AGREEMENTContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "KEY_AGREEMENT"); _KEY_AGREEMENTReady = true; } return _KEY_AGREEMENTContent; } }
         private static Java.Security.CryptoPrimitive _KEY_AGREEMENTContent = default;
         private static bool _KEY_AGREEMENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#KEY_ENCAPSULATION"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#KEY_ENCAPSULATION"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive KEY_ENCAPSULATION { get { if (!_KEY_ENCAPSULATIONReady) { _KEY_ENCAPSULATIONContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "KEY_ENCAPSULATION"); _KEY_ENCAPSULATIONReady = true; } return _KEY_ENCAPSULATIONContent; } }
         private static Java.Security.CryptoPrimitive _KEY_ENCAPSULATIONContent = default;
         private static bool _KEY_ENCAPSULATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#KEY_WRAP"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#KEY_WRAP"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive KEY_WRAP { get { if (!_KEY_WRAPReady) { _KEY_WRAPContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "KEY_WRAP"); _KEY_WRAPReady = true; } return _KEY_WRAPContent; } }
         private static Java.Security.CryptoPrimitive _KEY_WRAPContent = default;
         private static bool _KEY_WRAPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#MAC"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#MAC"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive MAC { get { if (!_MACReady) { _MACContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "MAC"); _MACReady = true; } return _MACContent; } }
         private static Java.Security.CryptoPrimitive _MACContent = default;
         private static bool _MACReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#MESSAGE_DIGEST"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#MESSAGE_DIGEST"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive MESSAGE_DIGEST { get { if (!_MESSAGE_DIGESTReady) { _MESSAGE_DIGESTContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "MESSAGE_DIGEST"); _MESSAGE_DIGESTReady = true; } return _MESSAGE_DIGESTContent; } }
         private static Java.Security.CryptoPrimitive _MESSAGE_DIGESTContent = default;
         private static bool _MESSAGE_DIGESTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#PUBLIC_KEY_ENCRYPTION"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#PUBLIC_KEY_ENCRYPTION"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive PUBLIC_KEY_ENCRYPTION { get { if (!_PUBLIC_KEY_ENCRYPTIONReady) { _PUBLIC_KEY_ENCRYPTIONContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "PUBLIC_KEY_ENCRYPTION"); _PUBLIC_KEY_ENCRYPTIONReady = true; } return _PUBLIC_KEY_ENCRYPTIONContent; } }
         private static Java.Security.CryptoPrimitive _PUBLIC_KEY_ENCRYPTIONContent = default;
         private static bool _PUBLIC_KEY_ENCRYPTIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#SECURE_RANDOM"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#SECURE_RANDOM"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive SECURE_RANDOM { get { if (!_SECURE_RANDOMReady) { _SECURE_RANDOMContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "SECURE_RANDOM"); _SECURE_RANDOMReady = true; } return _SECURE_RANDOMContent; } }
         private static Java.Security.CryptoPrimitive _SECURE_RANDOMContent = default;
         private static bool _SECURE_RANDOMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#SIGNATURE"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#SIGNATURE"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive SIGNATURE { get { if (!_SIGNATUREReady) { _SIGNATUREContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "SIGNATURE"); _SIGNATUREReady = true; } return _SIGNATUREContent; } }
         private static Java.Security.CryptoPrimitive _SIGNATUREContent = default;
         private static bool _SIGNATUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#STREAM_CIPHER"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#STREAM_CIPHER"/>
         /// </summary>
         public static Java.Security.CryptoPrimitive STREAM_CIPHER { get { if (!_STREAM_CIPHERReady) { _STREAM_CIPHERContent = SGetField<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "STREAM_CIPHER"); _STREAM_CIPHERReady = true; } return _STREAM_CIPHERContent; } }
         private static Java.Security.CryptoPrimitive _STREAM_CIPHERContent = default;
@@ -102,7 +102,7 @@ public partial class CryptoPrimitive
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.CryptoPrimitive"/></returns>
@@ -111,7 +111,7 @@ public static Java.Security.CryptoPrimitive ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Security.CryptoPrimitive>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/security/CryptoPrimitive;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/CryptoPrimitive.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/security/CryptoPrimitive.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.CryptoPrimitive"/></returns>
         public static Java.Security.CryptoPrimitive[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Security/DigestInputStream.cs b/src/net/Netdroid/Generated/Java/Security/DigestInputStream.cs
index beb8b0775..38c657534 100644
--- a/src/net/Netdroid/Generated/Java/Security/DigestInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Security/DigestInputStream.cs
@@ -30,7 +30,7 @@ public partial class DigestInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DigestInputStream.html#%3Cinit%3E(java.io.InputStream,java.security.MessageDigest)"/>
+        /// <see href="https://developer.android.com/reference/java/security/DigestInputStream.html#%3Cinit%3E(java.io.InputStream,java.security.MessageDigest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Security.MessageDigest"/></param>
@@ -55,20 +55,29 @@ public DigestInputStream(Java.Io.InputStream arg0, Java.Security.MessageDigest a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DigestInputStream.html#getMessageDigest()"/> <see href="https://developer.android.com/reference/java.base/java/security/DigestInputStream.html#setMessageDigest(java.security.MessageDigest)"/>
+        /// <see href="https://developer.android.com/reference/java/security/DigestInputStream.html#getMessageDigest()"/>
         /// </summary>
-        public Java.Security.MessageDigest MessageDigest
+        /// <returns><see cref="Java.Security.MessageDigest"/></returns>
+        public Java.Security.MessageDigest GetMessageDigest()
         {
-            get { return IExecuteWithSignature<Java.Security.MessageDigest>("getMessageDigest", "()Ljava/security/MessageDigest;"); } set { IExecuteWithSignature("setMessageDigest", "(Ljava/security/MessageDigest;)V", value); }
+            return IExecuteWithSignature<Java.Security.MessageDigest>("getMessageDigest", "()Ljava/security/MessageDigest;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DigestInputStream.html#on(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/DigestInputStream.html#on(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void On(bool arg0)
         {
             IExecuteWithSignature("on", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/DigestInputStream.html#setMessageDigest(java.security.MessageDigest)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.MessageDigest"/></param>
+        public void SetMessageDigest(Java.Security.MessageDigest arg0)
+        {
+            IExecuteWithSignature("setMessageDigest", "(Ljava/security/MessageDigest;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/DigestOutputStream.cs b/src/net/Netdroid/Generated/Java/Security/DigestOutputStream.cs
index b73702589..812af3c45 100644
--- a/src/net/Netdroid/Generated/Java/Security/DigestOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Security/DigestOutputStream.cs
@@ -30,7 +30,7 @@ public partial class DigestOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DigestOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.security.MessageDigest)"/>
+        /// <see href="https://developer.android.com/reference/java/security/DigestOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.security.MessageDigest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Security.MessageDigest"/></param>
@@ -55,20 +55,29 @@ public DigestOutputStream(Java.Io.OutputStream arg0, Java.Security.MessageDigest
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DigestOutputStream.html#getMessageDigest()"/> <see href="https://developer.android.com/reference/java.base/java/security/DigestOutputStream.html#setMessageDigest(java.security.MessageDigest)"/>
+        /// <see href="https://developer.android.com/reference/java/security/DigestOutputStream.html#getMessageDigest()"/>
         /// </summary>
-        public Java.Security.MessageDigest MessageDigest
+        /// <returns><see cref="Java.Security.MessageDigest"/></returns>
+        public Java.Security.MessageDigest GetMessageDigest()
         {
-            get { return IExecuteWithSignature<Java.Security.MessageDigest>("getMessageDigest", "()Ljava/security/MessageDigest;"); } set { IExecuteWithSignature("setMessageDigest", "(Ljava/security/MessageDigest;)V", value); }
+            return IExecuteWithSignature<Java.Security.MessageDigest>("getMessageDigest", "()Ljava/security/MessageDigest;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DigestOutputStream.html#on(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/DigestOutputStream.html#on(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void On(bool arg0)
         {
             IExecuteWithSignature("on", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/DigestOutputStream.html#setMessageDigest(java.security.MessageDigest)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.MessageDigest"/></param>
+        public void SetMessageDigest(Java.Security.MessageDigest arg0)
+        {
+            IExecuteWithSignature("setMessageDigest", "(Ljava/security/MessageDigest;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/DomainCombiner.cs b/src/net/Netdroid/Generated/Java/Security/DomainCombiner.cs
index 77acc1535..5f613b710 100644
--- a/src/net/Netdroid/Generated/Java/Security/DomainCombiner.cs
+++ b/src/net/Netdroid/Generated/Java/Security/DomainCombiner.cs
@@ -64,7 +64,7 @@ public partial class DomainCombiner : Java.Security.IDomainCombiner
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DomainCombiner.html#combine(java.security.ProtectionDomain[],java.security.ProtectionDomain[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/DomainCombiner.html#combine(java.security.ProtectionDomain[],java.security.ProtectionDomain[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.ProtectionDomain"/></param>
         /// <param name="arg1"><see cref="Java.Security.ProtectionDomain"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/DomainLoadStoreParameter.cs b/src/net/Netdroid/Generated/Java/Security/DomainLoadStoreParameter.cs
index 9a5f80a5c..bafc7d2aa 100644
--- a/src/net/Netdroid/Generated/Java/Security/DomainLoadStoreParameter.cs
+++ b/src/net/Netdroid/Generated/Java/Security/DomainLoadStoreParameter.cs
@@ -30,7 +30,7 @@ public partial class DomainLoadStoreParameter
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DomainLoadStoreParameter.html#%3Cinit%3E(java.net.URI,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/security/DomainLoadStoreParameter.html#%3Cinit%3E(java.net.URI,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URI"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -55,25 +55,28 @@ public DomainLoadStoreParameter(Java.Net.URI arg0, Java.Util.Map<Java.Lang.Strin
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DomainLoadStoreParameter.html#getConfiguration()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/DomainLoadStoreParameter.html#getConfiguration()"/>
         /// </summary>
-        public Java.Net.URI Configuration
+        /// <returns><see cref="Java.Net.URI"/></returns>
+        public Java.Net.URI GetConfiguration()
         {
-            get { return IExecuteWithSignature<Java.Net.URI>("getConfiguration", "()Ljava/net/URI;"); }
+            return IExecuteWithSignature<Java.Net.URI>("getConfiguration", "()Ljava/net/URI;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DomainLoadStoreParameter.html#getProtectionParameter()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/DomainLoadStoreParameter.html#getProtectionParameter()"/>
         /// </summary>
-        public Java.Security.KeyStore.ProtectionParameter ProtectionParameter
+        /// <returns><see cref="Java.Security.KeyStore.ProtectionParameter"/></returns>
+        public Java.Security.KeyStore.ProtectionParameter GetProtectionParameter()
         {
-            get { return IExecuteWithSignature<Java.Security.KeyStore.ProtectionParameter>("getProtectionParameter", "()Ljava/security/KeyStore$ProtectionParameter;"); }
+            return IExecuteWithSignature<Java.Security.KeyStore.ProtectionParameter>("getProtectionParameter", "()Ljava/security/KeyStore$ProtectionParameter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/DomainLoadStoreParameter.html#getProtectionParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/DomainLoadStoreParameter.html#getProtectionParams()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Security.KeyStore.ProtectionParameter> ProtectionParams
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Security.KeyStore.ProtectionParameter> GetProtectionParams()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Security.KeyStore.ProtectionParameter>>("getProtectionParams", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Security.KeyStore.ProtectionParameter>>("getProtectionParams", "()Ljava/util/Map;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Guard.cs b/src/net/Netdroid/Generated/Java/Security/Guard.cs
index dc976719c..e7d012c9a 100644
--- a/src/net/Netdroid/Generated/Java/Security/Guard.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Guard.cs
@@ -64,7 +64,7 @@ public partial class Guard : Java.Security.IGuard
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Guard.html#checkGuard(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Guard.html#checkGuard(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.SecurityException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/GuardedObject.cs b/src/net/Netdroid/Generated/Java/Security/GuardedObject.cs
index 310aa3d5d..49738c9c4 100644
--- a/src/net/Netdroid/Generated/Java/Security/GuardedObject.cs
+++ b/src/net/Netdroid/Generated/Java/Security/GuardedObject.cs
@@ -30,7 +30,7 @@ public partial class GuardedObject
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/GuardedObject.html#%3Cinit%3E(java.lang.Object,java.security.Guard)"/>
+        /// <see href="https://developer.android.com/reference/java/security/GuardedObject.html#%3Cinit%3E(java.lang.Object,java.security.Guard)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Security.Guard"/></param>
@@ -55,11 +55,13 @@ public GuardedObject(object arg0, Java.Security.Guard arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/GuardedObject.html#getObject()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/GuardedObject.html#getObject()"/>
         /// </summary>
-        public object Object
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public object GetObject()
         {
-            get { return IExecuteWithSignature("getObject", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature("getObject", "()Ljava/lang/Object;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Identity.cs b/src/net/Netdroid/Generated/Java/Security/Identity.cs
index 6ddcb733b..df6f5bfd0 100644
--- a/src/net/Netdroid/Generated/Java/Security/Identity.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Identity.cs
@@ -30,7 +30,7 @@ public partial class Identity : Java.Security.IPrincipal, Java.Io.ISerializable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#%3Cinit%3E(java.lang.String,java.security.IdentityScope)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#%3Cinit%3E(java.lang.String,java.security.IdentityScope)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.IdentityScope"/></param>
@@ -40,7 +40,7 @@ public Identity(Java.Lang.String arg0, Java.Security.IdentityScope arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public Identity(Java.Lang.String arg0)
@@ -72,35 +72,31 @@ public Identity(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#getInfo()"/> <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#setInfo(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Info
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInfo", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setInfo", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#getPublicKey()"/> <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#setPublicKey(java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#getScope()"/>
         /// </summary>
-        public Java.Security.PublicKey PublicKey
+        /// <returns><see cref="Java.Security.IdentityScope"/></returns>
+        public Java.Security.IdentityScope GetScope()
         {
-            get { return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;"); } set { IExecuteWithSignature("setPublicKey", "(Ljava/security/PublicKey;)V", value); }
+            return IExecuteWithSignature<Java.Security.IdentityScope>("getScope", "()Ljava/security/IdentityScope;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#getScope()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#getInfo()"/>
         /// </summary>
-        public Java.Security.IdentityScope Scope
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInfo()
         {
-            get { return IExecuteWithSignature<Java.Security.IdentityScope>("getScope", "()Ljava/security/IdentityScope;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInfo", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#toString(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#toString(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -109,7 +105,7 @@ public Java.Lang.String ToString(bool arg0)
             return IExecuteWithSignature<Java.Lang.String>("toString", "(Z)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#certificates()"/>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#certificates()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.Certificate"/></returns>
         public Java.Security.Certificate[] Certificates()
@@ -117,7 +113,15 @@ public Java.Security.Certificate[] Certificates()
             return IExecuteWithSignatureArray<Java.Security.Certificate>("certificates", "()[Ljava/security/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#addCertificate(java.security.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#getPublicKey()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.PublicKey"/></returns>
+        public Java.Security.PublicKey GetPublicKey()
+        {
+            return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#addCertificate(java.security.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Certificate"/></param>
         /// <exception cref="Java.Security.KeyManagementException"/>
@@ -126,7 +130,7 @@ public void AddCertificate(Java.Security.Certificate arg0)
             IExecuteWithSignature("addCertificate", "(Ljava/security/Certificate;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Identity.html#removeCertificate(java.security.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#removeCertificate(java.security.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Certificate"/></param>
         /// <exception cref="Java.Security.KeyManagementException"/>
@@ -134,6 +138,23 @@ public void RemoveCertificate(Java.Security.Certificate arg0)
         {
             IExecuteWithSignature("removeCertificate", "(Ljava/security/Certificate;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#setInfo(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetInfo(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setInfo", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Identity.html#setPublicKey(java.security.PublicKey)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
+        /// <exception cref="Java.Security.KeyManagementException"/>
+        public void SetPublicKey(Java.Security.PublicKey arg0)
+        {
+            IExecuteWithSignature("setPublicKey", "(Ljava/security/PublicKey;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/IdentityScope.cs b/src/net/Netdroid/Generated/Java/Security/IdentityScope.cs
index 3e08d3c9f..303c32e5b 100644
--- a/src/net/Netdroid/Generated/Java/Security/IdentityScope.cs
+++ b/src/net/Netdroid/Generated/Java/Security/IdentityScope.cs
@@ -30,7 +30,7 @@ public partial class IdentityScope
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#%3Cinit%3E(java.lang.String,java.security.IdentityScope)"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#%3Cinit%3E(java.lang.String,java.security.IdentityScope)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.IdentityScope"/></param>
@@ -40,7 +40,7 @@ public IdentityScope(Java.Lang.String arg0, Java.Security.IdentityScope arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public IdentityScope(Java.Lang.String arg0)
@@ -60,18 +60,19 @@ public IdentityScope(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#getSystemScope()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#getSystemScope()"/>
         /// </summary>
-        public static Java.Security.IdentityScope SystemScope
+        /// <returns><see cref="Java.Security.IdentityScope"/></returns>
+        public static Java.Security.IdentityScope GetSystemScope()
         {
-            get { return SExecuteWithSignature<Java.Security.IdentityScope>(LocalBridgeClazz, "getSystemScope", "()Ljava/security/IdentityScope;"); }
+            return SExecuteWithSignature<Java.Security.IdentityScope>(LocalBridgeClazz, "getSystemScope", "()Ljava/security/IdentityScope;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -79,7 +80,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#getIdentity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#getIdentity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Identity"/></returns>
@@ -88,7 +89,7 @@ public Java.Security.Identity GetIdentity(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Security.Identity>("getIdentity", "(Ljava/lang/String;)Ljava/security/Identity;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#getIdentity(java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#getIdentity(java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <returns><see cref="Java.Security.Identity"/></returns>
@@ -97,7 +98,7 @@ public Java.Security.Identity GetIdentity(Java.Security.PublicKey arg0)
             return IExecuteWithSignature<Java.Security.Identity>("getIdentity", "(Ljava/security/PublicKey;)Ljava/security/Identity;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#identities()"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#identities()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<Java.Security.Identity> Identities()
@@ -105,7 +106,7 @@ public Java.Security.Identity GetIdentity(Java.Security.PublicKey arg0)
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Security.Identity>>("identities", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#addIdentity(java.security.Identity)"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#addIdentity(java.security.Identity)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Identity"/></param>
         /// <exception cref="Java.Security.KeyManagementException"/>
@@ -114,7 +115,7 @@ public void AddIdentity(Java.Security.Identity arg0)
             IExecuteWithSignature("addIdentity", "(Ljava/security/Identity;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#removeIdentity(java.security.Identity)"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#removeIdentity(java.security.Identity)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Identity"/></param>
         /// <exception cref="Java.Security.KeyManagementException"/>
@@ -123,7 +124,7 @@ public void RemoveIdentity(Java.Security.Identity arg0)
             IExecuteWithSignature("removeIdentity", "(Ljava/security/Identity;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/IdentityScope.html#getIdentity(java.security.Principal)"/>
+        /// <see href="https://developer.android.com/reference/java/security/IdentityScope.html#getIdentity(java.security.Principal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Principal"/></param>
         /// <returns><see cref="Java.Security.Identity"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/AllPackageClasses.cs
index 69eb62194..a85e973ac 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Security.Interfaces
 {
     #region DSAKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAKey.html"/>
     /// </summary>
     public partial class DSAKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAKey>
     {
@@ -36,12 +36,12 @@ public partial class DSAKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAKey>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DSAKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DSAKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public DSAKey(params object[] args) : base(args) { }
 
     #region DSAKeyPairGenerator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAKeyPairGenerator.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAKeyPairGenerator.html"/>
     /// </summary>
     public partial class DSAKeyPairGenerator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAKeyPairGenerator>
     {
@@ -82,12 +82,12 @@ public partial class DSAKeyPairGenerator : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DSAKeyPairGenerator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAKeyPairGenerator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAKeyPairGenerator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DSAKeyPairGenerator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAKeyPairGenerator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAKeyPairGenerator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public DSAKeyPairGenerator(params object[] args) : base(args) { }
 
     #region DSAParams
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAParams.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAParams.html"/>
     /// </summary>
     public partial class DSAParams : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAParams>
     {
@@ -128,12 +128,12 @@ public partial class DSAParams : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAPara
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DSAParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAParams() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DSAParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAParams(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -166,7 +166,7 @@ public DSAParams(params object[] args) : base(args) { }
 
     #region DSAPrivateKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAPrivateKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAPrivateKey.html"/>
     /// </summary>
     public partial class DSAPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAPrivateKey>
     {
@@ -174,12 +174,12 @@ public partial class DSAPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSA
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DSAPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAPrivateKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DSAPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAPrivateKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -212,7 +212,7 @@ public DSAPrivateKey(params object[] args) : base(args) { }
 
     #region DSAPublicKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAPublicKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAPublicKey.html"/>
     /// </summary>
     public partial class DSAPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAPublicKey>
     {
@@ -220,12 +220,12 @@ public partial class DSAPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAP
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DSAPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAPublicKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DSAPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DSAPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DSAPublicKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,7 +258,7 @@ public DSAPublicKey(params object[] args) : base(args) { }
 
     #region ECKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/ECKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/ECKey.html"/>
     /// </summary>
     public partial class ECKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECKey>
     {
@@ -266,12 +266,12 @@ public partial class ECKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECKey>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ECKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ECKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -304,7 +304,7 @@ public ECKey(params object[] args) : base(args) { }
 
     #region ECPrivateKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/ECPrivateKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/ECPrivateKey.html"/>
     /// </summary>
     public partial class ECPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECPrivateKey>
     {
@@ -312,12 +312,12 @@ public partial class ECPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECPr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ECPrivateKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ECPrivateKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -350,7 +350,7 @@ public ECPrivateKey(params object[] args) : base(args) { }
 
     #region ECPublicKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/ECPublicKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/ECPublicKey.html"/>
     /// </summary>
     public partial class ECPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECPublicKey>
     {
@@ -358,12 +358,12 @@ public partial class ECPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECPub
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ECPublicKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ECPublicKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -394,147 +394,9 @@ public ECPublicKey(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region EdECKey
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/EdECKey.html"/>
-    /// </summary>
-    public partial class EdECKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EdECKey>
-    {
-        const string _bridgeClassName = "java.security.interfaces.EdECKey";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        [Obsolete("EdECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public EdECKey() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        [Obsolete("EdECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public EdECKey(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region EdECPrivateKey
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/EdECPrivateKey.html"/>
-    /// </summary>
-    public partial class EdECPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EdECPrivateKey>
-    {
-        const string _bridgeClassName = "java.security.interfaces.EdECPrivateKey";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        [Obsolete("EdECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public EdECPrivateKey() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        [Obsolete("EdECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public EdECPrivateKey(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region EdECPublicKey
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/EdECPublicKey.html"/>
-    /// </summary>
-    public partial class EdECPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EdECPublicKey>
-    {
-        const string _bridgeClassName = "java.security.interfaces.EdECPublicKey";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        [Obsolete("EdECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public EdECPublicKey() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        [Obsolete("EdECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public EdECPublicKey(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
     #region RSAKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAKey.html"/>
     /// </summary>
     public partial class RSAKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RSAKey>
     {
@@ -542,12 +404,12 @@ public partial class RSAKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RSAKey>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RSAKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RSAKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -580,7 +442,7 @@ public RSAKey(params object[] args) : base(args) { }
 
     #region RSAMultiPrimePrivateCrtKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html"/>
     /// </summary>
     public partial class RSAMultiPrimePrivateCrtKey : Java.Security.Interfaces.RSAPrivateKey
     {
@@ -588,12 +450,12 @@ public partial class RSAMultiPrimePrivateCrtKey : Java.Security.Interfaces.RSAPr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RSAMultiPrimePrivateCrtKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAMultiPrimePrivateCrtKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAMultiPrimePrivateCrtKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RSAMultiPrimePrivateCrtKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAMultiPrimePrivateCrtKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAMultiPrimePrivateCrtKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -626,7 +488,7 @@ public RSAMultiPrimePrivateCrtKey(params object[] args) : base(args) { }
 
     #region RSAPrivateCrtKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateCrtKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html"/>
     /// </summary>
     public partial class RSAPrivateCrtKey : Java.Security.Interfaces.RSAPrivateKey
     {
@@ -634,12 +496,12 @@ public partial class RSAPrivateCrtKey : Java.Security.Interfaces.RSAPrivateKey
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RSAPrivateCrtKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAPrivateCrtKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAPrivateCrtKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RSAPrivateCrtKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAPrivateCrtKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAPrivateCrtKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -672,7 +534,7 @@ public RSAPrivateCrtKey(params object[] args) : base(args) { }
 
     #region RSAPrivateKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateKey.html"/>
     /// </summary>
     public partial class RSAPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RSAPrivateKey>
     {
@@ -680,12 +542,12 @@ public partial class RSAPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RSA
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RSAPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAPrivateKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RSAPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAPrivateKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -718,7 +580,7 @@ public RSAPrivateKey(params object[] args) : base(args) { }
 
     #region RSAPublicKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPublicKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPublicKey.html"/>
     /// </summary>
     public partial class RSAPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RSAPublicKey>
     {
@@ -726,12 +588,12 @@ public partial class RSAPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RSAP
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RSAPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAPublicKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RSAPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RSAPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RSAPublicKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -764,7 +626,7 @@ public RSAPublicKey(params object[] args) : base(args) { }
 
     #region XECKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/XECKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/XECKey.html"/>
     /// </summary>
     public partial class XECKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XECKey>
     {
@@ -772,12 +634,12 @@ public partial class XECKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XECKey>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XECKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XECKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XECKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -810,7 +672,7 @@ public XECKey(params object[] args) : base(args) { }
 
     #region XECPrivateKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/XECPrivateKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/XECPrivateKey.html"/>
     /// </summary>
     public partial class XECPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XECPrivateKey>
     {
@@ -818,12 +680,12 @@ public partial class XECPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XEC
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XECPrivateKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XECPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XECPrivateKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -856,7 +718,7 @@ public XECPrivateKey(params object[] args) : base(args) { }
 
     #region XECPublicKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/XECPublicKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/interfaces/XECPublicKey.html"/>
     /// </summary>
     public partial class XECPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XECPublicKey>
     {
@@ -864,12 +726,12 @@ public partial class XECPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XECP
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XECPublicKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XECPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XECPublicKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAKey.cs
index 439dbb5f1..598ea10fc 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAKey.cs
@@ -64,11 +64,12 @@ public partial class DSAKey : Java.Security.Interfaces.IDSAKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAKey.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAKey.html#getParams()"/>
         /// </summary>
-        public Java.Security.Interfaces.DSAParams Params
+        /// <returns><see cref="Java.Security.Interfaces.DSAParams"/></returns>
+        public Java.Security.Interfaces.DSAParams GetParams()
         {
-            get { return IExecute<Java.Security.Interfaces.DSAParams>("getParams"); }
+            return IExecute<Java.Security.Interfaces.DSAParams>("getParams");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAKeyPairGenerator.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAKeyPairGenerator.cs
index 49f3b55b2..cb1097d38 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAKeyPairGenerator.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAKeyPairGenerator.cs
@@ -64,7 +64,7 @@ public partial class DSAKeyPairGenerator : Java.Security.Interfaces.IDSAKeyPairG
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAKeyPairGenerator.html#initialize(int,boolean,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAKeyPairGenerator.html#initialize(int,boolean,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -75,7 +75,7 @@ public void Initialize(int arg0, bool arg1, Java.Security.SecureRandom arg2)
             IExecute("initialize", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAKeyPairGenerator.html#initialize(java.security.interfaces.DSAParams,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAKeyPairGenerator.html#initialize(java.security.interfaces.DSAParams,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Interfaces.DSAParams"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAParams.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAParams.cs
index 6890e662b..0c4d85fa6 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAParams.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAParams.cs
@@ -64,25 +64,28 @@ public partial class DSAParams : Java.Security.Interfaces.IDSAParams
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAParams.html#getG()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAParams.html#getG()"/>
         /// </summary>
-        public Java.Math.BigInteger G
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetG()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAParams.html#getP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAParams.html#getP()"/>
         /// </summary>
-        public Java.Math.BigInteger P
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAParams.html#getQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAParams.html#getQ()"/>
         /// </summary>
-        public Java.Math.BigInteger Q
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getQ", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAPrivateKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAPrivateKey.cs
index 96d89bc42..1da4bb070 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAPrivateKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAPrivateKey.cs
@@ -64,9 +64,8 @@ public partial class DSAPrivateKey : Java.Security.Interfaces.IDSAPrivateKey, Ja
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAPrivateKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAPrivateKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -79,11 +78,12 @@ public partial class DSAPrivateKey : Java.Security.Interfaces.IDSAPrivateKey, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAPrivateKey.html#getX()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAPrivateKey.html#getX()"/>
         /// </summary>
-        public Java.Math.BigInteger X
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetX()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getX", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getX", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAPublicKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAPublicKey.cs
index 8d72c4ef6..4c5aa704a 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAPublicKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/DSAPublicKey.cs
@@ -64,9 +64,8 @@ public partial class DSAPublicKey : Java.Security.Interfaces.IDSAPublicKey, Java
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAPublicKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAPublicKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -79,11 +78,12 @@ public partial class DSAPublicKey : Java.Security.Interfaces.IDSAPublicKey, Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/DSAPublicKey.html#getY()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/DSAPublicKey.html#getY()"/>
         /// </summary>
-        public Java.Math.BigInteger Y
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetY()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/ECKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/ECKey.cs
index d7d1df0c0..9688659e2 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/ECKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/ECKey.cs
@@ -64,11 +64,12 @@ public partial class ECKey : Java.Security.Interfaces.IECKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/ECKey.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/ECKey.html#getParams()"/>
         /// </summary>
-        public Java.Security.Spec.ECParameterSpec Params
+        /// <returns><see cref="Java.Security.Spec.ECParameterSpec"/></returns>
+        public Java.Security.Spec.ECParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.ECParameterSpec>("getParams", "()Ljava/security/spec/ECParameterSpec;"); }
+            return IExecuteWithSignature<Java.Security.Spec.ECParameterSpec>("getParams", "()Ljava/security/spec/ECParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/ECPrivateKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/ECPrivateKey.cs
index 82631347d..59e8f4ba1 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/ECPrivateKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/ECPrivateKey.cs
@@ -64,9 +64,8 @@ public partial class ECPrivateKey : Java.Security.Interfaces.IECPrivateKey, Java
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/ECPrivateKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/ECPrivateKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -79,11 +78,12 @@ public partial class ECPrivateKey : Java.Security.Interfaces.IECPrivateKey, Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/ECPrivateKey.html#getS()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/ECPrivateKey.html#getS()"/>
         /// </summary>
-        public Java.Math.BigInteger S
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetS()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getS", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getS", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/ECPublicKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/ECPublicKey.cs
index bf23a3a97..ba864ac19 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/ECPublicKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/ECPublicKey.cs
@@ -64,9 +64,8 @@ public partial class ECPublicKey : Java.Security.Interfaces.IECPublicKey, Java.S
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/ECPublicKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/ECPublicKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -79,11 +78,12 @@ public partial class ECPublicKey : Java.Security.Interfaces.IECPublicKey, Java.S
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/ECPublicKey.html#getW()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/ECPublicKey.html#getW()"/>
         /// </summary>
-        public Java.Security.Spec.ECPoint W
+        /// <returns><see cref="Java.Security.Spec.ECPoint"/></returns>
+        public Java.Security.Spec.ECPoint GetW()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.ECPoint>("getW", "()Ljava/security/spec/ECPoint;"); }
+            return IExecuteWithSignature<Java.Security.Spec.ECPoint>("getW", "()Ljava/security/spec/ECPoint;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/EdECPrivateKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/EdECPrivateKey.cs
deleted file mode 100644
index ab7ad2e5b..000000000
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/EdECPrivateKey.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Security.Interfaces
-{
-    #region IEdECPrivateKey
-    /// <summary>
-    /// .NET interface for TO BE DEFINED FROM USER
-    /// </summary>
-    public partial interface IEdECPrivateKey
-    {
-        #region Instance methods
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region EdECPrivateKey
-    public partial class EdECPrivateKey : Java.Security.Interfaces.IEdECPrivateKey, Java.Security.Interfaces.IEdECKey, Java.Security.IPrivateKey
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-        /// <summary>
-        /// Converter from <see cref="Java.Security.Interfaces.EdECPrivateKey"/> to <see cref="Java.Security.Interfaces.EdECKey"/>
-        /// </summary>
-        public static implicit operator Java.Security.Interfaces.EdECKey(Java.Security.Interfaces.EdECPrivateKey t) => t.Cast<Java.Security.Interfaces.EdECKey>();
-        /// <summary>
-        /// Converter from <see cref="Java.Security.Interfaces.EdECPrivateKey"/> to <see cref="Java.Security.PrivateKey"/>
-        /// </summary>
-        public static implicit operator Java.Security.PrivateKey(Java.Security.Interfaces.EdECPrivateKey t) => t.Cast<Java.Security.PrivateKey>();
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/EdECPrivateKey.html#getBytes()"/> 
-        /// </summary>
-        public Java.Util.Optional<byte[]> Bytes
-        {
-            get { return IExecuteWithSignature<Java.Util.Optional<byte[]>>("getBytes", "()Ljava/util/Optional;"); }
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/EdECPublicKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/EdECPublicKey.cs
deleted file mode 100644
index c308b87c8..000000000
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/EdECPublicKey.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Security.Interfaces
-{
-    #region IEdECPublicKey
-    /// <summary>
-    /// .NET interface for TO BE DEFINED FROM USER
-    /// </summary>
-    public partial interface IEdECPublicKey
-    {
-        #region Instance methods
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region EdECPublicKey
-    public partial class EdECPublicKey : Java.Security.Interfaces.IEdECPublicKey, Java.Security.Interfaces.IEdECKey, Java.Security.IPublicKey
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-        /// <summary>
-        /// Converter from <see cref="Java.Security.Interfaces.EdECPublicKey"/> to <see cref="Java.Security.Interfaces.EdECKey"/>
-        /// </summary>
-        public static implicit operator Java.Security.Interfaces.EdECKey(Java.Security.Interfaces.EdECPublicKey t) => t.Cast<Java.Security.Interfaces.EdECKey>();
-        /// <summary>
-        /// Converter from <see cref="Java.Security.Interfaces.EdECPublicKey"/> to <see cref="Java.Security.PublicKey"/>
-        /// </summary>
-        public static implicit operator Java.Security.PublicKey(Java.Security.Interfaces.EdECPublicKey t) => t.Cast<Java.Security.PublicKey>();
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/EdECPublicKey.html#getPoint()"/> 
-        /// </summary>
-        public Java.Security.Spec.EdECPoint Point
-        {
-            get { return IExecuteWithSignature<Java.Security.Spec.EdECPoint>("getPoint", "()Ljava/security/spec/EdECPoint;"); }
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAKey.cs
index cb17a8438..928551067 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAKey.cs
@@ -64,18 +64,20 @@ public partial class RSAKey : Java.Security.Interfaces.IRSAKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAKey.html#getModulus()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAKey.html#getModulus()"/>
         /// </summary>
-        public Java.Math.BigInteger Modulus
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetModulus()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getModulus", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getModulus", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAKey.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAKey.html#getParams()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec Params
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAMultiPrimePrivateCrtKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAMultiPrimePrivateCrtKey.cs
index 74956f9f6..399fb3071 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAMultiPrimePrivateCrtKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAMultiPrimePrivateCrtKey.cs
@@ -56,9 +56,8 @@ public partial class RSAMultiPrimePrivateCrtKey : Java.Security.Interfaces.IRSAM
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -71,53 +70,60 @@ public partial class RSAMultiPrimePrivateCrtKey : Java.Security.Interfaces.IRSAM
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getCrtCoefficient()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getCrtCoefficient()"/>
         /// </summary>
-        public Java.Math.BigInteger CrtCoefficient
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetCrtCoefficient()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getOtherPrimeInfo()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPrimeExponentP()"/>
         /// </summary>
-        public Java.Security.Spec.RSAOtherPrimeInfo[] OtherPrimeInfo
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeExponentP()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Spec.RSAOtherPrimeInfo>("getOtherPrimeInfo", "()[Ljava/security/spec/RSAOtherPrimeInfo;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPrimeExponentP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPrimeExponentQ()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeExponentP
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeExponentQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPrimeExponentQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPrimeP()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeExponentQ
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPrimeP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPrimeQ()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeP
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPrimeQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPublicExponent()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeQ
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPublicExponent()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getPublicExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAMultiPrimePrivateCrtKey.html#getOtherPrimeInfo()"/>
         /// </summary>
-        public Java.Math.BigInteger PublicExponent
+        /// <returns><see cref="Java.Security.Spec.RSAOtherPrimeInfo"/></returns>
+        public Java.Security.Spec.RSAOtherPrimeInfo[] GetOtherPrimeInfo()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignatureArray<Java.Security.Spec.RSAOtherPrimeInfo>("getOtherPrimeInfo", "()[Ljava/security/spec/RSAOtherPrimeInfo;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPrivateCrtKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPrivateCrtKey.cs
index 88e164078..4c8b600f5 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPrivateCrtKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPrivateCrtKey.cs
@@ -56,9 +56,8 @@ public partial class RSAPrivateCrtKey : Java.Security.Interfaces.IRSAPrivateCrtK
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateCrtKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -71,46 +70,52 @@ public partial class RSAPrivateCrtKey : Java.Security.Interfaces.IRSAPrivateCrtK
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateCrtKey.html#getCrtCoefficient()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html#getCrtCoefficient()"/>
         /// </summary>
-        public Java.Math.BigInteger CrtCoefficient
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetCrtCoefficient()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateCrtKey.html#getPrimeExponentP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html#getPrimeExponentP()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeExponentP
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeExponentP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateCrtKey.html#getPrimeExponentQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html#getPrimeExponentQ()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeExponentQ
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeExponentQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateCrtKey.html#getPrimeP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html#getPrimeP()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeP
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateCrtKey.html#getPrimeQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html#getPrimeQ()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeQ
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateCrtKey.html#getPublicExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateCrtKey.html#getPublicExponent()"/>
         /// </summary>
-        public Java.Math.BigInteger PublicExponent
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPublicExponent()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPrivateKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPrivateKey.cs
index fb0fe3526..743aeb9fc 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPrivateKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPrivateKey.cs
@@ -64,9 +64,8 @@ public partial class RSAPrivateKey : Java.Security.Interfaces.IRSAPrivateKey, Ja
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -79,11 +78,12 @@ public partial class RSAPrivateKey : Java.Security.Interfaces.IRSAPrivateKey, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPrivateKey.html#getPrivateExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPrivateKey.html#getPrivateExponent()"/>
         /// </summary>
-        public Java.Math.BigInteger PrivateExponent
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrivateExponent()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrivateExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrivateExponent", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPublicKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPublicKey.cs
index 886b87e69..b5b5c811d 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPublicKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/RSAPublicKey.cs
@@ -64,9 +64,8 @@ public partial class RSAPublicKey : Java.Security.Interfaces.IRSAPublicKey, Java
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPublicKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPublicKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -79,11 +78,12 @@ public partial class RSAPublicKey : Java.Security.Interfaces.IRSAPublicKey, Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/RSAPublicKey.html#getPublicExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/RSAPublicKey.html#getPublicExponent()"/>
         /// </summary>
-        public Java.Math.BigInteger PublicExponent
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPublicExponent()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/XECKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/XECKey.cs
index 841451f6c..dd12c4200 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/XECKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/XECKey.cs
@@ -64,11 +64,12 @@ public partial class XECKey : Java.Security.Interfaces.IXECKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/XECKey.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/XECKey.html#getParams()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec Params
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/XECPrivateKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/XECPrivateKey.cs
index 0e31d5fe9..d642c6101 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/XECPrivateKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/XECPrivateKey.cs
@@ -72,11 +72,12 @@ public partial class XECPrivateKey : Java.Security.Interfaces.IXECPrivateKey, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/XECPrivateKey.html#getScalar()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/XECPrivateKey.html#getScalar()"/>
         /// </summary>
-        public Java.Util.Optional<byte[]> Scalar
+        /// <returns><see cref="Java.Util.Optional"/></returns>
+        public Java.Util.Optional<byte[]> GetScalar()
         {
-            get { return IExecuteWithSignature<Java.Util.Optional<byte[]>>("getScalar", "()Ljava/util/Optional;"); }
+            return IExecuteWithSignature<Java.Util.Optional<byte[]>>("getScalar", "()Ljava/util/Optional;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Interfaces/XECPublicKey.cs b/src/net/Netdroid/Generated/Java/Security/Interfaces/XECPublicKey.cs
index 6f43bb874..8960f81fa 100644
--- a/src/net/Netdroid/Generated/Java/Security/Interfaces/XECPublicKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Interfaces/XECPublicKey.cs
@@ -72,11 +72,12 @@ public partial class XECPublicKey : Java.Security.Interfaces.IXECPublicKey, Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/interfaces/XECPublicKey.html#getU()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/interfaces/XECPublicKey.html#getU()"/>
         /// </summary>
-        public Java.Math.BigInteger U
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetU()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getU", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getU", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Key.cs b/src/net/Netdroid/Generated/Java/Security/Key.cs
index 868fcf983..dd2dc1c8e 100644
--- a/src/net/Netdroid/Generated/Java/Security/Key.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Key.cs
@@ -56,9 +56,8 @@ public partial class Key : Java.Security.IKey
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Key.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/Key.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -71,25 +70,28 @@ public partial class Key : Java.Security.IKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Key.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Key.html#getEncoded()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Key.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Key.html#getAlgorithm()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Key.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Key.html#getFormat()"/>
         /// </summary>
-        public Java.Lang.String Format
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFormat()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/KeyFactory.cs b/src/net/Netdroid/Generated/Java/Security/KeyFactory.cs
index 607bbdc3d..2b7143285 100644
--- a/src/net/Netdroid/Generated/Java/Security/KeyFactory.cs
+++ b/src/net/Netdroid/Generated/Java/Security/KeyFactory.cs
@@ -42,7 +42,7 @@ public partial class KeyFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Java.Security.KeyFactory GetInstance(Java.Lang.String arg0, Java.L
             return SExecute<Java.Security.KeyFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Java.Security.KeyFactory GetInstance(Java.Lang.String arg0, Java.S
             return SExecute<Java.Security.KeyFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.KeyFactory"/></returns>
@@ -79,33 +79,27 @@ public static Java.Security.KeyFactory GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#getAlgorithm()"/> 
-        /// </summary>
-        public Java.Lang.String Algorithm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#getProvider()"/> 
-        /// </summary>
-        public Java.Security.Provider Provider
-        {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#getKeySpec(java.security.Key,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#getKeySpec(java.security.Key,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Security.Spec.IKeySpec"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Security.Spec.InvalidKeySpecException"/>
-        public T GetKeySpec<T>(Java.Security.Key arg0, Java.Lang.Class arg1) where T: Java.Security.Spec.IKeySpec, new()
+        public T GetKeySpec<T>(Java.Security.Key arg0, Java.Lang.Class arg1) where T : Java.Security.Spec.IKeySpec, new()
         {
             return IExecute<T>("getKeySpec", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#translateKey(java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#getAlgorithm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#translateKey(java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <returns><see cref="Java.Security.Key"/></returns>
@@ -115,7 +109,7 @@ public Java.Security.Key TranslateKey(Java.Security.Key arg0)
             return IExecuteWithSignature<Java.Security.Key>("translateKey", "(Ljava/security/Key;)Ljava/security/Key;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#generatePrivate(java.security.spec.KeySpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#generatePrivate(java.security.spec.KeySpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.KeySpec"/></param>
         /// <returns><see cref="Java.Security.PrivateKey"/></returns>
@@ -125,7 +119,15 @@ public Java.Security.PrivateKey GeneratePrivate(Java.Security.Spec.KeySpec arg0)
             return IExecuteWithSignature<Java.Security.PrivateKey>("generatePrivate", "(Ljava/security/spec/KeySpec;)Ljava/security/PrivateKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyFactory.html#generatePublic(java.security.spec.KeySpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/KeyFactory.html#generatePublic(java.security.spec.KeySpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.KeySpec"/></param>
         /// <returns><see cref="Java.Security.PublicKey"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Security/KeyPair.cs b/src/net/Netdroid/Generated/Java/Security/KeyPair.cs
index cb66c37ed..313d69900 100644
--- a/src/net/Netdroid/Generated/Java/Security/KeyPair.cs
+++ b/src/net/Netdroid/Generated/Java/Security/KeyPair.cs
@@ -30,7 +30,7 @@ public partial class KeyPair
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPair.html#%3Cinit%3E(java.security.PublicKey,java.security.PrivateKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPair.html#%3Cinit%3E(java.security.PublicKey,java.security.PrivateKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <param name="arg1"><see cref="Java.Security.PrivateKey"/></param>
@@ -55,18 +55,20 @@ public KeyPair(Java.Security.PublicKey arg0, Java.Security.PrivateKey arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPair.html#getPrivate()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/KeyPair.html#getPrivate()"/>
         /// </summary>
-        public Java.Security.PrivateKey Private
+        /// <returns><see cref="Java.Security.PrivateKey"/></returns>
+        public Java.Security.PrivateKey GetPrivate()
         {
-            get { return IExecuteWithSignature<Java.Security.PrivateKey>("getPrivate", "()Ljava/security/PrivateKey;"); }
+            return IExecuteWithSignature<Java.Security.PrivateKey>("getPrivate", "()Ljava/security/PrivateKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPair.html#getPublic()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/KeyPair.html#getPublic()"/>
         /// </summary>
-        public Java.Security.PublicKey Public
+        /// <returns><see cref="Java.Security.PublicKey"/></returns>
+        public Java.Security.PublicKey GetPublic()
         {
-            get { return IExecuteWithSignature<Java.Security.PublicKey>("getPublic", "()Ljava/security/PublicKey;"); }
+            return IExecuteWithSignature<Java.Security.PublicKey>("getPublic", "()Ljava/security/PublicKey;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/KeyPairGenerator.cs b/src/net/Netdroid/Generated/Java/Security/KeyPairGenerator.cs
index 5370e06cf..1c1fc61fe 100644
--- a/src/net/Netdroid/Generated/Java/Security/KeyPairGenerator.cs
+++ b/src/net/Netdroid/Generated/Java/Security/KeyPairGenerator.cs
@@ -42,7 +42,7 @@ public partial class KeyPairGenerator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Java.Security.KeyPairGenerator GetInstance(Java.Lang.String arg0,
             return SExecute<Java.Security.KeyPairGenerator>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Java.Security.KeyPairGenerator GetInstance(Java.Lang.String arg0,
             return SExecute<Java.Security.KeyPairGenerator>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.KeyPairGenerator"/></returns>
@@ -79,29 +79,31 @@ public static Java.Security.KeyPairGenerator GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html#genKeyPair()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Security.KeyPair"/></returns>
+        public Java.Security.KeyPair GenKeyPair()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Security.KeyPair>("genKeyPair", "()Ljava/security/KeyPair;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html#getProvider()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html#genKeyPair()"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html#getAlgorithm()"/>
         /// </summary>
-        /// <returns><see cref="Java.Security.KeyPair"/></returns>
-        public Java.Security.KeyPair GenKeyPair()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            return IExecuteWithSignature<Java.Security.KeyPair>("genKeyPair", "()Ljava/security/KeyPair;");
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html#initialize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html#initialize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Initialize(int arg0)
@@ -109,7 +111,7 @@ public void Initialize(int arg0)
             IExecuteWithSignature("initialize", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGenerator.html#initialize(java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGenerator.html#initialize(java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/KeyPairGeneratorSpi.cs b/src/net/Netdroid/Generated/Java/Security/KeyPairGeneratorSpi.cs
index 3c1084bd5..b9a7225ee 100644
--- a/src/net/Netdroid/Generated/Java/Security/KeyPairGeneratorSpi.cs
+++ b/src/net/Netdroid/Generated/Java/Security/KeyPairGeneratorSpi.cs
@@ -46,7 +46,7 @@ public partial class KeyPairGeneratorSpi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGeneratorSpi.html#generateKeyPair()"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGeneratorSpi.html#generateKeyPair()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.KeyPair"/></returns>
         public Java.Security.KeyPair GenerateKeyPair()
@@ -54,7 +54,7 @@ public Java.Security.KeyPair GenerateKeyPair()
             return IExecuteWithSignature<Java.Security.KeyPair>("generateKeyPair", "()Ljava/security/KeyPair;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGeneratorSpi.html#initialize(int,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGeneratorSpi.html#initialize(int,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
@@ -63,7 +63,7 @@ public void Initialize(int arg0, Java.Security.SecureRandom arg1)
             IExecute("initialize", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyPairGeneratorSpi.html#initialize(java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyPairGeneratorSpi.html#initialize(java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/KeyRep.cs b/src/net/Netdroid/Generated/Java/Security/KeyRep.cs
index 2a2ec8687..16bbc8618 100644
--- a/src/net/Netdroid/Generated/Java/Security/KeyRep.cs
+++ b/src/net/Netdroid/Generated/Java/Security/KeyRep.cs
@@ -30,7 +30,7 @@ public partial class KeyRep
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyRep.html#%3Cinit%3E(java.security.KeyRep.Type,java.lang.String,java.lang.String,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyRep.html#%3Cinit%3E(java.security.KeyRep.Type,java.lang.String,java.lang.String,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyRep.Type"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -73,19 +73,19 @@ public partial class Type
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyRep.Type.html#PRIVATE"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyRep.Type.html#PRIVATE"/>
             /// </summary>
             public static Java.Security.KeyRep.Type PRIVATE { get { if (!_PRIVATEReady) { _PRIVATEContent = SGetField<Java.Security.KeyRep.Type>(LocalBridgeClazz, "PRIVATE"); _PRIVATEReady = true; } return _PRIVATEContent; } }
             private static Java.Security.KeyRep.Type _PRIVATEContent = default;
             private static bool _PRIVATEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyRep.Type.html#PUBLIC"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyRep.Type.html#PUBLIC"/>
             /// </summary>
             public static Java.Security.KeyRep.Type PUBLIC { get { if (!_PUBLICReady) { _PUBLICContent = SGetField<Java.Security.KeyRep.Type>(LocalBridgeClazz, "PUBLIC"); _PUBLICReady = true; } return _PUBLICContent; } }
             private static Java.Security.KeyRep.Type _PUBLICContent = default;
             private static bool _PUBLICReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyRep.Type.html#SECRET"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyRep.Type.html#SECRET"/>
             /// </summary>
             public static Java.Security.KeyRep.Type SECRET { get { if (!_SECRETReady) { _SECRETContent = SGetField<Java.Security.KeyRep.Type>(LocalBridgeClazz, "SECRET"); _SECRETReady = true; } return _SECRETContent; } }
             private static Java.Security.KeyRep.Type _SECRETContent = default;
@@ -95,7 +95,7 @@ public partial class Type
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyRep.Type.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyRep.Type.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Security.KeyRep.Type"/></returns>
@@ -104,7 +104,7 @@ public static Java.Security.KeyRep.Type ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Security.KeyRep.Type>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/security/KeyRep$Type;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyRep.Type.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyRep.Type.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Security.KeyRep.Type"/></returns>
             public static Java.Security.KeyRep.Type[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Security/KeyStore.cs b/src/net/Netdroid/Generated/Java/Security/KeyStore.cs
index cab25ce8a..bab81a995 100644
--- a/src/net/Netdroid/Generated/Java/Security/KeyStore.cs
+++ b/src/net/Netdroid/Generated/Java/Security/KeyStore.cs
@@ -42,14 +42,15 @@ public partial class KeyStore
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getDefaultType()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getDefaultType()"/>
         /// </summary>
-        public static Java.Lang.String DefaultType
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetDefaultType()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultType", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getInstance(java.io.File,char[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getInstance(java.io.File,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -63,7 +64,7 @@ public static Java.Security.KeyStore GetInstance(Java.Io.File arg0, char[] arg1)
             return SExecute<Java.Security.KeyStore>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getInstance(java.io.File,java.security.KeyStore.LoadStoreParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getInstance(java.io.File,java.security.KeyStore.LoadStoreParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Security.KeyStore.LoadStoreParameter"/></param>
@@ -77,7 +78,7 @@ public static Java.Security.KeyStore GetInstance(Java.Io.File arg0, Java.Securit
             return SExecute<Java.Security.KeyStore>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -89,7 +90,7 @@ public static Java.Security.KeyStore GetInstance(Java.Lang.String arg0, Java.Lan
             return SExecute<Java.Security.KeyStore>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -100,7 +101,7 @@ public static Java.Security.KeyStore GetInstance(Java.Lang.String arg0, Java.Sec
             return SExecute<Java.Security.KeyStore>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.KeyStore"/></returns>
@@ -114,21 +115,7 @@ public static Java.Security.KeyStore GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getProvider()"/> 
-        /// </summary>
-        public Java.Security.Provider Provider
-        {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#containsAlias(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#containsAlias(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -138,7 +125,7 @@ public bool ContainsAlias(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("containsAlias", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#entryInstanceOf(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#entryInstanceOf(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -149,7 +136,7 @@ public bool EntryInstanceOf(Java.Lang.String arg0, Java.Lang.Class arg1)
             return IExecute<bool>("entryInstanceOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#isCertificateEntry(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#isCertificateEntry(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -159,7 +146,7 @@ public bool IsCertificateEntry(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isCertificateEntry", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#isKeyEntry(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#isKeyEntry(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -169,7 +156,7 @@ public bool IsKeyEntry(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isKeyEntry", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Security.KeyStoreException"/>
@@ -178,7 +165,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getCertificateAlias(java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getCertificateAlias(java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -188,7 +175,15 @@ public Java.Lang.String GetCertificateAlias(Java.Security.Cert.Certificate arg0)
             return IExecuteWithSignature<Java.Lang.String>("getCertificateAlias", "(Ljava/security/cert/Certificate;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getCertificate(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getCertificate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
@@ -198,7 +193,7 @@ public Java.Security.Cert.Certificate GetCertificate(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Security.Cert.Certificate>("getCertificate", "(Ljava/lang/String;)Ljava/security/cert/Certificate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getCertificateChain(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getCertificateChain(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
@@ -208,7 +203,7 @@ public Java.Security.Cert.Certificate[] GetCertificateChain(Java.Lang.String arg
             return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificateChain", "(Ljava/lang/String;)[Ljava/security/cert/Certificate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getKey(java.lang.String,char[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getKey(java.lang.String,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -221,7 +216,7 @@ public Java.Security.Key GetKey(Java.Lang.String arg0, char[] arg1)
             return IExecute<Java.Security.Key>("getKey", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getEntry(java.lang.String,java.security.KeyStore.ProtectionParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getEntry(java.lang.String,java.security.KeyStore.ProtectionParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.KeyStore.ProtectionParameter"/></param>
@@ -234,7 +229,15 @@ public Java.Security.KeyStore.Entry GetEntry(Java.Lang.String arg0, Java.Securit
             return IExecute<Java.Security.KeyStore.Entry>("getEntry", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#getCreationDate(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#getCreationDate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Date"/></returns>
@@ -244,7 +247,7 @@ public Java.Util.Date GetCreationDate(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Date>("getCreationDate", "(Ljava/lang/String;)Ljava/util/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#aliases()"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#aliases()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         /// <exception cref="Java.Security.KeyStoreException"/>
@@ -253,7 +256,7 @@ public Java.Util.Date GetCreationDate(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("aliases", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#deleteEntry(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#deleteEntry(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Security.KeyStoreException"/>
@@ -262,7 +265,7 @@ public void DeleteEntry(Java.Lang.String arg0)
             IExecuteWithSignature("deleteEntry", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#load(java.io.InputStream,char[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#load(java.io.InputStream,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -274,7 +277,7 @@ public void Load(Java.Io.InputStream arg0, char[] arg1)
             IExecute("load", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#load(java.security.KeyStore.LoadStoreParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#load(java.security.KeyStore.LoadStoreParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore.LoadStoreParameter"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -285,7 +288,7 @@ public void Load(Java.Security.KeyStore.LoadStoreParameter arg0)
             IExecuteWithSignature("load", "(Ljava/security/KeyStore$LoadStoreParameter;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#setCertificateEntry(java.lang.String,java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#setCertificateEntry(java.lang.String,java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.Certificate"/></param>
@@ -295,7 +298,7 @@ public void SetCertificateEntry(Java.Lang.String arg0, Java.Security.Cert.Certif
             IExecute("setCertificateEntry", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#setEntry(java.lang.String,java.security.KeyStore.Entry,java.security.KeyStore.ProtectionParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#setEntry(java.lang.String,java.security.KeyStore.Entry,java.security.KeyStore.ProtectionParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.KeyStore.Entry"/></param>
@@ -306,7 +309,7 @@ public void SetEntry(Java.Lang.String arg0, Java.Security.KeyStore.Entry arg1, J
             IExecute("setEntry", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#setKeyEntry(java.lang.String,byte[],java.security.cert.Certificate[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#setKeyEntry(java.lang.String,byte[],java.security.cert.Certificate[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -317,7 +320,7 @@ public void SetKeyEntry(Java.Lang.String arg0, byte[] arg1, Java.Security.Cert.C
             IExecute("setKeyEntry", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#setKeyEntry(java.lang.String,java.security.Key,char[],java.security.cert.Certificate[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#setKeyEntry(java.lang.String,java.security.Key,char[],java.security.cert.Certificate[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
@@ -329,7 +332,7 @@ public void SetKeyEntry(Java.Lang.String arg0, Java.Security.Key arg1, char[] ar
             IExecute("setKeyEntry", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#store(java.io.OutputStream,char[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#store(java.io.OutputStream,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -342,7 +345,7 @@ public void Store(Java.Io.OutputStream arg0, char[] arg1)
             IExecute("store", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.html#store(java.security.KeyStore.LoadStoreParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStore.html#store(java.security.KeyStore.LoadStoreParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore.LoadStoreParameter"/></param>
         /// <exception cref="Java.Security.KeyStoreException"/>
@@ -374,7 +377,7 @@ public partial class Builder
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Builder.html#newInstance(java.io.File,java.security.KeyStore.ProtectionParameter)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.Builder.html#newInstance(java.io.File,java.security.KeyStore.ProtectionParameter)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Io.File"/></param>
             /// <param name="arg1"><see cref="Java.Security.KeyStore.ProtectionParameter"/></param>
@@ -384,7 +387,7 @@ public static Java.Security.KeyStore.Builder NewInstance(Java.Io.File arg0, Java
                 return SExecute<Java.Security.KeyStore.Builder>(LocalBridgeClazz, "newInstance", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Builder.html#newInstance(java.lang.String,java.security.Provider,java.io.File,java.security.KeyStore.ProtectionParameter)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.Builder.html#newInstance(java.lang.String,java.security.Provider,java.io.File,java.security.KeyStore.ProtectionParameter)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -396,7 +399,7 @@ public static Java.Security.KeyStore.Builder NewInstance(Java.Lang.String arg0,
                 return SExecute<Java.Security.KeyStore.Builder>(LocalBridgeClazz, "newInstance", arg0, arg1, arg2, arg3);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Builder.html#newInstance(java.lang.String,java.security.Provider,java.security.KeyStore.ProtectionParameter)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.Builder.html#newInstance(java.lang.String,java.security.Provider,java.security.KeyStore.ProtectionParameter)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -407,7 +410,7 @@ public static Java.Security.KeyStore.Builder NewInstance(Java.Lang.String arg0,
                 return SExecute<Java.Security.KeyStore.Builder>(LocalBridgeClazz, "newInstance", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Builder.html#newInstance(java.security.KeyStore,java.security.KeyStore.ProtectionParameter)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.Builder.html#newInstance(java.security.KeyStore,java.security.KeyStore.ProtectionParameter)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Security.KeyStore"/></param>
             /// <param name="arg1"><see cref="Java.Security.KeyStore.ProtectionParameter"/></param>
@@ -421,14 +424,16 @@ public static Java.Security.KeyStore.Builder NewInstance(Java.Security.KeyStore
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Builder.html#getKeyStore()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.Builder.html#getKeyStore()"/>
             /// </summary>
-            public Java.Security.KeyStore GetKeyStore
+            /// <returns><see cref="Java.Security.KeyStore"/></returns>
+            /// <exception cref="Java.Security.KeyStoreException"/>
+            public Java.Security.KeyStore GetKeyStore()
             {
-                get { return IExecuteWithSignature<Java.Security.KeyStore>("getKeyStore", "()Ljava/security/KeyStore;"); }
+                return IExecuteWithSignature<Java.Security.KeyStore>("getKeyStore", "()Ljava/security/KeyStore;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Builder.html#getProtectionParameter(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.Builder.html#getProtectionParameter(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Security.KeyStore.ProtectionParameter"/></returns>
@@ -453,7 +458,7 @@ public partial class CallbackHandlerProtection
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.CallbackHandlerProtection.html#%3Cinit%3E(javax.security.auth.callback.CallbackHandler)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.CallbackHandlerProtection.html#%3Cinit%3E(javax.security.auth.callback.CallbackHandler)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Javax.Security.Auth.Callback.CallbackHandler"/></param>
             public CallbackHandlerProtection(Javax.Security.Auth.Callback.CallbackHandler arg0)
@@ -477,11 +482,12 @@ public CallbackHandlerProtection(Javax.Security.Auth.Callback.CallbackHandler ar
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.CallbackHandlerProtection.html#getCallbackHandler()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.CallbackHandlerProtection.html#getCallbackHandler()"/>
             /// </summary>
-            public Javax.Security.Auth.Callback.CallbackHandler CallbackHandler
+            /// <returns><see cref="Javax.Security.Auth.Callback.CallbackHandler"/></returns>
+            public Javax.Security.Auth.Callback.CallbackHandler GetCallbackHandler()
             {
-                get { return IExecuteWithSignature<Javax.Security.Auth.Callback.CallbackHandler>("getCallbackHandler", "()Ljavax/security/auth/callback/CallbackHandler;"); }
+                return IExecuteWithSignature<Javax.Security.Auth.Callback.CallbackHandler>("getCallbackHandler", "()Ljavax/security/auth/callback/CallbackHandler;");
             }
 
             #endregion
@@ -515,11 +521,12 @@ public partial class Entry
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Entry.html#getAttributes()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.Entry.html#getAttributes()"/>
             /// </summary>
-            public Java.Util.Set<Java.Security.KeyStore.Entry.Attribute> Attributes
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Java.Security.KeyStore.Entry.Attribute> GetAttributes()
             {
-                get { return IExecuteWithSignature<Java.Util.Set<Java.Security.KeyStore.Entry.Attribute>>("getAttributes", "()Ljava/util/Set;"); }
+                return IExecuteWithSignature<Java.Util.Set<Java.Security.KeyStore.Entry.Attribute>>("getAttributes", "()Ljava/util/Set;");
             }
 
             #endregion
@@ -546,18 +553,20 @@ public partial class Attribute
 
                 #region Instance methods
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Entry.Attribute.html#getName()"/> 
+                /// <see href="https://developer.android.com/reference/java/security/KeyStore.Entry.Attribute.html#getName()"/>
                 /// </summary>
-                public Java.Lang.String Name
+                /// <returns><see cref="Java.Lang.String"/></returns>
+                public Java.Lang.String GetName()
                 {
-                    get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+                    return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
                 }
                 /// <summary>
-                /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.Entry.Attribute.html#getValue()"/> 
+                /// <see href="https://developer.android.com/reference/java/security/KeyStore.Entry.Attribute.html#getValue()"/>
                 /// </summary>
-                public Java.Lang.String Value
+                /// <returns><see cref="Java.Lang.String"/></returns>
+                public Java.Lang.String GetValue()
                 {
-                    get { return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;"); }
+                    return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;");
                 }
 
                 #endregion
@@ -598,11 +607,12 @@ public partial class LoadStoreParameter
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.LoadStoreParameter.html#getProtectionParameter()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.LoadStoreParameter.html#getProtectionParameter()"/>
             /// </summary>
-            public Java.Security.KeyStore.ProtectionParameter GetProtectionParameter
+            /// <returns><see cref="Java.Security.KeyStore.ProtectionParameter"/></returns>
+            public Java.Security.KeyStore.ProtectionParameter GetProtectionParameter()
             {
-                get { return IExecuteWithSignature<Java.Security.KeyStore.ProtectionParameter>("getProtectionParameter", "()Ljava/security/KeyStore$ProtectionParameter;"); }
+                return IExecuteWithSignature<Java.Security.KeyStore.ProtectionParameter>("getProtectionParameter", "()Ljava/security/KeyStore$ProtectionParameter;");
             }
 
             #endregion
@@ -620,7 +630,7 @@ public partial class PasswordProtection : Javax.Security.Auth.IDestroyable
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PasswordProtection.html#%3Cinit%3E(char[],java.lang.String,java.security.spec.AlgorithmParameterSpec)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html#%3Cinit%3E(char[],java.lang.String,java.security.spec.AlgorithmParameterSpec)"/>
             /// </summary>
             /// <param name="arg0"><see cref="char"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -630,7 +640,7 @@ public PasswordProtection(char[] arg0, Java.Lang.String arg1, Java.Security.Spec
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PasswordProtection.html#%3Cinit%3E(char[])"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html#%3Cinit%3E(char[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="char"/></param>
             public PasswordProtection(char[] arg0)
@@ -658,36 +668,39 @@ public PasswordProtection(char[] arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PasswordProtection.html#getPassword()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html#getProtectionAlgorithm()"/>
             /// </summary>
-            public char[] Password
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetProtectionAlgorithm()
             {
-                get { return IExecuteWithSignatureArray<char>("getPassword", "()[C"); }
+                return IExecuteWithSignature<Java.Lang.String>("getProtectionAlgorithm", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PasswordProtection.html#getProtectionAlgorithm()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html#getProtectionParameters()"/>
             /// </summary>
-            public Java.Lang.String ProtectionAlgorithm
+            /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+            public Java.Security.Spec.AlgorithmParameterSpec GetProtectionParameters()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getProtectionAlgorithm", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getProtectionParameters", "()Ljava/security/spec/AlgorithmParameterSpec;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PasswordProtection.html#getProtectionParameters()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html#isDestroyed()"/>
             /// </summary>
-            public Java.Security.Spec.AlgorithmParameterSpec ProtectionParameters
+            /// <returns><see cref="bool"/></returns>
+            public bool IsDestroyed()
             {
-                get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getProtectionParameters", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+                return IExecuteWithSignature<bool>("isDestroyed", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PasswordProtection.html#isDestroyed()"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html#getPassword()"/>
             /// </summary>
-            /// <returns><see cref="bool"/></returns>
-            public bool IsDestroyed()
+            /// <returns><see cref="char"/></returns>
+            public char[] GetPassword()
             {
-                return IExecuteWithSignature<bool>("isDestroyed", "()Z");
+                return IExecuteWithSignatureArray<char>("getPassword", "()[C");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PasswordProtection.html#destroy()"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PasswordProtection.html#destroy()"/>
             /// </summary>
             /// <exception cref="Javax.Security.Auth.DestroyFailedException"/>
             public void Destroy()
@@ -710,7 +723,7 @@ public partial class PrivateKeyEntry
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PrivateKeyEntry.html#%3Cinit%3E(java.security.PrivateKey,java.security.cert.Certificate[],java.util.Set)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PrivateKeyEntry.html#%3Cinit%3E(java.security.PrivateKey,java.security.cert.Certificate[],java.util.Set)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Security.PrivateKey"/></param>
             /// <param name="arg1"><see cref="Java.Security.Cert.Certificate"/></param>
@@ -720,7 +733,7 @@ public PrivateKeyEntry(Java.Security.PrivateKey arg0, Java.Security.Cert.Certifi
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PrivateKeyEntry.html#%3Cinit%3E(java.security.PrivateKey,java.security.cert.Certificate[])"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PrivateKeyEntry.html#%3Cinit%3E(java.security.PrivateKey,java.security.cert.Certificate[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Security.PrivateKey"/></param>
             /// <param name="arg1"><see cref="Java.Security.Cert.Certificate"/></param>
@@ -745,32 +758,36 @@ public PrivateKeyEntry(Java.Security.PrivateKey arg0, Java.Security.Cert.Certifi
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PrivateKeyEntry.html#getAttributes()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PrivateKeyEntry.html#getCertificate()"/>
             /// </summary>
-            public Java.Util.Set<Java.Security.KeyStore.Entry.Attribute> Attributes
+            /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+            public Java.Security.Cert.Certificate GetCertificate()
             {
-                get { return IExecuteWithSignature<Java.Util.Set<Java.Security.KeyStore.Entry.Attribute>>("getAttributes", "()Ljava/util/Set;"); }
+                return IExecuteWithSignature<Java.Security.Cert.Certificate>("getCertificate", "()Ljava/security/cert/Certificate;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PrivateKeyEntry.html#getCertificate()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PrivateKeyEntry.html#getCertificateChain()"/>
             /// </summary>
-            public Java.Security.Cert.Certificate Certificate
+            /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+            public Java.Security.Cert.Certificate[] GetCertificateChain()
             {
-                get { return IExecuteWithSignature<Java.Security.Cert.Certificate>("getCertificate", "()Ljava/security/cert/Certificate;"); }
+                return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificateChain", "()[Ljava/security/cert/Certificate;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PrivateKeyEntry.html#getCertificateChain()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PrivateKeyEntry.html#getPrivateKey()"/>
             /// </summary>
-            public Java.Security.Cert.Certificate[] CertificateChain
+            /// <returns><see cref="Java.Security.PrivateKey"/></returns>
+            public Java.Security.PrivateKey GetPrivateKey()
             {
-                get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificateChain", "()[Ljava/security/cert/Certificate;"); }
+                return IExecuteWithSignature<Java.Security.PrivateKey>("getPrivateKey", "()Ljava/security/PrivateKey;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.PrivateKeyEntry.html#getPrivateKey()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.PrivateKeyEntry.html#getAttributes()"/>
             /// </summary>
-            public Java.Security.PrivateKey PrivateKey
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Java.Security.KeyStore.Entry.Attribute> GetAttributes()
             {
-                get { return IExecuteWithSignature<Java.Security.PrivateKey>("getPrivateKey", "()Ljava/security/PrivateKey;"); }
+                return IExecuteWithSignature<Java.Util.Set<Java.Security.KeyStore.Entry.Attribute>>("getAttributes", "()Ljava/util/Set;");
             }
 
             #endregion
@@ -819,7 +836,7 @@ public partial class SecretKeyEntry
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.SecretKeyEntry.html#%3Cinit%3E(javax.crypto.SecretKey,java.util.Set)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.SecretKeyEntry.html#%3Cinit%3E(javax.crypto.SecretKey,java.util.Set)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Javax.Crypto.SecretKey"/></param>
             /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -828,7 +845,7 @@ public SecretKeyEntry(Javax.Crypto.SecretKey arg0, Java.Util.Set<Java.Security.K
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.SecretKeyEntry.html#%3Cinit%3E(javax.crypto.SecretKey)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.SecretKeyEntry.html#%3Cinit%3E(javax.crypto.SecretKey)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Javax.Crypto.SecretKey"/></param>
             public SecretKeyEntry(Javax.Crypto.SecretKey arg0)
@@ -852,18 +869,20 @@ public SecretKeyEntry(Javax.Crypto.SecretKey arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.SecretKeyEntry.html#getAttributes()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.SecretKeyEntry.html#getAttributes()"/>
             /// </summary>
-            public Java.Util.Set<Java.Security.KeyStore.Entry.Attribute> Attributes
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Java.Security.KeyStore.Entry.Attribute> GetAttributes()
             {
-                get { return IExecuteWithSignature<Java.Util.Set<Java.Security.KeyStore.Entry.Attribute>>("getAttributes", "()Ljava/util/Set;"); }
+                return IExecuteWithSignature<Java.Util.Set<Java.Security.KeyStore.Entry.Attribute>>("getAttributes", "()Ljava/util/Set;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.SecretKeyEntry.html#getSecretKey()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.SecretKeyEntry.html#getSecretKey()"/>
             /// </summary>
-            public Javax.Crypto.SecretKey SecretKey
+            /// <returns><see cref="Javax.Crypto.SecretKey"/></returns>
+            public Javax.Crypto.SecretKey GetSecretKey()
             {
-                get { return IExecuteWithSignature<Javax.Crypto.SecretKey>("getSecretKey", "()Ljavax/crypto/SecretKey;"); }
+                return IExecuteWithSignature<Javax.Crypto.SecretKey>("getSecretKey", "()Ljavax/crypto/SecretKey;");
             }
 
             #endregion
@@ -881,7 +900,7 @@ public partial class TrustedCertificateEntry
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.TrustedCertificateEntry.html#%3Cinit%3E(java.security.cert.Certificate,java.util.Set)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.TrustedCertificateEntry.html#%3Cinit%3E(java.security.cert.Certificate,java.util.Set)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
             /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -890,7 +909,7 @@ public TrustedCertificateEntry(Java.Security.Cert.Certificate arg0, Java.Util.Se
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.TrustedCertificateEntry.html#%3Cinit%3E(java.security.cert.Certificate)"/>
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.TrustedCertificateEntry.html#%3Cinit%3E(java.security.cert.Certificate)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
             public TrustedCertificateEntry(Java.Security.Cert.Certificate arg0)
@@ -914,18 +933,20 @@ public TrustedCertificateEntry(Java.Security.Cert.Certificate arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.TrustedCertificateEntry.html#getAttributes()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.TrustedCertificateEntry.html#getTrustedCertificate()"/>
             /// </summary>
-            public Java.Util.Set<Java.Security.KeyStore.Entry.Attribute> Attributes
+            /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+            public Java.Security.Cert.Certificate GetTrustedCertificate()
             {
-                get { return IExecuteWithSignature<Java.Util.Set<Java.Security.KeyStore.Entry.Attribute>>("getAttributes", "()Ljava/util/Set;"); }
+                return IExecuteWithSignature<Java.Security.Cert.Certificate>("getTrustedCertificate", "()Ljava/security/cert/Certificate;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStore.TrustedCertificateEntry.html#getTrustedCertificate()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/KeyStore.TrustedCertificateEntry.html#getAttributes()"/>
             /// </summary>
-            public Java.Security.Cert.Certificate TrustedCertificate
+            /// <returns><see cref="Java.Util.Set"/></returns>
+            public Java.Util.Set<Java.Security.KeyStore.Entry.Attribute> GetAttributes()
             {
-                get { return IExecuteWithSignature<Java.Security.Cert.Certificate>("getTrustedCertificate", "()Ljava/security/cert/Certificate;"); }
+                return IExecuteWithSignature<Java.Util.Set<Java.Security.KeyStore.Entry.Attribute>>("getAttributes", "()Ljava/util/Set;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/KeyStoreSpi.cs b/src/net/Netdroid/Generated/Java/Security/KeyStoreSpi.cs
index a0aa8e1f4..33a53ecfa 100644
--- a/src/net/Netdroid/Generated/Java/Security/KeyStoreSpi.cs
+++ b/src/net/Netdroid/Generated/Java/Security/KeyStoreSpi.cs
@@ -46,7 +46,7 @@ public partial class KeyStoreSpi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineContainsAlias(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineContainsAlias(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -55,7 +55,7 @@ public bool EngineContainsAlias(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("engineContainsAlias", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineIsCertificateEntry(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineIsCertificateEntry(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -64,7 +64,7 @@ public bool EngineIsCertificateEntry(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("engineIsCertificateEntry", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineIsKeyEntry(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineIsKeyEntry(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -73,7 +73,7 @@ public bool EngineIsKeyEntry(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("engineIsKeyEntry", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineSize()"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineSize()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int EngineSize()
@@ -81,7 +81,7 @@ public int EngineSize()
             return IExecuteWithSignature<int>("engineSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineGetCertificateAlias(java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineGetCertificateAlias(java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -90,7 +90,7 @@ public Java.Lang.String EngineGetCertificateAlias(Java.Security.Cert.Certificate
             return IExecuteWithSignature<Java.Lang.String>("engineGetCertificateAlias", "(Ljava/security/cert/Certificate;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineGetCertificate(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineGetCertificate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
@@ -99,7 +99,7 @@ public Java.Security.Cert.Certificate EngineGetCertificate(Java.Lang.String arg0
             return IExecuteWithSignature<Java.Security.Cert.Certificate>("engineGetCertificate", "(Ljava/lang/String;)Ljava/security/cert/Certificate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineGetCertificateChain(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineGetCertificateChain(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
@@ -108,7 +108,7 @@ public Java.Security.Cert.Certificate[] EngineGetCertificateChain(Java.Lang.Stri
             return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("engineGetCertificateChain", "(Ljava/lang/String;)[Ljava/security/cert/Certificate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineGetKey(java.lang.String,char[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineGetKey(java.lang.String,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -120,7 +120,7 @@ public Java.Security.Key EngineGetKey(Java.Lang.String arg0, char[] arg1)
             return IExecute<Java.Security.Key>("engineGetKey", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineGetCreationDate(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineGetCreationDate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Date"/></returns>
@@ -129,7 +129,7 @@ public Java.Util.Date EngineGetCreationDate(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Date>("engineGetCreationDate", "(Ljava/lang/String;)Ljava/util/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineAliases()"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineAliases()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<Java.Lang.String> EngineAliases()
@@ -137,7 +137,7 @@ public Java.Util.Date EngineGetCreationDate(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("engineAliases", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineDeleteEntry(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineDeleteEntry(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Security.KeyStoreException"/>
@@ -146,7 +146,7 @@ public void EngineDeleteEntry(Java.Lang.String arg0)
             IExecuteWithSignature("engineDeleteEntry", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineLoad(java.io.InputStream,char[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineLoad(java.io.InputStream,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -158,7 +158,7 @@ public void EngineLoad(Java.Io.InputStream arg0, char[] arg1)
             IExecute("engineLoad", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineSetCertificateEntry(java.lang.String,java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineSetCertificateEntry(java.lang.String,java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.Certificate"/></param>
@@ -168,7 +168,7 @@ public void EngineSetCertificateEntry(Java.Lang.String arg0, Java.Security.Cert.
             IExecute("engineSetCertificateEntry", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineSetKeyEntry(java.lang.String,byte[],java.security.cert.Certificate[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineSetKeyEntry(java.lang.String,byte[],java.security.cert.Certificate[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -179,7 +179,7 @@ public void EngineSetKeyEntry(Java.Lang.String arg0, byte[] arg1, Java.Security.
             IExecute("engineSetKeyEntry", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineSetKeyEntry(java.lang.String,java.security.Key,char[],java.security.cert.Certificate[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineSetKeyEntry(java.lang.String,java.security.Key,char[],java.security.cert.Certificate[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
@@ -191,7 +191,7 @@ public void EngineSetKeyEntry(Java.Lang.String arg0, Java.Security.Key arg1, cha
             IExecute("engineSetKeyEntry", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineStore(java.io.OutputStream,char[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineStore(java.io.OutputStream,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -203,7 +203,7 @@ public void EngineStore(Java.Io.OutputStream arg0, char[] arg1)
             IExecute("engineStore", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineEntryInstanceOf(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineEntryInstanceOf(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -213,7 +213,7 @@ public bool EngineEntryInstanceOf(Java.Lang.String arg0, Java.Lang.Class arg1)
             return IExecute<bool>("engineEntryInstanceOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineProbe(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineProbe(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -223,7 +223,7 @@ public bool EngineProbe(Java.Io.InputStream arg0)
             return IExecuteWithSignature<bool>("engineProbe", "(Ljava/io/InputStream;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineGetEntry(java.lang.String,java.security.KeyStore.ProtectionParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineGetEntry(java.lang.String,java.security.KeyStore.ProtectionParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.KeyStore.ProtectionParameter"/></param>
@@ -236,7 +236,7 @@ public Java.Security.KeyStore.Entry EngineGetEntry(Java.Lang.String arg0, Java.S
             return IExecute<Java.Security.KeyStore.Entry>("engineGetEntry", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineLoad(java.security.KeyStore.LoadStoreParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineLoad(java.security.KeyStore.LoadStoreParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore.LoadStoreParameter"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -247,7 +247,7 @@ public void EngineLoad(Java.Security.KeyStore.LoadStoreParameter arg0)
             IExecuteWithSignature("engineLoad", "(Ljava/security/KeyStore$LoadStoreParameter;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineSetEntry(java.lang.String,java.security.KeyStore.Entry,java.security.KeyStore.ProtectionParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineSetEntry(java.lang.String,java.security.KeyStore.Entry,java.security.KeyStore.ProtectionParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.KeyStore.Entry"/></param>
@@ -258,7 +258,7 @@ public void EngineSetEntry(Java.Lang.String arg0, Java.Security.KeyStore.Entry a
             IExecute("engineSetEntry", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/KeyStoreSpi.html#engineStore(java.security.KeyStore.LoadStoreParameter)"/>
+        /// <see href="https://developer.android.com/reference/java/security/KeyStoreSpi.html#engineStore(java.security.KeyStore.LoadStoreParameter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore.LoadStoreParameter"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/MessageDigest.cs b/src/net/Netdroid/Generated/Java/Security/MessageDigest.cs
index 648787e38..97cac207e 100644
--- a/src/net/Netdroid/Generated/Java/Security/MessageDigest.cs
+++ b/src/net/Netdroid/Generated/Java/Security/MessageDigest.cs
@@ -42,7 +42,7 @@ public partial class MessageDigest
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#isEqual(byte[],byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#isEqual(byte[],byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -52,7 +52,7 @@ public static bool IsEqual(byte[] arg0, byte[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "isEqual", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -64,7 +64,7 @@ public static Java.Security.MessageDigest GetInstance(Java.Lang.String arg0, Jav
             return SExecute<Java.Security.MessageDigest>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -75,7 +75,7 @@ public static Java.Security.MessageDigest GetInstance(Java.Lang.String arg0, Jav
             return SExecute<Java.Security.MessageDigest>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.MessageDigest"/></returns>
@@ -89,45 +89,48 @@ public static Java.Security.MessageDigest GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#digest()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="byte"/></returns>
+        public byte[] Digest()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("digest", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#getDigestLength()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#digest(byte[])"/>
         /// </summary>
-        public int DigestLength
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] Digest(byte[] arg0)
         {
-            get { return IExecuteWithSignature<int>("getDigestLength", "()I"); }
+            return IExecuteWithSignatureArray<byte>("digest", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#getDigestLength()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="int"/></returns>
+        public int GetDigestLength()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<int>("getDigestLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#digest()"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#getAlgorithm()"/>
         /// </summary>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] Digest()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            return IExecuteWithSignatureArray<byte>("digest", "()[B");
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#digest(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#getProvider()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] Digest(byte[] arg0)
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            return IExecuteWithSignatureArray<byte>("digest", "([B)[B", new object[] { arg0 });
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#update(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#update(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void Update(Java.Nio.ByteBuffer arg0)
@@ -135,7 +138,7 @@ public void Update(Java.Nio.ByteBuffer arg0)
             IExecuteWithSignature("update", "(Ljava/nio/ByteBuffer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#digest(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#digest(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -147,14 +150,14 @@ public int Digest(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("digest", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#update(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#update(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void Update(byte arg0)
@@ -162,7 +165,7 @@ public void Update(byte arg0)
             IExecuteWithSignature("update", "(B)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#update(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#update(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -172,7 +175,7 @@ public void Update(byte[] arg0, int arg1, int arg2)
             IExecute("update", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/MessageDigest.html#update(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/MessageDigest.html#update(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void Update(byte[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/PKCS12Attribute.cs b/src/net/Netdroid/Generated/Java/Security/PKCS12Attribute.cs
index fe8965124..b03cf5f89 100644
--- a/src/net/Netdroid/Generated/Java/Security/PKCS12Attribute.cs
+++ b/src/net/Netdroid/Generated/Java/Security/PKCS12Attribute.cs
@@ -30,7 +30,7 @@ public partial class PKCS12Attribute
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PKCS12Attribute.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/PKCS12Attribute.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public PKCS12Attribute(byte[] arg0)
@@ -38,7 +38,7 @@ public PKCS12Attribute(byte[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PKCS12Attribute.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/PKCS12Attribute.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -63,25 +63,28 @@ public PKCS12Attribute(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PKCS12Attribute.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/PKCS12Attribute.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PKCS12Attribute.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/PKCS12Attribute.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PKCS12Attribute.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/PKCS12Attribute.html#getValue()"/>
         /// </summary>
-        public Java.Lang.String Value
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetValue()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Permission.cs b/src/net/Netdroid/Generated/Java/Security/Permission.cs
index fcdcdd2a3..db8866f93 100644
--- a/src/net/Netdroid/Generated/Java/Security/Permission.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Permission.cs
@@ -30,7 +30,7 @@ public partial class Permission : Java.Security.IGuard, Java.Io.ISerializable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Permission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Permission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public Permission(Java.Lang.String arg0)
@@ -62,30 +62,32 @@ public Permission(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Permission.html#getActions()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Permission.html#implies(java.security.Permission)"/>
         /// </summary>
-        public Java.Lang.String Actions
+        /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Implies(Java.Security.Permission arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getActions", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("implies", "(Ljava/security/Permission;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Permission.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Permission.html#getActions()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetActions()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getActions", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Permission.html#implies(java.security.Permission)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Permission.html#getName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Implies(Java.Security.Permission arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("implies", "(Ljava/security/Permission;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Permission.html#newPermissionCollection()"/>
+        /// <see href="https://developer.android.com/reference/java/security/Permission.html#newPermissionCollection()"/>
         /// </summary>
         /// <returns><see cref="Java.Security.PermissionCollection"/></returns>
         public Java.Security.PermissionCollection NewPermissionCollection()
@@ -93,7 +95,7 @@ public Java.Security.PermissionCollection NewPermissionCollection()
             return IExecuteWithSignature<Java.Security.PermissionCollection>("newPermissionCollection", "()Ljava/security/PermissionCollection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Permission.html#checkGuard(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Permission.html#checkGuard(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.SecurityException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/PermissionCollection.cs b/src/net/Netdroid/Generated/Java/Security/PermissionCollection.cs
index f5356434a..0974fc2d0 100644
--- a/src/net/Netdroid/Generated/Java/Security/PermissionCollection.cs
+++ b/src/net/Netdroid/Generated/Java/Security/PermissionCollection.cs
@@ -46,7 +46,7 @@ public partial class PermissionCollection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PermissionCollection.html#implies(java.security.Permission)"/>
+        /// <see href="https://developer.android.com/reference/java/security/PermissionCollection.html#implies(java.security.Permission)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -55,7 +55,7 @@ public bool Implies(Java.Security.Permission arg0)
             return IExecuteWithSignature<bool>("implies", "(Ljava/security/Permission;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PermissionCollection.html#elements()"/>
+        /// <see href="https://developer.android.com/reference/java/security/PermissionCollection.html#elements()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<Java.Security.Permission> Elements()
@@ -63,7 +63,7 @@ public bool Implies(Java.Security.Permission arg0)
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Security.Permission>>("elements", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PermissionCollection.html#add(java.security.Permission)"/>
+        /// <see href="https://developer.android.com/reference/java/security/PermissionCollection.html#add(java.security.Permission)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
         public void Add(Java.Security.Permission arg0)
@@ -71,7 +71,7 @@ public void Add(Java.Security.Permission arg0)
             IExecuteWithSignature("add", "(Ljava/security/Permission;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PermissionCollection.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/security/PermissionCollection.html#isReadOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsReadOnly()
@@ -79,7 +79,7 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PermissionCollection.html#elementsAsStream()"/>
+        /// <see href="https://developer.android.com/reference/java/security/PermissionCollection.html#elementsAsStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Security.Permission> ElementsAsStream()
@@ -87,7 +87,7 @@ public bool IsReadOnly()
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Security.Permission>>("elementsAsStream", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PermissionCollection.html#setReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/security/PermissionCollection.html#setReadOnly()"/>
         /// </summary>
         public void SetReadOnly()
         {
diff --git a/src/net/Netdroid/Generated/Java/Security/Policy.cs b/src/net/Netdroid/Generated/Java/Security/Policy.cs
index 5f749c416..3c822b86f 100644
--- a/src/net/Netdroid/Generated/Java/Security/Policy.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Policy.cs
@@ -38,7 +38,7 @@ public partial class Policy
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#UNSUPPORTED_EMPTY_COLLECTION"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#UNSUPPORTED_EMPTY_COLLECTION"/>
         /// </summary>
         public static Java.Security.PermissionCollection UNSUPPORTED_EMPTY_COLLECTION { get { if (!_UNSUPPORTED_EMPTY_COLLECTIONReady) { _UNSUPPORTED_EMPTY_COLLECTIONContent = SGetField<Java.Security.PermissionCollection>(LocalBridgeClazz, "UNSUPPORTED_EMPTY_COLLECTION"); _UNSUPPORTED_EMPTY_COLLECTIONReady = true; } return _UNSUPPORTED_EMPTY_COLLECTIONContent; } }
         private static Java.Security.PermissionCollection _UNSUPPORTED_EMPTY_COLLECTIONContent = default;
@@ -48,14 +48,7 @@ public partial class Policy
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getPolicy()"/> 
-        /// </summary>
-        public static Java.Security.Policy GetPolicy
-        {
-            get { return SExecuteWithSignature<Java.Security.Policy>(LocalBridgeClazz, "getPolicy", "()Ljava/security/Policy;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getInstance(java.lang.String,java.security.Policy.Parameters,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getInstance(java.lang.String,java.security.Policy.Parameters,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Policy.Parameters"/></param>
@@ -68,7 +61,7 @@ public static Java.Security.Policy GetInstance(Java.Lang.String arg0, Java.Secur
             return SExecute<Java.Security.Policy>(LocalBridgeClazz, "getInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getInstance(java.lang.String,java.security.Policy.Parameters,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getInstance(java.lang.String,java.security.Policy.Parameters,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Policy.Parameters"/></param>
@@ -80,7 +73,7 @@ public static Java.Security.Policy GetInstance(Java.Lang.String arg0, Java.Secur
             return SExecute<Java.Security.Policy>(LocalBridgeClazz, "getInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getInstance(java.lang.String,java.security.Policy.Parameters)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getInstance(java.lang.String,java.security.Policy.Parameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Policy.Parameters"/></param>
@@ -91,7 +84,15 @@ public static Java.Security.Policy GetInstance(Java.Lang.String arg0, Java.Secur
             return SExecute<Java.Security.Policy>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#setPolicy(java.security.Policy)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getPolicy()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Policy"/></returns>
+        public static Java.Security.Policy GetPolicy()
+        {
+            return SExecuteWithSignature<Java.Security.Policy>(LocalBridgeClazz, "getPolicy", "()Ljava/security/Policy;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#setPolicy(java.security.Policy)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Policy"/></param>
         public static void SetPolicy(Java.Security.Policy arg0)
@@ -103,28 +104,7 @@ public static void SetPolicy(Java.Security.Policy arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getParameters()"/> 
-        /// </summary>
-        public Java.Security.Policy.Parameters GetParameters
-        {
-            get { return IExecuteWithSignature<Java.Security.Policy.Parameters>("getParameters", "()Ljava/security/Policy$Parameters;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getProvider()"/> 
-        /// </summary>
-        public Java.Security.Provider Provider
-        {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getType()"/> 
-        /// </summary>
-        public Java.Lang.String Type
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#implies(java.security.ProtectionDomain,java.security.Permission)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#implies(java.security.ProtectionDomain,java.security.Permission)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.ProtectionDomain"/></param>
         /// <param name="arg1"><see cref="Java.Security.Permission"/></param>
@@ -134,7 +114,15 @@ public bool Implies(Java.Security.ProtectionDomain arg0, Java.Security.Permissio
             return IExecute<bool>("implies", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getPermissions(java.security.CodeSource)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getPermissions(java.security.CodeSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.CodeSource"/></param>
         /// <returns><see cref="Java.Security.PermissionCollection"/></returns>
@@ -143,7 +131,7 @@ public Java.Security.PermissionCollection GetPermissions(Java.Security.CodeSourc
             return IExecuteWithSignature<Java.Security.PermissionCollection>("getPermissions", "(Ljava/security/CodeSource;)Ljava/security/PermissionCollection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#getPermissions(java.security.ProtectionDomain)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getPermissions(java.security.ProtectionDomain)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.ProtectionDomain"/></param>
         /// <returns><see cref="Java.Security.PermissionCollection"/></returns>
@@ -152,7 +140,23 @@ public Java.Security.PermissionCollection GetPermissions(Java.Security.Protectio
             return IExecuteWithSignature<Java.Security.PermissionCollection>("getPermissions", "(Ljava/security/ProtectionDomain;)Ljava/security/PermissionCollection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Policy.html#refresh()"/>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getParameters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Policy.Parameters"/></returns>
+        public Java.Security.Policy.Parameters GetParameters()
+        {
+            return IExecuteWithSignature<Java.Security.Policy.Parameters>("getParameters", "()Ljava/security/Policy$Parameters;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Policy.html#refresh()"/>
         /// </summary>
         public void Refresh()
         {
diff --git a/src/net/Netdroid/Generated/Java/Security/Principal.cs b/src/net/Netdroid/Generated/Java/Security/Principal.cs
index c34fc907a..1583d600a 100644
--- a/src/net/Netdroid/Generated/Java/Security/Principal.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Principal.cs
@@ -64,14 +64,15 @@ public partial class Principal : Java.Security.IPrincipal
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Principal.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Principal.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Principal.html#implies(javax.security.auth.Subject)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Principal.html#implies(javax.security.auth.Subject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Subject"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Security/PrivateKey.cs b/src/net/Netdroid/Generated/Java/Security/PrivateKey.cs
index 568eb3ca9..c37e5c31d 100644
--- a/src/net/Netdroid/Generated/Java/Security/PrivateKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/PrivateKey.cs
@@ -64,9 +64,8 @@ public partial class PrivateKey : Java.Security.IPrivateKey, Java.Security.IKey,
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PrivateKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/PrivateKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Java/Security/PrivilegedAction.cs b/src/net/Netdroid/Generated/Java/Security/PrivilegedAction.cs
index 2afcf02d7..fc8659b79 100644
--- a/src/net/Netdroid/Generated/Java/Security/PrivilegedAction.cs
+++ b/src/net/Netdroid/Generated/Java/Security/PrivilegedAction.cs
@@ -46,7 +46,7 @@ public partial class PrivilegedAction
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedAction.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/security/PrivilegedAction.html#run()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Run()
@@ -107,7 +107,7 @@ public partial class PrivilegedAction<T> : Java.Security.IPrivilegedAction<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedAction.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/security/PrivilegedAction.html#run()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public T Run()
diff --git a/src/net/Netdroid/Generated/Java/Security/PrivilegedExceptionAction.cs b/src/net/Netdroid/Generated/Java/Security/PrivilegedExceptionAction.cs
index 03d6bf705..412d1ab79 100644
--- a/src/net/Netdroid/Generated/Java/Security/PrivilegedExceptionAction.cs
+++ b/src/net/Netdroid/Generated/Java/Security/PrivilegedExceptionAction.cs
@@ -46,7 +46,7 @@ public partial class PrivilegedExceptionAction
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedExceptionAction.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/security/PrivilegedExceptionAction.html#run()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.Exception"/>
@@ -108,7 +108,7 @@ public partial class PrivilegedExceptionAction<T> : Java.Security.IPrivilegedExc
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PrivilegedExceptionAction.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/security/PrivilegedExceptionAction.html#run()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Lang.Exception"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/ProtectionDomain.cs b/src/net/Netdroid/Generated/Java/Security/ProtectionDomain.cs
index 538a056e2..078c82a50 100644
--- a/src/net/Netdroid/Generated/Java/Security/ProtectionDomain.cs
+++ b/src/net/Netdroid/Generated/Java/Security/ProtectionDomain.cs
@@ -30,7 +30,7 @@ public partial class ProtectionDomain
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html#%3Cinit%3E(java.security.CodeSource,java.security.PermissionCollection,java.lang.ClassLoader,java.security.Principal[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html#%3Cinit%3E(java.security.CodeSource,java.security.PermissionCollection,java.lang.ClassLoader,java.security.Principal[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.CodeSource"/></param>
         /// <param name="arg1"><see cref="Java.Security.PermissionCollection"/></param>
@@ -41,7 +41,7 @@ public ProtectionDomain(Java.Security.CodeSource arg0, Java.Security.PermissionC
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html#%3Cinit%3E(java.security.CodeSource,java.security.PermissionCollection)"/>
+        /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html#%3Cinit%3E(java.security.CodeSource,java.security.PermissionCollection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.CodeSource"/></param>
         /// <param name="arg1"><see cref="Java.Security.PermissionCollection"/></param>
@@ -66,49 +66,53 @@ public ProtectionDomain(Java.Security.CodeSource arg0, Java.Security.PermissionC
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html#getClassLoader()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html#implies(java.security.Permission)"/>
         /// </summary>
-        public Java.Lang.ClassLoader ClassLoader
+        /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Implies(Java.Security.Permission arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;"); }
+            return IExecuteWithSignature<bool>("implies", "(Ljava/security/Permission;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html#getCodeSource()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html#staticPermissionsOnly()"/>
         /// </summary>
-        public Java.Security.CodeSource CodeSource
+        /// <returns><see cref="bool"/></returns>
+        public bool StaticPermissionsOnly()
         {
-            get { return IExecuteWithSignature<Java.Security.CodeSource>("getCodeSource", "()Ljava/security/CodeSource;"); }
+            return IExecuteWithSignature<bool>("staticPermissionsOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html#getPermissions()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html#getClassLoader()"/>
         /// </summary>
-        public Java.Security.PermissionCollection Permissions
+        /// <returns><see cref="Java.Lang.ClassLoader"/></returns>
+        public Java.Lang.ClassLoader GetClassLoader()
         {
-            get { return IExecuteWithSignature<Java.Security.PermissionCollection>("getPermissions", "()Ljava/security/PermissionCollection;"); }
+            return IExecuteWithSignature<Java.Lang.ClassLoader>("getClassLoader", "()Ljava/lang/ClassLoader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html#getPrincipals()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html#getCodeSource()"/>
         /// </summary>
-        public Java.Security.Principal[] Principals
+        /// <returns><see cref="Java.Security.CodeSource"/></returns>
+        public Java.Security.CodeSource GetCodeSource()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Principal>("getPrincipals", "()[Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Security.CodeSource>("getCodeSource", "()Ljava/security/CodeSource;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html#implies(java.security.Permission)"/>
+        /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html#getPermissions()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.Permission"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Implies(Java.Security.Permission arg0)
+        /// <returns><see cref="Java.Security.PermissionCollection"/></returns>
+        public Java.Security.PermissionCollection GetPermissions()
         {
-            return IExecuteWithSignature<bool>("implies", "(Ljava/security/Permission;)Z", arg0);
+            return IExecuteWithSignature<Java.Security.PermissionCollection>("getPermissions", "()Ljava/security/PermissionCollection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/ProtectionDomain.html#staticPermissionsOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/security/ProtectionDomain.html#getPrincipals()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool StaticPermissionsOnly()
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal[] GetPrincipals()
         {
-            return IExecuteWithSignature<bool>("staticPermissionsOnly", "()Z");
+            return IExecuteWithSignatureArray<Java.Security.Principal>("getPrincipals", "()[Ljava/security/Principal;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Provider.cs b/src/net/Netdroid/Generated/Java/Security/Provider.cs
index 515b09cc8..841117f5b 100644
--- a/src/net/Netdroid/Generated/Java/Security/Provider.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Provider.cs
@@ -46,51 +46,48 @@ public partial class Provider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html#getInfo()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Provider.html#isConfigured()"/>
         /// </summary>
-        public Java.Lang.String Info
+        /// <returns><see cref="bool"/></returns>
+        public bool IsConfigured()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInfo", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isConfigured", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Provider.html#getVersion()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="double"/></returns>
+        [global::System.Obsolete()]
+        public double GetVersion()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<double>("getVersion", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html#getServices()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Provider.html#getInfo()"/>
         /// </summary>
-        public Java.Util.Set<Java.Security.Provider.Service> Services
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInfo()
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Security.Provider.Service>>("getServices", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInfo", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Provider.html#getName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public double Version
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<double>("getVersion", "()D"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html#getVersionStr()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Provider.html#getVersionStr()"/>
         /// </summary>
-        public Java.Lang.String VersionStr
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetVersionStr()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVersionStr", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getVersionStr", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html#isConfigured()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsConfigured()
-        {
-            return IExecuteWithSignature<bool>("isConfigured", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html#configure(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Provider.html#configure(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Provider"/></returns>
@@ -99,7 +96,7 @@ public Java.Security.Provider Configure(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Security.Provider>("configure", "(Ljava/lang/String;)Ljava/security/Provider;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.html#getService(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Provider.html#getService(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -108,6 +105,14 @@ public Java.Security.Provider.Service GetService(Java.Lang.String arg0, Java.Lan
         {
             return IExecute<Java.Security.Provider.Service>("getService", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Provider.html#getServices()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Security.Provider.Service> GetServices()
+        {
+            return IExecute<Java.Util.Set<Java.Security.Provider.Service>>("getServices");
+        }
 
         #endregion
 
@@ -117,7 +122,7 @@ public partial class Service
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html#%3Cinit%3E(java.security.Provider,java.lang.String,java.lang.String,java.lang.String,java.util.List,java.util.Map)"/>
+            /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html#%3Cinit%3E(java.security.Provider,java.lang.String,java.lang.String,java.lang.String,java.util.List,java.util.Map)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Security.Provider"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -146,53 +151,57 @@ public Service(Java.Security.Provider arg0, Java.Lang.String arg1, Java.Lang.Str
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html#getAlgorithm()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html#supportsParameter(java.lang.Object)"/>
             /// </summary>
-            public Java.Lang.String Algorithm
+            /// <param name="arg0"><see cref="object"/></param>
+            /// <returns><see cref="bool"/></returns>
+            public bool SupportsParameter(object arg0)
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<bool>("supportsParameter", "(Ljava/lang/Object;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html#getClassName()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html#getAlgorithm()"/>
             /// </summary>
-            public Java.Lang.String ClassName
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetAlgorithm()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html#getProvider()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html#getAttribute(java.lang.String)"/>
             /// </summary>
-            public Java.Security.Provider GetProvider
+            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetAttribute(Java.Lang.String arg0)
             {
-                get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getAttribute", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html#getType()"/> 
+            /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html#getClassName()"/>
             /// </summary>
-            public Java.Lang.String Type
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetClassName()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<Java.Lang.String>("getClassName", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html#supportsParameter(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html#getType()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="object"/></param>
-            /// <returns><see cref="bool"/></returns>
-            public bool SupportsParameter(object arg0)
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetType()
             {
-                return IExecuteWithSignature<bool>("supportsParameter", "(Ljava/lang/Object;)Z", arg0);
+                return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html#getAttribute(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html#getProvider()"/>
             /// </summary>
-            /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-            /// <returns><see cref="Java.Lang.String"/></returns>
-            public Java.Lang.String GetAttribute(Java.Lang.String arg0)
+            /// <returns><see cref="Java.Security.Provider"/></returns>
+            public Java.Security.Provider GetProvider()
             {
-                return IExecuteWithSignature<Java.Lang.String>("getAttribute", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+                return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/security/Provider.Service.html#newInstance(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/security/Provider.Service.html#newInstance(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="object"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Security/PublicKey.cs b/src/net/Netdroid/Generated/Java/Security/PublicKey.cs
index a7c885e89..afa78a665 100644
--- a/src/net/Netdroid/Generated/Java/Security/PublicKey.cs
+++ b/src/net/Netdroid/Generated/Java/Security/PublicKey.cs
@@ -56,9 +56,8 @@ public partial class PublicKey : Java.Security.IPublicKey
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/PublicKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/java/security/PublicKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Java/Security/SecureRandom.cs b/src/net/Netdroid/Generated/Java/Security/SecureRandom.cs
index 5f8b8b391..56214d36d 100644
--- a/src/net/Netdroid/Generated/Java/Security/SecureRandom.cs
+++ b/src/net/Netdroid/Generated/Java/Security/SecureRandom.cs
@@ -30,7 +30,7 @@ public partial class SecureRandom
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public SecureRandom(byte[] arg0)
@@ -50,14 +50,7 @@ public SecureRandom(byte[] arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#getInstanceStrong()"/> 
-        /// </summary>
-        public static Java.Security.SecureRandom InstanceStrong
-        {
-            get { return SExecuteWithSignature<Java.Security.SecureRandom>(LocalBridgeClazz, "getInstanceStrong", "()Ljava/security/SecureRandom;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#getSeed(int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#getSeed(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -66,7 +59,7 @@ public static byte[] GetSeed(int arg0)
             return SExecuteWithSignatureArray<byte>(LocalBridgeClazz, "getSeed", "(I)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -78,7 +71,7 @@ public static Java.Security.SecureRandom GetInstance(Java.Lang.String arg0, Java
             return SExecute<Java.Security.SecureRandom>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -89,7 +82,7 @@ public static Java.Security.SecureRandom GetInstance(Java.Lang.String arg0, Java
             return SExecute<Java.Security.SecureRandom>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.SecureRandom"/></returns>
@@ -98,42 +91,53 @@ public static Java.Security.SecureRandom GetInstance(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Security.SecureRandom>(LocalBridgeClazz, "getInstance", "(Ljava/lang/String;)Ljava/security/SecureRandom;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#getInstanceStrong()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.SecureRandom"/></returns>
+        /// <exception cref="Java.Security.NoSuchAlgorithmException"/>
+        public static Java.Security.SecureRandom GetInstanceStrong()
+        {
+            return SExecuteWithSignature<Java.Security.SecureRandom>(LocalBridgeClazz, "getInstanceStrong", "()Ljava/security/SecureRandom;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#generateSeed(int)"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GenerateSeed(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("generateSeed", "(I)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#getProvider()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#generateSeed(int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#getAlgorithm()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] GenerateSeed(int arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            return IExecuteWithSignatureArray<byte>("generateSeed", "(I)[B", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#reseed()"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#reseed()"/>
         /// </summary>
         public void Reseed()
         {
             IExecuteWithSignature("reseed", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecureRandom.html#setSeed(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecureRandom.html#setSeed(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void SetSeed(byte[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/Security.cs b/src/net/Netdroid/Generated/Java/Security/Security.cs
index 17c6cc225..ce534f5f6 100644
--- a/src/net/Netdroid/Generated/Java/Security/Security.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Security.cs
@@ -42,14 +42,7 @@ public partial class Security
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#getProviders()"/> 
-        /// </summary>
-        public static Java.Security.Provider[] Providers
-        {
-            get { return SExecuteWithSignatureArray<Java.Security.Provider>(LocalBridgeClazz, "getProviders", "()[Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#addProvider(java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#addProvider(java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Provider"/></param>
         /// <returns><see cref="int"/></returns>
@@ -58,18 +51,18 @@ public static int AddProvider(Java.Security.Provider arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "addProvider", "(Ljava/security/Provider;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#getAlgorithmProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#getAlgorithmProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String GetAlgorithmProperty(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "getAlgorithmProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -78,7 +71,7 @@ public static Java.Lang.String GetProperty(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#getProvider(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#getProvider(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Provider"/></returns>
@@ -87,7 +80,15 @@ public static Java.Security.Provider GetProvider(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Security.Provider>(LocalBridgeClazz, "getProvider", "(Ljava/lang/String;)Ljava/security/Provider;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#getProviders(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#getProviders()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public static Java.Security.Provider[] GetProviders()
+        {
+            return SExecuteWithSignatureArray<Java.Security.Provider>(LocalBridgeClazz, "getProviders", "()[Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#getProviders(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Provider"/></returns>
@@ -96,7 +97,7 @@ public static Java.Security.Provider[] GetProviders(Java.Lang.String arg0)
             return SExecuteWithSignatureArray<Java.Security.Provider>(LocalBridgeClazz, "getProviders", "(Ljava/lang/String;)[Ljava/security/Provider;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#getProviders(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#getProviders(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <returns><see cref="Java.Security.Provider"/></returns>
@@ -105,7 +106,7 @@ public static Java.Security.Provider[] GetProviders(Java.Util.Map<Java.Lang.Stri
             return SExecuteWithSignatureArray<Java.Security.Provider>(LocalBridgeClazz, "getProviders", "(Ljava/util/Map;)[Ljava/security/Provider;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#getAlgorithms(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#getAlgorithms(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
@@ -114,7 +115,7 @@ public static Java.Security.Provider[] GetProviders(Java.Util.Map<Java.Lang.Stri
             return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getAlgorithms", "(Ljava/lang/String;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#insertProviderAt(java.security.Provider,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#insertProviderAt(java.security.Provider,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Provider"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -124,7 +125,7 @@ public static int InsertProviderAt(Java.Security.Provider arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "insertProviderAt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#removeProvider(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#removeProvider(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public static void RemoveProvider(Java.Lang.String arg0)
@@ -132,7 +133,7 @@ public static void RemoveProvider(Java.Lang.String arg0)
             SExecuteWithSignature(LocalBridgeClazz, "removeProvider", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Security.html#setProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Security.html#setProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Security/SecurityPermission.cs b/src/net/Netdroid/Generated/Java/Security/SecurityPermission.cs
index 2b4cf6438..a809340c6 100644
--- a/src/net/Netdroid/Generated/Java/Security/SecurityPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Security/SecurityPermission.cs
@@ -30,7 +30,7 @@ public partial class SecurityPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecurityPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecurityPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public SecurityPermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SecurityPermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SecurityPermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public SecurityPermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/Signature.cs b/src/net/Netdroid/Generated/Java/Security/Signature.cs
index 68bfd569b..e760fb9d3 100644
--- a/src/net/Netdroid/Generated/Java/Security/Signature.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Signature.cs
@@ -42,7 +42,7 @@ public partial class Signature
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Java.Security.Signature GetInstance(Java.Lang.String arg0, Java.La
             return SExecute<Java.Security.Signature>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Java.Security.Signature GetInstance(Java.Lang.String arg0, Java.Se
             return SExecute<Java.Security.Signature>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Signature"/></returns>
@@ -79,28 +79,7 @@ public static Java.Security.Signature GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#getAlgorithm()"/> 
-        /// </summary>
-        public Java.Lang.String Algorithm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#getParameters()"/> 
-        /// </summary>
-        public Java.Security.AlgorithmParameters Parameters
-        {
-            get { return IExecuteWithSignature<Java.Security.AlgorithmParameters>("getParameters", "()Ljava/security/AlgorithmParameters;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#getProvider()"/> 
-        /// </summary>
-        public Java.Security.Provider Provider
-        {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#verify(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#verify(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -112,7 +91,7 @@ public bool Verify(byte[] arg0, int arg1, int arg2)
             return IExecute<bool>("verify", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#verify(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#verify(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -122,7 +101,7 @@ public bool Verify(byte[] arg0)
             return IExecuteWithSignature<bool>("verify", "([B)Z", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#sign()"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#sign()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Security.SignatureException"/>
@@ -131,7 +110,7 @@ public byte[] Sign()
             return IExecuteWithSignatureArray<byte>("sign", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#sign(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#sign(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -143,18 +122,42 @@ public int Sign(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("sign", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#getParameter(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#getParameter(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Security.InvalidParameterException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object GetParameter(Java.Lang.String arg0)
         {
             return IExecuteWithSignature("getParameter", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#initSign(java.security.PrivateKey,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#getAlgorithm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#getParameters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.AlgorithmParameters"/></returns>
+        public Java.Security.AlgorithmParameters GetParameters()
+        {
+            return IExecuteWithSignature<Java.Security.AlgorithmParameters>("getParameters", "()Ljava/security/AlgorithmParameters;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#initSign(java.security.PrivateKey,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivateKey"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
@@ -164,7 +167,7 @@ public void InitSign(Java.Security.PrivateKey arg0, Java.Security.SecureRandom a
             IExecute("initSign", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#initSign(java.security.PrivateKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#initSign(java.security.PrivateKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivateKey"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
@@ -173,7 +176,7 @@ public void InitSign(Java.Security.PrivateKey arg0)
             IExecuteWithSignature("initSign", "(Ljava/security/PrivateKey;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#initVerify(java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#initVerify(java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.Certificate"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
@@ -182,7 +185,7 @@ public void InitVerify(Java.Security.Cert.Certificate arg0)
             IExecuteWithSignature("initVerify", "(Ljava/security/cert/Certificate;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#initVerify(java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#initVerify(java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
@@ -191,18 +194,18 @@ public void InitVerify(Java.Security.PublicKey arg0)
             IExecuteWithSignature("initVerify", "(Ljava/security/PublicKey;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#setParameter(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#setParameter(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <exception cref="Java.Security.InvalidParameterException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetParameter(Java.Lang.String arg0, object arg1)
         {
             IExecute("setParameter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#setParameter(java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#setParameter(java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
@@ -211,7 +214,7 @@ public void SetParameter(Java.Security.Spec.AlgorithmParameterSpec arg0)
             IExecuteWithSignature("setParameter", "(Ljava/security/spec/AlgorithmParameterSpec;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#update(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#update(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Security.SignatureException"/>
@@ -220,7 +223,7 @@ public void Update(byte arg0)
             IExecuteWithSignature("update", "(B)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#update(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#update(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -231,7 +234,7 @@ public void Update(byte[] arg0, int arg1, int arg2)
             IExecute("update", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#update(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#update(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Security.SignatureException"/>
@@ -240,7 +243,7 @@ public void Update(byte[] arg0)
             IExecuteWithSignature("update", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signature.html#update(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signature.html#update(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <exception cref="Java.Security.SignatureException"/>
diff --git a/src/net/Netdroid/Generated/Java/Security/SignedObject.cs b/src/net/Netdroid/Generated/Java/Security/SignedObject.cs
index 2c2808538..1600e79ad 100644
--- a/src/net/Netdroid/Generated/Java/Security/SignedObject.cs
+++ b/src/net/Netdroid/Generated/Java/Security/SignedObject.cs
@@ -30,7 +30,7 @@ public partial class SignedObject
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SignedObject.html#%3Cinit%3E(java.io.Serializable,java.security.PrivateKey,java.security.Signature)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SignedObject.html#%3Cinit%3E(java.io.Serializable,java.security.PrivateKey,java.security.Signature)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Serializable"/></param>
         /// <param name="arg1"><see cref="Java.Security.PrivateKey"/></param>
@@ -59,37 +59,42 @@ public SignedObject(Java.Io.Serializable arg0, Java.Security.PrivateKey arg1, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SignedObject.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/SignedObject.html#verify(java.security.PublicKey,java.security.Signature)"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
+        /// <param name="arg1"><see cref="Java.Security.Signature"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Security.InvalidKeyException"/>
+        /// <exception cref="Java.Security.SignatureException"/>
+        public bool Verify(Java.Security.PublicKey arg0, Java.Security.Signature arg1)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecute<bool>("verify", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SignedObject.html#getObject()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/SignedObject.html#getSignature()"/>
         /// </summary>
-        public object Object
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSignature()
         {
-            get { return IExecuteWithSignature("getObject", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignatureArray<byte>("getSignature", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SignedObject.html#getSignature()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/SignedObject.html#getObject()"/>
         /// </summary>
-        public byte[] Signature
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        /// <exception cref="Java.Lang.ClassNotFoundException"/>
+        public object GetObject()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSignature", "()[B"); }
+            return IExecuteWithSignature("getObject", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/SignedObject.html#verify(java.security.PublicKey,java.security.Signature)"/>
+        /// <see href="https://developer.android.com/reference/java/security/SignedObject.html#getAlgorithm()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
-        /// <param name="arg1"><see cref="Java.Security.Signature"/></param>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Java.Security.InvalidKeyException"/>
-        /// <exception cref="Java.Security.SignatureException"/>
-        public bool Verify(Java.Security.PublicKey arg0, Java.Security.Signature arg1)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            return IExecute<bool>("verify", arg0, arg1);
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Signer.cs b/src/net/Netdroid/Generated/Java/Security/Signer.cs
index b8a4006bb..c26bc5655 100644
--- a/src/net/Netdroid/Generated/Java/Security/Signer.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Signer.cs
@@ -30,7 +30,7 @@ public partial class Signer
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signer.html#%3Cinit%3E(java.lang.String,java.security.IdentityScope)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signer.html#%3Cinit%3E(java.lang.String,java.security.IdentityScope)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.IdentityScope"/></param>
@@ -40,7 +40,7 @@ public Signer(Java.Lang.String arg0, Java.Security.IdentityScope arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signer.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signer.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public Signer(Java.Lang.String arg0)
@@ -64,14 +64,7 @@ public Signer(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signer.html#getPrivateKey()"/> 
-        /// </summary>
-        public Java.Security.PrivateKey PrivateKey
-        {
-            get { return IExecuteWithSignature<Java.Security.PrivateKey>("getPrivateKey", "()Ljava/security/PrivateKey;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Signer.html#setKeyPair(java.security.KeyPair)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Signer.html#setKeyPair(java.security.KeyPair)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyPair"/></param>
         /// <exception cref="Java.Security.InvalidParameterException"/>
@@ -80,6 +73,14 @@ public void SetKeyPair(Java.Security.KeyPair arg0)
         {
             IExecuteWithSignature("setKeyPair", "(Ljava/security/KeyPair;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/security/Signer.html#getPrivateKey()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.PrivateKey"/></returns>
+        public Java.Security.PrivateKey GetPrivateKey()
+        {
+            return IExecuteWithSignature<Java.Security.PrivateKey>("getPrivateKey", "()Ljava/security/PrivateKey;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Security/Spec/AllPackageClasses.cs
index 44d4bf6c7..8d52d5527 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Security.Spec
 {
     #region AlgorithmParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/AlgorithmParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/AlgorithmParameterSpec.html"/>
     /// </summary>
     public partial class AlgorithmParameterSpec : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AlgorithmParameterSpec>
     {
@@ -36,12 +36,12 @@ public partial class AlgorithmParameterSpec : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AlgorithmParameterSpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlgorithmParameterSpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlgorithmParameterSpec() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AlgorithmParameterSpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AlgorithmParameterSpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AlgorithmParameterSpec(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public AlgorithmParameterSpec(params object[] args) : base(args) { }
 
     #region DSAParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/DSAParameterSpec.html"/>
     /// </summary>
     public partial class DSAParameterSpec : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DSAParameterSpec>
     {
@@ -118,7 +118,7 @@ public DSAParameterSpec(params object[] args) : base(args) { }
 
     #region DSAPrivateKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPrivateKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/DSAPrivateKeySpec.html"/>
     /// </summary>
     public partial class DSAPrivateKeySpec : Java.Security.Spec.KeySpec
     {
@@ -162,7 +162,7 @@ public DSAPrivateKeySpec(params object[] args) : base(args) { }
 
     #region DSAPublicKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPublicKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/DSAPublicKeySpec.html"/>
     /// </summary>
     public partial class DSAPublicKeySpec : Java.Security.Spec.KeySpec
     {
@@ -206,7 +206,7 @@ public DSAPublicKeySpec(params object[] args) : base(args) { }
 
     #region ECField
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECField.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/ECField.html"/>
     /// </summary>
     public partial class ECField : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECField>
     {
@@ -214,12 +214,12 @@ public partial class ECField : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECField>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ECField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ECField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ECField() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ECField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ECField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ECField(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -252,7 +252,7 @@ public ECField(params object[] args) : base(args) { }
 
     #region ECFieldF2m
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldF2m.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldF2m.html"/>
     /// </summary>
     public partial class ECFieldF2m : Java.Security.Spec.ECField
     {
@@ -296,7 +296,7 @@ public ECFieldF2m(params object[] args) : base(args) { }
 
     #region ECFieldFp
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldFp.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldFp.html"/>
     /// </summary>
     public partial class ECFieldFp : Java.Security.Spec.ECField
     {
@@ -340,7 +340,7 @@ public ECFieldFp(params object[] args) : base(args) { }
 
     #region ECGenParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECGenParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/ECGenParameterSpec.html"/>
     /// </summary>
     public partial class ECGenParameterSpec : Java.Security.Spec.NamedParameterSpec
     {
@@ -384,7 +384,7 @@ public ECGenParameterSpec(params object[] args) : base(args) { }
 
     #region ECParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/ECParameterSpec.html"/>
     /// </summary>
     public partial class ECParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -428,7 +428,7 @@ public ECParameterSpec(params object[] args) : base(args) { }
 
     #region ECPoint
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPoint.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/ECPoint.html"/>
     /// </summary>
     public partial class ECPoint : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ECPoint>
     {
@@ -472,7 +472,7 @@ public ECPoint(params object[] args) : base(args) { }
 
     #region ECPrivateKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPrivateKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/ECPrivateKeySpec.html"/>
     /// </summary>
     public partial class ECPrivateKeySpec : Java.Security.Spec.KeySpec
     {
@@ -516,7 +516,7 @@ public ECPrivateKeySpec(params object[] args) : base(args) { }
 
     #region ECPublicKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPublicKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/ECPublicKeySpec.html"/>
     /// </summary>
     public partial class ECPublicKeySpec : Java.Security.Spec.KeySpec
     {
@@ -558,141 +558,9 @@ public ECPublicKeySpec(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region EdECPoint
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPoint.html"/>
-    /// </summary>
-    public partial class EdECPoint : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EdECPoint>
-    {
-        const string _bridgeClassName = "java.security.spec.EdECPoint";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        public EdECPoint() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        public EdECPoint(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region EdECPrivateKeySpec
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPrivateKeySpec.html"/>
-    /// </summary>
-    public partial class EdECPrivateKeySpec : Java.Security.Spec.KeySpec
-    {
-        const string _bridgeClassName = "java.security.spec.EdECPrivateKeySpec";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        public EdECPrivateKeySpec() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        public EdECPrivateKeySpec(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region EdECPublicKeySpec
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPublicKeySpec.html"/>
-    /// </summary>
-    public partial class EdECPublicKeySpec : Java.Security.Spec.KeySpec
-    {
-        const string _bridgeClassName = "java.security.spec.EdECPublicKeySpec";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        public EdECPublicKeySpec() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        public EdECPublicKeySpec(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
     #region EllipticCurve
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EllipticCurve.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/EllipticCurve.html"/>
     /// </summary>
     public partial class EllipticCurve : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EllipticCurve>
     {
@@ -736,7 +604,7 @@ public EllipticCurve(params object[] args) : base(args) { }
 
     #region EncodedKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EncodedKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/EncodedKeySpec.html"/>
     /// </summary>
     public partial class EncodedKeySpec : Java.Security.Spec.KeySpec
     {
@@ -744,12 +612,12 @@ public partial class EncodedKeySpec : Java.Security.Spec.KeySpec
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EncodedKeySpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EncodedKeySpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EncodedKeySpec() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EncodedKeySpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EncodedKeySpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EncodedKeySpec(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -782,7 +650,7 @@ public EncodedKeySpec(params object[] args) : base(args) { }
 
     #region InvalidKeySpecException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/InvalidKeySpecException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/InvalidKeySpecException.html"/>
     /// </summary>
     public partial class InvalidKeySpecException : Java.Security.GeneralSecurityException
     {
@@ -799,7 +667,7 @@ public partial class InvalidKeySpecException : Java.Security.GeneralSecurityExce
 
     #region InvalidParameterSpecException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/InvalidParameterSpecException.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/InvalidParameterSpecException.html"/>
     /// </summary>
     public partial class InvalidParameterSpecException : Java.Security.GeneralSecurityException
     {
@@ -816,7 +684,7 @@ public partial class InvalidParameterSpecException : Java.Security.GeneralSecuri
 
     #region KeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/KeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/KeySpec.html"/>
     /// </summary>
     public partial class KeySpec : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeySpec>
     {
@@ -824,12 +692,12 @@ public partial class KeySpec : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeySpec>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeySpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeySpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeySpec() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeySpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeySpec class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeySpec(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -862,7 +730,7 @@ public KeySpec(params object[] args) : base(args) { }
 
     #region MGF1ParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html"/>
     /// </summary>
     public partial class MGF1ParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -906,7 +774,7 @@ public MGF1ParameterSpec(params object[] args) : base(args) { }
 
     #region NamedParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/NamedParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/NamedParameterSpec.html"/>
     /// </summary>
     public partial class NamedParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -950,7 +818,7 @@ public NamedParameterSpec(params object[] args) : base(args) { }
 
     #region PKCS8EncodedKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PKCS8EncodedKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/PKCS8EncodedKeySpec.html"/>
     /// </summary>
     public partial class PKCS8EncodedKeySpec : Java.Security.Spec.EncodedKeySpec
     {
@@ -994,7 +862,7 @@ public PKCS8EncodedKeySpec(params object[] args) : base(args) { }
 
     #region PSSParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html"/>
     /// </summary>
     public partial class PSSParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -1038,7 +906,7 @@ public PSSParameterSpec(params object[] args) : base(args) { }
 
     #region RSAKeyGenParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAKeyGenParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html"/>
     /// </summary>
     public partial class RSAKeyGenParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -1082,7 +950,7 @@ public RSAKeyGenParameterSpec(params object[] args) : base(args) { }
 
     #region RSAMultiPrimePrivateCrtKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html"/>
     /// </summary>
     public partial class RSAMultiPrimePrivateCrtKeySpec : Java.Security.Spec.RSAPrivateKeySpec
     {
@@ -1126,7 +994,7 @@ public RSAMultiPrimePrivateCrtKeySpec(params object[] args) : base(args) { }
 
     #region RSAOtherPrimeInfo
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAOtherPrimeInfo.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/RSAOtherPrimeInfo.html"/>
     /// </summary>
     public partial class RSAOtherPrimeInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RSAOtherPrimeInfo>
     {
@@ -1170,7 +1038,7 @@ public RSAOtherPrimeInfo(params object[] args) : base(args) { }
 
     #region RSAPrivateCrtKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html"/>
     /// </summary>
     public partial class RSAPrivateCrtKeySpec : Java.Security.Spec.RSAPrivateKeySpec
     {
@@ -1214,7 +1082,7 @@ public RSAPrivateCrtKeySpec(params object[] args) : base(args) { }
 
     #region RSAPrivateKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateKeySpec.html"/>
     /// </summary>
     public partial class RSAPrivateKeySpec : Java.Security.Spec.KeySpec
     {
@@ -1258,7 +1126,7 @@ public RSAPrivateKeySpec(params object[] args) : base(args) { }
 
     #region RSAPublicKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPublicKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/RSAPublicKeySpec.html"/>
     /// </summary>
     public partial class RSAPublicKeySpec : Java.Security.Spec.KeySpec
     {
@@ -1302,7 +1170,7 @@ public RSAPublicKeySpec(params object[] args) : base(args) { }
 
     #region X509EncodedKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/X509EncodedKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/X509EncodedKeySpec.html"/>
     /// </summary>
     public partial class X509EncodedKeySpec : Java.Security.Spec.EncodedKeySpec
     {
@@ -1346,7 +1214,7 @@ public X509EncodedKeySpec(params object[] args) : base(args) { }
 
     #region XECPrivateKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/XECPrivateKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/XECPrivateKeySpec.html"/>
     /// </summary>
     public partial class XECPrivateKeySpec : Java.Security.Spec.KeySpec
     {
@@ -1390,7 +1258,7 @@ public XECPrivateKeySpec(params object[] args) : base(args) { }
 
     #region XECPublicKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/security/spec/XECPublicKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/java/security/spec/XECPublicKeySpec.html"/>
     /// </summary>
     public partial class XECPublicKeySpec : Java.Security.Spec.KeySpec
     {
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/DSAParameterSpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/DSAParameterSpec.cs
index a76efe120..62faf975c 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/DSAParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/DSAParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class DSAParameterSpec : Java.Security.Spec.IAlgorithmParameterSp
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAParameterSpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAParameterSpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -64,25 +64,28 @@ public DSAParameterSpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAParameterSpec.html#getG()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAParameterSpec.html#getG()"/>
         /// </summary>
-        public Java.Math.BigInteger G
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetG()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAParameterSpec.html#getP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAParameterSpec.html#getP()"/>
         /// </summary>
-        public Java.Math.BigInteger P
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAParameterSpec.html#getQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAParameterSpec.html#getQ()"/>
         /// </summary>
-        public Java.Math.BigInteger Q
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getQ", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/DSAPrivateKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/DSAPrivateKeySpec.cs
index 76acb7b3d..6af0efd79 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/DSAPrivateKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/DSAPrivateKeySpec.cs
@@ -30,7 +30,7 @@ public partial class DSAPrivateKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -57,32 +57,36 @@ public DSAPrivateKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, J
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPrivateKeySpec.html#getG()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPrivateKeySpec.html#getG()"/>
         /// </summary>
-        public Java.Math.BigInteger G
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetG()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPrivateKeySpec.html#getP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPrivateKeySpec.html#getP()"/>
         /// </summary>
-        public Java.Math.BigInteger P
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPrivateKeySpec.html#getQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPrivateKeySpec.html#getQ()"/>
         /// </summary>
-        public Java.Math.BigInteger Q
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPrivateKeySpec.html#getX()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPrivateKeySpec.html#getX()"/>
         /// </summary>
-        public Java.Math.BigInteger X
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetX()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getX", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getX", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/DSAPublicKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/DSAPublicKeySpec.cs
index 8cfe26f01..6f89ebe4f 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/DSAPublicKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/DSAPublicKeySpec.cs
@@ -30,7 +30,7 @@ public partial class DSAPublicKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPublicKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPublicKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -57,32 +57,36 @@ public DSAPublicKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPublicKeySpec.html#getG()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPublicKeySpec.html#getG()"/>
         /// </summary>
-        public Java.Math.BigInteger G
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetG()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPublicKeySpec.html#getP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPublicKeySpec.html#getP()"/>
         /// </summary>
-        public Java.Math.BigInteger P
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPublicKeySpec.html#getQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPublicKeySpec.html#getQ()"/>
         /// </summary>
-        public Java.Math.BigInteger Q
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/DSAPublicKeySpec.html#getY()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/DSAPublicKeySpec.html#getY()"/>
         /// </summary>
-        public Java.Math.BigInteger Y
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetY()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/ECField.cs b/src/net/Netdroid/Generated/Java/Security/Spec/ECField.cs
index 28965d92d..919596d5b 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/ECField.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/ECField.cs
@@ -64,11 +64,12 @@ public partial class ECField : Java.Security.Spec.IECField
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECField.html#getFieldSize()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECField.html#getFieldSize()"/>
         /// </summary>
-        public int FieldSize
+        /// <returns><see cref="int"/></returns>
+        public int GetFieldSize()
         {
-            get { return IExecuteWithSignature<int>("getFieldSize", "()I"); }
+            return IExecuteWithSignature<int>("getFieldSize", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/ECFieldF2m.cs b/src/net/Netdroid/Generated/Java/Security/Spec/ECFieldF2m.cs
index de3d275c3..d2a75b41c 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/ECFieldF2m.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/ECFieldF2m.cs
@@ -30,7 +30,7 @@ public partial class ECFieldF2m
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldF2m.html#%3Cinit%3E(int,int[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldF2m.html#%3Cinit%3E(int,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public ECFieldF2m(int arg0, int[] arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldF2m.html#%3Cinit%3E(int,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldF2m.html#%3Cinit%3E(int,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -48,7 +48,7 @@ public ECFieldF2m(int arg0, Java.Math.BigInteger arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldF2m.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldF2m.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ECFieldF2m(int arg0)
@@ -72,32 +72,36 @@ public ECFieldF2m(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldF2m.html#getFieldSize()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldF2m.html#getFieldSize()"/>
         /// </summary>
-        public int FieldSize
+        /// <returns><see cref="int"/></returns>
+        public int GetFieldSize()
         {
-            get { return IExecuteWithSignature<int>("getFieldSize", "()I"); }
+            return IExecuteWithSignature<int>("getFieldSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldF2m.html#getM()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldF2m.html#getM()"/>
         /// </summary>
-        public int M
+        /// <returns><see cref="int"/></returns>
+        public int GetM()
         {
-            get { return IExecuteWithSignature<int>("getM", "()I"); }
+            return IExecuteWithSignature<int>("getM", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldF2m.html#getMidTermsOfReductionPolynomial()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldF2m.html#getMidTermsOfReductionPolynomial()"/>
         /// </summary>
-        public int[] MidTermsOfReductionPolynomial
+        /// <returns><see cref="int"/></returns>
+        public int[] GetMidTermsOfReductionPolynomial()
         {
-            get { return IExecuteWithSignatureArray<int>("getMidTermsOfReductionPolynomial", "()[I"); }
+            return IExecuteWithSignatureArray<int>("getMidTermsOfReductionPolynomial", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldF2m.html#getReductionPolynomial()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldF2m.html#getReductionPolynomial()"/>
         /// </summary>
-        public Java.Math.BigInteger ReductionPolynomial
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetReductionPolynomial()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getReductionPolynomial", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getReductionPolynomial", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/ECFieldFp.cs b/src/net/Netdroid/Generated/Java/Security/Spec/ECFieldFp.cs
index f70497a03..2eb08728a 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/ECFieldFp.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/ECFieldFp.cs
@@ -30,7 +30,7 @@ public partial class ECFieldFp
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldFp.html#%3Cinit%3E(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldFp.html#%3Cinit%3E(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         public ECFieldFp(Java.Math.BigInteger arg0)
@@ -54,18 +54,20 @@ public ECFieldFp(Java.Math.BigInteger arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldFp.html#getFieldSize()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldFp.html#getFieldSize()"/>
         /// </summary>
-        public int FieldSize
+        /// <returns><see cref="int"/></returns>
+        public int GetFieldSize()
         {
-            get { return IExecuteWithSignature<int>("getFieldSize", "()I"); }
+            return IExecuteWithSignature<int>("getFieldSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECFieldFp.html#getP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECFieldFp.html#getP()"/>
         /// </summary>
-        public Java.Math.BigInteger P
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/ECGenParameterSpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/ECGenParameterSpec.cs
index d433650b7..c07816f69 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/ECGenParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/ECGenParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class ECGenParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECGenParameterSpec.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECGenParameterSpec.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public ECGenParameterSpec(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/ECParameterSpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/ECParameterSpec.cs
index f6e845323..ebdfa8c35 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/ECParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/ECParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class ECParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECParameterSpec.html#%3Cinit%3E(java.security.spec.EllipticCurve,java.security.spec.ECPoint,java.math.BigInteger,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECParameterSpec.html#%3Cinit%3E(java.security.spec.EllipticCurve,java.security.spec.ECPoint,java.math.BigInteger,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.EllipticCurve"/></param>
         /// <param name="arg1"><see cref="Java.Security.Spec.ECPoint"/></param>
@@ -57,32 +57,36 @@ public ECParameterSpec(Java.Security.Spec.EllipticCurve arg0, Java.Security.Spec
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECParameterSpec.html#getCofactor()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECParameterSpec.html#getCofactor()"/>
         /// </summary>
-        public int Cofactor
+        /// <returns><see cref="int"/></returns>
+        public int GetCofactor()
         {
-            get { return IExecuteWithSignature<int>("getCofactor", "()I"); }
+            return IExecuteWithSignature<int>("getCofactor", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECParameterSpec.html#getCurve()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECParameterSpec.html#getOrder()"/>
         /// </summary>
-        public Java.Security.Spec.EllipticCurve Curve
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetOrder()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.EllipticCurve>("getCurve", "()Ljava/security/spec/EllipticCurve;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getOrder", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECParameterSpec.html#getGenerator()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECParameterSpec.html#getGenerator()"/>
         /// </summary>
-        public Java.Security.Spec.ECPoint Generator
+        /// <returns><see cref="Java.Security.Spec.ECPoint"/></returns>
+        public Java.Security.Spec.ECPoint GetGenerator()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.ECPoint>("getGenerator", "()Ljava/security/spec/ECPoint;"); }
+            return IExecuteWithSignature<Java.Security.Spec.ECPoint>("getGenerator", "()Ljava/security/spec/ECPoint;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECParameterSpec.html#getOrder()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECParameterSpec.html#getCurve()"/>
         /// </summary>
-        public Java.Math.BigInteger Order
+        /// <returns><see cref="Java.Security.Spec.EllipticCurve"/></returns>
+        public Java.Security.Spec.EllipticCurve GetCurve()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getOrder", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Security.Spec.EllipticCurve>("getCurve", "()Ljava/security/spec/EllipticCurve;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/ECPoint.cs b/src/net/Netdroid/Generated/Java/Security/Spec/ECPoint.cs
index 4b10dabe3..bce20e8ad 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/ECPoint.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/ECPoint.cs
@@ -30,7 +30,7 @@ public partial class ECPoint
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPoint.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPoint.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -47,7 +47,7 @@ public ECPoint(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPoint.html#POINT_INFINITY"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPoint.html#POINT_INFINITY"/>
         /// </summary>
         public static Java.Security.Spec.ECPoint POINT_INFINITY { get { if (!_POINT_INFINITYReady) { _POINT_INFINITYContent = SGetField<Java.Security.Spec.ECPoint>(LocalBridgeClazz, "POINT_INFINITY"); _POINT_INFINITYReady = true; } return _POINT_INFINITYContent; } }
         private static Java.Security.Spec.ECPoint _POINT_INFINITYContent = default;
@@ -61,18 +61,20 @@ public ECPoint(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPoint.html#getAffineX()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPoint.html#getAffineX()"/>
         /// </summary>
-        public Java.Math.BigInteger AffineX
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetAffineX()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getAffineX", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getAffineX", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPoint.html#getAffineY()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPoint.html#getAffineY()"/>
         /// </summary>
-        public Java.Math.BigInteger AffineY
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetAffineY()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getAffineY", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getAffineY", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/ECPrivateKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/ECPrivateKeySpec.cs
index ab50e1f8a..6bb8958a8 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/ECPrivateKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/ECPrivateKeySpec.cs
@@ -30,7 +30,7 @@ public partial class ECPrivateKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.security.spec.ECParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.security.spec.ECParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Security.Spec.ECParameterSpec"/></param>
@@ -55,18 +55,20 @@ public ECPrivateKeySpec(Java.Math.BigInteger arg0, Java.Security.Spec.ECParamete
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPrivateKeySpec.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPrivateKeySpec.html#getS()"/>
         /// </summary>
-        public Java.Security.Spec.ECParameterSpec Params
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetS()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.ECParameterSpec>("getParams", "()Ljava/security/spec/ECParameterSpec;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getS", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPrivateKeySpec.html#getS()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPrivateKeySpec.html#getParams()"/>
         /// </summary>
-        public Java.Math.BigInteger S
+        /// <returns><see cref="Java.Security.Spec.ECParameterSpec"/></returns>
+        public Java.Security.Spec.ECParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getS", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Security.Spec.ECParameterSpec>("getParams", "()Ljava/security/spec/ECParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/ECPublicKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/ECPublicKeySpec.cs
index 8d069c7bf..37a39d04b 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/ECPublicKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/ECPublicKeySpec.cs
@@ -30,7 +30,7 @@ public partial class ECPublicKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPublicKeySpec.html#%3Cinit%3E(java.security.spec.ECPoint,java.security.spec.ECParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPublicKeySpec.html#%3Cinit%3E(java.security.spec.ECPoint,java.security.spec.ECParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.ECPoint"/></param>
         /// <param name="arg1"><see cref="Java.Security.Spec.ECParameterSpec"/></param>
@@ -55,18 +55,20 @@ public ECPublicKeySpec(Java.Security.Spec.ECPoint arg0, Java.Security.Spec.ECPar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPublicKeySpec.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPublicKeySpec.html#getParams()"/>
         /// </summary>
-        public Java.Security.Spec.ECParameterSpec Params
+        /// <returns><see cref="Java.Security.Spec.ECParameterSpec"/></returns>
+        public Java.Security.Spec.ECParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.ECParameterSpec>("getParams", "()Ljava/security/spec/ECParameterSpec;"); }
+            return IExecuteWithSignature<Java.Security.Spec.ECParameterSpec>("getParams", "()Ljava/security/spec/ECParameterSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/ECPublicKeySpec.html#getW()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/ECPublicKeySpec.html#getW()"/>
         /// </summary>
-        public Java.Security.Spec.ECPoint W
+        /// <returns><see cref="Java.Security.Spec.ECPoint"/></returns>
+        public Java.Security.Spec.ECPoint GetW()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.ECPoint>("getW", "()Ljava/security/spec/ECPoint;"); }
+            return IExecuteWithSignature<Java.Security.Spec.ECPoint>("getW", "()Ljava/security/spec/ECPoint;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/EdECPoint.cs b/src/net/Netdroid/Generated/Java/Security/Spec/EdECPoint.cs
deleted file mode 100644
index d40a7c465..000000000
--- a/src/net/Netdroid/Generated/Java/Security/Spec/EdECPoint.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Security.Spec
-{
-    #region EdECPoint
-    public partial class EdECPoint
-    {
-        #region Constructors
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPoint.html#%3Cinit%3E(boolean,java.math.BigInteger)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
-        /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
-        public EdECPoint(bool arg0, Java.Math.BigInteger arg1)
-            : base(arg0, arg1)
-        {
-        }
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPoint.html#getY()"/> 
-        /// </summary>
-        public Java.Math.BigInteger Y
-        {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPoint.html#isXOdd()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsXOdd()
-        {
-            return IExecuteWithSignature<bool>("isXOdd", "()Z");
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/EdECPrivateKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/EdECPrivateKeySpec.cs
deleted file mode 100644
index eae04a8cb..000000000
--- a/src/net/Netdroid/Generated/Java/Security/Spec/EdECPrivateKeySpec.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Security.Spec
-{
-    #region EdECPrivateKeySpec
-    public partial class EdECPrivateKeySpec
-    {
-        #region Constructors
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPrivateKeySpec.html#%3Cinit%3E(java.security.spec.NamedParameterSpec,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.Spec.NamedParameterSpec"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        public EdECPrivateKeySpec(Java.Security.Spec.NamedParameterSpec arg0, byte[] arg1)
-            : base(arg0, arg1)
-        {
-        }
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPrivateKeySpec.html#getBytes()"/> 
-        /// </summary>
-        public byte[] Bytes
-        {
-            get { return IExecuteWithSignatureArray<byte>("getBytes", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPrivateKeySpec.html#getParams()"/> 
-        /// </summary>
-        public Java.Security.Spec.NamedParameterSpec Params
-        {
-            get { return IExecuteWithSignature<Java.Security.Spec.NamedParameterSpec>("getParams", "()Ljava/security/spec/NamedParameterSpec;"); }
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/EdECPublicKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/EdECPublicKeySpec.cs
deleted file mode 100644
index 71ffd359f..000000000
--- a/src/net/Netdroid/Generated/Java/Security/Spec/EdECPublicKeySpec.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Security.Spec
-{
-    #region EdECPublicKeySpec
-    public partial class EdECPublicKeySpec
-    {
-        #region Constructors
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPublicKeySpec.html#%3Cinit%3E(java.security.spec.NamedParameterSpec,java.security.spec.EdECPoint)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Security.Spec.NamedParameterSpec"/></param>
-        /// <param name="arg1"><see cref="Java.Security.Spec.EdECPoint"/></param>
-        public EdECPublicKeySpec(Java.Security.Spec.NamedParameterSpec arg0, Java.Security.Spec.EdECPoint arg1)
-            : base(arg0, arg1)
-        {
-        }
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPublicKeySpec.html#getParams()"/> 
-        /// </summary>
-        public Java.Security.Spec.NamedParameterSpec Params
-        {
-            get { return IExecuteWithSignature<Java.Security.Spec.NamedParameterSpec>("getParams", "()Ljava/security/spec/NamedParameterSpec;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EdECPublicKeySpec.html#getPoint()"/> 
-        /// </summary>
-        public Java.Security.Spec.EdECPoint Point
-        {
-            get { return IExecuteWithSignature<Java.Security.Spec.EdECPoint>("getPoint", "()Ljava/security/spec/EdECPoint;"); }
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/EllipticCurve.cs b/src/net/Netdroid/Generated/Java/Security/Spec/EllipticCurve.cs
index 82844ee8f..68a7fe38b 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/EllipticCurve.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/EllipticCurve.cs
@@ -30,7 +30,7 @@ public partial class EllipticCurve
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EllipticCurve.html#%3Cinit%3E(java.security.spec.ECField,java.math.BigInteger,java.math.BigInteger,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/EllipticCurve.html#%3Cinit%3E(java.security.spec.ECField,java.math.BigInteger,java.math.BigInteger,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.ECField"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -41,7 +41,7 @@ public EllipticCurve(Java.Security.Spec.ECField arg0, Java.Math.BigInteger arg1,
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EllipticCurve.html#%3Cinit%3E(java.security.spec.ECField,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/EllipticCurve.html#%3Cinit%3E(java.security.spec.ECField,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.ECField"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -67,32 +67,36 @@ public EllipticCurve(Java.Security.Spec.ECField arg0, Java.Math.BigInteger arg1,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EllipticCurve.html#getA()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/EllipticCurve.html#getSeed()"/>
         /// </summary>
-        public Java.Math.BigInteger A
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSeed()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getA", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignatureArray<byte>("getSeed", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EllipticCurve.html#getB()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/EllipticCurve.html#getA()"/>
         /// </summary>
-        public Java.Math.BigInteger B
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetA()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getB", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getA", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EllipticCurve.html#getField()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/EllipticCurve.html#getB()"/>
         /// </summary>
-        public Java.Security.Spec.ECField Field
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetB()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.ECField>("getField", "()Ljava/security/spec/ECField;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getB", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EllipticCurve.html#getSeed()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/EllipticCurve.html#getField()"/>
         /// </summary>
-        public byte[] Seed
+        /// <returns><see cref="Java.Security.Spec.ECField"/></returns>
+        public Java.Security.Spec.ECField GetField()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSeed", "()[B"); }
+            return IExecuteWithSignature<Java.Security.Spec.ECField>("getField", "()Ljava/security/spec/ECField;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/EncodedKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/EncodedKeySpec.cs
index 982a269c7..1d6e93710 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/EncodedKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/EncodedKeySpec.cs
@@ -30,7 +30,7 @@ public partial class EncodedKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EncodedKeySpec.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/EncodedKeySpec.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public EncodedKeySpec(byte[] arg0)
@@ -54,25 +54,28 @@ public EncodedKeySpec(byte[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EncodedKeySpec.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/EncodedKeySpec.html#getFormat()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFormat()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EncodedKeySpec.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/EncodedKeySpec.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/EncodedKeySpec.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/EncodedKeySpec.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Format
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/MGF1ParameterSpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/MGF1ParameterSpec.cs
index 20c7b2897..b8f002258 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/MGF1ParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/MGF1ParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class MGF1ParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public MGF1ParameterSpec(Java.Lang.String arg0)
@@ -46,67 +46,43 @@ public MGF1ParameterSpec(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA1"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#SHA1"/>
         /// </summary>
         public static Java.Security.Spec.MGF1ParameterSpec SHA1 { get { if (!_SHA1Ready) { _SHA1Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA1"); _SHA1Ready = true; } return _SHA1Content; } }
         private static Java.Security.Spec.MGF1ParameterSpec _SHA1Content = default;
         private static bool _SHA1Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA224"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#SHA224"/>
         /// </summary>
         public static Java.Security.Spec.MGF1ParameterSpec SHA224 { get { if (!_SHA224Ready) { _SHA224Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA224"); _SHA224Ready = true; } return _SHA224Content; } }
         private static Java.Security.Spec.MGF1ParameterSpec _SHA224Content = default;
         private static bool _SHA224Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA256"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#SHA256"/>
         /// </summary>
         public static Java.Security.Spec.MGF1ParameterSpec SHA256 { get { if (!_SHA256Ready) { _SHA256Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA256"); _SHA256Ready = true; } return _SHA256Content; } }
         private static Java.Security.Spec.MGF1ParameterSpec _SHA256Content = default;
         private static bool _SHA256Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA3_224"/>
-        /// </summary>
-        public static Java.Security.Spec.MGF1ParameterSpec SHA3_224 { get { if (!_SHA3_224Ready) { _SHA3_224Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA3_224"); _SHA3_224Ready = true; } return _SHA3_224Content; } }
-        private static Java.Security.Spec.MGF1ParameterSpec _SHA3_224Content = default;
-        private static bool _SHA3_224Ready = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA3_256"/>
-        /// </summary>
-        public static Java.Security.Spec.MGF1ParameterSpec SHA3_256 { get { if (!_SHA3_256Ready) { _SHA3_256Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA3_256"); _SHA3_256Ready = true; } return _SHA3_256Content; } }
-        private static Java.Security.Spec.MGF1ParameterSpec _SHA3_256Content = default;
-        private static bool _SHA3_256Ready = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA3_384"/>
-        /// </summary>
-        public static Java.Security.Spec.MGF1ParameterSpec SHA3_384 { get { if (!_SHA3_384Ready) { _SHA3_384Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA3_384"); _SHA3_384Ready = true; } return _SHA3_384Content; } }
-        private static Java.Security.Spec.MGF1ParameterSpec _SHA3_384Content = default;
-        private static bool _SHA3_384Ready = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA3_512"/>
-        /// </summary>
-        public static Java.Security.Spec.MGF1ParameterSpec SHA3_512 { get { if (!_SHA3_512Ready) { _SHA3_512Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA3_512"); _SHA3_512Ready = true; } return _SHA3_512Content; } }
-        private static Java.Security.Spec.MGF1ParameterSpec _SHA3_512Content = default;
-        private static bool _SHA3_512Ready = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA384"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#SHA384"/>
         /// </summary>
         public static Java.Security.Spec.MGF1ParameterSpec SHA384 { get { if (!_SHA384Ready) { _SHA384Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA384"); _SHA384Ready = true; } return _SHA384Content; } }
         private static Java.Security.Spec.MGF1ParameterSpec _SHA384Content = default;
         private static bool _SHA384Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA512"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#SHA512"/>
         /// </summary>
         public static Java.Security.Spec.MGF1ParameterSpec SHA512 { get { if (!_SHA512Ready) { _SHA512Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA512"); _SHA512Ready = true; } return _SHA512Content; } }
         private static Java.Security.Spec.MGF1ParameterSpec _SHA512Content = default;
         private static bool _SHA512Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA512_224"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#SHA512_224"/>
         /// </summary>
         public static Java.Security.Spec.MGF1ParameterSpec SHA512_224 { get { if (!_SHA512_224Ready) { _SHA512_224Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA512_224"); _SHA512_224Ready = true; } return _SHA512_224Content; } }
         private static Java.Security.Spec.MGF1ParameterSpec _SHA512_224Content = default;
         private static bool _SHA512_224Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#SHA512_256"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#SHA512_256"/>
         /// </summary>
         public static Java.Security.Spec.MGF1ParameterSpec SHA512_256 { get { if (!_SHA512_256Ready) { _SHA512_256Content = SGetField<Java.Security.Spec.MGF1ParameterSpec>(LocalBridgeClazz, "SHA512_256"); _SHA512_256Ready = true; } return _SHA512_256Content; } }
         private static Java.Security.Spec.MGF1ParameterSpec _SHA512_256Content = default;
@@ -120,11 +96,12 @@ public MGF1ParameterSpec(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/MGF1ParameterSpec.html#getDigestAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/MGF1ParameterSpec.html#getDigestAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String DigestAlgorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDigestAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDigestAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDigestAlgorithm", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/NamedParameterSpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/NamedParameterSpec.cs
index 59c34d68f..93cf0dbc9 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/NamedParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/NamedParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class NamedParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/NamedParameterSpec.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/NamedParameterSpec.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public NamedParameterSpec(Java.Lang.String arg0)
@@ -46,25 +46,13 @@ public NamedParameterSpec(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/NamedParameterSpec.html#ED25519"/>
-        /// </summary>
-        public static Java.Security.Spec.NamedParameterSpec ED25519 { get { if (!_ED25519Ready) { _ED25519Content = SGetField<Java.Security.Spec.NamedParameterSpec>(LocalBridgeClazz, "ED25519"); _ED25519Ready = true; } return _ED25519Content; } }
-        private static Java.Security.Spec.NamedParameterSpec _ED25519Content = default;
-        private static bool _ED25519Ready = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/NamedParameterSpec.html#ED448"/>
-        /// </summary>
-        public static Java.Security.Spec.NamedParameterSpec ED448 { get { if (!_ED448Ready) { _ED448Content = SGetField<Java.Security.Spec.NamedParameterSpec>(LocalBridgeClazz, "ED448"); _ED448Ready = true; } return _ED448Content; } }
-        private static Java.Security.Spec.NamedParameterSpec _ED448Content = default;
-        private static bool _ED448Ready = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/NamedParameterSpec.html#X25519"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/NamedParameterSpec.html#X25519"/>
         /// </summary>
         public static Java.Security.Spec.NamedParameterSpec X25519 { get { if (!_X25519Ready) { _X25519Content = SGetField<Java.Security.Spec.NamedParameterSpec>(LocalBridgeClazz, "X25519"); _X25519Ready = true; } return _X25519Content; } }
         private static Java.Security.Spec.NamedParameterSpec _X25519Content = default;
         private static bool _X25519Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/NamedParameterSpec.html#X448"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/NamedParameterSpec.html#X448"/>
         /// </summary>
         public static Java.Security.Spec.NamedParameterSpec X448 { get { if (!_X448Ready) { _X448Content = SGetField<Java.Security.Spec.NamedParameterSpec>(LocalBridgeClazz, "X448"); _X448Ready = true; } return _X448Content; } }
         private static Java.Security.Spec.NamedParameterSpec _X448Content = default;
@@ -78,11 +66,12 @@ public NamedParameterSpec(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/NamedParameterSpec.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/NamedParameterSpec.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/PKCS8EncodedKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/PKCS8EncodedKeySpec.cs
index 3a49a9bf6..b3f901bf8 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/PKCS8EncodedKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/PKCS8EncodedKeySpec.cs
@@ -30,7 +30,7 @@ public partial class PKCS8EncodedKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PKCS8EncodedKeySpec.html#%3Cinit%3E(byte[],java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/PKCS8EncodedKeySpec.html#%3Cinit%3E(byte[],java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public PKCS8EncodedKeySpec(byte[] arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PKCS8EncodedKeySpec.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/PKCS8EncodedKeySpec.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public PKCS8EncodedKeySpec(byte[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/PSSParameterSpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/PSSParameterSpec.cs
index 551a53994..03477bbb9 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/PSSParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/PSSParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class PSSParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public PSSParameterSpec(int arg0)
@@ -38,7 +38,7 @@ public PSSParameterSpec(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#%3Cinit%3E(java.lang.String,java.lang.String,java.security.spec.AlgorithmParameterSpec,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#%3Cinit%3E(java.lang.String,java.lang.String,java.security.spec.AlgorithmParameterSpec,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -58,13 +58,13 @@ public PSSParameterSpec(Java.Lang.String arg0, Java.Lang.String arg1, Java.Secur
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#TRAILER_FIELD_BC"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#TRAILER_FIELD_BC"/>
         /// </summary>
         public static int TRAILER_FIELD_BC { get { if (!_TRAILER_FIELD_BCReady) { _TRAILER_FIELD_BCContent = SGetField<int>(LocalBridgeClazz, "TRAILER_FIELD_BC"); _TRAILER_FIELD_BCReady = true; } return _TRAILER_FIELD_BCContent; } }
         private static int _TRAILER_FIELD_BCContent = default;
         private static bool _TRAILER_FIELD_BCReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#DEFAULT"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#DEFAULT"/>
         /// </summary>
         public static Java.Security.Spec.PSSParameterSpec DEFAULT { get { if (!_DEFAULTReady) { _DEFAULTContent = SGetField<Java.Security.Spec.PSSParameterSpec>(LocalBridgeClazz, "DEFAULT"); _DEFAULTReady = true; } return _DEFAULTContent; } }
         private static Java.Security.Spec.PSSParameterSpec _DEFAULTContent = default;
@@ -78,39 +78,44 @@ public PSSParameterSpec(Java.Lang.String arg0, Java.Lang.String arg1, Java.Secur
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#getDigestAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#getSaltLength()"/>
         /// </summary>
-        public Java.Lang.String DigestAlgorithm
+        /// <returns><see cref="int"/></returns>
+        public int GetSaltLength()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDigestAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getSaltLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#getMGFAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#getTrailerField()"/>
         /// </summary>
-        public Java.Lang.String MGFAlgorithm
+        /// <returns><see cref="int"/></returns>
+        public int GetTrailerField()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMGFAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getTrailerField", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#getMGFParameters()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#getDigestAlgorithm()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec MGFParameters
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDigestAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getMGFParameters", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDigestAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#getSaltLength()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#getMGFAlgorithm()"/>
         /// </summary>
-        public int SaltLength
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMGFAlgorithm()
         {
-            get { return IExecuteWithSignature<int>("getSaltLength", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMGFAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/PSSParameterSpec.html#getTrailerField()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/PSSParameterSpec.html#getMGFParameters()"/>
         /// </summary>
-        public int TrailerField
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetMGFParameters()
         {
-            get { return IExecuteWithSignature<int>("getTrailerField", "()I"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getMGFParameters", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/RSAKeyGenParameterSpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/RSAKeyGenParameterSpec.cs
index 729d597f9..a4b7a3e86 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/RSAKeyGenParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/RSAKeyGenParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class RSAKeyGenParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAKeyGenParameterSpec.html#%3Cinit%3E(int,java.math.BigInteger,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html#%3Cinit%3E(int,java.math.BigInteger,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -40,7 +40,7 @@ public RSAKeyGenParameterSpec(int arg0, Java.Math.BigInteger arg1, Java.Security
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAKeyGenParameterSpec.html#%3Cinit%3E(int,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html#%3Cinit%3E(int,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -57,13 +57,13 @@ public RSAKeyGenParameterSpec(int arg0, Java.Math.BigInteger arg1)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAKeyGenParameterSpec.html#F0"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html#F0"/>
         /// </summary>
         public static Java.Math.BigInteger F0 { get { if (!_F0Ready) { _F0Content = SGetField<Java.Math.BigInteger>(LocalBridgeClazz, "F0"); _F0Ready = true; } return _F0Content; } }
         private static Java.Math.BigInteger _F0Content = default;
         private static bool _F0Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAKeyGenParameterSpec.html#F4"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html#F4"/>
         /// </summary>
         public static Java.Math.BigInteger F4 { get { if (!_F4Ready) { _F4Content = SGetField<Java.Math.BigInteger>(LocalBridgeClazz, "F4"); _F4Ready = true; } return _F4Content; } }
         private static Java.Math.BigInteger _F4Content = default;
@@ -77,25 +77,28 @@ public RSAKeyGenParameterSpec(int arg0, Java.Math.BigInteger arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAKeyGenParameterSpec.html#getKeyParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html#getKeysize()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec KeyParams
+        /// <returns><see cref="int"/></returns>
+        public int GetKeysize()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getKeyParams", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<int>("getKeysize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAKeyGenParameterSpec.html#getKeysize()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html#getPublicExponent()"/>
         /// </summary>
-        public int Keysize
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPublicExponent()
         {
-            get { return IExecuteWithSignature<int>("getKeysize", "()I"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAKeyGenParameterSpec.html#getPublicExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAKeyGenParameterSpec.html#getKeyParams()"/>
         /// </summary>
-        public Java.Math.BigInteger PublicExponent
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetKeyParams()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getKeyParams", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/RSAMultiPrimePrivateCrtKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/RSAMultiPrimePrivateCrtKeySpec.cs
index 8200c65e1..02c22e6f5 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/RSAMultiPrimePrivateCrtKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/RSAMultiPrimePrivateCrtKeySpec.cs
@@ -30,7 +30,7 @@ public partial class RSAMultiPrimePrivateCrtKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.security.spec.RSAOtherPrimeInfo[],java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.security.spec.RSAOtherPrimeInfo[],java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -47,7 +47,7 @@ public RSAMultiPrimePrivateCrtKeySpec(Java.Math.BigInteger arg0, Java.Math.BigIn
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.security.spec.RSAOtherPrimeInfo[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.security.spec.RSAOtherPrimeInfo[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -79,53 +79,60 @@ public RSAMultiPrimePrivateCrtKeySpec(Java.Math.BigInteger arg0, Java.Math.BigIn
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getCrtCoefficient()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getCrtCoefficient()"/>
         /// </summary>
-        public Java.Math.BigInteger CrtCoefficient
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetCrtCoefficient()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getOtherPrimeInfo()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPrimeExponentP()"/>
         /// </summary>
-        public Java.Security.Spec.RSAOtherPrimeInfo[] OtherPrimeInfo
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeExponentP()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Spec.RSAOtherPrimeInfo>("getOtherPrimeInfo", "()[Ljava/security/spec/RSAOtherPrimeInfo;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPrimeExponentP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPrimeExponentQ()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeExponentP
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeExponentQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPrimeExponentQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPrimeP()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeExponentQ
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPrimeP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPrimeQ()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeP
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPrimeQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPublicExponent()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeQ
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPublicExponent()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getPublicExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.html#getOtherPrimeInfo()"/>
         /// </summary>
-        public Java.Math.BigInteger PublicExponent
+        /// <returns><see cref="Java.Security.Spec.RSAOtherPrimeInfo"/></returns>
+        public Java.Security.Spec.RSAOtherPrimeInfo[] GetOtherPrimeInfo()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignatureArray<Java.Security.Spec.RSAOtherPrimeInfo>("getOtherPrimeInfo", "()[Ljava/security/spec/RSAOtherPrimeInfo;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/RSAOtherPrimeInfo.cs b/src/net/Netdroid/Generated/Java/Security/Spec/RSAOtherPrimeInfo.cs
index b48d3b6fa..7d8413388 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/RSAOtherPrimeInfo.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/RSAOtherPrimeInfo.cs
@@ -30,7 +30,7 @@ public partial class RSAOtherPrimeInfo
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAOtherPrimeInfo.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAOtherPrimeInfo.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -56,25 +56,28 @@ public RSAOtherPrimeInfo(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, J
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAOtherPrimeInfo.html#getCrtCoefficient()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAOtherPrimeInfo.html#getCrtCoefficient()"/>
         /// </summary>
-        public Java.Math.BigInteger CrtCoefficient
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetCrtCoefficient()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAOtherPrimeInfo.html#getExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAOtherPrimeInfo.html#getExponent()"/>
         /// </summary>
-        public Java.Math.BigInteger Exponent
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetExponent()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getExponent", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAOtherPrimeInfo.html#getPrime()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAOtherPrimeInfo.html#getPrime()"/>
         /// </summary>
-        public Java.Math.BigInteger Prime
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrime()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrime", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrime", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/RSAPrivateCrtKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/RSAPrivateCrtKeySpec.cs
index e1b684285..fb6744dbd 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/RSAPrivateCrtKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/RSAPrivateCrtKeySpec.cs
@@ -30,7 +30,7 @@ public partial class RSAPrivateCrtKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -46,7 +46,7 @@ public RSAPrivateCrtKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -77,46 +77,52 @@ public RSAPrivateCrtKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html#getCrtCoefficient()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html#getCrtCoefficient()"/>
         /// </summary>
-        public Java.Math.BigInteger CrtCoefficient
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetCrtCoefficient()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getCrtCoefficient", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html#getPrimeExponentP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html#getPrimeExponentP()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeExponentP
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeExponentP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html#getPrimeExponentQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html#getPrimeExponentQ()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeExponentQ
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeExponentQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeExponentQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html#getPrimeP()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html#getPrimeP()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeP
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html#getPrimeQ()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html#getPrimeQ()"/>
         /// </summary>
-        public Java.Math.BigInteger PrimeQ
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrimeQ()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeQ", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrimeQ", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateCrtKeySpec.html#getPublicExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateCrtKeySpec.html#getPublicExponent()"/>
         /// </summary>
-        public Java.Math.BigInteger PublicExponent
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPublicExponent()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/RSAPrivateKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/RSAPrivateKeySpec.cs
index bc8b33000..c8ccf23e2 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/RSAPrivateKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/RSAPrivateKeySpec.cs
@@ -30,7 +30,7 @@ public partial class RSAPrivateKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -40,7 +40,7 @@ public RSAPrivateKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, J
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -65,25 +65,28 @@ public RSAPrivateKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateKeySpec.html#getModulus()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateKeySpec.html#getModulus()"/>
         /// </summary>
-        public Java.Math.BigInteger Modulus
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetModulus()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getModulus", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getModulus", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateKeySpec.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateKeySpec.html#getPrivateExponent()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec Params
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPrivateExponent()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPrivateExponent", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPrivateKeySpec.html#getPrivateExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPrivateKeySpec.html#getParams()"/>
         /// </summary>
-        public Java.Math.BigInteger PrivateExponent
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPrivateExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/RSAPublicKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/RSAPublicKeySpec.cs
index f714f85a6..026c974cb 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/RSAPublicKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/RSAPublicKeySpec.cs
@@ -30,7 +30,7 @@ public partial class RSAPublicKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPublicKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPublicKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -40,7 +40,7 @@ public RSAPublicKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, Ja
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPublicKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPublicKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -65,25 +65,28 @@ public RSAPublicKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPublicKeySpec.html#getModulus()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPublicKeySpec.html#getModulus()"/>
         /// </summary>
-        public Java.Math.BigInteger Modulus
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetModulus()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getModulus", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getModulus", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPublicKeySpec.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPublicKeySpec.html#getPublicExponent()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec Params
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetPublicExponent()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/RSAPublicKeySpec.html#getPublicExponent()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/RSAPublicKeySpec.html#getParams()"/>
         /// </summary>
-        public Java.Math.BigInteger PublicExponent
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getPublicExponent", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/X509EncodedKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/X509EncodedKeySpec.cs
index eba99eab0..5e692674a 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/X509EncodedKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/X509EncodedKeySpec.cs
@@ -30,7 +30,7 @@ public partial class X509EncodedKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/X509EncodedKeySpec.html#%3Cinit%3E(byte[],java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/X509EncodedKeySpec.html#%3Cinit%3E(byte[],java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public X509EncodedKeySpec(byte[] arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/X509EncodedKeySpec.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/X509EncodedKeySpec.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public X509EncodedKeySpec(byte[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/XECPrivateKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/XECPrivateKeySpec.cs
index 06b61d7e7..98018e796 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/XECPrivateKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/XECPrivateKeySpec.cs
@@ -30,7 +30,7 @@ public partial class XECPrivateKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/XECPrivateKeySpec.html#%3Cinit%3E(java.security.spec.AlgorithmParameterSpec,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/XECPrivateKeySpec.html#%3Cinit%3E(java.security.spec.AlgorithmParameterSpec,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -55,18 +55,20 @@ public XECPrivateKeySpec(Java.Security.Spec.AlgorithmParameterSpec arg0, byte[]
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/XECPrivateKeySpec.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/XECPrivateKeySpec.html#getScalar()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec Params
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetScalar()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignatureArray<byte>("getScalar", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/XECPrivateKeySpec.html#getScalar()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/XECPrivateKeySpec.html#getParams()"/>
         /// </summary>
-        public byte[] Scalar
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetParams()
         {
-            get { return IExecuteWithSignatureArray<byte>("getScalar", "()[B"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Spec/XECPublicKeySpec.cs b/src/net/Netdroid/Generated/Java/Security/Spec/XECPublicKeySpec.cs
index 165ecb2e0..e1a53ef7a 100644
--- a/src/net/Netdroid/Generated/Java/Security/Spec/XECPublicKeySpec.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Spec/XECPublicKeySpec.cs
@@ -30,7 +30,7 @@ public partial class XECPublicKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/XECPublicKeySpec.html#%3Cinit%3E(java.security.spec.AlgorithmParameterSpec,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/java/security/spec/XECPublicKeySpec.html#%3Cinit%3E(java.security.spec.AlgorithmParameterSpec,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -55,18 +55,20 @@ public XECPublicKeySpec(Java.Security.Spec.AlgorithmParameterSpec arg0, Java.Mat
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/XECPublicKeySpec.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/XECPublicKeySpec.html#getU()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec Params
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetU()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getU", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/spec/XECPublicKeySpec.html#getU()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/spec/XECPublicKeySpec.html#getParams()"/>
         /// </summary>
-        public Java.Math.BigInteger U
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getU", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParams", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/Timestamp.cs b/src/net/Netdroid/Generated/Java/Security/Timestamp.cs
index 70802e761..0a6b01ab0 100644
--- a/src/net/Netdroid/Generated/Java/Security/Timestamp.cs
+++ b/src/net/Netdroid/Generated/Java/Security/Timestamp.cs
@@ -30,7 +30,7 @@ public partial class Timestamp
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Timestamp.html#%3Cinit%3E(java.util.Date,java.security.cert.CertPath)"/>
+        /// <see href="https://developer.android.com/reference/java/security/Timestamp.html#%3Cinit%3E(java.util.Date,java.security.cert.CertPath)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.CertPath"/></param>
@@ -55,18 +55,20 @@ public Timestamp(Java.Util.Date arg0, Java.Security.Cert.CertPath arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Timestamp.html#getTimestamp()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Timestamp.html#getSignerCertPath()"/>
         /// </summary>
-        public Java.Util.Date GetTimestamp
+        /// <returns><see cref="Java.Security.Cert.CertPath"/></returns>
+        public Java.Security.Cert.CertPath GetSignerCertPath()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getTimestamp", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertPath>("getSignerCertPath", "()Ljava/security/cert/CertPath;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/Timestamp.html#getSignerCertPath()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/Timestamp.html#getTimestamp()"/>
         /// </summary>
-        public Java.Security.Cert.CertPath SignerCertPath
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetTimestamp()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertPath>("getSignerCertPath", "()Ljava/security/cert/CertPath;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getTimestamp", "()Ljava/util/Date;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Security/UnresolvedPermission.cs b/src/net/Netdroid/Generated/Java/Security/UnresolvedPermission.cs
index 1acfee9f5..02191ca13 100644
--- a/src/net/Netdroid/Generated/Java/Security/UnresolvedPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Security/UnresolvedPermission.cs
@@ -30,7 +30,7 @@ public partial class UnresolvedPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/UnresolvedPermission.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.security.cert.Certificate[])"/>
+        /// <see href="https://developer.android.com/reference/java/security/UnresolvedPermission.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.security.cert.Certificate[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -57,32 +57,36 @@ public UnresolvedPermission(Java.Lang.String arg0, Java.Lang.String arg1, Java.L
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/UnresolvedPermission.html#getUnresolvedActions()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/UnresolvedPermission.html#getUnresolvedActions()"/>
         /// </summary>
-        public Java.Lang.String UnresolvedActions
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUnresolvedActions()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUnresolvedActions", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUnresolvedActions", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/UnresolvedPermission.html#getUnresolvedCerts()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/UnresolvedPermission.html#getUnresolvedName()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] UnresolvedCerts
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUnresolvedName()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getUnresolvedCerts", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUnresolvedName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/UnresolvedPermission.html#getUnresolvedName()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/UnresolvedPermission.html#getUnresolvedType()"/>
         /// </summary>
-        public Java.Lang.String UnresolvedName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUnresolvedType()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUnresolvedName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUnresolvedType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/security/UnresolvedPermission.html#getUnresolvedType()"/> 
+        /// <see href="https://developer.android.com/reference/java/security/UnresolvedPermission.html#getUnresolvedCerts()"/>
         /// </summary>
-        public Java.Lang.String UnresolvedType
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        public Java.Security.Cert.Certificate[] GetUnresolvedCerts()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUnresolvedType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getUnresolvedCerts", "()[Ljava/security/cert/Certificate;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Sql/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Sql/AllPackageClasses.cs
index 7ea47336f..66324b7e4 100644
--- a/src/net/Netdroid/Generated/Java/Sql/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Sql
 {
     #region Array
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Array.html"/>
     /// </summary>
     public partial class Array : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Array>
     {
@@ -36,12 +36,12 @@ public partial class Array : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Array>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Array class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Array class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Array() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Array class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Array class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Array(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Array(params object[] args) : base(args) { }
 
     #region BatchUpdateException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/BatchUpdateException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/BatchUpdateException.html"/>
     /// </summary>
     public partial class BatchUpdateException : Java.Sql.SQLException
     {
@@ -91,7 +91,7 @@ public partial class BatchUpdateException : Java.Sql.SQLException
 
     #region Blob
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Blob.html"/>
     /// </summary>
     public partial class Blob : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Blob>
     {
@@ -99,12 +99,12 @@ public partial class Blob : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Blob>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Blob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Blob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Blob() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Blob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Blob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Blob(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -137,7 +137,7 @@ public Blob(params object[] args) : base(args) { }
 
     #region CallableStatement
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html"/>
     /// </summary>
     public partial class CallableStatement : Java.Sql.PreparedStatement
     {
@@ -145,12 +145,12 @@ public partial class CallableStatement : Java.Sql.PreparedStatement
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CallableStatement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallableStatement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallableStatement() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CallableStatement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallableStatement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallableStatement(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -183,7 +183,7 @@ public CallableStatement(params object[] args) : base(args) { }
 
     #region ClientInfoStatus
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/ClientInfoStatus.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/ClientInfoStatus.html"/>
     /// </summary>
     public partial class ClientInfoStatus : Java.Lang.Enum<Java.Sql.ClientInfoStatus>
     {
@@ -227,7 +227,7 @@ public ClientInfoStatus(params object[] args) : base(args) { }
 
     #region Clob
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Clob.html"/>
     /// </summary>
     public partial class Clob : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Clob>
     {
@@ -235,12 +235,12 @@ public partial class Clob : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Clob>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Clob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Clob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Clob() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Clob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Clob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Clob(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -273,7 +273,7 @@ public Clob(params object[] args) : base(args) { }
 
     #region Connection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Connection.html"/>
     /// </summary>
     public partial class Connection : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Connection>
     {
@@ -281,12 +281,12 @@ public partial class Connection : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Connec
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Connection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Connection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Connection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Connection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Connection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Connection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -319,7 +319,7 @@ public Connection(params object[] args) : base(args) { }
 
     #region DatabaseMetaData
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html"/>
     /// </summary>
     public partial class DatabaseMetaData : Java.Sql.Wrapper
     {
@@ -327,12 +327,12 @@ public partial class DatabaseMetaData : Java.Sql.Wrapper
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DatabaseMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatabaseMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatabaseMetaData() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DatabaseMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatabaseMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatabaseMetaData(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -365,7 +365,7 @@ public DatabaseMetaData(params object[] args) : base(args) { }
 
     #region DataTruncation
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/DataTruncation.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/DataTruncation.html"/>
     /// </summary>
     public partial class DataTruncation : Java.Sql.SQLWarning
     {
@@ -382,7 +382,7 @@ public partial class DataTruncation : Java.Sql.SQLWarning
 
     #region Date
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Date.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Date.html"/>
     /// </summary>
     public partial class Date : Java.Util.Date
     {
@@ -426,7 +426,7 @@ public Date(params object[] args) : base(args) { }
 
     #region Driver
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Driver.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Driver.html"/>
     /// </summary>
     public partial class Driver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Driver>
     {
@@ -434,12 +434,12 @@ public partial class Driver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Driver>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Driver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Driver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Driver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Driver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Driver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Driver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -472,7 +472,7 @@ public Driver(params object[] args) : base(args) { }
 
     #region DriverManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html"/>
     /// </summary>
     public partial class DriverManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DriverManager>
     {
@@ -516,7 +516,7 @@ public DriverManager(params object[] args) : base(args) { }
 
     #region DriverPropertyInfo
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverPropertyInfo.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/DriverPropertyInfo.html"/>
     /// </summary>
     public partial class DriverPropertyInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DriverPropertyInfo>
     {
@@ -560,7 +560,7 @@ public DriverPropertyInfo(params object[] args) : base(args) { }
 
     #region NClob
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/NClob.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/NClob.html"/>
     /// </summary>
     public partial class NClob : Java.Sql.Clob
     {
@@ -568,12 +568,12 @@ public partial class NClob : Java.Sql.Clob
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NClob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NClob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NClob() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NClob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NClob class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NClob(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -606,7 +606,7 @@ public NClob(params object[] args) : base(args) { }
 
     #region ParameterMetaData
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html"/>
     /// </summary>
     public partial class ParameterMetaData : Java.Sql.Wrapper
     {
@@ -614,12 +614,12 @@ public partial class ParameterMetaData : Java.Sql.Wrapper
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ParameterMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ParameterMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ParameterMetaData() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ParameterMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ParameterMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ParameterMetaData(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -652,7 +652,7 @@ public ParameterMetaData(params object[] args) : base(args) { }
 
     #region PreparedStatement
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html"/>
     /// </summary>
     public partial class PreparedStatement : Java.Sql.Statement
     {
@@ -660,12 +660,12 @@ public partial class PreparedStatement : Java.Sql.Statement
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PreparedStatement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreparedStatement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreparedStatement() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PreparedStatement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreparedStatement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreparedStatement(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -698,7 +698,7 @@ public PreparedStatement(params object[] args) : base(args) { }
 
     #region Ref
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Ref.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Ref.html"/>
     /// </summary>
     public partial class Ref : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ref>
     {
@@ -706,12 +706,12 @@ public partial class Ref : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ref>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Ref class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Ref class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Ref() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Ref class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Ref class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Ref(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -744,7 +744,7 @@ public Ref(params object[] args) : base(args) { }
 
     #region ResultSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html"/>
     /// </summary>
     public partial class ResultSet : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ResultSet>
     {
@@ -752,12 +752,12 @@ public partial class ResultSet : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ResultS
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ResultSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResultSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResultSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ResultSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResultSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResultSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -790,7 +790,7 @@ public ResultSet(params object[] args) : base(args) { }
 
     #region ResultSetMetaData
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html"/>
     /// </summary>
     public partial class ResultSetMetaData : Java.Sql.Wrapper
     {
@@ -798,12 +798,12 @@ public partial class ResultSetMetaData : Java.Sql.Wrapper
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ResultSetMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResultSetMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResultSetMetaData() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ResultSetMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResultSetMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResultSetMetaData(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -836,7 +836,7 @@ public ResultSetMetaData(params object[] args) : base(args) { }
 
     #region RowId
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowId.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/RowId.html"/>
     /// </summary>
     public partial class RowId : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RowId>
     {
@@ -844,12 +844,12 @@ public partial class RowId : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RowId>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RowId class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowId class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowId() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RowId class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowId class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowId(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -882,7 +882,7 @@ public RowId(params object[] args) : base(args) { }
 
     #region RowIdLifetime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowIdLifetime.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/RowIdLifetime.html"/>
     /// </summary>
     public partial class RowIdLifetime : Java.Lang.Enum<Java.Sql.RowIdLifetime>
     {
@@ -926,7 +926,7 @@ public RowIdLifetime(params object[] args) : base(args) { }
 
     #region Savepoint
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Savepoint.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Savepoint.html"/>
     /// </summary>
     public partial class Savepoint : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Savepoint>
     {
@@ -934,12 +934,12 @@ public partial class Savepoint : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Savepoi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Savepoint class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Savepoint class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Savepoint() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Savepoint class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Savepoint class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Savepoint(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -972,7 +972,7 @@ public Savepoint(params object[] args) : base(args) { }
 
     #region SQLClientInfoException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLClientInfoException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLClientInfoException.html"/>
     /// </summary>
     public partial class SQLClientInfoException : Java.Sql.SQLException
     {
@@ -989,7 +989,7 @@ public partial class SQLClientInfoException : Java.Sql.SQLException
 
     #region SQLData
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLData.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLData.html"/>
     /// </summary>
     public partial class SQLData : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SQLData>
     {
@@ -997,12 +997,12 @@ public partial class SQLData : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SQLData>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SQLData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLData() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SQLData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLData(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1035,7 +1035,7 @@ public SQLData(params object[] args) : base(args) { }
 
     #region SQLDataException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLDataException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLDataException.html"/>
     /// </summary>
     public partial class SQLDataException : Java.Sql.SQLNonTransientException
     {
@@ -1052,7 +1052,7 @@ public partial class SQLDataException : Java.Sql.SQLNonTransientException
 
     #region SQLException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLException.html"/>
     /// </summary>
     public partial class SQLException : Java.Lang.Exception
     {
@@ -1069,7 +1069,7 @@ public partial class SQLException : Java.Lang.Exception
 
     #region SQLFeatureNotSupportedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLFeatureNotSupportedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLFeatureNotSupportedException.html"/>
     /// </summary>
     public partial class SQLFeatureNotSupportedException : Java.Sql.SQLNonTransientException
     {
@@ -1086,7 +1086,7 @@ public partial class SQLFeatureNotSupportedException : Java.Sql.SQLNonTransientE
 
     #region SQLInput
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html"/>
     /// </summary>
     public partial class SQLInput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SQLInput>
     {
@@ -1094,12 +1094,12 @@ public partial class SQLInput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SQLInput
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SQLInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLInput() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SQLInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLInput(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1132,7 +1132,7 @@ public SQLInput(params object[] args) : base(args) { }
 
     #region SQLIntegrityConstraintViolationException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLIntegrityConstraintViolationException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLIntegrityConstraintViolationException.html"/>
     /// </summary>
     public partial class SQLIntegrityConstraintViolationException : Java.Sql.SQLNonTransientException
     {
@@ -1149,7 +1149,7 @@ public partial class SQLIntegrityConstraintViolationException : Java.Sql.SQLNonT
 
     #region SQLInvalidAuthorizationSpecException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInvalidAuthorizationSpecException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLInvalidAuthorizationSpecException.html"/>
     /// </summary>
     public partial class SQLInvalidAuthorizationSpecException : Java.Sql.SQLNonTransientException
     {
@@ -1166,7 +1166,7 @@ public partial class SQLInvalidAuthorizationSpecException : Java.Sql.SQLNonTrans
 
     #region SQLNonTransientConnectionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLNonTransientConnectionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLNonTransientConnectionException.html"/>
     /// </summary>
     public partial class SQLNonTransientConnectionException : Java.Sql.SQLNonTransientException
     {
@@ -1183,7 +1183,7 @@ public partial class SQLNonTransientConnectionException : Java.Sql.SQLNonTransie
 
     #region SQLNonTransientException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLNonTransientException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLNonTransientException.html"/>
     /// </summary>
     public partial class SQLNonTransientException : Java.Sql.SQLException
     {
@@ -1200,7 +1200,7 @@ public partial class SQLNonTransientException : Java.Sql.SQLException
 
     #region SQLOutput
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html"/>
     /// </summary>
     public partial class SQLOutput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SQLOutput>
     {
@@ -1208,12 +1208,12 @@ public partial class SQLOutput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SQLOutp
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SQLOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLOutput() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SQLOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLOutput(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1246,7 +1246,7 @@ public SQLOutput(params object[] args) : base(args) { }
 
     #region SQLPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLPermission.html"/>
     /// </summary>
     public partial class SQLPermission : Java.Security.BasicPermission
     {
@@ -1290,7 +1290,7 @@ public SQLPermission(params object[] args) : base(args) { }
 
     #region SQLRecoverableException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLRecoverableException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLRecoverableException.html"/>
     /// </summary>
     public partial class SQLRecoverableException : Java.Sql.SQLException
     {
@@ -1307,7 +1307,7 @@ public partial class SQLRecoverableException : Java.Sql.SQLException
 
     #region SQLSyntaxErrorException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLSyntaxErrorException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLSyntaxErrorException.html"/>
     /// </summary>
     public partial class SQLSyntaxErrorException : Java.Sql.SQLNonTransientException
     {
@@ -1324,7 +1324,7 @@ public partial class SQLSyntaxErrorException : Java.Sql.SQLNonTransientException
 
     #region SQLTimeoutException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLTimeoutException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLTimeoutException.html"/>
     /// </summary>
     public partial class SQLTimeoutException : Java.Sql.SQLTransientException
     {
@@ -1341,7 +1341,7 @@ public partial class SQLTimeoutException : Java.Sql.SQLTransientException
 
     #region SQLTransactionRollbackException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLTransactionRollbackException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLTransactionRollbackException.html"/>
     /// </summary>
     public partial class SQLTransactionRollbackException : Java.Sql.SQLTransientException
     {
@@ -1358,7 +1358,7 @@ public partial class SQLTransactionRollbackException : Java.Sql.SQLTransientExce
 
     #region SQLTransientConnectionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLTransientConnectionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLTransientConnectionException.html"/>
     /// </summary>
     public partial class SQLTransientConnectionException : Java.Sql.SQLTransientException
     {
@@ -1375,7 +1375,7 @@ public partial class SQLTransientConnectionException : Java.Sql.SQLTransientExce
 
     #region SQLTransientException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLTransientException.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLTransientException.html"/>
     /// </summary>
     public partial class SQLTransientException : Java.Sql.SQLException
     {
@@ -1392,7 +1392,7 @@ public partial class SQLTransientException : Java.Sql.SQLException
 
     #region SQLWarning
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLWarning.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLWarning.html"/>
     /// </summary>
     public partial class SQLWarning : Java.Sql.SQLException
     {
@@ -1409,7 +1409,7 @@ public partial class SQLWarning : Java.Sql.SQLException
 
     #region SQLXML
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html"/>
     /// </summary>
     public partial class SQLXML : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SQLXML>
     {
@@ -1417,12 +1417,12 @@ public partial class SQLXML : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SQLXML>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SQLXML class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLXML class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLXML() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SQLXML class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SQLXML class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SQLXML(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1455,7 +1455,7 @@ public SQLXML(params object[] args) : base(args) { }
 
     #region Statement
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Statement.html"/>
     /// </summary>
     public partial class Statement : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Statement>
     {
@@ -1463,12 +1463,12 @@ public partial class Statement : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Stateme
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Statement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Statement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Statement() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Statement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Statement class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Statement(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1501,7 +1501,7 @@ public Statement(params object[] args) : base(args) { }
 
     #region Struct
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Struct.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Struct.html"/>
     /// </summary>
     public partial class Struct : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Struct>
     {
@@ -1509,12 +1509,12 @@ public partial class Struct : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Struct>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Struct class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Struct class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Struct() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Struct class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Struct class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Struct(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1547,7 +1547,7 @@ public Struct(params object[] args) : base(args) { }
 
     #region Time
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Time.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Time.html"/>
     /// </summary>
     public partial class Time : Java.Util.Date
     {
@@ -1591,7 +1591,7 @@ public Time(params object[] args) : base(args) { }
 
     #region Timestamp
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html"/>
     /// </summary>
     public partial class Timestamp : Java.Util.Date
     {
@@ -1635,7 +1635,7 @@ public Timestamp(params object[] args) : base(args) { }
 
     #region Types
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Types.html"/>
     /// </summary>
     public partial class Types : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Types>
     {
@@ -1679,7 +1679,7 @@ public Types(params object[] args) : base(args) { }
 
     #region Wrapper
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/java/sql/Wrapper.html"/>
+    /// <see href="https://developer.android.com/reference/java/sql/Wrapper.html"/>
     /// </summary>
     public partial class Wrapper : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Wrapper>
     {
@@ -1687,12 +1687,12 @@ public partial class Wrapper : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Wrapper>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Wrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Wrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Wrapper() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Wrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Wrapper class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Wrapper(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Sql/Array.cs b/src/net/Netdroid/Generated/Java/Sql/Array.cs
index a5abc96be..d6c68130a 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Array.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Array.cs
@@ -64,28 +64,16 @@ public partial class Array : Java.Sql.IArray
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getBaseType()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getBaseType()"/>
         /// </summary>
-        public int BaseType
-        {
-            get { return IExecuteWithSignature<int>("getBaseType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getBaseTypeName()"/> 
-        /// </summary>
-        public Java.Lang.String BaseTypeName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBaseTypeName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getResultSet()"/> 
-        /// </summary>
-        public Java.Sql.ResultSet ResultSet
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetBaseType()
         {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getResultSet", "()Ljava/sql/ResultSet;"); }
+            return IExecuteWithSignature<int>("getBaseType", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getArray()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -94,7 +82,7 @@ public object GetArray()
             return IExecuteWithSignature("getArray", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getArray(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getArray(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <returns><see cref="object"/></returns>
@@ -104,7 +92,7 @@ public object GetArray(Java.Util.Map<Java.Lang.String, Java.Lang.Class> arg0)
             return IExecuteWithSignature("getArray", "(Ljava/util/Map;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getArray(long,int,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getArray(long,int,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -116,7 +104,7 @@ public object GetArray(long arg0, int arg1, Java.Util.Map<Java.Lang.String, Java
             return IExecute("getArray", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getArray(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getArray(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -127,7 +115,25 @@ public object GetArray(long arg0, int arg1)
             return IExecute("getArray", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getResultSet(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getBaseTypeName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetBaseTypeName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getBaseTypeName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getResultSet()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetResultSet()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getResultSet", "()Ljava/sql/ResultSet;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getResultSet(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <returns><see cref="Java.Sql.ResultSet"/></returns>
@@ -137,7 +143,7 @@ public Java.Sql.ResultSet GetResultSet(Java.Util.Map<Java.Lang.String, Java.Lang
             return IExecuteWithSignature<Java.Sql.ResultSet>("getResultSet", "(Ljava/util/Map;)Ljava/sql/ResultSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getResultSet(long,int,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getResultSet(long,int,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -149,7 +155,7 @@ public Java.Sql.ResultSet GetResultSet(long arg0, int arg1, Java.Util.Map<Java.L
             return IExecute<Java.Sql.ResultSet>("getResultSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#getResultSet(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#getResultSet(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -160,7 +166,7 @@ public Java.Sql.ResultSet GetResultSet(long arg0, int arg1)
             return IExecute<Java.Sql.ResultSet>("getResultSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Array.html#free()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Array.html#free()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Free()
diff --git a/src/net/Netdroid/Generated/Java/Sql/Blob.cs b/src/net/Netdroid/Generated/Java/Sql/Blob.cs
index 992383188..21d1c57c6 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Blob.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Blob.cs
@@ -64,14 +64,7 @@ public partial class Blob : Java.Sql.IBlob
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#getBinaryStream()"/> 
-        /// </summary>
-        public Java.Io.InputStream BinaryStream
-        {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getBinaryStream", "()Ljava/io/InputStream;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#getBytes(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#getBytes(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -82,7 +75,7 @@ public byte[] GetBytes(long arg0, int arg1)
             return IExecuteArray<byte>("getBytes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#setBytes(long,byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#setBytes(long,byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -95,7 +88,7 @@ public int SetBytes(long arg0, byte[] arg1, int arg2, int arg3)
             return IExecute<int>("setBytes", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#setBytes(long,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#setBytes(long,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -106,7 +99,16 @@ public int SetBytes(long arg0, byte[] arg1)
             return IExecute<int>("setBytes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#getBinaryStream(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#getBinaryStream()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Io.InputStream GetBinaryStream()
+        {
+            return IExecuteWithSignature<Java.Io.InputStream>("getBinaryStream", "()Ljava/io/InputStream;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#getBinaryStream(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -117,7 +119,7 @@ public Java.Io.InputStream GetBinaryStream(long arg0, long arg1)
             return IExecute<Java.Io.InputStream>("getBinaryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#setBinaryStream(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#setBinaryStream(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Io.OutputStream"/></returns>
@@ -127,7 +129,7 @@ public Java.Io.OutputStream SetBinaryStream(long arg0)
             return IExecuteWithSignature<Java.Io.OutputStream>("setBinaryStream", "(J)Ljava/io/OutputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#length()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -136,7 +138,7 @@ public long Length()
             return IExecuteWithSignature<long>("length", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#position(byte[],long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#position(byte[],long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -147,7 +149,7 @@ public long Position(byte[] arg0, long arg1)
             return IExecute<long>("position", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#position(java.sql.Blob,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#position(java.sql.Blob,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Blob"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -158,7 +160,7 @@ public long Position(Java.Sql.Blob arg0, long arg1)
             return IExecute<long>("position", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#free()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#free()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Free()
@@ -166,7 +168,7 @@ public void Free()
             IExecuteWithSignature("free", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Blob.html#truncate(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Blob.html#truncate(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
diff --git a/src/net/Netdroid/Generated/Java/Sql/CallableStatement.cs b/src/net/Netdroid/Generated/Java/Sql/CallableStatement.cs
index d9a425bde..44cfb047e 100644
--- a/src/net/Netdroid/Generated/Java/Sql/CallableStatement.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/CallableStatement.cs
@@ -64,7 +64,7 @@ public partial class CallableStatement : Java.Sql.ICallableStatement
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getObject(int,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getObject(int,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -76,7 +76,7 @@ public T GetObject<T>(int arg0, Java.Lang.Class arg1)
             return IExecute<T>("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getObject(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getObject(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -88,7 +88,7 @@ public T GetObject<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
             return IExecute<T>("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBoolean(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBoolean(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -98,7 +98,7 @@ public bool GetBoolean(int arg0)
             return IExecuteWithSignature<bool>("getBoolean", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBoolean(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBoolean(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -108,7 +108,7 @@ public bool GetBoolean(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getBoolean", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#wasNull()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#wasNull()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -117,7 +117,7 @@ public bool WasNull()
             return IExecuteWithSignature<bool>("wasNull", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getByte(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getByte(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -127,7 +127,7 @@ public byte GetByte(int arg0)
             return IExecuteWithSignature<byte>("getByte", "(I)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getByte(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getByte(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -137,7 +137,7 @@ public byte GetByte(Java.Lang.String arg0)
             return IExecuteWithSignature<byte>("getByte", "(Ljava/lang/String;)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBytes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -147,7 +147,7 @@ public byte[] GetBytes(int arg0)
             return IExecuteWithSignatureArray<byte>("getBytes", "(I)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBytes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBytes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -157,7 +157,7 @@ public byte[] GetBytes(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<byte>("getBytes", "(Ljava/lang/String;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getDouble(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getDouble(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="double"/></returns>
@@ -167,7 +167,7 @@ public double GetDouble(int arg0)
             return IExecuteWithSignature<double>("getDouble", "(I)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getDouble(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getDouble(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="double"/></returns>
@@ -177,7 +177,7 @@ public double GetDouble(Java.Lang.String arg0)
             return IExecuteWithSignature<double>("getDouble", "(Ljava/lang/String;)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getFloat(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getFloat(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
@@ -187,7 +187,7 @@ public float GetFloat(int arg0)
             return IExecuteWithSignature<float>("getFloat", "(I)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getFloat(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getFloat(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="float"/></returns>
@@ -197,7 +197,7 @@ public float GetFloat(Java.Lang.String arg0)
             return IExecuteWithSignature<float>("getFloat", "(Ljava/lang/String;)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -207,7 +207,7 @@ public int GetInt(int arg0)
             return IExecuteWithSignature<int>("getInt", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getInt(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getInt(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -217,7 +217,7 @@ public int GetInt(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getInt", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getCharacterStream(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getCharacterStream(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.Reader"/></returns>
@@ -227,7 +227,7 @@ public Java.Io.Reader GetCharacterStream(int arg0)
             return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "(I)Ljava/io/Reader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getCharacterStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getCharacterStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.Reader"/></returns>
@@ -237,7 +237,7 @@ public Java.Io.Reader GetCharacterStream(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "(Ljava/lang/String;)Ljava/io/Reader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getNCharacterStream(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getNCharacterStream(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.Reader"/></returns>
@@ -247,7 +247,7 @@ public Java.Io.Reader GetNCharacterStream(int arg0)
             return IExecuteWithSignature<Java.Io.Reader>("getNCharacterStream", "(I)Ljava/io/Reader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getNCharacterStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getNCharacterStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.Reader"/></returns>
@@ -257,7 +257,7 @@ public Java.Io.Reader GetNCharacterStream(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.Reader>("getNCharacterStream", "(Ljava/lang/String;)Ljava/io/Reader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getObject(int,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getObject(int,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -268,7 +268,7 @@ public object GetObject(int arg0, Java.Util.Map<Java.Lang.String, Java.Lang.Clas
             return IExecute("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getObject(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getObject(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -278,7 +278,7 @@ public object GetObject(int arg0)
             return IExecuteWithSignature("getObject", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getObject(java.lang.String,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getObject(java.lang.String,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -289,7 +289,7 @@ public object GetObject(Java.Lang.String arg0, Java.Util.Map<Java.Lang.String, J
             return IExecute("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getObject(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getObject(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -299,7 +299,7 @@ public object GetObject(Java.Lang.String arg0)
             return IExecuteWithSignature("getObject", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getNString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getNString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -309,7 +309,7 @@ public Java.Lang.String GetNString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getNString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getNString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getNString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -319,7 +319,7 @@ public Java.Lang.String GetNString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getNString", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -329,7 +329,7 @@ public Java.Lang.String GetString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -339,19 +339,19 @@ public Java.Lang.String GetString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBigDecimal(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBigDecimal(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Math.BigDecimal GetBigDecimal(int arg0, int arg1)
         {
             return IExecute<Java.Math.BigDecimal>("getBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBigDecimal(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBigDecimal(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -361,7 +361,7 @@ public Java.Math.BigDecimal GetBigDecimal(int arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("getBigDecimal", "(I)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBigDecimal(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBigDecimal(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -371,7 +371,7 @@ public Java.Math.BigDecimal GetBigDecimal(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("getBigDecimal", "(Ljava/lang/String;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getURL(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getURL(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Net.URL"/></returns>
@@ -381,7 +381,7 @@ public Java.Net.URL GetURL(int arg0)
             return IExecuteWithSignature<Java.Net.URL>("getURL", "(I)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getURL(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getURL(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URL"/></returns>
@@ -391,7 +391,7 @@ public Java.Net.URL GetURL(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Net.URL>("getURL", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getArray(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getArray(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Array"/></returns>
@@ -401,7 +401,7 @@ public Java.Sql.Array GetArray(int arg0)
             return IExecuteWithSignature<Java.Sql.Array>("getArray", "(I)Ljava/sql/Array;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getArray(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getArray(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Array"/></returns>
@@ -411,7 +411,7 @@ public Java.Sql.Array GetArray(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Array>("getArray", "(Ljava/lang/String;)Ljava/sql/Array;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBlob(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBlob(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Blob"/></returns>
@@ -421,7 +421,7 @@ public Java.Sql.Blob GetBlob(int arg0)
             return IExecuteWithSignature<Java.Sql.Blob>("getBlob", "(I)Ljava/sql/Blob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getBlob(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getBlob(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Blob"/></returns>
@@ -431,7 +431,7 @@ public Java.Sql.Blob GetBlob(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Blob>("getBlob", "(Ljava/lang/String;)Ljava/sql/Blob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getClob(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getClob(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Clob"/></returns>
@@ -441,7 +441,7 @@ public Java.Sql.Clob GetClob(int arg0)
             return IExecuteWithSignature<Java.Sql.Clob>("getClob", "(I)Ljava/sql/Clob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getClob(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getClob(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Clob"/></returns>
@@ -451,7 +451,7 @@ public Java.Sql.Clob GetClob(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Clob>("getClob", "(Ljava/lang/String;)Ljava/sql/Clob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getDate(int,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getDate(int,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -462,7 +462,7 @@ public Java.Sql.Date GetDate(int arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Date>("getDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getDate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getDate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Date"/></returns>
@@ -472,7 +472,7 @@ public Java.Sql.Date GetDate(int arg0)
             return IExecuteWithSignature<Java.Sql.Date>("getDate", "(I)Ljava/sql/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getDate(java.lang.String,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getDate(java.lang.String,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -483,7 +483,7 @@ public Java.Sql.Date GetDate(Java.Lang.String arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Date>("getDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getDate(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getDate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Date"/></returns>
@@ -493,7 +493,7 @@ public Java.Sql.Date GetDate(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Date>("getDate", "(Ljava/lang/String;)Ljava/sql/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getNClob(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getNClob(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.NClob"/></returns>
@@ -503,7 +503,7 @@ public Java.Sql.NClob GetNClob(int arg0)
             return IExecuteWithSignature<Java.Sql.NClob>("getNClob", "(I)Ljava/sql/NClob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getNClob(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getNClob(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.NClob"/></returns>
@@ -513,7 +513,7 @@ public Java.Sql.NClob GetNClob(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.NClob>("getNClob", "(Ljava/lang/String;)Ljava/sql/NClob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getRef(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getRef(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Ref"/></returns>
@@ -523,7 +523,7 @@ public Java.Sql.Ref GetRef(int arg0)
             return IExecuteWithSignature<Java.Sql.Ref>("getRef", "(I)Ljava/sql/Ref;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getRef(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getRef(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Ref"/></returns>
@@ -533,7 +533,7 @@ public Java.Sql.Ref GetRef(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Ref>("getRef", "(Ljava/lang/String;)Ljava/sql/Ref;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getRowId(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getRowId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.RowId"/></returns>
@@ -543,7 +543,7 @@ public Java.Sql.RowId GetRowId(int arg0)
             return IExecuteWithSignature<Java.Sql.RowId>("getRowId", "(I)Ljava/sql/RowId;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getRowId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getRowId(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.RowId"/></returns>
@@ -553,7 +553,7 @@ public Java.Sql.RowId GetRowId(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.RowId>("getRowId", "(Ljava/lang/String;)Ljava/sql/RowId;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getSQLXML(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getSQLXML(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.SQLXML"/></returns>
@@ -563,7 +563,7 @@ public Java.Sql.SQLXML GetSQLXML(int arg0)
             return IExecuteWithSignature<Java.Sql.SQLXML>("getSQLXML", "(I)Ljava/sql/SQLXML;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getSQLXML(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getSQLXML(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.SQLXML"/></returns>
@@ -573,7 +573,7 @@ public Java.Sql.SQLXML GetSQLXML(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.SQLXML>("getSQLXML", "(Ljava/lang/String;)Ljava/sql/SQLXML;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getTime(int,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getTime(int,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -584,7 +584,7 @@ public Java.Sql.Time GetTime(int arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Time>("getTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getTime(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getTime(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Time"/></returns>
@@ -594,7 +594,7 @@ public Java.Sql.Time GetTime(int arg0)
             return IExecuteWithSignature<Java.Sql.Time>("getTime", "(I)Ljava/sql/Time;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getTime(java.lang.String,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getTime(java.lang.String,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -605,7 +605,7 @@ public Java.Sql.Time GetTime(Java.Lang.String arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Time>("getTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getTime(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getTime(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Time"/></returns>
@@ -615,7 +615,7 @@ public Java.Sql.Time GetTime(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Time>("getTime", "(Ljava/lang/String;)Ljava/sql/Time;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getTimestamp(int,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getTimestamp(int,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -626,7 +626,7 @@ public Java.Sql.Timestamp GetTimestamp(int arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Timestamp>("getTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getTimestamp(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getTimestamp(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Timestamp"/></returns>
@@ -636,7 +636,7 @@ public Java.Sql.Timestamp GetTimestamp(int arg0)
             return IExecuteWithSignature<Java.Sql.Timestamp>("getTimestamp", "(I)Ljava/sql/Timestamp;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getTimestamp(java.lang.String,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getTimestamp(java.lang.String,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -647,7 +647,7 @@ public Java.Sql.Timestamp GetTimestamp(Java.Lang.String arg0, Java.Util.Calendar
             return IExecute<Java.Sql.Timestamp>("getTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getTimestamp(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getTimestamp(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Timestamp"/></returns>
@@ -657,7 +657,7 @@ public Java.Sql.Timestamp GetTimestamp(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Timestamp>("getTimestamp", "(Ljava/lang/String;)Ljava/sql/Timestamp;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getLong(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -667,7 +667,7 @@ public long GetLong(int arg0)
             return IExecuteWithSignature<long>("getLong", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getLong(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getLong(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="long"/></returns>
@@ -677,7 +677,7 @@ public long GetLong(Java.Lang.String arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="short"/></returns>
@@ -687,7 +687,7 @@ public short GetShort(int arg0)
             return IExecuteWithSignature<short>("getShort", "(I)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#getShort(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#getShort(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="short"/></returns>
@@ -697,7 +697,7 @@ public short GetShort(Java.Lang.String arg0)
             return IExecuteWithSignature<short>("getShort", "(Ljava/lang/String;)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#registerOutParameter(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#registerOutParameter(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -708,7 +708,7 @@ public void RegisterOutParameter(int arg0, int arg1, int arg2)
             IExecute("registerOutParameter", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#registerOutParameter(int,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#registerOutParameter(int,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -719,7 +719,7 @@ public void RegisterOutParameter(int arg0, int arg1, Java.Lang.String arg2)
             IExecute("registerOutParameter", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#registerOutParameter(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#registerOutParameter(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -729,7 +729,7 @@ public void RegisterOutParameter(int arg0, int arg1)
             IExecute("registerOutParameter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#registerOutParameter(java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#registerOutParameter(java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -740,7 +740,7 @@ public void RegisterOutParameter(Java.Lang.String arg0, int arg1, int arg2)
             IExecute("registerOutParameter", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#registerOutParameter(java.lang.String,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#registerOutParameter(java.lang.String,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -751,7 +751,7 @@ public void RegisterOutParameter(Java.Lang.String arg0, int arg1, Java.Lang.Stri
             IExecute("registerOutParameter", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#registerOutParameter(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#registerOutParameter(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -761,7 +761,7 @@ public void RegisterOutParameter(Java.Lang.String arg0, int arg1)
             IExecute("registerOutParameter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setAsciiStream(java.lang.String,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setAsciiStream(java.lang.String,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -772,7 +772,7 @@ public void SetAsciiStream(Java.Lang.String arg0, Java.Io.InputStream arg1, int
             IExecute("setAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setAsciiStream(java.lang.String,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setAsciiStream(java.lang.String,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -783,7 +783,7 @@ public void SetAsciiStream(Java.Lang.String arg0, Java.Io.InputStream arg1, long
             IExecute("setAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setAsciiStream(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setAsciiStream(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -793,7 +793,7 @@ public void SetAsciiStream(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("setAsciiStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBigDecimal(java.lang.String,java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBigDecimal(java.lang.String,java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigDecimal"/></param>
@@ -803,7 +803,7 @@ public void SetBigDecimal(Java.Lang.String arg0, Java.Math.BigDecimal arg1)
             IExecute("setBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBinaryStream(java.lang.String,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBinaryStream(java.lang.String,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -814,7 +814,7 @@ public void SetBinaryStream(Java.Lang.String arg0, Java.Io.InputStream arg1, int
             IExecute("setBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBinaryStream(java.lang.String,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBinaryStream(java.lang.String,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -825,7 +825,7 @@ public void SetBinaryStream(Java.Lang.String arg0, Java.Io.InputStream arg1, lon
             IExecute("setBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBinaryStream(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBinaryStream(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -835,7 +835,7 @@ public void SetBinaryStream(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("setBinaryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBlob(java.lang.String,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBlob(java.lang.String,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -846,7 +846,7 @@ public void SetBlob(Java.Lang.String arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("setBlob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBlob(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBlob(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -856,7 +856,7 @@ public void SetBlob(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("setBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBlob(java.lang.String,java.sql.Blob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBlob(java.lang.String,java.sql.Blob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Blob"/></param>
@@ -866,7 +866,7 @@ public void SetBlob(Java.Lang.String arg0, Java.Sql.Blob arg1)
             IExecute("setBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBoolean(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBoolean(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -876,7 +876,7 @@ public void SetBoolean(Java.Lang.String arg0, bool arg1)
             IExecute("setBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setByte(java.lang.String,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setByte(java.lang.String,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -886,7 +886,7 @@ public void SetByte(Java.Lang.String arg0, byte arg1)
             IExecute("setByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setBytes(java.lang.String,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setBytes(java.lang.String,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -896,7 +896,7 @@ public void SetBytes(Java.Lang.String arg0, byte[] arg1)
             IExecute("setBytes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setCharacterStream(java.lang.String,java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setCharacterStream(java.lang.String,java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -907,7 +907,7 @@ public void SetCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1, int a
             IExecute("setCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setCharacterStream(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setCharacterStream(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -918,7 +918,7 @@ public void SetCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1, long
             IExecute("setCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setCharacterStream(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setCharacterStream(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -928,7 +928,7 @@ public void SetCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("setCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setClob(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setClob(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -939,7 +939,7 @@ public void SetClob(Java.Lang.String arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setClob(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setClob(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -949,7 +949,7 @@ public void SetClob(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("setClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setClob(java.lang.String,java.sql.Clob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setClob(java.lang.String,java.sql.Clob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Clob"/></param>
@@ -959,7 +959,7 @@ public void SetClob(Java.Lang.String arg0, Java.Sql.Clob arg1)
             IExecute("setClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setDate(java.lang.String,java.sql.Date,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setDate(java.lang.String,java.sql.Date,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -970,7 +970,7 @@ public void SetDate(Java.Lang.String arg0, Java.Sql.Date arg1, Java.Util.Calenda
             IExecute("setDate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setDate(java.lang.String,java.sql.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setDate(java.lang.String,java.sql.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -980,7 +980,7 @@ public void SetDate(Java.Lang.String arg0, Java.Sql.Date arg1)
             IExecute("setDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setDouble(java.lang.String,double)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setDouble(java.lang.String,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -990,7 +990,7 @@ public void SetDouble(Java.Lang.String arg0, double arg1)
             IExecute("setDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setFloat(java.lang.String,float)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setFloat(java.lang.String,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -1000,7 +1000,7 @@ public void SetFloat(Java.Lang.String arg0, float arg1)
             IExecute("setFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setInt(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setInt(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1010,7 +1010,7 @@ public void SetInt(Java.Lang.String arg0, int arg1)
             IExecute("setInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setLong(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setLong(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -1020,7 +1020,7 @@ public void SetLong(Java.Lang.String arg0, long arg1)
             IExecute("setLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setNCharacterStream(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setNCharacterStream(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1031,7 +1031,7 @@ public void SetNCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1, long
             IExecute("setNCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setNCharacterStream(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setNCharacterStream(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1041,7 +1041,7 @@ public void SetNCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("setNCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setNClob(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setNClob(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1052,7 +1052,7 @@ public void SetNClob(Java.Lang.String arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setNClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setNClob(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setNClob(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1062,7 +1062,7 @@ public void SetNClob(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("setNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setNClob(java.lang.String,java.sql.NClob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setNClob(java.lang.String,java.sql.NClob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.NClob"/></param>
@@ -1072,7 +1072,7 @@ public void SetNClob(Java.Lang.String arg0, Java.Sql.NClob arg1)
             IExecute("setNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setNString(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setNString(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1082,7 +1082,7 @@ public void SetNString(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setNString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setNull(java.lang.String,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setNull(java.lang.String,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1093,7 +1093,7 @@ public void SetNull(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
             IExecute("setNull", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setNull(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setNull(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1103,7 +1103,7 @@ public void SetNull(Java.Lang.String arg0, int arg1)
             IExecute("setNull", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setObject(java.lang.String,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setObject(java.lang.String,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1115,7 +1115,7 @@ public void SetObject(Java.Lang.String arg0, object arg1, int arg2, int arg3)
             IExecute("setObject", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setObject(java.lang.String,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setObject(java.lang.String,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1126,7 +1126,7 @@ public void SetObject(Java.Lang.String arg0, object arg1, int arg2)
             IExecute("setObject", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setObject(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setObject(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1136,7 +1136,7 @@ public void SetObject(Java.Lang.String arg0, object arg1)
             IExecute("setObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setRowId(java.lang.String,java.sql.RowId)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setRowId(java.lang.String,java.sql.RowId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.RowId"/></param>
@@ -1146,7 +1146,7 @@ public void SetRowId(Java.Lang.String arg0, Java.Sql.RowId arg1)
             IExecute("setRowId", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setShort(java.lang.String,short)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setShort(java.lang.String,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -1156,7 +1156,7 @@ public void SetShort(Java.Lang.String arg0, short arg1)
             IExecute("setShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setSQLXML(java.lang.String,java.sql.SQLXML)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setSQLXML(java.lang.String,java.sql.SQLXML)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.SQLXML"/></param>
@@ -1166,7 +1166,7 @@ public void SetSQLXML(Java.Lang.String arg0, Java.Sql.SQLXML arg1)
             IExecute("setSQLXML", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setString(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setString(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1176,7 +1176,7 @@ public void SetString(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setTime(java.lang.String,java.sql.Time,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setTime(java.lang.String,java.sql.Time,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -1187,7 +1187,7 @@ public void SetTime(Java.Lang.String arg0, Java.Sql.Time arg1, Java.Util.Calenda
             IExecute("setTime", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setTime(java.lang.String,java.sql.Time)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setTime(java.lang.String,java.sql.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -1197,7 +1197,7 @@ public void SetTime(Java.Lang.String arg0, Java.Sql.Time arg1)
             IExecute("setTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setTimestamp(java.lang.String,java.sql.Timestamp,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setTimestamp(java.lang.String,java.sql.Timestamp,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -1208,7 +1208,7 @@ public void SetTimestamp(Java.Lang.String arg0, Java.Sql.Timestamp arg1, Java.Ut
             IExecute("setTimestamp", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setTimestamp(java.lang.String,java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setTimestamp(java.lang.String,java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -1218,7 +1218,7 @@ public void SetTimestamp(Java.Lang.String arg0, Java.Sql.Timestamp arg1)
             IExecute("setTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/CallableStatement.html#setURL(java.lang.String,java.net.URL)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/CallableStatement.html#setURL(java.lang.String,java.net.URL)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Net.URL"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Sql/ClientInfoStatus.cs b/src/net/Netdroid/Generated/Java/Sql/ClientInfoStatus.cs
index b0bd20066..6019c5700 100644
--- a/src/net/Netdroid/Generated/Java/Sql/ClientInfoStatus.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/ClientInfoStatus.cs
@@ -38,25 +38,25 @@ public partial class ClientInfoStatus
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ClientInfoStatus.html#REASON_UNKNOWN"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ClientInfoStatus.html#REASON_UNKNOWN"/>
         /// </summary>
         public static Java.Sql.ClientInfoStatus REASON_UNKNOWN { get { if (!_REASON_UNKNOWNReady) { _REASON_UNKNOWNContent = SGetField<Java.Sql.ClientInfoStatus>(LocalBridgeClazz, "REASON_UNKNOWN"); _REASON_UNKNOWNReady = true; } return _REASON_UNKNOWNContent; } }
         private static Java.Sql.ClientInfoStatus _REASON_UNKNOWNContent = default;
         private static bool _REASON_UNKNOWNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ClientInfoStatus.html#REASON_UNKNOWN_PROPERTY"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ClientInfoStatus.html#REASON_UNKNOWN_PROPERTY"/>
         /// </summary>
         public static Java.Sql.ClientInfoStatus REASON_UNKNOWN_PROPERTY { get { if (!_REASON_UNKNOWN_PROPERTYReady) { _REASON_UNKNOWN_PROPERTYContent = SGetField<Java.Sql.ClientInfoStatus>(LocalBridgeClazz, "REASON_UNKNOWN_PROPERTY"); _REASON_UNKNOWN_PROPERTYReady = true; } return _REASON_UNKNOWN_PROPERTYContent; } }
         private static Java.Sql.ClientInfoStatus _REASON_UNKNOWN_PROPERTYContent = default;
         private static bool _REASON_UNKNOWN_PROPERTYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ClientInfoStatus.html#REASON_VALUE_INVALID"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ClientInfoStatus.html#REASON_VALUE_INVALID"/>
         /// </summary>
         public static Java.Sql.ClientInfoStatus REASON_VALUE_INVALID { get { if (!_REASON_VALUE_INVALIDReady) { _REASON_VALUE_INVALIDContent = SGetField<Java.Sql.ClientInfoStatus>(LocalBridgeClazz, "REASON_VALUE_INVALID"); _REASON_VALUE_INVALIDReady = true; } return _REASON_VALUE_INVALIDContent; } }
         private static Java.Sql.ClientInfoStatus _REASON_VALUE_INVALIDContent = default;
         private static bool _REASON_VALUE_INVALIDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ClientInfoStatus.html#REASON_VALUE_TRUNCATED"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ClientInfoStatus.html#REASON_VALUE_TRUNCATED"/>
         /// </summary>
         public static Java.Sql.ClientInfoStatus REASON_VALUE_TRUNCATED { get { if (!_REASON_VALUE_TRUNCATEDReady) { _REASON_VALUE_TRUNCATEDContent = SGetField<Java.Sql.ClientInfoStatus>(LocalBridgeClazz, "REASON_VALUE_TRUNCATED"); _REASON_VALUE_TRUNCATEDReady = true; } return _REASON_VALUE_TRUNCATEDContent; } }
         private static Java.Sql.ClientInfoStatus _REASON_VALUE_TRUNCATEDContent = default;
@@ -66,7 +66,7 @@ public partial class ClientInfoStatus
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ClientInfoStatus.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ClientInfoStatus.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.ClientInfoStatus"/></returns>
@@ -75,7 +75,7 @@ public static Java.Sql.ClientInfoStatus ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Sql.ClientInfoStatus>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/sql/ClientInfoStatus;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ClientInfoStatus.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ClientInfoStatus.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.ClientInfoStatus"/></returns>
         public static Java.Sql.ClientInfoStatus[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Sql/Clob.cs b/src/net/Netdroid/Generated/Java/Sql/Clob.cs
index 69301af13..f3a1e07be 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Clob.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Clob.cs
@@ -64,21 +64,7 @@ public partial class Clob : Java.Sql.IClob
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#getAsciiStream()"/> 
-        /// </summary>
-        public Java.Io.InputStream AsciiStream
-        {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getAsciiStream", "()Ljava/io/InputStream;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#getCharacterStream()"/> 
-        /// </summary>
-        public Java.Io.Reader CharacterStream
-        {
-            get { return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "()Ljava/io/Reader;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#setString(long,java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#setString(long,java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -91,7 +77,7 @@ public int SetString(long arg0, Java.Lang.String arg1, int arg2, int arg3)
             return IExecute<int>("setString", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#setString(long,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#setString(long,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -102,7 +88,16 @@ public int SetString(long arg0, Java.Lang.String arg1)
             return IExecute<int>("setString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#setAsciiStream(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#getAsciiStream()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Io.InputStream GetAsciiStream()
+        {
+            return IExecuteWithSignature<Java.Io.InputStream>("getAsciiStream", "()Ljava/io/InputStream;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#setAsciiStream(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Io.OutputStream"/></returns>
@@ -112,7 +107,16 @@ public Java.Io.OutputStream SetAsciiStream(long arg0)
             return IExecuteWithSignature<Java.Io.OutputStream>("setAsciiStream", "(J)Ljava/io/OutputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#getCharacterStream(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#getCharacterStream()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.Reader"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Io.Reader GetCharacterStream()
+        {
+            return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "()Ljava/io/Reader;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#getCharacterStream(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -123,7 +127,7 @@ public Java.Io.Reader GetCharacterStream(long arg0, long arg1)
             return IExecute<Java.Io.Reader>("getCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#setCharacterStream(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#setCharacterStream(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Io.Writer"/></returns>
@@ -133,7 +137,7 @@ public Java.Io.Writer SetCharacterStream(long arg0)
             return IExecuteWithSignature<Java.Io.Writer>("setCharacterStream", "(J)Ljava/io/Writer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#getSubString(long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#getSubString(long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -144,7 +148,7 @@ public Java.Lang.String GetSubString(long arg0, int arg1)
             return IExecute<Java.Lang.String>("getSubString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#length()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -153,7 +157,7 @@ public long Length()
             return IExecuteWithSignature<long>("length", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#position(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#position(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -164,7 +168,7 @@ public long Position(Java.Lang.String arg0, long arg1)
             return IExecute<long>("position", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#position(java.sql.Clob,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#position(java.sql.Clob,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Clob"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -175,7 +179,7 @@ public long Position(Java.Sql.Clob arg0, long arg1)
             return IExecute<long>("position", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#free()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#free()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Free()
@@ -183,7 +187,7 @@ public void Free()
             IExecuteWithSignature("free", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Clob.html#truncate(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Clob.html#truncate(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
diff --git a/src/net/Netdroid/Generated/Java/Sql/Connection.cs b/src/net/Netdroid/Generated/Java/Sql/Connection.cs
index 26465331a..7e9976531 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Connection.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Connection.cs
@@ -64,31 +64,31 @@ public partial class Connection : Java.Sql.IConnection, Java.Sql.IWrapper, Java.
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#TRANSACTION_NONE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#TRANSACTION_NONE"/>
         /// </summary>
         public static int TRANSACTION_NONE { get { if (!_TRANSACTION_NONEReady) { _TRANSACTION_NONEContent = SGetField<int>(LocalBridgeClazz, "TRANSACTION_NONE"); _TRANSACTION_NONEReady = true; } return _TRANSACTION_NONEContent; } }
         private static int _TRANSACTION_NONEContent = default;
         private static bool _TRANSACTION_NONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#TRANSACTION_READ_COMMITTED"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#TRANSACTION_READ_COMMITTED"/>
         /// </summary>
         public static int TRANSACTION_READ_COMMITTED { get { if (!_TRANSACTION_READ_COMMITTEDReady) { _TRANSACTION_READ_COMMITTEDContent = SGetField<int>(LocalBridgeClazz, "TRANSACTION_READ_COMMITTED"); _TRANSACTION_READ_COMMITTEDReady = true; } return _TRANSACTION_READ_COMMITTEDContent; } }
         private static int _TRANSACTION_READ_COMMITTEDContent = default;
         private static bool _TRANSACTION_READ_COMMITTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#TRANSACTION_READ_UNCOMMITTED"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#TRANSACTION_READ_UNCOMMITTED"/>
         /// </summary>
         public static int TRANSACTION_READ_UNCOMMITTED { get { if (!_TRANSACTION_READ_UNCOMMITTEDReady) { _TRANSACTION_READ_UNCOMMITTEDContent = SGetField<int>(LocalBridgeClazz, "TRANSACTION_READ_UNCOMMITTED"); _TRANSACTION_READ_UNCOMMITTEDReady = true; } return _TRANSACTION_READ_UNCOMMITTEDContent; } }
         private static int _TRANSACTION_READ_UNCOMMITTEDContent = default;
         private static bool _TRANSACTION_READ_UNCOMMITTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#TRANSACTION_REPEATABLE_READ"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#TRANSACTION_REPEATABLE_READ"/>
         /// </summary>
         public static int TRANSACTION_REPEATABLE_READ { get { if (!_TRANSACTION_REPEATABLE_READReady) { _TRANSACTION_REPEATABLE_READContent = SGetField<int>(LocalBridgeClazz, "TRANSACTION_REPEATABLE_READ"); _TRANSACTION_REPEATABLE_READReady = true; } return _TRANSACTION_REPEATABLE_READContent; } }
         private static int _TRANSACTION_REPEATABLE_READContent = default;
         private static bool _TRANSACTION_REPEATABLE_READReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#TRANSACTION_SERIALIZABLE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#TRANSACTION_SERIALIZABLE"/>
         /// </summary>
         public static int TRANSACTION_SERIALIZABLE { get { if (!_TRANSACTION_SERIALIZABLEReady) { _TRANSACTION_SERIALIZABLEContent = SGetField<int>(LocalBridgeClazz, "TRANSACTION_SERIALIZABLE"); _TRANSACTION_SERIALIZABLEReady = true; } return _TRANSACTION_SERIALIZABLEContent; } }
         private static int _TRANSACTION_SERIALIZABLEContent = default;
@@ -102,115 +102,99 @@ public partial class Connection : Java.Sql.IConnection, Java.Sql.IWrapper, Java.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getAutoCommit()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setAutoCommit(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getAutoCommit()"/>
         /// </summary>
-        public bool AutoCommit
-        {
-            get { return IExecuteWithSignature<bool>("getAutoCommit", "()Z"); } set { IExecuteWithSignature("setAutoCommit", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getCatalog()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setCatalog(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String Catalog
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCatalog", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCatalog", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getClientInfo()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setClientInfo(java.util.Properties)"/>
-        /// </summary>
-        public Java.Util.Properties ClientInfo
-        {
-            get { return IExecuteWithSignature<Java.Util.Properties>("getClientInfo", "()Ljava/util/Properties;"); } set { IExecuteWithSignature("setClientInfo", "(Ljava/util/Properties;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getHoldability()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setHoldability(int)"/>
-        /// </summary>
-        public int Holdability
-        {
-            get { return IExecuteWithSignature<int>("getHoldability", "()I"); } set { IExecuteWithSignature("setHoldability", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getMetaData()"/> 
-        /// </summary>
-        public Java.Sql.DatabaseMetaData MetaData
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public bool GetAutoCommit()
         {
-            get { return IExecuteWithSignature<Java.Sql.DatabaseMetaData>("getMetaData", "()Ljava/sql/DatabaseMetaData;"); }
+            return IExecuteWithSignature<bool>("getAutoCommit", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getNetworkTimeout()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#isClosed()"/>
         /// </summary>
-        public int NetworkTimeout
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public bool IsClosed()
         {
-            get { return IExecuteWithSignature<int>("getNetworkTimeout", "()I"); }
+            return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getSchema()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setSchema(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#isReadOnly()"/>
         /// </summary>
-        public Java.Lang.String Schema
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public bool IsReadOnly()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSchema", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSchema", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getTransactionIsolation()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setTransactionIsolation(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#isValid(int)"/>
         /// </summary>
-        public int TransactionIsolation
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public bool IsValid(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getTransactionIsolation", "()I"); } set { IExecuteWithSignature("setTransactionIsolation", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isValid", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getTypeMap()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setTypeMap(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getHoldability()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Lang.Class> TypeMap
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetHoldability()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.Class>>("getTypeMap", "()Ljava/util/Map;"); } set { IExecuteWithSignature("setTypeMap", "(Ljava/util/Map;)V", value); }
+            return IExecuteWithSignature<int>("getHoldability", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getWarnings()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getNetworkTimeout()"/>
         /// </summary>
-        public Java.Sql.SQLWarning Warnings
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetNetworkTimeout()
         {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getWarnings", "()Ljava/sql/SQLWarning;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLWarning>(obj); }
+            return IExecuteWithSignature<int>("getNetworkTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getTransactionIsolation()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
+        /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        public bool IsClosed()
+        public int GetTransactionIsolation()
         {
-            return IExecuteWithSignature<bool>("isClosed", "()Z");
+            return IExecuteWithSignature<int>("getTransactionIsolation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getCatalog()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
+        /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        public bool IsReadOnly()
+        public Java.Lang.String GetCatalog()
         {
-            return IExecuteWithSignature<bool>("isReadOnly", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getCatalog", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#isValid(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getClientInfo(java.lang.String)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        public bool IsValid(int arg0)
+        public Java.Lang.String GetClientInfo(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<bool>("isValid", "(I)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getClientInfo", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#getClientInfo(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getSchema()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        public Java.Lang.String GetClientInfo(Java.Lang.String arg0)
+        public Java.Lang.String GetSchema()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getClientInfo", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSchema", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#nativeSQL(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#nativeSQL(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -220,7 +204,7 @@ public Java.Lang.String NativeSQL(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("nativeSQL", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createArrayOf(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createArrayOf(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -231,7 +215,7 @@ public Java.Sql.Array CreateArrayOf(Java.Lang.String arg0, object[] arg1)
             return IExecute<Java.Sql.Array>("createArrayOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createBlob()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createBlob()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Blob"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -240,7 +224,7 @@ public Java.Sql.Blob CreateBlob()
             return IExecuteWithSignature<Java.Sql.Blob>("createBlob", "()Ljava/sql/Blob;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareCall(java.lang.String,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareCall(java.lang.String,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -253,7 +237,7 @@ public Java.Sql.CallableStatement PrepareCall(Java.Lang.String arg0, int arg1, i
             return IExecute<Java.Sql.CallableStatement>("prepareCall", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareCall(java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareCall(java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -265,7 +249,7 @@ public Java.Sql.CallableStatement PrepareCall(Java.Lang.String arg0, int arg1, i
             return IExecute<Java.Sql.CallableStatement>("prepareCall", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareCall(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareCall(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.CallableStatement"/></returns>
@@ -275,7 +259,7 @@ public Java.Sql.CallableStatement PrepareCall(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.CallableStatement>("prepareCall", "(Ljava/lang/String;)Ljava/sql/CallableStatement;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createClob()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createClob()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Clob"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -284,7 +268,16 @@ public Java.Sql.Clob CreateClob()
             return IExecuteWithSignature<Java.Sql.Clob>("createClob", "()Ljava/sql/Clob;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createNClob()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getMetaData()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.DatabaseMetaData"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.DatabaseMetaData GetMetaData()
+        {
+            return IExecuteWithSignature<Java.Sql.DatabaseMetaData>("getMetaData", "()Ljava/sql/DatabaseMetaData;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createNClob()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.NClob"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -293,7 +286,7 @@ public Java.Sql.NClob CreateNClob()
             return IExecuteWithSignature<Java.Sql.NClob>("createNClob", "()Ljava/sql/NClob;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareStatement(java.lang.String,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareStatement(java.lang.String,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -306,7 +299,7 @@ public Java.Sql.PreparedStatement PrepareStatement(Java.Lang.String arg0, int ar
             return IExecute<Java.Sql.PreparedStatement>("prepareStatement", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareStatement(java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareStatement(java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -318,7 +311,7 @@ public Java.Sql.PreparedStatement PrepareStatement(Java.Lang.String arg0, int ar
             return IExecute<Java.Sql.PreparedStatement>("prepareStatement", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareStatement(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareStatement(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -329,7 +322,7 @@ public Java.Sql.PreparedStatement PrepareStatement(Java.Lang.String arg0, int ar
             return IExecute<Java.Sql.PreparedStatement>("prepareStatement", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareStatement(java.lang.String,int[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareStatement(java.lang.String,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -340,7 +333,7 @@ public Java.Sql.PreparedStatement PrepareStatement(Java.Lang.String arg0, int[]
             return IExecute<Java.Sql.PreparedStatement>("prepareStatement", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareStatement(java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareStatement(java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -351,7 +344,7 @@ public Java.Sql.PreparedStatement PrepareStatement(Java.Lang.String arg0, Java.L
             return IExecute<Java.Sql.PreparedStatement>("prepareStatement", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#prepareStatement(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#prepareStatement(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.PreparedStatement"/></returns>
@@ -361,7 +354,7 @@ public Java.Sql.PreparedStatement PrepareStatement(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.PreparedStatement>("prepareStatement", "(Ljava/lang/String;)Ljava/sql/PreparedStatement;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setSavepoint()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setSavepoint()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Savepoint"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -370,7 +363,7 @@ public Java.Sql.Savepoint SetSavepoint()
             return IExecuteWithSignature<Java.Sql.Savepoint>("setSavepoint", "()Ljava/sql/Savepoint;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setSavepoint(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setSavepoint(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Savepoint"/></returns>
@@ -380,7 +373,16 @@ public Java.Sql.Savepoint SetSavepoint(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Savepoint>("setSavepoint", "(Ljava/lang/String;)Ljava/sql/Savepoint;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createSQLXML()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getWarnings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.SQLWarning"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.SQLWarning GetWarnings()
+        {
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getWarnings", "()Ljava/sql/SQLWarning;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLWarning>(obj);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createSQLXML()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.SQLXML"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -389,7 +391,7 @@ public Java.Sql.SQLXML CreateSQLXML()
             return IExecuteWithSignature<Java.Sql.SQLXML>("createSQLXML", "()Ljava/sql/SQLXML;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createStatement()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createStatement()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Statement"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -398,7 +400,7 @@ public Java.Sql.Statement CreateStatement()
             return IExecuteWithSignature<Java.Sql.Statement>("createStatement", "()Ljava/sql/Statement;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createStatement(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createStatement(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -410,7 +412,7 @@ public Java.Sql.Statement CreateStatement(int arg0, int arg1, int arg2)
             return IExecute<Java.Sql.Statement>("createStatement", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createStatement(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createStatement(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -421,7 +423,7 @@ public Java.Sql.Statement CreateStatement(int arg0, int arg1)
             return IExecute<Java.Sql.Statement>("createStatement", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#createStruct(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#createStruct(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -432,7 +434,25 @@ public Java.Sql.Struct CreateStruct(Java.Lang.String arg0, object[] arg1)
             return IExecute<Java.Sql.Struct>("createStruct", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#abort(java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getTypeMap()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Util.Map<Java.Lang.String, Java.Lang.Class> GetTypeMap()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.Class>>("getTypeMap", "()Ljava/util/Map;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#getClientInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Properties"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Util.Properties GetClientInfo()
+        {
+            return IExecuteWithSignature<Java.Util.Properties>("getClientInfo", "()Ljava/util/Properties;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#abort(java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -441,7 +461,7 @@ public void Abort(Java.Util.Concurrent.Executor arg0)
             IExecuteWithSignature("abort", "(Ljava/util/concurrent/Executor;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#clearWarnings()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#clearWarnings()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void ClearWarnings()
@@ -449,7 +469,7 @@ public void ClearWarnings()
             IExecuteWithSignature("clearWarnings", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Close()
@@ -457,7 +477,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#commit()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#commit()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Commit()
@@ -465,7 +485,7 @@ public void Commit()
             IExecuteWithSignature("commit", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#releaseSavepoint(java.sql.Savepoint)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#releaseSavepoint(java.sql.Savepoint)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Savepoint"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -474,7 +494,7 @@ public void ReleaseSavepoint(Java.Sql.Savepoint arg0)
             IExecuteWithSignature("releaseSavepoint", "(Ljava/sql/Savepoint;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#rollback()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#rollback()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Rollback()
@@ -482,7 +502,7 @@ public void Rollback()
             IExecuteWithSignature("rollback", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#rollback(java.sql.Savepoint)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#rollback(java.sql.Savepoint)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Savepoint"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -491,7 +511,25 @@ public void Rollback(Java.Sql.Savepoint arg0)
             IExecuteWithSignature("rollback", "(Ljava/sql/Savepoint;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setClientInfo(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setAutoCommit(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetAutoCommit(bool arg0)
+        {
+            IExecuteWithSignature("setAutoCommit", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setCatalog(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetCatalog(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setCatalog", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setClientInfo(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -501,7 +539,25 @@ public void SetClientInfo(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setClientInfo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setNetworkTimeout(java.util.concurrent.Executor,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setClientInfo(java.util.Properties)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Properties"/></param>
+        /// <exception cref="Java.Sql.SQLClientInfoException"/>
+        public void SetClientInfo(Java.Util.Properties arg0)
+        {
+            IExecuteWithSignature("setClientInfo", "(Ljava/util/Properties;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setHoldability(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetHoldability(int arg0)
+        {
+            IExecuteWithSignature("setHoldability", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setNetworkTimeout(java.util.concurrent.Executor,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -511,7 +567,7 @@ public void SetNetworkTimeout(Java.Util.Concurrent.Executor arg0, int arg1)
             IExecute("setNetworkTimeout", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#setReadOnly(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setReadOnly(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -520,7 +576,34 @@ public void SetReadOnly(bool arg0)
             IExecuteWithSignature("setReadOnly", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#beginRequest()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setSchema(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetSchema(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSchema", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setTransactionIsolation(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetTransactionIsolation(int arg0)
+        {
+            IExecuteWithSignature("setTransactionIsolation", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#setTypeMap(java.util.Map)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Map"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetTypeMap(Java.Util.Map<Java.Lang.String, Java.Lang.Class> arg0)
+        {
+            IExecuteWithSignature("setTypeMap", "(Ljava/util/Map;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#beginRequest()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void BeginRequest()
@@ -528,7 +611,7 @@ public void BeginRequest()
             IExecuteWithSignature("beginRequest", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Connection.html#endRequest()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Connection.html#endRequest()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void EndRequest()
diff --git a/src/net/Netdroid/Generated/Java/Sql/DatabaseMetaData.cs b/src/net/Netdroid/Generated/Java/Sql/DatabaseMetaData.cs
index 6255f60a3..b847cc75b 100644
--- a/src/net/Netdroid/Generated/Java/Sql/DatabaseMetaData.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/DatabaseMetaData.cs
@@ -56,367 +56,367 @@ public partial class DatabaseMetaData : Java.Sql.IDatabaseMetaData
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#bestRowNotPseudo"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#bestRowNotPseudo"/>
         /// </summary>
         public static int bestRowNotPseudo { get { if (!_bestRowNotPseudoReady) { _bestRowNotPseudoContent = SGetField<int>(LocalBridgeClazz, "bestRowNotPseudo"); _bestRowNotPseudoReady = true; } return _bestRowNotPseudoContent; } }
         private static int _bestRowNotPseudoContent = default;
         private static bool _bestRowNotPseudoReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#bestRowPseudo"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#bestRowPseudo"/>
         /// </summary>
         public static int bestRowPseudo { get { if (!_bestRowPseudoReady) { _bestRowPseudoContent = SGetField<int>(LocalBridgeClazz, "bestRowPseudo"); _bestRowPseudoReady = true; } return _bestRowPseudoContent; } }
         private static int _bestRowPseudoContent = default;
         private static bool _bestRowPseudoReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#bestRowSession"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#bestRowSession"/>
         /// </summary>
         public static int bestRowSession { get { if (!_bestRowSessionReady) { _bestRowSessionContent = SGetField<int>(LocalBridgeClazz, "bestRowSession"); _bestRowSessionReady = true; } return _bestRowSessionContent; } }
         private static int _bestRowSessionContent = default;
         private static bool _bestRowSessionReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#bestRowTemporary"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#bestRowTemporary"/>
         /// </summary>
         public static int bestRowTemporary { get { if (!_bestRowTemporaryReady) { _bestRowTemporaryContent = SGetField<int>(LocalBridgeClazz, "bestRowTemporary"); _bestRowTemporaryReady = true; } return _bestRowTemporaryContent; } }
         private static int _bestRowTemporaryContent = default;
         private static bool _bestRowTemporaryReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#bestRowTransaction"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#bestRowTransaction"/>
         /// </summary>
         public static int bestRowTransaction { get { if (!_bestRowTransactionReady) { _bestRowTransactionContent = SGetField<int>(LocalBridgeClazz, "bestRowTransaction"); _bestRowTransactionReady = true; } return _bestRowTransactionContent; } }
         private static int _bestRowTransactionContent = default;
         private static bool _bestRowTransactionReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#bestRowUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#bestRowUnknown"/>
         /// </summary>
         public static int bestRowUnknown { get { if (!_bestRowUnknownReady) { _bestRowUnknownContent = SGetField<int>(LocalBridgeClazz, "bestRowUnknown"); _bestRowUnknownReady = true; } return _bestRowUnknownContent; } }
         private static int _bestRowUnknownContent = default;
         private static bool _bestRowUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#columnNoNulls"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#columnNoNulls"/>
         /// </summary>
         public static int columnNoNulls { get { if (!_columnNoNullsReady) { _columnNoNullsContent = SGetField<int>(LocalBridgeClazz, "columnNoNulls"); _columnNoNullsReady = true; } return _columnNoNullsContent; } }
         private static int _columnNoNullsContent = default;
         private static bool _columnNoNullsReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#columnNullable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#columnNullable"/>
         /// </summary>
         public static int columnNullable { get { if (!_columnNullableReady) { _columnNullableContent = SGetField<int>(LocalBridgeClazz, "columnNullable"); _columnNullableReady = true; } return _columnNullableContent; } }
         private static int _columnNullableContent = default;
         private static bool _columnNullableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#columnNullableUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#columnNullableUnknown"/>
         /// </summary>
         public static int columnNullableUnknown { get { if (!_columnNullableUnknownReady) { _columnNullableUnknownContent = SGetField<int>(LocalBridgeClazz, "columnNullableUnknown"); _columnNullableUnknownReady = true; } return _columnNullableUnknownContent; } }
         private static int _columnNullableUnknownContent = default;
         private static bool _columnNullableUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionColumnIn"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionColumnIn"/>
         /// </summary>
         public static int functionColumnIn { get { if (!_functionColumnInReady) { _functionColumnInContent = SGetField<int>(LocalBridgeClazz, "functionColumnIn"); _functionColumnInReady = true; } return _functionColumnInContent; } }
         private static int _functionColumnInContent = default;
         private static bool _functionColumnInReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionColumnInOut"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionColumnInOut"/>
         /// </summary>
         public static int functionColumnInOut { get { if (!_functionColumnInOutReady) { _functionColumnInOutContent = SGetField<int>(LocalBridgeClazz, "functionColumnInOut"); _functionColumnInOutReady = true; } return _functionColumnInOutContent; } }
         private static int _functionColumnInOutContent = default;
         private static bool _functionColumnInOutReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionColumnOut"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionColumnOut"/>
         /// </summary>
         public static int functionColumnOut { get { if (!_functionColumnOutReady) { _functionColumnOutContent = SGetField<int>(LocalBridgeClazz, "functionColumnOut"); _functionColumnOutReady = true; } return _functionColumnOutContent; } }
         private static int _functionColumnOutContent = default;
         private static bool _functionColumnOutReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionColumnResult"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionColumnResult"/>
         /// </summary>
         public static int functionColumnResult { get { if (!_functionColumnResultReady) { _functionColumnResultContent = SGetField<int>(LocalBridgeClazz, "functionColumnResult"); _functionColumnResultReady = true; } return _functionColumnResultContent; } }
         private static int _functionColumnResultContent = default;
         private static bool _functionColumnResultReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionColumnUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionColumnUnknown"/>
         /// </summary>
         public static int functionColumnUnknown { get { if (!_functionColumnUnknownReady) { _functionColumnUnknownContent = SGetField<int>(LocalBridgeClazz, "functionColumnUnknown"); _functionColumnUnknownReady = true; } return _functionColumnUnknownContent; } }
         private static int _functionColumnUnknownContent = default;
         private static bool _functionColumnUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionNoNulls"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionNoNulls"/>
         /// </summary>
         public static int functionNoNulls { get { if (!_functionNoNullsReady) { _functionNoNullsContent = SGetField<int>(LocalBridgeClazz, "functionNoNulls"); _functionNoNullsReady = true; } return _functionNoNullsContent; } }
         private static int _functionNoNullsContent = default;
         private static bool _functionNoNullsReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionNoTable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionNoTable"/>
         /// </summary>
         public static int functionNoTable { get { if (!_functionNoTableReady) { _functionNoTableContent = SGetField<int>(LocalBridgeClazz, "functionNoTable"); _functionNoTableReady = true; } return _functionNoTableContent; } }
         private static int _functionNoTableContent = default;
         private static bool _functionNoTableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionNullable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionNullable"/>
         /// </summary>
         public static int functionNullable { get { if (!_functionNullableReady) { _functionNullableContent = SGetField<int>(LocalBridgeClazz, "functionNullable"); _functionNullableReady = true; } return _functionNullableContent; } }
         private static int _functionNullableContent = default;
         private static bool _functionNullableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionNullableUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionNullableUnknown"/>
         /// </summary>
         public static int functionNullableUnknown { get { if (!_functionNullableUnknownReady) { _functionNullableUnknownContent = SGetField<int>(LocalBridgeClazz, "functionNullableUnknown"); _functionNullableUnknownReady = true; } return _functionNullableUnknownContent; } }
         private static int _functionNullableUnknownContent = default;
         private static bool _functionNullableUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionResultUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionResultUnknown"/>
         /// </summary>
         public static int functionResultUnknown { get { if (!_functionResultUnknownReady) { _functionResultUnknownContent = SGetField<int>(LocalBridgeClazz, "functionResultUnknown"); _functionResultUnknownReady = true; } return _functionResultUnknownContent; } }
         private static int _functionResultUnknownContent = default;
         private static bool _functionResultUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionReturn"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionReturn"/>
         /// </summary>
         public static int functionReturn { get { if (!_functionReturnReady) { _functionReturnContent = SGetField<int>(LocalBridgeClazz, "functionReturn"); _functionReturnReady = true; } return _functionReturnContent; } }
         private static int _functionReturnContent = default;
         private static bool _functionReturnReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#functionReturnsTable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#functionReturnsTable"/>
         /// </summary>
         public static int functionReturnsTable { get { if (!_functionReturnsTableReady) { _functionReturnsTableContent = SGetField<int>(LocalBridgeClazz, "functionReturnsTable"); _functionReturnsTableReady = true; } return _functionReturnsTableContent; } }
         private static int _functionReturnsTableContent = default;
         private static bool _functionReturnsTableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#importedKeyCascade"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#importedKeyCascade"/>
         /// </summary>
         public static int importedKeyCascade { get { if (!_importedKeyCascadeReady) { _importedKeyCascadeContent = SGetField<int>(LocalBridgeClazz, "importedKeyCascade"); _importedKeyCascadeReady = true; } return _importedKeyCascadeContent; } }
         private static int _importedKeyCascadeContent = default;
         private static bool _importedKeyCascadeReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#importedKeyInitiallyDeferred"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#importedKeyInitiallyDeferred"/>
         /// </summary>
         public static int importedKeyInitiallyDeferred { get { if (!_importedKeyInitiallyDeferredReady) { _importedKeyInitiallyDeferredContent = SGetField<int>(LocalBridgeClazz, "importedKeyInitiallyDeferred"); _importedKeyInitiallyDeferredReady = true; } return _importedKeyInitiallyDeferredContent; } }
         private static int _importedKeyInitiallyDeferredContent = default;
         private static bool _importedKeyInitiallyDeferredReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#importedKeyInitiallyImmediate"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#importedKeyInitiallyImmediate"/>
         /// </summary>
         public static int importedKeyInitiallyImmediate { get { if (!_importedKeyInitiallyImmediateReady) { _importedKeyInitiallyImmediateContent = SGetField<int>(LocalBridgeClazz, "importedKeyInitiallyImmediate"); _importedKeyInitiallyImmediateReady = true; } return _importedKeyInitiallyImmediateContent; } }
         private static int _importedKeyInitiallyImmediateContent = default;
         private static bool _importedKeyInitiallyImmediateReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#importedKeyNoAction"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#importedKeyNoAction"/>
         /// </summary>
         public static int importedKeyNoAction { get { if (!_importedKeyNoActionReady) { _importedKeyNoActionContent = SGetField<int>(LocalBridgeClazz, "importedKeyNoAction"); _importedKeyNoActionReady = true; } return _importedKeyNoActionContent; } }
         private static int _importedKeyNoActionContent = default;
         private static bool _importedKeyNoActionReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#importedKeyNotDeferrable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#importedKeyNotDeferrable"/>
         /// </summary>
         public static int importedKeyNotDeferrable { get { if (!_importedKeyNotDeferrableReady) { _importedKeyNotDeferrableContent = SGetField<int>(LocalBridgeClazz, "importedKeyNotDeferrable"); _importedKeyNotDeferrableReady = true; } return _importedKeyNotDeferrableContent; } }
         private static int _importedKeyNotDeferrableContent = default;
         private static bool _importedKeyNotDeferrableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#importedKeyRestrict"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#importedKeyRestrict"/>
         /// </summary>
         public static int importedKeyRestrict { get { if (!_importedKeyRestrictReady) { _importedKeyRestrictContent = SGetField<int>(LocalBridgeClazz, "importedKeyRestrict"); _importedKeyRestrictReady = true; } return _importedKeyRestrictContent; } }
         private static int _importedKeyRestrictContent = default;
         private static bool _importedKeyRestrictReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#importedKeySetDefault"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#importedKeySetDefault"/>
         /// </summary>
         public static int importedKeySetDefault { get { if (!_importedKeySetDefaultReady) { _importedKeySetDefaultContent = SGetField<int>(LocalBridgeClazz, "importedKeySetDefault"); _importedKeySetDefaultReady = true; } return _importedKeySetDefaultContent; } }
         private static int _importedKeySetDefaultContent = default;
         private static bool _importedKeySetDefaultReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#importedKeySetNull"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#importedKeySetNull"/>
         /// </summary>
         public static int importedKeySetNull { get { if (!_importedKeySetNullReady) { _importedKeySetNullContent = SGetField<int>(LocalBridgeClazz, "importedKeySetNull"); _importedKeySetNullReady = true; } return _importedKeySetNullContent; } }
         private static int _importedKeySetNullContent = default;
         private static bool _importedKeySetNullReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureColumnIn"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureColumnIn"/>
         /// </summary>
         public static int procedureColumnIn { get { if (!_procedureColumnInReady) { _procedureColumnInContent = SGetField<int>(LocalBridgeClazz, "procedureColumnIn"); _procedureColumnInReady = true; } return _procedureColumnInContent; } }
         private static int _procedureColumnInContent = default;
         private static bool _procedureColumnInReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureColumnInOut"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureColumnInOut"/>
         /// </summary>
         public static int procedureColumnInOut { get { if (!_procedureColumnInOutReady) { _procedureColumnInOutContent = SGetField<int>(LocalBridgeClazz, "procedureColumnInOut"); _procedureColumnInOutReady = true; } return _procedureColumnInOutContent; } }
         private static int _procedureColumnInOutContent = default;
         private static bool _procedureColumnInOutReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureColumnOut"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureColumnOut"/>
         /// </summary>
         public static int procedureColumnOut { get { if (!_procedureColumnOutReady) { _procedureColumnOutContent = SGetField<int>(LocalBridgeClazz, "procedureColumnOut"); _procedureColumnOutReady = true; } return _procedureColumnOutContent; } }
         private static int _procedureColumnOutContent = default;
         private static bool _procedureColumnOutReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureColumnResult"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureColumnResult"/>
         /// </summary>
         public static int procedureColumnResult { get { if (!_procedureColumnResultReady) { _procedureColumnResultContent = SGetField<int>(LocalBridgeClazz, "procedureColumnResult"); _procedureColumnResultReady = true; } return _procedureColumnResultContent; } }
         private static int _procedureColumnResultContent = default;
         private static bool _procedureColumnResultReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureColumnReturn"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureColumnReturn"/>
         /// </summary>
         public static int procedureColumnReturn { get { if (!_procedureColumnReturnReady) { _procedureColumnReturnContent = SGetField<int>(LocalBridgeClazz, "procedureColumnReturn"); _procedureColumnReturnReady = true; } return _procedureColumnReturnContent; } }
         private static int _procedureColumnReturnContent = default;
         private static bool _procedureColumnReturnReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureColumnUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureColumnUnknown"/>
         /// </summary>
         public static int procedureColumnUnknown { get { if (!_procedureColumnUnknownReady) { _procedureColumnUnknownContent = SGetField<int>(LocalBridgeClazz, "procedureColumnUnknown"); _procedureColumnUnknownReady = true; } return _procedureColumnUnknownContent; } }
         private static int _procedureColumnUnknownContent = default;
         private static bool _procedureColumnUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureNoNulls"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureNoNulls"/>
         /// </summary>
         public static int procedureNoNulls { get { if (!_procedureNoNullsReady) { _procedureNoNullsContent = SGetField<int>(LocalBridgeClazz, "procedureNoNulls"); _procedureNoNullsReady = true; } return _procedureNoNullsContent; } }
         private static int _procedureNoNullsContent = default;
         private static bool _procedureNoNullsReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureNoResult"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureNoResult"/>
         /// </summary>
         public static int procedureNoResult { get { if (!_procedureNoResultReady) { _procedureNoResultContent = SGetField<int>(LocalBridgeClazz, "procedureNoResult"); _procedureNoResultReady = true; } return _procedureNoResultContent; } }
         private static int _procedureNoResultContent = default;
         private static bool _procedureNoResultReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureNullable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureNullable"/>
         /// </summary>
         public static int procedureNullable { get { if (!_procedureNullableReady) { _procedureNullableContent = SGetField<int>(LocalBridgeClazz, "procedureNullable"); _procedureNullableReady = true; } return _procedureNullableContent; } }
         private static int _procedureNullableContent = default;
         private static bool _procedureNullableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureNullableUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureNullableUnknown"/>
         /// </summary>
         public static int procedureNullableUnknown { get { if (!_procedureNullableUnknownReady) { _procedureNullableUnknownContent = SGetField<int>(LocalBridgeClazz, "procedureNullableUnknown"); _procedureNullableUnknownReady = true; } return _procedureNullableUnknownContent; } }
         private static int _procedureNullableUnknownContent = default;
         private static bool _procedureNullableUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureResultUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureResultUnknown"/>
         /// </summary>
         public static int procedureResultUnknown { get { if (!_procedureResultUnknownReady) { _procedureResultUnknownContent = SGetField<int>(LocalBridgeClazz, "procedureResultUnknown"); _procedureResultUnknownReady = true; } return _procedureResultUnknownContent; } }
         private static int _procedureResultUnknownContent = default;
         private static bool _procedureResultUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#procedureReturnsResult"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#procedureReturnsResult"/>
         /// </summary>
         public static int procedureReturnsResult { get { if (!_procedureReturnsResultReady) { _procedureReturnsResultContent = SGetField<int>(LocalBridgeClazz, "procedureReturnsResult"); _procedureReturnsResultReady = true; } return _procedureReturnsResultContent; } }
         private static int _procedureReturnsResultContent = default;
         private static bool _procedureReturnsResultReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#sqlStateSQL"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#sqlStateSQL"/>
         /// </summary>
         public static int sqlStateSQL { get { if (!_sqlStateSQLReady) { _sqlStateSQLContent = SGetField<int>(LocalBridgeClazz, "sqlStateSQL"); _sqlStateSQLReady = true; } return _sqlStateSQLContent; } }
         private static int _sqlStateSQLContent = default;
         private static bool _sqlStateSQLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#sqlStateSQL99"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#sqlStateSQL99"/>
         /// </summary>
         public static int sqlStateSQL99 { get { if (!_sqlStateSQL99Ready) { _sqlStateSQL99Content = SGetField<int>(LocalBridgeClazz, "sqlStateSQL99"); _sqlStateSQL99Ready = true; } return _sqlStateSQL99Content; } }
         private static int _sqlStateSQL99Content = default;
         private static bool _sqlStateSQL99Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#sqlStateXOpen"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#sqlStateXOpen"/>
         /// </summary>
         public static int sqlStateXOpen { get { if (!_sqlStateXOpenReady) { _sqlStateXOpenContent = SGetField<int>(LocalBridgeClazz, "sqlStateXOpen"); _sqlStateXOpenReady = true; } return _sqlStateXOpenContent; } }
         private static int _sqlStateXOpenContent = default;
         private static bool _sqlStateXOpenReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#typeNoNulls"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#typeNoNulls"/>
         /// </summary>
         public static int typeNoNulls { get { if (!_typeNoNullsReady) { _typeNoNullsContent = SGetField<int>(LocalBridgeClazz, "typeNoNulls"); _typeNoNullsReady = true; } return _typeNoNullsContent; } }
         private static int _typeNoNullsContent = default;
         private static bool _typeNoNullsReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#typeNullable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#typeNullable"/>
         /// </summary>
         public static int typeNullable { get { if (!_typeNullableReady) { _typeNullableContent = SGetField<int>(LocalBridgeClazz, "typeNullable"); _typeNullableReady = true; } return _typeNullableContent; } }
         private static int _typeNullableContent = default;
         private static bool _typeNullableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#typeNullableUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#typeNullableUnknown"/>
         /// </summary>
         public static int typeNullableUnknown { get { if (!_typeNullableUnknownReady) { _typeNullableUnknownContent = SGetField<int>(LocalBridgeClazz, "typeNullableUnknown"); _typeNullableUnknownReady = true; } return _typeNullableUnknownContent; } }
         private static int _typeNullableUnknownContent = default;
         private static bool _typeNullableUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#typePredBasic"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#typePredBasic"/>
         /// </summary>
         public static int typePredBasic { get { if (!_typePredBasicReady) { _typePredBasicContent = SGetField<int>(LocalBridgeClazz, "typePredBasic"); _typePredBasicReady = true; } return _typePredBasicContent; } }
         private static int _typePredBasicContent = default;
         private static bool _typePredBasicReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#typePredChar"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#typePredChar"/>
         /// </summary>
         public static int typePredChar { get { if (!_typePredCharReady) { _typePredCharContent = SGetField<int>(LocalBridgeClazz, "typePredChar"); _typePredCharReady = true; } return _typePredCharContent; } }
         private static int _typePredCharContent = default;
         private static bool _typePredCharReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#typePredNone"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#typePredNone"/>
         /// </summary>
         public static int typePredNone { get { if (!_typePredNoneReady) { _typePredNoneContent = SGetField<int>(LocalBridgeClazz, "typePredNone"); _typePredNoneReady = true; } return _typePredNoneContent; } }
         private static int _typePredNoneContent = default;
         private static bool _typePredNoneReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#typeSearchable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#typeSearchable"/>
         /// </summary>
         public static int typeSearchable { get { if (!_typeSearchableReady) { _typeSearchableContent = SGetField<int>(LocalBridgeClazz, "typeSearchable"); _typeSearchableReady = true; } return _typeSearchableContent; } }
         private static int _typeSearchableContent = default;
         private static bool _typeSearchableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#versionColumnNotPseudo"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#versionColumnNotPseudo"/>
         /// </summary>
         public static int versionColumnNotPseudo { get { if (!_versionColumnNotPseudoReady) { _versionColumnNotPseudoContent = SGetField<int>(LocalBridgeClazz, "versionColumnNotPseudo"); _versionColumnNotPseudoReady = true; } return _versionColumnNotPseudoContent; } }
         private static int _versionColumnNotPseudoContent = default;
         private static bool _versionColumnNotPseudoReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#versionColumnPseudo"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#versionColumnPseudo"/>
         /// </summary>
         public static int versionColumnPseudo { get { if (!_versionColumnPseudoReady) { _versionColumnPseudoContent = SGetField<int>(LocalBridgeClazz, "versionColumnPseudo"); _versionColumnPseudoReady = true; } return _versionColumnPseudoContent; } }
         private static int _versionColumnPseudoContent = default;
         private static bool _versionColumnPseudoReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#versionColumnUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#versionColumnUnknown"/>
         /// </summary>
         public static int versionColumnUnknown { get { if (!_versionColumnUnknownReady) { _versionColumnUnknownContent = SGetField<int>(LocalBridgeClazz, "versionColumnUnknown"); _versionColumnUnknownReady = true; } return _versionColumnUnknownContent; } }
         private static int _versionColumnUnknownContent = default;
         private static bool _versionColumnUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#attributeNoNulls"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#attributeNoNulls"/>
         /// </summary>
         public static short attributeNoNulls { get { if (!_attributeNoNullsReady) { _attributeNoNullsContent = SGetField<short>(LocalBridgeClazz, "attributeNoNulls"); _attributeNoNullsReady = true; } return _attributeNoNullsContent; } }
         private static short _attributeNoNullsContent = default;
         private static bool _attributeNoNullsReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#attributeNullable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#attributeNullable"/>
         /// </summary>
         public static short attributeNullable { get { if (!_attributeNullableReady) { _attributeNullableContent = SGetField<short>(LocalBridgeClazz, "attributeNullable"); _attributeNullableReady = true; } return _attributeNullableContent; } }
         private static short _attributeNullableContent = default;
         private static bool _attributeNullableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#attributeNullableUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#attributeNullableUnknown"/>
         /// </summary>
         public static short attributeNullableUnknown { get { if (!_attributeNullableUnknownReady) { _attributeNullableUnknownContent = SGetField<short>(LocalBridgeClazz, "attributeNullableUnknown"); _attributeNullableUnknownReady = true; } return _attributeNullableUnknownContent; } }
         private static short _attributeNullableUnknownContent = default;
         private static bool _attributeNullableUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#tableIndexClustered"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#tableIndexClustered"/>
         /// </summary>
         public static short tableIndexClustered { get { if (!_tableIndexClusteredReady) { _tableIndexClusteredContent = SGetField<short>(LocalBridgeClazz, "tableIndexClustered"); _tableIndexClusteredReady = true; } return _tableIndexClusteredContent; } }
         private static short _tableIndexClusteredContent = default;
         private static bool _tableIndexClusteredReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#tableIndexHashed"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#tableIndexHashed"/>
         /// </summary>
         public static short tableIndexHashed { get { if (!_tableIndexHashedReady) { _tableIndexHashedContent = SGetField<short>(LocalBridgeClazz, "tableIndexHashed"); _tableIndexHashedReady = true; } return _tableIndexHashedContent; } }
         private static short _tableIndexHashedContent = default;
         private static bool _tableIndexHashedReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#tableIndexOther"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#tableIndexOther"/>
         /// </summary>
         public static short tableIndexOther { get { if (!_tableIndexOtherReady) { _tableIndexOtherContent = SGetField<short>(LocalBridgeClazz, "tableIndexOther"); _tableIndexOtherReady = true; } return _tableIndexOtherContent; } }
         private static short _tableIndexOtherContent = default;
         private static bool _tableIndexOtherReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#tableIndexStatistic"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#tableIndexStatistic"/>
         /// </summary>
         public static short tableIndexStatistic { get { if (!_tableIndexStatisticReady) { _tableIndexStatisticContent = SGetField<short>(LocalBridgeClazz, "tableIndexStatistic"); _tableIndexStatisticReady = true; } return _tableIndexStatisticContent; } }
         private static short _tableIndexStatisticContent = default;
@@ -430,392 +430,7 @@ public partial class DatabaseMetaData : Java.Sql.IDatabaseMetaData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getCatalogs()"/> 
-        /// </summary>
-        public Java.Sql.ResultSet Catalogs
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getCatalogs", "()Ljava/sql/ResultSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getCatalogSeparator()"/> 
-        /// </summary>
-        public Java.Lang.String CatalogSeparator
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCatalogSeparator", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getCatalogTerm()"/> 
-        /// </summary>
-        public Java.Lang.String CatalogTerm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCatalogTerm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getClientInfoProperties()"/> 
-        /// </summary>
-        public Java.Sql.ResultSet ClientInfoProperties
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getClientInfoProperties", "()Ljava/sql/ResultSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getConnection()"/> 
-        /// </summary>
-        public Java.Sql.Connection Connection
-        {
-            get { return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDatabaseMajorVersion()"/> 
-        /// </summary>
-        public int DatabaseMajorVersion
-        {
-            get { return IExecuteWithSignature<int>("getDatabaseMajorVersion", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDatabaseMinorVersion()"/> 
-        /// </summary>
-        public int DatabaseMinorVersion
-        {
-            get { return IExecuteWithSignature<int>("getDatabaseMinorVersion", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDatabaseProductName()"/> 
-        /// </summary>
-        public Java.Lang.String DatabaseProductName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDatabaseProductName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDatabaseProductVersion()"/> 
-        /// </summary>
-        public Java.Lang.String DatabaseProductVersion
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDatabaseProductVersion", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDefaultTransactionIsolation()"/> 
-        /// </summary>
-        public int DefaultTransactionIsolation
-        {
-            get { return IExecuteWithSignature<int>("getDefaultTransactionIsolation", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDriverMajorVersion()"/> 
-        /// </summary>
-        public int DriverMajorVersion
-        {
-            get { return IExecuteWithSignature<int>("getDriverMajorVersion", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDriverMinorVersion()"/> 
-        /// </summary>
-        public int DriverMinorVersion
-        {
-            get { return IExecuteWithSignature<int>("getDriverMinorVersion", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDriverName()"/> 
-        /// </summary>
-        public Java.Lang.String DriverName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDriverName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getDriverVersion()"/> 
-        /// </summary>
-        public Java.Lang.String DriverVersion
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDriverVersion", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getExtraNameCharacters()"/> 
-        /// </summary>
-        public Java.Lang.String ExtraNameCharacters
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getExtraNameCharacters", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getIdentifierQuoteString()"/> 
-        /// </summary>
-        public Java.Lang.String IdentifierQuoteString
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getIdentifierQuoteString", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getJDBCMajorVersion()"/> 
-        /// </summary>
-        public int JDBCMajorVersion
-        {
-            get { return IExecuteWithSignature<int>("getJDBCMajorVersion", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getJDBCMinorVersion()"/> 
-        /// </summary>
-        public int JDBCMinorVersion
-        {
-            get { return IExecuteWithSignature<int>("getJDBCMinorVersion", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxBinaryLiteralLength()"/> 
-        /// </summary>
-        public int MaxBinaryLiteralLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxBinaryLiteralLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxCatalogNameLength()"/> 
-        /// </summary>
-        public int MaxCatalogNameLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxCatalogNameLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxCharLiteralLength()"/> 
-        /// </summary>
-        public int MaxCharLiteralLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxCharLiteralLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxColumnNameLength()"/> 
-        /// </summary>
-        public int MaxColumnNameLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxColumnNameLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxColumnsInGroupBy()"/> 
-        /// </summary>
-        public int MaxColumnsInGroupBy
-        {
-            get { return IExecuteWithSignature<int>("getMaxColumnsInGroupBy", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxColumnsInIndex()"/> 
-        /// </summary>
-        public int MaxColumnsInIndex
-        {
-            get { return IExecuteWithSignature<int>("getMaxColumnsInIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxColumnsInOrderBy()"/> 
-        /// </summary>
-        public int MaxColumnsInOrderBy
-        {
-            get { return IExecuteWithSignature<int>("getMaxColumnsInOrderBy", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxColumnsInSelect()"/> 
-        /// </summary>
-        public int MaxColumnsInSelect
-        {
-            get { return IExecuteWithSignature<int>("getMaxColumnsInSelect", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxColumnsInTable()"/> 
-        /// </summary>
-        public int MaxColumnsInTable
-        {
-            get { return IExecuteWithSignature<int>("getMaxColumnsInTable", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxConnections()"/> 
-        /// </summary>
-        public int MaxConnections
-        {
-            get { return IExecuteWithSignature<int>("getMaxConnections", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxCursorNameLength()"/> 
-        /// </summary>
-        public int MaxCursorNameLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxCursorNameLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxIndexLength()"/> 
-        /// </summary>
-        public int MaxIndexLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxIndexLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxLogicalLobSize()"/> 
-        /// </summary>
-        public long MaxLogicalLobSize
-        {
-            get { return IExecuteWithSignature<long>("getMaxLogicalLobSize", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxProcedureNameLength()"/> 
-        /// </summary>
-        public int MaxProcedureNameLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxProcedureNameLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxRowSize()"/> 
-        /// </summary>
-        public int MaxRowSize
-        {
-            get { return IExecuteWithSignature<int>("getMaxRowSize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxSchemaNameLength()"/> 
-        /// </summary>
-        public int MaxSchemaNameLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxSchemaNameLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxStatementLength()"/> 
-        /// </summary>
-        public int MaxStatementLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxStatementLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxStatements()"/> 
-        /// </summary>
-        public int MaxStatements
-        {
-            get { return IExecuteWithSignature<int>("getMaxStatements", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxTableNameLength()"/> 
-        /// </summary>
-        public int MaxTableNameLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxTableNameLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxTablesInSelect()"/> 
-        /// </summary>
-        public int MaxTablesInSelect
-        {
-            get { return IExecuteWithSignature<int>("getMaxTablesInSelect", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getMaxUserNameLength()"/> 
-        /// </summary>
-        public int MaxUserNameLength
-        {
-            get { return IExecuteWithSignature<int>("getMaxUserNameLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getNumericFunctions()"/> 
-        /// </summary>
-        public Java.Lang.String NumericFunctions
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNumericFunctions", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getProcedureTerm()"/> 
-        /// </summary>
-        public Java.Lang.String ProcedureTerm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProcedureTerm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getResultSetHoldability()"/> 
-        /// </summary>
-        public int ResultSetHoldability
-        {
-            get { return IExecuteWithSignature<int>("getResultSetHoldability", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getRowIdLifetime()"/> 
-        /// </summary>
-        public Java.Sql.RowIdLifetime RowIdLifetime
-        {
-            get { return IExecuteWithSignature<Java.Sql.RowIdLifetime>("getRowIdLifetime", "()Ljava/sql/RowIdLifetime;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSchemas()"/> 
-        /// </summary>
-        public Java.Sql.ResultSet Schemas
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getSchemas", "()Ljava/sql/ResultSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSchemaTerm()"/> 
-        /// </summary>
-        public Java.Lang.String SchemaTerm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSchemaTerm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSearchStringEscape()"/> 
-        /// </summary>
-        public Java.Lang.String SearchStringEscape
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSearchStringEscape", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSQLKeywords()"/> 
-        /// </summary>
-        public Java.Lang.String SQLKeywords
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSQLKeywords", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSQLStateType()"/> 
-        /// </summary>
-        public int SQLStateType
-        {
-            get { return IExecuteWithSignature<int>("getSQLStateType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getStringFunctions()"/> 
-        /// </summary>
-        public Java.Lang.String StringFunctions
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getStringFunctions", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSystemFunctions()"/> 
-        /// </summary>
-        public Java.Lang.String SystemFunctions
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemFunctions", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getTableTypes()"/> 
-        /// </summary>
-        public Java.Sql.ResultSet TableTypes
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getTableTypes", "()Ljava/sql/ResultSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getTimeDateFunctions()"/> 
-        /// </summary>
-        public Java.Lang.String TimeDateFunctions
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTimeDateFunctions", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getTypeInfo()"/> 
-        /// </summary>
-        public Java.Sql.ResultSet TypeInfo
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getTypeInfo", "()Ljava/sql/ResultSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getURL()"/> 
-        /// </summary>
-        public Java.Lang.String URL
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getURL", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getUserName()"/> 
-        /// </summary>
-        public Java.Lang.String UserName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUserName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#allProceduresAreCallable()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#allProceduresAreCallable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -824,7 +439,7 @@ public bool AllProceduresAreCallable()
             return IExecuteWithSignature<bool>("allProceduresAreCallable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#allTablesAreSelectable()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#allTablesAreSelectable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -833,7 +448,7 @@ public bool AllTablesAreSelectable()
             return IExecuteWithSignature<bool>("allTablesAreSelectable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#autoCommitFailureClosesAllResultSets()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#autoCommitFailureClosesAllResultSets()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -842,7 +457,7 @@ public bool AutoCommitFailureClosesAllResultSets()
             return IExecuteWithSignature<bool>("autoCommitFailureClosesAllResultSets", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#dataDefinitionCausesTransactionCommit()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#dataDefinitionCausesTransactionCommit()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -851,7 +466,7 @@ public bool DataDefinitionCausesTransactionCommit()
             return IExecuteWithSignature<bool>("dataDefinitionCausesTransactionCommit", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#dataDefinitionIgnoredInTransactions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#dataDefinitionIgnoredInTransactions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -860,7 +475,7 @@ public bool DataDefinitionIgnoredInTransactions()
             return IExecuteWithSignature<bool>("dataDefinitionIgnoredInTransactions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#deletesAreDetected(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#deletesAreDetected(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -870,7 +485,7 @@ public bool DeletesAreDetected(int arg0)
             return IExecuteWithSignature<bool>("deletesAreDetected", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#doesMaxRowSizeIncludeBlobs()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#doesMaxRowSizeIncludeBlobs()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -879,7 +494,7 @@ public bool DoesMaxRowSizeIncludeBlobs()
             return IExecuteWithSignature<bool>("doesMaxRowSizeIncludeBlobs", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#generatedKeyAlwaysReturned()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#generatedKeyAlwaysReturned()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -888,7 +503,7 @@ public bool GeneratedKeyAlwaysReturned()
             return IExecuteWithSignature<bool>("generatedKeyAlwaysReturned", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#insertsAreDetected(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#insertsAreDetected(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -898,7 +513,7 @@ public bool InsertsAreDetected(int arg0)
             return IExecuteWithSignature<bool>("insertsAreDetected", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#isCatalogAtStart()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#isCatalogAtStart()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -907,7 +522,7 @@ public bool IsCatalogAtStart()
             return IExecuteWithSignature<bool>("isCatalogAtStart", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#isReadOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -916,7 +531,7 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#locatorsUpdateCopy()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#locatorsUpdateCopy()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -925,7 +540,7 @@ public bool LocatorsUpdateCopy()
             return IExecuteWithSignature<bool>("locatorsUpdateCopy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#nullPlusNonNullIsNull()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#nullPlusNonNullIsNull()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -934,7 +549,7 @@ public bool NullPlusNonNullIsNull()
             return IExecuteWithSignature<bool>("nullPlusNonNullIsNull", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#nullsAreSortedAtEnd()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#nullsAreSortedAtEnd()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -943,7 +558,7 @@ public bool NullsAreSortedAtEnd()
             return IExecuteWithSignature<bool>("nullsAreSortedAtEnd", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#nullsAreSortedAtStart()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#nullsAreSortedAtStart()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -952,7 +567,7 @@ public bool NullsAreSortedAtStart()
             return IExecuteWithSignature<bool>("nullsAreSortedAtStart", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#nullsAreSortedHigh()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#nullsAreSortedHigh()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -961,7 +576,7 @@ public bool NullsAreSortedHigh()
             return IExecuteWithSignature<bool>("nullsAreSortedHigh", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#nullsAreSortedLow()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#nullsAreSortedLow()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -970,7 +585,7 @@ public bool NullsAreSortedLow()
             return IExecuteWithSignature<bool>("nullsAreSortedLow", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#othersDeletesAreVisible(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#othersDeletesAreVisible(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -980,7 +595,7 @@ public bool OthersDeletesAreVisible(int arg0)
             return IExecuteWithSignature<bool>("othersDeletesAreVisible", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#othersInsertsAreVisible(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#othersInsertsAreVisible(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -990,7 +605,7 @@ public bool OthersInsertsAreVisible(int arg0)
             return IExecuteWithSignature<bool>("othersInsertsAreVisible", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#othersUpdatesAreVisible(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#othersUpdatesAreVisible(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1000,7 +615,7 @@ public bool OthersUpdatesAreVisible(int arg0)
             return IExecuteWithSignature<bool>("othersUpdatesAreVisible", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#ownDeletesAreVisible(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#ownDeletesAreVisible(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1010,7 +625,7 @@ public bool OwnDeletesAreVisible(int arg0)
             return IExecuteWithSignature<bool>("ownDeletesAreVisible", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#ownInsertsAreVisible(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#ownInsertsAreVisible(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1020,7 +635,7 @@ public bool OwnInsertsAreVisible(int arg0)
             return IExecuteWithSignature<bool>("ownInsertsAreVisible", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#ownUpdatesAreVisible(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#ownUpdatesAreVisible(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1030,7 +645,7 @@ public bool OwnUpdatesAreVisible(int arg0)
             return IExecuteWithSignature<bool>("ownUpdatesAreVisible", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#storesLowerCaseIdentifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#storesLowerCaseIdentifiers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1039,7 +654,7 @@ public bool StoresLowerCaseIdentifiers()
             return IExecuteWithSignature<bool>("storesLowerCaseIdentifiers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#storesLowerCaseQuotedIdentifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#storesLowerCaseQuotedIdentifiers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1048,7 +663,7 @@ public bool StoresLowerCaseQuotedIdentifiers()
             return IExecuteWithSignature<bool>("storesLowerCaseQuotedIdentifiers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#storesMixedCaseIdentifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#storesMixedCaseIdentifiers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1057,7 +672,7 @@ public bool StoresMixedCaseIdentifiers()
             return IExecuteWithSignature<bool>("storesMixedCaseIdentifiers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#storesMixedCaseQuotedIdentifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#storesMixedCaseQuotedIdentifiers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1066,7 +681,7 @@ public bool StoresMixedCaseQuotedIdentifiers()
             return IExecuteWithSignature<bool>("storesMixedCaseQuotedIdentifiers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#storesUpperCaseIdentifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#storesUpperCaseIdentifiers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1075,7 +690,7 @@ public bool StoresUpperCaseIdentifiers()
             return IExecuteWithSignature<bool>("storesUpperCaseIdentifiers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#storesUpperCaseQuotedIdentifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#storesUpperCaseQuotedIdentifiers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1084,7 +699,7 @@ public bool StoresUpperCaseQuotedIdentifiers()
             return IExecuteWithSignature<bool>("storesUpperCaseQuotedIdentifiers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsAlterTableWithAddColumn()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsAlterTableWithAddColumn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1093,7 +708,7 @@ public bool SupportsAlterTableWithAddColumn()
             return IExecuteWithSignature<bool>("supportsAlterTableWithAddColumn", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsAlterTableWithDropColumn()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsAlterTableWithDropColumn()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1102,7 +717,7 @@ public bool SupportsAlterTableWithDropColumn()
             return IExecuteWithSignature<bool>("supportsAlterTableWithDropColumn", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsANSI92EntryLevelSQL()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsANSI92EntryLevelSQL()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1111,7 +726,7 @@ public bool SupportsANSI92EntryLevelSQL()
             return IExecuteWithSignature<bool>("supportsANSI92EntryLevelSQL", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsANSI92FullSQL()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsANSI92FullSQL()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1120,7 +735,7 @@ public bool SupportsANSI92FullSQL()
             return IExecuteWithSignature<bool>("supportsANSI92FullSQL", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsANSI92IntermediateSQL()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsANSI92IntermediateSQL()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1129,7 +744,7 @@ public bool SupportsANSI92IntermediateSQL()
             return IExecuteWithSignature<bool>("supportsANSI92IntermediateSQL", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsBatchUpdates()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsBatchUpdates()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1138,7 +753,7 @@ public bool SupportsBatchUpdates()
             return IExecuteWithSignature<bool>("supportsBatchUpdates", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsCatalogsInDataManipulation()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsCatalogsInDataManipulation()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1147,7 +762,7 @@ public bool SupportsCatalogsInDataManipulation()
             return IExecuteWithSignature<bool>("supportsCatalogsInDataManipulation", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsCatalogsInIndexDefinitions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsCatalogsInIndexDefinitions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1156,7 +771,7 @@ public bool SupportsCatalogsInIndexDefinitions()
             return IExecuteWithSignature<bool>("supportsCatalogsInIndexDefinitions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsCatalogsInPrivilegeDefinitions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsCatalogsInPrivilegeDefinitions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1165,7 +780,7 @@ public bool SupportsCatalogsInPrivilegeDefinitions()
             return IExecuteWithSignature<bool>("supportsCatalogsInPrivilegeDefinitions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsCatalogsInProcedureCalls()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsCatalogsInProcedureCalls()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1174,7 +789,7 @@ public bool SupportsCatalogsInProcedureCalls()
             return IExecuteWithSignature<bool>("supportsCatalogsInProcedureCalls", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsCatalogsInTableDefinitions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsCatalogsInTableDefinitions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1183,7 +798,7 @@ public bool SupportsCatalogsInTableDefinitions()
             return IExecuteWithSignature<bool>("supportsCatalogsInTableDefinitions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsColumnAliasing()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsColumnAliasing()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1192,7 +807,7 @@ public bool SupportsColumnAliasing()
             return IExecuteWithSignature<bool>("supportsColumnAliasing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsConvert()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsConvert()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1201,7 +816,7 @@ public bool SupportsConvert()
             return IExecuteWithSignature<bool>("supportsConvert", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsConvert(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsConvert(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1212,7 +827,7 @@ public bool SupportsConvert(int arg0, int arg1)
             return IExecute<bool>("supportsConvert", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsCoreSQLGrammar()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsCoreSQLGrammar()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1221,7 +836,7 @@ public bool SupportsCoreSQLGrammar()
             return IExecuteWithSignature<bool>("supportsCoreSQLGrammar", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsCorrelatedSubqueries()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsCorrelatedSubqueries()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1230,7 +845,7 @@ public bool SupportsCorrelatedSubqueries()
             return IExecuteWithSignature<bool>("supportsCorrelatedSubqueries", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsDataDefinitionAndDataManipulationTransactions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsDataDefinitionAndDataManipulationTransactions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1239,7 +854,7 @@ public bool SupportsDataDefinitionAndDataManipulationTransactions()
             return IExecuteWithSignature<bool>("supportsDataDefinitionAndDataManipulationTransactions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsDataManipulationTransactionsOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsDataManipulationTransactionsOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1248,7 +863,7 @@ public bool SupportsDataManipulationTransactionsOnly()
             return IExecuteWithSignature<bool>("supportsDataManipulationTransactionsOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsDifferentTableCorrelationNames()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsDifferentTableCorrelationNames()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1257,7 +872,7 @@ public bool SupportsDifferentTableCorrelationNames()
             return IExecuteWithSignature<bool>("supportsDifferentTableCorrelationNames", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsExpressionsInOrderBy()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsExpressionsInOrderBy()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1266,7 +881,7 @@ public bool SupportsExpressionsInOrderBy()
             return IExecuteWithSignature<bool>("supportsExpressionsInOrderBy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsExtendedSQLGrammar()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsExtendedSQLGrammar()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1275,7 +890,7 @@ public bool SupportsExtendedSQLGrammar()
             return IExecuteWithSignature<bool>("supportsExtendedSQLGrammar", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsFullOuterJoins()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsFullOuterJoins()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1284,7 +899,7 @@ public bool SupportsFullOuterJoins()
             return IExecuteWithSignature<bool>("supportsFullOuterJoins", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsGetGeneratedKeys()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsGetGeneratedKeys()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1293,7 +908,7 @@ public bool SupportsGetGeneratedKeys()
             return IExecuteWithSignature<bool>("supportsGetGeneratedKeys", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsGroupBy()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsGroupBy()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1302,7 +917,7 @@ public bool SupportsGroupBy()
             return IExecuteWithSignature<bool>("supportsGroupBy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsGroupByBeyondSelect()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsGroupByBeyondSelect()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1311,7 +926,7 @@ public bool SupportsGroupByBeyondSelect()
             return IExecuteWithSignature<bool>("supportsGroupByBeyondSelect", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsGroupByUnrelated()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsGroupByUnrelated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1320,7 +935,7 @@ public bool SupportsGroupByUnrelated()
             return IExecuteWithSignature<bool>("supportsGroupByUnrelated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsIntegrityEnhancementFacility()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsIntegrityEnhancementFacility()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1329,7 +944,7 @@ public bool SupportsIntegrityEnhancementFacility()
             return IExecuteWithSignature<bool>("supportsIntegrityEnhancementFacility", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsLikeEscapeClause()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsLikeEscapeClause()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1338,7 +953,7 @@ public bool SupportsLikeEscapeClause()
             return IExecuteWithSignature<bool>("supportsLikeEscapeClause", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsLimitedOuterJoins()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsLimitedOuterJoins()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1347,7 +962,7 @@ public bool SupportsLimitedOuterJoins()
             return IExecuteWithSignature<bool>("supportsLimitedOuterJoins", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsMinimumSQLGrammar()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsMinimumSQLGrammar()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1356,7 +971,7 @@ public bool SupportsMinimumSQLGrammar()
             return IExecuteWithSignature<bool>("supportsMinimumSQLGrammar", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsMixedCaseIdentifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsMixedCaseIdentifiers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1365,7 +980,7 @@ public bool SupportsMixedCaseIdentifiers()
             return IExecuteWithSignature<bool>("supportsMixedCaseIdentifiers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsMixedCaseQuotedIdentifiers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsMixedCaseQuotedIdentifiers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1374,7 +989,7 @@ public bool SupportsMixedCaseQuotedIdentifiers()
             return IExecuteWithSignature<bool>("supportsMixedCaseQuotedIdentifiers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsMultipleOpenResults()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsMultipleOpenResults()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1383,7 +998,7 @@ public bool SupportsMultipleOpenResults()
             return IExecuteWithSignature<bool>("supportsMultipleOpenResults", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsMultipleResultSets()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsMultipleResultSets()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1392,7 +1007,7 @@ public bool SupportsMultipleResultSets()
             return IExecuteWithSignature<bool>("supportsMultipleResultSets", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsMultipleTransactions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsMultipleTransactions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1401,7 +1016,7 @@ public bool SupportsMultipleTransactions()
             return IExecuteWithSignature<bool>("supportsMultipleTransactions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsNamedParameters()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsNamedParameters()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1410,7 +1025,7 @@ public bool SupportsNamedParameters()
             return IExecuteWithSignature<bool>("supportsNamedParameters", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsNonNullableColumns()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsNonNullableColumns()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1419,7 +1034,7 @@ public bool SupportsNonNullableColumns()
             return IExecuteWithSignature<bool>("supportsNonNullableColumns", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsOpenCursorsAcrossCommit()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsOpenCursorsAcrossCommit()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1428,7 +1043,7 @@ public bool SupportsOpenCursorsAcrossCommit()
             return IExecuteWithSignature<bool>("supportsOpenCursorsAcrossCommit", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsOpenCursorsAcrossRollback()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsOpenCursorsAcrossRollback()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1437,7 +1052,7 @@ public bool SupportsOpenCursorsAcrossRollback()
             return IExecuteWithSignature<bool>("supportsOpenCursorsAcrossRollback", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsOpenStatementsAcrossCommit()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsOpenStatementsAcrossCommit()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1446,7 +1061,7 @@ public bool SupportsOpenStatementsAcrossCommit()
             return IExecuteWithSignature<bool>("supportsOpenStatementsAcrossCommit", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsOpenStatementsAcrossRollback()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsOpenStatementsAcrossRollback()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1455,7 +1070,7 @@ public bool SupportsOpenStatementsAcrossRollback()
             return IExecuteWithSignature<bool>("supportsOpenStatementsAcrossRollback", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsOrderByUnrelated()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsOrderByUnrelated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1464,7 +1079,7 @@ public bool SupportsOrderByUnrelated()
             return IExecuteWithSignature<bool>("supportsOrderByUnrelated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsOuterJoins()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsOuterJoins()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1473,7 +1088,7 @@ public bool SupportsOuterJoins()
             return IExecuteWithSignature<bool>("supportsOuterJoins", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsPositionedDelete()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsPositionedDelete()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1482,7 +1097,7 @@ public bool SupportsPositionedDelete()
             return IExecuteWithSignature<bool>("supportsPositionedDelete", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsPositionedUpdate()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsPositionedUpdate()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1491,7 +1106,7 @@ public bool SupportsPositionedUpdate()
             return IExecuteWithSignature<bool>("supportsPositionedUpdate", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsResultSetConcurrency(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsResultSetConcurrency(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1502,7 +1117,7 @@ public bool SupportsResultSetConcurrency(int arg0, int arg1)
             return IExecute<bool>("supportsResultSetConcurrency", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsResultSetHoldability(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsResultSetHoldability(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1512,7 +1127,7 @@ public bool SupportsResultSetHoldability(int arg0)
             return IExecuteWithSignature<bool>("supportsResultSetHoldability", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsResultSetType(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsResultSetType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1522,7 +1137,7 @@ public bool SupportsResultSetType(int arg0)
             return IExecuteWithSignature<bool>("supportsResultSetType", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSavepoints()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSavepoints()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1531,7 +1146,7 @@ public bool SupportsSavepoints()
             return IExecuteWithSignature<bool>("supportsSavepoints", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSchemasInDataManipulation()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSchemasInDataManipulation()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1540,7 +1155,7 @@ public bool SupportsSchemasInDataManipulation()
             return IExecuteWithSignature<bool>("supportsSchemasInDataManipulation", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSchemasInIndexDefinitions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSchemasInIndexDefinitions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1549,7 +1164,7 @@ public bool SupportsSchemasInIndexDefinitions()
             return IExecuteWithSignature<bool>("supportsSchemasInIndexDefinitions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSchemasInPrivilegeDefinitions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSchemasInPrivilegeDefinitions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1558,7 +1173,7 @@ public bool SupportsSchemasInPrivilegeDefinitions()
             return IExecuteWithSignature<bool>("supportsSchemasInPrivilegeDefinitions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSchemasInProcedureCalls()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSchemasInProcedureCalls()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1567,7 +1182,7 @@ public bool SupportsSchemasInProcedureCalls()
             return IExecuteWithSignature<bool>("supportsSchemasInProcedureCalls", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSchemasInTableDefinitions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSchemasInTableDefinitions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1576,7 +1191,7 @@ public bool SupportsSchemasInTableDefinitions()
             return IExecuteWithSignature<bool>("supportsSchemasInTableDefinitions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSelectForUpdate()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSelectForUpdate()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1585,7 +1200,7 @@ public bool SupportsSelectForUpdate()
             return IExecuteWithSignature<bool>("supportsSelectForUpdate", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsStatementPooling()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsStatementPooling()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1594,7 +1209,7 @@ public bool SupportsStatementPooling()
             return IExecuteWithSignature<bool>("supportsStatementPooling", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsStoredFunctionsUsingCallSyntax()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsStoredFunctionsUsingCallSyntax()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1603,7 +1218,7 @@ public bool SupportsStoredFunctionsUsingCallSyntax()
             return IExecuteWithSignature<bool>("supportsStoredFunctionsUsingCallSyntax", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsStoredProcedures()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsStoredProcedures()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1612,7 +1227,7 @@ public bool SupportsStoredProcedures()
             return IExecuteWithSignature<bool>("supportsStoredProcedures", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSubqueriesInComparisons()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSubqueriesInComparisons()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1621,7 +1236,7 @@ public bool SupportsSubqueriesInComparisons()
             return IExecuteWithSignature<bool>("supportsSubqueriesInComparisons", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSubqueriesInExists()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSubqueriesInExists()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1630,7 +1245,7 @@ public bool SupportsSubqueriesInExists()
             return IExecuteWithSignature<bool>("supportsSubqueriesInExists", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSubqueriesInIns()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSubqueriesInIns()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1639,7 +1254,7 @@ public bool SupportsSubqueriesInIns()
             return IExecuteWithSignature<bool>("supportsSubqueriesInIns", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSubqueriesInQuantifieds()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSubqueriesInQuantifieds()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1648,7 +1263,7 @@ public bool SupportsSubqueriesInQuantifieds()
             return IExecuteWithSignature<bool>("supportsSubqueriesInQuantifieds", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsTableCorrelationNames()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsTableCorrelationNames()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1657,7 +1272,7 @@ public bool SupportsTableCorrelationNames()
             return IExecuteWithSignature<bool>("supportsTableCorrelationNames", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsTransactionIsolationLevel(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsTransactionIsolationLevel(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1667,7 +1282,7 @@ public bool SupportsTransactionIsolationLevel(int arg0)
             return IExecuteWithSignature<bool>("supportsTransactionIsolationLevel", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsTransactions()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsTransactions()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1676,7 +1291,7 @@ public bool SupportsTransactions()
             return IExecuteWithSignature<bool>("supportsTransactions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsUnion()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsUnion()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1685,7 +1300,7 @@ public bool SupportsUnion()
             return IExecuteWithSignature<bool>("supportsUnion", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsUnionAll()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsUnionAll()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1694,7 +1309,7 @@ public bool SupportsUnionAll()
             return IExecuteWithSignature<bool>("supportsUnionAll", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#updatesAreDetected(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#updatesAreDetected(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1704,7 +1319,7 @@ public bool UpdatesAreDetected(int arg0)
             return IExecuteWithSignature<bool>("updatesAreDetected", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#usesLocalFilePerTable()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#usesLocalFilePerTable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1713,7 +1328,7 @@ public bool UsesLocalFilePerTable()
             return IExecuteWithSignature<bool>("usesLocalFilePerTable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#usesLocalFiles()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#usesLocalFiles()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1722,7 +1337,437 @@ public bool UsesLocalFiles()
             return IExecuteWithSignature<bool>("usesLocalFiles", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getAttributes(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDatabaseMajorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetDatabaseMajorVersion()
+        {
+            return IExecuteWithSignature<int>("getDatabaseMajorVersion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDatabaseMinorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetDatabaseMinorVersion()
+        {
+            return IExecuteWithSignature<int>("getDatabaseMinorVersion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDefaultTransactionIsolation()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetDefaultTransactionIsolation()
+        {
+            return IExecuteWithSignature<int>("getDefaultTransactionIsolation", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDriverMajorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDriverMajorVersion()
+        {
+            return IExecuteWithSignature<int>("getDriverMajorVersion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDriverMinorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDriverMinorVersion()
+        {
+            return IExecuteWithSignature<int>("getDriverMinorVersion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getJDBCMajorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetJDBCMajorVersion()
+        {
+            return IExecuteWithSignature<int>("getJDBCMajorVersion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getJDBCMinorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetJDBCMinorVersion()
+        {
+            return IExecuteWithSignature<int>("getJDBCMinorVersion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxBinaryLiteralLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxBinaryLiteralLength()
+        {
+            return IExecuteWithSignature<int>("getMaxBinaryLiteralLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxCatalogNameLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxCatalogNameLength()
+        {
+            return IExecuteWithSignature<int>("getMaxCatalogNameLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxCharLiteralLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxCharLiteralLength()
+        {
+            return IExecuteWithSignature<int>("getMaxCharLiteralLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxColumnNameLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxColumnNameLength()
+        {
+            return IExecuteWithSignature<int>("getMaxColumnNameLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxColumnsInGroupBy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxColumnsInGroupBy()
+        {
+            return IExecuteWithSignature<int>("getMaxColumnsInGroupBy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxColumnsInIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxColumnsInIndex()
+        {
+            return IExecuteWithSignature<int>("getMaxColumnsInIndex", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxColumnsInOrderBy()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxColumnsInOrderBy()
+        {
+            return IExecuteWithSignature<int>("getMaxColumnsInOrderBy", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxColumnsInSelect()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxColumnsInSelect()
+        {
+            return IExecuteWithSignature<int>("getMaxColumnsInSelect", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxColumnsInTable()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxColumnsInTable()
+        {
+            return IExecuteWithSignature<int>("getMaxColumnsInTable", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxConnections()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxConnections()
+        {
+            return IExecuteWithSignature<int>("getMaxConnections", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxCursorNameLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxCursorNameLength()
+        {
+            return IExecuteWithSignature<int>("getMaxCursorNameLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxIndexLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxIndexLength()
+        {
+            return IExecuteWithSignature<int>("getMaxIndexLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxProcedureNameLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxProcedureNameLength()
+        {
+            return IExecuteWithSignature<int>("getMaxProcedureNameLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxRowSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxRowSize()
+        {
+            return IExecuteWithSignature<int>("getMaxRowSize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxSchemaNameLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxSchemaNameLength()
+        {
+            return IExecuteWithSignature<int>("getMaxSchemaNameLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxStatementLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxStatementLength()
+        {
+            return IExecuteWithSignature<int>("getMaxStatementLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxStatements()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxStatements()
+        {
+            return IExecuteWithSignature<int>("getMaxStatements", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxTableNameLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxTableNameLength()
+        {
+            return IExecuteWithSignature<int>("getMaxTableNameLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxTablesInSelect()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxTablesInSelect()
+        {
+            return IExecuteWithSignature<int>("getMaxTablesInSelect", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxUserNameLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxUserNameLength()
+        {
+            return IExecuteWithSignature<int>("getMaxUserNameLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getResultSetHoldability()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetResultSetHoldability()
+        {
+            return IExecuteWithSignature<int>("getResultSetHoldability", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSQLStateType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetSQLStateType()
+        {
+            return IExecuteWithSignature<int>("getSQLStateType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getCatalogSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetCatalogSeparator()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCatalogSeparator", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getCatalogTerm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetCatalogTerm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCatalogTerm", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDatabaseProductName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetDatabaseProductName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDatabaseProductName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDatabaseProductVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetDatabaseProductVersion()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDatabaseProductVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDriverName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetDriverName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDriverName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getDriverVersion()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetDriverVersion()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDriverVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getExtraNameCharacters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetExtraNameCharacters()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getExtraNameCharacters", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getIdentifierQuoteString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetIdentifierQuoteString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getIdentifierQuoteString", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getNumericFunctions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetNumericFunctions()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNumericFunctions", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getProcedureTerm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetProcedureTerm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getProcedureTerm", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSchemaTerm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetSchemaTerm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSchemaTerm", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSearchStringEscape()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetSearchStringEscape()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSearchStringEscape", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSQLKeywords()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetSQLKeywords()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSQLKeywords", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getStringFunctions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetStringFunctions()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getStringFunctions", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSystemFunctions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetSystemFunctions()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSystemFunctions", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getTimeDateFunctions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetTimeDateFunctions()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTimeDateFunctions", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getURL()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetURL()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getURL", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getUserName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetUserName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getUserName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getConnection()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.Connection"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.Connection GetConnection()
+        {
+            return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getAttributes(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1735,7 +1780,7 @@ public Java.Sql.ResultSet GetAttributes(Java.Lang.String arg0, Java.Lang.String
             return IExecute<Java.Sql.ResultSet>("getAttributes", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getBestRowIdentifier(java.lang.String,java.lang.String,java.lang.String,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getBestRowIdentifier(java.lang.String,java.lang.String,java.lang.String,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1749,7 +1794,25 @@ public Java.Sql.ResultSet GetBestRowIdentifier(Java.Lang.String arg0, Java.Lang.
             return IExecute<Java.Sql.ResultSet>("getBestRowIdentifier", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getColumnPrivileges(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getCatalogs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetCatalogs()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getCatalogs", "()Ljava/sql/ResultSet;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getClientInfoProperties()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetClientInfoProperties()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getClientInfoProperties", "()Ljava/sql/ResultSet;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getColumnPrivileges(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1762,7 +1825,7 @@ public Java.Sql.ResultSet GetColumnPrivileges(Java.Lang.String arg0, Java.Lang.S
             return IExecute<Java.Sql.ResultSet>("getColumnPrivileges", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getColumns(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getColumns(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1775,7 +1838,7 @@ public Java.Sql.ResultSet GetColumns(Java.Lang.String arg0, Java.Lang.String arg
             return IExecute<Java.Sql.ResultSet>("getColumns", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getCrossReference(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getCrossReference(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1790,7 +1853,7 @@ public Java.Sql.ResultSet GetCrossReference(Java.Lang.String arg0, Java.Lang.Str
             return IExecute<Java.Sql.ResultSet>("getCrossReference", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getExportedKeys(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getExportedKeys(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1802,7 +1865,7 @@ public Java.Sql.ResultSet GetExportedKeys(Java.Lang.String arg0, Java.Lang.Strin
             return IExecute<Java.Sql.ResultSet>("getExportedKeys", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getFunctionColumns(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getFunctionColumns(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1815,7 +1878,7 @@ public Java.Sql.ResultSet GetFunctionColumns(Java.Lang.String arg0, Java.Lang.St
             return IExecute<Java.Sql.ResultSet>("getFunctionColumns", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getFunctions(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getFunctions(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1827,7 +1890,7 @@ public Java.Sql.ResultSet GetFunctions(Java.Lang.String arg0, Java.Lang.String a
             return IExecute<Java.Sql.ResultSet>("getFunctions", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getImportedKeys(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getImportedKeys(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1839,7 +1902,7 @@ public Java.Sql.ResultSet GetImportedKeys(Java.Lang.String arg0, Java.Lang.Strin
             return IExecute<Java.Sql.ResultSet>("getImportedKeys", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getIndexInfo(java.lang.String,java.lang.String,java.lang.String,boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getIndexInfo(java.lang.String,java.lang.String,java.lang.String,boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1853,7 +1916,7 @@ public Java.Sql.ResultSet GetIndexInfo(Java.Lang.String arg0, Java.Lang.String a
             return IExecute<Java.Sql.ResultSet>("getIndexInfo", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getPrimaryKeys(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getPrimaryKeys(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1865,7 +1928,7 @@ public Java.Sql.ResultSet GetPrimaryKeys(Java.Lang.String arg0, Java.Lang.String
             return IExecute<Java.Sql.ResultSet>("getPrimaryKeys", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getProcedureColumns(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getProcedureColumns(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1878,7 +1941,7 @@ public Java.Sql.ResultSet GetProcedureColumns(Java.Lang.String arg0, Java.Lang.S
             return IExecute<Java.Sql.ResultSet>("getProcedureColumns", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getProcedures(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getProcedures(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1890,7 +1953,7 @@ public Java.Sql.ResultSet GetProcedures(Java.Lang.String arg0, Java.Lang.String
             return IExecute<Java.Sql.ResultSet>("getProcedures", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getPseudoColumns(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getPseudoColumns(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1903,7 +1966,16 @@ public Java.Sql.ResultSet GetPseudoColumns(Java.Lang.String arg0, Java.Lang.Stri
             return IExecute<Java.Sql.ResultSet>("getPseudoColumns", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSchemas(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSchemas()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetSchemas()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getSchemas", "()Ljava/sql/ResultSet;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSchemas(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1914,7 +1986,7 @@ public Java.Sql.ResultSet GetSchemas(Java.Lang.String arg0, Java.Lang.String arg
             return IExecute<Java.Sql.ResultSet>("getSchemas", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSuperTables(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSuperTables(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1926,7 +1998,7 @@ public Java.Sql.ResultSet GetSuperTables(Java.Lang.String arg0, Java.Lang.String
             return IExecute<Java.Sql.ResultSet>("getSuperTables", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getSuperTypes(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getSuperTypes(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1938,7 +2010,7 @@ public Java.Sql.ResultSet GetSuperTypes(Java.Lang.String arg0, Java.Lang.String
             return IExecute<Java.Sql.ResultSet>("getSuperTypes", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getTablePrivileges(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getTablePrivileges(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1950,7 +2022,7 @@ public Java.Sql.ResultSet GetTablePrivileges(Java.Lang.String arg0, Java.Lang.St
             return IExecute<Java.Sql.ResultSet>("getTablePrivileges", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getTables(java.lang.String,java.lang.String,java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getTables(java.lang.String,java.lang.String,java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1963,7 +2035,25 @@ public Java.Sql.ResultSet GetTables(Java.Lang.String arg0, Java.Lang.String arg1
             return IExecute<Java.Sql.ResultSet>("getTables", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getUDTs(java.lang.String,java.lang.String,java.lang.String,int[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getTableTypes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetTableTypes()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getTableTypes", "()Ljava/sql/ResultSet;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getTypeInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetTypeInfo()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getTypeInfo", "()Ljava/sql/ResultSet;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getUDTs(java.lang.String,java.lang.String,java.lang.String,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1976,7 +2066,7 @@ public Java.Sql.ResultSet GetUDTs(Java.Lang.String arg0, Java.Lang.String arg1,
             return IExecute<Java.Sql.ResultSet>("getUDTs", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#getVersionColumns(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getVersionColumns(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1988,7 +2078,16 @@ public Java.Sql.ResultSet GetVersionColumns(Java.Lang.String arg0, Java.Lang.Str
             return IExecute<Java.Sql.ResultSet>("getVersionColumns", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsRefCursors()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getRowIdLifetime()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.RowIdLifetime"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.RowIdLifetime GetRowIdLifetime()
+        {
+            return IExecuteWithSignature<Java.Sql.RowIdLifetime>("getRowIdLifetime", "()Ljava/sql/RowIdLifetime;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsRefCursors()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1997,7 +2096,7 @@ public bool SupportsRefCursors()
             return IExecuteWithSignature<bool>("supportsRefCursors", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DatabaseMetaData.html#supportsSharding()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#supportsSharding()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -2005,6 +2104,15 @@ public bool SupportsSharding()
         {
             return IExecuteWithSignature<bool>("supportsSharding", "()Z");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DatabaseMetaData.html#getMaxLogicalLobSize()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public long GetMaxLogicalLobSize()
+        {
+            return IExecuteWithSignature<long>("getMaxLogicalLobSize", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/Date.cs b/src/net/Netdroid/Generated/Java/Sql/Date.cs
index 3bd43db5a..dd88a3618 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Date.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Date.cs
@@ -30,18 +30,18 @@ public partial class Date
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Date.html#%3Cinit%3E(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Date.html#%3Cinit%3E(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Date(int arg0, int arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Date.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Date.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public Date(long arg0)
@@ -61,7 +61,7 @@ public Date(long arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Date.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Date.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Date"/></returns>
@@ -70,7 +70,7 @@ public static Java.Sql.Date ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Sql.Date>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/sql/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Date.html#valueOf(java.time.LocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Date.html#valueOf(java.time.LocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <returns><see cref="Java.Sql.Date"/></returns>
@@ -83,7 +83,7 @@ public static Java.Sql.Date ValueOf(Java.Time.LocalDate arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Date.html#toLocalDate()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Date.html#toLocalDate()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
         public Java.Time.LocalDate ToLocalDate()
diff --git a/src/net/Netdroid/Generated/Java/Sql/Driver.cs b/src/net/Netdroid/Generated/Java/Sql/Driver.cs
index 234d855da..d24a63520 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Driver.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Driver.cs
@@ -64,28 +64,7 @@ public partial class Driver : Java.Sql.IDriver
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Driver.html#getMajorVersion()"/> 
-        /// </summary>
-        public int MajorVersion
-        {
-            get { return IExecuteWithSignature<int>("getMajorVersion", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Driver.html#getMinorVersion()"/> 
-        /// </summary>
-        public int MinorVersion
-        {
-            get { return IExecuteWithSignature<int>("getMinorVersion", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Driver.html#getParentLogger()"/> 
-        /// </summary>
-        public Java.Util.Logging.Logger ParentLogger
-        {
-            get { return IExecuteWithSignature<Java.Util.Logging.Logger>("getParentLogger", "()Ljava/util/logging/Logger;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Driver.html#acceptsURL(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Driver.html#acceptsURL(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -95,7 +74,7 @@ public bool AcceptsURL(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("acceptsURL", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Driver.html#jdbcCompliant()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Driver.html#jdbcCompliant()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool JdbcCompliant()
@@ -103,7 +82,23 @@ public bool JdbcCompliant()
             return IExecuteWithSignature<bool>("jdbcCompliant", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Driver.html#connect(java.lang.String,java.util.Properties)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Driver.html#getMajorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMajorVersion()
+        {
+            return IExecuteWithSignature<int>("getMajorVersion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Driver.html#getMinorVersion()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinorVersion()
+        {
+            return IExecuteWithSignature<int>("getMinorVersion", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Driver.html#connect(java.lang.String,java.util.Properties)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Properties"/></param>
@@ -114,7 +109,7 @@ public Java.Sql.Connection Connect(Java.Lang.String arg0, Java.Util.Properties a
             return IExecute<Java.Sql.Connection>("connect", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Driver.html#getPropertyInfo(java.lang.String,java.util.Properties)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Driver.html#getPropertyInfo(java.lang.String,java.util.Properties)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Properties"/></param>
@@ -124,6 +119,15 @@ public Java.Sql.DriverPropertyInfo[] GetPropertyInfo(Java.Lang.String arg0, Java
         {
             return IExecuteArray<Java.Sql.DriverPropertyInfo>("getPropertyInfo", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Driver.html#getParentLogger()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Logging.Logger"/></returns>
+        /// <exception cref="Java.Sql.SQLFeatureNotSupportedException"/>
+        public Java.Util.Logging.Logger GetParentLogger()
+        {
+            return IExecuteWithSignature<Java.Util.Logging.Logger>("getParentLogger", "()Ljava/util/logging/Logger;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/DriverManager.cs b/src/net/Netdroid/Generated/Java/Sql/DriverManager.cs
index 58dfd0f84..1cd8374bb 100644
--- a/src/net/Netdroid/Generated/Java/Sql/DriverManager.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/DriverManager.cs
@@ -42,29 +42,32 @@ public partial class DriverManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#getLoginTimeout()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#setLoginTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#getLoginTimeout()"/>
         /// </summary>
-        public static int LoginTimeout
+        /// <returns><see cref="int"/></returns>
+        public static int GetLoginTimeout()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getLoginTimeout", "()I"); } set { SExecuteWithSignature(LocalBridgeClazz, "setLoginTimeout", "(I)V", value); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getLoginTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#getLogStream()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#setLogStream(java.io.PrintStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#getLogStream()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Java.Io.PrintStream LogStream
+        /// <returns><see cref="Java.Io.PrintStream"/></returns>
+        [global::System.Obsolete()]
+        public static Java.Io.PrintStream GetLogStream()
         {
-            get { return SExecuteWithSignature<Java.Io.PrintStream>(LocalBridgeClazz, "getLogStream", "()Ljava/io/PrintStream;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setLogStream", "(Ljava/io/PrintStream;)V", value); }
+            return SExecuteWithSignature<Java.Io.PrintStream>(LocalBridgeClazz, "getLogStream", "()Ljava/io/PrintStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#getLogWriter()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#setLogWriter(java.io.PrintWriter)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#getLogWriter()"/>
         /// </summary>
-        public static Java.Io.PrintWriter LogWriter
+        /// <returns><see cref="Java.Io.PrintWriter"/></returns>
+        public static Java.Io.PrintWriter GetLogWriter()
         {
-            get { return SExecuteWithSignature<Java.Io.PrintWriter>(LocalBridgeClazz, "getLogWriter", "()Ljava/io/PrintWriter;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setLogWriter", "(Ljava/io/PrintWriter;)V", value); }
+            return SExecuteWithSignature<Java.Io.PrintWriter>(LocalBridgeClazz, "getLogWriter", "()Ljava/io/PrintWriter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#getConnection(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#getConnection(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -76,7 +79,7 @@ public static Java.Sql.Connection GetConnection(Java.Lang.String arg0, Java.Lang
             return SExecute<Java.Sql.Connection>(LocalBridgeClazz, "getConnection", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#getConnection(java.lang.String,java.util.Properties)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#getConnection(java.lang.String,java.util.Properties)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Properties"/></param>
@@ -87,7 +90,7 @@ public static Java.Sql.Connection GetConnection(Java.Lang.String arg0, Java.Util
             return SExecute<Java.Sql.Connection>(LocalBridgeClazz, "getConnection", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#getConnection(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#getConnection(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Connection"/></returns>
@@ -97,7 +100,7 @@ public static Java.Sql.Connection GetConnection(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Sql.Connection>(LocalBridgeClazz, "getConnection", "(Ljava/lang/String;)Ljava/sql/Connection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#getDriver(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#getDriver(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Driver"/></returns>
@@ -107,7 +110,7 @@ public static Java.Sql.Driver GetDriver(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Sql.Driver>(LocalBridgeClazz, "getDriver", "(Ljava/lang/String;)Ljava/sql/Driver;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#getDrivers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#getDrivers()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public static Java.Util.Enumeration<Java.Sql.Driver> GetDrivers()
@@ -115,7 +118,7 @@ public static Java.Sql.Driver GetDriver(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.Enumeration<Java.Sql.Driver>>(LocalBridgeClazz, "getDrivers", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#drivers()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#drivers()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public static Java.Util.Stream.Stream<Java.Sql.Driver> Drivers()
@@ -123,7 +126,7 @@ public static Java.Sql.Driver GetDriver(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.Stream.Stream<Java.Sql.Driver>>(LocalBridgeClazz, "drivers", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#deregisterDriver(java.sql.Driver)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#deregisterDriver(java.sql.Driver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Driver"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -132,7 +135,7 @@ public static void DeregisterDriver(Java.Sql.Driver arg0)
             SExecuteWithSignature(LocalBridgeClazz, "deregisterDriver", "(Ljava/sql/Driver;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#println(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#println(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public static void Println(Java.Lang.String arg0)
@@ -140,7 +143,7 @@ public static void Println(Java.Lang.String arg0)
             SExecuteWithSignature(LocalBridgeClazz, "println", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverManager.html#registerDriver(java.sql.Driver)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#registerDriver(java.sql.Driver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Driver"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -148,6 +151,31 @@ public static void RegisterDriver(Java.Sql.Driver arg0)
         {
             SExecuteWithSignature(LocalBridgeClazz, "registerDriver", "(Ljava/sql/Driver;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#setLoginTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public static void SetLoginTimeout(int arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setLoginTimeout", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#setLogStream(java.io.PrintStream)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.PrintStream"/></param>
+        [global::System.Obsolete()]
+        public static void SetLogStream(Java.Io.PrintStream arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setLogStream", "(Ljava/io/PrintStream;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverManager.html#setLogWriter(java.io.PrintWriter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.PrintWriter"/></param>
+        public static void SetLogWriter(Java.Io.PrintWriter arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setLogWriter", "(Ljava/io/PrintWriter;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/DriverPropertyInfo.cs b/src/net/Netdroid/Generated/Java/Sql/DriverPropertyInfo.cs
index 8dd1fdb8c..470b66785 100644
--- a/src/net/Netdroid/Generated/Java/Sql/DriverPropertyInfo.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/DriverPropertyInfo.cs
@@ -30,7 +30,7 @@ public partial class DriverPropertyInfo
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverPropertyInfo.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverPropertyInfo.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -47,23 +47,23 @@ public DriverPropertyInfo(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverPropertyInfo.html#required"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverPropertyInfo.html#required"/>
         /// </summary>
         public bool required { get { return IGetField<bool>("required"); } set { ISetField("required", value); } }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverPropertyInfo.html#description"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverPropertyInfo.html#description"/>
         /// </summary>
         public Java.Lang.String description { get { return IGetField<Java.Lang.String>("description"); } set { ISetField("description", value); } }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverPropertyInfo.html#name"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverPropertyInfo.html#name"/>
         /// </summary>
         public Java.Lang.String name { get { return IGetField<Java.Lang.String>("name"); } set { ISetField("name", value); } }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverPropertyInfo.html#value"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverPropertyInfo.html#value"/>
         /// </summary>
         public Java.Lang.String value { get { return IGetField<Java.Lang.String>("value"); } set { ISetField("value", value); } }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/DriverPropertyInfo.html#choices"/>
+        /// <see href="https://developer.android.com/reference/java/sql/DriverPropertyInfo.html#choices"/>
         /// </summary>
         public Java.Lang.String[] choices { get { return IGetFieldArray<Java.Lang.String>("choices"); } set { ISetField("choices", value); } }
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/ParameterMetaData.cs b/src/net/Netdroid/Generated/Java/Sql/ParameterMetaData.cs
index 8a0b0a8bd..53f880eb1 100644
--- a/src/net/Netdroid/Generated/Java/Sql/ParameterMetaData.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/ParameterMetaData.cs
@@ -56,43 +56,43 @@ public partial class ParameterMetaData : Java.Sql.IParameterMetaData
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#parameterModeIn"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#parameterModeIn"/>
         /// </summary>
         public static int parameterModeIn { get { if (!_parameterModeInReady) { _parameterModeInContent = SGetField<int>(LocalBridgeClazz, "parameterModeIn"); _parameterModeInReady = true; } return _parameterModeInContent; } }
         private static int _parameterModeInContent = default;
         private static bool _parameterModeInReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#parameterModeInOut"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#parameterModeInOut"/>
         /// </summary>
         public static int parameterModeInOut { get { if (!_parameterModeInOutReady) { _parameterModeInOutContent = SGetField<int>(LocalBridgeClazz, "parameterModeInOut"); _parameterModeInOutReady = true; } return _parameterModeInOutContent; } }
         private static int _parameterModeInOutContent = default;
         private static bool _parameterModeInOutReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#parameterModeOut"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#parameterModeOut"/>
         /// </summary>
         public static int parameterModeOut { get { if (!_parameterModeOutReady) { _parameterModeOutContent = SGetField<int>(LocalBridgeClazz, "parameterModeOut"); _parameterModeOutReady = true; } return _parameterModeOutContent; } }
         private static int _parameterModeOutContent = default;
         private static bool _parameterModeOutReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#parameterModeUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#parameterModeUnknown"/>
         /// </summary>
         public static int parameterModeUnknown { get { if (!_parameterModeUnknownReady) { _parameterModeUnknownContent = SGetField<int>(LocalBridgeClazz, "parameterModeUnknown"); _parameterModeUnknownReady = true; } return _parameterModeUnknownContent; } }
         private static int _parameterModeUnknownContent = default;
         private static bool _parameterModeUnknownReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#parameterNoNulls"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#parameterNoNulls"/>
         /// </summary>
         public static int parameterNoNulls { get { if (!_parameterNoNullsReady) { _parameterNoNullsContent = SGetField<int>(LocalBridgeClazz, "parameterNoNulls"); _parameterNoNullsReady = true; } return _parameterNoNullsContent; } }
         private static int _parameterNoNullsContent = default;
         private static bool _parameterNoNullsReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#parameterNullable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#parameterNullable"/>
         /// </summary>
         public static int parameterNullable { get { if (!_parameterNullableReady) { _parameterNullableContent = SGetField<int>(LocalBridgeClazz, "parameterNullable"); _parameterNullableReady = true; } return _parameterNullableContent; } }
         private static int _parameterNullableContent = default;
         private static bool _parameterNullableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#parameterNullableUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#parameterNullableUnknown"/>
         /// </summary>
         public static int parameterNullableUnknown { get { if (!_parameterNullableUnknownReady) { _parameterNullableUnknownContent = SGetField<int>(LocalBridgeClazz, "parameterNullableUnknown"); _parameterNullableUnknownReady = true; } return _parameterNullableUnknownContent; } }
         private static int _parameterNullableUnknownContent = default;
@@ -106,14 +106,7 @@ public partial class ParameterMetaData : Java.Sql.IParameterMetaData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#getParameterCount()"/> 
-        /// </summary>
-        public int ParameterCount
-        {
-            get { return IExecuteWithSignature<int>("getParameterCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#isSigned(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#isSigned(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -123,7 +116,16 @@ public bool IsSigned(int arg0)
             return IExecuteWithSignature<bool>("isSigned", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#getParameterMode(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#getParameterCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetParameterCount()
+        {
+            return IExecuteWithSignature<int>("getParameterCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#getParameterMode(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -133,7 +135,7 @@ public int GetParameterMode(int arg0)
             return IExecuteWithSignature<int>("getParameterMode", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#getParameterType(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#getParameterType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -143,7 +145,7 @@ public int GetParameterType(int arg0)
             return IExecuteWithSignature<int>("getParameterType", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#getPrecision(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#getPrecision(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -153,7 +155,7 @@ public int GetPrecision(int arg0)
             return IExecuteWithSignature<int>("getPrecision", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#getScale(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#getScale(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -163,7 +165,7 @@ public int GetScale(int arg0)
             return IExecuteWithSignature<int>("getScale", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#isNullable(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#isNullable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -173,7 +175,7 @@ public int IsNullable(int arg0)
             return IExecuteWithSignature<int>("isNullable", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#getParameterClassName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#getParameterClassName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -183,7 +185,7 @@ public Java.Lang.String GetParameterClassName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getParameterClassName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ParameterMetaData.html#getParameterTypeName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ParameterMetaData.html#getParameterTypeName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Sql/PreparedStatement.cs b/src/net/Netdroid/Generated/Java/Sql/PreparedStatement.cs
index 1ce9fb3e1..0c8685788 100644
--- a/src/net/Netdroid/Generated/Java/Sql/PreparedStatement.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/PreparedStatement.cs
@@ -64,21 +64,7 @@ public partial class PreparedStatement : Java.Sql.IPreparedStatement
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#getMetaData()"/> 
-        /// </summary>
-        public Java.Sql.ResultSetMetaData MetaData
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSetMetaData>("getMetaData", "()Ljava/sql/ResultSetMetaData;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#getParameterMetaData()"/> 
-        /// </summary>
-        public Java.Sql.ParameterMetaData ParameterMetaData
-        {
-            get { return IExecuteWithSignature<Java.Sql.ParameterMetaData>("getParameterMetaData", "()Ljava/sql/ParameterMetaData;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#execute()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#execute()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -87,7 +73,7 @@ public bool Execute()
             return IExecuteWithSignature<bool>("execute", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#executeUpdate()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#executeUpdate()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -96,7 +82,16 @@ public int ExecuteUpdate()
             return IExecuteWithSignature<int>("executeUpdate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#executeQuery()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#getParameterMetaData()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ParameterMetaData"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ParameterMetaData GetParameterMetaData()
+        {
+            return IExecuteWithSignature<Java.Sql.ParameterMetaData>("getParameterMetaData", "()Ljava/sql/ParameterMetaData;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#executeQuery()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.ResultSet"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -105,7 +100,16 @@ public Java.Sql.ResultSet ExecuteQuery()
             return IExecuteWithSignature<Java.Sql.ResultSet>("executeQuery", "()Ljava/sql/ResultSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#addBatch()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#getMetaData()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSetMetaData"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSetMetaData GetMetaData()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSetMetaData>("getMetaData", "()Ljava/sql/ResultSetMetaData;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#addBatch()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void AddBatch()
@@ -113,7 +117,7 @@ public void AddBatch()
             IExecuteWithSignature("addBatch", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#clearParameters()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#clearParameters()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void ClearParameters()
@@ -121,7 +125,7 @@ public void ClearParameters()
             IExecuteWithSignature("clearParameters", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setArray(int,java.sql.Array)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setArray(int,java.sql.Array)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Array"/></param>
@@ -131,7 +135,7 @@ public void SetArray(int arg0, Java.Sql.Array arg1)
             IExecute("setArray", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setAsciiStream(int,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setAsciiStream(int,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -142,7 +146,7 @@ public void SetAsciiStream(int arg0, Java.Io.InputStream arg1, int arg2)
             IExecute("setAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setAsciiStream(int,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setAsciiStream(int,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -153,7 +157,7 @@ public void SetAsciiStream(int arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("setAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setAsciiStream(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setAsciiStream(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -163,7 +167,7 @@ public void SetAsciiStream(int arg0, Java.Io.InputStream arg1)
             IExecute("setAsciiStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBigDecimal(int,java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBigDecimal(int,java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigDecimal"/></param>
@@ -173,7 +177,7 @@ public void SetBigDecimal(int arg0, Java.Math.BigDecimal arg1)
             IExecute("setBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBinaryStream(int,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBinaryStream(int,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -184,7 +188,7 @@ public void SetBinaryStream(int arg0, Java.Io.InputStream arg1, int arg2)
             IExecute("setBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBinaryStream(int,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBinaryStream(int,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -195,7 +199,7 @@ public void SetBinaryStream(int arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("setBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBinaryStream(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBinaryStream(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -205,7 +209,7 @@ public void SetBinaryStream(int arg0, Java.Io.InputStream arg1)
             IExecute("setBinaryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBlob(int,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBlob(int,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -216,7 +220,7 @@ public void SetBlob(int arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("setBlob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBlob(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBlob(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -226,7 +230,7 @@ public void SetBlob(int arg0, Java.Io.InputStream arg1)
             IExecute("setBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBlob(int,java.sql.Blob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBlob(int,java.sql.Blob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Blob"/></param>
@@ -236,7 +240,7 @@ public void SetBlob(int arg0, Java.Sql.Blob arg1)
             IExecute("setBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBoolean(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBoolean(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -246,7 +250,7 @@ public void SetBoolean(int arg0, bool arg1)
             IExecute("setBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setByte(int,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setByte(int,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -256,7 +260,7 @@ public void SetByte(int arg0, byte arg1)
             IExecute("setByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setBytes(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setBytes(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -266,7 +270,7 @@ public void SetBytes(int arg0, byte[] arg1)
             IExecute("setBytes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setCharacterStream(int,java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setCharacterStream(int,java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -277,7 +281,7 @@ public void SetCharacterStream(int arg0, Java.Io.Reader arg1, int arg2)
             IExecute("setCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setCharacterStream(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setCharacterStream(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -288,7 +292,7 @@ public void SetCharacterStream(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setCharacterStream(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setCharacterStream(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -298,7 +302,7 @@ public void SetCharacterStream(int arg0, Java.Io.Reader arg1)
             IExecute("setCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setClob(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setClob(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -309,7 +313,7 @@ public void SetClob(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setClob(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setClob(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -319,7 +323,7 @@ public void SetClob(int arg0, Java.Io.Reader arg1)
             IExecute("setClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setClob(int,java.sql.Clob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setClob(int,java.sql.Clob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Clob"/></param>
@@ -329,7 +333,7 @@ public void SetClob(int arg0, Java.Sql.Clob arg1)
             IExecute("setClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setDate(int,java.sql.Date,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setDate(int,java.sql.Date,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -340,7 +344,7 @@ public void SetDate(int arg0, Java.Sql.Date arg1, Java.Util.Calendar arg2)
             IExecute("setDate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setDate(int,java.sql.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setDate(int,java.sql.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -350,7 +354,7 @@ public void SetDate(int arg0, Java.Sql.Date arg1)
             IExecute("setDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setDouble(int,double)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setDouble(int,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -360,7 +364,7 @@ public void SetDouble(int arg0, double arg1)
             IExecute("setDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setFloat(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setFloat(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -370,7 +374,7 @@ public void SetFloat(int arg0, float arg1)
             IExecute("setFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setInt(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setInt(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -380,7 +384,7 @@ public void SetInt(int arg0, int arg1)
             IExecute("setInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setLong(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setLong(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -390,7 +394,7 @@ public void SetLong(int arg0, long arg1)
             IExecute("setLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setNCharacterStream(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setNCharacterStream(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -401,7 +405,7 @@ public void SetNCharacterStream(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setNCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setNCharacterStream(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setNCharacterStream(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -411,7 +415,7 @@ public void SetNCharacterStream(int arg0, Java.Io.Reader arg1)
             IExecute("setNCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setNClob(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setNClob(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -422,7 +426,7 @@ public void SetNClob(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setNClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setNClob(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setNClob(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -432,7 +436,7 @@ public void SetNClob(int arg0, Java.Io.Reader arg1)
             IExecute("setNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setNClob(int,java.sql.NClob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setNClob(int,java.sql.NClob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.NClob"/></param>
@@ -442,7 +446,7 @@ public void SetNClob(int arg0, Java.Sql.NClob arg1)
             IExecute("setNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setNString(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setNString(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -452,7 +456,7 @@ public void SetNString(int arg0, Java.Lang.String arg1)
             IExecute("setNString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setNull(int,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setNull(int,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -463,7 +467,7 @@ public void SetNull(int arg0, int arg1, Java.Lang.String arg2)
             IExecute("setNull", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setNull(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setNull(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -473,7 +477,7 @@ public void SetNull(int arg0, int arg1)
             IExecute("setNull", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setObject(int,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setObject(int,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -485,7 +489,7 @@ public void SetObject(int arg0, object arg1, int arg2, int arg3)
             IExecute("setObject", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setObject(int,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setObject(int,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -496,7 +500,7 @@ public void SetObject(int arg0, object arg1, int arg2)
             IExecute("setObject", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setObject(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setObject(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -506,7 +510,7 @@ public void SetObject(int arg0, object arg1)
             IExecute("setObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setRef(int,java.sql.Ref)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setRef(int,java.sql.Ref)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Ref"/></param>
@@ -516,7 +520,7 @@ public void SetRef(int arg0, Java.Sql.Ref arg1)
             IExecute("setRef", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setRowId(int,java.sql.RowId)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setRowId(int,java.sql.RowId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.RowId"/></param>
@@ -526,7 +530,7 @@ public void SetRowId(int arg0, Java.Sql.RowId arg1)
             IExecute("setRowId", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setShort(int,short)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setShort(int,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -536,7 +540,7 @@ public void SetShort(int arg0, short arg1)
             IExecute("setShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setSQLXML(int,java.sql.SQLXML)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setSQLXML(int,java.sql.SQLXML)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.SQLXML"/></param>
@@ -546,7 +550,7 @@ public void SetSQLXML(int arg0, Java.Sql.SQLXML arg1)
             IExecute("setSQLXML", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setString(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setString(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -556,7 +560,7 @@ public void SetString(int arg0, Java.Lang.String arg1)
             IExecute("setString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setTime(int,java.sql.Time,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setTime(int,java.sql.Time,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -567,7 +571,7 @@ public void SetTime(int arg0, Java.Sql.Time arg1, Java.Util.Calendar arg2)
             IExecute("setTime", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setTime(int,java.sql.Time)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setTime(int,java.sql.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -577,7 +581,7 @@ public void SetTime(int arg0, Java.Sql.Time arg1)
             IExecute("setTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setTimestamp(int,java.sql.Timestamp,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setTimestamp(int,java.sql.Timestamp,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -588,7 +592,7 @@ public void SetTimestamp(int arg0, Java.Sql.Timestamp arg1, Java.Util.Calendar a
             IExecute("setTimestamp", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setTimestamp(int,java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setTimestamp(int,java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -598,19 +602,19 @@ public void SetTimestamp(int arg0, Java.Sql.Timestamp arg1)
             IExecute("setTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setUnicodeStream(int,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setUnicodeStream(int,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetUnicodeStream(int arg0, Java.Io.InputStream arg1, int arg2)
         {
             IExecute("setUnicodeStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#setURL(int,java.net.URL)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#setURL(int,java.net.URL)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Net.URL"/></param>
@@ -620,7 +624,7 @@ public void SetURL(int arg0, Java.Net.URL arg1)
             IExecute("setURL", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/PreparedStatement.html#executeLargeUpdate()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/PreparedStatement.html#executeLargeUpdate()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
diff --git a/src/net/Netdroid/Generated/Java/Sql/Ref.cs b/src/net/Netdroid/Generated/Java/Sql/Ref.cs
index 38cdf1be3..ff4a06b19 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Ref.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Ref.cs
@@ -64,21 +64,16 @@ public partial class Ref : Java.Sql.IRef
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Ref.html#getBaseTypeName()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/Ref.html#getObject()"/>
         /// </summary>
-        public Java.Lang.String BaseTypeName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBaseTypeName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Ref.html#getObject()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Ref.html#setObject(java.lang.Object)"/>
-        /// </summary>
-        public object Object
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public object GetObject()
         {
-            get { return IExecuteWithSignature("getObject", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setObject", "(Ljava/lang/Object;)V", value); }
+            return IExecuteWithSignature("getObject", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Ref.html#getObject(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Ref.html#getObject(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <returns><see cref="object"/></returns>
@@ -87,6 +82,24 @@ public object GetObject(Java.Util.Map<Java.Lang.String, Java.Lang.Class> arg0)
         {
             return IExecuteWithSignature("getObject", "(Ljava/util/Map;)Ljava/lang/Object;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Ref.html#getBaseTypeName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetBaseTypeName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getBaseTypeName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Ref.html#setObject(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetObject(object arg0)
+        {
+            IExecuteWithSignature("setObject", "(Ljava/lang/Object;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/ResultSet.cs b/src/net/Netdroid/Generated/Java/Sql/ResultSet.cs
index efac24328..0ef6719a3 100644
--- a/src/net/Netdroid/Generated/Java/Sql/ResultSet.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/ResultSet.cs
@@ -64,61 +64,61 @@ public partial class ResultSet : Java.Sql.IResultSet, Java.Sql.IWrapper, Java.La
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#CLOSE_CURSORS_AT_COMMIT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#CLOSE_CURSORS_AT_COMMIT"/>
         /// </summary>
         public static int CLOSE_CURSORS_AT_COMMIT { get { if (!_CLOSE_CURSORS_AT_COMMITReady) { _CLOSE_CURSORS_AT_COMMITContent = SGetField<int>(LocalBridgeClazz, "CLOSE_CURSORS_AT_COMMIT"); _CLOSE_CURSORS_AT_COMMITReady = true; } return _CLOSE_CURSORS_AT_COMMITContent; } }
         private static int _CLOSE_CURSORS_AT_COMMITContent = default;
         private static bool _CLOSE_CURSORS_AT_COMMITReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#CONCUR_READ_ONLY"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#CONCUR_READ_ONLY"/>
         /// </summary>
         public static int CONCUR_READ_ONLY { get { if (!_CONCUR_READ_ONLYReady) { _CONCUR_READ_ONLYContent = SGetField<int>(LocalBridgeClazz, "CONCUR_READ_ONLY"); _CONCUR_READ_ONLYReady = true; } return _CONCUR_READ_ONLYContent; } }
         private static int _CONCUR_READ_ONLYContent = default;
         private static bool _CONCUR_READ_ONLYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#CONCUR_UPDATABLE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#CONCUR_UPDATABLE"/>
         /// </summary>
         public static int CONCUR_UPDATABLE { get { if (!_CONCUR_UPDATABLEReady) { _CONCUR_UPDATABLEContent = SGetField<int>(LocalBridgeClazz, "CONCUR_UPDATABLE"); _CONCUR_UPDATABLEReady = true; } return _CONCUR_UPDATABLEContent; } }
         private static int _CONCUR_UPDATABLEContent = default;
         private static bool _CONCUR_UPDATABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#FETCH_FORWARD"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#FETCH_FORWARD"/>
         /// </summary>
         public static int FETCH_FORWARD { get { if (!_FETCH_FORWARDReady) { _FETCH_FORWARDContent = SGetField<int>(LocalBridgeClazz, "FETCH_FORWARD"); _FETCH_FORWARDReady = true; } return _FETCH_FORWARDContent; } }
         private static int _FETCH_FORWARDContent = default;
         private static bool _FETCH_FORWARDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#FETCH_REVERSE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#FETCH_REVERSE"/>
         /// </summary>
         public static int FETCH_REVERSE { get { if (!_FETCH_REVERSEReady) { _FETCH_REVERSEContent = SGetField<int>(LocalBridgeClazz, "FETCH_REVERSE"); _FETCH_REVERSEReady = true; } return _FETCH_REVERSEContent; } }
         private static int _FETCH_REVERSEContent = default;
         private static bool _FETCH_REVERSEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#FETCH_UNKNOWN"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#FETCH_UNKNOWN"/>
         /// </summary>
         public static int FETCH_UNKNOWN { get { if (!_FETCH_UNKNOWNReady) { _FETCH_UNKNOWNContent = SGetField<int>(LocalBridgeClazz, "FETCH_UNKNOWN"); _FETCH_UNKNOWNReady = true; } return _FETCH_UNKNOWNContent; } }
         private static int _FETCH_UNKNOWNContent = default;
         private static bool _FETCH_UNKNOWNReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#HOLD_CURSORS_OVER_COMMIT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#HOLD_CURSORS_OVER_COMMIT"/>
         /// </summary>
         public static int HOLD_CURSORS_OVER_COMMIT { get { if (!_HOLD_CURSORS_OVER_COMMITReady) { _HOLD_CURSORS_OVER_COMMITContent = SGetField<int>(LocalBridgeClazz, "HOLD_CURSORS_OVER_COMMIT"); _HOLD_CURSORS_OVER_COMMITReady = true; } return _HOLD_CURSORS_OVER_COMMITContent; } }
         private static int _HOLD_CURSORS_OVER_COMMITContent = default;
         private static bool _HOLD_CURSORS_OVER_COMMITReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#TYPE_FORWARD_ONLY"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#TYPE_FORWARD_ONLY"/>
         /// </summary>
         public static int TYPE_FORWARD_ONLY { get { if (!_TYPE_FORWARD_ONLYReady) { _TYPE_FORWARD_ONLYContent = SGetField<int>(LocalBridgeClazz, "TYPE_FORWARD_ONLY"); _TYPE_FORWARD_ONLYReady = true; } return _TYPE_FORWARD_ONLYContent; } }
         private static int _TYPE_FORWARD_ONLYContent = default;
         private static bool _TYPE_FORWARD_ONLYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#TYPE_SCROLL_INSENSITIVE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#TYPE_SCROLL_INSENSITIVE"/>
         /// </summary>
         public static int TYPE_SCROLL_INSENSITIVE { get { if (!_TYPE_SCROLL_INSENSITIVEReady) { _TYPE_SCROLL_INSENSITIVEContent = SGetField<int>(LocalBridgeClazz, "TYPE_SCROLL_INSENSITIVE"); _TYPE_SCROLL_INSENSITIVEReady = true; } return _TYPE_SCROLL_INSENSITIVEContent; } }
         private static int _TYPE_SCROLL_INSENSITIVEContent = default;
         private static bool _TYPE_SCROLL_INSENSITIVEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#TYPE_SCROLL_SENSITIVE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#TYPE_SCROLL_SENSITIVE"/>
         /// </summary>
         public static int TYPE_SCROLL_SENSITIVE { get { if (!_TYPE_SCROLL_SENSITIVEReady) { _TYPE_SCROLL_SENSITIVEContent = SGetField<int>(LocalBridgeClazz, "TYPE_SCROLL_SENSITIVE"); _TYPE_SCROLL_SENSITIVEReady = true; } return _TYPE_SCROLL_SENSITIVEContent; } }
         private static int _TYPE_SCROLL_SENSITIVEContent = default;
@@ -132,77 +132,7 @@ public partial class ResultSet : Java.Sql.IResultSet, Java.Sql.IWrapper, Java.La
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getConcurrency()"/> 
-        /// </summary>
-        public int Concurrency
-        {
-            get { return IExecuteWithSignature<int>("getConcurrency", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getCursorName()"/> 
-        /// </summary>
-        public Java.Lang.String CursorName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCursorName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getFetchDirection()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#setFetchDirection(int)"/>
-        /// </summary>
-        public int FetchDirection
-        {
-            get { return IExecuteWithSignature<int>("getFetchDirection", "()I"); } set { IExecuteWithSignature("setFetchDirection", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getFetchSize()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#setFetchSize(int)"/>
-        /// </summary>
-        public int FetchSize
-        {
-            get { return IExecuteWithSignature<int>("getFetchSize", "()I"); } set { IExecuteWithSignature("setFetchSize", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getHoldability()"/> 
-        /// </summary>
-        public int Holdability
-        {
-            get { return IExecuteWithSignature<int>("getHoldability", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getMetaData()"/> 
-        /// </summary>
-        public Java.Sql.ResultSetMetaData MetaData
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSetMetaData>("getMetaData", "()Ljava/sql/ResultSetMetaData;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getRow()"/> 
-        /// </summary>
-        public int Row
-        {
-            get { return IExecuteWithSignature<int>("getRow", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getStatement()"/> 
-        /// </summary>
-        public Java.Sql.Statement Statement
-        {
-            get { return IExecuteWithSignature<Java.Sql.Statement>("getStatement", "()Ljava/sql/Statement;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getWarnings()"/> 
-        /// </summary>
-        public Java.Sql.SQLWarning Warnings
-        {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getWarnings", "()Ljava/sql/SQLWarning;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLWarning>(obj); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getObject(int,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getObject(int,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -214,7 +144,7 @@ public T GetObject<T>(int arg0, Java.Lang.Class arg1)
             return IExecute<T>("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getObject(java.lang.String,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getObject(java.lang.String,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -226,7 +156,7 @@ public T GetObject<T>(Java.Lang.String arg0, Java.Lang.Class arg1)
             return IExecute<T>("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#absolute(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#absolute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -236,7 +166,7 @@ public bool Absolute(int arg0)
             return IExecuteWithSignature<bool>("absolute", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#first()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -245,7 +175,7 @@ public bool First()
             return IExecuteWithSignature<bool>("first", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBoolean(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBoolean(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -255,7 +185,7 @@ public bool GetBoolean(int arg0)
             return IExecuteWithSignature<bool>("getBoolean", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBoolean(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBoolean(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -265,7 +195,7 @@ public bool GetBoolean(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getBoolean", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#isAfterLast()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#isAfterLast()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -274,7 +204,7 @@ public bool IsAfterLast()
             return IExecuteWithSignature<bool>("isAfterLast", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#isBeforeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#isBeforeFirst()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -283,7 +213,7 @@ public bool IsBeforeFirst()
             return IExecuteWithSignature<bool>("isBeforeFirst", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#isClosed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -292,7 +222,7 @@ public bool IsClosed()
             return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#isFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#isFirst()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -301,7 +231,7 @@ public bool IsFirst()
             return IExecuteWithSignature<bool>("isFirst", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#isLast()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#isLast()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -310,7 +240,7 @@ public bool IsLast()
             return IExecuteWithSignature<bool>("isLast", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#last()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -319,7 +249,7 @@ public bool Last()
             return IExecuteWithSignature<bool>("last", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#next()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#next()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -328,7 +258,7 @@ public bool Next()
             return IExecuteWithSignature<bool>("next", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#previous()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#previous()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -337,7 +267,7 @@ public bool Previous()
             return IExecuteWithSignature<bool>("previous", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#relative(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#relative(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -347,7 +277,7 @@ public bool Relative(int arg0)
             return IExecuteWithSignature<bool>("relative", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#rowDeleted()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#rowDeleted()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -356,7 +286,7 @@ public bool RowDeleted()
             return IExecuteWithSignature<bool>("rowDeleted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#rowInserted()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#rowInserted()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -365,7 +295,7 @@ public bool RowInserted()
             return IExecuteWithSignature<bool>("rowInserted", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#rowUpdated()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#rowUpdated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -374,7 +304,7 @@ public bool RowUpdated()
             return IExecuteWithSignature<bool>("rowUpdated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#wasNull()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#wasNull()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -383,7 +313,7 @@ public bool WasNull()
             return IExecuteWithSignature<bool>("wasNull", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getByte(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getByte(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -393,7 +323,7 @@ public byte GetByte(int arg0)
             return IExecuteWithSignature<byte>("getByte", "(I)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getByte(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getByte(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -403,7 +333,7 @@ public byte GetByte(Java.Lang.String arg0)
             return IExecuteWithSignature<byte>("getByte", "(Ljava/lang/String;)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBytes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBytes(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -413,7 +343,7 @@ public byte[] GetBytes(int arg0)
             return IExecuteWithSignatureArray<byte>("getBytes", "(I)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBytes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBytes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -423,7 +353,7 @@ public byte[] GetBytes(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<byte>("getBytes", "(Ljava/lang/String;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getDouble(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getDouble(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="double"/></returns>
@@ -433,7 +363,7 @@ public double GetDouble(int arg0)
             return IExecuteWithSignature<double>("getDouble", "(I)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getDouble(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getDouble(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="double"/></returns>
@@ -443,7 +373,7 @@ public double GetDouble(Java.Lang.String arg0)
             return IExecuteWithSignature<double>("getDouble", "(Ljava/lang/String;)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getFloat(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getFloat(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="float"/></returns>
@@ -453,7 +383,7 @@ public float GetFloat(int arg0)
             return IExecuteWithSignature<float>("getFloat", "(I)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getFloat(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getFloat(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="float"/></returns>
@@ -463,7 +393,7 @@ public float GetFloat(Java.Lang.String arg0)
             return IExecuteWithSignature<float>("getFloat", "(Ljava/lang/String;)F", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#findColumn(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#findColumn(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -473,7 +403,43 @@ public int FindColumn(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("findColumn", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getConcurrency()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetConcurrency()
+        {
+            return IExecuteWithSignature<int>("getConcurrency", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getFetchDirection()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetFetchDirection()
+        {
+            return IExecuteWithSignature<int>("getFetchDirection", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getFetchSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetFetchSize()
+        {
+            return IExecuteWithSignature<int>("getFetchSize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getHoldability()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetHoldability()
+        {
+            return IExecuteWithSignature<int>("getHoldability", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -483,7 +449,7 @@ public int GetInt(int arg0)
             return IExecuteWithSignature<int>("getInt", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getInt(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getInt(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -493,7 +459,25 @@ public int GetInt(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getInt", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getAsciiStream(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getRow()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetRow()
+        {
+            return IExecuteWithSignature<int>("getRow", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getAsciiStream(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -503,7 +487,7 @@ public Java.Io.InputStream GetAsciiStream(int arg0)
             return IExecuteWithSignature<Java.Io.InputStream>("getAsciiStream", "(I)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getAsciiStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getAsciiStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -513,7 +497,7 @@ public Java.Io.InputStream GetAsciiStream(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.InputStream>("getAsciiStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBinaryStream(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBinaryStream(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -523,7 +507,7 @@ public Java.Io.InputStream GetBinaryStream(int arg0)
             return IExecuteWithSignature<Java.Io.InputStream>("getBinaryStream", "(I)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBinaryStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBinaryStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -533,29 +517,29 @@ public Java.Io.InputStream GetBinaryStream(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.InputStream>("getBinaryStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getUnicodeStream(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getUnicodeStream(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Io.InputStream GetUnicodeStream(int arg0)
         {
             return IExecuteWithSignature<Java.Io.InputStream>("getUnicodeStream", "(I)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getUnicodeStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getUnicodeStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Io.InputStream GetUnicodeStream(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Io.InputStream>("getUnicodeStream", "(Ljava/lang/String;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getCharacterStream(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getCharacterStream(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.Reader"/></returns>
@@ -565,7 +549,7 @@ public Java.Io.Reader GetCharacterStream(int arg0)
             return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "(I)Ljava/io/Reader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getCharacterStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getCharacterStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.Reader"/></returns>
@@ -575,7 +559,7 @@ public Java.Io.Reader GetCharacterStream(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "(Ljava/lang/String;)Ljava/io/Reader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getNCharacterStream(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getNCharacterStream(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Io.Reader"/></returns>
@@ -585,7 +569,7 @@ public Java.Io.Reader GetNCharacterStream(int arg0)
             return IExecuteWithSignature<Java.Io.Reader>("getNCharacterStream", "(I)Ljava/io/Reader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getNCharacterStream(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getNCharacterStream(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Io.Reader"/></returns>
@@ -595,7 +579,7 @@ public Java.Io.Reader GetNCharacterStream(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Io.Reader>("getNCharacterStream", "(Ljava/lang/String;)Ljava/io/Reader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getObject(int,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getObject(int,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -606,7 +590,7 @@ public object GetObject(int arg0, Java.Util.Map<Java.Lang.String, Java.Lang.Clas
             return IExecute("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getObject(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getObject(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -616,7 +600,7 @@ public object GetObject(int arg0)
             return IExecuteWithSignature("getObject", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getObject(java.lang.String,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getObject(java.lang.String,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -627,7 +611,7 @@ public object GetObject(Java.Lang.String arg0, Java.Util.Map<Java.Lang.String, J
             return IExecute("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getObject(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getObject(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -637,7 +621,16 @@ public object GetObject(Java.Lang.String arg0)
             return IExecuteWithSignature("getObject", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getNString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getCursorName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetCursorName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCursorName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getNString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -647,7 +640,7 @@ public Java.Lang.String GetNString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getNString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getNString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getNString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -657,7 +650,7 @@ public Java.Lang.String GetNString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getNString", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getString(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getString(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -667,7 +660,7 @@ public Java.Lang.String GetString(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -677,19 +670,19 @@ public Java.Lang.String GetString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBigDecimal(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBigDecimal(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Math.BigDecimal GetBigDecimal(int arg0, int arg1)
         {
             return IExecute<Java.Math.BigDecimal>("getBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBigDecimal(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBigDecimal(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -699,19 +692,19 @@ public Java.Math.BigDecimal GetBigDecimal(int arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("getBigDecimal", "(I)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBigDecimal(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBigDecimal(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Math.BigDecimal GetBigDecimal(Java.Lang.String arg0, int arg1)
         {
             return IExecute<Java.Math.BigDecimal>("getBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBigDecimal(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBigDecimal(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
@@ -721,7 +714,7 @@ public Java.Math.BigDecimal GetBigDecimal(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Math.BigDecimal>("getBigDecimal", "(Ljava/lang/String;)Ljava/math/BigDecimal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getURL(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getURL(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Net.URL"/></returns>
@@ -731,7 +724,7 @@ public Java.Net.URL GetURL(int arg0)
             return IExecuteWithSignature<Java.Net.URL>("getURL", "(I)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getURL(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getURL(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.URL"/></returns>
@@ -741,7 +734,7 @@ public Java.Net.URL GetURL(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Net.URL>("getURL", "(Ljava/lang/String;)Ljava/net/URL;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getArray(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getArray(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Array"/></returns>
@@ -751,7 +744,7 @@ public Java.Sql.Array GetArray(int arg0)
             return IExecuteWithSignature<Java.Sql.Array>("getArray", "(I)Ljava/sql/Array;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getArray(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getArray(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Array"/></returns>
@@ -761,7 +754,7 @@ public Java.Sql.Array GetArray(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Array>("getArray", "(Ljava/lang/String;)Ljava/sql/Array;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBlob(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBlob(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Blob"/></returns>
@@ -771,7 +764,7 @@ public Java.Sql.Blob GetBlob(int arg0)
             return IExecuteWithSignature<Java.Sql.Blob>("getBlob", "(I)Ljava/sql/Blob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getBlob(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getBlob(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Blob"/></returns>
@@ -781,7 +774,7 @@ public Java.Sql.Blob GetBlob(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Blob>("getBlob", "(Ljava/lang/String;)Ljava/sql/Blob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getClob(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getClob(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Clob"/></returns>
@@ -791,7 +784,7 @@ public Java.Sql.Clob GetClob(int arg0)
             return IExecuteWithSignature<Java.Sql.Clob>("getClob", "(I)Ljava/sql/Clob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getClob(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getClob(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Clob"/></returns>
@@ -801,7 +794,7 @@ public Java.Sql.Clob GetClob(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Clob>("getClob", "(Ljava/lang/String;)Ljava/sql/Clob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getDate(int,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getDate(int,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -812,7 +805,7 @@ public Java.Sql.Date GetDate(int arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Date>("getDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getDate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getDate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Date"/></returns>
@@ -822,7 +815,7 @@ public Java.Sql.Date GetDate(int arg0)
             return IExecuteWithSignature<Java.Sql.Date>("getDate", "(I)Ljava/sql/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getDate(java.lang.String,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getDate(java.lang.String,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -833,7 +826,7 @@ public Java.Sql.Date GetDate(Java.Lang.String arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Date>("getDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getDate(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getDate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Date"/></returns>
@@ -843,7 +836,7 @@ public Java.Sql.Date GetDate(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Date>("getDate", "(Ljava/lang/String;)Ljava/sql/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getNClob(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getNClob(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.NClob"/></returns>
@@ -853,7 +846,7 @@ public Java.Sql.NClob GetNClob(int arg0)
             return IExecuteWithSignature<Java.Sql.NClob>("getNClob", "(I)Ljava/sql/NClob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getNClob(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getNClob(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.NClob"/></returns>
@@ -863,7 +856,7 @@ public Java.Sql.NClob GetNClob(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.NClob>("getNClob", "(Ljava/lang/String;)Ljava/sql/NClob;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getRef(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getRef(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Ref"/></returns>
@@ -873,7 +866,7 @@ public Java.Sql.Ref GetRef(int arg0)
             return IExecuteWithSignature<Java.Sql.Ref>("getRef", "(I)Ljava/sql/Ref;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getRef(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getRef(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Ref"/></returns>
@@ -883,7 +876,16 @@ public Java.Sql.Ref GetRef(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Ref>("getRef", "(Ljava/lang/String;)Ljava/sql/Ref;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getRowId(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getMetaData()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSetMetaData"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSetMetaData GetMetaData()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSetMetaData>("getMetaData", "()Ljava/sql/ResultSetMetaData;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getRowId(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.RowId"/></returns>
@@ -893,7 +895,7 @@ public Java.Sql.RowId GetRowId(int arg0)
             return IExecuteWithSignature<Java.Sql.RowId>("getRowId", "(I)Ljava/sql/RowId;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getRowId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getRowId(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.RowId"/></returns>
@@ -903,7 +905,16 @@ public Java.Sql.RowId GetRowId(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.RowId>("getRowId", "(Ljava/lang/String;)Ljava/sql/RowId;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getSQLXML(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getWarnings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.SQLWarning"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.SQLWarning GetWarnings()
+        {
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getWarnings", "()Ljava/sql/SQLWarning;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLWarning>(obj);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getSQLXML(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.SQLXML"/></returns>
@@ -913,7 +924,7 @@ public Java.Sql.SQLXML GetSQLXML(int arg0)
             return IExecuteWithSignature<Java.Sql.SQLXML>("getSQLXML", "(I)Ljava/sql/SQLXML;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getSQLXML(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getSQLXML(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.SQLXML"/></returns>
@@ -923,7 +934,16 @@ public Java.Sql.SQLXML GetSQLXML(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.SQLXML>("getSQLXML", "(Ljava/lang/String;)Ljava/sql/SQLXML;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getTime(int,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getStatement()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.Statement"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.Statement GetStatement()
+        {
+            return IExecuteWithSignature<Java.Sql.Statement>("getStatement", "()Ljava/sql/Statement;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getTime(int,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -934,7 +954,7 @@ public Java.Sql.Time GetTime(int arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Time>("getTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getTime(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getTime(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Time"/></returns>
@@ -944,7 +964,7 @@ public Java.Sql.Time GetTime(int arg0)
             return IExecuteWithSignature<Java.Sql.Time>("getTime", "(I)Ljava/sql/Time;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getTime(java.lang.String,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getTime(java.lang.String,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -955,7 +975,7 @@ public Java.Sql.Time GetTime(Java.Lang.String arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Time>("getTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getTime(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getTime(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Time"/></returns>
@@ -965,7 +985,7 @@ public Java.Sql.Time GetTime(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Time>("getTime", "(Ljava/lang/String;)Ljava/sql/Time;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getTimestamp(int,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getTimestamp(int,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -976,7 +996,7 @@ public Java.Sql.Timestamp GetTimestamp(int arg0, Java.Util.Calendar arg1)
             return IExecute<Java.Sql.Timestamp>("getTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getTimestamp(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getTimestamp(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Sql.Timestamp"/></returns>
@@ -986,7 +1006,7 @@ public Java.Sql.Timestamp GetTimestamp(int arg0)
             return IExecuteWithSignature<Java.Sql.Timestamp>("getTimestamp", "(I)Ljava/sql/Timestamp;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getTimestamp(java.lang.String,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getTimestamp(java.lang.String,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Calendar"/></param>
@@ -997,7 +1017,7 @@ public Java.Sql.Timestamp GetTimestamp(Java.Lang.String arg0, Java.Util.Calendar
             return IExecute<Java.Sql.Timestamp>("getTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getTimestamp(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getTimestamp(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Timestamp"/></returns>
@@ -1007,7 +1027,7 @@ public Java.Sql.Timestamp GetTimestamp(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.Timestamp>("getTimestamp", "(Ljava/lang/String;)Ljava/sql/Timestamp;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getLong(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -1017,7 +1037,7 @@ public long GetLong(int arg0)
             return IExecuteWithSignature<long>("getLong", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getLong(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getLong(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="long"/></returns>
@@ -1027,7 +1047,7 @@ public long GetLong(Java.Lang.String arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="short"/></returns>
@@ -1037,7 +1057,7 @@ public short GetShort(int arg0)
             return IExecuteWithSignature<short>("getShort", "(I)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#getShort(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#getShort(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="short"/></returns>
@@ -1047,7 +1067,7 @@ public short GetShort(Java.Lang.String arg0)
             return IExecuteWithSignature<short>("getShort", "(Ljava/lang/String;)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#afterLast()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#afterLast()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void AfterLast()
@@ -1055,7 +1075,7 @@ public void AfterLast()
             IExecuteWithSignature("afterLast", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#beforeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#beforeFirst()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void BeforeFirst()
@@ -1063,7 +1083,7 @@ public void BeforeFirst()
             IExecuteWithSignature("beforeFirst", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#cancelRowUpdates()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#cancelRowUpdates()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void CancelRowUpdates()
@@ -1071,7 +1091,7 @@ public void CancelRowUpdates()
             IExecuteWithSignature("cancelRowUpdates", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#clearWarnings()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#clearWarnings()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void ClearWarnings()
@@ -1079,7 +1099,7 @@ public void ClearWarnings()
             IExecuteWithSignature("clearWarnings", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Close()
@@ -1087,7 +1107,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#deleteRow()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#deleteRow()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void DeleteRow()
@@ -1095,7 +1115,7 @@ public void DeleteRow()
             IExecuteWithSignature("deleteRow", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#insertRow()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#insertRow()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void InsertRow()
@@ -1103,7 +1123,7 @@ public void InsertRow()
             IExecuteWithSignature("insertRow", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#moveToCurrentRow()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#moveToCurrentRow()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void MoveToCurrentRow()
@@ -1111,7 +1131,7 @@ public void MoveToCurrentRow()
             IExecuteWithSignature("moveToCurrentRow", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#moveToInsertRow()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#moveToInsertRow()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void MoveToInsertRow()
@@ -1119,7 +1139,7 @@ public void MoveToInsertRow()
             IExecuteWithSignature("moveToInsertRow", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#refreshRow()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#refreshRow()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void RefreshRow()
@@ -1127,7 +1147,25 @@ public void RefreshRow()
             IExecuteWithSignature("refreshRow", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateArray(int,java.sql.Array)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#setFetchDirection(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetFetchDirection(int arg0)
+        {
+            IExecuteWithSignature("setFetchDirection", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#setFetchSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetFetchSize(int arg0)
+        {
+            IExecuteWithSignature("setFetchSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateArray(int,java.sql.Array)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Array"/></param>
@@ -1137,7 +1175,7 @@ public void UpdateArray(int arg0, Java.Sql.Array arg1)
             IExecute("updateArray", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateArray(java.lang.String,java.sql.Array)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateArray(java.lang.String,java.sql.Array)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Array"/></param>
@@ -1147,7 +1185,7 @@ public void UpdateArray(Java.Lang.String arg0, Java.Sql.Array arg1)
             IExecute("updateArray", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateAsciiStream(int,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateAsciiStream(int,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1158,7 +1196,7 @@ public void UpdateAsciiStream(int arg0, Java.Io.InputStream arg1, int arg2)
             IExecute("updateAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateAsciiStream(int,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateAsciiStream(int,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1169,7 +1207,7 @@ public void UpdateAsciiStream(int arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("updateAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateAsciiStream(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateAsciiStream(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1179,7 +1217,7 @@ public void UpdateAsciiStream(int arg0, Java.Io.InputStream arg1)
             IExecute("updateAsciiStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateAsciiStream(java.lang.String,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateAsciiStream(java.lang.String,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1190,7 +1228,7 @@ public void UpdateAsciiStream(Java.Lang.String arg0, Java.Io.InputStream arg1, i
             IExecute("updateAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateAsciiStream(java.lang.String,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateAsciiStream(java.lang.String,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1201,7 +1239,7 @@ public void UpdateAsciiStream(Java.Lang.String arg0, Java.Io.InputStream arg1, l
             IExecute("updateAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateAsciiStream(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateAsciiStream(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1211,7 +1249,7 @@ public void UpdateAsciiStream(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("updateAsciiStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBigDecimal(int,java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBigDecimal(int,java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigDecimal"/></param>
@@ -1221,7 +1259,7 @@ public void UpdateBigDecimal(int arg0, Java.Math.BigDecimal arg1)
             IExecute("updateBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBigDecimal(java.lang.String,java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBigDecimal(java.lang.String,java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigDecimal"/></param>
@@ -1231,7 +1269,7 @@ public void UpdateBigDecimal(Java.Lang.String arg0, Java.Math.BigDecimal arg1)
             IExecute("updateBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBinaryStream(int,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBinaryStream(int,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1242,7 +1280,7 @@ public void UpdateBinaryStream(int arg0, Java.Io.InputStream arg1, int arg2)
             IExecute("updateBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBinaryStream(int,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBinaryStream(int,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1253,7 +1291,7 @@ public void UpdateBinaryStream(int arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("updateBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBinaryStream(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBinaryStream(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1263,7 +1301,7 @@ public void UpdateBinaryStream(int arg0, Java.Io.InputStream arg1)
             IExecute("updateBinaryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBinaryStream(java.lang.String,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBinaryStream(java.lang.String,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1274,7 +1312,7 @@ public void UpdateBinaryStream(Java.Lang.String arg0, Java.Io.InputStream arg1,
             IExecute("updateBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBinaryStream(java.lang.String,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBinaryStream(java.lang.String,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1285,7 +1323,7 @@ public void UpdateBinaryStream(Java.Lang.String arg0, Java.Io.InputStream arg1,
             IExecute("updateBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBinaryStream(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBinaryStream(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1295,7 +1333,7 @@ public void UpdateBinaryStream(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("updateBinaryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBlob(int,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBlob(int,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1306,7 +1344,7 @@ public void UpdateBlob(int arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("updateBlob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBlob(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBlob(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1316,7 +1354,7 @@ public void UpdateBlob(int arg0, Java.Io.InputStream arg1)
             IExecute("updateBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBlob(int,java.sql.Blob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBlob(int,java.sql.Blob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Blob"/></param>
@@ -1326,7 +1364,7 @@ public void UpdateBlob(int arg0, Java.Sql.Blob arg1)
             IExecute("updateBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBlob(java.lang.String,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBlob(java.lang.String,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1337,7 +1375,7 @@ public void UpdateBlob(Java.Lang.String arg0, Java.Io.InputStream arg1, long arg
             IExecute("updateBlob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBlob(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBlob(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -1347,7 +1385,7 @@ public void UpdateBlob(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("updateBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBlob(java.lang.String,java.sql.Blob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBlob(java.lang.String,java.sql.Blob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Blob"/></param>
@@ -1357,7 +1395,7 @@ public void UpdateBlob(Java.Lang.String arg0, Java.Sql.Blob arg1)
             IExecute("updateBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBoolean(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBoolean(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -1367,7 +1405,7 @@ public void UpdateBoolean(int arg0, bool arg1)
             IExecute("updateBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBoolean(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBoolean(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -1377,7 +1415,7 @@ public void UpdateBoolean(Java.Lang.String arg0, bool arg1)
             IExecute("updateBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateByte(int,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateByte(int,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -1387,7 +1425,7 @@ public void UpdateByte(int arg0, byte arg1)
             IExecute("updateByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateByte(java.lang.String,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateByte(java.lang.String,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -1397,7 +1435,7 @@ public void UpdateByte(Java.Lang.String arg0, byte arg1)
             IExecute("updateByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBytes(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBytes(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -1407,7 +1445,7 @@ public void UpdateBytes(int arg0, byte[] arg1)
             IExecute("updateBytes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateBytes(java.lang.String,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateBytes(java.lang.String,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -1417,7 +1455,7 @@ public void UpdateBytes(Java.Lang.String arg0, byte[] arg1)
             IExecute("updateBytes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateCharacterStream(int,java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateCharacterStream(int,java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1428,7 +1466,7 @@ public void UpdateCharacterStream(int arg0, Java.Io.Reader arg1, int arg2)
             IExecute("updateCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateCharacterStream(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateCharacterStream(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1439,7 +1477,7 @@ public void UpdateCharacterStream(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("updateCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateCharacterStream(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateCharacterStream(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1449,7 +1487,7 @@ public void UpdateCharacterStream(int arg0, Java.Io.Reader arg1)
             IExecute("updateCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateCharacterStream(java.lang.String,java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateCharacterStream(java.lang.String,java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1460,7 +1498,7 @@ public void UpdateCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1, in
             IExecute("updateCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateCharacterStream(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateCharacterStream(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1471,7 +1509,7 @@ public void UpdateCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1, lo
             IExecute("updateCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateCharacterStream(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateCharacterStream(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1481,7 +1519,7 @@ public void UpdateCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("updateCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateClob(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateClob(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1492,7 +1530,7 @@ public void UpdateClob(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("updateClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateClob(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateClob(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1502,7 +1540,7 @@ public void UpdateClob(int arg0, Java.Io.Reader arg1)
             IExecute("updateClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateClob(int,java.sql.Clob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateClob(int,java.sql.Clob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Clob"/></param>
@@ -1512,7 +1550,7 @@ public void UpdateClob(int arg0, Java.Sql.Clob arg1)
             IExecute("updateClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateClob(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateClob(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1523,7 +1561,7 @@ public void UpdateClob(Java.Lang.String arg0, Java.Io.Reader arg1, long arg2)
             IExecute("updateClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateClob(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateClob(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1533,7 +1571,7 @@ public void UpdateClob(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("updateClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateClob(java.lang.String,java.sql.Clob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateClob(java.lang.String,java.sql.Clob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Clob"/></param>
@@ -1543,7 +1581,7 @@ public void UpdateClob(Java.Lang.String arg0, Java.Sql.Clob arg1)
             IExecute("updateClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateDate(int,java.sql.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateDate(int,java.sql.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -1553,7 +1591,7 @@ public void UpdateDate(int arg0, Java.Sql.Date arg1)
             IExecute("updateDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateDate(java.lang.String,java.sql.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateDate(java.lang.String,java.sql.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -1563,7 +1601,7 @@ public void UpdateDate(Java.Lang.String arg0, Java.Sql.Date arg1)
             IExecute("updateDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateDouble(int,double)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateDouble(int,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -1573,7 +1611,7 @@ public void UpdateDouble(int arg0, double arg1)
             IExecute("updateDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateDouble(java.lang.String,double)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateDouble(java.lang.String,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -1583,7 +1621,7 @@ public void UpdateDouble(Java.Lang.String arg0, double arg1)
             IExecute("updateDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateFloat(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateFloat(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -1593,7 +1631,7 @@ public void UpdateFloat(int arg0, float arg1)
             IExecute("updateFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateFloat(java.lang.String,float)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateFloat(java.lang.String,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -1603,7 +1641,7 @@ public void UpdateFloat(Java.Lang.String arg0, float arg1)
             IExecute("updateFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateInt(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateInt(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1613,7 +1651,7 @@ public void UpdateInt(int arg0, int arg1)
             IExecute("updateInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateInt(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateInt(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1623,7 +1661,7 @@ public void UpdateInt(Java.Lang.String arg0, int arg1)
             IExecute("updateInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateLong(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateLong(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -1633,7 +1671,7 @@ public void UpdateLong(int arg0, long arg1)
             IExecute("updateLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateLong(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateLong(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -1643,7 +1681,7 @@ public void UpdateLong(Java.Lang.String arg0, long arg1)
             IExecute("updateLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNCharacterStream(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNCharacterStream(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1654,7 +1692,7 @@ public void UpdateNCharacterStream(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("updateNCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNCharacterStream(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNCharacterStream(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1664,7 +1702,7 @@ public void UpdateNCharacterStream(int arg0, Java.Io.Reader arg1)
             IExecute("updateNCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNCharacterStream(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNCharacterStream(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1675,7 +1713,7 @@ public void UpdateNCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1, l
             IExecute("updateNCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNCharacterStream(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNCharacterStream(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1685,7 +1723,7 @@ public void UpdateNCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("updateNCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNClob(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNClob(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1696,7 +1734,7 @@ public void UpdateNClob(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("updateNClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNClob(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNClob(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1706,7 +1744,7 @@ public void UpdateNClob(int arg0, Java.Io.Reader arg1)
             IExecute("updateNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNClob(int,java.sql.NClob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNClob(int,java.sql.NClob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.NClob"/></param>
@@ -1716,7 +1754,7 @@ public void UpdateNClob(int arg0, Java.Sql.NClob arg1)
             IExecute("updateNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNClob(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNClob(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1727,7 +1765,7 @@ public void UpdateNClob(Java.Lang.String arg0, Java.Io.Reader arg1, long arg2)
             IExecute("updateNClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNClob(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNClob(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -1737,7 +1775,7 @@ public void UpdateNClob(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("updateNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNClob(java.lang.String,java.sql.NClob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNClob(java.lang.String,java.sql.NClob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.NClob"/></param>
@@ -1747,7 +1785,7 @@ public void UpdateNClob(Java.Lang.String arg0, Java.Sql.NClob arg1)
             IExecute("updateNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNString(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNString(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1757,7 +1795,7 @@ public void UpdateNString(int arg0, Java.Lang.String arg1)
             IExecute("updateNString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNString(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNString(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1767,7 +1805,7 @@ public void UpdateNString(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("updateNString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNull(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNull(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1776,7 +1814,7 @@ public void UpdateNull(int arg0)
             IExecuteWithSignature("updateNull", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateNull(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateNull(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1785,7 +1823,7 @@ public void UpdateNull(Java.Lang.String arg0)
             IExecuteWithSignature("updateNull", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateObject(int,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateObject(int,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1796,7 +1834,7 @@ public void UpdateObject(int arg0, object arg1, int arg2)
             IExecute("updateObject", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateObject(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateObject(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1806,7 +1844,7 @@ public void UpdateObject(int arg0, object arg1)
             IExecute("updateObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateObject(java.lang.String,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateObject(java.lang.String,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1817,7 +1855,7 @@ public void UpdateObject(Java.Lang.String arg0, object arg1, int arg2)
             IExecute("updateObject", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateObject(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateObject(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1827,7 +1865,7 @@ public void UpdateObject(Java.Lang.String arg0, object arg1)
             IExecute("updateObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateRef(int,java.sql.Ref)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateRef(int,java.sql.Ref)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Ref"/></param>
@@ -1837,7 +1875,7 @@ public void UpdateRef(int arg0, Java.Sql.Ref arg1)
             IExecute("updateRef", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateRef(java.lang.String,java.sql.Ref)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateRef(java.lang.String,java.sql.Ref)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Ref"/></param>
@@ -1847,7 +1885,7 @@ public void UpdateRef(Java.Lang.String arg0, Java.Sql.Ref arg1)
             IExecute("updateRef", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateRow()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateRow()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void UpdateRow()
@@ -1855,7 +1893,7 @@ public void UpdateRow()
             IExecuteWithSignature("updateRow", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateRowId(int,java.sql.RowId)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateRowId(int,java.sql.RowId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.RowId"/></param>
@@ -1865,7 +1903,7 @@ public void UpdateRowId(int arg0, Java.Sql.RowId arg1)
             IExecute("updateRowId", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateRowId(java.lang.String,java.sql.RowId)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateRowId(java.lang.String,java.sql.RowId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.RowId"/></param>
@@ -1875,7 +1913,7 @@ public void UpdateRowId(Java.Lang.String arg0, Java.Sql.RowId arg1)
             IExecute("updateRowId", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateShort(int,short)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateShort(int,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -1885,7 +1923,7 @@ public void UpdateShort(int arg0, short arg1)
             IExecute("updateShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateShort(java.lang.String,short)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateShort(java.lang.String,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -1895,7 +1933,7 @@ public void UpdateShort(Java.Lang.String arg0, short arg1)
             IExecute("updateShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateSQLXML(int,java.sql.SQLXML)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateSQLXML(int,java.sql.SQLXML)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.SQLXML"/></param>
@@ -1905,7 +1943,7 @@ public void UpdateSQLXML(int arg0, Java.Sql.SQLXML arg1)
             IExecute("updateSQLXML", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateSQLXML(java.lang.String,java.sql.SQLXML)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateSQLXML(java.lang.String,java.sql.SQLXML)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.SQLXML"/></param>
@@ -1915,7 +1953,7 @@ public void UpdateSQLXML(Java.Lang.String arg0, Java.Sql.SQLXML arg1)
             IExecute("updateSQLXML", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateString(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateString(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1925,7 +1963,7 @@ public void UpdateString(int arg0, Java.Lang.String arg1)
             IExecute("updateString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateString(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateString(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -1935,7 +1973,7 @@ public void UpdateString(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("updateString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateTime(int,java.sql.Time)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateTime(int,java.sql.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -1945,7 +1983,7 @@ public void UpdateTime(int arg0, Java.Sql.Time arg1)
             IExecute("updateTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateTime(java.lang.String,java.sql.Time)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateTime(java.lang.String,java.sql.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -1955,7 +1993,7 @@ public void UpdateTime(Java.Lang.String arg0, Java.Sql.Time arg1)
             IExecute("updateTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateTimestamp(int,java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateTimestamp(int,java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -1965,7 +2003,7 @@ public void UpdateTimestamp(int arg0, Java.Sql.Timestamp arg1)
             IExecute("updateTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSet.html#updateTimestamp(java.lang.String,java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSet.html#updateTimestamp(java.lang.String,java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Sql/ResultSetMetaData.cs b/src/net/Netdroid/Generated/Java/Sql/ResultSetMetaData.cs
index cfc9c3224..bb138b163 100644
--- a/src/net/Netdroid/Generated/Java/Sql/ResultSetMetaData.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/ResultSetMetaData.cs
@@ -56,19 +56,19 @@ public partial class ResultSetMetaData : Java.Sql.IResultSetMetaData
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#columnNoNulls"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#columnNoNulls"/>
         /// </summary>
         public static int columnNoNulls { get { if (!_columnNoNullsReady) { _columnNoNullsContent = SGetField<int>(LocalBridgeClazz, "columnNoNulls"); _columnNoNullsReady = true; } return _columnNoNullsContent; } }
         private static int _columnNoNullsContent = default;
         private static bool _columnNoNullsReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#columnNullable"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#columnNullable"/>
         /// </summary>
         public static int columnNullable { get { if (!_columnNullableReady) { _columnNullableContent = SGetField<int>(LocalBridgeClazz, "columnNullable"); _columnNullableReady = true; } return _columnNullableContent; } }
         private static int _columnNullableContent = default;
         private static bool _columnNullableReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#columnNullableUnknown"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#columnNullableUnknown"/>
         /// </summary>
         public static int columnNullableUnknown { get { if (!_columnNullableUnknownReady) { _columnNullableUnknownContent = SGetField<int>(LocalBridgeClazz, "columnNullableUnknown"); _columnNullableUnknownReady = true; } return _columnNullableUnknownContent; } }
         private static int _columnNullableUnknownContent = default;
@@ -82,14 +82,7 @@ public partial class ResultSetMetaData : Java.Sql.IResultSetMetaData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getColumnCount()"/> 
-        /// </summary>
-        public int ColumnCount
-        {
-            get { return IExecuteWithSignature<int>("getColumnCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isAutoIncrement(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isAutoIncrement(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -99,7 +92,7 @@ public bool IsAutoIncrement(int arg0)
             return IExecuteWithSignature<bool>("isAutoIncrement", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isCaseSensitive(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isCaseSensitive(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -109,7 +102,7 @@ public bool IsCaseSensitive(int arg0)
             return IExecuteWithSignature<bool>("isCaseSensitive", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isCurrency(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isCurrency(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -119,7 +112,7 @@ public bool IsCurrency(int arg0)
             return IExecuteWithSignature<bool>("isCurrency", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isDefinitelyWritable(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isDefinitelyWritable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -129,7 +122,7 @@ public bool IsDefinitelyWritable(int arg0)
             return IExecuteWithSignature<bool>("isDefinitelyWritable", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isReadOnly(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isReadOnly(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -139,7 +132,7 @@ public bool IsReadOnly(int arg0)
             return IExecuteWithSignature<bool>("isReadOnly", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isSearchable(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isSearchable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -149,7 +142,7 @@ public bool IsSearchable(int arg0)
             return IExecuteWithSignature<bool>("isSearchable", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isSigned(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isSigned(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -159,7 +152,7 @@ public bool IsSigned(int arg0)
             return IExecuteWithSignature<bool>("isSigned", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isWritable(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isWritable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -169,7 +162,16 @@ public bool IsWritable(int arg0)
             return IExecuteWithSignature<bool>("isWritable", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getColumnDisplaySize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getColumnCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetColumnCount()
+        {
+            return IExecuteWithSignature<int>("getColumnCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getColumnDisplaySize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -179,7 +181,7 @@ public int GetColumnDisplaySize(int arg0)
             return IExecuteWithSignature<int>("getColumnDisplaySize", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getColumnType(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getColumnType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -189,7 +191,7 @@ public int GetColumnType(int arg0)
             return IExecuteWithSignature<int>("getColumnType", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getPrecision(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getPrecision(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -199,7 +201,7 @@ public int GetPrecision(int arg0)
             return IExecuteWithSignature<int>("getPrecision", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getScale(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getScale(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -209,7 +211,7 @@ public int GetScale(int arg0)
             return IExecuteWithSignature<int>("getScale", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#isNullable(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#isNullable(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -219,7 +221,7 @@ public int IsNullable(int arg0)
             return IExecuteWithSignature<int>("isNullable", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getCatalogName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getCatalogName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -229,7 +231,7 @@ public Java.Lang.String GetCatalogName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getCatalogName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getColumnClassName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getColumnClassName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -239,7 +241,7 @@ public Java.Lang.String GetColumnClassName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getColumnClassName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getColumnLabel(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getColumnLabel(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -249,7 +251,7 @@ public Java.Lang.String GetColumnLabel(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getColumnLabel", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getColumnName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getColumnName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -259,7 +261,7 @@ public Java.Lang.String GetColumnName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getColumnName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getColumnTypeName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getColumnTypeName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -269,7 +271,7 @@ public Java.Lang.String GetColumnTypeName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getColumnTypeName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getSchemaName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getSchemaName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -279,7 +281,7 @@ public Java.Lang.String GetSchemaName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getSchemaName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/ResultSetMetaData.html#getTableName(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/ResultSetMetaData.html#getTableName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Sql/RowId.cs b/src/net/Netdroid/Generated/Java/Sql/RowId.cs
index a8a4b6008..61907ee74 100644
--- a/src/net/Netdroid/Generated/Java/Sql/RowId.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/RowId.cs
@@ -64,11 +64,12 @@ public partial class RowId : Java.Sql.IRowId
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowId.html#getBytes()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/RowId.html#getBytes()"/>
         /// </summary>
-        public byte[] Bytes
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetBytes()
         {
-            get { return IExecuteWithSignatureArray<byte>("getBytes", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getBytes", "()[B");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Sql/RowIdLifetime.cs b/src/net/Netdroid/Generated/Java/Sql/RowIdLifetime.cs
index 5e58111dd..d5cc475cc 100644
--- a/src/net/Netdroid/Generated/Java/Sql/RowIdLifetime.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/RowIdLifetime.cs
@@ -38,31 +38,31 @@ public partial class RowIdLifetime
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowIdLifetime.html#ROWID_UNSUPPORTED"/>
+        /// <see href="https://developer.android.com/reference/java/sql/RowIdLifetime.html#ROWID_UNSUPPORTED"/>
         /// </summary>
         public static Java.Sql.RowIdLifetime ROWID_UNSUPPORTED { get { if (!_ROWID_UNSUPPORTEDReady) { _ROWID_UNSUPPORTEDContent = SGetField<Java.Sql.RowIdLifetime>(LocalBridgeClazz, "ROWID_UNSUPPORTED"); _ROWID_UNSUPPORTEDReady = true; } return _ROWID_UNSUPPORTEDContent; } }
         private static Java.Sql.RowIdLifetime _ROWID_UNSUPPORTEDContent = default;
         private static bool _ROWID_UNSUPPORTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowIdLifetime.html#ROWID_VALID_FOREVER"/>
+        /// <see href="https://developer.android.com/reference/java/sql/RowIdLifetime.html#ROWID_VALID_FOREVER"/>
         /// </summary>
         public static Java.Sql.RowIdLifetime ROWID_VALID_FOREVER { get { if (!_ROWID_VALID_FOREVERReady) { _ROWID_VALID_FOREVERContent = SGetField<Java.Sql.RowIdLifetime>(LocalBridgeClazz, "ROWID_VALID_FOREVER"); _ROWID_VALID_FOREVERReady = true; } return _ROWID_VALID_FOREVERContent; } }
         private static Java.Sql.RowIdLifetime _ROWID_VALID_FOREVERContent = default;
         private static bool _ROWID_VALID_FOREVERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowIdLifetime.html#ROWID_VALID_OTHER"/>
+        /// <see href="https://developer.android.com/reference/java/sql/RowIdLifetime.html#ROWID_VALID_OTHER"/>
         /// </summary>
         public static Java.Sql.RowIdLifetime ROWID_VALID_OTHER { get { if (!_ROWID_VALID_OTHERReady) { _ROWID_VALID_OTHERContent = SGetField<Java.Sql.RowIdLifetime>(LocalBridgeClazz, "ROWID_VALID_OTHER"); _ROWID_VALID_OTHERReady = true; } return _ROWID_VALID_OTHERContent; } }
         private static Java.Sql.RowIdLifetime _ROWID_VALID_OTHERContent = default;
         private static bool _ROWID_VALID_OTHERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowIdLifetime.html#ROWID_VALID_SESSION"/>
+        /// <see href="https://developer.android.com/reference/java/sql/RowIdLifetime.html#ROWID_VALID_SESSION"/>
         /// </summary>
         public static Java.Sql.RowIdLifetime ROWID_VALID_SESSION { get { if (!_ROWID_VALID_SESSIONReady) { _ROWID_VALID_SESSIONContent = SGetField<Java.Sql.RowIdLifetime>(LocalBridgeClazz, "ROWID_VALID_SESSION"); _ROWID_VALID_SESSIONReady = true; } return _ROWID_VALID_SESSIONContent; } }
         private static Java.Sql.RowIdLifetime _ROWID_VALID_SESSIONContent = default;
         private static bool _ROWID_VALID_SESSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowIdLifetime.html#ROWID_VALID_TRANSACTION"/>
+        /// <see href="https://developer.android.com/reference/java/sql/RowIdLifetime.html#ROWID_VALID_TRANSACTION"/>
         /// </summary>
         public static Java.Sql.RowIdLifetime ROWID_VALID_TRANSACTION { get { if (!_ROWID_VALID_TRANSACTIONReady) { _ROWID_VALID_TRANSACTIONContent = SGetField<Java.Sql.RowIdLifetime>(LocalBridgeClazz, "ROWID_VALID_TRANSACTION"); _ROWID_VALID_TRANSACTIONReady = true; } return _ROWID_VALID_TRANSACTIONContent; } }
         private static Java.Sql.RowIdLifetime _ROWID_VALID_TRANSACTIONContent = default;
@@ -72,7 +72,7 @@ public partial class RowIdLifetime
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowIdLifetime.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/RowIdLifetime.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.RowIdLifetime"/></returns>
@@ -81,7 +81,7 @@ public static Java.Sql.RowIdLifetime ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Sql.RowIdLifetime>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/sql/RowIdLifetime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/RowIdLifetime.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/RowIdLifetime.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.RowIdLifetime"/></returns>
         public static Java.Sql.RowIdLifetime[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Sql/SQLData.cs b/src/net/Netdroid/Generated/Java/Sql/SQLData.cs
index bc422ecca..9a771e2c5 100644
--- a/src/net/Netdroid/Generated/Java/Sql/SQLData.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/SQLData.cs
@@ -64,14 +64,16 @@ public partial class SQLData : Java.Sql.ISQLData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLData.html#getSQLTypeName()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/SQLData.html#getSQLTypeName()"/>
         /// </summary>
-        public Java.Lang.String SQLTypeName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetSQLTypeName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSQLTypeName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSQLTypeName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLData.html#readSQL(java.sql.SQLInput,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLData.html#readSQL(java.sql.SQLInput,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.SQLInput"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -81,7 +83,7 @@ public void ReadSQL(Java.Sql.SQLInput arg0, Java.Lang.String arg1)
             IExecute("readSQL", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLData.html#writeSQL(java.sql.SQLOutput)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLData.html#writeSQL(java.sql.SQLOutput)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.SQLOutput"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
diff --git a/src/net/Netdroid/Generated/Java/Sql/SQLInput.cs b/src/net/Netdroid/Generated/Java/Sql/SQLInput.cs
index 9469d38bd..f99fb1b68 100644
--- a/src/net/Netdroid/Generated/Java/Sql/SQLInput.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/SQLInput.cs
@@ -64,7 +64,7 @@ public partial class SQLInput : Java.Sql.ISQLInput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -73,7 +73,7 @@ public bool ReadBoolean()
             return IExecuteWithSignature<bool>("readBoolean", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#wasNull()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#wasNull()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -82,7 +82,7 @@ public bool WasNull()
             return IExecuteWithSignature<bool>("wasNull", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readByte()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readByte()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -91,7 +91,7 @@ public byte ReadByte()
             return IExecuteWithSignature<byte>("readByte", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readBytes()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readBytes()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -100,7 +100,7 @@ public byte[] ReadBytes()
             return IExecuteWithSignatureArray<byte>("readBytes", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readDouble()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -109,7 +109,7 @@ public double ReadDouble()
             return IExecuteWithSignature<double>("readDouble", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readFloat()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readFloat()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -118,7 +118,7 @@ public float ReadFloat()
             return IExecuteWithSignature<float>("readFloat", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readInt()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -127,7 +127,7 @@ public int ReadInt()
             return IExecuteWithSignature<int>("readInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readAsciiStream()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readAsciiStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -136,7 +136,7 @@ public Java.Io.InputStream ReadAsciiStream()
             return IExecuteWithSignature<Java.Io.InputStream>("readAsciiStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readBinaryStream()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readBinaryStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -145,7 +145,7 @@ public Java.Io.InputStream ReadBinaryStream()
             return IExecuteWithSignature<Java.Io.InputStream>("readBinaryStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readCharacterStream()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readCharacterStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.Reader"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -154,7 +154,7 @@ public Java.Io.Reader ReadCharacterStream()
             return IExecuteWithSignature<Java.Io.Reader>("readCharacterStream", "()Ljava/io/Reader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readObject()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readObject()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -163,7 +163,7 @@ public object ReadObject()
             return IExecuteWithSignature("readObject", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readNString()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readNString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -172,7 +172,7 @@ public Java.Lang.String ReadNString()
             return IExecuteWithSignature<Java.Lang.String>("readNString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readString()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -181,7 +181,7 @@ public Java.Lang.String ReadString()
             return IExecuteWithSignature<Java.Lang.String>("readString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readBigDecimal()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readBigDecimal()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -190,7 +190,7 @@ public Java.Math.BigDecimal ReadBigDecimal()
             return IExecuteWithSignature<Java.Math.BigDecimal>("readBigDecimal", "()Ljava/math/BigDecimal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readURL()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readURL()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.URL"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -199,7 +199,7 @@ public Java.Net.URL ReadURL()
             return IExecuteWithSignature<Java.Net.URL>("readURL", "()Ljava/net/URL;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readArray()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readArray()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Array"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -208,7 +208,7 @@ public Java.Sql.Array ReadArray()
             return IExecuteWithSignature<Java.Sql.Array>("readArray", "()Ljava/sql/Array;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readBlob()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readBlob()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Blob"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -217,7 +217,7 @@ public Java.Sql.Blob ReadBlob()
             return IExecuteWithSignature<Java.Sql.Blob>("readBlob", "()Ljava/sql/Blob;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readClob()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readClob()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Clob"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -226,7 +226,7 @@ public Java.Sql.Clob ReadClob()
             return IExecuteWithSignature<Java.Sql.Clob>("readClob", "()Ljava/sql/Clob;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readDate()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readDate()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Date"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -235,7 +235,7 @@ public Java.Sql.Date ReadDate()
             return IExecuteWithSignature<Java.Sql.Date>("readDate", "()Ljava/sql/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readNClob()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readNClob()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.NClob"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -244,7 +244,7 @@ public Java.Sql.NClob ReadNClob()
             return IExecuteWithSignature<Java.Sql.NClob>("readNClob", "()Ljava/sql/NClob;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readRef()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readRef()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Ref"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -253,7 +253,7 @@ public Java.Sql.Ref ReadRef()
             return IExecuteWithSignature<Java.Sql.Ref>("readRef", "()Ljava/sql/Ref;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readRowId()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readRowId()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.RowId"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -262,7 +262,7 @@ public Java.Sql.RowId ReadRowId()
             return IExecuteWithSignature<Java.Sql.RowId>("readRowId", "()Ljava/sql/RowId;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readSQLXML()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readSQLXML()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.SQLXML"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -271,7 +271,7 @@ public Java.Sql.SQLXML ReadSQLXML()
             return IExecuteWithSignature<Java.Sql.SQLXML>("readSQLXML", "()Ljava/sql/SQLXML;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readTime()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Time"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -280,7 +280,7 @@ public Java.Sql.Time ReadTime()
             return IExecuteWithSignature<Java.Sql.Time>("readTime", "()Ljava/sql/Time;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readTimestamp()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readTimestamp()"/>
         /// </summary>
         /// <returns><see cref="Java.Sql.Timestamp"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -289,7 +289,7 @@ public Java.Sql.Timestamp ReadTimestamp()
             return IExecuteWithSignature<Java.Sql.Timestamp>("readTimestamp", "()Ljava/sql/Timestamp;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readLong()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readLong()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -298,7 +298,7 @@ public long ReadLong()
             return IExecuteWithSignature<long>("readLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readShort()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readShort()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -307,7 +307,7 @@ public short ReadShort()
             return IExecuteWithSignature<short>("readShort", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLInput.html#readObject(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLInput.html#readObject(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"></typeparam>
diff --git a/src/net/Netdroid/Generated/Java/Sql/SQLOutput.cs b/src/net/Netdroid/Generated/Java/Sql/SQLOutput.cs
index 9442eab43..1e7cd883c 100644
--- a/src/net/Netdroid/Generated/Java/Sql/SQLOutput.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/SQLOutput.cs
@@ -64,7 +64,7 @@ public partial class SQLOutput : Java.Sql.ISQLOutput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeArray(java.sql.Array)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeArray(java.sql.Array)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Array"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -73,7 +73,7 @@ public void WriteArray(Java.Sql.Array arg0)
             IExecuteWithSignature("writeArray", "(Ljava/sql/Array;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeAsciiStream(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeAsciiStream(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -82,7 +82,7 @@ public void WriteAsciiStream(Java.Io.InputStream arg0)
             IExecuteWithSignature("writeAsciiStream", "(Ljava/io/InputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeBigDecimal(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeBigDecimal(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -91,7 +91,7 @@ public void WriteBigDecimal(Java.Math.BigDecimal arg0)
             IExecuteWithSignature("writeBigDecimal", "(Ljava/math/BigDecimal;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeBinaryStream(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeBinaryStream(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -100,7 +100,7 @@ public void WriteBinaryStream(Java.Io.InputStream arg0)
             IExecuteWithSignature("writeBinaryStream", "(Ljava/io/InputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeBlob(java.sql.Blob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeBlob(java.sql.Blob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Blob"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -109,7 +109,7 @@ public void WriteBlob(Java.Sql.Blob arg0)
             IExecuteWithSignature("writeBlob", "(Ljava/sql/Blob;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeBoolean(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeBoolean(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -118,7 +118,7 @@ public void WriteBoolean(bool arg0)
             IExecuteWithSignature("writeBoolean", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeByte(byte)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeByte(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -127,7 +127,7 @@ public void WriteByte(byte arg0)
             IExecuteWithSignature("writeByte", "(B)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeBytes(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeBytes(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -136,7 +136,7 @@ public void WriteBytes(byte[] arg0)
             IExecuteWithSignature("writeBytes", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeCharacterStream(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeCharacterStream(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -145,7 +145,7 @@ public void WriteCharacterStream(Java.Io.Reader arg0)
             IExecuteWithSignature("writeCharacterStream", "(Ljava/io/Reader;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeClob(java.sql.Clob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeClob(java.sql.Clob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Clob"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -154,7 +154,7 @@ public void WriteClob(Java.Sql.Clob arg0)
             IExecuteWithSignature("writeClob", "(Ljava/sql/Clob;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeDate(java.sql.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeDate(java.sql.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Date"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -163,7 +163,7 @@ public void WriteDate(Java.Sql.Date arg0)
             IExecuteWithSignature("writeDate", "(Ljava/sql/Date;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -172,7 +172,7 @@ public void WriteDouble(double arg0)
             IExecuteWithSignature("writeDouble", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeFloat(float)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeFloat(float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -181,7 +181,7 @@ public void WriteFloat(float arg0)
             IExecuteWithSignature("writeFloat", "(F)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -190,7 +190,7 @@ public void WriteInt(int arg0)
             IExecuteWithSignature("writeInt", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeLong(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -199,7 +199,7 @@ public void WriteLong(long arg0)
             IExecuteWithSignature("writeLong", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeNClob(java.sql.NClob)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeNClob(java.sql.NClob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.NClob"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -208,7 +208,7 @@ public void WriteNClob(Java.Sql.NClob arg0)
             IExecuteWithSignature("writeNClob", "(Ljava/sql/NClob;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeNString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeNString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -217,7 +217,7 @@ public void WriteNString(Java.Lang.String arg0)
             IExecuteWithSignature("writeNString", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeObject(java.sql.SQLData)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeObject(java.sql.SQLData)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.SQLData"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -226,7 +226,7 @@ public void WriteObject(Java.Sql.SQLData arg0)
             IExecuteWithSignature("writeObject", "(Ljava/sql/SQLData;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeRef(java.sql.Ref)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeRef(java.sql.Ref)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Ref"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -235,7 +235,7 @@ public void WriteRef(Java.Sql.Ref arg0)
             IExecuteWithSignature("writeRef", "(Ljava/sql/Ref;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeRowId(java.sql.RowId)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeRowId(java.sql.RowId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.RowId"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -244,7 +244,7 @@ public void WriteRowId(Java.Sql.RowId arg0)
             IExecuteWithSignature("writeRowId", "(Ljava/sql/RowId;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeShort(short)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeShort(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -253,7 +253,7 @@ public void WriteShort(short arg0)
             IExecuteWithSignature("writeShort", "(S)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeSQLXML(java.sql.SQLXML)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeSQLXML(java.sql.SQLXML)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.SQLXML"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -262,7 +262,7 @@ public void WriteSQLXML(Java.Sql.SQLXML arg0)
             IExecuteWithSignature("writeSQLXML", "(Ljava/sql/SQLXML;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -271,7 +271,7 @@ public void WriteString(Java.Lang.String arg0)
             IExecuteWithSignature("writeString", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeStruct(java.sql.Struct)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeStruct(java.sql.Struct)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Struct"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -280,7 +280,7 @@ public void WriteStruct(Java.Sql.Struct arg0)
             IExecuteWithSignature("writeStruct", "(Ljava/sql/Struct;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeTime(java.sql.Time)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeTime(java.sql.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Time"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -289,7 +289,7 @@ public void WriteTime(Java.Sql.Time arg0)
             IExecuteWithSignature("writeTime", "(Ljava/sql/Time;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeTimestamp(java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeTimestamp(java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Timestamp"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -298,7 +298,7 @@ public void WriteTimestamp(Java.Sql.Timestamp arg0)
             IExecuteWithSignature("writeTimestamp", "(Ljava/sql/Timestamp;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLOutput.html#writeURL(java.net.URL)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLOutput.html#writeURL(java.net.URL)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
diff --git a/src/net/Netdroid/Generated/Java/Sql/SQLPermission.cs b/src/net/Netdroid/Generated/Java/Sql/SQLPermission.cs
index 550ac13ab..a213ad807 100644
--- a/src/net/Netdroid/Generated/Java/Sql/SQLPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/SQLPermission.cs
@@ -30,7 +30,7 @@ public partial class SQLPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public SQLPermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLPermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLPermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public SQLPermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Sql/SQLXML.cs b/src/net/Netdroid/Generated/Java/Sql/SQLXML.cs
index de44f2694..76664e372 100644
--- a/src/net/Netdroid/Generated/Java/Sql/SQLXML.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/SQLXML.cs
@@ -64,50 +64,38 @@ public partial class SQLXML : Java.Sql.ISQLXML
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#getBinaryStream()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#getSource(java.lang.Class)"/>
         /// </summary>
-        public Java.Io.InputStream BinaryStream
-        {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getBinaryStream", "()Ljava/io/InputStream;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#getCharacterStream()"/> 
-        /// </summary>
-        public Java.Io.Reader CharacterStream
-        {
-            get { return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "()Ljava/io/Reader;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#getString()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#setString(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String String
+        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
+        /// <typeparam name="T"><see cref="Javax.Xml.Transform.ISource"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public T GetSource<T>(Java.Lang.Class arg0) where T : Javax.Xml.Transform.ISource, new()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getString", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setString", "(Ljava/lang/String;)V", value); }
+            return IExecute<T>("getSource", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#setResult(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#setResult(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Javax.Xml.Transform.IResult"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        public T SetResult<T>(Java.Lang.Class arg0) where T: Javax.Xml.Transform.IResult, new()
+        public T SetResult<T>(Java.Lang.Class arg0) where T : Javax.Xml.Transform.IResult, new()
         {
-            return IExecuteWithSignature<T>("setResult", "(Ljava/lang/Class;)Ljavax/xml/transform/Result;", arg0);
+            return IExecute<T>("setResult", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#getSource(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#getBinaryStream()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
-        /// <typeparam name="T"><see cref="Javax.Xml.Transform.ISource"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
-        public T GetSource<T>(Java.Lang.Class arg0) where T: Javax.Xml.Transform.ISource, new()
+        public Java.Io.InputStream GetBinaryStream()
         {
-            return IExecuteWithSignature<T>("getSource", "(Ljava/lang/Class;)Ljavax/xml/transform/Source;", arg0);
+            return IExecuteWithSignature<Java.Io.InputStream>("getBinaryStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#setBinaryStream()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#setBinaryStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.OutputStream"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -116,7 +104,16 @@ public Java.Io.OutputStream SetBinaryStream()
             return IExecuteWithSignature<Java.Io.OutputStream>("setBinaryStream", "()Ljava/io/OutputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#setCharacterStream()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#getCharacterStream()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Io.Reader"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Io.Reader GetCharacterStream()
+        {
+            return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "()Ljava/io/Reader;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#setCharacterStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.Writer"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -125,13 +122,31 @@ public Java.Io.Writer SetCharacterStream()
             return IExecuteWithSignature<Java.Io.Writer>("setCharacterStream", "()Ljava/io/Writer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/SQLXML.html#free()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#getString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getString", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#free()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Free()
         {
             IExecuteWithSignature("free", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/SQLXML.html#setString(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetString(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setString", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/Savepoint.cs b/src/net/Netdroid/Generated/Java/Sql/Savepoint.cs
index c9f6c0feb..e835eb375 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Savepoint.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Savepoint.cs
@@ -64,18 +64,22 @@ public partial class Savepoint : Java.Sql.ISavepoint
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Savepoint.html#getSavepointId()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/Savepoint.html#getSavepointId()"/>
         /// </summary>
-        public int SavepointId
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetSavepointId()
         {
-            get { return IExecuteWithSignature<int>("getSavepointId", "()I"); }
+            return IExecuteWithSignature<int>("getSavepointId", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Savepoint.html#getSavepointName()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/Savepoint.html#getSavepointName()"/>
         /// </summary>
-        public Java.Lang.String SavepointName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetSavepointName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSavepointName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSavepointName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Sql/Statement.cs b/src/net/Netdroid/Generated/Java/Sql/Statement.cs
index 25a9f8145..a848abc8b 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Statement.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Statement.cs
@@ -64,43 +64,43 @@ public partial class Statement : Java.Sql.IStatement, Java.Sql.IWrapper, Java.La
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#CLOSE_ALL_RESULTS"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#CLOSE_ALL_RESULTS"/>
         /// </summary>
         public static int CLOSE_ALL_RESULTS { get { if (!_CLOSE_ALL_RESULTSReady) { _CLOSE_ALL_RESULTSContent = SGetField<int>(LocalBridgeClazz, "CLOSE_ALL_RESULTS"); _CLOSE_ALL_RESULTSReady = true; } return _CLOSE_ALL_RESULTSContent; } }
         private static int _CLOSE_ALL_RESULTSContent = default;
         private static bool _CLOSE_ALL_RESULTSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#CLOSE_CURRENT_RESULT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#CLOSE_CURRENT_RESULT"/>
         /// </summary>
         public static int CLOSE_CURRENT_RESULT { get { if (!_CLOSE_CURRENT_RESULTReady) { _CLOSE_CURRENT_RESULTContent = SGetField<int>(LocalBridgeClazz, "CLOSE_CURRENT_RESULT"); _CLOSE_CURRENT_RESULTReady = true; } return _CLOSE_CURRENT_RESULTContent; } }
         private static int _CLOSE_CURRENT_RESULTContent = default;
         private static bool _CLOSE_CURRENT_RESULTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#EXECUTE_FAILED"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#EXECUTE_FAILED"/>
         /// </summary>
         public static int EXECUTE_FAILED { get { if (!_EXECUTE_FAILEDReady) { _EXECUTE_FAILEDContent = SGetField<int>(LocalBridgeClazz, "EXECUTE_FAILED"); _EXECUTE_FAILEDReady = true; } return _EXECUTE_FAILEDContent; } }
         private static int _EXECUTE_FAILEDContent = default;
         private static bool _EXECUTE_FAILEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#KEEP_CURRENT_RESULT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#KEEP_CURRENT_RESULT"/>
         /// </summary>
         public static int KEEP_CURRENT_RESULT { get { if (!_KEEP_CURRENT_RESULTReady) { _KEEP_CURRENT_RESULTContent = SGetField<int>(LocalBridgeClazz, "KEEP_CURRENT_RESULT"); _KEEP_CURRENT_RESULTReady = true; } return _KEEP_CURRENT_RESULTContent; } }
         private static int _KEEP_CURRENT_RESULTContent = default;
         private static bool _KEEP_CURRENT_RESULTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#NO_GENERATED_KEYS"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#NO_GENERATED_KEYS"/>
         /// </summary>
         public static int NO_GENERATED_KEYS { get { if (!_NO_GENERATED_KEYSReady) { _NO_GENERATED_KEYSContent = SGetField<int>(LocalBridgeClazz, "NO_GENERATED_KEYS"); _NO_GENERATED_KEYSReady = true; } return _NO_GENERATED_KEYSContent; } }
         private static int _NO_GENERATED_KEYSContent = default;
         private static bool _NO_GENERATED_KEYSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#RETURN_GENERATED_KEYS"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#RETURN_GENERATED_KEYS"/>
         /// </summary>
         public static int RETURN_GENERATED_KEYS { get { if (!_RETURN_GENERATED_KEYSReady) { _RETURN_GENERATED_KEYSContent = SGetField<int>(LocalBridgeClazz, "RETURN_GENERATED_KEYS"); _RETURN_GENERATED_KEYSReady = true; } return _RETURN_GENERATED_KEYSContent; } }
         private static int _RETURN_GENERATED_KEYSContent = default;
         private static bool _RETURN_GENERATED_KEYSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#SUCCESS_NO_INFO"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#SUCCESS_NO_INFO"/>
         /// </summary>
         public static int SUCCESS_NO_INFO { get { if (!_SUCCESS_NO_INFOReady) { _SUCCESS_NO_INFOContent = SGetField<int>(LocalBridgeClazz, "SUCCESS_NO_INFO"); _SUCCESS_NO_INFOReady = true; } return _SUCCESS_NO_INFOContent; } }
         private static int _SUCCESS_NO_INFOContent = default;
@@ -114,119 +114,7 @@ public partial class Statement : Java.Sql.IStatement, Java.Sql.IWrapper, Java.La
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getConnection()"/> 
-        /// </summary>
-        public Java.Sql.Connection Connection
-        {
-            get { return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getFetchDirection()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setFetchDirection(int)"/>
-        /// </summary>
-        public int FetchDirection
-        {
-            get { return IExecuteWithSignature<int>("getFetchDirection", "()I"); } set { IExecuteWithSignature("setFetchDirection", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getFetchSize()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setFetchSize(int)"/>
-        /// </summary>
-        public int FetchSize
-        {
-            get { return IExecuteWithSignature<int>("getFetchSize", "()I"); } set { IExecuteWithSignature("setFetchSize", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getGeneratedKeys()"/> 
-        /// </summary>
-        public Java.Sql.ResultSet GeneratedKeys
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getGeneratedKeys", "()Ljava/sql/ResultSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getLargeMaxRows()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setLargeMaxRows(long)"/>
-        /// </summary>
-        public long LargeMaxRows
-        {
-            get { return IExecuteWithSignature<long>("getLargeMaxRows", "()J"); } set { IExecuteWithSignature("setLargeMaxRows", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getLargeUpdateCount()"/> 
-        /// </summary>
-        public long LargeUpdateCount
-        {
-            get { return IExecuteWithSignature<long>("getLargeUpdateCount", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getMaxFieldSize()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setMaxFieldSize(int)"/>
-        /// </summary>
-        public int MaxFieldSize
-        {
-            get { return IExecuteWithSignature<int>("getMaxFieldSize", "()I"); } set { IExecuteWithSignature("setMaxFieldSize", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getMaxRows()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setMaxRows(int)"/>
-        /// </summary>
-        public int MaxRows
-        {
-            get { return IExecuteWithSignature<int>("getMaxRows", "()I"); } set { IExecuteWithSignature("setMaxRows", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getMoreResults()"/> 
-        /// </summary>
-        public bool MoreResults
-        {
-            get { return IExecuteWithSignature<bool>("getMoreResults", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getQueryTimeout()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setQueryTimeout(int)"/>
-        /// </summary>
-        public int QueryTimeout
-        {
-            get { return IExecuteWithSignature<int>("getQueryTimeout", "()I"); } set { IExecuteWithSignature("setQueryTimeout", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getResultSet()"/> 
-        /// </summary>
-        public Java.Sql.ResultSet ResultSet
-        {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getResultSet", "()Ljava/sql/ResultSet;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getResultSetConcurrency()"/> 
-        /// </summary>
-        public int ResultSetConcurrency
-        {
-            get { return IExecuteWithSignature<int>("getResultSetConcurrency", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getResultSetHoldability()"/> 
-        /// </summary>
-        public int ResultSetHoldability
-        {
-            get { return IExecuteWithSignature<int>("getResultSetHoldability", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getResultSetType()"/> 
-        /// </summary>
-        public int ResultSetType
-        {
-            get { return IExecuteWithSignature<int>("getResultSetType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getUpdateCount()"/> 
-        /// </summary>
-        public int UpdateCount
-        {
-            get { return IExecuteWithSignature<int>("getUpdateCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getWarnings()"/> 
-        /// </summary>
-        public Java.Sql.SQLWarning Warnings
-        {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getWarnings", "()Ljava/sql/SQLWarning;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLWarning>(obj); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#execute(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#execute(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -237,7 +125,7 @@ public bool Execute(Java.Lang.String arg0, int arg1)
             return IExecute<bool>("execute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#execute(java.lang.String,int[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#execute(java.lang.String,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -248,7 +136,7 @@ public bool Execute(Java.Lang.String arg0, int[] arg1)
             return IExecute<bool>("execute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#execute(java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#execute(java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -259,7 +147,7 @@ public bool Execute(Java.Lang.String arg0, Java.Lang.String[] arg1)
             return IExecute<bool>("execute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#execute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#execute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -269,7 +157,16 @@ public bool Execute(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("execute", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#getMoreResults(int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getMoreResults()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public bool GetMoreResults()
+        {
+            return IExecuteWithSignature<bool>("getMoreResults", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getMoreResults(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -279,7 +176,7 @@ public bool GetMoreResults(int arg0)
             return IExecuteWithSignature<bool>("getMoreResults", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#isClosed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -288,7 +185,7 @@ public bool IsClosed()
             return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#isCloseOnCompletion()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#isCloseOnCompletion()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -297,7 +194,7 @@ public bool IsCloseOnCompletion()
             return IExecuteWithSignature<bool>("isCloseOnCompletion", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#isPoolable()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#isPoolable()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -306,7 +203,7 @@ public bool IsPoolable()
             return IExecuteWithSignature<bool>("isPoolable", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeUpdate(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeUpdate(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -317,7 +214,7 @@ public int ExecuteUpdate(Java.Lang.String arg0, int arg1)
             return IExecute<int>("executeUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeUpdate(java.lang.String,int[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeUpdate(java.lang.String,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -328,7 +225,7 @@ public int ExecuteUpdate(Java.Lang.String arg0, int[] arg1)
             return IExecute<int>("executeUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeUpdate(java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeUpdate(java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -339,7 +236,7 @@ public int ExecuteUpdate(Java.Lang.String arg0, Java.Lang.String[] arg1)
             return IExecute<int>("executeUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeUpdate(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeUpdate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -349,7 +246,88 @@ public int ExecuteUpdate(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("executeUpdate", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeBatch()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getFetchDirection()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetFetchDirection()
+        {
+            return IExecuteWithSignature<int>("getFetchDirection", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getFetchSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetFetchSize()
+        {
+            return IExecuteWithSignature<int>("getFetchSize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getMaxFieldSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxFieldSize()
+        {
+            return IExecuteWithSignature<int>("getMaxFieldSize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getMaxRows()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxRows()
+        {
+            return IExecuteWithSignature<int>("getMaxRows", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getQueryTimeout()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetQueryTimeout()
+        {
+            return IExecuteWithSignature<int>("getQueryTimeout", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getResultSetConcurrency()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetResultSetConcurrency()
+        {
+            return IExecuteWithSignature<int>("getResultSetConcurrency", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getResultSetHoldability()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetResultSetHoldability()
+        {
+            return IExecuteWithSignature<int>("getResultSetHoldability", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getResultSetType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetResultSetType()
+        {
+            return IExecuteWithSignature<int>("getResultSetType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getUpdateCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetUpdateCount()
+        {
+            return IExecuteWithSignature<int>("getUpdateCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeBatch()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -358,7 +336,16 @@ public int[] ExecuteBatch()
             return IExecuteWithSignatureArray<int>("executeBatch", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeQuery(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getConnection()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.Connection"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.Connection GetConnection()
+        {
+            return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeQuery(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.ResultSet"/></returns>
@@ -368,7 +355,34 @@ public Java.Sql.ResultSet ExecuteQuery(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Sql.ResultSet>("executeQuery", "(Ljava/lang/String;)Ljava/sql/ResultSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#addBatch(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getGeneratedKeys()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetGeneratedKeys()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getGeneratedKeys", "()Ljava/sql/ResultSet;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getResultSet()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetResultSet()
+        {
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getResultSet", "()Ljava/sql/ResultSet;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getWarnings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Sql.SQLWarning"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.SQLWarning GetWarnings()
+        {
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getWarnings", "()Ljava/sql/SQLWarning;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLWarning>(obj);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#addBatch(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -377,7 +391,7 @@ public void AddBatch(Java.Lang.String arg0)
             IExecuteWithSignature("addBatch", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#cancel()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#cancel()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Cancel()
@@ -385,7 +399,7 @@ public void Cancel()
             IExecuteWithSignature("cancel", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#clearBatch()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#clearBatch()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void ClearBatch()
@@ -393,7 +407,7 @@ public void ClearBatch()
             IExecuteWithSignature("clearBatch", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#clearWarnings()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#clearWarnings()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void ClearWarnings()
@@ -401,7 +415,7 @@ public void ClearWarnings()
             IExecuteWithSignature("clearWarnings", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Close()
@@ -409,7 +423,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#closeOnCompletion()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#closeOnCompletion()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void CloseOnCompletion()
@@ -417,7 +431,7 @@ public void CloseOnCompletion()
             IExecuteWithSignature("closeOnCompletion", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setCursorName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setCursorName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -426,7 +440,7 @@ public void SetCursorName(Java.Lang.String arg0)
             IExecuteWithSignature("setCursorName", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setEscapeProcessing(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setEscapeProcessing(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -435,7 +449,43 @@ public void SetEscapeProcessing(bool arg0)
             IExecuteWithSignature("setEscapeProcessing", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#setPoolable(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setFetchDirection(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetFetchDirection(int arg0)
+        {
+            IExecuteWithSignature("setFetchDirection", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setFetchSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetFetchSize(int arg0)
+        {
+            IExecuteWithSignature("setFetchSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setMaxFieldSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetMaxFieldSize(int arg0)
+        {
+            IExecuteWithSignature("setMaxFieldSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setMaxRows(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetMaxRows(int arg0)
+        {
+            IExecuteWithSignature("setMaxRows", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setPoolable(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -444,7 +494,16 @@ public void SetPoolable(bool arg0)
             IExecuteWithSignature("setPoolable", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#isSimpleIdentifier(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setQueryTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetQueryTimeout(int arg0)
+        {
+            IExecuteWithSignature("setQueryTimeout", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#isSimpleIdentifier(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -454,7 +513,7 @@ public bool IsSimpleIdentifier(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isSimpleIdentifier", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#enquoteIdentifier(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#enquoteIdentifier(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -465,7 +524,7 @@ public Java.Lang.String EnquoteIdentifier(Java.Lang.String arg0, bool arg1)
             return IExecute<Java.Lang.String>("enquoteIdentifier", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#enquoteLiteral(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#enquoteLiteral(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -475,7 +534,7 @@ public Java.Lang.String EnquoteLiteral(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("enquoteLiteral", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#enquoteNCharLiteral(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#enquoteNCharLiteral(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -485,7 +544,7 @@ public Java.Lang.String EnquoteNCharLiteral(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("enquoteNCharLiteral", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeLargeUpdate(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeLargeUpdate(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -496,7 +555,7 @@ public long ExecuteLargeUpdate(Java.Lang.String arg0, int arg1)
             return IExecute<long>("executeLargeUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeLargeUpdate(java.lang.String,int[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeLargeUpdate(java.lang.String,int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -507,7 +566,7 @@ public long ExecuteLargeUpdate(Java.Lang.String arg0, int[] arg1)
             return IExecute<long>("executeLargeUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeLargeUpdate(java.lang.String,java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeLargeUpdate(java.lang.String,java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -518,7 +577,7 @@ public long ExecuteLargeUpdate(Java.Lang.String arg0, Java.Lang.String[] arg1)
             return IExecute<long>("executeLargeUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeLargeUpdate(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeLargeUpdate(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="long"/></returns>
@@ -528,7 +587,25 @@ public long ExecuteLargeUpdate(Java.Lang.String arg0)
             return IExecuteWithSignature<long>("executeLargeUpdate", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Statement.html#executeLargeBatch()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getLargeMaxRows()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public long GetLargeMaxRows()
+        {
+            return IExecuteWithSignature<long>("getLargeMaxRows", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#getLargeUpdateCount()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public long GetLargeUpdateCount()
+        {
+            return IExecuteWithSignature<long>("getLargeUpdateCount", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#executeLargeBatch()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -536,6 +613,15 @@ public long[] ExecuteLargeBatch()
         {
             return IExecuteWithSignatureArray<long>("executeLargeBatch", "()[J");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Statement.html#setLargeMaxRows(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetLargeMaxRows(long arg0)
+        {
+            IExecuteWithSignature("setLargeMaxRows", "(J)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/Struct.cs b/src/net/Netdroid/Generated/Java/Sql/Struct.cs
index 5b8a02141..3435c838a 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Struct.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Struct.cs
@@ -64,21 +64,16 @@ public partial class Struct : Java.Sql.IStruct
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Struct.html#getAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/java/sql/Struct.html#getAttributes()"/>
         /// </summary>
-        public object[] Attributes
-        {
-            get { return IExecuteWithSignatureArray<object>("getAttributes", "()[Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Struct.html#getSQLTypeName()"/> 
-        /// </summary>
-        public Java.Lang.String SQLTypeName
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public object[] GetAttributes()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSQLTypeName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<object>("getAttributes", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Struct.html#getAttributes(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Struct.html#getAttributes(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <returns><see cref="object"/></returns>
@@ -87,6 +82,15 @@ public object[] GetAttributes(Java.Util.Map<Java.Lang.String, Java.Lang.Class> a
         {
             return IExecuteWithSignatureArray<object>("getAttributes", "(Ljava/util/Map;)[Ljava/lang/Object;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Struct.html#getSQLTypeName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetSQLTypeName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSQLTypeName", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/Time.cs b/src/net/Netdroid/Generated/Java/Sql/Time.cs
index bf5cf7175..d78867e0c 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Time.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Time.cs
@@ -30,18 +30,18 @@ public partial class Time
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Time.html#%3Cinit%3E(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Time.html#%3Cinit%3E(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Time(int arg0, int arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Time.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Time.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public Time(long arg0)
@@ -61,7 +61,7 @@ public Time(long arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Time.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Time.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Time"/></returns>
@@ -70,7 +70,7 @@ public static Java.Sql.Time ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Sql.Time>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/sql/Time;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Time.html#valueOf(java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Time.html#valueOf(java.time.LocalTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
         /// <returns><see cref="Java.Sql.Time"/></returns>
@@ -83,7 +83,7 @@ public static Java.Sql.Time ValueOf(Java.Time.LocalTime arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Time.html#toLocalTime()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Time.html#toLocalTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
         public Java.Time.LocalTime ToLocalTime()
diff --git a/src/net/Netdroid/Generated/Java/Sql/Timestamp.cs b/src/net/Netdroid/Generated/Java/Sql/Timestamp.cs
index 66721da7a..ace32cbb0 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Timestamp.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Timestamp.cs
@@ -30,7 +30,7 @@ public partial class Timestamp
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#%3Cinit%3E(int,int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#%3Cinit%3E(int,int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,13 +39,13 @@ public partial class Timestamp
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <param name="arg6"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Timestamp(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6)
             : base(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public Timestamp(long arg0)
@@ -65,7 +65,7 @@ public Timestamp(long arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Sql.Timestamp"/></returns>
@@ -74,7 +74,7 @@ public static Java.Sql.Timestamp ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Sql.Timestamp>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/sql/Timestamp;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#valueOf(java.time.LocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#valueOf(java.time.LocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <returns><see cref="Java.Sql.Timestamp"/></returns>
@@ -87,14 +87,7 @@ public static Java.Sql.Timestamp ValueOf(Java.Time.LocalDateTime arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#getNanos()"/> <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#setNanos(int)"/>
-        /// </summary>
-        public int Nanos
-        {
-            get { return IExecuteWithSignature<int>("getNanos", "()I"); } set { IExecuteWithSignature("setNanos", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#after(java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#after(java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Timestamp"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -103,7 +96,7 @@ public bool After(Java.Sql.Timestamp arg0)
             return IExecuteWithSignature<bool>("after", "(Ljava/sql/Timestamp;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#before(java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#before(java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Timestamp"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -112,7 +105,7 @@ public bool Before(Java.Sql.Timestamp arg0)
             return IExecuteWithSignature<bool>("before", "(Ljava/sql/Timestamp;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#compareTo(java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#compareTo(java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Sql.Timestamp"/></param>
         /// <returns><see cref="int"/></returns>
@@ -121,13 +114,29 @@ public int CompareTo(Java.Sql.Timestamp arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/sql/Timestamp;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Timestamp.html#toLocalDateTime()"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#getNanos()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNanos()
+        {
+            return IExecuteWithSignature<int>("getNanos", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#toLocalDateTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
         public Java.Time.LocalDateTime ToLocalDateTime()
         {
             return IExecuteWithSignature<Java.Time.LocalDateTime>("toLocalDateTime", "()Ljava/time/LocalDateTime;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/sql/Timestamp.html#setNanos(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetNanos(int arg0)
+        {
+            IExecuteWithSignature("setNanos", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Sql/Types.cs b/src/net/Netdroid/Generated/Java/Sql/Types.cs
index 9a5ba8bd2..f5cf8aadc 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Types.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Types.cs
@@ -38,235 +38,235 @@ public partial class Types
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#ARRAY"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#ARRAY"/>
         /// </summary>
         public static int ARRAY { get { if (!_ARRAYReady) { _ARRAYContent = SGetField<int>(LocalBridgeClazz, "ARRAY"); _ARRAYReady = true; } return _ARRAYContent; } }
         private static int _ARRAYContent = default;
         private static bool _ARRAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#BIGINT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#BIGINT"/>
         /// </summary>
         public static int BIGINT { get { if (!_BIGINTReady) { _BIGINTContent = SGetField<int>(LocalBridgeClazz, "BIGINT"); _BIGINTReady = true; } return _BIGINTContent; } }
         private static int _BIGINTContent = default;
         private static bool _BIGINTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#BINARY"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#BINARY"/>
         /// </summary>
         public static int BINARY { get { if (!_BINARYReady) { _BINARYContent = SGetField<int>(LocalBridgeClazz, "BINARY"); _BINARYReady = true; } return _BINARYContent; } }
         private static int _BINARYContent = default;
         private static bool _BINARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#BIT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#BIT"/>
         /// </summary>
         public static int BIT { get { if (!_BITReady) { _BITContent = SGetField<int>(LocalBridgeClazz, "BIT"); _BITReady = true; } return _BITContent; } }
         private static int _BITContent = default;
         private static bool _BITReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#BLOB"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#BLOB"/>
         /// </summary>
         public static int BLOB { get { if (!_BLOBReady) { _BLOBContent = SGetField<int>(LocalBridgeClazz, "BLOB"); _BLOBReady = true; } return _BLOBContent; } }
         private static int _BLOBContent = default;
         private static bool _BLOBReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#BOOLEAN"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#BOOLEAN"/>
         /// </summary>
         public static int BOOLEAN { get { if (!_BOOLEANReady) { _BOOLEANContent = SGetField<int>(LocalBridgeClazz, "BOOLEAN"); _BOOLEANReady = true; } return _BOOLEANContent; } }
         private static int _BOOLEANContent = default;
         private static bool _BOOLEANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#CHAR"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#CHAR"/>
         /// </summary>
         public static int CHAR { get { if (!_CHARReady) { _CHARContent = SGetField<int>(LocalBridgeClazz, "CHAR"); _CHARReady = true; } return _CHARContent; } }
         private static int _CHARContent = default;
         private static bool _CHARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#CLOB"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#CLOB"/>
         /// </summary>
         public static int CLOB { get { if (!_CLOBReady) { _CLOBContent = SGetField<int>(LocalBridgeClazz, "CLOB"); _CLOBReady = true; } return _CLOBContent; } }
         private static int _CLOBContent = default;
         private static bool _CLOBReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#DATALINK"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#DATALINK"/>
         /// </summary>
         public static int DATALINK { get { if (!_DATALINKReady) { _DATALINKContent = SGetField<int>(LocalBridgeClazz, "DATALINK"); _DATALINKReady = true; } return _DATALINKContent; } }
         private static int _DATALINKContent = default;
         private static bool _DATALINKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#DATE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#DATE"/>
         /// </summary>
         public static int DATE { get { if (!_DATEReady) { _DATEContent = SGetField<int>(LocalBridgeClazz, "DATE"); _DATEReady = true; } return _DATEContent; } }
         private static int _DATEContent = default;
         private static bool _DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#DECIMAL"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#DECIMAL"/>
         /// </summary>
         public static int DECIMAL { get { if (!_DECIMALReady) { _DECIMALContent = SGetField<int>(LocalBridgeClazz, "DECIMAL"); _DECIMALReady = true; } return _DECIMALContent; } }
         private static int _DECIMALContent = default;
         private static bool _DECIMALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#DISTINCT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#DISTINCT"/>
         /// </summary>
         public static int DISTINCT { get { if (!_DISTINCTReady) { _DISTINCTContent = SGetField<int>(LocalBridgeClazz, "DISTINCT"); _DISTINCTReady = true; } return _DISTINCTContent; } }
         private static int _DISTINCTContent = default;
         private static bool _DISTINCTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#DOUBLE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#DOUBLE"/>
         /// </summary>
         public static int DOUBLE { get { if (!_DOUBLEReady) { _DOUBLEContent = SGetField<int>(LocalBridgeClazz, "DOUBLE"); _DOUBLEReady = true; } return _DOUBLEContent; } }
         private static int _DOUBLEContent = default;
         private static bool _DOUBLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#FLOAT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#FLOAT"/>
         /// </summary>
         public static int FLOAT { get { if (!_FLOATReady) { _FLOATContent = SGetField<int>(LocalBridgeClazz, "FLOAT"); _FLOATReady = true; } return _FLOATContent; } }
         private static int _FLOATContent = default;
         private static bool _FLOATReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#INTEGER"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#INTEGER"/>
         /// </summary>
         public static int INTEGER { get { if (!_INTEGERReady) { _INTEGERContent = SGetField<int>(LocalBridgeClazz, "INTEGER"); _INTEGERReady = true; } return _INTEGERContent; } }
         private static int _INTEGERContent = default;
         private static bool _INTEGERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#JAVA_OBJECT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#JAVA_OBJECT"/>
         /// </summary>
         public static int JAVA_OBJECT { get { if (!_JAVA_OBJECTReady) { _JAVA_OBJECTContent = SGetField<int>(LocalBridgeClazz, "JAVA_OBJECT"); _JAVA_OBJECTReady = true; } return _JAVA_OBJECTContent; } }
         private static int _JAVA_OBJECTContent = default;
         private static bool _JAVA_OBJECTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#LONGNVARCHAR"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#LONGNVARCHAR"/>
         /// </summary>
         public static int LONGNVARCHAR { get { if (!_LONGNVARCHARReady) { _LONGNVARCHARContent = SGetField<int>(LocalBridgeClazz, "LONGNVARCHAR"); _LONGNVARCHARReady = true; } return _LONGNVARCHARContent; } }
         private static int _LONGNVARCHARContent = default;
         private static bool _LONGNVARCHARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#LONGVARBINARY"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#LONGVARBINARY"/>
         /// </summary>
         public static int LONGVARBINARY { get { if (!_LONGVARBINARYReady) { _LONGVARBINARYContent = SGetField<int>(LocalBridgeClazz, "LONGVARBINARY"); _LONGVARBINARYReady = true; } return _LONGVARBINARYContent; } }
         private static int _LONGVARBINARYContent = default;
         private static bool _LONGVARBINARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#LONGVARCHAR"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#LONGVARCHAR"/>
         /// </summary>
         public static int LONGVARCHAR { get { if (!_LONGVARCHARReady) { _LONGVARCHARContent = SGetField<int>(LocalBridgeClazz, "LONGVARCHAR"); _LONGVARCHARReady = true; } return _LONGVARCHARContent; } }
         private static int _LONGVARCHARContent = default;
         private static bool _LONGVARCHARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#NCHAR"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#NCHAR"/>
         /// </summary>
         public static int NCHAR { get { if (!_NCHARReady) { _NCHARContent = SGetField<int>(LocalBridgeClazz, "NCHAR"); _NCHARReady = true; } return _NCHARContent; } }
         private static int _NCHARContent = default;
         private static bool _NCHARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#NCLOB"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#NCLOB"/>
         /// </summary>
         public static int NCLOB { get { if (!_NCLOBReady) { _NCLOBContent = SGetField<int>(LocalBridgeClazz, "NCLOB"); _NCLOBReady = true; } return _NCLOBContent; } }
         private static int _NCLOBContent = default;
         private static bool _NCLOBReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#NULL"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#NULL"/>
         /// </summary>
         public static int NULL { get { if (!_NULLReady) { _NULLContent = SGetField<int>(LocalBridgeClazz, "NULL"); _NULLReady = true; } return _NULLContent; } }
         private static int _NULLContent = default;
         private static bool _NULLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#NUMERIC"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#NUMERIC"/>
         /// </summary>
         public static int NUMERIC { get { if (!_NUMERICReady) { _NUMERICContent = SGetField<int>(LocalBridgeClazz, "NUMERIC"); _NUMERICReady = true; } return _NUMERICContent; } }
         private static int _NUMERICContent = default;
         private static bool _NUMERICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#NVARCHAR"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#NVARCHAR"/>
         /// </summary>
         public static int NVARCHAR { get { if (!_NVARCHARReady) { _NVARCHARContent = SGetField<int>(LocalBridgeClazz, "NVARCHAR"); _NVARCHARReady = true; } return _NVARCHARContent; } }
         private static int _NVARCHARContent = default;
         private static bool _NVARCHARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#OTHER"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#OTHER"/>
         /// </summary>
         public static int OTHER { get { if (!_OTHERReady) { _OTHERContent = SGetField<int>(LocalBridgeClazz, "OTHER"); _OTHERReady = true; } return _OTHERContent; } }
         private static int _OTHERContent = default;
         private static bool _OTHERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#REAL"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#REAL"/>
         /// </summary>
         public static int REAL { get { if (!_REALReady) { _REALContent = SGetField<int>(LocalBridgeClazz, "REAL"); _REALReady = true; } return _REALContent; } }
         private static int _REALContent = default;
         private static bool _REALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#REF"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#REF"/>
         /// </summary>
         public static int REF { get { if (!_REFReady) { _REFContent = SGetField<int>(LocalBridgeClazz, "REF"); _REFReady = true; } return _REFContent; } }
         private static int _REFContent = default;
         private static bool _REFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#REF_CURSOR"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#REF_CURSOR"/>
         /// </summary>
         public static int REF_CURSOR { get { if (!_REF_CURSORReady) { _REF_CURSORContent = SGetField<int>(LocalBridgeClazz, "REF_CURSOR"); _REF_CURSORReady = true; } return _REF_CURSORContent; } }
         private static int _REF_CURSORContent = default;
         private static bool _REF_CURSORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#ROWID"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#ROWID"/>
         /// </summary>
         public static int ROWID { get { if (!_ROWIDReady) { _ROWIDContent = SGetField<int>(LocalBridgeClazz, "ROWID"); _ROWIDReady = true; } return _ROWIDContent; } }
         private static int _ROWIDContent = default;
         private static bool _ROWIDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#SMALLINT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#SMALLINT"/>
         /// </summary>
         public static int SMALLINT { get { if (!_SMALLINTReady) { _SMALLINTContent = SGetField<int>(LocalBridgeClazz, "SMALLINT"); _SMALLINTReady = true; } return _SMALLINTContent; } }
         private static int _SMALLINTContent = default;
         private static bool _SMALLINTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#SQLXML"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#SQLXML"/>
         /// </summary>
         public static int SQLXML { get { if (!_SQLXMLReady) { _SQLXMLContent = SGetField<int>(LocalBridgeClazz, "SQLXML"); _SQLXMLReady = true; } return _SQLXMLContent; } }
         private static int _SQLXMLContent = default;
         private static bool _SQLXMLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#STRUCT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#STRUCT"/>
         /// </summary>
         public static int STRUCT { get { if (!_STRUCTReady) { _STRUCTContent = SGetField<int>(LocalBridgeClazz, "STRUCT"); _STRUCTReady = true; } return _STRUCTContent; } }
         private static int _STRUCTContent = default;
         private static bool _STRUCTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#TIME"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#TIME"/>
         /// </summary>
         public static int TIME { get { if (!_TIMEReady) { _TIMEContent = SGetField<int>(LocalBridgeClazz, "TIME"); _TIMEReady = true; } return _TIMEContent; } }
         private static int _TIMEContent = default;
         private static bool _TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#TIME_WITH_TIMEZONE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#TIME_WITH_TIMEZONE"/>
         /// </summary>
         public static int TIME_WITH_TIMEZONE { get { if (!_TIME_WITH_TIMEZONEReady) { _TIME_WITH_TIMEZONEContent = SGetField<int>(LocalBridgeClazz, "TIME_WITH_TIMEZONE"); _TIME_WITH_TIMEZONEReady = true; } return _TIME_WITH_TIMEZONEContent; } }
         private static int _TIME_WITH_TIMEZONEContent = default;
         private static bool _TIME_WITH_TIMEZONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#TIMESTAMP"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#TIMESTAMP"/>
         /// </summary>
         public static int TIMESTAMP { get { if (!_TIMESTAMPReady) { _TIMESTAMPContent = SGetField<int>(LocalBridgeClazz, "TIMESTAMP"); _TIMESTAMPReady = true; } return _TIMESTAMPContent; } }
         private static int _TIMESTAMPContent = default;
         private static bool _TIMESTAMPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#TIMESTAMP_WITH_TIMEZONE"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#TIMESTAMP_WITH_TIMEZONE"/>
         /// </summary>
         public static int TIMESTAMP_WITH_TIMEZONE { get { if (!_TIMESTAMP_WITH_TIMEZONEReady) { _TIMESTAMP_WITH_TIMEZONEContent = SGetField<int>(LocalBridgeClazz, "TIMESTAMP_WITH_TIMEZONE"); _TIMESTAMP_WITH_TIMEZONEReady = true; } return _TIMESTAMP_WITH_TIMEZONEContent; } }
         private static int _TIMESTAMP_WITH_TIMEZONEContent = default;
         private static bool _TIMESTAMP_WITH_TIMEZONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#TINYINT"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#TINYINT"/>
         /// </summary>
         public static int TINYINT { get { if (!_TINYINTReady) { _TINYINTContent = SGetField<int>(LocalBridgeClazz, "TINYINT"); _TINYINTReady = true; } return _TINYINTContent; } }
         private static int _TINYINTContent = default;
         private static bool _TINYINTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#VARBINARY"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#VARBINARY"/>
         /// </summary>
         public static int VARBINARY { get { if (!_VARBINARYReady) { _VARBINARYContent = SGetField<int>(LocalBridgeClazz, "VARBINARY"); _VARBINARYReady = true; } return _VARBINARYContent; } }
         private static int _VARBINARYContent = default;
         private static bool _VARBINARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Types.html#VARCHAR"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Types.html#VARCHAR"/>
         /// </summary>
         public static int VARCHAR { get { if (!_VARCHARReady) { _VARCHARContent = SGetField<int>(LocalBridgeClazz, "VARCHAR"); _VARCHARReady = true; } return _VARCHARContent; } }
         private static int _VARCHARContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Sql/Wrapper.cs b/src/net/Netdroid/Generated/Java/Sql/Wrapper.cs
index 44540c65e..7704d756b 100644
--- a/src/net/Netdroid/Generated/Java/Sql/Wrapper.cs
+++ b/src/net/Netdroid/Generated/Java/Sql/Wrapper.cs
@@ -64,7 +64,7 @@ public partial class Wrapper : Java.Sql.IWrapper
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Wrapper.html#unwrap(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Wrapper.html#unwrap(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"></typeparam>
@@ -75,7 +75,7 @@ public T Unwrap<T>(Java.Lang.Class arg0)
             return IExecuteWithSignature<T>("unwrap", "(Ljava/lang/Class;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/java/sql/Wrapper.html#isWrapperFor(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/sql/Wrapper.html#isWrapperFor(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Text/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Text/AllPackageClasses.cs
index c5825bf5f..30e41e3c3 100644
--- a/src/net/Netdroid/Generated/Java/Text/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Text/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Text
 {
     #region Annotation
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/Annotation.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/Annotation.html"/>
     /// </summary>
     public partial class Annotation : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Annotation>
     {
@@ -72,7 +72,7 @@ public Annotation(params object[] args) : base(args) { }
 
     #region AttributedCharacterIterator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html"/>
     /// </summary>
     public partial class AttributedCharacterIterator : Java.Text.CharacterIterator
     {
@@ -80,12 +80,12 @@ public partial class AttributedCharacterIterator : Java.Text.CharacterIterator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AttributedCharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttributedCharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttributedCharacterIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AttributedCharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttributedCharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttributedCharacterIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -114,7 +114,7 @@ public AttributedCharacterIterator(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Attribute
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.Attribute.html"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.Attribute.html"/>
         /// </summary>
         public partial class Attribute : Java.Io.Serializable
         {
@@ -162,7 +162,7 @@ public Attribute(params object[] args) : base(args) { }
 
     #region AttributedString
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/AttributedString.html"/>
     /// </summary>
     public partial class AttributedString : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AttributedString>
     {
@@ -206,7 +206,7 @@ public AttributedString(params object[] args) : base(args) { }
 
     #region Bidi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/Bidi.html"/>
     /// </summary>
     public partial class Bidi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Bidi>
     {
@@ -250,7 +250,7 @@ public Bidi(params object[] args) : base(args) { }
 
     #region BreakIterator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html"/>
     /// </summary>
     public partial class BreakIterator : Java.Lang.Cloneable
     {
@@ -258,12 +258,12 @@ public partial class BreakIterator : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BreakIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BreakIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BreakIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BreakIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BreakIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BreakIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -296,7 +296,7 @@ public BreakIterator(params object[] args) : base(args) { }
 
     #region CharacterIterator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html"/>
     /// </summary>
     public partial class CharacterIterator : Java.Lang.Cloneable
     {
@@ -304,12 +304,12 @@ public partial class CharacterIterator : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharacterIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharacterIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharacterIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -342,7 +342,7 @@ public CharacterIterator(params object[] args) : base(args) { }
 
     #region ChoiceFormat
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html"/>
     /// </summary>
     public partial class ChoiceFormat : Java.Text.NumberFormat
     {
@@ -386,7 +386,7 @@ public ChoiceFormat(params object[] args) : base(args) { }
 
     #region CollationElementIterator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html"/>
     /// </summary>
     public partial class CollationElementIterator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CollationElementIterator>
     {
@@ -430,7 +430,7 @@ public CollationElementIterator(params object[] args) : base(args) { }
 
     #region CollationKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/CollationKey.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/CollationKey.html"/>
     /// </summary>
     public partial class CollationKey : Java.Lang.Comparable<Java.Text.CollationKey>
     {
@@ -438,12 +438,12 @@ public partial class CollationKey : Java.Lang.Comparable<Java.Text.CollationKey>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CollationKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CollationKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CollationKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CollationKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CollationKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CollationKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -476,7 +476,7 @@ public CollationKey(params object[] args) : base(args) { }
 
     #region Collator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/Collator.html"/>
     /// </summary>
     public partial class Collator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Collator>
     {
@@ -484,12 +484,12 @@ public partial class Collator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Collator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Collator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Collator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -522,7 +522,7 @@ public Collator(params object[] args) : base(args) { }
 
     #region DateFormat
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/DateFormat.html"/>
     /// </summary>
     public partial class DateFormat : Java.Text.Format
     {
@@ -530,12 +530,12 @@ public partial class DateFormat : Java.Text.Format
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DateFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DateFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DateFormat() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DateFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DateFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DateFormat(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -564,7 +564,7 @@ public DateFormat(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Field
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html"/>
         /// </summary>
         public partial class Field : Java.Text.Format.Field
         {
@@ -612,7 +612,7 @@ public Field(params object[] args) : base(args) { }
 
     #region DateFormatSymbols
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html"/>
     /// </summary>
     public partial class DateFormatSymbols : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DateFormatSymbols>
     {
@@ -656,7 +656,7 @@ public DateFormatSymbols(params object[] args) : base(args) { }
 
     #region DecimalFormat
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html"/>
     /// </summary>
     public partial class DecimalFormat : Java.Text.NumberFormat
     {
@@ -700,7 +700,7 @@ public DecimalFormat(params object[] args) : base(args) { }
 
     #region DecimalFormatSymbols
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html"/>
     /// </summary>
     public partial class DecimalFormatSymbols : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DecimalFormatSymbols>
     {
@@ -744,7 +744,7 @@ public DecimalFormatSymbols(params object[] args) : base(args) { }
 
     #region FieldPosition
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html"/>
     /// </summary>
     public partial class FieldPosition : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FieldPosition>
     {
@@ -788,7 +788,7 @@ public FieldPosition(params object[] args) : base(args) { }
 
     #region Format
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/Format.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/Format.html"/>
     /// </summary>
     public partial class Format : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Format>
     {
@@ -796,12 +796,12 @@ public partial class Format : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Format>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Format class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Format class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Format() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Format class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Format class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Format(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -830,7 +830,7 @@ public Format(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Field
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Format.Field.html"/>
+        /// <see href="https://developer.android.com/reference/java/text/Format.Field.html"/>
         /// </summary>
         public partial class Field : Java.Text.AttributedCharacterIterator.Attribute
         {
@@ -878,7 +878,7 @@ public Field(params object[] args) : base(args) { }
 
     #region MessageFormat
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html"/>
     /// </summary>
     public partial class MessageFormat : Java.Text.Format
     {
@@ -918,7 +918,7 @@ public MessageFormat(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Field
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.Field.html"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.Field.html"/>
         /// </summary>
         public partial class Field : Java.Text.Format.Field
         {
@@ -966,7 +966,7 @@ public Field(params object[] args) : base(args) { }
 
     #region Normalizer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/Normalizer.html"/>
     /// </summary>
     public partial class Normalizer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Normalizer>
     {
@@ -1006,7 +1006,7 @@ public Normalizer(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Form
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.Form.html"/>
+        /// <see href="https://developer.android.com/reference/java/text/Normalizer.Form.html"/>
         /// </summary>
         public partial class Form : Java.Lang.Enum<Java.Text.Normalizer.Form>
         {
@@ -1054,7 +1054,7 @@ public Form(params object[] args) : base(args) { }
 
     #region NumberFormat
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html"/>
     /// </summary>
     public partial class NumberFormat : Java.Text.Format
     {
@@ -1062,12 +1062,12 @@ public partial class NumberFormat : Java.Text.Format
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NumberFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NumberFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NumberFormat() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NumberFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NumberFormat class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NumberFormat(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1096,7 +1096,7 @@ public NumberFormat(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Field
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html"/>
         /// </summary>
         public partial class Field : Java.Text.Format.Field
         {
@@ -1144,7 +1144,7 @@ public Field(params object[] args) : base(args) { }
 
     #region ParseException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/ParseException.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/ParseException.html"/>
     /// </summary>
     public partial class ParseException : Java.Lang.Exception
     {
@@ -1161,7 +1161,7 @@ public partial class ParseException : Java.Lang.Exception
 
     #region ParsePosition
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/ParsePosition.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/ParsePosition.html"/>
     /// </summary>
     public partial class ParsePosition : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ParsePosition>
     {
@@ -1205,7 +1205,7 @@ public ParsePosition(params object[] args) : base(args) { }
 
     #region RuleBasedCollator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/RuleBasedCollator.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/RuleBasedCollator.html"/>
     /// </summary>
     public partial class RuleBasedCollator : Java.Text.Collator
     {
@@ -1249,7 +1249,7 @@ public RuleBasedCollator(params object[] args) : base(args) { }
 
     #region SimpleDateFormat
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html"/>
     /// </summary>
     public partial class SimpleDateFormat : Java.Text.DateFormat
     {
@@ -1293,7 +1293,7 @@ public SimpleDateFormat(params object[] args) : base(args) { }
 
     #region StringCharacterIterator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html"/>
     /// </summary>
     public partial class StringCharacterIterator : Java.Text.CharacterIterator
     {
diff --git a/src/net/Netdroid/Generated/Java/Text/Annotation.cs b/src/net/Netdroid/Generated/Java/Text/Annotation.cs
index 57e4e187b..f4f949b92 100644
--- a/src/net/Netdroid/Generated/Java/Text/Annotation.cs
+++ b/src/net/Netdroid/Generated/Java/Text/Annotation.cs
@@ -30,7 +30,7 @@ public partial class Annotation
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Annotation.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Annotation.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public Annotation(object arg0)
@@ -54,11 +54,12 @@ public Annotation(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Annotation.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/Annotation.html#getValue()"/>
         /// </summary>
-        public object Value
+        /// <returns><see cref="object"/></returns>
+        public object GetValue()
         {
-            get { return IExecuteWithSignature("getValue", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature("getValue", "()Ljava/lang/Object;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Text/AttributedCharacterIterator.cs b/src/net/Netdroid/Generated/Java/Text/AttributedCharacterIterator.cs
index fd9a30c45..12ca9e980 100644
--- a/src/net/Netdroid/Generated/Java/Text/AttributedCharacterIterator.cs
+++ b/src/net/Netdroid/Generated/Java/Text/AttributedCharacterIterator.cs
@@ -64,35 +64,15 @@ public partial class AttributedCharacterIterator : Java.Text.IAttributedCharacte
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getAllAttributeKeys()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getRunLimit()"/>
         /// </summary>
-        public Java.Util.Set<Java.Text.AttributedCharacterIterator.Attribute> AllAttributeKeys
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Text.AttributedCharacterIterator.Attribute>>("getAllAttributeKeys", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getAttributes()"/> 
-        /// </summary>
-        public Java.Util.Map<Java.Text.AttributedCharacterIterator.Attribute, object> Attributes
-        {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Text.AttributedCharacterIterator.Attribute, object>>("getAttributes", "()Ljava/util/Map;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getRunLimit()"/> 
-        /// </summary>
-        public int RunLimit
-        {
-            get { return IExecuteWithSignature<int>("getRunLimit", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getRunStart()"/> 
-        /// </summary>
-        public int RunStart
+        /// <returns><see cref="int"/></returns>
+        public int GetRunLimit()
         {
-            get { return IExecuteWithSignature<int>("getRunStart", "()I"); }
+            return IExecuteWithSignature<int>("getRunLimit", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getRunLimit(java.text.AttributedCharacterIterator.Attribute)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getRunLimit(java.text.AttributedCharacterIterator.Attribute)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></param>
         /// <returns><see cref="int"/></returns>
@@ -101,17 +81,25 @@ public int GetRunLimit(Java.Text.AttributedCharacterIterator.Attribute arg0)
             return IExecuteWithSignature<int>("getRunLimit", "(Ljava/text/AttributedCharacterIterator$Attribute;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getRunLimit(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getRunLimit(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <typeparam name="Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int GetRunLimit<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute>(Java.Util.Set<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute> arg0) where Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute: Java.Text.AttributedCharacterIterator.Attribute
+        public int GetRunLimit<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute>(Java.Util.Set<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute> arg0) where Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute : Java.Text.AttributedCharacterIterator.Attribute
         {
             return IExecuteWithSignature<int>("getRunLimit", "(Ljava/util/Set;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getRunStart(java.text.AttributedCharacterIterator.Attribute)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getRunStart()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRunStart()
+        {
+            return IExecuteWithSignature<int>("getRunStart", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getRunStart(java.text.AttributedCharacterIterator.Attribute)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></param>
         /// <returns><see cref="int"/></returns>
@@ -120,17 +108,17 @@ public int GetRunStart(Java.Text.AttributedCharacterIterator.Attribute arg0)
             return IExecuteWithSignature<int>("getRunStart", "(Ljava/text/AttributedCharacterIterator$Attribute;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getRunStart(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getRunStart(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <typeparam name="Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int GetRunStart<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute>(Java.Util.Set<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute> arg0) where Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute: Java.Text.AttributedCharacterIterator.Attribute
+        public int GetRunStart<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute>(Java.Util.Set<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute> arg0) where Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute : Java.Text.AttributedCharacterIterator.Attribute
         {
             return IExecuteWithSignature<int>("getRunStart", "(Ljava/util/Set;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.html#getAttribute(java.text.AttributedCharacterIterator.Attribute)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getAttribute(java.text.AttributedCharacterIterator.Attribute)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></param>
         /// <returns><see cref="object"/></returns>
@@ -138,6 +126,22 @@ public object GetAttribute(Java.Text.AttributedCharacterIterator.Attribute arg0)
         {
             return IExecuteWithSignature("getAttribute", "(Ljava/text/AttributedCharacterIterator$Attribute;)Ljava/lang/Object;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getAttributes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Text.AttributedCharacterIterator.Attribute, object> GetAttributes()
+        {
+            return IExecuteWithSignature<Java.Util.Map<Java.Text.AttributedCharacterIterator.Attribute, object>>("getAttributes", "()Ljava/util/Map;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.html#getAllAttributeKeys()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Text.AttributedCharacterIterator.Attribute> GetAllAttributeKeys()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Text.AttributedCharacterIterator.Attribute>>("getAllAttributeKeys", "()Ljava/util/Set;");
+        }
 
         #endregion
 
@@ -155,19 +159,19 @@ public partial class Attribute
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.Attribute.html#INPUT_METHOD_SEGMENT"/>
+            /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.Attribute.html#INPUT_METHOD_SEGMENT"/>
             /// </summary>
             public static Java.Text.AttributedCharacterIterator.Attribute INPUT_METHOD_SEGMENT { get { if (!_INPUT_METHOD_SEGMENTReady) { _INPUT_METHOD_SEGMENTContent = SGetField<Java.Text.AttributedCharacterIterator.Attribute>(LocalBridgeClazz, "INPUT_METHOD_SEGMENT"); _INPUT_METHOD_SEGMENTReady = true; } return _INPUT_METHOD_SEGMENTContent; } }
             private static Java.Text.AttributedCharacterIterator.Attribute _INPUT_METHOD_SEGMENTContent = default;
             private static bool _INPUT_METHOD_SEGMENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.Attribute.html#LANGUAGE"/>
+            /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.Attribute.html#LANGUAGE"/>
             /// </summary>
             public static Java.Text.AttributedCharacterIterator.Attribute LANGUAGE { get { if (!_LANGUAGEReady) { _LANGUAGEContent = SGetField<Java.Text.AttributedCharacterIterator.Attribute>(LocalBridgeClazz, "LANGUAGE"); _LANGUAGEReady = true; } return _LANGUAGEContent; } }
             private static Java.Text.AttributedCharacterIterator.Attribute _LANGUAGEContent = default;
             private static bool _LANGUAGEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedCharacterIterator.Attribute.html#READING"/>
+            /// <see href="https://developer.android.com/reference/java/text/AttributedCharacterIterator.Attribute.html#READING"/>
             /// </summary>
             public static Java.Text.AttributedCharacterIterator.Attribute READING { get { if (!_READINGReady) { _READINGContent = SGetField<Java.Text.AttributedCharacterIterator.Attribute>(LocalBridgeClazz, "READING"); _READINGReady = true; } return _READINGContent; } }
             private static Java.Text.AttributedCharacterIterator.Attribute _READINGContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Text/AttributedString.cs b/src/net/Netdroid/Generated/Java/Text/AttributedString.cs
index 6e0f8cfc9..d70d6ca81 100644
--- a/src/net/Netdroid/Generated/Java/Text/AttributedString.cs
+++ b/src/net/Netdroid/Generated/Java/Text/AttributedString.cs
@@ -30,7 +30,7 @@ public partial class AttributedString
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#%3Cinit%3E(java.lang.String,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#%3Cinit%3E(java.lang.String,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -39,7 +39,7 @@ public AttributedString(Java.Lang.String arg0, Java.Util.Map arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public AttributedString(Java.Lang.String arg0)
@@ -47,7 +47,7 @@ public AttributedString(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#%3Cinit%3E(java.text.AttributedCharacterIterator,int,int,java.text.AttributedCharacterIterator.Attribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#%3Cinit%3E(java.text.AttributedCharacterIterator,int,int,java.text.AttributedCharacterIterator.Attribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -58,7 +58,7 @@ public AttributedString(Java.Text.AttributedCharacterIterator arg0, int arg1, in
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#%3Cinit%3E(java.text.AttributedCharacterIterator,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#%3Cinit%3E(java.text.AttributedCharacterIterator,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -68,7 +68,7 @@ public AttributedString(Java.Text.AttributedCharacterIterator arg0, int arg1, in
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#%3Cinit%3E(java.text.AttributedCharacterIterator)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#%3Cinit%3E(java.text.AttributedCharacterIterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator"/></param>
         public AttributedString(Java.Text.AttributedCharacterIterator arg0)
@@ -92,14 +92,15 @@ public AttributedString(Java.Text.AttributedCharacterIterator arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#getIterator()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#getIterator()"/>
         /// </summary>
-        public Java.Text.AttributedCharacterIterator Iterator
+        /// <returns><see cref="Java.Text.AttributedCharacterIterator"/></returns>
+        public Java.Text.AttributedCharacterIterator GetIterator()
         {
-            get { return IExecuteWithSignature<Java.Text.AttributedCharacterIterator>("getIterator", "()Ljava/text/AttributedCharacterIterator;"); }
+            return IExecuteWithSignature<Java.Text.AttributedCharacterIterator>("getIterator", "()Ljava/text/AttributedCharacterIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#getIterator(java.text.AttributedCharacterIterator.Attribute[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#getIterator(java.text.AttributedCharacterIterator.Attribute[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -110,7 +111,7 @@ public Java.Text.AttributedCharacterIterator GetIterator(Java.Text.AttributedCha
             return IExecute<Java.Text.AttributedCharacterIterator>("getIterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#getIterator(java.text.AttributedCharacterIterator.Attribute[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#getIterator(java.text.AttributedCharacterIterator.Attribute[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></param>
         /// <returns><see cref="Java.Text.AttributedCharacterIterator"/></returns>
@@ -119,7 +120,7 @@ public Java.Text.AttributedCharacterIterator GetIterator(Java.Text.AttributedCha
             return IExecuteWithSignature<Java.Text.AttributedCharacterIterator>("getIterator", "([Ljava/text/AttributedCharacterIterator$Attribute;)Ljava/text/AttributedCharacterIterator;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#addAttribute(java.text.AttributedCharacterIterator.Attribute,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#addAttribute(java.text.AttributedCharacterIterator.Attribute,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -130,7 +131,7 @@ public void AddAttribute(Java.Text.AttributedCharacterIterator.Attribute arg0, o
             IExecute("addAttribute", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#addAttribute(java.text.AttributedCharacterIterator.Attribute,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#addAttribute(java.text.AttributedCharacterIterator.Attribute,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -139,13 +140,13 @@ public void AddAttribute(Java.Text.AttributedCharacterIterator.Attribute arg0, o
             IExecute("addAttribute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/AttributedString.html#addAttributes(java.util.Map,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/AttributedString.html#addAttributes(java.util.Map,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <typeparam name="Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute"><see cref="Java.Text.AttributedCharacterIterator.Attribute"/></typeparam>
-        public void AddAttributes<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute>(Java.Util.Map<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute, object> arg0, int arg1, int arg2) where Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute: Java.Text.AttributedCharacterIterator.Attribute
+        public void AddAttributes<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute>(Java.Util.Map<Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute, object> arg0, int arg1, int arg2) where Arg0ExtendsJava_Text_AttributedCharacterIterator_Attribute : Java.Text.AttributedCharacterIterator.Attribute
         {
             IExecute("addAttributes", arg0, arg1, arg2);
         }
diff --git a/src/net/Netdroid/Generated/Java/Text/Bidi.cs b/src/net/Netdroid/Generated/Java/Text/Bidi.cs
index fc74304dd..ea38dd828 100644
--- a/src/net/Netdroid/Generated/Java/Text/Bidi.cs
+++ b/src/net/Netdroid/Generated/Java/Text/Bidi.cs
@@ -30,7 +30,7 @@ public partial class Bidi
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#%3Cinit%3E(char[],int,byte[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#%3Cinit%3E(char[],int,byte[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -43,7 +43,7 @@ public Bidi(char[] arg0, int arg1, byte[] arg2, int arg3, int arg4, int arg5)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#%3Cinit%3E(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#%3Cinit%3E(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -52,7 +52,7 @@ public Bidi(Java.Lang.String arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#%3Cinit%3E(java.text.AttributedCharacterIterator)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#%3Cinit%3E(java.text.AttributedCharacterIterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.AttributedCharacterIterator"/></param>
         public Bidi(Java.Text.AttributedCharacterIterator arg0)
@@ -68,25 +68,25 @@ public Bidi(Java.Text.AttributedCharacterIterator arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#DIRECTION_DEFAULT_LEFT_TO_RIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#DIRECTION_DEFAULT_LEFT_TO_RIGHT"/>
         /// </summary>
         public static int DIRECTION_DEFAULT_LEFT_TO_RIGHT { get { if (!_DIRECTION_DEFAULT_LEFT_TO_RIGHTReady) { _DIRECTION_DEFAULT_LEFT_TO_RIGHTContent = SGetField<int>(LocalBridgeClazz, "DIRECTION_DEFAULT_LEFT_TO_RIGHT"); _DIRECTION_DEFAULT_LEFT_TO_RIGHTReady = true; } return _DIRECTION_DEFAULT_LEFT_TO_RIGHTContent; } }
         private static int _DIRECTION_DEFAULT_LEFT_TO_RIGHTContent = default;
         private static bool _DIRECTION_DEFAULT_LEFT_TO_RIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#DIRECTION_DEFAULT_RIGHT_TO_LEFT"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#DIRECTION_DEFAULT_RIGHT_TO_LEFT"/>
         /// </summary>
         public static int DIRECTION_DEFAULT_RIGHT_TO_LEFT { get { if (!_DIRECTION_DEFAULT_RIGHT_TO_LEFTReady) { _DIRECTION_DEFAULT_RIGHT_TO_LEFTContent = SGetField<int>(LocalBridgeClazz, "DIRECTION_DEFAULT_RIGHT_TO_LEFT"); _DIRECTION_DEFAULT_RIGHT_TO_LEFTReady = true; } return _DIRECTION_DEFAULT_RIGHT_TO_LEFTContent; } }
         private static int _DIRECTION_DEFAULT_RIGHT_TO_LEFTContent = default;
         private static bool _DIRECTION_DEFAULT_RIGHT_TO_LEFTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#DIRECTION_LEFT_TO_RIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#DIRECTION_LEFT_TO_RIGHT"/>
         /// </summary>
         public static int DIRECTION_LEFT_TO_RIGHT { get { if (!_DIRECTION_LEFT_TO_RIGHTReady) { _DIRECTION_LEFT_TO_RIGHTContent = SGetField<int>(LocalBridgeClazz, "DIRECTION_LEFT_TO_RIGHT"); _DIRECTION_LEFT_TO_RIGHTReady = true; } return _DIRECTION_LEFT_TO_RIGHTContent; } }
         private static int _DIRECTION_LEFT_TO_RIGHTContent = default;
         private static bool _DIRECTION_LEFT_TO_RIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#DIRECTION_RIGHT_TO_LEFT"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#DIRECTION_RIGHT_TO_LEFT"/>
         /// </summary>
         public static int DIRECTION_RIGHT_TO_LEFT { get { if (!_DIRECTION_RIGHT_TO_LEFTReady) { _DIRECTION_RIGHT_TO_LEFTContent = SGetField<int>(LocalBridgeClazz, "DIRECTION_RIGHT_TO_LEFT"); _DIRECTION_RIGHT_TO_LEFTReady = true; } return _DIRECTION_RIGHT_TO_LEFTContent; } }
         private static int _DIRECTION_RIGHT_TO_LEFTContent = default;
@@ -96,7 +96,7 @@ public Bidi(Java.Text.AttributedCharacterIterator arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#requiresBidi(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#requiresBidi(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -107,7 +107,7 @@ public static bool RequiresBidi(char[] arg0, int arg1, int arg2)
             return SExecute<bool>(LocalBridgeClazz, "requiresBidi", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#reorderVisually(byte[],int,java.lang.Object[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#reorderVisually(byte[],int,java.lang.Object[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -123,28 +123,7 @@ public static void ReorderVisually(byte[] arg0, int arg1, object[] arg2, int arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#getBaseLevel()"/> 
-        /// </summary>
-        public int BaseLevel
-        {
-            get { return IExecuteWithSignature<int>("getBaseLevel", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#getLength()"/> 
-        /// </summary>
-        public int Length
-        {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#getRunCount()"/> 
-        /// </summary>
-        public int RunCount
-        {
-            get { return IExecuteWithSignature<int>("getRunCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#baseIsLeftToRight()"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#baseIsLeftToRight()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool BaseIsLeftToRight()
@@ -152,7 +131,7 @@ public bool BaseIsLeftToRight()
             return IExecuteWithSignature<bool>("baseIsLeftToRight", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#isLeftToRight()"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#isLeftToRight()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLeftToRight()
@@ -160,7 +139,7 @@ public bool IsLeftToRight()
             return IExecuteWithSignature<bool>("isLeftToRight", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#isMixed()"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#isMixed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMixed()
@@ -168,7 +147,7 @@ public bool IsMixed()
             return IExecuteWithSignature<bool>("isMixed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#isRightToLeft()"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#isRightToLeft()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsRightToLeft()
@@ -176,7 +155,23 @@ public bool IsRightToLeft()
             return IExecuteWithSignature<bool>("isRightToLeft", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#getLevelAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#getBaseLevel()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBaseLevel()
+        {
+            return IExecuteWithSignature<int>("getBaseLevel", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
+        {
+            return IExecuteWithSignature<int>("getLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#getLevelAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -185,7 +180,15 @@ public int GetLevelAt(int arg0)
             return IExecuteWithSignature<int>("getLevelAt", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#getRunLevel(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#getRunCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRunCount()
+        {
+            return IExecuteWithSignature<int>("getRunCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#getRunLevel(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -194,7 +197,7 @@ public int GetRunLevel(int arg0)
             return IExecuteWithSignature<int>("getRunLevel", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#getRunLimit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#getRunLimit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -203,7 +206,7 @@ public int GetRunLimit(int arg0)
             return IExecuteWithSignature<int>("getRunLimit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#getRunStart(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#getRunStart(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -212,7 +215,7 @@ public int GetRunStart(int arg0)
             return IExecuteWithSignature<int>("getRunStart", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Bidi.html#createLineBidi(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Bidi.html#createLineBidi(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Text/BreakIterator.cs b/src/net/Netdroid/Generated/Java/Text/BreakIterator.cs
index 31cfc3c57..bbfafa16d 100644
--- a/src/net/Netdroid/Generated/Java/Text/BreakIterator.cs
+++ b/src/net/Netdroid/Generated/Java/Text/BreakIterator.cs
@@ -38,7 +38,7 @@ public partial class BreakIterator
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#DONE"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#DONE"/>
         /// </summary>
         public static int DONE { get { if (!_DONEReady) { _DONEContent = SGetField<int>(LocalBridgeClazz, "DONE"); _DONEReady = true; } return _DONEContent; } }
         private static int _DONEContent = default;
@@ -48,89 +48,87 @@ public partial class BreakIterator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getCharacterInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
+        /// <returns><see cref="Java.Text.BreakIterator"/></returns>
+        public static Java.Text.BreakIterator GetCharacterInstance()
         {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
+            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getCharacterInstance", "()Ljava/text/BreakIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getCharacterInstance()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getCharacterInstance(java.util.Locale)"/>
         /// </summary>
-        public static Java.Text.BreakIterator CharacterInstance
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Text.BreakIterator"/></returns>
+        public static Java.Text.BreakIterator GetCharacterInstance(Java.Util.Locale arg0)
         {
-            get { return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getCharacterInstance", "()Ljava/text/BreakIterator;"); }
+            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getCharacterInstance", "(Ljava/util/Locale;)Ljava/text/BreakIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getLineInstance()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getLineInstance()"/>
         /// </summary>
-        public static Java.Text.BreakIterator LineInstance
+        /// <returns><see cref="Java.Text.BreakIterator"/></returns>
+        public static Java.Text.BreakIterator GetLineInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getLineInstance", "()Ljava/text/BreakIterator;"); }
+            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getLineInstance", "()Ljava/text/BreakIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getSentenceInstance()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getLineInstance(java.util.Locale)"/>
         /// </summary>
-        public static Java.Text.BreakIterator SentenceInstance
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Text.BreakIterator"/></returns>
+        public static Java.Text.BreakIterator GetLineInstance(Java.Util.Locale arg0)
         {
-            get { return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getSentenceInstance", "()Ljava/text/BreakIterator;"); }
+            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getLineInstance", "(Ljava/util/Locale;)Ljava/text/BreakIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getWordInstance()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getSentenceInstance()"/>
         /// </summary>
-        public static Java.Text.BreakIterator WordInstance
+        /// <returns><see cref="Java.Text.BreakIterator"/></returns>
+        public static Java.Text.BreakIterator GetSentenceInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getWordInstance", "()Ljava/text/BreakIterator;"); }
+            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getSentenceInstance", "()Ljava/text/BreakIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getCharacterInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getSentenceInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.BreakIterator"/></returns>
-        public static Java.Text.BreakIterator GetCharacterInstance(Java.Util.Locale arg0)
+        public static Java.Text.BreakIterator GetSentenceInstance(Java.Util.Locale arg0)
         {
-            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getCharacterInstance", "(Ljava/util/Locale;)Ljava/text/BreakIterator;", arg0);
+            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getSentenceInstance", "(Ljava/util/Locale;)Ljava/text/BreakIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getLineInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getWordInstance()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.BreakIterator"/></returns>
-        public static Java.Text.BreakIterator GetLineInstance(Java.Util.Locale arg0)
+        public static Java.Text.BreakIterator GetWordInstance()
         {
-            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getLineInstance", "(Ljava/util/Locale;)Ljava/text/BreakIterator;", arg0);
+            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getWordInstance", "()Ljava/text/BreakIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getSentenceInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getWordInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.BreakIterator"/></returns>
-        public static Java.Text.BreakIterator GetSentenceInstance(Java.Util.Locale arg0)
+        public static Java.Text.BreakIterator GetWordInstance(Java.Util.Locale arg0)
         {
-            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getSentenceInstance", "(Ljava/util/Locale;)Ljava/text/BreakIterator;", arg0);
+            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getWordInstance", "(Ljava/util/Locale;)Ljava/text/BreakIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getWordInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getAvailableLocales()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
-        /// <returns><see cref="Java.Text.BreakIterator"/></returns>
-        public static Java.Text.BreakIterator GetWordInstance(Java.Util.Locale arg0)
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            return SExecuteWithSignature<Java.Text.BreakIterator>(LocalBridgeClazz, "getWordInstance", "(Ljava/util/Locale;)Ljava/text/BreakIterator;", arg0);
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#getText()"/> 
-        /// </summary>
-        public Java.Text.CharacterIterator Text
-        {
-            get { return IExecuteWithSignature<Java.Text.CharacterIterator>("getText", "()Ljava/text/CharacterIterator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#current()"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#current()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Current()
@@ -138,7 +136,7 @@ public int Current()
             return IExecuteWithSignature<int>("current", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#first()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int First()
@@ -146,7 +144,7 @@ public int First()
             return IExecuteWithSignature<int>("first", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#following(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#following(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -155,7 +153,7 @@ public int Following(int arg0)
             return IExecuteWithSignature<int>("following", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#last()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Last()
@@ -163,7 +161,7 @@ public int Last()
             return IExecuteWithSignature<int>("last", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#next()"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#next()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Next()
@@ -171,7 +169,7 @@ public int Next()
             return IExecuteWithSignature<int>("next", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#next(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#next(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -180,7 +178,7 @@ public int Next(int arg0)
             return IExecuteWithSignature<int>("next", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#previous()"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#previous()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Previous()
@@ -188,7 +186,15 @@ public int Previous()
             return IExecuteWithSignature<int>("previous", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#setText(java.text.CharacterIterator)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.CharacterIterator"/></returns>
+        public Java.Text.CharacterIterator GetText()
+        {
+            return IExecuteWithSignature<Java.Text.CharacterIterator>("getText", "()Ljava/text/CharacterIterator;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#setText(java.text.CharacterIterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.CharacterIterator"/></param>
         public void SetText(Java.Text.CharacterIterator arg0)
@@ -196,7 +202,7 @@ public void SetText(Java.Text.CharacterIterator arg0)
             IExecuteWithSignature("setText", "(Ljava/text/CharacterIterator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#isBoundary(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#isBoundary(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -205,7 +211,7 @@ public bool IsBoundary(int arg0)
             return IExecuteWithSignature<bool>("isBoundary", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#preceding(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#preceding(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -214,7 +220,7 @@ public int Preceding(int arg0)
             return IExecuteWithSignature<int>("preceding", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/BreakIterator.html#setText(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/BreakIterator.html#setText(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void SetText(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Text/CharacterIterator.cs b/src/net/Netdroid/Generated/Java/Text/CharacterIterator.cs
index c9ec045da..56e342774 100644
--- a/src/net/Netdroid/Generated/Java/Text/CharacterIterator.cs
+++ b/src/net/Netdroid/Generated/Java/Text/CharacterIterator.cs
@@ -56,7 +56,7 @@ public partial class CharacterIterator : Java.Text.ICharacterIterator
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#DONE"/>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#DONE"/>
         /// </summary>
         public static char DONE { get { if (!_DONEReady) { _DONEContent = SGetField<char>(LocalBridgeClazz, "DONE"); _DONEReady = true; } return _DONEContent; } }
         private static char _DONEContent = default;
@@ -70,28 +70,7 @@ public partial class CharacterIterator : Java.Text.ICharacterIterator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#getBeginIndex()"/> 
-        /// </summary>
-        public int BeginIndex
-        {
-            get { return IExecuteWithSignature<int>("getBeginIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#getEndIndex()"/> 
-        /// </summary>
-        public int EndIndex
-        {
-            get { return IExecuteWithSignature<int>("getEndIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#getIndex()"/> 
-        /// </summary>
-        public int Index
-        {
-            get { return IExecuteWithSignature<int>("getIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#current()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#current()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Current()
@@ -99,7 +78,7 @@ public char Current()
             return IExecuteWithSignature<char>("current", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#first()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char First()
@@ -107,7 +86,7 @@ public char First()
             return IExecuteWithSignature<char>("first", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#last()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Last()
@@ -115,7 +94,7 @@ public char Last()
             return IExecuteWithSignature<char>("last", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#next()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#next()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Next()
@@ -123,7 +102,7 @@ public char Next()
             return IExecuteWithSignature<char>("next", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#previous()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#previous()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Previous()
@@ -131,7 +110,7 @@ public char Previous()
             return IExecuteWithSignature<char>("previous", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CharacterIterator.html#setIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#setIndex(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -139,6 +118,30 @@ public char SetIndex(int arg0)
         {
             return IExecuteWithSignature<char>("setIndex", "(I)C", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#getBeginIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBeginIndex()
+        {
+            return IExecuteWithSignature<int>("getBeginIndex", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#getEndIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetEndIndex()
+        {
+            return IExecuteWithSignature<int>("getEndIndex", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/CharacterIterator.html#getIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIndex()
+        {
+            return IExecuteWithSignature<int>("getIndex", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Text/ChoiceFormat.cs b/src/net/Netdroid/Generated/Java/Text/ChoiceFormat.cs
index af4d32b2e..57fae2ada 100644
--- a/src/net/Netdroid/Generated/Java/Text/ChoiceFormat.cs
+++ b/src/net/Netdroid/Generated/Java/Text/ChoiceFormat.cs
@@ -30,7 +30,7 @@ public partial class ChoiceFormat
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#%3Cinit%3E(double[],java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#%3Cinit%3E(double[],java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public ChoiceFormat(double[] arg0, Java.Lang.String[] arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public ChoiceFormat(Java.Lang.String arg0)
@@ -59,7 +59,7 @@ public ChoiceFormat(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#nextDouble(double,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#nextDouble(double,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -69,7 +69,7 @@ public static double NextDouble(double arg0, bool arg1)
             return SExecute<double>(LocalBridgeClazz, "nextDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#nextDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#nextDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -78,7 +78,7 @@ public static double NextDouble(double arg0)
             return SExecuteWithSignature<double>(LocalBridgeClazz, "nextDouble", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#previousDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#previousDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -91,21 +91,23 @@ public static double PreviousDouble(double arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#getFormats()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#getLimits()"/>
         /// </summary>
-        public object[] Formats
+        /// <returns><see cref="double"/></returns>
+        public double[] GetLimits()
         {
-            get { return IExecuteWithSignatureArray<object>("getFormats", "()[Ljava/lang/Object;"); }
+            return IExecuteWithSignatureArray<double>("getLimits", "()[D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#getLimits()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#getFormats()"/>
         /// </summary>
-        public double[] Limits
+        /// <returns><see cref="object"/></returns>
+        public object[] GetFormats()
         {
-            get { return IExecuteWithSignatureArray<double>("getLimits", "()[D"); }
+            return IExecuteWithSignatureArray<object>("getFormats", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#toPattern()"/>
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#toPattern()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToPattern()
@@ -113,7 +115,7 @@ public Java.Lang.String ToPattern()
             return IExecuteWithSignature<Java.Lang.String>("toPattern", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#applyPattern(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#applyPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void ApplyPattern(Java.Lang.String arg0)
@@ -121,7 +123,7 @@ public void ApplyPattern(Java.Lang.String arg0)
             IExecuteWithSignature("applyPattern", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ChoiceFormat.html#setChoices(double[],java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/ChoiceFormat.html#setChoices(double[],java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Text/CollationElementIterator.cs b/src/net/Netdroid/Generated/Java/Text/CollationElementIterator.cs
index 461430bc0..3ba4d94eb 100644
--- a/src/net/Netdroid/Generated/Java/Text/CollationElementIterator.cs
+++ b/src/net/Netdroid/Generated/Java/Text/CollationElementIterator.cs
@@ -38,7 +38,7 @@ public partial class CollationElementIterator
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#NULLORDER"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#NULLORDER"/>
         /// </summary>
         public static int NULLORDER { get { if (!_NULLORDERReady) { _NULLORDERContent = SGetField<int>(LocalBridgeClazz, "NULLORDER"); _NULLORDERReady = true; } return _NULLORDERContent; } }
         private static int _NULLORDERContent = default;
@@ -48,7 +48,7 @@ public partial class CollationElementIterator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#primaryOrder(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#primaryOrder(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -57,7 +57,7 @@ public static int PrimaryOrder(int arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "primaryOrder", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#secondaryOrder(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#secondaryOrder(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="short"/></returns>
@@ -66,7 +66,7 @@ public static short SecondaryOrder(int arg0)
             return SExecuteWithSignature<short>(LocalBridgeClazz, "secondaryOrder", "(I)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#tertiaryOrder(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#tertiaryOrder(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="short"/></returns>
@@ -79,23 +79,24 @@ public static short TertiaryOrder(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#getOffset()"/> <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#setOffset(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#getMaxExpansion(int)"/>
         /// </summary>
-        public int Offset
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxExpansion(int arg0)
         {
-            get { return IExecuteWithSignature<int>("getOffset", "()I"); } set { IExecuteWithSignature("setOffset", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxExpansion", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#getMaxExpansion(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#getOffset()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        public int GetMaxExpansion(int arg0)
+        public int GetOffset()
         {
-            return IExecuteWithSignature<int>("getMaxExpansion", "(I)I", arg0);
+            return IExecuteWithSignature<int>("getOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#next()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#next()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Next()
@@ -103,7 +104,7 @@ public int Next()
             return IExecuteWithSignature<int>("next", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#previous()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#previous()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Previous()
@@ -111,14 +112,22 @@ public int Previous()
             return IExecuteWithSignature<int>("previous", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#setText(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#setOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOffset(int arg0)
+        {
+            IExecuteWithSignature("setOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#setText(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void SetText(Java.Lang.String arg0)
@@ -126,7 +135,7 @@ public void SetText(Java.Lang.String arg0)
             IExecuteWithSignature("setText", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationElementIterator.html#setText(java.text.CharacterIterator)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationElementIterator.html#setText(java.text.CharacterIterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.CharacterIterator"/></param>
         public void SetText(Java.Text.CharacterIterator arg0)
diff --git a/src/net/Netdroid/Generated/Java/Text/CollationKey.cs b/src/net/Netdroid/Generated/Java/Text/CollationKey.cs
index 92e97cc82..ba202b55f 100644
--- a/src/net/Netdroid/Generated/Java/Text/CollationKey.cs
+++ b/src/net/Netdroid/Generated/Java/Text/CollationKey.cs
@@ -46,14 +46,7 @@ public partial class CollationKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationKey.html#getSourceString()"/> 
-        /// </summary>
-        public Java.Lang.String SourceString
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSourceString", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationKey.html#toByteArray()"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationKey.html#toByteArray()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte[] ToByteArray()
@@ -61,7 +54,7 @@ public byte[] ToByteArray()
             return IExecuteWithSignatureArray<byte>("toByteArray", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationKey.html#compareTo(java.text.CollationKey)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationKey.html#compareTo(java.text.CollationKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.CollationKey"/></param>
         /// <returns><see cref="int"/></returns>
@@ -70,7 +63,7 @@ public int CompareTo(Java.Text.CollationKey arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/text/CollationKey;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/CollationKey.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/text/CollationKey.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -78,6 +71,14 @@ public int CompareTo(object arg0)
         {
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/CollationKey.html#getSourceString()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSourceString()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSourceString", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Text/Collator.cs b/src/net/Netdroid/Generated/Java/Text/Collator.cs
index 27c9bf832..032ee83f8 100644
--- a/src/net/Netdroid/Generated/Java/Text/Collator.cs
+++ b/src/net/Netdroid/Generated/Java/Text/Collator.cs
@@ -42,43 +42,43 @@ public partial class Collator : Java.Lang.ICloneable
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#CANONICAL_DECOMPOSITION"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#CANONICAL_DECOMPOSITION"/>
         /// </summary>
         public static int CANONICAL_DECOMPOSITION { get { if (!_CANONICAL_DECOMPOSITIONReady) { _CANONICAL_DECOMPOSITIONContent = SGetField<int>(LocalBridgeClazz, "CANONICAL_DECOMPOSITION"); _CANONICAL_DECOMPOSITIONReady = true; } return _CANONICAL_DECOMPOSITIONContent; } }
         private static int _CANONICAL_DECOMPOSITIONContent = default;
         private static bool _CANONICAL_DECOMPOSITIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#FULL_DECOMPOSITION"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#FULL_DECOMPOSITION"/>
         /// </summary>
         public static int FULL_DECOMPOSITION { get { if (!_FULL_DECOMPOSITIONReady) { _FULL_DECOMPOSITIONContent = SGetField<int>(LocalBridgeClazz, "FULL_DECOMPOSITION"); _FULL_DECOMPOSITIONReady = true; } return _FULL_DECOMPOSITIONContent; } }
         private static int _FULL_DECOMPOSITIONContent = default;
         private static bool _FULL_DECOMPOSITIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#IDENTICAL"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#IDENTICAL"/>
         /// </summary>
         public static int IDENTICAL { get { if (!_IDENTICALReady) { _IDENTICALContent = SGetField<int>(LocalBridgeClazz, "IDENTICAL"); _IDENTICALReady = true; } return _IDENTICALContent; } }
         private static int _IDENTICALContent = default;
         private static bool _IDENTICALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#NO_DECOMPOSITION"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#NO_DECOMPOSITION"/>
         /// </summary>
         public static int NO_DECOMPOSITION { get { if (!_NO_DECOMPOSITIONReady) { _NO_DECOMPOSITIONContent = SGetField<int>(LocalBridgeClazz, "NO_DECOMPOSITION"); _NO_DECOMPOSITIONReady = true; } return _NO_DECOMPOSITIONContent; } }
         private static int _NO_DECOMPOSITIONContent = default;
         private static bool _NO_DECOMPOSITIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#PRIMARY"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#PRIMARY"/>
         /// </summary>
         public static int PRIMARY { get { if (!_PRIMARYReady) { _PRIMARYContent = SGetField<int>(LocalBridgeClazz, "PRIMARY"); _PRIMARYReady = true; } return _PRIMARYContent; } }
         private static int _PRIMARYContent = default;
         private static bool _PRIMARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#SECONDARY"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#SECONDARY"/>
         /// </summary>
         public static int SECONDARY { get { if (!_SECONDARYReady) { _SECONDARYContent = SGetField<int>(LocalBridgeClazz, "SECONDARY"); _SECONDARYReady = true; } return _SECONDARYContent; } }
         private static int _SECONDARYContent = default;
         private static bool _SECONDARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#TERTIARY"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#TERTIARY"/>
         /// </summary>
         public static int TERTIARY { get { if (!_TERTIARYReady) { _TERTIARYContent = SGetField<int>(LocalBridgeClazz, "TERTIARY"); _TERTIARYReady = true; } return _TERTIARYContent; } }
         private static int _TERTIARYContent = default;
@@ -88,21 +88,7 @@ public partial class Collator : Java.Lang.ICloneable
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#getAvailableLocales()"/> 
-        /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#getInstance()"/> 
-        /// </summary>
-        public static Java.Text.Collator Instance
-        {
-            get { return SExecuteWithSignature<Java.Text.Collator>(LocalBridgeClazz, "getInstance", "()Ljava/text/Collator;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#getInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.Collator"/></returns>
@@ -110,26 +96,28 @@ public static Java.Text.Collator GetInstance(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<Java.Text.Collator>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Ljava/text/Collator;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#getDecomposition()"/> <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#setDecomposition(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#getInstance()"/>
         /// </summary>
-        public int Decomposition
+        /// <returns><see cref="Java.Text.Collator"/></returns>
+        public static Java.Text.Collator GetInstance()
         {
-            get { return IExecuteWithSignature<int>("getDecomposition", "()I"); } set { IExecuteWithSignature("setDecomposition", "(I)V", value); }
+            return SExecuteWithSignature<Java.Text.Collator>(LocalBridgeClazz, "getInstance", "()Ljava/text/Collator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#getStrength()"/> <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#setStrength(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#getAvailableLocales()"/>
         /// </summary>
-        public int Strength
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignature<int>("getStrength", "()I"); } set { IExecuteWithSignature("setStrength", "(I)V", value); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#compare(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#compare(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -139,7 +127,7 @@ public int Compare(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<int>("compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#getCollationKey(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#getCollationKey(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Text.CollationKey"/></returns>
@@ -148,7 +136,7 @@ public Java.Text.CollationKey GetCollationKey(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Text.CollationKey>("getCollationKey", "(Ljava/lang/String;)Ljava/text/CollationKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#equals(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#equals(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -158,7 +146,7 @@ public bool Equals(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Collator.html#compare(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#compare(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -167,6 +155,38 @@ public int Compare(object arg0, object arg1)
         {
             return IExecute<int>("compare", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#getDecomposition()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDecomposition()
+        {
+            return IExecuteWithSignature<int>("getDecomposition", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#getStrength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStrength()
+        {
+            return IExecuteWithSignature<int>("getStrength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#setDecomposition(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDecomposition(int arg0)
+        {
+            IExecuteWithSignature("setDecomposition", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/Collator.html#setStrength(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetStrength(int arg0)
+        {
+            IExecuteWithSignature("setStrength", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Text/DateFormat.cs b/src/net/Netdroid/Generated/Java/Text/DateFormat.cs
index 3746a5f8b..2fec41ac3 100644
--- a/src/net/Netdroid/Generated/Java/Text/DateFormat.cs
+++ b/src/net/Netdroid/Generated/Java/Text/DateFormat.cs
@@ -38,139 +38,139 @@ public partial class DateFormat
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#AM_PM_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#AM_PM_FIELD"/>
         /// </summary>
         public static int AM_PM_FIELD { get { if (!_AM_PM_FIELDReady) { _AM_PM_FIELDContent = SGetField<int>(LocalBridgeClazz, "AM_PM_FIELD"); _AM_PM_FIELDReady = true; } return _AM_PM_FIELDContent; } }
         private static int _AM_PM_FIELDContent = default;
         private static bool _AM_PM_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#DATE_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#DATE_FIELD"/>
         /// </summary>
         public static int DATE_FIELD { get { if (!_DATE_FIELDReady) { _DATE_FIELDContent = SGetField<int>(LocalBridgeClazz, "DATE_FIELD"); _DATE_FIELDReady = true; } return _DATE_FIELDContent; } }
         private static int _DATE_FIELDContent = default;
         private static bool _DATE_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#DAY_OF_WEEK_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#DAY_OF_WEEK_FIELD"/>
         /// </summary>
         public static int DAY_OF_WEEK_FIELD { get { if (!_DAY_OF_WEEK_FIELDReady) { _DAY_OF_WEEK_FIELDContent = SGetField<int>(LocalBridgeClazz, "DAY_OF_WEEK_FIELD"); _DAY_OF_WEEK_FIELDReady = true; } return _DAY_OF_WEEK_FIELDContent; } }
         private static int _DAY_OF_WEEK_FIELDContent = default;
         private static bool _DAY_OF_WEEK_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#DAY_OF_WEEK_IN_MONTH_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#DAY_OF_WEEK_IN_MONTH_FIELD"/>
         /// </summary>
         public static int DAY_OF_WEEK_IN_MONTH_FIELD { get { if (!_DAY_OF_WEEK_IN_MONTH_FIELDReady) { _DAY_OF_WEEK_IN_MONTH_FIELDContent = SGetField<int>(LocalBridgeClazz, "DAY_OF_WEEK_IN_MONTH_FIELD"); _DAY_OF_WEEK_IN_MONTH_FIELDReady = true; } return _DAY_OF_WEEK_IN_MONTH_FIELDContent; } }
         private static int _DAY_OF_WEEK_IN_MONTH_FIELDContent = default;
         private static bool _DAY_OF_WEEK_IN_MONTH_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#DAY_OF_YEAR_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#DAY_OF_YEAR_FIELD"/>
         /// </summary>
         public static int DAY_OF_YEAR_FIELD { get { if (!_DAY_OF_YEAR_FIELDReady) { _DAY_OF_YEAR_FIELDContent = SGetField<int>(LocalBridgeClazz, "DAY_OF_YEAR_FIELD"); _DAY_OF_YEAR_FIELDReady = true; } return _DAY_OF_YEAR_FIELDContent; } }
         private static int _DAY_OF_YEAR_FIELDContent = default;
         private static bool _DAY_OF_YEAR_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#DEFAULT"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#DEFAULT"/>
         /// </summary>
         public static int DEFAULT { get { if (!_DEFAULTReady) { _DEFAULTContent = SGetField<int>(LocalBridgeClazz, "DEFAULT"); _DEFAULTReady = true; } return _DEFAULTContent; } }
         private static int _DEFAULTContent = default;
         private static bool _DEFAULTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#ERA_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#ERA_FIELD"/>
         /// </summary>
         public static int ERA_FIELD { get { if (!_ERA_FIELDReady) { _ERA_FIELDContent = SGetField<int>(LocalBridgeClazz, "ERA_FIELD"); _ERA_FIELDReady = true; } return _ERA_FIELDContent; } }
         private static int _ERA_FIELDContent = default;
         private static bool _ERA_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#FULL"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#FULL"/>
         /// </summary>
         public static int FULL { get { if (!_FULLReady) { _FULLContent = SGetField<int>(LocalBridgeClazz, "FULL"); _FULLReady = true; } return _FULLContent; } }
         private static int _FULLContent = default;
         private static bool _FULLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#HOUR_OF_DAY0_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#HOUR_OF_DAY0_FIELD"/>
         /// </summary>
         public static int HOUR_OF_DAY0_FIELD { get { if (!_HOUR_OF_DAY0_FIELDReady) { _HOUR_OF_DAY0_FIELDContent = SGetField<int>(LocalBridgeClazz, "HOUR_OF_DAY0_FIELD"); _HOUR_OF_DAY0_FIELDReady = true; } return _HOUR_OF_DAY0_FIELDContent; } }
         private static int _HOUR_OF_DAY0_FIELDContent = default;
         private static bool _HOUR_OF_DAY0_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#HOUR_OF_DAY1_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#HOUR_OF_DAY1_FIELD"/>
         /// </summary>
         public static int HOUR_OF_DAY1_FIELD { get { if (!_HOUR_OF_DAY1_FIELDReady) { _HOUR_OF_DAY1_FIELDContent = SGetField<int>(LocalBridgeClazz, "HOUR_OF_DAY1_FIELD"); _HOUR_OF_DAY1_FIELDReady = true; } return _HOUR_OF_DAY1_FIELDContent; } }
         private static int _HOUR_OF_DAY1_FIELDContent = default;
         private static bool _HOUR_OF_DAY1_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#HOUR0_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#HOUR0_FIELD"/>
         /// </summary>
         public static int HOUR0_FIELD { get { if (!_HOUR0_FIELDReady) { _HOUR0_FIELDContent = SGetField<int>(LocalBridgeClazz, "HOUR0_FIELD"); _HOUR0_FIELDReady = true; } return _HOUR0_FIELDContent; } }
         private static int _HOUR0_FIELDContent = default;
         private static bool _HOUR0_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#HOUR1_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#HOUR1_FIELD"/>
         /// </summary>
         public static int HOUR1_FIELD { get { if (!_HOUR1_FIELDReady) { _HOUR1_FIELDContent = SGetField<int>(LocalBridgeClazz, "HOUR1_FIELD"); _HOUR1_FIELDReady = true; } return _HOUR1_FIELDContent; } }
         private static int _HOUR1_FIELDContent = default;
         private static bool _HOUR1_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#LONG"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#LONG"/>
         /// </summary>
         public static int LONG { get { if (!_LONGReady) { _LONGContent = SGetField<int>(LocalBridgeClazz, "LONG"); _LONGReady = true; } return _LONGContent; } }
         private static int _LONGContent = default;
         private static bool _LONGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#MEDIUM"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#MEDIUM"/>
         /// </summary>
         public static int MEDIUM { get { if (!_MEDIUMReady) { _MEDIUMContent = SGetField<int>(LocalBridgeClazz, "MEDIUM"); _MEDIUMReady = true; } return _MEDIUMContent; } }
         private static int _MEDIUMContent = default;
         private static bool _MEDIUMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#MILLISECOND_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#MILLISECOND_FIELD"/>
         /// </summary>
         public static int MILLISECOND_FIELD { get { if (!_MILLISECOND_FIELDReady) { _MILLISECOND_FIELDContent = SGetField<int>(LocalBridgeClazz, "MILLISECOND_FIELD"); _MILLISECOND_FIELDReady = true; } return _MILLISECOND_FIELDContent; } }
         private static int _MILLISECOND_FIELDContent = default;
         private static bool _MILLISECOND_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#MINUTE_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#MINUTE_FIELD"/>
         /// </summary>
         public static int MINUTE_FIELD { get { if (!_MINUTE_FIELDReady) { _MINUTE_FIELDContent = SGetField<int>(LocalBridgeClazz, "MINUTE_FIELD"); _MINUTE_FIELDReady = true; } return _MINUTE_FIELDContent; } }
         private static int _MINUTE_FIELDContent = default;
         private static bool _MINUTE_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#MONTH_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#MONTH_FIELD"/>
         /// </summary>
         public static int MONTH_FIELD { get { if (!_MONTH_FIELDReady) { _MONTH_FIELDContent = SGetField<int>(LocalBridgeClazz, "MONTH_FIELD"); _MONTH_FIELDReady = true; } return _MONTH_FIELDContent; } }
         private static int _MONTH_FIELDContent = default;
         private static bool _MONTH_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#SECOND_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#SECOND_FIELD"/>
         /// </summary>
         public static int SECOND_FIELD { get { if (!_SECOND_FIELDReady) { _SECOND_FIELDContent = SGetField<int>(LocalBridgeClazz, "SECOND_FIELD"); _SECOND_FIELDReady = true; } return _SECOND_FIELDContent; } }
         private static int _SECOND_FIELDContent = default;
         private static bool _SECOND_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#SHORT"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#SHORT"/>
         /// </summary>
         public static int SHORT { get { if (!_SHORTReady) { _SHORTContent = SGetField<int>(LocalBridgeClazz, "SHORT"); _SHORTReady = true; } return _SHORTContent; } }
         private static int _SHORTContent = default;
         private static bool _SHORTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#TIMEZONE_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#TIMEZONE_FIELD"/>
         /// </summary>
         public static int TIMEZONE_FIELD { get { if (!_TIMEZONE_FIELDReady) { _TIMEZONE_FIELDContent = SGetField<int>(LocalBridgeClazz, "TIMEZONE_FIELD"); _TIMEZONE_FIELDReady = true; } return _TIMEZONE_FIELDContent; } }
         private static int _TIMEZONE_FIELDContent = default;
         private static bool _TIMEZONE_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#WEEK_OF_MONTH_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#WEEK_OF_MONTH_FIELD"/>
         /// </summary>
         public static int WEEK_OF_MONTH_FIELD { get { if (!_WEEK_OF_MONTH_FIELDReady) { _WEEK_OF_MONTH_FIELDContent = SGetField<int>(LocalBridgeClazz, "WEEK_OF_MONTH_FIELD"); _WEEK_OF_MONTH_FIELDReady = true; } return _WEEK_OF_MONTH_FIELDContent; } }
         private static int _WEEK_OF_MONTH_FIELDContent = default;
         private static bool _WEEK_OF_MONTH_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#WEEK_OF_YEAR_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#WEEK_OF_YEAR_FIELD"/>
         /// </summary>
         public static int WEEK_OF_YEAR_FIELD { get { if (!_WEEK_OF_YEAR_FIELDReady) { _WEEK_OF_YEAR_FIELDContent = SGetField<int>(LocalBridgeClazz, "WEEK_OF_YEAR_FIELD"); _WEEK_OF_YEAR_FIELDReady = true; } return _WEEK_OF_YEAR_FIELDContent; } }
         private static int _WEEK_OF_YEAR_FIELDContent = default;
         private static bool _WEEK_OF_YEAR_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#YEAR_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#YEAR_FIELD"/>
         /// </summary>
         public static int YEAR_FIELD { get { if (!_YEAR_FIELDReady) { _YEAR_FIELDContent = SGetField<int>(LocalBridgeClazz, "YEAR_FIELD"); _YEAR_FIELDReady = true; } return _YEAR_FIELDContent; } }
         private static int _YEAR_FIELDContent = default;
@@ -180,42 +180,15 @@ public partial class DateFormat
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getDateInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getDateInstance()"/> 
-        /// </summary>
-        public static Java.Text.DateFormat DateInstance
-        {
-            get { return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getDateInstance", "()Ljava/text/DateFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getDateTimeInstance()"/> 
-        /// </summary>
-        public static Java.Text.DateFormat DateTimeInstance
-        {
-            get { return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getDateTimeInstance", "()Ljava/text/DateFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getInstance()"/> 
-        /// </summary>
-        public static Java.Text.DateFormat Instance
-        {
-            get { return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getInstance", "()Ljava/text/DateFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getTimeInstance()"/> 
-        /// </summary>
-        public static Java.Text.DateFormat TimeInstance
+        /// <returns><see cref="Java.Text.DateFormat"/></returns>
+        public static Java.Text.DateFormat GetDateInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", "()Ljava/text/DateFormat;"); }
+            return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getDateInstance", "()Ljava/text/DateFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getDateInstance(int,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getDateInstance(int,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -225,7 +198,7 @@ public static Java.Text.DateFormat GetDateInstance(int arg0, Java.Util.Locale ar
             return SExecute<Java.Text.DateFormat>(LocalBridgeClazz, "getDateInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getDateInstance(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getDateInstance(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Text.DateFormat"/></returns>
@@ -234,7 +207,15 @@ public static Java.Text.DateFormat GetDateInstance(int arg0)
             return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getDateInstance", "(I)Ljava/text/DateFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getDateTimeInstance(int,int,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getDateTimeInstance()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.DateFormat"/></returns>
+        public static Java.Text.DateFormat GetDateTimeInstance()
+        {
+            return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getDateTimeInstance", "()Ljava/text/DateFormat;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getDateTimeInstance(int,int,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -245,7 +226,7 @@ public static Java.Text.DateFormat GetDateTimeInstance(int arg0, int arg1, Java.
             return SExecute<Java.Text.DateFormat>(LocalBridgeClazz, "getDateTimeInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getDateTimeInstance(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getDateTimeInstance(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -255,51 +236,54 @@ public static Java.Text.DateFormat GetDateTimeInstance(int arg0, int arg1)
             return SExecute<Java.Text.DateFormat>(LocalBridgeClazz, "getDateTimeInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getTimeInstance(int,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getInstance()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.DateFormat"/></returns>
-        public static Java.Text.DateFormat GetTimeInstance(int arg0, Java.Util.Locale arg1)
+        public static Java.Text.DateFormat GetInstance()
         {
-            return SExecute<Java.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", arg0, arg1);
+            return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getInstance", "()Ljava/text/DateFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getTimeInstance(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getTimeInstance()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Text.DateFormat"/></returns>
-        public static Java.Text.DateFormat GetTimeInstance(int arg0)
+        public static Java.Text.DateFormat GetTimeInstance()
         {
-            return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", "(I)Ljava/text/DateFormat;", arg0);
+            return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", "()Ljava/text/DateFormat;");
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getCalendar()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#setCalendar(java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getTimeInstance(int,java.util.Locale)"/>
         /// </summary>
-        public Java.Util.Calendar Calendar
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Text.DateFormat"/></returns>
+        public static Java.Text.DateFormat GetTimeInstance(int arg0, Java.Util.Locale arg1)
         {
-            get { return IExecuteWithSignature<Java.Util.Calendar>("getCalendar", "()Ljava/util/Calendar;"); } set { IExecuteWithSignature("setCalendar", "(Ljava/util/Calendar;)V", value); }
+            return SExecute<Java.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getNumberFormat()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#setNumberFormat(java.text.NumberFormat)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getTimeInstance(int)"/>
         /// </summary>
-        public Java.Text.NumberFormat NumberFormat
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Java.Text.DateFormat"/></returns>
+        public static Java.Text.DateFormat GetTimeInstance(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Text.NumberFormat>("getNumberFormat", "()Ljava/text/NumberFormat;"); } set { IExecuteWithSignature("setNumberFormat", "(Ljava/text/NumberFormat;)V", value); }
+            return SExecuteWithSignature<Java.Text.DateFormat>(LocalBridgeClazz, "getTimeInstance", "(I)Ljava/text/DateFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#getTimeZone()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#setTimeZone(java.util.TimeZone)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getAvailableLocales()"/>
         /// </summary>
-        public Java.Util.TimeZone TimeZone
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignature<Java.Util.TimeZone>("getTimeZone", "()Ljava/util/TimeZone;"); } set { IExecuteWithSignature("setTimeZone", "(Ljava/util/TimeZone;)V", value); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#format(java.util.Date,java.lang.StringBuffer,java.text.FieldPosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#format(java.util.Date,java.lang.StringBuffer,java.text.FieldPosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         /// <param name="arg1"><see cref="Java.Lang.StringBuffer"/></param>
@@ -310,7 +294,7 @@ public Java.Lang.StringBuffer Format(Java.Util.Date arg0, Java.Lang.StringBuffer
             return IExecute<Java.Lang.StringBuffer>("format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#parse(java.lang.String,java.text.ParsePosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#parse(java.lang.String,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Text.ParsePosition"/></param>
@@ -320,7 +304,7 @@ public Java.Util.Date Parse(Java.Lang.String arg0, Java.Text.ParsePosition arg1)
             return IExecute<Java.Util.Date>("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#isLenient()"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#isLenient()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLenient()
@@ -328,7 +312,7 @@ public bool IsLenient()
             return IExecuteWithSignature<bool>("isLenient", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#format(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#format(java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -337,7 +321,23 @@ public Java.Lang.String Format(Java.Util.Date arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/util/Date;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getNumberFormat()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.NumberFormat"/></returns>
+        public Java.Text.NumberFormat GetNumberFormat()
+        {
+            return IExecuteWithSignature<Java.Text.NumberFormat>("getNumberFormat", "()Ljava/text/NumberFormat;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getCalendar()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Calendar"/></returns>
+        public Java.Util.Calendar GetCalendar()
+        {
+            return IExecuteWithSignature<Java.Util.Calendar>("getCalendar", "()Ljava/util/Calendar;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Date"/></returns>
@@ -347,13 +347,45 @@ public Java.Util.Date Parse(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Date>("parse", "(Ljava/lang/String;)Ljava/util/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.html#setLenient(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#getTimeZone()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.TimeZone"/></returns>
+        public Java.Util.TimeZone GetTimeZone()
+        {
+            return IExecuteWithSignature<Java.Util.TimeZone>("getTimeZone", "()Ljava/util/TimeZone;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#setCalendar(java.util.Calendar)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Calendar"/></param>
+        public void SetCalendar(Java.Util.Calendar arg0)
+        {
+            IExecuteWithSignature("setCalendar", "(Ljava/util/Calendar;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#setLenient(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetLenient(bool arg0)
         {
             IExecuteWithSignature("setLenient", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#setNumberFormat(java.text.NumberFormat)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Text.NumberFormat"/></param>
+        public void SetNumberFormat(Java.Text.NumberFormat arg0)
+        {
+            IExecuteWithSignature("setNumberFormat", "(Ljava/text/NumberFormat;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormat.html#setTimeZone(java.util.TimeZone)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
+        public void SetTimeZone(Java.Util.TimeZone arg0)
+        {
+            IExecuteWithSignature("setTimeZone", "(Ljava/util/TimeZone;)V", arg0);
+        }
 
         #endregion
 
@@ -371,109 +403,109 @@ public partial class Field
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#AM_PM"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#AM_PM"/>
             /// </summary>
             public static Java.Text.DateFormat.Field AM_PM { get { if (!_AM_PMReady) { _AM_PMContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "AM_PM"); _AM_PMReady = true; } return _AM_PMContent; } }
             private static Java.Text.DateFormat.Field _AM_PMContent = default;
             private static bool _AM_PMReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#DAY_OF_MONTH"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#DAY_OF_MONTH"/>
             /// </summary>
             public static Java.Text.DateFormat.Field DAY_OF_MONTH { get { if (!_DAY_OF_MONTHReady) { _DAY_OF_MONTHContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "DAY_OF_MONTH"); _DAY_OF_MONTHReady = true; } return _DAY_OF_MONTHContent; } }
             private static Java.Text.DateFormat.Field _DAY_OF_MONTHContent = default;
             private static bool _DAY_OF_MONTHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#DAY_OF_WEEK"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#DAY_OF_WEEK"/>
             /// </summary>
             public static Java.Text.DateFormat.Field DAY_OF_WEEK { get { if (!_DAY_OF_WEEKReady) { _DAY_OF_WEEKContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "DAY_OF_WEEK"); _DAY_OF_WEEKReady = true; } return _DAY_OF_WEEKContent; } }
             private static Java.Text.DateFormat.Field _DAY_OF_WEEKContent = default;
             private static bool _DAY_OF_WEEKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#DAY_OF_WEEK_IN_MONTH"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#DAY_OF_WEEK_IN_MONTH"/>
             /// </summary>
             public static Java.Text.DateFormat.Field DAY_OF_WEEK_IN_MONTH { get { if (!_DAY_OF_WEEK_IN_MONTHReady) { _DAY_OF_WEEK_IN_MONTHContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "DAY_OF_WEEK_IN_MONTH"); _DAY_OF_WEEK_IN_MONTHReady = true; } return _DAY_OF_WEEK_IN_MONTHContent; } }
             private static Java.Text.DateFormat.Field _DAY_OF_WEEK_IN_MONTHContent = default;
             private static bool _DAY_OF_WEEK_IN_MONTHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#DAY_OF_YEAR"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#DAY_OF_YEAR"/>
             /// </summary>
             public static Java.Text.DateFormat.Field DAY_OF_YEAR { get { if (!_DAY_OF_YEARReady) { _DAY_OF_YEARContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "DAY_OF_YEAR"); _DAY_OF_YEARReady = true; } return _DAY_OF_YEARContent; } }
             private static Java.Text.DateFormat.Field _DAY_OF_YEARContent = default;
             private static bool _DAY_OF_YEARReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#ERA"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#ERA"/>
             /// </summary>
             public static Java.Text.DateFormat.Field ERA { get { if (!_ERAReady) { _ERAContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "ERA"); _ERAReady = true; } return _ERAContent; } }
             private static Java.Text.DateFormat.Field _ERAContent = default;
             private static bool _ERAReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#HOUR_OF_DAY0"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#HOUR_OF_DAY0"/>
             /// </summary>
             public static Java.Text.DateFormat.Field HOUR_OF_DAY0 { get { if (!_HOUR_OF_DAY0Ready) { _HOUR_OF_DAY0Content = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "HOUR_OF_DAY0"); _HOUR_OF_DAY0Ready = true; } return _HOUR_OF_DAY0Content; } }
             private static Java.Text.DateFormat.Field _HOUR_OF_DAY0Content = default;
             private static bool _HOUR_OF_DAY0Ready = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#HOUR_OF_DAY1"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#HOUR_OF_DAY1"/>
             /// </summary>
             public static Java.Text.DateFormat.Field HOUR_OF_DAY1 { get { if (!_HOUR_OF_DAY1Ready) { _HOUR_OF_DAY1Content = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "HOUR_OF_DAY1"); _HOUR_OF_DAY1Ready = true; } return _HOUR_OF_DAY1Content; } }
             private static Java.Text.DateFormat.Field _HOUR_OF_DAY1Content = default;
             private static bool _HOUR_OF_DAY1Ready = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#HOUR0"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#HOUR0"/>
             /// </summary>
             public static Java.Text.DateFormat.Field HOUR0 { get { if (!_HOUR0Ready) { _HOUR0Content = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "HOUR0"); _HOUR0Ready = true; } return _HOUR0Content; } }
             private static Java.Text.DateFormat.Field _HOUR0Content = default;
             private static bool _HOUR0Ready = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#HOUR1"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#HOUR1"/>
             /// </summary>
             public static Java.Text.DateFormat.Field HOUR1 { get { if (!_HOUR1Ready) { _HOUR1Content = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "HOUR1"); _HOUR1Ready = true; } return _HOUR1Content; } }
             private static Java.Text.DateFormat.Field _HOUR1Content = default;
             private static bool _HOUR1Ready = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#MILLISECOND"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#MILLISECOND"/>
             /// </summary>
             public static Java.Text.DateFormat.Field MILLISECOND { get { if (!_MILLISECONDReady) { _MILLISECONDContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "MILLISECOND"); _MILLISECONDReady = true; } return _MILLISECONDContent; } }
             private static Java.Text.DateFormat.Field _MILLISECONDContent = default;
             private static bool _MILLISECONDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#MINUTE"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#MINUTE"/>
             /// </summary>
             public static Java.Text.DateFormat.Field MINUTE { get { if (!_MINUTEReady) { _MINUTEContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "MINUTE"); _MINUTEReady = true; } return _MINUTEContent; } }
             private static Java.Text.DateFormat.Field _MINUTEContent = default;
             private static bool _MINUTEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#MONTH"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#MONTH"/>
             /// </summary>
             public static Java.Text.DateFormat.Field MONTH { get { if (!_MONTHReady) { _MONTHContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "MONTH"); _MONTHReady = true; } return _MONTHContent; } }
             private static Java.Text.DateFormat.Field _MONTHContent = default;
             private static bool _MONTHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#SECOND"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#SECOND"/>
             /// </summary>
             public static Java.Text.DateFormat.Field SECOND { get { if (!_SECONDReady) { _SECONDContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "SECOND"); _SECONDReady = true; } return _SECONDContent; } }
             private static Java.Text.DateFormat.Field _SECONDContent = default;
             private static bool _SECONDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#TIME_ZONE"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#TIME_ZONE"/>
             /// </summary>
             public static Java.Text.DateFormat.Field TIME_ZONE { get { if (!_TIME_ZONEReady) { _TIME_ZONEContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "TIME_ZONE"); _TIME_ZONEReady = true; } return _TIME_ZONEContent; } }
             private static Java.Text.DateFormat.Field _TIME_ZONEContent = default;
             private static bool _TIME_ZONEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#WEEK_OF_MONTH"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#WEEK_OF_MONTH"/>
             /// </summary>
             public static Java.Text.DateFormat.Field WEEK_OF_MONTH { get { if (!_WEEK_OF_MONTHReady) { _WEEK_OF_MONTHContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "WEEK_OF_MONTH"); _WEEK_OF_MONTHReady = true; } return _WEEK_OF_MONTHContent; } }
             private static Java.Text.DateFormat.Field _WEEK_OF_MONTHContent = default;
             private static bool _WEEK_OF_MONTHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#WEEK_OF_YEAR"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#WEEK_OF_YEAR"/>
             /// </summary>
             public static Java.Text.DateFormat.Field WEEK_OF_YEAR { get { if (!_WEEK_OF_YEARReady) { _WEEK_OF_YEARContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "WEEK_OF_YEAR"); _WEEK_OF_YEARReady = true; } return _WEEK_OF_YEARContent; } }
             private static Java.Text.DateFormat.Field _WEEK_OF_YEARContent = default;
             private static bool _WEEK_OF_YEARReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#YEAR"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#YEAR"/>
             /// </summary>
             public static Java.Text.DateFormat.Field YEAR { get { if (!_YEARReady) { _YEARContent = SGetField<Java.Text.DateFormat.Field>(LocalBridgeClazz, "YEAR"); _YEARReady = true; } return _YEARContent; } }
             private static Java.Text.DateFormat.Field _YEARContent = default;
@@ -483,7 +515,7 @@ public partial class Field
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#ofCalendarField(int)"/>
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#ofCalendarField(int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Java.Text.DateFormat.Field"/></returns>
@@ -496,11 +528,12 @@ public static Java.Text.DateFormat.Field OfCalendarField(int arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormat.Field.html#getCalendarField()"/> 
+            /// <see href="https://developer.android.com/reference/java/text/DateFormat.Field.html#getCalendarField()"/>
             /// </summary>
-            public int CalendarField
+            /// <returns><see cref="int"/></returns>
+            public int GetCalendarField()
             {
-                get { return IExecuteWithSignature<int>("getCalendarField", "()I"); }
+                return IExecuteWithSignature<int>("getCalendarField", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Java/Text/DateFormatSymbols.cs b/src/net/Netdroid/Generated/Java/Text/DateFormatSymbols.cs
index b52736371..a9e81083a 100644
--- a/src/net/Netdroid/Generated/Java/Text/DateFormatSymbols.cs
+++ b/src/net/Netdroid/Generated/Java/Text/DateFormatSymbols.cs
@@ -30,7 +30,7 @@ public partial class DateFormatSymbols : Java.Io.ISerializable, Java.Lang.IClone
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#%3Cinit%3E(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#%3Cinit%3E(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         public DateFormatSymbols(Java.Util.Locale arg0)
@@ -58,21 +58,15 @@ public DateFormatSymbols(Java.Util.Locale arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getInstance()"/> 
-        /// </summary>
-        public static Java.Text.DateFormatSymbols Instance
+        /// <returns><see cref="Java.Text.DateFormatSymbols"/></returns>
+        public static Java.Text.DateFormatSymbols GetInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.DateFormatSymbols>(LocalBridgeClazz, "getInstance", "()Ljava/text/DateFormatSymbols;"); }
+            return SExecuteWithSignature<Java.Text.DateFormatSymbols>(LocalBridgeClazz, "getInstance", "()Ljava/text/DateFormatSymbols;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.DateFormatSymbols"/></returns>
@@ -80,65 +74,145 @@ public static Java.Text.DateFormatSymbols GetInstance(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<Java.Text.DateFormatSymbols>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Ljava/text/DateFormatSymbols;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getAvailableLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
+        {
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getAmPmStrings()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#setAmPmStrings(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getLocalPatternChars()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLocalPatternChars()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getLocalPatternChars", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getAmPmStrings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetAmPmStrings()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getAmPmStrings", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getEras()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEras()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEras", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getMonths()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetMonths()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getMonths", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getShortMonths()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetShortMonths()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getShortMonths", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getShortWeekdays()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetShortWeekdays()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getShortWeekdays", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getWeekdays()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetWeekdays()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getWeekdays", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#getZoneStrings()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetZoneStrings()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getZoneStrings", "()[[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#setAmPmStrings(java.lang.String[])"/>
         /// </summary>
-        public Java.Lang.String[] AmPmStrings
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetAmPmStrings(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getAmPmStrings", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setAmPmStrings", "([Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setAmPmStrings", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getEras()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#setEras(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#setEras(java.lang.String[])"/>
         /// </summary>
-        public Java.Lang.String[] Eras
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEras(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEras", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEras", "([Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setEras", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getLocalPatternChars()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#setLocalPatternChars(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#setLocalPatternChars(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String LocalPatternChars
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetLocalPatternChars(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocalPatternChars", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setLocalPatternChars", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setLocalPatternChars", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getMonths()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#setMonths(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#setMonths(java.lang.String[])"/>
         /// </summary>
-        public Java.Lang.String[] Months
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetMonths(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getMonths", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setMonths", "([Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setMonths", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getShortMonths()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#setShortMonths(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#setShortMonths(java.lang.String[])"/>
         /// </summary>
-        public Java.Lang.String[] ShortMonths
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetShortMonths(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getShortMonths", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setShortMonths", "([Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setShortMonths", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getShortWeekdays()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#setShortWeekdays(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#setShortWeekdays(java.lang.String[])"/>
         /// </summary>
-        public Java.Lang.String[] ShortWeekdays
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetShortWeekdays(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getShortWeekdays", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setShortWeekdays", "([Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setShortWeekdays", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getWeekdays()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#setWeekdays(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#setWeekdays(java.lang.String[])"/>
         /// </summary>
-        public Java.Lang.String[] Weekdays
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetWeekdays(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getWeekdays", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setWeekdays", "([Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setWeekdays", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#getZoneStrings()"/> <see href="https://developer.android.com/reference/java.base/java/text/DateFormatSymbols.html#setZoneStrings(java.lang.String[][])"/>
+        /// <see href="https://developer.android.com/reference/java/text/DateFormatSymbols.html#setZoneStrings(java.lang.String[][])"/>
         /// </summary>
-        public Java.Lang.String[] ZoneStrings
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetZoneStrings(Java.Lang.String[][] arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getZoneStrings", "()[[Ljava/lang/String;"); } set { IExecuteWithSignature("setZoneStrings", "([[Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setZoneStrings", "([[Ljava/lang/String;)V", new object[] { arg0 });
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Text/DecimalFormat.cs b/src/net/Netdroid/Generated/Java/Text/DecimalFormat.cs
index 1e84bbb0f..eea09a1ae 100644
--- a/src/net/Netdroid/Generated/Java/Text/DecimalFormat.cs
+++ b/src/net/Netdroid/Generated/Java/Text/DecimalFormat.cs
@@ -30,7 +30,7 @@ public partial class DecimalFormat
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#%3Cinit%3E(java.lang.String,java.text.DecimalFormatSymbols)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#%3Cinit%3E(java.lang.String,java.text.DecimalFormatSymbols)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Text.DecimalFormatSymbols"/></param>
@@ -39,7 +39,7 @@ public DecimalFormat(Java.Lang.String arg0, Java.Text.DecimalFormatSymbols arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public DecimalFormat(Java.Lang.String arg0)
@@ -63,72 +63,71 @@ public DecimalFormat(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#getDecimalFormatSymbols()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setDecimalFormatSymbols(java.text.DecimalFormatSymbols)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#isDecimalSeparatorAlwaysShown()"/>
         /// </summary>
-        public Java.Text.DecimalFormatSymbols DecimalFormatSymbols
-        {
-            get { return IExecuteWithSignature<Java.Text.DecimalFormatSymbols>("getDecimalFormatSymbols", "()Ljava/text/DecimalFormatSymbols;"); } set { IExecuteWithSignature("setDecimalFormatSymbols", "(Ljava/text/DecimalFormatSymbols;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#getGroupingSize()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setGroupingSize(int)"/>
-        /// </summary>
-        public int GroupingSize
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDecimalSeparatorAlwaysShown()
         {
-            get { return IExecuteWithSignature<int>("getGroupingSize", "()I"); } set { IExecuteWithSignature("setGroupingSize", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isDecimalSeparatorAlwaysShown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#getMultiplier()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setMultiplier(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#isParseBigDecimal()"/>
         /// </summary>
-        public int Multiplier
+        /// <returns><see cref="bool"/></returns>
+        public bool IsParseBigDecimal()
         {
-            get { return IExecuteWithSignature<int>("getMultiplier", "()I"); } set { IExecuteWithSignature("setMultiplier", "(I)V", value); }
+            return IExecuteWithSignature<bool>("isParseBigDecimal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#getNegativePrefix()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setNegativePrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#getGroupingSize()"/>
         /// </summary>
-        public Java.Lang.String NegativePrefix
+        /// <returns><see cref="int"/></returns>
+        public int GetGroupingSize()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNegativePrefix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNegativePrefix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getGroupingSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#getNegativeSuffix()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setNegativeSuffix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#getMultiplier()"/>
         /// </summary>
-        public Java.Lang.String NegativeSuffix
+        /// <returns><see cref="int"/></returns>
+        public int GetMultiplier()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNegativeSuffix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNegativeSuffix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getMultiplier", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#getPositivePrefix()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setPositivePrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#getNegativePrefix()"/>
         /// </summary>
-        public Java.Lang.String PositivePrefix
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNegativePrefix()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPositivePrefix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPositivePrefix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getNegativePrefix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#getPositiveSuffix()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setPositiveSuffix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#getNegativeSuffix()"/>
         /// </summary>
-        public Java.Lang.String PositiveSuffix
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNegativeSuffix()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPositiveSuffix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPositiveSuffix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getNegativeSuffix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#isDecimalSeparatorAlwaysShown()"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#getPositivePrefix()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDecimalSeparatorAlwaysShown()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPositivePrefix()
         {
-            return IExecuteWithSignature<bool>("isDecimalSeparatorAlwaysShown", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPositivePrefix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#isParseBigDecimal()"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#getPositiveSuffix()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsParseBigDecimal()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPositiveSuffix()
         {
-            return IExecuteWithSignature<bool>("isParseBigDecimal", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPositiveSuffix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#toLocalizedPattern()"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#toLocalizedPattern()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToLocalizedPattern()
@@ -136,7 +135,7 @@ public Java.Lang.String ToLocalizedPattern()
             return IExecuteWithSignature<Java.Lang.String>("toLocalizedPattern", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#toPattern()"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#toPattern()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToPattern()
@@ -144,7 +143,15 @@ public Java.Lang.String ToPattern()
             return IExecuteWithSignature<Java.Lang.String>("toPattern", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#applyLocalizedPattern(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#getDecimalFormatSymbols()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.DecimalFormatSymbols"/></returns>
+        public Java.Text.DecimalFormatSymbols GetDecimalFormatSymbols()
+        {
+            return IExecuteWithSignature<Java.Text.DecimalFormatSymbols>("getDecimalFormatSymbols", "()Ljava/text/DecimalFormatSymbols;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#applyLocalizedPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void ApplyLocalizedPattern(Java.Lang.String arg0)
@@ -152,7 +159,7 @@ public void ApplyLocalizedPattern(Java.Lang.String arg0)
             IExecuteWithSignature("applyLocalizedPattern", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#applyPattern(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#applyPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void ApplyPattern(Java.Lang.String arg0)
@@ -160,7 +167,15 @@ public void ApplyPattern(Java.Lang.String arg0)
             IExecuteWithSignature("applyPattern", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setDecimalSeparatorAlwaysShown(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setDecimalFormatSymbols(java.text.DecimalFormatSymbols)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Text.DecimalFormatSymbols"/></param>
+        public void SetDecimalFormatSymbols(Java.Text.DecimalFormatSymbols arg0)
+        {
+            IExecuteWithSignature("setDecimalFormatSymbols", "(Ljava/text/DecimalFormatSymbols;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setDecimalSeparatorAlwaysShown(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetDecimalSeparatorAlwaysShown(bool arg0)
@@ -168,13 +183,61 @@ public void SetDecimalSeparatorAlwaysShown(bool arg0)
             IExecuteWithSignature("setDecimalSeparatorAlwaysShown", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormat.html#setParseBigDecimal(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setGroupingSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetGroupingSize(int arg0)
+        {
+            IExecuteWithSignature("setGroupingSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setMultiplier(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMultiplier(int arg0)
+        {
+            IExecuteWithSignature("setMultiplier", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setNegativePrefix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNegativePrefix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setNegativePrefix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setNegativeSuffix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNegativeSuffix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setNegativeSuffix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setParseBigDecimal(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetParseBigDecimal(bool arg0)
         {
             IExecuteWithSignature("setParseBigDecimal", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setPositivePrefix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPositivePrefix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPositivePrefix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormat.html#setPositiveSuffix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPositiveSuffix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPositiveSuffix", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Text/DecimalFormatSymbols.cs b/src/net/Netdroid/Generated/Java/Text/DecimalFormatSymbols.cs
index aaf8d110a..55def3a17 100644
--- a/src/net/Netdroid/Generated/Java/Text/DecimalFormatSymbols.cs
+++ b/src/net/Netdroid/Generated/Java/Text/DecimalFormatSymbols.cs
@@ -30,7 +30,7 @@ public partial class DecimalFormatSymbols : Java.Lang.ICloneable, Java.Io.ISeria
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#%3Cinit%3E(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#%3Cinit%3E(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         public DecimalFormatSymbols(Java.Util.Locale arg0)
@@ -58,21 +58,15 @@ public DecimalFormatSymbols(Java.Util.Locale arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getInstance()"/> 
-        /// </summary>
-        public static Java.Text.DecimalFormatSymbols Instance
+        /// <returns><see cref="Java.Text.DecimalFormatSymbols"/></returns>
+        public static Java.Text.DecimalFormatSymbols GetInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.DecimalFormatSymbols>(LocalBridgeClazz, "getInstance", "()Ljava/text/DecimalFormatSymbols;"); }
+            return SExecuteWithSignature<Java.Text.DecimalFormatSymbols>(LocalBridgeClazz, "getInstance", "()Ljava/text/DecimalFormatSymbols;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.DecimalFormatSymbols"/></returns>
@@ -80,121 +74,257 @@ public static Java.Text.DecimalFormatSymbols GetInstance(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<Java.Text.DecimalFormatSymbols>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Ljava/text/DecimalFormatSymbols;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getAvailableLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
+        {
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getCurrency()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setCurrency(java.util.Currency)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getDecimalSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetDecimalSeparator()
+        {
+            return IExecuteWithSignature<char>("getDecimalSeparator", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getDigit()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetDigit()
+        {
+            return IExecuteWithSignature<char>("getDigit", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getGroupingSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetGroupingSeparator()
+        {
+            return IExecuteWithSignature<char>("getGroupingSeparator", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getMinusSign()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetMinusSign()
+        {
+            return IExecuteWithSignature<char>("getMinusSign", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getMonetaryDecimalSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetMonetaryDecimalSeparator()
+        {
+            return IExecuteWithSignature<char>("getMonetaryDecimalSeparator", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getPatternSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetPatternSeparator()
+        {
+            return IExecuteWithSignature<char>("getPatternSeparator", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getPercent()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetPercent()
+        {
+            return IExecuteWithSignature<char>("getPercent", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getPerMill()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetPerMill()
+        {
+            return IExecuteWithSignature<char>("getPerMill", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getZeroDigit()"/>
+        /// </summary>
+        /// <returns><see cref="char"/></returns>
+        public char GetZeroDigit()
+        {
+            return IExecuteWithSignature<char>("getZeroDigit", "()C");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getCurrencySymbol()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCurrencySymbol()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCurrencySymbol", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getExponentSeparator()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetExponentSeparator()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getExponentSeparator", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getInfinity()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInfinity()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInfinity", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getInternationalCurrencySymbol()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInternationalCurrencySymbol()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInternationalCurrencySymbol", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getNaN()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNaN()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNaN", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#getCurrency()"/>
         /// </summary>
-        public Java.Util.Currency Currency
+        /// <returns><see cref="Java.Util.Currency"/></returns>
+        public Java.Util.Currency GetCurrency()
         {
-            get { return IExecuteWithSignature<Java.Util.Currency>("getCurrency", "()Ljava/util/Currency;"); } set { IExecuteWithSignature("setCurrency", "(Ljava/util/Currency;)V", value); }
+            return IExecuteWithSignature<Java.Util.Currency>("getCurrency", "()Ljava/util/Currency;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getCurrencySymbol()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setCurrencySymbol(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setCurrency(java.util.Currency)"/>
         /// </summary>
-        public Java.Lang.String CurrencySymbol
+        /// <param name="arg0"><see cref="Java.Util.Currency"/></param>
+        public void SetCurrency(Java.Util.Currency arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCurrencySymbol", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCurrencySymbol", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setCurrency", "(Ljava/util/Currency;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getDecimalSeparator()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setDecimalSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setCurrencySymbol(java.lang.String)"/>
         /// </summary>
-        public char DecimalSeparator
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetCurrencySymbol(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<char>("getDecimalSeparator", "()C"); } set { IExecuteWithSignature("setDecimalSeparator", "(C)V", value); }
+            IExecuteWithSignature("setCurrencySymbol", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getDigit()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setDecimalSeparator(char)"/>
         /// </summary>
-        public char Digit
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetDecimalSeparator(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getDigit", "()C"); } set { IExecuteWithSignature("setDigit", "(C)V", value); }
+            IExecuteWithSignature("setDecimalSeparator", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getExponentSeparator()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setExponentSeparator(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setDigit(char)"/>
         /// </summary>
-        public Java.Lang.String ExponentSeparator
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetDigit(char arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getExponentSeparator", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setExponentSeparator", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setDigit", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getGroupingSeparator()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setGroupingSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setExponentSeparator(java.lang.String)"/>
         /// </summary>
-        public char GroupingSeparator
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetExponentSeparator(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<char>("getGroupingSeparator", "()C"); } set { IExecuteWithSignature("setGroupingSeparator", "(C)V", value); }
+            IExecuteWithSignature("setExponentSeparator", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getInfinity()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setInfinity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setGroupingSeparator(char)"/>
         /// </summary>
-        public Java.Lang.String Infinity
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetGroupingSeparator(char arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInfinity", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setInfinity", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setGroupingSeparator", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getInternationalCurrencySymbol()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setInternationalCurrencySymbol(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setInfinity(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String InternationalCurrencySymbol
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetInfinity(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInternationalCurrencySymbol", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setInternationalCurrencySymbol", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setInfinity", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getMinusSign()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setMinusSign(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setInternationalCurrencySymbol(java.lang.String)"/>
         /// </summary>
-        public char MinusSign
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetInternationalCurrencySymbol(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<char>("getMinusSign", "()C"); } set { IExecuteWithSignature("setMinusSign", "(C)V", value); }
+            IExecuteWithSignature("setInternationalCurrencySymbol", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getMonetaryDecimalSeparator()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setMonetaryDecimalSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setMinusSign(char)"/>
         /// </summary>
-        public char MonetaryDecimalSeparator
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetMinusSign(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getMonetaryDecimalSeparator", "()C"); } set { IExecuteWithSignature("setMonetaryDecimalSeparator", "(C)V", value); }
+            IExecuteWithSignature("setMinusSign", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getMonetaryGroupingSeparator()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setMonetaryGroupingSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setMonetaryDecimalSeparator(char)"/>
         /// </summary>
-        public char MonetaryGroupingSeparator
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetMonetaryDecimalSeparator(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getMonetaryGroupingSeparator", "()C"); } set { IExecuteWithSignature("setMonetaryGroupingSeparator", "(C)V", value); }
+            IExecuteWithSignature("setMonetaryDecimalSeparator", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getNaN()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setNaN(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setNaN(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String NaN
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNaN(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNaN", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNaN", "(Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setNaN", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getPatternSeparator()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setPatternSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setPatternSeparator(char)"/>
         /// </summary>
-        public char PatternSeparator
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPatternSeparator(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getPatternSeparator", "()C"); } set { IExecuteWithSignature("setPatternSeparator", "(C)V", value); }
+            IExecuteWithSignature("setPatternSeparator", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getPercent()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setPercent(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setPercent(char)"/>
         /// </summary>
-        public char Percent
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPercent(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getPercent", "()C"); } set { IExecuteWithSignature("setPercent", "(C)V", value); }
+            IExecuteWithSignature("setPercent", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getPerMill()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setPerMill(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setPerMill(char)"/>
         /// </summary>
-        public char PerMill
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPerMill(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getPerMill", "()C"); } set { IExecuteWithSignature("setPerMill", "(C)V", value); }
+            IExecuteWithSignature("setPerMill", "(C)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#getZeroDigit()"/> <see href="https://developer.android.com/reference/java.base/java/text/DecimalFormatSymbols.html#setZeroDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/java/text/DecimalFormatSymbols.html#setZeroDigit(char)"/>
         /// </summary>
-        public char ZeroDigit
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetZeroDigit(char arg0)
         {
-            get { return IExecuteWithSignature<char>("getZeroDigit", "()C"); } set { IExecuteWithSignature("setZeroDigit", "(C)V", value); }
+            IExecuteWithSignature("setZeroDigit", "(C)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Text/FieldPosition.cs b/src/net/Netdroid/Generated/Java/Text/FieldPosition.cs
index 14bcf8ea7..a0e968ed6 100644
--- a/src/net/Netdroid/Generated/Java/Text/FieldPosition.cs
+++ b/src/net/Netdroid/Generated/Java/Text/FieldPosition.cs
@@ -30,7 +30,7 @@ public partial class FieldPosition
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public FieldPosition(int arg0)
@@ -38,7 +38,7 @@ public FieldPosition(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#%3Cinit%3E(java.text.Format.Field,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#%3Cinit%3E(java.text.Format.Field,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.Format.Field"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -47,7 +47,7 @@ public FieldPosition(Java.Text.Format.Field arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#%3Cinit%3E(java.text.Format.Field)"/>
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#%3Cinit%3E(java.text.Format.Field)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.Format.Field"/></param>
         public FieldPosition(Java.Text.Format.Field arg0)
@@ -71,32 +71,52 @@ public FieldPosition(Java.Text.Format.Field arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#getBeginIndex()"/> <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#setBeginIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#getBeginIndex()"/>
         /// </summary>
-        public int BeginIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetBeginIndex()
         {
-            get { return IExecuteWithSignature<int>("getBeginIndex", "()I"); } set { IExecuteWithSignature("setBeginIndex", "(I)V", value); }
+            return IExecuteWithSignature<int>("getBeginIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#getEndIndex()"/> <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#setEndIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#getEndIndex()"/>
         /// </summary>
-        public int EndIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetEndIndex()
         {
-            get { return IExecuteWithSignature<int>("getEndIndex", "()I"); } set { IExecuteWithSignature("setEndIndex", "(I)V", value); }
+            return IExecuteWithSignature<int>("getEndIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#getField()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#getField()"/>
         /// </summary>
-        public int Field
+        /// <returns><see cref="int"/></returns>
+        public int GetField()
         {
-            get { return IExecuteWithSignature<int>("getField", "()I"); }
+            return IExecuteWithSignature<int>("getField", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/FieldPosition.html#getFieldAttribute()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#getFieldAttribute()"/>
         /// </summary>
-        public Java.Text.Format.Field FieldAttribute
+        /// <returns><see cref="Java.Text.Format.Field"/></returns>
+        public Java.Text.Format.Field GetFieldAttribute()
         {
-            get { return IExecuteWithSignature<Java.Text.Format.Field>("getFieldAttribute", "()Ljava/text/Format$Field;"); }
+            return IExecuteWithSignature<Java.Text.Format.Field>("getFieldAttribute", "()Ljava/text/Format$Field;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#setBeginIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetBeginIndex(int arg0)
+        {
+            IExecuteWithSignature("setBeginIndex", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/FieldPosition.html#setEndIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetEndIndex(int arg0)
+        {
+            IExecuteWithSignature("setEndIndex", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Text/Format.cs b/src/net/Netdroid/Generated/Java/Text/Format.cs
index 1c43777d1..9c345ae8d 100644
--- a/src/net/Netdroid/Generated/Java/Text/Format.cs
+++ b/src/net/Netdroid/Generated/Java/Text/Format.cs
@@ -54,7 +54,7 @@ public partial class Format : Java.Io.ISerializable, Java.Lang.ICloneable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Format.html#parseObject(java.lang.String,java.text.ParsePosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Format.html#parseObject(java.lang.String,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Text.ParsePosition"/></param>
@@ -64,7 +64,7 @@ public object ParseObject(Java.Lang.String arg0, Java.Text.ParsePosition arg1)
             return IExecute("parseObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Format.html#format(java.lang.Object,java.lang.StringBuffer,java.text.FieldPosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Format.html#format(java.lang.Object,java.lang.StringBuffer,java.text.FieldPosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.StringBuffer"/></param>
@@ -75,7 +75,7 @@ public Java.Lang.StringBuffer FormatMethod(object arg0, Java.Lang.StringBuffer a
             return IExecute<Java.Lang.StringBuffer>("format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Format.html#format(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Format.html#format(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -84,7 +84,7 @@ public Java.Lang.String FormatMethod(object arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/lang/Object;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Format.html#parseObject(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Format.html#parseObject(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -94,7 +94,7 @@ public object ParseObject(Java.Lang.String arg0)
             return IExecuteWithSignature("parseObject", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Format.html#formatToCharacterIterator(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Format.html#formatToCharacterIterator(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Text.AttributedCharacterIterator"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Text/MessageFormat.cs b/src/net/Netdroid/Generated/Java/Text/MessageFormat.cs
index 08918f97b..ab0baf1b6 100644
--- a/src/net/Netdroid/Generated/Java/Text/MessageFormat.cs
+++ b/src/net/Netdroid/Generated/Java/Text/MessageFormat.cs
@@ -30,7 +30,7 @@ public partial class MessageFormat
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#%3Cinit%3E(java.lang.String,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#%3Cinit%3E(java.lang.String,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -39,7 +39,7 @@ public MessageFormat(Java.Lang.String arg0, Java.Util.Locale arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public MessageFormat(Java.Lang.String arg0)
@@ -59,7 +59,7 @@ public MessageFormat(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#format(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#format(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -73,28 +73,7 @@ public static Java.Lang.String Format(Java.Lang.String arg0, params object[] arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#getFormats()"/> <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#setFormats(java.text.Format[])"/>
-        /// </summary>
-        public Java.Text.Format[] Formats
-        {
-            get { return IExecuteWithSignatureArray<Java.Text.Format>("getFormats", "()[Ljava/text/Format;"); } set { IExecuteWithSignature("setFormats", "([Ljava/text/Format;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#getFormatsByArgumentIndex()"/> <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#setFormatsByArgumentIndex(java.text.Format[])"/>
-        /// </summary>
-        public Java.Text.Format[] FormatsByArgumentIndex
-        {
-            get { return IExecuteWithSignatureArray<Java.Text.Format>("getFormatsByArgumentIndex", "()[Ljava/text/Format;"); } set { IExecuteWithSignature("setFormatsByArgumentIndex", "([Ljava/text/Format;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#getLocale()"/> <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#setLocale(java.util.Locale)"/>
-        /// </summary>
-        public Java.Util.Locale Locale
-        {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); } set { IExecuteWithSignature("setLocale", "(Ljava/util/Locale;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#format(java.lang.Object[],java.lang.StringBuffer,java.text.FieldPosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#format(java.lang.Object[],java.lang.StringBuffer,java.text.FieldPosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.StringBuffer"/></param>
@@ -105,7 +84,7 @@ public Java.Lang.StringBuffer Format(object[] arg0, Java.Lang.StringBuffer arg1,
             return IExecute<Java.Lang.StringBuffer>("format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#parse(java.lang.String,java.text.ParsePosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#parse(java.lang.String,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Text.ParsePosition"/></param>
@@ -115,7 +94,7 @@ public object[] Parse(Java.Lang.String arg0, Java.Text.ParsePosition arg1)
             return IExecuteArray<object>("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -125,7 +104,7 @@ public object[] Parse(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<object>("parse", "(Ljava/lang/String;)[Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#toPattern()"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#toPattern()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String ToPattern()
@@ -133,7 +112,31 @@ public Java.Lang.String ToPattern()
             return IExecuteWithSignature<Java.Lang.String>("toPattern", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#applyPattern(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#getFormats()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.Format"/></returns>
+        public Java.Text.Format[] GetFormats()
+        {
+            return IExecuteWithSignatureArray<Java.Text.Format>("getFormats", "()[Ljava/text/Format;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#getFormatsByArgumentIndex()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Text.Format"/></returns>
+        public Java.Text.Format[] GetFormatsByArgumentIndex()
+        {
+            return IExecuteWithSignatureArray<Java.Text.Format>("getFormatsByArgumentIndex", "()[Ljava/text/Format;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#getLocale()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
+        {
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#applyPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void ApplyPattern(Java.Lang.String arg0)
@@ -141,7 +144,7 @@ public void ApplyPattern(Java.Lang.String arg0)
             IExecuteWithSignature("applyPattern", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#setFormat(int,java.text.Format)"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#setFormat(int,java.text.Format)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Text.Format"/></param>
@@ -150,7 +153,7 @@ public void SetFormat(int arg0, Java.Text.Format arg1)
             IExecute("setFormat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.html#setFormatByArgumentIndex(int,java.text.Format)"/>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#setFormatByArgumentIndex(int,java.text.Format)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Text.Format"/></param>
@@ -158,6 +161,30 @@ public void SetFormatByArgumentIndex(int arg0, Java.Text.Format arg1)
         {
             IExecute("setFormatByArgumentIndex", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#setFormats(java.text.Format[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Text.Format"/></param>
+        public void SetFormats(Java.Text.Format[] arg0)
+        {
+            IExecuteWithSignature("setFormats", "([Ljava/text/Format;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#setFormatsByArgumentIndex(java.text.Format[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Text.Format"/></param>
+        public void SetFormatsByArgumentIndex(Java.Text.Format[] arg0)
+        {
+            IExecuteWithSignature("setFormatsByArgumentIndex", "([Ljava/text/Format;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/MessageFormat.html#setLocale(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public void SetLocale(Java.Util.Locale arg0)
+        {
+            IExecuteWithSignature("setLocale", "(Ljava/util/Locale;)V", arg0);
+        }
 
         #endregion
 
@@ -175,7 +202,7 @@ public partial class Field
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/MessageFormat.Field.html#ARGUMENT"/>
+            /// <see href="https://developer.android.com/reference/java/text/MessageFormat.Field.html#ARGUMENT"/>
             /// </summary>
             public static Java.Text.MessageFormat.Field ARGUMENT { get { if (!_ARGUMENTReady) { _ARGUMENTContent = SGetField<Java.Text.MessageFormat.Field>(LocalBridgeClazz, "ARGUMENT"); _ARGUMENTReady = true; } return _ARGUMENTContent; } }
             private static Java.Text.MessageFormat.Field _ARGUMENTContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Text/Normalizer.cs b/src/net/Netdroid/Generated/Java/Text/Normalizer.cs
index 10998c9a3..299784815 100644
--- a/src/net/Netdroid/Generated/Java/Text/Normalizer.cs
+++ b/src/net/Netdroid/Generated/Java/Text/Normalizer.cs
@@ -42,7 +42,7 @@ public partial class Normalizer
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.html#isNormalized(java.lang.CharSequence,java.text.Normalizer.Form)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Normalizer.html#isNormalized(java.lang.CharSequence,java.text.Normalizer.Form)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Text.Normalizer.Form"/></param>
@@ -52,7 +52,7 @@ public static bool IsNormalized(Java.Lang.CharSequence arg0, Java.Text.Normalize
             return SExecute<bool>(LocalBridgeClazz, "isNormalized", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.html#normalize(java.lang.CharSequence,java.text.Normalizer.Form)"/>
+        /// <see href="https://developer.android.com/reference/java/text/Normalizer.html#normalize(java.lang.CharSequence,java.text.Normalizer.Form)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Text.Normalizer.Form"/></param>
@@ -82,25 +82,25 @@ public partial class Form
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.Form.html#NFC"/>
+            /// <see href="https://developer.android.com/reference/java/text/Normalizer.Form.html#NFC"/>
             /// </summary>
             public static Java.Text.Normalizer.Form NFC { get { if (!_NFCReady) { _NFCContent = SGetField<Java.Text.Normalizer.Form>(LocalBridgeClazz, "NFC"); _NFCReady = true; } return _NFCContent; } }
             private static Java.Text.Normalizer.Form _NFCContent = default;
             private static bool _NFCReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.Form.html#NFD"/>
+            /// <see href="https://developer.android.com/reference/java/text/Normalizer.Form.html#NFD"/>
             /// </summary>
             public static Java.Text.Normalizer.Form NFD { get { if (!_NFDReady) { _NFDContent = SGetField<Java.Text.Normalizer.Form>(LocalBridgeClazz, "NFD"); _NFDReady = true; } return _NFDContent; } }
             private static Java.Text.Normalizer.Form _NFDContent = default;
             private static bool _NFDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.Form.html#NFKC"/>
+            /// <see href="https://developer.android.com/reference/java/text/Normalizer.Form.html#NFKC"/>
             /// </summary>
             public static Java.Text.Normalizer.Form NFKC { get { if (!_NFKCReady) { _NFKCContent = SGetField<Java.Text.Normalizer.Form>(LocalBridgeClazz, "NFKC"); _NFKCReady = true; } return _NFKCContent; } }
             private static Java.Text.Normalizer.Form _NFKCContent = default;
             private static bool _NFKCReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.Form.html#NFKD"/>
+            /// <see href="https://developer.android.com/reference/java/text/Normalizer.Form.html#NFKD"/>
             /// </summary>
             public static Java.Text.Normalizer.Form NFKD { get { if (!_NFKDReady) { _NFKDContent = SGetField<Java.Text.Normalizer.Form>(LocalBridgeClazz, "NFKD"); _NFKDReady = true; } return _NFKDContent; } }
             private static Java.Text.Normalizer.Form _NFKDContent = default;
@@ -110,7 +110,7 @@ public partial class Form
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.Form.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/text/Normalizer.Form.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Text.Normalizer.Form"/></returns>
@@ -119,7 +119,7 @@ public static Java.Text.Normalizer.Form ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Text.Normalizer.Form>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/text/Normalizer$Form;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/Normalizer.Form.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/text/Normalizer.Form.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Text.Normalizer.Form"/></returns>
             public static Java.Text.Normalizer.Form[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Text/NumberFormat.cs b/src/net/Netdroid/Generated/Java/Text/NumberFormat.cs
index 3d5f1557a..b65ea5bf5 100644
--- a/src/net/Netdroid/Generated/Java/Text/NumberFormat.cs
+++ b/src/net/Netdroid/Generated/Java/Text/NumberFormat.cs
@@ -38,13 +38,13 @@ public partial class NumberFormat
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#FRACTION_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#FRACTION_FIELD"/>
         /// </summary>
         public static int FRACTION_FIELD { get { if (!_FRACTION_FIELDReady) { _FRACTION_FIELDContent = SGetField<int>(LocalBridgeClazz, "FRACTION_FIELD"); _FRACTION_FIELDReady = true; } return _FRACTION_FIELDContent; } }
         private static int _FRACTION_FIELDContent = default;
         private static bool _FRACTION_FIELDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#INTEGER_FIELD"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#INTEGER_FIELD"/>
         /// </summary>
         public static int INTEGER_FIELD { get { if (!_INTEGER_FIELDReady) { _INTEGER_FIELDContent = SGetField<int>(LocalBridgeClazz, "INTEGER_FIELD"); _INTEGER_FIELDReady = true; } return _INTEGER_FIELDContent; } }
         private static int _INTEGER_FIELDContent = default;
@@ -54,66 +54,47 @@ public partial class NumberFormat
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getCurrencyInstance()"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getCompactNumberInstance()"/> 
-        /// </summary>
-        public static Java.Text.NumberFormat CompactNumberInstance
-        {
-            get { return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getCompactNumberInstance", "()Ljava/text/NumberFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getCurrencyInstance()"/> 
-        /// </summary>
-        public static Java.Text.NumberFormat CurrencyInstance
-        {
-            get { return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getCurrencyInstance", "()Ljava/text/NumberFormat;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getInstance()"/> 
-        /// </summary>
-        public static Java.Text.NumberFormat Instance
+        /// <returns><see cref="Java.Text.NumberFormat"/></returns>
+        public static Java.Text.NumberFormat GetCurrencyInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getInstance", "()Ljava/text/NumberFormat;"); }
+            return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getCurrencyInstance", "()Ljava/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getIntegerInstance()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getInstance()"/>
         /// </summary>
-        public static Java.Text.NumberFormat IntegerInstance
+        /// <returns><see cref="Java.Text.NumberFormat"/></returns>
+        public static Java.Text.NumberFormat GetInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getIntegerInstance", "()Ljava/text/NumberFormat;"); }
+            return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getInstance", "()Ljava/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getNumberInstance()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getIntegerInstance()"/>
         /// </summary>
-        public static Java.Text.NumberFormat NumberInstance
+        /// <returns><see cref="Java.Text.NumberFormat"/></returns>
+        public static Java.Text.NumberFormat GetIntegerInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getNumberInstance", "()Ljava/text/NumberFormat;"); }
+            return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getIntegerInstance", "()Ljava/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getPercentInstance()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getNumberInstance()"/>
         /// </summary>
-        public static Java.Text.NumberFormat PercentInstance
+        /// <returns><see cref="Java.Text.NumberFormat"/></returns>
+        public static Java.Text.NumberFormat GetNumberInstance()
         {
-            get { return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getPercentInstance", "()Ljava/text/NumberFormat;"); }
+            return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getNumberInstance", "()Ljava/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getCompactNumberInstance(java.util.Locale,java.text.NumberFormat.Style)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getPercentInstance()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
-        /// <param name="arg1"><see cref="Java.Text.NumberFormat.Style"/></param>
         /// <returns><see cref="Java.Text.NumberFormat"/></returns>
-        public static Java.Text.NumberFormat GetCompactNumberInstance(Java.Util.Locale arg0, Java.Text.NumberFormat.Style arg1)
+        public static Java.Text.NumberFormat GetPercentInstance()
         {
-            return SExecute<Java.Text.NumberFormat>(LocalBridgeClazz, "getCompactNumberInstance", arg0, arg1);
+            return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getPercentInstance", "()Ljava/text/NumberFormat;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getCurrencyInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getCurrencyInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.NumberFormat"/></returns>
@@ -122,7 +103,7 @@ public static Java.Text.NumberFormat GetCurrencyInstance(Java.Util.Locale arg0)
             return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getCurrencyInstance", "(Ljava/util/Locale;)Ljava/text/NumberFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.NumberFormat"/></returns>
@@ -131,7 +112,7 @@ public static Java.Text.NumberFormat GetInstance(Java.Util.Locale arg0)
             return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Ljava/text/NumberFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getIntegerInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getIntegerInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.NumberFormat"/></returns>
@@ -140,7 +121,7 @@ public static Java.Text.NumberFormat GetIntegerInstance(Java.Util.Locale arg0)
             return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getIntegerInstance", "(Ljava/util/Locale;)Ljava/text/NumberFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getNumberInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getNumberInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.NumberFormat"/></returns>
@@ -149,7 +130,7 @@ public static Java.Text.NumberFormat GetNumberInstance(Java.Util.Locale arg0)
             return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getNumberInstance", "(Ljava/util/Locale;)Ljava/text/NumberFormat;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getPercentInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getPercentInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Text.NumberFormat"/></returns>
@@ -157,54 +138,20 @@ public static Java.Text.NumberFormat GetPercentInstance(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<Java.Text.NumberFormat>(LocalBridgeClazz, "getPercentInstance", "(Ljava/util/Locale;)Ljava/text/NumberFormat;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getCurrency()"/> <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#setCurrency(java.util.Currency)"/>
-        /// </summary>
-        public Java.Util.Currency Currency
-        {
-            get { return IExecuteWithSignature<Java.Util.Currency>("getCurrency", "()Ljava/util/Currency;"); } set { IExecuteWithSignature("setCurrency", "(Ljava/util/Currency;)V", value); }
-        }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getMaximumFractionDigits()"/> <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#setMaximumFractionDigits(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getAvailableLocales()"/>
         /// </summary>
-        public int MaximumFractionDigits
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignature<int>("getMaximumFractionDigits", "()I"); } set { IExecuteWithSignature("setMaximumFractionDigits", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getMaximumIntegerDigits()"/> <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#setMaximumIntegerDigits(int)"/>
-        /// </summary>
-        public int MaximumIntegerDigits
-        {
-            get { return IExecuteWithSignature<int>("getMaximumIntegerDigits", "()I"); } set { IExecuteWithSignature("setMaximumIntegerDigits", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getMinimumFractionDigits()"/> <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#setMinimumFractionDigits(int)"/>
-        /// </summary>
-        public int MinimumFractionDigits
-        {
-            get { return IExecuteWithSignature<int>("getMinimumFractionDigits", "()I"); } set { IExecuteWithSignature("setMinimumFractionDigits", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getMinimumIntegerDigits()"/> <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#setMinimumIntegerDigits(int)"/>
-        /// </summary>
-        public int MinimumIntegerDigits
-        {
-            get { return IExecuteWithSignature<int>("getMinimumIntegerDigits", "()I"); } set { IExecuteWithSignature("setMinimumIntegerDigits", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#getRoundingMode()"/> <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#setRoundingMode(java.math.RoundingMode)"/>
-        /// </summary>
-        public Java.Math.RoundingMode RoundingMode
-        {
-            get { return IExecuteWithSignature<Java.Math.RoundingMode>("getRoundingMode", "()Ljava/math/RoundingMode;"); } set { IExecuteWithSignature("setRoundingMode", "(Ljava/math/RoundingMode;)V", value); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#parse(java.lang.String,java.text.ParsePosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#parse(java.lang.String,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Text.ParsePosition"/></param>
@@ -214,7 +161,7 @@ public Java.Lang.Number Parse(Java.Lang.String arg0, Java.Text.ParsePosition arg
             return IExecute<Java.Lang.Number>("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#format(double,java.lang.StringBuffer,java.text.FieldPosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#format(double,java.lang.StringBuffer,java.text.FieldPosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Lang.StringBuffer"/></param>
@@ -225,7 +172,7 @@ public Java.Lang.StringBuffer Format(double arg0, Java.Lang.StringBuffer arg1, J
             return IExecute<Java.Lang.StringBuffer>("format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#format(long,java.lang.StringBuffer,java.text.FieldPosition)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#format(long,java.lang.StringBuffer,java.text.FieldPosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Lang.StringBuffer"/></param>
@@ -236,7 +183,7 @@ public Java.Lang.StringBuffer Format(long arg0, Java.Lang.StringBuffer arg1, Jav
             return IExecute<Java.Lang.StringBuffer>("format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#isGroupingUsed()"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#isGroupingUsed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsGroupingUsed()
@@ -244,7 +191,7 @@ public bool IsGroupingUsed()
             return IExecuteWithSignature<bool>("isGroupingUsed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#isParseIntegerOnly()"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#isParseIntegerOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsParseIntegerOnly()
@@ -252,7 +199,7 @@ public bool IsParseIntegerOnly()
             return IExecuteWithSignature<bool>("isParseIntegerOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#format(double)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#format(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -261,7 +208,7 @@ public Java.Lang.String Format(double arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(D)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#format(long)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#format(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -270,7 +217,39 @@ public Java.Lang.String Format(long arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(J)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getMaximumFractionDigits()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumFractionDigits()
+        {
+            return IExecuteWithSignature<int>("getMaximumFractionDigits", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getMaximumIntegerDigits()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumIntegerDigits()
+        {
+            return IExecuteWithSignature<int>("getMaximumIntegerDigits", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getMinimumFractionDigits()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumFractionDigits()
+        {
+            return IExecuteWithSignature<int>("getMinimumFractionDigits", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getMinimumIntegerDigits()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimumIntegerDigits()
+        {
+            return IExecuteWithSignature<int>("getMinimumIntegerDigits", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.Number"/></returns>
@@ -280,7 +259,31 @@ public Java.Lang.Number Parse(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.Number>("parse", "(Ljava/lang/String;)Ljava/lang/Number;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#setGroupingUsed(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getRoundingMode()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Math.RoundingMode"/></returns>
+        public Java.Math.RoundingMode GetRoundingMode()
+        {
+            return IExecuteWithSignature<Java.Math.RoundingMode>("getRoundingMode", "()Ljava/math/RoundingMode;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#getCurrency()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Currency"/></returns>
+        public Java.Util.Currency GetCurrency()
+        {
+            return IExecuteWithSignature<Java.Util.Currency>("getCurrency", "()Ljava/util/Currency;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#setCurrency(java.util.Currency)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Currency"/></param>
+        public void SetCurrency(Java.Util.Currency arg0)
+        {
+            IExecuteWithSignature("setCurrency", "(Ljava/util/Currency;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#setGroupingUsed(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetGroupingUsed(bool arg0)
@@ -288,13 +291,53 @@ public void SetGroupingUsed(bool arg0)
             IExecuteWithSignature("setGroupingUsed", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.html#setParseIntegerOnly(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#setMaximumFractionDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaximumFractionDigits(int arg0)
+        {
+            IExecuteWithSignature("setMaximumFractionDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#setMaximumIntegerDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaximumIntegerDigits(int arg0)
+        {
+            IExecuteWithSignature("setMaximumIntegerDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#setMinimumFractionDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumFractionDigits(int arg0)
+        {
+            IExecuteWithSignature("setMinimumFractionDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#setMinimumIntegerDigits(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimumIntegerDigits(int arg0)
+        {
+            IExecuteWithSignature("setMinimumIntegerDigits", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#setParseIntegerOnly(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetParseIntegerOnly(bool arg0)
         {
             IExecuteWithSignature("setParseIntegerOnly", "(Z)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/NumberFormat.html#setRoundingMode(java.math.RoundingMode)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Math.RoundingMode"/></param>
+        public void SetRoundingMode(Java.Math.RoundingMode arg0)
+        {
+            IExecuteWithSignature("setRoundingMode", "(Ljava/math/RoundingMode;)V", arg0);
+        }
 
         #endregion
 
@@ -312,83 +355,71 @@ public partial class Field
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#CURRENCY"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#CURRENCY"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field CURRENCY { get { if (!_CURRENCYReady) { _CURRENCYContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "CURRENCY"); _CURRENCYReady = true; } return _CURRENCYContent; } }
             private static Java.Text.NumberFormat.Field _CURRENCYContent = default;
             private static bool _CURRENCYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#DECIMAL_SEPARATOR"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#DECIMAL_SEPARATOR"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field DECIMAL_SEPARATOR { get { if (!_DECIMAL_SEPARATORReady) { _DECIMAL_SEPARATORContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "DECIMAL_SEPARATOR"); _DECIMAL_SEPARATORReady = true; } return _DECIMAL_SEPARATORContent; } }
             private static Java.Text.NumberFormat.Field _DECIMAL_SEPARATORContent = default;
             private static bool _DECIMAL_SEPARATORReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#EXPONENT"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#EXPONENT"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field EXPONENT { get { if (!_EXPONENTReady) { _EXPONENTContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "EXPONENT"); _EXPONENTReady = true; } return _EXPONENTContent; } }
             private static Java.Text.NumberFormat.Field _EXPONENTContent = default;
             private static bool _EXPONENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#EXPONENT_SIGN"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#EXPONENT_SIGN"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field EXPONENT_SIGN { get { if (!_EXPONENT_SIGNReady) { _EXPONENT_SIGNContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "EXPONENT_SIGN"); _EXPONENT_SIGNReady = true; } return _EXPONENT_SIGNContent; } }
             private static Java.Text.NumberFormat.Field _EXPONENT_SIGNContent = default;
             private static bool _EXPONENT_SIGNReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#EXPONENT_SYMBOL"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#EXPONENT_SYMBOL"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field EXPONENT_SYMBOL { get { if (!_EXPONENT_SYMBOLReady) { _EXPONENT_SYMBOLContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "EXPONENT_SYMBOL"); _EXPONENT_SYMBOLReady = true; } return _EXPONENT_SYMBOLContent; } }
             private static Java.Text.NumberFormat.Field _EXPONENT_SYMBOLContent = default;
             private static bool _EXPONENT_SYMBOLReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#FRACTION"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#FRACTION"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field FRACTION { get { if (!_FRACTIONReady) { _FRACTIONContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "FRACTION"); _FRACTIONReady = true; } return _FRACTIONContent; } }
             private static Java.Text.NumberFormat.Field _FRACTIONContent = default;
             private static bool _FRACTIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#GROUPING_SEPARATOR"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#GROUPING_SEPARATOR"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field GROUPING_SEPARATOR { get { if (!_GROUPING_SEPARATORReady) { _GROUPING_SEPARATORContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "GROUPING_SEPARATOR"); _GROUPING_SEPARATORReady = true; } return _GROUPING_SEPARATORContent; } }
             private static Java.Text.NumberFormat.Field _GROUPING_SEPARATORContent = default;
             private static bool _GROUPING_SEPARATORReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#INTEGER"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#INTEGER"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field INTEGER { get { if (!_INTEGERReady) { _INTEGERContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "INTEGER"); _INTEGERReady = true; } return _INTEGERContent; } }
             private static Java.Text.NumberFormat.Field _INTEGERContent = default;
             private static bool _INTEGERReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#PERCENT"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#PERCENT"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field PERCENT { get { if (!_PERCENTReady) { _PERCENTContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "PERCENT"); _PERCENTReady = true; } return _PERCENTContent; } }
             private static Java.Text.NumberFormat.Field _PERCENTContent = default;
             private static bool _PERCENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#PERMILLE"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#PERMILLE"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field PERMILLE { get { if (!_PERMILLEReady) { _PERMILLEContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "PERMILLE"); _PERMILLEReady = true; } return _PERMILLEContent; } }
             private static Java.Text.NumberFormat.Field _PERMILLEContent = default;
             private static bool _PERMILLEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#PREFIX"/>
-            /// </summary>
-            public static Java.Text.NumberFormat.Field PREFIX { get { if (!_PREFIXReady) { _PREFIXContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "PREFIX"); _PREFIXReady = true; } return _PREFIXContent; } }
-            private static Java.Text.NumberFormat.Field _PREFIXContent = default;
-            private static bool _PREFIXReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#SIGN"/>
+            /// <see href="https://developer.android.com/reference/java/text/NumberFormat.Field.html#SIGN"/>
             /// </summary>
             public static Java.Text.NumberFormat.Field SIGN { get { if (!_SIGNReady) { _SIGNContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "SIGN"); _SIGNReady = true; } return _SIGNContent; } }
             private static Java.Text.NumberFormat.Field _SIGNContent = default;
             private static bool _SIGNReady = false; // this is used because in case of generics 
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/text/NumberFormat.Field.html#SUFFIX"/>
-            /// </summary>
-            public static Java.Text.NumberFormat.Field SUFFIX { get { if (!_SUFFIXReady) { _SUFFIXContent = SGetField<Java.Text.NumberFormat.Field>(LocalBridgeClazz, "SUFFIX"); _SUFFIXReady = true; } return _SUFFIXContent; } }
-            private static Java.Text.NumberFormat.Field _SUFFIXContent = default;
-            private static bool _SUFFIXReady = false; // this is used because in case of generics 
 
             #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Text/ParsePosition.cs b/src/net/Netdroid/Generated/Java/Text/ParsePosition.cs
index d373effcb..8d7c0e74a 100644
--- a/src/net/Netdroid/Generated/Java/Text/ParsePosition.cs
+++ b/src/net/Netdroid/Generated/Java/Text/ParsePosition.cs
@@ -30,7 +30,7 @@ public partial class ParsePosition
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ParsePosition.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/ParsePosition.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ParsePosition(int arg0)
@@ -54,18 +54,36 @@ public ParsePosition(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ParsePosition.html#getErrorIndex()"/> <see href="https://developer.android.com/reference/java.base/java/text/ParsePosition.html#setErrorIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/ParsePosition.html#getErrorIndex()"/>
         /// </summary>
-        public int ErrorIndex
+        /// <returns><see cref="int"/></returns>
+        public int GetErrorIndex()
         {
-            get { return IExecuteWithSignature<int>("getErrorIndex", "()I"); } set { IExecuteWithSignature("setErrorIndex", "(I)V", value); }
+            return IExecuteWithSignature<int>("getErrorIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/ParsePosition.html#getIndex()"/> <see href="https://developer.android.com/reference/java.base/java/text/ParsePosition.html#setIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/ParsePosition.html#getIndex()"/>
         /// </summary>
-        public int Index
+        /// <returns><see cref="int"/></returns>
+        public int GetIndex()
         {
-            get { return IExecuteWithSignature<int>("getIndex", "()I"); } set { IExecuteWithSignature("setIndex", "(I)V", value); }
+            return IExecuteWithSignature<int>("getIndex", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/ParsePosition.html#setErrorIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetErrorIndex(int arg0)
+        {
+            IExecuteWithSignature("setErrorIndex", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/ParsePosition.html#setIndex(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetIndex(int arg0)
+        {
+            IExecuteWithSignature("setIndex", "(I)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Text/RuleBasedCollator.cs b/src/net/Netdroid/Generated/Java/Text/RuleBasedCollator.cs
index bb8337eea..e33565eba 100644
--- a/src/net/Netdroid/Generated/Java/Text/RuleBasedCollator.cs
+++ b/src/net/Netdroid/Generated/Java/Text/RuleBasedCollator.cs
@@ -30,7 +30,7 @@ public partial class RuleBasedCollator
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/RuleBasedCollator.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/RuleBasedCollator.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Text.ParseException"/>
@@ -55,14 +55,15 @@ public RuleBasedCollator(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/RuleBasedCollator.html#getRules()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/RuleBasedCollator.html#getRules()"/>
         /// </summary>
-        public Java.Lang.String Rules
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRules()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRules", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRules", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/RuleBasedCollator.html#getCollationElementIterator(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/RuleBasedCollator.html#getCollationElementIterator(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Text.CollationElementIterator"/></returns>
@@ -71,7 +72,7 @@ public Java.Text.CollationElementIterator GetCollationElementIterator(Java.Lang.
             return IExecuteWithSignature<Java.Text.CollationElementIterator>("getCollationElementIterator", "(Ljava/lang/String;)Ljava/text/CollationElementIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/RuleBasedCollator.html#getCollationElementIterator(java.text.CharacterIterator)"/>
+        /// <see href="https://developer.android.com/reference/java/text/RuleBasedCollator.html#getCollationElementIterator(java.text.CharacterIterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Text.CharacterIterator"/></param>
         /// <returns><see cref="Java.Text.CollationElementIterator"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Text/SimpleDateFormat.cs b/src/net/Netdroid/Generated/Java/Text/SimpleDateFormat.cs
index db3382166..7cbb79c16 100644
--- a/src/net/Netdroid/Generated/Java/Text/SimpleDateFormat.cs
+++ b/src/net/Netdroid/Generated/Java/Text/SimpleDateFormat.cs
@@ -30,7 +30,7 @@ public partial class SimpleDateFormat
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#%3Cinit%3E(java.lang.String,java.text.DateFormatSymbols)"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#%3Cinit%3E(java.lang.String,java.text.DateFormatSymbols)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Text.DateFormatSymbols"/></param>
@@ -39,7 +39,7 @@ public SimpleDateFormat(Java.Lang.String arg0, Java.Text.DateFormatSymbols arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#%3Cinit%3E(java.lang.String,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#%3Cinit%3E(java.lang.String,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -48,7 +48,7 @@ public SimpleDateFormat(Java.Lang.String arg0, Java.Util.Locale arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public SimpleDateFormat(Java.Lang.String arg0)
@@ -72,37 +72,39 @@ public SimpleDateFormat(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#getDateFormatSymbols()"/> <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#setDateFormatSymbols(java.text.DateFormatSymbols)"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#toLocalizedPattern()"/>
         /// </summary>
-        public Java.Text.DateFormatSymbols DateFormatSymbols
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String ToLocalizedPattern()
         {
-            get { return IExecuteWithSignature<Java.Text.DateFormatSymbols>("getDateFormatSymbols", "()Ljava/text/DateFormatSymbols;"); } set { IExecuteWithSignature("setDateFormatSymbols", "(Ljava/text/DateFormatSymbols;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("toLocalizedPattern", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#get2DigitYearStart()"/> 
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#toPattern()"/>
         /// </summary>
-        public Java.Util.Date Get2DigitYearStart
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String ToPattern()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("get2DigitYearStart", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Lang.String>("toPattern", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#toLocalizedPattern()"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#getDateFormatSymbols()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToLocalizedPattern()
+        /// <returns><see cref="Java.Text.DateFormatSymbols"/></returns>
+        public Java.Text.DateFormatSymbols GetDateFormatSymbols()
         {
-            return IExecuteWithSignature<Java.Lang.String>("toLocalizedPattern", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Text.DateFormatSymbols>("getDateFormatSymbols", "()Ljava/text/DateFormatSymbols;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#toPattern()"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#get2DigitYearStart()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToPattern()
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date Get2DigitYearStart()
         {
-            return IExecuteWithSignature<Java.Lang.String>("toPattern", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Util.Date>("get2DigitYearStart", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#applyLocalizedPattern(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#applyLocalizedPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void ApplyLocalizedPattern(Java.Lang.String arg0)
@@ -110,7 +112,7 @@ public void ApplyLocalizedPattern(Java.Lang.String arg0)
             IExecuteWithSignature("applyLocalizedPattern", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#applyPattern(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#applyPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void ApplyPattern(Java.Lang.String arg0)
@@ -118,13 +120,21 @@ public void ApplyPattern(Java.Lang.String arg0)
             IExecuteWithSignature("applyPattern", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/SimpleDateFormat.html#set2DigitYearStart(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#set2DigitYearStart(java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         public void Set2DigitYearStart(Java.Util.Date arg0)
         {
             IExecuteWithSignature("set2DigitYearStart", "(Ljava/util/Date;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/SimpleDateFormat.html#setDateFormatSymbols(java.text.DateFormatSymbols)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Text.DateFormatSymbols"/></param>
+        public void SetDateFormatSymbols(Java.Text.DateFormatSymbols arg0)
+        {
+            IExecuteWithSignature("setDateFormatSymbols", "(Ljava/text/DateFormatSymbols;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Text/StringCharacterIterator.cs b/src/net/Netdroid/Generated/Java/Text/StringCharacterIterator.cs
index 9b36e53bc..0154b96a8 100644
--- a/src/net/Netdroid/Generated/Java/Text/StringCharacterIterator.cs
+++ b/src/net/Netdroid/Generated/Java/Text/StringCharacterIterator.cs
@@ -30,7 +30,7 @@ public partial class StringCharacterIterator
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#%3Cinit%3E(java.lang.String,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#%3Cinit%3E(java.lang.String,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -41,7 +41,7 @@ public StringCharacterIterator(Java.Lang.String arg0, int arg1, int arg2, int ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#%3Cinit%3E(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#%3Cinit%3E(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -50,7 +50,7 @@ public StringCharacterIterator(Java.Lang.String arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public StringCharacterIterator(Java.Lang.String arg0)
@@ -74,28 +74,7 @@ public StringCharacterIterator(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#getBeginIndex()"/> 
-        /// </summary>
-        public int BeginIndex
-        {
-            get { return IExecuteWithSignature<int>("getBeginIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#getEndIndex()"/> 
-        /// </summary>
-        public int EndIndex
-        {
-            get { return IExecuteWithSignature<int>("getEndIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#getIndex()"/> 
-        /// </summary>
-        public int Index
-        {
-            get { return IExecuteWithSignature<int>("getIndex", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#current()"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#current()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Current()
@@ -103,7 +82,7 @@ public char Current()
             return IExecuteWithSignature<char>("current", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#first()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char First()
@@ -111,7 +90,7 @@ public char First()
             return IExecuteWithSignature<char>("first", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#last()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Last()
@@ -119,7 +98,7 @@ public char Last()
             return IExecuteWithSignature<char>("last", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#next()"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#next()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Next()
@@ -127,7 +106,7 @@ public char Next()
             return IExecuteWithSignature<char>("next", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#previous()"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#previous()"/>
         /// </summary>
         /// <returns><see cref="char"/></returns>
         public char Previous()
@@ -135,7 +114,7 @@ public char Previous()
             return IExecuteWithSignature<char>("previous", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#setIndex(int)"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#setIndex(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="char"/></returns>
@@ -144,7 +123,31 @@ public char SetIndex(int arg0)
             return IExecuteWithSignature<char>("setIndex", "(I)C", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/text/StringCharacterIterator.html#setText(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#getBeginIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBeginIndex()
+        {
+            return IExecuteWithSignature<int>("getBeginIndex", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#getEndIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetEndIndex()
+        {
+            return IExecuteWithSignature<int>("getEndIndex", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#getIndex()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetIndex()
+        {
+            return IExecuteWithSignature<int>("getIndex", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/text/StringCharacterIterator.html#setText(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void SetText(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Java/Time/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Time/AllPackageClasses.cs
index e477ab79f..2f493a364 100644
--- a/src/net/Netdroid/Generated/Java/Time/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Time/AllPackageClasses.cs
@@ -28,20 +28,20 @@ namespace Java.Time
 {
     #region Clock
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/Clock.html"/>
     /// </summary>
-    public partial class Clock : Java.Time.InstantSource
+    public partial class Clock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Clock>
     {
         const string _bridgeClassName = "java.time.Clock";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Clock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Clock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Clock() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Clock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Clock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Clock(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Clock(params object[] args) : base(args) { }
 
     #region DateTimeException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/DateTimeException.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/DateTimeException.html"/>
     /// </summary>
     public partial class DateTimeException : Java.Lang.RuntimeException
     {
@@ -91,7 +91,7 @@ public partial class DateTimeException : Java.Lang.RuntimeException
 
     #region DayOfWeek
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html"/>
     /// </summary>
     public partial class DayOfWeek : Java.Lang.Enum<Java.Time.DayOfWeek>
     {
@@ -135,7 +135,7 @@ public DayOfWeek(params object[] args) : base(args) { }
 
     #region Duration
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/Duration.html"/>
     /// </summary>
     public partial class Duration : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Duration>
     {
@@ -179,7 +179,7 @@ public Duration(params object[] args) : base(args) { }
 
     #region Instant
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/Instant.html"/>
     /// </summary>
     public partial class Instant : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Instant>
     {
@@ -221,55 +221,9 @@ public Instant(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region InstantSource
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/InstantSource.html"/>
-    /// </summary>
-    public partial class InstantSource : MASES.JCOBridge.C2JBridge.JVMBridgeBase<InstantSource>
-    {
-        const string _bridgeClassName = "java.time.InstantSource";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        [Obsolete("InstantSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public InstantSource() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        [Obsolete("InstantSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
-        public InstantSource(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => true;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
     #region LocalDate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/LocalDate.html"/>
     /// </summary>
     public partial class LocalDate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LocalDate>
     {
@@ -313,7 +267,7 @@ public LocalDate(params object[] args) : base(args) { }
 
     #region LocalDateTime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html"/>
     /// </summary>
     public partial class LocalDateTime : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LocalDateTime>
     {
@@ -357,7 +311,7 @@ public LocalDateTime(params object[] args) : base(args) { }
 
     #region LocalTime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/LocalTime.html"/>
     /// </summary>
     public partial class LocalTime : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LocalTime>
     {
@@ -401,7 +355,7 @@ public LocalTime(params object[] args) : base(args) { }
 
     #region Month
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/Month.html"/>
     /// </summary>
     public partial class Month : Java.Lang.Enum<Java.Time.Month>
     {
@@ -445,7 +399,7 @@ public Month(params object[] args) : base(args) { }
 
     #region MonthDay
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/MonthDay.html"/>
     /// </summary>
     public partial class MonthDay : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MonthDay>
     {
@@ -489,7 +443,7 @@ public MonthDay(params object[] args) : base(args) { }
 
     #region OffsetDateTime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html"/>
     /// </summary>
     public partial class OffsetDateTime : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OffsetDateTime>
     {
@@ -533,7 +487,7 @@ public OffsetDateTime(params object[] args) : base(args) { }
 
     #region OffsetTime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html"/>
     /// </summary>
     public partial class OffsetTime : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OffsetTime>
     {
@@ -577,7 +531,7 @@ public OffsetTime(params object[] args) : base(args) { }
 
     #region Period
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/Period.html"/>
     /// </summary>
     public partial class Period : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Period>
     {
@@ -621,7 +575,7 @@ public Period(params object[] args) : base(args) { }
 
     #region Year
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/Year.html"/>
     /// </summary>
     public partial class Year : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Year>
     {
@@ -665,7 +619,7 @@ public Year(params object[] args) : base(args) { }
 
     #region YearMonth
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/YearMonth.html"/>
     /// </summary>
     public partial class YearMonth : MASES.JCOBridge.C2JBridge.JVMBridgeBase<YearMonth>
     {
@@ -709,7 +663,7 @@ public YearMonth(params object[] args) : base(args) { }
 
     #region ZonedDateTime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html"/>
     /// </summary>
     public partial class ZonedDateTime : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ZonedDateTime>
     {
@@ -753,7 +707,7 @@ public ZonedDateTime(params object[] args) : base(args) { }
 
     #region ZoneId
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/ZoneId.html"/>
     /// </summary>
     public partial class ZoneId : Java.Io.Serializable
     {
@@ -761,12 +715,12 @@ public partial class ZoneId : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ZoneId class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ZoneId class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ZoneId() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ZoneId class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ZoneId class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ZoneId(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -799,7 +753,7 @@ public ZoneId(params object[] args) : base(args) { }
 
     #region ZoneOffset
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html"/>
     /// </summary>
     public partial class ZoneOffset : Java.Time.ZoneId
     {
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/AbstractChronology.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/AbstractChronology.cs
index dbefa833f..d22e352f2 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/AbstractChronology.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/AbstractChronology.cs
@@ -46,7 +46,7 @@ public partial class AbstractChronology
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/AbstractChronology.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/AbstractChronology.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -55,7 +55,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/AbstractChronology.html#compareTo(java.time.chrono.Chronology)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/AbstractChronology.html#compareTo(java.time.chrono.Chronology)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.Chronology"/></param>
         /// <returns><see cref="int"/></returns>
@@ -64,7 +64,7 @@ public int CompareTo(Java.Time.Chrono.Chronology arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/Chronology;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/AbstractChronology.html#resolveDate(java.util.Map,java.time.format.ResolverStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/AbstractChronology.html#resolveDate(java.util.Map,java.time.format.ResolverStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.ResolverStyle"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/AllPackageClasses.cs
index e94329cac..37ade4e4b 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Time.Chrono
 {
     #region AbstractChronology
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/AbstractChronology.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/AbstractChronology.html"/>
     /// </summary>
     public partial class AbstractChronology : Java.Time.Chrono.Chronology
     {
@@ -36,12 +36,12 @@ public partial class AbstractChronology : Java.Time.Chrono.Chronology
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractChronology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractChronology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractChronology() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractChronology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractChronology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractChronology(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public AbstractChronology(params object[] args) : base(args) { }
 
     #region ChronoLocalDate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html"/>
     /// </summary>
     public partial class ChronoLocalDate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ChronoLocalDate>
     {
@@ -82,12 +82,12 @@ public partial class ChronoLocalDate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ChronoLocalDate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChronoLocalDate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChronoLocalDate() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ChronoLocalDate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChronoLocalDate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChronoLocalDate(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public ChronoLocalDate(params object[] args) : base(args) { }
 
     #region ChronoLocalDateTime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html"/>
     /// </summary>
     public partial class ChronoLocalDateTime : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ChronoLocalDateTime>
     {
@@ -128,12 +128,12 @@ public partial class ChronoLocalDateTime : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ChronoLocalDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChronoLocalDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChronoLocalDateTime() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ChronoLocalDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChronoLocalDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChronoLocalDateTime(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -164,9 +164,56 @@ public ChronoLocalDateTime(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region ChronoLocalDateTime<D>
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html"/>
+    /// </summary>
+    /// <typeparam name="D"><see cref="Java.Time.Chrono.IChronoLocalDate"/></typeparam>
+    public partial class ChronoLocalDateTime<D> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ChronoLocalDateTime<D>> where D : Java.Time.Chrono.IChronoLocalDate, new()
+    {
+        const string _bridgeClassName = "java.time.chrono.ChronoLocalDateTime";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("ChronoLocalDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public ChronoLocalDateTime() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("ChronoLocalDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public ChronoLocalDateTime(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+    
+    }
+    #endregion
+
     #region Chronology
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html"/>
     /// </summary>
     public partial class Chronology : Java.Lang.Comparable<Java.Time.Chrono.Chronology>
     {
@@ -174,12 +221,12 @@ public partial class Chronology : Java.Lang.Comparable<Java.Time.Chrono.Chronolo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Chronology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Chronology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Chronology() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Chronology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Chronology class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Chronology(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -212,7 +259,7 @@ public Chronology(params object[] args) : base(args) { }
 
     #region ChronoPeriod
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html"/>
     /// </summary>
     public partial class ChronoPeriod : Java.Time.Temporal.TemporalAmount
     {
@@ -220,12 +267,12 @@ public partial class ChronoPeriod : Java.Time.Temporal.TemporalAmount
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ChronoPeriod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChronoPeriod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChronoPeriod() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ChronoPeriod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChronoPeriod class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChronoPeriod(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,7 +305,7 @@ public ChronoPeriod(params object[] args) : base(args) { }
 
     #region ChronoZonedDateTime
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html"/>
     /// </summary>
     public partial class ChronoZonedDateTime : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ChronoZonedDateTime>
     {
@@ -266,12 +313,12 @@ public partial class ChronoZonedDateTime : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ChronoZonedDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChronoZonedDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChronoZonedDateTime() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ChronoZonedDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ChronoZonedDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ChronoZonedDateTime(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -302,9 +349,56 @@ public ChronoZonedDateTime(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region ChronoZonedDateTime<D>
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html"/>
+    /// </summary>
+    /// <typeparam name="D"><see cref="Java.Time.Chrono.IChronoLocalDate"/></typeparam>
+    public partial class ChronoZonedDateTime<D> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ChronoZonedDateTime<D>> where D : Java.Time.Chrono.IChronoLocalDate, new()
+    {
+        const string _bridgeClassName = "java.time.chrono.ChronoZonedDateTime";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("ChronoZonedDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public ChronoZonedDateTime() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("ChronoZonedDateTime class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public ChronoZonedDateTime(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+    
+    }
+    #endregion
+
     #region Era
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html"/>
     /// </summary>
     public partial class Era : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Era>
     {
@@ -312,12 +406,12 @@ public partial class Era : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Era>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Era class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Era class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Era() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Era class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Era class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Era(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -350,7 +444,7 @@ public Era(params object[] args) : base(args) { }
 
     #region HijrahChronology
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahChronology.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahChronology.html"/>
     /// </summary>
     public partial class HijrahChronology : Java.Time.Chrono.AbstractChronology
     {
@@ -394,7 +488,7 @@ public HijrahChronology(params object[] args) : base(args) { }
 
     #region HijrahDate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahDate.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahDate.html"/>
     /// </summary>
     public partial class HijrahDate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HijrahDate>
     {
@@ -438,7 +532,7 @@ public HijrahDate(params object[] args) : base(args) { }
 
     #region HijrahEra
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahEra.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahEra.html"/>
     /// </summary>
     public partial class HijrahEra : Java.Lang.Enum<Java.Time.Chrono.HijrahEra>
     {
@@ -482,7 +576,7 @@ public HijrahEra(params object[] args) : base(args) { }
 
     #region IsoChronology
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoChronology.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/IsoChronology.html"/>
     /// </summary>
     public partial class IsoChronology : Java.Time.Chrono.AbstractChronology
     {
@@ -526,7 +620,7 @@ public IsoChronology(params object[] args) : base(args) { }
 
     #region IsoEra
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoEra.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/IsoEra.html"/>
     /// </summary>
     public partial class IsoEra : Java.Lang.Enum<Java.Time.Chrono.IsoEra>
     {
@@ -570,7 +664,7 @@ public IsoEra(params object[] args) : base(args) { }
 
     #region JapaneseChronology
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseChronology.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseChronology.html"/>
     /// </summary>
     public partial class JapaneseChronology : Java.Time.Chrono.AbstractChronology
     {
@@ -614,7 +708,7 @@ public JapaneseChronology(params object[] args) : base(args) { }
 
     #region JapaneseDate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseDate.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseDate.html"/>
     /// </summary>
     public partial class JapaneseDate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<JapaneseDate>
     {
@@ -658,7 +752,7 @@ public JapaneseDate(params object[] args) : base(args) { }
 
     #region JapaneseEra
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html"/>
     /// </summary>
     public partial class JapaneseEra : MASES.JCOBridge.C2JBridge.JVMBridgeBase<JapaneseEra>
     {
@@ -702,7 +796,7 @@ public JapaneseEra(params object[] args) : base(args) { }
 
     #region MinguoChronology
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoChronology.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoChronology.html"/>
     /// </summary>
     public partial class MinguoChronology : Java.Time.Chrono.AbstractChronology
     {
@@ -746,7 +840,7 @@ public MinguoChronology(params object[] args) : base(args) { }
 
     #region MinguoDate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoDate.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoDate.html"/>
     /// </summary>
     public partial class MinguoDate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MinguoDate>
     {
@@ -790,7 +884,7 @@ public MinguoDate(params object[] args) : base(args) { }
 
     #region MinguoEra
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoEra.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoEra.html"/>
     /// </summary>
     public partial class MinguoEra : Java.Lang.Enum<Java.Time.Chrono.MinguoEra>
     {
@@ -834,7 +928,7 @@ public MinguoEra(params object[] args) : base(args) { }
 
     #region ThaiBuddhistChronology
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistChronology.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistChronology.html"/>
     /// </summary>
     public partial class ThaiBuddhistChronology : Java.Time.Chrono.AbstractChronology
     {
@@ -878,7 +972,7 @@ public ThaiBuddhistChronology(params object[] args) : base(args) { }
 
     #region ThaiBuddhistDate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistDate.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistDate.html"/>
     /// </summary>
     public partial class ThaiBuddhistDate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ThaiBuddhistDate>
     {
@@ -922,7 +1016,7 @@ public ThaiBuddhistDate(params object[] args) : base(args) { }
 
     #region ThaiBuddhistEra
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistEra.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistEra.html"/>
     /// </summary>
     public partial class ThaiBuddhistEra : Java.Lang.Enum<Java.Time.Chrono.ThaiBuddhistEra>
     {
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoLocalDate.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoLocalDate.cs
index 8337f9d5c..3590baa05 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoLocalDate.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoLocalDate.cs
@@ -72,7 +72,7 @@ public partial class ChronoLocalDate : Java.Time.Chrono.IChronoLocalDate, Java.T
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
@@ -85,29 +85,23 @@ public static Java.Time.Chrono.ChronoLocalDate From(Java.Time.Temporal.TemporalA
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#getChronology()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#lengthOfMonth()"/>
         /// </summary>
-        public Java.Time.Chrono.Chronology Chronology
-        {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#getEra()"/> 
-        /// </summary>
-        public Java.Time.Chrono.Era Era
+        /// <returns><see cref="int"/></returns>
+        public int LengthOfMonth()
         {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Era>("getEra", "()Ljava/time/chrono/Era;"); }
+            return IExecuteWithSignature<int>("lengthOfMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#lengthOfMonth()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#getChronology()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int LengthOfMonth()
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
         {
-            return IExecuteWithSignature<int>("lengthOfMonth", "()I");
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#until(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#until(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
@@ -116,7 +110,7 @@ public Java.Time.Chrono.ChronoPeriod Until(Java.Time.Chrono.ChronoLocalDate arg0
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("until", "(Ljava/time/chrono/ChronoLocalDate;)Ljava/time/chrono/ChronoPeriod;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -126,7 +120,7 @@ public long Until(Java.Time.Temporal.Temporal arg0, Java.Time.Temporal.TemporalU
             return IExecute<long>("until", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -136,7 +130,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#isAfter(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#isAfter(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -145,7 +139,7 @@ public bool IsAfter(Java.Time.Chrono.ChronoLocalDate arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/chrono/ChronoLocalDate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#isBefore(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#isBefore(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -154,7 +148,7 @@ public bool IsBefore(Java.Time.Chrono.ChronoLocalDate arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/chrono/ChronoLocalDate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#isEqual(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#isEqual(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -163,7 +157,7 @@ public bool IsEqual(Java.Time.Chrono.ChronoLocalDate arg0)
             return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/chrono/ChronoLocalDate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#isLeapYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#isLeapYear()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLeapYear()
@@ -171,7 +165,7 @@ public bool IsLeapYear()
             return IExecuteWithSignature<bool>("isLeapYear", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -180,7 +174,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -189,7 +183,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -198,7 +192,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#compareTo(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#compareTo(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="int"/></returns>
@@ -207,7 +201,7 @@ public int CompareTo(Java.Time.Chrono.ChronoLocalDate arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/ChronoLocalDate;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#lengthOfYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#lengthOfYear()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int LengthOfYear()
@@ -215,7 +209,7 @@ public int LengthOfYear()
             return IExecuteWithSignature<int>("lengthOfYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -224,7 +218,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#atTime(java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#atTime(java.time.LocalTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></returns>
@@ -233,7 +227,15 @@ public Java.Time.Chrono.ChronoLocalDateTime AtTime(Java.Time.LocalTime arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDateTime>("atTime", "(Ljava/time/LocalTime;)Ljava/time/chrono/ChronoLocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#getEra()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.Era"/></returns>
+        public Java.Time.Chrono.Era GetEra()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.Era>("getEra", "()Ljava/time/chrono/Era;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -242,7 +244,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -251,7 +253,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -261,7 +263,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -270,7 +272,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -280,7 +282,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -289,7 +291,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -299,7 +301,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDate.html#toEpochDay()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDate.html#toEpochDay()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToEpochDay()
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoLocalDateTime.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoLocalDateTime.cs
index 68361284c..1b8a688e7 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoLocalDateTime.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoLocalDateTime.cs
@@ -54,7 +54,7 @@ public partial class ChronoLocalDateTime
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></returns>
@@ -67,14 +67,7 @@ public static Java.Time.Chrono.ChronoLocalDateTime From(Java.Time.Temporal.Tempo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#getChronology()"/> 
-        /// </summary>
-        public Java.Time.Chrono.Chronology Chronology
-        {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -83,7 +76,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#toLocalDate()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#toLocalDate()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
         public Java.Time.Chrono.ChronoLocalDate ToLocalDate()
@@ -91,7 +84,7 @@ public Java.Time.Chrono.ChronoLocalDate ToLocalDate()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("toLocalDate", "()Ljava/time/chrono/ChronoLocalDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#atZone(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#atZone(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
@@ -100,7 +93,7 @@ public Java.Time.Chrono.ChronoZonedDateTime AtZone(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("atZone", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#toLocalTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#toLocalTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
         public Java.Time.LocalTime ToLocalTime()
@@ -108,7 +101,7 @@ public Java.Time.LocalTime ToLocalTime()
             return IExecuteWithSignature<Java.Time.LocalTime>("toLocalTime", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <returns><see cref="object"/></returns>
@@ -117,7 +110,7 @@ public object Query(Java.Time.Temporal.TemporalQuery arg0)
             return IExecuteWithSignature("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#isAfter(java.time.chrono.ChronoLocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isAfter(java.time.chrono.ChronoLocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -126,7 +119,7 @@ public bool IsAfter(Java.Time.Chrono.ChronoLocalDateTime arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#isBefore(java.time.chrono.ChronoLocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isBefore(java.time.chrono.ChronoLocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -135,7 +128,7 @@ public bool IsBefore(Java.Time.Chrono.ChronoLocalDateTime arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#isEqual(java.time.chrono.ChronoLocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isEqual(java.time.chrono.ChronoLocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -144,7 +137,7 @@ public bool IsEqual(Java.Time.Chrono.ChronoLocalDateTime arg0)
             return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -153,7 +146,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -162,7 +155,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#compareTo(java.time.chrono.ChronoLocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#compareTo(java.time.chrono.ChronoLocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
         /// <returns><see cref="int"/></returns>
@@ -171,7 +164,7 @@ public int CompareTo(Java.Time.Chrono.ChronoLocalDateTime arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/ChronoLocalDateTime;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -180,7 +173,288 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#toInstant(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#getChronology()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#toInstant(java.time.ZoneOffset)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant ToInstant(Java.Time.ZoneOffset arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Instant>("toInstant", "(Ljava/time/ZoneOffset;)Ljava/time/Instant;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalUnit arg1)
+        {
+            return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUnit arg1)
+        {
+            return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#with(java.time.temporal.TemporalField,long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <param name="arg1"><see cref="long"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, long arg1)
+        {
+            return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#toEpochSecond(java.time.ZoneOffset)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
+        /// <returns><see cref="long"/></returns>
+        public long ToEpochSecond(Java.Time.ZoneOffset arg0)
+        {
+            return IExecuteWithSignature<long>("toEpochSecond", "(Ljava/time/ZoneOffset;)J", arg0);
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region IChronoLocalDateTime<D>
+    /// <summary>
+    /// .NET interface for TO BE DEFINED FROM USER
+    /// </summary>
+    public partial interface IChronoLocalDateTime<D>
+    {
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region ChronoLocalDateTime<D>
+    public partial class ChronoLocalDateTime<D> : Java.Time.Chrono.IChronoLocalDateTime<D>, Java.Time.Temporal.ITemporal, Java.Time.Temporal.ITemporalAdjuster, Java.Lang.IComparable<Java.Time.Chrono.ChronoLocalDateTime>
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Java.Time.Chrono.ChronoLocalDateTime{D}"/> to <see cref="Java.Time.Temporal.Temporal"/>
+        /// </summary>
+        public static implicit operator Java.Time.Temporal.Temporal(Java.Time.Chrono.ChronoLocalDateTime<D> t) => t.Cast<Java.Time.Temporal.Temporal>();
+        /// <summary>
+        /// Converter from <see cref="Java.Time.Chrono.ChronoLocalDateTime{D}"/> to <see cref="Java.Time.Temporal.TemporalAdjuster"/>
+        /// </summary>
+        public static implicit operator Java.Time.Temporal.TemporalAdjuster(Java.Time.Chrono.ChronoLocalDateTime<D> t) => t.Cast<Java.Time.Temporal.TemporalAdjuster>();
+        /// <summary>
+        /// Converter from <see cref="Java.Time.Chrono.ChronoLocalDateTime{D}"/> to <see cref="Java.Lang.Comparable"/>
+        /// </summary>
+        public static implicit operator Java.Lang.Comparable(Java.Time.Chrono.ChronoLocalDateTime<D> t) => t.Cast<Java.Lang.Comparable>();
+        /// <summary>
+        /// Converter from <see cref="Java.Time.Chrono.ChronoLocalDateTime{D}"/> to <see cref="Java.Time.Chrono.ChronoLocalDateTime"/>
+        /// </summary>
+        public static implicit operator Java.Time.Chrono.ChronoLocalDateTime(Java.Time.Chrono.ChronoLocalDateTime<D> t) => t.Cast<Java.Time.Chrono.ChronoLocalDateTime>();
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
+        /// <returns><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></returns>
+        public static Java.Time.Chrono.ChronoLocalDateTime From(Java.Time.Temporal.TemporalAccessor arg0)
+        {
+            return SExecuteWithSignature<Java.Time.Chrono.ChronoLocalDateTime>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime;", arg0);
+        }
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
+        {
+            return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#toLocalDate()"/>
+        /// </summary>
+        /// <returns><typeparamref name="D"/></returns>
+        public D ToLocalDate()
+        {
+            return IExecuteWithSignature<D>("toLocalDate", "()Ljava/time/chrono/ChronoLocalDate;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#atZone(java.time.ZoneId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
+        /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
+        public Java.Time.Chrono.ChronoZonedDateTime<D> AtZone(Java.Time.ZoneId arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime<D>>("atZone", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#toLocalTime()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.LocalTime"/></returns>
+        public Java.Time.LocalTime ToLocalTime()
+        {
+            return IExecuteWithSignature<Java.Time.LocalTime>("toLocalTime", "()Ljava/time/LocalTime;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
+        /// <typeparam name="R"></typeparam>
+        /// <returns><typeparamref name="R"/></returns>
+        public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
+        {
+            return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isAfter(java.time.chrono.ChronoLocalDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAfter(Java.Time.Chrono.ChronoLocalDateTime arg0)
+        {
+            return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isBefore(java.time.chrono.ChronoLocalDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBefore(Java.Time.Chrono.ChronoLocalDateTime arg0)
+        {
+            return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isEqual(java.time.chrono.ChronoLocalDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEqual(Java.Time.Chrono.ChronoLocalDateTime arg0)
+        {
+            return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
+        {
+            return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#compareTo(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
+        {
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#compareTo(java.time.chrono.ChronoLocalDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(Java.Time.Chrono.ChronoLocalDateTime arg0)
+        {
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/ChronoLocalDateTime;)I", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
+        {
+            return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#getChronology()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#toInstant(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -189,7 +463,7 @@ public Java.Time.Instant ToInstant(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<Java.Time.Instant>("toInstant", "(Ljava/time/ZoneOffset;)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -198,7 +472,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -207,7 +481,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -217,7 +491,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -226,7 +500,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -236,7 +510,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -245,7 +519,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -255,7 +529,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoLocalDateTime.html#toEpochSecond(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoLocalDateTime.html#toEpochSecond(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoPeriod.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoPeriod.cs
index 5dfbe735b..f33873698 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoPeriod.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoPeriod.cs
@@ -60,7 +60,7 @@ public partial class ChronoPeriod : Java.Time.Chrono.IChronoPeriod
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#between(java.time.chrono.ChronoLocalDate,java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#between(java.time.chrono.ChronoLocalDate,java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <param name="arg1"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
@@ -74,21 +74,15 @@ public static Java.Time.Chrono.ChronoPeriod Between(Java.Time.Chrono.ChronoLocal
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#getChronology()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#getChronology()"/>
         /// </summary>
-        public Java.Time.Chrono.Chronology Chronology
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
         {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;"); }
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#getUnits()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Time.Temporal.TemporalUnit> Units
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Time.Temporal.TemporalUnit>>("getUnits", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
@@ -97,7 +91,7 @@ public Java.Time.Chrono.ChronoPeriod Minus(Java.Time.Temporal.TemporalAmount arg
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/chrono/ChronoPeriod;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#multipliedBy(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#multipliedBy(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
@@ -106,7 +100,7 @@ public Java.Time.Chrono.ChronoPeriod MultipliedBy(int arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("multipliedBy", "(I)Ljava/time/chrono/ChronoPeriod;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#normalized()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#normalized()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
         public Java.Time.Chrono.ChronoPeriod Normalized()
@@ -114,7 +108,7 @@ public Java.Time.Chrono.ChronoPeriod Normalized()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("normalized", "()Ljava/time/chrono/ChronoPeriod;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
@@ -123,7 +117,7 @@ public Java.Time.Chrono.ChronoPeriod Plus(Java.Time.Temporal.TemporalAmount arg0
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/chrono/ChronoPeriod;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#addTo(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#addTo(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -132,7 +126,7 @@ public Java.Time.Temporal.Temporal AddTo(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("addTo", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#subtractFrom(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#subtractFrom(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -141,7 +135,15 @@ public Java.Time.Temporal.Temporal SubtractFrom(Java.Time.Temporal.Temporal arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("subtractFrom", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#get(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#getUnits()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Time.Temporal.TemporalUnit> GetUnits()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Time.Temporal.TemporalUnit>>("getUnits", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#get(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="long"/></returns>
@@ -150,7 +152,7 @@ public long Get(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<long>("get", "(Ljava/time/temporal/TemporalUnit;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#isNegative()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#isNegative()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNegative()
@@ -158,7 +160,7 @@ public bool IsNegative()
             return IExecuteWithSignature<bool>("isNegative", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#isZero()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#isZero()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsZero()
@@ -166,7 +168,7 @@ public bool IsZero()
             return IExecuteWithSignature<bool>("isZero", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoPeriod.html#negated()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoPeriod.html#negated()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
         public Java.Time.Chrono.ChronoPeriod Negated()
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoZonedDateTime.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoZonedDateTime.cs
index a447cdadb..9b1585d5e 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoZonedDateTime.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/ChronoZonedDateTime.cs
@@ -50,7 +50,7 @@ public partial class ChronoZonedDateTime
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
@@ -63,28 +63,7 @@ public static Java.Time.Chrono.ChronoZonedDateTime From(Java.Time.Temporal.Tempo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#getChronology()"/> 
-        /// </summary>
-        public Java.Time.Chrono.Chronology Chronology
-        {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#getOffset()"/> 
-        /// </summary>
-        public Java.Time.ZoneOffset Offset
-        {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#getZone()"/> 
-        /// </summary>
-        public Java.Time.ZoneId Zone
-        {
-            get { return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -93,7 +72,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#toLocalDateTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toLocalDateTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></returns>
         public Java.Time.Chrono.ChronoLocalDateTime ToLocalDateTime()
@@ -101,7 +80,7 @@ public Java.Time.Chrono.ChronoLocalDateTime ToLocalDateTime()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDateTime>("toLocalDateTime", "()Ljava/time/chrono/ChronoLocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#withEarlierOffsetAtOverlap()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#withEarlierOffsetAtOverlap()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
         public Java.Time.Chrono.ChronoZonedDateTime WithEarlierOffsetAtOverlap()
@@ -109,7 +88,7 @@ public Java.Time.Chrono.ChronoZonedDateTime WithEarlierOffsetAtOverlap()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("withEarlierOffsetAtOverlap", "()Ljava/time/chrono/ChronoZonedDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#withLaterOffsetAtOverlap()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#withLaterOffsetAtOverlap()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
         public Java.Time.Chrono.ChronoZonedDateTime WithLaterOffsetAtOverlap()
@@ -117,7 +96,7 @@ public Java.Time.Chrono.ChronoZonedDateTime WithLaterOffsetAtOverlap()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("withLaterOffsetAtOverlap", "()Ljava/time/chrono/ChronoZonedDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#withZoneSameInstant(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#withZoneSameInstant(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
@@ -126,7 +105,7 @@ public Java.Time.Chrono.ChronoZonedDateTime WithZoneSameInstant(Java.Time.ZoneId
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("withZoneSameInstant", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#withZoneSameLocal(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#withZoneSameLocal(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
@@ -135,7 +114,23 @@ public Java.Time.Chrono.ChronoZonedDateTime WithZoneSameLocal(Java.Time.ZoneId a
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("withZoneSameLocal", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#getZone()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneId"/></returns>
+        public Java.Time.ZoneId GetZone()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#getOffset()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffset()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <returns><see cref="object"/></returns>
@@ -144,7 +139,7 @@ public object Query(Java.Time.Temporal.TemporalQuery arg0)
             return IExecuteWithSignature("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#isAfter(java.time.chrono.ChronoZonedDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isAfter(java.time.chrono.ChronoZonedDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -153,7 +148,7 @@ public bool IsAfter(Java.Time.Chrono.ChronoZonedDateTime arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/chrono/ChronoZonedDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#isBefore(java.time.chrono.ChronoZonedDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isBefore(java.time.chrono.ChronoZonedDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -162,7 +157,7 @@ public bool IsBefore(Java.Time.Chrono.ChronoZonedDateTime arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/chrono/ChronoZonedDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#isEqual(java.time.chrono.ChronoZonedDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isEqual(java.time.chrono.ChronoZonedDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -171,7 +166,7 @@ public bool IsEqual(Java.Time.Chrono.ChronoZonedDateTime arg0)
             return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/chrono/ChronoZonedDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -180,7 +175,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#toLocalDate()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toLocalDate()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
         public Java.Time.Chrono.ChronoLocalDate ToLocalDate()
@@ -188,7 +183,341 @@ public Java.Time.Chrono.ChronoLocalDate ToLocalDate()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("toLocalDate", "()Ljava/time/chrono/ChronoLocalDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#compareTo(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
+        {
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#compareTo(java.time.chrono.ChronoZonedDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(Java.Time.Chrono.ChronoZonedDateTime arg0)
+        {
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/ChronoZonedDateTime;)I", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#get(java.time.temporal.TemporalField)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int Get(Java.Time.Temporal.TemporalField arg0)
+        {
+            return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
+        {
+            return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#getChronology()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toInstant()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant ToInstant()
+        {
+            return IExecuteWithSignature<Java.Time.Instant>("toInstant", "()Ljava/time/Instant;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toLocalTime()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.LocalTime"/></returns>
+        public Java.Time.LocalTime ToLocalTime()
+        {
+            return IExecuteWithSignature<Java.Time.LocalTime>("toLocalTime", "()Ljava/time/LocalTime;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalUnit arg1)
+        {
+            return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUnit arg1)
+        {
+            return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#with(java.time.temporal.TemporalField,long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <param name="arg1"><see cref="long"/></param>
+        /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
+        public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, long arg1)
+        {
+            return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#range(java.time.temporal.TemporalField)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
+        public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#getLong(java.time.temporal.TemporalField)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <returns><see cref="long"/></returns>
+        public long GetLong(Java.Time.Temporal.TemporalField arg0)
+        {
+            return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toEpochSecond()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long ToEpochSecond()
+        {
+            return IExecuteWithSignature<long>("toEpochSecond", "()J");
+        }
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region IChronoZonedDateTime<D>
+    /// <summary>
+    /// .NET interface for TO BE DEFINED FROM USER
+    /// </summary>
+    public partial interface IChronoZonedDateTime<D>
+    {
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+
+    #region ChronoZonedDateTime<D>
+    public partial class ChronoZonedDateTime<D> : Java.Time.Chrono.IChronoZonedDateTime<D>, Java.Time.Temporal.ITemporal, Java.Lang.IComparable<Java.Time.Chrono.ChronoZonedDateTime>
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+        /// <summary>
+        /// Converter from <see cref="Java.Time.Chrono.ChronoZonedDateTime{D}"/> to <see cref="Java.Time.Temporal.Temporal"/>
+        /// </summary>
+        public static implicit operator Java.Time.Temporal.Temporal(Java.Time.Chrono.ChronoZonedDateTime<D> t) => t.Cast<Java.Time.Temporal.Temporal>();
+        /// <summary>
+        /// Converter from <see cref="Java.Time.Chrono.ChronoZonedDateTime{D}"/> to <see cref="Java.Lang.Comparable"/>
+        /// </summary>
+        public static implicit operator Java.Lang.Comparable(Java.Time.Chrono.ChronoZonedDateTime<D> t) => t.Cast<Java.Lang.Comparable>();
+        /// <summary>
+        /// Converter from <see cref="Java.Time.Chrono.ChronoZonedDateTime{D}"/> to <see cref="Java.Time.Chrono.ChronoZonedDateTime"/>
+        /// </summary>
+        public static implicit operator Java.Time.Chrono.ChronoZonedDateTime(Java.Time.Chrono.ChronoZonedDateTime<D> t) => t.Cast<Java.Time.Chrono.ChronoZonedDateTime>();
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
+        /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
+        public static Java.Time.Chrono.ChronoZonedDateTime From(Java.Time.Temporal.TemporalAccessor arg0)
+        {
+            return SExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
+        }
+
+        #endregion
+
+        #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
+        {
+            return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toLocalDateTime()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></returns>
+        public Java.Time.Chrono.ChronoLocalDateTime<D> ToLocalDateTime()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDateTime<D>>("toLocalDateTime", "()Ljava/time/chrono/ChronoLocalDateTime;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#withEarlierOffsetAtOverlap()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
+        public Java.Time.Chrono.ChronoZonedDateTime<D> WithEarlierOffsetAtOverlap()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime<D>>("withEarlierOffsetAtOverlap", "()Ljava/time/chrono/ChronoZonedDateTime;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#withLaterOffsetAtOverlap()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
+        public Java.Time.Chrono.ChronoZonedDateTime<D> WithLaterOffsetAtOverlap()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime<D>>("withLaterOffsetAtOverlap", "()Ljava/time/chrono/ChronoZonedDateTime;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#withZoneSameInstant(java.time.ZoneId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
+        /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
+        public Java.Time.Chrono.ChronoZonedDateTime<D> WithZoneSameInstant(Java.Time.ZoneId arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime<D>>("withZoneSameInstant", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#withZoneSameLocal(java.time.ZoneId)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
+        /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
+        public Java.Time.Chrono.ChronoZonedDateTime<D> WithZoneSameLocal(Java.Time.ZoneId arg0)
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime<D>>("withZoneSameLocal", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#getZone()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneId"/></returns>
+        public Java.Time.ZoneId GetZone()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#getOffset()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffset()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
+        /// <typeparam name="R"></typeparam>
+        /// <returns><typeparamref name="R"/></returns>
+        public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
+        {
+            return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isAfter(java.time.chrono.ChronoZonedDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsAfter(Java.Time.Chrono.ChronoZonedDateTime arg0)
+        {
+            return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/chrono/ChronoZonedDateTime;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isBefore(java.time.chrono.ChronoZonedDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsBefore(Java.Time.Chrono.ChronoZonedDateTime arg0)
+        {
+            return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/chrono/ChronoZonedDateTime;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isEqual(java.time.chrono.ChronoZonedDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEqual(Java.Time.Chrono.ChronoZonedDateTime arg0)
+        {
+            return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/chrono/ChronoZonedDateTime;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
+        {
+            return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toLocalDate()"/>
+        /// </summary>
+        /// <returns><typeparamref name="D"/></returns>
+        public D ToLocalDate()
+        {
+            return IExecuteWithSignature<D>("toLocalDate", "()Ljava/time/chrono/ChronoLocalDate;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -197,7 +526,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#compareTo(java.time.chrono.ChronoZonedDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#compareTo(java.time.chrono.ChronoZonedDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></param>
         /// <returns><see cref="int"/></returns>
@@ -206,7 +535,7 @@ public int CompareTo(Java.Time.Chrono.ChronoZonedDateTime arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/ChronoZonedDateTime;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -215,7 +544,7 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -224,7 +553,15 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#toInstant()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#getChronology()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toInstant()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Instant"/></returns>
         public Java.Time.Instant ToInstant()
@@ -232,7 +569,7 @@ public Java.Time.Instant ToInstant()
             return IExecuteWithSignature<Java.Time.Instant>("toInstant", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#toLocalTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toLocalTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
         public Java.Time.LocalTime ToLocalTime()
@@ -240,7 +577,7 @@ public Java.Time.LocalTime ToLocalTime()
             return IExecuteWithSignature<Java.Time.LocalTime>("toLocalTime", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -249,7 +586,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -259,7 +596,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -268,7 +605,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -278,7 +615,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -287,7 +624,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -297,7 +634,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -306,7 +643,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -315,7 +652,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ChronoZonedDateTime.html#toEpochSecond()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ChronoZonedDateTime.html#toEpochSecond()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToEpochSecond()
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/Chronology.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/Chronology.cs
index 72a4b1952..a99d30993 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/Chronology.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/Chronology.cs
@@ -60,14 +60,7 @@ public partial class Chronology : Java.Time.Chrono.IChronology
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#getAvailableChronologies()"/> 
-        /// </summary>
-        public static Java.Util.Set<Java.Time.Chrono.Chronology> AvailableChronologies
-        {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Time.Chrono.Chronology>>(LocalBridgeClazz, "getAvailableChronologies", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
@@ -76,7 +69,7 @@ public static Java.Time.Chrono.Chronology From(Java.Time.Temporal.TemporalAccess
             return SExecuteWithSignature<Java.Time.Chrono.Chronology>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/Chronology;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#of(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#of(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
@@ -85,7 +78,7 @@ public static Java.Time.Chrono.Chronology Of(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Chrono.Chronology>(LocalBridgeClazz, "of", "(Ljava/lang/String;)Ljava/time/chrono/Chronology;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#ofLocale(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#ofLocale(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
@@ -93,26 +86,20 @@ public static Java.Time.Chrono.Chronology OfLocale(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<Java.Time.Chrono.Chronology>(LocalBridgeClazz, "ofLocale", "(Ljava/util/Locale;)Ljava/time/chrono/Chronology;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#getCalendarType()"/> 
-        /// </summary>
-        public Java.Lang.String CalendarType
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCalendarType", "()Ljava/lang/String;"); }
-        }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#getAvailableChronologies()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Time.Chrono.Chronology> GetAvailableChronologies()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Time.Chrono.Chronology>>(LocalBridgeClazz, "getAvailableChronologies", "()Ljava/util/Set;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#isLeapYear(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#isLeapYear(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -121,7 +108,7 @@ public bool IsLeapYear(long arg0)
             return IExecuteWithSignature<bool>("isLeapYear", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#compareTo(java.time.chrono.Chronology)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#compareTo(java.time.chrono.Chronology)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.Chronology"/></param>
         /// <returns><see cref="int"/></returns>
@@ -130,7 +117,7 @@ public int CompareTo(Java.Time.Chrono.Chronology arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/Chronology;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#prolepticYear(java.time.chrono.Era,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#prolepticYear(java.time.chrono.Era,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.Era"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -140,7 +127,23 @@ public int ProlepticYear(Java.Time.Chrono.Era arg0, int arg1)
             return IExecute<int>("prolepticYear", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#date(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#getCalendarType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCalendarType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCalendarType", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#getId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#date(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -151,7 +154,7 @@ public Java.Time.Chrono.ChronoLocalDate Date(int arg0, int arg1, int arg2)
             return IExecute<Java.Time.Chrono.ChronoLocalDate>("date", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#date(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#date(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
@@ -160,7 +163,7 @@ public Java.Time.Chrono.ChronoLocalDate Date(Java.Time.Temporal.TemporalAccessor
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("date", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#dateEpochDay(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#dateEpochDay(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
@@ -169,7 +172,7 @@ public Java.Time.Chrono.ChronoLocalDate DateEpochDay(long arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("dateEpochDay", "(J)Ljava/time/chrono/ChronoLocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#dateYearDay(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#dateYearDay(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -179,7 +182,7 @@ public Java.Time.Chrono.ChronoLocalDate DateYearDay(int arg0, int arg1)
             return IExecute<Java.Time.Chrono.ChronoLocalDate>("dateYearDay", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#resolveDate(java.util.Map,java.time.format.ResolverStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#resolveDate(java.util.Map,java.time.format.ResolverStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.ResolverStyle"/></param>
@@ -189,7 +192,7 @@ public Java.Time.Chrono.ChronoLocalDate ResolveDate(Java.Util.Map<Java.Time.Temp
             return IExecute<Java.Time.Chrono.ChronoLocalDate>("resolveDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#eraOf(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#eraOf(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Chrono.Era"/></returns>
@@ -198,7 +201,7 @@ public Java.Time.Chrono.Era EraOf(int arg0)
             return IExecuteWithSignature<Java.Time.Chrono.Era>("eraOf", "(I)Ljava/time/chrono/Era;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#range(java.time.temporal.ChronoField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#range(java.time.temporal.ChronoField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.ChronoField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -207,7 +210,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.ChronoField arg0)
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/ChronoField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#eras()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#eras()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         public Java.Util.List<Java.Time.Chrono.Era> Eras()
@@ -215,7 +218,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.ChronoField arg0)
             return IExecuteWithSignature<Java.Util.List<Java.Time.Chrono.Era>>("eras", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -224,7 +227,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -234,7 +237,7 @@ public Java.Lang.String GetDisplayName(Java.Time.Format.TextStyle arg0, Java.Uti
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#date(java.time.chrono.Era,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#date(java.time.chrono.Era,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.Era"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -246,7 +249,7 @@ public Java.Time.Chrono.ChronoLocalDate Date(Java.Time.Chrono.Era arg0, int arg1
             return IExecute<Java.Time.Chrono.ChronoLocalDate>("date", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#dateNow()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#dateNow()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
         public Java.Time.Chrono.ChronoLocalDate DateNow()
@@ -254,7 +257,7 @@ public Java.Time.Chrono.ChronoLocalDate DateNow()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("dateNow", "()Ljava/time/chrono/ChronoLocalDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#dateNow(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#dateNow(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
@@ -263,7 +266,7 @@ public Java.Time.Chrono.ChronoLocalDate DateNow(Java.Time.Clock arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("dateNow", "(Ljava/time/Clock;)Ljava/time/chrono/ChronoLocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#dateNow(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#dateNow(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
@@ -272,7 +275,7 @@ public Java.Time.Chrono.ChronoLocalDate DateNow(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("dateNow", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoLocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#dateYearDay(java.time.chrono.Era,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#dateYearDay(java.time.chrono.Era,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.Era"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -283,16 +286,17 @@ public Java.Time.Chrono.ChronoLocalDate DateYearDay(Java.Time.Chrono.Era arg0, i
             return IExecute<Java.Time.Chrono.ChronoLocalDate>("dateYearDay", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#localDateTime(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#localDateTime(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
+        /// <typeparam name="ReturnExtendsJava_Time_Chrono_ChronoLocalDate"><see cref="Java.Time.Chrono.ChronoLocalDate"/></typeparam>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></returns>
-        public Java.Time.Chrono.ChronoLocalDateTime LocalDateTime(Java.Time.Temporal.TemporalAccessor arg0)
+        public Java.Time.Chrono.ChronoLocalDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate> LocalDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate>(Java.Time.Temporal.TemporalAccessor arg0) where ReturnExtendsJava_Time_Chrono_ChronoLocalDate : Java.Time.Chrono.ChronoLocalDate, new()
         {
-            return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDateTime>("localDateTime", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime;", arg0);
+            return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate>>("localDateTime", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoLocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#period(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#period(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -303,26 +307,28 @@ public Java.Time.Chrono.ChronoPeriod Period(int arg0, int arg1, int arg2)
             return IExecute<Java.Time.Chrono.ChronoPeriod>("period", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#zonedDateTime(java.time.Instant,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#zonedDateTime(java.time.Instant,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
+        /// <typeparam name="ReturnExtendsJava_Time_Chrono_ChronoLocalDate"><see cref="Java.Time.Chrono.ChronoLocalDate"/></typeparam>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
-        public Java.Time.Chrono.ChronoZonedDateTime ZonedDateTime(Java.Time.Instant arg0, Java.Time.ZoneId arg1)
+        public Java.Time.Chrono.ChronoZonedDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate> ZonedDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate>(Java.Time.Instant arg0, Java.Time.ZoneId arg1) where ReturnExtendsJava_Time_Chrono_ChronoLocalDate : Java.Time.Chrono.ChronoLocalDate, new()
         {
-            return IExecute<Java.Time.Chrono.ChronoZonedDateTime>("zonedDateTime", arg0, arg1);
+            return IExecute<Java.Time.Chrono.ChronoZonedDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate>>("zonedDateTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#zonedDateTime(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#zonedDateTime(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
+        /// <typeparam name="ReturnExtendsJava_Time_Chrono_ChronoLocalDate"><see cref="Java.Time.Chrono.ChronoLocalDate"/></typeparam>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
-        public Java.Time.Chrono.ChronoZonedDateTime ZonedDateTime(Java.Time.Temporal.TemporalAccessor arg0)
+        public Java.Time.Chrono.ChronoZonedDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate> ZonedDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate>(Java.Time.Temporal.TemporalAccessor arg0) where ReturnExtendsJava_Time_Chrono_ChronoLocalDate : Java.Time.Chrono.ChronoLocalDate, new()
         {
-            return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("zonedDateTime", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
+            return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime<ReturnExtendsJava_Time_Chrono_ChronoLocalDate>>("zonedDateTime", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#epochSecond(int,int,int,int,int,int,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#epochSecond(int,int,int,int,int,int,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -337,7 +343,7 @@ public long EpochSecond(int arg0, int arg1, int arg2, int arg3, int arg4, int ar
             return IExecute<long>("epochSecond", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Chronology.html#epochSecond(java.time.chrono.Era,int,int,int,int,int,int,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Chronology.html#epochSecond(java.time.chrono.Era,int,int,int,int,int,int,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.Era"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/Era.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/Era.cs
index 56411b6e1..27a1bd59c 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/Era.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/Era.cs
@@ -72,14 +72,15 @@ public partial class Era : Java.Time.Chrono.IEra, Java.Time.Temporal.ITemporalAc
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html#getValue()"/>
         /// </summary>
-        public int Value
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
         {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
+            return IExecuteWithSignature<int>("getValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -89,7 +90,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -98,7 +99,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -107,7 +108,7 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -117,7 +118,7 @@ public Java.Lang.String GetDisplayName(Java.Time.Format.TextStyle arg0, Java.Uti
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -126,7 +127,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -135,7 +136,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/Era.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/Era.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahChronology.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahChronology.cs
index 81f351c9e..47f44a9dc 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahChronology.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahChronology.cs
@@ -42,7 +42,7 @@ public partial class HijrahChronology
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahChronology.html#INSTANCE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahChronology.html#INSTANCE"/>
         /// </summary>
         public static Java.Time.Chrono.HijrahChronology INSTANCE { get { if (!_INSTANCEReady) { _INSTANCEContent = SGetField<Java.Time.Chrono.HijrahChronology>(LocalBridgeClazz, "INSTANCE"); _INSTANCEReady = true; } return _INSTANCEContent; } }
         private static Java.Time.Chrono.HijrahChronology _INSTANCEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahDate.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahDate.cs
index 63c01c43d..b08b01600 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahDate.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahDate.cs
@@ -50,7 +50,7 @@ public partial class HijrahDate : Java.Time.Chrono.IChronoLocalDate, Java.Io.ISe
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahDate.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahDate.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.HijrahDate"/></returns>
         public static Java.Time.Chrono.HijrahDate Now()
@@ -58,7 +58,7 @@ public static Java.Time.Chrono.HijrahDate Now()
             return SExecuteWithSignature<Java.Time.Chrono.HijrahDate>(LocalBridgeClazz, "now", "()Ljava/time/chrono/HijrahDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahDate.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahDate.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.Chrono.HijrahDate"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.Chrono.HijrahDate Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.Chrono.HijrahDate>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/chrono/HijrahDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahDate.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahDate.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.HijrahDate"/></returns>
@@ -76,7 +76,7 @@ public static Java.Time.Chrono.HijrahDate Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.Chrono.HijrahDate>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/chrono/HijrahDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahDate.html#of(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahDate.html#of(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -91,7 +91,7 @@ public static Java.Time.Chrono.HijrahDate Of(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahDate.html#withVariant(java.time.chrono.HijrahChronology)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahDate.html#withVariant(java.time.chrono.HijrahChronology)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.HijrahChronology"/></param>
         /// <returns><see cref="Java.Time.Chrono.HijrahDate"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahEra.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahEra.cs
index 56414972f..d9160a634 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahEra.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/HijrahEra.cs
@@ -42,7 +42,7 @@ public partial class HijrahEra
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahEra.html#AH"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahEra.html#AH"/>
         /// </summary>
         public static Java.Time.Chrono.HijrahEra AH { get { if (!_AHReady) { _AHContent = SGetField<Java.Time.Chrono.HijrahEra>(LocalBridgeClazz, "AH"); _AHReady = true; } return _AHContent; } }
         private static Java.Time.Chrono.HijrahEra _AHContent = default;
@@ -52,7 +52,7 @@ public partial class HijrahEra
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahEra.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahEra.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Chrono.HijrahEra"/></returns>
@@ -61,7 +61,7 @@ public static Java.Time.Chrono.HijrahEra Of(int arg0)
             return SExecuteWithSignature<Java.Time.Chrono.HijrahEra>(LocalBridgeClazz, "of", "(I)Ljava/time/chrono/HijrahEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahEra.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahEra.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Chrono.HijrahEra"/></returns>
@@ -70,7 +70,7 @@ public static Java.Time.Chrono.HijrahEra ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Chrono.HijrahEra>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/chrono/HijrahEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahEra.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahEra.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.HijrahEra"/></returns>
         public static Java.Time.Chrono.HijrahEra[] Values()
@@ -82,14 +82,15 @@ public static Java.Time.Chrono.HijrahEra[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahEra.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahEra.html#getValue()"/>
         /// </summary>
-        public int Value
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
         {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
+            return IExecuteWithSignature<int>("getValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahEra.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahEra.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -99,7 +100,7 @@ public Java.Lang.String GetDisplayName(Java.Time.Format.TextStyle arg0, Java.Uti
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/HijrahEra.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/HijrahEra.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/IsoChronology.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/IsoChronology.cs
index cf4d85b84..2e56bad7e 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/IsoChronology.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/IsoChronology.cs
@@ -42,7 +42,7 @@ public partial class IsoChronology
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoChronology.html#INSTANCE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/IsoChronology.html#INSTANCE"/>
         /// </summary>
         public static Java.Time.Chrono.IsoChronology INSTANCE { get { if (!_INSTANCEReady) { _INSTANCEContent = SGetField<Java.Time.Chrono.IsoChronology>(LocalBridgeClazz, "INSTANCE"); _INSTANCEReady = true; } return _INSTANCEContent; } }
         private static Java.Time.Chrono.IsoChronology _INSTANCEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/IsoEra.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/IsoEra.cs
index c9a61e9e7..51beb08e8 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/IsoEra.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/IsoEra.cs
@@ -42,13 +42,13 @@ public partial class IsoEra
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoEra.html#BCE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/IsoEra.html#BCE"/>
         /// </summary>
         public static Java.Time.Chrono.IsoEra BCE { get { if (!_BCEReady) { _BCEContent = SGetField<Java.Time.Chrono.IsoEra>(LocalBridgeClazz, "BCE"); _BCEReady = true; } return _BCEContent; } }
         private static Java.Time.Chrono.IsoEra _BCEContent = default;
         private static bool _BCEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoEra.html#CE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/IsoEra.html#CE"/>
         /// </summary>
         public static Java.Time.Chrono.IsoEra CE { get { if (!_CEReady) { _CEContent = SGetField<Java.Time.Chrono.IsoEra>(LocalBridgeClazz, "CE"); _CEReady = true; } return _CEContent; } }
         private static Java.Time.Chrono.IsoEra _CEContent = default;
@@ -58,7 +58,7 @@ public partial class IsoEra
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoEra.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/IsoEra.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Chrono.IsoEra"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.Chrono.IsoEra Of(int arg0)
             return SExecuteWithSignature<Java.Time.Chrono.IsoEra>(LocalBridgeClazz, "of", "(I)Ljava/time/chrono/IsoEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoEra.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/IsoEra.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Chrono.IsoEra"/></returns>
@@ -76,7 +76,7 @@ public static Java.Time.Chrono.IsoEra ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Chrono.IsoEra>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/chrono/IsoEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoEra.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/IsoEra.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.IsoEra"/></returns>
         public static Java.Time.Chrono.IsoEra[] Values()
@@ -88,11 +88,12 @@ public static Java.Time.Chrono.IsoEra[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/IsoEra.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/IsoEra.html#getValue()"/>
         /// </summary>
-        public int Value
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
         {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
+            return IExecuteWithSignature<int>("getValue", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseChronology.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseChronology.cs
index 97660957f..84a746b87 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseChronology.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseChronology.cs
@@ -42,7 +42,7 @@ public partial class JapaneseChronology
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseChronology.html#INSTANCE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseChronology.html#INSTANCE"/>
         /// </summary>
         public static Java.Time.Chrono.JapaneseChronology INSTANCE { get { if (!_INSTANCEReady) { _INSTANCEContent = SGetField<Java.Time.Chrono.JapaneseChronology>(LocalBridgeClazz, "INSTANCE"); _INSTANCEReady = true; } return _INSTANCEContent; } }
         private static Java.Time.Chrono.JapaneseChronology _INSTANCEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseDate.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseDate.cs
index 6070f4368..3110bb031 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseDate.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseDate.cs
@@ -50,7 +50,7 @@ public partial class JapaneseDate : Java.Time.Chrono.IChronoLocalDate, Java.Io.I
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseDate.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseDate.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.JapaneseDate"/></returns>
         public static Java.Time.Chrono.JapaneseDate Now()
@@ -58,7 +58,7 @@ public static Java.Time.Chrono.JapaneseDate Now()
             return SExecuteWithSignature<Java.Time.Chrono.JapaneseDate>(LocalBridgeClazz, "now", "()Ljava/time/chrono/JapaneseDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseDate.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseDate.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.Chrono.JapaneseDate"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.Chrono.JapaneseDate Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.Chrono.JapaneseDate>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/chrono/JapaneseDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseDate.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseDate.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.JapaneseDate"/></returns>
@@ -76,7 +76,7 @@ public static Java.Time.Chrono.JapaneseDate Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.Chrono.JapaneseDate>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/chrono/JapaneseDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseDate.html#of(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseDate.html#of(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -87,7 +87,7 @@ public static Java.Time.Chrono.JapaneseDate Of(int arg0, int arg1, int arg2)
             return SExecute<Java.Time.Chrono.JapaneseDate>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseDate.html#of(java.time.chrono.JapaneseEra,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseDate.html#of(java.time.chrono.JapaneseEra,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.JapaneseEra"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseEra.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseEra.cs
index 3a3b66884..b5d44b48d 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseEra.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/JapaneseEra.cs
@@ -46,31 +46,25 @@ public partial class JapaneseEra : Java.Time.Chrono.IEra, Java.Io.ISerializable
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#HEISEI"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#HEISEI"/>
         /// </summary>
         public static Java.Time.Chrono.JapaneseEra HEISEI { get { if (!_HEISEIReady) { _HEISEIContent = SGetField<Java.Time.Chrono.JapaneseEra>(LocalBridgeClazz, "HEISEI"); _HEISEIReady = true; } return _HEISEIContent; } }
         private static Java.Time.Chrono.JapaneseEra _HEISEIContent = default;
         private static bool _HEISEIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#MEIJI"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#MEIJI"/>
         /// </summary>
         public static Java.Time.Chrono.JapaneseEra MEIJI { get { if (!_MEIJIReady) { _MEIJIContent = SGetField<Java.Time.Chrono.JapaneseEra>(LocalBridgeClazz, "MEIJI"); _MEIJIReady = true; } return _MEIJIContent; } }
         private static Java.Time.Chrono.JapaneseEra _MEIJIContent = default;
         private static bool _MEIJIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#REIWA"/>
-        /// </summary>
-        public static Java.Time.Chrono.JapaneseEra REIWA { get { if (!_REIWAReady) { _REIWAContent = SGetField<Java.Time.Chrono.JapaneseEra>(LocalBridgeClazz, "REIWA"); _REIWAReady = true; } return _REIWAContent; } }
-        private static Java.Time.Chrono.JapaneseEra _REIWAContent = default;
-        private static bool _REIWAReady = false; // this is used because in case of generics 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#SHOWA"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#SHOWA"/>
         /// </summary>
         public static Java.Time.Chrono.JapaneseEra SHOWA { get { if (!_SHOWAReady) { _SHOWAContent = SGetField<Java.Time.Chrono.JapaneseEra>(LocalBridgeClazz, "SHOWA"); _SHOWAReady = true; } return _SHOWAContent; } }
         private static Java.Time.Chrono.JapaneseEra _SHOWAContent = default;
         private static bool _SHOWAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#TAISHO"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#TAISHO"/>
         /// </summary>
         public static Java.Time.Chrono.JapaneseEra TAISHO { get { if (!_TAISHOReady) { _TAISHOContent = SGetField<Java.Time.Chrono.JapaneseEra>(LocalBridgeClazz, "TAISHO"); _TAISHOReady = true; } return _TAISHOContent; } }
         private static Java.Time.Chrono.JapaneseEra _TAISHOContent = default;
@@ -80,7 +74,7 @@ public partial class JapaneseEra : Java.Time.Chrono.IEra, Java.Io.ISerializable
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Chrono.JapaneseEra"/></returns>
@@ -89,7 +83,7 @@ public static Java.Time.Chrono.JapaneseEra Of(int arg0)
             return SExecuteWithSignature<Java.Time.Chrono.JapaneseEra>(LocalBridgeClazz, "of", "(I)Ljava/time/chrono/JapaneseEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Chrono.JapaneseEra"/></returns>
@@ -98,7 +92,7 @@ public static Java.Time.Chrono.JapaneseEra ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Chrono.JapaneseEra>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/chrono/JapaneseEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.JapaneseEra"/></returns>
         public static Java.Time.Chrono.JapaneseEra[] Values()
@@ -110,14 +104,15 @@ public static Java.Time.Chrono.JapaneseEra[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#getValue()"/>
         /// </summary>
-        public int Value
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
         {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
+            return IExecuteWithSignature<int>("getValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -127,7 +122,7 @@ public Java.Lang.String GetDisplayName(Java.Time.Format.TextStyle arg0, Java.Uti
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/JapaneseEra.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/JapaneseEra.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoChronology.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoChronology.cs
index d9d5a15e9..0bf7a4a02 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoChronology.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoChronology.cs
@@ -42,7 +42,7 @@ public partial class MinguoChronology
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoChronology.html#INSTANCE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoChronology.html#INSTANCE"/>
         /// </summary>
         public static Java.Time.Chrono.MinguoChronology INSTANCE { get { if (!_INSTANCEReady) { _INSTANCEContent = SGetField<Java.Time.Chrono.MinguoChronology>(LocalBridgeClazz, "INSTANCE"); _INSTANCEReady = true; } return _INSTANCEContent; } }
         private static Java.Time.Chrono.MinguoChronology _INSTANCEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoDate.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoDate.cs
index 5d51f2d62..3bb5b71e2 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoDate.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoDate.cs
@@ -50,7 +50,7 @@ public partial class MinguoDate : Java.Time.Chrono.IChronoLocalDate, Java.Io.ISe
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoDate.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoDate.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.MinguoDate"/></returns>
         public static Java.Time.Chrono.MinguoDate Now()
@@ -58,7 +58,7 @@ public static Java.Time.Chrono.MinguoDate Now()
             return SExecuteWithSignature<Java.Time.Chrono.MinguoDate>(LocalBridgeClazz, "now", "()Ljava/time/chrono/MinguoDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoDate.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoDate.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.Chrono.MinguoDate"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.Chrono.MinguoDate Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.Chrono.MinguoDate>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/chrono/MinguoDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoDate.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoDate.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.MinguoDate"/></returns>
@@ -76,7 +76,7 @@ public static Java.Time.Chrono.MinguoDate Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.Chrono.MinguoDate>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/chrono/MinguoDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoDate.html#of(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoDate.html#of(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoEra.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoEra.cs
index 2a77da093..3de7de47c 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoEra.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/MinguoEra.cs
@@ -42,13 +42,13 @@ public partial class MinguoEra
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoEra.html#BEFORE_ROC"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoEra.html#BEFORE_ROC"/>
         /// </summary>
         public static Java.Time.Chrono.MinguoEra BEFORE_ROC { get { if (!_BEFORE_ROCReady) { _BEFORE_ROCContent = SGetField<Java.Time.Chrono.MinguoEra>(LocalBridgeClazz, "BEFORE_ROC"); _BEFORE_ROCReady = true; } return _BEFORE_ROCContent; } }
         private static Java.Time.Chrono.MinguoEra _BEFORE_ROCContent = default;
         private static bool _BEFORE_ROCReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoEra.html#ROC"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoEra.html#ROC"/>
         /// </summary>
         public static Java.Time.Chrono.MinguoEra ROC { get { if (!_ROCReady) { _ROCContent = SGetField<Java.Time.Chrono.MinguoEra>(LocalBridgeClazz, "ROC"); _ROCReady = true; } return _ROCContent; } }
         private static Java.Time.Chrono.MinguoEra _ROCContent = default;
@@ -58,7 +58,7 @@ public partial class MinguoEra
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoEra.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoEra.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Chrono.MinguoEra"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.Chrono.MinguoEra Of(int arg0)
             return SExecuteWithSignature<Java.Time.Chrono.MinguoEra>(LocalBridgeClazz, "of", "(I)Ljava/time/chrono/MinguoEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoEra.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoEra.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Chrono.MinguoEra"/></returns>
@@ -76,7 +76,7 @@ public static Java.Time.Chrono.MinguoEra ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Chrono.MinguoEra>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/chrono/MinguoEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoEra.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoEra.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.MinguoEra"/></returns>
         public static Java.Time.Chrono.MinguoEra[] Values()
@@ -88,14 +88,15 @@ public static Java.Time.Chrono.MinguoEra[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoEra.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoEra.html#getValue()"/>
         /// </summary>
-        public int Value
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
         {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
+            return IExecuteWithSignature<int>("getValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/MinguoEra.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/MinguoEra.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistChronology.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistChronology.cs
index 4f8cf040d..91b21f763 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistChronology.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistChronology.cs
@@ -42,7 +42,7 @@ public partial class ThaiBuddhistChronology
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistChronology.html#INSTANCE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistChronology.html#INSTANCE"/>
         /// </summary>
         public static Java.Time.Chrono.ThaiBuddhistChronology INSTANCE { get { if (!_INSTANCEReady) { _INSTANCEContent = SGetField<Java.Time.Chrono.ThaiBuddhistChronology>(LocalBridgeClazz, "INSTANCE"); _INSTANCEReady = true; } return _INSTANCEContent; } }
         private static Java.Time.Chrono.ThaiBuddhistChronology _INSTANCEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistDate.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistDate.cs
index 2fb1a35ae..48cee76d3 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistDate.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistDate.cs
@@ -50,7 +50,7 @@ public partial class ThaiBuddhistDate : Java.Time.Chrono.IChronoLocalDate, Java.
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistDate.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistDate.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ThaiBuddhistDate"/></returns>
         public static Java.Time.Chrono.ThaiBuddhistDate Now()
@@ -58,7 +58,7 @@ public static Java.Time.Chrono.ThaiBuddhistDate Now()
             return SExecuteWithSignature<Java.Time.Chrono.ThaiBuddhistDate>(LocalBridgeClazz, "now", "()Ljava/time/chrono/ThaiBuddhistDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistDate.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistDate.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.Chrono.ThaiBuddhistDate"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.Chrono.ThaiBuddhistDate Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.Chrono.ThaiBuddhistDate>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/chrono/ThaiBuddhistDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistDate.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistDate.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.ThaiBuddhistDate"/></returns>
@@ -76,7 +76,7 @@ public static Java.Time.Chrono.ThaiBuddhistDate Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.Chrono.ThaiBuddhistDate>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/chrono/ThaiBuddhistDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistDate.html#of(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistDate.html#of(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistEra.cs b/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistEra.cs
index 1daeeac36..aa6be7125 100644
--- a/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistEra.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Chrono/ThaiBuddhistEra.cs
@@ -42,13 +42,13 @@ public partial class ThaiBuddhistEra
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistEra.html#BE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistEra.html#BE"/>
         /// </summary>
         public static Java.Time.Chrono.ThaiBuddhistEra BE { get { if (!_BEReady) { _BEContent = SGetField<Java.Time.Chrono.ThaiBuddhistEra>(LocalBridgeClazz, "BE"); _BEReady = true; } return _BEContent; } }
         private static Java.Time.Chrono.ThaiBuddhistEra _BEContent = default;
         private static bool _BEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistEra.html#BEFORE_BE"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistEra.html#BEFORE_BE"/>
         /// </summary>
         public static Java.Time.Chrono.ThaiBuddhistEra BEFORE_BE { get { if (!_BEFORE_BEReady) { _BEFORE_BEContent = SGetField<Java.Time.Chrono.ThaiBuddhistEra>(LocalBridgeClazz, "BEFORE_BE"); _BEFORE_BEReady = true; } return _BEFORE_BEContent; } }
         private static Java.Time.Chrono.ThaiBuddhistEra _BEFORE_BEContent = default;
@@ -58,7 +58,7 @@ public partial class ThaiBuddhistEra
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistEra.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistEra.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Chrono.ThaiBuddhistEra"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.Chrono.ThaiBuddhistEra Of(int arg0)
             return SExecuteWithSignature<Java.Time.Chrono.ThaiBuddhistEra>(LocalBridgeClazz, "of", "(I)Ljava/time/chrono/ThaiBuddhistEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistEra.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistEra.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Chrono.ThaiBuddhistEra"/></returns>
@@ -76,7 +76,7 @@ public static Java.Time.Chrono.ThaiBuddhistEra ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Chrono.ThaiBuddhistEra>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/chrono/ThaiBuddhistEra;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistEra.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistEra.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ThaiBuddhistEra"/></returns>
         public static Java.Time.Chrono.ThaiBuddhistEra[] Values()
@@ -88,14 +88,15 @@ public static Java.Time.Chrono.ThaiBuddhistEra[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistEra.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistEra.html#getValue()"/>
         /// </summary>
-        public int Value
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
         {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
+            return IExecuteWithSignature<int>("getValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/chrono/ThaiBuddhistEra.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/chrono/ThaiBuddhistEra.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Clock.cs b/src/net/Netdroid/Generated/Java/Time/Clock.cs
index 4ff677952..c3386957a 100644
--- a/src/net/Netdroid/Generated/Java/Time/Clock.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Clock.cs
@@ -42,7 +42,7 @@ public partial class Clock
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#fixed(java.time.Instant,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#fixed(java.time.Instant,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -52,7 +52,7 @@ public static Java.Time.Clock Fixed(Java.Time.Instant arg0, Java.Time.ZoneId arg
             return SExecute<Java.Time.Clock>(LocalBridgeClazz, "fixed", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#offset(java.time.Clock,java.time.Duration)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#offset(java.time.Clock,java.time.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <param name="arg1"><see cref="Java.Time.Duration"/></param>
@@ -62,7 +62,7 @@ public static Java.Time.Clock Offset(Java.Time.Clock arg0, Java.Time.Duration ar
             return SExecute<Java.Time.Clock>(LocalBridgeClazz, "offset", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#system(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#system(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Clock"/></returns>
@@ -71,7 +71,7 @@ public static Java.Time.Clock System(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.Clock>(LocalBridgeClazz, "system", "(Ljava/time/ZoneId;)Ljava/time/Clock;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#systemDefaultZone()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#systemDefaultZone()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Clock"/></returns>
         public static Java.Time.Clock SystemDefaultZone()
@@ -79,7 +79,7 @@ public static Java.Time.Clock SystemDefaultZone()
             return SExecuteWithSignature<Java.Time.Clock>(LocalBridgeClazz, "systemDefaultZone", "()Ljava/time/Clock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#systemUTC()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#systemUTC()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Clock"/></returns>
         public static Java.Time.Clock SystemUTC()
@@ -87,7 +87,7 @@ public static Java.Time.Clock SystemUTC()
             return SExecuteWithSignature<Java.Time.Clock>(LocalBridgeClazz, "systemUTC", "()Ljava/time/Clock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#tick(java.time.Clock,java.time.Duration)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#tick(java.time.Clock,java.time.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <param name="arg1"><see cref="Java.Time.Duration"/></param>
@@ -97,7 +97,7 @@ public static Java.Time.Clock Tick(Java.Time.Clock arg0, Java.Time.Duration arg1
             return SExecute<Java.Time.Clock>(LocalBridgeClazz, "tick", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#tickMillis(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#tickMillis(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Clock"/></returns>
@@ -106,7 +106,7 @@ public static Java.Time.Clock TickMillis(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.Clock>(LocalBridgeClazz, "tickMillis", "(Ljava/time/ZoneId;)Ljava/time/Clock;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#tickMinutes(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#tickMinutes(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Clock"/></returns>
@@ -115,7 +115,7 @@ public static Java.Time.Clock TickMinutes(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.Clock>(LocalBridgeClazz, "tickMinutes", "(Ljava/time/ZoneId;)Ljava/time/Clock;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#tickSeconds(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#tickSeconds(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Clock"/></returns>
@@ -128,14 +128,7 @@ public static Java.Time.Clock TickSeconds(Java.Time.ZoneId arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#getZone()"/> 
-        /// </summary>
-        public Java.Time.ZoneId Zone
-        {
-            get { return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#withZone(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#withZone(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Clock"/></returns>
@@ -144,7 +137,7 @@ public Java.Time.Clock WithZone(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.Clock>("withZone", "(Ljava/time/ZoneId;)Ljava/time/Clock;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#instant()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#instant()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Instant"/></returns>
         public Java.Time.Instant Instant()
@@ -152,7 +145,15 @@ public Java.Time.Instant Instant()
             return IExecuteWithSignature<Java.Time.Instant>("instant", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Clock.html#millis()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#getZone()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneId"/></returns>
+        public Java.Time.ZoneId GetZone()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Clock.html#millis()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Millis()
diff --git a/src/net/Netdroid/Generated/Java/Time/DayOfWeek.cs b/src/net/Netdroid/Generated/Java/Time/DayOfWeek.cs
index 858435af3..9baa75a19 100644
--- a/src/net/Netdroid/Generated/Java/Time/DayOfWeek.cs
+++ b/src/net/Netdroid/Generated/Java/Time/DayOfWeek.cs
@@ -46,43 +46,43 @@ public partial class DayOfWeek : Java.Time.Temporal.ITemporalAccessor, Java.Time
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#FRIDAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#FRIDAY"/>
         /// </summary>
         public static Java.Time.DayOfWeek FRIDAY { get { if (!_FRIDAYReady) { _FRIDAYContent = SGetField<Java.Time.DayOfWeek>(LocalBridgeClazz, "FRIDAY"); _FRIDAYReady = true; } return _FRIDAYContent; } }
         private static Java.Time.DayOfWeek _FRIDAYContent = default;
         private static bool _FRIDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#MONDAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#MONDAY"/>
         /// </summary>
         public static Java.Time.DayOfWeek MONDAY { get { if (!_MONDAYReady) { _MONDAYContent = SGetField<Java.Time.DayOfWeek>(LocalBridgeClazz, "MONDAY"); _MONDAYReady = true; } return _MONDAYContent; } }
         private static Java.Time.DayOfWeek _MONDAYContent = default;
         private static bool _MONDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#SATURDAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#SATURDAY"/>
         /// </summary>
         public static Java.Time.DayOfWeek SATURDAY { get { if (!_SATURDAYReady) { _SATURDAYContent = SGetField<Java.Time.DayOfWeek>(LocalBridgeClazz, "SATURDAY"); _SATURDAYReady = true; } return _SATURDAYContent; } }
         private static Java.Time.DayOfWeek _SATURDAYContent = default;
         private static bool _SATURDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#SUNDAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#SUNDAY"/>
         /// </summary>
         public static Java.Time.DayOfWeek SUNDAY { get { if (!_SUNDAYReady) { _SUNDAYContent = SGetField<Java.Time.DayOfWeek>(LocalBridgeClazz, "SUNDAY"); _SUNDAYReady = true; } return _SUNDAYContent; } }
         private static Java.Time.DayOfWeek _SUNDAYContent = default;
         private static bool _SUNDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#THURSDAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#THURSDAY"/>
         /// </summary>
         public static Java.Time.DayOfWeek THURSDAY { get { if (!_THURSDAYReady) { _THURSDAYContent = SGetField<Java.Time.DayOfWeek>(LocalBridgeClazz, "THURSDAY"); _THURSDAYReady = true; } return _THURSDAYContent; } }
         private static Java.Time.DayOfWeek _THURSDAYContent = default;
         private static bool _THURSDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#TUESDAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#TUESDAY"/>
         /// </summary>
         public static Java.Time.DayOfWeek TUESDAY { get { if (!_TUESDAYReady) { _TUESDAYContent = SGetField<Java.Time.DayOfWeek>(LocalBridgeClazz, "TUESDAY"); _TUESDAYReady = true; } return _TUESDAYContent; } }
         private static Java.Time.DayOfWeek _TUESDAYContent = default;
         private static bool _TUESDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#WEDNESDAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#WEDNESDAY"/>
         /// </summary>
         public static Java.Time.DayOfWeek WEDNESDAY { get { if (!_WEDNESDAYReady) { _WEDNESDAYContent = SGetField<Java.Time.DayOfWeek>(LocalBridgeClazz, "WEDNESDAY"); _WEDNESDAYReady = true; } return _WEDNESDAYContent; } }
         private static Java.Time.DayOfWeek _WEDNESDAYContent = default;
@@ -92,7 +92,7 @@ public partial class DayOfWeek : Java.Time.Temporal.ITemporalAccessor, Java.Time
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
@@ -101,7 +101,7 @@ public static Java.Time.DayOfWeek From(Java.Time.Temporal.TemporalAccessor arg0)
             return SExecuteWithSignature<Java.Time.DayOfWeek>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/DayOfWeek;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
@@ -110,7 +110,7 @@ public static Java.Time.DayOfWeek Of(int arg0)
             return SExecuteWithSignature<Java.Time.DayOfWeek>(LocalBridgeClazz, "of", "(I)Ljava/time/DayOfWeek;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
@@ -119,7 +119,7 @@ public static Java.Time.DayOfWeek ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.DayOfWeek>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/DayOfWeek;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
         public static Java.Time.DayOfWeek[] Values()
@@ -131,14 +131,7 @@ public static Java.Time.DayOfWeek[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#getValue()"/> 
-        /// </summary>
-        public int Value
-        {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -148,7 +141,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -157,7 +150,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -166,7 +159,15 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#getValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
+        {
+            return IExecuteWithSignature<int>("getValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -176,7 +177,7 @@ public Java.Lang.String GetDisplayName(Java.Time.Format.TextStyle arg0, Java.Uti
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#minus(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#minus(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
@@ -185,7 +186,7 @@ public Java.Time.DayOfWeek Minus(long arg0)
             return IExecuteWithSignature<Java.Time.DayOfWeek>("minus", "(J)Ljava/time/DayOfWeek;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#plus(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#plus(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
@@ -194,7 +195,7 @@ public Java.Time.DayOfWeek Plus(long arg0)
             return IExecuteWithSignature<Java.Time.DayOfWeek>("plus", "(J)Ljava/time/DayOfWeek;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -203,7 +204,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -212,7 +213,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/DayOfWeek.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/DayOfWeek.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Duration.cs b/src/net/Netdroid/Generated/Java/Time/Duration.cs
index 2118d9ca8..9bcfa573b 100644
--- a/src/net/Netdroid/Generated/Java/Time/Duration.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Duration.cs
@@ -50,7 +50,7 @@ public partial class Duration : Java.Time.Temporal.ITemporalAmount, Java.Lang.IC
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#ZERO"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#ZERO"/>
         /// </summary>
         public static Java.Time.Duration ZERO { get { if (!_ZEROReady) { _ZEROContent = SGetField<Java.Time.Duration>(LocalBridgeClazz, "ZERO"); _ZEROReady = true; } return _ZEROContent; } }
         private static Java.Time.Duration _ZEROContent = default;
@@ -60,7 +60,7 @@ public partial class Duration : Java.Time.Temporal.ITemporalAmount, Java.Lang.IC
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#between(java.time.temporal.Temporal,java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#between(java.time.temporal.Temporal,java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.Temporal"/></param>
@@ -70,7 +70,7 @@ public static Java.Time.Duration Between(Java.Time.Temporal.Temporal arg0, Java.
             return SExecute<Java.Time.Duration>(LocalBridgeClazz, "between", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#from(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#from(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -79,7 +79,7 @@ public static Java.Time.Duration From(Java.Time.Temporal.TemporalAmount arg0)
             return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#of(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#of(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -89,7 +89,7 @@ public static Java.Time.Duration Of(long arg0, Java.Time.Temporal.TemporalUnit a
             return SExecute<Java.Time.Duration>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#ofDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#ofDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -98,7 +98,7 @@ public static Java.Time.Duration OfDays(long arg0)
             return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "ofDays", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#ofHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#ofHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -107,7 +107,7 @@ public static Java.Time.Duration OfHours(long arg0)
             return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "ofHours", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#ofMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#ofMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -116,7 +116,7 @@ public static Java.Time.Duration OfMillis(long arg0)
             return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "ofMillis", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#ofMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#ofMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -125,7 +125,7 @@ public static Java.Time.Duration OfMinutes(long arg0)
             return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "ofMinutes", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#ofNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#ofNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -134,7 +134,7 @@ public static Java.Time.Duration OfNanos(long arg0)
             return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "ofNanos", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#ofSeconds(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#ofSeconds(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -144,7 +144,7 @@ public static Java.Time.Duration OfSeconds(long arg0, long arg1)
             return SExecute<Java.Time.Duration>(LocalBridgeClazz, "ofSeconds", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#ofSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#ofSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -153,7 +153,7 @@ public static Java.Time.Duration OfSeconds(long arg0)
             return SExecuteWithSignature<Java.Time.Duration>(LocalBridgeClazz, "ofSeconds", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -166,28 +166,7 @@ public static Java.Time.Duration Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#getNano()"/> 
-        /// </summary>
-        public int Nano
-        {
-            get { return IExecuteWithSignature<int>("getNano", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#getSeconds()"/> 
-        /// </summary>
-        public long Seconds
-        {
-            get { return IExecuteWithSignature<long>("getSeconds", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#getUnits()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Time.Temporal.TemporalUnit> Units
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Time.Temporal.TemporalUnit>>("getUnits", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#isNegative()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#isNegative()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNegative()
@@ -195,7 +174,7 @@ public bool IsNegative()
             return IExecuteWithSignature<bool>("isNegative", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#isZero()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#isZero()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsZero()
@@ -203,7 +182,7 @@ public bool IsZero()
             return IExecuteWithSignature<bool>("isZero", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -212,7 +191,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#compareTo(java.time.Duration)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#compareTo(java.time.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Duration"/></param>
         /// <returns><see cref="int"/></returns>
@@ -221,7 +200,15 @@ public int CompareTo(Java.Time.Duration arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/Duration;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toHoursPart()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#getNano()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNano()
+        {
+            return IExecuteWithSignature<int>("getNano", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toHoursPart()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ToHoursPart()
@@ -229,7 +216,7 @@ public int ToHoursPart()
             return IExecuteWithSignature<int>("toHoursPart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toMillisPart()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toMillisPart()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ToMillisPart()
@@ -237,7 +224,7 @@ public int ToMillisPart()
             return IExecuteWithSignature<int>("toMillisPart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toMinutesPart()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toMinutesPart()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ToMinutesPart()
@@ -245,7 +232,7 @@ public int ToMinutesPart()
             return IExecuteWithSignature<int>("toMinutesPart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toNanosPart()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toNanosPart()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ToNanosPart()
@@ -253,7 +240,7 @@ public int ToNanosPart()
             return IExecuteWithSignature<int>("toNanosPart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toSecondsPart()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toSecondsPart()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ToSecondsPart()
@@ -261,7 +248,7 @@ public int ToSecondsPart()
             return IExecuteWithSignature<int>("toSecondsPart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#abs()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#abs()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Duration"/></returns>
         public Java.Time.Duration Abs()
@@ -269,7 +256,7 @@ public Java.Time.Duration Abs()
             return IExecuteWithSignature<Java.Time.Duration>("abs", "()Ljava/time/Duration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#dividedBy(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#dividedBy(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -278,7 +265,7 @@ public Java.Time.Duration DividedBy(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("dividedBy", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#minus(java.time.Duration)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#minus(java.time.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Duration"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -287,7 +274,7 @@ public Java.Time.Duration Minus(Java.Time.Duration arg0)
             return IExecuteWithSignature<Java.Time.Duration>("minus", "(Ljava/time/Duration;)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -297,7 +284,7 @@ public Java.Time.Duration Minus(long arg0, Java.Time.Temporal.TemporalUnit arg1)
             return IExecute<Java.Time.Duration>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#minusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#minusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -306,7 +293,7 @@ public Java.Time.Duration MinusDays(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("minusDays", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#minusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#minusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -315,7 +302,7 @@ public Java.Time.Duration MinusHours(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("minusHours", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#minusMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#minusMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -324,7 +311,7 @@ public Java.Time.Duration MinusMillis(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("minusMillis", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#minusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#minusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -333,7 +320,7 @@ public Java.Time.Duration MinusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("minusMinutes", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#minusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#minusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -342,7 +329,7 @@ public Java.Time.Duration MinusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("minusNanos", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#minusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#minusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -351,7 +338,7 @@ public Java.Time.Duration MinusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("minusSeconds", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#multipliedBy(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#multipliedBy(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -360,7 +347,7 @@ public Java.Time.Duration MultipliedBy(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("multipliedBy", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#negated()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#negated()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Duration"/></returns>
         public Java.Time.Duration Negated()
@@ -368,7 +355,7 @@ public Java.Time.Duration Negated()
             return IExecuteWithSignature<Java.Time.Duration>("negated", "()Ljava/time/Duration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#plus(java.time.Duration)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#plus(java.time.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Duration"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -377,7 +364,7 @@ public Java.Time.Duration Plus(Java.Time.Duration arg0)
             return IExecuteWithSignature<Java.Time.Duration>("plus", "(Ljava/time/Duration;)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -387,7 +374,7 @@ public Java.Time.Duration Plus(long arg0, Java.Time.Temporal.TemporalUnit arg1)
             return IExecute<Java.Time.Duration>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#plusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#plusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -396,7 +383,7 @@ public Java.Time.Duration PlusDays(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("plusDays", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#plusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#plusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -405,7 +392,7 @@ public Java.Time.Duration PlusHours(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("plusHours", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#plusMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#plusMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -414,7 +401,7 @@ public Java.Time.Duration PlusMillis(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("plusMillis", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#plusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#plusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -423,7 +410,7 @@ public Java.Time.Duration PlusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("plusMinutes", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#plusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#plusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -432,7 +419,7 @@ public Java.Time.Duration PlusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("plusNanos", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#plusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#plusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -441,7 +428,7 @@ public Java.Time.Duration PlusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("plusSeconds", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -450,7 +437,7 @@ public Java.Time.Duration TruncatedTo(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<Java.Time.Duration>("truncatedTo", "(Ljava/time/temporal/TemporalUnit;)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#withNanos(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#withNanos(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -459,7 +446,7 @@ public Java.Time.Duration WithNanos(int arg0)
             return IExecuteWithSignature<Java.Time.Duration>("withNanos", "(I)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#withSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#withSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -468,7 +455,7 @@ public Java.Time.Duration WithSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.Duration>("withSeconds", "(J)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#addTo(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#addTo(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -477,7 +464,7 @@ public Java.Time.Temporal.Temporal AddTo(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("addTo", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#subtractFrom(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#subtractFrom(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -486,7 +473,15 @@ public Java.Time.Temporal.Temporal SubtractFrom(Java.Time.Temporal.Temporal arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("subtractFrom", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#dividedBy(java.time.Duration)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#getUnits()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Time.Temporal.TemporalUnit> GetUnits()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Time.Temporal.TemporalUnit>>("getUnits", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#dividedBy(java.time.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Duration"/></param>
         /// <returns><see cref="long"/></returns>
@@ -495,7 +490,7 @@ public long DividedBy(Java.Time.Duration arg0)
             return IExecuteWithSignature<long>("dividedBy", "(Ljava/time/Duration;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#get(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#get(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="long"/></returns>
@@ -504,7 +499,15 @@ public long Get(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<long>("get", "(Ljava/time/temporal/TemporalUnit;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toDays()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#getSeconds()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetSeconds()
+        {
+            return IExecuteWithSignature<long>("getSeconds", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toDays()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToDays()
@@ -512,7 +515,7 @@ public long ToDays()
             return IExecuteWithSignature<long>("toDays", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toDaysPart()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toDaysPart()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToDaysPart()
@@ -520,7 +523,7 @@ public long ToDaysPart()
             return IExecuteWithSignature<long>("toDaysPart", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toHours()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toHours()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToHours()
@@ -528,7 +531,7 @@ public long ToHours()
             return IExecuteWithSignature<long>("toHours", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toMillis()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toMillis()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToMillis()
@@ -536,7 +539,7 @@ public long ToMillis()
             return IExecuteWithSignature<long>("toMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toMinutes()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toMinutes()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToMinutes()
@@ -544,7 +547,7 @@ public long ToMinutes()
             return IExecuteWithSignature<long>("toMinutes", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toNanos()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toNanos()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToNanos()
@@ -552,7 +555,7 @@ public long ToNanos()
             return IExecuteWithSignature<long>("toNanos", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Duration.html#toSeconds()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Duration.html#toSeconds()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToSeconds()
diff --git a/src/net/Netdroid/Generated/Java/Time/Format/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Time/Format/AllPackageClasses.cs
index 7d5b56106..2ccdafa20 100644
--- a/src/net/Netdroid/Generated/Java/Time/Format/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Format/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Time.Format
 {
     #region DateTimeFormatter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html"/>
     /// </summary>
     public partial class DateTimeFormatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DateTimeFormatter>
     {
@@ -72,7 +72,7 @@ public DateTimeFormatter(params object[] args) : base(args) { }
 
     #region DateTimeFormatterBuilder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html"/>
     /// </summary>
     public partial class DateTimeFormatterBuilder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DateTimeFormatterBuilder>
     {
@@ -116,7 +116,7 @@ public DateTimeFormatterBuilder(params object[] args) : base(args) { }
 
     #region DateTimeParseException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeParseException.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/format/DateTimeParseException.html"/>
     /// </summary>
     public partial class DateTimeParseException : Java.Time.DateTimeException
     {
@@ -133,7 +133,7 @@ public partial class DateTimeParseException : Java.Time.DateTimeException
 
     #region DecimalStyle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html"/>
     /// </summary>
     public partial class DecimalStyle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DecimalStyle>
     {
@@ -177,7 +177,7 @@ public DecimalStyle(params object[] args) : base(args) { }
 
     #region FormatStyle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/format/FormatStyle.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/format/FormatStyle.html"/>
     /// </summary>
     public partial class FormatStyle : Java.Lang.Enum<Java.Time.Format.FormatStyle>
     {
@@ -221,7 +221,7 @@ public FormatStyle(params object[] args) : base(args) { }
 
     #region ResolverStyle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/format/ResolverStyle.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/format/ResolverStyle.html"/>
     /// </summary>
     public partial class ResolverStyle : Java.Lang.Enum<Java.Time.Format.ResolverStyle>
     {
@@ -265,7 +265,7 @@ public ResolverStyle(params object[] args) : base(args) { }
 
     #region SignStyle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/format/SignStyle.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/format/SignStyle.html"/>
     /// </summary>
     public partial class SignStyle : Java.Lang.Enum<Java.Time.Format.SignStyle>
     {
@@ -309,7 +309,7 @@ public SignStyle(params object[] args) : base(args) { }
 
     #region TextStyle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html"/>
     /// </summary>
     public partial class TextStyle : Java.Lang.Enum<Java.Time.Format.TextStyle>
     {
diff --git a/src/net/Netdroid/Generated/Java/Time/Format/DateTimeFormatter.cs b/src/net/Netdroid/Generated/Java/Time/Format/DateTimeFormatter.cs
index 61f2cb69e..5396ee4f7 100644
--- a/src/net/Netdroid/Generated/Java/Time/Format/DateTimeFormatter.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Format/DateTimeFormatter.cs
@@ -38,91 +38,91 @@ public partial class DateTimeFormatter
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#BASIC_ISO_DATE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#BASIC_ISO_DATE"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter BASIC_ISO_DATE { get { if (!_BASIC_ISO_DATEReady) { _BASIC_ISO_DATEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "BASIC_ISO_DATE"); _BASIC_ISO_DATEReady = true; } return _BASIC_ISO_DATEContent; } }
         private static Java.Time.Format.DateTimeFormatter _BASIC_ISO_DATEContent = default;
         private static bool _BASIC_ISO_DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_DATE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_DATE"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_DATE { get { if (!_ISO_DATEReady) { _ISO_DATEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_DATE"); _ISO_DATEReady = true; } return _ISO_DATEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_DATEContent = default;
         private static bool _ISO_DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_DATE_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_DATE_TIME"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_DATE_TIME { get { if (!_ISO_DATE_TIMEReady) { _ISO_DATE_TIMEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_DATE_TIME"); _ISO_DATE_TIMEReady = true; } return _ISO_DATE_TIMEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_DATE_TIMEContent = default;
         private static bool _ISO_DATE_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_INSTANT"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_INSTANT"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_INSTANT { get { if (!_ISO_INSTANTReady) { _ISO_INSTANTContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_INSTANT"); _ISO_INSTANTReady = true; } return _ISO_INSTANTContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_INSTANTContent = default;
         private static bool _ISO_INSTANTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_LOCAL_DATE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_LOCAL_DATE"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_LOCAL_DATE { get { if (!_ISO_LOCAL_DATEReady) { _ISO_LOCAL_DATEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_LOCAL_DATE"); _ISO_LOCAL_DATEReady = true; } return _ISO_LOCAL_DATEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_LOCAL_DATEContent = default;
         private static bool _ISO_LOCAL_DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_LOCAL_DATE_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_LOCAL_DATE_TIME"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_LOCAL_DATE_TIME { get { if (!_ISO_LOCAL_DATE_TIMEReady) { _ISO_LOCAL_DATE_TIMEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_LOCAL_DATE_TIME"); _ISO_LOCAL_DATE_TIMEReady = true; } return _ISO_LOCAL_DATE_TIMEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_LOCAL_DATE_TIMEContent = default;
         private static bool _ISO_LOCAL_DATE_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_LOCAL_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_LOCAL_TIME"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_LOCAL_TIME { get { if (!_ISO_LOCAL_TIMEReady) { _ISO_LOCAL_TIMEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_LOCAL_TIME"); _ISO_LOCAL_TIMEReady = true; } return _ISO_LOCAL_TIMEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_LOCAL_TIMEContent = default;
         private static bool _ISO_LOCAL_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_OFFSET_DATE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_OFFSET_DATE"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_OFFSET_DATE { get { if (!_ISO_OFFSET_DATEReady) { _ISO_OFFSET_DATEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_OFFSET_DATE"); _ISO_OFFSET_DATEReady = true; } return _ISO_OFFSET_DATEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_OFFSET_DATEContent = default;
         private static bool _ISO_OFFSET_DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_OFFSET_DATE_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_OFFSET_DATE_TIME"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_OFFSET_DATE_TIME { get { if (!_ISO_OFFSET_DATE_TIMEReady) { _ISO_OFFSET_DATE_TIMEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_OFFSET_DATE_TIME"); _ISO_OFFSET_DATE_TIMEReady = true; } return _ISO_OFFSET_DATE_TIMEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_OFFSET_DATE_TIMEContent = default;
         private static bool _ISO_OFFSET_DATE_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_OFFSET_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_OFFSET_TIME"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_OFFSET_TIME { get { if (!_ISO_OFFSET_TIMEReady) { _ISO_OFFSET_TIMEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_OFFSET_TIME"); _ISO_OFFSET_TIMEReady = true; } return _ISO_OFFSET_TIMEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_OFFSET_TIMEContent = default;
         private static bool _ISO_OFFSET_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_ORDINAL_DATE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_ORDINAL_DATE"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_ORDINAL_DATE { get { if (!_ISO_ORDINAL_DATEReady) { _ISO_ORDINAL_DATEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_ORDINAL_DATE"); _ISO_ORDINAL_DATEReady = true; } return _ISO_ORDINAL_DATEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_ORDINAL_DATEContent = default;
         private static bool _ISO_ORDINAL_DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_TIME"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_TIME { get { if (!_ISO_TIMEReady) { _ISO_TIMEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_TIME"); _ISO_TIMEReady = true; } return _ISO_TIMEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_TIMEContent = default;
         private static bool _ISO_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_WEEK_DATE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_WEEK_DATE"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_WEEK_DATE { get { if (!_ISO_WEEK_DATEReady) { _ISO_WEEK_DATEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_WEEK_DATE"); _ISO_WEEK_DATEReady = true; } return _ISO_WEEK_DATEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_WEEK_DATEContent = default;
         private static bool _ISO_WEEK_DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ISO_ZONED_DATE_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ISO_ZONED_DATE_TIME"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter ISO_ZONED_DATE_TIME { get { if (!_ISO_ZONED_DATE_TIMEReady) { _ISO_ZONED_DATE_TIMEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ISO_ZONED_DATE_TIME"); _ISO_ZONED_DATE_TIMEReady = true; } return _ISO_ZONED_DATE_TIMEContent; } }
         private static Java.Time.Format.DateTimeFormatter _ISO_ZONED_DATE_TIMEContent = default;
         private static bool _ISO_ZONED_DATE_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#RFC_1123_DATE_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#RFC_1123_DATE_TIME"/>
         /// </summary>
         public static Java.Time.Format.DateTimeFormatter RFC_1123_DATE_TIME { get { if (!_RFC_1123_DATE_TIMEReady) { _RFC_1123_DATE_TIMEContent = SGetField<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "RFC_1123_DATE_TIME"); _RFC_1123_DATE_TIMEReady = true; } return _RFC_1123_DATE_TIMEContent; } }
         private static Java.Time.Format.DateTimeFormatter _RFC_1123_DATE_TIMEContent = default;
@@ -132,7 +132,7 @@ public partial class DateTimeFormatter
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#parsedLeapSecond()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#parsedLeapSecond()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Lang.Boolean> ParsedLeapSecond()
@@ -140,7 +140,7 @@ public partial class DateTimeFormatter
             return SExecuteWithSignature<Java.Time.Temporal.TemporalQuery<Java.Lang.Boolean>>(LocalBridgeClazz, "parsedLeapSecond", "()Ljava/time/temporal/TemporalQuery;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#parsedExcessDays()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#parsedExcessDays()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Time.Period> ParsedExcessDays()
@@ -148,7 +148,7 @@ public partial class DateTimeFormatter
             return SExecuteWithSignature<Java.Time.Temporal.TemporalQuery<Java.Time.Period>>(LocalBridgeClazz, "parsedExcessDays", "()Ljava/time/temporal/TemporalQuery;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ofLocalizedDate(java.time.format.FormatStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ofLocalizedDate(java.time.format.FormatStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.FormatStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -157,7 +157,7 @@ public static Java.Time.Format.DateTimeFormatter OfLocalizedDate(Java.Time.Forma
             return SExecuteWithSignature<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ofLocalizedDate", "(Ljava/time/format/FormatStyle;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ofLocalizedDateTime(java.time.format.FormatStyle,java.time.format.FormatStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ofLocalizedDateTime(java.time.format.FormatStyle,java.time.format.FormatStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.FormatStyle"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.FormatStyle"/></param>
@@ -167,7 +167,7 @@ public static Java.Time.Format.DateTimeFormatter OfLocalizedDateTime(Java.Time.F
             return SExecute<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ofLocalizedDateTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ofLocalizedDateTime(java.time.format.FormatStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ofLocalizedDateTime(java.time.format.FormatStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.FormatStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -176,7 +176,7 @@ public static Java.Time.Format.DateTimeFormatter OfLocalizedDateTime(Java.Time.F
             return SExecuteWithSignature<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ofLocalizedDateTime", "(Ljava/time/format/FormatStyle;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ofLocalizedTime(java.time.format.FormatStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ofLocalizedTime(java.time.format.FormatStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.FormatStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -185,7 +185,7 @@ public static Java.Time.Format.DateTimeFormatter OfLocalizedTime(Java.Time.Forma
             return SExecuteWithSignature<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ofLocalizedTime", "(Ljava/time/format/FormatStyle;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ofPattern(java.lang.String,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ofPattern(java.lang.String,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -195,7 +195,7 @@ public static Java.Time.Format.DateTimeFormatter OfPattern(Java.Lang.String arg0
             return SExecute<Java.Time.Format.DateTimeFormatter>(LocalBridgeClazz, "ofPattern", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#ofPattern(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#ofPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -208,49 +208,7 @@ public static Java.Time.Format.DateTimeFormatter OfPattern(Java.Lang.String arg0
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#getChronology()"/> 
-        /// </summary>
-        public Java.Time.Chrono.Chronology Chronology
-        {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#getDecimalStyle()"/> 
-        /// </summary>
-        public Java.Time.Format.DecimalStyle DecimalStyle
-        {
-            get { return IExecuteWithSignature<Java.Time.Format.DecimalStyle>("getDecimalStyle", "()Ljava/time/format/DecimalStyle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#getLocale()"/> 
-        /// </summary>
-        public Java.Util.Locale Locale
-        {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#getResolverFields()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Time.Temporal.TemporalField> ResolverFields
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Time.Temporal.TemporalField>>("getResolverFields", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#getResolverStyle()"/> 
-        /// </summary>
-        public Java.Time.Format.ResolverStyle ResolverStyle
-        {
-            get { return IExecuteWithSignature<Java.Time.Format.ResolverStyle>("getResolverStyle", "()Ljava/time/format/ResolverStyle;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#getZone()"/> 
-        /// </summary>
-        public Java.Time.ZoneId Zone
-        {
-            get { return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#parse(java.lang.CharSequence,java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#parse(java.lang.CharSequence,java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
@@ -261,7 +219,7 @@ public T Parse<T>(Java.Lang.CharSequence arg0, Java.Time.Temporal.TemporalQuery<
             return IExecute<T>("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#format(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#format(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -270,7 +228,7 @@ public Java.Lang.String Format(Java.Time.Temporal.TemporalAccessor arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/temporal/TemporalAccessor;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#toFormat()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#toFormat()"/>
         /// </summary>
         /// <returns><see cref="Java.Text.Format"/></returns>
         public Java.Text.Format ToFormat()
@@ -278,7 +236,7 @@ public Java.Text.Format ToFormat()
             return IExecuteWithSignature<Java.Text.Format>("toFormat", "()Ljava/text/Format;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#toFormat(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#toFormat(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <returns><see cref="Java.Text.Format"/></returns>
@@ -287,7 +245,15 @@ public Java.Text.Format ToFormat(Java.Time.Temporal.TemporalQuery<object> arg0)
             return IExecuteWithSignature<Java.Text.Format>("toFormat", "(Ljava/time/temporal/TemporalQuery;)Ljava/text/Format;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#localizedBy(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#getChronology()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#localizedBy(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -296,7 +262,7 @@ public Java.Time.Format.DateTimeFormatter LocalizedBy(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("localizedBy", "(Ljava/util/Locale;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#withChronology(java.time.chrono.Chronology)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#withChronology(java.time.chrono.Chronology)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.Chronology"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -305,7 +271,7 @@ public Java.Time.Format.DateTimeFormatter WithChronology(Java.Time.Chrono.Chrono
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("withChronology", "(Ljava/time/chrono/Chronology;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#withDecimalStyle(java.time.format.DecimalStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#withDecimalStyle(java.time.format.DecimalStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DecimalStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -314,7 +280,7 @@ public Java.Time.Format.DateTimeFormatter WithDecimalStyle(Java.Time.Format.Deci
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("withDecimalStyle", "(Ljava/time/format/DecimalStyle;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#withLocale(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#withLocale(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -323,7 +289,7 @@ public Java.Time.Format.DateTimeFormatter WithLocale(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("withLocale", "(Ljava/util/Locale;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#withResolverFields(java.time.temporal.TemporalField[])"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#withResolverFields(java.time.temporal.TemporalField[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -332,7 +298,7 @@ public Java.Time.Format.DateTimeFormatter WithResolverFields(params Java.Time.Te
             if (arg0.Length == 0) return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("withResolverFields", "([Ljava/time/temporal/TemporalField;)Ljava/time/format/DateTimeFormatter;"); else return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("withResolverFields", "([Ljava/time/temporal/TemporalField;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#withResolverFields(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#withResolverFields(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -341,7 +307,7 @@ public Java.Time.Format.DateTimeFormatter WithResolverFields(Java.Util.Set<Java.
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("withResolverFields", "(Ljava/util/Set;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#withResolverStyle(java.time.format.ResolverStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#withResolverStyle(java.time.format.ResolverStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.ResolverStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -350,7 +316,7 @@ public Java.Time.Format.DateTimeFormatter WithResolverStyle(Java.Time.Format.Res
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("withResolverStyle", "(Ljava/time/format/ResolverStyle;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#withZone(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#withZone(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -359,7 +325,23 @@ public Java.Time.Format.DateTimeFormatter WithZone(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("withZone", "(Ljava/time/ZoneId;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#parse(java.lang.CharSequence,java.text.ParsePosition)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#getDecimalStyle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Format.DecimalStyle"/></returns>
+        public Java.Time.Format.DecimalStyle GetDecimalStyle()
+        {
+            return IExecuteWithSignature<Java.Time.Format.DecimalStyle>("getDecimalStyle", "()Ljava/time/format/DecimalStyle;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#getResolverStyle()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Format.ResolverStyle"/></returns>
+        public Java.Time.Format.ResolverStyle GetResolverStyle()
+        {
+            return IExecuteWithSignature<Java.Time.Format.ResolverStyle>("getResolverStyle", "()Ljava/time/format/ResolverStyle;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#parse(java.lang.CharSequence,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Text.ParsePosition"/></param>
@@ -369,7 +351,7 @@ public Java.Time.Temporal.TemporalAccessor Parse(Java.Lang.CharSequence arg0, Ja
             return IExecute<Java.Time.Temporal.TemporalAccessor>("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.Temporal.TemporalAccessor"/></returns>
@@ -378,7 +360,7 @@ public Java.Time.Temporal.TemporalAccessor Parse(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Time.Temporal.TemporalAccessor>("parse", "(Ljava/lang/CharSequence;)Ljava/time/temporal/TemporalAccessor;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#parseBest(java.lang.CharSequence,java.time.temporal.TemporalQuery[])"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#parseBest(java.lang.CharSequence,java.time.temporal.TemporalQuery[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
@@ -388,7 +370,7 @@ public Java.Time.Temporal.TemporalAccessor ParseBest(Java.Lang.CharSequence arg0
             if (arg1.Length == 0) return IExecute<Java.Time.Temporal.TemporalAccessor>("parseBest", arg0); else return IExecute<Java.Time.Temporal.TemporalAccessor>("parseBest", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#parseUnresolved(java.lang.CharSequence,java.text.ParsePosition)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#parseUnresolved(java.lang.CharSequence,java.text.ParsePosition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Text.ParsePosition"/></param>
@@ -398,7 +380,31 @@ public Java.Time.Temporal.TemporalAccessor ParseUnresolved(Java.Lang.CharSequenc
             return IExecute<Java.Time.Temporal.TemporalAccessor>("parseUnresolved", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatter.html#formatTo(java.time.temporal.TemporalAccessor,java.lang.Appendable)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#getZone()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneId"/></returns>
+        public Java.Time.ZoneId GetZone()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#getLocale()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
+        {
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#getResolverFields()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Time.Temporal.TemporalField> GetResolverFields()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Time.Temporal.TemporalField>>("getResolverFields", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatter.html#formatTo(java.time.temporal.TemporalAccessor,java.lang.Appendable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Appendable"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Format/DateTimeFormatterBuilder.cs b/src/net/Netdroid/Generated/Java/Time/Format/DateTimeFormatterBuilder.cs
index fdc74b1ef..041eb0497 100644
--- a/src/net/Netdroid/Generated/Java/Time/Format/DateTimeFormatterBuilder.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Format/DateTimeFormatterBuilder.cs
@@ -42,7 +42,7 @@ public partial class DateTimeFormatterBuilder
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#getLocalizedDateTimePattern(java.time.format.FormatStyle,java.time.format.FormatStyle,java.time.chrono.Chronology,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#getLocalizedDateTimePattern(java.time.format.FormatStyle,java.time.format.FormatStyle,java.time.chrono.Chronology,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.FormatStyle"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.FormatStyle"/></param>
@@ -58,7 +58,7 @@ public static Java.Lang.String GetLocalizedDateTimePattern(Java.Time.Format.Form
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#toFormatter()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#toFormatter()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
         public Java.Time.Format.DateTimeFormatter ToFormatter()
@@ -66,7 +66,7 @@ public Java.Time.Format.DateTimeFormatter ToFormatter()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("toFormatter", "()Ljava/time/format/DateTimeFormatter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#toFormatter(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#toFormatter(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatter"/></returns>
@@ -75,7 +75,7 @@ public Java.Time.Format.DateTimeFormatter ToFormatter(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatter>("toFormatter", "(Ljava/util/Locale;)Ljava/time/format/DateTimeFormatter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#append(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#append(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -84,7 +84,7 @@ public Java.Time.Format.DateTimeFormatterBuilder Append(Java.Time.Format.DateTim
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("append", "(Ljava/time/format/DateTimeFormatter;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendChronologyId()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendChronologyId()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder AppendChronologyId()
@@ -92,7 +92,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendChronologyId()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendChronologyId", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendChronologyText(java.time.format.TextStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendChronologyText(java.time.format.TextStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -101,16 +101,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendChronologyText(Java.Time.
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendChronologyText", "(Ljava/time/format/TextStyle;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendDayPeriodText(java.time.format.TextStyle)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
-        /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
-        public Java.Time.Format.DateTimeFormatterBuilder AppendDayPeriodText(Java.Time.Format.TextStyle arg0)
-        {
-            return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendDayPeriodText", "(Ljava/time/format/TextStyle;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendFraction(java.time.temporal.TemporalField,int,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendFraction(java.time.temporal.TemporalField,int,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -122,7 +113,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendFraction(Java.Time.Tempor
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendFraction", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendGenericZoneText(java.time.format.TextStyle,java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendGenericZoneText(java.time.format.TextStyle,java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -132,7 +123,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendGenericZoneText(Java.Time
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendGenericZoneText", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendGenericZoneText(java.time.format.TextStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendGenericZoneText(java.time.format.TextStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -141,7 +132,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendGenericZoneText(Java.Time
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendGenericZoneText", "(Ljava/time/format/TextStyle;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendInstant()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendInstant()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder AppendInstant()
@@ -149,7 +140,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendInstant()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendInstant", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendInstant(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendInstant(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -158,7 +149,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendInstant(int arg0)
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendInstant", "(I)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendLiteral(char)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendLiteral(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -167,7 +158,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendLiteral(char arg0)
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendLiteral", "(C)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendLiteral(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendLiteral(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -176,7 +167,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendLiteral(Java.Lang.String
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendLiteral", "(Ljava/lang/String;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendLocalized(java.time.format.FormatStyle,java.time.format.FormatStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendLocalized(java.time.format.FormatStyle,java.time.format.FormatStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.FormatStyle"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.FormatStyle"/></param>
@@ -186,7 +177,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendLocalized(Java.Time.Forma
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendLocalized", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendLocalizedOffset(java.time.format.TextStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendLocalizedOffset(java.time.format.TextStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -195,7 +186,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendLocalizedOffset(Java.Time
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendLocalizedOffset", "(Ljava/time/format/TextStyle;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendOffset(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendOffset(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -205,7 +196,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendOffset(Java.Lang.String a
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendOffset", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendOffsetId()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendOffsetId()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder AppendOffsetId()
@@ -213,7 +204,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendOffsetId()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendOffsetId", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendOptional(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendOptional(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -222,7 +213,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendOptional(Java.Time.Format
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendOptional", "(Ljava/time/format/DateTimeFormatter;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendPattern(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendPattern(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -231,7 +222,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendPattern(Java.Lang.String
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendPattern", "(Ljava/lang/String;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendText(java.time.temporal.TemporalField,java.time.format.TextStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendText(java.time.temporal.TemporalField,java.time.format.TextStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.TextStyle"/></param>
@@ -241,7 +232,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendText(Java.Time.Temporal.T
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendText", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendText(java.time.temporal.TemporalField,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendText(java.time.temporal.TemporalField,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -251,7 +242,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendText(Java.Time.Temporal.T
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendText", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendText(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendText(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -260,7 +251,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendText(Java.Time.Temporal.T
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendText", "(Ljava/time/temporal/TemporalField;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendValue(java.time.temporal.TemporalField,int,int,java.time.format.SignStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendValue(java.time.temporal.TemporalField,int,int,java.time.format.SignStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -272,7 +263,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendValue(Java.Time.Temporal.
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendValue", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendValue(java.time.temporal.TemporalField,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendValue(java.time.temporal.TemporalField,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -282,7 +273,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendValue(Java.Time.Temporal.
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendValue(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendValue(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -291,7 +282,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendValue(Java.Time.Temporal.
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendValue", "(Ljava/time/temporal/TemporalField;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendValueReduced(java.time.temporal.TemporalField,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendValueReduced(java.time.temporal.TemporalField,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -303,7 +294,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendValueReduced(Java.Time.Te
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendValueReduced", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendValueReduced(java.time.temporal.TemporalField,int,int,java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendValueReduced(java.time.temporal.TemporalField,int,int,java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -315,7 +306,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendValueReduced(Java.Time.Te
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendValueReduced", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendZoneId()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendZoneId()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder AppendZoneId()
@@ -323,7 +314,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendZoneId()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendZoneId", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendZoneOrOffsetId()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendZoneOrOffsetId()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder AppendZoneOrOffsetId()
@@ -331,7 +322,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendZoneOrOffsetId()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendZoneOrOffsetId", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendZoneRegionId()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendZoneRegionId()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder AppendZoneRegionId()
@@ -339,7 +330,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendZoneRegionId()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendZoneRegionId", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendZoneText(java.time.format.TextStyle,java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendZoneText(java.time.format.TextStyle,java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -349,7 +340,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendZoneText(Java.Time.Format
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("appendZoneText", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#appendZoneText(java.time.format.TextStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#appendZoneText(java.time.format.TextStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -358,7 +349,7 @@ public Java.Time.Format.DateTimeFormatterBuilder AppendZoneText(Java.Time.Format
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("appendZoneText", "(Ljava/time/format/TextStyle;)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#optionalEnd()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#optionalEnd()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder OptionalEnd()
@@ -366,7 +357,7 @@ public Java.Time.Format.DateTimeFormatterBuilder OptionalEnd()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("optionalEnd", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#optionalStart()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#optionalStart()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder OptionalStart()
@@ -374,7 +365,7 @@ public Java.Time.Format.DateTimeFormatterBuilder OptionalStart()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("optionalStart", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#padNext(int,char)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#padNext(int,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -384,7 +375,7 @@ public Java.Time.Format.DateTimeFormatterBuilder PadNext(int arg0, char arg1)
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("padNext", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#padNext(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#padNext(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
@@ -393,7 +384,7 @@ public Java.Time.Format.DateTimeFormatterBuilder PadNext(int arg0)
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("padNext", "(I)Ljava/time/format/DateTimeFormatterBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#parseCaseInsensitive()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#parseCaseInsensitive()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder ParseCaseInsensitive()
@@ -401,7 +392,7 @@ public Java.Time.Format.DateTimeFormatterBuilder ParseCaseInsensitive()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("parseCaseInsensitive", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#parseCaseSensitive()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#parseCaseSensitive()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder ParseCaseSensitive()
@@ -409,7 +400,7 @@ public Java.Time.Format.DateTimeFormatterBuilder ParseCaseSensitive()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("parseCaseSensitive", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#parseDefaulting(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#parseDefaulting(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -419,7 +410,7 @@ public Java.Time.Format.DateTimeFormatterBuilder ParseDefaulting(Java.Time.Tempo
             return IExecute<Java.Time.Format.DateTimeFormatterBuilder>("parseDefaulting", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#parseLenient()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#parseLenient()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder ParseLenient()
@@ -427,7 +418,7 @@ public Java.Time.Format.DateTimeFormatterBuilder ParseLenient()
             return IExecuteWithSignature<Java.Time.Format.DateTimeFormatterBuilder>("parseLenient", "()Ljava/time/format/DateTimeFormatterBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DateTimeFormatterBuilder.html#parseStrict()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DateTimeFormatterBuilder.html#parseStrict()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DateTimeFormatterBuilder"/></returns>
         public Java.Time.Format.DateTimeFormatterBuilder ParseStrict()
diff --git a/src/net/Netdroid/Generated/Java/Time/Format/DecimalStyle.cs b/src/net/Netdroid/Generated/Java/Time/Format/DecimalStyle.cs
index 75aa9ee8e..5097e4567 100644
--- a/src/net/Netdroid/Generated/Java/Time/Format/DecimalStyle.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Format/DecimalStyle.cs
@@ -38,7 +38,7 @@ public partial class DecimalStyle
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#STANDARD"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#STANDARD"/>
         /// </summary>
         public static Java.Time.Format.DecimalStyle STANDARD { get { if (!_STANDARDReady) { _STANDARDContent = SGetField<Java.Time.Format.DecimalStyle>(LocalBridgeClazz, "STANDARD"); _STANDARDReady = true; } return _STANDARDContent; } }
         private static Java.Time.Format.DecimalStyle _STANDARDContent = default;
@@ -48,14 +48,7 @@ public partial class DecimalStyle
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#getAvailableLocales()"/> 
-        /// </summary>
-        public static Java.Util.Set<Java.Util.Locale> AvailableLocales
-        {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Util.Locale>>(LocalBridgeClazz, "getAvailableLocales", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#of(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#of(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Time.Format.DecimalStyle"/></returns>
@@ -64,47 +57,59 @@ public static Java.Time.Format.DecimalStyle Of(Java.Util.Locale arg0)
             return SExecuteWithSignature<Java.Time.Format.DecimalStyle>(LocalBridgeClazz, "of", "(Ljava/util/Locale;)Ljava/time/format/DecimalStyle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#ofDefaultLocale()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#ofDefaultLocale()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.DecimalStyle"/></returns>
         public static Java.Time.Format.DecimalStyle OfDefaultLocale()
         {
             return SExecuteWithSignature<Java.Time.Format.DecimalStyle>(LocalBridgeClazz, "ofDefaultLocale", "()Ljava/time/format/DecimalStyle;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#getAvailableLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Util.Locale> GetAvailableLocales()
+        {
+            return SExecuteWithSignature<Java.Util.Set<Java.Util.Locale>>(LocalBridgeClazz, "getAvailableLocales", "()Ljava/util/Set;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#getDecimalSeparator()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#getDecimalSeparator()"/>
         /// </summary>
-        public char DecimalSeparator
+        /// <returns><see cref="char"/></returns>
+        public char GetDecimalSeparator()
         {
-            get { return IExecuteWithSignature<char>("getDecimalSeparator", "()C"); }
+            return IExecuteWithSignature<char>("getDecimalSeparator", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#getNegativeSign()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#getNegativeSign()"/>
         /// </summary>
-        public char NegativeSign
+        /// <returns><see cref="char"/></returns>
+        public char GetNegativeSign()
         {
-            get { return IExecuteWithSignature<char>("getNegativeSign", "()C"); }
+            return IExecuteWithSignature<char>("getNegativeSign", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#getPositiveSign()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#getPositiveSign()"/>
         /// </summary>
-        public char PositiveSign
+        /// <returns><see cref="char"/></returns>
+        public char GetPositiveSign()
         {
-            get { return IExecuteWithSignature<char>("getPositiveSign", "()C"); }
+            return IExecuteWithSignature<char>("getPositiveSign", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#getZeroDigit()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#getZeroDigit()"/>
         /// </summary>
-        public char ZeroDigit
+        /// <returns><see cref="char"/></returns>
+        public char GetZeroDigit()
         {
-            get { return IExecuteWithSignature<char>("getZeroDigit", "()C"); }
+            return IExecuteWithSignature<char>("getZeroDigit", "()C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#withDecimalSeparator(char)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#withDecimalSeparator(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Time.Format.DecimalStyle"/></returns>
@@ -113,7 +118,7 @@ public Java.Time.Format.DecimalStyle WithDecimalSeparator(char arg0)
             return IExecuteWithSignature<Java.Time.Format.DecimalStyle>("withDecimalSeparator", "(C)Ljava/time/format/DecimalStyle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#withNegativeSign(char)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#withNegativeSign(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Time.Format.DecimalStyle"/></returns>
@@ -122,7 +127,7 @@ public Java.Time.Format.DecimalStyle WithNegativeSign(char arg0)
             return IExecuteWithSignature<Java.Time.Format.DecimalStyle>("withNegativeSign", "(C)Ljava/time/format/DecimalStyle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#withPositiveSign(char)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#withPositiveSign(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Time.Format.DecimalStyle"/></returns>
@@ -131,7 +136,7 @@ public Java.Time.Format.DecimalStyle WithPositiveSign(char arg0)
             return IExecuteWithSignature<Java.Time.Format.DecimalStyle>("withPositiveSign", "(C)Ljava/time/format/DecimalStyle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/DecimalStyle.html#withZeroDigit(char)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/DecimalStyle.html#withZeroDigit(char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Time.Format.DecimalStyle"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Format/FormatStyle.cs b/src/net/Netdroid/Generated/Java/Time/Format/FormatStyle.cs
index 479cd8eab..af5addf66 100644
--- a/src/net/Netdroid/Generated/Java/Time/Format/FormatStyle.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Format/FormatStyle.cs
@@ -38,25 +38,25 @@ public partial class FormatStyle
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/FormatStyle.html#FULL"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/FormatStyle.html#FULL"/>
         /// </summary>
         public static Java.Time.Format.FormatStyle FULL { get { if (!_FULLReady) { _FULLContent = SGetField<Java.Time.Format.FormatStyle>(LocalBridgeClazz, "FULL"); _FULLReady = true; } return _FULLContent; } }
         private static Java.Time.Format.FormatStyle _FULLContent = default;
         private static bool _FULLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/FormatStyle.html#LONG"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/FormatStyle.html#LONG"/>
         /// </summary>
         public static Java.Time.Format.FormatStyle LONG { get { if (!_LONGReady) { _LONGContent = SGetField<Java.Time.Format.FormatStyle>(LocalBridgeClazz, "LONG"); _LONGReady = true; } return _LONGContent; } }
         private static Java.Time.Format.FormatStyle _LONGContent = default;
         private static bool _LONGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/FormatStyle.html#MEDIUM"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/FormatStyle.html#MEDIUM"/>
         /// </summary>
         public static Java.Time.Format.FormatStyle MEDIUM { get { if (!_MEDIUMReady) { _MEDIUMContent = SGetField<Java.Time.Format.FormatStyle>(LocalBridgeClazz, "MEDIUM"); _MEDIUMReady = true; } return _MEDIUMContent; } }
         private static Java.Time.Format.FormatStyle _MEDIUMContent = default;
         private static bool _MEDIUMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/FormatStyle.html#SHORT"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/FormatStyle.html#SHORT"/>
         /// </summary>
         public static Java.Time.Format.FormatStyle SHORT { get { if (!_SHORTReady) { _SHORTContent = SGetField<Java.Time.Format.FormatStyle>(LocalBridgeClazz, "SHORT"); _SHORTReady = true; } return _SHORTContent; } }
         private static Java.Time.Format.FormatStyle _SHORTContent = default;
@@ -66,7 +66,7 @@ public partial class FormatStyle
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/FormatStyle.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/FormatStyle.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Format.FormatStyle"/></returns>
@@ -75,7 +75,7 @@ public static Java.Time.Format.FormatStyle ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Format.FormatStyle>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/format/FormatStyle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/FormatStyle.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/FormatStyle.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.FormatStyle"/></returns>
         public static Java.Time.Format.FormatStyle[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Time/Format/ResolverStyle.cs b/src/net/Netdroid/Generated/Java/Time/Format/ResolverStyle.cs
index 909727e32..201daa9d9 100644
--- a/src/net/Netdroid/Generated/Java/Time/Format/ResolverStyle.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Format/ResolverStyle.cs
@@ -38,19 +38,19 @@ public partial class ResolverStyle
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/ResolverStyle.html#LENIENT"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/ResolverStyle.html#LENIENT"/>
         /// </summary>
         public static Java.Time.Format.ResolverStyle LENIENT { get { if (!_LENIENTReady) { _LENIENTContent = SGetField<Java.Time.Format.ResolverStyle>(LocalBridgeClazz, "LENIENT"); _LENIENTReady = true; } return _LENIENTContent; } }
         private static Java.Time.Format.ResolverStyle _LENIENTContent = default;
         private static bool _LENIENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/ResolverStyle.html#SMART"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/ResolverStyle.html#SMART"/>
         /// </summary>
         public static Java.Time.Format.ResolverStyle SMART { get { if (!_SMARTReady) { _SMARTContent = SGetField<Java.Time.Format.ResolverStyle>(LocalBridgeClazz, "SMART"); _SMARTReady = true; } return _SMARTContent; } }
         private static Java.Time.Format.ResolverStyle _SMARTContent = default;
         private static bool _SMARTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/ResolverStyle.html#STRICT"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/ResolverStyle.html#STRICT"/>
         /// </summary>
         public static Java.Time.Format.ResolverStyle STRICT { get { if (!_STRICTReady) { _STRICTContent = SGetField<Java.Time.Format.ResolverStyle>(LocalBridgeClazz, "STRICT"); _STRICTReady = true; } return _STRICTContent; } }
         private static Java.Time.Format.ResolverStyle _STRICTContent = default;
@@ -60,7 +60,7 @@ public partial class ResolverStyle
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/ResolverStyle.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/ResolverStyle.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Format.ResolverStyle"/></returns>
@@ -69,7 +69,7 @@ public static Java.Time.Format.ResolverStyle ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Format.ResolverStyle>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/format/ResolverStyle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/ResolverStyle.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/ResolverStyle.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.ResolverStyle"/></returns>
         public static Java.Time.Format.ResolverStyle[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Time/Format/SignStyle.cs b/src/net/Netdroid/Generated/Java/Time/Format/SignStyle.cs
index 25ad608cf..2d2009b52 100644
--- a/src/net/Netdroid/Generated/Java/Time/Format/SignStyle.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Format/SignStyle.cs
@@ -38,31 +38,31 @@ public partial class SignStyle
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/SignStyle.html#ALWAYS"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/SignStyle.html#ALWAYS"/>
         /// </summary>
         public static Java.Time.Format.SignStyle ALWAYS { get { if (!_ALWAYSReady) { _ALWAYSContent = SGetField<Java.Time.Format.SignStyle>(LocalBridgeClazz, "ALWAYS"); _ALWAYSReady = true; } return _ALWAYSContent; } }
         private static Java.Time.Format.SignStyle _ALWAYSContent = default;
         private static bool _ALWAYSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/SignStyle.html#EXCEEDS_PAD"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/SignStyle.html#EXCEEDS_PAD"/>
         /// </summary>
         public static Java.Time.Format.SignStyle EXCEEDS_PAD { get { if (!_EXCEEDS_PADReady) { _EXCEEDS_PADContent = SGetField<Java.Time.Format.SignStyle>(LocalBridgeClazz, "EXCEEDS_PAD"); _EXCEEDS_PADReady = true; } return _EXCEEDS_PADContent; } }
         private static Java.Time.Format.SignStyle _EXCEEDS_PADContent = default;
         private static bool _EXCEEDS_PADReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/SignStyle.html#NEVER"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/SignStyle.html#NEVER"/>
         /// </summary>
         public static Java.Time.Format.SignStyle NEVER { get { if (!_NEVERReady) { _NEVERContent = SGetField<Java.Time.Format.SignStyle>(LocalBridgeClazz, "NEVER"); _NEVERReady = true; } return _NEVERContent; } }
         private static Java.Time.Format.SignStyle _NEVERContent = default;
         private static bool _NEVERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/SignStyle.html#NORMAL"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/SignStyle.html#NORMAL"/>
         /// </summary>
         public static Java.Time.Format.SignStyle NORMAL { get { if (!_NORMALReady) { _NORMALContent = SGetField<Java.Time.Format.SignStyle>(LocalBridgeClazz, "NORMAL"); _NORMALReady = true; } return _NORMALContent; } }
         private static Java.Time.Format.SignStyle _NORMALContent = default;
         private static bool _NORMALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/SignStyle.html#NOT_NEGATIVE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/SignStyle.html#NOT_NEGATIVE"/>
         /// </summary>
         public static Java.Time.Format.SignStyle NOT_NEGATIVE { get { if (!_NOT_NEGATIVEReady) { _NOT_NEGATIVEContent = SGetField<Java.Time.Format.SignStyle>(LocalBridgeClazz, "NOT_NEGATIVE"); _NOT_NEGATIVEReady = true; } return _NOT_NEGATIVEContent; } }
         private static Java.Time.Format.SignStyle _NOT_NEGATIVEContent = default;
@@ -72,7 +72,7 @@ public partial class SignStyle
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/SignStyle.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/SignStyle.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Format.SignStyle"/></returns>
@@ -81,7 +81,7 @@ public static Java.Time.Format.SignStyle ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Format.SignStyle>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/format/SignStyle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/SignStyle.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/SignStyle.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.SignStyle"/></returns>
         public static Java.Time.Format.SignStyle[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Time/Format/TextStyle.cs b/src/net/Netdroid/Generated/Java/Time/Format/TextStyle.cs
index 6ee2e08f8..0f3729819 100644
--- a/src/net/Netdroid/Generated/Java/Time/Format/TextStyle.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Format/TextStyle.cs
@@ -38,37 +38,37 @@ public partial class TextStyle
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#FULL"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#FULL"/>
         /// </summary>
         public static Java.Time.Format.TextStyle FULL { get { if (!_FULLReady) { _FULLContent = SGetField<Java.Time.Format.TextStyle>(LocalBridgeClazz, "FULL"); _FULLReady = true; } return _FULLContent; } }
         private static Java.Time.Format.TextStyle _FULLContent = default;
         private static bool _FULLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#FULL_STANDALONE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#FULL_STANDALONE"/>
         /// </summary>
         public static Java.Time.Format.TextStyle FULL_STANDALONE { get { if (!_FULL_STANDALONEReady) { _FULL_STANDALONEContent = SGetField<Java.Time.Format.TextStyle>(LocalBridgeClazz, "FULL_STANDALONE"); _FULL_STANDALONEReady = true; } return _FULL_STANDALONEContent; } }
         private static Java.Time.Format.TextStyle _FULL_STANDALONEContent = default;
         private static bool _FULL_STANDALONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#NARROW"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#NARROW"/>
         /// </summary>
         public static Java.Time.Format.TextStyle NARROW { get { if (!_NARROWReady) { _NARROWContent = SGetField<Java.Time.Format.TextStyle>(LocalBridgeClazz, "NARROW"); _NARROWReady = true; } return _NARROWContent; } }
         private static Java.Time.Format.TextStyle _NARROWContent = default;
         private static bool _NARROWReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#NARROW_STANDALONE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#NARROW_STANDALONE"/>
         /// </summary>
         public static Java.Time.Format.TextStyle NARROW_STANDALONE { get { if (!_NARROW_STANDALONEReady) { _NARROW_STANDALONEContent = SGetField<Java.Time.Format.TextStyle>(LocalBridgeClazz, "NARROW_STANDALONE"); _NARROW_STANDALONEReady = true; } return _NARROW_STANDALONEContent; } }
         private static Java.Time.Format.TextStyle _NARROW_STANDALONEContent = default;
         private static bool _NARROW_STANDALONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#SHORT"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#SHORT"/>
         /// </summary>
         public static Java.Time.Format.TextStyle SHORT { get { if (!_SHORTReady) { _SHORTContent = SGetField<Java.Time.Format.TextStyle>(LocalBridgeClazz, "SHORT"); _SHORTReady = true; } return _SHORTContent; } }
         private static Java.Time.Format.TextStyle _SHORTContent = default;
         private static bool _SHORTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#SHORT_STANDALONE"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#SHORT_STANDALONE"/>
         /// </summary>
         public static Java.Time.Format.TextStyle SHORT_STANDALONE { get { if (!_SHORT_STANDALONEReady) { _SHORT_STANDALONEContent = SGetField<Java.Time.Format.TextStyle>(LocalBridgeClazz, "SHORT_STANDALONE"); _SHORT_STANDALONEReady = true; } return _SHORT_STANDALONEContent; } }
         private static Java.Time.Format.TextStyle _SHORT_STANDALONEContent = default;
@@ -78,7 +78,7 @@ public partial class TextStyle
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Format.TextStyle"/></returns>
@@ -87,7 +87,7 @@ public static Java.Time.Format.TextStyle ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Format.TextStyle>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/format/TextStyle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.TextStyle"/></returns>
         public static Java.Time.Format.TextStyle[] Values()
@@ -99,7 +99,7 @@ public static Java.Time.Format.TextStyle[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#isStandalone()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#isStandalone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsStandalone()
@@ -107,7 +107,7 @@ public bool IsStandalone()
             return IExecuteWithSignature<bool>("isStandalone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#asNormal()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#asNormal()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.TextStyle"/></returns>
         public Java.Time.Format.TextStyle AsNormal()
@@ -115,7 +115,7 @@ public Java.Time.Format.TextStyle AsNormal()
             return IExecuteWithSignature<Java.Time.Format.TextStyle>("asNormal", "()Ljava/time/format/TextStyle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/format/TextStyle.html#asStandalone()"/>
+        /// <see href="https://developer.android.com/reference/java/time/format/TextStyle.html#asStandalone()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Format.TextStyle"/></returns>
         public Java.Time.Format.TextStyle AsStandalone()
diff --git a/src/net/Netdroid/Generated/Java/Time/Instant.cs b/src/net/Netdroid/Generated/Java/Time/Instant.cs
index 6aa35962a..ab519db6d 100644
--- a/src/net/Netdroid/Generated/Java/Time/Instant.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Instant.cs
@@ -54,19 +54,19 @@ public partial class Instant : Java.Time.Temporal.ITemporal, Java.Time.Temporal.
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#EPOCH"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#EPOCH"/>
         /// </summary>
         public static Java.Time.Instant EPOCH { get { if (!_EPOCHReady) { _EPOCHContent = SGetField<Java.Time.Instant>(LocalBridgeClazz, "EPOCH"); _EPOCHReady = true; } return _EPOCHContent; } }
         private static Java.Time.Instant _EPOCHContent = default;
         private static bool _EPOCHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#MAX"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#MAX"/>
         /// </summary>
         public static Java.Time.Instant MAX { get { if (!_MAXReady) { _MAXContent = SGetField<Java.Time.Instant>(LocalBridgeClazz, "MAX"); _MAXReady = true; } return _MAXContent; } }
         private static Java.Time.Instant _MAXContent = default;
         private static bool _MAXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#MIN"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#MIN"/>
         /// </summary>
         public static Java.Time.Instant MIN { get { if (!_MINReady) { _MINContent = SGetField<Java.Time.Instant>(LocalBridgeClazz, "MIN"); _MINReady = true; } return _MINContent; } }
         private static Java.Time.Instant _MINContent = default;
@@ -76,7 +76,7 @@ public partial class Instant : Java.Time.Temporal.ITemporal, Java.Time.Temporal.
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -85,7 +85,7 @@ public static Java.Time.Instant From(Java.Time.Temporal.TemporalAccessor arg0)
             return SExecuteWithSignature<Java.Time.Instant>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Instant"/></returns>
         public static Java.Time.Instant Now()
@@ -93,7 +93,7 @@ public static Java.Time.Instant Now()
             return SExecuteWithSignature<Java.Time.Instant>(LocalBridgeClazz, "now", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -102,7 +102,7 @@ public static Java.Time.Instant Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.Instant>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#ofEpochMilli(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#ofEpochMilli(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -111,7 +111,7 @@ public static Java.Time.Instant OfEpochMilli(long arg0)
             return SExecuteWithSignature<Java.Time.Instant>(LocalBridgeClazz, "ofEpochMilli", "(J)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#ofEpochSecond(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#ofEpochSecond(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -121,7 +121,7 @@ public static Java.Time.Instant OfEpochSecond(long arg0, long arg1)
             return SExecute<Java.Time.Instant>(LocalBridgeClazz, "ofEpochSecond", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#ofEpochSecond(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#ofEpochSecond(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -130,7 +130,7 @@ public static Java.Time.Instant OfEpochSecond(long arg0)
             return SExecuteWithSignature<Java.Time.Instant>(LocalBridgeClazz, "ofEpochSecond", "(J)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -143,21 +143,7 @@ public static Java.Time.Instant Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#getEpochSecond()"/> 
-        /// </summary>
-        public long EpochSecond
-        {
-            get { return IExecuteWithSignature<long>("getEpochSecond", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#getNano()"/> 
-        /// </summary>
-        public int Nano
-        {
-            get { return IExecuteWithSignature<int>("getNano", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -167,7 +153,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#isAfter(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#isAfter(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -176,7 +162,7 @@ public bool IsAfter(Java.Time.Instant arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/Instant;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#isBefore(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#isBefore(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -185,7 +171,7 @@ public bool IsBefore(Java.Time.Instant arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/Instant;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -194,7 +180,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -203,7 +189,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -212,7 +198,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#compareTo(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#compareTo(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="int"/></returns>
@@ -221,7 +207,7 @@ public int CompareTo(Java.Time.Instant arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/Instant;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -230,7 +216,15 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#minusMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#getNano()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNano()
+        {
+            return IExecuteWithSignature<int>("getNano", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#minusMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -239,7 +233,7 @@ public Java.Time.Instant MinusMillis(long arg0)
             return IExecuteWithSignature<Java.Time.Instant>("minusMillis", "(J)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#minusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#minusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -248,7 +242,7 @@ public Java.Time.Instant MinusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.Instant>("minusNanos", "(J)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#minusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#minusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -257,7 +251,7 @@ public Java.Time.Instant MinusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.Instant>("minusSeconds", "(J)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#plusMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#plusMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -266,7 +260,7 @@ public Java.Time.Instant PlusMillis(long arg0)
             return IExecuteWithSignature<Java.Time.Instant>("plusMillis", "(J)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#plusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#plusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -275,7 +269,7 @@ public Java.Time.Instant PlusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.Instant>("plusNanos", "(J)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#plusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#plusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -284,7 +278,7 @@ public Java.Time.Instant PlusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.Instant>("plusSeconds", "(J)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="Java.Time.Instant"/></returns>
@@ -293,7 +287,7 @@ public Java.Time.Instant TruncatedTo(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<Java.Time.Instant>("truncatedTo", "(Ljava/time/temporal/TemporalUnit;)Ljava/time/Instant;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#atOffset(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#atOffset(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -302,7 +296,7 @@ public Java.Time.OffsetDateTime AtOffset(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("atOffset", "(Ljava/time/ZoneOffset;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -311,7 +305,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -320,7 +314,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -330,7 +324,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -339,7 +333,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -349,7 +343,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -358,7 +352,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -368,7 +362,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -377,7 +371,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#atZone(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#atZone(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -386,7 +380,15 @@ public Java.Time.ZonedDateTime AtZone(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("atZone", "(Ljava/time/ZoneId;)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#getEpochSecond()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetEpochSecond()
+        {
+            return IExecuteWithSignature<long>("getEpochSecond", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -395,7 +397,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#toEpochMilli()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#toEpochMilli()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToEpochMilli()
@@ -403,7 +405,7 @@ public long ToEpochMilli()
             return IExecuteWithSignature<long>("toEpochMilli", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Instant.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Instant.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/InstantSource.cs b/src/net/Netdroid/Generated/Java/Time/InstantSource.cs
deleted file mode 100644
index 9f2592339..000000000
--- a/src/net/Netdroid/Generated/Java/Time/InstantSource.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Time
-{
-    #region IInstantSource
-    /// <summary>
-    /// .NET interface for TO BE DEFINED FROM USER
-    /// </summary>
-    public partial interface IInstantSource
-    {
-        #region Instance methods
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region InstantSource
-    public partial class InstantSource : Java.Time.IInstantSource
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/InstantSource.html#fixed(java.time.Instant)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
-        /// <returns><see cref="Java.Time.InstantSource"/></returns>
-        public static Java.Time.InstantSource Fixed(Java.Time.Instant arg0)
-        {
-            return SExecuteWithSignature<Java.Time.InstantSource>(LocalBridgeClazz, "fixed", "(Ljava/time/Instant;)Ljava/time/InstantSource;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/InstantSource.html#offset(java.time.InstantSource,java.time.Duration)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.InstantSource"/></param>
-        /// <param name="arg1"><see cref="Java.Time.Duration"/></param>
-        /// <returns><see cref="Java.Time.InstantSource"/></returns>
-        public static Java.Time.InstantSource Offset(Java.Time.InstantSource arg0, Java.Time.Duration arg1)
-        {
-            return SExecute<Java.Time.InstantSource>(LocalBridgeClazz, "offset", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/InstantSource.html#system()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Time.InstantSource"/></returns>
-        public static Java.Time.InstantSource System()
-        {
-            return SExecuteWithSignature<Java.Time.InstantSource>(LocalBridgeClazz, "system", "()Ljava/time/InstantSource;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/InstantSource.html#tick(java.time.InstantSource,java.time.Duration)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.InstantSource"/></param>
-        /// <param name="arg1"><see cref="Java.Time.Duration"/></param>
-        /// <returns><see cref="Java.Time.InstantSource"/></returns>
-        public static Java.Time.InstantSource Tick(Java.Time.InstantSource arg0, Java.Time.Duration arg1)
-        {
-            return SExecute<Java.Time.InstantSource>(LocalBridgeClazz, "tick", arg0, arg1);
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/InstantSource.html#instant()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Time.Instant"/></returns>
-        public Java.Time.Instant Instant()
-        {
-            return IExecuteWithSignature<Java.Time.Instant>("instant", "()Ljava/time/Instant;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/InstantSource.html#withZone(java.time.ZoneId)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
-        /// <returns><see cref="Java.Time.Clock"/></returns>
-        public Java.Time.Clock WithZone(Java.Time.ZoneId arg0)
-        {
-            return IExecuteWithSignature<Java.Time.Clock>("withZone", "(Ljava/time/ZoneId;)Ljava/time/Clock;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/InstantSource.html#millis()"/>
-        /// </summary>
-        /// <returns><see cref="long"/></returns>
-        public long Millis()
-        {
-            return IExecuteWithSignature<long>("millis", "()J");
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Time/LocalDate.cs b/src/net/Netdroid/Generated/Java/Time/LocalDate.cs
index baf1f6cb1..3ba332f2c 100644
--- a/src/net/Netdroid/Generated/Java/Time/LocalDate.cs
+++ b/src/net/Netdroid/Generated/Java/Time/LocalDate.cs
@@ -54,19 +54,19 @@ public partial class LocalDate : Java.Time.Temporal.ITemporal, Java.Time.Tempora
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#EPOCH"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#EPOCH"/>
         /// </summary>
         public static Java.Time.LocalDate EPOCH { get { if (!_EPOCHReady) { _EPOCHContent = SGetField<Java.Time.LocalDate>(LocalBridgeClazz, "EPOCH"); _EPOCHReady = true; } return _EPOCHContent; } }
         private static Java.Time.LocalDate _EPOCHContent = default;
         private static bool _EPOCHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#MAX"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#MAX"/>
         /// </summary>
         public static Java.Time.LocalDate MAX { get { if (!_MAXReady) { _MAXContent = SGetField<Java.Time.LocalDate>(LocalBridgeClazz, "MAX"); _MAXReady = true; } return _MAXContent; } }
         private static Java.Time.LocalDate _MAXContent = default;
         private static bool _MAXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#MIN"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#MIN"/>
         /// </summary>
         public static Java.Time.LocalDate MIN { get { if (!_MINReady) { _MINContent = SGetField<Java.Time.LocalDate>(LocalBridgeClazz, "MIN"); _MINReady = true; } return _MINContent; } }
         private static Java.Time.LocalDate _MINContent = default;
@@ -76,7 +76,7 @@ public partial class LocalDate : Java.Time.Temporal.ITemporal, Java.Time.Tempora
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
         public static Java.Time.LocalDate Now()
@@ -84,7 +84,7 @@ public static Java.Time.LocalDate Now()
             return SExecuteWithSignature<Java.Time.LocalDate>(LocalBridgeClazz, "now", "()Ljava/time/LocalDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -93,7 +93,7 @@ public static Java.Time.LocalDate Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.LocalDate>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -102,7 +102,7 @@ public static Java.Time.LocalDate Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.LocalDate>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#of(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#of(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -113,7 +113,7 @@ public static Java.Time.LocalDate Of(int arg0, int arg1, int arg2)
             return SExecute<Java.Time.LocalDate>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#of(int,java.time.Month,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#of(int,java.time.Month,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Time.Month"/></param>
@@ -124,7 +124,7 @@ public static Java.Time.LocalDate Of(int arg0, Java.Time.Month arg1, int arg2)
             return SExecute<Java.Time.LocalDate>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#ofEpochDay(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#ofEpochDay(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -133,7 +133,7 @@ public static Java.Time.LocalDate OfEpochDay(long arg0)
             return SExecuteWithSignature<Java.Time.LocalDate>(LocalBridgeClazz, "ofEpochDay", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -143,7 +143,7 @@ public static Java.Time.LocalDate OfInstant(Java.Time.Instant arg0, Java.Time.Zo
             return SExecute<Java.Time.LocalDate>(LocalBridgeClazz, "ofInstant", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#ofYearDay(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#ofYearDay(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -153,7 +153,7 @@ public static Java.Time.LocalDate OfYearDay(int arg0, int arg1)
             return SExecute<Java.Time.LocalDate>(LocalBridgeClazz, "ofYearDay", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -163,7 +163,7 @@ public static Java.Time.LocalDate Parse(Java.Lang.CharSequence arg0, Java.Time.F
             return SExecute<Java.Time.LocalDate>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -176,63 +176,7 @@ public static Java.Time.LocalDate Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getChronology()"/> 
-        /// </summary>
-        public Java.Time.Chrono.Chronology Chronology
-        {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getDayOfMonth()"/> 
-        /// </summary>
-        public int DayOfMonth
-        {
-            get { return IExecuteWithSignature<int>("getDayOfMonth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getDayOfWeek()"/> 
-        /// </summary>
-        public Java.Time.DayOfWeek DayOfWeek
-        {
-            get { return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getDayOfYear()"/> 
-        /// </summary>
-        public int DayOfYear
-        {
-            get { return IExecuteWithSignature<int>("getDayOfYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getEra()"/> 
-        /// </summary>
-        public Java.Time.Chrono.Era Era
-        {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Era>("getEra", "()Ljava/time/chrono/Era;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getMonth()"/> 
-        /// </summary>
-        public Java.Time.Month Month
-        {
-            get { return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getMonthValue()"/> 
-        /// </summary>
-        public int MonthValue
-        {
-            get { return IExecuteWithSignature<int>("getMonthValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getYear()"/> 
-        /// </summary>
-        public int Year
-        {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -242,7 +186,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#isAfter(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#isAfter(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -251,7 +195,7 @@ public bool IsAfter(Java.Time.Chrono.ChronoLocalDate arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/chrono/ChronoLocalDate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#isBefore(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#isBefore(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -260,7 +204,7 @@ public bool IsBefore(Java.Time.Chrono.ChronoLocalDate arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/chrono/ChronoLocalDate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#isEqual(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#isEqual(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -269,7 +213,7 @@ public bool IsEqual(Java.Time.Chrono.ChronoLocalDate arg0)
             return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/chrono/ChronoLocalDate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#isLeapYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#isLeapYear()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLeapYear()
@@ -277,7 +221,7 @@ public bool IsLeapYear()
             return IExecuteWithSignature<bool>("isLeapYear", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -286,7 +230,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -295,7 +239,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -304,7 +248,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#compareTo(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#compareTo(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="int"/></returns>
@@ -313,7 +257,7 @@ public int CompareTo(Java.Time.Chrono.ChronoLocalDate arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/ChronoLocalDate;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -322,7 +266,39 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#lengthOfMonth()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getDayOfMonth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfMonth()
+        {
+            return IExecuteWithSignature<int>("getDayOfMonth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getDayOfYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfYear()
+        {
+            return IExecuteWithSignature<int>("getDayOfYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getMonthValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMonthValue()
+        {
+            return IExecuteWithSignature<int>("getMonthValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetYear()
+        {
+            return IExecuteWithSignature<int>("getYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#lengthOfMonth()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int LengthOfMonth()
@@ -330,7 +306,7 @@ public int LengthOfMonth()
             return IExecuteWithSignature<int>("lengthOfMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#lengthOfYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#lengthOfYear()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int LengthOfYear()
@@ -338,7 +314,7 @@ public int LengthOfYear()
             return IExecuteWithSignature<int>("lengthOfYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -347,7 +323,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#atTime(java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#atTime(java.time.LocalTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></returns>
@@ -356,7 +332,15 @@ public Java.Time.Chrono.ChronoLocalDateTime AtTime(Java.Time.LocalTime arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDateTime>("atTime", "(Ljava/time/LocalTime;)Ljava/time/chrono/ChronoLocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#until(java.time.chrono.ChronoLocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getChronology()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#until(java.time.chrono.ChronoLocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDate"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
@@ -365,7 +349,23 @@ public Java.Time.Chrono.ChronoPeriod Until(Java.Time.Chrono.ChronoLocalDate arg0
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("until", "(Ljava/time/chrono/ChronoLocalDate;)Ljava/time/chrono/ChronoPeriod;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#minusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getEra()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Chrono.Era"/></returns>
+        public Java.Time.Chrono.Era GetEra()
+        {
+            return IExecuteWithSignature<Java.Time.Chrono.Era>("getEra", "()Ljava/time/chrono/Era;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getDayOfWeek()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
+        public Java.Time.DayOfWeek GetDayOfWeek()
+        {
+            return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#minusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -374,7 +374,7 @@ public Java.Time.LocalDate MinusDays(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("minusDays", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#minusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#minusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -383,7 +383,7 @@ public Java.Time.LocalDate MinusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("minusMonths", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#minusWeeks(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#minusWeeks(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -392,7 +392,7 @@ public Java.Time.LocalDate MinusWeeks(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("minusWeeks", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#minusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#minusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -401,7 +401,7 @@ public Java.Time.LocalDate MinusYears(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("minusYears", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#plusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#plusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -410,7 +410,7 @@ public Java.Time.LocalDate PlusDays(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("plusDays", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#plusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#plusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -419,7 +419,7 @@ public Java.Time.LocalDate PlusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("plusMonths", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#plusWeeks(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#plusWeeks(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -428,7 +428,7 @@ public Java.Time.LocalDate PlusWeeks(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("plusWeeks", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#plusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#plusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -437,7 +437,7 @@ public Java.Time.LocalDate PlusYears(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("plusYears", "(J)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#withDayOfMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#withDayOfMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -446,7 +446,7 @@ public Java.Time.LocalDate WithDayOfMonth(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("withDayOfMonth", "(I)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#withDayOfYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#withDayOfYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -455,7 +455,7 @@ public Java.Time.LocalDate WithDayOfYear(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("withDayOfYear", "(I)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#withMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#withMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -464,7 +464,7 @@ public Java.Time.LocalDate WithMonth(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("withMonth", "(I)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#withYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#withYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -473,7 +473,7 @@ public Java.Time.LocalDate WithYear(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("withYear", "(I)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#atStartOfDay()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#atStartOfDay()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
         public Java.Time.LocalDateTime AtStartOfDay()
@@ -481,7 +481,7 @@ public Java.Time.LocalDateTime AtStartOfDay()
             return IExecuteWithSignature<Java.Time.LocalDateTime>("atStartOfDay", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#atTime(int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#atTime(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -493,7 +493,7 @@ public Java.Time.LocalDateTime AtTime(int arg0, int arg1, int arg2, int arg3)
             return IExecute<Java.Time.LocalDateTime>("atTime", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#atTime(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#atTime(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -504,7 +504,7 @@ public Java.Time.LocalDateTime AtTime(int arg0, int arg1, int arg2)
             return IExecute<Java.Time.LocalDateTime>("atTime", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#atTime(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#atTime(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -514,7 +514,15 @@ public Java.Time.LocalDateTime AtTime(int arg0, int arg1)
             return IExecute<Java.Time.LocalDateTime>("atTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#atTime(java.time.OffsetTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getMonth()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Month"/></returns>
+        public Java.Time.Month GetMonth()
+        {
+            return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#atTime(java.time.OffsetTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetTime"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -523,7 +531,7 @@ public Java.Time.OffsetDateTime AtTime(Java.Time.OffsetTime arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("atTime", "(Ljava/time/OffsetTime;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -532,7 +540,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -541,7 +549,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#atStartOfDay(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#atStartOfDay(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -550,7 +558,7 @@ public Java.Time.ZonedDateTime AtStartOfDay(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("atStartOfDay", "(Ljava/time/ZoneId;)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#datesUntil(java.time.LocalDate,java.time.Period)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#datesUntil(java.time.LocalDate,java.time.Period)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <param name="arg1"><see cref="Java.Time.Period"/></param>
@@ -560,7 +568,7 @@ public Java.Time.ZonedDateTime AtStartOfDay(Java.Time.ZoneId arg0)
             return IExecute<Java.Util.Stream.Stream<Java.Time.LocalDate>>("datesUntil", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#datesUntil(java.time.LocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#datesUntil(java.time.LocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -569,7 +577,7 @@ public Java.Time.ZonedDateTime AtStartOfDay(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Time.LocalDate>>("datesUntil", "(Ljava/time/LocalDate;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -578,7 +586,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#toEpochDay()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#toEpochDay()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToEpochDay()
@@ -586,7 +594,7 @@ public long ToEpochDay()
             return IExecuteWithSignature<long>("toEpochDay", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#toEpochSecond(java.time.LocalTime,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#toEpochSecond(java.time.LocalTime,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -596,7 +604,7 @@ public long ToEpochSecond(Java.Time.LocalTime arg0, Java.Time.ZoneOffset arg1)
             return IExecute<long>("toEpochSecond", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDate.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDate.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/LocalDateTime.cs b/src/net/Netdroid/Generated/Java/Time/LocalDateTime.cs
index c869c2353..4da40de24 100644
--- a/src/net/Netdroid/Generated/Java/Time/LocalDateTime.cs
+++ b/src/net/Netdroid/Generated/Java/Time/LocalDateTime.cs
@@ -26,7 +26,7 @@
 namespace Java.Time
 {
     #region LocalDateTime
-    public partial class LocalDateTime : Java.Time.Temporal.ITemporal, Java.Time.Temporal.ITemporalAdjuster, Java.Time.Chrono.IChronoLocalDateTime, Java.Io.ISerializable
+    public partial class LocalDateTime : Java.Time.Temporal.ITemporal, Java.Time.Temporal.ITemporalAdjuster, Java.Time.Chrono.IChronoLocalDateTime<Java.Time.LocalDate>, Java.Io.ISerializable
     {
         #region Constructors
 
@@ -54,13 +54,13 @@ public partial class LocalDateTime : Java.Time.Temporal.ITemporal, Java.Time.Tem
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#MAX"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#MAX"/>
         /// </summary>
         public static Java.Time.LocalDateTime MAX { get { if (!_MAXReady) { _MAXContent = SGetField<Java.Time.LocalDateTime>(LocalBridgeClazz, "MAX"); _MAXReady = true; } return _MAXContent; } }
         private static Java.Time.LocalDateTime _MAXContent = default;
         private static bool _MAXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#MIN"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#MIN"/>
         /// </summary>
         public static Java.Time.LocalDateTime MIN { get { if (!_MINReady) { _MINContent = SGetField<Java.Time.LocalDateTime>(LocalBridgeClazz, "MIN"); _MINReady = true; } return _MINContent; } }
         private static Java.Time.LocalDateTime _MINContent = default;
@@ -70,7 +70,7 @@ public partial class LocalDateTime : Java.Time.Temporal.ITemporal, Java.Time.Tem
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
         public static Java.Time.LocalDateTime Now()
@@ -78,7 +78,7 @@ public static Java.Time.LocalDateTime Now()
             return SExecuteWithSignature<Java.Time.LocalDateTime>(LocalBridgeClazz, "now", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -87,7 +87,7 @@ public static Java.Time.LocalDateTime Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.LocalDateTime>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -96,7 +96,7 @@ public static Java.Time.LocalDateTime Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.LocalDateTime>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#of(int,int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#of(int,int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -111,7 +111,7 @@ public static Java.Time.LocalDateTime Of(int arg0, int arg1, int arg2, int arg3,
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#of(int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#of(int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -125,7 +125,7 @@ public static Java.Time.LocalDateTime Of(int arg0, int arg1, int arg2, int arg3,
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#of(int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#of(int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -138,7 +138,7 @@ public static Java.Time.LocalDateTime Of(int arg0, int arg1, int arg2, int arg3,
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#of(int,java.time.Month,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#of(int,java.time.Month,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Time.Month"/></param>
@@ -153,7 +153,7 @@ public static Java.Time.LocalDateTime Of(int arg0, Java.Time.Month arg1, int arg
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#of(int,java.time.Month,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#of(int,java.time.Month,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Time.Month"/></param>
@@ -167,7 +167,7 @@ public static Java.Time.LocalDateTime Of(int arg0, Java.Time.Month arg1, int arg
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#of(int,java.time.Month,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#of(int,java.time.Month,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Time.Month"/></param>
@@ -180,7 +180,7 @@ public static Java.Time.LocalDateTime Of(int arg0, Java.Time.Month arg1, int arg
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#of(java.time.LocalDate,java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#of(java.time.LocalDate,java.time.LocalTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <param name="arg1"><see cref="Java.Time.LocalTime"/></param>
@@ -190,7 +190,7 @@ public static Java.Time.LocalDateTime Of(Java.Time.LocalDate arg0, Java.Time.Loc
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#ofEpochSecond(long,int,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#ofEpochSecond(long,int,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -201,7 +201,7 @@ public static Java.Time.LocalDateTime OfEpochSecond(long arg0, int arg1, Java.Ti
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "ofEpochSecond", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -211,7 +211,7 @@ public static Java.Time.LocalDateTime OfInstant(Java.Time.Instant arg0, Java.Tim
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "ofInstant", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -221,7 +221,7 @@ public static Java.Time.LocalDateTime Parse(Java.Lang.CharSequence arg0, Java.Ti
             return SExecute<Java.Time.LocalDateTime>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -234,77 +234,7 @@ public static Java.Time.LocalDateTime Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getDayOfMonth()"/> 
-        /// </summary>
-        public int DayOfMonth
-        {
-            get { return IExecuteWithSignature<int>("getDayOfMonth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getDayOfWeek()"/> 
-        /// </summary>
-        public Java.Time.DayOfWeek DayOfWeek
-        {
-            get { return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getDayOfYear()"/> 
-        /// </summary>
-        public int DayOfYear
-        {
-            get { return IExecuteWithSignature<int>("getDayOfYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getHour()"/> 
-        /// </summary>
-        public int Hour
-        {
-            get { return IExecuteWithSignature<int>("getHour", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getMinute()"/> 
-        /// </summary>
-        public int Minute
-        {
-            get { return IExecuteWithSignature<int>("getMinute", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getMonth()"/> 
-        /// </summary>
-        public Java.Time.Month Month
-        {
-            get { return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getMonthValue()"/> 
-        /// </summary>
-        public int MonthValue
-        {
-            get { return IExecuteWithSignature<int>("getMonthValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getNano()"/> 
-        /// </summary>
-        public int Nano
-        {
-            get { return IExecuteWithSignature<int>("getNano", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getSecond()"/> 
-        /// </summary>
-        public int Second
-        {
-            get { return IExecuteWithSignature<int>("getSecond", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getYear()"/> 
-        /// </summary>
-        public int Year
-        {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -314,7 +244,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#isAfter(java.time.chrono.ChronoLocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#isAfter(java.time.chrono.ChronoLocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -323,7 +253,7 @@ public bool IsAfter(Java.Time.Chrono.ChronoLocalDateTime arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#isBefore(java.time.chrono.ChronoLocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#isBefore(java.time.chrono.ChronoLocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -332,7 +262,7 @@ public bool IsBefore(Java.Time.Chrono.ChronoLocalDateTime arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#isEqual(java.time.chrono.ChronoLocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#isEqual(java.time.chrono.ChronoLocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -341,7 +271,7 @@ public bool IsEqual(Java.Time.Chrono.ChronoLocalDateTime arg0)
             return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/chrono/ChronoLocalDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -350,7 +280,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -359,7 +289,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -368,7 +298,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#compareTo(java.time.chrono.ChronoLocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#compareTo(java.time.chrono.ChronoLocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></param>
         /// <returns><see cref="int"/></returns>
@@ -377,7 +307,7 @@ public int CompareTo(Java.Time.Chrono.ChronoLocalDateTime arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/chrono/ChronoLocalDateTime;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -386,7 +316,71 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getDayOfMonth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfMonth()
+        {
+            return IExecuteWithSignature<int>("getDayOfMonth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getDayOfYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfYear()
+        {
+            return IExecuteWithSignature<int>("getDayOfYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getHour()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHour()
+        {
+            return IExecuteWithSignature<int>("getHour", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getMinute()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinute()
+        {
+            return IExecuteWithSignature<int>("getMinute", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getMonthValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMonthValue()
+        {
+            return IExecuteWithSignature<int>("getMonthValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getNano()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNano()
+        {
+            return IExecuteWithSignature<int>("getNano", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getSecond()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSecond()
+        {
+            return IExecuteWithSignature<int>("getSecond", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetYear()
+        {
+            return IExecuteWithSignature<int>("getYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -395,7 +389,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#toLocalDate()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#toLocalDate()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
         public Java.Time.Chrono.ChronoLocalDate ToLocalDate()
@@ -403,7 +397,7 @@ public Java.Time.Chrono.ChronoLocalDate ToLocalDate()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("toLocalDate", "()Ljava/time/chrono/ChronoLocalDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#atZone(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#atZone(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
@@ -412,7 +406,15 @@ public Java.Time.Chrono.ChronoZonedDateTime AtZone(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("atZone", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#minusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getDayOfWeek()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
+        public Java.Time.DayOfWeek GetDayOfWeek()
+        {
+            return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#minusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -421,7 +423,7 @@ public Java.Time.LocalDateTime MinusDays(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("minusDays", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#minusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#minusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -430,7 +432,7 @@ public Java.Time.LocalDateTime MinusHours(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("minusHours", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#minusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#minusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -439,7 +441,7 @@ public Java.Time.LocalDateTime MinusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("minusMinutes", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#minusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#minusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -448,7 +450,7 @@ public Java.Time.LocalDateTime MinusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("minusMonths", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#minusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#minusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -457,7 +459,7 @@ public Java.Time.LocalDateTime MinusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("minusNanos", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#minusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#minusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -466,7 +468,7 @@ public Java.Time.LocalDateTime MinusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("minusSeconds", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#minusWeeks(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#minusWeeks(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -475,7 +477,7 @@ public Java.Time.LocalDateTime MinusWeeks(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("minusWeeks", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#minusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#minusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -484,7 +486,7 @@ public Java.Time.LocalDateTime MinusYears(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("minusYears", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#plusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#plusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -493,7 +495,7 @@ public Java.Time.LocalDateTime PlusDays(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("plusDays", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#plusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#plusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -502,7 +504,7 @@ public Java.Time.LocalDateTime PlusHours(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("plusHours", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#plusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#plusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -511,7 +513,7 @@ public Java.Time.LocalDateTime PlusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("plusMinutes", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#plusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#plusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -520,7 +522,7 @@ public Java.Time.LocalDateTime PlusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("plusMonths", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#plusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#plusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -529,7 +531,7 @@ public Java.Time.LocalDateTime PlusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("plusNanos", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#plusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#plusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -538,7 +540,7 @@ public Java.Time.LocalDateTime PlusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("plusSeconds", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#plusWeeks(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#plusWeeks(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -547,7 +549,7 @@ public Java.Time.LocalDateTime PlusWeeks(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("plusWeeks", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#plusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#plusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -556,7 +558,7 @@ public Java.Time.LocalDateTime PlusYears(long arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("plusYears", "(J)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -565,7 +567,7 @@ public Java.Time.LocalDateTime TruncatedTo(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("truncatedTo", "(Ljava/time/temporal/TemporalUnit;)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#withDayOfMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#withDayOfMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -574,7 +576,7 @@ public Java.Time.LocalDateTime WithDayOfMonth(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("withDayOfMonth", "(I)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#withDayOfYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#withDayOfYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -583,7 +585,7 @@ public Java.Time.LocalDateTime WithDayOfYear(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("withDayOfYear", "(I)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#withHour(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#withHour(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -592,7 +594,7 @@ public Java.Time.LocalDateTime WithHour(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("withHour", "(I)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#withMinute(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#withMinute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -601,7 +603,7 @@ public Java.Time.LocalDateTime WithMinute(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("withMinute", "(I)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#withMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#withMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -610,7 +612,7 @@ public Java.Time.LocalDateTime WithMonth(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("withMonth", "(I)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#withNano(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#withNano(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -619,7 +621,7 @@ public Java.Time.LocalDateTime WithNano(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("withNano", "(I)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#withSecond(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#withSecond(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -628,7 +630,7 @@ public Java.Time.LocalDateTime WithSecond(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("withSecond", "(I)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#withYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#withYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -637,7 +639,7 @@ public Java.Time.LocalDateTime WithYear(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("withYear", "(I)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#toLocalTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#toLocalTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
         public Java.Time.LocalTime ToLocalTime()
@@ -645,7 +647,15 @@ public Java.Time.LocalTime ToLocalTime()
             return IExecuteWithSignature<Java.Time.LocalTime>("toLocalTime", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#atOffset(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getMonth()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Month"/></returns>
+        public Java.Time.Month GetMonth()
+        {
+            return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#atOffset(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -654,7 +664,7 @@ public Java.Time.OffsetDateTime AtOffset(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("atOffset", "(Ljava/time/ZoneOffset;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -663,7 +673,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -672,7 +682,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -681,7 +691,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalDateTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalDateTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/LocalTime.cs b/src/net/Netdroid/Generated/Java/Time/LocalTime.cs
index c7693a662..80a12bb3c 100644
--- a/src/net/Netdroid/Generated/Java/Time/LocalTime.cs
+++ b/src/net/Netdroid/Generated/Java/Time/LocalTime.cs
@@ -54,25 +54,25 @@ public partial class LocalTime : Java.Time.Temporal.ITemporal, Java.Time.Tempora
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#MAX"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#MAX"/>
         /// </summary>
         public static Java.Time.LocalTime MAX { get { if (!_MAXReady) { _MAXContent = SGetField<Java.Time.LocalTime>(LocalBridgeClazz, "MAX"); _MAXReady = true; } return _MAXContent; } }
         private static Java.Time.LocalTime _MAXContent = default;
         private static bool _MAXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#MIDNIGHT"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#MIDNIGHT"/>
         /// </summary>
         public static Java.Time.LocalTime MIDNIGHT { get { if (!_MIDNIGHTReady) { _MIDNIGHTContent = SGetField<Java.Time.LocalTime>(LocalBridgeClazz, "MIDNIGHT"); _MIDNIGHTReady = true; } return _MIDNIGHTContent; } }
         private static Java.Time.LocalTime _MIDNIGHTContent = default;
         private static bool _MIDNIGHTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#MIN"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#MIN"/>
         /// </summary>
         public static Java.Time.LocalTime MIN { get { if (!_MINReady) { _MINContent = SGetField<Java.Time.LocalTime>(LocalBridgeClazz, "MIN"); _MINReady = true; } return _MINContent; } }
         private static Java.Time.LocalTime _MINContent = default;
         private static bool _MINReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#NOON"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#NOON"/>
         /// </summary>
         public static Java.Time.LocalTime NOON { get { if (!_NOONReady) { _NOONContent = SGetField<Java.Time.LocalTime>(LocalBridgeClazz, "NOON"); _NOONReady = true; } return _NOONContent; } }
         private static Java.Time.LocalTime _NOONContent = default;
@@ -82,7 +82,7 @@ public partial class LocalTime : Java.Time.Temporal.ITemporal, Java.Time.Tempora
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -91,7 +91,7 @@ public static Java.Time.LocalTime From(Java.Time.Temporal.TemporalAccessor arg0)
             return SExecuteWithSignature<Java.Time.LocalTime>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
         public static Java.Time.LocalTime Now()
@@ -99,7 +99,7 @@ public static Java.Time.LocalTime Now()
             return SExecuteWithSignature<Java.Time.LocalTime>(LocalBridgeClazz, "now", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -108,7 +108,7 @@ public static Java.Time.LocalTime Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.LocalTime>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -117,7 +117,7 @@ public static Java.Time.LocalTime Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.LocalTime>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#of(int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#of(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -129,7 +129,7 @@ public static Java.Time.LocalTime Of(int arg0, int arg1, int arg2, int arg3)
             return SExecute<Java.Time.LocalTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#of(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#of(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -140,7 +140,7 @@ public static Java.Time.LocalTime Of(int arg0, int arg1, int arg2)
             return SExecute<Java.Time.LocalTime>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#of(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#of(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -150,7 +150,7 @@ public static Java.Time.LocalTime Of(int arg0, int arg1)
             return SExecute<Java.Time.LocalTime>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -160,7 +160,7 @@ public static Java.Time.LocalTime OfInstant(Java.Time.Instant arg0, Java.Time.Zo
             return SExecute<Java.Time.LocalTime>(LocalBridgeClazz, "ofInstant", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#ofNanoOfDay(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#ofNanoOfDay(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -169,7 +169,7 @@ public static Java.Time.LocalTime OfNanoOfDay(long arg0)
             return SExecuteWithSignature<Java.Time.LocalTime>(LocalBridgeClazz, "ofNanoOfDay", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#ofSecondOfDay(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#ofSecondOfDay(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -178,7 +178,7 @@ public static Java.Time.LocalTime OfSecondOfDay(long arg0)
             return SExecuteWithSignature<Java.Time.LocalTime>(LocalBridgeClazz, "ofSecondOfDay", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -188,7 +188,7 @@ public static Java.Time.LocalTime Parse(Java.Lang.CharSequence arg0, Java.Time.F
             return SExecute<Java.Time.LocalTime>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -201,35 +201,7 @@ public static Java.Time.LocalTime Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#getHour()"/> 
-        /// </summary>
-        public int Hour
-        {
-            get { return IExecuteWithSignature<int>("getHour", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#getMinute()"/> 
-        /// </summary>
-        public int Minute
-        {
-            get { return IExecuteWithSignature<int>("getMinute", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#getNano()"/> 
-        /// </summary>
-        public int Nano
-        {
-            get { return IExecuteWithSignature<int>("getNano", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#getSecond()"/> 
-        /// </summary>
-        public int Second
-        {
-            get { return IExecuteWithSignature<int>("getSecond", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -239,7 +211,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#isAfter(java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#isAfter(java.time.LocalTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -248,7 +220,7 @@ public bool IsAfter(Java.Time.LocalTime arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/LocalTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#isBefore(java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#isBefore(java.time.LocalTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -257,7 +229,7 @@ public bool IsBefore(Java.Time.LocalTime arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/LocalTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -266,7 +238,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -275,7 +247,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -284,7 +256,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#compareTo(java.time.LocalTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#compareTo(java.time.LocalTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
         /// <returns><see cref="int"/></returns>
@@ -293,7 +265,7 @@ public int CompareTo(Java.Time.LocalTime arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/LocalTime;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -302,7 +274,39 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#toSecondOfDay()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#getHour()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHour()
+        {
+            return IExecuteWithSignature<int>("getHour", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#getMinute()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinute()
+        {
+            return IExecuteWithSignature<int>("getMinute", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#getNano()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNano()
+        {
+            return IExecuteWithSignature<int>("getNano", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#getSecond()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSecond()
+        {
+            return IExecuteWithSignature<int>("getSecond", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#toSecondOfDay()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ToSecondOfDay()
@@ -310,7 +314,7 @@ public int ToSecondOfDay()
             return IExecuteWithSignature<int>("toSecondOfDay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -319,7 +323,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#atDate(java.time.LocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#atDate(java.time.LocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
@@ -328,7 +332,7 @@ public Java.Time.LocalDateTime AtDate(Java.Time.LocalDate arg0)
             return IExecuteWithSignature<Java.Time.LocalDateTime>("atDate", "(Ljava/time/LocalDate;)Ljava/time/LocalDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#minusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#minusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -337,7 +341,7 @@ public Java.Time.LocalTime MinusHours(long arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("minusHours", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#minusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#minusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -346,7 +350,7 @@ public Java.Time.LocalTime MinusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("minusMinutes", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#minusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#minusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -355,7 +359,7 @@ public Java.Time.LocalTime MinusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("minusNanos", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#minusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#minusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -364,7 +368,7 @@ public Java.Time.LocalTime MinusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("minusSeconds", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#plusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#plusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -373,7 +377,7 @@ public Java.Time.LocalTime PlusHours(long arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("plusHours", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#plusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#plusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -382,7 +386,7 @@ public Java.Time.LocalTime PlusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("plusMinutes", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#plusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#plusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -391,7 +395,7 @@ public Java.Time.LocalTime PlusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("plusNanos", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#plusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#plusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -400,7 +404,7 @@ public Java.Time.LocalTime PlusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("plusSeconds", "(J)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -409,7 +413,7 @@ public Java.Time.LocalTime TruncatedTo(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("truncatedTo", "(Ljava/time/temporal/TemporalUnit;)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#withHour(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#withHour(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -418,7 +422,7 @@ public Java.Time.LocalTime WithHour(int arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("withHour", "(I)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#withMinute(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#withMinute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -427,7 +431,7 @@ public Java.Time.LocalTime WithMinute(int arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("withMinute", "(I)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#withNano(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#withNano(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -436,7 +440,7 @@ public Java.Time.LocalTime WithNano(int arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("withNano", "(I)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#withSecond(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#withSecond(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
@@ -445,7 +449,7 @@ public Java.Time.LocalTime WithSecond(int arg0)
             return IExecuteWithSignature<Java.Time.LocalTime>("withSecond", "(I)Ljava/time/LocalTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#atOffset(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#atOffset(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -454,7 +458,7 @@ public Java.Time.OffsetTime AtOffset(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("atOffset", "(Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -463,7 +467,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -472,7 +476,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -482,7 +486,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -491,7 +495,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -501,7 +505,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -510,7 +514,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -520,7 +524,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -529,7 +533,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -538,7 +542,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#toEpochSecond(java.time.LocalDate,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#toEpochSecond(java.time.LocalDate,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -548,7 +552,7 @@ public long ToEpochSecond(Java.Time.LocalDate arg0, Java.Time.ZoneOffset arg1)
             return IExecute<long>("toEpochSecond", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#toNanoOfDay()"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#toNanoOfDay()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToNanoOfDay()
@@ -556,7 +560,7 @@ public long ToNanoOfDay()
             return IExecuteWithSignature<long>("toNanoOfDay", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/LocalTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/LocalTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Month.cs b/src/net/Netdroid/Generated/Java/Time/Month.cs
index 062c3985c..5d5c46ea1 100644
--- a/src/net/Netdroid/Generated/Java/Time/Month.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Month.cs
@@ -46,73 +46,73 @@ public partial class Month : Java.Time.Temporal.ITemporalAccessor, Java.Time.Tem
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#APRIL"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#APRIL"/>
         /// </summary>
         public static Java.Time.Month APRIL { get { if (!_APRILReady) { _APRILContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "APRIL"); _APRILReady = true; } return _APRILContent; } }
         private static Java.Time.Month _APRILContent = default;
         private static bool _APRILReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#AUGUST"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#AUGUST"/>
         /// </summary>
         public static Java.Time.Month AUGUST { get { if (!_AUGUSTReady) { _AUGUSTContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "AUGUST"); _AUGUSTReady = true; } return _AUGUSTContent; } }
         private static Java.Time.Month _AUGUSTContent = default;
         private static bool _AUGUSTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#DECEMBER"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#DECEMBER"/>
         /// </summary>
         public static Java.Time.Month DECEMBER { get { if (!_DECEMBERReady) { _DECEMBERContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "DECEMBER"); _DECEMBERReady = true; } return _DECEMBERContent; } }
         private static Java.Time.Month _DECEMBERContent = default;
         private static bool _DECEMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#FEBRUARY"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#FEBRUARY"/>
         /// </summary>
         public static Java.Time.Month FEBRUARY { get { if (!_FEBRUARYReady) { _FEBRUARYContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "FEBRUARY"); _FEBRUARYReady = true; } return _FEBRUARYContent; } }
         private static Java.Time.Month _FEBRUARYContent = default;
         private static bool _FEBRUARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#JANUARY"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#JANUARY"/>
         /// </summary>
         public static Java.Time.Month JANUARY { get { if (!_JANUARYReady) { _JANUARYContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "JANUARY"); _JANUARYReady = true; } return _JANUARYContent; } }
         private static Java.Time.Month _JANUARYContent = default;
         private static bool _JANUARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#JULY"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#JULY"/>
         /// </summary>
         public static Java.Time.Month JULY { get { if (!_JULYReady) { _JULYContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "JULY"); _JULYReady = true; } return _JULYContent; } }
         private static Java.Time.Month _JULYContent = default;
         private static bool _JULYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#JUNE"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#JUNE"/>
         /// </summary>
         public static Java.Time.Month JUNE { get { if (!_JUNEReady) { _JUNEContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "JUNE"); _JUNEReady = true; } return _JUNEContent; } }
         private static Java.Time.Month _JUNEContent = default;
         private static bool _JUNEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#MARCH"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#MARCH"/>
         /// </summary>
         public static Java.Time.Month MARCH { get { if (!_MARCHReady) { _MARCHContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "MARCH"); _MARCHReady = true; } return _MARCHContent; } }
         private static Java.Time.Month _MARCHContent = default;
         private static bool _MARCHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#MAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#MAY"/>
         /// </summary>
         public static Java.Time.Month MAY { get { if (!_MAYReady) { _MAYContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "MAY"); _MAYReady = true; } return _MAYContent; } }
         private static Java.Time.Month _MAYContent = default;
         private static bool _MAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#NOVEMBER"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#NOVEMBER"/>
         /// </summary>
         public static Java.Time.Month NOVEMBER { get { if (!_NOVEMBERReady) { _NOVEMBERContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "NOVEMBER"); _NOVEMBERReady = true; } return _NOVEMBERContent; } }
         private static Java.Time.Month _NOVEMBERContent = default;
         private static bool _NOVEMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#OCTOBER"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#OCTOBER"/>
         /// </summary>
         public static Java.Time.Month OCTOBER { get { if (!_OCTOBERReady) { _OCTOBERContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "OCTOBER"); _OCTOBERReady = true; } return _OCTOBERContent; } }
         private static Java.Time.Month _OCTOBERContent = default;
         private static bool _OCTOBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#SEPTEMBER"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#SEPTEMBER"/>
         /// </summary>
         public static Java.Time.Month SEPTEMBER { get { if (!_SEPTEMBERReady) { _SEPTEMBERContent = SGetField<Java.Time.Month>(LocalBridgeClazz, "SEPTEMBER"); _SEPTEMBERReady = true; } return _SEPTEMBERContent; } }
         private static Java.Time.Month _SEPTEMBERContent = default;
@@ -122,7 +122,7 @@ public partial class Month : Java.Time.Temporal.ITemporalAccessor, Java.Time.Tem
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Month"/></returns>
@@ -131,7 +131,7 @@ public static Java.Time.Month From(Java.Time.Temporal.TemporalAccessor arg0)
             return SExecuteWithSignature<Java.Time.Month>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/Month;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Month"/></returns>
@@ -140,7 +140,7 @@ public static Java.Time.Month Of(int arg0)
             return SExecuteWithSignature<Java.Time.Month>(LocalBridgeClazz, "of", "(I)Ljava/time/Month;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Month"/></returns>
@@ -149,7 +149,7 @@ public static Java.Time.Month ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Month>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/Month;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Month"/></returns>
         public static Java.Time.Month[] Values()
@@ -161,14 +161,7 @@ public static Java.Time.Month[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#getValue()"/> 
-        /// </summary>
-        public int Value
-        {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -178,7 +171,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -187,7 +180,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#firstDayOfYear(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#firstDayOfYear(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="int"/></returns>
@@ -196,7 +189,7 @@ public int FirstDayOfYear(bool arg0)
             return IExecuteWithSignature<int>("firstDayOfYear", "(Z)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -205,7 +198,15 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#length(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#getValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
+        {
+            return IExecuteWithSignature<int>("getValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#length(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="int"/></returns>
@@ -214,7 +215,7 @@ public int Length(bool arg0)
             return IExecuteWithSignature<int>("length", "(Z)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#maxLength()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#maxLength()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int MaxLength()
@@ -222,7 +223,7 @@ public int MaxLength()
             return IExecuteWithSignature<int>("maxLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#minLength()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#minLength()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int MinLength()
@@ -230,7 +231,7 @@ public int MinLength()
             return IExecuteWithSignature<int>("minLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -240,7 +241,7 @@ public Java.Lang.String GetDisplayName(Java.Time.Format.TextStyle arg0, Java.Uti
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#firstMonthOfQuarter()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#firstMonthOfQuarter()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Month"/></returns>
         public Java.Time.Month FirstMonthOfQuarter()
@@ -248,7 +249,7 @@ public Java.Time.Month FirstMonthOfQuarter()
             return IExecuteWithSignature<Java.Time.Month>("firstMonthOfQuarter", "()Ljava/time/Month;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#minus(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#minus(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Month"/></returns>
@@ -257,7 +258,7 @@ public Java.Time.Month Minus(long arg0)
             return IExecuteWithSignature<Java.Time.Month>("minus", "(J)Ljava/time/Month;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#plus(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#plus(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Month"/></returns>
@@ -266,7 +267,7 @@ public Java.Time.Month Plus(long arg0)
             return IExecuteWithSignature<Java.Time.Month>("plus", "(J)Ljava/time/Month;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -275,7 +276,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -284,7 +285,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Month.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Month.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/MonthDay.cs b/src/net/Netdroid/Generated/Java/Time/MonthDay.cs
index 1d702cb46..61e213ce7 100644
--- a/src/net/Netdroid/Generated/Java/Time/MonthDay.cs
+++ b/src/net/Netdroid/Generated/Java/Time/MonthDay.cs
@@ -58,7 +58,7 @@ public partial class MonthDay : Java.Time.Temporal.ITemporalAccessor, Java.Time.
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.MonthDay"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.MonthDay From(Java.Time.Temporal.TemporalAccessor arg0)
             return SExecuteWithSignature<Java.Time.MonthDay>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/MonthDay;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.MonthDay"/></returns>
         public static Java.Time.MonthDay Now()
@@ -75,7 +75,7 @@ public static Java.Time.MonthDay Now()
             return SExecuteWithSignature<Java.Time.MonthDay>(LocalBridgeClazz, "now", "()Ljava/time/MonthDay;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.MonthDay"/></returns>
@@ -84,7 +84,7 @@ public static Java.Time.MonthDay Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.MonthDay>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/MonthDay;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.MonthDay"/></returns>
@@ -93,7 +93,7 @@ public static Java.Time.MonthDay Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.MonthDay>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/MonthDay;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#of(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#of(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -103,7 +103,7 @@ public static Java.Time.MonthDay Of(int arg0, int arg1)
             return SExecute<Java.Time.MonthDay>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#of(java.time.Month,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#of(java.time.Month,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Month"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -113,7 +113,7 @@ public static Java.Time.MonthDay Of(Java.Time.Month arg0, int arg1)
             return SExecute<Java.Time.MonthDay>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -123,7 +123,7 @@ public static Java.Time.MonthDay Parse(Java.Lang.CharSequence arg0, Java.Time.Fo
             return SExecute<Java.Time.MonthDay>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.MonthDay"/></returns>
@@ -136,28 +136,7 @@ public static Java.Time.MonthDay Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#getDayOfMonth()"/> 
-        /// </summary>
-        public int DayOfMonth
-        {
-            get { return IExecuteWithSignature<int>("getDayOfMonth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#getMonth()"/> 
-        /// </summary>
-        public Java.Time.Month Month
-        {
-            get { return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#getMonthValue()"/> 
-        /// </summary>
-        public int MonthValue
-        {
-            get { return IExecuteWithSignature<int>("getMonthValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -167,7 +146,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#isAfter(java.time.MonthDay)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#isAfter(java.time.MonthDay)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.MonthDay"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -176,7 +155,7 @@ public bool IsAfter(Java.Time.MonthDay arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/MonthDay;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#isBefore(java.time.MonthDay)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#isBefore(java.time.MonthDay)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.MonthDay"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -185,7 +164,7 @@ public bool IsBefore(Java.Time.MonthDay arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/MonthDay;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -194,7 +173,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#isValidYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#isValidYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -203,7 +182,7 @@ public bool IsValidYear(int arg0)
             return IExecuteWithSignature<bool>("isValidYear", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -212,7 +191,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#compareTo(java.time.MonthDay)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#compareTo(java.time.MonthDay)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.MonthDay"/></param>
         /// <returns><see cref="int"/></returns>
@@ -221,7 +200,7 @@ public int CompareTo(Java.Time.MonthDay arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/MonthDay;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -230,7 +209,23 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#getDayOfMonth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfMonth()
+        {
+            return IExecuteWithSignature<int>("getDayOfMonth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#getMonthValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMonthValue()
+        {
+            return IExecuteWithSignature<int>("getMonthValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -239,7 +234,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#atYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#atYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -248,7 +243,15 @@ public Java.Time.LocalDate AtYear(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("atYear", "(I)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#with(java.time.Month)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#getMonth()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Month"/></returns>
+        public Java.Time.Month GetMonth()
+        {
+            return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#with(java.time.Month)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Month"/></param>
         /// <returns><see cref="Java.Time.MonthDay"/></returns>
@@ -257,7 +260,7 @@ public Java.Time.MonthDay With(Java.Time.Month arg0)
             return IExecuteWithSignature<Java.Time.MonthDay>("with", "(Ljava/time/Month;)Ljava/time/MonthDay;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#withDayOfMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#withDayOfMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.MonthDay"/></returns>
@@ -266,7 +269,7 @@ public Java.Time.MonthDay WithDayOfMonth(int arg0)
             return IExecuteWithSignature<Java.Time.MonthDay>("withDayOfMonth", "(I)Ljava/time/MonthDay;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#withMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#withMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.MonthDay"/></returns>
@@ -275,7 +278,7 @@ public Java.Time.MonthDay WithMonth(int arg0)
             return IExecuteWithSignature<Java.Time.MonthDay>("withMonth", "(I)Ljava/time/MonthDay;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -284,7 +287,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -293,7 +296,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/MonthDay.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/MonthDay.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/OffsetDateTime.cs b/src/net/Netdroid/Generated/Java/Time/OffsetDateTime.cs
index 8c3211e80..2a54caeb8 100644
--- a/src/net/Netdroid/Generated/Java/Time/OffsetDateTime.cs
+++ b/src/net/Netdroid/Generated/Java/Time/OffsetDateTime.cs
@@ -54,13 +54,13 @@ public partial class OffsetDateTime : Java.Time.Temporal.ITemporal, Java.Time.Te
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#MAX"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#MAX"/>
         /// </summary>
         public static Java.Time.OffsetDateTime MAX { get { if (!_MAXReady) { _MAXContent = SGetField<Java.Time.OffsetDateTime>(LocalBridgeClazz, "MAX"); _MAXReady = true; } return _MAXContent; } }
         private static Java.Time.OffsetDateTime _MAXContent = default;
         private static bool _MAXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#MIN"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#MIN"/>
         /// </summary>
         public static Java.Time.OffsetDateTime MIN { get { if (!_MINReady) { _MINContent = SGetField<Java.Time.OffsetDateTime>(LocalBridgeClazz, "MIN"); _MINReady = true; } return _MINContent; } }
         private static Java.Time.OffsetDateTime _MINContent = default;
@@ -70,7 +70,7 @@ public partial class OffsetDateTime : Java.Time.Temporal.ITemporal, Java.Time.Te
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -79,7 +79,7 @@ public static Java.Time.OffsetDateTime From(Java.Time.Temporal.TemporalAccessor
             return SExecuteWithSignature<Java.Time.OffsetDateTime>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
         public static Java.Time.OffsetDateTime Now()
@@ -87,7 +87,7 @@ public static Java.Time.OffsetDateTime Now()
             return SExecuteWithSignature<Java.Time.OffsetDateTime>(LocalBridgeClazz, "now", "()Ljava/time/OffsetDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -96,7 +96,7 @@ public static Java.Time.OffsetDateTime Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.OffsetDateTime>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -105,7 +105,7 @@ public static Java.Time.OffsetDateTime Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.OffsetDateTime>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#of(int,int,int,int,int,int,int,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#of(int,int,int,int,int,int,int,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -121,7 +121,7 @@ public static Java.Time.OffsetDateTime Of(int arg0, int arg1, int arg2, int arg3
             return SExecute<Java.Time.OffsetDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#of(java.time.LocalDate,java.time.LocalTime,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#of(java.time.LocalDate,java.time.LocalTime,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <param name="arg1"><see cref="Java.Time.LocalTime"/></param>
@@ -132,7 +132,7 @@ public static Java.Time.OffsetDateTime Of(Java.Time.LocalDate arg0, Java.Time.Lo
             return SExecute<Java.Time.OffsetDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#of(java.time.LocalDateTime,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#of(java.time.LocalDateTime,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -142,7 +142,7 @@ public static Java.Time.OffsetDateTime Of(Java.Time.LocalDateTime arg0, Java.Tim
             return SExecute<Java.Time.OffsetDateTime>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -152,7 +152,7 @@ public static Java.Time.OffsetDateTime OfInstant(Java.Time.Instant arg0, Java.Ti
             return SExecute<Java.Time.OffsetDateTime>(LocalBridgeClazz, "ofInstant", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -162,7 +162,7 @@ public static Java.Time.OffsetDateTime Parse(Java.Lang.CharSequence arg0, Java.T
             return SExecute<Java.Time.OffsetDateTime>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -175,84 +175,7 @@ public static Java.Time.OffsetDateTime Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getDayOfMonth()"/> 
-        /// </summary>
-        public int DayOfMonth
-        {
-            get { return IExecuteWithSignature<int>("getDayOfMonth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getDayOfWeek()"/> 
-        /// </summary>
-        public Java.Time.DayOfWeek DayOfWeek
-        {
-            get { return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getDayOfYear()"/> 
-        /// </summary>
-        public int DayOfYear
-        {
-            get { return IExecuteWithSignature<int>("getDayOfYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getHour()"/> 
-        /// </summary>
-        public int Hour
-        {
-            get { return IExecuteWithSignature<int>("getHour", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getMinute()"/> 
-        /// </summary>
-        public int Minute
-        {
-            get { return IExecuteWithSignature<int>("getMinute", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getMonth()"/> 
-        /// </summary>
-        public Java.Time.Month Month
-        {
-            get { return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getMonthValue()"/> 
-        /// </summary>
-        public int MonthValue
-        {
-            get { return IExecuteWithSignature<int>("getMonthValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getNano()"/> 
-        /// </summary>
-        public int Nano
-        {
-            get { return IExecuteWithSignature<int>("getNano", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getOffset()"/> 
-        /// </summary>
-        public Java.Time.ZoneOffset Offset
-        {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getSecond()"/> 
-        /// </summary>
-        public int Second
-        {
-            get { return IExecuteWithSignature<int>("getSecond", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getYear()"/> 
-        /// </summary>
-        public int Year
-        {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -262,7 +185,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#isAfter(java.time.OffsetDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#isAfter(java.time.OffsetDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -271,7 +194,7 @@ public bool IsAfter(Java.Time.OffsetDateTime arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/OffsetDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#isBefore(java.time.OffsetDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#isBefore(java.time.OffsetDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -280,7 +203,7 @@ public bool IsBefore(Java.Time.OffsetDateTime arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/OffsetDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#isEqual(java.time.OffsetDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#isEqual(java.time.OffsetDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetDateTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -289,7 +212,7 @@ public bool IsEqual(Java.Time.OffsetDateTime arg0)
             return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/OffsetDateTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -298,7 +221,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -307,7 +230,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -316,7 +239,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#compareTo(java.time.OffsetDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#compareTo(java.time.OffsetDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetDateTime"/></param>
         /// <returns><see cref="int"/></returns>
@@ -325,7 +248,7 @@ public int CompareTo(Java.Time.OffsetDateTime arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/OffsetDateTime;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -334,7 +257,71 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getDayOfMonth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfMonth()
+        {
+            return IExecuteWithSignature<int>("getDayOfMonth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getDayOfYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfYear()
+        {
+            return IExecuteWithSignature<int>("getDayOfYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getHour()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHour()
+        {
+            return IExecuteWithSignature<int>("getHour", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getMinute()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinute()
+        {
+            return IExecuteWithSignature<int>("getMinute", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getMonthValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMonthValue()
+        {
+            return IExecuteWithSignature<int>("getMonthValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getNano()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNano()
+        {
+            return IExecuteWithSignature<int>("getNano", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getSecond()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSecond()
+        {
+            return IExecuteWithSignature<int>("getSecond", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetYear()
+        {
+            return IExecuteWithSignature<int>("getYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -343,7 +330,15 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#toInstant()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getDayOfWeek()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
+        public Java.Time.DayOfWeek GetDayOfWeek()
+        {
+            return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#toInstant()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Instant"/></returns>
         public Java.Time.Instant ToInstant()
@@ -351,7 +346,7 @@ public Java.Time.Instant ToInstant()
             return IExecuteWithSignature<Java.Time.Instant>("toInstant", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#toLocalDate()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#toLocalDate()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
         public Java.Time.LocalDate ToLocalDate()
@@ -359,7 +354,7 @@ public Java.Time.LocalDate ToLocalDate()
             return IExecuteWithSignature<Java.Time.LocalDate>("toLocalDate", "()Ljava/time/LocalDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#toLocalDateTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#toLocalDateTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
         public Java.Time.LocalDateTime ToLocalDateTime()
@@ -367,7 +362,7 @@ public Java.Time.LocalDateTime ToLocalDateTime()
             return IExecuteWithSignature<Java.Time.LocalDateTime>("toLocalDateTime", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#toLocalTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#toLocalTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
         public Java.Time.LocalTime ToLocalTime()
@@ -375,7 +370,15 @@ public Java.Time.LocalTime ToLocalTime()
             return IExecuteWithSignature<Java.Time.LocalTime>("toLocalTime", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getMonth()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Month"/></returns>
+        public Java.Time.Month GetMonth()
+        {
+            return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -384,7 +387,7 @@ public Java.Time.OffsetDateTime MinusDays(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("minusDays", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -393,7 +396,7 @@ public Java.Time.OffsetDateTime MinusHours(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("minusHours", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -402,7 +405,7 @@ public Java.Time.OffsetDateTime MinusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("minusMinutes", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -411,7 +414,7 @@ public Java.Time.OffsetDateTime MinusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("minusMonths", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -420,7 +423,7 @@ public Java.Time.OffsetDateTime MinusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("minusNanos", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -429,7 +432,7 @@ public Java.Time.OffsetDateTime MinusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("minusSeconds", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minusWeeks(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minusWeeks(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -438,7 +441,7 @@ public Java.Time.OffsetDateTime MinusWeeks(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("minusWeeks", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -447,7 +450,7 @@ public Java.Time.OffsetDateTime MinusYears(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("minusYears", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -456,7 +459,7 @@ public Java.Time.OffsetDateTime PlusDays(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("plusDays", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -465,7 +468,7 @@ public Java.Time.OffsetDateTime PlusHours(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("plusHours", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -474,7 +477,7 @@ public Java.Time.OffsetDateTime PlusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("plusMinutes", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -483,7 +486,7 @@ public Java.Time.OffsetDateTime PlusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("plusMonths", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -492,7 +495,7 @@ public Java.Time.OffsetDateTime PlusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("plusNanos", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -501,7 +504,7 @@ public Java.Time.OffsetDateTime PlusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("plusSeconds", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plusWeeks(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plusWeeks(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -510,7 +513,7 @@ public Java.Time.OffsetDateTime PlusWeeks(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("plusWeeks", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -519,7 +522,7 @@ public Java.Time.OffsetDateTime PlusYears(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("plusYears", "(J)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -528,7 +531,7 @@ public Java.Time.OffsetDateTime TruncatedTo(Java.Time.Temporal.TemporalUnit arg0
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("truncatedTo", "(Ljava/time/temporal/TemporalUnit;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withDayOfMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withDayOfMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -537,7 +540,7 @@ public Java.Time.OffsetDateTime WithDayOfMonth(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withDayOfMonth", "(I)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withDayOfYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withDayOfYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -546,7 +549,7 @@ public Java.Time.OffsetDateTime WithDayOfYear(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withDayOfYear", "(I)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withHour(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withHour(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -555,7 +558,7 @@ public Java.Time.OffsetDateTime WithHour(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withHour", "(I)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withMinute(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withMinute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -564,7 +567,7 @@ public Java.Time.OffsetDateTime WithMinute(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withMinute", "(I)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -573,7 +576,7 @@ public Java.Time.OffsetDateTime WithMonth(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withMonth", "(I)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withNano(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withNano(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -582,7 +585,7 @@ public Java.Time.OffsetDateTime WithNano(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withNano", "(I)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withOffsetSameInstant(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withOffsetSameInstant(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -591,7 +594,7 @@ public Java.Time.OffsetDateTime WithOffsetSameInstant(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withOffsetSameInstant", "(Ljava/time/ZoneOffset;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withOffsetSameLocal(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withOffsetSameLocal(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -600,7 +603,7 @@ public Java.Time.OffsetDateTime WithOffsetSameLocal(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withOffsetSameLocal", "(Ljava/time/ZoneOffset;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withSecond(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withSecond(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -609,7 +612,7 @@ public Java.Time.OffsetDateTime WithSecond(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withSecond", "(I)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#withYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#withYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -618,7 +621,7 @@ public Java.Time.OffsetDateTime WithYear(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("withYear", "(I)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#toOffsetTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#toOffsetTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
         public Java.Time.OffsetTime ToOffsetTime()
@@ -626,7 +629,7 @@ public Java.Time.OffsetTime ToOffsetTime()
             return IExecuteWithSignature<Java.Time.OffsetTime>("toOffsetTime", "()Ljava/time/OffsetTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -635,7 +638,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -644,7 +647,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -654,7 +657,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -663,7 +666,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -673,7 +676,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -682,7 +685,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -692,7 +695,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -701,7 +704,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#atZoneSameInstant(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#atZoneSameInstant(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -710,7 +713,7 @@ public Java.Time.ZonedDateTime AtZoneSameInstant(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("atZoneSameInstant", "(Ljava/time/ZoneId;)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#atZoneSimilarLocal(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#atZoneSimilarLocal(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -719,7 +722,7 @@ public Java.Time.ZonedDateTime AtZoneSimilarLocal(Java.Time.ZoneId arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("atZoneSimilarLocal", "(Ljava/time/ZoneId;)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#toZonedDateTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#toZonedDateTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
         public Java.Time.ZonedDateTime ToZonedDateTime()
@@ -727,7 +730,15 @@ public Java.Time.ZonedDateTime ToZonedDateTime()
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("toZonedDateTime", "()Ljava/time/ZonedDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getOffset()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffset()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -736,7 +747,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#toEpochSecond()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#toEpochSecond()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToEpochSecond()
@@ -744,7 +755,7 @@ public long ToEpochSecond()
             return IExecuteWithSignature<long>("toEpochSecond", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetDateTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetDateTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/OffsetTime.cs b/src/net/Netdroid/Generated/Java/Time/OffsetTime.cs
index 537febe32..ed8a7ade3 100644
--- a/src/net/Netdroid/Generated/Java/Time/OffsetTime.cs
+++ b/src/net/Netdroid/Generated/Java/Time/OffsetTime.cs
@@ -54,13 +54,13 @@ public partial class OffsetTime : Java.Time.Temporal.ITemporal, Java.Time.Tempor
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#MAX"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#MAX"/>
         /// </summary>
         public static Java.Time.OffsetTime MAX { get { if (!_MAXReady) { _MAXContent = SGetField<Java.Time.OffsetTime>(LocalBridgeClazz, "MAX"); _MAXReady = true; } return _MAXContent; } }
         private static Java.Time.OffsetTime _MAXContent = default;
         private static bool _MAXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#MIN"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#MIN"/>
         /// </summary>
         public static Java.Time.OffsetTime MIN { get { if (!_MINReady) { _MINContent = SGetField<Java.Time.OffsetTime>(LocalBridgeClazz, "MIN"); _MINReady = true; } return _MINContent; } }
         private static Java.Time.OffsetTime _MINContent = default;
@@ -70,7 +70,7 @@ public partial class OffsetTime : Java.Time.Temporal.ITemporal, Java.Time.Tempor
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -79,7 +79,7 @@ public static Java.Time.OffsetTime From(Java.Time.Temporal.TemporalAccessor arg0
             return SExecuteWithSignature<Java.Time.OffsetTime>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
         public static Java.Time.OffsetTime Now()
@@ -87,7 +87,7 @@ public static Java.Time.OffsetTime Now()
             return SExecuteWithSignature<Java.Time.OffsetTime>(LocalBridgeClazz, "now", "()Ljava/time/OffsetTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -96,7 +96,7 @@ public static Java.Time.OffsetTime Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.OffsetTime>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -105,7 +105,7 @@ public static Java.Time.OffsetTime Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.OffsetTime>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#of(int,int,int,int,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#of(int,int,int,int,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -118,7 +118,7 @@ public static Java.Time.OffsetTime Of(int arg0, int arg1, int arg2, int arg3, Ja
             return SExecute<Java.Time.OffsetTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#of(java.time.LocalTime,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#of(java.time.LocalTime,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -128,7 +128,7 @@ public static Java.Time.OffsetTime Of(Java.Time.LocalTime arg0, Java.Time.ZoneOf
             return SExecute<Java.Time.OffsetTime>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -138,7 +138,7 @@ public static Java.Time.OffsetTime OfInstant(Java.Time.Instant arg0, Java.Time.Z
             return SExecute<Java.Time.OffsetTime>(LocalBridgeClazz, "ofInstant", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -148,7 +148,7 @@ public static Java.Time.OffsetTime Parse(Java.Lang.CharSequence arg0, Java.Time.
             return SExecute<Java.Time.OffsetTime>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -161,42 +161,7 @@ public static Java.Time.OffsetTime Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#getHour()"/> 
-        /// </summary>
-        public int Hour
-        {
-            get { return IExecuteWithSignature<int>("getHour", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#getMinute()"/> 
-        /// </summary>
-        public int Minute
-        {
-            get { return IExecuteWithSignature<int>("getMinute", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#getNano()"/> 
-        /// </summary>
-        public int Nano
-        {
-            get { return IExecuteWithSignature<int>("getNano", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#getOffset()"/> 
-        /// </summary>
-        public Java.Time.ZoneOffset Offset
-        {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#getSecond()"/> 
-        /// </summary>
-        public int Second
-        {
-            get { return IExecuteWithSignature<int>("getSecond", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -206,7 +171,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#isAfter(java.time.OffsetTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#isAfter(java.time.OffsetTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -215,7 +180,7 @@ public bool IsAfter(Java.Time.OffsetTime arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/OffsetTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#isBefore(java.time.OffsetTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#isBefore(java.time.OffsetTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -224,7 +189,7 @@ public bool IsBefore(Java.Time.OffsetTime arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/OffsetTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#isEqual(java.time.OffsetTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#isEqual(java.time.OffsetTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetTime"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -233,7 +198,7 @@ public bool IsEqual(Java.Time.OffsetTime arg0)
             return IExecuteWithSignature<bool>("isEqual", "(Ljava/time/OffsetTime;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -242,7 +207,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -251,7 +216,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -260,7 +225,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#compareTo(java.time.OffsetTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#compareTo(java.time.OffsetTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.OffsetTime"/></param>
         /// <returns><see cref="int"/></returns>
@@ -269,7 +234,7 @@ public int CompareTo(Java.Time.OffsetTime arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/OffsetTime;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -278,7 +243,39 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#getHour()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHour()
+        {
+            return IExecuteWithSignature<int>("getHour", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#getMinute()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinute()
+        {
+            return IExecuteWithSignature<int>("getMinute", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#getNano()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNano()
+        {
+            return IExecuteWithSignature<int>("getNano", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#getSecond()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSecond()
+        {
+            return IExecuteWithSignature<int>("getSecond", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -287,7 +284,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#toLocalTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#toLocalTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
         public Java.Time.LocalTime ToLocalTime()
@@ -295,7 +292,7 @@ public Java.Time.LocalTime ToLocalTime()
             return IExecuteWithSignature<Java.Time.LocalTime>("toLocalTime", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#atDate(java.time.LocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#atDate(java.time.LocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
@@ -304,7 +301,7 @@ public Java.Time.OffsetDateTime AtDate(Java.Time.LocalDate arg0)
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("atDate", "(Ljava/time/LocalDate;)Ljava/time/OffsetDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#minusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#minusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -313,7 +310,7 @@ public Java.Time.OffsetTime MinusHours(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("minusHours", "(J)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#minusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#minusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -322,7 +319,7 @@ public Java.Time.OffsetTime MinusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("minusMinutes", "(J)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#minusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#minusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -331,7 +328,7 @@ public Java.Time.OffsetTime MinusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("minusNanos", "(J)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#minusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#minusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -340,7 +337,7 @@ public Java.Time.OffsetTime MinusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("minusSeconds", "(J)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#plusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#plusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -349,7 +346,7 @@ public Java.Time.OffsetTime PlusHours(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("plusHours", "(J)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#plusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#plusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -358,7 +355,7 @@ public Java.Time.OffsetTime PlusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("plusMinutes", "(J)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#plusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#plusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -367,7 +364,7 @@ public Java.Time.OffsetTime PlusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("plusNanos", "(J)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#plusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#plusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -376,7 +373,7 @@ public Java.Time.OffsetTime PlusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("plusSeconds", "(J)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -385,7 +382,7 @@ public Java.Time.OffsetTime TruncatedTo(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("truncatedTo", "(Ljava/time/temporal/TemporalUnit;)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#withHour(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#withHour(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -394,7 +391,7 @@ public Java.Time.OffsetTime WithHour(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("withHour", "(I)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#withMinute(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#withMinute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -403,7 +400,7 @@ public Java.Time.OffsetTime WithMinute(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("withMinute", "(I)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#withNano(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#withNano(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -412,7 +409,7 @@ public Java.Time.OffsetTime WithNano(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("withNano", "(I)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#withOffsetSameInstant(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#withOffsetSameInstant(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -421,7 +418,7 @@ public Java.Time.OffsetTime WithOffsetSameInstant(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("withOffsetSameInstant", "(Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#withOffsetSameLocal(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#withOffsetSameLocal(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -430,7 +427,7 @@ public Java.Time.OffsetTime WithOffsetSameLocal(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("withOffsetSameLocal", "(Ljava/time/ZoneOffset;)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#withSecond(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#withSecond(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.OffsetTime"/></returns>
@@ -439,7 +436,7 @@ public Java.Time.OffsetTime WithSecond(int arg0)
             return IExecuteWithSignature<Java.Time.OffsetTime>("withSecond", "(I)Ljava/time/OffsetTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -448,7 +445,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -457,7 +454,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -467,7 +464,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -476,7 +473,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -486,7 +483,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -495,7 +492,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -505,7 +502,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -514,7 +511,15 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#getOffset()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffset()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -523,7 +528,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#toEpochSecond(java.time.LocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#toEpochSecond(java.time.LocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <returns><see cref="long"/></returns>
@@ -532,7 +537,7 @@ public long ToEpochSecond(Java.Time.LocalDate arg0)
             return IExecuteWithSignature<long>("toEpochSecond", "(Ljava/time/LocalDate;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/OffsetTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/OffsetTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Period.cs b/src/net/Netdroid/Generated/Java/Time/Period.cs
index a1cf76d7d..6551d9a3d 100644
--- a/src/net/Netdroid/Generated/Java/Time/Period.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Period.cs
@@ -46,7 +46,7 @@ public partial class Period : Java.Time.Chrono.IChronoPeriod, Java.Io.ISerializa
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#ZERO"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#ZERO"/>
         /// </summary>
         public static Java.Time.Period ZERO { get { if (!_ZEROReady) { _ZEROContent = SGetField<Java.Time.Period>(LocalBridgeClazz, "ZERO"); _ZEROReady = true; } return _ZEROContent; } }
         private static Java.Time.Period _ZEROContent = default;
@@ -56,7 +56,7 @@ public partial class Period : Java.Time.Chrono.IChronoPeriod, Java.Io.ISerializa
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#between(java.time.LocalDate,java.time.LocalDate)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#between(java.time.LocalDate,java.time.LocalDate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <param name="arg1"><see cref="Java.Time.LocalDate"/></param>
@@ -66,7 +66,7 @@ public static Java.Time.Period Between(Java.Time.LocalDate arg0, Java.Time.Local
             return SExecute<Java.Time.Period>(LocalBridgeClazz, "between", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#from(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#from(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -75,7 +75,7 @@ public static Java.Time.Period From(Java.Time.Temporal.TemporalAmount arg0)
             return SExecuteWithSignature<Java.Time.Period>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#of(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#of(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -86,7 +86,7 @@ public static Java.Time.Period Of(int arg0, int arg1, int arg2)
             return SExecute<Java.Time.Period>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#ofDays(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#ofDays(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -95,7 +95,7 @@ public static Java.Time.Period OfDays(int arg0)
             return SExecuteWithSignature<Java.Time.Period>(LocalBridgeClazz, "ofDays", "(I)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#ofMonths(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#ofMonths(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -104,7 +104,7 @@ public static Java.Time.Period OfMonths(int arg0)
             return SExecuteWithSignature<Java.Time.Period>(LocalBridgeClazz, "ofMonths", "(I)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#ofWeeks(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#ofWeeks(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -113,7 +113,7 @@ public static Java.Time.Period OfWeeks(int arg0)
             return SExecuteWithSignature<Java.Time.Period>(LocalBridgeClazz, "ofWeeks", "(I)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#ofYears(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#ofYears(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -122,7 +122,7 @@ public static Java.Time.Period OfYears(int arg0)
             return SExecuteWithSignature<Java.Time.Period>(LocalBridgeClazz, "ofYears", "(I)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -135,58 +135,55 @@ public static Java.Time.Period Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#getChronology()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#isNegative()"/>
         /// </summary>
-        public Java.Time.Chrono.Chronology Chronology
-        {
-            get { return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#getDays()"/> 
-        /// </summary>
-        public int Days
+        /// <returns><see cref="bool"/></returns>
+        public bool IsNegative()
         {
-            get { return IExecuteWithSignature<int>("getDays", "()I"); }
+            return IExecuteWithSignature<bool>("isNegative", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#getMonths()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#isZero()"/>
         /// </summary>
-        public int Months
+        /// <returns><see cref="bool"/></returns>
+        public bool IsZero()
         {
-            get { return IExecuteWithSignature<int>("getMonths", "()I"); }
+            return IExecuteWithSignature<bool>("isZero", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#getUnits()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#getDays()"/>
         /// </summary>
-        public Java.Util.List<Java.Time.Temporal.TemporalUnit> Units
+        /// <returns><see cref="int"/></returns>
+        public int GetDays()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Time.Temporal.TemporalUnit>>("getUnits", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<int>("getDays", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#getYears()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#getMonths()"/>
         /// </summary>
-        public int Years
+        /// <returns><see cref="int"/></returns>
+        public int GetMonths()
         {
-            get { return IExecuteWithSignature<int>("getYears", "()I"); }
+            return IExecuteWithSignature<int>("getMonths", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#isNegative()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#getYears()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsNegative()
+        /// <returns><see cref="int"/></returns>
+        public int GetYears()
         {
-            return IExecuteWithSignature<bool>("isNegative", "()Z");
+            return IExecuteWithSignature<int>("getYears", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#isZero()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#getChronology()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsZero()
+        /// <returns><see cref="Java.Time.Chrono.Chronology"/></returns>
+        public Java.Time.Chrono.Chronology GetChronology()
         {
-            return IExecuteWithSignature<bool>("isZero", "()Z");
+            return IExecuteWithSignature<Java.Time.Chrono.Chronology>("getChronology", "()Ljava/time/chrono/Chronology;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
@@ -195,7 +192,7 @@ public Java.Time.Chrono.ChronoPeriod Minus(Java.Time.Temporal.TemporalAmount arg
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/chrono/ChronoPeriod;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#multipliedBy(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#multipliedBy(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
@@ -204,7 +201,7 @@ public Java.Time.Chrono.ChronoPeriod MultipliedBy(int arg0)
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("multipliedBy", "(I)Ljava/time/chrono/ChronoPeriod;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#negated()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#negated()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
         public Java.Time.Chrono.ChronoPeriod Negated()
@@ -212,7 +209,7 @@ public Java.Time.Chrono.ChronoPeriod Negated()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("negated", "()Ljava/time/chrono/ChronoPeriod;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#normalized()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#normalized()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
         public Java.Time.Chrono.ChronoPeriod Normalized()
@@ -220,7 +217,7 @@ public Java.Time.Chrono.ChronoPeriod Normalized()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("normalized", "()Ljava/time/chrono/ChronoPeriod;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoPeriod"/></returns>
@@ -229,7 +226,7 @@ public Java.Time.Chrono.ChronoPeriod Plus(Java.Time.Temporal.TemporalAmount arg0
             return IExecuteWithSignature<Java.Time.Chrono.ChronoPeriod>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/chrono/ChronoPeriod;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#minusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#minusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -238,7 +235,7 @@ public Java.Time.Period MinusDays(long arg0)
             return IExecuteWithSignature<Java.Time.Period>("minusDays", "(J)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#minusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#minusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -247,7 +244,7 @@ public Java.Time.Period MinusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.Period>("minusMonths", "(J)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#minusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#minusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -256,7 +253,7 @@ public Java.Time.Period MinusYears(long arg0)
             return IExecuteWithSignature<Java.Time.Period>("minusYears", "(J)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#plusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#plusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -265,7 +262,7 @@ public Java.Time.Period PlusDays(long arg0)
             return IExecuteWithSignature<Java.Time.Period>("plusDays", "(J)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#plusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#plusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -274,7 +271,7 @@ public Java.Time.Period PlusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.Period>("plusMonths", "(J)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#plusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#plusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -283,7 +280,7 @@ public Java.Time.Period PlusYears(long arg0)
             return IExecuteWithSignature<Java.Time.Period>("plusYears", "(J)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#withDays(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#withDays(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -292,7 +289,7 @@ public Java.Time.Period WithDays(int arg0)
             return IExecuteWithSignature<Java.Time.Period>("withDays", "(I)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#withMonths(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#withMonths(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -301,7 +298,7 @@ public Java.Time.Period WithMonths(int arg0)
             return IExecuteWithSignature<Java.Time.Period>("withMonths", "(I)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#withYears(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#withYears(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Period"/></returns>
@@ -310,7 +307,7 @@ public Java.Time.Period WithYears(int arg0)
             return IExecuteWithSignature<Java.Time.Period>("withYears", "(I)Ljava/time/Period;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#addTo(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#addTo(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -319,7 +316,7 @@ public Java.Time.Temporal.Temporal AddTo(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("addTo", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#subtractFrom(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#subtractFrom(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -328,7 +325,15 @@ public Java.Time.Temporal.Temporal SubtractFrom(Java.Time.Temporal.Temporal arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("subtractFrom", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#get(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#getUnits()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Time.Temporal.TemporalUnit> GetUnits()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Time.Temporal.TemporalUnit>>("getUnits", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#get(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="long"/></returns>
@@ -337,7 +342,7 @@ public long Get(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<long>("get", "(Ljava/time/temporal/TemporalUnit;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Period.html#toTotalMonths()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Period.html#toTotalMonths()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToTotalMonths()
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/AllPackageClasses.cs
index 5c56c48cb..23af2f00f 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Time.Temporal
 {
     #region ChronoField
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html"/>
     /// </summary>
     public partial class ChronoField : Java.Lang.Enum<Java.Time.Temporal.ChronoField>
     {
@@ -72,7 +72,7 @@ public ChronoField(params object[] args) : base(args) { }
 
     #region ChronoUnit
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html"/>
     /// </summary>
     public partial class ChronoUnit : Java.Lang.Enum<Java.Time.Temporal.ChronoUnit>
     {
@@ -116,7 +116,7 @@ public ChronoUnit(params object[] args) : base(args) { }
 
     #region IsoFields
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/IsoFields.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/IsoFields.html"/>
     /// </summary>
     public partial class IsoFields : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IsoFields>
     {
@@ -160,7 +160,7 @@ public IsoFields(params object[] args) : base(args) { }
 
     #region JulianFields
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/JulianFields.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/JulianFields.html"/>
     /// </summary>
     public partial class JulianFields : MASES.JCOBridge.C2JBridge.JVMBridgeBase<JulianFields>
     {
@@ -204,7 +204,7 @@ public JulianFields(params object[] args) : base(args) { }
 
     #region Temporal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html"/>
     /// </summary>
     public partial class Temporal : Java.Time.Temporal.TemporalAccessor
     {
@@ -212,12 +212,12 @@ public partial class Temporal : Java.Time.Temporal.TemporalAccessor
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Temporal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Temporal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Temporal() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Temporal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Temporal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Temporal(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -250,7 +250,7 @@ public Temporal(params object[] args) : base(args) { }
 
     #region TemporalAccessor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAccessor.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAccessor.html"/>
     /// </summary>
     public partial class TemporalAccessor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalAccessor>
     {
@@ -258,12 +258,12 @@ public partial class TemporalAccessor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TemporalAccessor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalAccessor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalAccessor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TemporalAccessor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalAccessor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalAccessor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -296,7 +296,7 @@ public TemporalAccessor(params object[] args) : base(args) { }
 
     #region TemporalAdjuster
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjuster.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjuster.html"/>
     /// </summary>
     public partial class TemporalAdjuster : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalAdjuster>
     {
@@ -304,12 +304,12 @@ public partial class TemporalAdjuster : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TemporalAdjuster class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalAdjuster class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalAdjuster() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TemporalAdjuster class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalAdjuster class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalAdjuster(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -342,7 +342,7 @@ public TemporalAdjuster(params object[] args) : base(args) { }
 
     #region TemporalAdjusters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html"/>
     /// </summary>
     public partial class TemporalAdjusters : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalAdjusters>
     {
@@ -386,7 +386,7 @@ public TemporalAdjusters(params object[] args) : base(args) { }
 
     #region TemporalAmount
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAmount.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAmount.html"/>
     /// </summary>
     public partial class TemporalAmount : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalAmount>
     {
@@ -394,12 +394,12 @@ public partial class TemporalAmount : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Te
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TemporalAmount class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalAmount class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalAmount() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TemporalAmount class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalAmount class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalAmount(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -432,7 +432,7 @@ public TemporalAmount(params object[] args) : base(args) { }
 
     #region TemporalField
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html"/>
     /// </summary>
     public partial class TemporalField : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalField>
     {
@@ -440,12 +440,12 @@ public partial class TemporalField : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Tem
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TemporalField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalField() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TemporalField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalField class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalField(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -478,7 +478,7 @@ public TemporalField(params object[] args) : base(args) { }
 
     #region TemporalQueries
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQueries.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQueries.html"/>
     /// </summary>
     public partial class TemporalQueries : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalQueries>
     {
@@ -522,7 +522,7 @@ public TemporalQueries(params object[] args) : base(args) { }
 
     #region TemporalQuery
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQuery.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQuery.html"/>
     /// </summary>
     public partial class TemporalQuery : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalQuery>
     {
@@ -530,12 +530,12 @@ public partial class TemporalQuery : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Tem
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TemporalQuery class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalQuery class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalQuery() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TemporalQuery class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalQuery class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalQuery(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -568,7 +568,7 @@ public TemporalQuery(params object[] args) : base(args) { }
 
     #region TemporalQuery<R>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQuery.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQuery.html"/>
     /// </summary>
     /// <typeparam name="R"></typeparam>
     public partial class TemporalQuery<R> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalQuery<R>>
@@ -577,12 +577,12 @@ public partial class TemporalQuery<R> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TemporalQuery class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalQuery class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalQuery() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TemporalQuery class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalQuery class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalQuery(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -615,7 +615,7 @@ public TemporalQuery(params object[] args) : base(args) { }
 
     #region TemporalUnit
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalUnit.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalUnit.html"/>
     /// </summary>
     public partial class TemporalUnit : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TemporalUnit>
     {
@@ -623,12 +623,12 @@ public partial class TemporalUnit : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Temp
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TemporalUnit class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalUnit class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalUnit() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TemporalUnit class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemporalUnit class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemporalUnit(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -661,7 +661,7 @@ public TemporalUnit(params object[] args) : base(args) { }
 
     #region UnsupportedTemporalTypeException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/UnsupportedTemporalTypeException.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/UnsupportedTemporalTypeException.html"/>
     /// </summary>
     public partial class UnsupportedTemporalTypeException : Java.Time.DateTimeException
     {
@@ -678,7 +678,7 @@ public partial class UnsupportedTemporalTypeException : Java.Time.DateTimeExcept
 
     #region ValueRange
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html"/>
     /// </summary>
     public partial class ValueRange : Java.Io.Serializable
     {
@@ -722,7 +722,7 @@ public ValueRange(params object[] args) : base(args) { }
 
     #region WeekFields
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html"/>
     /// </summary>
     public partial class WeekFields : Java.Io.Serializable
     {
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/ChronoField.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/ChronoField.cs
index 79c2f4b35..48bf9a58e 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/ChronoField.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/ChronoField.cs
@@ -42,181 +42,181 @@ public partial class ChronoField
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#ALIGNED_DAY_OF_WEEK_IN_MONTH"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#ALIGNED_DAY_OF_WEEK_IN_MONTH"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField ALIGNED_DAY_OF_WEEK_IN_MONTH { get { if (!_ALIGNED_DAY_OF_WEEK_IN_MONTHReady) { _ALIGNED_DAY_OF_WEEK_IN_MONTHContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "ALIGNED_DAY_OF_WEEK_IN_MONTH"); _ALIGNED_DAY_OF_WEEK_IN_MONTHReady = true; } return _ALIGNED_DAY_OF_WEEK_IN_MONTHContent; } }
         private static Java.Time.Temporal.ChronoField _ALIGNED_DAY_OF_WEEK_IN_MONTHContent = default;
         private static bool _ALIGNED_DAY_OF_WEEK_IN_MONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#ALIGNED_DAY_OF_WEEK_IN_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#ALIGNED_DAY_OF_WEEK_IN_YEAR"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField ALIGNED_DAY_OF_WEEK_IN_YEAR { get { if (!_ALIGNED_DAY_OF_WEEK_IN_YEARReady) { _ALIGNED_DAY_OF_WEEK_IN_YEARContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "ALIGNED_DAY_OF_WEEK_IN_YEAR"); _ALIGNED_DAY_OF_WEEK_IN_YEARReady = true; } return _ALIGNED_DAY_OF_WEEK_IN_YEARContent; } }
         private static Java.Time.Temporal.ChronoField _ALIGNED_DAY_OF_WEEK_IN_YEARContent = default;
         private static bool _ALIGNED_DAY_OF_WEEK_IN_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#ALIGNED_WEEK_OF_MONTH"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#ALIGNED_WEEK_OF_MONTH"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField ALIGNED_WEEK_OF_MONTH { get { if (!_ALIGNED_WEEK_OF_MONTHReady) { _ALIGNED_WEEK_OF_MONTHContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "ALIGNED_WEEK_OF_MONTH"); _ALIGNED_WEEK_OF_MONTHReady = true; } return _ALIGNED_WEEK_OF_MONTHContent; } }
         private static Java.Time.Temporal.ChronoField _ALIGNED_WEEK_OF_MONTHContent = default;
         private static bool _ALIGNED_WEEK_OF_MONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#ALIGNED_WEEK_OF_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#ALIGNED_WEEK_OF_YEAR"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField ALIGNED_WEEK_OF_YEAR { get { if (!_ALIGNED_WEEK_OF_YEARReady) { _ALIGNED_WEEK_OF_YEARContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "ALIGNED_WEEK_OF_YEAR"); _ALIGNED_WEEK_OF_YEARReady = true; } return _ALIGNED_WEEK_OF_YEARContent; } }
         private static Java.Time.Temporal.ChronoField _ALIGNED_WEEK_OF_YEARContent = default;
         private static bool _ALIGNED_WEEK_OF_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#AMPM_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#AMPM_OF_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField AMPM_OF_DAY { get { if (!_AMPM_OF_DAYReady) { _AMPM_OF_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "AMPM_OF_DAY"); _AMPM_OF_DAYReady = true; } return _AMPM_OF_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _AMPM_OF_DAYContent = default;
         private static bool _AMPM_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#CLOCK_HOUR_OF_AMPM"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#CLOCK_HOUR_OF_AMPM"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField CLOCK_HOUR_OF_AMPM { get { if (!_CLOCK_HOUR_OF_AMPMReady) { _CLOCK_HOUR_OF_AMPMContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "CLOCK_HOUR_OF_AMPM"); _CLOCK_HOUR_OF_AMPMReady = true; } return _CLOCK_HOUR_OF_AMPMContent; } }
         private static Java.Time.Temporal.ChronoField _CLOCK_HOUR_OF_AMPMContent = default;
         private static bool _CLOCK_HOUR_OF_AMPMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#CLOCK_HOUR_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#CLOCK_HOUR_OF_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField CLOCK_HOUR_OF_DAY { get { if (!_CLOCK_HOUR_OF_DAYReady) { _CLOCK_HOUR_OF_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "CLOCK_HOUR_OF_DAY"); _CLOCK_HOUR_OF_DAYReady = true; } return _CLOCK_HOUR_OF_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _CLOCK_HOUR_OF_DAYContent = default;
         private static bool _CLOCK_HOUR_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#DAY_OF_MONTH"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#DAY_OF_MONTH"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField DAY_OF_MONTH { get { if (!_DAY_OF_MONTHReady) { _DAY_OF_MONTHContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "DAY_OF_MONTH"); _DAY_OF_MONTHReady = true; } return _DAY_OF_MONTHContent; } }
         private static Java.Time.Temporal.ChronoField _DAY_OF_MONTHContent = default;
         private static bool _DAY_OF_MONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#DAY_OF_WEEK"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#DAY_OF_WEEK"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField DAY_OF_WEEK { get { if (!_DAY_OF_WEEKReady) { _DAY_OF_WEEKContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "DAY_OF_WEEK"); _DAY_OF_WEEKReady = true; } return _DAY_OF_WEEKContent; } }
         private static Java.Time.Temporal.ChronoField _DAY_OF_WEEKContent = default;
         private static bool _DAY_OF_WEEKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#DAY_OF_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#DAY_OF_YEAR"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField DAY_OF_YEAR { get { if (!_DAY_OF_YEARReady) { _DAY_OF_YEARContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "DAY_OF_YEAR"); _DAY_OF_YEARReady = true; } return _DAY_OF_YEARContent; } }
         private static Java.Time.Temporal.ChronoField _DAY_OF_YEARContent = default;
         private static bool _DAY_OF_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#EPOCH_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#EPOCH_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField EPOCH_DAY { get { if (!_EPOCH_DAYReady) { _EPOCH_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "EPOCH_DAY"); _EPOCH_DAYReady = true; } return _EPOCH_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _EPOCH_DAYContent = default;
         private static bool _EPOCH_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#ERA"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#ERA"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField ERA { get { if (!_ERAReady) { _ERAContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "ERA"); _ERAReady = true; } return _ERAContent; } }
         private static Java.Time.Temporal.ChronoField _ERAContent = default;
         private static bool _ERAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#HOUR_OF_AMPM"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#HOUR_OF_AMPM"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField HOUR_OF_AMPM { get { if (!_HOUR_OF_AMPMReady) { _HOUR_OF_AMPMContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "HOUR_OF_AMPM"); _HOUR_OF_AMPMReady = true; } return _HOUR_OF_AMPMContent; } }
         private static Java.Time.Temporal.ChronoField _HOUR_OF_AMPMContent = default;
         private static bool _HOUR_OF_AMPMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#HOUR_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#HOUR_OF_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField HOUR_OF_DAY { get { if (!_HOUR_OF_DAYReady) { _HOUR_OF_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "HOUR_OF_DAY"); _HOUR_OF_DAYReady = true; } return _HOUR_OF_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _HOUR_OF_DAYContent = default;
         private static bool _HOUR_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#INSTANT_SECONDS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#INSTANT_SECONDS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField INSTANT_SECONDS { get { if (!_INSTANT_SECONDSReady) { _INSTANT_SECONDSContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "INSTANT_SECONDS"); _INSTANT_SECONDSReady = true; } return _INSTANT_SECONDSContent; } }
         private static Java.Time.Temporal.ChronoField _INSTANT_SECONDSContent = default;
         private static bool _INSTANT_SECONDSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#MICRO_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#MICRO_OF_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField MICRO_OF_DAY { get { if (!_MICRO_OF_DAYReady) { _MICRO_OF_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "MICRO_OF_DAY"); _MICRO_OF_DAYReady = true; } return _MICRO_OF_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _MICRO_OF_DAYContent = default;
         private static bool _MICRO_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#MICRO_OF_SECOND"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#MICRO_OF_SECOND"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField MICRO_OF_SECOND { get { if (!_MICRO_OF_SECONDReady) { _MICRO_OF_SECONDContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "MICRO_OF_SECOND"); _MICRO_OF_SECONDReady = true; } return _MICRO_OF_SECONDContent; } }
         private static Java.Time.Temporal.ChronoField _MICRO_OF_SECONDContent = default;
         private static bool _MICRO_OF_SECONDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#MILLI_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#MILLI_OF_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField MILLI_OF_DAY { get { if (!_MILLI_OF_DAYReady) { _MILLI_OF_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "MILLI_OF_DAY"); _MILLI_OF_DAYReady = true; } return _MILLI_OF_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _MILLI_OF_DAYContent = default;
         private static bool _MILLI_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#MILLI_OF_SECOND"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#MILLI_OF_SECOND"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField MILLI_OF_SECOND { get { if (!_MILLI_OF_SECONDReady) { _MILLI_OF_SECONDContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "MILLI_OF_SECOND"); _MILLI_OF_SECONDReady = true; } return _MILLI_OF_SECONDContent; } }
         private static Java.Time.Temporal.ChronoField _MILLI_OF_SECONDContent = default;
         private static bool _MILLI_OF_SECONDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#MINUTE_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#MINUTE_OF_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField MINUTE_OF_DAY { get { if (!_MINUTE_OF_DAYReady) { _MINUTE_OF_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "MINUTE_OF_DAY"); _MINUTE_OF_DAYReady = true; } return _MINUTE_OF_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _MINUTE_OF_DAYContent = default;
         private static bool _MINUTE_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#MINUTE_OF_HOUR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#MINUTE_OF_HOUR"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField MINUTE_OF_HOUR { get { if (!_MINUTE_OF_HOURReady) { _MINUTE_OF_HOURContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "MINUTE_OF_HOUR"); _MINUTE_OF_HOURReady = true; } return _MINUTE_OF_HOURContent; } }
         private static Java.Time.Temporal.ChronoField _MINUTE_OF_HOURContent = default;
         private static bool _MINUTE_OF_HOURReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#MONTH_OF_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#MONTH_OF_YEAR"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField MONTH_OF_YEAR { get { if (!_MONTH_OF_YEARReady) { _MONTH_OF_YEARContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "MONTH_OF_YEAR"); _MONTH_OF_YEARReady = true; } return _MONTH_OF_YEARContent; } }
         private static Java.Time.Temporal.ChronoField _MONTH_OF_YEARContent = default;
         private static bool _MONTH_OF_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#NANO_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#NANO_OF_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField NANO_OF_DAY { get { if (!_NANO_OF_DAYReady) { _NANO_OF_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "NANO_OF_DAY"); _NANO_OF_DAYReady = true; } return _NANO_OF_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _NANO_OF_DAYContent = default;
         private static bool _NANO_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#NANO_OF_SECOND"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#NANO_OF_SECOND"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField NANO_OF_SECOND { get { if (!_NANO_OF_SECONDReady) { _NANO_OF_SECONDContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "NANO_OF_SECOND"); _NANO_OF_SECONDReady = true; } return _NANO_OF_SECONDContent; } }
         private static Java.Time.Temporal.ChronoField _NANO_OF_SECONDContent = default;
         private static bool _NANO_OF_SECONDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#OFFSET_SECONDS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#OFFSET_SECONDS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField OFFSET_SECONDS { get { if (!_OFFSET_SECONDSReady) { _OFFSET_SECONDSContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "OFFSET_SECONDS"); _OFFSET_SECONDSReady = true; } return _OFFSET_SECONDSContent; } }
         private static Java.Time.Temporal.ChronoField _OFFSET_SECONDSContent = default;
         private static bool _OFFSET_SECONDSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#PROLEPTIC_MONTH"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#PROLEPTIC_MONTH"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField PROLEPTIC_MONTH { get { if (!_PROLEPTIC_MONTHReady) { _PROLEPTIC_MONTHContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "PROLEPTIC_MONTH"); _PROLEPTIC_MONTHReady = true; } return _PROLEPTIC_MONTHContent; } }
         private static Java.Time.Temporal.ChronoField _PROLEPTIC_MONTHContent = default;
         private static bool _PROLEPTIC_MONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#SECOND_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#SECOND_OF_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField SECOND_OF_DAY { get { if (!_SECOND_OF_DAYReady) { _SECOND_OF_DAYContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "SECOND_OF_DAY"); _SECOND_OF_DAYReady = true; } return _SECOND_OF_DAYContent; } }
         private static Java.Time.Temporal.ChronoField _SECOND_OF_DAYContent = default;
         private static bool _SECOND_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#SECOND_OF_MINUTE"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#SECOND_OF_MINUTE"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField SECOND_OF_MINUTE { get { if (!_SECOND_OF_MINUTEReady) { _SECOND_OF_MINUTEContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "SECOND_OF_MINUTE"); _SECOND_OF_MINUTEReady = true; } return _SECOND_OF_MINUTEContent; } }
         private static Java.Time.Temporal.ChronoField _SECOND_OF_MINUTEContent = default;
         private static bool _SECOND_OF_MINUTEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#YEAR"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField YEAR { get { if (!_YEARReady) { _YEARContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "YEAR"); _YEARReady = true; } return _YEARContent; } }
         private static Java.Time.Temporal.ChronoField _YEARContent = default;
         private static bool _YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#YEAR_OF_ERA"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#YEAR_OF_ERA"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoField YEAR_OF_ERA { get { if (!_YEAR_OF_ERAReady) { _YEAR_OF_ERAContent = SGetField<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "YEAR_OF_ERA"); _YEAR_OF_ERAReady = true; } return _YEAR_OF_ERAContent; } }
         private static Java.Time.Temporal.ChronoField _YEAR_OF_ERAContent = default;
@@ -226,7 +226,7 @@ public partial class ChronoField
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Temporal.ChronoField"/></returns>
@@ -235,7 +235,7 @@ public static Java.Time.Temporal.ChronoField ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Temporal.ChronoField>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/temporal/ChronoField;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.ChronoField"/></returns>
         public static Java.Time.Temporal.ChronoField[] Values()
@@ -247,32 +247,18 @@ public static Java.Time.Temporal.ChronoField[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#getBaseUnit()"/> 
-        /// </summary>
-        public Java.Time.Temporal.TemporalUnit BaseUnit
-        {
-            get { return IExecuteWithSignature<Java.Time.Temporal.TemporalUnit>("getBaseUnit", "()Ljava/time/temporal/TemporalUnit;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#getRangeUnit()"/> 
-        /// </summary>
-        public Java.Time.Temporal.TemporalUnit RangeUnit
-        {
-            get { return IExecuteWithSignature<Java.Time.Temporal.TemporalUnit>("getRangeUnit", "()Ljava/time/temporal/TemporalUnit;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#adjustInto(java.time.temporal.Temporal,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#adjustInto(java.time.temporal.Temporal,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="R"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <typeparam name="R"><see cref="Java.Time.Temporal.ITemporal"/></typeparam>
         /// <returns><typeparamref name="R"/></returns>
-        public R AdjustInto<R>(R arg0, long arg1) where R: Java.Time.Temporal.ITemporal, new()
+        public R AdjustInto<R>(R arg0, long arg1) where R : Java.Time.Temporal.ITemporal, new()
         {
             return IExecute<R>("adjustInto", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#isDateBased()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#isDateBased()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDateBased()
@@ -280,7 +266,7 @@ public bool IsDateBased()
             return IExecuteWithSignature<bool>("isDateBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#isSupportedBy(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#isSupportedBy(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -289,7 +275,7 @@ public bool IsSupportedBy(Java.Time.Temporal.TemporalAccessor arg0)
             return IExecuteWithSignature<bool>("isSupportedBy", "(Ljava/time/temporal/TemporalAccessor;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#isTimeBased()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#isTimeBased()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsTimeBased()
@@ -297,7 +283,7 @@ public bool IsTimeBased()
             return IExecuteWithSignature<bool>("isTimeBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#checkValidIntValue(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#checkValidIntValue(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -306,7 +292,7 @@ public int CheckValidIntValue(long arg0)
             return IExecuteWithSignature<int>("checkValidIntValue", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#getDisplayName(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#getDisplayName(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -315,7 +301,23 @@ public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#range()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#getBaseUnit()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Temporal.TemporalUnit"/></returns>
+        public Java.Time.Temporal.TemporalUnit GetBaseUnit()
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.TemporalUnit>("getBaseUnit", "()Ljava/time/temporal/TemporalUnit;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#getRangeUnit()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Temporal.TemporalUnit"/></returns>
+        public Java.Time.Temporal.TemporalUnit GetRangeUnit()
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.TemporalUnit>("getRangeUnit", "()Ljava/time/temporal/TemporalUnit;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#range()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
         public Java.Time.Temporal.ValueRange Range()
@@ -323,7 +325,7 @@ public Java.Time.Temporal.ValueRange Range()
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "()Ljava/time/temporal/ValueRange;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#rangeRefinedBy(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#rangeRefinedBy(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -332,7 +334,7 @@ public Java.Time.Temporal.ValueRange RangeRefinedBy(Java.Time.Temporal.TemporalA
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("rangeRefinedBy", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#checkValidValue(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#checkValidValue(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -341,7 +343,7 @@ public long CheckValidValue(long arg0)
             return IExecuteWithSignature<long>("checkValidValue", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoField.html#getFrom(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoField.html#getFrom(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/ChronoUnit.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/ChronoUnit.cs
index 91f66dad8..fec65b612 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/ChronoUnit.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/ChronoUnit.cs
@@ -42,97 +42,97 @@ public partial class ChronoUnit
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#CENTURIES"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#CENTURIES"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit CENTURIES { get { if (!_CENTURIESReady) { _CENTURIESContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "CENTURIES"); _CENTURIESReady = true; } return _CENTURIESContent; } }
         private static Java.Time.Temporal.ChronoUnit _CENTURIESContent = default;
         private static bool _CENTURIESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#DAYS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#DAYS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit DAYS { get { if (!_DAYSReady) { _DAYSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "DAYS"); _DAYSReady = true; } return _DAYSContent; } }
         private static Java.Time.Temporal.ChronoUnit _DAYSContent = default;
         private static bool _DAYSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#DECADES"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#DECADES"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit DECADES { get { if (!_DECADESReady) { _DECADESContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "DECADES"); _DECADESReady = true; } return _DECADESContent; } }
         private static Java.Time.Temporal.ChronoUnit _DECADESContent = default;
         private static bool _DECADESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#ERAS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#ERAS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit ERAS { get { if (!_ERASReady) { _ERASContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "ERAS"); _ERASReady = true; } return _ERASContent; } }
         private static Java.Time.Temporal.ChronoUnit _ERASContent = default;
         private static bool _ERASReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#FOREVER"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#FOREVER"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit FOREVER { get { if (!_FOREVERReady) { _FOREVERContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "FOREVER"); _FOREVERReady = true; } return _FOREVERContent; } }
         private static Java.Time.Temporal.ChronoUnit _FOREVERContent = default;
         private static bool _FOREVERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#HALF_DAYS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#HALF_DAYS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit HALF_DAYS { get { if (!_HALF_DAYSReady) { _HALF_DAYSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "HALF_DAYS"); _HALF_DAYSReady = true; } return _HALF_DAYSContent; } }
         private static Java.Time.Temporal.ChronoUnit _HALF_DAYSContent = default;
         private static bool _HALF_DAYSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#HOURS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#HOURS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit HOURS { get { if (!_HOURSReady) { _HOURSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "HOURS"); _HOURSReady = true; } return _HOURSContent; } }
         private static Java.Time.Temporal.ChronoUnit _HOURSContent = default;
         private static bool _HOURSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#MICROS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#MICROS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit MICROS { get { if (!_MICROSReady) { _MICROSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "MICROS"); _MICROSReady = true; } return _MICROSContent; } }
         private static Java.Time.Temporal.ChronoUnit _MICROSContent = default;
         private static bool _MICROSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#MILLENNIA"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#MILLENNIA"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit MILLENNIA { get { if (!_MILLENNIAReady) { _MILLENNIAContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "MILLENNIA"); _MILLENNIAReady = true; } return _MILLENNIAContent; } }
         private static Java.Time.Temporal.ChronoUnit _MILLENNIAContent = default;
         private static bool _MILLENNIAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#MILLIS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#MILLIS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit MILLIS { get { if (!_MILLISReady) { _MILLISContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "MILLIS"); _MILLISReady = true; } return _MILLISContent; } }
         private static Java.Time.Temporal.ChronoUnit _MILLISContent = default;
         private static bool _MILLISReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#MINUTES"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#MINUTES"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit MINUTES { get { if (!_MINUTESReady) { _MINUTESContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "MINUTES"); _MINUTESReady = true; } return _MINUTESContent; } }
         private static Java.Time.Temporal.ChronoUnit _MINUTESContent = default;
         private static bool _MINUTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#MONTHS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#MONTHS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit MONTHS { get { if (!_MONTHSReady) { _MONTHSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "MONTHS"); _MONTHSReady = true; } return _MONTHSContent; } }
         private static Java.Time.Temporal.ChronoUnit _MONTHSContent = default;
         private static bool _MONTHSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#NANOS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#NANOS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit NANOS { get { if (!_NANOSReady) { _NANOSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "NANOS"); _NANOSReady = true; } return _NANOSContent; } }
         private static Java.Time.Temporal.ChronoUnit _NANOSContent = default;
         private static bool _NANOSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#SECONDS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#SECONDS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit SECONDS { get { if (!_SECONDSReady) { _SECONDSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "SECONDS"); _SECONDSReady = true; } return _SECONDSContent; } }
         private static Java.Time.Temporal.ChronoUnit _SECONDSContent = default;
         private static bool _SECONDSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#WEEKS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#WEEKS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit WEEKS { get { if (!_WEEKSReady) { _WEEKSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "WEEKS"); _WEEKSReady = true; } return _WEEKSContent; } }
         private static Java.Time.Temporal.ChronoUnit _WEEKSContent = default;
         private static bool _WEEKSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#YEARS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#YEARS"/>
         /// </summary>
         public static Java.Time.Temporal.ChronoUnit YEARS { get { if (!_YEARSReady) { _YEARSContent = SGetField<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "YEARS"); _YEARSReady = true; } return _YEARSContent; } }
         private static Java.Time.Temporal.ChronoUnit _YEARSContent = default;
@@ -142,7 +142,7 @@ public partial class ChronoUnit
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.Temporal.ChronoUnit"/></returns>
@@ -151,7 +151,7 @@ public static Java.Time.Temporal.ChronoUnit ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.Temporal.ChronoUnit>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/temporal/ChronoUnit;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.ChronoUnit"/></returns>
         public static Java.Time.Temporal.ChronoUnit[] Values()
@@ -163,25 +163,18 @@ public static Java.Time.Temporal.ChronoUnit[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#getDuration()"/> 
-        /// </summary>
-        public Java.Time.Duration Duration
-        {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getDuration", "()Ljava/time/Duration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#addTo(java.time.temporal.Temporal,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#addTo(java.time.temporal.Temporal,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="R"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <typeparam name="R"><see cref="Java.Time.Temporal.ITemporal"/></typeparam>
         /// <returns><typeparamref name="R"/></returns>
-        public R AddTo<R>(R arg0, long arg1) where R: Java.Time.Temporal.ITemporal, new()
+        public R AddTo<R>(R arg0, long arg1) where R : Java.Time.Temporal.ITemporal, new()
         {
             return IExecute<R>("addTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#isDateBased()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#isDateBased()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDateBased()
@@ -189,7 +182,7 @@ public bool IsDateBased()
             return IExecuteWithSignature<bool>("isDateBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#isDurationEstimated()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#isDurationEstimated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDurationEstimated()
@@ -197,7 +190,7 @@ public bool IsDurationEstimated()
             return IExecuteWithSignature<bool>("isDurationEstimated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#isSupportedBy(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#isSupportedBy(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -206,7 +199,7 @@ public bool IsSupportedBy(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<bool>("isSupportedBy", "(Ljava/time/temporal/Temporal;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#isTimeBased()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#isTimeBased()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsTimeBased()
@@ -214,7 +207,15 @@ public bool IsTimeBased()
             return IExecuteWithSignature<bool>("isTimeBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ChronoUnit.html#between(java.time.temporal.Temporal,java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#getDuration()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetDuration()
+        {
+            return IExecuteWithSignature<Java.Time.Duration>("getDuration", "()Ljava/time/Duration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ChronoUnit.html#between(java.time.temporal.Temporal,java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.Temporal"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/IsoFields.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/IsoFields.cs
index 6c4e645ca..ea0b2aceb 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/IsoFields.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/IsoFields.cs
@@ -38,37 +38,37 @@ public partial class IsoFields
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/IsoFields.html#DAY_OF_QUARTER"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/IsoFields.html#DAY_OF_QUARTER"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalField DAY_OF_QUARTER { get { if (!_DAY_OF_QUARTERReady) { _DAY_OF_QUARTERContent = SGetField<Java.Time.Temporal.TemporalField>(LocalBridgeClazz, "DAY_OF_QUARTER"); _DAY_OF_QUARTERReady = true; } return _DAY_OF_QUARTERContent; } }
         private static Java.Time.Temporal.TemporalField _DAY_OF_QUARTERContent = default;
         private static bool _DAY_OF_QUARTERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/IsoFields.html#QUARTER_OF_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/IsoFields.html#QUARTER_OF_YEAR"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalField QUARTER_OF_YEAR { get { if (!_QUARTER_OF_YEARReady) { _QUARTER_OF_YEARContent = SGetField<Java.Time.Temporal.TemporalField>(LocalBridgeClazz, "QUARTER_OF_YEAR"); _QUARTER_OF_YEARReady = true; } return _QUARTER_OF_YEARContent; } }
         private static Java.Time.Temporal.TemporalField _QUARTER_OF_YEARContent = default;
         private static bool _QUARTER_OF_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/IsoFields.html#WEEK_BASED_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/IsoFields.html#WEEK_BASED_YEAR"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalField WEEK_BASED_YEAR { get { if (!_WEEK_BASED_YEARReady) { _WEEK_BASED_YEARContent = SGetField<Java.Time.Temporal.TemporalField>(LocalBridgeClazz, "WEEK_BASED_YEAR"); _WEEK_BASED_YEARReady = true; } return _WEEK_BASED_YEARContent; } }
         private static Java.Time.Temporal.TemporalField _WEEK_BASED_YEARContent = default;
         private static bool _WEEK_BASED_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/IsoFields.html#WEEK_OF_WEEK_BASED_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/IsoFields.html#WEEK_OF_WEEK_BASED_YEAR"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalField WEEK_OF_WEEK_BASED_YEAR { get { if (!_WEEK_OF_WEEK_BASED_YEARReady) { _WEEK_OF_WEEK_BASED_YEARContent = SGetField<Java.Time.Temporal.TemporalField>(LocalBridgeClazz, "WEEK_OF_WEEK_BASED_YEAR"); _WEEK_OF_WEEK_BASED_YEARReady = true; } return _WEEK_OF_WEEK_BASED_YEARContent; } }
         private static Java.Time.Temporal.TemporalField _WEEK_OF_WEEK_BASED_YEARContent = default;
         private static bool _WEEK_OF_WEEK_BASED_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/IsoFields.html#QUARTER_YEARS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/IsoFields.html#QUARTER_YEARS"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalUnit QUARTER_YEARS { get { if (!_QUARTER_YEARSReady) { _QUARTER_YEARSContent = SGetField<Java.Time.Temporal.TemporalUnit>(LocalBridgeClazz, "QUARTER_YEARS"); _QUARTER_YEARSReady = true; } return _QUARTER_YEARSContent; } }
         private static Java.Time.Temporal.TemporalUnit _QUARTER_YEARSContent = default;
         private static bool _QUARTER_YEARSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/IsoFields.html#WEEK_BASED_YEARS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/IsoFields.html#WEEK_BASED_YEARS"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalUnit WEEK_BASED_YEARS { get { if (!_WEEK_BASED_YEARSReady) { _WEEK_BASED_YEARSContent = SGetField<Java.Time.Temporal.TemporalUnit>(LocalBridgeClazz, "WEEK_BASED_YEARS"); _WEEK_BASED_YEARSReady = true; } return _WEEK_BASED_YEARSContent; } }
         private static Java.Time.Temporal.TemporalUnit _WEEK_BASED_YEARSContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/JulianFields.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/JulianFields.cs
index 7fd8eefd2..b2abcdf86 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/JulianFields.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/JulianFields.cs
@@ -38,19 +38,19 @@ public partial class JulianFields
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/JulianFields.html#JULIAN_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/JulianFields.html#JULIAN_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalField JULIAN_DAY { get { if (!_JULIAN_DAYReady) { _JULIAN_DAYContent = SGetField<Java.Time.Temporal.TemporalField>(LocalBridgeClazz, "JULIAN_DAY"); _JULIAN_DAYReady = true; } return _JULIAN_DAYContent; } }
         private static Java.Time.Temporal.TemporalField _JULIAN_DAYContent = default;
         private static bool _JULIAN_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/JulianFields.html#MODIFIED_JULIAN_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/JulianFields.html#MODIFIED_JULIAN_DAY"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalField MODIFIED_JULIAN_DAY { get { if (!_MODIFIED_JULIAN_DAYReady) { _MODIFIED_JULIAN_DAYContent = SGetField<Java.Time.Temporal.TemporalField>(LocalBridgeClazz, "MODIFIED_JULIAN_DAY"); _MODIFIED_JULIAN_DAYReady = true; } return _MODIFIED_JULIAN_DAYContent; } }
         private static Java.Time.Temporal.TemporalField _MODIFIED_JULIAN_DAYContent = default;
         private static bool _MODIFIED_JULIAN_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/JulianFields.html#RATA_DIE"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/JulianFields.html#RATA_DIE"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalField RATA_DIE { get { if (!_RATA_DIEReady) { _RATA_DIEContent = SGetField<Java.Time.Temporal.TemporalField>(LocalBridgeClazz, "RATA_DIE"); _RATA_DIEReady = true; } return _RATA_DIEContent; } }
         private static Java.Time.Temporal.TemporalField _RATA_DIEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/Temporal.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/Temporal.cs
index f3139cb61..f47fca077 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/Temporal.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/Temporal.cs
@@ -64,7 +64,7 @@ public partial class Temporal : Java.Time.Temporal.ITemporal
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -73,7 +73,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -83,7 +83,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -93,7 +93,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -103,7 +103,7 @@ public long Until(Java.Time.Temporal.Temporal arg0, Java.Time.Temporal.TemporalU
             return IExecute<long>("until", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -112,7 +112,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -122,7 +122,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -131,7 +131,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/Temporal.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/Temporal.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAccessor.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAccessor.cs
index b233ca9e6..e5f875e4b 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAccessor.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAccessor.cs
@@ -64,7 +64,7 @@ public partial class TemporalAccessor : Java.Time.Temporal.ITemporalAccessor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAccessor.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAccessor.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -73,7 +73,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAccessor.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAccessor.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -82,7 +82,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAccessor.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAccessor.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -92,7 +92,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAccessor.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAccessor.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -101,7 +101,7 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAccessor.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAccessor.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAdjuster.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAdjuster.cs
index 3a30c087b..86aab60e1 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAdjuster.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAdjuster.cs
@@ -64,7 +64,7 @@ public partial class TemporalAdjuster : Java.Time.Temporal.ITemporalAdjuster
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjuster.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjuster.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAdjusters.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAdjusters.cs
index a991d24c6..5131e651e 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAdjusters.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAdjusters.cs
@@ -42,7 +42,7 @@ public partial class TemporalAdjusters
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#dayOfWeekInMonth(int,java.time.DayOfWeek)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#dayOfWeekInMonth(int,java.time.DayOfWeek)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Time.DayOfWeek"/></param>
@@ -52,7 +52,7 @@ public static Java.Time.Temporal.TemporalAdjuster DayOfWeekInMonth(int arg0, Jav
             return SExecute<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "dayOfWeekInMonth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#firstDayOfMonth()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#firstDayOfMonth()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
         public static Java.Time.Temporal.TemporalAdjuster FirstDayOfMonth()
@@ -60,7 +60,7 @@ public static Java.Time.Temporal.TemporalAdjuster FirstDayOfMonth()
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "firstDayOfMonth", "()Ljava/time/temporal/TemporalAdjuster;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#firstDayOfNextMonth()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#firstDayOfNextMonth()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
         public static Java.Time.Temporal.TemporalAdjuster FirstDayOfNextMonth()
@@ -68,7 +68,7 @@ public static Java.Time.Temporal.TemporalAdjuster FirstDayOfNextMonth()
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "firstDayOfNextMonth", "()Ljava/time/temporal/TemporalAdjuster;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#firstDayOfNextYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#firstDayOfNextYear()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
         public static Java.Time.Temporal.TemporalAdjuster FirstDayOfNextYear()
@@ -76,7 +76,7 @@ public static Java.Time.Temporal.TemporalAdjuster FirstDayOfNextYear()
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "firstDayOfNextYear", "()Ljava/time/temporal/TemporalAdjuster;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#firstDayOfYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#firstDayOfYear()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
         public static Java.Time.Temporal.TemporalAdjuster FirstDayOfYear()
@@ -84,7 +84,7 @@ public static Java.Time.Temporal.TemporalAdjuster FirstDayOfYear()
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "firstDayOfYear", "()Ljava/time/temporal/TemporalAdjuster;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#firstInMonth(java.time.DayOfWeek)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#firstInMonth(java.time.DayOfWeek)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.DayOfWeek"/></param>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
@@ -93,7 +93,7 @@ public static Java.Time.Temporal.TemporalAdjuster FirstInMonth(Java.Time.DayOfWe
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "firstInMonth", "(Ljava/time/DayOfWeek;)Ljava/time/temporal/TemporalAdjuster;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#lastDayOfMonth()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#lastDayOfMonth()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
         public static Java.Time.Temporal.TemporalAdjuster LastDayOfMonth()
@@ -101,7 +101,7 @@ public static Java.Time.Temporal.TemporalAdjuster LastDayOfMonth()
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "lastDayOfMonth", "()Ljava/time/temporal/TemporalAdjuster;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#lastDayOfYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#lastDayOfYear()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
         public static Java.Time.Temporal.TemporalAdjuster LastDayOfYear()
@@ -109,7 +109,7 @@ public static Java.Time.Temporal.TemporalAdjuster LastDayOfYear()
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "lastDayOfYear", "()Ljava/time/temporal/TemporalAdjuster;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#lastInMonth(java.time.DayOfWeek)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#lastInMonth(java.time.DayOfWeek)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.DayOfWeek"/></param>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
@@ -118,7 +118,7 @@ public static Java.Time.Temporal.TemporalAdjuster LastInMonth(Java.Time.DayOfWee
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "lastInMonth", "(Ljava/time/DayOfWeek;)Ljava/time/temporal/TemporalAdjuster;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#next(java.time.DayOfWeek)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#next(java.time.DayOfWeek)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.DayOfWeek"/></param>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
@@ -127,7 +127,7 @@ public static Java.Time.Temporal.TemporalAdjuster Next(Java.Time.DayOfWeek arg0)
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "next", "(Ljava/time/DayOfWeek;)Ljava/time/temporal/TemporalAdjuster;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#nextOrSame(java.time.DayOfWeek)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#nextOrSame(java.time.DayOfWeek)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.DayOfWeek"/></param>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
@@ -136,7 +136,7 @@ public static Java.Time.Temporal.TemporalAdjuster NextOrSame(Java.Time.DayOfWeek
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "nextOrSame", "(Ljava/time/DayOfWeek;)Ljava/time/temporal/TemporalAdjuster;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#ofDateAdjuster(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#ofDateAdjuster(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
@@ -145,7 +145,7 @@ public static Java.Time.Temporal.TemporalAdjuster OfDateAdjuster(Java.Util.Funct
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "ofDateAdjuster", "(Ljava/util/function/UnaryOperator;)Ljava/time/temporal/TemporalAdjuster;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#previous(java.time.DayOfWeek)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#previous(java.time.DayOfWeek)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.DayOfWeek"/></param>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
@@ -154,7 +154,7 @@ public static Java.Time.Temporal.TemporalAdjuster Previous(Java.Time.DayOfWeek a
             return SExecuteWithSignature<Java.Time.Temporal.TemporalAdjuster>(LocalBridgeClazz, "previous", "(Ljava/time/DayOfWeek;)Ljava/time/temporal/TemporalAdjuster;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAdjusters.html#previousOrSame(java.time.DayOfWeek)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAdjusters.html#previousOrSame(java.time.DayOfWeek)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.DayOfWeek"/></param>
         /// <returns><see cref="Java.Time.Temporal.TemporalAdjuster"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAmount.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAmount.cs
index f0d0a4581..eb5df237b 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAmount.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalAmount.cs
@@ -64,14 +64,7 @@ public partial class TemporalAmount : Java.Time.Temporal.ITemporalAmount
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAmount.html#getUnits()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Time.Temporal.TemporalUnit> Units
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Time.Temporal.TemporalUnit>>("getUnits", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAmount.html#addTo(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAmount.html#addTo(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -80,7 +73,7 @@ public Java.Time.Temporal.Temporal AddTo(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("addTo", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAmount.html#subtractFrom(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAmount.html#subtractFrom(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -89,7 +82,15 @@ public Java.Time.Temporal.Temporal SubtractFrom(Java.Time.Temporal.Temporal arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("subtractFrom", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalAmount.html#get(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAmount.html#getUnits()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Time.Temporal.TemporalUnit> GetUnits()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Time.Temporal.TemporalUnit>>("getUnits", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalAmount.html#get(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalField.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalField.cs
index 558f2b6e2..a37f7e7ca 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalField.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalField.cs
@@ -64,32 +64,18 @@ public partial class TemporalField : Java.Time.Temporal.ITemporalField
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#getBaseUnit()"/> 
-        /// </summary>
-        public Java.Time.Temporal.TemporalUnit BaseUnit
-        {
-            get { return IExecuteWithSignature<Java.Time.Temporal.TemporalUnit>("getBaseUnit", "()Ljava/time/temporal/TemporalUnit;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#getRangeUnit()"/> 
-        /// </summary>
-        public Java.Time.Temporal.TemporalUnit RangeUnit
-        {
-            get { return IExecuteWithSignature<Java.Time.Temporal.TemporalUnit>("getRangeUnit", "()Ljava/time/temporal/TemporalUnit;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#adjustInto(java.time.temporal.Temporal,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#adjustInto(java.time.temporal.Temporal,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="R"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <typeparam name="R"><see cref="Java.Time.Temporal.ITemporal"/></typeparam>
         /// <returns><typeparamref name="R"/></returns>
-        public R AdjustInto<R>(R arg0, long arg1) where R: Java.Time.Temporal.ITemporal, new()
+        public R AdjustInto<R>(R arg0, long arg1) where R : Java.Time.Temporal.ITemporal, new()
         {
             return IExecute<R>("adjustInto", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#isDateBased()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#isDateBased()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDateBased()
@@ -97,7 +83,7 @@ public bool IsDateBased()
             return IExecuteWithSignature<bool>("isDateBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#isSupportedBy(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#isSupportedBy(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -106,7 +92,7 @@ public bool IsSupportedBy(Java.Time.Temporal.TemporalAccessor arg0)
             return IExecuteWithSignature<bool>("isSupportedBy", "(Ljava/time/temporal/TemporalAccessor;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#isTimeBased()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#isTimeBased()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsTimeBased()
@@ -114,7 +100,23 @@ public bool IsTimeBased()
             return IExecuteWithSignature<bool>("isTimeBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#range()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#getBaseUnit()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Temporal.TemporalUnit"/></returns>
+        public Java.Time.Temporal.TemporalUnit GetBaseUnit()
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.TemporalUnit>("getBaseUnit", "()Ljava/time/temporal/TemporalUnit;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#getRangeUnit()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Temporal.TemporalUnit"/></returns>
+        public Java.Time.Temporal.TemporalUnit GetRangeUnit()
+        {
+            return IExecuteWithSignature<Java.Time.Temporal.TemporalUnit>("getRangeUnit", "()Ljava/time/temporal/TemporalUnit;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#range()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
         public Java.Time.Temporal.ValueRange Range()
@@ -122,7 +124,7 @@ public Java.Time.Temporal.ValueRange Range()
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "()Ljava/time/temporal/ValueRange;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#rangeRefinedBy(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#rangeRefinedBy(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -131,7 +133,7 @@ public Java.Time.Temporal.ValueRange RangeRefinedBy(Java.Time.Temporal.TemporalA
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("rangeRefinedBy", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#getFrom(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#getFrom(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="long"/></returns>
@@ -140,7 +142,7 @@ public long GetFrom(Java.Time.Temporal.TemporalAccessor arg0)
             return IExecuteWithSignature<long>("getFrom", "(Ljava/time/temporal/TemporalAccessor;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#getDisplayName(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#getDisplayName(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -149,7 +151,7 @@ public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalField.html#resolve(java.util.Map,java.time.temporal.TemporalAccessor,java.time.format.ResolverStyle)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalField.html#resolve(java.util.Map,java.time.temporal.TemporalAccessor,java.time.format.ResolverStyle)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalQueries.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalQueries.cs
index 887f3a283..4f41d0e8d 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalQueries.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalQueries.cs
@@ -42,7 +42,7 @@ public partial class TemporalQueries
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQueries.html#chronology()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQueries.html#chronology()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Time.Chrono.Chronology> Chronology()
@@ -50,7 +50,7 @@ public partial class TemporalQueries
             return SExecuteWithSignature<Java.Time.Temporal.TemporalQuery<Java.Time.Chrono.Chronology>>(LocalBridgeClazz, "chronology", "()Ljava/time/temporal/TemporalQuery;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQueries.html#localDate()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQueries.html#localDate()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Time.LocalDate> LocalDate()
@@ -58,7 +58,7 @@ public partial class TemporalQueries
             return SExecuteWithSignature<Java.Time.Temporal.TemporalQuery<Java.Time.LocalDate>>(LocalBridgeClazz, "localDate", "()Ljava/time/temporal/TemporalQuery;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQueries.html#localTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQueries.html#localTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Time.LocalTime> LocalTime()
@@ -66,7 +66,7 @@ public partial class TemporalQueries
             return SExecuteWithSignature<Java.Time.Temporal.TemporalQuery<Java.Time.LocalTime>>(LocalBridgeClazz, "localTime", "()Ljava/time/temporal/TemporalQuery;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQueries.html#precision()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQueries.html#precision()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Time.Temporal.TemporalUnit> Precision()
@@ -74,7 +74,7 @@ public partial class TemporalQueries
             return SExecuteWithSignature<Java.Time.Temporal.TemporalQuery<Java.Time.Temporal.TemporalUnit>>(LocalBridgeClazz, "precision", "()Ljava/time/temporal/TemporalQuery;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQueries.html#zone()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQueries.html#zone()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Time.ZoneId> Zone()
@@ -82,7 +82,7 @@ public partial class TemporalQueries
             return SExecuteWithSignature<Java.Time.Temporal.TemporalQuery<Java.Time.ZoneId>>(LocalBridgeClazz, "zone", "()Ljava/time/temporal/TemporalQuery;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQueries.html#zoneId()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQueries.html#zoneId()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Time.ZoneId> ZoneId()
@@ -90,7 +90,7 @@ public partial class TemporalQueries
             return SExecuteWithSignature<Java.Time.Temporal.TemporalQuery<Java.Time.ZoneId>>(LocalBridgeClazz, "zoneId", "()Ljava/time/temporal/TemporalQuery;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQueries.html#offset()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQueries.html#offset()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalQuery"/></returns>
         public static Java.Time.Temporal.TemporalQuery<Java.Time.ZoneOffset> Offset()
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalQuery.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalQuery.cs
index ba0c7206e..f1fc57b42 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalQuery.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalQuery.cs
@@ -46,7 +46,7 @@ public partial class TemporalQuery
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQuery.html#queryFrom(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQuery.html#queryFrom(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="object"/></returns>
@@ -108,7 +108,7 @@ public partial class TemporalQuery<R> : Java.Time.Temporal.ITemporalQuery<R>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalQuery.html#queryFrom(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalQuery.html#queryFrom(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><typeparamref name="R"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalUnit.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalUnit.cs
index 9b30a66ef..8e62c95e3 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalUnit.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/TemporalUnit.cs
@@ -64,25 +64,18 @@ public partial class TemporalUnit : Java.Time.Temporal.ITemporalUnit
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalUnit.html#getDuration()"/> 
-        /// </summary>
-        public Java.Time.Duration Duration
-        {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getDuration", "()Ljava/time/Duration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalUnit.html#addTo(java.time.temporal.Temporal,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalUnit.html#addTo(java.time.temporal.Temporal,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="R"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <typeparam name="R"><see cref="Java.Time.Temporal.ITemporal"/></typeparam>
         /// <returns><typeparamref name="R"/></returns>
-        public R AddTo<R>(R arg0, long arg1) where R: Java.Time.Temporal.ITemporal, new()
+        public R AddTo<R>(R arg0, long arg1) where R : Java.Time.Temporal.ITemporal, new()
         {
             return IExecute<R>("addTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalUnit.html#isDateBased()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalUnit.html#isDateBased()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDateBased()
@@ -90,7 +83,7 @@ public bool IsDateBased()
             return IExecuteWithSignature<bool>("isDateBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalUnit.html#isDurationEstimated()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalUnit.html#isDurationEstimated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDurationEstimated()
@@ -98,7 +91,7 @@ public bool IsDurationEstimated()
             return IExecuteWithSignature<bool>("isDurationEstimated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalUnit.html#isTimeBased()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalUnit.html#isTimeBased()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsTimeBased()
@@ -106,7 +99,15 @@ public bool IsTimeBased()
             return IExecuteWithSignature<bool>("isTimeBased", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalUnit.html#between(java.time.temporal.Temporal,java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalUnit.html#getDuration()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetDuration()
+        {
+            return IExecuteWithSignature<Java.Time.Duration>("getDuration", "()Ljava/time/Duration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalUnit.html#between(java.time.temporal.Temporal,java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.Temporal"/></param>
@@ -116,7 +117,7 @@ public long Between(Java.Time.Temporal.Temporal arg0, Java.Time.Temporal.Tempora
             return IExecute<long>("between", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/TemporalUnit.html#isSupportedBy(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/TemporalUnit.html#isSupportedBy(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/ValueRange.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/ValueRange.cs
index 236681bb6..6142ebdaa 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/ValueRange.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/ValueRange.cs
@@ -42,7 +42,7 @@ public partial class ValueRange
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#of(long,long,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#of(long,long,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -54,7 +54,7 @@ public static Java.Time.Temporal.ValueRange Of(long arg0, long arg1, long arg2,
             return SExecute<Java.Time.Temporal.ValueRange>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#of(long,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#of(long,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -65,7 +65,7 @@ public static Java.Time.Temporal.ValueRange Of(long arg0, long arg1, long arg2)
             return SExecute<Java.Time.Temporal.ValueRange>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#of(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#of(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -79,35 +79,7 @@ public static Java.Time.Temporal.ValueRange Of(long arg0, long arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#getLargestMinimum()"/> 
-        /// </summary>
-        public long LargestMinimum
-        {
-            get { return IExecuteWithSignature<long>("getLargestMinimum", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#getMaximum()"/> 
-        /// </summary>
-        public long Maximum
-        {
-            get { return IExecuteWithSignature<long>("getMaximum", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#getMinimum()"/> 
-        /// </summary>
-        public long Minimum
-        {
-            get { return IExecuteWithSignature<long>("getMinimum", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#getSmallestMaximum()"/> 
-        /// </summary>
-        public long SmallestMaximum
-        {
-            get { return IExecuteWithSignature<long>("getSmallestMaximum", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#isFixed()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#isFixed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsFixed()
@@ -115,7 +87,7 @@ public bool IsFixed()
             return IExecuteWithSignature<bool>("isFixed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#isIntValue()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#isIntValue()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsIntValue()
@@ -123,7 +95,7 @@ public bool IsIntValue()
             return IExecuteWithSignature<bool>("isIntValue", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#isValidIntValue(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#isValidIntValue(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -132,7 +104,7 @@ public bool IsValidIntValue(long arg0)
             return IExecuteWithSignature<bool>("isValidIntValue", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#isValidValue(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#isValidValue(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -141,7 +113,7 @@ public bool IsValidValue(long arg0)
             return IExecuteWithSignature<bool>("isValidValue", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#checkValidIntValue(long,java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#checkValidIntValue(long,java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalField"/></param>
@@ -151,7 +123,7 @@ public int CheckValidIntValue(long arg0, Java.Time.Temporal.TemporalField arg1)
             return IExecute<int>("checkValidIntValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/ValueRange.html#checkValidValue(long,java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#checkValidValue(long,java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalField"/></param>
@@ -160,6 +132,38 @@ public long CheckValidValue(long arg0, Java.Time.Temporal.TemporalField arg1)
         {
             return IExecute<long>("checkValidValue", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#getLargestMinimum()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetLargestMinimum()
+        {
+            return IExecuteWithSignature<long>("getLargestMinimum", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#getMaximum()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetMaximum()
+        {
+            return IExecuteWithSignature<long>("getMaximum", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#getMinimum()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetMinimum()
+        {
+            return IExecuteWithSignature<long>("getMinimum", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/ValueRange.html#getSmallestMaximum()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetSmallestMaximum()
+        {
+            return IExecuteWithSignature<long>("getSmallestMaximum", "()J");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Time/Temporal/WeekFields.cs b/src/net/Netdroid/Generated/Java/Time/Temporal/WeekFields.cs
index 002cc299f..f1dd72cfa 100644
--- a/src/net/Netdroid/Generated/Java/Time/Temporal/WeekFields.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Temporal/WeekFields.cs
@@ -38,19 +38,19 @@ public partial class WeekFields
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#WEEK_BASED_YEARS"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#WEEK_BASED_YEARS"/>
         /// </summary>
         public static Java.Time.Temporal.TemporalUnit WEEK_BASED_YEARS { get { if (!_WEEK_BASED_YEARSReady) { _WEEK_BASED_YEARSContent = SGetField<Java.Time.Temporal.TemporalUnit>(LocalBridgeClazz, "WEEK_BASED_YEARS"); _WEEK_BASED_YEARSReady = true; } return _WEEK_BASED_YEARSContent; } }
         private static Java.Time.Temporal.TemporalUnit _WEEK_BASED_YEARSContent = default;
         private static bool _WEEK_BASED_YEARSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#ISO"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#ISO"/>
         /// </summary>
         public static Java.Time.Temporal.WeekFields ISO { get { if (!_ISOReady) { _ISOContent = SGetField<Java.Time.Temporal.WeekFields>(LocalBridgeClazz, "ISO"); _ISOReady = true; } return _ISOContent; } }
         private static Java.Time.Temporal.WeekFields _ISOContent = default;
         private static bool _ISOReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#SUNDAY_START"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#SUNDAY_START"/>
         /// </summary>
         public static Java.Time.Temporal.WeekFields SUNDAY_START { get { if (!_SUNDAY_STARTReady) { _SUNDAY_STARTContent = SGetField<Java.Time.Temporal.WeekFields>(LocalBridgeClazz, "SUNDAY_START"); _SUNDAY_STARTReady = true; } return _SUNDAY_STARTContent; } }
         private static Java.Time.Temporal.WeekFields _SUNDAY_STARTContent = default;
@@ -60,7 +60,7 @@ public partial class WeekFields
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#of(java.time.DayOfWeek,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#of(java.time.DayOfWeek,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.DayOfWeek"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -70,7 +70,7 @@ public static Java.Time.Temporal.WeekFields Of(Java.Time.DayOfWeek arg0, int arg
             return SExecute<Java.Time.Temporal.WeekFields>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#of(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#of(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Time.Temporal.WeekFields"/></returns>
@@ -83,21 +83,23 @@ public static Java.Time.Temporal.WeekFields Of(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#getFirstDayOfWeek()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#getMinimalDaysInFirstWeek()"/>
         /// </summary>
-        public Java.Time.DayOfWeek FirstDayOfWeek
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimalDaysInFirstWeek()
         {
-            get { return IExecuteWithSignature<Java.Time.DayOfWeek>("getFirstDayOfWeek", "()Ljava/time/DayOfWeek;"); }
+            return IExecuteWithSignature<int>("getMinimalDaysInFirstWeek", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#getMinimalDaysInFirstWeek()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#getFirstDayOfWeek()"/>
         /// </summary>
-        public int MinimalDaysInFirstWeek
+        /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
+        public Java.Time.DayOfWeek GetFirstDayOfWeek()
         {
-            get { return IExecuteWithSignature<int>("getMinimalDaysInFirstWeek", "()I"); }
+            return IExecuteWithSignature<Java.Time.DayOfWeek>("getFirstDayOfWeek", "()Ljava/time/DayOfWeek;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#dayOfWeek()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#dayOfWeek()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalField"/></returns>
         public Java.Time.Temporal.TemporalField DayOfWeek()
@@ -105,7 +107,7 @@ public Java.Time.Temporal.TemporalField DayOfWeek()
             return IExecuteWithSignature<Java.Time.Temporal.TemporalField>("dayOfWeek", "()Ljava/time/temporal/TemporalField;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#weekBasedYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#weekBasedYear()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalField"/></returns>
         public Java.Time.Temporal.TemporalField WeekBasedYear()
@@ -113,7 +115,7 @@ public Java.Time.Temporal.TemporalField WeekBasedYear()
             return IExecuteWithSignature<Java.Time.Temporal.TemporalField>("weekBasedYear", "()Ljava/time/temporal/TemporalField;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#weekOfMonth()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#weekOfMonth()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalField"/></returns>
         public Java.Time.Temporal.TemporalField WeekOfMonth()
@@ -121,7 +123,7 @@ public Java.Time.Temporal.TemporalField WeekOfMonth()
             return IExecuteWithSignature<Java.Time.Temporal.TemporalField>("weekOfMonth", "()Ljava/time/temporal/TemporalField;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#weekOfWeekBasedYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#weekOfWeekBasedYear()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalField"/></returns>
         public Java.Time.Temporal.TemporalField WeekOfWeekBasedYear()
@@ -129,7 +131,7 @@ public Java.Time.Temporal.TemporalField WeekOfWeekBasedYear()
             return IExecuteWithSignature<Java.Time.Temporal.TemporalField>("weekOfWeekBasedYear", "()Ljava/time/temporal/TemporalField;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/temporal/WeekFields.html#weekOfYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/temporal/WeekFields.html#weekOfYear()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.TemporalField"/></returns>
         public Java.Time.Temporal.TemporalField WeekOfYear()
diff --git a/src/net/Netdroid/Generated/Java/Time/Year.cs b/src/net/Netdroid/Generated/Java/Time/Year.cs
index 7a37c81a5..50a528401 100644
--- a/src/net/Netdroid/Generated/Java/Time/Year.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Year.cs
@@ -54,13 +54,13 @@ public partial class Year : Java.Time.Temporal.ITemporal, Java.Time.Temporal.ITe
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#MAX_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#MAX_VALUE"/>
         /// </summary>
         public static int MAX_VALUE { get { if (!_MAX_VALUEReady) { _MAX_VALUEContent = SGetField<int>(LocalBridgeClazz, "MAX_VALUE"); _MAX_VALUEReady = true; } return _MAX_VALUEContent; } }
         private static int _MAX_VALUEContent = default;
         private static bool _MAX_VALUEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#MIN_VALUE"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#MIN_VALUE"/>
         /// </summary>
         public static int MIN_VALUE { get { if (!_MIN_VALUEReady) { _MIN_VALUEContent = SGetField<int>(LocalBridgeClazz, "MIN_VALUE"); _MIN_VALUEReady = true; } return _MIN_VALUEContent; } }
         private static int _MIN_VALUEContent = default;
@@ -70,7 +70,7 @@ public partial class Year : Java.Time.Temporal.ITemporal, Java.Time.Temporal.ITe
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#isLeap(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#isLeap(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -79,7 +79,7 @@ public static bool IsLeap(long arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLeap", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.Year"/></returns>
@@ -88,7 +88,7 @@ public static Java.Time.Year From(Java.Time.Temporal.TemporalAccessor arg0)
             return SExecuteWithSignature<Java.Time.Year>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/Year;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Year"/></returns>
         public static Java.Time.Year Now()
@@ -96,7 +96,7 @@ public static Java.Time.Year Now()
             return SExecuteWithSignature<Java.Time.Year>(LocalBridgeClazz, "now", "()Ljava/time/Year;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.Year"/></returns>
@@ -105,7 +105,7 @@ public static Java.Time.Year Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.Year>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/Year;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Year"/></returns>
@@ -114,7 +114,7 @@ public static Java.Time.Year Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.Year>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/Year;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.Year"/></returns>
@@ -123,7 +123,7 @@ public static Java.Time.Year Of(int arg0)
             return SExecuteWithSignature<Java.Time.Year>(LocalBridgeClazz, "of", "(I)Ljava/time/Year;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -133,7 +133,7 @@ public static Java.Time.Year Parse(Java.Lang.CharSequence arg0, Java.Time.Format
             return SExecute<Java.Time.Year>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.Year"/></returns>
@@ -146,14 +146,7 @@ public static Java.Time.Year Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#getValue()"/> 
-        /// </summary>
-        public int Value
-        {
-            get { return IExecuteWithSignature<int>("getValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -163,7 +156,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#isAfter(java.time.Year)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#isAfter(java.time.Year)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Year"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -172,7 +165,7 @@ public bool IsAfter(Java.Time.Year arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/Year;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#isBefore(java.time.Year)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#isBefore(java.time.Year)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Year"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -181,7 +174,7 @@ public bool IsBefore(Java.Time.Year arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/Year;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#isLeap()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#isLeap()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLeap()
@@ -189,7 +182,7 @@ public bool IsLeap()
             return IExecuteWithSignature<bool>("isLeap", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -198,7 +191,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -207,7 +200,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#isValidMonthDay(java.time.MonthDay)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#isValidMonthDay(java.time.MonthDay)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.MonthDay"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -216,7 +209,7 @@ public bool IsValidMonthDay(Java.Time.MonthDay arg0)
             return IExecuteWithSignature<bool>("isValidMonthDay", "(Ljava/time/MonthDay;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -225,7 +218,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#compareTo(java.time.Year)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#compareTo(java.time.Year)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Year"/></param>
         /// <returns><see cref="int"/></returns>
@@ -234,7 +227,7 @@ public int CompareTo(Java.Time.Year arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/Year;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -243,7 +236,15 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#getValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetValue()
+        {
+            return IExecuteWithSignature<int>("getValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -251,7 +252,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -260,7 +261,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#atDay(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#atDay(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -269,7 +270,7 @@ public Java.Time.LocalDate AtDay(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("atDay", "(I)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#atMonthDay(java.time.MonthDay)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#atMonthDay(java.time.MonthDay)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.MonthDay"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -278,7 +279,7 @@ public Java.Time.LocalDate AtMonthDay(Java.Time.MonthDay arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("atMonthDay", "(Ljava/time/MonthDay;)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -287,7 +288,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -296,7 +297,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -306,7 +307,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -315,7 +316,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -325,7 +326,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -334,7 +335,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -344,7 +345,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -353,7 +354,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#minusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#minusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Year"/></returns>
@@ -362,7 +363,7 @@ public Java.Time.Year MinusYears(long arg0)
             return IExecuteWithSignature<Java.Time.Year>("minusYears", "(J)Ljava/time/Year;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#plusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#plusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.Year"/></returns>
@@ -371,7 +372,7 @@ public Java.Time.Year PlusYears(long arg0)
             return IExecuteWithSignature<Java.Time.Year>("plusYears", "(J)Ljava/time/Year;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#atMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#atMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -380,7 +381,7 @@ public Java.Time.YearMonth AtMonth(int arg0)
             return IExecuteWithSignature<Java.Time.YearMonth>("atMonth", "(I)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#atMonth(java.time.Month)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#atMonth(java.time.Month)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Month"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -389,7 +390,7 @@ public Java.Time.YearMonth AtMonth(Java.Time.Month arg0)
             return IExecuteWithSignature<Java.Time.YearMonth>("atMonth", "(Ljava/time/Month;)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -398,7 +399,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/Year.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/Year.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/YearMonth.cs b/src/net/Netdroid/Generated/Java/Time/YearMonth.cs
index ab65b90a3..7f63db372 100644
--- a/src/net/Netdroid/Generated/Java/Time/YearMonth.cs
+++ b/src/net/Netdroid/Generated/Java/Time/YearMonth.cs
@@ -58,7 +58,7 @@ public partial class YearMonth : Java.Time.Temporal.ITemporal, Java.Time.Tempora
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -67,7 +67,7 @@ public static Java.Time.YearMonth From(Java.Time.Temporal.TemporalAccessor arg0)
             return SExecuteWithSignature<Java.Time.YearMonth>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
         public static Java.Time.YearMonth Now()
@@ -75,7 +75,7 @@ public static Java.Time.YearMonth Now()
             return SExecuteWithSignature<Java.Time.YearMonth>(LocalBridgeClazz, "now", "()Ljava/time/YearMonth;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -84,7 +84,7 @@ public static Java.Time.YearMonth Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.YearMonth>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -93,7 +93,7 @@ public static Java.Time.YearMonth Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.YearMonth>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#of(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#of(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -103,7 +103,7 @@ public static Java.Time.YearMonth Of(int arg0, int arg1)
             return SExecute<Java.Time.YearMonth>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#of(int,java.time.Month)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#of(int,java.time.Month)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Time.Month"/></param>
@@ -113,7 +113,7 @@ public static Java.Time.YearMonth Of(int arg0, Java.Time.Month arg1)
             return SExecute<Java.Time.YearMonth>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -123,7 +123,7 @@ public static Java.Time.YearMonth Parse(Java.Lang.CharSequence arg0, Java.Time.F
             return SExecute<Java.Time.YearMonth>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -136,28 +136,7 @@ public static Java.Time.YearMonth Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#getMonth()"/> 
-        /// </summary>
-        public Java.Time.Month Month
-        {
-            get { return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#getMonthValue()"/> 
-        /// </summary>
-        public int MonthValue
-        {
-            get { return IExecuteWithSignature<int>("getMonthValue", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#getYear()"/> 
-        /// </summary>
-        public int Year
-        {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -167,7 +146,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#isAfter(java.time.YearMonth)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#isAfter(java.time.YearMonth)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.YearMonth"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -176,7 +155,7 @@ public bool IsAfter(Java.Time.YearMonth arg0)
             return IExecuteWithSignature<bool>("isAfter", "(Ljava/time/YearMonth;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#isBefore(java.time.YearMonth)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#isBefore(java.time.YearMonth)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.YearMonth"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -185,7 +164,7 @@ public bool IsBefore(Java.Time.YearMonth arg0)
             return IExecuteWithSignature<bool>("isBefore", "(Ljava/time/YearMonth;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#isLeapYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#isLeapYear()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLeapYear()
@@ -193,7 +172,7 @@ public bool IsLeapYear()
             return IExecuteWithSignature<bool>("isLeapYear", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -202,7 +181,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -211,7 +190,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#isValidDay(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#isValidDay(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -220,7 +199,7 @@ public bool IsValidDay(int arg0)
             return IExecuteWithSignature<bool>("isValidDay", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -229,7 +208,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#compareTo(java.time.YearMonth)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#compareTo(java.time.YearMonth)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.YearMonth"/></param>
         /// <returns><see cref="int"/></returns>
@@ -238,7 +217,7 @@ public int CompareTo(Java.Time.YearMonth arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/YearMonth;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -247,7 +226,23 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#lengthOfMonth()"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#getMonthValue()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMonthValue()
+        {
+            return IExecuteWithSignature<int>("getMonthValue", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#getYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetYear()
+        {
+            return IExecuteWithSignature<int>("getYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#lengthOfMonth()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int LengthOfMonth()
@@ -255,7 +250,7 @@ public int LengthOfMonth()
             return IExecuteWithSignature<int>("lengthOfMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#lengthOfYear()"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#lengthOfYear()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int LengthOfYear()
@@ -263,7 +258,7 @@ public int LengthOfYear()
             return IExecuteWithSignature<int>("lengthOfYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -272,7 +267,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#atDay(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#atDay(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
@@ -281,7 +276,7 @@ public Java.Time.LocalDate AtDay(int arg0)
             return IExecuteWithSignature<Java.Time.LocalDate>("atDay", "(I)Ljava/time/LocalDate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#atEndOfMonth()"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#atEndOfMonth()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalDate"/></returns>
         public Java.Time.LocalDate AtEndOfMonth()
@@ -289,7 +284,15 @@ public Java.Time.LocalDate AtEndOfMonth()
             return IExecuteWithSignature<Java.Time.LocalDate>("atEndOfMonth", "()Ljava/time/LocalDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#getMonth()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Month"/></returns>
+        public Java.Time.Month GetMonth()
+        {
+            return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -298,7 +301,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#minus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#minus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -307,7 +310,7 @@ public Java.Time.Temporal.Temporal Minus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("minus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#minus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#minus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -317,7 +320,7 @@ public Java.Time.Temporal.Temporal Minus(long arg0, Java.Time.Temporal.TemporalU
             return IExecute<Java.Time.Temporal.Temporal>("minus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#plus(java.time.temporal.TemporalAmount)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#plus(java.time.temporal.TemporalAmount)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAmount"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -326,7 +329,7 @@ public Java.Time.Temporal.Temporal Plus(Java.Time.Temporal.TemporalAmount arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("plus", "(Ljava/time/temporal/TemporalAmount;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#plus(long,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#plus(long,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
@@ -336,7 +339,7 @@ public Java.Time.Temporal.Temporal Plus(long arg0, Java.Time.Temporal.TemporalUn
             return IExecute<Java.Time.Temporal.Temporal>("plus", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#with(java.time.temporal.TemporalAdjuster)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#with(java.time.temporal.TemporalAdjuster)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAdjuster"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -345,7 +348,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalAdjuster arg0
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("with", "(Ljava/time/temporal/TemporalAdjuster;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#with(java.time.temporal.TemporalField,long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#with(java.time.temporal.TemporalField,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -355,7 +358,7 @@ public Java.Time.Temporal.Temporal With(Java.Time.Temporal.TemporalField arg0, l
             return IExecute<Java.Time.Temporal.Temporal>("with", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -364,7 +367,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#minusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#minusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -373,7 +376,7 @@ public Java.Time.YearMonth MinusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.YearMonth>("minusMonths", "(J)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#minusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#minusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -382,7 +385,7 @@ public Java.Time.YearMonth MinusYears(long arg0)
             return IExecuteWithSignature<Java.Time.YearMonth>("minusYears", "(J)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#plusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#plusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -391,7 +394,7 @@ public Java.Time.YearMonth PlusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.YearMonth>("plusMonths", "(J)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#plusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#plusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -400,7 +403,7 @@ public Java.Time.YearMonth PlusYears(long arg0)
             return IExecuteWithSignature<Java.Time.YearMonth>("plusYears", "(J)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#withMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#withMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -409,7 +412,7 @@ public Java.Time.YearMonth WithMonth(int arg0)
             return IExecuteWithSignature<Java.Time.YearMonth>("withMonth", "(I)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#withYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#withYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.YearMonth"/></returns>
@@ -418,7 +421,7 @@ public Java.Time.YearMonth WithYear(int arg0)
             return IExecuteWithSignature<Java.Time.YearMonth>("withYear", "(I)Ljava/time/YearMonth;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -427,7 +430,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/YearMonth.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/YearMonth.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Zone/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Time/Zone/AllPackageClasses.cs
index 0ef408b3e..35fe0dc03 100644
--- a/src/net/Netdroid/Generated/Java/Time/Zone/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Zone/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Time.Zone
 {
     #region ZoneOffsetTransition
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html"/>
     /// </summary>
     public partial class ZoneOffsetTransition : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ZoneOffsetTransition>
     {
@@ -72,7 +72,7 @@ public ZoneOffsetTransition(params object[] args) : base(args) { }
 
     #region ZoneOffsetTransitionRule
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html"/>
     /// </summary>
     public partial class ZoneOffsetTransitionRule : Java.Io.Serializable
     {
@@ -112,7 +112,7 @@ public ZoneOffsetTransitionRule(params object[] args) : base(args) { }
         // TODO: complete the class
         #region TimeDefinition
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html"/>
         /// </summary>
         public partial class TimeDefinition : Java.Lang.Enum<Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition>
         {
@@ -160,7 +160,7 @@ public TimeDefinition(params object[] args) : base(args) { }
 
     #region ZoneRules
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html"/>
     /// </summary>
     public partial class ZoneRules : Java.Io.Serializable
     {
@@ -204,7 +204,7 @@ public ZoneRules(params object[] args) : base(args) { }
 
     #region ZoneRulesException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRulesException.html"/>
+    /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRulesException.html"/>
     /// </summary>
     public partial class ZoneRulesException : Java.Time.DateTimeException
     {
diff --git a/src/net/Netdroid/Generated/Java/Time/Zone/ZoneOffsetTransition.cs b/src/net/Netdroid/Generated/Java/Time/Zone/ZoneOffsetTransition.cs
index 6ca086abb..3382b6ceb 100644
--- a/src/net/Netdroid/Generated/Java/Time/Zone/ZoneOffsetTransition.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Zone/ZoneOffsetTransition.cs
@@ -50,7 +50,7 @@ public partial class ZoneOffsetTransition : Java.Lang.IComparable<Java.Time.Zone
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#of(java.time.LocalDateTime,java.time.ZoneOffset,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#of(java.time.LocalDateTime,java.time.ZoneOffset,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -65,92 +65,98 @@ public static Java.Time.Zone.ZoneOffsetTransition Of(Java.Time.LocalDateTime arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#getDateTimeAfter()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#isGap()"/>
         /// </summary>
-        public Java.Time.LocalDateTime DateTimeAfter
+        /// <returns><see cref="bool"/></returns>
+        public bool IsGap()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getDateTimeAfter", "()Ljava/time/LocalDateTime;"); }
+            return IExecuteWithSignature<bool>("isGap", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#getDateTimeBefore()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#isOverlap()"/>
         /// </summary>
-        public Java.Time.LocalDateTime DateTimeBefore
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOverlap()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getDateTimeBefore", "()Ljava/time/LocalDateTime;"); }
+            return IExecuteWithSignature<bool>("isOverlap", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#getDuration()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#isValidOffset(java.time.ZoneOffset)"/>
         /// </summary>
-        public Java.Time.Duration Duration
+        /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsValidOffset(Java.Time.ZoneOffset arg0)
         {
-            get { return IExecuteWithSignature<Java.Time.Duration>("getDuration", "()Ljava/time/Duration;"); }
+            return IExecuteWithSignature<bool>("isValidOffset", "(Ljava/time/ZoneOffset;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#getInstant()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#compareTo(java.lang.Object)"/>
         /// </summary>
-        public Java.Time.Instant Instant
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getInstant", "()Ljava/time/Instant;"); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#getOffsetAfter()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#compareTo(java.time.zone.ZoneOffsetTransition)"/>
         /// </summary>
-        public Java.Time.ZoneOffset OffsetAfter
+        /// <param name="arg0"><see cref="Java.Time.Zone.ZoneOffsetTransition"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(Java.Time.Zone.ZoneOffsetTransition arg0)
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffsetAfter", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/time/zone/ZoneOffsetTransition;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#getOffsetBefore()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#getDuration()"/>
         /// </summary>
-        public Java.Time.ZoneOffset OffsetBefore
+        /// <returns><see cref="Java.Time.Duration"/></returns>
+        public Java.Time.Duration GetDuration()
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffsetBefore", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<Java.Time.Duration>("getDuration", "()Ljava/time/Duration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#isGap()"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#getInstant()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsGap()
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetInstant()
         {
-            return IExecuteWithSignature<bool>("isGap", "()Z");
+            return IExecuteWithSignature<Java.Time.Instant>("getInstant", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#isOverlap()"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#getDateTimeAfter()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOverlap()
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetDateTimeAfter()
         {
-            return IExecuteWithSignature<bool>("isOverlap", "()Z");
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getDateTimeAfter", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#isValidOffset(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#getDateTimeBefore()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsValidOffset(Java.Time.ZoneOffset arg0)
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetDateTimeBefore()
         {
-            return IExecuteWithSignature<bool>("isValidOffset", "(Ljava/time/ZoneOffset;)Z", arg0);
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getDateTimeBefore", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#getOffsetAfter()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(object arg0)
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffsetAfter()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffsetAfter", "()Ljava/time/ZoneOffset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#compareTo(java.time.zone.ZoneOffsetTransition)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#getOffsetBefore()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.Zone.ZoneOffsetTransition"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int CompareTo(Java.Time.Zone.ZoneOffsetTransition arg0)
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffsetBefore()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/time/zone/ZoneOffsetTransition;)I", arg0);
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffsetBefore", "()Ljava/time/ZoneOffset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransition.html#toEpochSecond()"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransition.html#toEpochSecond()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ToEpochSecond()
diff --git a/src/net/Netdroid/Generated/Java/Time/Zone/ZoneOffsetTransitionRule.cs b/src/net/Netdroid/Generated/Java/Time/Zone/ZoneOffsetTransitionRule.cs
index 84f87256f..777347e3d 100644
--- a/src/net/Netdroid/Generated/Java/Time/Zone/ZoneOffsetTransitionRule.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Zone/ZoneOffsetTransitionRule.cs
@@ -42,7 +42,7 @@ public partial class ZoneOffsetTransitionRule
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#of(java.time.Month,int,java.time.DayOfWeek,java.time.LocalTime,boolean,java.time.zone.ZoneOffsetTransitionRule.TimeDefinition,java.time.ZoneOffset,java.time.ZoneOffset,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#of(java.time.Month,int,java.time.DayOfWeek,java.time.LocalTime,boolean,java.time.zone.ZoneOffsetTransitionRule.TimeDefinition,java.time.ZoneOffset,java.time.ZoneOffset,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Month"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -63,77 +63,85 @@ public static Java.Time.Zone.ZoneOffsetTransitionRule Of(Java.Time.Month arg0, i
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#getDayOfMonthIndicator()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#isMidnightEndOfDay()"/>
         /// </summary>
-        public int DayOfMonthIndicator
+        /// <returns><see cref="bool"/></returns>
+        public bool IsMidnightEndOfDay()
         {
-            get { return IExecuteWithSignature<int>("getDayOfMonthIndicator", "()I"); }
+            return IExecuteWithSignature<bool>("isMidnightEndOfDay", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#getDayOfWeek()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#getDayOfMonthIndicator()"/>
         /// </summary>
-        public Java.Time.DayOfWeek DayOfWeek
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfMonthIndicator()
         {
-            get { return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;"); }
+            return IExecuteWithSignature<int>("getDayOfMonthIndicator", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#getTimeDefinition()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#getDayOfWeek()"/>
         /// </summary>
-        public Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition GetTimeDefinition
+        /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
+        public Java.Time.DayOfWeek GetDayOfWeek()
         {
-            get { return IExecuteWithSignature<Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition>("getTimeDefinition", "()Ljava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;"); }
+            return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#getLocalTime()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#getLocalTime()"/>
         /// </summary>
-        public Java.Time.LocalTime LocalTime
+        /// <returns><see cref="Java.Time.LocalTime"/></returns>
+        public Java.Time.LocalTime GetLocalTime()
         {
-            get { return IExecuteWithSignature<Java.Time.LocalTime>("getLocalTime", "()Ljava/time/LocalTime;"); }
+            return IExecuteWithSignature<Java.Time.LocalTime>("getLocalTime", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#getMonth()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#getMonth()"/>
         /// </summary>
-        public Java.Time.Month Month
+        /// <returns><see cref="Java.Time.Month"/></returns>
+        public Java.Time.Month GetMonth()
         {
-            get { return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;"); }
+            return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#getOffsetAfter()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#createTransition(int)"/>
         /// </summary>
-        public Java.Time.ZoneOffset OffsetAfter
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="Java.Time.Zone.ZoneOffsetTransition"/></returns>
+        public Java.Time.Zone.ZoneOffsetTransition CreateTransition(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffsetAfter", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<Java.Time.Zone.ZoneOffsetTransition>("createTransition", "(I)Ljava/time/zone/ZoneOffsetTransition;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#getOffsetBefore()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#getTimeDefinition()"/>
         /// </summary>
-        public Java.Time.ZoneOffset OffsetBefore
+        /// <returns><see cref="Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition"/></returns>
+        public Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition GetTimeDefinition()
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffsetBefore", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition>("getTimeDefinition", "()Ljava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#getStandardOffset()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#getOffsetAfter()"/>
         /// </summary>
-        public Java.Time.ZoneOffset StandardOffset
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffsetAfter()
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getStandardOffset", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffsetAfter", "()Ljava/time/ZoneOffset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#isMidnightEndOfDay()"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#getOffsetBefore()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsMidnightEndOfDay()
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffsetBefore()
         {
-            return IExecuteWithSignature<bool>("isMidnightEndOfDay", "()Z");
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffsetBefore", "()Ljava/time/ZoneOffset;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.html#createTransition(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.html#getStandardOffset()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Java.Time.Zone.ZoneOffsetTransition"/></returns>
-        public Java.Time.Zone.ZoneOffsetTransition CreateTransition(int arg0)
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetStandardOffset()
         {
-            return IExecuteWithSignature<Java.Time.Zone.ZoneOffsetTransition>("createTransition", "(I)Ljava/time/zone/ZoneOffsetTransition;", arg0);
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getStandardOffset", "()Ljava/time/ZoneOffset;");
         }
 
         #endregion
@@ -152,19 +160,19 @@ public partial class TimeDefinition
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#STANDARD"/>
+            /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#STANDARD"/>
             /// </summary>
             public static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition STANDARD { get { if (!_STANDARDReady) { _STANDARDContent = SGetField<Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition>(LocalBridgeClazz, "STANDARD"); _STANDARDReady = true; } return _STANDARDContent; } }
             private static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition _STANDARDContent = default;
             private static bool _STANDARDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#UTC"/>
+            /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#UTC"/>
             /// </summary>
             public static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition UTC { get { if (!_UTCReady) { _UTCContent = SGetField<Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition>(LocalBridgeClazz, "UTC"); _UTCReady = true; } return _UTCContent; } }
             private static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition _UTCContent = default;
             private static bool _UTCReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#WALL"/>
+            /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#WALL"/>
             /// </summary>
             public static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition WALL { get { if (!_WALLReady) { _WALLContent = SGetField<Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition>(LocalBridgeClazz, "WALL"); _WALLReady = true; } return _WALLContent; } }
             private static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition _WALLContent = default;
@@ -174,7 +182,7 @@ public partial class TimeDefinition
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition"/></returns>
@@ -183,7 +191,7 @@ public static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition ValueOf(Jav
                 return SExecuteWithSignature<Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/time/zone/ZoneOffsetTransitionRule$TimeDefinition;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition"/></returns>
             public static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition[] Values()
@@ -195,7 +203,7 @@ public static Java.Time.Zone.ZoneOffsetTransitionRule.TimeDefinition[] Values()
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#createDateTime(java.time.LocalDateTime,java.time.ZoneOffset,java.time.ZoneOffset)"/>
+            /// <see href="https://developer.android.com/reference/java/time/zone/ZoneOffsetTransitionRule.TimeDefinition.html#createDateTime(java.time.LocalDateTime,java.time.ZoneOffset,java.time.ZoneOffset)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
             /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Time/Zone/ZoneRules.cs b/src/net/Netdroid/Generated/Java/Time/Zone/ZoneRules.cs
index 35035ec1d..3fd634d92 100644
--- a/src/net/Netdroid/Generated/Java/Time/Zone/ZoneRules.cs
+++ b/src/net/Netdroid/Generated/Java/Time/Zone/ZoneRules.cs
@@ -42,7 +42,7 @@ public partial class ZoneRules
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#of(java.time.ZoneOffset,java.time.ZoneOffset,java.util.List,java.util.List,java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#of(java.time.ZoneOffset,java.time.ZoneOffset,java.util.List,java.util.List,java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -55,7 +55,7 @@ public static Java.Time.Zone.ZoneRules Of(Java.Time.ZoneOffset arg0, Java.Time.Z
             return SExecute<Java.Time.Zone.ZoneRules>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#of(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#of(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="Java.Time.Zone.ZoneRules"/></returns>
@@ -68,21 +68,7 @@ public static Java.Time.Zone.ZoneRules Of(Java.Time.ZoneOffset arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#getTransitionRules()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Time.Zone.ZoneOffsetTransitionRule> TransitionRules
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Time.Zone.ZoneOffsetTransitionRule>>("getTransitionRules", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#getTransitions()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Time.Zone.ZoneOffsetTransition> Transitions
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Time.Zone.ZoneOffsetTransition>>("getTransitions", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#isDaylightSavings(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#isDaylightSavings(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -91,7 +77,7 @@ public bool IsDaylightSavings(Java.Time.Instant arg0)
             return IExecuteWithSignature<bool>("isDaylightSavings", "(Ljava/time/Instant;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#isFixedOffset()"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#isFixedOffset()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsFixedOffset()
@@ -99,7 +85,7 @@ public bool IsFixedOffset()
             return IExecuteWithSignature<bool>("isFixedOffset", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#isValidOffset(java.time.LocalDateTime,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#isValidOffset(java.time.LocalDateTime,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -109,7 +95,7 @@ public bool IsValidOffset(Java.Time.LocalDateTime arg0, Java.Time.ZoneOffset arg
             return IExecute<bool>("isValidOffset", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#getDaylightSavings(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#getDaylightSavings(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="Java.Time.Duration"/></returns>
@@ -118,7 +104,7 @@ public Java.Time.Duration GetDaylightSavings(Java.Time.Instant arg0)
             return IExecuteWithSignature<Java.Time.Duration>("getDaylightSavings", "(Ljava/time/Instant;)Ljava/time/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#getTransition(java.time.LocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#getTransition(java.time.LocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <returns><see cref="Java.Time.Zone.ZoneOffsetTransition"/></returns>
@@ -127,7 +113,7 @@ public Java.Time.Zone.ZoneOffsetTransition GetTransition(Java.Time.LocalDateTime
             return IExecuteWithSignature<Java.Time.Zone.ZoneOffsetTransition>("getTransition", "(Ljava/time/LocalDateTime;)Ljava/time/zone/ZoneOffsetTransition;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#nextTransition(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#nextTransition(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="Java.Time.Zone.ZoneOffsetTransition"/></returns>
@@ -136,7 +122,7 @@ public Java.Time.Zone.ZoneOffsetTransition NextTransition(Java.Time.Instant arg0
             return IExecuteWithSignature<Java.Time.Zone.ZoneOffsetTransition>("nextTransition", "(Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#previousTransition(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#previousTransition(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="Java.Time.Zone.ZoneOffsetTransition"/></returns>
@@ -145,7 +131,7 @@ public Java.Time.Zone.ZoneOffsetTransition PreviousTransition(Java.Time.Instant
             return IExecuteWithSignature<Java.Time.Zone.ZoneOffsetTransition>("previousTransition", "(Ljava/time/Instant;)Ljava/time/zone/ZoneOffsetTransition;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#getOffset(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#getOffset(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
@@ -154,7 +140,7 @@ public Java.Time.ZoneOffset GetOffset(Java.Time.Instant arg0)
             return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "(Ljava/time/Instant;)Ljava/time/ZoneOffset;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#getOffset(java.time.LocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#getOffset(java.time.LocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
@@ -163,7 +149,7 @@ public Java.Time.ZoneOffset GetOffset(Java.Time.LocalDateTime arg0)
             return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "(Ljava/time/LocalDateTime;)Ljava/time/ZoneOffset;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#getStandardOffset(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#getStandardOffset(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
@@ -172,7 +158,23 @@ public Java.Time.ZoneOffset GetStandardOffset(Java.Time.Instant arg0)
             return IExecuteWithSignature<Java.Time.ZoneOffset>("getStandardOffset", "(Ljava/time/Instant;)Ljava/time/ZoneOffset;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/zone/ZoneRules.html#getValidOffsets(java.time.LocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#getTransitions()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Time.Zone.ZoneOffsetTransition> GetTransitions()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Time.Zone.ZoneOffsetTransition>>("getTransitions", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#getTransitionRules()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Time.Zone.ZoneOffsetTransitionRule> GetTransitionRules()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Time.Zone.ZoneOffsetTransitionRule>>("getTransitionRules", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/zone/ZoneRules.html#getValidOffsets(java.time.LocalDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/ZoneId.cs b/src/net/Netdroid/Generated/Java/Time/ZoneId.cs
index 6d0df33f7..2f43227d8 100644
--- a/src/net/Netdroid/Generated/Java/Time/ZoneId.cs
+++ b/src/net/Netdroid/Generated/Java/Time/ZoneId.cs
@@ -38,7 +38,7 @@ public partial class ZoneId
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#SHORT_IDS"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#SHORT_IDS"/>
         /// </summary>
         public static Java.Util.Map SHORT_IDS { get { if (!_SHORT_IDSReady) { _SHORT_IDSContent = SGetField<Java.Util.Map>(LocalBridgeClazz, "SHORT_IDS"); _SHORT_IDSReady = true; } return _SHORT_IDSContent; } }
         private static Java.Util.Map _SHORT_IDSContent = default;
@@ -48,14 +48,7 @@ public partial class ZoneId
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#getAvailableZoneIds()"/> 
-        /// </summary>
-        public static Java.Util.Set<Java.Lang.String> AvailableZoneIds
-        {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getAvailableZoneIds", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#from(java.time.temporal.TemporalAccessor)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#from(java.time.temporal.TemporalAccessor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalAccessor"/></param>
         /// <returns><see cref="Java.Time.ZoneId"/></returns>
@@ -64,7 +57,7 @@ public static Java.Time.ZoneId From(Java.Time.Temporal.TemporalAccessor arg0)
             return SExecuteWithSignature<Java.Time.ZoneId>(LocalBridgeClazz, "from", "(Ljava/time/temporal/TemporalAccessor;)Ljava/time/ZoneId;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#of(java.lang.String,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#of(java.lang.String,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -74,7 +67,7 @@ public static Java.Time.ZoneId Of(Java.Lang.String arg0, Java.Util.Map<Java.Lang
             return SExecute<Java.Time.ZoneId>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#of(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#of(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Time.ZoneId"/></returns>
@@ -83,7 +76,7 @@ public static Java.Time.ZoneId Of(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Time.ZoneId>(LocalBridgeClazz, "of", "(Ljava/lang/String;)Ljava/time/ZoneId;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#ofOffset(java.lang.String,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#ofOffset(java.lang.String,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -93,33 +86,43 @@ public static Java.Time.ZoneId OfOffset(Java.Lang.String arg0, Java.Time.ZoneOff
             return SExecute<Java.Time.ZoneId>(LocalBridgeClazz, "ofOffset", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#systemDefault()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#systemDefault()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.ZoneId"/></returns>
         public static Java.Time.ZoneId SystemDefault()
         {
             return SExecuteWithSignature<Java.Time.ZoneId>(LocalBridgeClazz, "systemDefault", "()Ljava/time/ZoneId;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#getAvailableZoneIds()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.String> GetAvailableZoneIds()
+        {
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getAvailableZoneIds", "()Ljava/util/Set;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#getId()"/>
         /// </summary>
-        public Java.Lang.String Id
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#getRules()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#getRules()"/>
         /// </summary>
-        public Java.Time.Zone.ZoneRules Rules
+        /// <returns><see cref="Java.Time.Zone.ZoneRules"/></returns>
+        public Java.Time.Zone.ZoneRules GetRules()
         {
-            get { return IExecuteWithSignature<Java.Time.Zone.ZoneRules>("getRules", "()Ljava/time/zone/ZoneRules;"); }
+            return IExecuteWithSignature<Java.Time.Zone.ZoneRules>("getRules", "()Ljava/time/zone/ZoneRules;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#getDisplayName(java.time.format.TextStyle,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.TextStyle"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -129,7 +132,7 @@ public Java.Lang.String GetDisplayName(Java.Time.Format.TextStyle arg0, Java.Uti
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneId.html#normalized()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneId.html#normalized()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.ZoneId"/></returns>
         public Java.Time.ZoneId Normalized()
diff --git a/src/net/Netdroid/Generated/Java/Time/ZoneOffset.cs b/src/net/Netdroid/Generated/Java/Time/ZoneOffset.cs
index 4fda51fc3..ae53774ae 100644
--- a/src/net/Netdroid/Generated/Java/Time/ZoneOffset.cs
+++ b/src/net/Netdroid/Generated/Java/Time/ZoneOffset.cs
@@ -50,19 +50,19 @@ public partial class ZoneOffset : Java.Time.Temporal.ITemporalAccessor, Java.Tim
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#MAX"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#MAX"/>
         /// </summary>
         public static Java.Time.ZoneOffset MAX { get { if (!_MAXReady) { _MAXContent = SGetField<Java.Time.ZoneOffset>(LocalBridgeClazz, "MAX"); _MAXReady = true; } return _MAXContent; } }
         private static Java.Time.ZoneOffset _MAXContent = default;
         private static bool _MAXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#MIN"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#MIN"/>
         /// </summary>
         public static Java.Time.ZoneOffset MIN { get { if (!_MINReady) { _MINContent = SGetField<Java.Time.ZoneOffset>(LocalBridgeClazz, "MIN"); _MINReady = true; } return _MINContent; } }
         private static Java.Time.ZoneOffset _MINContent = default;
         private static bool _MINReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#UTC"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#UTC"/>
         /// </summary>
         public static Java.Time.ZoneOffset UTC { get { if (!_UTCReady) { _UTCContent = SGetField<Java.Time.ZoneOffset>(LocalBridgeClazz, "UTC"); _UTCReady = true; } return _UTCContent; } }
         private static Java.Time.ZoneOffset _UTCContent = default;
@@ -72,7 +72,7 @@ public partial class ZoneOffset : Java.Time.Temporal.ITemporalAccessor, Java.Tim
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#ofHours(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#ofHours(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
@@ -81,7 +81,7 @@ public static Java.Time.ZoneOffset OfHours(int arg0)
             return SExecuteWithSignature<Java.Time.ZoneOffset>(LocalBridgeClazz, "ofHours", "(I)Ljava/time/ZoneOffset;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#ofHoursMinutes(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#ofHoursMinutes(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -91,7 +91,7 @@ public static Java.Time.ZoneOffset OfHoursMinutes(int arg0, int arg1)
             return SExecute<Java.Time.ZoneOffset>(LocalBridgeClazz, "ofHoursMinutes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#ofHoursMinutesSeconds(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#ofHoursMinutesSeconds(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -102,7 +102,7 @@ public static Java.Time.ZoneOffset OfHoursMinutesSeconds(int arg0, int arg1, int
             return SExecute<Java.Time.ZoneOffset>(LocalBridgeClazz, "ofHoursMinutesSeconds", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#ofTotalSeconds(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#ofTotalSeconds(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
@@ -115,14 +115,7 @@ public static Java.Time.ZoneOffset OfTotalSeconds(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#getTotalSeconds()"/> 
-        /// </summary>
-        public int TotalSeconds
-        {
-            get { return IExecuteWithSignature<int>("getTotalSeconds", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
         /// <typeparam name="R"></typeparam>
@@ -132,7 +125,7 @@ public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
             return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -141,7 +134,7 @@ public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -150,7 +143,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#compareTo(java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#compareTo(java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneOffset"/></param>
         /// <returns><see cref="int"/></returns>
@@ -159,7 +152,7 @@ public int CompareTo(Java.Time.ZoneOffset arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/time/ZoneOffset;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
@@ -168,7 +161,15 @@ public int Get(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#adjustInto(java.time.temporal.Temporal)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#getTotalSeconds()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalSeconds()
+        {
+            return IExecuteWithSignature<int>("getTotalSeconds", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#adjustInto(java.time.temporal.Temporal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <returns><see cref="Java.Time.Temporal.Temporal"/></returns>
@@ -177,7 +178,7 @@ public Java.Time.Temporal.Temporal AdjustInto(Java.Time.Temporal.Temporal arg0)
             return IExecuteWithSignature<Java.Time.Temporal.Temporal>("adjustInto", "(Ljava/time/temporal/Temporal;)Ljava/time/temporal/Temporal;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -186,7 +187,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZoneOffset.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZoneOffset.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Time/ZonedDateTime.cs b/src/net/Netdroid/Generated/Java/Time/ZonedDateTime.cs
index cec0927bc..012682a51 100644
--- a/src/net/Netdroid/Generated/Java/Time/ZonedDateTime.cs
+++ b/src/net/Netdroid/Generated/Java/Time/ZonedDateTime.cs
@@ -26,7 +26,7 @@
 namespace Java.Time
 {
     #region ZonedDateTime
-    public partial class ZonedDateTime : Java.Time.Temporal.ITemporal, Java.Time.Chrono.IChronoZonedDateTime, Java.Io.ISerializable
+    public partial class ZonedDateTime : Java.Time.Temporal.ITemporal, Java.Time.Chrono.IChronoZonedDateTime<Java.Time.LocalDate>, Java.Io.ISerializable
     {
         #region Constructors
 
@@ -54,7 +54,7 @@ public partial class ZonedDateTime : Java.Time.Temporal.ITemporal, Java.Time.Chr
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#now()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#now()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
         public static Java.Time.ZonedDateTime Now()
@@ -62,7 +62,7 @@ public static Java.Time.ZonedDateTime Now()
             return SExecuteWithSignature<Java.Time.ZonedDateTime>(LocalBridgeClazz, "now", "()Ljava/time/ZonedDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#now(java.time.Clock)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#now(java.time.Clock)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Clock"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -71,7 +71,7 @@ public static Java.Time.ZonedDateTime Now(Java.Time.Clock arg0)
             return SExecuteWithSignature<Java.Time.ZonedDateTime>(LocalBridgeClazz, "now", "(Ljava/time/Clock;)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#now(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#now(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -80,7 +80,7 @@ public static Java.Time.ZonedDateTime Now(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Time.ZonedDateTime>(LocalBridgeClazz, "now", "(Ljava/time/ZoneId;)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#of(int,int,int,int,int,int,int,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#of(int,int,int,int,int,int,int,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -96,7 +96,7 @@ public static Java.Time.ZonedDateTime Of(int arg0, int arg1, int arg2, int arg3,
             return SExecute<Java.Time.ZonedDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#of(java.time.LocalDate,java.time.LocalTime,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#of(java.time.LocalDate,java.time.LocalTime,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDate"/></param>
         /// <param name="arg1"><see cref="Java.Time.LocalTime"/></param>
@@ -107,7 +107,7 @@ public static Java.Time.ZonedDateTime Of(Java.Time.LocalDate arg0, Java.Time.Loc
             return SExecute<Java.Time.ZonedDateTime>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#of(java.time.LocalDateTime,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#of(java.time.LocalDateTime,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -117,7 +117,7 @@ public static Java.Time.ZonedDateTime Of(Java.Time.LocalDateTime arg0, Java.Time
             return SExecute<Java.Time.ZonedDateTime>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#ofInstant(java.time.Instant,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -127,7 +127,7 @@ public static Java.Time.ZonedDateTime OfInstant(Java.Time.Instant arg0, Java.Tim
             return SExecute<Java.Time.ZonedDateTime>(LocalBridgeClazz, "ofInstant", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#ofInstant(java.time.LocalDateTime,java.time.ZoneOffset,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#ofInstant(java.time.LocalDateTime,java.time.ZoneOffset,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -138,7 +138,7 @@ public static Java.Time.ZonedDateTime OfInstant(Java.Time.LocalDateTime arg0, Ja
             return SExecute<Java.Time.ZonedDateTime>(LocalBridgeClazz, "ofInstant", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#ofLocal(java.time.LocalDateTime,java.time.ZoneId,java.time.ZoneOffset)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#ofLocal(java.time.LocalDateTime,java.time.ZoneId,java.time.ZoneOffset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneId"/></param>
@@ -149,7 +149,7 @@ public static Java.Time.ZonedDateTime OfLocal(Java.Time.LocalDateTime arg0, Java
             return SExecute<Java.Time.ZonedDateTime>(LocalBridgeClazz, "ofLocal", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#ofStrict(java.time.LocalDateTime,java.time.ZoneOffset,java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#ofStrict(java.time.LocalDateTime,java.time.ZoneOffset,java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
         /// <param name="arg1"><see cref="Java.Time.ZoneOffset"/></param>
@@ -160,7 +160,7 @@ public static Java.Time.ZonedDateTime OfStrict(Java.Time.LocalDateTime arg0, Jav
             return SExecute<Java.Time.ZonedDateTime>(LocalBridgeClazz, "ofStrict", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#parse(java.lang.CharSequence,java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
@@ -170,7 +170,7 @@ public static Java.Time.ZonedDateTime Parse(Java.Lang.CharSequence arg0, Java.Ti
             return SExecute<Java.Time.ZonedDateTime>(LocalBridgeClazz, "parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#parse(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#parse(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -183,128 +183,108 @@ public static Java.Time.ZonedDateTime Parse(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getDayOfMonth()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#query(java.time.temporal.TemporalQuery)"/>
         /// </summary>
-        public int DayOfMonth
-        {
-            get { return IExecuteWithSignature<int>("getDayOfMonth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getDayOfWeek()"/> 
-        /// </summary>
-        public Java.Time.DayOfWeek DayOfWeek
-        {
-            get { return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getDayOfYear()"/> 
-        /// </summary>
-        public int DayOfYear
-        {
-            get { return IExecuteWithSignature<int>("getDayOfYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getHour()"/> 
-        /// </summary>
-        public int Hour
-        {
-            get { return IExecuteWithSignature<int>("getHour", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getMinute()"/> 
-        /// </summary>
-        public int Minute
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
+        /// <typeparam name="R"></typeparam>
+        /// <returns><typeparamref name="R"/></returns>
+        public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
         {
-            get { return IExecuteWithSignature<int>("getMinute", "()I"); }
+            return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getMonth()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
         /// </summary>
-        public Java.Time.Month Month
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
         {
-            get { return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;"); }
+            return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getMonthValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
         /// </summary>
-        public int MonthValue
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
         {
-            get { return IExecuteWithSignature<int>("getMonthValue", "()I"); }
+            return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getNano()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#get(java.time.temporal.TemporalField)"/>
         /// </summary>
-        public int Nano
+        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int Get(Java.Time.Temporal.TemporalField arg0)
         {
-            get { return IExecuteWithSignature<int>("getNano", "()I"); }
+            return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getOffset()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getDayOfMonth()"/>
         /// </summary>
-        public Java.Time.ZoneOffset Offset
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfMonth()
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;"); }
+            return IExecuteWithSignature<int>("getDayOfMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getSecond()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getDayOfYear()"/>
         /// </summary>
-        public int Second
+        /// <returns><see cref="int"/></returns>
+        public int GetDayOfYear()
         {
-            get { return IExecuteWithSignature<int>("getSecond", "()I"); }
+            return IExecuteWithSignature<int>("getDayOfYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getYear()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getHour()"/>
         /// </summary>
-        public int Year
+        /// <returns><see cref="int"/></returns>
+        public int GetHour()
         {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); }
+            return IExecuteWithSignature<int>("getHour", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getZone()"/> 
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getMinute()"/>
         /// </summary>
-        public Java.Time.ZoneId Zone
+        /// <returns><see cref="int"/></returns>
+        public int GetMinute()
         {
-            get { return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;"); }
+            return IExecuteWithSignature<int>("getMinute", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#query(java.time.temporal.TemporalQuery)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getMonthValue()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalQuery"/></param>
-        /// <typeparam name="R"></typeparam>
-        /// <returns><typeparamref name="R"/></returns>
-        public R Query<R>(Java.Time.Temporal.TemporalQuery<R> arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetMonthValue()
         {
-            return IExecuteWithSignature<R>("query", "(Ljava/time/temporal/TemporalQuery;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<int>("getMonthValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#isSupported(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getNano()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSupported(Java.Time.Temporal.TemporalField arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetNano()
         {
-            return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalField;)Z", arg0);
+            return IExecuteWithSignature<int>("getNano", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#isSupported(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getSecond()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSupported(Java.Time.Temporal.TemporalUnit arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetSecond()
         {
-            return IExecuteWithSignature<bool>("isSupported", "(Ljava/time/temporal/TemporalUnit;)Z", arg0);
+            return IExecuteWithSignature<int>("getSecond", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#get(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getYear()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="int"/></returns>
-        public int Get(Java.Time.Temporal.TemporalField arg0)
+        public int GetYear()
         {
-            return IExecuteWithSignature<int>("get", "(Ljava/time/temporal/TemporalField;)I", arg0);
+            return IExecuteWithSignature<int>("getYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#format(java.time.format.DateTimeFormatter)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#format(java.time.format.DateTimeFormatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Format.DateTimeFormatter"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -313,7 +293,7 @@ public Java.Lang.String Format(Java.Time.Format.DateTimeFormatter arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/time/format/DateTimeFormatter;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#toLocalDate()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#toLocalDate()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDate"/></returns>
         public Java.Time.Chrono.ChronoLocalDate ToLocalDate()
@@ -321,7 +301,7 @@ public Java.Time.Chrono.ChronoLocalDate ToLocalDate()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDate>("toLocalDate", "()Ljava/time/chrono/ChronoLocalDate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#toLocalDateTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#toLocalDateTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoLocalDateTime"/></returns>
         public Java.Time.Chrono.ChronoLocalDateTime ToLocalDateTime()
@@ -329,7 +309,7 @@ public Java.Time.Chrono.ChronoLocalDateTime ToLocalDateTime()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoLocalDateTime>("toLocalDateTime", "()Ljava/time/chrono/ChronoLocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withEarlierOffsetAtOverlap()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withEarlierOffsetAtOverlap()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
         public Java.Time.Chrono.ChronoZonedDateTime WithEarlierOffsetAtOverlap()
@@ -337,7 +317,7 @@ public Java.Time.Chrono.ChronoZonedDateTime WithEarlierOffsetAtOverlap()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("withEarlierOffsetAtOverlap", "()Ljava/time/chrono/ChronoZonedDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withLaterOffsetAtOverlap()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withLaterOffsetAtOverlap()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
         public Java.Time.Chrono.ChronoZonedDateTime WithLaterOffsetAtOverlap()
@@ -345,7 +325,7 @@ public Java.Time.Chrono.ChronoZonedDateTime WithLaterOffsetAtOverlap()
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("withLaterOffsetAtOverlap", "()Ljava/time/chrono/ChronoZonedDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withZoneSameInstant(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withZoneSameInstant(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
@@ -354,7 +334,7 @@ public Java.Time.Chrono.ChronoZonedDateTime WithZoneSameInstant(Java.Time.ZoneId
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("withZoneSameInstant", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withZoneSameLocal(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withZoneSameLocal(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Time.Chrono.ChronoZonedDateTime"/></returns>
@@ -363,7 +343,15 @@ public Java.Time.Chrono.ChronoZonedDateTime WithZoneSameLocal(Java.Time.ZoneId a
             return IExecuteWithSignature<Java.Time.Chrono.ChronoZonedDateTime>("withZoneSameLocal", "(Ljava/time/ZoneId;)Ljava/time/chrono/ChronoZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#toLocalTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getDayOfWeek()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.DayOfWeek"/></returns>
+        public Java.Time.DayOfWeek GetDayOfWeek()
+        {
+            return IExecuteWithSignature<Java.Time.DayOfWeek>("getDayOfWeek", "()Ljava/time/DayOfWeek;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#toLocalTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.LocalTime"/></returns>
         public Java.Time.LocalTime ToLocalTime()
@@ -371,7 +359,15 @@ public Java.Time.LocalTime ToLocalTime()
             return IExecuteWithSignature<Java.Time.LocalTime>("toLocalTime", "()Ljava/time/LocalTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#toOffsetDateTime()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getMonth()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.Month"/></returns>
+        public Java.Time.Month GetMonth()
+        {
+            return IExecuteWithSignature<Java.Time.Month>("getMonth", "()Ljava/time/Month;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#toOffsetDateTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.OffsetDateTime"/></returns>
         public Java.Time.OffsetDateTime ToOffsetDateTime()
@@ -379,7 +375,7 @@ public Java.Time.OffsetDateTime ToOffsetDateTime()
             return IExecuteWithSignature<Java.Time.OffsetDateTime>("toOffsetDateTime", "()Ljava/time/OffsetDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#range(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#range(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="Java.Time.Temporal.ValueRange"/></returns>
@@ -388,7 +384,7 @@ public Java.Time.Temporal.ValueRange Range(Java.Time.Temporal.TemporalField arg0
             return IExecuteWithSignature<Java.Time.Temporal.ValueRange>("range", "(Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#minusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#minusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -397,7 +393,7 @@ public Java.Time.ZonedDateTime MinusDays(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("minusDays", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#minusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#minusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -406,7 +402,7 @@ public Java.Time.ZonedDateTime MinusHours(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("minusHours", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#minusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#minusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -415,7 +411,7 @@ public Java.Time.ZonedDateTime MinusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("minusMinutes", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#minusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#minusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -424,7 +420,7 @@ public Java.Time.ZonedDateTime MinusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("minusMonths", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#minusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#minusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -433,7 +429,7 @@ public Java.Time.ZonedDateTime MinusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("minusNanos", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#minusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#minusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -442,7 +438,7 @@ public Java.Time.ZonedDateTime MinusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("minusSeconds", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#minusWeeks(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#minusWeeks(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -451,7 +447,7 @@ public Java.Time.ZonedDateTime MinusWeeks(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("minusWeeks", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#minusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#minusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -460,7 +456,7 @@ public Java.Time.ZonedDateTime MinusYears(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("minusYears", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#plusDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#plusDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -469,7 +465,7 @@ public Java.Time.ZonedDateTime PlusDays(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("plusDays", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#plusHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#plusHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -478,7 +474,7 @@ public Java.Time.ZonedDateTime PlusHours(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("plusHours", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#plusMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#plusMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -487,7 +483,7 @@ public Java.Time.ZonedDateTime PlusMinutes(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("plusMinutes", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#plusMonths(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#plusMonths(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -496,7 +492,7 @@ public Java.Time.ZonedDateTime PlusMonths(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("plusMonths", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#plusNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#plusNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -505,7 +501,7 @@ public Java.Time.ZonedDateTime PlusNanos(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("plusNanos", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#plusSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#plusSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -514,7 +510,7 @@ public Java.Time.ZonedDateTime PlusSeconds(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("plusSeconds", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#plusWeeks(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#plusWeeks(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -523,7 +519,7 @@ public Java.Time.ZonedDateTime PlusWeeks(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("plusWeeks", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#plusYears(long)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#plusYears(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -532,7 +528,7 @@ public Java.Time.ZonedDateTime PlusYears(long arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("plusYears", "(J)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#truncatedTo(java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -541,7 +537,7 @@ public Java.Time.ZonedDateTime TruncatedTo(Java.Time.Temporal.TemporalUnit arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("truncatedTo", "(Ljava/time/temporal/TemporalUnit;)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withDayOfMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withDayOfMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -550,7 +546,7 @@ public Java.Time.ZonedDateTime WithDayOfMonth(int arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withDayOfMonth", "(I)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withDayOfYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withDayOfYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -559,7 +555,7 @@ public Java.Time.ZonedDateTime WithDayOfYear(int arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withDayOfYear", "(I)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withFixedOffsetZone()"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withFixedOffsetZone()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
         public Java.Time.ZonedDateTime WithFixedOffsetZone()
@@ -567,7 +563,7 @@ public Java.Time.ZonedDateTime WithFixedOffsetZone()
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withFixedOffsetZone", "()Ljava/time/ZonedDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withHour(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withHour(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -576,7 +572,7 @@ public Java.Time.ZonedDateTime WithHour(int arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withHour", "(I)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withMinute(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withMinute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -585,7 +581,7 @@ public Java.Time.ZonedDateTime WithMinute(int arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withMinute", "(I)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withMonth(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -594,7 +590,7 @@ public Java.Time.ZonedDateTime WithMonth(int arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withMonth", "(I)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withNano(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withNano(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -603,7 +599,7 @@ public Java.Time.ZonedDateTime WithNano(int arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withNano", "(I)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withSecond(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withSecond(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -612,7 +608,7 @@ public Java.Time.ZonedDateTime WithSecond(int arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withSecond", "(I)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#withYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#withYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
@@ -621,7 +617,23 @@ public Java.Time.ZonedDateTime WithYear(int arg0)
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("withYear", "(I)Ljava/time/ZonedDateTime;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#getLong(java.time.temporal.TemporalField)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getZone()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneId"/></returns>
+        public Java.Time.ZoneId GetZone()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneId>("getZone", "()Ljava/time/ZoneId;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getOffset()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Time.ZoneOffset"/></returns>
+        public Java.Time.ZoneOffset GetOffset()
+        {
+            return IExecuteWithSignature<Java.Time.ZoneOffset>("getOffset", "()Ljava/time/ZoneOffset;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#getLong(java.time.temporal.TemporalField)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.TemporalField"/></param>
         /// <returns><see cref="long"/></returns>
@@ -630,7 +642,7 @@ public long GetLong(Java.Time.Temporal.TemporalField arg0)
             return IExecuteWithSignature<long>("getLong", "(Ljava/time/temporal/TemporalField;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/time/ZonedDateTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/time/ZonedDateTime.html#until(java.time.temporal.Temporal,java.time.temporal.TemporalUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.Temporal"/></param>
         /// <param name="arg1"><see cref="Java.Time.Temporal.TemporalUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/AbstractCollection.cs b/src/net/Netdroid/Generated/Java/Util/AbstractCollection.cs
index abc98326c..98db473fc 100644
--- a/src/net/Netdroid/Generated/Java/Util/AbstractCollection.cs
+++ b/src/net/Netdroid/Generated/Java/Util/AbstractCollection.cs
@@ -46,7 +46,7 @@ public partial class AbstractCollection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -55,7 +55,7 @@ public object[] ToArray(object[] arg0)
             return IExecuteWithSignatureArray<object>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -63,7 +63,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -71,7 +71,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -80,7 +80,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -89,7 +89,7 @@ public bool AddAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -98,7 +98,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -107,7 +107,7 @@ public bool ContainsAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -115,7 +115,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -124,7 +124,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -133,7 +133,7 @@ public bool RemoveAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -142,7 +142,7 @@ public bool RetainAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -150,7 +150,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#clear()"/>
         /// </summary>
         public void Clear()
         {
@@ -192,7 +192,7 @@ public partial class AbstractCollection<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -202,7 +202,7 @@ public T[] ToArray<T>(T[] arg0)
             return IExecuteWithSignatureArray<T>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -210,7 +210,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> Iterator()
@@ -218,7 +218,7 @@ public Java.Util.Iterator<E> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -227,17 +227,17 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -246,7 +246,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -255,7 +255,7 @@ public bool ContainsAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -263,7 +263,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -272,7 +272,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -281,7 +281,7 @@ public bool RemoveAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -290,7 +290,7 @@ public bool RetainAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -298,7 +298,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html#clear()"/>
         /// </summary>
         public void Clear()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/AbstractList.cs b/src/net/Netdroid/Generated/Java/Util/AbstractList.cs
index fe16b02cb..9241aab3e 100644
--- a/src/net/Netdroid/Generated/Java/Util/AbstractList.cs
+++ b/src/net/Netdroid/Generated/Java/Util/AbstractList.cs
@@ -50,7 +50,7 @@ public partial class AbstractList
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -59,7 +59,7 @@ public object Get(int arg0)
             return IExecuteWithSignature("get", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#addAll(int,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#addAll(int,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -69,7 +69,7 @@ public bool AddAll(int arg0, Java.Util.Collection arg1)
             return IExecute<bool>("addAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#remove(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#remove(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -78,7 +78,7 @@ public object Remove(int arg0)
             return IExecuteWithSignature("remove", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#set(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#set(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -88,7 +88,7 @@ public object Set(int arg0, object arg1)
             return IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#indexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#indexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -97,7 +97,7 @@ public int IndexOf(object arg0)
             return IExecuteWithSignature<int>("indexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#lastIndexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#lastIndexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -106,7 +106,7 @@ public int LastIndexOf(object arg0)
             return IExecuteWithSignature<int>("lastIndexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#subList(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#subList(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -116,7 +116,7 @@ public Java.Util.List SubList(int arg0, int arg1)
             return IExecute<Java.Util.List>("subList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#listIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#listIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
         public Java.Util.ListIterator ListIterator()
@@ -124,7 +124,7 @@ public Java.Util.ListIterator ListIterator()
             return IExecuteWithSignature<Java.Util.ListIterator>("listIterator", "()Ljava/util/ListIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#listIterator(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#listIterator(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
@@ -133,7 +133,7 @@ public Java.Util.ListIterator ListIterator(int arg0)
             return IExecuteWithSignature<Java.Util.ListIterator>("listIterator", "(I)Ljava/util/ListIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#add(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#add(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -181,7 +181,7 @@ public partial class AbstractList<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -190,18 +190,18 @@ public E Get(int arg0)
             return IExecuteWithSignature<E>("get", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#addAll(int,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#addAll(int,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg1ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg1ExtendsE>(int arg0, Java.Util.Collection<Arg1ExtendsE> arg1) where Arg1ExtendsE: E
+        public bool AddAll<Arg1ExtendsE>(int arg0, Java.Util.Collection<Arg1ExtendsE> arg1) where Arg1ExtendsE : E
         {
             return IExecute<bool>("addAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#remove(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#remove(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -210,7 +210,7 @@ public E Remove(int arg0)
             return IExecuteWithSignature<E>("remove", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#set(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#set(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -220,7 +220,7 @@ public E Set(int arg0, E arg1)
             return IExecute<E>("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#indexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#indexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -229,7 +229,7 @@ public int IndexOf(object arg0)
             return IExecuteWithSignature<int>("indexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#lastIndexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#lastIndexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -238,7 +238,7 @@ public int LastIndexOf(object arg0)
             return IExecuteWithSignature<int>("lastIndexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#subList(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#subList(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -248,7 +248,7 @@ public Java.Util.List<E> SubList(int arg0, int arg1)
             return IExecute<Java.Util.List<E>>("subList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#listIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#listIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
         public Java.Util.ListIterator<E> ListIterator()
@@ -256,7 +256,7 @@ public Java.Util.ListIterator<E> ListIterator()
             return IExecuteWithSignature<Java.Util.ListIterator<E>>("listIterator", "()Ljava/util/ListIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#listIterator(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#listIterator(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
@@ -265,7 +265,7 @@ public Java.Util.ListIterator<E> ListIterator(int arg0)
             return IExecuteWithSignature<Java.Util.ListIterator<E>>("listIterator", "(I)Ljava/util/ListIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html#add(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractList.html#add(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/AbstractMap.cs b/src/net/Netdroid/Generated/Java/Util/AbstractMap.cs
index d6a2be252..ad3d84789 100644
--- a/src/net/Netdroid/Generated/Java/Util/AbstractMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/AbstractMap.cs
@@ -46,7 +46,7 @@ public partial class AbstractMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set EntrySet()
@@ -54,7 +54,7 @@ public Java.Util.Set EntrySet()
             return IExecuteWithSignature<Java.Util.Set>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#containsKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#containsKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -63,7 +63,7 @@ public bool ContainsKey(object arg0)
             return IExecuteWithSignature<bool>("containsKey", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#containsValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#containsValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -72,7 +72,7 @@ public bool ContainsValue(object arg0)
             return IExecuteWithSignature<bool>("containsValue", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -80,7 +80,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -88,7 +88,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection Values()
@@ -96,7 +96,7 @@ public Java.Util.Collection Values()
             return IExecuteWithSignature<Java.Util.Collection>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set KeySet()
@@ -104,7 +104,7 @@ public Java.Util.Set KeySet()
             return IExecuteWithSignature<Java.Util.Set>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -113,7 +113,7 @@ public object Get(object arg0)
             return IExecuteWithSignature("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#put(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#put(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -123,7 +123,7 @@ public object Put(object arg0, object arg1)
             return IExecute("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -132,14 +132,14 @@ public object Remove(object arg0)
             return IExecuteWithSignature("remove", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#putAll(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#putAll(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public void PutAll(Java.Util.Map arg0)
@@ -155,7 +155,7 @@ public partial class SimpleEntry
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#%3Cinit%3E(java.util.Map.Entry)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#%3Cinit%3E(java.util.Map.Entry)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Map.Entry"/></param>
             public SimpleEntry(Java.Util.Map.Entry arg0)
@@ -163,7 +163,7 @@ public SimpleEntry(Java.Util.Map.Entry arg0)
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#%3Cinit%3E(java.lang.Object,java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#%3Cinit%3E(java.lang.Object,java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <param name="arg1"><see cref="object"/></param>
@@ -192,21 +192,23 @@ public SimpleEntry(object arg0, object arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#getKey()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#getKey()"/>
             /// </summary>
-            public object Key
+            /// <returns><see cref="object"/></returns>
+            public object GetKey()
             {
-                get { return IExecuteWithSignature("getKey", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature("getKey", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#getValue()"/>
             /// </summary>
-            public object Value
+            /// <returns><see cref="object"/></returns>
+            public object GetValue()
             {
-                get { return IExecuteWithSignature("getValue", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature("getValue", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#setValue(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#setValue(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="object"/></returns>
@@ -230,7 +232,7 @@ public partial class SimpleEntry<K, V> : Java.Io.ISerializable
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#%3Cinit%3E(java.util.Map.Entry)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#%3Cinit%3E(java.util.Map.Entry)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Map.Entry"/></param>
             public SimpleEntry(Java.Util.Map.Entry<K, V> arg0)
@@ -238,7 +240,7 @@ public SimpleEntry(Java.Util.Map.Entry<K, V> arg0)
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#%3Cinit%3E(java.lang.Object,java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#%3Cinit%3E(java.lang.Object,java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="K"/></param>
             /// <param name="arg1"><typeparamref name="V"/></param>
@@ -271,21 +273,23 @@ public SimpleEntry(K arg0, V arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#getKey()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#getKey()"/>
             /// </summary>
-            public K Key
+            /// <returns><typeparamref name="K"/></returns>
+            public K GetKey()
             {
-                get { return IExecuteWithSignature<K>("getKey", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<K>("getKey", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#getValue()"/>
             /// </summary>
-            public V Value
+            /// <returns><typeparamref name="V"/></returns>
+            public V GetValue()
             {
-                get { return IExecuteWithSignature<V>("getValue", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<V>("getValue", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html#setValue(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html#setValue(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="V"/></param>
             /// <returns><typeparamref name="V"/></returns>
@@ -309,7 +313,7 @@ public partial class SimpleImmutableEntry
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#%3Cinit%3E(java.util.Map.Entry)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#%3Cinit%3E(java.util.Map.Entry)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Map.Entry"/></param>
             public SimpleImmutableEntry(Java.Util.Map.Entry arg0)
@@ -317,7 +321,7 @@ public SimpleImmutableEntry(Java.Util.Map.Entry arg0)
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#%3Cinit%3E(java.lang.Object,java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#%3Cinit%3E(java.lang.Object,java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <param name="arg1"><see cref="object"/></param>
@@ -346,21 +350,23 @@ public SimpleImmutableEntry(object arg0, object arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#getKey()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#getKey()"/>
             /// </summary>
-            public object Key
+            /// <returns><see cref="object"/></returns>
+            public object GetKey()
             {
-                get { return IExecuteWithSignature("getKey", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature("getKey", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#getValue()"/>
             /// </summary>
-            public object Value
+            /// <returns><see cref="object"/></returns>
+            public object GetValue()
             {
-                get { return IExecuteWithSignature("getValue", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature("getValue", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#setValue(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#setValue(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="object"/></returns>
@@ -384,7 +390,7 @@ public partial class SimpleImmutableEntry<K, V> : Java.Io.ISerializable
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#%3Cinit%3E(java.util.Map.Entry)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#%3Cinit%3E(java.util.Map.Entry)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Map.Entry"/></param>
             public SimpleImmutableEntry(Java.Util.Map.Entry<K, V> arg0)
@@ -392,7 +398,7 @@ public SimpleImmutableEntry(Java.Util.Map.Entry<K, V> arg0)
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#%3Cinit%3E(java.lang.Object,java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#%3Cinit%3E(java.lang.Object,java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="K"/></param>
             /// <param name="arg1"><typeparamref name="V"/></param>
@@ -425,21 +431,23 @@ public SimpleImmutableEntry(K arg0, V arg1)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#getKey()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#getKey()"/>
             /// </summary>
-            public K Key
+            /// <returns><typeparamref name="K"/></returns>
+            public K GetKey()
             {
-                get { return IExecuteWithSignature<K>("getKey", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<K>("getKey", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#getValue()"/>
             /// </summary>
-            public V Value
+            /// <returns><typeparamref name="V"/></returns>
+            public V GetValue()
             {
-                get { return IExecuteWithSignature<V>("getValue", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<V>("getValue", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html#setValue(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html#setValue(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="V"/></param>
             /// <returns><typeparamref name="V"/></returns>
@@ -490,7 +498,7 @@ public partial class AbstractMap<K, V>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Util.Map.Entry<K, V>> EntrySet()
@@ -498,7 +506,7 @@ public partial class AbstractMap<K, V>
             return IExecuteWithSignature<Java.Util.Set<Java.Util.Map.Entry<K, V>>>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#containsKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#containsKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -507,7 +515,7 @@ public bool ContainsKey(object arg0)
             return IExecuteWithSignature<bool>("containsKey", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#containsValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#containsValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -516,7 +524,7 @@ public bool ContainsValue(object arg0)
             return IExecuteWithSignature<bool>("containsValue", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -524,7 +532,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -532,7 +540,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection<V> Values()
@@ -540,7 +548,7 @@ public Java.Util.Collection<V> Values()
             return IExecuteWithSignature<Java.Util.Collection<V>>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<K> KeySet()
@@ -548,7 +556,7 @@ public Java.Util.Set<K> KeySet()
             return IExecuteWithSignature<Java.Util.Set<K>>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -557,7 +565,7 @@ public V Get(object arg0)
             return IExecuteWithSignature<V>("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#put(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#put(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -567,7 +575,7 @@ public V Put(K arg0, V arg1)
             return IExecute<V>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -576,19 +584,19 @@ public V Remove(object arg0)
             return IExecuteWithSignature<V>("remove", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html#putAll(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html#putAll(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
+        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK : K where Arg0ExtendsV : V
         {
             IExecuteWithSignature("putAll", "(Ljava/util/Map;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/AbstractQueue.cs b/src/net/Netdroid/Generated/Java/Util/AbstractQueue.cs
index ab785a79b..9eb4d58ae 100644
--- a/src/net/Netdroid/Generated/Java/Util/AbstractQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/AbstractQueue.cs
@@ -50,7 +50,7 @@ public partial class AbstractQueue
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractQueue.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractQueue.html#element()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Element()
@@ -58,7 +58,7 @@ public object Element()
             return IExecuteWithSignature("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractQueue.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractQueue.html#remove()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Remove()
@@ -105,7 +105,7 @@ public partial class AbstractQueue<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractQueue.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractQueue.html#element()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Element()
@@ -113,7 +113,7 @@ public E Element()
             return IExecuteWithSignature<E>("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractQueue.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractQueue.html#remove()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Remove()
diff --git a/src/net/Netdroid/Generated/Java/Util/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/AllPackageClasses.cs
index 3866bf040..6dbb4adfa 100644
--- a/src/net/Netdroid/Generated/Java/Util/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util
 {
     #region AbstractCollection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html"/>
     /// </summary>
     public partial class AbstractCollection : Java.Util.Collection
     {
@@ -36,12 +36,12 @@ public partial class AbstractCollection : Java.Util.Collection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractCollection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractCollection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public AbstractCollection(params object[] args) : base(args) { }
 
     #region AbstractCollection<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractCollection.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractCollection.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class AbstractCollection<E> : Java.Util.Collection<E>
@@ -83,12 +83,12 @@ public partial class AbstractCollection<E> : Java.Util.Collection<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractCollection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractCollection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractCollection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -121,7 +121,7 @@ public AbstractCollection(params object[] args) : base(args) { }
 
     #region AbstractList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractList.html"/>
     /// </summary>
     public partial class AbstractList : Java.Util.AbstractCollection
     {
@@ -129,12 +129,12 @@ public partial class AbstractList : Java.Util.AbstractCollection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -167,7 +167,7 @@ public AbstractList(params object[] args) : base(args) { }
 
     #region AbstractList<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractList.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class AbstractList<E> : Java.Util.AbstractCollection<E>
@@ -176,12 +176,12 @@ public partial class AbstractList<E> : Java.Util.AbstractCollection<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -214,7 +214,7 @@ public AbstractList(params object[] args) : base(args) { }
 
     #region AbstractMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html"/>
     /// </summary>
     public partial class AbstractMap : Java.Util.Map
     {
@@ -222,12 +222,12 @@ public partial class AbstractMap : Java.Util.Map
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -256,7 +256,7 @@ public AbstractMap(params object[] args) : base(args) { }
         // TODO: complete the class
         #region SimpleEntry
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html"/>
         /// </summary>
         public partial class SimpleEntry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SimpleEntry>
         {
@@ -300,7 +300,7 @@ public SimpleEntry(params object[] args) : base(args) { }
 
         #region SimpleEntry<K, V>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleEntry.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleEntry.html"/>
         /// </summary>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
@@ -346,7 +346,7 @@ public SimpleEntry(params object[] args) : base(args) { }
 
         #region SimpleImmutableEntry
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html"/>
         /// </summary>
         public partial class SimpleImmutableEntry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SimpleImmutableEntry>
         {
@@ -390,7 +390,7 @@ public SimpleImmutableEntry(params object[] args) : base(args) { }
 
         #region SimpleImmutableEntry<K, V>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.SimpleImmutableEntry.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/AbstractMap.SimpleImmutableEntry.html"/>
         /// </summary>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
@@ -440,7 +440,7 @@ public SimpleImmutableEntry(params object[] args) : base(args) { }
 
     #region AbstractMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -450,12 +450,12 @@ public partial class AbstractMap<K, V> : Java.Util.Map<K, V>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -488,7 +488,7 @@ public AbstractMap(params object[] args) : base(args) { }
 
     #region AbstractQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractQueue.html"/>
     /// </summary>
     public partial class AbstractQueue : Java.Util.AbstractCollection
     {
@@ -496,12 +496,12 @@ public partial class AbstractQueue : Java.Util.AbstractCollection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractQueue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractQueue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -534,7 +534,7 @@ public AbstractQueue(params object[] args) : base(args) { }
 
     #region AbstractQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class AbstractQueue<E> : Java.Util.AbstractCollection<E>
@@ -543,12 +543,12 @@ public partial class AbstractQueue<E> : Java.Util.AbstractCollection<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractQueue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractQueue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -581,7 +581,7 @@ public AbstractQueue(params object[] args) : base(args) { }
 
     #region AbstractSequentialList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractSequentialList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractSequentialList.html"/>
     /// </summary>
     public partial class AbstractSequentialList : Java.Util.AbstractList
     {
@@ -589,12 +589,12 @@ public partial class AbstractSequentialList : Java.Util.AbstractList
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractSequentialList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSequentialList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSequentialList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractSequentialList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSequentialList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSequentialList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -627,7 +627,7 @@ public AbstractSequentialList(params object[] args) : base(args) { }
 
     #region AbstractSequentialList<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractSequentialList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractSequentialList.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class AbstractSequentialList<E> : Java.Util.AbstractList<E>
@@ -636,12 +636,12 @@ public partial class AbstractSequentialList<E> : Java.Util.AbstractList<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractSequentialList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSequentialList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSequentialList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractSequentialList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSequentialList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSequentialList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -674,7 +674,7 @@ public AbstractSequentialList(params object[] args) : base(args) { }
 
     #region AbstractSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractSet.html"/>
     /// </summary>
     public partial class AbstractSet : Java.Util.AbstractCollection
     {
@@ -682,12 +682,12 @@ public partial class AbstractSet : Java.Util.AbstractCollection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -720,7 +720,7 @@ public AbstractSet(params object[] args) : base(args) { }
 
     #region AbstractSet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/AbstractSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/AbstractSet.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class AbstractSet<E> : Java.Util.AbstractCollection<E>
@@ -729,12 +729,12 @@ public partial class AbstractSet<E> : Java.Util.AbstractCollection<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -767,7 +767,7 @@ public AbstractSet(params object[] args) : base(args) { }
 
     #region ArrayDeque
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html"/>
     /// </summary>
     public partial class ArrayDeque : Java.Util.AbstractCollection
     {
@@ -811,7 +811,7 @@ public ArrayDeque(params object[] args) : base(args) { }
 
     #region ArrayDeque<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class ArrayDeque<E> : Java.Util.AbstractCollection<E>
@@ -856,7 +856,7 @@ public ArrayDeque(params object[] args) : base(args) { }
 
     #region ArrayList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ArrayList.html"/>
     /// </summary>
     public partial class ArrayList : Java.Util.AbstractList
     {
@@ -900,7 +900,7 @@ public ArrayList(params object[] args) : base(args) { }
 
     #region ArrayList<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ArrayList.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class ArrayList<E> : Java.Util.AbstractList<E>
@@ -945,7 +945,7 @@ public ArrayList(params object[] args) : base(args) { }
 
     #region Arrays
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Arrays.html"/>
     /// </summary>
     public partial class Arrays : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Arrays>
     {
@@ -989,7 +989,7 @@ public Arrays(params object[] args) : base(args) { }
 
     #region Base64
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Base64.html"/>
     /// </summary>
     public partial class Base64 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Base64>
     {
@@ -1029,7 +1029,7 @@ public Base64(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Decoder
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Decoder.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Base64.Decoder.html"/>
         /// </summary>
         public partial class Decoder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Decoder>
         {
@@ -1073,7 +1073,7 @@ public Decoder(params object[] args) : base(args) { }
 
         #region Encoder
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Encoder.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Base64.Encoder.html"/>
         /// </summary>
         public partial class Encoder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Encoder>
         {
@@ -1121,7 +1121,7 @@ public Encoder(params object[] args) : base(args) { }
 
     #region BitSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/BitSet.html"/>
     /// </summary>
     public partial class BitSet : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BitSet>
     {
@@ -1165,7 +1165,7 @@ public BitSet(params object[] args) : base(args) { }
 
     #region Calendar
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Calendar.html"/>
     /// </summary>
     public partial class Calendar : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Calendar>
     {
@@ -1173,12 +1173,12 @@ public partial class Calendar : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Calendar
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Calendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Calendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Calendar() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Calendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Calendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Calendar(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1207,7 +1207,7 @@ public Calendar(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Builder
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html"/>
         /// </summary>
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
@@ -1255,7 +1255,7 @@ public Builder(params object[] args) : base(args) { }
 
     #region Collection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Collection.html"/>
     /// </summary>
     public partial class Collection : Java.Lang.Iterable
     {
@@ -1263,12 +1263,12 @@ public partial class Collection : Java.Lang.Iterable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Collection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Collection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1301,7 +1301,7 @@ public Collection(params object[] args) : base(args) { }
 
     #region Collection<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Collection.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class Collection<E> : Java.Lang.Iterable<E>
@@ -1310,12 +1310,12 @@ public partial class Collection<E> : Java.Lang.Iterable<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Collection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Collection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1348,7 +1348,7 @@ public Collection(params object[] args) : base(args) { }
 
     #region Collections
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Collections.html"/>
     /// </summary>
     public partial class Collections : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Collections>
     {
@@ -1392,7 +1392,7 @@ public Collections(params object[] args) : base(args) { }
 
     #region ConcurrentModificationException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ConcurrentModificationException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ConcurrentModificationException.html"/>
     /// </summary>
     public partial class ConcurrentModificationException : Java.Lang.RuntimeException
     {
@@ -1409,7 +1409,7 @@ public partial class ConcurrentModificationException : Java.Lang.RuntimeExceptio
 
     #region Currency
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Currency.html"/>
     /// </summary>
     public partial class Currency : Java.Io.Serializable
     {
@@ -1453,7 +1453,7 @@ public Currency(params object[] args) : base(args) { }
 
     #region Date
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Date.html"/>
     /// </summary>
     public partial class Date : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Date>
     {
@@ -1497,7 +1497,7 @@ public Date(params object[] args) : base(args) { }
 
     #region Deque
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Deque.html"/>
     /// </summary>
     public partial class Deque : Java.Util.Queue
     {
@@ -1505,12 +1505,12 @@ public partial class Deque : Java.Util.Queue
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Deque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Deque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Deque() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Deque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Deque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Deque(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1543,7 +1543,7 @@ public Deque(params object[] args) : base(args) { }
 
     #region Deque<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Deque.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class Deque<E> : Java.Util.Queue<E>
@@ -1552,12 +1552,12 @@ public partial class Deque<E> : Java.Util.Queue<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Deque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Deque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Deque() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Deque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Deque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Deque(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1590,7 +1590,7 @@ public Deque(params object[] args) : base(args) { }
 
     #region Dictionary
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Dictionary.html"/>
     /// </summary>
     public partial class Dictionary : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Dictionary>
     {
@@ -1598,12 +1598,12 @@ public partial class Dictionary : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Dictio
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Dictionary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Dictionary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Dictionary() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Dictionary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Dictionary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Dictionary(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1636,7 +1636,7 @@ public Dictionary(params object[] args) : base(args) { }
 
     #region Dictionary<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Dictionary.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -1646,12 +1646,12 @@ public partial class Dictionary<K, V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Dictionary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Dictionary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Dictionary() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Dictionary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Dictionary class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Dictionary(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1684,7 +1684,7 @@ public Dictionary(params object[] args) : base(args) { }
 
     #region DoubleSummaryStatistics
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html"/>
     /// </summary>
     public partial class DoubleSummaryStatistics : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DoubleSummaryStatistics>
     {
@@ -1728,7 +1728,7 @@ public DoubleSummaryStatistics(params object[] args) : base(args) { }
 
     #region DuplicateFormatFlagsException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/DuplicateFormatFlagsException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/DuplicateFormatFlagsException.html"/>
     /// </summary>
     public partial class DuplicateFormatFlagsException : Java.Util.IllegalFormatException
     {
@@ -1745,7 +1745,7 @@ public partial class DuplicateFormatFlagsException : Java.Util.IllegalFormatExce
 
     #region EmptyStackException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/EmptyStackException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/EmptyStackException.html"/>
     /// </summary>
     public partial class EmptyStackException : Java.Lang.RuntimeException
     {
@@ -1762,7 +1762,7 @@ public partial class EmptyStackException : Java.Lang.RuntimeException
 
     #region Enumeration
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Enumeration.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Enumeration.html"/>
     /// </summary>
     public partial class Enumeration : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Enumeration>
     {
@@ -1770,12 +1770,12 @@ public partial class Enumeration : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Enume
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Enumeration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Enumeration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Enumeration() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Enumeration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Enumeration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Enumeration(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1808,7 +1808,7 @@ public Enumeration(params object[] args) : base(args) { }
 
     #region Enumeration<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Enumeration.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Enumeration.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class Enumeration<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Enumeration<E>>
@@ -1817,12 +1817,12 @@ public partial class Enumeration<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<En
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Enumeration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Enumeration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Enumeration() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Enumeration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Enumeration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Enumeration(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1855,7 +1855,7 @@ public Enumeration(params object[] args) : base(args) { }
 
     #region EnumMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/EnumMap.html"/>
     /// </summary>
     public partial class EnumMap : Java.Util.AbstractMap
     {
@@ -1899,11 +1899,11 @@ public EnumMap(params object[] args) : base(args) { }
 
     #region EnumMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/EnumMap.html"/>
     /// </summary>
     /// <typeparam name="K"><see cref="Java.Lang.Enum{K}"/></typeparam>
     /// <typeparam name="V"></typeparam>
-    public partial class EnumMap<K, V> : Java.Util.AbstractMap<K, V> where K: Java.Lang.Enum<K>
+    public partial class EnumMap<K, V> : Java.Util.AbstractMap<K, V> where K : Java.Lang.Enum<K>
     {
         const string _bridgeClassName = "java.util.EnumMap";
         /// <summary>
@@ -1945,7 +1945,7 @@ public EnumMap(params object[] args) : base(args) { }
 
     #region EnumSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/EnumSet.html"/>
     /// </summary>
     public partial class EnumSet : Java.Util.AbstractSet
     {
@@ -1953,12 +1953,12 @@ public partial class EnumSet : Java.Util.AbstractSet
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EnumSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EnumSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EnumSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EnumSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EnumSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EnumSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1991,21 +1991,21 @@ public EnumSet(params object[] args) : base(args) { }
 
     #region EnumSet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/EnumSet.html"/>
     /// </summary>
     /// <typeparam name="E"><see cref="Java.Lang.Enum{E}"/></typeparam>
-    public partial class EnumSet<E> : Java.Util.AbstractSet<E> where E: Java.Lang.Enum<E>
+    public partial class EnumSet<E> : Java.Util.AbstractSet<E> where E : Java.Lang.Enum<E>
     {
         const string _bridgeClassName = "java.util.EnumSet";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EnumSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EnumSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EnumSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EnumSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EnumSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EnumSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2038,7 +2038,7 @@ public EnumSet(params object[] args) : base(args) { }
 
     #region EventListenerProxy
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/EventListenerProxy.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/EventListenerProxy.html"/>
     /// </summary>
     public partial class EventListenerProxy : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EventListenerProxy>
     {
@@ -2046,12 +2046,12 @@ public partial class EventListenerProxy : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EventListenerProxy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EventListenerProxy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EventListenerProxy() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EventListenerProxy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EventListenerProxy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EventListenerProxy(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2084,21 +2084,21 @@ public EventListenerProxy(params object[] args) : base(args) { }
 
     #region EventListenerProxy<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/EventListenerProxy.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/EventListenerProxy.html"/>
     /// </summary>
     /// <typeparam name="T"><see cref="Java.Util.IEventListener"/></typeparam>
-    public partial class EventListenerProxy<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EventListenerProxy<T>> where T: Java.Util.IEventListener, new()
+    public partial class EventListenerProxy<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EventListenerProxy<T>> where T : Java.Util.IEventListener, new()
     {
         const string _bridgeClassName = "java.util.EventListenerProxy";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EventListenerProxy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EventListenerProxy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EventListenerProxy() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EventListenerProxy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EventListenerProxy class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EventListenerProxy(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2131,7 +2131,7 @@ public EventListenerProxy(params object[] args) : base(args) { }
 
     #region EventObject
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/EventObject.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/EventObject.html"/>
     /// </summary>
     public partial class EventObject : Java.Io.Serializable
     {
@@ -2175,7 +2175,7 @@ public EventObject(params object[] args) : base(args) { }
 
     #region FormatFlagsConversionMismatchException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/FormatFlagsConversionMismatchException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/FormatFlagsConversionMismatchException.html"/>
     /// </summary>
     public partial class FormatFlagsConversionMismatchException : Java.Util.IllegalFormatException
     {
@@ -2192,7 +2192,7 @@ public partial class FormatFlagsConversionMismatchException : Java.Util.IllegalF
 
     #region Formattable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Formattable.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Formattable.html"/>
     /// </summary>
     public partial class Formattable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Formattable>
     {
@@ -2200,12 +2200,12 @@ public partial class Formattable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Forma
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Formattable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Formattable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Formattable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Formattable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Formattable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Formattable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2238,7 +2238,7 @@ public Formattable(params object[] args) : base(args) { }
 
     #region FormattableFlags
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/FormattableFlags.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/FormattableFlags.html"/>
     /// </summary>
     public partial class FormattableFlags : MASES.JCOBridge.C2JBridge.JVMBridgeBase<FormattableFlags>
     {
@@ -2282,7 +2282,7 @@ public FormattableFlags(params object[] args) : base(args) { }
 
     #region Formatter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Formatter.html"/>
     /// </summary>
     public partial class Formatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Formatter>
     {
@@ -2322,7 +2322,7 @@ public Formatter(params object[] args) : base(args) { }
         // TODO: complete the class
         #region BigDecimalLayoutForm
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.BigDecimalLayoutForm.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.BigDecimalLayoutForm.html"/>
         /// </summary>
         public partial class BigDecimalLayoutForm : Java.Lang.Enum<Java.Util.Formatter.BigDecimalLayoutForm>
         {
@@ -2370,7 +2370,7 @@ public BigDecimalLayoutForm(params object[] args) : base(args) { }
 
     #region FormatterClosedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/FormatterClosedException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/FormatterClosedException.html"/>
     /// </summary>
     public partial class FormatterClosedException : Java.Lang.IllegalStateException
     {
@@ -2387,7 +2387,7 @@ public partial class FormatterClosedException : Java.Lang.IllegalStateException
 
     #region GregorianCalendar
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html"/>
     /// </summary>
     public partial class GregorianCalendar : Java.Util.Calendar
     {
@@ -2431,7 +2431,7 @@ public GregorianCalendar(params object[] args) : base(args) { }
 
     #region HashMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/HashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/HashMap.html"/>
     /// </summary>
     public partial class HashMap : Java.Util.AbstractMap
     {
@@ -2475,7 +2475,7 @@ public HashMap(params object[] args) : base(args) { }
 
     #region HashMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/HashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/HashMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -2521,7 +2521,7 @@ public HashMap(params object[] args) : base(args) { }
 
     #region HashSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/HashSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/HashSet.html"/>
     /// </summary>
     public partial class HashSet : Java.Util.AbstractSet
     {
@@ -2565,7 +2565,7 @@ public HashSet(params object[] args) : base(args) { }
 
     #region HashSet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/HashSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/HashSet.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class HashSet<E> : Java.Util.AbstractSet<E>
@@ -2610,7 +2610,7 @@ public HashSet(params object[] args) : base(args) { }
 
     #region Hashtable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Hashtable.html"/>
     /// </summary>
     public partial class Hashtable : Java.Util.Dictionary
     {
@@ -2654,7 +2654,7 @@ public Hashtable(params object[] args) : base(args) { }
 
     #region Hashtable<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Hashtable.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -2698,53 +2698,9 @@ public Hashtable(params object[] args) : base(args) { }
     }
     #endregion
 
-    #region HexFormat
-    /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html"/>
-    /// </summary>
-    public partial class HexFormat : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HexFormat>
-    {
-        const string _bridgeClassName = "java.util.HexFormat";
-        /// <summary>
-        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
-        /// </summary>
-        public HexFormat() { }
-        /// <summary>
-        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
-        /// </summary>
-        public HexFormat(params object[] args) : base(args) { }
-
-        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
-
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
-        /// </summary>
-        public override string BridgeClassName => _bridgeClassName;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
-        /// </summary>
-        public override bool IsBridgeAbstract => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
-        /// </summary>
-        public override bool IsBridgeCloseable => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
-        /// </summary>
-        public override bool IsBridgeInterface => false;
-        /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
-        /// </summary>
-        public override bool IsBridgeStatic => false;
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
     #region IdentityHashMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IdentityHashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IdentityHashMap.html"/>
     /// </summary>
     public partial class IdentityHashMap : Java.Util.AbstractMap
     {
@@ -2788,7 +2744,7 @@ public IdentityHashMap(params object[] args) : base(args) { }
 
     #region IdentityHashMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IdentityHashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IdentityHashMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -2834,7 +2790,7 @@ public IdentityHashMap(params object[] args) : base(args) { }
 
     #region IllegalFormatCodePointException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IllegalFormatCodePointException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IllegalFormatCodePointException.html"/>
     /// </summary>
     public partial class IllegalFormatCodePointException : Java.Util.IllegalFormatException
     {
@@ -2851,7 +2807,7 @@ public partial class IllegalFormatCodePointException : Java.Util.IllegalFormatEx
 
     #region IllegalFormatConversionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IllegalFormatConversionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IllegalFormatConversionException.html"/>
     /// </summary>
     public partial class IllegalFormatConversionException : Java.Util.IllegalFormatException
     {
@@ -2868,7 +2824,7 @@ public partial class IllegalFormatConversionException : Java.Util.IllegalFormatE
 
     #region IllegalFormatException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IllegalFormatException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IllegalFormatException.html"/>
     /// </summary>
     public partial class IllegalFormatException : Java.Lang.IllegalArgumentException
     {
@@ -2885,7 +2841,7 @@ public partial class IllegalFormatException : Java.Lang.IllegalArgumentException
 
     #region IllegalFormatFlagsException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IllegalFormatFlagsException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IllegalFormatFlagsException.html"/>
     /// </summary>
     public partial class IllegalFormatFlagsException : Java.Util.IllegalFormatException
     {
@@ -2902,7 +2858,7 @@ public partial class IllegalFormatFlagsException : Java.Util.IllegalFormatExcept
 
     #region IllegalFormatPrecisionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IllegalFormatPrecisionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IllegalFormatPrecisionException.html"/>
     /// </summary>
     public partial class IllegalFormatPrecisionException : Java.Util.IllegalFormatException
     {
@@ -2919,7 +2875,7 @@ public partial class IllegalFormatPrecisionException : Java.Util.IllegalFormatEx
 
     #region IllegalFormatWidthException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IllegalFormatWidthException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IllegalFormatWidthException.html"/>
     /// </summary>
     public partial class IllegalFormatWidthException : Java.Util.IllegalFormatException
     {
@@ -2936,7 +2892,7 @@ public partial class IllegalFormatWidthException : Java.Util.IllegalFormatExcept
 
     #region IllformedLocaleException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IllformedLocaleException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IllformedLocaleException.html"/>
     /// </summary>
     public partial class IllformedLocaleException : Java.Lang.RuntimeException
     {
@@ -2953,7 +2909,7 @@ public partial class IllformedLocaleException : Java.Lang.RuntimeException
 
     #region InputMismatchException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/InputMismatchException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/InputMismatchException.html"/>
     /// </summary>
     public partial class InputMismatchException : Java.Util.NoSuchElementException
     {
@@ -2970,7 +2926,7 @@ public partial class InputMismatchException : Java.Util.NoSuchElementException
 
     #region IntSummaryStatistics
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html"/>
     /// </summary>
     public partial class IntSummaryStatistics : MASES.JCOBridge.C2JBridge.JVMBridgeBase<IntSummaryStatistics>
     {
@@ -3014,7 +2970,7 @@ public IntSummaryStatistics(params object[] args) : base(args) { }
 
     #region InvalidPropertiesFormatException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/InvalidPropertiesFormatException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/InvalidPropertiesFormatException.html"/>
     /// </summary>
     public partial class InvalidPropertiesFormatException : Java.Io.IOException
     {
@@ -3035,7 +2991,7 @@ public partial class InvalidPropertiesFormatException : Java.Io.IOException
 
     #region LinkedHashMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html"/>
     /// </summary>
     public partial class LinkedHashMap : Java.Util.HashMap
     {
@@ -3079,7 +3035,7 @@ public LinkedHashMap(params object[] args) : base(args) { }
 
     #region LinkedHashMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -3125,7 +3081,7 @@ public LinkedHashMap(params object[] args) : base(args) { }
 
     #region LinkedHashSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/LinkedHashSet.html"/>
     /// </summary>
     public partial class LinkedHashSet : Java.Util.HashSet
     {
@@ -3169,7 +3125,7 @@ public LinkedHashSet(params object[] args) : base(args) { }
 
     #region LinkedHashSet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/LinkedHashSet.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class LinkedHashSet<E> : Java.Util.HashSet<E>
@@ -3214,7 +3170,7 @@ public LinkedHashSet(params object[] args) : base(args) { }
 
     #region LinkedList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/LinkedList.html"/>
     /// </summary>
     public partial class LinkedList : Java.Util.AbstractSequentialList
     {
@@ -3258,7 +3214,7 @@ public LinkedList(params object[] args) : base(args) { }
 
     #region LinkedList<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/LinkedList.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class LinkedList<E> : Java.Util.AbstractSequentialList<E>
@@ -3303,7 +3259,7 @@ public LinkedList(params object[] args) : base(args) { }
 
     #region List
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/List.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/List.html"/>
     /// </summary>
     public partial class List : Java.Util.Collection
     {
@@ -3311,12 +3267,12 @@ public partial class List : Java.Util.Collection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("List class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("List class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public List() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("List class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("List class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public List(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3349,7 +3305,7 @@ public List(params object[] args) : base(args) { }
 
     #region List<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/List.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/List.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class List<E> : Java.Util.Collection<E>
@@ -3358,12 +3314,12 @@ public partial class List<E> : Java.Util.Collection<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("List class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("List class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public List() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("List class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("List class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public List(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3396,7 +3352,7 @@ public List(params object[] args) : base(args) { }
 
     #region ListIterator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ListIterator.html"/>
     /// </summary>
     public partial class ListIterator : Java.Util.Iterator
     {
@@ -3404,12 +3360,12 @@ public partial class ListIterator : Java.Util.Iterator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ListIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ListIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ListIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ListIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ListIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ListIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3442,7 +3398,7 @@ public ListIterator(params object[] args) : base(args) { }
 
     #region ListIterator<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ListIterator.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class ListIterator<E> : Java.Util.Iterator<E>
@@ -3451,12 +3407,12 @@ public partial class ListIterator<E> : Java.Util.Iterator<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ListIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ListIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ListIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ListIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ListIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ListIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3489,7 +3445,7 @@ public ListIterator(params object[] args) : base(args) { }
 
     #region ListResourceBundle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ListResourceBundle.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ListResourceBundle.html"/>
     /// </summary>
     public partial class ListResourceBundle : Java.Util.ResourceBundle
     {
@@ -3497,12 +3453,12 @@ public partial class ListResourceBundle : Java.Util.ResourceBundle
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ListResourceBundle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ListResourceBundle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ListResourceBundle() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ListResourceBundle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ListResourceBundle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ListResourceBundle(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3535,7 +3491,7 @@ public ListResourceBundle(params object[] args) : base(args) { }
 
     #region Locale
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Locale.html"/>
     /// </summary>
     public partial class Locale : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Locale>
     {
@@ -3575,7 +3531,7 @@ public Locale(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Builder
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html"/>
         /// </summary>
         public partial class Builder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Builder>
         {
@@ -3619,7 +3575,7 @@ public Builder(params object[] args) : base(args) { }
 
         #region Category
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Category.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.Category.html"/>
         /// </summary>
         public partial class Category : Java.Lang.Enum<Java.Util.Locale.Category>
         {
@@ -3663,7 +3619,7 @@ public Category(params object[] args) : base(args) { }
 
         #region FilteringMode
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.FilteringMode.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.FilteringMode.html"/>
         /// </summary>
         public partial class FilteringMode : Java.Lang.Enum<Java.Util.Locale.FilteringMode>
         {
@@ -3707,7 +3663,7 @@ public FilteringMode(params object[] args) : base(args) { }
 
         #region IsoCountryCode
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.IsoCountryCode.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.IsoCountryCode.html"/>
         /// </summary>
         public partial class IsoCountryCode : Java.Lang.Enum<Java.Util.Locale.IsoCountryCode>
         {
@@ -3715,12 +3671,12 @@ public partial class IsoCountryCode : Java.Lang.Enum<Java.Util.Locale.IsoCountry
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("IsoCountryCode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IsoCountryCode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IsoCountryCode() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("IsoCountryCode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("IsoCountryCode class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public IsoCountryCode(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3753,7 +3709,7 @@ public IsoCountryCode(params object[] args) : base(args) { }
 
         #region LanguageRange
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html"/>
         /// </summary>
         public partial class LanguageRange : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LanguageRange>
         {
@@ -3801,7 +3757,7 @@ public LanguageRange(params object[] args) : base(args) { }
 
     #region LongSummaryStatistics
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html"/>
     /// </summary>
     public partial class LongSummaryStatistics : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LongSummaryStatistics>
     {
@@ -3845,7 +3801,7 @@ public LongSummaryStatistics(params object[] args) : base(args) { }
 
     #region Map
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Map.html"/>
     /// </summary>
     public partial class Map : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Map>
     {
@@ -3853,12 +3809,12 @@ public partial class Map : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Map>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Map class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Map class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Map() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Map class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Map class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Map(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3887,7 +3843,7 @@ public Map(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Entry
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.Entry.html"/>
         /// </summary>
         public partial class Entry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Entry>
         {
@@ -3895,12 +3851,12 @@ public partial class Entry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Entry>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Entry() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Entry(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3933,7 +3889,7 @@ public Entry(params object[] args) : base(args) { }
 
         #region Entry<K, V>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.Entry.html"/>
         /// </summary>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
@@ -3943,12 +3899,12 @@ public partial class Entry<K, V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Entry
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Entry() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Entry class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Entry(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3985,7 +3941,7 @@ public Entry(params object[] args) : base(args) { }
 
     #region Map<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Map.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -3995,12 +3951,12 @@ public partial class Map<K, V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Map<K,
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Map class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Map class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Map() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Map class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Map class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Map(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4033,7 +3989,7 @@ public Map(params object[] args) : base(args) { }
 
     #region MissingFormatArgumentException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/MissingFormatArgumentException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/MissingFormatArgumentException.html"/>
     /// </summary>
     public partial class MissingFormatArgumentException : Java.Util.IllegalFormatException
     {
@@ -4050,7 +4006,7 @@ public partial class MissingFormatArgumentException : Java.Util.IllegalFormatExc
 
     #region MissingFormatWidthException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/MissingFormatWidthException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/MissingFormatWidthException.html"/>
     /// </summary>
     public partial class MissingFormatWidthException : Java.Util.IllegalFormatException
     {
@@ -4067,7 +4023,7 @@ public partial class MissingFormatWidthException : Java.Util.IllegalFormatExcept
 
     #region MissingResourceException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/MissingResourceException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/MissingResourceException.html"/>
     /// </summary>
     public partial class MissingResourceException : Java.Lang.RuntimeException
     {
@@ -4084,7 +4040,7 @@ public partial class MissingResourceException : Java.Lang.RuntimeException
 
     #region NavigableMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html"/>
     /// </summary>
     public partial class NavigableMap : Java.Util.SortedMap
     {
@@ -4092,12 +4048,12 @@ public partial class NavigableMap : Java.Util.SortedMap
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NavigableMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NavigableMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4130,7 +4086,7 @@ public NavigableMap(params object[] args) : base(args) { }
 
     #region NavigableMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -4140,12 +4096,12 @@ public partial class NavigableMap<K, V> : Java.Util.SortedMap<K, V>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NavigableMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NavigableMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4178,7 +4134,7 @@ public NavigableMap(params object[] args) : base(args) { }
 
     #region NavigableSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html"/>
     /// </summary>
     public partial class NavigableSet : Java.Util.SortedSet
     {
@@ -4186,12 +4142,12 @@ public partial class NavigableSet : Java.Util.SortedSet
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NavigableSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NavigableSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NavigableSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NavigableSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NavigableSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NavigableSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4224,7 +4180,7 @@ public NavigableSet(params object[] args) : base(args) { }
 
     #region NavigableSet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class NavigableSet<E> : Java.Util.SortedSet<E>
@@ -4233,12 +4189,12 @@ public partial class NavigableSet<E> : Java.Util.SortedSet<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NavigableSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NavigableSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NavigableSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NavigableSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NavigableSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NavigableSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4271,7 +4227,7 @@ public NavigableSet(params object[] args) : base(args) { }
 
     #region NoSuchElementException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/NoSuchElementException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/NoSuchElementException.html"/>
     /// </summary>
     public partial class NoSuchElementException : Java.Lang.RuntimeException
     {
@@ -4288,7 +4244,7 @@ public partial class NoSuchElementException : Java.Lang.RuntimeException
 
     #region Objects
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Objects.html"/>
     /// </summary>
     public partial class Objects : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Objects>
     {
@@ -4332,9 +4288,9 @@ public Objects(params object[] args) : base(args) { }
 
     #region Observable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Observable.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Observable.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Observable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Observable>
     {
         const string _bridgeClassName = "java.util.Observable";
@@ -4377,21 +4333,21 @@ public Observable(params object[] args) : base(args) { }
 
     #region Observer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Observer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Observer.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Observer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Observer>
     {
         const string _bridgeClassName = "java.util.Observer";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Observer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Observer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Observer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Observer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Observer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Observer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4424,7 +4380,7 @@ public Observer(params object[] args) : base(args) { }
 
     #region Optional
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Optional.html"/>
     /// </summary>
     public partial class Optional : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Optional>
     {
@@ -4468,7 +4424,7 @@ public Optional(params object[] args) : base(args) { }
 
     #region Optional<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Optional.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Optional<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Optional<T>>
@@ -4513,7 +4469,7 @@ public Optional(params object[] args) : base(args) { }
 
     #region OptionalDouble
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html"/>
     /// </summary>
     public partial class OptionalDouble : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OptionalDouble>
     {
@@ -4557,7 +4513,7 @@ public OptionalDouble(params object[] args) : base(args) { }
 
     #region OptionalInt
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html"/>
     /// </summary>
     public partial class OptionalInt : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OptionalInt>
     {
@@ -4601,7 +4557,7 @@ public OptionalInt(params object[] args) : base(args) { }
 
     #region OptionalLong
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html"/>
     /// </summary>
     public partial class OptionalLong : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OptionalLong>
     {
@@ -4645,7 +4601,7 @@ public OptionalLong(params object[] args) : base(args) { }
 
     #region PrimitiveIterator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.html"/>
     /// </summary>
     public partial class PrimitiveIterator : Java.Util.Iterator
     {
@@ -4653,12 +4609,12 @@ public partial class PrimitiveIterator : Java.Util.Iterator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrimitiveIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrimitiveIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrimitiveIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrimitiveIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrimitiveIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrimitiveIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4687,7 +4643,7 @@ public PrimitiveIterator(params object[] args) : base(args) { }
         // TODO: complete the class
         #region OfDouble
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfDouble.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfDouble.html"/>
         /// </summary>
         public partial class OfDouble : Java.Util.PrimitiveIterator<Java.Lang.Double, Java.Util.Function.DoubleConsumer>
         {
@@ -4695,12 +4651,12 @@ public partial class OfDouble : Java.Util.PrimitiveIterator<Java.Lang.Double, Ja
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OfDouble class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfDouble class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfDouble() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OfDouble class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfDouble class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfDouble(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4733,7 +4689,7 @@ public OfDouble(params object[] args) : base(args) { }
 
         #region OfInt
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfInt.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfInt.html"/>
         /// </summary>
         public partial class OfInt : Java.Util.PrimitiveIterator<Java.Lang.Integer, Java.Util.Function.IntConsumer>
         {
@@ -4741,12 +4697,12 @@ public partial class OfInt : Java.Util.PrimitiveIterator<Java.Lang.Integer, Java
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OfInt class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfInt class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfInt() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OfInt class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfInt class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfInt(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4779,7 +4735,7 @@ public OfInt(params object[] args) : base(args) { }
 
         #region OfLong
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfLong.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfLong.html"/>
         /// </summary>
         public partial class OfLong : Java.Util.PrimitiveIterator<Java.Lang.Long, Java.Util.Function.LongConsumer>
         {
@@ -4787,12 +4743,12 @@ public partial class OfLong : Java.Util.PrimitiveIterator<Java.Lang.Long, Java.U
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OfLong class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfLong class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfLong() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OfLong class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfLong class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfLong(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4829,7 +4785,7 @@ public OfLong(params object[] args) : base(args) { }
 
     #region PrimitiveIterator<T, T_CONS>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="T_CONS"></typeparam>
@@ -4839,12 +4795,12 @@ public partial class PrimitiveIterator<T, T_CONS> : Java.Util.Iterator<T>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PrimitiveIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrimitiveIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrimitiveIterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PrimitiveIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PrimitiveIterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PrimitiveIterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4877,7 +4833,7 @@ public PrimitiveIterator(params object[] args) : base(args) { }
 
     #region PriorityQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html"/>
     /// </summary>
     public partial class PriorityQueue : Java.Util.AbstractQueue
     {
@@ -4921,7 +4877,7 @@ public PriorityQueue(params object[] args) : base(args) { }
 
     #region PriorityQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class PriorityQueue<E> : Java.Util.AbstractQueue<E>
@@ -4966,7 +4922,7 @@ public PriorityQueue(params object[] args) : base(args) { }
 
     #region Properties
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Properties.html"/>
     /// </summary>
     public partial class Properties : Java.Util.Hashtable<object, object>
     {
@@ -5010,7 +4966,7 @@ public Properties(params object[] args) : base(args) { }
 
     #region PropertyPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/PropertyPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/PropertyPermission.html"/>
     /// </summary>
     public partial class PropertyPermission : Java.Security.BasicPermission
     {
@@ -5054,7 +5010,7 @@ public PropertyPermission(params object[] args) : base(args) { }
 
     #region PropertyResourceBundle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/PropertyResourceBundle.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/PropertyResourceBundle.html"/>
     /// </summary>
     public partial class PropertyResourceBundle : Java.Util.ResourceBundle
     {
@@ -5098,7 +5054,7 @@ public PropertyResourceBundle(params object[] args) : base(args) { }
 
     #region Queue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Queue.html"/>
     /// </summary>
     public partial class Queue : Java.Util.Collection
     {
@@ -5106,12 +5062,12 @@ public partial class Queue : Java.Util.Collection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Queue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Queue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Queue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Queue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Queue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Queue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5144,7 +5100,7 @@ public Queue(params object[] args) : base(args) { }
 
     #region Queue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Queue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class Queue<E> : Java.Util.Collection<E>
@@ -5153,12 +5109,12 @@ public partial class Queue<E> : Java.Util.Collection<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Queue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Queue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Queue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Queue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Queue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Queue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5191,9 +5147,9 @@ public Queue(params object[] args) : base(args) { }
 
     #region Random
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Random.html"/>
     /// </summary>
-    public partial class Random : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Random>
+    public partial class Random : Java.Io.Serializable
     {
         const string _bridgeClassName = "java.util.Random";
         /// <summary>
@@ -5235,7 +5191,7 @@ public Random(params object[] args) : base(args) { }
 
     #region RandomAccess
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/RandomAccess.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/RandomAccess.html"/>
     /// </summary>
     public partial class RandomAccess : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RandomAccess>
     {
@@ -5243,12 +5199,12 @@ public partial class RandomAccess : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Rand
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RandomAccess class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RandomAccess class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RandomAccess() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RandomAccess class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RandomAccess class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RandomAccess(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5281,7 +5237,7 @@ public RandomAccess(params object[] args) : base(args) { }
 
     #region ResourceBundle
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html"/>
     /// </summary>
     public partial class ResourceBundle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ResourceBundle>
     {
@@ -5289,12 +5245,12 @@ public partial class ResourceBundle : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Re
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ResourceBundle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResourceBundle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResourceBundle() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ResourceBundle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ResourceBundle class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ResourceBundle(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5323,7 +5279,7 @@ public ResourceBundle(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Control
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html"/>
         /// </summary>
         public partial class Control : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Control>
         {
@@ -5371,7 +5327,7 @@ public Control(params object[] args) : base(args) { }
 
     #region Scanner
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Scanner.html"/>
     /// </summary>
     public partial class Scanner : Java.Util.Iterator<Java.Lang.String>
     {
@@ -5415,7 +5371,7 @@ public Scanner(params object[] args) : base(args) { }
 
     #region ServiceConfigurationError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceConfigurationError.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ServiceConfigurationError.html"/>
     /// </summary>
     public partial class ServiceConfigurationError : Java.Lang.Error
     {
@@ -5432,7 +5388,7 @@ public partial class ServiceConfigurationError : Java.Lang.Error
 
     #region ServiceLoader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html"/>
     /// </summary>
     public partial class ServiceLoader : Java.Lang.Iterable
     {
@@ -5476,7 +5432,7 @@ public ServiceLoader(params object[] args) : base(args) { }
 
     #region ServiceLoader<S>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html"/>
     /// </summary>
     /// <typeparam name="S"></typeparam>
     public partial class ServiceLoader<S> : Java.Lang.Iterable<S>
@@ -5521,7 +5477,7 @@ public ServiceLoader(params object[] args) : base(args) { }
 
     #region Set
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Set.html"/>
     /// </summary>
     public partial class Set : Java.Util.Collection
     {
@@ -5529,12 +5485,12 @@ public partial class Set : Java.Util.Collection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Set class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Set class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Set() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Set class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Set class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Set(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5567,7 +5523,7 @@ public Set(params object[] args) : base(args) { }
 
     #region Set<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Set.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class Set<E> : Java.Util.Collection<E>
@@ -5576,12 +5532,12 @@ public partial class Set<E> : Java.Util.Collection<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Set class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Set class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Set() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Set class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Set class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Set(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5614,7 +5570,7 @@ public Set(params object[] args) : base(args) { }
 
     #region SimpleTimeZone
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html"/>
     /// </summary>
     public partial class SimpleTimeZone : Java.Util.TimeZone
     {
@@ -5658,7 +5614,7 @@ public SimpleTimeZone(params object[] args) : base(args) { }
 
     #region SortedMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/SortedMap.html"/>
     /// </summary>
     public partial class SortedMap : Java.Util.Map
     {
@@ -5666,12 +5622,12 @@ public partial class SortedMap : Java.Util.Map
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SortedMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SortedMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SortedMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SortedMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SortedMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SortedMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5704,7 +5660,7 @@ public SortedMap(params object[] args) : base(args) { }
 
     #region SortedMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/SortedMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -5714,12 +5670,12 @@ public partial class SortedMap<K, V> : Java.Util.Map<K, V>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SortedMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SortedMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SortedMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SortedMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SortedMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SortedMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5752,7 +5708,7 @@ public SortedMap(params object[] args) : base(args) { }
 
     #region SortedSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/SortedSet.html"/>
     /// </summary>
     public partial class SortedSet : Java.Util.Set
     {
@@ -5760,12 +5716,12 @@ public partial class SortedSet : Java.Util.Set
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SortedSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SortedSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SortedSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SortedSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SortedSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SortedSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5798,7 +5754,7 @@ public SortedSet(params object[] args) : base(args) { }
 
     #region SortedSet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/SortedSet.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class SortedSet<E> : Java.Util.Set<E>
@@ -5807,12 +5763,12 @@ public partial class SortedSet<E> : Java.Util.Set<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SortedSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SortedSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SortedSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SortedSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SortedSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SortedSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5845,7 +5801,7 @@ public SortedSet(params object[] args) : base(args) { }
 
     #region Spliterator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Spliterator.html"/>
     /// </summary>
     public partial class Spliterator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Spliterator>
     {
@@ -5853,12 +5809,12 @@ public partial class Spliterator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Split
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Spliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Spliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Spliterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Spliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Spliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Spliterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5887,7 +5843,7 @@ public Spliterator(params object[] args) : base(args) { }
         // TODO: complete the class
         #region OfDouble
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfDouble.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfDouble.html"/>
         /// </summary>
         public partial class OfDouble : Java.Util.Spliterator.OfPrimitive<Java.Lang.Double, Java.Util.Function.DoubleConsumer, Java.Util.Spliterator.OfDouble>
         {
@@ -5895,12 +5851,12 @@ public partial class OfDouble : Java.Util.Spliterator.OfPrimitive<Java.Lang.Doub
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OfDouble class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfDouble class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfDouble() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OfDouble class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfDouble class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfDouble(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5933,7 +5889,7 @@ public OfDouble(params object[] args) : base(args) { }
 
         #region OfInt
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfInt.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfInt.html"/>
         /// </summary>
         public partial class OfInt : Java.Util.Spliterator.OfPrimitive<Java.Lang.Integer, Java.Util.Function.IntConsumer, Java.Util.Spliterator.OfInt>
         {
@@ -5941,12 +5897,12 @@ public partial class OfInt : Java.Util.Spliterator.OfPrimitive<Java.Lang.Integer
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OfInt class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfInt class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfInt() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OfInt class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfInt class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfInt(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -5979,7 +5935,7 @@ public OfInt(params object[] args) : base(args) { }
 
         #region OfLong
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfLong.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfLong.html"/>
         /// </summary>
         public partial class OfLong : Java.Util.Spliterator.OfPrimitive<Java.Lang.Long, Java.Util.Function.LongConsumer, Java.Util.Spliterator.OfLong>
         {
@@ -5987,12 +5943,12 @@ public partial class OfLong : Java.Util.Spliterator.OfPrimitive<Java.Lang.Long,
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OfLong class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfLong class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfLong() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OfLong class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfLong class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfLong(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6025,7 +5981,7 @@ public OfLong(params object[] args) : base(args) { }
 
         #region OfPrimitive
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfPrimitive.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfPrimitive.html"/>
         /// </summary>
         public partial class OfPrimitive : Java.Util.Spliterator
         {
@@ -6033,12 +5989,12 @@ public partial class OfPrimitive : Java.Util.Spliterator
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OfPrimitive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfPrimitive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfPrimitive() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OfPrimitive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfPrimitive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfPrimitive(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6071,23 +6027,23 @@ public OfPrimitive(params object[] args) : base(args) { }
 
         #region OfPrimitive<T, T_CONS, T_SPLITR>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfPrimitive.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfPrimitive.html"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="T_CONS"></typeparam>
         /// <typeparam name="T_SPLITR"><see cref="Java.Util.Spliterator.OfPrimitive{T, T_CONS, T_SPLITR}"/></typeparam>
-        public partial class OfPrimitive<T, T_CONS, T_SPLITR> : Java.Util.Spliterator<T> where T_SPLITR: Java.Util.Spliterator.OfPrimitive<T, T_CONS, T_SPLITR>
+        public partial class OfPrimitive<T, T_CONS, T_SPLITR> : Java.Util.Spliterator<T> where T_SPLITR : Java.Util.Spliterator.OfPrimitive<T, T_CONS, T_SPLITR>
         {
             const string _bridgeClassName = "java.util.Spliterator$OfPrimitive";
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("OfPrimitive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfPrimitive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfPrimitive() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("OfPrimitive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("OfPrimitive class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public OfPrimitive(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6124,7 +6080,7 @@ public OfPrimitive(params object[] args) : base(args) { }
 
     #region Spliterator<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Spliterator.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Spliterator<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Spliterator<T>>
@@ -6133,12 +6089,12 @@ public partial class Spliterator<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sp
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Spliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Spliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Spliterator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Spliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Spliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Spliterator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6171,7 +6127,7 @@ public Spliterator(params object[] args) : base(args) { }
 
     #region Spliterators
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Spliterators.html"/>
     /// </summary>
     public partial class Spliterators : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Spliterators>
     {
@@ -6211,7 +6167,7 @@ public Spliterators(params object[] args) : base(args) { }
         // TODO: complete the class
         #region AbstractDoubleSpliterator
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractDoubleSpliterator.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractDoubleSpliterator.html"/>
         /// </summary>
         public partial class AbstractDoubleSpliterator : Java.Util.Spliterator.OfDouble
         {
@@ -6219,12 +6175,12 @@ public partial class AbstractDoubleSpliterator : Java.Util.Spliterator.OfDouble
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AbstractDoubleSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractDoubleSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractDoubleSpliterator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AbstractDoubleSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractDoubleSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractDoubleSpliterator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6257,7 +6213,7 @@ public AbstractDoubleSpliterator(params object[] args) : base(args) { }
 
         #region AbstractIntSpliterator
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractIntSpliterator.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractIntSpliterator.html"/>
         /// </summary>
         public partial class AbstractIntSpliterator : Java.Util.Spliterator.OfInt
         {
@@ -6265,12 +6221,12 @@ public partial class AbstractIntSpliterator : Java.Util.Spliterator.OfInt
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AbstractIntSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractIntSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractIntSpliterator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AbstractIntSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractIntSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractIntSpliterator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6303,7 +6259,7 @@ public AbstractIntSpliterator(params object[] args) : base(args) { }
 
         #region AbstractLongSpliterator
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractLongSpliterator.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractLongSpliterator.html"/>
         /// </summary>
         public partial class AbstractLongSpliterator : Java.Util.Spliterator.OfLong
         {
@@ -6311,12 +6267,12 @@ public partial class AbstractLongSpliterator : Java.Util.Spliterator.OfLong
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AbstractLongSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractLongSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractLongSpliterator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AbstractLongSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractLongSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractLongSpliterator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6349,7 +6305,7 @@ public AbstractLongSpliterator(params object[] args) : base(args) { }
 
         #region AbstractSpliterator
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractSpliterator.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractSpliterator.html"/>
         /// </summary>
         public partial class AbstractSpliterator : Java.Util.Spliterator
         {
@@ -6357,12 +6313,12 @@ public partial class AbstractSpliterator : Java.Util.Spliterator
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AbstractSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractSpliterator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AbstractSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractSpliterator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6395,7 +6351,7 @@ public AbstractSpliterator(params object[] args) : base(args) { }
 
         #region AbstractSpliterator<T>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractSpliterator.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractSpliterator.html"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         public partial class AbstractSpliterator<T> : Java.Util.Spliterator<T>
@@ -6404,12 +6360,12 @@ public partial class AbstractSpliterator<T> : Java.Util.Spliterator<T>
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AbstractSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractSpliterator() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AbstractSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AbstractSpliterator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AbstractSpliterator(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6446,7 +6402,7 @@ public AbstractSpliterator(params object[] args) : base(args) { }
 
     #region SplittableRandom
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html"/>
     /// </summary>
     public partial class SplittableRandom : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SplittableRandom>
     {
@@ -6490,7 +6446,7 @@ public SplittableRandom(params object[] args) : base(args) { }
 
     #region Stack
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Stack.html"/>
     /// </summary>
     public partial class Stack : Java.Util.Vector
     {
@@ -6534,7 +6490,7 @@ public Stack(params object[] args) : base(args) { }
 
     #region Stack<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Stack.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class Stack<E> : Java.Util.Vector<E>
@@ -6579,7 +6535,7 @@ public Stack(params object[] args) : base(args) { }
 
     #region StringJoiner
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/StringJoiner.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/StringJoiner.html"/>
     /// </summary>
     public partial class StringJoiner : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StringJoiner>
     {
@@ -6623,7 +6579,7 @@ public StringJoiner(params object[] args) : base(args) { }
 
     #region StringTokenizer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html"/>
     /// </summary>
     public partial class StringTokenizer : Java.Util.Enumeration<object>
     {
@@ -6667,7 +6623,7 @@ public StringTokenizer(params object[] args) : base(args) { }
 
     #region Timer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Timer.html"/>
     /// </summary>
     public partial class Timer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Timer>
     {
@@ -6711,7 +6667,7 @@ public Timer(params object[] args) : base(args) { }
 
     #region TimerTask
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/TimerTask.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/TimerTask.html"/>
     /// </summary>
     public partial class TimerTask : Java.Lang.Runnable
     {
@@ -6719,12 +6675,12 @@ public partial class TimerTask : Java.Lang.Runnable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TimerTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimerTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimerTask() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TimerTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimerTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimerTask(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6757,7 +6713,7 @@ public TimerTask(params object[] args) : base(args) { }
 
     #region TimeZone
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/TimeZone.html"/>
     /// </summary>
     public partial class TimeZone : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TimeZone>
     {
@@ -6765,12 +6721,12 @@ public partial class TimeZone : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TimeZone
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TimeZone class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeZone class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeZone() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TimeZone class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TimeZone class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TimeZone(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -6803,7 +6759,7 @@ public TimeZone(params object[] args) : base(args) { }
 
     #region TooManyListenersException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/TooManyListenersException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/TooManyListenersException.html"/>
     /// </summary>
     public partial class TooManyListenersException : Java.Lang.Exception
     {
@@ -6820,7 +6776,7 @@ public partial class TooManyListenersException : Java.Lang.Exception
 
     #region TreeMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/TreeMap.html"/>
     /// </summary>
     public partial class TreeMap : Java.Util.AbstractMap
     {
@@ -6864,7 +6820,7 @@ public TreeMap(params object[] args) : base(args) { }
 
     #region TreeMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/TreeMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -6910,7 +6866,7 @@ public TreeMap(params object[] args) : base(args) { }
 
     #region TreeSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/TreeSet.html"/>
     /// </summary>
     public partial class TreeSet : Java.Util.AbstractSet
     {
@@ -6954,7 +6910,7 @@ public TreeSet(params object[] args) : base(args) { }
 
     #region TreeSet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/TreeSet.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class TreeSet<E> : Java.Util.AbstractSet<E>
@@ -6999,7 +6955,7 @@ public TreeSet(params object[] args) : base(args) { }
 
     #region UnknownFormatConversionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/UnknownFormatConversionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/UnknownFormatConversionException.html"/>
     /// </summary>
     public partial class UnknownFormatConversionException : Java.Util.IllegalFormatException
     {
@@ -7016,7 +6972,7 @@ public partial class UnknownFormatConversionException : Java.Util.IllegalFormatE
 
     #region UnknownFormatFlagsException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/UnknownFormatFlagsException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/UnknownFormatFlagsException.html"/>
     /// </summary>
     public partial class UnknownFormatFlagsException : Java.Util.IllegalFormatException
     {
@@ -7033,7 +6989,7 @@ public partial class UnknownFormatFlagsException : Java.Util.IllegalFormatExcept
 
     #region UUID
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/UUID.html"/>
     /// </summary>
     public partial class UUID : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UUID>
     {
@@ -7077,7 +7033,7 @@ public UUID(params object[] args) : base(args) { }
 
     #region Vector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Vector.html"/>
     /// </summary>
     public partial class Vector : Java.Util.AbstractList
     {
@@ -7121,7 +7077,7 @@ public Vector(params object[] args) : base(args) { }
 
     #region Vector<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/Vector.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class Vector<E> : Java.Util.AbstractList<E>
@@ -7166,7 +7122,7 @@ public Vector(params object[] args) : base(args) { }
 
     #region WeakHashMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/WeakHashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/WeakHashMap.html"/>
     /// </summary>
     public partial class WeakHashMap : Java.Util.AbstractMap
     {
@@ -7210,7 +7166,7 @@ public WeakHashMap(params object[] args) : base(args) { }
 
     #region WeakHashMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/WeakHashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/WeakHashMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
diff --git a/src/net/Netdroid/Generated/Java/Util/ArrayDeque.cs b/src/net/Netdroid/Generated/Java/Util/ArrayDeque.cs
index 5386451c6..61b839e75 100644
--- a/src/net/Netdroid/Generated/Java/Util/ArrayDeque.cs
+++ b/src/net/Netdroid/Generated/Java/Util/ArrayDeque.cs
@@ -30,7 +30,7 @@ public partial class ArrayDeque
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ArrayDeque(int arg0)
@@ -38,7 +38,7 @@ public ArrayDeque(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ArrayDeque(Java.Util.Collection arg0)
@@ -74,21 +74,7 @@ public ArrayDeque(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#getFirst()"/> 
-        /// </summary>
-        public object First
-        {
-            get { return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#getLast()"/> 
-        /// </summary>
-        public object Last
-        {
-            get { return IExecuteWithSignature("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -97,7 +83,7 @@ public bool Offer(object arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -106,7 +92,7 @@ public bool OfferFirst(object arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -115,7 +101,7 @@ public bool OfferLast(object arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -124,7 +110,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -133,7 +119,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#element()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Element()
@@ -141,7 +127,23 @@ public object Element()
             return IExecuteWithSignature("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#getFirst()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetFirst()
+        {
+            return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#getLast()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetLast()
+        {
+            return IExecuteWithSignature("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#peek()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Peek()
@@ -149,7 +151,7 @@ public object Peek()
             return IExecuteWithSignature("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#peekFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekFirst()
@@ -157,7 +159,7 @@ public object PeekFirst()
             return IExecuteWithSignature("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#peekLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekLast()
@@ -165,7 +167,7 @@ public object PeekLast()
             return IExecuteWithSignature("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#poll()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Poll()
@@ -173,7 +175,7 @@ public object Poll()
             return IExecuteWithSignature("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#pollFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollFirst()
@@ -181,7 +183,7 @@ public object PollFirst()
             return IExecuteWithSignature("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#pollLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollLast()
@@ -189,7 +191,7 @@ public object PollLast()
             return IExecuteWithSignature("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#pop()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Pop()
@@ -197,7 +199,7 @@ public object Pop()
             return IExecuteWithSignature("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#remove()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Remove()
@@ -205,7 +207,7 @@ public object Remove()
             return IExecuteWithSignature("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#removeFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveFirst()
@@ -213,7 +215,7 @@ public object RemoveFirst()
             return IExecuteWithSignature("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#removeLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveLast()
@@ -221,7 +223,7 @@ public object RemoveLast()
             return IExecuteWithSignature("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.ArrayDeque"/></returns>
         public Java.Util.ArrayDeque Clone()
@@ -229,7 +231,7 @@ public Java.Util.ArrayDeque Clone()
             return IExecuteWithSignature<Java.Util.ArrayDeque>("clone", "()Ljava/util/ArrayDeque;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator DescendingIterator()
@@ -237,7 +239,7 @@ public Java.Util.Iterator DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddFirst(object arg0)
@@ -245,7 +247,7 @@ public void AddFirst(object arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddLast(object arg0)
@@ -253,7 +255,7 @@ public void AddLast(object arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Push(object arg0)
@@ -276,7 +278,7 @@ public partial class ArrayDeque<E> : Java.Util.IDeque<E>, Java.Lang.ICloneable,
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ArrayDeque(int arg0)
@@ -284,7 +286,7 @@ public ArrayDeque(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ArrayDeque(Java.Util.Collection<E> arg0)
@@ -324,21 +326,7 @@ public ArrayDeque(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#getFirst()"/> 
-        /// </summary>
-        public E First
-        {
-            get { return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#getLast()"/> 
-        /// </summary>
-        public E Last
-        {
-            get { return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -347,7 +335,7 @@ public bool Offer(E arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -356,7 +344,7 @@ public bool OfferFirst(E arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -365,7 +353,7 @@ public bool OfferLast(E arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -374,7 +362,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -383,7 +371,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#element()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Element()
@@ -391,7 +379,23 @@ public E Element()
             return IExecuteWithSignature<E>("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#getFirst()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetFirst()
+        {
+            return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#getLast()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetLast()
+        {
+            return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#peek()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Peek()
@@ -399,7 +403,7 @@ public E Peek()
             return IExecuteWithSignature<E>("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#peekFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekFirst()
@@ -407,7 +411,7 @@ public E PeekFirst()
             return IExecuteWithSignature<E>("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#peekLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekLast()
@@ -415,7 +419,7 @@ public E PeekLast()
             return IExecuteWithSignature<E>("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#poll()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Poll()
@@ -423,7 +427,7 @@ public E Poll()
             return IExecuteWithSignature<E>("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#pollFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollFirst()
@@ -431,7 +435,7 @@ public E PollFirst()
             return IExecuteWithSignature<E>("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#pollLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollLast()
@@ -439,7 +443,7 @@ public E PollLast()
             return IExecuteWithSignature<E>("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#pop()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Pop()
@@ -447,7 +451,7 @@ public E Pop()
             return IExecuteWithSignature<E>("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#remove()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Remove()
@@ -455,7 +459,7 @@ public E Remove()
             return IExecuteWithSignature<E>("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#removeFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveFirst()
@@ -463,7 +467,7 @@ public E RemoveFirst()
             return IExecuteWithSignature<E>("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#removeLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveLast()
@@ -471,7 +475,7 @@ public E RemoveLast()
             return IExecuteWithSignature<E>("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.ArrayDeque"/></returns>
         public Java.Util.ArrayDeque<E> Clone()
@@ -479,7 +483,7 @@ public Java.Util.ArrayDeque<E> Clone()
             return IExecuteWithSignature<Java.Util.ArrayDeque<E>>("clone", "()Ljava/util/ArrayDeque;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> DescendingIterator()
@@ -487,7 +491,7 @@ public Java.Util.Iterator<E> DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddFirst(E arg0)
@@ -495,7 +499,7 @@ public void AddFirst(E arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddLast(E arg0)
@@ -503,7 +507,7 @@ public void AddLast(E arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayDeque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayDeque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Push(E arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/ArrayList.cs b/src/net/Netdroid/Generated/Java/Util/ArrayList.cs
index 47e3cefdc..cecd6879f 100644
--- a/src/net/Netdroid/Generated/Java/Util/ArrayList.cs
+++ b/src/net/Netdroid/Generated/Java/Util/ArrayList.cs
@@ -30,7 +30,7 @@ public partial class ArrayList
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayList.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ArrayList(int arg0)
@@ -38,7 +38,7 @@ public ArrayList(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayList.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ArrayList(Java.Util.Collection arg0)
@@ -74,7 +74,7 @@ public ArrayList(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html#ensureCapacity(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayList.html#ensureCapacity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void EnsureCapacity(int arg0)
@@ -82,7 +82,7 @@ public void EnsureCapacity(int arg0)
             IExecuteWithSignature("ensureCapacity", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html#trimToSize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayList.html#trimToSize()"/>
         /// </summary>
         public void TrimToSize()
         {
@@ -104,7 +104,7 @@ public partial class ArrayList<E> : Java.Util.IList<E>, Java.Util.IRandomAccess,
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayList.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ArrayList(int arg0)
@@ -112,7 +112,7 @@ public ArrayList(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayList.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ArrayList(Java.Util.Collection<E> arg0)
@@ -152,7 +152,7 @@ public ArrayList(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html#ensureCapacity(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayList.html#ensureCapacity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void EnsureCapacity(int arg0)
@@ -160,7 +160,7 @@ public void EnsureCapacity(int arg0)
             IExecuteWithSignature("ensureCapacity", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ArrayList.html#trimToSize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ArrayList.html#trimToSize()"/>
         /// </summary>
         public void TrimToSize()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Arrays.cs b/src/net/Netdroid/Generated/Java/Util/Arrays.cs
index efc292984..278f64d15 100644
--- a/src/net/Netdroid/Generated/Java/Util/Arrays.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Arrays.cs
@@ -42,53 +42,7 @@ public partial class Arrays
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(java.lang.Comparable[],int,int,java.lang.Comparable[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><typeparamref name="T"/></param>
-        /// <param name="arg4"><see cref="int"/></param>
-        /// <param name="arg5"><see cref="int"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="int"/></returns>
-        public static int Compare<T>(T[] arg0, int arg1, int arg2, T[] arg3, int arg4, int arg5)
-        {
-            return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(java.lang.Comparable[],java.lang.Comparable[])"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><typeparamref name="T"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="int"/></returns>
-        public static int Compare<T>(T[] arg0, T[] arg1)
-        {
-            return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(java.lang.Comparable[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <typeparam name="T"></typeparam>
-        public static void ParallelSort<T>(T[] arg0, int arg1, int arg2)
-        {
-            SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(java.lang.Comparable[])"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="T"/></param>
-        /// <typeparam name="T"></typeparam>
-        public static void ParallelSort<T>(T[] arg0)
-        {
-            SExecuteWithSignature(LocalBridgeClazz, "parallelSort", "([Ljava/lang/Comparable;)V", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(java.lang.Object[],int,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(java.lang.Object[],int,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="U"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -101,7 +55,7 @@ public static T[] CopyOf<T, U>(U[] arg0, int arg1, Java.Lang.Class arg2)
             return SExecuteArray<T>(LocalBridgeClazz, "copyOf", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(java.lang.Object[],int,int,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(java.lang.Object[],int,int,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="U"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -115,7 +69,33 @@ public static T[] CopyOfRange<T, U>(U[] arg0, int arg1, int arg2, Java.Lang.Clas
             return SExecuteArray<T>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#asList(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(java.lang.Comparable[],int,int,java.lang.Comparable[],int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><typeparamref name="T"/></param>
+        /// <param name="arg4"><see cref="int"/></param>
+        /// <param name="arg5"><see cref="int"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><see cref="int"/></returns>
+        public static int Compare<T>(T[] arg0, int arg1, int arg2, T[] arg3, int arg4, int arg5)
+        {
+            return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(java.lang.Comparable[],java.lang.Comparable[])"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><typeparamref name="T"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><see cref="int"/></returns>
+        public static int Compare<T>(T[] arg0, T[] arg1)
+        {
+            return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#asList(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -125,7 +105,7 @@ public static Java.Util.List<T> AsList<T>(params T[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.List<T>>(LocalBridgeClazz, "asList", "([Ljava/lang/Object;)Ljava/util/List;"); else return SExecuteWithSignature<Java.Util.List<T>>(LocalBridgeClazz, "asList", "([Ljava/lang/Object;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#spliterator(java.lang.Object[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#spliterator(java.lang.Object[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -137,7 +117,7 @@ public static Java.Util.Spliterator<T> Spliterator<T>(T[] arg0, int arg1, int ar
             return SExecute<Java.Util.Spliterator<T>>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#spliterator(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#spliterator(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -147,7 +127,7 @@ public static Java.Util.Spliterator<T> Spliterator<T>(T[] arg0)
             return SExecuteWithSignature<Java.Util.Spliterator<T>>(LocalBridgeClazz, "spliterator", "([Ljava/lang/Object;)Ljava/util/Spliterator;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#stream(java.lang.Object[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#stream(java.lang.Object[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -159,7 +139,7 @@ public static Java.Util.Stream.Stream<T> Stream<T>(T[] arg0, int arg1, int arg2)
             return SExecute<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "stream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#stream(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#stream(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -169,7 +149,7 @@ public static Java.Util.Stream.Stream<T> Stream<T>(T[] arg0)
             return SExecuteWithSignature<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "stream", "([Ljava/lang/Object;)Ljava/util/stream/Stream;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(java.lang.Object[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(java.lang.Object[],int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -180,7 +160,7 @@ public static T[] CopyOf<T>(T[] arg0, int arg1)
             return SExecuteArray<T>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(java.lang.Object[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(java.lang.Object[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -192,7 +172,7 @@ public static T[] CopyOfRange<T>(T[] arg0, int arg1, int arg2)
             return SExecuteArray<T>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelPrefix(java.lang.Object[],int,int,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelPrefix(java.lang.Object[],int,int,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -204,7 +184,7 @@ public static void ParallelPrefix<T>(T[] arg0, int arg1, int arg2, Java.Util.Fun
             SExecute(LocalBridgeClazz, "parallelPrefix", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelPrefix(java.lang.Object[],java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelPrefix(java.lang.Object[],java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BinaryOperator"/></param>
@@ -214,29 +194,49 @@ public static void ParallelPrefix<T>(T[] arg0, Java.Util.Function.BinaryOperator
             SExecute(LocalBridgeClazz, "parallelPrefix", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSetAll(java.lang.Object[],java.util.function.IntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSetAll(java.lang.Object[],java.util.function.IntFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg1ExtendsT"><typeparamref name="T"/></typeparam>
-        public static void ParallelSetAll<T, Arg1ExtendsT>(T[] arg0, Java.Util.Function.IntFunction<Arg1ExtendsT> arg1) where Arg1ExtendsT: T
+        public static void ParallelSetAll<T, Arg1ExtendsT>(T[] arg0, Java.Util.Function.IntFunction<Arg1ExtendsT> arg1) where Arg1ExtendsT : T
         {
             SExecute(LocalBridgeClazz, "parallelSetAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#setAll(java.lang.Object[],java.util.function.IntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(java.lang.Comparable[],int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <typeparam name="T"></typeparam>
+        public static void ParallelSort<T>(T[] arg0, int arg1, int arg2)
+        {
+            SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(java.lang.Comparable[])"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="T"/></param>
+        /// <typeparam name="T"></typeparam>
+        public static void ParallelSort<T>(T[] arg0)
+        {
+            SExecute(LocalBridgeClazz, "parallelSort", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#setAll(java.lang.Object[],java.util.function.IntFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg1ExtendsT"><typeparamref name="T"/></typeparam>
-        public static void SetAll<T, Arg1ExtendsT>(T[] arg0, Java.Util.Function.IntFunction<Arg1ExtendsT> arg1) where Arg1ExtendsT: T
+        public static void SetAll<T, Arg1ExtendsT>(T[] arg0, Java.Util.Function.IntFunction<Arg1ExtendsT> arg1) where Arg1ExtendsT : T
         {
             SExecute(LocalBridgeClazz, "setAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#deepEquals(java.lang.Object[],java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#deepEquals(java.lang.Object[],java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -246,7 +246,7 @@ public static bool DeepEquals(object[] arg0, object[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "deepEquals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(boolean[],boolean[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(boolean[],boolean[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -256,7 +256,7 @@ public static bool Equals(bool[] arg0, bool[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(boolean[],int,int,boolean[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(boolean[],int,int,boolean[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -270,7 +270,7 @@ public static bool Equals(bool[] arg0, int arg1, int arg2, bool[] arg3, int arg4
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(byte[],byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(byte[],byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -280,7 +280,7 @@ public static bool Equals(byte[] arg0, byte[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(byte[],int,int,byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(byte[],int,int,byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -294,7 +294,7 @@ public static bool Equals(byte[] arg0, int arg1, int arg2, byte[] arg3, int arg4
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(char[],char[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(char[],char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -304,7 +304,7 @@ public static bool Equals(char[] arg0, char[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(char[],int,int,char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(char[],int,int,char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -318,7 +318,7 @@ public static bool Equals(char[] arg0, int arg1, int arg2, char[] arg3, int arg4
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(double[],double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(double[],double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -328,7 +328,7 @@ public static bool Equals(double[] arg0, double[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(double[],int,int,double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(double[],int,int,double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -342,7 +342,7 @@ public static bool Equals(double[] arg0, int arg1, int arg2, double[] arg3, int
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(float[],float[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(float[],float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -352,7 +352,7 @@ public static bool Equals(float[] arg0, float[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(float[],int,int,float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(float[],int,int,float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -366,7 +366,7 @@ public static bool Equals(float[] arg0, int arg1, int arg2, float[] arg3, int ar
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(int[],int,int,int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(int[],int,int,int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -380,7 +380,7 @@ public static bool Equals(int[] arg0, int arg1, int arg2, int[] arg3, int arg4,
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(int[],int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(int[],int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -390,7 +390,7 @@ public static bool Equals(int[] arg0, int[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(java.lang.Object[],int,int,java.lang.Object[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(java.lang.Object[],int,int,java.lang.Object[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -404,7 +404,7 @@ public static bool Equals(object[] arg0, int arg1, int arg2, object[] arg3, int
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(java.lang.Object[],java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(java.lang.Object[],java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -414,7 +414,7 @@ public static bool Equals(object[] arg0, object[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(long[],int,int,long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(long[],int,int,long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -428,7 +428,7 @@ public static bool Equals(long[] arg0, int arg1, int arg2, long[] arg3, int arg4
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(long[],long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(long[],long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -438,7 +438,7 @@ public static bool Equals(long[] arg0, long[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(short[],int,int,short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(short[],int,int,short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -452,7 +452,7 @@ public static bool Equals(short[] arg0, int arg1, int arg2, short[] arg3, int ar
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#equals(short[],short[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#equals(short[],short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -462,7 +462,7 @@ public static bool Equals(short[] arg0, short[] arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(boolean[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(boolean[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -472,7 +472,7 @@ public static bool[] CopyOf(bool[] arg0, int arg1)
             return SExecuteArray<bool>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(boolean[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(boolean[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -483,7 +483,7 @@ public static bool[] CopyOfRange(bool[] arg0, int arg1, int arg2)
             return SExecuteArray<bool>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -493,7 +493,7 @@ public static byte[] CopyOf(byte[] arg0, int arg1)
             return SExecuteArray<byte>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -504,7 +504,7 @@ public static byte[] CopyOfRange(byte[] arg0, int arg1, int arg2)
             return SExecuteArray<byte>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(char[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(char[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -514,7 +514,7 @@ public static char[] CopyOf(char[] arg0, int arg1)
             return SExecuteArray<char>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -525,7 +525,7 @@ public static char[] CopyOfRange(char[] arg0, int arg1, int arg2)
             return SExecuteArray<char>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(double[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(double[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -535,7 +535,7 @@ public static double[] CopyOf(double[] arg0, int arg1)
             return SExecuteArray<double>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -546,7 +546,7 @@ public static double[] CopyOfRange(double[] arg0, int arg1, int arg2)
             return SExecuteArray<double>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(float[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(float[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -556,7 +556,7 @@ public static float[] CopyOf(float[] arg0, int arg1)
             return SExecuteArray<float>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -567,7 +567,7 @@ public static float[] CopyOfRange(float[] arg0, int arg1, int arg2)
             return SExecuteArray<float>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(byte[],byte)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(byte[],byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -577,7 +577,7 @@ public static int BinarySearch(byte[] arg0, byte arg1)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(byte[],int,int,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(byte[],int,int,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -589,7 +589,7 @@ public static int BinarySearch(byte[] arg0, int arg1, int arg2, byte arg3)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(char[],char)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(char[],char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -599,7 +599,7 @@ public static int BinarySearch(char[] arg0, char arg1)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(char[],int,int,char)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(char[],int,int,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -611,7 +611,7 @@ public static int BinarySearch(char[] arg0, int arg1, int arg2, char arg3)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(double[],double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(double[],double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -621,7 +621,7 @@ public static int BinarySearch(double[] arg0, double arg1)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(double[],int,int,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(double[],int,int,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -633,7 +633,7 @@ public static int BinarySearch(double[] arg0, int arg1, int arg2, double arg3)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(float[],float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(float[],float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -643,7 +643,7 @@ public static int BinarySearch(float[] arg0, float arg1)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(float[],int,int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(float[],int,int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -655,7 +655,7 @@ public static int BinarySearch(float[] arg0, int arg1, int arg2, float arg3)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(int[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(int[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -667,7 +667,7 @@ public static int BinarySearch(int[] arg0, int arg1, int arg2, int arg3)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(int[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(int[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -677,7 +677,7 @@ public static int BinarySearch(int[] arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(java.lang.Object[],int,int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(java.lang.Object[],int,int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -689,7 +689,7 @@ public static int BinarySearch(object[] arg0, int arg1, int arg2, object arg3)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(java.lang.Object[],java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(java.lang.Object[],java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -699,7 +699,7 @@ public static int BinarySearch(object[] arg0, object arg1)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(long[],int,int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(long[],int,int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -711,7 +711,7 @@ public static int BinarySearch(long[] arg0, int arg1, int arg2, long arg3)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(long[],long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(long[],long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -721,7 +721,7 @@ public static int BinarySearch(long[] arg0, long arg1)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(short[],int,int,short)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(short[],int,int,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -733,7 +733,7 @@ public static int BinarySearch(short[] arg0, int arg1, int arg2, short arg3)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#binarySearch(short[],short)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#binarySearch(short[],short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -743,7 +743,7 @@ public static int BinarySearch(short[] arg0, short arg1)
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(boolean[],boolean[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(boolean[],boolean[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -753,7 +753,7 @@ public static int Compare(bool[] arg0, bool[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(boolean[],int,int,boolean[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(boolean[],int,int,boolean[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -767,7 +767,7 @@ public static int Compare(bool[] arg0, int arg1, int arg2, bool[] arg3, int arg4
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(byte[],byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(byte[],byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -777,7 +777,7 @@ public static int Compare(byte[] arg0, byte[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(byte[],int,int,byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(byte[],int,int,byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -791,7 +791,7 @@ public static int Compare(byte[] arg0, int arg1, int arg2, byte[] arg3, int arg4
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(char[],char[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(char[],char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -801,7 +801,7 @@ public static int Compare(char[] arg0, char[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(char[],int,int,char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(char[],int,int,char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -815,7 +815,7 @@ public static int Compare(char[] arg0, int arg1, int arg2, char[] arg3, int arg4
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(double[],double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(double[],double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -825,7 +825,7 @@ public static int Compare(double[] arg0, double[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(double[],int,int,double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(double[],int,int,double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -839,7 +839,7 @@ public static int Compare(double[] arg0, int arg1, int arg2, double[] arg3, int
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(float[],float[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(float[],float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -849,7 +849,7 @@ public static int Compare(float[] arg0, float[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(float[],int,int,float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(float[],int,int,float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -863,7 +863,7 @@ public static int Compare(float[] arg0, int arg1, int arg2, float[] arg3, int ar
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(int[],int,int,int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(int[],int,int,int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -877,7 +877,7 @@ public static int Compare(int[] arg0, int arg1, int arg2, int[] arg3, int arg4,
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(int[],int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(int[],int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -887,7 +887,7 @@ public static int Compare(int[] arg0, int[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(long[],int,int,long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(long[],int,int,long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -901,7 +901,7 @@ public static int Compare(long[] arg0, int arg1, int arg2, long[] arg3, int arg4
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(long[],long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(long[],long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -911,7 +911,7 @@ public static int Compare(long[] arg0, long[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(short[],int,int,short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(short[],int,int,short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -925,7 +925,7 @@ public static int Compare(short[] arg0, int arg1, int arg2, short[] arg3, int ar
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compare(short[],short[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compare(short[],short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -935,7 +935,7 @@ public static int Compare(short[] arg0, short[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compare", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compareUnsigned(byte[],byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compareUnsigned(byte[],byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -945,7 +945,7 @@ public static int CompareUnsigned(byte[] arg0, byte[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compareUnsigned(byte[],int,int,byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compareUnsigned(byte[],int,int,byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -959,7 +959,7 @@ public static int CompareUnsigned(byte[] arg0, int arg1, int arg2, byte[] arg3,
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compareUnsigned(int[],int,int,int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compareUnsigned(int[],int,int,int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -973,7 +973,7 @@ public static int CompareUnsigned(int[] arg0, int arg1, int arg2, int[] arg3, in
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compareUnsigned(int[],int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compareUnsigned(int[],int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -983,7 +983,7 @@ public static int CompareUnsigned(int[] arg0, int[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compareUnsigned(long[],int,int,long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compareUnsigned(long[],int,int,long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -997,7 +997,7 @@ public static int CompareUnsigned(long[] arg0, int arg1, int arg2, long[] arg3,
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compareUnsigned(long[],long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compareUnsigned(long[],long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -1007,7 +1007,7 @@ public static int CompareUnsigned(long[] arg0, long[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compareUnsigned(short[],int,int,short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compareUnsigned(short[],int,int,short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1021,7 +1021,7 @@ public static int CompareUnsigned(short[] arg0, int arg1, int arg2, short[] arg3
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#compareUnsigned(short[],short[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#compareUnsigned(short[],short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -1031,7 +1031,7 @@ public static int CompareUnsigned(short[] arg0, short[] arg1)
             return SExecute<int>(LocalBridgeClazz, "compareUnsigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#deepHashCode(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#deepHashCode(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1040,7 +1040,7 @@ public static int DeepHashCode(object[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "deepHashCode", "([Ljava/lang/Object;)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(boolean[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(boolean[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1049,7 +1049,7 @@ public static int HashCode(bool[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([Z)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1058,7 +1058,7 @@ public static int HashCode(byte[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([B)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1067,7 +1067,7 @@ public static int HashCode(char[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([C)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1076,7 +1076,7 @@ public static int HashCode(double[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([D)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(float[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1085,7 +1085,7 @@ public static int HashCode(float[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([F)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1094,7 +1094,7 @@ public static int HashCode(int[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([I)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1103,7 +1103,7 @@ public static int HashCode(object[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([Ljava/lang/Object;)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1112,7 +1112,7 @@ public static int HashCode(long[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([J)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#hashCode(short[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#hashCode(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="int"/></returns>
@@ -1121,7 +1121,7 @@ public static int HashCode(short[] arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "([S)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(boolean[],boolean[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(boolean[],boolean[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -1131,7 +1131,7 @@ public static int Mismatch(bool[] arg0, bool[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(boolean[],int,int,boolean[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(boolean[],int,int,boolean[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1145,7 +1145,7 @@ public static int Mismatch(bool[] arg0, int arg1, int arg2, bool[] arg3, int arg
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(byte[],byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(byte[],byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -1155,7 +1155,7 @@ public static int Mismatch(byte[] arg0, byte[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(byte[],int,int,byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(byte[],int,int,byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1169,7 +1169,7 @@ public static int Mismatch(byte[] arg0, int arg1, int arg2, byte[] arg3, int arg
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(char[],char[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(char[],char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -1179,7 +1179,7 @@ public static int Mismatch(char[] arg0, char[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(char[],int,int,char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(char[],int,int,char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1193,7 +1193,7 @@ public static int Mismatch(char[] arg0, int arg1, int arg2, char[] arg3, int arg
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(double[],double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(double[],double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -1203,7 +1203,7 @@ public static int Mismatch(double[] arg0, double[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(double[],int,int,double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(double[],int,int,double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1217,7 +1217,7 @@ public static int Mismatch(double[] arg0, int arg1, int arg2, double[] arg3, int
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(float[],float[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(float[],float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -1227,7 +1227,7 @@ public static int Mismatch(float[] arg0, float[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(float[],int,int,float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(float[],int,int,float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1241,7 +1241,7 @@ public static int Mismatch(float[] arg0, int arg1, int arg2, float[] arg3, int a
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(int[],int,int,int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(int[],int,int,int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1255,7 +1255,7 @@ public static int Mismatch(int[] arg0, int arg1, int arg2, int[] arg3, int arg4,
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(int[],int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(int[],int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1265,7 +1265,7 @@ public static int Mismatch(int[] arg0, int[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(java.lang.Object[],int,int,java.lang.Object[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(java.lang.Object[],int,int,java.lang.Object[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1279,7 +1279,7 @@ public static int Mismatch(object[] arg0, int arg1, int arg2, object[] arg3, int
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(java.lang.Object[],java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(java.lang.Object[],java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1289,7 +1289,7 @@ public static int Mismatch(object[] arg0, object[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(long[],int,int,long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(long[],int,int,long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1303,7 +1303,7 @@ public static int Mismatch(long[] arg0, int arg1, int arg2, long[] arg3, int arg
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(long[],long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(long[],long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -1313,7 +1313,7 @@ public static int Mismatch(long[] arg0, long[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(short[],int,int,short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(short[],int,int,short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1327,7 +1327,7 @@ public static int Mismatch(short[] arg0, int arg1, int arg2, short[] arg3, int a
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#mismatch(short[],short[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#mismatch(short[],short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -1337,7 +1337,7 @@ public static int Mismatch(short[] arg0, short[] arg1)
             return SExecute<int>(LocalBridgeClazz, "mismatch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(int[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(int[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1347,7 +1347,7 @@ public static int[] CopyOf(int[] arg0, int arg1)
             return SExecuteArray<int>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1358,7 +1358,7 @@ public static int[] CopyOfRange(int[] arg0, int arg1, int arg2)
             return SExecuteArray<int>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#deepToString(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#deepToString(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1367,7 +1367,7 @@ public static Java.Lang.String DeepToString(object[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "deepToString", "([Ljava/lang/Object;)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(boolean[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(boolean[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1376,7 +1376,7 @@ public static Java.Lang.String ToString(bool[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([Z)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1385,7 +1385,7 @@ public static Java.Lang.String ToString(byte[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([B)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1394,7 +1394,7 @@ public static Java.Lang.String ToString(char[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([C)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1403,7 +1403,7 @@ public static Java.Lang.String ToString(double[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([D)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(float[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1412,7 +1412,7 @@ public static Java.Lang.String ToString(float[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([F)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1421,7 +1421,7 @@ public static Java.Lang.String ToString(int[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([I)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1430,7 +1430,7 @@ public static Java.Lang.String ToString(object[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([Ljava/lang/Object;)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1439,7 +1439,7 @@ public static Java.Lang.String ToString(long[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([J)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#toString(short[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#toString(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -1448,7 +1448,7 @@ public static Java.Lang.String ToString(short[] arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "([S)Ljava/lang/String;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#spliterator(double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#spliterator(double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1459,7 +1459,7 @@ public static Java.Util.Spliterator.OfDouble Spliterator(double[] arg0, int arg1
             return SExecute<Java.Util.Spliterator.OfDouble>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#spliterator(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#spliterator(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Util.Spliterator.OfDouble"/></returns>
@@ -1468,7 +1468,7 @@ public static Java.Util.Spliterator.OfDouble Spliterator(double[] arg0)
             return SExecuteWithSignature<Java.Util.Spliterator.OfDouble>(LocalBridgeClazz, "spliterator", "([D)Ljava/util/Spliterator$OfDouble;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#spliterator(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#spliterator(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1479,7 +1479,7 @@ public static Java.Util.Spliterator.OfInt Spliterator(int[] arg0, int arg1, int
             return SExecute<Java.Util.Spliterator.OfInt>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#spliterator(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#spliterator(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Spliterator.OfInt"/></returns>
@@ -1488,7 +1488,7 @@ public static Java.Util.Spliterator.OfInt Spliterator(int[] arg0)
             return SExecuteWithSignature<Java.Util.Spliterator.OfInt>(LocalBridgeClazz, "spliterator", "([I)Ljava/util/Spliterator$OfInt;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#spliterator(long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#spliterator(long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1499,7 +1499,7 @@ public static Java.Util.Spliterator.OfLong Spliterator(long[] arg0, int arg1, in
             return SExecute<Java.Util.Spliterator.OfLong>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#spliterator(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#spliterator(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Spliterator.OfLong"/></returns>
@@ -1508,7 +1508,7 @@ public static Java.Util.Spliterator.OfLong Spliterator(long[] arg0)
             return SExecuteWithSignature<Java.Util.Spliterator.OfLong>(LocalBridgeClazz, "spliterator", "([J)Ljava/util/Spliterator$OfLong;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#stream(double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#stream(double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1519,7 +1519,7 @@ public static Java.Util.Stream.DoubleStream Stream(double[] arg0, int arg1, int
             return SExecute<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "stream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#stream(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#stream(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -1528,7 +1528,7 @@ public static Java.Util.Stream.DoubleStream Stream(double[] arg0)
             return SExecuteWithSignature<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "stream", "([D)Ljava/util/stream/DoubleStream;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#stream(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#stream(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1539,7 +1539,7 @@ public static Java.Util.Stream.IntStream Stream(int[] arg0, int arg1, int arg2)
             return SExecute<Java.Util.Stream.IntStream>(LocalBridgeClazz, "stream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#stream(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#stream(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -1548,7 +1548,7 @@ public static Java.Util.Stream.IntStream Stream(int[] arg0)
             return SExecuteWithSignature<Java.Util.Stream.IntStream>(LocalBridgeClazz, "stream", "([I)Ljava/util/stream/IntStream;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#stream(long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#stream(long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1559,7 +1559,7 @@ public static Java.Util.Stream.LongStream Stream(long[] arg0, int arg1, int arg2
             return SExecute<Java.Util.Stream.LongStream>(LocalBridgeClazz, "stream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#stream(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#stream(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -1568,7 +1568,7 @@ public static Java.Util.Stream.LongStream Stream(long[] arg0)
             return SExecuteWithSignature<Java.Util.Stream.LongStream>(LocalBridgeClazz, "stream", "([J)Ljava/util/stream/LongStream;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(long[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(long[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1578,7 +1578,7 @@ public static long[] CopyOf(long[] arg0, int arg1)
             return SExecuteArray<long>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1589,7 +1589,7 @@ public static long[] CopyOfRange(long[] arg0, int arg1, int arg2)
             return SExecuteArray<long>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOf(short[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOf(short[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1599,7 +1599,7 @@ public static short[] CopyOf(short[] arg0, int arg1)
             return SExecuteArray<short>(LocalBridgeClazz, "copyOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#copyOfRange(short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#copyOfRange(short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1610,7 +1610,7 @@ public static short[] CopyOfRange(short[] arg0, int arg1, int arg2)
             return SExecuteArray<short>(LocalBridgeClazz, "copyOfRange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(boolean[],boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(boolean[],boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -1619,7 +1619,7 @@ public static void Fill(bool[] arg0, bool arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(boolean[],int,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(boolean[],int,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1630,7 +1630,7 @@ public static void Fill(bool[] arg0, int arg1, int arg2, bool arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(byte[],byte)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(byte[],byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -1639,7 +1639,7 @@ public static void Fill(byte[] arg0, byte arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(byte[],int,int,byte)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(byte[],int,int,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1650,7 +1650,7 @@ public static void Fill(byte[] arg0, int arg1, int arg2, byte arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(char[],char)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(char[],char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -1659,7 +1659,7 @@ public static void Fill(char[] arg0, char arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(char[],int,int,char)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(char[],int,int,char)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1670,7 +1670,7 @@ public static void Fill(char[] arg0, int arg1, int arg2, char arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(double[],double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(double[],double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -1679,7 +1679,7 @@ public static void Fill(double[] arg0, double arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(double[],int,int,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(double[],int,int,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1690,7 +1690,7 @@ public static void Fill(double[] arg0, int arg1, int arg2, double arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(float[],float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(float[],float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -1699,7 +1699,7 @@ public static void Fill(float[] arg0, float arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(float[],int,int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(float[],int,int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1710,7 +1710,7 @@ public static void Fill(float[] arg0, int arg1, int arg2, float arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(int[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(int[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1721,7 +1721,7 @@ public static void Fill(int[] arg0, int arg1, int arg2, int arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(int[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(int[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1730,7 +1730,7 @@ public static void Fill(int[] arg0, int arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(java.lang.Object[],int,int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(java.lang.Object[],int,int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1741,7 +1741,7 @@ public static void Fill(object[] arg0, int arg1, int arg2, object arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(java.lang.Object[],java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(java.lang.Object[],java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1750,7 +1750,7 @@ public static void Fill(object[] arg0, object arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(long[],int,int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(long[],int,int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1761,7 +1761,7 @@ public static void Fill(long[] arg0, int arg1, int arg2, long arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(long[],long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(long[],long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -1770,7 +1770,7 @@ public static void Fill(long[] arg0, long arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(short[],int,int,short)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(short[],int,int,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1781,7 +1781,7 @@ public static void Fill(short[] arg0, int arg1, int arg2, short arg3)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#fill(short[],short)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#fill(short[],short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -1790,7 +1790,7 @@ public static void Fill(short[] arg0, short arg1)
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelPrefix(double[],int,int,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelPrefix(double[],int,int,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1801,7 +1801,7 @@ public static void ParallelPrefix(double[] arg0, int arg1, int arg2, Java.Util.F
             SExecute(LocalBridgeClazz, "parallelPrefix", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelPrefix(double[],java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelPrefix(double[],java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.DoubleBinaryOperator"/></param>
@@ -1810,7 +1810,7 @@ public static void ParallelPrefix(double[] arg0, Java.Util.Function.DoubleBinary
             SExecute(LocalBridgeClazz, "parallelPrefix", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelPrefix(int[],int,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelPrefix(int[],int,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1821,7 +1821,7 @@ public static void ParallelPrefix(int[] arg0, int arg1, int arg2, Java.Util.Func
             SExecute(LocalBridgeClazz, "parallelPrefix", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelPrefix(int[],java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelPrefix(int[],java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntBinaryOperator"/></param>
@@ -1830,7 +1830,7 @@ public static void ParallelPrefix(int[] arg0, Java.Util.Function.IntBinaryOperat
             SExecute(LocalBridgeClazz, "parallelPrefix", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelPrefix(long[],int,int,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelPrefix(long[],int,int,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1841,7 +1841,7 @@ public static void ParallelPrefix(long[] arg0, int arg1, int arg2, Java.Util.Fun
             SExecute(LocalBridgeClazz, "parallelPrefix", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelPrefix(long[],java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelPrefix(long[],java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongBinaryOperator"/></param>
@@ -1850,7 +1850,7 @@ public static void ParallelPrefix(long[] arg0, Java.Util.Function.LongBinaryOper
             SExecute(LocalBridgeClazz, "parallelPrefix", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSetAll(double[],java.util.function.IntToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSetAll(double[],java.util.function.IntToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntToDoubleFunction"/></param>
@@ -1859,7 +1859,7 @@ public static void ParallelSetAll(double[] arg0, Java.Util.Function.IntToDoubleF
             SExecute(LocalBridgeClazz, "parallelSetAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSetAll(int[],java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSetAll(int[],java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -1868,7 +1868,7 @@ public static void ParallelSetAll(int[] arg0, Java.Util.Function.IntUnaryOperato
             SExecute(LocalBridgeClazz, "parallelSetAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSetAll(long[],java.util.function.IntToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSetAll(long[],java.util.function.IntToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntToLongFunction"/></param>
@@ -1877,7 +1877,7 @@ public static void ParallelSetAll(long[] arg0, Java.Util.Function.IntToLongFunct
             SExecute(LocalBridgeClazz, "parallelSetAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1887,7 +1887,7 @@ public static void ParallelSort(byte[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public static void ParallelSort(byte[] arg0)
@@ -1895,7 +1895,7 @@ public static void ParallelSort(byte[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parallelSort", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1905,7 +1905,7 @@ public static void ParallelSort(char[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public static void ParallelSort(char[] arg0)
@@ -1913,7 +1913,7 @@ public static void ParallelSort(char[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parallelSort", "([C)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1923,7 +1923,7 @@ public static void ParallelSort(double[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public static void ParallelSort(double[] arg0)
@@ -1931,7 +1931,7 @@ public static void ParallelSort(double[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parallelSort", "([D)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1941,7 +1941,7 @@ public static void ParallelSort(float[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(float[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         public static void ParallelSort(float[] arg0)
@@ -1949,7 +1949,7 @@ public static void ParallelSort(float[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parallelSort", "([F)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1959,7 +1959,7 @@ public static void ParallelSort(int[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public static void ParallelSort(int[] arg0)
@@ -1967,7 +1967,7 @@ public static void ParallelSort(int[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parallelSort", "([I)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1977,7 +1977,7 @@ public static void ParallelSort(long[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public static void ParallelSort(long[] arg0)
@@ -1985,7 +1985,7 @@ public static void ParallelSort(long[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parallelSort", "([J)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -1995,7 +1995,7 @@ public static void ParallelSort(short[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "parallelSort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#parallelSort(short[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#parallelSort(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         public static void ParallelSort(short[] arg0)
@@ -2003,7 +2003,7 @@ public static void ParallelSort(short[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parallelSort", "([S)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#setAll(double[],java.util.function.IntToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#setAll(double[],java.util.function.IntToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntToDoubleFunction"/></param>
@@ -2012,7 +2012,7 @@ public static void SetAll(double[] arg0, Java.Util.Function.IntToDoubleFunction
             SExecute(LocalBridgeClazz, "setAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#setAll(int[],java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#setAll(int[],java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -2021,7 +2021,7 @@ public static void SetAll(int[] arg0, Java.Util.Function.IntUnaryOperator arg1)
             SExecute(LocalBridgeClazz, "setAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#setAll(long[],java.util.function.IntToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#setAll(long[],java.util.function.IntToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntToLongFunction"/></param>
@@ -2030,7 +2030,7 @@ public static void SetAll(long[] arg0, Java.Util.Function.IntToLongFunction arg1
             SExecute(LocalBridgeClazz, "setAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -2040,7 +2040,7 @@ public static void Sort(byte[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "sort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public static void Sort(byte[] arg0)
@@ -2048,7 +2048,7 @@ public static void Sort(byte[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "sort", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -2058,7 +2058,7 @@ public static void Sort(char[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "sort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(char[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public static void Sort(char[] arg0)
@@ -2066,7 +2066,7 @@ public static void Sort(char[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "sort", "([C)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(double[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(double[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -2076,7 +2076,7 @@ public static void Sort(double[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "sort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public static void Sort(double[] arg0)
@@ -2084,7 +2084,7 @@ public static void Sort(double[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "sort", "([D)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(float[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(float[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -2094,7 +2094,7 @@ public static void Sort(float[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "sort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(float[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(float[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="float"/></param>
         public static void Sort(float[] arg0)
@@ -2102,7 +2102,7 @@ public static void Sort(float[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "sort", "([F)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(int[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(int[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -2112,7 +2112,7 @@ public static void Sort(int[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "sort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public static void Sort(int[] arg0)
@@ -2120,7 +2120,7 @@ public static void Sort(int[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "sort", "([I)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(java.lang.Object[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(java.lang.Object[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -2130,7 +2130,7 @@ public static void Sort(object[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "sort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public static void Sort(object[] arg0)
@@ -2138,7 +2138,7 @@ public static void Sort(object[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "sort", "([Ljava/lang/Object;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(long[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(long[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -2148,7 +2148,7 @@ public static void Sort(long[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "sort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public static void Sort(long[] arg0)
@@ -2156,7 +2156,7 @@ public static void Sort(long[] arg0)
             SExecuteWithSignature(LocalBridgeClazz, "sort", "([J)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(short[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(short[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -2166,7 +2166,7 @@ public static void Sort(short[] arg0, int arg1, int arg2)
             SExecute(LocalBridgeClazz, "sort", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Arrays.html#sort(short[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Arrays.html#sort(short[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         public static void Sort(short[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Base64.cs b/src/net/Netdroid/Generated/Java/Util/Base64.cs
index 91d98212f..8190bf22d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Base64.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Base64.cs
@@ -42,49 +42,47 @@ public partial class Base64
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.html#getDecoder()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Base64.html#getDecoder()"/>
         /// </summary>
-        public static Java.Util.Base64.Decoder GetDecoder
+        /// <returns><see cref="Java.Util.Base64.Decoder"/></returns>
+        public static Java.Util.Base64.Decoder GetDecoder()
         {
-            get { return SExecuteWithSignature<Java.Util.Base64.Decoder>(LocalBridgeClazz, "getDecoder", "()Ljava/util/Base64$Decoder;"); }
+            return SExecuteWithSignature<Java.Util.Base64.Decoder>(LocalBridgeClazz, "getDecoder", "()Ljava/util/Base64$Decoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.html#getEncoder()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Base64.html#getMimeDecoder()"/>
         /// </summary>
-        public static Java.Util.Base64.Encoder GetEncoder
+        /// <returns><see cref="Java.Util.Base64.Decoder"/></returns>
+        public static Java.Util.Base64.Decoder GetMimeDecoder()
         {
-            get { return SExecuteWithSignature<Java.Util.Base64.Encoder>(LocalBridgeClazz, "getEncoder", "()Ljava/util/Base64$Encoder;"); }
+            return SExecuteWithSignature<Java.Util.Base64.Decoder>(LocalBridgeClazz, "getMimeDecoder", "()Ljava/util/Base64$Decoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.html#getMimeDecoder()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Base64.html#getUrlDecoder()"/>
         /// </summary>
-        public static Java.Util.Base64.Decoder MimeDecoder
+        /// <returns><see cref="Java.Util.Base64.Decoder"/></returns>
+        public static Java.Util.Base64.Decoder GetUrlDecoder()
         {
-            get { return SExecuteWithSignature<Java.Util.Base64.Decoder>(LocalBridgeClazz, "getMimeDecoder", "()Ljava/util/Base64$Decoder;"); }
+            return SExecuteWithSignature<Java.Util.Base64.Decoder>(LocalBridgeClazz, "getUrlDecoder", "()Ljava/util/Base64$Decoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.html#getMimeEncoder()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Base64.html#getEncoder()"/>
         /// </summary>
-        public static Java.Util.Base64.Encoder MimeEncoder
-        {
-            get { return SExecuteWithSignature<Java.Util.Base64.Encoder>(LocalBridgeClazz, "getMimeEncoder", "()Ljava/util/Base64$Encoder;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.html#getUrlDecoder()"/> 
-        /// </summary>
-        public static Java.Util.Base64.Decoder UrlDecoder
+        /// <returns><see cref="Java.Util.Base64.Encoder"/></returns>
+        public static Java.Util.Base64.Encoder GetEncoder()
         {
-            get { return SExecuteWithSignature<Java.Util.Base64.Decoder>(LocalBridgeClazz, "getUrlDecoder", "()Ljava/util/Base64$Decoder;"); }
+            return SExecuteWithSignature<Java.Util.Base64.Encoder>(LocalBridgeClazz, "getEncoder", "()Ljava/util/Base64$Encoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.html#getUrlEncoder()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Base64.html#getMimeEncoder()"/>
         /// </summary>
-        public static Java.Util.Base64.Encoder UrlEncoder
+        /// <returns><see cref="Java.Util.Base64.Encoder"/></returns>
+        public static Java.Util.Base64.Encoder GetMimeEncoder()
         {
-            get { return SExecuteWithSignature<Java.Util.Base64.Encoder>(LocalBridgeClazz, "getUrlEncoder", "()Ljava/util/Base64$Encoder;"); }
+            return SExecuteWithSignature<Java.Util.Base64.Encoder>(LocalBridgeClazz, "getMimeEncoder", "()Ljava/util/Base64$Encoder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.html#getMimeEncoder(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Base64.html#getMimeEncoder(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -93,6 +91,14 @@ public static Java.Util.Base64.Encoder GetMimeEncoder(int arg0, byte[] arg1)
         {
             return SExecute<Java.Util.Base64.Encoder>(LocalBridgeClazz, "getMimeEncoder", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Base64.html#getUrlEncoder()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Base64.Encoder"/></returns>
+        public static Java.Util.Base64.Encoder GetUrlEncoder()
+        {
+            return SExecuteWithSignature<Java.Util.Base64.Encoder>(LocalBridgeClazz, "getUrlEncoder", "()Ljava/util/Base64$Encoder;");
+        }
 
         #endregion
 
@@ -122,7 +128,7 @@ public partial class Decoder
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Decoder.html#decode(byte[])"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Decoder.html#decode(byte[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             /// <returns><see cref="byte"/></returns>
@@ -131,7 +137,7 @@ public byte[] Decode(byte[] arg0)
                 return IExecuteWithSignatureArray<byte>("decode", "([B)[B", new object[] { arg0 });
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Decoder.html#decode(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Decoder.html#decode(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="byte"/></returns>
@@ -140,7 +146,7 @@ public byte[] Decode(Java.Lang.String arg0)
                 return IExecuteWithSignatureArray<byte>("decode", "(Ljava/lang/String;)[B", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Decoder.html#decode(byte[],byte[])"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Decoder.html#decode(byte[],byte[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             /// <param name="arg1"><see cref="byte"/></param>
@@ -150,7 +156,7 @@ public int Decode(byte[] arg0, byte[] arg1)
                 return IExecute<int>("decode", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Decoder.html#wrap(java.io.InputStream)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Decoder.html#wrap(java.io.InputStream)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
             /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -159,7 +165,7 @@ public Java.Io.InputStream Wrap(Java.Io.InputStream arg0)
                 return IExecuteWithSignature<Java.Io.InputStream>("wrap", "(Ljava/io/InputStream;)Ljava/io/InputStream;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Decoder.html#decode(java.nio.ByteBuffer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Decoder.html#decode(java.nio.ByteBuffer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
             /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -199,7 +205,7 @@ public partial class Encoder
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Encoder.html#encode(byte[])"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Encoder.html#encode(byte[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             /// <returns><see cref="byte"/></returns>
@@ -208,7 +214,7 @@ public byte[] Encode(byte[] arg0)
                 return IExecuteWithSignatureArray<byte>("encode", "([B)[B", new object[] { arg0 });
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Encoder.html#encode(byte[],byte[])"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Encoder.html#encode(byte[],byte[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             /// <param name="arg1"><see cref="byte"/></param>
@@ -218,7 +224,7 @@ public int Encode(byte[] arg0, byte[] arg1)
                 return IExecute<int>("encode", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Encoder.html#wrap(java.io.OutputStream)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Encoder.html#wrap(java.io.OutputStream)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
             /// <returns><see cref="Java.Io.OutputStream"/></returns>
@@ -227,7 +233,7 @@ public Java.Io.OutputStream Wrap(Java.Io.OutputStream arg0)
                 return IExecuteWithSignature<Java.Io.OutputStream>("wrap", "(Ljava/io/OutputStream;)Ljava/io/OutputStream;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Encoder.html#encodeToString(byte[])"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Encoder.html#encodeToString(byte[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             /// <returns><see cref="Java.Lang.String"/></returns>
@@ -236,7 +242,7 @@ public Java.Lang.String EncodeToString(byte[] arg0)
                 return IExecuteWithSignature<Java.Lang.String>("encodeToString", "([B)Ljava/lang/String;", new object[] { arg0 });
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Encoder.html#encode(java.nio.ByteBuffer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Encoder.html#encode(java.nio.ByteBuffer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
             /// <returns><see cref="Java.Nio.ByteBuffer"/></returns>
@@ -245,7 +251,7 @@ public Java.Nio.ByteBuffer Encode(Java.Nio.ByteBuffer arg0)
                 return IExecuteWithSignature<Java.Nio.ByteBuffer>("encode", "(Ljava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Base64.Encoder.html#withoutPadding()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Base64.Encoder.html#withoutPadding()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Base64.Encoder"/></returns>
             public Java.Util.Base64.Encoder WithoutPadding()
diff --git a/src/net/Netdroid/Generated/Java/Util/BitSet.cs b/src/net/Netdroid/Generated/Java/Util/BitSet.cs
index 727b0684a..8d9c0afbf 100644
--- a/src/net/Netdroid/Generated/Java/Util/BitSet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/BitSet.cs
@@ -30,7 +30,7 @@ public partial class BitSet : Java.Lang.ICloneable, Java.Io.ISerializable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public BitSet(int arg0)
@@ -58,7 +58,7 @@ public BitSet(int arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#valueOf(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#valueOf(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Util.BitSet"/></returns>
@@ -67,7 +67,7 @@ public static Java.Util.BitSet ValueOf(byte[] arg0)
             return SExecuteWithSignature<Java.Util.BitSet>(LocalBridgeClazz, "valueOf", "([B)Ljava/util/BitSet;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#valueOf(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#valueOf(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="Java.Util.BitSet"/></returns>
@@ -76,7 +76,7 @@ public static Java.Util.BitSet ValueOf(Java.Nio.ByteBuffer arg0)
             return SExecuteWithSignature<Java.Util.BitSet>(LocalBridgeClazz, "valueOf", "(Ljava/nio/ByteBuffer;)Ljava/util/BitSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#valueOf(java.nio.LongBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#valueOf(java.nio.LongBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.LongBuffer"/></param>
         /// <returns><see cref="Java.Util.BitSet"/></returns>
@@ -85,7 +85,7 @@ public static Java.Util.BitSet ValueOf(Java.Nio.LongBuffer arg0)
             return SExecuteWithSignature<Java.Util.BitSet>(LocalBridgeClazz, "valueOf", "(Ljava/nio/LongBuffer;)Ljava/util/BitSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#valueOf(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#valueOf(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.BitSet"/></returns>
@@ -98,7 +98,7 @@ public static Java.Util.BitSet ValueOf(long[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -107,7 +107,7 @@ public bool Get(int arg0)
             return IExecuteWithSignature<bool>("get", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#intersects(java.util.BitSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#intersects(java.util.BitSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.BitSet"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -116,7 +116,7 @@ public bool Intersects(Java.Util.BitSet arg0)
             return IExecuteWithSignature<bool>("intersects", "(Ljava/util/BitSet;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -124,7 +124,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#toByteArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#toByteArray()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte[] ToByteArray()
@@ -132,7 +132,7 @@ public byte[] ToByteArray()
             return IExecuteWithSignatureArray<byte>("toByteArray", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#cardinality()"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#cardinality()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Cardinality()
@@ -140,7 +140,7 @@ public int Cardinality()
             return IExecuteWithSignature<int>("cardinality", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -148,7 +148,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#nextClearBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#nextClearBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -157,7 +157,7 @@ public int NextClearBit(int arg0)
             return IExecuteWithSignature<int>("nextClearBit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#nextSetBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#nextSetBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -166,7 +166,7 @@ public int NextSetBit(int arg0)
             return IExecuteWithSignature<int>("nextSetBit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#previousClearBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#previousClearBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -175,7 +175,7 @@ public int PreviousClearBit(int arg0)
             return IExecuteWithSignature<int>("previousClearBit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#previousSetBit(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#previousSetBit(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -184,7 +184,7 @@ public int PreviousSetBit(int arg0)
             return IExecuteWithSignature<int>("previousSetBit", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -192,7 +192,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#get(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#get(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -202,7 +202,7 @@ public Java.Util.BitSet Get(int arg0, int arg1)
             return IExecute<Java.Util.BitSet>("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#stream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Stream()
@@ -210,7 +210,7 @@ public Java.Util.Stream.IntStream Stream()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("stream", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#toLongArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#toLongArray()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long[] ToLongArray()
@@ -218,7 +218,7 @@ public long[] ToLongArray()
             return IExecuteWithSignatureArray<long>("toLongArray", "()[J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#and(java.util.BitSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#and(java.util.BitSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.BitSet"/></param>
         public void And(Java.Util.BitSet arg0)
@@ -226,7 +226,7 @@ public void And(Java.Util.BitSet arg0)
             IExecuteWithSignature("and", "(Ljava/util/BitSet;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#andNot(java.util.BitSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#andNot(java.util.BitSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.BitSet"/></param>
         public void AndNot(Java.Util.BitSet arg0)
@@ -234,14 +234,14 @@ public void AndNot(Java.Util.BitSet arg0)
             IExecuteWithSignature("andNot", "(Ljava/util/BitSet;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#clear(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#clear(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -250,7 +250,7 @@ public void Clear(int arg0, int arg1)
             IExecute("clear", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#clear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#clear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Clear(int arg0)
@@ -258,7 +258,7 @@ public void Clear(int arg0)
             IExecuteWithSignature("clear", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#flip(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#flip(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -267,7 +267,7 @@ public void Flip(int arg0, int arg1)
             IExecute("flip", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#flip(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#flip(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Flip(int arg0)
@@ -275,7 +275,7 @@ public void Flip(int arg0)
             IExecuteWithSignature("flip", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#or(java.util.BitSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#or(java.util.BitSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.BitSet"/></param>
         public void Or(Java.Util.BitSet arg0)
@@ -283,7 +283,7 @@ public void Or(Java.Util.BitSet arg0)
             IExecuteWithSignature("or", "(Ljava/util/BitSet;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#set(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#set(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -292,7 +292,7 @@ public void Set(int arg0, bool arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#set(int,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#set(int,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -302,7 +302,7 @@ public void Set(int arg0, int arg1, bool arg2)
             IExecute("set", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#set(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#set(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -311,7 +311,7 @@ public void Set(int arg0, int arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#set(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#set(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Set(int arg0)
@@ -319,7 +319,7 @@ public void Set(int arg0)
             IExecuteWithSignature("set", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/BitSet.html#xor(java.util.BitSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/BitSet.html#xor(java.util.BitSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.BitSet"/></param>
         public void Xor(Java.Util.BitSet arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Calendar.cs b/src/net/Netdroid/Generated/Java/Util/Calendar.cs
index ae489fc29..6824b43dd 100644
--- a/src/net/Netdroid/Generated/Java/Util/Calendar.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Calendar.cs
@@ -50,301 +50,301 @@ public partial class Calendar : Java.Io.ISerializable, Java.Lang.ICloneable, Jav
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#ALL_STYLES"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#ALL_STYLES"/>
         /// </summary>
         public static int ALL_STYLES { get { if (!_ALL_STYLESReady) { _ALL_STYLESContent = SGetField<int>(LocalBridgeClazz, "ALL_STYLES"); _ALL_STYLESReady = true; } return _ALL_STYLESContent; } }
         private static int _ALL_STYLESContent = default;
         private static bool _ALL_STYLESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#AM"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#AM"/>
         /// </summary>
         public static int AM { get { if (!_AMReady) { _AMContent = SGetField<int>(LocalBridgeClazz, "AM"); _AMReady = true; } return _AMContent; } }
         private static int _AMContent = default;
         private static bool _AMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#AM_PM"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#AM_PM"/>
         /// </summary>
         public static int AM_PM { get { if (!_AM_PMReady) { _AM_PMContent = SGetField<int>(LocalBridgeClazz, "AM_PM"); _AM_PMReady = true; } return _AM_PMContent; } }
         private static int _AM_PMContent = default;
         private static bool _AM_PMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#APRIL"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#APRIL"/>
         /// </summary>
         public static int APRIL { get { if (!_APRILReady) { _APRILContent = SGetField<int>(LocalBridgeClazz, "APRIL"); _APRILReady = true; } return _APRILContent; } }
         private static int _APRILContent = default;
         private static bool _APRILReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#AUGUST"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#AUGUST"/>
         /// </summary>
         public static int AUGUST { get { if (!_AUGUSTReady) { _AUGUSTContent = SGetField<int>(LocalBridgeClazz, "AUGUST"); _AUGUSTReady = true; } return _AUGUSTContent; } }
         private static int _AUGUSTContent = default;
         private static bool _AUGUSTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#DATE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#DATE"/>
         /// </summary>
         public static int DATE { get { if (!_DATEReady) { _DATEContent = SGetField<int>(LocalBridgeClazz, "DATE"); _DATEReady = true; } return _DATEContent; } }
         private static int _DATEContent = default;
         private static bool _DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#DAY_OF_MONTH"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#DAY_OF_MONTH"/>
         /// </summary>
         public static int DAY_OF_MONTH { get { if (!_DAY_OF_MONTHReady) { _DAY_OF_MONTHContent = SGetField<int>(LocalBridgeClazz, "DAY_OF_MONTH"); _DAY_OF_MONTHReady = true; } return _DAY_OF_MONTHContent; } }
         private static int _DAY_OF_MONTHContent = default;
         private static bool _DAY_OF_MONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#DAY_OF_WEEK"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#DAY_OF_WEEK"/>
         /// </summary>
         public static int DAY_OF_WEEK { get { if (!_DAY_OF_WEEKReady) { _DAY_OF_WEEKContent = SGetField<int>(LocalBridgeClazz, "DAY_OF_WEEK"); _DAY_OF_WEEKReady = true; } return _DAY_OF_WEEKContent; } }
         private static int _DAY_OF_WEEKContent = default;
         private static bool _DAY_OF_WEEKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#DAY_OF_WEEK_IN_MONTH"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#DAY_OF_WEEK_IN_MONTH"/>
         /// </summary>
         public static int DAY_OF_WEEK_IN_MONTH { get { if (!_DAY_OF_WEEK_IN_MONTHReady) { _DAY_OF_WEEK_IN_MONTHContent = SGetField<int>(LocalBridgeClazz, "DAY_OF_WEEK_IN_MONTH"); _DAY_OF_WEEK_IN_MONTHReady = true; } return _DAY_OF_WEEK_IN_MONTHContent; } }
         private static int _DAY_OF_WEEK_IN_MONTHContent = default;
         private static bool _DAY_OF_WEEK_IN_MONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#DAY_OF_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#DAY_OF_YEAR"/>
         /// </summary>
         public static int DAY_OF_YEAR { get { if (!_DAY_OF_YEARReady) { _DAY_OF_YEARContent = SGetField<int>(LocalBridgeClazz, "DAY_OF_YEAR"); _DAY_OF_YEARReady = true; } return _DAY_OF_YEARContent; } }
         private static int _DAY_OF_YEARContent = default;
         private static bool _DAY_OF_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#DECEMBER"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#DECEMBER"/>
         /// </summary>
         public static int DECEMBER { get { if (!_DECEMBERReady) { _DECEMBERContent = SGetField<int>(LocalBridgeClazz, "DECEMBER"); _DECEMBERReady = true; } return _DECEMBERContent; } }
         private static int _DECEMBERContent = default;
         private static bool _DECEMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#DST_OFFSET"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#DST_OFFSET"/>
         /// </summary>
         public static int DST_OFFSET { get { if (!_DST_OFFSETReady) { _DST_OFFSETContent = SGetField<int>(LocalBridgeClazz, "DST_OFFSET"); _DST_OFFSETReady = true; } return _DST_OFFSETContent; } }
         private static int _DST_OFFSETContent = default;
         private static bool _DST_OFFSETReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#ERA"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#ERA"/>
         /// </summary>
         public static int ERA { get { if (!_ERAReady) { _ERAContent = SGetField<int>(LocalBridgeClazz, "ERA"); _ERAReady = true; } return _ERAContent; } }
         private static int _ERAContent = default;
         private static bool _ERAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#FEBRUARY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#FEBRUARY"/>
         /// </summary>
         public static int FEBRUARY { get { if (!_FEBRUARYReady) { _FEBRUARYContent = SGetField<int>(LocalBridgeClazz, "FEBRUARY"); _FEBRUARYReady = true; } return _FEBRUARYContent; } }
         private static int _FEBRUARYContent = default;
         private static bool _FEBRUARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#FIELD_COUNT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#FIELD_COUNT"/>
         /// </summary>
         public static int FIELD_COUNT { get { if (!_FIELD_COUNTReady) { _FIELD_COUNTContent = SGetField<int>(LocalBridgeClazz, "FIELD_COUNT"); _FIELD_COUNTReady = true; } return _FIELD_COUNTContent; } }
         private static int _FIELD_COUNTContent = default;
         private static bool _FIELD_COUNTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#FRIDAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#FRIDAY"/>
         /// </summary>
         public static int FRIDAY { get { if (!_FRIDAYReady) { _FRIDAYContent = SGetField<int>(LocalBridgeClazz, "FRIDAY"); _FRIDAYReady = true; } return _FRIDAYContent; } }
         private static int _FRIDAYContent = default;
         private static bool _FRIDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#HOUR"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#HOUR"/>
         /// </summary>
         public static int HOUR { get { if (!_HOURReady) { _HOURContent = SGetField<int>(LocalBridgeClazz, "HOUR"); _HOURReady = true; } return _HOURContent; } }
         private static int _HOURContent = default;
         private static bool _HOURReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#HOUR_OF_DAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#HOUR_OF_DAY"/>
         /// </summary>
         public static int HOUR_OF_DAY { get { if (!_HOUR_OF_DAYReady) { _HOUR_OF_DAYContent = SGetField<int>(LocalBridgeClazz, "HOUR_OF_DAY"); _HOUR_OF_DAYReady = true; } return _HOUR_OF_DAYContent; } }
         private static int _HOUR_OF_DAYContent = default;
         private static bool _HOUR_OF_DAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#JANUARY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#JANUARY"/>
         /// </summary>
         public static int JANUARY { get { if (!_JANUARYReady) { _JANUARYContent = SGetField<int>(LocalBridgeClazz, "JANUARY"); _JANUARYReady = true; } return _JANUARYContent; } }
         private static int _JANUARYContent = default;
         private static bool _JANUARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#JULY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#JULY"/>
         /// </summary>
         public static int JULY { get { if (!_JULYReady) { _JULYContent = SGetField<int>(LocalBridgeClazz, "JULY"); _JULYReady = true; } return _JULYContent; } }
         private static int _JULYContent = default;
         private static bool _JULYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#JUNE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#JUNE"/>
         /// </summary>
         public static int JUNE { get { if (!_JUNEReady) { _JUNEContent = SGetField<int>(LocalBridgeClazz, "JUNE"); _JUNEReady = true; } return _JUNEContent; } }
         private static int _JUNEContent = default;
         private static bool _JUNEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#LONG"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#LONG"/>
         /// </summary>
         public static int LONG { get { if (!_LONGReady) { _LONGContent = SGetField<int>(LocalBridgeClazz, "LONG"); _LONGReady = true; } return _LONGContent; } }
         private static int _LONGContent = default;
         private static bool _LONGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#LONG_FORMAT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#LONG_FORMAT"/>
         /// </summary>
         public static int LONG_FORMAT { get { if (!_LONG_FORMATReady) { _LONG_FORMATContent = SGetField<int>(LocalBridgeClazz, "LONG_FORMAT"); _LONG_FORMATReady = true; } return _LONG_FORMATContent; } }
         private static int _LONG_FORMATContent = default;
         private static bool _LONG_FORMATReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#LONG_STANDALONE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#LONG_STANDALONE"/>
         /// </summary>
         public static int LONG_STANDALONE { get { if (!_LONG_STANDALONEReady) { _LONG_STANDALONEContent = SGetField<int>(LocalBridgeClazz, "LONG_STANDALONE"); _LONG_STANDALONEReady = true; } return _LONG_STANDALONEContent; } }
         private static int _LONG_STANDALONEContent = default;
         private static bool _LONG_STANDALONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#MARCH"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#MARCH"/>
         /// </summary>
         public static int MARCH { get { if (!_MARCHReady) { _MARCHContent = SGetField<int>(LocalBridgeClazz, "MARCH"); _MARCHReady = true; } return _MARCHContent; } }
         private static int _MARCHContent = default;
         private static bool _MARCHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#MAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#MAY"/>
         /// </summary>
         public static int MAY { get { if (!_MAYReady) { _MAYContent = SGetField<int>(LocalBridgeClazz, "MAY"); _MAYReady = true; } return _MAYContent; } }
         private static int _MAYContent = default;
         private static bool _MAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#MILLISECOND"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#MILLISECOND"/>
         /// </summary>
         public static int MILLISECOND { get { if (!_MILLISECONDReady) { _MILLISECONDContent = SGetField<int>(LocalBridgeClazz, "MILLISECOND"); _MILLISECONDReady = true; } return _MILLISECONDContent; } }
         private static int _MILLISECONDContent = default;
         private static bool _MILLISECONDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#MINUTE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#MINUTE"/>
         /// </summary>
         public static int MINUTE { get { if (!_MINUTEReady) { _MINUTEContent = SGetField<int>(LocalBridgeClazz, "MINUTE"); _MINUTEReady = true; } return _MINUTEContent; } }
         private static int _MINUTEContent = default;
         private static bool _MINUTEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#MONDAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#MONDAY"/>
         /// </summary>
         public static int MONDAY { get { if (!_MONDAYReady) { _MONDAYContent = SGetField<int>(LocalBridgeClazz, "MONDAY"); _MONDAYReady = true; } return _MONDAYContent; } }
         private static int _MONDAYContent = default;
         private static bool _MONDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#MONTH"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#MONTH"/>
         /// </summary>
         public static int MONTH { get { if (!_MONTHReady) { _MONTHContent = SGetField<int>(LocalBridgeClazz, "MONTH"); _MONTHReady = true; } return _MONTHContent; } }
         private static int _MONTHContent = default;
         private static bool _MONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#NARROW_FORMAT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#NARROW_FORMAT"/>
         /// </summary>
         public static int NARROW_FORMAT { get { if (!_NARROW_FORMATReady) { _NARROW_FORMATContent = SGetField<int>(LocalBridgeClazz, "NARROW_FORMAT"); _NARROW_FORMATReady = true; } return _NARROW_FORMATContent; } }
         private static int _NARROW_FORMATContent = default;
         private static bool _NARROW_FORMATReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#NARROW_STANDALONE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#NARROW_STANDALONE"/>
         /// </summary>
         public static int NARROW_STANDALONE { get { if (!_NARROW_STANDALONEReady) { _NARROW_STANDALONEContent = SGetField<int>(LocalBridgeClazz, "NARROW_STANDALONE"); _NARROW_STANDALONEReady = true; } return _NARROW_STANDALONEContent; } }
         private static int _NARROW_STANDALONEContent = default;
         private static bool _NARROW_STANDALONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#NOVEMBER"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#NOVEMBER"/>
         /// </summary>
         public static int NOVEMBER { get { if (!_NOVEMBERReady) { _NOVEMBERContent = SGetField<int>(LocalBridgeClazz, "NOVEMBER"); _NOVEMBERReady = true; } return _NOVEMBERContent; } }
         private static int _NOVEMBERContent = default;
         private static bool _NOVEMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#OCTOBER"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#OCTOBER"/>
         /// </summary>
         public static int OCTOBER { get { if (!_OCTOBERReady) { _OCTOBERContent = SGetField<int>(LocalBridgeClazz, "OCTOBER"); _OCTOBERReady = true; } return _OCTOBERContent; } }
         private static int _OCTOBERContent = default;
         private static bool _OCTOBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#PM"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#PM"/>
         /// </summary>
         public static int PM { get { if (!_PMReady) { _PMContent = SGetField<int>(LocalBridgeClazz, "PM"); _PMReady = true; } return _PMContent; } }
         private static int _PMContent = default;
         private static bool _PMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#SATURDAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#SATURDAY"/>
         /// </summary>
         public static int SATURDAY { get { if (!_SATURDAYReady) { _SATURDAYContent = SGetField<int>(LocalBridgeClazz, "SATURDAY"); _SATURDAYReady = true; } return _SATURDAYContent; } }
         private static int _SATURDAYContent = default;
         private static bool _SATURDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#SECOND"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#SECOND"/>
         /// </summary>
         public static int SECOND { get { if (!_SECONDReady) { _SECONDContent = SGetField<int>(LocalBridgeClazz, "SECOND"); _SECONDReady = true; } return _SECONDContent; } }
         private static int _SECONDContent = default;
         private static bool _SECONDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#SEPTEMBER"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#SEPTEMBER"/>
         /// </summary>
         public static int SEPTEMBER { get { if (!_SEPTEMBERReady) { _SEPTEMBERContent = SGetField<int>(LocalBridgeClazz, "SEPTEMBER"); _SEPTEMBERReady = true; } return _SEPTEMBERContent; } }
         private static int _SEPTEMBERContent = default;
         private static bool _SEPTEMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#SHORT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#SHORT"/>
         /// </summary>
         public static int SHORT { get { if (!_SHORTReady) { _SHORTContent = SGetField<int>(LocalBridgeClazz, "SHORT"); _SHORTReady = true; } return _SHORTContent; } }
         private static int _SHORTContent = default;
         private static bool _SHORTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#SHORT_FORMAT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#SHORT_FORMAT"/>
         /// </summary>
         public static int SHORT_FORMAT { get { if (!_SHORT_FORMATReady) { _SHORT_FORMATContent = SGetField<int>(LocalBridgeClazz, "SHORT_FORMAT"); _SHORT_FORMATReady = true; } return _SHORT_FORMATContent; } }
         private static int _SHORT_FORMATContent = default;
         private static bool _SHORT_FORMATReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#SHORT_STANDALONE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#SHORT_STANDALONE"/>
         /// </summary>
         public static int SHORT_STANDALONE { get { if (!_SHORT_STANDALONEReady) { _SHORT_STANDALONEContent = SGetField<int>(LocalBridgeClazz, "SHORT_STANDALONE"); _SHORT_STANDALONEReady = true; } return _SHORT_STANDALONEContent; } }
         private static int _SHORT_STANDALONEContent = default;
         private static bool _SHORT_STANDALONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#SUNDAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#SUNDAY"/>
         /// </summary>
         public static int SUNDAY { get { if (!_SUNDAYReady) { _SUNDAYContent = SGetField<int>(LocalBridgeClazz, "SUNDAY"); _SUNDAYReady = true; } return _SUNDAYContent; } }
         private static int _SUNDAYContent = default;
         private static bool _SUNDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#THURSDAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#THURSDAY"/>
         /// </summary>
         public static int THURSDAY { get { if (!_THURSDAYReady) { _THURSDAYContent = SGetField<int>(LocalBridgeClazz, "THURSDAY"); _THURSDAYReady = true; } return _THURSDAYContent; } }
         private static int _THURSDAYContent = default;
         private static bool _THURSDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#TUESDAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#TUESDAY"/>
         /// </summary>
         public static int TUESDAY { get { if (!_TUESDAYReady) { _TUESDAYContent = SGetField<int>(LocalBridgeClazz, "TUESDAY"); _TUESDAYReady = true; } return _TUESDAYContent; } }
         private static int _TUESDAYContent = default;
         private static bool _TUESDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#UNDECIMBER"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#UNDECIMBER"/>
         /// </summary>
         public static int UNDECIMBER { get { if (!_UNDECIMBERReady) { _UNDECIMBERContent = SGetField<int>(LocalBridgeClazz, "UNDECIMBER"); _UNDECIMBERReady = true; } return _UNDECIMBERContent; } }
         private static int _UNDECIMBERContent = default;
         private static bool _UNDECIMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#WEDNESDAY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#WEDNESDAY"/>
         /// </summary>
         public static int WEDNESDAY { get { if (!_WEDNESDAYReady) { _WEDNESDAYContent = SGetField<int>(LocalBridgeClazz, "WEDNESDAY"); _WEDNESDAYReady = true; } return _WEDNESDAYContent; } }
         private static int _WEDNESDAYContent = default;
         private static bool _WEDNESDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#WEEK_OF_MONTH"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#WEEK_OF_MONTH"/>
         /// </summary>
         public static int WEEK_OF_MONTH { get { if (!_WEEK_OF_MONTHReady) { _WEEK_OF_MONTHContent = SGetField<int>(LocalBridgeClazz, "WEEK_OF_MONTH"); _WEEK_OF_MONTHReady = true; } return _WEEK_OF_MONTHContent; } }
         private static int _WEEK_OF_MONTHContent = default;
         private static bool _WEEK_OF_MONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#WEEK_OF_YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#WEEK_OF_YEAR"/>
         /// </summary>
         public static int WEEK_OF_YEAR { get { if (!_WEEK_OF_YEARReady) { _WEEK_OF_YEARContent = SGetField<int>(LocalBridgeClazz, "WEEK_OF_YEAR"); _WEEK_OF_YEARReady = true; } return _WEEK_OF_YEARContent; } }
         private static int _WEEK_OF_YEARContent = default;
         private static bool _WEEK_OF_YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#YEAR"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#YEAR"/>
         /// </summary>
         public static int YEAR { get { if (!_YEARReady) { _YEARContent = SGetField<int>(LocalBridgeClazz, "YEAR"); _YEARReady = true; } return _YEARContent; } }
         private static int _YEARContent = default;
         private static bool _YEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#ZONE_OFFSET"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#ZONE_OFFSET"/>
         /// </summary>
         public static int ZONE_OFFSET { get { if (!_ZONE_OFFSETReady) { _ZONE_OFFSETContent = SGetField<int>(LocalBridgeClazz, "ZONE_OFFSET"); _ZONE_OFFSETReady = true; } return _ZONE_OFFSETContent; } }
         private static int _ZONE_OFFSETContent = default;
@@ -354,28 +354,15 @@ public partial class Calendar : Java.Io.ISerializable, Java.Lang.ICloneable, Jav
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getAvailableCalendarTypes()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getInstance()"/>
         /// </summary>
-        public static Java.Util.Set<Java.Lang.String> AvailableCalendarTypes
-        {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getAvailableCalendarTypes", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getAvailableLocales()"/> 
-        /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getInstance()"/> 
-        /// </summary>
-        public static Java.Util.Calendar Instance
+        /// <returns><see cref="Java.Util.Calendar"/></returns>
+        public static Java.Util.Calendar GetInstance()
         {
-            get { return SExecuteWithSignature<Java.Util.Calendar>(LocalBridgeClazz, "getInstance", "()Ljava/util/Calendar;"); }
+            return SExecuteWithSignature<Java.Util.Calendar>(LocalBridgeClazz, "getInstance", "()Ljava/util/Calendar;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Util.Calendar"/></returns>
@@ -384,7 +371,7 @@ public static Java.Util.Calendar GetInstance(Java.Util.Locale arg0)
             return SExecuteWithSignature<Java.Util.Calendar>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Ljava/util/Calendar;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getInstance(java.util.TimeZone,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getInstance(java.util.TimeZone,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -394,7 +381,7 @@ public static Java.Util.Calendar GetInstance(Java.Util.TimeZone arg0, Java.Util.
             return SExecute<Java.Util.Calendar>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getInstance(java.util.TimeZone)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getInstance(java.util.TimeZone)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
         /// <returns><see cref="Java.Util.Calendar"/></returns>
@@ -402,68 +389,28 @@ public static Java.Util.Calendar GetInstance(Java.Util.TimeZone arg0)
         {
             return SExecuteWithSignature<Java.Util.Calendar>(LocalBridgeClazz, "getInstance", "(Ljava/util/TimeZone;)Ljava/util/Calendar;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getCalendarType()"/> 
-        /// </summary>
-        public Java.Lang.String CalendarType
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCalendarType", "()Ljava/lang/String;"); }
-        }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getFirstDayOfWeek()"/> <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#setFirstDayOfWeek(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getAvailableCalendarTypes()"/>
         /// </summary>
-        public int FirstDayOfWeek
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Lang.String> GetAvailableCalendarTypes()
         {
-            get { return IExecuteWithSignature<int>("getFirstDayOfWeek", "()I"); } set { IExecuteWithSignature("setFirstDayOfWeek", "(I)V", value); }
+            return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getAvailableCalendarTypes", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getMinimalDaysInFirstWeek()"/> <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#setMinimalDaysInFirstWeek(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getAvailableLocales()"/>
         /// </summary>
-        public int MinimalDaysInFirstWeek
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
         {
-            get { return IExecuteWithSignature<int>("getMinimalDaysInFirstWeek", "()I"); } set { IExecuteWithSignature("setMinimalDaysInFirstWeek", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getTime()"/> <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#setTime(java.util.Date)"/>
-        /// </summary>
-        public Java.Util.Date Time
-        {
-            get { return IExecuteWithSignature<Java.Util.Date>("getTime", "()Ljava/util/Date;"); } set { IExecuteWithSignature("setTime", "(Ljava/util/Date;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getTimeInMillis()"/> <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#setTimeInMillis(long)"/>
-        /// </summary>
-        public long TimeInMillis
-        {
-            get { return IExecuteWithSignature<long>("getTimeInMillis", "()J"); } set { IExecuteWithSignature("setTimeInMillis", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getTimeZone()"/> <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#setTimeZone(java.util.TimeZone)"/>
-        /// </summary>
-        public Java.Util.TimeZone TimeZone
-        {
-            get { return IExecuteWithSignature<Java.Util.TimeZone>("getTimeZone", "()Ljava/util/TimeZone;"); } set { IExecuteWithSignature("setTimeZone", "(Ljava/util/TimeZone;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getWeeksInWeekYear()"/> 
-        /// </summary>
-        public int WeeksInWeekYear
-        {
-            get { return IExecuteWithSignature<int>("getWeeksInWeekYear", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getWeekYear()"/> 
-        /// </summary>
-        public int WeekYear
-        {
-            get { return IExecuteWithSignature<int>("getWeekYear", "()I"); }
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getGreatestMinimum(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getGreatestMinimum(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -472,7 +419,7 @@ public int GetGreatestMinimum(int arg0)
             return IExecuteWithSignature<int>("getGreatestMinimum", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getLeastMaximum(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getLeastMaximum(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -481,7 +428,7 @@ public int GetLeastMaximum(int arg0)
             return IExecuteWithSignature<int>("getLeastMaximum", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getMaximum(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getMaximum(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -490,7 +437,7 @@ public int GetMaximum(int arg0)
             return IExecuteWithSignature<int>("getMaximum", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getMinimum(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getMinimum(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -499,7 +446,7 @@ public int GetMinimum(int arg0)
             return IExecuteWithSignature<int>("getMinimum", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#add(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#add(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -508,7 +455,7 @@ public void Add(int arg0, int arg1)
             IExecute("add", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#roll(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#roll(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -517,7 +464,7 @@ public void Roll(int arg0, bool arg1)
             IExecute("roll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#after(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#after(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -526,7 +473,7 @@ public bool After(object arg0)
             return IExecuteWithSignature<bool>("after", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#before(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#before(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -535,7 +482,7 @@ public bool Before(object arg0)
             return IExecuteWithSignature<bool>("before", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#isLenient()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#isLenient()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLenient()
@@ -543,7 +490,7 @@ public bool IsLenient()
             return IExecuteWithSignature<bool>("isLenient", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#isWeekDateSupported()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#isWeekDateSupported()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsWeekDateSupported()
@@ -551,7 +498,7 @@ public bool IsWeekDateSupported()
             return IExecuteWithSignature<bool>("isWeekDateSupported", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#isSet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#isSet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -560,7 +507,7 @@ public bool IsSet(int arg0)
             return IExecuteWithSignature<bool>("isSet", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#toInstant()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#toInstant()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Instant"/></returns>
         public Java.Time.Instant ToInstant()
@@ -568,14 +515,22 @@ public Java.Time.Instant ToInstant()
             return IExecuteWithSignature<Java.Time.Instant>("toInstant", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getTime()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetTime()
+        {
+            return IExecuteWithSignature<Java.Util.Date>("getTime", "()Ljava/util/Date;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#clear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#clear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Clear(int arg0)
@@ -583,7 +538,7 @@ public void Clear(int arg0)
             IExecuteWithSignature("clear", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#set(int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#set(int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -596,7 +551,7 @@ public void Set(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
             IExecute("set", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#set(int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#set(int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -608,7 +563,7 @@ public void Set(int arg0, int arg1, int arg2, int arg3, int arg4)
             IExecute("set", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#set(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#set(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -618,7 +573,15 @@ public void Set(int arg0, int arg1, int arg2)
             IExecute("set", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#setTime(java.util.Date)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        public void SetTime(Java.Util.Date arg0)
+        {
+            IExecuteWithSignature("setTime", "(Ljava/util/Date;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -627,7 +590,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#compareTo(java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#compareTo(java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Calendar"/></param>
         /// <returns><see cref="int"/></returns>
@@ -636,7 +599,7 @@ public int CompareTo(Java.Util.Calendar arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/util/Calendar;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -645,7 +608,7 @@ public int Get(int arg0)
             return IExecuteWithSignature<int>("get", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getActualMaximum(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getActualMaximum(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -654,7 +617,7 @@ public int GetActualMaximum(int arg0)
             return IExecuteWithSignature<int>("getActualMaximum", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getActualMinimum(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getActualMinimum(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -663,7 +626,47 @@ public int GetActualMinimum(int arg0)
             return IExecuteWithSignature<int>("getActualMinimum", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getDisplayName(int,int,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getFirstDayOfWeek()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetFirstDayOfWeek()
+        {
+            return IExecuteWithSignature<int>("getFirstDayOfWeek", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getMinimalDaysInFirstWeek()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinimalDaysInFirstWeek()
+        {
+            return IExecuteWithSignature<int>("getMinimalDaysInFirstWeek", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getWeeksInWeekYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWeeksInWeekYear()
+        {
+            return IExecuteWithSignature<int>("getWeeksInWeekYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getWeekYear()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWeekYear()
+        {
+            return IExecuteWithSignature<int>("getWeekYear", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getCalendarType()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCalendarType()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCalendarType", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getDisplayName(int,int,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -674,7 +677,7 @@ public Java.Lang.String GetDisplayName(int arg0, int arg1, Java.Util.Locale arg2
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#getDisplayNames(int,int,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getDisplayNames(int,int,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -685,7 +688,23 @@ public Java.Lang.String GetDisplayName(int arg0, int arg1, Java.Util.Locale arg2
             return IExecute<Java.Util.Map<Java.Lang.String, Java.Lang.Integer>>("getDisplayNames", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#roll(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getTimeZone()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.TimeZone"/></returns>
+        public Java.Util.TimeZone GetTimeZone()
+        {
+            return IExecuteWithSignature<Java.Util.TimeZone>("getTimeZone", "()Ljava/util/TimeZone;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#getTimeInMillis()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTimeInMillis()
+        {
+            return IExecuteWithSignature<long>("getTimeInMillis", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#roll(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -694,7 +713,7 @@ public void Roll(int arg0, int arg1)
             IExecute("roll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#set(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#set(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -703,7 +722,15 @@ public void Set(int arg0, int arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#setLenient(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#setFirstDayOfWeek(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetFirstDayOfWeek(int arg0)
+        {
+            IExecuteWithSignature("setFirstDayOfWeek", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#setLenient(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetLenient(bool arg0)
@@ -711,7 +738,31 @@ public void SetLenient(bool arg0)
             IExecuteWithSignature("setLenient", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.html#setWeekDate(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#setMinimalDaysInFirstWeek(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinimalDaysInFirstWeek(int arg0)
+        {
+            IExecuteWithSignature("setMinimalDaysInFirstWeek", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#setTimeInMillis(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetTimeInMillis(long arg0)
+        {
+            IExecuteWithSignature("setTimeInMillis", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#setTimeZone(java.util.TimeZone)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
+        public void SetTimeZone(Java.Util.TimeZone arg0)
+        {
+            IExecuteWithSignature("setTimeZone", "(Ljava/util/TimeZone;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Calendar.html#setWeekDate(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -745,7 +796,7 @@ public partial class Builder
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#build()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#build()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Calendar"/></returns>
             public Java.Util.Calendar Build()
@@ -753,7 +804,7 @@ public Java.Util.Calendar Build()
                 return IExecuteWithSignature<Java.Util.Calendar>("build", "()Ljava/util/Calendar;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#set(int,int)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#set(int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
@@ -763,7 +814,7 @@ public Java.Util.Calendar.Builder Set(int arg0, int arg1)
                 return IExecute<Java.Util.Calendar.Builder>("set", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setCalendarType(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setCalendarType(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Calendar.Builder"/></returns>
@@ -772,7 +823,7 @@ public Java.Util.Calendar.Builder SetCalendarType(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Util.Calendar.Builder>("setCalendarType", "(Ljava/lang/String;)Ljava/util/Calendar$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setDate(int,int,int)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setDate(int,int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
@@ -783,7 +834,7 @@ public Java.Util.Calendar.Builder SetDate(int arg0, int arg1, int arg2)
                 return IExecute<Java.Util.Calendar.Builder>("setDate", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setFields(int[])"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setFields(int[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <returns><see cref="Java.Util.Calendar.Builder"/></returns>
@@ -792,7 +843,7 @@ public Java.Util.Calendar.Builder SetFields(params int[] arg0)
                 if (arg0.Length == 0) return IExecuteWithSignature<Java.Util.Calendar.Builder>("setFields", "([I)Ljava/util/Calendar$Builder;"); else return IExecuteWithSignature<Java.Util.Calendar.Builder>("setFields", "([I)Ljava/util/Calendar$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setInstant(java.util.Date)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setInstant(java.util.Date)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Date"/></param>
             /// <returns><see cref="Java.Util.Calendar.Builder"/></returns>
@@ -801,7 +852,7 @@ public Java.Util.Calendar.Builder SetInstant(Java.Util.Date arg0)
                 return IExecuteWithSignature<Java.Util.Calendar.Builder>("setInstant", "(Ljava/util/Date;)Ljava/util/Calendar$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setInstant(long)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setInstant(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <returns><see cref="Java.Util.Calendar.Builder"/></returns>
@@ -810,7 +861,7 @@ public Java.Util.Calendar.Builder SetInstant(long arg0)
                 return IExecuteWithSignature<Java.Util.Calendar.Builder>("setInstant", "(J)Ljava/util/Calendar$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setLenient(boolean)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setLenient(boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="bool"/></param>
             /// <returns><see cref="Java.Util.Calendar.Builder"/></returns>
@@ -819,7 +870,7 @@ public Java.Util.Calendar.Builder SetLenient(bool arg0)
                 return IExecuteWithSignature<Java.Util.Calendar.Builder>("setLenient", "(Z)Ljava/util/Calendar$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setLocale(java.util.Locale)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setLocale(java.util.Locale)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
             /// <returns><see cref="Java.Util.Calendar.Builder"/></returns>
@@ -828,7 +879,7 @@ public Java.Util.Calendar.Builder SetLocale(Java.Util.Locale arg0)
                 return IExecuteWithSignature<Java.Util.Calendar.Builder>("setLocale", "(Ljava/util/Locale;)Ljava/util/Calendar$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setTimeOfDay(int,int,int,int)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setTimeOfDay(int,int,int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
@@ -840,7 +891,7 @@ public Java.Util.Calendar.Builder SetTimeOfDay(int arg0, int arg1, int arg2, int
                 return IExecute<Java.Util.Calendar.Builder>("setTimeOfDay", arg0, arg1, arg2, arg3);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setTimeOfDay(int,int,int)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setTimeOfDay(int,int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
@@ -851,7 +902,7 @@ public Java.Util.Calendar.Builder SetTimeOfDay(int arg0, int arg1, int arg2)
                 return IExecute<Java.Util.Calendar.Builder>("setTimeOfDay", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setTimeZone(java.util.TimeZone)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setTimeZone(java.util.TimeZone)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
             /// <returns><see cref="Java.Util.Calendar.Builder"/></returns>
@@ -860,7 +911,7 @@ public Java.Util.Calendar.Builder SetTimeZone(Java.Util.TimeZone arg0)
                 return IExecuteWithSignature<Java.Util.Calendar.Builder>("setTimeZone", "(Ljava/util/TimeZone;)Ljava/util/Calendar$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setWeekDate(int,int,int)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setWeekDate(int,int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
@@ -871,7 +922,7 @@ public Java.Util.Calendar.Builder SetWeekDate(int arg0, int arg1, int arg2)
                 return IExecute<Java.Util.Calendar.Builder>("setWeekDate", arg0, arg1, arg2);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Calendar.Builder.html#setWeekDefinition(int,int)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Calendar.Builder.html#setWeekDefinition(int,int)"/>
             /// </summary>
             /// <param name="arg0"><see cref="int"/></param>
             /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Collection.cs b/src/net/Netdroid/Generated/Java/Util/Collection.cs
index b495b4945..f22cf1cd6 100644
--- a/src/net/Netdroid/Generated/Java/Util/Collection.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Collection.cs
@@ -46,7 +46,7 @@ public partial class Collection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -55,7 +55,7 @@ public object[] ToArray(object[] arg0)
             return IExecuteWithSignatureArray<object>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -64,7 +64,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -73,7 +73,7 @@ public bool AddAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -82,7 +82,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -91,7 +91,7 @@ public bool ContainsAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -99,7 +99,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -108,7 +108,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -117,7 +117,7 @@ public bool RemoveAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -126,7 +126,7 @@ public bool RetainAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -134,7 +134,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -142,7 +142,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -150,14 +150,14 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#toArray(java.util.function.IntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#toArray(java.util.function.IntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntFunction"/></param>
         /// <returns><see cref="object"/></returns>
@@ -166,7 +166,7 @@ public object[] ToArray(Java.Util.Function.IntFunction arg0)
             return IExecuteWithSignatureArray<object>("toArray", "(Ljava/util/function/IntFunction;)[Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#removeIf(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#removeIf(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -175,7 +175,7 @@ public bool RemoveIf(Java.Util.Function.Predicate arg0)
             return IExecuteWithSignature<bool>("removeIf", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -183,7 +183,7 @@ public Java.Util.Spliterator Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#parallelStream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#parallelStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream ParallelStream()
@@ -191,7 +191,7 @@ public Java.Util.Stream.Stream ParallelStream()
             return IExecuteWithSignature<Java.Util.Stream.Stream>("parallelStream", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#stream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream Stream()
@@ -252,7 +252,7 @@ public partial class Collection<E> : Java.Util.ICollection<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -262,7 +262,7 @@ public T[] ToArray<T>(T[] arg0)
             return IExecuteWithSignatureArray<T>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -271,17 +271,17 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -290,7 +290,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -299,7 +299,7 @@ public bool ContainsAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -307,7 +307,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -316,7 +316,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -325,7 +325,7 @@ public bool RemoveAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -334,7 +334,7 @@ public bool RetainAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -342,7 +342,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -350,7 +350,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> Iterator()
@@ -358,14 +358,14 @@ public Java.Util.Iterator<E> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#toArray(java.util.function.IntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#toArray(java.util.function.IntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntFunction"/></param>
         /// <typeparam name="T"></typeparam>
@@ -375,17 +375,17 @@ public T[] ToArray<T>(Java.Util.Function.IntFunction<T[]> arg0)
             return IExecuteWithSignatureArray<T>("toArray", "(Ljava/util/function/IntFunction;)[Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#removeIf(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#removeIf(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool RemoveIf<Arg0objectSuperE>(Java.Util.Function.Predicate<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public bool RemoveIf<Arg0objectSuperE>(Java.Util.Function.Predicate<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<bool>("removeIf", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator<E> Spliterator()
@@ -393,7 +393,7 @@ public Java.Util.Spliterator<E> Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator<E>>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#parallelStream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#parallelStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<E> ParallelStream()
@@ -401,7 +401,7 @@ public Java.Util.Stream.Stream<E> ParallelStream()
             return IExecuteWithSignature<Java.Util.Stream.Stream<E>>("parallelStream", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collection.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collection.html#stream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<E> Stream()
diff --git a/src/net/Netdroid/Generated/Java/Util/Collections.cs b/src/net/Netdroid/Generated/Java/Util/Collections.cs
index d42b630d0..a50f41db9 100644
--- a/src/net/Netdroid/Generated/Java/Util/Collections.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Collections.cs
@@ -38,19 +38,19 @@ public partial class Collections
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#EMPTY_LIST"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#EMPTY_LIST"/>
         /// </summary>
         public static Java.Util.List EMPTY_LIST { get { if (!_EMPTY_LISTReady) { _EMPTY_LISTContent = SGetField<Java.Util.List>(LocalBridgeClazz, "EMPTY_LIST"); _EMPTY_LISTReady = true; } return _EMPTY_LISTContent; } }
         private static Java.Util.List _EMPTY_LISTContent = default;
         private static bool _EMPTY_LISTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#EMPTY_MAP"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#EMPTY_MAP"/>
         /// </summary>
         public static Java.Util.Map EMPTY_MAP { get { if (!_EMPTY_MAPReady) { _EMPTY_MAPContent = SGetField<Java.Util.Map>(LocalBridgeClazz, "EMPTY_MAP"); _EMPTY_MAPReady = true; } return _EMPTY_MAPContent; } }
         private static Java.Util.Map _EMPTY_MAPContent = default;
         private static bool _EMPTY_MAPReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#EMPTY_SET"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#EMPTY_SET"/>
         /// </summary>
         public static Java.Util.Set EMPTY_SET { get { if (!_EMPTY_SETReady) { _EMPTY_SETContent = SGetField<Java.Util.Set>(LocalBridgeClazz, "EMPTY_SET"); _EMPTY_SETReady = true; } return _EMPTY_SETContent; } }
         private static Java.Util.Set _EMPTY_SETContent = default;
@@ -60,7 +60,7 @@ public partial class Collections
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedCollection(java.util.Collection,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedCollection(java.util.Collection,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -71,7 +71,7 @@ public static Java.Util.Collection<E> CheckedCollection<E>(Java.Util.Collection<
             return SExecute<Java.Util.Collection<E>>(LocalBridgeClazz, "checkedCollection", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedList(java.util.List,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedList(java.util.List,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -82,7 +82,7 @@ public static Java.Util.List<E> CheckedList<E>(Java.Util.List<E> arg0, Java.Lang
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "checkedList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedNavigableSet(java.util.NavigableSet,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedNavigableSet(java.util.NavigableSet,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.NavigableSet"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -93,7 +93,7 @@ public static Java.Util.NavigableSet<E> CheckedNavigableSet<E>(Java.Util.Navigab
             return SExecute<Java.Util.NavigableSet<E>>(LocalBridgeClazz, "checkedNavigableSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptyNavigableSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptyNavigableSet()"/>
         /// </summary>
         /// <typeparam name="E"></typeparam>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
@@ -102,7 +102,7 @@ public static Java.Util.NavigableSet<E> EmptyNavigableSet<E>()
             return SExecuteWithSignature<Java.Util.NavigableSet<E>>(LocalBridgeClazz, "emptyNavigableSet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedQueue(java.util.Queue,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedQueue(java.util.Queue,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Queue"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -113,7 +113,7 @@ public static Java.Util.Queue<E> CheckedQueue<E>(Java.Util.Queue<E> arg0, Java.L
             return SExecute<Java.Util.Queue<E>>(LocalBridgeClazz, "checkedQueue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedSet(java.util.Set,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedSet(java.util.Set,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -124,7 +124,7 @@ public static Java.Util.Set<E> CheckedSet<E>(Java.Util.Set<E> arg0, Java.Lang.Cl
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "checkedSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#newSetFromMap(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#newSetFromMap(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <typeparam name="E"></typeparam>
@@ -134,7 +134,7 @@ public static Java.Util.Set<E> NewSetFromMap<E>(Java.Util.Map<E, Java.Lang.Boole
             return SExecuteWithSignature<Java.Util.Set<E>>(LocalBridgeClazz, "newSetFromMap", "(Ljava/util/Map;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedSortedSet(java.util.SortedSet,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedSortedSet(java.util.SortedSet,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -145,7 +145,7 @@ public static Java.Util.SortedSet<E> CheckedSortedSet<E>(Java.Util.SortedSet<E>
             return SExecute<Java.Util.SortedSet<E>>(LocalBridgeClazz, "checkedSortedSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptySortedSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptySortedSet()"/>
         /// </summary>
         /// <typeparam name="E"></typeparam>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -154,7 +154,7 @@ public static Java.Util.SortedSet<E> EmptySortedSet<E>()
             return SExecuteWithSignature<Java.Util.SortedSet<E>>(LocalBridgeClazz, "emptySortedSet", "()Ljava/util/SortedSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedMap(java.util.Map,java.lang.Class,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedMap(java.util.Map,java.lang.Class,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -167,7 +167,7 @@ public static Java.Util.Map<K, V> CheckedMap<K, V>(Java.Util.Map<K, V> arg0, Jav
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "checkedMap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#singletonMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#singletonMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -179,7 +179,7 @@ public static Java.Util.Map<K, V> SingletonMap<K, V>(K arg0, V arg1)
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "singletonMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#synchronizedMap(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#synchronizedMap(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <typeparam name="K"></typeparam>
@@ -190,7 +190,7 @@ public static Java.Util.Map<K, V> SynchronizedMap<K, V>(Java.Util.Map<K, V> arg0
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "synchronizedMap", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#unmodifiableMap(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#unmodifiableMap(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <typeparam name="K"></typeparam>
@@ -198,12 +198,12 @@ public static Java.Util.Map<K, V> SynchronizedMap<K, V>(Java.Util.Map<K, V> arg0
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Map"/></returns>
-        public static Java.Util.Map<K, V> UnmodifiableMap<K, V, Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
+        public static Java.Util.Map<K, V> UnmodifiableMap<K, V, Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK : K where Arg0ExtendsV : V
         {
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "unmodifiableMap", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedNavigableMap(java.util.NavigableMap,java.lang.Class,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedNavigableMap(java.util.NavigableMap,java.lang.Class,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.NavigableMap"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -216,7 +216,7 @@ public static Java.Util.NavigableMap<K, V> CheckedNavigableMap<K, V>(Java.Util.N
             return SExecute<Java.Util.NavigableMap<K, V>>(LocalBridgeClazz, "checkedNavigableMap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#synchronizedNavigableMap(java.util.NavigableMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#synchronizedNavigableMap(java.util.NavigableMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.NavigableMap"/></param>
         /// <typeparam name="K"></typeparam>
@@ -227,19 +227,19 @@ public static Java.Util.NavigableMap<K, V> SynchronizedNavigableMap<K, V>(Java.U
             return SExecute<Java.Util.NavigableMap<K, V>>(LocalBridgeClazz, "synchronizedNavigableMap", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#unmodifiableNavigableMap(java.util.NavigableMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#unmodifiableNavigableMap(java.util.NavigableMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.NavigableMap"/></param>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.NavigableMap"/></returns>
-        public static Java.Util.NavigableMap<K, V> UnmodifiableNavigableMap<K, V, Arg0ExtendsV>(Java.Util.NavigableMap<K, Arg0ExtendsV> arg0) where Arg0ExtendsV: V
+        public static Java.Util.NavigableMap<K, V> UnmodifiableNavigableMap<K, V, Arg0ExtendsV>(Java.Util.NavigableMap<K, Arg0ExtendsV> arg0) where Arg0ExtendsV : V
         {
             return SExecute<Java.Util.NavigableMap<K, V>>(LocalBridgeClazz, "unmodifiableNavigableMap", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#checkedSortedMap(java.util.SortedMap,java.lang.Class,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#checkedSortedMap(java.util.SortedMap,java.lang.Class,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedMap"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -252,7 +252,7 @@ public static Java.Util.SortedMap<K, V> CheckedSortedMap<K, V>(Java.Util.SortedM
             return SExecute<Java.Util.SortedMap<K, V>>(LocalBridgeClazz, "checkedSortedMap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#synchronizedSortedMap(java.util.SortedMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#synchronizedSortedMap(java.util.SortedMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedMap"/></param>
         /// <typeparam name="K"></typeparam>
@@ -263,62 +263,31 @@ public static Java.Util.SortedMap<K, V> SynchronizedSortedMap<K, V>(Java.Util.So
             return SExecute<Java.Util.SortedMap<K, V>>(LocalBridgeClazz, "synchronizedSortedMap", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#unmodifiableSortedMap(java.util.SortedMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#unmodifiableSortedMap(java.util.SortedMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedMap"/></param>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
-        public static Java.Util.SortedMap<K, V> UnmodifiableSortedMap<K, V, Arg0ExtendsV>(Java.Util.SortedMap<K, Arg0ExtendsV> arg0) where Arg0ExtendsV: V
+        public static Java.Util.SortedMap<K, V> UnmodifiableSortedMap<K, V, Arg0ExtendsV>(Java.Util.SortedMap<K, Arg0ExtendsV> arg0) where Arg0ExtendsV : V
         {
             return SExecute<Java.Util.SortedMap<K, V>>(LocalBridgeClazz, "unmodifiableSortedMap", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#sort(java.util.List)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <typeparam name="T"></typeparam>
-        public static void Sort<T>(Java.Util.List<T> arg0)
-        {
-            SExecuteWithSignature(LocalBridgeClazz, "sort", "(Ljava/util/List;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#max(java.util.Collection)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public static T Max<T, Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
-        {
-            return SExecute<T>(LocalBridgeClazz, "max", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#min(java.util.Collection)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public static T Min<T, Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
-        {
-            return SExecute<T>(LocalBridgeClazz, "min", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#addAll(java.util.Collection,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#addAll(java.util.Collection,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public static bool AddAll<Arg0objectSuperT, T>(Java.Util.Collection<Arg0objectSuperT> arg0, params T[] arg1) where Arg0objectSuperT: T
+        public static bool AddAll<Arg0objectSuperT, T>(Java.Util.Collection<Arg0objectSuperT> arg0, params T[] arg1) where Arg0objectSuperT : T
         {
             if (arg1.Length == 0) return SExecute<bool>(LocalBridgeClazz, "addAll", arg0); else return SExecute<bool>(LocalBridgeClazz, "addAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#replaceAll(java.util.List,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#replaceAll(java.util.List,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -330,7 +299,7 @@ public static bool ReplaceAll<T>(Java.Util.List<T> arg0, T arg1, T arg2)
             return SExecute<bool>(LocalBridgeClazz, "replaceAll", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#binarySearch(java.util.List,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#binarySearch(java.util.List,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -338,12 +307,12 @@ public static bool ReplaceAll<T>(Java.Util.List<T> arg0, T arg1, T arg2)
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="int"/></returns>
-        public static int BinarySearch<Arg0ExtendsJava_Lang_Comparable_Arg0objectSuperT_, Arg0objectSuperT, T>(Java.Util.List<Arg0ExtendsJava_Lang_Comparable_Arg0objectSuperT_> arg0, T arg1) where Arg0ExtendsJava_Lang_Comparable_Arg0objectSuperT_: Java.Lang.Comparable<Arg0objectSuperT> where Arg0objectSuperT: T
+        public static int BinarySearch<Arg0ExtendsJava_Lang_Comparable_Arg0objectSuperT_, Arg0objectSuperT, T>(Java.Util.List<Arg0ExtendsJava_Lang_Comparable_Arg0objectSuperT_> arg0, T arg1) where Arg0ExtendsJava_Lang_Comparable_Arg0objectSuperT_ : Java.Lang.Comparable<Arg0objectSuperT> where Arg0objectSuperT : T
         {
             return SExecute<int>(LocalBridgeClazz, "binarySearch", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#list(java.util.Enumeration)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#list(java.util.Enumeration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Enumeration"/></param>
         /// <typeparam name="T"></typeparam>
@@ -353,7 +322,7 @@ public static Java.Util.ArrayList<T> List<T>(Java.Util.Enumeration<T> arg0)
             return SExecuteWithSignature<Java.Util.ArrayList<T>>(LocalBridgeClazz, "list", "(Ljava/util/Enumeration;)Ljava/util/ArrayList;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#synchronizedCollection(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#synchronizedCollection(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="T"></typeparam>
@@ -363,18 +332,18 @@ public static Java.Util.Collection<T> SynchronizedCollection<T>(Java.Util.Collec
             return SExecuteWithSignature<Java.Util.Collection<T>>(LocalBridgeClazz, "synchronizedCollection", "(Ljava/util/Collection;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#unmodifiableCollection(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#unmodifiableCollection(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
-        public static Java.Util.Collection<T> UnmodifiableCollection<T, Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public static Java.Util.Collection<T> UnmodifiableCollection<T, Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return SExecuteWithSignature<Java.Util.Collection<T>>(LocalBridgeClazz, "unmodifiableCollection", "(Ljava/util/Collection;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptyEnumeration()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptyEnumeration()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
@@ -383,7 +352,7 @@ public static Java.Util.Enumeration<T> EmptyEnumeration<T>()
             return SExecuteWithSignature<Java.Util.Enumeration<T>>(LocalBridgeClazz, "emptyEnumeration", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#enumeration(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#enumeration(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="T"></typeparam>
@@ -393,7 +362,7 @@ public static Java.Util.Enumeration<T> Enumeration<T>(Java.Util.Collection<T> ar
             return SExecuteWithSignature<Java.Util.Enumeration<T>>(LocalBridgeClazz, "enumeration", "(Ljava/util/Collection;)Ljava/util/Enumeration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptyIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptyIterator()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
@@ -402,7 +371,7 @@ public static Java.Util.Iterator<T> EmptyIterator<T>()
             return SExecuteWithSignature<Java.Util.Iterator<T>>(LocalBridgeClazz, "emptyIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#nCopies(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#nCopies(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -413,7 +382,7 @@ public static Java.Util.List<T> NCopies<T>(int arg0, T arg1)
             return SExecute<Java.Util.List<T>>(LocalBridgeClazz, "nCopies", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#singletonList(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#singletonList(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -423,7 +392,7 @@ public static Java.Util.List<T> SingletonList<T>(T arg0)
             return SExecuteWithSignature<Java.Util.List<T>>(LocalBridgeClazz, "singletonList", "(Ljava/lang/Object;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#synchronizedList(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#synchronizedList(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <typeparam name="T"></typeparam>
@@ -433,18 +402,18 @@ public static Java.Util.List<T> SynchronizedList<T>(Java.Util.List<T> arg0)
             return SExecuteWithSignature<Java.Util.List<T>>(LocalBridgeClazz, "synchronizedList", "(Ljava/util/List;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#unmodifiableList(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#unmodifiableList(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.List"/></returns>
-        public static Java.Util.List<T> UnmodifiableList<T, Arg0ExtendsT>(Java.Util.List<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public static Java.Util.List<T> UnmodifiableList<T, Arg0ExtendsT>(Java.Util.List<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return SExecuteWithSignature<Java.Util.List<T>>(LocalBridgeClazz, "unmodifiableList", "(Ljava/util/List;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptyListIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptyListIterator()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
@@ -453,7 +422,7 @@ public static Java.Util.ListIterator<T> EmptyListIterator<T>()
             return SExecuteWithSignature<Java.Util.ListIterator<T>>(LocalBridgeClazz, "emptyListIterator", "()Ljava/util/ListIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#synchronizedNavigableSet(java.util.NavigableSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#synchronizedNavigableSet(java.util.NavigableSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.NavigableSet"/></param>
         /// <typeparam name="T"></typeparam>
@@ -463,7 +432,7 @@ public static Java.Util.NavigableSet<T> SynchronizedNavigableSet<T>(Java.Util.Na
             return SExecuteWithSignature<Java.Util.NavigableSet<T>>(LocalBridgeClazz, "synchronizedNavigableSet", "(Ljava/util/NavigableSet;)Ljava/util/NavigableSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#unmodifiableNavigableSet(java.util.NavigableSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#unmodifiableNavigableSet(java.util.NavigableSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.NavigableSet"/></param>
         /// <typeparam name="T"></typeparam>
@@ -473,7 +442,7 @@ public static Java.Util.NavigableSet<T> UnmodifiableNavigableSet<T>(Java.Util.Na
             return SExecuteWithSignature<Java.Util.NavigableSet<T>>(LocalBridgeClazz, "unmodifiableNavigableSet", "(Ljava/util/NavigableSet;)Ljava/util/NavigableSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#asLifoQueue(java.util.Deque)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#asLifoQueue(java.util.Deque)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Deque"/></param>
         /// <typeparam name="T"></typeparam>
@@ -483,7 +452,7 @@ public static Java.Util.Queue<T> AsLifoQueue<T>(Java.Util.Deque<T> arg0)
             return SExecuteWithSignature<Java.Util.Queue<T>>(LocalBridgeClazz, "asLifoQueue", "(Ljava/util/Deque;)Ljava/util/Queue;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#singleton(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#singleton(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -493,7 +462,7 @@ public static Java.Util.Set<T> Singleton<T>(T arg0)
             return SExecuteWithSignature<Java.Util.Set<T>>(LocalBridgeClazz, "singleton", "(Ljava/lang/Object;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#synchronizedSet(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#synchronizedSet(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <typeparam name="T"></typeparam>
@@ -503,18 +472,18 @@ public static Java.Util.Set<T> SynchronizedSet<T>(Java.Util.Set<T> arg0)
             return SExecuteWithSignature<Java.Util.Set<T>>(LocalBridgeClazz, "synchronizedSet", "(Ljava/util/Set;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#unmodifiableSet(java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#unmodifiableSet(java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Set"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Set"/></returns>
-        public static Java.Util.Set<T> UnmodifiableSet<T, Arg0ExtendsT>(Java.Util.Set<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public static Java.Util.Set<T> UnmodifiableSet<T, Arg0ExtendsT>(Java.Util.Set<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return SExecuteWithSignature<Java.Util.Set<T>>(LocalBridgeClazz, "unmodifiableSet", "(Ljava/util/Set;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#synchronizedSortedSet(java.util.SortedSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#synchronizedSortedSet(java.util.SortedSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         /// <typeparam name="T"></typeparam>
@@ -524,7 +493,7 @@ public static Java.Util.SortedSet<T> SynchronizedSortedSet<T>(Java.Util.SortedSe
             return SExecuteWithSignature<Java.Util.SortedSet<T>>(LocalBridgeClazz, "synchronizedSortedSet", "(Ljava/util/SortedSet;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#unmodifiableSortedSet(java.util.SortedSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#unmodifiableSortedSet(java.util.SortedSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         /// <typeparam name="T"></typeparam>
@@ -534,30 +503,61 @@ public static Java.Util.SortedSet<T> UnmodifiableSortedSet<T>(Java.Util.SortedSe
             return SExecuteWithSignature<Java.Util.SortedSet<T>>(LocalBridgeClazz, "unmodifiableSortedSet", "(Ljava/util/SortedSet;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#copy(java.util.List,java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#max(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public static T Max<T, Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
+        {
+            return SExecute<T>(LocalBridgeClazz, "max", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#min(java.util.Collection)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public static T Min<T, Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
+        {
+            return SExecute<T>(LocalBridgeClazz, "min", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#copy(java.util.List,java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg1ExtendsT"><typeparamref name="T"/></typeparam>
-        public static void Copy<Arg0objectSuperT, T, Arg1ExtendsT>(Java.Util.List<Arg0objectSuperT> arg0, Java.Util.List<Arg1ExtendsT> arg1) where Arg0objectSuperT: T where Arg1ExtendsT: T
+        public static void Copy<Arg0objectSuperT, T, Arg1ExtendsT>(Java.Util.List<Arg0objectSuperT> arg0, Java.Util.List<Arg1ExtendsT> arg1) where Arg0objectSuperT : T where Arg1ExtendsT : T
         {
             SExecute(LocalBridgeClazz, "copy", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#fill(java.util.List,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#fill(java.util.List,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="T"></typeparam>
-        public static void Fill<Arg0objectSuperT, T>(Java.Util.List<Arg0objectSuperT> arg0, T arg1) where Arg0objectSuperT: T
+        public static void Fill<Arg0objectSuperT, T>(Java.Util.List<Arg0objectSuperT> arg0, T arg1) where Arg0objectSuperT : T
         {
             SExecute(LocalBridgeClazz, "fill", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#disjoint(java.util.Collection,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#sort(java.util.List)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <typeparam name="T"></typeparam>
+        public static void Sort<T>(Java.Util.List<T> arg0)
+        {
+            SExecute(LocalBridgeClazz, "sort", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#disjoint(java.util.Collection,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -567,7 +567,7 @@ public static bool Disjoint(Java.Util.Collection<object> arg0, Java.Util.Collect
             return SExecute<bool>(LocalBridgeClazz, "disjoint", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptyMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptyMap()"/>
         /// </summary>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
@@ -577,7 +577,7 @@ public static Java.Util.Map<K, V> EmptyMap<K, V>()
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "emptyMap");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptyNavigableMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptyNavigableMap()"/>
         /// </summary>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
@@ -587,7 +587,7 @@ public static Java.Util.NavigableMap<K, V> EmptyNavigableMap<K, V>()
             return SExecute<Java.Util.NavigableMap<K, V>>(LocalBridgeClazz, "emptyNavigableMap");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptySortedMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptySortedMap()"/>
         /// </summary>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
@@ -597,7 +597,7 @@ public static Java.Util.SortedMap<K, V> EmptySortedMap<K, V>()
             return SExecute<Java.Util.SortedMap<K, V>>(LocalBridgeClazz, "emptySortedMap");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptyList()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptyList()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -606,7 +606,7 @@ public static Java.Util.List<T> EmptyList<T>()
             return SExecuteWithSignature<Java.Util.List<T>>(LocalBridgeClazz, "emptyList", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#emptySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#emptySet()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Set"/></returns>
@@ -615,7 +615,7 @@ public static Java.Util.Set<T> EmptySet<T>()
             return SExecuteWithSignature<Java.Util.Set<T>>(LocalBridgeClazz, "emptySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#frequency(java.util.Collection,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#frequency(java.util.Collection,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -625,7 +625,7 @@ public static int Frequency(Java.Util.Collection<object> arg0, object arg1)
             return SExecute<int>(LocalBridgeClazz, "frequency", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#indexOfSubList(java.util.List,java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#indexOfSubList(java.util.List,java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
@@ -635,7 +635,7 @@ public static int IndexOfSubList(Java.Util.List<object> arg0, Java.Util.List<obj
             return SExecute<int>(LocalBridgeClazz, "indexOfSubList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#lastIndexOfSubList(java.util.List,java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#lastIndexOfSubList(java.util.List,java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.List"/></param>
@@ -645,7 +645,7 @@ public static int LastIndexOfSubList(Java.Util.List<object> arg0, Java.Util.List
             return SExecute<int>(LocalBridgeClazz, "lastIndexOfSubList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#reverse(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#reverse(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         public static void Reverse(Java.Util.List<object> arg0)
@@ -653,7 +653,7 @@ public static void Reverse(Java.Util.List<object> arg0)
             SExecuteWithSignature(LocalBridgeClazz, "reverse", "(Ljava/util/List;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#rotate(java.util.List,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#rotate(java.util.List,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -662,7 +662,7 @@ public static void Rotate(Java.Util.List<object> arg0, int arg1)
             SExecute(LocalBridgeClazz, "rotate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#shuffle(java.util.List,java.util.Random)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#shuffle(java.util.List,java.util.Random)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.Random"/></param>
@@ -671,7 +671,7 @@ public static void Shuffle(Java.Util.List<object> arg0, Java.Util.Random arg1)
             SExecute(LocalBridgeClazz, "shuffle", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#shuffle(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#shuffle(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         public static void Shuffle(Java.Util.List<object> arg0)
@@ -679,7 +679,7 @@ public static void Shuffle(Java.Util.List<object> arg0)
             SExecuteWithSignature(LocalBridgeClazz, "shuffle", "(Ljava/util/List;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Collections.html#swap(java.util.List,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Collections.html#swap(java.util.List,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/AbstractExecutorService.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/AbstractExecutorService.cs
index 227f70c31..43599436a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/AbstractExecutorService.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/AbstractExecutorService.cs
@@ -46,7 +46,7 @@ public partial class AbstractExecutorService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/AbstractExecutorService.html#submit(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html#submit(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -57,7 +57,7 @@ public Java.Util.Concurrent.Future<T> Submit<T>(Java.Lang.Runnable arg0, T arg1)
             return IExecute<Java.Util.Concurrent.Future<T>>("submit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/AbstractExecutorService.html#submit(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html#submit(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <typeparam name="T"></typeparam>
@@ -67,7 +67,7 @@ public Java.Util.Concurrent.Future<T> Submit<T>(Java.Util.Concurrent.Callable<T>
             return IExecuteWithSignature<Java.Util.Concurrent.Future<T>>("submit", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/AbstractExecutorService.html#invokeAll(java.util.Collection,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html#invokeAll(java.util.Collection,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -76,24 +76,24 @@ public Java.Util.Concurrent.Future<T> Submit<T>(Java.Util.Concurrent.Callable<T>
         /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_Callable_T_"><see cref="Java.Util.Concurrent.Callable{T}"/></typeparam>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
-        public Java.Util.List<Java.Util.Concurrent.Future<T>> InvokeAll<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2) where Arg0ExtendsJava_Util_Concurrent_Callable_T_: Java.Util.Concurrent.Callable<T>
+        public Java.Util.List<Java.Util.Concurrent.Future<T>> InvokeAll<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2) where Arg0ExtendsJava_Util_Concurrent_Callable_T_ : Java.Util.Concurrent.Callable<T>
         {
             return IExecute<Java.Util.List<Java.Util.Concurrent.Future<T>>>("invokeAll", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/AbstractExecutorService.html#invokeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html#invokeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_Callable_T_"><see cref="Java.Util.Concurrent.Callable{T}"/></typeparam>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
-        public Java.Util.List<Java.Util.Concurrent.Future<T>> InvokeAll<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_Callable_T_: Java.Util.Concurrent.Callable<T>
+        public Java.Util.List<Java.Util.Concurrent.Future<T>> InvokeAll<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_Callable_T_ : Java.Util.Concurrent.Callable<T>
         {
             return IExecuteWithSignature<Java.Util.List<Java.Util.Concurrent.Future<T>>>("invokeAll", "(Ljava/util/Collection;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/AbstractExecutorService.html#invokeAny(java.util.Collection,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html#invokeAny(java.util.Collection,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -104,12 +104,12 @@ public Java.Util.Concurrent.Future<T> Submit<T>(Java.Util.Concurrent.Callable<T>
         /// <exception cref="Java.Lang.InterruptedException"/>
         /// <exception cref="Java.Util.Concurrent.ExecutionException"/>
         /// <exception cref="Java.Util.Concurrent.TimeoutException"/>
-        public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2) where Arg0ExtendsJava_Util_Concurrent_Callable_T_: Java.Util.Concurrent.Callable<T>
+        public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2) where Arg0ExtendsJava_Util_Concurrent_Callable_T_ : Java.Util.Concurrent.Callable<T>
         {
             return IExecute<T>("invokeAny", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/AbstractExecutorService.html#invokeAny(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html#invokeAny(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="T"></typeparam>
@@ -117,12 +117,12 @@ public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Col
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
         /// <exception cref="Java.Util.Concurrent.ExecutionException"/>
-        public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_Callable_T_: Java.Util.Concurrent.Callable<T>
+        public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_Callable_T_ : Java.Util.Concurrent.Callable<T>
         {
             return IExecuteWithSignature<T>("invokeAny", "(Ljava/util/Collection;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/AbstractExecutorService.html#submit(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html#submit(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/AllPackageClasses.cs
index 93a136cd4..a8c718d30 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Concurrent
 {
     #region AbstractExecutorService
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/AbstractExecutorService.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/AbstractExecutorService.html"/>
     /// </summary>
     public partial class AbstractExecutorService : Java.Util.Concurrent.ExecutorService
     {
@@ -36,12 +36,12 @@ public partial class AbstractExecutorService : Java.Util.Concurrent.ExecutorServ
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractExecutorService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractExecutorService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public AbstractExecutorService(params object[] args) : base(args) { }
 
     #region ArrayBlockingQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html"/>
     /// </summary>
     public partial class ArrayBlockingQueue : Java.Util.AbstractQueue
     {
@@ -118,7 +118,7 @@ public ArrayBlockingQueue(params object[] args) : base(args) { }
 
     #region ArrayBlockingQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class ArrayBlockingQueue<E> : Java.Util.AbstractQueue<E>
@@ -163,7 +163,7 @@ public ArrayBlockingQueue(params object[] args) : base(args) { }
 
     #region BlockingDeque
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html"/>
     /// </summary>
     public partial class BlockingDeque : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BlockingDeque>
     {
@@ -171,12 +171,12 @@ public partial class BlockingDeque : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Blo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BlockingDeque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BlockingDeque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BlockingDeque() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BlockingDeque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BlockingDeque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BlockingDeque(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -209,7 +209,7 @@ public BlockingDeque(params object[] args) : base(args) { }
 
     #region BlockingDeque<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class BlockingDeque<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<BlockingDeque<E>>
@@ -218,12 +218,12 @@ public partial class BlockingDeque<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BlockingDeque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BlockingDeque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BlockingDeque() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BlockingDeque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BlockingDeque class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BlockingDeque(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -256,7 +256,7 @@ public BlockingDeque(params object[] args) : base(args) { }
 
     #region BlockingQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html"/>
     /// </summary>
     public partial class BlockingQueue : Java.Util.Queue
     {
@@ -264,12 +264,12 @@ public partial class BlockingQueue : Java.Util.Queue
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BlockingQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BlockingQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BlockingQueue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BlockingQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BlockingQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BlockingQueue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -302,7 +302,7 @@ public BlockingQueue(params object[] args) : base(args) { }
 
     #region BlockingQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class BlockingQueue<E> : Java.Util.Queue<E>
@@ -311,12 +311,12 @@ public partial class BlockingQueue<E> : Java.Util.Queue<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BlockingQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BlockingQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BlockingQueue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BlockingQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BlockingQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BlockingQueue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -349,7 +349,7 @@ public BlockingQueue(params object[] args) : base(args) { }
 
     #region BrokenBarrierException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BrokenBarrierException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/BrokenBarrierException.html"/>
     /// </summary>
     public partial class BrokenBarrierException : Java.Lang.Exception
     {
@@ -366,7 +366,7 @@ public partial class BrokenBarrierException : Java.Lang.Exception
 
     #region Callable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Callable.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Callable.html"/>
     /// </summary>
     public partial class Callable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callable>
     {
@@ -374,12 +374,12 @@ public partial class Callable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Callable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Callable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Callable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Callable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Callable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Callable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -412,7 +412,7 @@ public Callable(params object[] args) : base(args) { }
 
     #region Callable<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Callable.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Callable.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class Callable<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callable<V>>
@@ -421,12 +421,12 @@ public partial class Callable<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Calla
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Callable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Callable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Callable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Callable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Callable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Callable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -459,7 +459,7 @@ public Callable(params object[] args) : base(args) { }
 
     #region CancellationException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CancellationException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CancellationException.html"/>
     /// </summary>
     public partial class CancellationException : Java.Lang.IllegalStateException
     {
@@ -476,7 +476,7 @@ public partial class CancellationException : Java.Lang.IllegalStateException
 
     #region CompletableFuture
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html"/>
     /// </summary>
     public partial class CompletableFuture : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CompletableFuture>
     {
@@ -516,7 +516,7 @@ public CompletableFuture(params object[] args) : base(args) { }
         // TODO: complete the class
         #region AsynchronousCompletionTask
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.AsynchronousCompletionTask.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.AsynchronousCompletionTask.html"/>
         /// </summary>
         public partial class AsynchronousCompletionTask : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AsynchronousCompletionTask>
         {
@@ -524,12 +524,12 @@ public partial class AsynchronousCompletionTask : MASES.JCOBridge.C2JBridge.JVMB
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("AsynchronousCompletionTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AsynchronousCompletionTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AsynchronousCompletionTask() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("AsynchronousCompletionTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("AsynchronousCompletionTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public AsynchronousCompletionTask(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -566,7 +566,7 @@ public AsynchronousCompletionTask(params object[] args) : base(args) { }
 
     #region CompletableFuture<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class CompletableFuture<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CompletableFuture<T>>
@@ -611,7 +611,7 @@ public CompletableFuture(params object[] args) : base(args) { }
 
     #region CompletionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionException.html"/>
     /// </summary>
     public partial class CompletionException : Java.Lang.RuntimeException
     {
@@ -628,7 +628,7 @@ public partial class CompletionException : Java.Lang.RuntimeException
 
     #region CompletionService
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html"/>
     /// </summary>
     public partial class CompletionService : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CompletionService>
     {
@@ -636,12 +636,12 @@ public partial class CompletionService : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CompletionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CompletionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -674,7 +674,7 @@ public CompletionService(params object[] args) : base(args) { }
 
     #region CompletionService<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class CompletionService<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CompletionService<V>>
@@ -683,12 +683,12 @@ public partial class CompletionService<V> : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CompletionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CompletionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -721,7 +721,7 @@ public CompletionService(params object[] args) : base(args) { }
 
     #region CompletionStage
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html"/>
     /// </summary>
     public partial class CompletionStage : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CompletionStage>
     {
@@ -729,12 +729,12 @@ public partial class CompletionStage : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CompletionStage class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionStage class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionStage() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CompletionStage class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionStage class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionStage(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -767,7 +767,7 @@ public CompletionStage(params object[] args) : base(args) { }
 
     #region CompletionStage<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class CompletionStage<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CompletionStage<T>>
@@ -776,12 +776,12 @@ public partial class CompletionStage<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CompletionStage class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionStage class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionStage() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CompletionStage class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CompletionStage class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CompletionStage(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -814,7 +814,7 @@ public CompletionStage(params object[] args) : base(args) { }
 
     #region ConcurrentHashMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html"/>
     /// </summary>
     public partial class ConcurrentHashMap : Java.Util.AbstractMap
     {
@@ -854,7 +854,7 @@ public ConcurrentHashMap(params object[] args) : base(args) { }
         // TODO: complete the class
         #region KeySetView
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.KeySetView.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.KeySetView.html"/>
         /// </summary>
         public partial class KeySetView : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeySetView>
         {
@@ -898,7 +898,7 @@ public KeySetView(params object[] args) : base(args) { }
 
         #region KeySetView<K, V>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.KeySetView.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.KeySetView.html"/>
         /// </summary>
         /// <typeparam name="K"></typeparam>
         /// <typeparam name="V"></typeparam>
@@ -948,7 +948,7 @@ public KeySetView(params object[] args) : base(args) { }
 
     #region ConcurrentHashMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -994,7 +994,7 @@ public ConcurrentHashMap(params object[] args) : base(args) { }
 
     #region ConcurrentLinkedDeque
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html"/>
     /// </summary>
     public partial class ConcurrentLinkedDeque : Java.Util.AbstractCollection
     {
@@ -1038,7 +1038,7 @@ public ConcurrentLinkedDeque(params object[] args) : base(args) { }
 
     #region ConcurrentLinkedDeque<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class ConcurrentLinkedDeque<E> : Java.Util.AbstractCollection<E>
@@ -1083,7 +1083,7 @@ public ConcurrentLinkedDeque(params object[] args) : base(args) { }
 
     #region ConcurrentLinkedQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedQueue.html"/>
     /// </summary>
     public partial class ConcurrentLinkedQueue : Java.Util.AbstractQueue
     {
@@ -1127,7 +1127,7 @@ public ConcurrentLinkedQueue(params object[] args) : base(args) { }
 
     #region ConcurrentLinkedQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class ConcurrentLinkedQueue<E> : Java.Util.AbstractQueue<E>
@@ -1172,7 +1172,7 @@ public ConcurrentLinkedQueue(params object[] args) : base(args) { }
 
     #region ConcurrentMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html"/>
     /// </summary>
     public partial class ConcurrentMap : Java.Util.Map
     {
@@ -1180,12 +1180,12 @@ public partial class ConcurrentMap : Java.Util.Map
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ConcurrentMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConcurrentMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConcurrentMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ConcurrentMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConcurrentMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConcurrentMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1218,7 +1218,7 @@ public ConcurrentMap(params object[] args) : base(args) { }
 
     #region ConcurrentMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -1228,12 +1228,12 @@ public partial class ConcurrentMap<K, V> : Java.Util.Map<K, V>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ConcurrentMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConcurrentMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConcurrentMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ConcurrentMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConcurrentMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConcurrentMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1266,7 +1266,7 @@ public ConcurrentMap(params object[] args) : base(args) { }
 
     #region ConcurrentNavigableMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html"/>
     /// </summary>
     public partial class ConcurrentNavigableMap : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ConcurrentNavigableMap>
     {
@@ -1274,12 +1274,12 @@ public partial class ConcurrentNavigableMap : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ConcurrentNavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConcurrentNavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConcurrentNavigableMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ConcurrentNavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConcurrentNavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConcurrentNavigableMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1312,7 +1312,7 @@ public ConcurrentNavigableMap(params object[] args) : base(args) { }
 
     #region ConcurrentNavigableMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -1322,12 +1322,12 @@ public partial class ConcurrentNavigableMap<K, V> : MASES.JCOBridge.C2JBridge.JV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ConcurrentNavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConcurrentNavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConcurrentNavigableMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ConcurrentNavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConcurrentNavigableMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConcurrentNavigableMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1360,7 +1360,7 @@ public ConcurrentNavigableMap(params object[] args) : base(args) { }
 
     #region ConcurrentSkipListMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html"/>
     /// </summary>
     public partial class ConcurrentSkipListMap : Java.Util.AbstractMap
     {
@@ -1404,7 +1404,7 @@ public ConcurrentSkipListMap(params object[] args) : base(args) { }
 
     #region ConcurrentSkipListMap<K, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html"/>
     /// </summary>
     /// <typeparam name="K"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -1450,7 +1450,7 @@ public ConcurrentSkipListMap(params object[] args) : base(args) { }
 
     #region ConcurrentSkipListSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html"/>
     /// </summary>
     public partial class ConcurrentSkipListSet : Java.Util.AbstractSet
     {
@@ -1494,7 +1494,7 @@ public ConcurrentSkipListSet(params object[] args) : base(args) { }
 
     #region ConcurrentSkipListSet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class ConcurrentSkipListSet<E> : Java.Util.AbstractSet<E>
@@ -1539,7 +1539,7 @@ public ConcurrentSkipListSet(params object[] args) : base(args) { }
 
     #region CopyOnWriteArrayList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html"/>
     /// </summary>
     public partial class CopyOnWriteArrayList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CopyOnWriteArrayList>
     {
@@ -1583,7 +1583,7 @@ public CopyOnWriteArrayList(params object[] args) : base(args) { }
 
     #region CopyOnWriteArrayList<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class CopyOnWriteArrayList<E> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CopyOnWriteArrayList<E>>
@@ -1628,7 +1628,7 @@ public CopyOnWriteArrayList(params object[] args) : base(args) { }
 
     #region CopyOnWriteArraySet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArraySet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArraySet.html"/>
     /// </summary>
     public partial class CopyOnWriteArraySet : Java.Util.AbstractSet
     {
@@ -1672,7 +1672,7 @@ public CopyOnWriteArraySet(params object[] args) : base(args) { }
 
     #region CopyOnWriteArraySet<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArraySet.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArraySet.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class CopyOnWriteArraySet<E> : Java.Util.AbstractSet<E>
@@ -1717,7 +1717,7 @@ public CopyOnWriteArraySet(params object[] args) : base(args) { }
 
     #region CountDownLatch
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountDownLatch.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CountDownLatch.html"/>
     /// </summary>
     public partial class CountDownLatch : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CountDownLatch>
     {
@@ -1761,7 +1761,7 @@ public CountDownLatch(params object[] args) : base(args) { }
 
     #region CountedCompleter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html"/>
     /// </summary>
     public partial class CountedCompleter : Java.Util.Concurrent.ForkJoinTask
     {
@@ -1769,12 +1769,12 @@ public partial class CountedCompleter : Java.Util.Concurrent.ForkJoinTask
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CountedCompleter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CountedCompleter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CountedCompleter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CountedCompleter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CountedCompleter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CountedCompleter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1807,7 +1807,7 @@ public CountedCompleter(params object[] args) : base(args) { }
 
     #region CountedCompleter<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class CountedCompleter<T> : Java.Util.Concurrent.ForkJoinTask<T>
@@ -1816,12 +1816,12 @@ public partial class CountedCompleter<T> : Java.Util.Concurrent.ForkJoinTask<T>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CountedCompleter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CountedCompleter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CountedCompleter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CountedCompleter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CountedCompleter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CountedCompleter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1854,7 +1854,7 @@ public CountedCompleter(params object[] args) : base(args) { }
 
     #region CyclicBarrier
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html"/>
     /// </summary>
     public partial class CyclicBarrier : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CyclicBarrier>
     {
@@ -1898,7 +1898,7 @@ public CyclicBarrier(params object[] args) : base(args) { }
 
     #region Delayed
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Delayed.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Delayed.html"/>
     /// </summary>
     public partial class Delayed : Java.Lang.Comparable<Java.Util.Concurrent.Delayed>
     {
@@ -1906,12 +1906,12 @@ public partial class Delayed : Java.Lang.Comparable<Java.Util.Concurrent.Delayed
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Delayed class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Delayed class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Delayed() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Delayed class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Delayed class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Delayed(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1944,7 +1944,7 @@ public Delayed(params object[] args) : base(args) { }
 
     #region DelayQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html"/>
     /// </summary>
     public partial class DelayQueue : Java.Util.AbstractQueue
     {
@@ -1988,10 +1988,10 @@ public DelayQueue(params object[] args) : base(args) { }
 
     #region DelayQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html"/>
     /// </summary>
     /// <typeparam name="E"><see cref="Java.Util.Concurrent.IDelayed"/></typeparam>
-    public partial class DelayQueue<E> : Java.Util.AbstractQueue<E> where E: Java.Util.Concurrent.IDelayed, new()
+    public partial class DelayQueue<E> : Java.Util.AbstractQueue<E> where E : Java.Util.Concurrent.IDelayed, new()
     {
         const string _bridgeClassName = "java.util.concurrent.DelayQueue";
         /// <summary>
@@ -2033,7 +2033,7 @@ public DelayQueue(params object[] args) : base(args) { }
 
     #region Exchanger
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Exchanger.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Exchanger.html"/>
     /// </summary>
     public partial class Exchanger : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Exchanger>
     {
@@ -2077,7 +2077,7 @@ public Exchanger(params object[] args) : base(args) { }
 
     #region Exchanger<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Exchanger.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Exchanger.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class Exchanger<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Exchanger<V>>
@@ -2122,7 +2122,7 @@ public Exchanger(params object[] args) : base(args) { }
 
     #region ExecutionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutionException.html"/>
     /// </summary>
     public partial class ExecutionException : Java.Lang.Exception
     {
@@ -2139,7 +2139,7 @@ public partial class ExecutionException : Java.Lang.Exception
 
     #region Executor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executor.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Executor.html"/>
     /// </summary>
     public partial class Executor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Executor>
     {
@@ -2147,12 +2147,12 @@ public partial class Executor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Executor
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Executor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Executor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Executor() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Executor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Executor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Executor(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2185,7 +2185,7 @@ public Executor(params object[] args) : base(args) { }
 
     #region ExecutorCompletionService
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html"/>
     /// </summary>
     public partial class ExecutorCompletionService : Java.Util.Concurrent.CompletionService
     {
@@ -2229,7 +2229,7 @@ public ExecutorCompletionService(params object[] args) : base(args) { }
 
     #region ExecutorCompletionService<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class ExecutorCompletionService<V> : Java.Util.Concurrent.CompletionService<V>
@@ -2274,7 +2274,7 @@ public ExecutorCompletionService(params object[] args) : base(args) { }
 
     #region Executors
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html"/>
     /// </summary>
     public partial class Executors : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Executors>
     {
@@ -2318,7 +2318,7 @@ public Executors(params object[] args) : base(args) { }
 
     #region ExecutorService
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html"/>
     /// </summary>
     public partial class ExecutorService : Java.Util.Concurrent.Executor
     {
@@ -2326,12 +2326,12 @@ public partial class ExecutorService : Java.Util.Concurrent.Executor
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ExecutorService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ExecutorService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2364,7 +2364,7 @@ public ExecutorService(params object[] args) : base(args) { }
 
     #region Flow
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.html"/>
     /// </summary>
     public partial class Flow : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Flow>
     {
@@ -2404,7 +2404,7 @@ public Flow(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Processor
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Processor.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Processor.html"/>
         /// </summary>
         public partial class Processor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Processor>
         {
@@ -2412,12 +2412,12 @@ public partial class Processor : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Process
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Processor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Processor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Processor() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Processor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Processor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Processor(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2450,7 +2450,7 @@ public Processor(params object[] args) : base(args) { }
 
         #region Processor<T, R>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Processor.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Processor.html"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="R"></typeparam>
@@ -2460,12 +2460,12 @@ public partial class Processor<T, R> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<P
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Processor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Processor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Processor() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Processor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Processor class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Processor(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2498,7 +2498,7 @@ public Processor(params object[] args) : base(args) { }
 
         #region Publisher
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Publisher.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Publisher.html"/>
         /// </summary>
         public partial class Publisher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Publisher>
         {
@@ -2506,12 +2506,12 @@ public partial class Publisher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Publish
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Publisher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Publisher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Publisher() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Publisher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Publisher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Publisher(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2544,7 +2544,7 @@ public Publisher(params object[] args) : base(args) { }
 
         #region Publisher<T>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Publisher.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Publisher.html"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         public partial class Publisher<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Publisher<T>>
@@ -2553,12 +2553,12 @@ public partial class Publisher<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Publ
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Publisher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Publisher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Publisher() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Publisher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Publisher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Publisher(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2591,7 +2591,7 @@ public Publisher(params object[] args) : base(args) { }
 
         #region Subscriber
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html"/>
         /// </summary>
         public partial class Subscriber : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Subscriber>
         {
@@ -2599,12 +2599,12 @@ public partial class Subscriber : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Subscr
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Subscriber class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Subscriber class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Subscriber() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Subscriber class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Subscriber class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Subscriber(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2637,7 +2637,7 @@ public Subscriber(params object[] args) : base(args) { }
 
         #region Subscriber<T>
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         public partial class Subscriber<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Subscriber<T>>
@@ -2646,12 +2646,12 @@ public partial class Subscriber<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sub
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Subscriber class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Subscriber class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Subscriber() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Subscriber class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Subscriber class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Subscriber(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2684,7 +2684,7 @@ public Subscriber(params object[] args) : base(args) { }
 
         #region Subscription
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscription.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscription.html"/>
         /// </summary>
         public partial class Subscription : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Subscription>
         {
@@ -2692,12 +2692,12 @@ public partial class Subscription : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Subs
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("Subscription class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Subscription class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Subscription() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("Subscription class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("Subscription class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public Subscription(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2734,7 +2734,7 @@ public Subscription(params object[] args) : base(args) { }
 
     #region ForkJoinPool
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html"/>
     /// </summary>
     public partial class ForkJoinPool : Java.Util.Concurrent.AbstractExecutorService
     {
@@ -2774,7 +2774,7 @@ public ForkJoinPool(params object[] args) : base(args) { }
         // TODO: complete the class
         #region ForkJoinWorkerThreadFactory
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.ForkJoinWorkerThreadFactory.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.ForkJoinWorkerThreadFactory.html"/>
         /// </summary>
         public partial class ForkJoinWorkerThreadFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ForkJoinWorkerThreadFactory>
         {
@@ -2782,12 +2782,12 @@ public partial class ForkJoinWorkerThreadFactory : MASES.JCOBridge.C2JBridge.JVM
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ForkJoinWorkerThreadFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ForkJoinWorkerThreadFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ForkJoinWorkerThreadFactory() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ForkJoinWorkerThreadFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ForkJoinWorkerThreadFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ForkJoinWorkerThreadFactory(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2820,7 +2820,7 @@ public ForkJoinWorkerThreadFactory(params object[] args) : base(args) { }
 
         #region ManagedBlocker
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.ManagedBlocker.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.ManagedBlocker.html"/>
         /// </summary>
         public partial class ManagedBlocker : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ManagedBlocker>
         {
@@ -2828,12 +2828,12 @@ public partial class ManagedBlocker : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ma
             /// <summary>
             /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
             /// </summary>
-            [Obsolete("ManagedBlocker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ManagedBlocker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ManagedBlocker() { }
             /// <summary>
             /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
             /// </summary>
-            [Obsolete("ManagedBlocker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            [global::System.Obsolete("ManagedBlocker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
             public ManagedBlocker(params object[] args) : base(args) { }
 
             private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2870,7 +2870,7 @@ public ManagedBlocker(params object[] args) : base(args) { }
 
     #region ForkJoinTask
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html"/>
     /// </summary>
     public partial class ForkJoinTask : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ForkJoinTask>
     {
@@ -2878,12 +2878,12 @@ public partial class ForkJoinTask : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Fork
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ForkJoinTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ForkJoinTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ForkJoinTask() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ForkJoinTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ForkJoinTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ForkJoinTask(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2916,7 +2916,7 @@ public ForkJoinTask(params object[] args) : base(args) { }
 
     #region ForkJoinTask<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class ForkJoinTask<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ForkJoinTask<V>>
@@ -2925,12 +2925,12 @@ public partial class ForkJoinTask<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<F
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ForkJoinTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ForkJoinTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ForkJoinTask() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ForkJoinTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ForkJoinTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ForkJoinTask(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -2963,7 +2963,7 @@ public ForkJoinTask(params object[] args) : base(args) { }
 
     #region ForkJoinWorkerThread
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinWorkerThread.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinWorkerThread.html"/>
     /// </summary>
     public partial class ForkJoinWorkerThread : Java.Lang.Thread
     {
@@ -3007,7 +3007,7 @@ public ForkJoinWorkerThread(params object[] args) : base(args) { }
 
     #region Future
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html"/>
     /// </summary>
     public partial class Future : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Future>
     {
@@ -3015,12 +3015,12 @@ public partial class Future : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Future>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Future class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Future class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Future() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Future class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Future class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Future(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3053,7 +3053,7 @@ public Future(params object[] args) : base(args) { }
 
     #region Future<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class Future<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Future<V>>
@@ -3062,12 +3062,12 @@ public partial class Future<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Future<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Future class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Future class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Future() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Future class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Future class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Future(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3100,7 +3100,7 @@ public Future(params object[] args) : base(args) { }
 
     #region FutureTask
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html"/>
     /// </summary>
     public partial class FutureTask : Java.Util.Concurrent.RunnableFuture
     {
@@ -3144,7 +3144,7 @@ public FutureTask(params object[] args) : base(args) { }
 
     #region FutureTask<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class FutureTask<V> : Java.Util.Concurrent.RunnableFuture<V>
@@ -3189,7 +3189,7 @@ public FutureTask(params object[] args) : base(args) { }
 
     #region LinkedBlockingDeque
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html"/>
     /// </summary>
     public partial class LinkedBlockingDeque : Java.Util.AbstractQueue
     {
@@ -3233,7 +3233,7 @@ public LinkedBlockingDeque(params object[] args) : base(args) { }
 
     #region LinkedBlockingDeque<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class LinkedBlockingDeque<E> : Java.Util.AbstractQueue<E>
@@ -3278,7 +3278,7 @@ public LinkedBlockingDeque(params object[] args) : base(args) { }
 
     #region LinkedBlockingQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html"/>
     /// </summary>
     public partial class LinkedBlockingQueue : Java.Util.AbstractQueue
     {
@@ -3322,7 +3322,7 @@ public LinkedBlockingQueue(params object[] args) : base(args) { }
 
     #region LinkedBlockingQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class LinkedBlockingQueue<E> : Java.Util.AbstractQueue<E>
@@ -3367,7 +3367,7 @@ public LinkedBlockingQueue(params object[] args) : base(args) { }
 
     #region LinkedTransferQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html"/>
     /// </summary>
     public partial class LinkedTransferQueue : Java.Util.AbstractQueue
     {
@@ -3411,7 +3411,7 @@ public LinkedTransferQueue(params object[] args) : base(args) { }
 
     #region LinkedTransferQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class LinkedTransferQueue<E> : Java.Util.AbstractQueue<E>
@@ -3456,7 +3456,7 @@ public LinkedTransferQueue(params object[] args) : base(args) { }
 
     #region Phaser
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html"/>
     /// </summary>
     public partial class Phaser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Phaser>
     {
@@ -3500,7 +3500,7 @@ public Phaser(params object[] args) : base(args) { }
 
     #region PriorityBlockingQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html"/>
     /// </summary>
     public partial class PriorityBlockingQueue : Java.Util.AbstractQueue
     {
@@ -3544,7 +3544,7 @@ public PriorityBlockingQueue(params object[] args) : base(args) { }
 
     #region PriorityBlockingQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class PriorityBlockingQueue<E> : Java.Util.AbstractQueue<E>
@@ -3589,7 +3589,7 @@ public PriorityBlockingQueue(params object[] args) : base(args) { }
 
     #region RecursiveAction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RecursiveAction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RecursiveAction.html"/>
     /// </summary>
     public partial class RecursiveAction : Java.Util.Concurrent.ForkJoinTask<Java.Lang.Void>
     {
@@ -3597,12 +3597,12 @@ public partial class RecursiveAction : Java.Util.Concurrent.ForkJoinTask<Java.La
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RecursiveAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecursiveAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecursiveAction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RecursiveAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecursiveAction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecursiveAction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3635,7 +3635,7 @@ public RecursiveAction(params object[] args) : base(args) { }
 
     #region RecursiveTask
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RecursiveTask.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RecursiveTask.html"/>
     /// </summary>
     public partial class RecursiveTask : Java.Util.Concurrent.ForkJoinTask
     {
@@ -3643,12 +3643,12 @@ public partial class RecursiveTask : Java.Util.Concurrent.ForkJoinTask
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RecursiveTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecursiveTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecursiveTask() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RecursiveTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecursiveTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecursiveTask(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3681,7 +3681,7 @@ public RecursiveTask(params object[] args) : base(args) { }
 
     #region RecursiveTask<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RecursiveTask.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RecursiveTask.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class RecursiveTask<V> : Java.Util.Concurrent.ForkJoinTask<V>
@@ -3690,12 +3690,12 @@ public partial class RecursiveTask<V> : Java.Util.Concurrent.ForkJoinTask<V>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RecursiveTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecursiveTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecursiveTask() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RecursiveTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RecursiveTask class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RecursiveTask(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3728,7 +3728,7 @@ public RecursiveTask(params object[] args) : base(args) { }
 
     #region RejectedExecutionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RejectedExecutionException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionException.html"/>
     /// </summary>
     public partial class RejectedExecutionException : Java.Lang.RuntimeException
     {
@@ -3745,7 +3745,7 @@ public partial class RejectedExecutionException : Java.Lang.RuntimeException
 
     #region RejectedExecutionHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RejectedExecutionHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionHandler.html"/>
     /// </summary>
     public partial class RejectedExecutionHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RejectedExecutionHandler>
     {
@@ -3753,12 +3753,12 @@ public partial class RejectedExecutionHandler : MASES.JCOBridge.C2JBridge.JVMBri
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RejectedExecutionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RejectedExecutionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RejectedExecutionHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RejectedExecutionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RejectedExecutionHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RejectedExecutionHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3791,7 +3791,7 @@ public RejectedExecutionHandler(params object[] args) : base(args) { }
 
     #region RunnableFuture
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RunnableFuture.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RunnableFuture.html"/>
     /// </summary>
     public partial class RunnableFuture : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RunnableFuture>
     {
@@ -3799,12 +3799,12 @@ public partial class RunnableFuture : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ru
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RunnableFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RunnableFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RunnableFuture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RunnableFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RunnableFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RunnableFuture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3837,7 +3837,7 @@ public RunnableFuture(params object[] args) : base(args) { }
 
     #region RunnableFuture<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RunnableFuture.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RunnableFuture.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class RunnableFuture<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RunnableFuture<V>>
@@ -3846,12 +3846,12 @@ public partial class RunnableFuture<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RunnableFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RunnableFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RunnableFuture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RunnableFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RunnableFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RunnableFuture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3884,7 +3884,7 @@ public RunnableFuture(params object[] args) : base(args) { }
 
     #region RunnableScheduledFuture
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RunnableScheduledFuture.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RunnableScheduledFuture.html"/>
     /// </summary>
     public partial class RunnableScheduledFuture : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RunnableScheduledFuture>
     {
@@ -3892,12 +3892,12 @@ public partial class RunnableScheduledFuture : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RunnableScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RunnableScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RunnableScheduledFuture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RunnableScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RunnableScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RunnableScheduledFuture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3930,7 +3930,7 @@ public RunnableScheduledFuture(params object[] args) : base(args) { }
 
     #region RunnableScheduledFuture<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RunnableScheduledFuture.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/RunnableScheduledFuture.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class RunnableScheduledFuture<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RunnableScheduledFuture<V>>
@@ -3939,12 +3939,12 @@ public partial class RunnableScheduledFuture<V> : MASES.JCOBridge.C2JBridge.JVMB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RunnableScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RunnableScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RunnableScheduledFuture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RunnableScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RunnableScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RunnableScheduledFuture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -3977,7 +3977,7 @@ public RunnableScheduledFuture(params object[] args) : base(args) { }
 
     #region ScheduledExecutorService
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledExecutorService.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledExecutorService.html"/>
     /// </summary>
     public partial class ScheduledExecutorService : Java.Util.Concurrent.ExecutorService
     {
@@ -3985,12 +3985,12 @@ public partial class ScheduledExecutorService : Java.Util.Concurrent.ExecutorSer
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ScheduledExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScheduledExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScheduledExecutorService() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ScheduledExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScheduledExecutorService class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScheduledExecutorService(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4023,7 +4023,7 @@ public ScheduledExecutorService(params object[] args) : base(args) { }
 
     #region ScheduledFuture
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledFuture.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledFuture.html"/>
     /// </summary>
     public partial class ScheduledFuture : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ScheduledFuture>
     {
@@ -4031,12 +4031,12 @@ public partial class ScheduledFuture : MASES.JCOBridge.C2JBridge.JVMBridgeBase<S
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScheduledFuture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScheduledFuture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4069,7 +4069,7 @@ public ScheduledFuture(params object[] args) : base(args) { }
 
     #region ScheduledFuture<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledFuture.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledFuture.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class ScheduledFuture<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ScheduledFuture<V>>
@@ -4078,12 +4078,12 @@ public partial class ScheduledFuture<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScheduledFuture() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ScheduledFuture class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ScheduledFuture(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4116,7 +4116,7 @@ public ScheduledFuture(params object[] args) : base(args) { }
 
     #region ScheduledThreadPoolExecutor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html"/>
     /// </summary>
     public partial class ScheduledThreadPoolExecutor : Java.Util.Concurrent.ThreadPoolExecutor
     {
@@ -4160,7 +4160,7 @@ public ScheduledThreadPoolExecutor(params object[] args) : base(args) { }
 
     #region Semaphore
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html"/>
     /// </summary>
     public partial class Semaphore : Java.Io.Serializable
     {
@@ -4204,7 +4204,7 @@ public Semaphore(params object[] args) : base(args) { }
 
     #region SubmissionPublisher
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html"/>
     /// </summary>
     public partial class SubmissionPublisher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SubmissionPublisher>
     {
@@ -4248,7 +4248,7 @@ public SubmissionPublisher(params object[] args) : base(args) { }
 
     #region SubmissionPublisher<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class SubmissionPublisher<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SubmissionPublisher<T>>
@@ -4293,7 +4293,7 @@ public SubmissionPublisher(params object[] args) : base(args) { }
 
     #region SynchronousQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html"/>
     /// </summary>
     public partial class SynchronousQueue : Java.Util.AbstractQueue
     {
@@ -4337,7 +4337,7 @@ public SynchronousQueue(params object[] args) : base(args) { }
 
     #region SynchronousQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class SynchronousQueue<E> : Java.Util.AbstractQueue<E>
@@ -4382,7 +4382,7 @@ public SynchronousQueue(params object[] args) : base(args) { }
 
     #region ThreadFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadFactory.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadFactory.html"/>
     /// </summary>
     public partial class ThreadFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ThreadFactory>
     {
@@ -4390,12 +4390,12 @@ public partial class ThreadFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Thr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ThreadFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ThreadFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ThreadFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ThreadFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ThreadFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ThreadFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4428,7 +4428,7 @@ public ThreadFactory(params object[] args) : base(args) { }
 
     #region ThreadLocalRandom
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadLocalRandom.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom.html"/>
     /// </summary>
     public partial class ThreadLocalRandom : Java.Util.Random
     {
@@ -4472,7 +4472,7 @@ public ThreadLocalRandom(params object[] args) : base(args) { }
 
     #region ThreadPoolExecutor
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html"/>
     /// </summary>
     public partial class ThreadPoolExecutor : Java.Util.Concurrent.AbstractExecutorService
     {
@@ -4512,7 +4512,7 @@ public ThreadPoolExecutor(params object[] args) : base(args) { }
         // TODO: complete the class
         #region AbortPolicy
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.AbortPolicy.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.AbortPolicy.html"/>
         /// </summary>
         public partial class AbortPolicy : Java.Util.Concurrent.RejectedExecutionHandler
         {
@@ -4556,7 +4556,7 @@ public AbortPolicy(params object[] args) : base(args) { }
 
         #region CallerRunsPolicy
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.CallerRunsPolicy.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.CallerRunsPolicy.html"/>
         /// </summary>
         public partial class CallerRunsPolicy : Java.Util.Concurrent.RejectedExecutionHandler
         {
@@ -4600,7 +4600,7 @@ public CallerRunsPolicy(params object[] args) : base(args) { }
 
         #region DiscardOldestPolicy
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.DiscardOldestPolicy.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.DiscardOldestPolicy.html"/>
         /// </summary>
         public partial class DiscardOldestPolicy : Java.Util.Concurrent.RejectedExecutionHandler
         {
@@ -4644,7 +4644,7 @@ public DiscardOldestPolicy(params object[] args) : base(args) { }
 
         #region DiscardPolicy
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.DiscardPolicy.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.DiscardPolicy.html"/>
         /// </summary>
         public partial class DiscardPolicy : Java.Util.Concurrent.RejectedExecutionHandler
         {
@@ -4692,7 +4692,7 @@ public DiscardPolicy(params object[] args) : base(args) { }
 
     #region TimeoutException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeoutException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeoutException.html"/>
     /// </summary>
     public partial class TimeoutException : Java.Lang.Exception
     {
@@ -4709,7 +4709,7 @@ public partial class TimeoutException : Java.Lang.Exception
 
     #region TimeUnit
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html"/>
     /// </summary>
     public partial class TimeUnit : Java.Lang.Enum<Java.Util.Concurrent.TimeUnit>
     {
@@ -4753,7 +4753,7 @@ public TimeUnit(params object[] args) : base(args) { }
 
     #region TransferQueue
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html"/>
     /// </summary>
     public partial class TransferQueue : Java.Util.Concurrent.BlockingQueue
     {
@@ -4761,12 +4761,12 @@ public partial class TransferQueue : Java.Util.Concurrent.BlockingQueue
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TransferQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransferQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransferQueue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TransferQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransferQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransferQueue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -4799,7 +4799,7 @@ public TransferQueue(params object[] args) : base(args) { }
 
     #region TransferQueue<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class TransferQueue<E> : Java.Util.Concurrent.BlockingQueue<E>
@@ -4808,12 +4808,12 @@ public partial class TransferQueue<E> : Java.Util.Concurrent.BlockingQueue<E>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TransferQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransferQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransferQueue() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TransferQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransferQueue class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransferQueue(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ArrayBlockingQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ArrayBlockingQueue.cs
index 7f7c2486e..720f9273d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ArrayBlockingQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ArrayBlockingQueue.cs
@@ -30,7 +30,7 @@ public partial class ArrayBlockingQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int,boolean,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int,boolean,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -40,7 +40,7 @@ public ArrayBlockingQueue(int arg0, bool arg1, Java.Util.Collection arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -49,7 +49,7 @@ public ArrayBlockingQueue(int arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ArrayBlockingQueue(int arg0)
@@ -81,7 +81,7 @@ public ArrayBlockingQueue(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -93,7 +93,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -104,7 +104,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -113,7 +113,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -123,7 +123,7 @@ public int DrainTo(Java.Util.Collection arg0, int arg1)
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -132,7 +132,7 @@ public int DrainTo(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -140,7 +140,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -164,7 +164,7 @@ public partial class ArrayBlockingQueue<E> : Java.Util.Concurrent.IBlockingQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int,boolean,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int,boolean,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -174,7 +174,7 @@ public ArrayBlockingQueue(int arg0, bool arg1, Java.Util.Collection<E> arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -183,7 +183,7 @@ public ArrayBlockingQueue(int arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ArrayBlockingQueue(int arg0)
@@ -219,7 +219,7 @@ public ArrayBlockingQueue(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -231,7 +231,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -242,7 +242,7 @@ public E Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#take()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -251,28 +251,28 @@ public E Take()
             return IExecuteWithSignature<E>("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE : E
         {
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -280,7 +280,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ArrayBlockingQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ArrayBlockingQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AllPackageClasses.cs
index 36d456b99..b23ca90bc 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Concurrent.Atomic
 {
     #region AtomicBoolean
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html"/>
     /// </summary>
     public partial class AtomicBoolean : Java.Io.Serializable
     {
@@ -72,7 +72,7 @@ public AtomicBoolean(params object[] args) : base(args) { }
 
     #region AtomicInteger
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html"/>
     /// </summary>
     public partial class AtomicInteger : Java.Lang.Number
     {
@@ -116,7 +116,7 @@ public AtomicInteger(params object[] args) : base(args) { }
 
     #region AtomicIntegerArray
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html"/>
     /// </summary>
     public partial class AtomicIntegerArray : Java.Io.Serializable
     {
@@ -160,7 +160,7 @@ public AtomicIntegerArray(params object[] args) : base(args) { }
 
     #region AtomicIntegerFieldUpdater
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html"/>
     /// </summary>
     public partial class AtomicIntegerFieldUpdater : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicIntegerFieldUpdater>
     {
@@ -168,12 +168,12 @@ public partial class AtomicIntegerFieldUpdater : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AtomicIntegerFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicIntegerFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicIntegerFieldUpdater() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AtomicIntegerFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicIntegerFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicIntegerFieldUpdater(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -206,7 +206,7 @@ public AtomicIntegerFieldUpdater(params object[] args) : base(args) { }
 
     #region AtomicIntegerFieldUpdater<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class AtomicIntegerFieldUpdater<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicIntegerFieldUpdater<T>>
@@ -215,12 +215,12 @@ public partial class AtomicIntegerFieldUpdater<T> : MASES.JCOBridge.C2JBridge.JV
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AtomicIntegerFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicIntegerFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicIntegerFieldUpdater() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AtomicIntegerFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicIntegerFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicIntegerFieldUpdater(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -253,7 +253,7 @@ public AtomicIntegerFieldUpdater(params object[] args) : base(args) { }
 
     #region AtomicLong
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html"/>
     /// </summary>
     public partial class AtomicLong : Java.Lang.Number
     {
@@ -297,7 +297,7 @@ public AtomicLong(params object[] args) : base(args) { }
 
     #region AtomicLongArray
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html"/>
     /// </summary>
     public partial class AtomicLongArray : Java.Io.Serializable
     {
@@ -341,7 +341,7 @@ public AtomicLongArray(params object[] args) : base(args) { }
 
     #region AtomicLongFieldUpdater
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html"/>
     /// </summary>
     public partial class AtomicLongFieldUpdater : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicLongFieldUpdater>
     {
@@ -349,12 +349,12 @@ public partial class AtomicLongFieldUpdater : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AtomicLongFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicLongFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicLongFieldUpdater() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AtomicLongFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicLongFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicLongFieldUpdater(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -387,7 +387,7 @@ public AtomicLongFieldUpdater(params object[] args) : base(args) { }
 
     #region AtomicLongFieldUpdater<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class AtomicLongFieldUpdater<T> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicLongFieldUpdater<T>>
@@ -396,12 +396,12 @@ public partial class AtomicLongFieldUpdater<T> : MASES.JCOBridge.C2JBridge.JVMBr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AtomicLongFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicLongFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicLongFieldUpdater() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AtomicLongFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicLongFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicLongFieldUpdater(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -434,7 +434,7 @@ public AtomicLongFieldUpdater(params object[] args) : base(args) { }
 
     #region AtomicMarkableReference
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html"/>
     /// </summary>
     public partial class AtomicMarkableReference : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicMarkableReference>
     {
@@ -478,7 +478,7 @@ public AtomicMarkableReference(params object[] args) : base(args) { }
 
     #region AtomicMarkableReference<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class AtomicMarkableReference<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicMarkableReference<V>>
@@ -523,7 +523,7 @@ public AtomicMarkableReference(params object[] args) : base(args) { }
 
     #region AtomicReference
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html"/>
     /// </summary>
     public partial class AtomicReference : Java.Io.Serializable
     {
@@ -567,7 +567,7 @@ public AtomicReference(params object[] args) : base(args) { }
 
     #region AtomicReference<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class AtomicReference<V> : Java.Io.Serializable
@@ -612,7 +612,7 @@ public AtomicReference(params object[] args) : base(args) { }
 
     #region AtomicReferenceArray
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html"/>
     /// </summary>
     public partial class AtomicReferenceArray : Java.Io.Serializable
     {
@@ -656,7 +656,7 @@ public AtomicReferenceArray(params object[] args) : base(args) { }
 
     #region AtomicReferenceArray<E>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html"/>
     /// </summary>
     /// <typeparam name="E"></typeparam>
     public partial class AtomicReferenceArray<E> : Java.Io.Serializable
@@ -701,7 +701,7 @@ public AtomicReferenceArray(params object[] args) : base(args) { }
 
     #region AtomicReferenceFieldUpdater
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html"/>
     /// </summary>
     public partial class AtomicReferenceFieldUpdater : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicReferenceFieldUpdater>
     {
@@ -709,12 +709,12 @@ public partial class AtomicReferenceFieldUpdater : MASES.JCOBridge.C2JBridge.JVM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AtomicReferenceFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicReferenceFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicReferenceFieldUpdater() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AtomicReferenceFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicReferenceFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicReferenceFieldUpdater(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -747,7 +747,7 @@ public AtomicReferenceFieldUpdater(params object[] args) : base(args) { }
 
     #region AtomicReferenceFieldUpdater<T, V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="V"></typeparam>
@@ -757,12 +757,12 @@ public partial class AtomicReferenceFieldUpdater<T, V> : MASES.JCOBridge.C2JBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AtomicReferenceFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicReferenceFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicReferenceFieldUpdater() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AtomicReferenceFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AtomicReferenceFieldUpdater class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AtomicReferenceFieldUpdater(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -795,7 +795,7 @@ public AtomicReferenceFieldUpdater(params object[] args) : base(args) { }
 
     #region AtomicStampedReference
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html"/>
     /// </summary>
     public partial class AtomicStampedReference : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicStampedReference>
     {
@@ -839,7 +839,7 @@ public AtomicStampedReference(params object[] args) : base(args) { }
 
     #region AtomicStampedReference<V>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html"/>
     /// </summary>
     /// <typeparam name="V"></typeparam>
     public partial class AtomicStampedReference<V> : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AtomicStampedReference<V>>
@@ -884,7 +884,7 @@ public AtomicStampedReference(params object[] args) : base(args) { }
 
     #region DoubleAccumulator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAccumulator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAccumulator.html"/>
     /// </summary>
     public partial class DoubleAccumulator : Java.Io.Serializable
     {
@@ -928,7 +928,7 @@ public DoubleAccumulator(params object[] args) : base(args) { }
 
     #region DoubleAdder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAdder.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAdder.html"/>
     /// </summary>
     public partial class DoubleAdder : Java.Io.Serializable
     {
@@ -972,7 +972,7 @@ public DoubleAdder(params object[] args) : base(args) { }
 
     #region LongAccumulator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAccumulator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAccumulator.html"/>
     /// </summary>
     public partial class LongAccumulator : Java.Io.Serializable
     {
@@ -1016,7 +1016,7 @@ public LongAccumulator(params object[] args) : base(args) { }
 
     #region LongAdder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAdder.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAdder.html"/>
     /// </summary>
     public partial class LongAdder : Java.Io.Serializable
     {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicBoolean.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicBoolean.cs
index fa64bfda5..2b245aa6f 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicBoolean.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicBoolean.cs
@@ -30,7 +30,7 @@ public partial class AtomicBoolean
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#%3Cinit%3E(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public AtomicBoolean(bool arg0)
@@ -54,39 +54,18 @@ public AtomicBoolean(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#getAcquire()"/> 
-        /// </summary>
-        public bool Acquire
-        {
-            get { return IExecuteWithSignature<bool>("getAcquire", "()Z"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#getOpaque()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#setOpaque(boolean)"/>
-        /// </summary>
-        public bool Opaque
-        {
-            get { return IExecuteWithSignature<bool>("getOpaque", "()Z"); } set { IExecuteWithSignature("setOpaque", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#getPlain()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#setPlain(boolean)"/>
-        /// </summary>
-        public bool Plain
-        {
-            get { return IExecuteWithSignature<bool>("getPlain", "()Z"); } set { IExecuteWithSignature("setPlain", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSet(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSet(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(bool arg0, bool arg1)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSetPlain(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSetPlain(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -96,7 +75,7 @@ public bool WeakCompareAndSetPlain(bool arg0, bool arg1)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#compareAndExchange(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#compareAndExchange(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -106,7 +85,7 @@ public bool CompareAndExchange(bool arg0, bool arg1)
             return IExecute<bool>("compareAndExchange", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#compareAndExchangeAcquire(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#compareAndExchangeAcquire(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -116,7 +95,7 @@ public bool CompareAndExchangeAcquire(bool arg0, bool arg1)
             return IExecute<bool>("compareAndExchangeAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#compareAndExchangeRelease(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#compareAndExchangeRelease(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -126,7 +105,7 @@ public bool CompareAndExchangeRelease(bool arg0, bool arg1)
             return IExecute<bool>("compareAndExchangeRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#compareAndSet(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#compareAndSet(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -136,7 +115,7 @@ public bool CompareAndSet(bool arg0, bool arg1)
             return IExecute<bool>("compareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#get()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Get()
@@ -144,7 +123,15 @@ public bool Get()
             return IExecuteWithSignature<bool>("get", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#getAndSet(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#getAcquire()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAcquire()
+        {
+            return IExecuteWithSignature<bool>("getAcquire", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#getAndSet(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -153,7 +140,23 @@ public bool GetAndSet(bool arg0)
             return IExecuteWithSignature<bool>("getAndSet", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSetAcquire(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#getOpaque()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetOpaque()
+        {
+            return IExecuteWithSignature<bool>("getOpaque", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#getPlain()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetPlain()
+        {
+            return IExecuteWithSignature<bool>("getPlain", "()Z");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSetAcquire(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -163,7 +166,7 @@ public bool WeakCompareAndSetAcquire(bool arg0, bool arg1)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSetRelease(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSetRelease(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -173,7 +176,7 @@ public bool WeakCompareAndSetRelease(bool arg0, bool arg1)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSetVolatile(boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#weakCompareAndSetVolatile(boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -183,7 +186,7 @@ public bool WeakCompareAndSetVolatile(bool arg0, bool arg1)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#lazySet(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#lazySet(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void LazySet(bool arg0)
@@ -191,7 +194,7 @@ public void LazySet(bool arg0)
             IExecuteWithSignature("lazySet", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#set(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#set(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void Set(bool arg0)
@@ -199,7 +202,23 @@ public void Set(bool arg0)
             IExecuteWithSignature("set", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicBoolean.html#setRelease(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#setOpaque(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetOpaque(bool arg0)
+        {
+            IExecuteWithSignature("setOpaque", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#setPlain(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetPlain(bool arg0)
+        {
+            IExecuteWithSignature("setPlain", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicBoolean.html#setRelease(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetRelease(bool arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicInteger.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicInteger.cs
index 34a3d909c..035eb834a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicInteger.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicInteger.cs
@@ -30,7 +30,7 @@ public partial class AtomicInteger
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public AtomicInteger(int arg0)
@@ -54,42 +54,7 @@ public AtomicInteger(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getAcquire()"/> 
-        /// </summary>
-        public int Acquire
-        {
-            get { return IExecuteWithSignature<int>("getAcquire", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getAndDecrement()"/> 
-        /// </summary>
-        public int AndDecrement
-        {
-            get { return IExecuteWithSignature<int>("getAndDecrement", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getAndIncrement()"/> 
-        /// </summary>
-        public int AndIncrement
-        {
-            get { return IExecuteWithSignature<int>("getAndIncrement", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getOpaque()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#setOpaque(int)"/>
-        /// </summary>
-        public int Opaque
-        {
-            get { return IExecuteWithSignature<int>("getOpaque", "()I"); } set { IExecuteWithSignature("setOpaque", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getPlain()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#setPlain(int)"/>
-        /// </summary>
-        public int Plain
-        {
-            get { return IExecuteWithSignature<int>("getPlain", "()I"); } set { IExecuteWithSignature("setPlain", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#compareAndSet(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#compareAndSet(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -99,18 +64,18 @@ public bool CompareAndSet(int arg0, int arg1)
             return IExecute<bool>("compareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSet(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSet(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(int arg0, int arg1)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSetAcquire(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSetAcquire(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -120,7 +85,7 @@ public bool WeakCompareAndSetAcquire(int arg0, int arg1)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSetPlain(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSetPlain(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -130,7 +95,7 @@ public bool WeakCompareAndSetPlain(int arg0, int arg1)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSetRelease(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSetRelease(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -140,7 +105,7 @@ public bool WeakCompareAndSetRelease(int arg0, int arg1)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSetVolatile(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#weakCompareAndSetVolatile(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -150,7 +115,7 @@ public bool WeakCompareAndSetVolatile(int arg0, int arg1)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#accumulateAndGet(int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#accumulateAndGet(int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntBinaryOperator"/></param>
@@ -160,7 +125,7 @@ public int AccumulateAndGet(int arg0, Java.Util.Function.IntBinaryOperator arg1)
             return IExecute<int>("accumulateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#addAndGet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#addAndGet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -169,7 +134,7 @@ public int AddAndGet(int arg0)
             return IExecuteWithSignature<int>("addAndGet", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#compareAndExchange(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#compareAndExchange(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -179,7 +144,7 @@ public int CompareAndExchange(int arg0, int arg1)
             return IExecute<int>("compareAndExchange", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#compareAndExchangeAcquire(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#compareAndExchangeAcquire(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -189,7 +154,7 @@ public int CompareAndExchangeAcquire(int arg0, int arg1)
             return IExecute<int>("compareAndExchangeAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#compareAndExchangeRelease(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#compareAndExchangeRelease(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -199,7 +164,7 @@ public int CompareAndExchangeRelease(int arg0, int arg1)
             return IExecute<int>("compareAndExchangeRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#decrementAndGet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#decrementAndGet()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int DecrementAndGet()
@@ -207,7 +172,7 @@ public int DecrementAndGet()
             return IExecuteWithSignature<int>("decrementAndGet", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#get()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Get()
@@ -215,7 +180,15 @@ public int Get()
             return IExecuteWithSignature<int>("get", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getAndAccumulate(int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getAcquire()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAcquire()
+        {
+            return IExecuteWithSignature<int>("getAcquire", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getAndAccumulate(int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntBinaryOperator"/></param>
@@ -225,7 +198,7 @@ public int GetAndAccumulate(int arg0, Java.Util.Function.IntBinaryOperator arg1)
             return IExecute<int>("getAndAccumulate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getAndAdd(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getAndAdd(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -234,7 +207,23 @@ public int GetAndAdd(int arg0)
             return IExecuteWithSignature<int>("getAndAdd", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getAndSet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getAndDecrement()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAndDecrement()
+        {
+            return IExecuteWithSignature<int>("getAndDecrement", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getAndIncrement()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAndIncrement()
+        {
+            return IExecuteWithSignature<int>("getAndIncrement", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getAndSet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -243,7 +232,7 @@ public int GetAndSet(int arg0)
             return IExecuteWithSignature<int>("getAndSet", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#getAndUpdate(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getAndUpdate(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="int"/></returns>
@@ -252,7 +241,23 @@ public int GetAndUpdate(Java.Util.Function.IntUnaryOperator arg0)
             return IExecuteWithSignature<int>("getAndUpdate", "(Ljava/util/function/IntUnaryOperator;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#incrementAndGet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getOpaque()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetOpaque()
+        {
+            return IExecuteWithSignature<int>("getOpaque", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#getPlain()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPlain()
+        {
+            return IExecuteWithSignature<int>("getPlain", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#incrementAndGet()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int IncrementAndGet()
@@ -260,7 +265,7 @@ public int IncrementAndGet()
             return IExecuteWithSignature<int>("incrementAndGet", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#updateAndGet(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#updateAndGet(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="int"/></returns>
@@ -269,7 +274,7 @@ public int UpdateAndGet(Java.Util.Function.IntUnaryOperator arg0)
             return IExecuteWithSignature<int>("updateAndGet", "(Ljava/util/function/IntUnaryOperator;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#lazySet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#lazySet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void LazySet(int arg0)
@@ -277,7 +282,7 @@ public void LazySet(int arg0)
             IExecuteWithSignature("lazySet", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#set(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#set(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Set(int arg0)
@@ -285,7 +290,23 @@ public void Set(int arg0)
             IExecuteWithSignature("set", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicInteger.html#setRelease(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#setOpaque(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetOpaque(int arg0)
+        {
+            IExecuteWithSignature("setOpaque", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#setPlain(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPlain(int arg0)
+        {
+            IExecuteWithSignature("setPlain", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicInteger.html#setRelease(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetRelease(int arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicIntegerArray.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicIntegerArray.cs
index 37a7bb7ce..0b129edc0 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicIntegerArray.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicIntegerArray.cs
@@ -30,7 +30,7 @@ public partial class AtomicIntegerArray
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public AtomicIntegerArray(int arg0)
@@ -38,7 +38,7 @@ public AtomicIntegerArray(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#%3Cinit%3E(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#%3Cinit%3E(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public AtomicIntegerArray(int[] arg0)
@@ -62,7 +62,7 @@ public AtomicIntegerArray(int[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#compareAndSet(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#compareAndSet(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -73,19 +73,19 @@ public bool CompareAndSet(int arg0, int arg1, int arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSet(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSet(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(int arg0, int arg1, int arg2)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSetAcquire(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSetAcquire(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -96,7 +96,7 @@ public bool WeakCompareAndSetAcquire(int arg0, int arg1, int arg2)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSetPlain(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSetPlain(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -107,7 +107,7 @@ public bool WeakCompareAndSetPlain(int arg0, int arg1, int arg2)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSetRelease(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSetRelease(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -118,7 +118,7 @@ public bool WeakCompareAndSetRelease(int arg0, int arg1, int arg2)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSetVolatile(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#weakCompareAndSetVolatile(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -129,7 +129,7 @@ public bool WeakCompareAndSetVolatile(int arg0, int arg1, int arg2)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#accumulateAndGet(int,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#accumulateAndGet(int,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -140,7 +140,7 @@ public int AccumulateAndGet(int arg0, int arg1, Java.Util.Function.IntBinaryOper
             return IExecute<int>("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#addAndGet(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#addAndGet(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -150,7 +150,7 @@ public int AddAndGet(int arg0, int arg1)
             return IExecute<int>("addAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#compareAndExchange(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#compareAndExchange(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -161,7 +161,7 @@ public int CompareAndExchange(int arg0, int arg1, int arg2)
             return IExecute<int>("compareAndExchange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#compareAndExchangeAcquire(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#compareAndExchangeAcquire(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -172,7 +172,7 @@ public int CompareAndExchangeAcquire(int arg0, int arg1, int arg2)
             return IExecute<int>("compareAndExchangeAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#compareAndExchangeRelease(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#compareAndExchangeRelease(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -183,7 +183,7 @@ public int CompareAndExchangeRelease(int arg0, int arg1, int arg2)
             return IExecute<int>("compareAndExchangeRelease", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#decrementAndGet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#decrementAndGet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -192,7 +192,7 @@ public int DecrementAndGet(int arg0)
             return IExecuteWithSignature<int>("decrementAndGet", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -201,7 +201,7 @@ public int Get(int arg0)
             return IExecuteWithSignature<int>("get", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getAcquire(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getAcquire(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -210,7 +210,7 @@ public int GetAcquire(int arg0)
             return IExecuteWithSignature<int>("getAcquire", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndAccumulate(int,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndAccumulate(int,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -221,7 +221,7 @@ public int GetAndAccumulate(int arg0, int arg1, Java.Util.Function.IntBinaryOper
             return IExecute<int>("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndAdd(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndAdd(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -231,7 +231,7 @@ public int GetAndAdd(int arg0, int arg1)
             return IExecute<int>("getAndAdd", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndDecrement(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndDecrement(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -240,7 +240,7 @@ public int GetAndDecrement(int arg0)
             return IExecuteWithSignature<int>("getAndDecrement", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndIncrement(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndIncrement(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -249,7 +249,7 @@ public int GetAndIncrement(int arg0)
             return IExecuteWithSignature<int>("getAndIncrement", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndSet(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndSet(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -259,7 +259,7 @@ public int GetAndSet(int arg0, int arg1)
             return IExecute<int>("getAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndUpdate(int,java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getAndUpdate(int,java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -269,7 +269,7 @@ public int GetAndUpdate(int arg0, Java.Util.Function.IntUnaryOperator arg1)
             return IExecute<int>("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getOpaque(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getOpaque(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -278,7 +278,7 @@ public int GetOpaque(int arg0)
             return IExecuteWithSignature<int>("getOpaque", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#getPlain(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#getPlain(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -287,7 +287,7 @@ public int GetPlain(int arg0)
             return IExecuteWithSignature<int>("getPlain", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#incrementAndGet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#incrementAndGet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -296,7 +296,7 @@ public int IncrementAndGet(int arg0)
             return IExecuteWithSignature<int>("incrementAndGet", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -304,7 +304,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#updateAndGet(int,java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#updateAndGet(int,java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -314,7 +314,7 @@ public int UpdateAndGet(int arg0, Java.Util.Function.IntUnaryOperator arg1)
             return IExecute<int>("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#lazySet(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#lazySet(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -323,7 +323,7 @@ public void LazySet(int arg0, int arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#set(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#set(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -332,7 +332,7 @@ public void Set(int arg0, int arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#setOpaque(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#setOpaque(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -341,7 +341,7 @@ public void SetOpaque(int arg0, int arg1)
             IExecute("setOpaque", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#setPlain(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#setPlain(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -350,7 +350,7 @@ public void SetPlain(int arg0, int arg1)
             IExecute("setPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerArray.html#setRelease(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerArray.html#setRelease(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicIntegerFieldUpdater.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicIntegerFieldUpdater.cs
index 1a9ce3503..1c972c476 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicIntegerFieldUpdater.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicIntegerFieldUpdater.cs
@@ -42,7 +42,7 @@ public partial class AtomicIntegerFieldUpdater
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#newUpdater(java.lang.Class,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#newUpdater(java.lang.Class,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -56,7 +56,7 @@ public static Java.Util.Concurrent.Atomic.AtomicIntegerFieldUpdater NewUpdater(J
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#compareAndSet(java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#compareAndSet(java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -67,7 +67,7 @@ public bool CompareAndSet(object arg0, int arg1, int arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#weakCompareAndSet(java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#weakCompareAndSet(java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -78,7 +78,7 @@ public bool WeakCompareAndSet(object arg0, int arg1, int arg2)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -87,7 +87,7 @@ public int Get(object arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#lazySet(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#lazySet(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -96,7 +96,7 @@ public void LazySet(object arg0, int arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#set(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#set(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -105,7 +105,7 @@ public void Set(object arg0, int arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#accumulateAndGet(java.lang.Object,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#accumulateAndGet(java.lang.Object,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -116,7 +116,7 @@ public int AccumulateAndGet(object arg0, int arg1, Java.Util.Function.IntBinaryO
             return IExecute<int>("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndAccumulate(java.lang.Object,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndAccumulate(java.lang.Object,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -127,7 +127,7 @@ public int GetAndAccumulate(object arg0, int arg1, Java.Util.Function.IntBinaryO
             return IExecute<int>("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -137,7 +137,7 @@ public int GetAndUpdate(object arg0, Java.Util.Function.IntUnaryOperator arg1)
             return IExecute<int>("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -147,7 +147,7 @@ public int UpdateAndGet(object arg0, Java.Util.Function.IntUnaryOperator arg1)
             return IExecute<int>("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#addAndGet(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#addAndGet(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -157,7 +157,7 @@ public int AddAndGet(object arg0, int arg1)
             return IExecute<int>("addAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#decrementAndGet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#decrementAndGet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -166,7 +166,7 @@ public int DecrementAndGet(object arg0)
             return IExecuteWithSignature<int>("decrementAndGet", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndAdd(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndAdd(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -176,7 +176,7 @@ public int GetAndAdd(object arg0, int arg1)
             return IExecute<int>("getAndAdd", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndDecrement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndDecrement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -185,7 +185,7 @@ public int GetAndDecrement(object arg0)
             return IExecuteWithSignature<int>("getAndDecrement", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndIncrement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndIncrement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -194,7 +194,7 @@ public int GetAndIncrement(object arg0)
             return IExecuteWithSignature<int>("getAndIncrement", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndSet(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndSet(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -204,7 +204,7 @@ public int GetAndSet(object arg0, int arg1)
             return IExecute<int>("getAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#incrementAndGet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#incrementAndGet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -244,7 +244,7 @@ public partial class AtomicIntegerFieldUpdater<T>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#newUpdater(java.lang.Class,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#newUpdater(java.lang.Class,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -259,7 +259,7 @@ public static Java.Util.Concurrent.Atomic.AtomicIntegerFieldUpdater<U> NewUpdate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#compareAndSet(java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#compareAndSet(java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -270,7 +270,7 @@ public bool CompareAndSet(T arg0, int arg1, int arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#weakCompareAndSet(java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#weakCompareAndSet(java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -281,7 +281,7 @@ public bool WeakCompareAndSet(T arg0, int arg1, int arg2)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
@@ -290,7 +290,7 @@ public int Get(T arg0)
             return IExecuteWithSignature<int>("get", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#lazySet(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#lazySet(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -299,7 +299,7 @@ public void LazySet(T arg0, int arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#set(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#set(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -308,7 +308,7 @@ public void Set(T arg0, int arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#accumulateAndGet(java.lang.Object,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#accumulateAndGet(java.lang.Object,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -319,7 +319,7 @@ public int AccumulateAndGet(T arg0, int arg1, Java.Util.Function.IntBinaryOperat
             return IExecute<int>("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndAccumulate(java.lang.Object,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndAccumulate(java.lang.Object,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -330,7 +330,7 @@ public int GetAndAccumulate(T arg0, int arg1, Java.Util.Function.IntBinaryOperat
             return IExecute<int>("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -340,7 +340,7 @@ public int GetAndUpdate(T arg0, Java.Util.Function.IntUnaryOperator arg1)
             return IExecute<int>("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -350,7 +350,7 @@ public int UpdateAndGet(T arg0, Java.Util.Function.IntUnaryOperator arg1)
             return IExecute<int>("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#addAndGet(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#addAndGet(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -360,7 +360,7 @@ public int AddAndGet(T arg0, int arg1)
             return IExecute<int>("addAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#decrementAndGet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#decrementAndGet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
@@ -369,7 +369,7 @@ public int DecrementAndGet(T arg0)
             return IExecuteWithSignature<int>("decrementAndGet", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndAdd(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndAdd(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -379,7 +379,7 @@ public int GetAndAdd(T arg0, int arg1)
             return IExecute<int>("getAndAdd", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndDecrement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndDecrement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
@@ -388,7 +388,7 @@ public int GetAndDecrement(T arg0)
             return IExecuteWithSignature<int>("getAndDecrement", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndIncrement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndIncrement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
@@ -397,7 +397,7 @@ public int GetAndIncrement(T arg0)
             return IExecuteWithSignature<int>("getAndIncrement", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndSet(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#getAndSet(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -407,7 +407,7 @@ public int GetAndSet(T arg0, int arg1)
             return IExecute<int>("getAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#incrementAndGet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.html#incrementAndGet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLong.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLong.cs
index bf6612d4a..72e30d681 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLong.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLong.cs
@@ -30,7 +30,7 @@ public partial class AtomicLong
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public AtomicLong(long arg0)
@@ -54,42 +54,7 @@ public AtomicLong(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getAcquire()"/> 
-        /// </summary>
-        public long Acquire
-        {
-            get { return IExecuteWithSignature<long>("getAcquire", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getAndDecrement()"/> 
-        /// </summary>
-        public long AndDecrement
-        {
-            get { return IExecuteWithSignature<long>("getAndDecrement", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getAndIncrement()"/> 
-        /// </summary>
-        public long AndIncrement
-        {
-            get { return IExecuteWithSignature<long>("getAndIncrement", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getOpaque()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#setOpaque(long)"/>
-        /// </summary>
-        public long Opaque
-        {
-            get { return IExecuteWithSignature<long>("getOpaque", "()J"); } set { IExecuteWithSignature("setOpaque", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getPlain()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#setPlain(long)"/>
-        /// </summary>
-        public long Plain
-        {
-            get { return IExecuteWithSignature<long>("getPlain", "()J"); } set { IExecuteWithSignature("setPlain", "(J)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#compareAndSet(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#compareAndSet(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -99,18 +64,18 @@ public bool CompareAndSet(long arg0, long arg1)
             return IExecute<bool>("compareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSet(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSet(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(long arg0, long arg1)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSetAcquire(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSetAcquire(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -120,7 +85,7 @@ public bool WeakCompareAndSetAcquire(long arg0, long arg1)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSetPlain(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSetPlain(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -130,7 +95,7 @@ public bool WeakCompareAndSetPlain(long arg0, long arg1)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSetRelease(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSetRelease(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -140,7 +105,7 @@ public bool WeakCompareAndSetRelease(long arg0, long arg1)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSetVolatile(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#weakCompareAndSetVolatile(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -150,7 +115,7 @@ public bool WeakCompareAndSetVolatile(long arg0, long arg1)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#accumulateAndGet(long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#accumulateAndGet(long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongBinaryOperator"/></param>
@@ -160,7 +125,7 @@ public long AccumulateAndGet(long arg0, Java.Util.Function.LongBinaryOperator ar
             return IExecute<long>("accumulateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#addAndGet(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#addAndGet(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -169,7 +134,7 @@ public long AddAndGet(long arg0)
             return IExecuteWithSignature<long>("addAndGet", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#compareAndExchange(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#compareAndExchange(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -179,7 +144,7 @@ public long CompareAndExchange(long arg0, long arg1)
             return IExecute<long>("compareAndExchange", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#compareAndExchangeAcquire(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#compareAndExchangeAcquire(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -189,7 +154,7 @@ public long CompareAndExchangeAcquire(long arg0, long arg1)
             return IExecute<long>("compareAndExchangeAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#compareAndExchangeRelease(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#compareAndExchangeRelease(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -199,7 +164,7 @@ public long CompareAndExchangeRelease(long arg0, long arg1)
             return IExecute<long>("compareAndExchangeRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#decrementAndGet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#decrementAndGet()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long DecrementAndGet()
@@ -207,7 +172,7 @@ public long DecrementAndGet()
             return IExecuteWithSignature<long>("decrementAndGet", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#get()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Get()
@@ -215,7 +180,15 @@ public long Get()
             return IExecuteWithSignature<long>("get", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getAndAccumulate(long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getAcquire()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetAcquire()
+        {
+            return IExecuteWithSignature<long>("getAcquire", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getAndAccumulate(long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongBinaryOperator"/></param>
@@ -225,7 +198,7 @@ public long GetAndAccumulate(long arg0, Java.Util.Function.LongBinaryOperator ar
             return IExecute<long>("getAndAccumulate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getAndAdd(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getAndAdd(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -234,7 +207,23 @@ public long GetAndAdd(long arg0)
             return IExecuteWithSignature<long>("getAndAdd", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getAndSet(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getAndDecrement()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetAndDecrement()
+        {
+            return IExecuteWithSignature<long>("getAndDecrement", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getAndIncrement()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetAndIncrement()
+        {
+            return IExecuteWithSignature<long>("getAndIncrement", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getAndSet(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -243,7 +232,7 @@ public long GetAndSet(long arg0)
             return IExecuteWithSignature<long>("getAndSet", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#getAndUpdate(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getAndUpdate(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="long"/></returns>
@@ -252,7 +241,23 @@ public long GetAndUpdate(Java.Util.Function.LongUnaryOperator arg0)
             return IExecuteWithSignature<long>("getAndUpdate", "(Ljava/util/function/LongUnaryOperator;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#incrementAndGet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getOpaque()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetOpaque()
+        {
+            return IExecuteWithSignature<long>("getOpaque", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#getPlain()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetPlain()
+        {
+            return IExecuteWithSignature<long>("getPlain", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#incrementAndGet()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long IncrementAndGet()
@@ -260,7 +265,7 @@ public long IncrementAndGet()
             return IExecuteWithSignature<long>("incrementAndGet", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#updateAndGet(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#updateAndGet(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="long"/></returns>
@@ -269,7 +274,7 @@ public long UpdateAndGet(Java.Util.Function.LongUnaryOperator arg0)
             return IExecuteWithSignature<long>("updateAndGet", "(Ljava/util/function/LongUnaryOperator;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#lazySet(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#lazySet(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void LazySet(long arg0)
@@ -277,7 +282,7 @@ public void LazySet(long arg0)
             IExecuteWithSignature("lazySet", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#set(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#set(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Set(long arg0)
@@ -285,7 +290,23 @@ public void Set(long arg0)
             IExecuteWithSignature("set", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLong.html#setRelease(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#setOpaque(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetOpaque(long arg0)
+        {
+            IExecuteWithSignature("setOpaque", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#setPlain(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetPlain(long arg0)
+        {
+            IExecuteWithSignature("setPlain", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLong.html#setRelease(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void SetRelease(long arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLongArray.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLongArray.cs
index cb2b9ffa5..e8e19b1bf 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLongArray.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLongArray.cs
@@ -30,7 +30,7 @@ public partial class AtomicLongArray
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public AtomicLongArray(int arg0)
@@ -38,7 +38,7 @@ public AtomicLongArray(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#%3Cinit%3E(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#%3Cinit%3E(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public AtomicLongArray(long[] arg0)
@@ -62,7 +62,7 @@ public AtomicLongArray(long[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#compareAndSet(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#compareAndSet(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -73,19 +73,19 @@ public bool CompareAndSet(int arg0, long arg1, long arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSet(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSet(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <param name="arg2"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(int arg0, long arg1, long arg2)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSetAcquire(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSetAcquire(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -96,7 +96,7 @@ public bool WeakCompareAndSetAcquire(int arg0, long arg1, long arg2)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSetPlain(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSetPlain(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -107,7 +107,7 @@ public bool WeakCompareAndSetPlain(int arg0, long arg1, long arg2)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSetRelease(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSetRelease(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -118,7 +118,7 @@ public bool WeakCompareAndSetRelease(int arg0, long arg1, long arg2)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSetVolatile(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#weakCompareAndSetVolatile(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -129,7 +129,7 @@ public bool WeakCompareAndSetVolatile(int arg0, long arg1, long arg2)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -137,7 +137,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#accumulateAndGet(int,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#accumulateAndGet(int,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -148,7 +148,7 @@ public long AccumulateAndGet(int arg0, long arg1, Java.Util.Function.LongBinaryO
             return IExecute<long>("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#compareAndExchange(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#compareAndExchange(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -159,7 +159,7 @@ public long CompareAndExchange(int arg0, long arg1, long arg2)
             return IExecute<long>("compareAndExchange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#compareAndExchangeAcquire(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#compareAndExchangeAcquire(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -170,7 +170,7 @@ public long CompareAndExchangeAcquire(int arg0, long arg1, long arg2)
             return IExecute<long>("compareAndExchangeAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#compareAndExchangeRelease(int,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#compareAndExchangeRelease(int,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -181,7 +181,7 @@ public long CompareAndExchangeRelease(int arg0, long arg1, long arg2)
             return IExecute<long>("compareAndExchangeRelease", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#decrementAndGet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#decrementAndGet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -190,7 +190,7 @@ public long DecrementAndGet(int arg0)
             return IExecuteWithSignature<long>("decrementAndGet", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -199,7 +199,7 @@ public long Get(int arg0)
             return IExecuteWithSignature<long>("get", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getAcquire(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getAcquire(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -208,7 +208,7 @@ public long GetAcquire(int arg0)
             return IExecuteWithSignature<long>("getAcquire", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getAndAccumulate(int,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getAndAccumulate(int,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -219,7 +219,7 @@ public long GetAndAccumulate(int arg0, long arg1, Java.Util.Function.LongBinaryO
             return IExecute<long>("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getAndAdd(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getAndAdd(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -229,7 +229,7 @@ public long GetAndAdd(int arg0, long arg1)
             return IExecute<long>("getAndAdd", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getAndDecrement(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getAndDecrement(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -238,7 +238,7 @@ public long GetAndDecrement(int arg0)
             return IExecuteWithSignature<long>("getAndDecrement", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getAndIncrement(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getAndIncrement(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -247,7 +247,7 @@ public long GetAndIncrement(int arg0)
             return IExecuteWithSignature<long>("getAndIncrement", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getAndSet(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getAndSet(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -257,7 +257,7 @@ public long GetAndSet(int arg0, long arg1)
             return IExecute<long>("getAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getAndUpdate(int,java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getAndUpdate(int,java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
@@ -267,7 +267,7 @@ public long GetAndUpdate(int arg0, Java.Util.Function.LongUnaryOperator arg1)
             return IExecute<long>("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getOpaque(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getOpaque(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -276,7 +276,7 @@ public long GetOpaque(int arg0)
             return IExecuteWithSignature<long>("getOpaque", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#getPlain(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#getPlain(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -285,7 +285,7 @@ public long GetPlain(int arg0)
             return IExecuteWithSignature<long>("getPlain", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#incrementAndGet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#incrementAndGet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -294,7 +294,7 @@ public long IncrementAndGet(int arg0)
             return IExecuteWithSignature<long>("incrementAndGet", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#updateAndGet(int,java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#updateAndGet(int,java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
@@ -304,7 +304,7 @@ public long UpdateAndGet(int arg0, Java.Util.Function.LongUnaryOperator arg1)
             return IExecute<long>("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#lazySet(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#lazySet(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -313,7 +313,7 @@ public void LazySet(int arg0, long arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#set(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#set(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -322,7 +322,7 @@ public void Set(int arg0, long arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#setOpaque(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#setOpaque(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -331,7 +331,7 @@ public void SetOpaque(int arg0, long arg1)
             IExecute("setOpaque", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#setPlain(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#setPlain(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -340,7 +340,7 @@ public void SetPlain(int arg0, long arg1)
             IExecute("setPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#setRelease(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#setRelease(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -349,7 +349,7 @@ public void SetRelease(int arg0, long arg1)
             IExecute("setRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongArray.html#addAndGet(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongArray.html#addAndGet(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLongFieldUpdater.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLongFieldUpdater.cs
index 8d0063155..b08a906dd 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLongFieldUpdater.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicLongFieldUpdater.cs
@@ -42,7 +42,7 @@ public partial class AtomicLongFieldUpdater
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#newUpdater(java.lang.Class,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#newUpdater(java.lang.Class,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -56,7 +56,7 @@ public static Java.Util.Concurrent.Atomic.AtomicLongFieldUpdater NewUpdater(Java
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#compareAndSet(java.lang.Object,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#compareAndSet(java.lang.Object,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -67,7 +67,7 @@ public bool CompareAndSet(object arg0, long arg1, long arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#weakCompareAndSet(java.lang.Object,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#weakCompareAndSet(java.lang.Object,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -78,7 +78,7 @@ public bool WeakCompareAndSet(object arg0, long arg1, long arg2)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="long"/></returns>
@@ -87,7 +87,7 @@ public long Get(object arg0)
             return IExecuteWithSignature<long>("get", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#lazySet(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#lazySet(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -96,7 +96,7 @@ public void LazySet(object arg0, long arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#set(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#set(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -105,7 +105,7 @@ public void Set(object arg0, long arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#accumulateAndGet(java.lang.Object,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#accumulateAndGet(java.lang.Object,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -116,7 +116,7 @@ public long AccumulateAndGet(object arg0, long arg1, Java.Util.Function.LongBina
             return IExecute<long>("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndAccumulate(java.lang.Object,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndAccumulate(java.lang.Object,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -127,7 +127,7 @@ public long GetAndAccumulate(object arg0, long arg1, Java.Util.Function.LongBina
             return IExecute<long>("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
@@ -137,7 +137,7 @@ public long GetAndUpdate(object arg0, Java.Util.Function.LongUnaryOperator arg1)
             return IExecute<long>("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
@@ -147,7 +147,7 @@ public long UpdateAndGet(object arg0, Java.Util.Function.LongUnaryOperator arg1)
             return IExecute<long>("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#addAndGet(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#addAndGet(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -157,7 +157,7 @@ public long AddAndGet(object arg0, long arg1)
             return IExecute<long>("addAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#decrementAndGet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#decrementAndGet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="long"/></returns>
@@ -166,7 +166,7 @@ public long DecrementAndGet(object arg0)
             return IExecuteWithSignature<long>("decrementAndGet", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndAdd(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndAdd(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -176,7 +176,7 @@ public long GetAndAdd(object arg0, long arg1)
             return IExecute<long>("getAndAdd", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndDecrement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndDecrement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="long"/></returns>
@@ -185,7 +185,7 @@ public long GetAndDecrement(object arg0)
             return IExecuteWithSignature<long>("getAndDecrement", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndIncrement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndIncrement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="long"/></returns>
@@ -194,7 +194,7 @@ public long GetAndIncrement(object arg0)
             return IExecuteWithSignature<long>("getAndIncrement", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndSet(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndSet(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -204,7 +204,7 @@ public long GetAndSet(object arg0, long arg1)
             return IExecute<long>("getAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#incrementAndGet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#incrementAndGet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="long"/></returns>
@@ -244,7 +244,7 @@ public partial class AtomicLongFieldUpdater<T>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#newUpdater(java.lang.Class,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#newUpdater(java.lang.Class,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -259,7 +259,7 @@ public static Java.Util.Concurrent.Atomic.AtomicLongFieldUpdater<U> NewUpdater<U
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#compareAndSet(java.lang.Object,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#compareAndSet(java.lang.Object,long,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -270,7 +270,7 @@ public bool CompareAndSet(T arg0, long arg1, long arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#weakCompareAndSet(java.lang.Object,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#weakCompareAndSet(java.lang.Object,long,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -281,7 +281,7 @@ public bool WeakCompareAndSet(T arg0, long arg1, long arg2)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="long"/></returns>
@@ -290,7 +290,7 @@ public long Get(T arg0)
             return IExecuteWithSignature<long>("get", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#lazySet(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#lazySet(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -299,7 +299,7 @@ public void LazySet(T arg0, long arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#set(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#set(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -308,7 +308,7 @@ public void Set(T arg0, long arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#accumulateAndGet(java.lang.Object,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#accumulateAndGet(java.lang.Object,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -319,7 +319,7 @@ public long AccumulateAndGet(T arg0, long arg1, Java.Util.Function.LongBinaryOpe
             return IExecute<long>("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndAccumulate(java.lang.Object,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndAccumulate(java.lang.Object,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -330,7 +330,7 @@ public long GetAndAccumulate(T arg0, long arg1, Java.Util.Function.LongBinaryOpe
             return IExecute<long>("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
@@ -340,7 +340,7 @@ public long GetAndUpdate(T arg0, Java.Util.Function.LongUnaryOperator arg1)
             return IExecute<long>("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
@@ -350,7 +350,7 @@ public long UpdateAndGet(T arg0, Java.Util.Function.LongUnaryOperator arg1)
             return IExecute<long>("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#addAndGet(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#addAndGet(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -360,7 +360,7 @@ public long AddAndGet(T arg0, long arg1)
             return IExecute<long>("addAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#decrementAndGet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#decrementAndGet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="long"/></returns>
@@ -369,7 +369,7 @@ public long DecrementAndGet(T arg0)
             return IExecuteWithSignature<long>("decrementAndGet", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndAdd(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndAdd(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -379,7 +379,7 @@ public long GetAndAdd(T arg0, long arg1)
             return IExecute<long>("getAndAdd", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndDecrement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndDecrement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="long"/></returns>
@@ -388,7 +388,7 @@ public long GetAndDecrement(T arg0)
             return IExecuteWithSignature<long>("getAndDecrement", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndIncrement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndIncrement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="long"/></returns>
@@ -397,7 +397,7 @@ public long GetAndIncrement(T arg0)
             return IExecuteWithSignature<long>("getAndIncrement", "(Ljava/lang/Object;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndSet(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#getAndSet(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -407,7 +407,7 @@ public long GetAndSet(T arg0, long arg1)
             return IExecute<long>("getAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#incrementAndGet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicLongFieldUpdater.html#incrementAndGet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicMarkableReference.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicMarkableReference.cs
index 55c2e88e8..42b1677d0 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicMarkableReference.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicMarkableReference.cs
@@ -30,7 +30,7 @@ public partial class AtomicMarkableReference
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#%3Cinit%3E(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#%3Cinit%3E(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -55,14 +55,7 @@ public AtomicMarkableReference(object arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#getReference()"/> 
-        /// </summary>
-        public object Reference
-        {
-            get { return IExecuteWithSignature("getReference", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#attemptMark(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#attemptMark(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -72,7 +65,7 @@ public bool AttemptMark(object arg0, bool arg1)
             return IExecute<bool>("attemptMark", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#compareAndSet(java.lang.Object,java.lang.Object,boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#compareAndSet(java.lang.Object,java.lang.Object,boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -84,7 +77,7 @@ public bool CompareAndSet(object arg0, object arg1, bool arg2, bool arg3)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#isMarked()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#isMarked()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMarked()
@@ -92,7 +85,7 @@ public bool IsMarked()
             return IExecuteWithSignature<bool>("isMarked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object,boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object,boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -104,7 +97,7 @@ public bool WeakCompareAndSet(object arg0, object arg1, bool arg2, bool arg3)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#get(boolean[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#get(boolean[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="object"/></returns>
@@ -113,7 +106,15 @@ public object Get(bool[] arg0)
             return IExecuteWithSignature("get", "([Z)Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#set(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#getReference()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetReference()
+        {
+            return IExecuteWithSignature("getReference", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#set(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -137,7 +138,7 @@ public partial class AtomicMarkableReference<V>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#%3Cinit%3E(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#%3Cinit%3E(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -166,14 +167,7 @@ public AtomicMarkableReference(V arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#getReference()"/> 
-        /// </summary>
-        public V Reference
-        {
-            get { return IExecuteWithSignature<V>("getReference", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#attemptMark(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#attemptMark(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -183,7 +177,7 @@ public bool AttemptMark(V arg0, bool arg1)
             return IExecute<bool>("attemptMark", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#compareAndSet(java.lang.Object,java.lang.Object,boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#compareAndSet(java.lang.Object,java.lang.Object,boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -195,7 +189,7 @@ public bool CompareAndSet(V arg0, V arg1, bool arg2, bool arg3)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#isMarked()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#isMarked()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMarked()
@@ -203,7 +197,7 @@ public bool IsMarked()
             return IExecuteWithSignature<bool>("isMarked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object,boolean,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object,boolean,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -215,7 +209,7 @@ public bool WeakCompareAndSet(V arg0, V arg1, bool arg2, bool arg3)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#get(boolean[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#get(boolean[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -224,7 +218,15 @@ public V Get(bool[] arg0)
             return IExecuteWithSignature<V>("get", "([Z)Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicMarkableReference.html#set(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#getReference()"/>
+        /// </summary>
+        /// <returns><typeparamref name="V"/></returns>
+        public V GetReference()
+        {
+            return IExecuteWithSignature<V>("getReference", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicMarkableReference.html#set(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReference.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReference.cs
index 8a7f7cc35..6a73519e5 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReference.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReference.cs
@@ -30,7 +30,7 @@ public partial class AtomicReference
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public AtomicReference(object arg0)
@@ -54,28 +54,7 @@ public AtomicReference(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getAcquire()"/> 
-        /// </summary>
-        public object Acquire
-        {
-            get { return IExecuteWithSignature("getAcquire", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getOpaque()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#setOpaque(java.lang.Object)"/>
-        /// </summary>
-        public object Opaque
-        {
-            get { return IExecuteWithSignature("getOpaque", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setOpaque", "(Ljava/lang/Object;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getPlain()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#setPlain(java.lang.Object)"/>
-        /// </summary>
-        public object Plain
-        {
-            get { return IExecuteWithSignature("getPlain", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setPlain", "(Ljava/lang/Object;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#compareAndSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#compareAndSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -85,18 +64,18 @@ public bool CompareAndSet(object arg0, object arg1)
             return IExecute<bool>("compareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(object arg0, object arg1)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetAcquire(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetAcquire(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -106,7 +85,7 @@ public bool WeakCompareAndSetAcquire(object arg0, object arg1)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetPlain(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetPlain(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -116,7 +95,7 @@ public bool WeakCompareAndSetPlain(object arg0, object arg1)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetRelease(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetRelease(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -126,7 +105,7 @@ public bool WeakCompareAndSetRelease(object arg0, object arg1)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetVolatile(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetVolatile(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -136,7 +115,7 @@ public bool WeakCompareAndSetVolatile(object arg0, object arg1)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#accumulateAndGet(java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#accumulateAndGet(java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BinaryOperator"/></param>
@@ -146,7 +125,7 @@ public object AccumulateAndGet(object arg0, Java.Util.Function.BinaryOperator ar
             return IExecute("accumulateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#compareAndExchange(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#compareAndExchange(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -156,7 +135,7 @@ public object CompareAndExchange(object arg0, object arg1)
             return IExecute("compareAndExchange", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#compareAndExchangeAcquire(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#compareAndExchangeAcquire(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -166,7 +145,7 @@ public object CompareAndExchangeAcquire(object arg0, object arg1)
             return IExecute("compareAndExchangeAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#compareAndExchangeRelease(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#compareAndExchangeRelease(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -176,7 +155,7 @@ public object CompareAndExchangeRelease(object arg0, object arg1)
             return IExecute("compareAndExchangeRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Get()
@@ -184,7 +163,15 @@ public object Get()
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getAndAccumulate(java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getAcquire()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetAcquire()
+        {
+            return IExecuteWithSignature("getAcquire", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getAndAccumulate(java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BinaryOperator"/></param>
@@ -194,7 +181,7 @@ public object GetAndAccumulate(object arg0, Java.Util.Function.BinaryOperator ar
             return IExecute("getAndAccumulate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getAndSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getAndSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -203,7 +190,7 @@ public object GetAndSet(object arg0)
             return IExecuteWithSignature("getAndSet", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getAndUpdate(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getAndUpdate(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         /// <returns><see cref="object"/></returns>
@@ -212,7 +199,23 @@ public object GetAndUpdate(Java.Util.Function.UnaryOperator arg0)
             return IExecuteWithSignature("getAndUpdate", "(Ljava/util/function/UnaryOperator;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#updateAndGet(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getOpaque()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetOpaque()
+        {
+            return IExecuteWithSignature("getOpaque", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getPlain()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetPlain()
+        {
+            return IExecuteWithSignature("getPlain", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#updateAndGet(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         /// <returns><see cref="object"/></returns>
@@ -221,7 +224,7 @@ public object UpdateAndGet(Java.Util.Function.UnaryOperator arg0)
             return IExecuteWithSignature("updateAndGet", "(Ljava/util/function/UnaryOperator;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#lazySet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#lazySet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void LazySet(object arg0)
@@ -229,7 +232,7 @@ public void LazySet(object arg0)
             IExecuteWithSignature("lazySet", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#set(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#set(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Set(object arg0)
@@ -237,7 +240,23 @@ public void Set(object arg0)
             IExecuteWithSignature("set", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#setRelease(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#setOpaque(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetOpaque(object arg0)
+        {
+            IExecuteWithSignature("setOpaque", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#setPlain(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetPlain(object arg0)
+        {
+            IExecuteWithSignature("setPlain", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#setRelease(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void SetRelease(object arg0)
@@ -260,7 +279,7 @@ public partial class AtomicReference<V>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         public AtomicReference(V arg0)
@@ -288,28 +307,7 @@ public AtomicReference(V arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getAcquire()"/> 
-        /// </summary>
-        public V Acquire
-        {
-            get { return IExecuteWithSignature<V>("getAcquire", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getOpaque()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#setOpaque(java.lang.Object)"/>
-        /// </summary>
-        public V Opaque
-        {
-            get { return IExecuteWithSignature<V>("getOpaque", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setOpaque", "(Ljava/lang/Object;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getPlain()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#setPlain(java.lang.Object)"/>
-        /// </summary>
-        public V Plain
-        {
-            get { return IExecuteWithSignature<V>("getPlain", "()Ljava/lang/Object;"); } set { IExecuteWithSignature("setPlain", "(Ljava/lang/Object;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#compareAndSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#compareAndSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -319,18 +317,18 @@ public bool CompareAndSet(V arg0, V arg1)
             return IExecute<bool>("compareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(V arg0, V arg1)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetAcquire(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetAcquire(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -340,7 +338,7 @@ public bool WeakCompareAndSetAcquire(V arg0, V arg1)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetPlain(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetPlain(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -350,7 +348,7 @@ public bool WeakCompareAndSetPlain(V arg0, V arg1)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetRelease(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetRelease(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -360,7 +358,7 @@ public bool WeakCompareAndSetRelease(V arg0, V arg1)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetVolatile(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#weakCompareAndSetVolatile(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -370,7 +368,7 @@ public bool WeakCompareAndSetVolatile(V arg0, V arg1)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#accumulateAndGet(java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#accumulateAndGet(java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BinaryOperator"/></param>
@@ -380,7 +378,7 @@ public V AccumulateAndGet(V arg0, Java.Util.Function.BinaryOperator<V> arg1)
             return IExecute<V>("accumulateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#compareAndExchange(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#compareAndExchange(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -390,7 +388,7 @@ public V CompareAndExchange(V arg0, V arg1)
             return IExecute<V>("compareAndExchange", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#compareAndExchangeAcquire(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#compareAndExchangeAcquire(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -400,7 +398,7 @@ public V CompareAndExchangeAcquire(V arg0, V arg1)
             return IExecute<V>("compareAndExchangeAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#compareAndExchangeRelease(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#compareAndExchangeRelease(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -410,7 +408,7 @@ public V CompareAndExchangeRelease(V arg0, V arg1)
             return IExecute<V>("compareAndExchangeRelease", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="V"/></returns>
         public V Get()
@@ -418,7 +416,15 @@ public V Get()
             return IExecuteWithSignature<V>("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getAndAccumulate(java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getAcquire()"/>
+        /// </summary>
+        /// <returns><typeparamref name="V"/></returns>
+        public V GetAcquire()
+        {
+            return IExecuteWithSignature<V>("getAcquire", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getAndAccumulate(java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BinaryOperator"/></param>
@@ -428,7 +434,7 @@ public V GetAndAccumulate(V arg0, Java.Util.Function.BinaryOperator<V> arg1)
             return IExecute<V>("getAndAccumulate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getAndSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getAndSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -437,7 +443,7 @@ public V GetAndSet(V arg0)
             return IExecuteWithSignature<V>("getAndSet", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#getAndUpdate(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getAndUpdate(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -446,7 +452,23 @@ public V GetAndUpdate(Java.Util.Function.UnaryOperator<V> arg0)
             return IExecuteWithSignature<V>("getAndUpdate", "(Ljava/util/function/UnaryOperator;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#updateAndGet(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getOpaque()"/>
+        /// </summary>
+        /// <returns><typeparamref name="V"/></returns>
+        public V GetOpaque()
+        {
+            return IExecuteWithSignature<V>("getOpaque", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#getPlain()"/>
+        /// </summary>
+        /// <returns><typeparamref name="V"/></returns>
+        public V GetPlain()
+        {
+            return IExecuteWithSignature<V>("getPlain", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#updateAndGet(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -455,7 +477,7 @@ public V UpdateAndGet(Java.Util.Function.UnaryOperator<V> arg0)
             return IExecuteWithSignature<V>("updateAndGet", "(Ljava/util/function/UnaryOperator;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#lazySet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#lazySet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         public void LazySet(V arg0)
@@ -463,7 +485,7 @@ public void LazySet(V arg0)
             IExecuteWithSignature("lazySet", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#set(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#set(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         public void Set(V arg0)
@@ -471,7 +493,23 @@ public void Set(V arg0)
             IExecuteWithSignature("set", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReference.html#setRelease(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#setOpaque(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="V"/></param>
+        public void SetOpaque(V arg0)
+        {
+            IExecuteWithSignature("setOpaque", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#setPlain(java.lang.Object)"/>
+        /// </summary>
+        /// <param name="arg0"><typeparamref name="V"/></param>
+        public void SetPlain(V arg0)
+        {
+            IExecuteWithSignature("setPlain", "(Ljava/lang/Object;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReference.html#setRelease(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         public void SetRelease(V arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReferenceArray.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReferenceArray.cs
index 9b5f27f9e..35f2a0dbf 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReferenceArray.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReferenceArray.cs
@@ -30,7 +30,7 @@ public partial class AtomicReferenceArray
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public AtomicReferenceArray(int arg0)
@@ -54,7 +54,7 @@ public AtomicReferenceArray(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndSet(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndSet(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -65,19 +65,19 @@ public bool CompareAndSet(int arg0, object arg1, object arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSet(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSet(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <param name="arg2"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(int arg0, object arg1, object arg2)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetAcquire(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetAcquire(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -88,7 +88,7 @@ public bool WeakCompareAndSetAcquire(int arg0, object arg1, object arg2)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetPlain(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetPlain(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -99,7 +99,7 @@ public bool WeakCompareAndSetPlain(int arg0, object arg1, object arg2)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetRelease(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetRelease(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -110,7 +110,7 @@ public bool WeakCompareAndSetRelease(int arg0, object arg1, object arg2)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetVolatile(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetVolatile(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -121,7 +121,7 @@ public bool WeakCompareAndSetVolatile(int arg0, object arg1, object arg2)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#accumulateAndGet(int,java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#accumulateAndGet(int,java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -132,7 +132,7 @@ public object AccumulateAndGet(int arg0, object arg1, Java.Util.Function.BinaryO
             return IExecute("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchange(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchange(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -143,7 +143,7 @@ public object CompareAndExchange(int arg0, object arg1, object arg2)
             return IExecute("compareAndExchange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchangeAcquire(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchangeAcquire(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -154,7 +154,7 @@ public object CompareAndExchangeAcquire(int arg0, object arg1, object arg2)
             return IExecute("compareAndExchangeAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchangeRelease(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchangeRelease(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -165,7 +165,7 @@ public object CompareAndExchangeRelease(int arg0, object arg1, object arg2)
             return IExecute("compareAndExchangeRelease", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -174,7 +174,7 @@ public object Get(int arg0)
             return IExecuteWithSignature("get", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getAcquire(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getAcquire(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -183,7 +183,7 @@ public object GetAcquire(int arg0)
             return IExecuteWithSignature("getAcquire", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndAccumulate(int,java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndAccumulate(int,java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -194,7 +194,7 @@ public object GetAndAccumulate(int arg0, object arg1, Java.Util.Function.BinaryO
             return IExecute("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndSet(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndSet(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -204,7 +204,7 @@ public object GetAndSet(int arg0, object arg1)
             return IExecute("getAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndUpdate(int,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndUpdate(int,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -214,7 +214,7 @@ public object GetAndUpdate(int arg0, Java.Util.Function.UnaryOperator arg1)
             return IExecute("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getOpaque(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getOpaque(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -223,7 +223,7 @@ public object GetOpaque(int arg0)
             return IExecuteWithSignature("getOpaque", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getPlain(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getPlain(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -232,7 +232,7 @@ public object GetPlain(int arg0)
             return IExecuteWithSignature("getPlain", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#updateAndGet(int,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#updateAndGet(int,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -242,7 +242,7 @@ public object UpdateAndGet(int arg0, Java.Util.Function.UnaryOperator arg1)
             return IExecute("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -250,7 +250,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#lazySet(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#lazySet(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -259,7 +259,7 @@ public void LazySet(int arg0, object arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#set(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#set(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -268,7 +268,7 @@ public void Set(int arg0, object arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#setOpaque(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#setOpaque(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -277,7 +277,7 @@ public void SetOpaque(int arg0, object arg1)
             IExecute("setOpaque", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#setPlain(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#setPlain(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -286,7 +286,7 @@ public void SetPlain(int arg0, object arg1)
             IExecute("setPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#setRelease(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#setRelease(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -310,7 +310,7 @@ public partial class AtomicReferenceArray<E>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#%3Cinit%3E(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#%3Cinit%3E(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public AtomicReferenceArray(E[] arg0)
@@ -318,7 +318,7 @@ public AtomicReferenceArray(E[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public AtomicReferenceArray(int arg0)
@@ -346,7 +346,7 @@ public AtomicReferenceArray(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndSet(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndSet(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -357,19 +357,19 @@ public bool CompareAndSet(int arg0, E arg1, E arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSet(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSet(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
         /// <param name="arg2"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool WeakCompareAndSet(int arg0, E arg1, E arg2)
         {
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetAcquire(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetAcquire(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -380,7 +380,7 @@ public bool WeakCompareAndSetAcquire(int arg0, E arg1, E arg2)
             return IExecute<bool>("weakCompareAndSetAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetPlain(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetPlain(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -391,7 +391,7 @@ public bool WeakCompareAndSetPlain(int arg0, E arg1, E arg2)
             return IExecute<bool>("weakCompareAndSetPlain", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetRelease(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetRelease(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -402,7 +402,7 @@ public bool WeakCompareAndSetRelease(int arg0, E arg1, E arg2)
             return IExecute<bool>("weakCompareAndSetRelease", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetVolatile(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#weakCompareAndSetVolatile(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -413,7 +413,7 @@ public bool WeakCompareAndSetVolatile(int arg0, E arg1, E arg2)
             return IExecute<bool>("weakCompareAndSetVolatile", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#accumulateAndGet(int,java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#accumulateAndGet(int,java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -424,7 +424,7 @@ public E AccumulateAndGet(int arg0, E arg1, Java.Util.Function.BinaryOperator<E>
             return IExecute<E>("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchange(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchange(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -435,7 +435,7 @@ public E CompareAndExchange(int arg0, E arg1, E arg2)
             return IExecute<E>("compareAndExchange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchangeAcquire(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchangeAcquire(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -446,7 +446,7 @@ public E CompareAndExchangeAcquire(int arg0, E arg1, E arg2)
             return IExecute<E>("compareAndExchangeAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchangeRelease(int,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#compareAndExchangeRelease(int,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -457,7 +457,7 @@ public E CompareAndExchangeRelease(int arg0, E arg1, E arg2)
             return IExecute<E>("compareAndExchangeRelease", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -466,7 +466,7 @@ public E Get(int arg0)
             return IExecuteWithSignature<E>("get", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getAcquire(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getAcquire(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -475,7 +475,7 @@ public E GetAcquire(int arg0)
             return IExecuteWithSignature<E>("getAcquire", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndAccumulate(int,java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndAccumulate(int,java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -486,7 +486,7 @@ public E GetAndAccumulate(int arg0, E arg1, Java.Util.Function.BinaryOperator<E>
             return IExecute<E>("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndSet(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndSet(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -496,7 +496,7 @@ public E GetAndSet(int arg0, E arg1)
             return IExecute<E>("getAndSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndUpdate(int,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getAndUpdate(int,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -506,7 +506,7 @@ public E GetAndUpdate(int arg0, Java.Util.Function.UnaryOperator<E> arg1)
             return IExecute<E>("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getOpaque(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getOpaque(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -515,7 +515,7 @@ public E GetOpaque(int arg0)
             return IExecuteWithSignature<E>("getOpaque", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#getPlain(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#getPlain(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -524,7 +524,7 @@ public E GetPlain(int arg0)
             return IExecuteWithSignature<E>("getPlain", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#updateAndGet(int,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#updateAndGet(int,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -534,7 +534,7 @@ public E UpdateAndGet(int arg0, Java.Util.Function.UnaryOperator<E> arg1)
             return IExecute<E>("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -542,7 +542,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#lazySet(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#lazySet(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -551,7 +551,7 @@ public void LazySet(int arg0, E arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#set(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#set(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -560,7 +560,7 @@ public void Set(int arg0, E arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#setOpaque(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#setOpaque(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -569,7 +569,7 @@ public void SetOpaque(int arg0, E arg1)
             IExecute("setOpaque", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#setPlain(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#setPlain(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -578,7 +578,7 @@ public void SetPlain(int arg0, E arg1)
             IExecute("setPlain", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceArray.html#setRelease(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceArray.html#setRelease(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReferenceFieldUpdater.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReferenceFieldUpdater.cs
index 27fccd955..6e5860eb5 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReferenceFieldUpdater.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicReferenceFieldUpdater.cs
@@ -42,7 +42,7 @@ public partial class AtomicReferenceFieldUpdater
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#newUpdater(java.lang.Class,java.lang.Class,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#newUpdater(java.lang.Class,java.lang.Class,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -57,7 +57,7 @@ public static Java.Util.Concurrent.Atomic.AtomicReferenceFieldUpdater NewUpdater
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#compareAndSet(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#compareAndSet(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -68,7 +68,7 @@ public bool CompareAndSet(object arg0, object arg1, object arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#weakCompareAndSet(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#weakCompareAndSet(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -79,7 +79,7 @@ public bool WeakCompareAndSet(object arg0, object arg1, object arg2)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -88,7 +88,7 @@ public object Get(object arg0)
             return IExecuteWithSignature("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#lazySet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#lazySet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -97,7 +97,7 @@ public void LazySet(object arg0, object arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#set(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#set(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -106,7 +106,7 @@ public void Set(object arg0, object arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#accumulateAndGet(java.lang.Object,java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#accumulateAndGet(java.lang.Object,java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -117,7 +117,7 @@ public object AccumulateAndGet(object arg0, object arg1, Java.Util.Function.Bina
             return IExecute("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndAccumulate(java.lang.Object,java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndAccumulate(java.lang.Object,java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -128,7 +128,7 @@ public object GetAndAccumulate(object arg0, object arg1, Java.Util.Function.Bina
             return IExecute("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -138,7 +138,7 @@ public object GetAndUpdate(object arg0, Java.Util.Function.UnaryOperator arg1)
             return IExecute("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -148,7 +148,7 @@ public object UpdateAndGet(object arg0, Java.Util.Function.UnaryOperator arg1)
             return IExecute("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -189,7 +189,7 @@ public partial class AtomicReferenceFieldUpdater<T, V>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#newUpdater(java.lang.Class,java.lang.Class,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#newUpdater(java.lang.Class,java.lang.Class,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -206,7 +206,7 @@ public static Java.Util.Concurrent.Atomic.AtomicReferenceFieldUpdater<U, W> NewU
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#compareAndSet(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#compareAndSet(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -217,7 +217,7 @@ public bool CompareAndSet(T arg0, V arg1, V arg2)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#weakCompareAndSet(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#weakCompareAndSet(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -228,7 +228,7 @@ public bool WeakCompareAndSet(T arg0, V arg1, V arg2)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -237,7 +237,7 @@ public V Get(T arg0)
             return IExecuteWithSignature<V>("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#lazySet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#lazySet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -246,7 +246,7 @@ public void LazySet(T arg0, V arg1)
             IExecute("lazySet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#set(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#set(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -255,7 +255,7 @@ public void Set(T arg0, V arg1)
             IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#accumulateAndGet(java.lang.Object,java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#accumulateAndGet(java.lang.Object,java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -266,7 +266,7 @@ public V AccumulateAndGet(T arg0, V arg1, Java.Util.Function.BinaryOperator<V> a
             return IExecute<V>("accumulateAndGet", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndAccumulate(java.lang.Object,java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndAccumulate(java.lang.Object,java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -277,7 +277,7 @@ public V GetAndAccumulate(T arg0, V arg1, Java.Util.Function.BinaryOperator<V> a
             return IExecute<V>("getAndAccumulate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndUpdate(java.lang.Object,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -287,7 +287,7 @@ public V GetAndUpdate(T arg0, Java.Util.Function.UnaryOperator<V> arg1)
             return IExecute<V>("getAndUpdate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#updateAndGet(java.lang.Object,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -297,7 +297,7 @@ public V UpdateAndGet(T arg0, Java.Util.Function.UnaryOperator<V> arg1)
             return IExecute<V>("updateAndGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.html#getAndSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicStampedReference.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicStampedReference.cs
index ebdce0086..cedc8dd8a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicStampedReference.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/AtomicStampedReference.cs
@@ -30,7 +30,7 @@ public partial class AtomicStampedReference
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#%3Cinit%3E(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#%3Cinit%3E(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -55,21 +55,7 @@ public AtomicStampedReference(object arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#getReference()"/> 
-        /// </summary>
-        public object Reference
-        {
-            get { return IExecuteWithSignature("getReference", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#getStamp()"/> 
-        /// </summary>
-        public int Stamp
-        {
-            get { return IExecuteWithSignature<int>("getStamp", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#attemptStamp(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#attemptStamp(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -79,7 +65,7 @@ public bool AttemptStamp(object arg0, int arg1)
             return IExecute<bool>("attemptStamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#compareAndSet(java.lang.Object,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#compareAndSet(java.lang.Object,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -91,7 +77,7 @@ public bool CompareAndSet(object arg0, object arg1, int arg2, int arg3)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -103,7 +89,15 @@ public bool WeakCompareAndSet(object arg0, object arg1, int arg2, int arg3)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#get(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#getStamp()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStamp()
+        {
+            return IExecuteWithSignature<int>("getStamp", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#get(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -112,7 +106,15 @@ public object Get(int[] arg0)
             return IExecuteWithSignature("get", "([I)Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#set(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#getReference()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetReference()
+        {
+            return IExecuteWithSignature("getReference", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#set(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -136,7 +138,7 @@ public partial class AtomicStampedReference<V>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#%3Cinit%3E(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#%3Cinit%3E(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -165,21 +167,7 @@ public AtomicStampedReference(V arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#getReference()"/> 
-        /// </summary>
-        public V Reference
-        {
-            get { return IExecuteWithSignature<V>("getReference", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#getStamp()"/> 
-        /// </summary>
-        public int Stamp
-        {
-            get { return IExecuteWithSignature<int>("getStamp", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#attemptStamp(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#attemptStamp(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -189,7 +177,7 @@ public bool AttemptStamp(V arg0, int arg1)
             return IExecute<bool>("attemptStamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#compareAndSet(java.lang.Object,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#compareAndSet(java.lang.Object,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -201,7 +189,7 @@ public bool CompareAndSet(V arg0, V arg1, int arg2, int arg3)
             return IExecute<bool>("compareAndSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#weakCompareAndSet(java.lang.Object,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -213,7 +201,15 @@ public bool WeakCompareAndSet(V arg0, V arg1, int arg2, int arg3)
             return IExecute<bool>("weakCompareAndSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#get(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#getStamp()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetStamp()
+        {
+            return IExecuteWithSignature<int>("getStamp", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#get(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -222,7 +218,15 @@ public V Get(int[] arg0)
             return IExecuteWithSignature<V>("get", "([I)Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/AtomicStampedReference.html#set(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#getReference()"/>
+        /// </summary>
+        /// <returns><typeparamref name="V"/></returns>
+        public V GetReference()
+        {
+            return IExecuteWithSignature<V>("getReference", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/AtomicStampedReference.html#set(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/DoubleAccumulator.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/DoubleAccumulator.cs
index 53bd66743..d84eb1807 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/DoubleAccumulator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/DoubleAccumulator.cs
@@ -30,7 +30,7 @@ public partial class DoubleAccumulator
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAccumulator.html#%3Cinit%3E(java.util.function.DoubleBinaryOperator,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAccumulator.html#%3Cinit%3E(java.util.function.DoubleBinaryOperator,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleBinaryOperator"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -55,22 +55,23 @@ public DoubleAccumulator(Java.Util.Function.DoubleBinaryOperator arg0, double ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAccumulator.html#getThenReset()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAccumulator.html#get()"/>
         /// </summary>
-        public double ThenReset
+        /// <returns><see cref="double"/></returns>
+        public double Get()
         {
-            get { return IExecuteWithSignature<double>("getThenReset", "()D"); }
+            return IExecuteWithSignature<double>("get", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAccumulator.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAccumulator.html#getThenReset()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
-        public double Get()
+        public double GetThenReset()
         {
-            return IExecuteWithSignature<double>("get", "()D");
+            return IExecuteWithSignature<double>("getThenReset", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAccumulator.html#accumulate(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAccumulator.html#accumulate(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public void Accumulate(double arg0)
@@ -78,7 +79,7 @@ public void Accumulate(double arg0)
             IExecuteWithSignature("accumulate", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAccumulator.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAccumulator.html#reset()"/>
         /// </summary>
         public void Reset()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/DoubleAdder.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/DoubleAdder.cs
index f0235be8c..11e125081 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/DoubleAdder.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/DoubleAdder.cs
@@ -46,7 +46,7 @@ public partial class DoubleAdder
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAdder.html#sum()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAdder.html#sum()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double Sum()
@@ -54,7 +54,7 @@ public double Sum()
             return IExecuteWithSignature<double>("sum", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAdder.html#sumThenReset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAdder.html#sumThenReset()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double SumThenReset()
@@ -62,7 +62,7 @@ public double SumThenReset()
             return IExecuteWithSignature<double>("sumThenReset", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAdder.html#add(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAdder.html#add(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public void Add(double arg0)
@@ -70,7 +70,7 @@ public void Add(double arg0)
             IExecuteWithSignature("add", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/DoubleAdder.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/DoubleAdder.html#reset()"/>
         /// </summary>
         public void Reset()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/LongAccumulator.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/LongAccumulator.cs
index 4af6665c3..e0bf2e6f1 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/LongAccumulator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/LongAccumulator.cs
@@ -30,7 +30,7 @@ public partial class LongAccumulator
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAccumulator.html#%3Cinit%3E(java.util.function.LongBinaryOperator,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAccumulator.html#%3Cinit%3E(java.util.function.LongBinaryOperator,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongBinaryOperator"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -55,22 +55,23 @@ public LongAccumulator(Java.Util.Function.LongBinaryOperator arg0, long arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAccumulator.html#getThenReset()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAccumulator.html#get()"/>
         /// </summary>
-        public long ThenReset
+        /// <returns><see cref="long"/></returns>
+        public long Get()
         {
-            get { return IExecuteWithSignature<long>("getThenReset", "()J"); }
+            return IExecuteWithSignature<long>("get", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAccumulator.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAccumulator.html#getThenReset()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
-        public long Get()
+        public long GetThenReset()
         {
-            return IExecuteWithSignature<long>("get", "()J");
+            return IExecuteWithSignature<long>("getThenReset", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAccumulator.html#accumulate(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAccumulator.html#accumulate(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Accumulate(long arg0)
@@ -78,7 +79,7 @@ public void Accumulate(long arg0)
             IExecuteWithSignature("accumulate", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAccumulator.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAccumulator.html#reset()"/>
         /// </summary>
         public void Reset()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/LongAdder.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/LongAdder.cs
index 37506fde1..ee516463f 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/LongAdder.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Atomic/LongAdder.cs
@@ -46,7 +46,7 @@ public partial class LongAdder
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAdder.html#sum()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAdder.html#sum()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Sum()
@@ -54,7 +54,7 @@ public long Sum()
             return IExecuteWithSignature<long>("sum", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAdder.html#sumThenReset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAdder.html#sumThenReset()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long SumThenReset()
@@ -62,7 +62,7 @@ public long SumThenReset()
             return IExecuteWithSignature<long>("sumThenReset", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAdder.html#add(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAdder.html#add(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Add(long arg0)
@@ -70,21 +70,21 @@ public void Add(long arg0)
             IExecuteWithSignature("add", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAdder.html#decrement()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAdder.html#decrement()"/>
         /// </summary>
         public void Decrement()
         {
             IExecuteWithSignature("decrement", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAdder.html#increment()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAdder.html#increment()"/>
         /// </summary>
         public void Increment()
         {
             IExecuteWithSignature("increment", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/atomic/LongAdder.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/atomic/LongAdder.html#reset()"/>
         /// </summary>
         public void Reset()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/BlockingDeque.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/BlockingDeque.cs
index 5e21368ca..a7235b6d6 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/BlockingDeque.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/BlockingDeque.cs
@@ -54,7 +54,7 @@ public partial class BlockingDeque
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -63,7 +63,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -72,7 +72,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -84,7 +84,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -93,7 +93,7 @@ public bool Offer(object arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offerFirst(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offerFirst(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -105,7 +105,7 @@ public bool OfferFirst(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg
             return IExecute<bool>("offerFirst", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -114,7 +114,7 @@ public bool OfferFirst(object arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offerLast(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offerLast(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -126,7 +126,7 @@ public bool OfferLast(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2
             return IExecute<bool>("offerLast", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -135,7 +135,7 @@ public bool OfferLast(object arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -144,7 +144,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -153,7 +153,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -162,7 +162,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#element()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Element()
@@ -170,7 +170,7 @@ public object Element()
             return IExecuteWithSignature("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#peek()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Peek()
@@ -178,7 +178,7 @@ public object Peek()
             return IExecuteWithSignature("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#poll()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Poll()
@@ -186,7 +186,7 @@ public object Poll()
             return IExecuteWithSignature("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -197,7 +197,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#pollFirst(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#pollFirst(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -208,7 +208,7 @@ public object PollFirst(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("pollFirst", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#pollLast(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#pollLast(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -219,7 +219,7 @@ public object PollLast(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("pollLast", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#remove()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Remove()
@@ -227,7 +227,7 @@ public object Remove()
             return IExecuteWithSignature("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -236,7 +236,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#takeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#takeFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -245,7 +245,7 @@ public object TakeFirst()
             return IExecuteWithSignature("takeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#takeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#takeLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -254,7 +254,7 @@ public object TakeLast()
             return IExecuteWithSignature("takeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -262,7 +262,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -270,7 +270,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddFirst(object arg0)
@@ -278,7 +278,7 @@ public void AddFirst(object arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddLast(object arg0)
@@ -286,7 +286,7 @@ public void AddLast(object arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Push(object arg0)
@@ -294,7 +294,7 @@ public void Push(object arg0)
             IExecuteWithSignature("push", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -303,7 +303,7 @@ public void Put(object arg0)
             IExecuteWithSignature("put", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#putFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#putFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -312,7 +312,7 @@ public void PutFirst(object arg0)
             IExecuteWithSignature("putFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#putLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#putLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -382,7 +382,7 @@ public partial class BlockingDeque<E> : Java.Util.Concurrent.IBlockingDeque<E>,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -391,7 +391,7 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -400,7 +400,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -412,7 +412,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -421,7 +421,7 @@ public bool Offer(E arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offerFirst(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offerFirst(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -433,7 +433,7 @@ public bool OfferFirst(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offerFirst", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -442,7 +442,7 @@ public bool OfferFirst(E arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offerLast(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offerLast(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -454,7 +454,7 @@ public bool OfferLast(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offerLast", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -463,7 +463,7 @@ public bool OfferLast(E arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -472,7 +472,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -481,7 +481,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -490,7 +490,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#element()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Element()
@@ -498,7 +498,7 @@ public E Element()
             return IExecuteWithSignature<E>("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#peek()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Peek()
@@ -506,7 +506,7 @@ public E Peek()
             return IExecuteWithSignature<E>("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#poll()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Poll()
@@ -514,7 +514,7 @@ public E Poll()
             return IExecuteWithSignature<E>("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -525,7 +525,7 @@ public E Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#pollFirst(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#pollFirst(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -536,7 +536,7 @@ public E PollFirst(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("pollFirst", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#pollLast(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#pollLast(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -547,7 +547,7 @@ public E PollLast(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("pollLast", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#remove()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Remove()
@@ -555,7 +555,7 @@ public E Remove()
             return IExecuteWithSignature<E>("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#take()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -564,7 +564,7 @@ public E Take()
             return IExecuteWithSignature<E>("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#takeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#takeFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -573,7 +573,7 @@ public E TakeFirst()
             return IExecuteWithSignature<E>("takeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#takeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#takeLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -582,7 +582,7 @@ public E TakeLast()
             return IExecuteWithSignature<E>("takeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -590,7 +590,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> Iterator()
@@ -598,7 +598,7 @@ public Java.Util.Iterator<E> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddFirst(E arg0)
@@ -606,7 +606,7 @@ public void AddFirst(E arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddLast(E arg0)
@@ -614,7 +614,7 @@ public void AddLast(E arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Push(E arg0)
@@ -622,7 +622,7 @@ public void Push(E arg0)
             IExecuteWithSignature("push", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -631,7 +631,7 @@ public void Put(E arg0)
             IExecuteWithSignature("put", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#putFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#putFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -640,7 +640,7 @@ public void PutFirst(E arg0)
             IExecuteWithSignature("putFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingDeque.html#putLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingDeque.html#putLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/BlockingQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/BlockingQueue.cs
index 6c4338e9b..bb4862e68 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/BlockingQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/BlockingQueue.cs
@@ -46,7 +46,7 @@ public partial class BlockingQueue
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -55,7 +55,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -64,7 +64,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -76,7 +76,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -85,7 +85,7 @@ public bool Offer(object arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -94,7 +94,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -105,7 +105,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -114,7 +114,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -124,7 +124,7 @@ public int DrainTo(Java.Util.Collection arg0, int arg1)
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -133,7 +133,7 @@ public int DrainTo(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -141,7 +141,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -203,7 +203,7 @@ public partial class BlockingQueue<E> : Java.Util.Concurrent.IBlockingQueue<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -212,7 +212,7 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -221,7 +221,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -233,7 +233,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -242,7 +242,7 @@ public bool Offer(E arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -251,7 +251,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -262,7 +262,7 @@ public E Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#take()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -271,28 +271,28 @@ public E Take()
             return IExecuteWithSignature<E>("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE : E
         {
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -300,7 +300,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/BlockingQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/BlockingQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Callable.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Callable.cs
index a845d1105..a8c0e6b4d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Callable.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Callable.cs
@@ -46,7 +46,7 @@ public partial class Callable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Callable.html#call()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Callable.html#call()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.Exception"/>
@@ -108,7 +108,7 @@ public partial class Callable<V> : Java.Util.Concurrent.ICallable<V>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Callable.html#call()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Callable.html#call()"/>
         /// </summary>
         /// <returns><typeparamref name="V"/></returns>
         /// <exception cref="Java.Lang.Exception"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletableFuture.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletableFuture.cs
index b11cfc380..adaa85c4a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletableFuture.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletableFuture.cs
@@ -50,7 +50,7 @@ public partial class CompletableFuture
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completedFuture(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completedFuture(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -59,7 +59,7 @@ public static Java.Util.Concurrent.CompletableFuture CompletedFuture(object arg0
             return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "completedFuture", "(Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#failedFuture(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#failedFuture(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -68,7 +68,7 @@ public static Java.Util.Concurrent.CompletableFuture FailedFuture(MASES.JCOBridg
             return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "failedFuture", "(Ljava/lang/Throwable;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -78,7 +78,7 @@ public static Java.Util.Concurrent.CompletableFuture SupplyAsync(Java.Util.Funct
             return SExecute<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "supplyAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -87,7 +87,7 @@ public static Java.Util.Concurrent.CompletableFuture SupplyAsync(Java.Util.Funct
             return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "supplyAsync", "(Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completedStage(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completedStage(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -96,7 +96,7 @@ public static Java.Util.Concurrent.CompletionStage CompletedStage(object arg0)
             return SExecuteWithSignature<Java.Util.Concurrent.CompletionStage>(LocalBridgeClazz, "completedStage", "(Ljava/lang/Object;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#failedStage(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#failedStage(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -105,7 +105,7 @@ public static Java.Util.Concurrent.CompletionStage FailedStage(MASES.JCOBridge.C
             return SExecuteWithSignature<Java.Util.Concurrent.CompletionStage>(LocalBridgeClazz, "failedStage", "(Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#anyOf(java.util.concurrent.CompletableFuture[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#anyOf(java.util.concurrent.CompletableFuture[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletableFuture"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -114,7 +114,7 @@ public static Java.Util.Concurrent.CompletableFuture AnyOf(params Java.Util.Conc
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "anyOf", "([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;"); else return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "anyOf", "([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#allOf(java.util.concurrent.CompletableFuture[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#allOf(java.util.concurrent.CompletableFuture[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletableFuture"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -123,7 +123,7 @@ public static Java.Util.Concurrent.CompletableFuture AllOf(params Java.Util.Conc
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "allOf", "([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;"); else return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "allOf", "([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -133,7 +133,7 @@ public static Java.Util.Concurrent.CompletableFuture RunAsync(Java.Lang.Runnable
             return SExecute<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "runAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAsync(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAsync(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -142,7 +142,7 @@ public static Java.Util.Concurrent.CompletableFuture RunAsync(Java.Lang.Runnable
             return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>(LocalBridgeClazz, "runAsync", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#delayedExecutor(long,java.util.concurrent.TimeUnit,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#delayedExecutor(long,java.util.concurrent.TimeUnit,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -153,7 +153,7 @@ public static Java.Util.Concurrent.Executor DelayedExecutor(long arg0, Java.Util
             return SExecute<Java.Util.Concurrent.Executor>(LocalBridgeClazz, "delayedExecutor", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#delayedExecutor(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#delayedExecutor(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -167,14 +167,7 @@ public static Java.Util.Concurrent.Executor DelayedExecutor(long arg0, Java.Util
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#getNumberOfDependents()"/> 
-        /// </summary>
-        public int NumberOfDependents
-        {
-            get { return IExecuteWithSignature<int>("getNumberOfDependents", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#newIncompleteFuture()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#newIncompleteFuture()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
         public Java.Util.Concurrent.CompletableFuture NewIncompleteFuture()
@@ -182,7 +175,7 @@ public Java.Util.Concurrent.CompletableFuture NewIncompleteFuture()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>("newIncompleteFuture", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#cancel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -191,7 +184,7 @@ public bool Cancel(bool arg0)
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#complete(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#complete(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -200,7 +193,7 @@ public bool Complete(object arg0)
             return IExecuteWithSignature<bool>("complete", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completeExceptionally(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completeExceptionally(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -209,7 +202,7 @@ public bool CompleteExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException a
             return IExecuteWithSignature<bool>("completeExceptionally", "(Ljava/lang/Throwable;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCancelled()
@@ -217,7 +210,7 @@ public bool IsCancelled()
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#isCompletedExceptionally()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#isCompletedExceptionally()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCompletedExceptionally()
@@ -225,7 +218,7 @@ public bool IsCompletedExceptionally()
             return IExecuteWithSignature<bool>("isCompletedExceptionally", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#isDone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#isDone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDone()
@@ -233,7 +226,15 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completeAsync(java.util.function.Supplier,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#getNumberOfDependents()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfDependents()
+        {
+            return IExecuteWithSignature<int>("getNumberOfDependents", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completeAsync(java.util.function.Supplier,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -243,7 +244,7 @@ public Java.Util.Concurrent.CompletableFuture CompleteAsync(Java.Util.Function.S
             return IExecute<Java.Util.Concurrent.CompletableFuture>("completeAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completeAsync(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completeAsync(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -252,7 +253,7 @@ public Java.Util.Concurrent.CompletableFuture CompleteAsync(Java.Util.Function.S
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>("completeAsync", "(Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completeOnTimeout(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completeOnTimeout(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -263,7 +264,7 @@ public Java.Util.Concurrent.CompletableFuture CompleteOnTimeout(object arg0, lon
             return IExecute<Java.Util.Concurrent.CompletableFuture>("completeOnTimeout", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#copy()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#copy()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
         public Java.Util.Concurrent.CompletableFuture Copy()
@@ -271,7 +272,7 @@ public Java.Util.Concurrent.CompletableFuture Copy()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>("copy", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#orTimeout(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#orTimeout(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -281,7 +282,7 @@ public Java.Util.Concurrent.CompletableFuture OrTimeout(long arg0, Java.Util.Con
             return IExecute<Java.Util.Concurrent.CompletableFuture>("orTimeout", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#toCompletableFuture()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#toCompletableFuture()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
         public Java.Util.Concurrent.CompletableFuture ToCompletableFuture()
@@ -289,7 +290,7 @@ public Java.Util.Concurrent.CompletableFuture ToCompletableFuture()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>("toCompletableFuture", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#acceptEither(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#acceptEither(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -299,7 +300,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEither(Java.Util.Concurrent.Co
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -310,7 +311,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEitherAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -320,7 +321,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEitherAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#applyToEither(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#applyToEither(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -330,7 +331,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEither(Java.Util.Concurrent.C
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -341,7 +342,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEitherAsync(Java.Util.Concurr
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -351,7 +352,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEitherAsync(Java.Util.Concurr
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionally(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#exceptionally(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -360,54 +361,7 @@ public Java.Util.Concurrent.CompletionStage Exceptionally(Java.Util.Function.Fun
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionally", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyAsync(Java.Util.Function.Function arg0, Java.Util.Concurrent.Executor arg1)
-        {
-            return IExecute<Java.Util.Concurrent.CompletionStage>("exceptionallyAsync", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyAsync(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyAsync(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyCompose(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyCompose(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyCompose", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyComposeAsync(Java.Util.Function.Function arg0, Java.Util.Concurrent.Executor arg1)
-        {
-            return IExecute<Java.Util.Concurrent.CompletionStage>("exceptionallyComposeAsync", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyComposeAsync(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyComposeAsync(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyComposeAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#handle(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#handle(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -416,7 +370,7 @@ public Java.Util.Concurrent.CompletionStage Handle(Java.Util.Function.BiFunction
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("handle", "(Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#handleAsync(java.util.function.BiFunction,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#handleAsync(java.util.function.BiFunction,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -426,7 +380,7 @@ public Java.Util.Concurrent.CompletionStage HandleAsync(Java.Util.Function.BiFun
             return IExecute<Java.Util.Concurrent.CompletionStage>("handleAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#handleAsync(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#handleAsync(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -435,7 +389,7 @@ public Java.Util.Concurrent.CompletionStage HandleAsync(Java.Util.Function.BiFun
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("handleAsync", "(Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterBoth(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterBoth(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -445,7 +399,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBoth(Java.Util.Concurrent.Co
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBoth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -456,7 +410,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBothAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBothAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -466,7 +420,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBothAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBothAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterEither(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterEither(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -476,7 +430,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEither(Java.Util.Concurrent.
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -487,7 +441,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEitherAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -497,7 +451,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEitherAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAccept(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAccept(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -506,7 +460,7 @@ public Java.Util.Concurrent.CompletionStage ThenAccept(Java.Util.Function.Consum
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenAccept", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptAsync(java.util.function.Consumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptAsync(java.util.function.Consumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -516,7 +470,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptAsync(Java.Util.Function.C
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptAsync(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptAsync(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -525,7 +479,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptAsync(Java.Util.Function.C
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenAcceptAsync", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptBoth(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptBoth(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -535,7 +489,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBoth(Java.Util.Concurrent.
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBoth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -546,7 +500,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBothAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBothAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -556,7 +510,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBothAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBothAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenApply(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenApply(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -565,7 +519,7 @@ public Java.Util.Concurrent.CompletionStage ThenApply(Java.Util.Function.Functio
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenApply", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenApplyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenApplyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -575,7 +529,7 @@ public Java.Util.Concurrent.CompletionStage ThenApplyAsync(Java.Util.Function.Fu
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenApplyAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenApplyAsync(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenApplyAsync(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -584,7 +538,7 @@ public Java.Util.Concurrent.CompletionStage ThenApplyAsync(Java.Util.Function.Fu
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenApplyAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenCombine(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenCombine(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -594,7 +548,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombine(Java.Util.Concurrent.Com
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombine", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -605,7 +559,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombineAsync(Java.Util.Concurren
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombineAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -615,7 +569,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombineAsync(Java.Util.Concurren
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombineAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenCompose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenCompose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -624,7 +578,7 @@ public Java.Util.Concurrent.CompletionStage ThenCompose(Java.Util.Function.Funct
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenCompose", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -634,7 +588,7 @@ public Java.Util.Concurrent.CompletionStage ThenComposeAsync(Java.Util.Function.
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenComposeAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenComposeAsync(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenComposeAsync(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -643,7 +597,7 @@ public Java.Util.Concurrent.CompletionStage ThenComposeAsync(Java.Util.Function.
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenComposeAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenRun(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenRun(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -652,7 +606,7 @@ public Java.Util.Concurrent.CompletionStage ThenRun(Java.Lang.Runnable arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenRun", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenRunAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenRunAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -662,7 +616,7 @@ public Java.Util.Concurrent.CompletionStage ThenRunAsync(Java.Lang.Runnable arg0
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenRunAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenRunAsync(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenRunAsync(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -671,7 +625,7 @@ public Java.Util.Concurrent.CompletionStage ThenRunAsync(Java.Lang.Runnable arg0
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenRunAsync", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#whenComplete(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#whenComplete(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -680,7 +634,7 @@ public Java.Util.Concurrent.CompletionStage WhenComplete(Java.Util.Function.BiCo
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("whenComplete", "(Ljava/util/function/BiConsumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#whenCompleteAsync(java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#whenCompleteAsync(java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -690,7 +644,7 @@ public Java.Util.Concurrent.CompletionStage WhenCompleteAsync(Java.Util.Function
             return IExecute<Java.Util.Concurrent.CompletionStage>("whenCompleteAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#whenCompleteAsync(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#whenCompleteAsync(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -699,7 +653,7 @@ public Java.Util.Concurrent.CompletionStage WhenCompleteAsync(Java.Util.Function
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("whenCompleteAsync", "(Ljava/util/function/BiConsumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#minimalCompletionStage()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#minimalCompletionStage()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
         public Java.Util.Concurrent.CompletionStage MinimalCompletionStage()
@@ -707,7 +661,7 @@ public Java.Util.Concurrent.CompletionStage MinimalCompletionStage()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("minimalCompletionStage", "()Ljava/util/concurrent/CompletionStage;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#defaultExecutor()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#defaultExecutor()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Executor"/></returns>
         public Java.Util.Concurrent.Executor DefaultExecutor()
@@ -715,7 +669,7 @@ public Java.Util.Concurrent.Executor DefaultExecutor()
             return IExecuteWithSignature<Java.Util.Concurrent.Executor>("defaultExecutor", "()Ljava/util/concurrent/Executor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -725,7 +679,7 @@ public object Get()
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#get(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#get(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -738,7 +692,7 @@ public object Get(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#getNow(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#getNow(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -747,7 +701,7 @@ public object GetNow(object arg0)
             return IExecuteWithSignature("getNow", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#join()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#join()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Join()
@@ -755,7 +709,7 @@ public object Join()
             return IExecuteWithSignature("join", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#obtrudeException(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#obtrudeException(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         public void ObtrudeException(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
@@ -763,7 +717,7 @@ public void ObtrudeException(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("obtrudeException", "(Ljava/lang/Throwable;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#obtrudeValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#obtrudeValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void ObtrudeValue(object arg0)
@@ -841,7 +795,7 @@ public partial class CompletableFuture<T> : Java.Util.Concurrent.IFuture<T>, Jav
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completedFuture(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completedFuture(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="U"/></param>
         /// <typeparam name="U"></typeparam>
@@ -851,7 +805,7 @@ public static Java.Util.Concurrent.CompletableFuture<U> CompletedFuture<U>(U arg
             return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<U>>(LocalBridgeClazz, "completedFuture", "(Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#failedFuture(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#failedFuture(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <typeparam name="U"></typeparam>
@@ -861,7 +815,7 @@ public static Java.Util.Concurrent.CompletableFuture<U> FailedFuture<U>(MASES.JC
             return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<U>>(LocalBridgeClazz, "failedFuture", "(Ljava/lang/Throwable;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -872,7 +826,7 @@ public static Java.Util.Concurrent.CompletableFuture<U> SupplyAsync<U>(Java.Util
             return SExecute<Java.Util.Concurrent.CompletableFuture<U>>(LocalBridgeClazz, "supplyAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="U"></typeparam>
@@ -882,7 +836,7 @@ public static Java.Util.Concurrent.CompletableFuture<U> SupplyAsync<U>(Java.Util
             return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<U>>(LocalBridgeClazz, "supplyAsync", "(Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completedStage(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completedStage(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="U"/></param>
         /// <typeparam name="U"></typeparam>
@@ -892,7 +846,7 @@ public static Java.Util.Concurrent.CompletionStage<U> CompletedStage<U>(U arg0)
             return SExecuteWithSignature<Java.Util.Concurrent.CompletionStage<U>>(LocalBridgeClazz, "completedStage", "(Ljava/lang/Object;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#failedStage(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#failedStage(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <typeparam name="U"></typeparam>
@@ -902,7 +856,7 @@ public static Java.Util.Concurrent.CompletionStage<U> FailedStage<U>(MASES.JCOBr
             return SExecuteWithSignature<Java.Util.Concurrent.CompletionStage<U>>(LocalBridgeClazz, "failedStage", "(Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#anyOf(java.util.concurrent.CompletableFuture[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#anyOf(java.util.concurrent.CompletableFuture[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletableFuture"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -911,7 +865,7 @@ public static Java.Util.Concurrent.CompletableFuture<object> AnyOf(params Java.U
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<object>>(LocalBridgeClazz, "anyOf", "([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;"); else return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<object>>(LocalBridgeClazz, "anyOf", "([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#allOf(java.util.concurrent.CompletableFuture[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#allOf(java.util.concurrent.CompletableFuture[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletableFuture"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -920,7 +874,7 @@ public static Java.Util.Concurrent.CompletableFuture<object> AnyOf(params Java.U
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<Java.Lang.Void>>(LocalBridgeClazz, "allOf", "([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;"); else return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<Java.Lang.Void>>(LocalBridgeClazz, "allOf", "([Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -930,7 +884,7 @@ public static Java.Util.Concurrent.CompletableFuture<object> AnyOf(params Java.U
             return SExecute<Java.Util.Concurrent.CompletableFuture<Java.Lang.Void>>(LocalBridgeClazz, "runAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAsync(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAsync(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -939,7 +893,7 @@ public static Java.Util.Concurrent.CompletableFuture<object> AnyOf(params Java.U
             return SExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<Java.Lang.Void>>(LocalBridgeClazz, "runAsync", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#delayedExecutor(long,java.util.concurrent.TimeUnit,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#delayedExecutor(long,java.util.concurrent.TimeUnit,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -950,7 +904,7 @@ public static Java.Util.Concurrent.Executor DelayedExecutor(long arg0, Java.Util
             return SExecute<Java.Util.Concurrent.Executor>(LocalBridgeClazz, "delayedExecutor", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#delayedExecutor(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#delayedExecutor(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -964,14 +918,7 @@ public static Java.Util.Concurrent.Executor DelayedExecutor(long arg0, Java.Util
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#getNumberOfDependents()"/> 
-        /// </summary>
-        public int NumberOfDependents
-        {
-            get { return IExecuteWithSignature<int>("getNumberOfDependents", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#newIncompleteFuture()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#newIncompleteFuture()"/>
         /// </summary>
         /// <typeparam name="U"></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -980,7 +927,7 @@ public Java.Util.Concurrent.CompletableFuture<U> NewIncompleteFuture<U>()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<U>>("newIncompleteFuture", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#cancel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -989,7 +936,7 @@ public bool Cancel(bool arg0)
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#complete(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#complete(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -998,7 +945,7 @@ public bool Complete(T arg0)
             return IExecuteWithSignature<bool>("complete", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completeExceptionally(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completeExceptionally(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -1007,7 +954,7 @@ public bool CompleteExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException a
             return IExecuteWithSignature<bool>("completeExceptionally", "(Ljava/lang/Throwable;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCancelled()
@@ -1015,7 +962,7 @@ public bool IsCancelled()
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#isCompletedExceptionally()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#isCompletedExceptionally()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCompletedExceptionally()
@@ -1023,7 +970,7 @@ public bool IsCompletedExceptionally()
             return IExecuteWithSignature<bool>("isCompletedExceptionally", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#isDone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#isDone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDone()
@@ -1031,28 +978,36 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completeAsync(java.util.function.Supplier,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#getNumberOfDependents()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfDependents()
+        {
+            return IExecuteWithSignature<int>("getNumberOfDependents", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completeAsync(java.util.function.Supplier,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
-        public Java.Util.Concurrent.CompletableFuture<T> CompleteAsync<Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsT> arg0, Java.Util.Concurrent.Executor arg1) where Arg0ExtendsT: T
+        public Java.Util.Concurrent.CompletableFuture<T> CompleteAsync<Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsT> arg0, Java.Util.Concurrent.Executor arg1) where Arg0ExtendsT : T
         {
             return IExecute<Java.Util.Concurrent.CompletableFuture<T>>("completeAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completeAsync(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completeAsync(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
-        public Java.Util.Concurrent.CompletableFuture<T> CompleteAsync<Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public Java.Util.Concurrent.CompletableFuture<T> CompleteAsync<Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<T>>("completeAsync", "(Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#completeOnTimeout(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#completeOnTimeout(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -1063,7 +1018,7 @@ public Java.Util.Concurrent.CompletableFuture<T> CompleteOnTimeout(T arg0, long
             return IExecute<Java.Util.Concurrent.CompletableFuture<T>>("completeOnTimeout", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#copy()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#copy()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
         public Java.Util.Concurrent.CompletableFuture<T> Copy()
@@ -1071,7 +1026,7 @@ public Java.Util.Concurrent.CompletableFuture<T> Copy()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<T>>("copy", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#orTimeout(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#orTimeout(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -1081,7 +1036,7 @@ public Java.Util.Concurrent.CompletableFuture<T> OrTimeout(long arg0, Java.Util.
             return IExecute<Java.Util.Concurrent.CompletableFuture<T>>("orTimeout", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#toCompletableFuture()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#toCompletableFuture()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
         public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
@@ -1089,7 +1044,7 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<T>>("toCompletableFuture", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#acceptEither(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#acceptEither(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -1099,7 +1054,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEither(Java.Util.Concurrent.Co
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -1110,7 +1065,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEitherAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -1120,7 +1075,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEitherAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#applyToEither(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#applyToEither(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -1130,7 +1085,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEither(Java.Util.Concurrent.C
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -1141,7 +1096,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEitherAsync(Java.Util.Concurr
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -1151,7 +1106,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEitherAsync(Java.Util.Concurr
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionally(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#exceptionally(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1160,54 +1115,7 @@ public Java.Util.Concurrent.CompletionStage Exceptionally(Java.Util.Function.Fun
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionally", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyAsync(Java.Util.Function.Function arg0, Java.Util.Concurrent.Executor arg1)
-        {
-            return IExecute<Java.Util.Concurrent.CompletionStage>("exceptionallyAsync", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyAsync(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyAsync(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyCompose(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyCompose(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyCompose", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyComposeAsync(Java.Util.Function.Function arg0, Java.Util.Concurrent.Executor arg1)
-        {
-            return IExecute<Java.Util.Concurrent.CompletionStage>("exceptionallyComposeAsync", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#exceptionallyComposeAsync(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyComposeAsync(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyComposeAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#handle(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#handle(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1216,7 +1124,7 @@ public Java.Util.Concurrent.CompletionStage Handle(Java.Util.Function.BiFunction
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("handle", "(Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#handleAsync(java.util.function.BiFunction,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#handleAsync(java.util.function.BiFunction,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1226,7 +1134,7 @@ public Java.Util.Concurrent.CompletionStage HandleAsync(Java.Util.Function.BiFun
             return IExecute<Java.Util.Concurrent.CompletionStage>("handleAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#handleAsync(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#handleAsync(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1235,7 +1143,7 @@ public Java.Util.Concurrent.CompletionStage HandleAsync(Java.Util.Function.BiFun
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("handleAsync", "(Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterBoth(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterBoth(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -1245,7 +1153,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBoth(Java.Util.Concurrent.Co
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBoth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -1256,7 +1164,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBothAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBothAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -1266,7 +1174,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBothAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBothAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterEither(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterEither(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -1276,7 +1184,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEither(Java.Util.Concurrent.
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -1287,7 +1195,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEitherAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -1297,7 +1205,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEitherAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAccept(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAccept(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1306,7 +1214,7 @@ public Java.Util.Concurrent.CompletionStage ThenAccept(Java.Util.Function.Consum
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenAccept", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptAsync(java.util.function.Consumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptAsync(java.util.function.Consumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1316,7 +1224,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptAsync(Java.Util.Function.C
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptAsync(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptAsync(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1325,7 +1233,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptAsync(Java.Util.Function.C
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenAcceptAsync", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptBoth(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptBoth(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -1335,7 +1243,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBoth(Java.Util.Concurrent.
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBoth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -1346,7 +1254,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBothAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBothAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -1356,7 +1264,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBothAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBothAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenApply(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenApply(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1365,7 +1273,7 @@ public Java.Util.Concurrent.CompletionStage ThenApply(Java.Util.Function.Functio
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenApply", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenApplyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenApplyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1375,7 +1283,7 @@ public Java.Util.Concurrent.CompletionStage ThenApplyAsync(Java.Util.Function.Fu
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenApplyAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenApplyAsync(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenApplyAsync(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1384,7 +1292,7 @@ public Java.Util.Concurrent.CompletionStage ThenApplyAsync(Java.Util.Function.Fu
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenApplyAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenCombine(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenCombine(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -1394,7 +1302,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombine(Java.Util.Concurrent.Com
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombine", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -1405,7 +1313,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombineAsync(Java.Util.Concurren
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombineAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -1415,7 +1323,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombineAsync(Java.Util.Concurren
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombineAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenCompose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenCompose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1424,7 +1332,7 @@ public Java.Util.Concurrent.CompletionStage ThenCompose(Java.Util.Function.Funct
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenCompose", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1434,7 +1342,7 @@ public Java.Util.Concurrent.CompletionStage ThenComposeAsync(Java.Util.Function.
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenComposeAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenComposeAsync(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenComposeAsync(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1443,7 +1351,7 @@ public Java.Util.Concurrent.CompletionStage ThenComposeAsync(Java.Util.Function.
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenComposeAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenRun(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenRun(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1452,7 +1360,7 @@ public Java.Util.Concurrent.CompletionStage ThenRun(Java.Lang.Runnable arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenRun", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenRunAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenRunAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1462,7 +1370,7 @@ public Java.Util.Concurrent.CompletionStage ThenRunAsync(Java.Lang.Runnable arg0
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenRunAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#thenRunAsync(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#thenRunAsync(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1471,7 +1379,7 @@ public Java.Util.Concurrent.CompletionStage ThenRunAsync(Java.Lang.Runnable arg0
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenRunAsync", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#whenComplete(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#whenComplete(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1480,7 +1388,7 @@ public Java.Util.Concurrent.CompletionStage WhenComplete(Java.Util.Function.BiCo
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("whenComplete", "(Ljava/util/function/BiConsumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#whenCompleteAsync(java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#whenCompleteAsync(java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -1490,7 +1398,7 @@ public Java.Util.Concurrent.CompletionStage WhenCompleteAsync(Java.Util.Function
             return IExecute<Java.Util.Concurrent.CompletionStage>("whenCompleteAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#whenCompleteAsync(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#whenCompleteAsync(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -1499,7 +1407,7 @@ public Java.Util.Concurrent.CompletionStage WhenCompleteAsync(Java.Util.Function
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("whenCompleteAsync", "(Ljava/util/function/BiConsumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#minimalCompletionStage()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#minimalCompletionStage()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
         public Java.Util.Concurrent.CompletionStage<T> MinimalCompletionStage()
@@ -1507,7 +1415,7 @@ public Java.Util.Concurrent.CompletionStage<T> MinimalCompletionStage()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<T>>("minimalCompletionStage", "()Ljava/util/concurrent/CompletionStage;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#defaultExecutor()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#defaultExecutor()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Executor"/></returns>
         public Java.Util.Concurrent.Executor DefaultExecutor()
@@ -1515,7 +1423,7 @@ public Java.Util.Concurrent.Executor DefaultExecutor()
             return IExecuteWithSignature<Java.Util.Concurrent.Executor>("defaultExecutor", "()Ljava/util/concurrent/Executor;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -1525,7 +1433,7 @@ public T Get()
             return IExecuteWithSignature<T>("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#get(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#get(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -1538,7 +1446,7 @@ public T Get(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<T>("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#getNow(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#getNow(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><typeparamref name="T"/></returns>
@@ -1547,7 +1455,7 @@ public T GetNow(T arg0)
             return IExecuteWithSignature<T>("getNow", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#join()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#join()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public T Join()
@@ -1555,7 +1463,7 @@ public T Join()
             return IExecuteWithSignature<T>("join", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#obtrudeException(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#obtrudeException(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         public void ObtrudeException(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
@@ -1563,7 +1471,7 @@ public void ObtrudeException(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("obtrudeException", "(Ljava/lang/Throwable;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletableFuture.html#obtrudeValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletableFuture.html#obtrudeValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         public void ObtrudeValue(T arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletionService.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletionService.cs
index 6cfe6d8be..ba4164a57 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletionService.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletionService.cs
@@ -46,7 +46,7 @@ public partial class CompletionService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#poll()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         public Java.Util.Concurrent.Future Poll()
@@ -54,7 +54,7 @@ public Java.Util.Concurrent.Future Poll()
             return IExecuteWithSignature<Java.Util.Concurrent.Future>("poll", "()Ljava/util/concurrent/Future;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -65,7 +65,7 @@ public Java.Util.Concurrent.Future Poll(long arg0, Java.Util.Concurrent.TimeUnit
             return IExecute<Java.Util.Concurrent.Future>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#submit(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#submit(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -75,7 +75,7 @@ public Java.Util.Concurrent.Future Submit(Java.Lang.Runnable arg0, object arg1)
             return IExecute<Java.Util.Concurrent.Future>("submit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#submit(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#submit(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -84,7 +84,7 @@ public Java.Util.Concurrent.Future Submit(Java.Util.Concurrent.Callable arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.Future>("submit", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#take()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -146,7 +146,7 @@ public partial class CompletionService<V> : Java.Util.Concurrent.ICompletionServ
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#poll()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         public Java.Util.Concurrent.Future<V> Poll()
@@ -154,7 +154,7 @@ public Java.Util.Concurrent.Future<V> Poll()
             return IExecuteWithSignature<Java.Util.Concurrent.Future<V>>("poll", "()Ljava/util/concurrent/Future;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -165,7 +165,7 @@ public Java.Util.Concurrent.Future<V> Poll(long arg0, Java.Util.Concurrent.TimeU
             return IExecute<Java.Util.Concurrent.Future<V>>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#submit(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#submit(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -175,7 +175,7 @@ public Java.Util.Concurrent.Future<V> Submit(Java.Lang.Runnable arg0, V arg1)
             return IExecute<Java.Util.Concurrent.Future<V>>("submit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#submit(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#submit(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -184,7 +184,7 @@ public Java.Util.Concurrent.Future<V> Submit(Java.Util.Concurrent.Callable<V> ar
             return IExecuteWithSignature<Java.Util.Concurrent.Future<V>>("submit", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionService.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionService.html#take()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletionStage.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletionStage.cs
index 61c551804..e47938b9c 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletionStage.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/CompletionStage.cs
@@ -46,7 +46,7 @@ public partial class CompletionStage
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenCombine(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenCombine(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -56,7 +56,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombine(Java.Util.Concurrent.Com
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombine", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -67,7 +67,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombineAsync(Java.Util.Concurren
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombineAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -77,7 +77,7 @@ public Java.Util.Concurrent.CompletionStage ThenCombineAsync(Java.Util.Concurren
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenCombineAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptBoth(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptBoth(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -87,7 +87,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBoth(Java.Util.Concurrent.
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBoth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -98,7 +98,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBothAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBothAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -108,7 +108,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptBothAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptBothAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#applyToEither(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#applyToEither(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -118,7 +118,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEither(Java.Util.Concurrent.C
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -129,7 +129,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEitherAsync(Java.Util.Concurr
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -139,7 +139,7 @@ public Java.Util.Concurrent.CompletionStage ApplyToEitherAsync(Java.Util.Concurr
             return IExecute<Java.Util.Concurrent.CompletionStage>("applyToEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#handle(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#handle(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -148,7 +148,7 @@ public Java.Util.Concurrent.CompletionStage Handle(Java.Util.Function.BiFunction
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("handle", "(Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#handleAsync(java.util.function.BiFunction,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#handleAsync(java.util.function.BiFunction,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -158,7 +158,7 @@ public Java.Util.Concurrent.CompletionStage HandleAsync(Java.Util.Function.BiFun
             return IExecute<Java.Util.Concurrent.CompletionStage>("handleAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#handleAsync(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#handleAsync(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -167,7 +167,7 @@ public Java.Util.Concurrent.CompletionStage HandleAsync(Java.Util.Function.BiFun
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("handleAsync", "(Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenApply(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenApply(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -176,7 +176,7 @@ public Java.Util.Concurrent.CompletionStage ThenApply(Java.Util.Function.Functio
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenApply", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenApplyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenApplyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -186,7 +186,7 @@ public Java.Util.Concurrent.CompletionStage ThenApplyAsync(Java.Util.Function.Fu
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenApplyAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenApplyAsync(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenApplyAsync(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -195,7 +195,7 @@ public Java.Util.Concurrent.CompletionStage ThenApplyAsync(Java.Util.Function.Fu
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenApplyAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenCompose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenCompose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -204,7 +204,7 @@ public Java.Util.Concurrent.CompletionStage ThenCompose(Java.Util.Function.Funct
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenCompose", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -214,7 +214,7 @@ public Java.Util.Concurrent.CompletionStage ThenComposeAsync(Java.Util.Function.
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenComposeAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenComposeAsync(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenComposeAsync(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -223,7 +223,7 @@ public Java.Util.Concurrent.CompletionStage ThenComposeAsync(Java.Util.Function.
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenComposeAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#toCompletableFuture()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#toCompletableFuture()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
         public Java.Util.Concurrent.CompletableFuture ToCompletableFuture()
@@ -231,7 +231,7 @@ public Java.Util.Concurrent.CompletableFuture ToCompletableFuture()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>("toCompletableFuture", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#acceptEither(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#acceptEither(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -241,7 +241,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEither(Java.Util.Concurrent.Co
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -252,7 +252,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEitherAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -262,7 +262,7 @@ public Java.Util.Concurrent.CompletionStage AcceptEitherAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("acceptEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterBoth(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterBoth(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -272,7 +272,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBoth(Java.Util.Concurrent.Co
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBoth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -283,7 +283,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBothAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBothAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -293,7 +293,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterBothAsync(Java.Util.Concurre
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterBothAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterEither(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterEither(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -303,7 +303,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEither(Java.Util.Concurrent.
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -314,7 +314,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEitherAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -324,7 +324,7 @@ public Java.Util.Concurrent.CompletionStage RunAfterEitherAsync(Java.Util.Concur
             return IExecute<Java.Util.Concurrent.CompletionStage>("runAfterEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAccept(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAccept(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -333,7 +333,7 @@ public Java.Util.Concurrent.CompletionStage ThenAccept(Java.Util.Function.Consum
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenAccept", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptAsync(java.util.function.Consumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptAsync(java.util.function.Consumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -343,7 +343,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptAsync(Java.Util.Function.C
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenAcceptAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptAsync(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptAsync(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -352,7 +352,7 @@ public Java.Util.Concurrent.CompletionStage ThenAcceptAsync(Java.Util.Function.C
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenAcceptAsync", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenRun(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenRun(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -361,7 +361,7 @@ public Java.Util.Concurrent.CompletionStage ThenRun(Java.Lang.Runnable arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenRun", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenRunAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenRunAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -371,7 +371,7 @@ public Java.Util.Concurrent.CompletionStage ThenRunAsync(Java.Lang.Runnable arg0
             return IExecute<Java.Util.Concurrent.CompletionStage>("thenRunAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenRunAsync(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenRunAsync(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -380,7 +380,7 @@ public Java.Util.Concurrent.CompletionStage ThenRunAsync(Java.Lang.Runnable arg0
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("thenRunAsync", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionally(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#exceptionally(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -389,7 +389,7 @@ public Java.Util.Concurrent.CompletionStage Exceptionally(Java.Util.Function.Fun
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionally", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#whenComplete(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#whenComplete(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -398,7 +398,7 @@ public Java.Util.Concurrent.CompletionStage WhenComplete(Java.Util.Function.BiCo
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("whenComplete", "(Ljava/util/function/BiConsumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#whenCompleteAsync(java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#whenCompleteAsync(java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -408,7 +408,7 @@ public Java.Util.Concurrent.CompletionStage WhenCompleteAsync(Java.Util.Function
             return IExecute<Java.Util.Concurrent.CompletionStage>("whenCompleteAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#whenCompleteAsync(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#whenCompleteAsync(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -416,53 +416,6 @@ public Java.Util.Concurrent.CompletionStage WhenCompleteAsync(Java.Util.Function
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("whenCompleteAsync", "(Ljava/util/function/BiConsumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyAsync(Java.Util.Function.Function arg0, Java.Util.Concurrent.Executor arg1)
-        {
-            return IExecute<Java.Util.Concurrent.CompletionStage>("exceptionallyAsync", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyAsync(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyAsync(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyCompose(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyCompose(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyCompose", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyComposeAsync(Java.Util.Function.Function arg0, Java.Util.Concurrent.Executor arg1)
-        {
-            return IExecute<Java.Util.Concurrent.CompletionStage>("exceptionallyComposeAsync", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyComposeAsync(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage ExceptionallyComposeAsync(Java.Util.Function.Function arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage>("exceptionallyComposeAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
 
         #endregion
 
@@ -517,7 +470,7 @@ public partial class CompletionStage<T> : Java.Util.Concurrent.ICompletionStage<
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenCombine(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenCombine(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -528,12 +481,12 @@ public partial class CompletionStage<T> : Java.Util.Concurrent.ICompletionStage<
         /// <typeparam name="Arg1objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<V> ThenCombine<V, Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiFunction<Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV> arg1) where Arg0ExtendsU: U where Arg1objectSuperT: T where Arg1objectSuperU: U where Arg1ExtendsV: V
+        public Java.Util.Concurrent.CompletionStage<V> ThenCombine<V, Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiFunction<Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV> arg1) where Arg0ExtendsU : U where Arg1objectSuperT : T where Arg1objectSuperU : U where Arg1ExtendsV : V
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<V>>("thenCombine", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -545,12 +498,12 @@ public Java.Util.Concurrent.CompletionStage<V> ThenCombine<V, Arg0ExtendsU, U, A
         /// <typeparam name="Arg1objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiFunction<Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV> arg1, Java.Util.Concurrent.Executor arg2) where Arg0ExtendsU: U where Arg1objectSuperT: T where Arg1objectSuperU: U where Arg1ExtendsV: V
+        public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiFunction<Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV> arg1, Java.Util.Concurrent.Executor arg2) where Arg0ExtendsU : U where Arg1objectSuperT : T where Arg1objectSuperU : U where Arg1ExtendsV : V
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<V>>("thenCombineAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenCombineAsync(java.util.concurrent.CompletionStage,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -561,12 +514,12 @@ public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU,
         /// <typeparam name="Arg1objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiFunction<Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV> arg1) where Arg0ExtendsU: U where Arg1objectSuperT: T where Arg1objectSuperU: U where Arg1ExtendsV: V
+        public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiFunction<Arg1objectSuperT, Arg1objectSuperU, Arg1ExtendsV> arg1) where Arg0ExtendsU : U where Arg1objectSuperT : T where Arg1objectSuperU : U where Arg1ExtendsV : V
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<V>>("thenCombineAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptBoth(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptBoth(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -575,12 +528,12 @@ public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU,
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptBoth<Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiConsumer<Arg1objectSuperT, Arg1objectSuperU> arg1) where Arg0ExtendsU: U where Arg1objectSuperT: T where Arg1objectSuperU: U
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptBoth<Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiConsumer<Arg1objectSuperT, Arg1objectSuperU> arg1) where Arg0ExtendsU : U where Arg1objectSuperT : T where Arg1objectSuperU : U
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenAcceptBoth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -590,12 +543,12 @@ public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU,
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptBothAsync<Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiConsumer<Arg1objectSuperT, Arg1objectSuperU> arg1, Java.Util.Concurrent.Executor arg2) where Arg0ExtendsU: U where Arg1objectSuperT: T where Arg1objectSuperU: U
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptBothAsync<Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiConsumer<Arg1objectSuperT, Arg1objectSuperU> arg1, Java.Util.Concurrent.Executor arg2) where Arg0ExtendsU : U where Arg1objectSuperT : T where Arg1objectSuperU : U
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenAcceptBothAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptBothAsync(java.util.concurrent.CompletionStage,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -604,12 +557,12 @@ public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU,
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptBothAsync<Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiConsumer<Arg1objectSuperT, Arg1objectSuperU> arg1) where Arg0ExtendsU: U where Arg1objectSuperT: T where Arg1objectSuperU: U
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptBothAsync<Arg0ExtendsU, U, Arg1objectSuperT, Arg1objectSuperU>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsU> arg0, Java.Util.Function.BiConsumer<Arg1objectSuperT, Arg1objectSuperU> arg1) where Arg0ExtendsU : U where Arg1objectSuperT : T where Arg1objectSuperU : U
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenAcceptBothAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#applyToEither(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#applyToEither(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -617,12 +570,12 @@ public Java.Util.Concurrent.CompletionStage<V> ThenCombineAsync<V, Arg0ExtendsU,
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ApplyToEither<U, Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Function<Arg1objectSuperT, U> arg1) where Arg0ExtendsT: T where Arg1objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<U> ApplyToEither<U, Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Function<Arg1objectSuperT, U> arg1) where Arg0ExtendsT : T where Arg1objectSuperT : T
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<U>>("applyToEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -631,12 +584,12 @@ public Java.Util.Concurrent.CompletionStage<U> ApplyToEither<U, Arg0ExtendsT, Ar
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ApplyToEitherAsync<U, Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Function<Arg1objectSuperT, U> arg1, Java.Util.Concurrent.Executor arg2) where Arg0ExtendsT: T where Arg1objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<U> ApplyToEitherAsync<U, Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Function<Arg1objectSuperT, U> arg1, Java.Util.Concurrent.Executor arg2) where Arg0ExtendsT : T where Arg1objectSuperT : T
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<U>>("applyToEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#applyToEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -644,24 +597,24 @@ public Java.Util.Concurrent.CompletionStage<U> ApplyToEitherAsync<U, Arg0Extends
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ApplyToEitherAsync<U, Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Function<Arg1objectSuperT, U> arg1) where Arg0ExtendsT: T where Arg1objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<U> ApplyToEitherAsync<U, Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Function<Arg1objectSuperT, U> arg1) where Arg0ExtendsT : T where Arg1objectSuperT : T
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<U>>("applyToEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#handle(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#handle(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> Handle<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.BiFunction<Arg0objectSuperT, Java.Lang.Throwable, Arg0ExtendsU> arg0) where Arg0objectSuperT: T where Arg0ExtendsU: U
+        public Java.Util.Concurrent.CompletionStage<U> Handle<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.BiFunction<Arg0objectSuperT, Java.Lang.Throwable, Arg0ExtendsU> arg0) where Arg0objectSuperT : T where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<U>>("handle", "(Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#handleAsync(java.util.function.BiFunction,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#handleAsync(java.util.function.BiFunction,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -669,36 +622,36 @@ public Java.Util.Concurrent.CompletionStage<U> Handle<U, Arg0objectSuperT, Arg0E
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> HandleAsync<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.BiFunction<Arg0objectSuperT, Java.Lang.Throwable, Arg0ExtendsU> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT: T where Arg0ExtendsU: U
+        public Java.Util.Concurrent.CompletionStage<U> HandleAsync<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.BiFunction<Arg0objectSuperT, Java.Lang.Throwable, Arg0ExtendsU> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT : T where Arg0ExtendsU : U
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<U>>("handleAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#handleAsync(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#handleAsync(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> HandleAsync<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.BiFunction<Arg0objectSuperT, Java.Lang.Throwable, Arg0ExtendsU> arg0) where Arg0objectSuperT: T where Arg0ExtendsU: U
+        public Java.Util.Concurrent.CompletionStage<U> HandleAsync<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.BiFunction<Arg0objectSuperT, Java.Lang.Throwable, Arg0ExtendsU> arg0) where Arg0objectSuperT : T where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<U>>("handleAsync", "(Ljava/util/function/BiFunction;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenApply(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenApply(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ThenApply<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0) where Arg0objectSuperT: T where Arg0ExtendsU: U
+        public Java.Util.Concurrent.CompletionStage<U> ThenApply<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0) where Arg0objectSuperT : T where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<U>>("thenApply", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenApplyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenApplyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -706,36 +659,36 @@ public Java.Util.Concurrent.CompletionStage<U> ThenApply<U, Arg0objectSuperT, Ar
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ThenApplyAsync<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT: T where Arg0ExtendsU: U
+        public Java.Util.Concurrent.CompletionStage<U> ThenApplyAsync<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT : T where Arg0ExtendsU : U
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<U>>("thenApplyAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenApplyAsync(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenApplyAsync(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ThenApplyAsync<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0) where Arg0objectSuperT: T where Arg0ExtendsU: U
+        public Java.Util.Concurrent.CompletionStage<U> ThenApplyAsync<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0) where Arg0objectSuperT : T where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<U>>("thenApplyAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenCompose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenCompose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_"><see cref="Java.Util.Concurrent.CompletionStage{U}"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ThenCompose<U, Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_> arg0) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_: Java.Util.Concurrent.CompletionStage<U>
+        public Java.Util.Concurrent.CompletionStage<U> ThenCompose<U, Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_> arg0) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_ : Java.Util.Concurrent.CompletionStage<U>
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<U>>("thenCompose", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -743,24 +696,24 @@ public Java.Util.Concurrent.CompletionStage<U> ThenCompose<U, Arg0objectSuperT,
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_"><see cref="Java.Util.Concurrent.CompletionStage{U}"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ThenComposeAsync<U, Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_: Java.Util.Concurrent.CompletionStage<U>
+        public Java.Util.Concurrent.CompletionStage<U> ThenComposeAsync<U, Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_ : Java.Util.Concurrent.CompletionStage<U>
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<U>>("thenComposeAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenComposeAsync(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenComposeAsync(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_"><see cref="Java.Util.Concurrent.CompletionStage{U}"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<U> ThenComposeAsync<U, Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_> arg0) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_: Java.Util.Concurrent.CompletionStage<U>
+        public Java.Util.Concurrent.CompletionStage<U> ThenComposeAsync<U, Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_> arg0) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Concurrent_CompletionStage_U_ : Java.Util.Concurrent.CompletionStage<U>
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<U>>("thenComposeAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#toCompletableFuture()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#toCompletableFuture()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
         public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
@@ -768,19 +721,19 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<T>>("toCompletableFuture", "()Ljava/util/concurrent/CompletableFuture;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#acceptEither(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#acceptEither(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> AcceptEither<Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Consumer<Arg1objectSuperT> arg1) where Arg0ExtendsT: T where Arg1objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> AcceptEither<Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Consumer<Arg1objectSuperT> arg1) where Arg0ExtendsT : T where Arg1objectSuperT : T
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("acceptEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -788,24 +741,24 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> AcceptEitherAsync<Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Consumer<Arg1objectSuperT> arg1, Java.Util.Concurrent.Executor arg2) where Arg0ExtendsT: T where Arg1objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> AcceptEitherAsync<Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Consumer<Arg1objectSuperT> arg1, Java.Util.Concurrent.Executor arg2) where Arg0ExtendsT : T where Arg1objectSuperT : T
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("acceptEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#acceptEitherAsync(java.util.concurrent.CompletionStage,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> AcceptEitherAsync<Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Consumer<Arg1objectSuperT> arg1) where Arg0ExtendsT: T where Arg1objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> AcceptEitherAsync<Arg0ExtendsT, Arg1objectSuperT>(Java.Util.Concurrent.CompletionStage<Arg0ExtendsT> arg0, Java.Util.Function.Consumer<Arg1objectSuperT> arg1) where Arg0ExtendsT : T where Arg1objectSuperT : T
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("acceptEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterBoth(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterBoth(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -815,7 +768,7 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("runAfterBoth", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -826,7 +779,7 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("runAfterBothAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterBothAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -836,7 +789,7 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("runAfterBothAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterEither(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterEither(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -846,7 +799,7 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("runAfterEither", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -857,7 +810,7 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("runAfterEitherAsync", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#runAfterEitherAsync(java.util.concurrent.CompletionStage,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CompletionStage"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -867,38 +820,38 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("runAfterEitherAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAccept(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAccept(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAccept<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAccept<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenAccept", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptAsync(java.util.function.Consumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptAsync(java.util.function.Consumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptAsync<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptAsync<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT : T
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenAcceptAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenAcceptAsync(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenAcceptAsync(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptAsync<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Concurrent.CompletionStage<Java.Lang.Void> ThenAcceptAsync<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenAcceptAsync", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenRun(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenRun(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -907,7 +860,7 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenRun", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenRunAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenRunAsync(java.lang.Runnable,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
@@ -917,7 +870,7 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecute<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenRunAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#thenRunAsync(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#thenRunAsync(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
@@ -926,101 +879,49 @@ public Java.Util.Concurrent.CompletableFuture<T> ToCompletableFuture()
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<Java.Lang.Void>>("thenRunAsync", "(Ljava/lang/Runnable;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionally(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#exceptionally(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> Exceptionally<Arg0ExtendsT>(Java.Util.Function.Function<Java.Lang.Throwable, Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public Java.Util.Concurrent.CompletionStage<T> Exceptionally<Arg0ExtendsT>(Java.Util.Function.Function<Java.Lang.Throwable, Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<T>>("exceptionally", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#whenComplete(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#whenComplete(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperJava_Lang_Throwable"><see cref="Java.Lang.Throwable"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> WhenComplete<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable> arg0) where Arg0objectSuperT: T where Arg0objectSuperJava_Lang_Throwable: Java.Lang.Throwable
+        public Java.Util.Concurrent.CompletionStage<T> WhenComplete<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable> arg0) where Arg0objectSuperT : T where Arg0objectSuperJava_Lang_Throwable : Java.Lang.Throwable
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<T>>("whenComplete", "(Ljava/util/function/BiConsumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#whenCompleteAsync(java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#whenCompleteAsync(java.util.function.BiConsumer,java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperJava_Lang_Throwable"><see cref="Java.Lang.Throwable"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> WhenCompleteAsync<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT: T where Arg0objectSuperJava_Lang_Throwable: Java.Lang.Throwable
+        public Java.Util.Concurrent.CompletionStage<T> WhenCompleteAsync<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable> arg0, Java.Util.Concurrent.Executor arg1) where Arg0objectSuperT : T where Arg0objectSuperJava_Lang_Throwable : Java.Lang.Throwable
         {
             return IExecute<Java.Util.Concurrent.CompletionStage<T>>("whenCompleteAsync", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#whenCompleteAsync(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CompletionStage.html#whenCompleteAsync(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperJava_Lang_Throwable"><see cref="Java.Lang.Throwable"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> WhenCompleteAsync<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable> arg0) where Arg0objectSuperT: T where Arg0objectSuperJava_Lang_Throwable: Java.Lang.Throwable
+        public Java.Util.Concurrent.CompletionStage<T> WhenCompleteAsync<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Lang_Throwable> arg0) where Arg0objectSuperT : T where Arg0objectSuperJava_Lang_Throwable : Java.Lang.Throwable
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<T>>("whenCompleteAsync", "(Ljava/util/function/BiConsumer;)Ljava/util/concurrent/CompletionStage;", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> ExceptionallyAsync<Arg0ExtendsT>(Java.Util.Function.Function<Java.Lang.Throwable, Arg0ExtendsT> arg0, Java.Util.Concurrent.Executor arg1) where Arg0ExtendsT: T
-        {
-            return IExecute<Java.Util.Concurrent.CompletionStage<T>>("exceptionallyAsync", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyAsync(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> ExceptionallyAsync<Arg0ExtendsT>(Java.Util.Function.Function<Java.Lang.Throwable, Arg0ExtendsT> arg0) where Arg0ExtendsT: T
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<T>>("exceptionallyAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyCompose(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_"><see cref="Java.Util.Concurrent.CompletionStage{T}"/></typeparam>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> ExceptionallyCompose<Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_>(Java.Util.Function.Function<Java.Lang.Throwable, Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_: Java.Util.Concurrent.CompletionStage<T>
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<T>>("exceptionallyCompose", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyComposeAsync(java.util.function.Function,java.util.concurrent.Executor)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.Executor"/></param>
-        /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_"><see cref="Java.Util.Concurrent.CompletionStage{T}"/></typeparam>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> ExceptionallyComposeAsync<Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_>(Java.Util.Function.Function<Java.Lang.Throwable, Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_> arg0, Java.Util.Concurrent.Executor arg1) where Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_: Java.Util.Concurrent.CompletionStage<T>
-        {
-            return IExecute<Java.Util.Concurrent.CompletionStage<T>>("exceptionallyComposeAsync", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CompletionStage.html#exceptionallyComposeAsync(java.util.function.Function)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
-        /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_"><see cref="Java.Util.Concurrent.CompletionStage{T}"/></typeparam>
-        /// <returns><see cref="Java.Util.Concurrent.CompletionStage"/></returns>
-        public Java.Util.Concurrent.CompletionStage<T> ExceptionallyComposeAsync<Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_>(Java.Util.Function.Function<Java.Lang.Throwable, Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_CompletionStage_T_: Java.Util.Concurrent.CompletionStage<T>
-        {
-            return IExecuteWithSignature<Java.Util.Concurrent.CompletionStage<T>>("exceptionallyComposeAsync", "(Ljava/util/function/Function;)Ljava/util/concurrent/CompletionStage;", arg0);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentHashMap.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentHashMap.cs
index 000c0fb75..3171a79aa 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentHashMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentHashMap.cs
@@ -30,7 +30,7 @@ public partial class ConcurrentHashMap
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int,float,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int,float,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -40,7 +40,7 @@ public ConcurrentHashMap(int arg0, float arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -49,7 +49,7 @@ public ConcurrentHashMap(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ConcurrentHashMap(int arg0)
@@ -57,7 +57,7 @@ public ConcurrentHashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public ConcurrentHashMap(Java.Util.Map arg0)
@@ -85,7 +85,7 @@ public ConcurrentHashMap(Java.Util.Map arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#newKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#newKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentHashMap.KeySetView"/></returns>
         public static Java.Util.Concurrent.ConcurrentHashMap.KeySetView NewKeySet()
@@ -93,7 +93,7 @@ public static Java.Util.Concurrent.ConcurrentHashMap.KeySetView NewKeySet()
             return SExecuteWithSignature<Java.Util.Concurrent.ConcurrentHashMap.KeySetView>(LocalBridgeClazz, "newKeySet", "()Ljava/util/concurrent/ConcurrentHashMap$KeySetView;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#newKeySet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#newKeySet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentHashMap.KeySetView"/></returns>
@@ -106,7 +106,7 @@ public static Java.Util.Concurrent.ConcurrentHashMap.KeySetView NewKeySet(int ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduce(long,java.util.function.BiFunction,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduce(long,java.util.function.BiFunction,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -117,7 +117,7 @@ public object Reduce(long arg0, Java.Util.Function.BiFunction arg1, Java.Util.Fu
             return IExecute("reduce", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntries(long,java.util.function.Function,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntries(long,java.util.function.Function,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -128,7 +128,7 @@ public object ReduceEntries(long arg0, Java.Util.Function.Function arg1, Java.Ut
             return IExecute("reduceEntries", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeys(long,java.util.function.Function,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeys(long,java.util.function.Function,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -139,7 +139,7 @@ public object ReduceKeys(long arg0, Java.Util.Function.Function arg1, Java.Util.
             return IExecute("reduceKeys", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValues(long,java.util.function.Function,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValues(long,java.util.function.Function,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -150,7 +150,7 @@ public object ReduceValues(long arg0, Java.Util.Function.Function arg1, Java.Uti
             return IExecute("reduceValues", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#search(long,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#search(long,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -160,7 +160,7 @@ public object Search(long arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("search", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#searchEntries(long,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#searchEntries(long,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -170,7 +170,7 @@ public object SearchEntries(long arg0, Java.Util.Function.Function arg1)
             return IExecute("searchEntries", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#searchKeys(long,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#searchKeys(long,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -180,7 +180,7 @@ public object SearchKeys(long arg0, Java.Util.Function.Function arg1)
             return IExecute("searchKeys", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#searchValues(long,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#searchValues(long,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -190,7 +190,7 @@ public object SearchValues(long arg0, Java.Util.Function.Function arg1)
             return IExecute("searchValues", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEach(long,java.util.function.BiFunction,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEach(long,java.util.function.BiFunction,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -200,7 +200,7 @@ public void ForEach(long arg0, Java.Util.Function.BiFunction arg1, Java.Util.Fun
             IExecute("forEach", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachEntry(long,java.util.function.Function,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachEntry(long,java.util.function.Function,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -210,7 +210,7 @@ public void ForEachEntry(long arg0, Java.Util.Function.Function arg1, Java.Util.
             IExecute("forEachEntry", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachKey(long,java.util.function.Function,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachKey(long,java.util.function.Function,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -220,7 +220,7 @@ public void ForEachKey(long arg0, Java.Util.Function.Function arg1, Java.Util.Fu
             IExecute("forEachKey", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachValue(long,java.util.function.Function,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachValue(long,java.util.function.Function,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -230,7 +230,7 @@ public void ForEachValue(long arg0, Java.Util.Function.Function arg1, Java.Util.
             IExecute("forEachValue", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -239,7 +239,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
@@ -251,7 +251,7 @@ public double ReduceEntriesToDouble(long arg0, Java.Util.Function.ToDoubleFuncti
             return IExecute<double>("reduceEntriesToDouble", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
@@ -263,7 +263,7 @@ public double ReduceKeysToDouble(long arg0, Java.Util.Function.ToDoubleFunction
             return IExecute<double>("reduceKeysToDouble", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceToDouble(long,java.util.function.ToDoubleBiFunction,double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceToDouble(long,java.util.function.ToDoubleBiFunction,double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToDoubleBiFunction"/></param>
@@ -275,7 +275,7 @@ public double ReduceToDouble(long arg0, Java.Util.Function.ToDoubleBiFunction ar
             return IExecute<double>("reduceToDouble", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
@@ -287,7 +287,7 @@ public double ReduceValuesToDouble(long arg0, Java.Util.Function.ToDoubleFunctio
             return IExecute<double>("reduceValuesToDouble", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToIntFunction"/></param>
@@ -299,7 +299,7 @@ public int ReduceEntriesToInt(long arg0, Java.Util.Function.ToIntFunction arg1,
             return IExecute<int>("reduceEntriesToInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToIntFunction"/></param>
@@ -311,7 +311,7 @@ public int ReduceKeysToInt(long arg0, Java.Util.Function.ToIntFunction arg1, int
             return IExecute<int>("reduceKeysToInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceToInt(long,java.util.function.ToIntBiFunction,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceToInt(long,java.util.function.ToIntBiFunction,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToIntBiFunction"/></param>
@@ -323,7 +323,7 @@ public int ReduceToInt(long arg0, Java.Util.Function.ToIntBiFunction arg1, int a
             return IExecute<int>("reduceToInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToIntFunction"/></param>
@@ -335,7 +335,7 @@ public int ReduceValuesToInt(long arg0, Java.Util.Function.ToIntFunction arg1, i
             return IExecute<int>("reduceValuesToInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#keySet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#keySet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentHashMap.KeySetView"/></returns>
@@ -344,7 +344,7 @@ public Java.Util.Concurrent.ConcurrentHashMap.KeySetView KeySet(object arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentHashMap.KeySetView>("keySet", "(Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentHashMap$KeySetView;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#keys()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#keys()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration Keys()
@@ -352,7 +352,7 @@ public Java.Util.Enumeration Keys()
             return IExecuteWithSignature<Java.Util.Enumeration>("keys", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#elements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#elements()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration Elements()
@@ -360,7 +360,7 @@ public Java.Util.Enumeration Elements()
             return IExecuteWithSignature<Java.Util.Enumeration>("elements", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntries(long,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntries(long,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -370,7 +370,7 @@ public Java.Util.Map.Entry ReduceEntries(long arg0, Java.Util.Function.BiFunctio
             return IExecute<Java.Util.Map.Entry>("reduceEntries", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeys(long,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeys(long,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -380,7 +380,7 @@ public object ReduceKeys(long arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("reduceKeys", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#mappingCount()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#mappingCount()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long MappingCount()
@@ -388,7 +388,7 @@ public long MappingCount()
             return IExecuteWithSignature<long>("mappingCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToLongFunction"/></param>
@@ -400,7 +400,7 @@ public long ReduceEntriesToLong(long arg0, Java.Util.Function.ToLongFunction arg
             return IExecute<long>("reduceEntriesToLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToLongFunction"/></param>
@@ -412,7 +412,7 @@ public long ReduceKeysToLong(long arg0, Java.Util.Function.ToLongFunction arg1,
             return IExecute<long>("reduceKeysToLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceToLong(long,java.util.function.ToLongBiFunction,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceToLong(long,java.util.function.ToLongBiFunction,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToLongBiFunction"/></param>
@@ -424,7 +424,7 @@ public long ReduceToLong(long arg0, Java.Util.Function.ToLongBiFunction arg1, lo
             return IExecute<long>("reduceToLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToLongFunction"/></param>
@@ -436,7 +436,7 @@ public long ReduceValuesToLong(long arg0, Java.Util.Function.ToLongFunction arg1
             return IExecute<long>("reduceValuesToLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValues(long,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValues(long,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -446,7 +446,7 @@ public object ReduceValues(long arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("reduceValues", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEach(long,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEach(long,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -455,7 +455,7 @@ public void ForEach(long arg0, Java.Util.Function.BiConsumer arg1)
             IExecute("forEach", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachEntry(long,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachEntry(long,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -464,7 +464,7 @@ public void ForEachEntry(long arg0, Java.Util.Function.Consumer arg1)
             IExecute("forEachEntry", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachKey(long,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachKey(long,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -473,7 +473,7 @@ public void ForEachKey(long arg0, Java.Util.Function.Consumer arg1)
             IExecute("forEachKey", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachValue(long,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachValue(long,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
@@ -514,11 +514,12 @@ public partial class KeySetView
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.KeySetView.html#getMappedValue()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.KeySetView.html#getMappedValue()"/>
             /// </summary>
-            public object MappedValue
+            /// <returns><see cref="object"/></returns>
+            public object GetMappedValue()
             {
-                get { return IExecuteWithSignature("getMappedValue", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature("getMappedValue", "()Ljava/lang/Object;");
             }
 
             #endregion
@@ -564,11 +565,12 @@ public partial class KeySetView<K, V> : Java.Util.ISet<K>, Java.Io.ISerializable
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.KeySetView.html#getMappedValue()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.KeySetView.html#getMappedValue()"/>
             /// </summary>
-            public V MappedValue
+            /// <returns><typeparamref name="V"/></returns>
+            public V GetMappedValue()
             {
-                get { return IExecuteWithSignature<V>("getMappedValue", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<V>("getMappedValue", "()Ljava/lang/Object;");
             }
 
             #endregion
@@ -593,7 +595,7 @@ public partial class ConcurrentHashMap<K, V> : Java.Util.Concurrent.IConcurrentM
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int,float,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int,float,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -603,7 +605,7 @@ public ConcurrentHashMap(int arg0, float arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -612,7 +614,7 @@ public ConcurrentHashMap(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ConcurrentHashMap(int arg0)
@@ -620,7 +622,7 @@ public ConcurrentHashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public ConcurrentHashMap(Java.Util.Map<K, V> arg0)
@@ -652,7 +654,7 @@ public ConcurrentHashMap(Java.Util.Map<K, V> arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#newKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#newKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentHashMap.KeySetView"/></returns>
         public static Java.Util.Concurrent.ConcurrentHashMap.KeySetView<K, Java.Lang.Boolean> NewKeySet()
@@ -660,7 +662,7 @@ public ConcurrentHashMap(Java.Util.Map<K, V> arg0)
             return SExecuteWithSignature<Java.Util.Concurrent.ConcurrentHashMap.KeySetView<K, Java.Lang.Boolean>>(LocalBridgeClazz, "newKeySet", "()Ljava/util/concurrent/ConcurrentHashMap$KeySetView;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#newKeySet(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#newKeySet(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentHashMap.KeySetView"/></returns>
@@ -673,7 +675,7 @@ public ConcurrentHashMap(Java.Util.Map<K, V> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduce(long,java.util.function.BiFunction,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduce(long,java.util.function.BiFunction,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -685,12 +687,12 @@ public ConcurrentHashMap(Java.Util.Map<K, V> arg0)
         /// <typeparam name="Arg2objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="Arg2ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U Reduce<U, Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU> arg1, Java.Util.Function.BiFunction<Arg2objectSuperU, Arg2objectSuperU, Arg2ExtendsU> arg2) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsU: U where Arg2objectSuperU: U where Arg2ExtendsU: U
+        public U Reduce<U, Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU> arg1, Java.Util.Function.BiFunction<Arg2objectSuperU, Arg2objectSuperU, Arg2ExtendsU> arg2) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsU : U where Arg2objectSuperU : U where Arg2ExtendsU : U
         {
             return IExecute<U>("reduce", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntries(long,java.util.function.Function,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntries(long,java.util.function.Function,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -700,12 +702,12 @@ public U Reduce<U, Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU, Arg2objectS
         /// <typeparam name="Arg2objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="Arg2ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U ReduceEntries<U, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg0, Java.Util.Function.Function<Java.Util.Map.Entry<K, V>, Arg1ExtendsU> arg1, Java.Util.Function.BiFunction<Arg2objectSuperU, Arg2objectSuperU, Arg2ExtendsU> arg2) where Arg1ExtendsU: U where Arg2objectSuperU: U where Arg2ExtendsU: U
+        public U ReduceEntries<U, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg0, Java.Util.Function.Function<Java.Util.Map.Entry<K, V>, Arg1ExtendsU> arg1, Java.Util.Function.BiFunction<Arg2objectSuperU, Arg2objectSuperU, Arg2ExtendsU> arg2) where Arg1ExtendsU : U where Arg2objectSuperU : U where Arg2ExtendsU : U
         {
             return IExecute<U>("reduceEntries", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeys(long,java.util.function.Function,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeys(long,java.util.function.Function,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -716,12 +718,12 @@ public U ReduceEntries<U, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg
         /// <typeparam name="Arg2objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="Arg2ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U ReduceKeys<U, Arg1objectSuperK, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsU> arg1, Java.Util.Function.BiFunction<Arg2objectSuperU, Arg2objectSuperU, Arg2ExtendsU> arg2) where Arg1objectSuperK: K where Arg1ExtendsU: U where Arg2objectSuperU: U where Arg2ExtendsU: U
+        public U ReduceKeys<U, Arg1objectSuperK, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsU> arg1, Java.Util.Function.BiFunction<Arg2objectSuperU, Arg2objectSuperU, Arg2ExtendsU> arg2) where Arg1objectSuperK : K where Arg1ExtendsU : U where Arg2objectSuperU : U where Arg2ExtendsU : U
         {
             return IExecute<U>("reduceKeys", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValues(long,java.util.function.Function,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValues(long,java.util.function.Function,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -732,12 +734,12 @@ public U ReduceKeys<U, Arg1objectSuperK, Arg1ExtendsU, Arg2objectSuperU, Arg2Ext
         /// <typeparam name="Arg2objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="Arg2ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U ReduceValues<U, Arg1objectSuperV, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg0, Java.Util.Function.Function<Arg1objectSuperV, Arg1ExtendsU> arg1, Java.Util.Function.BiFunction<Arg2objectSuperU, Arg2objectSuperU, Arg2ExtendsU> arg2) where Arg1objectSuperV: V where Arg1ExtendsU: U where Arg2objectSuperU: U where Arg2ExtendsU: U
+        public U ReduceValues<U, Arg1objectSuperV, Arg1ExtendsU, Arg2objectSuperU, Arg2ExtendsU>(long arg0, Java.Util.Function.Function<Arg1objectSuperV, Arg1ExtendsU> arg1, Java.Util.Function.BiFunction<Arg2objectSuperU, Arg2objectSuperU, Arg2ExtendsU> arg2) where Arg1objectSuperV : V where Arg1ExtendsU : U where Arg2objectSuperU : U where Arg2ExtendsU : U
         {
             return IExecute<U>("reduceValues", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#search(long,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#search(long,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -746,24 +748,24 @@ public U ReduceValues<U, Arg1objectSuperV, Arg1ExtendsU, Arg2objectSuperU, Arg2E
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U Search<U, Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU> arg1) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsU: U
+        public U Search<U, Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU> arg1) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsU : U
         {
             return IExecute<U>("search", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#searchEntries(long,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#searchEntries(long,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U SearchEntries<U, Arg1ExtendsU>(long arg0, Java.Util.Function.Function<Java.Util.Map.Entry<K, V>, Arg1ExtendsU> arg1) where Arg1ExtendsU: U
+        public U SearchEntries<U, Arg1ExtendsU>(long arg0, Java.Util.Function.Function<Java.Util.Map.Entry<K, V>, Arg1ExtendsU> arg1) where Arg1ExtendsU : U
         {
             return IExecute<U>("searchEntries", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#searchKeys(long,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#searchKeys(long,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -771,12 +773,12 @@ public U SearchEntries<U, Arg1ExtendsU>(long arg0, Java.Util.Function.Function<J
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U SearchKeys<U, Arg1objectSuperK, Arg1ExtendsU>(long arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsU> arg1) where Arg1objectSuperK: K where Arg1ExtendsU: U
+        public U SearchKeys<U, Arg1objectSuperK, Arg1ExtendsU>(long arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsU> arg1) where Arg1objectSuperK : K where Arg1ExtendsU : U
         {
             return IExecute<U>("searchKeys", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#searchValues(long,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#searchValues(long,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -784,12 +786,12 @@ public U SearchKeys<U, Arg1objectSuperK, Arg1ExtendsU>(long arg0, Java.Util.Func
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U SearchValues<U, Arg1objectSuperV, Arg1ExtendsU>(long arg0, Java.Util.Function.Function<Arg1objectSuperV, Arg1ExtendsU> arg1) where Arg1objectSuperV: V where Arg1ExtendsU: U
+        public U SearchValues<U, Arg1objectSuperV, Arg1ExtendsU>(long arg0, Java.Util.Function.Function<Arg1objectSuperV, Arg1ExtendsU> arg1) where Arg1objectSuperV : V where Arg1ExtendsU : U
         {
             return IExecute<U>("searchValues", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEach(long,java.util.function.BiFunction,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEach(long,java.util.function.BiFunction,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -799,12 +801,12 @@ public U SearchValues<U, Arg1objectSuperV, Arg1ExtendsU>(long arg0, Java.Util.Fu
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg2objectSuperU"><typeparamref name="U"/></typeparam>
-        public void ForEach<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU> arg1, Java.Util.Function.Consumer<Arg2objectSuperU> arg2) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsU: U where Arg2objectSuperU: U
+        public void ForEach<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU> arg1, Java.Util.Function.Consumer<Arg2objectSuperU> arg2) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsU : U where Arg2objectSuperU : U
         {
             IExecute("forEach", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachEntry(long,java.util.function.Function,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachEntry(long,java.util.function.Function,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -812,12 +814,12 @@ public void ForEach<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsU, U, Arg2obj
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg2objectSuperU"><typeparamref name="U"/></typeparam>
-        public void ForEachEntry<Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util.Function.Function<Java.Util.Map.Entry<K, V>, Arg1ExtendsU> arg1, Java.Util.Function.Consumer<Arg2objectSuperU> arg2) where Arg1ExtendsU: U where Arg2objectSuperU: U
+        public void ForEachEntry<Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util.Function.Function<Java.Util.Map.Entry<K, V>, Arg1ExtendsU> arg1, Java.Util.Function.Consumer<Arg2objectSuperU> arg2) where Arg1ExtendsU : U where Arg2objectSuperU : U
         {
             IExecute("forEachEntry", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachKey(long,java.util.function.Function,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachKey(long,java.util.function.Function,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -826,12 +828,12 @@ public void ForEachEntry<Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg2objectSuperU"><typeparamref name="U"/></typeparam>
-        public void ForEachKey<Arg1objectSuperK, Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsU> arg1, Java.Util.Function.Consumer<Arg2objectSuperU> arg2) where Arg1objectSuperK: K where Arg1ExtendsU: U where Arg2objectSuperU: U
+        public void ForEachKey<Arg1objectSuperK, Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsU> arg1, Java.Util.Function.Consumer<Arg2objectSuperU> arg2) where Arg1objectSuperK : K where Arg1ExtendsU : U where Arg2objectSuperU : U
         {
             IExecute("forEachKey", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachValue(long,java.util.function.Function,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachValue(long,java.util.function.Function,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -840,12 +842,12 @@ public void ForEachKey<Arg1objectSuperK, Arg1ExtendsU, U, Arg2objectSuperU>(long
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg2objectSuperU"><typeparamref name="U"/></typeparam>
-        public void ForEachValue<Arg1objectSuperV, Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util.Function.Function<Arg1objectSuperV, Arg1ExtendsU> arg1, Java.Util.Function.Consumer<Arg2objectSuperU> arg2) where Arg1objectSuperV: V where Arg1ExtendsU: U where Arg2objectSuperU: U
+        public void ForEachValue<Arg1objectSuperV, Arg1ExtendsU, U, Arg2objectSuperU>(long arg0, Java.Util.Function.Function<Arg1objectSuperV, Arg1ExtendsU> arg1, Java.Util.Function.Consumer<Arg2objectSuperU> arg2) where Arg1objectSuperV : V where Arg1ExtendsU : U where Arg2objectSuperU : U
         {
             IExecute("forEachValue", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -854,7 +856,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
@@ -866,7 +868,7 @@ public double ReduceEntriesToDouble(long arg0, Java.Util.Function.ToDoubleFuncti
             return IExecute<double>("reduceEntriesToDouble", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
@@ -874,12 +876,12 @@ public double ReduceEntriesToDouble(long arg0, Java.Util.Function.ToDoubleFuncti
         /// <param name="arg3"><see cref="Java.Util.Function.DoubleBinaryOperator"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <returns><see cref="double"/></returns>
-        public double ReduceKeysToDouble<Arg1objectSuperK>(long arg0, Java.Util.Function.ToDoubleFunction<Arg1objectSuperK> arg1, double arg2, Java.Util.Function.DoubleBinaryOperator arg3) where Arg1objectSuperK: K
+        public double ReduceKeysToDouble<Arg1objectSuperK>(long arg0, Java.Util.Function.ToDoubleFunction<Arg1objectSuperK> arg1, double arg2, Java.Util.Function.DoubleBinaryOperator arg3) where Arg1objectSuperK : K
         {
             return IExecute<double>("reduceKeysToDouble", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceToDouble(long,java.util.function.ToDoubleBiFunction,double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceToDouble(long,java.util.function.ToDoubleBiFunction,double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToDoubleBiFunction"/></param>
@@ -888,12 +890,12 @@ public double ReduceKeysToDouble<Arg1objectSuperK>(long arg0, Java.Util.Function
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="double"/></returns>
-        public double ReduceToDouble<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.Function.ToDoubleBiFunction<Arg1objectSuperK, Arg1objectSuperV> arg1, double arg2, Java.Util.Function.DoubleBinaryOperator arg3) where Arg1objectSuperK: K where Arg1objectSuperV: V
+        public double ReduceToDouble<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.Function.ToDoubleBiFunction<Arg1objectSuperK, Arg1objectSuperV> arg1, double arg2, Java.Util.Function.DoubleBinaryOperator arg3) where Arg1objectSuperK : K where Arg1objectSuperV : V
         {
             return IExecute<double>("reduceToDouble", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToDouble(long,java.util.function.ToDoubleFunction,double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
@@ -901,12 +903,12 @@ public double ReduceToDouble<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java
         /// <param name="arg3"><see cref="Java.Util.Function.DoubleBinaryOperator"/></param>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="double"/></returns>
-        public double ReduceValuesToDouble<Arg1objectSuperV>(long arg0, Java.Util.Function.ToDoubleFunction<Arg1objectSuperV> arg1, double arg2, Java.Util.Function.DoubleBinaryOperator arg3) where Arg1objectSuperV: V
+        public double ReduceValuesToDouble<Arg1objectSuperV>(long arg0, Java.Util.Function.ToDoubleFunction<Arg1objectSuperV> arg1, double arg2, Java.Util.Function.DoubleBinaryOperator arg3) where Arg1objectSuperV : V
         {
             return IExecute<double>("reduceValuesToDouble", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToIntFunction"/></param>
@@ -918,7 +920,7 @@ public int ReduceEntriesToInt(long arg0, Java.Util.Function.ToIntFunction<Java.U
             return IExecute<int>("reduceEntriesToInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToIntFunction"/></param>
@@ -926,12 +928,12 @@ public int ReduceEntriesToInt(long arg0, Java.Util.Function.ToIntFunction<Java.U
         /// <param name="arg3"><see cref="Java.Util.Function.IntBinaryOperator"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int ReduceKeysToInt<Arg1objectSuperK>(long arg0, Java.Util.Function.ToIntFunction<Arg1objectSuperK> arg1, int arg2, Java.Util.Function.IntBinaryOperator arg3) where Arg1objectSuperK: K
+        public int ReduceKeysToInt<Arg1objectSuperK>(long arg0, Java.Util.Function.ToIntFunction<Arg1objectSuperK> arg1, int arg2, Java.Util.Function.IntBinaryOperator arg3) where Arg1objectSuperK : K
         {
             return IExecute<int>("reduceKeysToInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceToInt(long,java.util.function.ToIntBiFunction,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceToInt(long,java.util.function.ToIntBiFunction,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToIntBiFunction"/></param>
@@ -940,12 +942,12 @@ public int ReduceKeysToInt<Arg1objectSuperK>(long arg0, Java.Util.Function.ToInt
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int ReduceToInt<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.Function.ToIntBiFunction<Arg1objectSuperK, Arg1objectSuperV> arg1, int arg2, Java.Util.Function.IntBinaryOperator arg3) where Arg1objectSuperK: K where Arg1objectSuperV: V
+        public int ReduceToInt<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.Function.ToIntBiFunction<Arg1objectSuperK, Arg1objectSuperV> arg1, int arg2, Java.Util.Function.IntBinaryOperator arg3) where Arg1objectSuperK : K where Arg1objectSuperV : V
         {
             return IExecute<int>("reduceToInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToInt(long,java.util.function.ToIntFunction,int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToIntFunction"/></param>
@@ -953,12 +955,12 @@ public int ReduceToInt<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.
         /// <param name="arg3"><see cref="Java.Util.Function.IntBinaryOperator"/></param>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int ReduceValuesToInt<Arg1objectSuperV>(long arg0, Java.Util.Function.ToIntFunction<Arg1objectSuperV> arg1, int arg2, Java.Util.Function.IntBinaryOperator arg3) where Arg1objectSuperV: V
+        public int ReduceValuesToInt<Arg1objectSuperV>(long arg0, Java.Util.Function.ToIntFunction<Arg1objectSuperV> arg1, int arg2, Java.Util.Function.IntBinaryOperator arg3) where Arg1objectSuperV : V
         {
             return IExecute<int>("reduceValuesToInt", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#keySet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#keySet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentHashMap.KeySetView"/></returns>
@@ -967,7 +969,7 @@ public Java.Util.Concurrent.ConcurrentHashMap.KeySetView<K, V> KeySet(V arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentHashMap.KeySetView<K, V>>("keySet", "(Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentHashMap$KeySetView;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#keys()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#keys()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<K> Keys()
@@ -975,7 +977,7 @@ public Java.Util.Enumeration<K> Keys()
             return IExecuteWithSignature<Java.Util.Enumeration<K>>("keys", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#elements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#elements()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<V> Elements()
@@ -983,30 +985,30 @@ public Java.Util.Enumeration<V> Elements()
             return IExecuteWithSignature<Java.Util.Enumeration<V>>("elements", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntries(long,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntries(long,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <typeparam name="Arg1ExtendsJava_Util_Map_Entry_K_V_"><see cref="Java.Util.Map.Entry{K, V}"/></typeparam>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
-        public Java.Util.Map.Entry<K, V> ReduceEntries<Arg1ExtendsJava_Util_Map_Entry_K_V_>(long arg0, Java.Util.Function.BiFunction<Java.Util.Map.Entry<K, V>, Java.Util.Map.Entry<K, V>, Arg1ExtendsJava_Util_Map_Entry_K_V_> arg1) where Arg1ExtendsJava_Util_Map_Entry_K_V_: Java.Util.Map.Entry<K, V>
+        public Java.Util.Map.Entry<K, V> ReduceEntries<Arg1ExtendsJava_Util_Map_Entry_K_V_>(long arg0, Java.Util.Function.BiFunction<Java.Util.Map.Entry<K, V>, Java.Util.Map.Entry<K, V>, Arg1ExtendsJava_Util_Map_Entry_K_V_> arg1) where Arg1ExtendsJava_Util_Map_Entry_K_V_ : Java.Util.Map.Entry<K, V>
         {
             return IExecute<Java.Util.Map.Entry<K, V>>("reduceEntries", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeys(long,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeys(long,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1ExtendsK"><typeparamref name="K"/></typeparam>
         /// <returns><typeparamref name="K"/></returns>
-        public K ReduceKeys<Arg1objectSuperK, Arg1ExtendsK>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperK, Arg1ExtendsK> arg1) where Arg1objectSuperK: K where Arg1ExtendsK: K
+        public K ReduceKeys<Arg1objectSuperK, Arg1ExtendsK>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperK, Arg1ExtendsK> arg1) where Arg1objectSuperK : K where Arg1ExtendsK : K
         {
             return IExecute<K>("reduceKeys", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#mappingCount()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#mappingCount()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long MappingCount()
@@ -1014,7 +1016,7 @@ public long MappingCount()
             return IExecuteWithSignature<long>("mappingCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceEntriesToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToLongFunction"/></param>
@@ -1026,7 +1028,7 @@ public long ReduceEntriesToLong(long arg0, Java.Util.Function.ToLongFunction<Jav
             return IExecute<long>("reduceEntriesToLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceKeysToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToLongFunction"/></param>
@@ -1034,12 +1036,12 @@ public long ReduceEntriesToLong(long arg0, Java.Util.Function.ToLongFunction<Jav
         /// <param name="arg3"><see cref="Java.Util.Function.LongBinaryOperator"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <returns><see cref="long"/></returns>
-        public long ReduceKeysToLong<Arg1objectSuperK>(long arg0, Java.Util.Function.ToLongFunction<Arg1objectSuperK> arg1, long arg2, Java.Util.Function.LongBinaryOperator arg3) where Arg1objectSuperK: K
+        public long ReduceKeysToLong<Arg1objectSuperK>(long arg0, Java.Util.Function.ToLongFunction<Arg1objectSuperK> arg1, long arg2, Java.Util.Function.LongBinaryOperator arg3) where Arg1objectSuperK : K
         {
             return IExecute<long>("reduceKeysToLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceToLong(long,java.util.function.ToLongBiFunction,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceToLong(long,java.util.function.ToLongBiFunction,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToLongBiFunction"/></param>
@@ -1048,12 +1050,12 @@ public long ReduceKeysToLong<Arg1objectSuperK>(long arg0, Java.Util.Function.ToL
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="long"/></returns>
-        public long ReduceToLong<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.Function.ToLongBiFunction<Arg1objectSuperK, Arg1objectSuperV> arg1, long arg2, Java.Util.Function.LongBinaryOperator arg3) where Arg1objectSuperK: K where Arg1objectSuperV: V
+        public long ReduceToLong<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.Function.ToLongBiFunction<Arg1objectSuperK, Arg1objectSuperV> arg1, long arg2, Java.Util.Function.LongBinaryOperator arg3) where Arg1objectSuperK : K where Arg1objectSuperV : V
         {
             return IExecute<long>("reduceToLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValuesToLong(long,java.util.function.ToLongFunction,long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ToLongFunction"/></param>
@@ -1061,60 +1063,60 @@ public long ReduceToLong<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Uti
         /// <param name="arg3"><see cref="Java.Util.Function.LongBinaryOperator"/></param>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="long"/></returns>
-        public long ReduceValuesToLong<Arg1objectSuperV>(long arg0, Java.Util.Function.ToLongFunction<Arg1objectSuperV> arg1, long arg2, Java.Util.Function.LongBinaryOperator arg3) where Arg1objectSuperV: V
+        public long ReduceValuesToLong<Arg1objectSuperV>(long arg0, Java.Util.Function.ToLongFunction<Arg1objectSuperV> arg1, long arg2, Java.Util.Function.LongBinaryOperator arg3) where Arg1objectSuperV : V
         {
             return IExecute<long>("reduceValuesToLong", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#reduceValues(long,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#reduceValues(long,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V ReduceValues<Arg1objectSuperV, Arg1ExtendsV>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperV, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperV: V where Arg1ExtendsV: V
+        public V ReduceValues<Arg1objectSuperV, Arg1ExtendsV>(long arg0, Java.Util.Function.BiFunction<Arg1objectSuperV, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperV : V where Arg1ExtendsV : V
         {
             return IExecute<V>("reduceValues", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEach(long,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEach(long,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
-        public void ForEach<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.Function.BiConsumer<Arg1objectSuperK, Arg1objectSuperV> arg1) where Arg1objectSuperK: K where Arg1objectSuperV: V
+        public void ForEach<Arg1objectSuperK, Arg1objectSuperV>(long arg0, Java.Util.Function.BiConsumer<Arg1objectSuperK, Arg1objectSuperV> arg1) where Arg1objectSuperK : K where Arg1objectSuperV : V
         {
             IExecute("forEach", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachEntry(long,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachEntry(long,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg1objectSuperJava_Util_Map_Entry_K_V_"><see cref="Java.Util.Map.Entry{K, V}"/></typeparam>
-        public void ForEachEntry<Arg1objectSuperJava_Util_Map_Entry_K_V_>(long arg0, Java.Util.Function.Consumer<Arg1objectSuperJava_Util_Map_Entry_K_V_> arg1) where Arg1objectSuperJava_Util_Map_Entry_K_V_: Java.Util.Map.Entry<K, V>
+        public void ForEachEntry<Arg1objectSuperJava_Util_Map_Entry_K_V_>(long arg0, Java.Util.Function.Consumer<Arg1objectSuperJava_Util_Map_Entry_K_V_> arg1) where Arg1objectSuperJava_Util_Map_Entry_K_V_ : Java.Util.Map.Entry<K, V>
         {
             IExecute("forEachEntry", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachKey(long,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachKey(long,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
-        public void ForEachKey<Arg1objectSuperK>(long arg0, Java.Util.Function.Consumer<Arg1objectSuperK> arg1) where Arg1objectSuperK: K
+        public void ForEachKey<Arg1objectSuperK>(long arg0, Java.Util.Function.Consumer<Arg1objectSuperK> arg1) where Arg1objectSuperK : K
         {
             IExecute("forEachKey", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentHashMap.html#forEachValue(long,java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentHashMap.html#forEachValue(long,java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
-        public void ForEachValue<Arg1objectSuperV>(long arg0, Java.Util.Function.Consumer<Arg1objectSuperV> arg1) where Arg1objectSuperV: V
+        public void ForEachValue<Arg1objectSuperV>(long arg0, Java.Util.Function.Consumer<Arg1objectSuperV> arg1) where Arg1objectSuperV : V
         {
             IExecute("forEachValue", arg0, arg1);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentLinkedDeque.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentLinkedDeque.cs
index fcf2ebee2..67063cca5 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentLinkedDeque.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentLinkedDeque.cs
@@ -30,7 +30,7 @@ public partial class ConcurrentLinkedDeque
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ConcurrentLinkedDeque(Java.Util.Collection arg0)
@@ -62,21 +62,7 @@ public ConcurrentLinkedDeque(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#getFirst()"/> 
-        /// </summary>
-        public object First
-        {
-            get { return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#getLast()"/> 
-        /// </summary>
-        public object Last
-        {
-            get { return IExecuteWithSignature("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -85,7 +71,7 @@ public bool Offer(object arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -94,7 +80,7 @@ public bool OfferFirst(object arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -103,7 +89,7 @@ public bool OfferLast(object arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -112,7 +98,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -121,7 +107,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#element()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Element()
@@ -129,7 +115,23 @@ public object Element()
             return IExecuteWithSignature("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#getFirst()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetFirst()
+        {
+            return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#getLast()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetLast()
+        {
+            return IExecuteWithSignature("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#peek()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Peek()
@@ -137,7 +139,7 @@ public object Peek()
             return IExecuteWithSignature("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#peekFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekFirst()
@@ -145,7 +147,7 @@ public object PeekFirst()
             return IExecuteWithSignature("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#peekLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekLast()
@@ -153,7 +155,7 @@ public object PeekLast()
             return IExecuteWithSignature("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#poll()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Poll()
@@ -161,7 +163,7 @@ public object Poll()
             return IExecuteWithSignature("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#pollFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollFirst()
@@ -169,7 +171,7 @@ public object PollFirst()
             return IExecuteWithSignature("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#pollLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollLast()
@@ -177,7 +179,7 @@ public object PollLast()
             return IExecuteWithSignature("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#pop()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Pop()
@@ -185,7 +187,7 @@ public object Pop()
             return IExecuteWithSignature("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#remove()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Remove()
@@ -193,7 +195,7 @@ public object Remove()
             return IExecuteWithSignature("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#removeFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveFirst()
@@ -201,7 +203,7 @@ public object RemoveFirst()
             return IExecuteWithSignature("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#removeLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveLast()
@@ -209,7 +211,7 @@ public object RemoveLast()
             return IExecuteWithSignature("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator DescendingIterator()
@@ -217,7 +219,7 @@ public Java.Util.Iterator DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddFirst(object arg0)
@@ -225,7 +227,7 @@ public void AddFirst(object arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddLast(object arg0)
@@ -233,7 +235,7 @@ public void AddLast(object arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Push(object arg0)
@@ -256,7 +258,7 @@ public partial class ConcurrentLinkedDeque<E> : Java.Util.IDeque<E>, Java.Io.ISe
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ConcurrentLinkedDeque(Java.Util.Collection<E> arg0)
@@ -292,21 +294,7 @@ public ConcurrentLinkedDeque(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#getFirst()"/> 
-        /// </summary>
-        public E First
-        {
-            get { return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#getLast()"/> 
-        /// </summary>
-        public E Last
-        {
-            get { return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -315,7 +303,7 @@ public bool Offer(E arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -324,7 +312,7 @@ public bool OfferFirst(E arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -333,7 +321,7 @@ public bool OfferLast(E arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -342,7 +330,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -351,7 +339,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#element()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Element()
@@ -359,7 +347,23 @@ public E Element()
             return IExecuteWithSignature<E>("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#getFirst()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetFirst()
+        {
+            return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#getLast()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetLast()
+        {
+            return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#peek()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Peek()
@@ -367,7 +371,7 @@ public E Peek()
             return IExecuteWithSignature<E>("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#peekFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekFirst()
@@ -375,7 +379,7 @@ public E PeekFirst()
             return IExecuteWithSignature<E>("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#peekLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekLast()
@@ -383,7 +387,7 @@ public E PeekLast()
             return IExecuteWithSignature<E>("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#poll()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Poll()
@@ -391,7 +395,7 @@ public E Poll()
             return IExecuteWithSignature<E>("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#pollFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollFirst()
@@ -399,7 +403,7 @@ public E PollFirst()
             return IExecuteWithSignature<E>("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#pollLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollLast()
@@ -407,7 +411,7 @@ public E PollLast()
             return IExecuteWithSignature<E>("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#pop()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Pop()
@@ -415,7 +419,7 @@ public E Pop()
             return IExecuteWithSignature<E>("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#remove()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Remove()
@@ -423,7 +427,7 @@ public E Remove()
             return IExecuteWithSignature<E>("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#removeFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveFirst()
@@ -431,7 +435,7 @@ public E RemoveFirst()
             return IExecuteWithSignature<E>("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#removeLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveLast()
@@ -439,7 +443,7 @@ public E RemoveLast()
             return IExecuteWithSignature<E>("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> DescendingIterator()
@@ -447,7 +451,7 @@ public Java.Util.Iterator<E> DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddFirst(E arg0)
@@ -455,7 +459,7 @@ public void AddFirst(E arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddLast(E arg0)
@@ -463,7 +467,7 @@ public void AddLast(E arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedDeque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedDeque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Push(E arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentLinkedQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentLinkedQueue.cs
index fa91f68de..5a22ba87e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentLinkedQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentLinkedQueue.cs
@@ -30,7 +30,7 @@ public partial class ConcurrentLinkedQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ConcurrentLinkedQueue(Java.Util.Collection arg0)
@@ -73,7 +73,7 @@ public partial class ConcurrentLinkedQueue<E> : Java.Util.IQueue<E>, Java.Io.ISe
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentLinkedQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentLinkedQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ConcurrentLinkedQueue(Java.Util.Collection<E> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentMap.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentMap.cs
index 58466a3d6..6d60b9f0a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentMap.cs
@@ -46,7 +46,7 @@ public partial class ConcurrentMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#remove(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#remove(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -56,7 +56,7 @@ public bool Remove(object arg0, object arg1)
             return IExecute<bool>("remove", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -67,7 +67,7 @@ public bool Replace(object arg0, object arg1, object arg2)
             return IExecute<bool>("replace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -77,7 +77,7 @@ public object PutIfAbsent(object arg0, object arg1)
             return IExecute("putIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#replace(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#replace(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -87,7 +87,7 @@ public object Replace(object arg0, object arg1)
             return IExecute("replace", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -97,7 +97,7 @@ public object Compute(object arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("compute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -107,7 +107,7 @@ public object ComputeIfAbsent(object arg0, Java.Util.Function.Function arg1)
             return IExecute("computeIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -117,7 +117,7 @@ public object ComputeIfPresent(object arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("computeIfPresent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -127,7 +127,7 @@ public object GetOrDefault(object arg0, object arg1)
             return IExecute("getOrDefault", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -138,7 +138,7 @@ public object Merge(object arg0, object arg1, Java.Util.Function.BiFunction arg2
             return IExecute("merge", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#forEach(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#forEach(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         public void ForEach(Java.Util.Function.BiConsumer arg0)
@@ -146,7 +146,7 @@ public void ForEach(Java.Util.Function.BiConsumer arg0)
             IExecuteWithSignature("forEach", "(Ljava/util/function/BiConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#replaceAll(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#replaceAll(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         public void ReplaceAll(Java.Util.Function.BiFunction arg0)
@@ -207,7 +207,7 @@ public partial class ConcurrentMap<K, V> : Java.Util.Concurrent.IConcurrentMap<K
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#remove(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#remove(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -217,7 +217,7 @@ public bool Remove(object arg0, object arg1)
             return IExecute<bool>("remove", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -228,7 +228,7 @@ public bool Replace(K arg0, V arg1, V arg2)
             return IExecute<bool>("replace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -238,7 +238,7 @@ public V PutIfAbsent(K arg0, V arg1)
             return IExecute<V>("putIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#replace(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#replace(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -248,7 +248,7 @@ public V Replace(K arg0, V arg1)
             return IExecute<V>("replace", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -256,24 +256,24 @@ public V Replace(K arg0, V arg1)
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V Compute<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsV: V
+        public V Compute<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsV : V
         {
             return IExecute<V>("compute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1ExtendsV: V
+        public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1ExtendsV : V
         {
             return IExecute<V>("computeIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -281,12 +281,12 @@ public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Funct
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V ComputeIfPresent<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsV: V
+        public V ComputeIfPresent<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsV : V
         {
             return IExecute<V>("computeIfPresent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -296,7 +296,7 @@ public V GetOrDefault(object arg0, V arg1)
             return IExecute<V>("getOrDefault", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -304,28 +304,28 @@ public V GetOrDefault(object arg0, V arg1)
         /// <typeparam name="Arg2objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg2ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V Merge<Arg2objectSuperV, Arg2ExtendsV>(K arg0, V arg1, Java.Util.Function.BiFunction<Arg2objectSuperV, Arg2objectSuperV, Arg2ExtendsV> arg2) where Arg2objectSuperV: V where Arg2ExtendsV: V
+        public V Merge<Arg2objectSuperV, Arg2ExtendsV>(K arg0, V arg1, Java.Util.Function.BiFunction<Arg2objectSuperV, Arg2objectSuperV, Arg2ExtendsV> arg2) where Arg2objectSuperV : V where Arg2ExtendsV : V
         {
             return IExecute<V>("merge", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#forEach(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#forEach(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
-        public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiConsumer<Arg0objectSuperK, Arg0objectSuperV> arg0) where Arg0objectSuperK: K where Arg0objectSuperV: V
+        public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiConsumer<Arg0objectSuperK, Arg0objectSuperV> arg0) where Arg0objectSuperK : K where Arg0objectSuperV : V
         {
             IExecuteWithSignature("forEach", "(Ljava/util/function/BiConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentMap.html#replaceAll(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentMap.html#replaceAll(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <typeparam name="Arg0objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void ReplaceAll<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV>(Java.Util.Function.BiFunction<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV> arg0) where Arg0objectSuperK: K where Arg0objectSuperV: V where Arg0ExtendsV: V
+        public void ReplaceAll<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV>(Java.Util.Function.BiFunction<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV> arg0) where Arg0objectSuperK : K where Arg0objectSuperV : V where Arg0ExtendsV : V
         {
             IExecuteWithSignature("replaceAll", "(Ljava/util/function/BiFunction;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentNavigableMap.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentNavigableMap.cs
index a905b0a15..44a6474bf 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentNavigableMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentNavigableMap.cs
@@ -54,7 +54,7 @@ public partial class ConcurrentNavigableMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#descendingKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#descendingKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet DescendingKeySet()
@@ -62,7 +62,7 @@ public Java.Util.NavigableSet DescendingKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("descendingKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#navigableKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#navigableKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet NavigableKeySet()
@@ -70,7 +70,7 @@ public Java.Util.NavigableSet NavigableKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("navigableKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#descendingMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#descendingMap()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableMap"/></returns>
         public Java.Util.NavigableMap DescendingMap()
@@ -78,7 +78,7 @@ public Java.Util.NavigableMap DescendingMap()
             return IExecuteWithSignature<Java.Util.NavigableMap>("descendingMap", "()Ljava/util/NavigableMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#headMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#headMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -88,7 +88,7 @@ public Java.Util.NavigableMap HeadMap(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap>("headMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -100,7 +100,7 @@ public Java.Util.NavigableMap SubMap(object arg0, bool arg1, object arg2, bool a
             return IExecute<Java.Util.NavigableMap>("subMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#tailMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#tailMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -110,7 +110,7 @@ public Java.Util.NavigableMap TailMap(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap>("tailMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set KeySet()
@@ -118,7 +118,7 @@ public Java.Util.Set KeySet()
             return IExecuteWithSignature<Java.Util.Set>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -127,7 +127,7 @@ public Java.Util.SortedMap HeadMap(object arg0)
             return IExecuteWithSignature<Java.Util.SortedMap>("headMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -137,7 +137,7 @@ public Java.Util.SortedMap SubMap(object arg0, object arg1)
             return IExecute<Java.Util.SortedMap>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -207,7 +207,7 @@ public partial class ConcurrentNavigableMap<K, V> : Java.Util.Concurrent.IConcur
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#descendingKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#descendingKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<K> DescendingKeySet()
@@ -215,7 +215,7 @@ public Java.Util.NavigableSet<K> DescendingKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet<K>>("descendingKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#navigableKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#navigableKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<K> NavigableKeySet()
@@ -223,7 +223,7 @@ public Java.Util.NavigableSet<K> NavigableKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet<K>>("navigableKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#descendingMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#descendingMap()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableMap"/></returns>
         public Java.Util.NavigableMap DescendingMap()
@@ -231,7 +231,7 @@ public Java.Util.NavigableMap DescendingMap()
             return IExecuteWithSignature<Java.Util.NavigableMap>("descendingMap", "()Ljava/util/NavigableMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#headMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#headMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -241,7 +241,7 @@ public Java.Util.NavigableMap HeadMap(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap>("headMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -253,7 +253,7 @@ public Java.Util.NavigableMap SubMap(object arg0, bool arg1, object arg2, bool a
             return IExecute<Java.Util.NavigableMap>("subMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#tailMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#tailMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -263,7 +263,7 @@ public Java.Util.NavigableMap TailMap(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap>("tailMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set KeySet()
@@ -271,7 +271,7 @@ public Java.Util.Set KeySet()
             return IExecuteWithSignature<Java.Util.Set>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -280,7 +280,7 @@ public Java.Util.SortedMap HeadMap(object arg0)
             return IExecuteWithSignature<Java.Util.SortedMap>("headMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -290,7 +290,7 @@ public Java.Util.SortedMap SubMap(object arg0, object arg1)
             return IExecute<Java.Util.SortedMap>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentNavigableMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentNavigableMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentSkipListMap.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentSkipListMap.cs
index 4528c5a6d..6c8064eb4 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentSkipListMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentSkipListMap.cs
@@ -30,7 +30,7 @@ public partial class ConcurrentSkipListMap
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public ConcurrentSkipListMap(Java.Util.Map arg0)
@@ -38,7 +38,7 @@ public ConcurrentSkipListMap(Java.Util.Map arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#%3Cinit%3E(java.util.SortedMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#%3Cinit%3E(java.util.SortedMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedMap"/></param>
         public ConcurrentSkipListMap(Java.Util.SortedMap arg0)
@@ -74,7 +74,7 @@ public ConcurrentSkipListMap(Java.Util.SortedMap arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#descendingMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#descendingMap()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentNavigableMap"/></returns>
         public Java.Util.Concurrent.ConcurrentNavigableMap DescendingMap()
@@ -82,7 +82,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap DescendingMap()
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentNavigableMap>("descendingMap", "()Ljava/util/concurrent/ConcurrentNavigableMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#headMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#headMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -92,7 +92,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap HeadMap(object arg0, bool arg
             return IExecute<Java.Util.Concurrent.ConcurrentNavigableMap>("headMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentNavigableMap"/></returns>
@@ -101,7 +101,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap HeadMap(object arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentNavigableMap>("headMap", "(Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentNavigableMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -113,7 +113,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap SubMap(object arg0, bool arg1
             return IExecute<Java.Util.Concurrent.ConcurrentNavigableMap>("subMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -123,7 +123,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap SubMap(object arg0, object ar
             return IExecute<Java.Util.Concurrent.ConcurrentNavigableMap>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#tailMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#tailMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -133,7 +133,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap TailMap(object arg0, bool arg
             return IExecute<Java.Util.Concurrent.ConcurrentNavigableMap>("tailMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentNavigableMap"/></returns>
@@ -142,7 +142,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap TailMap(object arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentNavigableMap>("tailMap", "(Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentNavigableMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentSkipListMap"/></returns>
         public Java.Util.Concurrent.ConcurrentSkipListMap Clone()
@@ -150,7 +150,7 @@ public Java.Util.Concurrent.ConcurrentSkipListMap Clone()
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentSkipListMap>("clone", "()Ljava/util/concurrent/ConcurrentSkipListMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#ceilingEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#ceilingEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -159,7 +159,7 @@ public Java.Util.Map.Entry CeilingEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("ceilingEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#firstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#firstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry FirstEntry()
@@ -167,7 +167,7 @@ public Java.Util.Map.Entry FirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("firstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#floorEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#floorEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -176,7 +176,7 @@ public Java.Util.Map.Entry FloorEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("floorEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#higherEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#higherEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -185,7 +185,7 @@ public Java.Util.Map.Entry HigherEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("higherEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#lastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#lastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry LastEntry()
@@ -193,7 +193,7 @@ public Java.Util.Map.Entry LastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("lastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#lowerEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#lowerEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -202,7 +202,7 @@ public Java.Util.Map.Entry LowerEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("lowerEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#pollFirstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#pollFirstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry PollFirstEntry()
@@ -210,7 +210,7 @@ public Java.Util.Map.Entry PollFirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("pollFirstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#pollLastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#pollLastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry PollLastEntry()
@@ -218,7 +218,7 @@ public Java.Util.Map.Entry PollLastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("pollLastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#descendingKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#descendingKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet DescendingKeySet()
@@ -226,7 +226,7 @@ public Java.Util.NavigableSet DescendingKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("descendingKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#navigableKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#navigableKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet NavigableKeySet()
@@ -234,7 +234,7 @@ public Java.Util.NavigableSet NavigableKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("navigableKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#ceilingKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#ceilingKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -243,7 +243,7 @@ public object CeilingKey(object arg0)
             return IExecuteWithSignature("ceilingKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#firstKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#firstKey()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object FirstKey()
@@ -251,7 +251,7 @@ public object FirstKey()
             return IExecuteWithSignature("firstKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#floorKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#floorKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -260,7 +260,7 @@ public object FloorKey(object arg0)
             return IExecuteWithSignature("floorKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#higherKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#higherKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -269,7 +269,7 @@ public object HigherKey(object arg0)
             return IExecuteWithSignature("higherKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#lastKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#lastKey()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object LastKey()
@@ -277,7 +277,7 @@ public object LastKey()
             return IExecuteWithSignature("lastKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#lowerKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#lowerKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -301,7 +301,7 @@ public partial class ConcurrentSkipListMap<K, V> : Java.Util.Concurrent.IConcurr
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public ConcurrentSkipListMap(Java.Util.Map<K, V> arg0)
@@ -309,7 +309,7 @@ public ConcurrentSkipListMap(Java.Util.Map<K, V> arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#%3Cinit%3E(java.util.SortedMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#%3Cinit%3E(java.util.SortedMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedMap"/></param>
         public ConcurrentSkipListMap(Java.Util.SortedMap<K, V> arg0)
@@ -349,7 +349,7 @@ public ConcurrentSkipListMap(Java.Util.SortedMap<K, V> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#descendingMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#descendingMap()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentNavigableMap"/></returns>
         public Java.Util.Concurrent.ConcurrentNavigableMap<K, V> DescendingMap()
@@ -357,7 +357,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap<K, V> DescendingMap()
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentNavigableMap<K, V>>("descendingMap", "()Ljava/util/concurrent/ConcurrentNavigableMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#headMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#headMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -367,7 +367,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap<K, V> HeadMap(K arg0, bool ar
             return IExecute<Java.Util.Concurrent.ConcurrentNavigableMap<K, V>>("headMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentNavigableMap"/></returns>
@@ -376,7 +376,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap<K, V> HeadMap(K arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentNavigableMap<K, V>>("headMap", "(Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentNavigableMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -388,7 +388,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap<K, V> SubMap(K arg0, bool arg
             return IExecute<Java.Util.Concurrent.ConcurrentNavigableMap<K, V>>("subMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="K"/></param>
@@ -398,7 +398,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap<K, V> SubMap(K arg0, K arg1)
             return IExecute<Java.Util.Concurrent.ConcurrentNavigableMap<K, V>>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#tailMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#tailMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -408,7 +408,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap<K, V> TailMap(K arg0, bool ar
             return IExecute<Java.Util.Concurrent.ConcurrentNavigableMap<K, V>>("tailMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentNavigableMap"/></returns>
@@ -417,7 +417,7 @@ public Java.Util.Concurrent.ConcurrentNavigableMap<K, V> TailMap(K arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentNavigableMap<K, V>>("tailMap", "(Ljava/lang/Object;)Ljava/util/concurrent/ConcurrentNavigableMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentSkipListMap"/></returns>
         public Java.Util.Concurrent.ConcurrentSkipListMap<K, V> Clone()
@@ -425,7 +425,7 @@ public Java.Util.Concurrent.ConcurrentSkipListMap<K, V> Clone()
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentSkipListMap<K, V>>("clone", "()Ljava/util/concurrent/ConcurrentSkipListMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#ceilingEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#ceilingEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -434,7 +434,7 @@ public Java.Util.Map.Entry<K, V> CeilingEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("ceilingEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#firstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#firstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> FirstEntry()
@@ -442,7 +442,7 @@ public Java.Util.Map.Entry<K, V> FirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("firstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#floorEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#floorEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -451,7 +451,7 @@ public Java.Util.Map.Entry<K, V> FloorEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("floorEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#higherEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#higherEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -460,7 +460,7 @@ public Java.Util.Map.Entry<K, V> HigherEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("higherEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#lastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#lastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> LastEntry()
@@ -468,7 +468,7 @@ public Java.Util.Map.Entry<K, V> LastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("lastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#lowerEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#lowerEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -477,7 +477,7 @@ public Java.Util.Map.Entry<K, V> LowerEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("lowerEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#pollFirstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#pollFirstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> PollFirstEntry()
@@ -485,7 +485,7 @@ public Java.Util.Map.Entry<K, V> PollFirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("pollFirstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#pollLastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#pollLastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> PollLastEntry()
@@ -493,7 +493,7 @@ public Java.Util.Map.Entry<K, V> PollLastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("pollLastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#descendingKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#descendingKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<K> DescendingKeySet()
@@ -501,7 +501,7 @@ public Java.Util.NavigableSet<K> DescendingKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet<K>>("descendingKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#navigableKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#navigableKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<K> NavigableKeySet()
@@ -509,7 +509,7 @@ public Java.Util.NavigableSet<K> NavigableKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet<K>>("navigableKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#ceilingKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#ceilingKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -518,7 +518,7 @@ public K CeilingKey(K arg0)
             return IExecuteWithSignature<K>("ceilingKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#firstKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#firstKey()"/>
         /// </summary>
         /// <returns><typeparamref name="K"/></returns>
         public K FirstKey()
@@ -526,7 +526,7 @@ public K FirstKey()
             return IExecuteWithSignature<K>("firstKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#floorKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#floorKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -535,7 +535,7 @@ public K FloorKey(K arg0)
             return IExecuteWithSignature<K>("floorKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#higherKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#higherKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -544,7 +544,7 @@ public K HigherKey(K arg0)
             return IExecuteWithSignature<K>("higherKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#lastKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#lastKey()"/>
         /// </summary>
         /// <returns><typeparamref name="K"/></returns>
         public K LastKey()
@@ -552,7 +552,7 @@ public K LastKey()
             return IExecuteWithSignature<K>("lastKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListMap.html#lowerKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListMap.html#lowerKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentSkipListSet.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentSkipListSet.cs
index d26499c1c..64efe3325 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentSkipListSet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ConcurrentSkipListSet.cs
@@ -30,7 +30,7 @@ public partial class ConcurrentSkipListSet
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ConcurrentSkipListSet(Java.Util.Collection arg0)
@@ -38,7 +38,7 @@ public ConcurrentSkipListSet(Java.Util.Collection arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#%3Cinit%3E(java.util.SortedSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#%3Cinit%3E(java.util.SortedSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         public ConcurrentSkipListSet(Java.Util.SortedSet arg0)
@@ -74,7 +74,7 @@ public ConcurrentSkipListSet(Java.Util.SortedSet arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#ceiling(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#ceiling(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -83,7 +83,7 @@ public object Ceiling(object arg0)
             return IExecuteWithSignature("ceiling", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#first()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object First()
@@ -91,7 +91,7 @@ public object First()
             return IExecuteWithSignature("first", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#floor(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#floor(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -100,7 +100,7 @@ public object Floor(object arg0)
             return IExecuteWithSignature("floor", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#higher(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#higher(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -109,7 +109,7 @@ public object Higher(object arg0)
             return IExecuteWithSignature("higher", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#last()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Last()
@@ -117,7 +117,7 @@ public object Last()
             return IExecuteWithSignature("last", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#lower(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#lower(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -126,7 +126,7 @@ public object Lower(object arg0)
             return IExecuteWithSignature("lower", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#pollFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollFirst()
@@ -134,7 +134,7 @@ public object PollFirst()
             return IExecuteWithSignature("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#pollLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollLast()
@@ -142,7 +142,7 @@ public object PollLast()
             return IExecuteWithSignature("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentSkipListSet"/></returns>
         public Java.Util.Concurrent.ConcurrentSkipListSet Clone()
@@ -150,7 +150,7 @@ public Java.Util.Concurrent.ConcurrentSkipListSet Clone()
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentSkipListSet>("clone", "()Ljava/util/concurrent/ConcurrentSkipListSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator DescendingIterator()
@@ -158,7 +158,7 @@ public Java.Util.Iterator DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#descendingSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#descendingSet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet DescendingSet()
@@ -166,7 +166,7 @@ public Java.Util.NavigableSet DescendingSet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("descendingSet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#headSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#headSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -176,7 +176,7 @@ public Java.Util.NavigableSet HeadSet(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet>("headSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -188,7 +188,7 @@ public Java.Util.NavigableSet SubSet(object arg0, bool arg1, object arg2, bool a
             return IExecute<Java.Util.NavigableSet>("subSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#tailSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#tailSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -198,7 +198,7 @@ public Java.Util.NavigableSet TailSet(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet>("tailSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#headSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#headSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -207,7 +207,7 @@ public Java.Util.SortedSet HeadSet(object arg0)
             return IExecuteWithSignature<Java.Util.SortedSet>("headSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#subSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#subSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -217,7 +217,7 @@ public Java.Util.SortedSet SubSet(object arg0, object arg1)
             return IExecute<Java.Util.SortedSet>("subSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#tailSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#tailSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -241,7 +241,7 @@ public partial class ConcurrentSkipListSet<E> : Java.Util.INavigableSet<E>, Java
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public ConcurrentSkipListSet(Java.Util.Collection<E> arg0)
@@ -249,7 +249,7 @@ public ConcurrentSkipListSet(Java.Util.Collection<E> arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#%3Cinit%3E(java.util.SortedSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#%3Cinit%3E(java.util.SortedSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         public ConcurrentSkipListSet(Java.Util.SortedSet<E> arg0)
@@ -289,7 +289,7 @@ public ConcurrentSkipListSet(Java.Util.SortedSet<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#ceiling(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#ceiling(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -298,7 +298,7 @@ public E Ceiling(E arg0)
             return IExecuteWithSignature<E>("ceiling", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#first()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E First()
@@ -306,7 +306,7 @@ public E First()
             return IExecuteWithSignature<E>("first", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#floor(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#floor(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -315,7 +315,7 @@ public E Floor(E arg0)
             return IExecuteWithSignature<E>("floor", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#higher(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#higher(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -324,7 +324,7 @@ public E Higher(E arg0)
             return IExecuteWithSignature<E>("higher", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#last()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Last()
@@ -332,7 +332,7 @@ public E Last()
             return IExecuteWithSignature<E>("last", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#lower(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#lower(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -341,7 +341,7 @@ public E Lower(E arg0)
             return IExecuteWithSignature<E>("lower", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#pollFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollFirst()
@@ -349,7 +349,7 @@ public E PollFirst()
             return IExecuteWithSignature<E>("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#pollLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollLast()
@@ -357,7 +357,7 @@ public E PollLast()
             return IExecuteWithSignature<E>("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ConcurrentSkipListSet"/></returns>
         public Java.Util.Concurrent.ConcurrentSkipListSet<E> Clone()
@@ -365,7 +365,7 @@ public Java.Util.Concurrent.ConcurrentSkipListSet<E> Clone()
             return IExecuteWithSignature<Java.Util.Concurrent.ConcurrentSkipListSet<E>>("clone", "()Ljava/util/concurrent/ConcurrentSkipListSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> DescendingIterator()
@@ -373,7 +373,7 @@ public Java.Util.Iterator<E> DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#descendingSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#descendingSet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<E> DescendingSet()
@@ -381,7 +381,7 @@ public Java.Util.NavigableSet<E> DescendingSet()
             return IExecuteWithSignature<Java.Util.NavigableSet<E>>("descendingSet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#headSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#headSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -391,7 +391,7 @@ public Java.Util.NavigableSet<E> HeadSet(E arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet<E>>("headSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -403,7 +403,7 @@ public Java.Util.NavigableSet<E> SubSet(E arg0, bool arg1, E arg2, bool arg3)
             return IExecute<Java.Util.NavigableSet<E>>("subSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#tailSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#tailSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -413,7 +413,7 @@ public Java.Util.NavigableSet<E> TailSet(E arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet<E>>("tailSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#headSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#headSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -422,7 +422,7 @@ public Java.Util.SortedSet HeadSet(object arg0)
             return IExecuteWithSignature<Java.Util.SortedSet>("headSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#subSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#subSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -432,7 +432,7 @@ public Java.Util.SortedSet SubSet(object arg0, object arg1)
             return IExecute<Java.Util.SortedSet>("subSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ConcurrentSkipListSet.html#tailSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ConcurrentSkipListSet.html#tailSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/CopyOnWriteArrayList.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/CopyOnWriteArrayList.cs
index 2280e1b59..e4b9dd197 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/CopyOnWriteArrayList.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/CopyOnWriteArrayList.cs
@@ -30,7 +30,7 @@ public partial class CopyOnWriteArrayList
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public CopyOnWriteArrayList(Java.Util.Collection arg0)
@@ -70,7 +70,7 @@ public CopyOnWriteArrayList(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -79,7 +79,7 @@ public object[] ToArray(object[] arg0)
             return IExecuteWithSignatureArray<object>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -88,7 +88,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#addAll(int,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#addAll(int,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -98,7 +98,7 @@ public bool AddAll(int arg0, Java.Util.Collection arg1)
             return IExecute<bool>("addAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -107,7 +107,7 @@ public bool AddAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#addIfAbsent(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#addIfAbsent(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -116,7 +116,7 @@ public bool AddIfAbsent(object arg0)
             return IExecuteWithSignature<bool>("addIfAbsent", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -125,7 +125,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -134,7 +134,7 @@ public bool ContainsAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -142,7 +142,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -151,7 +151,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -160,7 +160,7 @@ public bool RemoveAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#removeIf(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#removeIf(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -169,7 +169,7 @@ public bool RemoveIf(Java.Util.Function.Predicate arg0)
             return IExecuteWithSignature<bool>("removeIf", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -178,7 +178,7 @@ public bool RetainAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -187,7 +187,7 @@ public object Get(int arg0)
             return IExecuteWithSignature("get", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#remove(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#remove(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -196,7 +196,7 @@ public object Remove(int arg0)
             return IExecuteWithSignature("remove", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#set(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#set(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -206,7 +206,7 @@ public object Set(int arg0, object arg1)
             return IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#addAllAbsent(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#addAllAbsent(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -215,7 +215,7 @@ public int AddAllAbsent(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("addAllAbsent", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#indexOf(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#indexOf(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -225,7 +225,7 @@ public int IndexOf(object arg0, int arg1)
             return IExecute<int>("indexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#indexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#indexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -234,7 +234,7 @@ public int IndexOf(object arg0)
             return IExecuteWithSignature<int>("indexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#lastIndexOf(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#lastIndexOf(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -244,7 +244,7 @@ public int LastIndexOf(object arg0, int arg1)
             return IExecute<int>("lastIndexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#lastIndexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#lastIndexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -253,7 +253,7 @@ public int LastIndexOf(object arg0)
             return IExecuteWithSignature<int>("lastIndexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -261,7 +261,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -269,7 +269,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -277,7 +277,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#subList(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#subList(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -287,7 +287,7 @@ public Java.Util.List SubList(int arg0, int arg1)
             return IExecute<Java.Util.List>("subList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#listIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#listIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
         public Java.Util.ListIterator ListIterator()
@@ -295,7 +295,7 @@ public Java.Util.ListIterator ListIterator()
             return IExecuteWithSignature<Java.Util.ListIterator>("listIterator", "()Ljava/util/ListIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#listIterator(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#listIterator(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
@@ -304,7 +304,7 @@ public Java.Util.ListIterator ListIterator(int arg0)
             return IExecuteWithSignature<Java.Util.ListIterator>("listIterator", "(I)Ljava/util/ListIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -312,7 +312,7 @@ public Java.Util.Spliterator Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#add(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#add(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -321,14 +321,14 @@ public void Add(int arg0, object arg1)
             IExecute("add", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#forEach(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#forEach(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         public void ForEach(Java.Util.Function.Consumer arg0)
@@ -336,7 +336,7 @@ public void ForEach(Java.Util.Function.Consumer arg0)
             IExecuteWithSignature("forEach", "(Ljava/util/function/Consumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#replaceAll(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#replaceAll(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         public void ReplaceAll(Java.Util.Function.UnaryOperator arg0)
@@ -359,7 +359,7 @@ public partial class CopyOnWriteArrayList<E> : Java.Util.IList<E>, Java.Util.IRa
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#%3Cinit%3E(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#%3Cinit%3E(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public CopyOnWriteArrayList(E[] arg0)
@@ -367,7 +367,7 @@ public CopyOnWriteArrayList(E[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public CopyOnWriteArrayList(Java.Util.Collection<E> arg0)
@@ -411,7 +411,7 @@ public CopyOnWriteArrayList(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -421,7 +421,7 @@ public T[] ToArray<T>(T[] arg0)
             return IExecuteWithSignatureArray<T>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -430,28 +430,28 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#addAll(int,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#addAll(int,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg1ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg1ExtendsE>(int arg0, Java.Util.Collection<Arg1ExtendsE> arg1) where Arg1ExtendsE: E
+        public bool AddAll<Arg1ExtendsE>(int arg0, Java.Util.Collection<Arg1ExtendsE> arg1) where Arg1ExtendsE : E
         {
             return IExecute<bool>("addAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#addIfAbsent(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#addIfAbsent(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -460,7 +460,7 @@ public bool AddIfAbsent(E arg0)
             return IExecuteWithSignature<bool>("addIfAbsent", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -469,7 +469,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -478,7 +478,7 @@ public bool ContainsAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -486,7 +486,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -495,7 +495,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -504,17 +504,17 @@ public bool RemoveAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#removeIf(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#removeIf(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool RemoveIf<Arg0objectSuperE>(Java.Util.Function.Predicate<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public bool RemoveIf<Arg0objectSuperE>(Java.Util.Function.Predicate<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<bool>("removeIf", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -523,7 +523,7 @@ public bool RetainAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -532,7 +532,7 @@ public E Get(int arg0)
             return IExecuteWithSignature<E>("get", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#remove(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#remove(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -541,7 +541,7 @@ public E Remove(int arg0)
             return IExecuteWithSignature<E>("remove", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#set(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#set(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -551,17 +551,17 @@ public E Set(int arg0, E arg1)
             return IExecute<E>("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#addAllAbsent(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#addAllAbsent(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int AddAllAbsent<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public int AddAllAbsent<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<int>("addAllAbsent", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#indexOf(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#indexOf(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -571,7 +571,7 @@ public int IndexOf(E arg0, int arg1)
             return IExecute<int>("indexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#indexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#indexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -580,7 +580,7 @@ public int IndexOf(object arg0)
             return IExecuteWithSignature<int>("indexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#lastIndexOf(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#lastIndexOf(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -590,7 +590,7 @@ public int LastIndexOf(E arg0, int arg1)
             return IExecute<int>("lastIndexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#lastIndexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#lastIndexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -599,7 +599,7 @@ public int LastIndexOf(object arg0)
             return IExecuteWithSignature<int>("lastIndexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -607,7 +607,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -615,7 +615,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> Iterator()
@@ -623,7 +623,7 @@ public Java.Util.Iterator<E> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#subList(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#subList(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -633,7 +633,7 @@ public Java.Util.List<E> SubList(int arg0, int arg1)
             return IExecute<Java.Util.List<E>>("subList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#listIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#listIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
         public Java.Util.ListIterator<E> ListIterator()
@@ -641,7 +641,7 @@ public Java.Util.ListIterator<E> ListIterator()
             return IExecuteWithSignature<Java.Util.ListIterator<E>>("listIterator", "()Ljava/util/ListIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#listIterator(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#listIterator(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
@@ -650,7 +650,7 @@ public Java.Util.ListIterator<E> ListIterator(int arg0)
             return IExecuteWithSignature<Java.Util.ListIterator<E>>("listIterator", "(I)Ljava/util/ListIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator<E> Spliterator()
@@ -658,7 +658,7 @@ public Java.Util.Spliterator<E> Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator<E>>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#add(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#add(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -667,23 +667,23 @@ public void Add(int arg0, E arg1)
             IExecute("add", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#forEach(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#forEach(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
-        public void ForEach<Arg0objectSuperE>(Java.Util.Function.Consumer<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public void ForEach<Arg0objectSuperE>(Java.Util.Function.Consumer<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             IExecuteWithSignature("forEach", "(Ljava/util/function/Consumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArrayList.html#replaceAll(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArrayList.html#replaceAll(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         public void ReplaceAll(Java.Util.Function.UnaryOperator<E> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/CopyOnWriteArraySet.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/CopyOnWriteArraySet.cs
index e2ad7064a..e07d306da 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/CopyOnWriteArraySet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/CopyOnWriteArraySet.cs
@@ -30,7 +30,7 @@ public partial class CopyOnWriteArraySet
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArraySet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArraySet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public CopyOnWriteArraySet(Java.Util.Collection arg0)
@@ -73,7 +73,7 @@ public partial class CopyOnWriteArraySet<E>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CopyOnWriteArraySet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CopyOnWriteArraySet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public CopyOnWriteArraySet(Java.Util.Collection<E> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/CountDownLatch.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/CountDownLatch.cs
index 00a96bb24..697e1f7a0 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/CountDownLatch.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/CountDownLatch.cs
@@ -30,7 +30,7 @@ public partial class CountDownLatch
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountDownLatch.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountDownLatch.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public CountDownLatch(int arg0)
@@ -54,14 +54,7 @@ public CountDownLatch(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountDownLatch.html#getCount()"/> 
-        /// </summary>
-        public long Count
-        {
-            get { return IExecuteWithSignature<long>("getCount", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountDownLatch.html#await(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountDownLatch.html#await(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -72,7 +65,15 @@ public bool Await(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<bool>("await", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountDownLatch.html#await()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountDownLatch.html#getCount()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetCount()
+        {
+            return IExecuteWithSignature<long>("getCount", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountDownLatch.html#await()"/>
         /// </summary>
         /// <exception cref="Java.Lang.InterruptedException"/>
         public void Await()
@@ -80,7 +81,7 @@ public void Await()
             IExecuteWithSignature("await", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountDownLatch.html#countDown()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountDownLatch.html#countDown()"/>
         /// </summary>
         public void CountDown()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/CountedCompleter.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/CountedCompleter.cs
index 28580dc3a..4cb9d3d26 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/CountedCompleter.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/CountedCompleter.cs
@@ -46,35 +46,14 @@ public partial class CountedCompleter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#getCompleter()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.CountedCompleter Completer
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter>("getCompleter", "()Ljava/util/concurrent/CountedCompleter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#getPendingCount()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#setPendingCount(int)"/>
-        /// </summary>
-        public int PendingCount
-        {
-            get { return IExecuteWithSignature<int>("getPendingCount", "()I"); } set { IExecuteWithSignature("setPendingCount", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#getRoot()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.CountedCompleter Root
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter>("getRoot", "()Ljava/util/concurrent/CountedCompleter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#compute()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#compute()"/>
         /// </summary>
         public void Compute()
         {
             IExecuteWithSignature("compute", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#onExceptionalCompletion(java.lang.Throwable,java.util.concurrent.CountedCompleter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#onExceptionalCompletion(java.lang.Throwable,java.util.concurrent.CountedCompleter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.CountedCompleter"/></param>
@@ -84,7 +63,7 @@ public bool OnExceptionalCompletion(MASES.JCOBridge.C2JBridge.JVMBridgeException
             return IExecute<bool>("onExceptionalCompletion", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#compareAndSetPendingCount(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#compareAndSetPendingCount(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -94,7 +73,7 @@ public bool CompareAndSetPendingCount(int arg0, int arg1)
             return IExecute<bool>("compareAndSetPendingCount", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#decrementPendingCountUnlessZero()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#decrementPendingCountUnlessZero()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int DecrementPendingCountUnlessZero()
@@ -102,7 +81,15 @@ public int DecrementPendingCountUnlessZero()
             return IExecuteWithSignature<int>("decrementPendingCountUnlessZero", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#firstComplete()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#getPendingCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPendingCount()
+        {
+            return IExecuteWithSignature<int>("getPendingCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#firstComplete()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CountedCompleter"/></returns>
         public Java.Util.Concurrent.CountedCompleter FirstComplete()
@@ -110,7 +97,23 @@ public Java.Util.Concurrent.CountedCompleter FirstComplete()
             return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter>("firstComplete", "()Ljava/util/concurrent/CountedCompleter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#nextComplete()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#getCompleter()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.CountedCompleter"/></returns>
+        public Java.Util.Concurrent.CountedCompleter GetCompleter()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter>("getCompleter", "()Ljava/util/concurrent/CountedCompleter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#getRoot()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.CountedCompleter"/></returns>
+        public Java.Util.Concurrent.CountedCompleter GetRoot()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter>("getRoot", "()Ljava/util/concurrent/CountedCompleter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#nextComplete()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CountedCompleter"/></returns>
         public Java.Util.Concurrent.CountedCompleter NextComplete()
@@ -118,7 +121,7 @@ public Java.Util.Concurrent.CountedCompleter NextComplete()
             return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter>("nextComplete", "()Ljava/util/concurrent/CountedCompleter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#addToPendingCount(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#addToPendingCount(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void AddToPendingCount(int arg0)
@@ -126,7 +129,7 @@ public void AddToPendingCount(int arg0)
             IExecuteWithSignature("addToPendingCount", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#helpComplete(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#helpComplete(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void HelpComplete(int arg0)
@@ -134,28 +137,36 @@ public void HelpComplete(int arg0)
             IExecuteWithSignature("helpComplete", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#propagateCompletion()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#propagateCompletion()"/>
         /// </summary>
         public void PropagateCompletion()
         {
             IExecuteWithSignature("propagateCompletion", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#quietlyCompleteRoot()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#quietlyCompleteRoot()"/>
         /// </summary>
         public void QuietlyCompleteRoot()
         {
             IExecuteWithSignature("quietlyCompleteRoot", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#tryComplete()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#setPendingCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPendingCount(int arg0)
+        {
+            IExecuteWithSignature("setPendingCount", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#tryComplete()"/>
         /// </summary>
         public void TryComplete()
         {
             IExecuteWithSignature("tryComplete", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#onCompletion(java.util.concurrent.CountedCompleter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#onCompletion(java.util.concurrent.CountedCompleter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CountedCompleter"/></param>
         public void OnCompletion(Java.Util.Concurrent.CountedCompleter arg0)
@@ -198,35 +209,14 @@ public partial class CountedCompleter<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#getCompleter()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.CountedCompleter<object> Completer
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter<object>>("getCompleter", "()Ljava/util/concurrent/CountedCompleter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#getPendingCount()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#setPendingCount(int)"/>
-        /// </summary>
-        public int PendingCount
-        {
-            get { return IExecuteWithSignature<int>("getPendingCount", "()I"); } set { IExecuteWithSignature("setPendingCount", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#getRoot()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.CountedCompleter<object> Root
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter<object>>("getRoot", "()Ljava/util/concurrent/CountedCompleter;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#compute()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#compute()"/>
         /// </summary>
         public void Compute()
         {
             IExecuteWithSignature("compute", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#onExceptionalCompletion(java.lang.Throwable,java.util.concurrent.CountedCompleter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#onExceptionalCompletion(java.lang.Throwable,java.util.concurrent.CountedCompleter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.CountedCompleter"/></param>
@@ -236,7 +226,7 @@ public bool OnExceptionalCompletion(MASES.JCOBridge.C2JBridge.JVMBridgeException
             return IExecute<bool>("onExceptionalCompletion", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#compareAndSetPendingCount(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#compareAndSetPendingCount(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -246,7 +236,7 @@ public bool CompareAndSetPendingCount(int arg0, int arg1)
             return IExecute<bool>("compareAndSetPendingCount", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#decrementPendingCountUnlessZero()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#decrementPendingCountUnlessZero()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int DecrementPendingCountUnlessZero()
@@ -254,7 +244,15 @@ public int DecrementPendingCountUnlessZero()
             return IExecuteWithSignature<int>("decrementPendingCountUnlessZero", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#firstComplete()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#getPendingCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetPendingCount()
+        {
+            return IExecuteWithSignature<int>("getPendingCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#firstComplete()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CountedCompleter"/></returns>
         public Java.Util.Concurrent.CountedCompleter<object> FirstComplete()
@@ -262,7 +260,23 @@ public Java.Util.Concurrent.CountedCompleter<object> FirstComplete()
             return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter<object>>("firstComplete", "()Ljava/util/concurrent/CountedCompleter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#nextComplete()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#getCompleter()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.CountedCompleter"/></returns>
+        public Java.Util.Concurrent.CountedCompleter<object> GetCompleter()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter<object>>("getCompleter", "()Ljava/util/concurrent/CountedCompleter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#getRoot()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.CountedCompleter"/></returns>
+        public Java.Util.Concurrent.CountedCompleter<object> GetRoot()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter<object>>("getRoot", "()Ljava/util/concurrent/CountedCompleter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#nextComplete()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.CountedCompleter"/></returns>
         public Java.Util.Concurrent.CountedCompleter<object> NextComplete()
@@ -270,7 +284,7 @@ public Java.Util.Concurrent.CountedCompleter<object> NextComplete()
             return IExecuteWithSignature<Java.Util.Concurrent.CountedCompleter<object>>("nextComplete", "()Ljava/util/concurrent/CountedCompleter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#addToPendingCount(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#addToPendingCount(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void AddToPendingCount(int arg0)
@@ -278,7 +292,7 @@ public void AddToPendingCount(int arg0)
             IExecuteWithSignature("addToPendingCount", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#helpComplete(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#helpComplete(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void HelpComplete(int arg0)
@@ -286,28 +300,36 @@ public void HelpComplete(int arg0)
             IExecuteWithSignature("helpComplete", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#propagateCompletion()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#propagateCompletion()"/>
         /// </summary>
         public void PropagateCompletion()
         {
             IExecuteWithSignature("propagateCompletion", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#quietlyCompleteRoot()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#quietlyCompleteRoot()"/>
         /// </summary>
         public void QuietlyCompleteRoot()
         {
             IExecuteWithSignature("quietlyCompleteRoot", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#tryComplete()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#setPendingCount(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetPendingCount(int arg0)
+        {
+            IExecuteWithSignature("setPendingCount", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#tryComplete()"/>
         /// </summary>
         public void TryComplete()
         {
             IExecuteWithSignature("tryComplete", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CountedCompleter.html#onCompletion(java.util.concurrent.CountedCompleter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CountedCompleter.html#onCompletion(java.util.concurrent.CountedCompleter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.CountedCompleter"/></param>
         public void OnCompletion(Java.Util.Concurrent.CountedCompleter<object> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/CyclicBarrier.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/CyclicBarrier.cs
index af657cb13..16f2c7c42 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/CyclicBarrier.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/CyclicBarrier.cs
@@ -30,7 +30,7 @@ public partial class CyclicBarrier
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html#%3Cinit%3E(int,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html#%3Cinit%3E(int,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -39,7 +39,7 @@ public CyclicBarrier(int arg0, Java.Lang.Runnable arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public CyclicBarrier(int arg0)
@@ -63,21 +63,7 @@ public CyclicBarrier(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html#getNumberWaiting()"/> 
-        /// </summary>
-        public int NumberWaiting
-        {
-            get { return IExecuteWithSignature<int>("getNumberWaiting", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html#getParties()"/> 
-        /// </summary>
-        public int Parties
-        {
-            get { return IExecuteWithSignature<int>("getParties", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html#isBroken()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html#isBroken()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsBroken()
@@ -85,7 +71,7 @@ public bool IsBroken()
             return IExecuteWithSignature<bool>("isBroken", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html#await()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html#await()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -95,7 +81,7 @@ public int Await()
             return IExecuteWithSignature<int>("await", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html#await(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html#await(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -108,7 +94,23 @@ public int Await(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<int>("await", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/CyclicBarrier.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html#getNumberWaiting()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberWaiting()
+        {
+            return IExecuteWithSignature<int>("getNumberWaiting", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html#getParties()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetParties()
+        {
+            return IExecuteWithSignature<int>("getParties", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/CyclicBarrier.html#reset()"/>
         /// </summary>
         public void Reset()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/DelayQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/DelayQueue.cs
index 5017db88f..0adca90fb 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/DelayQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/DelayQueue.cs
@@ -30,7 +30,7 @@ public partial class DelayQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public DelayQueue(Java.Util.Collection arg0)
@@ -58,7 +58,7 @@ public DelayQueue(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#add(java.util.concurrent.Delayed)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#add(java.util.concurrent.Delayed)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Delayed"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -67,7 +67,7 @@ public bool Add(Java.Util.Concurrent.Delayed arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/util/concurrent/Delayed;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#offer(java.util.concurrent.Delayed,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#offer(java.util.concurrent.Delayed,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Delayed"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -78,7 +78,7 @@ public bool Offer(Java.Util.Concurrent.Delayed arg0, long arg1, Java.Util.Concur
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#offer(java.util.concurrent.Delayed)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#offer(java.util.concurrent.Delayed)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Delayed"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -87,7 +87,7 @@ public bool Offer(Java.Util.Concurrent.Delayed arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/util/concurrent/Delayed;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -99,7 +99,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -109,7 +109,7 @@ public int DrainTo(Java.Util.Collection arg0, int arg1)
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -118,7 +118,7 @@ public int DrainTo(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -126,7 +126,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -137,7 +137,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -146,7 +146,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#put(java.util.concurrent.Delayed)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#put(java.util.concurrent.Delayed)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Delayed"/></param>
         public void Put(Java.Util.Concurrent.Delayed arg0)
@@ -154,7 +154,7 @@ public void Put(Java.Util.Concurrent.Delayed arg0)
             IExecuteWithSignature("put", "(Ljava/util/concurrent/Delayed;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -178,7 +178,7 @@ public partial class DelayQueue<E>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public DelayQueue(Java.Util.Collection<E> arg0)
@@ -210,7 +210,7 @@ public DelayQueue(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#add(java.util.concurrent.Delayed)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#add(java.util.concurrent.Delayed)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -219,7 +219,7 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/util/concurrent/Delayed;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#offer(java.util.concurrent.Delayed,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#offer(java.util.concurrent.Delayed,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -230,7 +230,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#offer(java.util.concurrent.Delayed)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#offer(java.util.concurrent.Delayed)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -239,7 +239,7 @@ public bool Offer(E arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/util/concurrent/Delayed;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -251,28 +251,28 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE : E
         {
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -280,7 +280,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -291,7 +291,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -300,7 +300,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#put(java.util.concurrent.Delayed)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#put(java.util.concurrent.Delayed)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Put(E arg0)
@@ -308,7 +308,7 @@ public void Put(E arg0)
             IExecuteWithSignature("put", "(Ljava/util/concurrent/Delayed;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/DelayQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/DelayQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Delayed.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Delayed.cs
index 85df3c3c6..963689a44 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Delayed.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Delayed.cs
@@ -64,7 +64,7 @@ public partial class Delayed : Java.Util.Concurrent.IDelayed
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Delayed.html#getDelay(java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Delayed.html#getDelay(java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Exchanger.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Exchanger.cs
index f18998228..526ea3bf9 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Exchanger.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Exchanger.cs
@@ -46,7 +46,7 @@ public partial class Exchanger
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Exchanger.html#exchange(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Exchanger.html#exchange(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -59,7 +59,7 @@ public object Exchange(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg
             return IExecute("exchange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Exchanger.html#exchange(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Exchanger.html#exchange(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -104,7 +104,7 @@ public partial class Exchanger<V>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Exchanger.html#exchange(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Exchanger.html#exchange(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -117,7 +117,7 @@ public V Exchange(V arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<V>("exchange", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Exchanger.html#exchange(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Exchanger.html#exchange(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         /// <returns><typeparamref name="V"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Executor.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Executor.cs
index 29c51305e..7f33e3713 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Executor.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Executor.cs
@@ -64,7 +64,7 @@ public partial class Executor : Java.Util.Concurrent.IExecutor
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executor.html#execute(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executor.html#execute(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         public void Execute(Java.Lang.Runnable arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ExecutorCompletionService.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ExecutorCompletionService.cs
index 59de3ff13..c7a7e6989 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ExecutorCompletionService.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ExecutorCompletionService.cs
@@ -30,7 +30,7 @@ public partial class ExecutorCompletionService
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#%3Cinit%3E(java.util.concurrent.Executor,java.util.concurrent.BlockingQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#%3Cinit%3E(java.util.concurrent.Executor,java.util.concurrent.BlockingQueue)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.BlockingQueue"/></param>
@@ -39,7 +39,7 @@ public ExecutorCompletionService(Java.Util.Concurrent.Executor arg0, Java.Util.C
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#%3Cinit%3E(java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#%3Cinit%3E(java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         public ExecutorCompletionService(Java.Util.Concurrent.Executor arg0)
@@ -63,7 +63,7 @@ public ExecutorCompletionService(Java.Util.Concurrent.Executor arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#poll()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         public Java.Util.Concurrent.Future Poll()
@@ -71,7 +71,7 @@ public Java.Util.Concurrent.Future Poll()
             return IExecuteWithSignature<Java.Util.Concurrent.Future>("poll", "()Ljava/util/concurrent/Future;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -82,7 +82,7 @@ public Java.Util.Concurrent.Future Poll(long arg0, Java.Util.Concurrent.TimeUnit
             return IExecute<Java.Util.Concurrent.Future>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#submit(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#submit(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -92,7 +92,7 @@ public Java.Util.Concurrent.Future Submit(Java.Lang.Runnable arg0, object arg1)
             return IExecute<Java.Util.Concurrent.Future>("submit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#submit(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#submit(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -101,7 +101,7 @@ public Java.Util.Concurrent.Future Submit(Java.Util.Concurrent.Callable arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.Future>("submit", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#take()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -125,7 +125,7 @@ public partial class ExecutorCompletionService<V>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#%3Cinit%3E(java.util.concurrent.Executor,java.util.concurrent.BlockingQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#%3Cinit%3E(java.util.concurrent.Executor,java.util.concurrent.BlockingQueue)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.BlockingQueue"/></param>
@@ -134,7 +134,7 @@ public ExecutorCompletionService(Java.Util.Concurrent.Executor arg0, Java.Util.C
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#%3Cinit%3E(java.util.concurrent.Executor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#%3Cinit%3E(java.util.concurrent.Executor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         public ExecutorCompletionService(Java.Util.Concurrent.Executor arg0)
@@ -162,7 +162,7 @@ public ExecutorCompletionService(Java.Util.Concurrent.Executor arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#poll()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         public Java.Util.Concurrent.Future<V> Poll()
@@ -170,7 +170,7 @@ public Java.Util.Concurrent.Future<V> Poll()
             return IExecuteWithSignature<Java.Util.Concurrent.Future<V>>("poll", "()Ljava/util/concurrent/Future;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -181,7 +181,7 @@ public Java.Util.Concurrent.Future<V> Poll(long arg0, Java.Util.Concurrent.TimeU
             return IExecute<Java.Util.Concurrent.Future<V>>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#submit(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#submit(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -191,7 +191,7 @@ public Java.Util.Concurrent.Future<V> Submit(Java.Lang.Runnable arg0, V arg1)
             return IExecute<Java.Util.Concurrent.Future<V>>("submit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#submit(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#submit(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -200,7 +200,7 @@ public Java.Util.Concurrent.Future<V> Submit(Java.Util.Concurrent.Callable<V> ar
             return IExecuteWithSignature<Java.Util.Concurrent.Future<V>>("submit", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorCompletionService.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorCompletionService.html#take()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ExecutorService.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ExecutorService.cs
index 23e749ae8..2061fa4b3 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ExecutorService.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ExecutorService.cs
@@ -64,7 +64,7 @@ public partial class ExecutorService : Java.Util.Concurrent.IExecutorService
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#submit(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#submit(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -75,7 +75,7 @@ public Java.Util.Concurrent.Future<T> Submit<T>(Java.Lang.Runnable arg0, T arg1)
             return IExecute<Java.Util.Concurrent.Future<T>>("submit", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#submit(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#submit(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <typeparam name="T"></typeparam>
@@ -85,7 +85,7 @@ public Java.Util.Concurrent.Future<T> Submit<T>(Java.Util.Concurrent.Callable<T>
             return IExecuteWithSignature<Java.Util.Concurrent.Future<T>>("submit", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#invokeAll(java.util.Collection,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#invokeAll(java.util.Collection,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -94,24 +94,24 @@ public Java.Util.Concurrent.Future<T> Submit<T>(Java.Util.Concurrent.Callable<T>
         /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_Callable_T_"><see cref="Java.Util.Concurrent.Callable{T}"/></typeparam>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
-        public Java.Util.List<Java.Util.Concurrent.Future<T>> InvokeAll<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2) where Arg0ExtendsJava_Util_Concurrent_Callable_T_: Java.Util.Concurrent.Callable<T>
+        public Java.Util.List<Java.Util.Concurrent.Future<T>> InvokeAll<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2) where Arg0ExtendsJava_Util_Concurrent_Callable_T_ : Java.Util.Concurrent.Callable<T>
         {
             return IExecute<Java.Util.List<Java.Util.Concurrent.Future<T>>>("invokeAll", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#invokeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#invokeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Concurrent_Callable_T_"><see cref="Java.Util.Concurrent.Callable{T}"/></typeparam>
         /// <returns><see cref="Java.Util.List"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
-        public Java.Util.List<Java.Util.Concurrent.Future<T>> InvokeAll<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_Callable_T_: Java.Util.Concurrent.Callable<T>
+        public Java.Util.List<Java.Util.Concurrent.Future<T>> InvokeAll<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_Callable_T_ : Java.Util.Concurrent.Callable<T>
         {
             return IExecuteWithSignature<Java.Util.List<Java.Util.Concurrent.Future<T>>>("invokeAll", "(Ljava/util/Collection;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#invokeAny(java.util.Collection,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#invokeAny(java.util.Collection,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -122,12 +122,12 @@ public Java.Util.Concurrent.Future<T> Submit<T>(Java.Util.Concurrent.Callable<T>
         /// <exception cref="Java.Lang.InterruptedException"/>
         /// <exception cref="Java.Util.Concurrent.ExecutionException"/>
         /// <exception cref="Java.Util.Concurrent.TimeoutException"/>
-        public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2) where Arg0ExtendsJava_Util_Concurrent_Callable_T_: Java.Util.Concurrent.Callable<T>
+        public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2) where Arg0ExtendsJava_Util_Concurrent_Callable_T_ : Java.Util.Concurrent.Callable<T>
         {
             return IExecute<T>("invokeAny", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#invokeAny(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#invokeAny(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="T"></typeparam>
@@ -135,12 +135,12 @@ public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Col
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
         /// <exception cref="Java.Util.Concurrent.ExecutionException"/>
-        public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_Callable_T_: Java.Util.Concurrent.Callable<T>
+        public T InvokeAny<T, Arg0ExtendsJava_Util_Concurrent_Callable_T_>(Java.Util.Collection<Arg0ExtendsJava_Util_Concurrent_Callable_T_> arg0) where Arg0ExtendsJava_Util_Concurrent_Callable_T_ : Java.Util.Concurrent.Callable<T>
         {
             return IExecuteWithSignature<T>("invokeAny", "(Ljava/util/Collection;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#awaitTermination(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#awaitTermination(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -151,7 +151,7 @@ public bool AwaitTermination(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<bool>("awaitTermination", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#isShutdown()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#isShutdown()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsShutdown()
@@ -159,7 +159,7 @@ public bool IsShutdown()
             return IExecuteWithSignature<bool>("isShutdown", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#isTerminated()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#isTerminated()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsTerminated()
@@ -167,7 +167,7 @@ public bool IsTerminated()
             return IExecuteWithSignature<bool>("isTerminated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#submit(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#submit(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Future"/></returns>
@@ -176,7 +176,7 @@ public Java.Util.Concurrent.Future<object> Submit(Java.Lang.Runnable arg0)
             return IExecuteWithSignature<Java.Util.Concurrent.Future<object>>("submit", "(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#shutdownNow()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#shutdownNow()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         public Java.Util.List<Java.Lang.Runnable> ShutdownNow()
@@ -184,7 +184,7 @@ public Java.Util.Concurrent.Future<object> Submit(Java.Lang.Runnable arg0)
             return IExecuteWithSignature<Java.Util.List<Java.Lang.Runnable>>("shutdownNow", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ExecutorService.html#shutdown()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ExecutorService.html#shutdown()"/>
         /// </summary>
         public void Shutdown()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Executors.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Executors.cs
index 55fe6c1cf..b6c47fce7 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Executors.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Executors.cs
@@ -42,7 +42,7 @@ public partial class Executors
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#callable(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#callable(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -53,29 +53,27 @@ public static Java.Util.Concurrent.Callable<T> Callable<T>(Java.Lang.Runnable ar
             return SExecute<Java.Util.Concurrent.Callable<T>>(LocalBridgeClazz, "callable", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#privilegedCallable(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#privilegedCallable(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.Callable"/></returns>
-        [System.Obsolete()]
         public static Java.Util.Concurrent.Callable<T> PrivilegedCallable<T>(Java.Util.Concurrent.Callable<T> arg0)
         {
             return SExecuteWithSignature<Java.Util.Concurrent.Callable<T>>(LocalBridgeClazz, "privilegedCallable", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Callable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#privilegedCallableUsingCurrentClassLoader(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#privilegedCallableUsingCurrentClassLoader(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.Callable"/></returns>
-        [System.Obsolete()]
         public static Java.Util.Concurrent.Callable<T> PrivilegedCallableUsingCurrentClassLoader<T>(Java.Util.Concurrent.Callable<T> arg0)
         {
             return SExecuteWithSignature<Java.Util.Concurrent.Callable<T>>(LocalBridgeClazz, "privilegedCallableUsingCurrentClassLoader", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Callable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#callable(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#callable(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Callable"/></returns>
@@ -84,7 +82,7 @@ public static Java.Util.Concurrent.Callable<object> Callable(Java.Lang.Runnable
             return SExecuteWithSignature<Java.Util.Concurrent.Callable<object>>(LocalBridgeClazz, "callable", "(Ljava/lang/Runnable;)Ljava/util/concurrent/Callable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#callable(java.security.PrivilegedAction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#callable(java.security.PrivilegedAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedAction"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Callable"/></returns>
@@ -93,7 +91,7 @@ public static Java.Util.Concurrent.Callable<object> Callable(Java.Security.Privi
             return SExecuteWithSignature<Java.Util.Concurrent.Callable<object>>(LocalBridgeClazz, "callable", "(Ljava/security/PrivilegedAction;)Ljava/util/concurrent/Callable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#callable(java.security.PrivilegedExceptionAction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#callable(java.security.PrivilegedExceptionAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
         /// <returns><see cref="Java.Util.Concurrent.Callable"/></returns>
@@ -102,7 +100,7 @@ public static Java.Util.Concurrent.Callable<object> Callable(Java.Security.Privi
             return SExecuteWithSignature<Java.Util.Concurrent.Callable<object>>(LocalBridgeClazz, "callable", "(Ljava/security/PrivilegedExceptionAction;)Ljava/util/concurrent/Callable;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newCachedThreadPool()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newCachedThreadPool()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ExecutorService"/></returns>
         public static Java.Util.Concurrent.ExecutorService NewCachedThreadPool()
@@ -110,7 +108,7 @@ public static Java.Util.Concurrent.ExecutorService NewCachedThreadPool()
             return SExecuteWithSignature<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "newCachedThreadPool", "()Ljava/util/concurrent/ExecutorService;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newCachedThreadPool(java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newCachedThreadPool(java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ExecutorService"/></returns>
@@ -119,7 +117,7 @@ public static Java.Util.Concurrent.ExecutorService NewCachedThreadPool(Java.Util
             return SExecuteWithSignature<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "newCachedThreadPool", "(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newFixedThreadPool(int,java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newFixedThreadPool(int,java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
@@ -129,7 +127,7 @@ public static Java.Util.Concurrent.ExecutorService NewFixedThreadPool(int arg0,
             return SExecute<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "newFixedThreadPool", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newFixedThreadPool(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newFixedThreadPool(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ExecutorService"/></returns>
@@ -138,7 +136,7 @@ public static Java.Util.Concurrent.ExecutorService NewFixedThreadPool(int arg0)
             return SExecuteWithSignature<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "newFixedThreadPool", "(I)Ljava/util/concurrent/ExecutorService;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newSingleThreadExecutor()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newSingleThreadExecutor()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ExecutorService"/></returns>
         public static Java.Util.Concurrent.ExecutorService NewSingleThreadExecutor()
@@ -146,7 +144,7 @@ public static Java.Util.Concurrent.ExecutorService NewSingleThreadExecutor()
             return SExecuteWithSignature<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "newSingleThreadExecutor", "()Ljava/util/concurrent/ExecutorService;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newSingleThreadExecutor(java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newSingleThreadExecutor(java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ExecutorService"/></returns>
@@ -155,7 +153,7 @@ public static Java.Util.Concurrent.ExecutorService NewSingleThreadExecutor(Java.
             return SExecuteWithSignature<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "newSingleThreadExecutor", "(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newWorkStealingPool()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newWorkStealingPool()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ExecutorService"/></returns>
         public static Java.Util.Concurrent.ExecutorService NewWorkStealingPool()
@@ -163,7 +161,7 @@ public static Java.Util.Concurrent.ExecutorService NewWorkStealingPool()
             return SExecuteWithSignature<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "newWorkStealingPool", "()Ljava/util/concurrent/ExecutorService;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newWorkStealingPool(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newWorkStealingPool(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ExecutorService"/></returns>
@@ -172,7 +170,7 @@ public static Java.Util.Concurrent.ExecutorService NewWorkStealingPool(int arg0)
             return SExecuteWithSignature<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "newWorkStealingPool", "(I)Ljava/util/concurrent/ExecutorService;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#unconfigurableExecutorService(java.util.concurrent.ExecutorService)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#unconfigurableExecutorService(java.util.concurrent.ExecutorService)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ExecutorService"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ExecutorService"/></returns>
@@ -181,7 +179,7 @@ public static Java.Util.Concurrent.ExecutorService UnconfigurableExecutorService
             return SExecuteWithSignature<Java.Util.Concurrent.ExecutorService>(LocalBridgeClazz, "unconfigurableExecutorService", "(Ljava/util/concurrent/ExecutorService;)Ljava/util/concurrent/ExecutorService;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newScheduledThreadPool(int,java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newScheduledThreadPool(int,java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
@@ -191,7 +189,7 @@ public static Java.Util.Concurrent.ScheduledExecutorService NewScheduledThreadPo
             return SExecute<Java.Util.Concurrent.ScheduledExecutorService>(LocalBridgeClazz, "newScheduledThreadPool", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newScheduledThreadPool(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newScheduledThreadPool(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ScheduledExecutorService"/></returns>
@@ -200,7 +198,7 @@ public static Java.Util.Concurrent.ScheduledExecutorService NewScheduledThreadPo
             return SExecuteWithSignature<Java.Util.Concurrent.ScheduledExecutorService>(LocalBridgeClazz, "newScheduledThreadPool", "(I)Ljava/util/concurrent/ScheduledExecutorService;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newSingleThreadScheduledExecutor()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newSingleThreadScheduledExecutor()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ScheduledExecutorService"/></returns>
         public static Java.Util.Concurrent.ScheduledExecutorService NewSingleThreadScheduledExecutor()
@@ -208,7 +206,7 @@ public static Java.Util.Concurrent.ScheduledExecutorService NewSingleThreadSched
             return SExecuteWithSignature<Java.Util.Concurrent.ScheduledExecutorService>(LocalBridgeClazz, "newSingleThreadScheduledExecutor", "()Ljava/util/concurrent/ScheduledExecutorService;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#newSingleThreadScheduledExecutor(java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#newSingleThreadScheduledExecutor(java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ScheduledExecutorService"/></returns>
@@ -217,7 +215,7 @@ public static Java.Util.Concurrent.ScheduledExecutorService NewSingleThreadSched
             return SExecuteWithSignature<Java.Util.Concurrent.ScheduledExecutorService>(LocalBridgeClazz, "newSingleThreadScheduledExecutor", "(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#unconfigurableScheduledExecutorService(java.util.concurrent.ScheduledExecutorService)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#unconfigurableScheduledExecutorService(java.util.concurrent.ScheduledExecutorService)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ScheduledExecutorService"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ScheduledExecutorService"/></returns>
@@ -226,7 +224,7 @@ public static Java.Util.Concurrent.ScheduledExecutorService UnconfigurableSchedu
             return SExecuteWithSignature<Java.Util.Concurrent.ScheduledExecutorService>(LocalBridgeClazz, "unconfigurableScheduledExecutorService", "(Ljava/util/concurrent/ScheduledExecutorService;)Ljava/util/concurrent/ScheduledExecutorService;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#defaultThreadFactory()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#defaultThreadFactory()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ThreadFactory"/></returns>
         public static Java.Util.Concurrent.ThreadFactory DefaultThreadFactory()
@@ -234,10 +232,9 @@ public static Java.Util.Concurrent.ThreadFactory DefaultThreadFactory()
             return SExecuteWithSignature<Java.Util.Concurrent.ThreadFactory>(LocalBridgeClazz, "defaultThreadFactory", "()Ljava/util/concurrent/ThreadFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Executors.html#privilegedThreadFactory()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Executors.html#privilegedThreadFactory()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ThreadFactory"/></returns>
-        [System.Obsolete()]
         public static Java.Util.Concurrent.ThreadFactory PrivilegedThreadFactory()
         {
             return SExecuteWithSignature<Java.Util.Concurrent.ThreadFactory>(LocalBridgeClazz, "privilegedThreadFactory", "()Ljava/util/concurrent/ThreadFactory;");
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Flow.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Flow.cs
index c483f6a80..d30a6ec2a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Flow.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Flow.cs
@@ -42,7 +42,7 @@ public partial class Flow
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.html#defaultBufferSize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.html#defaultBufferSize()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public static int DefaultBufferSize()
@@ -144,7 +144,7 @@ public partial class Publisher
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Publisher.html#subscribe(java.util.concurrent.Flow.Subscriber)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Publisher.html#subscribe(java.util.concurrent.Flow.Subscriber)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Concurrent.Flow.Subscriber"/></param>
             public void Subscribe(Java.Util.Concurrent.Flow.Subscriber arg0)
@@ -187,11 +187,11 @@ public partial class Publisher<T>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Publisher.html#subscribe(java.util.concurrent.Flow.Subscriber)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Publisher.html#subscribe(java.util.concurrent.Flow.Subscriber)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Concurrent.Flow.Subscriber"/></param>
             /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-            public void Subscribe<Arg0objectSuperT>(Java.Util.Concurrent.Flow.Subscriber<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+            public void Subscribe<Arg0objectSuperT>(Java.Util.Concurrent.Flow.Subscriber<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
             {
                 IExecuteWithSignature("subscribe", "(Ljava/util/concurrent/Flow$Subscriber;)V", arg0);
             }
@@ -227,14 +227,14 @@ public partial class Subscriber
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html#onComplete()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html#onComplete()"/>
             /// </summary>
             public void OnComplete()
             {
                 IExecuteWithSignature("onComplete", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html#onError(java.lang.Throwable)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html#onError(java.lang.Throwable)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
             public void OnError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
@@ -242,7 +242,7 @@ public void OnError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
                 IExecuteWithSignature("onError", "(Ljava/lang/Throwable;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html#onNext(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html#onNext(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             public void OnNext(object arg0)
@@ -250,7 +250,7 @@ public void OnNext(object arg0)
                 IExecuteWithSignature("onNext", "(Ljava/lang/Object;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html#onSubscribe(java.util.concurrent.Flow.Subscription)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html#onSubscribe(java.util.concurrent.Flow.Subscription)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Concurrent.Flow.Subscription"/></param>
             public void OnSubscribe(Java.Util.Concurrent.Flow.Subscription arg0)
@@ -293,14 +293,14 @@ public partial class Subscriber<T>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html#onComplete()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html#onComplete()"/>
             /// </summary>
             public void OnComplete()
             {
                 IExecuteWithSignature("onComplete", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html#onError(java.lang.Throwable)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html#onError(java.lang.Throwable)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
             public void OnError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
@@ -308,7 +308,7 @@ public void OnError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
                 IExecuteWithSignature("onError", "(Ljava/lang/Throwable;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html#onNext(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html#onNext(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="T"/></param>
             public void OnNext(T arg0)
@@ -316,7 +316,7 @@ public void OnNext(T arg0)
                 IExecuteWithSignature("onNext", "(Ljava/lang/Object;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscriber.html#onSubscribe(java.util.concurrent.Flow.Subscription)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscriber.html#onSubscribe(java.util.concurrent.Flow.Subscription)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Concurrent.Flow.Subscription"/></param>
             public void OnSubscribe(Java.Util.Concurrent.Flow.Subscription arg0)
@@ -355,14 +355,14 @@ public partial class Subscription
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscription.html#cancel()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscription.html#cancel()"/>
             /// </summary>
             public void Cancel()
             {
                 IExecuteWithSignature("cancel", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Flow.Subscription.html#request(long)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/Flow.Subscription.html#request(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             public void Request(long arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinPool.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinPool.cs
index 1c443553a..435005137 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinPool.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinPool.cs
@@ -30,7 +30,7 @@ public partial class ForkJoinPool
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ForkJoinPool(int arg0)
@@ -46,7 +46,7 @@ public ForkJoinPool(int arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#defaultForkJoinWorkerThreadFactory"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#defaultForkJoinWorkerThreadFactory"/>
         /// </summary>
         public static Java.Util.Concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory defaultForkJoinWorkerThreadFactory { get { if (!_defaultForkJoinWorkerThreadFactoryReady) { _defaultForkJoinWorkerThreadFactoryContent = SGetField<Java.Util.Concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory>(LocalBridgeClazz, "defaultForkJoinWorkerThreadFactory"); _defaultForkJoinWorkerThreadFactoryReady = true; } return _defaultForkJoinWorkerThreadFactoryContent; } }
         private static Java.Util.Concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory _defaultForkJoinWorkerThreadFactoryContent = default;
@@ -56,14 +56,15 @@ public ForkJoinPool(int arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getCommonPoolParallelism()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getCommonPoolParallelism()"/>
         /// </summary>
-        public static int CommonPoolParallelism
+        /// <returns><see cref="int"/></returns>
+        public static int GetCommonPoolParallelism()
         {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getCommonPoolParallelism", "()I"); }
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getCommonPoolParallelism", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#commonPool()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#commonPool()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ForkJoinPool"/></returns>
         public static Java.Util.Concurrent.ForkJoinPool CommonPool()
@@ -71,7 +72,7 @@ public static Java.Util.Concurrent.ForkJoinPool CommonPool()
             return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool>(LocalBridgeClazz, "commonPool", "()Ljava/util/concurrent/ForkJoinPool;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#managedBlock(java.util.concurrent.ForkJoinPool.ManagedBlocker)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#managedBlock(java.util.concurrent.ForkJoinPool.ManagedBlocker)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinPool.ManagedBlocker"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -84,124 +85,133 @@ public static void ManagedBlock(Java.Util.Concurrent.ForkJoinPool.ManagedBlocker
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getActiveThreadCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#submit(java.util.concurrent.ForkJoinTask)"/>
         /// </summary>
-        public int ActiveThreadCount
+        /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><see cref="Java.Util.Concurrent.ForkJoinTask"/></returns>
+        public Java.Util.Concurrent.ForkJoinTask<T> Submit<T>(Java.Util.Concurrent.ForkJoinTask<T> arg0)
         {
-            get { return IExecuteWithSignature<int>("getActiveThreadCount", "()I"); }
+            return IExecuteWithSignature<Java.Util.Concurrent.ForkJoinTask<T>>("submit", "(Ljava/util/concurrent/ForkJoinTask;)Ljava/util/concurrent/ForkJoinTask;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getAsyncMode()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#invoke(java.util.concurrent.ForkJoinTask)"/>
         /// </summary>
-        public bool AsyncMode
+        /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns><typeparamref name="T"/></returns>
+        public T Invoke<T>(Java.Util.Concurrent.ForkJoinTask<T> arg0)
         {
-            get { return IExecuteWithSignature<bool>("getAsyncMode", "()Z"); }
+            return IExecuteWithSignature<T>("invoke", "(Ljava/util/concurrent/ForkJoinTask;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getFactory()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#awaitQuiescence(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
-        public Java.Util.Concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory Factory
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool AwaitQuiescence(long arg0, Java.Util.Concurrent.TimeUnit arg1)
         {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory>("getFactory", "()Ljava/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory;"); }
+            return IExecute<bool>("awaitQuiescence", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getParallelism()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getAsyncMode()"/>
         /// </summary>
-        public int Parallelism
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAsyncMode()
         {
-            get { return IExecuteWithSignature<int>("getParallelism", "()I"); }
+            return IExecuteWithSignature<bool>("getAsyncMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getPoolSize()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#hasQueuedSubmissions()"/>
         /// </summary>
-        public int PoolSize
+        /// <returns><see cref="bool"/></returns>
+        public bool HasQueuedSubmissions()
         {
-            get { return IExecuteWithSignature<int>("getPoolSize", "()I"); }
+            return IExecuteWithSignature<bool>("hasQueuedSubmissions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getQueuedSubmissionCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#isQuiescent()"/>
         /// </summary>
-        public int QueuedSubmissionCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsQuiescent()
         {
-            get { return IExecuteWithSignature<int>("getQueuedSubmissionCount", "()I"); }
+            return IExecuteWithSignature<bool>("isQuiescent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getQueuedTaskCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#isTerminating()"/>
         /// </summary>
-        public long QueuedTaskCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTerminating()
         {
-            get { return IExecuteWithSignature<long>("getQueuedTaskCount", "()J"); }
+            return IExecuteWithSignature<bool>("isTerminating", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getRunningThreadCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getActiveThreadCount()"/>
         /// </summary>
-        public int RunningThreadCount
+        /// <returns><see cref="int"/></returns>
+        public int GetActiveThreadCount()
         {
-            get { return IExecuteWithSignature<int>("getRunningThreadCount", "()I"); }
+            return IExecuteWithSignature<int>("getActiveThreadCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#getStealCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getParallelism()"/>
         /// </summary>
-        public long StealCount
+        /// <returns><see cref="int"/></returns>
+        public int GetParallelism()
         {
-            get { return IExecuteWithSignature<long>("getStealCount", "()J"); }
+            return IExecuteWithSignature<int>("getParallelism", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#submit(java.util.concurrent.ForkJoinTask)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getPoolSize()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><see cref="Java.Util.Concurrent.ForkJoinTask"/></returns>
-        public Java.Util.Concurrent.ForkJoinTask<T> Submit<T>(Java.Util.Concurrent.ForkJoinTask<T> arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetPoolSize()
         {
-            return IExecuteWithSignature<Java.Util.Concurrent.ForkJoinTask<T>>("submit", "(Ljava/util/concurrent/ForkJoinTask;)Ljava/util/concurrent/ForkJoinTask;", arg0);
+            return IExecuteWithSignature<int>("getPoolSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#invoke(java.util.concurrent.ForkJoinTask)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getQueuedSubmissionCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns><typeparamref name="T"/></returns>
-        public T Invoke<T>(Java.Util.Concurrent.ForkJoinTask<T> arg0)
+        /// <returns><see cref="int"/></returns>
+        public int GetQueuedSubmissionCount()
         {
-            return IExecuteWithSignature<T>("invoke", "(Ljava/util/concurrent/ForkJoinTask;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<int>("getQueuedSubmissionCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#awaitQuiescence(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getRunningThreadCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool AwaitQuiescence(long arg0, Java.Util.Concurrent.TimeUnit arg1)
+        /// <returns><see cref="int"/></returns>
+        public int GetRunningThreadCount()
         {
-            return IExecute<bool>("awaitQuiescence", arg0, arg1);
+            return IExecuteWithSignature<int>("getRunningThreadCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#hasQueuedSubmissions()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getFactory()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasQueuedSubmissions()
+        /// <returns><see cref="Java.Util.Concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory"/></returns>
+        public Java.Util.Concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory GetFactory()
         {
-            return IExecuteWithSignature<bool>("hasQueuedSubmissions", "()Z");
+            return IExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory>("getFactory", "()Ljava/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#isQuiescent()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getQueuedTaskCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsQuiescent()
+        /// <returns><see cref="long"/></returns>
+        public long GetQueuedTaskCount()
         {
-            return IExecuteWithSignature<bool>("isQuiescent", "()Z");
+            return IExecuteWithSignature<long>("getQueuedTaskCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#isTerminating()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#getStealCount()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTerminating()
+        /// <returns><see cref="long"/></returns>
+        public long GetStealCount()
         {
-            return IExecuteWithSignature<bool>("isTerminating", "()Z");
+            return IExecuteWithSignature<long>("getStealCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.html#execute(java.util.concurrent.ForkJoinTask)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.html#execute(java.util.concurrent.ForkJoinTask)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
         public void Execute(Java.Util.Concurrent.ForkJoinTask<object> arg0)
@@ -233,7 +243,7 @@ public partial class ForkJoinWorkerThreadFactory
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.ForkJoinWorkerThreadFactory.html#newThread(java.util.concurrent.ForkJoinPool)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.ForkJoinWorkerThreadFactory.html#newThread(java.util.concurrent.ForkJoinPool)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinPool"/></param>
             /// <returns><see cref="Java.Util.Concurrent.ForkJoinWorkerThread"/></returns>
@@ -273,7 +283,7 @@ public partial class ManagedBlocker
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.ManagedBlocker.html#block()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.ManagedBlocker.html#block()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
             /// <exception cref="Java.Lang.InterruptedException"/>
@@ -282,7 +292,7 @@ public bool Block()
                 return IExecuteWithSignature<bool>("block", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinPool.ManagedBlocker.html#isReleasable()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinPool.ManagedBlocker.html#isReleasable()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
             public bool IsReleasable()
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinTask.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinTask.cs
index e9b658222..30ee7f2e9 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinTask.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinTask.cs
@@ -50,37 +50,16 @@ public partial class ForkJoinTask
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getPool()"/> 
-        /// </summary>
-        public static Java.Util.Concurrent.ForkJoinPool Pool
-        {
-            get { return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool>(LocalBridgeClazz, "getPool", "()Ljava/util/concurrent/ForkJoinPool;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getQueuedTaskCount()"/> 
-        /// </summary>
-        public static int QueuedTaskCount
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getQueuedTaskCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getSurplusQueuedTaskCount()"/> 
-        /// </summary>
-        public static int SurplusQueuedTaskCount
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getSurplusQueuedTaskCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public static Java.Util.Collection InvokeAll(Java.Util.Collection arg0)
         {
-            return SExecuteWithSignature<Java.Util.Collection>(LocalBridgeClazz, "invokeAll", "(Ljava/util/Collection;)Ljava/util/Collection;", arg0);
+            return SExecute<Java.Util.Collection>(LocalBridgeClazz, "invokeAll", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#adapt(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#adapt(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -90,7 +69,7 @@ public static Java.Util.Concurrent.ForkJoinTask Adapt(Java.Lang.Runnable arg0, o
             return SExecute<Java.Util.Concurrent.ForkJoinTask>(LocalBridgeClazz, "adapt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#adapt(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#adapt(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ForkJoinTask"/></returns>
@@ -99,7 +78,7 @@ public static Java.Util.Concurrent.ForkJoinTask Adapt(Java.Util.Concurrent.Calla
             return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinTask>(LocalBridgeClazz, "adapt", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/ForkJoinTask;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#inForkJoinPool()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#inForkJoinPool()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public static bool InForkJoinPool()
@@ -107,7 +86,31 @@ public static bool InForkJoinPool()
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "inForkJoinPool", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#adapt(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getQueuedTaskCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int GetQueuedTaskCount()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getQueuedTaskCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getSurplusQueuedTaskCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int GetSurplusQueuedTaskCount()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getSurplusQueuedTaskCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getPool()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.ForkJoinPool"/></returns>
+        public static Java.Util.Concurrent.ForkJoinPool GetPool()
+        {
+            return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool>(LocalBridgeClazz, "getPool", "()Ljava/util/concurrent/ForkJoinPool;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#adapt(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ForkJoinTask"/></returns>
@@ -116,14 +119,14 @@ public static Java.Util.Concurrent.ForkJoinTask Adapt(Java.Lang.Runnable arg0)
             return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinTask>(LocalBridgeClazz, "adapt", "(Ljava/lang/Runnable;)Ljava/util/concurrent/ForkJoinTask;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#helpQuiesce()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#helpQuiesce()"/>
         /// </summary>
         public static void HelpQuiesce()
         {
             SExecuteWithSignature(LocalBridgeClazz, "helpQuiesce", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.concurrent.ForkJoinTask,java.util.concurrent.ForkJoinTask)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.concurrent.ForkJoinTask,java.util.concurrent.ForkJoinTask)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
@@ -132,7 +135,7 @@ public static void InvokeAll(Java.Util.Concurrent.ForkJoinTask arg0, Java.Util.C
             SExecute(LocalBridgeClazz, "invokeAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.concurrent.ForkJoinTask[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.concurrent.ForkJoinTask[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
         public static void InvokeAll(params Java.Util.Concurrent.ForkJoinTask[] arg0)
@@ -144,28 +147,15 @@ public static void InvokeAll(params Java.Util.Concurrent.ForkJoinTask[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getException()"/> 
-        /// </summary>
-        public Java.Lang.Throwable Exception
-        {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getException", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getForkJoinTaskTag()"/> 
-        /// </summary>
-        public short ForkJoinTaskTag
-        {
-            get { return IExecuteWithSignature<short>("getForkJoinTaskTag", "()S"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getRawResult()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getRawResult()"/>
         /// </summary>
-        public object RawResult
+        /// <returns><see cref="object"/></returns>
+        public object GetRawResult()
         {
-            get { return IExecuteWithSignature("getRawResult", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature("getRawResult", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#cancel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -174,7 +164,7 @@ public bool Cancel(bool arg0)
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#tryUnfork()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#tryUnfork()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool TryUnfork()
@@ -182,7 +172,7 @@ public bool TryUnfork()
             return IExecuteWithSignature<bool>("tryUnfork", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#compareAndSetForkJoinTaskTag(short,short)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#compareAndSetForkJoinTaskTag(short,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -192,7 +182,7 @@ public bool CompareAndSetForkJoinTaskTag(short arg0, short arg1)
             return IExecute<bool>("compareAndSetForkJoinTaskTag", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCancelled()
@@ -200,7 +190,7 @@ public bool IsCancelled()
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#isCompletedAbnormally()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#isCompletedAbnormally()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCompletedAbnormally()
@@ -208,7 +198,7 @@ public bool IsCompletedAbnormally()
             return IExecuteWithSignature<bool>("isCompletedAbnormally", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#isCompletedNormally()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#isCompletedNormally()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCompletedNormally()
@@ -216,7 +206,7 @@ public bool IsCompletedNormally()
             return IExecuteWithSignature<bool>("isCompletedNormally", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#isDone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#isDone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDone()
@@ -224,7 +214,15 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#fork()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getException()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Throwable"/></returns>
+        public Java.Lang.Throwable GetException()
+        {
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getException", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#fork()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ForkJoinTask"/></returns>
         public Java.Util.Concurrent.ForkJoinTask Fork()
@@ -232,7 +230,15 @@ public Java.Util.Concurrent.ForkJoinTask Fork()
             return IExecuteWithSignature<Java.Util.Concurrent.ForkJoinTask>("fork", "()Ljava/util/concurrent/ForkJoinTask;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#setForkJoinTaskTag(short)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getForkJoinTaskTag()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        public short GetForkJoinTaskTag()
+        {
+            return IExecuteWithSignature<short>("getForkJoinTaskTag", "()S");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#setForkJoinTaskTag(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="short"/></returns>
@@ -241,7 +247,7 @@ public short SetForkJoinTaskTag(short arg0)
             return IExecuteWithSignature<short>("setForkJoinTaskTag", "(S)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -251,7 +257,7 @@ public object Get()
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#get(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#get(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -264,7 +270,7 @@ public object Get(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#invoke()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#invoke()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Invoke()
@@ -272,7 +278,7 @@ public object Invoke()
             return IExecuteWithSignature("invoke", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#join()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#join()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Join()
@@ -280,28 +286,28 @@ public object Join()
             return IExecuteWithSignature("join", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#quietlyComplete()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#quietlyComplete()"/>
         /// </summary>
         public void QuietlyComplete()
         {
             IExecuteWithSignature("quietlyComplete", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#quietlyInvoke()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#quietlyInvoke()"/>
         /// </summary>
         public void QuietlyInvoke()
         {
             IExecuteWithSignature("quietlyInvoke", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#quietlyJoin()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#quietlyJoin()"/>
         /// </summary>
         public void QuietlyJoin()
         {
             IExecuteWithSignature("quietlyJoin", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#complete(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#complete(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Complete(object arg0)
@@ -309,7 +315,7 @@ public void Complete(object arg0)
             IExecuteWithSignature("complete", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#completeExceptionally(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#completeExceptionally(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         public void CompleteExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
@@ -317,7 +323,7 @@ public void CompleteExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException a
             IExecuteWithSignature("completeExceptionally", "(Ljava/lang/Throwable;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#reinitialize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#reinitialize()"/>
         /// </summary>
         public void Reinitialize()
         {
@@ -363,38 +369,17 @@ public partial class ForkJoinTask<V> : Java.Util.Concurrent.IFuture<V>, Java.Io.
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getPool()"/> 
-        /// </summary>
-        public static Java.Util.Concurrent.ForkJoinPool Pool
-        {
-            get { return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool>(LocalBridgeClazz, "getPool", "()Ljava/util/concurrent/ForkJoinPool;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getQueuedTaskCount()"/> 
-        /// </summary>
-        public static int QueuedTaskCount
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getQueuedTaskCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getSurplusQueuedTaskCount()"/> 
-        /// </summary>
-        public static int SurplusQueuedTaskCount
-        {
-            get { return SExecuteWithSignature<int>(LocalBridgeClazz, "getSurplusQueuedTaskCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public static Java.Util.Collection<T> InvokeAll<T>(Java.Util.Collection<T> arg0)
         {
-            return SExecuteWithSignature<Java.Util.Collection<T>>(LocalBridgeClazz, "invokeAll", "(Ljava/util/Collection;)Ljava/util/Collection;", arg0);
+            return SExecute<Java.Util.Collection<T>>(LocalBridgeClazz, "invokeAll", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#adapt(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#adapt(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -405,18 +390,18 @@ public static Java.Util.Concurrent.ForkJoinTask<T> Adapt<T>(Java.Lang.Runnable a
             return SExecute<Java.Util.Concurrent.ForkJoinTask<T>>(LocalBridgeClazz, "adapt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#adapt(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#adapt(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.ForkJoinTask"/></returns>
-        public static Java.Util.Concurrent.ForkJoinTask<T> Adapt<T, Arg0ExtendsT>(Java.Util.Concurrent.Callable<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public static Java.Util.Concurrent.ForkJoinTask<T> Adapt<T, Arg0ExtendsT>(Java.Util.Concurrent.Callable<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinTask<T>>(LocalBridgeClazz, "adapt", "(Ljava/util/concurrent/Callable;)Ljava/util/concurrent/ForkJoinTask;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#inForkJoinPool()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#inForkJoinPool()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public static bool InForkJoinPool()
@@ -424,7 +409,31 @@ public static bool InForkJoinPool()
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "inForkJoinPool", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#adapt(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getQueuedTaskCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int GetQueuedTaskCount()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getQueuedTaskCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getSurplusQueuedTaskCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public static int GetSurplusQueuedTaskCount()
+        {
+            return SExecuteWithSignature<int>(LocalBridgeClazz, "getSurplusQueuedTaskCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getPool()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.ForkJoinPool"/></returns>
+        public static Java.Util.Concurrent.ForkJoinPool GetPool()
+        {
+            return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool>(LocalBridgeClazz, "getPool", "()Ljava/util/concurrent/ForkJoinPool;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#adapt(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Concurrent.ForkJoinTask"/></returns>
@@ -433,14 +442,14 @@ public static Java.Util.Concurrent.ForkJoinTask<object> Adapt(Java.Lang.Runnable
             return SExecuteWithSignature<Java.Util.Concurrent.ForkJoinTask<object>>(LocalBridgeClazz, "adapt", "(Ljava/lang/Runnable;)Ljava/util/concurrent/ForkJoinTask;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#helpQuiesce()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#helpQuiesce()"/>
         /// </summary>
         public static void HelpQuiesce()
         {
             SExecuteWithSignature(LocalBridgeClazz, "helpQuiesce", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.concurrent.ForkJoinTask,java.util.concurrent.ForkJoinTask)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.concurrent.ForkJoinTask,java.util.concurrent.ForkJoinTask)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
@@ -449,7 +458,7 @@ public static void InvokeAll(Java.Util.Concurrent.ForkJoinTask<object> arg0, Jav
             SExecute(LocalBridgeClazz, "invokeAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.concurrent.ForkJoinTask[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#invokeAll(java.util.concurrent.ForkJoinTask[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.ForkJoinTask"/></param>
         public static void InvokeAll(params Java.Util.Concurrent.ForkJoinTask<object>[] arg0)
@@ -461,28 +470,15 @@ public static void InvokeAll(params Java.Util.Concurrent.ForkJoinTask<object>[]
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getException()"/> 
-        /// </summary>
-        public Java.Lang.Throwable Exception
-        {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getException", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getForkJoinTaskTag()"/> 
-        /// </summary>
-        public short ForkJoinTaskTag
-        {
-            get { return IExecuteWithSignature<short>("getForkJoinTaskTag", "()S"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#getRawResult()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getRawResult()"/>
         /// </summary>
-        public V RawResult
+        /// <returns><typeparamref name="V"/></returns>
+        public V GetRawResult()
         {
-            get { return IExecuteWithSignature<V>("getRawResult", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<V>("getRawResult", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#cancel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -491,7 +487,7 @@ public bool Cancel(bool arg0)
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#tryUnfork()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#tryUnfork()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool TryUnfork()
@@ -499,7 +495,7 @@ public bool TryUnfork()
             return IExecuteWithSignature<bool>("tryUnfork", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#compareAndSetForkJoinTaskTag(short,short)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#compareAndSetForkJoinTaskTag(short,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -509,7 +505,7 @@ public bool CompareAndSetForkJoinTaskTag(short arg0, short arg1)
             return IExecute<bool>("compareAndSetForkJoinTaskTag", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCancelled()
@@ -517,7 +513,7 @@ public bool IsCancelled()
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#isCompletedAbnormally()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#isCompletedAbnormally()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCompletedAbnormally()
@@ -525,7 +521,7 @@ public bool IsCompletedAbnormally()
             return IExecuteWithSignature<bool>("isCompletedAbnormally", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#isCompletedNormally()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#isCompletedNormally()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCompletedNormally()
@@ -533,7 +529,7 @@ public bool IsCompletedNormally()
             return IExecuteWithSignature<bool>("isCompletedNormally", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#isDone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#isDone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDone()
@@ -541,7 +537,15 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#fork()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getException()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Throwable"/></returns>
+        public Java.Lang.Throwable GetException()
+        {
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getException", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#fork()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ForkJoinTask"/></returns>
         public Java.Util.Concurrent.ForkJoinTask<V> Fork()
@@ -549,7 +553,15 @@ public Java.Util.Concurrent.ForkJoinTask<V> Fork()
             return IExecuteWithSignature<Java.Util.Concurrent.ForkJoinTask<V>>("fork", "()Ljava/util/concurrent/ForkJoinTask;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#setForkJoinTaskTag(short)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#getForkJoinTaskTag()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        public short GetForkJoinTaskTag()
+        {
+            return IExecuteWithSignature<short>("getForkJoinTaskTag", "()S");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#setForkJoinTaskTag(short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <returns><see cref="short"/></returns>
@@ -558,7 +570,7 @@ public short SetForkJoinTaskTag(short arg0)
             return IExecuteWithSignature<short>("setForkJoinTaskTag", "(S)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="V"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -568,7 +580,7 @@ public V Get()
             return IExecuteWithSignature<V>("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#get(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#get(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -581,7 +593,7 @@ public V Get(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<V>("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#invoke()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#invoke()"/>
         /// </summary>
         /// <returns><typeparamref name="V"/></returns>
         public V Invoke()
@@ -589,7 +601,7 @@ public V Invoke()
             return IExecuteWithSignature<V>("invoke", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#join()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#join()"/>
         /// </summary>
         /// <returns><typeparamref name="V"/></returns>
         public V Join()
@@ -597,28 +609,28 @@ public V Join()
             return IExecuteWithSignature<V>("join", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#quietlyComplete()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#quietlyComplete()"/>
         /// </summary>
         public void QuietlyComplete()
         {
             IExecuteWithSignature("quietlyComplete", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#quietlyInvoke()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#quietlyInvoke()"/>
         /// </summary>
         public void QuietlyInvoke()
         {
             IExecuteWithSignature("quietlyInvoke", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#quietlyJoin()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#quietlyJoin()"/>
         /// </summary>
         public void QuietlyJoin()
         {
             IExecuteWithSignature("quietlyJoin", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#complete(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#complete(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="V"/></param>
         public void Complete(V arg0)
@@ -626,7 +638,7 @@ public void Complete(V arg0)
             IExecuteWithSignature("complete", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#completeExceptionally(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#completeExceptionally(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         public void CompleteExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
@@ -634,7 +646,7 @@ public void CompleteExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException a
             IExecuteWithSignature("completeExceptionally", "(Ljava/lang/Throwable;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinTask.html#reinitialize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinTask.html#reinitialize()"/>
         /// </summary>
         public void Reinitialize()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinWorkerThread.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinWorkerThread.cs
index 8a45dcc77..3eb273dd3 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinWorkerThread.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ForkJoinWorkerThread.cs
@@ -46,18 +46,20 @@ public partial class ForkJoinWorkerThread
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinWorkerThread.html#getPool()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinWorkerThread.html#getPoolIndex()"/>
         /// </summary>
-        public Java.Util.Concurrent.ForkJoinPool Pool
+        /// <returns><see cref="int"/></returns>
+        public int GetPoolIndex()
         {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool>("getPool", "()Ljava/util/concurrent/ForkJoinPool;"); }
+            return IExecuteWithSignature<int>("getPoolIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ForkJoinWorkerThread.html#getPoolIndex()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ForkJoinWorkerThread.html#getPool()"/>
         /// </summary>
-        public int PoolIndex
+        /// <returns><see cref="Java.Util.Concurrent.ForkJoinPool"/></returns>
+        public Java.Util.Concurrent.ForkJoinPool GetPool()
         {
-            get { return IExecuteWithSignature<int>("getPoolIndex", "()I"); }
+            return IExecuteWithSignature<Java.Util.Concurrent.ForkJoinPool>("getPool", "()Ljava/util/concurrent/ForkJoinPool;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Future.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Future.cs
index cbb8f96bd..2011fd5b7 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Future.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Future.cs
@@ -46,7 +46,7 @@ public partial class Future
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#cancel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -55,7 +55,7 @@ public bool Cancel(bool arg0)
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCancelled()
@@ -63,7 +63,7 @@ public bool IsCancelled()
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#isDone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#isDone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDone()
@@ -71,7 +71,7 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -81,7 +81,7 @@ public object Get()
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#get(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#get(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -147,7 +147,7 @@ public partial class Future<V> : Java.Util.Concurrent.IFuture<V>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#cancel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -156,7 +156,7 @@ public bool Cancel(bool arg0)
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCancelled()
@@ -164,7 +164,7 @@ public bool IsCancelled()
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#isDone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#isDone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDone()
@@ -172,7 +172,7 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="V"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -182,7 +182,7 @@ public V Get()
             return IExecuteWithSignature<V>("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Future.html#get(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Future.html#get(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/FutureTask.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/FutureTask.cs
index d4e3bd0e0..34719b781 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/FutureTask.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/FutureTask.cs
@@ -30,7 +30,7 @@ public partial class FutureTask
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#%3Cinit%3E(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#%3Cinit%3E(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -39,7 +39,7 @@ public FutureTask(Java.Lang.Runnable arg0, object arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#%3Cinit%3E(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#%3Cinit%3E(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         public FutureTask(Java.Util.Concurrent.Callable arg0)
@@ -63,7 +63,7 @@ public FutureTask(Java.Util.Concurrent.Callable arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#cancel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -72,7 +72,7 @@ public bool Cancel(bool arg0)
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCancelled()
@@ -80,7 +80,7 @@ public bool IsCancelled()
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#isDone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#isDone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDone()
@@ -88,7 +88,7 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -98,7 +98,7 @@ public object Get()
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#get(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#get(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -111,7 +111,7 @@ public object Get(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#run()"/>
         /// </summary>
         public void Run()
         {
@@ -133,7 +133,7 @@ public partial class FutureTask<V>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#%3Cinit%3E(java.lang.Runnable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#%3Cinit%3E(java.lang.Runnable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -142,7 +142,7 @@ public FutureTask(Java.Lang.Runnable arg0, V arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#%3Cinit%3E(java.util.concurrent.Callable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#%3Cinit%3E(java.util.concurrent.Callable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         public FutureTask(Java.Util.Concurrent.Callable<V> arg0)
@@ -170,7 +170,7 @@ public FutureTask(Java.Util.Concurrent.Callable<V> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#cancel(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#cancel(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -179,7 +179,7 @@ public bool Cancel(bool arg0)
             return IExecuteWithSignature<bool>("cancel", "(Z)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#isCancelled()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#isCancelled()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCancelled()
@@ -187,7 +187,7 @@ public bool IsCancelled()
             return IExecuteWithSignature<bool>("isCancelled", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#isDone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#isDone()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDone()
@@ -195,7 +195,7 @@ public bool IsDone()
             return IExecuteWithSignature<bool>("isDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="V"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -205,7 +205,7 @@ public V Get()
             return IExecuteWithSignature<V>("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#get(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#get(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -218,7 +218,7 @@ public V Get(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<V>("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/FutureTask.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/FutureTask.html#run()"/>
         /// </summary>
         public void Run()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedBlockingDeque.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedBlockingDeque.cs
index 849e27565..cd2362f83 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedBlockingDeque.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedBlockingDeque.cs
@@ -30,7 +30,7 @@ public partial class LinkedBlockingDeque
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public LinkedBlockingDeque(int arg0)
@@ -38,7 +38,7 @@ public LinkedBlockingDeque(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedBlockingDeque(Java.Util.Collection arg0)
@@ -70,21 +70,7 @@ public LinkedBlockingDeque(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#getFirst()"/> 
-        /// </summary>
-        public object First
-        {
-            get { return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#getLast()"/> 
-        /// </summary>
-        public object Last
-        {
-            get { return IExecuteWithSignature("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -96,7 +82,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offerFirst(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offerFirst(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -108,7 +94,7 @@ public bool OfferFirst(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg
             return IExecute<bool>("offerFirst", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -117,7 +103,7 @@ public bool OfferFirst(object arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offerLast(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offerLast(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -129,7 +115,7 @@ public bool OfferLast(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2
             return IExecute<bool>("offerLast", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -138,7 +124,7 @@ public bool OfferLast(object arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -147,7 +133,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -156,7 +142,23 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#getFirst()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetFirst()
+        {
+            return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#getLast()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetLast()
+        {
+            return IExecuteWithSignature("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#peekFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekFirst()
@@ -164,7 +166,7 @@ public object PeekFirst()
             return IExecuteWithSignature("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#peekLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekLast()
@@ -172,7 +174,7 @@ public object PeekLast()
             return IExecuteWithSignature("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -183,7 +185,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pollFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollFirst()
@@ -191,7 +193,7 @@ public object PollFirst()
             return IExecuteWithSignature("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pollFirst(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pollFirst(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -202,7 +204,7 @@ public object PollFirst(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("pollFirst", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pollLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollLast()
@@ -210,7 +212,7 @@ public object PollLast()
             return IExecuteWithSignature("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pollLast(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pollLast(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -221,7 +223,7 @@ public object PollLast(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("pollLast", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pop()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Pop()
@@ -229,7 +231,7 @@ public object Pop()
             return IExecuteWithSignature("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#removeFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveFirst()
@@ -237,7 +239,7 @@ public object RemoveFirst()
             return IExecuteWithSignature("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#removeLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveLast()
@@ -245,7 +247,7 @@ public object RemoveLast()
             return IExecuteWithSignature("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -254,7 +256,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#takeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#takeFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -263,7 +265,7 @@ public object TakeFirst()
             return IExecuteWithSignature("takeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#takeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#takeLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -272,7 +274,7 @@ public object TakeLast()
             return IExecuteWithSignature("takeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -282,7 +284,7 @@ public int DrainTo(Java.Util.Collection arg0, int arg1)
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -291,7 +293,7 @@ public int DrainTo(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -299,7 +301,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator DescendingIterator()
@@ -307,7 +309,7 @@ public Java.Util.Iterator DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddFirst(object arg0)
@@ -315,7 +317,7 @@ public void AddFirst(object arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddLast(object arg0)
@@ -323,7 +325,7 @@ public void AddLast(object arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Push(object arg0)
@@ -331,7 +333,7 @@ public void Push(object arg0)
             IExecuteWithSignature("push", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -340,7 +342,7 @@ public void Put(object arg0)
             IExecuteWithSignature("put", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#putFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#putFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -349,7 +351,7 @@ public void PutFirst(object arg0)
             IExecuteWithSignature("putFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#putLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#putLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -373,7 +375,7 @@ public partial class LinkedBlockingDeque<E> : Java.Util.Concurrent.IBlockingDequ
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public LinkedBlockingDeque(int arg0)
@@ -381,7 +383,7 @@ public LinkedBlockingDeque(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedBlockingDeque(Java.Util.Collection<E> arg0)
@@ -417,21 +419,7 @@ public LinkedBlockingDeque(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#getFirst()"/> 
-        /// </summary>
-        public E First
-        {
-            get { return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#getLast()"/> 
-        /// </summary>
-        public E Last
-        {
-            get { return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -443,7 +431,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offerFirst(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offerFirst(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -455,7 +443,7 @@ public bool OfferFirst(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offerFirst", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -464,7 +452,7 @@ public bool OfferFirst(E arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offerLast(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offerLast(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -476,7 +464,7 @@ public bool OfferLast(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offerLast", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -485,7 +473,7 @@ public bool OfferLast(E arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -494,7 +482,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -503,7 +491,23 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#getFirst()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetFirst()
+        {
+            return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#getLast()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetLast()
+        {
+            return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#peekFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekFirst()
@@ -511,7 +515,7 @@ public E PeekFirst()
             return IExecuteWithSignature<E>("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#peekLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekLast()
@@ -519,7 +523,7 @@ public E PeekLast()
             return IExecuteWithSignature<E>("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -530,7 +534,7 @@ public E Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pollFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollFirst()
@@ -538,7 +542,7 @@ public E PollFirst()
             return IExecuteWithSignature<E>("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pollFirst(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pollFirst(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -549,7 +553,7 @@ public E PollFirst(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("pollFirst", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pollLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollLast()
@@ -557,7 +561,7 @@ public E PollLast()
             return IExecuteWithSignature<E>("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pollLast(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pollLast(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -568,7 +572,7 @@ public E PollLast(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("pollLast", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#pop()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Pop()
@@ -576,7 +580,7 @@ public E Pop()
             return IExecuteWithSignature<E>("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#removeFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveFirst()
@@ -584,7 +588,7 @@ public E RemoveFirst()
             return IExecuteWithSignature<E>("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#removeLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveLast()
@@ -592,7 +596,7 @@ public E RemoveLast()
             return IExecuteWithSignature<E>("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#take()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -601,7 +605,7 @@ public E Take()
             return IExecuteWithSignature<E>("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#takeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#takeFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -610,7 +614,7 @@ public E TakeFirst()
             return IExecuteWithSignature<E>("takeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#takeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#takeLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -619,28 +623,28 @@ public E TakeLast()
             return IExecuteWithSignature<E>("takeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE : E
         {
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -648,7 +652,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> DescendingIterator()
@@ -656,7 +660,7 @@ public Java.Util.Iterator<E> DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddFirst(E arg0)
@@ -664,7 +668,7 @@ public void AddFirst(E arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddLast(E arg0)
@@ -672,7 +676,7 @@ public void AddLast(E arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Push(E arg0)
@@ -680,7 +684,7 @@ public void Push(E arg0)
             IExecuteWithSignature("push", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -689,7 +693,7 @@ public void Put(E arg0)
             IExecuteWithSignature("put", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#putFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#putFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -698,7 +702,7 @@ public void PutFirst(E arg0)
             IExecuteWithSignature("putFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingDeque.html#putLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingDeque.html#putLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedBlockingQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedBlockingQueue.cs
index 93f7d2c15..c86eac61b 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedBlockingQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedBlockingQueue.cs
@@ -30,7 +30,7 @@ public partial class LinkedBlockingQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public LinkedBlockingQueue(int arg0)
@@ -38,7 +38,7 @@ public LinkedBlockingQueue(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedBlockingQueue(Java.Util.Collection arg0)
@@ -70,7 +70,7 @@ public LinkedBlockingQueue(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -82,7 +82,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -93,7 +93,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -102,7 +102,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -112,7 +112,7 @@ public int DrainTo(Java.Util.Collection arg0, int arg1)
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -121,7 +121,7 @@ public int DrainTo(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -129,7 +129,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -153,7 +153,7 @@ public partial class LinkedBlockingQueue<E> : Java.Util.Concurrent.IBlockingQueu
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public LinkedBlockingQueue(int arg0)
@@ -161,7 +161,7 @@ public LinkedBlockingQueue(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedBlockingQueue(Java.Util.Collection<E> arg0)
@@ -197,7 +197,7 @@ public LinkedBlockingQueue(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -209,7 +209,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -220,7 +220,7 @@ public E Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#take()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -229,28 +229,28 @@ public E Take()
             return IExecuteWithSignature<E>("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE : E
         {
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -258,7 +258,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedBlockingQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedBlockingQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedTransferQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedTransferQueue.cs
index f964eb26c..a583ceaab 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedTransferQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/LinkedTransferQueue.cs
@@ -30,7 +30,7 @@ public partial class LinkedTransferQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedTransferQueue(Java.Util.Collection arg0)
@@ -62,14 +62,7 @@ public LinkedTransferQueue(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#getWaitingConsumerCount()"/> 
-        /// </summary>
-        public int WaitingConsumerCount
-        {
-            get { return IExecuteWithSignature<int>("getWaitingConsumerCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#hasWaitingConsumer()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#hasWaitingConsumer()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasWaitingConsumer()
@@ -77,7 +70,7 @@ public bool HasWaitingConsumer()
             return IExecuteWithSignature<bool>("hasWaitingConsumer", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -88,7 +81,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#tryTransfer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#tryTransfer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -100,7 +93,7 @@ public bool TryTransfer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit ar
             return IExecute<bool>("tryTransfer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#tryTransfer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#tryTransfer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -109,7 +102,7 @@ public bool TryTransfer(object arg0)
             return IExecuteWithSignature<bool>("tryTransfer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -120,7 +113,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -129,7 +122,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -139,7 +132,7 @@ public int DrainTo(Java.Util.Collection arg0, int arg1)
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -148,7 +141,15 @@ public int DrainTo(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#getWaitingConsumerCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWaitingConsumerCount()
+        {
+            return IExecuteWithSignature<int>("getWaitingConsumerCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -156,7 +157,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Put(object arg0)
@@ -164,7 +165,7 @@ public void Put(object arg0)
             IExecuteWithSignature("put", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#transfer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#transfer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -188,7 +189,7 @@ public partial class LinkedTransferQueue<E> : Java.Util.Concurrent.ITransferQueu
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedTransferQueue(Java.Util.Collection<E> arg0)
@@ -224,14 +225,7 @@ public LinkedTransferQueue(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#getWaitingConsumerCount()"/> 
-        /// </summary>
-        public int WaitingConsumerCount
-        {
-            get { return IExecuteWithSignature<int>("getWaitingConsumerCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#hasWaitingConsumer()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#hasWaitingConsumer()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasWaitingConsumer()
@@ -239,7 +233,7 @@ public bool HasWaitingConsumer()
             return IExecuteWithSignature<bool>("hasWaitingConsumer", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -250,7 +244,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#tryTransfer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#tryTransfer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -262,7 +256,7 @@ public bool TryTransfer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("tryTransfer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#tryTransfer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#tryTransfer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -271,7 +265,7 @@ public bool TryTransfer(E arg0)
             return IExecuteWithSignature<bool>("tryTransfer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -282,7 +276,7 @@ public E Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#take()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -291,28 +285,36 @@ public E Take()
             return IExecuteWithSignature<E>("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE : E
         {
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#getWaitingConsumerCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWaitingConsumerCount()
+        {
+            return IExecuteWithSignature<int>("getWaitingConsumerCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -320,7 +322,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Put(E arg0)
@@ -328,7 +330,7 @@ public void Put(E arg0)
             IExecuteWithSignature("put", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/LinkedTransferQueue.html#transfer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/LinkedTransferQueue.html#transfer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AbstractQueuedLongSynchronizer.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AbstractQueuedLongSynchronizer.cs
index 3b6023948..035785f4b 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AbstractQueuedLongSynchronizer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AbstractQueuedLongSynchronizer.cs
@@ -46,42 +46,7 @@ public partial class AbstractQueuedLongSynchronizer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getExclusiveQueuedThreads()"/> 
-        /// </summary>
-        public Java.Util.Collection<Java.Lang.Thread> ExclusiveQueuedThreads
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getExclusiveQueuedThreads", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getFirstQueuedThread()"/> 
-        /// </summary>
-        public Java.Lang.Thread FirstQueuedThread
-        {
-            get { return IExecuteWithSignature<Java.Lang.Thread>("getFirstQueuedThread", "()Ljava/lang/Thread;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getQueuedThreads()"/> 
-        /// </summary>
-        public Java.Util.Collection<Java.Lang.Thread> QueuedThreads
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getQueuedThreads", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getQueueLength()"/> 
-        /// </summary>
-        public int QueueLength
-        {
-            get { return IExecuteWithSignature<int>("getQueueLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getSharedQueuedThreads()"/> 
-        /// </summary>
-        public Java.Util.Collection<Java.Lang.Thread> SharedQueuedThreads
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getSharedQueuedThreads", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#hasContended()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#hasContended()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasContended()
@@ -89,7 +54,7 @@ public bool HasContended()
             return IExecuteWithSignature<bool>("hasContended", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#hasQueuedPredecessors()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#hasQueuedPredecessors()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasQueuedPredecessors()
@@ -97,7 +62,7 @@ public bool HasQueuedPredecessors()
             return IExecuteWithSignature<bool>("hasQueuedPredecessors", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#hasQueuedThreads()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#hasQueuedThreads()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasQueuedThreads()
@@ -105,7 +70,7 @@ public bool HasQueuedThreads()
             return IExecuteWithSignature<bool>("hasQueuedThreads", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#hasWaiters(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#hasWaiters(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer.ConditionObject"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -114,7 +79,7 @@ public bool HasWaiters(Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer
             return IExecuteWithSignature<bool>("hasWaiters", "(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#isQueued(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#isQueued(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -123,7 +88,7 @@ public bool IsQueued(Java.Lang.Thread arg0)
             return IExecuteWithSignature<bool>("isQueued", "(Ljava/lang/Thread;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#owns(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#owns(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer.ConditionObject"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -132,7 +97,7 @@ public bool Owns(Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer.Condi
             return IExecuteWithSignature<bool>("owns", "(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#release(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#release(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -141,7 +106,7 @@ public bool Release(long arg0)
             return IExecuteWithSignature<bool>("release", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#releaseShared(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#releaseShared(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -150,7 +115,7 @@ public bool ReleaseShared(long arg0)
             return IExecuteWithSignature<bool>("releaseShared", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#tryAcquireNanos(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#tryAcquireNanos(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -161,7 +126,7 @@ public bool TryAcquireNanos(long arg0, long arg1)
             return IExecute<bool>("tryAcquireNanos", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#tryAcquireSharedNanos(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#tryAcquireSharedNanos(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -172,7 +137,15 @@ public bool TryAcquireSharedNanos(long arg0, long arg1)
             return IExecute<bool>("tryAcquireSharedNanos", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getWaitQueueLength(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getQueueLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetQueueLength()
+        {
+            return IExecuteWithSignature<int>("getQueueLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getWaitQueueLength(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer.ConditionObject"/></param>
         /// <returns><see cref="int"/></returns>
@@ -181,7 +154,39 @@ public int GetWaitQueueLength(Java.Util.Concurrent.Locks.AbstractQueuedLongSynch
             return IExecuteWithSignature<int>("getWaitQueueLength", "(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getWaitingThreads(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getFirstQueuedThread()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Thread"/></returns>
+        public Java.Lang.Thread GetFirstQueuedThread()
+        {
+            return IExecuteWithSignature<Java.Lang.Thread>("getFirstQueuedThread", "()Ljava/lang/Thread;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getExclusiveQueuedThreads()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Lang.Thread> GetExclusiveQueuedThreads()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getExclusiveQueuedThreads", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getQueuedThreads()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Lang.Thread> GetQueuedThreads()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getQueuedThreads", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getSharedQueuedThreads()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Lang.Thread> GetSharedQueuedThreads()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getSharedQueuedThreads", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#getWaitingThreads(java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer.ConditionObject"/></param>
         /// <returns><see cref="Java.Util.Collection"/></returns>
@@ -190,7 +195,7 @@ public int GetWaitQueueLength(Java.Util.Concurrent.Locks.AbstractQueuedLongSynch
             return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getWaitingThreads", "(Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#acquire(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#acquire(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Acquire(long arg0)
@@ -198,7 +203,7 @@ public void Acquire(long arg0)
             IExecuteWithSignature("acquire", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#acquireInterruptibly(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#acquireInterruptibly(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -207,7 +212,7 @@ public void AcquireInterruptibly(long arg0)
             IExecuteWithSignature("acquireInterruptibly", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#acquireShared(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#acquireShared(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void AcquireShared(long arg0)
@@ -215,7 +220,7 @@ public void AcquireShared(long arg0)
             IExecuteWithSignature("acquireShared", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#acquireSharedInterruptibly(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html#acquireSharedInterruptibly(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -232,7 +237,7 @@ public partial class ConditionObject : Java.Util.Concurrent.Locks.ICondition, Ja
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#%3Cinit%3E(java.util.concurrent.locks.AbstractQueuedLongSynchronizer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#%3Cinit%3E(java.util.concurrent.locks.AbstractQueuedLongSynchronizer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer"/></param>
             public ConditionObject(Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer arg0)
@@ -264,7 +269,7 @@ public ConditionObject(Java.Util.Concurrent.Locks.AbstractQueuedLongSynchronizer
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#await(long,java.util.concurrent.TimeUnit)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#await(long,java.util.concurrent.TimeUnit)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -275,7 +280,7 @@ public bool Await(long arg0, Java.Util.Concurrent.TimeUnit arg1)
                 return IExecute<bool>("await", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#awaitUntil(java.util.Date)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#awaitUntil(java.util.Date)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Date"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -285,7 +290,7 @@ public bool AwaitUntil(Java.Util.Date arg0)
                 return IExecuteWithSignature<bool>("awaitUntil", "(Ljava/util/Date;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#awaitNanos(long)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#awaitNanos(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <returns><see cref="long"/></returns>
@@ -295,7 +300,7 @@ public long AwaitNanos(long arg0)
                 return IExecuteWithSignature<long>("awaitNanos", "(J)J", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#await()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#await()"/>
             /// </summary>
             /// <exception cref="Java.Lang.InterruptedException"/>
             public void Await()
@@ -303,21 +308,21 @@ public void Await()
                 IExecuteWithSignature("await", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#awaitUninterruptibly()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#awaitUninterruptibly()"/>
             /// </summary>
             public void AwaitUninterruptibly()
             {
                 IExecuteWithSignature("awaitUninterruptibly", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#signal()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#signal()"/>
             /// </summary>
             public void Signal()
             {
                 IExecuteWithSignature("signal", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#signalAll()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html#signalAll()"/>
             /// </summary>
             public void SignalAll()
             {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AbstractQueuedSynchronizer.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AbstractQueuedSynchronizer.cs
index f7a6a3c40..7033608a7 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AbstractQueuedSynchronizer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AbstractQueuedSynchronizer.cs
@@ -46,42 +46,7 @@ public partial class AbstractQueuedSynchronizer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getExclusiveQueuedThreads()"/> 
-        /// </summary>
-        public Java.Util.Collection<Java.Lang.Thread> ExclusiveQueuedThreads
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getExclusiveQueuedThreads", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getFirstQueuedThread()"/> 
-        /// </summary>
-        public Java.Lang.Thread FirstQueuedThread
-        {
-            get { return IExecuteWithSignature<Java.Lang.Thread>("getFirstQueuedThread", "()Ljava/lang/Thread;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getQueuedThreads()"/> 
-        /// </summary>
-        public Java.Util.Collection<Java.Lang.Thread> QueuedThreads
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getQueuedThreads", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getQueueLength()"/> 
-        /// </summary>
-        public int QueueLength
-        {
-            get { return IExecuteWithSignature<int>("getQueueLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getSharedQueuedThreads()"/> 
-        /// </summary>
-        public Java.Util.Collection<Java.Lang.Thread> SharedQueuedThreads
-        {
-            get { return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getSharedQueuedThreads", "()Ljava/util/Collection;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#hasContended()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#hasContended()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasContended()
@@ -89,7 +54,7 @@ public bool HasContended()
             return IExecuteWithSignature<bool>("hasContended", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#hasQueuedPredecessors()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#hasQueuedPredecessors()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasQueuedPredecessors()
@@ -97,7 +62,7 @@ public bool HasQueuedPredecessors()
             return IExecuteWithSignature<bool>("hasQueuedPredecessors", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#hasQueuedThreads()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#hasQueuedThreads()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasQueuedThreads()
@@ -105,7 +70,7 @@ public bool HasQueuedThreads()
             return IExecuteWithSignature<bool>("hasQueuedThreads", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#hasWaiters(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#hasWaiters(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer.ConditionObject"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -114,7 +79,7 @@ public bool HasWaiters(Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer.Con
             return IExecuteWithSignature<bool>("hasWaiters", "(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#isQueued(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#isQueued(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -123,7 +88,7 @@ public bool IsQueued(Java.Lang.Thread arg0)
             return IExecuteWithSignature<bool>("isQueued", "(Ljava/lang/Thread;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#owns(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#owns(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer.ConditionObject"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -132,7 +97,7 @@ public bool Owns(Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer.Condition
             return IExecuteWithSignature<bool>("owns", "(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#release(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#release(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -141,7 +106,7 @@ public bool Release(int arg0)
             return IExecuteWithSignature<bool>("release", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#releaseShared(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#releaseShared(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -150,7 +115,7 @@ public bool ReleaseShared(int arg0)
             return IExecuteWithSignature<bool>("releaseShared", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#tryAcquireNanos(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#tryAcquireNanos(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -161,7 +126,7 @@ public bool TryAcquireNanos(int arg0, long arg1)
             return IExecute<bool>("tryAcquireNanos", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#tryAcquireSharedNanos(int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#tryAcquireSharedNanos(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -172,7 +137,15 @@ public bool TryAcquireSharedNanos(int arg0, long arg1)
             return IExecute<bool>("tryAcquireSharedNanos", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getWaitQueueLength(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getQueueLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetQueueLength()
+        {
+            return IExecuteWithSignature<int>("getQueueLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getWaitQueueLength(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer.ConditionObject"/></param>
         /// <returns><see cref="int"/></returns>
@@ -181,7 +154,39 @@ public int GetWaitQueueLength(Java.Util.Concurrent.Locks.AbstractQueuedSynchroni
             return IExecuteWithSignature<int>("getWaitQueueLength", "(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getWaitingThreads(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getFirstQueuedThread()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Thread"/></returns>
+        public Java.Lang.Thread GetFirstQueuedThread()
+        {
+            return IExecuteWithSignature<Java.Lang.Thread>("getFirstQueuedThread", "()Ljava/lang/Thread;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getExclusiveQueuedThreads()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Lang.Thread> GetExclusiveQueuedThreads()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getExclusiveQueuedThreads", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getQueuedThreads()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Lang.Thread> GetQueuedThreads()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getQueuedThreads", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getSharedQueuedThreads()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Java.Lang.Thread> GetSharedQueuedThreads()
+        {
+            return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getSharedQueuedThreads", "()Ljava/util/Collection;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#getWaitingThreads(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer.ConditionObject"/></param>
         /// <returns><see cref="Java.Util.Collection"/></returns>
@@ -190,7 +195,7 @@ public int GetWaitQueueLength(Java.Util.Concurrent.Locks.AbstractQueuedSynchroni
             return IExecuteWithSignature<Java.Util.Collection<Java.Lang.Thread>>("getWaitingThreads", "(Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;)Ljava/util/Collection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#acquire(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#acquire(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Acquire(int arg0)
@@ -198,7 +203,7 @@ public void Acquire(int arg0)
             IExecuteWithSignature("acquire", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#acquireInterruptibly(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#acquireInterruptibly(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -207,7 +212,7 @@ public void AcquireInterruptibly(int arg0)
             IExecuteWithSignature("acquireInterruptibly", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#acquireShared(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#acquireShared(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void AcquireShared(int arg0)
@@ -215,7 +220,7 @@ public void AcquireShared(int arg0)
             IExecuteWithSignature("acquireShared", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#acquireSharedInterruptibly(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html#acquireSharedInterruptibly(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -232,7 +237,7 @@ public partial class ConditionObject : Java.Util.Concurrent.Locks.ICondition, Ja
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#%3Cinit%3E(java.util.concurrent.locks.AbstractQueuedSynchronizer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#%3Cinit%3E(java.util.concurrent.locks.AbstractQueuedSynchronizer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer"/></param>
             public ConditionObject(Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer arg0)
@@ -264,7 +269,7 @@ public ConditionObject(Java.Util.Concurrent.Locks.AbstractQueuedSynchronizer arg
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#await(long,java.util.concurrent.TimeUnit)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#await(long,java.util.concurrent.TimeUnit)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -275,7 +280,7 @@ public bool Await(long arg0, Java.Util.Concurrent.TimeUnit arg1)
                 return IExecute<bool>("await", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#awaitUntil(java.util.Date)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#awaitUntil(java.util.Date)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Date"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -285,7 +290,7 @@ public bool AwaitUntil(Java.Util.Date arg0)
                 return IExecuteWithSignature<bool>("awaitUntil", "(Ljava/util/Date;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#awaitNanos(long)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#awaitNanos(long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <returns><see cref="long"/></returns>
@@ -295,7 +300,7 @@ public long AwaitNanos(long arg0)
                 return IExecuteWithSignature<long>("awaitNanos", "(J)J", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#await()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#await()"/>
             /// </summary>
             /// <exception cref="Java.Lang.InterruptedException"/>
             public void Await()
@@ -303,21 +308,21 @@ public void Await()
                 IExecuteWithSignature("await", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#awaitUninterruptibly()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#awaitUninterruptibly()"/>
             /// </summary>
             public void AwaitUninterruptibly()
             {
                 IExecuteWithSignature("awaitUninterruptibly", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#signal()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#signal()"/>
             /// </summary>
             public void Signal()
             {
                 IExecuteWithSignature("signal", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#signalAll()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html#signalAll()"/>
             /// </summary>
             public void SignalAll()
             {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AllPackageClasses.cs
index 9e05f2dd8..427a72623 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Concurrent.Locks
 {
     #region AbstractOwnableSynchronizer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractOwnableSynchronizer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractOwnableSynchronizer.html"/>
     /// </summary>
     public partial class AbstractOwnableSynchronizer : Java.Io.Serializable
     {
@@ -36,12 +36,12 @@ public partial class AbstractOwnableSynchronizer : Java.Io.Serializable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractOwnableSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractOwnableSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractOwnableSynchronizer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractOwnableSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractOwnableSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractOwnableSynchronizer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public AbstractOwnableSynchronizer(params object[] args) : base(args) { }
 
     #region AbstractQueuedLongSynchronizer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.html"/>
     /// </summary>
     public partial class AbstractQueuedLongSynchronizer : Java.Util.Concurrent.Locks.AbstractOwnableSynchronizer
     {
@@ -82,12 +82,12 @@ public partial class AbstractQueuedLongSynchronizer : Java.Util.Concurrent.Locks
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractQueuedLongSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractQueuedLongSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractQueuedLongSynchronizer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractQueuedLongSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractQueuedLongSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractQueuedLongSynchronizer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -116,7 +116,7 @@ public AbstractQueuedLongSynchronizer(params object[] args) : base(args) { }
         // TODO: complete the class
         #region ConditionObject
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.ConditionObject.html"/>
         /// </summary>
         public partial class ConditionObject : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ConditionObject>
         {
@@ -164,7 +164,7 @@ public ConditionObject(params object[] args) : base(args) { }
 
     #region AbstractQueuedSynchronizer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.html"/>
     /// </summary>
     public partial class AbstractQueuedSynchronizer : Java.Util.Concurrent.Locks.AbstractOwnableSynchronizer
     {
@@ -172,12 +172,12 @@ public partial class AbstractQueuedSynchronizer : Java.Util.Concurrent.Locks.Abs
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractQueuedSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractQueuedSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractQueuedSynchronizer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractQueuedSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractQueuedSynchronizer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractQueuedSynchronizer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -206,7 +206,7 @@ public AbstractQueuedSynchronizer(params object[] args) : base(args) { }
         // TODO: complete the class
         #region ConditionObject
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject.html"/>
         /// </summary>
         public partial class ConditionObject : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ConditionObject>
         {
@@ -254,7 +254,7 @@ public ConditionObject(params object[] args) : base(args) { }
 
     #region Condition
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Condition.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Condition.html"/>
     /// </summary>
     public partial class Condition : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Condition>
     {
@@ -262,12 +262,12 @@ public partial class Condition : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Conditi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Condition class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Condition class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Condition() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Condition class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Condition class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Condition(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -300,7 +300,7 @@ public Condition(params object[] args) : base(args) { }
 
     #region Lock
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Lock.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Lock.html"/>
     /// </summary>
     public partial class Lock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Lock>
     {
@@ -308,12 +308,12 @@ public partial class Lock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Lock>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Lock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Lock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Lock() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Lock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Lock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Lock(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -346,7 +346,7 @@ public Lock(params object[] args) : base(args) { }
 
     #region LockSupport
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html"/>
     /// </summary>
     public partial class LockSupport : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LockSupport>
     {
@@ -390,7 +390,7 @@ public LockSupport(params object[] args) : base(args) { }
 
     #region ReadWriteLock
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReadWriteLock.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReadWriteLock.html"/>
     /// </summary>
     public partial class ReadWriteLock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReadWriteLock>
     {
@@ -398,12 +398,12 @@ public partial class ReadWriteLock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Rea
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ReadWriteLock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReadWriteLock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReadWriteLock() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ReadWriteLock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ReadWriteLock class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ReadWriteLock(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -436,7 +436,7 @@ public ReadWriteLock(params object[] args) : base(args) { }
 
     #region ReentrantLock
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html"/>
     /// </summary>
     public partial class ReentrantLock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReentrantLock>
     {
@@ -480,7 +480,7 @@ public ReentrantLock(params object[] args) : base(args) { }
 
     #region ReentrantReadWriteLock
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html"/>
     /// </summary>
     public partial class ReentrantReadWriteLock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReentrantReadWriteLock>
     {
@@ -520,7 +520,7 @@ public ReentrantReadWriteLock(params object[] args) : base(args) { }
         // TODO: complete the class
         #region ReadLock
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html"/>
         /// </summary>
         public partial class ReadLock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ReadLock>
         {
@@ -564,7 +564,7 @@ public ReadLock(params object[] args) : base(args) { }
 
         #region WriteLock
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html"/>
         /// </summary>
         public partial class WriteLock : MASES.JCOBridge.C2JBridge.JVMBridgeBase<WriteLock>
         {
@@ -612,7 +612,7 @@ public WriteLock(params object[] args) : base(args) { }
 
     #region StampedLock
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html"/>
     /// </summary>
     public partial class StampedLock : Java.Io.Serializable
     {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/Condition.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/Condition.cs
index 93aa30878..9e5d15e13 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/Condition.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/Condition.cs
@@ -64,7 +64,7 @@ public partial class Condition : Java.Util.Concurrent.Locks.ICondition
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Condition.html#await(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Condition.html#await(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -75,7 +75,7 @@ public bool Await(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<bool>("await", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Condition.html#awaitUntil(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Condition.html#awaitUntil(java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -85,7 +85,7 @@ public bool AwaitUntil(Java.Util.Date arg0)
             return IExecuteWithSignature<bool>("awaitUntil", "(Ljava/util/Date;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Condition.html#awaitNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Condition.html#awaitNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -95,7 +95,7 @@ public long AwaitNanos(long arg0)
             return IExecuteWithSignature<long>("awaitNanos", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Condition.html#await()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Condition.html#await()"/>
         /// </summary>
         /// <exception cref="Java.Lang.InterruptedException"/>
         public void Await()
@@ -103,21 +103,21 @@ public void Await()
             IExecuteWithSignature("await", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Condition.html#awaitUninterruptibly()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Condition.html#awaitUninterruptibly()"/>
         /// </summary>
         public void AwaitUninterruptibly()
         {
             IExecuteWithSignature("awaitUninterruptibly", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Condition.html#signal()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Condition.html#signal()"/>
         /// </summary>
         public void Signal()
         {
             IExecuteWithSignature("signal", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Condition.html#signalAll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Condition.html#signalAll()"/>
         /// </summary>
         public void SignalAll()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/Lock.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/Lock.cs
index 19b41fbca..f33741424 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/Lock.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/Lock.cs
@@ -64,7 +64,7 @@ public partial class Lock : Java.Util.Concurrent.Locks.ILock
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Lock.html#tryLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Lock.html#tryLock()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool TryLock()
@@ -72,7 +72,7 @@ public bool TryLock()
             return IExecuteWithSignature<bool>("tryLock", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Lock.html#tryLock(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Lock.html#tryLock(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -83,7 +83,7 @@ public bool TryLock(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<bool>("tryLock", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Lock.html#newCondition()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Lock.html#newCondition()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.Condition"/></returns>
         public Java.Util.Concurrent.Locks.Condition NewCondition()
@@ -91,14 +91,14 @@ public Java.Util.Concurrent.Locks.Condition NewCondition()
             return IExecuteWithSignature<Java.Util.Concurrent.Locks.Condition>("newCondition", "()Ljava/util/concurrent/locks/Condition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Lock.html#lock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Lock.html#lock()"/>
         /// </summary>
         public void LockMethod()
         {
             IExecuteWithSignature("lock", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Lock.html#lockInterruptibly()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Lock.html#lockInterruptibly()"/>
         /// </summary>
         /// <exception cref="Java.Lang.InterruptedException"/>
         public void LockInterruptibly()
@@ -106,7 +106,7 @@ public void LockInterruptibly()
             IExecuteWithSignature("lockInterruptibly", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/Lock.html#unlock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/Lock.html#unlock()"/>
         /// </summary>
         public void Unlock()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/LockSupport.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/LockSupport.cs
index e7365a3e4..f30d63c4f 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/LockSupport.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/LockSupport.cs
@@ -42,7 +42,7 @@ public partial class LockSupport
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#getBlocker(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html#getBlocker(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <returns><see cref="object"/></returns>
@@ -51,14 +51,14 @@ public static object GetBlocker(Java.Lang.Thread arg0)
             return SExecuteWithSignature(LocalBridgeClazz, "getBlocker", "(Ljava/lang/Thread;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#park()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html#park()"/>
         /// </summary>
         public static void Park()
         {
             SExecuteWithSignature(LocalBridgeClazz, "park", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#park(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html#park(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public static void Park(object arg0)
@@ -66,7 +66,7 @@ public static void Park(object arg0)
             SExecuteWithSignature(LocalBridgeClazz, "park", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#parkNanos(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html#parkNanos(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -75,7 +75,7 @@ public static void ParkNanos(object arg0, long arg1)
             SExecute(LocalBridgeClazz, "parkNanos", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#parkNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html#parkNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public static void ParkNanos(long arg0)
@@ -83,7 +83,7 @@ public static void ParkNanos(long arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parkNanos", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#parkUntil(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html#parkUntil(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -92,7 +92,7 @@ public static void ParkUntil(object arg0, long arg1)
             SExecute(LocalBridgeClazz, "parkUntil", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#parkUntil(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html#parkUntil(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public static void ParkUntil(long arg0)
@@ -100,15 +100,7 @@ public static void ParkUntil(long arg0)
             SExecuteWithSignature(LocalBridgeClazz, "parkUntil", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#setCurrentBlocker(java.lang.Object)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
-        public static void SetCurrentBlocker(object arg0)
-        {
-            SExecuteWithSignature(LocalBridgeClazz, "setCurrentBlocker", "(Ljava/lang/Object;)V", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/LockSupport.html#unpark(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/LockSupport.html#unpark(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         public static void Unpark(Java.Lang.Thread arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReadWriteLock.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReadWriteLock.cs
index 369fb6e94..53f2e7586 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReadWriteLock.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReadWriteLock.cs
@@ -64,7 +64,7 @@ public partial class ReadWriteLock : Java.Util.Concurrent.Locks.IReadWriteLock
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReadWriteLock.html#readLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReadWriteLock.html#readLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.Lock"/></returns>
         public Java.Util.Concurrent.Locks.Lock ReadLock()
@@ -72,7 +72,7 @@ public Java.Util.Concurrent.Locks.Lock ReadLock()
             return IExecuteWithSignature<Java.Util.Concurrent.Locks.Lock>("readLock", "()Ljava/util/concurrent/locks/Lock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReadWriteLock.html#writeLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReadWriteLock.html#writeLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.Lock"/></returns>
         public Java.Util.Concurrent.Locks.Lock WriteLock()
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReentrantLock.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReentrantLock.cs
index 7745f958f..447c4a19b 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReentrantLock.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReentrantLock.cs
@@ -30,7 +30,7 @@ public partial class ReentrantLock : Java.Util.Concurrent.Locks.ILock, Java.Io.I
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#%3Cinit%3E(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public ReentrantLock(bool arg0)
@@ -62,21 +62,7 @@ public ReentrantLock(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#getHoldCount()"/> 
-        /// </summary>
-        public int HoldCount
-        {
-            get { return IExecuteWithSignature<int>("getHoldCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#getQueueLength()"/> 
-        /// </summary>
-        public int QueueLength
-        {
-            get { return IExecuteWithSignature<int>("getQueueLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#hasWaiters(java.util.concurrent.locks.Condition)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#hasWaiters(java.util.concurrent.locks.Condition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.Condition"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -85,7 +71,7 @@ public bool HasWaiters(Java.Util.Concurrent.Locks.Condition arg0)
             return IExecuteWithSignature<bool>("hasWaiters", "(Ljava/util/concurrent/locks/Condition;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#isHeldByCurrentThread()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#isHeldByCurrentThread()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsHeldByCurrentThread()
@@ -93,7 +79,7 @@ public bool IsHeldByCurrentThread()
             return IExecuteWithSignature<bool>("isHeldByCurrentThread", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#isLocked()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#isLocked()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsLocked()
@@ -101,7 +87,7 @@ public bool IsLocked()
             return IExecuteWithSignature<bool>("isLocked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#tryLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#tryLock()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool TryLock()
@@ -109,7 +95,7 @@ public bool TryLock()
             return IExecuteWithSignature<bool>("tryLock", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#tryLock(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#tryLock(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -120,7 +106,7 @@ public bool TryLock(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<bool>("tryLock", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#hasQueuedThread(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#hasQueuedThread(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -129,7 +115,7 @@ public bool HasQueuedThread(Java.Lang.Thread arg0)
             return IExecuteWithSignature<bool>("hasQueuedThread", "(Ljava/lang/Thread;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#hasQueuedThreads()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#hasQueuedThreads()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasQueuedThreads()
@@ -137,7 +123,7 @@ public bool HasQueuedThreads()
             return IExecuteWithSignature<bool>("hasQueuedThreads", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#isFair()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#isFair()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsFair()
@@ -145,7 +131,23 @@ public bool IsFair()
             return IExecuteWithSignature<bool>("isFair", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#getWaitQueueLength(java.util.concurrent.locks.Condition)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#getQueueLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetQueueLength()
+        {
+            return IExecuteWithSignature<int>("getQueueLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#getHoldCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHoldCount()
+        {
+            return IExecuteWithSignature<int>("getHoldCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#getWaitQueueLength(java.util.concurrent.locks.Condition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.Condition"/></param>
         /// <returns><see cref="int"/></returns>
@@ -154,7 +156,7 @@ public int GetWaitQueueLength(Java.Util.Concurrent.Locks.Condition arg0)
             return IExecuteWithSignature<int>("getWaitQueueLength", "(Ljava/util/concurrent/locks/Condition;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#newCondition()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#newCondition()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.Condition"/></returns>
         public Java.Util.Concurrent.Locks.Condition NewCondition()
@@ -162,14 +164,14 @@ public Java.Util.Concurrent.Locks.Condition NewCondition()
             return IExecuteWithSignature<Java.Util.Concurrent.Locks.Condition>("newCondition", "()Ljava/util/concurrent/locks/Condition;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#lock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#lock()"/>
         /// </summary>
         public void Lock()
         {
             IExecuteWithSignature("lock", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#lockInterruptibly()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#lockInterruptibly()"/>
         /// </summary>
         /// <exception cref="Java.Lang.InterruptedException"/>
         public void LockInterruptibly()
@@ -177,7 +179,7 @@ public void LockInterruptibly()
             IExecuteWithSignature("lockInterruptibly", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantLock.html#unlock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantLock.html#unlock()"/>
         /// </summary>
         public void Unlock()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReentrantReadWriteLock.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReentrantReadWriteLock.cs
index fe8a95107..07e89a548 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReentrantReadWriteLock.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/ReentrantReadWriteLock.cs
@@ -30,7 +30,7 @@ public partial class ReentrantReadWriteLock : Java.Util.Concurrent.Locks.IReadWr
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#%3Cinit%3E(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public ReentrantReadWriteLock(bool arg0)
@@ -62,35 +62,7 @@ public ReentrantReadWriteLock(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#getQueueLength()"/> 
-        /// </summary>
-        public int QueueLength
-        {
-            get { return IExecuteWithSignature<int>("getQueueLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#getReadHoldCount()"/> 
-        /// </summary>
-        public int ReadHoldCount
-        {
-            get { return IExecuteWithSignature<int>("getReadHoldCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#getReadLockCount()"/> 
-        /// </summary>
-        public int ReadLockCount
-        {
-            get { return IExecuteWithSignature<int>("getReadLockCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#getWriteHoldCount()"/> 
-        /// </summary>
-        public int WriteHoldCount
-        {
-            get { return IExecuteWithSignature<int>("getWriteHoldCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#hasWaiters(java.util.concurrent.locks.Condition)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#hasWaiters(java.util.concurrent.locks.Condition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.Condition"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -99,7 +71,7 @@ public bool HasWaiters(Java.Util.Concurrent.Locks.Condition arg0)
             return IExecuteWithSignature<bool>("hasWaiters", "(Ljava/util/concurrent/locks/Condition;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#isWriteLocked()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#isWriteLocked()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsWriteLocked()
@@ -107,7 +79,7 @@ public bool IsWriteLocked()
             return IExecuteWithSignature<bool>("isWriteLocked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#isWriteLockedByCurrentThread()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#isWriteLockedByCurrentThread()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsWriteLockedByCurrentThread()
@@ -115,7 +87,7 @@ public bool IsWriteLockedByCurrentThread()
             return IExecuteWithSignature<bool>("isWriteLockedByCurrentThread", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#hasQueuedThread(java.lang.Thread)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#hasQueuedThread(java.lang.Thread)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -124,7 +96,7 @@ public bool HasQueuedThread(Java.Lang.Thread arg0)
             return IExecuteWithSignature<bool>("hasQueuedThread", "(Ljava/lang/Thread;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#hasQueuedThreads()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#hasQueuedThreads()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasQueuedThreads()
@@ -132,7 +104,7 @@ public bool HasQueuedThreads()
             return IExecuteWithSignature<bool>("hasQueuedThreads", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#isFair()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#isFair()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsFair()
@@ -140,7 +112,31 @@ public bool IsFair()
             return IExecuteWithSignature<bool>("isFair", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#getWaitQueueLength(java.util.concurrent.locks.Condition)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#getQueueLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetQueueLength()
+        {
+            return IExecuteWithSignature<int>("getQueueLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#getReadHoldCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetReadHoldCount()
+        {
+            return IExecuteWithSignature<int>("getReadHoldCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#getReadLockCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetReadLockCount()
+        {
+            return IExecuteWithSignature<int>("getReadLockCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#getWaitQueueLength(java.util.concurrent.locks.Condition)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Locks.Condition"/></param>
         /// <returns><see cref="int"/></returns>
@@ -149,7 +145,15 @@ public int GetWaitQueueLength(Java.Util.Concurrent.Locks.Condition arg0)
             return IExecuteWithSignature<int>("getWaitQueueLength", "(Ljava/util/concurrent/locks/Condition;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#readLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#getWriteHoldCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWriteHoldCount()
+        {
+            return IExecuteWithSignature<int>("getWriteHoldCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#readLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.Lock"/></returns>
         public Java.Util.Concurrent.Locks.Lock ReadLockMethod()
@@ -157,7 +161,7 @@ public Java.Util.Concurrent.Locks.Lock ReadLockMethod()
             return IExecuteWithSignature<Java.Util.Concurrent.Locks.Lock>("readLock", "()Ljava/util/concurrent/locks/Lock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.html#writeLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.html#writeLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.Lock"/></returns>
         public Java.Util.Concurrent.Locks.Lock WriteLockMethod()
@@ -197,7 +201,7 @@ public partial class ReadLock : Java.Util.Concurrent.Locks.ILock, Java.Io.ISeria
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#tryLock()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#tryLock()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
             public bool TryLock()
@@ -205,7 +209,7 @@ public bool TryLock()
                 return IExecuteWithSignature<bool>("tryLock", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#tryLock(long,java.util.concurrent.TimeUnit)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#tryLock(long,java.util.concurrent.TimeUnit)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -216,7 +220,7 @@ public bool TryLock(long arg0, Java.Util.Concurrent.TimeUnit arg1)
                 return IExecute<bool>("tryLock", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#newCondition()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#newCondition()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Concurrent.Locks.Condition"/></returns>
             public Java.Util.Concurrent.Locks.Condition NewCondition()
@@ -224,14 +228,14 @@ public Java.Util.Concurrent.Locks.Condition NewCondition()
                 return IExecuteWithSignature<Java.Util.Concurrent.Locks.Condition>("newCondition", "()Ljava/util/concurrent/locks/Condition;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#lock()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#lock()"/>
             /// </summary>
             public void Lock()
             {
                 IExecuteWithSignature("lock", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#lockInterruptibly()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#lockInterruptibly()"/>
             /// </summary>
             /// <exception cref="Java.Lang.InterruptedException"/>
             public void LockInterruptibly()
@@ -239,7 +243,7 @@ public void LockInterruptibly()
                 IExecuteWithSignature("lockInterruptibly", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#unlock()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.ReadLock.html#unlock()"/>
             /// </summary>
             public void Unlock()
             {
@@ -285,14 +289,7 @@ public partial class WriteLock : Java.Util.Concurrent.Locks.ILock, Java.Io.ISeri
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#getHoldCount()"/> 
-            /// </summary>
-            public int HoldCount
-            {
-                get { return IExecuteWithSignature<int>("getHoldCount", "()I"); }
-            }
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#isHeldByCurrentThread()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#isHeldByCurrentThread()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
             public bool IsHeldByCurrentThread()
@@ -300,7 +297,7 @@ public bool IsHeldByCurrentThread()
                 return IExecuteWithSignature<bool>("isHeldByCurrentThread", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#tryLock()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#tryLock()"/>
             /// </summary>
             /// <returns><see cref="bool"/></returns>
             public bool TryLock()
@@ -308,7 +305,7 @@ public bool TryLock()
                 return IExecuteWithSignature<bool>("tryLock", "()Z");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#tryLock(long,java.util.concurrent.TimeUnit)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#tryLock(long,java.util.concurrent.TimeUnit)"/>
             /// </summary>
             /// <param name="arg0"><see cref="long"/></param>
             /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -319,7 +316,15 @@ public bool TryLock(long arg0, Java.Util.Concurrent.TimeUnit arg1)
                 return IExecute<bool>("tryLock", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#newCondition()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#getHoldCount()"/>
+            /// </summary>
+            /// <returns><see cref="int"/></returns>
+            public int GetHoldCount()
+            {
+                return IExecuteWithSignature<int>("getHoldCount", "()I");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#newCondition()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Concurrent.Locks.Condition"/></returns>
             public Java.Util.Concurrent.Locks.Condition NewCondition()
@@ -327,14 +332,14 @@ public Java.Util.Concurrent.Locks.Condition NewCondition()
                 return IExecuteWithSignature<Java.Util.Concurrent.Locks.Condition>("newCondition", "()Ljava/util/concurrent/locks/Condition;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#lock()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#lock()"/>
             /// </summary>
             public void Lock()
             {
                 IExecuteWithSignature("lock", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#lockInterruptibly()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#lockInterruptibly()"/>
             /// </summary>
             /// <exception cref="Java.Lang.InterruptedException"/>
             public void LockInterruptibly()
@@ -342,7 +347,7 @@ public void LockInterruptibly()
                 IExecuteWithSignature("lockInterruptibly", "()V");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#unlock()"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/ReentrantReadWriteLock.WriteLock.html#unlock()"/>
             /// </summary>
             public void Unlock()
             {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/StampedLock.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/StampedLock.cs
index 5435fb216..21db8bfe5 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/StampedLock.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Locks/StampedLock.cs
@@ -42,7 +42,7 @@ public partial class StampedLock
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#isLockStamp(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#isLockStamp(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -51,7 +51,7 @@ public static bool IsLockStamp(long arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isLockStamp", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#isOptimisticReadStamp(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#isOptimisticReadStamp(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -60,7 +60,7 @@ public static bool IsOptimisticReadStamp(long arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isOptimisticReadStamp", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#isReadLockStamp(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#isReadLockStamp(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -69,7 +69,7 @@ public static bool IsReadLockStamp(long arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isReadLockStamp", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#isWriteLockStamp(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#isWriteLockStamp(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -82,14 +82,7 @@ public static bool IsWriteLockStamp(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#getReadLockCount()"/> 
-        /// </summary>
-        public int ReadLockCount
-        {
-            get { return IExecuteWithSignature<int>("getReadLockCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#isReadLocked()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#isReadLocked()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsReadLocked()
@@ -97,7 +90,7 @@ public bool IsReadLocked()
             return IExecuteWithSignature<bool>("isReadLocked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#isWriteLocked()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#isWriteLocked()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsWriteLocked()
@@ -105,7 +98,7 @@ public bool IsWriteLocked()
             return IExecuteWithSignature<bool>("isWriteLocked", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryUnlockRead()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryUnlockRead()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool TryUnlockRead()
@@ -113,7 +106,7 @@ public bool TryUnlockRead()
             return IExecuteWithSignature<bool>("tryUnlockRead", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryUnlockWrite()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryUnlockWrite()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool TryUnlockWrite()
@@ -121,7 +114,7 @@ public bool TryUnlockWrite()
             return IExecuteWithSignature<bool>("tryUnlockWrite", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#validate(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#validate(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -130,7 +123,15 @@ public bool Validate(long arg0)
             return IExecuteWithSignature<bool>("validate", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#asReadLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#getReadLockCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetReadLockCount()
+        {
+            return IExecuteWithSignature<int>("getReadLockCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#asReadLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.Lock"/></returns>
         public Java.Util.Concurrent.Locks.Lock AsReadLock()
@@ -138,7 +139,7 @@ public Java.Util.Concurrent.Locks.Lock AsReadLock()
             return IExecuteWithSignature<Java.Util.Concurrent.Locks.Lock>("asReadLock", "()Ljava/util/concurrent/locks/Lock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#asWriteLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#asWriteLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.Lock"/></returns>
         public Java.Util.Concurrent.Locks.Lock AsWriteLock()
@@ -146,7 +147,7 @@ public Java.Util.Concurrent.Locks.Lock AsWriteLock()
             return IExecuteWithSignature<Java.Util.Concurrent.Locks.Lock>("asWriteLock", "()Ljava/util/concurrent/locks/Lock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#asReadWriteLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#asReadWriteLock()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.Locks.ReadWriteLock"/></returns>
         public Java.Util.Concurrent.Locks.ReadWriteLock AsReadWriteLock()
@@ -154,7 +155,7 @@ public Java.Util.Concurrent.Locks.ReadWriteLock AsReadWriteLock()
             return IExecuteWithSignature<Java.Util.Concurrent.Locks.ReadWriteLock>("asReadWriteLock", "()Ljava/util/concurrent/locks/ReadWriteLock;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#readLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#readLock()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ReadLock()
@@ -162,7 +163,7 @@ public long ReadLock()
             return IExecuteWithSignature<long>("readLock", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#readLockInterruptibly()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#readLockInterruptibly()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -171,7 +172,7 @@ public long ReadLockInterruptibly()
             return IExecuteWithSignature<long>("readLockInterruptibly", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryConvertToOptimisticRead(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryConvertToOptimisticRead(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -180,7 +181,7 @@ public long TryConvertToOptimisticRead(long arg0)
             return IExecuteWithSignature<long>("tryConvertToOptimisticRead", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryConvertToReadLock(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryConvertToReadLock(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -189,7 +190,7 @@ public long TryConvertToReadLock(long arg0)
             return IExecuteWithSignature<long>("tryConvertToReadLock", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryConvertToWriteLock(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryConvertToWriteLock(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -198,7 +199,7 @@ public long TryConvertToWriteLock(long arg0)
             return IExecuteWithSignature<long>("tryConvertToWriteLock", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryOptimisticRead()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryOptimisticRead()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long TryOptimisticRead()
@@ -206,7 +207,7 @@ public long TryOptimisticRead()
             return IExecuteWithSignature<long>("tryOptimisticRead", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryReadLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryReadLock()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long TryReadLock()
@@ -214,7 +215,7 @@ public long TryReadLock()
             return IExecuteWithSignature<long>("tryReadLock", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryReadLock(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryReadLock(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -225,7 +226,7 @@ public long TryReadLock(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<long>("tryReadLock", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryWriteLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryWriteLock()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long TryWriteLock()
@@ -233,7 +234,7 @@ public long TryWriteLock()
             return IExecuteWithSignature<long>("tryWriteLock", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#tryWriteLock(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#tryWriteLock(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -244,7 +245,7 @@ public long TryWriteLock(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<long>("tryWriteLock", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#writeLock()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#writeLock()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long WriteLock()
@@ -252,7 +253,7 @@ public long WriteLock()
             return IExecuteWithSignature<long>("writeLock", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#writeLockInterruptibly()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#writeLockInterruptibly()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -261,7 +262,7 @@ public long WriteLockInterruptibly()
             return IExecuteWithSignature<long>("writeLockInterruptibly", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#unlock(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#unlock(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Unlock(long arg0)
@@ -269,7 +270,7 @@ public void Unlock(long arg0)
             IExecuteWithSignature("unlock", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#unlockRead(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#unlockRead(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void UnlockRead(long arg0)
@@ -277,7 +278,7 @@ public void UnlockRead(long arg0)
             IExecuteWithSignature("unlockRead", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/locks/StampedLock.html#unlockWrite(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/locks/StampedLock.html#unlockWrite(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void UnlockWrite(long arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Phaser.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Phaser.cs
index 9f9debc87..ee2f3052a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Phaser.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Phaser.cs
@@ -30,7 +30,7 @@ public partial class Phaser
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Phaser(int arg0)
@@ -38,7 +38,7 @@ public Phaser(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#%3Cinit%3E(java.util.concurrent.Phaser,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#%3Cinit%3E(java.util.concurrent.Phaser,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Phaser"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -47,7 +47,7 @@ public Phaser(Java.Util.Concurrent.Phaser arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#%3Cinit%3E(java.util.concurrent.Phaser)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#%3Cinit%3E(java.util.concurrent.Phaser)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Phaser"/></param>
         public Phaser(Java.Util.Concurrent.Phaser arg0)
@@ -71,57 +71,23 @@ public Phaser(Java.Util.Concurrent.Phaser arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#getArrivedParties()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#isTerminated()"/>
         /// </summary>
-        public int ArrivedParties
-        {
-            get { return IExecuteWithSignature<int>("getArrivedParties", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#getParent()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.Phaser Parent
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.Phaser>("getParent", "()Ljava/util/concurrent/Phaser;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#getPhase()"/> 
-        /// </summary>
-        public int Phase
-        {
-            get { return IExecuteWithSignature<int>("getPhase", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#getRegisteredParties()"/> 
-        /// </summary>
-        public int RegisteredParties
-        {
-            get { return IExecuteWithSignature<int>("getRegisteredParties", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#getRoot()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.Phaser Root
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.Phaser>("getRoot", "()Ljava/util/concurrent/Phaser;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#getUnarrivedParties()"/> 
-        /// </summary>
-        public int UnarrivedParties
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTerminated()
         {
-            get { return IExecuteWithSignature<int>("getUnarrivedParties", "()I"); }
+            return IExecuteWithSignature<bool>("isTerminated", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#isTerminated()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#getPhase()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTerminated()
+        /// <returns><see cref="int"/></returns>
+        public int GetPhase()
         {
-            return IExecuteWithSignature<bool>("isTerminated", "()Z");
+            return IExecuteWithSignature<int>("getPhase", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#arrive()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#arrive()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Arrive()
@@ -129,7 +95,7 @@ public int Arrive()
             return IExecuteWithSignature<int>("arrive", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#arriveAndAwaitAdvance()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#arriveAndAwaitAdvance()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ArriveAndAwaitAdvance()
@@ -137,7 +103,7 @@ public int ArriveAndAwaitAdvance()
             return IExecuteWithSignature<int>("arriveAndAwaitAdvance", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#arriveAndDeregister()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#arriveAndDeregister()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ArriveAndDeregister()
@@ -145,7 +111,7 @@ public int ArriveAndDeregister()
             return IExecuteWithSignature<int>("arriveAndDeregister", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#awaitAdvance(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#awaitAdvance(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -154,7 +120,7 @@ public int AwaitAdvance(int arg0)
             return IExecuteWithSignature<int>("awaitAdvance", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#awaitAdvanceInterruptibly(int,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#awaitAdvanceInterruptibly(int,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -167,7 +133,7 @@ public int AwaitAdvanceInterruptibly(int arg0, long arg1, Java.Util.Concurrent.T
             return IExecute<int>("awaitAdvanceInterruptibly", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#awaitAdvanceInterruptibly(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#awaitAdvanceInterruptibly(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -177,7 +143,7 @@ public int AwaitAdvanceInterruptibly(int arg0)
             return IExecuteWithSignature<int>("awaitAdvanceInterruptibly", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#bulkRegister(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#bulkRegister(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -186,7 +152,31 @@ public int BulkRegister(int arg0)
             return IExecuteWithSignature<int>("bulkRegister", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#register()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#getArrivedParties()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetArrivedParties()
+        {
+            return IExecuteWithSignature<int>("getArrivedParties", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#getRegisteredParties()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRegisteredParties()
+        {
+            return IExecuteWithSignature<int>("getRegisteredParties", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#getUnarrivedParties()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetUnarrivedParties()
+        {
+            return IExecuteWithSignature<int>("getUnarrivedParties", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#register()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Register()
@@ -194,7 +184,23 @@ public int Register()
             return IExecuteWithSignature<int>("register", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Phaser.html#forceTermination()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#getParent()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.Phaser"/></returns>
+        public Java.Util.Concurrent.Phaser GetParent()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.Phaser>("getParent", "()Ljava/util/concurrent/Phaser;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#getRoot()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.Phaser"/></returns>
+        public Java.Util.Concurrent.Phaser GetRoot()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.Phaser>("getRoot", "()Ljava/util/concurrent/Phaser;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Phaser.html#forceTermination()"/>
         /// </summary>
         public void ForceTermination()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/PriorityBlockingQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/PriorityBlockingQueue.cs
index 569b67c76..7014b1216 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/PriorityBlockingQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/PriorityBlockingQueue.cs
@@ -30,7 +30,7 @@ public partial class PriorityBlockingQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public PriorityBlockingQueue(int arg0)
@@ -38,7 +38,7 @@ public PriorityBlockingQueue(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public PriorityBlockingQueue(Java.Util.Collection arg0)
@@ -70,7 +70,7 @@ public PriorityBlockingQueue(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -81,7 +81,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -92,7 +92,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -101,7 +101,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -111,7 +111,7 @@ public int DrainTo(Java.Util.Collection arg0, int arg1)
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -120,7 +120,7 @@ public int DrainTo(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -128,7 +128,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Put(object arg0)
@@ -151,7 +151,7 @@ public partial class PriorityBlockingQueue<E> : Java.Util.Concurrent.IBlockingQu
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public PriorityBlockingQueue(int arg0)
@@ -159,7 +159,7 @@ public PriorityBlockingQueue(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public PriorityBlockingQueue(Java.Util.Collection<E> arg0)
@@ -195,7 +195,7 @@ public PriorityBlockingQueue(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -206,7 +206,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -217,7 +217,7 @@ public E Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#take()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -226,28 +226,28 @@ public E Take()
             return IExecuteWithSignature<E>("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE : E
         {
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -255,7 +255,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/PriorityBlockingQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/PriorityBlockingQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Put(E arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/RejectedExecutionHandler.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/RejectedExecutionHandler.cs
index 6c10b0989..82f005042 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/RejectedExecutionHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/RejectedExecutionHandler.cs
@@ -64,7 +64,7 @@ public partial class RejectedExecutionHandler : Java.Util.Concurrent.IRejectedEx
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RejectedExecutionHandler.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/RejectedExecutionHandler.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadPoolExecutor"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/RunnableFuture.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/RunnableFuture.cs
index 50cbf144a..600030b4d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/RunnableFuture.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/RunnableFuture.cs
@@ -54,7 +54,7 @@ public partial class RunnableFuture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RunnableFuture.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/RunnableFuture.html#run()"/>
         /// </summary>
         public void Run()
         {
@@ -122,7 +122,7 @@ public partial class RunnableFuture<V> : Java.Util.Concurrent.IRunnableFuture<V>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RunnableFuture.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/RunnableFuture.html#run()"/>
         /// </summary>
         public void Run()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/RunnableScheduledFuture.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/RunnableScheduledFuture.cs
index 928338fd2..584c43329 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/RunnableScheduledFuture.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/RunnableScheduledFuture.cs
@@ -54,7 +54,7 @@ public partial class RunnableScheduledFuture
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RunnableScheduledFuture.html#isPeriodic()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/RunnableScheduledFuture.html#isPeriodic()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsPeriodic()
@@ -123,7 +123,7 @@ public partial class RunnableScheduledFuture<V> : Java.Util.Concurrent.IRunnable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/RunnableScheduledFuture.html#isPeriodic()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/RunnableScheduledFuture.html#isPeriodic()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsPeriodic()
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ScheduledExecutorService.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ScheduledExecutorService.cs
index 6dc90e061..f542b792a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ScheduledExecutorService.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ScheduledExecutorService.cs
@@ -64,7 +64,7 @@ public partial class ScheduledExecutorService : Java.Util.Concurrent.IScheduledE
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledExecutorService.html#schedule(java.util.concurrent.Callable,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledExecutorService.html#schedule(java.util.concurrent.Callable,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -76,7 +76,7 @@ public Java.Util.Concurrent.ScheduledFuture<V> Schedule<V>(Java.Util.Concurrent.
             return IExecute<Java.Util.Concurrent.ScheduledFuture<V>>("schedule", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledExecutorService.html#schedule(java.lang.Runnable,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledExecutorService.html#schedule(java.lang.Runnable,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -87,7 +87,7 @@ public Java.Util.Concurrent.ScheduledFuture<object> Schedule(Java.Lang.Runnable
             return IExecute<Java.Util.Concurrent.ScheduledFuture<object>>("schedule", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledExecutorService.html#scheduleAtFixedRate(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledExecutorService.html#scheduleAtFixedRate(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -99,7 +99,7 @@ public Java.Util.Concurrent.ScheduledFuture<object> ScheduleAtFixedRate(Java.Lan
             return IExecute<Java.Util.Concurrent.ScheduledFuture<object>>("scheduleAtFixedRate", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledExecutorService.html#scheduleWithFixedDelay(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledExecutorService.html#scheduleWithFixedDelay(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ScheduledThreadPoolExecutor.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ScheduledThreadPoolExecutor.cs
index 7f417a7c2..e46ebc512 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ScheduledThreadPoolExecutor.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ScheduledThreadPoolExecutor.cs
@@ -30,7 +30,7 @@ public partial class ScheduledThreadPoolExecutor
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#%3Cinit%3E(int,java.util.concurrent.RejectedExecutionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#%3Cinit%3E(int,java.util.concurrent.RejectedExecutionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.RejectedExecutionHandler"/></param>
@@ -39,7 +39,7 @@ public ScheduledThreadPoolExecutor(int arg0, Java.Util.Concurrent.RejectedExecut
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#%3Cinit%3E(int,java.util.concurrent.ThreadFactory,java.util.concurrent.RejectedExecutionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#%3Cinit%3E(int,java.util.concurrent.ThreadFactory,java.util.concurrent.RejectedExecutionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
@@ -49,7 +49,7 @@ public ScheduledThreadPoolExecutor(int arg0, Java.Util.Concurrent.ThreadFactory
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#%3Cinit%3E(int,java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#%3Cinit%3E(int,java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
@@ -58,7 +58,7 @@ public ScheduledThreadPoolExecutor(int arg0, Java.Util.Concurrent.ThreadFactory
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public ScheduledThreadPoolExecutor(int arg0)
@@ -86,40 +86,43 @@ public ScheduledThreadPoolExecutor(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#getContinueExistingPeriodicTasksAfterShutdownPolicy()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#setContinueExistingPeriodicTasksAfterShutdownPolicy(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#schedule(java.util.concurrent.Callable,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
-        public bool ContinueExistingPeriodicTasksAfterShutdownPolicy
+        /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
+        /// <param name="arg1"><see cref="long"/></param>
+        /// <param name="arg2"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
+        /// <typeparam name="V"></typeparam>
+        /// <returns><see cref="Java.Util.Concurrent.ScheduledFuture"/></returns>
+        public Java.Util.Concurrent.ScheduledFuture<V> Schedule<V>(Java.Util.Concurrent.Callable<V> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
         {
-            get { return IExecuteWithSignature<bool>("getContinueExistingPeriodicTasksAfterShutdownPolicy", "()Z"); } set { IExecuteWithSignature("setContinueExistingPeriodicTasksAfterShutdownPolicy", "(Z)V", value); }
+            return IExecute<Java.Util.Concurrent.ScheduledFuture<V>>("schedule", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#getExecuteExistingDelayedTasksAfterShutdownPolicy()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#setExecuteExistingDelayedTasksAfterShutdownPolicy(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#getContinueExistingPeriodicTasksAfterShutdownPolicy()"/>
         /// </summary>
-        public bool ExecuteExistingDelayedTasksAfterShutdownPolicy
+        /// <returns><see cref="bool"/></returns>
+        public bool GetContinueExistingPeriodicTasksAfterShutdownPolicy()
         {
-            get { return IExecuteWithSignature<bool>("getExecuteExistingDelayedTasksAfterShutdownPolicy", "()Z"); } set { IExecuteWithSignature("setExecuteExistingDelayedTasksAfterShutdownPolicy", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getContinueExistingPeriodicTasksAfterShutdownPolicy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#getRemoveOnCancelPolicy()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#setRemoveOnCancelPolicy(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#getExecuteExistingDelayedTasksAfterShutdownPolicy()"/>
         /// </summary>
-        public bool RemoveOnCancelPolicy
+        /// <returns><see cref="bool"/></returns>
+        public bool GetExecuteExistingDelayedTasksAfterShutdownPolicy()
         {
-            get { return IExecuteWithSignature<bool>("getRemoveOnCancelPolicy", "()Z"); } set { IExecuteWithSignature("setRemoveOnCancelPolicy", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getExecuteExistingDelayedTasksAfterShutdownPolicy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#schedule(java.util.concurrent.Callable,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#getRemoveOnCancelPolicy()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Concurrent.Callable"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <param name="arg2"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
-        /// <typeparam name="V"></typeparam>
-        /// <returns><see cref="Java.Util.Concurrent.ScheduledFuture"/></returns>
-        public Java.Util.Concurrent.ScheduledFuture<V> Schedule<V>(Java.Util.Concurrent.Callable<V> arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
+        /// <returns><see cref="bool"/></returns>
+        public bool GetRemoveOnCancelPolicy()
         {
-            return IExecute<Java.Util.Concurrent.ScheduledFuture<V>>("schedule", arg0, arg1, arg2);
+            return IExecuteWithSignature<bool>("getRemoveOnCancelPolicy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#schedule(java.lang.Runnable,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#schedule(java.lang.Runnable,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -130,7 +133,7 @@ public Java.Util.Concurrent.ScheduledFuture<object> Schedule(Java.Lang.Runnable
             return IExecute<Java.Util.Concurrent.ScheduledFuture<object>>("schedule", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#scheduleAtFixedRate(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#scheduleAtFixedRate(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -142,7 +145,7 @@ public Java.Util.Concurrent.ScheduledFuture<object> ScheduleAtFixedRate(Java.Lan
             return IExecute<Java.Util.Concurrent.ScheduledFuture<object>>("scheduleAtFixedRate", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ScheduledThreadPoolExecutor.html#scheduleWithFixedDelay(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#scheduleWithFixedDelay(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -153,6 +156,30 @@ public Java.Util.Concurrent.ScheduledFuture<object> ScheduleWithFixedDelay(Java.
         {
             return IExecute<Java.Util.Concurrent.ScheduledFuture<object>>("scheduleWithFixedDelay", arg0, arg1, arg2, arg3);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#setContinueExistingPeriodicTasksAfterShutdownPolicy(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetContinueExistingPeriodicTasksAfterShutdownPolicy(bool arg0)
+        {
+            IExecuteWithSignature("setContinueExistingPeriodicTasksAfterShutdownPolicy", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#setExecuteExistingDelayedTasksAfterShutdownPolicy(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetExecuteExistingDelayedTasksAfterShutdownPolicy(bool arg0)
+        {
+            IExecuteWithSignature("setExecuteExistingDelayedTasksAfterShutdownPolicy", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ScheduledThreadPoolExecutor.html#setRemoveOnCancelPolicy(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetRemoveOnCancelPolicy(bool arg0)
+        {
+            IExecuteWithSignature("setRemoveOnCancelPolicy", "(Z)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/Semaphore.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/Semaphore.cs
index e5a7cb52c..895e0ec38 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/Semaphore.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/Semaphore.cs
@@ -30,7 +30,7 @@ public partial class Semaphore
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#%3Cinit%3E(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#%3Cinit%3E(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -39,7 +39,7 @@ public Semaphore(int arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Semaphore(int arg0)
@@ -63,14 +63,7 @@ public Semaphore(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#getQueueLength()"/> 
-        /// </summary>
-        public int QueueLength
-        {
-            get { return IExecuteWithSignature<int>("getQueueLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#isFair()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#isFair()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsFair()
@@ -78,7 +71,7 @@ public bool IsFair()
             return IExecuteWithSignature<bool>("isFair", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#tryAcquire()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#tryAcquire()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool TryAcquire()
@@ -86,7 +79,7 @@ public bool TryAcquire()
             return IExecuteWithSignature<bool>("tryAcquire", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#tryAcquire(int,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#tryAcquire(int,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -98,7 +91,7 @@ public bool TryAcquire(int arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("tryAcquire", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#tryAcquire(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#tryAcquire(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -107,7 +100,7 @@ public bool TryAcquire(int arg0)
             return IExecuteWithSignature<bool>("tryAcquire", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#tryAcquire(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#tryAcquire(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -118,7 +111,7 @@ public bool TryAcquire(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<bool>("tryAcquire", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#hasQueuedThreads()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#hasQueuedThreads()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasQueuedThreads()
@@ -126,7 +119,15 @@ public bool HasQueuedThreads()
             return IExecuteWithSignature<bool>("hasQueuedThreads", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#availablePermits()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#getQueueLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetQueueLength()
+        {
+            return IExecuteWithSignature<int>("getQueueLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#availablePermits()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int AvailablePermits()
@@ -134,7 +135,7 @@ public int AvailablePermits()
             return IExecuteWithSignature<int>("availablePermits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#drainPermits()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#drainPermits()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int DrainPermits()
@@ -142,7 +143,7 @@ public int DrainPermits()
             return IExecuteWithSignature<int>("drainPermits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#acquire()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#acquire()"/>
         /// </summary>
         /// <exception cref="Java.Lang.InterruptedException"/>
         public void Acquire()
@@ -150,7 +151,7 @@ public void Acquire()
             IExecuteWithSignature("acquire", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#acquire(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#acquire(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -159,14 +160,14 @@ public void Acquire(int arg0)
             IExecuteWithSignature("acquire", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#acquireUninterruptibly()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#acquireUninterruptibly()"/>
         /// </summary>
         public void AcquireUninterruptibly()
         {
             IExecuteWithSignature("acquireUninterruptibly", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#acquireUninterruptibly(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#acquireUninterruptibly(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void AcquireUninterruptibly(int arg0)
@@ -174,14 +175,14 @@ public void AcquireUninterruptibly(int arg0)
             IExecuteWithSignature("acquireUninterruptibly", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#release()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#release()"/>
         /// </summary>
         public void Release()
         {
             IExecuteWithSignature("release", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/Semaphore.html#release(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/Semaphore.html#release(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Release(int arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/SubmissionPublisher.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/SubmissionPublisher.cs
index ca5788d56..51adccae1 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/SubmissionPublisher.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/SubmissionPublisher.cs
@@ -30,7 +30,7 @@ public partial class SubmissionPublisher
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#%3Cinit%3E(java.util.concurrent.Executor,int,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#%3Cinit%3E(java.util.concurrent.Executor,int,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public SubmissionPublisher(Java.Util.Concurrent.Executor arg0, int arg1, Java.Ut
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#%3Cinit%3E(java.util.concurrent.Executor,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#%3Cinit%3E(java.util.concurrent.Executor,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -69,42 +69,7 @@ public SubmissionPublisher(Java.Util.Concurrent.Executor arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getClosedException()"/> 
-        /// </summary>
-        public Java.Lang.Throwable ClosedException
-        {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getClosedException", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getExecutor()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.Executor Executor
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getExecutor", "()Ljava/util/concurrent/Executor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getMaxBufferCapacity()"/> 
-        /// </summary>
-        public int MaxBufferCapacity
-        {
-            get { return IExecuteWithSignature<int>("getMaxBufferCapacity", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getNumberOfSubscribers()"/> 
-        /// </summary>
-        public int NumberOfSubscribers
-        {
-            get { return IExecuteWithSignature<int>("getNumberOfSubscribers", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getSubscribers()"/> 
-        /// </summary>
-        public Java.Util.List Subscribers
-        {
-            get { return IExecuteWithSignature<Java.Util.List>("getSubscribers", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#hasSubscribers()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#hasSubscribers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasSubscribers()
@@ -112,7 +77,7 @@ public bool HasSubscribers()
             return IExecuteWithSignature<bool>("hasSubscribers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#isClosed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsClosed()
@@ -120,7 +85,7 @@ public bool IsClosed()
             return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#isSubscribed(java.util.concurrent.Flow.Subscriber)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#isSubscribed(java.util.concurrent.Flow.Subscriber)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Flow.Subscriber"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -129,7 +94,7 @@ public bool IsSubscribed(Java.Util.Concurrent.Flow.Subscriber arg0)
             return IExecuteWithSignature<bool>("isSubscribed", "(Ljava/util/concurrent/Flow$Subscriber;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#estimateMaximumLag()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#estimateMaximumLag()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int EstimateMaximumLag()
@@ -137,7 +102,23 @@ public int EstimateMaximumLag()
             return IExecuteWithSignature<int>("estimateMaximumLag", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#offer(java.lang.Object,java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getMaxBufferCapacity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxBufferCapacity()
+        {
+            return IExecuteWithSignature<int>("getMaxBufferCapacity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getNumberOfSubscribers()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfSubscribers()
+        {
+            return IExecuteWithSignature<int>("getNumberOfSubscribers", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#offer(java.lang.Object,java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiPredicate"/></param>
@@ -147,7 +128,7 @@ public int Offer(object arg0, Java.Util.Function.BiPredicate arg1)
             return IExecute<int>("offer", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit,java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit,java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -159,7 +140,7 @@ public int Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2, Jav
             return IExecute<int>("offer", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#submit(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#submit(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -168,7 +149,15 @@ public int Submit(object arg0)
             return IExecuteWithSignature<int>("submit", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#consume(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getClosedException()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Throwable"/></returns>
+        public Java.Lang.Throwable GetClosedException()
+        {
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getClosedException", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#consume(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
@@ -177,7 +166,23 @@ public Java.Util.Concurrent.CompletableFuture Consume(Java.Util.Function.Consume
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture>("consume", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#estimateMinimumDemand()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getExecutor()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.Executor"/></returns>
+        public Java.Util.Concurrent.Executor GetExecutor()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getExecutor", "()Ljava/util/concurrent/Executor;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getSubscribers()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List GetSubscribers()
+        {
+            return IExecuteWithSignature<Java.Util.List>("getSubscribers", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#estimateMinimumDemand()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long EstimateMinimumDemand()
@@ -185,14 +190,14 @@ public long EstimateMinimumDemand()
             return IExecuteWithSignature<long>("estimateMinimumDemand", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#close()"/>
         /// </summary>
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#closeExceptionally(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#closeExceptionally(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         public void CloseExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
@@ -200,7 +205,7 @@ public void CloseExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0
             IExecuteWithSignature("closeExceptionally", "(Ljava/lang/Throwable;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#subscribe(java.util.concurrent.Flow.Subscriber)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#subscribe(java.util.concurrent.Flow.Subscriber)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Flow.Subscriber"/></param>
         public void Subscribe(Java.Util.Concurrent.Flow.Subscriber arg0)
@@ -223,7 +228,7 @@ public partial class SubmissionPublisher<T> : Java.Lang.IAutoCloseable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#%3Cinit%3E(java.util.concurrent.Executor,int,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#%3Cinit%3E(java.util.concurrent.Executor,int,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -233,7 +238,7 @@ public SubmissionPublisher(Java.Util.Concurrent.Executor arg0, int arg1, Java.Ut
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#%3Cinit%3E(java.util.concurrent.Executor,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#%3Cinit%3E(java.util.concurrent.Executor,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Executor"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -266,42 +271,7 @@ public SubmissionPublisher(Java.Util.Concurrent.Executor arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getClosedException()"/> 
-        /// </summary>
-        public Java.Lang.Throwable ClosedException
-        {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getClosedException", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getExecutor()"/> 
-        /// </summary>
-        public Java.Util.Concurrent.Executor Executor
-        {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getExecutor", "()Ljava/util/concurrent/Executor;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getMaxBufferCapacity()"/> 
-        /// </summary>
-        public int MaxBufferCapacity
-        {
-            get { return IExecuteWithSignature<int>("getMaxBufferCapacity", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getNumberOfSubscribers()"/> 
-        /// </summary>
-        public int NumberOfSubscribers
-        {
-            get { return IExecuteWithSignature<int>("getNumberOfSubscribers", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#getSubscribers()"/> 
-        /// </summary>
-        public Java.Util.List Subscribers
-        {
-            get { return IExecuteWithSignature<Java.Util.List>("getSubscribers", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#hasSubscribers()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#hasSubscribers()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasSubscribers()
@@ -309,7 +279,7 @@ public bool HasSubscribers()
             return IExecuteWithSignature<bool>("hasSubscribers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#isClosed()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#isClosed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsClosed()
@@ -317,17 +287,17 @@ public bool IsClosed()
             return IExecuteWithSignature<bool>("isClosed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#isSubscribed(java.util.concurrent.Flow.Subscriber)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#isSubscribed(java.util.concurrent.Flow.Subscriber)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Flow.Subscriber"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool IsSubscribed<Arg0objectSuperT>(Java.Util.Concurrent.Flow.Subscriber<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public bool IsSubscribed<Arg0objectSuperT>(Java.Util.Concurrent.Flow.Subscriber<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<bool>("isSubscribed", "(Ljava/util/concurrent/Flow$Subscriber;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#estimateMaximumLag()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#estimateMaximumLag()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int EstimateMaximumLag()
@@ -335,18 +305,34 @@ public int EstimateMaximumLag()
             return IExecuteWithSignature<int>("estimateMaximumLag", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#offer(java.lang.Object,java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getMaxBufferCapacity()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMaxBufferCapacity()
+        {
+            return IExecuteWithSignature<int>("getMaxBufferCapacity", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getNumberOfSubscribers()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetNumberOfSubscribers()
+        {
+            return IExecuteWithSignature<int>("getNumberOfSubscribers", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#offer(java.lang.Object,java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int Offer<Arg1objectSuperT>(T arg0, Java.Util.Function.BiPredicate<Java.Util.Concurrent.Flow.Subscriber<Arg1objectSuperT>, Arg1objectSuperT> arg1) where Arg1objectSuperT: T
+        public int Offer<Arg1objectSuperT>(T arg0, Java.Util.Function.BiPredicate<Java.Util.Concurrent.Flow.Subscriber<Arg1objectSuperT>, Arg1objectSuperT> arg1) where Arg1objectSuperT : T
         {
             return IExecute<int>("offer", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit,java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit,java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -354,12 +340,12 @@ public int Offer<Arg1objectSuperT>(T arg0, Java.Util.Function.BiPredicate<Java.U
         /// <param name="arg3"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <typeparam name="Arg3objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int Offer<Arg3objectSuperT>(T arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2, Java.Util.Function.BiPredicate<Java.Util.Concurrent.Flow.Subscriber<Arg3objectSuperT>, Arg3objectSuperT> arg3) where Arg3objectSuperT: T
+        public int Offer<Arg3objectSuperT>(T arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2, Java.Util.Function.BiPredicate<Java.Util.Concurrent.Flow.Subscriber<Arg3objectSuperT>, Arg3objectSuperT> arg3) where Arg3objectSuperT : T
         {
             return IExecute<int>("offer", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#submit(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#submit(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
@@ -368,17 +354,42 @@ public int Submit(T arg0)
             return IExecuteWithSignature<int>("submit", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#consume(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getClosedException()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.Throwable"/></returns>
+        public Java.Lang.Throwable GetClosedException()
+        {
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getClosedException", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#consume(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Concurrent.CompletableFuture"/></returns>
-        public Java.Util.Concurrent.CompletableFuture<Java.Lang.Void> Consume<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Concurrent.CompletableFuture<Java.Lang.Void> Consume<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Concurrent.CompletableFuture<Java.Lang.Void>>("consume", "(Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#estimateMinimumDemand()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getExecutor()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Concurrent.Executor"/></returns>
+        public Java.Util.Concurrent.Executor GetExecutor()
+        {
+            return IExecuteWithSignature<Java.Util.Concurrent.Executor>("getExecutor", "()Ljava/util/concurrent/Executor;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#getSubscribers()"/>
+        /// </summary>
+        /// <typeparam name="ReturnobjectSuperT"><typeparamref name="T"/></typeparam>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Util.Concurrent.Flow.Subscriber<ReturnobjectSuperT>> GetSubscribers<ReturnobjectSuperT>() where ReturnobjectSuperT : T
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Util.Concurrent.Flow.Subscriber<ReturnobjectSuperT>>>("getSubscribers", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#estimateMinimumDemand()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long EstimateMinimumDemand()
@@ -386,14 +397,14 @@ public long EstimateMinimumDemand()
             return IExecuteWithSignature<long>("estimateMinimumDemand", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#close()"/>
         /// </summary>
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#closeExceptionally(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#closeExceptionally(java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
         public void CloseExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
@@ -401,11 +412,11 @@ public void CloseExceptionally(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0
             IExecuteWithSignature("closeExceptionally", "(Ljava/lang/Throwable;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SubmissionPublisher.html#subscribe(java.util.concurrent.Flow.Subscriber)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SubmissionPublisher.html#subscribe(java.util.concurrent.Flow.Subscriber)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Concurrent.Flow.Subscriber"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        public void Subscribe<Arg0objectSuperT>(Java.Util.Concurrent.Flow.Subscriber<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public void Subscribe<Arg0objectSuperT>(Java.Util.Concurrent.Flow.Subscriber<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             IExecuteWithSignature("subscribe", "(Ljava/util/concurrent/Flow$Subscriber;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/SynchronousQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/SynchronousQueue.cs
index 28f586974..29b13fe02 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/SynchronousQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/SynchronousQueue.cs
@@ -30,7 +30,7 @@ public partial class SynchronousQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#%3Cinit%3E(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public SynchronousQueue(bool arg0)
@@ -62,7 +62,7 @@ public SynchronousQueue(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -74,7 +74,7 @@ public bool Offer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -85,7 +85,7 @@ public object Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#take()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -94,7 +94,7 @@ public object Take()
             return IExecuteWithSignature("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -104,7 +104,7 @@ public int DrainTo(Java.Util.Collection arg0, int arg1)
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="int"/></returns>
@@ -113,7 +113,7 @@ public int DrainTo(Java.Util.Collection arg0)
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -121,7 +121,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -145,7 +145,7 @@ public partial class SynchronousQueue<E> : Java.Util.Concurrent.IBlockingQueue<E
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#%3Cinit%3E(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public SynchronousQueue(bool arg0)
@@ -181,7 +181,7 @@ public SynchronousQueue(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#offer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -193,7 +193,7 @@ public bool Offer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("offer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#poll(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -204,7 +204,7 @@ public E Poll(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<E>("poll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#take()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#take()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -213,28 +213,28 @@ public E Take()
             return IExecuteWithSignature<E>("take", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#drainTo(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#drainTo(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0, int arg1) where Arg0objectSuperE : E
         {
             return IExecute<int>("drainTo", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#drainTo(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#drainTo(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0objectSuperE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="int"/></returns>
-        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE: E
+        public int DrainTo<Arg0objectSuperE>(Java.Util.Collection<Arg0objectSuperE> arg0) where Arg0objectSuperE : E
         {
             return IExecuteWithSignature<int>("drainTo", "(Ljava/util/Collection;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#remainingCapacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#remainingCapacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RemainingCapacity()
@@ -242,7 +242,7 @@ public int RemainingCapacity()
             return IExecuteWithSignature<int>("remainingCapacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/SynchronousQueue.html#put(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/SynchronousQueue.html#put(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadFactory.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadFactory.cs
index 803930f51..82faa232c 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadFactory.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadFactory.cs
@@ -64,7 +64,7 @@ public partial class ThreadFactory : Java.Util.Concurrent.IThreadFactory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadFactory.html#newThread(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadFactory.html#newThread(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Lang.Thread"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadLocalRandom.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadLocalRandom.cs
index 6814c0e6a..6814f05fe 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadLocalRandom.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadLocalRandom.cs
@@ -42,7 +42,7 @@ public partial class ThreadLocalRandom
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadLocalRandom.html#current()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom.html#current()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.ThreadLocalRandom"/></returns>
         public static Java.Util.Concurrent.ThreadLocalRandom Current()
@@ -53,6 +53,54 @@ public static Java.Util.Concurrent.ThreadLocalRandom Current()
         #endregion
 
         #region Instance methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom.html#nextDouble(double,double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        /// <param name="arg1"><see cref="double"/></param>
+        /// <returns><see cref="double"/></returns>
+        public double NextDouble(double arg0, double arg1)
+        {
+            return IExecute<double>("nextDouble", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom.html#nextDouble(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        /// <returns><see cref="double"/></returns>
+        public double NextDouble(double arg0)
+        {
+            return IExecuteWithSignature<double>("nextDouble", "(D)D", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom.html#nextInt(int,int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int NextInt(int arg0, int arg1)
+        {
+            return IExecute<int>("nextInt", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom.html#nextLong(long,long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <param name="arg1"><see cref="long"/></param>
+        /// <returns><see cref="long"/></returns>
+        public long NextLong(long arg0, long arg1)
+        {
+            return IExecute<long>("nextLong", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadLocalRandom.html#nextLong(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        /// <returns><see cref="long"/></returns>
+        public long NextLong(long arg0)
+        {
+            return IExecuteWithSignature<long>("nextLong", "(J)J", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadPoolExecutor.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadPoolExecutor.cs
index 669beb6ae..95feba608 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadPoolExecutor.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/ThreadPoolExecutor.cs
@@ -30,7 +30,7 @@ public partial class ThreadPoolExecutor
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#%3Cinit%3E(int,int,long,java.util.concurrent.TimeUnit,java.util.concurrent.BlockingQueue,java.util.concurrent.RejectedExecutionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#%3Cinit%3E(int,int,long,java.util.concurrent.TimeUnit,java.util.concurrent.BlockingQueue,java.util.concurrent.RejectedExecutionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -43,7 +43,7 @@ public ThreadPoolExecutor(int arg0, int arg1, long arg2, Java.Util.Concurrent.Ti
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#%3Cinit%3E(int,int,long,java.util.concurrent.TimeUnit,java.util.concurrent.BlockingQueue,java.util.concurrent.ThreadFactory,java.util.concurrent.RejectedExecutionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#%3Cinit%3E(int,int,long,java.util.concurrent.TimeUnit,java.util.concurrent.BlockingQueue,java.util.concurrent.ThreadFactory,java.util.concurrent.RejectedExecutionHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -57,7 +57,7 @@ public ThreadPoolExecutor(int arg0, int arg1, long arg2, Java.Util.Concurrent.Ti
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#%3Cinit%3E(int,int,long,java.util.concurrent.TimeUnit,java.util.concurrent.BlockingQueue,java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#%3Cinit%3E(int,int,long,java.util.concurrent.TimeUnit,java.util.concurrent.BlockingQueue,java.util.concurrent.ThreadFactory)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -70,7 +70,7 @@ public ThreadPoolExecutor(int arg0, int arg1, long arg2, Java.Util.Concurrent.Ti
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#%3Cinit%3E(int,int,long,java.util.concurrent.TimeUnit,java.util.concurrent.BlockingQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#%3Cinit%3E(int,int,long,java.util.concurrent.TimeUnit,java.util.concurrent.BlockingQueue)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -98,127 +98,137 @@ public ThreadPoolExecutor(int arg0, int arg1, long arg2, Java.Util.Concurrent.Ti
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getActiveCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#allowsCoreThreadTimeOut()"/>
         /// </summary>
-        public int ActiveCount
+        /// <returns><see cref="bool"/></returns>
+        public bool AllowsCoreThreadTimeOut()
         {
-            get { return IExecuteWithSignature<int>("getActiveCount", "()I"); }
+            return IExecuteWithSignature<bool>("allowsCoreThreadTimeOut", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getCompletedTaskCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#isTerminating()"/>
         /// </summary>
-        public long CompletedTaskCount
+        /// <returns><see cref="bool"/></returns>
+        public bool IsTerminating()
         {
-            get { return IExecuteWithSignature<long>("getCompletedTaskCount", "()J"); }
+            return IExecuteWithSignature<bool>("isTerminating", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getCorePoolSize()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#setCorePoolSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#prestartCoreThread()"/>
         /// </summary>
-        public int CorePoolSize
+        /// <returns><see cref="bool"/></returns>
+        public bool PrestartCoreThread()
         {
-            get { return IExecuteWithSignature<int>("getCorePoolSize", "()I"); } set { IExecuteWithSignature("setCorePoolSize", "(I)V", value); }
+            return IExecuteWithSignature<bool>("prestartCoreThread", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getLargestPoolSize()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#remove(java.lang.Runnable)"/>
         /// </summary>
-        public int LargestPoolSize
+        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Remove(Java.Lang.Runnable arg0)
         {
-            get { return IExecuteWithSignature<int>("getLargestPoolSize", "()I"); }
+            return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Runnable;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getMaximumPoolSize()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#setMaximumPoolSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getActiveCount()"/>
         /// </summary>
-        public int MaximumPoolSize
+        /// <returns><see cref="int"/></returns>
+        public int GetActiveCount()
         {
-            get { return IExecuteWithSignature<int>("getMaximumPoolSize", "()I"); } set { IExecuteWithSignature("setMaximumPoolSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getActiveCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getPoolSize()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getCorePoolSize()"/>
         /// </summary>
-        public int PoolSize
+        /// <returns><see cref="int"/></returns>
+        public int GetCorePoolSize()
         {
-            get { return IExecuteWithSignature<int>("getPoolSize", "()I"); }
+            return IExecuteWithSignature<int>("getCorePoolSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getQueue()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getLargestPoolSize()"/>
         /// </summary>
-        public Java.Util.Concurrent.BlockingQueue<Java.Lang.Runnable> Queue
+        /// <returns><see cref="int"/></returns>
+        public int GetLargestPoolSize()
         {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.BlockingQueue<Java.Lang.Runnable>>("getQueue", "()Ljava/util/concurrent/BlockingQueue;"); }
+            return IExecuteWithSignature<int>("getLargestPoolSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getRejectedExecutionHandler()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#setRejectedExecutionHandler(java.util.concurrent.RejectedExecutionHandler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getMaximumPoolSize()"/>
         /// </summary>
-        public Java.Util.Concurrent.RejectedExecutionHandler RejectedExecutionHandler
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumPoolSize()
         {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.RejectedExecutionHandler>("getRejectedExecutionHandler", "()Ljava/util/concurrent/RejectedExecutionHandler;"); } set { IExecuteWithSignature("setRejectedExecutionHandler", "(Ljava/util/concurrent/RejectedExecutionHandler;)V", value); }
+            return IExecuteWithSignature<int>("getMaximumPoolSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getTaskCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getPoolSize()"/>
         /// </summary>
-        public long TaskCount
+        /// <returns><see cref="int"/></returns>
+        public int GetPoolSize()
         {
-            get { return IExecuteWithSignature<long>("getTaskCount", "()J"); }
+            return IExecuteWithSignature<int>("getPoolSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getThreadFactory()"/> <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#setThreadFactory(java.util.concurrent.ThreadFactory)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#prestartAllCoreThreads()"/>
         /// </summary>
-        public Java.Util.Concurrent.ThreadFactory ThreadFactory
+        /// <returns><see cref="int"/></returns>
+        public int PrestartAllCoreThreads()
         {
-            get { return IExecuteWithSignature<Java.Util.Concurrent.ThreadFactory>("getThreadFactory", "()Ljava/util/concurrent/ThreadFactory;"); } set { IExecuteWithSignature("setThreadFactory", "(Ljava/util/concurrent/ThreadFactory;)V", value); }
+            return IExecuteWithSignature<int>("prestartAllCoreThreads", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#allowsCoreThreadTimeOut()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getQueue()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool AllowsCoreThreadTimeOut()
+        /// <returns><see cref="Java.Util.Concurrent.BlockingQueue"/></returns>
+        public Java.Util.Concurrent.BlockingQueue<Java.Lang.Runnable> GetQueue()
         {
-            return IExecuteWithSignature<bool>("allowsCoreThreadTimeOut", "()Z");
+            return IExecuteWithSignature<Java.Util.Concurrent.BlockingQueue<Java.Lang.Runnable>>("getQueue", "()Ljava/util/concurrent/BlockingQueue;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#isTerminating()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getRejectedExecutionHandler()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsTerminating()
+        /// <returns><see cref="Java.Util.Concurrent.RejectedExecutionHandler"/></returns>
+        public Java.Util.Concurrent.RejectedExecutionHandler GetRejectedExecutionHandler()
         {
-            return IExecuteWithSignature<bool>("isTerminating", "()Z");
+            return IExecuteWithSignature<Java.Util.Concurrent.RejectedExecutionHandler>("getRejectedExecutionHandler", "()Ljava/util/concurrent/RejectedExecutionHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#prestartCoreThread()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getThreadFactory()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool PrestartCoreThread()
+        /// <returns><see cref="Java.Util.Concurrent.ThreadFactory"/></returns>
+        public Java.Util.Concurrent.ThreadFactory GetThreadFactory()
         {
-            return IExecuteWithSignature<bool>("prestartCoreThread", "()Z");
+            return IExecuteWithSignature<Java.Util.Concurrent.ThreadFactory>("getThreadFactory", "()Ljava/util/concurrent/ThreadFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#remove(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getCompletedTaskCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Remove(Java.Lang.Runnable arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetCompletedTaskCount()
         {
-            return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Runnable;)Z", arg0);
+            return IExecuteWithSignature<long>("getCompletedTaskCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#prestartAllCoreThreads()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getKeepAliveTime(java.util.concurrent.TimeUnit)"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int PrestartAllCoreThreads()
+        /// <param name="arg0"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
+        /// <returns><see cref="long"/></returns>
+        public long GetKeepAliveTime(Java.Util.Concurrent.TimeUnit arg0)
         {
-            return IExecuteWithSignature<int>("prestartAllCoreThreads", "()I");
+            return IExecuteWithSignature<long>("getKeepAliveTime", "(Ljava/util/concurrent/TimeUnit;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#getKeepAliveTime(java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#getTaskCount()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
         /// <returns><see cref="long"/></returns>
-        public long GetKeepAliveTime(Java.Util.Concurrent.TimeUnit arg0)
+        public long GetTaskCount()
         {
-            return IExecuteWithSignature<long>("getKeepAliveTime", "(Ljava/util/concurrent/TimeUnit;)J", arg0);
+            return IExecuteWithSignature<long>("getTaskCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#allowCoreThreadTimeOut(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#allowCoreThreadTimeOut(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void AllowCoreThreadTimeOut(bool arg0)
@@ -226,14 +236,22 @@ public void AllowCoreThreadTimeOut(bool arg0)
             IExecuteWithSignature("allowCoreThreadTimeOut", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#purge()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#purge()"/>
         /// </summary>
         public void Purge()
         {
             IExecuteWithSignature("purge", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.html#setKeepAliveTime(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#setCorePoolSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetCorePoolSize(int arg0)
+        {
+            IExecuteWithSignature("setCorePoolSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#setKeepAliveTime(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -241,6 +259,30 @@ public void SetKeepAliveTime(long arg0, Java.Util.Concurrent.TimeUnit arg1)
         {
             IExecute("setKeepAliveTime", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#setMaximumPoolSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaximumPoolSize(int arg0)
+        {
+            IExecuteWithSignature("setMaximumPoolSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#setRejectedExecutionHandler(java.util.concurrent.RejectedExecutionHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Concurrent.RejectedExecutionHandler"/></param>
+        public void SetRejectedExecutionHandler(Java.Util.Concurrent.RejectedExecutionHandler arg0)
+        {
+            IExecuteWithSignature("setRejectedExecutionHandler", "(Ljava/util/concurrent/RejectedExecutionHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.html#setThreadFactory(java.util.concurrent.ThreadFactory)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Concurrent.ThreadFactory"/></param>
+        public void SetThreadFactory(Java.Util.Concurrent.ThreadFactory arg0)
+        {
+            IExecuteWithSignature("setThreadFactory", "(Ljava/util/concurrent/ThreadFactory;)V", arg0);
+        }
 
         #endregion
 
@@ -266,7 +308,7 @@ public partial class AbortPolicy
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.AbortPolicy.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.AbortPolicy.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
             /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadPoolExecutor"/></param>
@@ -306,7 +348,7 @@ public partial class CallerRunsPolicy
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.CallerRunsPolicy.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.CallerRunsPolicy.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
             /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadPoolExecutor"/></param>
@@ -346,7 +388,7 @@ public partial class DiscardOldestPolicy
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.DiscardOldestPolicy.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.DiscardOldestPolicy.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
             /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadPoolExecutor"/></param>
@@ -386,7 +428,7 @@ public partial class DiscardPolicy
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/ThreadPoolExecutor.DiscardPolicy.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
+            /// <see href="https://developer.android.com/reference/java/util/concurrent/ThreadPoolExecutor.DiscardPolicy.html#rejectedExecution(java.lang.Runnable,java.util.concurrent.ThreadPoolExecutor)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
             /// <param name="arg1"><see cref="Java.Util.Concurrent.ThreadPoolExecutor"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/TimeUnit.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/TimeUnit.cs
index f2a3de0d4..c9985ec29 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/TimeUnit.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/TimeUnit.cs
@@ -38,43 +38,43 @@ public partial class TimeUnit
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#DAYS"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#DAYS"/>
         /// </summary>
         public static Java.Util.Concurrent.TimeUnit DAYS { get { if (!_DAYSReady) { _DAYSContent = SGetField<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "DAYS"); _DAYSReady = true; } return _DAYSContent; } }
         private static Java.Util.Concurrent.TimeUnit _DAYSContent = default;
         private static bool _DAYSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#HOURS"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#HOURS"/>
         /// </summary>
         public static Java.Util.Concurrent.TimeUnit HOURS { get { if (!_HOURSReady) { _HOURSContent = SGetField<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "HOURS"); _HOURSReady = true; } return _HOURSContent; } }
         private static Java.Util.Concurrent.TimeUnit _HOURSContent = default;
         private static bool _HOURSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#MICROSECONDS"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#MICROSECONDS"/>
         /// </summary>
         public static Java.Util.Concurrent.TimeUnit MICROSECONDS { get { if (!_MICROSECONDSReady) { _MICROSECONDSContent = SGetField<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "MICROSECONDS"); _MICROSECONDSReady = true; } return _MICROSECONDSContent; } }
         private static Java.Util.Concurrent.TimeUnit _MICROSECONDSContent = default;
         private static bool _MICROSECONDSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#MILLISECONDS"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#MILLISECONDS"/>
         /// </summary>
         public static Java.Util.Concurrent.TimeUnit MILLISECONDS { get { if (!_MILLISECONDSReady) { _MILLISECONDSContent = SGetField<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "MILLISECONDS"); _MILLISECONDSReady = true; } return _MILLISECONDSContent; } }
         private static Java.Util.Concurrent.TimeUnit _MILLISECONDSContent = default;
         private static bool _MILLISECONDSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#MINUTES"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#MINUTES"/>
         /// </summary>
         public static Java.Util.Concurrent.TimeUnit MINUTES { get { if (!_MINUTESReady) { _MINUTESContent = SGetField<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "MINUTES"); _MINUTESReady = true; } return _MINUTESContent; } }
         private static Java.Util.Concurrent.TimeUnit _MINUTESContent = default;
         private static bool _MINUTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#NANOSECONDS"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#NANOSECONDS"/>
         /// </summary>
         public static Java.Util.Concurrent.TimeUnit NANOSECONDS { get { if (!_NANOSECONDSReady) { _NANOSECONDSContent = SGetField<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "NANOSECONDS"); _NANOSECONDSReady = true; } return _NANOSECONDSContent; } }
         private static Java.Util.Concurrent.TimeUnit _NANOSECONDSContent = default;
         private static bool _NANOSECONDSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#SECONDS"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#SECONDS"/>
         /// </summary>
         public static Java.Util.Concurrent.TimeUnit SECONDS { get { if (!_SECONDSReady) { _SECONDSContent = SGetField<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "SECONDS"); _SECONDSReady = true; } return _SECONDSContent; } }
         private static Java.Util.Concurrent.TimeUnit _SECONDSContent = default;
@@ -84,7 +84,7 @@ public partial class TimeUnit
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#of(java.time.temporal.ChronoUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#of(java.time.temporal.ChronoUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Temporal.ChronoUnit"/></param>
         /// <returns><see cref="Java.Util.Concurrent.TimeUnit"/></returns>
@@ -93,7 +93,7 @@ public static Java.Util.Concurrent.TimeUnit Of(Java.Time.Temporal.ChronoUnit arg
             return SExecuteWithSignature<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "of", "(Ljava/time/temporal/ChronoUnit;)Ljava/util/concurrent/TimeUnit;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Concurrent.TimeUnit"/></returns>
@@ -102,7 +102,7 @@ public static Java.Util.Concurrent.TimeUnit ValueOf(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.Concurrent.TimeUnit>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/util/concurrent/TimeUnit;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Concurrent.TimeUnit"/></returns>
         public static Java.Util.Concurrent.TimeUnit[] Values()
@@ -114,7 +114,7 @@ public static Java.Util.Concurrent.TimeUnit[] Values()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#toChronoUnit()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#toChronoUnit()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Temporal.ChronoUnit"/></returns>
         public Java.Time.Temporal.ChronoUnit ToChronoUnit()
@@ -122,7 +122,7 @@ public Java.Time.Temporal.ChronoUnit ToChronoUnit()
             return IExecuteWithSignature<Java.Time.Temporal.ChronoUnit>("toChronoUnit", "()Ljava/time/temporal/ChronoUnit;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#convert(java.time.Duration)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#convert(java.time.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Duration"/></param>
         /// <returns><see cref="long"/></returns>
@@ -131,7 +131,7 @@ public long Convert(Java.Time.Duration arg0)
             return IExecuteWithSignature<long>("convert", "(Ljava/time/Duration;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#convert(long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#convert(long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Concurrent.TimeUnit"/></param>
@@ -141,7 +141,7 @@ public long Convert(long arg0, Java.Util.Concurrent.TimeUnit arg1)
             return IExecute<long>("convert", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#toDays(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#toDays(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -150,7 +150,7 @@ public long ToDays(long arg0)
             return IExecuteWithSignature<long>("toDays", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#toHours(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#toHours(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -159,7 +159,7 @@ public long ToHours(long arg0)
             return IExecuteWithSignature<long>("toHours", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#toMicros(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#toMicros(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -168,7 +168,7 @@ public long ToMicros(long arg0)
             return IExecuteWithSignature<long>("toMicros", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#toMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#toMillis(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -177,7 +177,7 @@ public long ToMillis(long arg0)
             return IExecuteWithSignature<long>("toMillis", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#toMinutes(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#toMinutes(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -186,7 +186,7 @@ public long ToMinutes(long arg0)
             return IExecuteWithSignature<long>("toMinutes", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#toNanos(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#toNanos(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -195,7 +195,7 @@ public long ToNanos(long arg0)
             return IExecuteWithSignature<long>("toNanos", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#toSeconds(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#toSeconds(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -204,7 +204,7 @@ public long ToSeconds(long arg0)
             return IExecuteWithSignature<long>("toSeconds", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#sleep(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#sleep(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -213,7 +213,7 @@ public void Sleep(long arg0)
             IExecuteWithSignature("sleep", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#timedJoin(java.lang.Thread,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#timedJoin(java.lang.Thread,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Thread"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -223,7 +223,7 @@ public void TimedJoin(Java.Lang.Thread arg0, long arg1)
             IExecute("timedJoin", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TimeUnit.html#timedWait(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TimeUnit.html#timedWait(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Concurrent/TransferQueue.cs b/src/net/Netdroid/Generated/Java/Util/Concurrent/TransferQueue.cs
index a63743f33..fda5ec3a6 100644
--- a/src/net/Netdroid/Generated/Java/Util/Concurrent/TransferQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Concurrent/TransferQueue.cs
@@ -46,14 +46,7 @@ public partial class TransferQueue
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#getWaitingConsumerCount()"/> 
-        /// </summary>
-        public int WaitingConsumerCount
-        {
-            get { return IExecuteWithSignature<int>("getWaitingConsumerCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#hasWaitingConsumer()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#hasWaitingConsumer()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasWaitingConsumer()
@@ -61,7 +54,7 @@ public bool HasWaitingConsumer()
             return IExecuteWithSignature<bool>("hasWaitingConsumer", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#tryTransfer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#tryTransfer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -73,7 +66,7 @@ public bool TryTransfer(object arg0, long arg1, Java.Util.Concurrent.TimeUnit ar
             return IExecute<bool>("tryTransfer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#tryTransfer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#tryTransfer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -82,7 +75,15 @@ public bool TryTransfer(object arg0)
             return IExecuteWithSignature<bool>("tryTransfer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#transfer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#getWaitingConsumerCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWaitingConsumerCount()
+        {
+            return IExecuteWithSignature<int>("getWaitingConsumerCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#transfer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
@@ -144,14 +145,7 @@ public partial class TransferQueue<E> : Java.Util.Concurrent.ITransferQueue<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#getWaitingConsumerCount()"/> 
-        /// </summary>
-        public int WaitingConsumerCount
-        {
-            get { return IExecuteWithSignature<int>("getWaitingConsumerCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#hasWaitingConsumer()"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#hasWaitingConsumer()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasWaitingConsumer()
@@ -159,7 +153,7 @@ public bool HasWaitingConsumer()
             return IExecuteWithSignature<bool>("hasWaitingConsumer", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#tryTransfer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#tryTransfer(java.lang.Object,long,java.util.concurrent.TimeUnit)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -171,7 +165,7 @@ public bool TryTransfer(E arg0, long arg1, Java.Util.Concurrent.TimeUnit arg2)
             return IExecute<bool>("tryTransfer", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#tryTransfer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#tryTransfer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -180,7 +174,15 @@ public bool TryTransfer(E arg0)
             return IExecuteWithSignature<bool>("tryTransfer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/concurrent/TransferQueue.html#transfer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#getWaitingConsumerCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetWaitingConsumerCount()
+        {
+            return IExecuteWithSignature<int>("getWaitingConsumerCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/concurrent/TransferQueue.html#transfer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <exception cref="Java.Lang.InterruptedException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Currency.cs b/src/net/Netdroid/Generated/Java/Util/Currency.cs
index 2f6f1fa8e..7c839c3ec 100644
--- a/src/net/Netdroid/Generated/Java/Util/Currency.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Currency.cs
@@ -42,14 +42,7 @@ public partial class Currency
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getAvailableCurrencies()"/> 
-        /// </summary>
-        public static Java.Util.Set<Java.Util.Currency> AvailableCurrencies
-        {
-            get { return SExecuteWithSignature<Java.Util.Set<Java.Util.Currency>>(LocalBridgeClazz, "getAvailableCurrencies", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Currency"/></returns>
@@ -58,7 +51,7 @@ public static Java.Util.Currency GetInstance(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.Currency>(LocalBridgeClazz, "getInstance", "(Ljava/lang/String;)Ljava/util/Currency;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getInstance(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getInstance(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Util.Currency"/></returns>
@@ -66,63 +59,77 @@ public static Java.Util.Currency GetInstance(Java.Util.Locale arg0)
         {
             return SExecuteWithSignature<Java.Util.Currency>(LocalBridgeClazz, "getInstance", "(Ljava/util/Locale;)Ljava/util/Currency;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getAvailableCurrencies()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public static Java.Util.Set<Java.Util.Currency> GetAvailableCurrencies()
+        {
+            return SExecuteWithSignature<Java.Util.Set<Java.Util.Currency>>(LocalBridgeClazz, "getAvailableCurrencies", "()Ljava/util/Set;");
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getCurrencyCode()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getDefaultFractionDigits()"/>
         /// </summary>
-        public Java.Lang.String CurrencyCode
+        /// <returns><see cref="int"/></returns>
+        public int GetDefaultFractionDigits()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCurrencyCode", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getDefaultFractionDigits", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getDefaultFractionDigits()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getNumericCode()"/>
         /// </summary>
-        public int DefaultFractionDigits
+        /// <returns><see cref="int"/></returns>
+        public int GetNumericCode()
         {
-            get { return IExecuteWithSignature<int>("getDefaultFractionDigits", "()I"); }
+            return IExecuteWithSignature<int>("getNumericCode", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getCurrencyCode()"/>
         /// </summary>
-        public Java.Lang.String DisplayName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCurrencyCode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCurrencyCode", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getNumericCode()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getDisplayName()"/>
         /// </summary>
-        public int NumericCode
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName()
         {
-            get { return IExecuteWithSignature<int>("getNumericCode", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getNumericCodeAsString()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getDisplayName(java.util.Locale)"/>
         /// </summary>
-        public Java.Lang.String NumericCodeAsString
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNumericCodeAsString", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getSymbol()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getNumericCodeAsString()"/>
         /// </summary>
-        public Java.Lang.String Symbol
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNumericCodeAsString()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSymbol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNumericCodeAsString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getDisplayName(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getSymbol()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
+        public Java.Lang.String GetSymbol()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getSymbol", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Currency.html#getSymbol(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Currency.html#getSymbol(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Date.cs b/src/net/Netdroid/Generated/Java/Util/Date.cs
index 2960e1fa3..cc2ebb473 100644
--- a/src/net/Netdroid/Generated/Java/Util/Date.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Date.cs
@@ -30,7 +30,7 @@ public partial class Date : Java.Io.ISerializable, Java.Lang.ICloneable, Java.La
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#%3Cinit%3E(int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#%3Cinit%3E(int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -38,46 +38,46 @@ public partial class Date : Java.Io.ISerializable, Java.Lang.ICloneable, Java.La
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Date(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
             : base(arg0, arg1, arg2, arg3, arg4, arg5)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#%3Cinit%3E(int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#%3Cinit%3E(int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <param name="arg4"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Date(int arg0, int arg1, int arg2, int arg3, int arg4)
             : base(arg0, arg1, arg2, arg3, arg4)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#%3Cinit%3E(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#%3Cinit%3E(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Date(int arg0, int arg1, int arg2)
             : base(arg0, arg1, arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Date(Java.Lang.String arg0)
             : base(arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public Date(long arg0)
@@ -109,7 +109,7 @@ public Date(long arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#from(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#from(java.time.Instant)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
         /// <returns><see cref="Java.Util.Date"/></returns>
@@ -118,17 +118,17 @@ public static Java.Util.Date From(Java.Time.Instant arg0)
             return SExecuteWithSignature<Java.Util.Date>(LocalBridgeClazz, "from", "(Ljava/time/Instant;)Ljava/util/Date;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long Parse(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<long>(LocalBridgeClazz, "parse", "(Ljava/lang/String;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#UTC(int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#UTC(int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -137,7 +137,7 @@ public static long Parse(Java.Lang.String arg0)
         /// <param name="arg4"><see cref="int"/></param>
         /// <param name="arg5"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static long UTC(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
         {
             return SExecute<long>(LocalBridgeClazz, "UTC", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -147,132 +147,133 @@ public static long UTC(int arg0, int arg1, int arg2, int arg3, int arg4, int arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getDay()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#after(java.util.Date)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Day
-        {
-            get { return IExecuteWithSignature<int>("getDay", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getDate()"/> 
-        /// </summary>
-        [System.Obsolete()]
-        public int GetDate
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool After(Java.Util.Date arg0)
         {
-            get { return IExecuteWithSignature<int>("getDate", "()I"); }
+            return IExecuteWithSignature<bool>("after", "(Ljava/util/Date;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getHours()"/> <see href="https://developer.android.com/reference/java.base/java/util/Date.html#setHours(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#before(java.util.Date)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Hours
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool Before(Java.Util.Date arg0)
         {
-            get { return IExecuteWithSignature<int>("getHours", "()I"); } set { IExecuteWithSignature("setHours", "(I)V", value); }
+            return IExecuteWithSignature<bool>("before", "(Ljava/util/Date;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getMinutes()"/> <see href="https://developer.android.com/reference/java.base/java/util/Date.html#setMinutes(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#compareTo(java.lang.Object)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Minutes
+        /// <param name="arg0"><see cref="object"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(object arg0)
         {
-            get { return IExecuteWithSignature<int>("getMinutes", "()I"); } set { IExecuteWithSignature("setMinutes", "(I)V", value); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getMonth()"/> <see href="https://developer.android.com/reference/java.base/java/util/Date.html#setMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#compareTo(java.util.Date)"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Month
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int CompareTo(Java.Util.Date arg0)
         {
-            get { return IExecuteWithSignature<int>("getMonth", "()I"); } set { IExecuteWithSignature("setMonth", "(I)V", value); }
+            return IExecuteWithSignature<int>("compareTo", "(Ljava/util/Date;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getSeconds()"/> <see href="https://developer.android.com/reference/java.base/java/util/Date.html#setSeconds(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getDate()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Seconds
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetDate()
         {
-            get { return IExecuteWithSignature<int>("getSeconds", "()I"); } set { IExecuteWithSignature("setSeconds", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDate", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getTime()"/> <see href="https://developer.android.com/reference/java.base/java/util/Date.html#setTime(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getDay()"/>
         /// </summary>
-        public long Time
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetDay()
         {
-            get { return IExecuteWithSignature<long>("getTime", "()J"); } set { IExecuteWithSignature("setTime", "(J)V", value); }
+            return IExecuteWithSignature<int>("getDay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getTimezoneOffset()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getHours()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int TimezoneOffset
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetHours()
         {
-            get { return IExecuteWithSignature<int>("getTimezoneOffset", "()I"); }
+            return IExecuteWithSignature<int>("getHours", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#getYear()"/> <see href="https://developer.android.com/reference/java.base/java/util/Date.html#setYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getMinutes()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int Year
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMinutes()
         {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); } set { IExecuteWithSignature("setYear", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMinutes", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#after(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getMonth()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool After(Java.Util.Date arg0)
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetMonth()
         {
-            return IExecuteWithSignature<bool>("after", "(Ljava/util/Date;)Z", arg0);
+            return IExecuteWithSignature<int>("getMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#before(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getSeconds()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool Before(Java.Util.Date arg0)
+        /// <returns><see cref="int"/></returns>
+        [global::System.Obsolete()]
+        public int GetSeconds()
         {
-            return IExecuteWithSignature<bool>("before", "(Ljava/util/Date;)Z", arg0);
+            return IExecuteWithSignature<int>("getSeconds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getTimezoneOffset()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
-        public int CompareTo(object arg0)
+        [global::System.Obsolete()]
+        public int GetTimezoneOffset()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
+            return IExecuteWithSignature<int>("getTimezoneOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#compareTo(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getYear()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         /// <returns><see cref="int"/></returns>
-        public int CompareTo(Java.Util.Date arg0)
+        [global::System.Obsolete()]
+        public int GetYear()
         {
-            return IExecuteWithSignature<int>("compareTo", "(Ljava/util/Date;)I", arg0);
+            return IExecuteWithSignature<int>("getYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#toGMTString()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#toGMTString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String ToGMTString()
         {
             return IExecuteWithSignature<Java.Lang.String>("toGMTString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#toLocaleString()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#toLocaleString()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Lang.String ToLocaleString()
         {
             return IExecuteWithSignature<Java.Lang.String>("toLocaleString", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#toInstant()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#toInstant()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.Instant"/></returns>
         public Java.Time.Instant ToInstant()
@@ -280,14 +281,75 @@ public Java.Time.Instant ToInstant()
             return IExecuteWithSignature<Java.Time.Instant>("toInstant", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Date.html#setDate(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#getTime()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetTime()
+        {
+            return IExecuteWithSignature<long>("getTime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#setDate(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void SetDate(int arg0)
         {
             IExecuteWithSignature("setDate", "(I)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#setHours(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetHours(int arg0)
+        {
+            IExecuteWithSignature("setHours", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#setMinutes(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetMinutes(int arg0)
+        {
+            IExecuteWithSignature("setMinutes", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#setMonth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetMonth(int arg0)
+        {
+            IExecuteWithSignature("setMonth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#setSeconds(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetSeconds(int arg0)
+        {
+            IExecuteWithSignature("setSeconds", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#setTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetTime(long arg0)
+        {
+            IExecuteWithSignature("setTime", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Date.html#setYear(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        [global::System.Obsolete()]
+        public void SetYear(int arg0)
+        {
+            IExecuteWithSignature("setYear", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Util/Deque.cs b/src/net/Netdroid/Generated/Java/Util/Deque.cs
index c66098bcc..bd43371c5 100644
--- a/src/net/Netdroid/Generated/Java/Util/Deque.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Deque.cs
@@ -46,21 +46,7 @@ public partial class Deque
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#getFirst()"/> 
-        /// </summary>
-        public object First
-        {
-            get { return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#getLast()"/> 
-        /// </summary>
-        public object Last
-        {
-            get { return IExecuteWithSignature("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -69,7 +55,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -78,7 +64,7 @@ public bool AddAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -87,7 +73,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -96,7 +82,7 @@ public bool Offer(object arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -105,7 +91,7 @@ public bool OfferFirst(object arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -114,7 +100,7 @@ public bool OfferLast(object arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -123,7 +109,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -132,7 +118,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -141,7 +127,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#element()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Element()
@@ -149,7 +135,23 @@ public object Element()
             return IExecuteWithSignature("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#getFirst()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetFirst()
+        {
+            return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#getLast()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetLast()
+        {
+            return IExecuteWithSignature("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#peek()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Peek()
@@ -157,7 +159,7 @@ public object Peek()
             return IExecuteWithSignature("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#peekFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekFirst()
@@ -165,7 +167,7 @@ public object PeekFirst()
             return IExecuteWithSignature("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#peekLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekLast()
@@ -173,7 +175,7 @@ public object PeekLast()
             return IExecuteWithSignature("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#poll()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Poll()
@@ -181,7 +183,7 @@ public object Poll()
             return IExecuteWithSignature("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#pollFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollFirst()
@@ -189,7 +191,7 @@ public object PollFirst()
             return IExecuteWithSignature("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#pollLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollLast()
@@ -197,7 +199,7 @@ public object PollLast()
             return IExecuteWithSignature("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#pop()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Pop()
@@ -205,7 +207,7 @@ public object Pop()
             return IExecuteWithSignature("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#remove()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Remove()
@@ -213,7 +215,7 @@ public object Remove()
             return IExecuteWithSignature("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#removeFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveFirst()
@@ -221,7 +223,7 @@ public object RemoveFirst()
             return IExecuteWithSignature("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#removeLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveLast()
@@ -229,7 +231,7 @@ public object RemoveLast()
             return IExecuteWithSignature("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -237,7 +239,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator DescendingIterator()
@@ -245,7 +247,7 @@ public Java.Util.Iterator DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -253,7 +255,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddFirst(object arg0)
@@ -261,7 +263,7 @@ public void AddFirst(object arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddLast(object arg0)
@@ -269,7 +271,7 @@ public void AddLast(object arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Push(object arg0)
@@ -330,21 +332,7 @@ public partial class Deque<E> : Java.Util.IDeque<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#getFirst()"/> 
-        /// </summary>
-        public E First
-        {
-            get { return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#getLast()"/> 
-        /// </summary>
-        public E Last
-        {
-            get { return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -353,17 +341,17 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -372,7 +360,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -381,7 +369,7 @@ public bool Offer(E arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -390,7 +378,7 @@ public bool OfferFirst(E arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -399,7 +387,7 @@ public bool OfferLast(E arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -408,7 +396,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -417,7 +405,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -426,7 +414,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#element()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Element()
@@ -434,7 +422,23 @@ public E Element()
             return IExecuteWithSignature<E>("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#getFirst()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetFirst()
+        {
+            return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#getLast()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetLast()
+        {
+            return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#peek()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Peek()
@@ -442,7 +446,7 @@ public E Peek()
             return IExecuteWithSignature<E>("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#peekFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekFirst()
@@ -450,7 +454,7 @@ public E PeekFirst()
             return IExecuteWithSignature<E>("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#peekLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekLast()
@@ -458,7 +462,7 @@ public E PeekLast()
             return IExecuteWithSignature<E>("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#poll()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Poll()
@@ -466,7 +470,7 @@ public E Poll()
             return IExecuteWithSignature<E>("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#pollFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollFirst()
@@ -474,7 +478,7 @@ public E PollFirst()
             return IExecuteWithSignature<E>("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#pollLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollLast()
@@ -482,7 +486,7 @@ public E PollLast()
             return IExecuteWithSignature<E>("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#pop()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Pop()
@@ -490,7 +494,7 @@ public E Pop()
             return IExecuteWithSignature<E>("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#remove()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Remove()
@@ -498,7 +502,7 @@ public E Remove()
             return IExecuteWithSignature<E>("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#removeFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveFirst()
@@ -506,7 +510,7 @@ public E RemoveFirst()
             return IExecuteWithSignature<E>("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#removeLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveLast()
@@ -514,7 +518,7 @@ public E RemoveLast()
             return IExecuteWithSignature<E>("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -522,7 +526,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> DescendingIterator()
@@ -530,7 +534,7 @@ public Java.Util.Iterator<E> DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> Iterator()
@@ -538,7 +542,7 @@ public Java.Util.Iterator<E> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddFirst(E arg0)
@@ -546,7 +550,7 @@ public void AddFirst(E arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddLast(E arg0)
@@ -554,7 +558,7 @@ public void AddLast(E arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Deque.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Deque.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Push(E arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Dictionary.cs b/src/net/Netdroid/Generated/Java/Util/Dictionary.cs
index c995be8de..ae25943bb 100644
--- a/src/net/Netdroid/Generated/Java/Util/Dictionary.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Dictionary.cs
@@ -46,7 +46,7 @@ public partial class Dictionary
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -54,7 +54,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -62,7 +62,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#keys()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#keys()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration Keys()
@@ -70,7 +70,7 @@ public Java.Util.Enumeration Keys()
             return IExecuteWithSignature<Java.Util.Enumeration>("keys", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#elements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#elements()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration Elements()
@@ -78,7 +78,7 @@ public Java.Util.Enumeration Elements()
             return IExecuteWithSignature<Java.Util.Enumeration>("elements", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -87,7 +87,7 @@ public object Get(object arg0)
             return IExecuteWithSignature("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#put(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#put(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -97,7 +97,7 @@ public object Put(object arg0, object arg1)
             return IExecute("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -141,7 +141,7 @@ public partial class Dictionary<K, V>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -149,7 +149,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -157,7 +157,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#keys()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#keys()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<K> Keys()
@@ -165,7 +165,7 @@ public Java.Util.Enumeration<K> Keys()
             return IExecuteWithSignature<Java.Util.Enumeration<K>>("keys", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#elements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#elements()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<V> Elements()
@@ -173,7 +173,7 @@ public Java.Util.Enumeration<V> Elements()
             return IExecuteWithSignature<Java.Util.Enumeration<V>>("elements", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -182,7 +182,7 @@ public V Get(object arg0)
             return IExecuteWithSignature<V>("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#put(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#put(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -192,7 +192,7 @@ public V Put(K arg0, V arg1)
             return IExecute<V>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Dictionary.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Dictionary.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><typeparamref name="V"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/DoubleSummaryStatistics.cs b/src/net/Netdroid/Generated/Java/Util/DoubleSummaryStatistics.cs
index 0ea7a44f7..d3e668898 100644
--- a/src/net/Netdroid/Generated/Java/Util/DoubleSummaryStatistics.cs
+++ b/src/net/Netdroid/Generated/Java/Util/DoubleSummaryStatistics.cs
@@ -30,7 +30,7 @@ public partial class DoubleSummaryStatistics
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html#%3Cinit%3E(long,double,double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html#%3Cinit%3E(long,double,double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -62,42 +62,47 @@ public DoubleSummaryStatistics(long arg0, double arg1, double arg2, double arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html#getAverage()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html#getAverage()"/>
         /// </summary>
-        public double Average
+        /// <returns><see cref="double"/></returns>
+        public double GetAverage()
         {
-            get { return IExecuteWithSignature<double>("getAverage", "()D"); }
+            return IExecuteWithSignature<double>("getAverage", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html#getMax()"/>
         /// </summary>
-        public long Count
+        /// <returns><see cref="double"/></returns>
+        public double GetMax()
         {
-            get { return IExecuteWithSignature<long>("getCount", "()J"); }
+            return IExecuteWithSignature<double>("getMax", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html#getMax()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html#getMin()"/>
         /// </summary>
-        public double Max
+        /// <returns><see cref="double"/></returns>
+        public double GetMin()
         {
-            get { return IExecuteWithSignature<double>("getMax", "()D"); }
+            return IExecuteWithSignature<double>("getMin", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html#getMin()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html#getSum()"/>
         /// </summary>
-        public double Min
+        /// <returns><see cref="double"/></returns>
+        public double GetSum()
         {
-            get { return IExecuteWithSignature<double>("getMin", "()D"); }
+            return IExecuteWithSignature<double>("getSum", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html#getSum()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html#getCount()"/>
         /// </summary>
-        public double Sum
+        /// <returns><see cref="long"/></returns>
+        public long GetCount()
         {
-            get { return IExecuteWithSignature<double>("getSum", "()D"); }
+            return IExecuteWithSignature<long>("getCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html#accept(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html#accept(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public void Accept(double arg0)
@@ -105,7 +110,7 @@ public void Accept(double arg0)
             IExecuteWithSignature("accept", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/DoubleSummaryStatistics.html#combine(java.util.DoubleSummaryStatistics)"/>
+        /// <see href="https://developer.android.com/reference/java/util/DoubleSummaryStatistics.html#combine(java.util.DoubleSummaryStatistics)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.DoubleSummaryStatistics"/></param>
         public void Combine(Java.Util.DoubleSummaryStatistics arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/EnumMap.cs b/src/net/Netdroid/Generated/Java/Util/EnumMap.cs
index 79658cc4d..3e32d8132 100644
--- a/src/net/Netdroid/Generated/Java/Util/EnumMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/EnumMap.cs
@@ -30,7 +30,7 @@ public partial class EnumMap
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#%3Cinit%3E(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#%3Cinit%3E(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         public EnumMap(Java.Lang.Class arg0)
@@ -38,7 +38,7 @@ public EnumMap(Java.Lang.Class arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#%3Cinit%3E(java.util.EnumMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#%3Cinit%3E(java.util.EnumMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.EnumMap"/></param>
         public EnumMap(Java.Util.EnumMap arg0)
@@ -46,7 +46,7 @@ public EnumMap(Java.Util.EnumMap arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public EnumMap(Java.Util.Map arg0)
@@ -78,7 +78,7 @@ public EnumMap(Java.Util.Map arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.EnumMap"/></returns>
         public Java.Util.EnumMap Clone()
@@ -86,7 +86,7 @@ public Java.Util.EnumMap Clone()
             return IExecuteWithSignature<Java.Util.EnumMap>("clone", "()Ljava/util/EnumMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#put(java.lang.Enum,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#put(java.lang.Enum,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -111,7 +111,7 @@ public partial class EnumMap<K, V> : Java.Io.ISerializable, Java.Lang.ICloneable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#%3Cinit%3E(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#%3Cinit%3E(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         public EnumMap(Java.Lang.Class arg0)
@@ -119,7 +119,7 @@ public EnumMap(Java.Lang.Class arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#%3Cinit%3E(java.util.EnumMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#%3Cinit%3E(java.util.EnumMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.EnumMap"/></param>
         public EnumMap(Java.Util.EnumMap<K, V> arg0)
@@ -127,7 +127,7 @@ public EnumMap(Java.Util.EnumMap<K, V> arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public EnumMap(Java.Util.Map<K, V> arg0)
@@ -163,7 +163,7 @@ public EnumMap(Java.Util.Map<K, V> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.EnumMap"/></returns>
         public Java.Util.EnumMap Clone()
@@ -171,7 +171,7 @@ public Java.Util.EnumMap Clone()
             return IExecuteWithSignature<Java.Util.EnumMap>("clone", "()Ljava/util/EnumMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumMap.html#put(java.lang.Enum,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumMap.html#put(java.lang.Enum,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/EnumSet.cs b/src/net/Netdroid/Generated/Java/Util/EnumSet.cs
index d3d22f846..87b3519aa 100644
--- a/src/net/Netdroid/Generated/Java/Util/EnumSet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/EnumSet.cs
@@ -50,52 +50,52 @@ public partial class EnumSet
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#allOf(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#allOf(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet AllOf(Java.Lang.Class arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet>(LocalBridgeClazz, "allOf", "(Ljava/lang/Class;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "allOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#complementOf(java.util.EnumSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#complementOf(java.util.EnumSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.EnumSet"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet ComplementOf(Java.Util.EnumSet arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet>(LocalBridgeClazz, "complementOf", "(Ljava/util/EnumSet;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "complementOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#copyOf(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#copyOf(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet CopyOf(Java.Util.Collection arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet>(LocalBridgeClazz, "copyOf", "(Ljava/util/Collection;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "copyOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#copyOf(java.util.EnumSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#copyOf(java.util.EnumSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.EnumSet"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet CopyOf(Java.Util.EnumSet arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet>(LocalBridgeClazz, "copyOf", "(Ljava/util/EnumSet;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "copyOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#noneOf(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#noneOf(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet NoneOf(Java.Lang.Class arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet>(LocalBridgeClazz, "noneOf", "(Ljava/lang/Class;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "noneOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Enum"/></param>
@@ -108,7 +108,7 @@ public static Java.Util.EnumSet Of(Java.Lang.Enum arg0, Java.Lang.Enum arg1, Jav
             return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Enum"/></param>
@@ -120,7 +120,7 @@ public static Java.Util.EnumSet Of(Java.Lang.Enum arg0, Java.Lang.Enum arg1, Jav
             return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Enum"/></param>
@@ -131,7 +131,7 @@ public static Java.Util.EnumSet Of(Java.Lang.Enum arg0, Java.Lang.Enum arg1, Jav
             return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Enum"/></param>
@@ -141,7 +141,7 @@ public static Java.Util.EnumSet Of(Java.Lang.Enum arg0, params Java.Lang.Enum[]
             if (arg1.Length == 0) return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "of", arg0); else return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Enum"/></param>
@@ -151,16 +151,16 @@ public static Java.Util.EnumSet Of(Java.Lang.Enum arg0, Java.Lang.Enum arg1)
             return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet Of(Java.Lang.Enum arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet>(LocalBridgeClazz, "of", "(Ljava/lang/Enum;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet>(LocalBridgeClazz, "of", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#range(java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#range(java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Enum"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Enum"/></param>
@@ -174,7 +174,7 @@ public static Java.Util.EnumSet Range(Java.Lang.Enum arg0, Java.Lang.Enum arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public Java.Util.EnumSet Clone()
@@ -221,52 +221,52 @@ public partial class EnumSet<E> : Java.Lang.ICloneable, Java.Io.ISerializable
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#allOf(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#allOf(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet<E> AllOf(Java.Lang.Class arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet<E>>(LocalBridgeClazz, "allOf", "(Ljava/lang/Class;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "allOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#complementOf(java.util.EnumSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#complementOf(java.util.EnumSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.EnumSet"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet<E> ComplementOf(Java.Util.EnumSet<E> arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet<E>>(LocalBridgeClazz, "complementOf", "(Ljava/util/EnumSet;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "complementOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#copyOf(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#copyOf(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet<E> CopyOf(Java.Util.Collection<E> arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet<E>>(LocalBridgeClazz, "copyOf", "(Ljava/util/Collection;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "copyOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#copyOf(java.util.EnumSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#copyOf(java.util.EnumSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.EnumSet"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet<E> CopyOf(Java.Util.EnumSet<E> arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet<E>>(LocalBridgeClazz, "copyOf", "(Ljava/util/EnumSet;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "copyOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#noneOf(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#noneOf(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet<E> NoneOf(Java.Lang.Class arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet<E>>(LocalBridgeClazz, "noneOf", "(Ljava/lang/Class;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "noneOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -279,7 +279,7 @@ public static Java.Util.EnumSet<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4)
             return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -291,7 +291,7 @@ public static Java.Util.EnumSet<E> Of(E arg0, E arg1, E arg2, E arg3)
             return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -302,7 +302,7 @@ public static Java.Util.EnumSet<E> Of(E arg0, E arg1, E arg2)
             return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -312,7 +312,7 @@ public static Java.Util.EnumSet<E> Of(E arg0, params E[] arg1)
             if (arg1.Length == 0) return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "of", arg0); else return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -322,16 +322,16 @@ public static Java.Util.EnumSet<E> Of(E arg0, E arg1)
             return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#of(java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#of(java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public static Java.Util.EnumSet<E> Of(E arg0)
         {
-            return SExecuteWithSignature<Java.Util.EnumSet<E>>(LocalBridgeClazz, "of", "(Ljava/lang/Enum;)Ljava/util/EnumSet;", arg0);
+            return SExecute<Java.Util.EnumSet<E>>(LocalBridgeClazz, "of", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#range(java.lang.Enum,java.lang.Enum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#range(java.lang.Enum,java.lang.Enum)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -345,7 +345,7 @@ public static Java.Util.EnumSet<E> Range(E arg0, E arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EnumSet.html#clone()"/>
+        /// <see href="https://developer.android.com/reference/java/util/EnumSet.html#clone()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.EnumSet"/></returns>
         public Java.Util.EnumSet<E> Clone()
diff --git a/src/net/Netdroid/Generated/Java/Util/Enumeration.cs b/src/net/Netdroid/Generated/Java/Util/Enumeration.cs
index 1a027a1f1..ef730bd81 100644
--- a/src/net/Netdroid/Generated/Java/Util/Enumeration.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Enumeration.cs
@@ -46,7 +46,7 @@ public partial class Enumeration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Enumeration.html#hasMoreElements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Enumeration.html#hasMoreElements()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasMoreElements()
@@ -54,7 +54,7 @@ public bool HasMoreElements()
             return IExecuteWithSignature<bool>("hasMoreElements", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Enumeration.html#nextElement()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Enumeration.html#nextElement()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object NextElement()
@@ -62,7 +62,7 @@ public object NextElement()
             return IExecuteWithSignature("nextElement", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Enumeration.html#asIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Enumeration.html#asIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator AsIterator()
@@ -123,7 +123,7 @@ public partial class Enumeration<E> : Java.Util.IEnumeration<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Enumeration.html#hasMoreElements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Enumeration.html#hasMoreElements()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasMoreElements()
@@ -131,7 +131,7 @@ public bool HasMoreElements()
             return IExecuteWithSignature<bool>("hasMoreElements", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Enumeration.html#nextElement()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Enumeration.html#nextElement()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E NextElement()
@@ -139,7 +139,7 @@ public E NextElement()
             return IExecuteWithSignature<E>("nextElement", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Enumeration.html#asIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Enumeration.html#asIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> AsIterator()
diff --git a/src/net/Netdroid/Generated/Java/Util/EventObject.cs b/src/net/Netdroid/Generated/Java/Util/EventObject.cs
index bc66b00d0..84e55ac68 100644
--- a/src/net/Netdroid/Generated/Java/Util/EventObject.cs
+++ b/src/net/Netdroid/Generated/Java/Util/EventObject.cs
@@ -30,7 +30,7 @@ public partial class EventObject
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EventObject.html#%3Cinit%3E(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/EventObject.html#%3Cinit%3E(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public EventObject(object arg0)
@@ -54,11 +54,12 @@ public EventObject(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/EventObject.html#getSource()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/EventObject.html#getSource()"/>
         /// </summary>
-        public object Source
+        /// <returns><see cref="object"/></returns>
+        public object GetSource()
         {
-            get { return IExecuteWithSignature("getSource", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature("getSource", "()Ljava/lang/Object;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Formattable.cs b/src/net/Netdroid/Generated/Java/Util/Formattable.cs
index b816b518b..5a7516fe3 100644
--- a/src/net/Netdroid/Generated/Java/Util/Formattable.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Formattable.cs
@@ -64,7 +64,7 @@ public partial class Formattable : Java.Util.IFormattable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formattable.html#formatTo(java.util.Formatter,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formattable.html#formatTo(java.util.Formatter,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Formatter"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/FormattableFlags.cs b/src/net/Netdroid/Generated/Java/Util/FormattableFlags.cs
index 34e53c88c..f978c17c2 100644
--- a/src/net/Netdroid/Generated/Java/Util/FormattableFlags.cs
+++ b/src/net/Netdroid/Generated/Java/Util/FormattableFlags.cs
@@ -38,19 +38,19 @@ public partial class FormattableFlags
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/FormattableFlags.html#ALTERNATE"/>
+        /// <see href="https://developer.android.com/reference/java/util/FormattableFlags.html#ALTERNATE"/>
         /// </summary>
         public static int ALTERNATE { get { if (!_ALTERNATEReady) { _ALTERNATEContent = SGetField<int>(LocalBridgeClazz, "ALTERNATE"); _ALTERNATEReady = true; } return _ALTERNATEContent; } }
         private static int _ALTERNATEContent = default;
         private static bool _ALTERNATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/FormattableFlags.html#LEFT_JUSTIFY"/>
+        /// <see href="https://developer.android.com/reference/java/util/FormattableFlags.html#LEFT_JUSTIFY"/>
         /// </summary>
         public static int LEFT_JUSTIFY { get { if (!_LEFT_JUSTIFYReady) { _LEFT_JUSTIFYContent = SGetField<int>(LocalBridgeClazz, "LEFT_JUSTIFY"); _LEFT_JUSTIFYReady = true; } return _LEFT_JUSTIFYContent; } }
         private static int _LEFT_JUSTIFYContent = default;
         private static bool _LEFT_JUSTIFYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/FormattableFlags.html#UPPERCASE"/>
+        /// <see href="https://developer.android.com/reference/java/util/FormattableFlags.html#UPPERCASE"/>
         /// </summary>
         public static int UPPERCASE { get { if (!_UPPERCASEReady) { _UPPERCASEContent = SGetField<int>(LocalBridgeClazz, "UPPERCASE"); _UPPERCASEReady = true; } return _UPPERCASEContent; } }
         private static int _UPPERCASEContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Util/Formatter.cs b/src/net/Netdroid/Generated/Java/Util/Formatter.cs
index 74cddee6b..5fd303bef 100644
--- a/src/net/Netdroid/Generated/Java/Util/Formatter.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Formatter.cs
@@ -30,7 +30,7 @@ public partial class Formatter : Java.Io.ICloseable, Java.Io.IFlushable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.File,java.lang.String,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.File,java.lang.String,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -42,7 +42,7 @@ public Formatter(Java.Io.File arg0, Java.Lang.String arg1, Java.Util.Locale arg2
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -53,7 +53,7 @@ public Formatter(Java.Io.File arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -64,7 +64,7 @@ public Formatter(Java.Io.File arg0, Java.Nio.Charset.Charset arg1, Java.Util.Loc
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -73,7 +73,7 @@ public Formatter(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.OutputStream,java.lang.String,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.OutputStream,java.lang.String,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -84,7 +84,7 @@ public Formatter(Java.Io.OutputStream arg0, Java.Lang.String arg1, Java.Util.Loc
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.OutputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.OutputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -94,7 +94,7 @@ public Formatter(Java.Io.OutputStream arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.OutputStream,java.nio.charset.Charset,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.OutputStream,java.nio.charset.Charset,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -104,7 +104,7 @@ public Formatter(Java.Io.OutputStream arg0, Java.Nio.Charset.Charset arg1, Java.
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public Formatter(Java.Io.OutputStream arg0)
@@ -112,7 +112,7 @@ public Formatter(Java.Io.OutputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.io.PrintStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.io.PrintStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PrintStream"/></param>
         public Formatter(Java.Io.PrintStream arg0)
@@ -120,7 +120,7 @@ public Formatter(Java.Io.PrintStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.lang.Appendable,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.lang.Appendable,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Appendable"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -129,7 +129,7 @@ public Formatter(Java.Lang.Appendable arg0, Java.Util.Locale arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.lang.Appendable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.lang.Appendable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Appendable"/></param>
         public Formatter(Java.Lang.Appendable arg0)
@@ -137,7 +137,7 @@ public Formatter(Java.Lang.Appendable arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.lang.String,java.lang.String,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.lang.String,java.lang.String,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -149,7 +149,7 @@ public Formatter(Java.Lang.String arg0, Java.Lang.String arg1, Java.Util.Locale
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -160,7 +160,7 @@ public Formatter(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -171,7 +171,7 @@ public Formatter(Java.Lang.String arg0, Java.Nio.Charset.Charset arg1, Java.Util
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -180,7 +180,7 @@ public Formatter(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#%3Cinit%3E(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#%3Cinit%3E(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         public Formatter(Java.Util.Locale arg0)
@@ -212,7 +212,7 @@ public Formatter(Java.Util.Locale arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#ioException()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#ioException()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.IOException"/></returns>
         public Java.Io.IOException IoException()
@@ -220,7 +220,7 @@ public Java.Io.IOException IoException()
             var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("ioException", "()Ljava/io/IOException;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Io.IOException>(obj);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#out()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#out()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.Appendable"/></returns>
         public Java.Lang.Appendable Out()
@@ -228,7 +228,7 @@ public Java.Lang.Appendable Out()
             return IExecuteWithSignature<Java.Lang.Appendable>("out", "()Ljava/lang/Appendable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#format(java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#format(java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -238,7 +238,7 @@ public Java.Util.Formatter Format(Java.Lang.String arg0, params object[] arg1)
             if (arg1.Length == 0) return IExecute<Java.Util.Formatter>("format", arg0); else return IExecute<Java.Util.Formatter>("format", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#format(java.util.Locale,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#format(java.util.Locale,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -249,7 +249,7 @@ public Java.Util.Formatter Format(Java.Util.Locale arg0, Java.Lang.String arg1,
             if (arg2.Length == 0) return IExecute<Java.Util.Formatter>("format", arg0, arg1); else return IExecute<Java.Util.Formatter>("format", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#locale()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#locale()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Locale"/></returns>
         public Java.Util.Locale Locale()
@@ -257,14 +257,14 @@ public Java.Util.Locale Locale()
             return IExecuteWithSignature<Java.Util.Locale>("locale", "()Ljava/util/Locale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#close()"/>
         /// </summary>
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.html#flush()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Formatter.html#flush()"/>
         /// </summary>
         public void Flush()
         {
@@ -287,13 +287,13 @@ public partial class BigDecimalLayoutForm
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.BigDecimalLayoutForm.html#DECIMAL_FLOAT"/>
+            /// <see href="https://developer.android.com/reference/java/util/Formatter.BigDecimalLayoutForm.html#DECIMAL_FLOAT"/>
             /// </summary>
             public static Java.Util.Formatter.BigDecimalLayoutForm DECIMAL_FLOAT { get { if (!_DECIMAL_FLOATReady) { _DECIMAL_FLOATContent = SGetField<Java.Util.Formatter.BigDecimalLayoutForm>(LocalBridgeClazz, "DECIMAL_FLOAT"); _DECIMAL_FLOATReady = true; } return _DECIMAL_FLOATContent; } }
             private static Java.Util.Formatter.BigDecimalLayoutForm _DECIMAL_FLOATContent = default;
             private static bool _DECIMAL_FLOATReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.BigDecimalLayoutForm.html#SCIENTIFIC"/>
+            /// <see href="https://developer.android.com/reference/java/util/Formatter.BigDecimalLayoutForm.html#SCIENTIFIC"/>
             /// </summary>
             public static Java.Util.Formatter.BigDecimalLayoutForm SCIENTIFIC { get { if (!_SCIENTIFICReady) { _SCIENTIFICContent = SGetField<Java.Util.Formatter.BigDecimalLayoutForm>(LocalBridgeClazz, "SCIENTIFIC"); _SCIENTIFICReady = true; } return _SCIENTIFICContent; } }
             private static Java.Util.Formatter.BigDecimalLayoutForm _SCIENTIFICContent = default;
@@ -303,7 +303,7 @@ public partial class BigDecimalLayoutForm
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.BigDecimalLayoutForm.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Formatter.BigDecimalLayoutForm.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Formatter.BigDecimalLayoutForm"/></returns>
@@ -312,7 +312,7 @@ public static Java.Util.Formatter.BigDecimalLayoutForm ValueOf(Java.Lang.String
                 return SExecuteWithSignature<Java.Util.Formatter.BigDecimalLayoutForm>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/util/Formatter$BigDecimalLayoutForm;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Formatter.BigDecimalLayoutForm.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Formatter.BigDecimalLayoutForm.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Formatter.BigDecimalLayoutForm"/></returns>
             public static Java.Util.Formatter.BigDecimalLayoutForm[] Values()
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Function/AllPackageClasses.cs
index 773c7e17b..1cfe11524 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Function
 {
     #region BiConsumer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html"/>
     /// </summary>
     public partial class BiConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -37,10 +37,13 @@ public partial class BiConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public BiConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BiConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BiConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -62,10 +65,13 @@ public partial class BiConsumerDirect : BiConsumer
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BiConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BiConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -87,7 +93,7 @@ protected override void InitializeHandlers() { }
 
     #region BiConsumer<T, U>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="U"></typeparam>
@@ -98,10 +104,13 @@ public partial class BiConsumer<T, U> : MASES.JCOBridge.C2JBridge.JVMBridgeListe
         /// </summary>
         public BiConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BiConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BiConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -123,10 +132,13 @@ public partial class BiConsumerDirect<T, U> : BiConsumer<T, U>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BiConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BiConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -148,7 +160,7 @@ protected override void InitializeHandlers() { }
 
     #region BiFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html"/>
     /// </summary>
     public partial class BiFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -157,10 +169,13 @@ public partial class BiFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public BiFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BiFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -182,10 +197,13 @@ public partial class BiFunctionDirect : BiFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BiFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -207,7 +225,7 @@ protected override void InitializeHandlers() { }
 
     #region BiFunction<T, U, R>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="U"></typeparam>
@@ -219,10 +237,13 @@ public partial class BiFunction<T, U, R> : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public BiFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BiFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -244,10 +265,13 @@ public partial class BiFunctionDirect<T, U, R> : BiFunction<T, U, R>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BiFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -269,7 +293,7 @@ protected override void InitializeHandlers() { }
 
     #region BinaryOperator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BinaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BinaryOperator.html"/>
     /// </summary>
     public partial class BinaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -278,10 +302,13 @@ public partial class BinaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public BinaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -303,10 +330,13 @@ public partial class BinaryOperatorDirect : BinaryOperator
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -328,7 +358,7 @@ protected override void InitializeHandlers() { }
 
     #region BinaryOperator<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BinaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BinaryOperator.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class BinaryOperator<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -338,10 +368,13 @@ public partial class BinaryOperator<T> : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public BinaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -363,10 +396,13 @@ public partial class BinaryOperatorDirect<T> : BinaryOperator<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -388,7 +424,7 @@ protected override void InitializeHandlers() { }
 
     #region BiPredicate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html"/>
     /// </summary>
     public partial class BiPredicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -397,10 +433,13 @@ public partial class BiPredicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public BiPredicate() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BiPredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BiPredicate";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -422,10 +461,13 @@ public partial class BiPredicateDirect : BiPredicate
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BiPredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BiPredicate";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -447,7 +489,7 @@ protected override void InitializeHandlers() { }
 
     #region BiPredicate<T, U>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="U"></typeparam>
@@ -458,10 +500,13 @@ public partial class BiPredicate<T, U> : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public BiPredicate() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BiPredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BiPredicate";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -483,10 +528,13 @@ public partial class BiPredicateDirect<T, U> : BiPredicate<T, U>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BiPredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BiPredicate";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -508,7 +556,7 @@ protected override void InitializeHandlers() { }
 
     #region BooleanSupplier
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/BooleanSupplier.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/BooleanSupplier.html"/>
     /// </summary>
     public partial class BooleanSupplier : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -517,10 +565,13 @@ public partial class BooleanSupplier : MASES.JCOBridge.C2JBridge.JVMBridgeListen
         /// </summary>
         public BooleanSupplier() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.BooleanSupplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.BooleanSupplier";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -542,10 +593,13 @@ public partial class BooleanSupplierDirect : BooleanSupplier
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.BooleanSupplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.BooleanSupplier";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -567,7 +621,7 @@ protected override void InitializeHandlers() { }
 
     #region Consumer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html"/>
     /// </summary>
     public partial class Consumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -576,10 +630,13 @@ public partial class Consumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public Consumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.Consumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.Consumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -601,10 +658,13 @@ public partial class ConsumerDirect : Consumer
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.Consumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.Consumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -626,7 +686,7 @@ protected override void InitializeHandlers() { }
 
     #region Consumer<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Consumer<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -636,10 +696,13 @@ public partial class Consumer<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public Consumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.Consumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.Consumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -661,10 +724,13 @@ public partial class ConsumerDirect<T> : Consumer<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.Consumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.Consumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -686,7 +752,7 @@ protected override void InitializeHandlers() { }
 
     #region DoubleBinaryOperator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleBinaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoubleBinaryOperator.html"/>
     /// </summary>
     public partial class DoubleBinaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -695,10 +761,13 @@ public partial class DoubleBinaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeL
         /// </summary>
         public DoubleBinaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoubleBinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoubleBinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -720,10 +789,13 @@ public partial class DoubleBinaryOperatorDirect : DoubleBinaryOperator
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoubleBinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoubleBinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -745,7 +817,7 @@ protected override void InitializeHandlers() { }
 
     #region DoubleConsumer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html"/>
     /// </summary>
     public partial class DoubleConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -754,10 +826,13 @@ public partial class DoubleConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public DoubleConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoubleConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoubleConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -779,10 +854,13 @@ public partial class DoubleConsumerDirect : DoubleConsumer
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoubleConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoubleConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -804,7 +882,7 @@ protected override void InitializeHandlers() { }
 
     #region DoubleFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html"/>
     /// </summary>
     public partial class DoubleFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -813,10 +891,13 @@ public partial class DoubleFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public DoubleFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -838,10 +919,13 @@ public partial class DoubleFunctionDirect : DoubleFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -863,7 +947,7 @@ protected override void InitializeHandlers() { }
 
     #region DoubleFunction<R>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html"/>
     /// </summary>
     /// <typeparam name="R"></typeparam>
     public partial class DoubleFunction<R> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -873,10 +957,13 @@ public partial class DoubleFunction<R> : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public DoubleFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -898,10 +985,13 @@ public partial class DoubleFunctionDirect<R> : DoubleFunction<R>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -923,7 +1013,7 @@ protected override void InitializeHandlers() { }
 
     #region DoublePredicate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html"/>
     /// </summary>
     public partial class DoublePredicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -932,10 +1022,13 @@ public partial class DoublePredicate : MASES.JCOBridge.C2JBridge.JVMBridgeListen
         /// </summary>
         public DoublePredicate() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoublePredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoublePredicate";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -957,10 +1050,13 @@ public partial class DoublePredicateDirect : DoublePredicate
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoublePredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoublePredicate";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -982,7 +1078,7 @@ protected override void InitializeHandlers() { }
 
     #region DoubleSupplier
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleSupplier.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoubleSupplier.html"/>
     /// </summary>
     public partial class DoubleSupplier : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -991,10 +1087,13 @@ public partial class DoubleSupplier : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public DoubleSupplier() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoubleSupplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoubleSupplier";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1016,10 +1115,13 @@ public partial class DoubleSupplierDirect : DoubleSupplier
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoubleSupplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoubleSupplier";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1041,7 +1143,7 @@ protected override void InitializeHandlers() { }
 
     #region DoubleToIntFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToIntFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoubleToIntFunction.html"/>
     /// </summary>
     public partial class DoubleToIntFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1050,10 +1152,13 @@ public partial class DoubleToIntFunction : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public DoubleToIntFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoubleToIntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoubleToIntFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1075,10 +1180,13 @@ public partial class DoubleToIntFunctionDirect : DoubleToIntFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoubleToIntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoubleToIntFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1100,7 +1208,7 @@ protected override void InitializeHandlers() { }
 
     #region DoubleToLongFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToLongFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoubleToLongFunction.html"/>
     /// </summary>
     public partial class DoubleToLongFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1109,10 +1217,13 @@ public partial class DoubleToLongFunction : MASES.JCOBridge.C2JBridge.JVMBridgeL
         /// </summary>
         public DoubleToLongFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoubleToLongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoubleToLongFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1134,10 +1245,13 @@ public partial class DoubleToLongFunctionDirect : DoubleToLongFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoubleToLongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoubleToLongFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1159,7 +1273,7 @@ protected override void InitializeHandlers() { }
 
     #region DoubleUnaryOperator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html"/>
     /// </summary>
     public partial class DoubleUnaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1168,10 +1282,13 @@ public partial class DoubleUnaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public DoubleUnaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.DoubleUnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.DoubleUnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1193,10 +1310,13 @@ public partial class DoubleUnaryOperatorDirect : DoubleUnaryOperator
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.DoubleUnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.DoubleUnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1218,7 +1338,7 @@ protected override void InitializeHandlers() { }
 
     #region Function
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/Function.html"/>
     /// </summary>
     public partial class Function : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1227,10 +1347,13 @@ public partial class Function : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public Function() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.Function";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.Function";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1252,10 +1375,13 @@ public partial class FunctionDirect : Function
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.Function";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.Function";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1277,7 +1403,7 @@ protected override void InitializeHandlers() { }
 
     #region Function<T, R>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/Function.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="R"></typeparam>
@@ -1288,10 +1414,13 @@ public partial class Function<T, R> : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public Function() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.Function";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.Function";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1313,10 +1442,13 @@ public partial class FunctionDirect<T, R> : Function<T, R>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.Function";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.Function";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1338,7 +1470,7 @@ protected override void InitializeHandlers() { }
 
     #region IntBinaryOperator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntBinaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntBinaryOperator.html"/>
     /// </summary>
     public partial class IntBinaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1347,10 +1479,13 @@ public partial class IntBinaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public IntBinaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntBinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntBinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1372,10 +1507,13 @@ public partial class IntBinaryOperatorDirect : IntBinaryOperator
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntBinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntBinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1397,7 +1535,7 @@ protected override void InitializeHandlers() { }
 
     #region IntConsumer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html"/>
     /// </summary>
     public partial class IntConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1406,10 +1544,13 @@ public partial class IntConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public IntConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1431,10 +1572,13 @@ public partial class IntConsumerDirect : IntConsumer
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1456,7 +1600,7 @@ protected override void InitializeHandlers() { }
 
     #region IntFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntFunction.html"/>
     /// </summary>
     public partial class IntFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1465,10 +1609,13 @@ public partial class IntFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public IntFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1490,10 +1637,13 @@ public partial class IntFunctionDirect : IntFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1515,7 +1665,7 @@ protected override void InitializeHandlers() { }
 
     #region IntFunction<R>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntFunction.html"/>
     /// </summary>
     /// <typeparam name="R"></typeparam>
     public partial class IntFunction<R> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -1525,10 +1675,13 @@ public partial class IntFunction<R> : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public IntFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1550,10 +1703,13 @@ public partial class IntFunctionDirect<R> : IntFunction<R>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1575,7 +1731,7 @@ protected override void InitializeHandlers() { }
 
     #region IntPredicate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html"/>
     /// </summary>
     public partial class IntPredicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1584,10 +1740,13 @@ public partial class IntPredicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public IntPredicate() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntPredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntPredicate";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1609,10 +1768,13 @@ public partial class IntPredicateDirect : IntPredicate
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntPredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntPredicate";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1634,7 +1796,7 @@ protected override void InitializeHandlers() { }
 
     #region IntSupplier
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntSupplier.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntSupplier.html"/>
     /// </summary>
     public partial class IntSupplier : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1643,10 +1805,13 @@ public partial class IntSupplier : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public IntSupplier() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntSupplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntSupplier";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1668,10 +1833,13 @@ public partial class IntSupplierDirect : IntSupplier
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntSupplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntSupplier";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1693,7 +1861,7 @@ protected override void InitializeHandlers() { }
 
     #region IntToDoubleFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntToDoubleFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntToDoubleFunction.html"/>
     /// </summary>
     public partial class IntToDoubleFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1702,10 +1870,13 @@ public partial class IntToDoubleFunction : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public IntToDoubleFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntToDoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntToDoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1727,10 +1898,13 @@ public partial class IntToDoubleFunctionDirect : IntToDoubleFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntToDoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntToDoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1752,7 +1926,7 @@ protected override void InitializeHandlers() { }
 
     #region IntToLongFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntToLongFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntToLongFunction.html"/>
     /// </summary>
     public partial class IntToLongFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1761,10 +1935,13 @@ public partial class IntToLongFunction : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public IntToLongFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntToLongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntToLongFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1786,10 +1963,13 @@ public partial class IntToLongFunctionDirect : IntToLongFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntToLongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntToLongFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1811,7 +1991,7 @@ protected override void InitializeHandlers() { }
 
     #region IntUnaryOperator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html"/>
     /// </summary>
     public partial class IntUnaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1820,10 +2000,13 @@ public partial class IntUnaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListe
         /// </summary>
         public IntUnaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.IntUnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.IntUnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1845,10 +2028,13 @@ public partial class IntUnaryOperatorDirect : IntUnaryOperator
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.IntUnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.IntUnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1870,7 +2056,7 @@ protected override void InitializeHandlers() { }
 
     #region LongBinaryOperator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongBinaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongBinaryOperator.html"/>
     /// </summary>
     public partial class LongBinaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1879,10 +2065,13 @@ public partial class LongBinaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeLis
         /// </summary>
         public LongBinaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongBinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongBinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1904,10 +2093,13 @@ public partial class LongBinaryOperatorDirect : LongBinaryOperator
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongBinaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongBinaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1929,7 +2121,7 @@ protected override void InitializeHandlers() { }
 
     #region LongConsumer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html"/>
     /// </summary>
     public partial class LongConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1938,10 +2130,13 @@ public partial class LongConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public LongConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1963,10 +2158,13 @@ public partial class LongConsumerDirect : LongConsumer
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1988,7 +2186,7 @@ protected override void InitializeHandlers() { }
 
     #region LongFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongFunction.html"/>
     /// </summary>
     public partial class LongFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -1997,10 +2195,13 @@ public partial class LongFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public LongFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2022,10 +2223,13 @@ public partial class LongFunctionDirect : LongFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2047,7 +2251,7 @@ protected override void InitializeHandlers() { }
 
     #region LongFunction<R>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongFunction.html"/>
     /// </summary>
     /// <typeparam name="R"></typeparam>
     public partial class LongFunction<R> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -2057,10 +2261,13 @@ public partial class LongFunction<R> : MASES.JCOBridge.C2JBridge.JVMBridgeListen
         /// </summary>
         public LongFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2082,10 +2289,13 @@ public partial class LongFunctionDirect<R> : LongFunction<R>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2107,7 +2317,7 @@ protected override void InitializeHandlers() { }
 
     #region LongPredicate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html"/>
     /// </summary>
     public partial class LongPredicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2116,10 +2326,13 @@ public partial class LongPredicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public LongPredicate() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongPredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongPredicate";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2141,10 +2354,13 @@ public partial class LongPredicateDirect : LongPredicate
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongPredicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongPredicate";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2166,7 +2382,7 @@ protected override void InitializeHandlers() { }
 
     #region LongSupplier
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongSupplier.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongSupplier.html"/>
     /// </summary>
     public partial class LongSupplier : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2175,10 +2391,13 @@ public partial class LongSupplier : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public LongSupplier() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongSupplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongSupplier";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2200,10 +2419,13 @@ public partial class LongSupplierDirect : LongSupplier
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongSupplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongSupplier";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2225,7 +2447,7 @@ protected override void InitializeHandlers() { }
 
     #region LongToDoubleFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongToDoubleFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongToDoubleFunction.html"/>
     /// </summary>
     public partial class LongToDoubleFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2234,10 +2456,13 @@ public partial class LongToDoubleFunction : MASES.JCOBridge.C2JBridge.JVMBridgeL
         /// </summary>
         public LongToDoubleFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongToDoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongToDoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2259,10 +2484,13 @@ public partial class LongToDoubleFunctionDirect : LongToDoubleFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongToDoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongToDoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2284,7 +2512,7 @@ protected override void InitializeHandlers() { }
 
     #region LongToIntFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongToIntFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongToIntFunction.html"/>
     /// </summary>
     public partial class LongToIntFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2293,10 +2521,13 @@ public partial class LongToIntFunction : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public LongToIntFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongToIntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongToIntFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2318,10 +2549,13 @@ public partial class LongToIntFunctionDirect : LongToIntFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongToIntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongToIntFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2343,7 +2577,7 @@ protected override void InitializeHandlers() { }
 
     #region LongUnaryOperator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html"/>
     /// </summary>
     public partial class LongUnaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2352,10 +2586,13 @@ public partial class LongUnaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public LongUnaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.LongUnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.LongUnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2377,10 +2614,13 @@ public partial class LongUnaryOperatorDirect : LongUnaryOperator
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.LongUnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.LongUnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2402,7 +2642,7 @@ protected override void InitializeHandlers() { }
 
     #region ObjDoubleConsumer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html"/>
     /// </summary>
     public partial class ObjDoubleConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2411,10 +2651,13 @@ public partial class ObjDoubleConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public ObjDoubleConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ObjDoubleConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ObjDoubleConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2436,10 +2679,13 @@ public partial class ObjDoubleConsumerDirect : ObjDoubleConsumer
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ObjDoubleConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ObjDoubleConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2461,7 +2707,7 @@ protected override void InitializeHandlers() { }
 
     #region ObjDoubleConsumer<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ObjDoubleConsumer<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -2471,10 +2717,13 @@ public partial class ObjDoubleConsumer<T> : MASES.JCOBridge.C2JBridge.JVMBridgeL
         /// </summary>
         public ObjDoubleConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ObjDoubleConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ObjDoubleConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2496,10 +2745,13 @@ public partial class ObjDoubleConsumerDirect<T> : ObjDoubleConsumer<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ObjDoubleConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ObjDoubleConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2521,7 +2773,7 @@ protected override void InitializeHandlers() { }
 
     #region ObjIntConsumer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html"/>
     /// </summary>
     public partial class ObjIntConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2530,10 +2782,13 @@ public partial class ObjIntConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public ObjIntConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ObjIntConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ObjIntConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2555,10 +2810,13 @@ public partial class ObjIntConsumerDirect : ObjIntConsumer
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ObjIntConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ObjIntConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2580,7 +2838,7 @@ protected override void InitializeHandlers() { }
 
     #region ObjIntConsumer<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ObjIntConsumer<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -2590,10 +2848,13 @@ public partial class ObjIntConsumer<T> : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public ObjIntConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ObjIntConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ObjIntConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2615,10 +2876,13 @@ public partial class ObjIntConsumerDirect<T> : ObjIntConsumer<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ObjIntConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ObjIntConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2640,7 +2904,7 @@ protected override void InitializeHandlers() { }
 
     #region ObjLongConsumer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html"/>
     /// </summary>
     public partial class ObjLongConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2649,10 +2913,13 @@ public partial class ObjLongConsumer : MASES.JCOBridge.C2JBridge.JVMBridgeListen
         /// </summary>
         public ObjLongConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ObjLongConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ObjLongConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2674,10 +2941,13 @@ public partial class ObjLongConsumerDirect : ObjLongConsumer
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ObjLongConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ObjLongConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2699,7 +2969,7 @@ protected override void InitializeHandlers() { }
 
     #region ObjLongConsumer<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ObjLongConsumer<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -2709,10 +2979,13 @@ public partial class ObjLongConsumer<T> : MASES.JCOBridge.C2JBridge.JVMBridgeLis
         /// </summary>
         public ObjLongConsumer() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ObjLongConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ObjLongConsumer";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2734,10 +3007,13 @@ public partial class ObjLongConsumerDirect<T> : ObjLongConsumer<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ObjLongConsumer";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ObjLongConsumer";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2759,7 +3035,7 @@ protected override void InitializeHandlers() { }
 
     #region Predicate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html"/>
     /// </summary>
     public partial class Predicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2768,10 +3044,13 @@ public partial class Predicate : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public Predicate() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.Predicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.Predicate";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2793,10 +3072,13 @@ public partial class PredicateDirect : Predicate
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.Predicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.Predicate";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2818,7 +3100,7 @@ protected override void InitializeHandlers() { }
 
     #region Predicate<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Predicate<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -2828,10 +3110,13 @@ public partial class Predicate<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public Predicate() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.Predicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.Predicate";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2853,10 +3138,13 @@ public partial class PredicateDirect<T> : Predicate<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.Predicate";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.Predicate";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2878,7 +3166,7 @@ protected override void InitializeHandlers() { }
 
     #region Supplier
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/Supplier.html"/>
     /// </summary>
     public partial class Supplier : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -2887,10 +3175,13 @@ public partial class Supplier : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public Supplier() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.Supplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.Supplier";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2912,10 +3203,13 @@ public partial class SupplierDirect : Supplier
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.Supplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.Supplier";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2937,7 +3231,7 @@ protected override void InitializeHandlers() { }
 
     #region Supplier<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/Supplier.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Supplier<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -2947,10 +3241,13 @@ public partial class Supplier<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public Supplier() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.Supplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.Supplier";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -2972,10 +3269,13 @@ public partial class SupplierDirect<T> : Supplier<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.Supplier";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.Supplier";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -2997,7 +3297,7 @@ protected override void InitializeHandlers() { }
 
     #region ToDoubleBiFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html"/>
     /// </summary>
     public partial class ToDoubleBiFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -3006,10 +3306,13 @@ public partial class ToDoubleBiFunction : MASES.JCOBridge.C2JBridge.JVMBridgeLis
         /// </summary>
         public ToDoubleBiFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToDoubleBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToDoubleBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3031,10 +3334,13 @@ public partial class ToDoubleBiFunctionDirect : ToDoubleBiFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToDoubleBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToDoubleBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3056,7 +3362,7 @@ protected override void InitializeHandlers() { }
 
     #region ToDoubleBiFunction<T, U>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="U"></typeparam>
@@ -3067,10 +3373,13 @@ public partial class ToDoubleBiFunction<T, U> : MASES.JCOBridge.C2JBridge.JVMBri
         /// </summary>
         public ToDoubleBiFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToDoubleBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToDoubleBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3092,10 +3401,13 @@ public partial class ToDoubleBiFunctionDirect<T, U> : ToDoubleBiFunction<T, U>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToDoubleBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToDoubleBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3117,7 +3429,7 @@ protected override void InitializeHandlers() { }
 
     #region ToDoubleFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html"/>
     /// </summary>
     public partial class ToDoubleFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -3126,10 +3438,13 @@ public partial class ToDoubleFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListe
         /// </summary>
         public ToDoubleFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToDoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToDoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3151,10 +3466,13 @@ public partial class ToDoubleFunctionDirect : ToDoubleFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToDoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToDoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3176,7 +3494,7 @@ protected override void InitializeHandlers() { }
 
     #region ToDoubleFunction<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ToDoubleFunction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -3186,10 +3504,13 @@ public partial class ToDoubleFunction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeLi
         /// </summary>
         public ToDoubleFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToDoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToDoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3211,10 +3532,13 @@ public partial class ToDoubleFunctionDirect<T> : ToDoubleFunction<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToDoubleFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToDoubleFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3236,7 +3560,7 @@ protected override void InitializeHandlers() { }
 
     #region ToIntBiFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html"/>
     /// </summary>
     public partial class ToIntBiFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -3245,10 +3569,13 @@ public partial class ToIntBiFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListen
         /// </summary>
         public ToIntBiFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToIntBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToIntBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3270,10 +3597,13 @@ public partial class ToIntBiFunctionDirect : ToIntBiFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToIntBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToIntBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3295,7 +3625,7 @@ protected override void InitializeHandlers() { }
 
     #region ToIntBiFunction<T, U>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="U"></typeparam>
@@ -3306,10 +3636,13 @@ public partial class ToIntBiFunction<T, U> : MASES.JCOBridge.C2JBridge.JVMBridge
         /// </summary>
         public ToIntBiFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToIntBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToIntBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3331,10 +3664,13 @@ public partial class ToIntBiFunctionDirect<T, U> : ToIntBiFunction<T, U>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToIntBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToIntBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3356,7 +3692,7 @@ protected override void InitializeHandlers() { }
 
     #region ToIntFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html"/>
     /// </summary>
     public partial class ToIntFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -3365,10 +3701,13 @@ public partial class ToIntFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public ToIntFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToIntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToIntFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3390,10 +3729,13 @@ public partial class ToIntFunctionDirect : ToIntFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToIntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToIntFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3415,7 +3757,7 @@ protected override void InitializeHandlers() { }
 
     #region ToIntFunction<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ToIntFunction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -3425,10 +3767,13 @@ public partial class ToIntFunction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListe
         /// </summary>
         public ToIntFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToIntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToIntFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3450,10 +3795,13 @@ public partial class ToIntFunctionDirect<T> : ToIntFunction<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToIntFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToIntFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3475,7 +3823,7 @@ protected override void InitializeHandlers() { }
 
     #region ToLongBiFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html"/>
     /// </summary>
     public partial class ToLongBiFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -3484,10 +3832,13 @@ public partial class ToLongBiFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListe
         /// </summary>
         public ToLongBiFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToLongBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToLongBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3509,10 +3860,13 @@ public partial class ToLongBiFunctionDirect : ToLongBiFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToLongBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToLongBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3534,7 +3888,7 @@ protected override void InitializeHandlers() { }
 
     #region ToLongBiFunction<T, U>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="U"></typeparam>
@@ -3545,10 +3899,13 @@ public partial class ToLongBiFunction<T, U> : MASES.JCOBridge.C2JBridge.JVMBridg
         /// </summary>
         public ToLongBiFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToLongBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToLongBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3570,10 +3927,13 @@ public partial class ToLongBiFunctionDirect<T, U> : ToLongBiFunction<T, U>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToLongBiFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToLongBiFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3595,7 +3955,7 @@ protected override void InitializeHandlers() { }
 
     #region ToLongFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html"/>
     /// </summary>
     public partial class ToLongFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -3604,10 +3964,13 @@ public partial class ToLongFunction : MASES.JCOBridge.C2JBridge.JVMBridgeListene
         /// </summary>
         public ToLongFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToLongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToLongFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3629,10 +3992,13 @@ public partial class ToLongFunctionDirect : ToLongFunction
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToLongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToLongFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3654,7 +4020,7 @@ protected override void InitializeHandlers() { }
 
     #region ToLongFunction<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class ToLongFunction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -3664,10 +4030,13 @@ public partial class ToLongFunction<T> : MASES.JCOBridge.C2JBridge.JVMBridgeList
         /// </summary>
         public ToLongFunction() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.ToLongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.ToLongFunction";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3689,10 +4058,13 @@ public partial class ToLongFunctionDirect<T> : ToLongFunction<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.ToLongFunction";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.ToLongFunction";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3714,7 +4086,7 @@ protected override void InitializeHandlers() { }
 
     #region UnaryOperator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/UnaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/UnaryOperator.html"/>
     /// </summary>
     public partial class UnaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -3723,10 +4095,13 @@ public partial class UnaryOperator : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public UnaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.UnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.UnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3748,10 +4123,13 @@ public partial class UnaryOperatorDirect : UnaryOperator
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.UnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.UnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -3773,7 +4151,7 @@ protected override void InitializeHandlers() { }
 
     #region UnaryOperator<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/function/UnaryOperator.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/function/UnaryOperator.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class UnaryOperator<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListener
@@ -3783,10 +4161,13 @@ public partial class UnaryOperator<T> : MASES.JCOBridge.C2JBridge.JVMBridgeListe
         /// </summary>
         public UnaryOperator() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.function.UnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.function.UnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -3808,10 +4189,13 @@ public partial class UnaryOperatorDirect<T> : UnaryOperator<T>
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.function.UnaryOperator";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.function.UnaryOperator";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/BiConsumer.cs b/src/net/Netdroid/Generated/Java/Util/Function/BiConsumer.cs
index 155f35585..e302b0081 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/BiConsumer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/BiConsumer.cs
@@ -50,16 +50,16 @@ public partial class BiConsumer
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiConsumer>>>(AndThenEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiConsumer>>>(AndThenEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<object, object> OnAccept { get; set; } = null;
+        public global::System.Action<object, object> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -68,7 +68,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -77,7 +77,7 @@ public virtual void Accept(object arg0, object arg1)
             
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
@@ -88,10 +88,10 @@ public Java.Util.Function.BiConsumer AndThenDefault(Java.Util.Function.BiConsume
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.BiConsumer, Java.Util.Function.BiConsumer> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.BiConsumer, Java.Util.Function.BiConsumer> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.BiConsumer>> data)
         {
@@ -101,7 +101,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
@@ -142,7 +142,7 @@ public partial class BiConsumerDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -151,7 +151,7 @@ public override void Accept(object arg0, object arg1)
             IExecute("accept", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
@@ -172,7 +172,7 @@ public override Java.Util.Function.BiConsumer AndThen(Java.Util.Function.BiConsu
 
     #region IBiConsumer<T, U>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.BiConsumer implementing <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.BiConsumer implementing <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html"/>
     /// </summary>
     public partial interface IBiConsumer<T, U>
     {
@@ -213,16 +213,16 @@ public partial class BiConsumer<T, U> : Java.Util.Function.IBiConsumer<T, U>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU>>>>(AndThen<Arg0objectSuperT, Arg0objectSuperU>EventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU>>>>(AndThen<Arg0objectSuperT, Arg0objectSuperU>EventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<T, U> OnAccept { get; set; } = null;
+        public global::System.Action<T, U> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -231,7 +231,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> dat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -240,23 +240,23 @@ public virtual void Accept(T arg0, U arg1)
             
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.BiConsumer<T, U> AndThen<Arg0objectSuperT, Arg0objectSuperU>Default(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public Java.Util.Function.BiConsumer<T, U> AndThen<Arg0objectSuperT, Arg0objectSuperU>Default(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return IExecuteWithSignature<Java.Util.Function.BiConsumer<T, U>>("andThenDefault", "(Ljava/util/function/BiConsumer;)Ljava/util/function/BiConsumer;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen<Arg0objectSuperT, Arg0objectSuperU>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU>, Java.Util.Function.BiConsumer<T, U>> OnAndThen<Arg0objectSuperT, Arg0objectSuperU> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU>, Java.Util.Function.BiConsumer<T, U>> OnAndThen<Arg0objectSuperT, Arg0objectSuperU> { get; set; } = null;
 
         void AndThen<Arg0objectSuperT, Arg0objectSuperU>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU>>> data)
         {
@@ -266,14 +266,14 @@ void AndThen<Arg0objectSuperT, Arg0objectSuperU>EventHandler(object sender, CLRL
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="AndThen<Arg0objectSuperT, Arg0objectSuperU>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.BiConsumer<T, U> AndThen<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public virtual Java.Util.Function.BiConsumer<T, U> AndThen<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return AndThen<Arg0objectSuperT, Arg0objectSuperU>Default(arg0);
         }
@@ -309,7 +309,7 @@ public partial class BiConsumerDirect<T, U> : Java.Util.Function.IBiConsumer<T,
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#accept(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -318,13 +318,13 @@ public override void Accept(T arg0, U arg1)
             IExecute("accept", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiConsumer.html#andThen(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
-        public override Java.Util.Function.BiConsumer<T, U> AndThen<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public override Java.Util.Function.BiConsumer<T, U> AndThen<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return IExecuteWithSignature<Java.Util.Function.BiConsumerDirect<T, U>, Java.Util.Function.BiConsumer<T, U>>("andThen", "(Ljava/util/function/BiConsumer;)Ljava/util/function/BiConsumer;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/BiFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/BiFunction.cs
index d86dfa451..536d57191 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/BiFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/BiFunction.cs
@@ -50,16 +50,16 @@ public partial class BiFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(AndThenEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(AndThenEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, object, object> OnApply { get; set; } = null;
+        public global::System.Func<object, object, object> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -69,7 +69,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -79,7 +79,7 @@ public virtual object Apply(object arg0, object arg1)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
@@ -90,10 +90,10 @@ public Java.Util.Function.BiFunction AndThenDefault(Java.Util.Function.Function
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function, Java.Util.Function.BiFunction> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function, Java.Util.Function.BiFunction> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>> data)
         {
@@ -103,7 +103,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
@@ -144,7 +144,7 @@ public partial class BiFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -154,7 +154,7 @@ public override object Apply(object arg0, object arg1)
             return IExecute("apply", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
@@ -175,7 +175,7 @@ public override Java.Util.Function.BiFunction AndThen(Java.Util.Function.Functio
 
     #region IBiFunction<T, U, R>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.BiFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.BiFunction implementing <see href="https://developer.android.com/reference/java/util/function/BiFunction.html"/>
     /// </summary>
     public partial interface IBiFunction<T, U, R>
     {
@@ -216,16 +216,16 @@ public partial class BiFunction<T, U, R> : Java.Util.Function.IBiFunction<T, U,
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>>>(AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>>>(AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, U, R> OnApply { get; set; } = null;
+        public global::System.Func<T, U, R> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -235,7 +235,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -245,7 +245,7 @@ public virtual R Apply(T arg0, U arg1)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -253,16 +253,16 @@ public virtual R Apply(T arg0, U arg1)
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.BiFunction<T, U, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>Default(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public Java.Util.Function.BiFunction<T, U, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>Default(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return IExecuteWithSignature<Java.Util.Function.BiFunction<T, U, V>>("andThenDefault", "(Ljava/util/function/Function;)Ljava/util/function/BiFunction;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen<V, Arg0objectSuperR, Arg0ExtendsV>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>, Java.Util.Function.BiFunction<T, U, V>> OnAndThen<V, Arg0objectSuperR, Arg0ExtendsV> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>, Java.Util.Function.BiFunction<T, U, V>> OnAndThen<V, Arg0objectSuperR, Arg0ExtendsV> { get; set; } = null;
 
         void AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>> data)
         {
@@ -272,7 +272,7 @@ void AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler(object sender, CLRLi
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -280,7 +280,7 @@ void AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler(object sender, CLRLi
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="AndThen<V, Arg0objectSuperR, Arg0ExtendsV>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.BiFunction<T, U, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public virtual Java.Util.Function.BiFunction<T, U, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return AndThen<V, Arg0objectSuperR, Arg0ExtendsV>Default(arg0);
         }
@@ -316,7 +316,7 @@ public partial class BiFunctionDirect<T, U, R> : Java.Util.Function.IBiFunction<
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -326,14 +326,14 @@ public override R Apply(T arg0, U arg1)
             return IExecute<R>("apply", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
         /// <typeparam name="Arg0objectSuperR"><typeparamref name="R"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
-        public override Java.Util.Function.BiFunction<T, U, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public override Java.Util.Function.BiFunction<T, U, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return IExecuteWithSignature<Java.Util.Function.BiFunctionDirect<T, U, V>, Java.Util.Function.BiFunction<T, U, V>>("andThen", "(Ljava/util/function/Function;)Ljava/util/function/BiFunction;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/BiPredicate.cs b/src/net/Netdroid/Generated/Java/Util/Function/BiPredicate.cs
index be7a504e0..c09b70626 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/BiPredicate.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/BiPredicate.cs
@@ -50,18 +50,18 @@ public partial class BiPredicate
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("test", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(TestEventHandler));
-            AddEventHandler("and", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate>>>(AndEventHandler));
-            AddEventHandler("negate", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
-            AddEventHandler("or", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate>>>(OrEventHandler));
+            AddEventHandler("test", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(TestEventHandler));
+            AddEventHandler("and", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate>>>(AndEventHandler));
+            AddEventHandler("negate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
+            AddEventHandler("or", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate>>>(OrEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnTest"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, object, bool> OnTest { get; set; } = null;
+        public global::System.Func<object, object, bool> OnTest { get; set; } = null;
 
         void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -71,7 +71,7 @@ void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -81,7 +81,7 @@ public virtual bool Test(object arg0, object arg1)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
@@ -92,10 +92,10 @@ public Java.Util.Function.BiPredicate AndDefault(Java.Util.Function.BiPredicate
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.BiPredicate, Java.Util.Function.BiPredicate> OnAnd { get; set; } = null;
+        public global::System.Func<Java.Util.Function.BiPredicate, Java.Util.Function.BiPredicate> OnAnd { get; set; } = null;
 
         void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate>> data)
         {
@@ -105,7 +105,7 @@ void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
@@ -115,7 +115,7 @@ public virtual Java.Util.Function.BiPredicate And(Java.Util.Function.BiPredicate
             return AndDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
@@ -125,10 +125,10 @@ public Java.Util.Function.BiPredicate NegateDefault()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#negate()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#negate()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNegate"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.BiPredicate> OnNegate { get; set; } = null;
+        public global::System.Func<Java.Util.Function.BiPredicate> OnNegate { get; set; } = null;
 
         void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -138,7 +138,7 @@ void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="NegateDefault"/>; override the method to implement a different behavior</remarks>
@@ -147,7 +147,7 @@ public virtual Java.Util.Function.BiPredicate Negate()
             return NegateDefault();
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
@@ -158,10 +158,10 @@ public Java.Util.Function.BiPredicate OrDefault(Java.Util.Function.BiPredicate a
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOr"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.BiPredicate, Java.Util.Function.BiPredicate> OnOr { get; set; } = null;
+        public global::System.Func<Java.Util.Function.BiPredicate, Java.Util.Function.BiPredicate> OnOr { get; set; } = null;
 
         void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate>> data)
         {
@@ -171,7 +171,7 @@ void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.F
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
@@ -212,7 +212,7 @@ public partial class BiPredicateDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -222,7 +222,7 @@ public override bool Test(object arg0, object arg1)
             return IExecute<bool>("test", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
@@ -231,7 +231,7 @@ public override Java.Util.Function.BiPredicate And(Java.Util.Function.BiPredicat
             return IExecuteWithSignature<Java.Util.Function.BiPredicateDirect, Java.Util.Function.BiPredicate>("and", "(Ljava/util/function/BiPredicate;)Ljava/util/function/BiPredicate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         public override Java.Util.Function.BiPredicate Negate()
@@ -239,7 +239,7 @@ public override Java.Util.Function.BiPredicate Negate()
             return IExecuteWithSignature<Java.Util.Function.BiPredicateDirect, Java.Util.Function.BiPredicate>("negate", "()Ljava/util/function/BiPredicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
@@ -260,7 +260,7 @@ public override Java.Util.Function.BiPredicate Or(Java.Util.Function.BiPredicate
 
     #region IBiPredicate<T, U>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.BiPredicate implementing <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.BiPredicate implementing <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html"/>
     /// </summary>
     public partial interface IBiPredicate<T, U>
     {
@@ -301,18 +301,18 @@ public partial class BiPredicate<T, U> : Java.Util.Function.IBiPredicate<T, U>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("test", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(TestEventHandler));
-            AddEventHandler("and", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>>>>(And<Arg0objectSuperT, Arg0objectSuperU>EventHandler));
-            AddEventHandler("negate", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
-            AddEventHandler("or", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>>>>(Or<Arg0objectSuperT, Arg0objectSuperU>EventHandler));
+            AddEventHandler("test", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(TestEventHandler));
+            AddEventHandler("and", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>>>>(And<Arg0objectSuperT, Arg0objectSuperU>EventHandler));
+            AddEventHandler("negate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
+            AddEventHandler("or", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>>>>(Or<Arg0objectSuperT, Arg0objectSuperU>EventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnTest"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, U, bool> OnTest { get; set; } = null;
+        public global::System.Func<T, U, bool> OnTest { get; set; } = null;
 
         void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -322,7 +322,7 @@ void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -332,23 +332,23 @@ public virtual bool Test(T arg0, U arg1)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.BiPredicate<T, U> And<Arg0objectSuperT, Arg0objectSuperU>Default(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public Java.Util.Function.BiPredicate<T, U> And<Arg0objectSuperT, Arg0objectSuperU>Default(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return IExecuteWithSignature<Java.Util.Function.BiPredicate<T, U>>("andDefault", "(Ljava/util/function/BiPredicate;)Ljava/util/function/BiPredicate;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAnd<Arg0objectSuperT, Arg0objectSuperU>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>, Java.Util.Function.BiPredicate<T, U>> OnAnd<Arg0objectSuperT, Arg0objectSuperU> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>, Java.Util.Function.BiPredicate<T, U>> OnAnd<Arg0objectSuperT, Arg0objectSuperU> { get; set; } = null;
 
         void And<Arg0objectSuperT, Arg0objectSuperU>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>>> data)
         {
@@ -358,19 +358,19 @@ void And<Arg0objectSuperT, Arg0objectSuperU>EventHandler(object sender, CLRListe
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="And<Arg0objectSuperT, Arg0objectSuperU>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.BiPredicate<T, U> And<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public virtual Java.Util.Function.BiPredicate<T, U> And<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return And<Arg0objectSuperT, Arg0objectSuperU>Default(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
@@ -380,10 +380,10 @@ public Java.Util.Function.BiPredicate<T, U> NegateDefault()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#negate()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#negate()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNegate"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.BiPredicate<T, U>> OnNegate { get; set; } = null;
+        public global::System.Func<Java.Util.Function.BiPredicate<T, U>> OnNegate { get; set; } = null;
 
         void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -393,7 +393,7 @@ void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="NegateDefault"/>; override the method to implement a different behavior</remarks>
@@ -402,23 +402,23 @@ public virtual Java.Util.Function.BiPredicate<T, U> Negate()
             return NegateDefault();
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.BiPredicate<T, U> Or<Arg0objectSuperT, Arg0objectSuperU>Default(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public Java.Util.Function.BiPredicate<T, U> Or<Arg0objectSuperT, Arg0objectSuperU>Default(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return IExecuteWithSignature<Java.Util.Function.BiPredicate<T, U>>("orDefault", "(Ljava/util/function/BiPredicate;)Ljava/util/function/BiPredicate;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOr<Arg0objectSuperT, Arg0objectSuperU>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>, Java.Util.Function.BiPredicate<T, U>> OnOr<Arg0objectSuperT, Arg0objectSuperU> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>, Java.Util.Function.BiPredicate<T, U>> OnOr<Arg0objectSuperT, Arg0objectSuperU> { get; set; } = null;
 
         void Or<Arg0objectSuperT, Arg0objectSuperU>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU>>> data)
         {
@@ -428,14 +428,14 @@ void Or<Arg0objectSuperT, Arg0objectSuperU>EventHandler(object sender, CLRListen
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="Or<Arg0objectSuperT, Arg0objectSuperU>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.BiPredicate<T, U> Or<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public virtual Java.Util.Function.BiPredicate<T, U> Or<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return Or<Arg0objectSuperT, Arg0objectSuperU>Default(arg0);
         }
@@ -471,7 +471,7 @@ public partial class BiPredicateDirect<T, U> : Java.Util.Function.IBiPredicate<T
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#test(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -481,18 +481,18 @@ public override bool Test(T arg0, U arg1)
             return IExecute<bool>("test", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#and(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
-        public override Java.Util.Function.BiPredicate<T, U> And<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public override Java.Util.Function.BiPredicate<T, U> And<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return IExecuteWithSignature<Java.Util.Function.BiPredicateDirect<T, U>, Java.Util.Function.BiPredicate<T, U>>("and", "(Ljava/util/function/BiPredicate;)Ljava/util/function/BiPredicate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
         public override Java.Util.Function.BiPredicate<T, U> Negate()
@@ -500,13 +500,13 @@ public override Java.Util.Function.BiPredicate<T, U> Negate()
             return IExecuteWithSignature<Java.Util.Function.BiPredicateDirect<T, U>, Java.Util.Function.BiPredicate<T, U>>("negate", "()Ljava/util/function/BiPredicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiPredicate.html#or(java.util.function.BiPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiPredicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0objectSuperU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiPredicate"/></returns>
-        public override Java.Util.Function.BiPredicate<T, U> Or<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT: T where Arg0objectSuperU: U
+        public override Java.Util.Function.BiPredicate<T, U> Or<Arg0objectSuperT, Arg0objectSuperU>(Java.Util.Function.BiPredicate<Arg0objectSuperT, Arg0objectSuperU> arg0) where Arg0objectSuperT : T where Arg0objectSuperU : U
         {
             return IExecuteWithSignature<Java.Util.Function.BiPredicateDirect<T, U>, Java.Util.Function.BiPredicate<T, U>>("or", "(Ljava/util/function/BiPredicate;)Ljava/util/function/BiPredicate;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/BinaryOperator.cs b/src/net/Netdroid/Generated/Java/Util/Function/BinaryOperator.cs
index 23e3a6a3e..26dfb746a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/BinaryOperator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/BinaryOperator.cs
@@ -50,16 +50,16 @@ public partial class BinaryOperator
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(AndThenEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(AndThenEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, object, object> OnApply { get; set; } = null;
+        public global::System.Func<object, object, object> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -69,7 +69,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -79,7 +79,7 @@ public virtual object Apply(object arg0, object arg1)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
@@ -90,10 +90,10 @@ public Java.Util.Function.BiFunction AndThenDefault(Java.Util.Function.Function
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function, Java.Util.Function.BiFunction> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function, Java.Util.Function.BiFunction> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>> data)
         {
@@ -103,7 +103,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
@@ -144,7 +144,7 @@ public partial class BinaryOperatorDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -154,7 +154,7 @@ public override object Apply(object arg0, object arg1)
             return IExecute("apply", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
@@ -175,7 +175,7 @@ public override Java.Util.Function.BiFunction AndThen(Java.Util.Function.Functio
 
     #region IBinaryOperator<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.BinaryOperator implementing <see href="https://developer.android.com/reference/java.base/java/util/function/BinaryOperator.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.BinaryOperator implementing <see href="https://developer.android.com/reference/java/util/function/BinaryOperator.html"/>
     /// </summary>
     public partial interface IBinaryOperator<T>
     {
@@ -216,16 +216,16 @@ public partial class BinaryOperator<T> : Java.Util.Function.IBinaryOperator<T>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(Apply<R, U>EventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>>>(AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(Apply<R, U>EventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>>>(AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply<R, U>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, U, R> OnApply<R, U> { get; set; } = null;
+        public global::System.Func<T, U, R> OnApply<R, U> { get; set; } = null;
 
         void Apply<R, U>EventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -235,7 +235,7 @@ void Apply<R, U>EventHandler(object sender, CLRListenerEventArgs<CLREventData<T>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -247,7 +247,7 @@ public virtual R Apply<R, U>(T arg0, U arg1)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
@@ -257,16 +257,16 @@ public virtual R Apply<R, U>(T arg0, U arg1)
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.BiFunction<T, U, V> AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>Default(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public Java.Util.Function.BiFunction<T, U, V> AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>Default(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return IExecute<Java.Util.Function.BiFunction<T, U, V>>("andThenDefault", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>, Java.Util.Function.BiFunction<T, U, V>> OnAndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>, Java.Util.Function.BiFunction<T, U, V>> OnAndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV> { get; set; } = null;
 
         void AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>> data)
         {
@@ -276,7 +276,7 @@ void AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler(object sender,
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
@@ -286,7 +286,7 @@ void AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler(object sender,
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.BiFunction<T, U, V> AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public virtual Java.Util.Function.BiFunction<T, U, V> AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>Default(arg0);
         }
@@ -322,7 +322,7 @@ public partial class BinaryOperatorDirect<T> : Java.Util.Function.IBinaryOperato
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#apply(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -334,7 +334,7 @@ public override R Apply<R, U>(T arg0, U arg1)
             return IExecute<R>("apply", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BiFunction.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
@@ -343,7 +343,7 @@ public override R Apply<R, U>(T arg0, U arg1)
         /// <typeparam name="R"></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
-        public override Java.Util.Function.BiFunction<T, U, V> AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public override Java.Util.Function.BiFunction<T, U, V> AndThen<U, V, Arg0objectSuperR, R, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return IExecute<Java.Util.Function.BiFunctionDirect<T, U, V>, Java.Util.Function.BiFunction<T, U, V>>("andThen", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/BooleanSupplier.cs b/src/net/Netdroid/Generated/Java/Util/Function/BooleanSupplier.cs
index e25a192f6..f9689b513 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/BooleanSupplier.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/BooleanSupplier.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IBooleanSupplier
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.BooleanSupplier implementing <see href="https://developer.android.com/reference/java.base/java/util/function/BooleanSupplier.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.BooleanSupplier implementing <see href="https://developer.android.com/reference/java/util/function/BooleanSupplier.html"/>
     /// </summary>
     public partial interface IBooleanSupplier
     {
@@ -68,15 +68,15 @@ public partial class BooleanSupplier : Java.Util.Function.IBooleanSupplier
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getAsBoolean", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAsBooleanEventHandler));
+            AddEventHandler("getAsBoolean", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAsBooleanEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/BooleanSupplier.html#getAsBoolean()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/BooleanSupplier.html#getAsBoolean()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAsBoolean"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<bool> OnGetAsBoolean { get; set; } = null;
+        public global::System.Func<bool> OnGetAsBoolean { get; set; } = null;
 
         void GetAsBooleanEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -86,7 +86,7 @@ void GetAsBooleanEventHandler(object sender, CLRListenerEventArgs<CLREventData>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BooleanSupplier.html#getAsBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/BooleanSupplier.html#getAsBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public virtual bool GetAsBoolean()
@@ -125,11 +125,12 @@ public partial class BooleanSupplierDirect : Java.Util.Function.IBooleanSupplier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/BooleanSupplier.html#getAsBoolean()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/function/BooleanSupplier.html#getAsBoolean()"/>
         /// </summary>
-        public bool AsBoolean
+        /// <returns><see cref="bool"/></returns>
+        public override bool GetAsBoolean()
         {
-            get { return IExecuteWithSignature<bool>("getAsBoolean", "()Z"); }
+            return IExecuteWithSignature<bool>("getAsBoolean", "()Z");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/Consumer.cs b/src/net/Netdroid/Generated/Java/Util/Function/Consumer.cs
index a91c0586c..853d9d5e7 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/Consumer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/Consumer.cs
@@ -50,16 +50,16 @@ public partial class Consumer
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Consumer>>>(AndThenEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Consumer>>>(AndThenEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#accept(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Consumer.html#accept(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<object> OnAccept { get; set; } = null;
+        public global::System.Action<object> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -68,7 +68,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#accept(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#accept(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public virtual void Accept(object arg0)
@@ -76,7 +76,7 @@ public virtual void Accept(object arg0)
             
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Function.Consumer"/></returns>
@@ -87,10 +87,10 @@ public Java.Util.Function.Consumer AndThenDefault(Java.Util.Function.Consumer ar
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Consumer, Java.Util.Function.Consumer> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Consumer, Java.Util.Function.Consumer> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Consumer>> data)
         {
@@ -100,7 +100,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Function.Consumer"/></returns>
@@ -141,7 +141,7 @@ public partial class ConsumerDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#accept(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#accept(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public override void Accept(object arg0)
@@ -149,7 +149,7 @@ public override void Accept(object arg0)
             IExecuteWithSignature("accept", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Function.Consumer"/></returns>
@@ -170,7 +170,7 @@ public override Java.Util.Function.Consumer AndThen(Java.Util.Function.Consumer
 
     #region IConsumer<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.Consumer implementing <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.Consumer implementing <see href="https://developer.android.com/reference/java/util/function/Consumer.html"/>
     /// </summary>
     public partial interface IConsumer<T>
     {
@@ -211,16 +211,16 @@ public partial class Consumer<T> : Java.Util.Function.IConsumer<T>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Consumer<Arg0objectSuperT>>>>(AndThen<Arg0objectSuperT>EventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Consumer<Arg0objectSuperT>>>>(AndThen<Arg0objectSuperT>EventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#accept(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Consumer.html#accept(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<T> OnAccept { get; set; } = null;
+        public global::System.Action<T> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -229,7 +229,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> dat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#accept(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#accept(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         public virtual void Accept(T arg0)
@@ -237,22 +237,22 @@ public virtual void Accept(T arg0)
             
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Consumer"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.Consumer<T> AndThen<Arg0objectSuperT>Default(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Function.Consumer<T> AndThen<Arg0objectSuperT>Default(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Function.Consumer<T>>("andThenDefault", "(Ljava/util/function/Consumer;)Ljava/util/function/Consumer;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen<Arg0objectSuperT>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Consumer<Arg0objectSuperT>, Java.Util.Function.Consumer<T>> OnAndThen<Arg0objectSuperT> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Consumer<Arg0objectSuperT>, Java.Util.Function.Consumer<T>> OnAndThen<Arg0objectSuperT> { get; set; } = null;
 
         void AndThen<Arg0objectSuperT>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Consumer<Arg0objectSuperT>>> data)
         {
@@ -262,13 +262,13 @@ void AndThen<Arg0objectSuperT>EventHandler(object sender, CLRListenerEventArgs<C
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Consumer"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="AndThen<Arg0objectSuperT>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.Consumer<T> AndThen<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public virtual Java.Util.Function.Consumer<T> AndThen<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return AndThen<Arg0objectSuperT>Default(arg0);
         }
@@ -304,7 +304,7 @@ public partial class ConsumerDirect<T> : Java.Util.Function.IConsumer<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#accept(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#accept(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         public override void Accept(T arg0)
@@ -312,12 +312,12 @@ public override void Accept(T arg0)
             IExecuteWithSignature("accept", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Consumer.html#andThen(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Consumer"/></returns>
-        public override Java.Util.Function.Consumer<T> AndThen<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public override Java.Util.Function.Consumer<T> AndThen<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Function.ConsumerDirect<T>, Java.Util.Function.Consumer<T>>("andThen", "(Ljava/util/function/Consumer;)Ljava/util/function/Consumer;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/DoubleBinaryOperator.cs b/src/net/Netdroid/Generated/Java/Util/Function/DoubleBinaryOperator.cs
index eaa3a87ab..cf0992419 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/DoubleBinaryOperator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/DoubleBinaryOperator.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IDoubleBinaryOperator
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleBinaryOperator implementing <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleBinaryOperator.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleBinaryOperator implementing <see href="https://developer.android.com/reference/java/util/function/DoubleBinaryOperator.html"/>
     /// </summary>
     public partial interface IDoubleBinaryOperator
     {
@@ -68,15 +68,15 @@ public partial class DoubleBinaryOperator : Java.Util.Function.IDoubleBinaryOper
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsDoubleEventHandler));
+            AddEventHandler("applyAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsDoubleEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleBinaryOperator.html#applyAsDouble(double,double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleBinaryOperator.html#applyAsDouble(double,double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<double, double, double> OnApplyAsDouble { get; set; } = null;
+        public global::System.Func<double, double, double> OnApplyAsDouble { get; set; } = null;
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleBinaryOperator.html#applyAsDouble(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleBinaryOperator.html#applyAsDouble(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -127,7 +127,7 @@ public partial class DoubleBinaryOperatorDirect : Java.Util.Function.IDoubleBina
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleBinaryOperator.html#applyAsDouble(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleBinaryOperator.html#applyAsDouble(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/DoubleConsumer.cs b/src/net/Netdroid/Generated/Java/Util/Function/DoubleConsumer.cs
index 4e95f08c6..3f726d28f 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/DoubleConsumer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/DoubleConsumer.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IDoubleConsumer
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleConsumer implementing <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleConsumer implementing <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html"/>
     /// </summary>
     public partial interface IDoubleConsumer
     {
@@ -68,16 +68,16 @@ public partial class DoubleConsumer : Java.Util.Function.IDoubleConsumer
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(AcceptEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleConsumer>>>(AndThenEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(AcceptEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleConsumer>>>(AndThenEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html#accept(double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html#accept(double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<double> OnAccept { get; set; } = null;
+        public global::System.Action<double> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
         {
@@ -86,7 +86,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html#accept(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html#accept(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public virtual void Accept(double arg0)
@@ -94,7 +94,7 @@ public virtual void Accept(double arg0)
             
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html#andThen(java.util.function.DoubleConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html#andThen(java.util.function.DoubleConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleConsumer"/></returns>
@@ -105,10 +105,10 @@ public Java.Util.Function.DoubleConsumer AndThenDefault(Java.Util.Function.Doubl
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html#andThen(java.util.function.DoubleConsumer)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html#andThen(java.util.function.DoubleConsumer)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.DoubleConsumer, Java.Util.Function.DoubleConsumer> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.DoubleConsumer, Java.Util.Function.DoubleConsumer> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleConsumer>> data)
         {
@@ -118,7 +118,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html#andThen(java.util.function.DoubleConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html#andThen(java.util.function.DoubleConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleConsumer"/></returns>
@@ -159,7 +159,7 @@ public partial class DoubleConsumerDirect : Java.Util.Function.IDoubleConsumer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html#accept(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html#accept(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         public override void Accept(double arg0)
@@ -167,7 +167,7 @@ public override void Accept(double arg0)
             IExecuteWithSignature("accept", "(D)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleConsumer.html#andThen(java.util.function.DoubleConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleConsumer.html#andThen(java.util.function.DoubleConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleConsumer"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/DoubleFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/DoubleFunction.cs
index bc9dd3142..24027b725 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/DoubleFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/DoubleFunction.cs
@@ -50,15 +50,15 @@ public partial class DoubleFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html#apply(double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html#apply(double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<double, object> OnApply { get; set; } = null;
+        public global::System.Func<double, object> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
         {
@@ -68,7 +68,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html#apply(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html#apply(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="object"/></returns>
@@ -108,7 +108,7 @@ public partial class DoubleFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html#apply(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html#apply(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="object"/></returns>
@@ -129,7 +129,7 @@ public override object Apply(double arg0)
 
     #region IDoubleFunction<R>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleFunction implementing <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html"/>
     /// </summary>
     public partial interface IDoubleFunction<R>
     {
@@ -170,15 +170,15 @@ public partial class DoubleFunction<R> : Java.Util.Function.IDoubleFunction<R>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html#apply(double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html#apply(double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<double, R> OnApply { get; set; } = null;
+        public global::System.Func<double, R> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
         {
@@ -188,7 +188,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html#apply(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html#apply(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><typeparamref name="R"/></returns>
@@ -228,7 +228,7 @@ public partial class DoubleFunctionDirect<R> : Java.Util.Function.IDoubleFunctio
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleFunction.html#apply(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleFunction.html#apply(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><typeparamref name="R"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/DoublePredicate.cs b/src/net/Netdroid/Generated/Java/Util/Function/DoublePredicate.cs
index 4489ae4e2..0088609c2 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/DoublePredicate.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/DoublePredicate.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IDoublePredicate
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoublePredicate implementing <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoublePredicate implementing <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html"/>
     /// </summary>
     public partial interface IDoublePredicate
     {
@@ -68,18 +68,18 @@ public partial class DoublePredicate : Java.Util.Function.IDoublePredicate
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("test", new System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(TestEventHandler));
-            AddEventHandler("and", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoublePredicate>>>(AndEventHandler));
-            AddEventHandler("negate", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
-            AddEventHandler("or", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoublePredicate>>>(OrEventHandler));
+            AddEventHandler("test", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(TestEventHandler));
+            AddEventHandler("and", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoublePredicate>>>(AndEventHandler));
+            AddEventHandler("negate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
+            AddEventHandler("or", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoublePredicate>>>(OrEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#test(double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#test(double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnTest"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<double, bool> OnTest { get; set; } = null;
+        public global::System.Func<double, bool> OnTest { get; set; } = null;
 
         void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
         {
@@ -89,7 +89,7 @@ void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#test(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#test(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -98,7 +98,7 @@ public virtual bool Test(double arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#and(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#and(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
@@ -109,10 +109,10 @@ public Java.Util.Function.DoublePredicate AndDefault(Java.Util.Function.DoublePr
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#and(java.util.function.DoublePredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#and(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.DoublePredicate, Java.Util.Function.DoublePredicate> OnAnd { get; set; } = null;
+        public global::System.Func<Java.Util.Function.DoublePredicate, Java.Util.Function.DoublePredicate> OnAnd { get; set; } = null;
 
         void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.DoublePredicate>> data)
         {
@@ -122,7 +122,7 @@ void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#and(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#and(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
@@ -132,7 +132,7 @@ public virtual Java.Util.Function.DoublePredicate And(Java.Util.Function.DoubleP
             return AndDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
@@ -142,10 +142,10 @@ public Java.Util.Function.DoublePredicate NegateDefault()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#negate()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#negate()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNegate"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.DoublePredicate> OnNegate { get; set; } = null;
+        public global::System.Func<Java.Util.Function.DoublePredicate> OnNegate { get; set; } = null;
 
         void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -155,7 +155,7 @@ void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="NegateDefault"/>; override the method to implement a different behavior</remarks>
@@ -164,7 +164,7 @@ public virtual Java.Util.Function.DoublePredicate Negate()
             return NegateDefault();
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#or(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#or(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
@@ -175,10 +175,10 @@ public Java.Util.Function.DoublePredicate OrDefault(Java.Util.Function.DoublePre
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#or(java.util.function.DoublePredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#or(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOr"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.DoublePredicate, Java.Util.Function.DoublePredicate> OnOr { get; set; } = null;
+        public global::System.Func<Java.Util.Function.DoublePredicate, Java.Util.Function.DoublePredicate> OnOr { get; set; } = null;
 
         void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.DoublePredicate>> data)
         {
@@ -188,7 +188,7 @@ void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.F
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#or(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#or(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
@@ -229,7 +229,7 @@ public partial class DoublePredicateDirect : Java.Util.Function.IDoublePredicate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#test(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#test(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -238,7 +238,7 @@ public override bool Test(double arg0)
             return IExecuteWithSignature<bool>("test", "(D)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#and(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#and(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
@@ -247,7 +247,7 @@ public override Java.Util.Function.DoublePredicate And(Java.Util.Function.Double
             return IExecuteWithSignature<Java.Util.Function.DoublePredicateDirect, Java.Util.Function.DoublePredicate>("and", "(Ljava/util/function/DoublePredicate;)Ljava/util/function/DoublePredicate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
         public override Java.Util.Function.DoublePredicate Negate()
@@ -255,7 +255,7 @@ public override Java.Util.Function.DoublePredicate Negate()
             return IExecuteWithSignature<Java.Util.Function.DoublePredicateDirect, Java.Util.Function.DoublePredicate>("negate", "()Ljava/util/function/DoublePredicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoublePredicate.html#or(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoublePredicate.html#or(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Function.DoublePredicate"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/DoubleSupplier.cs b/src/net/Netdroid/Generated/Java/Util/Function/DoubleSupplier.cs
index 436efa483..7261121b0 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/DoubleSupplier.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/DoubleSupplier.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IDoubleSupplier
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleSupplier implementing <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleSupplier.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleSupplier implementing <see href="https://developer.android.com/reference/java/util/function/DoubleSupplier.html"/>
     /// </summary>
     public partial interface IDoubleSupplier
     {
@@ -68,15 +68,15 @@ public partial class DoubleSupplier : Java.Util.Function.IDoubleSupplier
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAsDoubleEventHandler));
+            AddEventHandler("getAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAsDoubleEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleSupplier.html#getAsDouble()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleSupplier.html#getAsDouble()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<double> OnGetAsDouble { get; set; } = null;
+        public global::System.Func<double> OnGetAsDouble { get; set; } = null;
 
         void GetAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -86,7 +86,7 @@ void GetAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData> d
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleSupplier.html#getAsDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleSupplier.html#getAsDouble()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public virtual double GetAsDouble()
@@ -125,11 +125,12 @@ public partial class DoubleSupplierDirect : Java.Util.Function.IDoubleSupplier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleSupplier.html#getAsDouble()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleSupplier.html#getAsDouble()"/>
         /// </summary>
-        public double AsDouble
+        /// <returns><see cref="double"/></returns>
+        public override double GetAsDouble()
         {
-            get { return IExecuteWithSignature<double>("getAsDouble", "()D"); }
+            return IExecuteWithSignature<double>("getAsDouble", "()D");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/DoubleToIntFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/DoubleToIntFunction.cs
index 0d1ccd341..b0591e929 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/DoubleToIntFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/DoubleToIntFunction.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IDoubleToIntFunction
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleToIntFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToIntFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleToIntFunction implementing <see href="https://developer.android.com/reference/java/util/function/DoubleToIntFunction.html"/>
     /// </summary>
     public partial interface IDoubleToIntFunction
     {
@@ -68,15 +68,15 @@ public partial class DoubleToIntFunction : Java.Util.Function.IDoubleToIntFuncti
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsIntEventHandler));
+            AddEventHandler("applyAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsIntEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToIntFunction.html#applyAsInt(double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleToIntFunction.html#applyAsInt(double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<double, int> OnApplyAsInt { get; set; } = null;
+        public global::System.Func<double, int> OnApplyAsInt { get; set; } = null;
 
         void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<dou
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToIntFunction.html#applyAsInt(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleToIntFunction.html#applyAsInt(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="int"/></returns>
@@ -126,7 +126,7 @@ public partial class DoubleToIntFunctionDirect : Java.Util.Function.IDoubleToInt
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToIntFunction.html#applyAsInt(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleToIntFunction.html#applyAsInt(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/DoubleToLongFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/DoubleToLongFunction.cs
index 94937c46c..1025c1ad3 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/DoubleToLongFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/DoubleToLongFunction.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IDoubleToLongFunction
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleToLongFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToLongFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleToLongFunction implementing <see href="https://developer.android.com/reference/java/util/function/DoubleToLongFunction.html"/>
     /// </summary>
     public partial interface IDoubleToLongFunction
     {
@@ -68,15 +68,15 @@ public partial class DoubleToLongFunction : Java.Util.Function.IDoubleToLongFunc
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsLongEventHandler));
+            AddEventHandler("applyAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsLongEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToLongFunction.html#applyAsLong(double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleToLongFunction.html#applyAsLong(double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<double, long> OnApplyAsLong { get; set; } = null;
+        public global::System.Func<double, long> OnApplyAsLong { get; set; } = null;
 
         void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<do
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToLongFunction.html#applyAsLong(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleToLongFunction.html#applyAsLong(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="long"/></returns>
@@ -126,7 +126,7 @@ public partial class DoubleToLongFunctionDirect : Java.Util.Function.IDoubleToLo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleToLongFunction.html#applyAsLong(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleToLongFunction.html#applyAsLong(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/DoubleUnaryOperator.cs b/src/net/Netdroid/Generated/Java/Util/Function/DoubleUnaryOperator.cs
index 63c6918fd..82a2bbfb2 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/DoubleUnaryOperator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/DoubleUnaryOperator.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IDoubleUnaryOperator
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleUnaryOperator implementing <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.DoubleUnaryOperator implementing <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html"/>
     /// </summary>
     public partial interface IDoubleUnaryOperator
     {
@@ -59,27 +59,14 @@ public partial class DoubleUnaryOperator : Java.Util.Function.IDoubleUnaryOperat
         #endregion
 
         #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#identity()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIdentity"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.DoubleUnaryOperator> OnIdentity { get; set; } = null;
-
-        void IdentityEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIdentity != null) ? OnIdentity : Identity;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#identity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#identity()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
-        public virtual Java.Util.Function.DoubleUnaryOperator Identity()
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.DoubleUnaryOperator Identity()
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.DoubleUnaryOperator>(LocalBridgeClazz, "identity", "()Ljava/util/function/DoubleUnaryOperator;");
         }
 
         #endregion
@@ -90,17 +77,17 @@ public virtual Java.Util.Function.DoubleUnaryOperator Identity()
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsDoubleEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleUnaryOperator>>>(AndThenEventHandler));
-            AddEventHandler("compose", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleUnaryOperator>>>(ComposeEventHandler));
+            AddEventHandler("applyAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<double>>>(ApplyAsDoubleEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleUnaryOperator>>>(AndThenEventHandler));
+            AddEventHandler("compose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleUnaryOperator>>>(ComposeEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#applyAsDouble(double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#applyAsDouble(double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<double, double> OnApplyAsDouble { get; set; } = null;
+        public global::System.Func<double, double> OnApplyAsDouble { get; set; } = null;
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<double>> data)
         {
@@ -110,7 +97,7 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#applyAsDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#applyAsDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -119,7 +106,7 @@ public virtual double ApplyAsDouble(double arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
@@ -130,10 +117,10 @@ public Java.Util.Function.DoubleUnaryOperator AndThenDefault(Java.Util.Function.
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.DoubleUnaryOperator, Java.Util.Function.DoubleUnaryOperator> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.DoubleUnaryOperator, Java.Util.Function.DoubleUnaryOperator> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleUnaryOperator>> data)
         {
@@ -143,7 +130,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
@@ -153,7 +140,7 @@ public virtual Java.Util.Function.DoubleUnaryOperator AndThen(Java.Util.Function
             return AndThenDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
@@ -164,10 +151,10 @@ public Java.Util.Function.DoubleUnaryOperator ComposeDefault(Java.Util.Function.
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCompose"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.DoubleUnaryOperator, Java.Util.Function.DoubleUnaryOperator> OnCompose { get; set; } = null;
+        public global::System.Func<Java.Util.Function.DoubleUnaryOperator, Java.Util.Function.DoubleUnaryOperator> OnCompose { get; set; } = null;
 
         void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.DoubleUnaryOperator>> data)
         {
@@ -177,7 +164,7 @@ void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
@@ -218,7 +205,7 @@ public partial class DoubleUnaryOperatorDirect : Java.Util.Function.IDoubleUnary
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#applyAsDouble(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#applyAsDouble(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -227,7 +214,7 @@ public override double ApplyAsDouble(double arg0)
             return IExecuteWithSignature<double>("applyAsDouble", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#andThen(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
@@ -236,7 +223,7 @@ public override Java.Util.Function.DoubleUnaryOperator AndThen(Java.Util.Functio
             return IExecuteWithSignature<Java.Util.Function.DoubleUnaryOperatorDirect, Java.Util.Function.DoubleUnaryOperator>("andThen", "(Ljava/util/function/DoubleUnaryOperator;)Ljava/util/function/DoubleUnaryOperator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/DoubleUnaryOperator.html#compose(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.DoubleUnaryOperator"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/Function.cs b/src/net/Netdroid/Generated/Java/Util/Function/Function.cs
index fed349e95..a9e55fa9c 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/Function.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/Function.cs
@@ -41,27 +41,14 @@ public partial class Function
         #endregion
 
         #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#identity()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIdentity"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function> OnIdentity { get; set; } = null;
-
-        void IdentityEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIdentity != null) ? OnIdentity : Identity;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#identity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#identity()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
-        public virtual Java.Util.Function.Function Identity()
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.Function Identity()
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.Function>(LocalBridgeClazz, "identity", "()Ljava/util/function/Function;");
         }
 
         #endregion
@@ -72,17 +59,17 @@ public virtual Java.Util.Function.Function Identity()
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(AndThenEventHandler));
-            AddEventHandler("compose", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(ComposeEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(AndThenEventHandler));
+            AddEventHandler("compose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(ComposeEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, object> OnApply { get; set; } = null;
+        public global::System.Func<object, object> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -92,7 +79,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -101,7 +88,7 @@ public virtual object Apply(object arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -112,10 +99,10 @@ public Java.Util.Function.Function AndThenDefault(Java.Util.Function.Function ar
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function, Java.Util.Function.Function> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function, Java.Util.Function.Function> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>> data)
         {
@@ -125,7 +112,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -135,7 +122,7 @@ public virtual Java.Util.Function.Function AndThen(Java.Util.Function.Function a
             return AndThenDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -146,10 +133,10 @@ public Java.Util.Function.Function ComposeDefault(Java.Util.Function.Function ar
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCompose"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function, Java.Util.Function.Function> OnCompose { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function, Java.Util.Function.Function> OnCompose { get; set; } = null;
 
         void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>> data)
         {
@@ -159,7 +146,7 @@ void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -200,7 +187,7 @@ public partial class FunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -209,7 +196,7 @@ public override object Apply(object arg0)
             return IExecuteWithSignature("apply", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -218,7 +205,7 @@ public override Java.Util.Function.Function AndThen(Java.Util.Function.Function
             return IExecuteWithSignature<Java.Util.Function.FunctionDirect, Java.Util.Function.Function>("andThen", "(Ljava/util/function/Function;)Ljava/util/function/Function;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -239,7 +226,7 @@ public override Java.Util.Function.Function Compose(Java.Util.Function.Function
 
     #region IFunction<T, R>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.Function implementing <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.Function implementing <see href="https://developer.android.com/reference/java/util/function/Function.html"/>
     /// </summary>
     public partial interface IFunction<T, R>
     {
@@ -271,27 +258,14 @@ public partial class Function<T, R> : Java.Util.Function.IFunction<T, R>
         #endregion
 
         #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#identity()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIdentity"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function<T, T>> OnIdentity { get; set; } = null;
-
-        void IdentityEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIdentity != null) ? OnIdentity : Identity;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#identity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#identity()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
-        public virtual Java.Util.Function.Function<T, T> Identity()
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.Function<T, T> Identity()
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.Function<T, T>>(LocalBridgeClazz, "identity", "()Ljava/util/function/Function;");
         }
 
         #endregion
@@ -302,17 +276,17 @@ public virtual Java.Util.Function.Function<T, T> Identity()
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>>>(AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler));
-            AddEventHandler("compose", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>>>>(Compose<V, Arg0objectSuperV, Arg0ExtendsT>EventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>>>(AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler));
+            AddEventHandler("compose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>>>>(Compose<V, Arg0objectSuperV, Arg0ExtendsT>EventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, R> OnApply { get; set; } = null;
+        public global::System.Func<T, R> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -322,7 +296,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><typeparamref name="R"/></returns>
@@ -331,7 +305,7 @@ public virtual R Apply(T arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -339,16 +313,16 @@ public virtual R Apply(T arg0)
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>Default(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>Default(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return IExecuteWithSignature<Java.Util.Function.Function<T, V>>("andThenDefault", "(Ljava/util/function/Function;)Ljava/util/function/Function;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen<V, Arg0objectSuperR, Arg0ExtendsV>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>, Java.Util.Function.Function<T, V>> OnAndThen<V, Arg0objectSuperR, Arg0ExtendsV> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>, Java.Util.Function.Function<T, V>> OnAndThen<V, Arg0objectSuperR, Arg0ExtendsV> { get; set; } = null;
 
         void AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>> data)
         {
@@ -358,7 +332,7 @@ void AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler(object sender, CLRLi
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -366,12 +340,12 @@ void AndThen<V, Arg0objectSuperR, Arg0ExtendsV>EventHandler(object sender, CLRLi
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="AndThen<V, Arg0objectSuperR, Arg0ExtendsV>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public virtual Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return AndThen<V, Arg0objectSuperR, Arg0ExtendsV>Default(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -379,16 +353,16 @@ public virtual Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, Ar
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.Function<V, R> Compose<V, Arg0objectSuperV, Arg0ExtendsT>Default(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV: V where Arg0ExtendsT: T
+        public Java.Util.Function.Function<V, R> Compose<V, Arg0objectSuperV, Arg0ExtendsT>Default(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV : V where Arg0ExtendsT : T
         {
             return IExecuteWithSignature<Java.Util.Function.Function<V, R>>("composeDefault", "(Ljava/util/function/Function;)Ljava/util/function/Function;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCompose<V, Arg0objectSuperV, Arg0ExtendsT>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>, Java.Util.Function.Function<V, R>> OnCompose<V, Arg0objectSuperV, Arg0ExtendsT> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>, Java.Util.Function.Function<V, R>> OnCompose<V, Arg0objectSuperV, Arg0ExtendsT> { get; set; } = null;
 
         void Compose<V, Arg0objectSuperV, Arg0ExtendsT>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>>> data)
         {
@@ -398,7 +372,7 @@ void Compose<V, Arg0objectSuperV, Arg0ExtendsT>EventHandler(object sender, CLRLi
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -406,7 +380,7 @@ void Compose<V, Arg0objectSuperV, Arg0ExtendsT>EventHandler(object sender, CLRLi
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="Compose<V, Arg0objectSuperV, Arg0ExtendsT>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.Function<V, R> Compose<V, Arg0objectSuperV, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV: V where Arg0ExtendsT: T
+        public virtual Java.Util.Function.Function<V, R> Compose<V, Arg0objectSuperV, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV : V where Arg0ExtendsT : T
         {
             return Compose<V, Arg0objectSuperV, Arg0ExtendsT>Default(arg0);
         }
@@ -442,7 +416,7 @@ public partial class FunctionDirect<T, R> : Java.Util.Function.IFunction<T, R>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><typeparamref name="R"/></returns>
@@ -451,26 +425,26 @@ public override R Apply(T arg0)
             return IExecuteWithSignature<R>("apply", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
         /// <typeparam name="Arg0objectSuperR"><typeparamref name="R"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
-        public override Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public override Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return IExecuteWithSignature<Java.Util.Function.FunctionDirect<T, V>, Java.Util.Function.Function<T, V>>("andThen", "(Ljava/util/function/Function;)Ljava/util/function/Function;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
-        public override Java.Util.Function.Function<V, R> Compose<V, Arg0objectSuperV, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV: V where Arg0ExtendsT: T
+        public override Java.Util.Function.Function<V, R> Compose<V, Arg0objectSuperV, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV : V where Arg0ExtendsT : T
         {
             return IExecuteWithSignature<Java.Util.Function.FunctionDirect<V, R>, Java.Util.Function.Function<V, R>>("compose", "(Ljava/util/function/Function;)Ljava/util/function/Function;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/IntBinaryOperator.cs b/src/net/Netdroid/Generated/Java/Util/Function/IntBinaryOperator.cs
index fb3ff42be..9cf00ffd2 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/IntBinaryOperator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/IntBinaryOperator.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IIntBinaryOperator
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntBinaryOperator implementing <see href="https://developer.android.com/reference/java.base/java/util/function/IntBinaryOperator.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntBinaryOperator implementing <see href="https://developer.android.com/reference/java/util/function/IntBinaryOperator.html"/>
     /// </summary>
     public partial interface IIntBinaryOperator
     {
@@ -68,15 +68,15 @@ public partial class IntBinaryOperator : Java.Util.Function.IIntBinaryOperator
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyAsIntEventHandler));
+            AddEventHandler("applyAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyAsIntEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntBinaryOperator.html#applyAsInt(int,int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntBinaryOperator.html#applyAsInt(int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int, int> OnApplyAsInt { get; set; } = null;
+        public global::System.Func<int, int, int> OnApplyAsInt { get; set; } = null;
 
         void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<int
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntBinaryOperator.html#applyAsInt(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntBinaryOperator.html#applyAsInt(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -127,7 +127,7 @@ public partial class IntBinaryOperatorDirect : Java.Util.Function.IIntBinaryOper
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntBinaryOperator.html#applyAsInt(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntBinaryOperator.html#applyAsInt(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/IntConsumer.cs b/src/net/Netdroid/Generated/Java/Util/Function/IntConsumer.cs
index 58bc6b123..afeefd3bc 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/IntConsumer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/IntConsumer.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IIntConsumer
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntConsumer implementing <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntConsumer implementing <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html"/>
     /// </summary>
     public partial interface IIntConsumer
     {
@@ -68,16 +68,16 @@ public partial class IntConsumer : Java.Util.Function.IIntConsumer
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(AcceptEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntConsumer>>>(AndThenEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(AcceptEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntConsumer>>>(AndThenEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html#accept(int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html#accept(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<int> OnAccept { get; set; } = null;
+        public global::System.Action<int> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -86,7 +86,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> d
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html#accept(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html#accept(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public virtual void Accept(int arg0)
@@ -94,7 +94,7 @@ public virtual void Accept(int arg0)
             
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html#andThen(java.util.function.IntConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html#andThen(java.util.function.IntConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.IntConsumer"/></returns>
@@ -105,10 +105,10 @@ public Java.Util.Function.IntConsumer AndThenDefault(Java.Util.Function.IntConsu
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html#andThen(java.util.function.IntConsumer)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html#andThen(java.util.function.IntConsumer)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.IntConsumer, Java.Util.Function.IntConsumer> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.IntConsumer, Java.Util.Function.IntConsumer> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.IntConsumer>> data)
         {
@@ -118,7 +118,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html#andThen(java.util.function.IntConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html#andThen(java.util.function.IntConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.IntConsumer"/></returns>
@@ -159,7 +159,7 @@ public partial class IntConsumerDirect : Java.Util.Function.IIntConsumer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html#accept(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html#accept(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public override void Accept(int arg0)
@@ -167,7 +167,7 @@ public override void Accept(int arg0)
             IExecuteWithSignature("accept", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntConsumer.html#andThen(java.util.function.IntConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntConsumer.html#andThen(java.util.function.IntConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.IntConsumer"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/IntFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/IntFunction.cs
index 81627fa07..c1238505e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/IntFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/IntFunction.cs
@@ -50,15 +50,15 @@ public partial class IntFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html#apply(int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntFunction.html#apply(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, object> OnApply { get; set; } = null;
+        public global::System.Func<int, object> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -68,7 +68,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> da
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html#apply(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntFunction.html#apply(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -108,7 +108,7 @@ public partial class IntFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html#apply(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntFunction.html#apply(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -129,7 +129,7 @@ public override object Apply(int arg0)
 
     #region IIntFunction<R>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntFunction implementing <see href="https://developer.android.com/reference/java/util/function/IntFunction.html"/>
     /// </summary>
     public partial interface IIntFunction<R>
     {
@@ -170,15 +170,15 @@ public partial class IntFunction<R> : Java.Util.Function.IIntFunction<R>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html#apply(int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntFunction.html#apply(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, R> OnApply { get; set; } = null;
+        public global::System.Func<int, R> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -188,7 +188,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> da
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html#apply(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntFunction.html#apply(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="R"/></returns>
@@ -228,7 +228,7 @@ public partial class IntFunctionDirect<R> : Java.Util.Function.IIntFunction<R>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntFunction.html#apply(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntFunction.html#apply(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="R"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/IntPredicate.cs b/src/net/Netdroid/Generated/Java/Util/Function/IntPredicate.cs
index b57819e9e..e051d5b9b 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/IntPredicate.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/IntPredicate.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IIntPredicate
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntPredicate implementing <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntPredicate implementing <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html"/>
     /// </summary>
     public partial interface IIntPredicate
     {
@@ -68,18 +68,18 @@ public partial class IntPredicate : Java.Util.Function.IIntPredicate
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("test", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(TestEventHandler));
-            AddEventHandler("and", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntPredicate>>>(AndEventHandler));
-            AddEventHandler("negate", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
-            AddEventHandler("or", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntPredicate>>>(OrEventHandler));
+            AddEventHandler("test", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(TestEventHandler));
+            AddEventHandler("and", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntPredicate>>>(AndEventHandler));
+            AddEventHandler("negate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
+            AddEventHandler("or", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntPredicate>>>(OrEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#test(int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#test(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnTest"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, bool> OnTest { get; set; } = null;
+        public global::System.Func<int, bool> OnTest { get; set; } = null;
 
         void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -89,7 +89,7 @@ void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> dat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#test(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#test(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -98,7 +98,7 @@ public virtual bool Test(int arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#and(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#and(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
@@ -109,10 +109,10 @@ public Java.Util.Function.IntPredicate AndDefault(Java.Util.Function.IntPredicat
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#and(java.util.function.IntPredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#and(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.IntPredicate, Java.Util.Function.IntPredicate> OnAnd { get; set; } = null;
+        public global::System.Func<Java.Util.Function.IntPredicate, Java.Util.Function.IntPredicate> OnAnd { get; set; } = null;
 
         void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.IntPredicate>> data)
         {
@@ -122,7 +122,7 @@ void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#and(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#and(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
@@ -132,7 +132,7 @@ public virtual Java.Util.Function.IntPredicate And(Java.Util.Function.IntPredica
             return AndDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
@@ -142,10 +142,10 @@ public Java.Util.Function.IntPredicate NegateDefault()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#negate()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#negate()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNegate"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.IntPredicate> OnNegate { get; set; } = null;
+        public global::System.Func<Java.Util.Function.IntPredicate> OnNegate { get; set; } = null;
 
         void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -155,7 +155,7 @@ void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="NegateDefault"/>; override the method to implement a different behavior</remarks>
@@ -164,7 +164,7 @@ public virtual Java.Util.Function.IntPredicate Negate()
             return NegateDefault();
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#or(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#or(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
@@ -175,10 +175,10 @@ public Java.Util.Function.IntPredicate OrDefault(Java.Util.Function.IntPredicate
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#or(java.util.function.IntPredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#or(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOr"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.IntPredicate, Java.Util.Function.IntPredicate> OnOr { get; set; } = null;
+        public global::System.Func<Java.Util.Function.IntPredicate, Java.Util.Function.IntPredicate> OnOr { get; set; } = null;
 
         void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.IntPredicate>> data)
         {
@@ -188,7 +188,7 @@ void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.F
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#or(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#or(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
@@ -229,7 +229,7 @@ public partial class IntPredicateDirect : Java.Util.Function.IIntPredicate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#test(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#test(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -238,7 +238,7 @@ public override bool Test(int arg0)
             return IExecuteWithSignature<bool>("test", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#and(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#and(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
@@ -247,7 +247,7 @@ public override Java.Util.Function.IntPredicate And(Java.Util.Function.IntPredic
             return IExecuteWithSignature<Java.Util.Function.IntPredicateDirect, Java.Util.Function.IntPredicate>("and", "(Ljava/util/function/IntPredicate;)Ljava/util/function/IntPredicate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
         public override Java.Util.Function.IntPredicate Negate()
@@ -255,7 +255,7 @@ public override Java.Util.Function.IntPredicate Negate()
             return IExecuteWithSignature<Java.Util.Function.IntPredicateDirect, Java.Util.Function.IntPredicate>("negate", "()Ljava/util/function/IntPredicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntPredicate.html#or(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntPredicate.html#or(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.IntPredicate"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/IntSupplier.cs b/src/net/Netdroid/Generated/Java/Util/Function/IntSupplier.cs
index 2c90e2ab8..aae697d6e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/IntSupplier.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/IntSupplier.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IIntSupplier
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntSupplier implementing <see href="https://developer.android.com/reference/java.base/java/util/function/IntSupplier.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntSupplier implementing <see href="https://developer.android.com/reference/java/util/function/IntSupplier.html"/>
     /// </summary>
     public partial interface IIntSupplier
     {
@@ -68,15 +68,15 @@ public partial class IntSupplier : Java.Util.Function.IIntSupplier
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAsIntEventHandler));
+            AddEventHandler("getAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAsIntEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntSupplier.html#getAsInt()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntSupplier.html#getAsInt()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int> OnGetAsInt { get; set; } = null;
+        public global::System.Func<int> OnGetAsInt { get; set; } = null;
 
         void GetAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -86,7 +86,7 @@ void GetAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData> data
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntSupplier.html#getAsInt()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntSupplier.html#getAsInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public virtual int GetAsInt()
@@ -125,11 +125,12 @@ public partial class IntSupplierDirect : Java.Util.Function.IIntSupplier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntSupplier.html#getAsInt()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/function/IntSupplier.html#getAsInt()"/>
         /// </summary>
-        public int AsInt
+        /// <returns><see cref="int"/></returns>
+        public override int GetAsInt()
         {
-            get { return IExecuteWithSignature<int>("getAsInt", "()I"); }
+            return IExecuteWithSignature<int>("getAsInt", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/IntToDoubleFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/IntToDoubleFunction.cs
index a2277d97f..8f781ef61 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/IntToDoubleFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/IntToDoubleFunction.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IIntToDoubleFunction
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntToDoubleFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/IntToDoubleFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntToDoubleFunction implementing <see href="https://developer.android.com/reference/java/util/function/IntToDoubleFunction.html"/>
     /// </summary>
     public partial interface IIntToDoubleFunction
     {
@@ -68,15 +68,15 @@ public partial class IntToDoubleFunction : Java.Util.Function.IIntToDoubleFuncti
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyAsDoubleEventHandler));
+            AddEventHandler("applyAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyAsDoubleEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntToDoubleFunction.html#applyAsDouble(int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntToDoubleFunction.html#applyAsDouble(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, double> OnApplyAsDouble { get; set; } = null;
+        public global::System.Func<int, double> OnApplyAsDouble { get; set; } = null;
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntToDoubleFunction.html#applyAsDouble(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntToDoubleFunction.html#applyAsDouble(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="double"/></returns>
@@ -126,7 +126,7 @@ public partial class IntToDoubleFunctionDirect : Java.Util.Function.IIntToDouble
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntToDoubleFunction.html#applyAsDouble(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntToDoubleFunction.html#applyAsDouble(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="double"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/IntToLongFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/IntToLongFunction.cs
index ecbbc0424..bb1489458 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/IntToLongFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/IntToLongFunction.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IIntToLongFunction
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntToLongFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/IntToLongFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntToLongFunction implementing <see href="https://developer.android.com/reference/java/util/function/IntToLongFunction.html"/>
     /// </summary>
     public partial interface IIntToLongFunction
     {
@@ -68,15 +68,15 @@ public partial class IntToLongFunction : Java.Util.Function.IIntToLongFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyAsLongEventHandler));
+            AddEventHandler("applyAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyAsLongEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntToLongFunction.html#applyAsLong(int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntToLongFunction.html#applyAsLong(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, long> OnApplyAsLong { get; set; } = null;
+        public global::System.Func<int, long> OnApplyAsLong { get; set; } = null;
 
         void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<in
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntToLongFunction.html#applyAsLong(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntToLongFunction.html#applyAsLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -126,7 +126,7 @@ public partial class IntToLongFunctionDirect : Java.Util.Function.IIntToLongFunc
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntToLongFunction.html#applyAsLong(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntToLongFunction.html#applyAsLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/IntUnaryOperator.cs b/src/net/Netdroid/Generated/Java/Util/Function/IntUnaryOperator.cs
index e49bbcdb5..f2b0c17fd 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/IntUnaryOperator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/IntUnaryOperator.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region IIntUnaryOperator
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntUnaryOperator implementing <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.IntUnaryOperator implementing <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html"/>
     /// </summary>
     public partial interface IIntUnaryOperator
     {
@@ -59,27 +59,14 @@ public partial class IntUnaryOperator : Java.Util.Function.IIntUnaryOperator
         #endregion
 
         #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#identity()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIdentity"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.IntUnaryOperator> OnIdentity { get; set; } = null;
-
-        void IdentityEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIdentity != null) ? OnIdentity : Identity;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#identity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#identity()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.IntUnaryOperator"/></returns>
-        public virtual Java.Util.Function.IntUnaryOperator Identity()
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.IntUnaryOperator Identity()
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.IntUnaryOperator>(LocalBridgeClazz, "identity", "()Ljava/util/function/IntUnaryOperator;");
         }
 
         #endregion
@@ -90,17 +77,17 @@ public virtual Java.Util.Function.IntUnaryOperator Identity()
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyAsIntEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntUnaryOperator>>>(AndThenEventHandler));
-            AddEventHandler("compose", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntUnaryOperator>>>(ComposeEventHandler));
+            AddEventHandler("applyAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<int>>>(ApplyAsIntEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntUnaryOperator>>>(AndThenEventHandler));
+            AddEventHandler("compose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.IntUnaryOperator>>>(ComposeEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#applyAsInt(int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#applyAsInt(int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<int, int> OnApplyAsInt { get; set; } = null;
+        public global::System.Func<int, int> OnApplyAsInt { get; set; } = null;
 
         void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<int>> data)
         {
@@ -110,7 +97,7 @@ void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<int
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#applyAsInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#applyAsInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -119,7 +106,7 @@ public virtual int ApplyAsInt(int arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#andThen(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#andThen(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.IntUnaryOperator"/></returns>
@@ -130,10 +117,10 @@ public Java.Util.Function.IntUnaryOperator AndThenDefault(Java.Util.Function.Int
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#andThen(java.util.function.IntUnaryOperator)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#andThen(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.IntUnaryOperator, Java.Util.Function.IntUnaryOperator> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.IntUnaryOperator, Java.Util.Function.IntUnaryOperator> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.IntUnaryOperator>> data)
         {
@@ -143,7 +130,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#andThen(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#andThen(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.IntUnaryOperator"/></returns>
@@ -153,7 +140,7 @@ public virtual Java.Util.Function.IntUnaryOperator AndThen(Java.Util.Function.In
             return AndThenDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#compose(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#compose(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.IntUnaryOperator"/></returns>
@@ -164,10 +151,10 @@ public Java.Util.Function.IntUnaryOperator ComposeDefault(Java.Util.Function.Int
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#compose(java.util.function.IntUnaryOperator)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#compose(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCompose"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.IntUnaryOperator, Java.Util.Function.IntUnaryOperator> OnCompose { get; set; } = null;
+        public global::System.Func<Java.Util.Function.IntUnaryOperator, Java.Util.Function.IntUnaryOperator> OnCompose { get; set; } = null;
 
         void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.IntUnaryOperator>> data)
         {
@@ -177,7 +164,7 @@ void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#compose(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#compose(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.IntUnaryOperator"/></returns>
@@ -218,7 +205,7 @@ public partial class IntUnaryOperatorDirect : Java.Util.Function.IIntUnaryOperat
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#applyAsInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#applyAsInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -227,7 +214,7 @@ public override int ApplyAsInt(int arg0)
             return IExecuteWithSignature<int>("applyAsInt", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#andThen(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#andThen(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.IntUnaryOperator"/></returns>
@@ -236,7 +223,7 @@ public override Java.Util.Function.IntUnaryOperator AndThen(Java.Util.Function.I
             return IExecuteWithSignature<Java.Util.Function.IntUnaryOperatorDirect, Java.Util.Function.IntUnaryOperator>("andThen", "(Ljava/util/function/IntUnaryOperator;)Ljava/util/function/IntUnaryOperator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/IntUnaryOperator.html#compose(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/IntUnaryOperator.html#compose(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.IntUnaryOperator"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/LongBinaryOperator.cs b/src/net/Netdroid/Generated/Java/Util/Function/LongBinaryOperator.cs
index aaace1e8b..2645d6ec7 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/LongBinaryOperator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/LongBinaryOperator.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region ILongBinaryOperator
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongBinaryOperator implementing <see href="https://developer.android.com/reference/java.base/java/util/function/LongBinaryOperator.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongBinaryOperator implementing <see href="https://developer.android.com/reference/java/util/function/LongBinaryOperator.html"/>
     /// </summary>
     public partial interface ILongBinaryOperator
     {
@@ -68,15 +68,15 @@ public partial class LongBinaryOperator : Java.Util.Function.ILongBinaryOperator
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyAsLongEventHandler));
+            AddEventHandler("applyAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyAsLongEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongBinaryOperator.html#applyAsLong(long,long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongBinaryOperator.html#applyAsLong(long,long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long, long> OnApplyAsLong { get; set; } = null;
+        public global::System.Func<long, long, long> OnApplyAsLong { get; set; } = null;
 
         void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<lo
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongBinaryOperator.html#applyAsLong(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongBinaryOperator.html#applyAsLong(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -127,7 +127,7 @@ public partial class LongBinaryOperatorDirect : Java.Util.Function.ILongBinaryOp
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongBinaryOperator.html#applyAsLong(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongBinaryOperator.html#applyAsLong(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/LongConsumer.cs b/src/net/Netdroid/Generated/Java/Util/Function/LongConsumer.cs
index e49a73a29..07c390cae 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/LongConsumer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/LongConsumer.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region ILongConsumer
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongConsumer implementing <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongConsumer implementing <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html"/>
     /// </summary>
     public partial interface ILongConsumer
     {
@@ -68,16 +68,16 @@ public partial class LongConsumer : Java.Util.Function.ILongConsumer
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(AcceptEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongConsumer>>>(AndThenEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(AcceptEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongConsumer>>>(AndThenEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html#accept(long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html#accept(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<long> OnAccept { get; set; } = null;
+        public global::System.Action<long> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -86,7 +86,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html#accept(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html#accept(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public virtual void Accept(long arg0)
@@ -94,7 +94,7 @@ public virtual void Accept(long arg0)
             
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html#andThen(java.util.function.LongConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html#andThen(java.util.function.LongConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.LongConsumer"/></returns>
@@ -105,10 +105,10 @@ public Java.Util.Function.LongConsumer AndThenDefault(Java.Util.Function.LongCon
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html#andThen(java.util.function.LongConsumer)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html#andThen(java.util.function.LongConsumer)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.LongConsumer, Java.Util.Function.LongConsumer> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.LongConsumer, Java.Util.Function.LongConsumer> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.LongConsumer>> data)
         {
@@ -118,7 +118,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html#andThen(java.util.function.LongConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html#andThen(java.util.function.LongConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.LongConsumer"/></returns>
@@ -159,7 +159,7 @@ public partial class LongConsumerDirect : Java.Util.Function.ILongConsumer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html#accept(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html#accept(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public override void Accept(long arg0)
@@ -167,7 +167,7 @@ public override void Accept(long arg0)
             IExecuteWithSignature("accept", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongConsumer.html#andThen(java.util.function.LongConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongConsumer.html#andThen(java.util.function.LongConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
         /// <returns><see cref="Java.Util.Function.LongConsumer"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/LongFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/LongFunction.cs
index a10982fca..7399abcd5 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/LongFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/LongFunction.cs
@@ -50,15 +50,15 @@ public partial class LongFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html#apply(long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongFunction.html#apply(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, object> OnApply { get; set; } = null;
+        public global::System.Func<long, object> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -68,7 +68,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> d
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html#apply(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongFunction.html#apply(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="object"/></returns>
@@ -108,7 +108,7 @@ public partial class LongFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html#apply(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongFunction.html#apply(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="object"/></returns>
@@ -129,7 +129,7 @@ public override object Apply(long arg0)
 
     #region ILongFunction<R>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongFunction implementing <see href="https://developer.android.com/reference/java/util/function/LongFunction.html"/>
     /// </summary>
     public partial interface ILongFunction<R>
     {
@@ -170,15 +170,15 @@ public partial class LongFunction<R> : Java.Util.Function.ILongFunction<R>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html#apply(long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongFunction.html#apply(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, R> OnApply { get; set; } = null;
+        public global::System.Func<long, R> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -188,7 +188,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> d
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html#apply(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongFunction.html#apply(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><typeparamref name="R"/></returns>
@@ -228,7 +228,7 @@ public partial class LongFunctionDirect<R> : Java.Util.Function.ILongFunction<R>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongFunction.html#apply(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongFunction.html#apply(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><typeparamref name="R"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/LongPredicate.cs b/src/net/Netdroid/Generated/Java/Util/Function/LongPredicate.cs
index 4570a182e..8ce3e9f7e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/LongPredicate.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/LongPredicate.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region ILongPredicate
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongPredicate implementing <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongPredicate implementing <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html"/>
     /// </summary>
     public partial interface ILongPredicate
     {
@@ -68,18 +68,18 @@ public partial class LongPredicate : Java.Util.Function.ILongPredicate
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("test", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(TestEventHandler));
-            AddEventHandler("and", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongPredicate>>>(AndEventHandler));
-            AddEventHandler("negate", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
-            AddEventHandler("or", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongPredicate>>>(OrEventHandler));
+            AddEventHandler("test", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(TestEventHandler));
+            AddEventHandler("and", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongPredicate>>>(AndEventHandler));
+            AddEventHandler("negate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
+            AddEventHandler("or", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongPredicate>>>(OrEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#test(long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#test(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnTest"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, bool> OnTest { get; set; } = null;
+        public global::System.Func<long, bool> OnTest { get; set; } = null;
 
         void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -89,7 +89,7 @@ void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> da
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#test(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#test(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -98,7 +98,7 @@ public virtual bool Test(long arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#and(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#and(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
@@ -109,10 +109,10 @@ public Java.Util.Function.LongPredicate AndDefault(Java.Util.Function.LongPredic
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#and(java.util.function.LongPredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#and(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.LongPredicate, Java.Util.Function.LongPredicate> OnAnd { get; set; } = null;
+        public global::System.Func<Java.Util.Function.LongPredicate, Java.Util.Function.LongPredicate> OnAnd { get; set; } = null;
 
         void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.LongPredicate>> data)
         {
@@ -122,7 +122,7 @@ void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#and(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#and(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
@@ -132,7 +132,7 @@ public virtual Java.Util.Function.LongPredicate And(Java.Util.Function.LongPredi
             return AndDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
@@ -142,10 +142,10 @@ public Java.Util.Function.LongPredicate NegateDefault()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#negate()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#negate()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNegate"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.LongPredicate> OnNegate { get; set; } = null;
+        public global::System.Func<Java.Util.Function.LongPredicate> OnNegate { get; set; } = null;
 
         void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -155,7 +155,7 @@ void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="NegateDefault"/>; override the method to implement a different behavior</remarks>
@@ -164,7 +164,7 @@ public virtual Java.Util.Function.LongPredicate Negate()
             return NegateDefault();
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#or(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#or(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
@@ -175,10 +175,10 @@ public Java.Util.Function.LongPredicate OrDefault(Java.Util.Function.LongPredica
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#or(java.util.function.LongPredicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#or(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOr"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.LongPredicate, Java.Util.Function.LongPredicate> OnOr { get; set; } = null;
+        public global::System.Func<Java.Util.Function.LongPredicate, Java.Util.Function.LongPredicate> OnOr { get; set; } = null;
 
         void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.LongPredicate>> data)
         {
@@ -188,7 +188,7 @@ void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.F
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#or(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#or(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
@@ -229,7 +229,7 @@ public partial class LongPredicateDirect : Java.Util.Function.ILongPredicate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#test(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#test(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -238,7 +238,7 @@ public override bool Test(long arg0)
             return IExecuteWithSignature<bool>("test", "(J)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#and(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#and(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
@@ -247,7 +247,7 @@ public override Java.Util.Function.LongPredicate And(Java.Util.Function.LongPred
             return IExecuteWithSignature<Java.Util.Function.LongPredicateDirect, Java.Util.Function.LongPredicate>("and", "(Ljava/util/function/LongPredicate;)Ljava/util/function/LongPredicate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
         public override Java.Util.Function.LongPredicate Negate()
@@ -255,7 +255,7 @@ public override Java.Util.Function.LongPredicate Negate()
             return IExecuteWithSignature<Java.Util.Function.LongPredicateDirect, Java.Util.Function.LongPredicate>("negate", "()Ljava/util/function/LongPredicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongPredicate.html#or(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongPredicate.html#or(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Function.LongPredicate"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/LongSupplier.cs b/src/net/Netdroid/Generated/Java/Util/Function/LongSupplier.cs
index 1fca6c691..5848850ce 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/LongSupplier.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/LongSupplier.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region ILongSupplier
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongSupplier implementing <see href="https://developer.android.com/reference/java.base/java/util/function/LongSupplier.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongSupplier implementing <see href="https://developer.android.com/reference/java/util/function/LongSupplier.html"/>
     /// </summary>
     public partial interface ILongSupplier
     {
@@ -68,15 +68,15 @@ public partial class LongSupplier : Java.Util.Function.ILongSupplier
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAsLongEventHandler));
+            AddEventHandler("getAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetAsLongEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongSupplier.html#getAsLong()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongSupplier.html#getAsLong()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long> OnGetAsLong { get; set; } = null;
+        public global::System.Func<long> OnGetAsLong { get; set; } = null;
 
         void GetAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -86,7 +86,7 @@ void GetAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData> dat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongSupplier.html#getAsLong()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongSupplier.html#getAsLong()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public virtual long GetAsLong()
@@ -125,11 +125,12 @@ public partial class LongSupplierDirect : Java.Util.Function.ILongSupplier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongSupplier.html#getAsLong()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/function/LongSupplier.html#getAsLong()"/>
         /// </summary>
-        public long AsLong
+        /// <returns><see cref="long"/></returns>
+        public override long GetAsLong()
         {
-            get { return IExecuteWithSignature<long>("getAsLong", "()J"); }
+            return IExecuteWithSignature<long>("getAsLong", "()J");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/LongToDoubleFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/LongToDoubleFunction.cs
index 54edf4b87..10e9bc15b 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/LongToDoubleFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/LongToDoubleFunction.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region ILongToDoubleFunction
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongToDoubleFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/LongToDoubleFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongToDoubleFunction implementing <see href="https://developer.android.com/reference/java/util/function/LongToDoubleFunction.html"/>
     /// </summary>
     public partial interface ILongToDoubleFunction
     {
@@ -68,15 +68,15 @@ public partial class LongToDoubleFunction : Java.Util.Function.ILongToDoubleFunc
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyAsDoubleEventHandler));
+            AddEventHandler("applyAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyAsDoubleEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongToDoubleFunction.html#applyAsDouble(long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongToDoubleFunction.html#applyAsDouble(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, double> OnApplyAsDouble { get; set; } = null;
+        public global::System.Func<long, double> OnApplyAsDouble { get; set; } = null;
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongToDoubleFunction.html#applyAsDouble(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongToDoubleFunction.html#applyAsDouble(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="double"/></returns>
@@ -126,7 +126,7 @@ public partial class LongToDoubleFunctionDirect : Java.Util.Function.ILongToDoub
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongToDoubleFunction.html#applyAsDouble(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongToDoubleFunction.html#applyAsDouble(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="double"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/LongToIntFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/LongToIntFunction.cs
index a0ef626fc..6a90cddbf 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/LongToIntFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/LongToIntFunction.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region ILongToIntFunction
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongToIntFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/LongToIntFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongToIntFunction implementing <see href="https://developer.android.com/reference/java/util/function/LongToIntFunction.html"/>
     /// </summary>
     public partial interface ILongToIntFunction
     {
@@ -68,15 +68,15 @@ public partial class LongToIntFunction : Java.Util.Function.ILongToIntFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyAsIntEventHandler));
+            AddEventHandler("applyAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyAsIntEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongToIntFunction.html#applyAsInt(long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongToIntFunction.html#applyAsInt(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, int> OnApplyAsInt { get; set; } = null;
+        public global::System.Func<long, int> OnApplyAsInt { get; set; } = null;
 
         void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -86,7 +86,7 @@ void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<lon
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongToIntFunction.html#applyAsInt(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongToIntFunction.html#applyAsInt(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -126,7 +126,7 @@ public partial class LongToIntFunctionDirect : Java.Util.Function.ILongToIntFunc
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongToIntFunction.html#applyAsInt(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongToIntFunction.html#applyAsInt(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/LongUnaryOperator.cs b/src/net/Netdroid/Generated/Java/Util/Function/LongUnaryOperator.cs
index 491329ac5..03d8be330 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/LongUnaryOperator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/LongUnaryOperator.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Function
 {
     #region ILongUnaryOperator
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongUnaryOperator implementing <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.LongUnaryOperator implementing <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html"/>
     /// </summary>
     public partial interface ILongUnaryOperator
     {
@@ -59,27 +59,14 @@ public partial class LongUnaryOperator : Java.Util.Function.ILongUnaryOperator
         #endregion
 
         #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#identity()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIdentity"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.LongUnaryOperator> OnIdentity { get; set; } = null;
-
-        void IdentityEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnIdentity != null) ? OnIdentity : Identity;
-            var executionResult = methodToExecute.Invoke();
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#identity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#identity()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.LongUnaryOperator"/></returns>
-        public virtual Java.Util.Function.LongUnaryOperator Identity()
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.LongUnaryOperator Identity()
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.LongUnaryOperator>(LocalBridgeClazz, "identity", "()Ljava/util/function/LongUnaryOperator;");
         }
 
         #endregion
@@ -90,17 +77,17 @@ public virtual Java.Util.Function.LongUnaryOperator Identity()
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyAsLongEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongUnaryOperator>>>(AndThenEventHandler));
-            AddEventHandler("compose", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongUnaryOperator>>>(ComposeEventHandler));
+            AddEventHandler("applyAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<long>>>(ApplyAsLongEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongUnaryOperator>>>(AndThenEventHandler));
+            AddEventHandler("compose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.LongUnaryOperator>>>(ComposeEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#applyAsLong(long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#applyAsLong(long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<long, long> OnApplyAsLong { get; set; } = null;
+        public global::System.Func<long, long> OnApplyAsLong { get; set; } = null;
 
         void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<long>> data)
         {
@@ -110,7 +97,7 @@ void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<lo
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#applyAsLong(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#applyAsLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -119,7 +106,7 @@ public virtual long ApplyAsLong(long arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#andThen(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#andThen(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.LongUnaryOperator"/></returns>
@@ -130,10 +117,10 @@ public Java.Util.Function.LongUnaryOperator AndThenDefault(Java.Util.Function.Lo
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#andThen(java.util.function.LongUnaryOperator)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#andThen(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.LongUnaryOperator, Java.Util.Function.LongUnaryOperator> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.LongUnaryOperator, Java.Util.Function.LongUnaryOperator> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.LongUnaryOperator>> data)
         {
@@ -143,7 +130,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#andThen(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#andThen(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.LongUnaryOperator"/></returns>
@@ -153,7 +140,7 @@ public virtual Java.Util.Function.LongUnaryOperator AndThen(Java.Util.Function.L
             return AndThenDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#compose(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#compose(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.LongUnaryOperator"/></returns>
@@ -164,10 +151,10 @@ public Java.Util.Function.LongUnaryOperator ComposeDefault(Java.Util.Function.Lo
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#compose(java.util.function.LongUnaryOperator)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#compose(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCompose"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.LongUnaryOperator, Java.Util.Function.LongUnaryOperator> OnCompose { get; set; } = null;
+        public global::System.Func<Java.Util.Function.LongUnaryOperator, Java.Util.Function.LongUnaryOperator> OnCompose { get; set; } = null;
 
         void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.LongUnaryOperator>> data)
         {
@@ -177,7 +164,7 @@ void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#compose(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#compose(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.LongUnaryOperator"/></returns>
@@ -218,7 +205,7 @@ public partial class LongUnaryOperatorDirect : Java.Util.Function.ILongUnaryOper
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#applyAsLong(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#applyAsLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -227,7 +214,7 @@ public override long ApplyAsLong(long arg0)
             return IExecuteWithSignature<long>("applyAsLong", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#andThen(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#andThen(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.LongUnaryOperator"/></returns>
@@ -236,7 +223,7 @@ public override Java.Util.Function.LongUnaryOperator AndThen(Java.Util.Function.
             return IExecuteWithSignature<Java.Util.Function.LongUnaryOperatorDirect, Java.Util.Function.LongUnaryOperator>("andThen", "(Ljava/util/function/LongUnaryOperator;)Ljava/util/function/LongUnaryOperator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/LongUnaryOperator.html#compose(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/LongUnaryOperator.html#compose(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Function.LongUnaryOperator"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ObjDoubleConsumer.cs b/src/net/Netdroid/Generated/Java/Util/Function/ObjDoubleConsumer.cs
index 139bd6d45..2a35cf63d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ObjDoubleConsumer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ObjDoubleConsumer.cs
@@ -50,15 +50,15 @@ public partial class ObjDoubleConsumer
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<object, double> OnAccept { get; set; } = null;
+        public global::System.Action<object, double> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -67,7 +67,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -107,7 +107,7 @@ public partial class ObjDoubleConsumerDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -128,7 +128,7 @@ public override void Accept(object arg0, double arg1)
 
     #region IObjDoubleConsumer<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ObjDoubleConsumer implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ObjDoubleConsumer implementing <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html"/>
     /// </summary>
     public partial interface IObjDoubleConsumer<T>
     {
@@ -169,15 +169,15 @@ public partial class ObjDoubleConsumer<T> : Java.Util.Function.IObjDoubleConsume
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<T, double> OnAccept { get; set; } = null;
+        public global::System.Action<T, double> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -186,7 +186,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> dat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -226,7 +226,7 @@ public partial class ObjDoubleConsumerDirect<T> : Java.Util.Function.IObjDoubleC
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjDoubleConsumer.html#accept(java.lang.Object,double)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="double"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ObjIntConsumer.cs b/src/net/Netdroid/Generated/Java/Util/Function/ObjIntConsumer.cs
index 7df9e41ba..e104b25e2 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ObjIntConsumer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ObjIntConsumer.cs
@@ -50,15 +50,15 @@ public partial class ObjIntConsumer
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<object, int> OnAccept { get; set; } = null;
+        public global::System.Action<object, int> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -67,7 +67,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -107,7 +107,7 @@ public partial class ObjIntConsumerDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -128,7 +128,7 @@ public override void Accept(object arg0, int arg1)
 
     #region IObjIntConsumer<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ObjIntConsumer implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ObjIntConsumer implementing <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html"/>
     /// </summary>
     public partial interface IObjIntConsumer<T>
     {
@@ -169,15 +169,15 @@ public partial class ObjIntConsumer<T> : Java.Util.Function.IObjIntConsumer<T>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<T, int> OnAccept { get; set; } = null;
+        public global::System.Action<T, int> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -186,7 +186,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> dat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -226,7 +226,7 @@ public partial class ObjIntConsumerDirect<T> : Java.Util.Function.IObjIntConsume
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjIntConsumer.html#accept(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ObjLongConsumer.cs b/src/net/Netdroid/Generated/Java/Util/Function/ObjLongConsumer.cs
index c09e4ea12..2f06b7653 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ObjLongConsumer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ObjLongConsumer.cs
@@ -50,15 +50,15 @@ public partial class ObjLongConsumer
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(AcceptEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<object, long> OnAccept { get; set; } = null;
+        public global::System.Action<object, long> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -67,7 +67,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -107,7 +107,7 @@ public partial class ObjLongConsumerDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -128,7 +128,7 @@ public override void Accept(object arg0, long arg1)
 
     #region IObjLongConsumer<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ObjLongConsumer implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ObjLongConsumer implementing <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html"/>
     /// </summary>
     public partial interface IObjLongConsumer<T>
     {
@@ -169,15 +169,15 @@ public partial class ObjLongConsumer<T> : Java.Util.Function.IObjLongConsumer<T>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("accept", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
+            AddEventHandler("accept", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(AcceptEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAccept"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<T, long> OnAccept { get; set; } = null;
+        public global::System.Action<T, long> OnAccept { get; set; } = null;
 
         void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -186,7 +186,7 @@ void AcceptEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> dat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -226,7 +226,7 @@ public partial class ObjLongConsumerDirect<T> : Java.Util.Function.IObjLongConsu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ObjLongConsumer.html#accept(java.lang.Object,long)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/Predicate.cs b/src/net/Netdroid/Generated/Java/Util/Function/Predicate.cs
index 06a8cd1e0..5686207c6 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/Predicate.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/Predicate.cs
@@ -41,51 +41,25 @@ public partial class Predicate
         #endregion
 
         #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#isEqual(java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEqual"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, Java.Util.Function.Predicate> OnIsEqual { get; set; } = null;
-
-        void IsEqualEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
-        {
-            var methodToExecute = (OnIsEqual != null) ? OnIsEqual : IsEqual;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#isEqual(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#isEqual(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
-        public virtual Java.Util.Function.Predicate IsEqual(object arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.Predicate IsEqual(object arg0)
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.Predicate>(LocalBridgeClazz, "isEqual", "(Ljava/lang/Object;)Ljava/util/function/Predicate;", arg0);
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#not(java.util.function.Predicate)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNot"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Predicate, Java.Util.Function.Predicate> OnNot { get; set; } = null;
-
-        void NotEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate>> data)
-        {
-            var methodToExecute = (OnNot != null) ? OnNot : Not;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#not(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#not(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
-        public virtual Java.Util.Function.Predicate Not(Java.Util.Function.Predicate arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.Predicate Not(Java.Util.Function.Predicate arg0)
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.Predicate>(LocalBridgeClazz, "not", "(Ljava/util/function/Predicate;)Ljava/util/function/Predicate;", arg0);
         }
 
         #endregion
@@ -96,18 +70,18 @@ public virtual Java.Util.Function.Predicate Not(Java.Util.Function.Predicate arg
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("test", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(TestEventHandler));
-            AddEventHandler("and", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate>>>(AndEventHandler));
-            AddEventHandler("negate", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
-            AddEventHandler("or", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate>>>(OrEventHandler));
+            AddEventHandler("test", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(TestEventHandler));
+            AddEventHandler("and", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate>>>(AndEventHandler));
+            AddEventHandler("negate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
+            AddEventHandler("or", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate>>>(OrEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#test(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Predicate.html#test(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnTest"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, bool> OnTest { get; set; } = null;
+        public global::System.Func<object, bool> OnTest { get; set; } = null;
 
         void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -117,7 +91,7 @@ void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#test(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#test(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -126,7 +100,7 @@ public virtual bool Test(object arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
@@ -137,10 +111,10 @@ public Java.Util.Function.Predicate AndDefault(Java.Util.Function.Predicate arg0
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAnd"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Predicate, Java.Util.Function.Predicate> OnAnd { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Predicate, Java.Util.Function.Predicate> OnAnd { get; set; } = null;
 
         void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate>> data)
         {
@@ -150,7 +124,7 @@ void AndEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
@@ -160,7 +134,7 @@ public virtual Java.Util.Function.Predicate And(Java.Util.Function.Predicate arg
             return AndDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
@@ -170,10 +144,10 @@ public Java.Util.Function.Predicate NegateDefault()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#negate()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Predicate.html#negate()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNegate"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Predicate> OnNegate { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Predicate> OnNegate { get; set; } = null;
 
         void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -183,7 +157,7 @@ void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="NegateDefault"/>; override the method to implement a different behavior</remarks>
@@ -192,7 +166,7 @@ public virtual Java.Util.Function.Predicate Negate()
             return NegateDefault();
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
@@ -203,10 +177,10 @@ public Java.Util.Function.Predicate OrDefault(Java.Util.Function.Predicate arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOr"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Predicate, Java.Util.Function.Predicate> OnOr { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Predicate, Java.Util.Function.Predicate> OnOr { get; set; } = null;
 
         void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate>> data)
         {
@@ -216,7 +190,7 @@ void OrEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.F
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
@@ -257,7 +231,7 @@ public partial class PredicateDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#test(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#test(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -266,7 +240,7 @@ public override bool Test(object arg0)
             return IExecuteWithSignature<bool>("test", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
@@ -275,7 +249,7 @@ public override Java.Util.Function.Predicate And(Java.Util.Function.Predicate ar
             return IExecuteWithSignature<Java.Util.Function.PredicateDirect, Java.Util.Function.Predicate>("and", "(Ljava/util/function/Predicate;)Ljava/util/function/Predicate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         public override Java.Util.Function.Predicate Negate()
@@ -283,7 +257,7 @@ public override Java.Util.Function.Predicate Negate()
             return IExecuteWithSignature<Java.Util.Function.PredicateDirect, Java.Util.Function.Predicate>("negate", "()Ljava/util/function/Predicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
@@ -304,7 +278,7 @@ public override Java.Util.Function.Predicate Or(Java.Util.Function.Predicate arg
 
     #region IPredicate<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.Predicate implementing <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.Predicate implementing <see href="https://developer.android.com/reference/java/util/function/Predicate.html"/>
     /// </summary>
     public partial interface IPredicate<T>
     {
@@ -336,52 +310,26 @@ public partial class Predicate<T> : Java.Util.Function.IPredicate<T>
         #endregion
 
         #region Static methods
-        
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#isEqual(java.lang.Object)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnIsEqual"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, Java.Util.Function.Predicate<T>> OnIsEqual { get; set; } = null;
-
-        void IsEqualEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
-        {
-            var methodToExecute = (OnIsEqual != null) ? OnIsEqual : IsEqual;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#isEqual(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#isEqual(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
-        public virtual Java.Util.Function.Predicate<T> IsEqual(object arg0)
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.Predicate<T> IsEqual(object arg0)
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.Predicate<T>>(LocalBridgeClazz, "isEqual", "(Ljava/lang/Object;)Ljava/util/function/Predicate;", arg0);
         }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#not(java.util.function.Predicate)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnNot<Arg0objectSuperT>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Predicate<Arg0objectSuperT>, Java.Util.Function.Predicate<T>> OnNot<Arg0objectSuperT> { get; set; } = null;
-
-        void Not<Arg0objectSuperT>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate<Arg0objectSuperT>>> data)
-        {
-            var methodToExecute = (OnNot<Arg0objectSuperT> != null) ? OnNot<Arg0objectSuperT> : Not<Arg0objectSuperT>;
-            var executionResult = methodToExecute.Invoke(data.EventData.TypedEventData);
-            data.SetReturnValue(executionResult);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#not(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#not(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
-        public virtual Java.Util.Function.Predicate<T> Not<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        /// <remarks>The method invokes the static implementation in the JVM interface</remarks>
+        public static Java.Util.Function.Predicate<T> Not<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
-            return default;
+            return SExecuteWithSignature<Java.Util.Function.Predicate<T>>(LocalBridgeClazz, "not", "(Ljava/util/function/Predicate;)Ljava/util/function/Predicate;", arg0);
         }
 
         #endregion
@@ -392,18 +340,18 @@ public virtual Java.Util.Function.Predicate<T> Not<Arg0objectSuperT>(Java.Util.F
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("test", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(TestEventHandler));
-            AddEventHandler("and", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate<Arg0objectSuperT>>>>(And<Arg0objectSuperT>EventHandler));
-            AddEventHandler("negate", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
-            AddEventHandler("or", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate<Arg0objectSuperT>>>>(Or<Arg0objectSuperT>EventHandler));
+            AddEventHandler("test", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(TestEventHandler));
+            AddEventHandler("and", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate<Arg0objectSuperT>>>>(And<Arg0objectSuperT>EventHandler));
+            AddEventHandler("negate", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(NegateEventHandler));
+            AddEventHandler("or", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate<Arg0objectSuperT>>>>(Or<Arg0objectSuperT>EventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#test(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Predicate.html#test(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnTest"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, bool> OnTest { get; set; } = null;
+        public global::System.Func<T, bool> OnTest { get; set; } = null;
 
         void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -413,7 +361,7 @@ void TestEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#test(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#test(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -422,22 +370,22 @@ public virtual bool Test(T arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.Predicate<T> And<Arg0objectSuperT>Default(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Function.Predicate<T> And<Arg0objectSuperT>Default(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Function.Predicate<T>>("andDefault", "(Ljava/util/function/Predicate;)Ljava/util/function/Predicate;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAnd<Arg0objectSuperT>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Predicate<Arg0objectSuperT>, Java.Util.Function.Predicate<T>> OnAnd<Arg0objectSuperT> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Predicate<Arg0objectSuperT>, Java.Util.Function.Predicate<T>> OnAnd<Arg0objectSuperT> { get; set; } = null;
 
         void And<Arg0objectSuperT>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate<Arg0objectSuperT>>> data)
         {
@@ -447,18 +395,18 @@ void And<Arg0objectSuperT>EventHandler(object sender, CLRListenerEventArgs<CLREv
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="And<Arg0objectSuperT>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.Predicate<T> And<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public virtual Java.Util.Function.Predicate<T> And<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return And<Arg0objectSuperT>Default(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
@@ -468,10 +416,10 @@ public Java.Util.Function.Predicate<T> NegateDefault()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#negate()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Predicate.html#negate()"/>
         /// </summary>
         /// <remarks>If <see cref="OnNegate"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Predicate<T>> OnNegate { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Predicate<T>> OnNegate { get; set; } = null;
 
         void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -481,7 +429,7 @@ void NegateEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="NegateDefault"/>; override the method to implement a different behavior</remarks>
@@ -490,22 +438,22 @@ public virtual Java.Util.Function.Predicate<T> Negate()
             return NegateDefault();
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.Predicate<T> Or<Arg0objectSuperT>Default(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Function.Predicate<T> Or<Arg0objectSuperT>Default(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Function.Predicate<T>>("orDefault", "(Ljava/util/function/Predicate;)Ljava/util/function/Predicate;", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
         /// </summary>
         /// <remarks>If <see cref="OnOr<Arg0objectSuperT>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Predicate<Arg0objectSuperT>, Java.Util.Function.Predicate<T>> OnOr<Arg0objectSuperT> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Predicate<Arg0objectSuperT>, Java.Util.Function.Predicate<T>> OnOr<Arg0objectSuperT> { get; set; } = null;
 
         void Or<Arg0objectSuperT>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Predicate<Arg0objectSuperT>>> data)
         {
@@ -515,13 +463,13 @@ void Or<Arg0objectSuperT>EventHandler(object sender, CLRListenerEventArgs<CLREve
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="Or<Arg0objectSuperT>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.Predicate<T> Or<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public virtual Java.Util.Function.Predicate<T> Or<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return Or<Arg0objectSuperT>Default(arg0);
         }
@@ -557,7 +505,7 @@ public partial class PredicateDirect<T> : Java.Util.Function.IPredicate<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#test(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#test(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -566,17 +514,17 @@ public override bool Test(T arg0)
             return IExecuteWithSignature<bool>("test", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#and(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
-        public override Java.Util.Function.Predicate<T> And<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public override Java.Util.Function.Predicate<T> And<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Function.PredicateDirect<T>, Java.Util.Function.Predicate<T>>("and", "(Ljava/util/function/Predicate;)Ljava/util/function/Predicate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         public override Java.Util.Function.Predicate<T> Negate()
@@ -584,12 +532,12 @@ public override Java.Util.Function.Predicate<T> Negate()
             return IExecuteWithSignature<Java.Util.Function.PredicateDirect<T>, Java.Util.Function.Predicate<T>>("negate", "()Ljava/util/function/Predicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Predicate.html#or(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
-        public override Java.Util.Function.Predicate<T> Or<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public override Java.Util.Function.Predicate<T> Or<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Function.PredicateDirect<T>, Java.Util.Function.Predicate<T>>("or", "(Ljava/util/function/Predicate;)Ljava/util/function/Predicate;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/Supplier.cs b/src/net/Netdroid/Generated/Java/Util/Function/Supplier.cs
index 8266c7c3b..dac840c4d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/Supplier.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/Supplier.cs
@@ -50,15 +50,15 @@ public partial class Supplier
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("get", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetEventHandler));
+            AddEventHandler("get", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html#get()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Supplier.html#get()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGet"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object> OnGet { get; set; } = null;
+        public global::System.Func<object> OnGet { get; set; } = null;
 
         void GetEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -68,7 +68,7 @@ void GetEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Supplier.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public virtual object Get()
@@ -107,7 +107,7 @@ public partial class SupplierDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Supplier.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public override object Get()
@@ -127,7 +127,7 @@ public override object Get()
 
     #region ISupplier<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.Supplier implementing <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.Supplier implementing <see href="https://developer.android.com/reference/java/util/function/Supplier.html"/>
     /// </summary>
     public partial interface ISupplier<T>
     {
@@ -168,15 +168,15 @@ public partial class Supplier<T> : Java.Util.Function.ISupplier<T>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("get", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetEventHandler));
+            AddEventHandler("get", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html#get()"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Supplier.html#get()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGet"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T> OnGet { get; set; } = null;
+        public global::System.Func<T> OnGet { get; set; } = null;
 
         void GetEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -186,7 +186,7 @@ void GetEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Supplier.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public virtual T Get()
@@ -225,7 +225,7 @@ public partial class SupplierDirect<T> : Java.Util.Function.ISupplier<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Supplier.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Supplier.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public override T Get()
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ToDoubleBiFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/ToDoubleBiFunction.cs
index 244907435..fc46cd021 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ToDoubleBiFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ToDoubleBiFunction.cs
@@ -50,15 +50,15 @@ public partial class ToDoubleBiFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsDoubleEventHandler));
+            AddEventHandler("applyAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsDoubleEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, object, double> OnApplyAsDouble { get; set; } = null;
+        public global::System.Func<object, object, double> OnApplyAsDouble { get; set; } = null;
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -68,7 +68,7 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -109,7 +109,7 @@ public partial class ToDoubleBiFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -131,7 +131,7 @@ public override double ApplyAsDouble(object arg0, object arg1)
 
     #region IToDoubleBiFunction<T, U>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToDoubleBiFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToDoubleBiFunction implementing <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html"/>
     /// </summary>
     public partial interface IToDoubleBiFunction<T, U>
     {
@@ -172,15 +172,15 @@ public partial class ToDoubleBiFunction<T, U> : Java.Util.Function.IToDoubleBiFu
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsDoubleEventHandler));
+            AddEventHandler("applyAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsDoubleEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, U, double> OnApplyAsDouble { get; set; } = null;
+        public global::System.Func<T, U, double> OnApplyAsDouble { get; set; } = null;
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -190,7 +190,7 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -231,7 +231,7 @@ public partial class ToDoubleBiFunctionDirect<T, U> : Java.Util.Function.IToDoub
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleBiFunction.html#applyAsDouble(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ToDoubleFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/ToDoubleFunction.cs
index f93d50694..13cc0f95e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ToDoubleFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ToDoubleFunction.cs
@@ -50,15 +50,15 @@ public partial class ToDoubleFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsDoubleEventHandler));
+            AddEventHandler("applyAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsDoubleEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, double> OnApplyAsDouble { get; set; } = null;
+        public global::System.Func<object, double> OnApplyAsDouble { get; set; } = null;
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -68,7 +68,7 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="double"/></returns>
@@ -108,7 +108,7 @@ public partial class ToDoubleFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="double"/></returns>
@@ -129,7 +129,7 @@ public override double ApplyAsDouble(object arg0)
 
     #region IToDoubleFunction<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToDoubleFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToDoubleFunction implementing <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html"/>
     /// </summary>
     public partial interface IToDoubleFunction<T>
     {
@@ -170,15 +170,15 @@ public partial class ToDoubleFunction<T> : Java.Util.Function.IToDoubleFunction<
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsDouble", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsDoubleEventHandler));
+            AddEventHandler("applyAsDouble", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsDoubleEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsDouble"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, double> OnApplyAsDouble { get; set; } = null;
+        public global::System.Func<T, double> OnApplyAsDouble { get; set; } = null;
 
         void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -188,7 +188,7 @@ void ApplyAsDoubleEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="double"/></returns>
@@ -228,7 +228,7 @@ public partial class ToDoubleFunctionDirect<T> : Java.Util.Function.IToDoubleFun
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToDoubleFunction.html#applyAsDouble(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="double"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ToIntBiFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/ToIntBiFunction.cs
index 3f53806b4..15752bc11 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ToIntBiFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ToIntBiFunction.cs
@@ -50,15 +50,15 @@ public partial class ToIntBiFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsIntEventHandler));
+            AddEventHandler("applyAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsIntEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, object, int> OnApplyAsInt { get; set; } = null;
+        public global::System.Func<object, object, int> OnApplyAsInt { get; set; } = null;
 
         void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -68,7 +68,7 @@ void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<obj
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -109,7 +109,7 @@ public partial class ToIntBiFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -131,7 +131,7 @@ public override int ApplyAsInt(object arg0, object arg1)
 
     #region IToIntBiFunction<T, U>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToIntBiFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToIntBiFunction implementing <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html"/>
     /// </summary>
     public partial interface IToIntBiFunction<T, U>
     {
@@ -172,15 +172,15 @@ public partial class ToIntBiFunction<T, U> : Java.Util.Function.IToIntBiFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsIntEventHandler));
+            AddEventHandler("applyAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsIntEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, U, int> OnApplyAsInt { get; set; } = null;
+        public global::System.Func<T, U, int> OnApplyAsInt { get; set; } = null;
 
         void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -190,7 +190,7 @@ void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -231,7 +231,7 @@ public partial class ToIntBiFunctionDirect<T, U> : Java.Util.Function.IToIntBiFu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToIntBiFunction.html#applyAsInt(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ToIntFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/ToIntFunction.cs
index d5b4959a8..ef9fe3a7a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ToIntFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ToIntFunction.cs
@@ -50,15 +50,15 @@ public partial class ToIntFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsIntEventHandler));
+            AddEventHandler("applyAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsIntEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, int> OnApplyAsInt { get; set; } = null;
+        public global::System.Func<object, int> OnApplyAsInt { get; set; } = null;
 
         void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -68,7 +68,7 @@ void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<obj
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -108,7 +108,7 @@ public partial class ToIntFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -129,7 +129,7 @@ public override int ApplyAsInt(object arg0)
 
     #region IToIntFunction<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToIntFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToIntFunction implementing <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html"/>
     /// </summary>
     public partial interface IToIntFunction<T>
     {
@@ -170,15 +170,15 @@ public partial class ToIntFunction<T> : Java.Util.Function.IToIntFunction<T>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsInt", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsIntEventHandler));
+            AddEventHandler("applyAsInt", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsIntEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsInt"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, int> OnApplyAsInt { get; set; } = null;
+        public global::System.Func<T, int> OnApplyAsInt { get; set; } = null;
 
         void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -188,7 +188,7 @@ void ApplyAsIntEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
@@ -228,7 +228,7 @@ public partial class ToIntFunctionDirect<T> : Java.Util.Function.IToIntFunction<
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToIntFunction.html#applyAsInt(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ToLongBiFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/ToLongBiFunction.cs
index c39885422..d37555499 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ToLongBiFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ToLongBiFunction.cs
@@ -50,15 +50,15 @@ public partial class ToLongBiFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsLongEventHandler));
+            AddEventHandler("applyAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsLongEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, object, long> OnApplyAsLong { get; set; } = null;
+        public global::System.Func<object, object, long> OnApplyAsLong { get; set; } = null;
 
         void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -68,7 +68,7 @@ void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<ob
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -109,7 +109,7 @@ public partial class ToLongBiFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -131,7 +131,7 @@ public override long ApplyAsLong(object arg0, object arg1)
 
     #region IToLongBiFunction<T, U>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToLongBiFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToLongBiFunction implementing <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html"/>
     /// </summary>
     public partial interface IToLongBiFunction<T, U>
     {
@@ -172,15 +172,15 @@ public partial class ToLongBiFunction<T, U> : Java.Util.Function.IToLongBiFuncti
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsLongEventHandler));
+            AddEventHandler("applyAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsLongEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, U, long> OnApplyAsLong { get; set; } = null;
+        public global::System.Func<T, U, long> OnApplyAsLong { get; set; } = null;
 
         void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -190,7 +190,7 @@ void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
@@ -231,7 +231,7 @@ public partial class ToLongBiFunctionDirect<T, U> : Java.Util.Function.IToLongBi
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToLongBiFunction.html#applyAsLong(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="U"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/ToLongFunction.cs b/src/net/Netdroid/Generated/Java/Util/Function/ToLongFunction.cs
index ebdf735c5..ef806e342 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/ToLongFunction.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/ToLongFunction.cs
@@ -50,15 +50,15 @@ public partial class ToLongFunction
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsLongEventHandler));
+            AddEventHandler("applyAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyAsLongEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, long> OnApplyAsLong { get; set; } = null;
+        public global::System.Func<object, long> OnApplyAsLong { get; set; } = null;
 
         void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -68,7 +68,7 @@ void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<ob
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="long"/></returns>
@@ -108,7 +108,7 @@ public partial class ToLongFunctionDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="long"/></returns>
@@ -129,7 +129,7 @@ public override long ApplyAsLong(object arg0)
 
     #region IToLongFunction<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToLongFunction implementing <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.ToLongFunction implementing <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html"/>
     /// </summary>
     public partial interface IToLongFunction<T>
     {
@@ -170,15 +170,15 @@ public partial class ToLongFunction<T> : Java.Util.Function.IToLongFunction<T>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("applyAsLong", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsLongEventHandler));
+            AddEventHandler("applyAsLong", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(ApplyAsLongEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApplyAsLong"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, long> OnApplyAsLong { get; set; } = null;
+        public global::System.Func<T, long> OnApplyAsLong { get; set; } = null;
 
         void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -188,7 +188,7 @@ void ApplyAsLongEventHandler(object sender, CLRListenerEventArgs<CLREventData<T>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="long"/></returns>
@@ -228,7 +228,7 @@ public partial class ToLongFunctionDirect<T> : Java.Util.Function.IToLongFunctio
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/ToLongFunction.html#applyAsLong(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="long"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Function/UnaryOperator.cs b/src/net/Netdroid/Generated/Java/Util/Function/UnaryOperator.cs
index 55ffa9bb3..f41068caa 100644
--- a/src/net/Netdroid/Generated/Java/Util/Function/UnaryOperator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Function/UnaryOperator.cs
@@ -50,17 +50,17 @@ public partial class UnaryOperator
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyEventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(AndThenEventHandler));
-            AddEventHandler("compose", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(ComposeEventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<object>>>(ApplyEventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(AndThenEventHandler));
+            AddEventHandler("compose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>>>(ComposeEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<object, object> OnApply { get; set; } = null;
+        public global::System.Func<object, object> OnApply { get; set; } = null;
 
         void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>> data)
         {
@@ -70,7 +70,7 @@ void ApplyEventHandler(object sender, CLRListenerEventArgs<CLREventData<object>>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -79,7 +79,7 @@ public virtual object Apply(object arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -90,10 +90,10 @@ public Java.Util.Function.Function AndThenDefault(Java.Util.Function.Function ar
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function, Java.Util.Function.Function> OnAndThen { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function, Java.Util.Function.Function> OnAndThen { get; set; } = null;
 
         void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>> data)
         {
@@ -103,7 +103,7 @@ void AndThenEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -113,7 +113,7 @@ public virtual Java.Util.Function.Function AndThen(Java.Util.Function.Function a
             return AndThenDefault(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -124,10 +124,10 @@ public Java.Util.Function.Function ComposeDefault(Java.Util.Function.Function ar
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCompose"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function, Java.Util.Function.Function> OnCompose { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function, Java.Util.Function.Function> OnCompose { get; set; } = null;
 
         void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function>> data)
         {
@@ -137,7 +137,7 @@ void ComposeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.U
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -178,7 +178,7 @@ public partial class UnaryOperatorDirect
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -187,7 +187,7 @@ public override object Apply(object arg0)
             return IExecute("apply", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -196,7 +196,7 @@ public override Java.Util.Function.Function AndThen(Java.Util.Function.Function
             return IExecute<Java.Util.Function.FunctionDirect, Java.Util.Function.Function>("andThen", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
@@ -217,7 +217,7 @@ public override Java.Util.Function.Function Compose(Java.Util.Function.Function
 
     #region IUnaryOperator<T>
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.function.UnaryOperator implementing <see href="https://developer.android.com/reference/java.base/java/util/function/UnaryOperator.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.function.UnaryOperator implementing <see href="https://developer.android.com/reference/java/util/function/UnaryOperator.html"/>
     /// </summary>
     public partial interface IUnaryOperator<T>
     {
@@ -258,17 +258,17 @@ public partial class UnaryOperator<T> : Java.Util.Function.IUnaryOperator<T>
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("apply", new System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(Apply<R>EventHandler));
-            AddEventHandler("andThen", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>>>(AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler));
-            AddEventHandler("compose", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>>>>(Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>EventHandler));
+            AddEventHandler("apply", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<T>>>(Apply<R>EventHandler));
+            AddEventHandler("andThen", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>>>(AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler));
+            AddEventHandler("compose", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>>>>(Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>EventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnApply<R>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<T, R> OnApply<R> { get; set; } = null;
+        public global::System.Func<T, R> OnApply<R> { get; set; } = null;
 
         void Apply<R>EventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> data)
         {
@@ -278,7 +278,7 @@ void Apply<R>EventHandler(object sender, CLRListenerEventArgs<CLREventData<T>> d
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="R"></typeparam>
@@ -288,7 +288,7 @@ public virtual R Apply<R>(T arg0)
             return default;
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -297,16 +297,16 @@ public virtual R Apply<R>(T arg0)
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>Default(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>Default(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return IExecute<Java.Util.Function.Function<T, V>>("andThenDefault", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnAndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>, Java.Util.Function.Function<T, V>> OnAndThen<V, Arg0objectSuperR, R, Arg0ExtendsV> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>, Java.Util.Function.Function<T, V>> OnAndThen<V, Arg0objectSuperR, R, Arg0ExtendsV> { get; set; } = null;
 
         void AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV>>> data)
         {
@@ -316,7 +316,7 @@ void AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler(object sender, CL
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -325,12 +325,12 @@ void AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>EventHandler(object sender, CL
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public virtual Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>Default(arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -339,16 +339,16 @@ public virtual Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, R,
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public Java.Util.Function.Function<V, R> Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>Default(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV: V where Arg0ExtendsT: T
+        public Java.Util.Function.Function<V, R> Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>Default(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV : V where Arg0ExtendsT : T
         {
             return IExecute<Java.Util.Function.Function<V, R>>("composeDefault", arg0);
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCompose<V, R, Arg0objectSuperV, Arg0ExtendsT>"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>, Java.Util.Function.Function<V, R>> OnCompose<V, R, Arg0objectSuperV, Arg0ExtendsT> { get; set; } = null;
+        public global::System.Func<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>, Java.Util.Function.Function<V, R>> OnCompose<V, R, Arg0objectSuperV, Arg0ExtendsT> { get; set; } = null;
 
         void Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>EventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT>>> data)
         {
@@ -358,7 +358,7 @@ void Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>EventHandler(object sender, CL
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -367,7 +367,7 @@ void Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>EventHandler(object sender, CL
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>Default"/>; override the method to implement a different behavior</remarks>
-        public virtual Java.Util.Function.Function<V, R> Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV: V where Arg0ExtendsT: T
+        public virtual Java.Util.Function.Function<V, R> Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV : V where Arg0ExtendsT : T
         {
             return Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>Default(arg0);
         }
@@ -403,7 +403,7 @@ public partial class UnaryOperatorDirect<T> : Java.Util.Function.IUnaryOperator<
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#apply(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#apply(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="R"></typeparam>
@@ -413,7 +413,7 @@ public override R Apply<R>(T arg0)
             return IExecute<R>("apply", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#andThen(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#andThen(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -421,12 +421,12 @@ public override R Apply<R>(T arg0)
         /// <typeparam name="R"></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
-        public override Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR: R where Arg0ExtendsV: V
+        public override Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, R, Arg0ExtendsV>(Java.Util.Function.Function<Arg0objectSuperR, Arg0ExtendsV> arg0) where Arg0objectSuperR : R where Arg0ExtendsV : V
         {
             return IExecute<Java.Util.Function.FunctionDirect<T, V>, Java.Util.Function.Function<T, V>>("andThen", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/function/Function.html#compose(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/function/Function.html#compose(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="V"></typeparam>
@@ -434,7 +434,7 @@ public override Java.Util.Function.Function<T, V> AndThen<V, Arg0objectSuperR, R
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
-        public override Java.Util.Function.Function<V, R> Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV: V where Arg0ExtendsT: T
+        public override Java.Util.Function.Function<V, R> Compose<V, R, Arg0objectSuperV, Arg0ExtendsT>(Java.Util.Function.Function<Arg0objectSuperV, Arg0ExtendsT> arg0) where Arg0objectSuperV : V where Arg0ExtendsT : T
         {
             return IExecute<Java.Util.Function.FunctionDirect<V, R>, Java.Util.Function.Function<V, R>>("compose", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/GregorianCalendar.cs b/src/net/Netdroid/Generated/Java/Util/GregorianCalendar.cs
index 2d6466ce6..7cd1d91af 100644
--- a/src/net/Netdroid/Generated/Java/Util/GregorianCalendar.cs
+++ b/src/net/Netdroid/Generated/Java/Util/GregorianCalendar.cs
@@ -30,7 +30,7 @@ public partial class GregorianCalendar
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#%3Cinit%3E(int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#%3Cinit%3E(int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -43,7 +43,7 @@ public GregorianCalendar(int arg0, int arg1, int arg2, int arg3, int arg4, int a
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#%3Cinit%3E(int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#%3Cinit%3E(int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -55,7 +55,7 @@ public GregorianCalendar(int arg0, int arg1, int arg2, int arg3, int arg4)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#%3Cinit%3E(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#%3Cinit%3E(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -65,7 +65,7 @@ public GregorianCalendar(int arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#%3Cinit%3E(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#%3Cinit%3E(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         public GregorianCalendar(Java.Util.Locale arg0)
@@ -73,7 +73,7 @@ public GregorianCalendar(Java.Util.Locale arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#%3Cinit%3E(java.util.TimeZone,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#%3Cinit%3E(java.util.TimeZone,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -82,7 +82,7 @@ public GregorianCalendar(Java.Util.TimeZone arg0, Java.Util.Locale arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#%3Cinit%3E(java.util.TimeZone)"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#%3Cinit%3E(java.util.TimeZone)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
         public GregorianCalendar(Java.Util.TimeZone arg0)
@@ -98,13 +98,13 @@ public GregorianCalendar(Java.Util.TimeZone arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#AD"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#AD"/>
         /// </summary>
         public static int AD { get { if (!_ADReady) { _ADContent = SGetField<int>(LocalBridgeClazz, "AD"); _ADReady = true; } return _ADContent; } }
         private static int _ADContent = default;
         private static bool _ADReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#BC"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#BC"/>
         /// </summary>
         public static int BC { get { if (!_BCReady) { _BCContent = SGetField<int>(LocalBridgeClazz, "BC"); _BCReady = true; } return _BCContent; } }
         private static int _BCContent = default;
@@ -114,7 +114,7 @@ public GregorianCalendar(Java.Util.TimeZone arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#from(java.time.ZonedDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#from(java.time.ZonedDateTime)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZonedDateTime"/></param>
         /// <returns><see cref="Java.Util.GregorianCalendar"/></returns>
@@ -127,14 +127,7 @@ public static Java.Util.GregorianCalendar From(Java.Time.ZonedDateTime arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#getGregorianChange()"/> <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#setGregorianChange(java.util.Date)"/>
-        /// </summary>
-        public Java.Util.Date GregorianChange
-        {
-            get { return IExecuteWithSignature<Java.Util.Date>("getGregorianChange", "()Ljava/util/Date;"); } set { IExecuteWithSignature("setGregorianChange", "(Ljava/util/Date;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#isLeapYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#isLeapYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -143,13 +136,29 @@ public bool IsLeapYear(int arg0)
             return IExecuteWithSignature<bool>("isLeapYear", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/GregorianCalendar.html#toZonedDateTime()"/>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#getGregorianChange()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetGregorianChange()
+        {
+            return IExecuteWithSignature<Java.Util.Date>("getGregorianChange", "()Ljava/util/Date;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#toZonedDateTime()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.ZonedDateTime"/></returns>
         public Java.Time.ZonedDateTime ToZonedDateTime()
         {
             return IExecuteWithSignature<Java.Time.ZonedDateTime>("toZonedDateTime", "()Ljava/time/ZonedDateTime;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/GregorianCalendar.html#setGregorianChange(java.util.Date)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Date"/></param>
+        public void SetGregorianChange(Java.Util.Date arg0)
+        {
+            IExecuteWithSignature("setGregorianChange", "(Ljava/util/Date;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Util/HashMap.cs b/src/net/Netdroid/Generated/Java/Util/HashMap.cs
index 0bfc6c09d..11ccaf723 100644
--- a/src/net/Netdroid/Generated/Java/Util/HashMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/HashMap.cs
@@ -30,7 +30,7 @@ public partial class HashMap
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashMap.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashMap.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -39,7 +39,7 @@ public HashMap(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public HashMap(int arg0)
@@ -47,7 +47,7 @@ public HashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public HashMap(Java.Util.Map arg0)
@@ -94,7 +94,7 @@ public partial class HashMap<K, V> : Java.Util.IMap<K, V>, Java.Lang.ICloneable,
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashMap.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashMap.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -103,7 +103,7 @@ public HashMap(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public HashMap(int arg0)
@@ -111,7 +111,7 @@ public HashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public HashMap(Java.Util.Map<K, V> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/HashSet.cs b/src/net/Netdroid/Generated/Java/Util/HashSet.cs
index 524d40484..84e6c9365 100644
--- a/src/net/Netdroid/Generated/Java/Util/HashSet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/HashSet.cs
@@ -30,7 +30,7 @@ public partial class HashSet
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashSet.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashSet.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -39,7 +39,7 @@ public HashSet(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashSet.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashSet.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public HashSet(int arg0)
@@ -47,7 +47,7 @@ public HashSet(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashSet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashSet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public HashSet(Java.Util.Collection arg0)
@@ -94,7 +94,7 @@ public partial class HashSet<E> : Java.Util.ISet<E>, Java.Lang.ICloneable, Java.
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashSet.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashSet.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -103,7 +103,7 @@ public HashSet(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashSet.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashSet.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public HashSet(int arg0)
@@ -111,7 +111,7 @@ public HashSet(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HashSet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/HashSet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public HashSet(Java.Util.Collection<E> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Hashtable.cs b/src/net/Netdroid/Generated/Java/Util/Hashtable.cs
index 9127375c9..af405ae44 100644
--- a/src/net/Netdroid/Generated/Java/Util/Hashtable.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Hashtable.cs
@@ -30,7 +30,7 @@ public partial class Hashtable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -39,7 +39,7 @@ public Hashtable(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Hashtable(int arg0)
@@ -47,7 +47,7 @@ public Hashtable(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public Hashtable(Java.Util.Map arg0)
@@ -83,7 +83,7 @@ public Hashtable(Java.Util.Map arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#containsValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#containsValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -92,7 +92,7 @@ public bool ContainsValue(object arg0)
             return IExecuteWithSignature<bool>("containsValue", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection Values()
@@ -100,7 +100,7 @@ public Java.Util.Collection Values()
             return IExecuteWithSignature<Java.Util.Collection>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set EntrySet()
@@ -108,7 +108,7 @@ public Java.Util.Set EntrySet()
             return IExecuteWithSignature<Java.Util.Set>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set KeySet()
@@ -116,7 +116,7 @@ public Java.Util.Set KeySet()
             return IExecuteWithSignature<Java.Util.Set>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -125,7 +125,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#containsKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#containsKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -134,7 +134,7 @@ public bool ContainsKey(object arg0)
             return IExecuteWithSignature<bool>("containsKey", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#remove(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#remove(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -144,7 +144,7 @@ public bool Remove(object arg0, object arg1)
             return IExecute<bool>("remove", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -155,7 +155,7 @@ public bool Replace(object arg0, object arg1, object arg2)
             return IExecute<bool>("replace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -165,7 +165,7 @@ public object Compute(object arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("compute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -175,7 +175,7 @@ public object ComputeIfAbsent(object arg0, Java.Util.Function.Function arg1)
             return IExecute("computeIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -185,7 +185,7 @@ public object ComputeIfPresent(object arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("computeIfPresent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -195,7 +195,7 @@ public object GetOrDefault(object arg0, object arg1)
             return IExecute("getOrDefault", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -206,7 +206,7 @@ public object Merge(object arg0, object arg1, Java.Util.Function.BiFunction arg2
             return IExecute("merge", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -216,7 +216,7 @@ public object PutIfAbsent(object arg0, object arg1)
             return IExecute("putIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#replace(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#replace(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -226,14 +226,14 @@ public object Replace(object arg0, object arg1)
             return IExecute("replace", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#forEach(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#forEach(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         public void ForEach(Java.Util.Function.BiConsumer arg0)
@@ -241,7 +241,7 @@ public void ForEach(Java.Util.Function.BiConsumer arg0)
             IExecuteWithSignature("forEach", "(Ljava/util/function/BiConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#putAll(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#putAll(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public void PutAll(Java.Util.Map arg0)
@@ -249,7 +249,7 @@ public void PutAll(Java.Util.Map arg0)
             IExecuteWithSignature("putAll", "(Ljava/util/Map;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#replaceAll(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#replaceAll(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         public void ReplaceAll(Java.Util.Function.BiFunction arg0)
@@ -272,7 +272,7 @@ public partial class Hashtable<K, V> : Java.Util.IMap<K, V>, Java.Lang.ICloneabl
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -281,7 +281,7 @@ public Hashtable(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Hashtable(int arg0)
@@ -289,7 +289,7 @@ public Hashtable(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public Hashtable(Java.Util.Map<K, V> arg0)
@@ -329,7 +329,7 @@ public Hashtable(Java.Util.Map<K, V> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#containsValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#containsValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -338,7 +338,7 @@ public bool ContainsValue(object arg0)
             return IExecuteWithSignature<bool>("containsValue", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection<V> Values()
@@ -346,7 +346,7 @@ public Java.Util.Collection<V> Values()
             return IExecuteWithSignature<Java.Util.Collection<V>>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Util.Map.Entry<K, V>> EntrySet()
@@ -354,7 +354,7 @@ public Java.Util.Collection<V> Values()
             return IExecuteWithSignature<Java.Util.Set<Java.Util.Map.Entry<K, V>>>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<K> KeySet()
@@ -362,7 +362,7 @@ public Java.Util.Set<K> KeySet()
             return IExecuteWithSignature<Java.Util.Set<K>>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -371,7 +371,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#containsKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#containsKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -380,7 +380,7 @@ public bool ContainsKey(object arg0)
             return IExecuteWithSignature<bool>("containsKey", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#remove(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#remove(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -390,7 +390,7 @@ public bool Remove(object arg0, object arg1)
             return IExecute<bool>("remove", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -401,7 +401,7 @@ public bool Replace(K arg0, V arg1, V arg2)
             return IExecute<bool>("replace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -409,24 +409,24 @@ public bool Replace(K arg0, V arg1, V arg2)
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V Compute<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsV: V
+        public V Compute<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsV : V
         {
             return IExecute<V>("compute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1ExtendsV: V
+        public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1ExtendsV : V
         {
             return IExecute<V>("computeIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -434,12 +434,12 @@ public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Funct
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V ComputeIfPresent<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsV: V
+        public V ComputeIfPresent<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsV : V
         {
             return IExecute<V>("computeIfPresent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -449,7 +449,7 @@ public V GetOrDefault(object arg0, V arg1)
             return IExecute<V>("getOrDefault", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -457,12 +457,12 @@ public V GetOrDefault(object arg0, V arg1)
         /// <typeparam name="Arg2objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg2ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V Merge<Arg2objectSuperV, Arg2ExtendsV>(K arg0, V arg1, Java.Util.Function.BiFunction<Arg2objectSuperV, Arg2objectSuperV, Arg2ExtendsV> arg2) where Arg2objectSuperV: V where Arg2ExtendsV: V
+        public V Merge<Arg2objectSuperV, Arg2ExtendsV>(K arg0, V arg1, Java.Util.Function.BiFunction<Arg2objectSuperV, Arg2objectSuperV, Arg2ExtendsV> arg2) where Arg2objectSuperV : V where Arg2ExtendsV : V
         {
             return IExecute<V>("merge", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -472,7 +472,7 @@ public V PutIfAbsent(K arg0, V arg1)
             return IExecute<V>("putIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#replace(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#replace(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -482,40 +482,40 @@ public V Replace(K arg0, V arg1)
             return IExecute<V>("replace", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#forEach(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#forEach(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
-        public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiConsumer<Arg0objectSuperK, Arg0objectSuperV> arg0) where Arg0objectSuperK: K where Arg0objectSuperV: V
+        public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiConsumer<Arg0objectSuperK, Arg0objectSuperV> arg0) where Arg0objectSuperK : K where Arg0objectSuperV : V
         {
             IExecuteWithSignature("forEach", "(Ljava/util/function/BiConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#putAll(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#putAll(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
+        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK : K where Arg0ExtendsV : V
         {
             IExecuteWithSignature("putAll", "(Ljava/util/Map;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Hashtable.html#replaceAll(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Hashtable.html#replaceAll(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <typeparam name="Arg0objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void ReplaceAll<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV>(Java.Util.Function.BiFunction<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV> arg0) where Arg0objectSuperK: K where Arg0objectSuperV: V where Arg0ExtendsV: V
+        public void ReplaceAll<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV>(Java.Util.Function.BiFunction<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV> arg0) where Arg0objectSuperK : K where Arg0objectSuperV : V where Arg0ExtendsV : V
         {
             IExecuteWithSignature("replaceAll", "(Ljava/util/function/BiFunction;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/HexFormat.cs b/src/net/Netdroid/Generated/Java/Util/HexFormat.cs
deleted file mode 100644
index f86eb587a..000000000
--- a/src/net/Netdroid/Generated/Java/Util/HexFormat.cs
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
-*  Copyright 2024 MASES s.r.l.
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*  Refer to LICENSE for more information.
-*/
-
-/*
-*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
-*  using android.jar as reference
-*/
-
-using MASES.JCOBridge.C2JBridge;
-
-namespace Java.Util
-{
-    #region HexFormat
-    public partial class HexFormat
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#isHexDigit(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public static bool IsHexDigit(int arg0)
-        {
-            return SExecuteWithSignature<bool>(LocalBridgeClazz, "isHexDigit", "(I)Z", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#fromHexDigit(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int FromHexDigit(int arg0)
-        {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "fromHexDigit", "(I)I", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#fromHexDigits(java.lang.CharSequence,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int FromHexDigits(Java.Lang.CharSequence arg0, int arg1, int arg2)
-        {
-            return SExecute<int>(LocalBridgeClazz, "fromHexDigits", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#fromHexDigits(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="int"/></returns>
-        public static int FromHexDigits(Java.Lang.CharSequence arg0)
-        {
-            return SExecuteWithSignature<int>(LocalBridgeClazz, "fromHexDigits", "(Ljava/lang/CharSequence;)I", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#of()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.HexFormat"/></returns>
-        public static Java.Util.HexFormat Of()
-        {
-            return SExecuteWithSignature<Java.Util.HexFormat>(LocalBridgeClazz, "of", "()Ljava/util/HexFormat;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#ofDelimiter(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Util.HexFormat"/></returns>
-        public static Java.Util.HexFormat OfDelimiter(Java.Lang.String arg0)
-        {
-            return SExecuteWithSignature<Java.Util.HexFormat>(LocalBridgeClazz, "ofDelimiter", "(Ljava/lang/String;)Ljava/util/HexFormat;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#fromHexDigitsToLong(java.lang.CharSequence,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long FromHexDigitsToLong(Java.Lang.CharSequence arg0, int arg1, int arg2)
-        {
-            return SExecute<long>(LocalBridgeClazz, "fromHexDigitsToLong", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#fromHexDigitsToLong(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long FromHexDigitsToLong(Java.Lang.CharSequence arg0)
-        {
-            return SExecuteWithSignature<long>(LocalBridgeClazz, "fromHexDigitsToLong", "(Ljava/lang/CharSequence;)J", arg0);
-        }
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#formatHex(java.lang.Appendable,byte[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="A"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
-        /// <returns><typeparamref name="A"/></returns>
-        public A FormatHex<A>(A arg0, byte[] arg1, int arg2, int arg3) where A: Java.Lang.IAppendable, new()
-        {
-            return IExecute<A>("formatHex", arg0, arg1, arg2, arg3);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#formatHex(java.lang.Appendable,byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="A"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
-        /// <returns><typeparamref name="A"/></returns>
-        public A FormatHex<A>(A arg0, byte[] arg1) where A: Java.Lang.IAppendable, new()
-        {
-            return IExecute<A>("formatHex", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toHexDigits(java.lang.Appendable,byte)"/>
-        /// </summary>
-        /// <param name="arg0"><typeparamref name="A"/></param>
-        /// <param name="arg1"><see cref="byte"/></param>
-        /// <typeparam name="A"><see cref="Java.Lang.IAppendable"/></typeparam>
-        /// <returns><typeparamref name="A"/></returns>
-        public A ToHexDigits<A>(A arg0, byte arg1) where A: Java.Lang.IAppendable, new()
-        {
-            return IExecute<A>("toHexDigits", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#isUpperCase()"/>
-        /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsUpperCase()
-        {
-            return IExecuteWithSignature<bool>("isUpperCase", "()Z");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#parseHex(char[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="char"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] ParseHex(char[] arg0, int arg1, int arg2)
-        {
-            return IExecuteArray<byte>("parseHex", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#parseHex(java.lang.CharSequence,int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] ParseHex(Java.Lang.CharSequence arg0, int arg1, int arg2)
-        {
-            return IExecuteArray<byte>("parseHex", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#parseHex(java.lang.CharSequence)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
-        /// <returns><see cref="byte"/></returns>
-        public byte[] ParseHex(Java.Lang.CharSequence arg0)
-        {
-            return IExecuteWithSignatureArray<byte>("parseHex", "(Ljava/lang/CharSequence;)[B", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toHighHexDigit(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="char"/></returns>
-        public char ToHighHexDigit(int arg0)
-        {
-            return IExecuteWithSignature<char>("toHighHexDigit", "(I)C", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toLowHexDigit(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="char"/></returns>
-        public char ToLowHexDigit(int arg0)
-        {
-            return IExecuteWithSignature<char>("toLowHexDigit", "(I)C", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#delimiter()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Delimiter()
-        {
-            return IExecuteWithSignature<Java.Lang.String>("delimiter", "()Ljava/lang/String;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#formatHex(byte[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String FormatHex(byte[] arg0, int arg1, int arg2)
-        {
-            return IExecute<Java.Lang.String>("formatHex", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#formatHex(byte[])"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String FormatHex(byte[] arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.String>("formatHex", "([B)Ljava/lang/String;", new object[] { arg0 });
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#prefix()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Prefix()
-        {
-            return IExecuteWithSignature<Java.Lang.String>("prefix", "()Ljava/lang/String;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#suffix()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String Suffix()
-        {
-            return IExecuteWithSignature<Java.Lang.String>("suffix", "()Ljava/lang/String;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toHexDigits(byte)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToHexDigits(byte arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.String>("toHexDigits", "(B)Ljava/lang/String;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toHexDigits(char)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="char"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToHexDigits(char arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.String>("toHexDigits", "(C)Ljava/lang/String;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toHexDigits(int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToHexDigits(int arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.String>("toHexDigits", "(I)Ljava/lang/String;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toHexDigits(long,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToHexDigits(long arg0, int arg1)
-        {
-            return IExecute<Java.Lang.String>("toHexDigits", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toHexDigits(long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToHexDigits(long arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.String>("toHexDigits", "(J)Ljava/lang/String;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#toHexDigits(short)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="short"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToHexDigits(short arg0)
-        {
-            return IExecuteWithSignature<Java.Lang.String>("toHexDigits", "(S)Ljava/lang/String;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#withDelimiter(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Util.HexFormat"/></returns>
-        public Java.Util.HexFormat WithDelimiter(Java.Lang.String arg0)
-        {
-            return IExecuteWithSignature<Java.Util.HexFormat>("withDelimiter", "(Ljava/lang/String;)Ljava/util/HexFormat;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#withLowerCase()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.HexFormat"/></returns>
-        public Java.Util.HexFormat WithLowerCase()
-        {
-            return IExecuteWithSignature<Java.Util.HexFormat>("withLowerCase", "()Ljava/util/HexFormat;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#withPrefix(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Util.HexFormat"/></returns>
-        public Java.Util.HexFormat WithPrefix(Java.Lang.String arg0)
-        {
-            return IExecuteWithSignature<Java.Util.HexFormat>("withPrefix", "(Ljava/lang/String;)Ljava/util/HexFormat;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#withSuffix(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Util.HexFormat"/></returns>
-        public Java.Util.HexFormat WithSuffix(Java.Lang.String arg0)
-        {
-            return IExecuteWithSignature<Java.Util.HexFormat>("withSuffix", "(Ljava/lang/String;)Ljava/util/HexFormat;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/HexFormat.html#withUpperCase()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.HexFormat"/></returns>
-        public Java.Util.HexFormat WithUpperCase()
-        {
-            return IExecuteWithSignature<Java.Util.HexFormat>("withUpperCase", "()Ljava/util/HexFormat;");
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Util/IdentityHashMap.cs b/src/net/Netdroid/Generated/Java/Util/IdentityHashMap.cs
index 53c78b598..250ad03d5 100644
--- a/src/net/Netdroid/Generated/Java/Util/IdentityHashMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/IdentityHashMap.cs
@@ -30,7 +30,7 @@ public partial class IdentityHashMap
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IdentityHashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/IdentityHashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public IdentityHashMap(int arg0)
@@ -38,7 +38,7 @@ public IdentityHashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IdentityHashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/IdentityHashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public IdentityHashMap(Java.Util.Map arg0)
@@ -85,7 +85,7 @@ public partial class IdentityHashMap<K, V> : Java.Util.IMap<K, V>, Java.Io.ISeri
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IdentityHashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/IdentityHashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public IdentityHashMap(int arg0)
@@ -93,7 +93,7 @@ public IdentityHashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IdentityHashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/IdentityHashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public IdentityHashMap(Java.Util.Map<K, V> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/IntSummaryStatistics.cs b/src/net/Netdroid/Generated/Java/Util/IntSummaryStatistics.cs
index 8579e789a..f67ccd197 100644
--- a/src/net/Netdroid/Generated/Java/Util/IntSummaryStatistics.cs
+++ b/src/net/Netdroid/Generated/Java/Util/IntSummaryStatistics.cs
@@ -30,7 +30,7 @@ public partial class IntSummaryStatistics
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html#%3Cinit%3E(long,int,int,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html#%3Cinit%3E(long,int,int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -62,42 +62,47 @@ public IntSummaryStatistics(long arg0, int arg1, int arg2, long arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html#getAverage()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html#getAverage()"/>
         /// </summary>
-        public double Average
+        /// <returns><see cref="double"/></returns>
+        public double GetAverage()
         {
-            get { return IExecuteWithSignature<double>("getAverage", "()D"); }
+            return IExecuteWithSignature<double>("getAverage", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html#getMax()"/>
         /// </summary>
-        public long Count
+        /// <returns><see cref="int"/></returns>
+        public int GetMax()
         {
-            get { return IExecuteWithSignature<long>("getCount", "()J"); }
+            return IExecuteWithSignature<int>("getMax", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html#getMax()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html#getMin()"/>
         /// </summary>
-        public int Max
+        /// <returns><see cref="int"/></returns>
+        public int GetMin()
         {
-            get { return IExecuteWithSignature<int>("getMax", "()I"); }
+            return IExecuteWithSignature<int>("getMin", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html#getMin()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html#getCount()"/>
         /// </summary>
-        public int Min
+        /// <returns><see cref="long"/></returns>
+        public long GetCount()
         {
-            get { return IExecuteWithSignature<int>("getMin", "()I"); }
+            return IExecuteWithSignature<long>("getCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html#getSum()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html#getSum()"/>
         /// </summary>
-        public long Sum
+        /// <returns><see cref="long"/></returns>
+        public long GetSum()
         {
-            get { return IExecuteWithSignature<long>("getSum", "()J"); }
+            return IExecuteWithSignature<long>("getSum", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html#accept(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html#accept(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Accept(int arg0)
@@ -105,7 +110,7 @@ public void Accept(int arg0)
             IExecuteWithSignature("accept", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/IntSummaryStatistics.html#combine(java.util.IntSummaryStatistics)"/>
+        /// <see href="https://developer.android.com/reference/java/util/IntSummaryStatistics.html#combine(java.util.IntSummaryStatistics)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.IntSummaryStatistics"/></param>
         public void Combine(Java.Util.IntSummaryStatistics arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Jar/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Jar/AllPackageClasses.cs
index e99c7217a..16fcc600c 100644
--- a/src/net/Netdroid/Generated/Java/Util/Jar/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Jar/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Jar
 {
     #region Attributes
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html"/>
     /// </summary>
     public partial class Attributes : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Attributes>
     {
@@ -68,7 +68,7 @@ public Attributes(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Name
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html"/>
         /// </summary>
         public partial class Name : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Name>
         {
@@ -116,7 +116,7 @@ public Name(params object[] args) : base(args) { }
 
     #region JarEntry
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarEntry.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/jar/JarEntry.html"/>
     /// </summary>
     public partial class JarEntry : Java.Util.Zip.ZipEntry
     {
@@ -160,7 +160,7 @@ public JarEntry(params object[] args) : base(args) { }
 
     #region JarException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/jar/JarException.html"/>
     /// </summary>
     public partial class JarException : Java.Util.Zip.ZipException
     {
@@ -177,7 +177,7 @@ public partial class JarException : Java.Util.Zip.ZipException
 
     #region JarFile
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html"/>
     /// </summary>
     public partial class JarFile : Java.Util.Zip.ZipFile
     {
@@ -221,7 +221,7 @@ public JarFile(params object[] args) : base(args) { }
 
     #region JarInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/jar/JarInputStream.html"/>
     /// </summary>
     public partial class JarInputStream : Java.Util.Zip.ZipInputStream
     {
@@ -265,7 +265,7 @@ public JarInputStream(params object[] args) : base(args) { }
 
     #region JarOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/jar/JarOutputStream.html"/>
     /// </summary>
     public partial class JarOutputStream : Java.Util.Zip.ZipOutputStream
     {
@@ -309,7 +309,7 @@ public JarOutputStream(params object[] args) : base(args) { }
 
     #region Manifest
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html"/>
     /// </summary>
     public partial class Manifest : Java.Lang.Cloneable
     {
@@ -351,6 +351,147 @@ public Manifest(params object[] args) : base(args) { }
     }
     #endregion
 
+    #region Pack200
+    /// <summary>
+    /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.html"/>
+    /// </summary>
+    [global::System.Obsolete()]
+    public partial class Pack200 : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Pack200>
+    {
+        const string _bridgeClassName = "java.util.jar.Pack200";
+        /// <summary>
+        /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+        /// </summary>
+        [global::System.Obsolete("Pack200 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Pack200() { }
+        /// <summary>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+        /// </summary>
+        [global::System.Obsolete("Pack200 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        public Pack200(params object[] args) : base(args) { }
+
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+        /// </summary>
+        public override string BridgeClassName => _bridgeClassName;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+        /// </summary>
+        public override bool IsBridgeAbstract => true;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+        /// </summary>
+        public override bool IsBridgeCloseable => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+        /// </summary>
+        public override bool IsBridgeInterface => false;
+        /// <summary>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+        /// </summary>
+        public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+        #region Packer
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html"/>
+        /// </summary>
+        [global::System.Obsolete()]
+        public partial class Packer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Packer>
+        {
+            const string _bridgeClassName = "java.util.jar.Pack200$Packer";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            [global::System.Obsolete("Packer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            public Packer() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            [global::System.Obsolete("Packer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            public Packer(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => true;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => true;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+        #region Unpacker
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html"/>
+        /// </summary>
+        [global::System.Obsolete()]
+        public partial class Unpacker : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Unpacker>
+        {
+            const string _bridgeClassName = "java.util.jar.Pack200$Unpacker";
+            /// <summary>
+            /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
+            /// </summary>
+            [global::System.Obsolete("Unpacker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            public Unpacker() { }
+            /// <summary>
+            /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
+            /// </summary>
+            [global::System.Obsolete("Unpacker class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+            public Unpacker(params object[] args) : base(args) { }
+
+            private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
+            /// </summary>
+            public override string BridgeClassName => _bridgeClassName;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
+            /// </summary>
+            public override bool IsBridgeAbstract => true;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeCloseable.htm"/>
+            /// </summary>
+            public override bool IsBridgeCloseable => false;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeInterface.htm"/>
+            /// </summary>
+            public override bool IsBridgeInterface => true;
+            /// <summary>
+            /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
+            /// </summary>
+            public override bool IsBridgeStatic => true;
+
+            // TODO: complete the class
+
+        }
+        #endregion
+
+    
+    }
+    #endregion
+
 
 
 }
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Util/Jar/Attributes.cs b/src/net/Netdroid/Generated/Java/Util/Jar/Attributes.cs
index 2923e9e18..754bdb4f2 100644
--- a/src/net/Netdroid/Generated/Java/Util/Jar/Attributes.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Jar/Attributes.cs
@@ -30,7 +30,7 @@ public partial class Attributes : Java.Util.IMap<object, object>, Java.Lang.IClo
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Attributes(int arg0)
@@ -38,7 +38,7 @@ public Attributes(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#%3Cinit%3E(java.util.jar.Attributes)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#%3Cinit%3E(java.util.jar.Attributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Jar.Attributes"/></param>
         public Attributes(Java.Util.Jar.Attributes arg0)
@@ -70,7 +70,7 @@ public Attributes(Java.Util.Jar.Attributes arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#containsKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#containsKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -79,7 +79,7 @@ public bool ContainsKey(object arg0)
             return IExecuteWithSignature<bool>("containsKey", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#containsValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#containsValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -88,7 +88,7 @@ public bool ContainsValue(object arg0)
             return IExecuteWithSignature<bool>("containsValue", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -96,7 +96,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -104,7 +104,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -113,7 +113,7 @@ public object Get(object arg0)
             return IExecuteWithSignature("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#put(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#put(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -123,7 +123,7 @@ public object Put(object arg0, object arg1)
             return IExecute("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -132,7 +132,7 @@ public object Remove(object arg0)
             return IExecuteWithSignature("remove", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#getValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#getValue(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -141,7 +141,7 @@ public Java.Lang.String GetValue(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#getValue(java.util.jar.Attributes.Name)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#getValue(java.util.jar.Attributes.Name)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Jar.Attributes.Name"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -150,7 +150,7 @@ public Java.Lang.String GetValue(Java.Util.Jar.Attributes.Name arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(Ljava/util/jar/Attributes$Name;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#putValue(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#putValue(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -160,7 +160,7 @@ public Java.Lang.String PutValue(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<Java.Lang.String>("putValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection<object> Values()
@@ -168,7 +168,7 @@ public Java.Util.Collection<object> Values()
             return IExecuteWithSignature<Java.Util.Collection<object>>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<object> KeySet()
@@ -176,7 +176,7 @@ public Java.Util.Set<object> KeySet()
             return IExecuteWithSignature<Java.Util.Set<object>>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Util.Map.Entry<object, object>> EntrySet()
@@ -184,14 +184,14 @@ public Java.Util.Set<object> KeySet()
             return IExecuteWithSignature<Java.Util.Set<Java.Util.Map.Entry<object, object>>>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.html#putAll(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.html#putAll(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public void PutAll(Java.Util.Map<object, object> arg0)
@@ -207,7 +207,7 @@ public partial class Name
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#%3Cinit%3E(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#%3Cinit%3E(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             public Name(Java.Lang.String arg0)
@@ -223,112 +223,112 @@ public Name(Java.Lang.String arg0)
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#CLASS_PATH"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#CLASS_PATH"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name CLASS_PATH { get { if (!_CLASS_PATHReady) { _CLASS_PATHContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "CLASS_PATH"); _CLASS_PATHReady = true; } return _CLASS_PATHContent; } }
             private static Java.Util.Jar.Attributes.Name _CLASS_PATHContent = default;
             private static bool _CLASS_PATHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#CONTENT_TYPE"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#CONTENT_TYPE"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name CONTENT_TYPE { get { if (!_CONTENT_TYPEReady) { _CONTENT_TYPEContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "CONTENT_TYPE"); _CONTENT_TYPEReady = true; } return _CONTENT_TYPEContent; } }
             private static Java.Util.Jar.Attributes.Name _CONTENT_TYPEContent = default;
             private static bool _CONTENT_TYPEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#EXTENSION_INSTALLATION"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#EXTENSION_INSTALLATION"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Util.Jar.Attributes.Name EXTENSION_INSTALLATION { get { if (!_EXTENSION_INSTALLATIONReady) { _EXTENSION_INSTALLATIONContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "EXTENSION_INSTALLATION"); _EXTENSION_INSTALLATIONReady = true; } return _EXTENSION_INSTALLATIONContent; } }
             private static Java.Util.Jar.Attributes.Name _EXTENSION_INSTALLATIONContent = default;
             private static bool _EXTENSION_INSTALLATIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#EXTENSION_LIST"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#EXTENSION_LIST"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name EXTENSION_LIST { get { if (!_EXTENSION_LISTReady) { _EXTENSION_LISTContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "EXTENSION_LIST"); _EXTENSION_LISTReady = true; } return _EXTENSION_LISTContent; } }
             private static Java.Util.Jar.Attributes.Name _EXTENSION_LISTContent = default;
             private static bool _EXTENSION_LISTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#EXTENSION_NAME"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#EXTENSION_NAME"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name EXTENSION_NAME { get { if (!_EXTENSION_NAMEReady) { _EXTENSION_NAMEContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "EXTENSION_NAME"); _EXTENSION_NAMEReady = true; } return _EXTENSION_NAMEContent; } }
             private static Java.Util.Jar.Attributes.Name _EXTENSION_NAMEContent = default;
             private static bool _EXTENSION_NAMEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#IMPLEMENTATION_TITLE"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#IMPLEMENTATION_TITLE"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name IMPLEMENTATION_TITLE { get { if (!_IMPLEMENTATION_TITLEReady) { _IMPLEMENTATION_TITLEContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "IMPLEMENTATION_TITLE"); _IMPLEMENTATION_TITLEReady = true; } return _IMPLEMENTATION_TITLEContent; } }
             private static Java.Util.Jar.Attributes.Name _IMPLEMENTATION_TITLEContent = default;
             private static bool _IMPLEMENTATION_TITLEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#IMPLEMENTATION_URL"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#IMPLEMENTATION_URL"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Util.Jar.Attributes.Name IMPLEMENTATION_URL { get { if (!_IMPLEMENTATION_URLReady) { _IMPLEMENTATION_URLContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "IMPLEMENTATION_URL"); _IMPLEMENTATION_URLReady = true; } return _IMPLEMENTATION_URLContent; } }
             private static Java.Util.Jar.Attributes.Name _IMPLEMENTATION_URLContent = default;
             private static bool _IMPLEMENTATION_URLReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#IMPLEMENTATION_VENDOR"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#IMPLEMENTATION_VENDOR"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name IMPLEMENTATION_VENDOR { get { if (!_IMPLEMENTATION_VENDORReady) { _IMPLEMENTATION_VENDORContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "IMPLEMENTATION_VENDOR"); _IMPLEMENTATION_VENDORReady = true; } return _IMPLEMENTATION_VENDORContent; } }
             private static Java.Util.Jar.Attributes.Name _IMPLEMENTATION_VENDORContent = default;
             private static bool _IMPLEMENTATION_VENDORReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#IMPLEMENTATION_VENDOR_ID"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#IMPLEMENTATION_VENDOR_ID"/>
             /// </summary>
-            [System.Obsolete()]
+            [global::System.Obsolete()]
             public static Java.Util.Jar.Attributes.Name IMPLEMENTATION_VENDOR_ID { get { if (!_IMPLEMENTATION_VENDOR_IDReady) { _IMPLEMENTATION_VENDOR_IDContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "IMPLEMENTATION_VENDOR_ID"); _IMPLEMENTATION_VENDOR_IDReady = true; } return _IMPLEMENTATION_VENDOR_IDContent; } }
             private static Java.Util.Jar.Attributes.Name _IMPLEMENTATION_VENDOR_IDContent = default;
             private static bool _IMPLEMENTATION_VENDOR_IDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#IMPLEMENTATION_VERSION"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#IMPLEMENTATION_VERSION"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name IMPLEMENTATION_VERSION { get { if (!_IMPLEMENTATION_VERSIONReady) { _IMPLEMENTATION_VERSIONContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "IMPLEMENTATION_VERSION"); _IMPLEMENTATION_VERSIONReady = true; } return _IMPLEMENTATION_VERSIONContent; } }
             private static Java.Util.Jar.Attributes.Name _IMPLEMENTATION_VERSIONContent = default;
             private static bool _IMPLEMENTATION_VERSIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#MAIN_CLASS"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#MAIN_CLASS"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name MAIN_CLASS { get { if (!_MAIN_CLASSReady) { _MAIN_CLASSContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "MAIN_CLASS"); _MAIN_CLASSReady = true; } return _MAIN_CLASSContent; } }
             private static Java.Util.Jar.Attributes.Name _MAIN_CLASSContent = default;
             private static bool _MAIN_CLASSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#MANIFEST_VERSION"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#MANIFEST_VERSION"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name MANIFEST_VERSION { get { if (!_MANIFEST_VERSIONReady) { _MANIFEST_VERSIONContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "MANIFEST_VERSION"); _MANIFEST_VERSIONReady = true; } return _MANIFEST_VERSIONContent; } }
             private static Java.Util.Jar.Attributes.Name _MANIFEST_VERSIONContent = default;
             private static bool _MANIFEST_VERSIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#MULTI_RELEASE"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#MULTI_RELEASE"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name MULTI_RELEASE { get { if (!_MULTI_RELEASEReady) { _MULTI_RELEASEContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "MULTI_RELEASE"); _MULTI_RELEASEReady = true; } return _MULTI_RELEASEContent; } }
             private static Java.Util.Jar.Attributes.Name _MULTI_RELEASEContent = default;
             private static bool _MULTI_RELEASEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#SEALED"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#SEALED"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name SEALED { get { if (!_SEALEDReady) { _SEALEDContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "SEALED"); _SEALEDReady = true; } return _SEALEDContent; } }
             private static Java.Util.Jar.Attributes.Name _SEALEDContent = default;
             private static bool _SEALEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#SIGNATURE_VERSION"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#SIGNATURE_VERSION"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name SIGNATURE_VERSION { get { if (!_SIGNATURE_VERSIONReady) { _SIGNATURE_VERSIONContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "SIGNATURE_VERSION"); _SIGNATURE_VERSIONReady = true; } return _SIGNATURE_VERSIONContent; } }
             private static Java.Util.Jar.Attributes.Name _SIGNATURE_VERSIONContent = default;
             private static bool _SIGNATURE_VERSIONReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#SPECIFICATION_TITLE"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#SPECIFICATION_TITLE"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name SPECIFICATION_TITLE { get { if (!_SPECIFICATION_TITLEReady) { _SPECIFICATION_TITLEContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "SPECIFICATION_TITLE"); _SPECIFICATION_TITLEReady = true; } return _SPECIFICATION_TITLEContent; } }
             private static Java.Util.Jar.Attributes.Name _SPECIFICATION_TITLEContent = default;
             private static bool _SPECIFICATION_TITLEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#SPECIFICATION_VENDOR"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#SPECIFICATION_VENDOR"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name SPECIFICATION_VENDOR { get { if (!_SPECIFICATION_VENDORReady) { _SPECIFICATION_VENDORContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "SPECIFICATION_VENDOR"); _SPECIFICATION_VENDORReady = true; } return _SPECIFICATION_VENDORContent; } }
             private static Java.Util.Jar.Attributes.Name _SPECIFICATION_VENDORContent = default;
             private static bool _SPECIFICATION_VENDORReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Attributes.Name.html#SPECIFICATION_VERSION"/>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Attributes.Name.html#SPECIFICATION_VERSION"/>
             /// </summary>
             public static Java.Util.Jar.Attributes.Name SPECIFICATION_VERSION { get { if (!_SPECIFICATION_VERSIONReady) { _SPECIFICATION_VERSIONContent = SGetField<Java.Util.Jar.Attributes.Name>(LocalBridgeClazz, "SPECIFICATION_VERSION"); _SPECIFICATION_VERSIONReady = true; } return _SPECIFICATION_VERSIONContent; } }
             private static Java.Util.Jar.Attributes.Name _SPECIFICATION_VERSIONContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Util/Jar/JarEntry.cs b/src/net/Netdroid/Generated/Java/Util/Jar/JarEntry.cs
index 42df2c842..3006ad7cb 100644
--- a/src/net/Netdroid/Generated/Java/Util/Jar/JarEntry.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Jar/JarEntry.cs
@@ -30,7 +30,7 @@ public partial class JarEntry
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarEntry.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarEntry.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public JarEntry(Java.Lang.String arg0)
@@ -38,7 +38,7 @@ public JarEntry(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarEntry.html#%3Cinit%3E(java.util.jar.JarEntry)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarEntry.html#%3Cinit%3E(java.util.jar.JarEntry)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Jar.JarEntry"/></param>
         public JarEntry(Java.Util.Jar.JarEntry arg0)
@@ -46,7 +46,7 @@ public JarEntry(Java.Util.Jar.JarEntry arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarEntry.html#%3Cinit%3E(java.util.zip.ZipEntry)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarEntry.html#%3Cinit%3E(java.util.zip.ZipEntry)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Zip.ZipEntry"/></param>
         public JarEntry(Java.Util.Zip.ZipEntry arg0)
@@ -70,32 +70,37 @@ public JarEntry(Java.Util.Zip.ZipEntry arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarEntry.html#getAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarEntry.html#getRealName()"/>
         /// </summary>
-        public Java.Util.Jar.Attributes Attributes
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetRealName()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.Attributes>("getAttributes", "()Ljava/util/jar/Attributes;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getRealName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarEntry.html#getCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarEntry.html#getCertificates()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] Certificates
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        public Java.Security.Cert.Certificate[] GetCertificates()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarEntry.html#getCodeSigners()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarEntry.html#getCodeSigners()"/>
         /// </summary>
-        public Java.Security.CodeSigner[] CodeSigners
+        /// <returns><see cref="Java.Security.CodeSigner"/></returns>
+        public Java.Security.CodeSigner[] GetCodeSigners()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.CodeSigner>("getCodeSigners", "()[Ljava/security/CodeSigner;"); }
+            return IExecuteWithSignatureArray<Java.Security.CodeSigner>("getCodeSigners", "()[Ljava/security/CodeSigner;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarEntry.html#getRealName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarEntry.html#getAttributes()"/>
         /// </summary>
-        public Java.Lang.String RealName
+        /// <returns><see cref="Java.Util.Jar.Attributes"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Jar.Attributes GetAttributes()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getRealName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Jar.Attributes>("getAttributes", "()Ljava/util/jar/Attributes;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Jar/JarFile.cs b/src/net/Netdroid/Generated/Java/Util/Jar/JarFile.cs
index 18a3d7291..34f98d1f3 100644
--- a/src/net/Netdroid/Generated/Java/Util/Jar/JarFile.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Jar/JarFile.cs
@@ -30,19 +30,7 @@ public partial class JarFile
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#%3Cinit%3E(java.io.File,boolean,int,java.lang.Runtime.Version)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Io.File"/></param>
-        /// <param name="arg1"><see cref="bool"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Java.Lang.Runtime.Version"/></param>
-        /// <exception cref="Java.Io.IOException"/>
-        public JarFile(Java.Io.File arg0, bool arg1, int arg2, Java.Lang.Runtime.Version arg3)
-            : base(arg0, arg1, arg2, arg3)
-        {
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#%3Cinit%3E(java.io.File,boolean,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#%3Cinit%3E(java.io.File,boolean,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -53,7 +41,7 @@ public JarFile(Java.Io.File arg0, bool arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#%3Cinit%3E(java.io.File,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#%3Cinit%3E(java.io.File,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -63,7 +51,7 @@ public JarFile(Java.Io.File arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -72,7 +60,7 @@ public JarFile(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#%3Cinit%3E(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#%3Cinit%3E(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -82,7 +70,7 @@ public JarFile(Java.Lang.String arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -99,7 +87,7 @@ public JarFile(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#MANIFEST_NAME"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#MANIFEST_NAME"/>
         /// </summary>
         public static Java.Lang.String MANIFEST_NAME { get { if (!_MANIFEST_NAMEReady) { _MANIFEST_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MANIFEST_NAME"); _MANIFEST_NAMEReady = true; } return _MANIFEST_NAMEContent; } }
         private static Java.Lang.String _MANIFEST_NAMEContent = default;
@@ -108,42 +96,12 @@ public JarFile(Java.Lang.String arg0)
         #endregion
 
         #region Static methods
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#baseVersion()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.Runtime.Version"/></returns>
-        public static Java.Lang.Runtime.Version BaseVersion()
-        {
-            return SExecuteWithSignature<Java.Lang.Runtime.Version>(LocalBridgeClazz, "baseVersion", "()Ljava/lang/Runtime$Version;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#runtimeVersion()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Lang.Runtime.Version"/></returns>
-        public static Java.Lang.Runtime.Version RuntimeVersion()
-        {
-            return SExecuteWithSignature<Java.Lang.Runtime.Version>(LocalBridgeClazz, "runtimeVersion", "()Ljava/lang/Runtime$Version;");
-        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#getManifest()"/> 
-        /// </summary>
-        public Java.Util.Jar.Manifest Manifest
-        {
-            get { return IExecuteWithSignature<Java.Util.Jar.Manifest>("getManifest", "()Ljava/util/jar/Manifest;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#getVersion()"/> 
-        /// </summary>
-        public Java.Lang.Runtime.Version Version
-        {
-            get { return IExecuteWithSignature<Java.Lang.Runtime.Version>("getVersion", "()Ljava/lang/Runtime$Version;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#isMultiRelease()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#isMultiRelease()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsMultiRelease()
@@ -151,7 +109,7 @@ public bool IsMultiRelease()
             return IExecuteWithSignature<bool>("isMultiRelease", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#getJarEntry(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#getJarEntry(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Jar.JarEntry"/></returns>
@@ -160,7 +118,16 @@ public Java.Util.Jar.JarEntry GetJarEntry(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Jar.JarEntry>("getJarEntry", "(Ljava/lang/String;)Ljava/util/jar/JarEntry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarFile.html#versionedStream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#getManifest()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Jar.Manifest"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Jar.Manifest GetManifest()
+        {
+            return IExecuteWithSignature<Java.Util.Jar.Manifest>("getManifest", "()Ljava/util/jar/Manifest;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarFile.html#versionedStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Util.Jar.JarEntry> VersionedStream()
diff --git a/src/net/Netdroid/Generated/Java/Util/Jar/JarInputStream.cs b/src/net/Netdroid/Generated/Java/Util/Jar/JarInputStream.cs
index 5bfe094b2..f05744bcf 100644
--- a/src/net/Netdroid/Generated/Java/Util/Jar/JarInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Jar/JarInputStream.cs
@@ -30,7 +30,7 @@ public partial class JarInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarInputStream.html#%3Cinit%3E(java.io.InputStream,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarInputStream.html#%3Cinit%3E(java.io.InputStream,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -40,7 +40,7 @@ public JarInputStream(Java.Io.InputStream arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -65,18 +65,21 @@ public JarInputStream(Java.Io.InputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarInputStream.html#getManifest()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarInputStream.html#getNextJarEntry()"/>
         /// </summary>
-        public Java.Util.Jar.Manifest Manifest
+        /// <returns><see cref="Java.Util.Jar.JarEntry"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Jar.JarEntry GetNextJarEntry()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.Manifest>("getManifest", "()Ljava/util/jar/Manifest;"); }
+            return IExecuteWithSignature<Java.Util.Jar.JarEntry>("getNextJarEntry", "()Ljava/util/jar/JarEntry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarInputStream.html#getNextJarEntry()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarInputStream.html#getManifest()"/>
         /// </summary>
-        public Java.Util.Jar.JarEntry NextJarEntry
+        /// <returns><see cref="Java.Util.Jar.Manifest"/></returns>
+        public Java.Util.Jar.Manifest GetManifest()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.JarEntry>("getNextJarEntry", "()Ljava/util/jar/JarEntry;"); }
+            return IExecuteWithSignature<Java.Util.Jar.Manifest>("getManifest", "()Ljava/util/jar/Manifest;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Jar/JarOutputStream.cs b/src/net/Netdroid/Generated/Java/Util/Jar/JarOutputStream.cs
index 94ab89c51..6a64076f6 100644
--- a/src/net/Netdroid/Generated/Java/Util/Jar/JarOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Jar/JarOutputStream.cs
@@ -30,7 +30,7 @@ public partial class JarOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.jar.Manifest)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.jar.Manifest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Jar.Manifest"/></param>
@@ -40,7 +40,7 @@ public JarOutputStream(Java.Io.OutputStream arg0, Java.Util.Jar.Manifest arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/JarOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/JarOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Jar/Manifest.cs b/src/net/Netdroid/Generated/Java/Util/Jar/Manifest.cs
index fa530c9e1..401258462 100644
--- a/src/net/Netdroid/Generated/Java/Util/Jar/Manifest.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Jar/Manifest.cs
@@ -30,7 +30,7 @@ public partial class Manifest
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -39,7 +39,7 @@ public Manifest(Java.Io.InputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html#%3Cinit%3E(java.util.jar.Manifest)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html#%3Cinit%3E(java.util.jar.Manifest)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Jar.Manifest"/></param>
         public Manifest(Java.Util.Jar.Manifest arg0)
@@ -63,37 +63,39 @@ public Manifest(Java.Util.Jar.Manifest arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html#getEntries()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html#getAttributes(java.lang.String)"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Util.Jar.Attributes> Entries
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Util.Jar.Attributes"/></returns>
+        public Java.Util.Jar.Attributes GetAttributes(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Jar.Attributes>>("getEntries", "()Ljava/util/Map;"); }
+            return IExecuteWithSignature<Java.Util.Jar.Attributes>("getAttributes", "(Ljava/lang/String;)Ljava/util/jar/Attributes;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html#getMainAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html#getMainAttributes()"/>
         /// </summary>
-        public Java.Util.Jar.Attributes MainAttributes
+        /// <returns><see cref="Java.Util.Jar.Attributes"/></returns>
+        public Java.Util.Jar.Attributes GetMainAttributes()
         {
-            get { return IExecuteWithSignature<Java.Util.Jar.Attributes>("getMainAttributes", "()Ljava/util/jar/Attributes;"); }
+            return IExecuteWithSignature<Java.Util.Jar.Attributes>("getMainAttributes", "()Ljava/util/jar/Attributes;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html#getAttributes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html#getEntries()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Util.Jar.Attributes"/></returns>
-        public Java.Util.Jar.Attributes GetAttributes(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        public Java.Util.Map<Java.Lang.String, Java.Util.Jar.Attributes> GetEntries()
         {
-            return IExecuteWithSignature<Java.Util.Jar.Attributes>("getAttributes", "(Ljava/lang/String;)Ljava/util/jar/Attributes;", arg0);
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Util.Jar.Attributes>>("getEntries", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html#read(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html#read(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -102,7 +104,7 @@ public void Read(Java.Io.InputStream arg0)
             IExecuteWithSignature("read", "(Ljava/io/InputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/jar/Manifest.html#write(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Manifest.html#write(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Jar/Pack200.cs b/src/net/Netdroid/Generated/Java/Util/Jar/Pack200.cs
new file mode 100644
index 000000000..02858c6e4
--- /dev/null
+++ b/src/net/Netdroid/Generated/Java/Util/Jar/Pack200.cs
@@ -0,0 +1,336 @@
+/*
+*  Copyright 2024 MASES s.r.l.
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*  Refer to LICENSE for more information.
+*/
+
+/*
+*  This file is generated by MASES.JNetReflector (ver. 2.5.1.0)
+*  using android.jar as reference
+*/
+
+using MASES.JCOBridge.C2JBridge;
+
+namespace Java.Util.Jar
+{
+    #region Pack200
+    public partial class Pack200
+    {
+        #region Constructors
+
+        #endregion
+
+        #region Class/Interface conversion operators
+
+        #endregion
+
+        #region Fields
+
+        #endregion
+
+        #region Static methods
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.html#newUnpacker()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Jar.Pack200.Unpacker"/></returns>
+        public static Java.Util.Jar.Pack200.Unpacker NewUnpacker()
+        {
+            return SExecuteWithSignature<Java.Util.Jar.Pack200.Unpacker>(LocalBridgeClazz, "newUnpacker", "()Ljava/util/jar/Pack200$Unpacker;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.html#newPacker()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Jar.Pack200.Packer"/></returns>
+        public static Java.Util.Jar.Pack200.Packer NewPacker()
+        {
+            return SExecuteWithSignature<Java.Util.Jar.Pack200.Packer>(LocalBridgeClazz, "newPacker", "()Ljava/util/jar/Pack200$Packer;");
+        }
+
+        #endregion
+
+        #region Instance methods
+
+        #endregion
+
+        #region Nested classes
+        #region Packer
+        public partial class Packer
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#CLASS_ATTRIBUTE_PFX"/>
+            /// </summary>
+            public static Java.Lang.String CLASS_ATTRIBUTE_PFX { get { if (!_CLASS_ATTRIBUTE_PFXReady) { _CLASS_ATTRIBUTE_PFXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CLASS_ATTRIBUTE_PFX"); _CLASS_ATTRIBUTE_PFXReady = true; } return _CLASS_ATTRIBUTE_PFXContent; } }
+            private static Java.Lang.String _CLASS_ATTRIBUTE_PFXContent = default;
+            private static bool _CLASS_ATTRIBUTE_PFXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#CODE_ATTRIBUTE_PFX"/>
+            /// </summary>
+            public static Java.Lang.String CODE_ATTRIBUTE_PFX { get { if (!_CODE_ATTRIBUTE_PFXReady) { _CODE_ATTRIBUTE_PFXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CODE_ATTRIBUTE_PFX"); _CODE_ATTRIBUTE_PFXReady = true; } return _CODE_ATTRIBUTE_PFXContent; } }
+            private static Java.Lang.String _CODE_ATTRIBUTE_PFXContent = default;
+            private static bool _CODE_ATTRIBUTE_PFXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#DEFLATE_HINT"/>
+            /// </summary>
+            public static Java.Lang.String DEFLATE_HINT { get { if (!_DEFLATE_HINTReady) { _DEFLATE_HINTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFLATE_HINT"); _DEFLATE_HINTReady = true; } return _DEFLATE_HINTContent; } }
+            private static Java.Lang.String _DEFLATE_HINTContent = default;
+            private static bool _DEFLATE_HINTReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#EFFORT"/>
+            /// </summary>
+            public static Java.Lang.String EFFORT { get { if (!_EFFORTReady) { _EFFORTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "EFFORT"); _EFFORTReady = true; } return _EFFORTContent; } }
+            private static Java.Lang.String _EFFORTContent = default;
+            private static bool _EFFORTReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#ERROR"/>
+            /// </summary>
+            public static Java.Lang.String ERROR { get { if (!_ERRORReady) { _ERRORContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ERROR"); _ERRORReady = true; } return _ERRORContent; } }
+            private static Java.Lang.String _ERRORContent = default;
+            private static bool _ERRORReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#FALSE"/>
+            /// </summary>
+            public static Java.Lang.String FALSE { get { if (!_FALSEReady) { _FALSEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FALSE"); _FALSEReady = true; } return _FALSEContent; } }
+            private static Java.Lang.String _FALSEContent = default;
+            private static bool _FALSEReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#FIELD_ATTRIBUTE_PFX"/>
+            /// </summary>
+            public static Java.Lang.String FIELD_ATTRIBUTE_PFX { get { if (!_FIELD_ATTRIBUTE_PFXReady) { _FIELD_ATTRIBUTE_PFXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FIELD_ATTRIBUTE_PFX"); _FIELD_ATTRIBUTE_PFXReady = true; } return _FIELD_ATTRIBUTE_PFXContent; } }
+            private static Java.Lang.String _FIELD_ATTRIBUTE_PFXContent = default;
+            private static bool _FIELD_ATTRIBUTE_PFXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#KEEP"/>
+            /// </summary>
+            public static Java.Lang.String KEEP { get { if (!_KEEPReady) { _KEEPContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEEP"); _KEEPReady = true; } return _KEEPContent; } }
+            private static Java.Lang.String _KEEPContent = default;
+            private static bool _KEEPReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#KEEP_FILE_ORDER"/>
+            /// </summary>
+            public static Java.Lang.String KEEP_FILE_ORDER { get { if (!_KEEP_FILE_ORDERReady) { _KEEP_FILE_ORDERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEEP_FILE_ORDER"); _KEEP_FILE_ORDERReady = true; } return _KEEP_FILE_ORDERContent; } }
+            private static Java.Lang.String _KEEP_FILE_ORDERContent = default;
+            private static bool _KEEP_FILE_ORDERReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#LATEST"/>
+            /// </summary>
+            public static Java.Lang.String LATEST { get { if (!_LATESTReady) { _LATESTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LATEST"); _LATESTReady = true; } return _LATESTContent; } }
+            private static Java.Lang.String _LATESTContent = default;
+            private static bool _LATESTReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#METHOD_ATTRIBUTE_PFX"/>
+            /// </summary>
+            public static Java.Lang.String METHOD_ATTRIBUTE_PFX { get { if (!_METHOD_ATTRIBUTE_PFXReady) { _METHOD_ATTRIBUTE_PFXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "METHOD_ATTRIBUTE_PFX"); _METHOD_ATTRIBUTE_PFXReady = true; } return _METHOD_ATTRIBUTE_PFXContent; } }
+            private static Java.Lang.String _METHOD_ATTRIBUTE_PFXContent = default;
+            private static bool _METHOD_ATTRIBUTE_PFXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#MODIFICATION_TIME"/>
+            /// </summary>
+            public static Java.Lang.String MODIFICATION_TIME { get { if (!_MODIFICATION_TIMEReady) { _MODIFICATION_TIMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MODIFICATION_TIME"); _MODIFICATION_TIMEReady = true; } return _MODIFICATION_TIMEContent; } }
+            private static Java.Lang.String _MODIFICATION_TIMEContent = default;
+            private static bool _MODIFICATION_TIMEReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#PASS"/>
+            /// </summary>
+            public static Java.Lang.String PASS { get { if (!_PASSReady) { _PASSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PASS"); _PASSReady = true; } return _PASSContent; } }
+            private static Java.Lang.String _PASSContent = default;
+            private static bool _PASSReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#PASS_FILE_PFX"/>
+            /// </summary>
+            public static Java.Lang.String PASS_FILE_PFX { get { if (!_PASS_FILE_PFXReady) { _PASS_FILE_PFXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PASS_FILE_PFX"); _PASS_FILE_PFXReady = true; } return _PASS_FILE_PFXContent; } }
+            private static Java.Lang.String _PASS_FILE_PFXContent = default;
+            private static bool _PASS_FILE_PFXReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#PROGRESS"/>
+            /// </summary>
+            public static Java.Lang.String PROGRESS { get { if (!_PROGRESSReady) { _PROGRESSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PROGRESS"); _PROGRESSReady = true; } return _PROGRESSContent; } }
+            private static Java.Lang.String _PROGRESSContent = default;
+            private static bool _PROGRESSReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#SEGMENT_LIMIT"/>
+            /// </summary>
+            public static Java.Lang.String SEGMENT_LIMIT { get { if (!_SEGMENT_LIMITReady) { _SEGMENT_LIMITContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SEGMENT_LIMIT"); _SEGMENT_LIMITReady = true; } return _SEGMENT_LIMITContent; } }
+            private static Java.Lang.String _SEGMENT_LIMITContent = default;
+            private static bool _SEGMENT_LIMITReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#STRIP"/>
+            /// </summary>
+            public static Java.Lang.String STRIP { get { if (!_STRIPReady) { _STRIPContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "STRIP"); _STRIPReady = true; } return _STRIPContent; } }
+            private static Java.Lang.String _STRIPContent = default;
+            private static bool _STRIPReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#TRUE"/>
+            /// </summary>
+            public static Java.Lang.String TRUE { get { if (!_TRUEReady) { _TRUEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TRUE"); _TRUEReady = true; } return _TRUEContent; } }
+            private static Java.Lang.String _TRUEContent = default;
+            private static bool _TRUEReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#UNKNOWN_ATTRIBUTE"/>
+            /// </summary>
+            public static Java.Lang.String UNKNOWN_ATTRIBUTE { get { if (!_UNKNOWN_ATTRIBUTEReady) { _UNKNOWN_ATTRIBUTEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "UNKNOWN_ATTRIBUTE"); _UNKNOWN_ATTRIBUTEReady = true; } return _UNKNOWN_ATTRIBUTEContent; } }
+            private static Java.Lang.String _UNKNOWN_ATTRIBUTEContent = default;
+            private static bool _UNKNOWN_ATTRIBUTEReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#properties()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.SortedMap"/></returns>
+            public Java.Util.SortedMap<Java.Lang.String, Java.Lang.String> Properties()
+            {
+                return IExecuteWithSignature<Java.Util.SortedMap<Java.Lang.String, Java.Lang.String>>("properties", "()Ljava/util/SortedMap;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#pack(java.util.jar.JarFile,java.io.OutputStream)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Util.Jar.JarFile"/></param>
+            /// <param name="arg1"><see cref="Java.Io.OutputStream"/></param>
+            /// <exception cref="Java.Io.IOException"/>
+            public void Pack(Java.Util.Jar.JarFile arg0, Java.Io.OutputStream arg1)
+            {
+                IExecute("pack", arg0, arg1);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Packer.html#pack(java.util.jar.JarInputStream,java.io.OutputStream)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Util.Jar.JarInputStream"/></param>
+            /// <param name="arg1"><see cref="Java.Io.OutputStream"/></param>
+            /// <exception cref="Java.Io.IOException"/>
+            public void Pack(Java.Util.Jar.JarInputStream arg0, Java.Io.OutputStream arg1)
+            {
+                IExecute("pack", arg0, arg1);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+        #region Unpacker
+        public partial class Unpacker
+        {
+            #region Constructors
+
+            #endregion
+
+            #region Class/Interface conversion operators
+
+            #endregion
+
+            #region Fields
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html#DEFLATE_HINT"/>
+            /// </summary>
+            public static Java.Lang.String DEFLATE_HINT { get { if (!_DEFLATE_HINTReady) { _DEFLATE_HINTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFLATE_HINT"); _DEFLATE_HINTReady = true; } return _DEFLATE_HINTContent; } }
+            private static Java.Lang.String _DEFLATE_HINTContent = default;
+            private static bool _DEFLATE_HINTReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html#FALSE"/>
+            /// </summary>
+            public static Java.Lang.String FALSE { get { if (!_FALSEReady) { _FALSEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FALSE"); _FALSEReady = true; } return _FALSEContent; } }
+            private static Java.Lang.String _FALSEContent = default;
+            private static bool _FALSEReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html#KEEP"/>
+            /// </summary>
+            public static Java.Lang.String KEEP { get { if (!_KEEPReady) { _KEEPContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "KEEP"); _KEEPReady = true; } return _KEEPContent; } }
+            private static Java.Lang.String _KEEPContent = default;
+            private static bool _KEEPReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html#PROGRESS"/>
+            /// </summary>
+            public static Java.Lang.String PROGRESS { get { if (!_PROGRESSReady) { _PROGRESSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PROGRESS"); _PROGRESSReady = true; } return _PROGRESSContent; } }
+            private static Java.Lang.String _PROGRESSContent = default;
+            private static bool _PROGRESSReady = false; // this is used because in case of generics 
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html#TRUE"/>
+            /// </summary>
+            public static Java.Lang.String TRUE { get { if (!_TRUEReady) { _TRUEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TRUE"); _TRUEReady = true; } return _TRUEContent; } }
+            private static Java.Lang.String _TRUEContent = default;
+            private static bool _TRUEReady = false; // this is used because in case of generics 
+
+            #endregion
+
+            #region Static methods
+
+            #endregion
+
+            #region Instance methods
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html#properties()"/>
+            /// </summary>
+            /// <returns><see cref="Java.Util.SortedMap"/></returns>
+            public Java.Util.SortedMap<Java.Lang.String, Java.Lang.String> Properties()
+            {
+                return IExecuteWithSignature<Java.Util.SortedMap<Java.Lang.String, Java.Lang.String>>("properties", "()Ljava/util/SortedMap;");
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html#unpack(java.io.File,java.util.jar.JarOutputStream)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Io.File"/></param>
+            /// <param name="arg1"><see cref="Java.Util.Jar.JarOutputStream"/></param>
+            /// <exception cref="Java.Io.IOException"/>
+            public void Unpack(Java.Io.File arg0, Java.Util.Jar.JarOutputStream arg1)
+            {
+                IExecute("unpack", arg0, arg1);
+            }
+            /// <summary>
+            /// <see href="https://developer.android.com/reference/java/util/jar/Pack200.Unpacker.html#unpack(java.io.InputStream,java.util.jar.JarOutputStream)"/>
+            /// </summary>
+            /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
+            /// <param name="arg1"><see cref="Java.Util.Jar.JarOutputStream"/></param>
+            /// <exception cref="Java.Io.IOException"/>
+            public void Unpack(Java.Io.InputStream arg0, Java.Util.Jar.JarOutputStream arg1)
+            {
+                IExecute("unpack", arg0, arg1);
+            }
+
+            #endregion
+
+            #region Nested classes
+
+            #endregion
+
+            // TODO: complete the class
+        }
+        #endregion
+
+    
+        #endregion
+
+        // TODO: complete the class
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/net/Netdroid/Generated/Java/Util/LinkedHashMap.cs b/src/net/Netdroid/Generated/Java/Util/LinkedHashMap.cs
index 604ef4bff..735b44845 100644
--- a/src/net/Netdroid/Generated/Java/Util/LinkedHashMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/LinkedHashMap.cs
@@ -30,7 +30,7 @@ public partial class LinkedHashMap
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html#%3Cinit%3E(int,float,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html#%3Cinit%3E(int,float,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -40,7 +40,7 @@ public LinkedHashMap(int arg0, float arg1, bool arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -49,7 +49,7 @@ public LinkedHashMap(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public LinkedHashMap(int arg0)
@@ -57,7 +57,7 @@ public LinkedHashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public LinkedHashMap(Java.Util.Map arg0)
@@ -96,7 +96,7 @@ public partial class LinkedHashMap<K, V>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html#%3Cinit%3E(int,float,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html#%3Cinit%3E(int,float,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -106,7 +106,7 @@ public LinkedHashMap(int arg0, float arg1, bool arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -115,7 +115,7 @@ public LinkedHashMap(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public LinkedHashMap(int arg0)
@@ -123,7 +123,7 @@ public LinkedHashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public LinkedHashMap(Java.Util.Map<K, V> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/LinkedHashSet.cs b/src/net/Netdroid/Generated/Java/Util/LinkedHashSet.cs
index 55d0400a8..9494dd519 100644
--- a/src/net/Netdroid/Generated/Java/Util/LinkedHashSet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/LinkedHashSet.cs
@@ -30,7 +30,7 @@ public partial class LinkedHashSet
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashSet.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashSet.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -39,7 +39,7 @@ public LinkedHashSet(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashSet.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashSet.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public LinkedHashSet(int arg0)
@@ -47,7 +47,7 @@ public LinkedHashSet(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashSet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashSet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedHashSet(Java.Util.Collection arg0)
@@ -86,7 +86,7 @@ public partial class LinkedHashSet<E> : Java.Util.ISet<E>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashSet.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashSet.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -95,7 +95,7 @@ public LinkedHashSet(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashSet.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashSet.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public LinkedHashSet(int arg0)
@@ -103,7 +103,7 @@ public LinkedHashSet(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedHashSet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedHashSet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedHashSet(Java.Util.Collection<E> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/LinkedList.cs b/src/net/Netdroid/Generated/Java/Util/LinkedList.cs
index e1c34a494..354a2bfda 100644
--- a/src/net/Netdroid/Generated/Java/Util/LinkedList.cs
+++ b/src/net/Netdroid/Generated/Java/Util/LinkedList.cs
@@ -30,7 +30,7 @@ public partial class LinkedList
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedList(Java.Util.Collection arg0)
@@ -70,21 +70,7 @@ public LinkedList(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#getFirst()"/> 
-        /// </summary>
-        public object First
-        {
-            get { return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#getLast()"/> 
-        /// </summary>
-        public object Last
-        {
-            get { return IExecuteWithSignature("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -93,7 +79,7 @@ public bool Offer(object arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -102,7 +88,7 @@ public bool OfferFirst(object arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -111,7 +97,7 @@ public bool OfferLast(object arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -120,7 +106,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -129,7 +115,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#element()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Element()
@@ -137,7 +123,23 @@ public object Element()
             return IExecuteWithSignature("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#getFirst()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetFirst()
+        {
+            return IExecuteWithSignature("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#getLast()"/>
+        /// </summary>
+        /// <returns><see cref="object"/></returns>
+        public object GetLast()
+        {
+            return IExecuteWithSignature("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#peek()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Peek()
@@ -145,7 +147,7 @@ public object Peek()
             return IExecuteWithSignature("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#peekFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekFirst()
@@ -153,7 +155,7 @@ public object PeekFirst()
             return IExecuteWithSignature("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#peekLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PeekLast()
@@ -161,7 +163,7 @@ public object PeekLast()
             return IExecuteWithSignature("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#poll()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Poll()
@@ -169,7 +171,7 @@ public object Poll()
             return IExecuteWithSignature("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#pollFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollFirst()
@@ -177,7 +179,7 @@ public object PollFirst()
             return IExecuteWithSignature("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#pollLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollLast()
@@ -185,7 +187,7 @@ public object PollLast()
             return IExecuteWithSignature("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#pop()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Pop()
@@ -193,7 +195,7 @@ public object Pop()
             return IExecuteWithSignature("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#remove()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Remove()
@@ -201,7 +203,7 @@ public object Remove()
             return IExecuteWithSignature("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#removeFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveFirst()
@@ -209,7 +211,7 @@ public object RemoveFirst()
             return IExecuteWithSignature("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#removeLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object RemoveLast()
@@ -217,7 +219,7 @@ public object RemoveLast()
             return IExecuteWithSignature("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator DescendingIterator()
@@ -225,7 +227,7 @@ public Java.Util.Iterator DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddFirst(object arg0)
@@ -233,7 +235,7 @@ public void AddFirst(object arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddLast(object arg0)
@@ -241,7 +243,7 @@ public void AddLast(object arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Push(object arg0)
@@ -264,7 +266,7 @@ public partial class LinkedList<E> : Java.Util.IList<E>, Java.Util.IDeque<E>, Ja
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public LinkedList(Java.Util.Collection<E> arg0)
@@ -308,21 +310,7 @@ public LinkedList(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#getFirst()"/> 
-        /// </summary>
-        public E First
-        {
-            get { return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#getLast()"/> 
-        /// </summary>
-        public E Last
-        {
-            get { return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -331,7 +319,7 @@ public bool Offer(E arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#offerFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#offerFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -340,7 +328,7 @@ public bool OfferFirst(E arg0)
             return IExecuteWithSignature<bool>("offerFirst", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#offerLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#offerLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -349,7 +337,7 @@ public bool OfferLast(E arg0)
             return IExecuteWithSignature<bool>("offerLast", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#removeFirstOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#removeFirstOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -358,7 +346,7 @@ public bool RemoveFirstOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeFirstOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#removeLastOccurrence(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#removeLastOccurrence(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -367,7 +355,7 @@ public bool RemoveLastOccurrence(object arg0)
             return IExecuteWithSignature<bool>("removeLastOccurrence", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#element()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Element()
@@ -375,7 +363,23 @@ public E Element()
             return IExecuteWithSignature<E>("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#getFirst()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetFirst()
+        {
+            return IExecuteWithSignature<E>("getFirst", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#getLast()"/>
+        /// </summary>
+        /// <returns><typeparamref name="E"/></returns>
+        public E GetLast()
+        {
+            return IExecuteWithSignature<E>("getLast", "()Ljava/lang/Object;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#peek()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Peek()
@@ -383,7 +387,7 @@ public E Peek()
             return IExecuteWithSignature<E>("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#peekFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#peekFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekFirst()
@@ -391,7 +395,7 @@ public E PeekFirst()
             return IExecuteWithSignature<E>("peekFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#peekLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#peekLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PeekLast()
@@ -399,7 +403,7 @@ public E PeekLast()
             return IExecuteWithSignature<E>("peekLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#poll()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Poll()
@@ -407,7 +411,7 @@ public E Poll()
             return IExecuteWithSignature<E>("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#pollFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollFirst()
@@ -415,7 +419,7 @@ public E PollFirst()
             return IExecuteWithSignature<E>("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#pollLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollLast()
@@ -423,7 +427,7 @@ public E PollLast()
             return IExecuteWithSignature<E>("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#pop()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Pop()
@@ -431,7 +435,7 @@ public E Pop()
             return IExecuteWithSignature<E>("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#remove()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Remove()
@@ -439,7 +443,7 @@ public E Remove()
             return IExecuteWithSignature<E>("remove", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#removeFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#removeFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveFirst()
@@ -447,7 +451,7 @@ public E RemoveFirst()
             return IExecuteWithSignature<E>("removeFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#removeLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#removeLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E RemoveLast()
@@ -455,7 +459,7 @@ public E RemoveLast()
             return IExecuteWithSignature<E>("removeLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> DescendingIterator()
@@ -463,7 +467,7 @@ public Java.Util.Iterator<E> DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#addFirst(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#addFirst(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddFirst(E arg0)
@@ -471,7 +475,7 @@ public void AddFirst(E arg0)
             IExecuteWithSignature("addFirst", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#addLast(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#addLast(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddLast(E arg0)
@@ -479,7 +483,7 @@ public void AddLast(E arg0)
             IExecuteWithSignature("addLast", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LinkedList.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LinkedList.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Push(E arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/List.cs b/src/net/Netdroid/Generated/Java/Util/List.cs
index c6d53418b..9c82b0623 100644
--- a/src/net/Netdroid/Generated/Java/Util/List.cs
+++ b/src/net/Netdroid/Generated/Java/Util/List.cs
@@ -42,7 +42,7 @@ public partial class List
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#copyOf(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#copyOf(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -51,7 +51,7 @@ public static Java.Util.List CopyOf(Java.Util.Collection arg0)
             return SExecuteWithSignature<Java.Util.List>(LocalBridgeClazz, "copyOf", "(Ljava/util/Collection;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         public static Java.Util.List Of()
@@ -59,7 +59,7 @@ public static Java.Util.List Of()
             return SExecuteWithSignature<Java.Util.List>(LocalBridgeClazz, "of", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -77,7 +77,7 @@ public static Java.Util.List Of(object arg0, object arg1, object arg2, object ar
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -94,7 +94,7 @@ public static Java.Util.List Of(object arg0, object arg1, object arg2, object ar
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -110,7 +110,7 @@ public static Java.Util.List Of(object arg0, object arg1, object arg2, object ar
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -125,7 +125,7 @@ public static Java.Util.List Of(object arg0, object arg1, object arg2, object ar
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -139,7 +139,7 @@ public static Java.Util.List Of(object arg0, object arg1, object arg2, object ar
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -152,7 +152,7 @@ public static Java.Util.List Of(object arg0, object arg1, object arg2, object ar
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -164,7 +164,7 @@ public static Java.Util.List Of(object arg0, object arg1, object arg2, object ar
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -175,7 +175,7 @@ public static Java.Util.List Of(object arg0, object arg1, object arg2)
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -185,7 +185,7 @@ public static Java.Util.List Of(object arg0, object arg1)
             return SExecute<Java.Util.List>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -194,7 +194,7 @@ public static Java.Util.List Of(params object[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.List>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/List;"); else return SExecuteWithSignature<Java.Util.List>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -207,7 +207,7 @@ public static Java.Util.List Of(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -216,7 +216,7 @@ public object[] ToArray(object[] arg0)
             return IExecuteWithSignatureArray<object>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -225,7 +225,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#addAll(int,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#addAll(int,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -235,7 +235,7 @@ public bool AddAll(int arg0, Java.Util.Collection arg1)
             return IExecute<bool>("addAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -244,7 +244,7 @@ public bool AddAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -253,7 +253,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -262,7 +262,7 @@ public bool ContainsAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -270,7 +270,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -279,7 +279,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -288,7 +288,7 @@ public bool RemoveAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -297,7 +297,7 @@ public bool RetainAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -306,7 +306,7 @@ public object Get(int arg0)
             return IExecuteWithSignature("get", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#remove(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#remove(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -315,7 +315,7 @@ public object Remove(int arg0)
             return IExecuteWithSignature("remove", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#set(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#set(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -325,7 +325,7 @@ public object Set(int arg0, object arg1)
             return IExecute("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#indexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#indexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -334,7 +334,7 @@ public int IndexOf(object arg0)
             return IExecuteWithSignature<int>("indexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#lastIndexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#lastIndexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -343,7 +343,7 @@ public int LastIndexOf(object arg0)
             return IExecuteWithSignature<int>("lastIndexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -351,7 +351,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -359,7 +359,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -367,7 +367,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#subList(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#subList(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -377,7 +377,7 @@ public Java.Util.List SubList(int arg0, int arg1)
             return IExecute<Java.Util.List>("subList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#listIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#listIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
         public Java.Util.ListIterator ListIterator()
@@ -385,7 +385,7 @@ public Java.Util.ListIterator ListIterator()
             return IExecuteWithSignature<Java.Util.ListIterator>("listIterator", "()Ljava/util/ListIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#listIterator(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#listIterator(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
@@ -394,7 +394,7 @@ public Java.Util.ListIterator ListIterator(int arg0)
             return IExecuteWithSignature<Java.Util.ListIterator>("listIterator", "(I)Ljava/util/ListIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#add(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#add(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -403,14 +403,14 @@ public void Add(int arg0, object arg1)
             IExecute("add", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -418,7 +418,7 @@ public Java.Util.Spliterator Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#replaceAll(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#replaceAll(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         public void ReplaceAll(Java.Util.Function.UnaryOperator arg0)
@@ -475,17 +475,17 @@ public partial class List<E> : Java.Util.IList<E>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#copyOf(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#copyOf(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="Java.Util.List"/></returns>
-        public static Java.Util.List<E> CopyOf<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public static Java.Util.List<E> CopyOf<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return SExecuteWithSignature<Java.Util.List<E>>(LocalBridgeClazz, "copyOf", "(Ljava/util/Collection;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.List"/></returns>
         public static Java.Util.List<E> Of()
@@ -493,7 +493,7 @@ public static Java.Util.List<E> Of()
             return SExecuteWithSignature<Java.Util.List<E>>(LocalBridgeClazz, "of", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -511,7 +511,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -528,7 +528,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -544,7 +544,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -559,7 +559,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -573,7 +573,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -586,7 +586,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4)
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -598,7 +598,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1, E arg2, E arg3)
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -609,7 +609,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1, E arg2)
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -619,7 +619,7 @@ public static Java.Util.List<E> Of(E arg0, E arg1)
             return SExecute<Java.Util.List<E>>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -628,7 +628,7 @@ public static Java.Util.List<E> Of(params E[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.List<E>>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/List;"); else return SExecuteWithSignature<Java.Util.List<E>>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/List;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#of(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#of(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.List"/></returns>
@@ -641,7 +641,7 @@ public static Java.Util.List<E> Of(E arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -651,7 +651,7 @@ public T[] ToArray<T>(T[] arg0)
             return IExecuteWithSignatureArray<T>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -660,28 +660,28 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#addAll(int,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#addAll(int,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg1ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg1ExtendsE>(int arg0, Java.Util.Collection<Arg1ExtendsE> arg1) where Arg1ExtendsE: E
+        public bool AddAll<Arg1ExtendsE>(int arg0, Java.Util.Collection<Arg1ExtendsE> arg1) where Arg1ExtendsE : E
         {
             return IExecute<bool>("addAll", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -690,7 +690,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -699,7 +699,7 @@ public bool ContainsAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -707,7 +707,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -716,7 +716,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -725,7 +725,7 @@ public bool RemoveAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -734,7 +734,7 @@ public bool RetainAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#get(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#get(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -743,7 +743,7 @@ public E Get(int arg0)
             return IExecuteWithSignature<E>("get", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#remove(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#remove(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -752,7 +752,7 @@ public E Remove(int arg0)
             return IExecuteWithSignature<E>("remove", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#set(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#set(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -762,7 +762,7 @@ public E Set(int arg0, E arg1)
             return IExecute<E>("set", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#indexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#indexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -771,7 +771,7 @@ public int IndexOf(object arg0)
             return IExecuteWithSignature<int>("indexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#lastIndexOf(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#lastIndexOf(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -780,7 +780,7 @@ public int LastIndexOf(object arg0)
             return IExecuteWithSignature<int>("lastIndexOf", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -788,7 +788,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -796,7 +796,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> Iterator()
@@ -804,7 +804,7 @@ public Java.Util.Iterator<E> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#subList(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#subList(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -814,7 +814,7 @@ public Java.Util.List<E> SubList(int arg0, int arg1)
             return IExecute<Java.Util.List<E>>("subList", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#listIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#listIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
         public Java.Util.ListIterator<E> ListIterator()
@@ -822,7 +822,7 @@ public Java.Util.ListIterator<E> ListIterator()
             return IExecuteWithSignature<Java.Util.ListIterator<E>>("listIterator", "()Ljava/util/ListIterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#listIterator(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#listIterator(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.ListIterator"/></returns>
@@ -831,7 +831,7 @@ public Java.Util.ListIterator<E> ListIterator(int arg0)
             return IExecuteWithSignature<Java.Util.ListIterator<E>>("listIterator", "(I)Ljava/util/ListIterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#add(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#add(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -840,14 +840,14 @@ public void Add(int arg0, E arg1)
             IExecute("add", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator<E> Spliterator()
@@ -855,7 +855,7 @@ public Java.Util.Spliterator<E> Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator<E>>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/List.html#replaceAll(java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/List.html#replaceAll(java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.UnaryOperator"/></param>
         public void ReplaceAll(Java.Util.Function.UnaryOperator<E> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/ListIterator.cs b/src/net/Netdroid/Generated/Java/Util/ListIterator.cs
index 1b5b173e7..dc8e628b7 100644
--- a/src/net/Netdroid/Generated/Java/Util/ListIterator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/ListIterator.cs
@@ -46,7 +46,7 @@ public partial class ListIterator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#hasNext()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#hasNext()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNext()
@@ -54,7 +54,7 @@ public bool HasNext()
             return IExecuteWithSignature<bool>("hasNext", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#hasPrevious()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#hasPrevious()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasPrevious()
@@ -62,7 +62,7 @@ public bool HasPrevious()
             return IExecuteWithSignature<bool>("hasPrevious", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#next()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#next()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Next()
@@ -70,7 +70,7 @@ public object Next()
             return IExecuteWithSignature("next", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#previous()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#previous()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Previous()
@@ -78,7 +78,7 @@ public object Previous()
             return IExecuteWithSignature("previous", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#nextIndex()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#nextIndex()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int NextIndex()
@@ -86,7 +86,7 @@ public int NextIndex()
             return IExecuteWithSignature<int>("nextIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#previousIndex()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#previousIndex()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int PreviousIndex()
@@ -94,7 +94,7 @@ public int PreviousIndex()
             return IExecuteWithSignature<int>("previousIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Add(object arg0)
@@ -102,14 +102,14 @@ public void Add(object arg0)
             IExecuteWithSignature("add", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#remove()"/>
         /// </summary>
         public void Remove()
         {
             IExecuteWithSignature("remove", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#set(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#set(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void Set(object arg0)
@@ -170,7 +170,7 @@ public partial class ListIterator<E> : Java.Util.IListIterator<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#hasNext()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#hasNext()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNext()
@@ -178,7 +178,7 @@ public bool HasNext()
             return IExecuteWithSignature<bool>("hasNext", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#hasPrevious()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#hasPrevious()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasPrevious()
@@ -186,7 +186,7 @@ public bool HasPrevious()
             return IExecuteWithSignature<bool>("hasPrevious", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#next()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#next()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Next()
@@ -194,7 +194,7 @@ public E Next()
             return IExecuteWithSignature<E>("next", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#previous()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#previous()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Previous()
@@ -202,7 +202,7 @@ public E Previous()
             return IExecuteWithSignature<E>("previous", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#nextIndex()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#nextIndex()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int NextIndex()
@@ -210,7 +210,7 @@ public int NextIndex()
             return IExecuteWithSignature<int>("nextIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#previousIndex()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#previousIndex()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int PreviousIndex()
@@ -218,7 +218,7 @@ public int PreviousIndex()
             return IExecuteWithSignature<int>("previousIndex", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Add(E arg0)
@@ -226,14 +226,14 @@ public void Add(E arg0)
             IExecuteWithSignature("add", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#remove()"/>
         /// </summary>
         public void Remove()
         {
             IExecuteWithSignature("remove", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListIterator.html#set(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListIterator.html#set(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void Set(E arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/ListResourceBundle.cs b/src/net/Netdroid/Generated/Java/Util/ListResourceBundle.cs
index 331bb7113..510abde26 100644
--- a/src/net/Netdroid/Generated/Java/Util/ListResourceBundle.cs
+++ b/src/net/Netdroid/Generated/Java/Util/ListResourceBundle.cs
@@ -46,7 +46,7 @@ public partial class ListResourceBundle
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ListResourceBundle.html#handleGetObject(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ListResourceBundle.html#handleGetObject(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Locale.cs b/src/net/Netdroid/Generated/Java/Util/Locale.cs
index c56fe6ada..62a3ce033 100644
--- a/src/net/Netdroid/Generated/Java/Util/Locale.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Locale.cs
@@ -30,7 +30,7 @@ public partial class Locale : Java.Lang.ICloneable, Java.Io.ISerializable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -40,7 +40,7 @@ public Locale(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -49,7 +49,7 @@ public Locale(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public Locale(Java.Lang.String arg0)
@@ -73,145 +73,145 @@ public Locale(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#PRIVATE_USE_EXTENSION"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#PRIVATE_USE_EXTENSION"/>
         /// </summary>
         public static char PRIVATE_USE_EXTENSION { get { if (!_PRIVATE_USE_EXTENSIONReady) { _PRIVATE_USE_EXTENSIONContent = SGetField<char>(LocalBridgeClazz, "PRIVATE_USE_EXTENSION"); _PRIVATE_USE_EXTENSIONReady = true; } return _PRIVATE_USE_EXTENSIONContent; } }
         private static char _PRIVATE_USE_EXTENSIONContent = default;
         private static bool _PRIVATE_USE_EXTENSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#UNICODE_LOCALE_EXTENSION"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#UNICODE_LOCALE_EXTENSION"/>
         /// </summary>
         public static char UNICODE_LOCALE_EXTENSION { get { if (!_UNICODE_LOCALE_EXTENSIONReady) { _UNICODE_LOCALE_EXTENSIONContent = SGetField<char>(LocalBridgeClazz, "UNICODE_LOCALE_EXTENSION"); _UNICODE_LOCALE_EXTENSIONReady = true; } return _UNICODE_LOCALE_EXTENSIONContent; } }
         private static char _UNICODE_LOCALE_EXTENSIONContent = default;
         private static bool _UNICODE_LOCALE_EXTENSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#CANADA"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#CANADA"/>
         /// </summary>
         public static Java.Util.Locale CANADA { get { if (!_CANADAReady) { _CANADAContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "CANADA"); _CANADAReady = true; } return _CANADAContent; } }
         private static Java.Util.Locale _CANADAContent = default;
         private static bool _CANADAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#CANADA_FRENCH"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#CANADA_FRENCH"/>
         /// </summary>
         public static Java.Util.Locale CANADA_FRENCH { get { if (!_CANADA_FRENCHReady) { _CANADA_FRENCHContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "CANADA_FRENCH"); _CANADA_FRENCHReady = true; } return _CANADA_FRENCHContent; } }
         private static Java.Util.Locale _CANADA_FRENCHContent = default;
         private static bool _CANADA_FRENCHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#CHINA"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#CHINA"/>
         /// </summary>
         public static Java.Util.Locale CHINA { get { if (!_CHINAReady) { _CHINAContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "CHINA"); _CHINAReady = true; } return _CHINAContent; } }
         private static Java.Util.Locale _CHINAContent = default;
         private static bool _CHINAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#CHINESE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#CHINESE"/>
         /// </summary>
         public static Java.Util.Locale CHINESE { get { if (!_CHINESEReady) { _CHINESEContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "CHINESE"); _CHINESEReady = true; } return _CHINESEContent; } }
         private static Java.Util.Locale _CHINESEContent = default;
         private static bool _CHINESEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#ENGLISH"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#ENGLISH"/>
         /// </summary>
         public static Java.Util.Locale ENGLISH { get { if (!_ENGLISHReady) { _ENGLISHContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "ENGLISH"); _ENGLISHReady = true; } return _ENGLISHContent; } }
         private static Java.Util.Locale _ENGLISHContent = default;
         private static bool _ENGLISHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#FRANCE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#FRANCE"/>
         /// </summary>
         public static Java.Util.Locale FRANCE { get { if (!_FRANCEReady) { _FRANCEContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "FRANCE"); _FRANCEReady = true; } return _FRANCEContent; } }
         private static Java.Util.Locale _FRANCEContent = default;
         private static bool _FRANCEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#FRENCH"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#FRENCH"/>
         /// </summary>
         public static Java.Util.Locale FRENCH { get { if (!_FRENCHReady) { _FRENCHContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "FRENCH"); _FRENCHReady = true; } return _FRENCHContent; } }
         private static Java.Util.Locale _FRENCHContent = default;
         private static bool _FRENCHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#GERMAN"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#GERMAN"/>
         /// </summary>
         public static Java.Util.Locale GERMAN { get { if (!_GERMANReady) { _GERMANContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "GERMAN"); _GERMANReady = true; } return _GERMANContent; } }
         private static Java.Util.Locale _GERMANContent = default;
         private static bool _GERMANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#GERMANY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#GERMANY"/>
         /// </summary>
         public static Java.Util.Locale GERMANY { get { if (!_GERMANYReady) { _GERMANYContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "GERMANY"); _GERMANYReady = true; } return _GERMANYContent; } }
         private static Java.Util.Locale _GERMANYContent = default;
         private static bool _GERMANYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#ITALIAN"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#ITALIAN"/>
         /// </summary>
         public static Java.Util.Locale ITALIAN { get { if (!_ITALIANReady) { _ITALIANContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "ITALIAN"); _ITALIANReady = true; } return _ITALIANContent; } }
         private static Java.Util.Locale _ITALIANContent = default;
         private static bool _ITALIANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#ITALY"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#ITALY"/>
         /// </summary>
         public static Java.Util.Locale ITALY { get { if (!_ITALYReady) { _ITALYContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "ITALY"); _ITALYReady = true; } return _ITALYContent; } }
         private static Java.Util.Locale _ITALYContent = default;
         private static bool _ITALYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#JAPAN"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#JAPAN"/>
         /// </summary>
         public static Java.Util.Locale JAPAN { get { if (!_JAPANReady) { _JAPANContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "JAPAN"); _JAPANReady = true; } return _JAPANContent; } }
         private static Java.Util.Locale _JAPANContent = default;
         private static bool _JAPANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#JAPANESE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#JAPANESE"/>
         /// </summary>
         public static Java.Util.Locale JAPANESE { get { if (!_JAPANESEReady) { _JAPANESEContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "JAPANESE"); _JAPANESEReady = true; } return _JAPANESEContent; } }
         private static Java.Util.Locale _JAPANESEContent = default;
         private static bool _JAPANESEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#KOREA"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#KOREA"/>
         /// </summary>
         public static Java.Util.Locale KOREA { get { if (!_KOREAReady) { _KOREAContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "KOREA"); _KOREAReady = true; } return _KOREAContent; } }
         private static Java.Util.Locale _KOREAContent = default;
         private static bool _KOREAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#KOREAN"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#KOREAN"/>
         /// </summary>
         public static Java.Util.Locale KOREAN { get { if (!_KOREANReady) { _KOREANContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "KOREAN"); _KOREANReady = true; } return _KOREANContent; } }
         private static Java.Util.Locale _KOREANContent = default;
         private static bool _KOREANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#PRC"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#PRC"/>
         /// </summary>
         public static Java.Util.Locale PRC { get { if (!_PRCReady) { _PRCContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "PRC"); _PRCReady = true; } return _PRCContent; } }
         private static Java.Util.Locale _PRCContent = default;
         private static bool _PRCReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#ROOT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#ROOT"/>
         /// </summary>
         public static Java.Util.Locale ROOT { get { if (!_ROOTReady) { _ROOTContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "ROOT"); _ROOTReady = true; } return _ROOTContent; } }
         private static Java.Util.Locale _ROOTContent = default;
         private static bool _ROOTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#SIMPLIFIED_CHINESE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#SIMPLIFIED_CHINESE"/>
         /// </summary>
         public static Java.Util.Locale SIMPLIFIED_CHINESE { get { if (!_SIMPLIFIED_CHINESEReady) { _SIMPLIFIED_CHINESEContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "SIMPLIFIED_CHINESE"); _SIMPLIFIED_CHINESEReady = true; } return _SIMPLIFIED_CHINESEContent; } }
         private static Java.Util.Locale _SIMPLIFIED_CHINESEContent = default;
         private static bool _SIMPLIFIED_CHINESEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#TAIWAN"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#TAIWAN"/>
         /// </summary>
         public static Java.Util.Locale TAIWAN { get { if (!_TAIWANReady) { _TAIWANContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "TAIWAN"); _TAIWANReady = true; } return _TAIWANContent; } }
         private static Java.Util.Locale _TAIWANContent = default;
         private static bool _TAIWANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#TRADITIONAL_CHINESE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#TRADITIONAL_CHINESE"/>
         /// </summary>
         public static Java.Util.Locale TRADITIONAL_CHINESE { get { if (!_TRADITIONAL_CHINESEReady) { _TRADITIONAL_CHINESEContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "TRADITIONAL_CHINESE"); _TRADITIONAL_CHINESEReady = true; } return _TRADITIONAL_CHINESEContent; } }
         private static Java.Util.Locale _TRADITIONAL_CHINESEContent = default;
         private static bool _TRADITIONAL_CHINESEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#UK"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#UK"/>
         /// </summary>
         public static Java.Util.Locale UK { get { if (!_UKReady) { _UKContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "UK"); _UKReady = true; } return _UKContent; } }
         private static Java.Util.Locale _UKContent = default;
         private static bool _UKReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#US"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#US"/>
         /// </summary>
         public static Java.Util.Locale US { get { if (!_USReady) { _USContent = SGetField<Java.Util.Locale>(LocalBridgeClazz, "US"); _USReady = true; } return _USContent; } }
         private static Java.Util.Locale _USContent = default;
@@ -221,45 +221,33 @@ public Locale(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getAvailableLocales()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#lookupTag(java.util.List,java.util.Collection)"/>
         /// </summary>
-        public static Java.Util.Locale[] AvailableLocales
-        {
-            get { return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDefault()"/> <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#setDefault(java.util.Locale)"/>
-        /// </summary>
-        public static Java.Util.Locale Default
-        {
-            get { return SExecuteWithSignature<Java.Util.Locale>(LocalBridgeClazz, "getDefault", "()Ljava/util/Locale;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/util/Locale;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getISOCountries()"/> 
-        /// </summary>
-        public static Java.Lang.String[] ISOCountries
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String LookupTag(Java.Util.List<Java.Util.Locale.LanguageRange> arg0, Java.Util.Collection<Java.Lang.String> arg1)
         {
-            get { return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getISOCountries", "()[Ljava/lang/String;"); }
+            return SExecute<Java.Lang.String>(LocalBridgeClazz, "lookupTag", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getISOLanguages()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getISOCountries()"/>
         /// </summary>
-        public static Java.Lang.String[] ISOLanguages
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String[] GetISOCountries()
         {
-            get { return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getISOLanguages", "()[Ljava/lang/String;"); }
+            return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getISOCountries", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#lookupTag(java.util.List,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getISOLanguages()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.List"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public static Java.Lang.String LookupTag(Java.Util.List<Java.Util.Locale.LanguageRange> arg0, Java.Util.Collection<Java.Lang.String> arg1)
+        public static Java.Lang.String[] GetISOLanguages()
         {
-            return SExecute<Java.Lang.String>(LocalBridgeClazz, "lookupTag", arg0, arg1);
+            return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getISOLanguages", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#filterTags(java.util.List,java.util.Collection,java.util.Locale.FilteringMode)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#filterTags(java.util.List,java.util.Collection,java.util.Locale.FilteringMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -270,7 +258,7 @@ public static Java.Lang.String LookupTag(Java.Util.List<Java.Util.Locale.Languag
             return SExecute<Java.Util.List<Java.Lang.String>>(LocalBridgeClazz, "filterTags", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#filterTags(java.util.List,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#filterTags(java.util.List,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -280,7 +268,7 @@ public static Java.Lang.String LookupTag(Java.Util.List<Java.Util.Locale.Languag
             return SExecute<Java.Util.List<Java.Lang.String>>(LocalBridgeClazz, "filterTags", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#filter(java.util.List,java.util.Collection,java.util.Locale.FilteringMode)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#filter(java.util.List,java.util.Collection,java.util.Locale.FilteringMode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -291,7 +279,7 @@ public static Java.Lang.String LookupTag(Java.Util.List<Java.Util.Locale.Languag
             return SExecute<Java.Util.List<Java.Util.Locale>>(LocalBridgeClazz, "filter", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#filter(java.util.List,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#filter(java.util.List,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -301,7 +289,7 @@ public static Java.Lang.String LookupTag(Java.Util.List<Java.Util.Locale.Languag
             return SExecute<Java.Util.List<Java.Util.Locale>>(LocalBridgeClazz, "filter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#forLanguageTag(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#forLanguageTag(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Locale"/></returns>
@@ -310,7 +298,15 @@ public static Java.Util.Locale ForLanguageTag(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.Locale>(LocalBridgeClazz, "forLanguageTag", "(Ljava/lang/String;)Ljava/util/Locale;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDefault(java.util.Locale.Category)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDefault()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale GetDefault()
+        {
+            return SExecuteWithSignature<Java.Util.Locale>(LocalBridgeClazz, "getDefault", "()Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDefault(java.util.Locale.Category)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale.Category"/></param>
         /// <returns><see cref="Java.Util.Locale"/></returns>
@@ -319,7 +315,7 @@ public static Java.Util.Locale GetDefault(Java.Util.Locale.Category arg0)
             return SExecuteWithSignature<Java.Util.Locale>(LocalBridgeClazz, "getDefault", "(Ljava/util/Locale$Category;)Ljava/util/Locale;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#lookup(java.util.List,java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#lookup(java.util.List,java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <param name="arg1"><see cref="Java.Util.Collection"/></param>
@@ -329,7 +325,15 @@ public static Java.Util.Locale Lookup(Java.Util.List<Java.Util.Locale.LanguageRa
             return SExecute<Java.Util.Locale>(LocalBridgeClazz, "lookup", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getISOCountries(java.util.Locale.IsoCountryCode)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getAvailableLocales()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public static Java.Util.Locale[] GetAvailableLocales()
+        {
+            return SExecuteWithSignatureArray<Java.Util.Locale>(LocalBridgeClazz, "getAvailableLocales", "()[Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getISOCountries(java.util.Locale.IsoCountryCode)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale.IsoCountryCode"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
@@ -338,7 +342,15 @@ public static Java.Util.Locale Lookup(Java.Util.List<Java.Util.Locale.LanguageRa
             return SExecuteWithSignature<Java.Util.Set<Java.Lang.String>>(LocalBridgeClazz, "getISOCountries", "(Ljava/util/Locale$IsoCountryCode;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#setDefault(java.util.Locale.Category,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#setDefault(java.util.Locale)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        public static void SetDefault(Java.Util.Locale arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/util/Locale;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#setDefault(java.util.Locale.Category,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale.Category"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -351,189 +363,205 @@ public static void SetDefault(Java.Util.Locale.Category arg0, Java.Util.Locale a
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getCountry()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#hasExtensions()"/>
         /// </summary>
-        public Java.Lang.String Country
+        /// <returns><see cref="bool"/></returns>
+        public bool HasExtensions()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCountry", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("hasExtensions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayCountry()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayCountry()"/>
         /// </summary>
-        public Java.Lang.String DisplayCountry
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayCountry()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayCountry", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayCountry", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayLanguage()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayLanguage()"/>
         /// </summary>
-        public Java.Lang.String DisplayLanguage
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayLanguage()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayName()"/>
         /// </summary>
-        public Java.Lang.String DisplayName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayScript()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayVariant()"/>
         /// </summary>
-        public Java.Lang.String DisplayScript
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayVariant()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayScript", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayVariant", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayVariant()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getCountry()"/>
         /// </summary>
-        public Java.Lang.String DisplayVariant
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCountry()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayVariant", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCountry", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getExtensionKeys()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayCountry(java.util.Locale)"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.Character> ExtensionKeys
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayCountry(Java.Util.Locale arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.Character>>("getExtensionKeys", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayCountry", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getISO3Country()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayLanguage(java.util.Locale)"/>
         /// </summary>
-        public Java.Lang.String ISO3Country
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayLanguage(Java.Util.Locale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getISO3Country", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguage", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getISO3Language()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayName(java.util.Locale)"/>
         /// </summary>
-        public Java.Lang.String ISO3Language
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getISO3Language", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getLanguage()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayScript()"/>
         /// </summary>
-        public Java.Lang.String Language
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayScript()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayScript", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getScript()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayScript(java.util.Locale)"/>
         /// </summary>
-        public Java.Lang.String Script
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayScript(Java.Util.Locale arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getScript", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayScript", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getUnicodeLocaleAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getDisplayVariant(java.util.Locale)"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> UnicodeLocaleAttributes
+        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayVariant(Java.Util.Locale arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getUnicodeLocaleAttributes", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayVariant", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getUnicodeLocaleKeys()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getExtension(char)"/>
         /// </summary>
-        public Java.Util.Set<Java.Lang.String> UnicodeLocaleKeys
+        /// <param name="arg0"><see cref="char"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetExtension(char arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getUnicodeLocaleKeys", "()Ljava/util/Set;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getExtension", "(C)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getVariant()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getISO3Country()"/>
         /// </summary>
-        public Java.Lang.String Variant
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Util.MissingResourceException"/>
+        public Java.Lang.String GetISO3Country()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getVariant", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getISO3Country", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#hasExtensions()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getISO3Language()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasExtensions()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Util.MissingResourceException"/>
+        public Java.Lang.String GetISO3Language()
         {
-            return IExecuteWithSignature<bool>("hasExtensions", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getISO3Language", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayCountry(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getLanguage()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayCountry(Java.Util.Locale arg0)
+        public Java.Lang.String GetLanguage()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayCountry", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getLanguage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayLanguage(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getScript()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayLanguage(Java.Util.Locale arg0)
+        public Java.Lang.String GetScript()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayLanguage", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getScript", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayName(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getUnicodeLocaleType(java.lang.String)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
+        public Java.Lang.String GetUnicodeLocaleType(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getUnicodeLocaleType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayScript(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getVariant()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayScript(Java.Util.Locale arg0)
+        public Java.Lang.String GetVariant()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayScript", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getVariant", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getDisplayVariant(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#toLanguageTag()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetDisplayVariant(Java.Util.Locale arg0)
+        public Java.Lang.String ToLanguageTag()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getDisplayVariant", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("toLanguageTag", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getExtension(char)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#stripExtensions()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="char"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetExtension(char arg0)
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale StripExtensions()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getExtension", "(C)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Util.Locale>("stripExtensions", "()Ljava/util/Locale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#getUnicodeLocaleType(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getExtensionKeys()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String GetUnicodeLocaleType(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.Character> GetExtensionKeys()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getUnicodeLocaleType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.Character>>("getExtensionKeys", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#toLanguageTag()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getUnicodeLocaleAttributes()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToLanguageTag()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetUnicodeLocaleAttributes()
         {
-            return IExecuteWithSignature<Java.Lang.String>("toLanguageTag", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getUnicodeLocaleAttributes", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.html#stripExtensions()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Locale.html#getUnicodeLocaleKeys()"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Locale"/></returns>
-        public Java.Util.Locale StripExtensions()
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Lang.String> GetUnicodeLocaleKeys()
         {
-            return IExecuteWithSignature<Java.Util.Locale>("stripExtensions", "()Ljava/util/Locale;");
+            return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("getUnicodeLocaleKeys", "()Ljava/util/Set;");
         }
 
         #endregion
@@ -560,7 +588,7 @@ public partial class Builder
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#build()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#build()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Locale"/></returns>
             public Java.Util.Locale Build()
@@ -568,7 +596,7 @@ public Java.Util.Locale Build()
                 return IExecuteWithSignature<Java.Util.Locale>("build", "()Ljava/util/Locale;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#addUnicodeLocaleAttribute(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#addUnicodeLocaleAttribute(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
@@ -577,7 +605,7 @@ public Java.Util.Locale.Builder AddUnicodeLocaleAttribute(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("addUnicodeLocaleAttribute", "(Ljava/lang/String;)Ljava/util/Locale$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#clear()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#clear()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
             public Java.Util.Locale.Builder Clear()
@@ -585,7 +613,7 @@ public Java.Util.Locale.Builder Clear()
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("clear", "()Ljava/util/Locale$Builder;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#clearExtensions()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#clearExtensions()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
             public Java.Util.Locale.Builder ClearExtensions()
@@ -593,7 +621,7 @@ public Java.Util.Locale.Builder ClearExtensions()
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("clearExtensions", "()Ljava/util/Locale$Builder;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#removeUnicodeLocaleAttribute(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#removeUnicodeLocaleAttribute(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
@@ -602,7 +630,7 @@ public Java.Util.Locale.Builder RemoveUnicodeLocaleAttribute(Java.Lang.String ar
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("removeUnicodeLocaleAttribute", "(Ljava/lang/String;)Ljava/util/Locale$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#setExtension(char,java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#setExtension(char,java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="char"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -612,7 +640,7 @@ public Java.Util.Locale.Builder SetExtension(char arg0, Java.Lang.String arg1)
                 return IExecute<Java.Util.Locale.Builder>("setExtension", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#setLanguage(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#setLanguage(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
@@ -621,7 +649,7 @@ public Java.Util.Locale.Builder SetLanguage(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("setLanguage", "(Ljava/lang/String;)Ljava/util/Locale$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#setLanguageTag(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#setLanguageTag(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
@@ -630,7 +658,7 @@ public Java.Util.Locale.Builder SetLanguageTag(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("setLanguageTag", "(Ljava/lang/String;)Ljava/util/Locale$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#setLocale(java.util.Locale)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#setLocale(java.util.Locale)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
@@ -639,7 +667,7 @@ public Java.Util.Locale.Builder SetLocale(Java.Util.Locale arg0)
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("setLocale", "(Ljava/util/Locale;)Ljava/util/Locale$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#setRegion(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#setRegion(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
@@ -648,7 +676,7 @@ public Java.Util.Locale.Builder SetRegion(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("setRegion", "(Ljava/lang/String;)Ljava/util/Locale$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#setScript(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#setScript(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
@@ -657,7 +685,7 @@ public Java.Util.Locale.Builder SetScript(Java.Lang.String arg0)
                 return IExecuteWithSignature<Java.Util.Locale.Builder>("setScript", "(Ljava/lang/String;)Ljava/util/Locale$Builder;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#setUnicodeLocaleKeyword(java.lang.String,java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#setUnicodeLocaleKeyword(java.lang.String,java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -667,7 +695,7 @@ public Java.Util.Locale.Builder SetUnicodeLocaleKeyword(Java.Lang.String arg0, J
                 return IExecute<Java.Util.Locale.Builder>("setUnicodeLocaleKeyword", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Builder.html#setVariant(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Builder.html#setVariant(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.Builder"/></returns>
@@ -699,13 +727,13 @@ public partial class Category
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Category.html#DISPLAY"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Category.html#DISPLAY"/>
             /// </summary>
             public static Java.Util.Locale.Category DISPLAY { get { if (!_DISPLAYReady) { _DISPLAYContent = SGetField<Java.Util.Locale.Category>(LocalBridgeClazz, "DISPLAY"); _DISPLAYReady = true; } return _DISPLAYContent; } }
             private static Java.Util.Locale.Category _DISPLAYContent = default;
             private static bool _DISPLAYReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Category.html#FORMAT"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Category.html#FORMAT"/>
             /// </summary>
             public static Java.Util.Locale.Category FORMAT { get { if (!_FORMATReady) { _FORMATContent = SGetField<Java.Util.Locale.Category>(LocalBridgeClazz, "FORMAT"); _FORMATReady = true; } return _FORMATContent; } }
             private static Java.Util.Locale.Category _FORMATContent = default;
@@ -715,7 +743,7 @@ public partial class Category
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Category.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Category.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.Category"/></returns>
@@ -724,7 +752,7 @@ public static Java.Util.Locale.Category ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Util.Locale.Category>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/util/Locale$Category;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.Category.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.Category.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Locale.Category"/></returns>
             public static Java.Util.Locale.Category[] Values()
@@ -759,31 +787,31 @@ public partial class FilteringMode
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.FilteringMode.html#AUTOSELECT_FILTERING"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.FilteringMode.html#AUTOSELECT_FILTERING"/>
             /// </summary>
             public static Java.Util.Locale.FilteringMode AUTOSELECT_FILTERING { get { if (!_AUTOSELECT_FILTERINGReady) { _AUTOSELECT_FILTERINGContent = SGetField<Java.Util.Locale.FilteringMode>(LocalBridgeClazz, "AUTOSELECT_FILTERING"); _AUTOSELECT_FILTERINGReady = true; } return _AUTOSELECT_FILTERINGContent; } }
             private static Java.Util.Locale.FilteringMode _AUTOSELECT_FILTERINGContent = default;
             private static bool _AUTOSELECT_FILTERINGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.FilteringMode.html#EXTENDED_FILTERING"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.FilteringMode.html#EXTENDED_FILTERING"/>
             /// </summary>
             public static Java.Util.Locale.FilteringMode EXTENDED_FILTERING { get { if (!_EXTENDED_FILTERINGReady) { _EXTENDED_FILTERINGContent = SGetField<Java.Util.Locale.FilteringMode>(LocalBridgeClazz, "EXTENDED_FILTERING"); _EXTENDED_FILTERINGReady = true; } return _EXTENDED_FILTERINGContent; } }
             private static Java.Util.Locale.FilteringMode _EXTENDED_FILTERINGContent = default;
             private static bool _EXTENDED_FILTERINGReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.FilteringMode.html#IGNORE_EXTENDED_RANGES"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.FilteringMode.html#IGNORE_EXTENDED_RANGES"/>
             /// </summary>
             public static Java.Util.Locale.FilteringMode IGNORE_EXTENDED_RANGES { get { if (!_IGNORE_EXTENDED_RANGESReady) { _IGNORE_EXTENDED_RANGESContent = SGetField<Java.Util.Locale.FilteringMode>(LocalBridgeClazz, "IGNORE_EXTENDED_RANGES"); _IGNORE_EXTENDED_RANGESReady = true; } return _IGNORE_EXTENDED_RANGESContent; } }
             private static Java.Util.Locale.FilteringMode _IGNORE_EXTENDED_RANGESContent = default;
             private static bool _IGNORE_EXTENDED_RANGESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.FilteringMode.html#MAP_EXTENDED_RANGES"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.FilteringMode.html#MAP_EXTENDED_RANGES"/>
             /// </summary>
             public static Java.Util.Locale.FilteringMode MAP_EXTENDED_RANGES { get { if (!_MAP_EXTENDED_RANGESReady) { _MAP_EXTENDED_RANGESContent = SGetField<Java.Util.Locale.FilteringMode>(LocalBridgeClazz, "MAP_EXTENDED_RANGES"); _MAP_EXTENDED_RANGESReady = true; } return _MAP_EXTENDED_RANGESContent; } }
             private static Java.Util.Locale.FilteringMode _MAP_EXTENDED_RANGESContent = default;
             private static bool _MAP_EXTENDED_RANGESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.FilteringMode.html#REJECT_EXTENDED_RANGES"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.FilteringMode.html#REJECT_EXTENDED_RANGES"/>
             /// </summary>
             public static Java.Util.Locale.FilteringMode REJECT_EXTENDED_RANGES { get { if (!_REJECT_EXTENDED_RANGESReady) { _REJECT_EXTENDED_RANGESContent = SGetField<Java.Util.Locale.FilteringMode>(LocalBridgeClazz, "REJECT_EXTENDED_RANGES"); _REJECT_EXTENDED_RANGESReady = true; } return _REJECT_EXTENDED_RANGESContent; } }
             private static Java.Util.Locale.FilteringMode _REJECT_EXTENDED_RANGESContent = default;
@@ -793,7 +821,7 @@ public partial class FilteringMode
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.FilteringMode.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.FilteringMode.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.FilteringMode"/></returns>
@@ -802,7 +830,7 @@ public static Java.Util.Locale.FilteringMode ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Util.Locale.FilteringMode>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/util/Locale$FilteringMode;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.FilteringMode.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.FilteringMode.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Locale.FilteringMode"/></returns>
             public static Java.Util.Locale.FilteringMode[] Values()
@@ -837,19 +865,19 @@ public partial class IsoCountryCode
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.IsoCountryCode.html#PART1_ALPHA2"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.IsoCountryCode.html#PART1_ALPHA2"/>
             /// </summary>
             public static Java.Util.Locale.IsoCountryCode PART1_ALPHA2 { get { if (!_PART1_ALPHA2Ready) { _PART1_ALPHA2Content = SGetField<Java.Util.Locale.IsoCountryCode>(LocalBridgeClazz, "PART1_ALPHA2"); _PART1_ALPHA2Ready = true; } return _PART1_ALPHA2Content; } }
             private static Java.Util.Locale.IsoCountryCode _PART1_ALPHA2Content = default;
             private static bool _PART1_ALPHA2Ready = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.IsoCountryCode.html#PART1_ALPHA3"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.IsoCountryCode.html#PART1_ALPHA3"/>
             /// </summary>
             public static Java.Util.Locale.IsoCountryCode PART1_ALPHA3 { get { if (!_PART1_ALPHA3Ready) { _PART1_ALPHA3Content = SGetField<Java.Util.Locale.IsoCountryCode>(LocalBridgeClazz, "PART1_ALPHA3"); _PART1_ALPHA3Ready = true; } return _PART1_ALPHA3Content; } }
             private static Java.Util.Locale.IsoCountryCode _PART1_ALPHA3Content = default;
             private static bool _PART1_ALPHA3Ready = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.IsoCountryCode.html#PART3"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.IsoCountryCode.html#PART3"/>
             /// </summary>
             public static Java.Util.Locale.IsoCountryCode PART3 { get { if (!_PART3Ready) { _PART3Content = SGetField<Java.Util.Locale.IsoCountryCode>(LocalBridgeClazz, "PART3"); _PART3Ready = true; } return _PART3Content; } }
             private static Java.Util.Locale.IsoCountryCode _PART3Content = default;
@@ -859,7 +887,7 @@ public partial class IsoCountryCode
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.IsoCountryCode.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.IsoCountryCode.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Locale.IsoCountryCode"/></returns>
@@ -868,7 +896,7 @@ public static Java.Util.Locale.IsoCountryCode ValueOf(Java.Lang.String arg0)
                 return SExecuteWithSignature<Java.Util.Locale.IsoCountryCode>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/util/Locale$IsoCountryCode;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.IsoCountryCode.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.IsoCountryCode.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Locale.IsoCountryCode"/></returns>
             public static Java.Util.Locale.IsoCountryCode[] Values()
@@ -895,7 +923,7 @@ public partial class LanguageRange
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#%3Cinit%3E(java.lang.String,double)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#%3Cinit%3E(java.lang.String,double)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="double"/></param>
@@ -904,7 +932,7 @@ public LanguageRange(Java.Lang.String arg0, double arg1)
             {
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#%3Cinit%3E(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#%3Cinit%3E(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             public LanguageRange(Java.Lang.String arg0)
@@ -920,13 +948,13 @@ public LanguageRange(Java.Lang.String arg0)
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#MAX_WEIGHT"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#MAX_WEIGHT"/>
             /// </summary>
             public static double MAX_WEIGHT { get { if (!_MAX_WEIGHTReady) { _MAX_WEIGHTContent = SGetField<double>(LocalBridgeClazz, "MAX_WEIGHT"); _MAX_WEIGHTReady = true; } return _MAX_WEIGHTContent; } }
             private static double _MAX_WEIGHTContent = default;
             private static bool _MAX_WEIGHTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#MIN_WEIGHT"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#MIN_WEIGHT"/>
             /// </summary>
             public static double MIN_WEIGHT { get { if (!_MIN_WEIGHTReady) { _MIN_WEIGHTContent = SGetField<double>(LocalBridgeClazz, "MIN_WEIGHT"); _MIN_WEIGHTReady = true; } return _MIN_WEIGHTContent; } }
             private static double _MIN_WEIGHTContent = default;
@@ -936,7 +964,7 @@ public LanguageRange(Java.Lang.String arg0)
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#mapEquivalents(java.util.List,java.util.Map)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#mapEquivalents(java.util.List,java.util.Map)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.List"/></param>
             /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -946,7 +974,7 @@ public LanguageRange(Java.Lang.String arg0)
                 return SExecute<Java.Util.List<Java.Util.Locale.LanguageRange>>(LocalBridgeClazz, "mapEquivalents", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#parse(java.lang.String,java.util.Map)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#parse(java.lang.String,java.util.Map)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -956,7 +984,7 @@ public LanguageRange(Java.Lang.String arg0)
                 return SExecute<Java.Util.List<Java.Util.Locale.LanguageRange>>(LocalBridgeClazz, "parse", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#parse(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#parse(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.List"/></returns>
@@ -969,18 +997,20 @@ public LanguageRange(Java.Lang.String arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#getRange()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#getWeight()"/>
             /// </summary>
-            public Java.Lang.String Range
+            /// <returns><see cref="double"/></returns>
+            public double GetWeight()
             {
-                get { return IExecuteWithSignature<Java.Lang.String>("getRange", "()Ljava/lang/String;"); }
+                return IExecuteWithSignature<double>("getWeight", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Locale.LanguageRange.html#getWeight()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/Locale.LanguageRange.html#getRange()"/>
             /// </summary>
-            public double Weight
+            /// <returns><see cref="Java.Lang.String"/></returns>
+            public Java.Lang.String GetRange()
             {
-                get { return IExecuteWithSignature<double>("getWeight", "()D"); }
+                return IExecuteWithSignature<Java.Lang.String>("getRange", "()Ljava/lang/String;");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Logging/AllPackageClasses.cs
index f21bd8015..87fecbacd 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Logging
 {
     #region ConsoleHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ConsoleHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/ConsoleHandler.html"/>
     /// </summary>
     public partial class ConsoleHandler : Java.Util.Logging.StreamHandler
     {
@@ -72,7 +72,7 @@ public ConsoleHandler(params object[] args) : base(args) { }
 
     #region ErrorManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ErrorManager.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/ErrorManager.html"/>
     /// </summary>
     public partial class ErrorManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ErrorManager>
     {
@@ -116,7 +116,7 @@ public ErrorManager(params object[] args) : base(args) { }
 
     #region FileHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/FileHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/FileHandler.html"/>
     /// </summary>
     public partial class FileHandler : Java.Util.Logging.StreamHandler
     {
@@ -160,7 +160,7 @@ public FileHandler(params object[] args) : base(args) { }
 
     #region Filter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Filter.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/Filter.html"/>
     /// </summary>
     public partial class Filter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter>
     {
@@ -168,12 +168,12 @@ public partial class Filter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Filter>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Filter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Filter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Filter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -206,7 +206,7 @@ public Filter(params object[] args) : base(args) { }
 
     #region Formatter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Formatter.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/Formatter.html"/>
     /// </summary>
     public partial class Formatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Formatter>
     {
@@ -214,12 +214,12 @@ public partial class Formatter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Formatt
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Formatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Formatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Formatter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Formatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Formatter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Formatter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -252,7 +252,7 @@ public Formatter(params object[] args) : base(args) { }
 
     #region Handler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html"/>
     /// </summary>
     public partial class Handler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Handler>
     {
@@ -260,12 +260,12 @@ public partial class Handler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Handler>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Handler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Handler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Handler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Handler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Handler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Handler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -298,7 +298,7 @@ public Handler(params object[] args) : base(args) { }
 
     #region Level
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/Level.html"/>
     /// </summary>
     public partial class Level : Java.Io.Serializable
     {
@@ -342,7 +342,7 @@ public Level(params object[] args) : base(args) { }
 
     #region Logger
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html"/>
     /// </summary>
     public partial class Logger : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Logger>
     {
@@ -386,21 +386,21 @@ public Logger(params object[] args) : base(args) { }
 
     #region LoggingMXBean
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LoggingMXBean.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/LoggingMXBean.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LoggingMXBean : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LoggingMXBean>
     {
         const string _bridgeClassName = "java.util.logging.LoggingMXBean";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LoggingMXBean class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LoggingMXBean class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LoggingMXBean() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LoggingMXBean class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LoggingMXBean class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LoggingMXBean(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -433,7 +433,7 @@ public LoggingMXBean(params object[] args) : base(args) { }
 
     #region LoggingPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LoggingPermission.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/LoggingPermission.html"/>
     /// </summary>
     public partial class LoggingPermission : Java.Security.BasicPermission
     {
@@ -477,7 +477,7 @@ public LoggingPermission(params object[] args) : base(args) { }
 
     #region LogManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html"/>
     /// </summary>
     public partial class LogManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LogManager>
     {
@@ -521,7 +521,7 @@ public LogManager(params object[] args) : base(args) { }
 
     #region LogRecord
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html"/>
     /// </summary>
     public partial class LogRecord : Java.Io.Serializable
     {
@@ -565,7 +565,7 @@ public LogRecord(params object[] args) : base(args) { }
 
     #region MemoryHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/MemoryHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/MemoryHandler.html"/>
     /// </summary>
     public partial class MemoryHandler : Java.Util.Logging.Handler
     {
@@ -609,7 +609,7 @@ public MemoryHandler(params object[] args) : base(args) { }
 
     #region SimpleFormatter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/SimpleFormatter.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/SimpleFormatter.html"/>
     /// </summary>
     public partial class SimpleFormatter : Java.Util.Logging.Formatter
     {
@@ -653,7 +653,7 @@ public SimpleFormatter(params object[] args) : base(args) { }
 
     #region SocketHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/SocketHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/SocketHandler.html"/>
     /// </summary>
     public partial class SocketHandler : Java.Util.Logging.StreamHandler
     {
@@ -697,7 +697,7 @@ public SocketHandler(params object[] args) : base(args) { }
 
     #region StreamHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/StreamHandler.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/StreamHandler.html"/>
     /// </summary>
     public partial class StreamHandler : Java.Util.Logging.Handler
     {
@@ -741,7 +741,7 @@ public StreamHandler(params object[] args) : base(args) { }
 
     #region XMLFormatter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/XMLFormatter.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/logging/XMLFormatter.html"/>
     /// </summary>
     public partial class XMLFormatter : Java.Util.Logging.Formatter
     {
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/ErrorManager.cs b/src/net/Netdroid/Generated/Java/Util/Logging/ErrorManager.cs
index d0cfad870..efbc6712d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/ErrorManager.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/ErrorManager.cs
@@ -38,37 +38,37 @@ public partial class ErrorManager
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ErrorManager.html#CLOSE_FAILURE"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/ErrorManager.html#CLOSE_FAILURE"/>
         /// </summary>
         public static int CLOSE_FAILURE { get { if (!_CLOSE_FAILUREReady) { _CLOSE_FAILUREContent = SGetField<int>(LocalBridgeClazz, "CLOSE_FAILURE"); _CLOSE_FAILUREReady = true; } return _CLOSE_FAILUREContent; } }
         private static int _CLOSE_FAILUREContent = default;
         private static bool _CLOSE_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ErrorManager.html#FLUSH_FAILURE"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/ErrorManager.html#FLUSH_FAILURE"/>
         /// </summary>
         public static int FLUSH_FAILURE { get { if (!_FLUSH_FAILUREReady) { _FLUSH_FAILUREContent = SGetField<int>(LocalBridgeClazz, "FLUSH_FAILURE"); _FLUSH_FAILUREReady = true; } return _FLUSH_FAILUREContent; } }
         private static int _FLUSH_FAILUREContent = default;
         private static bool _FLUSH_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ErrorManager.html#FORMAT_FAILURE"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/ErrorManager.html#FORMAT_FAILURE"/>
         /// </summary>
         public static int FORMAT_FAILURE { get { if (!_FORMAT_FAILUREReady) { _FORMAT_FAILUREContent = SGetField<int>(LocalBridgeClazz, "FORMAT_FAILURE"); _FORMAT_FAILUREReady = true; } return _FORMAT_FAILUREContent; } }
         private static int _FORMAT_FAILUREContent = default;
         private static bool _FORMAT_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ErrorManager.html#GENERIC_FAILURE"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/ErrorManager.html#GENERIC_FAILURE"/>
         /// </summary>
         public static int GENERIC_FAILURE { get { if (!_GENERIC_FAILUREReady) { _GENERIC_FAILUREContent = SGetField<int>(LocalBridgeClazz, "GENERIC_FAILURE"); _GENERIC_FAILUREReady = true; } return _GENERIC_FAILUREContent; } }
         private static int _GENERIC_FAILUREContent = default;
         private static bool _GENERIC_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ErrorManager.html#OPEN_FAILURE"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/ErrorManager.html#OPEN_FAILURE"/>
         /// </summary>
         public static int OPEN_FAILURE { get { if (!_OPEN_FAILUREReady) { _OPEN_FAILUREContent = SGetField<int>(LocalBridgeClazz, "OPEN_FAILURE"); _OPEN_FAILUREReady = true; } return _OPEN_FAILUREContent; } }
         private static int _OPEN_FAILUREContent = default;
         private static bool _OPEN_FAILUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ErrorManager.html#WRITE_FAILURE"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/ErrorManager.html#WRITE_FAILURE"/>
         /// </summary>
         public static int WRITE_FAILURE { get { if (!_WRITE_FAILUREReady) { _WRITE_FAILUREContent = SGetField<int>(LocalBridgeClazz, "WRITE_FAILURE"); _WRITE_FAILUREReady = true; } return _WRITE_FAILUREContent; } }
         private static int _WRITE_FAILUREContent = default;
@@ -82,7 +82,7 @@ public partial class ErrorManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/ErrorManager.html#error(java.lang.String,java.lang.Exception,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/ErrorManager.html#error(java.lang.String,java.lang.Exception,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Exception"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/FileHandler.cs b/src/net/Netdroid/Generated/Java/Util/Logging/FileHandler.cs
index 96862bcdb..66ca286d1 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/FileHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/FileHandler.cs
@@ -30,7 +30,7 @@ public partial class FileHandler
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -41,7 +41,7 @@ public FileHandler(Java.Lang.String arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String,int,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String,int,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -54,7 +54,7 @@ public FileHandler(Java.Lang.String arg0, int arg1, int arg2, bool arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -66,7 +66,7 @@ public FileHandler(Java.Lang.String arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String,long,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String,long,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -78,7 +78,7 @@ public FileHandler(Java.Lang.String arg0, long arg1, int arg2, bool arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/FileHandler.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/Filter.cs b/src/net/Netdroid/Generated/Java/Util/Logging/Filter.cs
index f6dcf9f59..910f1e211 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/Filter.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/Filter.cs
@@ -64,7 +64,7 @@ public partial class Filter : Java.Util.Logging.IFilter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Filter.html#isLoggable(java.util.logging.LogRecord)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Filter.html#isLoggable(java.util.logging.LogRecord)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.LogRecord"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/Formatter.cs b/src/net/Netdroid/Generated/Java/Util/Logging/Formatter.cs
index b50337d87..c1006d186 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/Formatter.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/Formatter.cs
@@ -46,7 +46,7 @@ public partial class Formatter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Formatter.html#format(java.util.logging.LogRecord)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Formatter.html#format(java.util.logging.LogRecord)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.LogRecord"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -55,7 +55,7 @@ public Java.Lang.String Format(Java.Util.Logging.LogRecord arg0)
             return IExecuteWithSignature<Java.Lang.String>("format", "(Ljava/util/logging/LogRecord;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Formatter.html#formatMessage(java.util.logging.LogRecord)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Formatter.html#formatMessage(java.util.logging.LogRecord)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.LogRecord"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -64,7 +64,7 @@ public Java.Lang.String FormatMessage(Java.Util.Logging.LogRecord arg0)
             return IExecuteWithSignature<Java.Lang.String>("formatMessage", "(Ljava/util/logging/LogRecord;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Formatter.html#getHead(java.util.logging.Handler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Formatter.html#getHead(java.util.logging.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Handler"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -73,7 +73,7 @@ public Java.Lang.String GetHead(Java.Util.Logging.Handler arg0)
             return IExecuteWithSignature<Java.Lang.String>("getHead", "(Ljava/util/logging/Handler;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Formatter.html#getTail(java.util.logging.Handler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Formatter.html#getTail(java.util.logging.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Handler"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/Handler.cs b/src/net/Netdroid/Generated/Java/Util/Logging/Handler.cs
index 9fc933251..08ba37ddd 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/Handler.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/Handler.cs
@@ -46,71 +46,121 @@ public partial class Handler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#getEncoding()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#setEncoding(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#close()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public void Close()
+        {
+            IExecuteWithSignature("close", "()V");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#flush()"/>
+        /// </summary>
+        public void Flush()
+        {
+            IExecuteWithSignature("flush", "()V");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#publish(java.util.logging.LogRecord)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Logging.LogRecord"/></param>
+        public void Publish(Java.Util.Logging.LogRecord arg0)
+        {
+            IExecuteWithSignature("publish", "(Ljava/util/logging/LogRecord;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#isLoggable(java.util.logging.LogRecord)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Logging.LogRecord"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLoggable(Java.Util.Logging.LogRecord arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isLoggable", "(Ljava/util/logging/LogRecord;)Z", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#getEncoding()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#getErrorManager()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#setErrorManager(java.util.logging.ErrorManager)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#getErrorManager()"/>
         /// </summary>
-        public Java.Util.Logging.ErrorManager ErrorManager
+        /// <returns><see cref="Java.Util.Logging.ErrorManager"/></returns>
+        public Java.Util.Logging.ErrorManager GetErrorManager()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.ErrorManager>("getErrorManager", "()Ljava/util/logging/ErrorManager;"); } set { IExecuteWithSignature("setErrorManager", "(Ljava/util/logging/ErrorManager;)V", value); }
+            return IExecuteWithSignature<Java.Util.Logging.ErrorManager>("getErrorManager", "()Ljava/util/logging/ErrorManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#getFilter()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#setFilter(java.util.logging.Filter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#getFilter()"/>
         /// </summary>
-        public Java.Util.Logging.Filter Filter
+        /// <returns><see cref="Java.Util.Logging.Filter"/></returns>
+        public Java.Util.Logging.Filter GetFilter()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Filter>("getFilter", "()Ljava/util/logging/Filter;"); } set { IExecuteWithSignature("setFilter", "(Ljava/util/logging/Filter;)V", value); }
+            return IExecuteWithSignature<Java.Util.Logging.Filter>("getFilter", "()Ljava/util/logging/Filter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#getFormatter()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#setFormatter(java.util.logging.Formatter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#getFormatter()"/>
         /// </summary>
-        public Java.Util.Logging.Formatter Formatter
+        /// <returns><see cref="Java.Util.Logging.Formatter"/></returns>
+        public Java.Util.Logging.Formatter GetFormatter()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Formatter>("getFormatter", "()Ljava/util/logging/Formatter;"); } set { IExecuteWithSignature("setFormatter", "(Ljava/util/logging/Formatter;)V", value); }
+            return IExecuteWithSignature<Java.Util.Logging.Formatter>("getFormatter", "()Ljava/util/logging/Formatter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#getLevel()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#setLevel(java.util.logging.Level)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#getLevel()"/>
         /// </summary>
-        public Java.Util.Logging.Level Level
+        /// <returns><see cref="Java.Util.Logging.Level"/></returns>
+        public Java.Util.Logging.Level GetLevel()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Level>("getLevel", "()Ljava/util/logging/Level;"); } set { IExecuteWithSignature("setLevel", "(Ljava/util/logging/Level;)V", value); }
+            return IExecuteWithSignature<Java.Util.Logging.Level>("getLevel", "()Ljava/util/logging/Level;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#setEncoding(java.lang.String)"/>
         /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Lang.SecurityException"/>
-        public void Close()
+        /// <exception cref="Java.Io.UnsupportedEncodingException"/>
+        public void SetEncoding(Java.Lang.String arg0)
         {
-            IExecuteWithSignature("close", "()V");
+            IExecute("setEncoding", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#flush()"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#setErrorManager(java.util.logging.ErrorManager)"/>
         /// </summary>
-        public void Flush()
+        /// <param name="arg0"><see cref="Java.Util.Logging.ErrorManager"/></param>
+        public void SetErrorManager(Java.Util.Logging.ErrorManager arg0)
         {
-            IExecuteWithSignature("flush", "()V");
+            IExecute("setErrorManager", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#publish(java.util.logging.LogRecord)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#setFilter(java.util.logging.Filter)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Logging.LogRecord"/></param>
-        public void Publish(Java.Util.Logging.LogRecord arg0)
+        /// <param name="arg0"><see cref="Java.Util.Logging.Filter"/></param>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public void SetFilter(Java.Util.Logging.Filter arg0)
         {
-            IExecuteWithSignature("publish", "(Ljava/util/logging/LogRecord;)V", arg0);
+            IExecute("setFilter", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Handler.html#isLoggable(java.util.logging.LogRecord)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#setFormatter(java.util.logging.Formatter)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Logging.LogRecord"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLoggable(Java.Util.Logging.LogRecord arg0)
+        /// <param name="arg0"><see cref="Java.Util.Logging.Formatter"/></param>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public void SetFormatter(Java.Util.Logging.Formatter arg0)
         {
-            return IExecuteWithSignature<bool>("isLoggable", "(Ljava/util/logging/LogRecord;)Z", arg0);
+            IExecute("setFormatter", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Handler.html#setLevel(java.util.logging.Level)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public void SetLevel(Java.Util.Logging.Level arg0)
+        {
+            IExecute("setLevel", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/Level.cs b/src/net/Netdroid/Generated/Java/Util/Logging/Level.cs
index fc4914490..e3d0c8c1f 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/Level.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/Level.cs
@@ -38,55 +38,55 @@ public partial class Level
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#ALL"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#ALL"/>
         /// </summary>
         public static Java.Util.Logging.Level ALL { get { if (!_ALLReady) { _ALLContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "ALL"); _ALLReady = true; } return _ALLContent; } }
         private static Java.Util.Logging.Level _ALLContent = default;
         private static bool _ALLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#CONFIG"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#CONFIG"/>
         /// </summary>
         public static Java.Util.Logging.Level CONFIG { get { if (!_CONFIGReady) { _CONFIGContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "CONFIG"); _CONFIGReady = true; } return _CONFIGContent; } }
         private static Java.Util.Logging.Level _CONFIGContent = default;
         private static bool _CONFIGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#FINE"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#FINE"/>
         /// </summary>
         public static Java.Util.Logging.Level FINE { get { if (!_FINEReady) { _FINEContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "FINE"); _FINEReady = true; } return _FINEContent; } }
         private static Java.Util.Logging.Level _FINEContent = default;
         private static bool _FINEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#FINER"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#FINER"/>
         /// </summary>
         public static Java.Util.Logging.Level FINER { get { if (!_FINERReady) { _FINERContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "FINER"); _FINERReady = true; } return _FINERContent; } }
         private static Java.Util.Logging.Level _FINERContent = default;
         private static bool _FINERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#FINEST"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#FINEST"/>
         /// </summary>
         public static Java.Util.Logging.Level FINEST { get { if (!_FINESTReady) { _FINESTContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "FINEST"); _FINESTReady = true; } return _FINESTContent; } }
         private static Java.Util.Logging.Level _FINESTContent = default;
         private static bool _FINESTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#INFO"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#INFO"/>
         /// </summary>
         public static Java.Util.Logging.Level INFO { get { if (!_INFOReady) { _INFOContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "INFO"); _INFOReady = true; } return _INFOContent; } }
         private static Java.Util.Logging.Level _INFOContent = default;
         private static bool _INFOReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#OFF"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#OFF"/>
         /// </summary>
         public static Java.Util.Logging.Level OFF { get { if (!_OFFReady) { _OFFContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "OFF"); _OFFReady = true; } return _OFFContent; } }
         private static Java.Util.Logging.Level _OFFContent = default;
         private static bool _OFFReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#SEVERE"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#SEVERE"/>
         /// </summary>
         public static Java.Util.Logging.Level SEVERE { get { if (!_SEVEREReady) { _SEVEREContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "SEVERE"); _SEVEREReady = true; } return _SEVEREContent; } }
         private static Java.Util.Logging.Level _SEVEREContent = default;
         private static bool _SEVEREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#WARNING"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#WARNING"/>
         /// </summary>
         public static Java.Util.Logging.Level WARNING { get { if (!_WARNINGReady) { _WARNINGContent = SGetField<Java.Util.Logging.Level>(LocalBridgeClazz, "WARNING"); _WARNINGReady = true; } return _WARNINGContent; } }
         private static Java.Util.Logging.Level _WARNINGContent = default;
@@ -96,7 +96,7 @@ public partial class Level
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Logging.Level"/></returns>
@@ -110,33 +110,36 @@ public static Java.Util.Logging.Level Parse(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#getLocalizedName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#intValue()"/>
         /// </summary>
-        public Java.Lang.String LocalizedName
+        /// <returns><see cref="int"/></returns>
+        public int IntValue()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocalizedName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("intValue", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#getLocalizedName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLocalizedName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getLocalizedName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#getResourceBundleName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#getName()"/>
         /// </summary>
-        public Java.Lang.String ResourceBundleName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResourceBundleName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Level.html#intValue()"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Level.html#getResourceBundleName()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int IntValue()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResourceBundleName()
         {
-            return IExecuteWithSignature<int>("intValue", "()I");
+            return IExecuteWithSignature<Java.Lang.String>("getResourceBundleName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/LogManager.cs b/src/net/Netdroid/Generated/Java/Util/Logging/LogManager.cs
index 160f3a4bd..8432f4619 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/LogManager.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/LogManager.cs
@@ -38,7 +38,7 @@ public partial class LogManager
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#LOGGING_MXBEAN_NAME"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#LOGGING_MXBEAN_NAME"/>
         /// </summary>
         public static Java.Lang.String LOGGING_MXBEAN_NAME { get { if (!_LOGGING_MXBEAN_NAMEReady) { _LOGGING_MXBEAN_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "LOGGING_MXBEAN_NAME"); _LOGGING_MXBEAN_NAMEReady = true; } return _LOGGING_MXBEAN_NAMEContent; } }
         private static Java.Lang.String _LOGGING_MXBEAN_NAMEContent = default;
@@ -48,33 +48,28 @@ public partial class LogManager
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#getLogManager()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#getLogManager()"/>
         /// </summary>
-        public static Java.Util.Logging.LogManager GetLogManager
+        /// <returns><see cref="Java.Util.Logging.LogManager"/></returns>
+        public static Java.Util.Logging.LogManager GetLogManager()
         {
-            get { return SExecuteWithSignature<Java.Util.Logging.LogManager>(LocalBridgeClazz, "getLogManager", "()Ljava/util/logging/LogManager;"); }
+            return SExecuteWithSignature<Java.Util.Logging.LogManager>(LocalBridgeClazz, "getLogManager", "()Ljava/util/logging/LogManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#getLoggingMXBean()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#getLoggingMXBean()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Java.Util.Logging.LoggingMXBean LoggingMXBean
+        /// <returns><see cref="Java.Util.Logging.LoggingMXBean"/></returns>
+        [global::System.Obsolete()]
+        public static Java.Util.Logging.LoggingMXBean GetLoggingMXBean()
         {
-            get { return SExecuteWithSignature<Java.Util.Logging.LoggingMXBean>(LocalBridgeClazz, "getLoggingMXBean", "()Ljava/util/logging/LoggingMXBean;"); }
+            return SExecuteWithSignature<Java.Util.Logging.LoggingMXBean>(LocalBridgeClazz, "getLoggingMXBean", "()Ljava/util/logging/LoggingMXBean;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#getLoggerNames()"/> 
-        /// </summary>
-        public Java.Util.Enumeration<Java.Lang.String> LoggerNames
-        {
-            get { return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getLoggerNames", "()Ljava/util/Enumeration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#addLogger(java.util.logging.Logger)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#addLogger(java.util.logging.Logger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Logger"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -83,7 +78,7 @@ public bool AddLogger(Java.Util.Logging.Logger arg0)
             return IExecuteWithSignature<bool>("addLogger", "(Ljava/util/logging/Logger;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -92,7 +87,15 @@ public Java.Lang.String GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#getLogger(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#getLoggerNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<Java.Lang.String> GetLoggerNames()
+        {
+            return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getLoggerNames", "()Ljava/util/Enumeration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#getLogger(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Logging.Logger"/></returns>
@@ -101,7 +104,7 @@ public Java.Util.Logging.Logger GetLogger(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Logging.Logger>("getLogger", "(Ljava/lang/String;)Ljava/util/logging/Logger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#addConfigurationListener(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#addConfigurationListener(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Logging.LogManager"/></returns>
@@ -110,16 +113,15 @@ public Java.Util.Logging.LogManager AddConfigurationListener(Java.Lang.Runnable
             return IExecuteWithSignature<Java.Util.Logging.LogManager>("addConfigurationListener", "(Ljava/lang/Runnable;)Ljava/util/logging/LogManager;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#checkAccess()"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#checkAccess()"/>
         /// </summary>
         /// <exception cref="Java.Lang.SecurityException"/>
-        [System.Obsolete()]
         public void CheckAccess()
         {
             IExecuteWithSignature("checkAccess", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#readConfiguration()"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#readConfiguration()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         /// <exception cref="Java.Lang.SecurityException"/>
@@ -128,7 +130,7 @@ public void ReadConfiguration()
             IExecuteWithSignature("readConfiguration", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#readConfiguration(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#readConfiguration(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -138,7 +140,7 @@ public void ReadConfiguration(Java.Io.InputStream arg0)
             IExecuteWithSignature("readConfiguration", "(Ljava/io/InputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#removeConfigurationListener(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#removeConfigurationListener(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         public void RemoveConfigurationListener(Java.Lang.Runnable arg0)
@@ -146,7 +148,7 @@ public void RemoveConfigurationListener(Java.Lang.Runnable arg0)
             IExecuteWithSignature("removeConfigurationListener", "(Ljava/lang/Runnable;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#reset()"/>
         /// </summary>
         /// <exception cref="Java.Lang.SecurityException"/>
         public void Reset()
@@ -154,7 +156,7 @@ public void Reset()
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#updateConfiguration(java.io.InputStream,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#updateConfiguration(java.io.InputStream,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -164,7 +166,7 @@ public void UpdateConfiguration(Java.Io.InputStream arg0, Java.Util.Function.Fun
             IExecute("updateConfiguration", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogManager.html#updateConfiguration(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogManager.html#updateConfiguration(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/LogRecord.cs b/src/net/Netdroid/Generated/Java/Util/Logging/LogRecord.cs
index b1a1595c2..56c23afa4 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/LogRecord.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/LogRecord.cs
@@ -30,7 +30,7 @@ public partial class LogRecord
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#%3Cinit%3E(java.util.logging.Level,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#%3Cinit%3E(java.util.logging.Level,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -55,113 +55,213 @@ public LogRecord(Java.Util.Logging.Level arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getInstant()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setInstant(java.time.Instant)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getThreadID()"/>
         /// </summary>
-        public Java.Time.Instant Instant
+        /// <returns><see cref="int"/></returns>
+        public int GetThreadID()
         {
-            get { return IExecuteWithSignature<Java.Time.Instant>("getInstant", "()Ljava/time/Instant;"); } set { IExecuteWithSignature("setInstant", "(Ljava/time/Instant;)V", value); }
+            return IExecuteWithSignature<int>("getThreadID", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getLevel()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setLevel(java.util.logging.Level)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getParameters()"/>
         /// </summary>
-        public Java.Util.Logging.Level Level
+        /// <returns><see cref="object"/></returns>
+        public object[] GetParameters()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Level>("getLevel", "()Ljava/util/logging/Level;"); } set { IExecuteWithSignature("setLevel", "(Ljava/util/logging/Level;)V", value); }
+            return IExecuteWithSignatureArray<object>("getParameters", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getLoggerName()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setLoggerName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getLoggerName()"/>
         /// </summary>
-        public Java.Lang.String LoggerName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLoggerName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLoggerName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setLoggerName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getLoggerName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getLongThreadID()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getMessage()"/>
         /// </summary>
-        public long LongThreadID
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMessage()
         {
-            get { return IExecuteWithSignature<long>("getLongThreadID", "()J"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getMessage()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setMessage(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getResourceBundleName()"/>
         /// </summary>
-        public Java.Lang.String Message
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResourceBundleName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setMessage", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getResourceBundleName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getMillis()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setMillis(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getSourceClassName()"/>
         /// </summary>
-        [System.Obsolete()]
-        public long Millis
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSourceClassName()
         {
-            get { return IExecuteWithSignature<long>("getMillis", "()J"); } set { IExecuteWithSignature("setMillis", "(J)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSourceClassName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getParameters()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setParameters(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getSourceMethodName()"/>
         /// </summary>
-        public object[] Parameters
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSourceMethodName()
         {
-            get { return IExecuteWithSignatureArray<object>("getParameters", "()[Ljava/lang/Object;"); } set { IExecuteWithSignature("setParameters", "([Ljava/lang/Object;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSourceMethodName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getResourceBundle()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setResourceBundle(java.util.ResourceBundle)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getThrown()"/>
         /// </summary>
-        public Java.Util.ResourceBundle ResourceBundle
+        /// <returns><see cref="Java.Lang.Throwable"/></returns>
+        public Java.Lang.Throwable GetThrown()
         {
-            get { return IExecuteWithSignature<Java.Util.ResourceBundle>("getResourceBundle", "()Ljava/util/ResourceBundle;"); } set { IExecuteWithSignature("setResourceBundle", "(Ljava/util/ResourceBundle;)V", value); }
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getThrown", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getResourceBundleName()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setResourceBundleName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getInstant()"/>
         /// </summary>
-        public Java.Lang.String ResourceBundleName
+        /// <returns><see cref="Java.Time.Instant"/></returns>
+        public Java.Time.Instant GetInstant()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResourceBundleName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setResourceBundleName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Time.Instant>("getInstant", "()Ljava/time/Instant;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getSequenceNumber()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setSequenceNumber(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getLevel()"/>
         /// </summary>
-        public long SequenceNumber
+        /// <returns><see cref="Java.Util.Logging.Level"/></returns>
+        public Java.Util.Logging.Level GetLevel()
         {
-            get { return IExecuteWithSignature<long>("getSequenceNumber", "()J"); } set { IExecuteWithSignature("setSequenceNumber", "(J)V", value); }
+            return IExecuteWithSignature<Java.Util.Logging.Level>("getLevel", "()Ljava/util/logging/Level;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getSourceClassName()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setSourceClassName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getResourceBundle()"/>
         /// </summary>
-        public Java.Lang.String SourceClassName
+        /// <returns><see cref="Java.Util.ResourceBundle"/></returns>
+        public Java.Util.ResourceBundle GetResourceBundle()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSourceClassName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSourceClassName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Util.ResourceBundle>("getResourceBundle", "()Ljava/util/ResourceBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getSourceMethodName()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setSourceMethodName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getMillis()"/>
         /// </summary>
-        public Java.Lang.String SourceMethodName
+        /// <returns><see cref="long"/></returns>
+        public long GetMillis()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSourceMethodName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSourceMethodName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<long>("getMillis", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getThreadID()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setThreadID(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#getSequenceNumber()"/>
         /// </summary>
-        [System.Obsolete()]
-        public int ThreadID
+        /// <returns><see cref="long"/></returns>
+        public long GetSequenceNumber()
         {
-            get { return IExecuteWithSignature<int>("getThreadID", "()I"); } set { IExecuteWithSignature("setThreadID", "(I)V", value); }
+            return IExecuteWithSignature<long>("getSequenceNumber", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#getThrown()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setThrown(java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setInstant(java.time.Instant)"/>
         /// </summary>
-        public Java.Lang.Throwable Thrown
+        /// <param name="arg0"><see cref="Java.Time.Instant"/></param>
+        public void SetInstant(Java.Time.Instant arg0)
         {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getThrown", "()Ljava/lang/Throwable;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Lang.Throwable>(obj); } set { IExecuteWithSignature("setThrown", "(Ljava/lang/Throwable;)V", value); }
+            IExecuteWithSignature("setInstant", "(Ljava/time/Instant;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LogRecord.html#setLongThreadID(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setLevel(java.util.logging.Level)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
+        public void SetLevel(Java.Util.Logging.Level arg0)
+        {
+            IExecuteWithSignature("setLevel", "(Ljava/util/logging/Level;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setLoggerName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetLoggerName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setLoggerName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setMessage(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetMessage(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setMessage", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setMillis(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        [global::System.Obsolete()]
+        public void SetMillis(long arg0)
+        {
+            IExecuteWithSignature("setMillis", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setParameters(java.lang.Object[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="object"/></param>
+        public void SetParameters(object[] arg0)
+        {
+            IExecuteWithSignature("setParameters", "([Ljava/lang/Object;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setResourceBundle(java.util.ResourceBundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.ResourceBundle"/></param>
+        public void SetResourceBundle(Java.Util.ResourceBundle arg0)
+        {
+            IExecuteWithSignature("setResourceBundle", "(Ljava/util/ResourceBundle;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setResourceBundleName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetResourceBundleName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setResourceBundleName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setSequenceNumber(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="Java.Util.Logging.LogRecord"/></returns>
-        public Java.Util.Logging.LogRecord SetLongThreadID(long arg0)
+        public void SetSequenceNumber(long arg0)
+        {
+            IExecuteWithSignature("setSequenceNumber", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setSourceClassName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSourceClassName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSourceClassName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setSourceMethodName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSourceMethodName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSourceMethodName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setThreadID(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetThreadID(int arg0)
+        {
+            IExecuteWithSignature("setThreadID", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LogRecord.html#setThrown(java.lang.Throwable)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.Throwable"/></param>
+        public void SetThrown(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
         {
-            return IExecuteWithSignature<Java.Util.Logging.LogRecord>("setLongThreadID", "(J)Ljava/util/logging/LogRecord;", arg0);
+            IExecuteWithSignature("setThrown", "(Ljava/lang/Throwable;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/Logger.cs b/src/net/Netdroid/Generated/Java/Util/Logging/Logger.cs
index 85dda5eca..71cc2dfc5 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/Logger.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/Logger.cs
@@ -38,15 +38,15 @@ public partial class Logger
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#GLOBAL_LOGGER_NAME"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#GLOBAL_LOGGER_NAME"/>
         /// </summary>
         public static Java.Lang.String GLOBAL_LOGGER_NAME { get { if (!_GLOBAL_LOGGER_NAMEReady) { _GLOBAL_LOGGER_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "GLOBAL_LOGGER_NAME"); _GLOBAL_LOGGER_NAMEReady = true; } return _GLOBAL_LOGGER_NAMEContent; } }
         private static Java.Lang.String _GLOBAL_LOGGER_NAMEContent = default;
         private static bool _GLOBAL_LOGGER_NAMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#global"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#global"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Util.Logging.Logger global { get { if (!_globalReady) { _globalContent = SGetField<Java.Util.Logging.Logger>(LocalBridgeClazz, "global"); _globalReady = true; } return _globalContent; } }
         private static Java.Util.Logging.Logger _globalContent = default;
         private static bool _globalReady = false; // this is used because in case of generics 
@@ -55,21 +55,23 @@ public partial class Logger
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getAnonymousLogger()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getGlobal()"/>
         /// </summary>
-        public static Java.Util.Logging.Logger AnonymousLogger
+        /// <returns><see cref="Java.Util.Logging.Logger"/></returns>
+        public static Java.Util.Logging.Logger GetGlobal()
         {
-            get { return SExecuteWithSignature<Java.Util.Logging.Logger>(LocalBridgeClazz, "getAnonymousLogger", "()Ljava/util/logging/Logger;"); }
+            return SExecuteWithSignature<Java.Util.Logging.Logger>(LocalBridgeClazz, "getGlobal", "()Ljava/util/logging/Logger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getGlobal()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getAnonymousLogger()"/>
         /// </summary>
-        public static Java.Util.Logging.Logger Global
+        /// <returns><see cref="Java.Util.Logging.Logger"/></returns>
+        public static Java.Util.Logging.Logger GetAnonymousLogger()
         {
-            get { return SExecuteWithSignature<Java.Util.Logging.Logger>(LocalBridgeClazz, "getGlobal", "()Ljava/util/logging/Logger;"); }
+            return SExecuteWithSignature<Java.Util.Logging.Logger>(LocalBridgeClazz, "getAnonymousLogger", "()Ljava/util/logging/Logger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getAnonymousLogger(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getAnonymousLogger(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Logging.Logger"/></returns>
@@ -78,7 +80,7 @@ public static Java.Util.Logging.Logger GetAnonymousLogger(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.Logging.Logger>(LocalBridgeClazz, "getAnonymousLogger", "(Ljava/lang/String;)Ljava/util/logging/Logger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getLogger(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getLogger(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -88,7 +90,7 @@ public static Java.Util.Logging.Logger GetLogger(Java.Lang.String arg0, Java.Lan
             return SExecute<Java.Util.Logging.Logger>(LocalBridgeClazz, "getLogger", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getLogger(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getLogger(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Logging.Logger"/></returns>
@@ -101,72 +103,80 @@ public static Java.Util.Logging.Logger GetLogger(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getFilter()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#setFilter(java.util.logging.Filter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getUseParentHandlers()"/>
         /// </summary>
-        public Java.Util.Logging.Filter Filter
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseParentHandlers()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Filter>("getFilter", "()Ljava/util/logging/Filter;"); } set { IExecuteWithSignature("setFilter", "(Ljava/util/logging/Filter;)V", value); }
+            return IExecuteWithSignature<bool>("getUseParentHandlers", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getHandlers()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#isLoggable(java.util.logging.Level)"/>
         /// </summary>
-        public Java.Util.Logging.Handler[] Handlers
+        /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsLoggable(Java.Util.Logging.Level arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Util.Logging.Handler>("getHandlers", "()[Ljava/util/logging/Handler;"); }
+            return IExecuteWithSignature<bool>("isLoggable", "(Ljava/util/logging/Level;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getLevel()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#setLevel(java.util.logging.Level)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getName()"/>
         /// </summary>
-        public Java.Util.Logging.Level Level
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Level>("getLevel", "()Ljava/util/logging/Level;"); } set { IExecuteWithSignature("setLevel", "(Ljava/util/logging/Level;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getResourceBundleName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetResourceBundleName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getResourceBundleName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getParent()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#setParent(java.util.logging.Logger)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getFilter()"/>
         /// </summary>
-        public Java.Util.Logging.Logger Parent
+        /// <returns><see cref="Java.Util.Logging.Filter"/></returns>
+        public Java.Util.Logging.Filter GetFilter()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Logger>("getParent", "()Ljava/util/logging/Logger;"); } set { IExecuteWithSignature("setParent", "(Ljava/util/logging/Logger;)V", value); }
+            return IExecuteWithSignature<Java.Util.Logging.Filter>("getFilter", "()Ljava/util/logging/Filter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getResourceBundle()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#setResourceBundle(java.util.ResourceBundle)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getHandlers()"/>
         /// </summary>
-        public Java.Util.ResourceBundle ResourceBundle
+        /// <returns><see cref="Java.Util.Logging.Handler"/></returns>
+        public Java.Util.Logging.Handler[] GetHandlers()
         {
-            get { return IExecuteWithSignature<Java.Util.ResourceBundle>("getResourceBundle", "()Ljava/util/ResourceBundle;"); } set { IExecuteWithSignature("setResourceBundle", "(Ljava/util/ResourceBundle;)V", value); }
+            return IExecuteWithSignatureArray<Java.Util.Logging.Handler>("getHandlers", "()[Ljava/util/logging/Handler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getResourceBundleName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getLevel()"/>
         /// </summary>
-        public Java.Lang.String ResourceBundleName
+        /// <returns><see cref="Java.Util.Logging.Level"/></returns>
+        public Java.Util.Logging.Level GetLevel()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getResourceBundleName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Logging.Level>("getLevel", "()Ljava/util/logging/Level;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#getUseParentHandlers()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#setUseParentHandlers(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getParent()"/>
         /// </summary>
-        public bool UseParentHandlers
+        /// <returns><see cref="Java.Util.Logging.Logger"/></returns>
+        public Java.Util.Logging.Logger GetParent()
         {
-            get { return IExecuteWithSignature<bool>("getUseParentHandlers", "()Z"); } set { IExecuteWithSignature("setUseParentHandlers", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Util.Logging.Logger>("getParent", "()Ljava/util/logging/Logger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#isLoggable(java.util.logging.Level)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#getResourceBundle()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsLoggable(Java.Util.Logging.Level arg0)
+        /// <returns><see cref="Java.Util.ResourceBundle"/></returns>
+        public Java.Util.ResourceBundle GetResourceBundle()
         {
-            return IExecuteWithSignature<bool>("isLoggable", "(Ljava/util/logging/Level;)Z", arg0);
+            return IExecuteWithSignature<Java.Util.ResourceBundle>("getResourceBundle", "()Ljava/util/ResourceBundle;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#addHandler(java.util.logging.Handler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#addHandler(java.util.logging.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Handler"/></param>
         /// <exception cref="Java.Lang.SecurityException"/>
@@ -175,7 +185,7 @@ public void AddHandler(Java.Util.Logging.Handler arg0)
             IExecuteWithSignature("addHandler", "(Ljava/util/logging/Handler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#config(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#config(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Config(Java.Lang.String arg0)
@@ -183,7 +193,7 @@ public void Config(Java.Lang.String arg0)
             IExecuteWithSignature("config", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#config(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#config(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         public void Config(Java.Util.Function.Supplier<Java.Lang.String> arg0)
@@ -191,7 +201,7 @@ public void Config(Java.Util.Function.Supplier<Java.Lang.String> arg0)
             IExecuteWithSignature("config", "(Ljava/util/function/Supplier;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#entering(java.lang.String,java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#entering(java.lang.String,java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -201,7 +211,7 @@ public void Entering(Java.Lang.String arg0, Java.Lang.String arg1, object arg2)
             IExecute("entering", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#entering(java.lang.String,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#entering(java.lang.String,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -211,7 +221,7 @@ public void Entering(Java.Lang.String arg0, Java.Lang.String arg1, object[] arg2
             IExecute("entering", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#entering(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#entering(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -220,7 +230,7 @@ public void Entering(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("entering", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#exiting(java.lang.String,java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#exiting(java.lang.String,java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -230,7 +240,7 @@ public void Exiting(Java.Lang.String arg0, Java.Lang.String arg1, object arg2)
             IExecute("exiting", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#exiting(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#exiting(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -239,7 +249,7 @@ public void Exiting(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("exiting", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#fine(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#fine(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Fine(Java.Lang.String arg0)
@@ -247,7 +257,7 @@ public void Fine(Java.Lang.String arg0)
             IExecuteWithSignature("fine", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#fine(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#fine(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         public void Fine(Java.Util.Function.Supplier<Java.Lang.String> arg0)
@@ -255,7 +265,7 @@ public void Fine(Java.Util.Function.Supplier<Java.Lang.String> arg0)
             IExecuteWithSignature("fine", "(Ljava/util/function/Supplier;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#finer(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#finer(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Finer(Java.Lang.String arg0)
@@ -263,7 +273,7 @@ public void Finer(Java.Lang.String arg0)
             IExecuteWithSignature("finer", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#finer(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#finer(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         public void Finer(Java.Util.Function.Supplier<Java.Lang.String> arg0)
@@ -271,7 +281,7 @@ public void Finer(Java.Util.Function.Supplier<Java.Lang.String> arg0)
             IExecuteWithSignature("finer", "(Ljava/util/function/Supplier;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#finest(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#finest(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Finest(Java.Lang.String arg0)
@@ -279,7 +289,7 @@ public void Finest(Java.Lang.String arg0)
             IExecuteWithSignature("finest", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#finest(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#finest(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         public void Finest(Java.Util.Function.Supplier<Java.Lang.String> arg0)
@@ -287,7 +297,7 @@ public void Finest(Java.Util.Function.Supplier<Java.Lang.String> arg0)
             IExecuteWithSignature("finest", "(Ljava/util/function/Supplier;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#info(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#info(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Info(Java.Lang.String arg0)
@@ -295,7 +305,7 @@ public void Info(Java.Lang.String arg0)
             IExecuteWithSignature("info", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#info(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#info(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         public void Info(Java.Util.Function.Supplier<Java.Lang.String> arg0)
@@ -303,7 +313,7 @@ public void Info(Java.Util.Function.Supplier<Java.Lang.String> arg0)
             IExecuteWithSignature("info", "(Ljava/util/function/Supplier;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -313,7 +323,7 @@ public void Log(Java.Util.Logging.Level arg0, Java.Lang.String arg1, object arg2
             IExecute("log", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -323,7 +333,7 @@ public void Log(Java.Util.Logging.Level arg0, Java.Lang.String arg1, object[] ar
             IExecute("log", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.String,java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.String,java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -333,7 +343,7 @@ public void Log(Java.Util.Logging.Level arg0, Java.Lang.String arg1, MASES.JCOBr
             IExecute("log", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -342,7 +352,7 @@ public void Log(Java.Util.Logging.Level arg0, Java.Lang.String arg1)
             IExecute("log", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.Throwable,java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#log(java.util.logging.Level,java.lang.Throwable,java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Throwable"/></param>
@@ -352,7 +362,7 @@ public void Log(Java.Util.Logging.Level arg0, MASES.JCOBridge.C2JBridge.JVMBridg
             IExecute("log", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#log(java.util.logging.Level,java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#log(java.util.logging.Level,java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Supplier"/></param>
@@ -361,7 +371,7 @@ public void Log(Java.Util.Logging.Level arg0, Java.Util.Function.Supplier<Java.L
             IExecute("log", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#log(java.util.logging.LogRecord)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#log(java.util.logging.LogRecord)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.LogRecord"/></param>
         public void Log(Java.Util.Logging.LogRecord arg0)
@@ -369,7 +379,7 @@ public void Log(Java.Util.Logging.LogRecord arg0)
             IExecuteWithSignature("log", "(Ljava/util/logging/LogRecord;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -381,7 +391,7 @@ public void Logp(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.
             IExecute("logp", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -393,7 +403,7 @@ public void Logp(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.
             IExecute("logp", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -405,7 +415,7 @@ public void Logp(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.
             IExecute("logp", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -416,7 +426,7 @@ public void Logp(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.
             IExecute("logp", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.Throwable,java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.Throwable,java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -428,7 +438,7 @@ public void Logp(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.
             IExecute("logp", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logp(java.util.logging.Level,java.lang.String,java.lang.String,java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -439,7 +449,7 @@ public void Logp(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.
             IExecute("logp", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -447,13 +457,13 @@ public void Logp(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
         /// <param name="arg5"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Logrb(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3, Java.Lang.String arg4, object arg5)
         {
             IExecute("logrb", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -461,13 +471,13 @@ public void Logrb(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
         /// <param name="arg5"><see cref="object"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Logrb(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3, Java.Lang.String arg4, object[] arg5)
         {
             IExecute("logrb", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -475,26 +485,26 @@ public void Logrb(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
         /// <param name="arg5"><see cref="Java.Lang.Throwable"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Logrb(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3, Java.Lang.String arg4, MASES.JCOBridge.C2JBridge.JVMBridgeException arg5)
         {
             IExecute("logrb", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Java.Lang.String"/></param>
         /// <param name="arg4"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Logrb(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang.String arg2, Java.Lang.String arg3, Java.Lang.String arg4)
         {
             IExecute("logrb", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.util.ResourceBundle,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.util.ResourceBundle,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -507,7 +517,7 @@ public void Logrb(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang
             if (arg5.Length == 0) IExecute("logrb", arg0, arg1, arg2, arg3, arg4); else IExecute("logrb", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.util.ResourceBundle,java.lang.String,java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.lang.String,java.lang.String,java.util.ResourceBundle,java.lang.String,java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -520,7 +530,7 @@ public void Logrb(Java.Util.Logging.Level arg0, Java.Lang.String arg1, Java.Lang
             IExecute("logrb", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.util.ResourceBundle,java.lang.String,java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.util.ResourceBundle,java.lang.String,java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Util.ResourceBundle"/></param>
@@ -531,7 +541,7 @@ public void Logrb(Java.Util.Logging.Level arg0, Java.Util.ResourceBundle arg1, J
             if (arg3.Length == 0) IExecute("logrb", arg0, arg1, arg2); else IExecute("logrb", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.util.ResourceBundle,java.lang.String,java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#logrb(java.util.logging.Level,java.util.ResourceBundle,java.lang.String,java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
         /// <param name="arg1"><see cref="Java.Util.ResourceBundle"/></param>
@@ -542,7 +552,7 @@ public void Logrb(Java.Util.Logging.Level arg0, Java.Util.ResourceBundle arg1, J
             IExecute("logrb", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#removeHandler(java.util.logging.Handler)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#removeHandler(java.util.logging.Handler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Handler"/></param>
         /// <exception cref="Java.Lang.SecurityException"/>
@@ -551,7 +561,49 @@ public void RemoveHandler(Java.Util.Logging.Handler arg0)
             IExecuteWithSignature("removeHandler", "(Ljava/util/logging/Handler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#severe(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#setFilter(java.util.logging.Filter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Logging.Filter"/></param>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public void SetFilter(Java.Util.Logging.Filter arg0)
+        {
+            IExecuteWithSignature("setFilter", "(Ljava/util/logging/Filter;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#setLevel(java.util.logging.Level)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public void SetLevel(Java.Util.Logging.Level arg0)
+        {
+            IExecuteWithSignature("setLevel", "(Ljava/util/logging/Level;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#setParent(java.util.logging.Logger)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Logging.Logger"/></param>
+        public void SetParent(Java.Util.Logging.Logger arg0)
+        {
+            IExecuteWithSignature("setParent", "(Ljava/util/logging/Logger;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#setResourceBundle(java.util.ResourceBundle)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.ResourceBundle"/></param>
+        public void SetResourceBundle(Java.Util.ResourceBundle arg0)
+        {
+            IExecuteWithSignature("setResourceBundle", "(Ljava/util/ResourceBundle;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#setUseParentHandlers(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseParentHandlers(bool arg0)
+        {
+            IExecuteWithSignature("setUseParentHandlers", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#severe(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Severe(Java.Lang.String arg0)
@@ -559,7 +611,7 @@ public void Severe(Java.Lang.String arg0)
             IExecuteWithSignature("severe", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#severe(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#severe(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         public void Severe(Java.Util.Function.Supplier<Java.Lang.String> arg0)
@@ -567,7 +619,7 @@ public void Severe(Java.Util.Function.Supplier<Java.Lang.String> arg0)
             IExecuteWithSignature("severe", "(Ljava/util/function/Supplier;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#throwing(java.lang.String,java.lang.String,java.lang.Throwable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#throwing(java.lang.String,java.lang.String,java.lang.Throwable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -577,7 +629,7 @@ public void Throwing(Java.Lang.String arg0, Java.Lang.String arg1, MASES.JCOBrid
             IExecute("throwing", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#warning(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#warning(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Warning(Java.Lang.String arg0)
@@ -585,7 +637,7 @@ public void Warning(Java.Lang.String arg0)
             IExecuteWithSignature("warning", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/Logger.html#warning(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/Logger.html#warning(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         public void Warning(Java.Util.Function.Supplier<Java.Lang.String> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/LoggingMXBean.cs b/src/net/Netdroid/Generated/Java/Util/Logging/LoggingMXBean.cs
index ba869fc24..3260f81c6 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/LoggingMXBean.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/LoggingMXBean.cs
@@ -64,14 +64,7 @@ public partial class LoggingMXBean : Java.Util.Logging.ILoggingMXBean
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LoggingMXBean.html#getLoggerNames()"/> 
-        /// </summary>
-        public Java.Util.List<Java.Lang.String> LoggerNames
-        {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getLoggerNames", "()Ljava/util/List;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LoggingMXBean.html#getLoggerLevel(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LoggingMXBean.html#getLoggerLevel(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -80,7 +73,7 @@ public Java.Lang.String GetLoggerLevel(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getLoggerLevel", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LoggingMXBean.html#getParentLoggerName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LoggingMXBean.html#getParentLoggerName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -89,7 +82,15 @@ public Java.Lang.String GetParentLoggerName(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getParentLoggerName", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LoggingMXBean.html#setLoggerLevel(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LoggingMXBean.html#getLoggerNames()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Lang.String> GetLoggerNames()
+        {
+            return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getLoggerNames", "()Ljava/util/List;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LoggingMXBean.html#setLoggerLevel(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/LoggingPermission.cs b/src/net/Netdroid/Generated/Java/Util/Logging/LoggingPermission.cs
index 95498a50d..76a3ecb74 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/LoggingPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/LoggingPermission.cs
@@ -30,7 +30,7 @@ public partial class LoggingPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/LoggingPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/LoggingPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/MemoryHandler.cs b/src/net/Netdroid/Generated/Java/Util/Logging/MemoryHandler.cs
index 622b6ea2a..b27b5df66 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/MemoryHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/MemoryHandler.cs
@@ -30,7 +30,7 @@ public partial class MemoryHandler
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/MemoryHandler.html#%3Cinit%3E(java.util.logging.Handler,int,java.util.logging.Level)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/MemoryHandler.html#%3Cinit%3E(java.util.logging.Handler,int,java.util.logging.Level)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Logging.Handler"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -56,18 +56,28 @@ public MemoryHandler(Java.Util.Logging.Handler arg0, int arg1, Java.Util.Logging
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/MemoryHandler.html#getPushLevel()"/> <see href="https://developer.android.com/reference/java.logging/java/util/logging/MemoryHandler.html#setPushLevel(java.util.logging.Level)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/MemoryHandler.html#getPushLevel()"/>
         /// </summary>
-        public Java.Util.Logging.Level PushLevel
+        /// <returns><see cref="Java.Util.Logging.Level"/></returns>
+        public Java.Util.Logging.Level GetPushLevel()
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Level>("getPushLevel", "()Ljava/util/logging/Level;"); } set { IExecuteWithSignature("setPushLevel", "(Ljava/util/logging/Level;)V", value); }
+            return IExecuteWithSignature<Java.Util.Logging.Level>("getPushLevel", "()Ljava/util/logging/Level;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/MemoryHandler.html#push()"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/MemoryHandler.html#push()"/>
         /// </summary>
         public void Push()
         {
-            IExecuteWithSignature("push", "()V");
+            IExecute("push");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/logging/MemoryHandler.html#setPushLevel(java.util.logging.Level)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Logging.Level"/></param>
+        /// <exception cref="Java.Lang.SecurityException"/>
+        public void SetPushLevel(Java.Util.Logging.Level arg0)
+        {
+            IExecute("setPushLevel", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/SocketHandler.cs b/src/net/Netdroid/Generated/Java/Util/Logging/SocketHandler.cs
index 995cecd7f..0d6108d14 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/SocketHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/SocketHandler.cs
@@ -30,7 +30,7 @@ public partial class SocketHandler
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/SocketHandler.html#%3Cinit%3E(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/SocketHandler.html#%3Cinit%3E(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Logging/StreamHandler.cs b/src/net/Netdroid/Generated/Java/Util/Logging/StreamHandler.cs
index 1c4146063..508c7c9e8 100644
--- a/src/net/Netdroid/Generated/Java/Util/Logging/StreamHandler.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Logging/StreamHandler.cs
@@ -30,7 +30,7 @@ public partial class StreamHandler
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.logging/java/util/logging/StreamHandler.html#%3Cinit%3E(java.io.OutputStream,java.util.logging.Formatter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/logging/StreamHandler.html#%3Cinit%3E(java.io.OutputStream,java.util.logging.Formatter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Logging.Formatter"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/LongSummaryStatistics.cs b/src/net/Netdroid/Generated/Java/Util/LongSummaryStatistics.cs
index 07fcab406..5480a8752 100644
--- a/src/net/Netdroid/Generated/Java/Util/LongSummaryStatistics.cs
+++ b/src/net/Netdroid/Generated/Java/Util/LongSummaryStatistics.cs
@@ -30,7 +30,7 @@ public partial class LongSummaryStatistics : Java.Util.Function.ILongConsumer, J
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#%3Cinit%3E(long,long,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#%3Cinit%3E(long,long,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -66,42 +66,47 @@ public LongSummaryStatistics(long arg0, long arg1, long arg2, long arg3)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#getAverage()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#getAverage()"/>
         /// </summary>
-        public double Average
+        /// <returns><see cref="double"/></returns>
+        public double GetAverage()
         {
-            get { return IExecuteWithSignature<double>("getAverage", "()D"); }
+            return IExecuteWithSignature<double>("getAverage", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#getCount()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#getCount()"/>
         /// </summary>
-        public long Count
+        /// <returns><see cref="long"/></returns>
+        public long GetCount()
         {
-            get { return IExecuteWithSignature<long>("getCount", "()J"); }
+            return IExecuteWithSignature<long>("getCount", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#getMax()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#getMax()"/>
         /// </summary>
-        public long Max
+        /// <returns><see cref="long"/></returns>
+        public long GetMax()
         {
-            get { return IExecuteWithSignature<long>("getMax", "()J"); }
+            return IExecuteWithSignature<long>("getMax", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#getMin()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#getMin()"/>
         /// </summary>
-        public long Min
+        /// <returns><see cref="long"/></returns>
+        public long GetMin()
         {
-            get { return IExecuteWithSignature<long>("getMin", "()J"); }
+            return IExecuteWithSignature<long>("getMin", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#getSum()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#getSum()"/>
         /// </summary>
-        public long Sum
+        /// <returns><see cref="long"/></returns>
+        public long GetSum()
         {
-            get { return IExecuteWithSignature<long>("getSum", "()J"); }
+            return IExecuteWithSignature<long>("getSum", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#accept(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#accept(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Accept(int arg0)
@@ -109,7 +114,7 @@ public void Accept(int arg0)
             IExecuteWithSignature("accept", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#accept(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#accept(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void Accept(long arg0)
@@ -117,7 +122,7 @@ public void Accept(long arg0)
             IExecuteWithSignature("accept", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/LongSummaryStatistics.html#combine(java.util.LongSummaryStatistics)"/>
+        /// <see href="https://developer.android.com/reference/java/util/LongSummaryStatistics.html#combine(java.util.LongSummaryStatistics)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.LongSummaryStatistics"/></param>
         public void Combine(Java.Util.LongSummaryStatistics arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Map.cs b/src/net/Netdroid/Generated/Java/Util/Map.cs
index 53828dd9f..bb071c804 100644
--- a/src/net/Netdroid/Generated/Java/Util/Map.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Map.cs
@@ -42,7 +42,7 @@ public partial class Map
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#copyOf(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#copyOf(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <returns><see cref="Java.Util.Map"/></returns>
@@ -51,7 +51,7 @@ public static Java.Util.Map CopyOf(Java.Util.Map arg0)
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "copyOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map"/></returns>
         public static Java.Util.Map Of()
@@ -59,7 +59,7 @@ public static Java.Util.Map Of()
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -87,7 +87,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -113,7 +113,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -137,7 +137,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -159,7 +159,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -179,7 +179,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -197,7 +197,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -213,7 +213,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -227,7 +227,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -239,7 +239,7 @@ public static Java.Util.Map Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -249,7 +249,7 @@ public static Java.Util.Map Of(object arg0, object arg1)
             return SExecute<Java.Util.Map>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#ofEntries(java.util.Map.Entry[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#ofEntries(java.util.Map.Entry[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map.Entry"/></param>
         /// <returns><see cref="Java.Util.Map"/></returns>
@@ -258,7 +258,7 @@ public static Java.Util.Map OfEntries(params Java.Util.Map.Entry[] arg0)
             if (arg0.Length == 0) return SExecute<Java.Util.Map>(LocalBridgeClazz, "ofEntries"); else return SExecute<Java.Util.Map>(LocalBridgeClazz, "ofEntries", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#entry(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#entry(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -272,7 +272,7 @@ public static Java.Util.Map.Entry EntryMethod(object arg0, object arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#containsKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#containsKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -281,7 +281,7 @@ public bool ContainsKey(object arg0)
             return IExecuteWithSignature<bool>("containsKey", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#containsValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#containsValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -290,7 +290,7 @@ public bool ContainsValue(object arg0)
             return IExecuteWithSignature<bool>("containsValue", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -298,7 +298,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -306,7 +306,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection Values()
@@ -314,7 +314,7 @@ public Java.Util.Collection Values()
             return IExecuteWithSignature<Java.Util.Collection>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set EntrySet()
@@ -322,7 +322,7 @@ public Java.Util.Set EntrySet()
             return IExecuteWithSignature<Java.Util.Set>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set KeySet()
@@ -330,7 +330,7 @@ public Java.Util.Set KeySet()
             return IExecuteWithSignature<Java.Util.Set>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -339,7 +339,7 @@ public object Get(object arg0)
             return IExecuteWithSignature("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#put(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#put(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -349,7 +349,7 @@ public object Put(object arg0, object arg1)
             return IExecute("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -358,14 +358,14 @@ public object Remove(object arg0)
             return IExecuteWithSignature("remove", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#putAll(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#putAll(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public void PutAll(Java.Util.Map arg0)
@@ -373,7 +373,7 @@ public void PutAll(Java.Util.Map arg0)
             IExecuteWithSignature("putAll", "(Ljava/util/Map;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#remove(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#remove(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -383,7 +383,7 @@ public bool Remove(object arg0, object arg1)
             return IExecute<bool>("remove", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -394,7 +394,7 @@ public bool Replace(object arg0, object arg1, object arg2)
             return IExecute<bool>("replace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -404,7 +404,7 @@ public object Compute(object arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("compute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -414,7 +414,7 @@ public object ComputeIfAbsent(object arg0, Java.Util.Function.Function arg1)
             return IExecute("computeIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -424,7 +424,7 @@ public object ComputeIfPresent(object arg0, Java.Util.Function.BiFunction arg1)
             return IExecute("computeIfPresent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -434,7 +434,7 @@ public object GetOrDefault(object arg0, object arg1)
             return IExecute("getOrDefault", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -445,7 +445,7 @@ public object Merge(object arg0, object arg1, Java.Util.Function.BiFunction arg2
             return IExecute("merge", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -455,7 +455,7 @@ public object PutIfAbsent(object arg0, object arg1)
             return IExecute("putIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#replace(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#replace(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -465,7 +465,7 @@ public object Replace(object arg0, object arg1)
             return IExecute("replace", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#forEach(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#forEach(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         public void ForEach(Java.Util.Function.BiConsumer arg0)
@@ -473,7 +473,7 @@ public void ForEach(Java.Util.Function.BiConsumer arg0)
             IExecuteWithSignature("forEach", "(Ljava/util/function/BiConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#replaceAll(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#replaceAll(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         public void ReplaceAll(Java.Util.Function.BiFunction arg0)
@@ -500,35 +500,28 @@ public partial class Entry
             #endregion
 
             #region Static methods
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html#copyOf(java.util.Map.Entry)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Java.Util.Map.Entry"/></param>
-            /// <returns><see cref="Java.Util.Map.Entry"/></returns>
-            public static Java.Util.Map.Entry CopyOf(Java.Util.Map.Entry arg0)
-            {
-                return SExecute<Java.Util.Map.Entry>(LocalBridgeClazz, "copyOf", arg0);
-            }
 
             #endregion
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html#getKey()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/Map.Entry.html#getKey()"/>
             /// </summary>
-            public object Key
+            /// <returns><see cref="object"/></returns>
+            public object GetKey()
             {
-                get { return IExecuteWithSignature("getKey", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature("getKey", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/Map.Entry.html#getValue()"/>
             /// </summary>
-            public object Value
+            /// <returns><see cref="object"/></returns>
+            public object GetValue()
             {
-                get { return IExecuteWithSignature("getValue", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature("getValue", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html#setValue(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Map.Entry.html#setValue(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="object"/></returns>
@@ -567,37 +560,28 @@ public partial class Entry<K, V>
             #endregion
 
             #region Static methods
-            /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html#copyOf(java.util.Map.Entry)"/>
-            /// </summary>
-            /// <param name="arg0"><see cref="Java.Util.Map.Entry"/></param>
-            /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
-            /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-            /// <returns><see cref="Java.Util.Map.Entry"/></returns>
-            public static Java.Util.Map.Entry<K, V> CopyOf<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map.Entry<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
-            {
-                return SExecute<Java.Util.Map.Entry<K, V>>(LocalBridgeClazz, "copyOf", arg0);
-            }
 
             #endregion
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html#getKey()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/Map.Entry.html#getKey()"/>
             /// </summary>
-            public K Key
+            /// <returns><typeparamref name="K"/></returns>
+            public K GetKey()
             {
-                get { return IExecuteWithSignature<K>("getKey", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<K>("getKey", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/java/util/Map.Entry.html#getValue()"/>
             /// </summary>
-            public V Value
+            /// <returns><typeparamref name="V"/></returns>
+            public V GetValue()
             {
-                get { return IExecuteWithSignature<V>("getValue", "()Ljava/lang/Object;"); }
+                return IExecuteWithSignature<V>("getValue", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Map.Entry.html#setValue(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Map.Entry.html#setValue(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="V"/></param>
             /// <returns><typeparamref name="V"/></returns>
@@ -662,18 +646,18 @@ public partial class Map<K, V> : Java.Util.IMap<K, V>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#copyOf(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#copyOf(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Map"/></returns>
-        public static Java.Util.Map<K, V> CopyOf<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
+        public static Java.Util.Map<K, V> CopyOf<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK : K where Arg0ExtendsV : V
         {
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "copyOf", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map"/></returns>
         public static Java.Util.Map<K, V> Of()
@@ -681,7 +665,7 @@ public static Java.Util.Map<K, V> Of()
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -709,7 +693,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3, K arg4, V a
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -735,7 +719,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3, K arg4, V a
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -759,7 +743,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3, K arg4, V a
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -781,7 +765,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3, K arg4, V a
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -801,7 +785,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3, K arg4, V a
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -819,7 +803,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3, K arg4, V a
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -835,7 +819,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3, K arg4, V a
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -849,7 +833,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3, K arg4, V a
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -861,7 +845,7 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1, K arg2, V arg3)
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#of(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#of(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -871,18 +855,18 @@ public static Java.Util.Map<K, V> Of(K arg0, V arg1)
             return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#ofEntries(java.util.Map.Entry[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#ofEntries(java.util.Map.Entry[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map.Entry"/></param>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><see cref="Java.Util.Map"/></returns>
-        public static Java.Util.Map<K, V> OfEntries<Arg0ExtendsK, Arg0ExtendsV>(params Java.Util.Map.Entry<Arg0ExtendsK, Arg0ExtendsV>[] arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
+        public static Java.Util.Map<K, V> OfEntries<Arg0ExtendsK, Arg0ExtendsV>(params Java.Util.Map.Entry<Arg0ExtendsK, Arg0ExtendsV>[] arg0) where Arg0ExtendsK : K where Arg0ExtendsV : V
         {
             if (arg0.Length == 0) return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "ofEntries"); else return SExecute<Java.Util.Map<K, V>>(LocalBridgeClazz, "ofEntries", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#entry(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#entry(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -896,7 +880,7 @@ public static Java.Util.Map.Entry<K, V> EntryMethod(K arg0, V arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#containsKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#containsKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -905,7 +889,7 @@ public bool ContainsKey(object arg0)
             return IExecuteWithSignature<bool>("containsKey", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#containsValue(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#containsValue(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -914,7 +898,7 @@ public bool ContainsValue(object arg0)
             return IExecuteWithSignature<bool>("containsValue", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -922,7 +906,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -930,7 +914,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection<V> Values()
@@ -938,7 +922,7 @@ public Java.Util.Collection<V> Values()
             return IExecuteWithSignature<Java.Util.Collection<V>>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Util.Map.Entry<K, V>> EntrySet()
@@ -946,7 +930,7 @@ public Java.Util.Collection<V> Values()
             return IExecuteWithSignature<Java.Util.Set<Java.Util.Map.Entry<K, V>>>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<K> KeySet()
@@ -954,7 +938,7 @@ public Java.Util.Set<K> KeySet()
             return IExecuteWithSignature<Java.Util.Set<K>>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#get(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#get(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -963,7 +947,7 @@ public V Get(object arg0)
             return IExecuteWithSignature<V>("get", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#put(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#put(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -973,7 +957,7 @@ public V Put(K arg0, V arg1)
             return IExecute<V>("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><typeparamref name="V"/></returns>
@@ -982,24 +966,24 @@ public V Remove(object arg0)
             return IExecuteWithSignature<V>("remove", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#putAll(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#putAll(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK: K where Arg0ExtendsV: V
+        public void PutAll<Arg0ExtendsK, Arg0ExtendsV>(Java.Util.Map<Arg0ExtendsK, Arg0ExtendsV> arg0) where Arg0ExtendsK : K where Arg0ExtendsV : V
         {
             IExecuteWithSignature("putAll", "(Ljava/util/Map;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#remove(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#remove(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -1009,7 +993,7 @@ public bool Remove(object arg0, object arg1)
             return IExecute<bool>("remove", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#replace(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -1020,7 +1004,7 @@ public bool Replace(K arg0, V arg1, V arg2)
             return IExecute<bool>("replace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#compute(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -1028,24 +1012,24 @@ public bool Replace(K arg0, V arg1, V arg2)
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V Compute<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsV: V
+        public V Compute<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsV : V
         {
             return IExecute<V>("compute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#computeIfAbsent(java.lang.Object,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="Arg1objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1ExtendsV: V
+        public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Function.Function<Arg1objectSuperK, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1ExtendsV : V
         {
             return IExecute<V>("computeIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#computeIfPresent(java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -1053,12 +1037,12 @@ public V ComputeIfAbsent<Arg1objectSuperK, Arg1ExtendsV>(K arg0, Java.Util.Funct
         /// <typeparam name="Arg1objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg1ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V ComputeIfPresent<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK: K where Arg1objectSuperV: V where Arg1ExtendsV: V
+        public V ComputeIfPresent<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV>(K arg0, Java.Util.Function.BiFunction<Arg1objectSuperK, Arg1objectSuperV, Arg1ExtendsV> arg1) where Arg1objectSuperK : K where Arg1objectSuperV : V where Arg1ExtendsV : V
         {
             return IExecute<V>("computeIfPresent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#getOrDefault(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -1068,7 +1052,7 @@ public V GetOrDefault(object arg0, V arg1)
             return IExecute<V>("getOrDefault", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -1076,12 +1060,12 @@ public V GetOrDefault(object arg0, V arg1)
         /// <typeparam name="Arg2objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg2ExtendsV"><typeparamref name="V"/></typeparam>
         /// <returns><typeparamref name="V"/></returns>
-        public V Merge<Arg2objectSuperV, Arg2ExtendsV>(K arg0, V arg1, Java.Util.Function.BiFunction<Arg2objectSuperV, Arg2objectSuperV, Arg2ExtendsV> arg2) where Arg2objectSuperV: V where Arg2ExtendsV: V
+        public V Merge<Arg2objectSuperV, Arg2ExtendsV>(K arg0, V arg1, Java.Util.Function.BiFunction<Arg2objectSuperV, Arg2objectSuperV, Arg2ExtendsV> arg2) where Arg2objectSuperV : V where Arg2ExtendsV : V
         {
             return IExecute<V>("merge", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#putIfAbsent(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -1091,7 +1075,7 @@ public V PutIfAbsent(K arg0, V arg1)
             return IExecute<V>("putIfAbsent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#replace(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#replace(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="V"/></param>
@@ -1101,23 +1085,23 @@ public V Replace(K arg0, V arg1)
             return IExecute<V>("replace", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#forEach(java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#forEach(java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
         /// <typeparam name="Arg0objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
-        public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiConsumer<Arg0objectSuperK, Arg0objectSuperV> arg0) where Arg0objectSuperK: K where Arg0objectSuperV: V
+        public void ForEach<Arg0objectSuperK, Arg0objectSuperV>(Java.Util.Function.BiConsumer<Arg0objectSuperK, Arg0objectSuperV> arg0) where Arg0objectSuperK : K where Arg0objectSuperV : V
         {
             IExecuteWithSignature("forEach", "(Ljava/util/function/BiConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Map.html#replaceAll(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Map.html#replaceAll(java.util.function.BiFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
         /// <typeparam name="Arg0objectSuperK"><typeparamref name="K"/></typeparam>
         /// <typeparam name="Arg0objectSuperV"><typeparamref name="V"/></typeparam>
         /// <typeparam name="Arg0ExtendsV"><typeparamref name="V"/></typeparam>
-        public void ReplaceAll<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV>(Java.Util.Function.BiFunction<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV> arg0) where Arg0objectSuperK: K where Arg0objectSuperV: V where Arg0ExtendsV: V
+        public void ReplaceAll<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV>(Java.Util.Function.BiFunction<Arg0objectSuperK, Arg0objectSuperV, Arg0ExtendsV> arg0) where Arg0objectSuperK : K where Arg0objectSuperV : V where Arg0ExtendsV : V
         {
             IExecuteWithSignature("replaceAll", "(Ljava/util/function/BiFunction;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/NavigableMap.cs b/src/net/Netdroid/Generated/Java/Util/NavigableMap.cs
index b3b2cdc78..f0169cba6 100644
--- a/src/net/Netdroid/Generated/Java/Util/NavigableMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/NavigableMap.cs
@@ -46,7 +46,7 @@ public partial class NavigableMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#ceilingEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#ceilingEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -55,7 +55,7 @@ public Java.Util.Map.Entry CeilingEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("ceilingEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#firstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#firstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry FirstEntry()
@@ -63,7 +63,7 @@ public Java.Util.Map.Entry FirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("firstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#floorEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#floorEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -72,7 +72,7 @@ public Java.Util.Map.Entry FloorEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("floorEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#higherEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#higherEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -81,7 +81,7 @@ public Java.Util.Map.Entry HigherEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("higherEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#lastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#lastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry LastEntry()
@@ -89,7 +89,7 @@ public Java.Util.Map.Entry LastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("lastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#lowerEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#lowerEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -98,7 +98,7 @@ public Java.Util.Map.Entry LowerEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("lowerEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#pollFirstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#pollFirstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry PollFirstEntry()
@@ -106,7 +106,7 @@ public Java.Util.Map.Entry PollFirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("pollFirstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#pollLastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#pollLastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry PollLastEntry()
@@ -114,7 +114,7 @@ public Java.Util.Map.Entry PollLastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("pollLastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#descendingMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#descendingMap()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableMap"/></returns>
         public Java.Util.NavigableMap DescendingMap()
@@ -122,7 +122,7 @@ public Java.Util.NavigableMap DescendingMap()
             return IExecuteWithSignature<Java.Util.NavigableMap>("descendingMap", "()Ljava/util/NavigableMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#headMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#headMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -132,7 +132,7 @@ public Java.Util.NavigableMap HeadMap(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap>("headMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -144,7 +144,7 @@ public Java.Util.NavigableMap SubMap(object arg0, bool arg1, object arg2, bool a
             return IExecute<Java.Util.NavigableMap>("subMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#tailMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#tailMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -154,7 +154,7 @@ public Java.Util.NavigableMap TailMap(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap>("tailMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#descendingKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#descendingKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet DescendingKeySet()
@@ -162,7 +162,7 @@ public Java.Util.NavigableSet DescendingKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("descendingKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#navigableKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#navigableKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet NavigableKeySet()
@@ -170,7 +170,7 @@ public Java.Util.NavigableSet NavigableKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("navigableKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -179,7 +179,7 @@ public Java.Util.SortedMap HeadMap(object arg0)
             return IExecuteWithSignature<Java.Util.SortedMap>("headMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -189,7 +189,7 @@ public Java.Util.SortedMap SubMap(object arg0, object arg1)
             return IExecute<Java.Util.SortedMap>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -198,7 +198,7 @@ public Java.Util.SortedMap TailMap(object arg0)
             return IExecuteWithSignature<Java.Util.SortedMap>("tailMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#ceilingKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#ceilingKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -207,7 +207,7 @@ public object CeilingKey(object arg0)
             return IExecuteWithSignature("ceilingKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#floorKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#floorKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -216,7 +216,7 @@ public object FloorKey(object arg0)
             return IExecuteWithSignature("floorKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#higherKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#higherKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -225,7 +225,7 @@ public object HigherKey(object arg0)
             return IExecuteWithSignature("higherKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#lowerKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#lowerKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -287,7 +287,7 @@ public partial class NavigableMap<K, V> : Java.Util.INavigableMap<K, V>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#ceilingEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#ceilingEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -296,7 +296,7 @@ public Java.Util.Map.Entry<K, V> CeilingEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("ceilingEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#firstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#firstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> FirstEntry()
@@ -304,7 +304,7 @@ public Java.Util.Map.Entry<K, V> FirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("firstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#floorEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#floorEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -313,7 +313,7 @@ public Java.Util.Map.Entry<K, V> FloorEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("floorEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#higherEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#higherEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -322,7 +322,7 @@ public Java.Util.Map.Entry<K, V> HigherEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("higherEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#lastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#lastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> LastEntry()
@@ -330,7 +330,7 @@ public Java.Util.Map.Entry<K, V> LastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("lastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#lowerEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#lowerEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -339,7 +339,7 @@ public Java.Util.Map.Entry<K, V> LowerEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("lowerEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#pollFirstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#pollFirstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> PollFirstEntry()
@@ -347,7 +347,7 @@ public Java.Util.Map.Entry<K, V> PollFirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("pollFirstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#pollLastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#pollLastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> PollLastEntry()
@@ -355,7 +355,7 @@ public Java.Util.Map.Entry<K, V> PollLastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("pollLastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#descendingMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#descendingMap()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableMap"/></returns>
         public Java.Util.NavigableMap<K, V> DescendingMap()
@@ -363,7 +363,7 @@ public Java.Util.NavigableMap<K, V> DescendingMap()
             return IExecuteWithSignature<Java.Util.NavigableMap<K, V>>("descendingMap", "()Ljava/util/NavigableMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#headMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#headMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -373,7 +373,7 @@ public Java.Util.NavigableMap<K, V> HeadMap(K arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap<K, V>>("headMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -385,7 +385,7 @@ public Java.Util.NavigableMap<K, V> SubMap(K arg0, bool arg1, K arg2, bool arg3)
             return IExecute<Java.Util.NavigableMap<K, V>>("subMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#tailMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#tailMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -395,7 +395,7 @@ public Java.Util.NavigableMap<K, V> TailMap(K arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap<K, V>>("tailMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#descendingKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#descendingKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<K> DescendingKeySet()
@@ -403,7 +403,7 @@ public Java.Util.NavigableSet<K> DescendingKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet<K>>("descendingKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#navigableKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#navigableKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<K> NavigableKeySet()
@@ -411,7 +411,7 @@ public Java.Util.NavigableSet<K> NavigableKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet<K>>("navigableKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -420,7 +420,7 @@ public Java.Util.SortedMap<K, V> HeadMap(K arg0)
             return IExecuteWithSignature<Java.Util.SortedMap<K, V>>("headMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="K"/></param>
@@ -430,7 +430,7 @@ public Java.Util.SortedMap<K, V> SubMap(K arg0, K arg1)
             return IExecute<Java.Util.SortedMap<K, V>>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -439,7 +439,7 @@ public Java.Util.SortedMap<K, V> TailMap(K arg0)
             return IExecuteWithSignature<Java.Util.SortedMap<K, V>>("tailMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#ceilingKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#ceilingKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -448,7 +448,7 @@ public K CeilingKey(K arg0)
             return IExecuteWithSignature<K>("ceilingKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#floorKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#floorKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -457,7 +457,7 @@ public K FloorKey(K arg0)
             return IExecuteWithSignature<K>("floorKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#higherKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#higherKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -466,7 +466,7 @@ public K HigherKey(K arg0)
             return IExecuteWithSignature<K>("higherKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableMap.html#lowerKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableMap.html#lowerKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/NavigableSet.cs b/src/net/Netdroid/Generated/Java/Util/NavigableSet.cs
index e3eee4e10..c78dfe189 100644
--- a/src/net/Netdroid/Generated/Java/Util/NavigableSet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/NavigableSet.cs
@@ -46,7 +46,7 @@ public partial class NavigableSet
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#ceiling(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#ceiling(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -55,7 +55,7 @@ public object Ceiling(object arg0)
             return IExecuteWithSignature("ceiling", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#floor(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#floor(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -64,7 +64,7 @@ public object Floor(object arg0)
             return IExecuteWithSignature("floor", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#higher(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#higher(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -73,7 +73,7 @@ public object Higher(object arg0)
             return IExecuteWithSignature("higher", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#lower(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#lower(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -82,7 +82,7 @@ public object Lower(object arg0)
             return IExecuteWithSignature("lower", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#pollFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollFirst()
@@ -90,7 +90,7 @@ public object PollFirst()
             return IExecuteWithSignature("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#pollLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollLast()
@@ -98,7 +98,7 @@ public object PollLast()
             return IExecuteWithSignature("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator DescendingIterator()
@@ -106,7 +106,7 @@ public Java.Util.Iterator DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -114,7 +114,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#descendingSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#descendingSet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet DescendingSet()
@@ -122,7 +122,7 @@ public Java.Util.NavigableSet DescendingSet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("descendingSet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#headSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#headSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -132,7 +132,7 @@ public Java.Util.NavigableSet HeadSet(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet>("headSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -144,7 +144,7 @@ public Java.Util.NavigableSet SubSet(object arg0, bool arg1, object arg2, bool a
             return IExecute<Java.Util.NavigableSet>("subSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#tailSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#tailSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -154,7 +154,7 @@ public Java.Util.NavigableSet TailSet(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet>("tailSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#headSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#headSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -163,7 +163,7 @@ public Java.Util.SortedSet HeadSet(object arg0)
             return IExecuteWithSignature<Java.Util.SortedSet>("headSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#subSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#subSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -173,7 +173,7 @@ public Java.Util.SortedSet SubSet(object arg0, object arg1)
             return IExecute<Java.Util.SortedSet>("subSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#tailSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#tailSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -235,7 +235,7 @@ public partial class NavigableSet<E> : Java.Util.INavigableSet<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#ceiling(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#ceiling(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -244,7 +244,7 @@ public E Ceiling(E arg0)
             return IExecuteWithSignature<E>("ceiling", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#floor(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#floor(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -253,7 +253,7 @@ public E Floor(E arg0)
             return IExecuteWithSignature<E>("floor", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#higher(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#higher(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -262,7 +262,7 @@ public E Higher(E arg0)
             return IExecuteWithSignature<E>("higher", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#lower(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#lower(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -271,7 +271,7 @@ public E Lower(E arg0)
             return IExecuteWithSignature<E>("lower", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#pollFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollFirst()
@@ -279,7 +279,7 @@ public E PollFirst()
             return IExecuteWithSignature<E>("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#pollLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollLast()
@@ -287,7 +287,7 @@ public E PollLast()
             return IExecuteWithSignature<E>("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> DescendingIterator()
@@ -295,7 +295,7 @@ public Java.Util.Iterator<E> DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> Iterator()
@@ -303,7 +303,7 @@ public Java.Util.Iterator<E> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#descendingSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#descendingSet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<E> DescendingSet()
@@ -311,7 +311,7 @@ public Java.Util.NavigableSet<E> DescendingSet()
             return IExecuteWithSignature<Java.Util.NavigableSet<E>>("descendingSet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#headSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#headSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -321,7 +321,7 @@ public Java.Util.NavigableSet<E> HeadSet(E arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet<E>>("headSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -333,7 +333,7 @@ public Java.Util.NavigableSet<E> SubSet(E arg0, bool arg1, E arg2, bool arg3)
             return IExecute<Java.Util.NavigableSet<E>>("subSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#tailSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#tailSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -343,7 +343,7 @@ public Java.Util.NavigableSet<E> TailSet(E arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet<E>>("tailSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#headSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#headSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -352,7 +352,7 @@ public Java.Util.SortedSet<E> HeadSet(E arg0)
             return IExecuteWithSignature<Java.Util.SortedSet<E>>("headSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#subSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#subSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -362,7 +362,7 @@ public Java.Util.SortedSet<E> SubSet(E arg0, E arg1)
             return IExecute<Java.Util.SortedSet<E>>("subSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/NavigableSet.html#tailSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/NavigableSet.html#tailSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Objects.cs b/src/net/Netdroid/Generated/Java/Util/Objects.cs
index 44651c0f6..86b44bea4 100644
--- a/src/net/Netdroid/Generated/Java/Util/Objects.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Objects.cs
@@ -42,7 +42,7 @@ public partial class Objects
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#requireNonNull(java.lang.Object,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#requireNonNull(java.lang.Object,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -53,7 +53,7 @@ public static T RequireNonNull<T>(T arg0, Java.Lang.String arg1)
             return SExecute<T>(LocalBridgeClazz, "requireNonNull", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#requireNonNull(java.lang.Object,java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#requireNonNull(java.lang.Object,java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Supplier"/></param>
@@ -64,7 +64,7 @@ public static T RequireNonNull<T>(T arg0, Java.Util.Function.Supplier<Java.Lang.
             return SExecute<T>(LocalBridgeClazz, "requireNonNull", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#requireNonNull(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#requireNonNull(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -74,7 +74,7 @@ public static T RequireNonNull<T>(T arg0)
             return SExecuteWithSignature<T>(LocalBridgeClazz, "requireNonNull", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#requireNonNullElse(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#requireNonNullElse(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><typeparamref name="T"/></param>
@@ -85,19 +85,19 @@ public static T RequireNonNullElse<T>(T arg0, T arg1)
             return SExecute<T>(LocalBridgeClazz, "requireNonNullElse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#requireNonNullElseGet(java.lang.Object,java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#requireNonNullElseGet(java.lang.Object,java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg1ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public static T RequireNonNullElseGet<T, Arg1ExtendsT>(T arg0, Java.Util.Function.Supplier<Arg1ExtendsT> arg1) where Arg1ExtendsT: T
+        public static T RequireNonNullElseGet<T, Arg1ExtendsT>(T arg0, Java.Util.Function.Supplier<Arg1ExtendsT> arg1) where Arg1ExtendsT : T
         {
             return SExecute<T>(LocalBridgeClazz, "requireNonNullElseGet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#deepEquals(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#deepEquals(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -107,7 +107,7 @@ public static bool DeepEquals(object arg0, object arg1)
             return SExecute<bool>(LocalBridgeClazz, "deepEquals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#equals(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#equals(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -117,7 +117,7 @@ public static bool Equals(object arg0, object arg1)
             return SExecute<bool>(LocalBridgeClazz, "equals", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#isNull(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#isNull(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -126,7 +126,7 @@ public static bool IsNull(object arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isNull", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#nonNull(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#nonNull(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -135,7 +135,7 @@ public static bool NonNull(object arg0)
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "nonNull", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#checkFromIndexSize(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#checkFromIndexSize(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -146,7 +146,7 @@ public static int CheckFromIndexSize(int arg0, int arg1, int arg2)
             return SExecute<int>(LocalBridgeClazz, "checkFromIndexSize", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#checkFromToIndex(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#checkFromToIndex(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -157,7 +157,7 @@ public static int CheckFromToIndex(int arg0, int arg1, int arg2)
             return SExecute<int>(LocalBridgeClazz, "checkFromToIndex", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#checkIndex(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#checkIndex(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -167,7 +167,7 @@ public static int CheckIndex(int arg0, int arg1)
             return SExecute<int>(LocalBridgeClazz, "checkIndex", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#hash(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#hash(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -176,7 +176,7 @@ public static int Hash(params object[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<int>(LocalBridgeClazz, "hash", "([Ljava/lang/Object;)I"); else return SExecuteWithSignature<int>(LocalBridgeClazz, "hash", "([Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#hashCode(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#hashCode(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -185,7 +185,7 @@ public static int HashCode(object arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "hashCode", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#toString(java.lang.Object,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#toString(java.lang.Object,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -195,7 +195,7 @@ public static Java.Lang.String ToString(object arg0, Java.Lang.String arg1)
             return SExecute<Java.Lang.String>(LocalBridgeClazz, "toString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#toString(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Objects.html#toString(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -203,38 +203,6 @@ public static Java.Lang.String ToString(object arg0)
         {
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "toString", "(Ljava/lang/Object;)Ljava/lang/String;", arg0);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#checkFromIndexSize(long,long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <param name="arg2"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long CheckFromIndexSize(long arg0, long arg1, long arg2)
-        {
-            return SExecute<long>(LocalBridgeClazz, "checkFromIndexSize", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#checkFromToIndex(long,long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <param name="arg2"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long CheckFromToIndex(long arg0, long arg1, long arg2)
-        {
-            return SExecute<long>(LocalBridgeClazz, "checkFromToIndex", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Objects.html#checkIndex(long,long)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="long"/></param>
-        /// <returns><see cref="long"/></returns>
-        public static long CheckIndex(long arg0, long arg1)
-        {
-            return SExecute<long>(LocalBridgeClazz, "checkIndex", arg0, arg1);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Util/Observable.cs b/src/net/Netdroid/Generated/Java/Util/Observable.cs
index 4a921be22..c4f081f35 100644
--- a/src/net/Netdroid/Generated/Java/Util/Observable.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Observable.cs
@@ -46,7 +46,7 @@ public partial class Observable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Observable.html#hasChanged()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Observable.html#hasChanged()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasChanged()
@@ -54,7 +54,7 @@ public bool HasChanged()
             return IExecuteWithSignature<bool>("hasChanged", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Observable.html#countObservers()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Observable.html#countObservers()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int CountObservers()
@@ -62,7 +62,7 @@ public int CountObservers()
             return IExecuteWithSignature<int>("countObservers", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Observable.html#addObserver(java.util.Observer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Observable.html#addObserver(java.util.Observer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Observer"/></param>
         public void AddObserver(Java.Util.Observer arg0)
@@ -70,7 +70,7 @@ public void AddObserver(Java.Util.Observer arg0)
             IExecuteWithSignature("addObserver", "(Ljava/util/Observer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Observable.html#deleteObserver(java.util.Observer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Observable.html#deleteObserver(java.util.Observer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Observer"/></param>
         public void DeleteObserver(Java.Util.Observer arg0)
@@ -78,21 +78,21 @@ public void DeleteObserver(Java.Util.Observer arg0)
             IExecuteWithSignature("deleteObserver", "(Ljava/util/Observer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Observable.html#deleteObservers()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Observable.html#deleteObservers()"/>
         /// </summary>
         public void DeleteObservers()
         {
             IExecuteWithSignature("deleteObservers", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Observable.html#notifyObservers()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Observable.html#notifyObservers()"/>
         /// </summary>
         public void NotifyObservers()
         {
             IExecuteWithSignature("notifyObservers", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Observable.html#notifyObservers(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Observable.html#notifyObservers(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void NotifyObservers(object arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Observer.cs b/src/net/Netdroid/Generated/Java/Util/Observer.cs
index 5e893be23..4483d21ab 100644
--- a/src/net/Netdroid/Generated/Java/Util/Observer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Observer.cs
@@ -64,7 +64,7 @@ public partial class Observer : Java.Util.IObserver
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Observer.html#update(java.util.Observable,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Observer.html#update(java.util.Observable,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Observable"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Optional.cs b/src/net/Netdroid/Generated/Java/Util/Optional.cs
index 04b40a56c..f977f2fdb 100644
--- a/src/net/Netdroid/Generated/Java/Util/Optional.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Optional.cs
@@ -42,7 +42,7 @@ public partial class Optional
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Optional"/></returns>
         public static Java.Util.Optional Empty()
@@ -50,7 +50,7 @@ public static Java.Util.Optional Empty()
             return SExecuteWithSignature<Java.Util.Optional>(LocalBridgeClazz, "empty", "()Ljava/util/Optional;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#of(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#of(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -59,7 +59,7 @@ public static Java.Util.Optional Of(object arg0)
             return SExecuteWithSignature<Java.Util.Optional>(LocalBridgeClazz, "of", "(Ljava/lang/Object;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#ofNullable(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#ofNullable(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -72,7 +72,7 @@ public static Java.Util.Optional OfNullable(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#flatMap(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#flatMap(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -81,7 +81,7 @@ public Java.Util.Optional FlatMap(Java.Util.Function.Function arg0)
             return IExecuteWithSignature<Java.Util.Optional>("flatMap", "(Ljava/util/function/Function;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#map(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#map(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -90,17 +90,17 @@ public Java.Util.Optional Map(Java.Util.Function.Function arg0)
             return IExecuteWithSignature<Java.Util.Optional>("map", "(Ljava/util/function/Function;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#orElseThrow(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#orElseThrow(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <returns><see cref="object"/></returns>
         /// <exception cref="Java.Lang.Throwable"/>
         public object OrElseThrow(Java.Util.Function.Supplier arg0)
         {
-            return IExecuteWithSignature("orElseThrow", "(Ljava/util/function/Supplier;)Ljava/lang/Object;", arg0);
+            return IExecute("orElseThrow", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -108,7 +108,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#isPresent()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#isPresent()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsPresent()
@@ -116,7 +116,7 @@ public bool IsPresent()
             return IExecuteWithSignature<bool>("isPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#filter(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#filter(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -125,7 +125,7 @@ public Java.Util.Optional Filter(Java.Util.Function.Predicate arg0)
             return IExecuteWithSignature<Java.Util.Optional>("filter", "(Ljava/util/function/Predicate;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#or(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#or(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -134,7 +134,7 @@ public Java.Util.Optional Or(Java.Util.Function.Supplier arg0)
             return IExecuteWithSignature<Java.Util.Optional>("or", "(Ljava/util/function/Supplier;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#stream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream Stream()
@@ -142,7 +142,7 @@ public Java.Util.Stream.Stream Stream()
             return IExecuteWithSignature<Java.Util.Stream.Stream>("stream", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#get()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Get()
@@ -150,7 +150,7 @@ public object Get()
             return IExecuteWithSignature("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#orElse(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#orElse(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -159,7 +159,7 @@ public object OrElse(object arg0)
             return IExecuteWithSignature("orElse", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#orElseGet(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#orElseGet(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <returns><see cref="object"/></returns>
@@ -168,7 +168,7 @@ public object OrElseGet(Java.Util.Function.Supplier arg0)
             return IExecuteWithSignature("orElseGet", "(Ljava/util/function/Supplier;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#orElseThrow()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#orElseThrow()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object OrElseThrow()
@@ -176,7 +176,7 @@ public object OrElseThrow()
             return IExecuteWithSignature("orElseThrow", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#ifPresent(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#ifPresent(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         public void IfPresent(Java.Util.Function.Consumer arg0)
@@ -184,7 +184,7 @@ public void IfPresent(Java.Util.Function.Consumer arg0)
             IExecuteWithSignature("ifPresent", "(Ljava/util/function/Consumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#ifPresentOrElse(java.util.function.Consumer,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#ifPresentOrElse(java.util.function.Consumer,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
@@ -224,7 +224,7 @@ public partial class Optional<T>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Optional"/></returns>
         public static Java.Util.Optional<T> Empty()
@@ -232,7 +232,7 @@ public static Java.Util.Optional<T> Empty()
             return SExecuteWithSignature<Java.Util.Optional<T>>(LocalBridgeClazz, "empty", "()Ljava/util/Optional;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#of(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#of(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -241,7 +241,7 @@ public static Java.Util.Optional<T> Of(T arg0)
             return SExecuteWithSignature<Java.Util.Optional<T>>(LocalBridgeClazz, "of", "(Ljava/lang/Object;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#ofNullable(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#ofNullable(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -254,7 +254,7 @@ public static Java.Util.Optional<T> OfNullable(T arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#flatMap(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#flatMap(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
@@ -262,36 +262,36 @@ public static Java.Util.Optional<T> OfNullable(T arg0)
         /// <typeparam name="Arg0ExtendsJava_Util_Optional_Arg0ExtendsU_"><see cref="Java.Util.Optional{Arg0ExtendsU}"/></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<U> FlatMap<U, Arg0objectSuperT, Arg0ExtendsJava_Util_Optional_Arg0ExtendsU_, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Optional_Arg0ExtendsU_> arg0) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Optional_Arg0ExtendsU_: Java.Util.Optional<Arg0ExtendsU> where Arg0ExtendsU: U
+        public Java.Util.Optional<U> FlatMap<U, Arg0objectSuperT, Arg0ExtendsJava_Util_Optional_Arg0ExtendsU_, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Optional_Arg0ExtendsU_> arg0) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Optional_Arg0ExtendsU_ : Java.Util.Optional<Arg0ExtendsU> where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Optional<U>>("flatMap", "(Ljava/util/function/Function;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#map(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#map(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<U> Map<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0) where Arg0objectSuperT: T where Arg0ExtendsU: U
+        public Java.Util.Optional<U> Map<U, Arg0objectSuperT, Arg0ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0) where Arg0objectSuperT : T where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Optional<U>>("map", "(Ljava/util/function/Function;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#orElseThrow(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#orElseThrow(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="Arg0ExtendsX"><typeparamref name="X"/></typeparam>
         /// <typeparam name="X"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Lang.Throwable"/>
-        public T OrElseThrow<Arg0ExtendsX, X>(Java.Util.Function.Supplier<Arg0ExtendsX> arg0) where Arg0ExtendsX: X
+        public T OrElseThrow<Arg0ExtendsX, X>(Java.Util.Function.Supplier<Arg0ExtendsX> arg0) where Arg0ExtendsX : X
         {
-            return IExecuteWithSignature<T>("orElseThrow", "(Ljava/util/function/Supplier;)Ljava/lang/Object;", arg0);
+            return IExecute<T>("orElseThrow", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -299,7 +299,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#isPresent()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#isPresent()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsPresent()
@@ -307,28 +307,28 @@ public bool IsPresent()
             return IExecuteWithSignature<bool>("isPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#filter(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#filter(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<T> Filter<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Optional<T> Filter<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Optional<T>>("filter", "(Ljava/util/function/Predicate;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#or(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#or(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="Arg0ExtendsJava_Util_Optional_Arg0ExtendsT_"><see cref="Java.Util.Optional{Arg0ExtendsT}"/></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Optional"/></returns>
-        public Java.Util.Optional<T> Or<Arg0ExtendsJava_Util_Optional_Arg0ExtendsT_, Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Optional_Arg0ExtendsT_> arg0) where Arg0ExtendsJava_Util_Optional_Arg0ExtendsT_: Java.Util.Optional<Arg0ExtendsT> where Arg0ExtendsT: T
+        public Java.Util.Optional<T> Or<Arg0ExtendsJava_Util_Optional_Arg0ExtendsT_, Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Optional_Arg0ExtendsT_> arg0) where Arg0ExtendsJava_Util_Optional_Arg0ExtendsT_ : Java.Util.Optional<Arg0ExtendsT> where Arg0ExtendsT : T
         {
             return IExecuteWithSignature<Java.Util.Optional<T>>("or", "(Ljava/util/function/Supplier;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#stream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<T> Stream()
@@ -336,7 +336,7 @@ public Java.Util.Stream.Stream<T> Stream()
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("stream", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#get()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#get()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public T Get()
@@ -344,7 +344,7 @@ public T Get()
             return IExecuteWithSignature<T>("get", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#orElse(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#orElse(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><typeparamref name="T"/></returns>
@@ -353,17 +353,17 @@ public T OrElse(T arg0)
             return IExecuteWithSignature<T>("orElse", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#orElseGet(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#orElseGet(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        public T OrElseGet<Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public T OrElseGet<Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return IExecuteWithSignature<T>("orElseGet", "(Ljava/util/function/Supplier;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#orElseThrow()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#orElseThrow()"/>
         /// </summary>
         /// <returns><typeparamref name="T"/></returns>
         public T OrElseThrow()
@@ -371,21 +371,21 @@ public T OrElseThrow()
             return IExecuteWithSignature<T>("orElseThrow", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#ifPresent(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#ifPresent(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        public void IfPresent<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public void IfPresent<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             IExecuteWithSignature("ifPresent", "(Ljava/util/function/Consumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Optional.html#ifPresentOrElse(java.util.function.Consumer,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Optional.html#ifPresentOrElse(java.util.function.Consumer,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        public void IfPresentOrElse<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0, Java.Lang.Runnable arg1) where Arg0objectSuperT: T
+        public void IfPresentOrElse<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0, Java.Lang.Runnable arg1) where Arg0objectSuperT : T
         {
             IExecute("ifPresentOrElse", arg0, arg1);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/OptionalDouble.cs b/src/net/Netdroid/Generated/Java/Util/OptionalDouble.cs
index e51a933b7..0d819bbe2 100644
--- a/src/net/Netdroid/Generated/Java/Util/OptionalDouble.cs
+++ b/src/net/Netdroid/Generated/Java/Util/OptionalDouble.cs
@@ -42,7 +42,7 @@ public partial class OptionalDouble
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
         public static Java.Util.OptionalDouble Empty()
@@ -50,7 +50,7 @@ public static Java.Util.OptionalDouble Empty()
             return SExecuteWithSignature<Java.Util.OptionalDouble>(LocalBridgeClazz, "empty", "()Ljava/util/OptionalDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#of(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#of(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
@@ -63,26 +63,19 @@ public static Java.Util.OptionalDouble Of(double arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#getAsDouble()"/> 
-        /// </summary>
-        public double AsDouble
-        {
-            get { return IExecuteWithSignature<double>("getAsDouble", "()D"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#orElseThrow(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#orElseThrow(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="Arg0ExtendsX"><typeparamref name="X"/></typeparam>
         /// <typeparam name="X"></typeparam>
         /// <returns><see cref="double"/></returns>
         /// <exception cref="Java.Lang.Throwable"/>
-        public double OrElseThrow<Arg0ExtendsX, X>(Java.Util.Function.Supplier<Arg0ExtendsX> arg0) where Arg0ExtendsX: X
+        public double OrElseThrow<Arg0ExtendsX, X>(Java.Util.Function.Supplier<Arg0ExtendsX> arg0) where Arg0ExtendsX : X
         {
-            return IExecuteWithSignature<double>("orElseThrow", "(Ljava/util/function/Supplier;)D", arg0);
+            return IExecute<double>("orElseThrow", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -90,7 +83,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#isPresent()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#isPresent()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsPresent()
@@ -98,7 +91,15 @@ public bool IsPresent()
             return IExecuteWithSignature<bool>("isPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#orElse(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#getAsDouble()"/>
+        /// </summary>
+        /// <returns><see cref="double"/></returns>
+        public double GetAsDouble()
+        {
+            return IExecuteWithSignature<double>("getAsDouble", "()D");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#orElse(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
@@ -107,7 +108,7 @@ public double OrElse(double arg0)
             return IExecuteWithSignature<double>("orElse", "(D)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#orElseGet(java.util.function.DoubleSupplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#orElseGet(java.util.function.DoubleSupplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleSupplier"/></param>
         /// <returns><see cref="double"/></returns>
@@ -116,7 +117,7 @@ public double OrElseGet(Java.Util.Function.DoubleSupplier arg0)
             return IExecuteWithSignature<double>("orElseGet", "(Ljava/util/function/DoubleSupplier;)D", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#orElseThrow()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#orElseThrow()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double OrElseThrow()
@@ -124,7 +125,7 @@ public double OrElseThrow()
             return IExecuteWithSignature<double>("orElseThrow", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#stream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
         public Java.Util.Stream.DoubleStream Stream()
@@ -132,7 +133,7 @@ public Java.Util.Stream.DoubleStream Stream()
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("stream", "()Ljava/util/stream/DoubleStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#ifPresent(java.util.function.DoubleConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#ifPresent(java.util.function.DoubleConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
         public void IfPresent(Java.Util.Function.DoubleConsumer arg0)
@@ -140,7 +141,7 @@ public void IfPresent(Java.Util.Function.DoubleConsumer arg0)
             IExecuteWithSignature("ifPresent", "(Ljava/util/function/DoubleConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalDouble.html#ifPresentOrElse(java.util.function.DoubleConsumer,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalDouble.html#ifPresentOrElse(java.util.function.DoubleConsumer,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/OptionalInt.cs b/src/net/Netdroid/Generated/Java/Util/OptionalInt.cs
index 76ef01599..b5c9c9a3e 100644
--- a/src/net/Netdroid/Generated/Java/Util/OptionalInt.cs
+++ b/src/net/Netdroid/Generated/Java/Util/OptionalInt.cs
@@ -42,7 +42,7 @@ public partial class OptionalInt
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalInt"/></returns>
         public static Java.Util.OptionalInt Empty()
@@ -50,7 +50,7 @@ public static Java.Util.OptionalInt Empty()
             return SExecuteWithSignature<Java.Util.OptionalInt>(LocalBridgeClazz, "empty", "()Ljava/util/OptionalInt;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.OptionalInt"/></returns>
@@ -63,26 +63,19 @@ public static Java.Util.OptionalInt Of(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#getAsInt()"/> 
-        /// </summary>
-        public int AsInt
-        {
-            get { return IExecuteWithSignature<int>("getAsInt", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#orElseThrow(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#orElseThrow(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="Arg0ExtendsX"><typeparamref name="X"/></typeparam>
         /// <typeparam name="X"></typeparam>
         /// <returns><see cref="int"/></returns>
         /// <exception cref="Java.Lang.Throwable"/>
-        public int OrElseThrow<Arg0ExtendsX, X>(Java.Util.Function.Supplier<Arg0ExtendsX> arg0) where Arg0ExtendsX: X
+        public int OrElseThrow<Arg0ExtendsX, X>(Java.Util.Function.Supplier<Arg0ExtendsX> arg0) where Arg0ExtendsX : X
         {
-            return IExecuteWithSignature<int>("orElseThrow", "(Ljava/util/function/Supplier;)I", arg0);
+            return IExecute<int>("orElseThrow", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -90,7 +83,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#isPresent()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#isPresent()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsPresent()
@@ -98,7 +91,15 @@ public bool IsPresent()
             return IExecuteWithSignature<bool>("isPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#orElse(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#getAsInt()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAsInt()
+        {
+            return IExecuteWithSignature<int>("getAsInt", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#orElse(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -107,7 +108,7 @@ public int OrElse(int arg0)
             return IExecuteWithSignature<int>("orElse", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#orElseGet(java.util.function.IntSupplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#orElseGet(java.util.function.IntSupplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntSupplier"/></param>
         /// <returns><see cref="int"/></returns>
@@ -116,7 +117,7 @@ public int OrElseGet(Java.Util.Function.IntSupplier arg0)
             return IExecuteWithSignature<int>("orElseGet", "(Ljava/util/function/IntSupplier;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#orElseThrow()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#orElseThrow()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int OrElseThrow()
@@ -124,7 +125,7 @@ public int OrElseThrow()
             return IExecuteWithSignature<int>("orElseThrow", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#stream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Stream()
@@ -132,7 +133,7 @@ public Java.Util.Stream.IntStream Stream()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("stream", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#ifPresent(java.util.function.IntConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#ifPresent(java.util.function.IntConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
         public void IfPresent(Java.Util.Function.IntConsumer arg0)
@@ -140,7 +141,7 @@ public void IfPresent(Java.Util.Function.IntConsumer arg0)
             IExecuteWithSignature("ifPresent", "(Ljava/util/function/IntConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalInt.html#ifPresentOrElse(java.util.function.IntConsumer,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalInt.html#ifPresentOrElse(java.util.function.IntConsumer,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/OptionalLong.cs b/src/net/Netdroid/Generated/Java/Util/OptionalLong.cs
index f3c993e98..c4f785b5a 100644
--- a/src/net/Netdroid/Generated/Java/Util/OptionalLong.cs
+++ b/src/net/Netdroid/Generated/Java/Util/OptionalLong.cs
@@ -42,7 +42,7 @@ public partial class OptionalLong
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalLong"/></returns>
         public static Java.Util.OptionalLong Empty()
@@ -50,7 +50,7 @@ public static Java.Util.OptionalLong Empty()
             return SExecuteWithSignature<Java.Util.OptionalLong>(LocalBridgeClazz, "empty", "()Ljava/util/OptionalLong;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#of(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#of(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.OptionalLong"/></returns>
@@ -63,26 +63,19 @@ public static Java.Util.OptionalLong Of(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#getAsLong()"/> 
-        /// </summary>
-        public long AsLong
-        {
-            get { return IExecuteWithSignature<long>("getAsLong", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#orElseThrow(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#orElseThrow(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="Arg0ExtendsX"><typeparamref name="X"/></typeparam>
         /// <typeparam name="X"></typeparam>
         /// <returns><see cref="long"/></returns>
         /// <exception cref="Java.Lang.Throwable"/>
-        public long OrElseThrow<Arg0ExtendsX, X>(Java.Util.Function.Supplier<Arg0ExtendsX> arg0) where Arg0ExtendsX: X
+        public long OrElseThrow<Arg0ExtendsX, X>(Java.Util.Function.Supplier<Arg0ExtendsX> arg0) where Arg0ExtendsX : X
         {
-            return IExecuteWithSignature<long>("orElseThrow", "(Ljava/util/function/Supplier;)J", arg0);
+            return IExecute<long>("orElseThrow", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -90,7 +83,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#isPresent()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#isPresent()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsPresent()
@@ -98,7 +91,7 @@ public bool IsPresent()
             return IExecuteWithSignature<bool>("isPresent", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#stream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
         public Java.Util.Stream.LongStream Stream()
@@ -106,7 +99,15 @@ public Java.Util.Stream.LongStream Stream()
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("stream", "()Ljava/util/stream/LongStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#orElse(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#getAsLong()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetAsLong()
+        {
+            return IExecuteWithSignature<long>("getAsLong", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#orElse(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
@@ -115,7 +116,7 @@ public long OrElse(long arg0)
             return IExecuteWithSignature<long>("orElse", "(J)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#orElseGet(java.util.function.LongSupplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#orElseGet(java.util.function.LongSupplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongSupplier"/></param>
         /// <returns><see cref="long"/></returns>
@@ -124,7 +125,7 @@ public long OrElseGet(Java.Util.Function.LongSupplier arg0)
             return IExecuteWithSignature<long>("orElseGet", "(Ljava/util/function/LongSupplier;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#orElseThrow()"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#orElseThrow()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long OrElseThrow()
@@ -132,7 +133,7 @@ public long OrElseThrow()
             return IExecuteWithSignature<long>("orElseThrow", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#ifPresent(java.util.function.LongConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#ifPresent(java.util.function.LongConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
         public void IfPresent(Java.Util.Function.LongConsumer arg0)
@@ -140,7 +141,7 @@ public void IfPresent(Java.Util.Function.LongConsumer arg0)
             IExecuteWithSignature("ifPresent", "(Ljava/util/function/LongConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/OptionalLong.html#ifPresentOrElse(java.util.function.LongConsumer,java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/OptionalLong.html#ifPresentOrElse(java.util.function.LongConsumer,java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Runnable"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Prefs/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Prefs/AllPackageClasses.cs
index 4d32f53c7..825830c44 100644
--- a/src/net/Netdroid/Generated/Java/Util/Prefs/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Prefs/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Prefs
 {
     #region AbstractPreferences
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/AbstractPreferences.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/AbstractPreferences.html"/>
     /// </summary>
     public partial class AbstractPreferences : Java.Util.Prefs.Preferences
     {
@@ -36,12 +36,12 @@ public partial class AbstractPreferences : Java.Util.Prefs.Preferences
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractPreferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractPreferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractPreferences() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractPreferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractPreferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractPreferences(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public AbstractPreferences(params object[] args) : base(args) { }
 
     #region BackingStoreException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/BackingStoreException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/BackingStoreException.html"/>
     /// </summary>
     public partial class BackingStoreException : Java.Lang.Exception
     {
@@ -91,7 +91,7 @@ public partial class BackingStoreException : Java.Lang.Exception
 
     #region InvalidPreferencesFormatException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/InvalidPreferencesFormatException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/InvalidPreferencesFormatException.html"/>
     /// </summary>
     public partial class InvalidPreferencesFormatException : Java.Lang.Exception
     {
@@ -108,7 +108,7 @@ public partial class InvalidPreferencesFormatException : Java.Lang.Exception
 
     #region NodeChangeEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeEvent.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeEvent.html"/>
     /// </summary>
     public partial class NodeChangeEvent : Java.Util.EventObject
     {
@@ -152,7 +152,7 @@ public NodeChangeEvent(params object[] args) : base(args) { }
 
     #region NodeChangeListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeListener.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeListener.html"/>
     /// </summary>
     public partial class NodeChangeListener : Java.Util.EventListener
     {
@@ -161,10 +161,13 @@ public partial class NodeChangeListener : Java.Util.EventListener
         /// </summary>
         public NodeChangeListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.prefs.NodeChangeListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.prefs.NodeChangeListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -186,10 +189,13 @@ public partial class NodeChangeListenerDirect : NodeChangeListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.prefs.NodeChangeListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.prefs.NodeChangeListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -211,7 +217,7 @@ protected override void InitializeHandlers() { }
 
     #region PreferenceChangeEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeEvent.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeEvent.html"/>
     /// </summary>
     public partial class PreferenceChangeEvent : Java.Util.EventObject
     {
@@ -255,7 +261,7 @@ public PreferenceChangeEvent(params object[] args) : base(args) { }
 
     #region PreferenceChangeListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeListener.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeListener.html"/>
     /// </summary>
     public partial class PreferenceChangeListener : Java.Util.EventListener
     {
@@ -264,10 +270,13 @@ public partial class PreferenceChangeListener : Java.Util.EventListener
         /// </summary>
         public PreferenceChangeListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.java.util.prefs.PreferenceChangeListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.java.util.prefs.PreferenceChangeListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -289,10 +298,13 @@ public partial class PreferenceChangeListenerDirect : PreferenceChangeListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "java.util.prefs.PreferenceChangeListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "java.util.prefs.PreferenceChangeListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -314,7 +326,7 @@ protected override void InitializeHandlers() { }
 
     #region Preferences
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html"/>
     /// </summary>
     public partial class Preferences : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Preferences>
     {
@@ -322,12 +334,12 @@ public partial class Preferences : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Prefe
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Preferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Preferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Preferences() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Preferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Preferences class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Preferences(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -360,7 +372,7 @@ public Preferences(params object[] args) : base(args) { }
 
     #region PreferencesFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferencesFactory.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/prefs/PreferencesFactory.html"/>
     /// </summary>
     public partial class PreferencesFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PreferencesFactory>
     {
@@ -368,12 +380,12 @@ public partial class PreferencesFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PreferencesFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferencesFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferencesFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PreferencesFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PreferencesFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PreferencesFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Java/Util/Prefs/NodeChangeEvent.cs b/src/net/Netdroid/Generated/Java/Util/Prefs/NodeChangeEvent.cs
index 02e802122..26d598ca2 100644
--- a/src/net/Netdroid/Generated/Java/Util/Prefs/NodeChangeEvent.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Prefs/NodeChangeEvent.cs
@@ -30,7 +30,7 @@ public partial class NodeChangeEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeEvent.html#%3Cinit%3E(java.util.prefs.Preferences,java.util.prefs.Preferences)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeEvent.html#%3Cinit%3E(java.util.prefs.Preferences,java.util.prefs.Preferences)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.Preferences"/></param>
         /// <param name="arg1"><see cref="Java.Util.Prefs.Preferences"/></param>
@@ -55,18 +55,20 @@ public NodeChangeEvent(Java.Util.Prefs.Preferences arg0, Java.Util.Prefs.Prefere
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeEvent.html#getChild()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeEvent.html#getChild()"/>
         /// </summary>
-        public Java.Util.Prefs.Preferences Child
+        /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
+        public Java.Util.Prefs.Preferences GetChild()
         {
-            get { return IExecuteWithSignature<Java.Util.Prefs.Preferences>("getChild", "()Ljava/util/prefs/Preferences;"); }
+            return IExecuteWithSignature<Java.Util.Prefs.Preferences>("getChild", "()Ljava/util/prefs/Preferences;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeEvent.html#getParent()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeEvent.html#getParent()"/>
         /// </summary>
-        public Java.Util.Prefs.Preferences Parent
+        /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
+        public Java.Util.Prefs.Preferences GetParent()
         {
-            get { return IExecuteWithSignature<Java.Util.Prefs.Preferences>("getParent", "()Ljava/util/prefs/Preferences;"); }
+            return IExecuteWithSignature<Java.Util.Prefs.Preferences>("getParent", "()Ljava/util/prefs/Preferences;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Prefs/NodeChangeListener.cs b/src/net/Netdroid/Generated/Java/Util/Prefs/NodeChangeListener.cs
index 5a3102e59..73b51c6e9 100644
--- a/src/net/Netdroid/Generated/Java/Util/Prefs/NodeChangeListener.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Prefs/NodeChangeListener.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Prefs
 {
     #region INodeChangeListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.prefs.NodeChangeListener implementing <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.prefs.NodeChangeListener implementing <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeListener.html"/>
     /// </summary>
     public partial interface INodeChangeListener
     {
@@ -68,16 +68,16 @@ public partial class NodeChangeListener : Java.Util.Prefs.INodeChangeListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("childAdded", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Prefs.NodeChangeEvent>>>(ChildAddedEventHandler));
-            AddEventHandler("childRemoved", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Prefs.NodeChangeEvent>>>(ChildRemovedEventHandler));
+            AddEventHandler("childAdded", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Prefs.NodeChangeEvent>>>(ChildAddedEventHandler));
+            AddEventHandler("childRemoved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Prefs.NodeChangeEvent>>>(ChildRemovedEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeListener.html#childAdded(java.util.prefs.NodeChangeEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeListener.html#childAdded(java.util.prefs.NodeChangeEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnChildAdded"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Util.Prefs.NodeChangeEvent> OnChildAdded { get; set; } = null;
+        public global::System.Action<Java.Util.Prefs.NodeChangeEvent> OnChildAdded { get; set; } = null;
 
         void ChildAddedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Prefs.NodeChangeEvent>> data)
         {
@@ -86,7 +86,7 @@ void ChildAddedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Jav
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeListener.html#childAdded(java.util.prefs.NodeChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeListener.html#childAdded(java.util.prefs.NodeChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.NodeChangeEvent"/></param>
         public virtual void ChildAdded(Java.Util.Prefs.NodeChangeEvent arg0)
@@ -95,10 +95,10 @@ public virtual void ChildAdded(Java.Util.Prefs.NodeChangeEvent arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeListener.html#childRemoved(java.util.prefs.NodeChangeEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeListener.html#childRemoved(java.util.prefs.NodeChangeEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnChildRemoved"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Util.Prefs.NodeChangeEvent> OnChildRemoved { get; set; } = null;
+        public global::System.Action<Java.Util.Prefs.NodeChangeEvent> OnChildRemoved { get; set; } = null;
 
         void ChildRemovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Prefs.NodeChangeEvent>> data)
         {
@@ -107,7 +107,7 @@ void ChildRemovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<J
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeListener.html#childRemoved(java.util.prefs.NodeChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeListener.html#childRemoved(java.util.prefs.NodeChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.NodeChangeEvent"/></param>
         public virtual void ChildRemoved(Java.Util.Prefs.NodeChangeEvent arg0)
@@ -146,7 +146,7 @@ public partial class NodeChangeListenerDirect : Java.Util.Prefs.INodeChangeListe
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeListener.html#childAdded(java.util.prefs.NodeChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeListener.html#childAdded(java.util.prefs.NodeChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.NodeChangeEvent"/></param>
         public override void ChildAdded(Java.Util.Prefs.NodeChangeEvent arg0)
@@ -154,7 +154,7 @@ public override void ChildAdded(Java.Util.Prefs.NodeChangeEvent arg0)
             IExecuteWithSignature("childAdded", "(Ljava/util/prefs/NodeChangeEvent;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/NodeChangeListener.html#childRemoved(java.util.prefs.NodeChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/NodeChangeListener.html#childRemoved(java.util.prefs.NodeChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.NodeChangeEvent"/></param>
         public override void ChildRemoved(Java.Util.Prefs.NodeChangeEvent arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Prefs/PreferenceChangeEvent.cs b/src/net/Netdroid/Generated/Java/Util/Prefs/PreferenceChangeEvent.cs
index b70839912..e75ad4d66 100644
--- a/src/net/Netdroid/Generated/Java/Util/Prefs/PreferenceChangeEvent.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Prefs/PreferenceChangeEvent.cs
@@ -30,7 +30,7 @@ public partial class PreferenceChangeEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeEvent.html#%3Cinit%3E(java.util.prefs.Preferences,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeEvent.html#%3Cinit%3E(java.util.prefs.Preferences,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.Preferences"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -56,25 +56,28 @@ public PreferenceChangeEvent(Java.Util.Prefs.Preferences arg0, Java.Lang.String
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeEvent.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeEvent.html#getKey()"/>
         /// </summary>
-        public Java.Lang.String Key
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetKey()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getKey", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeEvent.html#getNewValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeEvent.html#getNewValue()"/>
         /// </summary>
-        public Java.Lang.String NewValue
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNewValue()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNewValue", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNewValue", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeEvent.html#getNode()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeEvent.html#getNode()"/>
         /// </summary>
-        public Java.Util.Prefs.Preferences Node
+        /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
+        public Java.Util.Prefs.Preferences GetNode()
         {
-            get { return IExecuteWithSignature<Java.Util.Prefs.Preferences>("getNode", "()Ljava/util/prefs/Preferences;"); }
+            return IExecuteWithSignature<Java.Util.Prefs.Preferences>("getNode", "()Ljava/util/prefs/Preferences;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Prefs/PreferenceChangeListener.cs b/src/net/Netdroid/Generated/Java/Util/Prefs/PreferenceChangeListener.cs
index 73a15147f..8930bdb99 100644
--- a/src/net/Netdroid/Generated/Java/Util/Prefs/PreferenceChangeListener.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Prefs/PreferenceChangeListener.cs
@@ -27,7 +27,7 @@ namespace Java.Util.Prefs
 {
     #region IPreferenceChangeListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.java.util.prefs.PreferenceChangeListener implementing <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.java.util.prefs.PreferenceChangeListener implementing <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeListener.html"/>
     /// </summary>
     public partial interface IPreferenceChangeListener
     {
@@ -68,15 +68,15 @@ public partial class PreferenceChangeListener : Java.Util.Prefs.IPreferenceChang
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("preferenceChange", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Prefs.PreferenceChangeEvent>>>(PreferenceChangeEventHandler));
+            AddEventHandler("preferenceChange", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Prefs.PreferenceChangeEvent>>>(PreferenceChangeEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeListener.html#preferenceChange(java.util.prefs.PreferenceChangeEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeListener.html#preferenceChange(java.util.prefs.PreferenceChangeEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnPreferenceChange"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Util.Prefs.PreferenceChangeEvent> OnPreferenceChange { get; set; } = null;
+        public global::System.Action<Java.Util.Prefs.PreferenceChangeEvent> OnPreferenceChange { get; set; } = null;
 
         void PreferenceChangeEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Prefs.PreferenceChangeEvent>> data)
         {
@@ -85,7 +85,7 @@ void PreferenceChangeEventHandler(object sender, CLRListenerEventArgs<CLREventDa
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeListener.html#preferenceChange(java.util.prefs.PreferenceChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeListener.html#preferenceChange(java.util.prefs.PreferenceChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.PreferenceChangeEvent"/></param>
         public virtual void PreferenceChange(Java.Util.Prefs.PreferenceChangeEvent arg0)
@@ -124,7 +124,7 @@ public partial class PreferenceChangeListenerDirect : Java.Util.Prefs.IPreferenc
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferenceChangeListener.html#preferenceChange(java.util.prefs.PreferenceChangeEvent)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/PreferenceChangeListener.html#preferenceChange(java.util.prefs.PreferenceChangeEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.PreferenceChangeEvent"/></param>
         public override void PreferenceChange(Java.Util.Prefs.PreferenceChangeEvent arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Prefs/Preferences.cs b/src/net/Netdroid/Generated/Java/Util/Prefs/Preferences.cs
index 799f59e75..acd8975a4 100644
--- a/src/net/Netdroid/Generated/Java/Util/Prefs/Preferences.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Prefs/Preferences.cs
@@ -38,19 +38,19 @@ public partial class Preferences
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#MAX_KEY_LENGTH"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#MAX_KEY_LENGTH"/>
         /// </summary>
         public static int MAX_KEY_LENGTH { get { if (!_MAX_KEY_LENGTHReady) { _MAX_KEY_LENGTHContent = SGetField<int>(LocalBridgeClazz, "MAX_KEY_LENGTH"); _MAX_KEY_LENGTHReady = true; } return _MAX_KEY_LENGTHContent; } }
         private static int _MAX_KEY_LENGTHContent = default;
         private static bool _MAX_KEY_LENGTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#MAX_NAME_LENGTH"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#MAX_NAME_LENGTH"/>
         /// </summary>
         public static int MAX_NAME_LENGTH { get { if (!_MAX_NAME_LENGTHReady) { _MAX_NAME_LENGTHContent = SGetField<int>(LocalBridgeClazz, "MAX_NAME_LENGTH"); _MAX_NAME_LENGTHReady = true; } return _MAX_NAME_LENGTHContent; } }
         private static int _MAX_NAME_LENGTHContent = default;
         private static bool _MAX_NAME_LENGTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#MAX_VALUE_LENGTH"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#MAX_VALUE_LENGTH"/>
         /// </summary>
         public static int MAX_VALUE_LENGTH { get { if (!_MAX_VALUE_LENGTHReady) { _MAX_VALUE_LENGTHContent = SGetField<int>(LocalBridgeClazz, "MAX_VALUE_LENGTH"); _MAX_VALUE_LENGTHReady = true; } return _MAX_VALUE_LENGTHContent; } }
         private static int _MAX_VALUE_LENGTHContent = default;
@@ -60,7 +60,7 @@ public partial class Preferences
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#systemNodeForPackage(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#systemNodeForPackage(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
@@ -69,7 +69,7 @@ public static Java.Util.Prefs.Preferences SystemNodeForPackage(Java.Lang.Class a
             return SExecuteWithSignature<Java.Util.Prefs.Preferences>(LocalBridgeClazz, "systemNodeForPackage", "(Ljava/lang/Class;)Ljava/util/prefs/Preferences;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#systemRoot()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#systemRoot()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
         public static Java.Util.Prefs.Preferences SystemRoot()
@@ -77,7 +77,7 @@ public static Java.Util.Prefs.Preferences SystemRoot()
             return SExecuteWithSignature<Java.Util.Prefs.Preferences>(LocalBridgeClazz, "systemRoot", "()Ljava/util/prefs/Preferences;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#userNodeForPackage(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#userNodeForPackage(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
@@ -86,7 +86,7 @@ public static Java.Util.Prefs.Preferences UserNodeForPackage(Java.Lang.Class arg
             return SExecuteWithSignature<Java.Util.Prefs.Preferences>(LocalBridgeClazz, "userNodeForPackage", "(Ljava/lang/Class;)Ljava/util/prefs/Preferences;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#userRoot()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#userRoot()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
         public static Java.Util.Prefs.Preferences UserRoot()
@@ -94,7 +94,7 @@ public static Java.Util.Prefs.Preferences UserRoot()
             return SExecuteWithSignature<Java.Util.Prefs.Preferences>(LocalBridgeClazz, "userRoot", "()Ljava/util/prefs/Preferences;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#importPreferences(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#importPreferences(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -108,7 +108,7 @@ public static void ImportPreferences(Java.Io.InputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#getBoolean(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#getBoolean(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -118,7 +118,7 @@ public bool GetBoolean(Java.Lang.String arg0, bool arg1)
             return IExecute<bool>("getBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#isUserNode()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#isUserNode()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsUserNode()
@@ -126,7 +126,7 @@ public bool IsUserNode()
             return IExecuteWithSignature<bool>("isUserNode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#nodeExists(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#nodeExists(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -136,7 +136,7 @@ public bool NodeExists(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("nodeExists", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#getByteArray(java.lang.String,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#getByteArray(java.lang.String,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -146,7 +146,7 @@ public byte[] GetByteArray(Java.Lang.String arg0, byte[] arg1)
             return IExecuteArray<byte>("getByteArray", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#getDouble(java.lang.String,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#getDouble(java.lang.String,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -156,7 +156,7 @@ public double GetDouble(Java.Lang.String arg0, double arg1)
             return IExecute<double>("getDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#getFloat(java.lang.String,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#getFloat(java.lang.String,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -166,7 +166,7 @@ public float GetFloat(Java.Lang.String arg0, float arg1)
             return IExecute<float>("getFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#getInt(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#getInt(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -176,7 +176,7 @@ public int GetInt(Java.Lang.String arg0, int arg1)
             return IExecute<int>("getInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#absolutePath()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#absolutePath()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String AbsolutePath()
@@ -184,7 +184,7 @@ public Java.Lang.String AbsolutePath()
             return IExecuteWithSignature<Java.Lang.String>("absolutePath", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#get(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#get(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -194,7 +194,7 @@ public Java.Lang.String Get(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<Java.Lang.String>("get", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#name()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#name()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Name()
@@ -202,7 +202,7 @@ public Java.Lang.String Name()
             return IExecuteWithSignature<Java.Lang.String>("name", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#childrenNames()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#childrenNames()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Util.Prefs.BackingStoreException"/>
@@ -211,7 +211,7 @@ public Java.Lang.String[] ChildrenNames()
             return IExecuteWithSignatureArray<Java.Lang.String>("childrenNames", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#keys()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#keys()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         /// <exception cref="Java.Util.Prefs.BackingStoreException"/>
@@ -220,7 +220,7 @@ public Java.Lang.String[] Keys()
             return IExecuteWithSignatureArray<Java.Lang.String>("keys", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#node(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#node(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
@@ -229,7 +229,7 @@ public Java.Util.Prefs.Preferences Node(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Prefs.Preferences>("node", "(Ljava/lang/String;)Ljava/util/prefs/Preferences;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#parent()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#parent()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
         public Java.Util.Prefs.Preferences Parent()
@@ -237,7 +237,7 @@ public Java.Util.Prefs.Preferences Parent()
             return IExecuteWithSignature<Java.Util.Prefs.Preferences>("parent", "()Ljava/util/prefs/Preferences;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#getLong(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#getLong(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -247,7 +247,7 @@ public long GetLong(Java.Lang.String arg0, long arg1)
             return IExecute<long>("getLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#addNodeChangeListener(java.util.prefs.NodeChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#addNodeChangeListener(java.util.prefs.NodeChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.NodeChangeListener"/></param>
         public void AddNodeChangeListener(Java.Util.Prefs.NodeChangeListener arg0)
@@ -255,7 +255,7 @@ public void AddNodeChangeListener(Java.Util.Prefs.NodeChangeListener arg0)
             IExecuteWithSignature("addNodeChangeListener", "(Ljava/util/prefs/NodeChangeListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#addPreferenceChangeListener(java.util.prefs.PreferenceChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#addPreferenceChangeListener(java.util.prefs.PreferenceChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.PreferenceChangeListener"/></param>
         public void AddPreferenceChangeListener(Java.Util.Prefs.PreferenceChangeListener arg0)
@@ -263,7 +263,7 @@ public void AddPreferenceChangeListener(Java.Util.Prefs.PreferenceChangeListener
             IExecuteWithSignature("addPreferenceChangeListener", "(Ljava/util/prefs/PreferenceChangeListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#clear()"/>
         /// </summary>
         /// <exception cref="Java.Util.Prefs.BackingStoreException"/>
         public void Clear()
@@ -271,7 +271,7 @@ public void Clear()
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#exportNode(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#exportNode(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -281,7 +281,7 @@ public void ExportNode(Java.Io.OutputStream arg0)
             IExecuteWithSignature("exportNode", "(Ljava/io/OutputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#exportSubtree(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#exportSubtree(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -291,7 +291,7 @@ public void ExportSubtree(Java.Io.OutputStream arg0)
             IExecuteWithSignature("exportSubtree", "(Ljava/io/OutputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#flush()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#flush()"/>
         /// </summary>
         /// <exception cref="Java.Util.Prefs.BackingStoreException"/>
         public void Flush()
@@ -299,7 +299,7 @@ public void Flush()
             IExecuteWithSignature("flush", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#put(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#put(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -308,7 +308,7 @@ public void Put(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("put", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#putBoolean(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#putBoolean(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -317,7 +317,7 @@ public void PutBoolean(Java.Lang.String arg0, bool arg1)
             IExecute("putBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#putByteArray(java.lang.String,byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#putByteArray(java.lang.String,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -326,7 +326,7 @@ public void PutByteArray(Java.Lang.String arg0, byte[] arg1)
             IExecute("putByteArray", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#putDouble(java.lang.String,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#putDouble(java.lang.String,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -335,7 +335,7 @@ public void PutDouble(Java.Lang.String arg0, double arg1)
             IExecute("putDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#putFloat(java.lang.String,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#putFloat(java.lang.String,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -344,7 +344,7 @@ public void PutFloat(Java.Lang.String arg0, float arg1)
             IExecute("putFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#putInt(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#putInt(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -353,7 +353,7 @@ public void PutInt(Java.Lang.String arg0, int arg1)
             IExecute("putInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#putLong(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#putLong(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -362,7 +362,7 @@ public void PutLong(Java.Lang.String arg0, long arg1)
             IExecute("putLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#remove(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#remove(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void Remove(Java.Lang.String arg0)
@@ -370,7 +370,7 @@ public void Remove(Java.Lang.String arg0)
             IExecuteWithSignature("remove", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#removeNode()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#removeNode()"/>
         /// </summary>
         /// <exception cref="Java.Util.Prefs.BackingStoreException"/>
         public void RemoveNode()
@@ -378,7 +378,7 @@ public void RemoveNode()
             IExecuteWithSignature("removeNode", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#removeNodeChangeListener(java.util.prefs.NodeChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#removeNodeChangeListener(java.util.prefs.NodeChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.NodeChangeListener"/></param>
         public void RemoveNodeChangeListener(Java.Util.Prefs.NodeChangeListener arg0)
@@ -386,7 +386,7 @@ public void RemoveNodeChangeListener(Java.Util.Prefs.NodeChangeListener arg0)
             IExecuteWithSignature("removeNodeChangeListener", "(Ljava/util/prefs/NodeChangeListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#removePreferenceChangeListener(java.util.prefs.PreferenceChangeListener)"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#removePreferenceChangeListener(java.util.prefs.PreferenceChangeListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Prefs.PreferenceChangeListener"/></param>
         public void RemovePreferenceChangeListener(Java.Util.Prefs.PreferenceChangeListener arg0)
@@ -394,7 +394,7 @@ public void RemovePreferenceChangeListener(Java.Util.Prefs.PreferenceChangeListe
             IExecuteWithSignature("removePreferenceChangeListener", "(Ljava/util/prefs/PreferenceChangeListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/Preferences.html#sync()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/Preferences.html#sync()"/>
         /// </summary>
         /// <exception cref="Java.Util.Prefs.BackingStoreException"/>
         public void Sync()
diff --git a/src/net/Netdroid/Generated/Java/Util/Prefs/PreferencesFactory.cs b/src/net/Netdroid/Generated/Java/Util/Prefs/PreferencesFactory.cs
index cb8a1c1d7..780556dba 100644
--- a/src/net/Netdroid/Generated/Java/Util/Prefs/PreferencesFactory.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Prefs/PreferencesFactory.cs
@@ -64,7 +64,7 @@ public partial class PreferencesFactory : Java.Util.Prefs.IPreferencesFactory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferencesFactory.html#systemRoot()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/PreferencesFactory.html#systemRoot()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
         public Java.Util.Prefs.Preferences SystemRoot()
@@ -72,7 +72,7 @@ public Java.Util.Prefs.Preferences SystemRoot()
             return IExecuteWithSignature<Java.Util.Prefs.Preferences>("systemRoot", "()Ljava/util/prefs/Preferences;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.prefs/java/util/prefs/PreferencesFactory.html#userRoot()"/>
+        /// <see href="https://developer.android.com/reference/java/util/prefs/PreferencesFactory.html#userRoot()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Prefs.Preferences"/></returns>
         public Java.Util.Prefs.Preferences UserRoot()
diff --git a/src/net/Netdroid/Generated/Java/Util/PrimitiveIterator.cs b/src/net/Netdroid/Generated/Java/Util/PrimitiveIterator.cs
index 52ef2b545..b15c78489 100644
--- a/src/net/Netdroid/Generated/Java/Util/PrimitiveIterator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/PrimitiveIterator.cs
@@ -46,7 +46,7 @@ public partial class PrimitiveIterator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.html#forEachRemaining(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.html#forEachRemaining(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void ForEachRemaining(object arg0)
@@ -78,7 +78,7 @@ public partial class OfDouble
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfDouble.html#nextDouble()"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfDouble.html#nextDouble()"/>
             /// </summary>
             /// <returns><see cref="double"/></returns>
             public double NextDouble()
@@ -86,7 +86,7 @@ public double NextDouble()
                 return IExecuteWithSignature<double>("nextDouble", "()D");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfDouble.html#next()"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfDouble.html#next()"/>
             /// </summary>
             /// <returns><see cref="object"/></returns>
             public object Next()
@@ -94,7 +94,7 @@ public object Next()
                 return IExecuteWithSignature("next", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfDouble.html#forEachRemaining(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfDouble.html#forEachRemaining(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             public void ForEachRemaining(object arg0)
@@ -102,16 +102,16 @@ public void ForEachRemaining(object arg0)
                 IExecuteWithSignature("forEachRemaining", "(Ljava/lang/Object;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfDouble.html#forEachRemaining(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfDouble.html#forEachRemaining(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Double"><see cref="Java.Lang.Double"/></typeparam>
-            public void ForEachRemaining<Arg0objectSuperJava_Lang_Double>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Double> arg0) where Arg0objectSuperJava_Lang_Double: Java.Lang.Double
+            public void ForEachRemaining<Arg0objectSuperJava_Lang_Double>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Double> arg0) where Arg0objectSuperJava_Lang_Double : Java.Lang.Double
             {
                 IExecuteWithSignature("forEachRemaining", "(Ljava/util/function/Consumer;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfDouble.html#forEachRemaining(java.util.function.DoubleConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfDouble.html#forEachRemaining(java.util.function.DoubleConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
             public void ForEachRemaining(Java.Util.Function.DoubleConsumer arg0)
@@ -150,7 +150,7 @@ public partial class OfInt
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfInt.html#nextInt()"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfInt.html#nextInt()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
             public int NextInt()
@@ -158,7 +158,7 @@ public int NextInt()
                 return IExecuteWithSignature<int>("nextInt", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfInt.html#next()"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfInt.html#next()"/>
             /// </summary>
             /// <returns><see cref="object"/></returns>
             public object Next()
@@ -166,7 +166,7 @@ public object Next()
                 return IExecuteWithSignature("next", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfInt.html#forEachRemaining(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfInt.html#forEachRemaining(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             public void ForEachRemaining(object arg0)
@@ -174,16 +174,16 @@ public void ForEachRemaining(object arg0)
                 IExecuteWithSignature("forEachRemaining", "(Ljava/lang/Object;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfInt.html#forEachRemaining(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfInt.html#forEachRemaining(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Integer"><see cref="Java.Lang.Integer"/></typeparam>
-            public void ForEachRemaining<Arg0objectSuperJava_Lang_Integer>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Integer> arg0) where Arg0objectSuperJava_Lang_Integer: Java.Lang.Integer
+            public void ForEachRemaining<Arg0objectSuperJava_Lang_Integer>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Integer> arg0) where Arg0objectSuperJava_Lang_Integer : Java.Lang.Integer
             {
                 IExecuteWithSignature("forEachRemaining", "(Ljava/util/function/Consumer;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfInt.html#forEachRemaining(java.util.function.IntConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfInt.html#forEachRemaining(java.util.function.IntConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
             public void ForEachRemaining(Java.Util.Function.IntConsumer arg0)
@@ -222,7 +222,7 @@ public partial class OfLong
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfLong.html#nextLong()"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfLong.html#nextLong()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
             public long NextLong()
@@ -230,7 +230,7 @@ public long NextLong()
                 return IExecuteWithSignature<long>("nextLong", "()J");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfLong.html#next()"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfLong.html#next()"/>
             /// </summary>
             /// <returns><see cref="object"/></returns>
             public object Next()
@@ -238,7 +238,7 @@ public object Next()
                 return IExecuteWithSignature("next", "()Ljava/lang/Object;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfLong.html#forEachRemaining(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfLong.html#forEachRemaining(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             public void ForEachRemaining(object arg0)
@@ -246,16 +246,16 @@ public void ForEachRemaining(object arg0)
                 IExecuteWithSignature("forEachRemaining", "(Ljava/lang/Object;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfLong.html#forEachRemaining(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfLong.html#forEachRemaining(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Long"><see cref="Java.Lang.Long"/></typeparam>
-            public void ForEachRemaining<Arg0objectSuperJava_Lang_Long>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Long> arg0) where Arg0objectSuperJava_Lang_Long: Java.Lang.Long
+            public void ForEachRemaining<Arg0objectSuperJava_Lang_Long>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Long> arg0) where Arg0objectSuperJava_Lang_Long : Java.Lang.Long
             {
                 IExecuteWithSignature("forEachRemaining", "(Ljava/util/function/Consumer;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.OfLong.html#forEachRemaining(java.util.function.LongConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.OfLong.html#forEachRemaining(java.util.function.LongConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
             public void ForEachRemaining(Java.Util.Function.LongConsumer arg0)
@@ -323,7 +323,7 @@ public partial class PrimitiveIterator<T, T_CONS> : Java.Util.IPrimitiveIterator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PrimitiveIterator.html#forEachRemaining(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PrimitiveIterator.html#forEachRemaining(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T_CONS"/></param>
         public void ForEachRemaining(T_CONS arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/PriorityQueue.cs b/src/net/Netdroid/Generated/Java/Util/PriorityQueue.cs
index 420fe9923..1828006c0 100644
--- a/src/net/Netdroid/Generated/Java/Util/PriorityQueue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/PriorityQueue.cs
@@ -30,7 +30,7 @@ public partial class PriorityQueue
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public PriorityQueue(int arg0)
@@ -38,7 +38,7 @@ public PriorityQueue(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public PriorityQueue(Java.Util.Collection arg0)
@@ -46,7 +46,7 @@ public PriorityQueue(Java.Util.Collection arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html#%3Cinit%3E(java.util.PriorityQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html#%3Cinit%3E(java.util.PriorityQueue)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.PriorityQueue"/></param>
         public PriorityQueue(Java.Util.PriorityQueue arg0)
@@ -54,7 +54,7 @@ public PriorityQueue(Java.Util.PriorityQueue arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html#%3Cinit%3E(java.util.SortedSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html#%3Cinit%3E(java.util.SortedSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         public PriorityQueue(Java.Util.SortedSet arg0)
@@ -97,7 +97,7 @@ public partial class PriorityQueue<E>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public PriorityQueue(int arg0)
@@ -105,7 +105,7 @@ public PriorityQueue(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public PriorityQueue(Java.Util.Collection<E> arg0)
@@ -113,7 +113,7 @@ public PriorityQueue(Java.Util.Collection<E> arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html#%3Cinit%3E(java.util.PriorityQueue)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html#%3Cinit%3E(java.util.PriorityQueue)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.PriorityQueue"/></param>
         public PriorityQueue(Java.Util.PriorityQueue<E> arg0)
@@ -121,7 +121,7 @@ public PriorityQueue(Java.Util.PriorityQueue<E> arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PriorityQueue.html#%3Cinit%3E(java.util.SortedSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PriorityQueue.html#%3Cinit%3E(java.util.SortedSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         public PriorityQueue(Java.Util.SortedSet<E> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Properties.cs b/src/net/Netdroid/Generated/Java/Util/Properties.cs
index e4562f7dd..ec7988a0b 100644
--- a/src/net/Netdroid/Generated/Java/Util/Properties.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Properties.cs
@@ -30,7 +30,7 @@ public partial class Properties
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Properties(int arg0)
@@ -38,7 +38,7 @@ public Properties(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#%3Cinit%3E(java.util.Properties)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#%3Cinit%3E(java.util.Properties)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Properties"/></param>
         public Properties(Java.Util.Properties arg0)
@@ -62,7 +62,7 @@ public Properties(Java.Util.Properties arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#getProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#getProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -72,7 +72,7 @@ public Java.Lang.String GetProperty(Java.Lang.String arg0, Java.Lang.String arg1
             return IExecute<Java.Lang.String>("getProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -81,7 +81,7 @@ public Java.Lang.String GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#propertyNames()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#propertyNames()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<object> PropertyNames()
@@ -89,7 +89,7 @@ public Java.Util.Enumeration<object> PropertyNames()
             return IExecuteWithSignature<Java.Util.Enumeration<object>>("propertyNames", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#stringPropertyNames()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#stringPropertyNames()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Lang.String> StringPropertyNames()
@@ -97,7 +97,7 @@ public Java.Util.Enumeration<object> PropertyNames()
             return IExecuteWithSignature<Java.Util.Set<Java.Lang.String>>("stringPropertyNames", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#setProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#setProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -107,7 +107,7 @@ public object SetProperty(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute("setProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#load(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#load(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -116,7 +116,7 @@ public void Load(Java.Io.InputStream arg0)
             IExecuteWithSignature("load", "(Ljava/io/InputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#load(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#load(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -125,7 +125,7 @@ public void Load(Java.Io.Reader arg0)
             IExecuteWithSignature("load", "(Ljava/io/Reader;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#loadFromXML(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#loadFromXML(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -135,7 +135,7 @@ public void LoadFromXML(Java.Io.InputStream arg0)
             IExecuteWithSignature("loadFromXML", "(Ljava/io/InputStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#list(java.io.PrintStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#list(java.io.PrintStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PrintStream"/></param>
         public void List(Java.Io.PrintStream arg0)
@@ -143,7 +143,7 @@ public void List(Java.Io.PrintStream arg0)
             IExecuteWithSignature("list", "(Ljava/io/PrintStream;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#list(java.io.PrintWriter)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#list(java.io.PrintWriter)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.PrintWriter"/></param>
         public void List(Java.Io.PrintWriter arg0)
@@ -151,17 +151,17 @@ public void List(Java.Io.PrintWriter arg0)
             IExecuteWithSignature("list", "(Ljava/io/PrintWriter;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#save(java.io.OutputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#save(java.io.OutputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Save(Java.Io.OutputStream arg0, Java.Lang.String arg1)
         {
             IExecute("save", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#store(java.io.OutputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#store(java.io.OutputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -171,7 +171,7 @@ public void Store(Java.Io.OutputStream arg0, Java.Lang.String arg1)
             IExecute("store", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#store(java.io.Writer,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#store(java.io.Writer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -181,7 +181,7 @@ public void Store(Java.Io.Writer arg0, Java.Lang.String arg1)
             IExecute("store", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#storeToXML(java.io.OutputStream,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#storeToXML(java.io.OutputStream,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -192,7 +192,7 @@ public void StoreToXML(Java.Io.OutputStream arg0, Java.Lang.String arg1, Java.La
             IExecute("storeToXML", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#storeToXML(java.io.OutputStream,java.lang.String,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#storeToXML(java.io.OutputStream,java.lang.String,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -203,7 +203,7 @@ public void StoreToXML(Java.Io.OutputStream arg0, Java.Lang.String arg1, Java.Ni
             IExecute("storeToXML", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Properties.html#storeToXML(java.io.OutputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Properties.html#storeToXML(java.io.OutputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/PropertyPermission.cs b/src/net/Netdroid/Generated/Java/Util/PropertyPermission.cs
index b0e000a6d..f9b7f157c 100644
--- a/src/net/Netdroid/Generated/Java/Util/PropertyPermission.cs
+++ b/src/net/Netdroid/Generated/Java/Util/PropertyPermission.cs
@@ -30,7 +30,7 @@ public partial class PropertyPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PropertyPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PropertyPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/PropertyResourceBundle.cs b/src/net/Netdroid/Generated/Java/Util/PropertyResourceBundle.cs
index b81442948..f382e17ca 100644
--- a/src/net/Netdroid/Generated/Java/Util/PropertyResourceBundle.cs
+++ b/src/net/Netdroid/Generated/Java/Util/PropertyResourceBundle.cs
@@ -30,7 +30,7 @@ public partial class PropertyResourceBundle
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PropertyResourceBundle.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PropertyResourceBundle.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -39,7 +39,7 @@ public PropertyResourceBundle(Java.Io.InputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PropertyResourceBundle.html#%3Cinit%3E(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PropertyResourceBundle.html#%3Cinit%3E(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -64,7 +64,7 @@ public PropertyResourceBundle(Java.Io.Reader arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/PropertyResourceBundle.html#handleGetObject(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/PropertyResourceBundle.html#handleGetObject(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Queue.cs b/src/net/Netdroid/Generated/Java/Util/Queue.cs
index 58b62e444..b5f32dd3c 100644
--- a/src/net/Netdroid/Generated/Java/Util/Queue.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Queue.cs
@@ -46,7 +46,7 @@ public partial class Queue
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -55,7 +55,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -64,7 +64,7 @@ public bool Offer(object arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#element()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Element()
@@ -72,7 +72,7 @@ public object Element()
             return IExecuteWithSignature("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#peek()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Peek()
@@ -80,7 +80,7 @@ public object Peek()
             return IExecuteWithSignature("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#poll()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Poll()
@@ -88,7 +88,7 @@ public object Poll()
             return IExecuteWithSignature("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#remove()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Remove()
@@ -149,7 +149,7 @@ public partial class Queue<E> : Java.Util.IQueue<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -158,7 +158,7 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#offer(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#offer(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -167,7 +167,7 @@ public bool Offer(E arg0)
             return IExecuteWithSignature<bool>("offer", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#element()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#element()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Element()
@@ -175,7 +175,7 @@ public E Element()
             return IExecuteWithSignature<E>("element", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#peek()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Peek()
@@ -183,7 +183,7 @@ public E Peek()
             return IExecuteWithSignature<E>("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#poll()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#poll()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Poll()
@@ -191,7 +191,7 @@ public E Poll()
             return IExecuteWithSignature<E>("poll", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Queue.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Queue.html#remove()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Remove()
diff --git a/src/net/Netdroid/Generated/Java/Util/Random.cs b/src/net/Netdroid/Generated/Java/Util/Random.cs
index 00a56cb06..c94ebecd0 100644
--- a/src/net/Netdroid/Generated/Java/Util/Random.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Random.cs
@@ -26,11 +26,11 @@
 namespace Java.Util
 {
     #region Random
-    public partial class Random : Java.Io.ISerializable
+    public partial class Random
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public Random(long arg0)
@@ -41,10 +41,6 @@ public Random(long arg0)
         #endregion
 
         #region Class/Interface conversion operators
-        /// <summary>
-        /// Converter from <see cref="Java.Util.Random"/> to <see cref="Java.Io.Serializable"/>
-        /// </summary>
-        public static implicit operator Java.Io.Serializable(Java.Util.Random t) => t.Cast<Java.Io.Serializable>();
 
         #endregion
 
@@ -58,7 +54,7 @@ public Random(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#nextBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#nextBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool NextBoolean()
@@ -66,7 +62,7 @@ public bool NextBoolean()
             return IExecuteWithSignature<bool>("nextBoolean", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#nextDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#nextDouble()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double NextDouble()
@@ -74,7 +70,7 @@ public double NextDouble()
             return IExecuteWithSignature<double>("nextDouble", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#nextFloat()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#nextFloat()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         public float NextFloat()
@@ -82,7 +78,7 @@ public float NextFloat()
             return IExecuteWithSignature<float>("nextFloat", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#nextInt()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#nextInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int NextInt()
@@ -90,7 +86,7 @@ public int NextInt()
             return IExecuteWithSignature<int>("nextInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#nextInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#nextInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -99,7 +95,7 @@ public int NextInt(int arg0)
             return IExecuteWithSignature<int>("nextInt", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#doubles()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#doubles()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
         public Java.Util.Stream.DoubleStream Doubles()
@@ -107,7 +103,7 @@ public Java.Util.Stream.DoubleStream Doubles()
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("doubles", "()Ljava/util/stream/DoubleStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#doubles(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#doubles(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -117,7 +113,7 @@ public Java.Util.Stream.DoubleStream Doubles(double arg0, double arg1)
             return IExecute<Java.Util.Stream.DoubleStream>("doubles", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#doubles(long,double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#doubles(long,double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -128,7 +124,7 @@ public Java.Util.Stream.DoubleStream Doubles(long arg0, double arg1, double arg2
             return IExecute<Java.Util.Stream.DoubleStream>("doubles", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#doubles(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#doubles(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -137,7 +133,7 @@ public Java.Util.Stream.DoubleStream Doubles(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("doubles", "(J)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#ints()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#ints()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Ints()
@@ -145,7 +141,7 @@ public Java.Util.Stream.IntStream Ints()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("ints", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#ints(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#ints(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -155,7 +151,7 @@ public Java.Util.Stream.IntStream Ints(int arg0, int arg1)
             return IExecute<Java.Util.Stream.IntStream>("ints", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#ints(long,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#ints(long,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -166,7 +162,7 @@ public Java.Util.Stream.IntStream Ints(long arg0, int arg1, int arg2)
             return IExecute<Java.Util.Stream.IntStream>("ints", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#ints(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#ints(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -175,7 +171,7 @@ public Java.Util.Stream.IntStream Ints(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("ints", "(J)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#longs()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#longs()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
         public Java.Util.Stream.LongStream Longs()
@@ -183,7 +179,7 @@ public Java.Util.Stream.LongStream Longs()
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("longs", "()Ljava/util/stream/LongStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#longs(long,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#longs(long,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -194,7 +190,7 @@ public Java.Util.Stream.LongStream Longs(long arg0, long arg1, long arg2)
             return IExecute<Java.Util.Stream.LongStream>("longs", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#longs(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#longs(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -204,7 +200,7 @@ public Java.Util.Stream.LongStream Longs(long arg0, long arg1)
             return IExecute<Java.Util.Stream.LongStream>("longs", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#longs(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#longs(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -213,7 +209,7 @@ public Java.Util.Stream.LongStream Longs(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("longs", "(J)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#nextLong()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#nextLong()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long NextLong()
@@ -221,7 +217,7 @@ public long NextLong()
             return IExecuteWithSignature<long>("nextLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#nextGaussian()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#nextGaussian()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double NextGaussian()
@@ -229,7 +225,7 @@ public double NextGaussian()
             return IExecuteWithSignature<double>("nextGaussian", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#setSeed(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#setSeed(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public void SetSeed(long arg0)
@@ -237,7 +233,7 @@ public void SetSeed(long arg0)
             IExecuteWithSignature("setSeed", "(J)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Random.html#nextBytes(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Random.html#nextBytes(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void NextBytes(byte[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Regex/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Regex/AllPackageClasses.cs
index bcab470e4..5ffe8713b 100644
--- a/src/net/Netdroid/Generated/Java/Util/Regex/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Regex/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Regex
 {
     #region Matcher
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html"/>
     /// </summary>
     public partial class Matcher : Java.Util.Regex.MatchResult
     {
@@ -72,7 +72,7 @@ public Matcher(params object[] args) : base(args) { }
 
     #region MatchResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/regex/MatchResult.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/regex/MatchResult.html"/>
     /// </summary>
     public partial class MatchResult : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MatchResult>
     {
@@ -80,12 +80,12 @@ public partial class MatchResult : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Match
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MatchResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MatchResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MatchResult() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MatchResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MatchResult class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MatchResult(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -118,7 +118,7 @@ public MatchResult(params object[] args) : base(args) { }
 
     #region Pattern
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html"/>
     /// </summary>
     public partial class Pattern : Java.Io.Serializable
     {
@@ -162,7 +162,7 @@ public Pattern(params object[] args) : base(args) { }
 
     #region PatternSyntaxException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/regex/PatternSyntaxException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/regex/PatternSyntaxException.html"/>
     /// </summary>
     public partial class PatternSyntaxException : Java.Lang.IllegalArgumentException
     {
diff --git a/src/net/Netdroid/Generated/Java/Util/Regex/MatchResult.cs b/src/net/Netdroid/Generated/Java/Util/Regex/MatchResult.cs
index 20a9ed1dd..7b89fc5e6 100644
--- a/src/net/Netdroid/Generated/Java/Util/Regex/MatchResult.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Regex/MatchResult.cs
@@ -64,7 +64,7 @@ public partial class MatchResult : Java.Util.Regex.IMatchResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/MatchResult.html#end()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/MatchResult.html#end()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int End()
@@ -72,7 +72,7 @@ public int End()
             return IExecuteWithSignature<int>("end", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/MatchResult.html#end(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/MatchResult.html#end(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -81,7 +81,7 @@ public int End(int arg0)
             return IExecuteWithSignature<int>("end", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/MatchResult.html#groupCount()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/MatchResult.html#groupCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int GroupCount()
@@ -89,7 +89,7 @@ public int GroupCount()
             return IExecuteWithSignature<int>("groupCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/MatchResult.html#start()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/MatchResult.html#start()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Start()
@@ -97,7 +97,7 @@ public int Start()
             return IExecuteWithSignature<int>("start", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/MatchResult.html#start(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/MatchResult.html#start(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -106,7 +106,7 @@ public int Start(int arg0)
             return IExecuteWithSignature<int>("start", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/MatchResult.html#group()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/MatchResult.html#group()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Group()
@@ -114,7 +114,7 @@ public Java.Lang.String Group()
             return IExecuteWithSignature<Java.Lang.String>("group", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/MatchResult.html#group(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/MatchResult.html#group(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Regex/Matcher.cs b/src/net/Netdroid/Generated/Java/Util/Regex/Matcher.cs
index 5652ef019..724fed896 100644
--- a/src/net/Netdroid/Generated/Java/Util/Regex/Matcher.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Regex/Matcher.cs
@@ -42,7 +42,7 @@ public partial class Matcher
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#quoteReplacement(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#quoteReplacement(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -55,7 +55,7 @@ public static Java.Lang.String QuoteReplacement(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#find()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#find()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Find()
@@ -63,7 +63,7 @@ public bool Find()
             return IExecuteWithSignature<bool>("find", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#find(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#find(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -72,7 +72,7 @@ public bool Find(int arg0)
             return IExecuteWithSignature<bool>("find", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#hasAnchoringBounds()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#hasAnchoringBounds()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasAnchoringBounds()
@@ -80,7 +80,7 @@ public bool HasAnchoringBounds()
             return IExecuteWithSignature<bool>("hasAnchoringBounds", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#hasTransparentBounds()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#hasTransparentBounds()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasTransparentBounds()
@@ -88,7 +88,7 @@ public bool HasTransparentBounds()
             return IExecuteWithSignature<bool>("hasTransparentBounds", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#hitEnd()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#hitEnd()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HitEnd()
@@ -96,7 +96,7 @@ public bool HitEnd()
             return IExecuteWithSignature<bool>("hitEnd", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#lookingAt()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#lookingAt()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool LookingAt()
@@ -104,7 +104,7 @@ public bool LookingAt()
             return IExecuteWithSignature<bool>("lookingAt", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#matches()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#matches()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Matches()
@@ -112,7 +112,7 @@ public bool Matches()
             return IExecuteWithSignature<bool>("matches", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#requireEnd()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#requireEnd()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool RequireEnd()
@@ -120,7 +120,7 @@ public bool RequireEnd()
             return IExecuteWithSignature<bool>("requireEnd", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#end()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#end()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int End()
@@ -128,7 +128,7 @@ public int End()
             return IExecuteWithSignature<int>("end", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#end(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#end(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -137,7 +137,7 @@ public int End(int arg0)
             return IExecuteWithSignature<int>("end", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#end(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#end(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -146,7 +146,7 @@ public int End(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("end", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#groupCount()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#groupCount()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int GroupCount()
@@ -154,7 +154,7 @@ public int GroupCount()
             return IExecuteWithSignature<int>("groupCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#regionEnd()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#regionEnd()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RegionEnd()
@@ -162,7 +162,7 @@ public int RegionEnd()
             return IExecuteWithSignature<int>("regionEnd", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#regionStart()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#regionStart()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int RegionStart()
@@ -170,7 +170,7 @@ public int RegionStart()
             return IExecuteWithSignature<int>("regionStart", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#start()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#start()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Start()
@@ -178,7 +178,7 @@ public int Start()
             return IExecuteWithSignature<int>("start", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#start(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#start(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -187,7 +187,7 @@ public int Start(int arg0)
             return IExecuteWithSignature<int>("start", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#start(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#start(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -196,7 +196,7 @@ public int Start(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("start", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#group()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#group()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Group()
@@ -204,7 +204,7 @@ public Java.Lang.String Group()
             return IExecuteWithSignature<Java.Lang.String>("group", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#group(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#group(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -213,7 +213,7 @@ public Java.Lang.String Group(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("group", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#group(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#group(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -222,7 +222,7 @@ public Java.Lang.String Group(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("group", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#replaceAll(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#replaceAll(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -231,7 +231,7 @@ public Java.Lang.String ReplaceAll(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("replaceAll", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#replaceAll(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#replaceAll(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -240,7 +240,7 @@ public Java.Lang.String ReplaceAll(Java.Util.Function.Function<Java.Util.Regex.M
             return IExecuteWithSignature<Java.Lang.String>("replaceAll", "(Ljava/util/function/Function;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#replaceFirst(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#replaceFirst(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -249,7 +249,7 @@ public Java.Lang.String ReplaceFirst(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("replaceFirst", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#replaceFirst(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#replaceFirst(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -258,7 +258,7 @@ public Java.Lang.String ReplaceFirst(Java.Util.Function.Function<Java.Util.Regex
             return IExecuteWithSignature<Java.Lang.String>("replaceFirst", "(Ljava/util/function/Function;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#appendTail(java.lang.StringBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#appendTail(java.lang.StringBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuffer"/></param>
         /// <returns><see cref="Java.Lang.StringBuffer"/></returns>
@@ -267,7 +267,7 @@ public Java.Lang.StringBuffer AppendTail(Java.Lang.StringBuffer arg0)
             return IExecuteWithSignature<Java.Lang.StringBuffer>("appendTail", "(Ljava/lang/StringBuffer;)Ljava/lang/StringBuffer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#appendTail(java.lang.StringBuilder)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#appendTail(java.lang.StringBuilder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuilder"/></param>
         /// <returns><see cref="Java.Lang.StringBuilder"/></returns>
@@ -276,7 +276,7 @@ public Java.Lang.StringBuilder AppendTail(Java.Lang.StringBuilder arg0)
             return IExecuteWithSignature<Java.Lang.StringBuilder>("appendTail", "(Ljava/lang/StringBuilder;)Ljava/lang/StringBuilder;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#appendReplacement(java.lang.StringBuffer,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#appendReplacement(java.lang.StringBuffer,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -286,7 +286,7 @@ public Java.Util.Regex.Matcher AppendReplacement(Java.Lang.StringBuffer arg0, Ja
             return IExecute<Java.Util.Regex.Matcher>("appendReplacement", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#appendReplacement(java.lang.StringBuilder,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#appendReplacement(java.lang.StringBuilder,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.StringBuilder"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -296,7 +296,7 @@ public Java.Util.Regex.Matcher AppendReplacement(Java.Lang.StringBuilder arg0, J
             return IExecute<Java.Util.Regex.Matcher>("appendReplacement", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#region(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#region(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -306,7 +306,7 @@ public Java.Util.Regex.Matcher Region(int arg0, int arg1)
             return IExecute<Java.Util.Regex.Matcher>("region", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#reset()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Regex.Matcher"/></returns>
         public Java.Util.Regex.Matcher Reset()
@@ -314,7 +314,7 @@ public Java.Util.Regex.Matcher Reset()
             return IExecuteWithSignature<Java.Util.Regex.Matcher>("reset", "()Ljava/util/regex/Matcher;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#reset(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#reset(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Util.Regex.Matcher"/></returns>
@@ -323,7 +323,7 @@ public Java.Util.Regex.Matcher Reset(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Util.Regex.Matcher>("reset", "(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#useAnchoringBounds(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#useAnchoringBounds(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Util.Regex.Matcher"/></returns>
@@ -332,7 +332,7 @@ public Java.Util.Regex.Matcher UseAnchoringBounds(bool arg0)
             return IExecuteWithSignature<Java.Util.Regex.Matcher>("useAnchoringBounds", "(Z)Ljava/util/regex/Matcher;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#usePattern(java.util.regex.Pattern)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#usePattern(java.util.regex.Pattern)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
         /// <returns><see cref="Java.Util.Regex.Matcher"/></returns>
@@ -341,7 +341,7 @@ public Java.Util.Regex.Matcher UsePattern(Java.Util.Regex.Pattern arg0)
             return IExecuteWithSignature<Java.Util.Regex.Matcher>("usePattern", "(Ljava/util/regex/Pattern;)Ljava/util/regex/Matcher;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#useTransparentBounds(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#useTransparentBounds(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Java.Util.Regex.Matcher"/></returns>
@@ -350,7 +350,7 @@ public Java.Util.Regex.Matcher UseTransparentBounds(bool arg0)
             return IExecuteWithSignature<Java.Util.Regex.Matcher>("useTransparentBounds", "(Z)Ljava/util/regex/Matcher;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#toMatchResult()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#toMatchResult()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Regex.MatchResult"/></returns>
         public Java.Util.Regex.MatchResult ToMatchResult()
@@ -358,7 +358,7 @@ public Java.Util.Regex.MatchResult ToMatchResult()
             return IExecuteWithSignature<Java.Util.Regex.MatchResult>("toMatchResult", "()Ljava/util/regex/MatchResult;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#pattern()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#pattern()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Regex.Pattern"/></returns>
         public Java.Util.Regex.Pattern Pattern()
@@ -366,7 +366,7 @@ public Java.Util.Regex.Pattern Pattern()
             return IExecuteWithSignature<Java.Util.Regex.Pattern>("pattern", "()Ljava/util/regex/Pattern;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Matcher.html#results()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Matcher.html#results()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Util.Regex.MatchResult> Results()
diff --git a/src/net/Netdroid/Generated/Java/Util/Regex/Pattern.cs b/src/net/Netdroid/Generated/Java/Util/Regex/Pattern.cs
index fe48edee6..e4161d6e7 100644
--- a/src/net/Netdroid/Generated/Java/Util/Regex/Pattern.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Regex/Pattern.cs
@@ -38,55 +38,55 @@ public partial class Pattern
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#CANON_EQ"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#CANON_EQ"/>
         /// </summary>
         public static int CANON_EQ { get { if (!_CANON_EQReady) { _CANON_EQContent = SGetField<int>(LocalBridgeClazz, "CANON_EQ"); _CANON_EQReady = true; } return _CANON_EQContent; } }
         private static int _CANON_EQContent = default;
         private static bool _CANON_EQReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#CASE_INSENSITIVE"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#CASE_INSENSITIVE"/>
         /// </summary>
         public static int CASE_INSENSITIVE { get { if (!_CASE_INSENSITIVEReady) { _CASE_INSENSITIVEContent = SGetField<int>(LocalBridgeClazz, "CASE_INSENSITIVE"); _CASE_INSENSITIVEReady = true; } return _CASE_INSENSITIVEContent; } }
         private static int _CASE_INSENSITIVEContent = default;
         private static bool _CASE_INSENSITIVEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#COMMENTS"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#COMMENTS"/>
         /// </summary>
         public static int COMMENTS { get { if (!_COMMENTSReady) { _COMMENTSContent = SGetField<int>(LocalBridgeClazz, "COMMENTS"); _COMMENTSReady = true; } return _COMMENTSContent; } }
         private static int _COMMENTSContent = default;
         private static bool _COMMENTSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#DOTALL"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#DOTALL"/>
         /// </summary>
         public static int DOTALL { get { if (!_DOTALLReady) { _DOTALLContent = SGetField<int>(LocalBridgeClazz, "DOTALL"); _DOTALLReady = true; } return _DOTALLContent; } }
         private static int _DOTALLContent = default;
         private static bool _DOTALLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#LITERAL"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#LITERAL"/>
         /// </summary>
         public static int LITERAL { get { if (!_LITERALReady) { _LITERALContent = SGetField<int>(LocalBridgeClazz, "LITERAL"); _LITERALReady = true; } return _LITERALContent; } }
         private static int _LITERALContent = default;
         private static bool _LITERALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#MULTILINE"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#MULTILINE"/>
         /// </summary>
         public static int MULTILINE { get { if (!_MULTILINEReady) { _MULTILINEContent = SGetField<int>(LocalBridgeClazz, "MULTILINE"); _MULTILINEReady = true; } return _MULTILINEContent; } }
         private static int _MULTILINEContent = default;
         private static bool _MULTILINEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#UNICODE_CASE"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#UNICODE_CASE"/>
         /// </summary>
         public static int UNICODE_CASE { get { if (!_UNICODE_CASEReady) { _UNICODE_CASEContent = SGetField<int>(LocalBridgeClazz, "UNICODE_CASE"); _UNICODE_CASEReady = true; } return _UNICODE_CASEContent; } }
         private static int _UNICODE_CASEContent = default;
         private static bool _UNICODE_CASEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#UNICODE_CHARACTER_CLASS"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#UNICODE_CHARACTER_CLASS"/>
         /// </summary>
         public static int UNICODE_CHARACTER_CLASS { get { if (!_UNICODE_CHARACTER_CLASSReady) { _UNICODE_CHARACTER_CLASSContent = SGetField<int>(LocalBridgeClazz, "UNICODE_CHARACTER_CLASS"); _UNICODE_CHARACTER_CLASSReady = true; } return _UNICODE_CHARACTER_CLASSContent; } }
         private static int _UNICODE_CHARACTER_CLASSContent = default;
         private static bool _UNICODE_CHARACTER_CLASSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#UNIX_LINES"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#UNIX_LINES"/>
         /// </summary>
         public static int UNIX_LINES { get { if (!_UNIX_LINESReady) { _UNIX_LINESContent = SGetField<int>(LocalBridgeClazz, "UNIX_LINES"); _UNIX_LINESReady = true; } return _UNIX_LINESContent; } }
         private static int _UNIX_LINESContent = default;
@@ -96,7 +96,7 @@ public partial class Pattern
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#matches(java.lang.String,java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#matches(java.lang.String,java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
@@ -106,7 +106,7 @@ public static bool Matches(Java.Lang.String arg0, Java.Lang.CharSequence arg1)
             return SExecute<bool>(LocalBridgeClazz, "matches", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#quote(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#quote(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -115,7 +115,7 @@ public static Java.Lang.String Quote(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "quote", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#compile(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#compile(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -125,7 +125,7 @@ public static Java.Util.Regex.Pattern Compile(Java.Lang.String arg0, int arg1)
             return SExecute<Java.Util.Regex.Pattern>(LocalBridgeClazz, "compile", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#compile(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#compile(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Regex.Pattern"/></returns>
@@ -138,7 +138,7 @@ public static Java.Util.Regex.Pattern Compile(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#flags()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#flags()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Flags()
@@ -146,7 +146,7 @@ public int Flags()
             return IExecuteWithSignature<int>("flags", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#pattern()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#pattern()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String PatternMethod()
@@ -154,7 +154,7 @@ public Java.Lang.String PatternMethod()
             return IExecuteWithSignature<Java.Lang.String>("pattern", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#split(java.lang.CharSequence,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#split(java.lang.CharSequence,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -164,7 +164,7 @@ public Java.Lang.String[] Split(Java.Lang.CharSequence arg0, int arg1)
             return IExecuteArray<Java.Lang.String>("split", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#split(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#split(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -173,7 +173,7 @@ public Java.Lang.String[] Split(Java.Lang.CharSequence arg0)
             return IExecuteWithSignatureArray<Java.Lang.String>("split", "(Ljava/lang/CharSequence;)[Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#asMatchPredicate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#asMatchPredicate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         public Java.Util.Function.Predicate<Java.Lang.String> AsMatchPredicate()
@@ -181,7 +181,7 @@ public Java.Lang.String[] Split(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Util.Function.Predicate<Java.Lang.String>>("asMatchPredicate", "()Ljava/util/function/Predicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#asMatchPredicate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#asMatchPredicate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         public Java.Util.Function.Predicate<Java.Lang.String> AsMatchPredicateDirect()
@@ -189,7 +189,7 @@ public Java.Lang.String[] Split(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Util.Function.PredicateDirect<Java.Lang.String>, Java.Util.Function.Predicate<Java.Lang.String>>("asMatchPredicate", "()Ljava/util/function/Predicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#asPredicate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#asPredicate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         public Java.Util.Function.Predicate<Java.Lang.String> AsPredicate()
@@ -197,7 +197,7 @@ public Java.Lang.String[] Split(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Util.Function.Predicate<Java.Lang.String>>("asPredicate", "()Ljava/util/function/Predicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#asPredicate()"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#asPredicate()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Predicate"/></returns>
         public Java.Util.Function.Predicate<Java.Lang.String> AsPredicateDirect()
@@ -205,7 +205,7 @@ public Java.Lang.String[] Split(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Util.Function.PredicateDirect<Java.Lang.String>, Java.Util.Function.Predicate<Java.Lang.String>>("asPredicate", "()Ljava/util/function/Predicate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#matcher(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#matcher(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Util.Regex.Matcher"/></returns>
@@ -214,7 +214,7 @@ public Java.Util.Regex.Matcher Matcher(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Util.Regex.Matcher>("matcher", "(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/regex/Pattern.html#splitAsStream(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/regex/Pattern.html#splitAsStream(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/ResourceBundle.cs b/src/net/Netdroid/Generated/Java/Util/ResourceBundle.cs
index f5b5c0d1b..3f0f23d7c 100644
--- a/src/net/Netdroid/Generated/Java/Util/ResourceBundle.cs
+++ b/src/net/Netdroid/Generated/Java/Util/ResourceBundle.cs
@@ -42,7 +42,7 @@ public partial class ResourceBundle
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.Locale,java.util.ResourceBundle.Control)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.Locale,java.util.ResourceBundle.Control)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -53,7 +53,7 @@ public static Java.Util.ResourceBundle GetBundle(Java.Lang.String arg0, Java.Uti
             return SExecute<Java.Util.ResourceBundle>(LocalBridgeClazz, "getBundle", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -63,7 +63,7 @@ public static Java.Util.ResourceBundle GetBundle(Java.Lang.String arg0, Java.Uti
             return SExecute<Java.Util.ResourceBundle>(LocalBridgeClazz, "getBundle", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.ResourceBundle.Control)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.ResourceBundle.Control)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.ResourceBundle.Control"/></param>
@@ -73,7 +73,7 @@ public static Java.Util.ResourceBundle GetBundle(Java.Lang.String arg0, Java.Uti
             return SExecute<Java.Util.ResourceBundle>(LocalBridgeClazz, "getBundle", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getBundle(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getBundle(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.ResourceBundle"/></returns>
@@ -82,14 +82,14 @@ public static Java.Util.ResourceBundle GetBundle(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.ResourceBundle>(LocalBridgeClazz, "getBundle", "(Ljava/lang/String;)Ljava/util/ResourceBundle;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#clearCache()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#clearCache()"/>
         /// </summary>
         public static void ClearCache()
         {
             SExecuteWithSignature(LocalBridgeClazz, "clearCache", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#clearCache(java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#clearCache(java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.ClassLoader"/></param>
         public static void ClearCache(Java.Lang.ClassLoader arg0)
@@ -97,7 +97,7 @@ public static void ClearCache(Java.Lang.ClassLoader arg0)
             SExecuteWithSignature(LocalBridgeClazz, "clearCache", "(Ljava/lang/ClassLoader;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.Locale,java.lang.ClassLoader,java.util.ResourceBundle.Control)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.Locale,java.lang.ClassLoader,java.util.ResourceBundle.Control)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -109,7 +109,7 @@ public static Java.Util.ResourceBundle GetBundle(Java.Lang.String arg0, Java.Uti
             return SExecute<Java.Util.ResourceBundle>(LocalBridgeClazz, "getBundle", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.Locale,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getBundle(java.lang.String,java.util.Locale,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -124,28 +124,15 @@ public static Java.Util.ResourceBundle GetBundle(Java.Lang.String arg0, Java.Uti
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getBaseBundleName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getKeys()"/>
         /// </summary>
-        public Java.Lang.String BaseBundleName
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<Java.Lang.String> GetKeys()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBaseBundleName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getKeys", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getKeys()"/> 
-        /// </summary>
-        public Java.Util.Enumeration<Java.Lang.String> Keys
-        {
-            get { return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getKeys", "()Ljava/util/Enumeration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getLocale()"/> 
-        /// </summary>
-        public Java.Util.Locale Locale
-        {
-            get { return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#containsKey(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#containsKey(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -154,7 +141,7 @@ public bool ContainsKey(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("containsKey", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getObject(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getObject(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -163,7 +150,7 @@ public object GetObject(Java.Lang.String arg0)
             return IExecuteWithSignature("getObject", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -172,7 +159,7 @@ public Java.Lang.String GetString(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getString", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#getStringArray(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getStringArray(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -181,7 +168,23 @@ public Java.Lang.String[] GetStringArray(Java.Lang.String arg0)
             return IExecuteWithSignatureArray<Java.Lang.String>("getStringArray", "(Ljava/lang/String;)[Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getBaseBundleName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBaseBundleName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getBaseBundleName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#getLocale()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Locale"/></returns>
+        public Java.Util.Locale GetLocale()
+        {
+            return IExecuteWithSignature<Java.Util.Locale>("getLocale", "()Ljava/util/Locale;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Lang.String> KeySet()
@@ -205,31 +208,31 @@ public partial class Control
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#FORMAT_CLASS"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#FORMAT_CLASS"/>
             /// </summary>
             public static Java.Util.List FORMAT_CLASS { get { if (!_FORMAT_CLASSReady) { _FORMAT_CLASSContent = SGetField<Java.Util.List>(LocalBridgeClazz, "FORMAT_CLASS"); _FORMAT_CLASSReady = true; } return _FORMAT_CLASSContent; } }
             private static Java.Util.List _FORMAT_CLASSContent = default;
             private static bool _FORMAT_CLASSReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#FORMAT_DEFAULT"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#FORMAT_DEFAULT"/>
             /// </summary>
             public static Java.Util.List FORMAT_DEFAULT { get { if (!_FORMAT_DEFAULTReady) { _FORMAT_DEFAULTContent = SGetField<Java.Util.List>(LocalBridgeClazz, "FORMAT_DEFAULT"); _FORMAT_DEFAULTReady = true; } return _FORMAT_DEFAULTContent; } }
             private static Java.Util.List _FORMAT_DEFAULTContent = default;
             private static bool _FORMAT_DEFAULTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#FORMAT_PROPERTIES"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#FORMAT_PROPERTIES"/>
             /// </summary>
             public static Java.Util.List FORMAT_PROPERTIES { get { if (!_FORMAT_PROPERTIESReady) { _FORMAT_PROPERTIESContent = SGetField<Java.Util.List>(LocalBridgeClazz, "FORMAT_PROPERTIES"); _FORMAT_PROPERTIESReady = true; } return _FORMAT_PROPERTIESContent; } }
             private static Java.Util.List _FORMAT_PROPERTIESContent = default;
             private static bool _FORMAT_PROPERTIESReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#TTL_DONT_CACHE"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#TTL_DONT_CACHE"/>
             /// </summary>
             public static long TTL_DONT_CACHE { get { if (!_TTL_DONT_CACHEReady) { _TTL_DONT_CACHEContent = SGetField<long>(LocalBridgeClazz, "TTL_DONT_CACHE"); _TTL_DONT_CACHEReady = true; } return _TTL_DONT_CACHEContent; } }
             private static long _TTL_DONT_CACHEContent = default;
             private static bool _TTL_DONT_CACHEReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#TTL_NO_EXPIRATION_CONTROL"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#TTL_NO_EXPIRATION_CONTROL"/>
             /// </summary>
             public static long TTL_NO_EXPIRATION_CONTROL { get { if (!_TTL_NO_EXPIRATION_CONTROLReady) { _TTL_NO_EXPIRATION_CONTROLContent = SGetField<long>(LocalBridgeClazz, "TTL_NO_EXPIRATION_CONTROL"); _TTL_NO_EXPIRATION_CONTROLReady = true; } return _TTL_NO_EXPIRATION_CONTROLContent; } }
             private static long _TTL_NO_EXPIRATION_CONTROLContent = default;
@@ -239,7 +242,7 @@ public partial class Control
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#getControl(java.util.List)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#getControl(java.util.List)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.List"/></param>
             /// <returns><see cref="Java.Util.ResourceBundle.Control"/></returns>
@@ -248,7 +251,7 @@ public static Java.Util.ResourceBundle.Control GetControl(Java.Util.List<Java.La
                 return SExecuteWithSignature<Java.Util.ResourceBundle.Control>(LocalBridgeClazz, "getControl", "(Ljava/util/List;)Ljava/util/ResourceBundle$Control;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#getNoFallbackControl(java.util.List)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#getNoFallbackControl(java.util.List)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.List"/></param>
             /// <returns><see cref="Java.Util.ResourceBundle.Control"/></returns>
@@ -261,7 +264,7 @@ public static Java.Util.ResourceBundle.Control GetNoFallbackControl(Java.Util.Li
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#needsReload(java.lang.String,java.util.Locale,java.lang.String,java.lang.ClassLoader,java.util.ResourceBundle,long)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#needsReload(java.lang.String,java.util.Locale,java.lang.String,java.lang.ClassLoader,java.util.ResourceBundle,long)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -275,7 +278,7 @@ public bool NeedsReload(Java.Lang.String arg0, Java.Util.Locale arg1, Java.Lang.
                 return IExecute<bool>("needsReload", arg0, arg1, arg2, arg3, arg4, arg5);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#toResourceName(java.lang.String,java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#toResourceName(java.lang.String,java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -285,7 +288,7 @@ public Java.Lang.String ToResourceName(Java.Lang.String arg0, Java.Lang.String a
                 return IExecute<Java.Lang.String>("toResourceName", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#toBundleName(java.lang.String,java.util.Locale)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#toBundleName(java.lang.String,java.util.Locale)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -295,7 +298,7 @@ public Java.Lang.String ToBundleName(Java.Lang.String arg0, Java.Util.Locale arg
                 return IExecute<Java.Lang.String>("toBundleName", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#getFormats(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#getFormats(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.List"/></returns>
@@ -304,7 +307,7 @@ public Java.Lang.String ToBundleName(Java.Lang.String arg0, Java.Util.Locale arg
                 return IExecuteWithSignature<Java.Util.List<Java.Lang.String>>("getFormats", "(Ljava/lang/String;)Ljava/util/List;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#getCandidateLocales(java.lang.String,java.util.Locale)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#getCandidateLocales(java.lang.String,java.util.Locale)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -314,7 +317,7 @@ public Java.Lang.String ToBundleName(Java.Lang.String arg0, Java.Util.Locale arg
                 return IExecute<Java.Util.List<Java.Util.Locale>>("getCandidateLocales", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#getFallbackLocale(java.lang.String,java.util.Locale)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#getFallbackLocale(java.lang.String,java.util.Locale)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -324,7 +327,7 @@ public Java.Util.Locale GetFallbackLocale(Java.Lang.String arg0, Java.Util.Local
                 return IExecute<Java.Util.Locale>("getFallbackLocale", arg0, arg1);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#newBundle(java.lang.String,java.util.Locale,java.lang.String,java.lang.ClassLoader,boolean)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#newBundle(java.lang.String,java.util.Locale,java.lang.String,java.lang.ClassLoader,boolean)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -340,7 +343,7 @@ public Java.Util.ResourceBundle NewBundle(Java.Lang.String arg0, Java.Util.Local
                 return IExecute<Java.Util.ResourceBundle>("newBundle", arg0, arg1, arg2, arg3, arg4);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/ResourceBundle.Control.html#getTimeToLive(java.lang.String,java.util.Locale)"/>
+            /// <see href="https://developer.android.com/reference/java/util/ResourceBundle.Control.html#getTimeToLive(java.lang.String,java.util.Locale)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/Scanner.cs b/src/net/Netdroid/Generated/Java/Util/Scanner.cs
index 9c6f253cf..f07cc6bb8 100644
--- a/src/net/Netdroid/Generated/Java/Util/Scanner.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Scanner.cs
@@ -30,7 +30,7 @@ public partial class Scanner : Java.Util.IIterator<Java.Lang.String>, Java.Io.IC
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.io.File,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -40,7 +40,7 @@ public Scanner(Java.Io.File arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -50,7 +50,7 @@ public Scanner(Java.Io.File arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Io.FileNotFoundException"/>
@@ -59,7 +59,7 @@ public Scanner(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.io.InputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.io.InputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -68,7 +68,7 @@ public Scanner(Java.Io.InputStream arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.io.InputStream,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.io.InputStream,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -77,7 +77,7 @@ public Scanner(Java.Io.InputStream arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public Scanner(Java.Io.InputStream arg0)
@@ -85,7 +85,7 @@ public Scanner(Java.Io.InputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.lang.Readable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.lang.Readable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Readable"/></param>
         public Scanner(Java.Lang.Readable arg0)
@@ -93,7 +93,7 @@ public Scanner(Java.Lang.Readable arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public Scanner(Java.Lang.String arg0)
@@ -101,7 +101,7 @@ public Scanner(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.nio.channels.ReadableByteChannel,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.nio.channels.ReadableByteChannel,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.ReadableByteChannel"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -110,7 +110,7 @@ public Scanner(Java.Nio.Channels.ReadableByteChannel arg0, Java.Lang.String arg1
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.nio.channels.ReadableByteChannel,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.nio.channels.ReadableByteChannel,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.ReadableByteChannel"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -119,7 +119,7 @@ public Scanner(Java.Nio.Channels.ReadableByteChannel arg0, Java.Nio.Charset.Char
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.nio.channels.ReadableByteChannel)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.nio.channels.ReadableByteChannel)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.Channels.ReadableByteChannel"/></param>
         public Scanner(Java.Nio.Channels.ReadableByteChannel arg0)
@@ -127,7 +127,7 @@ public Scanner(Java.Nio.Channels.ReadableByteChannel arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.nio.file.Path,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.nio.file.Path,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -137,7 +137,7 @@ public Scanner(Java.Nio.File.Path arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.nio.file.Path,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.nio.file.Path,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -147,7 +147,7 @@ public Scanner(Java.Nio.File.Path arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#%3Cinit%3E(java.nio.file.Path)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#%3Cinit%3E(java.nio.file.Path)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.File.Path"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -176,7 +176,7 @@ public Scanner(Java.Nio.File.Path arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNext()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNext()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNext()
@@ -184,7 +184,7 @@ public bool HasNext()
             return IExecuteWithSignature<bool>("hasNext", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNext(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNext(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -193,7 +193,7 @@ public bool HasNext(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("hasNext", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNext(java.util.regex.Pattern)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNext(java.util.regex.Pattern)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -202,7 +202,7 @@ public bool HasNext(Java.Util.Regex.Pattern arg0)
             return IExecuteWithSignature<bool>("hasNext", "(Ljava/util/regex/Pattern;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextBigDecimal()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextBigDecimal()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextBigDecimal()
@@ -210,7 +210,7 @@ public bool HasNextBigDecimal()
             return IExecuteWithSignature<bool>("hasNextBigDecimal", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextBigInteger()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextBigInteger()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextBigInteger()
@@ -218,7 +218,7 @@ public bool HasNextBigInteger()
             return IExecuteWithSignature<bool>("hasNextBigInteger", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextBigInteger(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextBigInteger(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -227,7 +227,7 @@ public bool HasNextBigInteger(int arg0)
             return IExecuteWithSignature<bool>("hasNextBigInteger", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextBoolean()
@@ -235,7 +235,7 @@ public bool HasNextBoolean()
             return IExecuteWithSignature<bool>("hasNextBoolean", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextByte()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextByte()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextByte()
@@ -243,7 +243,7 @@ public bool HasNextByte()
             return IExecuteWithSignature<bool>("hasNextByte", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextByte(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextByte(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -252,7 +252,7 @@ public bool HasNextByte(int arg0)
             return IExecuteWithSignature<bool>("hasNextByte", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextDouble()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextDouble()
@@ -260,7 +260,7 @@ public bool HasNextDouble()
             return IExecuteWithSignature<bool>("hasNextDouble", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextFloat()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextFloat()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextFloat()
@@ -268,7 +268,7 @@ public bool HasNextFloat()
             return IExecuteWithSignature<bool>("hasNextFloat", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextInt()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextInt()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextInt()
@@ -276,7 +276,7 @@ public bool HasNextInt()
             return IExecuteWithSignature<bool>("hasNextInt", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -285,7 +285,7 @@ public bool HasNextInt(int arg0)
             return IExecuteWithSignature<bool>("hasNextInt", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextLine()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextLine()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextLine()
@@ -293,7 +293,7 @@ public bool HasNextLine()
             return IExecuteWithSignature<bool>("hasNextLine", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextLong()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextLong()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextLong()
@@ -301,7 +301,7 @@ public bool HasNextLong()
             return IExecuteWithSignature<bool>("hasNextLong", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextLong(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -310,7 +310,7 @@ public bool HasNextLong(int arg0)
             return IExecuteWithSignature<bool>("hasNextLong", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextShort()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextShort()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasNextShort()
@@ -318,7 +318,7 @@ public bool HasNextShort()
             return IExecuteWithSignature<bool>("hasNextShort", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#hasNextShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#hasNextShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -327,7 +327,7 @@ public bool HasNextShort(int arg0)
             return IExecuteWithSignature<bool>("hasNextShort", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextBoolean()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextBoolean()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool NextBoolean()
@@ -335,7 +335,7 @@ public bool NextBoolean()
             return IExecuteWithSignature<bool>("nextBoolean", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextByte()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextByte()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         public byte NextByte()
@@ -343,7 +343,7 @@ public byte NextByte()
             return IExecuteWithSignature<byte>("nextByte", "()B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextByte(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextByte(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -352,7 +352,7 @@ public byte NextByte(int arg0)
             return IExecuteWithSignature<byte>("nextByte", "(I)B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextDouble()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextDouble()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double NextDouble()
@@ -360,7 +360,7 @@ public double NextDouble()
             return IExecuteWithSignature<double>("nextDouble", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextFloat()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextFloat()"/>
         /// </summary>
         /// <returns><see cref="float"/></returns>
         public float NextFloat()
@@ -368,7 +368,7 @@ public float NextFloat()
             return IExecuteWithSignature<float>("nextFloat", "()F");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextInt()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int NextInt()
@@ -376,7 +376,7 @@ public int NextInt()
             return IExecuteWithSignature<int>("nextInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextInt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextInt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -385,7 +385,7 @@ public int NextInt(int arg0)
             return IExecuteWithSignature<int>("nextInt", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#radix()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#radix()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Radix()
@@ -393,7 +393,7 @@ public int Radix()
             return IExecuteWithSignature<int>("radix", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#ioException()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#ioException()"/>
         /// </summary>
         /// <returns><see cref="Java.Io.IOException"/></returns>
         public Java.Io.IOException IoException()
@@ -401,7 +401,7 @@ public Java.Io.IOException IoException()
             var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("ioException", "()Ljava/io/IOException;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Io.IOException>(obj);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#next()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#next()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Next()
@@ -409,7 +409,7 @@ public object Next()
             return IExecuteWithSignature("next", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#findInLine(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#findInLine(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -418,7 +418,7 @@ public Java.Lang.String FindInLine(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("findInLine", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#findInLine(java.util.regex.Pattern)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#findInLine(java.util.regex.Pattern)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -427,7 +427,7 @@ public Java.Lang.String FindInLine(Java.Util.Regex.Pattern arg0)
             return IExecuteWithSignature<Java.Lang.String>("findInLine", "(Ljava/util/regex/Pattern;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#findWithinHorizon(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#findWithinHorizon(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -437,7 +437,7 @@ public Java.Lang.String FindWithinHorizon(Java.Lang.String arg0, int arg1)
             return IExecute<Java.Lang.String>("findWithinHorizon", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#findWithinHorizon(java.util.regex.Pattern,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#findWithinHorizon(java.util.regex.Pattern,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -447,7 +447,7 @@ public Java.Lang.String FindWithinHorizon(Java.Util.Regex.Pattern arg0, int arg1
             return IExecute<Java.Lang.String>("findWithinHorizon", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#next(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#next(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -456,7 +456,7 @@ public Java.Lang.String Next(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("next", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#next(java.util.regex.Pattern)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#next(java.util.regex.Pattern)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -465,7 +465,7 @@ public Java.Lang.String Next(Java.Util.Regex.Pattern arg0)
             return IExecuteWithSignature<Java.Lang.String>("next", "(Ljava/util/regex/Pattern;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextLine()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextLine()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String NextLine()
@@ -473,7 +473,7 @@ public Java.Lang.String NextLine()
             return IExecuteWithSignature<Java.Lang.String>("nextLine", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextBigDecimal()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextBigDecimal()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigDecimal"/></returns>
         public Java.Math.BigDecimal NextBigDecimal()
@@ -481,7 +481,7 @@ public Java.Math.BigDecimal NextBigDecimal()
             return IExecuteWithSignature<Java.Math.BigDecimal>("nextBigDecimal", "()Ljava/math/BigDecimal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextBigInteger()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextBigInteger()"/>
         /// </summary>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
         public Java.Math.BigInteger NextBigInteger()
@@ -489,7 +489,7 @@ public Java.Math.BigInteger NextBigInteger()
             return IExecuteWithSignature<Java.Math.BigInteger>("nextBigInteger", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextBigInteger(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextBigInteger(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Math.BigInteger"/></returns>
@@ -498,7 +498,7 @@ public Java.Math.BigInteger NextBigInteger(int arg0)
             return IExecuteWithSignature<Java.Math.BigInteger>("nextBigInteger", "(I)Ljava/math/BigInteger;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#locale()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#locale()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Locale"/></returns>
         public Java.Util.Locale Locale()
@@ -506,7 +506,7 @@ public Java.Util.Locale Locale()
             return IExecuteWithSignature<Java.Util.Locale>("locale", "()Ljava/util/Locale;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#match()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#match()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Regex.MatchResult"/></returns>
         public Java.Util.Regex.MatchResult Match()
@@ -514,7 +514,7 @@ public Java.Util.Regex.MatchResult Match()
             return IExecuteWithSignature<Java.Util.Regex.MatchResult>("match", "()Ljava/util/regex/MatchResult;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#delimiter()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#delimiter()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Regex.Pattern"/></returns>
         public Java.Util.Regex.Pattern Delimiter()
@@ -522,7 +522,7 @@ public Java.Util.Regex.Pattern Delimiter()
             return IExecuteWithSignature<Java.Util.Regex.Pattern>("delimiter", "()Ljava/util/regex/Pattern;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#reset()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Scanner"/></returns>
         public Java.Util.Scanner Reset()
@@ -530,7 +530,7 @@ public Java.Util.Scanner Reset()
             return IExecuteWithSignature<Java.Util.Scanner>("reset", "()Ljava/util/Scanner;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#skip(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#skip(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Scanner"/></returns>
@@ -539,7 +539,7 @@ public Java.Util.Scanner Skip(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Scanner>("skip", "(Ljava/lang/String;)Ljava/util/Scanner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#skip(java.util.regex.Pattern)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#skip(java.util.regex.Pattern)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
         /// <returns><see cref="Java.Util.Scanner"/></returns>
@@ -548,7 +548,7 @@ public Java.Util.Scanner Skip(Java.Util.Regex.Pattern arg0)
             return IExecuteWithSignature<Java.Util.Scanner>("skip", "(Ljava/util/regex/Pattern;)Ljava/util/Scanner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#useDelimiter(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#useDelimiter(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Scanner"/></returns>
@@ -557,7 +557,7 @@ public Java.Util.Scanner UseDelimiter(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Scanner>("useDelimiter", "(Ljava/lang/String;)Ljava/util/Scanner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#useDelimiter(java.util.regex.Pattern)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#useDelimiter(java.util.regex.Pattern)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
         /// <returns><see cref="Java.Util.Scanner"/></returns>
@@ -566,7 +566,7 @@ public Java.Util.Scanner UseDelimiter(Java.Util.Regex.Pattern arg0)
             return IExecuteWithSignature<Java.Util.Scanner>("useDelimiter", "(Ljava/util/regex/Pattern;)Ljava/util/Scanner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#useLocale(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#useLocale(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Util.Scanner"/></returns>
@@ -575,7 +575,7 @@ public Java.Util.Scanner UseLocale(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Util.Scanner>("useLocale", "(Ljava/util/Locale;)Ljava/util/Scanner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#useRadix(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#useRadix(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Scanner"/></returns>
@@ -584,7 +584,7 @@ public Java.Util.Scanner UseRadix(int arg0)
             return IExecuteWithSignature<Java.Util.Scanner>("useRadix", "(I)Ljava/util/Scanner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#tokens()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#tokens()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Lang.String> Tokens()
@@ -592,7 +592,7 @@ public Java.Util.Scanner UseRadix(int arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Lang.String>>("tokens", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#findAll(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#findAll(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -601,7 +601,7 @@ public Java.Util.Scanner UseRadix(int arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Util.Regex.MatchResult>>("findAll", "(Ljava/lang/String;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#findAll(java.util.regex.Pattern)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#findAll(java.util.regex.Pattern)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Regex.Pattern"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -610,7 +610,7 @@ public Java.Util.Scanner UseRadix(int arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Util.Regex.MatchResult>>("findAll", "(Ljava/util/regex/Pattern;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextLong()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextLong()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long NextLong()
@@ -618,7 +618,7 @@ public long NextLong()
             return IExecuteWithSignature<long>("nextLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextLong(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextLong(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="long"/></returns>
@@ -627,7 +627,7 @@ public long NextLong(int arg0)
             return IExecuteWithSignature<long>("nextLong", "(I)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextShort()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextShort()"/>
         /// </summary>
         /// <returns><see cref="short"/></returns>
         public short NextShort()
@@ -635,7 +635,7 @@ public short NextShort()
             return IExecuteWithSignature<short>("nextShort", "()S");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#nextShort(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#nextShort(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="short"/></returns>
@@ -644,14 +644,14 @@ public short NextShort(int arg0)
             return IExecuteWithSignature<short>("nextShort", "(I)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#close()"/>
         /// </summary>
         public void Close()
         {
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Scanner.html#remove()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Scanner.html#remove()"/>
         /// </summary>
         public void Remove()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/ServiceLoader.cs b/src/net/Netdroid/Generated/Java/Util/ServiceLoader.cs
index be2c6bd0d..568a9a319 100644
--- a/src/net/Netdroid/Generated/Java/Util/ServiceLoader.cs
+++ b/src/net/Netdroid/Generated/Java/Util/ServiceLoader.cs
@@ -42,7 +42,7 @@ public partial class ServiceLoader
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#load(java.lang.Class,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#load(java.lang.Class,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -52,7 +52,7 @@ public static Java.Util.ServiceLoader Load(Java.Lang.Class arg0, Java.Lang.Class
             return SExecute<Java.Util.ServiceLoader>(LocalBridgeClazz, "load", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#load(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#load(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.ServiceLoader"/></returns>
@@ -61,7 +61,7 @@ public static Java.Util.ServiceLoader Load(Java.Lang.Class arg0)
             return SExecuteWithSignature<Java.Util.ServiceLoader>(LocalBridgeClazz, "load", "(Ljava/lang/Class;)Ljava/util/ServiceLoader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#loadInstalled(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#loadInstalled(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.ServiceLoader"/></returns>
@@ -74,7 +74,7 @@ public static Java.Util.ServiceLoader LoadInstalled(Java.Lang.Class arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -82,7 +82,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#findFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#findFirst()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Optional"/></returns>
         public Java.Util.Optional FindFirst()
@@ -90,7 +90,7 @@ public Java.Util.Optional FindFirst()
             return IExecuteWithSignature<Java.Util.Optional>("findFirst", "()Ljava/util/Optional;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#reload()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#reload()"/>
         /// </summary>
         public void Reload()
         {
@@ -128,7 +128,7 @@ public partial class ServiceLoader<S>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#load(java.lang.Class,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#load(java.lang.Class,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -138,7 +138,7 @@ public static Java.Util.ServiceLoader<S> Load(Java.Lang.Class arg0, Java.Lang.Cl
             return SExecute<Java.Util.ServiceLoader<S>>(LocalBridgeClazz, "load", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#load(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#load(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.ServiceLoader"/></returns>
@@ -147,7 +147,7 @@ public static Java.Util.ServiceLoader<S> Load(Java.Lang.Class arg0)
             return SExecuteWithSignature<Java.Util.ServiceLoader<S>>(LocalBridgeClazz, "load", "(Ljava/lang/Class;)Ljava/util/ServiceLoader;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#loadInstalled(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#loadInstalled(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <returns><see cref="Java.Util.ServiceLoader"/></returns>
@@ -160,7 +160,7 @@ public static Java.Util.ServiceLoader<S> LoadInstalled(Java.Lang.Class arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<S> Iterator()
@@ -168,7 +168,7 @@ public Java.Util.Iterator<S> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<S>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#findFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#findFirst()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Optional"/></returns>
         public Java.Util.Optional<S> FindFirst()
@@ -176,7 +176,7 @@ public Java.Util.Optional<S> FindFirst()
             return IExecuteWithSignature<Java.Util.Optional<S>>("findFirst", "()Ljava/util/Optional;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/ServiceLoader.html#reload()"/>
+        /// <see href="https://developer.android.com/reference/java/util/ServiceLoader.html#reload()"/>
         /// </summary>
         public void Reload()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Set.cs b/src/net/Netdroid/Generated/Java/Util/Set.cs
index c6ef209d0..8f7fbdadd 100644
--- a/src/net/Netdroid/Generated/Java/Util/Set.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Set.cs
@@ -42,7 +42,7 @@ public partial class Set
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#copyOf(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#copyOf(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
@@ -51,7 +51,7 @@ public static Java.Util.Set CopyOf(Java.Util.Collection arg0)
             return SExecuteWithSignature<Java.Util.Set>(LocalBridgeClazz, "copyOf", "(Ljava/util/Collection;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public static Java.Util.Set Of()
@@ -59,7 +59,7 @@ public static Java.Util.Set Of()
             return SExecuteWithSignature<Java.Util.Set>(LocalBridgeClazz, "of", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -77,7 +77,7 @@ public static Java.Util.Set Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -94,7 +94,7 @@ public static Java.Util.Set Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -110,7 +110,7 @@ public static Java.Util.Set Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -125,7 +125,7 @@ public static Java.Util.Set Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -139,7 +139,7 @@ public static Java.Util.Set Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -152,7 +152,7 @@ public static Java.Util.Set Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -164,7 +164,7 @@ public static Java.Util.Set Of(object arg0, object arg1, object arg2, object arg
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -175,7 +175,7 @@ public static Java.Util.Set Of(object arg0, object arg1, object arg2)
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -185,7 +185,7 @@ public static Java.Util.Set Of(object arg0, object arg1)
             return SExecute<Java.Util.Set>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
@@ -194,7 +194,7 @@ public static Java.Util.Set Of(params object[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Set>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/Set;"); else return SExecuteWithSignature<Java.Util.Set>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
@@ -207,7 +207,7 @@ public static Java.Util.Set Of(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -216,7 +216,7 @@ public object[] ToArray(object[] arg0)
             return IExecuteWithSignatureArray<object>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -225,7 +225,7 @@ public bool Add(object arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -234,7 +234,7 @@ public bool AddAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -243,7 +243,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -252,7 +252,7 @@ public bool ContainsAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -260,7 +260,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -269,7 +269,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -278,7 +278,7 @@ public bool RemoveAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -287,7 +287,7 @@ public bool RetainAll(Java.Util.Collection arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -295,7 +295,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -303,7 +303,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -311,14 +311,14 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -375,17 +375,17 @@ public partial class Set<E> : Java.Util.ISet<E>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#copyOf(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#copyOf(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="Java.Util.Set"/></returns>
-        public static Java.Util.Set<E> CopyOf<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public static Java.Util.Set<E> CopyOf<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return SExecuteWithSignature<Java.Util.Set<E>>(LocalBridgeClazz, "copyOf", "(Ljava/util/Collection;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public static Java.Util.Set<E> Of()
@@ -393,7 +393,7 @@ public static Java.Util.Set<E> Of()
             return SExecuteWithSignature<Java.Util.Set<E>>(LocalBridgeClazz, "of", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -411,7 +411,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg5
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -428,7 +428,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg5
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -444,7 +444,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg5
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -459,7 +459,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg5
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -473,7 +473,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4, E arg5
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -486,7 +486,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1, E arg2, E arg3, E arg4)
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -498,7 +498,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1, E arg2, E arg3)
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -509,7 +509,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1, E arg2)
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -519,7 +519,7 @@ public static Java.Util.Set<E> Of(E arg0, E arg1)
             return SExecute<Java.Util.Set<E>>(LocalBridgeClazz, "of", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
@@ -528,7 +528,7 @@ public static Java.Util.Set<E> Of(params E[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Set<E>>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/Set;"); else return SExecuteWithSignature<Java.Util.Set<E>>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#of(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#of(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.Set"/></returns>
@@ -541,7 +541,7 @@ public static Java.Util.Set<E> Of(E arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#toArray(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#toArray(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <typeparam name="T"></typeparam>
@@ -551,7 +551,7 @@ public T[] ToArray<T>(T[] arg0)
             return IExecuteWithSignatureArray<T>("toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#add(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#add(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -560,17 +560,17 @@ public bool Add(E arg0)
             return IExecuteWithSignature<bool>("add", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#addAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#addAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <typeparam name="Arg0ExtendsE"><typeparamref name="E"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE: E
+        public bool AddAll<Arg0ExtendsE>(Java.Util.Collection<Arg0ExtendsE> arg0) where Arg0ExtendsE : E
         {
             return IExecuteWithSignature<bool>("addAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#contains(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#contains(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -579,7 +579,7 @@ public bool Contains(object arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#containsAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#containsAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -588,7 +588,7 @@ public bool ContainsAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("containsAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
@@ -596,7 +596,7 @@ public bool IsEmpty()
             return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#remove(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#remove(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -605,7 +605,7 @@ public bool Remove(object arg0)
             return IExecuteWithSignature<bool>("remove", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#removeAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#removeAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -614,7 +614,7 @@ public bool RemoveAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("removeAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#retainAll(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#retainAll(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -623,7 +623,7 @@ public bool RetainAll(Java.Util.Collection<object> arg0)
             return IExecuteWithSignature<bool>("retainAll", "(Ljava/util/Collection;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -631,7 +631,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -639,7 +639,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> Iterator()
@@ -647,14 +647,14 @@ public Java.Util.Iterator<E> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Set.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Set.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator<E> Spliterator()
diff --git a/src/net/Netdroid/Generated/Java/Util/SimpleTimeZone.cs b/src/net/Netdroid/Generated/Java/Util/SimpleTimeZone.cs
index 069fca86d..0b726f139 100644
--- a/src/net/Netdroid/Generated/Java/Util/SimpleTimeZone.cs
+++ b/src/net/Netdroid/Generated/Java/Util/SimpleTimeZone.cs
@@ -30,7 +30,7 @@ public partial class SimpleTimeZone
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#%3Cinit%3E(int,java.lang.String,int,int,int,int,int,int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#%3Cinit%3E(int,java.lang.String,int,int,int,int,int,int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -50,7 +50,7 @@ public SimpleTimeZone(int arg0, Java.Lang.String arg1, int arg2, int arg3, int a
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#%3Cinit%3E(int,java.lang.String,int,int,int,int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#%3Cinit%3E(int,java.lang.String,int,int,int,int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -68,7 +68,7 @@ public SimpleTimeZone(int arg0, Java.Lang.String arg1, int arg2, int arg3, int a
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#%3Cinit%3E(int,java.lang.String,int,int,int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#%3Cinit%3E(int,java.lang.String,int,int,int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -85,7 +85,7 @@ public SimpleTimeZone(int arg0, Java.Lang.String arg1, int arg2, int arg3, int a
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#%3Cinit%3E(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#%3Cinit%3E(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -102,19 +102,19 @@ public SimpleTimeZone(int arg0, Java.Lang.String arg1)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#STANDARD_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#STANDARD_TIME"/>
         /// </summary>
         public static int STANDARD_TIME { get { if (!_STANDARD_TIMEReady) { _STANDARD_TIMEContent = SGetField<int>(LocalBridgeClazz, "STANDARD_TIME"); _STANDARD_TIMEReady = true; } return _STANDARD_TIMEContent; } }
         private static int _STANDARD_TIMEContent = default;
         private static bool _STANDARD_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#UTC_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#UTC_TIME"/>
         /// </summary>
         public static int UTC_TIME { get { if (!_UTC_TIMEReady) { _UTC_TIMEContent = SGetField<int>(LocalBridgeClazz, "UTC_TIME"); _UTC_TIMEReady = true; } return _UTC_TIMEContent; } }
         private static int _UTC_TIMEContent = default;
         private static bool _UTC_TIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#WALL_TIME"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#WALL_TIME"/>
         /// </summary>
         public static int WALL_TIME { get { if (!_WALL_TIMEReady) { _WALL_TIMEContent = SGetField<int>(LocalBridgeClazz, "WALL_TIME"); _WALL_TIMEReady = true; } return _WALL_TIMEContent; } }
         private static int _WALL_TIMEContent = default;
@@ -128,7 +128,7 @@ public SimpleTimeZone(int arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#setDSTSavings(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#setDSTSavings(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetDSTSavings(int arg0)
@@ -136,7 +136,7 @@ public void SetDSTSavings(int arg0)
             IExecuteWithSignature("setDSTSavings", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#setEndRule(int,int,int,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#setEndRule(int,int,int,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -148,7 +148,7 @@ public void SetEndRule(int arg0, int arg1, int arg2, int arg3, bool arg4)
             IExecute("setEndRule", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#setEndRule(int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#setEndRule(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -159,7 +159,7 @@ public void SetEndRule(int arg0, int arg1, int arg2, int arg3)
             IExecute("setEndRule", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#setEndRule(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#setEndRule(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -169,7 +169,7 @@ public void SetEndRule(int arg0, int arg1, int arg2)
             IExecute("setEndRule", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#setStartRule(int,int,int,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#setStartRule(int,int,int,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -181,7 +181,7 @@ public void SetStartRule(int arg0, int arg1, int arg2, int arg3, bool arg4)
             IExecute("setStartRule", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#setStartRule(int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#setStartRule(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -192,7 +192,7 @@ public void SetStartRule(int arg0, int arg1, int arg2, int arg3)
             IExecute("setStartRule", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#setStartRule(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#setStartRule(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -202,7 +202,7 @@ public void SetStartRule(int arg0, int arg1, int arg2)
             IExecute("setStartRule", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SimpleTimeZone.html#setStartYear(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SimpleTimeZone.html#setStartYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetStartYear(int arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/SortedMap.cs b/src/net/Netdroid/Generated/Java/Util/SortedMap.cs
index b8c94c24b..c218aa189 100644
--- a/src/net/Netdroid/Generated/Java/Util/SortedMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/SortedMap.cs
@@ -46,7 +46,7 @@ public partial class SortedMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection Values()
@@ -54,7 +54,7 @@ public Java.Util.Collection Values()
             return IExecuteWithSignature<Java.Util.Collection>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set EntrySet()
@@ -62,7 +62,7 @@ public Java.Util.Set EntrySet()
             return IExecuteWithSignature<Java.Util.Set>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set KeySet()
@@ -70,7 +70,7 @@ public Java.Util.Set KeySet()
             return IExecuteWithSignature<Java.Util.Set>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -79,7 +79,7 @@ public Java.Util.SortedMap HeadMap(object arg0)
             return IExecuteWithSignature<Java.Util.SortedMap>("headMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -89,7 +89,7 @@ public Java.Util.SortedMap SubMap(object arg0, object arg1)
             return IExecute<Java.Util.SortedMap>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -98,7 +98,7 @@ public Java.Util.SortedMap TailMap(object arg0)
             return IExecuteWithSignature<Java.Util.SortedMap>("tailMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#firstKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#firstKey()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object FirstKey()
@@ -106,7 +106,7 @@ public object FirstKey()
             return IExecuteWithSignature("firstKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#lastKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#lastKey()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object LastKey()
@@ -167,7 +167,7 @@ public partial class SortedMap<K, V> : Java.Util.ISortedMap<K, V>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#values()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#values()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Collection"/></returns>
         public Java.Util.Collection<V> Values()
@@ -175,7 +175,7 @@ public Java.Util.Collection<V> Values()
             return IExecuteWithSignature<Java.Util.Collection<V>>("values", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#entrySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#entrySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Util.Map.Entry<K, V>> EntrySet()
@@ -183,7 +183,7 @@ public Java.Util.Collection<V> Values()
             return IExecuteWithSignature<Java.Util.Set<Java.Util.Map.Entry<K, V>>>("entrySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#keySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#keySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<K> KeySet()
@@ -191,7 +191,7 @@ public Java.Util.Set<K> KeySet()
             return IExecuteWithSignature<Java.Util.Set<K>>("keySet", "()Ljava/util/Set;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -200,7 +200,7 @@ public Java.Util.SortedMap<K, V> HeadMap(K arg0)
             return IExecuteWithSignature<Java.Util.SortedMap<K, V>>("headMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="K"/></param>
@@ -210,7 +210,7 @@ public Java.Util.SortedMap<K, V> SubMap(K arg0, K arg1)
             return IExecute<Java.Util.SortedMap<K, V>>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -219,7 +219,7 @@ public Java.Util.SortedMap<K, V> TailMap(K arg0)
             return IExecuteWithSignature<Java.Util.SortedMap<K, V>>("tailMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#firstKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#firstKey()"/>
         /// </summary>
         /// <returns><typeparamref name="K"/></returns>
         public K FirstKey()
@@ -227,7 +227,7 @@ public K FirstKey()
             return IExecuteWithSignature<K>("firstKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedMap.html#lastKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedMap.html#lastKey()"/>
         /// </summary>
         /// <returns><typeparamref name="K"/></returns>
         public K LastKey()
diff --git a/src/net/Netdroid/Generated/Java/Util/SortedSet.cs b/src/net/Netdroid/Generated/Java/Util/SortedSet.cs
index 2f8a7c055..740fe37ad 100644
--- a/src/net/Netdroid/Generated/Java/Util/SortedSet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/SortedSet.cs
@@ -46,7 +46,7 @@ public partial class SortedSet
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#first()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object First()
@@ -54,7 +54,7 @@ public object First()
             return IExecuteWithSignature("first", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#last()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Last()
@@ -62,7 +62,7 @@ public object Last()
             return IExecuteWithSignature("last", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#headSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#headSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -71,7 +71,7 @@ public Java.Util.SortedSet HeadSet(object arg0)
             return IExecuteWithSignature<Java.Util.SortedSet>("headSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#subSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#subSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -81,7 +81,7 @@ public Java.Util.SortedSet SubSet(object arg0, object arg1)
             return IExecute<Java.Util.SortedSet>("subSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#tailSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#tailSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -90,7 +90,7 @@ public Java.Util.SortedSet TailSet(object arg0)
             return IExecuteWithSignature<Java.Util.SortedSet>("tailSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -151,7 +151,7 @@ public partial class SortedSet<E> : Java.Util.ISortedSet<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#first()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E First()
@@ -159,7 +159,7 @@ public E First()
             return IExecuteWithSignature<E>("first", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#last()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Last()
@@ -167,7 +167,7 @@ public E Last()
             return IExecuteWithSignature<E>("last", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#headSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#headSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -176,7 +176,7 @@ public Java.Util.SortedSet<E> HeadSet(E arg0)
             return IExecuteWithSignature<Java.Util.SortedSet<E>>("headSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#subSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#subSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -186,7 +186,7 @@ public Java.Util.SortedSet<E> SubSet(E arg0, E arg1)
             return IExecute<Java.Util.SortedSet<E>>("subSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#tailSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#tailSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -195,7 +195,7 @@ public Java.Util.SortedSet<E> TailSet(E arg0)
             return IExecuteWithSignature<Java.Util.SortedSet<E>>("tailSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SortedSet.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SortedSet.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator<E> Spliterator()
diff --git a/src/net/Netdroid/Generated/Java/Util/Spliterator.cs b/src/net/Netdroid/Generated/Java/Util/Spliterator.cs
index d5c57ff53..7839c70c7 100644
--- a/src/net/Netdroid/Generated/Java/Util/Spliterator.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Spliterator.cs
@@ -38,49 +38,49 @@ public partial class Spliterator
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#CONCURRENT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#CONCURRENT"/>
         /// </summary>
         public static int CONCURRENT { get { if (!_CONCURRENTReady) { _CONCURRENTContent = SGetField<int>(LocalBridgeClazz, "CONCURRENT"); _CONCURRENTReady = true; } return _CONCURRENTContent; } }
         private static int _CONCURRENTContent = default;
         private static bool _CONCURRENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#DISTINCT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#DISTINCT"/>
         /// </summary>
         public static int DISTINCT { get { if (!_DISTINCTReady) { _DISTINCTContent = SGetField<int>(LocalBridgeClazz, "DISTINCT"); _DISTINCTReady = true; } return _DISTINCTContent; } }
         private static int _DISTINCTContent = default;
         private static bool _DISTINCTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#IMMUTABLE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#IMMUTABLE"/>
         /// </summary>
         public static int IMMUTABLE { get { if (!_IMMUTABLEReady) { _IMMUTABLEContent = SGetField<int>(LocalBridgeClazz, "IMMUTABLE"); _IMMUTABLEReady = true; } return _IMMUTABLEContent; } }
         private static int _IMMUTABLEContent = default;
         private static bool _IMMUTABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#NONNULL"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#NONNULL"/>
         /// </summary>
         public static int NONNULL { get { if (!_NONNULLReady) { _NONNULLContent = SGetField<int>(LocalBridgeClazz, "NONNULL"); _NONNULLReady = true; } return _NONNULLContent; } }
         private static int _NONNULLContent = default;
         private static bool _NONNULLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#ORDERED"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#ORDERED"/>
         /// </summary>
         public static int ORDERED { get { if (!_ORDEREDReady) { _ORDEREDContent = SGetField<int>(LocalBridgeClazz, "ORDERED"); _ORDEREDReady = true; } return _ORDEREDContent; } }
         private static int _ORDEREDContent = default;
         private static bool _ORDEREDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#SIZED"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#SIZED"/>
         /// </summary>
         public static int SIZED { get { if (!_SIZEDReady) { _SIZEDContent = SGetField<int>(LocalBridgeClazz, "SIZED"); _SIZEDReady = true; } return _SIZEDContent; } }
         private static int _SIZEDContent = default;
         private static bool _SIZEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#SORTED"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#SORTED"/>
         /// </summary>
         public static int SORTED { get { if (!_SORTEDReady) { _SORTEDContent = SGetField<int>(LocalBridgeClazz, "SORTED"); _SORTEDReady = true; } return _SORTEDContent; } }
         private static int _SORTEDContent = default;
         private static bool _SORTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#SUBSIZED"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#SUBSIZED"/>
         /// </summary>
         public static int SUBSIZED { get { if (!_SUBSIZEDReady) { _SUBSIZEDContent = SGetField<int>(LocalBridgeClazz, "SUBSIZED"); _SUBSIZEDReady = true; } return _SUBSIZEDContent; } }
         private static int _SUBSIZEDContent = default;
@@ -94,14 +94,7 @@ public partial class Spliterator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#getExactSizeIfKnown()"/> 
-        /// </summary>
-        public long ExactSizeIfKnown
-        {
-            get { return IExecuteWithSignature<long>("getExactSizeIfKnown", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#tryAdvance(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#tryAdvance(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -110,7 +103,7 @@ public bool TryAdvance(Java.Util.Function.Consumer arg0)
             return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/util/function/Consumer;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#characteristics()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#characteristics()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Characteristics()
@@ -118,7 +111,7 @@ public int Characteristics()
             return IExecuteWithSignature<int>("characteristics", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#trySplit()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#trySplit()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator TrySplit()
@@ -126,7 +119,7 @@ public Java.Util.Spliterator TrySplit()
             return IExecuteWithSignature<Java.Util.Spliterator>("trySplit", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#estimateSize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#estimateSize()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long EstimateSize()
@@ -134,7 +127,7 @@ public long EstimateSize()
             return IExecuteWithSignature<long>("estimateSize", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#hasCharacteristics(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#hasCharacteristics(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -143,7 +136,15 @@ public bool HasCharacteristics(int arg0)
             return IExecuteWithSignature<bool>("hasCharacteristics", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#forEachRemaining(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#getExactSizeIfKnown()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetExactSizeIfKnown()
+        {
+            return IExecuteWithSignature<long>("getExactSizeIfKnown", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#forEachRemaining(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         public void ForEachRemaining(Java.Util.Function.Consumer arg0)
@@ -175,7 +176,7 @@ public partial class OfDouble
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfDouble.html#tryAdvance(java.util.function.DoubleConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfDouble.html#tryAdvance(java.util.function.DoubleConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -184,7 +185,7 @@ public bool TryAdvance(Java.Util.Function.DoubleConsumer arg0)
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/util/function/DoubleConsumer;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfDouble.html#tryAdvance(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfDouble.html#tryAdvance(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -193,17 +194,17 @@ public bool TryAdvance(object arg0)
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/lang/Object;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfDouble.html#tryAdvance(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfDouble.html#tryAdvance(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Double"><see cref="Java.Lang.Double"/></typeparam>
             /// <returns><see cref="bool"/></returns>
-            public bool TryAdvance<Arg0objectSuperJava_Lang_Double>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Double> arg0) where Arg0objectSuperJava_Lang_Double: Java.Lang.Double
+            public bool TryAdvance<Arg0objectSuperJava_Lang_Double>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Double> arg0) where Arg0objectSuperJava_Lang_Double : Java.Lang.Double
             {
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/util/function/Consumer;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfDouble.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfDouble.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator.OfPrimitive"/></returns>
             public Java.Util.Spliterator.OfPrimitive TrySplit()
@@ -211,7 +212,7 @@ public Java.Util.Spliterator.OfPrimitive TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator.OfPrimitive>("trySplit", "()Ljava/util/Spliterator$OfPrimitive;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfDouble.html#forEachRemaining(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfDouble.html#forEachRemaining(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             public void ForEachRemaining(object arg0)
@@ -219,16 +220,16 @@ public void ForEachRemaining(object arg0)
                 IExecuteWithSignature("forEachRemaining", "(Ljava/lang/Object;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfDouble.html#forEachRemaining(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfDouble.html#forEachRemaining(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Double"><see cref="Java.Lang.Double"/></typeparam>
-            public void ForEachRemaining<Arg0objectSuperJava_Lang_Double>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Double> arg0) where Arg0objectSuperJava_Lang_Double: Java.Lang.Double
+            public void ForEachRemaining<Arg0objectSuperJava_Lang_Double>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Double> arg0) where Arg0objectSuperJava_Lang_Double : Java.Lang.Double
             {
                 IExecuteWithSignature("forEachRemaining", "(Ljava/util/function/Consumer;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfDouble.html#forEachRemaining(java.util.function.DoubleConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfDouble.html#forEachRemaining(java.util.function.DoubleConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
             public void ForEachRemaining(Java.Util.Function.DoubleConsumer arg0)
@@ -267,7 +268,7 @@ public partial class OfInt
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfInt.html#tryAdvance(java.util.function.IntConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfInt.html#tryAdvance(java.util.function.IntConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -276,7 +277,7 @@ public bool TryAdvance(Java.Util.Function.IntConsumer arg0)
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/util/function/IntConsumer;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfInt.html#tryAdvance(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfInt.html#tryAdvance(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -285,17 +286,17 @@ public bool TryAdvance(object arg0)
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/lang/Object;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfInt.html#tryAdvance(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfInt.html#tryAdvance(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Integer"><see cref="Java.Lang.Integer"/></typeparam>
             /// <returns><see cref="bool"/></returns>
-            public bool TryAdvance<Arg0objectSuperJava_Lang_Integer>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Integer> arg0) where Arg0objectSuperJava_Lang_Integer: Java.Lang.Integer
+            public bool TryAdvance<Arg0objectSuperJava_Lang_Integer>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Integer> arg0) where Arg0objectSuperJava_Lang_Integer : Java.Lang.Integer
             {
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/util/function/Consumer;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfInt.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfInt.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator.OfPrimitive"/></returns>
             public Java.Util.Spliterator.OfPrimitive TrySplit()
@@ -303,7 +304,7 @@ public Java.Util.Spliterator.OfPrimitive TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator.OfPrimitive>("trySplit", "()Ljava/util/Spliterator$OfPrimitive;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfInt.html#forEachRemaining(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfInt.html#forEachRemaining(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             public void ForEachRemaining(object arg0)
@@ -311,16 +312,16 @@ public void ForEachRemaining(object arg0)
                 IExecuteWithSignature("forEachRemaining", "(Ljava/lang/Object;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfInt.html#forEachRemaining(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfInt.html#forEachRemaining(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Integer"><see cref="Java.Lang.Integer"/></typeparam>
-            public void ForEachRemaining<Arg0objectSuperJava_Lang_Integer>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Integer> arg0) where Arg0objectSuperJava_Lang_Integer: Java.Lang.Integer
+            public void ForEachRemaining<Arg0objectSuperJava_Lang_Integer>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Integer> arg0) where Arg0objectSuperJava_Lang_Integer : Java.Lang.Integer
             {
                 IExecuteWithSignature("forEachRemaining", "(Ljava/util/function/Consumer;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfInt.html#forEachRemaining(java.util.function.IntConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfInt.html#forEachRemaining(java.util.function.IntConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
             public void ForEachRemaining(Java.Util.Function.IntConsumer arg0)
@@ -359,7 +360,7 @@ public partial class OfLong
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfLong.html#tryAdvance(java.util.function.LongConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfLong.html#tryAdvance(java.util.function.LongConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -368,7 +369,7 @@ public bool TryAdvance(Java.Util.Function.LongConsumer arg0)
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/util/function/LongConsumer;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfLong.html#tryAdvance(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfLong.html#tryAdvance(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -377,17 +378,17 @@ public bool TryAdvance(object arg0)
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/lang/Object;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfLong.html#tryAdvance(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfLong.html#tryAdvance(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Long"><see cref="Java.Lang.Long"/></typeparam>
             /// <returns><see cref="bool"/></returns>
-            public bool TryAdvance<Arg0objectSuperJava_Lang_Long>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Long> arg0) where Arg0objectSuperJava_Lang_Long: Java.Lang.Long
+            public bool TryAdvance<Arg0objectSuperJava_Lang_Long>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Long> arg0) where Arg0objectSuperJava_Lang_Long : Java.Lang.Long
             {
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/util/function/Consumer;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfLong.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfLong.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator.OfPrimitive"/></returns>
             public Java.Util.Spliterator.OfPrimitive TrySplit()
@@ -395,7 +396,7 @@ public Java.Util.Spliterator.OfPrimitive TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator.OfPrimitive>("trySplit", "()Ljava/util/Spliterator$OfPrimitive;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfLong.html#forEachRemaining(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfLong.html#forEachRemaining(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             public void ForEachRemaining(object arg0)
@@ -403,16 +404,16 @@ public void ForEachRemaining(object arg0)
                 IExecuteWithSignature("forEachRemaining", "(Ljava/lang/Object;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfLong.html#forEachRemaining(java.util.function.Consumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfLong.html#forEachRemaining(java.util.function.Consumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
             /// <typeparam name="Arg0objectSuperJava_Lang_Long"><see cref="Java.Lang.Long"/></typeparam>
-            public void ForEachRemaining<Arg0objectSuperJava_Lang_Long>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Long> arg0) where Arg0objectSuperJava_Lang_Long: Java.Lang.Long
+            public void ForEachRemaining<Arg0objectSuperJava_Lang_Long>(Java.Util.Function.Consumer<Arg0objectSuperJava_Lang_Long> arg0) where Arg0objectSuperJava_Lang_Long : Java.Lang.Long
             {
                 IExecuteWithSignature("forEachRemaining", "(Ljava/util/function/Consumer;)V", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfLong.html#forEachRemaining(java.util.function.LongConsumer)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfLong.html#forEachRemaining(java.util.function.LongConsumer)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
             public void ForEachRemaining(Java.Util.Function.LongConsumer arg0)
@@ -451,7 +452,7 @@ public partial class OfPrimitive
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfPrimitive.html#tryAdvance(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfPrimitive.html#tryAdvance(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -460,7 +461,7 @@ public bool TryAdvance(object arg0)
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/lang/Object;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfPrimitive.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfPrimitive.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator"/></returns>
             public Java.Util.Spliterator TrySplit()
@@ -468,7 +469,7 @@ public Java.Util.Spliterator TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator>("trySplit", "()Ljava/util/Spliterator;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfPrimitive.html#forEachRemaining(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfPrimitive.html#forEachRemaining(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><see cref="object"/></param>
             public void ForEachRemaining(object arg0)
@@ -511,7 +512,7 @@ public partial class OfPrimitive<T, T_CONS, T_SPLITR>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfPrimitive.html#tryAdvance(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfPrimitive.html#tryAdvance(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="T_CONS"/></param>
             /// <returns><see cref="bool"/></returns>
@@ -520,7 +521,7 @@ public bool TryAdvance(T_CONS arg0)
                 return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/lang/Object;)Z", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfPrimitive.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfPrimitive.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator"/></returns>
             public Java.Util.Spliterator TrySplit()
@@ -528,7 +529,7 @@ public Java.Util.Spliterator TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator>("trySplit", "()Ljava/util/Spliterator;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.OfPrimitive.html#forEachRemaining(java.lang.Object)"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterator.OfPrimitive.html#forEachRemaining(java.lang.Object)"/>
             /// </summary>
             /// <param name="arg0"><typeparamref name="T_CONS"/></param>
             public void ForEachRemaining(T_CONS arg0)
@@ -588,49 +589,49 @@ public partial class Spliterator<T> : Java.Util.ISpliterator<T>
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#CONCURRENT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#CONCURRENT"/>
         /// </summary>
         public static int CONCURRENT { get { if (!_CONCURRENTReady) { _CONCURRENTContent = SGetField<int>(LocalBridgeClazz, "CONCURRENT"); _CONCURRENTReady = true; } return _CONCURRENTContent; } }
         private static int _CONCURRENTContent = default;
         private static bool _CONCURRENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#DISTINCT"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#DISTINCT"/>
         /// </summary>
         public static int DISTINCT { get { if (!_DISTINCTReady) { _DISTINCTContent = SGetField<int>(LocalBridgeClazz, "DISTINCT"); _DISTINCTReady = true; } return _DISTINCTContent; } }
         private static int _DISTINCTContent = default;
         private static bool _DISTINCTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#IMMUTABLE"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#IMMUTABLE"/>
         /// </summary>
         public static int IMMUTABLE { get { if (!_IMMUTABLEReady) { _IMMUTABLEContent = SGetField<int>(LocalBridgeClazz, "IMMUTABLE"); _IMMUTABLEReady = true; } return _IMMUTABLEContent; } }
         private static int _IMMUTABLEContent = default;
         private static bool _IMMUTABLEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#NONNULL"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#NONNULL"/>
         /// </summary>
         public static int NONNULL { get { if (!_NONNULLReady) { _NONNULLContent = SGetField<int>(LocalBridgeClazz, "NONNULL"); _NONNULLReady = true; } return _NONNULLContent; } }
         private static int _NONNULLContent = default;
         private static bool _NONNULLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#ORDERED"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#ORDERED"/>
         /// </summary>
         public static int ORDERED { get { if (!_ORDEREDReady) { _ORDEREDContent = SGetField<int>(LocalBridgeClazz, "ORDERED"); _ORDEREDReady = true; } return _ORDEREDContent; } }
         private static int _ORDEREDContent = default;
         private static bool _ORDEREDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#SIZED"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#SIZED"/>
         /// </summary>
         public static int SIZED { get { if (!_SIZEDReady) { _SIZEDContent = SGetField<int>(LocalBridgeClazz, "SIZED"); _SIZEDReady = true; } return _SIZEDContent; } }
         private static int _SIZEDContent = default;
         private static bool _SIZEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#SORTED"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#SORTED"/>
         /// </summary>
         public static int SORTED { get { if (!_SORTEDReady) { _SORTEDContent = SGetField<int>(LocalBridgeClazz, "SORTED"); _SORTEDReady = true; } return _SORTEDContent; } }
         private static int _SORTEDContent = default;
         private static bool _SORTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#SUBSIZED"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#SUBSIZED"/>
         /// </summary>
         public static int SUBSIZED { get { if (!_SUBSIZEDReady) { _SUBSIZEDContent = SGetField<int>(LocalBridgeClazz, "SUBSIZED"); _SUBSIZEDReady = true; } return _SUBSIZEDContent; } }
         private static int _SUBSIZEDContent = default;
@@ -644,24 +645,17 @@ public partial class Spliterator<T> : Java.Util.ISpliterator<T>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#getExactSizeIfKnown()"/> 
-        /// </summary>
-        public long ExactSizeIfKnown
-        {
-            get { return IExecuteWithSignature<long>("getExactSizeIfKnown", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#tryAdvance(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#tryAdvance(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool TryAdvance<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public bool TryAdvance<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<bool>("tryAdvance", "(Ljava/util/function/Consumer;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#characteristics()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#characteristics()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Characteristics()
@@ -669,7 +663,7 @@ public int Characteristics()
             return IExecuteWithSignature<int>("characteristics", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#trySplit()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#trySplit()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator<T> TrySplit()
@@ -677,7 +671,7 @@ public Java.Util.Spliterator<T> TrySplit()
             return IExecuteWithSignature<Java.Util.Spliterator<T>>("trySplit", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#estimateSize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#estimateSize()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long EstimateSize()
@@ -685,7 +679,7 @@ public long EstimateSize()
             return IExecuteWithSignature<long>("estimateSize", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#hasCharacteristics(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#hasCharacteristics(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -694,11 +688,19 @@ public bool HasCharacteristics(int arg0)
             return IExecuteWithSignature<bool>("hasCharacteristics", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterator.html#forEachRemaining(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#getExactSizeIfKnown()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetExactSizeIfKnown()
+        {
+            return IExecuteWithSignature<long>("getExactSizeIfKnown", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterator.html#forEachRemaining(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        public void ForEachRemaining<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public void ForEachRemaining<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             IExecuteWithSignature("forEachRemaining", "(Ljava/util/function/Consumer;)V", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Spliterators.cs b/src/net/Netdroid/Generated/Java/Util/Spliterators.cs
index 151541abe..a34c6e4b1 100644
--- a/src/net/Netdroid/Generated/Java/Util/Spliterators.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Spliterators.cs
@@ -42,18 +42,18 @@ public partial class Spliterators
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#iterator(java.util.Spliterator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#iterator(java.util.Spliterator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Spliterator"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
-        public static Java.Util.Iterator<T> Iterator<T, Arg0ExtendsT>(Java.Util.Spliterator<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public static Java.Util.Iterator<T> Iterator<T, Arg0ExtendsT>(Java.Util.Spliterator<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return SExecuteWithSignature<Java.Util.Iterator<T>>(LocalBridgeClazz, "iterator", "(Ljava/util/Spliterator;)Ljava/util/Iterator;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#emptySpliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#emptySpliterator()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
@@ -62,7 +62,7 @@ public static Java.Util.Spliterator<T> EmptySpliterator<T>()
             return SExecuteWithSignature<Java.Util.Spliterator<T>>(LocalBridgeClazz, "emptySpliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(java.lang.Object[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(java.lang.Object[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -75,7 +75,7 @@ public static Java.Util.Spliterator<T> Spliterator<T>(object[] arg0, int arg1, i
             return SExecute<Java.Util.Spliterator<T>>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(java.lang.Object[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(java.lang.Object[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -86,19 +86,19 @@ public static Java.Util.Spliterator<T> Spliterator<T>(object[] arg0, int arg1)
             return SExecute<Java.Util.Spliterator<T>>(LocalBridgeClazz, "spliterator", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(java.util.Collection,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(java.util.Collection,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
-        public static Java.Util.Spliterator<T> Spliterator<T, Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0, int arg1) where Arg0ExtendsT: T
+        public static Java.Util.Spliterator<T> Spliterator<T, Arg0ExtendsT>(Java.Util.Collection<Arg0ExtendsT> arg0, int arg1) where Arg0ExtendsT : T
         {
             return SExecute<Java.Util.Spliterator<T>>(LocalBridgeClazz, "spliterator", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(java.util.Iterator,long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(java.util.Iterator,long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Iterator"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -106,24 +106,24 @@ public static Java.Util.Spliterator<T> Spliterator<T, Arg0ExtendsT>(Java.Util.Co
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
-        public static Java.Util.Spliterator<T> Spliterator<T, Arg0ExtendsT>(Java.Util.Iterator<Arg0ExtendsT> arg0, long arg1, int arg2) where Arg0ExtendsT: T
+        public static Java.Util.Spliterator<T> Spliterator<T, Arg0ExtendsT>(Java.Util.Iterator<Arg0ExtendsT> arg0, long arg1, int arg2) where Arg0ExtendsT : T
         {
             return SExecute<Java.Util.Spliterator<T>>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliteratorUnknownSize(java.util.Iterator,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliteratorUnknownSize(java.util.Iterator,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Iterator"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
-        public static Java.Util.Spliterator<T> SpliteratorUnknownSize<T, Arg0ExtendsT>(Java.Util.Iterator<Arg0ExtendsT> arg0, int arg1) where Arg0ExtendsT: T
+        public static Java.Util.Spliterator<T> SpliteratorUnknownSize<T, Arg0ExtendsT>(Java.Util.Iterator<Arg0ExtendsT> arg0, int arg1) where Arg0ExtendsT : T
         {
             return SExecute<Java.Util.Spliterator<T>>(LocalBridgeClazz, "spliteratorUnknownSize", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#iterator(java.util.Spliterator.OfDouble)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#iterator(java.util.Spliterator.OfDouble)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Spliterator.OfDouble"/></param>
         /// <returns><see cref="Java.Util.PrimitiveIterator.OfDouble"/></returns>
@@ -132,7 +132,7 @@ public static Java.Util.PrimitiveIterator.OfDouble Iterator(Java.Util.Spliterato
             return SExecuteWithSignature<Java.Util.PrimitiveIterator.OfDouble>(LocalBridgeClazz, "iterator", "(Ljava/util/Spliterator$OfDouble;)Ljava/util/PrimitiveIterator$OfDouble;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#iterator(java.util.Spliterator.OfInt)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#iterator(java.util.Spliterator.OfInt)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Spliterator.OfInt"/></param>
         /// <returns><see cref="Java.Util.PrimitiveIterator.OfInt"/></returns>
@@ -141,7 +141,7 @@ public static Java.Util.PrimitiveIterator.OfInt Iterator(Java.Util.Spliterator.O
             return SExecuteWithSignature<Java.Util.PrimitiveIterator.OfInt>(LocalBridgeClazz, "iterator", "(Ljava/util/Spliterator$OfInt;)Ljava/util/PrimitiveIterator$OfInt;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#iterator(java.util.Spliterator.OfLong)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#iterator(java.util.Spliterator.OfLong)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Spliterator.OfLong"/></param>
         /// <returns><see cref="Java.Util.PrimitiveIterator.OfLong"/></returns>
@@ -150,7 +150,7 @@ public static Java.Util.PrimitiveIterator.OfLong Iterator(Java.Util.Spliterator.
             return SExecuteWithSignature<Java.Util.PrimitiveIterator.OfLong>(LocalBridgeClazz, "iterator", "(Ljava/util/Spliterator$OfLong;)Ljava/util/PrimitiveIterator$OfLong;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#emptyDoubleSpliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#emptyDoubleSpliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator.OfDouble"/></returns>
         public static Java.Util.Spliterator.OfDouble EmptyDoubleSpliterator()
@@ -158,7 +158,7 @@ public static Java.Util.Spliterator.OfDouble EmptyDoubleSpliterator()
             return SExecuteWithSignature<Java.Util.Spliterator.OfDouble>(LocalBridgeClazz, "emptyDoubleSpliterator", "()Ljava/util/Spliterator$OfDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(double[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(double[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -170,7 +170,7 @@ public static Java.Util.Spliterator.OfDouble Spliterator(double[] arg0, int arg1
             return SExecute<Java.Util.Spliterator.OfDouble>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(double[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(double[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -180,7 +180,7 @@ public static Java.Util.Spliterator.OfDouble Spliterator(double[] arg0, int arg1
             return SExecute<Java.Util.Spliterator.OfDouble>(LocalBridgeClazz, "spliterator", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(java.util.PrimitiveIterator.OfDouble,long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(java.util.PrimitiveIterator.OfDouble,long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.PrimitiveIterator.OfDouble"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -191,7 +191,7 @@ public static Java.Util.Spliterator.OfDouble Spliterator(Java.Util.PrimitiveIter
             return SExecute<Java.Util.Spliterator.OfDouble>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliteratorUnknownSize(java.util.PrimitiveIterator.OfDouble,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliteratorUnknownSize(java.util.PrimitiveIterator.OfDouble,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.PrimitiveIterator.OfDouble"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -201,7 +201,7 @@ public static Java.Util.Spliterator.OfDouble SpliteratorUnknownSize(Java.Util.Pr
             return SExecute<Java.Util.Spliterator.OfDouble>(LocalBridgeClazz, "spliteratorUnknownSize", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#emptyIntSpliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#emptyIntSpliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator.OfInt"/></returns>
         public static Java.Util.Spliterator.OfInt EmptyIntSpliterator()
@@ -209,7 +209,7 @@ public static Java.Util.Spliterator.OfInt EmptyIntSpliterator()
             return SExecuteWithSignature<Java.Util.Spliterator.OfInt>(LocalBridgeClazz, "emptyIntSpliterator", "()Ljava/util/Spliterator$OfInt;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(int[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(int[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -221,7 +221,7 @@ public static Java.Util.Spliterator.OfInt Spliterator(int[] arg0, int arg1, int
             return SExecute<Java.Util.Spliterator.OfInt>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(int[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(int[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -231,7 +231,7 @@ public static Java.Util.Spliterator.OfInt Spliterator(int[] arg0, int arg1)
             return SExecute<Java.Util.Spliterator.OfInt>(LocalBridgeClazz, "spliterator", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(java.util.PrimitiveIterator.OfInt,long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(java.util.PrimitiveIterator.OfInt,long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.PrimitiveIterator.OfInt"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -242,7 +242,7 @@ public static Java.Util.Spliterator.OfInt Spliterator(Java.Util.PrimitiveIterato
             return SExecute<Java.Util.Spliterator.OfInt>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliteratorUnknownSize(java.util.PrimitiveIterator.OfInt,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliteratorUnknownSize(java.util.PrimitiveIterator.OfInt,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.PrimitiveIterator.OfInt"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -252,7 +252,7 @@ public static Java.Util.Spliterator.OfInt SpliteratorUnknownSize(Java.Util.Primi
             return SExecute<Java.Util.Spliterator.OfInt>(LocalBridgeClazz, "spliteratorUnknownSize", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#emptyLongSpliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#emptyLongSpliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator.OfLong"/></returns>
         public static Java.Util.Spliterator.OfLong EmptyLongSpliterator()
@@ -260,7 +260,7 @@ public static Java.Util.Spliterator.OfLong EmptyLongSpliterator()
             return SExecuteWithSignature<Java.Util.Spliterator.OfLong>(LocalBridgeClazz, "emptyLongSpliterator", "()Ljava/util/Spliterator$OfLong;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(java.util.PrimitiveIterator.OfLong,long,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(java.util.PrimitiveIterator.OfLong,long,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.PrimitiveIterator.OfLong"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -271,7 +271,7 @@ public static Java.Util.Spliterator.OfLong Spliterator(Java.Util.PrimitiveIterat
             return SExecute<Java.Util.Spliterator.OfLong>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(long[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(long[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -283,7 +283,7 @@ public static Java.Util.Spliterator.OfLong Spliterator(long[] arg0, int arg1, in
             return SExecute<Java.Util.Spliterator.OfLong>(LocalBridgeClazz, "spliterator", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliterator(long[],int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliterator(long[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -293,7 +293,7 @@ public static Java.Util.Spliterator.OfLong Spliterator(long[] arg0, int arg1)
             return SExecute<Java.Util.Spliterator.OfLong>(LocalBridgeClazz, "spliterator", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.html#spliteratorUnknownSize(java.util.PrimitiveIterator.OfLong,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Spliterators.html#spliteratorUnknownSize(java.util.PrimitiveIterator.OfLong,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.PrimitiveIterator.OfLong"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -331,7 +331,7 @@ public partial class AbstractDoubleSpliterator
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractDoubleSpliterator.html#characteristics()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractDoubleSpliterator.html#characteristics()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
             public int Characteristics()
@@ -339,7 +339,7 @@ public int Characteristics()
                 return IExecuteWithSignature<int>("characteristics", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractDoubleSpliterator.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractDoubleSpliterator.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator.OfDouble"/></returns>
             public Java.Util.Spliterator.OfDouble TrySplit()
@@ -347,7 +347,7 @@ public Java.Util.Spliterator.OfDouble TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator.OfDouble>("trySplit", "()Ljava/util/Spliterator$OfDouble;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractDoubleSpliterator.html#estimateSize()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractDoubleSpliterator.html#estimateSize()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
             public long EstimateSize()
@@ -386,7 +386,7 @@ public partial class AbstractIntSpliterator
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractIntSpliterator.html#characteristics()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractIntSpliterator.html#characteristics()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
             public int Characteristics()
@@ -394,7 +394,7 @@ public int Characteristics()
                 return IExecuteWithSignature<int>("characteristics", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractIntSpliterator.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractIntSpliterator.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator.OfInt"/></returns>
             public Java.Util.Spliterator.OfInt TrySplit()
@@ -402,7 +402,7 @@ public Java.Util.Spliterator.OfInt TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator.OfInt>("trySplit", "()Ljava/util/Spliterator$OfInt;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractIntSpliterator.html#estimateSize()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractIntSpliterator.html#estimateSize()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
             public long EstimateSize()
@@ -441,7 +441,7 @@ public partial class AbstractLongSpliterator
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractLongSpliterator.html#characteristics()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractLongSpliterator.html#characteristics()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
             public int Characteristics()
@@ -449,7 +449,7 @@ public int Characteristics()
                 return IExecuteWithSignature<int>("characteristics", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractLongSpliterator.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractLongSpliterator.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator.OfLong"/></returns>
             public Java.Util.Spliterator.OfLong TrySplit()
@@ -457,7 +457,7 @@ public Java.Util.Spliterator.OfLong TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator.OfLong>("trySplit", "()Ljava/util/Spliterator$OfLong;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractLongSpliterator.html#estimateSize()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractLongSpliterator.html#estimateSize()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
             public long EstimateSize()
@@ -496,7 +496,7 @@ public partial class AbstractSpliterator
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractSpliterator.html#characteristics()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractSpliterator.html#characteristics()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
             public int Characteristics()
@@ -504,7 +504,7 @@ public int Characteristics()
                 return IExecuteWithSignature<int>("characteristics", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractSpliterator.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractSpliterator.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator"/></returns>
             public Java.Util.Spliterator TrySplit()
@@ -512,7 +512,7 @@ public Java.Util.Spliterator TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator>("trySplit", "()Ljava/util/Spliterator;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractSpliterator.html#estimateSize()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractSpliterator.html#estimateSize()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
             public long EstimateSize()
@@ -555,7 +555,7 @@ public partial class AbstractSpliterator<T>
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractSpliterator.html#characteristics()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractSpliterator.html#characteristics()"/>
             /// </summary>
             /// <returns><see cref="int"/></returns>
             public int Characteristics()
@@ -563,7 +563,7 @@ public int Characteristics()
                 return IExecuteWithSignature<int>("characteristics", "()I");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractSpliterator.html#trySplit()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractSpliterator.html#trySplit()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Spliterator"/></returns>
             public Java.Util.Spliterator<T> TrySplit()
@@ -571,7 +571,7 @@ public Java.Util.Spliterator<T> TrySplit()
                 return IExecuteWithSignature<Java.Util.Spliterator<T>>("trySplit", "()Ljava/util/Spliterator;");
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/Spliterators.AbstractSpliterator.html#estimateSize()"/>
+            /// <see href="https://developer.android.com/reference/java/util/Spliterators.AbstractSpliterator.html#estimateSize()"/>
             /// </summary>
             /// <returns><see cref="long"/></returns>
             public long EstimateSize()
diff --git a/src/net/Netdroid/Generated/Java/Util/SplittableRandom.cs b/src/net/Netdroid/Generated/Java/Util/SplittableRandom.cs
index 716436a3a..4c54f9cf2 100644
--- a/src/net/Netdroid/Generated/Java/Util/SplittableRandom.cs
+++ b/src/net/Netdroid/Generated/Java/Util/SplittableRandom.cs
@@ -30,7 +30,7 @@ public partial class SplittableRandom
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#%3Cinit%3E(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#%3Cinit%3E(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         public SplittableRandom(long arg0)
@@ -54,7 +54,42 @@ public SplittableRandom(long arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#nextInt()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextBoolean()"/>
+        /// </summary>
+        /// <returns><see cref="bool"/></returns>
+        public bool NextBoolean()
+        {
+            return IExecute<bool>("nextBoolean");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextDouble()"/>
+        /// </summary>
+        /// <returns><see cref="double"/></returns>
+        public double NextDouble()
+        {
+            return IExecute<double>("nextDouble");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextDouble(double,double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        /// <param name="arg1"><see cref="double"/></param>
+        /// <returns><see cref="double"/></returns>
+        public double NextDouble(double arg0, double arg1)
+        {
+            return IExecute<double>("nextDouble", arg0, arg1);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextDouble(double)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="double"/></param>
+        /// <returns><see cref="double"/></returns>
+        public double NextDouble(double arg0)
+        {
+            return IExecute<double>("nextDouble", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextInt()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int NextInt()
@@ -62,24 +97,34 @@ public int NextInt()
             return IExecuteWithSignature<int>("nextInt", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#split()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextInt(int,int)"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Random.RandomGenerator.SplittableGenerator"/></returns>
-        public Java.Util.Random.RandomGenerator.SplittableGenerator Split()
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int NextInt(int arg0, int arg1)
         {
-            return IExecuteWithSignature<Java.Util.Random.RandomGenerator.SplittableGenerator>("split", "()Ljava/util/random/RandomGenerator$SplittableGenerator;");
+            return IExecute<int>("nextInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#split(java.util.random.RandomGenerator.SplittableGenerator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextInt(int)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Random.RandomGenerator.SplittableGenerator"/></param>
-        /// <returns><see cref="Java.Util.Random.RandomGenerator.SplittableGenerator"/></returns>
-        public Java.Util.Random.RandomGenerator.SplittableGenerator Split(Java.Util.Random.RandomGenerator.SplittableGenerator arg0)
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int NextInt(int arg0)
+        {
+            return IExecute<int>("nextInt", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#split()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.SplittableRandom"/></returns>
+        public Java.Util.SplittableRandom Split()
         {
-            return IExecuteWithSignature<Java.Util.Random.RandomGenerator.SplittableGenerator>("split", "(Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/random/RandomGenerator$SplittableGenerator;", arg0);
+            return IExecuteWithSignature<Java.Util.SplittableRandom>("split", "()Ljava/util/SplittableRandom;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#doubles()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#doubles()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
         public Java.Util.Stream.DoubleStream Doubles()
@@ -87,7 +132,7 @@ public Java.Util.Stream.DoubleStream Doubles()
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("doubles", "()Ljava/util/stream/DoubleStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#doubles(double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#doubles(double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -97,7 +142,7 @@ public Java.Util.Stream.DoubleStream Doubles(double arg0, double arg1)
             return IExecute<Java.Util.Stream.DoubleStream>("doubles", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#doubles(long,double,double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#doubles(long,double,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -108,7 +153,7 @@ public Java.Util.Stream.DoubleStream Doubles(long arg0, double arg1, double arg2
             return IExecute<Java.Util.Stream.DoubleStream>("doubles", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#doubles(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#doubles(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -117,7 +162,7 @@ public Java.Util.Stream.DoubleStream Doubles(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("doubles", "(J)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#ints()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#ints()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Ints()
@@ -125,7 +170,7 @@ public Java.Util.Stream.IntStream Ints()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("ints", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#ints(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#ints(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -135,7 +180,7 @@ public Java.Util.Stream.IntStream Ints(int arg0, int arg1)
             return IExecute<Java.Util.Stream.IntStream>("ints", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#ints(long,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#ints(long,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -146,7 +191,7 @@ public Java.Util.Stream.IntStream Ints(long arg0, int arg1, int arg2)
             return IExecute<Java.Util.Stream.IntStream>("ints", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#ints(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#ints(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -155,7 +200,7 @@ public Java.Util.Stream.IntStream Ints(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("ints", "(J)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#longs()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#longs()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
         public Java.Util.Stream.LongStream Longs()
@@ -163,7 +208,7 @@ public Java.Util.Stream.LongStream Longs()
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("longs", "()Ljava/util/stream/LongStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#longs(long,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#longs(long,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -174,7 +219,7 @@ public Java.Util.Stream.LongStream Longs(long arg0, long arg1, long arg2)
             return IExecute<Java.Util.Stream.LongStream>("longs", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#longs(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#longs(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -184,7 +229,7 @@ public Java.Util.Stream.LongStream Longs(long arg0, long arg1)
             return IExecute<Java.Util.Stream.LongStream>("longs", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#longs(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#longs(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -193,51 +238,34 @@ public Java.Util.Stream.LongStream Longs(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("longs", "(J)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#splits()"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextLong()"/>
         /// </summary>
-        /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<Java.Util.Random.RandomGenerator.SplittableGenerator> Splits()
-        {
-            return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Util.Random.RandomGenerator.SplittableGenerator>>("splits", "()Ljava/util/stream/Stream;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#splits(java.util.random.RandomGenerator.SplittableGenerator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Random.RandomGenerator.SplittableGenerator"/></param>
-        /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<Java.Util.Random.RandomGenerator.SplittableGenerator> Splits(Java.Util.Random.RandomGenerator.SplittableGenerator arg0)
+        /// <returns><see cref="long"/></returns>
+        public long NextLong()
         {
-            return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Util.Random.RandomGenerator.SplittableGenerator>>("splits", "(Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream;", arg0);
+            return IExecuteWithSignature<long>("nextLong", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#splits(long,java.util.random.RandomGenerator.SplittableGenerator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextLong(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Random.RandomGenerator.SplittableGenerator"/></param>
-        /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<Java.Util.Random.RandomGenerator.SplittableGenerator> Splits(long arg0, Java.Util.Random.RandomGenerator.SplittableGenerator arg1)
+        /// <param name="arg1"><see cref="long"/></param>
+        /// <returns><see cref="long"/></returns>
+        public long NextLong(long arg0, long arg1)
         {
-            return IExecute<Java.Util.Stream.Stream<Java.Util.Random.RandomGenerator.SplittableGenerator>>("splits", arg0, arg1);
+            return IExecute<long>("nextLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#splits(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextLong(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
-        /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<Java.Util.Random.RandomGenerator.SplittableGenerator> Splits(long arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Util.Random.RandomGenerator.SplittableGenerator>>("splits", "(J)Ljava/util/stream/Stream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#nextLong()"/>
-        /// </summary>
         /// <returns><see cref="long"/></returns>
-        public long NextLong()
+        public long NextLong(long arg0)
         {
-            return IExecuteWithSignature<long>("nextLong", "()J");
+            return IExecute<long>("nextLong", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/SplittableRandom.html#nextBytes(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/SplittableRandom.html#nextBytes(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void NextBytes(byte[] arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Stack.cs b/src/net/Netdroid/Generated/Java/Util/Stack.cs
index 032784abd..484ebc425 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stack.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stack.cs
@@ -46,7 +46,7 @@ public partial class Stack
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#empty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Empty()
@@ -54,7 +54,7 @@ public bool Empty()
             return IExecuteWithSignature<bool>("empty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -63,7 +63,7 @@ public object Push(object arg0)
             return IExecuteWithSignature("push", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#peek()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Peek()
@@ -71,7 +71,7 @@ public object Peek()
             return IExecuteWithSignature("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#pop()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Pop()
@@ -79,7 +79,7 @@ public object Pop()
             return IExecuteWithSignature("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#search(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#search(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -123,7 +123,7 @@ public partial class Stack<E>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#empty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Empty()
@@ -131,7 +131,7 @@ public bool Empty()
             return IExecuteWithSignature<bool>("empty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#push(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#push(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -140,7 +140,7 @@ public E Push(E arg0)
             return IExecuteWithSignature<E>("push", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#peek()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#peek()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Peek()
@@ -148,7 +148,7 @@ public E Peek()
             return IExecuteWithSignature<E>("peek", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#pop()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#pop()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Pop()
@@ -156,7 +156,7 @@ public E Pop()
             return IExecuteWithSignature<E>("pop", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Stack.html#search(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Stack.html#search(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Stream/AllPackageClasses.cs
index af27a2e8c..d589c6f1a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Stream
 {
     #region BaseStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html"/>
     /// </summary>
     public partial class BaseStream : Java.Lang.AutoCloseable
     {
@@ -36,12 +36,12 @@ public partial class BaseStream : Java.Lang.AutoCloseable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BaseStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BaseStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BaseStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BaseStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BaseStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BaseStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,22 +74,22 @@ public BaseStream(params object[] args) : base(args) { }
 
     #region BaseStream<T, S>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="S"><see cref="Java.Util.Stream.BaseStream{T, S}"/></typeparam>
-    public partial class BaseStream<T, S> : Java.Lang.AutoCloseable where S: Java.Util.Stream.BaseStream<T, S>
+    public partial class BaseStream<T, S> : Java.Lang.AutoCloseable where S : Java.Util.Stream.BaseStream<T, S>
     {
         const string _bridgeClassName = "java.util.stream.BaseStream";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("BaseStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BaseStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BaseStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("BaseStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("BaseStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public BaseStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -122,7 +122,7 @@ public BaseStream(params object[] args) : base(args) { }
 
     #region Collector
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html"/>
     /// </summary>
     public partial class Collector : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Collector>
     {
@@ -130,12 +130,12 @@ public partial class Collector : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Collect
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Collector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collector() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Collector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collector(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -164,7 +164,7 @@ public Collector(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Characteristics
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.Characteristics.html"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.Characteristics.html"/>
         /// </summary>
         public partial class Characteristics : Java.Lang.Enum<Java.Util.Stream.Collector.Characteristics>
         {
@@ -212,7 +212,7 @@ public Characteristics(params object[] args) : base(args) { }
 
     #region Collector<T, A, R>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <typeparam name="A"></typeparam>
@@ -223,12 +223,12 @@ public partial class Collector<T, A, R> : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Collector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collector() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Collector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Collector class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Collector(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -261,7 +261,7 @@ public Collector(params object[] args) : base(args) { }
 
     #region Collectors
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html"/>
     /// </summary>
     public partial class Collectors : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Collectors>
     {
@@ -305,7 +305,7 @@ public Collectors(params object[] args) : base(args) { }
 
     #region DoubleStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html"/>
     /// </summary>
     public partial class DoubleStream : Java.Util.Stream.BaseStream<Java.Lang.Double, Java.Util.Stream.DoubleStream>
     {
@@ -313,12 +313,12 @@ public partial class DoubleStream : Java.Util.Stream.BaseStream<Java.Lang.Double
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DoubleStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DoubleStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DoubleStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DoubleStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DoubleStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DoubleStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -351,7 +351,7 @@ public DoubleStream(params object[] args) : base(args) { }
 
     #region IntStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html"/>
     /// </summary>
     public partial class IntStream : Java.Util.Stream.BaseStream<Java.Lang.Integer, Java.Util.Stream.IntStream>
     {
@@ -359,12 +359,12 @@ public partial class IntStream : Java.Util.Stream.BaseStream<Java.Lang.Integer,
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("IntStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("IntStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("IntStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public IntStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -397,7 +397,7 @@ public IntStream(params object[] args) : base(args) { }
 
     #region LongStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html"/>
     /// </summary>
     public partial class LongStream : Java.Util.Stream.BaseStream<Java.Lang.Long, Java.Util.Stream.LongStream>
     {
@@ -405,12 +405,12 @@ public partial class LongStream : Java.Util.Stream.BaseStream<Java.Lang.Long, Ja
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LongStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LongStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LongStream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LongStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LongStream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LongStream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -443,7 +443,7 @@ public LongStream(params object[] args) : base(args) { }
 
     #region Stream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html"/>
     /// </summary>
     public partial class Stream : Java.Util.Stream.BaseStream
     {
@@ -451,12 +451,12 @@ public partial class Stream : Java.Util.Stream.BaseStream
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Stream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Stream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Stream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Stream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Stream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Stream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -489,7 +489,7 @@ public Stream(params object[] args) : base(args) { }
 
     #region Stream<T>
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public partial class Stream<T> : Java.Util.Stream.BaseStream<T, Java.Util.Stream.Stream<T>>
@@ -498,12 +498,12 @@ public partial class Stream<T> : Java.Util.Stream.BaseStream<T, Java.Util.Stream
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Stream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Stream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Stream() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Stream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Stream class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Stream(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -536,7 +536,7 @@ public Stream(params object[] args) : base(args) { }
 
     #region StreamSupport
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html"/>
     /// </summary>
     public partial class StreamSupport : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StreamSupport>
     {
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/BaseStream.cs b/src/net/Netdroid/Generated/Java/Util/Stream/BaseStream.cs
index eb36b4145..8fd450e13 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/BaseStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/BaseStream.cs
@@ -46,7 +46,7 @@ public partial class BaseStream
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#isParallel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#isParallel()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsParallel()
@@ -54,7 +54,7 @@ public bool IsParallel()
             return IExecuteWithSignature<bool>("isParallel", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -62,7 +62,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -70,7 +70,7 @@ public Java.Util.Spliterator Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#onClose(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#onClose(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
@@ -79,7 +79,7 @@ public Java.Util.Stream.BaseStream OnClose(Java.Lang.Runnable arg0)
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("onClose", "(Ljava/lang/Runnable;)Ljava/util/stream/BaseStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#parallel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#parallel()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Parallel()
@@ -87,7 +87,7 @@ public Java.Util.Stream.BaseStream Parallel()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("parallel", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#sequential()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#sequential()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Sequential()
@@ -95,7 +95,7 @@ public Java.Util.Stream.BaseStream Sequential()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("sequential", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#unordered()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#unordered()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Unordered()
@@ -103,7 +103,7 @@ public Java.Util.Stream.BaseStream Unordered()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("unordered", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#close()"/>
         /// </summary>
         public void Close()
         {
@@ -163,7 +163,7 @@ public partial class BaseStream<T, S> : Java.Util.Stream.IBaseStream<T, S>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#isParallel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#isParallel()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsParallel()
@@ -171,7 +171,7 @@ public bool IsParallel()
             return IExecuteWithSignature<bool>("isParallel", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<T> Iterator()
@@ -179,7 +179,7 @@ public Java.Util.Iterator<T> Iterator()
             return IExecuteWithSignature<Java.Util.Iterator<T>>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator<T> Spliterator()
@@ -187,7 +187,7 @@ public Java.Util.Spliterator<T> Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator<T>>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#onClose(java.lang.Runnable)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#onClose(java.lang.Runnable)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Runnable"/></param>
         /// <returns><typeparamref name="S"/></returns>
@@ -196,7 +196,7 @@ public S OnClose(Java.Lang.Runnable arg0)
             return IExecuteWithSignature<S>("onClose", "(Ljava/lang/Runnable;)Ljava/util/stream/BaseStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#parallel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#parallel()"/>
         /// </summary>
         /// <returns><typeparamref name="S"/></returns>
         public S Parallel()
@@ -204,7 +204,7 @@ public S Parallel()
             return IExecuteWithSignature<S>("parallel", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#sequential()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#sequential()"/>
         /// </summary>
         /// <returns><typeparamref name="S"/></returns>
         public S Sequential()
@@ -212,7 +212,7 @@ public S Sequential()
             return IExecuteWithSignature<S>("sequential", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#unordered()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#unordered()"/>
         /// </summary>
         /// <returns><typeparamref name="S"/></returns>
         public S Unordered()
@@ -220,7 +220,7 @@ public S Unordered()
             return IExecuteWithSignature<S>("unordered", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/BaseStream.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/BaseStream.html#close()"/>
         /// </summary>
         public void Close()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/Collector.cs b/src/net/Netdroid/Generated/Java/Util/Stream/Collector.cs
index 631c1284a..a12afbb7a 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/Collector.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/Collector.cs
@@ -42,7 +42,7 @@ public partial class Collector
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#of(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BinaryOperator,java.util.function.Function,java.util.stream.Collector.Characteristics[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#of(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BinaryOperator,java.util.function.Function,java.util.stream.Collector.Characteristics[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -55,7 +55,7 @@ public static Java.Util.Stream.Collector Of(Java.Util.Function.Supplier arg0, Ja
             if (arg4.Length == 0) return SExecute<Java.Util.Stream.Collector>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3); else return SExecute<Java.Util.Stream.Collector>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#of(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BinaryOperator,java.util.stream.Collector.Characteristics[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#of(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BinaryOperator,java.util.stream.Collector.Characteristics[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -71,7 +71,7 @@ public static Java.Util.Stream.Collector Of(Java.Util.Function.Supplier arg0, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#accumulator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#accumulator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
         public Java.Util.Function.BiConsumer Accumulator()
@@ -79,7 +79,7 @@ public Java.Util.Function.BiConsumer Accumulator()
             return IExecuteWithSignature<Java.Util.Function.BiConsumer>("accumulator", "()Ljava/util/function/BiConsumer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#accumulator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#accumulator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
         public Java.Util.Function.BiConsumer AccumulatorDirect()
@@ -87,7 +87,7 @@ public Java.Util.Function.BiConsumer AccumulatorDirect()
             return IExecuteWithSignature<Java.Util.Function.BiConsumerDirect, Java.Util.Function.BiConsumer>("accumulator", "()Ljava/util/function/BiConsumer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#combiner()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#combiner()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BinaryOperator"/></returns>
         public Java.Util.Function.BinaryOperator Combiner()
@@ -95,7 +95,7 @@ public Java.Util.Function.BinaryOperator Combiner()
             return IExecuteWithSignature<Java.Util.Function.BinaryOperator>("combiner", "()Ljava/util/function/BinaryOperator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#combiner()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#combiner()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BinaryOperator"/></returns>
         public Java.Util.Function.BinaryOperator CombinerDirect()
@@ -103,7 +103,7 @@ public Java.Util.Function.BinaryOperator CombinerDirect()
             return IExecuteWithSignature<Java.Util.Function.BinaryOperatorDirect, Java.Util.Function.BinaryOperator>("combiner", "()Ljava/util/function/BinaryOperator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#finisher()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#finisher()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         public Java.Util.Function.Function Finisher()
@@ -111,7 +111,7 @@ public Java.Util.Function.Function Finisher()
             return IExecuteWithSignature<Java.Util.Function.Function>("finisher", "()Ljava/util/function/Function;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#finisher()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#finisher()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         public Java.Util.Function.Function FinisherDirect()
@@ -119,7 +119,7 @@ public Java.Util.Function.Function FinisherDirect()
             return IExecuteWithSignature<Java.Util.Function.FunctionDirect, Java.Util.Function.Function>("finisher", "()Ljava/util/function/Function;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#supplier()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#supplier()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Supplier"/></returns>
         public Java.Util.Function.Supplier Supplier()
@@ -127,7 +127,7 @@ public Java.Util.Function.Supplier Supplier()
             return IExecuteWithSignature<Java.Util.Function.Supplier>("supplier", "()Ljava/util/function/Supplier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#supplier()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#supplier()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Supplier"/></returns>
         public Java.Util.Function.Supplier SupplierDirect()
@@ -135,7 +135,7 @@ public Java.Util.Function.Supplier SupplierDirect()
             return IExecuteWithSignature<Java.Util.Function.SupplierDirect, Java.Util.Function.Supplier>("supplier", "()Ljava/util/function/Supplier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#characteristics()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#characteristics()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set CharacteristicsMethod()
@@ -159,19 +159,19 @@ public partial class Characteristics
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.Characteristics.html#CONCURRENT"/>
+            /// <see href="https://developer.android.com/reference/java/util/stream/Collector.Characteristics.html#CONCURRENT"/>
             /// </summary>
             public static Java.Util.Stream.Collector.Characteristics CONCURRENT { get { if (!_CONCURRENTReady) { _CONCURRENTContent = SGetField<Java.Util.Stream.Collector.Characteristics>(LocalBridgeClazz, "CONCURRENT"); _CONCURRENTReady = true; } return _CONCURRENTContent; } }
             private static Java.Util.Stream.Collector.Characteristics _CONCURRENTContent = default;
             private static bool _CONCURRENTReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.Characteristics.html#IDENTITY_FINISH"/>
+            /// <see href="https://developer.android.com/reference/java/util/stream/Collector.Characteristics.html#IDENTITY_FINISH"/>
             /// </summary>
             public static Java.Util.Stream.Collector.Characteristics IDENTITY_FINISH { get { if (!_IDENTITY_FINISHReady) { _IDENTITY_FINISHContent = SGetField<Java.Util.Stream.Collector.Characteristics>(LocalBridgeClazz, "IDENTITY_FINISH"); _IDENTITY_FINISHReady = true; } return _IDENTITY_FINISHContent; } }
             private static Java.Util.Stream.Collector.Characteristics _IDENTITY_FINISHContent = default;
             private static bool _IDENTITY_FINISHReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.Characteristics.html#UNORDERED"/>
+            /// <see href="https://developer.android.com/reference/java/util/stream/Collector.Characteristics.html#UNORDERED"/>
             /// </summary>
             public static Java.Util.Stream.Collector.Characteristics UNORDERED { get { if (!_UNORDEREDReady) { _UNORDEREDContent = SGetField<Java.Util.Stream.Collector.Characteristics>(LocalBridgeClazz, "UNORDERED"); _UNORDEREDReady = true; } return _UNORDEREDContent; } }
             private static Java.Util.Stream.Collector.Characteristics _UNORDEREDContent = default;
@@ -181,7 +181,7 @@ public partial class Characteristics
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.Characteristics.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/java/util/stream/Collector.Characteristics.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Java.Util.Stream.Collector.Characteristics"/></returns>
@@ -190,7 +190,7 @@ public static Java.Util.Stream.Collector.Characteristics ValueOf(Java.Lang.Strin
                 return SExecuteWithSignature<Java.Util.Stream.Collector.Characteristics>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljava/util/stream/Collector$Characteristics;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.Characteristics.html#values()"/>
+            /// <see href="https://developer.android.com/reference/java/util/stream/Collector.Characteristics.html#values()"/>
             /// </summary>
             /// <returns><see cref="Java.Util.Stream.Collector.Characteristics"/></returns>
             public static Java.Util.Stream.Collector.Characteristics[] Values()
@@ -258,7 +258,7 @@ public partial class Collector<T, A, R> : Java.Util.Stream.ICollector<T, A, R>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#of(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BinaryOperator,java.util.function.Function,java.util.stream.Collector.Characteristics[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#of(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BinaryOperator,java.util.function.Function,java.util.stream.Collector.Characteristics[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -271,7 +271,7 @@ public static Java.Util.Stream.Collector<T, A, R> Of(Java.Util.Function.Supplier
             if (arg4.Length == 0) return SExecute<Java.Util.Stream.Collector<T, A, R>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3); else return SExecute<Java.Util.Stream.Collector<T, A, R>>(LocalBridgeClazz, "of", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#of(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BinaryOperator,java.util.stream.Collector.Characteristics[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#of(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BinaryOperator,java.util.stream.Collector.Characteristics[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -287,7 +287,7 @@ public static Java.Util.Stream.Collector<T, R, R> Of(Java.Util.Function.Supplier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#accumulator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#accumulator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
         public Java.Util.Function.BiConsumer<A, T> Accumulator()
@@ -295,7 +295,7 @@ public Java.Util.Function.BiConsumer<A, T> Accumulator()
             return IExecuteWithSignature<Java.Util.Function.BiConsumer<A, T>>("accumulator", "()Ljava/util/function/BiConsumer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#accumulator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#accumulator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BiConsumer"/></returns>
         public Java.Util.Function.BiConsumer<A, T> AccumulatorDirect()
@@ -303,7 +303,7 @@ public Java.Util.Function.BiConsumer<A, T> AccumulatorDirect()
             return IExecuteWithSignature<Java.Util.Function.BiConsumerDirect<A, T>, Java.Util.Function.BiConsumer<A, T>>("accumulator", "()Ljava/util/function/BiConsumer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#combiner()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#combiner()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BinaryOperator"/></returns>
         public Java.Util.Function.BinaryOperator<A> Combiner()
@@ -311,7 +311,7 @@ public Java.Util.Function.BinaryOperator<A> Combiner()
             return IExecuteWithSignature<Java.Util.Function.BinaryOperator<A>>("combiner", "()Ljava/util/function/BinaryOperator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#combiner()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#combiner()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.BinaryOperator"/></returns>
         public Java.Util.Function.BinaryOperator<A> CombinerDirect()
@@ -319,7 +319,7 @@ public Java.Util.Function.BinaryOperator<A> CombinerDirect()
             return IExecuteWithSignature<Java.Util.Function.BinaryOperatorDirect<A>, Java.Util.Function.BinaryOperator<A>>("combiner", "()Ljava/util/function/BinaryOperator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#finisher()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#finisher()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         public Java.Util.Function.Function<A, R> Finisher()
@@ -327,7 +327,7 @@ public Java.Util.Function.Function<A, R> Finisher()
             return IExecuteWithSignature<Java.Util.Function.Function<A, R>>("finisher", "()Ljava/util/function/Function;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#finisher()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#finisher()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Function"/></returns>
         public Java.Util.Function.Function<A, R> FinisherDirect()
@@ -335,7 +335,7 @@ public Java.Util.Function.Function<A, R> FinisherDirect()
             return IExecuteWithSignature<Java.Util.Function.FunctionDirect<A, R>, Java.Util.Function.Function<A, R>>("finisher", "()Ljava/util/function/Function;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#supplier()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#supplier()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Supplier"/></returns>
         public Java.Util.Function.Supplier<A> Supplier()
@@ -343,7 +343,7 @@ public Java.Util.Function.Supplier<A> Supplier()
             return IExecuteWithSignature<Java.Util.Function.Supplier<A>>("supplier", "()Ljava/util/function/Supplier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#supplier()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#supplier()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Function.Supplier"/></returns>
         public Java.Util.Function.Supplier<A> SupplierDirect()
@@ -351,7 +351,7 @@ public Java.Util.Function.Supplier<A> SupplierDirect()
             return IExecuteWithSignature<Java.Util.Function.SupplierDirect<A>, Java.Util.Function.Supplier<A>>("supplier", "()Ljava/util/function/Supplier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collector.html#characteristics()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collector.html#characteristics()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Set"/></returns>
         public Java.Util.Set<Java.Util.Stream.Collector.Characteristics> CharacteristicsMethod()
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/Collectors.cs b/src/net/Netdroid/Generated/Java/Util/Stream/Collectors.cs
index 88481090a..27f535ae2 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/Collectors.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/Collectors.cs
@@ -42,7 +42,7 @@ public partial class Collectors
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#collectingAndThen(java.util.stream.Collector,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#collectingAndThen(java.util.stream.Collector,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Stream.Collector"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -56,7 +56,7 @@ public static Java.Util.Stream.Collector<T, A, RR> CollectingAndThen<T, A, RR, R
             return SExecute<Java.Util.Stream.Collector<T, A, RR>>(LocalBridgeClazz, "collectingAndThen", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#filtering(java.util.function.Predicate,java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#filtering(java.util.function.Predicate,java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.Collector"/></param>
@@ -66,23 +66,23 @@ public static Java.Util.Stream.Collector<T, A, RR> CollectingAndThen<T, A, RR, R
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="A"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, R> Filtering<T, R, Arg0objectSuperT, Arg1objectSuperT, A>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, A, R> arg1) where Arg0objectSuperT: T where Arg1objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, R> Filtering<T, R, Arg0objectSuperT, Arg1objectSuperT, A>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, A, R> arg1) where Arg0objectSuperT : T where Arg1objectSuperT : T
         {
             return SExecute<Java.Util.Stream.Collector<T, object, R>>(LocalBridgeClazz, "filtering", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toCollection(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toCollection(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="C"><see cref="Java.Util.Collection{T}"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, C> ToCollection<T, C>(Java.Util.Function.Supplier<C> arg0) where C: Java.Util.Collection<T>
+        public static Java.Util.Stream.Collector<T, object, C> ToCollection<T, C>(Java.Util.Function.Supplier<C> arg0) where C : Java.Util.Collection<T>
         {
             return SExecute<Java.Util.Stream.Collector<T, object, C>>(LocalBridgeClazz, "toCollection", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#partitioningBy(java.util.function.Predicate,java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#partitioningBy(java.util.function.Predicate,java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.Collector"/></param>
@@ -92,12 +92,12 @@ public static Java.Util.Stream.Collector<T, object, C> ToCollection<T, C>(Java.U
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="A"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<Java.Lang.Boolean, D>> PartitioningBy<T, D, Arg0objectSuperT, Arg1objectSuperT, A>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, A, D> arg1) where Arg0objectSuperT: T where Arg1objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<Java.Lang.Boolean, D>> PartitioningBy<T, D, Arg0objectSuperT, Arg1objectSuperT, A>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, A, D> arg1) where Arg0objectSuperT : T where Arg1objectSuperT : T
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Map<Java.Lang.Boolean, D>>>(LocalBridgeClazz, "partitioningBy", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#groupingByConcurrent(java.util.function.Function,java.util.function.Supplier,java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#groupingByConcurrent(java.util.function.Function,java.util.function.Supplier,java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Supplier"/></param>
@@ -111,12 +111,12 @@ public static Java.Util.Stream.Collector<T, object, C> ToCollection<T, C>(Java.U
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="D"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, M> GroupingByConcurrent<T, M, Arg0objectSuperT, Arg0ExtendsK, K, Arg2objectSuperT, A, D>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Supplier<M> arg1, Java.Util.Stream.Collector<Arg2objectSuperT, A, D> arg2) where M: Java.Util.Concurrent.ConcurrentMap<K, D> where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg2objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, M> GroupingByConcurrent<T, M, Arg0objectSuperT, Arg0ExtendsK, K, Arg2objectSuperT, A, D>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Supplier<M> arg1, Java.Util.Stream.Collector<Arg2objectSuperT, A, D> arg2) where M : Java.Util.Concurrent.ConcurrentMap<K, D> where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg2objectSuperT : T
         {
             return SExecute<Java.Util.Stream.Collector<T, object, M>>(LocalBridgeClazz, "groupingByConcurrent", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#groupingByConcurrent(java.util.function.Function,java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#groupingByConcurrent(java.util.function.Function,java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.Collector"/></param>
@@ -128,12 +128,12 @@ public static Java.Util.Stream.Collector<T, object, M> GroupingByConcurrent<T, M
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="A"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, D>> GroupingByConcurrent<T, K, D, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, A>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, A, D> arg1) where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, D>> GroupingByConcurrent<T, K, D, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, A>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, A, D> arg1) where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, D>>>(LocalBridgeClazz, "groupingByConcurrent", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#groupingBy(java.util.function.Function,java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#groupingBy(java.util.function.Function,java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.Collector"/></param>
@@ -145,12 +145,12 @@ public static Java.Util.Stream.Collector<T, object, M> GroupingByConcurrent<T, M
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="A"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, D>> GroupingBy<T, K, D, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, A>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, A, D> arg1) where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, D>> GroupingBy<T, K, D, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, A>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, A, D> arg1) where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Map<K, D>>>(LocalBridgeClazz, "groupingBy", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#groupingBy(java.util.function.Function,java.util.function.Supplier,java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#groupingBy(java.util.function.Function,java.util.function.Supplier,java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Supplier"/></param>
@@ -164,12 +164,12 @@ public static Java.Util.Stream.Collector<T, object, M> GroupingByConcurrent<T, M
         /// <typeparam name="A"></typeparam>
         /// <typeparam name="D"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, M> GroupingBy<T, M, Arg0objectSuperT, Arg0ExtendsK, K, Arg2objectSuperT, A, D>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Supplier<M> arg1, Java.Util.Stream.Collector<Arg2objectSuperT, A, D> arg2) where M: Java.Util.Map<K, D> where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg2objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, M> GroupingBy<T, M, Arg0objectSuperT, Arg0ExtendsK, K, Arg2objectSuperT, A, D>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Supplier<M> arg1, Java.Util.Stream.Collector<Arg2objectSuperT, A, D> arg2) where M : Java.Util.Map<K, D> where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg2objectSuperT : T
         {
             return SExecute<Java.Util.Stream.Collector<T, object, M>>(LocalBridgeClazz, "groupingBy", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toConcurrentMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator,java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toConcurrentMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator,java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -184,12 +184,12 @@ public static Java.Util.Stream.Collector<T, object, M> GroupingBy<T, M, Arg0obje
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="U"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, M> ToConcurrentMap<T, M, Arg0objectSuperT, Arg0ExtendsK, K, Arg1objectSuperT, Arg1ExtendsU, U>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2, Java.Util.Function.Supplier<M> arg3) where M: Java.Util.Concurrent.ConcurrentMap<K, U> where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, M> ToConcurrentMap<T, M, Arg0objectSuperT, Arg0ExtendsK, K, Arg1objectSuperT, Arg1ExtendsU, U>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2, Java.Util.Function.Supplier<M> arg3) where M : Java.Util.Concurrent.ConcurrentMap<K, U> where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, M>>(LocalBridgeClazz, "toConcurrentMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator,java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator,java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -204,12 +204,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToConcurrentMap<T, M, Arg
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="U"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSuperT, Arg0ExtendsK, K, Arg1objectSuperT, Arg1ExtendsU, U>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2, Java.Util.Function.Supplier<M> arg3) where M: Java.Util.Map<K, U> where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSuperT, Arg0ExtendsK, K, Arg1objectSuperT, Arg1ExtendsU, U>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2, Java.Util.Function.Supplier<M> arg3) where M : Java.Util.Map<K, U> where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, M>>(LocalBridgeClazz, "toMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toConcurrentMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toConcurrentMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -222,12 +222,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSup
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, U>> ToConcurrentMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, U>> ToConcurrentMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, U>>>(LocalBridgeClazz, "toConcurrentMap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toConcurrentMap(java.util.function.Function,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toConcurrentMap(java.util.function.Function,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -239,12 +239,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSup
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, U>> ToConcurrentMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1) where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, U>> ToConcurrentMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1) where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, U>>>(LocalBridgeClazz, "toConcurrentMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -257,12 +257,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSup
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>> ToMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>> ToMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>>>(LocalBridgeClazz, "toMap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toMap(java.util.function.Function,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toMap(java.util.function.Function,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -274,12 +274,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSup
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>> ToMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1) where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>> ToMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1) where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>>>(LocalBridgeClazz, "toMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toUnmodifiableMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toUnmodifiableMap(java.util.function.Function,java.util.function.Function,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -292,12 +292,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSup
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>> ToUnmodifiableMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>> ToUnmodifiableMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>>>(LocalBridgeClazz, "toUnmodifiableMap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toUnmodifiableMap(java.util.function.Function,java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toUnmodifiableMap(java.util.function.Function,java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -309,12 +309,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSup
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>> ToUnmodifiableMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1) where Arg0objectSuperT: T where Arg0ExtendsK: K where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>> ToUnmodifiableMap<T, K, U, Arg0objectSuperT, Arg0ExtendsK, Arg1objectSuperT, Arg1ExtendsU>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1) where Arg0objectSuperT : T where Arg0ExtendsK : K where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Map<K, U>>>(LocalBridgeClazz, "toUnmodifiableMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#groupingByConcurrent(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#groupingByConcurrent(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="T"></typeparam>
@@ -322,12 +322,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSup
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, Java.Util.List<T>>> GroupingByConcurrent<T, K, Arg0objectSuperT, Arg0ExtendsK>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0) where Arg0objectSuperT: T where Arg0ExtendsK: K
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, Java.Util.List<T>>> GroupingByConcurrent<T, K, Arg0objectSuperT, Arg0ExtendsK>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0) where Arg0objectSuperT : T where Arg0ExtendsK : K
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Concurrent.ConcurrentMap<K, Java.Util.List<T>>>>(LocalBridgeClazz, "groupingByConcurrent", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#groupingBy(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#groupingBy(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="T"></typeparam>
@@ -335,31 +335,12 @@ public static Java.Util.Stream.Collector<T, object, M> ToMap<T, M, Arg0objectSup
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsK"><typeparamref name="K"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, Java.Util.List<T>>> GroupingBy<T, K, Arg0objectSuperT, Arg0ExtendsK>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0) where Arg0objectSuperT: T where Arg0ExtendsK: K
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<K, Java.Util.List<T>>> GroupingBy<T, K, Arg0objectSuperT, Arg0ExtendsK>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsK> arg0) where Arg0objectSuperT : T where Arg0ExtendsK : K
         {
             return SExecute<Java.Util.Stream.Collector<T, object, Java.Util.Map<K, Java.Util.List<T>>>>(LocalBridgeClazz, "groupingBy", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#teeing(java.util.stream.Collector,java.util.stream.Collector,java.util.function.BiFunction)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Stream.Collector"/></param>
-        /// <param name="arg1"><see cref="Java.Util.Stream.Collector"/></param>
-        /// <param name="arg2"><see cref="Java.Util.Function.BiFunction"/></param>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="R"></typeparam>
-        /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        /// <typeparam name="R1"></typeparam>
-        /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
-        /// <typeparam name="R2"></typeparam>
-        /// <typeparam name="Arg2objectSuperR1"><typeparamref name="R1"/></typeparam>
-        /// <typeparam name="Arg2objectSuperR2"><typeparamref name="R2"/></typeparam>
-        /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, R> Teeing<T, R, Arg0objectSuperT, R1, Arg1objectSuperT, R2, Arg2objectSuperR1, Arg2objectSuperR2>(Java.Util.Stream.Collector<Arg0objectSuperT, object, R1> arg0, Java.Util.Stream.Collector<Arg1objectSuperT, object, R2> arg1, Java.Util.Function.BiFunction<Arg2objectSuperR1, Arg2objectSuperR2, R> arg2) where Arg0objectSuperT: T where Arg1objectSuperT: T where Arg2objectSuperR1: R1 where Arg2objectSuperR2: R2
-        {
-            return SExecute<Java.Util.Stream.Collector<T, object, R>>(LocalBridgeClazz, "teeing", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#flatMapping(java.util.function.Function,java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#flatMapping(java.util.function.Function,java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.Collector"/></param>
@@ -372,12 +353,12 @@ public static Java.Util.Stream.Collector<T, object, R> Teeing<T, R, Arg0objectSu
         /// <typeparam name="Arg1objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="A"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, R> FlatMapping<T, R, Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsU_, Arg0ExtendsU, U, Arg1objectSuperU, A>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsU_> arg0, Java.Util.Stream.Collector<Arg1objectSuperU, A, R> arg1) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsU_: Java.Util.Stream.Stream<Arg0ExtendsU> where Arg0ExtendsU: U where Arg1objectSuperU: U
+        public static Java.Util.Stream.Collector<T, object, R> FlatMapping<T, R, Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsU_, Arg0ExtendsU, U, Arg1objectSuperU, A>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsU_> arg0, Java.Util.Stream.Collector<Arg1objectSuperU, A, R> arg1) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsU_ : Java.Util.Stream.Stream<Arg0ExtendsU> where Arg0ExtendsU : U where Arg1objectSuperU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, R>>(LocalBridgeClazz, "flatMapping", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#mapping(java.util.function.Function,java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#mapping(java.util.function.Function,java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.Collector"/></param>
@@ -389,12 +370,12 @@ public static Java.Util.Stream.Collector<T, object, R> FlatMapping<T, R, Arg0obj
         /// <typeparam name="Arg1objectSuperU"><typeparamref name="U"/></typeparam>
         /// <typeparam name="A"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, R> Mapping<T, R, Arg0objectSuperT, Arg0ExtendsU, U, Arg1objectSuperU, A>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0, Java.Util.Stream.Collector<Arg1objectSuperU, A, R> arg1) where Arg0objectSuperT: T where Arg0ExtendsU: U where Arg1objectSuperU: U
+        public static Java.Util.Stream.Collector<T, object, R> Mapping<T, R, Arg0objectSuperT, Arg0ExtendsU, U, Arg1objectSuperU, A>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsU> arg0, Java.Util.Stream.Collector<Arg1objectSuperU, A, R> arg1) where Arg0objectSuperT : T where Arg0ExtendsU : U where Arg1objectSuperU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, R>>(LocalBridgeClazz, "mapping", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#reducing(java.lang.Object,java.util.function.Function,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#reducing(java.lang.Object,java.util.function.Function,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="U"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Function"/></param>
@@ -404,67 +385,67 @@ public static Java.Util.Stream.Collector<T, object, R> Mapping<T, R, Arg0objectS
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, U> Reducing<T, U, Arg1objectSuperT, Arg1ExtendsU>(U arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg1objectSuperT: T where Arg1ExtendsU: U
+        public static Java.Util.Stream.Collector<T, object, U> Reducing<T, U, Arg1objectSuperT, Arg1ExtendsU>(U arg0, Java.Util.Function.Function<Arg1objectSuperT, Arg1ExtendsU> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg1objectSuperT : T where Arg1ExtendsU : U
         {
             return SExecute<Java.Util.Stream.Collector<T, object, U>>(LocalBridgeClazz, "reducing", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#averagingDouble(java.util.function.ToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#averagingDouble(java.util.function.ToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Lang.Double> AveragingDouble<T, Arg0objectSuperT>(Java.Util.Function.ToDoubleFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Lang.Double> AveragingDouble<T, Arg0objectSuperT>(Java.Util.Function.ToDoubleFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Lang.Double>>(LocalBridgeClazz, "averagingDouble", "(Ljava/util/function/ToDoubleFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#averagingInt(java.util.function.ToIntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#averagingInt(java.util.function.ToIntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToIntFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Lang.Double> AveragingInt<T, Arg0objectSuperT>(Java.Util.Function.ToIntFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Lang.Double> AveragingInt<T, Arg0objectSuperT>(Java.Util.Function.ToIntFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Lang.Double>>(LocalBridgeClazz, "averagingInt", "(Ljava/util/function/ToIntFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#averagingLong(java.util.function.ToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#averagingLong(java.util.function.ToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToLongFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Lang.Double> AveragingLong<T, Arg0objectSuperT>(Java.Util.Function.ToLongFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Lang.Double> AveragingLong<T, Arg0objectSuperT>(Java.Util.Function.ToLongFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Lang.Double>>(LocalBridgeClazz, "averagingLong", "(Ljava/util/function/ToLongFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#summingDouble(java.util.function.ToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#summingDouble(java.util.function.ToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Lang.Double> SummingDouble<T, Arg0objectSuperT>(Java.Util.Function.ToDoubleFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Lang.Double> SummingDouble<T, Arg0objectSuperT>(Java.Util.Function.ToDoubleFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Lang.Double>>(LocalBridgeClazz, "summingDouble", "(Ljava/util/function/ToDoubleFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#summingInt(java.util.function.ToIntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#summingInt(java.util.function.ToIntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToIntFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Lang.Integer> SummingInt<T, Arg0objectSuperT>(Java.Util.Function.ToIntFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Lang.Integer> SummingInt<T, Arg0objectSuperT>(Java.Util.Function.ToIntFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Lang.Integer>>(LocalBridgeClazz, "summingInt", "(Ljava/util/function/ToIntFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#counting()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#counting()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
@@ -473,40 +454,40 @@ public static Java.Util.Stream.Collector<T, object, U> Reducing<T, U, Arg1object
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Lang.Long>>(LocalBridgeClazz, "counting", "()Ljava/util/stream/Collector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#summingLong(java.util.function.ToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#summingLong(java.util.function.ToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToLongFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Lang.Long> SummingLong<T, Arg0objectSuperT>(Java.Util.Function.ToLongFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Lang.Long> SummingLong<T, Arg0objectSuperT>(Java.Util.Function.ToLongFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Lang.Long>>(LocalBridgeClazz, "summingLong", "(Ljava/util/function/ToLongFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#summarizingDouble(java.util.function.ToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#summarizingDouble(java.util.function.ToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.DoubleSummaryStatistics> SummarizingDouble<T, Arg0objectSuperT>(Java.Util.Function.ToDoubleFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Util.DoubleSummaryStatistics> SummarizingDouble<T, Arg0objectSuperT>(Java.Util.Function.ToDoubleFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.DoubleSummaryStatistics>>(LocalBridgeClazz, "summarizingDouble", "(Ljava/util/function/ToDoubleFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#summarizingInt(java.util.function.ToIntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#summarizingInt(java.util.function.ToIntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToIntFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.IntSummaryStatistics> SummarizingInt<T, Arg0objectSuperT>(Java.Util.Function.ToIntFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Util.IntSummaryStatistics> SummarizingInt<T, Arg0objectSuperT>(Java.Util.Function.ToIntFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.IntSummaryStatistics>>(LocalBridgeClazz, "summarizingInt", "(Ljava/util/function/ToIntFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toList()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toList()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
@@ -515,7 +496,7 @@ public static Java.Util.Stream.Collector<T, object, U> Reducing<T, U, Arg1object
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.List<T>>>(LocalBridgeClazz, "toList", "()Ljava/util/stream/Collector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toUnmodifiableList()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toUnmodifiableList()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
@@ -524,29 +505,29 @@ public static Java.Util.Stream.Collector<T, object, U> Reducing<T, U, Arg1object
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.List<T>>>(LocalBridgeClazz, "toUnmodifiableList", "()Ljava/util/stream/Collector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#summarizingLong(java.util.function.ToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#summarizingLong(java.util.function.ToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToLongFunction"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.LongSummaryStatistics> SummarizingLong<T, Arg0objectSuperT>(Java.Util.Function.ToLongFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Util.LongSummaryStatistics> SummarizingLong<T, Arg0objectSuperT>(Java.Util.Function.ToLongFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.LongSummaryStatistics>>(LocalBridgeClazz, "summarizingLong", "(Ljava/util/function/ToLongFunction;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#partitioningBy(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#partitioningBy(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
-        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<Java.Lang.Boolean, Java.Util.List<T>>> PartitioningBy<T, Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public static Java.Util.Stream.Collector<T, object, Java.Util.Map<Java.Lang.Boolean, Java.Util.List<T>>> PartitioningBy<T, Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.Map<Java.Lang.Boolean, Java.Util.List<T>>>>(LocalBridgeClazz, "partitioningBy", "(Ljava/util/function/Predicate;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#reducing(java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#reducing(java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BinaryOperator"/></param>
         /// <typeparam name="T"></typeparam>
@@ -556,7 +537,7 @@ public static Java.Util.Stream.Collector<T, object, U> Reducing<T, U, Arg1object
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.Optional<T>>>(LocalBridgeClazz, "reducing", "(Ljava/util/function/BinaryOperator;)Ljava/util/stream/Collector;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toSet()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
@@ -565,7 +546,7 @@ public static Java.Util.Stream.Collector<T, object, U> Reducing<T, U, Arg1object
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.Set<T>>>(LocalBridgeClazz, "toSet", "()Ljava/util/stream/Collector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#toUnmodifiableSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#toUnmodifiableSet()"/>
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
@@ -574,7 +555,7 @@ public static Java.Util.Stream.Collector<T, object, U> Reducing<T, U, Arg1object
             return SExecuteWithSignature<Java.Util.Stream.Collector<T, object, Java.Util.Set<T>>>(LocalBridgeClazz, "toUnmodifiableSet", "()Ljava/util/stream/Collector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#reducing(java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#reducing(java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BinaryOperator"/></param>
@@ -585,7 +566,7 @@ public static Java.Util.Stream.Collector<T, object, T> Reducing<T>(T arg0, Java.
             return SExecute<Java.Util.Stream.Collector<T, object, T>>(LocalBridgeClazz, "reducing", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#joining()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#joining()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
         public static Java.Util.Stream.Collector<Java.Lang.CharSequence, object, Java.Lang.String> Joining()
@@ -593,7 +574,7 @@ public static Java.Util.Stream.Collector<T, object, T> Reducing<T>(T arg0, Java.
             return SExecuteWithSignature<Java.Util.Stream.Collector<Java.Lang.CharSequence, object, Java.Lang.String>>(LocalBridgeClazz, "joining", "()Ljava/util/stream/Collector;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#joining(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#joining(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
@@ -604,7 +585,7 @@ public static Java.Util.Stream.Collector<T, object, T> Reducing<T>(T arg0, Java.
             return SExecute<Java.Util.Stream.Collector<Java.Lang.CharSequence, object, Java.Lang.String>>(LocalBridgeClazz, "joining", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Collectors.html#joining(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Collectors.html#joining(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Util.Stream.Collector"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/DoubleStream.cs b/src/net/Netdroid/Generated/Java/Util/Stream/DoubleStream.cs
index dfa7ea240..2a2ac094f 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/DoubleStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/DoubleStream.cs
@@ -60,7 +60,7 @@ public partial class DoubleStream : Java.Util.Stream.IDoubleStream
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#concat(java.util.stream.DoubleStream,java.util.stream.DoubleStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#concat(java.util.stream.DoubleStream,java.util.stream.DoubleStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Stream.DoubleStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.DoubleStream"/></param>
@@ -70,7 +70,7 @@ public static Java.Util.Stream.DoubleStream Concat(Java.Util.Stream.DoubleStream
             return SExecute<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "concat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
         public static Java.Util.Stream.DoubleStream Empty()
@@ -78,7 +78,7 @@ public static Java.Util.Stream.DoubleStream Empty()
             return SExecuteWithSignature<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "empty", "()Ljava/util/stream/DoubleStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#generate(java.util.function.DoubleSupplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#generate(java.util.function.DoubleSupplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleSupplier"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -87,7 +87,7 @@ public static Java.Util.Stream.DoubleStream Generate(Java.Util.Function.DoubleSu
             return SExecuteWithSignature<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "generate", "(Ljava/util/function/DoubleSupplier;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#iterate(double,java.util.function.DoublePredicate,java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#iterate(double,java.util.function.DoublePredicate,java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.DoublePredicate"/></param>
@@ -98,7 +98,7 @@ public static Java.Util.Stream.DoubleStream Iterate(double arg0, Java.Util.Funct
             return SExecute<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "iterate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#iterate(double,java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#iterate(double,java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
@@ -108,7 +108,7 @@ public static Java.Util.Stream.DoubleStream Iterate(double arg0, Java.Util.Funct
             return SExecute<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "iterate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#of(double[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#of(double[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -117,7 +117,7 @@ public static Java.Util.Stream.DoubleStream Of(params double[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "of", "([D)Ljava/util/stream/DoubleStream;"); else return SExecuteWithSignature<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "of", "([D)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#of(double)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#of(double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -130,7 +130,7 @@ public static Java.Util.Stream.DoubleStream Of(double arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#collect(java.util.function.Supplier,java.util.function.ObjDoubleConsumer,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#collect(java.util.function.Supplier,java.util.function.ObjDoubleConsumer,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ObjDoubleConsumer"/></param>
@@ -142,18 +142,18 @@ public R Collect<R>(Java.Util.Function.Supplier<R> arg0, Java.Util.Function.ObjD
             return IExecute<R>("collect", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#mapToObj(java.util.function.DoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#mapToObj(java.util.function.DoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleFunction"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<U> MapToObj<U, Arg0ExtendsU>(Java.Util.Function.DoubleFunction<Arg0ExtendsU> arg0) where Arg0ExtendsU: U
+        public Java.Util.Stream.Stream<U> MapToObj<U, Arg0ExtendsU>(Java.Util.Function.DoubleFunction<Arg0ExtendsU> arg0) where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<U>>("mapToObj", "(Ljava/util/function/DoubleFunction;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#allMatch(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#allMatch(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -162,7 +162,7 @@ public bool AllMatch(Java.Util.Function.DoublePredicate arg0)
             return IExecuteWithSignature<bool>("allMatch", "(Ljava/util/function/DoublePredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#anyMatch(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#anyMatch(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -171,7 +171,7 @@ public bool AnyMatch(Java.Util.Function.DoublePredicate arg0)
             return IExecuteWithSignature<bool>("anyMatch", "(Ljava/util/function/DoublePredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#noneMatch(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#noneMatch(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -180,7 +180,7 @@ public bool NoneMatch(Java.Util.Function.DoublePredicate arg0)
             return IExecuteWithSignature<bool>("noneMatch", "(Ljava/util/function/DoublePredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#reduce(double,java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#reduce(double,java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="double"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.DoubleBinaryOperator"/></param>
@@ -190,7 +190,7 @@ public double Reduce(double arg0, Java.Util.Function.DoubleBinaryOperator arg1)
             return IExecute<double>("reduce", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#sum()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#sum()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double Sum()
@@ -198,7 +198,7 @@ public double Sum()
             return IExecuteWithSignature<double>("sum", "()D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="double"/></returns>
         public double[] ToArray()
@@ -206,7 +206,7 @@ public double[] ToArray()
             return IExecuteWithSignatureArray<double>("toArray", "()[D");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#summaryStatistics()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#summaryStatistics()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.DoubleSummaryStatistics"/></returns>
         public Java.Util.DoubleSummaryStatistics SummaryStatistics()
@@ -214,7 +214,7 @@ public Java.Util.DoubleSummaryStatistics SummaryStatistics()
             return IExecuteWithSignature<Java.Util.DoubleSummaryStatistics>("summaryStatistics", "()Ljava/util/DoubleSummaryStatistics;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#average()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#average()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
         public Java.Util.OptionalDouble Average()
@@ -222,7 +222,7 @@ public Java.Util.OptionalDouble Average()
             return IExecuteWithSignature<Java.Util.OptionalDouble>("average", "()Ljava/util/OptionalDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#findAny()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#findAny()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
         public Java.Util.OptionalDouble FindAny()
@@ -230,7 +230,7 @@ public Java.Util.OptionalDouble FindAny()
             return IExecuteWithSignature<Java.Util.OptionalDouble>("findAny", "()Ljava/util/OptionalDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#findFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#findFirst()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
         public Java.Util.OptionalDouble FindFirst()
@@ -238,7 +238,7 @@ public Java.Util.OptionalDouble FindFirst()
             return IExecuteWithSignature<Java.Util.OptionalDouble>("findFirst", "()Ljava/util/OptionalDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#max()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#max()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
         public Java.Util.OptionalDouble Max()
@@ -246,7 +246,7 @@ public Java.Util.OptionalDouble Max()
             return IExecuteWithSignature<Java.Util.OptionalDouble>("max", "()Ljava/util/OptionalDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#min()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#min()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
         public Java.Util.OptionalDouble Min()
@@ -254,7 +254,7 @@ public Java.Util.OptionalDouble Min()
             return IExecuteWithSignature<Java.Util.OptionalDouble>("min", "()Ljava/util/OptionalDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#reduce(java.util.function.DoubleBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#reduce(java.util.function.DoubleBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleBinaryOperator"/></param>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
@@ -263,7 +263,7 @@ public Java.Util.OptionalDouble Reduce(Java.Util.Function.DoubleBinaryOperator a
             return IExecuteWithSignature<Java.Util.OptionalDouble>("reduce", "(Ljava/util/function/DoubleBinaryOperator;)Ljava/util/OptionalDouble;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#distinct()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#distinct()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
         public Java.Util.Stream.DoubleStream Distinct()
@@ -271,7 +271,7 @@ public Java.Util.Stream.DoubleStream Distinct()
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("distinct", "()Ljava/util/stream/DoubleStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#filter(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#filter(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -280,17 +280,17 @@ public Java.Util.Stream.DoubleStream Filter(Java.Util.Function.DoublePredicate a
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("filter", "(Ljava/util/function/DoublePredicate;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#flatMap(java.util.function.DoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#flatMap(java.util.function.DoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleFunction"/></param>
         /// <typeparam name="Arg0ExtendsJava_Util_Stream_DoubleStream"><see cref="Java.Util.Stream.DoubleStream"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
-        public Java.Util.Stream.DoubleStream FlatMap<Arg0ExtendsJava_Util_Stream_DoubleStream>(Java.Util.Function.DoubleFunction<Arg0ExtendsJava_Util_Stream_DoubleStream> arg0) where Arg0ExtendsJava_Util_Stream_DoubleStream: Java.Util.Stream.DoubleStream
+        public Java.Util.Stream.DoubleStream FlatMap<Arg0ExtendsJava_Util_Stream_DoubleStream>(Java.Util.Function.DoubleFunction<Arg0ExtendsJava_Util_Stream_DoubleStream> arg0) where Arg0ExtendsJava_Util_Stream_DoubleStream : Java.Util.Stream.DoubleStream
         {
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("flatMap", "(Ljava/util/function/DoubleFunction;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#limit(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#limit(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -299,7 +299,7 @@ public Java.Util.Stream.DoubleStream Limit(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("limit", "(J)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#map(java.util.function.DoubleUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#map(java.util.function.DoubleUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -308,7 +308,7 @@ public Java.Util.Stream.DoubleStream Map(Java.Util.Function.DoubleUnaryOperator
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("map", "(Ljava/util/function/DoubleUnaryOperator;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#peek(java.util.function.DoubleConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#peek(java.util.function.DoubleConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -317,7 +317,7 @@ public Java.Util.Stream.DoubleStream Peek(Java.Util.Function.DoubleConsumer arg0
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("peek", "(Ljava/util/function/DoubleConsumer;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#skip(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#skip(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -326,7 +326,7 @@ public Java.Util.Stream.DoubleStream Skip(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("skip", "(J)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#sorted()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#sorted()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
         public Java.Util.Stream.DoubleStream Sorted()
@@ -334,7 +334,7 @@ public Java.Util.Stream.DoubleStream Sorted()
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("sorted", "()Ljava/util/stream/DoubleStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#mapToInt(java.util.function.DoubleToIntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#mapToInt(java.util.function.DoubleToIntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleToIntFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -343,7 +343,7 @@ public Java.Util.Stream.IntStream MapToInt(Java.Util.Function.DoubleToIntFunctio
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("mapToInt", "(Ljava/util/function/DoubleToIntFunction;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#mapToLong(java.util.function.DoubleToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#mapToLong(java.util.function.DoubleToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleToLongFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -352,7 +352,7 @@ public Java.Util.Stream.LongStream MapToLong(Java.Util.Function.DoubleToLongFunc
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("mapToLong", "(Ljava/util/function/DoubleToLongFunction;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#boxed()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#boxed()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Lang.Double> Boxed()
@@ -360,7 +360,7 @@ public Java.Util.Stream.LongStream MapToLong(Java.Util.Function.DoubleToLongFunc
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Lang.Double>>("boxed", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#count()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#count()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Count()
@@ -368,7 +368,7 @@ public long Count()
             return IExecuteWithSignature<long>("count", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#forEach(java.util.function.DoubleConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#forEach(java.util.function.DoubleConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
         public void ForEach(Java.Util.Function.DoubleConsumer arg0)
@@ -376,7 +376,7 @@ public void ForEach(Java.Util.Function.DoubleConsumer arg0)
             IExecuteWithSignature("forEach", "(Ljava/util/function/DoubleConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#forEachOrdered(java.util.function.DoubleConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#forEachOrdered(java.util.function.DoubleConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoubleConsumer"/></param>
         public void ForEachOrdered(Java.Util.Function.DoubleConsumer arg0)
@@ -384,7 +384,7 @@ public void ForEachOrdered(Java.Util.Function.DoubleConsumer arg0)
             IExecuteWithSignature("forEachOrdered", "(Ljava/util/function/DoubleConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -392,7 +392,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -400,7 +400,7 @@ public Java.Util.Spliterator Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#parallel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#parallel()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Parallel()
@@ -408,7 +408,7 @@ public Java.Util.Stream.BaseStream Parallel()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("parallel", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#sequential()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#sequential()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Sequential()
@@ -416,7 +416,7 @@ public Java.Util.Stream.BaseStream Sequential()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("sequential", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#dropWhile(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#dropWhile(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -425,16 +425,7 @@ public Java.Util.Stream.DoubleStream DropWhile(Java.Util.Function.DoublePredicat
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("dropWhile", "(Ljava/util/function/DoublePredicate;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#mapMulti(java.util.stream.DoubleStream.DoubleMapMultiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Stream.DoubleStream.DoubleMapMultiConsumer"/></param>
-        /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
-        public Java.Util.Stream.DoubleStream MapMulti(Java.Util.Stream.DoubleStream.DoubleMapMultiConsumer arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("mapMulti", "(Ljava/util/stream/DoubleStream$DoubleMapMultiConsumer;)Ljava/util/stream/DoubleStream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/DoubleStream.html#takeWhile(java.util.function.DoublePredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/DoubleStream.html#takeWhile(java.util.function.DoublePredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.DoublePredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/IntStream.cs b/src/net/Netdroid/Generated/Java/Util/Stream/IntStream.cs
index 7c78eaaa0..a4e54d13d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/IntStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/IntStream.cs
@@ -60,7 +60,7 @@ public partial class IntStream : Java.Util.Stream.IIntStream
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#concat(java.util.stream.IntStream,java.util.stream.IntStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#concat(java.util.stream.IntStream,java.util.stream.IntStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Stream.IntStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.IntStream"/></param>
@@ -70,7 +70,7 @@ public static Java.Util.Stream.IntStream Concat(Java.Util.Stream.IntStream arg0,
             return SExecute<Java.Util.Stream.IntStream>(LocalBridgeClazz, "concat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public static Java.Util.Stream.IntStream Empty()
@@ -78,7 +78,7 @@ public static Java.Util.Stream.IntStream Empty()
             return SExecuteWithSignature<Java.Util.Stream.IntStream>(LocalBridgeClazz, "empty", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#generate(java.util.function.IntSupplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#generate(java.util.function.IntSupplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntSupplier"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -87,7 +87,7 @@ public static Java.Util.Stream.IntStream Generate(Java.Util.Function.IntSupplier
             return SExecuteWithSignature<Java.Util.Stream.IntStream>(LocalBridgeClazz, "generate", "(Ljava/util/function/IntSupplier;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#iterate(int,java.util.function.IntPredicate,java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#iterate(int,java.util.function.IntPredicate,java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntPredicate"/></param>
@@ -98,7 +98,7 @@ public static Java.Util.Stream.IntStream Iterate(int arg0, Java.Util.Function.In
             return SExecute<Java.Util.Stream.IntStream>(LocalBridgeClazz, "iterate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#iterate(int,java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#iterate(int,java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
@@ -108,7 +108,7 @@ public static Java.Util.Stream.IntStream Iterate(int arg0, Java.Util.Function.In
             return SExecute<Java.Util.Stream.IntStream>(LocalBridgeClazz, "iterate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#of(int[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#of(int[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -117,7 +117,7 @@ public static Java.Util.Stream.IntStream Of(params int[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Stream.IntStream>(LocalBridgeClazz, "of", "([I)Ljava/util/stream/IntStream;"); else return SExecuteWithSignature<Java.Util.Stream.IntStream>(LocalBridgeClazz, "of", "([I)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#of(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#of(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -126,7 +126,7 @@ public static Java.Util.Stream.IntStream Of(int arg0)
             return SExecuteWithSignature<Java.Util.Stream.IntStream>(LocalBridgeClazz, "of", "(I)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#range(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#range(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -136,7 +136,7 @@ public static Java.Util.Stream.IntStream Range(int arg0, int arg1)
             return SExecute<Java.Util.Stream.IntStream>(LocalBridgeClazz, "range", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#rangeClosed(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#rangeClosed(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -150,7 +150,7 @@ public static Java.Util.Stream.IntStream RangeClosed(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#collect(java.util.function.Supplier,java.util.function.ObjIntConsumer,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#collect(java.util.function.Supplier,java.util.function.ObjIntConsumer,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ObjIntConsumer"/></param>
@@ -162,18 +162,18 @@ public R Collect<R>(Java.Util.Function.Supplier<R> arg0, Java.Util.Function.ObjI
             return IExecute<R>("collect", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#mapToObj(java.util.function.IntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#mapToObj(java.util.function.IntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntFunction"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<U> MapToObj<U, Arg0ExtendsU>(Java.Util.Function.IntFunction<Arg0ExtendsU> arg0) where Arg0ExtendsU: U
+        public Java.Util.Stream.Stream<U> MapToObj<U, Arg0ExtendsU>(Java.Util.Function.IntFunction<Arg0ExtendsU> arg0) where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<U>>("mapToObj", "(Ljava/util/function/IntFunction;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#allMatch(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#allMatch(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -182,7 +182,7 @@ public bool AllMatch(Java.Util.Function.IntPredicate arg0)
             return IExecuteWithSignature<bool>("allMatch", "(Ljava/util/function/IntPredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#anyMatch(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#anyMatch(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -191,7 +191,7 @@ public bool AnyMatch(Java.Util.Function.IntPredicate arg0)
             return IExecuteWithSignature<bool>("anyMatch", "(Ljava/util/function/IntPredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#noneMatch(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#noneMatch(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -200,7 +200,7 @@ public bool NoneMatch(Java.Util.Function.IntPredicate arg0)
             return IExecuteWithSignature<bool>("noneMatch", "(Ljava/util/function/IntPredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#reduce(int,java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#reduce(int,java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.IntBinaryOperator"/></param>
@@ -210,7 +210,7 @@ public int Reduce(int arg0, Java.Util.Function.IntBinaryOperator arg1)
             return IExecute<int>("reduce", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#sum()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#sum()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Sum()
@@ -218,7 +218,7 @@ public int Sum()
             return IExecuteWithSignature<int>("sum", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int[] ToArray()
@@ -226,7 +226,7 @@ public int[] ToArray()
             return IExecuteWithSignatureArray<int>("toArray", "()[I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#summaryStatistics()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#summaryStatistics()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.IntSummaryStatistics"/></returns>
         public Java.Util.IntSummaryStatistics SummaryStatistics()
@@ -234,7 +234,7 @@ public Java.Util.IntSummaryStatistics SummaryStatistics()
             return IExecuteWithSignature<Java.Util.IntSummaryStatistics>("summaryStatistics", "()Ljava/util/IntSummaryStatistics;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#average()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#average()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
         public Java.Util.OptionalDouble Average()
@@ -242,7 +242,7 @@ public Java.Util.OptionalDouble Average()
             return IExecuteWithSignature<Java.Util.OptionalDouble>("average", "()Ljava/util/OptionalDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#findAny()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#findAny()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalInt"/></returns>
         public Java.Util.OptionalInt FindAny()
@@ -250,7 +250,7 @@ public Java.Util.OptionalInt FindAny()
             return IExecuteWithSignature<Java.Util.OptionalInt>("findAny", "()Ljava/util/OptionalInt;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#findFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#findFirst()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalInt"/></returns>
         public Java.Util.OptionalInt FindFirst()
@@ -258,7 +258,7 @@ public Java.Util.OptionalInt FindFirst()
             return IExecuteWithSignature<Java.Util.OptionalInt>("findFirst", "()Ljava/util/OptionalInt;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#max()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#max()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalInt"/></returns>
         public Java.Util.OptionalInt Max()
@@ -266,7 +266,7 @@ public Java.Util.OptionalInt Max()
             return IExecuteWithSignature<Java.Util.OptionalInt>("max", "()Ljava/util/OptionalInt;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#min()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#min()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalInt"/></returns>
         public Java.Util.OptionalInt Min()
@@ -274,7 +274,7 @@ public Java.Util.OptionalInt Min()
             return IExecuteWithSignature<Java.Util.OptionalInt>("min", "()Ljava/util/OptionalInt;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#reduce(java.util.function.IntBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#reduce(java.util.function.IntBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntBinaryOperator"/></param>
         /// <returns><see cref="Java.Util.OptionalInt"/></returns>
@@ -283,7 +283,7 @@ public Java.Util.OptionalInt Reduce(Java.Util.Function.IntBinaryOperator arg0)
             return IExecuteWithSignature<Java.Util.OptionalInt>("reduce", "(Ljava/util/function/IntBinaryOperator;)Ljava/util/OptionalInt;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#asDoubleStream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#asDoubleStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
         public Java.Util.Stream.DoubleStream AsDoubleStream()
@@ -291,7 +291,7 @@ public Java.Util.Stream.DoubleStream AsDoubleStream()
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("asDoubleStream", "()Ljava/util/stream/DoubleStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#mapToDouble(java.util.function.IntToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#mapToDouble(java.util.function.IntToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntToDoubleFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -300,7 +300,7 @@ public Java.Util.Stream.DoubleStream MapToDouble(Java.Util.Function.IntToDoubleF
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("mapToDouble", "(Ljava/util/function/IntToDoubleFunction;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#distinct()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#distinct()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Distinct()
@@ -308,7 +308,7 @@ public Java.Util.Stream.IntStream Distinct()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("distinct", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#filter(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#filter(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -317,17 +317,17 @@ public Java.Util.Stream.IntStream Filter(Java.Util.Function.IntPredicate arg0)
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("filter", "(Ljava/util/function/IntPredicate;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#flatMap(java.util.function.IntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#flatMap(java.util.function.IntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntFunction"/></param>
         /// <typeparam name="Arg0ExtendsJava_Util_Stream_IntStream"><see cref="Java.Util.Stream.IntStream"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
-        public Java.Util.Stream.IntStream FlatMap<Arg0ExtendsJava_Util_Stream_IntStream>(Java.Util.Function.IntFunction<Arg0ExtendsJava_Util_Stream_IntStream> arg0) where Arg0ExtendsJava_Util_Stream_IntStream: Java.Util.Stream.IntStream
+        public Java.Util.Stream.IntStream FlatMap<Arg0ExtendsJava_Util_Stream_IntStream>(Java.Util.Function.IntFunction<Arg0ExtendsJava_Util_Stream_IntStream> arg0) where Arg0ExtendsJava_Util_Stream_IntStream : Java.Util.Stream.IntStream
         {
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("flatMap", "(Ljava/util/function/IntFunction;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#limit(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#limit(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -336,7 +336,7 @@ public Java.Util.Stream.IntStream Limit(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("limit", "(J)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#map(java.util.function.IntUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#map(java.util.function.IntUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -345,7 +345,7 @@ public Java.Util.Stream.IntStream Map(Java.Util.Function.IntUnaryOperator arg0)
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("map", "(Ljava/util/function/IntUnaryOperator;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#peek(java.util.function.IntConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#peek(java.util.function.IntConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -354,7 +354,7 @@ public Java.Util.Stream.IntStream Peek(Java.Util.Function.IntConsumer arg0)
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("peek", "(Ljava/util/function/IntConsumer;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#skip(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#skip(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -363,7 +363,7 @@ public Java.Util.Stream.IntStream Skip(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("skip", "(J)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#sorted()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#sorted()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
         public Java.Util.Stream.IntStream Sorted()
@@ -371,7 +371,7 @@ public Java.Util.Stream.IntStream Sorted()
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("sorted", "()Ljava/util/stream/IntStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#asLongStream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#asLongStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
         public Java.Util.Stream.LongStream AsLongStream()
@@ -379,7 +379,7 @@ public Java.Util.Stream.LongStream AsLongStream()
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("asLongStream", "()Ljava/util/stream/LongStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#mapToLong(java.util.function.IntToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#mapToLong(java.util.function.IntToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntToLongFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -388,7 +388,7 @@ public Java.Util.Stream.LongStream MapToLong(Java.Util.Function.IntToLongFunctio
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("mapToLong", "(Ljava/util/function/IntToLongFunction;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#boxed()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#boxed()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Lang.Integer> Boxed()
@@ -396,7 +396,7 @@ public Java.Util.Stream.LongStream MapToLong(Java.Util.Function.IntToLongFunctio
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Lang.Integer>>("boxed", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#count()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#count()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Count()
@@ -404,7 +404,7 @@ public long Count()
             return IExecuteWithSignature<long>("count", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#forEach(java.util.function.IntConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#forEach(java.util.function.IntConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
         public void ForEach(Java.Util.Function.IntConsumer arg0)
@@ -412,7 +412,7 @@ public void ForEach(Java.Util.Function.IntConsumer arg0)
             IExecuteWithSignature("forEach", "(Ljava/util/function/IntConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#forEachOrdered(java.util.function.IntConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#forEachOrdered(java.util.function.IntConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntConsumer"/></param>
         public void ForEachOrdered(Java.Util.Function.IntConsumer arg0)
@@ -420,7 +420,7 @@ public void ForEachOrdered(Java.Util.Function.IntConsumer arg0)
             IExecuteWithSignature("forEachOrdered", "(Ljava/util/function/IntConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -428,7 +428,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -436,7 +436,7 @@ public Java.Util.Spliterator Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#parallel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#parallel()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Parallel()
@@ -444,7 +444,7 @@ public Java.Util.Stream.BaseStream Parallel()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("parallel", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#sequential()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#sequential()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Sequential()
@@ -452,7 +452,7 @@ public Java.Util.Stream.BaseStream Sequential()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("sequential", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#dropWhile(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#dropWhile(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -461,16 +461,7 @@ public Java.Util.Stream.IntStream DropWhile(Java.Util.Function.IntPredicate arg0
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("dropWhile", "(Ljava/util/function/IntPredicate;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#mapMulti(java.util.stream.IntStream.IntMapMultiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Stream.IntStream.IntMapMultiConsumer"/></param>
-        /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
-        public Java.Util.Stream.IntStream MapMulti(Java.Util.Stream.IntStream.IntMapMultiConsumer arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Stream.IntStream>("mapMulti", "(Ljava/util/stream/IntStream$IntMapMultiConsumer;)Ljava/util/stream/IntStream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/IntStream.html#takeWhile(java.util.function.IntPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/IntStream.html#takeWhile(java.util.function.IntPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntPredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/LongStream.cs b/src/net/Netdroid/Generated/Java/Util/Stream/LongStream.cs
index 6673376db..31571fa57 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/LongStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/LongStream.cs
@@ -60,7 +60,7 @@ public partial class LongStream : Java.Util.Stream.ILongStream
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#concat(java.util.stream.LongStream,java.util.stream.LongStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#concat(java.util.stream.LongStream,java.util.stream.LongStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Stream.LongStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.LongStream"/></param>
@@ -70,7 +70,7 @@ public static Java.Util.Stream.LongStream Concat(Java.Util.Stream.LongStream arg
             return SExecute<Java.Util.Stream.LongStream>(LocalBridgeClazz, "concat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
         public static Java.Util.Stream.LongStream Empty()
@@ -78,7 +78,7 @@ public static Java.Util.Stream.LongStream Empty()
             return SExecuteWithSignature<Java.Util.Stream.LongStream>(LocalBridgeClazz, "empty", "()Ljava/util/stream/LongStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#generate(java.util.function.LongSupplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#generate(java.util.function.LongSupplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongSupplier"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -87,7 +87,7 @@ public static Java.Util.Stream.LongStream Generate(Java.Util.Function.LongSuppli
             return SExecuteWithSignature<Java.Util.Stream.LongStream>(LocalBridgeClazz, "generate", "(Ljava/util/function/LongSupplier;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#iterate(long,java.util.function.LongPredicate,java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#iterate(long,java.util.function.LongPredicate,java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongPredicate"/></param>
@@ -98,7 +98,7 @@ public static Java.Util.Stream.LongStream Iterate(long arg0, Java.Util.Function.
             return SExecute<Java.Util.Stream.LongStream>(LocalBridgeClazz, "iterate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#iterate(long,java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#iterate(long,java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
@@ -108,7 +108,7 @@ public static Java.Util.Stream.LongStream Iterate(long arg0, Java.Util.Function.
             return SExecute<Java.Util.Stream.LongStream>(LocalBridgeClazz, "iterate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#of(long[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#of(long[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -117,7 +117,7 @@ public static Java.Util.Stream.LongStream Of(params long[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Stream.LongStream>(LocalBridgeClazz, "of", "([J)Ljava/util/stream/LongStream;"); else return SExecuteWithSignature<Java.Util.Stream.LongStream>(LocalBridgeClazz, "of", "([J)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#of(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#of(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -126,7 +126,7 @@ public static Java.Util.Stream.LongStream Of(long arg0)
             return SExecuteWithSignature<Java.Util.Stream.LongStream>(LocalBridgeClazz, "of", "(J)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#range(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#range(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -136,7 +136,7 @@ public static Java.Util.Stream.LongStream Range(long arg0, long arg1)
             return SExecute<Java.Util.Stream.LongStream>(LocalBridgeClazz, "range", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#rangeClosed(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#rangeClosed(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -150,7 +150,7 @@ public static Java.Util.Stream.LongStream RangeClosed(long arg0, long arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#collect(java.util.function.Supplier,java.util.function.ObjLongConsumer,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#collect(java.util.function.Supplier,java.util.function.ObjLongConsumer,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.ObjLongConsumer"/></param>
@@ -162,18 +162,18 @@ public R Collect<R>(Java.Util.Function.Supplier<R> arg0, Java.Util.Function.ObjL
             return IExecute<R>("collect", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#mapToObj(java.util.function.LongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#mapToObj(java.util.function.LongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongFunction"/></param>
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg0ExtendsU"><typeparamref name="U"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<U> MapToObj<U, Arg0ExtendsU>(Java.Util.Function.LongFunction<Arg0ExtendsU> arg0) where Arg0ExtendsU: U
+        public Java.Util.Stream.Stream<U> MapToObj<U, Arg0ExtendsU>(Java.Util.Function.LongFunction<Arg0ExtendsU> arg0) where Arg0ExtendsU : U
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<U>>("mapToObj", "(Ljava/util/function/LongFunction;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#allMatch(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#allMatch(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -182,7 +182,7 @@ public bool AllMatch(Java.Util.Function.LongPredicate arg0)
             return IExecuteWithSignature<bool>("allMatch", "(Ljava/util/function/LongPredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#anyMatch(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#anyMatch(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -191,7 +191,7 @@ public bool AnyMatch(Java.Util.Function.LongPredicate arg0)
             return IExecuteWithSignature<bool>("anyMatch", "(Ljava/util/function/LongPredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#noneMatch(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#noneMatch(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -200,7 +200,7 @@ public bool NoneMatch(Java.Util.Function.LongPredicate arg0)
             return IExecuteWithSignature<bool>("noneMatch", "(Ljava/util/function/LongPredicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#summaryStatistics()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#summaryStatistics()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.LongSummaryStatistics"/></returns>
         public Java.Util.LongSummaryStatistics SummaryStatistics()
@@ -208,7 +208,7 @@ public Java.Util.LongSummaryStatistics SummaryStatistics()
             return IExecuteWithSignature<Java.Util.LongSummaryStatistics>("summaryStatistics", "()Ljava/util/LongSummaryStatistics;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#average()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#average()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalDouble"/></returns>
         public Java.Util.OptionalDouble Average()
@@ -216,7 +216,7 @@ public Java.Util.OptionalDouble Average()
             return IExecuteWithSignature<Java.Util.OptionalDouble>("average", "()Ljava/util/OptionalDouble;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#findAny()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#findAny()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalLong"/></returns>
         public Java.Util.OptionalLong FindAny()
@@ -224,7 +224,7 @@ public Java.Util.OptionalLong FindAny()
             return IExecuteWithSignature<Java.Util.OptionalLong>("findAny", "()Ljava/util/OptionalLong;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#findFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#findFirst()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalLong"/></returns>
         public Java.Util.OptionalLong FindFirst()
@@ -232,7 +232,7 @@ public Java.Util.OptionalLong FindFirst()
             return IExecuteWithSignature<Java.Util.OptionalLong>("findFirst", "()Ljava/util/OptionalLong;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#max()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#max()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalLong"/></returns>
         public Java.Util.OptionalLong Max()
@@ -240,7 +240,7 @@ public Java.Util.OptionalLong Max()
             return IExecuteWithSignature<Java.Util.OptionalLong>("max", "()Ljava/util/OptionalLong;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#min()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#min()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.OptionalLong"/></returns>
         public Java.Util.OptionalLong Min()
@@ -248,7 +248,7 @@ public Java.Util.OptionalLong Min()
             return IExecuteWithSignature<Java.Util.OptionalLong>("min", "()Ljava/util/OptionalLong;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#reduce(java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#reduce(java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongBinaryOperator"/></param>
         /// <returns><see cref="Java.Util.OptionalLong"/></returns>
@@ -257,7 +257,7 @@ public Java.Util.OptionalLong Reduce(Java.Util.Function.LongBinaryOperator arg0)
             return IExecuteWithSignature<Java.Util.OptionalLong>("reduce", "(Ljava/util/function/LongBinaryOperator;)Ljava/util/OptionalLong;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#asDoubleStream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#asDoubleStream()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
         public Java.Util.Stream.DoubleStream AsDoubleStream()
@@ -265,7 +265,7 @@ public Java.Util.Stream.DoubleStream AsDoubleStream()
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("asDoubleStream", "()Ljava/util/stream/DoubleStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#mapToDouble(java.util.function.LongToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#mapToDouble(java.util.function.LongToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongToDoubleFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -274,7 +274,7 @@ public Java.Util.Stream.DoubleStream MapToDouble(Java.Util.Function.LongToDouble
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("mapToDouble", "(Ljava/util/function/LongToDoubleFunction;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#mapToInt(java.util.function.LongToIntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#mapToInt(java.util.function.LongToIntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongToIntFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -283,7 +283,7 @@ public Java.Util.Stream.IntStream MapToInt(Java.Util.Function.LongToIntFunction
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("mapToInt", "(Ljava/util/function/LongToIntFunction;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#distinct()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#distinct()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
         public Java.Util.Stream.LongStream Distinct()
@@ -291,7 +291,7 @@ public Java.Util.Stream.LongStream Distinct()
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("distinct", "()Ljava/util/stream/LongStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#filter(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#filter(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -300,17 +300,17 @@ public Java.Util.Stream.LongStream Filter(Java.Util.Function.LongPredicate arg0)
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("filter", "(Ljava/util/function/LongPredicate;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#flatMap(java.util.function.LongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#flatMap(java.util.function.LongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongFunction"/></param>
         /// <typeparam name="Arg0ExtendsJava_Util_Stream_LongStream"><see cref="Java.Util.Stream.LongStream"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
-        public Java.Util.Stream.LongStream FlatMap<Arg0ExtendsJava_Util_Stream_LongStream>(Java.Util.Function.LongFunction<Arg0ExtendsJava_Util_Stream_LongStream> arg0) where Arg0ExtendsJava_Util_Stream_LongStream: Java.Util.Stream.LongStream
+        public Java.Util.Stream.LongStream FlatMap<Arg0ExtendsJava_Util_Stream_LongStream>(Java.Util.Function.LongFunction<Arg0ExtendsJava_Util_Stream_LongStream> arg0) where Arg0ExtendsJava_Util_Stream_LongStream : Java.Util.Stream.LongStream
         {
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("flatMap", "(Ljava/util/function/LongFunction;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#limit(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#limit(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -319,7 +319,7 @@ public Java.Util.Stream.LongStream Limit(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("limit", "(J)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#map(java.util.function.LongUnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#map(java.util.function.LongUnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongUnaryOperator"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -328,7 +328,7 @@ public Java.Util.Stream.LongStream Map(Java.Util.Function.LongUnaryOperator arg0
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("map", "(Ljava/util/function/LongUnaryOperator;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#peek(java.util.function.LongConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#peek(java.util.function.LongConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -337,7 +337,7 @@ public Java.Util.Stream.LongStream Peek(Java.Util.Function.LongConsumer arg0)
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("peek", "(Ljava/util/function/LongConsumer;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#skip(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#skip(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -346,7 +346,7 @@ public Java.Util.Stream.LongStream Skip(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("skip", "(J)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#sorted()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#sorted()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
         public Java.Util.Stream.LongStream Sorted()
@@ -354,7 +354,7 @@ public Java.Util.Stream.LongStream Sorted()
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("sorted", "()Ljava/util/stream/LongStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#boxed()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#boxed()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<Java.Lang.Long> Boxed()
@@ -362,7 +362,7 @@ public Java.Util.Stream.LongStream Sorted()
             return IExecuteWithSignature<Java.Util.Stream.Stream<Java.Lang.Long>>("boxed", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#count()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#count()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Count()
@@ -370,7 +370,7 @@ public long Count()
             return IExecuteWithSignature<long>("count", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#reduce(long,java.util.function.LongBinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#reduce(long,java.util.function.LongBinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.LongBinaryOperator"/></param>
@@ -380,7 +380,7 @@ public long Reduce(long arg0, Java.Util.Function.LongBinaryOperator arg1)
             return IExecute<long>("reduce", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#sum()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#sum()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Sum()
@@ -388,7 +388,7 @@ public long Sum()
             return IExecuteWithSignature<long>("sum", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long[] ToArray()
@@ -396,7 +396,7 @@ public long[] ToArray()
             return IExecuteWithSignatureArray<long>("toArray", "()[J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#forEach(java.util.function.LongConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#forEach(java.util.function.LongConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
         public void ForEach(Java.Util.Function.LongConsumer arg0)
@@ -404,7 +404,7 @@ public void ForEach(Java.Util.Function.LongConsumer arg0)
             IExecuteWithSignature("forEach", "(Ljava/util/function/LongConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#forEachOrdered(java.util.function.LongConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#forEachOrdered(java.util.function.LongConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongConsumer"/></param>
         public void ForEachOrdered(Java.Util.Function.LongConsumer arg0)
@@ -412,7 +412,7 @@ public void ForEachOrdered(Java.Util.Function.LongConsumer arg0)
             IExecuteWithSignature("forEachOrdered", "(Ljava/util/function/LongConsumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#iterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#iterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator Iterator()
@@ -420,7 +420,7 @@ public Java.Util.Iterator Iterator()
             return IExecuteWithSignature<Java.Util.Iterator>("iterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#spliterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#spliterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Spliterator"/></returns>
         public Java.Util.Spliterator Spliterator()
@@ -428,7 +428,7 @@ public Java.Util.Spliterator Spliterator()
             return IExecuteWithSignature<Java.Util.Spliterator>("spliterator", "()Ljava/util/Spliterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#parallel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#parallel()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Parallel()
@@ -436,7 +436,7 @@ public Java.Util.Stream.BaseStream Parallel()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("parallel", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#sequential()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#sequential()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.BaseStream"/></returns>
         public Java.Util.Stream.BaseStream Sequential()
@@ -444,7 +444,7 @@ public Java.Util.Stream.BaseStream Sequential()
             return IExecuteWithSignature<Java.Util.Stream.BaseStream>("sequential", "()Ljava/util/stream/BaseStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#dropWhile(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#dropWhile(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -453,7 +453,7 @@ public Java.Util.Stream.LongStream DropWhile(Java.Util.Function.LongPredicate ar
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("dropWhile", "(Ljava/util/function/LongPredicate;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/LongStream.html#takeWhile(java.util.function.LongPredicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/LongStream.html#takeWhile(java.util.function.LongPredicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.LongPredicate"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/Stream.cs b/src/net/Netdroid/Generated/Java/Util/Stream/Stream.cs
index 4be9c5ceb..0a50efd7f 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/Stream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/Stream.cs
@@ -42,7 +42,7 @@ public partial class Stream
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#concat(java.util.stream.Stream,java.util.stream.Stream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#concat(java.util.stream.Stream,java.util.stream.Stream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Stream.Stream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.Stream"/></param>
@@ -52,7 +52,7 @@ public static Java.Util.Stream.Stream Concat(Java.Util.Stream.Stream arg0, Java.
             return SExecute<Java.Util.Stream.Stream>(LocalBridgeClazz, "concat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public static Java.Util.Stream.Stream Empty()
@@ -60,7 +60,7 @@ public static Java.Util.Stream.Stream Empty()
             return SExecuteWithSignature<Java.Util.Stream.Stream>(LocalBridgeClazz, "empty", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#generate(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#generate(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -69,7 +69,7 @@ public static Java.Util.Stream.Stream Generate(Java.Util.Function.Supplier arg0)
             return SExecuteWithSignature<Java.Util.Stream.Stream>(LocalBridgeClazz, "generate", "(Ljava/util/function/Supplier;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#iterate(java.lang.Object,java.util.function.Predicate,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#iterate(java.lang.Object,java.util.function.Predicate,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Predicate"/></param>
@@ -80,7 +80,7 @@ public static Java.Util.Stream.Stream Iterate(object arg0, Java.Util.Function.Pr
             return SExecute<Java.Util.Stream.Stream>(LocalBridgeClazz, "iterate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#iterate(java.lang.Object,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#iterate(java.lang.Object,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -90,7 +90,7 @@ public static Java.Util.Stream.Stream Iterate(object arg0, Java.Util.Function.Un
             return SExecute<Java.Util.Stream.Stream>(LocalBridgeClazz, "iterate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#of(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#of(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -99,7 +99,7 @@ public static Java.Util.Stream.Stream Of(params object[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Stream.Stream>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/stream/Stream;"); else return SExecuteWithSignature<Java.Util.Stream.Stream>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#of(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#of(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -108,7 +108,7 @@ public static Java.Util.Stream.Stream Of(object arg0)
             return SExecuteWithSignature<Java.Util.Stream.Stream>(LocalBridgeClazz, "of", "(Ljava/lang/Object;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#ofNullable(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#ofNullable(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -121,7 +121,7 @@ public static Java.Util.Stream.Stream OfNullable(object arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#toArray(java.util.function.IntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#toArray(java.util.function.IntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntFunction"/></param>
         /// <returns><see cref="object"/></returns>
@@ -130,7 +130,7 @@ public object[] ToArray(Java.Util.Function.IntFunction arg0)
             return IExecuteWithSignatureArray<object>("toArray", "(Ljava/util/function/IntFunction;)[Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#collect(java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#collect(java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Stream.Collector"/></param>
         /// <returns><see cref="object"/></returns>
@@ -139,7 +139,7 @@ public object Collect(Java.Util.Stream.Collector arg0)
             return IExecute("collect", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#flatMap(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#flatMap(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -148,7 +148,7 @@ public Java.Util.Stream.Stream FlatMap(Java.Util.Function.Function arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream>("flatMap", "(Ljava/util/function/Function;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#map(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#map(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -157,7 +157,7 @@ public Java.Util.Stream.Stream Map(Java.Util.Function.Function arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream>("map", "(Ljava/util/function/Function;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#collect(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#collect(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -168,7 +168,7 @@ public object Collect(Java.Util.Function.Supplier arg0, Java.Util.Function.BiCon
             return IExecute("collect", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#reduce(java.lang.Object,java.util.function.BiFunction,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#reduce(java.lang.Object,java.util.function.BiFunction,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -179,7 +179,7 @@ public object Reduce(object arg0, Java.Util.Function.BiFunction arg1, Java.Util.
             return IExecute("reduce", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#allMatch(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#allMatch(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -188,7 +188,7 @@ public bool AllMatch(Java.Util.Function.Predicate arg0)
             return IExecuteWithSignature<bool>("allMatch", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#anyMatch(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#anyMatch(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -197,7 +197,7 @@ public bool AnyMatch(Java.Util.Function.Predicate arg0)
             return IExecuteWithSignature<bool>("anyMatch", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#noneMatch(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#noneMatch(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -206,7 +206,7 @@ public bool NoneMatch(Java.Util.Function.Predicate arg0)
             return IExecuteWithSignature<bool>("noneMatch", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -214,7 +214,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#findAny()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#findAny()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Optional"/></returns>
         public Java.Util.Optional FindAny()
@@ -222,7 +222,7 @@ public Java.Util.Optional FindAny()
             return IExecuteWithSignature<Java.Util.Optional>("findAny", "()Ljava/util/Optional;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#findFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#findFirst()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Optional"/></returns>
         public Java.Util.Optional FindFirst()
@@ -230,7 +230,7 @@ public Java.Util.Optional FindFirst()
             return IExecuteWithSignature<Java.Util.Optional>("findFirst", "()Ljava/util/Optional;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#reduce(java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#reduce(java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BinaryOperator"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -239,7 +239,7 @@ public Java.Util.Optional Reduce(Java.Util.Function.BinaryOperator arg0)
             return IExecuteWithSignature<Java.Util.Optional>("reduce", "(Ljava/util/function/BinaryOperator;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#flatMapToDouble(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#flatMapToDouble(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -248,7 +248,7 @@ public Java.Util.Stream.DoubleStream FlatMapToDouble(Java.Util.Function.Function
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("flatMapToDouble", "(Ljava/util/function/Function;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapToDouble(java.util.function.ToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#mapToDouble(java.util.function.ToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
@@ -257,7 +257,7 @@ public Java.Util.Stream.DoubleStream MapToDouble(Java.Util.Function.ToDoubleFunc
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("mapToDouble", "(Ljava/util/function/ToDoubleFunction;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#flatMapToInt(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#flatMapToInt(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -266,7 +266,7 @@ public Java.Util.Stream.IntStream FlatMapToInt(Java.Util.Function.Function arg0)
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("flatMapToInt", "(Ljava/util/function/Function;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapToInt(java.util.function.ToIntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#mapToInt(java.util.function.ToIntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToIntFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
@@ -275,7 +275,7 @@ public Java.Util.Stream.IntStream MapToInt(Java.Util.Function.ToIntFunction arg0
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("mapToInt", "(Ljava/util/function/ToIntFunction;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#flatMapToLong(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#flatMapToLong(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -284,7 +284,7 @@ public Java.Util.Stream.LongStream FlatMapToLong(Java.Util.Function.Function arg
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("flatMapToLong", "(Ljava/util/function/Function;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapToLong(java.util.function.ToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#mapToLong(java.util.function.ToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToLongFunction"/></param>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
@@ -293,7 +293,7 @@ public Java.Util.Stream.LongStream MapToLong(Java.Util.Function.ToLongFunction a
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("mapToLong", "(Ljava/util/function/ToLongFunction;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#distinct()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#distinct()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream Distinct()
@@ -301,7 +301,7 @@ public Java.Util.Stream.Stream Distinct()
             return IExecuteWithSignature<Java.Util.Stream.Stream>("distinct", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#filter(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#filter(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -310,7 +310,7 @@ public Java.Util.Stream.Stream Filter(Java.Util.Function.Predicate arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream>("filter", "(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#limit(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#limit(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -319,7 +319,7 @@ public Java.Util.Stream.Stream Limit(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream>("limit", "(J)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#peek(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#peek(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -328,7 +328,7 @@ public Java.Util.Stream.Stream Peek(Java.Util.Function.Consumer arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream>("peek", "(Ljava/util/function/Consumer;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#skip(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#skip(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -337,7 +337,7 @@ public Java.Util.Stream.Stream Skip(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream>("skip", "(J)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#sorted()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#sorted()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream Sorted()
@@ -345,7 +345,7 @@ public Java.Util.Stream.Stream Sorted()
             return IExecuteWithSignature<Java.Util.Stream.Stream>("sorted", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#count()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#count()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Count()
@@ -353,7 +353,7 @@ public long Count()
             return IExecuteWithSignature<long>("count", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#reduce(java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#reduce(java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BinaryOperator"/></param>
@@ -363,7 +363,7 @@ public object Reduce(object arg0, Java.Util.Function.BinaryOperator arg1)
             return IExecute("reduce", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#forEach(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#forEach(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         public void ForEach(Java.Util.Function.Consumer arg0)
@@ -371,7 +371,7 @@ public void ForEach(Java.Util.Function.Consumer arg0)
             IExecuteWithSignature("forEach", "(Ljava/util/function/Consumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#forEachOrdered(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#forEachOrdered(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         public void ForEachOrdered(Java.Util.Function.Consumer arg0)
@@ -379,51 +379,7 @@ public void ForEachOrdered(Java.Util.Function.Consumer arg0)
             IExecuteWithSignature("forEachOrdered", "(Ljava/util/function/Consumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapMulti(java.util.function.BiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
-        /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream MapMulti(Java.Util.Function.BiConsumer arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Stream.Stream>("mapMulti", "(Ljava/util/function/BiConsumer;)Ljava/util/stream/Stream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#toList()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.List"/></returns>
-        public Java.Util.List ToList()
-        {
-            return IExecuteWithSignature<Java.Util.List>("toList", "()Ljava/util/List;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapMultiToDouble(java.util.function.BiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
-        /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
-        public Java.Util.Stream.DoubleStream MapMultiToDouble(Java.Util.Function.BiConsumer arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("mapMultiToDouble", "(Ljava/util/function/BiConsumer;)Ljava/util/stream/DoubleStream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapMultiToInt(java.util.function.BiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
-        /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
-        public Java.Util.Stream.IntStream MapMultiToInt(Java.Util.Function.BiConsumer arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Stream.IntStream>("mapMultiToInt", "(Ljava/util/function/BiConsumer;)Ljava/util/stream/IntStream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapMultiToLong(java.util.function.BiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
-        /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
-        public Java.Util.Stream.LongStream MapMultiToLong(Java.Util.Function.BiConsumer arg0)
-        {
-            return IExecuteWithSignature<Java.Util.Stream.LongStream>("mapMultiToLong", "(Ljava/util/function/BiConsumer;)Ljava/util/stream/LongStream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#dropWhile(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#dropWhile(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -432,7 +388,7 @@ public Java.Util.Stream.Stream DropWhile(Java.Util.Function.Predicate arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream>("dropWhile", "(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#takeWhile(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#takeWhile(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -490,19 +446,19 @@ public partial class Stream<T> : Java.Util.Stream.IStream<T>
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#concat(java.util.stream.Stream,java.util.stream.Stream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#concat(java.util.stream.Stream,java.util.stream.Stream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Stream.Stream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Stream.Stream"/></param>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg1ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public static Java.Util.Stream.Stream<T> Concat<Arg0ExtendsT, Arg1ExtendsT>(Java.Util.Stream.Stream<Arg0ExtendsT> arg0, Java.Util.Stream.Stream<Arg1ExtendsT> arg1) where Arg0ExtendsT: T where Arg1ExtendsT: T
+        public static Java.Util.Stream.Stream<T> Concat<Arg0ExtendsT, Arg1ExtendsT>(Java.Util.Stream.Stream<Arg0ExtendsT> arg0, Java.Util.Stream.Stream<Arg1ExtendsT> arg1) where Arg0ExtendsT : T where Arg1ExtendsT : T
         {
             return SExecute<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "concat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#empty()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#empty()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public static Java.Util.Stream.Stream<T> Empty()
@@ -510,29 +466,29 @@ public static Java.Util.Stream.Stream<T> Empty()
             return SExecuteWithSignature<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "empty", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#generate(java.util.function.Supplier)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#generate(java.util.function.Supplier)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <typeparam name="Arg0ExtendsT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public static Java.Util.Stream.Stream<T> Generate<Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsT> arg0) where Arg0ExtendsT: T
+        public static Java.Util.Stream.Stream<T> Generate<Arg0ExtendsT>(Java.Util.Function.Supplier<Arg0ExtendsT> arg0) where Arg0ExtendsT : T
         {
             return SExecuteWithSignature<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "generate", "(Ljava/util/function/Supplier;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#iterate(java.lang.Object,java.util.function.Predicate,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#iterate(java.lang.Object,java.util.function.Predicate,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.Predicate"/></param>
         /// <param name="arg2"><see cref="Java.Util.Function.UnaryOperator"/></param>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public static Java.Util.Stream.Stream<T> Iterate<Arg1objectSuperT>(T arg0, Java.Util.Function.Predicate<Arg1objectSuperT> arg1, Java.Util.Function.UnaryOperator<T> arg2) where Arg1objectSuperT: T
+        public static Java.Util.Stream.Stream<T> Iterate<Arg1objectSuperT>(T arg0, Java.Util.Function.Predicate<Arg1objectSuperT> arg1, Java.Util.Function.UnaryOperator<T> arg2) where Arg1objectSuperT : T
         {
             return SExecute<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "iterate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#iterate(java.lang.Object,java.util.function.UnaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#iterate(java.lang.Object,java.util.function.UnaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.UnaryOperator"/></param>
@@ -542,7 +498,7 @@ public static Java.Util.Stream.Stream<T> Iterate(T arg0, Java.Util.Function.Unar
             return SExecute<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "iterate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#of(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#of(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -551,7 +507,7 @@ public static Java.Util.Stream.Stream<T> Of(params T[] arg0)
             if (arg0.Length == 0) return SExecuteWithSignature<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/stream/Stream;"); else return SExecuteWithSignature<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "of", "([Ljava/lang/Object;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#of(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#of(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -560,7 +516,7 @@ public static Java.Util.Stream.Stream<T> Of(T arg0)
             return SExecuteWithSignature<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "of", "(Ljava/lang/Object;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#ofNullable(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#ofNullable(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -573,7 +529,7 @@ public static Java.Util.Stream.Stream<T> OfNullable(T arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#toArray(java.util.function.IntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#toArray(java.util.function.IntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.IntFunction"/></param>
         /// <typeparam name="A"></typeparam>
@@ -583,19 +539,19 @@ public A[] ToArray<A>(Java.Util.Function.IntFunction<A[]> arg0)
             return IExecuteWithSignatureArray<A>("toArray", "(Ljava/util/function/IntFunction;)[Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#collect(java.util.stream.Collector)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#collect(java.util.stream.Collector)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Stream.Collector"/></param>
         /// <typeparam name="R"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="A"></typeparam>
         /// <returns><typeparamref name="R"/></returns>
-        public R Collect<R, Arg0objectSuperT, A>(Java.Util.Stream.Collector<Arg0objectSuperT, A, R> arg0) where Arg0objectSuperT: T
+        public R Collect<R, Arg0objectSuperT, A>(Java.Util.Stream.Collector<Arg0objectSuperT, A, R> arg0) where Arg0objectSuperT : T
         {
             return IExecute<R>("collect", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#flatMap(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#flatMap(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="R"></typeparam>
@@ -603,24 +559,24 @@ public R Collect<R, Arg0objectSuperT, A>(Java.Util.Stream.Collector<Arg0objectSu
         /// <typeparam name="Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsR_"><see cref="Java.Util.Stream.Stream{Arg0ExtendsR}"/></typeparam>
         /// <typeparam name="Arg0ExtendsR"><typeparamref name="R"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<R> FlatMap<R, Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsR_, Arg0ExtendsR>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsR_> arg0) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsR_: Java.Util.Stream.Stream<Arg0ExtendsR> where Arg0ExtendsR: R
+        public Java.Util.Stream.Stream<R> FlatMap<R, Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsR_, Arg0ExtendsR>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsR_> arg0) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Stream_Stream_Arg0ExtendsR_ : Java.Util.Stream.Stream<Arg0ExtendsR> where Arg0ExtendsR : R
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<R>>("flatMap", "(Ljava/util/function/Function;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#map(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#map(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="R"></typeparam>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsR"><typeparamref name="R"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<R> Map<R, Arg0objectSuperT, Arg0ExtendsR>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsR> arg0) where Arg0objectSuperT: T where Arg0ExtendsR: R
+        public Java.Util.Stream.Stream<R> Map<R, Arg0objectSuperT, Arg0ExtendsR>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsR> arg0) where Arg0objectSuperT : T where Arg0ExtendsR : R
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<R>>("map", "(Ljava/util/function/Function;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#collect(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BiConsumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#collect(java.util.function.Supplier,java.util.function.BiConsumer,java.util.function.BiConsumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiConsumer"/></param>
@@ -628,12 +584,12 @@ public Java.Util.Stream.Stream<R> Map<R, Arg0objectSuperT, Arg0ExtendsR>(Java.Ut
         /// <typeparam name="R"></typeparam>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><typeparamref name="R"/></returns>
-        public R Collect<R, Arg1objectSuperT>(Java.Util.Function.Supplier<R> arg0, Java.Util.Function.BiConsumer<R, Arg1objectSuperT> arg1, Java.Util.Function.BiConsumer<R, R> arg2) where Arg1objectSuperT: T
+        public R Collect<R, Arg1objectSuperT>(Java.Util.Function.Supplier<R> arg0, Java.Util.Function.BiConsumer<R, Arg1objectSuperT> arg1, Java.Util.Function.BiConsumer<R, R> arg2) where Arg1objectSuperT : T
         {
             return IExecute<R>("collect", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#reduce(java.lang.Object,java.util.function.BiFunction,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#reduce(java.lang.Object,java.util.function.BiFunction,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="U"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BiFunction"/></param>
@@ -641,42 +597,42 @@ public R Collect<R, Arg1objectSuperT>(Java.Util.Function.Supplier<R> arg0, Java.
         /// <typeparam name="U"></typeparam>
         /// <typeparam name="Arg1objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><typeparamref name="U"/></returns>
-        public U Reduce<U, Arg1objectSuperT>(U arg0, Java.Util.Function.BiFunction<U, Arg1objectSuperT, U> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg1objectSuperT: T
+        public U Reduce<U, Arg1objectSuperT>(U arg0, Java.Util.Function.BiFunction<U, Arg1objectSuperT, U> arg1, Java.Util.Function.BinaryOperator<U> arg2) where Arg1objectSuperT : T
         {
             return IExecute<U>("reduce", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#allMatch(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#allMatch(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AllMatch<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public bool AllMatch<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<bool>("allMatch", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#anyMatch(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#anyMatch(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool AnyMatch<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public bool AnyMatch<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<bool>("anyMatch", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#noneMatch(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#noneMatch(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="bool"/></returns>
-        public bool NoneMatch<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public bool NoneMatch<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<bool>("noneMatch", "(Ljava/util/function/Predicate;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#toArray()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#toArray()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object[] ToArray()
@@ -684,7 +640,7 @@ public object[] ToArray()
             return IExecuteWithSignatureArray<object>("toArray", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#findAny()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#findAny()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Optional"/></returns>
         public Java.Util.Optional<T> FindAny()
@@ -692,7 +648,7 @@ public Java.Util.Optional<T> FindAny()
             return IExecuteWithSignature<Java.Util.Optional<T>>("findAny", "()Ljava/util/Optional;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#findFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#findFirst()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Optional"/></returns>
         public Java.Util.Optional<T> FindFirst()
@@ -700,7 +656,7 @@ public Java.Util.Optional<T> FindFirst()
             return IExecuteWithSignature<Java.Util.Optional<T>>("findFirst", "()Ljava/util/Optional;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#reduce(java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#reduce(java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.BinaryOperator"/></param>
         /// <returns><see cref="Java.Util.Optional"/></returns>
@@ -709,70 +665,70 @@ public Java.Util.Optional<T> Reduce(Java.Util.Function.BinaryOperator<T> arg0)
             return IExecuteWithSignature<Java.Util.Optional<T>>("reduce", "(Ljava/util/function/BinaryOperator;)Ljava/util/Optional;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#flatMapToDouble(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#flatMapToDouble(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Stream_DoubleStream"><see cref="Java.Util.Stream.DoubleStream"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
-        public Java.Util.Stream.DoubleStream FlatMapToDouble<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_DoubleStream>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_DoubleStream> arg0) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Stream_DoubleStream: Java.Util.Stream.DoubleStream
+        public Java.Util.Stream.DoubleStream FlatMapToDouble<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_DoubleStream>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_DoubleStream> arg0) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Stream_DoubleStream : Java.Util.Stream.DoubleStream
         {
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("flatMapToDouble", "(Ljava/util/function/Function;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapToDouble(java.util.function.ToDoubleFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#mapToDouble(java.util.function.ToDoubleFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToDoubleFunction"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
-        public Java.Util.Stream.DoubleStream MapToDouble<Arg0objectSuperT>(Java.Util.Function.ToDoubleFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Stream.DoubleStream MapToDouble<Arg0objectSuperT>(Java.Util.Function.ToDoubleFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("mapToDouble", "(Ljava/util/function/ToDoubleFunction;)Ljava/util/stream/DoubleStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#flatMapToInt(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#flatMapToInt(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Stream_IntStream"><see cref="Java.Util.Stream.IntStream"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
-        public Java.Util.Stream.IntStream FlatMapToInt<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_IntStream>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_IntStream> arg0) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Stream_IntStream: Java.Util.Stream.IntStream
+        public Java.Util.Stream.IntStream FlatMapToInt<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_IntStream>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_IntStream> arg0) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Stream_IntStream : Java.Util.Stream.IntStream
         {
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("flatMapToInt", "(Ljava/util/function/Function;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapToInt(java.util.function.ToIntFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#mapToInt(java.util.function.ToIntFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToIntFunction"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
-        public Java.Util.Stream.IntStream MapToInt<Arg0objectSuperT>(Java.Util.Function.ToIntFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Stream.IntStream MapToInt<Arg0objectSuperT>(Java.Util.Function.ToIntFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Stream.IntStream>("mapToInt", "(Ljava/util/function/ToIntFunction;)Ljava/util/stream/IntStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#flatMapToLong(java.util.function.Function)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#flatMapToLong(java.util.function.Function)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Function"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Stream_LongStream"><see cref="Java.Util.Stream.LongStream"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
-        public Java.Util.Stream.LongStream FlatMapToLong<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_LongStream>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_LongStream> arg0) where Arg0objectSuperT: T where Arg0ExtendsJava_Util_Stream_LongStream: Java.Util.Stream.LongStream
+        public Java.Util.Stream.LongStream FlatMapToLong<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_LongStream>(Java.Util.Function.Function<Arg0objectSuperT, Arg0ExtendsJava_Util_Stream_LongStream> arg0) where Arg0objectSuperT : T where Arg0ExtendsJava_Util_Stream_LongStream : Java.Util.Stream.LongStream
         {
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("flatMapToLong", "(Ljava/util/function/Function;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapToLong(java.util.function.ToLongFunction)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#mapToLong(java.util.function.ToLongFunction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.ToLongFunction"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
-        public Java.Util.Stream.LongStream MapToLong<Arg0objectSuperT>(Java.Util.Function.ToLongFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Stream.LongStream MapToLong<Arg0objectSuperT>(Java.Util.Function.ToLongFunction<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Stream.LongStream>("mapToLong", "(Ljava/util/function/ToLongFunction;)Ljava/util/stream/LongStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#distinct()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#distinct()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<T> Distinct()
@@ -780,17 +736,17 @@ public Java.Util.Stream.Stream<T> Distinct()
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("distinct", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#filter(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#filter(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<T> Filter<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Stream.Stream<T> Filter<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("filter", "(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#limit(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#limit(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -799,17 +755,17 @@ public Java.Util.Stream.Stream<T> Limit(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("limit", "(J)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#peek(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#peek(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<T> Peek<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Stream.Stream<T> Peek<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("peek", "(Ljava/util/function/Consumer;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#skip(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#skip(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
@@ -818,7 +774,7 @@ public Java.Util.Stream.Stream<T> Skip(long arg0)
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("skip", "(J)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#sorted()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#sorted()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
         public Java.Util.Stream.Stream<T> Sorted()
@@ -826,7 +782,7 @@ public Java.Util.Stream.Stream<T> Sorted()
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("sorted", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#count()"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#count()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Count()
@@ -834,7 +790,7 @@ public long Count()
             return IExecuteWithSignature<long>("count", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#reduce(java.lang.Object,java.util.function.BinaryOperator)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#reduce(java.lang.Object,java.util.function.BinaryOperator)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="T"/></param>
         /// <param name="arg1"><see cref="Java.Util.Function.BinaryOperator"/></param>
@@ -844,93 +800,40 @@ public T Reduce(T arg0, Java.Util.Function.BinaryOperator<T> arg1)
             return IExecute<T>("reduce", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#forEach(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#forEach(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        public void ForEach<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public void ForEach<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             IExecuteWithSignature("forEach", "(Ljava/util/function/Consumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#forEachOrdered(java.util.function.Consumer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#forEachOrdered(java.util.function.Consumer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Consumer"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        public void ForEachOrdered<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public void ForEachOrdered<Arg0objectSuperT>(Java.Util.Function.Consumer<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             IExecuteWithSignature("forEachOrdered", "(Ljava/util/function/Consumer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapMulti(java.util.function.BiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
-        /// <typeparam name="R"></typeparam>
-        /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        /// <typeparam name="Arg0objectSuperJava_Util_Function_Consumer_R_"><see cref="Java.Util.Function.Consumer{R}"/></typeparam>
-        /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<R> MapMulti<R, Arg0objectSuperT, Arg0objectSuperJava_Util_Function_Consumer_R_>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Util_Function_Consumer_R_> arg0) where Arg0objectSuperT: T where Arg0objectSuperJava_Util_Function_Consumer_R_: Java.Util.Function.Consumer<R>
-        {
-            return IExecuteWithSignature<Java.Util.Stream.Stream<R>>("mapMulti", "(Ljava/util/function/BiConsumer;)Ljava/util/stream/Stream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#toList()"/>
-        /// </summary>
-        /// <returns><see cref="Java.Util.List"/></returns>
-        public Java.Util.List<T> ToList()
-        {
-            return IExecuteWithSignature<Java.Util.List<T>>("toList", "()Ljava/util/List;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapMultiToDouble(java.util.function.BiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
-        /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        /// <typeparam name="Arg0objectSuperJava_Util_Function_DoubleConsumer"><see cref="Java.Util.Function.DoubleConsumer"/></typeparam>
-        /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
-        public Java.Util.Stream.DoubleStream MapMultiToDouble<Arg0objectSuperT, Arg0objectSuperJava_Util_Function_DoubleConsumer>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Util_Function_DoubleConsumer> arg0) where Arg0objectSuperT: T where Arg0objectSuperJava_Util_Function_DoubleConsumer: Java.Util.Function.DoubleConsumer
-        {
-            return IExecuteWithSignature<Java.Util.Stream.DoubleStream>("mapMultiToDouble", "(Ljava/util/function/BiConsumer;)Ljava/util/stream/DoubleStream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapMultiToInt(java.util.function.BiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
-        /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        /// <typeparam name="Arg0objectSuperJava_Util_Function_IntConsumer"><see cref="Java.Util.Function.IntConsumer"/></typeparam>
-        /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
-        public Java.Util.Stream.IntStream MapMultiToInt<Arg0objectSuperT, Arg0objectSuperJava_Util_Function_IntConsumer>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Util_Function_IntConsumer> arg0) where Arg0objectSuperT: T where Arg0objectSuperJava_Util_Function_IntConsumer: Java.Util.Function.IntConsumer
-        {
-            return IExecuteWithSignature<Java.Util.Stream.IntStream>("mapMultiToInt", "(Ljava/util/function/BiConsumer;)Ljava/util/stream/IntStream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#mapMultiToLong(java.util.function.BiConsumer)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Function.BiConsumer"/></param>
-        /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
-        /// <typeparam name="Arg0objectSuperJava_Util_Function_LongConsumer"><see cref="Java.Util.Function.LongConsumer"/></typeparam>
-        /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
-        public Java.Util.Stream.LongStream MapMultiToLong<Arg0objectSuperT, Arg0objectSuperJava_Util_Function_LongConsumer>(Java.Util.Function.BiConsumer<Arg0objectSuperT, Arg0objectSuperJava_Util_Function_LongConsumer> arg0) where Arg0objectSuperT: T where Arg0objectSuperJava_Util_Function_LongConsumer: Java.Util.Function.LongConsumer
-        {
-            return IExecuteWithSignature<Java.Util.Stream.LongStream>("mapMultiToLong", "(Ljava/util/function/BiConsumer;)Ljava/util/stream/LongStream;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#dropWhile(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#dropWhile(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<T> DropWhile<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Stream.Stream<T> DropWhile<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("dropWhile", "(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/Stream.html#takeWhile(java.util.function.Predicate)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/Stream.html#takeWhile(java.util.function.Predicate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Predicate"/></param>
         /// <typeparam name="Arg0objectSuperT"><typeparamref name="T"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<T> TakeWhile<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT: T
+        public Java.Util.Stream.Stream<T> TakeWhile<Arg0objectSuperT>(Java.Util.Function.Predicate<Arg0objectSuperT> arg0) where Arg0objectSuperT : T
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<T>>("takeWhile", "(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", arg0);
         }
diff --git a/src/net/Netdroid/Generated/Java/Util/Stream/StreamSupport.cs b/src/net/Netdroid/Generated/Java/Util/Stream/StreamSupport.cs
index 8d5fc59e8..72fcb9569 100644
--- a/src/net/Netdroid/Generated/Java/Util/Stream/StreamSupport.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Stream/StreamSupport.cs
@@ -42,7 +42,7 @@ public partial class StreamSupport
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html#stream(java.util.function.Supplier,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html#stream(java.util.function.Supplier,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -50,12 +50,12 @@ public partial class StreamSupport
         /// <typeparam name="T"></typeparam>
         /// <typeparam name="Arg0ExtendsJava_Util_Spliterator_T_"><see cref="Java.Util.Spliterator{T}"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public static Java.Util.Stream.Stream<T> Stream<T, Arg0ExtendsJava_Util_Spliterator_T_>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Spliterator_T_> arg0, int arg1, bool arg2) where Arg0ExtendsJava_Util_Spliterator_T_: Java.Util.Spliterator<T>
+        public static Java.Util.Stream.Stream<T> Stream<T, Arg0ExtendsJava_Util_Spliterator_T_>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Spliterator_T_> arg0, int arg1, bool arg2) where Arg0ExtendsJava_Util_Spliterator_T_ : Java.Util.Spliterator<T>
         {
             return SExecute<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "stream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html#stream(java.util.Spliterator,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html#stream(java.util.Spliterator,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Spliterator"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -66,19 +66,19 @@ public static Java.Util.Stream.Stream<T> Stream<T>(Java.Util.Spliterator<T> arg0
             return SExecute<Java.Util.Stream.Stream<T>>(LocalBridgeClazz, "stream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html#doubleStream(java.util.function.Supplier,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html#doubleStream(java.util.function.Supplier,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <typeparam name="Arg0ExtendsJava_Util_Spliterator_OfDouble"><see cref="Java.Util.Spliterator.OfDouble"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.DoubleStream"/></returns>
-        public static Java.Util.Stream.DoubleStream DoubleStream<Arg0ExtendsJava_Util_Spliterator_OfDouble>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Spliterator_OfDouble> arg0, int arg1, bool arg2) where Arg0ExtendsJava_Util_Spliterator_OfDouble: Java.Util.Spliterator.OfDouble
+        public static Java.Util.Stream.DoubleStream DoubleStream<Arg0ExtendsJava_Util_Spliterator_OfDouble>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Spliterator_OfDouble> arg0, int arg1, bool arg2) where Arg0ExtendsJava_Util_Spliterator_OfDouble : Java.Util.Spliterator.OfDouble
         {
             return SExecute<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "doubleStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html#doubleStream(java.util.Spliterator.OfDouble,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html#doubleStream(java.util.Spliterator.OfDouble,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Spliterator.OfDouble"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -88,19 +88,19 @@ public static Java.Util.Stream.DoubleStream DoubleStream(Java.Util.Spliterator.O
             return SExecute<Java.Util.Stream.DoubleStream>(LocalBridgeClazz, "doubleStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html#intStream(java.util.function.Supplier,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html#intStream(java.util.function.Supplier,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <typeparam name="Arg0ExtendsJava_Util_Spliterator_OfInt"><see cref="Java.Util.Spliterator.OfInt"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.IntStream"/></returns>
-        public static Java.Util.Stream.IntStream IntStream<Arg0ExtendsJava_Util_Spliterator_OfInt>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Spliterator_OfInt> arg0, int arg1, bool arg2) where Arg0ExtendsJava_Util_Spliterator_OfInt: Java.Util.Spliterator.OfInt
+        public static Java.Util.Stream.IntStream IntStream<Arg0ExtendsJava_Util_Spliterator_OfInt>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Spliterator_OfInt> arg0, int arg1, bool arg2) where Arg0ExtendsJava_Util_Spliterator_OfInt : Java.Util.Spliterator.OfInt
         {
             return SExecute<Java.Util.Stream.IntStream>(LocalBridgeClazz, "intStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html#intStream(java.util.Spliterator.OfInt,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html#intStream(java.util.Spliterator.OfInt,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Spliterator.OfInt"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -110,19 +110,19 @@ public static Java.Util.Stream.IntStream IntStream(Java.Util.Spliterator.OfInt a
             return SExecute<Java.Util.Stream.IntStream>(LocalBridgeClazz, "intStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html#longStream(java.util.function.Supplier,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html#longStream(java.util.function.Supplier,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Function.Supplier"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="bool"/></param>
         /// <typeparam name="Arg0ExtendsJava_Util_Spliterator_OfLong"><see cref="Java.Util.Spliterator.OfLong"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.LongStream"/></returns>
-        public static Java.Util.Stream.LongStream LongStream<Arg0ExtendsJava_Util_Spliterator_OfLong>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Spliterator_OfLong> arg0, int arg1, bool arg2) where Arg0ExtendsJava_Util_Spliterator_OfLong: Java.Util.Spliterator.OfLong
+        public static Java.Util.Stream.LongStream LongStream<Arg0ExtendsJava_Util_Spliterator_OfLong>(Java.Util.Function.Supplier<Arg0ExtendsJava_Util_Spliterator_OfLong> arg0, int arg1, bool arg2) where Arg0ExtendsJava_Util_Spliterator_OfLong : Java.Util.Spliterator.OfLong
         {
             return SExecute<Java.Util.Stream.LongStream>(LocalBridgeClazz, "longStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/stream/StreamSupport.html#longStream(java.util.Spliterator.OfLong,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/stream/StreamSupport.html#longStream(java.util.Spliterator.OfLong,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Spliterator.OfLong"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/StringJoiner.cs b/src/net/Netdroid/Generated/Java/Util/StringJoiner.cs
index e79aab8a4..2c92e02c4 100644
--- a/src/net/Netdroid/Generated/Java/Util/StringJoiner.cs
+++ b/src/net/Netdroid/Generated/Java/Util/StringJoiner.cs
@@ -30,7 +30,7 @@ public partial class StringJoiner
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringJoiner.html#%3Cinit%3E(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringJoiner.html#%3Cinit%3E(java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <param name="arg1"><see cref="Java.Lang.CharSequence"/></param>
@@ -40,7 +40,7 @@ public StringJoiner(Java.Lang.CharSequence arg0, Java.Lang.CharSequence arg1, Ja
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringJoiner.html#%3Cinit%3E(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringJoiner.html#%3Cinit%3E(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         public StringJoiner(Java.Lang.CharSequence arg0)
@@ -64,7 +64,7 @@ public StringJoiner(Java.Lang.CharSequence arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringJoiner.html#length()"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringJoiner.html#length()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Length()
@@ -72,7 +72,7 @@ public int Length()
             return IExecuteWithSignature<int>("length", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringJoiner.html#add(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringJoiner.html#add(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Util.StringJoiner"/></returns>
@@ -81,7 +81,7 @@ public Java.Util.StringJoiner Add(Java.Lang.CharSequence arg0)
             return IExecuteWithSignature<Java.Util.StringJoiner>("add", "(Ljava/lang/CharSequence;)Ljava/util/StringJoiner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringJoiner.html#merge(java.util.StringJoiner)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringJoiner.html#merge(java.util.StringJoiner)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.StringJoiner"/></param>
         /// <returns><see cref="Java.Util.StringJoiner"/></returns>
@@ -90,7 +90,7 @@ public Java.Util.StringJoiner Merge(Java.Util.StringJoiner arg0)
             return IExecuteWithSignature<Java.Util.StringJoiner>("merge", "(Ljava/util/StringJoiner;)Ljava/util/StringJoiner;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringJoiner.html#setEmptyValue(java.lang.CharSequence)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringJoiner.html#setEmptyValue(java.lang.CharSequence)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.CharSequence"/></param>
         /// <returns><see cref="Java.Util.StringJoiner"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/StringTokenizer.cs b/src/net/Netdroid/Generated/Java/Util/StringTokenizer.cs
index 2edae5402..ac390a96c 100644
--- a/src/net/Netdroid/Generated/Java/Util/StringTokenizer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/StringTokenizer.cs
@@ -30,7 +30,7 @@ public partial class StringTokenizer
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#%3Cinit%3E(java.lang.String,java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -40,7 +40,7 @@ public StringTokenizer(Java.Lang.String arg0, Java.Lang.String arg1, bool arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -49,7 +49,7 @@ public StringTokenizer(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public StringTokenizer(Java.Lang.String arg0)
@@ -73,7 +73,7 @@ public StringTokenizer(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#hasMoreElements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#hasMoreElements()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasMoreElements()
@@ -81,7 +81,7 @@ public bool HasMoreElements()
             return IExecuteWithSignature<bool>("hasMoreElements", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#hasMoreTokens()"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#hasMoreTokens()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool HasMoreTokens()
@@ -89,7 +89,7 @@ public bool HasMoreTokens()
             return IExecuteWithSignature<bool>("hasMoreTokens", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#countTokens()"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#countTokens()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int CountTokens()
@@ -97,7 +97,7 @@ public int CountTokens()
             return IExecuteWithSignature<int>("countTokens", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#nextElement()"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#nextElement()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object NextElement()
@@ -105,7 +105,7 @@ public object NextElement()
             return IExecuteWithSignature("nextElement", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#nextToken()"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#nextToken()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String NextToken()
@@ -113,7 +113,7 @@ public Java.Lang.String NextToken()
             return IExecuteWithSignature<Java.Lang.String>("nextToken", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/StringTokenizer.html#nextToken(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/StringTokenizer.html#nextToken(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/TimeZone.cs b/src/net/Netdroid/Generated/Java/Util/TimeZone.cs
index c98214201..ad2899031 100644
--- a/src/net/Netdroid/Generated/Java/Util/TimeZone.cs
+++ b/src/net/Netdroid/Generated/Java/Util/TimeZone.cs
@@ -46,13 +46,13 @@ public partial class TimeZone : Java.Io.ISerializable, Java.Lang.ICloneable
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#LONG"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#LONG"/>
         /// </summary>
         public static int LONG { get { if (!_LONGReady) { _LONGContent = SGetField<int>(LocalBridgeClazz, "LONG"); _LONGReady = true; } return _LONGContent; } }
         private static int _LONGContent = default;
         private static bool _LONGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#SHORT"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#SHORT"/>
         /// </summary>
         public static int SHORT { get { if (!_SHORTReady) { _SHORTContent = SGetField<int>(LocalBridgeClazz, "SHORT"); _SHORTReady = true; } return _SHORTContent; } }
         private static int _SHORTContent = default;
@@ -62,21 +62,15 @@ public partial class TimeZone : Java.Io.ISerializable, Java.Lang.ICloneable
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getAvailableIDs()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getDefault()"/>
         /// </summary>
-        public static Java.Lang.String[] AvailableIDs
-        {
-            get { return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getAvailableIDs", "()[Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getDefault()"/> <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#setDefault(java.util.TimeZone)"/>
-        /// </summary>
-        public static Java.Util.TimeZone Default
+        /// <returns><see cref="Java.Util.TimeZone"/></returns>
+        public static Java.Util.TimeZone GetDefault()
         {
-            get { return SExecuteWithSignature<Java.Util.TimeZone>(LocalBridgeClazz, "getDefault", "()Ljava/util/TimeZone;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/util/TimeZone;)V", value); }
+            return SExecuteWithSignature<Java.Util.TimeZone>(LocalBridgeClazz, "getDefault", "()Ljava/util/TimeZone;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getTimeZone(java.time.ZoneId)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getTimeZone(java.time.ZoneId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Time.ZoneId"/></param>
         /// <returns><see cref="Java.Util.TimeZone"/></returns>
@@ -85,7 +79,15 @@ public static Java.Util.TimeZone GetTimeZone(Java.Time.ZoneId arg0)
             return SExecuteWithSignature<Java.Util.TimeZone>(LocalBridgeClazz, "getTimeZone", "(Ljava/time/ZoneId;)Ljava/util/TimeZone;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getAvailableIDs(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getAvailableIDs()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String[] GetAvailableIDs()
+        {
+            return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getAvailableIDs", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getAvailableIDs(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -94,7 +96,7 @@ public static Java.Lang.String[] GetAvailableIDs(int arg0)
             return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getAvailableIDs", "(I)[Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getTimeZone(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getTimeZone(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.TimeZone"/></returns>
@@ -102,40 +104,20 @@ public static Java.Util.TimeZone GetTimeZone(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Java.Util.TimeZone>(LocalBridgeClazz, "getTimeZone", "(Ljava/lang/String;)Ljava/util/TimeZone;", arg0);
         }
-
-        #endregion
-
-        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getDisplayName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#setDefault(java.util.TimeZone)"/>
         /// </summary>
-        public Java.Lang.String DisplayName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getDSTSavings()"/> 
-        /// </summary>
-        public int DSTSavings
-        {
-            get { return IExecuteWithSignature<int>("getDSTSavings", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getID()"/> <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#setID(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String ID
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getID", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setID", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getRawOffset()"/> <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#setRawOffset(int)"/>
-        /// </summary>
-        public int RawOffset
+        /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
+        public static void SetDefault(Java.Util.TimeZone arg0)
         {
-            get { return IExecuteWithSignature<int>("getRawOffset", "()I"); } set { IExecuteWithSignature("setRawOffset", "(I)V", value); }
+            SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljava/util/TimeZone;)V", arg0);
         }
+
+        #endregion
+
+        #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#inDaylightTime(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#inDaylightTime(java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -144,7 +126,7 @@ public bool InDaylightTime(Java.Util.Date arg0)
             return IExecuteWithSignature<bool>("inDaylightTime", "(Ljava/util/Date;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#useDaylightTime()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#useDaylightTime()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool UseDaylightTime()
@@ -152,7 +134,7 @@ public bool UseDaylightTime()
             return IExecuteWithSignature<bool>("useDaylightTime", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getOffset(int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getOffset(int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -166,7 +148,23 @@ public int GetOffset(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5)
             return IExecute<int>("getOffset", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#hasSameRules(java.util.TimeZone)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getRawOffset()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetRawOffset()
+        {
+            return IExecuteWithSignature<int>("getRawOffset", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#setRawOffset(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetRawOffset(int arg0)
+        {
+            IExecuteWithSignature("setRawOffset", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#hasSameRules(java.util.TimeZone)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -175,7 +173,7 @@ public bool HasSameRules(Java.Util.TimeZone arg0)
             return IExecuteWithSignature<bool>("hasSameRules", "(Ljava/util/TimeZone;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#observesDaylightTime()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#observesDaylightTime()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool ObservesDaylightTime()
@@ -183,7 +181,15 @@ public bool ObservesDaylightTime()
             return IExecuteWithSignature<bool>("observesDaylightTime", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getDisplayName(boolean,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getDisplayName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDisplayName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getDisplayName(boolean,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -193,7 +199,7 @@ public Java.Lang.String GetDisplayName(bool arg0, int arg1)
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getDisplayName(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getDisplayName(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -202,7 +208,15 @@ public Java.Lang.String GetDisplayName(Java.Util.Locale arg0)
             return IExecuteWithSignature<Java.Lang.String>("getDisplayName", "(Ljava/util/Locale;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getOffset(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getDSTSavings()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDSTSavings()
+        {
+            return IExecuteWithSignature<int>("getDSTSavings", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getOffset(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="int"/></returns>
@@ -211,7 +225,7 @@ public int GetOffset(long arg0)
             return IExecuteWithSignature<int>("getOffset", "(J)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#getDisplayName(boolean,int,java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getDisplayName(boolean,int,java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -222,13 +236,29 @@ public Java.Lang.String GetDisplayName(bool arg0, int arg1, Java.Util.Locale arg
             return IExecute<Java.Lang.String>("getDisplayName", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimeZone.html#toZoneId()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#getID()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetID()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getID", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#toZoneId()"/>
         /// </summary>
         /// <returns><see cref="Java.Time.ZoneId"/></returns>
         public Java.Time.ZoneId ToZoneId()
         {
             return IExecuteWithSignature<Java.Time.ZoneId>("toZoneId", "()Ljava/time/ZoneId;");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/TimeZone.html#setID(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetID(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setID", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Java/Util/Timer.cs b/src/net/Netdroid/Generated/Java/Util/Timer.cs
index 922de32d9..3951e4670 100644
--- a/src/net/Netdroid/Generated/Java/Util/Timer.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Timer.cs
@@ -30,7 +30,7 @@ public partial class Timer
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#%3Cinit%3E(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public Timer(bool arg0)
@@ -38,7 +38,7 @@ public Timer(bool arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#%3Cinit%3E(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#%3Cinit%3E(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -47,7 +47,7 @@ public Timer(Java.Lang.String arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public Timer(Java.Lang.String arg0)
@@ -71,7 +71,7 @@ public Timer(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#purge()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#purge()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Purge()
@@ -79,14 +79,14 @@ public int Purge()
             return IExecuteWithSignature<int>("purge", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#cancel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#cancel()"/>
         /// </summary>
         public void Cancel()
         {
             IExecuteWithSignature("cancel", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#schedule(java.util.TimerTask,java.util.Date,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#schedule(java.util.TimerTask,java.util.Date,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimerTask"/></param>
         /// <param name="arg1"><see cref="Java.Util.Date"/></param>
@@ -96,7 +96,7 @@ public void Schedule(Java.Util.TimerTask arg0, Java.Util.Date arg1, long arg2)
             IExecute("schedule", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#schedule(java.util.TimerTask,java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#schedule(java.util.TimerTask,java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimerTask"/></param>
         /// <param name="arg1"><see cref="Java.Util.Date"/></param>
@@ -105,7 +105,7 @@ public void Schedule(Java.Util.TimerTask arg0, Java.Util.Date arg1)
             IExecute("schedule", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#schedule(java.util.TimerTask,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#schedule(java.util.TimerTask,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimerTask"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -115,7 +115,7 @@ public void Schedule(Java.Util.TimerTask arg0, long arg1, long arg2)
             IExecute("schedule", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#schedule(java.util.TimerTask,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#schedule(java.util.TimerTask,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimerTask"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -124,7 +124,7 @@ public void Schedule(Java.Util.TimerTask arg0, long arg1)
             IExecute("schedule", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#scheduleAtFixedRate(java.util.TimerTask,java.util.Date,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#scheduleAtFixedRate(java.util.TimerTask,java.util.Date,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimerTask"/></param>
         /// <param name="arg1"><see cref="Java.Util.Date"/></param>
@@ -134,7 +134,7 @@ public void ScheduleAtFixedRate(Java.Util.TimerTask arg0, Java.Util.Date arg1, l
             IExecute("scheduleAtFixedRate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Timer.html#scheduleAtFixedRate(java.util.TimerTask,long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Timer.html#scheduleAtFixedRate(java.util.TimerTask,long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimerTask"/></param>
         /// <param name="arg1"><see cref="long"/></param>
diff --git a/src/net/Netdroid/Generated/Java/Util/TimerTask.cs b/src/net/Netdroid/Generated/Java/Util/TimerTask.cs
index 68744d59f..f7676d992 100644
--- a/src/net/Netdroid/Generated/Java/Util/TimerTask.cs
+++ b/src/net/Netdroid/Generated/Java/Util/TimerTask.cs
@@ -46,14 +46,14 @@ public partial class TimerTask
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimerTask.html#run()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimerTask.html#run()"/>
         /// </summary>
         public void Run()
         {
             IExecuteWithSignature("run", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimerTask.html#cancel()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimerTask.html#cancel()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Cancel()
@@ -61,7 +61,7 @@ public bool Cancel()
             return IExecuteWithSignature<bool>("cancel", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TimerTask.html#scheduledExecutionTime()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TimerTask.html#scheduledExecutionTime()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long ScheduledExecutionTime()
diff --git a/src/net/Netdroid/Generated/Java/Util/TreeMap.cs b/src/net/Netdroid/Generated/Java/Util/TreeMap.cs
index db909cab0..bb3d55fc2 100644
--- a/src/net/Netdroid/Generated/Java/Util/TreeMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/TreeMap.cs
@@ -30,7 +30,7 @@ public partial class TreeMap
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public TreeMap(Java.Util.Map arg0)
@@ -38,7 +38,7 @@ public TreeMap(Java.Util.Map arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#%3Cinit%3E(java.util.SortedMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#%3Cinit%3E(java.util.SortedMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedMap"/></param>
         public TreeMap(Java.Util.SortedMap arg0)
@@ -74,7 +74,7 @@ public TreeMap(Java.Util.SortedMap arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#ceilingEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#ceilingEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -83,7 +83,7 @@ public Java.Util.Map.Entry CeilingEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("ceilingEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#firstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#firstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry FirstEntry()
@@ -91,7 +91,7 @@ public Java.Util.Map.Entry FirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("firstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#floorEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#floorEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -100,7 +100,7 @@ public Java.Util.Map.Entry FloorEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("floorEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#higherEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#higherEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -109,7 +109,7 @@ public Java.Util.Map.Entry HigherEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("higherEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#lastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#lastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry LastEntry()
@@ -117,7 +117,7 @@ public Java.Util.Map.Entry LastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("lastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#lowerEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#lowerEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -126,7 +126,7 @@ public Java.Util.Map.Entry LowerEntry(object arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry>("lowerEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#pollFirstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#pollFirstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry PollFirstEntry()
@@ -134,7 +134,7 @@ public Java.Util.Map.Entry PollFirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("pollFirstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#pollLastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#pollLastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry PollLastEntry()
@@ -142,7 +142,7 @@ public Java.Util.Map.Entry PollLastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry>("pollLastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#descendingMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#descendingMap()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableMap"/></returns>
         public Java.Util.NavigableMap DescendingMap()
@@ -150,7 +150,7 @@ public Java.Util.NavigableMap DescendingMap()
             return IExecuteWithSignature<Java.Util.NavigableMap>("descendingMap", "()Ljava/util/NavigableMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#headMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#headMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -160,7 +160,7 @@ public Java.Util.NavigableMap HeadMap(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap>("headMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -172,7 +172,7 @@ public Java.Util.NavigableMap SubMap(object arg0, bool arg1, object arg2, bool a
             return IExecute<Java.Util.NavigableMap>("subMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#tailMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#tailMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -182,7 +182,7 @@ public Java.Util.NavigableMap TailMap(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap>("tailMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#descendingKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#descendingKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet DescendingKeySet()
@@ -190,7 +190,7 @@ public Java.Util.NavigableSet DescendingKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("descendingKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#navigableKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#navigableKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet NavigableKeySet()
@@ -198,7 +198,7 @@ public Java.Util.NavigableSet NavigableKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("navigableKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -207,7 +207,7 @@ public Java.Util.SortedMap HeadMap(object arg0)
             return IExecuteWithSignature<Java.Util.SortedMap>("headMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -217,7 +217,7 @@ public Java.Util.SortedMap SubMap(object arg0, object arg1)
             return IExecute<Java.Util.SortedMap>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -226,7 +226,7 @@ public Java.Util.SortedMap TailMap(object arg0)
             return IExecuteWithSignature<Java.Util.SortedMap>("tailMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#ceilingKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#ceilingKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -235,7 +235,7 @@ public object CeilingKey(object arg0)
             return IExecuteWithSignature("ceilingKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#firstKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#firstKey()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object FirstKey()
@@ -243,7 +243,7 @@ public object FirstKey()
             return IExecuteWithSignature("firstKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#floorKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#floorKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -252,7 +252,7 @@ public object FloorKey(object arg0)
             return IExecuteWithSignature("floorKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#higherKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#higherKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -261,7 +261,7 @@ public object HigherKey(object arg0)
             return IExecuteWithSignature("higherKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#lastKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#lastKey()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object LastKey()
@@ -269,7 +269,7 @@ public object LastKey()
             return IExecuteWithSignature("lastKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#lowerKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#lowerKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -293,7 +293,7 @@ public partial class TreeMap<K, V> : Java.Util.INavigableMap<K, V>, Java.Lang.IC
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public TreeMap(Java.Util.Map<K, V> arg0)
@@ -301,7 +301,7 @@ public TreeMap(Java.Util.Map<K, V> arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#%3Cinit%3E(java.util.SortedMap)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#%3Cinit%3E(java.util.SortedMap)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedMap"/></param>
         public TreeMap(Java.Util.SortedMap<K, V> arg0)
@@ -341,7 +341,7 @@ public TreeMap(Java.Util.SortedMap<K, V> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#ceilingEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#ceilingEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -350,7 +350,7 @@ public Java.Util.Map.Entry<K, V> CeilingEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("ceilingEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#firstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#firstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> FirstEntry()
@@ -358,7 +358,7 @@ public Java.Util.Map.Entry<K, V> FirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("firstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#floorEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#floorEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -367,7 +367,7 @@ public Java.Util.Map.Entry<K, V> FloorEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("floorEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#higherEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#higherEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -376,7 +376,7 @@ public Java.Util.Map.Entry<K, V> HigherEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("higherEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#lastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#lastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> LastEntry()
@@ -384,7 +384,7 @@ public Java.Util.Map.Entry<K, V> LastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("lastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#lowerEntry(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#lowerEntry(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
@@ -393,7 +393,7 @@ public Java.Util.Map.Entry<K, V> LowerEntry(K arg0)
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("lowerEntry", "(Ljava/lang/Object;)Ljava/util/Map$Entry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#pollFirstEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#pollFirstEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> PollFirstEntry()
@@ -401,7 +401,7 @@ public Java.Util.Map.Entry<K, V> PollFirstEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("pollFirstEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#pollLastEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#pollLastEntry()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Map.Entry"/></returns>
         public Java.Util.Map.Entry<K, V> PollLastEntry()
@@ -409,7 +409,7 @@ public Java.Util.Map.Entry<K, V> PollLastEntry()
             return IExecuteWithSignature<Java.Util.Map.Entry<K, V>>("pollLastEntry", "()Ljava/util/Map$Entry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#descendingMap()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#descendingMap()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableMap"/></returns>
         public Java.Util.NavigableMap<K, V> DescendingMap()
@@ -417,7 +417,7 @@ public Java.Util.NavigableMap<K, V> DescendingMap()
             return IExecuteWithSignature<Java.Util.NavigableMap<K, V>>("descendingMap", "()Ljava/util/NavigableMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#headMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#headMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -427,7 +427,7 @@ public Java.Util.NavigableMap<K, V> HeadMap(K arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap<K, V>>("headMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#subMap(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -439,7 +439,7 @@ public Java.Util.NavigableMap<K, V> SubMap(K arg0, bool arg1, K arg2, bool arg3)
             return IExecute<Java.Util.NavigableMap<K, V>>("subMap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#tailMap(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#tailMap(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -449,7 +449,7 @@ public Java.Util.NavigableMap<K, V> TailMap(K arg0, bool arg1)
             return IExecute<Java.Util.NavigableMap<K, V>>("tailMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#descendingKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#descendingKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<K> DescendingKeySet()
@@ -457,7 +457,7 @@ public Java.Util.NavigableSet<K> DescendingKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet<K>>("descendingKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#navigableKeySet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#navigableKeySet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<K> NavigableKeySet()
@@ -465,7 +465,7 @@ public Java.Util.NavigableSet<K> NavigableKeySet()
             return IExecuteWithSignature<Java.Util.NavigableSet<K>>("navigableKeySet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#headMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#headMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -474,7 +474,7 @@ public Java.Util.SortedMap<K, V> HeadMap(K arg0)
             return IExecuteWithSignature<Java.Util.SortedMap<K, V>>("headMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#subMap(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#subMap(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <param name="arg1"><typeparamref name="K"/></param>
@@ -484,7 +484,7 @@ public Java.Util.SortedMap<K, V> SubMap(K arg0, K arg1)
             return IExecute<Java.Util.SortedMap<K, V>>("subMap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#tailMap(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#tailMap(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><see cref="Java.Util.SortedMap"/></returns>
@@ -493,7 +493,7 @@ public Java.Util.SortedMap<K, V> TailMap(K arg0)
             return IExecuteWithSignature<Java.Util.SortedMap<K, V>>("tailMap", "(Ljava/lang/Object;)Ljava/util/SortedMap;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#ceilingKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#ceilingKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -502,7 +502,7 @@ public K CeilingKey(K arg0)
             return IExecuteWithSignature<K>("ceilingKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#firstKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#firstKey()"/>
         /// </summary>
         /// <returns><typeparamref name="K"/></returns>
         public K FirstKey()
@@ -510,7 +510,7 @@ public K FirstKey()
             return IExecuteWithSignature<K>("firstKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#floorKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#floorKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -519,7 +519,7 @@ public K FloorKey(K arg0)
             return IExecuteWithSignature<K>("floorKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#higherKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#higherKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
@@ -528,7 +528,7 @@ public K HigherKey(K arg0)
             return IExecuteWithSignature<K>("higherKey", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#lastKey()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#lastKey()"/>
         /// </summary>
         /// <returns><typeparamref name="K"/></returns>
         public K LastKey()
@@ -536,7 +536,7 @@ public K LastKey()
             return IExecuteWithSignature<K>("lastKey", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeMap.html#lowerKey(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeMap.html#lowerKey(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="K"/></param>
         /// <returns><typeparamref name="K"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/TreeSet.cs b/src/net/Netdroid/Generated/Java/Util/TreeSet.cs
index b5884c043..2c0f7215e 100644
--- a/src/net/Netdroid/Generated/Java/Util/TreeSet.cs
+++ b/src/net/Netdroid/Generated/Java/Util/TreeSet.cs
@@ -30,7 +30,7 @@ public partial class TreeSet
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public TreeSet(Java.Util.Collection arg0)
@@ -38,7 +38,7 @@ public TreeSet(Java.Util.Collection arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#%3Cinit%3E(java.util.SortedSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#%3Cinit%3E(java.util.SortedSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         public TreeSet(Java.Util.SortedSet arg0)
@@ -74,7 +74,7 @@ public TreeSet(Java.Util.SortedSet arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#ceiling(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#ceiling(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -83,7 +83,7 @@ public object Ceiling(object arg0)
             return IExecuteWithSignature("ceiling", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#first()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object First()
@@ -91,7 +91,7 @@ public object First()
             return IExecuteWithSignature("first", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#floor(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#floor(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -100,7 +100,7 @@ public object Floor(object arg0)
             return IExecuteWithSignature("floor", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#higher(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#higher(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -109,7 +109,7 @@ public object Higher(object arg0)
             return IExecuteWithSignature("higher", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#last()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object Last()
@@ -117,7 +117,7 @@ public object Last()
             return IExecuteWithSignature("last", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#lower(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#lower(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="object"/></returns>
@@ -126,7 +126,7 @@ public object Lower(object arg0)
             return IExecuteWithSignature("lower", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#pollFirst()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollFirst()
@@ -134,7 +134,7 @@ public object PollFirst()
             return IExecuteWithSignature("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#pollLast()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object PollLast()
@@ -142,7 +142,7 @@ public object PollLast()
             return IExecuteWithSignature("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator DescendingIterator()
@@ -150,7 +150,7 @@ public Java.Util.Iterator DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#descendingSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#descendingSet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet DescendingSet()
@@ -158,7 +158,7 @@ public Java.Util.NavigableSet DescendingSet()
             return IExecuteWithSignature<Java.Util.NavigableSet>("descendingSet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#headSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#headSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -168,7 +168,7 @@ public Java.Util.NavigableSet HeadSet(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet>("headSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -180,7 +180,7 @@ public Java.Util.NavigableSet SubSet(object arg0, bool arg1, object arg2, bool a
             return IExecute<Java.Util.NavigableSet>("subSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#tailSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#tailSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -190,7 +190,7 @@ public Java.Util.NavigableSet TailSet(object arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet>("tailSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#headSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#headSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -199,7 +199,7 @@ public Java.Util.SortedSet HeadSet(object arg0)
             return IExecuteWithSignature<Java.Util.SortedSet>("headSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#subSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#subSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -209,7 +209,7 @@ public Java.Util.SortedSet SubSet(object arg0, object arg1)
             return IExecute<Java.Util.SortedSet>("subSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#tailSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#tailSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -233,7 +233,7 @@ public partial class TreeSet<E> : Java.Util.INavigableSet<E>, Java.Lang.ICloneab
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public TreeSet(Java.Util.Collection<E> arg0)
@@ -241,7 +241,7 @@ public TreeSet(Java.Util.Collection<E> arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#%3Cinit%3E(java.util.SortedSet)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#%3Cinit%3E(java.util.SortedSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.SortedSet"/></param>
         public TreeSet(Java.Util.SortedSet<E> arg0)
@@ -281,7 +281,7 @@ public TreeSet(Java.Util.SortedSet<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#ceiling(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#ceiling(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -290,7 +290,7 @@ public E Ceiling(E arg0)
             return IExecuteWithSignature<E>("ceiling", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#first()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#first()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E First()
@@ -298,7 +298,7 @@ public E First()
             return IExecuteWithSignature<E>("first", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#floor(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#floor(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -307,7 +307,7 @@ public E Floor(E arg0)
             return IExecuteWithSignature<E>("floor", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#higher(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#higher(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -316,7 +316,7 @@ public E Higher(E arg0)
             return IExecuteWithSignature<E>("higher", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#last()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#last()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E Last()
@@ -324,7 +324,7 @@ public E Last()
             return IExecuteWithSignature<E>("last", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#lower(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#lower(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -333,7 +333,7 @@ public E Lower(E arg0)
             return IExecuteWithSignature<E>("lower", "(Ljava/lang/Object;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#pollFirst()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#pollFirst()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollFirst()
@@ -341,7 +341,7 @@ public E PollFirst()
             return IExecuteWithSignature<E>("pollFirst", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#pollLast()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#pollLast()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E PollLast()
@@ -349,7 +349,7 @@ public E PollLast()
             return IExecuteWithSignature<E>("pollLast", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#descendingIterator()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#descendingIterator()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
         public Java.Util.Iterator<E> DescendingIterator()
@@ -357,7 +357,7 @@ public Java.Util.Iterator<E> DescendingIterator()
             return IExecuteWithSignature<Java.Util.Iterator<E>>("descendingIterator", "()Ljava/util/Iterator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#descendingSet()"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#descendingSet()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.NavigableSet"/></returns>
         public Java.Util.NavigableSet<E> DescendingSet()
@@ -365,7 +365,7 @@ public Java.Util.NavigableSet<E> DescendingSet()
             return IExecuteWithSignature<Java.Util.NavigableSet<E>>("descendingSet", "()Ljava/util/NavigableSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#headSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#headSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -375,7 +375,7 @@ public Java.Util.NavigableSet<E> HeadSet(E arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet<E>>("headSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#subSet(java.lang.Object,boolean,java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -387,7 +387,7 @@ public Java.Util.NavigableSet<E> SubSet(E arg0, bool arg1, E arg2, bool arg3)
             return IExecute<Java.Util.NavigableSet<E>>("subSet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#tailSet(java.lang.Object,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#tailSet(java.lang.Object,boolean)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -397,7 +397,7 @@ public Java.Util.NavigableSet<E> TailSet(E arg0, bool arg1)
             return IExecute<Java.Util.NavigableSet<E>>("tailSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#headSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#headSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
@@ -406,7 +406,7 @@ public Java.Util.SortedSet<E> HeadSet(E arg0)
             return IExecuteWithSignature<Java.Util.SortedSet<E>>("headSet", "(Ljava/lang/Object;)Ljava/util/SortedSet;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#subSet(java.lang.Object,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#subSet(java.lang.Object,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><typeparamref name="E"/></param>
@@ -416,7 +416,7 @@ public Java.Util.SortedSet<E> SubSet(E arg0, E arg1)
             return IExecute<Java.Util.SortedSet<E>>("subSet", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/TreeSet.html#tailSet(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/TreeSet.html#tailSet(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <returns><see cref="Java.Util.SortedSet"/></returns>
diff --git a/src/net/Netdroid/Generated/Java/Util/UUID.cs b/src/net/Netdroid/Generated/Java/Util/UUID.cs
index b5dbf0817..d876f3f9e 100644
--- a/src/net/Netdroid/Generated/Java/Util/UUID.cs
+++ b/src/net/Netdroid/Generated/Java/Util/UUID.cs
@@ -30,7 +30,7 @@ public partial class UUID : Java.Io.ISerializable, Java.Lang.IComparable<Java.Ut
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#%3Cinit%3E(long,long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#%3Cinit%3E(long,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -59,7 +59,7 @@ public UUID(long arg0, long arg1)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#fromString(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#fromString(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.UUID"/></returns>
@@ -68,7 +68,7 @@ public static Java.Util.UUID FromString(Java.Lang.String arg0)
             return SExecuteWithSignature<Java.Util.UUID>(LocalBridgeClazz, "fromString", "(Ljava/lang/String;)Ljava/util/UUID;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#nameUUIDFromBytes(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#nameUUIDFromBytes(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Java.Util.UUID"/></returns>
@@ -77,7 +77,7 @@ public static Java.Util.UUID NameUUIDFromBytes(byte[] arg0)
             return SExecuteWithSignature<Java.Util.UUID>(LocalBridgeClazz, "nameUUIDFromBytes", "([B)Ljava/util/UUID;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#randomUUID()"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#randomUUID()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.UUID"/></returns>
         public static Java.Util.UUID RandomUUID()
@@ -89,21 +89,7 @@ public static Java.Util.UUID RandomUUID()
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#getLeastSignificantBits()"/> 
-        /// </summary>
-        public long LeastSignificantBits
-        {
-            get { return IExecuteWithSignature<long>("getLeastSignificantBits", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#getMostSignificantBits()"/> 
-        /// </summary>
-        public long MostSignificantBits
-        {
-            get { return IExecuteWithSignature<long>("getMostSignificantBits", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#clockSequence()"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#clockSequence()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int ClockSequence()
@@ -111,7 +97,7 @@ public int ClockSequence()
             return IExecuteWithSignature<int>("clockSequence", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#compareTo(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#compareTo(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="int"/></returns>
@@ -120,7 +106,7 @@ public int CompareTo(object arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/lang/Object;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#compareTo(java.util.UUID)"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#compareTo(java.util.UUID)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.UUID"/></param>
         /// <returns><see cref="int"/></returns>
@@ -129,7 +115,7 @@ public int CompareTo(Java.Util.UUID arg0)
             return IExecuteWithSignature<int>("compareTo", "(Ljava/util/UUID;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#variant()"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#variant()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Variant()
@@ -137,7 +123,7 @@ public int Variant()
             return IExecuteWithSignature<int>("variant", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#version()"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#version()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Version()
@@ -145,7 +131,23 @@ public int Version()
             return IExecuteWithSignature<int>("version", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#node()"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#getLeastSignificantBits()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetLeastSignificantBits()
+        {
+            return IExecuteWithSignature<long>("getLeastSignificantBits", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#getMostSignificantBits()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetMostSignificantBits()
+        {
+            return IExecuteWithSignature<long>("getMostSignificantBits", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#node()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Node()
@@ -153,7 +155,7 @@ public long Node()
             return IExecuteWithSignature<long>("node", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/UUID.html#timestamp()"/>
+        /// <see href="https://developer.android.com/reference/java/util/UUID.html#timestamp()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long Timestamp()
diff --git a/src/net/Netdroid/Generated/Java/Util/Vector.cs b/src/net/Netdroid/Generated/Java/Util/Vector.cs
index 1cfb089b4..e08fc19a8 100644
--- a/src/net/Netdroid/Generated/Java/Util/Vector.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Vector.cs
@@ -30,7 +30,7 @@ public partial class Vector
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#%3Cinit%3E(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#%3Cinit%3E(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -39,7 +39,7 @@ public Vector(int arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Vector(int arg0)
@@ -47,7 +47,7 @@ public Vector(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public Vector(Java.Util.Collection arg0)
@@ -83,7 +83,7 @@ public Vector(Java.Util.Collection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#elements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#elements()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration Elements()
@@ -91,7 +91,7 @@ public Java.Util.Enumeration Elements()
             return IExecuteWithSignature<Java.Util.Enumeration>("elements", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#removeElement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#removeElement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -100,7 +100,7 @@ public bool RemoveElement(object arg0)
             return IExecuteWithSignature<bool>("removeElement", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#elementAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#elementAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="object"/></returns>
@@ -109,7 +109,7 @@ public object ElementAt(int arg0)
             return IExecuteWithSignature("elementAt", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#firstElement()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#firstElement()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object FirstElement()
@@ -117,7 +117,7 @@ public object FirstElement()
             return IExecuteWithSignature("firstElement", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#lastElement()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#lastElement()"/>
         /// </summary>
         /// <returns><see cref="object"/></returns>
         public object LastElement()
@@ -125,7 +125,7 @@ public object LastElement()
             return IExecuteWithSignature("lastElement", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#capacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#capacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Capacity()
@@ -133,7 +133,7 @@ public int Capacity()
             return IExecuteWithSignature<int>("capacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#indexOf(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#indexOf(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -143,7 +143,7 @@ public int IndexOf(object arg0, int arg1)
             return IExecute<int>("indexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#lastIndexOf(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#lastIndexOf(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -153,7 +153,7 @@ public int LastIndexOf(object arg0, int arg1)
             return IExecute<int>("lastIndexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#addElement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#addElement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void AddElement(object arg0)
@@ -161,7 +161,7 @@ public void AddElement(object arg0)
             IExecuteWithSignature("addElement", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#copyInto(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#copyInto(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void CopyInto(object[] arg0)
@@ -169,7 +169,7 @@ public void CopyInto(object[] arg0)
             IExecuteWithSignature("copyInto", "([Ljava/lang/Object;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#ensureCapacity(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#ensureCapacity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void EnsureCapacity(int arg0)
@@ -177,7 +177,7 @@ public void EnsureCapacity(int arg0)
             IExecuteWithSignature("ensureCapacity", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#insertElementAt(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#insertElementAt(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -186,14 +186,14 @@ public void InsertElementAt(object arg0, int arg1)
             IExecute("insertElementAt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#removeAllElements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#removeAllElements()"/>
         /// </summary>
         public void RemoveAllElements()
         {
             IExecuteWithSignature("removeAllElements", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#removeElementAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#removeElementAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void RemoveElementAt(int arg0)
@@ -201,7 +201,7 @@ public void RemoveElementAt(int arg0)
             IExecuteWithSignature("removeElementAt", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#setElementAt(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#setElementAt(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -210,7 +210,7 @@ public void SetElementAt(object arg0, int arg1)
             IExecute("setElementAt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#setSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#setSize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetSize(int arg0)
@@ -218,7 +218,7 @@ public void SetSize(int arg0)
             IExecuteWithSignature("setSize", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#trimToSize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#trimToSize()"/>
         /// </summary>
         public void TrimToSize()
         {
@@ -240,7 +240,7 @@ public partial class Vector<E> : Java.Util.IList<E>, Java.Util.IRandomAccess, Ja
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#%3Cinit%3E(int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#%3Cinit%3E(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -249,7 +249,7 @@ public Vector(int arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Vector(int arg0)
@@ -257,7 +257,7 @@ public Vector(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#%3Cinit%3E(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#%3Cinit%3E(java.util.Collection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
         public Vector(Java.Util.Collection<E> arg0)
@@ -297,7 +297,7 @@ public Vector(Java.Util.Collection<E> arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#elements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#elements()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
         public Java.Util.Enumeration<E> Elements()
@@ -305,7 +305,7 @@ public Java.Util.Enumeration<E> Elements()
             return IExecuteWithSignature<Java.Util.Enumeration<E>>("elements", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#removeElement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#removeElement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -314,7 +314,7 @@ public bool RemoveElement(object arg0)
             return IExecuteWithSignature<bool>("removeElement", "(Ljava/lang/Object;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#elementAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#elementAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><typeparamref name="E"/></returns>
@@ -323,7 +323,7 @@ public E ElementAt(int arg0)
             return IExecuteWithSignature<E>("elementAt", "(I)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#firstElement()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#firstElement()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E FirstElement()
@@ -331,7 +331,7 @@ public E FirstElement()
             return IExecuteWithSignature<E>("firstElement", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#lastElement()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#lastElement()"/>
         /// </summary>
         /// <returns><typeparamref name="E"/></returns>
         public E LastElement()
@@ -339,7 +339,7 @@ public E LastElement()
             return IExecuteWithSignature<E>("lastElement", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#capacity()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#capacity()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Capacity()
@@ -347,7 +347,7 @@ public int Capacity()
             return IExecuteWithSignature<int>("capacity", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#indexOf(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#indexOf(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -357,7 +357,7 @@ public int IndexOf(object arg0, int arg1)
             return IExecute<int>("indexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#lastIndexOf(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#lastIndexOf(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -367,7 +367,7 @@ public int LastIndexOf(object arg0, int arg1)
             return IExecute<int>("lastIndexOf", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#addElement(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#addElement(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         public void AddElement(E arg0)
@@ -375,7 +375,7 @@ public void AddElement(E arg0)
             IExecuteWithSignature("addElement", "(Ljava/lang/Object;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#copyInto(java.lang.Object[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#copyInto(java.lang.Object[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         public void CopyInto(object[] arg0)
@@ -383,7 +383,7 @@ public void CopyInto(object[] arg0)
             IExecuteWithSignature("copyInto", "([Ljava/lang/Object;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#ensureCapacity(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#ensureCapacity(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void EnsureCapacity(int arg0)
@@ -391,7 +391,7 @@ public void EnsureCapacity(int arg0)
             IExecuteWithSignature("ensureCapacity", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#insertElementAt(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#insertElementAt(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -400,14 +400,14 @@ public void InsertElementAt(E arg0, int arg1)
             IExecute("insertElementAt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#removeAllElements()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#removeAllElements()"/>
         /// </summary>
         public void RemoveAllElements()
         {
             IExecuteWithSignature("removeAllElements", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#removeElementAt(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#removeElementAt(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void RemoveElementAt(int arg0)
@@ -415,7 +415,7 @@ public void RemoveElementAt(int arg0)
             IExecuteWithSignature("removeElementAt", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#setElementAt(java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#setElementAt(java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><typeparamref name="E"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -424,7 +424,7 @@ public void SetElementAt(E arg0, int arg1)
             IExecute("setElementAt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#setSize(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#setSize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetSize(int arg0)
@@ -432,7 +432,7 @@ public void SetSize(int arg0)
             IExecuteWithSignature("setSize", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/Vector.html#trimToSize()"/>
+        /// <see href="https://developer.android.com/reference/java/util/Vector.html#trimToSize()"/>
         /// </summary>
         public void TrimToSize()
         {
diff --git a/src/net/Netdroid/Generated/Java/Util/WeakHashMap.cs b/src/net/Netdroid/Generated/Java/Util/WeakHashMap.cs
index 991857524..f3f2be5d4 100644
--- a/src/net/Netdroid/Generated/Java/Util/WeakHashMap.cs
+++ b/src/net/Netdroid/Generated/Java/Util/WeakHashMap.cs
@@ -30,7 +30,7 @@ public partial class WeakHashMap
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/WeakHashMap.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/WeakHashMap.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -39,7 +39,7 @@ public WeakHashMap(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/WeakHashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/WeakHashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public WeakHashMap(int arg0)
@@ -47,7 +47,7 @@ public WeakHashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/WeakHashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/WeakHashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public WeakHashMap(Java.Util.Map arg0)
@@ -86,7 +86,7 @@ public partial class WeakHashMap<K, V>
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/WeakHashMap.html#%3Cinit%3E(int,float)"/>
+        /// <see href="https://developer.android.com/reference/java/util/WeakHashMap.html#%3Cinit%3E(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -95,7 +95,7 @@ public WeakHashMap(int arg0, float arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/WeakHashMap.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/WeakHashMap.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public WeakHashMap(int arg0)
@@ -103,7 +103,7 @@ public WeakHashMap(int arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/WeakHashMap.html#%3Cinit%3E(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/java/util/WeakHashMap.html#%3Cinit%3E(java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Map"/></param>
         public WeakHashMap(Java.Util.Map<K, V> arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/Adler32.cs b/src/net/Netdroid/Generated/Java/Util/Zip/Adler32.cs
index 2658b6f60..ca93e0415 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/Adler32.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/Adler32.cs
@@ -46,21 +46,22 @@ public partial class Adler32
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Adler32.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/Adler32.html#getValue()"/>
         /// </summary>
-        public long Value
+        /// <returns><see cref="long"/></returns>
+        public long GetValue()
         {
-            get { return IExecuteWithSignature<long>("getValue", "()J"); }
+            return IExecuteWithSignature<long>("getValue", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Adler32.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Adler32.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Adler32.html#update(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Adler32.html#update(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -70,7 +71,7 @@ public void Update(byte[] arg0, int arg1, int arg2)
             IExecute("update", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Adler32.html#update(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Adler32.html#update(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Update(int arg0)
@@ -78,7 +79,7 @@ public void Update(int arg0)
             IExecuteWithSignature("update", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Adler32.html#update(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Adler32.html#update(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void Update(Java.Nio.ByteBuffer arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/AllPackageClasses.cs b/src/net/Netdroid/Generated/Java/Util/Zip/AllPackageClasses.cs
index f7f332834..6be08b80c 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Java.Util.Zip
 {
     #region Adler32
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Adler32.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/Adler32.html"/>
     /// </summary>
     public partial class Adler32 : Java.Util.Zip.Checksum
     {
@@ -72,7 +72,7 @@ public Adler32(params object[] args) : base(args) { }
 
     #region CheckedInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CheckedInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/CheckedInputStream.html"/>
     /// </summary>
     public partial class CheckedInputStream : Java.Io.FilterInputStream
     {
@@ -116,7 +116,7 @@ public CheckedInputStream(params object[] args) : base(args) { }
 
     #region CheckedOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CheckedOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/CheckedOutputStream.html"/>
     /// </summary>
     public partial class CheckedOutputStream : Java.Io.FilterOutputStream
     {
@@ -160,7 +160,7 @@ public CheckedOutputStream(params object[] args) : base(args) { }
 
     #region Checksum
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Checksum.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/Checksum.html"/>
     /// </summary>
     public partial class Checksum : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Checksum>
     {
@@ -168,12 +168,12 @@ public partial class Checksum : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Checksum
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Checksum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Checksum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Checksum() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Checksum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Checksum class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Checksum(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -206,7 +206,7 @@ public Checksum(params object[] args) : base(args) { }
 
     #region CRC32
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/CRC32.html"/>
     /// </summary>
     public partial class CRC32 : Java.Util.Zip.Checksum
     {
@@ -250,7 +250,7 @@ public CRC32(params object[] args) : base(args) { }
 
     #region CRC32C
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32C.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/CRC32C.html"/>
     /// </summary>
     public partial class CRC32C : Java.Util.Zip.Checksum
     {
@@ -294,7 +294,7 @@ public CRC32C(params object[] args) : base(args) { }
 
     #region DataFormatException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DataFormatException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/DataFormatException.html"/>
     /// </summary>
     public partial class DataFormatException : Java.Lang.Exception
     {
@@ -311,7 +311,7 @@ public partial class DataFormatException : Java.Lang.Exception
 
     #region Deflater
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html"/>
     /// </summary>
     public partial class Deflater : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Deflater>
     {
@@ -355,7 +355,7 @@ public Deflater(params object[] args) : base(args) { }
 
     #region DeflaterInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterInputStream.html"/>
     /// </summary>
     public partial class DeflaterInputStream : Java.Io.FilterInputStream
     {
@@ -399,7 +399,7 @@ public DeflaterInputStream(params object[] args) : base(args) { }
 
     #region DeflaterOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html"/>
     /// </summary>
     public partial class DeflaterOutputStream : Java.Io.FilterOutputStream
     {
@@ -443,7 +443,7 @@ public DeflaterOutputStream(params object[] args) : base(args) { }
 
     #region GZIPInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/GZIPInputStream.html"/>
     /// </summary>
     public partial class GZIPInputStream : Java.Util.Zip.InflaterInputStream
     {
@@ -487,7 +487,7 @@ public GZIPInputStream(params object[] args) : base(args) { }
 
     #region GZIPOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream.html"/>
     /// </summary>
     public partial class GZIPOutputStream : Java.Util.Zip.DeflaterOutputStream
     {
@@ -531,7 +531,7 @@ public GZIPOutputStream(params object[] args) : base(args) { }
 
     #region Inflater
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html"/>
     /// </summary>
     public partial class Inflater : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Inflater>
     {
@@ -575,7 +575,7 @@ public Inflater(params object[] args) : base(args) { }
 
     #region InflaterInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/InflaterInputStream.html"/>
     /// </summary>
     public partial class InflaterInputStream : Java.Io.FilterInputStream
     {
@@ -619,7 +619,7 @@ public InflaterInputStream(params object[] args) : base(args) { }
 
     #region InflaterOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream.html"/>
     /// </summary>
     public partial class InflaterOutputStream : Java.Io.FilterOutputStream
     {
@@ -663,7 +663,7 @@ public InflaterOutputStream(params object[] args) : base(args) { }
 
     #region ZipEntry
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html"/>
     /// </summary>
     public partial class ZipEntry : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ZipEntry>
     {
@@ -707,7 +707,7 @@ public ZipEntry(params object[] args) : base(args) { }
 
     #region ZipError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipError.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/ZipError.html"/>
     /// </summary>
     public partial class ZipError : Java.Lang.InternalError
     {
@@ -724,7 +724,7 @@ public partial class ZipError : Java.Lang.InternalError
 
     #region ZipException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipException.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/ZipException.html"/>
     /// </summary>
     public partial class ZipException : Java.Io.IOException
     {
@@ -741,7 +741,7 @@ public partial class ZipException : Java.Io.IOException
 
     #region ZipFile
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html"/>
     /// </summary>
     public partial class ZipFile : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ZipFile>
     {
@@ -785,7 +785,7 @@ public ZipFile(params object[] args) : base(args) { }
 
     #region ZipInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/ZipInputStream.html"/>
     /// </summary>
     public partial class ZipInputStream : Java.Util.Zip.InflaterInputStream
     {
@@ -829,7 +829,7 @@ public ZipInputStream(params object[] args) : base(args) { }
 
     #region ZipOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html"/>
     /// </summary>
     public partial class ZipOutputStream : Java.Util.Zip.DeflaterOutputStream
     {
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/CRC32.cs b/src/net/Netdroid/Generated/Java/Util/Zip/CRC32.cs
index cf9a11271..7502640b1 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/CRC32.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/CRC32.cs
@@ -46,21 +46,22 @@ public partial class CRC32
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32.html#getValue()"/>
         /// </summary>
-        public long Value
+        /// <returns><see cref="long"/></returns>
+        public long GetValue()
         {
-            get { return IExecuteWithSignature<long>("getValue", "()J"); }
+            return IExecuteWithSignature<long>("getValue", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32.html#update(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32.html#update(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -70,7 +71,7 @@ public void Update(byte[] arg0, int arg1, int arg2)
             IExecute("update", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32.html#update(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32.html#update(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Update(int arg0)
@@ -78,7 +79,7 @@ public void Update(int arg0)
             IExecuteWithSignature("update", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32.html#update(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32.html#update(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void Update(Java.Nio.ByteBuffer arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/CRC32C.cs b/src/net/Netdroid/Generated/Java/Util/Zip/CRC32C.cs
index b51e0b7bc..60bbb253e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/CRC32C.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/CRC32C.cs
@@ -46,21 +46,22 @@ public partial class CRC32C
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32C.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32C.html#getValue()"/>
         /// </summary>
-        public long Value
+        /// <returns><see cref="long"/></returns>
+        public long GetValue()
         {
-            get { return IExecuteWithSignature<long>("getValue", "()J"); }
+            return IExecuteWithSignature<long>("getValue", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32C.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32C.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32C.html#update(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32C.html#update(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -70,7 +71,7 @@ public void Update(byte[] arg0, int arg1, int arg2)
             IExecute("update", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32C.html#update(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32C.html#update(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Update(int arg0)
@@ -78,7 +79,7 @@ public void Update(int arg0)
             IExecuteWithSignature("update", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CRC32C.html#update(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CRC32C.html#update(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void Update(Java.Nio.ByteBuffer arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/CheckedInputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/CheckedInputStream.cs
index 4a0948723..b7e2b884b 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/CheckedInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/CheckedInputStream.cs
@@ -30,7 +30,7 @@ public partial class CheckedInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CheckedInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Checksum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CheckedInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Checksum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Checksum"/></param>
@@ -55,11 +55,12 @@ public CheckedInputStream(Java.Io.InputStream arg0, Java.Util.Zip.Checksum arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CheckedInputStream.html#getChecksum()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/CheckedInputStream.html#getChecksum()"/>
         /// </summary>
-        public Java.Util.Zip.Checksum Checksum
+        /// <returns><see cref="Java.Util.Zip.Checksum"/></returns>
+        public Java.Util.Zip.Checksum GetChecksum()
         {
-            get { return IExecuteWithSignature<Java.Util.Zip.Checksum>("getChecksum", "()Ljava/util/zip/Checksum;"); }
+            return IExecuteWithSignature<Java.Util.Zip.Checksum>("getChecksum", "()Ljava/util/zip/Checksum;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/CheckedOutputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/CheckedOutputStream.cs
index 359684f18..90f387569 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/CheckedOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/CheckedOutputStream.cs
@@ -30,7 +30,7 @@ public partial class CheckedOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CheckedOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Checksum)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/CheckedOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Checksum)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Checksum"/></param>
@@ -55,11 +55,12 @@ public CheckedOutputStream(Java.Io.OutputStream arg0, Java.Util.Zip.Checksum arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/CheckedOutputStream.html#getChecksum()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/CheckedOutputStream.html#getChecksum()"/>
         /// </summary>
-        public Java.Util.Zip.Checksum Checksum
+        /// <returns><see cref="Java.Util.Zip.Checksum"/></returns>
+        public Java.Util.Zip.Checksum GetChecksum()
         {
-            get { return IExecuteWithSignature<Java.Util.Zip.Checksum>("getChecksum", "()Ljava/util/zip/Checksum;"); }
+            return IExecuteWithSignature<Java.Util.Zip.Checksum>("getChecksum", "()Ljava/util/zip/Checksum;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/Checksum.cs b/src/net/Netdroid/Generated/Java/Util/Zip/Checksum.cs
index a33497fe0..1f2c6aa61 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/Checksum.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/Checksum.cs
@@ -64,21 +64,22 @@ public partial class Checksum : Java.Util.Zip.IChecksum
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Checksum.html#getValue()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/Checksum.html#getValue()"/>
         /// </summary>
-        public long Value
+        /// <returns><see cref="long"/></returns>
+        public long GetValue()
         {
-            get { return IExecuteWithSignature<long>("getValue", "()J"); }
+            return IExecuteWithSignature<long>("getValue", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Checksum.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Checksum.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Checksum.html#update(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Checksum.html#update(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -88,7 +89,7 @@ public void Update(byte[] arg0, int arg1, int arg2)
             IExecute("update", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Checksum.html#update(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Checksum.html#update(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Update(int arg0)
@@ -96,7 +97,7 @@ public void Update(int arg0)
             IExecuteWithSignature("update", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Checksum.html#update(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Checksum.html#update(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void Update(byte[] arg0)
@@ -104,7 +105,7 @@ public void Update(byte[] arg0)
             IExecuteWithSignature("update", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Checksum.html#update(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Checksum.html#update(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void Update(Java.Nio.ByteBuffer arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/Deflater.cs b/src/net/Netdroid/Generated/Java/Util/Zip/Deflater.cs
index d7137bdcf..41efbbdd1 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/Deflater.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/Deflater.cs
@@ -30,7 +30,7 @@ public partial class Deflater
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#%3Cinit%3E(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#%3Cinit%3E(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -39,7 +39,7 @@ public Deflater(int arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public Deflater(int arg0)
@@ -55,67 +55,67 @@ public Deflater(int arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#BEST_COMPRESSION"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#BEST_COMPRESSION"/>
         /// </summary>
         public static int BEST_COMPRESSION { get { if (!_BEST_COMPRESSIONReady) { _BEST_COMPRESSIONContent = SGetField<int>(LocalBridgeClazz, "BEST_COMPRESSION"); _BEST_COMPRESSIONReady = true; } return _BEST_COMPRESSIONContent; } }
         private static int _BEST_COMPRESSIONContent = default;
         private static bool _BEST_COMPRESSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#BEST_SPEED"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#BEST_SPEED"/>
         /// </summary>
         public static int BEST_SPEED { get { if (!_BEST_SPEEDReady) { _BEST_SPEEDContent = SGetField<int>(LocalBridgeClazz, "BEST_SPEED"); _BEST_SPEEDReady = true; } return _BEST_SPEEDContent; } }
         private static int _BEST_SPEEDContent = default;
         private static bool _BEST_SPEEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#DEFAULT_COMPRESSION"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#DEFAULT_COMPRESSION"/>
         /// </summary>
         public static int DEFAULT_COMPRESSION { get { if (!_DEFAULT_COMPRESSIONReady) { _DEFAULT_COMPRESSIONContent = SGetField<int>(LocalBridgeClazz, "DEFAULT_COMPRESSION"); _DEFAULT_COMPRESSIONReady = true; } return _DEFAULT_COMPRESSIONContent; } }
         private static int _DEFAULT_COMPRESSIONContent = default;
         private static bool _DEFAULT_COMPRESSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#DEFAULT_STRATEGY"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#DEFAULT_STRATEGY"/>
         /// </summary>
         public static int DEFAULT_STRATEGY { get { if (!_DEFAULT_STRATEGYReady) { _DEFAULT_STRATEGYContent = SGetField<int>(LocalBridgeClazz, "DEFAULT_STRATEGY"); _DEFAULT_STRATEGYReady = true; } return _DEFAULT_STRATEGYContent; } }
         private static int _DEFAULT_STRATEGYContent = default;
         private static bool _DEFAULT_STRATEGYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#DEFLATED"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#DEFLATED"/>
         /// </summary>
         public static int DEFLATED { get { if (!_DEFLATEDReady) { _DEFLATEDContent = SGetField<int>(LocalBridgeClazz, "DEFLATED"); _DEFLATEDReady = true; } return _DEFLATEDContent; } }
         private static int _DEFLATEDContent = default;
         private static bool _DEFLATEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#FILTERED"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#FILTERED"/>
         /// </summary>
         public static int FILTERED { get { if (!_FILTEREDReady) { _FILTEREDContent = SGetField<int>(LocalBridgeClazz, "FILTERED"); _FILTEREDReady = true; } return _FILTEREDContent; } }
         private static int _FILTEREDContent = default;
         private static bool _FILTEREDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#FULL_FLUSH"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#FULL_FLUSH"/>
         /// </summary>
         public static int FULL_FLUSH { get { if (!_FULL_FLUSHReady) { _FULL_FLUSHContent = SGetField<int>(LocalBridgeClazz, "FULL_FLUSH"); _FULL_FLUSHReady = true; } return _FULL_FLUSHContent; } }
         private static int _FULL_FLUSHContent = default;
         private static bool _FULL_FLUSHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#HUFFMAN_ONLY"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#HUFFMAN_ONLY"/>
         /// </summary>
         public static int HUFFMAN_ONLY { get { if (!_HUFFMAN_ONLYReady) { _HUFFMAN_ONLYContent = SGetField<int>(LocalBridgeClazz, "HUFFMAN_ONLY"); _HUFFMAN_ONLYReady = true; } return _HUFFMAN_ONLYContent; } }
         private static int _HUFFMAN_ONLYContent = default;
         private static bool _HUFFMAN_ONLYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#NO_COMPRESSION"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#NO_COMPRESSION"/>
         /// </summary>
         public static int NO_COMPRESSION { get { if (!_NO_COMPRESSIONReady) { _NO_COMPRESSIONContent = SGetField<int>(LocalBridgeClazz, "NO_COMPRESSION"); _NO_COMPRESSIONReady = true; } return _NO_COMPRESSIONContent; } }
         private static int _NO_COMPRESSIONContent = default;
         private static bool _NO_COMPRESSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#NO_FLUSH"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#NO_FLUSH"/>
         /// </summary>
         public static int NO_FLUSH { get { if (!_NO_FLUSHReady) { _NO_FLUSHContent = SGetField<int>(LocalBridgeClazz, "NO_FLUSH"); _NO_FLUSHReady = true; } return _NO_FLUSHContent; } }
         private static int _NO_FLUSHContent = default;
         private static bool _NO_FLUSHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#SYNC_FLUSH"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#SYNC_FLUSH"/>
         /// </summary>
         public static int SYNC_FLUSH { get { if (!_SYNC_FLUSHReady) { _SYNC_FLUSHContent = SGetField<int>(LocalBridgeClazz, "SYNC_FLUSH"); _SYNC_FLUSHReady = true; } return _SYNC_FLUSHContent; } }
         private static int _SYNC_FLUSHContent = default;
@@ -129,42 +129,7 @@ public Deflater(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#getAdler()"/> 
-        /// </summary>
-        public int Adler
-        {
-            get { return IExecuteWithSignature<int>("getAdler", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#getBytesRead()"/> 
-        /// </summary>
-        public long BytesRead
-        {
-            get { return IExecuteWithSignature<long>("getBytesRead", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#getBytesWritten()"/> 
-        /// </summary>
-        public long BytesWritten
-        {
-            get { return IExecuteWithSignature<long>("getBytesWritten", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#getTotalIn()"/> 
-        /// </summary>
-        public int TotalIn
-        {
-            get { return IExecuteWithSignature<int>("getTotalIn", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#getTotalOut()"/> 
-        /// </summary>
-        public int TotalOut
-        {
-            get { return IExecuteWithSignature<int>("getTotalOut", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#finished()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#finished()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool Finished()
@@ -172,7 +137,7 @@ public bool Finished()
             return IExecuteWithSignature<bool>("finished", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#needsInput()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#needsInput()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool NeedsInput()
@@ -180,7 +145,7 @@ public bool NeedsInput()
             return IExecuteWithSignature<bool>("needsInput", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#deflate(byte[],int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#deflate(byte[],int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -192,7 +157,7 @@ public int Deflate(byte[] arg0, int arg1, int arg2, int arg3)
             return IExecute<int>("deflate", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#deflate(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#deflate(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -203,7 +168,7 @@ public int Deflate(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("deflate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#deflate(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#deflate(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -212,7 +177,7 @@ public int Deflate(byte[] arg0)
             return IExecuteWithSignature<int>("deflate", "([B)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#deflate(java.nio.ByteBuffer,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#deflate(java.nio.ByteBuffer,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -222,7 +187,7 @@ public int Deflate(Java.Nio.ByteBuffer arg0, int arg1)
             return IExecute<int>("deflate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#deflate(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#deflate(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -231,28 +196,68 @@ public int Deflate(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("deflate", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#end()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#getAdler()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAdler()
+        {
+            return IExecuteWithSignature<int>("getAdler", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#getTotalIn()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalIn()
+        {
+            return IExecuteWithSignature<int>("getTotalIn", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#getTotalOut()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalOut()
+        {
+            return IExecuteWithSignature<int>("getTotalOut", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#getBytesRead()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetBytesRead()
+        {
+            return IExecuteWithSignature<long>("getBytesRead", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#getBytesWritten()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetBytesWritten()
+        {
+            return IExecuteWithSignature<long>("getBytesWritten", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#end()"/>
         /// </summary>
         public void End()
         {
             IExecuteWithSignature("end", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#finish()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#finish()"/>
         /// </summary>
         public void Finish()
         {
             IExecuteWithSignature("finish", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#setDictionary(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#setDictionary(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -262,7 +267,7 @@ public void SetDictionary(byte[] arg0, int arg1, int arg2)
             IExecute("setDictionary", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#setDictionary(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#setDictionary(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void SetDictionary(byte[] arg0)
@@ -270,7 +275,7 @@ public void SetDictionary(byte[] arg0)
             IExecuteWithSignature("setDictionary", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#setDictionary(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#setDictionary(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void SetDictionary(Java.Nio.ByteBuffer arg0)
@@ -278,7 +283,7 @@ public void SetDictionary(Java.Nio.ByteBuffer arg0)
             IExecuteWithSignature("setDictionary", "(Ljava/nio/ByteBuffer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#setInput(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#setInput(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -288,7 +293,7 @@ public void SetInput(byte[] arg0, int arg1, int arg2)
             IExecute("setInput", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#setInput(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#setInput(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void SetInput(byte[] arg0)
@@ -296,7 +301,7 @@ public void SetInput(byte[] arg0)
             IExecuteWithSignature("setInput", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#setInput(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#setInput(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void SetInput(Java.Nio.ByteBuffer arg0)
@@ -304,7 +309,7 @@ public void SetInput(Java.Nio.ByteBuffer arg0)
             IExecuteWithSignature("setInput", "(Ljava/nio/ByteBuffer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#setLevel(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#setLevel(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetLevel(int arg0)
@@ -312,7 +317,7 @@ public void SetLevel(int arg0)
             IExecuteWithSignature("setLevel", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Deflater.html#setStrategy(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Deflater.html#setStrategy(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetStrategy(int arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/DeflaterInputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/DeflaterInputStream.cs
index 163432740..92cf4c77e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/DeflaterInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/DeflaterInputStream.cs
@@ -30,7 +30,7 @@ public partial class DeflaterInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Deflater,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Deflater,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Deflater"/></param>
@@ -40,7 +40,7 @@ public DeflaterInputStream(Java.Io.InputStream arg0, Java.Util.Zip.Deflater arg1
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Deflater)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Deflater)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Deflater"/></param>
@@ -49,7 +49,7 @@ public DeflaterInputStream(Java.Io.InputStream arg0, Java.Util.Zip.Deflater arg1
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public DeflaterInputStream(Java.Io.InputStream arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/DeflaterOutputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/DeflaterOutputStream.cs
index 91ccf0038..9e42beae1 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/DeflaterOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/DeflaterOutputStream.cs
@@ -30,7 +30,7 @@ public partial class DeflaterOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -39,7 +39,7 @@ public DeflaterOutputStream(Java.Io.OutputStream arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Deflater,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Deflater,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Deflater"/></param>
@@ -49,7 +49,7 @@ public DeflaterOutputStream(Java.Io.OutputStream arg0, Java.Util.Zip.Deflater ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Deflater,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Deflater,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Deflater"/></param>
@@ -60,7 +60,7 @@ public DeflaterOutputStream(Java.Io.OutputStream arg0, Java.Util.Zip.Deflater ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Deflater,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Deflater,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Deflater"/></param>
@@ -70,7 +70,7 @@ public DeflaterOutputStream(Java.Io.OutputStream arg0, Java.Util.Zip.Deflater ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Deflater)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Deflater)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Deflater"/></param>
@@ -79,7 +79,7 @@ public DeflaterOutputStream(Java.Io.OutputStream arg0, Java.Util.Zip.Deflater ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public DeflaterOutputStream(Java.Io.OutputStream arg0)
@@ -103,7 +103,7 @@ public DeflaterOutputStream(Java.Io.OutputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/DeflaterOutputStream.html#finish()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/DeflaterOutputStream.html#finish()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Finish()
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/GZIPInputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/GZIPInputStream.cs
index 1547f7f59..1fbdd5cc5 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/GZIPInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/GZIPInputStream.cs
@@ -30,7 +30,7 @@ public partial class GZIPInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPInputStream.html#%3Cinit%3E(java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/GZIPInputStream.html#%3Cinit%3E(java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public GZIPInputStream(Java.Io.InputStream arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/GZIPInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -57,7 +57,7 @@ public GZIPInputStream(Java.Io.InputStream arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPInputStream.html#GZIP_MAGIC"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/GZIPInputStream.html#GZIP_MAGIC"/>
         /// </summary>
         public static int GZIP_MAGIC { get { if (!_GZIP_MAGICReady) { _GZIP_MAGICContent = SGetField<int>(LocalBridgeClazz, "GZIP_MAGIC"); _GZIP_MAGICReady = true; } return _GZIP_MAGICContent; } }
         private static int _GZIP_MAGICContent = default;
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/GZIPOutputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/GZIPOutputStream.cs
index 403788482..bdec1a20e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/GZIPOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/GZIPOutputStream.cs
@@ -30,7 +30,7 @@ public partial class GZIPOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPOutputStream.html#%3Cinit%3E(java.io.OutputStream,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream.html#%3Cinit%3E(java.io.OutputStream,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -40,7 +40,7 @@ public GZIPOutputStream(Java.Io.OutputStream arg0, bool arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPOutputStream.html#%3Cinit%3E(java.io.OutputStream,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream.html#%3Cinit%3E(java.io.OutputStream,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -51,7 +51,7 @@ public GZIPOutputStream(Java.Io.OutputStream arg0, int arg1, bool arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPOutputStream.html#%3Cinit%3E(java.io.OutputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream.html#%3Cinit%3E(java.io.OutputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -61,7 +61,7 @@ public GZIPOutputStream(Java.Io.OutputStream arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/GZIPOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/GZIPOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/Inflater.cs b/src/net/Netdroid/Generated/Java/Util/Zip/Inflater.cs
index 46638ecb3..fc8c436f8 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/Inflater.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/Inflater.cs
@@ -30,7 +30,7 @@ public partial class Inflater
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#%3Cinit%3E(boolean)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#%3Cinit%3E(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public Inflater(bool arg0)
@@ -54,73 +54,63 @@ public Inflater(bool arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#getAdler()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#finished()"/>
         /// </summary>
-        public int Adler
-        {
-            get { return IExecuteWithSignature<int>("getAdler", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#getBytesRead()"/> 
-        /// </summary>
-        public long BytesRead
-        {
-            get { return IExecuteWithSignature<long>("getBytesRead", "()J"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#getBytesWritten()"/> 
-        /// </summary>
-        public long BytesWritten
+        /// <returns><see cref="bool"/></returns>
+        public bool Finished()
         {
-            get { return IExecuteWithSignature<long>("getBytesWritten", "()J"); }
+            return IExecuteWithSignature<bool>("finished", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#getRemaining()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#needsDictionary()"/>
         /// </summary>
-        public int Remaining
+        /// <returns><see cref="bool"/></returns>
+        public bool NeedsDictionary()
         {
-            get { return IExecuteWithSignature<int>("getRemaining", "()I"); }
+            return IExecuteWithSignature<bool>("needsDictionary", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#getTotalIn()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#needsInput()"/>
         /// </summary>
-        public int TotalIn
+        /// <returns><see cref="bool"/></returns>
+        public bool NeedsInput()
         {
-            get { return IExecuteWithSignature<int>("getTotalIn", "()I"); }
+            return IExecuteWithSignature<bool>("needsInput", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#getTotalOut()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#getAdler()"/>
         /// </summary>
-        public int TotalOut
+        /// <returns><see cref="int"/></returns>
+        public int GetAdler()
         {
-            get { return IExecuteWithSignature<int>("getTotalOut", "()I"); }
+            return IExecuteWithSignature<int>("getAdler", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#finished()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#getRemaining()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool Finished()
+        /// <returns><see cref="int"/></returns>
+        public int GetRemaining()
         {
-            return IExecuteWithSignature<bool>("finished", "()Z");
+            return IExecuteWithSignature<int>("getRemaining", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#needsDictionary()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#getTotalIn()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool NeedsDictionary()
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalIn()
         {
-            return IExecuteWithSignature<bool>("needsDictionary", "()Z");
+            return IExecuteWithSignature<int>("getTotalIn", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#needsInput()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#getTotalOut()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool NeedsInput()
+        /// <returns><see cref="int"/></returns>
+        public int GetTotalOut()
         {
-            return IExecuteWithSignature<bool>("needsInput", "()Z");
+            return IExecuteWithSignature<int>("getTotalOut", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#inflate(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#inflate(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -132,7 +122,7 @@ public int Inflate(byte[] arg0, int arg1, int arg2)
             return IExecute<int>("inflate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#inflate(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#inflate(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -142,7 +132,7 @@ public int Inflate(byte[] arg0)
             return IExecuteWithSignature<int>("inflate", "([B)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#inflate(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#inflate(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <returns><see cref="int"/></returns>
@@ -152,21 +142,37 @@ public int Inflate(Java.Nio.ByteBuffer arg0)
             return IExecuteWithSignature<int>("inflate", "(Ljava/nio/ByteBuffer;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#end()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#getBytesRead()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetBytesRead()
+        {
+            return IExecuteWithSignature<long>("getBytesRead", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#getBytesWritten()"/>
+        /// </summary>
+        /// <returns><see cref="long"/></returns>
+        public long GetBytesWritten()
+        {
+            return IExecuteWithSignature<long>("getBytesWritten", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#end()"/>
         /// </summary>
         public void End()
         {
             IExecuteWithSignature("end", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#setDictionary(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#setDictionary(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -176,7 +182,7 @@ public void SetDictionary(byte[] arg0, int arg1, int arg2)
             IExecute("setDictionary", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#setDictionary(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#setDictionary(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void SetDictionary(byte[] arg0)
@@ -184,7 +190,7 @@ public void SetDictionary(byte[] arg0)
             IExecuteWithSignature("setDictionary", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#setDictionary(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#setDictionary(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void SetDictionary(Java.Nio.ByteBuffer arg0)
@@ -192,7 +198,7 @@ public void SetDictionary(Java.Nio.ByteBuffer arg0)
             IExecuteWithSignature("setDictionary", "(Ljava/nio/ByteBuffer;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#setInput(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#setInput(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -202,7 +208,7 @@ public void SetInput(byte[] arg0, int arg1, int arg2)
             IExecute("setInput", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#setInput(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#setInput(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void SetInput(byte[] arg0)
@@ -210,7 +216,7 @@ public void SetInput(byte[] arg0)
             IExecuteWithSignature("setInput", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/Inflater.html#setInput(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/Inflater.html#setInput(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void SetInput(Java.Nio.ByteBuffer arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/InflaterInputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/InflaterInputStream.cs
index 4bd9a319a..3213b753d 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/InflaterInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/InflaterInputStream.cs
@@ -30,7 +30,7 @@ public partial class InflaterInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Inflater,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/InflaterInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Inflater,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Inflater"/></param>
@@ -40,7 +40,7 @@ public InflaterInputStream(Java.Io.InputStream arg0, Java.Util.Zip.Inflater arg1
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Inflater)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/InflaterInputStream.html#%3Cinit%3E(java.io.InputStream,java.util.zip.Inflater)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Inflater"/></param>
@@ -49,7 +49,7 @@ public InflaterInputStream(Java.Io.InputStream arg0, Java.Util.Zip.Inflater arg1
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/InflaterInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public InflaterInputStream(Java.Io.InputStream arg0)
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/InflaterOutputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/InflaterOutputStream.cs
index 9434b75ad..3e7e6d215 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/InflaterOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/InflaterOutputStream.cs
@@ -30,7 +30,7 @@ public partial class InflaterOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Inflater,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Inflater,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Inflater"/></param>
@@ -40,7 +40,7 @@ public InflaterOutputStream(Java.Io.OutputStream arg0, Java.Util.Zip.Inflater ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Inflater)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.util.zip.Inflater)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Util.Zip.Inflater"/></param>
@@ -49,7 +49,7 @@ public InflaterOutputStream(Java.Io.OutputStream arg0, Java.Util.Zip.Inflater ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public InflaterOutputStream(Java.Io.OutputStream arg0)
@@ -73,7 +73,7 @@ public InflaterOutputStream(Java.Io.OutputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/InflaterOutputStream.html#finish()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/InflaterOutputStream.html#finish()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Finish()
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/ZipEntry.cs b/src/net/Netdroid/Generated/Java/Util/Zip/ZipEntry.cs
index 40715de9f..959415066 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/ZipEntry.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/ZipEntry.cs
@@ -30,7 +30,7 @@ public partial class ZipEntry : Java.Lang.ICloneable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public ZipEntry(Java.Lang.String arg0)
@@ -38,7 +38,7 @@ public ZipEntry(Java.Lang.String arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#%3Cinit%3E(java.util.zip.ZipEntry)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#%3Cinit%3E(java.util.zip.ZipEntry)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Zip.ZipEntry"/></param>
         public ZipEntry(Java.Util.Zip.ZipEntry arg0)
@@ -58,13 +58,13 @@ public ZipEntry(Java.Util.Zip.ZipEntry arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#DEFLATED"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#DEFLATED"/>
         /// </summary>
         public static int DEFLATED { get { if (!_DEFLATEDReady) { _DEFLATEDContent = SGetField<int>(LocalBridgeClazz, "DEFLATED"); _DEFLATEDReady = true; } return _DEFLATEDContent; } }
         private static int _DEFLATEDContent = default;
         private static bool _DEFLATEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#STORED"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#STORED"/>
         /// </summary>
         public static int STORED { get { if (!_STOREDReady) { _STOREDContent = SGetField<int>(LocalBridgeClazz, "STORED"); _STOREDReady = true; } return _STOREDContent; } }
         private static int _STOREDContent = default;
@@ -78,123 +78,199 @@ public ZipEntry(Java.Util.Zip.ZipEntry arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getComment()"/> <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setComment(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#isDirectory()"/>
         /// </summary>
-        public Java.Lang.String Comment
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDirectory()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getComment", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setComment", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isDirectory", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getCompressedSize()"/> <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setCompressedSize(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getExtra()"/>
         /// </summary>
-        public long CompressedSize
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetExtra()
         {
-            get { return IExecuteWithSignature<long>("getCompressedSize", "()J"); } set { IExecuteWithSignature("setCompressedSize", "(J)V", value); }
+            return IExecuteWithSignatureArray<byte>("getExtra", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getCrc()"/> <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setCrc(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getMethod()"/>
         /// </summary>
-        public long Crc
+        /// <returns><see cref="int"/></returns>
+        public int GetMethod()
         {
-            get { return IExecuteWithSignature<long>("getCrc", "()J"); } set { IExecuteWithSignature("setCrc", "(J)V", value); }
+            return IExecuteWithSignature<int>("getMethod", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getCreationTime()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getComment()"/>
         /// </summary>
-        public Java.Nio.File.Attribute.FileTime CreationTime
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetComment()
         {
-            get { return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("getCreationTime", "()Ljava/nio/file/attribute/FileTime;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getComment", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getExtra()"/> <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setExtra(byte[])"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getName()"/>
         /// </summary>
-        public byte[] Extra
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignatureArray<byte>("getExtra", "()[B"); } set { IExecuteWithSignature("setExtra", "([B)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getLastAccessTime()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getCreationTime()"/>
         /// </summary>
-        public Java.Nio.File.Attribute.FileTime LastAccessTime
+        /// <returns><see cref="Java.Nio.File.Attribute.FileTime"/></returns>
+        public Java.Nio.File.Attribute.FileTime GetCreationTime()
         {
-            get { return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("getLastAccessTime", "()Ljava/nio/file/attribute/FileTime;"); }
+            return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("getCreationTime", "()Ljava/nio/file/attribute/FileTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getLastModifiedTime()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getLastAccessTime()"/>
         /// </summary>
-        public Java.Nio.File.Attribute.FileTime LastModifiedTime
+        /// <returns><see cref="Java.Nio.File.Attribute.FileTime"/></returns>
+        public Java.Nio.File.Attribute.FileTime GetLastAccessTime()
         {
-            get { return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("getLastModifiedTime", "()Ljava/nio/file/attribute/FileTime;"); }
+            return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("getLastAccessTime", "()Ljava/nio/file/attribute/FileTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getMethod()"/> <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setMethod(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getLastModifiedTime()"/>
         /// </summary>
-        public int Method
+        /// <returns><see cref="Java.Nio.File.Attribute.FileTime"/></returns>
+        public Java.Nio.File.Attribute.FileTime GetLastModifiedTime()
         {
-            get { return IExecuteWithSignature<int>("getMethod", "()I"); } set { IExecuteWithSignature("setMethod", "(I)V", value); }
+            return IExecuteWithSignature<Java.Nio.File.Attribute.FileTime>("getLastModifiedTime", "()Ljava/nio/file/attribute/FileTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getTimeLocal()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Time.LocalDateTime"/></returns>
+        public Java.Time.LocalDateTime GetTimeLocal()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Time.LocalDateTime>("getTimeLocal", "()Ljava/time/LocalDateTime;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getSize()"/> <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setSize(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setCreationTime(java.nio.file.attribute.FileTime)"/>
         /// </summary>
-        public long Size
+        /// <param name="arg0"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
+        /// <returns><see cref="Java.Util.Zip.ZipEntry"/></returns>
+        public Java.Util.Zip.ZipEntry SetCreationTime(Java.Nio.File.Attribute.FileTime arg0)
         {
-            get { return IExecuteWithSignature<long>("getSize", "()J"); } set { IExecuteWithSignature("setSize", "(J)V", value); }
+            return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("setCreationTime", "(Ljava/nio/file/attribute/FileTime;)Ljava/util/zip/ZipEntry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getTime()"/> <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setTime(long)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setLastAccessTime(java.nio.file.attribute.FileTime)"/>
         /// </summary>
-        public long Time
+        /// <param name="arg0"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
+        /// <returns><see cref="Java.Util.Zip.ZipEntry"/></returns>
+        public Java.Util.Zip.ZipEntry SetLastAccessTime(Java.Nio.File.Attribute.FileTime arg0)
         {
-            get { return IExecuteWithSignature<long>("getTime", "()J"); } set { IExecuteWithSignature("setTime", "(J)V", value); }
+            return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("setLastAccessTime", "(Ljava/nio/file/attribute/FileTime;)Ljava/util/zip/ZipEntry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#getTimeLocal()"/> <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setTimeLocal(java.time.LocalDateTime)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setLastModifiedTime(java.nio.file.attribute.FileTime)"/>
         /// </summary>
-        public Java.Time.LocalDateTime TimeLocal
+        /// <param name="arg0"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
+        /// <returns><see cref="Java.Util.Zip.ZipEntry"/></returns>
+        public Java.Util.Zip.ZipEntry SetLastModifiedTime(Java.Nio.File.Attribute.FileTime arg0)
         {
-            get { return IExecuteWithSignature<Java.Time.LocalDateTime>("getTimeLocal", "()Ljava/time/LocalDateTime;"); } set { IExecuteWithSignature("setTimeLocal", "(Ljava/time/LocalDateTime;)V", value); }
+            return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("setLastModifiedTime", "(Ljava/nio/file/attribute/FileTime;)Ljava/util/zip/ZipEntry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#isDirectory()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getCompressedSize()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDirectory()
+        /// <returns><see cref="long"/></returns>
+        public long GetCompressedSize()
         {
-            return IExecuteWithSignature<bool>("isDirectory", "()Z");
+            return IExecuteWithSignature<long>("getCompressedSize", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setCreationTime(java.nio.file.attribute.FileTime)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getCrc()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
-        /// <returns><see cref="Java.Util.Zip.ZipEntry"/></returns>
-        public Java.Util.Zip.ZipEntry SetCreationTime(Java.Nio.File.Attribute.FileTime arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetCrc()
         {
-            return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("setCreationTime", "(Ljava/nio/file/attribute/FileTime;)Ljava/util/zip/ZipEntry;", arg0);
+            return IExecuteWithSignature<long>("getCrc", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setLastAccessTime(java.nio.file.attribute.FileTime)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getSize()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
-        /// <returns><see cref="Java.Util.Zip.ZipEntry"/></returns>
-        public Java.Util.Zip.ZipEntry SetLastAccessTime(Java.Nio.File.Attribute.FileTime arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetSize()
         {
-            return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("setLastAccessTime", "(Ljava/nio/file/attribute/FileTime;)Ljava/util/zip/ZipEntry;", arg0);
+            return IExecuteWithSignature<long>("getSize", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipEntry.html#setLastModifiedTime(java.nio.file.attribute.FileTime)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#getTime()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.File.Attribute.FileTime"/></param>
-        /// <returns><see cref="Java.Util.Zip.ZipEntry"/></returns>
-        public Java.Util.Zip.ZipEntry SetLastModifiedTime(Java.Nio.File.Attribute.FileTime arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetTime()
         {
-            return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("setLastModifiedTime", "(Ljava/nio/file/attribute/FileTime;)Ljava/util/zip/ZipEntry;", arg0);
+            return IExecuteWithSignature<long>("getTime", "()J");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setComment(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetComment(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setComment", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setCompressedSize(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetCompressedSize(long arg0)
+        {
+            IExecuteWithSignature("setCompressedSize", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setCrc(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetCrc(long arg0)
+        {
+            IExecuteWithSignature("setCrc", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setExtra(byte[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="byte"/></param>
+        public void SetExtra(byte[] arg0)
+        {
+            IExecuteWithSignature("setExtra", "([B)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setMethod(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMethod(int arg0)
+        {
+            IExecuteWithSignature("setMethod", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setSize(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetSize(long arg0)
+        {
+            IExecuteWithSignature("setSize", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setTime(long)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="long"/></param>
+        public void SetTime(long arg0)
+        {
+            IExecuteWithSignature("setTime", "(J)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipEntry.html#setTimeLocal(java.time.LocalDateTime)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Time.LocalDateTime"/></param>
+        public void SetTimeLocal(Java.Time.LocalDateTime arg0)
+        {
+            IExecuteWithSignature("setTimeLocal", "(Ljava/time/LocalDateTime;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/ZipFile.cs b/src/net/Netdroid/Generated/Java/Util/Zip/ZipFile.cs
index 6e0854788..c6167af09 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/ZipFile.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/ZipFile.cs
@@ -30,7 +30,7 @@ public partial class ZipFile : Java.Io.ICloseable
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#%3Cinit%3E(java.io.File,int,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#%3Cinit%3E(java.io.File,int,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -41,7 +41,7 @@ public ZipFile(Java.Io.File arg0, int arg1, Java.Nio.Charset.Charset arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#%3Cinit%3E(java.io.File,int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#%3Cinit%3E(java.io.File,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -51,7 +51,7 @@ public ZipFile(Java.Io.File arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#%3Cinit%3E(java.io.File,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -61,7 +61,7 @@ public ZipFile(Java.Io.File arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <exception cref="Java.Util.Zip.ZipException"/>
@@ -71,7 +71,7 @@ public ZipFile(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#%3Cinit%3E(java.lang.String,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -81,7 +81,7 @@ public ZipFile(Java.Lang.String arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -102,13 +102,13 @@ public ZipFile(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#OPEN_DELETE"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#OPEN_DELETE"/>
         /// </summary>
         public static int OPEN_DELETE { get { if (!_OPEN_DELETEReady) { _OPEN_DELETEContent = SGetField<int>(LocalBridgeClazz, "OPEN_DELETE"); _OPEN_DELETEReady = true; } return _OPEN_DELETEContent; } }
         private static int _OPEN_DELETEContent = default;
         private static bool _OPEN_DELETEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#OPEN_READ"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#OPEN_READ"/>
         /// </summary>
         public static int OPEN_READ { get { if (!_OPEN_READReady) { _OPEN_READContent = SGetField<int>(LocalBridgeClazz, "OPEN_READ"); _OPEN_READReady = true; } return _OPEN_READContent; } }
         private static int _OPEN_READContent = default;
@@ -122,21 +122,7 @@ public ZipFile(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#getComment()"/> 
-        /// </summary>
-        public Java.Lang.String Comment
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getComment", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#size()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#size()"/>
         /// </summary>
         /// <returns><see cref="int"/></returns>
         public int Size()
@@ -144,7 +130,7 @@ public int Size()
             return IExecuteWithSignature<int>("size", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#getInputStream(java.util.zip.ZipEntry)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#getInputStream(java.util.zip.ZipEntry)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Zip.ZipEntry"/></param>
         /// <returns><see cref="Java.Io.InputStream"/></returns>
@@ -154,25 +140,41 @@ public Java.Io.InputStream GetInputStream(Java.Util.Zip.ZipEntry arg0)
             return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "(Ljava/util/zip/ZipEntry;)Ljava/io/InputStream;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#entries()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#getComment()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetComment()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getComment", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#entries()"/>
         /// </summary>
         /// <typeparam name="ReturnExtendsJava_Util_Zip_ZipEntry"><see cref="Java.Util.Zip.ZipEntry"/></typeparam>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
-        public Java.Util.Enumeration<ReturnExtendsJava_Util_Zip_ZipEntry> Entries<ReturnExtendsJava_Util_Zip_ZipEntry>() where ReturnExtendsJava_Util_Zip_ZipEntry: Java.Util.Zip.ZipEntry
+        public Java.Util.Enumeration<ReturnExtendsJava_Util_Zip_ZipEntry> Entries<ReturnExtendsJava_Util_Zip_ZipEntry>() where ReturnExtendsJava_Util_Zip_ZipEntry : Java.Util.Zip.ZipEntry
         {
             return IExecuteWithSignature<Java.Util.Enumeration<ReturnExtendsJava_Util_Zip_ZipEntry>>("entries", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#stream()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#stream()"/>
         /// </summary>
         /// <typeparam name="ReturnExtendsJava_Util_Zip_ZipEntry"><see cref="Java.Util.Zip.ZipEntry"/></typeparam>
         /// <returns><see cref="Java.Util.Stream.Stream"/></returns>
-        public Java.Util.Stream.Stream<ReturnExtendsJava_Util_Zip_ZipEntry> Stream<ReturnExtendsJava_Util_Zip_ZipEntry>() where ReturnExtendsJava_Util_Zip_ZipEntry: Java.Util.Zip.ZipEntry
+        public Java.Util.Stream.Stream<ReturnExtendsJava_Util_Zip_ZipEntry> Stream<ReturnExtendsJava_Util_Zip_ZipEntry>() where ReturnExtendsJava_Util_Zip_ZipEntry : Java.Util.Zip.ZipEntry
         {
             return IExecuteWithSignature<Java.Util.Stream.Stream<ReturnExtendsJava_Util_Zip_ZipEntry>>("stream", "()Ljava/util/stream/Stream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#getEntry(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#getEntry(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Zip.ZipEntry"/></returns>
@@ -181,7 +183,7 @@ public Java.Util.Zip.ZipEntry GetEntry(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("getEntry", "(Ljava/lang/String;)Ljava/util/zip/ZipEntry;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipFile.html#close()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipFile.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void Close()
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/ZipInputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/ZipInputStream.cs
index 1d378094b..436641085 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/ZipInputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/ZipInputStream.cs
@@ -30,7 +30,7 @@ public partial class ZipInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipInputStream.html#%3Cinit%3E(java.io.InputStream,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipInputStream.html#%3Cinit%3E(java.io.InputStream,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -39,7 +39,7 @@ public ZipInputStream(Java.Io.InputStream arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipInputStream.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public ZipInputStream(Java.Io.InputStream arg0)
@@ -63,14 +63,16 @@ public ZipInputStream(Java.Io.InputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipInputStream.html#getNextEntry()"/> 
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipInputStream.html#getNextEntry()"/>
         /// </summary>
-        public Java.Util.Zip.ZipEntry NextEntry
+        /// <returns><see cref="Java.Util.Zip.ZipEntry"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public Java.Util.Zip.ZipEntry GetNextEntry()
         {
-            get { return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("getNextEntry", "()Ljava/util/zip/ZipEntry;"); }
+            return IExecuteWithSignature<Java.Util.Zip.ZipEntry>("getNextEntry", "()Ljava/util/zip/ZipEntry;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipInputStream.html#closeEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipInputStream.html#closeEntry()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void CloseEntry()
diff --git a/src/net/Netdroid/Generated/Java/Util/Zip/ZipOutputStream.cs b/src/net/Netdroid/Generated/Java/Util/Zip/ZipOutputStream.cs
index c0c51825a..84c03b59e 100644
--- a/src/net/Netdroid/Generated/Java/Util/Zip/ZipOutputStream.cs
+++ b/src/net/Netdroid/Generated/Java/Util/Zip/ZipOutputStream.cs
@@ -30,7 +30,7 @@ public partial class ZipOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.nio.charset.Charset)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#%3Cinit%3E(java.io.OutputStream,java.nio.charset.Charset)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Java.Nio.Charset.Charset"/></param>
@@ -39,7 +39,7 @@ public ZipOutputStream(Java.Io.OutputStream arg0, Java.Nio.Charset.Charset arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public ZipOutputStream(Java.Io.OutputStream arg0)
@@ -55,13 +55,13 @@ public ZipOutputStream(Java.Io.OutputStream arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#DEFLATED"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#DEFLATED"/>
         /// </summary>
         public static int DEFLATED { get { if (!_DEFLATEDReady) { _DEFLATEDContent = SGetField<int>(LocalBridgeClazz, "DEFLATED"); _DEFLATEDReady = true; } return _DEFLATEDContent; } }
         private static int _DEFLATEDContent = default;
         private static bool _DEFLATEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#STORED"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#STORED"/>
         /// </summary>
         public static int STORED { get { if (!_STOREDReady) { _STOREDContent = SGetField<int>(LocalBridgeClazz, "STORED"); _STOREDReady = true; } return _STOREDContent; } }
         private static int _STOREDContent = default;
@@ -75,7 +75,7 @@ public ZipOutputStream(Java.Io.OutputStream arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#closeEntry()"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#closeEntry()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void CloseEntry()
@@ -83,7 +83,7 @@ public void CloseEntry()
             IExecuteWithSignature("closeEntry", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#putNextEntry(java.util.zip.ZipEntry)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#putNextEntry(java.util.zip.ZipEntry)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Zip.ZipEntry"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -92,7 +92,7 @@ public void PutNextEntry(Java.Util.Zip.ZipEntry arg0)
             IExecuteWithSignature("putNextEntry", "(Ljava/util/zip/ZipEntry;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#setComment(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#setComment(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void SetComment(Java.Lang.String arg0)
@@ -100,7 +100,7 @@ public void SetComment(Java.Lang.String arg0)
             IExecuteWithSignature("setComment", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#setLevel(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#setLevel(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetLevel(int arg0)
@@ -108,7 +108,7 @@ public void SetLevel(int arg0)
             IExecuteWithSignature("setLevel", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/java/util/zip/ZipOutputStream.html#setMethod(int)"/>
+        /// <see href="https://developer.android.com/reference/java/util/zip/ZipOutputStream.html#setMethod(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetMethod(int arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Annotation/Processing/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Annotation/Processing/AllPackageClasses.cs
index a1afd0bb4..ad91f9f23 100644
--- a/src/net/Netdroid/Generated/Javax/Annotation/Processing/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Annotation/Processing/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Annotation.Processing
 {
     #region Generated
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.compiler/javax/annotation/processing/Generated.html"/>
+    /// <see href="https://developer.android.com/reference/javax/annotation/processing/Generated.html"/>
     /// </summary>
     public partial class Generated : Java.Lang.Annotation.Annotation
     {
@@ -36,12 +36,12 @@ public partial class Generated : Java.Lang.Annotation.Annotation
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Generated class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Generated class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Generated() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Generated class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Generated class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Generated(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Annotation/Processing/Generated.cs b/src/net/Netdroid/Generated/Javax/Annotation/Processing/Generated.cs
index 43ae7bdb7..abc0e97ef 100644
--- a/src/net/Netdroid/Generated/Javax/Annotation/Processing/Generated.cs
+++ b/src/net/Netdroid/Generated/Javax/Annotation/Processing/Generated.cs
@@ -64,7 +64,7 @@ public partial class Generated : Javax.Annotation.Processing.IGenerated
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.compiler/javax/annotation/processing/Generated.html#comments()"/>
+        /// <see href="https://developer.android.com/reference/javax/annotation/processing/Generated.html#comments()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Comments()
@@ -72,7 +72,7 @@ public Java.Lang.String Comments()
             return IExecuteWithSignature<Java.Lang.String>("comments", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.compiler/javax/annotation/processing/Generated.html#date()"/>
+        /// <see href="https://developer.android.com/reference/javax/annotation/processing/Generated.html#date()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String Date()
@@ -80,7 +80,7 @@ public Java.Lang.String Date()
             return IExecuteWithSignature<Java.Lang.String>("date", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.compiler/javax/annotation/processing/Generated.html#value()"/>
+        /// <see href="https://developer.android.com/reference/javax/annotation/processing/Generated.html#value()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
         public Java.Lang.String[] Value()
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Crypto/AllPackageClasses.cs
index c4f87dc1e..4b7a3b10c 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Crypto
 {
     #region AEADBadTagException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/AEADBadTagException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/AEADBadTagException.html"/>
     /// </summary>
     public partial class AEADBadTagException : Javax.Crypto.BadPaddingException
     {
@@ -45,7 +45,7 @@ public partial class AEADBadTagException : Javax.Crypto.BadPaddingException
 
     #region BadPaddingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/BadPaddingException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/BadPaddingException.html"/>
     /// </summary>
     public partial class BadPaddingException : Java.Security.GeneralSecurityException
     {
@@ -62,7 +62,7 @@ public partial class BadPaddingException : Java.Security.GeneralSecurityExceptio
 
     #region Cipher
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html"/>
     /// </summary>
     public partial class Cipher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Cipher>
     {
@@ -106,7 +106,7 @@ public Cipher(params object[] args) : base(args) { }
 
     #region CipherInputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/CipherInputStream.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/CipherInputStream.html"/>
     /// </summary>
     public partial class CipherInputStream : Java.Io.FilterInputStream
     {
@@ -150,7 +150,7 @@ public CipherInputStream(params object[] args) : base(args) { }
 
     #region CipherOutputStream
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/CipherOutputStream.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/CipherOutputStream.html"/>
     /// </summary>
     public partial class CipherOutputStream : Java.Io.FilterOutputStream
     {
@@ -194,7 +194,7 @@ public CipherOutputStream(params object[] args) : base(args) { }
 
     #region CipherSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/CipherSpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/CipherSpi.html"/>
     /// </summary>
     public partial class CipherSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CipherSpi>
     {
@@ -202,12 +202,12 @@ public partial class CipherSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CipherS
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CipherSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CipherSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CipherSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CipherSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CipherSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CipherSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -240,7 +240,7 @@ public CipherSpi(params object[] args) : base(args) { }
 
     #region EncryptedPrivateKeyInfo
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html"/>
     /// </summary>
     public partial class EncryptedPrivateKeyInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EncryptedPrivateKeyInfo>
     {
@@ -284,7 +284,7 @@ public EncryptedPrivateKeyInfo(params object[] args) : base(args) { }
 
     #region ExemptionMechanism
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html"/>
     /// </summary>
     public partial class ExemptionMechanism : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ExemptionMechanism>
     {
@@ -328,7 +328,7 @@ public ExemptionMechanism(params object[] args) : base(args) { }
 
     #region ExemptionMechanismException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanismException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismException.html"/>
     /// </summary>
     public partial class ExemptionMechanismException : Java.Security.GeneralSecurityException
     {
@@ -345,7 +345,7 @@ public partial class ExemptionMechanismException : Java.Security.GeneralSecurity
 
     #region ExemptionMechanismSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanismSpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanismSpi.html"/>
     /// </summary>
     public partial class ExemptionMechanismSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ExemptionMechanismSpi>
     {
@@ -353,12 +353,12 @@ public partial class ExemptionMechanismSpi : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ExemptionMechanismSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ExemptionMechanismSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ExemptionMechanismSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ExemptionMechanismSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ExemptionMechanismSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ExemptionMechanismSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -391,7 +391,7 @@ public ExemptionMechanismSpi(params object[] args) : base(args) { }
 
     #region IllegalBlockSizeException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/IllegalBlockSizeException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/IllegalBlockSizeException.html"/>
     /// </summary>
     public partial class IllegalBlockSizeException : Java.Security.GeneralSecurityException
     {
@@ -408,7 +408,7 @@ public partial class IllegalBlockSizeException : Java.Security.GeneralSecurityEx
 
     #region KeyAgreement
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html"/>
     /// </summary>
     public partial class KeyAgreement : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyAgreement>
     {
@@ -452,7 +452,7 @@ public KeyAgreement(params object[] args) : base(args) { }
 
     #region KeyAgreementSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreementSpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreementSpi.html"/>
     /// </summary>
     public partial class KeyAgreementSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyAgreementSpi>
     {
@@ -460,12 +460,12 @@ public partial class KeyAgreementSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<K
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyAgreementSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyAgreementSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyAgreementSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyAgreementSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyAgreementSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyAgreementSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -498,7 +498,7 @@ public KeyAgreementSpi(params object[] args) : base(args) { }
 
     #region KeyGenerator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html"/>
     /// </summary>
     public partial class KeyGenerator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyGenerator>
     {
@@ -542,7 +542,7 @@ public KeyGenerator(params object[] args) : base(args) { }
 
     #region KeyGeneratorSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGeneratorSpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/KeyGeneratorSpi.html"/>
     /// </summary>
     public partial class KeyGeneratorSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyGeneratorSpi>
     {
@@ -550,12 +550,12 @@ public partial class KeyGeneratorSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<K
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyGeneratorSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyGeneratorSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyGeneratorSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -588,7 +588,7 @@ public KeyGeneratorSpi(params object[] args) : base(args) { }
 
     #region Mac
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html"/>
     /// </summary>
     public partial class Mac : Java.Lang.Cloneable
     {
@@ -632,7 +632,7 @@ public Mac(params object[] args) : base(args) { }
 
     #region MacSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/MacSpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/MacSpi.html"/>
     /// </summary>
     public partial class MacSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MacSpi>
     {
@@ -640,12 +640,12 @@ public partial class MacSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<MacSpi>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("MacSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MacSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MacSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("MacSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("MacSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public MacSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -678,7 +678,7 @@ public MacSpi(params object[] args) : base(args) { }
 
     #region NoSuchPaddingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/NoSuchPaddingException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/NoSuchPaddingException.html"/>
     /// </summary>
     public partial class NoSuchPaddingException : Java.Security.GeneralSecurityException
     {
@@ -695,7 +695,7 @@ public partial class NoSuchPaddingException : Java.Security.GeneralSecurityExcep
 
     #region NullCipher
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/NullCipher.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/NullCipher.html"/>
     /// </summary>
     public partial class NullCipher : Javax.Crypto.Cipher
     {
@@ -739,7 +739,7 @@ public NullCipher(params object[] args) : base(args) { }
 
     #region SealedObject
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SealedObject.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/SealedObject.html"/>
     /// </summary>
     public partial class SealedObject : Java.Io.Serializable
     {
@@ -783,7 +783,7 @@ public SealedObject(params object[] args) : base(args) { }
 
     #region SecretKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKey.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/SecretKey.html"/>
     /// </summary>
     public partial class SecretKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SecretKey>
     {
@@ -791,12 +791,12 @@ public partial class SecretKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SecretK
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SecretKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecretKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecretKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SecretKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecretKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecretKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -829,7 +829,7 @@ public SecretKey(params object[] args) : base(args) { }
 
     #region SecretKeyFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html"/>
     /// </summary>
     public partial class SecretKeyFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SecretKeyFactory>
     {
@@ -873,7 +873,7 @@ public SecretKeyFactory(params object[] args) : base(args) { }
 
     #region SecretKeyFactorySpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactorySpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactorySpi.html"/>
     /// </summary>
     public partial class SecretKeyFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SecretKeyFactorySpi>
     {
@@ -881,12 +881,12 @@ public partial class SecretKeyFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SecretKeyFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecretKeyFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecretKeyFactorySpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SecretKeyFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SecretKeyFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SecretKeyFactorySpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -919,7 +919,7 @@ public SecretKeyFactorySpi(params object[] args) : base(args) { }
 
     #region ShortBufferException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ShortBufferException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/ShortBufferException.html"/>
     /// </summary>
     public partial class ShortBufferException : Java.Security.GeneralSecurityException
     {
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Cipher.cs b/src/net/Netdroid/Generated/Javax/Crypto/Cipher.cs
index 33cc7fc86..114c28506 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Cipher.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Cipher.cs
@@ -38,43 +38,43 @@ public partial class Cipher
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#DECRYPT_MODE"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#DECRYPT_MODE"/>
         /// </summary>
         public static int DECRYPT_MODE { get { if (!_DECRYPT_MODEReady) { _DECRYPT_MODEContent = SGetField<int>(LocalBridgeClazz, "DECRYPT_MODE"); _DECRYPT_MODEReady = true; } return _DECRYPT_MODEContent; } }
         private static int _DECRYPT_MODEContent = default;
         private static bool _DECRYPT_MODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#ENCRYPT_MODE"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#ENCRYPT_MODE"/>
         /// </summary>
         public static int ENCRYPT_MODE { get { if (!_ENCRYPT_MODEReady) { _ENCRYPT_MODEContent = SGetField<int>(LocalBridgeClazz, "ENCRYPT_MODE"); _ENCRYPT_MODEReady = true; } return _ENCRYPT_MODEContent; } }
         private static int _ENCRYPT_MODEContent = default;
         private static bool _ENCRYPT_MODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#PRIVATE_KEY"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#PRIVATE_KEY"/>
         /// </summary>
         public static int PRIVATE_KEY { get { if (!_PRIVATE_KEYReady) { _PRIVATE_KEYContent = SGetField<int>(LocalBridgeClazz, "PRIVATE_KEY"); _PRIVATE_KEYReady = true; } return _PRIVATE_KEYContent; } }
         private static int _PRIVATE_KEYContent = default;
         private static bool _PRIVATE_KEYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#PUBLIC_KEY"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#PUBLIC_KEY"/>
         /// </summary>
         public static int PUBLIC_KEY { get { if (!_PUBLIC_KEYReady) { _PUBLIC_KEYContent = SGetField<int>(LocalBridgeClazz, "PUBLIC_KEY"); _PUBLIC_KEYReady = true; } return _PUBLIC_KEYContent; } }
         private static int _PUBLIC_KEYContent = default;
         private static bool _PUBLIC_KEYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#SECRET_KEY"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#SECRET_KEY"/>
         /// </summary>
         public static int SECRET_KEY { get { if (!_SECRET_KEYReady) { _SECRET_KEYContent = SGetField<int>(LocalBridgeClazz, "SECRET_KEY"); _SECRET_KEYReady = true; } return _SECRET_KEYContent; } }
         private static int _SECRET_KEYContent = default;
         private static bool _SECRET_KEYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#UNWRAP_MODE"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#UNWRAP_MODE"/>
         /// </summary>
         public static int UNWRAP_MODE { get { if (!_UNWRAP_MODEReady) { _UNWRAP_MODEContent = SGetField<int>(LocalBridgeClazz, "UNWRAP_MODE"); _UNWRAP_MODEReady = true; } return _UNWRAP_MODEContent; } }
         private static int _UNWRAP_MODEContent = default;
         private static bool _UNWRAP_MODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#WRAP_MODE"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#WRAP_MODE"/>
         /// </summary>
         public static int WRAP_MODE { get { if (!_WRAP_MODEReady) { _WRAP_MODEContent = SGetField<int>(LocalBridgeClazz, "WRAP_MODE"); _WRAP_MODEReady = true; } return _WRAP_MODEContent; } }
         private static int _WRAP_MODEContent = default;
@@ -84,7 +84,7 @@ public partial class Cipher
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getMaxAllowedKeyLength(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getMaxAllowedKeyLength(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -94,7 +94,7 @@ public static int GetMaxAllowedKeyLength(Java.Lang.String arg0)
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getMaxAllowedKeyLength", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getMaxAllowedParameterSpec(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getMaxAllowedParameterSpec(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
@@ -104,7 +104,7 @@ public static Java.Security.Spec.AlgorithmParameterSpec GetMaxAllowedParameterSp
             return SExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>(LocalBridgeClazz, "getMaxAllowedParameterSpec", "(Ljava/lang/String;)Ljava/security/spec/AlgorithmParameterSpec;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -117,7 +117,7 @@ public static Javax.Crypto.Cipher GetInstance(Java.Lang.String arg0, Java.Lang.S
             return SExecute<Javax.Crypto.Cipher>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -129,7 +129,7 @@ public static Javax.Crypto.Cipher GetInstance(Java.Lang.String arg0, Java.Securi
             return SExecute<Javax.Crypto.Cipher>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Crypto.Cipher"/></returns>
@@ -144,49 +144,7 @@ public static Javax.Crypto.Cipher GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getAlgorithm()"/> 
-        /// </summary>
-        public Java.Lang.String Algorithm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getBlockSize()"/> 
-        /// </summary>
-        public int BlockSize
-        {
-            get { return IExecuteWithSignature<int>("getBlockSize", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getExemptionMechanism()"/> 
-        /// </summary>
-        public Javax.Crypto.ExemptionMechanism ExemptionMechanism
-        {
-            get { return IExecuteWithSignature<Javax.Crypto.ExemptionMechanism>("getExemptionMechanism", "()Ljavax/crypto/ExemptionMechanism;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getIV()"/> 
-        /// </summary>
-        public byte[] IV
-        {
-            get { return IExecuteWithSignatureArray<byte>("getIV", "()[B"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getParameters()"/> 
-        /// </summary>
-        public Java.Security.AlgorithmParameters Parameters
-        {
-            get { return IExecuteWithSignature<Java.Security.AlgorithmParameters>("getParameters", "()Ljava/security/AlgorithmParameters;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getProvider()"/> 
-        /// </summary>
-        public Java.Security.Provider Provider
-        {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#doFinal()"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#doFinal()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Javax.Crypto.IllegalBlockSizeException"/>
@@ -196,7 +154,7 @@ public byte[] DoFinal()
             return IExecuteWithSignatureArray<byte>("doFinal", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#doFinal(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#doFinal(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -209,7 +167,7 @@ public byte[] DoFinal(byte[] arg0, int arg1, int arg2)
             return IExecuteArray<byte>("doFinal", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#doFinal(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#doFinal(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -220,7 +178,15 @@ public byte[] DoFinal(byte[] arg0)
             return IExecuteWithSignatureArray<byte>("doFinal", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#update(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getIV()"/>
+        /// </summary>
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetIV()
+        {
+            return IExecuteWithSignatureArray<byte>("getIV", "()[B");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#update(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -231,7 +197,7 @@ public byte[] Update(byte[] arg0, int arg1, int arg2)
             return IExecuteArray<byte>("update", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#update(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#update(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -240,7 +206,7 @@ public byte[] Update(byte[] arg0)
             return IExecuteWithSignatureArray<byte>("update", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#wrap(java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#wrap(java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <returns><see cref="byte"/></returns>
@@ -251,7 +217,7 @@ public byte[] Wrap(Java.Security.Key arg0)
             return IExecuteWithSignatureArray<byte>("wrap", "(Ljava/security/Key;)[B", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#doFinal(byte[],int,int,byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#doFinal(byte[],int,int,byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -267,7 +233,7 @@ public int DoFinal(byte[] arg0, int arg1, int arg2, byte[] arg3, int arg4)
             return IExecute<int>("doFinal", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#doFinal(byte[],int,int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#doFinal(byte[],int,int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -282,7 +248,7 @@ public int DoFinal(byte[] arg0, int arg1, int arg2, byte[] arg3)
             return IExecute<int>("doFinal", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#doFinal(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#doFinal(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -295,7 +261,7 @@ public int DoFinal(byte[] arg0, int arg1)
             return IExecute<int>("doFinal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#doFinal(java.nio.ByteBuffer,java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#doFinal(java.nio.ByteBuffer,java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -308,7 +274,15 @@ public int DoFinal(Java.Nio.ByteBuffer arg0, Java.Nio.ByteBuffer arg1)
             return IExecute<int>("doFinal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#getOutputSize(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getBlockSize()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetBlockSize()
+        {
+            return IExecuteWithSignature<int>("getBlockSize", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getOutputSize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -317,7 +291,7 @@ public int GetOutputSize(int arg0)
             return IExecuteWithSignature<int>("getOutputSize", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#update(byte[],int,int,byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#update(byte[],int,int,byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -331,7 +305,7 @@ public int Update(byte[] arg0, int arg1, int arg2, byte[] arg3, int arg4)
             return IExecute<int>("update", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#update(byte[],int,int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#update(byte[],int,int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -344,7 +318,7 @@ public int Update(byte[] arg0, int arg1, int arg2, byte[] arg3)
             return IExecute<int>("update", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#update(java.nio.ByteBuffer,java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#update(java.nio.ByteBuffer,java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -355,7 +329,23 @@ public int Update(Java.Nio.ByteBuffer arg0, Java.Nio.ByteBuffer arg1)
             return IExecute<int>("update", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#unwrap(byte[],java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getAlgorithm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getParameters()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.AlgorithmParameters"/></returns>
+        public Java.Security.AlgorithmParameters GetParameters()
+        {
+            return IExecuteWithSignature<Java.Security.AlgorithmParameters>("getParameters", "()Ljava/security/AlgorithmParameters;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#unwrap(byte[],java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -368,7 +358,23 @@ public Java.Security.Key Unwrap(byte[] arg0, Java.Lang.String arg1, int arg2)
             return IExecute<Java.Security.Key>("unwrap", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#init(int,java.security.cert.Certificate,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#getExemptionMechanism()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Crypto.ExemptionMechanism"/></returns>
+        public Javax.Crypto.ExemptionMechanism GetExemptionMechanism()
+        {
+            return IExecuteWithSignature<Javax.Crypto.ExemptionMechanism>("getExemptionMechanism", "()Ljavax/crypto/ExemptionMechanism;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#init(int,java.security.cert.Certificate,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.Certificate"/></param>
@@ -379,7 +385,7 @@ public void Init(int arg0, Java.Security.Cert.Certificate arg1, Java.Security.Se
             IExecute("init", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#init(int,java.security.cert.Certificate)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#init(int,java.security.cert.Certificate)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.Certificate"/></param>
@@ -389,7 +395,7 @@ public void Init(int arg0, Java.Security.Cert.Certificate arg1)
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.AlgorithmParameters,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.AlgorithmParameters,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
@@ -402,7 +408,7 @@ public void Init(int arg0, Java.Security.Key arg1, Java.Security.AlgorithmParame
             IExecute("init", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.AlgorithmParameters)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.AlgorithmParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
@@ -414,7 +420,7 @@ public void Init(int arg0, Java.Security.Key arg1, Java.Security.AlgorithmParame
             IExecute("init", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
@@ -425,7 +431,7 @@ public void Init(int arg0, Java.Security.Key arg1, Java.Security.SecureRandom ar
             IExecute("init", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
@@ -438,7 +444,7 @@ public void Init(int arg0, Java.Security.Key arg1, Java.Security.Spec.AlgorithmP
             IExecute("init", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#init(int,java.security.Key,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
@@ -450,7 +456,7 @@ public void Init(int arg0, Java.Security.Key arg1, Java.Security.Spec.AlgorithmP
             IExecute("init", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#init(int,java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#init(int,java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.Key"/></param>
@@ -460,7 +466,7 @@ public void Init(int arg0, Java.Security.Key arg1)
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#updateAAD(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#updateAAD(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -470,7 +476,7 @@ public void UpdateAAD(byte[] arg0, int arg1, int arg2)
             IExecute("updateAAD", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#updateAAD(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#updateAAD(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public void UpdateAAD(byte[] arg0)
@@ -478,7 +484,7 @@ public void UpdateAAD(byte[] arg0)
             IExecuteWithSignature("updateAAD", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Cipher.html#updateAAD(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Cipher.html#updateAAD(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void UpdateAAD(Java.Nio.ByteBuffer arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/CipherInputStream.cs b/src/net/Netdroid/Generated/Javax/Crypto/CipherInputStream.cs
index e56db3cd5..84420eb81 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/CipherInputStream.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/CipherInputStream.cs
@@ -30,7 +30,7 @@ public partial class CipherInputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/CipherInputStream.html#%3Cinit%3E(java.io.InputStream,javax.crypto.Cipher)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/CipherInputStream.html#%3Cinit%3E(java.io.InputStream,javax.crypto.Cipher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Javax.Crypto.Cipher"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/CipherOutputStream.cs b/src/net/Netdroid/Generated/Javax/Crypto/CipherOutputStream.cs
index dfcf5b88b..62d19fcdc 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/CipherOutputStream.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/CipherOutputStream.cs
@@ -30,7 +30,7 @@ public partial class CipherOutputStream
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/CipherOutputStream.html#%3Cinit%3E(java.io.OutputStream,javax.crypto.Cipher)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/CipherOutputStream.html#%3Cinit%3E(java.io.OutputStream,javax.crypto.Cipher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         /// <param name="arg1"><see cref="Javax.Crypto.Cipher"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/EncryptedPrivateKeyInfo.cs b/src/net/Netdroid/Generated/Javax/Crypto/EncryptedPrivateKeyInfo.cs
index 6f66bcde2..8a001482a 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/EncryptedPrivateKeyInfo.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/EncryptedPrivateKeyInfo.cs
@@ -30,7 +30,7 @@ public partial class EncryptedPrivateKeyInfo
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -39,7 +39,7 @@ public EncryptedPrivateKeyInfo(byte[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#%3Cinit%3E(java.lang.String,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#%3Cinit%3E(java.lang.String,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -49,7 +49,7 @@ public EncryptedPrivateKeyInfo(Java.Lang.String arg0, byte[] arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#%3Cinit%3E(java.security.AlgorithmParameters,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#%3Cinit%3E(java.security.AlgorithmParameters,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.AlgorithmParameters"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -75,35 +75,40 @@ public EncryptedPrivateKeyInfo(Java.Security.AlgorithmParameters arg0, byte[] ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#getAlgName()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#getEncoded()"/>
         /// </summary>
-        public Java.Lang.String AlgName
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Io.IOException"/>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#getAlgParameters()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#getEncryptedData()"/>
         /// </summary>
-        public Java.Security.AlgorithmParameters AlgParameters
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEncryptedData()
         {
-            get { return IExecuteWithSignature<Java.Security.AlgorithmParameters>("getAlgParameters", "()Ljava/security/AlgorithmParameters;"); }
+            return IExecuteWithSignatureArray<byte>("getEncryptedData", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#getAlgName()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgName()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#getEncryptedData()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#getAlgParameters()"/>
         /// </summary>
-        public byte[] EncryptedData
+        /// <returns><see cref="Java.Security.AlgorithmParameters"/></returns>
+        public Java.Security.AlgorithmParameters GetAlgParameters()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncryptedData", "()[B"); }
+            return IExecuteWithSignature<Java.Security.AlgorithmParameters>("getAlgParameters", "()Ljava/security/AlgorithmParameters;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#getKeySpec(java.security.Key,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#getKeySpec(java.security.Key,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -116,7 +121,7 @@ public Java.Security.Spec.PKCS8EncodedKeySpec GetKeySpec(Java.Security.Key arg0,
             return IExecute<Java.Security.Spec.PKCS8EncodedKeySpec>("getKeySpec", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#getKeySpec(java.security.Key,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#getKeySpec(java.security.Key,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -128,7 +133,7 @@ public Java.Security.Spec.PKCS8EncodedKeySpec GetKeySpec(Java.Security.Key arg0,
             return IExecute<Java.Security.Spec.PKCS8EncodedKeySpec>("getKeySpec", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#getKeySpec(java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#getKeySpec(java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <returns><see cref="Java.Security.Spec.PKCS8EncodedKeySpec"/></returns>
@@ -139,7 +144,7 @@ public Java.Security.Spec.PKCS8EncodedKeySpec GetKeySpec(Java.Security.Key arg0)
             return IExecuteWithSignature<Java.Security.Spec.PKCS8EncodedKeySpec>("getKeySpec", "(Ljava/security/Key;)Ljava/security/spec/PKCS8EncodedKeySpec;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/EncryptedPrivateKeyInfo.html#getKeySpec(javax.crypto.Cipher)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/EncryptedPrivateKeyInfo.html#getKeySpec(javax.crypto.Cipher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Crypto.Cipher"/></param>
         /// <returns><see cref="Java.Security.Spec.PKCS8EncodedKeySpec"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/ExemptionMechanism.cs b/src/net/Netdroid/Generated/Javax/Crypto/ExemptionMechanism.cs
index b7f3099c0..83f632454 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/ExemptionMechanism.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/ExemptionMechanism.cs
@@ -42,7 +42,7 @@ public partial class ExemptionMechanism
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Javax.Crypto.ExemptionMechanism GetInstance(Java.Lang.String arg0,
             return SExecute<Javax.Crypto.ExemptionMechanism>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Javax.Crypto.ExemptionMechanism GetInstance(Java.Lang.String arg0,
             return SExecute<Javax.Crypto.ExemptionMechanism>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Crypto.ExemptionMechanism"/></returns>
@@ -79,21 +79,7 @@ public static Javax.Crypto.ExemptionMechanism GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#getProvider()"/> 
-        /// </summary>
-        public Java.Security.Provider Provider
-        {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#isCryptoAllowed(java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#isCryptoAllowed(java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -103,7 +89,7 @@ public bool IsCryptoAllowed(Java.Security.Key arg0)
             return IExecuteWithSignature<bool>("isCryptoAllowed", "(Ljava/security/Key;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#genExemptionBlob()"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#genExemptionBlob()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Lang.IllegalStateException"/>
@@ -113,7 +99,7 @@ public byte[] GenExemptionBlob()
             return IExecuteWithSignatureArray<byte>("genExemptionBlob", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#genExemptionBlob(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#genExemptionBlob(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -126,7 +112,7 @@ public int GenExemptionBlob(byte[] arg0, int arg1)
             return IExecute<int>("genExemptionBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#genExemptionBlob(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#genExemptionBlob(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="int"/></returns>
@@ -138,7 +124,7 @@ public int GenExemptionBlob(byte[] arg0)
             return IExecuteWithSignature<int>("genExemptionBlob", "([B)I", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#getOutputSize(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#getOutputSize(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
@@ -148,7 +134,23 @@ public int GetOutputSize(int arg0)
             return IExecuteWithSignature<int>("getOutputSize", "(I)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#init(java.security.Key,java.security.AlgorithmParameters)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#init(java.security.Key,java.security.AlgorithmParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Security.AlgorithmParameters"/></param>
@@ -160,7 +162,7 @@ public void Init(Java.Security.Key arg0, Java.Security.AlgorithmParameters arg1)
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#init(java.security.Key,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#init(java.security.Key,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
@@ -172,7 +174,7 @@ public void Init(Java.Security.Key arg0, Java.Security.Spec.AlgorithmParameterSp
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/ExemptionMechanism.html#init(java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/ExemptionMechanism.html#init(java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/AllPackageClasses.cs
index dadcac9de..4c546108f 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Crypto.Interfaces
 {
     #region DHKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/DHKey.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/DHKey.html"/>
     /// </summary>
     public partial class DHKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DHKey>
     {
@@ -36,12 +36,12 @@ public partial class DHKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DHKey>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DHKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DHKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DHKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DHKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DHKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DHKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public DHKey(params object[] args) : base(args) { }
 
     #region DHPrivateKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/DHPrivateKey.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/DHPrivateKey.html"/>
     /// </summary>
     public partial class DHPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DHPrivateKey>
     {
@@ -82,12 +82,12 @@ public partial class DHPrivateKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DHPr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DHPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DHPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DHPrivateKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DHPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DHPrivateKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DHPrivateKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public DHPrivateKey(params object[] args) : base(args) { }
 
     #region DHPublicKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/DHPublicKey.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/DHPublicKey.html"/>
     /// </summary>
     public partial class DHPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DHPublicKey>
     {
@@ -128,12 +128,12 @@ public partial class DHPublicKey : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DHPub
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DHPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DHPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DHPublicKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DHPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DHPublicKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DHPublicKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -166,7 +166,7 @@ public DHPublicKey(params object[] args) : base(args) { }
 
     #region PBEKey
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/PBEKey.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/PBEKey.html"/>
     /// </summary>
     public partial class PBEKey : Javax.Crypto.SecretKey
     {
@@ -174,12 +174,12 @@ public partial class PBEKey : Javax.Crypto.SecretKey
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PBEKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PBEKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PBEKey() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PBEKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PBEKey class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PBEKey(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHKey.cs b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHKey.cs
index a0daeaf6d..79ca2b4ff 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHKey.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHKey.cs
@@ -64,11 +64,12 @@ public partial class DHKey : Javax.Crypto.Interfaces.IDHKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/DHKey.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/DHKey.html#getParams()"/>
         /// </summary>
-        public Javax.Crypto.Spec.DHParameterSpec Params
+        /// <returns><see cref="Javax.Crypto.Spec.DHParameterSpec"/></returns>
+        public Javax.Crypto.Spec.DHParameterSpec GetParams()
         {
-            get { return IExecuteWithSignature<Javax.Crypto.Spec.DHParameterSpec>("getParams", "()Ljavax/crypto/spec/DHParameterSpec;"); }
+            return IExecuteWithSignature<Javax.Crypto.Spec.DHParameterSpec>("getParams", "()Ljavax/crypto/spec/DHParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHPrivateKey.cs b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHPrivateKey.cs
index aac819dd4..731f27429 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHPrivateKey.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHPrivateKey.cs
@@ -64,9 +64,8 @@ public partial class DHPrivateKey : Javax.Crypto.Interfaces.IDHPrivateKey, Javax
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/DHPrivateKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/DHPrivateKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -79,11 +78,12 @@ public partial class DHPrivateKey : Javax.Crypto.Interfaces.IDHPrivateKey, Javax
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/DHPrivateKey.html#getX()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/DHPrivateKey.html#getX()"/>
         /// </summary>
-        public Java.Math.BigInteger X
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetX()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getX", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getX", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHPublicKey.cs b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHPublicKey.cs
index 554f742f9..8a1839be0 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHPublicKey.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/DHPublicKey.cs
@@ -64,9 +64,8 @@ public partial class DHPublicKey : Javax.Crypto.Interfaces.IDHPublicKey, Javax.C
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/DHPublicKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/DHPublicKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -79,11 +78,12 @@ public partial class DHPublicKey : Javax.Crypto.Interfaces.IDHPublicKey, Javax.C
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/DHPublicKey.html#getY()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/DHPublicKey.html#getY()"/>
         /// </summary>
-        public Java.Math.BigInteger Y
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetY()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/PBEKey.cs b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/PBEKey.cs
index 6fc2727ef..0608c864a 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/PBEKey.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Interfaces/PBEKey.cs
@@ -56,9 +56,8 @@ public partial class PBEKey : Javax.Crypto.Interfaces.IPBEKey
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/PBEKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/PBEKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
@@ -71,25 +70,28 @@ public partial class PBEKey : Javax.Crypto.Interfaces.IPBEKey
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/PBEKey.html#getIterationCount()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/PBEKey.html#getSalt()"/>
         /// </summary>
-        public int IterationCount
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSalt()
         {
-            get { return IExecuteWithSignature<int>("getIterationCount", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getSalt", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/PBEKey.html#getPassword()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/PBEKey.html#getPassword()"/>
         /// </summary>
-        public char[] Password
+        /// <returns><see cref="char"/></returns>
+        public char[] GetPassword()
         {
-            get { return IExecuteWithSignatureArray<char>("getPassword", "()[C"); }
+            return IExecuteWithSignatureArray<char>("getPassword", "()[C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/interfaces/PBEKey.html#getSalt()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/interfaces/PBEKey.html#getIterationCount()"/>
         /// </summary>
-        public byte[] Salt
+        /// <returns><see cref="int"/></returns>
+        public int GetIterationCount()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSalt", "()[B"); }
+            return IExecuteWithSignature<int>("getIterationCount", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/KeyAgreement.cs b/src/net/Netdroid/Generated/Javax/Crypto/KeyAgreement.cs
index c95671458..7e7007a1e 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/KeyAgreement.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/KeyAgreement.cs
@@ -42,7 +42,7 @@ public partial class KeyAgreement
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Javax.Crypto.KeyAgreement GetInstance(Java.Lang.String arg0, Java.
             return SExecute<Javax.Crypto.KeyAgreement>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Javax.Crypto.KeyAgreement GetInstance(Java.Lang.String arg0, Java.
             return SExecute<Javax.Crypto.KeyAgreement>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Crypto.KeyAgreement"/></returns>
@@ -79,21 +79,7 @@ public static Javax.Crypto.KeyAgreement GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#getAlgorithm()"/> 
-        /// </summary>
-        public Java.Lang.String Algorithm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#getProvider()"/> 
-        /// </summary>
-        public Java.Security.Provider Provider
-        {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#generateSecret()"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#generateSecret()"/>
         /// </summary>
         /// <returns><see cref="byte"/></returns>
         /// <exception cref="Java.Lang.IllegalStateException"/>
@@ -102,7 +88,7 @@ public byte[] GenerateSecret()
             return IExecuteWithSignatureArray<byte>("generateSecret", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#generateSecret(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#generateSecret(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -114,7 +100,15 @@ public int GenerateSecret(byte[] arg0, int arg1)
             return IExecute<int>("generateSecret", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#doPhase(java.security.Key,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#getAlgorithm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#doPhase(java.security.Key,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -126,7 +120,15 @@ public Java.Security.Key DoPhase(Java.Security.Key arg0, bool arg1)
             return IExecute<Java.Security.Key>("doPhase", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#generateSecret(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#getProvider()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
+        {
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#generateSecret(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Crypto.SecretKey"/></returns>
@@ -138,7 +140,7 @@ public Javax.Crypto.SecretKey GenerateSecret(Java.Lang.String arg0)
             return IExecuteWithSignature<Javax.Crypto.SecretKey>("generateSecret", "(Ljava/lang/String;)Ljavax/crypto/SecretKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#init(java.security.Key,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#init(java.security.Key,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
@@ -148,7 +150,7 @@ public void Init(Java.Security.Key arg0, Java.Security.SecureRandom arg1)
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#init(java.security.Key,java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#init(java.security.Key,java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
@@ -160,7 +162,7 @@ public void Init(Java.Security.Key arg0, Java.Security.Spec.AlgorithmParameterSp
             IExecute("init", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#init(java.security.Key,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#init(java.security.Key,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
@@ -171,7 +173,7 @@ public void Init(Java.Security.Key arg0, Java.Security.Spec.AlgorithmParameterSp
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyAgreement.html#init(java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyAgreement.html#init(java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/KeyGenerator.cs b/src/net/Netdroid/Generated/Javax/Crypto/KeyGenerator.cs
index 1816a490b..0b1eaf30e 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/KeyGenerator.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/KeyGenerator.cs
@@ -42,7 +42,7 @@ public partial class KeyGenerator
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Javax.Crypto.KeyGenerator GetInstance(Java.Lang.String arg0, Java.
             return SExecute<Javax.Crypto.KeyGenerator>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Javax.Crypto.KeyGenerator GetInstance(Java.Lang.String arg0, Java.
             return SExecute<Javax.Crypto.KeyGenerator>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Crypto.KeyGenerator"/></returns>
@@ -79,21 +79,23 @@ public static Javax.Crypto.KeyGenerator GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#getProvider()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#generateKey()"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#generateKey()"/>
         /// </summary>
         /// <returns><see cref="Javax.Crypto.SecretKey"/></returns>
         public Javax.Crypto.SecretKey GenerateKey()
@@ -101,7 +103,7 @@ public Javax.Crypto.SecretKey GenerateKey()
             return IExecuteWithSignature<Javax.Crypto.SecretKey>("generateKey", "()Ljavax/crypto/SecretKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#init(int,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#init(int,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
@@ -110,7 +112,7 @@ public void Init(int arg0, Java.Security.SecureRandom arg1)
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#init(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#init(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void Init(int arg0)
@@ -118,7 +120,7 @@ public void Init(int arg0)
             IExecuteWithSignature("init", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#init(java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#init(java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.SecureRandom"/></param>
         public void Init(Java.Security.SecureRandom arg0)
@@ -126,7 +128,7 @@ public void Init(Java.Security.SecureRandom arg0)
             IExecuteWithSignature("init", "(Ljava/security/SecureRandom;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#init(java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#init(java.security.spec.AlgorithmParameterSpec,java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <param name="arg1"><see cref="Java.Security.SecureRandom"/></param>
@@ -136,7 +138,7 @@ public void Init(Java.Security.Spec.AlgorithmParameterSpec arg0, Java.Security.S
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/KeyGenerator.html#init(java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/KeyGenerator.html#init(java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
         /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Mac.cs b/src/net/Netdroid/Generated/Javax/Crypto/Mac.cs
index 6436654f4..fb5dbe9ba 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Mac.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Mac.cs
@@ -42,7 +42,7 @@ public partial class Mac
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Javax.Crypto.Mac GetInstance(Java.Lang.String arg0, Java.Lang.Stri
             return SExecute<Javax.Crypto.Mac>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Javax.Crypto.Mac GetInstance(Java.Lang.String arg0, Java.Security.
             return SExecute<Javax.Crypto.Mac>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Crypto.Mac"/></returns>
@@ -79,47 +79,50 @@ public static Javax.Crypto.Mac GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#doFinal()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public byte[] DoFinal()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("doFinal", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#getMacLength()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#doFinal(byte[])"/>
         /// </summary>
-        public int MacLength
+        /// <param name="arg0"><see cref="byte"/></param>
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Java.Lang.IllegalStateException"/>
+        public byte[] DoFinal(byte[] arg0)
         {
-            get { return IExecuteWithSignature<int>("getMacLength", "()I"); }
+            return IExecuteWithSignatureArray<byte>("doFinal", "([B)[B", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#getMacLength()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="int"/></returns>
+        public int GetMacLength()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<int>("getMacLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#doFinal()"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#getAlgorithm()"/>
         /// </summary>
-        /// <returns><see cref="byte"/></returns>
-        /// <exception cref="Java.Lang.IllegalStateException"/>
-        public byte[] DoFinal()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            return IExecuteWithSignatureArray<byte>("doFinal", "()[B");
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#doFinal(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#getProvider()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="byte"/></param>
-        /// <returns><see cref="byte"/></returns>
-        /// <exception cref="Java.Lang.IllegalStateException"/>
-        public byte[] DoFinal(byte[] arg0)
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            return IExecuteWithSignatureArray<byte>("doFinal", "([B)[B", new object[] { arg0 });
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#doFinal(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#doFinal(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -130,7 +133,7 @@ public void DoFinal(byte[] arg0, int arg1)
             IExecute("doFinal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#init(java.security.Key,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#init(java.security.Key,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></param>
@@ -141,7 +144,7 @@ public void Init(Java.Security.Key arg0, Java.Security.Spec.AlgorithmParameterSp
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#init(java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#init(java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
@@ -150,14 +153,14 @@ public void Init(Java.Security.Key arg0)
             IExecuteWithSignature("init", "(Ljava/security/Key;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#update(byte)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#update(byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Lang.IllegalStateException"/>
@@ -166,7 +169,7 @@ public void Update(byte arg0)
             IExecuteWithSignature("update", "(B)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#update(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#update(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -177,7 +180,7 @@ public void Update(byte[] arg0, int arg1, int arg2)
             IExecute("update", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#update(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#update(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Lang.IllegalStateException"/>
@@ -186,7 +189,7 @@ public void Update(byte[] arg0)
             IExecuteWithSignature("update", "([B)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/Mac.html#update(java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/Mac.html#update(java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         public void Update(Java.Nio.ByteBuffer arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/SealedObject.cs b/src/net/Netdroid/Generated/Javax/Crypto/SealedObject.cs
index 582e7e825..63ed13164 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/SealedObject.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/SealedObject.cs
@@ -30,7 +30,7 @@ public partial class SealedObject
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SealedObject.html#%3Cinit%3E(java.io.Serializable,javax.crypto.Cipher)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SealedObject.html#%3Cinit%3E(java.io.Serializable,javax.crypto.Cipher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Serializable"/></param>
         /// <param name="arg1"><see cref="Javax.Crypto.Cipher"/></param>
@@ -57,14 +57,7 @@ public SealedObject(Java.Io.Serializable arg0, Javax.Crypto.Cipher arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SealedObject.html#getAlgorithm()"/> 
-        /// </summary>
-        public Java.Lang.String Algorithm
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SealedObject.html#getObject(java.security.Key,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SealedObject.html#getObject(java.security.Key,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -79,7 +72,7 @@ public object GetObject(Java.Security.Key arg0, Java.Lang.String arg1)
             return IExecute("getObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SealedObject.html#getObject(java.security.Key)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SealedObject.html#getObject(java.security.Key)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Key"/></param>
         /// <returns><see cref="object"/></returns>
@@ -92,7 +85,7 @@ public object GetObject(Java.Security.Key arg0)
             return IExecuteWithSignature("getObject", "(Ljava/security/Key;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SealedObject.html#getObject(javax.crypto.Cipher)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SealedObject.html#getObject(javax.crypto.Cipher)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Crypto.Cipher"/></param>
         /// <returns><see cref="object"/></returns>
@@ -104,6 +97,14 @@ public object GetObject(Javax.Crypto.Cipher arg0)
         {
             return IExecuteWithSignature("getObject", "(Ljavax/crypto/Cipher;)Ljava/lang/Object;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SealedObject.html#getAlgorithm()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/SecretKey.cs b/src/net/Netdroid/Generated/Javax/Crypto/SecretKey.cs
index 8fa80121b..bdff60b8e 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/SecretKey.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/SecretKey.cs
@@ -64,9 +64,8 @@ public partial class SecretKey : Javax.Crypto.ISecretKey, Java.Security.IKey, Ja
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKey.html#serialVersionUID"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKey.html#serialVersionUID"/>
         /// </summary>
-        [System.Obsolete()]
         public static long serialVersionUID { get { if (!_serialVersionUIDReady) { _serialVersionUIDContent = SGetField<long>(LocalBridgeClazz, "serialVersionUID"); _serialVersionUIDReady = true; } return _serialVersionUIDContent; } }
         private static long _serialVersionUIDContent = default;
         private static bool _serialVersionUIDReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/SecretKeyFactory.cs b/src/net/Netdroid/Generated/Javax/Crypto/SecretKeyFactory.cs
index f898f38bf..adfc4f4df 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/SecretKeyFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/SecretKeyFactory.cs
@@ -42,7 +42,7 @@ public partial class SecretKeyFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -54,7 +54,7 @@ public static Javax.Crypto.SecretKeyFactory GetInstance(Java.Lang.String arg0, J
             return SExecute<Javax.Crypto.SecretKeyFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -65,7 +65,7 @@ public static Javax.Crypto.SecretKeyFactory GetInstance(Java.Lang.String arg0, J
             return SExecute<Javax.Crypto.SecretKeyFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Crypto.SecretKeyFactory"/></returns>
@@ -79,21 +79,23 @@ public static Javax.Crypto.SecretKeyFactory GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html#getProvider()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html#getKeySpec(javax.crypto.SecretKey,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html#getKeySpec(javax.crypto.SecretKey,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Crypto.SecretKey"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -104,7 +106,7 @@ public Java.Security.Spec.KeySpec GetKeySpec(Javax.Crypto.SecretKey arg0, Java.L
             return IExecute<Java.Security.Spec.KeySpec>("getKeySpec", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html#generateSecret(java.security.spec.KeySpec)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html#generateSecret(java.security.spec.KeySpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Spec.KeySpec"/></param>
         /// <returns><see cref="Javax.Crypto.SecretKey"/></returns>
@@ -114,7 +116,7 @@ public Javax.Crypto.SecretKey GenerateSecret(Java.Security.Spec.KeySpec arg0)
             return IExecuteWithSignature<Javax.Crypto.SecretKey>("generateSecret", "(Ljava/security/spec/KeySpec;)Ljavax/crypto/SecretKey;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/SecretKeyFactory.html#translateKey(javax.crypto.SecretKey)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/SecretKeyFactory.html#translateKey(javax.crypto.SecretKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Crypto.SecretKey"/></param>
         /// <returns><see cref="Javax.Crypto.SecretKey"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/AllPackageClasses.cs
index 144eef2b5..491b08422 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Crypto.Spec
 {
     #region DESedeKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESedeKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec.html"/>
     /// </summary>
     public partial class DESedeKeySpec : Java.Security.Spec.KeySpec
     {
@@ -72,7 +72,7 @@ public DESedeKeySpec(params object[] args) : base(args) { }
 
     #region DESKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec.html"/>
     /// </summary>
     public partial class DESKeySpec : Java.Security.Spec.KeySpec
     {
@@ -116,7 +116,7 @@ public DESKeySpec(params object[] args) : base(args) { }
 
     #region DHGenParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHGenParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHGenParameterSpec.html"/>
     /// </summary>
     public partial class DHGenParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -160,7 +160,7 @@ public DHGenParameterSpec(params object[] args) : base(args) { }
 
     #region DHParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHParameterSpec.html"/>
     /// </summary>
     public partial class DHParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -204,7 +204,7 @@ public DHParameterSpec(params object[] args) : base(args) { }
 
     #region DHPrivateKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPrivateKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPrivateKeySpec.html"/>
     /// </summary>
     public partial class DHPrivateKeySpec : Java.Security.Spec.KeySpec
     {
@@ -248,7 +248,7 @@ public DHPrivateKeySpec(params object[] args) : base(args) { }
 
     #region DHPublicKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPublicKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPublicKeySpec.html"/>
     /// </summary>
     public partial class DHPublicKeySpec : Java.Security.Spec.KeySpec
     {
@@ -292,7 +292,7 @@ public DHPublicKeySpec(params object[] args) : base(args) { }
 
     #region GCMParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/GCMParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/GCMParameterSpec.html"/>
     /// </summary>
     public partial class GCMParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -336,7 +336,7 @@ public GCMParameterSpec(params object[] args) : base(args) { }
 
     #region IvParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/IvParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/IvParameterSpec.html"/>
     /// </summary>
     public partial class IvParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -380,7 +380,7 @@ public IvParameterSpec(params object[] args) : base(args) { }
 
     #region OAEPParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/OAEPParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec.html"/>
     /// </summary>
     public partial class OAEPParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -424,7 +424,7 @@ public OAEPParameterSpec(params object[] args) : base(args) { }
 
     #region PBEKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html"/>
     /// </summary>
     public partial class PBEKeySpec : Java.Security.Spec.KeySpec
     {
@@ -468,7 +468,7 @@ public PBEKeySpec(params object[] args) : base(args) { }
 
     #region PBEParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec.html"/>
     /// </summary>
     public partial class PBEParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -512,7 +512,7 @@ public PBEParameterSpec(params object[] args) : base(args) { }
 
     #region PSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PSource.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/PSource.html"/>
     /// </summary>
     public partial class PSource : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PSource>
     {
@@ -552,7 +552,7 @@ public PSource(params object[] args) : base(args) { }
         // TODO: complete the class
         #region PSpecified
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PSource.PSpecified.html"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PSource.PSpecified.html"/>
         /// </summary>
         public partial class PSpecified : Javax.Crypto.Spec.PSource
         {
@@ -600,7 +600,7 @@ public PSpecified(params object[] args) : base(args) { }
 
     #region RC2ParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC2ParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec.html"/>
     /// </summary>
     public partial class RC2ParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -644,7 +644,7 @@ public RC2ParameterSpec(params object[] args) : base(args) { }
 
     #region RC5ParameterSpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC5ParameterSpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html"/>
     /// </summary>
     public partial class RC5ParameterSpec : Java.Security.Spec.AlgorithmParameterSpec
     {
@@ -688,7 +688,7 @@ public RC5ParameterSpec(params object[] args) : base(args) { }
 
     #region SecretKeySpec
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/SecretKeySpec.html"/>
+    /// <see href="https://developer.android.com/reference/javax/crypto/spec/SecretKeySpec.html"/>
     /// </summary>
     public partial class SecretKeySpec : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SecretKeySpec>
     {
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DESKeySpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DESKeySpec.cs
index 6f0bc2c29..f6fd300cd 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DESKeySpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DESKeySpec.cs
@@ -30,7 +30,7 @@ public partial class DESKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESKeySpec.html#%3Cinit%3E(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec.html#%3Cinit%3E(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public DESKeySpec(byte[] arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESKeySpec.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
@@ -57,7 +57,7 @@ public DESKeySpec(byte[] arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESKeySpec.html#DES_KEY_LEN"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec.html#DES_KEY_LEN"/>
         /// </summary>
         public static int DES_KEY_LEN { get { if (!_DES_KEY_LENReady) { _DES_KEY_LENContent = SGetField<int>(LocalBridgeClazz, "DES_KEY_LEN"); _DES_KEY_LENReady = true; } return _DES_KEY_LENContent; } }
         private static int _DES_KEY_LENContent = default;
@@ -67,7 +67,7 @@ public DESKeySpec(byte[] arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESKeySpec.html#isParityAdjusted(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec.html#isParityAdjusted(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -78,7 +78,7 @@ public static bool IsParityAdjusted(byte[] arg0, int arg1)
             return SExecute<bool>(LocalBridgeClazz, "isParityAdjusted", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESKeySpec.html#isWeak(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec.html#isWeak(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -93,11 +93,12 @@ public static bool IsWeak(byte[] arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESKeySpec.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESKeySpec.html#getKey()"/>
         /// </summary>
-        public byte[] Key
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetKey()
         {
-            get { return IExecuteWithSignatureArray<byte>("getKey", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getKey", "()[B");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DESedeKeySpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DESedeKeySpec.cs
index 2acca17b9..883efcf15 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DESedeKeySpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DESedeKeySpec.cs
@@ -30,7 +30,7 @@ public partial class DESedeKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESedeKeySpec.html#%3Cinit%3E(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec.html#%3Cinit%3E(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public DESedeKeySpec(byte[] arg0, int arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESedeKeySpec.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <exception cref="Java.Security.InvalidKeyException"/>
@@ -57,7 +57,7 @@ public DESedeKeySpec(byte[] arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESedeKeySpec.html#DES_EDE_KEY_LEN"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec.html#DES_EDE_KEY_LEN"/>
         /// </summary>
         public static int DES_EDE_KEY_LEN { get { if (!_DES_EDE_KEY_LENReady) { _DES_EDE_KEY_LENContent = SGetField<int>(LocalBridgeClazz, "DES_EDE_KEY_LEN"); _DES_EDE_KEY_LENReady = true; } return _DES_EDE_KEY_LENContent; } }
         private static int _DES_EDE_KEY_LENContent = default;
@@ -67,7 +67,7 @@ public DESedeKeySpec(byte[] arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESedeKeySpec.html#isParityAdjusted(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec.html#isParityAdjusted(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -82,11 +82,12 @@ public static bool IsParityAdjusted(byte[] arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DESedeKeySpec.html#getKey()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DESedeKeySpec.html#getKey()"/>
         /// </summary>
-        public byte[] Key
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetKey()
         {
-            get { return IExecuteWithSignatureArray<byte>("getKey", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getKey", "()[B");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHGenParameterSpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHGenParameterSpec.cs
index a66260d77..0e693c4ed 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHGenParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHGenParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class DHGenParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHGenParameterSpec.html#%3Cinit%3E(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHGenParameterSpec.html#%3Cinit%3E(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -55,18 +55,20 @@ public DHGenParameterSpec(int arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHGenParameterSpec.html#getExponentSize()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHGenParameterSpec.html#getExponentSize()"/>
         /// </summary>
-        public int ExponentSize
+        /// <returns><see cref="int"/></returns>
+        public int GetExponentSize()
         {
-            get { return IExecuteWithSignature<int>("getExponentSize", "()I"); }
+            return IExecuteWithSignature<int>("getExponentSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHGenParameterSpec.html#getPrimeSize()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHGenParameterSpec.html#getPrimeSize()"/>
         /// </summary>
-        public int PrimeSize
+        /// <returns><see cref="int"/></returns>
+        public int GetPrimeSize()
         {
-            get { return IExecuteWithSignature<int>("getPrimeSize", "()I"); }
+            return IExecuteWithSignature<int>("getPrimeSize", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHParameterSpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHParameterSpec.cs
index 0141e798a..e0c06fe96 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class DHParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHParameterSpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHParameterSpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -40,7 +40,7 @@ public DHParameterSpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, int
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHParameterSpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHParameterSpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -65,25 +65,28 @@ public DHParameterSpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHParameterSpec.html#getG()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHParameterSpec.html#getL()"/>
         /// </summary>
-        public Java.Math.BigInteger G
+        /// <returns><see cref="int"/></returns>
+        public int GetL()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<int>("getL", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHParameterSpec.html#getL()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHParameterSpec.html#getG()"/>
         /// </summary>
-        public int L
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetG()
         {
-            get { return IExecuteWithSignature<int>("getL", "()I"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHParameterSpec.html#getP()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHParameterSpec.html#getP()"/>
         /// </summary>
-        public Java.Math.BigInteger P
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHPrivateKeySpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHPrivateKeySpec.cs
index c91eb26b1..bcc601f53 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHPrivateKeySpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHPrivateKeySpec.cs
@@ -30,7 +30,7 @@ public partial class DHPrivateKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPrivateKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -56,25 +56,28 @@ public DHPrivateKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, Ja
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPrivateKeySpec.html#getG()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPrivateKeySpec.html#getG()"/>
         /// </summary>
-        public Java.Math.BigInteger G
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetG()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPrivateKeySpec.html#getP()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPrivateKeySpec.html#getP()"/>
         /// </summary>
-        public Java.Math.BigInteger P
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPrivateKeySpec.html#getX()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPrivateKeySpec.html#getX()"/>
         /// </summary>
-        public Java.Math.BigInteger X
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetX()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getX", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getX", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHPublicKeySpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHPublicKeySpec.cs
index 2d6036748..da3ebf37f 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHPublicKeySpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/DHPublicKeySpec.cs
@@ -30,7 +30,7 @@ public partial class DHPublicKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPublicKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPublicKeySpec.html#%3Cinit%3E(java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -56,25 +56,28 @@ public DHPublicKeySpec(Java.Math.BigInteger arg0, Java.Math.BigInteger arg1, Jav
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPublicKeySpec.html#getG()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPublicKeySpec.html#getG()"/>
         /// </summary>
-        public Java.Math.BigInteger G
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetG()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getG", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPublicKeySpec.html#getP()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPublicKeySpec.html#getP()"/>
         /// </summary>
-        public Java.Math.BigInteger P
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetP()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getP", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/DHPublicKeySpec.html#getY()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/DHPublicKeySpec.html#getY()"/>
         /// </summary>
-        public Java.Math.BigInteger Y
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetY()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getY", "()Ljava/math/BigInteger;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/GCMParameterSpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/GCMParameterSpec.cs
index 59479b1d2..b8377d8eb 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/GCMParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/GCMParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class GCMParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/GCMParameterSpec.html#%3Cinit%3E(int,byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/GCMParameterSpec.html#%3Cinit%3E(int,byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -41,7 +41,7 @@ public GCMParameterSpec(int arg0, byte[] arg1, int arg2, int arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/GCMParameterSpec.html#%3Cinit%3E(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/GCMParameterSpec.html#%3Cinit%3E(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -66,18 +66,20 @@ public GCMParameterSpec(int arg0, byte[] arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/GCMParameterSpec.html#getIV()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/GCMParameterSpec.html#getIV()"/>
         /// </summary>
-        public byte[] IV
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetIV()
         {
-            get { return IExecuteWithSignatureArray<byte>("getIV", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getIV", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/GCMParameterSpec.html#getTLen()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/GCMParameterSpec.html#getTLen()"/>
         /// </summary>
-        public int TLen
+        /// <returns><see cref="int"/></returns>
+        public int GetTLen()
         {
-            get { return IExecuteWithSignature<int>("getTLen", "()I"); }
+            return IExecuteWithSignature<int>("getTLen", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/IvParameterSpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/IvParameterSpec.cs
index caa6202fb..ee2115470 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/IvParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/IvParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class IvParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/IvParameterSpec.html#%3Cinit%3E(byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/IvParameterSpec.html#%3Cinit%3E(byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public IvParameterSpec(byte[] arg0, int arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/IvParameterSpec.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/IvParameterSpec.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public IvParameterSpec(byte[] arg0)
@@ -64,11 +64,12 @@ public IvParameterSpec(byte[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/IvParameterSpec.html#getIV()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/IvParameterSpec.html#getIV()"/>
         /// </summary>
-        public byte[] IV
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetIV()
         {
-            get { return IExecuteWithSignatureArray<byte>("getIV", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getIV", "()[B");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/OAEPParameterSpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/OAEPParameterSpec.cs
index 2b5391a82..d6921110c 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/OAEPParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/OAEPParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class OAEPParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/OAEPParameterSpec.html#%3Cinit%3E(java.lang.String,java.lang.String,java.security.spec.AlgorithmParameterSpec,javax.crypto.spec.PSource)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec.html#%3Cinit%3E(java.lang.String,java.lang.String,java.security.spec.AlgorithmParameterSpec,javax.crypto.spec.PSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -49,7 +49,7 @@ public OAEPParameterSpec(Java.Lang.String arg0, Java.Lang.String arg1, Java.Secu
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/OAEPParameterSpec.html#DEFAULT"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec.html#DEFAULT"/>
         /// </summary>
         public static Javax.Crypto.Spec.OAEPParameterSpec DEFAULT { get { if (!_DEFAULTReady) { _DEFAULTContent = SGetField<Javax.Crypto.Spec.OAEPParameterSpec>(LocalBridgeClazz, "DEFAULT"); _DEFAULTReady = true; } return _DEFAULTContent; } }
         private static Javax.Crypto.Spec.OAEPParameterSpec _DEFAULTContent = default;
@@ -63,32 +63,36 @@ public OAEPParameterSpec(Java.Lang.String arg0, Java.Lang.String arg1, Java.Secu
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/OAEPParameterSpec.html#getDigestAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec.html#getDigestAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String DigestAlgorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDigestAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDigestAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getDigestAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/OAEPParameterSpec.html#getMGFAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec.html#getMGFAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String MGFAlgorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMGFAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMGFAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMGFAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/OAEPParameterSpec.html#getMGFParameters()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec.html#getMGFParameters()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec MGFParameters
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetMGFParameters()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getMGFParameters", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getMGFParameters", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/OAEPParameterSpec.html#getPSource()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/OAEPParameterSpec.html#getPSource()"/>
         /// </summary>
-        public Javax.Crypto.Spec.PSource PSource
+        /// <returns><see cref="Javax.Crypto.Spec.PSource"/></returns>
+        public Javax.Crypto.Spec.PSource GetPSource()
         {
-            get { return IExecuteWithSignature<Javax.Crypto.Spec.PSource>("getPSource", "()Ljavax/crypto/spec/PSource;"); }
+            return IExecuteWithSignature<Javax.Crypto.Spec.PSource>("getPSource", "()Ljavax/crypto/spec/PSource;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/PBEKeySpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/PBEKeySpec.cs
index 7e876abae..b7f0bff80 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/PBEKeySpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/PBEKeySpec.cs
@@ -30,7 +30,7 @@ public partial class PBEKeySpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html#%3Cinit%3E(char[],byte[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html#%3Cinit%3E(char[],byte[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -41,7 +41,7 @@ public PBEKeySpec(char[] arg0, byte[] arg1, int arg2, int arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html#%3Cinit%3E(char[],byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html#%3Cinit%3E(char[],byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -51,7 +51,7 @@ public PBEKeySpec(char[] arg0, byte[] arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html#%3Cinit%3E(char[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html#%3Cinit%3E(char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         public PBEKeySpec(char[] arg0)
@@ -75,39 +75,43 @@ public PBEKeySpec(char[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html#getIterationCount()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html#getSalt()"/>
         /// </summary>
-        public int IterationCount
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSalt()
         {
-            get { return IExecuteWithSignature<int>("getIterationCount", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getSalt", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html#getKeyLength()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html#getPassword()"/>
         /// </summary>
-        public int KeyLength
+        /// <returns><see cref="char"/></returns>
+        public char[] GetPassword()
         {
-            get { return IExecuteWithSignature<int>("getKeyLength", "()I"); }
+            return IExecuteArray<char>("getPassword");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html#getPassword()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html#getIterationCount()"/>
         /// </summary>
-        public char[] Password
+        /// <returns><see cref="int"/></returns>
+        public int GetIterationCount()
         {
-            get { return IExecuteWithSignatureArray<char>("getPassword", "()[C"); }
+            return IExecuteWithSignature<int>("getIterationCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html#getSalt()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html#getKeyLength()"/>
         /// </summary>
-        public byte[] Salt
+        /// <returns><see cref="int"/></returns>
+        public int GetKeyLength()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSalt", "()[B"); }
+            return IExecuteWithSignature<int>("getKeyLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEKeySpec.html#clearPassword()"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEKeySpec.html#clearPassword()"/>
         /// </summary>
         public void ClearPassword()
         {
-            IExecuteWithSignature("clearPassword", "()V");
+            IExecute("clearPassword");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/PBEParameterSpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/PBEParameterSpec.cs
index b0dbb83c5..cabe1a29c 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/PBEParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/PBEParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class PBEParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEParameterSpec.html#%3Cinit%3E(byte[],int,java.security.spec.AlgorithmParameterSpec)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec.html#%3Cinit%3E(byte[],int,java.security.spec.AlgorithmParameterSpec)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -40,7 +40,7 @@ public PBEParameterSpec(byte[] arg0, int arg1, Java.Security.Spec.AlgorithmParam
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEParameterSpec.html#%3Cinit%3E(byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec.html#%3Cinit%3E(byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -65,25 +65,28 @@ public PBEParameterSpec(byte[] arg0, int arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEParameterSpec.html#getIterationCount()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec.html#getSalt()"/>
         /// </summary>
-        public int IterationCount
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSalt()
         {
-            get { return IExecuteWithSignature<int>("getIterationCount", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getSalt", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEParameterSpec.html#getParameterSpec()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec.html#getIterationCount()"/>
         /// </summary>
-        public Java.Security.Spec.AlgorithmParameterSpec ParameterSpec
+        /// <returns><see cref="int"/></returns>
+        public int GetIterationCount()
         {
-            get { return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParameterSpec", "()Ljava/security/spec/AlgorithmParameterSpec;"); }
+            return IExecuteWithSignature<int>("getIterationCount", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PBEParameterSpec.html#getSalt()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PBEParameterSpec.html#getParameterSpec()"/>
         /// </summary>
-        public byte[] Salt
+        /// <returns><see cref="Java.Security.Spec.AlgorithmParameterSpec"/></returns>
+        public Java.Security.Spec.AlgorithmParameterSpec GetParameterSpec()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSalt", "()[B"); }
+            return IExecuteWithSignature<Java.Security.Spec.AlgorithmParameterSpec>("getParameterSpec", "()Ljava/security/spec/AlgorithmParameterSpec;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/PSource.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/PSource.cs
index 294a25546..bbf1eb171 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/PSource.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/PSource.cs
@@ -46,11 +46,12 @@ public partial class PSource
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PSource.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/PSource.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
 
         #endregion
@@ -61,7 +62,7 @@ public partial class PSpecified
         {
             #region Constructors
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PSource.PSpecified.html#%3Cinit%3E(byte[])"/>
+            /// <see href="https://developer.android.com/reference/javax/crypto/spec/PSource.PSpecified.html#%3Cinit%3E(byte[])"/>
             /// </summary>
             /// <param name="arg0"><see cref="byte"/></param>
             public PSpecified(byte[] arg0)
@@ -77,7 +78,7 @@ public PSpecified(byte[] arg0)
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PSource.PSpecified.html#DEFAULT"/>
+            /// <see href="https://developer.android.com/reference/javax/crypto/spec/PSource.PSpecified.html#DEFAULT"/>
             /// </summary>
             public static Javax.Crypto.Spec.PSource.PSpecified DEFAULT { get { if (!_DEFAULTReady) { _DEFAULTContent = SGetField<Javax.Crypto.Spec.PSource.PSpecified>(LocalBridgeClazz, "DEFAULT"); _DEFAULTReady = true; } return _DEFAULTContent; } }
             private static Javax.Crypto.Spec.PSource.PSpecified _DEFAULTContent = default;
@@ -91,11 +92,12 @@ public PSpecified(byte[] arg0)
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/PSource.PSpecified.html#getValue()"/> 
+            /// <see href="https://developer.android.com/reference/javax/crypto/spec/PSource.PSpecified.html#getValue()"/>
             /// </summary>
-            public byte[] Value
+            /// <returns><see cref="byte"/></returns>
+            public byte[] GetValue()
             {
-                get { return IExecuteWithSignatureArray<byte>("getValue", "()[B"); }
+                return IExecuteWithSignatureArray<byte>("getValue", "()[B");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/RC2ParameterSpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/RC2ParameterSpec.cs
index ebd1c5739..3613fbc9e 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/RC2ParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/RC2ParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class RC2ParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC2ParameterSpec.html#%3Cinit%3E(int,byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec.html#%3Cinit%3E(int,byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -40,7 +40,7 @@ public RC2ParameterSpec(int arg0, byte[] arg1, int arg2)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC2ParameterSpec.html#%3Cinit%3E(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec.html#%3Cinit%3E(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -49,7 +49,7 @@ public RC2ParameterSpec(int arg0, byte[] arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC2ParameterSpec.html#%3Cinit%3E(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec.html#%3Cinit%3E(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public RC2ParameterSpec(int arg0)
@@ -73,18 +73,20 @@ public RC2ParameterSpec(int arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC2ParameterSpec.html#getEffectiveKeyBits()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec.html#getIV()"/>
         /// </summary>
-        public int EffectiveKeyBits
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetIV()
         {
-            get { return IExecuteWithSignature<int>("getEffectiveKeyBits", "()I"); }
+            return IExecuteWithSignatureArray<byte>("getIV", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC2ParameterSpec.html#getIV()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC2ParameterSpec.html#getEffectiveKeyBits()"/>
         /// </summary>
-        public byte[] IV
+        /// <returns><see cref="int"/></returns>
+        public int GetEffectiveKeyBits()
         {
-            get { return IExecuteWithSignatureArray<byte>("getIV", "()[B"); }
+            return IExecuteWithSignature<int>("getEffectiveKeyBits", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/RC5ParameterSpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/RC5ParameterSpec.cs
index 6a864e778..42dc3112c 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/RC5ParameterSpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/RC5ParameterSpec.cs
@@ -30,7 +30,7 @@ public partial class RC5ParameterSpec
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC5ParameterSpec.html#%3Cinit%3E(int,int,int,byte[],int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html#%3Cinit%3E(int,int,int,byte[],int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -42,7 +42,7 @@ public RC5ParameterSpec(int arg0, int arg1, int arg2, byte[] arg3, int arg4)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC5ParameterSpec.html#%3Cinit%3E(int,int,int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html#%3Cinit%3E(int,int,int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -53,7 +53,7 @@ public RC5ParameterSpec(int arg0, int arg1, int arg2, byte[] arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC5ParameterSpec.html#%3Cinit%3E(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html#%3Cinit%3E(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -79,32 +79,36 @@ public RC5ParameterSpec(int arg0, int arg1, int arg2)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC5ParameterSpec.html#getIV()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html#getIV()"/>
         /// </summary>
-        public byte[] IV
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetIV()
         {
-            get { return IExecuteWithSignatureArray<byte>("getIV", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getIV", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC5ParameterSpec.html#getRounds()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html#getRounds()"/>
         /// </summary>
-        public int Rounds
+        /// <returns><see cref="int"/></returns>
+        public int GetRounds()
         {
-            get { return IExecuteWithSignature<int>("getRounds", "()I"); }
+            return IExecuteWithSignature<int>("getRounds", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC5ParameterSpec.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html#getVersion()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/RC5ParameterSpec.html#getWordSize()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/RC5ParameterSpec.html#getWordSize()"/>
         /// </summary>
-        public int WordSize
+        /// <returns><see cref="int"/></returns>
+        public int GetWordSize()
         {
-            get { return IExecuteWithSignature<int>("getWordSize", "()I"); }
+            return IExecuteWithSignature<int>("getWordSize", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Crypto/Spec/SecretKeySpec.cs b/src/net/Netdroid/Generated/Javax/Crypto/Spec/SecretKeySpec.cs
index d7ba1ca57..a2c9227aa 100644
--- a/src/net/Netdroid/Generated/Javax/Crypto/Spec/SecretKeySpec.cs
+++ b/src/net/Netdroid/Generated/Javax/Crypto/Spec/SecretKeySpec.cs
@@ -30,7 +30,7 @@ public partial class SecretKeySpec : Java.Security.Spec.IKeySpec, Javax.Crypto.I
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/SecretKeySpec.html#%3Cinit%3E(byte[],int,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/SecretKeySpec.html#%3Cinit%3E(byte[],int,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -41,7 +41,7 @@ public SecretKeySpec(byte[] arg0, int arg1, int arg2, Java.Lang.String arg3)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/SecretKeySpec.html#%3Cinit%3E(byte[],java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/SecretKeySpec.html#%3Cinit%3E(byte[],java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -74,25 +74,28 @@ public SecretKeySpec(byte[] arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/SecretKeySpec.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/SecretKeySpec.html#getEncoded()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/SecretKeySpec.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/SecretKeySpec.html#getAlgorithm()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/crypto/spec/SecretKeySpec.html#getFormat()"/> 
+        /// <see href="https://developer.android.com/reference/javax/crypto/spec/SecretKeySpec.html#getFormat()"/>
         /// </summary>
-        public Java.Lang.String Format
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetFormat()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getFormat", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/AllPackageClasses.cs
index 26dc4abfa..bb9fc15cb 100644
--- a/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class EGL : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EGL>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EGL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGL() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EGL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGL(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -82,12 +82,12 @@ public partial class EGL10 : Javax.Microedition.Khronos.Egl.EGL
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EGL10 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGL10 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGL10() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EGL10 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGL10 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGL10(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -128,12 +128,12 @@ public partial class EGL11 : Javax.Microedition.Khronos.Egl.EGL10
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EGL11 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGL11 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGL11() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EGL11 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGL11 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGL11(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -174,12 +174,12 @@ public partial class EGLConfig : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EGLConf
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EGLConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLConfig() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EGLConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLConfig class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLConfig(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -220,12 +220,12 @@ public partial class EGLContext : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EGLCon
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EGLContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLContext() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EGLContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLContext(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -266,12 +266,12 @@ public partial class EGLDisplay : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EGLDis
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EGLDisplay class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLDisplay class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLDisplay() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EGLDisplay class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLDisplay class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLDisplay(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -312,12 +312,12 @@ public partial class EGLSurface : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EGLSur
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EGLSurface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLSurface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLSurface() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EGLSurface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EGLSurface class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EGLSurface(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/EGL10.cs b/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/EGL10.cs
index 237282257..18d414399 100644
--- a/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/EGL10.cs
+++ b/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/EGL10.cs
@@ -714,7 +714,7 @@ public Javax.Microedition.Khronos.Egl.EGLSurface EglCreatePbufferSurface(Javax.M
         /// <param name="arg2"><see cref="object"/></param>
         /// <param name="arg3"><see cref="int"/></param>
         /// <returns><see cref="Javax.Microedition.Khronos.Egl.EGLSurface"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Javax.Microedition.Khronos.Egl.EGLSurface EglCreatePixmapSurface(Javax.Microedition.Khronos.Egl.EGLDisplay arg0, Javax.Microedition.Khronos.Egl.EGLConfig arg1, object arg2, int[] arg3)
         {
             return IExecute<Javax.Microedition.Khronos.Egl.EGLSurface>("eglCreatePixmapSurface", arg0, arg1, arg2, arg3);
diff --git a/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/EGLContext.cs b/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/EGLContext.cs
index 07e9f5887..0dfe72428 100644
--- a/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/EGLContext.cs
+++ b/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Egl/EGLContext.cs
@@ -42,22 +42,24 @@ public partial class EGLContext
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/javax/microedition/khronos/egl/EGLContext.html#getEGL()"/> 
+        /// <see href="https://developer.android.com/reference/javax/microedition/khronos/egl/EGLContext.html#getEGL()"/>
         /// </summary>
-        public static Javax.Microedition.Khronos.Egl.EGL EGL
+        /// <returns><see cref="Javax.Microedition.Khronos.Egl.EGL"/></returns>
+        public static Javax.Microedition.Khronos.Egl.EGL GetEGL()
         {
-            get { return SExecuteWithSignature<Javax.Microedition.Khronos.Egl.EGL>(LocalBridgeClazz, "getEGL", "()Ljavax/microedition/khronos/egl/EGL;"); }
+            return SExecuteWithSignature<Javax.Microedition.Khronos.Egl.EGL>(LocalBridgeClazz, "getEGL", "()Ljavax/microedition/khronos/egl/EGL;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/javax/microedition/khronos/egl/EGLContext.html#getGL()"/> 
+        /// <see href="https://developer.android.com/reference/javax/microedition/khronos/egl/EGLContext.html#getGL()"/>
         /// </summary>
-        public Javax.Microedition.Khronos.Opengles.GL GL
+        /// <returns><see cref="Javax.Microedition.Khronos.Opengles.GL"/></returns>
+        public Javax.Microedition.Khronos.Opengles.GL GetGL()
         {
-            get { return IExecuteWithSignature<Javax.Microedition.Khronos.Opengles.GL>("getGL", "()Ljavax/microedition/khronos/opengles/GL;"); }
+            return IExecuteWithSignature<Javax.Microedition.Khronos.Opengles.GL>("getGL", "()Ljavax/microedition/khronos/opengles/GL;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Opengles/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Opengles/AllPackageClasses.cs
index 9b0d2c5f8..18e12080a 100644
--- a/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Opengles/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Microedition/Khronos/Opengles/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class GL : MASES.JCOBridge.C2JBridge.JVMBridgeBase<GL>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -82,12 +82,12 @@ public partial class GL10 : Javax.Microedition.Khronos.Opengles.GL
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GL10 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL10 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL10() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GL10 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL10 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL10(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -128,12 +128,12 @@ public partial class GL10Ext : Javax.Microedition.Khronos.Opengles.GL
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GL10Ext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL10Ext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL10Ext() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GL10Ext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL10Ext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL10Ext(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -174,12 +174,12 @@ public partial class GL11 : Javax.Microedition.Khronos.Opengles.GL10
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GL11 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL11 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL11() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GL11 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL11 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL11(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -220,12 +220,12 @@ public partial class GL11Ext : Javax.Microedition.Khronos.Opengles.GL
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GL11Ext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL11Ext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL11Ext() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GL11Ext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL11Ext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL11Ext(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -266,12 +266,12 @@ public partial class GL11ExtensionPack : Javax.Microedition.Khronos.Opengles.GL
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("GL11ExtensionPack class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL11ExtensionPack class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL11ExtensionPack() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("GL11ExtensionPack class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("GL11ExtensionPack class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public GL11ExtensionPack(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Net/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Net/AllPackageClasses.cs
index 491e3f538..6fb3b648a 100644
--- a/src/net/Netdroid/Generated/Javax/Net/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Net
 {
     #region ServerSocketFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ServerSocketFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ServerSocketFactory.html"/>
     /// </summary>
     public partial class ServerSocketFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ServerSocketFactory>
     {
@@ -36,12 +36,12 @@ public partial class ServerSocketFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ServerSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServerSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServerSocketFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ServerSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ServerSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ServerSocketFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public ServerSocketFactory(params object[] args) : base(args) { }
 
     #region SocketFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/SocketFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/SocketFactory.html"/>
     /// </summary>
     public partial class SocketFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SocketFactory>
     {
@@ -82,12 +82,12 @@ public partial class SocketFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Soc
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Net/ServerSocketFactory.cs b/src/net/Netdroid/Generated/Javax/Net/ServerSocketFactory.cs
index f7e7659e2..a4d7f3350 100644
--- a/src/net/Netdroid/Generated/Javax/Net/ServerSocketFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/ServerSocketFactory.cs
@@ -42,18 +42,19 @@ public partial class ServerSocketFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ServerSocketFactory.html#getDefault()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ServerSocketFactory.html#getDefault()"/>
         /// </summary>
-        public static Javax.Net.ServerSocketFactory Default
+        /// <returns><see cref="Javax.Net.ServerSocketFactory"/></returns>
+        public static Javax.Net.ServerSocketFactory GetDefault()
         {
-            get { return SExecuteWithSignature<Javax.Net.ServerSocketFactory>(LocalBridgeClazz, "getDefault", "()Ljavax/net/ServerSocketFactory;"); }
+            return SExecuteWithSignature<Javax.Net.ServerSocketFactory>(LocalBridgeClazz, "getDefault", "()Ljavax/net/ServerSocketFactory;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ServerSocketFactory.html#createServerSocket(int,int,java.net.InetAddress)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ServerSocketFactory.html#createServerSocket(int,int,java.net.InetAddress)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -65,7 +66,7 @@ public Java.Net.ServerSocket CreateServerSocket(int arg0, int arg1, Java.Net.Ine
             return IExecute<Java.Net.ServerSocket>("createServerSocket", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ServerSocketFactory.html#createServerSocket(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ServerSocketFactory.html#createServerSocket(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -76,7 +77,7 @@ public Java.Net.ServerSocket CreateServerSocket(int arg0, int arg1)
             return IExecute<Java.Net.ServerSocket>("createServerSocket", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ServerSocketFactory.html#createServerSocket(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ServerSocketFactory.html#createServerSocket(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Net.ServerSocket"/></returns>
@@ -86,7 +87,7 @@ public Java.Net.ServerSocket CreateServerSocket(int arg0)
             return IExecuteWithSignature<Java.Net.ServerSocket>("createServerSocket", "(I)Ljava/net/ServerSocket;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ServerSocketFactory.html#createServerSocket()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ServerSocketFactory.html#createServerSocket()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.ServerSocket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Net/SocketFactory.cs b/src/net/Netdroid/Generated/Javax/Net/SocketFactory.cs
index 5dd62bb61..ffc56b96c 100644
--- a/src/net/Netdroid/Generated/Javax/Net/SocketFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/SocketFactory.cs
@@ -42,18 +42,19 @@ public partial class SocketFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/SocketFactory.html#getDefault()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/SocketFactory.html#getDefault()"/>
         /// </summary>
-        public static Javax.Net.SocketFactory Default
+        /// <returns><see cref="Javax.Net.SocketFactory"/></returns>
+        public static Javax.Net.SocketFactory GetDefault()
         {
-            get { return SExecuteWithSignature<Javax.Net.SocketFactory>(LocalBridgeClazz, "getDefault", "()Ljavax/net/SocketFactory;"); }
+            return SExecuteWithSignature<Javax.Net.SocketFactory>(LocalBridgeClazz, "getDefault", "()Ljavax/net/SocketFactory;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/SocketFactory.html#createSocket(java.lang.String,int,java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/SocketFactory.html#createSocket(java.lang.String,int,java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -67,7 +68,7 @@ public Java.Net.Socket CreateSocket(Java.Lang.String arg0, int arg1, Java.Net.In
             return IExecute<Java.Net.Socket>("createSocket", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/SocketFactory.html#createSocket(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/SocketFactory.html#createSocket(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -79,7 +80,7 @@ public Java.Net.Socket CreateSocket(Java.Lang.String arg0, int arg1)
             return IExecute<Java.Net.Socket>("createSocket", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/SocketFactory.html#createSocket(java.net.InetAddress,int,java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/SocketFactory.html#createSocket(java.net.InetAddress,int,java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -92,7 +93,7 @@ public Java.Net.Socket CreateSocket(Java.Net.InetAddress arg0, int arg1, Java.Ne
             return IExecute<Java.Net.Socket>("createSocket", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/SocketFactory.html#createSocket(java.net.InetAddress,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/SocketFactory.html#createSocket(java.net.InetAddress,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.InetAddress"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -103,7 +104,7 @@ public Java.Net.Socket CreateSocket(Java.Net.InetAddress arg0, int arg1)
             return IExecute<Java.Net.Socket>("createSocket", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/SocketFactory.html#createSocket()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/SocketFactory.html#createSocket()"/>
         /// </summary>
         /// <returns><see cref="Java.Net.Socket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/AllPackageClasses.cs
index 7bce4a540..6eeca3059 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Net.Ssl
 {
     #region CertPathTrustManagerParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/CertPathTrustManagerParameters.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/CertPathTrustManagerParameters.html"/>
     /// </summary>
     public partial class CertPathTrustManagerParameters : Javax.Net.Ssl.ManagerFactoryParameters
     {
@@ -72,7 +72,7 @@ public CertPathTrustManagerParameters(params object[] args) : base(args) { }
 
     #region ExtendedSSLSession
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/ExtendedSSLSession.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/ExtendedSSLSession.html"/>
     /// </summary>
     public partial class ExtendedSSLSession : Javax.Net.Ssl.SSLSession
     {
@@ -80,12 +80,12 @@ public partial class ExtendedSSLSession : Javax.Net.Ssl.SSLSession
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ExtendedSSLSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ExtendedSSLSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ExtendedSSLSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ExtendedSSLSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ExtendedSSLSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ExtendedSSLSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -118,7 +118,7 @@ public ExtendedSSLSession(params object[] args) : base(args) { }
 
     #region HandshakeCompletedEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html"/>
     /// </summary>
     public partial class HandshakeCompletedEvent : Java.Util.EventObject
     {
@@ -162,7 +162,7 @@ public HandshakeCompletedEvent(params object[] args) : base(args) { }
 
     #region HandshakeCompletedListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedListener.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedListener.html"/>
     /// </summary>
     public partial class HandshakeCompletedListener : Java.Util.EventListener
     {
@@ -171,10 +171,13 @@ public partial class HandshakeCompletedListener : Java.Util.EventListener
         /// </summary>
         public HandshakeCompletedListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.javax.net.ssl.HandshakeCompletedListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.javax.net.ssl.HandshakeCompletedListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -196,10 +199,13 @@ public partial class HandshakeCompletedListenerDirect : HandshakeCompletedListen
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "javax.net.ssl.HandshakeCompletedListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "javax.net.ssl.HandshakeCompletedListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -221,7 +227,7 @@ protected override void InitializeHandlers() { }
 
     #region HostnameVerifier
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HostnameVerifier.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/HostnameVerifier.html"/>
     /// </summary>
     public partial class HostnameVerifier : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HostnameVerifier>
     {
@@ -229,12 +235,12 @@ public partial class HostnameVerifier : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HostnameVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HostnameVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HostnameVerifier() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HostnameVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HostnameVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HostnameVerifier(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -267,7 +273,7 @@ public HostnameVerifier(params object[] args) : base(args) { }
 
     #region HttpsURLConnection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html"/>
     /// </summary>
     public partial class HttpsURLConnection : Java.Net.HttpURLConnection
     {
@@ -275,12 +281,12 @@ public partial class HttpsURLConnection : Java.Net.HttpURLConnection
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HttpsURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HttpsURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HttpsURLConnection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HttpsURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HttpsURLConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HttpsURLConnection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -313,7 +319,7 @@ public HttpsURLConnection(params object[] args) : base(args) { }
 
     #region KeyManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManager.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManager.html"/>
     /// </summary>
     public partial class KeyManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyManager>
     {
@@ -321,12 +327,12 @@ public partial class KeyManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyMan
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -359,7 +365,7 @@ public KeyManager(params object[] args) : base(args) { }
 
     #region KeyManagerFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html"/>
     /// </summary>
     public partial class KeyManagerFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyManagerFactory>
     {
@@ -403,7 +409,7 @@ public KeyManagerFactory(params object[] args) : base(args) { }
 
     #region KeyManagerFactorySpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactorySpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactorySpi.html"/>
     /// </summary>
     public partial class KeyManagerFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<KeyManagerFactorySpi>
     {
@@ -411,12 +417,12 @@ public partial class KeyManagerFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridgeB
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("KeyManagerFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyManagerFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyManagerFactorySpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("KeyManagerFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("KeyManagerFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public KeyManagerFactorySpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -449,7 +455,7 @@ public KeyManagerFactorySpi(params object[] args) : base(args) { }
 
     #region KeyStoreBuilderParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyStoreBuilderParameters.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyStoreBuilderParameters.html"/>
     /// </summary>
     public partial class KeyStoreBuilderParameters : Javax.Net.Ssl.ManagerFactoryParameters
     {
@@ -493,7 +499,7 @@ public KeyStoreBuilderParameters(params object[] args) : base(args) { }
 
     #region ManagerFactoryParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/ManagerFactoryParameters.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/ManagerFactoryParameters.html"/>
     /// </summary>
     public partial class ManagerFactoryParameters : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ManagerFactoryParameters>
     {
@@ -501,12 +507,12 @@ public partial class ManagerFactoryParameters : MASES.JCOBridge.C2JBridge.JVMBri
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ManagerFactoryParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ManagerFactoryParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ManagerFactoryParameters() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ManagerFactoryParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ManagerFactoryParameters class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ManagerFactoryParameters(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -539,7 +545,7 @@ public ManagerFactoryParameters(params object[] args) : base(args) { }
 
     #region SNIHostName
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIHostName.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIHostName.html"/>
     /// </summary>
     public partial class SNIHostName : Javax.Net.Ssl.SNIServerName
     {
@@ -583,7 +589,7 @@ public SNIHostName(params object[] args) : base(args) { }
 
     #region SNIMatcher
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIMatcher.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIMatcher.html"/>
     /// </summary>
     public partial class SNIMatcher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SNIMatcher>
     {
@@ -591,12 +597,12 @@ public partial class SNIMatcher : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SNIMat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SNIMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SNIMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SNIMatcher() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SNIMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SNIMatcher class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SNIMatcher(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -629,7 +635,7 @@ public SNIMatcher(params object[] args) : base(args) { }
 
     #region SNIServerName
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIServerName.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIServerName.html"/>
     /// </summary>
     public partial class SNIServerName : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SNIServerName>
     {
@@ -637,12 +643,12 @@ public partial class SNIServerName : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SNI
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SNIServerName class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SNIServerName class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SNIServerName() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SNIServerName class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SNIServerName class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SNIServerName(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -675,7 +681,7 @@ public SNIServerName(params object[] args) : base(args) { }
 
     #region SSLContext
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html"/>
     /// </summary>
     public partial class SSLContext : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLContext>
     {
@@ -719,7 +725,7 @@ public SSLContext(params object[] args) : base(args) { }
 
     #region SSLContextSpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContextSpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContextSpi.html"/>
     /// </summary>
     public partial class SSLContextSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLContextSpi>
     {
@@ -727,12 +733,12 @@ public partial class SSLContextSpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSL
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SSLContextSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLContextSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLContextSpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SSLContextSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLContextSpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLContextSpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -765,7 +771,7 @@ public SSLContextSpi(params object[] args) : base(args) { }
 
     #region SSLEngine
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html"/>
     /// </summary>
     public partial class SSLEngine : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLEngine>
     {
@@ -773,12 +779,12 @@ public partial class SSLEngine : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLEngi
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SSLEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLEngine() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SSLEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLEngine class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLEngine(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -811,7 +817,7 @@ public SSLEngine(params object[] args) : base(args) { }
 
     #region SSLEngineResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html"/>
     /// </summary>
     public partial class SSLEngineResult : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLEngineResult>
     {
@@ -851,7 +857,7 @@ public SSLEngineResult(params object[] args) : base(args) { }
         // TODO: complete the class
         #region HandshakeStatus
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html"/>
         /// </summary>
         public partial class HandshakeStatus : Java.Lang.Enum<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>
         {
@@ -895,7 +901,7 @@ public HandshakeStatus(params object[] args) : base(args) { }
 
         #region Status
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.Status.html"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.Status.html"/>
         /// </summary>
         public partial class Status : Java.Lang.Enum<Javax.Net.Ssl.SSLEngineResult.Status>
         {
@@ -943,7 +949,7 @@ public Status(params object[] args) : base(args) { }
 
     #region SSLException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLException.html"/>
     /// </summary>
     public partial class SSLException : Java.Io.IOException
     {
@@ -960,7 +966,7 @@ public partial class SSLException : Java.Io.IOException
 
     #region SSLHandshakeException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLHandshakeException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLHandshakeException.html"/>
     /// </summary>
     public partial class SSLHandshakeException : Javax.Net.Ssl.SSLException
     {
@@ -977,7 +983,7 @@ public partial class SSLHandshakeException : Javax.Net.Ssl.SSLException
 
     #region SSLKeyException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLKeyException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLKeyException.html"/>
     /// </summary>
     public partial class SSLKeyException : Javax.Net.Ssl.SSLException
     {
@@ -994,7 +1000,7 @@ public partial class SSLKeyException : Javax.Net.Ssl.SSLException
 
     #region SSLParameters
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html"/>
     /// </summary>
     public partial class SSLParameters : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLParameters>
     {
@@ -1038,7 +1044,7 @@ public SSLParameters(params object[] args) : base(args) { }
 
     #region SSLPeerUnverifiedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLPeerUnverifiedException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLPeerUnverifiedException.html"/>
     /// </summary>
     public partial class SSLPeerUnverifiedException : Javax.Net.Ssl.SSLException
     {
@@ -1055,7 +1061,7 @@ public partial class SSLPeerUnverifiedException : Javax.Net.Ssl.SSLException
 
     #region SSLPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLPermission.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLPermission.html"/>
     /// </summary>
     public partial class SSLPermission : Java.Security.BasicPermission
     {
@@ -1099,7 +1105,7 @@ public SSLPermission(params object[] args) : base(args) { }
 
     #region SSLProtocolException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLProtocolException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLProtocolException.html"/>
     /// </summary>
     public partial class SSLProtocolException : Javax.Net.Ssl.SSLException
     {
@@ -1116,7 +1122,7 @@ public partial class SSLProtocolException : Javax.Net.Ssl.SSLException
 
     #region SSLServerSocket
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html"/>
     /// </summary>
     public partial class SSLServerSocket : Java.Net.ServerSocket
     {
@@ -1124,12 +1130,12 @@ public partial class SSLServerSocket : Java.Net.ServerSocket
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SSLServerSocket class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLServerSocket class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLServerSocket() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SSLServerSocket class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLServerSocket class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLServerSocket(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1162,7 +1168,7 @@ public SSLServerSocket(params object[] args) : base(args) { }
 
     #region SSLServerSocketFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocketFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocketFactory.html"/>
     /// </summary>
     public partial class SSLServerSocketFactory : Javax.Net.ServerSocketFactory
     {
@@ -1170,12 +1176,12 @@ public partial class SSLServerSocketFactory : Javax.Net.ServerSocketFactory
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SSLServerSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLServerSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLServerSocketFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SSLServerSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLServerSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLServerSocketFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1208,7 +1214,7 @@ public SSLServerSocketFactory(params object[] args) : base(args) { }
 
     #region SSLSession
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html"/>
     /// </summary>
     public partial class SSLSession : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLSession>
     {
@@ -1216,12 +1222,12 @@ public partial class SSLSession : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLSes
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SSLSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLSession() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SSLSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLSession class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLSession(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1254,7 +1260,7 @@ public SSLSession(params object[] args) : base(args) { }
 
     #region SSLSessionBindingEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingEvent.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingEvent.html"/>
     /// </summary>
     public partial class SSLSessionBindingEvent : Java.Util.EventObject
     {
@@ -1298,7 +1304,7 @@ public SSLSessionBindingEvent(params object[] args) : base(args) { }
 
     #region SSLSessionBindingListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingListener.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html"/>
     /// </summary>
     public partial class SSLSessionBindingListener : Java.Util.EventListener
     {
@@ -1307,10 +1313,13 @@ public partial class SSLSessionBindingListener : Java.Util.EventListener
         /// </summary>
         public SSLSessionBindingListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.javax.net.ssl.SSLSessionBindingListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.javax.net.ssl.SSLSessionBindingListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -1332,10 +1341,13 @@ public partial class SSLSessionBindingListenerDirect : SSLSessionBindingListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "javax.net.ssl.SSLSessionBindingListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "javax.net.ssl.SSLSessionBindingListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -1357,7 +1369,7 @@ protected override void InitializeHandlers() { }
 
     #region SSLSessionContext
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionContext.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionContext.html"/>
     /// </summary>
     public partial class SSLSessionContext : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SSLSessionContext>
     {
@@ -1365,12 +1377,12 @@ public partial class SSLSessionContext : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SSLSessionContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLSessionContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLSessionContext() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SSLSessionContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLSessionContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLSessionContext(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1403,7 +1415,7 @@ public SSLSessionContext(params object[] args) : base(args) { }
 
     #region SSLSocket
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html"/>
     /// </summary>
     public partial class SSLSocket : Java.Net.Socket
     {
@@ -1411,12 +1423,12 @@ public partial class SSLSocket : Java.Net.Socket
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SSLSocket class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLSocket class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLSocket() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SSLSocket class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLSocket class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLSocket(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1449,7 +1461,7 @@ public SSLSocket(params object[] args) : base(args) { }
 
     #region SSLSocketFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocketFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocketFactory.html"/>
     /// </summary>
     public partial class SSLSocketFactory : Javax.Net.SocketFactory
     {
@@ -1457,12 +1469,12 @@ public partial class SSLSocketFactory : Javax.Net.SocketFactory
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SSLSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLSocketFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SSLSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SSLSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SSLSocketFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1495,7 +1507,7 @@ public SSLSocketFactory(params object[] args) : base(args) { }
 
     #region StandardConstants
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/StandardConstants.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/StandardConstants.html"/>
     /// </summary>
     public partial class StandardConstants : MASES.JCOBridge.C2JBridge.JVMBridgeBase<StandardConstants>
     {
@@ -1539,7 +1551,7 @@ public StandardConstants(params object[] args) : base(args) { }
 
     #region TrustManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManager.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManager.html"/>
     /// </summary>
     public partial class TrustManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TrustManager>
     {
@@ -1547,12 +1559,12 @@ public partial class TrustManager : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Trus
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TrustManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TrustManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1585,7 +1597,7 @@ public TrustManager(params object[] args) : base(args) { }
 
     #region TrustManagerFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html"/>
     /// </summary>
     public partial class TrustManagerFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TrustManagerFactory>
     {
@@ -1629,7 +1641,7 @@ public TrustManagerFactory(params object[] args) : base(args) { }
 
     #region TrustManagerFactorySpi
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactorySpi.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactorySpi.html"/>
     /// </summary>
     public partial class TrustManagerFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TrustManagerFactorySpi>
     {
@@ -1637,12 +1649,12 @@ public partial class TrustManagerFactorySpi : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TrustManagerFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TrustManagerFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TrustManagerFactorySpi() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TrustManagerFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TrustManagerFactorySpi class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TrustManagerFactorySpi(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1675,7 +1687,7 @@ public TrustManagerFactorySpi(params object[] args) : base(args) { }
 
     #region X509ExtendedKeyManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509ExtendedKeyManager.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedKeyManager.html"/>
     /// </summary>
     public partial class X509ExtendedKeyManager : Javax.Net.Ssl.X509KeyManager
     {
@@ -1683,12 +1695,12 @@ public partial class X509ExtendedKeyManager : Javax.Net.Ssl.X509KeyManager
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509ExtendedKeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509ExtendedKeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509ExtendedKeyManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509ExtendedKeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509ExtendedKeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509ExtendedKeyManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1721,7 +1733,7 @@ public X509ExtendedKeyManager(params object[] args) : base(args) { }
 
     #region X509ExtendedTrustManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509ExtendedTrustManager.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager.html"/>
     /// </summary>
     public partial class X509ExtendedTrustManager : Javax.Net.Ssl.X509TrustManager
     {
@@ -1729,12 +1741,12 @@ public partial class X509ExtendedTrustManager : Javax.Net.Ssl.X509TrustManager
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509ExtendedTrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509ExtendedTrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509ExtendedTrustManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509ExtendedTrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509ExtendedTrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509ExtendedTrustManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1767,7 +1779,7 @@ public X509ExtendedTrustManager(params object[] args) : base(args) { }
 
     #region X509KeyManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509KeyManager.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/X509KeyManager.html"/>
     /// </summary>
     public partial class X509KeyManager : Javax.Net.Ssl.KeyManager
     {
@@ -1775,12 +1787,12 @@ public partial class X509KeyManager : Javax.Net.Ssl.KeyManager
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509KeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509KeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509KeyManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509KeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509KeyManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509KeyManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1813,7 +1825,7 @@ public X509KeyManager(params object[] args) : base(args) { }
 
     #region X509TrustManager
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509TrustManager.html"/>
+    /// <see href="https://developer.android.com/reference/javax/net/ssl/X509TrustManager.html"/>
     /// </summary>
     public partial class X509TrustManager : Javax.Net.Ssl.TrustManager
     {
@@ -1821,12 +1833,12 @@ public partial class X509TrustManager : Javax.Net.Ssl.TrustManager
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509TrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509TrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509TrustManager() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509TrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509TrustManager class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509TrustManager(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/CertPathTrustManagerParameters.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/CertPathTrustManagerParameters.cs
index ca65572b7..6ea0e3ee4 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/CertPathTrustManagerParameters.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/CertPathTrustManagerParameters.cs
@@ -30,7 +30,7 @@ public partial class CertPathTrustManagerParameters
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/CertPathTrustManagerParameters.html#%3Cinit%3E(java.security.cert.CertPathParameters)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/CertPathTrustManagerParameters.html#%3Cinit%3E(java.security.cert.CertPathParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.CertPathParameters"/></param>
         public CertPathTrustManagerParameters(Java.Security.Cert.CertPathParameters arg0)
@@ -54,11 +54,12 @@ public CertPathTrustManagerParameters(Java.Security.Cert.CertPathParameters arg0
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/CertPathTrustManagerParameters.html#getParameters()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/CertPathTrustManagerParameters.html#getParameters()"/>
         /// </summary>
-        public Java.Security.Cert.CertPathParameters Parameters
+        /// <returns><see cref="Java.Security.Cert.CertPathParameters"/></returns>
+        public Java.Security.Cert.CertPathParameters GetParameters()
         {
-            get { return IExecuteWithSignature<Java.Security.Cert.CertPathParameters>("getParameters", "()Ljava/security/cert/CertPathParameters;"); }
+            return IExecuteWithSignature<Java.Security.Cert.CertPathParameters>("getParameters", "()Ljava/security/cert/CertPathParameters;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/ExtendedSSLSession.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/ExtendedSSLSession.cs
index 33a3d2a15..1b7e1e327 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/ExtendedSSLSession.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/ExtendedSSLSession.cs
@@ -46,32 +46,36 @@ public partial class ExtendedSSLSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/ExtendedSSLSession.html#getLocalSupportedSignatureAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/ExtendedSSLSession.html#getLocalSupportedSignatureAlgorithms()"/>
         /// </summary>
-        public Java.Lang.String[] LocalSupportedSignatureAlgorithms
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetLocalSupportedSignatureAlgorithms()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getLocalSupportedSignatureAlgorithms", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getLocalSupportedSignatureAlgorithms", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/ExtendedSSLSession.html#getPeerSupportedSignatureAlgorithms()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/ExtendedSSLSession.html#getPeerSupportedSignatureAlgorithms()"/>
         /// </summary>
-        public Java.Lang.String[] PeerSupportedSignatureAlgorithms
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetPeerSupportedSignatureAlgorithms()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getPeerSupportedSignatureAlgorithms", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getPeerSupportedSignatureAlgorithms", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/ExtendedSSLSession.html#getRequestedServerNames()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/ExtendedSSLSession.html#getStatusResponses()"/>
         /// </summary>
-        public Java.Util.List<Javax.Net.Ssl.SNIServerName> RequestedServerNames
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<byte[]> GetStatusResponses()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Javax.Net.Ssl.SNIServerName>>("getRequestedServerNames", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<byte[]>>("getStatusResponses", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/ExtendedSSLSession.html#getStatusResponses()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/ExtendedSSLSession.html#getRequestedServerNames()"/>
         /// </summary>
-        public Java.Util.List<byte[]> StatusResponses
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Javax.Net.Ssl.SNIServerName> GetRequestedServerNames()
         {
-            get { return IExecuteWithSignature<Java.Util.List<byte[]>>("getStatusResponses", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Javax.Net.Ssl.SNIServerName>>("getRequestedServerNames", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/HandshakeCompletedEvent.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/HandshakeCompletedEvent.cs
index 44cd272a5..c0216a83e 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/HandshakeCompletedEvent.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/HandshakeCompletedEvent.cs
@@ -30,7 +30,7 @@ public partial class HandshakeCompletedEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#%3Cinit%3E(javax.net.ssl.SSLSocket,javax.net.ssl.SSLSession)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#%3Cinit%3E(javax.net.ssl.SSLSocket,javax.net.ssl.SSLSession)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLSocket"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.SSLSession"/></param>
@@ -55,61 +55,72 @@ public HandshakeCompletedEvent(Javax.Net.Ssl.SSLSocket arg0, Javax.Net.Ssl.SSLSe
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#getCipherSuite()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#getCipherSuite()"/>
         /// </summary>
-        public Java.Lang.String CipherSuite
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCipherSuite()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCipherSuite", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCipherSuite", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#getLocalCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#getLocalCertificates()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] LocalCertificates
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        public Java.Security.Cert.Certificate[] GetLocalCertificates()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getLocalCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getLocalCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#getLocalPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#getPeerCertificates()"/>
         /// </summary>
-        public Java.Security.Principal LocalPrincipal
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        public Java.Security.Cert.Certificate[] GetPeerCertificates()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getLocalPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getPeerCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#getPeerCertificateChain()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#getLocalPrincipal()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Javax.Security.Cert.X509Certificate[] PeerCertificateChain
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetLocalPrincipal()
         {
-            get { return IExecuteWithSignatureArray<Javax.Security.Cert.X509Certificate>("getPeerCertificateChain", "()[Ljavax/security/cert/X509Certificate;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getLocalPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#getPeerCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#getPeerPrincipal()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] PeerCertificates
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        public Java.Security.Principal GetPeerPrincipal()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getPeerCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getPeerPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#getPeerPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#getSession()"/>
         /// </summary>
-        public Java.Security.Principal PeerPrincipal
+        /// <returns><see cref="Javax.Net.Ssl.SSLSession"/></returns>
+        public Javax.Net.Ssl.SSLSession GetSession()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getPeerPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "()Ljavax/net/ssl/SSLSession;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#getSession()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#getSocket()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSession Session
+        /// <returns><see cref="Javax.Net.Ssl.SSLSocket"/></returns>
+        public Javax.Net.Ssl.SSLSocket GetSocket()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "()Ljavax/net/ssl/SSLSession;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSocket>("getSocket", "()Ljavax/net/ssl/SSLSocket;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedEvent.html#getSocket()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedEvent.html#getPeerCertificateChain()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSocket Socket
+        /// <returns><see cref="Javax.Security.Cert.X509Certificate"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        [global::System.Obsolete()]
+        public Javax.Security.Cert.X509Certificate[] GetPeerCertificateChain()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSocket>("getSocket", "()Ljavax/net/ssl/SSLSocket;"); }
+            return IExecuteWithSignatureArray<Javax.Security.Cert.X509Certificate>("getPeerCertificateChain", "()[Ljavax/security/cert/X509Certificate;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/HandshakeCompletedListener.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/HandshakeCompletedListener.cs
index a9a206fac..93524d4e7 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/HandshakeCompletedListener.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/HandshakeCompletedListener.cs
@@ -27,7 +27,7 @@ namespace Javax.Net.Ssl
 {
     #region IHandshakeCompletedListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.javax.net.ssl.HandshakeCompletedListener implementing <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.javax.net.ssl.HandshakeCompletedListener implementing <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedListener.html"/>
     /// </summary>
     public partial interface IHandshakeCompletedListener
     {
@@ -68,15 +68,15 @@ public partial class HandshakeCompletedListener : Javax.Net.Ssl.IHandshakeComple
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("handshakeCompleted", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.HandshakeCompletedEvent>>>(HandshakeCompletedEventHandler));
+            AddEventHandler("handshakeCompleted", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.HandshakeCompletedEvent>>>(HandshakeCompletedEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedListener.html#handshakeCompleted(javax.net.ssl.HandshakeCompletedEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedListener.html#handshakeCompleted(javax.net.ssl.HandshakeCompletedEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnHandshakeCompleted"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Net.Ssl.HandshakeCompletedEvent> OnHandshakeCompleted { get; set; } = null;
+        public global::System.Action<Javax.Net.Ssl.HandshakeCompletedEvent> OnHandshakeCompleted { get; set; } = null;
 
         void HandshakeCompletedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.HandshakeCompletedEvent>> data)
         {
@@ -85,7 +85,7 @@ void HandshakeCompletedEventHandler(object sender, CLRListenerEventArgs<CLREvent
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedListener.html#handshakeCompleted(javax.net.ssl.HandshakeCompletedEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedListener.html#handshakeCompleted(javax.net.ssl.HandshakeCompletedEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.HandshakeCompletedEvent"/></param>
         public virtual void HandshakeCompleted(Javax.Net.Ssl.HandshakeCompletedEvent arg0)
@@ -124,7 +124,7 @@ public partial class HandshakeCompletedListenerDirect : Javax.Net.Ssl.IHandshake
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HandshakeCompletedListener.html#handshakeCompleted(javax.net.ssl.HandshakeCompletedEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HandshakeCompletedListener.html#handshakeCompleted(javax.net.ssl.HandshakeCompletedEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.HandshakeCompletedEvent"/></param>
         public override void HandshakeCompleted(Javax.Net.Ssl.HandshakeCompletedEvent arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/HostnameVerifier.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/HostnameVerifier.cs
index 052980e92..d90eec4db 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/HostnameVerifier.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/HostnameVerifier.cs
@@ -64,7 +64,7 @@ public partial class HostnameVerifier : Javax.Net.Ssl.IHostnameVerifier
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HostnameVerifier.html#verify(java.lang.String,javax.net.ssl.SSLSession)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HostnameVerifier.html#verify(java.lang.String,javax.net.ssl.SSLSession)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.SSLSession"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/HttpsURLConnection.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/HttpsURLConnection.cs
index f3bdff159..d1bc0bd61 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/HttpsURLConnection.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/HttpsURLConnection.cs
@@ -42,78 +42,114 @@ public partial class HttpsURLConnection
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getDefaultHostnameVerifier()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#setDefaultHostnameVerifier(javax.net.ssl.HostnameVerifier)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getDefaultHostnameVerifier()"/>
         /// </summary>
-        public static Javax.Net.Ssl.HostnameVerifier DefaultHostnameVerifier
+        /// <returns><see cref="Javax.Net.Ssl.HostnameVerifier"/></returns>
+        public static Javax.Net.Ssl.HostnameVerifier GetDefaultHostnameVerifier()
         {
-            get { return SExecuteWithSignature<Javax.Net.Ssl.HostnameVerifier>(LocalBridgeClazz, "getDefaultHostnameVerifier", "()Ljavax/net/ssl/HostnameVerifier;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefaultHostnameVerifier", "(Ljavax/net/ssl/HostnameVerifier;)V", value); }
+            return SExecuteWithSignature<Javax.Net.Ssl.HostnameVerifier>(LocalBridgeClazz, "getDefaultHostnameVerifier", "()Ljavax/net/ssl/HostnameVerifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getDefaultSSLSocketFactory()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#setDefaultSSLSocketFactory(javax.net.ssl.SSLSocketFactory)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getDefaultSSLSocketFactory()"/>
         /// </summary>
-        public static Javax.Net.Ssl.SSLSocketFactory DefaultSSLSocketFactory
+        /// <returns><see cref="Javax.Net.Ssl.SSLSocketFactory"/></returns>
+        public static Javax.Net.Ssl.SSLSocketFactory GetDefaultSSLSocketFactory()
         {
-            get { return SExecuteWithSignature<Javax.Net.Ssl.SSLSocketFactory>(LocalBridgeClazz, "getDefaultSSLSocketFactory", "()Ljavax/net/ssl/SSLSocketFactory;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefaultSSLSocketFactory", "(Ljavax/net/ssl/SSLSocketFactory;)V", value); }
+            return SExecuteWithSignature<Javax.Net.Ssl.SSLSocketFactory>(LocalBridgeClazz, "getDefaultSSLSocketFactory", "()Ljavax/net/ssl/SSLSocketFactory;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#setDefaultHostnameVerifier(javax.net.ssl.HostnameVerifier)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.HostnameVerifier"/></param>
+        public static void SetDefaultHostnameVerifier(Javax.Net.Ssl.HostnameVerifier arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefaultHostnameVerifier", "(Ljavax/net/ssl/HostnameVerifier;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#setDefaultSSLSocketFactory(javax.net.ssl.SSLSocketFactory)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLSocketFactory"/></param>
+        public static void SetDefaultSSLSocketFactory(Javax.Net.Ssl.SSLSocketFactory arg0)
+        {
+            SExecuteWithSignature(LocalBridgeClazz, "setDefaultSSLSocketFactory", "(Ljavax/net/ssl/SSLSocketFactory;)V", arg0);
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getCipherSuite()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getCipherSuite()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCipherSuite()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getCipherSuite", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getLocalCertificates()"/>
         /// </summary>
-        public Java.Lang.String CipherSuite
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        public Java.Security.Cert.Certificate[] GetLocalCertificates()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCipherSuite", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getLocalCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getHostnameVerifier()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#setHostnameVerifier(javax.net.ssl.HostnameVerifier)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getServerCertificates()"/>
         /// </summary>
-        public Javax.Net.Ssl.HostnameVerifier HostnameVerifier
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        public Java.Security.Cert.Certificate[] GetServerCertificates()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.HostnameVerifier>("getHostnameVerifier", "()Ljavax/net/ssl/HostnameVerifier;"); } set { IExecuteWithSignature("setHostnameVerifier", "(Ljavax/net/ssl/HostnameVerifier;)V", value); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getServerCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getLocalCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getLocalPrincipal()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] LocalCertificates
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetLocalPrincipal()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getLocalCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getLocalPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getLocalPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getPeerPrincipal()"/>
         /// </summary>
-        public Java.Security.Principal LocalPrincipal
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        public Java.Security.Principal GetPeerPrincipal()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getLocalPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getPeerPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getPeerPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getHostnameVerifier()"/>
         /// </summary>
-        public Java.Security.Principal PeerPrincipal
+        /// <returns><see cref="Javax.Net.Ssl.HostnameVerifier"/></returns>
+        public Javax.Net.Ssl.HostnameVerifier GetHostnameVerifier()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getPeerPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.HostnameVerifier>("getHostnameVerifier", "()Ljavax/net/ssl/HostnameVerifier;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getServerCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#getSSLSocketFactory()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] ServerCertificates
+        /// <returns><see cref="Javax.Net.Ssl.SSLSocketFactory"/></returns>
+        public Javax.Net.Ssl.SSLSocketFactory GetSSLSocketFactory()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getServerCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSocketFactory>("getSSLSocketFactory", "()Ljavax/net/ssl/SSLSocketFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getSSLSession()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#setHostnameVerifier(javax.net.ssl.HostnameVerifier)"/>
         /// </summary>
-        public Java.Util.Optional<Javax.Net.Ssl.SSLSession> SSLSession
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.HostnameVerifier"/></param>
+        public void SetHostnameVerifier(Javax.Net.Ssl.HostnameVerifier arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Optional<Javax.Net.Ssl.SSLSession>>("getSSLSession", "()Ljava/util/Optional;"); }
+            IExecuteWithSignature("setHostnameVerifier", "(Ljavax/net/ssl/HostnameVerifier;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#getSSLSocketFactory()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/HttpsURLConnection.html#setSSLSocketFactory(javax.net.ssl.SSLSocketFactory)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/HttpsURLConnection.html#setSSLSocketFactory(javax.net.ssl.SSLSocketFactory)"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSocketFactory SSLSocketFactory
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLSocketFactory"/></param>
+        public void SetSSLSocketFactory(Javax.Net.Ssl.SSLSocketFactory arg0)
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSocketFactory>("getSSLSocketFactory", "()Ljavax/net/ssl/SSLSocketFactory;"); } set { IExecuteWithSignature("setSSLSocketFactory", "(Ljavax/net/ssl/SSLSocketFactory;)V", value); }
+            IExecuteWithSignature("setSSLSocketFactory", "(Ljavax/net/ssl/SSLSocketFactory;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/KeyManagerFactory.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/KeyManagerFactory.cs
index ba996df88..eddf0f4bc 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/KeyManagerFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/KeyManagerFactory.cs
@@ -42,14 +42,15 @@ public partial class KeyManagerFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#getDefaultAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#getDefaultAlgorithm()"/>
         /// </summary>
-        public static Java.Lang.String DefaultAlgorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetDefaultAlgorithm()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultAlgorithm", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -61,7 +62,7 @@ public static Javax.Net.Ssl.KeyManagerFactory GetInstance(Java.Lang.String arg0,
             return SExecute<Javax.Net.Ssl.KeyManagerFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -72,7 +73,7 @@ public static Javax.Net.Ssl.KeyManagerFactory GetInstance(Java.Lang.String arg0,
             return SExecute<Javax.Net.Ssl.KeyManagerFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Net.Ssl.KeyManagerFactory"/></returns>
@@ -86,28 +87,31 @@ public static Javax.Net.Ssl.KeyManagerFactory GetInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#getKeyManagers()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#getProvider()"/>
         /// </summary>
-        public Javax.Net.Ssl.KeyManager[] KeyManagers
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            get { return IExecuteWithSignatureArray<Javax.Net.Ssl.KeyManager>("getKeyManagers", "()[Ljavax/net/ssl/KeyManager;"); }
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#getKeyManagers()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Javax.Net.Ssl.KeyManager"/></returns>
+        public Javax.Net.Ssl.KeyManager[] GetKeyManagers()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignatureArray<Javax.Net.Ssl.KeyManager>("getKeyManagers", "()[Ljavax/net/ssl/KeyManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#init(java.security.KeyStore,char[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#init(java.security.KeyStore,char[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore"/></param>
         /// <param name="arg1"><see cref="char"/></param>
@@ -119,7 +123,7 @@ public void Init(Java.Security.KeyStore arg0, char[] arg1)
             IExecute("init", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyManagerFactory.html#init(javax.net.ssl.ManagerFactoryParameters)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyManagerFactory.html#init(javax.net.ssl.ManagerFactoryParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.ManagerFactoryParameters"/></param>
         /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/KeyStoreBuilderParameters.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/KeyStoreBuilderParameters.cs
index 9be3ec0f9..68cc8b15a 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/KeyStoreBuilderParameters.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/KeyStoreBuilderParameters.cs
@@ -30,7 +30,7 @@ public partial class KeyStoreBuilderParameters
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyStoreBuilderParameters.html#%3Cinit%3E(java.security.KeyStore.Builder)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyStoreBuilderParameters.html#%3Cinit%3E(java.security.KeyStore.Builder)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore.Builder"/></param>
         public KeyStoreBuilderParameters(Java.Security.KeyStore.Builder arg0)
@@ -38,7 +38,7 @@ public KeyStoreBuilderParameters(Java.Security.KeyStore.Builder arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyStoreBuilderParameters.html#%3Cinit%3E(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyStoreBuilderParameters.html#%3Cinit%3E(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         public KeyStoreBuilderParameters(Java.Util.List<Java.Security.KeyStore.Builder> arg0)
@@ -62,11 +62,12 @@ public KeyStoreBuilderParameters(Java.Util.List<Java.Security.KeyStore.Builder>
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/KeyStoreBuilderParameters.html#getParameters()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/KeyStoreBuilderParameters.html#getParameters()"/>
         /// </summary>
-        public Java.Util.List<Java.Security.KeyStore.Builder> Parameters
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Java.Security.KeyStore.Builder> GetParameters()
         {
-            get { return IExecuteWithSignature<Java.Util.List<Java.Security.KeyStore.Builder>>("getParameters", "()Ljava/util/List;"); }
+            return IExecuteWithSignature<Java.Util.List<Java.Security.KeyStore.Builder>>("getParameters", "()Ljava/util/List;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIHostName.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIHostName.cs
index b377d2764..4362a88fa 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIHostName.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIHostName.cs
@@ -30,7 +30,7 @@ public partial class SNIHostName
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIHostName.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIHostName.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public SNIHostName(byte[] arg0)
@@ -38,7 +38,7 @@ public SNIHostName(byte[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIHostName.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIHostName.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public SNIHostName(Java.Lang.String arg0)
@@ -58,7 +58,7 @@ public SNIHostName(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIHostName.html#createSNIMatcher(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIHostName.html#createSNIMatcher(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Net.Ssl.SNIMatcher"/></returns>
@@ -71,11 +71,12 @@ public static Javax.Net.Ssl.SNIMatcher CreateSNIMatcher(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIHostName.html#getAsciiName()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIHostName.html#getAsciiName()"/>
         /// </summary>
-        public Java.Lang.String AsciiName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAsciiName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAsciiName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAsciiName", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIMatcher.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIMatcher.cs
index 6e0728b00..7136b8e64 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIMatcher.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIMatcher.cs
@@ -46,14 +46,7 @@ public partial class SNIMatcher
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIMatcher.html#getType()"/> 
-        /// </summary>
-        public int Type
-        {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIMatcher.html#matches(javax.net.ssl.SNIServerName)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIMatcher.html#matches(javax.net.ssl.SNIServerName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SNIServerName"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -61,6 +54,14 @@ public bool Matches(Javax.Net.Ssl.SNIServerName arg0)
         {
             return IExecuteWithSignature<bool>("matches", "(Ljavax/net/ssl/SNIServerName;)Z", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIMatcher.html#getType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
+        {
+            return IExecuteWithSignature<int>("getType", "()I");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIServerName.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIServerName.cs
index 80cc0419d..9a6f71bff 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIServerName.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SNIServerName.cs
@@ -46,18 +46,20 @@ public partial class SNIServerName
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIServerName.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIServerName.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SNIServerName.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SNIServerName.html#getType()"/>
         /// </summary>
-        public int Type
+        /// <returns><see cref="int"/></returns>
+        public int GetType()
         {
-            get { return IExecuteWithSignature<int>("getType", "()I"); }
+            return IExecuteWithSignature<int>("getType", "()I");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLContext.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLContext.cs
index 7483263ff..ad08c4425 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLContext.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLContext.cs
@@ -42,14 +42,7 @@ public partial class SSLContext
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getDefault()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#setDefault(javax.net.ssl.SSLContext)"/>
-        /// </summary>
-        public static Javax.Net.Ssl.SSLContext Default
-        {
-            get { return SExecuteWithSignature<Javax.Net.Ssl.SSLContext>(LocalBridgeClazz, "getDefault", "()Ljavax/net/ssl/SSLContext;"); } set { SExecuteWithSignature(LocalBridgeClazz, "setDefault", "(Ljavax/net/ssl/SSLContext;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -61,7 +54,7 @@ public static Javax.Net.Ssl.SSLContext GetInstance(Java.Lang.String arg0, Java.L
             return SExecute<Javax.Net.Ssl.SSLContext>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -72,7 +65,7 @@ public static Javax.Net.Ssl.SSLContext GetInstance(Java.Lang.String arg0, Java.S
             return SExecute<Javax.Net.Ssl.SSLContext>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Net.Ssl.SSLContext"/></returns>
@@ -81,86 +74,111 @@ public static Javax.Net.Ssl.SSLContext GetInstance(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<Javax.Net.Ssl.SSLContext>(LocalBridgeClazz, "getInstance", "(Ljava/lang/String;)Ljavax/net/ssl/SSLContext;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getDefault()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Net.Ssl.SSLContext"/></returns>
+        /// <exception cref="Java.Security.NoSuchAlgorithmException"/>
+        public static Javax.Net.Ssl.SSLContext GetDefault()
+        {
+            return SExecute<Javax.Net.Ssl.SSLContext>(LocalBridgeClazz, "getDefault");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#setDefault(javax.net.ssl.SSLContext)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLContext"/></param>
+        public static void SetDefault(Javax.Net.Ssl.SSLContext arg0)
+        {
+            SExecute(LocalBridgeClazz, "setDefault", arg0);
+        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getClientSessionContext()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getProtocol()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSessionContext ClientSessionContext
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProtocol()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSessionContext>("getClientSessionContext", "()Ljavax/net/ssl/SSLSessionContext;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProtocol", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getDefaultSSLParameters()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getProvider()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLParameters DefaultSSLParameters
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getDefaultSSLParameters", "()Ljavax/net/ssl/SSLParameters;"); }
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#createSSLEngine()"/>
         /// </summary>
-        public Java.Lang.String Protocol
+        /// <returns><see cref="Javax.Net.Ssl.SSLEngine"/></returns>
+        public Javax.Net.Ssl.SSLEngine CreateSSLEngine()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLEngine>("createSSLEngine", "()Ljavax/net/ssl/SSLEngine;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#createSSLEngine(java.lang.String,int)"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <returns><see cref="Javax.Net.Ssl.SSLEngine"/></returns>
+        public Javax.Net.Ssl.SSLEngine CreateSSLEngine(Java.Lang.String arg0, int arg1)
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecute<Javax.Net.Ssl.SSLEngine>("createSSLEngine", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getServerSessionContext()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getDefaultSSLParameters()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSessionContext ServerSessionContext
+        /// <returns><see cref="Javax.Net.Ssl.SSLParameters"/></returns>
+        public Javax.Net.Ssl.SSLParameters GetDefaultSSLParameters()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSessionContext>("getServerSessionContext", "()Ljavax/net/ssl/SSLSessionContext;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getDefaultSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getServerSocketFactory()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getSupportedSSLParameters()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLServerSocketFactory ServerSocketFactory
+        /// <returns><see cref="Javax.Net.Ssl.SSLParameters"/></returns>
+        public Javax.Net.Ssl.SSLParameters GetSupportedSSLParameters()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLServerSocketFactory>("getServerSocketFactory", "()Ljavax/net/ssl/SSLServerSocketFactory;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getSupportedSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getSocketFactory()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getServerSocketFactory()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSocketFactory SocketFactory
+        /// <returns><see cref="Javax.Net.Ssl.SSLServerSocketFactory"/></returns>
+        public Javax.Net.Ssl.SSLServerSocketFactory GetServerSocketFactory()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSocketFactory>("getSocketFactory", "()Ljavax/net/ssl/SSLSocketFactory;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLServerSocketFactory>("getServerSocketFactory", "()Ljavax/net/ssl/SSLServerSocketFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#getSupportedSSLParameters()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getClientSessionContext()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLParameters SupportedSSLParameters
+        /// <returns><see cref="Javax.Net.Ssl.SSLSessionContext"/></returns>
+        public Javax.Net.Ssl.SSLSessionContext GetClientSessionContext()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getSupportedSSLParameters", "()Ljavax/net/ssl/SSLParameters;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSessionContext>("getClientSessionContext", "()Ljavax/net/ssl/SSLSessionContext;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#createSSLEngine()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getServerSessionContext()"/>
         /// </summary>
-        /// <returns><see cref="Javax.Net.Ssl.SSLEngine"/></returns>
-        public Javax.Net.Ssl.SSLEngine CreateSSLEngine()
+        /// <returns><see cref="Javax.Net.Ssl.SSLSessionContext"/></returns>
+        public Javax.Net.Ssl.SSLSessionContext GetServerSessionContext()
         {
-            return IExecuteWithSignature<Javax.Net.Ssl.SSLEngine>("createSSLEngine", "()Ljavax/net/ssl/SSLEngine;");
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSessionContext>("getServerSessionContext", "()Ljavax/net/ssl/SSLSessionContext;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#createSSLEngine(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#getSocketFactory()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <returns><see cref="Javax.Net.Ssl.SSLEngine"/></returns>
-        public Javax.Net.Ssl.SSLEngine CreateSSLEngine(Java.Lang.String arg0, int arg1)
+        /// <returns><see cref="Javax.Net.Ssl.SSLSocketFactory"/></returns>
+        public Javax.Net.Ssl.SSLSocketFactory GetSocketFactory()
         {
-            return IExecute<Javax.Net.Ssl.SSLEngine>("createSSLEngine", arg0, arg1);
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSocketFactory>("getSocketFactory", "()Ljavax/net/ssl/SSLSocketFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLContext.html#init(javax.net.ssl.KeyManager[],javax.net.ssl.TrustManager[],java.security.SecureRandom)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLContext.html#init(javax.net.ssl.KeyManager[],javax.net.ssl.TrustManager[],java.security.SecureRandom)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.KeyManager"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.TrustManager"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLEngine.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLEngine.cs
index d9d788628..8c56abfcc 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLEngine.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLEngine.cs
@@ -46,198 +46,256 @@ public partial class SSLEngine
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getApplicationProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getEnableSessionCreation()"/>
         /// </summary>
-        public Java.Lang.String ApplicationProtocol
+        /// <returns><see cref="bool"/></returns>
+        public bool GetEnableSessionCreation()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getApplicationProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("getEnableSessionCreation", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getDelegatedTask()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getNeedClientAuth()"/>
         /// </summary>
-        public Java.Lang.Runnable DelegatedTask
+        /// <returns><see cref="bool"/></returns>
+        public bool GetNeedClientAuth()
         {
-            get { return IExecuteWithSignature<Java.Lang.Runnable>("getDelegatedTask", "()Ljava/lang/Runnable;"); }
+            return IExecuteWithSignature<bool>("getNeedClientAuth", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getEnabledCipherSuites()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#setEnabledCipherSuites(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getUseClientMode()"/>
         /// </summary>
-        public Java.Lang.String[] EnabledCipherSuites
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseClientMode()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledCipherSuites", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEnabledCipherSuites", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getUseClientMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getEnabledProtocols()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#setEnabledProtocols(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getWantClientAuth()"/>
         /// </summary>
-        public Java.Lang.String[] EnabledProtocols
+        /// <returns><see cref="bool"/></returns>
+        public bool GetWantClientAuth()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledProtocols", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEnabledProtocols", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getWantClientAuth", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getEnableSessionCreation()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#setEnableSessionCreation(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#isInboundDone()"/>
         /// </summary>
-        public bool EnableSessionCreation
+        /// <returns><see cref="bool"/></returns>
+        public bool IsInboundDone()
         {
-            get { return IExecuteWithSignature<bool>("getEnableSessionCreation", "()Z"); } set { IExecuteWithSignature("setEnableSessionCreation", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("isInboundDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getHandshakeApplicationProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#isOutboundDone()"/>
         /// </summary>
-        public Java.Lang.String HandshakeApplicationProtocol
+        /// <returns><see cref="bool"/></returns>
+        public bool IsOutboundDone()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHandshakeApplicationProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isOutboundDone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getHandshakeApplicationProtocolSelector()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#setHandshakeApplicationProtocolSelector(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getDelegatedTask()"/>
         /// </summary>
-        public Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLEngine, Java.Util.List<Java.Lang.String>, Java.Lang.String> HandshakeApplicationProtocolSelector
+        /// <returns><see cref="Java.Lang.Runnable"/></returns>
+        public Java.Lang.Runnable GetDelegatedTask()
         {
-            get { return IExecuteWithSignature<Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLEngine, Java.Util.List<Java.Lang.String>, Java.Lang.String>>("getHandshakeApplicationProtocolSelector", "()Ljava/util/function/BiFunction;"); } set { IExecuteWithSignature("setHandshakeApplicationProtocolSelector", "(Ljava/util/function/BiFunction;)V", value); }
+            return IExecuteWithSignature<Java.Lang.Runnable>("getDelegatedTask", "()Ljava/lang/Runnable;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getHandshakeSession()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getEnabledCipherSuites()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSession HandshakeSession
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEnabledCipherSuites()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getHandshakeSession", "()Ljavax/net/ssl/SSLSession;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getHandshakeStatus()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getEnabledProtocols()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLEngineResult.HandshakeStatus HandshakeStatus
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEnabledProtocols()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>("getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledProtocols", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getNeedClientAuth()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#setNeedClientAuth(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getSupportedCipherSuites()"/>
         /// </summary>
-        public bool NeedClientAuth
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedCipherSuites()
         {
-            get { return IExecuteWithSignature<bool>("getNeedClientAuth", "()Z"); } set { IExecuteWithSignature("setNeedClientAuth", "(Z)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getPeerHost()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getSupportedProtocols()"/>
         /// </summary>
-        public Java.Lang.String PeerHost
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedProtocols()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPeerHost", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedProtocols", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getPeerPort()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#unwrap(java.nio.ByteBuffer,java.nio.ByteBuffer[],int,int)"/>
         /// </summary>
-        public int PeerPort
+        /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
+        /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="int"/></param>
+        /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLException"/>
+        public Javax.Net.Ssl.SSLEngineResult Unwrap(Java.Nio.ByteBuffer arg0, Java.Nio.ByteBuffer[] arg1, int arg2, int arg3)
         {
-            get { return IExecuteWithSignature<int>("getPeerPort", "()I"); }
+            return IExecute<Javax.Net.Ssl.SSLEngineResult>("unwrap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getSession()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#wrap(java.nio.ByteBuffer[],int,int,java.nio.ByteBuffer)"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSession Session
+        /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
+        /// <param name="arg1"><see cref="int"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <param name="arg3"><see cref="Java.Nio.ByteBuffer"/></param>
+        /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLException"/>
+        public Javax.Net.Ssl.SSLEngineResult Wrap(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2, Java.Nio.ByteBuffer arg3)
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "()Ljavax/net/ssl/SSLSession;"); }
+            return IExecute<Javax.Net.Ssl.SSLEngineResult>("wrap", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getSSLParameters()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#setSSLParameters(javax.net.ssl.SSLParameters)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getHandshakeStatus()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLParameters SSLParameters
+        /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult.HandshakeStatus"/></returns>
+        public Javax.Net.Ssl.SSLEngineResult.HandshakeStatus GetHandshakeStatus()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getSSLParameters", "()Ljavax/net/ssl/SSLParameters;"); } set { IExecuteWithSignature("setSSLParameters", "(Ljavax/net/ssl/SSLParameters;)V", value); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>("getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getSupportedCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getSession()"/>
         /// </summary>
-        public Java.Lang.String[] SupportedCipherSuites
+        /// <returns><see cref="Javax.Net.Ssl.SSLSession"/></returns>
+        public Javax.Net.Ssl.SSLSession GetSession()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "()Ljavax/net/ssl/SSLSession;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getSupportedProtocols()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#beginHandshake()"/>
         /// </summary>
-        public Java.Lang.String[] SupportedProtocols
+        /// <exception cref="Javax.Net.Ssl.SSLException"/>
+        public void BeginHandshake()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedProtocols", "()[Ljava/lang/String;"); }
+            IExecuteWithSignature("beginHandshake", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getUseClientMode()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#setUseClientMode(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#closeInbound()"/>
         /// </summary>
-        public bool UseClientMode
+        /// <exception cref="Javax.Net.Ssl.SSLException"/>
+        public void CloseInbound()
         {
-            get { return IExecuteWithSignature<bool>("getUseClientMode", "()Z"); } set { IExecuteWithSignature("setUseClientMode", "(Z)V", value); }
+            IExecuteWithSignature("closeInbound", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#getWantClientAuth()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#setWantClientAuth(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#closeOutbound()"/>
         /// </summary>
-        public bool WantClientAuth
+        public void CloseOutbound()
         {
-            get { return IExecuteWithSignature<bool>("getWantClientAuth", "()Z"); } set { IExecuteWithSignature("setWantClientAuth", "(Z)V", value); }
+            IExecuteWithSignature("closeOutbound", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#isInboundDone()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#setEnabledCipherSuites(java.lang.String[])"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsInboundDone()
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEnabledCipherSuites(Java.Lang.String[] arg0)
         {
-            return IExecuteWithSignature<bool>("isInboundDone", "()Z");
+            IExecuteWithSignature("setEnabledCipherSuites", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#isOutboundDone()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#setEnabledProtocols(java.lang.String[])"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsOutboundDone()
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEnabledProtocols(Java.Lang.String[] arg0)
         {
-            return IExecuteWithSignature<bool>("isOutboundDone", "()Z");
+            IExecuteWithSignature("setEnabledProtocols", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#unwrap(java.nio.ByteBuffer,java.nio.ByteBuffer[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#setEnableSessionCreation(boolean)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
-        /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="int"/></param>
-        /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult"/></returns>
-        /// <exception cref="Javax.Net.Ssl.SSLException"/>
-        public Javax.Net.Ssl.SSLEngineResult Unwrap(Java.Nio.ByteBuffer arg0, Java.Nio.ByteBuffer[] arg1, int arg2, int arg3)
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetEnableSessionCreation(bool arg0)
         {
-            return IExecute<Javax.Net.Ssl.SSLEngineResult>("unwrap", arg0, arg1, arg2, arg3);
+            IExecuteWithSignature("setEnableSessionCreation", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#wrap(java.nio.ByteBuffer[],int,int,java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#setNeedClientAuth(boolean)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <param name="arg3"><see cref="Java.Nio.ByteBuffer"/></param>
-        /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult"/></returns>
-        /// <exception cref="Javax.Net.Ssl.SSLException"/>
-        public Javax.Net.Ssl.SSLEngineResult Wrap(Java.Nio.ByteBuffer[] arg0, int arg1, int arg2, Java.Nio.ByteBuffer arg3)
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetNeedClientAuth(bool arg0)
         {
-            return IExecute<Javax.Net.Ssl.SSLEngineResult>("wrap", arg0, arg1, arg2, arg3);
+            IExecuteWithSignature("setNeedClientAuth", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#beginHandshake()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#setUseClientMode(boolean)"/>
         /// </summary>
-        /// <exception cref="Javax.Net.Ssl.SSLException"/>
-        public void BeginHandshake()
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseClientMode(bool arg0)
         {
-            IExecuteWithSignature("beginHandshake", "()V");
+            IExecuteWithSignature("setUseClientMode", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#closeInbound()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#setWantClientAuth(boolean)"/>
         /// </summary>
-        /// <exception cref="Javax.Net.Ssl.SSLException"/>
-        public void CloseInbound()
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetWantClientAuth(bool arg0)
         {
-            IExecuteWithSignature("closeInbound", "()V");
+            IExecuteWithSignature("setWantClientAuth", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#closeOutbound()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getPeerPort()"/>
         /// </summary>
-        public void CloseOutbound()
+        /// <returns><see cref="int"/></returns>
+        public int GetPeerPort()
         {
-            IExecuteWithSignature("closeOutbound", "()V");
+            return IExecuteWithSignature<int>("getPeerPort", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getApplicationProtocol()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetApplicationProtocol()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getApplicationProtocol", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getHandshakeApplicationProtocol()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHandshakeApplicationProtocol()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getHandshakeApplicationProtocol", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getPeerHost()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPeerHost()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPeerHost", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#unwrap(java.nio.ByteBuffer,java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getHandshakeApplicationProtocolSelector()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
+        public Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLEngine, Java.Util.List<Java.Lang.String>, Java.Lang.String> GetHandshakeApplicationProtocolSelector()
+        {
+            return IExecuteWithSignature<Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLEngine, Java.Util.List<Java.Lang.String>, Java.Lang.String>>("getHandshakeApplicationProtocolSelector", "()Ljava/util/function/BiFunction;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getHandshakeApplicationProtocolSelector()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
+        public Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLEngine, Java.Util.List<Java.Lang.String>, Java.Lang.String> GetHandshakeApplicationProtocolSelectorDirect()
+        {
+            return IExecuteWithSignature<Java.Util.Function.BiFunctionDirect<Javax.Net.Ssl.SSLEngine, Java.Util.List<Java.Lang.String>, Java.Lang.String>, Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLEngine, Java.Util.List<Java.Lang.String>, Java.Lang.String>>("getHandshakeApplicationProtocolSelector", "()Ljava/util/function/BiFunction;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#unwrap(java.nio.ByteBuffer,java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -248,7 +306,7 @@ public Javax.Net.Ssl.SSLEngineResult Unwrap(Java.Nio.ByteBuffer arg0, Java.Nio.B
             return IExecute<Javax.Net.Ssl.SSLEngineResult>("unwrap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#unwrap(java.nio.ByteBuffer,java.nio.ByteBuffer[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#unwrap(java.nio.ByteBuffer,java.nio.ByteBuffer[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -259,7 +317,7 @@ public Javax.Net.Ssl.SSLEngineResult Unwrap(Java.Nio.ByteBuffer arg0, Java.Nio.B
             return IExecute<Javax.Net.Ssl.SSLEngineResult>("unwrap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#wrap(java.nio.ByteBuffer,java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#wrap(java.nio.ByteBuffer,java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -270,7 +328,7 @@ public Javax.Net.Ssl.SSLEngineResult Wrap(Java.Nio.ByteBuffer arg0, Java.Nio.Byt
             return IExecute<Javax.Net.Ssl.SSLEngineResult>("wrap", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngine.html#wrap(java.nio.ByteBuffer[],java.nio.ByteBuffer)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#wrap(java.nio.ByteBuffer[],java.nio.ByteBuffer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Nio.ByteBuffer"/></param>
         /// <param name="arg1"><see cref="Java.Nio.ByteBuffer"/></param>
@@ -280,6 +338,38 @@ public Javax.Net.Ssl.SSLEngineResult Wrap(Java.Nio.ByteBuffer[] arg0, Java.Nio.B
         {
             return IExecute<Javax.Net.Ssl.SSLEngineResult>("wrap", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getSSLParameters()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Net.Ssl.SSLParameters"/></returns>
+        public Javax.Net.Ssl.SSLParameters GetSSLParameters()
+        {
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#getHandshakeSession()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Net.Ssl.SSLSession"/></returns>
+        public Javax.Net.Ssl.SSLSession GetHandshakeSession()
+        {
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#setHandshakeApplicationProtocolSelector(java.util.function.BiFunction)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
+        public void SetHandshakeApplicationProtocolSelector(Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLEngine, Java.Util.List<Java.Lang.String>, Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setHandshakeApplicationProtocolSelector", "(Ljava/util/function/BiFunction;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngine.html#setSSLParameters(javax.net.ssl.SSLParameters)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLParameters"/></param>
+        public void SetSSLParameters(Javax.Net.Ssl.SSLParameters arg0)
+        {
+            IExecuteWithSignature("setSSLParameters", "(Ljavax/net/ssl/SSLParameters;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLEngineResult.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLEngineResult.cs
index 9abf8aa2e..75a21b722 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLEngineResult.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLEngineResult.cs
@@ -30,7 +30,7 @@ public partial class SSLEngineResult
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.html#%3Cinit%3E(javax.net.ssl.SSLEngineResult.Status,javax.net.ssl.SSLEngineResult.HandshakeStatus,int,int,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html#%3Cinit%3E(javax.net.ssl.SSLEngineResult.Status,javax.net.ssl.SSLEngineResult.HandshakeStatus,int,int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLEngineResult.Status"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.SSLEngineResult.HandshakeStatus"/></param>
@@ -42,7 +42,7 @@ public SSLEngineResult(Javax.Net.Ssl.SSLEngineResult.Status arg0, Javax.Net.Ssl.
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.html#%3Cinit%3E(javax.net.ssl.SSLEngineResult.Status,javax.net.ssl.SSLEngineResult.HandshakeStatus,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html#%3Cinit%3E(javax.net.ssl.SSLEngineResult.Status,javax.net.ssl.SSLEngineResult.HandshakeStatus,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLEngineResult.Status"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.SSLEngineResult.HandshakeStatus"/></param>
@@ -69,37 +69,39 @@ public SSLEngineResult(Javax.Net.Ssl.SSLEngineResult.Status arg0, Javax.Net.Ssl.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.html#getHandshakeStatus()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html#bytesConsumed()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLEngineResult.HandshakeStatus GetHandshakeStatus
+        /// <returns><see cref="int"/></returns>
+        public int BytesConsumed()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>("getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;"); }
+            return IExecuteWithSignature<int>("bytesConsumed", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.html#getStatus()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html#bytesProduced()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLEngineResult.Status GetStatus
+        /// <returns><see cref="int"/></returns>
+        public int BytesProduced()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLEngineResult.Status>("getStatus", "()Ljavax/net/ssl/SSLEngineResult$Status;"); }
+            return IExecuteWithSignature<int>("bytesProduced", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.html#bytesConsumed()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html#getHandshakeStatus()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int BytesConsumed()
+        /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult.HandshakeStatus"/></returns>
+        public Javax.Net.Ssl.SSLEngineResult.HandshakeStatus GetHandshakeStatus()
         {
-            return IExecuteWithSignature<int>("bytesConsumed", "()I");
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>("getHandshakeStatus", "()Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.html#bytesProduced()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html#getStatus()"/>
         /// </summary>
-        /// <returns><see cref="int"/></returns>
-        public int BytesProduced()
+        /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult.Status"/></returns>
+        public Javax.Net.Ssl.SSLEngineResult.Status GetStatus()
         {
-            return IExecuteWithSignature<int>("bytesProduced", "()I");
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLEngineResult.Status>("getStatus", "()Ljavax/net/ssl/SSLEngineResult$Status;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.html#sequenceNumber()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.html#sequenceNumber()"/>
         /// </summary>
         /// <returns><see cref="long"/></returns>
         public long SequenceNumber()
@@ -123,37 +125,37 @@ public partial class HandshakeStatus
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#FINISHED"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#FINISHED"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus FINISHED { get { if (!_FINISHEDReady) { _FINISHEDContent = SGetField<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>(LocalBridgeClazz, "FINISHED"); _FINISHEDReady = true; } return _FINISHEDContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus _FINISHEDContent = default;
             private static bool _FINISHEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NEED_TASK"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NEED_TASK"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus NEED_TASK { get { if (!_NEED_TASKReady) { _NEED_TASKContent = SGetField<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>(LocalBridgeClazz, "NEED_TASK"); _NEED_TASKReady = true; } return _NEED_TASKContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus _NEED_TASKContent = default;
             private static bool _NEED_TASKReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NEED_UNWRAP"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NEED_UNWRAP"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus NEED_UNWRAP { get { if (!_NEED_UNWRAPReady) { _NEED_UNWRAPContent = SGetField<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>(LocalBridgeClazz, "NEED_UNWRAP"); _NEED_UNWRAPReady = true; } return _NEED_UNWRAPContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus _NEED_UNWRAPContent = default;
             private static bool _NEED_UNWRAPReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NEED_UNWRAP_AGAIN"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NEED_UNWRAP_AGAIN"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus NEED_UNWRAP_AGAIN { get { if (!_NEED_UNWRAP_AGAINReady) { _NEED_UNWRAP_AGAINContent = SGetField<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>(LocalBridgeClazz, "NEED_UNWRAP_AGAIN"); _NEED_UNWRAP_AGAINReady = true; } return _NEED_UNWRAP_AGAINContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus _NEED_UNWRAP_AGAINContent = default;
             private static bool _NEED_UNWRAP_AGAINReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NEED_WRAP"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NEED_WRAP"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus NEED_WRAP { get { if (!_NEED_WRAPReady) { _NEED_WRAPContent = SGetField<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>(LocalBridgeClazz, "NEED_WRAP"); _NEED_WRAPReady = true; } return _NEED_WRAPContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus _NEED_WRAPContent = default;
             private static bool _NEED_WRAPReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NOT_HANDSHAKING"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#NOT_HANDSHAKING"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus NOT_HANDSHAKING { get { if (!_NOT_HANDSHAKINGReady) { _NOT_HANDSHAKINGContent = SGetField<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>(LocalBridgeClazz, "NOT_HANDSHAKING"); _NOT_HANDSHAKINGReady = true; } return _NOT_HANDSHAKINGContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus _NOT_HANDSHAKINGContent = default;
@@ -163,7 +165,7 @@ public partial class HandshakeStatus
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult.HandshakeStatus"/></returns>
@@ -172,7 +174,7 @@ public static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus ValueOf(Java.Lang.St
                 return SExecuteWithSignature<Javax.Net.Ssl.SSLEngineResult.HandshakeStatus>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#values()"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.HandshakeStatus.html#values()"/>
             /// </summary>
             /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult.HandshakeStatus"/></returns>
             public static Javax.Net.Ssl.SSLEngineResult.HandshakeStatus[] Values()
@@ -207,25 +209,25 @@ public partial class Status
 
             #region Fields
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.Status.html#BUFFER_OVERFLOW"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.Status.html#BUFFER_OVERFLOW"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.Status BUFFER_OVERFLOW { get { if (!_BUFFER_OVERFLOWReady) { _BUFFER_OVERFLOWContent = SGetField<Javax.Net.Ssl.SSLEngineResult.Status>(LocalBridgeClazz, "BUFFER_OVERFLOW"); _BUFFER_OVERFLOWReady = true; } return _BUFFER_OVERFLOWContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.Status _BUFFER_OVERFLOWContent = default;
             private static bool _BUFFER_OVERFLOWReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.Status.html#BUFFER_UNDERFLOW"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.Status.html#BUFFER_UNDERFLOW"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.Status BUFFER_UNDERFLOW { get { if (!_BUFFER_UNDERFLOWReady) { _BUFFER_UNDERFLOWContent = SGetField<Javax.Net.Ssl.SSLEngineResult.Status>(LocalBridgeClazz, "BUFFER_UNDERFLOW"); _BUFFER_UNDERFLOWReady = true; } return _BUFFER_UNDERFLOWContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.Status _BUFFER_UNDERFLOWContent = default;
             private static bool _BUFFER_UNDERFLOWReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.Status.html#CLOSED"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.Status.html#CLOSED"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.Status CLOSED { get { if (!_CLOSEDReady) { _CLOSEDContent = SGetField<Javax.Net.Ssl.SSLEngineResult.Status>(LocalBridgeClazz, "CLOSED"); _CLOSEDReady = true; } return _CLOSEDContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.Status _CLOSEDContent = default;
             private static bool _CLOSEDReady = false; // this is used because in case of generics 
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.Status.html#OK"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.Status.html#OK"/>
             /// </summary>
             public static Javax.Net.Ssl.SSLEngineResult.Status OK { get { if (!_OKReady) { _OKContent = SGetField<Javax.Net.Ssl.SSLEngineResult.Status>(LocalBridgeClazz, "OK"); _OKReady = true; } return _OKContent; } }
             private static Javax.Net.Ssl.SSLEngineResult.Status _OKContent = default;
@@ -235,7 +237,7 @@ public partial class Status
 
             #region Static methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.Status.html#valueOf(java.lang.String)"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.Status.html#valueOf(java.lang.String)"/>
             /// </summary>
             /// <param name="arg0"><see cref="Java.Lang.String"/></param>
             /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult.Status"/></returns>
@@ -244,7 +246,7 @@ public static Javax.Net.Ssl.SSLEngineResult.Status ValueOf(Java.Lang.String arg0
                 return SExecuteWithSignature<Javax.Net.Ssl.SSLEngineResult.Status>(LocalBridgeClazz, "valueOf", "(Ljava/lang/String;)Ljavax/net/ssl/SSLEngineResult$Status;", arg0);
             }
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLEngineResult.Status.html#values()"/>
+            /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLEngineResult.Status.html#values()"/>
             /// </summary>
             /// <returns><see cref="Javax.Net.Ssl.SSLEngineResult.Status"/></returns>
             public static Javax.Net.Ssl.SSLEngineResult.Status[] Values()
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLParameters.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLParameters.cs
index e9868fac3..858dd9dcb 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLParameters.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLParameters.cs
@@ -30,7 +30,7 @@ public partial class SSLParameters
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#%3Cinit%3E(java.lang.String[],java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#%3Cinit%3E(java.lang.String[],java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public SSLParameters(Java.Lang.String[] arg0, Java.Lang.String[] arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#%3Cinit%3E(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#%3Cinit%3E(java.lang.String[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public SSLParameters(Java.Lang.String[] arg0)
@@ -63,88 +63,196 @@ public SSLParameters(Java.Lang.String[] arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getAlgorithmConstraints()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setAlgorithmConstraints(java.security.AlgorithmConstraints)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getEnableRetransmissions()"/>
         /// </summary>
-        public Java.Security.AlgorithmConstraints AlgorithmConstraints
+        /// <returns><see cref="bool"/></returns>
+        public bool GetEnableRetransmissions()
         {
-            get { return IExecuteWithSignature<Java.Security.AlgorithmConstraints>("getAlgorithmConstraints", "()Ljava/security/AlgorithmConstraints;"); } set { IExecuteWithSignature("setAlgorithmConstraints", "(Ljava/security/AlgorithmConstraints;)V", value); }
+            return IExecuteWithSignature<bool>("getEnableRetransmissions", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getApplicationProtocols()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setApplicationProtocols(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getNeedClientAuth()"/>
         /// </summary>
-        public Java.Lang.String[] ApplicationProtocols
+        /// <returns><see cref="bool"/></returns>
+        public bool GetNeedClientAuth()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getApplicationProtocols", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setApplicationProtocols", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getNeedClientAuth", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getCipherSuites()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setCipherSuites(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getWantClientAuth()"/>
         /// </summary>
-        public Java.Lang.String[] CipherSuites
+        /// <returns><see cref="bool"/></returns>
+        public bool GetWantClientAuth()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getCipherSuites", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setCipherSuites", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getWantClientAuth", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getEnableRetransmissions()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setEnableRetransmissions(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getUseCipherSuitesOrder()"/>
         /// </summary>
-        public bool EnableRetransmissions
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseCipherSuitesOrder()
         {
-            get { return IExecuteWithSignature<bool>("getEnableRetransmissions", "()Z"); } set { IExecuteWithSignature("setEnableRetransmissions", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getUseCipherSuitesOrder", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getEndpointIdentificationAlgorithm()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setEndpointIdentificationAlgorithm(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getSNIMatchers()"/>
         /// </summary>
-        public Java.Lang.String EndpointIdentificationAlgorithm
+        /// <returns><see cref="Java.Util.Collection"/></returns>
+        public Java.Util.Collection<Javax.Net.Ssl.SNIMatcher> GetSNIMatchers()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEndpointIdentificationAlgorithm", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setEndpointIdentificationAlgorithm", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Util.Collection<Javax.Net.Ssl.SNIMatcher>>("getSNIMatchers", "()Ljava/util/Collection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getMaximumPacketSize()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setMaximumPacketSize(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getServerNames()"/>
         /// </summary>
-        public int MaximumPacketSize
+        /// <returns><see cref="Java.Util.List"/></returns>
+        public Java.Util.List<Javax.Net.Ssl.SNIServerName> GetServerNames()
         {
-            get { return IExecuteWithSignature<int>("getMaximumPacketSize", "()I"); } set { IExecuteWithSignature("setMaximumPacketSize", "(I)V", value); }
+            return IExecuteWithSignature<Java.Util.List<Javax.Net.Ssl.SNIServerName>>("getServerNames", "()Ljava/util/List;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getNeedClientAuth()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setNeedClientAuth(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setServerNames(java.util.List)"/>
         /// </summary>
-        public bool NeedClientAuth
+        /// <param name="arg0"><see cref="Java.Util.List"/></param>
+        public void SetServerNames(Java.Util.List<Javax.Net.Ssl.SNIServerName> arg0)
         {
-            get { return IExecuteWithSignature<bool>("getNeedClientAuth", "()Z"); } set { IExecuteWithSignature("setNeedClientAuth", "(Z)V", value); }
+            IExecuteWithSignature("setServerNames", "(Ljava/util/List;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getProtocols()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setProtocols(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setSNIMatchers(java.util.Collection)"/>
         /// </summary>
-        public Java.Lang.String[] Protocols
+        /// <param name="arg0"><see cref="Java.Util.Collection"/></param>
+        public void SetSNIMatchers(Java.Util.Collection<Javax.Net.Ssl.SNIMatcher> arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getProtocols", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setProtocols", "([Ljava/lang/String;)V", value); }
+            IExecuteWithSignature("setSNIMatchers", "(Ljava/util/Collection;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getServerNames()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setServerNames(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setUseCipherSuitesOrder(boolean)"/>
         /// </summary>
-        public Java.Util.List<Javax.Net.Ssl.SNIServerName> ServerNames
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseCipherSuitesOrder(bool arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.List<Javax.Net.Ssl.SNIServerName>>("getServerNames", "()Ljava/util/List;"); } set { IExecuteWithSignature("setServerNames", "(Ljava/util/List;)V", value); }
+            IExecuteWithSignature("setUseCipherSuitesOrder", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getSNIMatchers()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setSNIMatchers(java.util.Collection)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getMaximumPacketSize()"/>
         /// </summary>
-        public Java.Util.Collection<Javax.Net.Ssl.SNIMatcher> SNIMatchers
+        /// <returns><see cref="int"/></returns>
+        public int GetMaximumPacketSize()
         {
-            get { return IExecuteWithSignature<Java.Util.Collection<Javax.Net.Ssl.SNIMatcher>>("getSNIMatchers", "()Ljava/util/Collection;"); } set { IExecuteWithSignature("setSNIMatchers", "(Ljava/util/Collection;)V", value); }
+            return IExecuteWithSignature<int>("getMaximumPacketSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getUseCipherSuitesOrder()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setUseCipherSuitesOrder(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getEndpointIdentificationAlgorithm()"/>
         /// </summary>
-        public bool UseCipherSuitesOrder
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEndpointIdentificationAlgorithm()
         {
-            get { return IExecuteWithSignature<bool>("getUseCipherSuitesOrder", "()Z"); } set { IExecuteWithSignature("setUseCipherSuitesOrder", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getEndpointIdentificationAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#getWantClientAuth()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLParameters.html#setWantClientAuth(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getApplicationProtocols()"/>
         /// </summary>
-        public bool WantClientAuth
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetApplicationProtocols()
         {
-            get { return IExecuteWithSignature<bool>("getWantClientAuth", "()Z"); } set { IExecuteWithSignature("setWantClientAuth", "(Z)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getApplicationProtocols", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getCipherSuites()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetCipherSuites()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getCipherSuites", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getProtocols()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetProtocols()
+        {
+            return IExecuteWithSignatureArray<Java.Lang.String>("getProtocols", "()[Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#getAlgorithmConstraints()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Security.AlgorithmConstraints"/></returns>
+        public Java.Security.AlgorithmConstraints GetAlgorithmConstraints()
+        {
+            return IExecuteWithSignature<Java.Security.AlgorithmConstraints>("getAlgorithmConstraints", "()Ljava/security/AlgorithmConstraints;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setAlgorithmConstraints(java.security.AlgorithmConstraints)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Security.AlgorithmConstraints"/></param>
+        public void SetAlgorithmConstraints(Java.Security.AlgorithmConstraints arg0)
+        {
+            IExecuteWithSignature("setAlgorithmConstraints", "(Ljava/security/AlgorithmConstraints;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setApplicationProtocols(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetApplicationProtocols(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setApplicationProtocols", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setCipherSuites(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetCipherSuites(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setCipherSuites", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setEnableRetransmissions(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetEnableRetransmissions(bool arg0)
+        {
+            IExecuteWithSignature("setEnableRetransmissions", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setEndpointIdentificationAlgorithm(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEndpointIdentificationAlgorithm(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setEndpointIdentificationAlgorithm", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setMaximumPacketSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMaximumPacketSize(int arg0)
+        {
+            IExecuteWithSignature("setMaximumPacketSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setNeedClientAuth(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetNeedClientAuth(bool arg0)
+        {
+            IExecuteWithSignature("setNeedClientAuth", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setProtocols(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetProtocols(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setProtocols", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLParameters.html#setWantClientAuth(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetWantClientAuth(bool arg0)
+        {
+            IExecuteWithSignature("setWantClientAuth", "(Z)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLPermission.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLPermission.cs
index 571081ca3..76ca1f4f6 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLPermission.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLPermission.cs
@@ -30,7 +30,7 @@ public partial class SSLPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public SSLPermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLPermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLPermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public SSLPermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLServerSocket.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLServerSocket.cs
index 6b3674665..e8a90351d 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLServerSocket.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLServerSocket.cs
@@ -46,67 +46,132 @@ public partial class SSLServerSocket
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getEnabledCipherSuites()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#setEnabledCipherSuites(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getEnableSessionCreation()"/>
         /// </summary>
-        public Java.Lang.String[] EnabledCipherSuites
+        /// <returns><see cref="bool"/></returns>
+        public bool GetEnableSessionCreation()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledCipherSuites", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEnabledCipherSuites", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getEnableSessionCreation", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getEnabledProtocols()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#setEnabledProtocols(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getNeedClientAuth()"/>
         /// </summary>
-        public Java.Lang.String[] EnabledProtocols
+        /// <returns><see cref="bool"/></returns>
+        public bool GetNeedClientAuth()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledProtocols", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEnabledProtocols", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getNeedClientAuth", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getEnableSessionCreation()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#setEnableSessionCreation(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getUseClientMode()"/>
         /// </summary>
-        public bool EnableSessionCreation
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseClientMode()
         {
-            get { return IExecuteWithSignature<bool>("getEnableSessionCreation", "()Z"); } set { IExecuteWithSignature("setEnableSessionCreation", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getUseClientMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getNeedClientAuth()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#setNeedClientAuth(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getWantClientAuth()"/>
         /// </summary>
-        public bool NeedClientAuth
+        /// <returns><see cref="bool"/></returns>
+        public bool GetWantClientAuth()
         {
-            get { return IExecuteWithSignature<bool>("getNeedClientAuth", "()Z"); } set { IExecuteWithSignature("setNeedClientAuth", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getWantClientAuth", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getSSLParameters()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#setSSLParameters(javax.net.ssl.SSLParameters)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getEnabledCipherSuites()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLParameters SSLParameters
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEnabledCipherSuites()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getSSLParameters", "()Ljavax/net/ssl/SSLParameters;"); } set { IExecuteWithSignature("setSSLParameters", "(Ljavax/net/ssl/SSLParameters;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getSupportedCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getEnabledProtocols()"/>
         /// </summary>
-        public Java.Lang.String[] SupportedCipherSuites
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEnabledProtocols()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledProtocols", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getSupportedProtocols()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getSupportedCipherSuites()"/>
         /// </summary>
-        public Java.Lang.String[] SupportedProtocols
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedCipherSuites()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedProtocols", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getUseClientMode()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#setUseClientMode(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getSupportedProtocols()"/>
         /// </summary>
-        public bool UseClientMode
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedProtocols()
         {
-            get { return IExecuteWithSignature<bool>("getUseClientMode", "()Z"); } set { IExecuteWithSignature("setUseClientMode", "(Z)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedProtocols", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#getWantClientAuth()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocket.html#setWantClientAuth(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#setEnabledCipherSuites(java.lang.String[])"/>
         /// </summary>
-        public bool WantClientAuth
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEnabledCipherSuites(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignature<bool>("getWantClientAuth", "()Z"); } set { IExecuteWithSignature("setWantClientAuth", "(Z)V", value); }
+            IExecuteWithSignature("setEnabledCipherSuites", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#setEnabledProtocols(java.lang.String[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEnabledProtocols(Java.Lang.String[] arg0)
+        {
+            IExecuteWithSignature("setEnabledProtocols", "([Ljava/lang/String;)V", new object[] { arg0 });
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#setEnableSessionCreation(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetEnableSessionCreation(bool arg0)
+        {
+            IExecuteWithSignature("setEnableSessionCreation", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#setNeedClientAuth(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetNeedClientAuth(bool arg0)
+        {
+            IExecuteWithSignature("setNeedClientAuth", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#setUseClientMode(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseClientMode(bool arg0)
+        {
+            IExecuteWithSignature("setUseClientMode", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#setWantClientAuth(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetWantClientAuth(bool arg0)
+        {
+            IExecuteWithSignature("setWantClientAuth", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#getSSLParameters()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Net.Ssl.SSLParameters"/></returns>
+        public Javax.Net.Ssl.SSLParameters GetSSLParameters()
+        {
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocket.html#setSSLParameters(javax.net.ssl.SSLParameters)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLParameters"/></param>
+        public void SetSSLParameters(Javax.Net.Ssl.SSLParameters arg0)
+        {
+            IExecuteWithSignature("setSSLParameters", "(Ljavax/net/ssl/SSLParameters;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLServerSocketFactory.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLServerSocketFactory.cs
index 4cfb29cb5..af832d105 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLServerSocketFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLServerSocketFactory.cs
@@ -46,18 +46,20 @@ public partial class SSLServerSocketFactory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocketFactory.html#getDefaultCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocketFactory.html#getDefaultCipherSuites()"/>
         /// </summary>
-        public Java.Lang.String[] DefaultCipherSuites
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetDefaultCipherSuites()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getDefaultCipherSuites", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getDefaultCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLServerSocketFactory.html#getSupportedCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLServerSocketFactory.html#getSupportedCipherSuites()"/>
         /// </summary>
-        public Java.Lang.String[] SupportedCipherSuites
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedCipherSuites()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSession.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSession.cs
index d30689004..ad732ded0 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSession.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSession.cs
@@ -64,144 +64,163 @@ public partial class SSLSession : Javax.Net.Ssl.ISSLSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getApplicationBufferSize()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#isValid()"/>
         /// </summary>
-        public int ApplicationBufferSize
+        /// <returns><see cref="bool"/></returns>
+        public bool IsValid()
         {
-            get { return IExecuteWithSignature<int>("getApplicationBufferSize", "()I"); }
+            return IExecuteWithSignature<bool>("isValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getCipherSuite()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getId()"/>
         /// </summary>
-        public Java.Lang.String CipherSuite
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCipherSuite", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<byte>("getId", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getCreationTime()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getApplicationBufferSize()"/>
         /// </summary>
-        public long CreationTime
+        /// <returns><see cref="int"/></returns>
+        public int GetApplicationBufferSize()
         {
-            get { return IExecuteWithSignature<long>("getCreationTime", "()J"); }
+            return IExecuteWithSignature<int>("getApplicationBufferSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getId()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getPacketBufferSize()"/>
         /// </summary>
-        public byte[] Id
+        /// <returns><see cref="int"/></returns>
+        public int GetPacketBufferSize()
         {
-            get { return IExecuteWithSignatureArray<byte>("getId", "()[B"); }
+            return IExecuteWithSignature<int>("getPacketBufferSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getLastAccessedTime()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getPeerPort()"/>
         /// </summary>
-        public long LastAccessedTime
+        /// <returns><see cref="int"/></returns>
+        public int GetPeerPort()
         {
-            get { return IExecuteWithSignature<long>("getLastAccessedTime", "()J"); }
+            return IExecuteWithSignature<int>("getPeerPort", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getLocalCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getValue(java.lang.String)"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] LocalCertificates
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="object"/></returns>
+        public object GetValue(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getLocalCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignature("getValue", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getLocalPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getCipherSuite()"/>
         /// </summary>
-        public Java.Security.Principal LocalPrincipal
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCipherSuite()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getLocalPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCipherSuite", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getPacketBufferSize()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getPeerHost()"/>
         /// </summary>
-        public int PacketBufferSize
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPeerHost()
         {
-            get { return IExecuteWithSignature<int>("getPacketBufferSize", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPeerHost", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getPeerCertificateChain()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getProtocol()"/>
         /// </summary>
-        [System.Obsolete()]
-        public Javax.Security.Cert.X509Certificate[] PeerCertificateChain
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetProtocol()
         {
-            get { return IExecuteWithSignatureArray<Javax.Security.Cert.X509Certificate>("getPeerCertificateChain", "()[Ljavax/security/cert/X509Certificate;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getProtocol", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getPeerCertificates()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getValueNames()"/>
         /// </summary>
-        public Java.Security.Cert.Certificate[] PeerCertificates
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetValueNames()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getPeerCertificates", "()[Ljava/security/cert/Certificate;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getValueNames", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getPeerHost()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getLocalCertificates()"/>
         /// </summary>
-        public Java.Lang.String PeerHost
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        public Java.Security.Cert.Certificate[] GetLocalCertificates()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPeerHost", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getLocalCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getPeerPort()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getPeerCertificates()"/>
         /// </summary>
-        public int PeerPort
+        /// <returns><see cref="Java.Security.Cert.Certificate"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        public Java.Security.Cert.Certificate[] GetPeerCertificates()
         {
-            get { return IExecuteWithSignature<int>("getPeerPort", "()I"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.Certificate>("getPeerCertificates", "()[Ljava/security/cert/Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getPeerPrincipal()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getLocalPrincipal()"/>
         /// </summary>
-        public Java.Security.Principal PeerPrincipal
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetLocalPrincipal()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getPeerPrincipal", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getLocalPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getPeerPrincipal()"/>
         /// </summary>
-        public Java.Lang.String Protocol
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        public Java.Security.Principal GetPeerPrincipal()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getPeerPrincipal", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getSessionContext()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getSessionContext()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSessionContext SessionContext
+        /// <returns><see cref="Javax.Net.Ssl.SSLSessionContext"/></returns>
+        public Javax.Net.Ssl.SSLSessionContext GetSessionContext()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSessionContext>("getSessionContext", "()Ljavax/net/ssl/SSLSessionContext;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSessionContext>("getSessionContext", "()Ljavax/net/ssl/SSLSessionContext;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getValueNames()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getPeerCertificateChain()"/>
         /// </summary>
-        public Java.Lang.String[] ValueNames
+        /// <returns><see cref="Javax.Security.Cert.X509Certificate"/></returns>
+        /// <exception cref="Javax.Net.Ssl.SSLPeerUnverifiedException"/>
+        [global::System.Obsolete()]
+        public Javax.Security.Cert.X509Certificate[] GetPeerCertificateChain()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getValueNames", "()[Ljava/lang/String;"); }
+            return IExecuteArray<Javax.Security.Cert.X509Certificate>("getPeerCertificateChain");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#isValid()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getCreationTime()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsValid()
+        /// <returns><see cref="long"/></returns>
+        public long GetCreationTime()
         {
-            return IExecuteWithSignature<bool>("isValid", "()Z");
+            return IExecuteWithSignature<long>("getCreationTime", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#getValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#getLastAccessedTime()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="object"/></returns>
-        public object GetValue(Java.Lang.String arg0)
+        /// <returns><see cref="long"/></returns>
+        public long GetLastAccessedTime()
         {
-            return IExecuteWithSignature("getValue", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<long>("getLastAccessedTime", "()J");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#invalidate()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#invalidate()"/>
         /// </summary>
         public void Invalidate()
         {
             IExecuteWithSignature("invalidate", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#putValue(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#putValue(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -210,7 +229,7 @@ public void PutValue(Java.Lang.String arg0, object arg1)
             IExecute("putValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSession.html#removeValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSession.html#removeValue(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void RemoveValue(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionBindingEvent.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionBindingEvent.cs
index c79ee3f64..435f06b66 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionBindingEvent.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionBindingEvent.cs
@@ -30,7 +30,7 @@ public partial class SSLSessionBindingEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingEvent.html#%3Cinit%3E(javax.net.ssl.SSLSession,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingEvent.html#%3Cinit%3E(javax.net.ssl.SSLSession,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLSession"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -55,18 +55,20 @@ public SSLSessionBindingEvent(Javax.Net.Ssl.SSLSession arg0, Java.Lang.String ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingEvent.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingEvent.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingEvent.html#getSession()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingEvent.html#getSession()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSession Session
+        /// <returns><see cref="Javax.Net.Ssl.SSLSession"/></returns>
+        public Javax.Net.Ssl.SSLSession GetSession()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "()Ljavax/net/ssl/SSLSession;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "()Ljavax/net/ssl/SSLSession;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionBindingListener.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionBindingListener.cs
index 7ea3fbb3c..a0b6718af 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionBindingListener.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionBindingListener.cs
@@ -27,7 +27,7 @@ namespace Javax.Net.Ssl
 {
     #region ISSLSessionBindingListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.javax.net.ssl.SSLSessionBindingListener implementing <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.javax.net.ssl.SSLSessionBindingListener implementing <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html"/>
     /// </summary>
     public partial interface ISSLSessionBindingListener
     {
@@ -68,16 +68,16 @@ public partial class SSLSessionBindingListener : Javax.Net.Ssl.ISSLSessionBindin
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("valueBound", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.SSLSessionBindingEvent>>>(ValueBoundEventHandler));
-            AddEventHandler("valueUnbound", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.SSLSessionBindingEvent>>>(ValueUnboundEventHandler));
+            AddEventHandler("valueBound", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.SSLSessionBindingEvent>>>(ValueBoundEventHandler));
+            AddEventHandler("valueUnbound", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.SSLSessionBindingEvent>>>(ValueUnboundEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingListener.html#valueBound(javax.net.ssl.SSLSessionBindingEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html#valueBound(javax.net.ssl.SSLSessionBindingEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnValueBound"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Net.Ssl.SSLSessionBindingEvent> OnValueBound { get; set; } = null;
+        public global::System.Action<Javax.Net.Ssl.SSLSessionBindingEvent> OnValueBound { get; set; } = null;
 
         void ValueBoundEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.SSLSessionBindingEvent>> data)
         {
@@ -86,7 +86,7 @@ void ValueBoundEventHandler(object sender, CLRListenerEventArgs<CLREventData<Jav
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingListener.html#valueBound(javax.net.ssl.SSLSessionBindingEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html#valueBound(javax.net.ssl.SSLSessionBindingEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLSessionBindingEvent"/></param>
         public virtual void ValueBound(Javax.Net.Ssl.SSLSessionBindingEvent arg0)
@@ -95,10 +95,10 @@ public virtual void ValueBound(Javax.Net.Ssl.SSLSessionBindingEvent arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingListener.html#valueUnbound(javax.net.ssl.SSLSessionBindingEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html#valueUnbound(javax.net.ssl.SSLSessionBindingEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnValueUnbound"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Net.Ssl.SSLSessionBindingEvent> OnValueUnbound { get; set; } = null;
+        public global::System.Action<Javax.Net.Ssl.SSLSessionBindingEvent> OnValueUnbound { get; set; } = null;
 
         void ValueUnboundEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Net.Ssl.SSLSessionBindingEvent>> data)
         {
@@ -107,7 +107,7 @@ void ValueUnboundEventHandler(object sender, CLRListenerEventArgs<CLREventData<J
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingListener.html#valueUnbound(javax.net.ssl.SSLSessionBindingEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html#valueUnbound(javax.net.ssl.SSLSessionBindingEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLSessionBindingEvent"/></param>
         public virtual void ValueUnbound(Javax.Net.Ssl.SSLSessionBindingEvent arg0)
@@ -146,7 +146,7 @@ public partial class SSLSessionBindingListenerDirect : Javax.Net.Ssl.ISSLSession
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingListener.html#valueBound(javax.net.ssl.SSLSessionBindingEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html#valueBound(javax.net.ssl.SSLSessionBindingEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLSessionBindingEvent"/></param>
         public override void ValueBound(Javax.Net.Ssl.SSLSessionBindingEvent arg0)
@@ -154,7 +154,7 @@ public override void ValueBound(Javax.Net.Ssl.SSLSessionBindingEvent arg0)
             IExecuteWithSignature("valueBound", "(Ljavax/net/ssl/SSLSessionBindingEvent;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionBindingListener.html#valueUnbound(javax.net.ssl.SSLSessionBindingEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionBindingListener.html#valueUnbound(javax.net.ssl.SSLSessionBindingEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLSessionBindingEvent"/></param>
         public override void ValueUnbound(Javax.Net.Ssl.SSLSessionBindingEvent arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionContext.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionContext.cs
index 1a107233b..56e318f2d 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionContext.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSessionContext.cs
@@ -64,28 +64,31 @@ public partial class SSLSessionContext : Javax.Net.Ssl.ISSLSessionContext
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionContext.html#getIds()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionContext.html#getSessionCacheSize()"/>
         /// </summary>
-        public Java.Util.Enumeration<byte[]> Ids
+        /// <returns><see cref="int"/></returns>
+        public int GetSessionCacheSize()
         {
-            get { return IExecuteWithSignature<Java.Util.Enumeration<byte[]>>("getIds", "()Ljava/util/Enumeration;"); }
+            return IExecuteWithSignature<int>("getSessionCacheSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionContext.html#getSessionCacheSize()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionContext.html#setSessionCacheSize(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionContext.html#getSessionTimeout()"/>
         /// </summary>
-        public int SessionCacheSize
+        /// <returns><see cref="int"/></returns>
+        public int GetSessionTimeout()
         {
-            get { return IExecuteWithSignature<int>("getSessionCacheSize", "()I"); } set { IExecuteWithSignature("setSessionCacheSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getSessionTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionContext.html#getSessionTimeout()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionContext.html#setSessionTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionContext.html#getIds()"/>
         /// </summary>
-        public int SessionTimeout
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<byte[]> GetIds()
         {
-            get { return IExecuteWithSignature<int>("getSessionTimeout", "()I"); } set { IExecuteWithSignature("setSessionTimeout", "(I)V", value); }
+            return IExecuteWithSignature<Java.Util.Enumeration<byte[]>>("getIds", "()Ljava/util/Enumeration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSessionContext.html#getSession(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionContext.html#getSession(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Javax.Net.Ssl.SSLSession"/></returns>
@@ -93,6 +96,24 @@ public Javax.Net.Ssl.SSLSession GetSession(byte[] arg0)
         {
             return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "([B)Ljavax/net/ssl/SSLSession;", new object[] { arg0 });
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionContext.html#setSessionCacheSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        public void SetSessionCacheSize(int arg0)
+        {
+            IExecuteWithSignature("setSessionCacheSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSessionContext.html#setSessionTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        public void SetSessionTimeout(int arg0)
+        {
+            IExecuteWithSignature("setSessionTimeout", "(I)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSocket.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSocket.cs
index 5713e79cd..c39c8f809 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSocket.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSocket.cs
@@ -46,127 +46,213 @@ public partial class SSLSocket
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getApplicationProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getEnableSessionCreation()"/>
         /// </summary>
-        public Java.Lang.String ApplicationProtocol
+        /// <returns><see cref="bool"/></returns>
+        public bool GetEnableSessionCreation()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getApplicationProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("getEnableSessionCreation", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getEnabledCipherSuites()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#setEnabledCipherSuites(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getNeedClientAuth()"/>
         /// </summary>
-        public Java.Lang.String[] EnabledCipherSuites
+        /// <returns><see cref="bool"/></returns>
+        public bool GetNeedClientAuth()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledCipherSuites", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEnabledCipherSuites", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getNeedClientAuth", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getEnabledProtocols()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#setEnabledProtocols(java.lang.String[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getUseClientMode()"/>
         /// </summary>
-        public Java.Lang.String[] EnabledProtocols
+        /// <returns><see cref="bool"/></returns>
+        public bool GetUseClientMode()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledProtocols", "()[Ljava/lang/String;"); } set { IExecuteWithSignature("setEnabledProtocols", "([Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getUseClientMode", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getEnableSessionCreation()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#setEnableSessionCreation(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getWantClientAuth()"/>
         /// </summary>
-        public bool EnableSessionCreation
+        /// <returns><see cref="bool"/></returns>
+        public bool GetWantClientAuth()
         {
-            get { return IExecuteWithSignature<bool>("getEnableSessionCreation", "()Z"); } set { IExecuteWithSignature("setEnableSessionCreation", "(Z)V", value); }
+            return IExecuteWithSignature<bool>("getWantClientAuth", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getHandshakeApplicationProtocol()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getEnabledCipherSuites()"/>
         /// </summary>
-        public Java.Lang.String HandshakeApplicationProtocol
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEnabledCipherSuites()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getHandshakeApplicationProtocol", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getHandshakeApplicationProtocolSelector()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#setHandshakeApplicationProtocolSelector(java.util.function.BiFunction)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getEnabledProtocols()"/>
         /// </summary>
-        public Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLSocket, Java.Util.List<Java.Lang.String>, Java.Lang.String> HandshakeApplicationProtocolSelector
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetEnabledProtocols()
         {
-            get { return IExecuteWithSignature<Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLSocket, Java.Util.List<Java.Lang.String>, Java.Lang.String>>("getHandshakeApplicationProtocolSelector", "()Ljava/util/function/BiFunction;"); } set { IExecuteWithSignature("setHandshakeApplicationProtocolSelector", "(Ljava/util/function/BiFunction;)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getEnabledProtocols", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getHandshakeSession()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getSupportedCipherSuites()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSession HandshakeSession
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedCipherSuites()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getHandshakeSession", "()Ljavax/net/ssl/SSLSession;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getNeedClientAuth()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#setNeedClientAuth(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getSupportedProtocols()"/>
         /// </summary>
-        public bool NeedClientAuth
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedProtocols()
         {
-            get { return IExecuteWithSignature<bool>("getNeedClientAuth", "()Z"); } set { IExecuteWithSignature("setNeedClientAuth", "(Z)V", value); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedProtocols", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getSession()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getSession()"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLSession Session
+        /// <returns><see cref="Javax.Net.Ssl.SSLSession"/></returns>
+        public Javax.Net.Ssl.SSLSession GetSession()
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "()Ljavax/net/ssl/SSLSession;"); }
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getSession", "()Ljavax/net/ssl/SSLSession;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getSSLParameters()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#setSSLParameters(javax.net.ssl.SSLParameters)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener)"/>
         /// </summary>
-        public Javax.Net.Ssl.SSLParameters SSLParameters
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.HandshakeCompletedListener"/></param>
+        public void AddHandshakeCompletedListener(Javax.Net.Ssl.HandshakeCompletedListener arg0)
         {
-            get { return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getSSLParameters", "()Ljavax/net/ssl/SSLParameters;"); } set { IExecuteWithSignature("setSSLParameters", "(Ljavax/net/ssl/SSLParameters;)V", value); }
+            IExecuteWithSignature("addHandshakeCompletedListener", "(Ljavax/net/ssl/HandshakeCompletedListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getSupportedCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#removeHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener)"/>
         /// </summary>
-        public Java.Lang.String[] SupportedCipherSuites
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.HandshakeCompletedListener"/></param>
+        public void RemoveHandshakeCompletedListener(Javax.Net.Ssl.HandshakeCompletedListener arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;"); }
+            IExecuteWithSignature("removeHandshakeCompletedListener", "(Ljavax/net/ssl/HandshakeCompletedListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getSupportedProtocols()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#setEnabledCipherSuites(java.lang.String[])"/>
         /// </summary>
-        public Java.Lang.String[] SupportedProtocols
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEnabledCipherSuites(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedProtocols", "()[Ljava/lang/String;"); }
+            IExecuteWithSignature("setEnabledCipherSuites", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getUseClientMode()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#setUseClientMode(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#setEnabledProtocols(java.lang.String[])"/>
         /// </summary>
-        public bool UseClientMode
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEnabledProtocols(Java.Lang.String[] arg0)
         {
-            get { return IExecuteWithSignature<bool>("getUseClientMode", "()Z"); } set { IExecuteWithSignature("setUseClientMode", "(Z)V", value); }
+            IExecuteWithSignature("setEnabledProtocols", "([Ljava/lang/String;)V", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#getWantClientAuth()"/> <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#setWantClientAuth(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#setEnableSessionCreation(boolean)"/>
         /// </summary>
-        public bool WantClientAuth
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetEnableSessionCreation(bool arg0)
         {
-            get { return IExecuteWithSignature<bool>("getWantClientAuth", "()Z"); } set { IExecuteWithSignature("setWantClientAuth", "(Z)V", value); }
+            IExecuteWithSignature("setEnableSessionCreation", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#setNeedClientAuth(boolean)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Javax.Net.Ssl.HandshakeCompletedListener"/></param>
-        public void AddHandshakeCompletedListener(Javax.Net.Ssl.HandshakeCompletedListener arg0)
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetNeedClientAuth(bool arg0)
         {
-            IExecuteWithSignature("addHandshakeCompletedListener", "(Ljavax/net/ssl/HandshakeCompletedListener;)V", arg0);
+            IExecuteWithSignature("setNeedClientAuth", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#removeHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#setUseClientMode(boolean)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Javax.Net.Ssl.HandshakeCompletedListener"/></param>
-        public void RemoveHandshakeCompletedListener(Javax.Net.Ssl.HandshakeCompletedListener arg0)
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetUseClientMode(bool arg0)
         {
-            IExecuteWithSignature("removeHandshakeCompletedListener", "(Ljavax/net/ssl/HandshakeCompletedListener;)V", arg0);
+            IExecuteWithSignature("setUseClientMode", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocket.html#startHandshake()"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#setWantClientAuth(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetWantClientAuth(bool arg0)
+        {
+            IExecuteWithSignature("setWantClientAuth", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#startHandshake()"/>
         /// </summary>
         /// <exception cref="Java.Io.IOException"/>
         public void StartHandshake()
         {
             IExecuteWithSignature("startHandshake", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getApplicationProtocol()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetApplicationProtocol()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getApplicationProtocol", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getHandshakeApplicationProtocol()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetHandshakeApplicationProtocol()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getHandshakeApplicationProtocol", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getHandshakeApplicationProtocolSelector()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
+        public Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLSocket, Java.Util.List<Java.Lang.String>, Java.Lang.String> GetHandshakeApplicationProtocolSelector()
+        {
+            return IExecuteWithSignature<Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLSocket, Java.Util.List<Java.Lang.String>, Java.Lang.String>>("getHandshakeApplicationProtocolSelector", "()Ljava/util/function/BiFunction;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getHandshakeApplicationProtocolSelector()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Function.BiFunction"/></returns>
+        public Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLSocket, Java.Util.List<Java.Lang.String>, Java.Lang.String> GetHandshakeApplicationProtocolSelectorDirect()
+        {
+            return IExecuteWithSignature<Java.Util.Function.BiFunctionDirect<Javax.Net.Ssl.SSLSocket, Java.Util.List<Java.Lang.String>, Java.Lang.String>, Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLSocket, Java.Util.List<Java.Lang.String>, Java.Lang.String>>("getHandshakeApplicationProtocolSelector", "()Ljava/util/function/BiFunction;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getSSLParameters()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Net.Ssl.SSLParameters"/></returns>
+        public Javax.Net.Ssl.SSLParameters GetSSLParameters()
+        {
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLParameters>("getSSLParameters", "()Ljavax/net/ssl/SSLParameters;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#getHandshakeSession()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Net.Ssl.SSLSession"/></returns>
+        public Javax.Net.Ssl.SSLSession GetHandshakeSession()
+        {
+            return IExecuteWithSignature<Javax.Net.Ssl.SSLSession>("getHandshakeSession", "()Ljavax/net/ssl/SSLSession;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#setHandshakeApplicationProtocolSelector(java.util.function.BiFunction)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Function.BiFunction"/></param>
+        public void SetHandshakeApplicationProtocolSelector(Java.Util.Function.BiFunction<Javax.Net.Ssl.SSLSocket, Java.Util.List<Java.Lang.String>, Java.Lang.String> arg0)
+        {
+            IExecuteWithSignature("setHandshakeApplicationProtocolSelector", "(Ljava/util/function/BiFunction;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocket.html#setSSLParameters(javax.net.ssl.SSLParameters)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Net.Ssl.SSLParameters"/></param>
+        public void SetSSLParameters(Javax.Net.Ssl.SSLParameters arg0)
+        {
+            IExecuteWithSignature("setSSLParameters", "(Ljavax/net/ssl/SSLParameters;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSocketFactory.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSocketFactory.cs
index 929ac1437..02c156e45 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSocketFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/SSLSocketFactory.cs
@@ -46,21 +46,23 @@ public partial class SSLSocketFactory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocketFactory.html#getDefaultCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocketFactory.html#getDefaultCipherSuites()"/>
         /// </summary>
-        public Java.Lang.String[] DefaultCipherSuites
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetDefaultCipherSuites()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getDefaultCipherSuites", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getDefaultCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocketFactory.html#getSupportedCipherSuites()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocketFactory.html#getSupportedCipherSuites()"/>
         /// </summary>
-        public Java.Lang.String[] SupportedCipherSuites
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetSupportedCipherSuites()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getSupportedCipherSuites", "()[Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocketFactory.html#createSocket(java.net.Socket,java.lang.String,int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocketFactory.html#createSocket(java.net.Socket,java.lang.String,int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Socket"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -73,7 +75,7 @@ public Java.Net.Socket CreateSocket(Java.Net.Socket arg0, Java.Lang.String arg1,
             return IExecute<Java.Net.Socket>("createSocket", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/SSLSocketFactory.html#createSocket(java.net.Socket,java.io.InputStream,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/SSLSocketFactory.html#createSocket(java.net.Socket,java.io.InputStream,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Socket"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/StandardConstants.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/StandardConstants.cs
index a043c967e..1fde1e1c7 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/StandardConstants.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/StandardConstants.cs
@@ -38,7 +38,7 @@ public partial class StandardConstants
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/StandardConstants.html#SNI_HOST_NAME"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/StandardConstants.html#SNI_HOST_NAME"/>
         /// </summary>
         public static int SNI_HOST_NAME { get { if (!_SNI_HOST_NAMEReady) { _SNI_HOST_NAMEContent = SGetField<int>(LocalBridgeClazz, "SNI_HOST_NAME"); _SNI_HOST_NAMEReady = true; } return _SNI_HOST_NAMEContent; } }
         private static int _SNI_HOST_NAMEContent = default;
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/TrustManagerFactory.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/TrustManagerFactory.cs
index adb7b07a1..328eab5db 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/TrustManagerFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/TrustManagerFactory.cs
@@ -42,14 +42,15 @@ public partial class TrustManagerFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#getDefaultAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#getDefaultAlgorithm()"/>
         /// </summary>
-        public static Java.Lang.String DefaultAlgorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public static Java.Lang.String GetDefaultAlgorithm()
         {
-            get { return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultAlgorithm", "()Ljava/lang/String;"); }
+            return SExecuteWithSignature<Java.Lang.String>(LocalBridgeClazz, "getDefaultAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#getInstance(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#getInstance(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -61,7 +62,7 @@ public static Javax.Net.Ssl.TrustManagerFactory GetInstance(Java.Lang.String arg
             return SExecute<Javax.Net.Ssl.TrustManagerFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#getInstance(java.lang.String,java.security.Provider)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Provider"/></param>
@@ -72,7 +73,7 @@ public static Javax.Net.Ssl.TrustManagerFactory GetInstance(Java.Lang.String arg
             return SExecute<Javax.Net.Ssl.TrustManagerFactory>(LocalBridgeClazz, "getInstance", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#getInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#getInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Net.Ssl.TrustManagerFactory"/></returns>
@@ -86,28 +87,31 @@ public static Javax.Net.Ssl.TrustManagerFactory GetInstance(Java.Lang.String arg
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#getAlgorithm()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#getAlgorithm()"/>
         /// </summary>
-        public Java.Lang.String Algorithm
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetAlgorithm()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getAlgorithm", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#getProvider()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#getProvider()"/>
         /// </summary>
-        public Java.Security.Provider Provider
+        /// <returns><see cref="Java.Security.Provider"/></returns>
+        public Java.Security.Provider GetProvider()
         {
-            get { return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;"); }
+            return IExecuteWithSignature<Java.Security.Provider>("getProvider", "()Ljava/security/Provider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#getTrustManagers()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#getTrustManagers()"/>
         /// </summary>
-        public Javax.Net.Ssl.TrustManager[] TrustManagers
+        /// <returns><see cref="Javax.Net.Ssl.TrustManager"/></returns>
+        public Javax.Net.Ssl.TrustManager[] GetTrustManagers()
         {
-            get { return IExecuteWithSignatureArray<Javax.Net.Ssl.TrustManager>("getTrustManagers", "()[Ljavax/net/ssl/TrustManager;"); }
+            return IExecuteWithSignatureArray<Javax.Net.Ssl.TrustManager>("getTrustManagers", "()[Ljavax/net/ssl/TrustManager;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#init(java.security.KeyStore)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#init(java.security.KeyStore)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.KeyStore"/></param>
         /// <exception cref="Java.Security.KeyStoreException"/>
@@ -116,7 +120,7 @@ public void Init(Java.Security.KeyStore arg0)
             IExecuteWithSignature("init", "(Ljava/security/KeyStore;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/TrustManagerFactory.html#init(javax.net.ssl.ManagerFactoryParameters)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/TrustManagerFactory.html#init(javax.net.ssl.ManagerFactoryParameters)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Net.Ssl.ManagerFactoryParameters"/></param>
         /// <exception cref="Java.Security.InvalidAlgorithmParameterException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/X509ExtendedKeyManager.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/X509ExtendedKeyManager.cs
index b3f618434..900a64b43 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/X509ExtendedKeyManager.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/X509ExtendedKeyManager.cs
@@ -46,7 +46,7 @@ public partial class X509ExtendedKeyManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509ExtendedKeyManager.html#chooseEngineClientAlias(java.lang.String[],java.security.Principal[],javax.net.ssl.SSLEngine)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedKeyManager.html#chooseEngineClientAlias(java.lang.String[],java.security.Principal[],javax.net.ssl.SSLEngine)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Principal"/></param>
@@ -57,7 +57,7 @@ public Java.Lang.String ChooseEngineClientAlias(Java.Lang.String[] arg0, Java.Se
             return IExecute<Java.Lang.String>("chooseEngineClientAlias", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509ExtendedKeyManager.html#chooseEngineServerAlias(java.lang.String,java.security.Principal[],javax.net.ssl.SSLEngine)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedKeyManager.html#chooseEngineServerAlias(java.lang.String,java.security.Principal[],javax.net.ssl.SSLEngine)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Principal"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/X509ExtendedTrustManager.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/X509ExtendedTrustManager.cs
index 293ceb31b..6b224c2b9 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/X509ExtendedTrustManager.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/X509ExtendedTrustManager.cs
@@ -46,7 +46,7 @@ public partial class X509ExtendedTrustManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509ExtendedTrustManager.html#checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String,java.net.Socket)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager.html#checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String,java.net.Socket)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -57,7 +57,7 @@ public void CheckClientTrusted(Java.Security.Cert.X509Certificate[] arg0, Java.L
             IExecute("checkClientTrusted", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509ExtendedTrustManager.html#checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String,javax.net.ssl.SSLEngine)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager.html#checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String,javax.net.ssl.SSLEngine)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -68,7 +68,7 @@ public void CheckClientTrusted(Java.Security.Cert.X509Certificate[] arg0, Java.L
             IExecute("checkClientTrusted", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509ExtendedTrustManager.html#checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String,java.net.Socket)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager.html#checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String,java.net.Socket)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -79,7 +79,7 @@ public void CheckServerTrusted(Java.Security.Cert.X509Certificate[] arg0, Java.L
             IExecute("checkServerTrusted", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509ExtendedTrustManager.html#checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String,javax.net.ssl.SSLEngine)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager.html#checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String,javax.net.ssl.SSLEngine)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/X509KeyManager.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/X509KeyManager.cs
index bac1030c5..e944c094a 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/X509KeyManager.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/X509KeyManager.cs
@@ -64,7 +64,7 @@ public partial class X509KeyManager : Javax.Net.Ssl.IX509KeyManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509KeyManager.html#chooseClientAlias(java.lang.String[],java.security.Principal[],java.net.Socket)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509KeyManager.html#chooseClientAlias(java.lang.String[],java.security.Principal[],java.net.Socket)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Principal"/></param>
@@ -75,7 +75,7 @@ public Java.Lang.String ChooseClientAlias(Java.Lang.String[] arg0, Java.Security
             return IExecute<Java.Lang.String>("chooseClientAlias", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509KeyManager.html#chooseServerAlias(java.lang.String,java.security.Principal[],java.net.Socket)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509KeyManager.html#chooseServerAlias(java.lang.String,java.security.Principal[],java.net.Socket)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Principal"/></param>
@@ -86,7 +86,7 @@ public Java.Lang.String ChooseServerAlias(Java.Lang.String arg0, Java.Security.P
             return IExecute<Java.Lang.String>("chooseServerAlias", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509KeyManager.html#getClientAliases(java.lang.String,java.security.Principal[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509KeyManager.html#getClientAliases(java.lang.String,java.security.Principal[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Principal"/></param>
@@ -96,7 +96,7 @@ public Java.Lang.String[] GetClientAliases(Java.Lang.String arg0, Java.Security.
             return IExecuteArray<Java.Lang.String>("getClientAliases", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509KeyManager.html#getServerAliases(java.lang.String,java.security.Principal[])"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509KeyManager.html#getServerAliases(java.lang.String,java.security.Principal[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Principal"/></param>
@@ -106,7 +106,7 @@ public Java.Lang.String[] GetServerAliases(Java.Lang.String arg0, Java.Security.
             return IExecuteArray<Java.Lang.String>("getServerAliases", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509KeyManager.html#getCertificateChain(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509KeyManager.html#getCertificateChain(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
@@ -115,7 +115,7 @@ public Java.Security.Cert.X509Certificate[] GetCertificateChain(Java.Lang.String
             return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getCertificateChain", "(Ljava/lang/String;)[Ljava/security/cert/X509Certificate;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509KeyManager.html#getPrivateKey(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509KeyManager.html#getPrivateKey(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Security.PrivateKey"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Net/Ssl/X509TrustManager.cs b/src/net/Netdroid/Generated/Javax/Net/Ssl/X509TrustManager.cs
index 95dad3d70..f1a788250 100644
--- a/src/net/Netdroid/Generated/Javax/Net/Ssl/X509TrustManager.cs
+++ b/src/net/Netdroid/Generated/Javax/Net/Ssl/X509TrustManager.cs
@@ -64,14 +64,15 @@ public partial class X509TrustManager : Javax.Net.Ssl.IX509TrustManager
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509TrustManager.html#getAcceptedIssuers()"/> 
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509TrustManager.html#getAcceptedIssuers()"/>
         /// </summary>
-        public Java.Security.Cert.X509Certificate[] AcceptedIssuers
+        /// <returns><see cref="Java.Security.Cert.X509Certificate"/></returns>
+        public Java.Security.Cert.X509Certificate[] GetAcceptedIssuers()
         {
-            get { return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getAcceptedIssuers", "()[Ljava/security/cert/X509Certificate;"); }
+            return IExecuteWithSignatureArray<Java.Security.Cert.X509Certificate>("getAcceptedIssuers", "()[Ljava/security/cert/X509Certificate;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509TrustManager.html#checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509TrustManager.html#checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -81,7 +82,7 @@ public void CheckClientTrusted(Java.Security.Cert.X509Certificate[] arg0, Java.L
             IExecute("checkClientTrusted", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/net/ssl/X509TrustManager.html#checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/net/ssl/X509TrustManager.html#checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/AllPackageClasses.cs
index e46375df8..da1b78e31 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Security.Auth
 {
     #region AuthPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/AuthPermission.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/AuthPermission.html"/>
     /// </summary>
     public partial class AuthPermission : Java.Security.BasicPermission
     {
@@ -72,7 +72,7 @@ public AuthPermission(params object[] args) : base(args) { }
 
     #region Destroyable
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Destroyable.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/Destroyable.html"/>
     /// </summary>
     public partial class Destroyable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Destroyable>
     {
@@ -80,12 +80,12 @@ public partial class Destroyable : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Destr
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Destroyable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Destroyable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Destroyable() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Destroyable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Destroyable class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Destroyable(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -118,7 +118,7 @@ public Destroyable(params object[] args) : base(args) { }
 
     #region DestroyFailedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/DestroyFailedException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/DestroyFailedException.html"/>
     /// </summary>
     public partial class DestroyFailedException : Java.Lang.Exception
     {
@@ -135,7 +135,7 @@ public partial class DestroyFailedException : Java.Lang.Exception
 
     #region PrivateCredentialPermission
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/PrivateCredentialPermission.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/PrivateCredentialPermission.html"/>
     /// </summary>
     public partial class PrivateCredentialPermission : Java.Security.Permission
     {
@@ -179,7 +179,7 @@ public PrivateCredentialPermission(params object[] args) : base(args) { }
 
     #region Subject
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html"/>
     /// </summary>
     public partial class Subject : Java.Io.Serializable
     {
@@ -223,9 +223,8 @@ public Subject(params object[] args) : base(args) { }
 
     #region SubjectDomainCombiner
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/SubjectDomainCombiner.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/SubjectDomainCombiner.html"/>
     /// </summary>
-    [System.Obsolete()]
     public partial class SubjectDomainCombiner : Java.Security.DomainCombiner
     {
         const string _bridgeClassName = "javax.security.auth.SubjectDomainCombiner";
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/AuthPermission.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/AuthPermission.cs
index 4e4179d83..8757c4ee9 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/AuthPermission.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/AuthPermission.cs
@@ -30,7 +30,7 @@ public partial class AuthPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/AuthPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/AuthPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public AuthPermission(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/AuthPermission.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/AuthPermission.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public AuthPermission(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/AllPackageClasses.cs
index f493858c8..e99205d6a 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Security.Auth.Callback
 {
     #region Callback
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/Callback.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/callback/Callback.html"/>
     /// </summary>
     public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback>
     {
@@ -36,12 +36,12 @@ public partial class Callback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Callback
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Callback() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Callback class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Callback(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Callback(params object[] args) : base(args) { }
 
     #region CallbackHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/CallbackHandler.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/callback/CallbackHandler.html"/>
     /// </summary>
     public partial class CallbackHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CallbackHandler>
     {
@@ -82,12 +82,12 @@ public partial class CallbackHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<C
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CallbackHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallbackHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallbackHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CallbackHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CallbackHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CallbackHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public CallbackHandler(params object[] args) : base(args) { }
 
     #region PasswordCallback
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/PasswordCallback.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/callback/PasswordCallback.html"/>
     /// </summary>
     public partial class PasswordCallback : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PasswordCallback>
     {
@@ -164,7 +164,7 @@ public PasswordCallback(params object[] args) : base(args) { }
 
     #region UnsupportedCallbackException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/UnsupportedCallbackException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/callback/UnsupportedCallbackException.html"/>
     /// </summary>
     public partial class UnsupportedCallbackException : Java.Lang.Exception
     {
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/CallbackHandler.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/CallbackHandler.cs
index b107dead2..376ef89dd 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/CallbackHandler.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/CallbackHandler.cs
@@ -64,7 +64,7 @@ public partial class CallbackHandler : Javax.Security.Auth.Callback.ICallbackHan
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/CallbackHandler.html#handle(javax.security.auth.callback.Callback[])"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/callback/CallbackHandler.html#handle(javax.security.auth.callback.Callback[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Callback.Callback"/></param>
         /// <exception cref="Java.Io.IOException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/PasswordCallback.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/PasswordCallback.cs
index e967a29d2..906cc698e 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/PasswordCallback.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/Callback/PasswordCallback.cs
@@ -30,7 +30,7 @@ public partial class PasswordCallback : Javax.Security.Auth.Callback.ICallback,
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/PasswordCallback.html#%3Cinit%3E(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/callback/PasswordCallback.html#%3Cinit%3E(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -63,34 +63,44 @@ public PasswordCallback(Java.Lang.String arg0, bool arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/PasswordCallback.html#getPassword()"/> <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/PasswordCallback.html#setPassword(char[])"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/callback/PasswordCallback.html#isEchoOn()"/>
         /// </summary>
-        public char[] Password
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEchoOn()
         {
-            get { return IExecuteWithSignatureArray<char>("getPassword", "()[C"); } set { IExecuteWithSignature("setPassword", "([C)V", value); }
+            return IExecuteWithSignature<bool>("isEchoOn", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/PasswordCallback.html#getPrompt()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/auth/callback/PasswordCallback.html#getPassword()"/>
         /// </summary>
-        public Java.Lang.String Prompt
+        /// <returns><see cref="char"/></returns>
+        public char[] GetPassword()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPrompt", "()Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<char>("getPassword", "()[C");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/PasswordCallback.html#isEchoOn()"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/callback/PasswordCallback.html#getPrompt()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEchoOn()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPrompt()
         {
-            return IExecuteWithSignature<bool>("isEchoOn", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getPrompt", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/callback/PasswordCallback.html#clearPassword()"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/callback/PasswordCallback.html#clearPassword()"/>
         /// </summary>
         public void ClearPassword()
         {
             IExecuteWithSignature("clearPassword", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/callback/PasswordCallback.html#setPassword(char[])"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="char"/></param>
+        public void SetPassword(char[] arg0)
+        {
+            IExecuteWithSignature("setPassword", "([C)V", new object[] { arg0 });
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/Destroyable.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/Destroyable.cs
index 49f027fa5..1b2d9f343 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/Destroyable.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/Destroyable.cs
@@ -64,7 +64,7 @@ public partial class Destroyable : Javax.Security.Auth.IDestroyable
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Destroyable.html#isDestroyed()"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Destroyable.html#isDestroyed()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsDestroyed()
@@ -72,7 +72,7 @@ public bool IsDestroyed()
             return IExecuteWithSignature<bool>("isDestroyed", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Destroyable.html#destroy()"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Destroyable.html#destroy()"/>
         /// </summary>
         /// <exception cref="Javax.Security.Auth.DestroyFailedException"/>
         public void Destroy()
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/Login/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/Login/AllPackageClasses.cs
index 467f01b70..0c7035b4e 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/Login/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/Login/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Security.Auth.Login
 {
     #region LoginException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/login/LoginException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/login/LoginException.html"/>
     /// </summary>
     public partial class LoginException : Java.Security.GeneralSecurityException
     {
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/PrivateCredentialPermission.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/PrivateCredentialPermission.cs
index 18b682d23..def4e2cc3 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/PrivateCredentialPermission.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/PrivateCredentialPermission.cs
@@ -30,7 +30,7 @@ public partial class PrivateCredentialPermission
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/PrivateCredentialPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/PrivateCredentialPermission.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -55,18 +55,20 @@ public PrivateCredentialPermission(Java.Lang.String arg0, Java.Lang.String arg1)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/PrivateCredentialPermission.html#getCredentialClass()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/auth/PrivateCredentialPermission.html#getCredentialClass()"/>
         /// </summary>
-        public Java.Lang.String CredentialClass
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCredentialClass()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCredentialClass", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getCredentialClass", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/PrivateCredentialPermission.html#getPrincipals()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/auth/PrivateCredentialPermission.html#getPrincipals()"/>
         /// </summary>
-        public Java.Lang.String[] Principals
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String[] GetPrincipals()
         {
-            get { return IExecuteWithSignatureArray<Java.Lang.String>("getPrincipals", "()[[Ljava/lang/String;"); }
+            return IExecuteWithSignatureArray<Java.Lang.String>("getPrincipals", "()[[Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/Subject.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/Subject.cs
index 63b41c857..a59ffcd47 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/Subject.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/Subject.cs
@@ -30,7 +30,7 @@ public partial class Subject
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#%3Cinit%3E(boolean,java.util.Set,java.util.Set,java.util.Set)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#%3Cinit%3E(boolean,java.util.Set,java.util.Set,java.util.Set)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Java.Util.Set"/></param>
@@ -53,7 +53,7 @@ public Subject(bool arg0, Java.Util.Set arg1, Java.Util.Set<object> arg2, Java.U
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#doAs(javax.security.auth.Subject,java.security.PrivilegedAction)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#doAs(javax.security.auth.Subject,java.security.PrivilegedAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Subject"/></param>
         /// <param name="arg1"><see cref="Java.Security.PrivilegedAction"/></param>
@@ -64,7 +64,7 @@ public static T DoAs<T>(Javax.Security.Auth.Subject arg0, Java.Security.Privileg
             return SExecute<T>(LocalBridgeClazz, "doAs", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#doAs(javax.security.auth.Subject,java.security.PrivilegedExceptionAction)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#doAs(javax.security.auth.Subject,java.security.PrivilegedExceptionAction)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Subject"/></param>
         /// <param name="arg1"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
@@ -76,20 +76,19 @@ public static T DoAs<T>(Javax.Security.Auth.Subject arg0, Java.Security.Privileg
             return SExecute<T>(LocalBridgeClazz, "doAs", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#doAsPrivileged(javax.security.auth.Subject,java.security.PrivilegedAction,java.security.AccessControlContext)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#doAsPrivileged(javax.security.auth.Subject,java.security.PrivilegedAction,java.security.AccessControlContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Subject"/></param>
         /// <param name="arg1"><see cref="Java.Security.PrivilegedAction"/></param>
         /// <param name="arg2"><see cref="Java.Security.AccessControlContext"/></param>
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
-        [System.Obsolete()]
         public static T DoAsPrivileged<T>(Javax.Security.Auth.Subject arg0, Java.Security.PrivilegedAction<T> arg1, Java.Security.AccessControlContext arg2)
         {
             return SExecute<T>(LocalBridgeClazz, "doAsPrivileged", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#doAsPrivileged(javax.security.auth.Subject,java.security.PrivilegedExceptionAction,java.security.AccessControlContext)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#doAsPrivileged(javax.security.auth.Subject,java.security.PrivilegedExceptionAction,java.security.AccessControlContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Subject"/></param>
         /// <param name="arg1"><see cref="Java.Security.PrivilegedExceptionAction"/></param>
@@ -97,17 +96,15 @@ public static T DoAsPrivileged<T>(Javax.Security.Auth.Subject arg0, Java.Securit
         /// <typeparam name="T"></typeparam>
         /// <returns><typeparamref name="T"/></returns>
         /// <exception cref="Java.Security.PrivilegedActionException"/>
-        [System.Obsolete()]
         public static T DoAsPrivileged<T>(Javax.Security.Auth.Subject arg0, Java.Security.PrivilegedExceptionAction<T> arg1, Java.Security.AccessControlContext arg2)
         {
             return SExecute<T>(LocalBridgeClazz, "doAsPrivileged", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#getSubject(java.security.AccessControlContext)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#getSubject(java.security.AccessControlContext)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.AccessControlContext"/></param>
         /// <returns><see cref="Javax.Security.Auth.Subject"/></returns>
-        [System.Obsolete()]
         public static Javax.Security.Auth.Subject GetSubject(Java.Security.AccessControlContext arg0)
         {
             return SExecuteWithSignature<Javax.Security.Auth.Subject>(LocalBridgeClazz, "getSubject", "(Ljava/security/AccessControlContext;)Ljavax/security/auth/Subject;", arg0);
@@ -117,38 +114,17 @@ public static Javax.Security.Auth.Subject GetSubject(Java.Security.AccessControl
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#getPrincipals()"/> 
-        /// </summary>
-        public Java.Util.Set<Java.Security.Principal> Principals
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<Java.Security.Principal>>("getPrincipals", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#getPrivateCredentials()"/> 
-        /// </summary>
-        public Java.Util.Set<object> PrivateCredentials
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<object>>("getPrivateCredentials", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#getPublicCredentials()"/> 
-        /// </summary>
-        public Java.Util.Set<object> PublicCredentials
-        {
-            get { return IExecuteWithSignature<Java.Util.Set<object>>("getPublicCredentials", "()Ljava/util/Set;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#getPrincipals(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#getPrincipals(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"><see cref="Java.Security.IPrincipal"/></typeparam>
         /// <returns><see cref="Java.Util.Set"/></returns>
-        public Java.Util.Set<T> GetPrincipals<T>(Java.Lang.Class arg0) where T: Java.Security.IPrincipal, new()
+        public Java.Util.Set<T> GetPrincipals<T>(Java.Lang.Class arg0) where T : Java.Security.IPrincipal, new()
         {
-            return IExecuteWithSignature<Java.Util.Set<T>>("getPrincipals", "(Ljava/lang/Class;)Ljava/util/Set;", arg0);
+            return IExecute<Java.Util.Set<T>>("getPrincipals", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#getPrivateCredentials(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#getPrivateCredentials(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"></typeparam>
@@ -158,7 +134,7 @@ public Java.Util.Set<T> GetPrivateCredentials<T>(Java.Lang.Class arg0)
             return IExecuteWithSignature<Java.Util.Set<T>>("getPrivateCredentials", "(Ljava/lang/Class;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#getPublicCredentials(java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#getPublicCredentials(java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.Class"/></param>
         /// <typeparam name="T"></typeparam>
@@ -168,7 +144,7 @@ public Java.Util.Set<T> GetPublicCredentials<T>(Java.Lang.Class arg0)
             return IExecuteWithSignature<Java.Util.Set<T>>("getPublicCredentials", "(Ljava/lang/Class;)Ljava/util/Set;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#isReadOnly()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsReadOnly()
@@ -176,7 +152,31 @@ public bool IsReadOnly()
             return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/Subject.html#setReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#getPrivateCredentials()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<object> GetPrivateCredentials()
+        {
+            return IExecuteWithSignature<Java.Util.Set<object>>("getPrivateCredentials", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#getPublicCredentials()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<object> GetPublicCredentials()
+        {
+            return IExecuteWithSignature<Java.Util.Set<object>>("getPublicCredentials", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#getPrincipals()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Set"/></returns>
+        public Java.Util.Set<Java.Security.Principal> GetPrincipals()
+        {
+            return IExecuteWithSignature<Java.Util.Set<Java.Security.Principal>>("getPrincipals", "()Ljava/util/Set;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/Subject.html#setReadOnly()"/>
         /// </summary>
         public void SetReadOnly()
         {
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/SubjectDomainCombiner.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/SubjectDomainCombiner.cs
index bd73f6837..9cd4cb7b2 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/SubjectDomainCombiner.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/SubjectDomainCombiner.cs
@@ -30,7 +30,7 @@ public partial class SubjectDomainCombiner
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/SubjectDomainCombiner.html#%3Cinit%3E(javax.security.auth.Subject)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/SubjectDomainCombiner.html#%3Cinit%3E(javax.security.auth.Subject)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Security.Auth.Subject"/></param>
         public SubjectDomainCombiner(Javax.Security.Auth.Subject arg0)
@@ -54,14 +54,7 @@ public SubjectDomainCombiner(Javax.Security.Auth.Subject arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/SubjectDomainCombiner.html#getSubject()"/> 
-        /// </summary>
-        public Javax.Security.Auth.Subject Subject
-        {
-            get { return IExecuteWithSignature<Javax.Security.Auth.Subject>("getSubject", "()Ljavax/security/auth/Subject;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/SubjectDomainCombiner.html#combine(java.security.ProtectionDomain[],java.security.ProtectionDomain[])"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/SubjectDomainCombiner.html#combine(java.security.ProtectionDomain[],java.security.ProtectionDomain[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.ProtectionDomain"/></param>
         /// <param name="arg1"><see cref="Java.Security.ProtectionDomain"/></param>
@@ -70,6 +63,14 @@ public Java.Security.ProtectionDomain[] Combine(Java.Security.ProtectionDomain[]
         {
             return IExecuteArray<Java.Security.ProtectionDomain>("combine", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/SubjectDomainCombiner.html#getSubject()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Security.Auth.Subject"/></returns>
+        public Javax.Security.Auth.Subject GetSubject()
+        {
+            return IExecuteWithSignature<Javax.Security.Auth.Subject>("getSubject", "()Ljavax/security/auth/Subject;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/X500/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/X500/AllPackageClasses.cs
index 9f3e8bdb9..04c8adfa4 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/X500/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/X500/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Security.Auth.X500
 {
     #region X500Principal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html"/>
     /// </summary>
     public partial class X500Principal : MASES.JCOBridge.C2JBridge.JVMBridgeBase<X500Principal>
     {
diff --git a/src/net/Netdroid/Generated/Javax/Security/Auth/X500/X500Principal.cs b/src/net/Netdroid/Generated/Javax/Security/Auth/X500/X500Principal.cs
index 7fab76e1b..4e844a49c 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Auth/X500/X500Principal.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Auth/X500/X500Principal.cs
@@ -30,7 +30,7 @@ public partial class X500Principal : Java.Security.IPrincipal, Java.Io.ISerializ
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#%3Cinit%3E(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#%3Cinit%3E(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         public X500Principal(byte[] arg0)
@@ -38,7 +38,7 @@ public X500Principal(byte[] arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public X500Principal(Java.Io.InputStream arg0)
@@ -46,7 +46,7 @@ public X500Principal(Java.Io.InputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#%3Cinit%3E(java.lang.String,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#%3Cinit%3E(java.lang.String,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -55,7 +55,7 @@ public X500Principal(Java.Lang.String arg0, Java.Util.Map<Java.Lang.String, Java
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public X500Principal(Java.Lang.String arg0)
@@ -79,19 +79,19 @@ public X500Principal(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#CANONICAL"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#CANONICAL"/>
         /// </summary>
         public static Java.Lang.String CANONICAL { get { if (!_CANONICALReady) { _CANONICALContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CANONICAL"); _CANONICALReady = true; } return _CANONICALContent; } }
         private static Java.Lang.String _CANONICALContent = default;
         private static bool _CANONICALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#RFC1779"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#RFC1779"/>
         /// </summary>
         public static Java.Lang.String RFC1779 { get { if (!_RFC1779Ready) { _RFC1779Content = SGetField<Java.Lang.String>(LocalBridgeClazz, "RFC1779"); _RFC1779Ready = true; } return _RFC1779Content; } }
         private static Java.Lang.String _RFC1779Content = default;
         private static bool _RFC1779Ready = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#RFC2253"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#RFC2253"/>
         /// </summary>
         public static Java.Lang.String RFC2253 { get { if (!_RFC2253Ready) { _RFC2253Content = SGetField<Java.Lang.String>(LocalBridgeClazz, "RFC2253"); _RFC2253Ready = true; } return _RFC2253Content; } }
         private static Java.Lang.String _RFC2253Content = default;
@@ -105,21 +105,23 @@ public X500Principal(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#getName()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#getName(java.lang.String,java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#getName(java.lang.String,java.util.Map)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Util.Map"/></param>
@@ -129,7 +131,7 @@ public Java.Lang.String GetName(Java.Lang.String arg0, Java.Util.Map<Java.Lang.S
             return IExecute<Java.Lang.String>("getName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/auth/x500/X500Principal.html#getName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/auth/x500/X500Principal.html#getName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Security/Cert/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Security/Cert/AllPackageClasses.cs
index 7024ae50f..e6276c6af 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Cert/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Cert/AllPackageClasses.cs
@@ -28,21 +28,21 @@ namespace Javax.Security.Cert
 {
     #region Certificate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/Certificate.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/cert/Certificate.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Certificate : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Certificate>
     {
         const string _bridgeClassName = "javax.security.cert.Certificate";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Certificate() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Certificate(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -75,9 +75,9 @@ public Certificate(params object[] args) : base(args) { }
 
     #region CertificateEncodingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/CertificateEncodingException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/cert/CertificateEncodingException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CertificateEncodingException : Javax.Security.Cert.CertificateException
     {
         const string _bridgeClassName = "javax.security.cert.CertificateEncodingException";
@@ -93,9 +93,9 @@ public partial class CertificateEncodingException : Javax.Security.Cert.Certific
 
     #region CertificateException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/CertificateException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/cert/CertificateException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CertificateException : Java.Lang.Exception
     {
         const string _bridgeClassName = "javax.security.cert.CertificateException";
@@ -111,9 +111,9 @@ public partial class CertificateException : Java.Lang.Exception
 
     #region CertificateExpiredException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/CertificateExpiredException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/cert/CertificateExpiredException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CertificateExpiredException : Javax.Security.Cert.CertificateException
     {
         const string _bridgeClassName = "javax.security.cert.CertificateExpiredException";
@@ -129,9 +129,9 @@ public partial class CertificateExpiredException : Javax.Security.Cert.Certifica
 
     #region CertificateNotYetValidException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/CertificateNotYetValidException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/cert/CertificateNotYetValidException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CertificateNotYetValidException : Javax.Security.Cert.CertificateException
     {
         const string _bridgeClassName = "javax.security.cert.CertificateNotYetValidException";
@@ -147,9 +147,9 @@ public partial class CertificateNotYetValidException : Javax.Security.Cert.Certi
 
     #region CertificateParsingException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/CertificateParsingException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/cert/CertificateParsingException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CertificateParsingException : Javax.Security.Cert.CertificateException
     {
         const string _bridgeClassName = "javax.security.cert.CertificateParsingException";
@@ -165,21 +165,21 @@ public partial class CertificateParsingException : Javax.Security.Cert.Certifica
 
     #region X509Certificate
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html"/>
+    /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class X509Certificate : Javax.Security.Cert.Certificate
     {
         const string _bridgeClassName = "javax.security.cert.X509Certificate";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509Certificate() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509Certificate class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509Certificate(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Security/Cert/Certificate.cs b/src/net/Netdroid/Generated/Javax/Security/Cert/Certificate.cs
index 3a05b9fd4..92491a062 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Cert/Certificate.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Cert/Certificate.cs
@@ -46,21 +46,24 @@ public partial class Certificate
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/Certificate.html#getEncoded()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/Certificate.html#getEncoded()"/>
         /// </summary>
-        public byte[] Encoded
+        /// <returns><see cref="byte"/></returns>
+        /// <exception cref="Javax.Security.Cert.CertificateEncodingException"/>
+        public byte[] GetEncoded()
         {
-            get { return IExecuteWithSignatureArray<byte>("getEncoded", "()[B"); }
+            return IExecuteWithSignatureArray<byte>("getEncoded", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/Certificate.html#getPublicKey()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/Certificate.html#getPublicKey()"/>
         /// </summary>
-        public Java.Security.PublicKey PublicKey
+        /// <returns><see cref="Java.Security.PublicKey"/></returns>
+        public Java.Security.PublicKey GetPublicKey()
         {
-            get { return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;"); }
+            return IExecuteWithSignature<Java.Security.PublicKey>("getPublicKey", "()Ljava/security/PublicKey;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/Certificate.html#verify(java.security.PublicKey,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/cert/Certificate.html#verify(java.security.PublicKey,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -74,7 +77,7 @@ public void Verify(Java.Security.PublicKey arg0, Java.Lang.String arg1)
             IExecute("verify", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/Certificate.html#verify(java.security.PublicKey)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/cert/Certificate.html#verify(java.security.PublicKey)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.PublicKey"/></param>
         /// <exception cref="Javax.Security.Cert.CertificateException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Security/Cert/X509Certificate.cs b/src/net/Netdroid/Generated/Javax/Security/Cert/X509Certificate.cs
index 72138c606..fe74b2c21 100644
--- a/src/net/Netdroid/Generated/Javax/Security/Cert/X509Certificate.cs
+++ b/src/net/Netdroid/Generated/Javax/Security/Cert/X509Certificate.cs
@@ -42,7 +42,7 @@ public partial class X509Certificate
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getInstance(byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getInstance(byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="byte"/></param>
         /// <returns><see cref="Javax.Security.Cert.X509Certificate"/></returns>
@@ -52,7 +52,7 @@ public static Javax.Security.Cert.X509Certificate GetInstance(byte[] arg0)
             return SExecuteWithSignature<Javax.Security.Cert.X509Certificate>(LocalBridgeClazz, "getInstance", "([B)Ljavax/security/cert/X509Certificate;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getInstance(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getInstance(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Javax.Security.Cert.X509Certificate"/></returns>
@@ -66,70 +66,79 @@ public static Javax.Security.Cert.X509Certificate GetInstance(Java.Io.InputStrea
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getIssuerDN()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getSigAlgParams()"/>
         /// </summary>
-        public Java.Security.Principal IssuerDN
+        /// <returns><see cref="byte"/></returns>
+        public byte[] GetSigAlgParams()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getIssuerDN", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignatureArray<byte>("getSigAlgParams", "()[B");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getNotAfter()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getVersion()"/>
         /// </summary>
-        public Java.Util.Date NotAfter
+        /// <returns><see cref="int"/></returns>
+        public int GetVersion()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getNotAfter", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<int>("getVersion", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getNotBefore()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getSigAlgName()"/>
         /// </summary>
-        public Java.Util.Date NotBefore
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSigAlgName()
         {
-            get { return IExecuteWithSignature<Java.Util.Date>("getNotBefore", "()Ljava/util/Date;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSigAlgName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getSerialNumber()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getSigAlgOID()"/>
         /// </summary>
-        public Java.Math.BigInteger SerialNumber
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSigAlgOID()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSigAlgOID", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getSigAlgName()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getSerialNumber()"/>
         /// </summary>
-        public Java.Lang.String SigAlgName
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetSerialNumber()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSigAlgName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Math.BigInteger>("getSerialNumber", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getSigAlgOID()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getIssuerDN()"/>
         /// </summary>
-        public Java.Lang.String SigAlgOID
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetIssuerDN()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSigAlgOID", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getIssuerDN", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getSigAlgParams()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getSubjectDN()"/>
         /// </summary>
-        public byte[] SigAlgParams
+        /// <returns><see cref="Java.Security.Principal"/></returns>
+        public Java.Security.Principal GetSubjectDN()
         {
-            get { return IExecuteWithSignatureArray<byte>("getSigAlgParams", "()[B"); }
+            return IExecuteWithSignature<Java.Security.Principal>("getSubjectDN", "()Ljava/security/Principal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getSubjectDN()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getNotAfter()"/>
         /// </summary>
-        public Java.Security.Principal SubjectDN
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetNotAfter()
         {
-            get { return IExecuteWithSignature<Java.Security.Principal>("getSubjectDN", "()Ljava/security/Principal;"); }
+            return IExecuteWithSignature<Java.Util.Date>("getNotAfter", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#getVersion()"/> 
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#getNotBefore()"/>
         /// </summary>
-        public int Version
+        /// <returns><see cref="Java.Util.Date"/></returns>
+        public Java.Util.Date GetNotBefore()
         {
-            get { return IExecuteWithSignature<int>("getVersion", "()I"); }
+            return IExecuteWithSignature<Java.Util.Date>("getNotBefore", "()Ljava/util/Date;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#checkValidity()"/>
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#checkValidity()"/>
         /// </summary>
         /// <exception cref="Javax.Security.Cert.CertificateExpiredException"/>
         /// <exception cref="Javax.Security.Cert.CertificateNotYetValidException"/>
@@ -138,7 +147,7 @@ public void CheckValidity()
             IExecuteWithSignature("checkValidity", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.base/javax/security/cert/X509Certificate.html#checkValidity(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/javax/security/cert/X509Certificate.html#checkValidity(java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         /// <exception cref="Javax.Security.Cert.CertificateExpiredException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Sql/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Sql/AllPackageClasses.cs
index d19be82b8..2cb2ad7dd 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Sql
 {
     #region CommonDataSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/CommonDataSource.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/CommonDataSource.html"/>
     /// </summary>
     public partial class CommonDataSource : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CommonDataSource>
     {
@@ -36,12 +36,12 @@ public partial class CommonDataSource : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CommonDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CommonDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CommonDataSource() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CommonDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CommonDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CommonDataSource(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public CommonDataSource(params object[] args) : base(args) { }
 
     #region ConnectionEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEvent.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEvent.html"/>
     /// </summary>
     public partial class ConnectionEvent : Java.Util.EventObject
     {
@@ -118,7 +118,7 @@ public ConnectionEvent(params object[] args) : base(args) { }
 
     #region ConnectionEventListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEventListener.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEventListener.html"/>
     /// </summary>
     public partial class ConnectionEventListener : Java.Util.EventListener
     {
@@ -127,10 +127,13 @@ public partial class ConnectionEventListener : Java.Util.EventListener
         /// </summary>
         public ConnectionEventListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.javax.sql.ConnectionEventListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.javax.sql.ConnectionEventListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -152,10 +155,13 @@ public partial class ConnectionEventListenerDirect : ConnectionEventListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "javax.sql.ConnectionEventListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "javax.sql.ConnectionEventListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -177,7 +183,7 @@ protected override void InitializeHandlers() { }
 
     #region ConnectionPoolDataSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionPoolDataSource.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource.html"/>
     /// </summary>
     public partial class ConnectionPoolDataSource : Javax.Sql.CommonDataSource
     {
@@ -185,12 +191,12 @@ public partial class ConnectionPoolDataSource : Javax.Sql.CommonDataSource
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ConnectionPoolDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConnectionPoolDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConnectionPoolDataSource() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ConnectionPoolDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ConnectionPoolDataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ConnectionPoolDataSource(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -223,7 +229,7 @@ public ConnectionPoolDataSource(params object[] args) : base(args) { }
 
     #region DataSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/DataSource.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/DataSource.html"/>
     /// </summary>
     public partial class DataSource : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DataSource>
     {
@@ -231,12 +237,12 @@ public partial class DataSource : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DataSo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DataSource() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DataSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DataSource(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -269,7 +275,7 @@ public DataSource(params object[] args) : base(args) { }
 
     #region PooledConnection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/PooledConnection.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/PooledConnection.html"/>
     /// </summary>
     public partial class PooledConnection : MASES.JCOBridge.C2JBridge.JVMBridgeBase<PooledConnection>
     {
@@ -277,12 +283,12 @@ public partial class PooledConnection : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("PooledConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PooledConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PooledConnection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("PooledConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("PooledConnection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public PooledConnection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -315,7 +321,7 @@ public PooledConnection(params object[] args) : base(args) { }
 
     #region RowSet
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html"/>
     /// </summary>
     public partial class RowSet : Java.Sql.ResultSet
     {
@@ -323,12 +329,12 @@ public partial class RowSet : Java.Sql.ResultSet
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RowSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSet() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RowSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSet class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSet(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -361,7 +367,7 @@ public RowSet(params object[] args) : base(args) { }
 
     #region RowSetEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetEvent.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/RowSetEvent.html"/>
     /// </summary>
     public partial class RowSetEvent : Java.Util.EventObject
     {
@@ -405,7 +411,7 @@ public RowSetEvent(params object[] args) : base(args) { }
 
     #region RowSetInternal
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetInternal.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/RowSetInternal.html"/>
     /// </summary>
     public partial class RowSetInternal : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RowSetInternal>
     {
@@ -413,12 +419,12 @@ public partial class RowSetInternal : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Ro
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RowSetInternal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSetInternal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSetInternal() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RowSetInternal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSetInternal class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSetInternal(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -451,7 +457,7 @@ public RowSetInternal(params object[] args) : base(args) { }
 
     #region RowSetListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html"/>
     /// </summary>
     public partial class RowSetListener : Java.Util.EventListener
     {
@@ -460,10 +466,13 @@ public partial class RowSetListener : Java.Util.EventListener
         /// </summary>
         public RowSetListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.javax.sql.RowSetListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.javax.sql.RowSetListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -485,10 +494,13 @@ public partial class RowSetListenerDirect : RowSetListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "javax.sql.RowSetListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "javax.sql.RowSetListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -510,7 +522,7 @@ protected override void InitializeHandlers() { }
 
     #region RowSetMetaData
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html"/>
     /// </summary>
     public partial class RowSetMetaData : Java.Sql.ResultSetMetaData
     {
@@ -518,12 +530,12 @@ public partial class RowSetMetaData : Java.Sql.ResultSetMetaData
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RowSetMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSetMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSetMetaData() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RowSetMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSetMetaData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSetMetaData(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -556,7 +568,7 @@ public RowSetMetaData(params object[] args) : base(args) { }
 
     #region RowSetReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetReader.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/RowSetReader.html"/>
     /// </summary>
     public partial class RowSetReader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RowSetReader>
     {
@@ -564,12 +576,12 @@ public partial class RowSetReader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RowS
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RowSetReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSetReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSetReader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RowSetReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSetReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSetReader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -602,7 +614,7 @@ public RowSetReader(params object[] args) : base(args) { }
 
     #region RowSetWriter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetWriter.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/RowSetWriter.html"/>
     /// </summary>
     public partial class RowSetWriter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RowSetWriter>
     {
@@ -610,12 +622,12 @@ public partial class RowSetWriter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<RowS
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("RowSetWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSetWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSetWriter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("RowSetWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("RowSetWriter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public RowSetWriter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -648,7 +660,7 @@ public RowSetWriter(params object[] args) : base(args) { }
 
     #region StatementEvent
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEvent.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/StatementEvent.html"/>
     /// </summary>
     public partial class StatementEvent : Java.Util.EventObject
     {
@@ -692,7 +704,7 @@ public StatementEvent(params object[] args) : base(args) { }
 
     #region StatementEventListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEventListener.html"/>
+    /// <see href="https://developer.android.com/reference/javax/sql/StatementEventListener.html"/>
     /// </summary>
     public partial class StatementEventListener : Java.Util.EventListener
     {
@@ -701,10 +713,13 @@ public partial class StatementEventListener : Java.Util.EventListener
         /// </summary>
         public StatementEventListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.javax.sql.StatementEventListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.javax.sql.StatementEventListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -726,10 +741,13 @@ public partial class StatementEventListenerDirect : StatementEventListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "javax.sql.StatementEventListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "javax.sql.StatementEventListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
diff --git a/src/net/Netdroid/Generated/Javax/Sql/CommonDataSource.cs b/src/net/Netdroid/Generated/Javax/Sql/CommonDataSource.cs
index 22d1e639f..a6baf284f 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/CommonDataSource.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/CommonDataSource.cs
@@ -64,34 +64,49 @@ public partial class CommonDataSource : Javax.Sql.ICommonDataSource
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/CommonDataSource.html#getLoginTimeout()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/CommonDataSource.html#setLoginTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/CommonDataSource.html#getLoginTimeout()"/>
         /// </summary>
-        public int LoginTimeout
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetLoginTimeout()
         {
-            get { return IExecuteWithSignature<int>("getLoginTimeout", "()I"); } set { IExecuteWithSignature("setLoginTimeout", "(I)V", value); }
+            return IExecuteWithSignature<int>("getLoginTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/CommonDataSource.html#getLogWriter()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/CommonDataSource.html#setLogWriter(java.io.PrintWriter)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/CommonDataSource.html#getLogWriter()"/>
         /// </summary>
-        public Java.Io.PrintWriter LogWriter
+        /// <returns><see cref="Java.Io.PrintWriter"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Io.PrintWriter GetLogWriter()
         {
-            get { return IExecuteWithSignature<Java.Io.PrintWriter>("getLogWriter", "()Ljava/io/PrintWriter;"); } set { IExecuteWithSignature("setLogWriter", "(Ljava/io/PrintWriter;)V", value); }
+            return IExecuteWithSignature<Java.Io.PrintWriter>("getLogWriter", "()Ljava/io/PrintWriter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/CommonDataSource.html#getParentLogger()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/CommonDataSource.html#getParentLogger()"/>
         /// </summary>
-        public Java.Util.Logging.Logger ParentLogger
+        /// <returns><see cref="Java.Util.Logging.Logger"/></returns>
+        /// <exception cref="Java.Sql.SQLFeatureNotSupportedException"/>
+        public Java.Util.Logging.Logger GetParentLogger()
+        {
+            return IExecuteWithSignature<Java.Util.Logging.Logger>("getParentLogger", "()Ljava/util/logging/Logger;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/CommonDataSource.html#setLoginTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetLoginTimeout(int arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Logging.Logger>("getParentLogger", "()Ljava/util/logging/Logger;"); }
+            IExecuteWithSignature("setLoginTimeout", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/CommonDataSource.html#createShardingKeyBuilder()"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/CommonDataSource.html#setLogWriter(java.io.PrintWriter)"/>
         /// </summary>
-        /// <returns><see cref="Java.Sql.ShardingKeyBuilder"/></returns>
+        /// <param name="arg0"><see cref="Java.Io.PrintWriter"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
-        public Java.Sql.ShardingKeyBuilder CreateShardingKeyBuilder()
+        public void SetLogWriter(Java.Io.PrintWriter arg0)
         {
-            return IExecuteWithSignature<Java.Sql.ShardingKeyBuilder>("createShardingKeyBuilder", "()Ljava/sql/ShardingKeyBuilder;");
+            IExecuteWithSignature("setLogWriter", "(Ljava/io/PrintWriter;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Sql/ConnectionEvent.cs b/src/net/Netdroid/Generated/Javax/Sql/ConnectionEvent.cs
index 54b9bddc7..dca501155 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/ConnectionEvent.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/ConnectionEvent.cs
@@ -30,7 +30,7 @@ public partial class ConnectionEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEvent.html#%3Cinit%3E(javax.sql.PooledConnection,java.sql.SQLException)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEvent.html#%3Cinit%3E(javax.sql.PooledConnection,java.sql.SQLException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.PooledConnection"/></param>
         /// <param name="arg1"><see cref="Java.Sql.SQLException"/></param>
@@ -39,7 +39,7 @@ public ConnectionEvent(Javax.Sql.PooledConnection arg0, Java.Sql.SQLException ar
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEvent.html#%3Cinit%3E(javax.sql.PooledConnection)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEvent.html#%3Cinit%3E(javax.sql.PooledConnection)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.PooledConnection"/></param>
         public ConnectionEvent(Javax.Sql.PooledConnection arg0)
@@ -63,11 +63,12 @@ public ConnectionEvent(Javax.Sql.PooledConnection arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEvent.html#getSQLException()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEvent.html#getSQLException()"/>
         /// </summary>
-        public Java.Sql.SQLException SQLException
+        /// <returns><see cref="Java.Sql.SQLException"/></returns>
+        public Java.Sql.SQLException GetSQLException()
         {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getSQLException", "()Ljava/sql/SQLException;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLException>(obj); }
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getSQLException", "()Ljava/sql/SQLException;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLException>(obj);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Sql/ConnectionEventListener.cs b/src/net/Netdroid/Generated/Javax/Sql/ConnectionEventListener.cs
index 3e13f2dcb..aebdeda28 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/ConnectionEventListener.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/ConnectionEventListener.cs
@@ -27,7 +27,7 @@ namespace Javax.Sql
 {
     #region IConnectionEventListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.javax.sql.ConnectionEventListener implementing <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEventListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.javax.sql.ConnectionEventListener implementing <see href="https://developer.android.com/reference/javax/sql/ConnectionEventListener.html"/>
     /// </summary>
     public partial interface IConnectionEventListener
     {
@@ -68,16 +68,16 @@ public partial class ConnectionEventListener : Javax.Sql.IConnectionEventListene
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("connectionClosed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.ConnectionEvent>>>(ConnectionClosedEventHandler));
-            AddEventHandler("connectionErrorOccurred", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.ConnectionEvent>>>(ConnectionErrorOccurredEventHandler));
+            AddEventHandler("connectionClosed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.ConnectionEvent>>>(ConnectionClosedEventHandler));
+            AddEventHandler("connectionErrorOccurred", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.ConnectionEvent>>>(ConnectionErrorOccurredEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEventListener.html#connectionClosed(javax.sql.ConnectionEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/sql/ConnectionEventListener.html#connectionClosed(javax.sql.ConnectionEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnConnectionClosed"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Sql.ConnectionEvent> OnConnectionClosed { get; set; } = null;
+        public global::System.Action<Javax.Sql.ConnectionEvent> OnConnectionClosed { get; set; } = null;
 
         void ConnectionClosedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Sql.ConnectionEvent>> data)
         {
@@ -86,7 +86,7 @@ void ConnectionClosedEventHandler(object sender, CLRListenerEventArgs<CLREventDa
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEventListener.html#connectionClosed(javax.sql.ConnectionEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEventListener.html#connectionClosed(javax.sql.ConnectionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.ConnectionEvent"/></param>
         public virtual void ConnectionClosed(Javax.Sql.ConnectionEvent arg0)
@@ -95,10 +95,10 @@ public virtual void ConnectionClosed(Javax.Sql.ConnectionEvent arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEventListener.html#connectionErrorOccurred(javax.sql.ConnectionEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/sql/ConnectionEventListener.html#connectionErrorOccurred(javax.sql.ConnectionEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnConnectionErrorOccurred"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Sql.ConnectionEvent> OnConnectionErrorOccurred { get; set; } = null;
+        public global::System.Action<Javax.Sql.ConnectionEvent> OnConnectionErrorOccurred { get; set; } = null;
 
         void ConnectionErrorOccurredEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Sql.ConnectionEvent>> data)
         {
@@ -107,7 +107,7 @@ void ConnectionErrorOccurredEventHandler(object sender, CLRListenerEventArgs<CLR
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEventListener.html#connectionErrorOccurred(javax.sql.ConnectionEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEventListener.html#connectionErrorOccurred(javax.sql.ConnectionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.ConnectionEvent"/></param>
         public virtual void ConnectionErrorOccurred(Javax.Sql.ConnectionEvent arg0)
@@ -146,7 +146,7 @@ public partial class ConnectionEventListenerDirect : Javax.Sql.IConnectionEventL
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEventListener.html#connectionClosed(javax.sql.ConnectionEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEventListener.html#connectionClosed(javax.sql.ConnectionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.ConnectionEvent"/></param>
         public override void ConnectionClosed(Javax.Sql.ConnectionEvent arg0)
@@ -154,7 +154,7 @@ public override void ConnectionClosed(Javax.Sql.ConnectionEvent arg0)
             IExecuteWithSignature("connectionClosed", "(Ljavax/sql/ConnectionEvent;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionEventListener.html#connectionErrorOccurred(javax.sql.ConnectionEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionEventListener.html#connectionErrorOccurred(javax.sql.ConnectionEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.ConnectionEvent"/></param>
         public override void ConnectionErrorOccurred(Javax.Sql.ConnectionEvent arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Sql/ConnectionPoolDataSource.cs b/src/net/Netdroid/Generated/Javax/Sql/ConnectionPoolDataSource.cs
index 5f72a9125..34e7bb100 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/ConnectionPoolDataSource.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/ConnectionPoolDataSource.cs
@@ -64,28 +64,34 @@ public partial class ConnectionPoolDataSource : Javax.Sql.IConnectionPoolDataSou
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionPoolDataSource.html#getLoginTimeout()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionPoolDataSource.html#setLoginTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource.html#getLoginTimeout()"/>
         /// </summary>
-        public int LoginTimeout
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetLoginTimeout()
         {
-            get { return IExecuteWithSignature<int>("getLoginTimeout", "()I"); } set { IExecuteWithSignature("setLoginTimeout", "(I)V", value); }
+            return IExecuteWithSignature<int>("getLoginTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionPoolDataSource.html#getLogWriter()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionPoolDataSource.html#setLogWriter(java.io.PrintWriter)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource.html#getLogWriter()"/>
         /// </summary>
-        public Java.Io.PrintWriter LogWriter
+        /// <returns><see cref="Java.Io.PrintWriter"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Io.PrintWriter GetLogWriter()
         {
-            get { return IExecuteWithSignature<Java.Io.PrintWriter>("getLogWriter", "()Ljava/io/PrintWriter;"); } set { IExecuteWithSignature("setLogWriter", "(Ljava/io/PrintWriter;)V", value); }
+            return IExecuteWithSignature<Java.Io.PrintWriter>("getLogWriter", "()Ljava/io/PrintWriter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionPoolDataSource.html#getPooledConnection()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource.html#getPooledConnection()"/>
         /// </summary>
-        public Javax.Sql.PooledConnection PooledConnection
+        /// <returns><see cref="Javax.Sql.PooledConnection"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Javax.Sql.PooledConnection GetPooledConnection()
         {
-            get { return IExecuteWithSignature<Javax.Sql.PooledConnection>("getPooledConnection", "()Ljavax/sql/PooledConnection;"); }
+            return IExecuteWithSignature<Javax.Sql.PooledConnection>("getPooledConnection", "()Ljavax/sql/PooledConnection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/ConnectionPoolDataSource.html#getPooledConnection(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource.html#getPooledConnection(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -95,6 +101,24 @@ public Javax.Sql.PooledConnection GetPooledConnection(Java.Lang.String arg0, Jav
         {
             return IExecute<Javax.Sql.PooledConnection>("getPooledConnection", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource.html#setLoginTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetLoginTimeout(int arg0)
+        {
+            IExecuteWithSignature("setLoginTimeout", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/ConnectionPoolDataSource.html#setLogWriter(java.io.PrintWriter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.PrintWriter"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetLogWriter(Java.Io.PrintWriter arg0)
+        {
+            IExecuteWithSignature("setLogWriter", "(Ljava/io/PrintWriter;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Sql/DataSource.cs b/src/net/Netdroid/Generated/Javax/Sql/DataSource.cs
index 2e6bdbf0a..1ac1bcb60 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/DataSource.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/DataSource.cs
@@ -72,28 +72,34 @@ public partial class DataSource : Javax.Sql.IDataSource, Javax.Sql.ICommonDataSo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/DataSource.html#getConnection()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/DataSource.html#getLoginTimeout()"/>
         /// </summary>
-        public Java.Sql.Connection Connection
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetLoginTimeout()
         {
-            get { return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;"); }
+            return IExecuteWithSignature<int>("getLoginTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/DataSource.html#getLoginTimeout()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/DataSource.html#setLoginTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/DataSource.html#getLogWriter()"/>
         /// </summary>
-        public int LoginTimeout
+        /// <returns><see cref="Java.Io.PrintWriter"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Io.PrintWriter GetLogWriter()
         {
-            get { return IExecuteWithSignature<int>("getLoginTimeout", "()I"); } set { IExecuteWithSignature("setLoginTimeout", "(I)V", value); }
+            return IExecuteWithSignature<Java.Io.PrintWriter>("getLogWriter", "()Ljava/io/PrintWriter;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/DataSource.html#getLogWriter()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/DataSource.html#setLogWriter(java.io.PrintWriter)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/DataSource.html#getConnection()"/>
         /// </summary>
-        public Java.Io.PrintWriter LogWriter
+        /// <returns><see cref="Java.Sql.Connection"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.Connection GetConnection()
         {
-            get { return IExecuteWithSignature<Java.Io.PrintWriter>("getLogWriter", "()Ljava/io/PrintWriter;"); } set { IExecuteWithSignature("setLogWriter", "(Ljava/io/PrintWriter;)V", value); }
+            return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/DataSource.html#getConnection(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/DataSource.html#getConnection(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -103,6 +109,24 @@ public Java.Sql.Connection GetConnection(Java.Lang.String arg0, Java.Lang.String
         {
             return IExecute<Java.Sql.Connection>("getConnection", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/DataSource.html#setLoginTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetLoginTimeout(int arg0)
+        {
+            IExecuteWithSignature("setLoginTimeout", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/DataSource.html#setLogWriter(java.io.PrintWriter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.PrintWriter"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetLogWriter(Java.Io.PrintWriter arg0)
+        {
+            IExecuteWithSignature("setLogWriter", "(Ljava/io/PrintWriter;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Sql/PooledConnection.cs b/src/net/Netdroid/Generated/Javax/Sql/PooledConnection.cs
index 52833ea69..8e7177800 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/PooledConnection.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/PooledConnection.cs
@@ -64,14 +64,16 @@ public partial class PooledConnection : Javax.Sql.IPooledConnection
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/PooledConnection.html#getConnection()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/PooledConnection.html#getConnection()"/>
         /// </summary>
-        public Java.Sql.Connection Connection
+        /// <returns><see cref="Java.Sql.Connection"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.Connection GetConnection()
         {
-            get { return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;"); }
+            return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/PooledConnection.html#addConnectionEventListener(javax.sql.ConnectionEventListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/PooledConnection.html#addConnectionEventListener(javax.sql.ConnectionEventListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.ConnectionEventListener"/></param>
         public void AddConnectionEventListener(Javax.Sql.ConnectionEventListener arg0)
@@ -79,7 +81,7 @@ public void AddConnectionEventListener(Javax.Sql.ConnectionEventListener arg0)
             IExecuteWithSignature("addConnectionEventListener", "(Ljavax/sql/ConnectionEventListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/PooledConnection.html#addStatementEventListener(javax.sql.StatementEventListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/PooledConnection.html#addStatementEventListener(javax.sql.StatementEventListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.StatementEventListener"/></param>
         public void AddStatementEventListener(Javax.Sql.StatementEventListener arg0)
@@ -87,7 +89,7 @@ public void AddStatementEventListener(Javax.Sql.StatementEventListener arg0)
             IExecuteWithSignature("addStatementEventListener", "(Ljavax/sql/StatementEventListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/PooledConnection.html#close()"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/PooledConnection.html#close()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Close()
@@ -95,7 +97,7 @@ public void Close()
             IExecuteWithSignature("close", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/PooledConnection.html#removeConnectionEventListener(javax.sql.ConnectionEventListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/PooledConnection.html#removeConnectionEventListener(javax.sql.ConnectionEventListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.ConnectionEventListener"/></param>
         public void RemoveConnectionEventListener(Javax.Sql.ConnectionEventListener arg0)
@@ -103,7 +105,7 @@ public void RemoveConnectionEventListener(Javax.Sql.ConnectionEventListener arg0
             IExecuteWithSignature("removeConnectionEventListener", "(Ljavax/sql/ConnectionEventListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/PooledConnection.html#removeStatementEventListener(javax.sql.StatementEventListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/PooledConnection.html#removeStatementEventListener(javax.sql.StatementEventListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.StatementEventListener"/></param>
         public void RemoveStatementEventListener(Javax.Sql.StatementEventListener arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Sql/RowSet.cs b/src/net/Netdroid/Generated/Javax/Sql/RowSet.cs
index ae6cd852c..901cea3ff 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/RowSet.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/RowSet.cs
@@ -64,92 +64,109 @@ public partial class RowSet : Javax.Sql.IRowSet
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getCommand()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setCommand(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getEscapeProcessing()"/>
         /// </summary>
-        public Java.Lang.String Command
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public bool GetEscapeProcessing()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getCommand", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setCommand", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getEscapeProcessing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getDataSourceName()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setDataSourceName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#isReadOnly()"/>
         /// </summary>
-        public Java.Lang.String DataSourceName
+        /// <returns><see cref="bool"/></returns>
+        public bool IsReadOnly()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDataSourceName", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDataSourceName", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("isReadOnly", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getEscapeProcessing()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setEscapeProcessing(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getMaxFieldSize()"/>
         /// </summary>
-        public bool EscapeProcessing
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxFieldSize()
         {
-            get { return IExecuteWithSignature<bool>("getEscapeProcessing", "()Z"); } set { IExecuteWithSignature("setEscapeProcessing", "(Z)V", value); }
+            return IExecuteWithSignature<int>("getMaxFieldSize", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getMaxFieldSize()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setMaxFieldSize(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getMaxRows()"/>
         /// </summary>
-        public int MaxFieldSize
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetMaxRows()
         {
-            get { return IExecuteWithSignature<int>("getMaxFieldSize", "()I"); } set { IExecuteWithSignature("setMaxFieldSize", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMaxRows", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getMaxRows()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setMaxRows(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getQueryTimeout()"/>
         /// </summary>
-        public int MaxRows
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public int GetQueryTimeout()
         {
-            get { return IExecuteWithSignature<int>("getMaxRows", "()I"); } set { IExecuteWithSignature("setMaxRows", "(I)V", value); }
+            return IExecuteWithSignature<int>("getQueryTimeout", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getPassword()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setPassword(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getTransactionIsolation()"/>
         /// </summary>
-        public Java.Lang.String Password
+        /// <returns><see cref="int"/></returns>
+        public int GetTransactionIsolation()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPassword", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getTransactionIsolation", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getQueryTimeout()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setQueryTimeout(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getCommand()"/>
         /// </summary>
-        public int QueryTimeout
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetCommand()
         {
-            get { return IExecuteWithSignature<int>("getQueryTimeout", "()I"); } set { IExecuteWithSignature("setQueryTimeout", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getCommand", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getTransactionIsolation()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTransactionIsolation(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getDataSourceName()"/>
         /// </summary>
-        public int TransactionIsolation
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDataSourceName()
         {
-            get { return IExecuteWithSignature<int>("getTransactionIsolation", "()I"); } set { IExecuteWithSignature("setTransactionIsolation", "(I)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDataSourceName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getTypeMap()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTypeMap(java.util.Map)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getPassword()"/>
         /// </summary>
-        public Java.Util.Map<Java.Lang.String, Java.Lang.Class> TypeMap
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPassword()
         {
-            get { return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.Class>>("getTypeMap", "()Ljava/util/Map;"); } set { IExecuteWithSignature("setTypeMap", "(Ljava/util/Map;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPassword", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getUrl()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setUrl(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getUrl()"/>
         /// </summary>
-        public Java.Lang.String Url
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Lang.String GetUrl()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setUrl", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getUrl", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#getUsername()"/> <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setUsername(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getUsername()"/>
         /// </summary>
-        public Java.Lang.String Username
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUsername()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUsername", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setUsername", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getUsername", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#isReadOnly()"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#getTypeMap()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsReadOnly()
+        /// <returns><see cref="Java.Util.Map"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Util.Map<Java.Lang.String, Java.Lang.Class> GetTypeMap()
         {
-            return IExecuteWithSignature<bool>("isReadOnly", "()Z");
+            return IExecuteWithSignature<Java.Util.Map<Java.Lang.String, Java.Lang.Class>>("getTypeMap", "()Ljava/util/Map;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#addRowSetListener(javax.sql.RowSetListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#addRowSetListener(javax.sql.RowSetListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetListener"/></param>
         public void AddRowSetListener(Javax.Sql.RowSetListener arg0)
@@ -157,7 +174,7 @@ public void AddRowSetListener(Javax.Sql.RowSetListener arg0)
             IExecuteWithSignature("addRowSetListener", "(Ljavax/sql/RowSetListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#clearParameters()"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#clearParameters()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void ClearParameters()
@@ -165,7 +182,7 @@ public void ClearParameters()
             IExecuteWithSignature("clearParameters", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#execute()"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#execute()"/>
         /// </summary>
         /// <exception cref="Java.Sql.SQLException"/>
         public void Execute()
@@ -173,7 +190,7 @@ public void Execute()
             IExecuteWithSignature("execute", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#removeRowSetListener(javax.sql.RowSetListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#removeRowSetListener(javax.sql.RowSetListener)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetListener"/></param>
         public void RemoveRowSetListener(Javax.Sql.RowSetListener arg0)
@@ -181,7 +198,7 @@ public void RemoveRowSetListener(Javax.Sql.RowSetListener arg0)
             IExecuteWithSignature("removeRowSetListener", "(Ljavax/sql/RowSetListener;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setArray(int,java.sql.Array)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setArray(int,java.sql.Array)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Array"/></param>
@@ -191,7 +208,7 @@ public void SetArray(int arg0, Java.Sql.Array arg1)
             IExecute("setArray", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setAsciiStream(int,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setAsciiStream(int,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -202,7 +219,7 @@ public void SetAsciiStream(int arg0, Java.Io.InputStream arg1, int arg2)
             IExecute("setAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setAsciiStream(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setAsciiStream(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -212,7 +229,7 @@ public void SetAsciiStream(int arg0, Java.Io.InputStream arg1)
             IExecute("setAsciiStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setAsciiStream(java.lang.String,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setAsciiStream(java.lang.String,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -223,7 +240,7 @@ public void SetAsciiStream(Java.Lang.String arg0, Java.Io.InputStream arg1, int
             IExecute("setAsciiStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setAsciiStream(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setAsciiStream(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -233,7 +250,7 @@ public void SetAsciiStream(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("setAsciiStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBigDecimal(int,java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBigDecimal(int,java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigDecimal"/></param>
@@ -243,7 +260,7 @@ public void SetBigDecimal(int arg0, Java.Math.BigDecimal arg1)
             IExecute("setBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBigDecimal(java.lang.String,java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBigDecimal(java.lang.String,java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigDecimal"/></param>
@@ -253,7 +270,7 @@ public void SetBigDecimal(Java.Lang.String arg0, Java.Math.BigDecimal arg1)
             IExecute("setBigDecimal", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBinaryStream(int,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBinaryStream(int,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -264,7 +281,7 @@ public void SetBinaryStream(int arg0, Java.Io.InputStream arg1, int arg2)
             IExecute("setBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBinaryStream(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBinaryStream(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -274,7 +291,7 @@ public void SetBinaryStream(int arg0, Java.Io.InputStream arg1)
             IExecute("setBinaryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBinaryStream(java.lang.String,java.io.InputStream,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBinaryStream(java.lang.String,java.io.InputStream,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -285,7 +302,7 @@ public void SetBinaryStream(Java.Lang.String arg0, Java.Io.InputStream arg1, int
             IExecute("setBinaryStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBinaryStream(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBinaryStream(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -295,7 +312,7 @@ public void SetBinaryStream(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("setBinaryStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBlob(int,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBlob(int,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -306,7 +323,7 @@ public void SetBlob(int arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("setBlob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBlob(int,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBlob(int,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -316,7 +333,7 @@ public void SetBlob(int arg0, Java.Io.InputStream arg1)
             IExecute("setBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBlob(int,java.sql.Blob)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBlob(int,java.sql.Blob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Blob"/></param>
@@ -326,7 +343,7 @@ public void SetBlob(int arg0, Java.Sql.Blob arg1)
             IExecute("setBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBlob(java.lang.String,java.io.InputStream,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBlob(java.lang.String,java.io.InputStream,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -337,7 +354,7 @@ public void SetBlob(Java.Lang.String arg0, Java.Io.InputStream arg1, long arg2)
             IExecute("setBlob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBlob(java.lang.String,java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBlob(java.lang.String,java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.InputStream"/></param>
@@ -347,7 +364,7 @@ public void SetBlob(Java.Lang.String arg0, Java.Io.InputStream arg1)
             IExecute("setBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBlob(java.lang.String,java.sql.Blob)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBlob(java.lang.String,java.sql.Blob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Blob"/></param>
@@ -357,7 +374,7 @@ public void SetBlob(Java.Lang.String arg0, Java.Sql.Blob arg1)
             IExecute("setBlob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBoolean(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBoolean(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -367,7 +384,7 @@ public void SetBoolean(int arg0, bool arg1)
             IExecute("setBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBoolean(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBoolean(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -377,7 +394,7 @@ public void SetBoolean(Java.Lang.String arg0, bool arg1)
             IExecute("setBoolean", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setByte(int,byte)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setByte(int,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -387,7 +404,7 @@ public void SetByte(int arg0, byte arg1)
             IExecute("setByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setByte(java.lang.String,byte)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setByte(java.lang.String,byte)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -397,7 +414,7 @@ public void SetByte(Java.Lang.String arg0, byte arg1)
             IExecute("setByte", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBytes(int,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBytes(int,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -407,7 +424,7 @@ public void SetBytes(int arg0, byte[] arg1)
             IExecute("setBytes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setBytes(java.lang.String,byte[])"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setBytes(java.lang.String,byte[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="byte"/></param>
@@ -417,7 +434,7 @@ public void SetBytes(Java.Lang.String arg0, byte[] arg1)
             IExecute("setBytes", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setCharacterStream(int,java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setCharacterStream(int,java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -428,7 +445,7 @@ public void SetCharacterStream(int arg0, Java.Io.Reader arg1, int arg2)
             IExecute("setCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setCharacterStream(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setCharacterStream(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -438,7 +455,7 @@ public void SetCharacterStream(int arg0, Java.Io.Reader arg1)
             IExecute("setCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setCharacterStream(java.lang.String,java.io.Reader,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setCharacterStream(java.lang.String,java.io.Reader,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -449,7 +466,7 @@ public void SetCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1, int a
             IExecute("setCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setCharacterStream(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setCharacterStream(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -459,7 +476,7 @@ public void SetCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("setCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setClob(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setClob(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -470,7 +487,7 @@ public void SetClob(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setClob(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setClob(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -480,7 +497,7 @@ public void SetClob(int arg0, Java.Io.Reader arg1)
             IExecute("setClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setClob(int,java.sql.Clob)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setClob(int,java.sql.Clob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Clob"/></param>
@@ -490,7 +507,7 @@ public void SetClob(int arg0, Java.Sql.Clob arg1)
             IExecute("setClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setClob(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setClob(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -501,7 +518,7 @@ public void SetClob(Java.Lang.String arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setClob(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setClob(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -511,7 +528,7 @@ public void SetClob(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("setClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setClob(java.lang.String,java.sql.Clob)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setClob(java.lang.String,java.sql.Clob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Clob"/></param>
@@ -521,7 +538,16 @@ public void SetClob(Java.Lang.String arg0, Java.Sql.Clob arg1)
             IExecute("setClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setConcurrency(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setCommand(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetCommand(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setCommand", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setConcurrency(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -530,7 +556,16 @@ public void SetConcurrency(int arg0)
             IExecuteWithSignature("setConcurrency", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setDate(int,java.sql.Date,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setDataSourceName(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetDataSourceName(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDataSourceName", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setDate(int,java.sql.Date,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -541,7 +576,7 @@ public void SetDate(int arg0, Java.Sql.Date arg1, Java.Util.Calendar arg2)
             IExecute("setDate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setDate(int,java.sql.Date)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setDate(int,java.sql.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -551,7 +586,7 @@ public void SetDate(int arg0, Java.Sql.Date arg1)
             IExecute("setDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setDate(java.lang.String,java.sql.Date,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setDate(java.lang.String,java.sql.Date,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -562,7 +597,7 @@ public void SetDate(Java.Lang.String arg0, Java.Sql.Date arg1, Java.Util.Calenda
             IExecute("setDate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setDate(java.lang.String,java.sql.Date)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setDate(java.lang.String,java.sql.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Date"/></param>
@@ -572,7 +607,7 @@ public void SetDate(Java.Lang.String arg0, Java.Sql.Date arg1)
             IExecute("setDate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setDouble(int,double)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setDouble(int,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -582,7 +617,7 @@ public void SetDouble(int arg0, double arg1)
             IExecute("setDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setDouble(java.lang.String,double)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setDouble(java.lang.String,double)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="double"/></param>
@@ -592,7 +627,16 @@ public void SetDouble(Java.Lang.String arg0, double arg1)
             IExecute("setDouble", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setFloat(int,float)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setEscapeProcessing(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetEscapeProcessing(bool arg0)
+        {
+            IExecuteWithSignature("setEscapeProcessing", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setFloat(int,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -602,7 +646,7 @@ public void SetFloat(int arg0, float arg1)
             IExecute("setFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setFloat(java.lang.String,float)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setFloat(java.lang.String,float)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="float"/></param>
@@ -612,7 +656,7 @@ public void SetFloat(Java.Lang.String arg0, float arg1)
             IExecute("setFloat", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setInt(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setInt(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -622,7 +666,7 @@ public void SetInt(int arg0, int arg1)
             IExecute("setInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setInt(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setInt(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -632,7 +676,7 @@ public void SetInt(Java.Lang.String arg0, int arg1)
             IExecute("setInt", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setLong(int,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setLong(int,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -642,7 +686,7 @@ public void SetLong(int arg0, long arg1)
             IExecute("setLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setLong(java.lang.String,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setLong(java.lang.String,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
@@ -652,7 +696,25 @@ public void SetLong(Java.Lang.String arg0, long arg1)
             IExecute("setLong", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNCharacterStream(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setMaxFieldSize(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetMaxFieldSize(int arg0)
+        {
+            IExecuteWithSignature("setMaxFieldSize", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setMaxRows(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetMaxRows(int arg0)
+        {
+            IExecuteWithSignature("setMaxRows", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNCharacterStream(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -663,7 +725,7 @@ public void SetNCharacterStream(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setNCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNCharacterStream(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNCharacterStream(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -673,7 +735,7 @@ public void SetNCharacterStream(int arg0, Java.Io.Reader arg1)
             IExecute("setNCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNCharacterStream(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNCharacterStream(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -684,7 +746,7 @@ public void SetNCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1, long
             IExecute("setNCharacterStream", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNCharacterStream(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNCharacterStream(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -694,7 +756,7 @@ public void SetNCharacterStream(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("setNCharacterStream", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNClob(int,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNClob(int,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -705,7 +767,7 @@ public void SetNClob(int arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setNClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNClob(int,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNClob(int,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -715,7 +777,7 @@ public void SetNClob(int arg0, Java.Io.Reader arg1)
             IExecute("setNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNClob(int,java.sql.NClob)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNClob(int,java.sql.NClob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.NClob"/></param>
@@ -725,7 +787,7 @@ public void SetNClob(int arg0, Java.Sql.NClob arg1)
             IExecute("setNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNClob(java.lang.String,java.io.Reader,long)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNClob(java.lang.String,java.io.Reader,long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -736,7 +798,7 @@ public void SetNClob(Java.Lang.String arg0, Java.Io.Reader arg1, long arg2)
             IExecute("setNClob", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNClob(java.lang.String,java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNClob(java.lang.String,java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Io.Reader"/></param>
@@ -746,7 +808,7 @@ public void SetNClob(Java.Lang.String arg0, Java.Io.Reader arg1)
             IExecute("setNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNClob(java.lang.String,java.sql.NClob)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNClob(java.lang.String,java.sql.NClob)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.NClob"/></param>
@@ -756,7 +818,7 @@ public void SetNClob(Java.Lang.String arg0, Java.Sql.NClob arg1)
             IExecute("setNClob", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNString(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNString(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -766,7 +828,7 @@ public void SetNString(int arg0, Java.Lang.String arg1)
             IExecute("setNString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNString(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNString(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -776,7 +838,7 @@ public void SetNString(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setNString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNull(int,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNull(int,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -787,7 +849,7 @@ public void SetNull(int arg0, int arg1, Java.Lang.String arg2)
             IExecute("setNull", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNull(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNull(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -797,7 +859,7 @@ public void SetNull(int arg0, int arg1)
             IExecute("setNull", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNull(java.lang.String,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNull(java.lang.String,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -808,7 +870,7 @@ public void SetNull(Java.Lang.String arg0, int arg1, Java.Lang.String arg2)
             IExecute("setNull", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setNull(java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setNull(java.lang.String,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -818,7 +880,7 @@ public void SetNull(Java.Lang.String arg0, int arg1)
             IExecute("setNull", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setObject(int,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setObject(int,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -830,7 +892,7 @@ public void SetObject(int arg0, object arg1, int arg2, int arg3)
             IExecute("setObject", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setObject(int,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setObject(int,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -841,7 +903,7 @@ public void SetObject(int arg0, object arg1, int arg2)
             IExecute("setObject", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setObject(int,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setObject(int,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -851,7 +913,7 @@ public void SetObject(int arg0, object arg1)
             IExecute("setObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setObject(java.lang.String,java.lang.Object,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setObject(java.lang.String,java.lang.Object,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -863,7 +925,7 @@ public void SetObject(Java.Lang.String arg0, object arg1, int arg2, int arg3)
             IExecute("setObject", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setObject(java.lang.String,java.lang.Object,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setObject(java.lang.String,java.lang.Object,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -874,7 +936,7 @@ public void SetObject(Java.Lang.String arg0, object arg1, int arg2)
             IExecute("setObject", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setObject(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setObject(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -884,7 +946,25 @@ public void SetObject(Java.Lang.String arg0, object arg1)
             IExecute("setObject", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setReadOnly(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setPassword(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetPassword(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPassword", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setQueryTimeout(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetQueryTimeout(int arg0)
+        {
+            IExecuteWithSignature("setQueryTimeout", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setReadOnly(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -893,7 +973,7 @@ public void SetReadOnly(bool arg0)
             IExecuteWithSignature("setReadOnly", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setRef(int,java.sql.Ref)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setRef(int,java.sql.Ref)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Ref"/></param>
@@ -903,7 +983,7 @@ public void SetRef(int arg0, Java.Sql.Ref arg1)
             IExecute("setRef", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setRowId(int,java.sql.RowId)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setRowId(int,java.sql.RowId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.RowId"/></param>
@@ -913,7 +993,7 @@ public void SetRowId(int arg0, Java.Sql.RowId arg1)
             IExecute("setRowId", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setRowId(java.lang.String,java.sql.RowId)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setRowId(java.lang.String,java.sql.RowId)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.RowId"/></param>
@@ -923,7 +1003,7 @@ public void SetRowId(Java.Lang.String arg0, Java.Sql.RowId arg1)
             IExecute("setRowId", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setShort(int,short)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setShort(int,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -933,7 +1013,7 @@ public void SetShort(int arg0, short arg1)
             IExecute("setShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setShort(java.lang.String,short)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setShort(java.lang.String,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="short"/></param>
@@ -943,7 +1023,7 @@ public void SetShort(Java.Lang.String arg0, short arg1)
             IExecute("setShort", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setSQLXML(int,java.sql.SQLXML)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setSQLXML(int,java.sql.SQLXML)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.SQLXML"/></param>
@@ -953,7 +1033,7 @@ public void SetSQLXML(int arg0, Java.Sql.SQLXML arg1)
             IExecute("setSQLXML", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setSQLXML(java.lang.String,java.sql.SQLXML)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setSQLXML(java.lang.String,java.sql.SQLXML)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.SQLXML"/></param>
@@ -963,7 +1043,7 @@ public void SetSQLXML(Java.Lang.String arg0, Java.Sql.SQLXML arg1)
             IExecute("setSQLXML", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setString(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setString(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -973,7 +1053,7 @@ public void SetString(int arg0, Java.Lang.String arg1)
             IExecute("setString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setString(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setString(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -983,7 +1063,7 @@ public void SetString(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setString", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTime(int,java.sql.Time,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTime(int,java.sql.Time,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -994,7 +1074,7 @@ public void SetTime(int arg0, Java.Sql.Time arg1, Java.Util.Calendar arg2)
             IExecute("setTime", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTime(int,java.sql.Time)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTime(int,java.sql.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -1004,7 +1084,7 @@ public void SetTime(int arg0, Java.Sql.Time arg1)
             IExecute("setTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTime(java.lang.String,java.sql.Time,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTime(java.lang.String,java.sql.Time,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -1015,7 +1095,7 @@ public void SetTime(Java.Lang.String arg0, Java.Sql.Time arg1, Java.Util.Calenda
             IExecute("setTime", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTime(java.lang.String,java.sql.Time)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTime(java.lang.String,java.sql.Time)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Time"/></param>
@@ -1025,7 +1105,7 @@ public void SetTime(Java.Lang.String arg0, Java.Sql.Time arg1)
             IExecute("setTime", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTimestamp(int,java.sql.Timestamp,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTimestamp(int,java.sql.Timestamp,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -1036,7 +1116,7 @@ public void SetTimestamp(int arg0, Java.Sql.Timestamp arg1, Java.Util.Calendar a
             IExecute("setTimestamp", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTimestamp(int,java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTimestamp(int,java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -1046,7 +1126,7 @@ public void SetTimestamp(int arg0, Java.Sql.Timestamp arg1)
             IExecute("setTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTimestamp(java.lang.String,java.sql.Timestamp,java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTimestamp(java.lang.String,java.sql.Timestamp,java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -1057,7 +1137,7 @@ public void SetTimestamp(Java.Lang.String arg0, Java.Sql.Timestamp arg1, Java.Ut
             IExecute("setTimestamp", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setTimestamp(java.lang.String,java.sql.Timestamp)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTimestamp(java.lang.String,java.sql.Timestamp)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Sql.Timestamp"/></param>
@@ -1067,7 +1147,16 @@ public void SetTimestamp(Java.Lang.String arg0, Java.Sql.Timestamp arg1)
             IExecute("setTimestamp", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setType(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTransactionIsolation(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetTransactionIsolation(int arg0)
+        {
+            IExecuteWithSignature("setTransactionIsolation", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -1076,7 +1165,16 @@ public void SetType(int arg0)
             IExecuteWithSignature("setType", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSet.html#setURL(int,java.net.URL)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setTypeMap(java.util.Map)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Map"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetTypeMap(Java.Util.Map<Java.Lang.String, Java.Lang.Class> arg0)
+        {
+            IExecuteWithSignature("setTypeMap", "(Ljava/util/Map;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setURL(int,java.net.URL)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Net.URL"/></param>
@@ -1085,6 +1183,24 @@ public void SetURL(int arg0, Java.Net.URL arg1)
         {
             IExecute("setURL", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setUrl(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetUrl(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setUrl", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSet.html#setUsername(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public void SetUsername(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setUsername", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Sql/RowSetEvent.cs b/src/net/Netdroid/Generated/Javax/Sql/RowSetEvent.cs
index 10b634565..e4d0cea74 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/RowSetEvent.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/RowSetEvent.cs
@@ -30,7 +30,7 @@ public partial class RowSetEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetEvent.html#%3Cinit%3E(javax.sql.RowSet)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetEvent.html#%3Cinit%3E(javax.sql.RowSet)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSet"/></param>
         public RowSetEvent(Javax.Sql.RowSet arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Sql/RowSetInternal.cs b/src/net/Netdroid/Generated/Javax/Sql/RowSetInternal.cs
index b93385aa0..7ebedb89b 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/RowSetInternal.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/RowSetInternal.cs
@@ -64,35 +64,43 @@ public partial class RowSetInternal : Javax.Sql.IRowSetInternal
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetInternal.html#getConnection()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetInternal.html#getParams()"/>
         /// </summary>
-        public Java.Sql.Connection Connection
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public object[] GetParams()
         {
-            get { return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;"); }
+            return IExecuteWithSignatureArray<object>("getParams", "()[Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetInternal.html#getOriginal()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetInternal.html#getConnection()"/>
         /// </summary>
-        public Java.Sql.ResultSet Original
+        /// <returns><see cref="Java.Sql.Connection"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.Connection GetConnection()
         {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getOriginal", "()Ljava/sql/ResultSet;"); }
+            return IExecuteWithSignature<Java.Sql.Connection>("getConnection", "()Ljava/sql/Connection;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetInternal.html#getOriginalRow()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetInternal.html#getOriginal()"/>
         /// </summary>
-        public Java.Sql.ResultSet OriginalRow
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetOriginal()
         {
-            get { return IExecuteWithSignature<Java.Sql.ResultSet>("getOriginalRow", "()Ljava/sql/ResultSet;"); }
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getOriginal", "()Ljava/sql/ResultSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetInternal.html#getParams()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetInternal.html#getOriginalRow()"/>
         /// </summary>
-        public object[] Params
+        /// <returns><see cref="Java.Sql.ResultSet"/></returns>
+        /// <exception cref="Java.Sql.SQLException"/>
+        public Java.Sql.ResultSet GetOriginalRow()
         {
-            get { return IExecuteWithSignatureArray<object>("getParams", "()[Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Java.Sql.ResultSet>("getOriginalRow", "()Ljava/sql/ResultSet;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetInternal.html#setMetaData(javax.sql.RowSetMetaData)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetInternal.html#setMetaData(javax.sql.RowSetMetaData)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetMetaData"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Sql/RowSetListener.cs b/src/net/Netdroid/Generated/Javax/Sql/RowSetListener.cs
index 5413b42d1..1b4afa80c 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/RowSetListener.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/RowSetListener.cs
@@ -27,7 +27,7 @@ namespace Javax.Sql
 {
     #region IRowSetListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.javax.sql.RowSetListener implementing <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.javax.sql.RowSetListener implementing <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html"/>
     /// </summary>
     public partial interface IRowSetListener
     {
@@ -68,17 +68,17 @@ public partial class RowSetListener : Javax.Sql.IRowSetListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("cursorMoved", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>>>(CursorMovedEventHandler));
-            AddEventHandler("rowChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>>>(RowChangedEventHandler));
-            AddEventHandler("rowSetChanged", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>>>(RowSetChangedEventHandler));
+            AddEventHandler("cursorMoved", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>>>(CursorMovedEventHandler));
+            AddEventHandler("rowChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>>>(RowChangedEventHandler));
+            AddEventHandler("rowSetChanged", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>>>(RowSetChangedEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#cursorMoved(javax.sql.RowSetEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#cursorMoved(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCursorMoved"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Sql.RowSetEvent> OnCursorMoved { get; set; } = null;
+        public global::System.Action<Javax.Sql.RowSetEvent> OnCursorMoved { get; set; } = null;
 
         void CursorMovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>> data)
         {
@@ -87,7 +87,7 @@ void CursorMovedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Ja
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#cursorMoved(javax.sql.RowSetEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#cursorMoved(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetEvent"/></param>
         public virtual void CursorMoved(Javax.Sql.RowSetEvent arg0)
@@ -96,10 +96,10 @@ public virtual void CursorMoved(Javax.Sql.RowSetEvent arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#rowChanged(javax.sql.RowSetEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#rowChanged(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRowChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Sql.RowSetEvent> OnRowChanged { get; set; } = null;
+        public global::System.Action<Javax.Sql.RowSetEvent> OnRowChanged { get; set; } = null;
 
         void RowChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>> data)
         {
@@ -108,7 +108,7 @@ void RowChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Jav
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#rowChanged(javax.sql.RowSetEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#rowChanged(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetEvent"/></param>
         public virtual void RowChanged(Javax.Sql.RowSetEvent arg0)
@@ -117,10 +117,10 @@ public virtual void RowChanged(Javax.Sql.RowSetEvent arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#rowSetChanged(javax.sql.RowSetEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#rowSetChanged(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnRowSetChanged"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Sql.RowSetEvent> OnRowSetChanged { get; set; } = null;
+        public global::System.Action<Javax.Sql.RowSetEvent> OnRowSetChanged { get; set; } = null;
 
         void RowSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Sql.RowSetEvent>> data)
         {
@@ -129,7 +129,7 @@ void RowSetChangedEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#rowSetChanged(javax.sql.RowSetEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#rowSetChanged(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetEvent"/></param>
         public virtual void RowSetChanged(Javax.Sql.RowSetEvent arg0)
@@ -168,7 +168,7 @@ public partial class RowSetListenerDirect : Javax.Sql.IRowSetListener
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#cursorMoved(javax.sql.RowSetEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#cursorMoved(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetEvent"/></param>
         public override void CursorMoved(Javax.Sql.RowSetEvent arg0)
@@ -176,7 +176,7 @@ public override void CursorMoved(Javax.Sql.RowSetEvent arg0)
             IExecuteWithSignature("cursorMoved", "(Ljavax/sql/RowSetEvent;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#rowChanged(javax.sql.RowSetEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#rowChanged(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetEvent"/></param>
         public override void RowChanged(Javax.Sql.RowSetEvent arg0)
@@ -184,7 +184,7 @@ public override void RowChanged(Javax.Sql.RowSetEvent arg0)
             IExecuteWithSignature("rowChanged", "(Ljavax/sql/RowSetEvent;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetListener.html#rowSetChanged(javax.sql.RowSetEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetListener.html#rowSetChanged(javax.sql.RowSetEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetEvent"/></param>
         public override void RowSetChanged(Javax.Sql.RowSetEvent arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Sql/RowSetMetaData.cs b/src/net/Netdroid/Generated/Javax/Sql/RowSetMetaData.cs
index 639986760..985e774e5 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/RowSetMetaData.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/RowSetMetaData.cs
@@ -64,7 +64,7 @@ public partial class RowSetMetaData : Javax.Sql.IRowSetMetaData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setAutoIncrement(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setAutoIncrement(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -74,7 +74,7 @@ public void SetAutoIncrement(int arg0, bool arg1)
             IExecute("setAutoIncrement", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setCaseSensitive(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setCaseSensitive(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -84,7 +84,7 @@ public void SetCaseSensitive(int arg0, bool arg1)
             IExecute("setCaseSensitive", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setCatalogName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setCatalogName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -94,7 +94,7 @@ public void SetCatalogName(int arg0, Java.Lang.String arg1)
             IExecute("setCatalogName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setColumnCount(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setColumnCount(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
@@ -103,7 +103,7 @@ public void SetColumnCount(int arg0)
             IExecuteWithSignature("setColumnCount", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setColumnDisplaySize(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setColumnDisplaySize(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -113,7 +113,7 @@ public void SetColumnDisplaySize(int arg0, int arg1)
             IExecute("setColumnDisplaySize", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setColumnLabel(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setColumnLabel(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -123,7 +123,7 @@ public void SetColumnLabel(int arg0, Java.Lang.String arg1)
             IExecute("setColumnLabel", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setColumnName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setColumnName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -133,7 +133,7 @@ public void SetColumnName(int arg0, Java.Lang.String arg1)
             IExecute("setColumnName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setColumnType(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setColumnType(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -143,7 +143,7 @@ public void SetColumnType(int arg0, int arg1)
             IExecute("setColumnType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setColumnTypeName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setColumnTypeName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -153,7 +153,7 @@ public void SetColumnTypeName(int arg0, Java.Lang.String arg1)
             IExecute("setColumnTypeName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setCurrency(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setCurrency(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -163,7 +163,7 @@ public void SetCurrency(int arg0, bool arg1)
             IExecute("setCurrency", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setNullable(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setNullable(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -173,7 +173,7 @@ public void SetNullable(int arg0, int arg1)
             IExecute("setNullable", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setPrecision(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setPrecision(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -183,7 +183,7 @@ public void SetPrecision(int arg0, int arg1)
             IExecute("setPrecision", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setScale(int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setScale(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -193,7 +193,7 @@ public void SetScale(int arg0, int arg1)
             IExecute("setScale", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setSchemaName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setSchemaName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -203,7 +203,7 @@ public void SetSchemaName(int arg0, Java.Lang.String arg1)
             IExecute("setSchemaName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setSearchable(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setSearchable(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -213,7 +213,7 @@ public void SetSearchable(int arg0, bool arg1)
             IExecute("setSearchable", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setSigned(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setSigned(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -223,7 +223,7 @@ public void SetSigned(int arg0, bool arg1)
             IExecute("setSigned", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetMetaData.html#setTableName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetMetaData.html#setTableName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Sql/RowSetReader.cs b/src/net/Netdroid/Generated/Javax/Sql/RowSetReader.cs
index e9f0ccb9a..c06e31bc6 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/RowSetReader.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/RowSetReader.cs
@@ -64,7 +64,7 @@ public partial class RowSetReader : Javax.Sql.IRowSetReader
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetReader.html#readData(javax.sql.RowSetInternal)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetReader.html#readData(javax.sql.RowSetInternal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetInternal"/></param>
         /// <exception cref="Java.Sql.SQLException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Sql/RowSetWriter.cs b/src/net/Netdroid/Generated/Javax/Sql/RowSetWriter.cs
index 545003268..921fb9ed6 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/RowSetWriter.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/RowSetWriter.cs
@@ -64,7 +64,7 @@ public partial class RowSetWriter : Javax.Sql.IRowSetWriter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/RowSetWriter.html#writeData(javax.sql.RowSetInternal)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/RowSetWriter.html#writeData(javax.sql.RowSetInternal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.RowSetInternal"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Sql/StatementEvent.cs b/src/net/Netdroid/Generated/Javax/Sql/StatementEvent.cs
index eeb5cf9d6..d2f9d4ef8 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/StatementEvent.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/StatementEvent.cs
@@ -30,7 +30,7 @@ public partial class StatementEvent
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEvent.html#%3Cinit%3E(javax.sql.PooledConnection,java.sql.PreparedStatement,java.sql.SQLException)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/StatementEvent.html#%3Cinit%3E(javax.sql.PooledConnection,java.sql.PreparedStatement,java.sql.SQLException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.PooledConnection"/></param>
         /// <param name="arg1"><see cref="Java.Sql.PreparedStatement"/></param>
@@ -40,7 +40,7 @@ public StatementEvent(Javax.Sql.PooledConnection arg0, Java.Sql.PreparedStatemen
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEvent.html#%3Cinit%3E(javax.sql.PooledConnection,java.sql.PreparedStatement)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/StatementEvent.html#%3Cinit%3E(javax.sql.PooledConnection,java.sql.PreparedStatement)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.PooledConnection"/></param>
         /// <param name="arg1"><see cref="Java.Sql.PreparedStatement"/></param>
@@ -65,18 +65,20 @@ public StatementEvent(Javax.Sql.PooledConnection arg0, Java.Sql.PreparedStatemen
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEvent.html#getSQLException()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/StatementEvent.html#getStatement()"/>
         /// </summary>
-        public Java.Sql.SQLException SQLException
+        /// <returns><see cref="Java.Sql.PreparedStatement"/></returns>
+        public Java.Sql.PreparedStatement GetStatement()
         {
-            get { var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getSQLException", "()Ljava/sql/SQLException;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLException>(obj); }
+            return IExecuteWithSignature<Java.Sql.PreparedStatement>("getStatement", "()Ljava/sql/PreparedStatement;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEvent.html#getStatement()"/> 
+        /// <see href="https://developer.android.com/reference/javax/sql/StatementEvent.html#getSQLException()"/>
         /// </summary>
-        public Java.Sql.PreparedStatement Statement
+        /// <returns><see cref="Java.Sql.SQLException"/></returns>
+        public Java.Sql.SQLException GetSQLException()
         {
-            get { return IExecuteWithSignature<Java.Sql.PreparedStatement>("getStatement", "()Ljava/sql/PreparedStatement;"); }
+            var obj = IExecuteWithSignature<MASES.JCOBridge.C2JBridge.JVMInterop.IJavaObject>("getSQLException", "()Ljava/sql/SQLException;"); return MASES.JCOBridge.C2JBridge.JVMBridgeException.New<Java.Sql.SQLException>(obj);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Sql/StatementEventListener.cs b/src/net/Netdroid/Generated/Javax/Sql/StatementEventListener.cs
index 0e4e50677..4ba00ae0c 100644
--- a/src/net/Netdroid/Generated/Javax/Sql/StatementEventListener.cs
+++ b/src/net/Netdroid/Generated/Javax/Sql/StatementEventListener.cs
@@ -27,7 +27,7 @@ namespace Javax.Sql
 {
     #region IStatementEventListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.javax.sql.StatementEventListener implementing <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEventListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.javax.sql.StatementEventListener implementing <see href="https://developer.android.com/reference/javax/sql/StatementEventListener.html"/>
     /// </summary>
     public partial interface IStatementEventListener
     {
@@ -68,16 +68,16 @@ public partial class StatementEventListener : Javax.Sql.IStatementEventListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("statementClosed", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.StatementEvent>>>(StatementClosedEventHandler));
-            AddEventHandler("statementErrorOccurred", new System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.StatementEvent>>>(StatementErrorOccurredEventHandler));
+            AddEventHandler("statementClosed", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.StatementEvent>>>(StatementClosedEventHandler));
+            AddEventHandler("statementErrorOccurred", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Javax.Sql.StatementEvent>>>(StatementErrorOccurredEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEventListener.html#statementClosed(javax.sql.StatementEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/sql/StatementEventListener.html#statementClosed(javax.sql.StatementEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnStatementClosed"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Sql.StatementEvent> OnStatementClosed { get; set; } = null;
+        public global::System.Action<Javax.Sql.StatementEvent> OnStatementClosed { get; set; } = null;
 
         void StatementClosedEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Sql.StatementEvent>> data)
         {
@@ -86,7 +86,7 @@ void StatementClosedEventHandler(object sender, CLRListenerEventArgs<CLREventDat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEventListener.html#statementClosed(javax.sql.StatementEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/StatementEventListener.html#statementClosed(javax.sql.StatementEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.StatementEvent"/></param>
         public virtual void StatementClosed(Javax.Sql.StatementEvent arg0)
@@ -95,10 +95,10 @@ public virtual void StatementClosed(Javax.Sql.StatementEvent arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEventListener.html#statementErrorOccurred(javax.sql.StatementEvent)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/sql/StatementEventListener.html#statementErrorOccurred(javax.sql.StatementEvent)"/>
         /// </summary>
         /// <remarks>If <see cref="OnStatementErrorOccurred"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Javax.Sql.StatementEvent> OnStatementErrorOccurred { get; set; } = null;
+        public global::System.Action<Javax.Sql.StatementEvent> OnStatementErrorOccurred { get; set; } = null;
 
         void StatementErrorOccurredEventHandler(object sender, CLRListenerEventArgs<CLREventData<Javax.Sql.StatementEvent>> data)
         {
@@ -107,7 +107,7 @@ void StatementErrorOccurredEventHandler(object sender, CLRListenerEventArgs<CLRE
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEventListener.html#statementErrorOccurred(javax.sql.StatementEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/StatementEventListener.html#statementErrorOccurred(javax.sql.StatementEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.StatementEvent"/></param>
         public virtual void StatementErrorOccurred(Javax.Sql.StatementEvent arg0)
@@ -146,7 +146,7 @@ public partial class StatementEventListenerDirect : Javax.Sql.IStatementEventLis
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEventListener.html#statementClosed(javax.sql.StatementEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/StatementEventListener.html#statementClosed(javax.sql.StatementEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.StatementEvent"/></param>
         public override void StatementClosed(Javax.Sql.StatementEvent arg0)
@@ -154,7 +154,7 @@ public override void StatementClosed(Javax.Sql.StatementEvent arg0)
             IExecuteWithSignature("statementClosed", "(Ljavax/sql/StatementEvent;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.sql/javax/sql/StatementEventListener.html#statementErrorOccurred(javax.sql.StatementEvent)"/>
+        /// <see href="https://developer.android.com/reference/javax/sql/StatementEventListener.html#statementErrorOccurred(javax.sql.StatementEvent)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Sql.StatementEvent"/></param>
         public override void StatementErrorOccurred(Javax.Sql.StatementEvent arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Xml/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/AllPackageClasses.cs
index d691e2c54..173e258b4 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml
 {
     #region XMLConstants
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html"/>
     /// </summary>
     public partial class XMLConstants : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XMLConstants>
     {
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Datatype/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Datatype/AllPackageClasses.cs
index 065e72387..b12a185fe 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Datatype/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Datatype/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Datatype
 {
     #region DatatypeConfigurationException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConfigurationException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConfigurationException.html"/>
     /// </summary>
     public partial class DatatypeConfigurationException : Java.Lang.Exception
     {
@@ -45,7 +45,7 @@ public partial class DatatypeConfigurationException : Java.Lang.Exception
 
     #region DatatypeConstants
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html"/>
     /// </summary>
     public partial class DatatypeConstants : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DatatypeConstants>
     {
@@ -85,7 +85,7 @@ public DatatypeConstants(params object[] args) : base(args) { }
         // TODO: complete the class
         #region Field
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.Field.html"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.Field.html"/>
         /// </summary>
         public partial class Field : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Field>
         {
@@ -133,7 +133,7 @@ public Field(params object[] args) : base(args) { }
 
     #region DatatypeFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html"/>
     /// </summary>
     public partial class DatatypeFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DatatypeFactory>
     {
@@ -141,12 +141,12 @@ public partial class DatatypeFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<D
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DatatypeFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatatypeFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatatypeFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DatatypeFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DatatypeFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DatatypeFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -179,7 +179,7 @@ public DatatypeFactory(params object[] args) : base(args) { }
 
     #region Duration
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html"/>
     /// </summary>
     public partial class Duration : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Duration>
     {
@@ -187,12 +187,12 @@ public partial class Duration : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Duration
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Duration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Duration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Duration() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Duration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Duration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Duration(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -225,7 +225,7 @@ public Duration(params object[] args) : base(args) { }
 
     #region XMLGregorianCalendar
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html"/>
     /// </summary>
     public partial class XMLGregorianCalendar : Java.Lang.Cloneable
     {
@@ -233,12 +233,12 @@ public partial class XMLGregorianCalendar : Java.Lang.Cloneable
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XMLGregorianCalendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XMLGregorianCalendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XMLGregorianCalendar() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XMLGregorianCalendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XMLGregorianCalendar class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XMLGregorianCalendar(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Datatype/DatatypeConstants.cs b/src/net/Netdroid/Generated/Javax/Xml/Datatype/DatatypeConstants.cs
index ba0e5f792..cef88cabb 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Datatype/DatatypeConstants.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Datatype/DatatypeConstants.cs
@@ -38,217 +38,217 @@ public partial class DatatypeConstants
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#APRIL"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#APRIL"/>
         /// </summary>
         public static int APRIL { get { if (!_APRILReady) { _APRILContent = SGetField<int>(LocalBridgeClazz, "APRIL"); _APRILReady = true; } return _APRILContent; } }
         private static int _APRILContent = default;
         private static bool _APRILReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#AUGUST"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#AUGUST"/>
         /// </summary>
         public static int AUGUST { get { if (!_AUGUSTReady) { _AUGUSTContent = SGetField<int>(LocalBridgeClazz, "AUGUST"); _AUGUSTReady = true; } return _AUGUSTContent; } }
         private static int _AUGUSTContent = default;
         private static bool _AUGUSTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#DECEMBER"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#DECEMBER"/>
         /// </summary>
         public static int DECEMBER { get { if (!_DECEMBERReady) { _DECEMBERContent = SGetField<int>(LocalBridgeClazz, "DECEMBER"); _DECEMBERReady = true; } return _DECEMBERContent; } }
         private static int _DECEMBERContent = default;
         private static bool _DECEMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#EQUAL"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#EQUAL"/>
         /// </summary>
         public static int EQUAL { get { if (!_EQUALReady) { _EQUALContent = SGetField<int>(LocalBridgeClazz, "EQUAL"); _EQUALReady = true; } return _EQUALContent; } }
         private static int _EQUALContent = default;
         private static bool _EQUALReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#FEBRUARY"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#FEBRUARY"/>
         /// </summary>
         public static int FEBRUARY { get { if (!_FEBRUARYReady) { _FEBRUARYContent = SGetField<int>(LocalBridgeClazz, "FEBRUARY"); _FEBRUARYReady = true; } return _FEBRUARYContent; } }
         private static int _FEBRUARYContent = default;
         private static bool _FEBRUARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#FIELD_UNDEFINED"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#FIELD_UNDEFINED"/>
         /// </summary>
         public static int FIELD_UNDEFINED { get { if (!_FIELD_UNDEFINEDReady) { _FIELD_UNDEFINEDContent = SGetField<int>(LocalBridgeClazz, "FIELD_UNDEFINED"); _FIELD_UNDEFINEDReady = true; } return _FIELD_UNDEFINEDContent; } }
         private static int _FIELD_UNDEFINEDContent = default;
         private static bool _FIELD_UNDEFINEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#GREATER"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#GREATER"/>
         /// </summary>
         public static int GREATER { get { if (!_GREATERReady) { _GREATERContent = SGetField<int>(LocalBridgeClazz, "GREATER"); _GREATERReady = true; } return _GREATERContent; } }
         private static int _GREATERContent = default;
         private static bool _GREATERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#INDETERMINATE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#INDETERMINATE"/>
         /// </summary>
         public static int INDETERMINATE { get { if (!_INDETERMINATEReady) { _INDETERMINATEContent = SGetField<int>(LocalBridgeClazz, "INDETERMINATE"); _INDETERMINATEReady = true; } return _INDETERMINATEContent; } }
         private static int _INDETERMINATEContent = default;
         private static bool _INDETERMINATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#JANUARY"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#JANUARY"/>
         /// </summary>
         public static int JANUARY { get { if (!_JANUARYReady) { _JANUARYContent = SGetField<int>(LocalBridgeClazz, "JANUARY"); _JANUARYReady = true; } return _JANUARYContent; } }
         private static int _JANUARYContent = default;
         private static bool _JANUARYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#JULY"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#JULY"/>
         /// </summary>
         public static int JULY { get { if (!_JULYReady) { _JULYContent = SGetField<int>(LocalBridgeClazz, "JULY"); _JULYReady = true; } return _JULYContent; } }
         private static int _JULYContent = default;
         private static bool _JULYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#JUNE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#JUNE"/>
         /// </summary>
         public static int JUNE { get { if (!_JUNEReady) { _JUNEContent = SGetField<int>(LocalBridgeClazz, "JUNE"); _JUNEReady = true; } return _JUNEContent; } }
         private static int _JUNEContent = default;
         private static bool _JUNEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#LESSER"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#LESSER"/>
         /// </summary>
         public static int LESSER { get { if (!_LESSERReady) { _LESSERContent = SGetField<int>(LocalBridgeClazz, "LESSER"); _LESSERReady = true; } return _LESSERContent; } }
         private static int _LESSERContent = default;
         private static bool _LESSERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#MARCH"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#MARCH"/>
         /// </summary>
         public static int MARCH { get { if (!_MARCHReady) { _MARCHContent = SGetField<int>(LocalBridgeClazz, "MARCH"); _MARCHReady = true; } return _MARCHContent; } }
         private static int _MARCHContent = default;
         private static bool _MARCHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#MAX_TIMEZONE_OFFSET"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#MAX_TIMEZONE_OFFSET"/>
         /// </summary>
         public static int MAX_TIMEZONE_OFFSET { get { if (!_MAX_TIMEZONE_OFFSETReady) { _MAX_TIMEZONE_OFFSETContent = SGetField<int>(LocalBridgeClazz, "MAX_TIMEZONE_OFFSET"); _MAX_TIMEZONE_OFFSETReady = true; } return _MAX_TIMEZONE_OFFSETContent; } }
         private static int _MAX_TIMEZONE_OFFSETContent = default;
         private static bool _MAX_TIMEZONE_OFFSETReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#MAY"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#MAY"/>
         /// </summary>
         public static int MAY { get { if (!_MAYReady) { _MAYContent = SGetField<int>(LocalBridgeClazz, "MAY"); _MAYReady = true; } return _MAYContent; } }
         private static int _MAYContent = default;
         private static bool _MAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#MIN_TIMEZONE_OFFSET"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#MIN_TIMEZONE_OFFSET"/>
         /// </summary>
         public static int MIN_TIMEZONE_OFFSET { get { if (!_MIN_TIMEZONE_OFFSETReady) { _MIN_TIMEZONE_OFFSETContent = SGetField<int>(LocalBridgeClazz, "MIN_TIMEZONE_OFFSET"); _MIN_TIMEZONE_OFFSETReady = true; } return _MIN_TIMEZONE_OFFSETContent; } }
         private static int _MIN_TIMEZONE_OFFSETContent = default;
         private static bool _MIN_TIMEZONE_OFFSETReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#NOVEMBER"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#NOVEMBER"/>
         /// </summary>
         public static int NOVEMBER { get { if (!_NOVEMBERReady) { _NOVEMBERContent = SGetField<int>(LocalBridgeClazz, "NOVEMBER"); _NOVEMBERReady = true; } return _NOVEMBERContent; } }
         private static int _NOVEMBERContent = default;
         private static bool _NOVEMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#OCTOBER"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#OCTOBER"/>
         /// </summary>
         public static int OCTOBER { get { if (!_OCTOBERReady) { _OCTOBERContent = SGetField<int>(LocalBridgeClazz, "OCTOBER"); _OCTOBERReady = true; } return _OCTOBERContent; } }
         private static int _OCTOBERContent = default;
         private static bool _OCTOBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#SEPTEMBER"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#SEPTEMBER"/>
         /// </summary>
         public static int SEPTEMBER { get { if (!_SEPTEMBERReady) { _SEPTEMBERContent = SGetField<int>(LocalBridgeClazz, "SEPTEMBER"); _SEPTEMBERReady = true; } return _SEPTEMBERContent; } }
         private static int _SEPTEMBERContent = default;
         private static bool _SEPTEMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#DAYS"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#DAYS"/>
         /// </summary>
         public static Javax.Xml.Datatype.DatatypeConstants.Field DAYS { get { if (!_DAYSReady) { _DAYSContent = SGetField<Javax.Xml.Datatype.DatatypeConstants.Field>(LocalBridgeClazz, "DAYS"); _DAYSReady = true; } return _DAYSContent; } }
         private static Javax.Xml.Datatype.DatatypeConstants.Field _DAYSContent = default;
         private static bool _DAYSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#HOURS"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#HOURS"/>
         /// </summary>
         public static Javax.Xml.Datatype.DatatypeConstants.Field HOURS { get { if (!_HOURSReady) { _HOURSContent = SGetField<Javax.Xml.Datatype.DatatypeConstants.Field>(LocalBridgeClazz, "HOURS"); _HOURSReady = true; } return _HOURSContent; } }
         private static Javax.Xml.Datatype.DatatypeConstants.Field _HOURSContent = default;
         private static bool _HOURSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#MINUTES"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#MINUTES"/>
         /// </summary>
         public static Javax.Xml.Datatype.DatatypeConstants.Field MINUTES { get { if (!_MINUTESReady) { _MINUTESContent = SGetField<Javax.Xml.Datatype.DatatypeConstants.Field>(LocalBridgeClazz, "MINUTES"); _MINUTESReady = true; } return _MINUTESContent; } }
         private static Javax.Xml.Datatype.DatatypeConstants.Field _MINUTESContent = default;
         private static bool _MINUTESReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#MONTHS"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#MONTHS"/>
         /// </summary>
         public static Javax.Xml.Datatype.DatatypeConstants.Field MONTHS { get { if (!_MONTHSReady) { _MONTHSContent = SGetField<Javax.Xml.Datatype.DatatypeConstants.Field>(LocalBridgeClazz, "MONTHS"); _MONTHSReady = true; } return _MONTHSContent; } }
         private static Javax.Xml.Datatype.DatatypeConstants.Field _MONTHSContent = default;
         private static bool _MONTHSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#SECONDS"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#SECONDS"/>
         /// </summary>
         public static Javax.Xml.Datatype.DatatypeConstants.Field SECONDS { get { if (!_SECONDSReady) { _SECONDSContent = SGetField<Javax.Xml.Datatype.DatatypeConstants.Field>(LocalBridgeClazz, "SECONDS"); _SECONDSReady = true; } return _SECONDSContent; } }
         private static Javax.Xml.Datatype.DatatypeConstants.Field _SECONDSContent = default;
         private static bool _SECONDSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#YEARS"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#YEARS"/>
         /// </summary>
         public static Javax.Xml.Datatype.DatatypeConstants.Field YEARS { get { if (!_YEARSReady) { _YEARSContent = SGetField<Javax.Xml.Datatype.DatatypeConstants.Field>(LocalBridgeClazz, "YEARS"); _YEARSReady = true; } return _YEARSContent; } }
         private static Javax.Xml.Datatype.DatatypeConstants.Field _YEARSContent = default;
         private static bool _YEARSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#DATE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#DATE"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName DATE { get { if (!_DATEReady) { _DATEContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "DATE"); _DATEReady = true; } return _DATEContent; } }
         private static Javax.Xml.Namespace.QName _DATEContent = default;
         private static bool _DATEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#DATETIME"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#DATETIME"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName DATETIME { get { if (!_DATETIMEReady) { _DATETIMEContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "DATETIME"); _DATETIMEReady = true; } return _DATETIMEContent; } }
         private static Javax.Xml.Namespace.QName _DATETIMEContent = default;
         private static bool _DATETIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#DURATION"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#DURATION"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName DURATION { get { if (!_DURATIONReady) { _DURATIONContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "DURATION"); _DURATIONReady = true; } return _DURATIONContent; } }
         private static Javax.Xml.Namespace.QName _DURATIONContent = default;
         private static bool _DURATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#DURATION_DAYTIME"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#DURATION_DAYTIME"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName DURATION_DAYTIME { get { if (!_DURATION_DAYTIMEReady) { _DURATION_DAYTIMEContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "DURATION_DAYTIME"); _DURATION_DAYTIMEReady = true; } return _DURATION_DAYTIMEContent; } }
         private static Javax.Xml.Namespace.QName _DURATION_DAYTIMEContent = default;
         private static bool _DURATION_DAYTIMEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#DURATION_YEARMONTH"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#DURATION_YEARMONTH"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName DURATION_YEARMONTH { get { if (!_DURATION_YEARMONTHReady) { _DURATION_YEARMONTHContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "DURATION_YEARMONTH"); _DURATION_YEARMONTHReady = true; } return _DURATION_YEARMONTHContent; } }
         private static Javax.Xml.Namespace.QName _DURATION_YEARMONTHContent = default;
         private static bool _DURATION_YEARMONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#GDAY"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#GDAY"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName GDAY { get { if (!_GDAYReady) { _GDAYContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "GDAY"); _GDAYReady = true; } return _GDAYContent; } }
         private static Javax.Xml.Namespace.QName _GDAYContent = default;
         private static bool _GDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#GMONTH"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#GMONTH"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName GMONTH { get { if (!_GMONTHReady) { _GMONTHContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "GMONTH"); _GMONTHReady = true; } return _GMONTHContent; } }
         private static Javax.Xml.Namespace.QName _GMONTHContent = default;
         private static bool _GMONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#GMONTHDAY"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#GMONTHDAY"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName GMONTHDAY { get { if (!_GMONTHDAYReady) { _GMONTHDAYContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "GMONTHDAY"); _GMONTHDAYReady = true; } return _GMONTHDAYContent; } }
         private static Javax.Xml.Namespace.QName _GMONTHDAYContent = default;
         private static bool _GMONTHDAYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#GYEAR"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#GYEAR"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName GYEAR { get { if (!_GYEARReady) { _GYEARContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "GYEAR"); _GYEARReady = true; } return _GYEARContent; } }
         private static Javax.Xml.Namespace.QName _GYEARContent = default;
         private static bool _GYEARReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#GYEARMONTH"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#GYEARMONTH"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName GYEARMONTH { get { if (!_GYEARMONTHReady) { _GYEARMONTHContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "GYEARMONTH"); _GYEARMONTHReady = true; } return _GYEARMONTHContent; } }
         private static Javax.Xml.Namespace.QName _GYEARMONTHContent = default;
         private static bool _GYEARMONTHReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.html#TIME"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.html#TIME"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName TIME { get { if (!_TIMEReady) { _TIMEContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "TIME"); _TIMEReady = true; } return _TIMEContent; } }
         private static Javax.Xml.Namespace.QName _TIMEContent = default;
@@ -286,11 +286,12 @@ public partial class Field
 
             #region Instance methods
             /// <summary>
-            /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeConstants.Field.html#getId()"/> 
+            /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeConstants.Field.html#getId()"/>
             /// </summary>
-            public int Id
+            /// <returns><see cref="int"/></returns>
+            public int GetId()
             {
-                get { return IExecuteWithSignature<int>("getId", "()I"); }
+                return IExecuteWithSignature<int>("getId", "()I");
             }
 
             #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Datatype/DatatypeFactory.cs b/src/net/Netdroid/Generated/Javax/Xml/Datatype/DatatypeFactory.cs
index 5cfef8c82..c54ae92b7 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Datatype/DatatypeFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Datatype/DatatypeFactory.cs
@@ -38,13 +38,13 @@ public partial class DatatypeFactory
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#DATATYPEFACTORY_IMPLEMENTATION_CLASS"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#DATATYPEFACTORY_IMPLEMENTATION_CLASS"/>
         /// </summary>
         public static Java.Lang.String DATATYPEFACTORY_IMPLEMENTATION_CLASS { get { if (!_DATATYPEFACTORY_IMPLEMENTATION_CLASSReady) { _DATATYPEFACTORY_IMPLEMENTATION_CLASSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATATYPEFACTORY_IMPLEMENTATION_CLASS"); _DATATYPEFACTORY_IMPLEMENTATION_CLASSReady = true; } return _DATATYPEFACTORY_IMPLEMENTATION_CLASSContent; } }
         private static Java.Lang.String _DATATYPEFACTORY_IMPLEMENTATION_CLASSContent = default;
         private static bool _DATATYPEFACTORY_IMPLEMENTATION_CLASSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#DATATYPEFACTORY_PROPERTY"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#DATATYPEFACTORY_PROPERTY"/>
         /// </summary>
         public static Java.Lang.String DATATYPEFACTORY_PROPERTY { get { if (!_DATATYPEFACTORY_PROPERTYReady) { _DATATYPEFACTORY_PROPERTYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DATATYPEFACTORY_PROPERTY"); _DATATYPEFACTORY_PROPERTYReady = true; } return _DATATYPEFACTORY_PROPERTYContent; } }
         private static Java.Lang.String _DATATYPEFACTORY_PROPERTYContent = default;
@@ -54,7 +54,7 @@ public partial class DatatypeFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDefaultInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDefaultInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Datatype.DatatypeFactory"/></returns>
         public static Javax.Xml.Datatype.DatatypeFactory NewDefaultInstance()
@@ -62,7 +62,7 @@ public static Javax.Xml.Datatype.DatatypeFactory NewDefaultInstance()
             return SExecuteWithSignature<Javax.Xml.Datatype.DatatypeFactory>(LocalBridgeClazz, "newDefaultInstance", "()Ljavax/xml/datatype/DatatypeFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Datatype.DatatypeFactory"/></returns>
         /// <exception cref="Javax.Xml.Datatype.DatatypeConfigurationException"/>
@@ -71,7 +71,7 @@ public static Javax.Xml.Datatype.DatatypeFactory NewInstance()
             return SExecuteWithSignature<Javax.Xml.Datatype.DatatypeFactory>(LocalBridgeClazz, "newInstance", "()Ljavax/xml/datatype/DatatypeFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newInstance(java.lang.String,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newInstance(java.lang.String,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -86,7 +86,7 @@ public static Javax.Xml.Datatype.DatatypeFactory NewInstance(Java.Lang.String ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDuration(boolean,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDuration(boolean,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -101,7 +101,7 @@ public Javax.Xml.Datatype.Duration NewDuration(bool arg0, Java.Math.BigInteger a
             return IExecute<Javax.Xml.Datatype.Duration>("newDuration", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDuration(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDuration(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -110,7 +110,7 @@ public Javax.Xml.Datatype.Duration NewDuration(Java.Lang.String arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("newDuration", "(Ljava/lang/String;)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDuration(long)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDuration(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -119,7 +119,7 @@ public Javax.Xml.Datatype.Duration NewDuration(long arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("newDuration", "(J)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Datatype.XMLGregorianCalendar"/></returns>
         public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendar()
@@ -127,7 +127,7 @@ public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendar()
             return IExecuteWithSignature<Javax.Xml.Datatype.XMLGregorianCalendar>("newXMLGregorianCalendar", "()Ljavax/xml/datatype/XMLGregorianCalendar;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.XMLGregorianCalendar"/></returns>
@@ -136,7 +136,7 @@ public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendar(Java.Lang
             return IExecuteWithSignature<Javax.Xml.Datatype.XMLGregorianCalendar>("newXMLGregorianCalendar", "(Ljava/lang/String;)Ljavax/xml/datatype/XMLGregorianCalendar;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar(java.math.BigInteger,int,int,int,int,int,java.math.BigDecimal,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar(java.math.BigInteger,int,int,int,int,int,java.math.BigDecimal,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -152,7 +152,7 @@ public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendar(Java.Math
             return IExecute<Javax.Xml.Datatype.XMLGregorianCalendar>("newXMLGregorianCalendar", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar(java.util.GregorianCalendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar(java.util.GregorianCalendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.GregorianCalendar"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.XMLGregorianCalendar"/></returns>
@@ -161,7 +161,7 @@ public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendar(Java.Util
             return IExecuteWithSignature<Javax.Xml.Datatype.XMLGregorianCalendar>("newXMLGregorianCalendar", "(Ljava/util/GregorianCalendar;)Ljavax/xml/datatype/XMLGregorianCalendar;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDuration(boolean,int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDuration(boolean,int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -176,7 +176,7 @@ public Javax.Xml.Datatype.Duration NewDuration(bool arg0, int arg1, int arg2, in
             return IExecute<Javax.Xml.Datatype.Duration>("newDuration", arg0, arg1, arg2, arg3, arg4, arg5, arg6);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDurationDayTime(boolean,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDurationDayTime(boolean,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -189,7 +189,7 @@ public Javax.Xml.Datatype.Duration NewDurationDayTime(bool arg0, int arg1, int a
             return IExecute<Javax.Xml.Datatype.Duration>("newDurationDayTime", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDurationDayTime(boolean,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDurationDayTime(boolean,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -202,7 +202,7 @@ public Javax.Xml.Datatype.Duration NewDurationDayTime(bool arg0, Java.Math.BigIn
             return IExecute<Javax.Xml.Datatype.Duration>("newDurationDayTime", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDurationDayTime(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDurationDayTime(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -211,7 +211,7 @@ public Javax.Xml.Datatype.Duration NewDurationDayTime(Java.Lang.String arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("newDurationDayTime", "(Ljava/lang/String;)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDurationDayTime(long)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDurationDayTime(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -220,7 +220,7 @@ public Javax.Xml.Datatype.Duration NewDurationDayTime(long arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("newDurationDayTime", "(J)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDurationYearMonth(boolean,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDurationYearMonth(boolean,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -231,7 +231,7 @@ public Javax.Xml.Datatype.Duration NewDurationYearMonth(bool arg0, int arg1, int
             return IExecute<Javax.Xml.Datatype.Duration>("newDurationYearMonth", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDurationYearMonth(boolean,java.math.BigInteger,java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDurationYearMonth(boolean,java.math.BigInteger,java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         /// <param name="arg1"><see cref="Java.Math.BigInteger"/></param>
@@ -242,7 +242,7 @@ public Javax.Xml.Datatype.Duration NewDurationYearMonth(bool arg0, Java.Math.Big
             return IExecute<Javax.Xml.Datatype.Duration>("newDurationYearMonth", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDurationYearMonth(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDurationYearMonth(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -251,7 +251,7 @@ public Javax.Xml.Datatype.Duration NewDurationYearMonth(Java.Lang.String arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("newDurationYearMonth", "(Ljava/lang/String;)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newDurationYearMonth(long)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newDurationYearMonth(long)"/>
         /// </summary>
         /// <param name="arg0"><see cref="long"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -260,7 +260,7 @@ public Javax.Xml.Datatype.Duration NewDurationYearMonth(long arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("newDurationYearMonth", "(J)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar(int,int,int,int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendar(int,int,int,int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -276,7 +276,7 @@ public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendar(int arg0,
             return IExecute<Javax.Xml.Datatype.XMLGregorianCalendar>("newXMLGregorianCalendar", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendarDate(int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendarDate(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -288,7 +288,7 @@ public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendarDate(int a
             return IExecute<Javax.Xml.Datatype.XMLGregorianCalendar>("newXMLGregorianCalendarDate", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendarTime(int,int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendarTime(int,int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -301,7 +301,7 @@ public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendarTime(int a
             return IExecute<Javax.Xml.Datatype.XMLGregorianCalendar>("newXMLGregorianCalendarTime", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendarTime(int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendarTime(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -313,7 +313,7 @@ public Javax.Xml.Datatype.XMLGregorianCalendar NewXMLGregorianCalendarTime(int a
             return IExecute<Javax.Xml.Datatype.XMLGregorianCalendar>("newXMLGregorianCalendarTime", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendarTime(int,int,int,java.math.BigDecimal,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/DatatypeFactory.html#newXMLGregorianCalendarTime(int,int,int,java.math.BigDecimal,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Datatype/Duration.cs b/src/net/Netdroid/Generated/Javax/Xml/Datatype/Duration.cs
index 343af0784..0bed7fb5d 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Datatype/Duration.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Datatype/Duration.cs
@@ -46,63 +46,7 @@ public partial class Duration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getDays()"/> 
-        /// </summary>
-        public int Days
-        {
-            get { return IExecuteWithSignature<int>("getDays", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getHours()"/> 
-        /// </summary>
-        public int Hours
-        {
-            get { return IExecuteWithSignature<int>("getHours", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getMinutes()"/> 
-        /// </summary>
-        public int Minutes
-        {
-            get { return IExecuteWithSignature<int>("getMinutes", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getMonths()"/> 
-        /// </summary>
-        public int Months
-        {
-            get { return IExecuteWithSignature<int>("getMonths", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getSeconds()"/> 
-        /// </summary>
-        public int Seconds
-        {
-            get { return IExecuteWithSignature<int>("getSeconds", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getSign()"/> 
-        /// </summary>
-        public int Sign
-        {
-            get { return IExecuteWithSignature<int>("getSign", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getXMLSchemaType()"/> 
-        /// </summary>
-        public Javax.Xml.Namespace.QName XMLSchemaType
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Namespace.QName>("getXMLSchemaType", "()Ljavax/xml/namespace/QName;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getYears()"/> 
-        /// </summary>
-        public int Years
-        {
-            get { return IExecuteWithSignature<int>("getYears", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#isSet(javax.xml.datatype.DatatypeConstants.Field)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#isSet(javax.xml.datatype.DatatypeConstants.Field)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Datatype.DatatypeConstants.Field"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -111,7 +55,7 @@ public bool IsSet(Javax.Xml.Datatype.DatatypeConstants.Field arg0)
             return IExecuteWithSignature<bool>("isSet", "(Ljavax/xml/datatype/DatatypeConstants$Field;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#compare(javax.xml.datatype.Duration)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#compare(javax.xml.datatype.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Datatype.Duration"/></param>
         /// <returns><see cref="int"/></returns>
@@ -120,7 +64,15 @@ public int Compare(Javax.Xml.Datatype.Duration arg0)
             return IExecuteWithSignature<int>("compare", "(Ljavax/xml/datatype/Duration;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getField(javax.xml.datatype.DatatypeConstants.Field)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getSign()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSign()
+        {
+            return IExecuteWithSignature<int>("getSign", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getField(javax.xml.datatype.DatatypeConstants.Field)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Datatype.DatatypeConstants.Field"/></param>
         /// <returns><see cref="Java.Lang.Number"/></returns>
@@ -129,7 +81,7 @@ public Java.Lang.Number GetField(Javax.Xml.Datatype.DatatypeConstants.Field arg0
             return IExecuteWithSignature<Java.Lang.Number>("getField", "(Ljavax/xml/datatype/DatatypeConstants$Field;)Ljava/lang/Number;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#add(javax.xml.datatype.Duration)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#add(javax.xml.datatype.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Datatype.Duration"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -138,7 +90,7 @@ public Javax.Xml.Datatype.Duration Add(Javax.Xml.Datatype.Duration arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("add", "(Ljavax/xml/datatype/Duration;)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#multiply(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#multiply(java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -147,7 +99,7 @@ public Javax.Xml.Datatype.Duration Multiply(Java.Math.BigDecimal arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("multiply", "(Ljava/math/BigDecimal;)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#negate()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#negate()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
         public Javax.Xml.Datatype.Duration Negate()
@@ -155,7 +107,7 @@ public Javax.Xml.Datatype.Duration Negate()
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("negate", "()Ljavax/xml/datatype/Duration;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#normalizeWith(java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#normalizeWith(java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Calendar"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -164,7 +116,7 @@ public Javax.Xml.Datatype.Duration NormalizeWith(Java.Util.Calendar arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("normalizeWith", "(Ljava/util/Calendar;)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#addTo(java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#addTo(java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Calendar"/></param>
         public void AddTo(Java.Util.Calendar arg0)
@@ -172,7 +124,7 @@ public void AddTo(Java.Util.Calendar arg0)
             IExecuteWithSignature("addTo", "(Ljava/util/Calendar;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#isLongerThan(javax.xml.datatype.Duration)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#isLongerThan(javax.xml.datatype.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Datatype.Duration"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -181,7 +133,7 @@ public bool IsLongerThan(Javax.Xml.Datatype.Duration arg0)
             return IExecuteWithSignature<bool>("isLongerThan", "(Ljavax/xml/datatype/Duration;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#isShorterThan(javax.xml.datatype.Duration)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#isShorterThan(javax.xml.datatype.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Datatype.Duration"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -190,7 +142,55 @@ public bool IsShorterThan(Javax.Xml.Datatype.Duration arg0)
             return IExecuteWithSignature<bool>("isShorterThan", "(Ljavax/xml/datatype/Duration;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#multiply(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getDays()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDays()
+        {
+            return IExecuteWithSignature<int>("getDays", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getHours()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetHours()
+        {
+            return IExecuteWithSignature<int>("getHours", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getMinutes()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMinutes()
+        {
+            return IExecuteWithSignature<int>("getMinutes", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getMonths()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMonths()
+        {
+            return IExecuteWithSignature<int>("getMonths", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getSeconds()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetSeconds()
+        {
+            return IExecuteWithSignature<int>("getSeconds", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getYears()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetYears()
+        {
+            return IExecuteWithSignature<int>("getYears", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#multiply(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -199,7 +199,7 @@ public Javax.Xml.Datatype.Duration Multiply(int arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("multiply", "(I)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#subtract(javax.xml.datatype.Duration)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#subtract(javax.xml.datatype.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Datatype.Duration"/></param>
         /// <returns><see cref="Javax.Xml.Datatype.Duration"/></returns>
@@ -208,7 +208,15 @@ public Javax.Xml.Datatype.Duration Subtract(Javax.Xml.Datatype.Duration arg0)
             return IExecuteWithSignature<Javax.Xml.Datatype.Duration>("subtract", "(Ljavax/xml/datatype/Duration;)Ljavax/xml/datatype/Duration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getTimeInMillis(java.util.Calendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getXMLSchemaType()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Namespace.QName"/></returns>
+        public Javax.Xml.Namespace.QName GetXMLSchemaType()
+        {
+            return IExecuteWithSignature<Javax.Xml.Namespace.QName>("getXMLSchemaType", "()Ljavax/xml/namespace/QName;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getTimeInMillis(java.util.Calendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Calendar"/></param>
         /// <returns><see cref="long"/></returns>
@@ -217,7 +225,7 @@ public long GetTimeInMillis(Java.Util.Calendar arg0)
             return IExecuteWithSignature<long>("getTimeInMillis", "(Ljava/util/Calendar;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#getTimeInMillis(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#getTimeInMillis(java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         /// <returns><see cref="long"/></returns>
@@ -226,7 +234,7 @@ public long GetTimeInMillis(Java.Util.Date arg0)
             return IExecuteWithSignature<long>("getTimeInMillis", "(Ljava/util/Date;)J", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/Duration.html#addTo(java.util.Date)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/Duration.html#addTo(java.util.Date)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Date"/></param>
         public void AddTo(Java.Util.Date arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Datatype/XMLGregorianCalendar.cs b/src/net/Netdroid/Generated/Javax/Xml/Datatype/XMLGregorianCalendar.cs
index 69f8a17db..6697453cc 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Datatype/XMLGregorianCalendar.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Datatype/XMLGregorianCalendar.cs
@@ -46,116 +46,112 @@ public partial class XMLGregorianCalendar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getDay()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setDay(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#isValid()"/>
         /// </summary>
-        public int Day
-        {
-            get { return IExecuteWithSignature<int>("getDay", "()I"); } set { IExecuteWithSignature("setDay", "(I)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getEon()"/> 
-        /// </summary>
-        public Java.Math.BigInteger Eon
-        {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getEon", "()Ljava/math/BigInteger;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getEonAndYear()"/> 
-        /// </summary>
-        public Java.Math.BigInteger EonAndYear
+        /// <returns><see cref="bool"/></returns>
+        public bool IsValid()
         {
-            get { return IExecuteWithSignature<Java.Math.BigInteger>("getEonAndYear", "()Ljava/math/BigInteger;"); }
+            return IExecuteWithSignature<bool>("isValid", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getFractionalSecond()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setFractionalSecond(java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#compare(javax.xml.datatype.XMLGregorianCalendar)"/>
         /// </summary>
-        public Java.Math.BigDecimal FractionalSecond
+        /// <param name="arg0"><see cref="Javax.Xml.Datatype.XMLGregorianCalendar"/></param>
+        /// <returns><see cref="int"/></returns>
+        public int Compare(Javax.Xml.Datatype.XMLGregorianCalendar arg0)
         {
-            get { return IExecuteWithSignature<Java.Math.BigDecimal>("getFractionalSecond", "()Ljava/math/BigDecimal;"); } set { IExecuteWithSignature("setFractionalSecond", "(Ljava/math/BigDecimal;)V", value); }
+            return IExecuteWithSignature<int>("compare", "(Ljavax/xml/datatype/XMLGregorianCalendar;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getHour()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setHour(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getDay()"/>
         /// </summary>
-        public int Hour
+        /// <returns><see cref="int"/></returns>
+        public int GetDay()
         {
-            get { return IExecuteWithSignature<int>("getHour", "()I"); } set { IExecuteWithSignature("setHour", "(I)V", value); }
+            return IExecuteWithSignature<int>("getDay", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getMillisecond()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setMillisecond(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getHour()"/>
         /// </summary>
-        public int Millisecond
+        /// <returns><see cref="int"/></returns>
+        public int GetHour()
         {
-            get { return IExecuteWithSignature<int>("getMillisecond", "()I"); } set { IExecuteWithSignature("setMillisecond", "(I)V", value); }
+            return IExecuteWithSignature<int>("getHour", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getMinute()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setMinute(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getMinute()"/>
         /// </summary>
-        public int Minute
+        /// <returns><see cref="int"/></returns>
+        public int GetMinute()
         {
-            get { return IExecuteWithSignature<int>("getMinute", "()I"); } set { IExecuteWithSignature("setMinute", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMinute", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getMonth()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setMonth(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getMonth()"/>
         /// </summary>
-        public int Month
+        /// <returns><see cref="int"/></returns>
+        public int GetMonth()
         {
-            get { return IExecuteWithSignature<int>("getMonth", "()I"); } set { IExecuteWithSignature("setMonth", "(I)V", value); }
+            return IExecuteWithSignature<int>("getMonth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getSecond()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setSecond(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getSecond()"/>
         /// </summary>
-        public int Second
+        /// <returns><see cref="int"/></returns>
+        public int GetSecond()
         {
-            get { return IExecuteWithSignature<int>("getSecond", "()I"); } set { IExecuteWithSignature("setSecond", "(I)V", value); }
+            return IExecuteWithSignature<int>("getSecond", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getTimezone()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setTimezone(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getTimezone()"/>
         /// </summary>
-        public int Timezone
+        /// <returns><see cref="int"/></returns>
+        public int GetTimezone()
         {
-            get { return IExecuteWithSignature<int>("getTimezone", "()I"); } set { IExecuteWithSignature("setTimezone", "(I)V", value); }
+            return IExecuteWithSignature<int>("getTimezone", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getXMLSchemaType()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getYear()"/>
         /// </summary>
-        public Javax.Xml.Namespace.QName XMLSchemaType
+        /// <returns><see cref="int"/></returns>
+        public int GetYear()
         {
-            get { return IExecuteWithSignature<Javax.Xml.Namespace.QName>("getXMLSchemaType", "()Ljavax/xml/namespace/QName;"); }
+            return IExecuteWithSignature<int>("getYear", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getYear()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#toXMLFormat()"/>
         /// </summary>
-        public int Year
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String ToXMLFormat()
         {
-            get { return IExecuteWithSignature<int>("getYear", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("toXMLFormat", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#isValid()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getFractionalSecond()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsValid()
+        /// <returns><see cref="Java.Math.BigDecimal"/></returns>
+        public Java.Math.BigDecimal GetFractionalSecond()
         {
-            return IExecuteWithSignature<bool>("isValid", "()Z");
+            return IExecuteWithSignature<Java.Math.BigDecimal>("getFractionalSecond", "()Ljava/math/BigDecimal;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#compare(javax.xml.datatype.XMLGregorianCalendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getEon()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Javax.Xml.Datatype.XMLGregorianCalendar"/></param>
-        /// <returns><see cref="int"/></returns>
-        public int Compare(Javax.Xml.Datatype.XMLGregorianCalendar arg0)
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetEon()
         {
-            return IExecuteWithSignature<int>("compare", "(Ljavax/xml/datatype/XMLGregorianCalendar;)I", arg0);
+            return IExecuteWithSignature<Java.Math.BigInteger>("getEon", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#toXMLFormat()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getEonAndYear()"/>
         /// </summary>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String ToXMLFormat()
+        /// <returns><see cref="Java.Math.BigInteger"/></returns>
+        public Java.Math.BigInteger GetEonAndYear()
         {
-            return IExecuteWithSignature<Java.Lang.String>("toXMLFormat", "()Ljava/lang/String;");
+            return IExecuteWithSignature<Java.Math.BigInteger>("getEonAndYear", "()Ljava/math/BigInteger;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#toGregorianCalendar()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#toGregorianCalendar()"/>
         /// </summary>
         /// <returns><see cref="Java.Util.GregorianCalendar"/></returns>
         public Java.Util.GregorianCalendar ToGregorianCalendar()
@@ -163,7 +159,7 @@ public Java.Util.GregorianCalendar ToGregorianCalendar()
             return IExecuteWithSignature<Java.Util.GregorianCalendar>("toGregorianCalendar", "()Ljava/util/GregorianCalendar;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#toGregorianCalendar(java.util.TimeZone,java.util.Locale,javax.xml.datatype.XMLGregorianCalendar)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#toGregorianCalendar(java.util.TimeZone,java.util.Locale,javax.xml.datatype.XMLGregorianCalendar)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.TimeZone"/></param>
         /// <param name="arg1"><see cref="Java.Util.Locale"/></param>
@@ -174,7 +170,7 @@ public Java.Util.GregorianCalendar ToGregorianCalendar(Java.Util.TimeZone arg0,
             return IExecute<Java.Util.GregorianCalendar>("toGregorianCalendar", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#getTimeZone(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getTimeZone(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Util.TimeZone"/></returns>
@@ -183,7 +179,7 @@ public Java.Util.TimeZone GetTimeZone(int arg0)
             return IExecuteWithSignature<Java.Util.TimeZone>("getTimeZone", "(I)Ljava/util/TimeZone;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#normalize()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#normalize()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Datatype.XMLGregorianCalendar"/></returns>
         public Javax.Xml.Datatype.XMLGregorianCalendar Normalize()
@@ -191,7 +187,15 @@ public Javax.Xml.Datatype.XMLGregorianCalendar Normalize()
             return IExecuteWithSignature<Javax.Xml.Datatype.XMLGregorianCalendar>("normalize", "()Ljavax/xml/datatype/XMLGregorianCalendar;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#add(javax.xml.datatype.Duration)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getXMLSchemaType()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Namespace.QName"/></returns>
+        public Javax.Xml.Namespace.QName GetXMLSchemaType()
+        {
+            return IExecuteWithSignature<Javax.Xml.Namespace.QName>("getXMLSchemaType", "()Ljavax/xml/namespace/QName;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#add(javax.xml.datatype.Duration)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Datatype.Duration"/></param>
         public void Add(Javax.Xml.Datatype.Duration arg0)
@@ -199,21 +203,85 @@ public void Add(Javax.Xml.Datatype.Duration arg0)
             IExecuteWithSignature("add", "(Ljavax/xml/datatype/Duration;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setYear(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setDay(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetDay(int arg0)
+        {
+            IExecuteWithSignature("setDay", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setFractionalSecond(java.math.BigDecimal)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Math.BigDecimal"/></param>
+        public void SetFractionalSecond(Java.Math.BigDecimal arg0)
+        {
+            IExecuteWithSignature("setFractionalSecond", "(Ljava/math/BigDecimal;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setHour(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetHour(int arg0)
+        {
+            IExecuteWithSignature("setHour", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setMillisecond(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMillisecond(int arg0)
+        {
+            IExecuteWithSignature("setMillisecond", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setMinute(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMinute(int arg0)
+        {
+            IExecuteWithSignature("setMinute", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setMonth(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetMonth(int arg0)
+        {
+            IExecuteWithSignature("setMonth", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setSecond(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetSecond(int arg0)
+        {
+            IExecuteWithSignature("setSecond", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setTimezone(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetTimezone(int arg0)
+        {
+            IExecuteWithSignature("setTimezone", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setYear(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void SetYear(int arg0)
@@ -221,7 +289,7 @@ public void SetYear(int arg0)
             IExecuteWithSignature("setYear", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setYear(java.math.BigInteger)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setYear(java.math.BigInteger)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Math.BigInteger"/></param>
         public void SetYear(Java.Math.BigInteger arg0)
@@ -229,7 +297,15 @@ public void SetYear(Java.Math.BigInteger arg0)
             IExecuteWithSignature("setYear", "(Ljava/math/BigInteger;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setTime(int,int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#getMillisecond()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetMillisecond()
+        {
+            return IExecuteWithSignature<int>("getMillisecond", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setTime(int,int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -240,7 +316,7 @@ public void SetTime(int arg0, int arg1, int arg2, int arg3)
             IExecute("setTime", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setTime(int,int,int,java.math.BigDecimal)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setTime(int,int,int,java.math.BigDecimal)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -251,7 +327,7 @@ public void SetTime(int arg0, int arg1, int arg2, Java.Math.BigDecimal arg3)
             IExecute("setTime", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/datatype/XMLGregorianCalendar.html#setTime(int,int,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/datatype/XMLGregorianCalendar.html#setTime(int,int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Namespace/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Namespace/AllPackageClasses.cs
index af7528360..cf01f4eda 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Namespace/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Namespace/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Namespace
 {
     #region NamespaceContext
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/NamespaceContext.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/namespace/NamespaceContext.html"/>
     /// </summary>
     public partial class NamespaceContext : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NamespaceContext>
     {
@@ -36,12 +36,12 @@ public partial class NamespaceContext : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NamespaceContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NamespaceContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NamespaceContext() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NamespaceContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NamespaceContext class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NamespaceContext(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public NamespaceContext(params object[] args) : base(args) { }
 
     #region QName
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/QName.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/namespace/QName.html"/>
     /// </summary>
     public partial class QName : Java.Io.Serializable
     {
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Namespace/NamespaceContext.cs b/src/net/Netdroid/Generated/Javax/Xml/Namespace/NamespaceContext.cs
index d0fc65b61..d3ae8d711 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Namespace/NamespaceContext.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Namespace/NamespaceContext.cs
@@ -64,7 +64,7 @@ public partial class NamespaceContext : Javax.Xml.Namespace.INamespaceContext
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/NamespaceContext.html#getNamespaceURI(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/NamespaceContext.html#getNamespaceURI(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -73,7 +73,7 @@ public Java.Lang.String GetNamespaceURI(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getNamespaceURI", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/NamespaceContext.html#getPrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/NamespaceContext.html#getPrefix(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -82,7 +82,7 @@ public Java.Lang.String GetPrefix(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getPrefix", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/NamespaceContext.html#getPrefixes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/NamespaceContext.html#getPrefixes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Iterator"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Namespace/QName.cs b/src/net/Netdroid/Generated/Javax/Xml/Namespace/QName.cs
index a33ebc777..624f8699e 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Namespace/QName.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Namespace/QName.cs
@@ -30,7 +30,7 @@ public partial class QName
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/QName.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/QName.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -40,7 +40,7 @@ public QName(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/QName.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/QName.html#%3Cinit%3E(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -49,7 +49,7 @@ public QName(Java.Lang.String arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/QName.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/QName.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public QName(Java.Lang.String arg0)
@@ -69,7 +69,7 @@ public QName(Java.Lang.String arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/QName.html#valueOf(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/QName.html#valueOf(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Namespace.QName"/></returns>
@@ -82,25 +82,28 @@ public static Javax.Xml.Namespace.QName ValueOf(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/QName.html#getLocalPart()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/QName.html#getLocalPart()"/>
         /// </summary>
-        public Java.Lang.String LocalPart
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLocalPart()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocalPart", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getLocalPart", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/QName.html#getNamespaceURI()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/QName.html#getNamespaceURI()"/>
         /// </summary>
-        public Java.Lang.String NamespaceURI
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespaceURI()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespaceURI", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNamespaceURI", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/namespace/QName.html#getPrefix()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/namespace/QName.html#getPrefix()"/>
         /// </summary>
-        public Java.Lang.String Prefix
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPrefix()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPrefix", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPrefix", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Parsers/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Parsers/AllPackageClasses.cs
index dc887e89c..0b57813fe 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Parsers/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Parsers/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Parsers
 {
     #region DocumentBuilder
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html"/>
     /// </summary>
     public partial class DocumentBuilder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DocumentBuilder>
     {
@@ -36,12 +36,12 @@ public partial class DocumentBuilder : MASES.JCOBridge.C2JBridge.JVMBridgeBase<D
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DocumentBuilder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentBuilder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentBuilder() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DocumentBuilder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentBuilder class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentBuilder(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public DocumentBuilder(params object[] args) : base(args) { }
 
     #region DocumentBuilderFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html"/>
     /// </summary>
     public partial class DocumentBuilderFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DocumentBuilderFactory>
     {
@@ -82,12 +82,12 @@ public partial class DocumentBuilderFactory : MASES.JCOBridge.C2JBridge.JVMBridg
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DocumentBuilderFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentBuilderFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentBuilderFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DocumentBuilderFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentBuilderFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentBuilderFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public DocumentBuilderFactory(params object[] args) : base(args) { }
 
     #region FactoryConfigurationError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/FactoryConfigurationError.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/parsers/FactoryConfigurationError.html"/>
     /// </summary>
     public partial class FactoryConfigurationError : Java.Lang.Error
     {
@@ -137,7 +137,7 @@ public partial class FactoryConfigurationError : Java.Lang.Error
 
     #region ParserConfigurationException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/ParserConfigurationException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/parsers/ParserConfigurationException.html"/>
     /// </summary>
     public partial class ParserConfigurationException : Java.Lang.Exception
     {
@@ -154,7 +154,7 @@ public partial class ParserConfigurationException : Java.Lang.Exception
 
     #region SAXParser
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html"/>
     /// </summary>
     public partial class SAXParser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SAXParser>
     {
@@ -162,12 +162,12 @@ public partial class SAXParser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SAXPars
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SAXParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SAXParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SAXParser() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SAXParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SAXParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SAXParser(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -200,7 +200,7 @@ public SAXParser(params object[] args) : base(args) { }
 
     #region SAXParserFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html"/>
     /// </summary>
     public partial class SAXParserFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SAXParserFactory>
     {
@@ -208,12 +208,12 @@ public partial class SAXParserFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SAXParserFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SAXParserFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SAXParserFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SAXParserFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SAXParserFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SAXParserFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Parsers/DocumentBuilder.cs b/src/net/Netdroid/Generated/Javax/Xml/Parsers/DocumentBuilder.cs
index 74453cff3..4245d417d 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Parsers/DocumentBuilder.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Parsers/DocumentBuilder.cs
@@ -46,21 +46,7 @@ public partial class DocumentBuilder
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#getDOMImplementation()"/> 
-        /// </summary>
-        public Org.W3c.Dom.DOMImplementation DOMImplementation
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.DOMImplementation>("getDOMImplementation", "()Lorg/w3c/dom/DOMImplementation;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#getSchema()"/> 
-        /// </summary>
-        public Javax.Xml.Validation.Schema Schema
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Validation.Schema>("getSchema", "()Ljavax/xml/validation/Schema;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#isNamespaceAware()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#isNamespaceAware()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNamespaceAware()
@@ -68,7 +54,7 @@ public bool IsNamespaceAware()
             return IExecuteWithSignature<bool>("isNamespaceAware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#isValidating()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#isValidating()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsValidating()
@@ -76,7 +62,7 @@ public bool IsValidating()
             return IExecuteWithSignature<bool>("isValidating", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#newDocument()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#newDocument()"/>
         /// </summary>
         /// <returns><see cref="Org.W3c.Dom.Document"/></returns>
         public Org.W3c.Dom.Document NewDocument()
@@ -84,7 +70,7 @@ public Org.W3c.Dom.Document NewDocument()
             return IExecuteWithSignature<Org.W3c.Dom.Document>("newDocument", "()Lorg/w3c/dom/Document;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#parse(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#parse(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <returns><see cref="Org.W3c.Dom.Document"/></returns>
@@ -95,7 +81,15 @@ public Org.W3c.Dom.Document Parse(Org.Xml.Sax.InputSource arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Document>("parse", "(Lorg/xml/sax/InputSource;)Lorg/w3c/dom/Document;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#getDOMImplementation()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.DOMImplementation"/></returns>
+        public Org.W3c.Dom.DOMImplementation GetDOMImplementation()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.DOMImplementation>("getDOMImplementation", "()Lorg/w3c/dom/DOMImplementation;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
         public void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
@@ -103,7 +97,7 @@ public void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
             IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
         public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
@@ -111,7 +105,7 @@ public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
             IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#isXIncludeAware()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#isXIncludeAware()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsXIncludeAware()
@@ -119,7 +113,15 @@ public bool IsXIncludeAware()
             return IExecuteWithSignature<bool>("isXIncludeAware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#parse(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#getSchema()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
+        public Javax.Xml.Validation.Schema GetSchema()
+        {
+            return IExecuteWithSignature<Javax.Xml.Validation.Schema>("getSchema", "()Ljavax/xml/validation/Schema;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#parse(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="Org.W3c.Dom.Document"/></returns>
@@ -130,7 +132,7 @@ public Org.W3c.Dom.Document Parse(Java.Io.File arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Document>("parse", "(Ljava/io/File;)Lorg/w3c/dom/Document;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#parse(java.io.InputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#parse(java.io.InputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -142,7 +144,7 @@ public Org.W3c.Dom.Document Parse(Java.Io.InputStream arg0, Java.Lang.String arg
             return IExecute<Org.W3c.Dom.Document>("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#parse(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#parse(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <returns><see cref="Org.W3c.Dom.Document"/></returns>
@@ -153,7 +155,7 @@ public Org.W3c.Dom.Document Parse(Java.Io.InputStream arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Document>("parse", "(Ljava/io/InputStream;)Lorg/w3c/dom/Document;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Document"/></returns>
@@ -164,7 +166,7 @@ public Org.W3c.Dom.Document Parse(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Document>("parse", "(Ljava/lang/String;)Lorg/w3c/dom/Document;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilder.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilder.html#reset()"/>
         /// </summary>
         public void Reset()
         {
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Parsers/DocumentBuilderFactory.cs b/src/net/Netdroid/Generated/Javax/Xml/Parsers/DocumentBuilderFactory.cs
index 1b8773fc4..2537cc53d 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Parsers/DocumentBuilderFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Parsers/DocumentBuilderFactory.cs
@@ -42,7 +42,7 @@ public partial class DocumentBuilderFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#newDefaultInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#newDefaultInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Parsers.DocumentBuilderFactory"/></returns>
         public static Javax.Xml.Parsers.DocumentBuilderFactory NewDefaultInstance()
@@ -50,15 +50,7 @@ public static Javax.Xml.Parsers.DocumentBuilderFactory NewDefaultInstance()
             return SExecuteWithSignature<Javax.Xml.Parsers.DocumentBuilderFactory>(LocalBridgeClazz, "newDefaultInstance", "()Ljavax/xml/parsers/DocumentBuilderFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#newDefaultNSInstance()"/>
-        /// </summary>
-        /// <returns><see cref="Javax.Xml.Parsers.DocumentBuilderFactory"/></returns>
-        public static Javax.Xml.Parsers.DocumentBuilderFactory NewDefaultNSInstance()
-        {
-            return SExecuteWithSignature<Javax.Xml.Parsers.DocumentBuilderFactory>(LocalBridgeClazz, "newDefaultNSInstance", "()Ljavax/xml/parsers/DocumentBuilderFactory;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#newInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#newInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Parsers.DocumentBuilderFactory"/></returns>
         public static Javax.Xml.Parsers.DocumentBuilderFactory NewInstance()
@@ -66,7 +58,7 @@ public static Javax.Xml.Parsers.DocumentBuilderFactory NewInstance()
             return SExecuteWithSignature<Javax.Xml.Parsers.DocumentBuilderFactory>(LocalBridgeClazz, "newInstance", "()Ljavax/xml/parsers/DocumentBuilderFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#newInstance(java.lang.String,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#newInstance(java.lang.String,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -75,37 +67,12 @@ public static Javax.Xml.Parsers.DocumentBuilderFactory NewInstance(Java.Lang.Str
         {
             return SExecute<Javax.Xml.Parsers.DocumentBuilderFactory>(LocalBridgeClazz, "newInstance", arg0, arg1);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#newNSInstance()"/>
-        /// </summary>
-        /// <returns><see cref="Javax.Xml.Parsers.DocumentBuilderFactory"/></returns>
-        public static Javax.Xml.Parsers.DocumentBuilderFactory NewNSInstance()
-        {
-            return SExecuteWithSignature<Javax.Xml.Parsers.DocumentBuilderFactory>(LocalBridgeClazz, "newNSInstance", "()Ljavax/xml/parsers/DocumentBuilderFactory;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#newNSInstance(java.lang.String,java.lang.ClassLoader)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
-        /// <returns><see cref="Javax.Xml.Parsers.DocumentBuilderFactory"/></returns>
-        public static Javax.Xml.Parsers.DocumentBuilderFactory NewNSInstance(Java.Lang.String arg0, Java.Lang.ClassLoader arg1)
-        {
-            return SExecute<Javax.Xml.Parsers.DocumentBuilderFactory>(LocalBridgeClazz, "newNSInstance", arg0, arg1);
-        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#getSchema()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setSchema(javax.xml.validation.Schema)"/>
-        /// </summary>
-        public Javax.Xml.Validation.Schema Schema
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Validation.Schema>("getSchema", "()Ljavax/xml/validation/Schema;"); } set { IExecuteWithSignature("setSchema", "(Ljavax/xml/validation/Schema;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -115,7 +82,7 @@ public bool GetFeature(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#getAttribute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#getAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -125,7 +92,7 @@ public object GetAttribute(Java.Lang.String arg0)
             return IExecuteWithSignature("getAttribute", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#newDocumentBuilder()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#newDocumentBuilder()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Parsers.DocumentBuilder"/></returns>
         /// <exception cref="Javax.Xml.Parsers.ParserConfigurationException"/>
@@ -134,7 +101,7 @@ public Javax.Xml.Parsers.DocumentBuilder NewDocumentBuilder()
             return IExecuteWithSignature<Javax.Xml.Parsers.DocumentBuilder>("newDocumentBuilder", "()Ljavax/xml/parsers/DocumentBuilder;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setAttribute(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setAttribute(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -144,7 +111,7 @@ public void SetAttribute(Java.Lang.String arg0, object arg1)
             IExecute("setAttribute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -154,7 +121,7 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#isCoalescing()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#isCoalescing()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsCoalescing()
@@ -162,7 +129,7 @@ public bool IsCoalescing()
             return IExecuteWithSignature<bool>("isCoalescing", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#isExpandEntityReferences()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#isExpandEntityReferences()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsExpandEntityReferences()
@@ -170,7 +137,7 @@ public bool IsExpandEntityReferences()
             return IExecuteWithSignature<bool>("isExpandEntityReferences", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#isIgnoringComments()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#isIgnoringComments()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsIgnoringComments()
@@ -178,7 +145,7 @@ public bool IsIgnoringComments()
             return IExecuteWithSignature<bool>("isIgnoringComments", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#isIgnoringElementContentWhitespace()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#isIgnoringElementContentWhitespace()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsIgnoringElementContentWhitespace()
@@ -186,7 +153,7 @@ public bool IsIgnoringElementContentWhitespace()
             return IExecuteWithSignature<bool>("isIgnoringElementContentWhitespace", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#isNamespaceAware()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#isNamespaceAware()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNamespaceAware()
@@ -194,7 +161,7 @@ public bool IsNamespaceAware()
             return IExecuteWithSignature<bool>("isNamespaceAware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#isValidating()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#isValidating()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsValidating()
@@ -202,7 +169,7 @@ public bool IsValidating()
             return IExecuteWithSignature<bool>("isValidating", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#isXIncludeAware()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#isXIncludeAware()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsXIncludeAware()
@@ -210,7 +177,15 @@ public bool IsXIncludeAware()
             return IExecuteWithSignature<bool>("isXIncludeAware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setCoalescing(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#getSchema()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
+        public Javax.Xml.Validation.Schema GetSchema()
+        {
+            return IExecuteWithSignature<Javax.Xml.Validation.Schema>("getSchema", "()Ljavax/xml/validation/Schema;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setCoalescing(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetCoalescing(bool arg0)
@@ -218,7 +193,7 @@ public void SetCoalescing(bool arg0)
             IExecuteWithSignature("setCoalescing", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setExpandEntityReferences(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setExpandEntityReferences(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetExpandEntityReferences(bool arg0)
@@ -226,7 +201,7 @@ public void SetExpandEntityReferences(bool arg0)
             IExecuteWithSignature("setExpandEntityReferences", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setIgnoringComments(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setIgnoringComments(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetIgnoringComments(bool arg0)
@@ -234,7 +209,7 @@ public void SetIgnoringComments(bool arg0)
             IExecuteWithSignature("setIgnoringComments", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setIgnoringElementContentWhitespace(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setIgnoringElementContentWhitespace(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetIgnoringElementContentWhitespace(bool arg0)
@@ -242,7 +217,7 @@ public void SetIgnoringElementContentWhitespace(bool arg0)
             IExecuteWithSignature("setIgnoringElementContentWhitespace", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setNamespaceAware(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setNamespaceAware(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetNamespaceAware(bool arg0)
@@ -250,7 +225,15 @@ public void SetNamespaceAware(bool arg0)
             IExecuteWithSignature("setNamespaceAware", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setValidating(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setSchema(javax.xml.validation.Schema)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Validation.Schema"/></param>
+        public void SetSchema(Javax.Xml.Validation.Schema arg0)
+        {
+            IExecuteWithSignature("setSchema", "(Ljavax/xml/validation/Schema;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setValidating(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetValidating(bool arg0)
@@ -258,7 +241,7 @@ public void SetValidating(bool arg0)
             IExecuteWithSignature("setValidating", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/DocumentBuilderFactory.html#setXIncludeAware(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/DocumentBuilderFactory.html#setXIncludeAware(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetXIncludeAware(bool arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Parsers/SAXParser.cs b/src/net/Netdroid/Generated/Javax/Xml/Parsers/SAXParser.cs
index 143c040fb..c927b5205 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Parsers/SAXParser.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Parsers/SAXParser.cs
@@ -46,28 +46,7 @@ public partial class SAXParser
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#getParser()"/> 
-        /// </summary>
-        public Org.Xml.Sax.Parser Parser
-        {
-            get { return IExecuteWithSignature<Org.Xml.Sax.Parser>("getParser", "()Lorg/xml/sax/Parser;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#getSchema()"/> 
-        /// </summary>
-        public Javax.Xml.Validation.Schema Schema
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Validation.Schema>("getSchema", "()Ljavax/xml/validation/Schema;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#getXMLReader()"/> 
-        /// </summary>
-        public Org.Xml.Sax.XMLReader XMLReader
-        {
-            get { return IExecuteWithSignature<Org.Xml.Sax.XMLReader>("getXMLReader", "()Lorg/xml/sax/XMLReader;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#isNamespaceAware()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#isNamespaceAware()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNamespaceAware()
@@ -75,7 +54,7 @@ public bool IsNamespaceAware()
             return IExecuteWithSignature<bool>("isNamespaceAware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#isValidating()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#isValidating()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsValidating()
@@ -83,7 +62,7 @@ public bool IsValidating()
             return IExecuteWithSignature<bool>("isValidating", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -94,7 +73,25 @@ public object GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#getParser()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Xml.Sax.Parser"/></returns>
+        /// <exception cref="Org.Xml.Sax.SAXException"/>
+        public Org.Xml.Sax.Parser GetParser()
+        {
+            return IExecuteWithSignature<Org.Xml.Sax.Parser>("getParser", "()Lorg/xml/sax/Parser;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#getXMLReader()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Xml.Sax.XMLReader"/></returns>
+        /// <exception cref="Org.Xml.Sax.SAXException"/>
+        public Org.Xml.Sax.XMLReader GetXMLReader()
+        {
+            return IExecuteWithSignature<Org.Xml.Sax.XMLReader>("getXMLReader", "()Lorg/xml/sax/XMLReader;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -105,7 +102,7 @@ public void SetProperty(Java.Lang.String arg0, object arg1)
             IExecute("setProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#isXIncludeAware()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#isXIncludeAware()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsXIncludeAware()
@@ -113,7 +110,15 @@ public bool IsXIncludeAware()
             return IExecuteWithSignature<bool>("isXIncludeAware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(java.io.File,org.xml.sax.HandlerBase)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#getSchema()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
+        public Javax.Xml.Validation.Schema GetSchema()
+        {
+            return IExecuteWithSignature<Javax.Xml.Validation.Schema>("getSchema", "()Ljavax/xml/validation/Schema;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(java.io.File,org.xml.sax.HandlerBase)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.HandlerBase"/></param>
@@ -124,7 +129,7 @@ public void Parse(Java.Io.File arg0, Org.Xml.Sax.HandlerBase arg1)
             IExecute("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(java.io.File,org.xml.sax.helpers.DefaultHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(java.io.File,org.xml.sax.helpers.DefaultHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.Helpers.DefaultHandler"/></param>
@@ -135,7 +140,7 @@ public void Parse(Java.Io.File arg0, Org.Xml.Sax.Helpers.DefaultHandler arg1)
             IExecute("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(java.io.InputStream,org.xml.sax.HandlerBase,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(java.io.InputStream,org.xml.sax.HandlerBase,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.HandlerBase"/></param>
@@ -147,7 +152,7 @@ public void Parse(Java.Io.InputStream arg0, Org.Xml.Sax.HandlerBase arg1, Java.L
             IExecute("parse", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(java.io.InputStream,org.xml.sax.HandlerBase)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(java.io.InputStream,org.xml.sax.HandlerBase)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.HandlerBase"/></param>
@@ -158,7 +163,7 @@ public void Parse(Java.Io.InputStream arg0, Org.Xml.Sax.HandlerBase arg1)
             IExecute("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(java.io.InputStream,org.xml.sax.helpers.DefaultHandler,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(java.io.InputStream,org.xml.sax.helpers.DefaultHandler,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.Helpers.DefaultHandler"/></param>
@@ -170,7 +175,7 @@ public void Parse(Java.Io.InputStream arg0, Org.Xml.Sax.Helpers.DefaultHandler a
             IExecute("parse", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(java.io.InputStream,org.xml.sax.helpers.DefaultHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(java.io.InputStream,org.xml.sax.helpers.DefaultHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.Helpers.DefaultHandler"/></param>
@@ -181,7 +186,7 @@ public void Parse(Java.Io.InputStream arg0, Org.Xml.Sax.Helpers.DefaultHandler a
             IExecute("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(java.lang.String,org.xml.sax.HandlerBase)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(java.lang.String,org.xml.sax.HandlerBase)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.HandlerBase"/></param>
@@ -192,7 +197,7 @@ public void Parse(Java.Lang.String arg0, Org.Xml.Sax.HandlerBase arg1)
             IExecute("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(java.lang.String,org.xml.sax.helpers.DefaultHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(java.lang.String,org.xml.sax.helpers.DefaultHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.Helpers.DefaultHandler"/></param>
@@ -203,7 +208,7 @@ public void Parse(Java.Lang.String arg0, Org.Xml.Sax.Helpers.DefaultHandler arg1
             IExecute("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(org.xml.sax.InputSource,org.xml.sax.HandlerBase)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(org.xml.sax.InputSource,org.xml.sax.HandlerBase)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.HandlerBase"/></param>
@@ -214,7 +219,7 @@ public void Parse(Org.Xml.Sax.InputSource arg0, Org.Xml.Sax.HandlerBase arg1)
             IExecute("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#parse(org.xml.sax.InputSource,org.xml.sax.helpers.DefaultHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#parse(org.xml.sax.InputSource,org.xml.sax.helpers.DefaultHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.Helpers.DefaultHandler"/></param>
@@ -225,7 +230,7 @@ public void Parse(Org.Xml.Sax.InputSource arg0, Org.Xml.Sax.Helpers.DefaultHandl
             IExecute("parse", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParser.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParser.html#reset()"/>
         /// </summary>
         public void Reset()
         {
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Parsers/SAXParserFactory.cs b/src/net/Netdroid/Generated/Javax/Xml/Parsers/SAXParserFactory.cs
index 798a342f3..52c5e0fea 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Parsers/SAXParserFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Parsers/SAXParserFactory.cs
@@ -42,7 +42,7 @@ public partial class SAXParserFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#newDefaultInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#newDefaultInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Parsers.SAXParserFactory"/></returns>
         public static Javax.Xml.Parsers.SAXParserFactory NewDefaultInstance()
@@ -50,15 +50,7 @@ public static Javax.Xml.Parsers.SAXParserFactory NewDefaultInstance()
             return SExecuteWithSignature<Javax.Xml.Parsers.SAXParserFactory>(LocalBridgeClazz, "newDefaultInstance", "()Ljavax/xml/parsers/SAXParserFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#newDefaultNSInstance()"/>
-        /// </summary>
-        /// <returns><see cref="Javax.Xml.Parsers.SAXParserFactory"/></returns>
-        public static Javax.Xml.Parsers.SAXParserFactory NewDefaultNSInstance()
-        {
-            return SExecuteWithSignature<Javax.Xml.Parsers.SAXParserFactory>(LocalBridgeClazz, "newDefaultNSInstance", "()Ljavax/xml/parsers/SAXParserFactory;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#newInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#newInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Parsers.SAXParserFactory"/></returns>
         public static Javax.Xml.Parsers.SAXParserFactory NewInstance()
@@ -66,7 +58,7 @@ public static Javax.Xml.Parsers.SAXParserFactory NewInstance()
             return SExecuteWithSignature<Javax.Xml.Parsers.SAXParserFactory>(LocalBridgeClazz, "newInstance", "()Ljavax/xml/parsers/SAXParserFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#newInstance(java.lang.String,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#newInstance(java.lang.String,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -75,37 +67,12 @@ public static Javax.Xml.Parsers.SAXParserFactory NewInstance(Java.Lang.String ar
         {
             return SExecute<Javax.Xml.Parsers.SAXParserFactory>(LocalBridgeClazz, "newInstance", arg0, arg1);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#newNSInstance()"/>
-        /// </summary>
-        /// <returns><see cref="Javax.Xml.Parsers.SAXParserFactory"/></returns>
-        public static Javax.Xml.Parsers.SAXParserFactory NewNSInstance()
-        {
-            return SExecuteWithSignature<Javax.Xml.Parsers.SAXParserFactory>(LocalBridgeClazz, "newNSInstance", "()Ljavax/xml/parsers/SAXParserFactory;");
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#newNSInstance(java.lang.String,java.lang.ClassLoader)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
-        /// <returns><see cref="Javax.Xml.Parsers.SAXParserFactory"/></returns>
-        public static Javax.Xml.Parsers.SAXParserFactory NewNSInstance(Java.Lang.String arg0, Java.Lang.ClassLoader arg1)
-        {
-            return SExecute<Javax.Xml.Parsers.SAXParserFactory>(LocalBridgeClazz, "newNSInstance", arg0, arg1);
-        }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#getSchema()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#setSchema(javax.xml.validation.Schema)"/>
-        /// </summary>
-        public Javax.Xml.Validation.Schema Schema
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Validation.Schema>("getSchema", "()Ljavax/xml/validation/Schema;"); } set { IExecuteWithSignature("setSchema", "(Ljavax/xml/validation/Schema;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -117,7 +84,7 @@ public bool GetFeature(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#newSAXParser()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#newSAXParser()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Parsers.SAXParser"/></returns>
         /// <exception cref="Javax.Xml.Parsers.ParserConfigurationException"/>
@@ -127,7 +94,7 @@ public Javax.Xml.Parsers.SAXParser NewSAXParser()
             return IExecuteWithSignature<Javax.Xml.Parsers.SAXParser>("newSAXParser", "()Ljavax/xml/parsers/SAXParser;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -139,7 +106,7 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#isNamespaceAware()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#isNamespaceAware()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNamespaceAware()
@@ -147,7 +114,7 @@ public bool IsNamespaceAware()
             return IExecuteWithSignature<bool>("isNamespaceAware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#isValidating()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#isValidating()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsValidating()
@@ -155,7 +122,7 @@ public bool IsValidating()
             return IExecuteWithSignature<bool>("isValidating", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#isXIncludeAware()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#isXIncludeAware()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsXIncludeAware()
@@ -163,7 +130,15 @@ public bool IsXIncludeAware()
             return IExecuteWithSignature<bool>("isXIncludeAware", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#setNamespaceAware(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#getSchema()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
+        public Javax.Xml.Validation.Schema GetSchema()
+        {
+            return IExecuteWithSignature<Javax.Xml.Validation.Schema>("getSchema", "()Ljavax/xml/validation/Schema;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#setNamespaceAware(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetNamespaceAware(bool arg0)
@@ -171,7 +146,15 @@ public void SetNamespaceAware(bool arg0)
             IExecuteWithSignature("setNamespaceAware", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#setValidating(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#setSchema(javax.xml.validation.Schema)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Validation.Schema"/></param>
+        public void SetSchema(Javax.Xml.Validation.Schema arg0)
+        {
+            IExecuteWithSignature("setSchema", "(Ljavax/xml/validation/Schema;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#setValidating(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetValidating(bool arg0)
@@ -179,7 +162,7 @@ public void SetValidating(bool arg0)
             IExecuteWithSignature("setValidating", "(Z)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/parsers/SAXParserFactory.html#setXIncludeAware(boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/parsers/SAXParserFactory.html#setXIncludeAware(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetXIncludeAware(bool arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/AllPackageClasses.cs
index af2e81b7f..73de9a925 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Transform
 {
     #region ErrorListener
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html"/>
     /// </summary>
     public partial class ErrorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -37,10 +37,13 @@ public partial class ErrorListener : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public ErrorListener() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.javax.xml.transform.ErrorListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.javax.xml.transform.ErrorListener";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -62,10 +65,13 @@ public partial class ErrorListenerDirect : ErrorListener
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "javax.xml.transform.ErrorListener";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "javax.xml.transform.ErrorListener";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -87,7 +93,7 @@ protected override void InitializeHandlers() { }
 
     #region OutputKeys
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html"/>
     /// </summary>
     public partial class OutputKeys : MASES.JCOBridge.C2JBridge.JVMBridgeBase<OutputKeys>
     {
@@ -131,7 +137,7 @@ public OutputKeys(params object[] args) : base(args) { }
 
     #region Result
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Result.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/Result.html"/>
     /// </summary>
     public partial class Result : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Result>
     {
@@ -139,12 +145,12 @@ public partial class Result : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Result>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Result class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Result class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Result() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Result class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Result class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Result(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -177,7 +183,7 @@ public Result(params object[] args) : base(args) { }
 
     #region Source
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Source.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/Source.html"/>
     /// </summary>
     public partial class Source : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Source>
     {
@@ -185,12 +191,12 @@ public partial class Source : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Source>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Source class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Source class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Source() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Source class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Source class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Source(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -223,7 +229,7 @@ public Source(params object[] args) : base(args) { }
 
     #region SourceLocator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/SourceLocator.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/SourceLocator.html"/>
     /// </summary>
     public partial class SourceLocator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SourceLocator>
     {
@@ -231,12 +237,12 @@ public partial class SourceLocator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sou
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SourceLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SourceLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SourceLocator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SourceLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SourceLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SourceLocator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -269,7 +275,7 @@ public SourceLocator(params object[] args) : base(args) { }
 
     #region Templates
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Templates.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/Templates.html"/>
     /// </summary>
     public partial class Templates : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Templates>
     {
@@ -277,12 +283,12 @@ public partial class Templates : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Templat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Templates class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Templates class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Templates() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Templates class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Templates class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Templates(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -315,7 +321,7 @@ public Templates(params object[] args) : base(args) { }
 
     #region Transformer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html"/>
     /// </summary>
     public partial class Transformer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Transformer>
     {
@@ -323,12 +329,12 @@ public partial class Transformer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Trans
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Transformer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Transformer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Transformer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Transformer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Transformer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Transformer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -361,7 +367,7 @@ public Transformer(params object[] args) : base(args) { }
 
     #region TransformerConfigurationException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerConfigurationException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerConfigurationException.html"/>
     /// </summary>
     public partial class TransformerConfigurationException : Javax.Xml.Transform.TransformerException
     {
@@ -378,7 +384,7 @@ public partial class TransformerConfigurationException : Javax.Xml.Transform.Tra
 
     #region TransformerException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerException.html"/>
     /// </summary>
     public partial class TransformerException : Java.Lang.Exception
     {
@@ -395,7 +401,7 @@ public partial class TransformerException : Java.Lang.Exception
 
     #region TransformerFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html"/>
     /// </summary>
     public partial class TransformerFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TransformerFactory>
     {
@@ -403,12 +409,12 @@ public partial class TransformerFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TransformerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransformerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransformerFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TransformerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransformerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransformerFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -441,7 +447,7 @@ public TransformerFactory(params object[] args) : base(args) { }
 
     #region TransformerFactoryConfigurationError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactoryConfigurationError.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactoryConfigurationError.html"/>
     /// </summary>
     public partial class TransformerFactoryConfigurationError : Java.Lang.Error
     {
@@ -458,7 +464,7 @@ public partial class TransformerFactoryConfigurationError : Java.Lang.Error
 
     #region URIResolver
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/URIResolver.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/URIResolver.html"/>
     /// </summary>
     public partial class URIResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URIResolver>
     {
@@ -466,12 +472,12 @@ public partial class URIResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<URIRe
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("URIResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("URIResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public URIResolver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("URIResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("URIResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public URIResolver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/AllPackageClasses.cs
index 356a600a8..6e29bd922 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Transform.Dom
 {
     #region DOMLocator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMLocator.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMLocator.html"/>
     /// </summary>
     public partial class DOMLocator : Javax.Xml.Transform.SourceLocator
     {
@@ -36,12 +36,12 @@ public partial class DOMLocator : Javax.Xml.Transform.SourceLocator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMLocator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMLocator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public DOMLocator(params object[] args) : base(args) { }
 
     #region DOMResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html"/>
     /// </summary>
     public partial class DOMResult : Javax.Xml.Transform.Result
     {
@@ -118,7 +118,7 @@ public DOMResult(params object[] args) : base(args) { }
 
     #region DOMSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html"/>
     /// </summary>
     public partial class DOMSource : Javax.Xml.Transform.Source
     {
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMLocator.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMLocator.cs
index deb6ccd6f..75494b576 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMLocator.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMLocator.cs
@@ -64,11 +64,12 @@ public partial class DOMLocator : Javax.Xml.Transform.Dom.IDOMLocator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMLocator.html#getOriginatingNode()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMLocator.html#getOriginatingNode()"/>
         /// </summary>
-        public Org.W3c.Dom.Node OriginatingNode
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node GetOriginatingNode()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getOriginatingNode", "()Lorg/w3c/dom/Node;"); }
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getOriginatingNode", "()Lorg/w3c/dom/Node;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMResult.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMResult.cs
index 73c34c69b..d458e8707 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMResult.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMResult.cs
@@ -30,7 +30,7 @@ public partial class DOMResult
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#%3Cinit%3E(org.w3c.dom.Node,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#%3Cinit%3E(org.w3c.dom.Node,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public DOMResult(Org.W3c.Dom.Node arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#%3Cinit%3E(org.w3c.dom.Node,org.w3c.dom.Node,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#%3Cinit%3E(org.w3c.dom.Node,org.w3c.dom.Node,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Org.W3c.Dom.Node"/></param>
@@ -49,7 +49,7 @@ public DOMResult(Org.W3c.Dom.Node arg0, Org.W3c.Dom.Node arg1, Java.Lang.String
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#%3Cinit%3E(org.w3c.dom.Node,org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#%3Cinit%3E(org.w3c.dom.Node,org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Org.W3c.Dom.Node"/></param>
@@ -58,7 +58,7 @@ public DOMResult(Org.W3c.Dom.Node arg0, Org.W3c.Dom.Node arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#%3Cinit%3E(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#%3Cinit%3E(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         public DOMResult(Org.W3c.Dom.Node arg0)
@@ -74,7 +74,7 @@ public DOMResult(Org.W3c.Dom.Node arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#FEATURE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#FEATURE"/>
         /// </summary>
         public static Java.Lang.String FEATURE { get { if (!_FEATUREReady) { _FEATUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE"); _FEATUREReady = true; } return _FEATUREContent; } }
         private static Java.Lang.String _FEATUREContent = default;
@@ -88,25 +88,52 @@ public DOMResult(Org.W3c.Dom.Node arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#getNextSibling()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#setNextSibling(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#getSystemId()"/>
         /// </summary>
-        public Org.W3c.Dom.Node NextSibling
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getNextSibling", "()Lorg/w3c/dom/Node;"); } set { IExecuteWithSignature("setNextSibling", "(Lorg/w3c/dom/Node;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#getNode()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#setNode(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#getNextSibling()"/>
         /// </summary>
-        public Org.W3c.Dom.Node Node
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node GetNextSibling()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getNode", "()Lorg/w3c/dom/Node;"); } set { IExecuteWithSignature("setNode", "(Lorg/w3c/dom/Node;)V", value); }
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getNextSibling", "()Lorg/w3c/dom/Node;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMResult.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#getNode()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node GetNode()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getNode", "()Lorg/w3c/dom/Node;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#setNextSibling(org.w3c.dom.Node)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
+        public void SetNextSibling(Org.W3c.Dom.Node arg0)
+        {
+            IExecuteWithSignature("setNextSibling", "(Lorg/w3c/dom/Node;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#setNode(org.w3c.dom.Node)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
+        public void SetNode(Org.W3c.Dom.Node arg0)
+        {
+            IExecuteWithSignature("setNode", "(Lorg/w3c/dom/Node;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMResult.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMSource.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMSource.cs
index 1ce3853eb..24b6a3bb0 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMSource.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Dom/DOMSource.cs
@@ -30,7 +30,7 @@ public partial class DOMSource
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html#%3Cinit%3E(org.w3c.dom.Node,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html#%3Cinit%3E(org.w3c.dom.Node,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -39,7 +39,7 @@ public DOMSource(Org.W3c.Dom.Node arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html#%3Cinit%3E(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html#%3Cinit%3E(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         public DOMSource(Org.W3c.Dom.Node arg0)
@@ -55,7 +55,7 @@ public DOMSource(Org.W3c.Dom.Node arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html#FEATURE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html#FEATURE"/>
         /// </summary>
         public static Java.Lang.String FEATURE { get { if (!_FEATUREReady) { _FEATUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE"); _FEATUREReady = true; } return _FEATUREContent; } }
         private static Java.Lang.String _FEATUREContent = default;
@@ -69,26 +69,44 @@ public DOMSource(Org.W3c.Dom.Node arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html#getNode()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html#setNode(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html#isEmpty()"/>
         /// </summary>
-        public Org.W3c.Dom.Node Node
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEmpty()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getNode", "()Lorg/w3c/dom/Node;"); } set { IExecuteWithSignature("setNode", "(Lorg/w3c/dom/Node;)V", value); }
+            return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/dom/DOMSource.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html#getNode()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEmpty()
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node GetNode()
         {
-            return IExecuteWithSignature<bool>("isEmpty", "()Z");
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getNode", "()Lorg/w3c/dom/Node;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html#setNode(org.w3c.dom.Node)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
+        public void SetNode(Org.W3c.Dom.Node arg0)
+        {
+            IExecuteWithSignature("setNode", "(Lorg/w3c/dom/Node;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/dom/DOMSource.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/ErrorListener.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/ErrorListener.cs
index bbb8866fd..34a4150bf 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/ErrorListener.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/ErrorListener.cs
@@ -27,7 +27,7 @@ namespace Javax.Xml.Transform
 {
     #region IErrorListener
     /// <summary>
-    /// .NET interface for org.mases.netdroid.generated.javax.xml.transform.ErrorListener implementing <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html"/>
+    /// .NET interface for org.mases.netdroid.generated.javax.xml.transform.ErrorListener implementing <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html"/>
     /// </summary>
     public partial interface IErrorListener
     {
@@ -68,17 +68,17 @@ public partial class ErrorListener : Javax.Xml.Transform.IErrorListener
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("error", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(ErrorEventHandler));
-            AddEventHandler("fatalError", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(FatalErrorEventHandler));
-            AddEventHandler("warning", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(WarningEventHandler));
+            AddEventHandler("error", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(ErrorEventHandler));
+            AddEventHandler("fatalError", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(FatalErrorEventHandler));
+            AddEventHandler("warning", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(WarningEventHandler));
 
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#error(javax.xml.transform.TransformerException)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#error(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <remarks>If <see cref="OnError"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnError { get; set; } = null;
+        public global::System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnError { get; set; } = null;
 
         void ErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -87,7 +87,7 @@ void ErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#error(javax.xml.transform.TransformerException)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#error(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.TransformerException"/></param>
         /// <exception cref="Javax.Xml.Transform.TransformerException"/>
@@ -97,10 +97,10 @@ public virtual void Error(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#fatalError(javax.xml.transform.TransformerException)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#fatalError(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <remarks>If <see cref="OnFatalError"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnFatalError { get; set; } = null;
+        public global::System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnFatalError { get; set; } = null;
 
         void FatalErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -109,7 +109,7 @@ void FatalErrorEventHandler(object sender, CLRListenerEventArgs<CLREventData> da
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#fatalError(javax.xml.transform.TransformerException)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#fatalError(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.TransformerException"/></param>
         /// <exception cref="Javax.Xml.Transform.TransformerException"/>
@@ -119,10 +119,10 @@ public virtual void FatalError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#warning(javax.xml.transform.TransformerException)"/>
+        /// Handler for <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#warning(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <remarks>If <see cref="OnWarning"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnWarning { get; set; } = null;
+        public global::System.Action<MASES.JCOBridge.C2JBridge.JVMBridgeException> OnWarning { get; set; } = null;
 
         void WarningEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -131,7 +131,7 @@ void WarningEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#warning(javax.xml.transform.TransformerException)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#warning(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.TransformerException"/></param>
         /// <exception cref="Javax.Xml.Transform.TransformerException"/>
@@ -171,7 +171,7 @@ public partial class ErrorListenerDirect : Javax.Xml.Transform.IErrorListener
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#error(javax.xml.transform.TransformerException)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#error(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.TransformerException"/></param>
         /// <exception cref="Javax.Xml.Transform.TransformerException"/>
@@ -180,7 +180,7 @@ public override void Error(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("error", "(Ljavax/xml/transform/TransformerException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#fatalError(javax.xml.transform.TransformerException)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#fatalError(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.TransformerException"/></param>
         /// <exception cref="Javax.Xml.Transform.TransformerException"/>
@@ -189,7 +189,7 @@ public override void FatalError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg
             IExecuteWithSignature("fatalError", "(Ljavax/xml/transform/TransformerException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/ErrorListener.html#warning(javax.xml.transform.TransformerException)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/ErrorListener.html#warning(javax.xml.transform.TransformerException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.TransformerException"/></param>
         /// <exception cref="Javax.Xml.Transform.TransformerException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/OutputKeys.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/OutputKeys.cs
index f51d22fe7..acea9b57b 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/OutputKeys.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/OutputKeys.cs
@@ -38,61 +38,61 @@ public partial class OutputKeys
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#CDATA_SECTION_ELEMENTS"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#CDATA_SECTION_ELEMENTS"/>
         /// </summary>
         public static Java.Lang.String CDATA_SECTION_ELEMENTS { get { if (!_CDATA_SECTION_ELEMENTSReady) { _CDATA_SECTION_ELEMENTSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CDATA_SECTION_ELEMENTS"); _CDATA_SECTION_ELEMENTSReady = true; } return _CDATA_SECTION_ELEMENTSContent; } }
         private static Java.Lang.String _CDATA_SECTION_ELEMENTSContent = default;
         private static bool _CDATA_SECTION_ELEMENTSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#DOCTYPE_PUBLIC"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#DOCTYPE_PUBLIC"/>
         /// </summary>
         public static Java.Lang.String DOCTYPE_PUBLIC { get { if (!_DOCTYPE_PUBLICReady) { _DOCTYPE_PUBLICContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DOCTYPE_PUBLIC"); _DOCTYPE_PUBLICReady = true; } return _DOCTYPE_PUBLICContent; } }
         private static Java.Lang.String _DOCTYPE_PUBLICContent = default;
         private static bool _DOCTYPE_PUBLICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#DOCTYPE_SYSTEM"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#DOCTYPE_SYSTEM"/>
         /// </summary>
         public static Java.Lang.String DOCTYPE_SYSTEM { get { if (!_DOCTYPE_SYSTEMReady) { _DOCTYPE_SYSTEMContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DOCTYPE_SYSTEM"); _DOCTYPE_SYSTEMReady = true; } return _DOCTYPE_SYSTEMContent; } }
         private static Java.Lang.String _DOCTYPE_SYSTEMContent = default;
         private static bool _DOCTYPE_SYSTEMReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#ENCODING"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#ENCODING"/>
         /// </summary>
         public static Java.Lang.String ENCODING { get { if (!_ENCODINGReady) { _ENCODINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ENCODING"); _ENCODINGReady = true; } return _ENCODINGContent; } }
         private static Java.Lang.String _ENCODINGContent = default;
         private static bool _ENCODINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#INDENT"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#INDENT"/>
         /// </summary>
         public static Java.Lang.String INDENT { get { if (!_INDENTReady) { _INDENTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "INDENT"); _INDENTReady = true; } return _INDENTContent; } }
         private static Java.Lang.String _INDENTContent = default;
         private static bool _INDENTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#MEDIA_TYPE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#MEDIA_TYPE"/>
         /// </summary>
         public static Java.Lang.String MEDIA_TYPE { get { if (!_MEDIA_TYPEReady) { _MEDIA_TYPEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MEDIA_TYPE"); _MEDIA_TYPEReady = true; } return _MEDIA_TYPEContent; } }
         private static Java.Lang.String _MEDIA_TYPEContent = default;
         private static bool _MEDIA_TYPEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#METHOD"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#METHOD"/>
         /// </summary>
         public static Java.Lang.String METHOD { get { if (!_METHODReady) { _METHODContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "METHOD"); _METHODReady = true; } return _METHODContent; } }
         private static Java.Lang.String _METHODContent = default;
         private static bool _METHODReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#OMIT_XML_DECLARATION"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#OMIT_XML_DECLARATION"/>
         /// </summary>
         public static Java.Lang.String OMIT_XML_DECLARATION { get { if (!_OMIT_XML_DECLARATIONReady) { _OMIT_XML_DECLARATIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "OMIT_XML_DECLARATION"); _OMIT_XML_DECLARATIONReady = true; } return _OMIT_XML_DECLARATIONContent; } }
         private static Java.Lang.String _OMIT_XML_DECLARATIONContent = default;
         private static bool _OMIT_XML_DECLARATIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#STANDALONE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#STANDALONE"/>
         /// </summary>
         public static Java.Lang.String STANDALONE { get { if (!_STANDALONEReady) { _STANDALONEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "STANDALONE"); _STANDALONEReady = true; } return _STANDALONEContent; } }
         private static Java.Lang.String _STANDALONEContent = default;
         private static bool _STANDALONEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/OutputKeys.html#VERSION"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/OutputKeys.html#VERSION"/>
         /// </summary>
         public static Java.Lang.String VERSION { get { if (!_VERSIONReady) { _VERSIONContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "VERSION"); _VERSIONReady = true; } return _VERSIONContent; } }
         private static Java.Lang.String _VERSIONContent = default;
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Result.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Result.cs
index a94b78f5b..9c396d1ae 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Result.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Result.cs
@@ -56,13 +56,13 @@ public partial class Result : Javax.Xml.Transform.IResult
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Result.html#PI_DISABLE_OUTPUT_ESCAPING"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Result.html#PI_DISABLE_OUTPUT_ESCAPING"/>
         /// </summary>
         public static Java.Lang.String PI_DISABLE_OUTPUT_ESCAPING { get { if (!_PI_DISABLE_OUTPUT_ESCAPINGReady) { _PI_DISABLE_OUTPUT_ESCAPINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PI_DISABLE_OUTPUT_ESCAPING"); _PI_DISABLE_OUTPUT_ESCAPINGReady = true; } return _PI_DISABLE_OUTPUT_ESCAPINGContent; } }
         private static Java.Lang.String _PI_DISABLE_OUTPUT_ESCAPINGContent = default;
         private static bool _PI_DISABLE_OUTPUT_ESCAPINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Result.html#PI_ENABLE_OUTPUT_ESCAPING"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Result.html#PI_ENABLE_OUTPUT_ESCAPING"/>
         /// </summary>
         public static Java.Lang.String PI_ENABLE_OUTPUT_ESCAPING { get { if (!_PI_ENABLE_OUTPUT_ESCAPINGReady) { _PI_ENABLE_OUTPUT_ESCAPINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "PI_ENABLE_OUTPUT_ESCAPING"); _PI_ENABLE_OUTPUT_ESCAPINGReady = true; } return _PI_ENABLE_OUTPUT_ESCAPINGContent; } }
         private static Java.Lang.String _PI_ENABLE_OUTPUT_ESCAPINGContent = default;
@@ -76,11 +76,20 @@ public partial class Result : Javax.Xml.Transform.IResult
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Result.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Result.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Result.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Result.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/AllPackageClasses.cs
index 2e83fe31d..2a0c0f8f9 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Transform.Sax
 {
     #region SAXResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html"/>
     /// </summary>
     public partial class SAXResult : Javax.Xml.Transform.Result
     {
@@ -72,7 +72,7 @@ public SAXResult(params object[] args) : base(args) { }
 
     #region SAXSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html"/>
     /// </summary>
     public partial class SAXSource : Javax.Xml.Transform.Source
     {
@@ -116,7 +116,7 @@ public SAXSource(params object[] args) : base(args) { }
 
     #region SAXTransformerFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html"/>
     /// </summary>
     public partial class SAXTransformerFactory : Javax.Xml.Transform.TransformerFactory
     {
@@ -124,12 +124,12 @@ public partial class SAXTransformerFactory : Javax.Xml.Transform.TransformerFact
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SAXTransformerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SAXTransformerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SAXTransformerFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SAXTransformerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SAXTransformerFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SAXTransformerFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -162,7 +162,7 @@ public SAXTransformerFactory(params object[] args) : base(args) { }
 
     #region TemplatesHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TemplatesHandler.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TemplatesHandler.html"/>
     /// </summary>
     public partial class TemplatesHandler : Org.Xml.Sax.ContentHandler
     {
@@ -170,12 +170,12 @@ public partial class TemplatesHandler : Org.Xml.Sax.ContentHandler
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TemplatesHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemplatesHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemplatesHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TemplatesHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TemplatesHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TemplatesHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -208,7 +208,7 @@ public TemplatesHandler(params object[] args) : base(args) { }
 
     #region TransformerHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TransformerHandler.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TransformerHandler.html"/>
     /// </summary>
     public partial class TransformerHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TransformerHandler>
     {
@@ -216,12 +216,12 @@ public partial class TransformerHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TransformerHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransformerHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransformerHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TransformerHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TransformerHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TransformerHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXResult.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXResult.cs
index 95ed0262f..659daa2fc 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXResult.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXResult.cs
@@ -30,7 +30,7 @@ public partial class SAXResult
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html#%3Cinit%3E(org.xml.sax.ContentHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html#%3Cinit%3E(org.xml.sax.ContentHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.ContentHandler"/></param>
         public SAXResult(Org.Xml.Sax.ContentHandler arg0)
@@ -46,7 +46,7 @@ public SAXResult(Org.Xml.Sax.ContentHandler arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html#FEATURE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html#FEATURE"/>
         /// </summary>
         public static Java.Lang.String FEATURE { get { if (!_FEATUREReady) { _FEATUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE"); _FEATUREReady = true; } return _FEATUREContent; } }
         private static Java.Lang.String _FEATUREContent = default;
@@ -60,25 +60,52 @@ public SAXResult(Org.Xml.Sax.ContentHandler arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html#getHandler()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html#setHandler(org.xml.sax.ContentHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html#getSystemId()"/>
         /// </summary>
-        public Org.Xml.Sax.ContentHandler Handler
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getHandler", "()Lorg/xml/sax/ContentHandler;"); } set { IExecuteWithSignature("setHandler", "(Lorg/xml/sax/ContentHandler;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html#getLexicalHandler()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html#setLexicalHandler(org.xml.sax.ext.LexicalHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html#getHandler()"/>
         /// </summary>
-        public Org.Xml.Sax.Ext.LexicalHandler LexicalHandler
+        /// <returns><see cref="Org.Xml.Sax.ContentHandler"/></returns>
+        public Org.Xml.Sax.ContentHandler GetHandler()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.Ext.LexicalHandler>("getLexicalHandler", "()Lorg/xml/sax/ext/LexicalHandler;"); } set { IExecuteWithSignature("setLexicalHandler", "(Lorg/xml/sax/ext/LexicalHandler;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getHandler", "()Lorg/xml/sax/ContentHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXResult.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html#getLexicalHandler()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Org.Xml.Sax.Ext.LexicalHandler"/></returns>
+        public Org.Xml.Sax.Ext.LexicalHandler GetLexicalHandler()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.Ext.LexicalHandler>("getLexicalHandler", "()Lorg/xml/sax/ext/LexicalHandler;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html#setHandler(org.xml.sax.ContentHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ContentHandler"/></param>
+        public void SetHandler(Org.Xml.Sax.ContentHandler arg0)
+        {
+            IExecuteWithSignature("setHandler", "(Lorg/xml/sax/ContentHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html#setLexicalHandler(org.xml.sax.ext.LexicalHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.Ext.LexicalHandler"/></param>
+        public void SetLexicalHandler(Org.Xml.Sax.Ext.LexicalHandler arg0)
+        {
+            IExecuteWithSignature("setLexicalHandler", "(Lorg/xml/sax/ext/LexicalHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXResult.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXSource.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXSource.cs
index e69cdb2f3..a09d13e97 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXSource.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXSource.cs
@@ -30,7 +30,7 @@ public partial class SAXSource
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#%3Cinit%3E(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#%3Cinit%3E(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         public SAXSource(Org.Xml.Sax.InputSource arg0)
@@ -38,7 +38,7 @@ public SAXSource(Org.Xml.Sax.InputSource arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#%3Cinit%3E(org.xml.sax.XMLReader,org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#%3Cinit%3E(org.xml.sax.XMLReader,org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.XMLReader"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.InputSource"/></param>
@@ -55,7 +55,7 @@ public SAXSource(Org.Xml.Sax.XMLReader arg0, Org.Xml.Sax.InputSource arg1)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#FEATURE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#FEATURE"/>
         /// </summary>
         public static Java.Lang.String FEATURE { get { if (!_FEATUREReady) { _FEATUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE"); _FEATUREReady = true; } return _FEATUREContent; } }
         private static Java.Lang.String _FEATUREContent = default;
@@ -65,7 +65,7 @@ public SAXSource(Org.Xml.Sax.XMLReader arg0, Org.Xml.Sax.InputSource arg1)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#sourceToInputSource(javax.xml.transform.Source)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#sourceToInputSource(javax.xml.transform.Source)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <returns><see cref="Org.Xml.Sax.InputSource"/></returns>
@@ -78,33 +78,60 @@ public static Org.Xml.Sax.InputSource SourceToInputSource(Javax.Xml.Transform.So
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#getInputSource()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#setInputSource(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#isEmpty()"/>
         /// </summary>
-        public Org.Xml.Sax.InputSource InputSource
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEmpty()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.InputSource>("getInputSource", "()Lorg/xml/sax/InputSource;"); } set { IExecuteWithSignature("setInputSource", "(Lorg/xml/sax/InputSource;)V", value); }
+            return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#getXMLReader()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#setXMLReader(org.xml.sax.XMLReader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#getInputSource()"/>
         /// </summary>
-        public Org.Xml.Sax.XMLReader XMLReader
+        /// <returns><see cref="Org.Xml.Sax.InputSource"/></returns>
+        public Org.Xml.Sax.InputSource GetInputSource()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.XMLReader>("getXMLReader", "()Lorg/xml/sax/XMLReader;"); } set { IExecuteWithSignature("setXMLReader", "(Lorg/xml/sax/XMLReader;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.InputSource>("getInputSource", "()Lorg/xml/sax/InputSource;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXSource.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#getXMLReader()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEmpty()
+        /// <returns><see cref="Org.Xml.Sax.XMLReader"/></returns>
+        public Org.Xml.Sax.XMLReader GetXMLReader()
         {
-            return IExecuteWithSignature<bool>("isEmpty", "()Z");
+            return IExecuteWithSignature<Org.Xml.Sax.XMLReader>("getXMLReader", "()Lorg/xml/sax/XMLReader;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#setInputSource(org.xml.sax.InputSource)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
+        public void SetInputSource(Org.Xml.Sax.InputSource arg0)
+        {
+            IExecuteWithSignature("setInputSource", "(Lorg/xml/sax/InputSource;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXSource.html#setXMLReader(org.xml.sax.XMLReader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.XMLReader"/></param>
+        public void SetXMLReader(Org.Xml.Sax.XMLReader arg0)
+        {
+            IExecuteWithSignature("setXMLReader", "(Lorg/xml/sax/XMLReader;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXTransformerFactory.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXTransformerFactory.cs
index b273ec87d..29dd48038 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXTransformerFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/SAXTransformerFactory.cs
@@ -38,13 +38,13 @@ public partial class SAXTransformerFactory
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html#FEATURE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html#FEATURE"/>
         /// </summary>
         public static Java.Lang.String FEATURE { get { if (!_FEATUREReady) { _FEATUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE"); _FEATUREReady = true; } return _FEATUREContent; } }
         private static Java.Lang.String _FEATUREContent = default;
         private static bool _FEATUREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html#FEATURE_XMLFILTER"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html#FEATURE_XMLFILTER"/>
         /// </summary>
         public static Java.Lang.String FEATURE_XMLFILTER { get { if (!_FEATURE_XMLFILTERReady) { _FEATURE_XMLFILTERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE_XMLFILTER"); _FEATURE_XMLFILTERReady = true; } return _FEATURE_XMLFILTERContent; } }
         private static Java.Lang.String _FEATURE_XMLFILTERContent = default;
@@ -58,7 +58,7 @@ public partial class SAXTransformerFactory
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html#newTemplatesHandler()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html#newTemplatesHandler()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Transform.Sax.TemplatesHandler"/></returns>
         /// <exception cref="Javax.Xml.Transform.TransformerConfigurationException"/>
@@ -67,7 +67,7 @@ public Javax.Xml.Transform.Sax.TemplatesHandler NewTemplatesHandler()
             return IExecuteWithSignature<Javax.Xml.Transform.Sax.TemplatesHandler>("newTemplatesHandler", "()Ljavax/xml/transform/sax/TemplatesHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html#newTransformerHandler()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html#newTransformerHandler()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Transform.Sax.TransformerHandler"/></returns>
         /// <exception cref="Javax.Xml.Transform.TransformerConfigurationException"/>
@@ -76,7 +76,7 @@ public Javax.Xml.Transform.Sax.TransformerHandler NewTransformerHandler()
             return IExecuteWithSignature<Javax.Xml.Transform.Sax.TransformerHandler>("newTransformerHandler", "()Ljavax/xml/transform/sax/TransformerHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html#newTransformerHandler(javax.xml.transform.Source)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html#newTransformerHandler(javax.xml.transform.Source)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <returns><see cref="Javax.Xml.Transform.Sax.TransformerHandler"/></returns>
@@ -86,7 +86,7 @@ public Javax.Xml.Transform.Sax.TransformerHandler NewTransformerHandler(Javax.Xm
             return IExecuteWithSignature<Javax.Xml.Transform.Sax.TransformerHandler>("newTransformerHandler", "(Ljavax/xml/transform/Source;)Ljavax/xml/transform/sax/TransformerHandler;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html#newTransformerHandler(javax.xml.transform.Templates)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html#newTransformerHandler(javax.xml.transform.Templates)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Templates"/></param>
         /// <returns><see cref="Javax.Xml.Transform.Sax.TransformerHandler"/></returns>
@@ -96,7 +96,7 @@ public Javax.Xml.Transform.Sax.TransformerHandler NewTransformerHandler(Javax.Xm
             return IExecuteWithSignature<Javax.Xml.Transform.Sax.TransformerHandler>("newTransformerHandler", "(Ljavax/xml/transform/Templates;)Ljavax/xml/transform/sax/TransformerHandler;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html#newXMLFilter(javax.xml.transform.Source)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html#newXMLFilter(javax.xml.transform.Source)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <returns><see cref="Org.Xml.Sax.XMLFilter"/></returns>
@@ -106,7 +106,7 @@ public Org.Xml.Sax.XMLFilter NewXMLFilter(Javax.Xml.Transform.Source arg0)
             return IExecuteWithSignature<Org.Xml.Sax.XMLFilter>("newXMLFilter", "(Ljavax/xml/transform/Source;)Lorg/xml/sax/XMLFilter;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/SAXTransformerFactory.html#newXMLFilter(javax.xml.transform.Templates)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/SAXTransformerFactory.html#newXMLFilter(javax.xml.transform.Templates)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Templates"/></param>
         /// <returns><see cref="Org.Xml.Sax.XMLFilter"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/TemplatesHandler.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/TemplatesHandler.cs
index bf7890747..d92c8a363 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/TemplatesHandler.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/TemplatesHandler.cs
@@ -64,18 +64,28 @@ public partial class TemplatesHandler : Javax.Xml.Transform.Sax.ITemplatesHandle
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TemplatesHandler.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TemplatesHandler.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TemplatesHandler.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TemplatesHandler.html#getTemplates()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TemplatesHandler.html#getTemplates()"/>
         /// </summary>
-        public Javax.Xml.Transform.Templates Templates
+        /// <returns><see cref="Javax.Xml.Transform.Templates"/></returns>
+        public Javax.Xml.Transform.Templates GetTemplates()
         {
-            get { return IExecuteWithSignature<Javax.Xml.Transform.Templates>("getTemplates", "()Ljavax/xml/transform/Templates;"); }
+            return IExecuteWithSignature<Javax.Xml.Transform.Templates>("getTemplates", "()Ljavax/xml/transform/Templates;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TemplatesHandler.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/TransformerHandler.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/TransformerHandler.cs
index b2a955473..7b197f750 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/TransformerHandler.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Sax/TransformerHandler.cs
@@ -76,21 +76,23 @@ public partial class TransformerHandler : Javax.Xml.Transform.Sax.ITransformerHa
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TransformerHandler.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TransformerHandler.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TransformerHandler.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TransformerHandler.html#getTransformer()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TransformerHandler.html#getTransformer()"/>
         /// </summary>
-        public Javax.Xml.Transform.Transformer Transformer
+        /// <returns><see cref="Javax.Xml.Transform.Transformer"/></returns>
+        public Javax.Xml.Transform.Transformer GetTransformer()
         {
-            get { return IExecuteWithSignature<Javax.Xml.Transform.Transformer>("getTransformer", "()Ljavax/xml/transform/Transformer;"); }
+            return IExecuteWithSignature<Javax.Xml.Transform.Transformer>("getTransformer", "()Ljavax/xml/transform/Transformer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/sax/TransformerHandler.html#setResult(javax.xml.transform.Result)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TransformerHandler.html#setResult(javax.xml.transform.Result)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Result"/></param>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
@@ -98,6 +100,14 @@ public void SetResult(Javax.Xml.Transform.Result arg0)
         {
             IExecuteWithSignature("setResult", "(Ljavax/xml/transform/Result;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/sax/TransformerHandler.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Source.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Source.cs
index b3be0b364..a76ee9871 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Source.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Source.cs
@@ -64,14 +64,23 @@ public partial class Source : Javax.Xml.Transform.ISource
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Source.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Source.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Source.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Source.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Source.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Source.html#isEmpty()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsEmpty()
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/SourceLocator.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/SourceLocator.cs
index 2e9275bdc..00b942852 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/SourceLocator.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/SourceLocator.cs
@@ -64,32 +64,36 @@ public partial class SourceLocator : Javax.Xml.Transform.ISourceLocator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/SourceLocator.html#getColumnNumber()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/SourceLocator.html#getColumnNumber()"/>
         /// </summary>
-        public int ColumnNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnNumber()
         {
-            get { return IExecuteWithSignature<int>("getColumnNumber", "()I"); }
+            return IExecuteWithSignature<int>("getColumnNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/SourceLocator.html#getLineNumber()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/SourceLocator.html#getLineNumber()"/>
         /// </summary>
-        public int LineNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
         {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); }
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/SourceLocator.html#getPublicId()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/SourceLocator.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/SourceLocator.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/SourceLocator.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/AllPackageClasses.cs
index 85817da48..b0eb1b6e1 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Transform.Stream
 {
     #region StreamResult
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html"/>
     /// </summary>
     public partial class StreamResult : Javax.Xml.Transform.Result
     {
@@ -72,7 +72,7 @@ public StreamResult(params object[] args) : base(args) { }
 
     #region StreamSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html"/>
     /// </summary>
     public partial class StreamSource : Javax.Xml.Transform.Source
     {
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/StreamResult.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/StreamResult.cs
index 06e409a47..9cf470cec 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/StreamResult.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/StreamResult.cs
@@ -30,7 +30,7 @@ public partial class StreamResult
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         public StreamResult(Java.Io.File arg0)
@@ -38,7 +38,7 @@ public StreamResult(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#%3Cinit%3E(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#%3Cinit%3E(java.io.OutputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
         public StreamResult(Java.Io.OutputStream arg0)
@@ -46,7 +46,7 @@ public StreamResult(Java.Io.OutputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#%3Cinit%3E(java.io.Writer)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#%3Cinit%3E(java.io.Writer)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
         public StreamResult(Java.Io.Writer arg0)
@@ -54,7 +54,7 @@ public StreamResult(Java.Io.Writer arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public StreamResult(Java.Lang.String arg0)
@@ -70,7 +70,7 @@ public StreamResult(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#FEATURE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#FEATURE"/>
         /// </summary>
         public static Java.Lang.String FEATURE { get { if (!_FEATUREReady) { _FEATUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE"); _FEATUREReady = true; } return _FEATUREContent; } }
         private static Java.Lang.String _FEATUREContent = default;
@@ -84,28 +84,39 @@ public StreamResult(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#getOutputStream()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#setOutputStream(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#getOutputStream()"/>
         /// </summary>
-        public Java.Io.OutputStream OutputStream
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        public Java.Io.OutputStream GetOutputStream()
         {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;"); } set { IExecuteWithSignature("setOutputStream", "(Ljava/io/OutputStream;)V", value); }
+            return IExecuteWithSignature<Java.Io.OutputStream>("getOutputStream", "()Ljava/io/OutputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#getWriter()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Io.Writer"/></returns>
+        public Java.Io.Writer GetWriter()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Io.Writer>("getWriter", "()Ljava/io/Writer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#getWriter()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#setWriter(java.io.Writer)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#getSystemId()"/>
         /// </summary>
-        public Java.Io.Writer Writer
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Io.Writer>("getWriter", "()Ljava/io/Writer;"); } set { IExecuteWithSignature("setWriter", "(Ljava/io/Writer;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#setSystemId(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#setOutputStream(java.io.OutputStream)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
+        public void SetOutputStream(Java.Io.OutputStream arg0)
+        {
+            IExecuteWithSignature("setOutputStream", "(Ljava/io/OutputStream;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#setSystemId(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         public void SetSystemId(Java.Io.File arg0)
@@ -113,13 +124,21 @@ public void SetSystemId(Java.Io.File arg0)
             IExecuteWithSignature("setSystemId", "(Ljava/io/File;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamResult.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#setSystemId(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void SetSystemId(Java.Lang.String arg0)
         {
             IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamResult.html#setWriter(java.io.Writer)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
+        public void SetWriter(Java.Io.Writer arg0)
+        {
+            IExecuteWithSignature("setWriter", "(Ljava/io/Writer;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/StreamSource.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/StreamSource.cs
index 294b81dc5..bd6c8bb31 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/StreamSource.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Stream/StreamSource.cs
@@ -30,7 +30,7 @@ public partial class StreamSource
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         public StreamSource(Java.Io.File arg0)
@@ -38,7 +38,7 @@ public StreamSource(Java.Io.File arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.InputStream,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.InputStream,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -47,7 +47,7 @@ public StreamSource(Java.Io.InputStream arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public StreamSource(Java.Io.InputStream arg0)
@@ -55,7 +55,7 @@ public StreamSource(Java.Io.InputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.Reader,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.Reader,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -64,7 +64,7 @@ public StreamSource(Java.Io.Reader arg0, Java.Lang.String arg1)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         public StreamSource(Java.Io.Reader arg0)
@@ -72,7 +72,7 @@ public StreamSource(Java.Io.Reader arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public StreamSource(Java.Lang.String arg0)
@@ -88,7 +88,7 @@ public StreamSource(Java.Lang.String arg0)
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#FEATURE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#FEATURE"/>
         /// </summary>
         public static Java.Lang.String FEATURE { get { if (!_FEATUREReady) { _FEATUREContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE"); _FEATUREReady = true; } return _FEATUREContent; } }
         private static Java.Lang.String _FEATUREContent = default;
@@ -102,43 +102,71 @@ public StreamSource(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#getInputStream()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#setInputStream(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#isEmpty()"/>
         /// </summary>
-        public Java.Io.InputStream InputStream
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEmpty()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;"); } set { IExecuteWithSignature("setInputStream", "(Ljava/io/InputStream;)V", value); }
+            return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#getPublicId()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#setPublicId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#getInputStream()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetInputStream()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPublicId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getInputStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#getReader()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#setReader(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#getReader()"/>
         /// </summary>
-        public Java.Io.Reader Reader
+        /// <returns><see cref="Java.Io.Reader"/></returns>
+        public Java.Io.Reader GetReader()
         {
-            get { return IExecuteWithSignature<Java.Io.Reader>("getReader", "()Ljava/io/Reader;"); } set { IExecuteWithSignature("setReader", "(Ljava/io/Reader;)V", value); }
+            return IExecuteWithSignature<Java.Io.Reader>("getReader", "()Ljava/io/Reader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#getSystemId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEmpty()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            return IExecuteWithSignature<bool>("isEmpty", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#setInputStream(java.io.InputStream)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
+        public void SetInputStream(Java.Io.InputStream arg0)
+        {
+            IExecuteWithSignature("setInputStream", "(Ljava/io/InputStream;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#setPublicId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPublicId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPublicId", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#setReader(java.io.Reader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
+        public void SetReader(Java.Io.Reader arg0)
+        {
+            IExecuteWithSignature("setReader", "(Ljava/io/Reader;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#setSystemId(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#setSystemId(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         public void SetSystemId(Java.Io.File arg0)
@@ -146,7 +174,7 @@ public void SetSystemId(Java.Io.File arg0)
             IExecuteWithSignature("setSystemId", "(Ljava/io/File;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/stream/StreamSource.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/stream/StreamSource.html#setSystemId(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void SetSystemId(Java.Lang.String arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Templates.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Templates.cs
index 3f61f197c..f29b925e2 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Templates.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Templates.cs
@@ -64,14 +64,15 @@ public partial class Templates : Javax.Xml.Transform.ITemplates
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Templates.html#getOutputProperties()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Templates.html#getOutputProperties()"/>
         /// </summary>
-        public Java.Util.Properties OutputProperties
+        /// <returns><see cref="Java.Util.Properties"/></returns>
+        public Java.Util.Properties GetOutputProperties()
         {
-            get { return IExecuteWithSignature<Java.Util.Properties>("getOutputProperties", "()Ljava/util/Properties;"); }
+            return IExecuteWithSignature<Java.Util.Properties>("getOutputProperties", "()Ljava/util/Properties;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Templates.html#newTransformer()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Templates.html#newTransformer()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Transform.Transformer"/></returns>
         /// <exception cref="Javax.Xml.Transform.TransformerConfigurationException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/Transformer.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/Transformer.cs
index f482ed409..84e056be5 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/Transformer.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/Transformer.cs
@@ -46,54 +46,82 @@ public partial class Transformer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#getErrorListener()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#setErrorListener(javax.xml.transform.ErrorListener)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#getParameter(java.lang.String)"/>
         /// </summary>
-        public Javax.Xml.Transform.ErrorListener ErrorListener
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="object"/></returns>
+        public object GetParameter(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Javax.Xml.Transform.ErrorListener>("getErrorListener", "()Ljavax/xml/transform/ErrorListener;"); } set { IExecuteWithSignature("setErrorListener", "(Ljavax/xml/transform/ErrorListener;)V", value); }
+            return IExecuteWithSignature("getParameter", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#getOutputProperties()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#setOutputProperties(java.util.Properties)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#getOutputProperty(java.lang.String)"/>
         /// </summary>
-        public Java.Util.Properties OutputProperties
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        public Java.Lang.String GetOutputProperty(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Util.Properties>("getOutputProperties", "()Ljava/util/Properties;"); } set { IExecuteWithSignature("setOutputProperties", "(Ljava/util/Properties;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getOutputProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#getURIResolver()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#setURIResolver(javax.xml.transform.URIResolver)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#getOutputProperties()"/>
         /// </summary>
-        public Javax.Xml.Transform.URIResolver URIResolver
+        /// <returns><see cref="Java.Util.Properties"/></returns>
+        public Java.Util.Properties GetOutputProperties()
         {
-            get { return IExecuteWithSignature<Javax.Xml.Transform.URIResolver>("getURIResolver", "()Ljavax/xml/transform/URIResolver;"); } set { IExecuteWithSignature("setURIResolver", "(Ljavax/xml/transform/URIResolver;)V", value); }
+            return IExecuteWithSignature<Java.Util.Properties>("getOutputProperties", "()Ljava/util/Properties;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#getParameter(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#getErrorListener()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="object"/></returns>
-        public object GetParameter(Java.Lang.String arg0)
+        /// <returns><see cref="Javax.Xml.Transform.ErrorListener"/></returns>
+        public Javax.Xml.Transform.ErrorListener GetErrorListener()
         {
-            return IExecuteWithSignature("getParameter", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Javax.Xml.Transform.ErrorListener>("getErrorListener", "()Ljavax/xml/transform/ErrorListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#getOutputProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#getErrorListener()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        public Java.Lang.String GetOutputProperty(Java.Lang.String arg0)
+        /// <returns><see cref="Javax.Xml.Transform.ErrorListener"/></returns>
+        public Javax.Xml.Transform.ErrorListener GetErrorListenerDirect()
         {
-            return IExecuteWithSignature<Java.Lang.String>("getOutputProperty", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Javax.Xml.Transform.ErrorListenerDirect, Javax.Xml.Transform.ErrorListener>("getErrorListener", "()Ljavax/xml/transform/ErrorListener;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#clearParameters()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#getURIResolver()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Transform.URIResolver"/></returns>
+        public Javax.Xml.Transform.URIResolver GetURIResolver()
+        {
+            return IExecuteWithSignature<Javax.Xml.Transform.URIResolver>("getURIResolver", "()Ljavax/xml/transform/URIResolver;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#clearParameters()"/>
         /// </summary>
         public void ClearParameters()
         {
             IExecuteWithSignature("clearParameters", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#setOutputProperty(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#setErrorListener(javax.xml.transform.ErrorListener)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Transform.ErrorListener"/></param>
+        /// <exception cref="Java.Lang.IllegalArgumentException"/>
+        public void SetErrorListener(Javax.Xml.Transform.ErrorListener arg0)
+        {
+            IExecuteWithSignature("setErrorListener", "(Ljavax/xml/transform/ErrorListener;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#setOutputProperties(java.util.Properties)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Util.Properties"/></param>
+        public void SetOutputProperties(Java.Util.Properties arg0)
+        {
+            IExecuteWithSignature("setOutputProperties", "(Ljava/util/Properties;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#setOutputProperty(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -103,7 +131,7 @@ public void SetOutputProperty(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setOutputProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#setParameter(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#setParameter(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -112,7 +140,15 @@ public void SetParameter(Java.Lang.String arg0, object arg1)
             IExecute("setParameter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#transform(javax.xml.transform.Source,javax.xml.transform.Result)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#setURIResolver(javax.xml.transform.URIResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Transform.URIResolver"/></param>
+        public void SetURIResolver(Javax.Xml.Transform.URIResolver arg0)
+        {
+            IExecuteWithSignature("setURIResolver", "(Ljavax/xml/transform/URIResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#transform(javax.xml.transform.Source,javax.xml.transform.Result)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <param name="arg1"><see cref="Javax.Xml.Transform.Result"/></param>
@@ -122,7 +158,7 @@ public void Transform(Javax.Xml.Transform.Source arg0, Javax.Xml.Transform.Resul
             IExecute("transform", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/Transformer.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/Transformer.html#reset()"/>
         /// </summary>
         public void Reset()
         {
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/TransformerFactory.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/TransformerFactory.cs
index d02412a41..9170fa466 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/TransformerFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/TransformerFactory.cs
@@ -42,7 +42,7 @@ public partial class TransformerFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#newDefaultInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#newDefaultInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Transform.TransformerFactory"/></returns>
         public static Javax.Xml.Transform.TransformerFactory NewDefaultInstance()
@@ -50,7 +50,7 @@ public static Javax.Xml.Transform.TransformerFactory NewDefaultInstance()
             return SExecuteWithSignature<Javax.Xml.Transform.TransformerFactory>(LocalBridgeClazz, "newDefaultInstance", "()Ljavax/xml/transform/TransformerFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#newInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#newInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Transform.TransformerFactory"/></returns>
         /// <exception cref="Javax.Xml.Transform.TransformerFactoryConfigurationError"/>
@@ -59,7 +59,7 @@ public static Javax.Xml.Transform.TransformerFactory NewInstance()
             return SExecuteWithSignature<Javax.Xml.Transform.TransformerFactory>(LocalBridgeClazz, "newInstance", "()Ljavax/xml/transform/TransformerFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#newInstance(java.lang.String,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#newInstance(java.lang.String,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.ClassLoader"/></param>
@@ -74,21 +74,7 @@ public static Javax.Xml.Transform.TransformerFactory NewInstance(Java.Lang.Strin
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#getErrorListener()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#setErrorListener(javax.xml.transform.ErrorListener)"/>
-        /// </summary>
-        public Javax.Xml.Transform.ErrorListener ErrorListener
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Transform.ErrorListener>("getErrorListener", "()Ljavax/xml/transform/ErrorListener;"); } set { IExecuteWithSignature("setErrorListener", "(Ljavax/xml/transform/ErrorListener;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#getURIResolver()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#setURIResolver(javax.xml.transform.URIResolver)"/>
-        /// </summary>
-        public Javax.Xml.Transform.URIResolver URIResolver
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Transform.URIResolver>("getURIResolver", "()Ljavax/xml/transform/URIResolver;"); } set { IExecuteWithSignature("setURIResolver", "(Ljavax/xml/transform/URIResolver;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -97,7 +83,7 @@ public bool GetFeature(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#getAttribute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#getAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -106,7 +92,23 @@ public object GetAttribute(Java.Lang.String arg0)
             return IExecuteWithSignature("getAttribute", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#getAssociatedStylesheet(javax.xml.transform.Source,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#getErrorListener()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Transform.ErrorListener"/></returns>
+        public Javax.Xml.Transform.ErrorListener GetErrorListener()
+        {
+            return IExecuteWithSignature<Javax.Xml.Transform.ErrorListener>("getErrorListener", "()Ljavax/xml/transform/ErrorListener;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#getErrorListener()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Transform.ErrorListener"/></returns>
+        public Javax.Xml.Transform.ErrorListener GetErrorListenerDirect()
+        {
+            return IExecuteWithSignature<Javax.Xml.Transform.ErrorListenerDirect, Javax.Xml.Transform.ErrorListener>("getErrorListener", "()Ljavax/xml/transform/ErrorListener;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#getAssociatedStylesheet(javax.xml.transform.Source,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -119,7 +121,7 @@ public Javax.Xml.Transform.Source GetAssociatedStylesheet(Javax.Xml.Transform.So
             return IExecute<Javax.Xml.Transform.Source>("getAssociatedStylesheet", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#newTemplates(javax.xml.transform.Source)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#newTemplates(javax.xml.transform.Source)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <returns><see cref="Javax.Xml.Transform.Templates"/></returns>
@@ -129,7 +131,7 @@ public Javax.Xml.Transform.Templates NewTemplates(Javax.Xml.Transform.Source arg
             return IExecuteWithSignature<Javax.Xml.Transform.Templates>("newTemplates", "(Ljavax/xml/transform/Source;)Ljavax/xml/transform/Templates;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#newTransformer()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#newTransformer()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Transform.Transformer"/></returns>
         /// <exception cref="Javax.Xml.Transform.TransformerConfigurationException"/>
@@ -138,7 +140,7 @@ public Javax.Xml.Transform.Transformer NewTransformer()
             return IExecuteWithSignature<Javax.Xml.Transform.Transformer>("newTransformer", "()Ljavax/xml/transform/Transformer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#newTransformer(javax.xml.transform.Source)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#newTransformer(javax.xml.transform.Source)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <returns><see cref="Javax.Xml.Transform.Transformer"/></returns>
@@ -148,7 +150,15 @@ public Javax.Xml.Transform.Transformer NewTransformer(Javax.Xml.Transform.Source
             return IExecuteWithSignature<Javax.Xml.Transform.Transformer>("newTransformer", "(Ljavax/xml/transform/Source;)Ljavax/xml/transform/Transformer;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#setAttribute(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#getURIResolver()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Transform.URIResolver"/></returns>
+        public Javax.Xml.Transform.URIResolver GetURIResolver()
+        {
+            return IExecuteWithSignature<Javax.Xml.Transform.URIResolver>("getURIResolver", "()Ljavax/xml/transform/URIResolver;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#setAttribute(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -157,7 +167,15 @@ public void SetAttribute(Java.Lang.String arg0, object arg1)
             IExecute("setAttribute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/TransformerFactory.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#setErrorListener(javax.xml.transform.ErrorListener)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Transform.ErrorListener"/></param>
+        public void SetErrorListener(Javax.Xml.Transform.ErrorListener arg0)
+        {
+            IExecuteWithSignature("setErrorListener", "(Ljavax/xml/transform/ErrorListener;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -166,6 +184,14 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
         {
             IExecute("setFeature", arg0, arg1);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/TransformerFactory.html#setURIResolver(javax.xml.transform.URIResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Transform.URIResolver"/></param>
+        public void SetURIResolver(Javax.Xml.Transform.URIResolver arg0)
+        {
+            IExecuteWithSignature("setURIResolver", "(Ljavax/xml/transform/URIResolver;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Transform/URIResolver.cs b/src/net/Netdroid/Generated/Javax/Xml/Transform/URIResolver.cs
index c799b30ba..74ddeca1e 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Transform/URIResolver.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Transform/URIResolver.cs
@@ -64,7 +64,7 @@ public partial class URIResolver : Javax.Xml.Transform.IURIResolver
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/transform/URIResolver.html#resolve(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/transform/URIResolver.html#resolve(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Validation/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Validation/AllPackageClasses.cs
index d9a5ac40d..cac58fad3 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Validation/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Validation/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Validation
 {
     #region Schema
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Schema.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/validation/Schema.html"/>
     /// </summary>
     public partial class Schema : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Schema>
     {
@@ -36,12 +36,12 @@ public partial class Schema : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Schema>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Schema class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Schema class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Schema() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Schema class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Schema class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Schema(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Schema(params object[] args) : base(args) { }
 
     #region SchemaFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html"/>
     /// </summary>
     public partial class SchemaFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SchemaFactory>
     {
@@ -82,12 +82,12 @@ public partial class SchemaFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Sch
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SchemaFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SchemaFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SchemaFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SchemaFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SchemaFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SchemaFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public SchemaFactory(params object[] args) : base(args) { }
 
     #region SchemaFactoryLoader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactoryLoader.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactoryLoader.html"/>
     /// </summary>
     public partial class SchemaFactoryLoader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SchemaFactoryLoader>
     {
@@ -128,12 +128,12 @@ public partial class SchemaFactoryLoader : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SchemaFactoryLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SchemaFactoryLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SchemaFactoryLoader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SchemaFactoryLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SchemaFactoryLoader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SchemaFactoryLoader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -166,7 +166,7 @@ public SchemaFactoryLoader(params object[] args) : base(args) { }
 
     #region TypeInfoProvider
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/TypeInfoProvider.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/validation/TypeInfoProvider.html"/>
     /// </summary>
     public partial class TypeInfoProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TypeInfoProvider>
     {
@@ -174,12 +174,12 @@ public partial class TypeInfoProvider : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TypeInfoProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeInfoProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeInfoProvider() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TypeInfoProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeInfoProvider class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeInfoProvider(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -212,7 +212,7 @@ public TypeInfoProvider(params object[] args) : base(args) { }
 
     #region Validator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html"/>
     /// </summary>
     public partial class Validator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Validator>
     {
@@ -220,12 +220,12 @@ public partial class Validator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Validat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Validator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Validator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Validator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,7 +258,7 @@ public Validator(params object[] args) : base(args) { }
 
     #region ValidatorHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html"/>
     /// </summary>
     public partial class ValidatorHandler : Org.Xml.Sax.ContentHandler
     {
@@ -266,12 +266,12 @@ public partial class ValidatorHandler : Org.Xml.Sax.ContentHandler
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ValidatorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ValidatorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ValidatorHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ValidatorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ValidatorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ValidatorHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Validation/Schema.cs b/src/net/Netdroid/Generated/Javax/Xml/Validation/Schema.cs
index c94a93c7f..b27e8e97e 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Validation/Schema.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Validation/Schema.cs
@@ -46,7 +46,7 @@ public partial class Schema
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Schema.html#newValidator()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Schema.html#newValidator()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Validation.Validator"/></returns>
         public Javax.Xml.Validation.Validator NewValidator()
@@ -54,7 +54,7 @@ public Javax.Xml.Validation.Validator NewValidator()
             return IExecuteWithSignature<Javax.Xml.Validation.Validator>("newValidator", "()Ljavax/xml/validation/Validator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Schema.html#newValidatorHandler()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Schema.html#newValidatorHandler()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Validation.ValidatorHandler"/></returns>
         public Javax.Xml.Validation.ValidatorHandler NewValidatorHandler()
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Validation/SchemaFactory.cs b/src/net/Netdroid/Generated/Javax/Xml/Validation/SchemaFactory.cs
index 6072b3a6a..6fdd03248 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Validation/SchemaFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Validation/SchemaFactory.cs
@@ -42,7 +42,7 @@ public partial class SchemaFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#newDefaultInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#newDefaultInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Validation.SchemaFactory"/></returns>
         public static Javax.Xml.Validation.SchemaFactory NewDefaultInstance()
@@ -50,7 +50,7 @@ public static Javax.Xml.Validation.SchemaFactory NewDefaultInstance()
             return SExecuteWithSignature<Javax.Xml.Validation.SchemaFactory>(LocalBridgeClazz, "newDefaultInstance", "()Ljavax/xml/validation/SchemaFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#newInstance(java.lang.String,java.lang.String,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#newInstance(java.lang.String,java.lang.String,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -61,7 +61,7 @@ public static Javax.Xml.Validation.SchemaFactory NewInstance(Java.Lang.String ar
             return SExecute<Javax.Xml.Validation.SchemaFactory>(LocalBridgeClazz, "newInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#newInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#newInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Validation.SchemaFactory"/></returns>
@@ -74,21 +74,7 @@ public static Javax.Xml.Validation.SchemaFactory NewInstance(Java.Lang.String ar
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#getErrorHandler()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
-        /// </summary>
-        public Org.Xml.Sax.ErrorHandler ErrorHandler
-        {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;"); } set { IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#getResourceResolver()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#setResourceResolver(org.w3c.dom.ls.LSResourceResolver)"/>
-        /// </summary>
-        public Org.W3c.Dom.Ls.LSResourceResolver ResourceResolver
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Ls.LSResourceResolver>("getResourceResolver", "()Lorg/w3c/dom/ls/LSResourceResolver;"); } set { IExecuteWithSignature("setResourceResolver", "(Lorg/w3c/dom/ls/LSResourceResolver;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#isSchemaLanguageSupported(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#isSchemaLanguageSupported(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -97,7 +83,7 @@ public bool IsSchemaLanguageSupported(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isSchemaLanguageSupported", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#newSchema()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#newSchema()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -106,7 +92,7 @@ public Javax.Xml.Validation.Schema NewSchema()
             return IExecuteWithSignature<Javax.Xml.Validation.Schema>("newSchema", "()Ljavax/xml/validation/Schema;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#newSchema(javax.xml.transform.Source[])"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#newSchema(javax.xml.transform.Source[])"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
@@ -116,7 +102,39 @@ public Javax.Xml.Validation.Schema NewSchema(Javax.Xml.Transform.Source[] arg0)
             return IExecuteWithSignature<Javax.Xml.Validation.Schema>("newSchema", "([Ljavax/xml/transform/Source;)Ljavax/xml/validation/Schema;", new object[] { arg0 });
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#getResourceResolver()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.Ls.LSResourceResolver"/></returns>
+        public Org.W3c.Dom.Ls.LSResourceResolver GetResourceResolver()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.Ls.LSResourceResolver>("getResourceResolver", "()Lorg/w3c/dom/ls/LSResourceResolver;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#getErrorHandler()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Xml.Sax.ErrorHandler"/></returns>
+        public Org.Xml.Sax.ErrorHandler GetErrorHandler()
+        {
+            return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
+        public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
+        {
+            IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#setResourceResolver(org.w3c.dom.ls.LSResourceResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Ls.LSResourceResolver"/></param>
+        public void SetResourceResolver(Org.W3c.Dom.Ls.LSResourceResolver arg0)
+        {
+            IExecuteWithSignature("setResourceResolver", "(Lorg/w3c/dom/ls/LSResourceResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -127,7 +145,7 @@ public bool GetFeature(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -138,7 +156,7 @@ public object GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#newSchema(java.io.File)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#newSchema(java.io.File)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.File"/></param>
         /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
@@ -148,7 +166,7 @@ public Javax.Xml.Validation.Schema NewSchema(Java.Io.File arg0)
             return IExecuteWithSignature<Javax.Xml.Validation.Schema>("newSchema", "(Ljava/io/File;)Ljavax/xml/validation/Schema;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#newSchema(java.net.URL)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#newSchema(java.net.URL)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.URL"/></param>
         /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
@@ -158,7 +176,7 @@ public Javax.Xml.Validation.Schema NewSchema(Java.Net.URL arg0)
             return IExecuteWithSignature<Javax.Xml.Validation.Schema>("newSchema", "(Ljava/net/URL;)Ljavax/xml/validation/Schema;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#newSchema(javax.xml.transform.Source)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#newSchema(javax.xml.transform.Source)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <returns><see cref="Javax.Xml.Validation.Schema"/></returns>
@@ -168,7 +186,7 @@ public Javax.Xml.Validation.Schema NewSchema(Javax.Xml.Transform.Source arg0)
             return IExecuteWithSignature<Javax.Xml.Validation.Schema>("newSchema", "(Ljavax/xml/transform/Source;)Ljavax/xml/validation/Schema;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -179,7 +197,7 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactory.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactory.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Validation/SchemaFactoryLoader.cs b/src/net/Netdroid/Generated/Javax/Xml/Validation/SchemaFactoryLoader.cs
index 4373d23cf..3121bad94 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Validation/SchemaFactoryLoader.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Validation/SchemaFactoryLoader.cs
@@ -46,7 +46,7 @@ public partial class SchemaFactoryLoader
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/SchemaFactoryLoader.html#newFactory(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/SchemaFactoryLoader.html#newFactory(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Validation.SchemaFactory"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Validation/TypeInfoProvider.cs b/src/net/Netdroid/Generated/Javax/Xml/Validation/TypeInfoProvider.cs
index 225d7db93..18d3aca91 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Validation/TypeInfoProvider.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Validation/TypeInfoProvider.cs
@@ -46,14 +46,7 @@ public partial class TypeInfoProvider
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/TypeInfoProvider.html#getElementTypeInfo()"/> 
-        /// </summary>
-        public Org.W3c.Dom.TypeInfo ElementTypeInfo
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.TypeInfo>("getElementTypeInfo", "()Lorg/w3c/dom/TypeInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/TypeInfoProvider.html#isIdAttribute(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/TypeInfoProvider.html#isIdAttribute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -62,7 +55,7 @@ public bool IsIdAttribute(int arg0)
             return IExecuteWithSignature<bool>("isIdAttribute", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/TypeInfoProvider.html#isSpecified(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/TypeInfoProvider.html#isSpecified(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -71,7 +64,7 @@ public bool IsSpecified(int arg0)
             return IExecuteWithSignature<bool>("isSpecified", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/TypeInfoProvider.html#getAttributeTypeInfo(int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/TypeInfoProvider.html#getAttributeTypeInfo(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Org.W3c.Dom.TypeInfo"/></returns>
@@ -79,6 +72,14 @@ public Org.W3c.Dom.TypeInfo GetAttributeTypeInfo(int arg0)
         {
             return IExecuteWithSignature<Org.W3c.Dom.TypeInfo>("getAttributeTypeInfo", "(I)Lorg/w3c/dom/TypeInfo;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/TypeInfoProvider.html#getElementTypeInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.TypeInfo"/></returns>
+        public Org.W3c.Dom.TypeInfo GetElementTypeInfo()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.TypeInfo>("getElementTypeInfo", "()Lorg/w3c/dom/TypeInfo;");
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Validation/Validator.cs b/src/net/Netdroid/Generated/Javax/Xml/Validation/Validator.cs
index 6904074d5..a448be657 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Validation/Validator.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Validation/Validator.cs
@@ -46,28 +46,46 @@ public partial class Validator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#getErrorHandler()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#getResourceResolver()"/>
         /// </summary>
-        public Org.Xml.Sax.ErrorHandler ErrorHandler
+        /// <returns><see cref="Org.W3c.Dom.Ls.LSResourceResolver"/></returns>
+        public Org.W3c.Dom.Ls.LSResourceResolver GetResourceResolver()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;"); } set { IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", value); }
+            return IExecuteWithSignature<Org.W3c.Dom.Ls.LSResourceResolver>("getResourceResolver", "()Lorg/w3c/dom/ls/LSResourceResolver;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#getResourceResolver()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#setResourceResolver(org.w3c.dom.ls.LSResourceResolver)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#getErrorHandler()"/>
         /// </summary>
-        public Org.W3c.Dom.Ls.LSResourceResolver ResourceResolver
+        /// <returns><see cref="Org.Xml.Sax.ErrorHandler"/></returns>
+        public Org.Xml.Sax.ErrorHandler GetErrorHandler()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Ls.LSResourceResolver>("getResourceResolver", "()Lorg/w3c/dom/ls/LSResourceResolver;"); } set { IExecuteWithSignature("setResourceResolver", "(Lorg/w3c/dom/ls/LSResourceResolver;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#validate(javax.xml.transform.Source,javax.xml.transform.Result)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
+        public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
+        {
+            IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#setResourceResolver(org.w3c.dom.ls.LSResourceResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Ls.LSResourceResolver"/></param>
+        public void SetResourceResolver(Org.W3c.Dom.Ls.LSResourceResolver arg0)
+        {
+            IExecuteWithSignature("setResourceResolver", "(Lorg/w3c/dom/ls/LSResourceResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#validate(javax.xml.transform.Source,javax.xml.transform.Result)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <param name="arg1"><see cref="Javax.Xml.Transform.Result"/></param>
@@ -78,7 +96,7 @@ public void Validate(Javax.Xml.Transform.Source arg0, Javax.Xml.Transform.Result
             IExecute("validate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -89,7 +107,7 @@ public bool GetFeature(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -100,7 +118,7 @@ public object GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -111,7 +129,7 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -122,7 +140,7 @@ public void SetProperty(Java.Lang.String arg0, object arg1)
             IExecute("setProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/Validator.html#validate(javax.xml.transform.Source)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/Validator.html#validate(javax.xml.transform.Source)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Transform.Source"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Validation/ValidatorHandler.cs b/src/net/Netdroid/Generated/Javax/Xml/Validation/ValidatorHandler.cs
index f41c28b56..a8901223b 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Validation/ValidatorHandler.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Validation/ValidatorHandler.cs
@@ -46,35 +46,63 @@ public partial class ValidatorHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#getContentHandler()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#getTypeInfoProvider()"/>
         /// </summary>
-        public Org.Xml.Sax.ContentHandler ContentHandler
+        /// <returns><see cref="Javax.Xml.Validation.TypeInfoProvider"/></returns>
+        public Javax.Xml.Validation.TypeInfoProvider GetTypeInfoProvider()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;"); } set { IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", value); }
+            return IExecuteWithSignature<Javax.Xml.Validation.TypeInfoProvider>("getTypeInfoProvider", "()Ljavax/xml/validation/TypeInfoProvider;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#getErrorHandler()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#getResourceResolver()"/>
         /// </summary>
-        public Org.Xml.Sax.ErrorHandler ErrorHandler
+        /// <returns><see cref="Org.W3c.Dom.Ls.LSResourceResolver"/></returns>
+        public Org.W3c.Dom.Ls.LSResourceResolver GetResourceResolver()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;"); } set { IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", value); }
+            return IExecuteWithSignature<Org.W3c.Dom.Ls.LSResourceResolver>("getResourceResolver", "()Lorg/w3c/dom/ls/LSResourceResolver;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#getResourceResolver()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#setResourceResolver(org.w3c.dom.ls.LSResourceResolver)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#getContentHandler()"/>
         /// </summary>
-        public Org.W3c.Dom.Ls.LSResourceResolver ResourceResolver
+        /// <returns><see cref="Org.Xml.Sax.ContentHandler"/></returns>
+        public Org.Xml.Sax.ContentHandler GetContentHandler()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Ls.LSResourceResolver>("getResourceResolver", "()Lorg/w3c/dom/ls/LSResourceResolver;"); } set { IExecuteWithSignature("setResourceResolver", "(Lorg/w3c/dom/ls/LSResourceResolver;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#getTypeInfoProvider()"/> 
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#getErrorHandler()"/>
         /// </summary>
-        public Javax.Xml.Validation.TypeInfoProvider TypeInfoProvider
+        /// <returns><see cref="Org.Xml.Sax.ErrorHandler"/></returns>
+        public Org.Xml.Sax.ErrorHandler GetErrorHandler()
         {
-            get { return IExecuteWithSignature<Javax.Xml.Validation.TypeInfoProvider>("getTypeInfoProvider", "()Ljavax/xml/validation/TypeInfoProvider;"); }
+            return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ContentHandler"/></param>
+        public void SetContentHandler(Org.Xml.Sax.ContentHandler arg0)
+        {
+            IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
+        public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
+        {
+            IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#setResourceResolver(org.w3c.dom.ls.LSResourceResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Ls.LSResourceResolver"/></param>
+        public void SetResourceResolver(Org.W3c.Dom.Ls.LSResourceResolver arg0)
+        {
+            IExecuteWithSignature("setResourceResolver", "(Lorg/w3c/dom/ls/LSResourceResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -85,7 +113,7 @@ public bool GetFeature(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -96,7 +124,7 @@ public object GetProperty(Java.Lang.String arg0)
             return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -107,7 +135,7 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/validation/ValidatorHandler.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/validation/ValidatorHandler.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/XMLConstants.cs b/src/net/Netdroid/Generated/Javax/Xml/XMLConstants.cs
index cc8c7e451..2da673546 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/XMLConstants.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/XMLConstants.cs
@@ -38,97 +38,97 @@ public partial class XMLConstants
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#ACCESS_EXTERNAL_DTD"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#ACCESS_EXTERNAL_DTD"/>
         /// </summary>
         public static Java.Lang.String ACCESS_EXTERNAL_DTD { get { if (!_ACCESS_EXTERNAL_DTDReady) { _ACCESS_EXTERNAL_DTDContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACCESS_EXTERNAL_DTD"); _ACCESS_EXTERNAL_DTDReady = true; } return _ACCESS_EXTERNAL_DTDContent; } }
         private static Java.Lang.String _ACCESS_EXTERNAL_DTDContent = default;
         private static bool _ACCESS_EXTERNAL_DTDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#ACCESS_EXTERNAL_SCHEMA"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#ACCESS_EXTERNAL_SCHEMA"/>
         /// </summary>
         public static Java.Lang.String ACCESS_EXTERNAL_SCHEMA { get { if (!_ACCESS_EXTERNAL_SCHEMAReady) { _ACCESS_EXTERNAL_SCHEMAContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACCESS_EXTERNAL_SCHEMA"); _ACCESS_EXTERNAL_SCHEMAReady = true; } return _ACCESS_EXTERNAL_SCHEMAContent; } }
         private static Java.Lang.String _ACCESS_EXTERNAL_SCHEMAContent = default;
         private static bool _ACCESS_EXTERNAL_SCHEMAReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#ACCESS_EXTERNAL_STYLESHEET"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#ACCESS_EXTERNAL_STYLESHEET"/>
         /// </summary>
         public static Java.Lang.String ACCESS_EXTERNAL_STYLESHEET { get { if (!_ACCESS_EXTERNAL_STYLESHEETReady) { _ACCESS_EXTERNAL_STYLESHEETContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "ACCESS_EXTERNAL_STYLESHEET"); _ACCESS_EXTERNAL_STYLESHEETReady = true; } return _ACCESS_EXTERNAL_STYLESHEETContent; } }
         private static Java.Lang.String _ACCESS_EXTERNAL_STYLESHEETContent = default;
         private static bool _ACCESS_EXTERNAL_STYLESHEETReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#DEFAULT_NS_PREFIX"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#DEFAULT_NS_PREFIX"/>
         /// </summary>
         public static Java.Lang.String DEFAULT_NS_PREFIX { get { if (!_DEFAULT_NS_PREFIXReady) { _DEFAULT_NS_PREFIXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_NS_PREFIX"); _DEFAULT_NS_PREFIXReady = true; } return _DEFAULT_NS_PREFIXContent; } }
         private static Java.Lang.String _DEFAULT_NS_PREFIXContent = default;
         private static bool _DEFAULT_NS_PREFIXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#FEATURE_SECURE_PROCESSING"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#FEATURE_SECURE_PROCESSING"/>
         /// </summary>
         public static Java.Lang.String FEATURE_SECURE_PROCESSING { get { if (!_FEATURE_SECURE_PROCESSINGReady) { _FEATURE_SECURE_PROCESSINGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "FEATURE_SECURE_PROCESSING"); _FEATURE_SECURE_PROCESSINGReady = true; } return _FEATURE_SECURE_PROCESSINGContent; } }
         private static Java.Lang.String _FEATURE_SECURE_PROCESSINGContent = default;
         private static bool _FEATURE_SECURE_PROCESSINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#NULL_NS_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#NULL_NS_URI"/>
         /// </summary>
         public static Java.Lang.String NULL_NS_URI { get { if (!_NULL_NS_URIReady) { _NULL_NS_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NULL_NS_URI"); _NULL_NS_URIReady = true; } return _NULL_NS_URIContent; } }
         private static Java.Lang.String _NULL_NS_URIContent = default;
         private static bool _NULL_NS_URIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#RELAXNG_NS_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#RELAXNG_NS_URI"/>
         /// </summary>
         public static Java.Lang.String RELAXNG_NS_URI { get { if (!_RELAXNG_NS_URIReady) { _RELAXNG_NS_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "RELAXNG_NS_URI"); _RELAXNG_NS_URIReady = true; } return _RELAXNG_NS_URIContent; } }
         private static Java.Lang.String _RELAXNG_NS_URIContent = default;
         private static bool _RELAXNG_NS_URIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#USE_CATALOG"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#USE_CATALOG"/>
         /// </summary>
         public static Java.Lang.String USE_CATALOG { get { if (!_USE_CATALOGReady) { _USE_CATALOGContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "USE_CATALOG"); _USE_CATALOGReady = true; } return _USE_CATALOGContent; } }
         private static Java.Lang.String _USE_CATALOGContent = default;
         private static bool _USE_CATALOGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#W3C_XML_SCHEMA_INSTANCE_NS_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#W3C_XML_SCHEMA_INSTANCE_NS_URI"/>
         /// </summary>
         public static Java.Lang.String W3C_XML_SCHEMA_INSTANCE_NS_URI { get { if (!_W3C_XML_SCHEMA_INSTANCE_NS_URIReady) { _W3C_XML_SCHEMA_INSTANCE_NS_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "W3C_XML_SCHEMA_INSTANCE_NS_URI"); _W3C_XML_SCHEMA_INSTANCE_NS_URIReady = true; } return _W3C_XML_SCHEMA_INSTANCE_NS_URIContent; } }
         private static Java.Lang.String _W3C_XML_SCHEMA_INSTANCE_NS_URIContent = default;
         private static bool _W3C_XML_SCHEMA_INSTANCE_NS_URIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#W3C_XML_SCHEMA_NS_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#W3C_XML_SCHEMA_NS_URI"/>
         /// </summary>
         public static Java.Lang.String W3C_XML_SCHEMA_NS_URI { get { if (!_W3C_XML_SCHEMA_NS_URIReady) { _W3C_XML_SCHEMA_NS_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "W3C_XML_SCHEMA_NS_URI"); _W3C_XML_SCHEMA_NS_URIReady = true; } return _W3C_XML_SCHEMA_NS_URIContent; } }
         private static Java.Lang.String _W3C_XML_SCHEMA_NS_URIContent = default;
         private static bool _W3C_XML_SCHEMA_NS_URIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#W3C_XPATH_DATATYPE_NS_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#W3C_XPATH_DATATYPE_NS_URI"/>
         /// </summary>
         public static Java.Lang.String W3C_XPATH_DATATYPE_NS_URI { get { if (!_W3C_XPATH_DATATYPE_NS_URIReady) { _W3C_XPATH_DATATYPE_NS_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "W3C_XPATH_DATATYPE_NS_URI"); _W3C_XPATH_DATATYPE_NS_URIReady = true; } return _W3C_XPATH_DATATYPE_NS_URIContent; } }
         private static Java.Lang.String _W3C_XPATH_DATATYPE_NS_URIContent = default;
         private static bool _W3C_XPATH_DATATYPE_NS_URIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#XML_DTD_NS_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#XML_DTD_NS_URI"/>
         /// </summary>
         public static Java.Lang.String XML_DTD_NS_URI { get { if (!_XML_DTD_NS_URIReady) { _XML_DTD_NS_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "XML_DTD_NS_URI"); _XML_DTD_NS_URIReady = true; } return _XML_DTD_NS_URIContent; } }
         private static Java.Lang.String _XML_DTD_NS_URIContent = default;
         private static bool _XML_DTD_NS_URIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#XML_NS_PREFIX"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#XML_NS_PREFIX"/>
         /// </summary>
         public static Java.Lang.String XML_NS_PREFIX { get { if (!_XML_NS_PREFIXReady) { _XML_NS_PREFIXContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "XML_NS_PREFIX"); _XML_NS_PREFIXReady = true; } return _XML_NS_PREFIXContent; } }
         private static Java.Lang.String _XML_NS_PREFIXContent = default;
         private static bool _XML_NS_PREFIXReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#XML_NS_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#XML_NS_URI"/>
         /// </summary>
         public static Java.Lang.String XML_NS_URI { get { if (!_XML_NS_URIReady) { _XML_NS_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "XML_NS_URI"); _XML_NS_URIReady = true; } return _XML_NS_URIContent; } }
         private static Java.Lang.String _XML_NS_URIContent = default;
         private static bool _XML_NS_URIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#XMLNS_ATTRIBUTE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#XMLNS_ATTRIBUTE"/>
         /// </summary>
         public static Java.Lang.String XMLNS_ATTRIBUTE { get { if (!_XMLNS_ATTRIBUTEReady) { _XMLNS_ATTRIBUTEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "XMLNS_ATTRIBUTE"); _XMLNS_ATTRIBUTEReady = true; } return _XMLNS_ATTRIBUTEContent; } }
         private static Java.Lang.String _XMLNS_ATTRIBUTEContent = default;
         private static bool _XMLNS_ATTRIBUTEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/XMLConstants.html#XMLNS_ATTRIBUTE_NS_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/XMLConstants.html#XMLNS_ATTRIBUTE_NS_URI"/>
         /// </summary>
         public static Java.Lang.String XMLNS_ATTRIBUTE_NS_URI { get { if (!_XMLNS_ATTRIBUTE_NS_URIReady) { _XMLNS_ATTRIBUTE_NS_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "XMLNS_ATTRIBUTE_NS_URI"); _XMLNS_ATTRIBUTE_NS_URIReady = true; } return _XMLNS_ATTRIBUTE_NS_URIContent; } }
         private static Java.Lang.String _XMLNS_ATTRIBUTE_NS_URIContent = default;
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Xpath/AllPackageClasses.cs b/src/net/Netdroid/Generated/Javax/Xml/Xpath/AllPackageClasses.cs
index f0893fd98..6dc3ed8fb 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Xpath/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Xpath/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Javax.Xml.Xpath
 {
     #region XPath
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html"/>
     /// </summary>
     public partial class XPath : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPath>
     {
@@ -36,12 +36,12 @@ public partial class XPath : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPath>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XPath class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPath class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPath() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XPath class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPath class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPath(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public XPath(params object[] args) : base(args) { }
 
     #region XPathConstants
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathConstants.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathConstants.html"/>
     /// </summary>
     public partial class XPathConstants : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPathConstants>
     {
@@ -118,7 +118,7 @@ public XPathConstants(params object[] args) : base(args) { }
 
     #region XPathException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathException.html"/>
     /// </summary>
     public partial class XPathException : Java.Lang.Exception
     {
@@ -135,7 +135,7 @@ public partial class XPathException : Java.Lang.Exception
 
     #region XPathExpression
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathExpression.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression.html"/>
     /// </summary>
     public partial class XPathExpression : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPathExpression>
     {
@@ -143,12 +143,12 @@ public partial class XPathExpression : MASES.JCOBridge.C2JBridge.JVMBridgeBase<X
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XPathExpression class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathExpression class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathExpression() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XPathExpression class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathExpression class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathExpression(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -181,7 +181,7 @@ public XPathExpression(params object[] args) : base(args) { }
 
     #region XPathExpressionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathExpressionException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathExpressionException.html"/>
     /// </summary>
     public partial class XPathExpressionException : Javax.Xml.Xpath.XPathException
     {
@@ -198,7 +198,7 @@ public partial class XPathExpressionException : Javax.Xml.Xpath.XPathException
 
     #region XPathFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html"/>
     /// </summary>
     public partial class XPathFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPathFactory>
     {
@@ -206,12 +206,12 @@ public partial class XPathFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPat
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XPathFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XPathFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -244,7 +244,7 @@ public XPathFactory(params object[] args) : base(args) { }
 
     #region XPathFactoryConfigurationException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactoryConfigurationException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactoryConfigurationException.html"/>
     /// </summary>
     public partial class XPathFactoryConfigurationException : Javax.Xml.Xpath.XPathException
     {
@@ -261,7 +261,7 @@ public partial class XPathFactoryConfigurationException : Javax.Xml.Xpath.XPathE
 
     #region XPathFunction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFunction.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFunction.html"/>
     /// </summary>
     public partial class XPathFunction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPathFunction>
     {
@@ -269,12 +269,12 @@ public partial class XPathFunction : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XPathFunction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathFunction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathFunction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XPathFunction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathFunction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathFunction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -307,7 +307,7 @@ public XPathFunction(params object[] args) : base(args) { }
 
     #region XPathFunctionException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFunctionException.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFunctionException.html"/>
     /// </summary>
     public partial class XPathFunctionException : Javax.Xml.Xpath.XPathExpressionException
     {
@@ -324,7 +324,7 @@ public partial class XPathFunctionException : Javax.Xml.Xpath.XPathExpressionExc
 
     #region XPathFunctionResolver
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFunctionResolver.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFunctionResolver.html"/>
     /// </summary>
     public partial class XPathFunctionResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPathFunctionResolver>
     {
@@ -332,12 +332,12 @@ public partial class XPathFunctionResolver : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XPathFunctionResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathFunctionResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathFunctionResolver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XPathFunctionResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathFunctionResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathFunctionResolver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -370,7 +370,7 @@ public XPathFunctionResolver(params object[] args) : base(args) { }
 
     #region XPathVariableResolver
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathVariableResolver.html"/>
+    /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathVariableResolver.html"/>
     /// </summary>
     public partial class XPathVariableResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XPathVariableResolver>
     {
@@ -378,12 +378,12 @@ public partial class XPathVariableResolver : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XPathVariableResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathVariableResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathVariableResolver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XPathVariableResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XPathVariableResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XPathVariableResolver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPath.cs b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPath.cs
index 9e389f321..c730bbeb7 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPath.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPath.cs
@@ -64,28 +64,7 @@ public partial class XPath : Javax.Xml.Xpath.IXPath
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#getNamespaceContext()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#setNamespaceContext(javax.xml.namespace.NamespaceContext)"/>
-        /// </summary>
-        public Javax.Xml.Namespace.NamespaceContext NamespaceContext
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Namespace.NamespaceContext>("getNamespaceContext", "()Ljavax/xml/namespace/NamespaceContext;"); } set { IExecuteWithSignature("setNamespaceContext", "(Ljavax/xml/namespace/NamespaceContext;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#getXPathFunctionResolver()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#setXPathFunctionResolver(javax.xml.xpath.XPathFunctionResolver)"/>
-        /// </summary>
-        public Javax.Xml.Xpath.XPathFunctionResolver XPathFunctionResolver
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Xpath.XPathFunctionResolver>("getXPathFunctionResolver", "()Ljavax/xml/xpath/XPathFunctionResolver;"); } set { IExecuteWithSignature("setXPathFunctionResolver", "(Ljavax/xml/xpath/XPathFunctionResolver;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#getXPathVariableResolver()"/> <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#setXPathVariableResolver(javax.xml.xpath.XPathVariableResolver)"/>
-        /// </summary>
-        public Javax.Xml.Xpath.XPathVariableResolver XPathVariableResolver
-        {
-            get { return IExecuteWithSignature<Javax.Xml.Xpath.XPathVariableResolver>("getXPathVariableResolver", "()Ljavax/xml/xpath/XPathVariableResolver;"); } set { IExecuteWithSignature("setXPathVariableResolver", "(Ljavax/xml/xpath/XPathVariableResolver;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#evaluate(java.lang.String,java.lang.Object,javax.xml.namespace.QName)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#evaluate(java.lang.String,java.lang.Object,javax.xml.namespace.QName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -97,7 +76,7 @@ public object Evaluate(Java.Lang.String arg0, object arg1, Javax.Xml.Namespace.Q
             return IExecute("evaluate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#evaluate(java.lang.String,org.xml.sax.InputSource,javax.xml.namespace.QName)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#evaluate(java.lang.String,org.xml.sax.InputSource,javax.xml.namespace.QName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.InputSource"/></param>
@@ -109,7 +88,7 @@ public object Evaluate(Java.Lang.String arg0, Org.Xml.Sax.InputSource arg1, Java
             return IExecute("evaluate", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#evaluate(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#evaluate(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -120,7 +99,7 @@ public Java.Lang.String Evaluate(Java.Lang.String arg0, object arg1)
             return IExecute<Java.Lang.String>("evaluate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#evaluate(java.lang.String,org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#evaluate(java.lang.String,org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.InputSource"/></param>
@@ -131,7 +110,15 @@ public Java.Lang.String Evaluate(Java.Lang.String arg0, Org.Xml.Sax.InputSource
             return IExecute<Java.Lang.String>("evaluate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#compile(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#getNamespaceContext()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Namespace.NamespaceContext"/></returns>
+        public Javax.Xml.Namespace.NamespaceContext GetNamespaceContext()
+        {
+            return IExecuteWithSignature<Javax.Xml.Namespace.NamespaceContext>("getNamespaceContext", "()Ljavax/xml/namespace/NamespaceContext;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#compile(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Xpath.XPathExpression"/></returns>
@@ -141,14 +128,54 @@ public Javax.Xml.Xpath.XPathExpression Compile(Java.Lang.String arg0)
             return IExecuteWithSignature<Javax.Xml.Xpath.XPathExpression>("compile", "(Ljava/lang/String;)Ljavax/xml/xpath/XPathExpression;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#getXPathFunctionResolver()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Xpath.XPathFunctionResolver"/></returns>
+        public Javax.Xml.Xpath.XPathFunctionResolver GetXPathFunctionResolver()
+        {
+            return IExecuteWithSignature<Javax.Xml.Xpath.XPathFunctionResolver>("getXPathFunctionResolver", "()Ljavax/xml/xpath/XPathFunctionResolver;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#getXPathVariableResolver()"/>
+        /// </summary>
+        /// <returns><see cref="Javax.Xml.Xpath.XPathVariableResolver"/></returns>
+        public Javax.Xml.Xpath.XPathVariableResolver GetXPathVariableResolver()
+        {
+            return IExecuteWithSignature<Javax.Xml.Xpath.XPathVariableResolver>("getXPathVariableResolver", "()Ljavax/xml/xpath/XPathVariableResolver;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#evaluateExpression(java.lang.String,java.lang.Object,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#setNamespaceContext(javax.xml.namespace.NamespaceContext)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Namespace.NamespaceContext"/></param>
+        public void SetNamespaceContext(Javax.Xml.Namespace.NamespaceContext arg0)
+        {
+            IExecuteWithSignature("setNamespaceContext", "(Ljavax/xml/namespace/NamespaceContext;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#setXPathFunctionResolver(javax.xml.xpath.XPathFunctionResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Xpath.XPathFunctionResolver"/></param>
+        public void SetXPathFunctionResolver(Javax.Xml.Xpath.XPathFunctionResolver arg0)
+        {
+            IExecuteWithSignature("setXPathFunctionResolver", "(Ljavax/xml/xpath/XPathFunctionResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#setXPathVariableResolver(javax.xml.xpath.XPathVariableResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Javax.Xml.Xpath.XPathVariableResolver"/></param>
+        public void SetXPathVariableResolver(Javax.Xml.Xpath.XPathVariableResolver arg0)
+        {
+            IExecuteWithSignature("setXPathVariableResolver", "(Ljavax/xml/xpath/XPathVariableResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#evaluateExpression(java.lang.String,java.lang.Object,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -161,7 +188,7 @@ public T EvaluateExpression<T>(Java.Lang.String arg0, object arg1, Java.Lang.Cla
             return IExecute<T>("evaluateExpression", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPath.html#evaluateExpression(java.lang.String,org.xml.sax.InputSource,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPath.html#evaluateExpression(java.lang.String,org.xml.sax.InputSource,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.InputSource"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathConstants.cs b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathConstants.cs
index 2feda2e6a..ce0eaf5b9 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathConstants.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathConstants.cs
@@ -38,37 +38,37 @@ public partial class XPathConstants
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathConstants.html#DOM_OBJECT_MODEL"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathConstants.html#DOM_OBJECT_MODEL"/>
         /// </summary>
         public static Java.Lang.String DOM_OBJECT_MODEL { get { if (!_DOM_OBJECT_MODELReady) { _DOM_OBJECT_MODELContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DOM_OBJECT_MODEL"); _DOM_OBJECT_MODELReady = true; } return _DOM_OBJECT_MODELContent; } }
         private static Java.Lang.String _DOM_OBJECT_MODELContent = default;
         private static bool _DOM_OBJECT_MODELReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathConstants.html#BOOLEAN"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathConstants.html#BOOLEAN"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName BOOLEAN { get { if (!_BOOLEANReady) { _BOOLEANContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "BOOLEAN"); _BOOLEANReady = true; } return _BOOLEANContent; } }
         private static Javax.Xml.Namespace.QName _BOOLEANContent = default;
         private static bool _BOOLEANReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathConstants.html#NODE"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathConstants.html#NODE"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName NODE { get { if (!_NODEReady) { _NODEContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "NODE"); _NODEReady = true; } return _NODEContent; } }
         private static Javax.Xml.Namespace.QName _NODEContent = default;
         private static bool _NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathConstants.html#NODESET"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathConstants.html#NODESET"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName NODESET { get { if (!_NODESETReady) { _NODESETContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "NODESET"); _NODESETReady = true; } return _NODESETContent; } }
         private static Javax.Xml.Namespace.QName _NODESETContent = default;
         private static bool _NODESETReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathConstants.html#NUMBER"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathConstants.html#NUMBER"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName NUMBER { get { if (!_NUMBERReady) { _NUMBERContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "NUMBER"); _NUMBERReady = true; } return _NUMBERContent; } }
         private static Javax.Xml.Namespace.QName _NUMBERContent = default;
         private static bool _NUMBERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathConstants.html#STRING"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathConstants.html#STRING"/>
         /// </summary>
         public static Javax.Xml.Namespace.QName STRING { get { if (!_STRINGReady) { _STRINGContent = SGetField<Javax.Xml.Namespace.QName>(LocalBridgeClazz, "STRING"); _STRINGReady = true; } return _STRINGContent; } }
         private static Javax.Xml.Namespace.QName _STRINGContent = default;
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathExpression.cs b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathExpression.cs
index 249ec917c..d7df6565d 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathExpression.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathExpression.cs
@@ -64,7 +64,7 @@ public partial class XPathExpression : Javax.Xml.Xpath.IXPathExpression
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathExpression.html#evaluate(java.lang.Object,javax.xml.namespace.QName)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression.html#evaluate(java.lang.Object,javax.xml.namespace.QName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Javax.Xml.Namespace.QName"/></param>
@@ -75,7 +75,7 @@ public object Evaluate(object arg0, Javax.Xml.Namespace.QName arg1)
             return IExecute("evaluate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathExpression.html#evaluate(org.xml.sax.InputSource,javax.xml.namespace.QName)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression.html#evaluate(org.xml.sax.InputSource,javax.xml.namespace.QName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <param name="arg1"><see cref="Javax.Xml.Namespace.QName"/></param>
@@ -86,7 +86,7 @@ public object Evaluate(Org.Xml.Sax.InputSource arg0, Javax.Xml.Namespace.QName a
             return IExecute("evaluate", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathExpression.html#evaluate(java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression.html#evaluate(java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -96,7 +96,7 @@ public Java.Lang.String Evaluate(object arg0)
             return IExecuteWithSignature<Java.Lang.String>("evaluate", "(Ljava/lang/Object;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathExpression.html#evaluate(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression.html#evaluate(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -106,7 +106,7 @@ public Java.Lang.String Evaluate(Org.Xml.Sax.InputSource arg0)
             return IExecuteWithSignature<Java.Lang.String>("evaluate", "(Lorg/xml/sax/InputSource;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathExpression.html#evaluateExpression(java.lang.Object,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression.html#evaluateExpression(java.lang.Object,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="object"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
@@ -118,7 +118,7 @@ public T EvaluateExpression<T>(object arg0, Java.Lang.Class arg1)
             return IExecute<T>("evaluateExpression", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathExpression.html#evaluateExpression(org.xml.sax.InputSource,java.lang.Class)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathExpression.html#evaluateExpression(org.xml.sax.InputSource,java.lang.Class)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <param name="arg1"><see cref="Java.Lang.Class"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFactory.cs b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFactory.cs
index adde77ef3..7db62af14 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFactory.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFactory.cs
@@ -38,13 +38,13 @@ public partial class XPathFactory
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#DEFAULT_OBJECT_MODEL_URI"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#DEFAULT_OBJECT_MODEL_URI"/>
         /// </summary>
         public static Java.Lang.String DEFAULT_OBJECT_MODEL_URI { get { if (!_DEFAULT_OBJECT_MODEL_URIReady) { _DEFAULT_OBJECT_MODEL_URIContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_OBJECT_MODEL_URI"); _DEFAULT_OBJECT_MODEL_URIReady = true; } return _DEFAULT_OBJECT_MODEL_URIContent; } }
         private static Java.Lang.String _DEFAULT_OBJECT_MODEL_URIContent = default;
         private static bool _DEFAULT_OBJECT_MODEL_URIReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#DEFAULT_PROPERTY_NAME"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#DEFAULT_PROPERTY_NAME"/>
         /// </summary>
         public static Java.Lang.String DEFAULT_PROPERTY_NAME { get { if (!_DEFAULT_PROPERTY_NAMEReady) { _DEFAULT_PROPERTY_NAMEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "DEFAULT_PROPERTY_NAME"); _DEFAULT_PROPERTY_NAMEReady = true; } return _DEFAULT_PROPERTY_NAMEContent; } }
         private static Java.Lang.String _DEFAULT_PROPERTY_NAMEContent = default;
@@ -54,7 +54,7 @@ public partial class XPathFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#newDefaultInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#newDefaultInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Xpath.XPathFactory"/></returns>
         public static Javax.Xml.Xpath.XPathFactory NewDefaultInstance()
@@ -62,7 +62,7 @@ public static Javax.Xml.Xpath.XPathFactory NewDefaultInstance()
             return SExecuteWithSignature<Javax.Xml.Xpath.XPathFactory>(LocalBridgeClazz, "newDefaultInstance", "()Ljavax/xml/xpath/XPathFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#newInstance()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#newInstance()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Xpath.XPathFactory"/></returns>
         public static Javax.Xml.Xpath.XPathFactory NewInstance()
@@ -70,7 +70,7 @@ public static Javax.Xml.Xpath.XPathFactory NewInstance()
             return SExecuteWithSignature<Javax.Xml.Xpath.XPathFactory>(LocalBridgeClazz, "newInstance", "()Ljavax/xml/xpath/XPathFactory;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#newInstance(java.lang.String,java.lang.String,java.lang.ClassLoader)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#newInstance(java.lang.String,java.lang.String,java.lang.ClassLoader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -82,7 +82,7 @@ public static Javax.Xml.Xpath.XPathFactory NewInstance(Java.Lang.String arg0, Ja
             return SExecute<Javax.Xml.Xpath.XPathFactory>(LocalBridgeClazz, "newInstance", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#newInstance(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#newInstance(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Javax.Xml.Xpath.XPathFactory"/></returns>
@@ -96,7 +96,7 @@ public static Javax.Xml.Xpath.XPathFactory NewInstance(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -106,7 +106,7 @@ public bool GetFeature(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#isObjectModelSupported(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#isObjectModelSupported(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -115,7 +115,7 @@ public bool IsObjectModelSupported(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isObjectModelSupported", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#newXPath()"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#newXPath()"/>
         /// </summary>
         /// <returns><see cref="Javax.Xml.Xpath.XPath"/></returns>
         public Javax.Xml.Xpath.XPath NewXPath()
@@ -123,7 +123,7 @@ public Javax.Xml.Xpath.XPath NewXPath()
             return IExecuteWithSignature<Javax.Xml.Xpath.XPath>("newXPath", "()Ljavax/xml/xpath/XPath;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -133,7 +133,7 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#setXPathFunctionResolver(javax.xml.xpath.XPathFunctionResolver)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#setXPathFunctionResolver(javax.xml.xpath.XPathFunctionResolver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Xpath.XPathFunctionResolver"/></param>
         public void SetXPathFunctionResolver(Javax.Xml.Xpath.XPathFunctionResolver arg0)
@@ -141,7 +141,7 @@ public void SetXPathFunctionResolver(Javax.Xml.Xpath.XPathFunctionResolver arg0)
             IExecuteWithSignature("setXPathFunctionResolver", "(Ljavax/xml/xpath/XPathFunctionResolver;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFactory.html#setXPathVariableResolver(javax.xml.xpath.XPathVariableResolver)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFactory.html#setXPathVariableResolver(javax.xml.xpath.XPathVariableResolver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Xpath.XPathVariableResolver"/></param>
         public void SetXPathVariableResolver(Javax.Xml.Xpath.XPathVariableResolver arg0)
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFunction.cs b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFunction.cs
index b0261b9e3..0e03d8323 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFunction.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFunction.cs
@@ -64,7 +64,7 @@ public partial class XPathFunction : Javax.Xml.Xpath.IXPathFunction
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFunction.html#evaluate(java.util.List)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFunction.html#evaluate(java.util.List)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.List"/></param>
         /// <returns><see cref="object"/></returns>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFunctionResolver.cs b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFunctionResolver.cs
index 9476c08b0..132a48704 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFunctionResolver.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathFunctionResolver.cs
@@ -64,7 +64,7 @@ public partial class XPathFunctionResolver : Javax.Xml.Xpath.IXPathFunctionResol
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathFunctionResolver.html#resolveFunction(javax.xml.namespace.QName,int)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathFunctionResolver.html#resolveFunction(javax.xml.namespace.QName,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Namespace.QName"/></param>
         /// <param name="arg1"><see cref="int"/></param>
diff --git a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathVariableResolver.cs b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathVariableResolver.cs
index 6fd019454..8a63f5cb2 100644
--- a/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathVariableResolver.cs
+++ b/src/net/Netdroid/Generated/Javax/Xml/Xpath/XPathVariableResolver.cs
@@ -64,7 +64,7 @@ public partial class XPathVariableResolver : Javax.Xml.Xpath.IXPathVariableResol
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/javax/xml/xpath/XPathVariableResolver.html#resolveVariable(javax.xml.namespace.QName)"/>
+        /// <see href="https://developer.android.com/reference/javax/xml/xpath/XPathVariableResolver.html#resolveVariable(javax.xml.namespace.QName)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Javax.Xml.Namespace.QName"/></param>
         /// <returns><see cref="object"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/AllPackageClasses.cs
index 2dd63b895..7ba05be8f 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/AllPackageClasses.cs
@@ -30,7 +30,7 @@ namespace Org.Apache.Http.Conn
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/ConnectTimeoutException.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ConnectTimeoutException : Java.Io.InterruptedIOException
     {
         const string _bridgeClassName = "org.apache.http.conn.ConnectTimeoutException";
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/AllPackageClasses.cs
index 4c57a2616..1d8505ee3 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/AllPackageClasses.cs
@@ -30,19 +30,19 @@ namespace Org.Apache.Http.Conn.Scheme
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/scheme/HostNameResolver.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class HostNameResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HostNameResolver>
     {
         const string _bridgeClassName = "org.apache.http.conn.scheme.HostNameResolver";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HostNameResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HostNameResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HostNameResolver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HostNameResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HostNameResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HostNameResolver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -77,19 +77,19 @@ public HostNameResolver(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/scheme/LayeredSocketFactory.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class LayeredSocketFactory : Org.Apache.Http.Conn.Scheme.SocketFactory
     {
         const string _bridgeClassName = "org.apache.http.conn.scheme.LayeredSocketFactory";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LayeredSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LayeredSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LayeredSocketFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LayeredSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LayeredSocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LayeredSocketFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -124,19 +124,19 @@ public LayeredSocketFactory(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/scheme/SocketFactory.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SocketFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<SocketFactory>
     {
         const string _bridgeClassName = "org.apache.http.conn.scheme.SocketFactory";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("SocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketFactory() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("SocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("SocketFactory class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public SocketFactory(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/HostNameResolver.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/HostNameResolver.cs
index d6a656a20..088d587ef 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/HostNameResolver.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/HostNameResolver.cs
@@ -69,7 +69,7 @@ public partial class HostNameResolver : Org.Apache.Http.Conn.Scheme.IHostNameRes
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Net.InetAddress"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Net.InetAddress Resolve(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<Java.Net.InetAddress>("resolve", "(Ljava/lang/String;)Ljava/net/InetAddress;", arg0);
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/LayeredSocketFactory.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/LayeredSocketFactory.cs
index b6b809120..ec1286458 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/LayeredSocketFactory.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/LayeredSocketFactory.cs
@@ -73,7 +73,7 @@ public partial class LayeredSocketFactory : Org.Apache.Http.Conn.Scheme.ILayered
         /// <returns><see cref="Java.Net.Socket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
         /// <exception cref="Java.Net.UnknownHostException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Net.Socket CreateSocket(Java.Net.Socket arg0, Java.Lang.String arg1, int arg2, bool arg3)
         {
             return IExecute<Java.Net.Socket>("createSocket", arg0, arg1, arg2, arg3);
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/SocketFactory.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/SocketFactory.cs
index c88e8bcbb..4f65e63ea 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/SocketFactory.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Scheme/SocketFactory.cs
@@ -69,7 +69,7 @@ public partial class SocketFactory : Org.Apache.Http.Conn.Scheme.ISocketFactory
         /// <param name="arg0"><see cref="Java.Net.Socket"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsSecure(Java.Net.Socket arg0)
         {
             return IExecuteWithSignature<bool>("isSecure", "(Ljava/net/Socket;)Z", arg0);
@@ -87,7 +87,7 @@ public bool IsSecure(Java.Net.Socket arg0)
         /// <exception cref="Org.Apache.Http.Conn.ConnectTimeoutException"/>
         /// <exception cref="Java.Io.IOException"/>
         /// <exception cref="Java.Net.UnknownHostException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Net.Socket ConnectSocket(Java.Net.Socket arg0, Java.Lang.String arg1, int arg2, Java.Net.InetAddress arg3, int arg4, Org.Apache.Http.Params.HttpParams arg5)
         {
             return IExecute<Java.Net.Socket>("connectSocket", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -97,7 +97,7 @@ public Java.Net.Socket ConnectSocket(Java.Net.Socket arg0, Java.Lang.String arg1
         /// </summary>
         /// <returns><see cref="Java.Net.Socket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Net.Socket CreateSocket()
         {
             return IExecuteWithSignature<Java.Net.Socket>("createSocket", "()Ljava/net/Socket;");
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/AbstractVerifier.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/AbstractVerifier.cs
index e943b3c3e..679192f25 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/AbstractVerifier.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/AbstractVerifier.cs
@@ -46,7 +46,7 @@ public partial class AbstractVerifier
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool AcceptableCountryWildcard(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "acceptableCountryWildcard", "(Ljava/lang/String;)Z", arg0);
@@ -56,7 +56,7 @@ public static bool AcceptableCountryWildcard(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int CountDots(Java.Lang.String arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "countDots", "(Ljava/lang/String;)I", arg0);
@@ -66,7 +66,7 @@ public static int CountDots(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String[] GetCNs(Java.Security.Cert.X509Certificate arg0)
         {
             return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getCNs", "(Ljava/security/cert/X509Certificate;)[Ljava/lang/String;", arg0);
@@ -76,7 +76,7 @@ public static Java.Lang.String[] GetCNs(Java.Security.Cert.X509Certificate arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String[] GetDNSSubjectAlts(Java.Security.Cert.X509Certificate arg0)
         {
             return SExecuteWithSignatureArray<Java.Lang.String>(LocalBridgeClazz, "getDNSSubjectAlts", "(Ljava/security/cert/X509Certificate;)[Ljava/lang/String;", arg0);
@@ -91,7 +91,7 @@ public static Java.Lang.String[] GetDNSSubjectAlts(Java.Security.Cert.X509Certif
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.SSLSession"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Verify(Java.Lang.String arg0, Javax.Net.Ssl.SSLSession arg1)
         {
             return IExecute<bool>("verify", arg0, arg1);
@@ -104,7 +104,7 @@ public bool Verify(Java.Lang.String arg0, Javax.Net.Ssl.SSLSession arg1)
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="bool"/></param>
         /// <exception cref="Javax.Net.Ssl.SSLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Verify(Java.Lang.String arg0, Java.Lang.String[] arg1, Java.Lang.String[] arg2, bool arg3)
         {
             IExecute("verify", arg0, arg1, arg2, arg3);
@@ -115,7 +115,7 @@ public void Verify(Java.Lang.String arg0, Java.Lang.String[] arg1, Java.Lang.Str
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <exception cref="Javax.Net.Ssl.SSLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Verify(Java.Lang.String arg0, Java.Security.Cert.X509Certificate arg1)
         {
             IExecute("verify", arg0, arg1);
@@ -126,7 +126,7 @@ public void Verify(Java.Lang.String arg0, Java.Security.Cert.X509Certificate arg
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.SSLSocket"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Verify(Java.Lang.String arg0, Javax.Net.Ssl.SSLSocket arg1)
         {
             IExecute("verify", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/AllPackageClasses.cs
index fb518f35a..a0c461a2f 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/AllPackageClasses.cs
@@ -30,19 +30,19 @@ namespace Org.Apache.Http.Conn.Ssl
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/AbstractVerifier.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AbstractVerifier : Org.Apache.Http.Conn.Ssl.X509HostnameVerifier
     {
         const string _bridgeClassName = "org.apache.http.conn.ssl.AbstractVerifier";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AbstractVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractVerifier() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AbstractVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AbstractVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AbstractVerifier(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -77,7 +77,7 @@ public AbstractVerifier(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AllowAllHostnameVerifier : Org.Apache.Http.Conn.Ssl.AbstractVerifier
     {
         const string _bridgeClassName = "org.apache.http.conn.ssl.AllowAllHostnameVerifier";
@@ -122,7 +122,7 @@ public AllowAllHostnameVerifier(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class BrowserCompatHostnameVerifier : Org.Apache.Http.Conn.Ssl.AbstractVerifier
     {
         const string _bridgeClassName = "org.apache.http.conn.ssl.BrowserCompatHostnameVerifier";
@@ -167,7 +167,7 @@ public BrowserCompatHostnameVerifier(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class SSLSocketFactory : Org.Apache.Http.Conn.Scheme.LayeredSocketFactory
     {
         const string _bridgeClassName = "org.apache.http.conn.ssl.SSLSocketFactory";
@@ -212,7 +212,7 @@ public SSLSocketFactory(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/StrictHostnameVerifier.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class StrictHostnameVerifier : Org.Apache.Http.Conn.Ssl.AbstractVerifier
     {
         const string _bridgeClassName = "org.apache.http.conn.ssl.StrictHostnameVerifier";
@@ -257,19 +257,19 @@ public StrictHostnameVerifier(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/X509HostnameVerifier.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class X509HostnameVerifier : Javax.Net.Ssl.HostnameVerifier
     {
         const string _bridgeClassName = "org.apache.http.conn.ssl.X509HostnameVerifier";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("X509HostnameVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509HostnameVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509HostnameVerifier() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("X509HostnameVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("X509HostnameVerifier class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public X509HostnameVerifier(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/SSLSocketFactory.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/SSLSocketFactory.cs
index ae364f9db..4cb926738 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/SSLSocketFactory.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/SSLSocketFactory.cs
@@ -42,7 +42,7 @@ public partial class SSLSocketFactory
         /// <exception cref="Java.Security.KeyStoreException"/>
         /// <exception cref="Java.Security.NoSuchAlgorithmException"/>
         /// <exception cref="Java.Security.UnrecoverableKeyException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SSLSocketFactory(Java.Lang.String arg0, Java.Security.KeyStore arg1, Java.Lang.String arg2, Java.Security.KeyStore arg3, Java.Security.SecureRandom arg4, Org.Apache.Http.Conn.Scheme.HostNameResolver arg5)
             : base(arg0, arg1, arg2, arg3, arg4, arg5)
         {
@@ -57,7 +57,7 @@ public SSLSocketFactory(Java.Lang.String arg0, Java.Security.KeyStore arg1, Java
         /// <exception cref="Java.Security.KeyStoreException"/>
         /// <exception cref="Java.Security.NoSuchAlgorithmException"/>
         /// <exception cref="Java.Security.UnrecoverableKeyException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SSLSocketFactory(Java.Security.KeyStore arg0, Java.Lang.String arg1, Java.Security.KeyStore arg2)
             : base(arg0, arg1, arg2)
         {
@@ -71,7 +71,7 @@ public SSLSocketFactory(Java.Security.KeyStore arg0, Java.Lang.String arg1, Java
         /// <exception cref="Java.Security.KeyStoreException"/>
         /// <exception cref="Java.Security.NoSuchAlgorithmException"/>
         /// <exception cref="Java.Security.UnrecoverableKeyException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SSLSocketFactory(Java.Security.KeyStore arg0, Java.Lang.String arg1)
             : base(arg0, arg1)
         {
@@ -84,7 +84,7 @@ public SSLSocketFactory(Java.Security.KeyStore arg0, Java.Lang.String arg1)
         /// <exception cref="Java.Security.KeyStoreException"/>
         /// <exception cref="Java.Security.NoSuchAlgorithmException"/>
         /// <exception cref="Java.Security.UnrecoverableKeyException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public SSLSocketFactory(Java.Security.KeyStore arg0)
             : base(arg0)
         {
@@ -100,42 +100,42 @@ public SSLSocketFactory(Java.Security.KeyStore arg0)
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#SSL"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SSL { get { if (!_SSLReady) { _SSLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SSL"); _SSLReady = true; } return _SSLContent; } }
         private static Java.Lang.String _SSLContent = default;
         private static bool _SSLReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#SSLV2"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SSLV2 { get { if (!_SSLV2Ready) { _SSLV2Content = SGetField<Java.Lang.String>(LocalBridgeClazz, "SSLV2"); _SSLV2Ready = true; } return _SSLV2Content; } }
         private static Java.Lang.String _SSLV2Content = default;
         private static bool _SSLV2Ready = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#TLS"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TLS { get { if (!_TLSReady) { _TLSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TLS"); _TLSReady = true; } return _TLSContent; } }
         private static Java.Lang.String _TLSContent = default;
         private static bool _TLSReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#ALLOW_ALL_HOSTNAME_VERIFIER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Org.Apache.Http.Conn.Ssl.X509HostnameVerifier ALLOW_ALL_HOSTNAME_VERIFIER { get { if (!_ALLOW_ALL_HOSTNAME_VERIFIERReady) { _ALLOW_ALL_HOSTNAME_VERIFIERContent = SGetField<Org.Apache.Http.Conn.Ssl.X509HostnameVerifier>(LocalBridgeClazz, "ALLOW_ALL_HOSTNAME_VERIFIER"); _ALLOW_ALL_HOSTNAME_VERIFIERReady = true; } return _ALLOW_ALL_HOSTNAME_VERIFIERContent; } }
         private static Org.Apache.Http.Conn.Ssl.X509HostnameVerifier _ALLOW_ALL_HOSTNAME_VERIFIERContent = default;
         private static bool _ALLOW_ALL_HOSTNAME_VERIFIERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#BROWSER_COMPATIBLE_HOSTNAME_VERIFIER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Org.Apache.Http.Conn.Ssl.X509HostnameVerifier BROWSER_COMPATIBLE_HOSTNAME_VERIFIER { get { if (!_BROWSER_COMPATIBLE_HOSTNAME_VERIFIERReady) { _BROWSER_COMPATIBLE_HOSTNAME_VERIFIERContent = SGetField<Org.Apache.Http.Conn.Ssl.X509HostnameVerifier>(LocalBridgeClazz, "BROWSER_COMPATIBLE_HOSTNAME_VERIFIER"); _BROWSER_COMPATIBLE_HOSTNAME_VERIFIERReady = true; } return _BROWSER_COMPATIBLE_HOSTNAME_VERIFIERContent; } }
         private static Org.Apache.Http.Conn.Ssl.X509HostnameVerifier _BROWSER_COMPATIBLE_HOSTNAME_VERIFIERContent = default;
         private static bool _BROWSER_COMPATIBLE_HOSTNAME_VERIFIERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#STRICT_HOSTNAME_VERIFIER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Org.Apache.Http.Conn.Ssl.X509HostnameVerifier STRICT_HOSTNAME_VERIFIER { get { if (!_STRICT_HOSTNAME_VERIFIERReady) { _STRICT_HOSTNAME_VERIFIERContent = SGetField<Org.Apache.Http.Conn.Ssl.X509HostnameVerifier>(LocalBridgeClazz, "STRICT_HOSTNAME_VERIFIER"); _STRICT_HOSTNAME_VERIFIERReady = true; } return _STRICT_HOSTNAME_VERIFIERContent; } }
         private static Org.Apache.Http.Conn.Ssl.X509HostnameVerifier _STRICT_HOSTNAME_VERIFIERContent = default;
         private static bool _STRICT_HOSTNAME_VERIFIERReady = false; // this is used because in case of generics 
@@ -144,32 +144,25 @@ public SSLSocketFactory(Java.Security.KeyStore arg0)
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#getSocketFactory()"/> 
+        /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#getSocketFactory()"/>
         /// </summary>
-        [System.Obsolete()]
-        public static Org.Apache.Http.Conn.Ssl.SSLSocketFactory SocketFactory
+        /// <returns><see cref="Org.Apache.Http.Conn.Ssl.SSLSocketFactory"/></returns>
+        [global::System.Obsolete()]
+        public static Org.Apache.Http.Conn.Ssl.SSLSocketFactory GetSocketFactory()
         {
-            get { return SExecuteWithSignature<Org.Apache.Http.Conn.Ssl.SSLSocketFactory>(LocalBridgeClazz, "getSocketFactory", "()Lorg/apache/http/conn/ssl/SSLSocketFactory;"); }
+            return SExecuteWithSignature<Org.Apache.Http.Conn.Ssl.SSLSocketFactory>(LocalBridgeClazz, "getSocketFactory", "()Lorg/apache/http/conn/ssl/SSLSocketFactory;");
         }
 
         #endregion
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#getHostnameVerifier()"/> <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#setHostnameVerifier(org.apache.http.conn.ssl.X509HostnameVerifier)"/>
-        /// </summary>
-        [System.Obsolete()]
-        public Org.Apache.Http.Conn.Ssl.X509HostnameVerifier HostnameVerifier
-        {
-            get { return IExecuteWithSignature<Org.Apache.Http.Conn.Ssl.X509HostnameVerifier>("getHostnameVerifier", "()Lorg/apache/http/conn/ssl/X509HostnameVerifier;"); } set { IExecuteWithSignature("setHostnameVerifier", "(Lorg/apache/http/conn/ssl/X509HostnameVerifier;)V", value); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#isSecure(java.net.Socket)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Net.Socket"/></param>
         /// <returns><see cref="bool"/></returns>
         /// <exception cref="Java.Lang.IllegalArgumentException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsSecure(Java.Net.Socket arg0)
         {
             return IExecuteWithSignature<bool>("isSecure", "(Ljava/net/Socket;)Z", arg0);
@@ -185,7 +178,7 @@ public bool IsSecure(Java.Net.Socket arg0)
         /// <param name="arg5"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <returns><see cref="Java.Net.Socket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Net.Socket ConnectSocket(Java.Net.Socket arg0, Java.Lang.String arg1, int arg2, Java.Net.InetAddress arg3, int arg4, Org.Apache.Http.Params.HttpParams arg5)
         {
             return IExecute<Java.Net.Socket>("connectSocket", arg0, arg1, arg2, arg3, arg4, arg5);
@@ -195,7 +188,7 @@ public Java.Net.Socket ConnectSocket(Java.Net.Socket arg0, Java.Lang.String arg1
         /// </summary>
         /// <returns><see cref="Java.Net.Socket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Net.Socket CreateSocket()
         {
             return IExecuteWithSignature<Java.Net.Socket>("createSocket", "()Ljava/net/Socket;");
@@ -210,11 +203,29 @@ public Java.Net.Socket CreateSocket()
         /// <returns><see cref="Java.Net.Socket"/></returns>
         /// <exception cref="Java.Io.IOException"/>
         /// <exception cref="Java.Net.UnknownHostException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Java.Net.Socket CreateSocket(Java.Net.Socket arg0, Java.Lang.String arg1, int arg2, bool arg3)
         {
             return IExecute<Java.Net.Socket>("createSocket", arg0, arg1, arg2, arg3);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#getHostnameVerifier()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Apache.Http.Conn.Ssl.X509HostnameVerifier"/></returns>
+        [global::System.Obsolete()]
+        public Org.Apache.Http.Conn.Ssl.X509HostnameVerifier GetHostnameVerifier()
+        {
+            return IExecuteWithSignature<Org.Apache.Http.Conn.Ssl.X509HostnameVerifier>("getHostnameVerifier", "()Lorg/apache/http/conn/ssl/X509HostnameVerifier;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/apache/http/conn/ssl/SSLSocketFactory.html#setHostnameVerifier(org.apache.http.conn.ssl.X509HostnameVerifier)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Apache.Http.Conn.Ssl.X509HostnameVerifier"/></param>
+        [global::System.Obsolete()]
+        public void SetHostnameVerifier(Org.Apache.Http.Conn.Ssl.X509HostnameVerifier arg0)
+        {
+            IExecuteWithSignature("setHostnameVerifier", "(Lorg/apache/http/conn/ssl/X509HostnameVerifier;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/X509HostnameVerifier.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/X509HostnameVerifier.cs
index 9d033c2df..897d56826 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/X509HostnameVerifier.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Conn/Ssl/X509HostnameVerifier.cs
@@ -69,7 +69,7 @@ public partial class X509HostnameVerifier : Org.Apache.Http.Conn.Ssl.IX509Hostna
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.SSLSession"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool Verify(Java.Lang.String arg0, Javax.Net.Ssl.SSLSession arg1)
         {
             return IExecute<bool>("verify", arg0, arg1);
@@ -81,7 +81,7 @@ public bool Verify(Java.Lang.String arg0, Javax.Net.Ssl.SSLSession arg1)
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Javax.Net.Ssl.SSLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Verify(Java.Lang.String arg0, Java.Lang.String[] arg1, Java.Lang.String[] arg2)
         {
             IExecute("verify", arg0, arg1, arg2);
@@ -92,7 +92,7 @@ public void Verify(Java.Lang.String arg0, Java.Lang.String[] arg1, Java.Lang.Str
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Security.Cert.X509Certificate"/></param>
         /// <exception cref="Javax.Net.Ssl.SSLException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Verify(Java.Lang.String arg0, Java.Security.Cert.X509Certificate arg1)
         {
             IExecute("verify", arg0, arg1);
@@ -103,7 +103,7 @@ public void Verify(Java.Lang.String arg0, Java.Security.Cert.X509Certificate arg
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Javax.Net.Ssl.SSLSocket"/></param>
         /// <exception cref="Java.Io.IOException"/>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public void Verify(Java.Lang.String arg0, Javax.Net.Ssl.SSLSocket arg1)
         {
             IExecute("verify", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Params/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Params/AllPackageClasses.cs
index a6f11f851..7b00367dc 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Params/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Params/AllPackageClasses.cs
@@ -30,19 +30,19 @@ namespace Org.Apache.Http.Params
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class CoreConnectionPNames : MASES.JCOBridge.C2JBridge.JVMBridgeBase<CoreConnectionPNames>
     {
         const string _bridgeClassName = "org.apache.http.params.CoreConnectionPNames";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CoreConnectionPNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CoreConnectionPNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CoreConnectionPNames() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CoreConnectionPNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CoreConnectionPNames class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CoreConnectionPNames(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -77,7 +77,7 @@ public CoreConnectionPNames(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/params/HttpConnectionParams.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class HttpConnectionParams : Org.Apache.Http.Params.CoreConnectionPNames
     {
         const string _bridgeClassName = "org.apache.http.params.HttpConnectionParams";
@@ -122,19 +122,19 @@ public HttpConnectionParams(params object[] args) : base(args) { }
     /// <summary>
     /// <see href="https://developer.android.com/reference/org/apache/http/params/HttpParams.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class HttpParams : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HttpParams>
     {
         const string _bridgeClassName = "org.apache.http.params.HttpParams";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("HttpParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HttpParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HttpParams() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("HttpParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("HttpParams class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public HttpParams(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Params/CoreConnectionPNames.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Params/CoreConnectionPNames.cs
index 23b4751b4..23c0263e1 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Params/CoreConnectionPNames.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Params/CoreConnectionPNames.cs
@@ -58,56 +58,56 @@ public partial class CoreConnectionPNames : Org.Apache.Http.Params.ICoreConnecti
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html#CONNECTION_TIMEOUT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String CONNECTION_TIMEOUT { get { if (!_CONNECTION_TIMEOUTReady) { _CONNECTION_TIMEOUTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "CONNECTION_TIMEOUT"); _CONNECTION_TIMEOUTReady = true; } return _CONNECTION_TIMEOUTContent; } }
         private static Java.Lang.String _CONNECTION_TIMEOUTContent = default;
         private static bool _CONNECTION_TIMEOUTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html#MAX_HEADER_COUNT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String MAX_HEADER_COUNT { get { if (!_MAX_HEADER_COUNTReady) { _MAX_HEADER_COUNTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MAX_HEADER_COUNT"); _MAX_HEADER_COUNTReady = true; } return _MAX_HEADER_COUNTContent; } }
         private static Java.Lang.String _MAX_HEADER_COUNTContent = default;
         private static bool _MAX_HEADER_COUNTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html#MAX_LINE_LENGTH"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String MAX_LINE_LENGTH { get { if (!_MAX_LINE_LENGTHReady) { _MAX_LINE_LENGTHContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "MAX_LINE_LENGTH"); _MAX_LINE_LENGTHReady = true; } return _MAX_LINE_LENGTHContent; } }
         private static Java.Lang.String _MAX_LINE_LENGTHContent = default;
         private static bool _MAX_LINE_LENGTHReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html#SO_LINGER"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SO_LINGER { get { if (!_SO_LINGERReady) { _SO_LINGERContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SO_LINGER"); _SO_LINGERReady = true; } return _SO_LINGERContent; } }
         private static Java.Lang.String _SO_LINGERContent = default;
         private static bool _SO_LINGERReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html#SO_TIMEOUT"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SO_TIMEOUT { get { if (!_SO_TIMEOUTReady) { _SO_TIMEOUTContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SO_TIMEOUT"); _SO_TIMEOUTReady = true; } return _SO_TIMEOUTContent; } }
         private static Java.Lang.String _SO_TIMEOUTContent = default;
         private static bool _SO_TIMEOUTReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html#SOCKET_BUFFER_SIZE"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String SOCKET_BUFFER_SIZE { get { if (!_SOCKET_BUFFER_SIZEReady) { _SOCKET_BUFFER_SIZEContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "SOCKET_BUFFER_SIZE"); _SOCKET_BUFFER_SIZEReady = true; } return _SOCKET_BUFFER_SIZEContent; } }
         private static Java.Lang.String _SOCKET_BUFFER_SIZEContent = default;
         private static bool _SOCKET_BUFFER_SIZEReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html#STALE_CONNECTION_CHECK"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String STALE_CONNECTION_CHECK { get { if (!_STALE_CONNECTION_CHECKReady) { _STALE_CONNECTION_CHECKContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "STALE_CONNECTION_CHECK"); _STALE_CONNECTION_CHECKReady = true; } return _STALE_CONNECTION_CHECKContent; } }
         private static Java.Lang.String _STALE_CONNECTION_CHECKContent = default;
         private static bool _STALE_CONNECTION_CHECKReady = false; // this is used because in case of generics 
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/apache/http/params/CoreConnectionPNames.html#TCP_NODELAY"/>
         /// </summary>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static Java.Lang.String TCP_NODELAY { get { if (!_TCP_NODELAYReady) { _TCP_NODELAYContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "TCP_NODELAY"); _TCP_NODELAYReady = true; } return _TCP_NODELAYContent; } }
         private static Java.Lang.String _TCP_NODELAYContent = default;
         private static bool _TCP_NODELAYReady = false; // this is used because in case of generics 
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Params/HttpConnectionParams.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Params/HttpConnectionParams.cs
index 69edf6dd7..30f78388a 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Params/HttpConnectionParams.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Params/HttpConnectionParams.cs
@@ -46,7 +46,7 @@ public partial class HttpConnectionParams
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool GetTcpNoDelay(Org.Apache.Http.Params.HttpParams arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "getTcpNoDelay", "(Lorg/apache/http/params/HttpParams;)Z", arg0);
@@ -56,7 +56,7 @@ public static bool GetTcpNoDelay(Org.Apache.Http.Params.HttpParams arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static bool IsStaleCheckingEnabled(Org.Apache.Http.Params.HttpParams arg0)
         {
             return SExecuteWithSignature<bool>(LocalBridgeClazz, "isStaleCheckingEnabled", "(Lorg/apache/http/params/HttpParams;)Z", arg0);
@@ -66,7 +66,7 @@ public static bool IsStaleCheckingEnabled(Org.Apache.Http.Params.HttpParams arg0
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetConnectionTimeout(Org.Apache.Http.Params.HttpParams arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getConnectionTimeout", "(Lorg/apache/http/params/HttpParams;)I", arg0);
@@ -76,7 +76,7 @@ public static int GetConnectionTimeout(Org.Apache.Http.Params.HttpParams arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetLinger(Org.Apache.Http.Params.HttpParams arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getLinger", "(Lorg/apache/http/params/HttpParams;)I", arg0);
@@ -86,7 +86,7 @@ public static int GetLinger(Org.Apache.Http.Params.HttpParams arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetSocketBufferSize(Org.Apache.Http.Params.HttpParams arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getSocketBufferSize", "(Lorg/apache/http/params/HttpParams;)I", arg0);
@@ -96,7 +96,7 @@ public static int GetSocketBufferSize(Org.Apache.Http.Params.HttpParams arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static int GetSoTimeout(Org.Apache.Http.Params.HttpParams arg0)
         {
             return SExecuteWithSignature<int>(LocalBridgeClazz, "getSoTimeout", "(Lorg/apache/http/params/HttpParams;)I", arg0);
@@ -106,7 +106,7 @@ public static int GetSoTimeout(Org.Apache.Http.Params.HttpParams arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetConnectionTimeout(Org.Apache.Http.Params.HttpParams arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "setConnectionTimeout", arg0, arg1);
@@ -116,7 +116,7 @@ public static void SetConnectionTimeout(Org.Apache.Http.Params.HttpParams arg0,
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetLinger(Org.Apache.Http.Params.HttpParams arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "setLinger", arg0, arg1);
@@ -126,7 +126,7 @@ public static void SetLinger(Org.Apache.Http.Params.HttpParams arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetSocketBufferSize(Org.Apache.Http.Params.HttpParams arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "setSocketBufferSize", arg0, arg1);
@@ -136,7 +136,7 @@ public static void SetSocketBufferSize(Org.Apache.Http.Params.HttpParams arg0, i
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <param name="arg1"><see cref="int"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetSoTimeout(Org.Apache.Http.Params.HttpParams arg0, int arg1)
         {
             SExecute(LocalBridgeClazz, "setSoTimeout", arg0, arg1);
@@ -146,7 +146,7 @@ public static void SetSoTimeout(Org.Apache.Http.Params.HttpParams arg0, int arg1
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetStaleCheckingEnabled(Org.Apache.Http.Params.HttpParams arg0, bool arg1)
         {
             SExecute(LocalBridgeClazz, "setStaleCheckingEnabled", arg0, arg1);
@@ -156,7 +156,7 @@ public static void SetStaleCheckingEnabled(Org.Apache.Http.Params.HttpParams arg
         /// </summary>
         /// <param name="arg0"><see cref="Org.Apache.Http.Params.HttpParams"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public static void SetTcpNoDelay(Org.Apache.Http.Params.HttpParams arg0, bool arg1)
         {
             SExecute(LocalBridgeClazz, "setTcpNoDelay", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Org/Apache/Http/Params/HttpParams.cs b/src/net/Netdroid/Generated/Org/Apache/Http/Params/HttpParams.cs
index e454478c3..2158fa9ca 100644
--- a/src/net/Netdroid/Generated/Org/Apache/Http/Params/HttpParams.cs
+++ b/src/net/Netdroid/Generated/Org/Apache/Http/Params/HttpParams.cs
@@ -69,7 +69,7 @@ public partial class HttpParams : Org.Apache.Http.Params.IHttpParams
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool GetBooleanParameter(Java.Lang.String arg0, bool arg1)
         {
             return IExecute<bool>("getBooleanParameter", arg0, arg1);
@@ -79,7 +79,7 @@ public bool GetBooleanParameter(Java.Lang.String arg0, bool arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsParameterFalse(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("isParameterFalse", "(Ljava/lang/String;)Z", arg0);
@@ -89,7 +89,7 @@ public bool IsParameterFalse(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool IsParameterTrue(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("isParameterTrue", "(Ljava/lang/String;)Z", arg0);
@@ -99,7 +99,7 @@ public bool IsParameterTrue(Java.Lang.String arg0)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public bool RemoveParameter(Java.Lang.String arg0)
         {
             return IExecuteWithSignature<bool>("removeParameter", "(Ljava/lang/String;)Z", arg0);
@@ -110,7 +110,7 @@ public bool RemoveParameter(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="double"/></param>
         /// <returns><see cref="double"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public double GetDoubleParameter(Java.Lang.String arg0, double arg1)
         {
             return IExecute<double>("getDoubleParameter", arg0, arg1);
@@ -121,7 +121,7 @@ public double GetDoubleParameter(Java.Lang.String arg0, double arg1)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="int"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public int GetIntParameter(Java.Lang.String arg0, int arg1)
         {
             return IExecute<int>("getIntParameter", arg0, arg1);
@@ -131,7 +131,7 @@ public int GetIntParameter(Java.Lang.String arg0, int arg1)
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public object GetParameter(Java.Lang.String arg0)
         {
             return IExecuteWithSignature("getParameter", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
@@ -142,7 +142,7 @@ public object GetParameter(Java.Lang.String arg0)
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <returns><see cref="long"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public long GetLongParameter(Java.Lang.String arg0, long arg1)
         {
             return IExecute<long>("getLongParameter", arg0, arg1);
@@ -151,7 +151,7 @@ public long GetLongParameter(Java.Lang.String arg0, long arg1)
         /// <see href="https://developer.android.com/reference/org/apache/http/params/HttpParams.html#copy()"/>
         /// </summary>
         /// <returns><see cref="Org.Apache.Http.Params.HttpParams"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Org.Apache.Http.Params.HttpParams Copy()
         {
             return IExecuteWithSignature<Org.Apache.Http.Params.HttpParams>("copy", "()Lorg/apache/http/params/HttpParams;");
@@ -162,7 +162,7 @@ public Org.Apache.Http.Params.HttpParams Copy()
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
         /// <returns><see cref="Org.Apache.Http.Params.HttpParams"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Org.Apache.Http.Params.HttpParams SetBooleanParameter(Java.Lang.String arg0, bool arg1)
         {
             return IExecute<Org.Apache.Http.Params.HttpParams>("setBooleanParameter", arg0, arg1);
@@ -173,7 +173,7 @@ public Org.Apache.Http.Params.HttpParams SetBooleanParameter(Java.Lang.String ar
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="double"/></param>
         /// <returns><see cref="Org.Apache.Http.Params.HttpParams"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Org.Apache.Http.Params.HttpParams SetDoubleParameter(Java.Lang.String arg0, double arg1)
         {
             return IExecute<Org.Apache.Http.Params.HttpParams>("setDoubleParameter", arg0, arg1);
@@ -184,7 +184,7 @@ public Org.Apache.Http.Params.HttpParams SetDoubleParameter(Java.Lang.String arg
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <returns><see cref="Org.Apache.Http.Params.HttpParams"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Org.Apache.Http.Params.HttpParams SetIntParameter(Java.Lang.String arg0, int arg1)
         {
             return IExecute<Org.Apache.Http.Params.HttpParams>("setIntParameter", arg0, arg1);
@@ -195,7 +195,7 @@ public Org.Apache.Http.Params.HttpParams SetIntParameter(Java.Lang.String arg0,
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="long"/></param>
         /// <returns><see cref="Org.Apache.Http.Params.HttpParams"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Org.Apache.Http.Params.HttpParams SetLongParameter(Java.Lang.String arg0, long arg1)
         {
             return IExecute<Org.Apache.Http.Params.HttpParams>("setLongParameter", arg0, arg1);
@@ -206,7 +206,7 @@ public Org.Apache.Http.Params.HttpParams SetLongParameter(Java.Lang.String arg0,
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
         /// <returns><see cref="Org.Apache.Http.Params.HttpParams"/></returns>
-        [System.Obsolete()]
+        [global::System.Obsolete()]
         public Org.Apache.Http.Params.HttpParams SetParameter(Java.Lang.String arg0, object arg1)
         {
             return IExecute<Org.Apache.Http.Params.HttpParams>("setParameter", arg0, arg1);
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/AllPackageClasses.cs
index 96e057516..befd59620 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Org.W3c.Dom
 {
     #region Attr
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Attr.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/Attr.html"/>
     /// </summary>
     public partial class Attr : Org.W3c.Dom.Node
     {
@@ -36,12 +36,12 @@ public partial class Attr : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Attr class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Attr class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Attr() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Attr class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Attr class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Attr(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Attr(params object[] args) : base(args) { }
 
     #region CDATASection
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CDATASection.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/CDATASection.html"/>
     /// </summary>
     public partial class CDATASection : Org.W3c.Dom.Text
     {
@@ -82,12 +82,12 @@ public partial class CDATASection : Org.W3c.Dom.Text
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CDATASection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CDATASection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CDATASection() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CDATASection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CDATASection class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CDATASection(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -120,7 +120,7 @@ public CDATASection(params object[] args) : base(args) { }
 
     #region CharacterData
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html"/>
     /// </summary>
     public partial class CharacterData : Org.W3c.Dom.Node
     {
@@ -128,12 +128,12 @@ public partial class CharacterData : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("CharacterData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharacterData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharacterData() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("CharacterData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("CharacterData class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public CharacterData(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -166,7 +166,7 @@ public CharacterData(params object[] args) : base(args) { }
 
     #region Comment
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Comment.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/Comment.html"/>
     /// </summary>
     public partial class Comment : Org.W3c.Dom.CharacterData
     {
@@ -174,12 +174,12 @@ public partial class Comment : Org.W3c.Dom.CharacterData
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Comment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Comment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Comment() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Comment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Comment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Comment(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -212,7 +212,7 @@ public Comment(params object[] args) : base(args) { }
 
     #region Document
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html"/>
     /// </summary>
     public partial class Document : Org.W3c.Dom.Node
     {
@@ -220,12 +220,12 @@ public partial class Document : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Document class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Document class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Document() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Document class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Document class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Document(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -258,7 +258,7 @@ public Document(params object[] args) : base(args) { }
 
     #region DocumentFragment
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DocumentFragment.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DocumentFragment.html"/>
     /// </summary>
     public partial class DocumentFragment : Org.W3c.Dom.Node
     {
@@ -266,12 +266,12 @@ public partial class DocumentFragment : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DocumentFragment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentFragment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentFragment() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DocumentFragment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentFragment class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentFragment(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -304,7 +304,7 @@ public DocumentFragment(params object[] args) : base(args) { }
 
     #region DocumentType
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DocumentType.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DocumentType.html"/>
     /// </summary>
     public partial class DocumentType : Org.W3c.Dom.Node
     {
@@ -312,12 +312,12 @@ public partial class DocumentType : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DocumentType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentType() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DocumentType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentType class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentType(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -350,7 +350,7 @@ public DocumentType(params object[] args) : base(args) { }
 
     #region DOMConfiguration
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMConfiguration.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMConfiguration.html"/>
     /// </summary>
     public partial class DOMConfiguration : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMConfiguration>
     {
@@ -358,12 +358,12 @@ public partial class DOMConfiguration : MASES.JCOBridge.C2JBridge.JVMBridgeBase<
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMConfiguration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMConfiguration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMConfiguration() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMConfiguration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMConfiguration class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMConfiguration(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -396,7 +396,7 @@ public DOMConfiguration(params object[] args) : base(args) { }
 
     #region DOMError
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html"/>
     /// </summary>
     public partial class DOMError : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMError>
     {
@@ -404,12 +404,12 @@ public partial class DOMError : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMError
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMError class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMError class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMError() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMError class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMError class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMError(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -442,7 +442,7 @@ public DOMError(params object[] args) : base(args) { }
 
     #region DOMErrorHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMErrorHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMErrorHandler.html"/>
     /// </summary>
     public partial class DOMErrorHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMErrorHandler>
     {
@@ -450,12 +450,12 @@ public partial class DOMErrorHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<D
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMErrorHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMErrorHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -488,7 +488,7 @@ public DOMErrorHandler(params object[] args) : base(args) { }
 
     #region DOMException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMException.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMException.html"/>
     /// </summary>
     public partial class DOMException : Java.Lang.RuntimeException
     {
@@ -505,7 +505,7 @@ public partial class DOMException : Java.Lang.RuntimeException
 
     #region DOMImplementation
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementation.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementation.html"/>
     /// </summary>
     public partial class DOMImplementation : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMImplementation>
     {
@@ -513,12 +513,12 @@ public partial class DOMImplementation : MASES.JCOBridge.C2JBridge.JVMBridgeBase
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMImplementation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMImplementation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMImplementation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMImplementation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMImplementation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMImplementation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -551,7 +551,7 @@ public DOMImplementation(params object[] args) : base(args) { }
 
     #region DOMImplementationList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementationList.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementationList.html"/>
     /// </summary>
     public partial class DOMImplementationList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMImplementationList>
     {
@@ -559,12 +559,12 @@ public partial class DOMImplementationList : MASES.JCOBridge.C2JBridge.JVMBridge
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMImplementationList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMImplementationList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMImplementationList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMImplementationList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMImplementationList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMImplementationList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -597,7 +597,7 @@ public DOMImplementationList(params object[] args) : base(args) { }
 
     #region DOMImplementationSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementationSource.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementationSource.html"/>
     /// </summary>
     public partial class DOMImplementationSource : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMImplementationSource>
     {
@@ -605,12 +605,12 @@ public partial class DOMImplementationSource : MASES.JCOBridge.C2JBridge.JVMBrid
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMImplementationSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMImplementationSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMImplementationSource() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMImplementationSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMImplementationSource class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMImplementationSource(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -643,7 +643,7 @@ public DOMImplementationSource(params object[] args) : base(args) { }
 
     #region DOMLocator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMLocator.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMLocator.html"/>
     /// </summary>
     public partial class DOMLocator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMLocator>
     {
@@ -651,12 +651,12 @@ public partial class DOMLocator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMLoc
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMLocator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMLocator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMLocator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -689,7 +689,7 @@ public DOMLocator(params object[] args) : base(args) { }
 
     #region DOMStringList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMStringList.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMStringList.html"/>
     /// </summary>
     public partial class DOMStringList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMStringList>
     {
@@ -697,12 +697,12 @@ public partial class DOMStringList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOM
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMStringList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMStringList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMStringList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMStringList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMStringList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMStringList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -735,7 +735,7 @@ public DOMStringList(params object[] args) : base(args) { }
 
     #region Element
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html"/>
     /// </summary>
     public partial class Element : Org.W3c.Dom.Node
     {
@@ -743,12 +743,12 @@ public partial class Element : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Element class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Element class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Element() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Element class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Element class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Element(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -781,7 +781,7 @@ public Element(params object[] args) : base(args) { }
 
     #region Entity
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Entity.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/Entity.html"/>
     /// </summary>
     public partial class Entity : Org.W3c.Dom.Node
     {
@@ -789,12 +789,12 @@ public partial class Entity : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Entity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Entity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Entity() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Entity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Entity class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Entity(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -827,7 +827,7 @@ public Entity(params object[] args) : base(args) { }
 
     #region EntityReference
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/EntityReference.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/EntityReference.html"/>
     /// </summary>
     public partial class EntityReference : Org.W3c.Dom.Node
     {
@@ -835,12 +835,12 @@ public partial class EntityReference : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EntityReference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EntityReference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EntityReference() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EntityReference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EntityReference class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EntityReference(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -873,7 +873,7 @@ public EntityReference(params object[] args) : base(args) { }
 
     #region NamedNodeMap
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html"/>
     /// </summary>
     public partial class NamedNodeMap : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NamedNodeMap>
     {
@@ -881,12 +881,12 @@ public partial class NamedNodeMap : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Name
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NamedNodeMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NamedNodeMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NamedNodeMap() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NamedNodeMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NamedNodeMap class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NamedNodeMap(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -919,7 +919,7 @@ public NamedNodeMap(params object[] args) : base(args) { }
 
     #region NameList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NameList.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/NameList.html"/>
     /// </summary>
     public partial class NameList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NameList>
     {
@@ -927,12 +927,12 @@ public partial class NameList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NameList
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NameList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NameList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NameList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NameList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NameList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NameList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -965,7 +965,7 @@ public NameList(params object[] args) : base(args) { }
 
     #region Node
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html"/>
     /// </summary>
     public partial class Node : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Node>
     {
@@ -973,12 +973,12 @@ public partial class Node : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Node>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Node class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Node class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Node() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Node class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Node class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Node(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1011,7 +1011,7 @@ public Node(params object[] args) : base(args) { }
 
     #region NodeList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NodeList.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/NodeList.html"/>
     /// </summary>
     public partial class NodeList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NodeList>
     {
@@ -1019,12 +1019,12 @@ public partial class NodeList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NodeList
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("NodeList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NodeList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NodeList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("NodeList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("NodeList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public NodeList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1057,7 +1057,7 @@ public NodeList(params object[] args) : base(args) { }
 
     #region Notation
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Notation.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/Notation.html"/>
     /// </summary>
     public partial class Notation : Org.W3c.Dom.Node
     {
@@ -1065,12 +1065,12 @@ public partial class Notation : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Notation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Notation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Notation() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Notation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Notation class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Notation(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1103,7 +1103,7 @@ public Notation(params object[] args) : base(args) { }
 
     #region ProcessingInstruction
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ProcessingInstruction.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ProcessingInstruction.html"/>
     /// </summary>
     public partial class ProcessingInstruction : Org.W3c.Dom.Node
     {
@@ -1111,12 +1111,12 @@ public partial class ProcessingInstruction : Org.W3c.Dom.Node
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ProcessingInstruction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ProcessingInstruction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ProcessingInstruction() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ProcessingInstruction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ProcessingInstruction class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ProcessingInstruction(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1149,7 +1149,7 @@ public ProcessingInstruction(params object[] args) : base(args) { }
 
     #region Text
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Text.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/Text.html"/>
     /// </summary>
     public partial class Text : Org.W3c.Dom.CharacterData
     {
@@ -1157,12 +1157,12 @@ public partial class Text : Org.W3c.Dom.CharacterData
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Text class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Text class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Text() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Text class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Text class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Text(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1195,7 +1195,7 @@ public Text(params object[] args) : base(args) { }
 
     #region TypeInfo
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/TypeInfo.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/TypeInfo.html"/>
     /// </summary>
     public partial class TypeInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TypeInfo>
     {
@@ -1203,12 +1203,12 @@ public partial class TypeInfo : MASES.JCOBridge.C2JBridge.JVMBridgeBase<TypeInfo
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("TypeInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeInfo() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("TypeInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("TypeInfo class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public TypeInfo(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -1241,7 +1241,7 @@ public TypeInfo(params object[] args) : base(args) { }
 
     #region UserDataHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/UserDataHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/UserDataHandler.html"/>
     /// </summary>
     public partial class UserDataHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<UserDataHandler>
     {
@@ -1249,12 +1249,12 @@ public partial class UserDataHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<U
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("UserDataHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UserDataHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UserDataHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("UserDataHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("UserDataHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public UserDataHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Attr.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Attr.cs
index c545a0a53..a66531d6f 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Attr.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Attr.cs
@@ -64,47 +64,61 @@ public partial class Attr : Org.W3c.Dom.IAttr
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Attr.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Attr.html#getSpecified()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="bool"/></returns>
+        public bool GetSpecified()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("getSpecified", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Attr.html#getOwnerElement()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Attr.html#isId()"/>
         /// </summary>
-        public Org.W3c.Dom.Element OwnerElement
+        /// <returns><see cref="bool"/></returns>
+        public bool IsId()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Element>("getOwnerElement", "()Lorg/w3c/dom/Element;"); }
+            return IExecuteWithSignature<bool>("isId", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Attr.html#getSchemaTypeInfo()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Attr.html#getName()"/>
         /// </summary>
-        public Org.W3c.Dom.TypeInfo SchemaTypeInfo
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.TypeInfo>("getSchemaTypeInfo", "()Lorg/w3c/dom/TypeInfo;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Attr.html#getSpecified()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Attr.html#getValue()"/>
         /// </summary>
-        public bool Specified
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetValue()
         {
-            get { return IExecuteWithSignature<bool>("getSpecified", "()Z"); }
+            return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Attr.html#getValue()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Attr.html#setValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Attr.html#getOwnerElement()"/>
         /// </summary>
-        public Java.Lang.String Value
+        /// <returns><see cref="Org.W3c.Dom.Element"/></returns>
+        public Org.W3c.Dom.Element GetOwnerElement()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getValue", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setValue", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Org.W3c.Dom.Element>("getOwnerElement", "()Lorg/w3c/dom/Element;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Attr.html#isId()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Attr.html#getSchemaTypeInfo()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsId()
+        /// <returns><see cref="Org.W3c.Dom.TypeInfo"/></returns>
+        public Org.W3c.Dom.TypeInfo GetSchemaTypeInfo()
         {
-            return IExecuteWithSignature<bool>("isId", "()Z");
+            return IExecuteWithSignature<Org.W3c.Dom.TypeInfo>("getSchemaTypeInfo", "()Lorg/w3c/dom/TypeInfo;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Attr.html#setValue(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public void SetValue(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setValue", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/CharacterData.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/CharacterData.cs
index 0780f77bb..03db4cd36 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/CharacterData.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/CharacterData.cs
@@ -64,21 +64,24 @@ public partial class CharacterData : Org.W3c.Dom.ICharacterData
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html#getData()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html#setData(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html#getLength()"/>
         /// </summary>
-        public Java.Lang.String Data
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getData", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setData", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html#getData()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public Java.Lang.String GetData()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<Java.Lang.String>("getData", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html#substringData(int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html#substringData(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -89,7 +92,7 @@ public Java.Lang.String SubstringData(int arg0, int arg1)
             return IExecute<Java.Lang.String>("substringData", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html#appendData(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html#appendData(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.W3c.Dom.DOMException"/>
@@ -98,7 +101,7 @@ public void AppendData(Java.Lang.String arg0)
             IExecuteWithSignature("appendData", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html#deleteData(int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html#deleteData(int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -108,7 +111,7 @@ public void DeleteData(int arg0, int arg1)
             IExecute("deleteData", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html#insertData(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html#insertData(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -118,7 +121,7 @@ public void InsertData(int arg0, Java.Lang.String arg1)
             IExecute("insertData", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/CharacterData.html#replaceData(int,int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html#replaceData(int,int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -128,6 +131,15 @@ public void ReplaceData(int arg0, int arg1, Java.Lang.String arg2)
         {
             IExecute("replaceData", arg0, arg1, arg2);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/CharacterData.html#setData(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public void SetData(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setData", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMConfiguration.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMConfiguration.cs
index 33703f6a3..9cd9019d8 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMConfiguration.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMConfiguration.cs
@@ -64,14 +64,7 @@ public partial class DOMConfiguration : Org.W3c.Dom.IDOMConfiguration
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMConfiguration.html#getParameterNames()"/> 
-        /// </summary>
-        public Org.W3c.Dom.DOMStringList ParameterNames
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.DOMStringList>("getParameterNames", "()Lorg/w3c/dom/DOMStringList;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMConfiguration.html#canSetParameter(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMConfiguration.html#canSetParameter(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -81,7 +74,7 @@ public bool CanSetParameter(Java.Lang.String arg0, object arg1)
             return IExecute<bool>("canSetParameter", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMConfiguration.html#getParameter(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMConfiguration.html#getParameter(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -91,7 +84,15 @@ public object GetParameter(Java.Lang.String arg0)
             return IExecuteWithSignature("getParameter", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMConfiguration.html#setParameter(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMConfiguration.html#getParameterNames()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.DOMStringList"/></returns>
+        public Org.W3c.Dom.DOMStringList GetParameterNames()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.DOMStringList>("getParameterNames", "()Lorg/w3c/dom/DOMStringList;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMConfiguration.html#setParameter(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMError.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMError.cs
index 5dc142acd..c98f60e5b 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMError.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMError.cs
@@ -56,19 +56,19 @@ public partial class DOMError : Org.W3c.Dom.IDOMError
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#SEVERITY_ERROR"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#SEVERITY_ERROR"/>
         /// </summary>
         public static short SEVERITY_ERROR { get { if (!_SEVERITY_ERRORReady) { _SEVERITY_ERRORContent = SGetField<short>(LocalBridgeClazz, "SEVERITY_ERROR"); _SEVERITY_ERRORReady = true; } return _SEVERITY_ERRORContent; } }
         private static short _SEVERITY_ERRORContent = default;
         private static bool _SEVERITY_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#SEVERITY_FATAL_ERROR"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#SEVERITY_FATAL_ERROR"/>
         /// </summary>
         public static short SEVERITY_FATAL_ERROR { get { if (!_SEVERITY_FATAL_ERRORReady) { _SEVERITY_FATAL_ERRORContent = SGetField<short>(LocalBridgeClazz, "SEVERITY_FATAL_ERROR"); _SEVERITY_FATAL_ERRORReady = true; } return _SEVERITY_FATAL_ERRORContent; } }
         private static short _SEVERITY_FATAL_ERRORContent = default;
         private static bool _SEVERITY_FATAL_ERRORReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#SEVERITY_WARNING"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#SEVERITY_WARNING"/>
         /// </summary>
         public static short SEVERITY_WARNING { get { if (!_SEVERITY_WARNINGReady) { _SEVERITY_WARNINGContent = SGetField<short>(LocalBridgeClazz, "SEVERITY_WARNING"); _SEVERITY_WARNINGReady = true; } return _SEVERITY_WARNINGContent; } }
         private static short _SEVERITY_WARNINGContent = default;
@@ -82,46 +82,52 @@ public partial class DOMError : Org.W3c.Dom.IDOMError
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#getLocation()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#getRelatedData()"/>
         /// </summary>
-        public Org.W3c.Dom.DOMLocator Location
+        /// <returns><see cref="object"/></returns>
+        public object GetRelatedData()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.DOMLocator>("getLocation", "()Lorg/w3c/dom/DOMLocator;"); }
+            return IExecuteWithSignature("getRelatedData", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#getMessage()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#getRelatedException()"/>
         /// </summary>
-        public Java.Lang.String Message
+        /// <returns><see cref="object"/></returns>
+        public object GetRelatedException()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature("getRelatedException", "()Ljava/lang/Object;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#getRelatedData()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#getMessage()"/>
         /// </summary>
-        public object RelatedData
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetMessage()
         {
-            get { return IExecuteWithSignature("getRelatedData", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getMessage", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#getRelatedException()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#getType()"/>
         /// </summary>
-        public object RelatedException
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetType()
         {
-            get { return IExecuteWithSignature("getRelatedException", "()Ljava/lang/Object;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#getSeverity()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#getLocation()"/>
         /// </summary>
-        public short Severity
+        /// <returns><see cref="Org.W3c.Dom.DOMLocator"/></returns>
+        public Org.W3c.Dom.DOMLocator GetLocation()
         {
-            get { return IExecuteWithSignature<short>("getSeverity", "()S"); }
+            return IExecuteWithSignature<Org.W3c.Dom.DOMLocator>("getLocation", "()Lorg/w3c/dom/DOMLocator;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMError.html#getType()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMError.html#getSeverity()"/>
         /// </summary>
-        public Java.Lang.String Type
+        /// <returns><see cref="short"/></returns>
+        public short GetSeverity()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getType", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<short>("getSeverity", "()S");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMErrorHandler.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMErrorHandler.cs
index a62297d74..39640271d 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMErrorHandler.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMErrorHandler.cs
@@ -64,7 +64,7 @@ public partial class DOMErrorHandler : Org.W3c.Dom.IDOMErrorHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMErrorHandler.html#handleError(org.w3c.dom.DOMError)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMErrorHandler.html#handleError(org.w3c.dom.DOMError)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.DOMError"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementation.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementation.cs
index 204c58251..c3e4c41a3 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementation.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementation.cs
@@ -64,7 +64,7 @@ public partial class DOMImplementation : Org.W3c.Dom.IDOMImplementation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementation.html#hasFeature(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementation.html#hasFeature(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -74,7 +74,7 @@ public bool HasFeature(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("hasFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementation.html#getFeature(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementation.html#getFeature(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -84,7 +84,7 @@ public object GetFeature(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute("getFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementation.html#createDocument(java.lang.String,java.lang.String,org.w3c.dom.DocumentType)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementation.html#createDocument(java.lang.String,java.lang.String,org.w3c.dom.DocumentType)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -96,7 +96,7 @@ public Org.W3c.Dom.Document CreateDocument(Java.Lang.String arg0, Java.Lang.Stri
             return IExecute<Org.W3c.Dom.Document>("createDocument", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementation.html#createDocumentType(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementation.html#createDocumentType(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementationList.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementationList.cs
index 97271b38d..0dea3daf4 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementationList.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementationList.cs
@@ -64,14 +64,15 @@ public partial class DOMImplementationList : Org.W3c.Dom.IDOMImplementationList
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementationList.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementationList.html#getLength()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementationList.html#item(int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementationList.html#item(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Org.W3c.Dom.DOMImplementation"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementationSource.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementationSource.cs
index dc2643430..990d711eb 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementationSource.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMImplementationSource.cs
@@ -64,7 +64,7 @@ public partial class DOMImplementationSource : Org.W3c.Dom.IDOMImplementationSou
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementationSource.html#getDOMImplementation(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementationSource.html#getDOMImplementation(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.DOMImplementation"/></returns>
@@ -73,7 +73,7 @@ public Org.W3c.Dom.DOMImplementation GetDOMImplementation(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.DOMImplementation>("getDOMImplementation", "(Ljava/lang/String;)Lorg/w3c/dom/DOMImplementation;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMImplementationSource.html#getDOMImplementationList(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMImplementationSource.html#getDOMImplementationList(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.DOMImplementationList"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMLocator.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMLocator.cs
index f2f9d39f3..5237c4b3f 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMLocator.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMLocator.cs
@@ -64,46 +64,52 @@ public partial class DOMLocator : Org.W3c.Dom.IDOMLocator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMLocator.html#getByteOffset()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMLocator.html#getByteOffset()"/>
         /// </summary>
-        public int ByteOffset
+        /// <returns><see cref="int"/></returns>
+        public int GetByteOffset()
         {
-            get { return IExecuteWithSignature<int>("getByteOffset", "()I"); }
+            return IExecuteWithSignature<int>("getByteOffset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMLocator.html#getColumnNumber()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMLocator.html#getColumnNumber()"/>
         /// </summary>
-        public int ColumnNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnNumber()
         {
-            get { return IExecuteWithSignature<int>("getColumnNumber", "()I"); }
+            return IExecuteWithSignature<int>("getColumnNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMLocator.html#getLineNumber()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMLocator.html#getLineNumber()"/>
         /// </summary>
-        public int LineNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
         {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); }
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMLocator.html#getRelatedNode()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMLocator.html#getUtf16Offset()"/>
         /// </summary>
-        public Org.W3c.Dom.Node RelatedNode
+        /// <returns><see cref="int"/></returns>
+        public int GetUtf16Offset()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getRelatedNode", "()Lorg/w3c/dom/Node;"); }
+            return IExecuteWithSignature<int>("getUtf16Offset", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMLocator.html#getUri()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMLocator.html#getUri()"/>
         /// </summary>
-        public Java.Lang.String Uri
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetUri()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getUri", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getUri", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMLocator.html#getUtf16Offset()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMLocator.html#getRelatedNode()"/>
         /// </summary>
-        public int Utf16Offset
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node GetRelatedNode()
         {
-            get { return IExecuteWithSignature<int>("getUtf16Offset", "()I"); }
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getRelatedNode", "()Lorg/w3c/dom/Node;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMStringList.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMStringList.cs
index 0e1cab2fb..362fdf612 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DOMStringList.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DOMStringList.cs
@@ -64,14 +64,7 @@ public partial class DOMStringList : Org.W3c.Dom.IDOMStringList
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMStringList.html#getLength()"/> 
-        /// </summary>
-        public int Length
-        {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMStringList.html#contains(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMStringList.html#contains(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -80,7 +73,15 @@ public bool Contains(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DOMStringList.html#item(int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMStringList.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
+        {
+            return IExecuteWithSignature<int>("getLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DOMStringList.html#item(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Document.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Document.cs
index 3c54865ab..d401c733a 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Document.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Document.cs
@@ -64,77 +64,55 @@ public partial class Document : Org.W3c.Dom.IDocument
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getDoctype()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getStrictErrorChecking()"/>
         /// </summary>
-        public Org.W3c.Dom.DocumentType Doctype
+        /// <returns><see cref="bool"/></returns>
+        public bool GetStrictErrorChecking()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.DocumentType>("getDoctype", "()Lorg/w3c/dom/DocumentType;"); }
+            return IExecuteWithSignature<bool>("getStrictErrorChecking", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getDocumentElement()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getXmlStandalone()"/>
         /// </summary>
-        public Org.W3c.Dom.Element DocumentElement
+        /// <returns><see cref="bool"/></returns>
+        public bool GetXmlStandalone()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Element>("getDocumentElement", "()Lorg/w3c/dom/Element;"); }
+            return IExecuteWithSignature<bool>("getXmlStandalone", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getDocumentURI()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#setDocumentURI(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getDocumentURI()"/>
         /// </summary>
-        public Java.Lang.String DocumentURI
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetDocumentURI()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getDocumentURI", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setDocumentURI", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getDocumentURI", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getDomConfig()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getInputEncoding()"/>
         /// </summary>
-        public Org.W3c.Dom.DOMConfiguration DomConfig
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInputEncoding()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.DOMConfiguration>("getDomConfig", "()Lorg/w3c/dom/DOMConfiguration;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInputEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getImplementation()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getXmlEncoding()"/>
         /// </summary>
-        public Org.W3c.Dom.DOMImplementation Implementation
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetXmlEncoding()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.DOMImplementation>("getImplementation", "()Lorg/w3c/dom/DOMImplementation;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getXmlEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getInputEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getXmlVersion()"/>
         /// </summary>
-        public Java.Lang.String InputEncoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetXmlVersion()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInputEncoding", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getXmlVersion", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getStrictErrorChecking()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#setStrictErrorChecking(boolean)"/>
-        /// </summary>
-        public bool StrictErrorChecking
-        {
-            get { return IExecuteWithSignature<bool>("getStrictErrorChecking", "()Z"); } set { IExecuteWithSignature("setStrictErrorChecking", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getXmlEncoding()"/> 
-        /// </summary>
-        public Java.Lang.String XmlEncoding
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getXmlEncoding", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getXmlStandalone()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#setXmlStandalone(boolean)"/>
-        /// </summary>
-        public bool XmlStandalone
-        {
-            get { return IExecuteWithSignature<bool>("getXmlStandalone", "()Z"); } set { IExecuteWithSignature("setXmlStandalone", "(Z)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getXmlVersion()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#setXmlVersion(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String XmlVersion
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getXmlVersion", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setXmlVersion", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createAttribute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Attr"/></returns>
@@ -144,7 +122,7 @@ public Org.W3c.Dom.Attr CreateAttribute(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Attr>("createAttribute", "(Ljava/lang/String;)Lorg/w3c/dom/Attr;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createAttributeNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createAttributeNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -155,7 +133,7 @@ public Org.W3c.Dom.Attr CreateAttributeNS(Java.Lang.String arg0, Java.Lang.Strin
             return IExecute<Org.W3c.Dom.Attr>("createAttributeNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createCDATASection(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createCDATASection(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.CDATASection"/></returns>
@@ -165,7 +143,7 @@ public Org.W3c.Dom.CDATASection CreateCDATASection(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.CDATASection>("createCDATASection", "(Ljava/lang/String;)Lorg/w3c/dom/CDATASection;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createComment(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createComment(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Comment"/></returns>
@@ -174,7 +152,7 @@ public Org.W3c.Dom.Comment CreateComment(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Comment>("createComment", "(Ljava/lang/String;)Lorg/w3c/dom/Comment;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createDocumentFragment()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createDocumentFragment()"/>
         /// </summary>
         /// <returns><see cref="Org.W3c.Dom.DocumentFragment"/></returns>
         public Org.W3c.Dom.DocumentFragment CreateDocumentFragment()
@@ -182,7 +160,31 @@ public Org.W3c.Dom.DocumentFragment CreateDocumentFragment()
             return IExecuteWithSignature<Org.W3c.Dom.DocumentFragment>("createDocumentFragment", "()Lorg/w3c/dom/DocumentFragment;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createElement(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getDoctype()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.DocumentType"/></returns>
+        public Org.W3c.Dom.DocumentType GetDoctype()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.DocumentType>("getDoctype", "()Lorg/w3c/dom/DocumentType;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getDomConfig()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.DOMConfiguration"/></returns>
+        public Org.W3c.Dom.DOMConfiguration GetDomConfig()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.DOMConfiguration>("getDomConfig", "()Lorg/w3c/dom/DOMConfiguration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getImplementation()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.DOMImplementation"/></returns>
+        public Org.W3c.Dom.DOMImplementation GetImplementation()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.DOMImplementation>("getImplementation", "()Lorg/w3c/dom/DOMImplementation;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createElement(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Element"/></returns>
@@ -192,7 +194,7 @@ public Org.W3c.Dom.Element CreateElement(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Element>("createElement", "(Ljava/lang/String;)Lorg/w3c/dom/Element;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createElementNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createElementNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -203,7 +205,15 @@ public Org.W3c.Dom.Element CreateElementNS(Java.Lang.String arg0, Java.Lang.Stri
             return IExecute<Org.W3c.Dom.Element>("createElementNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getElementById(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getDocumentElement()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.Element"/></returns>
+        public Org.W3c.Dom.Element GetDocumentElement()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.Element>("getDocumentElement", "()Lorg/w3c/dom/Element;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getElementById(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Element"/></returns>
@@ -212,7 +222,7 @@ public Org.W3c.Dom.Element GetElementById(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Element>("getElementById", "(Ljava/lang/String;)Lorg/w3c/dom/Element;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createEntityReference(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createEntityReference(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.EntityReference"/></returns>
@@ -222,7 +232,7 @@ public Org.W3c.Dom.EntityReference CreateEntityReference(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.EntityReference>("createEntityReference", "(Ljava/lang/String;)Lorg/w3c/dom/EntityReference;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#adoptNode(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#adoptNode(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
@@ -232,7 +242,7 @@ public Org.W3c.Dom.Node AdoptNode(Org.W3c.Dom.Node arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Node>("adoptNode", "(Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#importNode(org.w3c.dom.Node,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#importNode(org.w3c.dom.Node,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -243,7 +253,7 @@ public Org.W3c.Dom.Node ImportNode(Org.W3c.Dom.Node arg0, bool arg1)
             return IExecute<Org.W3c.Dom.Node>("importNode", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#renameNode(org.w3c.dom.Node,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#renameNode(org.w3c.dom.Node,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -255,7 +265,7 @@ public Org.W3c.Dom.Node RenameNode(Org.W3c.Dom.Node arg0, Java.Lang.String arg1,
             return IExecute<Org.W3c.Dom.Node>("renameNode", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getElementsByTagName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getElementsByTagName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.NodeList"/></returns>
@@ -264,7 +274,7 @@ public Org.W3c.Dom.NodeList GetElementsByTagName(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.NodeList>("getElementsByTagName", "(Ljava/lang/String;)Lorg/w3c/dom/NodeList;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#getElementsByTagNameNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#getElementsByTagNameNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -274,7 +284,7 @@ public Org.W3c.Dom.NodeList GetElementsByTagNameNS(Java.Lang.String arg0, Java.L
             return IExecute<Org.W3c.Dom.NodeList>("getElementsByTagNameNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createProcessingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createProcessingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -285,7 +295,7 @@ public Org.W3c.Dom.ProcessingInstruction CreateProcessingInstruction(Java.Lang.S
             return IExecute<Org.W3c.Dom.ProcessingInstruction>("createProcessingInstruction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#createTextNode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#createTextNode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Text"/></returns>
@@ -294,12 +304,46 @@ public Org.W3c.Dom.Text CreateTextNode(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Text>("createTextNode", "(Ljava/lang/String;)Lorg/w3c/dom/Text;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Document.html#normalizeDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#normalizeDocument()"/>
         /// </summary>
         public void NormalizeDocument()
         {
             IExecuteWithSignature("normalizeDocument", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#setDocumentURI(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetDocumentURI(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setDocumentURI", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#setStrictErrorChecking(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetStrictErrorChecking(bool arg0)
+        {
+            IExecuteWithSignature("setStrictErrorChecking", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#setXmlStandalone(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public void SetXmlStandalone(bool arg0)
+        {
+            IExecuteWithSignature("setXmlStandalone", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Document.html#setXmlVersion(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public void SetXmlVersion(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setXmlVersion", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/DocumentType.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/DocumentType.cs
index 50505d4d3..44f810108 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/DocumentType.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/DocumentType.cs
@@ -64,46 +64,52 @@ public partial class DocumentType : Org.W3c.Dom.IDocumentType
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DocumentType.html#getEntities()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DocumentType.html#getInternalSubset()"/>
         /// </summary>
-        public Org.W3c.Dom.NamedNodeMap Entities
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInternalSubset()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.NamedNodeMap>("getEntities", "()Lorg/w3c/dom/NamedNodeMap;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInternalSubset", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DocumentType.html#getInternalSubset()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DocumentType.html#getName()"/>
         /// </summary>
-        public Java.Lang.String InternalSubset
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInternalSubset", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DocumentType.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DocumentType.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DocumentType.html#getNotations()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DocumentType.html#getSystemId()"/>
         /// </summary>
-        public Org.W3c.Dom.NamedNodeMap Notations
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.NamedNodeMap>("getNotations", "()Lorg/w3c/dom/NamedNodeMap;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DocumentType.html#getPublicId()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DocumentType.html#getEntities()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Org.W3c.Dom.NamedNodeMap"/></returns>
+        public Org.W3c.Dom.NamedNodeMap GetEntities()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Org.W3c.Dom.NamedNodeMap>("getEntities", "()Lorg/w3c/dom/NamedNodeMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/DocumentType.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/DocumentType.html#getNotations()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Org.W3c.Dom.NamedNodeMap"/></returns>
+        public Org.W3c.Dom.NamedNodeMap GetNotations()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Org.W3c.Dom.NamedNodeMap>("getNotations", "()Lorg/w3c/dom/NamedNodeMap;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Element.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Element.cs
index a56fafcb6..6703700ab 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Element.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Element.cs
@@ -64,21 +64,7 @@ public partial class Element : Org.W3c.Dom.IElement
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#getSchemaTypeInfo()"/> 
-        /// </summary>
-        public Org.W3c.Dom.TypeInfo SchemaTypeInfo
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.TypeInfo>("getSchemaTypeInfo", "()Lorg/w3c/dom/TypeInfo;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#getTagName()"/> 
-        /// </summary>
-        public Java.Lang.String TagName
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTagName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#hasAttribute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#hasAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -87,7 +73,7 @@ public bool HasAttribute(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("hasAttribute", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#hasAttributeNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#hasAttributeNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -98,7 +84,7 @@ public bool HasAttributeNS(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("hasAttributeNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#getAttribute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#getAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -107,7 +93,7 @@ public Java.Lang.String GetAttribute(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getAttribute", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#getAttributeNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#getAttributeNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -118,7 +104,15 @@ public Java.Lang.String GetAttributeNS(Java.Lang.String arg0, Java.Lang.String a
             return IExecute<Java.Lang.String>("getAttributeNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#getAttributeNode(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#getTagName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTagName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getTagName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#getAttributeNode(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Attr"/></returns>
@@ -127,7 +121,7 @@ public Org.W3c.Dom.Attr GetAttributeNode(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Attr>("getAttributeNode", "(Ljava/lang/String;)Lorg/w3c/dom/Attr;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#getAttributeNodeNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#getAttributeNodeNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -138,7 +132,7 @@ public Org.W3c.Dom.Attr GetAttributeNodeNS(Java.Lang.String arg0, Java.Lang.Stri
             return IExecute<Org.W3c.Dom.Attr>("getAttributeNodeNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#removeAttributeNode(org.w3c.dom.Attr)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#removeAttributeNode(org.w3c.dom.Attr)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Attr"/></param>
         /// <returns><see cref="Org.W3c.Dom.Attr"/></returns>
@@ -148,7 +142,7 @@ public Org.W3c.Dom.Attr RemoveAttributeNode(Org.W3c.Dom.Attr arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Attr>("removeAttributeNode", "(Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#setAttributeNode(org.w3c.dom.Attr)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#setAttributeNode(org.w3c.dom.Attr)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Attr"/></param>
         /// <returns><see cref="Org.W3c.Dom.Attr"/></returns>
@@ -158,7 +152,7 @@ public Org.W3c.Dom.Attr SetAttributeNode(Org.W3c.Dom.Attr arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Attr>("setAttributeNode", "(Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#setAttributeNodeNS(org.w3c.dom.Attr)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#setAttributeNodeNS(org.w3c.dom.Attr)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Attr"/></param>
         /// <returns><see cref="Org.W3c.Dom.Attr"/></returns>
@@ -168,7 +162,7 @@ public Org.W3c.Dom.Attr SetAttributeNodeNS(Org.W3c.Dom.Attr arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Attr>("setAttributeNodeNS", "(Lorg/w3c/dom/Attr;)Lorg/w3c/dom/Attr;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#getElementsByTagName(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#getElementsByTagName(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.NodeList"/></returns>
@@ -177,7 +171,7 @@ public Org.W3c.Dom.NodeList GetElementsByTagName(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.NodeList>("getElementsByTagName", "(Ljava/lang/String;)Lorg/w3c/dom/NodeList;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#getElementsByTagNameNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#getElementsByTagNameNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -188,7 +182,15 @@ public Org.W3c.Dom.NodeList GetElementsByTagNameNS(Java.Lang.String arg0, Java.L
             return IExecute<Org.W3c.Dom.NodeList>("getElementsByTagNameNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#removeAttribute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#getSchemaTypeInfo()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.TypeInfo"/></returns>
+        public Org.W3c.Dom.TypeInfo GetSchemaTypeInfo()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.TypeInfo>("getSchemaTypeInfo", "()Lorg/w3c/dom/TypeInfo;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#removeAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.W3c.Dom.DOMException"/>
@@ -197,7 +199,7 @@ public void RemoveAttribute(Java.Lang.String arg0)
             IExecuteWithSignature("removeAttribute", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#removeAttributeNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#removeAttributeNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -207,7 +209,7 @@ public void RemoveAttributeNS(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("removeAttributeNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#setAttribute(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#setAttribute(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -217,7 +219,7 @@ public void SetAttribute(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("setAttribute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#setAttributeNS(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#setAttributeNS(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -228,7 +230,7 @@ public void SetAttributeNS(Java.Lang.String arg0, Java.Lang.String arg1, Java.La
             IExecute("setAttributeNS", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#setIdAttribute(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#setIdAttribute(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -238,7 +240,7 @@ public void SetIdAttribute(Java.Lang.String arg0, bool arg1)
             IExecute("setIdAttribute", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#setIdAttributeNode(org.w3c.dom.Attr,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#setIdAttributeNode(org.w3c.dom.Attr,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Attr"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -248,7 +250,7 @@ public void SetIdAttributeNode(Org.W3c.Dom.Attr arg0, bool arg1)
             IExecute("setIdAttributeNode", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Element.html#setIdAttributeNS(java.lang.String,java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Element.html#setIdAttributeNS(java.lang.String,java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Entity.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Entity.cs
index ae14c716b..455263be1 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Entity.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Entity.cs
@@ -64,46 +64,52 @@ public partial class Entity : Org.W3c.Dom.IEntity
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Entity.html#getInputEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Entity.html#getInputEncoding()"/>
         /// </summary>
-        public Java.Lang.String InputEncoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInputEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInputEncoding", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getInputEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Entity.html#getNotationName()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Entity.html#getNotationName()"/>
         /// </summary>
-        public Java.Lang.String NotationName
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNotationName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNotationName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNotationName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Entity.html#getPublicId()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Entity.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Entity.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Entity.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Entity.html#getXmlEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Entity.html#getXmlEncoding()"/>
         /// </summary>
-        public Java.Lang.String XmlEncoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetXmlEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getXmlEncoding", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getXmlEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Entity.html#getXmlVersion()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Entity.html#getXmlVersion()"/>
         /// </summary>
-        public Java.Lang.String XmlVersion
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetXmlVersion()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getXmlVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getXmlVersion", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/AllPackageClasses.cs
index 0a0cc6cac..192ac4227 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Org.W3c.Dom.Ls
 {
     #region DOMImplementationLS
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/DOMImplementationLS.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/DOMImplementationLS.html"/>
     /// </summary>
     public partial class DOMImplementationLS : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DOMImplementationLS>
     {
@@ -36,12 +36,12 @@ public partial class DOMImplementationLS : MASES.JCOBridge.C2JBridge.JVMBridgeBa
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DOMImplementationLS class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMImplementationLS class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMImplementationLS() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DOMImplementationLS class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DOMImplementationLS class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DOMImplementationLS(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public DOMImplementationLS(params object[] args) : base(args) { }
 
     #region LSException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSException.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSException.html"/>
     /// </summary>
     public partial class LSException : Java.Lang.RuntimeException
     {
@@ -91,7 +91,7 @@ public partial class LSException : Java.Lang.RuntimeException
 
     #region LSInput
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html"/>
     /// </summary>
     public partial class LSInput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSInput>
     {
@@ -99,12 +99,12 @@ public partial class LSInput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSInput>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LSInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSInput() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LSInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSInput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSInput(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -137,7 +137,7 @@ public LSInput(params object[] args) : base(args) { }
 
     #region LSOutput
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html"/>
     /// </summary>
     public partial class LSOutput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSOutput>
     {
@@ -145,12 +145,12 @@ public partial class LSOutput : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSOutput
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LSOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSOutput() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LSOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSOutput class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSOutput(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -183,7 +183,7 @@ public LSOutput(params object[] args) : base(args) { }
 
     #region LSParser
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html"/>
     /// </summary>
     public partial class LSParser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSParser>
     {
@@ -191,12 +191,12 @@ public partial class LSParser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSParser
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LSParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSParser() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LSParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSParser(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -229,7 +229,7 @@ public LSParser(params object[] args) : base(args) { }
 
     #region LSParserFilter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParserFilter.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParserFilter.html"/>
     /// </summary>
     public partial class LSParserFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSParserFilter>
     {
@@ -237,12 +237,12 @@ public partial class LSParserFilter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LS
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LSParserFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSParserFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSParserFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LSParserFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSParserFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSParserFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -275,7 +275,7 @@ public LSParserFilter(params object[] args) : base(args) { }
 
     #region LSResourceResolver
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSResourceResolver.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSResourceResolver.html"/>
     /// </summary>
     public partial class LSResourceResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSResourceResolver>
     {
@@ -283,12 +283,12 @@ public partial class LSResourceResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBas
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LSResourceResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSResourceResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSResourceResolver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LSResourceResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSResourceResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSResourceResolver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -321,7 +321,7 @@ public LSResourceResolver(params object[] args) : base(args) { }
 
     #region LSSerializer
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSSerializer.html"/>
+    /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSSerializer.html"/>
     /// </summary>
     public partial class LSSerializer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSSerializer>
     {
@@ -329,12 +329,12 @@ public partial class LSSerializer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LSSe
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LSSerializer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSSerializer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSSerializer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LSSerializer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LSSerializer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LSSerializer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/DOMImplementationLS.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/DOMImplementationLS.cs
index c74dd42a6..f72074a66 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/DOMImplementationLS.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/DOMImplementationLS.cs
@@ -56,13 +56,13 @@ public partial class DOMImplementationLS : Org.W3c.Dom.Ls.IDOMImplementationLS
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/DOMImplementationLS.html#MODE_ASYNCHRONOUS"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/DOMImplementationLS.html#MODE_ASYNCHRONOUS"/>
         /// </summary>
         public static short MODE_ASYNCHRONOUS { get { if (!_MODE_ASYNCHRONOUSReady) { _MODE_ASYNCHRONOUSContent = SGetField<short>(LocalBridgeClazz, "MODE_ASYNCHRONOUS"); _MODE_ASYNCHRONOUSReady = true; } return _MODE_ASYNCHRONOUSContent; } }
         private static short _MODE_ASYNCHRONOUSContent = default;
         private static bool _MODE_ASYNCHRONOUSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/DOMImplementationLS.html#MODE_SYNCHRONOUS"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/DOMImplementationLS.html#MODE_SYNCHRONOUS"/>
         /// </summary>
         public static short MODE_SYNCHRONOUS { get { if (!_MODE_SYNCHRONOUSReady) { _MODE_SYNCHRONOUSContent = SGetField<short>(LocalBridgeClazz, "MODE_SYNCHRONOUS"); _MODE_SYNCHRONOUSReady = true; } return _MODE_SYNCHRONOUSContent; } }
         private static short _MODE_SYNCHRONOUSContent = default;
@@ -76,7 +76,7 @@ public partial class DOMImplementationLS : Org.W3c.Dom.Ls.IDOMImplementationLS
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/DOMImplementationLS.html#createLSInput()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/DOMImplementationLS.html#createLSInput()"/>
         /// </summary>
         /// <returns><see cref="Org.W3c.Dom.Ls.LSInput"/></returns>
         public Org.W3c.Dom.Ls.LSInput CreateLSInput()
@@ -84,7 +84,7 @@ public Org.W3c.Dom.Ls.LSInput CreateLSInput()
             return IExecuteWithSignature<Org.W3c.Dom.Ls.LSInput>("createLSInput", "()Lorg/w3c/dom/ls/LSInput;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/DOMImplementationLS.html#createLSOutput()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/DOMImplementationLS.html#createLSOutput()"/>
         /// </summary>
         /// <returns><see cref="Org.W3c.Dom.Ls.LSOutput"/></returns>
         public Org.W3c.Dom.Ls.LSOutput CreateLSOutput()
@@ -92,7 +92,7 @@ public Org.W3c.Dom.Ls.LSOutput CreateLSOutput()
             return IExecuteWithSignature<Org.W3c.Dom.Ls.LSOutput>("createLSOutput", "()Lorg/w3c/dom/ls/LSOutput;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/DOMImplementationLS.html#createLSParser(short,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/DOMImplementationLS.html#createLSParser(short,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -103,7 +103,7 @@ public Org.W3c.Dom.Ls.LSParser CreateLSParser(short arg0, Java.Lang.String arg1)
             return IExecute<Org.W3c.Dom.Ls.LSParser>("createLSParser", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/DOMImplementationLS.html#createLSSerializer()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/DOMImplementationLS.html#createLSSerializer()"/>
         /// </summary>
         /// <returns><see cref="Org.W3c.Dom.Ls.LSSerializer"/></returns>
         public Org.W3c.Dom.Ls.LSSerializer CreateLSSerializer()
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSInput.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSInput.cs
index 166173a5e..0eea971b3 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSInput.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSInput.cs
@@ -64,60 +64,132 @@ public partial class LSInput : Org.W3c.Dom.Ls.ILSInput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#getBaseURI()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#setBaseURI(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#getCertifiedText()"/>
         /// </summary>
-        public Java.Lang.String BaseURI
+        /// <returns><see cref="bool"/></returns>
+        public bool GetCertifiedText()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBaseURI", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setBaseURI", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<bool>("getCertifiedText", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#getByteStream()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#setByteStream(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#getByteStream()"/>
         /// </summary>
-        public Java.Io.InputStream ByteStream
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetByteStream()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getByteStream", "()Ljava/io/InputStream;"); } set { IExecuteWithSignature("setByteStream", "(Ljava/io/InputStream;)V", value); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getByteStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#getCertifiedText()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#setCertifiedText(boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#getCharacterStream()"/>
         /// </summary>
-        public bool CertifiedText
+        /// <returns><see cref="Java.Io.Reader"/></returns>
+        public Java.Io.Reader GetCharacterStream()
         {
-            get { return IExecuteWithSignature<bool>("getCertifiedText", "()Z"); } set { IExecuteWithSignature("setCertifiedText", "(Z)V", value); }
+            return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "()Ljava/io/Reader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#getCharacterStream()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#setCharacterStream(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#getBaseURI()"/>
         /// </summary>
-        public Java.Io.Reader CharacterStream
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBaseURI()
         {
-            get { return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "()Ljava/io/Reader;"); } set { IExecuteWithSignature("setCharacterStream", "(Ljava/io/Reader;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getBaseURI", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#getEncoding()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#setEncoding(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#getEncoding()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#getPublicId()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#setPublicId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPublicId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#getStringData()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#setStringData(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#getStringData()"/>
         /// </summary>
-        public Java.Lang.String StringData
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetStringData()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getStringData", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setStringData", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getStringData", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSInput.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#setBaseURI(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetBaseURI(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setBaseURI", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#setByteStream(java.io.InputStream)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
+        public void SetByteStream(Java.Io.InputStream arg0)
+        {
+            IExecuteWithSignature("setByteStream", "(Ljava/io/InputStream;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#setCertifiedText(boolean)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="bool"/></param>
+        public void SetCertifiedText(bool arg0)
+        {
+            IExecuteWithSignature("setCertifiedText", "(Z)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#setCharacterStream(java.io.Reader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
+        public void SetCharacterStream(Java.Io.Reader arg0)
+        {
+            IExecuteWithSignature("setCharacterStream", "(Ljava/io/Reader;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#setEncoding(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEncoding(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#setPublicId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPublicId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPublicId", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#setStringData(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetStringData(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setStringData", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSInput.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSOutput.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSOutput.cs
index c9d6317b0..5b1ba4125 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSOutput.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSOutput.cs
@@ -64,32 +64,68 @@ public partial class LSOutput : Org.W3c.Dom.Ls.ILSOutput
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html#getByteStream()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html#setByteStream(java.io.OutputStream)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html#getByteStream()"/>
         /// </summary>
-        public Java.Io.OutputStream ByteStream
+        /// <returns><see cref="Java.Io.OutputStream"/></returns>
+        public Java.Io.OutputStream GetByteStream()
         {
-            get { return IExecuteWithSignature<Java.Io.OutputStream>("getByteStream", "()Ljava/io/OutputStream;"); } set { IExecuteWithSignature("setByteStream", "(Ljava/io/OutputStream;)V", value); }
+            return IExecuteWithSignature<Java.Io.OutputStream>("getByteStream", "()Ljava/io/OutputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html#getCharacterStream()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html#setCharacterStream(java.io.Writer)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html#getCharacterStream()"/>
         /// </summary>
-        public Java.Io.Writer CharacterStream
+        /// <returns><see cref="Java.Io.Writer"/></returns>
+        public Java.Io.Writer GetCharacterStream()
         {
-            get { return IExecuteWithSignature<Java.Io.Writer>("getCharacterStream", "()Ljava/io/Writer;"); } set { IExecuteWithSignature("setCharacterStream", "(Ljava/io/Writer;)V", value); }
+            return IExecuteWithSignature<Java.Io.Writer>("getCharacterStream", "()Ljava/io/Writer;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html#getEncoding()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html#setEncoding(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html#getEncoding()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSOutput.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html#setByteStream(java.io.OutputStream)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.OutputStream"/></param>
+        public void SetByteStream(Java.Io.OutputStream arg0)
+        {
+            IExecuteWithSignature("setByteStream", "(Ljava/io/OutputStream;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html#setCharacterStream(java.io.Writer)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.Writer"/></param>
+        public void SetCharacterStream(Java.Io.Writer arg0)
+        {
+            IExecuteWithSignature("setCharacterStream", "(Ljava/io/Writer;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html#setEncoding(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEncoding(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSOutput.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSParser.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSParser.cs
index 409381fde..7e1bd83f8 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSParser.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSParser.cs
@@ -56,31 +56,31 @@ public partial class LSParser : Org.W3c.Dom.Ls.ILSParser
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#ACTION_APPEND_AS_CHILDREN"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#ACTION_APPEND_AS_CHILDREN"/>
         /// </summary>
         public static short ACTION_APPEND_AS_CHILDREN { get { if (!_ACTION_APPEND_AS_CHILDRENReady) { _ACTION_APPEND_AS_CHILDRENContent = SGetField<short>(LocalBridgeClazz, "ACTION_APPEND_AS_CHILDREN"); _ACTION_APPEND_AS_CHILDRENReady = true; } return _ACTION_APPEND_AS_CHILDRENContent; } }
         private static short _ACTION_APPEND_AS_CHILDRENContent = default;
         private static bool _ACTION_APPEND_AS_CHILDRENReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#ACTION_INSERT_AFTER"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#ACTION_INSERT_AFTER"/>
         /// </summary>
         public static short ACTION_INSERT_AFTER { get { if (!_ACTION_INSERT_AFTERReady) { _ACTION_INSERT_AFTERContent = SGetField<short>(LocalBridgeClazz, "ACTION_INSERT_AFTER"); _ACTION_INSERT_AFTERReady = true; } return _ACTION_INSERT_AFTERContent; } }
         private static short _ACTION_INSERT_AFTERContent = default;
         private static bool _ACTION_INSERT_AFTERReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#ACTION_INSERT_BEFORE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#ACTION_INSERT_BEFORE"/>
         /// </summary>
         public static short ACTION_INSERT_BEFORE { get { if (!_ACTION_INSERT_BEFOREReady) { _ACTION_INSERT_BEFOREContent = SGetField<short>(LocalBridgeClazz, "ACTION_INSERT_BEFORE"); _ACTION_INSERT_BEFOREReady = true; } return _ACTION_INSERT_BEFOREContent; } }
         private static short _ACTION_INSERT_BEFOREContent = default;
         private static bool _ACTION_INSERT_BEFOREReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#ACTION_REPLACE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#ACTION_REPLACE"/>
         /// </summary>
         public static short ACTION_REPLACE { get { if (!_ACTION_REPLACEReady) { _ACTION_REPLACEContent = SGetField<short>(LocalBridgeClazz, "ACTION_REPLACE"); _ACTION_REPLACEReady = true; } return _ACTION_REPLACEContent; } }
         private static short _ACTION_REPLACEContent = default;
         private static bool _ACTION_REPLACEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#ACTION_REPLACE_CHILDREN"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#ACTION_REPLACE_CHILDREN"/>
         /// </summary>
         public static short ACTION_REPLACE_CHILDREN { get { if (!_ACTION_REPLACE_CHILDRENReady) { _ACTION_REPLACE_CHILDRENContent = SGetField<short>(LocalBridgeClazz, "ACTION_REPLACE_CHILDREN"); _ACTION_REPLACE_CHILDRENReady = true; } return _ACTION_REPLACE_CHILDRENContent; } }
         private static short _ACTION_REPLACE_CHILDRENContent = default;
@@ -94,35 +94,23 @@ public partial class LSParser : Org.W3c.Dom.Ls.ILSParser
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#getAsync()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#getAsync()"/>
         /// </summary>
-        public bool Async
+        /// <returns><see cref="bool"/></returns>
+        public bool GetAsync()
         {
-            get { return IExecuteWithSignature<bool>("getAsync", "()Z"); }
+            return IExecuteWithSignature<bool>("getAsync", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#getBusy()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#getBusy()"/>
         /// </summary>
-        public bool Busy
+        /// <returns><see cref="bool"/></returns>
+        public bool GetBusy()
         {
-            get { return IExecuteWithSignature<bool>("getBusy", "()Z"); }
+            return IExecuteWithSignature<bool>("getBusy", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#getDomConfig()"/> 
-        /// </summary>
-        public Org.W3c.Dom.DOMConfiguration DomConfig
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.DOMConfiguration>("getDomConfig", "()Lorg/w3c/dom/DOMConfiguration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#getFilter()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#setFilter(org.w3c.dom.ls.LSParserFilter)"/>
-        /// </summary>
-        public Org.W3c.Dom.Ls.LSParserFilter Filter
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Ls.LSParserFilter>("getFilter", "()Lorg/w3c/dom/ls/LSParserFilter;"); } set { IExecuteWithSignature("setFilter", "(Lorg/w3c/dom/ls/LSParserFilter;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#parse(org.w3c.dom.ls.LSInput)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#parse(org.w3c.dom.ls.LSInput)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Ls.LSInput"/></param>
         /// <returns><see cref="Org.W3c.Dom.Document"/></returns>
@@ -133,7 +121,7 @@ public Org.W3c.Dom.Document Parse(Org.W3c.Dom.Ls.LSInput arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Document>("parse", "(Lorg/w3c/dom/ls/LSInput;)Lorg/w3c/dom/Document;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#parseURI(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#parseURI(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Document"/></returns>
@@ -144,7 +132,23 @@ public Org.W3c.Dom.Document ParseURI(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Document>("parseURI", "(Ljava/lang/String;)Lorg/w3c/dom/Document;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#parseWithContext(org.w3c.dom.ls.LSInput,org.w3c.dom.Node,short)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#getDomConfig()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.DOMConfiguration"/></returns>
+        public Org.W3c.Dom.DOMConfiguration GetDomConfig()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.DOMConfiguration>("getDomConfig", "()Lorg/w3c/dom/DOMConfiguration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#getFilter()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.Ls.LSParserFilter"/></returns>
+        public Org.W3c.Dom.Ls.LSParserFilter GetFilter()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.Ls.LSParserFilter>("getFilter", "()Lorg/w3c/dom/ls/LSParserFilter;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#parseWithContext(org.w3c.dom.ls.LSInput,org.w3c.dom.Node,short)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Ls.LSInput"/></param>
         /// <param name="arg1"><see cref="Org.W3c.Dom.Node"/></param>
@@ -157,12 +161,20 @@ public Org.W3c.Dom.Node ParseWithContext(Org.W3c.Dom.Ls.LSInput arg0, Org.W3c.Do
             return IExecute<Org.W3c.Dom.Node>("parseWithContext", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParser.html#abort()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#abort()"/>
         /// </summary>
         public void Abort()
         {
             IExecuteWithSignature("abort", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParser.html#setFilter(org.w3c.dom.ls.LSParserFilter)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Ls.LSParserFilter"/></param>
+        public void SetFilter(Org.W3c.Dom.Ls.LSParserFilter arg0)
+        {
+            IExecuteWithSignature("setFilter", "(Lorg/w3c/dom/ls/LSParserFilter;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSParserFilter.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSParserFilter.cs
index b23662f1a..815524ae8 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSParserFilter.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSParserFilter.cs
@@ -56,25 +56,25 @@ public partial class LSParserFilter : Org.W3c.Dom.Ls.ILSParserFilter
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParserFilter.html#FILTER_ACCEPT"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParserFilter.html#FILTER_ACCEPT"/>
         /// </summary>
         public static short FILTER_ACCEPT { get { if (!_FILTER_ACCEPTReady) { _FILTER_ACCEPTContent = SGetField<short>(LocalBridgeClazz, "FILTER_ACCEPT"); _FILTER_ACCEPTReady = true; } return _FILTER_ACCEPTContent; } }
         private static short _FILTER_ACCEPTContent = default;
         private static bool _FILTER_ACCEPTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParserFilter.html#FILTER_INTERRUPT"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParserFilter.html#FILTER_INTERRUPT"/>
         /// </summary>
         public static short FILTER_INTERRUPT { get { if (!_FILTER_INTERRUPTReady) { _FILTER_INTERRUPTContent = SGetField<short>(LocalBridgeClazz, "FILTER_INTERRUPT"); _FILTER_INTERRUPTReady = true; } return _FILTER_INTERRUPTContent; } }
         private static short _FILTER_INTERRUPTContent = default;
         private static bool _FILTER_INTERRUPTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParserFilter.html#FILTER_REJECT"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParserFilter.html#FILTER_REJECT"/>
         /// </summary>
         public static short FILTER_REJECT { get { if (!_FILTER_REJECTReady) { _FILTER_REJECTContent = SGetField<short>(LocalBridgeClazz, "FILTER_REJECT"); _FILTER_REJECTReady = true; } return _FILTER_REJECTContent; } }
         private static short _FILTER_REJECTContent = default;
         private static bool _FILTER_REJECTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParserFilter.html#FILTER_SKIP"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParserFilter.html#FILTER_SKIP"/>
         /// </summary>
         public static short FILTER_SKIP { get { if (!_FILTER_SKIPReady) { _FILTER_SKIPContent = SGetField<short>(LocalBridgeClazz, "FILTER_SKIP"); _FILTER_SKIPReady = true; } return _FILTER_SKIPContent; } }
         private static short _FILTER_SKIPContent = default;
@@ -88,14 +88,15 @@ public partial class LSParserFilter : Org.W3c.Dom.Ls.ILSParserFilter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParserFilter.html#getWhatToShow()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParserFilter.html#getWhatToShow()"/>
         /// </summary>
-        public int WhatToShow
+        /// <returns><see cref="int"/></returns>
+        public int GetWhatToShow()
         {
-            get { return IExecuteWithSignature<int>("getWhatToShow", "()I"); }
+            return IExecuteWithSignature<int>("getWhatToShow", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParserFilter.html#acceptNode(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParserFilter.html#acceptNode(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <returns><see cref="short"/></returns>
@@ -104,7 +105,7 @@ public short AcceptNode(Org.W3c.Dom.Node arg0)
             return IExecuteWithSignature<short>("acceptNode", "(Lorg/w3c/dom/Node;)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSParserFilter.html#startElement(org.w3c.dom.Element)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSParserFilter.html#startElement(org.w3c.dom.Element)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Element"/></param>
         /// <returns><see cref="short"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSResourceResolver.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSResourceResolver.cs
index a55cc3e3e..947cfb2ca 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSResourceResolver.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSResourceResolver.cs
@@ -64,7 +64,7 @@ public partial class LSResourceResolver : Org.W3c.Dom.Ls.ILSResourceResolver
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSResourceResolver.html#resolveResource(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSResourceResolver.html#resolveResource(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSSerializer.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSSerializer.cs
index 01789a649..3c96e6045 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSSerializer.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Ls/LSSerializer.cs
@@ -64,21 +64,7 @@ public partial class LSSerializer : Org.W3c.Dom.Ls.ILSSerializer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSSerializer.html#getDomConfig()"/> 
-        /// </summary>
-        public Org.W3c.Dom.DOMConfiguration DomConfig
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.DOMConfiguration>("getDomConfig", "()Lorg/w3c/dom/DOMConfiguration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSSerializer.html#getNewLine()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSSerializer.html#setNewLine(java.lang.String)"/>
-        /// </summary>
-        public Java.Lang.String NewLine
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNewLine", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNewLine", "(Ljava/lang/String;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSSerializer.html#write(org.w3c.dom.Node,org.w3c.dom.ls.LSOutput)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSSerializer.html#write(org.w3c.dom.Node,org.w3c.dom.ls.LSOutput)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Org.W3c.Dom.Ls.LSOutput"/></param>
@@ -89,7 +75,7 @@ public bool Write(Org.W3c.Dom.Node arg0, Org.W3c.Dom.Ls.LSOutput arg1)
             return IExecute<bool>("write", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSSerializer.html#writeToURI(org.w3c.dom.Node,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSSerializer.html#writeToURI(org.w3c.dom.Node,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -100,7 +86,15 @@ public bool WriteToURI(Org.W3c.Dom.Node arg0, Java.Lang.String arg1)
             return IExecute<bool>("writeToURI", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ls/LSSerializer.html#writeToString(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSSerializer.html#getNewLine()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNewLine()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNewLine", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSSerializer.html#writeToString(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -110,6 +104,22 @@ public Java.Lang.String WriteToString(Org.W3c.Dom.Node arg0)
         {
             return IExecuteWithSignature<Java.Lang.String>("writeToString", "(Lorg/w3c/dom/Node;)Ljava/lang/String;", arg0);
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSSerializer.html#getDomConfig()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.DOMConfiguration"/></returns>
+        public Org.W3c.Dom.DOMConfiguration GetDomConfig()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.DOMConfiguration>("getDomConfig", "()Lorg/w3c/dom/DOMConfiguration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ls/LSSerializer.html#setNewLine(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetNewLine(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setNewLine", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/NameList.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/NameList.cs
index 4bf97dd5b..5ca0fd40c 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/NameList.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/NameList.cs
@@ -64,14 +64,7 @@ public partial class NameList : Org.W3c.Dom.INameList
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NameList.html#getLength()"/> 
-        /// </summary>
-        public int Length
-        {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NameList.html#contains(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NameList.html#contains(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -80,7 +73,7 @@ public bool Contains(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("contains", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NameList.html#containsNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NameList.html#containsNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -90,7 +83,15 @@ public bool ContainsNS(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("containsNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NameList.html#getName(int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NameList.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
+        {
+            return IExecuteWithSignature<int>("getLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NameList.html#getName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -99,7 +100,7 @@ public Java.Lang.String GetName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NameList.html#getNamespaceURI(int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NameList.html#getNamespaceURI(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/NamedNodeMap.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/NamedNodeMap.cs
index d3c544823..b09dfa357 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/NamedNodeMap.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/NamedNodeMap.cs
@@ -64,14 +64,15 @@ public partial class NamedNodeMap : Org.W3c.Dom.INamedNodeMap
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html#getLength()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html#getNamedItem(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html#getNamedItem(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
@@ -80,7 +81,7 @@ public Org.W3c.Dom.Node GetNamedItem(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Node>("getNamedItem", "(Ljava/lang/String;)Lorg/w3c/dom/Node;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html#getNamedItemNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html#getNamedItemNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -91,7 +92,7 @@ public Org.W3c.Dom.Node GetNamedItemNS(Java.Lang.String arg0, Java.Lang.String a
             return IExecute<Org.W3c.Dom.Node>("getNamedItemNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html#item(int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html#item(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
@@ -100,7 +101,7 @@ public Org.W3c.Dom.Node Item(int arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Node>("item", "(I)Lorg/w3c/dom/Node;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html#removeNamedItem(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html#removeNamedItem(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
@@ -110,7 +111,7 @@ public Org.W3c.Dom.Node RemoveNamedItem(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Node>("removeNamedItem", "(Ljava/lang/String;)Lorg/w3c/dom/Node;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html#removeNamedItemNS(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html#removeNamedItemNS(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -121,7 +122,7 @@ public Org.W3c.Dom.Node RemoveNamedItemNS(Java.Lang.String arg0, Java.Lang.Strin
             return IExecute<Org.W3c.Dom.Node>("removeNamedItemNS", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html#setNamedItem(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html#setNamedItem(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
@@ -131,7 +132,7 @@ public Org.W3c.Dom.Node SetNamedItem(Org.W3c.Dom.Node arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Node>("setNamedItem", "(Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NamedNodeMap.html#setNamedItemNS(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NamedNodeMap.html#setNamedItemNS(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Node.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Node.cs
index 4d47a5342..a47f06f84 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Node.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Node.cs
@@ -56,109 +56,109 @@ public partial class Node : Org.W3c.Dom.INode
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#ATTRIBUTE_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#ATTRIBUTE_NODE"/>
         /// </summary>
         public static short ATTRIBUTE_NODE { get { if (!_ATTRIBUTE_NODEReady) { _ATTRIBUTE_NODEContent = SGetField<short>(LocalBridgeClazz, "ATTRIBUTE_NODE"); _ATTRIBUTE_NODEReady = true; } return _ATTRIBUTE_NODEContent; } }
         private static short _ATTRIBUTE_NODEContent = default;
         private static bool _ATTRIBUTE_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#CDATA_SECTION_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#CDATA_SECTION_NODE"/>
         /// </summary>
         public static short CDATA_SECTION_NODE { get { if (!_CDATA_SECTION_NODEReady) { _CDATA_SECTION_NODEContent = SGetField<short>(LocalBridgeClazz, "CDATA_SECTION_NODE"); _CDATA_SECTION_NODEReady = true; } return _CDATA_SECTION_NODEContent; } }
         private static short _CDATA_SECTION_NODEContent = default;
         private static bool _CDATA_SECTION_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#COMMENT_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#COMMENT_NODE"/>
         /// </summary>
         public static short COMMENT_NODE { get { if (!_COMMENT_NODEReady) { _COMMENT_NODEContent = SGetField<short>(LocalBridgeClazz, "COMMENT_NODE"); _COMMENT_NODEReady = true; } return _COMMENT_NODEContent; } }
         private static short _COMMENT_NODEContent = default;
         private static bool _COMMENT_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_FRAGMENT_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_FRAGMENT_NODE"/>
         /// </summary>
         public static short DOCUMENT_FRAGMENT_NODE { get { if (!_DOCUMENT_FRAGMENT_NODEReady) { _DOCUMENT_FRAGMENT_NODEContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_FRAGMENT_NODE"); _DOCUMENT_FRAGMENT_NODEReady = true; } return _DOCUMENT_FRAGMENT_NODEContent; } }
         private static short _DOCUMENT_FRAGMENT_NODEContent = default;
         private static bool _DOCUMENT_FRAGMENT_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_NODE"/>
         /// </summary>
         public static short DOCUMENT_NODE { get { if (!_DOCUMENT_NODEReady) { _DOCUMENT_NODEContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_NODE"); _DOCUMENT_NODEReady = true; } return _DOCUMENT_NODEContent; } }
         private static short _DOCUMENT_NODEContent = default;
         private static bool _DOCUMENT_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_POSITION_CONTAINED_BY"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_POSITION_CONTAINED_BY"/>
         /// </summary>
         public static short DOCUMENT_POSITION_CONTAINED_BY { get { if (!_DOCUMENT_POSITION_CONTAINED_BYReady) { _DOCUMENT_POSITION_CONTAINED_BYContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_POSITION_CONTAINED_BY"); _DOCUMENT_POSITION_CONTAINED_BYReady = true; } return _DOCUMENT_POSITION_CONTAINED_BYContent; } }
         private static short _DOCUMENT_POSITION_CONTAINED_BYContent = default;
         private static bool _DOCUMENT_POSITION_CONTAINED_BYReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_POSITION_CONTAINS"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_POSITION_CONTAINS"/>
         /// </summary>
         public static short DOCUMENT_POSITION_CONTAINS { get { if (!_DOCUMENT_POSITION_CONTAINSReady) { _DOCUMENT_POSITION_CONTAINSContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_POSITION_CONTAINS"); _DOCUMENT_POSITION_CONTAINSReady = true; } return _DOCUMENT_POSITION_CONTAINSContent; } }
         private static short _DOCUMENT_POSITION_CONTAINSContent = default;
         private static bool _DOCUMENT_POSITION_CONTAINSReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_POSITION_DISCONNECTED"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_POSITION_DISCONNECTED"/>
         /// </summary>
         public static short DOCUMENT_POSITION_DISCONNECTED { get { if (!_DOCUMENT_POSITION_DISCONNECTEDReady) { _DOCUMENT_POSITION_DISCONNECTEDContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_POSITION_DISCONNECTED"); _DOCUMENT_POSITION_DISCONNECTEDReady = true; } return _DOCUMENT_POSITION_DISCONNECTEDContent; } }
         private static short _DOCUMENT_POSITION_DISCONNECTEDContent = default;
         private static bool _DOCUMENT_POSITION_DISCONNECTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_POSITION_FOLLOWING"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_POSITION_FOLLOWING"/>
         /// </summary>
         public static short DOCUMENT_POSITION_FOLLOWING { get { if (!_DOCUMENT_POSITION_FOLLOWINGReady) { _DOCUMENT_POSITION_FOLLOWINGContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_POSITION_FOLLOWING"); _DOCUMENT_POSITION_FOLLOWINGReady = true; } return _DOCUMENT_POSITION_FOLLOWINGContent; } }
         private static short _DOCUMENT_POSITION_FOLLOWINGContent = default;
         private static bool _DOCUMENT_POSITION_FOLLOWINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC"/>
         /// </summary>
         public static short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC { get { if (!_DOCUMENT_POSITION_IMPLEMENTATION_SPECIFICReady) { _DOCUMENT_POSITION_IMPLEMENTATION_SPECIFICContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC"); _DOCUMENT_POSITION_IMPLEMENTATION_SPECIFICReady = true; } return _DOCUMENT_POSITION_IMPLEMENTATION_SPECIFICContent; } }
         private static short _DOCUMENT_POSITION_IMPLEMENTATION_SPECIFICContent = default;
         private static bool _DOCUMENT_POSITION_IMPLEMENTATION_SPECIFICReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_POSITION_PRECEDING"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_POSITION_PRECEDING"/>
         /// </summary>
         public static short DOCUMENT_POSITION_PRECEDING { get { if (!_DOCUMENT_POSITION_PRECEDINGReady) { _DOCUMENT_POSITION_PRECEDINGContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_POSITION_PRECEDING"); _DOCUMENT_POSITION_PRECEDINGReady = true; } return _DOCUMENT_POSITION_PRECEDINGContent; } }
         private static short _DOCUMENT_POSITION_PRECEDINGContent = default;
         private static bool _DOCUMENT_POSITION_PRECEDINGReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#DOCUMENT_TYPE_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#DOCUMENT_TYPE_NODE"/>
         /// </summary>
         public static short DOCUMENT_TYPE_NODE { get { if (!_DOCUMENT_TYPE_NODEReady) { _DOCUMENT_TYPE_NODEContent = SGetField<short>(LocalBridgeClazz, "DOCUMENT_TYPE_NODE"); _DOCUMENT_TYPE_NODEReady = true; } return _DOCUMENT_TYPE_NODEContent; } }
         private static short _DOCUMENT_TYPE_NODEContent = default;
         private static bool _DOCUMENT_TYPE_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#ELEMENT_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#ELEMENT_NODE"/>
         /// </summary>
         public static short ELEMENT_NODE { get { if (!_ELEMENT_NODEReady) { _ELEMENT_NODEContent = SGetField<short>(LocalBridgeClazz, "ELEMENT_NODE"); _ELEMENT_NODEReady = true; } return _ELEMENT_NODEContent; } }
         private static short _ELEMENT_NODEContent = default;
         private static bool _ELEMENT_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#ENTITY_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#ENTITY_NODE"/>
         /// </summary>
         public static short ENTITY_NODE { get { if (!_ENTITY_NODEReady) { _ENTITY_NODEContent = SGetField<short>(LocalBridgeClazz, "ENTITY_NODE"); _ENTITY_NODEReady = true; } return _ENTITY_NODEContent; } }
         private static short _ENTITY_NODEContent = default;
         private static bool _ENTITY_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#ENTITY_REFERENCE_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#ENTITY_REFERENCE_NODE"/>
         /// </summary>
         public static short ENTITY_REFERENCE_NODE { get { if (!_ENTITY_REFERENCE_NODEReady) { _ENTITY_REFERENCE_NODEContent = SGetField<short>(LocalBridgeClazz, "ENTITY_REFERENCE_NODE"); _ENTITY_REFERENCE_NODEReady = true; } return _ENTITY_REFERENCE_NODEContent; } }
         private static short _ENTITY_REFERENCE_NODEContent = default;
         private static bool _ENTITY_REFERENCE_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#NOTATION_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#NOTATION_NODE"/>
         /// </summary>
         public static short NOTATION_NODE { get { if (!_NOTATION_NODEReady) { _NOTATION_NODEContent = SGetField<short>(LocalBridgeClazz, "NOTATION_NODE"); _NOTATION_NODEReady = true; } return _NOTATION_NODEContent; } }
         private static short _NOTATION_NODEContent = default;
         private static bool _NOTATION_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#PROCESSING_INSTRUCTION_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#PROCESSING_INSTRUCTION_NODE"/>
         /// </summary>
         public static short PROCESSING_INSTRUCTION_NODE { get { if (!_PROCESSING_INSTRUCTION_NODEReady) { _PROCESSING_INSTRUCTION_NODEContent = SGetField<short>(LocalBridgeClazz, "PROCESSING_INSTRUCTION_NODE"); _PROCESSING_INSTRUCTION_NODEReady = true; } return _PROCESSING_INSTRUCTION_NODEContent; } }
         private static short _PROCESSING_INSTRUCTION_NODEContent = default;
         private static bool _PROCESSING_INSTRUCTION_NODEReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#TEXT_NODE"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#TEXT_NODE"/>
         /// </summary>
         public static short TEXT_NODE { get { if (!_TEXT_NODEReady) { _TEXT_NODEContent = SGetField<short>(LocalBridgeClazz, "TEXT_NODE"); _TEXT_NODEReady = true; } return _TEXT_NODEContent; } }
         private static short _TEXT_NODEContent = default;
@@ -172,239 +172,241 @@ public partial class Node : Org.W3c.Dom.INode
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getAttributes()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#hasAttributes()"/>
         /// </summary>
-        public Org.W3c.Dom.NamedNodeMap Attributes
-        {
-            get { return IExecuteWithSignature<Org.W3c.Dom.NamedNodeMap>("getAttributes", "()Lorg/w3c/dom/NamedNodeMap;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getBaseURI()"/> 
-        /// </summary>
-        public Java.Lang.String BaseURI
+        /// <returns><see cref="bool"/></returns>
+        public bool HasAttributes()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getBaseURI", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("hasAttributes", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getChildNodes()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#hasChildNodes()"/>
         /// </summary>
-        public Org.W3c.Dom.NodeList ChildNodes
+        /// <returns><see cref="bool"/></returns>
+        public bool HasChildNodes()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.NodeList>("getChildNodes", "()Lorg/w3c/dom/NodeList;"); }
+            return IExecuteWithSignature<bool>("hasChildNodes", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getFirstChild()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#isDefaultNamespace(java.lang.String)"/>
         /// </summary>
-        public Org.W3c.Dom.Node FirstChild
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDefaultNamespace(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getFirstChild", "()Lorg/w3c/dom/Node;"); }
+            return IExecuteWithSignature<bool>("isDefaultNamespace", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getLastChild()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#isEqualNode(org.w3c.dom.Node)"/>
         /// </summary>
-        public Org.W3c.Dom.Node LastChild
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEqualNode(Org.W3c.Dom.Node arg0)
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getLastChild", "()Lorg/w3c/dom/Node;"); }
+            return IExecuteWithSignature<bool>("isEqualNode", "(Lorg/w3c/dom/Node;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getLocalName()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#isSameNode(org.w3c.dom.Node)"/>
         /// </summary>
-        public Java.Lang.String LocalName
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSameNode(Org.W3c.Dom.Node arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getLocalName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isSameNode", "(Lorg/w3c/dom/Node;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getNamespaceURI()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#isSupported(java.lang.String,java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String NamespaceURI
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsSupported(Java.Lang.String arg0, Java.Lang.String arg1)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespaceURI", "()Ljava/lang/String;"); }
+            return IExecute<bool>("isSupported", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getNextSibling()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getFeature(java.lang.String,java.lang.String)"/>
         /// </summary>
-        public Org.W3c.Dom.Node NextSibling
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="object"/></returns>
+        public object GetFeature(Java.Lang.String arg0, Java.Lang.String arg1)
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getNextSibling", "()Lorg/w3c/dom/Node;"); }
+            return IExecute("getFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getNodeName()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getUserData(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String NodeName
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="object"/></returns>
+        public object GetUserData(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNodeName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature("getUserData", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getNodeType()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#setUserData(java.lang.String,java.lang.Object,org.w3c.dom.UserDataHandler)"/>
         /// </summary>
-        public short NodeType
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="object"/></param>
+        /// <param name="arg2"><see cref="Org.W3c.Dom.UserDataHandler"/></param>
+        /// <returns><see cref="object"/></returns>
+        public object SetUserData(Java.Lang.String arg0, object arg1, Org.W3c.Dom.UserDataHandler arg2)
         {
-            get { return IExecuteWithSignature<short>("getNodeType", "()S"); }
+            return IExecute("setUserData", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getNodeValue()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#setNodeValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getBaseURI()"/>
         /// </summary>
-        public Java.Lang.String NodeValue
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetBaseURI()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNodeValue", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setNodeValue", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getBaseURI", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getOwnerDocument()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getLocalName()"/>
         /// </summary>
-        public Org.W3c.Dom.Document OwnerDocument
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetLocalName()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Document>("getOwnerDocument", "()Lorg/w3c/dom/Document;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getLocalName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getParentNode()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getNamespaceURI()"/>
         /// </summary>
-        public Org.W3c.Dom.Node ParentNode
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespaceURI()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getParentNode", "()Lorg/w3c/dom/Node;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNamespaceURI", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getPrefix()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#setPrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getNodeName()"/>
         /// </summary>
-        public Java.Lang.String Prefix
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNodeName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPrefix", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPrefix", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getNodeName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getPreviousSibling()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getNodeValue()"/>
         /// </summary>
-        public Org.W3c.Dom.Node PreviousSibling
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public Java.Lang.String GetNodeValue()
         {
-            get { return IExecuteWithSignature<Org.W3c.Dom.Node>("getPreviousSibling", "()Lorg/w3c/dom/Node;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getNodeValue", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getTextContent()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#setTextContent(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getPrefix()"/>
         /// </summary>
-        public Java.Lang.String TextContent
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPrefix()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTextContent", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setTextContent", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPrefix", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#hasAttributes()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getTextContent()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasAttributes()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public Java.Lang.String GetTextContent()
         {
-            return IExecuteWithSignature<bool>("hasAttributes", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getTextContent", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#hasChildNodes()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#lookupNamespaceURI(java.lang.String)"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool HasChildNodes()
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String LookupNamespaceURI(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<bool>("hasChildNodes", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("lookupNamespaceURI", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#isDefaultNamespace(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#lookupPrefix(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDefaultNamespace(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String LookupPrefix(Java.Lang.String arg0)
         {
-            return IExecuteWithSignature<bool>("isDefaultNamespace", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("lookupPrefix", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#isEqualNode(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getOwnerDocument()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEqualNode(Org.W3c.Dom.Node arg0)
+        /// <returns><see cref="Org.W3c.Dom.Document"/></returns>
+        public Org.W3c.Dom.Document GetOwnerDocument()
         {
-            return IExecuteWithSignature<bool>("isEqualNode", "(Lorg/w3c/dom/Node;)Z", arg0);
+            return IExecuteWithSignature<Org.W3c.Dom.Document>("getOwnerDocument", "()Lorg/w3c/dom/Document;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#isSameNode(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getAttributes()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSameNode(Org.W3c.Dom.Node arg0)
+        /// <returns><see cref="Org.W3c.Dom.NamedNodeMap"/></returns>
+        public Org.W3c.Dom.NamedNodeMap GetAttributes()
         {
-            return IExecuteWithSignature<bool>("isSameNode", "(Lorg/w3c/dom/Node;)Z", arg0);
+            return IExecuteWithSignature<Org.W3c.Dom.NamedNodeMap>("getAttributes", "()Lorg/w3c/dom/NamedNodeMap;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#isSupported(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#appendChild(org.w3c.dom.Node)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsSupported(Java.Lang.String arg0, Java.Lang.String arg1)
-        {
-            return IExecute<bool>("isSupported", arg0, arg1);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getFeature(java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="object"/></returns>
-        public object GetFeature(Java.Lang.String arg0, Java.Lang.String arg1)
+        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public Org.W3c.Dom.Node AppendChild(Org.W3c.Dom.Node arg0)
         {
-            return IExecute("getFeature", arg0, arg1);
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("appendChild", "(Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#getUserData(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#cloneNode(boolean)"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="object"/></returns>
-        public object GetUserData(Java.Lang.String arg0)
+        /// <param name="arg0"><see cref="bool"/></param>
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node CloneNode(bool arg0)
         {
-            return IExecuteWithSignature("getUserData", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("cloneNode", "(Z)Lorg/w3c/dom/Node;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#setUserData(java.lang.String,java.lang.Object,org.w3c.dom.UserDataHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getFirstChild()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="object"/></param>
-        /// <param name="arg2"><see cref="Org.W3c.Dom.UserDataHandler"/></param>
-        /// <returns><see cref="object"/></returns>
-        public object SetUserData(Java.Lang.String arg0, object arg1, Org.W3c.Dom.UserDataHandler arg2)
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node GetFirstChild()
         {
-            return IExecute("setUserData", arg0, arg1, arg2);
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getFirstChild", "()Lorg/w3c/dom/Node;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#lookupNamespaceURI(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getLastChild()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String LookupNamespaceURI(Java.Lang.String arg0)
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node GetLastChild()
         {
-            return IExecuteWithSignature<Java.Lang.String>("lookupNamespaceURI", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getLastChild", "()Lorg/w3c/dom/Node;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#lookupPrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getNextSibling()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="Java.Lang.String"/></returns>
-        public Java.Lang.String LookupPrefix(Java.Lang.String arg0)
+        /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
+        public Org.W3c.Dom.Node GetNextSibling()
         {
-            return IExecuteWithSignature<Java.Lang.String>("lookupPrefix", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getNextSibling", "()Lorg/w3c/dom/Node;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#appendChild(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getParentNode()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
-        /// <exception cref="Org.W3c.Dom.DOMException"/>
-        public Org.W3c.Dom.Node AppendChild(Org.W3c.Dom.Node arg0)
+        public Org.W3c.Dom.Node GetParentNode()
         {
-            return IExecuteWithSignature<Org.W3c.Dom.Node>("appendChild", "(Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;", arg0);
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getParentNode", "()Lorg/w3c/dom/Node;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#cloneNode(boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getPreviousSibling()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="bool"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
-        public Org.W3c.Dom.Node CloneNode(bool arg0)
+        public Org.W3c.Dom.Node GetPreviousSibling()
         {
-            return IExecuteWithSignature<Org.W3c.Dom.Node>("cloneNode", "(Z)Lorg/w3c/dom/Node;", arg0);
+            return IExecuteWithSignature<Org.W3c.Dom.Node>("getPreviousSibling", "()Lorg/w3c/dom/Node;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#insertBefore(org.w3c.dom.Node,org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#insertBefore(org.w3c.dom.Node,org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Org.W3c.Dom.Node"/></param>
@@ -415,7 +417,7 @@ public Org.W3c.Dom.Node InsertBefore(Org.W3c.Dom.Node arg0, Org.W3c.Dom.Node arg
             return IExecute<Org.W3c.Dom.Node>("insertBefore", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#removeChild(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#removeChild(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
@@ -425,7 +427,7 @@ public Org.W3c.Dom.Node RemoveChild(Org.W3c.Dom.Node arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Node>("removeChild", "(Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#replaceChild(org.w3c.dom.Node,org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#replaceChild(org.w3c.dom.Node,org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <param name="arg1"><see cref="Org.W3c.Dom.Node"/></param>
@@ -436,7 +438,15 @@ public Org.W3c.Dom.Node ReplaceChild(Org.W3c.Dom.Node arg0, Org.W3c.Dom.Node arg
             return IExecute<Org.W3c.Dom.Node>("replaceChild", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#compareDocumentPosition(org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getChildNodes()"/>
+        /// </summary>
+        /// <returns><see cref="Org.W3c.Dom.NodeList"/></returns>
+        public Org.W3c.Dom.NodeList GetChildNodes()
+        {
+            return IExecuteWithSignature<Org.W3c.Dom.NodeList>("getChildNodes", "()Lorg/w3c/dom/NodeList;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#compareDocumentPosition(org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.W3c.Dom.Node"/></param>
         /// <returns><see cref="short"/></returns>
@@ -446,12 +456,47 @@ public short CompareDocumentPosition(Org.W3c.Dom.Node arg0)
             return IExecuteWithSignature<short>("compareDocumentPosition", "(Lorg/w3c/dom/Node;)S", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Node.html#normalize()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#getNodeType()"/>
+        /// </summary>
+        /// <returns><see cref="short"/></returns>
+        public short GetNodeType()
+        {
+            return IExecuteWithSignature<short>("getNodeType", "()S");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#normalize()"/>
         /// </summary>
         public void Normalize()
         {
             IExecuteWithSignature("normalize", "()V");
         }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#setNodeValue(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public void SetNodeValue(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setNodeValue", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#setPrefix(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public void SetPrefix(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPrefix", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Node.html#setTextContent(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public void SetTextContent(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setTextContent", "(Ljava/lang/String;)V", arg0);
+        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/NodeList.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/NodeList.cs
index 2bf4542a3..6655b1172 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/NodeList.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/NodeList.cs
@@ -64,14 +64,15 @@ public partial class NodeList : Org.W3c.Dom.INodeList
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NodeList.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NodeList.html#getLength()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/NodeList.html#item(int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/NodeList.html#item(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Org.W3c.Dom.Node"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Notation.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Notation.cs
index 55104b685..c87638316 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Notation.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Notation.cs
@@ -64,18 +64,20 @@ public partial class Notation : Org.W3c.Dom.INotation
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Notation.html#getPublicId()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Notation.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Notation.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Notation.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/ProcessingInstruction.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/ProcessingInstruction.cs
index baf9ae22a..d31d4fde9 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/ProcessingInstruction.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/ProcessingInstruction.cs
@@ -64,18 +64,29 @@ public partial class ProcessingInstruction : Org.W3c.Dom.IProcessingInstruction
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ProcessingInstruction.html#getData()"/> <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ProcessingInstruction.html#setData(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ProcessingInstruction.html#getData()"/>
         /// </summary>
-        public Java.Lang.String Data
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetData()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getData", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setData", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getData", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/ProcessingInstruction.html#getTarget()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ProcessingInstruction.html#getTarget()"/>
         /// </summary>
-        public Java.Lang.String Target
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTarget()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTarget", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTarget", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/ProcessingInstruction.html#setData(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <exception cref="Org.W3c.Dom.DOMException"/>
+        public void SetData(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setData", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/Text.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/Text.cs
index f101b3ecd..6846c6185 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/Text.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/Text.cs
@@ -64,22 +64,23 @@ public partial class Text : Org.W3c.Dom.IText
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Text.html#getWholeText()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Text.html#isElementContentWhitespace()"/>
         /// </summary>
-        public Java.Lang.String WholeText
+        /// <returns><see cref="bool"/></returns>
+        public bool IsElementContentWhitespace()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getWholeText", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<bool>("isElementContentWhitespace", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Text.html#isElementContentWhitespace()"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Text.html#getWholeText()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsElementContentWhitespace()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetWholeText()
         {
-            return IExecuteWithSignature<bool>("isElementContentWhitespace", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getWholeText", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Text.html#replaceWholeText(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Text.html#replaceWholeText(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.W3c.Dom.Text"/></returns>
@@ -89,7 +90,7 @@ public Org.W3c.Dom.Text ReplaceWholeText(Java.Lang.String arg0)
             return IExecuteWithSignature<Org.W3c.Dom.Text>("replaceWholeText", "(Ljava/lang/String;)Lorg/w3c/dom/Text;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/Text.html#splitText(int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/Text.html#splitText(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Org.W3c.Dom.Text"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/TypeInfo.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/TypeInfo.cs
index 01ca5a3f7..6bab25000 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/TypeInfo.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/TypeInfo.cs
@@ -56,25 +56,25 @@ public partial class TypeInfo : Org.W3c.Dom.ITypeInfo
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/TypeInfo.html#DERIVATION_EXTENSION"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/TypeInfo.html#DERIVATION_EXTENSION"/>
         /// </summary>
         public static int DERIVATION_EXTENSION { get { if (!_DERIVATION_EXTENSIONReady) { _DERIVATION_EXTENSIONContent = SGetField<int>(LocalBridgeClazz, "DERIVATION_EXTENSION"); _DERIVATION_EXTENSIONReady = true; } return _DERIVATION_EXTENSIONContent; } }
         private static int _DERIVATION_EXTENSIONContent = default;
         private static bool _DERIVATION_EXTENSIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/TypeInfo.html#DERIVATION_LIST"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/TypeInfo.html#DERIVATION_LIST"/>
         /// </summary>
         public static int DERIVATION_LIST { get { if (!_DERIVATION_LISTReady) { _DERIVATION_LISTContent = SGetField<int>(LocalBridgeClazz, "DERIVATION_LIST"); _DERIVATION_LISTReady = true; } return _DERIVATION_LISTContent; } }
         private static int _DERIVATION_LISTContent = default;
         private static bool _DERIVATION_LISTReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/TypeInfo.html#DERIVATION_RESTRICTION"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/TypeInfo.html#DERIVATION_RESTRICTION"/>
         /// </summary>
         public static int DERIVATION_RESTRICTION { get { if (!_DERIVATION_RESTRICTIONReady) { _DERIVATION_RESTRICTIONContent = SGetField<int>(LocalBridgeClazz, "DERIVATION_RESTRICTION"); _DERIVATION_RESTRICTIONReady = true; } return _DERIVATION_RESTRICTIONContent; } }
         private static int _DERIVATION_RESTRICTIONContent = default;
         private static bool _DERIVATION_RESTRICTIONReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/TypeInfo.html#DERIVATION_UNION"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/TypeInfo.html#DERIVATION_UNION"/>
         /// </summary>
         public static int DERIVATION_UNION { get { if (!_DERIVATION_UNIONReady) { _DERIVATION_UNIONContent = SGetField<int>(LocalBridgeClazz, "DERIVATION_UNION"); _DERIVATION_UNIONReady = true; } return _DERIVATION_UNIONContent; } }
         private static int _DERIVATION_UNIONContent = default;
@@ -88,29 +88,31 @@ public partial class TypeInfo : Org.W3c.Dom.ITypeInfo
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/TypeInfo.html#getTypeName()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/TypeInfo.html#isDerivedFrom(java.lang.String,java.lang.String,int)"/>
         /// </summary>
-        public Java.Lang.String TypeName
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
+        /// <param name="arg2"><see cref="int"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool IsDerivedFrom(Java.Lang.String arg0, Java.Lang.String arg1, int arg2)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;"); }
+            return IExecute<bool>("isDerivedFrom", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/TypeInfo.html#getTypeNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/TypeInfo.html#getTypeName()"/>
         /// </summary>
-        public Java.Lang.String TypeNamespace
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTypeName()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getTypeNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getTypeName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/TypeInfo.html#isDerivedFrom(java.lang.String,java.lang.String,int)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/TypeInfo.html#getTypeNamespace()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsDerivedFrom(Java.Lang.String arg0, Java.Lang.String arg1, int arg2)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetTypeNamespace()
         {
-            return IExecute<bool>("isDerivedFrom", arg0, arg1, arg2);
+            return IExecuteWithSignature<Java.Lang.String>("getTypeNamespace", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/W3c/Dom/UserDataHandler.cs b/src/net/Netdroid/Generated/Org/W3c/Dom/UserDataHandler.cs
index d5ee6a8fc..dd758583b 100644
--- a/src/net/Netdroid/Generated/Org/W3c/Dom/UserDataHandler.cs
+++ b/src/net/Netdroid/Generated/Org/W3c/Dom/UserDataHandler.cs
@@ -56,31 +56,31 @@ public partial class UserDataHandler : Org.W3c.Dom.IUserDataHandler
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/UserDataHandler.html#NODE_ADOPTED"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/UserDataHandler.html#NODE_ADOPTED"/>
         /// </summary>
         public static short NODE_ADOPTED { get { if (!_NODE_ADOPTEDReady) { _NODE_ADOPTEDContent = SGetField<short>(LocalBridgeClazz, "NODE_ADOPTED"); _NODE_ADOPTEDReady = true; } return _NODE_ADOPTEDContent; } }
         private static short _NODE_ADOPTEDContent = default;
         private static bool _NODE_ADOPTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/UserDataHandler.html#NODE_CLONED"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/UserDataHandler.html#NODE_CLONED"/>
         /// </summary>
         public static short NODE_CLONED { get { if (!_NODE_CLONEDReady) { _NODE_CLONEDContent = SGetField<short>(LocalBridgeClazz, "NODE_CLONED"); _NODE_CLONEDReady = true; } return _NODE_CLONEDContent; } }
         private static short _NODE_CLONEDContent = default;
         private static bool _NODE_CLONEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/UserDataHandler.html#NODE_DELETED"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/UserDataHandler.html#NODE_DELETED"/>
         /// </summary>
         public static short NODE_DELETED { get { if (!_NODE_DELETEDReady) { _NODE_DELETEDContent = SGetField<short>(LocalBridgeClazz, "NODE_DELETED"); _NODE_DELETEDReady = true; } return _NODE_DELETEDContent; } }
         private static short _NODE_DELETEDContent = default;
         private static bool _NODE_DELETEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/UserDataHandler.html#NODE_IMPORTED"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/UserDataHandler.html#NODE_IMPORTED"/>
         /// </summary>
         public static short NODE_IMPORTED { get { if (!_NODE_IMPORTEDReady) { _NODE_IMPORTEDContent = SGetField<short>(LocalBridgeClazz, "NODE_IMPORTED"); _NODE_IMPORTEDReady = true; } return _NODE_IMPORTEDContent; } }
         private static short _NODE_IMPORTEDContent = default;
         private static bool _NODE_IMPORTEDReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/UserDataHandler.html#NODE_RENAMED"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/UserDataHandler.html#NODE_RENAMED"/>
         /// </summary>
         public static short NODE_RENAMED { get { if (!_NODE_RENAMEDReady) { _NODE_RENAMEDContent = SGetField<short>(LocalBridgeClazz, "NODE_RENAMED"); _NODE_RENAMEDReady = true; } return _NODE_RENAMEDContent; } }
         private static short _NODE_RENAMEDContent = default;
@@ -94,7 +94,7 @@ public partial class UserDataHandler : Org.W3c.Dom.IUserDataHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/w3c/dom/UserDataHandler.html#handle(short,java.lang.String,java.lang.Object,org.w3c.dom.Node,org.w3c.dom.Node)"/>
+        /// <see href="https://developer.android.com/reference/org/w3c/dom/UserDataHandler.html#handle(short,java.lang.String,java.lang.Object,org.w3c.dom.Node,org.w3c.dom.Node)"/>
         /// </summary>
         /// <param name="arg0"><see cref="short"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/AllPackageClasses.cs
index f82c07751..8dca922e8 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/AllPackageClasses.cs
@@ -28,21 +28,21 @@ namespace Org.Xml.Sax
 {
     #region AttributeList
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/AttributeList.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/AttributeList.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AttributeList : MASES.JCOBridge.C2JBridge.JVMBridgeBase<AttributeList>
     {
         const string _bridgeClassName = "org.xml.sax.AttributeList";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("AttributeList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttributeList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttributeList() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("AttributeList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("AttributeList class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public AttributeList(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -75,7 +75,7 @@ public AttributeList(params object[] args) : base(args) { }
 
     #region Attributes
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html"/>
     /// </summary>
     public partial class Attributes : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Attributes>
     {
@@ -83,12 +83,12 @@ public partial class Attributes : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Attrib
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Attributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Attributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Attributes() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Attributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Attributes class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Attributes(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -121,7 +121,7 @@ public Attributes(params object[] args) : base(args) { }
 
     #region ContentHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html"/>
     /// </summary>
     public partial class ContentHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ContentHandler>
     {
@@ -129,12 +129,12 @@ public partial class ContentHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Co
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ContentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ContentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ContentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ContentHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -167,21 +167,21 @@ public ContentHandler(params object[] args) : base(args) { }
 
     #region DocumentHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class DocumentHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DocumentHandler>
     {
         const string _bridgeClassName = "org.xml.sax.DocumentHandler";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DocumentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DocumentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DocumentHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DocumentHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -214,7 +214,7 @@ public DocumentHandler(params object[] args) : base(args) { }
 
     #region DTDHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DTDHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/DTDHandler.html"/>
     /// </summary>
     public partial class DTDHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DTDHandler>
     {
@@ -222,12 +222,12 @@ public partial class DTDHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DTDHan
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DTDHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DTDHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DTDHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DTDHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DTDHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DTDHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -260,7 +260,7 @@ public DTDHandler(params object[] args) : base(args) { }
 
     #region EntityResolver
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/EntityResolver.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/EntityResolver.html"/>
     /// </summary>
     public partial class EntityResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<EntityResolver>
     {
@@ -268,12 +268,12 @@ public partial class EntityResolver : MASES.JCOBridge.C2JBridge.JVMBridgeBase<En
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EntityResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EntityResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EntityResolver() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EntityResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EntityResolver class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EntityResolver(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -306,7 +306,7 @@ public EntityResolver(params object[] args) : base(args) { }
 
     #region ErrorHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ErrorHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ErrorHandler.html"/>
     /// </summary>
     public partial class ErrorHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ErrorHandler>
     {
@@ -314,12 +314,12 @@ public partial class ErrorHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Erro
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("ErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ErrorHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("ErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("ErrorHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public ErrorHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -352,9 +352,9 @@ public ErrorHandler(params object[] args) : base(args) { }
 
     #region HandlerBase
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class HandlerBase : MASES.JCOBridge.C2JBridge.JVMBridgeBase<HandlerBase>
     {
         const string _bridgeClassName = "org.xml.sax.HandlerBase";
@@ -397,7 +397,7 @@ public HandlerBase(params object[] args) : base(args) { }
 
     #region InputSource
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html"/>
     /// </summary>
     public partial class InputSource : MASES.JCOBridge.C2JBridge.JVMBridgeBase<InputSource>
     {
@@ -441,7 +441,7 @@ public InputSource(params object[] args) : base(args) { }
 
     #region Locator
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Locator.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/Locator.html"/>
     /// </summary>
     public partial class Locator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Locator>
     {
@@ -449,12 +449,12 @@ public partial class Locator : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Locator>
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Locator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Locator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Locator() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Locator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Locator class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Locator(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -487,21 +487,21 @@ public Locator(params object[] args) : base(args) { }
 
     #region Parser
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Parser.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/Parser.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class Parser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Parser>
     {
         const string _bridgeClassName = "org.xml.sax.Parser";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Parser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Parser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Parser() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Parser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Parser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Parser(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -534,7 +534,7 @@ public Parser(params object[] args) : base(args) { }
 
     #region SAXException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/SAXException.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/SAXException.html"/>
     /// </summary>
     public partial class SAXException : Java.Lang.Exception
     {
@@ -551,7 +551,7 @@ public partial class SAXException : Java.Lang.Exception
 
     #region SAXNotRecognizedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/SAXNotRecognizedException.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/SAXNotRecognizedException.html"/>
     /// </summary>
     public partial class SAXNotRecognizedException : Org.Xml.Sax.SAXException
     {
@@ -568,7 +568,7 @@ public partial class SAXNotRecognizedException : Org.Xml.Sax.SAXException
 
     #region SAXNotSupportedException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/SAXNotSupportedException.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/SAXNotSupportedException.html"/>
     /// </summary>
     public partial class SAXNotSupportedException : Org.Xml.Sax.SAXException
     {
@@ -585,7 +585,7 @@ public partial class SAXNotSupportedException : Org.Xml.Sax.SAXException
 
     #region SAXParseException
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/SAXParseException.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/SAXParseException.html"/>
     /// </summary>
     public partial class SAXParseException : Org.Xml.Sax.SAXException
     {
@@ -602,7 +602,7 @@ public partial class SAXParseException : Org.Xml.Sax.SAXException
 
     #region XMLFilter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLFilter.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/XMLFilter.html"/>
     /// </summary>
     public partial class XMLFilter : Org.Xml.Sax.XMLReader
     {
@@ -610,12 +610,12 @@ public partial class XMLFilter : Org.Xml.Sax.XMLReader
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XMLFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XMLFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XMLFilter() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XMLFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XMLFilter class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XMLFilter(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -648,7 +648,7 @@ public XMLFilter(params object[] args) : base(args) { }
 
     #region XMLReader
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html"/>
     /// </summary>
     public partial class XMLReader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XMLReader>
     {
@@ -656,12 +656,12 @@ public partial class XMLReader : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XMLRead
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XMLReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XMLReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XMLReader() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XMLReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XMLReader class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XMLReader(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/AttributeList.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/AttributeList.cs
index 575c4e057..c761a5276 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/AttributeList.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/AttributeList.cs
@@ -64,14 +64,15 @@ public partial class AttributeList : Org.Xml.Sax.IAttributeList
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/AttributeList.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/org/xml/sax/AttributeList.html#getLength()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/AttributeList.html#getName(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/AttributeList.html#getName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -80,7 +81,7 @@ public Java.Lang.String GetName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/AttributeList.html#getType(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/AttributeList.html#getType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -89,7 +90,7 @@ public Java.Lang.String GetType(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getType", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/AttributeList.html#getType(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/AttributeList.html#getType(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -98,7 +99,7 @@ public Java.Lang.String GetType(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/AttributeList.html#getValue(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/AttributeList.html#getValue(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -107,7 +108,7 @@ public Java.Lang.String GetValue(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/AttributeList.html#getValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/AttributeList.html#getValue(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Attributes.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Attributes.cs
index 5388821d0..3fcb4c5ac 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Attributes.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Attributes.cs
@@ -64,14 +64,7 @@ public partial class Attributes : Org.Xml.Sax.IAttributes
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getLength()"/> 
-        /// </summary>
-        public int Length
-        {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getIndex(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getIndex(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -81,7 +74,7 @@ public int GetIndex(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<int>("getIndex", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getIndex(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getIndex(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -90,7 +83,15 @@ public int GetIndex(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getIndex", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getLocalName(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
+        {
+            return IExecuteWithSignature<int>("getLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getLocalName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -99,7 +100,7 @@ public Java.Lang.String GetLocalName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getLocalName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getQName(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getQName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -108,7 +109,7 @@ public Java.Lang.String GetQName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getQName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getType(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -117,7 +118,7 @@ public Java.Lang.String GetType(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getType", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getType(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getType(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -127,7 +128,7 @@ public Java.Lang.String GetType(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<Java.Lang.String>("getType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getType(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getType(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -136,7 +137,7 @@ public Java.Lang.String GetType(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getURI(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getURI(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -145,7 +146,7 @@ public Java.Lang.String GetURI(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getURI", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getValue(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getValue(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -154,7 +155,7 @@ public Java.Lang.String GetValue(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getValue(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getValue(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -164,7 +165,7 @@ public Java.Lang.String GetValue(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<Java.Lang.String>("getValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Attributes.html#getValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Attributes.html#getValue(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/ContentHandler.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/ContentHandler.cs
index ffcdce3af..288761290 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/ContentHandler.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/ContentHandler.cs
@@ -64,7 +64,7 @@ public partial class ContentHandler : Org.Xml.Sax.IContentHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#characters(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#characters(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -75,7 +75,7 @@ public void Characters(char[] arg0, int arg1, int arg2)
             IExecute("characters", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#endDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#endDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndDocument()
@@ -83,7 +83,7 @@ public void EndDocument()
             IExecuteWithSignature("endDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -94,7 +94,7 @@ public void EndElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.S
             IExecute("endElement", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#endPrefixMapping(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#endPrefixMapping(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -103,7 +103,7 @@ public void EndPrefixMapping(Java.Lang.String arg0)
             IExecuteWithSignature("endPrefixMapping", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -114,7 +114,7 @@ public void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
             IExecute("ignorableWhitespace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -124,7 +124,7 @@ public void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("processingInstruction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
@@ -132,7 +132,7 @@ public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
             IExecuteWithSignature("setDocumentLocator", "(Lorg/xml/sax/Locator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#skippedEntity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#skippedEntity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -141,7 +141,7 @@ public void SkippedEntity(Java.Lang.String arg0)
             IExecuteWithSignature("skippedEntity", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#startDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#startDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void StartDocument()
@@ -149,7 +149,7 @@ public void StartDocument()
             IExecuteWithSignature("startDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -161,7 +161,7 @@ public void StartElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("startElement", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ContentHandler.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -170,17 +170,6 @@ public void StartPrefixMapping(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             IExecute("startPrefixMapping", arg0, arg1);
         }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#declaration(java.lang.String,java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public void Declaration(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
-        {
-            IExecute("declaration", arg0, arg1, arg2);
-        }
 
         #endregion
 
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/DTDHandler.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/DTDHandler.cs
index 5211fa9e2..19c5d577c 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/DTDHandler.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/DTDHandler.cs
@@ -64,7 +64,7 @@ public partial class DTDHandler : Org.Xml.Sax.IDTDHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DTDHandler.html#notationDecl(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DTDHandler.html#notationDecl(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -75,7 +75,7 @@ public void NotationDecl(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("notationDecl", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DTDHandler.html#unparsedEntityDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DTDHandler.html#unparsedEntityDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/DocumentHandler.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/DocumentHandler.cs
index 12275e568..8caa29c8e 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/DocumentHandler.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/DocumentHandler.cs
@@ -64,7 +64,7 @@ public partial class DocumentHandler : Org.Xml.Sax.IDocumentHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html#characters(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html#characters(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -75,7 +75,7 @@ public void Characters(char[] arg0, int arg1, int arg2)
             IExecute("characters", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html#endDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html#endDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndDocument()
@@ -83,7 +83,7 @@ public void EndDocument()
             IExecuteWithSignature("endDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html#endElement(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html#endElement(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -92,7 +92,7 @@ public void EndElement(Java.Lang.String arg0)
             IExecuteWithSignature("endElement", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -103,7 +103,7 @@ public void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
             IExecute("ignorableWhitespace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -113,7 +113,7 @@ public void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("processingInstruction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
@@ -121,7 +121,7 @@ public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
             IExecuteWithSignature("setDocumentLocator", "(Lorg/xml/sax/Locator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html#startDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html#startDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void StartDocument()
@@ -129,7 +129,7 @@ public void StartDocument()
             IExecuteWithSignature("startDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/DocumentHandler.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/DocumentHandler.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.AttributeList"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/EntityResolver.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/EntityResolver.cs
index b9db09766..0a7ae984a 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/EntityResolver.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/EntityResolver.cs
@@ -64,7 +64,7 @@ public partial class EntityResolver : Org.Xml.Sax.IEntityResolver
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/EntityResolver.html#resolveEntity(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/EntityResolver.html#resolveEntity(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/ErrorHandler.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/ErrorHandler.cs
index 25fccf112..370024bef 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/ErrorHandler.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/ErrorHandler.cs
@@ -64,7 +64,7 @@ public partial class ErrorHandler : Org.Xml.Sax.IErrorHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ErrorHandler.html#error(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ErrorHandler.html#error(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -73,7 +73,7 @@ public void Error(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("error", "(Lorg/xml/sax/SAXParseException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ErrorHandler.html#fatalError(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ErrorHandler.html#fatalError(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -82,7 +82,7 @@ public void FatalError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("fatalError", "(Lorg/xml/sax/SAXParseException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ErrorHandler.html#warning(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ErrorHandler.html#warning(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/AllPackageClasses.cs
index 06418bf09..6cddac1be 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/AllPackageClasses.cs
@@ -28,7 +28,7 @@ namespace Org.Xml.Sax.Ext
 {
     #region Attributes2
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2.html"/>
     /// </summary>
     public partial class Attributes2 : Org.Xml.Sax.Attributes
     {
@@ -36,12 +36,12 @@ public partial class Attributes2 : Org.Xml.Sax.Attributes
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Attributes2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Attributes2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Attributes2() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Attributes2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Attributes2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Attributes2(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -74,7 +74,7 @@ public Attributes2(params object[] args) : base(args) { }
 
     #region Attributes2Impl
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html"/>
     /// </summary>
     public partial class Attributes2Impl : Org.Xml.Sax.Helpers.AttributesImpl
     {
@@ -118,7 +118,7 @@ public Attributes2Impl(params object[] args) : base(args) { }
 
     #region DeclHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DeclHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DeclHandler.html"/>
     /// </summary>
     public partial class DeclHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DeclHandler>
     {
@@ -126,12 +126,12 @@ public partial class DeclHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DeclH
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("DeclHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DeclHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DeclHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("DeclHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("DeclHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public DeclHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -164,7 +164,7 @@ public DeclHandler(params object[] args) : base(args) { }
 
     #region DefaultHandler2
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html"/>
     /// </summary>
     public partial class DefaultHandler2 : Org.Xml.Sax.Helpers.DefaultHandler
     {
@@ -208,7 +208,7 @@ public DefaultHandler2(params object[] args) : base(args) { }
 
     #region EntityResolver2
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/EntityResolver2.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ext/EntityResolver2.html"/>
     /// </summary>
     public partial class EntityResolver2 : Org.Xml.Sax.EntityResolver
     {
@@ -216,12 +216,12 @@ public partial class EntityResolver2 : Org.Xml.Sax.EntityResolver
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("EntityResolver2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EntityResolver2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EntityResolver2() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("EntityResolver2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("EntityResolver2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public EntityResolver2(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -254,7 +254,7 @@ public EntityResolver2(params object[] args) : base(args) { }
 
     #region LexicalHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/LexicalHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html"/>
     /// </summary>
     public partial class LexicalHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<LexicalHandler>
     {
@@ -262,12 +262,12 @@ public partial class LexicalHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Le
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("LexicalHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LexicalHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LexicalHandler() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("LexicalHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("LexicalHandler class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public LexicalHandler(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -300,7 +300,7 @@ public LexicalHandler(params object[] args) : base(args) { }
 
     #region Locator2
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2.html"/>
     /// </summary>
     public partial class Locator2 : Org.Xml.Sax.Locator
     {
@@ -308,12 +308,12 @@ public partial class Locator2 : Org.Xml.Sax.Locator
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("Locator2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Locator2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Locator2() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("Locator2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("Locator2 class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public Locator2(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -346,7 +346,7 @@ public Locator2(params object[] args) : base(args) { }
 
     #region Locator2Impl
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2Impl.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2Impl.html"/>
     /// </summary>
     public partial class Locator2Impl : Org.Xml.Sax.Helpers.LocatorImpl
     {
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Attributes2.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Attributes2.cs
index a917b6e8a..e22ae74dd 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Attributes2.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Attributes2.cs
@@ -64,7 +64,7 @@ public partial class Attributes2 : Org.Xml.Sax.Ext.IAttributes2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2.html#isDeclared(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2.html#isDeclared(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -73,7 +73,7 @@ public bool IsDeclared(int arg0)
             return IExecuteWithSignature<bool>("isDeclared", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2.html#isDeclared(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2.html#isDeclared(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -83,7 +83,7 @@ public bool IsDeclared(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("isDeclared", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2.html#isDeclared(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2.html#isDeclared(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -92,7 +92,7 @@ public bool IsDeclared(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isDeclared", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2.html#isSpecified(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2.html#isSpecified(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -101,7 +101,7 @@ public bool IsSpecified(int arg0)
             return IExecuteWithSignature<bool>("isSpecified", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2.html#isSpecified(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2.html#isSpecified(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -111,7 +111,7 @@ public bool IsSpecified(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("isSpecified", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2.html#isSpecified(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2.html#isSpecified(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Attributes2Impl.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Attributes2Impl.cs
index 1da4e66be..a59428676 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Attributes2Impl.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Attributes2Impl.cs
@@ -30,7 +30,7 @@ public partial class Attributes2Impl
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#%3Cinit%3E(org.xml.sax.Attributes)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#%3Cinit%3E(org.xml.sax.Attributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Attributes"/></param>
         public Attributes2Impl(Org.Xml.Sax.Attributes arg0)
@@ -58,7 +58,7 @@ public Attributes2Impl(Org.Xml.Sax.Attributes arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#isDeclared(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#isDeclared(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -67,7 +67,7 @@ public bool IsDeclared(int arg0)
             return IExecuteWithSignature<bool>("isDeclared", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#isDeclared(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#isDeclared(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -77,7 +77,7 @@ public bool IsDeclared(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("isDeclared", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#isDeclared(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#isDeclared(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -86,7 +86,7 @@ public bool IsDeclared(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isDeclared", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#isSpecified(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#isSpecified(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -95,7 +95,7 @@ public bool IsSpecified(int arg0)
             return IExecuteWithSignature<bool>("isSpecified", "(I)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#isSpecified(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#isSpecified(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -105,7 +105,7 @@ public bool IsSpecified(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("isSpecified", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#isSpecified(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#isSpecified(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -114,7 +114,7 @@ public bool IsSpecified(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("isSpecified", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#setDeclared(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#setDeclared(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -123,7 +123,7 @@ public void SetDeclared(int arg0, bool arg1)
             IExecute("setDeclared", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Attributes2Impl.html#setSpecified(int,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Attributes2Impl.html#setSpecified(int,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/DeclHandler.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/DeclHandler.cs
index cd11c6a04..7d3cc74b8 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/DeclHandler.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/DeclHandler.cs
@@ -64,7 +64,7 @@ public partial class DeclHandler : Org.Xml.Sax.Ext.IDeclHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DeclHandler.html#attributeDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DeclHandler.html#attributeDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -77,7 +77,7 @@ public void AttributeDecl(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lan
             IExecute("attributeDecl", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DeclHandler.html#elementDecl(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DeclHandler.html#elementDecl(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -87,7 +87,7 @@ public void ElementDecl(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("elementDecl", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DeclHandler.html#externalEntityDecl(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DeclHandler.html#externalEntityDecl(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -98,7 +98,7 @@ public void ExternalEntityDecl(Java.Lang.String arg0, Java.Lang.String arg1, Jav
             IExecute("externalEntityDecl", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DeclHandler.html#internalEntityDecl(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DeclHandler.html#internalEntityDecl(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/DefaultHandler2.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/DefaultHandler2.cs
index 704453c66..d004aa755 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/DefaultHandler2.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/DefaultHandler2.cs
@@ -58,7 +58,7 @@ public partial class DefaultHandler2 : Org.Xml.Sax.Ext.ILexicalHandler, Org.Xml.
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#getExternalSubset(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#getExternalSubset(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -70,7 +70,7 @@ public Org.Xml.Sax.InputSource GetExternalSubset(Java.Lang.String arg0, Java.Lan
             return IExecute<Org.Xml.Sax.InputSource>("getExternalSubset", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#resolveEntity(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#resolveEntity(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -84,7 +84,7 @@ public Org.Xml.Sax.InputSource ResolveEntity(Java.Lang.String arg0, Java.Lang.St
             return IExecute<Org.Xml.Sax.InputSource>("resolveEntity", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#attributeDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#attributeDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -97,7 +97,7 @@ public void AttributeDecl(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lan
             IExecute("attributeDecl", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#comment(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#comment(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -108,7 +108,7 @@ public void Comment(char[] arg0, int arg1, int arg2)
             IExecute("comment", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#elementDecl(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#elementDecl(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -118,7 +118,7 @@ public void ElementDecl(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("elementDecl", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#endCDATA()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#endCDATA()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndCDATA()
@@ -126,7 +126,7 @@ public void EndCDATA()
             IExecuteWithSignature("endCDATA", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#endDTD()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#endDTD()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndDTD()
@@ -134,7 +134,7 @@ public void EndDTD()
             IExecuteWithSignature("endDTD", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#endEntity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#endEntity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -143,7 +143,7 @@ public void EndEntity(Java.Lang.String arg0)
             IExecuteWithSignature("endEntity", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#externalEntityDecl(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#externalEntityDecl(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -154,7 +154,7 @@ public void ExternalEntityDecl(Java.Lang.String arg0, Java.Lang.String arg1, Jav
             IExecute("externalEntityDecl", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#internalEntityDecl(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#internalEntityDecl(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -164,7 +164,7 @@ public void InternalEntityDecl(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("internalEntityDecl", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#startCDATA()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#startCDATA()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void StartCDATA()
@@ -172,7 +172,7 @@ public void StartCDATA()
             IExecuteWithSignature("startCDATA", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#startDTD(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#startDTD(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -183,7 +183,7 @@ public void StartDTD(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.Str
             IExecute("startDTD", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/DefaultHandler2.html#startEntity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/DefaultHandler2.html#startEntity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/EntityResolver2.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/EntityResolver2.cs
index f6c1bf548..59ed552f9 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/EntityResolver2.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/EntityResolver2.cs
@@ -64,7 +64,7 @@ public partial class EntityResolver2 : Org.Xml.Sax.Ext.IEntityResolver2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/EntityResolver2.html#getExternalSubset(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/EntityResolver2.html#getExternalSubset(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -76,7 +76,7 @@ public Org.Xml.Sax.InputSource GetExternalSubset(Java.Lang.String arg0, Java.Lan
             return IExecute<Org.Xml.Sax.InputSource>("getExternalSubset", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/EntityResolver2.html#resolveEntity(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/EntityResolver2.html#resolveEntity(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/LexicalHandler.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/LexicalHandler.cs
index ac0be9bce..49db1169b 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/LexicalHandler.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/LexicalHandler.cs
@@ -64,7 +64,7 @@ public partial class LexicalHandler : Org.Xml.Sax.Ext.ILexicalHandler
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/LexicalHandler.html#comment(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html#comment(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -75,7 +75,7 @@ public void Comment(char[] arg0, int arg1, int arg2)
             IExecute("comment", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/LexicalHandler.html#endCDATA()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html#endCDATA()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndCDATA()
@@ -83,7 +83,7 @@ public void EndCDATA()
             IExecuteWithSignature("endCDATA", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/LexicalHandler.html#endDTD()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html#endDTD()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndDTD()
@@ -91,7 +91,7 @@ public void EndDTD()
             IExecuteWithSignature("endDTD", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/LexicalHandler.html#endEntity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html#endEntity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -100,7 +100,7 @@ public void EndEntity(Java.Lang.String arg0)
             IExecuteWithSignature("endEntity", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/LexicalHandler.html#startCDATA()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html#startCDATA()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void StartCDATA()
@@ -108,7 +108,7 @@ public void StartCDATA()
             IExecuteWithSignature("startCDATA", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/LexicalHandler.html#startDTD(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html#startDTD(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -119,7 +119,7 @@ public void StartDTD(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.Str
             IExecute("startDTD", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/LexicalHandler.html#startEntity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/LexicalHandler.html#startEntity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Locator2.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Locator2.cs
index 5afa36c19..9b62fe3a9 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Locator2.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Locator2.cs
@@ -64,18 +64,20 @@ public partial class Locator2 : Org.Xml.Sax.Ext.ILocator2
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2.html#getEncoding()"/> 
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2.html#getEncoding()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2.html#getXMLVersion()"/> 
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2.html#getXMLVersion()"/>
         /// </summary>
-        public Java.Lang.String XMLVersion
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetXMLVersion()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getXMLVersion", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getXMLVersion", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Locator2Impl.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Locator2Impl.cs
index ded675872..b3a084b0c 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Locator2Impl.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Ext/Locator2Impl.cs
@@ -30,7 +30,7 @@ public partial class Locator2Impl
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2Impl.html#%3Cinit%3E(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2Impl.html#%3Cinit%3E(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public Locator2Impl(Org.Xml.Sax.Locator arg0)
@@ -58,18 +58,36 @@ public Locator2Impl(Org.Xml.Sax.Locator arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2Impl.html#getEncoding()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2Impl.html#setEncoding(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2Impl.html#getEncoding()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2Impl.html#getXMLVersion()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ext/Locator2Impl.html#setXMLVersion(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2Impl.html#getXMLVersion()"/>
         /// </summary>
-        public Java.Lang.String XMLVersion
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetXMLVersion()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getXMLVersion", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setXMLVersion", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getXMLVersion", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2Impl.html#setEncoding(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEncoding(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/ext/Locator2Impl.html#setXMLVersion(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetXMLVersion(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setXMLVersion", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/HandlerBase.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/HandlerBase.cs
index b4a5e47c2..e601cf3b1 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/HandlerBase.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/HandlerBase.cs
@@ -62,7 +62,7 @@ public partial class HandlerBase : Org.Xml.Sax.IEntityResolver, Org.Xml.Sax.IDTD
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#resolveEntity(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#resolveEntity(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -73,7 +73,7 @@ public Org.Xml.Sax.InputSource ResolveEntity(Java.Lang.String arg0, Java.Lang.St
             return IExecute<Org.Xml.Sax.InputSource>("resolveEntity", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#characters(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#characters(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -84,7 +84,7 @@ public void Characters(char[] arg0, int arg1, int arg2)
             IExecute("characters", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#endDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#endDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndDocument()
@@ -92,7 +92,7 @@ public void EndDocument()
             IExecuteWithSignature("endDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#endElement(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#endElement(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -101,7 +101,7 @@ public void EndElement(Java.Lang.String arg0)
             IExecuteWithSignature("endElement", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#error(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#error(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -110,7 +110,7 @@ public void Error(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("error", "(Lorg/xml/sax/SAXParseException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#fatalError(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#fatalError(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -119,7 +119,7 @@ public void FatalError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("fatalError", "(Lorg/xml/sax/SAXParseException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -130,7 +130,7 @@ public void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
             IExecute("ignorableWhitespace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#notationDecl(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#notationDecl(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -140,7 +140,7 @@ public void NotationDecl(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("notationDecl", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -150,7 +150,7 @@ public void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("processingInstruction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
@@ -158,7 +158,7 @@ public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
             IExecuteWithSignature("setDocumentLocator", "(Lorg/xml/sax/Locator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#startDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#startDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void StartDocument()
@@ -166,7 +166,7 @@ public void StartDocument()
             IExecuteWithSignature("startDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.AttributeList"/></param>
@@ -176,7 +176,7 @@ public void StartElement(Java.Lang.String arg0, Org.Xml.Sax.AttributeList arg1)
             IExecute("startElement", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#unparsedEntityDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#unparsedEntityDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -187,7 +187,7 @@ public void UnparsedEntityDecl(Java.Lang.String arg0, Java.Lang.String arg1, Jav
             IExecute("unparsedEntityDecl", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/HandlerBase.html#warning(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/HandlerBase.html#warning(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AllPackageClasses.cs
index 956c524ae..0e566ee07 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AllPackageClasses.cs
@@ -28,9 +28,9 @@ namespace Org.Xml.Sax.Helpers
 {
     #region AttributeListImpl
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class AttributeListImpl : Org.Xml.Sax.AttributeList
     {
         const string _bridgeClassName = "org.xml.sax.helpers.AttributeListImpl";
@@ -73,7 +73,7 @@ public AttributeListImpl(params object[] args) : base(args) { }
 
     #region AttributesImpl
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html"/>
     /// </summary>
     public partial class AttributesImpl : Org.Xml.Sax.Attributes
     {
@@ -117,7 +117,7 @@ public AttributesImpl(params object[] args) : base(args) { }
 
     #region DefaultHandler
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html"/>
     /// </summary>
     public partial class DefaultHandler : MASES.JCOBridge.C2JBridge.JVMBridgeBase<DefaultHandler>
     {
@@ -161,7 +161,7 @@ public DefaultHandler(params object[] args) : base(args) { }
 
     #region LocatorImpl
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html"/>
     /// </summary>
     public partial class LocatorImpl : Org.Xml.Sax.Locator
     {
@@ -205,7 +205,7 @@ public LocatorImpl(params object[] args) : base(args) { }
 
     #region NamespaceSupport
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html"/>
     /// </summary>
     public partial class NamespaceSupport : MASES.JCOBridge.C2JBridge.JVMBridgeBase<NamespaceSupport>
     {
@@ -249,7 +249,7 @@ public NamespaceSupport(params object[] args) : base(args) { }
 
     #region ParserAdapter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html"/>
     /// </summary>
     public partial class ParserAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
     {
@@ -258,10 +258,13 @@ public partial class ParserAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
         /// </summary>
         public ParserAdapter() { InitializeHandlers(); }
 
+        const string _bridgeClassName = "org.mases.netdroid.generated.org.xml.sax.helpers.ParserAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+        
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.mases.netdroid.generated.org.xml.sax.helpers.ParserAdapter";
+        public override string BridgeClassName => _bridgeClassName;
 
     
         // TODO: complete the class
@@ -283,10 +286,13 @@ public partial class ParserAdapterDirect : ParserAdapter
         /// <inheritdoc />
         protected override void InitializeHandlers() { }
 
+        const string _bridgeClassName = "org.xml.sax.helpers.ParserAdapter";
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
+
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.xml.sax.helpers.ParserAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -308,9 +314,9 @@ protected override void InitializeHandlers() { }
 
     #region ParserFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserFactory.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserFactory.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class ParserFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<ParserFactory>
     {
         const string _bridgeClassName = "org.xml.sax.helpers.ParserFactory";
@@ -353,7 +359,7 @@ public ParserFactory(params object[] args) : base(args) { }
 
     #region XMLFilterImpl
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html"/>
     /// </summary>
     public partial class XMLFilterImpl : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XMLFilterImpl>
     {
@@ -397,40 +403,26 @@ public XMLFilterImpl(params object[] args) : base(args) { }
 
     #region XMLReaderAdapter
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html"/>
     /// </summary>
-    public partial class XMLReaderAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeListener
+    public partial class XMLReaderAdapter : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XMLReaderAdapter>
     {
+        const string _bridgeClassName = "org.xml.sax.helpers.XMLReaderAdapter";
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        public XMLReaderAdapter() { InitializeHandlers(); }
-
-    #warning Remember to build the Java class for event listener
-
-        // TODO: complete the class
-
-    }
-    #endregion
-
-    #region XMLReaderAdapterDirect
-    /// <summary>
-    /// Direct override of <see cref="XMLReaderAdapter"/> or its generic type if there is one
-    /// </summary>
-    public partial class XMLReaderAdapterDirect : XMLReaderAdapter
-    {
+        public XMLReaderAdapter() { }
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_AutoInit.htm"/>
+        /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        public override bool AutoInit => false;
+        public XMLReaderAdapter(params object[] args) : base(args) { }
 
-        /// <inheritdoc />
-        protected override void InitializeHandlers() { }
+        private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
 
         /// <summary>
-        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeListener_BridgeClassName.htm"/>
+        /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_BridgeClassName.htm"/>
         /// </summary>
-        public override string BridgeClassName => "org.xml.sax.helpers.XMLReaderAdapter";
+        public override string BridgeClassName => _bridgeClassName;
         /// <summary>
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeAbstract.htm"/>
         /// </summary>
@@ -447,14 +439,17 @@ protected override void InitializeHandlers() { }
         /// <see href="https://www.jcobridge.com/api-clr/html/P_MASES_JCOBridge_C2JBridge_JVMBridgeBase_IsBridgeStatic.htm"/>
         /// </summary>
         public override bool IsBridgeStatic => false;
+
+        // TODO: complete the class
+
     }
     #endregion
 
     #region XMLReaderFactory
     /// <summary>
-    /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderFactory.html"/>
+    /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderFactory.html"/>
     /// </summary>
-    [System.Obsolete()]
+    [global::System.Obsolete()]
     public partial class XMLReaderFactory : MASES.JCOBridge.C2JBridge.JVMBridgeBase<XMLReaderFactory>
     {
         const string _bridgeClassName = "org.xml.sax.helpers.XMLReaderFactory";
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AttributeListImpl.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AttributeListImpl.cs
index 5c5562fe3..ac095c1e4 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AttributeListImpl.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AttributeListImpl.cs
@@ -30,7 +30,7 @@ public partial class AttributeListImpl
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#%3Cinit%3E(org.xml.sax.AttributeList)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#%3Cinit%3E(org.xml.sax.AttributeList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.AttributeList"/></param>
         public AttributeListImpl(Org.Xml.Sax.AttributeList arg0)
@@ -54,14 +54,15 @@ public AttributeListImpl(Org.Xml.Sax.AttributeList arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#getLength()"/> 
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#getLength()"/>
         /// </summary>
-        public int Length
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
         {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
+            return IExecuteWithSignature<int>("getLength", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#getName(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#getName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -70,7 +71,7 @@ public Java.Lang.String GetName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#getType(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#getType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -79,7 +80,7 @@ public Java.Lang.String GetType(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getType", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#getType(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#getType(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -88,7 +89,7 @@ public Java.Lang.String GetType(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#getValue(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#getValue(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -97,7 +98,7 @@ public Java.Lang.String GetValue(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#getValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#getValue(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -106,7 +107,7 @@ public Java.Lang.String GetValue(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#addAttribute(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#addAttribute(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -116,14 +117,14 @@ public void AddAttribute(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("addAttribute", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#removeAttribute(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#removeAttribute(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public void RemoveAttribute(Java.Lang.String arg0)
@@ -131,7 +132,7 @@ public void RemoveAttribute(Java.Lang.String arg0)
             IExecuteWithSignature("removeAttribute", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributeListImpl.html#setAttributeList(org.xml.sax.AttributeList)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributeListImpl.html#setAttributeList(org.xml.sax.AttributeList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.AttributeList"/></param>
         public void SetAttributeList(Org.Xml.Sax.AttributeList arg0)
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AttributesImpl.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AttributesImpl.cs
index 1329c23ee..fa45c46f0 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AttributesImpl.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/AttributesImpl.cs
@@ -30,7 +30,7 @@ public partial class AttributesImpl
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#%3Cinit%3E(org.xml.sax.Attributes)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#%3Cinit%3E(org.xml.sax.Attributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Attributes"/></param>
         public AttributesImpl(Org.Xml.Sax.Attributes arg0)
@@ -54,14 +54,7 @@ public AttributesImpl(Org.Xml.Sax.Attributes arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getLength()"/> 
-        /// </summary>
-        public int Length
-        {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getIndex(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getIndex(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -71,7 +64,7 @@ public int GetIndex(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<int>("getIndex", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getIndex(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getIndex(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="int"/></returns>
@@ -80,7 +73,15 @@ public int GetIndex(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getIndex", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getLocalName(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
+        {
+            return IExecuteWithSignature<int>("getLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getLocalName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -89,7 +90,7 @@ public Java.Lang.String GetLocalName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getLocalName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getQName(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getQName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -98,7 +99,7 @@ public Java.Lang.String GetQName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getQName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getType(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -107,7 +108,7 @@ public Java.Lang.String GetType(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getType", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getType(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getType(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -117,7 +118,7 @@ public Java.Lang.String GetType(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<Java.Lang.String>("getType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getType(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getType(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -126,7 +127,7 @@ public Java.Lang.String GetType(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getType", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getURI(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getURI(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -135,7 +136,7 @@ public Java.Lang.String GetURI(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getURI", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getValue(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getValue(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -144,7 +145,7 @@ public Java.Lang.String GetValue(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getValue(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getValue(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -154,7 +155,7 @@ public Java.Lang.String GetValue(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<Java.Lang.String>("getValue", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#getValue(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#getValue(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -163,7 +164,7 @@ public Java.Lang.String GetValue(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#addAttribute(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#addAttribute(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -175,14 +176,14 @@ public void AddAttribute(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("addAttribute", arg0, arg1, arg2, arg3, arg4);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#clear()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#clear()"/>
         /// </summary>
         public void Clear()
         {
             IExecuteWithSignature("clear", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#removeAttribute(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#removeAttribute(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         public void RemoveAttribute(int arg0)
@@ -190,7 +191,7 @@ public void RemoveAttribute(int arg0)
             IExecuteWithSignature("removeAttribute", "(I)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#setAttribute(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#setAttribute(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -203,7 +204,7 @@ public void SetAttribute(int arg0, Java.Lang.String arg1, Java.Lang.String arg2,
             IExecute("setAttribute", arg0, arg1, arg2, arg3, arg4, arg5);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#setAttributes(org.xml.sax.Attributes)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#setAttributes(org.xml.sax.Attributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Attributes"/></param>
         public void SetAttributes(Org.Xml.Sax.Attributes arg0)
@@ -211,7 +212,7 @@ public void SetAttributes(Org.Xml.Sax.Attributes arg0)
             IExecuteWithSignature("setAttributes", "(Lorg/xml/sax/Attributes;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#setLocalName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#setLocalName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -220,7 +221,7 @@ public void SetLocalName(int arg0, Java.Lang.String arg1)
             IExecute("setLocalName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#setQName(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#setQName(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -229,7 +230,7 @@ public void SetQName(int arg0, Java.Lang.String arg1)
             IExecute("setQName", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#setType(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#setType(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -238,7 +239,7 @@ public void SetType(int arg0, Java.Lang.String arg1)
             IExecute("setType", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#setURI(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#setURI(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -247,7 +248,7 @@ public void SetURI(int arg0, Java.Lang.String arg1)
             IExecute("setURI", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/AttributesImpl.html#setValue(int,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/AttributesImpl.html#setValue(int,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/DefaultHandler.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/DefaultHandler.cs
index 7fd5c2a63..bd7691845 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/DefaultHandler.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/DefaultHandler.cs
@@ -62,7 +62,7 @@ public partial class DefaultHandler : Org.Xml.Sax.IEntityResolver, Org.Xml.Sax.I
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#resolveEntity(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#resolveEntity(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -74,7 +74,7 @@ public Org.Xml.Sax.InputSource ResolveEntity(Java.Lang.String arg0, Java.Lang.St
             return IExecute<Org.Xml.Sax.InputSource>("resolveEntity", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#characters(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#characters(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -85,7 +85,7 @@ public void Characters(char[] arg0, int arg1, int arg2)
             IExecute("characters", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#endDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#endDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndDocument()
@@ -93,7 +93,7 @@ public void EndDocument()
             IExecuteWithSignature("endDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -104,7 +104,7 @@ public void EndElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.S
             IExecute("endElement", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#endPrefixMapping(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#endPrefixMapping(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -113,7 +113,7 @@ public void EndPrefixMapping(Java.Lang.String arg0)
             IExecuteWithSignature("endPrefixMapping", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#error(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#error(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -122,7 +122,7 @@ public void Error(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("error", "(Lorg/xml/sax/SAXParseException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#fatalError(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#fatalError(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -131,7 +131,7 @@ public void FatalError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("fatalError", "(Lorg/xml/sax/SAXParseException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -142,7 +142,7 @@ public void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
             IExecute("ignorableWhitespace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#notationDecl(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#notationDecl(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -153,7 +153,7 @@ public void NotationDecl(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("notationDecl", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -163,7 +163,7 @@ public void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("processingInstruction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
@@ -171,7 +171,7 @@ public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
             IExecuteWithSignature("setDocumentLocator", "(Lorg/xml/sax/Locator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#skippedEntity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#skippedEntity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -180,7 +180,7 @@ public void SkippedEntity(Java.Lang.String arg0)
             IExecuteWithSignature("skippedEntity", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#startDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#startDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void StartDocument()
@@ -188,7 +188,7 @@ public void StartDocument()
             IExecuteWithSignature("startDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -200,7 +200,7 @@ public void StartElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("startElement", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -210,7 +210,7 @@ public void StartPrefixMapping(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("startPrefixMapping", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#unparsedEntityDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#unparsedEntityDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -222,7 +222,7 @@ public void UnparsedEntityDecl(Java.Lang.String arg0, Java.Lang.String arg1, Jav
             IExecute("unparsedEntityDecl", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/DefaultHandler.html#warning(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/DefaultHandler.html#warning(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/LocatorImpl.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/LocatorImpl.cs
index 1ae40dc7f..1fc84eed1 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/LocatorImpl.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/LocatorImpl.cs
@@ -30,7 +30,7 @@ public partial class LocatorImpl
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#%3Cinit%3E(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#%3Cinit%3E(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public LocatorImpl(Org.Xml.Sax.Locator arg0)
@@ -54,32 +54,68 @@ public LocatorImpl(Org.Xml.Sax.Locator arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#getColumnNumber()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#setColumnNumber(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#getColumnNumber()"/>
         /// </summary>
-        public int ColumnNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnNumber()
         {
-            get { return IExecuteWithSignature<int>("getColumnNumber", "()I"); } set { IExecuteWithSignature("setColumnNumber", "(I)V", value); }
+            return IExecuteWithSignature<int>("getColumnNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#getLineNumber()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#setLineNumber(int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#getLineNumber()"/>
         /// </summary>
-        public int LineNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
         {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); } set { IExecuteWithSignature("setLineNumber", "(I)V", value); }
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#getPublicId()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#setPublicId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPublicId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/LocatorImpl.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#setColumnNumber(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetColumnNumber(int arg0)
+        {
+            IExecuteWithSignature("setColumnNumber", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#setLineNumber(int)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="int"/></param>
+        public void SetLineNumber(int arg0)
+        {
+            IExecuteWithSignature("setLineNumber", "(I)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#setPublicId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPublicId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPublicId", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/LocatorImpl.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/NamespaceSupport.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/NamespaceSupport.cs
index b3c8d3fa1..970ee2138 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/NamespaceSupport.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/NamespaceSupport.cs
@@ -38,13 +38,13 @@ public partial class NamespaceSupport
 
         #region Fields
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#NSDECL"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#NSDECL"/>
         /// </summary>
         public static Java.Lang.String NSDECL { get { if (!_NSDECLReady) { _NSDECLContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "NSDECL"); _NSDECLReady = true; } return _NSDECLContent; } }
         private static Java.Lang.String _NSDECLContent = default;
         private static bool _NSDECLReady = false; // this is used because in case of generics 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#XMLNS"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#XMLNS"/>
         /// </summary>
         public static Java.Lang.String XMLNS { get { if (!_XMLNSReady) { _XMLNSContent = SGetField<Java.Lang.String>(LocalBridgeClazz, "XMLNS"); _XMLNSReady = true; } return _XMLNSContent; } }
         private static Java.Lang.String _XMLNSContent = default;
@@ -58,21 +58,7 @@ public partial class NamespaceSupport
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#getDeclaredPrefixes()"/> 
-        /// </summary>
-        public Java.Util.Enumeration<Java.Lang.String> DeclaredPrefixes
-        {
-            get { return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getDeclaredPrefixes", "()Ljava/util/Enumeration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#getPrefixes()"/> 
-        /// </summary>
-        public Java.Util.Enumeration<Java.Lang.String> Prefixes
-        {
-            get { return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getPrefixes", "()Ljava/util/Enumeration;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#declarePrefix(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#declarePrefix(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -82,7 +68,7 @@ public bool DeclarePrefix(Java.Lang.String arg0, Java.Lang.String arg1)
             return IExecute<bool>("declarePrefix", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#isNamespaceDeclUris()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#isNamespaceDeclUris()"/>
         /// </summary>
         /// <returns><see cref="bool"/></returns>
         public bool IsNamespaceDeclUris()
@@ -90,7 +76,7 @@ public bool IsNamespaceDeclUris()
             return IExecuteWithSignature<bool>("isNamespaceDeclUris", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#getPrefix(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#getPrefix(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -99,7 +85,7 @@ public Java.Lang.String GetPrefix(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getPrefix", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#getURI(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#getURI(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Lang.String"/></returns>
@@ -108,7 +94,7 @@ public Java.Lang.String GetURI(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getURI", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#processName(java.lang.String,java.lang.String[],boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#processName(java.lang.String,java.lang.String[],boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -119,7 +105,23 @@ public Java.Lang.String[] ProcessName(Java.Lang.String arg0, Java.Lang.String[]
             return IExecuteArray<Java.Lang.String>("processName", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#getPrefixes(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#getDeclaredPrefixes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<Java.Lang.String> GetDeclaredPrefixes()
+        {
+            return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getDeclaredPrefixes", "()Ljava/util/Enumeration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#getPrefixes()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Util.Enumeration"/></returns>
+        public Java.Util.Enumeration<Java.Lang.String> GetPrefixes()
+        {
+            return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getPrefixes", "()Ljava/util/Enumeration;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#getPrefixes(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Java.Util.Enumeration"/></returns>
@@ -128,28 +130,28 @@ public Java.Lang.String[] ProcessName(Java.Lang.String arg0, Java.Lang.String[]
             return IExecuteWithSignature<Java.Util.Enumeration<Java.Lang.String>>("getPrefixes", "(Ljava/lang/String;)Ljava/util/Enumeration;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#popContext()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#popContext()"/>
         /// </summary>
         public void PopContext()
         {
             IExecuteWithSignature("popContext", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#pushContext()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#pushContext()"/>
         /// </summary>
         public void PushContext()
         {
             IExecuteWithSignature("pushContext", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#reset()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#reset()"/>
         /// </summary>
         public void Reset()
         {
             IExecuteWithSignature("reset", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/NamespaceSupport.html#setNamespaceDeclUris(boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/NamespaceSupport.html#setNamespaceDeclUris(boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="bool"/></param>
         public void SetNamespaceDeclUris(bool arg0)
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/ParserAdapter.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/ParserAdapter.cs
index 48204c20d..8c282341e 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/ParserAdapter.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/ParserAdapter.cs
@@ -50,36 +50,36 @@ public partial class ParserAdapter : Org.Xml.Sax.IXMLReader, Org.Xml.Sax.IDocume
         /// </summary>
         protected virtual void InitializeHandlers()
         {
-            AddEventHandler("getFeature", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(GetFeatureEventHandler));
-            AddEventHandler("getProperty", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(GetPropertyEventHandler));
-            AddEventHandler("getContentHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetContentHandlerEventHandler));
-            AddEventHandler("getDTDHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDTDHandlerEventHandler));
-            AddEventHandler("getEntityResolver", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetEntityResolverEventHandler));
-            AddEventHandler("getErrorHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetErrorHandlerEventHandler));
-            AddEventHandler("characters", new System.EventHandler<CLRListenerEventArgs<CLREventData<char[]>>>(CharactersEventHandler));
-            AddEventHandler("endDocument", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(EndDocumentEventHandler));
-            AddEventHandler("endElement", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(EndElementEventHandler));
-            AddEventHandler("ignorableWhitespace", new System.EventHandler<CLRListenerEventArgs<CLREventData<char[]>>>(IgnorableWhitespaceEventHandler));
-            AddEventHandler("parse", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(ParseEventHandler));
-            AddEventHandler("parse1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.InputSource>>>(Parse1EventHandler));
-            AddEventHandler("processingInstruction", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(ProcessingInstructionEventHandler));
-            AddEventHandler("setContentHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.ContentHandler>>>(SetContentHandlerEventHandler));
-            AddEventHandler("setDocumentLocator", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Locator>>>(SetDocumentLocatorEventHandler));
-            AddEventHandler("setDTDHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.DTDHandler>>>(SetDTDHandlerEventHandler));
-            AddEventHandler("setEntityResolver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.EntityResolver>>>(SetEntityResolverEventHandler));
-            AddEventHandler("setErrorHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.ErrorHandler>>>(SetErrorHandlerEventHandler));
-            AddEventHandler("setFeature", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(SetFeatureEventHandler));
-            AddEventHandler("setProperty", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(SetPropertyEventHandler));
-            AddEventHandler("startDocument", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(StartDocumentEventHandler));
-            AddEventHandler("startElement", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(StartElementEventHandler));
-
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getFeature(java.lang.String)"/>
+            AddEventHandler("getFeature", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(GetFeatureEventHandler));
+            AddEventHandler("getProperty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(GetPropertyEventHandler));
+            AddEventHandler("getContentHandler", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetContentHandlerEventHandler));
+            AddEventHandler("getDTDHandler", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetDTDHandlerEventHandler));
+            AddEventHandler("getEntityResolver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetEntityResolverEventHandler));
+            AddEventHandler("getErrorHandler", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(GetErrorHandlerEventHandler));
+            AddEventHandler("characters", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<char[]>>>(CharactersEventHandler));
+            AddEventHandler("endDocument", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(EndDocumentEventHandler));
+            AddEventHandler("endElement", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(EndElementEventHandler));
+            AddEventHandler("ignorableWhitespace", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<char[]>>>(IgnorableWhitespaceEventHandler));
+            AddEventHandler("parse", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(ParseEventHandler));
+            AddEventHandler("parse1", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.InputSource>>>(Parse1EventHandler));
+            AddEventHandler("processingInstruction", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(ProcessingInstructionEventHandler));
+            AddEventHandler("setContentHandler", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.ContentHandler>>>(SetContentHandlerEventHandler));
+            AddEventHandler("setDocumentLocator", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Locator>>>(SetDocumentLocatorEventHandler));
+            AddEventHandler("setDTDHandler", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.DTDHandler>>>(SetDTDHandlerEventHandler));
+            AddEventHandler("setEntityResolver", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.EntityResolver>>>(SetEntityResolverEventHandler));
+            AddEventHandler("setErrorHandler", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.ErrorHandler>>>(SetErrorHandlerEventHandler));
+            AddEventHandler("setFeature", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(SetFeatureEventHandler));
+            AddEventHandler("setProperty", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(SetPropertyEventHandler));
+            AddEventHandler("startDocument", new global::System.EventHandler<CLRListenerEventArgs<CLREventData>>(StartDocumentEventHandler));
+            AddEventHandler("startElement", new global::System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(StartElementEventHandler));
+
+        }
+
+        /// <summary>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetFeature"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, bool> OnGetFeature { get; set; } = null;
+        public global::System.Func<Java.Lang.String, bool> OnGetFeature { get; set; } = null;
 
         void GetFeatureEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -89,7 +89,7 @@ void GetFeatureEventHandler(object sender, CLRListenerEventArgs<CLREventData<Jav
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="bool"/></returns>
@@ -101,10 +101,10 @@ public virtual bool GetFeature(Java.Lang.String arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getProperty(java.lang.String)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetProperty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Java.Lang.String, object> OnGetProperty { get; set; } = null;
+        public global::System.Func<Java.Lang.String, object> OnGetProperty { get; set; } = null;
 
         void GetPropertyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -114,7 +114,7 @@ void GetPropertyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Ja
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="object"/></returns>
@@ -126,10 +126,10 @@ public virtual object GetProperty(Java.Lang.String arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getContentHandler()"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getContentHandler()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetContentHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Org.Xml.Sax.ContentHandler> OnGetContentHandler { get; set; } = null;
+        public global::System.Func<Org.Xml.Sax.ContentHandler> OnGetContentHandler { get; set; } = null;
 
         void GetContentHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -139,7 +139,7 @@ void GetContentHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventD
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getContentHandler()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getContentHandler()"/>
         /// </summary>
         /// <returns><see cref="Org.Xml.Sax.ContentHandler"/></returns>
         public virtual Org.Xml.Sax.ContentHandler GetContentHandler()
@@ -148,10 +148,10 @@ public virtual Org.Xml.Sax.ContentHandler GetContentHandler()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getDTDHandler()"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getDTDHandler()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetDTDHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Org.Xml.Sax.DTDHandler> OnGetDTDHandler { get; set; } = null;
+        public global::System.Func<Org.Xml.Sax.DTDHandler> OnGetDTDHandler { get; set; } = null;
 
         void GetDTDHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -161,7 +161,7 @@ void GetDTDHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getDTDHandler()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getDTDHandler()"/>
         /// </summary>
         /// <returns><see cref="Org.Xml.Sax.DTDHandler"/></returns>
         public virtual Org.Xml.Sax.DTDHandler GetDTDHandler()
@@ -170,10 +170,10 @@ public virtual Org.Xml.Sax.DTDHandler GetDTDHandler()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getEntityResolver()"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getEntityResolver()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetEntityResolver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Org.Xml.Sax.EntityResolver> OnGetEntityResolver { get; set; } = null;
+        public global::System.Func<Org.Xml.Sax.EntityResolver> OnGetEntityResolver { get; set; } = null;
 
         void GetEntityResolverEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -183,7 +183,7 @@ void GetEntityResolverEventHandler(object sender, CLRListenerEventArgs<CLREventD
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getEntityResolver()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getEntityResolver()"/>
         /// </summary>
         /// <returns><see cref="Org.Xml.Sax.EntityResolver"/></returns>
         public virtual Org.Xml.Sax.EntityResolver GetEntityResolver()
@@ -192,10 +192,10 @@ public virtual Org.Xml.Sax.EntityResolver GetEntityResolver()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getErrorHandler()"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getErrorHandler()"/>
         /// </summary>
         /// <remarks>If <see cref="OnGetErrorHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Func<Org.Xml.Sax.ErrorHandler> OnGetErrorHandler { get; set; } = null;
+        public global::System.Func<Org.Xml.Sax.ErrorHandler> OnGetErrorHandler { get; set; } = null;
 
         void GetErrorHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -205,7 +205,7 @@ void GetErrorHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventDat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getErrorHandler()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getErrorHandler()"/>
         /// </summary>
         /// <returns><see cref="Org.Xml.Sax.ErrorHandler"/></returns>
         public virtual Org.Xml.Sax.ErrorHandler GetErrorHandler()
@@ -214,10 +214,10 @@ public virtual Org.Xml.Sax.ErrorHandler GetErrorHandler()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#characters(char[],int,int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#characters(char[],int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnCharacters"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<char[], int, int> OnCharacters { get; set; } = null;
+        public global::System.Action<char[], int, int> OnCharacters { get; set; } = null;
 
         void CharactersEventHandler(object sender, CLRListenerEventArgs<CLREventData<char[]>> data)
         {
@@ -226,7 +226,7 @@ void CharactersEventHandler(object sender, CLRListenerEventArgs<CLREventData<cha
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#characters(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#characters(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -238,10 +238,10 @@ public virtual void Characters(char[] arg0, int arg1, int arg2)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#endDocument()"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#endDocument()"/>
         /// </summary>
         /// <remarks>If <see cref="OnEndDocument"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnEndDocument { get; set; } = null;
+        public global::System.Action OnEndDocument { get; set; } = null;
 
         void EndDocumentEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -250,7 +250,7 @@ void EndDocumentEventHandler(object sender, CLRListenerEventArgs<CLREventData> d
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#endDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#endDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public virtual void EndDocument()
@@ -259,10 +259,10 @@ public virtual void EndDocument()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#endElement(java.lang.String)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#endElement(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnEndElement"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnEndElement { get; set; } = null;
+        public global::System.Action<Java.Lang.String> OnEndElement { get; set; } = null;
 
         void EndElementEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -271,7 +271,7 @@ void EndElementEventHandler(object sender, CLRListenerEventArgs<CLREventData<Jav
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#endElement(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#endElement(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -281,10 +281,10 @@ public virtual void EndElement(Java.Lang.String arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#ignorableWhitespace(char[],int,int)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <remarks>If <see cref="OnIgnorableWhitespace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<char[], int, int> OnIgnorableWhitespace { get; set; } = null;
+        public global::System.Action<char[], int, int> OnIgnorableWhitespace { get; set; } = null;
 
         void IgnorableWhitespaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<char[]>> data)
         {
@@ -293,7 +293,7 @@ void IgnorableWhitespaceEventHandler(object sender, CLRListenerEventArgs<CLREven
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -305,10 +305,10 @@ public virtual void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#parse(java.lang.String)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#parse(java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnParse"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnParse { get; set; } = null;
+        public global::System.Action<Java.Lang.String> OnParse { get; set; } = null;
 
         void ParseEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -317,7 +317,7 @@ void ParseEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lan
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -328,10 +328,10 @@ public virtual void Parse(Java.Lang.String arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#parse(org.xml.sax.InputSource)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#parse(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <remarks>If <see cref="OnParse1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.InputSource> OnParse1 { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.InputSource> OnParse1 { get; set; } = null;
 
         void Parse1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.InputSource>> data)
         {
@@ -340,7 +340,7 @@ void Parse1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#parse(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#parse(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -351,10 +351,10 @@ public virtual void Parse(Org.Xml.Sax.InputSource arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <remarks>If <see cref="OnProcessingInstruction"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, Java.Lang.String> OnProcessingInstruction { get; set; } = null;
+        public global::System.Action<Java.Lang.String, Java.Lang.String> OnProcessingInstruction { get; set; } = null;
 
         void ProcessingInstructionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -363,7 +363,7 @@ void ProcessingInstructionEventHandler(object sender, CLRListenerEventArgs<CLREv
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -374,10 +374,10 @@ public virtual void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.Strin
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setContentHandler(org.xml.sax.ContentHandler)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetContentHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.ContentHandler> OnSetContentHandler { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.ContentHandler> OnSetContentHandler { get; set; } = null;
 
         void SetContentHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.ContentHandler>> data)
         {
@@ -386,7 +386,7 @@ void SetContentHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventD
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setContentHandler(org.xml.sax.ContentHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.ContentHandler"/></param>
         public virtual void SetContentHandler(Org.Xml.Sax.ContentHandler arg0)
@@ -395,10 +395,10 @@ public virtual void SetContentHandler(Org.Xml.Sax.ContentHandler arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetDocumentLocator"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.Locator> OnSetDocumentLocator { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.Locator> OnSetDocumentLocator { get; set; } = null;
 
         void SetDocumentLocatorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Locator>> data)
         {
@@ -407,7 +407,7 @@ void SetDocumentLocatorEventHandler(object sender, CLRListenerEventArgs<CLREvent
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public virtual void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
@@ -416,10 +416,10 @@ public virtual void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetDTDHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.DTDHandler> OnSetDTDHandler { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.DTDHandler> OnSetDTDHandler { get; set; } = null;
 
         void SetDTDHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.DTDHandler>> data)
         {
@@ -428,7 +428,7 @@ void SetDTDHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData<
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.DTDHandler"/></param>
         public virtual void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
@@ -437,10 +437,10 @@ public virtual void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetEntityResolver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.EntityResolver> OnSetEntityResolver { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.EntityResolver> OnSetEntityResolver { get; set; } = null;
 
         void SetEntityResolverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.EntityResolver>> data)
         {
@@ -449,7 +449,7 @@ void SetEntityResolverEventHandler(object sender, CLRListenerEventArgs<CLREventD
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
         public virtual void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
@@ -458,10 +458,10 @@ public virtual void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetErrorHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.ErrorHandler> OnSetErrorHandler { get; set; } = null;
+        public global::System.Action<Org.Xml.Sax.ErrorHandler> OnSetErrorHandler { get; set; } = null;
 
         void SetErrorHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.ErrorHandler>> data)
         {
@@ -470,7 +470,7 @@ void SetErrorHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventDat
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
         public virtual void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
@@ -479,10 +479,10 @@ public virtual void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setFeature(java.lang.String,boolean)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetFeature"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, bool> OnSetFeature { get; set; } = null;
+        public global::System.Action<Java.Lang.String, bool> OnSetFeature { get; set; } = null;
 
         void SetFeatureEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -491,7 +491,7 @@ void SetFeatureEventHandler(object sender, CLRListenerEventArgs<CLREventData<Jav
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -503,10 +503,10 @@ public virtual void SetFeature(Java.Lang.String arg0, bool arg1)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <remarks>If <see cref="OnSetProperty"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, object> OnSetProperty { get; set; } = null;
+        public global::System.Action<Java.Lang.String, object> OnSetProperty { get; set; } = null;
 
         void SetPropertyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -515,7 +515,7 @@ void SetPropertyEventHandler(object sender, CLRListenerEventArgs<CLREventData<Ja
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -527,10 +527,10 @@ public virtual void SetProperty(Java.Lang.String arg0, object arg1)
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#startDocument()"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#startDocument()"/>
         /// </summary>
         /// <remarks>If <see cref="OnStartDocument"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnStartDocument { get; set; } = null;
+        public global::System.Action OnStartDocument { get; set; } = null;
 
         void StartDocumentEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
         {
@@ -539,7 +539,7 @@ void StartDocumentEventHandler(object sender, CLRListenerEventArgs<CLREventData>
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#startDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#startDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public virtual void StartDocument()
@@ -548,10 +548,10 @@ public virtual void StartDocument()
         }
 
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
+        /// Handler for <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
         /// </summary>
         /// <remarks>If <see cref="OnStartElement"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, Org.Xml.Sax.AttributeList> OnStartElement { get; set; } = null;
+        public global::System.Action<Java.Lang.String, Org.Xml.Sax.AttributeList> OnStartElement { get; set; } = null;
 
         void StartElementEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
         {
@@ -560,7 +560,7 @@ void StartElementEventHandler(object sender, CLRListenerEventArgs<CLREventData<J
         }
 
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.AttributeList"/></param>
@@ -601,57 +601,61 @@ public partial class ParserAdapterDirect : Org.Xml.Sax.IXMLReader, Org.Xml.Sax.I
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getContentHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getFeature(java.lang.String)"/>
         /// </summary>
-        public Org.Xml.Sax.ContentHandler ContentHandler
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
+        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
+        public override bool GetFeature(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;"); } set { IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", value); }
+            return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getDTDHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getProperty(java.lang.String)"/>
         /// </summary>
-        public Org.Xml.Sax.DTDHandler DTDHandler
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
+        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
+        public override object GetProperty(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.DTDHandler>("getDTDHandler", "()Lorg/xml/sax/DTDHandler;"); } set { IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", value); }
+            return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getEntityResolver()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getContentHandler()"/>
         /// </summary>
-        public Org.Xml.Sax.EntityResolver EntityResolver
+        /// <returns><see cref="Org.Xml.Sax.ContentHandler"/></returns>
+        public override Org.Xml.Sax.ContentHandler GetContentHandler()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.EntityResolver>("getEntityResolver", "()Lorg/xml/sax/EntityResolver;"); } set { IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getErrorHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getDTDHandler()"/>
         /// </summary>
-        public Org.Xml.Sax.ErrorHandler ErrorHandler
+        /// <returns><see cref="Org.Xml.Sax.DTDHandler"/></returns>
+        public override Org.Xml.Sax.DTDHandler GetDTDHandler()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;"); } set { IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.DTDHandler>("getDTDHandler", "()Lorg/xml/sax/DTDHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getEntityResolver()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
-        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
-        public override bool GetFeature(Java.Lang.String arg0)
+        /// <returns><see cref="Org.Xml.Sax.EntityResolver"/></returns>
+        public override Org.Xml.Sax.EntityResolver GetEntityResolver()
         {
-            return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Org.Xml.Sax.EntityResolver>("getEntityResolver", "()Lorg/xml/sax/EntityResolver;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#getErrorHandler()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
-        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
-        public override object GetProperty(Java.Lang.String arg0)
+        /// <returns><see cref="Org.Xml.Sax.ErrorHandler"/></returns>
+        public override Org.Xml.Sax.ErrorHandler GetErrorHandler()
         {
-            return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#characters(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#characters(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -662,7 +666,7 @@ public override void Characters(char[] arg0, int arg1, int arg2)
             IExecute("characters", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#endDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#endDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public override void EndDocument()
@@ -670,7 +674,7 @@ public override void EndDocument()
             IExecuteWithSignature("endDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#endElement(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#endElement(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -679,7 +683,7 @@ public override void EndElement(Java.Lang.String arg0)
             IExecuteWithSignature("endElement", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -690,7 +694,7 @@ public override void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
             IExecute("ignorableWhitespace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -700,7 +704,7 @@ public override void Parse(Java.Lang.String arg0)
             IExecuteWithSignature("parse", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#parse(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#parse(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -710,7 +714,7 @@ public override void Parse(Org.Xml.Sax.InputSource arg0)
             IExecuteWithSignature("parse", "(Lorg/xml/sax/InputSource;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -720,7 +724,15 @@ public override void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.Stri
             IExecute("processingInstruction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ContentHandler"/></param>
+        public override void SetContentHandler(Org.Xml.Sax.ContentHandler arg0)
+        {
+            IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public override void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
@@ -728,7 +740,31 @@ public override void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
             IExecuteWithSignature("setDocumentLocator", "(Lorg/xml/sax/Locator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.DTDHandler"/></param>
+        public override void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
+        {
+            IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
+        public override void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
+        {
+            IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
+        public override void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
+        {
+            IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -739,7 +775,7 @@ public override void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -750,7 +786,7 @@ public override void SetProperty(Java.Lang.String arg0, object arg1)
             IExecute("setProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#startDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#startDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public override void StartDocument()
@@ -758,7 +794,7 @@ public override void StartDocument()
             IExecuteWithSignature("startDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserAdapter.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserAdapter.html#startElement(java.lang.String,org.xml.sax.AttributeList)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Org.Xml.Sax.AttributeList"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/ParserFactory.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/ParserFactory.cs
index a86439446..b6f538a8b 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/ParserFactory.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/ParserFactory.cs
@@ -42,7 +42,7 @@ public partial class ParserFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserFactory.html#makeParser()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserFactory.html#makeParser()"/>
         /// </summary>
         /// <returns><see cref="Org.Xml.Sax.Parser"/></returns>
         /// <exception cref="Java.Lang.ClassNotFoundException"/>
@@ -55,7 +55,7 @@ public static Org.Xml.Sax.Parser MakeParser()
             return SExecuteWithSignature<Org.Xml.Sax.Parser>(LocalBridgeClazz, "makeParser", "()Lorg/xml/sax/Parser;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/ParserFactory.html#makeParser(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/ParserFactory.html#makeParser(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.Xml.Sax.Parser"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLFilterImpl.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLFilterImpl.cs
index 202795313..ff38b04ab 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLFilterImpl.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLFilterImpl.cs
@@ -30,7 +30,7 @@ public partial class XMLFilterImpl : Org.Xml.Sax.IXMLFilter, Org.Xml.Sax.IEntity
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#%3Cinit%3E(org.xml.sax.XMLReader)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#%3Cinit%3E(org.xml.sax.XMLReader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.XMLReader"/></param>
         public XMLFilterImpl(Org.Xml.Sax.XMLReader arg0)
@@ -74,64 +74,61 @@ public XMLFilterImpl(Org.Xml.Sax.XMLReader arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#getContentHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#getFeature(java.lang.String)"/>
         /// </summary>
-        public Org.Xml.Sax.ContentHandler ContentHandler
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
+        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
+        public bool GetFeature(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;"); } set { IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", value); }
+            return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#getDTDHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#getProperty(java.lang.String)"/>
         /// </summary>
-        public Org.Xml.Sax.DTDHandler DTDHandler
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
+        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
+        public object GetProperty(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.DTDHandler>("getDTDHandler", "()Lorg/xml/sax/DTDHandler;"); } set { IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", value); }
+            return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#getEntityResolver()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#getContentHandler()"/>
         /// </summary>
-        public Org.Xml.Sax.EntityResolver EntityResolver
+        /// <returns><see cref="Org.Xml.Sax.ContentHandler"/></returns>
+        public Org.Xml.Sax.ContentHandler GetContentHandler()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.EntityResolver>("getEntityResolver", "()Lorg/xml/sax/EntityResolver;"); } set { IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#getErrorHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#getDTDHandler()"/>
         /// </summary>
-        public Org.Xml.Sax.ErrorHandler ErrorHandler
+        /// <returns><see cref="Org.Xml.Sax.DTDHandler"/></returns>
+        public Org.Xml.Sax.DTDHandler GetDTDHandler()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;"); } set { IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.DTDHandler>("getDTDHandler", "()Lorg/xml/sax/DTDHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#getParent()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#setParent(org.xml.sax.XMLReader)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#getEntityResolver()"/>
         /// </summary>
-        public Org.Xml.Sax.XMLReader Parent
+        /// <returns><see cref="Org.Xml.Sax.EntityResolver"/></returns>
+        public Org.Xml.Sax.EntityResolver GetEntityResolver()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.XMLReader>("getParent", "()Lorg/xml/sax/XMLReader;"); } set { IExecuteWithSignature("setParent", "(Lorg/xml/sax/XMLReader;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.EntityResolver>("getEntityResolver", "()Lorg/xml/sax/EntityResolver;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#getErrorHandler()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
-        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
-        public bool GetFeature(Java.Lang.String arg0)
+        /// <returns><see cref="Org.Xml.Sax.ErrorHandler"/></returns>
+        public Org.Xml.Sax.ErrorHandler GetErrorHandler()
         {
-            return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#getProperty(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
-        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
-        public object GetProperty(Java.Lang.String arg0)
-        {
-            return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#resolveEntity(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#resolveEntity(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -143,7 +140,15 @@ public Org.Xml.Sax.InputSource ResolveEntity(Java.Lang.String arg0, Java.Lang.St
             return IExecute<Org.Xml.Sax.InputSource>("resolveEntity", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#characters(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#getParent()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Xml.Sax.XMLReader"/></returns>
+        public Org.Xml.Sax.XMLReader GetParent()
+        {
+            return IExecuteWithSignature<Org.Xml.Sax.XMLReader>("getParent", "()Lorg/xml/sax/XMLReader;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#characters(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -154,7 +159,7 @@ public void Characters(char[] arg0, int arg1, int arg2)
             IExecute("characters", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#endDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#endDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void EndDocument()
@@ -162,7 +167,7 @@ public void EndDocument()
             IExecuteWithSignature("endDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -173,7 +178,7 @@ public void EndElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.S
             IExecute("endElement", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#endPrefixMapping(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#endPrefixMapping(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -182,7 +187,7 @@ public void EndPrefixMapping(Java.Lang.String arg0)
             IExecuteWithSignature("endPrefixMapping", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#error(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#error(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -191,7 +196,7 @@ public void Error(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("error", "(Lorg/xml/sax/SAXParseException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#fatalError(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#fatalError(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -200,7 +205,7 @@ public void FatalError(MASES.JCOBridge.C2JBridge.JVMBridgeException arg0)
             IExecuteWithSignature("fatalError", "(Lorg/xml/sax/SAXParseException;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
@@ -211,7 +216,7 @@ public void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
             IExecute("ignorableWhitespace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#notationDecl(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#notationDecl(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -222,7 +227,7 @@ public void NotationDecl(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("notationDecl", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -232,7 +237,7 @@ public void Parse(Java.Lang.String arg0)
             IExecuteWithSignature("parse", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#parse(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#parse(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -242,7 +247,7 @@ public void Parse(Org.Xml.Sax.InputSource arg0)
             IExecuteWithSignature("parse", "(Lorg/xml/sax/InputSource;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -252,7 +257,15 @@ public void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("processingInstruction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ContentHandler"/></param>
+        public void SetContentHandler(Org.Xml.Sax.ContentHandler arg0)
+        {
+            IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
         public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
@@ -260,7 +273,31 @@ public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
             IExecuteWithSignature("setDocumentLocator", "(Lorg/xml/sax/Locator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.DTDHandler"/></param>
+        public void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
+        {
+            IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
+        public void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
+        {
+            IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
+        public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
+        {
+            IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -271,7 +308,15 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#setParent(org.xml.sax.XMLReader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.XMLReader"/></param>
+        public void SetParent(Org.Xml.Sax.XMLReader arg0)
+        {
+            IExecuteWithSignature("setParent", "(Lorg/xml/sax/XMLReader;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
@@ -282,7 +327,7 @@ public void SetProperty(Java.Lang.String arg0, object arg1)
             IExecute("setProperty", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#skippedEntity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#skippedEntity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -291,7 +336,7 @@ public void SkippedEntity(Java.Lang.String arg0)
             IExecuteWithSignature("skippedEntity", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#startDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#startDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
         public void StartDocument()
@@ -299,7 +344,7 @@ public void StartDocument()
             IExecuteWithSignature("startDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -311,7 +356,7 @@ public void StartElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang
             IExecute("startElement", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -321,7 +366,7 @@ public void StartPrefixMapping(Java.Lang.String arg0, Java.Lang.String arg1)
             IExecute("startPrefixMapping", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#unparsedEntityDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#unparsedEntityDecl(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
@@ -333,7 +378,7 @@ public void UnparsedEntityDecl(Java.Lang.String arg0, Java.Lang.String arg1, Jav
             IExecute("unparsedEntityDecl", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLFilterImpl.html#warning(org.xml.sax.SAXParseException)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLFilterImpl.html#warning(org.xml.sax.SAXParseException)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.SAXParseException"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLReaderAdapter.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLReaderAdapter.cs
index 5b2d78643..535b09729 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLReaderAdapter.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLReaderAdapter.cs
@@ -29,504 +29,26 @@ namespace Org.Xml.Sax.Helpers
     public partial class XMLReaderAdapter : Org.Xml.Sax.IParser, Org.Xml.Sax.IContentHandler
     {
         #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
-
-        #endregion
-
-        #region Fields
-
-        #endregion
-
-        #region Static methods
-
-        #endregion
-
-        #region Instance methods
-        /// <summary>
-        /// Handlers initializer for <see cref="XMLReaderAdapter"/>
-        /// </summary>
-        protected virtual void InitializeHandlers()
-        {
-            AddEventHandler("declaration", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(DeclarationEventHandler));
-            AddEventHandler("characters", new System.EventHandler<CLRListenerEventArgs<CLREventData<char[]>>>(CharactersEventHandler));
-            AddEventHandler("endDocument", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(EndDocumentEventHandler));
-            AddEventHandler("endElement", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(EndElementEventHandler));
-            AddEventHandler("endPrefixMapping", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(EndPrefixMappingEventHandler));
-            AddEventHandler("ignorableWhitespace", new System.EventHandler<CLRListenerEventArgs<CLREventData<char[]>>>(IgnorableWhitespaceEventHandler));
-            AddEventHandler("parse", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(ParseEventHandler));
-            AddEventHandler("parse1", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.InputSource>>>(Parse1EventHandler));
-            AddEventHandler("processingInstruction", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(ProcessingInstructionEventHandler));
-            AddEventHandler("setDocumentHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.DocumentHandler>>>(SetDocumentHandlerEventHandler));
-            AddEventHandler("setDocumentLocator", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Locator>>>(SetDocumentLocatorEventHandler));
-            AddEventHandler("setDTDHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.DTDHandler>>>(SetDTDHandlerEventHandler));
-            AddEventHandler("setEntityResolver", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.EntityResolver>>>(SetEntityResolverEventHandler));
-            AddEventHandler("setErrorHandler", new System.EventHandler<CLRListenerEventArgs<CLREventData<Org.Xml.Sax.ErrorHandler>>>(SetErrorHandlerEventHandler));
-            AddEventHandler("setLocale", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Util.Locale>>>(SetLocaleEventHandler));
-            AddEventHandler("skippedEntity", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(SkippedEntityEventHandler));
-            AddEventHandler("startDocument", new System.EventHandler<CLRListenerEventArgs<CLREventData>>(StartDocumentEventHandler));
-            AddEventHandler("startElement", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(StartElementEventHandler));
-            AddEventHandler("startPrefixMapping", new System.EventHandler<CLRListenerEventArgs<CLREventData<Java.Lang.String>>>(StartPrefixMappingEventHandler));
-
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#declaration(java.lang.String,java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        /// <remarks>The method invokes the default implementation in the JVM interface</remarks>
-        public void DeclarationDefault(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
-        {
-            IExecute("declarationDefault", arg0, arg1, arg2);
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#declaration(java.lang.String,java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnDeclaration"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, Java.Lang.String, Java.Lang.String> OnDeclaration { get; set; } = null;
-
-        void DeclarationEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnDeclaration != null) ? OnDeclaration : Declaration;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0), data.EventData.GetAt<Java.Lang.String>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#declaration(java.lang.String,java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        /// <remarks>The method invokes the default implementation in the JVM interface using <see cref="DeclarationDefault"/>; override the method to implement a different behavior</remarks>
-        public virtual void Declaration(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
-        {
-            DeclarationDefault(arg0, arg1, arg2);
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#characters(char[],int,int)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnCharacters"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<char[], int, int> OnCharacters { get; set; } = null;
-
-        void CharactersEventHandler(object sender, CLRListenerEventArgs<CLREventData<char[]>> data)
-        {
-            var methodToExecute = (OnCharacters != null) ? OnCharacters : Characters;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#characters(char[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="char"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void Characters(char[] arg0, int arg1, int arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endDocument()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnEndDocument"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnEndDocument { get; set; } = null;
-
-        void EndDocumentEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnEndDocument != null) ? OnEndDocument : EndDocument;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endDocument()"/>
-        /// </summary>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void EndDocument()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnEndElement"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, Java.Lang.String, Java.Lang.String> OnEndElement { get; set; } = null;
-
-        void EndElementEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnEndElement != null) ? OnEndElement : EndElement;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0), data.EventData.GetAt<Java.Lang.String>(1));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void EndElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endPrefixMapping(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnEndPrefixMapping"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnEndPrefixMapping { get; set; } = null;
-
-        void EndPrefixMappingEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnEndPrefixMapping != null) ? OnEndPrefixMapping : EndPrefixMapping;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endPrefixMapping(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        public virtual void EndPrefixMapping(Java.Lang.String arg0)
-        {
-            
-        }
-
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#%3Cinit%3E(org.xml.sax.XMLReader)"/>
         /// </summary>
-        /// <remarks>If <see cref="OnIgnorableWhitespace"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<char[], int, int> OnIgnorableWhitespace { get; set; } = null;
-
-        void IgnorableWhitespaceEventHandler(object sender, CLRListenerEventArgs<CLREventData<char[]>> data)
+        /// <param name="arg0"><see cref="Org.Xml.Sax.XMLReader"/></param>
+        public XMLReaderAdapter(Org.Xml.Sax.XMLReader arg0)
+            : base(arg0)
         {
-            var methodToExecute = (OnIgnorableWhitespace != null) ? OnIgnorableWhitespace : IgnorableWhitespace;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<int>(0), data.EventData.GetAt<int>(1));
         }
 
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#ignorableWhitespace(char[],int,int)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="char"/></param>
-        /// <param name="arg1"><see cref="int"/></param>
-        /// <param name="arg2"><see cref="int"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#parse(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnParse"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnParse { get; set; } = null;
-
-        void ParseEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnParse != null) ? OnParse : Parse;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#parse(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Java.Io.IOException"/>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void Parse(Java.Lang.String arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#parse(org.xml.sax.InputSource)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnParse1"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.InputSource> OnParse1 { get; set; } = null;
-
-        void Parse1EventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.InputSource>> data)
-        {
-            var methodToExecute = (OnParse1 != null) ? OnParse1 : Parse;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#parse(org.xml.sax.InputSource)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
-        /// <exception cref="Java.Io.IOException"/>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void Parse(Org.Xml.Sax.InputSource arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnProcessingInstruction"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, Java.Lang.String> OnProcessingInstruction { get; set; } = null;
-
-        void ProcessingInstructionEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnProcessingInstruction != null) ? OnProcessingInstruction : ProcessingInstruction;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.String arg1)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDocumentHandler(org.xml.sax.DocumentHandler)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetDocumentHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.DocumentHandler> OnSetDocumentHandler { get; set; } = null;
-
-        void SetDocumentHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.DocumentHandler>> data)
-        {
-            var methodToExecute = (OnSetDocumentHandler != null) ? OnSetDocumentHandler : SetDocumentHandler;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDocumentHandler(org.xml.sax.DocumentHandler)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Org.Xml.Sax.DocumentHandler"/></param>
-        public virtual void SetDocumentHandler(Org.Xml.Sax.DocumentHandler arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetDocumentLocator"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.Locator> OnSetDocumentLocator { get; set; } = null;
-
-        void SetDocumentLocatorEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.Locator>> data)
-        {
-            var methodToExecute = (OnSetDocumentLocator != null) ? OnSetDocumentLocator : SetDocumentLocator;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
-        public virtual void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetDTDHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.DTDHandler> OnSetDTDHandler { get; set; } = null;
-
-        void SetDTDHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.DTDHandler>> data)
-        {
-            var methodToExecute = (OnSetDTDHandler != null) ? OnSetDTDHandler : SetDTDHandler;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Org.Xml.Sax.DTDHandler"/></param>
-        public virtual void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetEntityResolver"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.EntityResolver> OnSetEntityResolver { get; set; } = null;
-
-        void SetEntityResolverEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.EntityResolver>> data)
-        {
-            var methodToExecute = (OnSetEntityResolver != null) ? OnSetEntityResolver : SetEntityResolver;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
-        public virtual void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetErrorHandler"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Org.Xml.Sax.ErrorHandler> OnSetErrorHandler { get; set; } = null;
-
-        void SetErrorHandlerEventHandler(object sender, CLRListenerEventArgs<CLREventData<Org.Xml.Sax.ErrorHandler>> data)
-        {
-            var methodToExecute = (OnSetErrorHandler != null) ? OnSetErrorHandler : SetErrorHandler;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
-        public virtual void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setLocale(java.util.Locale)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSetLocale"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Util.Locale> OnSetLocale { get; set; } = null;
-
-        void SetLocaleEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Util.Locale>> data)
-        {
-            var methodToExecute = (OnSetLocale != null) ? OnSetLocale : SetLocale;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setLocale(java.util.Locale)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void SetLocale(Java.Util.Locale arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#skippedEntity(java.lang.String)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnSkippedEntity"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String> OnSkippedEntity { get; set; } = null;
-
-        void SkippedEntityEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnSkippedEntity != null) ? OnSkippedEntity : SkippedEntity;
-            methodToExecute.Invoke(data.EventData.TypedEventData);
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#skippedEntity(java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void SkippedEntity(Java.Lang.String arg0)
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startDocument()"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnStartDocument"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action OnStartDocument { get; set; } = null;
-
-        void StartDocumentEventHandler(object sender, CLRListenerEventArgs<CLREventData> data)
-        {
-            var methodToExecute = (OnStartDocument != null) ? OnStartDocument : StartDocument;
-            methodToExecute.Invoke();
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startDocument()"/>
-        /// </summary>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void StartDocument()
-        {
-            
-        }
-
-        /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
-        /// </summary>
-        /// <remarks>If <see cref="OnStartElement"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, Java.Lang.String, Java.Lang.String, Org.Xml.Sax.Attributes> OnStartElement { get; set; } = null;
-
-        void StartElementEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnStartElement != null) ? OnStartElement : StartElement;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0), data.EventData.GetAt<Java.Lang.String>(1), data.EventData.GetAt<Org.Xml.Sax.Attributes>(2));
-        }
-
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg3"><see cref="Org.Xml.Sax.Attributes"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public virtual void StartElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, Org.Xml.Sax.Attributes arg3)
-        {
-            
-        }
+        #endregion
 
+        #region Class/Interface conversion operators
         /// <summary>
-        /// Handler for <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
+        /// Converter from <see cref="Org.Xml.Sax.Helpers.XMLReaderAdapter"/> to <see cref="Org.Xml.Sax.Parser"/>
         /// </summary>
-        /// <remarks>If <see cref="OnStartPrefixMapping"/> has a value it takes precedence over corresponding class method</remarks>
-        public System.Action<Java.Lang.String, Java.Lang.String> OnStartPrefixMapping { get; set; } = null;
-
-        void StartPrefixMappingEventHandler(object sender, CLRListenerEventArgs<CLREventData<Java.Lang.String>> data)
-        {
-            var methodToExecute = (OnStartPrefixMapping != null) ? OnStartPrefixMapping : StartPrefixMapping;
-            methodToExecute.Invoke(data.EventData.TypedEventData, data.EventData.GetAt<Java.Lang.String>(0));
-        }
-
+        public static implicit operator Org.Xml.Sax.Parser(Org.Xml.Sax.Helpers.XMLReaderAdapter t) => t.Cast<Org.Xml.Sax.Parser>();
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
+        /// Converter from <see cref="Org.Xml.Sax.Helpers.XMLReaderAdapter"/> to <see cref="Org.Xml.Sax.ContentHandler"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        public virtual void StartPrefixMapping(Java.Lang.String arg0, Java.Lang.String arg1)
-        {
-            
-        }
-
-        #endregion
-
-        #region Nested classes
-
-        #endregion
-
-        // TODO: complete the class
-    }
-    #endregion
-
-    #region XMLReaderAdapterDirect
-    public partial class XMLReaderAdapterDirect : Org.Xml.Sax.IParser, Org.Xml.Sax.IContentHandler
-    {
-        #region Constructors
-
-        #endregion
-
-        #region Class/Interface conversion operators
+        public static implicit operator Org.Xml.Sax.ContentHandler(Org.Xml.Sax.Helpers.XMLReaderAdapter t) => t.Cast<Org.Xml.Sax.ContentHandler>();
 
         #endregion
 
@@ -540,179 +62,168 @@ public partial class XMLReaderAdapterDirect : Org.Xml.Sax.IParser, Org.Xml.Sax.I
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/ContentHandler.html#declaration(java.lang.String,java.lang.String,java.lang.String)"/>
-        /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        /// <param name="arg2"><see cref="Java.Lang.String"/></param>
-        /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void Declaration(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
-        {
-            IExecute("declaration", arg0, arg1, arg2);
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#characters(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#characters(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void Characters(char[] arg0, int arg1, int arg2)
+        public void Characters(char[] arg0, int arg1, int arg2)
         {
             IExecute("characters", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#endDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void EndDocument()
+        public void EndDocument()
         {
             IExecuteWithSignature("endDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#endElement(java.lang.String,java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void EndElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
+        public void EndElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2)
         {
             IExecute("endElement", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#endPrefixMapping(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#endPrefixMapping(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        public override void EndPrefixMapping(Java.Lang.String arg0)
+        public void EndPrefixMapping(Java.Lang.String arg0)
         {
             IExecuteWithSignature("endPrefixMapping", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#ignorableWhitespace(char[],int,int)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#ignorableWhitespace(char[],int,int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="char"/></param>
         /// <param name="arg1"><see cref="int"/></param>
         /// <param name="arg2"><see cref="int"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
+        public void IgnorableWhitespace(char[] arg0, int arg1, int arg2)
         {
             IExecute("ignorableWhitespace", arg0, arg1, arg2);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void Parse(Java.Lang.String arg0)
+        public void Parse(Java.Lang.String arg0)
         {
             IExecuteWithSignature("parse", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#parse(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#parse(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <exception cref="Java.Io.IOException"/>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void Parse(Org.Xml.Sax.InputSource arg0)
+        public void Parse(Org.Xml.Sax.InputSource arg0)
         {
             IExecuteWithSignature("parse", "(Lorg/xml/sax/InputSource;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#processingInstruction(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.String arg1)
+        public void ProcessingInstruction(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             IExecute("processingInstruction", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDocumentHandler(org.xml.sax.DocumentHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#setDocumentHandler(org.xml.sax.DocumentHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.DocumentHandler"/></param>
-        public override void SetDocumentHandler(Org.Xml.Sax.DocumentHandler arg0)
+        public void SetDocumentHandler(Org.Xml.Sax.DocumentHandler arg0)
         {
             IExecuteWithSignature("setDocumentHandler", "(Lorg/xml/sax/DocumentHandler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#setDocumentLocator(org.xml.sax.Locator)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.Locator"/></param>
-        public override void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
+        public void SetDocumentLocator(Org.Xml.Sax.Locator arg0)
         {
             IExecuteWithSignature("setDocumentLocator", "(Lorg/xml/sax/Locator;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.DTDHandler"/></param>
-        public override void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
+        public void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
         {
             IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
-        public override void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
+        public void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
         {
             IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
-        public override void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
+        public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
         {
             IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#setLocale(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#setLocale(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void SetLocale(Java.Util.Locale arg0)
+        public void SetLocale(Java.Util.Locale arg0)
         {
             IExecuteWithSignature("setLocale", "(Ljava/util/Locale;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#skippedEntity(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#skippedEntity(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void SkippedEntity(Java.Lang.String arg0)
+        public void SkippedEntity(Java.Lang.String arg0)
         {
             IExecuteWithSignature("skippedEntity", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startDocument()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#startDocument()"/>
         /// </summary>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void StartDocument()
+        public void StartDocument()
         {
             IExecuteWithSignature("startDocument", "()V");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#startElement(java.lang.String,java.lang.String,java.lang.String,org.xml.sax.Attributes)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
         /// <param name="arg2"><see cref="Java.Lang.String"/></param>
         /// <param name="arg3"><see cref="Org.Xml.Sax.Attributes"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
-        public override void StartElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, Org.Xml.Sax.Attributes arg3)
+        public void StartElement(Java.Lang.String arg0, Java.Lang.String arg1, Java.Lang.String arg2, Org.Xml.Sax.Attributes arg3)
         {
             IExecute("startElement", arg0, arg1, arg2, arg3);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderAdapter.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderAdapter.html#startPrefixMapping(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="Java.Lang.String"/></param>
-        public override void StartPrefixMapping(Java.Lang.String arg0, Java.Lang.String arg1)
+        public void StartPrefixMapping(Java.Lang.String arg0, Java.Lang.String arg1)
         {
             IExecute("startPrefixMapping", arg0, arg1);
         }
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLReaderFactory.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLReaderFactory.cs
index ab37af661..d2aaceeee 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLReaderFactory.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Helpers/XMLReaderFactory.cs
@@ -42,7 +42,7 @@ public partial class XMLReaderFactory
 
         #region Static methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderFactory.html#createXMLReader()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderFactory.html#createXMLReader()"/>
         /// </summary>
         /// <returns><see cref="Org.Xml.Sax.XMLReader"/></returns>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -51,7 +51,7 @@ public static Org.Xml.Sax.XMLReader CreateXMLReader()
             return SExecuteWithSignature<Org.Xml.Sax.XMLReader>(LocalBridgeClazz, "createXMLReader", "()Lorg/xml/sax/XMLReader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/helpers/XMLReaderFactory.html#createXMLReader(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/helpers/XMLReaderFactory.html#createXMLReader(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <returns><see cref="Org.Xml.Sax.XMLReader"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/InputSource.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/InputSource.cs
index 0a4c6bee4..9c0e5d037 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/InputSource.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/InputSource.cs
@@ -30,7 +30,7 @@ public partial class InputSource
     {
         #region Constructors
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#%3Cinit%3E(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#%3Cinit%3E(java.io.InputStream)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
         public InputSource(Java.Io.InputStream arg0)
@@ -38,7 +38,7 @@ public InputSource(Java.Io.InputStream arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#%3Cinit%3E(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#%3Cinit%3E(java.io.Reader)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
         public InputSource(Java.Io.Reader arg0)
@@ -46,7 +46,7 @@ public InputSource(Java.Io.Reader arg0)
         {
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#%3Cinit%3E(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#%3Cinit%3E(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         public InputSource(Java.Lang.String arg0)
@@ -70,47 +70,92 @@ public InputSource(Java.Lang.String arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#getByteStream()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#setByteStream(java.io.InputStream)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#isEmpty()"/>
         /// </summary>
-        public Java.Io.InputStream ByteStream
+        /// <returns><see cref="bool"/></returns>
+        public bool IsEmpty()
         {
-            get { return IExecuteWithSignature<Java.Io.InputStream>("getByteStream", "()Ljava/io/InputStream;"); } set { IExecuteWithSignature("setByteStream", "(Ljava/io/InputStream;)V", value); }
+            return IExecuteWithSignature<bool>("isEmpty", "()Z");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#getCharacterStream()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#setCharacterStream(java.io.Reader)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#getByteStream()"/>
         /// </summary>
-        public Java.Io.Reader CharacterStream
+        /// <returns><see cref="Java.Io.InputStream"/></returns>
+        public Java.Io.InputStream GetByteStream()
         {
-            get { return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "()Ljava/io/Reader;"); } set { IExecuteWithSignature("setCharacterStream", "(Ljava/io/Reader;)V", value); }
+            return IExecuteWithSignature<Java.Io.InputStream>("getByteStream", "()Ljava/io/InputStream;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#getEncoding()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#setEncoding(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#getCharacterStream()"/>
         /// </summary>
-        public Java.Lang.String Encoding
+        /// <returns><see cref="Java.Io.Reader"/></returns>
+        public Java.Io.Reader GetCharacterStream()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Io.Reader>("getCharacterStream", "()Ljava/io/Reader;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#getPublicId()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#setPublicId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#getEncoding()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetEncoding()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setPublicId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getEncoding", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#getSystemId()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#setSystemId(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); } set { IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", value); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/InputSource.html#isEmpty()"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#getSystemId()"/>
         /// </summary>
-        /// <returns><see cref="bool"/></returns>
-        public bool IsEmpty()
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            return IExecuteWithSignature<bool>("isEmpty", "()Z");
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#setByteStream(java.io.InputStream)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.InputStream"/></param>
+        public void SetByteStream(Java.Io.InputStream arg0)
+        {
+            IExecuteWithSignature("setByteStream", "(Ljava/io/InputStream;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#setCharacterStream(java.io.Reader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Io.Reader"/></param>
+        public void SetCharacterStream(Java.Io.Reader arg0)
+        {
+            IExecuteWithSignature("setCharacterStream", "(Ljava/io/Reader;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#setEncoding(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetEncoding(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setEncoding", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#setPublicId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetPublicId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setPublicId", "(Ljava/lang/String;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/InputSource.html#setSystemId(java.lang.String)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        public void SetSystemId(Java.Lang.String arg0)
+        {
+            IExecuteWithSignature("setSystemId", "(Ljava/lang/String;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Locator.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Locator.cs
index 0dd3e100e..c9b24ffbb 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Locator.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Locator.cs
@@ -64,32 +64,36 @@ public partial class Locator : Org.Xml.Sax.ILocator
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Locator.html#getColumnNumber()"/> 
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Locator.html#getColumnNumber()"/>
         /// </summary>
-        public int ColumnNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnNumber()
         {
-            get { return IExecuteWithSignature<int>("getColumnNumber", "()I"); }
+            return IExecuteWithSignature<int>("getColumnNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Locator.html#getLineNumber()"/> 
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Locator.html#getLineNumber()"/>
         /// </summary>
-        public int LineNumber
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
         {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); }
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Locator.html#getPublicId()"/> 
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Locator.html#getPublicId()"/>
         /// </summary>
-        public Java.Lang.String PublicId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Locator.html#getSystemId()"/> 
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Locator.html#getSystemId()"/>
         /// </summary>
-        public Java.Lang.String SystemId
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/Parser.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/Parser.cs
index 47dbf4396..40d298f3c 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/Parser.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/Parser.cs
@@ -64,7 +64,7 @@ public partial class Parser : Org.Xml.Sax.IParser
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Parser.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Parser.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -74,7 +74,7 @@ public void Parse(Java.Lang.String arg0)
             IExecuteWithSignature("parse", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Parser.html#parse(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Parser.html#parse(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
@@ -84,7 +84,7 @@ public void Parse(Org.Xml.Sax.InputSource arg0)
             IExecuteWithSignature("parse", "(Lorg/xml/sax/InputSource;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Parser.html#setDocumentHandler(org.xml.sax.DocumentHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Parser.html#setDocumentHandler(org.xml.sax.DocumentHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.DocumentHandler"/></param>
         public void SetDocumentHandler(Org.Xml.Sax.DocumentHandler arg0)
@@ -92,7 +92,7 @@ public void SetDocumentHandler(Org.Xml.Sax.DocumentHandler arg0)
             IExecuteWithSignature("setDocumentHandler", "(Lorg/xml/sax/DocumentHandler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Parser.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Parser.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.DTDHandler"/></param>
         public void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
@@ -100,7 +100,7 @@ public void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
             IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Parser.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Parser.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
         public void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
@@ -108,7 +108,7 @@ public void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
             IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Parser.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Parser.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
         public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
@@ -116,7 +116,7 @@ public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
             IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/Parser.html#setLocale(java.util.Locale)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/Parser.html#setLocale(java.util.Locale)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Util.Locale"/></param>
         /// <exception cref="Org.Xml.Sax.SAXException"/>
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/XMLFilter.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/XMLFilter.cs
index 6a9dd527b..2bbc9e5fe 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/XMLFilter.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/XMLFilter.cs
@@ -64,11 +64,20 @@ public partial class XMLFilter : Org.Xml.Sax.IXMLFilter
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLFilter.html#getParent()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLFilter.html#setParent(org.xml.sax.XMLReader)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLFilter.html#getParent()"/>
         /// </summary>
-        public Org.Xml.Sax.XMLReader Parent
+        /// <returns><see cref="Org.Xml.Sax.XMLReader"/></returns>
+        public Org.Xml.Sax.XMLReader GetParent()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.XMLReader>("getParent", "()Lorg/xml/sax/XMLReader;"); } set { IExecuteWithSignature("setParent", "(Lorg/xml/sax/XMLReader;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.XMLReader>("getParent", "()Lorg/xml/sax/XMLReader;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLFilter.html#setParent(org.xml.sax.XMLReader)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.XMLReader"/></param>
+        public void SetParent(Org.Xml.Sax.XMLReader arg0)
+        {
+            IExecuteWithSignature("setParent", "(Lorg/xml/sax/XMLReader;)V", arg0);
         }
 
         #endregion
diff --git a/src/net/Netdroid/Generated/Org/Xml/Sax/XMLReader.cs b/src/net/Netdroid/Generated/Org/Xml/Sax/XMLReader.cs
index 8472ccb5e..bb63230b0 100644
--- a/src/net/Netdroid/Generated/Org/Xml/Sax/XMLReader.cs
+++ b/src/net/Netdroid/Generated/Org/Xml/Sax/XMLReader.cs
@@ -64,57 +64,61 @@ public partial class XMLReader : Org.Xml.Sax.IXMLReader
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#getContentHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#getFeature(java.lang.String)"/>
         /// </summary>
-        public Org.Xml.Sax.ContentHandler ContentHandler
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
+        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
+        public bool GetFeature(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;"); } set { IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", value); }
+            return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#getDTDHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#getProperty(java.lang.String)"/>
         /// </summary>
-        public Org.Xml.Sax.DTDHandler DTDHandler
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="object"/></returns>
+        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
+        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
+        public object GetProperty(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.DTDHandler>("getDTDHandler", "()Lorg/xml/sax/DTDHandler;"); } set { IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", value); }
+            return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#getEntityResolver()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#getContentHandler()"/>
         /// </summary>
-        public Org.Xml.Sax.EntityResolver EntityResolver
+        /// <returns><see cref="Org.Xml.Sax.ContentHandler"/></returns>
+        public Org.Xml.Sax.ContentHandler GetContentHandler()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.EntityResolver>("getEntityResolver", "()Lorg/xml/sax/EntityResolver;"); } set { IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#getErrorHandler()"/> <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#getDTDHandler()"/>
         /// </summary>
-        public Org.Xml.Sax.ErrorHandler ErrorHandler
+        /// <returns><see cref="Org.Xml.Sax.DTDHandler"/></returns>
+        public Org.Xml.Sax.DTDHandler GetDTDHandler()
         {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;"); } set { IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", value); }
+            return IExecuteWithSignature<Org.Xml.Sax.DTDHandler>("getDTDHandler", "()Lorg/xml/sax/DTDHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#getEntityResolver()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
-        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
-        public bool GetFeature(Java.Lang.String arg0)
+        /// <returns><see cref="Org.Xml.Sax.EntityResolver"/></returns>
+        public Org.Xml.Sax.EntityResolver GetEntityResolver()
         {
-            return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Org.Xml.Sax.EntityResolver>("getEntityResolver", "()Lorg/xml/sax/EntityResolver;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#getErrorHandler()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="object"/></returns>
-        /// <exception cref="Org.Xml.Sax.SAXNotRecognizedException"/>
-        /// <exception cref="Org.Xml.Sax.SAXNotSupportedException"/>
-        public object GetProperty(Java.Lang.String arg0)
+        /// <returns><see cref="Org.Xml.Sax.ErrorHandler"/></returns>
+        public Org.Xml.Sax.ErrorHandler GetErrorHandler()
         {
-            return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#parse(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -124,7 +128,7 @@ public void Parse(Java.Lang.String arg0)
             IExecuteWithSignature("parse", "(Ljava/lang/String;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#parse(org.xml.sax.InputSource)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#parse(org.xml.sax.InputSource)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Org.Xml.Sax.InputSource"/></param>
         /// <exception cref="Java.Io.IOException"/>
@@ -134,7 +138,39 @@ public void Parse(Org.Xml.Sax.InputSource arg0)
             IExecuteWithSignature("parse", "(Lorg/xml/sax/InputSource;)V", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#setFeature(java.lang.String,boolean)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ContentHandler"/></param>
+        public void SetContentHandler(Org.Xml.Sax.ContentHandler arg0)
+        {
+            IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.DTDHandler"/></param>
+        public void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
+        {
+            IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
+        public void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
+        {
+            IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
+        public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
+        {
+            IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="bool"/></param>
@@ -145,7 +181,7 @@ public void SetFeature(Java.Lang.String arg0, bool arg1)
             IExecute("setFeature", arg0, arg1);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/java.xml/org/xml/sax/XMLReader.html#setProperty(java.lang.String,java.lang.Object)"/>
+        /// <see href="https://developer.android.com/reference/org/xml/sax/XMLReader.html#setProperty(java.lang.String,java.lang.Object)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
         /// <param name="arg1"><see cref="object"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xmlpull/V1/AllPackageClasses.cs b/src/net/Netdroid/Generated/Org/Xmlpull/V1/AllPackageClasses.cs
index 8531a964c..90f676dfd 100644
--- a/src/net/Netdroid/Generated/Org/Xmlpull/V1/AllPackageClasses.cs
+++ b/src/net/Netdroid/Generated/Org/Xmlpull/V1/AllPackageClasses.cs
@@ -36,12 +36,12 @@ public partial class XmlPullParser : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Xml
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XmlPullParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XmlPullParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XmlPullParser() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XmlPullParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XmlPullParser class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XmlPullParser(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
@@ -143,12 +143,12 @@ public partial class XmlSerializer : MASES.JCOBridge.C2JBridge.JVMBridgeBase<Xml
         /// <summary>
         /// Default constructor: even if the corresponding Java class does not have one, it is mandatory for JCOBridge
         /// </summary>
-        [Obsolete("XmlSerializer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XmlSerializer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XmlSerializer() { }
         /// <summary>
         /// Generic constructor: it is useful for JCOBridge when there is a derived class which needs to pass arguments to the highest JVMBridgeBase class
         /// </summary>
-        [Obsolete("XmlSerializer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
+        [global::System.Obsolete("XmlSerializer class represents, in .NET, an instance of a JVM interface or abstract class. This public initializer is needed for JCOBridge internal use, other uses can produce unidentible behaviors.")]
         public XmlSerializer(params object[] args) : base(args) { }
 
         private static readonly IJavaType LocalBridgeClazz = ClazzOf(_bridgeClassName);
diff --git a/src/net/Netdroid/Generated/Org/Xmlpull/V1/Sax2/Driver.cs b/src/net/Netdroid/Generated/Org/Xmlpull/V1/Sax2/Driver.cs
index e46423ed5..04c21ae04 100644
--- a/src/net/Netdroid/Generated/Org/Xmlpull/V1/Sax2/Driver.cs
+++ b/src/net/Netdroid/Generated/Org/Xmlpull/V1/Sax2/Driver.cs
@@ -67,69 +67,6 @@ public Driver(Org.Xmlpull.V1.XmlPullParser arg0)
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getColumnNumber()"/> 
-        /// </summary>
-        public int ColumnNumber
-        {
-            get { return IExecuteWithSignature<int>("getColumnNumber", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getContentHandler()"/> <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setContentHandler(org.xml.sax.ContentHandler)"/>
-        /// </summary>
-        public Org.Xml.Sax.ContentHandler ContentHandler
-        {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;"); } set { IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getDTDHandler()"/> <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
-        /// </summary>
-        public Org.Xml.Sax.DTDHandler DTDHandler
-        {
-            get { return IExecuteWithSignature<Org.Xml.Sax.DTDHandler>("getDTDHandler", "()Lorg/xml/sax/DTDHandler;"); } set { IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getEntityResolver()"/> <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
-        /// </summary>
-        public Org.Xml.Sax.EntityResolver EntityResolver
-        {
-            get { return IExecuteWithSignature<Org.Xml.Sax.EntityResolver>("getEntityResolver", "()Lorg/xml/sax/EntityResolver;"); } set { IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getErrorHandler()"/> <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
-        /// </summary>
-        public Org.Xml.Sax.ErrorHandler ErrorHandler
-        {
-            get { return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;"); } set { IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", value); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getLength()"/> 
-        /// </summary>
-        public int Length
-        {
-            get { return IExecuteWithSignature<int>("getLength", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getLineNumber()"/> 
-        /// </summary>
-        public int LineNumber
-        {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getPublicId()"/> 
-        /// </summary>
-        public Java.Lang.String PublicId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getSystemId()"/> 
-        /// </summary>
-        public Java.Lang.String SystemId
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -141,6 +78,14 @@ public bool GetFeature(Java.Lang.String arg0)
             return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getColumnNumber()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnNumber()
+        {
+            return IExecuteWithSignature<int>("getColumnNumber", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getIndex(java.lang.String,java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -160,6 +105,22 @@ public int GetIndex(Java.Lang.String arg0)
             return IExecuteWithSignature<int>("getIndex", "(Ljava/lang/String;)I", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getLength()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLength()
+        {
+            return IExecuteWithSignature<int>("getLength", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getLineNumber()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
+        {
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getProperty(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -180,6 +141,14 @@ public Java.Lang.String GetLocalName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getLocalName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getPublicId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPublicId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPublicId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getQName(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -189,6 +158,14 @@ public Java.Lang.String GetQName(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getQName", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getSystemId()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetSystemId()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getSystemId", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getType(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -254,6 +231,38 @@ public Java.Lang.String GetValue(Java.Lang.String arg0)
             return IExecuteWithSignature<Java.Lang.String>("getValue", "(Ljava/lang/String;)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getContentHandler()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Xml.Sax.ContentHandler"/></returns>
+        public Org.Xml.Sax.ContentHandler GetContentHandler()
+        {
+            return IExecuteWithSignature<Org.Xml.Sax.ContentHandler>("getContentHandler", "()Lorg/xml/sax/ContentHandler;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getDTDHandler()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Xml.Sax.DTDHandler"/></returns>
+        public Org.Xml.Sax.DTDHandler GetDTDHandler()
+        {
+            return IExecuteWithSignature<Org.Xml.Sax.DTDHandler>("getDTDHandler", "()Lorg/xml/sax/DTDHandler;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getEntityResolver()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Xml.Sax.EntityResolver"/></returns>
+        public Org.Xml.Sax.EntityResolver GetEntityResolver()
+        {
+            return IExecuteWithSignature<Org.Xml.Sax.EntityResolver>("getEntityResolver", "()Lorg/xml/sax/EntityResolver;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#getErrorHandler()"/>
+        /// </summary>
+        /// <returns><see cref="Org.Xml.Sax.ErrorHandler"/></returns>
+        public Org.Xml.Sax.ErrorHandler GetErrorHandler()
+        {
+            return IExecuteWithSignature<Org.Xml.Sax.ErrorHandler>("getErrorHandler", "()Lorg/xml/sax/ErrorHandler;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#parse(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -284,6 +293,38 @@ public void ParseSubTree(Org.Xmlpull.V1.XmlPullParser arg0)
             IExecuteWithSignature("parseSubTree", "(Lorg/xmlpull/v1/XmlPullParser;)V", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setContentHandler(org.xml.sax.ContentHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ContentHandler"/></param>
+        public void SetContentHandler(Org.Xml.Sax.ContentHandler arg0)
+        {
+            IExecuteWithSignature("setContentHandler", "(Lorg/xml/sax/ContentHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setDTDHandler(org.xml.sax.DTDHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.DTDHandler"/></param>
+        public void SetDTDHandler(Org.Xml.Sax.DTDHandler arg0)
+        {
+            IExecuteWithSignature("setDTDHandler", "(Lorg/xml/sax/DTDHandler;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setEntityResolver(org.xml.sax.EntityResolver)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.EntityResolver"/></param>
+        public void SetEntityResolver(Org.Xml.Sax.EntityResolver arg0)
+        {
+            IExecuteWithSignature("setEntityResolver", "(Lorg/xml/sax/EntityResolver;)V", arg0);
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setErrorHandler(org.xml.sax.ErrorHandler)"/>
+        /// </summary>
+        /// <param name="arg0"><see cref="Org.Xml.Sax.ErrorHandler"/></param>
+        public void SetErrorHandler(Org.Xml.Sax.ErrorHandler arg0)
+        {
+            IExecuteWithSignature("setErrorHandler", "(Lorg/xml/sax/ErrorHandler;)V", arg0);
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/sax2/Driver.html#setFeature(java.lang.String,boolean)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
diff --git a/src/net/Netdroid/Generated/Org/Xmlpull/V1/XmlPullParser.cs b/src/net/Netdroid/Generated/Org/Xmlpull/V1/XmlPullParser.cs
index 15a0e6755..cbb3922ac 100644
--- a/src/net/Netdroid/Generated/Org/Xmlpull/V1/XmlPullParser.cs
+++ b/src/net/Netdroid/Generated/Org/Xmlpull/V1/XmlPullParser.cs
@@ -166,83 +166,6 @@ public partial class XmlPullParser : Org.Xmlpull.V1.IXmlPullParser
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getAttributeCount()"/> 
-        /// </summary>
-        public int AttributeCount
-        {
-            get { return IExecuteWithSignature<int>("getAttributeCount", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getColumnNumber()"/> 
-        /// </summary>
-        public int ColumnNumber
-        {
-            get { return IExecuteWithSignature<int>("getColumnNumber", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getDepth()"/> 
-        /// </summary>
-        public int Depth
-        {
-            get { return IExecuteWithSignature<int>("getDepth", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getEventType()"/> 
-        /// </summary>
-        public int EventType
-        {
-            get { return IExecuteWithSignature<int>("getEventType", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getInputEncoding()"/> 
-        /// </summary>
-        public Java.Lang.String InputEncoding
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getInputEncoding", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getLineNumber()"/> 
-        /// </summary>
-        public int LineNumber
-        {
-            get { return IExecuteWithSignature<int>("getLineNumber", "()I"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getName()"/> 
-        /// </summary>
-        public Java.Lang.String Name
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getNamespace()"/> 
-        /// </summary>
-        public Java.Lang.String Namespace
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getPositionDescription()"/> 
-        /// </summary>
-        public Java.Lang.String PositionDescription
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPositionDescription", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getPrefix()"/> 
-        /// </summary>
-        public Java.Lang.String Prefix
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getPrefix", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getText()"/> 
-        /// </summary>
-        public Java.Lang.String Text
-        {
-            get { return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;"); }
-        }
-        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getFeature(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -288,6 +211,47 @@ public char[] GetTextCharacters(int[] arg0)
             return IExecuteWithSignatureArray<char>("getTextCharacters", "([I)[C", new object[] { arg0 });
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getAttributeCount()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetAttributeCount()
+        {
+            return IExecuteWithSignature<int>("getAttributeCount", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getColumnNumber()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetColumnNumber()
+        {
+            return IExecuteWithSignature<int>("getColumnNumber", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getDepth()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetDepth()
+        {
+            return IExecuteWithSignature<int>("getDepth", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getEventType()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        /// <exception cref="Org.Xmlpull.V1.XmlPullParserException"/>
+        public int GetEventType()
+        {
+            return IExecuteWithSignature<int>("getEventType", "()I");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getLineNumber()"/>
+        /// </summary>
+        /// <returns><see cref="int"/></returns>
+        public int GetLineNumber()
+        {
+            return IExecuteWithSignature<int>("getLineNumber", "()I");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getNamespaceCount(int)"/>
         /// </summary>
         /// <param name="arg0"><see cref="int"/></param>
@@ -392,6 +356,30 @@ public Java.Lang.String GetAttributeValue(Java.Lang.String arg0, Java.Lang.Strin
             return IExecute<Java.Lang.String>("getAttributeValue", arg0, arg1);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getInputEncoding()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetInputEncoding()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getInputEncoding", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getName()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getNamespace()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getNamespace(java.lang.String)"/>
         /// </summary>
         /// <param name="arg0"><see cref="Java.Lang.String"/></param>
@@ -421,6 +409,30 @@ public Java.Lang.String GetNamespaceUri(int arg0)
             return IExecuteWithSignature<Java.Lang.String>("getNamespaceUri", "(I)Ljava/lang/String;", arg0);
         }
         /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getPositionDescription()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPositionDescription()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPositionDescription", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getPrefix()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetPrefix()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getPrefix", "()Ljava/lang/String;");
+        }
+        /// <summary>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#getText()"/>
+        /// </summary>
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetText()
+        {
+            return IExecuteWithSignature<Java.Lang.String>("getText", "()Ljava/lang/String;");
+        }
+        /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlPullParser.html#nextText()"/>
         /// </summary>
         /// <returns><see cref="Java.Lang.String"/></returns>
diff --git a/src/net/Netdroid/Generated/Org/Xmlpull/V1/XmlSerializer.cs b/src/net/Netdroid/Generated/Org/Xmlpull/V1/XmlSerializer.cs
index 17377bbf0..7fb85f951 100644
--- a/src/net/Netdroid/Generated/Org/Xmlpull/V1/XmlSerializer.cs
+++ b/src/net/Netdroid/Generated/Org/Xmlpull/V1/XmlSerializer.cs
@@ -64,43 +64,46 @@ public partial class XmlSerializer : Org.Xmlpull.V1.IXmlSerializer
 
         #region Instance methods
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getDepth()"/> 
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getFeature(java.lang.String)"/>
         /// </summary>
-        public int Depth
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="bool"/></returns>
+        public bool GetFeature(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<int>("getDepth", "()I"); }
+            return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getName()"/> 
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getDepth()"/>
         /// </summary>
-        public Java.Lang.String Name
+        /// <returns><see cref="int"/></returns>
+        public int GetDepth()
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature<int>("getDepth", "()I");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getNamespace()"/> 
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getProperty(java.lang.String)"/>
         /// </summary>
-        public Java.Lang.String Namespace
+        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
+        /// <returns><see cref="object"/></returns>
+        public object GetProperty(Java.Lang.String arg0)
         {
-            get { return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;"); }
+            return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getFeature(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getName()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="bool"/></returns>
-        public bool GetFeature(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetName()
         {
-            return IExecuteWithSignature<bool>("getFeature", "(Ljava/lang/String;)Z", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getName", "()Ljava/lang/String;");
         }
         /// <summary>
-        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getProperty(java.lang.String)"/>
+        /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getNamespace()"/>
         /// </summary>
-        /// <param name="arg0"><see cref="Java.Lang.String"/></param>
-        /// <returns><see cref="object"/></returns>
-        public object GetProperty(Java.Lang.String arg0)
+        /// <returns><see cref="Java.Lang.String"/></returns>
+        public Java.Lang.String GetNamespace()
         {
-            return IExecuteWithSignature("getProperty", "(Ljava/lang/String;)Ljava/lang/Object;", arg0);
+            return IExecuteWithSignature<Java.Lang.String>("getNamespace", "()Ljava/lang/String;");
         }
         /// <summary>
         /// <see href="https://developer.android.com/reference/org/xmlpull/v1/XmlSerializer.html#getPrefix(java.lang.String,boolean)"/>

From b848b5fbe1e2271f822a76cc5e0e4e8cf72e2aaa Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 02:24:14 +0200
Subject: [PATCH 3/9] Added reference to JNet to be aligned on JNetReflector

---
 .gitmodules   | 3 +++
 3rdparty/JNet | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 3rdparty/JNet

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..dda889a67
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "3rdparty/JNet"]
+	path = 3rdparty/JNet
+	url = https://github.com/masesgroup/JNet
diff --git a/3rdparty/JNet b/3rdparty/JNet
new file mode 160000
index 000000000..247cdc4a0
--- /dev/null
+++ b/3rdparty/JNet
@@ -0,0 +1 @@
+Subproject commit 247cdc4a05ed0fe0795e961f52ce97d6289a11f6

From d27572ab1e2a438136cdf536d1f08b5d507a380c Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 02:35:25 +0200
Subject: [PATCH 4/9] Generated code can use latest unpublished version of
 JNetReflector

---
 .github/workflows/generateclasses.yaml | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
index 9dc162ad0..52576051d 100644
--- a/.github/workflows/generateclasses.yaml
+++ b/.github/workflows/generateclasses.yaml
@@ -12,6 +12,11 @@ on:
         required: true
         default: false
         type: boolean
+      UseLatestJNetReflector:
+        description: 'Uses latest non published version of JNetReflector'
+        required: true
+        default: false
+        type: boolean
         
 # This workflow contains one job called "build_documentation"
 jobs:
@@ -31,10 +36,16 @@ jobs:
       
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
+        if: ${{ inputs.UseLatestJNetReflector == true }}
         with:
           fetch-depth: '1'
           submodules: 'true'
 
+      - uses: actions/checkout@v4
+        if: ${{ inputs.UseLatestJNetReflector == false }}
+        with:
+          fetch-depth: '1'
+
       - name: Pre compile
         run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" /p:NoWarn="0108%3B1030%3B0618" src\net\Netdroid\Netdroid.csproj
         env:
@@ -65,7 +76,19 @@ jobs:
       - name: Clear Java generated files
         run: Remove-Item .\src\jvm\netdroid\src\main\java\org\mases\netdroid\generated\* -Recurse -Force -Exclude README.md
 
+      - name: Prebuild
+        run: dotnet build --no-incremental --configuration Release 3rdparty\JNet\src\net\JNetReflector\JNetReflector.csproj
+
+      - name: Create Jars
+        if: ${{ inputs.UseLatestJNetReflector == true }}
+        run: mvn "-Djcobridgepath=../../../binReflector/net8.0/JCOBridge.jar" --file ./3rdparty/JNet/src/jvm/jnet/pom.xml --no-transfer-progress package
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+
       - run: dotnet tool update --version 2.5.1 -g MASES.JNetReflector
+        if: ${{ inputs.UseLatestJNetReflector == false }}
 
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
@@ -80,6 +103,16 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Build classes
+        if: ${{ inputs.UseLatestJNetReflector == true }}
+        shell: cmd
+        run: |
+          cd 3rdparty\JNet\binReflector\net8.0
+          MASES.JNetReflector.exe -TraceLevel 0 -DestinationRootPath ..\..\..\..\src\ -ConfigurationFile ..\..\..\..\src\configuration.json
+        env:
+          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+
+      - name: Build classes
+        if: ${{ inputs.UseLatestJNetReflector == false }}
         shell: cmd
         run: jnetreflector -TraceLevel 0 -OriginRootPath %ANDROID_HOME%\platforms\android-34-ext8 -DestinationRootPath .\src\ -ConfigurationFile .\src\configuration.json
         env:

From 78fbd1c392ea2cc45cede420f20ca22a1be182af Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 02:39:07 +0200
Subject: [PATCH 5/9] Update to latest PR in JNet

---
 3rdparty/JNet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/JNet b/3rdparty/JNet
index 247cdc4a0..d7a1b75aa 160000
--- a/3rdparty/JNet
+++ b/3rdparty/JNet
@@ -1 +1 @@
-Subproject commit 247cdc4a05ed0fe0795e961f52ce97d6289a11f6
+Subproject commit d7a1b75aa471d57713512eca453bd8fb4e5d2e78

From a5bca68131d32592bf84201b5af24f61e67c816b Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 02:47:52 +0200
Subject: [PATCH 6/9] Update generateclasses.yaml

---
 .github/workflows/generateclasses.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
index 52576051d..426b832e8 100644
--- a/.github/workflows/generateclasses.yaml
+++ b/.github/workflows/generateclasses.yaml
@@ -107,14 +107,14 @@ jobs:
         shell: cmd
         run: |
           cd 3rdparty\JNet\binReflector\net8.0
-          MASES.JNetReflector.exe -TraceLevel 0 -DestinationRootPath ..\..\..\..\src\ -ConfigurationFile ..\..\..\..\src\configuration.json
+          MASES.JNetReflector.exe -TraceLevel 0 -OriginRootPath %ANDROID_HOME%\platforms\android-34-ext8 -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json
         env:
           JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
 
       - name: Build classes
         if: ${{ inputs.UseLatestJNetReflector == false }}
         shell: cmd
-        run: jnetreflector -TraceLevel 0 -OriginRootPath %ANDROID_HOME%\platforms\android-34-ext8 -DestinationRootPath .\src\ -ConfigurationFile .\src\configuration.json
+        run: jnetreflector -TraceLevel 0 -OriginRootPath %ANDROID_HOME%\platforms\android-34-ext8 -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json
         env:
           JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
           

From a2af022667a01130b2bcbbecb038ba4ff82acc19 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 02:57:33 +0200
Subject: [PATCH 7/9] Update descriptions

---
 .github/workflows/generateclasses.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/generateclasses.yaml b/.github/workflows/generateclasses.yaml
index 426b832e8..313d61411 100644
--- a/.github/workflows/generateclasses.yaml
+++ b/.github/workflows/generateclasses.yaml
@@ -13,7 +13,7 @@ on:
         default: false
         type: boolean
       UseLatestJNetReflector:
-        description: 'Uses latest non published version of JNetReflector'
+        description: 'Shall use latest unpublished version of JNetReflector'
         required: true
         default: false
         type: boolean
@@ -79,7 +79,7 @@ jobs:
       - name: Prebuild
         run: dotnet build --no-incremental --configuration Release 3rdparty\JNet\src\net\JNetReflector\JNetReflector.csproj
 
-      - name: Create Jars
+      - name: Create Jars of JNetReflector
         if: ${{ inputs.UseLatestJNetReflector == true }}
         run: mvn "-Djcobridgepath=../../../binReflector/net8.0/JCOBridge.jar" --file ./3rdparty/JNet/src/jvm/jnet/pom.xml --no-transfer-progress package
         env:
@@ -87,7 +87,8 @@ jobs:
           MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
-      - run: dotnet tool update --version 2.5.1 -g MASES.JNetReflector
+      - name: Download latest published version of JNetReflector
+        run: dotnet tool update --version 2.5.1 -g MASES.JNetReflector
         if: ${{ inputs.UseLatestJNetReflector == false }}
 
       - name: Set up Apache Maven Central
@@ -102,7 +103,7 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
-      - name: Build classes
+      - name: Build classes with unpublished JNetReflector
         if: ${{ inputs.UseLatestJNetReflector == true }}
         shell: cmd
         run: |
@@ -111,7 +112,7 @@ jobs:
         env:
           JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
 
-      - name: Build classes
+      - name: Build classes with latest published version of JNetReflector
         if: ${{ inputs.UseLatestJNetReflector == false }}
         shell: cmd
         run: jnetreflector -TraceLevel 0 -OriginRootPath %ANDROID_HOME%\platforms\android-34-ext8 -DestinationRootPath %GITHUB_WORKSPACE%\src\ -ConfigurationFile %GITHUB_WORKSPACE%\src\configuration.json

From 62a2cfc04757e134293907eaa4dac66c5b558ef2 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 03:22:56 +0200
Subject: [PATCH 8/9] update README.md

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 3a419c8b0..f521aeb1c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,3 @@
----
-title: Android suite for .NET
-_description: Main page of Android suite for .NET
----
-
 # Netdroid: Android suite for .NET
 
 Netdroid is a comprehensive suite of libraries and tools to use Android and .NET side-by-side.

From e5e4f3ff692f2eaed9d847cf638ff8f642eb64b2 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Mon, 3 Jun 2024 03:27:43 +0200
Subject: [PATCH 9/9] JNetReflector alignment

---
 3rdparty/JNet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/JNet b/3rdparty/JNet
index d7a1b75aa..e28f21799 160000
--- a/3rdparty/JNet
+++ b/3rdparty/JNet
@@ -1 +1 @@
-Subproject commit d7a1b75aa471d57713512eca453bd8fb4e5d2e78
+Subproject commit e28f2179931efff1f89358e7610ed7e8def761d5